From a5ef5133a333dc47b12558ec2e422c7b6d589f15 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 29 Nov 2018 15:13:03 -0800
Subject: [PATCH 001/337] Reorganize source code in preparation to move into
 aspnet/AspNetCore Prior to reorganization, this source code was found in
 https://github.com/aspnet/Razor/tree/dotnet/aspnetcore-tooling@582f3f867eeb8fca00e6b328faf7665c9a98476c
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/33b287d4a46d71b1162f16af74ab8e8a6cffd3e8

---
 .../src/CSharpIdentifier.cs                   |    71 +
 .../src/ExtensionInitializer.cs               |    29 +
 .../src/IInjectTargetExtension.cs             |    12 +
 .../IViewComponentTagHelperTargetExtension.cs |    12 +
 .../src/InjectDirective.cs                    |   124 +
 .../src/InjectIntermediateNode.cs             |    59 +
 .../src/InjectTargetExtension.cs              |    44 +
 .../src/LegacySectionTargetExtension.cs       |    32 +
 ...ore.Mvc.Razor.Extensions.Version1_X.csproj |    21 +
 .../src/ModelDirective.cs                     |   145 +
 .../src/ModelExpressionPass.cs                |    85 +
 .../src/MvcImportProjectFeature.cs            |    89 +
 .../src/MvcRazorTemplateEngine.cs             |    60 +
 .../src/MvcViewDocumentClassifierPass.cs      |    71 +
 .../src/Properties/AssemblyInfo.cs            |    11 +
 .../src/Properties/Resources.Designer.cs      |   254 +
 .../ViewComponentResources.Designer.cs        |   100 +
 .../src/RazorExtensions.cs                    |   117 +
 .../src/RazorExtensionsDiagnosticFactory.cs   |   103 +
 .../src/Resources.resx                        |   168 +
 .../src/TagHelperDescriptorExtensions.cs      |    37 +
 .../src/ViewComponentResources.resx           |   135 +
 .../src/ViewComponentTagHelperConventions.cs  |    10 +
 ...ViewComponentTagHelperDescriptorFactory.cs |   269 +
 ...iewComponentTagHelperDescriptorProvider.cs |    72 +
 .../ViewComponentTagHelperIntermediateNode.cs |    59 +
 .../src/ViewComponentTagHelperMetadata.cs     |    14 +
 .../src/ViewComponentTagHelperPass.cs         |   203 +
 .../ViewComponentTagHelperTargetExtension.cs  |   183 +
 .../src/ViewComponentTypeVisitor.cs           |    86 +
 .../src/ViewComponentTypes.cs                 |    35 +
 .../test/InjectDirectiveTest.cs               |   225 +
 .../test/InjectTargetExtensionTest.cs         |    68 +
 .../CodeGenerationIntegrationTest.cs          |   370 +
 .../test/LegacySectionTargetExtensionTest.cs  |    46 +
 ...vc.Razor.Extensions.Version1_X.Test.csproj |    51 +
 .../test/ModelDirectiveTest.cs                |   343 +
 .../test/ModelExpressionPassTest.cs           |   208 +
 .../test/MvcImportProjectFeatureTest.cs       |    76 +
 .../test/MvcRazorTemplateEngineTest.cs        |    92 +
 .../test/MvcShim.cs                           |    45 +
 .../test/MvcViewDocumentClassifierPassTest.cs |   264 +
 .../test/Properties/AssemblyInfo.cs           |     6 +
 .../test/SourceMappingsSerializer.cs          |    54 +
 .../test/TagHelperDescriptorExtensionsTest.cs |    82 +
 .../Basic.cshtml                              |     8 +
 .../Basic_DesignTime.codegen.cs               |    71 +
 .../Basic_DesignTime.ir.txt                   |    62 +
 .../Basic_DesignTime.mappings.txt             |    34 +
 .../Basic_Runtime.codegen.cs                  |    92 +
 .../Basic_Runtime.ir.txt                      |    72 +
 .../IncompleteDirectives.cshtml               |     8 +
 ...IncompleteDirectives_DesignTime.codegen.cs |    63 +
 ...pleteDirectives_DesignTime.diagnostics.txt |     6 +
 .../IncompleteDirectives_DesignTime.ir.txt    |    64 +
 ...completeDirectives_DesignTime.mappings.txt |    30 +
 .../IncompleteDirectives_Runtime.codegen.cs   |    51 +
 ...completeDirectives_Runtime.diagnostics.txt |     6 +
 .../IncompleteDirectives_Runtime.ir.txt       |    58 +
 .../InheritsViewModel.cshtml                  |     2 +
 .../InheritsViewModel_DesignTime.codegen.cs   |    56 +
 .../InheritsViewModel_DesignTime.ir.txt       |    37 +
 .../InheritsViewModel_DesignTime.mappings.txt |    10 +
 .../InheritsViewModel_Runtime.codegen.cs      |    33 +
 .../InheritsViewModel_Runtime.ir.txt          |    16 +
 .../InheritsWithViewImports.cshtml            |     1 +
 ...eritsWithViewImports_DesignTime.codegen.cs |    48 +
 .../InheritsWithViewImports_DesignTime.ir.txt |    37 +
 ...itsWithViewImports_DesignTime.mappings.txt |     5 +
 ...InheritsWithViewImports_Runtime.codegen.cs |    33 +
 .../InheritsWithViewImports_Runtime.ir.txt    |    16 +
 .../Inject.cshtml                             |     1 +
 .../InjectWithModel.cshtml                    |     3 +
 .../InjectWithModel_DesignTime.codegen.cs     |    82 +
 .../InjectWithModel_DesignTime.ir.txt         |    41 +
 .../InjectWithModel_DesignTime.mappings.txt   |    25 +
 .../InjectWithModel_Runtime.codegen.cs        |    35 +
 .../InjectWithModel_Runtime.ir.txt            |    17 +
 .../InjectWithSemicolon.cshtml                |     5 +
 .../InjectWithSemicolon_DesignTime.codegen.cs |   118 +
 .../InjectWithSemicolon_DesignTime.ir.txt     |    47 +
 ...njectWithSemicolon_DesignTime.mappings.txt |    45 +
 .../InjectWithSemicolon_Runtime.codegen.cs    |    39 +
 .../InjectWithSemicolon_Runtime.ir.txt        |    19 +
 .../Inject_DesignTime.codegen.cs              |    58 +
 .../Inject_DesignTime.ir.txt                  |    38 +
 .../Inject_DesignTime.mappings.txt            |    10 +
 .../Inject_Runtime.codegen.cs                 |    35 +
 .../Inject_Runtime.ir.txt                     |    17 +
 .../InvalidNamespaceAtEOF.cshtml              |     1 +
 ...nvalidNamespaceAtEOF_DesignTime.codegen.cs |    40 +
 ...dNamespaceAtEOF_DesignTime.diagnostics.txt |     1 +
 .../InvalidNamespaceAtEOF_DesignTime.ir.txt   |    37 +
 ...alidNamespaceAtEOF_DesignTime.mappings.txt |     0
 .../InvalidNamespaceAtEOF_Runtime.codegen.cs  |    36 +
 ...alidNamespaceAtEOF_Runtime.diagnostics.txt |     1 +
 .../InvalidNamespaceAtEOF_Runtime.ir.txt      |    22 +
 .../Model.cshtml                              |     1 +
 .../ModelExpressionTagHelper.cshtml           |     6 +
 ...lExpressionTagHelper_DesignTime.codegen.cs |    69 +
 ...ModelExpressionTagHelper_DesignTime.ir.txt |    66 +
 ...xpressionTagHelper_DesignTime.mappings.txt |    20 +
 ...odelExpressionTagHelper_Runtime.codegen.cs |   104 +
 .../ModelExpressionTagHelper_Runtime.ir.txt   |    69 +
 .../Model_DesignTime.codegen.cs               |    48 +
 .../Model_DesignTime.ir.txt                   |    36 +
 .../Model_DesignTime.mappings.txt             |     5 +
 .../Model_Runtime.codegen.cs                  |    33 +
 .../Model_Runtime.ir.txt                      |    16 +
 .../MultipleModels.cshtml                     |     2 +
 .../MultipleModels_DesignTime.codegen.cs      |    56 +
 .../MultipleModels_DesignTime.diagnostics.txt |     1 +
 .../MultipleModels_DesignTime.ir.txt          |    39 +
 .../MultipleModels_DesignTime.mappings.txt    |    10 +
 .../Sections.cshtml                           |    14 +
 .../Sections_DesignTime.codegen.cs            |    80 +
 .../Sections_DesignTime.ir.txt                |    71 +
 .../Sections_DesignTime.mappings.txt          |    29 +
 .../ViewComponentTagHelper.cshtml             |     6 +
 ...ewComponentTagHelper_DesignTime.codegen.cs |    84 +
 .../ViewComponentTagHelper_DesignTime.ir.txt  |    57 +
 ...ComponentTagHelper_DesignTime.mappings.txt |    19 +
 .../ViewComponentTagHelper_Runtime.codegen.cs |   110 +
 .../ViewComponentTagHelper_Runtime.ir.txt     |    43 +
 .../_ViewImports.cshtml                       |     1 +
 .../_ViewImports_DesignTime.codegen.cs        |    58 +
 .../_ViewImports_DesignTime.ir.txt            |    38 +
 .../_ViewImports_DesignTime.mappings.txt      |    10 +
 .../_ViewImports_Runtime.codegen.cs           |    35 +
 .../_ViewImports_Runtime.ir.txt               |    17 +
 ...ComponentTagHelperDescriptorFactoryTest.cs |   343 +
 ...omponentTagHelperDescriptorProviderTest.cs |    71 +
 .../test/ViewComponentTagHelperPassTest.cs    |   275 +
 ...ewComponentTagHelperTargetExtensionTest.cs |   120 +
 .../test/ViewComponentTypeVisitorTest.cs      |   202 +
 .../test/xunit.runner.json                    |     4 +
 .../src/AssemblyAttributeInjectionPass.cs     |   102 +
 .../src/CSharpIdentifier.cs                   |    71 +
 .../src/ExtensionInitializer.cs               |    15 +
 .../src/IInjectTargetExtension.cs             |    12 +
 .../IViewComponentTagHelperTargetExtension.cs |    12 +
 .../src/InjectDirective.cs                    |   124 +
 .../src/InjectIntermediateNode.cs             |    58 +
 .../src/InjectTargetExtension.cs              |    44 +
 .../src/InstrumentationPass.cs                |   125 +
 ...ore.Mvc.Razor.Extensions.Version2_X.csproj |    20 +
 .../src/ModelDirective.cs                     |   152 +
 .../src/ModelExpressionPass.cs                |    85 +
 .../src/MvcImportProjectFeature.cs            |    91 +
 .../src/MvcViewDocumentClassifierPass.cs      |    71 +
 .../src/NamespaceDirective.cs                 |   204 +
 .../src/PageDirective.cs                      |   121 +
 .../src/PagesPropertyInjectionPass.cs         |    57 +
 .../src/Properties/AssemblyInfo.cs            |    12 +
 .../src/Properties/Resources.Designer.cs      |   338 +
 .../ViewComponentResources.Designer.cs        |   100 +
 .../src/RazorExtensions.cs                    |    48 +
 .../src/RazorExtensionsDiagnosticFactory.cs   |   131 +
 .../src/RazorPageDocumentClassifierPass.cs    |   164 +
 .../src/Resources.resx                        |   186 +
 .../src/TagHelperDescriptorExtensions.cs      |    37 +
 .../src/ViewComponentResources.resx           |   135 +
 .../src/ViewComponentTagHelperConventions.cs  |    10 +
 ...ViewComponentTagHelperDescriptorFactory.cs |   284 +
 ...iewComponentTagHelperDescriptorProvider.cs |    72 +
 .../ViewComponentTagHelperIntermediateNode.cs |    59 +
 .../src/ViewComponentTagHelperMetadata.cs     |    14 +
 .../src/ViewComponentTagHelperPass.cs         |   203 +
 .../ViewComponentTagHelperTargetExtension.cs  |   183 +
 .../src/ViewComponentTypeVisitor.cs           |    88 +
 .../src/ViewComponentTypes.cs                 |    35 +
 .../src/baseline.netcore.json                 |  1180 ++
 .../src/baseline.netframework.json            |   982 +
 .../AssemblyAttributeInjectionPassTest.cs     |   444 +
 .../test/InjectDirectiveTest.cs               |   225 +
 .../test/InjectTargetExtensionTest.cs         |    68 +
 .../test/InstrumentationPassTest.cs           |   348 +
 .../CodeGenerationIntegrationTest.cs          |   961 +
 .../InstrumentationPassIntegrationTest.cs     |    92 +
 ...vc.Razor.Extensions.Version2_X.Test.csproj |    52 +
 .../test/ModelDirectiveTest.cs                |   343 +
 .../test/ModelExpressionPassTest.cs           |   208 +
 .../test/MvcImportProjectFeatureTest.cs       |    76 +
 .../test/MvcShim.cs                           |    45 +
 .../test/MvcViewDocumentClassifierPassTest.cs |   264 +
 .../test/NamespaceDirectiveTest.cs            |   352 +
 .../test/PageDirectiveTest.cs                 |   148 +
 .../test/Properties/AssemblyInfo.cs           |     6 +
 .../RazorPageDocumentClassifierPassTest.cs    |   417 +
 .../test/SourceMappingsSerializer.cs          |    54 +
 .../test/TagHelperDescriptorExtensionsTest.cs |    82 +
 .../Basic.cshtml                              |     8 +
 .../Basic_DesignTime.codegen.cs               |    71 +
 .../Basic_DesignTime.ir.txt                   |    64 +
 .../Basic_DesignTime.mappings.txt             |    34 +
 .../Basic_Runtime.codegen.cs                  |    95 +
 .../Basic_Runtime.ir.txt                      |    76 +
 .../IncompleteDirectives.cshtml               |    15 +
 ...IncompleteDirectives_DesignTime.codegen.cs |    71 +
 ...pleteDirectives_DesignTime.diagnostics.txt |    12 +
 .../IncompleteDirectives_DesignTime.ir.txt    |    84 +
 ...completeDirectives_DesignTime.mappings.txt |    40 +
 .../IncompleteDirectives_Runtime.codegen.cs   |    65 +
 ...completeDirectives_Runtime.diagnostics.txt |    12 +
 .../IncompleteDirectives_Runtime.ir.txt       |    95 +
 .../InheritsViewModel.cshtml                  |     2 +
 .../InheritsViewModel_DesignTime.codegen.cs   |    56 +
 .../InheritsViewModel_DesignTime.ir.txt       |    39 +
 .../InheritsViewModel_DesignTime.mappings.txt |    10 +
 .../InheritsViewModel_Runtime.codegen.cs      |    36 +
 .../InheritsViewModel_Runtime.ir.txt          |    20 +
 .../InheritsWithViewImports.cshtml            |     2 +
 ...eritsWithViewImports_DesignTime.codegen.cs |    50 +
 .../InheritsWithViewImports_DesignTime.ir.txt |    43 +
 ...itsWithViewImports_DesignTime.mappings.txt |     5 +
 ...InheritsWithViewImports_Runtime.codegen.cs |    39 +
 .../InheritsWithViewImports_Runtime.ir.txt    |    25 +
 .../Inject.cshtml                             |     1 +
 .../InjectWithModel.cshtml                    |     3 +
 .../InjectWithModel_DesignTime.codegen.cs     |    82 +
 .../InjectWithModel_DesignTime.ir.txt         |    43 +
 .../InjectWithModel_DesignTime.mappings.txt   |    25 +
 .../InjectWithModel_Runtime.codegen.cs        |    38 +
 .../InjectWithModel_Runtime.ir.txt            |    21 +
 .../InjectWithSemicolon.cshtml                |     5 +
 .../InjectWithSemicolon_DesignTime.codegen.cs |   118 +
 .../InjectWithSemicolon_DesignTime.ir.txt     |    49 +
 ...njectWithSemicolon_DesignTime.mappings.txt |    45 +
 .../InjectWithSemicolon_Runtime.codegen.cs    |    42 +
 .../InjectWithSemicolon_Runtime.ir.txt        |    23 +
 .../Inject_DesignTime.codegen.cs              |    58 +
 .../Inject_DesignTime.ir.txt                  |    40 +
 .../Inject_DesignTime.mappings.txt            |    10 +
 .../Inject_Runtime.codegen.cs                 |    38 +
 .../Inject_Runtime.ir.txt                     |    21 +
 .../InvalidNamespaceAtEOF.cshtml              |     1 +
 ...nvalidNamespaceAtEOF_DesignTime.codegen.cs |    40 +
 ...dNamespaceAtEOF_DesignTime.diagnostics.txt |     1 +
 .../InvalidNamespaceAtEOF_DesignTime.ir.txt   |    40 +
 ...alidNamespaceAtEOF_DesignTime.mappings.txt |     0
 .../InvalidNamespaceAtEOF_Runtime.codegen.cs  |    39 +
 ...alidNamespaceAtEOF_Runtime.diagnostics.txt |     1 +
 .../InvalidNamespaceAtEOF_Runtime.ir.txt      |    27 +
 .../MalformedPageDirective.cshtml             |     4 +
 ...lformedPageDirective_DesignTime.codegen.cs |    42 +
 ...edPageDirective_DesignTime.diagnostics.txt |     1 +
 .../MalformedPageDirective_DesignTime.ir.txt  |    51 +
 ...ormedPageDirective_DesignTime.mappings.txt |     0
 .../MalformedPageDirective_Runtime.codegen.cs |    41 +
 ...ormedPageDirective_Runtime.diagnostics.txt |     1 +
 .../MalformedPageDirective_Runtime.ir.txt     |    38 +
 .../Model.cshtml                              |     1 +
 .../ModelExpressionTagHelper.cshtml           |     6 +
 ...lExpressionTagHelper_DesignTime.codegen.cs |    69 +
 ...ModelExpressionTagHelper_DesignTime.ir.txt |    68 +
 ...xpressionTagHelper_DesignTime.mappings.txt |    20 +
 ...odelExpressionTagHelper_Runtime.codegen.cs |   107 +
 .../ModelExpressionTagHelper_Runtime.ir.txt   |    73 +
 .../Model_DesignTime.codegen.cs               |    48 +
 .../Model_DesignTime.ir.txt                   |    38 +
 .../Model_DesignTime.mappings.txt             |     5 +
 .../Model_Runtime.codegen.cs                  |    36 +
 .../Model_Runtime.ir.txt                      |    20 +
 .../MultipleModels.cshtml                     |     2 +
 .../MultipleModels_DesignTime.codegen.cs      |    56 +
 .../MultipleModels_DesignTime.diagnostics.txt |     1 +
 .../MultipleModels_DesignTime.ir.txt          |    41 +
 .../MultipleModels_DesignTime.mappings.txt    |    10 +
 .../PageWithNamespace.cshtml                  |     3 +
 .../PageWithNamespace_DesignTime.codegen.cs   |    50 +
 .../PageWithNamespace_DesignTime.ir.txt       |    47 +
 .../PageWithNamespace_DesignTime.mappings.txt |     5 +
 .../PageWithNamespace_Runtime.codegen.cs      |    41 +
 .../PageWithNamespace_Runtime.ir.txt          |    33 +
 ...RazorPageWithNoLeadingPageDirective.cshtml |     2 +
 ...LeadingPageDirective_DesignTime.codegen.cs |    42 +
 ...ngPageDirective_DesignTime.diagnostics.txt |     1 +
 ...thNoLeadingPageDirective_DesignTime.ir.txt |    46 +
 ...adingPageDirective_DesignTime.mappings.txt |     0
 ...hNoLeadingPageDirective_Runtime.codegen.cs |    41 +
 ...adingPageDirective_Runtime.diagnostics.txt |     1 +
 ...eWithNoLeadingPageDirective_Runtime.ir.txt |    33 +
 .../RazorPages.cshtml                         |    40 +
 .../RazorPagesWithRouteTemplate.cshtml        |    13 +
 ...gesWithRouteTemplate_DesignTime.codegen.cs |    78 +
 ...orPagesWithRouteTemplate_DesignTime.ir.txt |    60 +
 ...sWithRouteTemplate_DesignTime.mappings.txt |    35 +
 ...rPagesWithRouteTemplate_Runtime.codegen.cs |    72 +
 ...RazorPagesWithRouteTemplate_Runtime.ir.txt |    61 +
 .../RazorPagesWithoutModel.cshtml             |    36 +
 ...zorPagesWithoutModel_DesignTime.codegen.cs |    83 +
 .../RazorPagesWithoutModel_DesignTime.ir.txt  |   143 +
 ...rPagesWithoutModel_DesignTime.mappings.txt |    46 +
 .../RazorPagesWithoutModel_Runtime.codegen.cs |   204 +
 .../RazorPagesWithoutModel_Runtime.ir.txt     |   193 +
 .../RazorPages_DesignTime.codegen.cs          |    94 +
 .../RazorPages_DesignTime.ir.txt              |   144 +
 .../RazorPages_DesignTime.mappings.txt        |    57 +
 .../RazorPages_Runtime.codegen.cs             |   207 +
 .../RazorPages_Runtime.ir.txt                 |   193 +
 .../Sections.cshtml                           |    14 +
 .../Sections_DesignTime.codegen.cs            |    80 +
 .../Sections_DesignTime.ir.txt                |    73 +
 .../Sections_DesignTime.mappings.txt          |    29 +
 .../Sections_Runtime.codegen.cs               |    99 +
 .../Sections_Runtime.ir.txt                   |    77 +
 .../UsingDirectives.cshtml                    |     4 +
 .../UsingDirectives_DesignTime.codegen.cs     |    59 +
 .../UsingDirectives_DesignTime.ir.txt         |    46 +
 .../UsingDirectives_DesignTime.mappings.txt   |    20 +
 .../UsingDirectives_Runtime.codegen.cs        |    55 +
 .../UsingDirectives_Runtime.ir.txt            |    23 +
 .../ViewComponentTagHelper.cshtml             |     6 +
 ...ewComponentTagHelper_DesignTime.codegen.cs |    84 +
 .../ViewComponentTagHelper_DesignTime.ir.txt  |    59 +
 ...ComponentTagHelper_DesignTime.mappings.txt |    19 +
 .../ViewComponentTagHelper_Runtime.codegen.cs |   112 +
 .../ViewComponentTagHelper_Runtime.ir.txt     |    46 +
 .../ViewWithNamespace.cshtml                  |     2 +
 .../ViewWithNamespace_DesignTime.codegen.cs   |    48 +
 .../ViewWithNamespace_DesignTime.ir.txt       |    43 +
 .../ViewWithNamespace_DesignTime.mappings.txt |     5 +
 .../ViewWithNamespace_Runtime.codegen.cs      |    39 +
 .../ViewWithNamespace_Runtime.ir.txt          |    29 +
 .../_ViewImports.cshtml                       |     1 +
 .../_ViewImports_DesignTime.codegen.cs        |    58 +
 .../_ViewImports_DesignTime.ir.txt            |    40 +
 .../_ViewImports_DesignTime.mappings.txt      |    10 +
 .../_ViewImports_Runtime.codegen.cs           |    38 +
 .../_ViewImports_Runtime.ir.txt               |    21 +
 .../BasicTest.codegen.cs                      |   118 +
 .../BasicTest.cshtml                          |     9 +
 .../BasicTest.ir.txt                          |   100 +
 ...ComponentTagHelperDescriptorFactoryTest.cs |   485 +
 ...omponentTagHelperDescriptorProviderTest.cs |    72 +
 .../test/ViewComponentTagHelperPassTest.cs    |   275 +
 ...ewComponentTagHelperTargetExtensionTest.cs |   120 +
 .../test/ViewComponentTypeVisitorTest.cs      |   202 +
 .../test/xunit.runner.json                    |     4 +
 .../src/AssemblyAttributeInjectionPass.cs     |   102 +
 .../src/ExtensionInitializer.cs               |    16 +
 .../src/IInjectTargetExtension.cs             |    12 +
 .../IViewComponentTagHelperTargetExtension.cs |    12 +
 .../src/InjectDirective.cs                    |   131 +
 .../src/InjectIntermediateNode.cs             |    58 +
 .../src/InjectTargetExtension.cs              |    44 +
 ...oft.AspNetCore.Mvc.Razor.Extensions.csproj |    20 +
 .../src/ModelDirective.cs                     |   152 +
 .../src/ModelExpressionPass.cs                |    85 +
 .../src/MvcImportProjectFeature.cs            |    91 +
 .../src/MvcRazorTemplateEngine.cs             |    62 +
 .../src/MvcViewDocumentClassifierPass.cs      |    70 +
 .../src/NamespaceDirective.cs                 |   204 +
 .../src/PageDirective.cs                      |   121 +
 .../src/PagesPropertyInjectionPass.cs         |    57 +
 .../src/Properties/AssemblyInfo.cs            |    11 +
 .../src/Properties/Resources.Designer.cs      |   338 +
 .../ViewComponentResources.Designer.cs        |   100 +
 .../src/RazorExtensions.cs                    |    47 +
 .../src/RazorExtensionsDiagnosticFactory.cs   |   131 +
 .../src/RazorPageDocumentClassifierPass.cs    |   163 +
 .../src/Resources.resx                        |   186 +
 .../src/TagHelperDescriptorExtensions.cs      |    37 +
 .../src/ViewComponentResources.resx           |   135 +
 .../src/ViewComponentTagHelperConventions.cs  |    10 +
 ...ViewComponentTagHelperDescriptorFactory.cs |   284 +
 ...iewComponentTagHelperDescriptorProvider.cs |    72 +
 .../ViewComponentTagHelperIntermediateNode.cs |    59 +
 .../src/ViewComponentTagHelperMetadata.cs     |    14 +
 .../src/ViewComponentTagHelperPass.cs         |   203 +
 .../ViewComponentTagHelperTargetExtension.cs  |   183 +
 .../src/ViewComponentTypeVisitor.cs           |    88 +
 .../src/ViewComponentTypes.cs                 |    35 +
 .../src/baseline.netcore.json                 |  1235 ++
 .../src/baseline.netframework.json            |  1023 +
 .../src/breakingchanges.netcore.json          |    11 +
 .../src/breakingchanges.netframework.json     |    11 +
 .../AssemblyAttributeInjectionPassTest.cs     |   444 +
 .../test/InjectDirectiveTest.cs               |   212 +
 .../test/InjectTargetExtensionTest.cs         |    68 +
 .../CodeGenerationIntegrationTest.cs          |   961 +
 ...spNetCore.Mvc.Razor.Extensions.Test.csproj |    51 +
 .../test/ModelDirectiveTest.cs                |   343 +
 .../test/ModelExpressionPassTest.cs           |   208 +
 .../test/MvcImportProjectFeatureTest.cs       |    76 +
 .../test/MvcRazorTemplateEngineTest.cs        |    94 +
 .../test/MvcShim.cs                           |    45 +
 .../test/MvcViewDocumentClassifierPassTest.cs |   264 +
 .../test/NamespaceDirectiveTest.cs            |   352 +
 .../test/PageDirectiveTest.cs                 |   148 +
 .../test/Properties/AssemblyInfo.cs           |     6 +
 .../RazorPageDocumentClassifierPassTest.cs    |   417 +
 .../test/SourceMappingsSerializer.cs          |    54 +
 .../test/TagHelperDescriptorExtensionsTest.cs |    82 +
 .../Basic.cshtml                              |     8 +
 .../Basic_DesignTime.codegen.cs               |    71 +
 .../Basic_DesignTime.ir.txt                   |    64 +
 .../Basic_DesignTime.mappings.txt             |    34 +
 .../Basic_Runtime.codegen.cs                  |    81 +
 .../Basic_Runtime.ir.txt                      |    48 +
 .../IncompleteDirectives.cshtml               |    15 +
 ...IncompleteDirectives_DesignTime.codegen.cs |    71 +
 ...pleteDirectives_DesignTime.diagnostics.txt |    12 +
 .../IncompleteDirectives_DesignTime.ir.txt    |    84 +
 ...completeDirectives_DesignTime.mappings.txt |    40 +
 .../IncompleteDirectives_Runtime.codegen.cs   |    47 +
 ...completeDirectives_Runtime.diagnostics.txt |    12 +
 .../IncompleteDirectives_Runtime.ir.txt       |    59 +
 .../InheritsViewModel.cshtml                  |     2 +
 .../InheritsViewModel_DesignTime.codegen.cs   |    56 +
 .../InheritsViewModel_DesignTime.ir.txt       |    39 +
 .../InheritsViewModel_DesignTime.mappings.txt |    10 +
 .../InheritsViewModel_Runtime.codegen.cs      |    36 +
 .../InheritsViewModel_Runtime.ir.txt          |    20 +
 .../InheritsWithViewImports.cshtml            |     2 +
 ...eritsWithViewImports_DesignTime.codegen.cs |    50 +
 .../InheritsWithViewImports_DesignTime.ir.txt |    43 +
 ...itsWithViewImports_DesignTime.mappings.txt |     5 +
 ...InheritsWithViewImports_Runtime.codegen.cs |    39 +
 .../InheritsWithViewImports_Runtime.ir.txt    |    25 +
 .../Inject.cshtml                             |     1 +
 .../InjectWithModel.cshtml                    |     3 +
 .../InjectWithModel_DesignTime.codegen.cs     |    82 +
 .../InjectWithModel_DesignTime.ir.txt         |    43 +
 .../InjectWithModel_DesignTime.mappings.txt   |    25 +
 .../InjectWithModel_Runtime.codegen.cs        |    38 +
 .../InjectWithModel_Runtime.ir.txt            |    21 +
 .../InjectWithSemicolon.cshtml                |     5 +
 .../InjectWithSemicolon_DesignTime.codegen.cs |   118 +
 .../InjectWithSemicolon_DesignTime.ir.txt     |    49 +
 ...njectWithSemicolon_DesignTime.mappings.txt |    45 +
 .../InjectWithSemicolon_Runtime.codegen.cs    |    42 +
 .../InjectWithSemicolon_Runtime.ir.txt        |    23 +
 .../Inject_DesignTime.codegen.cs              |    58 +
 .../Inject_DesignTime.ir.txt                  |    40 +
 .../Inject_DesignTime.mappings.txt            |    10 +
 .../Inject_Runtime.codegen.cs                 |    38 +
 .../Inject_Runtime.ir.txt                     |    21 +
 .../InvalidNamespaceAtEOF.cshtml              |     1 +
 ...nvalidNamespaceAtEOF_DesignTime.codegen.cs |    40 +
 ...dNamespaceAtEOF_DesignTime.diagnostics.txt |     1 +
 .../InvalidNamespaceAtEOF_DesignTime.ir.txt   |    40 +
 ...alidNamespaceAtEOF_DesignTime.mappings.txt |     0
 .../InvalidNamespaceAtEOF_Runtime.codegen.cs  |    37 +
 ...alidNamespaceAtEOF_Runtime.diagnostics.txt |     1 +
 .../InvalidNamespaceAtEOF_Runtime.ir.txt      |    23 +
 .../MalformedPageDirective.cshtml             |     4 +
 ...lformedPageDirective_DesignTime.codegen.cs |    42 +
 ...edPageDirective_DesignTime.diagnostics.txt |     1 +
 .../MalformedPageDirective_DesignTime.ir.txt  |    51 +
 ...ormedPageDirective_DesignTime.mappings.txt |     0
 .../MalformedPageDirective_Runtime.codegen.cs |    39 +
 ...ormedPageDirective_Runtime.diagnostics.txt |     1 +
 .../MalformedPageDirective_Runtime.ir.txt     |    34 +
 .../Model.cshtml                              |     1 +
 .../ModelExpressionTagHelper.cshtml           |     6 +
 ...lExpressionTagHelper_DesignTime.codegen.cs |    69 +
 ...ModelExpressionTagHelper_DesignTime.ir.txt |    68 +
 ...xpressionTagHelper_DesignTime.mappings.txt |    20 +
 ...odelExpressionTagHelper_Runtime.codegen.cs |    95 +
 .../ModelExpressionTagHelper_Runtime.ir.txt   |    49 +
 .../Model_DesignTime.codegen.cs               |    48 +
 .../Model_DesignTime.ir.txt                   |    38 +
 .../Model_DesignTime.mappings.txt             |     5 +
 .../Model_Runtime.codegen.cs                  |    36 +
 .../Model_Runtime.ir.txt                      |    20 +
 .../MultipleModels.cshtml                     |     2 +
 .../MultipleModels_DesignTime.codegen.cs      |    56 +
 .../MultipleModels_DesignTime.diagnostics.txt |     1 +
 .../MultipleModels_DesignTime.ir.txt          |    41 +
 .../MultipleModels_DesignTime.mappings.txt    |    10 +
 .../PageWithNamespace.cshtml                  |     3 +
 .../PageWithNamespace_DesignTime.codegen.cs   |    50 +
 .../PageWithNamespace_DesignTime.ir.txt       |    47 +
 .../PageWithNamespace_DesignTime.mappings.txt |     5 +
 .../PageWithNamespace_Runtime.codegen.cs      |    39 +
 .../PageWithNamespace_Runtime.ir.txt          |    29 +
 ...RazorPageWithNoLeadingPageDirective.cshtml |     2 +
 ...LeadingPageDirective_DesignTime.codegen.cs |    42 +
 ...ngPageDirective_DesignTime.diagnostics.txt |     1 +
 ...thNoLeadingPageDirective_DesignTime.ir.txt |    46 +
 ...adingPageDirective_DesignTime.mappings.txt |     0
 ...hNoLeadingPageDirective_Runtime.codegen.cs |    39 +
 ...adingPageDirective_Runtime.diagnostics.txt |     1 +
 ...eWithNoLeadingPageDirective_Runtime.ir.txt |    29 +
 .../RazorPages.cshtml                         |    40 +
 .../RazorPagesWithRouteTemplate.cshtml        |    13 +
 ...gesWithRouteTemplate_DesignTime.codegen.cs |    78 +
 ...orPagesWithRouteTemplate_DesignTime.ir.txt |    60 +
 ...sWithRouteTemplate_DesignTime.mappings.txt |    35 +
 ...rPagesWithRouteTemplate_Runtime.codegen.cs |    62 +
 ...RazorPagesWithRouteTemplate_Runtime.ir.txt |    41 +
 .../RazorPagesWithoutModel.cshtml             |    36 +
 ...zorPagesWithoutModel_DesignTime.codegen.cs |    83 +
 .../RazorPagesWithoutModel_DesignTime.ir.txt  |   143 +
 ...rPagesWithoutModel_DesignTime.mappings.txt |    46 +
 .../RazorPagesWithoutModel_Runtime.codegen.cs |   166 +
 .../RazorPagesWithoutModel_Runtime.ir.txt     |   117 +
 .../RazorPages_DesignTime.codegen.cs          |    94 +
 .../RazorPages_DesignTime.ir.txt              |   144 +
 .../RazorPages_DesignTime.mappings.txt        |    57 +
 .../RazorPages_Runtime.codegen.cs             |   169 +
 .../RazorPages_Runtime.ir.txt                 |   117 +
 .../Sections.cshtml                           |    14 +
 .../Sections_DesignTime.codegen.cs            |    80 +
 .../Sections_DesignTime.ir.txt                |    73 +
 .../Sections_DesignTime.mappings.txt          |    29 +
 .../Sections_Runtime.codegen.cs               |    87 +
 .../Sections_Runtime.ir.txt                   |    53 +
 .../UsingDirectives.cshtml                    |     4 +
 .../UsingDirectives_DesignTime.codegen.cs     |    59 +
 .../UsingDirectives_DesignTime.ir.txt         |    46 +
 .../UsingDirectives_DesignTime.mappings.txt   |    20 +
 .../UsingDirectives_Runtime.codegen.cs        |    55 +
 .../UsingDirectives_Runtime.ir.txt            |    23 +
 .../ViewComponentTagHelper.cshtml             |     6 +
 ...ewComponentTagHelper_DesignTime.codegen.cs |    84 +
 .../ViewComponentTagHelper_DesignTime.ir.txt  |    59 +
 ...ComponentTagHelper_DesignTime.mappings.txt |    19 +
 .../ViewComponentTagHelper_Runtime.codegen.cs |   108 +
 .../ViewComponentTagHelper_Runtime.ir.txt     |    38 +
 .../ViewWithNamespace.cshtml                  |     2 +
 .../ViewWithNamespace_DesignTime.codegen.cs   |    48 +
 .../ViewWithNamespace_DesignTime.ir.txt       |    43 +
 .../ViewWithNamespace_DesignTime.mappings.txt |     5 +
 .../ViewWithNamespace_Runtime.codegen.cs      |    37 +
 .../ViewWithNamespace_Runtime.ir.txt          |    25 +
 .../_ViewImports.cshtml                       |     1 +
 .../_ViewImports_DesignTime.codegen.cs        |    58 +
 .../_ViewImports_DesignTime.ir.txt            |    40 +
 .../_ViewImports_DesignTime.mappings.txt      |    10 +
 .../_ViewImports_Runtime.codegen.cs           |    38 +
 .../_ViewImports_Runtime.ir.txt               |    21 +
 ...ComponentTagHelperDescriptorFactoryTest.cs |   485 +
 ...omponentTagHelperDescriptorProviderTest.cs |    72 +
 .../test/ViewComponentTagHelperPassTest.cs    |   275 +
 ...ewComponentTagHelperTargetExtensionTest.cs |   120 +
 .../test/ViewComponentTypeVisitorTest.cs      |   202 +
 .../test/xunit.runner.json                    |     4 +
 .../src/AllowedChildTagDescriptor.cs          |    48 +
 .../src/AllowedChildTagDescriptorBuilder.cs   |    17 +
 .../src/AllowedChildTagDescriptorComparer.cs  |    71 +
 .../src/AssemblyExtension.cs                  |    55 +
 .../src/AttributeStructure.cs                 |    15 +
 .../src/BoundAttributeDescriptor.cs           |    80 +
 .../src/BoundAttributeDescriptorBuilder.cs    |    30 +
 ...undAttributeDescriptorBuilderExtensions.cs |    55 +
 .../src/BoundAttributeDescriptorComparer.cs   |    83 +
 .../src/BoundAttributeDescriptorExtensions.cs |    53 +
 .../src/CSharpIdentifier.cs                   |    53 +
 .../src/Checksum.cs                           |    28 +
 .../src/ClassifiedSpanVisitor.cs              |   312 +
 .../CodeGeneration/CodeRenderingContext.cs    |    44 +
 .../src/CodeGeneration/CodeTarget.cs          |    95 +
 .../src/CodeGeneration/CodeTargetBuilder.cs   |    18 +
 .../src/CodeGeneration/CodeWriter.cs          |   207 +
 .../CodeGeneration/CodeWriterExtensions.cs    |   650 +
 .../DefaultCodeRenderingContext.cs            |   213 +
 .../src/CodeGeneration/DefaultCodeTarget.cs   |    54 +
 .../DefaultCodeTargetBuilder.cs               |    30 +
 .../CodeGeneration/DefaultDocumentWriter.cs   |   266 +
 .../CodeGeneration/DesignTimeNodeWriter.cs    |   259 +
 .../src/CodeGeneration/DocumentWriter.cs      |    46 +
 .../CodeGeneration/ICodeTargetExtension.cs    |     9 +
 .../CodeGeneration/IntermediateNodeWriter.cs  |    30 +
 .../LiteralRuntimeNodeWriter.cs               |    10 +
 .../src/CodeGeneration/RuntimeNodeWriter.cs   |   391 +
 ...TagHelperHtmlAttributeRuntimeNodeWriter.cs |    10 +
 .../TagHelperRenderingContext.cs              |    40 +
 .../src/Components/CodeGenerationConstants.cs |    27 +
 .../ComponentDocumentClassifierPass.cs        |   139 +
 .../src/Components/ComponentExtensions.cs     |    22 +
 .../src/DefaultAllowedChildTagDescriptor.cs   |    15 +
 ...DefaultAllowedChildTagDescriptorBuilder.cs |    77 +
 .../src/DefaultBoundAttributeDescriptor.cs    |    43 +
 .../DefaultBoundAttributeDescriptorBuilder.cs |   209 +
 .../src/DefaultDirectiveSyntaxTreePass.cs     |    66 +
 .../src/DefaultDocumentClassifierPass.cs      |    49 +
 .../DefaultDocumentClassifierPassFeature.cs   |    21 +
 .../src/DefaultImportProjectFeature.cs        |    13 +
 .../src/DefaultRazorCSharpDocument.cs         |    47 +
 .../src/DefaultRazorCSharpLoweringPhase.cs    |    33 +
 .../src/DefaultRazorCodeDocument.cs           |    33 +
 .../src/DefaultRazorCodeGenerationOptions.cs  |    32 +
 ...efaultRazorCodeGenerationOptionsBuilder.cs |    51 +
 ...eGenerationOptionsFactoryProjectFeature.cs |    32 +
 ...efaultRazorCodeGenerationOptionsFeature.cs |    38 +
 .../src/DefaultRazorDiagnostic.cs             |    84 +
 .../DefaultRazorDirectiveClassifierPhase.cs   |    30 +
 .../src/DefaultRazorDirectiveFeature.cs       |    30 +
 .../DefaultRazorDocumentClassifierPhase.cs    |    30 +
 .../src/DefaultRazorEngine.cs                 |    55 +
 .../src/DefaultRazorEngineBuilder.cs          |    37 +
 ...faultRazorIntermediateNodeLoweringPhase.cs |  1118 ++
 .../src/DefaultRazorOptimizationPhase.cs      |    30 +
 .../src/DefaultRazorParserOptions.cs          |    35 +
 .../src/DefaultRazorParserOptionsBuilder.cs   |    51 +
 ...RazorParserOptionsFactoryProjectFeature.cs |    32 +
 .../src/DefaultRazorParserOptionsFeature.cs   |    40 +
 .../src/DefaultRazorParsingPhase.cs           |    31 +
 .../src/DefaultRazorProjectEngine.cs          |   195 +
 .../src/DefaultRazorProjectEngineBuilder.cs   |    60 +
 .../src/DefaultRazorProjectFileSystem.cs      |    86 +
 .../src/DefaultRazorProjectItem.cs            |    39 +
 .../src/DefaultRazorSourceLineCollection.cs   |   123 +
 .../src/DefaultRazorSyntaxTree.cs             |    33 +
 .../src/DefaultRazorSyntaxTreePhase.cs        |    30 +
 .../src/DefaultRazorTagHelperBinderPhase.cs   |   192 +
 .../src/DefaultRazorTargetExtensionFeature.cs |    13 +
 .../src/DefaultRequiredAttributeDescriptor.cs |    24 +
 ...faultRequiredAttributeDescriptorBuilder.cs |    78 +
 .../src/DefaultTagHelperDescriptor.cs         |    36 +
 .../src/DefaultTagHelperDescriptorBuilder.cs  |   237 +
 .../src/DefaultTagMatchingRuleDescriptor.cs   |    22 +
 ...DefaultTagMatchingRuleDescriptorBuilder.cs |   146 +
 .../src/DirectiveDescriptor.cs                |   263 +
 .../DirectiveDescriptorBuilderExtensions.cs   |   186 +
 .../src/DirectiveDescriptorComparer.cs        |    49 +
 .../src/DirectiveKind.cs                      |    12 +
 .../src/DirectiveRemovalOptimizationPass.cs   |    40 +
 .../src/DirectiveTokenDescriptor.cs           |    50 +
 .../src/DirectiveTokenDescriptorComparer.cs   |    44 +
 .../src/DirectiveTokenEditHandler.cs          |    49 +
 .../src/DirectiveTokenKind.cs                 |    13 +
 .../src/DirectiveUsage.cs                     |    27 +
 .../src/DocumentClassifierPassBase.cs         |   153 +
 .../src/EmptyProjectFileSystem.cs             |    23 +
 .../DefaultMetadataIdentifierFeature.cs       |    41 +
 .../DefaultTagHelperBodyIntermediateNode.cs   |    74 +
 .../DefaultTagHelperCreateIntermediateNode.cs |    61 +
 ...DefaultTagHelperExecuteIntermediateNode.cs |    46 +
 ...tTagHelperHtmlAttributeIntermediateNode.cs |    84 +
 .../DefaultTagHelperOptimizationPass.cs       |   259 +
 ...efaultTagHelperPropertyIntermediateNode.cs |   102 +
 ...DefaultTagHelperRuntimeIntermediateNode.cs |    46 +
 .../DefaultTagHelperTargetExtension.cs        |   663 +
 .../DesignTimeDirectiveIntermediateNode.cs    |    47 +
 .../src/Extensions/DesignTimeDirectivePass.cs |    82 +
 .../DesignTimeDirectiveTargetExtension.cs     |   174 +
 .../src/Extensions/EliminateMethodBodyPass.cs |    71 +
 .../src/Extensions/FunctionsDirective.cs      |    44 +
 .../src/Extensions/FunctionsDirectivePass.cs  |    27 +
 .../IDefaultTagHelperTargetExtension.cs       |    22 +
 .../IDesignTimeDirectiveTargetExtension.cs    |    12 +
 .../IMetadataAttributeTargetExtension.cs      |    16 +
 .../Extensions/IMetadataIdentifierFeature.cs  |    10 +
 .../IPreallocatedAttributeTargetExtension.cs  |    18 +
 .../src/Extensions/ISectionTargetExtension.cs |    12 +
 .../Extensions/ITemplateTargetExtension.cs    |    12 +
 .../src/Extensions/InheritsDirective.cs       |    46 +
 .../src/Extensions/InheritsDirectivePass.cs   |    31 +
 .../src/Extensions/MetadataAttributePass.cs   |   128 +
 .../MetadataAttributeTargetExtension.cs       |    88 +
 .../PreallocatedAttributeTargetExtension.cs   |   167 +
 ...catedTagHelperAttributeOptimizationPass.cs |   166 +
 ...dTagHelperHtmlAttributeIntermediateNode.cs |    55 +
 ...elperHtmlAttributeValueIntermediateNode.cs |    88 +
 ...ocatedTagHelperPropertyIntermediateNode.cs |    97 +
 ...dTagHelperPropertyValueIntermediateNode.cs |    64 +
 ...orCompiledItemAttributeIntermediateNode.cs |    59 +
 ...edItemMetadataAttributeIntermediateNode.cs |    65 +
 ...SourceChecksumAttributeIntermediateNode.cs |    52 +
 .../src/Extensions/SectionDirective.cs        |    47 +
 .../src/Extensions/SectionDirectivePass.cs    |    49 +
 .../src/Extensions/SectionIntermediateNode.cs |    55 +
 .../src/Extensions/SectionTargetExtension.cs  |    43 +
 .../Extensions/TemplateIntermediateNode.cs    |    46 +
 .../src/Extensions/TemplateTargetExtension.cs |    35 +
 .../src/HtmlConventions.cs                    |    44 +
 .../src/HtmlNodeOptimizationPass.cs           |    32 +
 ...figureRazorCodeGenerationOptionsFeature.cs |    12 +
 .../IConfigureRazorParserOptionsFeature.cs    |    12 +
 .../src/IDirectiveDescriptorBuilder.cs        |    49 +
 .../src/IImportProjectFeature.cs              |    12 +
 .../src/IRazorCSharpLoweringPhase.cs          |    17 +
 ...eGenerationOptionsFactoryProjectFeature.cs |    12 +
 .../src/IRazorCodeGenerationOptionsFeature.cs |    13 +
 .../src/IRazorDirectiveClassifierPass.cs      |    14 +
 .../src/IRazorDirectiveClassifierPhase.cs     |    25 +
 .../src/IRazorDirectiveFeature.cs             |    12 +
 .../src/IRazorDocumentClassifierPass.cs       |    14 +
 .../src/IRazorDocumentClassifierPhase.cs      |    28 +
 .../src/IRazorEngineBuilder.cs                |    20 +
 .../src/IRazorEngineFeature.cs                |    10 +
 .../src/IRazorEnginePhase.cs                  |    12 +
 .../src/IRazorFeature.cs                      |     9 +
 .../IRazorIntermediateNodeLoweringPhase.cs    |    19 +
 .../src/IRazorOptimizationPass.cs             |    14 +
 .../src/IRazorOptimizationPhase.cs            |    24 +
 ...RazorParserOptionsFactoryProjectFeature.cs |    12 +
 .../src/IRazorParserOptionsFeature.cs         |    13 +
 .../src/IRazorParsingPhase.cs                 |     9 +
 .../src/IRazorProjectEngineFeature.cs         |    10 +
 .../src/IRazorSyntaxTreePass.cs               |    13 +
 .../src/IRazorSyntaxTreePhase.cs              |    10 +
 .../src/IRazorTagHelperBinderPhase.cs         |     9 +
 .../src/IRazorTargetExtensionFeature.cs       |    13 +
 .../src/ITagHelperDescriptorProvider.cs       |    12 +
 .../src/ITagHelperFeature.cs                  |    12 +
 ...SharpCodeAttributeValueIntermediateNode.cs |    31 +
 .../CSharpCodeIntermediateNode.cs             |    27 +
 ...xpressionAttributeValueIntermediateNode.cs |    31 +
 .../CSharpExpressionIntermediateNode.cs       |    27 +
 .../ClassDeclarationIntermediateNode.cs       |    45 +
 .../src/Intermediate/CommonAnnotations.cs     |    21 +
 .../Intermediate/DebuggerDisplayFormatter.cs  |    21 +
 .../DefaultRazorIntermediateNodeBuilder.cs    |   102 +
 .../Intermediate/DirectiveIntermediateNode.cs |    32 +
 .../DirectiveTokenIntermediateNode.cs         |    28 +
 .../Intermediate/DocumentIntermediateNode.cs  |    36 +
 .../DocumentIntermediateNodeExtensions.cs     |    99 +
 .../Intermediate/ExtensionIntermediateNode.cs |    41 +
 .../FieldDeclarationIntermediateNode.cs       |    38 +
 .../HtmlAttributeIntermediateNode.cs          |    37 +
 .../HtmlAttributeValueIntermediateNode.cs     |    31 +
 .../HtmlContentIntermediateNode.cs            |    27 +
 .../IExtensionIntermediateNodeVisitor.cs      |    10 +
 .../src/Intermediate/InputDocumentKind.cs     |    12 +
 .../src/Intermediate/IntermediateNode.cs      |    71 +
 .../Intermediate/IntermediateNodeBuilder.cs   |    34 +
 .../IntermediateNodeCollection.cs             |   198 +
 .../IntermediateNodeExtensions.cs             |    81 +
 .../Intermediate/IntermediateNodeFormatter.cs |    16 +
 .../IntermediateNodeFormatterBase.cs          |   180 +
 .../Intermediate/IntermediateNodeReference.cs |   209 +
 .../Intermediate/IntermediateNodeVisitor.cs   |   132 +
 .../Intermediate/IntermediateNodeWalker.cs    |    40 +
 .../src/Intermediate/IntermediateToken.cs     |    37 +
 .../MalformedDirectiveIntermediateNode.cs     |    32 +
 .../MemberDeclarationIntermediateNode.cs      |     9 +
 .../MethodDeclarationIntermediateNode.cs      |    60 +
 .../src/Intermediate/MethodParameter.cs       |    16 +
 .../NamespaceDeclarationIntermediateNode.cs   |    31 +
 .../PropertyDeclarationIntermediateNode.cs    |    29 +
 .../TagHelperBodyIntermediateNode.cs          |    22 +
 .../TagHelperHtmlAttributeIntermediateNode.cs |    34 +
 .../Intermediate/TagHelperIntermediateNode.cs |    57 +
 .../TagHelperPropertyIntermediateNode.cs      |    43 +
 .../src/Intermediate/TokenKind.cs             |    12 +
 .../src/Intermediate/TypeParameter.cs         |    10 +
 .../UsingDirectiveIntermediateNode.cs         |    31 +
 .../src/IntermediateNodePassBase.cs           |    45 +
 .../src/ItemCollection.cs                     |   124 +
 .../src/LargeTextSourceDocument.cs            |   159 +
 .../src/Legacy/AcceptedCharactersInternal.cs  |    22 +
 .../src/Legacy/AddImportChunkGenerator.cs     |    35 +
 .../src/Legacy/AddTagHelperChunkGenerator.cs  |    86 +
 .../src/Legacy/AutoCompleteEditHandler.cs     |    70 +
 .../src/Legacy/BalancingModes.cs              |    17 +
 .../src/Legacy/BlockKindInternal.cs           |    24 +
 .../src/Legacy/CSharpCodeParser.cs            |  2471 +++
 .../src/Legacy/CSharpKeyword.cs               |    88 +
 .../Legacy/CSharpLanguageCharacteristics.cs   |   176 +
 .../src/Legacy/CSharpTokenizer.cs             |   807 +
 .../src/Legacy/ClassifiedSpanInternal.cs      |    27 +
 .../src/Legacy/CodeBlockEditHandler.cs        |   127 +
 .../src/Legacy/DirectiveCSharpTokenizer.cs    |    63 +
 .../src/Legacy/DirectiveHtmlTokenizer.cs      |    57 +
 .../Legacy/DirectiveTokenChunkGenerator.cs    |    50 +
 .../src/Legacy/DisposableAction.cs            |    32 +
 .../src/Legacy/EditResult.cs                  |    19 +
 .../src/Legacy/ErrorSink.cs                   |    34 +
 .../src/Legacy/ExpressionChunkGenerator.cs    |    28 +
 ...tDirectiveCSharpLanguageCharacteristics.cs |    18 +
 ...rstDirectiveHtmlLanguageCharacteristics.cs |    18 +
 .../src/Legacy/HtmlLanguageCharacteristics.cs |   128 +
 .../src/Legacy/HtmlMarkupParser.cs            |  1951 ++
 .../src/Legacy/HtmlTokenizer.cs               |   296 +
 .../src/Legacy/ISpanChunkGenerator.cs         |     9 +
 .../src/Legacy/ITextBuffer.cs                 |    13 +
 .../src/Legacy/ITextDocument.cs               |    10 +
 .../src/Legacy/ITokenizer.cs                  |    12 +
 .../Legacy/ImplicitExpressionEditHandler.cs   |   626 +
 .../src/Legacy/KnownTokenType.cs              |    18 +
 .../src/Legacy/LanguageCharacteristics.cs     |   108 +
 .../src/Legacy/LegacySyntaxNodeExtensions.cs  |   248 +
 .../src/Legacy/LineTrackingStringBuffer.cs    |   173 +
 .../Legacy/LiteralAttributeChunkGenerator.cs  |    44 +
 .../src/Legacy/LocationTagged.cs              |    89 +
 .../src/Legacy/MarkupChunkGenerator.cs        |    13 +
 .../src/Legacy/ParserBase.cs                  |    15 +
 .../src/Legacy/ParserContext.cs               |   112 +
 .../src/Legacy/ParserHelpers.cs               |   104 +
 .../src/Legacy/PartialParseResultInternal.cs  |    59 +
 .../src/Legacy/RazorParser.cs                 |    47 +
 .../src/Legacy/RazorSyntaxTreeExtensions.cs   |    38 +
 .../Legacy/RemoveTagHelperChunkGenerator.cs   |    86 +
 .../src/Legacy/SeekableTextReader.cs          |    76 +
 .../src/Legacy/SourceLocationTracker.cs       |   113 +
 .../src/Legacy/SpanChunkGenerator.cs          |    33 +
 .../src/Legacy/SpanContext.cs                 |    52 +
 .../src/Legacy/SpanEditHandler.cs             |   169 +
 .../src/Legacy/SpanKindInternal.cs            |    15 +
 .../src/Legacy/StatementChunkGenerator.cs     |    13 +
 .../src/Legacy/SyntaxConstants.cs             |    32 +
 .../src/Legacy/TagHelperAttributeNode.cs      |    29 +
 .../src/Legacy/TagHelperBlockRewriter.cs      |   649 +
 .../src/Legacy/TagHelperDirectiveType.cs      |    26 +
 .../src/Legacy/TagHelperParseTreeRewriter.cs  |   727 +
 .../TagHelperPrefixDirectiveChunkGenerator.cs |    67 +
 .../src/Legacy/TagHelperSpanInternal.cs       |    28 +
 .../src/Legacy/TextReaderExtensions.cs        |   167 +
 .../src/Legacy/Tokenizer.cs                   |   445 +
 .../src/Legacy/TokenizerBackedParser.cs       |   594 +
 .../src/Legacy/TokenizerView.cs               |    40 +
 .../src/Legacy/WhiteSpaceRewriter.cs          |    70 +
 ...Microsoft.AspNetCore.Razor.Language.csproj |    12 +
 .../src/NotFoundProjectItem.cs                |    40 +
 .../src/Properties/AssemblyInfo.cs            |    30 +
 .../src/Properties/Resources.Designer.cs      |  1918 ++
 ...ovideRazorExtensionInitializerAttribute.cs |    31 +
 .../src/RazorCSharpDocument.cs                |    69 +
 .../src/RazorCodeDocument.cs                  |    56 +
 .../src/RazorCodeDocumentExtensions.cs        |   222 +
 .../src/RazorCodeGenerationOptions.cs         |   104 +
 .../src/RazorCodeGenerationOptionsBuilder.cs  |    56 +
 .../src/RazorConfiguration.cs                 |   118 +
 .../src/RazorDiagnostic.cs                    |    64 +
 .../src/RazorDiagnosticCollection.cs          |   191 +
 .../src/RazorDiagnosticDescriptor.cs          |    65 +
 .../src/RazorDiagnosticFactory.cs             |   785 +
 .../src/RazorDiagnosticSeverity.cs            |    11 +
 .../src/RazorEngine.cs                        |   195 +
 .../src/RazorEngineBuilderExtensions.cs       |   163 +
 .../src/RazorEngineFeatureBase.cs             |    69 +
 .../src/RazorEnginePhaseBase.cs               |    86 +
 .../src/RazorExtension.cs                     |    10 +
 .../src/RazorExtensionInitializer.cs          |    10 +
 .../src/RazorLanguageVersion.cs               |   138 +
 .../src/RazorParserFeatureFlags.cs            |    57 +
 .../src/RazorParserOptions.cs                 |    66 +
 .../src/RazorParserOptionsBuilder.cs          |    26 +
 .../src/RazorProject.cs                       |   138 +
 .../src/RazorProjectEngine.cs                 |   232 +
 .../src/RazorProjectEngineBuilder.cs          |    20 +
 .../RazorProjectEngineBuilderExtensions.cs    |   265 +
 .../src/RazorProjectEngineFeatureBase.cs      |    31 +
 .../src/RazorProjectFileSystem.cs             |    27 +
 .../src/RazorProjectItem.cs                   |   122 +
 .../src/RazorSourceDocument.cs                |   294 +
 .../src/RazorSourceDocumentProperties.cs      |    57 +
 .../src/RazorSourceLineCollection.cs          |    14 +
 .../src/RazorSyntaxTree.cs                    |    71 +
 .../src/RazorTemplateEngine.cs                |   241 +
 .../src/RazorTemplateEngineOptions.cs         |    21 +
 .../src/RequiredAttributeDescriptor.cs        |    96 +
 .../src/RequiredAttributeDescriptorBuilder.cs |    18 +
 .../RequiredAttributeDescriptorComparer.cs    |    77 +
 .../src/Resources.resx                        |   545 +
 .../src/SourceChange.cs                       |   139 +
 .../src/SourceLocation.cs                     |   135 +
 .../src/SourceMapping.cs                      |    53 +
 .../src/SourceSpan.cs                         |   124 +
 .../src/StreamSourceDocument.cs               |   119 +
 .../src/StringSourceDocument.cs               |   105 +
 .../src/SuppressChecksumOptionsFeature.cs     |    22 +
 .../src/Syntax/ArrayElement.cs                |    58 +
 .../src/Syntax/ChildSyntaxList.cs             |   710 +
 .../Syntax.xml.Internal.Generated.cs          |  4264 +++++
 .../Generated/Syntax.xml.Main.Generated.cs    |  1246 ++
 .../Generated/Syntax.xml.Syntax.Generated.cs  |  3178 ++++
 .../src/Syntax/GreenNode.cs                   |   583 +
 .../src/Syntax/GreenNodeExtensions.cs         |    58 +
 .../InternalSyntax/RazorDirectiveSyntax.cs    |    34 +
 .../Syntax/InternalSyntax/RazorSyntaxNode.cs  |    27 +
 .../Syntax/InternalSyntax/SyntaxFactory.cs    |    26 +
 .../src/Syntax/InternalSyntax/SyntaxList.cs   |   428 +
 .../InternalSyntax/SyntaxListBuilder.cs       |   201 +
 .../InternalSyntax/SyntaxListBuilderOfT.cs    |   115 +
 .../Syntax/InternalSyntax/SyntaxListOfT.cs    |   187 +
 .../Syntax/InternalSyntax/SyntaxListPool.cs   |   100 +
 .../Syntax/InternalSyntax/SyntaxRewriter.cs   |    56 +
 .../src/Syntax/InternalSyntax/SyntaxToken.cs  |   226 +
 .../src/Syntax/InternalSyntax/SyntaxTrivia.cs |   100 +
 .../Syntax/InternalSyntax/SyntaxVisitor.cs    |    60 +
 .../src/Syntax/MarkupElementRewriter.cs       |   290 +
 ...MarkupMinimizedTagHelperAttributeSyntax.cs |    33 +
 .../Syntax/MarkupTagHelperAttributeSyntax.cs  |    33 +
 .../Syntax/MarkupTagHelperElementSyntax.cs    |    33 +
 .../src/Syntax/NodeFlags.cs                   |    21 +
 .../src/Syntax/ObjectPool.cs                  |   248 +
 .../src/Syntax/RazorDirectiveSyntax.cs        |    33 +
 .../src/Syntax/RazorSyntaxNode.cs             |    13 +
 .../src/Syntax/SpecializedCollections.cs      |   169 +
 .../src/Syntax/Syntax.xml                     |   230 +
 .../src/Syntax/SyntaxAnnotation.cs            |    93 +
 .../src/Syntax/SyntaxExtensions.cs            |    53 +
 .../src/Syntax/SyntaxFactory.cs               |    23 +
 .../src/Syntax/SyntaxKind.cs                  |   136 +
 .../src/Syntax/SyntaxList.cs                  |   123 +
 .../src/Syntax/SyntaxListBuilder.cs           |   172 +
 .../src/Syntax/SyntaxListBuilderExtensions.cs |    29 +
 .../src/Syntax/SyntaxListBuilderOfT.cs        |    93 +
 .../src/Syntax/SyntaxListOfT.cs               |   606 +
 .../src/Syntax/SyntaxNode.Iterators.cs        |   126 +
 .../src/Syntax/SyntaxNode.cs                  |   413 +
 .../src/Syntax/SyntaxNodeExtensions.cs        |   339 +
 .../src/Syntax/SyntaxReplacer.cs              |   207 +
 .../src/Syntax/SyntaxRewriter.cs              |   148 +
 .../src/Syntax/SyntaxSerializer.cs            |   304 +
 .../src/Syntax/SyntaxToken.cs                 |   105 +
 .../src/Syntax/SyntaxTrivia.cs                |    59 +
 .../src/Syntax/SyntaxTriviaList.cs            |   785 +
 .../src/Syntax/SyntaxTriviaListBuilder.cs     |   138 +
 .../src/Syntax/SyntaxVisitor.cs               |    70 +
 .../src/Syntax/SyntaxWalker.cs                |    55 +
 .../src/Syntax/TextSpan.cs                    |   261 +
 .../src/TagHelperAttributeInfo.cs             |    24 +
 .../src/TagHelperBinder.cs                    |   137 +
 .../src/TagHelperBinding.cs                   |    42 +
 .../src/TagHelperConventions.cs               |    12 +
 .../src/TagHelperDescriptor.cs                |    89 +
 .../src/TagHelperDescriptorBuilder.cs         |    77 +
 .../TagHelperDescriptorBuilderExtensions.cs   |    40 +
 .../src/TagHelperDescriptorComparer.cs        |   155 +
 .../src/TagHelperDescriptorExtensions.cs      |    42 +
 .../src/TagHelperDescriptorProviderContext.cs |    48 +
 .../src/TagHelperDocumentContext.cs           |    46 +
 .../src/TagHelperInfo.cs                      |    24 +
 .../src/TagHelperMatchingConventions.cs       |   186 +
 .../src/TagHelperMetadata.cs                  |    20 +
 .../src/TagHelperSpanVisitor.cs               |    31 +
 .../src/TagMatchingRuleDescriptor.cs          |    62 +
 .../src/TagMatchingRuleDescriptorBuilder.cs   |    23 +
 .../src/TagMatchingRuleDescriptorComparer.cs  |    77 +
 .../src/TagMode.cs                            |    26 +
 .../src/TagStructure.cs                       |    28 +
 .../src/VirtualRazorProjectFileSystem.cs      |   215 +
 .../src/baseline.netcore.json                 | 15598 ++++++++++++++++
 .../src/baseline.netframework.json            | 13608 ++++++++++++++
 .../src/breakingchanges.netcore.json          |    15 +
 .../src/breakingchanges.netframework.json     |    15 +
 .../src/Application.cs                        |   114 +
 .../src/CachingMetadataReference.cs           |    32 +
 .../src/Client.cs                             |   200 +
 .../src/CommandBase.cs                        |    59 +
 .../src/CompilerHost.cs                       |   134 +
 .../src/CompositeRazorProjectFileSystem.cs    |    46 +
 .../src/ConcurrentLruCache.cs                 |   207 +
 .../src/Connection.cs                         |    28 +
 .../src/ConnectionHost.cs                     |   148 +
 .../src/ConnectionResult.cs                   |    47 +
 .../src/DebugMode.cs                          |    27 +
 .../src/DefaultExtensionAssemblyLoader.cs     |   241 +
 .../src/DefaultExtensionDependencyChecker.cs  |   158 +
 .../src/DefaultRequestDispatcher.cs           |   472 +
 .../src/DiscoverCommand.cs                    |   224 +
 .../src/EventBus.cs                           |    68 +
 .../src/ExtensionAssemblyLoader.cs            |    16 +
 .../src/ExtensionDependencyChecker.cs         |    12 +
 .../src/GenerateCommand.cs                    |   372 +
 .../src/Memory.cs                             |    13 +
 .../src/MetadataCache.cs                      |    86 +
 .../src/MetadataReaderExtensions.cs           |    94 +
 .../Microsoft.AspNetCore.Razor.Tools.csproj   |    45 +
 .../src/MutexName.cs                          |    22 +
 .../src/PipeName.cs                           |    60 +
 .../src/Program.cs                            |    53 +
 .../src/Properties/AssemblyInfo.cs            |     9 +
 .../src/RequestDispatcher.cs                  |    29 +
 .../src/ServerCommand.cs                      |   188 +
 .../ServerProtocol/CompletedServerResponse.cs |    58 +
 .../MismatchedVersionServerResponse.cs        |    17 +
 .../src/ServerProtocol/NativeMethods.cs       |    89 +
 .../ServerProtocol/RejectedServerResponse.cs  |    17 +
 .../src/ServerProtocol/RequestArgument.cs     |    72 +
 .../src/ServerProtocol/ServerConnection.cs    |   390 +
 .../src/ServerProtocol/ServerLogger.cs        |   146 +
 .../src/ServerProtocol/ServerPaths.cs         |    33 +
 .../src/ServerProtocol/ServerProtocol.cs      |    70 +
 .../src/ServerProtocol/ServerRequest.cs       |   216 +
 .../src/ServerProtocol/ServerResponse.cs      |   132 +
 .../ServerProtocol/ShutdownServerResponse.cs  |    30 +
 .../src/ShadowCopyManager.cs                  |   169 +
 .../src/ShutdownCommand.cs                    |    97 +
 .../CompositeRazorProjectFileSystemTest.cs    |    81 +
 .../test/ConcurrentLruCacheTest.cs            |   120 +
 .../DefaultExtensionAssemblyLoaderTest.cs     |   128 +
 .../DefaultExtensionDependencyCheckerTest.cs  |   111 +
 .../test/DefaultRequestDispatcherTest.cs      |   572 +
 .../test/Infrastructure/ServerData.cs         |    49 +
 .../test/Infrastructure/ServerStats.cs        |    17 +
 .../test/Infrastructure/ServerUtilities.cs    |   156 +
 .../test/Infrastructure/TestableEventBus.cs   |    64 +
 .../test/LoaderTestResources.cs               |   146 +
 .../test/MetadataCacheTest.cs                 |   103 +
 ...crosoft.AspNetCore.Razor.Tools.Test.csproj |    21 +
 .../test/MvcShim.cs                           |    45 +
 .../test/Properties/AssemblyInfo.cs           |     6 +
 .../test/ServerCommandTest.cs                 |   119 +
 .../test/ServerLifecycleTest.cs               |   291 +
 .../test/ServerProtocol/ServerProtocolTest.cs |   128 +
 .../test/TempDirectory.cs                     |    30 +
 .../TestDefaultExtensionAssemblyLoader.cs     |    25 +
 .../src/AssemblyIdentityEqualityComparer.cs   |    50 +
 .../src/CompilationTagHelperFeature.cs        |    50 +
 .../ComponentTagHelperDescriptorProvider.cs   |   132 +
 .../src/DefaultMetadataReferenceFeature.cs    |    13 +
 .../src/DefaultTagHelperDescriptorFactory.cs  |   439 +
 .../src/DefaultTagHelperDescriptorProvider.cs |    75 +
 .../src/FilePathComparer.cs                   |    30 +
 .../src/IMetadataReferenceFeature.cs          |    13 +
 .../src/Microsoft.CodeAnalysis.Razor.csproj   |    16 +
 .../src/Properties/AssemblyInfo.cs            |    17 +
 .../src/Properties/Resources.Designer.cs      |   142 +
 .../src/RazorDiagnosticFactory.cs             |   175 +
 .../src/RazorLanguage.cs                      |    14 +
 .../src/RequiredAttributeParser.cs            |   304 +
 .../src/Resources.resx                        |   144 +
 .../src/SourceSpanExtensions.cs               |    16 +
 ...lperDescriptorProviderContextExtensions.cs |    31 +
 .../src/TagHelperTypeVisitor.cs               |    51 +
 .../src/TagHelperTypes.cs                     |    39 +
 .../src/TextChangeExtensions.cs               |    22 +
 .../src/TextSpanExtensions.cs                 |    16 +
 .../src/baseline.netcore.json                 |   360 +
 .../src/baseline.netframework.json            |   349 +
 .../test/CompilationTagHelperFeatureTest.cs   |   131 +
 .../DefaultTagHelperDescriptorFactoryTest.cs  |  2382 +++
 .../DefaultTagHelperDescriptorProviderTest.cs |    54 +
 .../Microsoft.CodeAnalysis.Razor.Test.csproj  |    31 +
 .../TagHelperDescriptorFactoryTagHelpers.cs   |   463 +
 .../test/TagHelperTypeVisitorTest.cs          |   118 +
 .../test/xunit.runner.json                    |     4 +
 .../src/DotnetToolTask.cs                     |   274 +
 .../src/Microsoft.NET.Sdk.Razor.csproj        |    96 +
 .../src/Microsoft.NET.Sdk.Razor.nuspec        |    25 +
 .../src/RazorGenerate.cs                      |   155 +
 .../src/RazorTagHelper.cs                     |   133 +
 .../Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.props |    25 +
 .../src/Sdk/Sdk.targets                       |    23 +
 .../src/baseline.netcore.json                 |   762 +
 .../src/baseline.netframework.json            |   762 +
 ...osoft.NET.Sdk.Razor.CodeGeneration.targets |   180 +
 ...icrosoft.NET.Sdk.Razor.Compilation.targets |   182 +
 .../Microsoft.NET.Sdk.Razor.Component.targets |   285 +
 ...rosoft.NET.Sdk.Razor.Configuration.targets |    92 +
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets |    60 +
 ...NET.Sdk.Razor.GenerateAssemblyInfo.targets |   185 +
 .../Microsoft.NET.Sdk.Razor.props             |    17 +
 .../Rules/RazorConfiguration.xaml             |    29 +
 .../netstandard2.0/Rules/RazorExtension.xaml  |    37 +
 .../netstandard2.0/Rules/RazorGeneral.xaml    |    36 +
 .../Rules/RazorGenerateWithTargetPath.xaml    |    30 +
 .../Sdk.Razor.CurrentVersion.props            |    86 +
 .../Sdk.Razor.CurrentVersion.targets          |   722 +
 .../Microsoft.NET.Sdk.Razor.props             |    17 +
 ...azor.CurrentVersion.MultiTargeting.targets |    22 +
 .../test/BuildVariables.cs                    |    41 +
 .../test/BuildVariables.cs.template           |    15 +
 .../test/IntegrationTests/Assert.cs           |   733 +
 .../BuildIncrementalismTest.cs                |   360 +
 .../IntegrationTests/BuildIntegrationTest.cs  |   684 +
 .../BuildIntrospectionTest.cs                 |    76 +
 .../IntegrationTests/BuildPerformanceTest.cs  |   109 +
 .../BuildServerIntegrationTest.cs             |   266 +
 .../BuildServerTestFixture.cs                 |    62 +
 .../BuildWithComponentsIntegrationTest.cs     |    41 +
 .../ConfigurationMetadataIntegrationTest.cs   |    71 +
 .../DesignTimeBuildIntegrationTest.cs         |    68 +
 .../test/IntegrationTests/FIleThumbPrint.cs   |    49 +
 .../InitializeTestProjectAttribute.cs         |    54 +
 .../MSBuildIntegrationTestBase.cs             |   173 +
 .../IntegrationTests/MSBuildProcessKind.cs    |    14 +
 .../IntegrationTests/MSBuildProcessManager.cs |   152 +
 .../test/IntegrationTests/MSBuildResult.cs    |    27 +
 .../IntegrationTests/PackIntegrationTest.cs   |   180 +
 .../test/IntegrationTests/ProjectDirectory.cs |   187 +
 .../PublishIntegrationTest.cs                 |   446 +
 .../RazorCompileIntegrationTest.cs            |   114 +
 .../RazorGenerateIntegrationTest.cs           |   358 +
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |    54 +
 .../test/xunit.runner.json                    |     5 +
 .../TestCodeRenderingContext.cs               |    99 +
 .../CompilationFailedException.cs             |    58 +
 .../IntegrationTests/CompiledAssembly.cs      |    24 +
 .../IntegrationTests/CompiledCSharpCode.cs    |    21 +
 .../IntegrationTests/IntegrationTestBase.cs   |   639 +
 .../IntermediateNodeSerializer.cs             |    46 +
 .../IntermediateNodeVerifier.cs               |   275 +
 .../IntermediateNodeWriter.cs                 |   306 +
 .../IntializeTestFileAttribute.cs             |    28 +
 .../RazorDiagnosticSerializer.cs              |    13 +
 .../SourceMappingsSerializer.cs               |    48 +
 .../Intermediate/IntermediateNodeAssert.cs    |   495 +
 .../ClassifiedSpanSerializer.cs               |    22 +
 .../ClassifiedSpan/ClassifiedSpanVerifier.cs  |   111 +
 .../ClassifiedSpan/ClassifiedSpanWriter.cs    |    56 +
 .../Legacy/IntializeTestFileAttribute.cs      |    36 +
 .../Language/Legacy/ParserTestBase.cs         |   463 +
 .../Language/Legacy/SyntaxNodeSerializer.cs   |    61 +
 .../Language/Legacy/SyntaxNodeVerifier.cs     |   296 +
 .../Language/Legacy/SyntaxNodeWalker.cs       |    37 +
 .../Language/Legacy/SyntaxNodeWriter.cs       |   219 +
 .../TagHelperSpan/TagHelperSpanSerializer.cs  |    22 +
 .../TagHelperSpan/TagHelperSpanVerifier.cs    |   111 +
 .../TagHelperSpan/TagHelperSpanWriter.cs      |    62 +
 .../Language/RazorEngineBuilderExtensions.cs  |    71 +
 .../RazorProjectEngineBuilderExtensions.cs    |    70 +
 .../Language/SyntaxTreeVerifier.cs            |    46 +
 ...undAttributeDescriptorBuilderExtensions.cs |   123 +
 .../Language/TestFile.cs                      |    89 +
 .../Language/TestProject.cs                   |    28 +
 .../Language/TestRazorCodeDocument.cs         |    27 +
 .../Language/TestRazorProjectFileSystem.cs    |    41 +
 .../Language/TestRazorProjectItem.cs          |    49 +
 .../Language/TestRazorSourceDocument.cs       |   113 +
 ...redAttributeDescriptorBuilderExtensions.cs |    69 +
 ...estTagHelperDescriptorBuilderExtensions.cs |   122 +
 .../Language/TestTagHelperFeature.cs          |    27 +
 ...MatchingRuleDescriptorBuilderExtensions.cs |    72 +
 ...rosoft.AspNetCore.Razor.Test.Common.csproj |    22 +
 .../Properties/AssemblyInfo.cs                |    15 +
 .../TestCompilation.cs                        |    71 +
 ...NetCore.Razor.Test.MvcShim.ClassLib.csproj |    19 +
 .../HelperResult.cs                           |    22 +
 .../IRazorPage.cs                             |    31 +
 .../RazorInjectAttribute.cs                   |    14 +
 .../RazorPage.cs                              |    55 +
 .../RazorPageOfT.cs                           |    14 +
 .../RenderAsyncDelegate.cs                    |    10 +
 .../IHtmlHelperOfT.cs                         |     9 +
 .../IJsonHelper.cs                            |    10 +
 .../ViewContext.cs                            |    12 +
 .../IModelExpressionProvider.cs               |    15 +
 .../ITempDataDictionary.cs                    |     9 +
 .../IViewContextAware.cs                      |    12 +
 .../ModelExpression.cs                        |     9 +
 .../ViewContextAttribute.cs                   |    11 +
 .../ViewDataDictionary.cs                     |    92 +
 .../ViewDataDictionaryOfT.cs                  |     7 +
 .../Microsoft.AspNetCore.Mvc/IUrlHelper.cs    |    10 +
 .../IViewComponentHelper.cs                   |    16 +
 .../ViewComponentAttribute.cs                 |    11 +
 ...tCore.Razor.Test.MvcShim.Version1_X.csproj |    16 +
 .../xunit.runner.json                         |     3 +
 ...iledRazorAssemblyApplicationPartFactory.cs |    10 +
 .../ProvideApplicationPartFactoryAttribute.cs |    19 +
 .../RelatedAssemblyAttribute.cs               |    15 +
 .../HelperResult.cs                           |    22 +
 .../RazorInjectAttribute.cs                   |    14 +
 .../RazorPage.cs                              |    48 +
 .../RazorPageBase.cs                          |   165 +
 .../RazorPageOfT.cs                           |    14 +
 .../RazorViewAttribute.cs                     |    27 +
 .../RenderAsyncDelegate.cs                    |     9 +
 .../Page.cs                                   |    32 +
 .../PageContext.cs                            |    12 +
 .../PageModel.cs                              |    43 +
 .../RazorPageAttribute.cs                     |    19 +
 .../IHtmlHelperOfT.cs                         |     9 +
 .../IJsonHelper.cs                            |    10 +
 .../ViewContext.cs                            |    12 +
 .../IModelExpressionProvider.cs               |    15 +
 .../ITempDataDictionary.cs                    |     9 +
 .../IViewContextAware.cs                      |    12 +
 .../ModelExpression.cs                        |     9 +
 .../ViewContextAttribute.cs                   |    11 +
 .../ViewDataDictionary.cs                     |    92 +
 .../ViewDataDictionaryOfT.cs                  |     7 +
 .../Microsoft.AspNetCore.Mvc/ActionResult.cs  |    10 +
 .../Microsoft.AspNetCore.Mvc/IActionResult.cs |     9 +
 .../Microsoft.AspNetCore.Mvc/IUrlHelper.cs    |    10 +
 .../IViewComponentHelper.cs                   |    16 +
 .../RedirectResult.cs                         |    10 +
 .../ViewComponentAttribute.cs                 |    11 +
 ...tCore.Razor.Test.MvcShim.Version2_X.csproj |    16 +
 .../xunit.runner.json                         |     3 +
 .../Component.cs                              |    16 +
 .../IComponent.cs                             |     9 +
 .../RenderTree/RenderTreeBuilder.cs           |     9 +
 ...iledRazorAssemblyApplicationPartFactory.cs |    10 +
 .../ProvideApplicationPartFactoryAttribute.cs |    19 +
 .../RelatedAssemblyAttribute.cs               |    15 +
 .../HelperResult.cs                           |    22 +
 .../RazorInjectAttribute.cs                   |    14 +
 .../RazorPage.cs                              |    48 +
 .../RazorPageBase.cs                          |   165 +
 .../RazorPageOfT.cs                           |    14 +
 .../RazorViewAttribute.cs                     |    27 +
 .../RenderAsyncDelegate.cs                    |     9 +
 .../Page.cs                                   |    32 +
 .../PageContext.cs                            |    12 +
 .../PageModel.cs                              |    43 +
 .../RazorPageAttribute.cs                     |    19 +
 .../IHtmlHelperOfT.cs                         |     9 +
 .../IJsonHelper.cs                            |    10 +
 .../ViewContext.cs                            |    12 +
 .../IModelExpressionProvider.cs               |    15 +
 .../ITempDataDictionary.cs                    |     9 +
 .../IViewContextAware.cs                      |    12 +
 .../ModelExpression.cs                        |     9 +
 .../ViewContextAttribute.cs                   |    11 +
 .../ViewDataDictionary.cs                     |    92 +
 .../ViewDataDictionaryOfT.cs                  |     7 +
 .../Microsoft.AspNetCore.Mvc/ActionResult.cs  |    10 +
 .../Microsoft.AspNetCore.Mvc/IActionResult.cs |     9 +
 .../Microsoft.AspNetCore.Mvc/IUrlHelper.cs    |    10 +
 .../IViewComponentHelper.cs                   |    16 +
 .../RedirectResult.cs                         |    10 +
 .../ViewComponentAttribute.cs                 |    11 +
 ...osoft.AspNetCore.Razor.Test.MvcShim.csproj |    16 +
 .../xunit.runner.json                         |     3 +
 .../AppWithP2PReference.csproj                |    34 +
 .../Models/ErrorViewModel.cs                  |    11 +
 .../testassets/AppWithP2PReference/Program.cs |    13 +
 .../Views/Home/About.cshtml                   |     7 +
 .../Views/Home/Contact.cshtml                 |    17 +
 .../Views/Home/Index.cshtml                   |   108 +
 .../Views/Shared/Error.cshtml                 |    22 +
 .../Shared/_ValidationScriptsPartial.cshtml   |    18 +
 .../Views/_ViewImports.cshtml                 |     3 +
 .../Views/_ViewStart.cshtml                   |     3 +
 .../test/testassets/ClassLibrary/Class1.cs    |     7 +
 .../ClassLibrary/ClassLibrary.csproj          |    40 +
 .../ClassLibrary/Views/Shared/_Layout.cshtml  |    71 +
 .../ClassLibrary/Views/_ViewImports.cshtml    |     2 +
 .../test/testassets/ClassLibrary2/Class2.cs   |    13 +
 .../ClassLibrary2/ClassLibrary2.csproj        |    39 +
 .../ClassLibrary2/Views/Shared/Index.cshtml   |     2 +
 .../ClassLibrary2/Views/_ViewImports.cshtml   |     2 +
 .../Areas/MyFeature/Pages/Page1.cshtml        |    16 +
 .../Areas/MyFeature/Pages/Page1.cshtml.cs     |    17 +
 .../ClassLibraryMvc21.csproj                  |    18 +
 .../test/testassets/Directory.Build.props     |    35 +
 .../test/testassets/Directory.Build.targets   |     9 +
 .../LargeProject/LargeProject.csproj          |    31 +
 .../LargeProject/Views/Home/View000.cshtml    |    71 +
 .../LargeProject/Views/Home/View001.cshtml    |     7 +
 .../LargeProject/Views/Home/View002.cshtml    |   108 +
 .../LargeProject/Views/Home/View003.cshtml    |    17 +
 .../LargeProject/Views/Shared/_Layout.cshtml  |    71 +
 .../Views/Shared/_ViewImports.cshtml          |     2 +
 .../Views/Shared/_ViewStart.cshtml            |     3 +
 .../LinkedDir/LinkedErrorFile.cshtml          |     1 +
 .../testassets/LinkedDir/LinkedFile.cshtml    |     1 +
 .../testassets/LinkedDir/LinkedFile2.cshtml   |     1 +
 .../testassets/LinkedDir/LinkedFile3.cshtml   |     1 +
 .../Models/ErrorViewModel.cs                  |    11 +
 .../MvcWithComponents.csproj                  |    31 +
 .../testassets/MvcWithComponents/Program.cs   |    13 +
 .../MvcWithComponents/TestComponent.razor     |     1 +
 .../MvcWithComponents/Views/Home/Index.cshtml |     5 +
 .../Views/Shared/NavMenu.razor                |     2 +
 .../Views/_ViewImports.cshtml                 |     3 +
 .../MvcWithComponents/Views/_ViewStart.cshtml |     3 +
 .../RazorTest.Introspection.targets           |    28 +
 .../SimpleMvc/Models/ErrorViewModel.cs        |    11 +
 .../test/testassets/SimpleMvc/Program.cs      |    13 +
 .../testassets/SimpleMvc/SimpleMvc.csproj     |    31 +
 .../testassets/SimpleMvc/SimpleTagHelper.cs   |     8 +
 .../SimpleMvc/Views/Home/About.cshtml         |     7 +
 .../SimpleMvc/Views/Home/Contact.cshtml       |    17 +
 .../SimpleMvc/Views/Home/Index.cshtml         |   108 +
 .../SimpleMvc/Views/Shared/Error.cshtml       |    22 +
 .../SimpleMvc/Views/Shared/_Layout.cshtml     |    71 +
 .../Shared/_ValidationScriptsPartial.cshtml   |    18 +
 .../SimpleMvc/Views/_ViewImports.cshtml       |     3 +
 .../SimpleMvc/Views/_ViewStart.cshtml         |     3 +
 .../testassets/SimpleMvc/wwwroot/css/site.css |    37 +
 .../SimpleMvc/wwwroot/js/SimpleMvc.js         |     1 +
 .../SimpleMvc21/Models/ErrorViewModel.cs      |    11 +
 .../test/testassets/SimpleMvc21/Program.cs    |    13 +
 .../testassets/SimpleMvc21/SimpleMvc21.csproj |    31 +
 .../SimpleMvc21/Views/Home/About.cshtml       |     7 +
 .../SimpleMvc21/Views/Home/Index.cshtml       |   108 +
 .../SimpleMvc21/Views/Shared/_Layout.cshtml   |    71 +
 .../Shared/_ValidationScriptsPartial.cshtml   |    18 +
 .../SimpleMvc21/Views/_ViewImports.cshtml     |     4 +
 .../SimpleMvc21/Views/_ViewStart.cshtml       |     3 +
 .../SimpleMvcFSharp/Models/ErrorViewModel.fs  |     8 +
 .../testassets/SimpleMvcFSharp/Program.fs     |    11 +
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |    36 +
 .../SimpleMvcFSharp/Views/Home/About.cshtml   |     7 +
 .../SimpleMvcFSharp/Views/_ViewImports.cshtml |     2 +
 .../Areas/Products/Pages/Index.cshtml         |   107 +
 .../Areas/Products/Pages/_ViewImports.cshtml  |     3 +
 .../Areas/Products/Pages/_ViewStart.cshtml    |     3 +
 .../testassets/SimplePages/Pages/About.cshtml |     9 +
 .../SimplePages/Pages/About.cshtml.cs         |    18 +
 .../SimplePages/Pages/Contact.cshtml          |    19 +
 .../SimplePages/Pages/Contact.cshtml.cs       |    18 +
 .../testassets/SimplePages/Pages/Index.cshtml |   108 +
 .../SimplePages/Pages/Index.cshtml.cs         |    17 +
 .../SimplePages/Pages/_Layout.cshtml          |    71 +
 .../SimplePages/Pages/_ViewImports.cshtml     |     3 +
 .../SimplePages/Pages/_ViewStart.cshtml       |     3 +
 .../test/testassets/SimplePages/Program.cs    |    10 +
 .../testassets/SimplePages/SimplePages.csproj |    31 +
 .../RazorDiagnosticJsonConverter.cs           |    66 +
 1290 files changed, 153085 insertions(+)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ExtensionInitializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IInjectTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IViewComponentTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/LegacySectionTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelExpressionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcViewDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensionsDiagnosticFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Resources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/TagHelperDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentResources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperConventions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperMetadata.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypes.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcImportProjectFeatureTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcShim.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/SourceMappingsSerializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TagHelperDescriptorExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTypeVisitorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/xunit.runner.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/AssemblyAttributeInjectionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ExtensionInitializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IInjectTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IViewComponentTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InstrumentationPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelExpressionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcViewDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/NamespaceDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PageDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PagesPropertyInjectionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensionsDiagnosticFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Resources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/TagHelperDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentResources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperConventions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperMetadata.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypes.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netcore.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netframework.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InstrumentationPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelExpressionPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcImportProjectFeatureTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcShim.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/NamespaceDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/PageDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/SourceMappingsSerializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TagHelperDescriptorExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/xunit.runner.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ExtensionInitializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IInjectTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IViewComponentTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelExpressionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PageDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PagesPropertyInjectionPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensionsDiagnosticFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/TagHelperDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentResources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperConventions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperMetadata.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypes.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netcore.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netframework.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netcore.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netframework.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcImportProjectFeatureTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcShim.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/PageDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/SourceMappingsSerializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TagHelperDescriptorExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/xunit.runner.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/AssemblyExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/AttributeStructure.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Checksum.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTarget.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTargetBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTarget.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTargetBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/ICodeTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LiteralRuntimeNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperRenderingContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPassFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultImportProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDiagnostic.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveClassifierPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDocumentClassifierPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngineBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorOptimizationPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParsingPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngineBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSourceLineCollection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTreePhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTargetExtensionFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveKind.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveRemovalOptimizationPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenEditHandler.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveUsage.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultMetadataIdentifierFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperBodyIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperCreateIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperExecuteIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperOptimizationPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperPropertyIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDefaultTagHelperTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDesignTimeDirectiveTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataAttributeTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataIdentifierFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IPreallocatedAttributeTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ISectionTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ITemplateTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributeTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedAttributeTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlConventions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlNodeOptimizationPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorCodeGenerationOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorParserOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IDirectiveDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IImportProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCSharpLoweringPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEnginePhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorIntermediateNodeLoweringPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParsingPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorProjectEngineFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTagHelperBinderPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTargetExtensionFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ClassDeclarationIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CommonAnnotations.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DebuggerDisplayFormatter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DefaultRazorIntermediateNodeBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveTokenIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ExtensionIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeValueIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IExtensionIntermediateNodeVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatterBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeReference.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeWalker.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateToken.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MalformedDirectiveIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MemberDeclarationIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodDeclarationIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodParameter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/NamespaceDeclarationIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/PropertyDeclarationIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperBodyIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TokenKind.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TypeParameter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/UsingDirectiveIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/IntermediateNodePassBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/LargeTextSourceDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AcceptedCharactersInternal.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddTagHelperChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AutoCompleteEditHandler.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BlockKindInternal.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpKeyword.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ClassifiedSpanInternal.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveCSharpTokenizer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveTokenChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DisposableAction.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/EditResult.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ErrorSink.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ExpressionChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ISpanChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextBuffer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITokenizer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ImplicitExpressionEditHandler.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/KnownTokenType.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LiteralAttributeChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LocationTagged.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/MarkupChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/PartialParseResultInternal.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RemoveTagHelperChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SeekableTextReader.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SourceLocationTracker.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanEditHandler.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanKindInternal.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/StatementChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SyntaxConstants.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperAttributeNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperDirectiveType.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperSpanInternal.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TextReaderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerView.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/WhiteSpaceRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ProvideRazorExtensionInitializerAttribute.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorConfiguration.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnostic.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineFeatureBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEnginePhaseBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtensionInitializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineFeatureBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocumentProperties.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceLineCollection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceChange.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceLocation.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceMapping.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceSpan.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/StreamSourceDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/StringSourceDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/SuppressChecksumOptionsFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ArrayElement.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ChildSyntaxList.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNodeExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorDirectiveSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorSyntaxNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxList.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListOfT.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListPool.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxToken.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxTrivia.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperAttributeSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperElementSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/NodeFlags.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ObjectPool.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorDirectiveSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorSyntaxNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SpecializedCollections.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxAnnotation.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxList.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListOfT.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.Iterators.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxReplacer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxToken.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTrivia.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaList.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaListBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/TextSpan.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperConventions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorProviderContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDocumentContext.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperSpanVisitor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagStructure.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netcore.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netframework.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netcore.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netframework.json
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Application.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CachingMetadataReference.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Client.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CommandBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompilerHost.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConcurrentLruCache.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Connection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionHost.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionResult.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DebugMode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionAssemblyLoader.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionDependencyChecker.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultRequestDispatcher.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/EventBus.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionAssemblyLoader.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionDependencyChecker.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Memory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataCache.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataReaderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MutexName.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/PipeName.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Program.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/RequestDispatcher.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerCommand.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/CompletedServerResponse.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/MismatchedVersionServerResponse.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/NativeMethods.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RejectedServerResponse.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RequestArgument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerConnection.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerLogger.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerPaths.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerProtocol.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerRequest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerResponse.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ShutdownServerResponse.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShadowCopyManager.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShutdownCommand.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ConcurrentLruCacheTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionDependencyCheckerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultRequestDispatcherTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerData.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerStats.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerUtilities.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/TestableEventBus.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/LoaderTestResources.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MetadataCacheTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MvcShim.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerCommandTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerProtocol/ServerProtocolTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TempDirectory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TestDefaultExtensionAssemblyLoader.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/AssemblyIdentityEqualityComparer.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilationTagHelperFeature.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultMetadataReferenceFeature.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparer.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/IMetadataReferenceFeature.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorDiagnosticFactory.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorLanguage.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/RequiredAttributeParser.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/SourceSpanExtensions.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperDescriptorProviderContextExtensions.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypeVisitor.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypes.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/TextSpanExtensions.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netcore.json
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netframework.json
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperDescriptorFactoryTagHelpers.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperTypeVisitorTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/xunit.runner.json
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/RazorTagHelper.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.props
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netcore.json
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netframework.json
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorConfiguration.xaml
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorExtension.xaml
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGeneral.xaml
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGenerateWithTargetPath.xaml
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/FIleThumbPrint.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessKind.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildResult.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/xunit.runner.json
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompilationFailedException.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledAssembly.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledCSharpCode.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/IntializeTestFileAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorSourceDocument.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperFeature.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/xunit.runner.json
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/xunit.runner.json
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Models/ErrorViewModel.cs
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Program.cs
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/Home/About.cshtml
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/Home/Contact.cshtml
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/Shared/Error.cshtml
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/AppWithP2PReference/Views/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/ClassLibrary/Class1.cs
 create mode 100644 src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
 create mode 100644 src/Razor/test/testassets/ClassLibrary/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/ClassLibrary2/Class2.cs
 create mode 100644 src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
 create mode 100644 src/Razor/test/testassets/ClassLibrary2/Views/Shared/Index.cshtml
 create mode 100644 src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml
 create mode 100644 src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml.cs
 create mode 100644 src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj
 create mode 100644 src/Razor/test/testassets/Directory.Build.props
 create mode 100644 src/Razor/test/testassets/Directory.Build.targets
 create mode 100644 src/Razor/test/testassets/LargeProject/LargeProject.csproj
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Home/View001.cshtml
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Home/View002.cshtml
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Home/View003.cshtml
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/LargeProject/Views/Shared/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml
 create mode 100644 src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml
 create mode 100644 src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml
 create mode 100644 src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Models/ErrorViewModel.cs
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Program.cs
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/TestComponent.razor
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Views/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/RazorTest.Introspection.targets
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Models/ErrorViewModel.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc/SimpleTagHelper.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/Home/About.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/Home/Contact.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/Shared/Error.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Views/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc/wwwroot/css/site.css
 create mode 100644 src/Razor/test/testassets/SimpleMvc/wwwroot/js/SimpleMvc.js
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Models/ErrorViewModel.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/SimpleMvc21.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Views/Home/About.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/Views/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvcFSharp/Models/ErrorViewModel.fs
 create mode 100644 src/Razor/test/testassets/SimpleMvcFSharp/Program.fs
 create mode 100644 src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
 create mode 100644 src/Razor/test/testassets/SimpleMvcFSharp/Views/Home/About.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvcFSharp/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Areas/Products/Pages/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/About.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/About.cshtml.cs
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml.cs
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/Index.cshtml.cs
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Pages/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/SimplePages/Program.cs
 create mode 100644 src/Razor/test/testassets/SimplePages/SimplePages.csproj
 create mode 100644 src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs
new file mode 100644
index 0000000000..4e34345903
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal static class CSharpIdentifier
+    {
+        private const string CshtmlExtension = ".cshtml";
+
+        public static string GetClassNameFromPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            if (path.EndsWith(CshtmlExtension, StringComparison.OrdinalIgnoreCase))
+            {
+                path = path.Substring(0, path.Length - CshtmlExtension.Length);
+            }
+
+            return SanitizeClassName(path);
+        }
+
+        // CSharp Spec §2.4.2
+        private static bool IsIdentifierStart(char character)
+        {
+            return char.IsLetter(character) ||
+                character == '_' ||
+                CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
+        }
+
+        public static bool IsIdentifierPart(char character)
+        {
+            return char.IsDigit(character) ||
+                   IsIdentifierStart(character) ||
+                   IsIdentifierPartByUnicodeCategory(character);
+        }
+
+        private static bool IsIdentifierPartByUnicodeCategory(char character)
+        {
+            var category = CharUnicodeInfo.GetUnicodeCategory(character);
+
+            return category == UnicodeCategory.NonSpacingMark || // Mn
+                category == UnicodeCategory.SpacingCombiningMark || // Mc
+                category == UnicodeCategory.ConnectorPunctuation || // Pc
+                category == UnicodeCategory.Format; // Cf
+        }
+
+        public static string SanitizeClassName(string inputName)
+        {
+            if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
+            {
+                inputName = "_" + inputName;
+            }
+
+            var builder = new StringBuilder(inputName.Length);
+            for (var i = 0; i < inputName.Length; i++)
+            {
+                var ch = inputName[i];
+                builder.Append(IsIdentifierPart(ch) ? ch : '_');
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ExtensionInitializer.cs
new file mode 100644
index 0000000000..51f16b552f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ExtensionInitializer.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal class ExtensionInitializer : RazorExtensionInitializer
+    {
+        public override void Initialize(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (builder.Configuration.ConfigurationName == "MVC-1.0")
+            {
+                RazorExtensions.Register(builder);
+            }
+            else if (builder.Configuration.ConfigurationName == "MVC-1.1")
+            {
+                RazorExtensions.Register(builder);
+                RazorExtensions.RegisterViewComponentTagHelpers(builder);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IInjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IInjectTargetExtension.cs
new file mode 100644
index 0000000000..781932ba8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IInjectTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public interface IInjectTargetExtension : ICodeTargetExtension
+    {
+        void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..45a0d581a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/IViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public interface IViewComponentTagHelperTargetExtension : ICodeTargetExtension
+    {
+        void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs
new file mode 100644
index 0000000000..f5ea583121
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs
@@ -0,0 +1,124 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class InjectDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "inject",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder
+                    .AddTypeToken(Resources.InjectDirective_TypeToken_Name, Resources.InjectDirective_TypeToken_Description)
+                    .AddMemberToken(Resources.InjectDirective_MemberToken_Name, Resources.InjectDirective_MemberToken_Description);
+
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = Resources.InjectDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @model and @namespace directives
+            public override int Order => 10;
+            
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+                var modelType = ModelDirective.GetModelType(documentNode);
+
+                var properties = new HashSet<string>(StringComparer.Ordinal);
+
+                for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+                {
+                    var directive = visitor.Directives[i];
+                    var tokens = directive.Tokens.ToArray();
+                    if (tokens.Length < 2)
+                    {
+                        continue;
+                    }
+
+                    var typeName = tokens[0].Content;
+                    var memberName = tokens[1].Content;
+
+                    if (!properties.Add(memberName))
+                    {
+                        continue;
+                    }
+
+                    typeName = typeName.Replace("<TModel>", "<" + modelType + ">");
+
+                    var injectNode = new InjectIntermediateNode()
+                    {
+                        TypeName = typeName,
+                        MemberName = memberName,
+                    };
+
+                    visitor.Class.Children.Add(injectNode);
+                }
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> Directives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    Directives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectIntermediateNode.cs
new file mode 100644
index 0000000000..8325c2b7a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectIntermediateNode.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class InjectIntermediateNode : ExtensionIntermediateNode
+    {
+        public string TypeName { get; set; }
+
+        public string MemberName { get; set; }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<InjectIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IInjectTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IInjectTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteInjectProperty(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(MemberName);
+
+            formatter.WriteProperty(nameof(MemberName), MemberName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs
new file mode 100644
index 0000000000..23effb4081
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class InjectTargetExtension : IInjectTargetExtension
+    {
+        private const string RazorInjectAttribute = "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]";
+
+        public void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var property = $"public {node.TypeName} {node.MemberName} {{ get; private set; }}";
+
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.CodeWriter
+                        .WriteLine(RazorInjectAttribute)
+                        .WriteLine(property);
+                }
+            }
+            else
+            {
+                context.CodeWriter
+                    .WriteLine(RazorInjectAttribute)
+                    .WriteLine(property);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/LegacySectionTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/LegacySectionTargetExtension.cs
new file mode 100644
index 0000000000..52698cdfe8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/LegacySectionTargetExtension.cs
@@ -0,0 +1,32 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class LegacySectionTargetExtension : ISectionTargetExtension
+    {
+        private static readonly string DefaultWriterName = "__razor_section_writer";
+
+        public static readonly string DefaultSectionMethodName = "DefineSection";
+
+        public string SectionMethodName { get; set; } = DefaultSectionMethodName;
+
+        public void WriteSection(CodeRenderingContext context, SectionIntermediateNode node)
+        {
+            context.CodeWriter
+                .WriteStartMethodInvocation(SectionMethodName)
+                .Write("\"")
+                .Write(node.SectionName)
+                .Write("\", ");
+
+            using (context.CodeWriter.BuildAsyncLambda(DefaultWriterName))
+            {
+                context.RenderChildren(node);
+            }
+
+            context.CodeWriter.WriteEndMethodInvocation(endLine: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
new file mode 100644
index 0000000000..0d61d12b26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
+    <EnableApiCheck>false</EnableApiCheck>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs">
+      <Link>Shared\CodeWriterExtensions.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="../Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs
new file mode 100644
index 0000000000..c16f46153f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs
@@ -0,0 +1,145 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class ModelDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "model",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(Resources.ModelDirective_TypeToken_Name, Resources.ModelDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.ModelDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+
+        public static string GetModelType(DocumentIntermediateNode document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var visitor = new Visitor();
+            return GetModelType(document, visitor);
+        }
+
+        private static string GetModelType(DocumentIntermediateNode document, Visitor visitor)
+        {
+            visitor.Visit(document);
+
+            for (var i = visitor.ModelDirectives.Count - 1; i >= 0; i--)
+            {
+                var directive = visitor.ModelDirectives[i];
+
+                var tokens = directive.Tokens.ToArray();
+                if (tokens.Length >= 1)
+                {
+                    return tokens[0].Content;
+                }
+            }
+
+            return "dynamic";
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @inherits directive
+            public override int Order => 5;
+
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                var modelType = GetModelType(documentNode, visitor);
+
+                if (documentNode.Options.DesignTime)
+                {
+                    // Alias the TModel token to a known type.
+                    // This allows design time compilation to succeed for Razor files where the token isn't replaced.
+                    var typeName = $"global::{typeof(object).FullName}";
+                    var usingNode = new UsingDirectiveIntermediateNode()
+                    {
+                        Content = $"TModel = {typeName}"
+                    };
+
+                    visitor.Namespace?.Children.Insert(0, usingNode);
+                }
+
+                var baseType = visitor.Class?.BaseType?.Replace("<TModel>", "<" + modelType + ">");
+                visitor.Class.BaseType = baseType;
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> ModelDirectives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (Namespace == null)
+                {
+                    Namespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    ModelDirectives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelExpressionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelExpressionPass.cs
new file mode 100644
index 0000000000..c943afe5bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelExpressionPass.cs
@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ModelExpressionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string ModelExpressionTypeName = "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public List<TagHelperIntermediateNode> TagHelpers { get; } = new List<TagHelperIntermediateNode>();
+
+            public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+            {
+                if (string.Equals(node.BoundAttribute.TypeName, ModelExpressionTypeName, StringComparison.Ordinal) ||
+                    (node.IsIndexerNameMatch &&
+                     string.Equals(node.BoundAttribute.IndexerTypeName, ModelExpressionTypeName, StringComparison.Ordinal)))
+                {
+                    var expression = new CSharpExpressionIntermediateNode();
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ",
+                    });
+
+                    if (node.Children.Count == 1 && node.Children[0] is IntermediateToken token && token.IsCSharp)
+                    {
+                        // A 'simple' expression will look like __model => __model.Foo
+
+                        expression.Children.Add(new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = "__model."
+                        });
+
+                        expression.Children.Add(token);
+                    }
+                    else
+                    {
+                        for (var i = 0; i < node.Children.Count; i++)
+                        {
+                            if (node.Children[i] is CSharpExpressionIntermediateNode nestedExpression)
+                            {
+                                for (var j = 0; j < nestedExpression.Children.Count; j++)
+                                {
+                                    if (nestedExpression.Children[j] is IntermediateToken cSharpToken &&
+                                        cSharpToken.IsCSharp)
+                                    {
+                                        expression.Children.Add(cSharpToken);
+                                    }
+                                }
+
+                                continue;
+                            }
+                        }
+                    }
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = ")",
+                    });
+
+                    node.Children.Clear();
+
+                    node.Children.Add(expression);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
new file mode 100644
index 0000000000..254c57c1c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal class MvcImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+    {
+        private const string ImportsFileName = "_ViewImports.cshtml";
+
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var imports = new List<RazorProjectItem>();
+            AddDefaultDirectivesImport(imports);
+
+            // We add hierarchical imports second so any default directive imports can be overridden.
+            AddHierarchicalImports(projectItem, imports);
+
+            return imports;
+        }
+
+        // Internal for testing
+        internal static void AddDefaultDirectivesImport(List<RazorProjectItem> imports)
+        {
+            imports.Add(DefaultDirectivesProjectItem.Instance);
+        }
+
+        // Internal for testing
+        internal void AddHierarchicalImports(RazorProjectItem projectItem, List<RazorProjectItem> imports)
+        {
+            // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+            var importProjectItems = ProjectEngine.FileSystem.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse();
+            imports.AddRange(importProjectItems);
+        }
+
+        private class DefaultDirectivesProjectItem : RazorProjectItem
+        {
+            private readonly byte[] _defaultImportBytes;
+
+            private DefaultDirectivesProjectItem()
+            {
+                var preamble = Encoding.UTF8.GetPreamble();
+                var content = @"
+@using System
+@using System.Collections.Generic
+@using System.Linq
+@using System.Threading.Tasks
+@using Microsoft.AspNetCore.Mvc
+@using Microsoft.AspNetCore.Mvc.Rendering
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json
+@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component
+@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url
+@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+";
+                var contentBytes = Encoding.UTF8.GetBytes(content);
+
+                _defaultImportBytes = new byte[preamble.Length + contentBytes.Length];
+                preamble.CopyTo(_defaultImportBytes, 0);
+                contentBytes.CopyTo(_defaultImportBytes, preamble.Length);
+            }
+
+            public override string BasePath => null;
+
+            public override string FilePath => null;
+
+            public override string PhysicalPath => null;
+
+            public override bool Exists => true;
+
+            public static DefaultDirectivesProjectItem Instance { get; } = new DefaultDirectivesProjectItem();
+
+            public override Stream Read() => new MemoryStream(_defaultImportBytes);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs
new file mode 100644
index 0000000000..497d173e4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs
@@ -0,0 +1,60 @@
+// 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.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    /// <summary>
+    /// A <see cref="RazorTemplateEngine"/> for Mvc Razor views.
+    /// </summary>
+    public class MvcRazorTemplateEngine : RazorTemplateEngine
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="MvcRazorTemplateEngine"/>.
+        /// </summary>
+        /// <param name="engine">The <see cref="RazorEngine"/>.</param>
+        /// <param name="project">The <see cref="RazorProject"/>.</param>
+        public MvcRazorTemplateEngine(
+            RazorEngine engine,
+            RazorProject project)
+            : base(engine, project)
+        {
+            Options.ImportsFileName = "_ViewImports.cshtml";
+            Options.DefaultImports = GetDefaultImports();
+        }
+
+        public override RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem)
+        {
+            return base.CreateCodeDocument(projectItem);
+        }
+
+        // Internal for testing.
+        internal static RazorSourceDocument GetDefaultImports()
+        {
+            using (var stream = new MemoryStream())
+            using (var writer = new StreamWriter(stream, Encoding.UTF8))
+            {
+                writer.WriteLine("@using System");
+                writer.WriteLine("@using System.Collections.Generic");
+                writer.WriteLine("@using System.Linq");
+                writer.WriteLine("@using System.Threading.Tasks");
+                writer.WriteLine("@using Microsoft.AspNetCore.Mvc");
+                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.Rendering");
+                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.ViewFeatures");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider");
+                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor");
+                writer.Flush();
+
+                stream.Position = 0;
+                return RazorSourceDocument.ReadFrom(stream, fileName: null, encoding: Encoding.UTF8);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcViewDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcViewDocumentClassifierPass.cs
new file mode 100644
index 0000000000..b4a5c930f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcViewDocumentClassifierPass.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class MvcViewDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string MvcViewDocumentKind = "mvc.1.0.view";
+
+        protected override string DocumentKind => MvcViewDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) => true;
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument, 
+            NamespaceDeclarationIntermediateNode @namespace, 
+            ClassDeclarationIntermediateNode @class, 
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+            }
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+        }
+
+        private static string BytesToString(byte[] bytes)
+        {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException(nameof(bytes));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..8233c62607
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// 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.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
+using Microsoft.AspNetCore.Razor.Language;
+
+[assembly: ProvideRazorExtensionInitializer("MVC-1.0", typeof(ExtensionInitializer))]
+[assembly: ProvideRazorExtensionInitializer("MVC-1.1", typeof(ExtensionInitializer))]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..917bbe18ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs
@@ -0,0 +1,254 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpy
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpy");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpy()
+            => GetString("ArgumentCannotBeNullOrEmpy");
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string InjectDirective_Description
+        {
+            get => GetString("InjectDirective_Description");
+        }
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string FormatInjectDirective_Description()
+            => GetString("InjectDirective_Description");
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Description
+        {
+            get => GetString("InjectDirective_MemberToken_Description");
+        }
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Description()
+            => GetString("InjectDirective_MemberToken_Description");
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Name
+        {
+            get => GetString("InjectDirective_MemberToken_Name");
+        }
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Name()
+            => GetString("InjectDirective_MemberToken_Name");
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Description
+        {
+            get => GetString("InjectDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Description()
+            => GetString("InjectDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Name
+        {
+            get => GetString("InjectDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Name()
+            => GetString("InjectDirective_TypeToken_Name");
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string ModelDirective_Description
+        {
+            get => GetString("ModelDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string FormatModelDirective_Description()
+            => GetString("ModelDirective_Description");
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Description
+        {
+            get => GetString("ModelDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Description()
+            => GetString("ModelDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Name
+        {
+            get => GetString("ModelDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Name()
+            => GetString("ModelDirective_TypeToken_Name");
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
+        {
+            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
+        }
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
+        {
+            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
+        }
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
+        {
+            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
+        }
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
+        {
+            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
+        }
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string MvcRazorParser_InvalidPropertyType
+        {
+            get => GetString("MvcRazorParser_InvalidPropertyType");
+        }
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string PageDirectiveCannotBeImported
+        {
+            get => GetString("PageDirectiveCannotBeImported");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
+
+        /// <summary>
+        /// Runtime code generation for Mvc 1.x is not supported.
+        /// </summary>
+        internal static string RuntimeCodeGenerationNotSupported
+        {
+            get => GetString("RuntimeCodeGenerationNotSupported");
+        }
+
+        /// <summary>
+        /// Runtime code generation for Mvc 1.x is not supported.
+        /// </summary>
+        internal static string FormatRuntimeCodeGenerationNotSupported()
+            => GetString("RuntimeCodeGenerationNotSupported");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs
new file mode 100644
index 0000000000..58228a720f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs
@@ -0,0 +1,100 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class ViewComponentResources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string ViewComponent_AmbiguousMethods
+        {
+            get => GetString("ViewComponent_AmbiguousMethods");
+        }
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
+        {
+            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string ViewComponent_CannotFindMethod
+        {
+            get => GetString("ViewComponent_CannotFindMethod");
+        }
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_CannotReturnTask
+        {
+            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_ShouldReturnValue
+        {
+            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
new file mode 100644
index 0000000000..55e8929457
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
@@ -0,0 +1,117 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class RazorExtensions
+    {
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            InjectDirective.Register(builder);
+            ModelDirective.Register(builder);
+
+            InheritsDirective.Register(builder);
+
+            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+
+            // Register section directive with the 1.x compatible target extension.
+            builder.AddDirective(SectionDirective.Directive);
+            builder.Features.Add(new SectionDirectivePass());
+            builder.AddTargetExtension(new LegacySectionTargetExtension());
+
+            builder.AddTargetExtension(new TemplateTargetExtension()
+            {
+                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
+            });
+
+            builder.Features.Add(new ModelExpressionPass());
+            builder.Features.Add(new MvcViewDocumentClassifierPass());
+
+            builder.SetImportFeature(new MvcImportProjectFeature());
+        }
+
+        public static void RegisterViewComponentTagHelpers(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+
+            builder.Features.Add(new ViewComponentTagHelperPass());
+            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            EnsureDesignTime(builder);
+
+            InjectDirective.Register(builder);
+            ModelDirective.Register(builder);
+
+            FunctionsDirective.Register(builder);
+            InheritsDirective.Register(builder);
+
+            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+
+            // Register section directive with the 1.x compatible target extension.
+            builder.AddDirective(SectionDirective.Directive);
+            builder.Features.Add(new SectionDirectivePass());
+            builder.AddTargetExtension(new LegacySectionTargetExtension());
+
+            builder.AddTargetExtension(new TemplateTargetExtension()
+            {
+                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
+            });
+
+            builder.Features.Add(new ModelExpressionPass());
+            builder.Features.Add(new MvcViewDocumentClassifierPass());
+        }
+
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void RegisterViewComponentTagHelpers(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            EnsureDesignTime(builder);
+
+            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+            builder.Features.Add(new ViewComponentTagHelperPass());
+            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
+        }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        private static void EnsureDesignTime(IRazorEngineBuilder builder)
+#pragma warning restore CS0618 // Type or member is obsolete
+        {
+            if (builder.DesignTime)
+            {
+                return;
+            }
+
+            throw new NotSupportedException(Resources.RuntimeCodeGenerationNotSupported);
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensionsDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensionsDiagnosticFactory.cs
new file mode 100644
index 0000000000..af883af3d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensionsDiagnosticFactory.cs
@@ -0,0 +1,103 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal class RazorExtensionsDiagnosticFactory
+    {
+        private const string DiagnosticPrefix = "RZ";
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_CannotFindMethod =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3900",
+                () => ViewComponentResources.ViewComponent_CannotFindMethod,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_CannotFindMethod(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_CannotFindMethod,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AmbiguousMethods =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3901",
+                () => ViewComponentResources.ViewComponent_AmbiguousMethods,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AmbiguousMethods(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AmbiguousMethods,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperType,
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AsyncMethod_ShouldReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3902",
+                () => ViewComponentResources.ViewComponent_AsyncMethod_ShouldReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AsyncMethod_ShouldReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AsyncMethod_ShouldReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_ShouldReturnValue =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3903",
+                () => ViewComponentResources.ViewComponent_SyncMethod_ShouldReturnValue,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_ShouldReturnValue(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_ShouldReturnValue,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_CannotReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3904",
+                () => ViewComponentResources.ViewComponent_SyncMethod_CannotReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_CannotReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_CannotReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Resources.resx
new file mode 100644
index 0000000000..6754c87c52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Resources.resx
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpy" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="InjectDirective_Description" xml:space="preserve">
+    <value>Inject a service from the application's service container into a property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Description" xml:space="preserve">
+    <value>The name of the property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Name" xml:space="preserve">
+    <value>PropertyName</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Description" xml:space="preserve">
+    <value>The type of the service to inject.</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="ModelDirective_Description" xml:space="preserve">
+    <value>Specify the view or page model for the page.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Description" xml:space="preserve">
+    <value>The model type.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword" xml:space="preserve">
+    <value>The 'inherits' keyword is not allowed when a '{0}' keyword is used.</value>
+  </data>
+  <data name="MvcRazorCodeParser_InjectDirectivePropertyNameRequired" xml:space="preserve">
+    <value>A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.</value>
+  </data>
+  <data name="MvcRazorCodeParser_KeywordMustBeFollowedByTypeName" xml:space="preserve">
+    <value>The '{0}' keyword must be followed by a type name on the same line.</value>
+  </data>
+  <data name="MvcRazorCodeParser_OnlyOneModelStatementIsAllowed" xml:space="preserve">
+    <value>Only one '{0}' statement is allowed in a file.</value>
+  </data>
+  <data name="MvcRazorParser_InvalidPropertyType" xml:space="preserve">
+    <value>Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.</value>
+  </data>
+  <data name="PageDirectiveCannotBeImported" xml:space="preserve">
+    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.</value>
+  </data>
+  <data name="RuntimeCodeGenerationNotSupported" xml:space="preserve">
+    <value>Runtime code generation for Mvc 1.x is not supported.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/TagHelperDescriptorExtensions.cs
new file mode 100644
index 0000000000..b455fc7423
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/TagHelperDescriptorExtensions.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class TagHelperDescriptorExtensions
+    {
+        /// <summary>
+        /// Indicates whether a <see cref="TagHelperDescriptor"/> represents a view component.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/> to check.</param>
+        /// <returns>Whether a <see cref="TagHelperDescriptor"/> represents a view component.</returns>
+        public static bool IsViewComponentKind(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return string.Equals(ViewComponentTagHelperConventions.Kind, tagHelper.Kind, StringComparison.Ordinal);
+        }
+
+        public static string GetViewComponentName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(ViewComponentTagHelperMetadata.Name, out var result);
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentResources.resx
new file mode 100644
index 0000000000..d6aad4ff3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentResources.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ViewComponent_AmbiguousMethods" xml:space="preserve">
+    <value>View component '{0}' must have exactly one public method named '{1}' or '{2}'.</value>
+  </data>
+  <data name="ViewComponent_AsyncMethod_ShouldReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.</value>
+  </data>
+  <data name="ViewComponent_CannotFindMethod" xml:space="preserve">
+    <value>Could not find an '{0}' or '{1}' method for the view component '{2}'.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_CannotReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' cannot return a {2}.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_ShouldReturnValue" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return a value.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperConventions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperConventions.cs
new file mode 100644
index 0000000000..f02d874dc5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperConventions.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class ViewComponentTagHelperConventions
+    {
+        public static readonly string Kind = "MVC.ViewComponent";
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
new file mode 100644
index 0000000000..68966e734c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -0,0 +1,269 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal class ViewComponentTagHelperDescriptorFactory
+    {
+        private readonly INamedTypeSymbol _viewComponentAttributeSymbol;
+        private readonly INamedTypeSymbol _genericTaskSymbol;
+        private readonly INamedTypeSymbol _taskSymbol;
+        private readonly INamedTypeSymbol _iDictionarySymbol;
+
+        private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+            SymbolDisplayFormat.FullyQualifiedFormat
+                .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+                .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+
+        private static readonly IReadOnlyDictionary<string, string> PrimitiveDisplayTypeNameLookups = new Dictionary<string, string>(StringComparer.Ordinal)
+        {
+            [typeof(byte).FullName] = "byte",
+            [typeof(sbyte).FullName] = "sbyte",
+            [typeof(int).FullName] = "int",
+            [typeof(uint).FullName] = "uint",
+            [typeof(short).FullName] = "short",
+            [typeof(ushort).FullName] = "ushort",
+            [typeof(long).FullName] = "long",
+            [typeof(ulong).FullName] = "ulong",
+            [typeof(float).FullName] = "float",
+            [typeof(double).FullName] = "double",
+            [typeof(char).FullName] = "char",
+            [typeof(bool).FullName] = "bool",
+            [typeof(object).FullName] = "object",
+            [typeof(string).FullName] = "string",
+            [typeof(decimal).FullName] = "decimal",
+        };
+
+        public ViewComponentTagHelperDescriptorFactory(Compilation compilation)
+        {
+            _viewComponentAttributeSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            _genericTaskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.GenericTask);
+            _taskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.Task);
+            _iDictionarySymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.IDictionary);
+        }
+
+        public virtual TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            var assemblyName = type.ContainingAssembly.Name;
+            var shortName = GetShortName(type);
+            var tagName = $"vc:{HtmlConventions.ToHtmlCase(shortName)}";
+            var typeName = $"__Generated__{shortName}ViewComponentTagHelper";
+            var displayName = shortName + "ViewComponentTagHelper";
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+            descriptorBuilder.DisplayName = displayName;
+            
+            if (TryFindInvokeMethod(type, out var method, out var diagnostic))
+            {
+                var methodParameters = method.Parameters;
+                descriptorBuilder.TagMatchingRule(ruleBuilder =>
+                {
+                    ruleBuilder.TagName = tagName;
+                    AddRequiredAttributes(methodParameters, ruleBuilder);
+                });
+
+                AddBoundAttributes(methodParameters, displayName, descriptorBuilder);
+            }
+            else
+            {
+                descriptorBuilder.Diagnostics.Add(diagnostic);
+            }
+
+            descriptorBuilder.Metadata[ViewComponentTagHelperMetadata.Name] = shortName;
+
+            var descriptor = descriptorBuilder.Build();
+            return descriptor;
+        }
+
+        private bool TryFindInvokeMethod(INamedTypeSymbol type, out IMethodSymbol method, out RazorDiagnostic diagnostic)
+        {
+            var methods = type.GetMembers()
+                .OfType<IMethodSymbol>()
+                .Where(m =>
+                    m.DeclaredAccessibility == Accessibility.Public &&
+                    (string.Equals(m.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal) ||
+                    string.Equals(m.Name, ViewComponentTypes.SyncMethodName, StringComparison.Ordinal)))
+                .ToArray();
+
+            if (methods.Length == 0)
+            {
+                diagnostic =  RazorExtensionsDiagnosticFactory.CreateViewComponent_CannotFindMethod(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+            else if (methods.Length > 1)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AmbiguousMethods(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+
+            var selectedMethod = methods[0];
+            var returnType = selectedMethod.ReturnType as INamedTypeSymbol;
+            if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
+            {
+                // Will invoke asynchronously. Method must not return Task or Task<T>.
+                if (returnType == _taskSymbol)
+                {
+                    // This is ok.
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    // This is ok.
+                }
+                else
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AsyncMethod_ShouldReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+            else
+            {
+                // Will invoke synchronously. Method must not return void, Task or Task<T>.
+                if (returnType.SpecialType == SpecialType.System_Void)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_ShouldReturnValue(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType == _taskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+
+            method = selectedMethod;
+            diagnostic = null;
+            return true;
+        }
+
+        private void AddRequiredAttributes(ImmutableArray<IParameterSymbol> methodParameters, TagMatchingRuleDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                if (GetIndexerValueTypeName(parameter) == null)
+                {
+                    // Set required attributes only for non-indexer attributes. Indexer attributes can't be required attributes
+                    // because there are two ways of setting values for the attribute.
+                    builder.Attribute(attributeBuilder =>
+                    {
+                        var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                        attributeBuilder.Name =lowerKebabName;
+                    });
+                }
+            }
+        }
+
+        private void AddBoundAttributes(ImmutableArray<IParameterSymbol> methodParameters, string containingDisplayName, TagHelperDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                var typeName = parameter.Type.ToDisplayString(FullNameTypeDisplayFormat);
+
+                if (!PrimitiveDisplayTypeNameLookups.TryGetValue(typeName, out var simpleName))
+                {
+                    simpleName = typeName;
+                }
+
+                builder.BindAttribute(attributeBuilder =>
+                {
+                    attributeBuilder.Name = lowerKebabName;
+                    attributeBuilder.TypeName = typeName;
+                    attributeBuilder.DisplayName = $"{simpleName} {containingDisplayName}.{parameter.Name}";
+                    attributeBuilder.SetPropertyName(parameter.Name);
+
+                    if (parameter.Type.TypeKind == TypeKind.Enum)
+                    {
+                        attributeBuilder.IsEnum = true;
+                    }
+                    else
+                    {
+                        var dictionaryValueType = GetIndexerValueTypeName(parameter);
+                        if (dictionaryValueType != null)
+                        {
+                            attributeBuilder.AsDictionary(lowerKebabName + "-", dictionaryValueType);
+                        }
+                    }
+                });
+            }
+        }
+
+        private string GetIndexerValueTypeName(IParameterSymbol parameter)
+        {
+            INamedTypeSymbol dictionaryType;
+            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            {
+                dictionaryType = (INamedTypeSymbol)parameter.Type;
+            }
+            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            {
+                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+            }
+            else
+            {
+                dictionaryType = null;
+            }
+
+            if (dictionaryType == null || dictionaryType.TypeArguments[0].SpecialType != SpecialType.System_String)
+            {
+                return null;
+            }
+
+            var type = dictionaryType.TypeArguments[1];
+            var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
+
+            return typeName;
+        }
+
+        private string GetShortName(INamedTypeSymbol componentType)
+        {
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var name = viewComponentAttribute
+                ?.NamedArguments
+                .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
+                .FirstOrDefault()
+                .Value
+                .Value as string;
+
+            if (!string.IsNullOrEmpty(name))
+            {
+                var separatorIndex = name.LastIndexOf('.');
+                if (separatorIndex >= 0)
+                {
+                    return name.Substring(separatorIndex + 1);
+                }
+                else
+                {
+                    return name;
+                }
+            }
+
+            // Get name by convention
+            if (componentType.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix, StringComparison.OrdinalIgnoreCase))
+            {
+                return componentType.Name.Substring(0, componentType.Name.Length - ViewComponentTypes.ViewComponentSuffix.Length);
+            }
+            else
+            {
+                return componentType.Name;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..318994ec0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorProvider.cs
@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
+            if (vcAttribute == null || vcAttribute.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new ViewComponentTypeVisitor(vcAttribute, nonVCAttribute, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            var factory = new ViewComponentTagHelperDescriptorFactory(compilation);
+            for (var i = 0; i < types.Count; i++)
+            {
+                var descriptor = factory.CreateDescriptor(types[i]);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperIntermediateNode.cs
new file mode 100644
index 0000000000..b1399ffbea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperIntermediateNode.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public sealed class ViewComponentTagHelperIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
+
+        public string ClassName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ViewComponentTagHelperIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IViewComponentTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IViewComponentTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteViewComponentTagHelper(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(ClassName);
+
+            formatter.WriteProperty(nameof(ClassName), ClassName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperMetadata.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperMetadata.cs
new file mode 100644
index 0000000000..1718829c39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperMetadata.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class ViewComponentTagHelperMetadata
+    {
+        /// <summary>
+        /// The key in a <see cref="Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor.Metadata"/>  containing 
+        /// the short name of a view component.
+        /// </summary>
+        public static readonly string Name = "MVC.ViewComponent.Name";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperPass.cs
new file mode 100644
index 0000000000..ba9938a123
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperPass.cs
@@ -0,0 +1,203 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ViewComponentTagHelperPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after the default taghelper pass
+        public override int Order => IntermediateNodePassBase.DefaultFeatureOrder + 2000;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            var context = new Context(@namespace, @class);
+
+            // For each VCTH *usage* we need to rewrite the tag helper node to use the tag helper runtime to construct
+            // and set properties on the the correct field, and using the name of the type we will generate.
+            var nodes = documentNode.FindDescendantNodes<TagHelperIntermediateNode>();
+            for (var i = 0; i < nodes.Count; i++)
+            {
+                var node = nodes[i];
+                foreach (var tagHelper in node.TagHelpers)
+                {
+                    RewriteUsage(context, node, tagHelper);
+                }
+            }
+
+            // Then for each VCTH *definition* that we've seen we need to generate the class that implements
+            // ITagHelper and the field that will hold it.
+            foreach (var tagHelper in context.TagHelpers)
+            {
+                AddField(context, tagHelper);
+                AddTagHelperClass(context, tagHelper);
+            }
+        }
+
+        private void RewriteUsage(Context context, TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        {
+            if (!tagHelper.IsViewComponentKind())
+            {
+                return;
+            }
+
+            context.Add(tagHelper);
+
+            // Now we need to insert a create node using the default tag helper runtime. This is similar to
+            // code in DefaultTagHelperOptimizationPass.
+            //
+            // Find the body node.
+            var i = 0;
+            while (i < node.Children.Count && node.Children[i] is TagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now find the last create node.
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperCreateIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now i has the right insertion point.
+            node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = context.GetFieldName(tagHelper),
+                TagHelper = tagHelper,
+                TypeName = context.GetFullyQualifiedName(tagHelper),
+            });
+
+            // Now we need to rewrite any set property nodes to use the default runtime.
+            for (i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode &&
+                    propertyNode.TagHelper == tagHelper)
+                {
+                    // This is a set property for this VCTH - we need to replace it with a node
+                    // that will use our field and property name.
+                    node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
+                    {
+                        FieldName = context.GetFieldName(tagHelper),
+                        PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
+                    };
+                }
+            }
+        }
+
+        private void AddField(Context context, TagHelperDescriptor tagHelper)
+        {
+            // We need to insert a node for the field that will hold the tag helper. We've already generated a field name
+            // at this time and use it for all uses of the same tag helper type.
+            //
+            // We also want to preserve the ordering of the nodes for testability. So insert at the end of any existing
+            // field nodes.
+            var i = 0;
+            while (i < context.Class.Children.Count && context.Class.Children[i] is DefaultTagHelperRuntimeIntermediateNode)
+            {
+                i++;
+            }
+
+            while (i < context.Class.Children.Count && context.Class.Children[i] is FieldDeclarationIntermediateNode)
+            {
+                i++;
+            }
+
+            context.Class.Children.Insert(i, new FieldDeclarationIntermediateNode()
+            {
+                Annotations =
+                {
+                    { CommonAnnotations.DefaultTagHelperExtension.TagHelperField, bool.TrueString },
+                },
+                Modifiers =
+                {
+                    "private",
+                },
+                FieldName = context.GetFieldName(tagHelper),
+                FieldType = "global::" + context.GetFullyQualifiedName(tagHelper),
+            });
+        }
+
+        private void AddTagHelperClass(Context context, TagHelperDescriptor tagHelper)
+        {
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = context.GetClassName(tagHelper),
+                TagHelper = tagHelper
+            };
+
+            context.Class.Children.Add(node);
+        }
+
+        private struct Context
+        {
+            private Dictionary<TagHelperDescriptor, (string className, string fullyQualifiedName, string fieldName)> _tagHelpers;
+
+            public Context(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class)
+            {
+                Namespace = @namespace;
+                Class = @class;
+
+                _tagHelpers = new Dictionary<TagHelperDescriptor, (string, string, string)>();
+            }
+
+            public ClassDeclarationIntermediateNode Class { get; }
+
+            public NamespaceDeclarationIntermediateNode Namespace { get; }
+
+
+            public IEnumerable<TagHelperDescriptor> TagHelpers => _tagHelpers.Keys;
+
+            public bool Add(TagHelperDescriptor tagHelper)
+            {
+                if (_tagHelpers.ContainsKey(tagHelper))
+                {
+                    return false;
+                }
+
+                var className = $"__Generated__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+                var fullyQualifiedName = $"{Namespace.Content}.{Class.ClassName}.{className}";
+                var fieldName = GenerateFieldName(tagHelper);
+
+                _tagHelpers.Add(tagHelper, (className, fullyQualifiedName, fieldName));
+
+                return true;
+            }
+
+            public string GetClassName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].className;
+            }
+
+            public string GetFullyQualifiedName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fullyQualifiedName;
+            }
+
+            public string GetFieldName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fieldName;
+            }
+
+            private static string GenerateFieldName(TagHelperDescriptor tagHelper)
+            {
+                return $"__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..eb426d0607
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,183 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal class ViewComponentTagHelperTargetExtension : IViewComponentTagHelperTargetExtension
+    {
+        private static readonly string[] PublicModifiers = new[] { "public" };
+
+        public string TagHelperTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper";
+
+        public string ViewComponentHelperTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.IViewComponentHelper";
+
+        public string ViewComponentHelperVariableName { get; set; } = "_helper";
+
+        public string ViewComponentInvokeMethodName { get; set; } = "InvokeAsync";
+
+        public string HtmlAttributeNotBoundAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute";
+
+        public string ViewContextAttributeTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute";
+
+        public string ViewContextTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext";
+
+        public string ViewContextPropertyName { get; set; } = "ViewContext";
+
+        public string HtmlTargetElementAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute";
+
+        public string TagHelperProcessMethodName { get; set; } = "ProcessAsync";
+
+        public string TagHelperContextTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext";
+
+        public string TagHelperContextVariableName { get; set; } = "context";
+
+        public string TagHelperOutputTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput";
+
+        public string TagHelperOutputVariableName { get; set; } = "output";
+
+        public string TagHelperOutputTagNamePropertyName { get; set; } = "TagName";
+
+        public string TagHelperOutputContentPropertyName { get; set; } = "Content";
+
+        public string TagHelperContentSetMethodName { get; set; } = "SetHtmlContent";
+
+        public string TagHelperContentVariableName { get; set; } = "content";
+
+        public string IViewContextAwareTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware";
+
+        public string IViewContextAwareContextualizeMethodName { get; set; } = "Contextualize";
+
+        public void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node)
+        {
+            // Add target element.
+            WriteTargetElementString(context.CodeWriter, node.TagHelper);
+
+            // Initialize declaration.
+            using (context.CodeWriter.BuildClassDeclaration(
+                PublicModifiers,
+                node.ClassName,
+                TagHelperTypeName,
+                interfaces: null,
+                typeParameters: null))
+            {
+                // Add view component helper.
+                context.CodeWriter.WriteVariableDeclaration(
+                    $"private readonly {ViewComponentHelperTypeName}",
+                    ViewComponentHelperVariableName,
+                    value: null);
+
+                // Add constructor.
+                WriteConstructorString(context.CodeWriter, node.ClassName);
+
+                // Add attributes.
+                WriteAttributeDeclarations(context.CodeWriter, node.TagHelper);
+
+                // Add process method.
+                WriteProcessMethodString(context.CodeWriter, node.TagHelper);
+            }
+        }
+
+        private void WriteConstructorString(CodeWriter writer, string className)
+        {
+            writer.Write("public ")
+                .Write(className)
+                .Write("(")
+                .Write($"{ViewComponentHelperTypeName} helper")
+                .WriteLine(")");
+            using (writer.BuildScope())
+            {
+                writer.WriteStartAssignment(ViewComponentHelperVariableName)
+                    .Write("helper")
+                    .WriteLine(";");
+            }
+        }
+
+        private void WriteAttributeDeclarations(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            writer.Write("[")
+              .Write(HtmlAttributeNotBoundAttributeTypeName)
+              .WriteParameterSeparator()
+              .Write(ViewContextAttributeTypeName)
+              .WriteLine("]");
+
+            writer.WriteAutoPropertyDeclaration(
+                PublicModifiers,
+                ViewContextTypeName,
+                ViewContextPropertyName);
+
+            foreach (var attribute in tagHelper.BoundAttributes)
+            {
+                writer.WriteAutoPropertyDeclaration(
+                    PublicModifiers,
+                    attribute.TypeName,
+                    attribute.GetPropertyName());
+
+                if (attribute.IndexerTypeName != null)
+                {
+                    writer.Write(" = ")
+                        .WriteStartNewObject(attribute.TypeName)
+                        .WriteEndMethodInvocation();
+                }
+            }
+        }
+
+        private void WriteProcessMethodString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            using (writer.BuildMethodDeclaration(
+                    $"public override async",
+                    $"global::{typeof(Task).FullName}",
+                    TagHelperProcessMethodName,
+                    new Dictionary<string, string>()
+                    {
+                        { TagHelperContextTypeName, TagHelperContextVariableName },
+                        { TagHelperOutputTypeName, TagHelperOutputVariableName }
+                    }))
+            {
+                writer.WriteInstanceMethodInvocation(
+                    $"({ViewComponentHelperVariableName} as {IViewContextAwareTypeName})?",
+                    IViewContextAwareContextualizeMethodName,
+                    new[] { ViewContextPropertyName });
+
+                var methodParameters = GetMethodParameters(tagHelper);
+                writer.Write("var ")
+                    .WriteStartAssignment(TagHelperContentVariableName)
+                    .WriteInstanceMethodInvocation($"await {ViewComponentHelperVariableName}", ViewComponentInvokeMethodName, methodParameters);
+                writer.WriteStartAssignment($"{TagHelperOutputVariableName}.{TagHelperOutputTagNamePropertyName}")
+                    .WriteLine("null;");
+                writer.WriteInstanceMethodInvocation(
+                    $"{TagHelperOutputVariableName}.{TagHelperOutputContentPropertyName}",
+                    TagHelperContentSetMethodName,
+                    new[] { TagHelperContentVariableName });
+            }
+        }
+
+        private string[] GetMethodParameters(TagHelperDescriptor tagHelper)
+        {
+            var propertyNames = tagHelper.BoundAttributes.Select(attribute => attribute.GetPropertyName());
+            var joinedPropertyNames = string.Join(", ", propertyNames);
+            var parametersString = $"new {{ { joinedPropertyNames } }}";
+            var viewComponentName = tagHelper.GetViewComponentName();
+            var methodParameters = new[] { $"\"{viewComponentName}\"", parametersString };
+            return methodParameters;
+        }
+
+        private void WriteTargetElementString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            Debug.Assert(tagHelper.TagMatchingRules.Count() == 1);
+
+            var rule = tagHelper.TagMatchingRules.First();
+
+            writer.Write("[")
+                .WriteStartMethodInvocation(HtmlTargetElementAttributeTypeName)
+                .WriteStringLiteral(rule.TagName)
+                .WriteLine(")]");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
new file mode 100644
index 0000000000..db0912087a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal class ViewComponentTypeVisitor : SymbolVisitor
+    {
+        private static readonly Version SupportedVCTHMvcVersion = new Version(1, 1);
+
+        private readonly INamedTypeSymbol _viewComponentAttribute;
+        private readonly INamedTypeSymbol _nonViewComponentAttribute;
+        private readonly List<INamedTypeSymbol> _results;
+
+        public ViewComponentTypeVisitor(
+            INamedTypeSymbol viewComponentAttribute,
+            INamedTypeSymbol nonViewComponentAttribute,
+            List<INamedTypeSymbol> results)
+        {
+            _viewComponentAttribute = viewComponentAttribute;
+            _nonViewComponentAttribute = nonViewComponentAttribute;
+            _results = results;
+        }
+
+        public override void VisitNamedType(INamedTypeSymbol symbol)
+        {
+            if (IsViewComponent(symbol))
+            {
+                _results.Add(symbol);
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public)
+            {
+                return;
+            }
+
+            foreach (var member in symbol.GetTypeMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        public override void VisitNamespace(INamespaceSymbol symbol)
+        {
+            foreach (var member in symbol.GetMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        internal bool IsViewComponent(INamedTypeSymbol symbol)
+        {
+            if (symbol.DeclaredAccessibility != Accessibility.Public ||
+                symbol.IsAbstract ||
+                symbol.IsGenericType ||
+                AttributeIsDefined(symbol, _nonViewComponentAttribute))
+            {
+                return false;
+            }
+
+            return symbol.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix) ||
+                AttributeIsDefined(symbol, _viewComponentAttribute);
+        }
+
+        private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+        {
+            if (type == null || queryAttribute == null)
+            {
+                return false;
+            }
+
+            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+
+            if (attribute != null)
+            {
+                return true;
+            }
+
+            return AttributeIsDefined(type.BaseType, queryAttribute);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypes.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypes.cs
new file mode 100644
index 0000000000..e9d8f598f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypes.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    internal static class ViewComponentTypes
+    {
+        public const string Assembly = "Microsoft.AspNetCore.Mvc.ViewFeatures";
+
+        public static readonly Version AssemblyVersion = new Version(1, 1, 0, 0);
+
+        public const string ViewComponentSuffix = "ViewComponent";
+
+        public const string ViewComponentAttribute = "Microsoft.AspNetCore.Mvc.ViewComponentAttribute";
+
+        public const string NonViewComponentAttribute = "Microsoft.AspNetCore.Mvc.NonViewComponentAttribute";
+
+        public const string GenericTask = "System.Threading.Tasks.Task`1";
+
+        public const string Task = "System.Threading.Tasks.Task";
+
+        public const string IDictionary = "System.Collections.Generic.IDictionary`2";
+
+        public const string AsyncMethodName = "InvokeAsync";
+
+        public const string SyncMethodName = "Invoke";
+
+        public static class ViewComponent
+        {
+            public const string Name = "Name";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs
new file mode 100644
index 0000000000..a5579d645a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs
@@ -0,0 +1,225 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class InjectDirectiveTest
+    {
+        [Fact]
+        public void InjectDirectivePass_Execute_DefinesProperty()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_DedupesPropertiesByName()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+@inject PropertyType2 PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType2", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<dynamic>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelTypeFirst()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model ModelType
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+@model ModelType
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
+                b.AddDirective(InjectDirective.Directive);
+                b.AddDirective(ModelDirective.Directive);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs
new file mode 100644
index 0000000000..fcc8b1123c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class InjectTargetExtensionTest
+    {
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesProperty()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType",
+                MemberName = "PropertyName",
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType PropertyName { get; private set; }" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesPropertyWithLinePragma_WhenSourceIsSet()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType<ModelType>",
+                MemberName = "PropertyName",
+                Source = new SourceSpan(
+                    filePath: "test-path",
+                    absoluteIndex: 0,
+                    lineIndex: 1,
+                    characterIndex: 1,
+                    length: 10)
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "#line 2 \"test-path\"" + Environment.NewLine +
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
+                "#line default" + Environment.NewLine +
+                "#line hidden" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
new file mode 100644
index 0000000000..bb605fed72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -0,0 +1,370 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.IntegrationTests
+{
+    public class CodeGenerationIntegrationTest : IntegrationTestBase
+    {
+        private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode");
+
+        public CodeGenerationIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Create(
+                RazorLanguageVersion.Version_1_1,
+                "MVC-1.1",
+                new[] { new AssemblyExtension("MVC-1.1", typeof(ExtensionInitializer).Assembly) });
+        }
+
+        protected override CSharpCompilation BaseCompilation => DefaultBaseCompilation;
+
+        protected override RazorConfiguration Configuration { get; }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1007", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+
+            AddProjectItemFromText(@"@inherits MyBasePageForViews<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Basic_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Sections_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void _ViewImports_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Inject_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Model_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MultipleModels_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class ThisShouldBeGenerated
+{
+
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ2001", Assert.Single(diagnotics).Id);
+        }
+        
+        [Fact]
+        public void ModelExpressionTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
new file mode 100644
index 0000000000..bef1d0718f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
@@ -0,0 +1,46 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class LegacySectionTargetExtensionTest
+    {
+        [Fact]
+        public void WriteSection_WritesSectionCode_DesignTime()
+        {
+            // Arrange
+            var node = new SectionIntermediateNode()
+            {
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode(),
+                },
+                SectionName = "MySection"
+            };
+
+            var extension = new LegacySectionTargetExtension()
+            {
+                SectionMethodName = "CreateSection"
+            };
+
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            // Act
+            extension.WriteSection(context, node);
+
+            // Assert
+            var expected = @"CreateSection(""MySection"", async(__razor_section_writer) => {
+    Render Children
+}
+);
+";
+
+            var output = context.CodeWriter.GenerateCode();
+            Assert.Equal(expected, output);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
new file mode 100644
index 0000000000..808b0f3eea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Targets>Build</Targets>
+    </ProjectReference>
+
+    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.deps.json" />
+  </ItemGroup>
+
+  <Target Name="CopyDepsFromShims" AfterTargets="Build">
+    <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
new file mode 100644
index 0000000000..cc6cf53097
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
@@ -0,0 +1,343 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ModelDirectiveTest
+    {
+        [Fact]
+        public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@model Type2
+@model
+");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("Type1", result);
+        }
+
+        [Fact]
+        public void ModelDirective_GetModelType_DefaultsToDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@" ");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("dynamic", result);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DifferentOrdering()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@inherits BaseType<TModel>
+@model Type2
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_NoOpWithoutTModel()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DefaultDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model SomeType
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<SomeType>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::System.Object", usingNode.Content);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private NamespaceDeclarationIntermediateNode FindNamespaceNode(IntermediateNode node)
+        {
+            var visitor = new NamespaceNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return CreateEngineCore();
+        }
+
+        private RazorEngine CreateDesignTimeEngine()
+        {
+            return CreateEngineCore(designTime: true);
+        }
+
+        private RazorEngine CreateEngineCore(bool designTime = false)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
+                b.AddDirective(ModelDirective.Directive);
+
+                // There's some special interaction with the inherits directive
+                InheritsDirective.Register(b);
+
+                b.Features.Add(new DesignTimeOptionsFeature(designTime));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // InheritsDirectivePass needs to run before ModelDirective.
+            var pass = new InheritsDirectivePass()
+            {
+                Engine = engine
+            };
+            pass.Execute(codeDocument, codeDocument.GetDocumentIntermediateNode());
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class NamespaceNodeVisitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private bool _designTime;
+
+            public DesignTimeOptionsFeature(bool designTime)
+            {
+                _designTime = designTime;
+            }
+
+            public int Order { get; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs
new file mode 100644
index 0000000000..30f27ffcbb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs
@@ -0,0 +1,208 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ModelExpressionPassTest
+    {
+        [Fact]
+        public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var token = Assert.IsType<IntermediateToken>(Assert.Single(setProperty.Children));
+            Assert.True(token.IsCSharp);
+            Assert.Equal("17", token.Content);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[2]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"@Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[1]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcImportProjectFeatureTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcImportProjectFeatureTest.cs
new file mode 100644
index 0000000000..e53046ed5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcImportProjectFeatureTest.cs
@@ -0,0 +1,76 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class MvcImportProjectFeatureTest
+    {
+        [Fact]
+        public void AddDefaultDirectivesImport_AddsSingleDynamicImport()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+
+            // Act
+            MvcImportProjectFeature.AddDefaultDirectivesImport(imports);
+
+            // Assert
+            var import = Assert.Single(imports);
+            Assert.Null(import.FilePath);
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[]
+            {
+                new TestRazorProjectItem("/Index.cshtml"),
+                new TestRazorProjectItem("/_ViewImports.cshtml"),
+                new TestRazorProjectItem("/Contact/_ViewImports.cshtml"),
+                projectItem,
+            });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsNotOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Pages/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[] { projectItem });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
new file mode 100644
index 0000000000..45186848ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class MvcRazorTemplateEngineTest
+    {
+        [Fact]
+        public void GetDefaultImports_IncludesDefaultImports()
+        {
+            // Arrange
+            var expectedImports = new[]
+            {
+                "@using System",
+                "@using System.Collections.Generic",
+                "@using System.Linq",
+                "@using System.Threading.Tasks",
+                "@using Microsoft.AspNetCore.Mvc",
+                "@using Microsoft.AspNetCore.Mvc.Rendering",
+                "@using Microsoft.AspNetCore.Mvc.ViewFeatures",
+            };
+            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
+                RazorProjectEngine.Create().Engine,
+                new TestRazorProjectFileSystem());
+
+            // Act
+            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
+
+            // Assert
+            var importContent = GetContent(imports)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .Where(line => line.StartsWith("@using"));
+            Assert.Equal(expectedImports, importContent);
+        }
+
+        [Fact]
+        public void GetDefaultImports_IncludesDefaulInjects()
+        {
+            // Arrange
+            var expectedImports = new[]
+            {
+                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html",
+                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json",
+                "@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component",
+                "@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url",
+                "@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider",
+            };
+            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
+                RazorProjectEngine.Create().Engine,
+                new TestRazorProjectFileSystem());
+
+            // Act
+            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
+
+            // Assert
+            var importContent = GetContent(imports)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .Where(line => line.StartsWith("@inject"));
+            Assert.Equal(expectedImports, importContent);
+        }
+
+        [Fact]
+        public void GetDefaultImports_IncludesDefaultTagHelpers()
+        {
+            // Arrange
+            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
+                RazorProjectEngine.Create().Engine,
+                new TestRazorProjectFileSystem());
+
+            // Act
+            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
+
+            // Assert
+            var importContent = GetContent(imports)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .Where(line => line.StartsWith("@addTagHelper"));
+            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
+        }
+
+        private string GetContent(RazorSourceDocument imports)
+        {
+            var contentChars = new char[imports.Length];
+            imports.CopyTo(0, contentChars, 0, imports.Length);
+            return new string(contentChars);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcShim.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcShim.cs
new file mode 100644
index 0000000000..a50560e593
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcShim.cs
@@ -0,0 +1,45 @@
+// 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.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal static class MvcShim
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X";
+
+        private static Assembly _assembly;
+        private static CSharpCompilation _baseCompilation;
+
+        public static Assembly Assembly
+        {
+            get
+            {
+                if (_assembly == null)
+                {
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), AssemblyName + ".dll");
+                    _assembly = Assembly.LoadFrom(filePath);
+                }
+
+                return _assembly;
+            }
+        }
+
+        public static CSharpCompilation BaseCompilation
+        {
+            get
+            {
+                if (_baseCompilation == null)
+                {
+                    _baseCompilation = TestCompilation.Create(Assembly);
+                }
+
+                return _baseCompilation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..663aff4518
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
@@ -0,0 +1,264 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class MvcViewDocumentClassifierPassTest
+    {
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.view", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_d9f877a857a7e9928eac04d09a59f25967624155", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void MvcViewDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/SourceMappingsSerializer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/SourceMappingsSerializer.cs
new file mode 100644
index 0000000000..c081118d86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/SourceMappingsSerializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public static class SourceMappingsSerializer
+    {
+        public static string Serialize(RazorCSharpDocument csharpDocument, RazorSourceDocument sourceDocument)
+        {
+            var builder = new StringBuilder();
+            var sourceFilePath = sourceDocument.FilePath;
+            var charBuffer = new char[sourceDocument.Length];
+            sourceDocument.CopyTo(0, charBuffer, 0, sourceDocument.Length);
+            var sourceContent = new string(charBuffer);
+
+            for (var i = 0; i < csharpDocument.SourceMappings.Count; i++)
+            {
+                var sourceMapping = csharpDocument.SourceMappings[i];
+                if (!string.Equals(sourceMapping.OriginalSpan.FilePath, sourceFilePath, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                builder.Append("Source Location: ");
+                AppendMappingLocation(builder, sourceMapping.OriginalSpan, sourceContent);
+
+                builder.Append("Generated Location: ");
+                AppendMappingLocation(builder, sourceMapping.GeneratedSpan, csharpDocument.GeneratedCode);
+
+                builder.AppendLine();
+            }
+
+            return builder.ToString();
+        }
+
+        private static void AppendMappingLocation(StringBuilder builder, SourceSpan location, string content)
+        {
+            builder
+                .AppendLine(location.ToString())
+                .Append("|");
+
+            for (var i = 0; i < location.Length; i++)
+            {
+                builder.Append(content[location.AbsoluteIndex + i]);
+            }
+
+            builder.AppendLine("|");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TagHelperDescriptorExtensionsTest.cs
new file mode 100644
index 0000000000..f080719b5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TagHelperDescriptorExtensionsTest.cs
@@ -0,0 +1,82 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class TagHelperDescriptorExtensionsTest
+    {
+        [Fact]
+        public void IsViewComponentKind_ReturnsFalse_ForNonVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsViewComponentKind_ReturnsTrue_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsNull_ForNonVCTHDescriptor()
+        {
+            //Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsName_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor("ViewComponentName");
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Equal("ViewComponentName", result);
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor()
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .Build();
+
+            return tagHelper;
+        }
+
+        private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor(string name = "ViewComponentName")
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, name)
+                .Build();
+
+            return tagHelper;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
new file mode 100644
index 0000000000..a20b20dae8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
@@ -0,0 +1,8 @@
+<div class="@this.ToString()">
+    Hello world
+    @string.Format("{0}", "Hello")
+</div>
+@{ 
+    var cls = "foo";
+}
+<p class="@if(cls != null) { @cls }" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d39b64c26d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+       __o = this.ToString();
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+__o = string.Format("{0}", "Hello");
+
+#line default
+#line hidden
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        __o = cls;
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
new file mode 100644
index 0000000000..24d84bf975
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -0,0 +1,62 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [23] Basic.cshtml) - Html - \n    Hello world\n    
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
new file mode 100644
index 0000000000..372b49cb6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (13:0,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|this.ToString()|
+Generated Location: (1030:26,13 [15] )
+|this.ToString()|
+
+Source Location: (54:2,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|string.Format("{0}", "Hello")|
+Generated Location: (1166:31,6 [29] )
+|string.Format("{0}", "Hello")|
+
+Source Location: (95:4,2 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| 
+    var cls = "foo";
+|
+Generated Location: (1312:36,2 [25] )
+| 
+    var cls = "foo";
+|
+
+Source Location: (134:7,11 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|if(cls != null) { |
+Generated Location: (1460:42,11 [18] )
+|if(cls != null) { |
+
+Source Location: (153:7,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|cls|
+Generated Location: (1622:47,30 [3] )
+|cls|
+
+Source Location: (156:7,33 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| }|
+Generated Location: (1773:52,33 [2] )
+| }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
new file mode 100644
index 0000000000..b8ce28e05f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -0,0 +1,92 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4120ddad9d4353ed260e0585fe71080d78ff8ab3"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 4, true);
+            WriteLiteral("<div");
+            EndContext();
+            BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            BeginContext(29, 24, true);
+            WriteLiteral(">\r\n    Hello world\r\n    ");
+            EndContext();
+            BeginContext(54, 29, false);
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+Write(string.Format("{0}", "Hello"));
+
+#line default
+#line hidden
+            EndContext();
+            BeginContext(83, 10, true);
+            WriteLiteral("\r\n</div>\r\n");
+            EndContext();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+            BeginContext(123, 2, true);
+            WriteLiteral("<p");
+            EndContext();
+            BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
+            WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+                BeginContext(153, 3, false);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        Write(cls);
+
+#line default
+#line hidden
+                EndContext();
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+                PopWriter();
+            }
+            ), 133, 25, false);
+            EndWriteAttribute();
+            BeginContext(159, 5, true);
+            WriteLiteral(" />\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
new file mode 100644
index 0000000000..8fedd92ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -0,0 +1,72 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(0, 4, true);
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(29, 24, true);
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [19] Basic.cshtml) - Html - \n    Hello world\n
+                    IntermediateToken - (49:2,0 [4] Basic.cshtml) - Html -     
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(54, 29, false);
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(83, 10, true);
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(123, 2, true);
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(153, 3, false);
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(159, 5, true);
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
new file mode 100644
index 0000000000..ecc90de2d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
@@ -0,0 +1,8 @@
+@* These test files validate that end-to-end, incomplete directives don't throw. *@
+
+@model
+@model 
+
+@inject
+@inject 
+@inject MyService<TModel>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9fdc70a98b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -0,0 +1,63 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..3542c13c86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
@@ -0,0 +1,6 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(3,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(6,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,26): Error RZ1015: The 'inject' directive expects an identifier.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..3a6d24fc1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -0,0 +1,64 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (93:2,6 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (102:3,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (113:5,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (123:6,8 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                DirectiveToken - (150:7,25 [0] IncompleteDirectives.cshtml) - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (93:2,6 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (95:3,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (102:3,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (102:3,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (106:5,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (113:5,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (113:5,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (115:6,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (123:6,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (123:6,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (125:7,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (150:7,25 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (150:7,25 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..cb37b8b1a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -0,0 +1,30 @@
+Source Location: (93:2,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (680:18,0 [0] )
+||
+
+Source Location: (102:3,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (733:21,0 [0] )
+||
+
+Source Location: (113:5,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (786:24,0 [0] )
+||
+
+Source Location: (123:6,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (839:27,0 [0] )
+||
+
+Source Location: (133:7,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|MyService<TModel>|
+Generated Location: (988:31,0 [17] )
+|MyService<TModel>|
+
+Source Location: (150:7,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1141:38,0 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..e9170ae11c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -0,0 +1,51 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "844eb91b909a14b78feddd5e6866563b5a75e021"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(83, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(93, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(102, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(113, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(123, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(150, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..72a8fa589b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
@@ -0,0 +1,6 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(3,7): Error RZ9999: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ9999: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,8): Error RZ9999: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(6,8): Error RZ9999: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,9): Error RZ9999: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,26): Error RZ9999: The 'inject' directive expects an identifier.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..8bb3264f43
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -0,0 +1,58 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(83, 4, true);
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(93, 2, true);
+                HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (95:3,0 [7] IncompleteDirectives.cshtml) - model
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(102, 4, true);
+                HtmlContent - (102:3,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (106:5,0 [7] IncompleteDirectives.cshtml) - inject
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(113, 2, true);
+                HtmlContent - (113:5,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (115:6,0 [8] IncompleteDirectives.cshtml) - inject
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(123, 2, true);
+                HtmlContent - (123:6,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (125:7,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(150, 2, true);
+                HtmlContent - (150:7,25 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
new file mode 100644
index 0000000000..38efd570da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
@@ -0,0 +1,2 @@
+@inherits MyBasePageForViews<TModel>
+@model MyModel
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7cdbaf3326
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..cc189604db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [26] InheritsViewModel.cshtml) - MyBasePageForViews<TModel>
+                DirectiveToken - (45:1,7 [7] InheritsViewModel.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a313a909d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyBasePageForViews<TModel>|
+Generated Location: (740:19,0 [26] )
+|MyBasePageForViews<TModel>|
+
+Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyModel|
+Generated Location: (1004:27,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..af9db74379
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
@@ -0,0 +1,33 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "91cf923452a86b2906083cb0236d6d5b3bc528ef"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
new file mode 100644
index 0000000000..b18e254c9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml - MyBasePageForViews<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
new file mode 100644
index 0000000000..c735e2e429
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
@@ -0,0 +1 @@
+@model MyModel
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..0ca023f56a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..db2a73f64d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyBasePageForViews<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [26] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - MyBasePageForViews<TModel>
+                DirectiveToken - (7:0,7 [7] InheritsWithViewImports.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9ee5bceaa0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
+|MyModel|
+Generated Location: (752:19,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..5ede728cf8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
@@ -0,0 +1,33 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "cf2e52e7d1326775fe4ece983a7f8ee1f62235a0"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..0f47fce86b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml - MyBasePageForViews<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
new file mode 100644
index 0000000000..0aa749dd3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
@@ -0,0 +1 @@
+@inject MyApp MyPropertyName
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
new file mode 100644
index 0000000000..d699f1e754
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
@@ -0,0 +1,3 @@
+@model MyModel
+@inject MyApp MyPropertyName
+@inject MyService<TModel> Html
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2120622373
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -0,0 +1,82 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..8ff03ba4e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
@@ -0,0 +1,41 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithModel.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithModel.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithModel.cshtml) - MyPropertyName
+                DirectiveToken - (54:2,8 [17] InjectWithModel.cshtml) - MyService<TModel>
+                DirectiveToken - (72:2,26 [4] InjectWithModel.cshtml) - Html
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c4838ff64d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyModel|
+Generated Location: (766:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyApp|
+Generated Location: (990:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyPropertyName|
+Generated Location: (1232:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyService<TModel>|
+Generated Location: (1438:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|Html|
+Generated Location: (1704:51,22 [4] )
+|Html|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..c3846121e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
@@ -0,0 +1,35 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a039b7091118c718dc3023b6ac58d9645cb58e59"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
new file mode 100644
index 0000000000..2e1c3deb3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
new file mode 100644
index 0000000000..8cd61913e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
@@ -0,0 +1,5 @@
+@model MyModel
+@inject MyApp MyPropertyName;   
+@inject MyService<TModel> Html;  
+@inject MyApp MyPropertyName2  ;  
+@inject MyService<TModel> Html2  ;  
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ea95a4e7eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -0,0 +1,118 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
new file mode 100644
index 0000000000..2b470e7180
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
@@ -0,0 +1,47 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithSemicolon.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithSemicolon.cshtml) - MyPropertyName
+                DirectiveToken - (58:2,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (76:2,26 [4] InjectWithSemicolon.cshtml) - Html
+                DirectiveToken - (93:3,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (99:3,14 [15] InjectWithSemicolon.cshtml) - MyPropertyName2
+                DirectiveToken - (129:4,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (147:4,26 [5] InjectWithSemicolon.cshtml) - Html2
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a90f75f3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -0,0 +1,45 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyModel|
+Generated Location: (774:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1002:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName|
+Generated Location: (1248:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (1458:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html|
+Generated Location: (1728:51,22 [4] )
+|Html|
+
+Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1928:59,0 [5] )
+|MyApp|
+
+Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName2|
+Generated Location: (2174:67,22 [15] )
+|MyPropertyName2|
+
+Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (2385:75,0 [17] )
+|MyService<TModel>|
+
+Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html2|
+Generated Location: (2655:83,22 [5] )
+|Html2|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
new file mode 100644
index 0000000000..4dd7659e08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5010aab35d235175dab517f8018e41aee9a2ac7f"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
new file mode 100644
index 0000000000..b624d6b15c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7b2f4fedc6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
new file mode 100644
index 0000000000..2fed4fbe5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [5] Inject.cshtml) - MyApp
+                DirectiveToken - (14:0,14 [14] Inject.cshtml) - MyPropertyName
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
new file mode 100644
index 0000000000..10ed356ecf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyApp|
+Generated Location: (748:19,0 [5] )
+|MyApp|
+
+Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyPropertyName|
+Generated Location: (981:27,22 [14] )
+|MyPropertyName|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
new file mode 100644
index 0000000000..941237e909
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
@@ -0,0 +1,35 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "c711078454f5b0e8d2cb77d9cb7fa88cca32b884"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
new file mode 100644
index 0000000000..32a3c51ac7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
new file mode 100644
index 0000000000..6dfb72bc31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
@@ -0,0 +1 @@
+@namespace Test.
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d99c176c52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..c3add1daa9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,2): Error RZ1007: "namespace" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..f34fe8f4a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml) - Html -  Test.
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..d292eeebcc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "de132bd3e2a46a0d2ec953a168427c01e5829cde"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(10, 6, true);
+            WriteLiteral(" Test.");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..cfbf688e18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,2): Error RZ9999: "namespace" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..fb0bab7833
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(10, 6, true);
+                HtmlContent - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml) - Html -  Test.
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
new file mode 100644
index 0000000000..4b73b2dc53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
@@ -0,0 +1 @@
+@model System.Collections.IEnumerable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
new file mode 100644
index 0000000000..c488b1e443
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -0,0 +1,6 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+<input-test for="Date" />
+<input-test for="@Model" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..82441cd663
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..1ecd121c63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
@@ -0,0 +1,66 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] ModelExpressionTagHelper.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] ModelExpressionTagHelper.cshtml) - "InputTestTagHelper, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (62:2,43 [4] ModelExpressionTagHelper.cshtml) - Html - \n\n
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..63a7d6ccc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|DateTime|
+Generated Location: (851:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1123:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Date|
+Generated Location: (1802:44,102 [4] )
+|Date|
+
+Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Model|
+Generated Location: (2118:50,94 [5] )
+|Model|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..8fb69e52ed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -0,0 +1,104 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0906a816db301fe624bbe5a96c4b3013071ea492"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(17, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(64, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(66, 25, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(91, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(93, 27, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(120, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..b336b645b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -0,0 +1,69 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
+                HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(66, 25, false);
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(91, 2, true);
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(93, 27, false);
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(120, 2, true);
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
new file mode 100644
index 0000000000..63c2a52c6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
new file mode 100644
index 0000000000..c18b0cd554
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
@@ -0,0 +1,36 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [30] Model.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
new file mode 100644
index 0000000000..7d84cf754d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (769:19,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
new file mode 100644
index 0000000000..cd4f57b409
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
@@ -0,0 +1,33 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "31c5b047a450ac9f6dc4116626667d26bfb657ba"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
new file mode 100644
index 0000000000..3f8d705381
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
new file mode 100644
index 0000000000..350f93b776
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
@@ -0,0 +1,2 @@
+@model ThisShouldBeGenerated
+@model System.Collections.IEnumerable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e8f705cef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<ThisShouldBeGenerated> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..2fe8233c66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml(2,1): Error RZ2001: The 'model' directive may only occur once per document.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
new file mode 100644
index 0000000000..a1ef9941e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
@@ -0,0 +1,39 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [21] MultipleModels.cshtml) - ThisShouldBeGenerated
+                DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (30:1,0 [39] MultipleModels.cshtml) - model
+                    DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
new file mode 100644
index 0000000000..79d7e257c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|ThisShouldBeGenerated|
+Generated Location: (778:19,0 [21] )
+|ThisShouldBeGenerated|
+
+Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (1029:27,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
new file mode 100644
index 0000000000..7438788ff4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
@@ -0,0 +1,14 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+@{ 
+    Layout = "_SectionTestLayout.cshtml";
+}
+
+<div>Some body</div>
+
+@section Section1 {
+    <div>This is in Section 1</div>
+    <input-test for="Date" />
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3ca46af8a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -0,0 +1,80 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object Section1 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            DefineSection("Section1", async(__razor_section_writer) => {
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
new file mode 100644
index 0000000000..515e48bee6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -0,0 +1,71 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] Sections.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] Sections.cshtml) - "InputTestTagHelper, AppCode"
+                DirectiveToken - (152:10,9 [8] Sections.cshtml) - Section1
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] Sections.cshtml)
+                    IntermediateToken - (62:2,43 [4] Sections.cshtml) - Html - \n\n
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                Section -  - Section1
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1cc991810c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|DateTime|
+Generated Location: (819:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1075:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Section1|
+Generated Location: (1305:36,22 [8] )
+|Section1|
+
+Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+Generated Location: (1771:51,2 [46] )
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+
+Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Date|
+Generated Location: (2196:59,102 [4] )
+|Date|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
new file mode 100644
index 0000000000..0430ccfc69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
@@ -0,0 +1,6 @@
+@addTagHelper "*, AppCode"
+@{
+    var foo = "Hello";
+}
+
+<vc:test first-name="@foo" bar=" World"></vc:test>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..b6196f6651
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,84 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AllTagHelper __AllTagHelper;
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+                __o = foo;
+
+#line default
+#line hidden
+            __TestViewComponentTagHelper.firstName = string.Empty;
+            __AllTagHelper.Bar = " World";
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..328b11876d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
@@ -0,0 +1,57 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (14:0,14 [12] ViewComponentTagHelper.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (26:0,26 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    DefaultTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - bar - string AllTagHelper.Bar - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (93:5,32 [6] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (93:5,32 [6] ViewComponentTagHelper.cshtml) - Html -  World
+                    DefaultTagHelperExecute - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9c5fd32efb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|"*, AppCode"|
+Generated Location: (1057:21,37 [12] )
+|"*, AppCode"|
+
+Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|
+    var foo = "Hello";
+|
+Generated Location: (1534:36,2 [26] )
+|
+    var foo = "Hello";
+|
+
+Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|foo|
+Generated Location: (1985:44,22 [3] )
+|foo|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..2c85bf513c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -0,0 +1,110 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6a0ad3c59f3a87877c36928472f0508bd40cdd8c"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::AllTagHelper __AllTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            BeginContext(59, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(61, 50, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __tagHelperExecutionContext.Add(__AllTagHelper);
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper>();
+            __tagHelperExecutionContext.Add(__TestViewComponentTagHelper);
+            BeginWriteTagHelperAttribute();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+         WriteLiteral(foo);
+
+#line default
+#line hidden
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestViewComponentTagHelper.firstName = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("first-name", __TestViewComponentTagHelper.firstName, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __AllTagHelper.Bar = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.String firstName { get; set; }
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync("Test", new { firstName });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..a1678711eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - bar -  World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(59, 2, true);
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(61, 50, false);
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]\npublic class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper\n{\n    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;\n    public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)\n    {\n        _helper = helper;\n    }\n    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]\n    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }\n    public System.String firstName { get; set; }\n    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)\n    {\n        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);\n        var content = await _helper.InvokeAsync("Test", new { firstName });\n        output.TagName = null;\n        output.Content.SetHtmlContent(content);\n    }\n}\n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
new file mode 100644
index 0000000000..f4e110d289
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
@@ -0,0 +1 @@
+@inject IHtmlHelper<TModel> Helper
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1f60d924cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+global::System.Object Helper = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..f75113d4b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [19] _ViewImports.cshtml) - IHtmlHelper<TModel>
+                DirectiveToken - (28:0,28 [6] _ViewImports.cshtml) - Helper
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..dc03ca32da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|IHtmlHelper<TModel>|
+Generated Location: (760:19,0 [19] )
+|IHtmlHelper<TModel>|
+
+Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|Helper|
+Generated Location: (1027:27,22 [6] )
+|Helper|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..2400a20b50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
@@ -0,0 +1,35 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e57bbc3e746e8b13b4c33d8df0e022bd397d8caa"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..3703d64a46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
new file mode 100644
index 0000000000..d88f379542
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -0,0 +1,343 @@
+// 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.Collections.Generic;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ViewComponentTagHelperDescriptorFactoryTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTagHelperDescriptorFactoryTest).GetTypeInfo().Assembly;
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsStringParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsVariousParameterTypes()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__VariousParameterViewComponentTagHelper",
+                typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__VariousParameterViewComponentTagHelper")
+                .DisplayName("VariousParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:various-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-enum"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-string"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("baz")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-enum")
+                    .PropertyName("testEnum")
+                    .TypeName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum))
+                    .AsEnum()
+                    .DisplayName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum) + " VariousParameterViewComponentTagHelper.testEnum"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-string")
+                    .PropertyName("testString")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string VariousParameterViewComponentTagHelper.testString"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("baz")
+                    .PropertyName("baz")
+                    .TypeName(typeof(int).FullName)
+                    .DisplayName("int VariousParameterViewComponentTagHelper.baz"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "VariousParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsGenericParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__GenericParameterViewComponentTagHelper",
+                typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__GenericParameterViewComponentTagHelper")
+                .DisplayName("GenericParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:generic-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("Foo")
+                    .TypeName("System.Collections.Generic.List<System.String>")
+                    .DisplayName("System.Collections.Generic.List<System.String> GenericParameterViewComponentTagHelper.Foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("Bar")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .AsDictionaryAttribute("bar-", typeof(int).FullName)
+                    .DisplayName("System.Collections.Generic.Dictionary<System.String, System.Int32> GenericParameterViewComponentTagHelper.Bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "GenericParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(ViewComponentWithoutInvokeMethod).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandString()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithVoid).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_ShouldReturnValue.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+    }
+
+    public class StringParameterViewComponent
+    {
+        public string Invoke(string foo, string bar) => null;
+    }
+
+    public class VariousParameterViewComponent
+    {
+        public string Invoke(TestEnum testEnum, string testString, int baz = 5) => null;
+
+        public enum TestEnum
+        {
+            A = 1,
+            B = 2,
+            C = 3
+        }
+    }
+
+    public class GenericParameterViewComponent
+    {
+        public string Invoke(List<string> Foo, Dictionary<string, int> Bar) => null;
+    }
+
+    public class ViewComponentWithoutInvokeMethod
+    {
+    }
+
+    public class AsyncViewComponentWithGenericTask
+    {
+        public Task<string> InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithNonGenericTask
+    {
+        public Task InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithVoid
+    {
+        public void InvokeAsync() { }
+    }
+
+    public class AsyncViewComponentWithString
+    {
+        public string InvokeAsync() => null;
+    }
+
+    public class SyncViewComponentWithVoid
+    {
+        public void Invoke() { }
+    }
+
+    public class SyncViewComponentWithNonGenericTask
+    {
+        public Task Invoke() => null;
+    }
+
+    public class SyncViewComponentWithGenericTask
+    {
+        public Task<string> Invoke() => null;
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..7ddd76d9fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,71 @@
+// 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.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    // This is just a basic integration test. There are detailed tests for the VCTH visitor and descriptor factory.
+    public class ViewComponentTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void DescriptorProvider_FindsVCTH()
+        {
+            // Arrange
+            var code = @"
+        public class StringParameterViewComponent
+        {
+            public string Invoke(string foo, string bar) => null;
+        }
+";
+
+            var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ViewComponentTagHelperDescriptorProvider()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                TestCompilation.AssemblyName)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs
new file mode 100644
index 0000000000..befa9d011c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs
@@ -0,0 +1,275 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ViewComponentTagHelperPassTest
+    {
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_IgnoresRegularTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .TypeName("TestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(3, @class.Children.Count); // No class node created for a VCTH
+            for (var i = 0; i < @class.Children.Count; i++)
+            {
+                Assert.IsNotType<ViewComponentTagHelperIntermediateNode>(@class.Children[i]);
+            }
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32")
+                        .PropertyName("Foo"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud tag-foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                        .PropertyName("Tags")
+                        .AsDictionaryAttribute("foo-", "System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[2]);
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children[3]);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_Nested()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper *, TestAssembly
+<p foo=""17""><tagcloud foo=""17""></p>");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly")
+                    .TypeName("PTestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var outerTagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal("PTestTagHelper", Assert.IsType<DefaultTagHelperCreateIntermediateNode>(outerTagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(outerTagHelper.Children[2]).PropertyName);
+
+            var vcth = FindTagHelperNode(outerTagHelper.Children[0]);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(vcth.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(vcth.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(5, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new MvcViewDocumentClassifierPass());
+
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // We also expect the default tag helper pass to run first.
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+
+            var defaultTagHelperPass = engine.Features.OfType<DefaultTagHelperOptimizationPass>().Single();
+            defaultTagHelperPass.Execute(codeDocument, documentNode);
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassDeclarationNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private class ClassDeclarationNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperTargetExtensionTest.cs
new file mode 100644
index 0000000000..2e3c476a36
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperTargetExtensionTest.cs
@@ -0,0 +1,120 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ViewComponentTagHelperTargetExtensionTest
+    {
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Int32")
+                    .PropertyName("Foo"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Int32 Foo { get; set; }
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .PropertyName("Tags")
+                    .AsDictionaryAttribute("foo-", "System.Int32"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }
+     = new System.Collections.Generic.Dictionary<System.String, System.Int32>();
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTypeVisitorTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTypeVisitorTest.cs
new file mode 100644
index 0000000000..96d879756c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTypeVisitorTest.cs
@@ -0,0 +1,202 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
+{
+    public class ViewComponentTypeVisitorTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly;
+
+        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+
+        // In practice MVC will provide a marker attribute for ViewComponents. To prevent a circular reference between MVC and Razor
+        // we can use a test class as a marker.
+        private static INamedTypeSymbol TestViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestViewComponentAttribute).FullName);
+        private static INamedTypeSymbol TestNonViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestNonViewComponentAttribute).FullName);
+
+        [Fact]
+        public void IsViewComponent_PlainViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_PlainViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_DecoratedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_InheritedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_AbstractViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_AbstractViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_GenericViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_GenericViewComponent<>).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InternalViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InternalViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_DecoratedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InheritedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        public abstract class Invalid_AbstractViewComponent
+        {
+        }
+
+        public class Invalid_GenericViewComponent<T>
+        {
+        }
+
+        internal class Invalid_InternalViewComponent
+        {
+        }
+
+        public class Valid_PlainViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Valid_DecoratedVC
+        {
+        }
+
+        public class Valid_InheritedVC : Valid_DecoratedVC
+        {
+        }
+
+        [TestNonViewComponent]
+        public class Invalid_DecoratedViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Invalid_InheritedViewComponent : Invalid_DecoratedViewComponent
+        {
+        }
+
+        public class TestViewComponentAttribute : Attribute
+        {
+        }
+
+        public class TestNonViewComponentAttribute : Attribute
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/xunit.runner.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/xunit.runner.json
new file mode 100644
index 0000000000..fcf172c8fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/AssemblyAttributeInjectionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/AssemblyAttributeInjectionPass.cs
new file mode 100644
index 0000000000..021c61c368
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/AssemblyAttributeInjectionPass.cs
@@ -0,0 +1,102 @@
+// 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.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class AssemblyAttributeInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string RazorViewAttribute = "global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute";
+        private const string RazorPageAttribute = "global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.Options.DesignTime)
+            {
+                return;
+            }
+
+            var @namespace = documentNode.FindPrimaryNamespace();
+            if (@namespace == null || string.IsNullOrEmpty(@namespace.Content))
+            {
+                // No namespace node or it's incomplete. Skip.
+                return;
+            }
+
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null || string.IsNullOrEmpty(@class.ClassName))
+            {
+                // No class node or it's incomplete. Skip.
+                return;
+            }
+
+            var generatedTypeName = $"{@namespace.Content}.{@class.ClassName}";
+
+            // The MVC attributes require a relative path to be specified so that we can make a view engine path.
+            // We can't use a rooted path because we don't know what the project root is.
+            //
+            // If we can't sanitize the path, we'll just set it to null and let is blow up at runtime - we don't
+            // want to create noise if this code has to run in some unanticipated scenario.
+            var escapedPath = MakeVerbatimStringLiteral(ConvertToViewEnginePath(codeDocument.Source.RelativePath));
+
+            string attribute;
+            if (documentNode.DocumentKind == MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+            {
+                attribute = $"[assembly:{RazorViewAttribute}({escapedPath}, typeof({generatedTypeName}))]";
+            }
+            else if (documentNode.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                PageDirective.TryGetPageDirective(documentNode, out var pageDirective))
+            {
+                var escapedRoutePrefix = MakeVerbatimStringLiteral(pageDirective.RouteTemplate);
+                attribute = $"[assembly:{RazorPageAttribute}({escapedPath}, typeof({generatedTypeName}), {escapedRoutePrefix})]";
+            }
+            else
+            {
+                return;
+            }
+
+            var index = documentNode.Children.IndexOf(@namespace);
+            Debug.Assert(index >= 0);
+
+            var pageAttribute = new CSharpCodeIntermediateNode();
+            pageAttribute.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = attribute,
+            });
+
+            documentNode.Children.Insert(index, pageAttribute);
+        }
+
+        private static string MakeVerbatimStringLiteral(string value)
+        {
+            if (value == null)
+            {
+                return "null";
+            }
+
+            value = value.Replace("\"", "\"\"");
+            return $"@\"{value}\"";
+        }
+        
+        private static string ConvertToViewEnginePath(string relativePath)
+        {
+            if (string.IsNullOrEmpty(relativePath))
+            {
+                return null;
+            }
+
+            // Checking for both / and \ because a \ will become a /.
+            if (!relativePath.StartsWith("/") && !relativePath.StartsWith("\\"))
+            {
+                relativePath = "/" + relativePath;
+            }
+            
+            relativePath = relativePath.Replace('\\', '/');
+            return relativePath;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs
new file mode 100644
index 0000000000..77a5e8f54e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal static class CSharpIdentifier
+    {
+        private const string CshtmlExtension = ".cshtml";
+
+        public static string GetClassNameFromPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            if (path.EndsWith(CshtmlExtension, StringComparison.OrdinalIgnoreCase))
+            {
+                path = path.Substring(0, path.Length - CshtmlExtension.Length);
+            }
+
+            return SanitizeClassName(path);
+        }
+
+        // CSharp Spec §2.4.2
+        private static bool IsIdentifierStart(char character)
+        {
+            return char.IsLetter(character) ||
+                character == '_' ||
+                CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
+        }
+
+        public static bool IsIdentifierPart(char character)
+        {
+            return char.IsDigit(character) ||
+                   IsIdentifierStart(character) ||
+                   IsIdentifierPartByUnicodeCategory(character);
+        }
+
+        private static bool IsIdentifierPartByUnicodeCategory(char character)
+        {
+            var category = CharUnicodeInfo.GetUnicodeCategory(character);
+
+            return category == UnicodeCategory.NonSpacingMark || // Mn
+                category == UnicodeCategory.SpacingCombiningMark || // Mc
+                category == UnicodeCategory.ConnectorPunctuation || // Pc
+                category == UnicodeCategory.Format; // Cf
+        }
+
+        public static string SanitizeClassName(string inputName)
+        {
+            if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
+            {
+                inputName = "_" + inputName;
+            }
+
+            var builder = new StringBuilder(inputName.Length);
+            for (var i = 0; i < inputName.Length; i++)
+            {
+                var ch = inputName[i];
+                builder.Append(IsIdentifierPart(ch) ? ch : '_');
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ExtensionInitializer.cs
new file mode 100644
index 0000000000..03d05f7f9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ExtensionInitializer.cs
@@ -0,0 +1,15 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ExtensionInitializer : RazorExtensionInitializer
+    {
+        public override void Initialize(RazorProjectEngineBuilder builder)
+        {
+            RazorExtensions.Register(builder);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IInjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IInjectTargetExtension.cs
new file mode 100644
index 0000000000..c334e23c2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IInjectTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public interface IInjectTargetExtension : ICodeTargetExtension
+    {
+        void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..f3e07a2b75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/IViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public interface IViewComponentTagHelperTargetExtension : ICodeTargetExtension
+    {
+        void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectDirective.cs
new file mode 100644
index 0000000000..9442aaf641
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectDirective.cs
@@ -0,0 +1,124 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class InjectDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "inject",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder
+                    .AddTypeToken(Resources.InjectDirective_TypeToken_Name, Resources.InjectDirective_TypeToken_Description)
+                    .AddMemberToken(Resources.InjectDirective_MemberToken_Name, Resources.InjectDirective_MemberToken_Description);
+
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = Resources.InjectDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @model and @namespace directives
+            public override int Order => 10;
+            
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+                var modelType = ModelDirective.GetModelType(documentNode);
+
+                var properties = new HashSet<string>(StringComparer.Ordinal);
+
+                for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+                {
+                    var directive = visitor.Directives[i];
+                    var tokens = directive.Tokens.ToArray();
+                    if (tokens.Length < 2)
+                    {
+                        continue;
+                    }
+
+                    var typeName = tokens[0].Content;
+                    var memberName = tokens[1].Content;
+
+                    if (!properties.Add(memberName))
+                    {
+                        continue;
+                    }
+
+                    typeName = typeName.Replace("<TModel>", "<" + modelType + ">");
+
+                    var injectNode = new InjectIntermediateNode()
+                    {
+                        TypeName = typeName,
+                        MemberName = memberName,
+                    };
+
+                    visitor.Class.Children.Add(injectNode);
+                }
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> Directives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    Directives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectIntermediateNode.cs
new file mode 100644
index 0000000000..4e3603f40d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectIntermediateNode.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectIntermediateNode : ExtensionIntermediateNode
+    {
+        public string TypeName { get; set; }
+
+        public string MemberName { get; set; }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<InjectIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IInjectTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IInjectTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteInjectProperty(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(MemberName);
+
+            formatter.WriteProperty(nameof(MemberName), MemberName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs
new file mode 100644
index 0000000000..1660b84d6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectTargetExtension : IInjectTargetExtension
+    {
+        private const string RazorInjectAttribute = "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]";
+
+        public void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var property = $"public {node.TypeName} {node.MemberName} {{ get; private set; }}";
+
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.CodeWriter
+                        .WriteLine(RazorInjectAttribute)
+                        .WriteLine(property);
+                }
+            }
+            else
+            {
+                context.CodeWriter
+                    .WriteLine(RazorInjectAttribute)
+                    .WriteLine(property);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InstrumentationPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InstrumentationPass.cs
new file mode 100644
index 0000000000..f82ed32e45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InstrumentationPass.cs
@@ -0,0 +1,125 @@
+// 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.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InstrumentationPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        public override int Order => DefaultFeatureOrder;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.Options.DesignTime)
+            {
+                return;
+            }
+
+            var walker = new Visitor();
+            walker.VisitDocument(documentNode);
+
+            for (var i = 0; i < walker.Items.Count; i++)
+            {
+                var node = walker.Items[i];
+     
+                AddInstrumentation(node);
+            }
+        }
+
+        private static void AddInstrumentation(InstrumentationItem item)
+        {
+            var beginContextMethodName = "BeginContext"; // ORIGINAL: BeginContextMethodName
+            var endContextMethodName = "EndContext"; // ORIGINAL: EndContextMethodName
+
+            var beginNode = new CSharpCodeIntermediateNode();
+            beginNode.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = string.Format("{0}({1}, {2}, {3});",
+                    beginContextMethodName,
+                    item.Source.AbsoluteIndex.ToString(CultureInfo.InvariantCulture),
+                    item.Source.Length.ToString(CultureInfo.InvariantCulture),
+                    item.IsLiteral ? "true" : "false")
+            });
+
+            var endNode = new CSharpCodeIntermediateNode();
+            endNode.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = string.Format("{0}();", endContextMethodName)
+            });
+
+            var nodeIndex = item.Parent.Children.IndexOf(item.Node);
+            item.Parent.Children.Insert(nodeIndex, beginNode);
+            item.Parent.Children.Insert(nodeIndex + 2, endNode);
+        }
+
+        private struct InstrumentationItem
+        {
+            public InstrumentationItem(IntermediateNode node, IntermediateNode parent, bool isLiteral, SourceSpan source)
+            {
+                Node = node;
+                Parent = parent;
+                IsLiteral = isLiteral;
+                Source = source;
+            }
+
+            public IntermediateNode Node { get; }
+
+            public IntermediateNode Parent { get; }
+
+            public bool IsLiteral { get; }
+
+            public SourceSpan Source { get; }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public List<InstrumentationItem> Items { get; } = new List<InstrumentationItem>();
+
+            public override void VisitHtml(HtmlContentIntermediateNode node)
+            {
+                if (node.Source != null)
+                {
+                    Items.Add(new InstrumentationItem(node, Parent, isLiteral: true, source: node.Source.Value));
+                }
+
+                VisitDefault(node);
+            }
+
+            public override void VisitCSharpExpression(CSharpExpressionIntermediateNode node)
+            {
+                if (node.Source != null)
+                {
+                    Items.Add(new InstrumentationItem(node, Parent, isLiteral: false, source: node.Source.Value));
+                }
+
+                VisitDefault(node);
+            }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                if (node.Source != null)
+                {
+                    Items.Add(new InstrumentationItem(node, Parent, isLiteral: false, source: node.Source.Value));
+                }
+
+                // Inside a tag helper we only want to visit inside of the body (skip all of the attributes and properties).
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    var child = node.Children[i];
+                    if (child is TagHelperBodyIntermediateNode || 
+                        child is DefaultTagHelperBodyIntermediateNode)
+                    {
+                        VisitDefault(child);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
new file mode 100644
index 0000000000..e77d4c3837
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs">
+      <Link>Shared\CodeWriterExtensions.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="../Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelDirective.cs
new file mode 100644
index 0000000000..cf80df5f68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelDirective.cs
@@ -0,0 +1,152 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class ModelDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "model",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(Resources.ModelDirective_TypeToken_Name, Resources.ModelDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.ModelDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+
+        public static string GetModelType(DocumentIntermediateNode document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var visitor = new Visitor();
+            return GetModelType(document, visitor);
+        }
+
+        private static string GetModelType(DocumentIntermediateNode document, Visitor visitor)
+        {
+            visitor.Visit(document);
+
+            for (var i = visitor.ModelDirectives.Count - 1; i >= 0; i--)
+            {
+                var directive = visitor.ModelDirectives[i];
+
+                var tokens = directive.Tokens.ToArray();
+                if (tokens.Length >= 1)
+                {
+                    return tokens[0].Content;
+                }
+            }
+
+            if (document.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+            {
+                return visitor.Class.ClassName;
+            }
+            else
+            {
+                return "dynamic";
+            }
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @inherits directive
+            public override int Order => 5;
+
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                var modelType = GetModelType(documentNode, visitor);
+
+                if (documentNode.Options.DesignTime)
+                {
+                    // Alias the TModel token to a known type.
+                    // This allows design time compilation to succeed for Razor files where the token isn't replaced.
+                    var typeName = $"global::{typeof(object).FullName}";
+                    var usingNode = new UsingDirectiveIntermediateNode()
+                    {
+                        Content = $"TModel = {typeName}"
+                    };
+
+                    visitor.Namespace?.Children.Insert(0, usingNode);
+                }
+
+                var baseType = visitor.Class?.BaseType?.Replace("<TModel>", "<" + modelType + ">");
+                visitor.Class.BaseType = baseType;
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> ModelDirectives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (Namespace == null)
+                {
+                    Namespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    ModelDirectives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelExpressionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelExpressionPass.cs
new file mode 100644
index 0000000000..ef8e8fb181
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelExpressionPass.cs
@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ModelExpressionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string ModelExpressionTypeName = "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public List<TagHelperIntermediateNode> TagHelpers { get; } = new List<TagHelperIntermediateNode>();
+
+            public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+            {
+                if (string.Equals(node.BoundAttribute.TypeName, ModelExpressionTypeName, StringComparison.Ordinal) ||
+                    (node.IsIndexerNameMatch &&
+                     string.Equals(node.BoundAttribute.IndexerTypeName, ModelExpressionTypeName, StringComparison.Ordinal)))
+                {
+                    var expression = new CSharpExpressionIntermediateNode();
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ",
+                    });
+
+                    if (node.Children.Count == 1 && node.Children[0] is IntermediateToken token && token.IsCSharp)
+                    {
+                        // A 'simple' expression will look like __model => __model.Foo
+
+                        expression.Children.Add(new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = "__model."
+                        });
+
+                        expression.Children.Add(token);
+                    }
+                    else
+                    {
+                        for (var i = 0; i < node.Children.Count; i++)
+                        {
+                            if (node.Children[i] is CSharpExpressionIntermediateNode nestedExpression)
+                            {
+                                for (var j = 0; j < nestedExpression.Children.Count; j++)
+                                {
+                                    if (nestedExpression.Children[j] is IntermediateToken cSharpToken &&
+                                        cSharpToken.IsCSharp)
+                                    {
+                                        expression.Children.Add(cSharpToken);
+                                    }
+                                }
+
+                                continue;
+                            }
+                        }
+                    }
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = ")",
+                    });
+
+                    node.Children.Clear();
+
+                    node.Children.Add(expression);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
new file mode 100644
index 0000000000..c25cb0d063
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
@@ -0,0 +1,91 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class MvcImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+    {
+        private const string ImportsFileName = "_ViewImports.cshtml";
+
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var imports = new List<RazorProjectItem>();
+            AddDefaultDirectivesImport(imports);
+
+            // We add hierarchical imports second so any default directive imports can be overridden.
+            AddHierarchicalImports(projectItem, imports);
+
+            return imports;
+        }
+
+        // Internal for testing
+        internal static void AddDefaultDirectivesImport(List<RazorProjectItem> imports)
+        {
+            imports.Add(DefaultDirectivesProjectItem.Instance);
+        }
+
+        // Internal for testing
+        internal void AddHierarchicalImports(RazorProjectItem projectItem, List<RazorProjectItem> imports)
+        {
+            // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+            var importProjectItems = ProjectEngine.FileSystem.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse();
+            imports.AddRange(importProjectItems);
+        }
+
+        private class DefaultDirectivesProjectItem : RazorProjectItem
+        {
+            private readonly byte[] _defaultImportBytes;
+
+            private DefaultDirectivesProjectItem()
+            {
+                var preamble = Encoding.UTF8.GetPreamble();
+                var content = @"
+@using System
+@using System.Collections.Generic
+@using System.Linq
+@using System.Threading.Tasks
+@using Microsoft.AspNetCore.Mvc
+@using Microsoft.AspNetCore.Mvc.Rendering
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json
+@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component
+@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url
+@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+";
+                var contentBytes = Encoding.UTF8.GetBytes(content);
+
+                _defaultImportBytes = new byte[preamble.Length + contentBytes.Length];
+                preamble.CopyTo(_defaultImportBytes, 0);
+                contentBytes.CopyTo(_defaultImportBytes, preamble.Length);
+            }
+
+            public override string BasePath => null;
+
+            public override string FilePath => null;
+
+            public override string PhysicalPath => null;
+
+            public override bool Exists => true;
+
+            public static DefaultDirectivesProjectItem Instance { get; } = new DefaultDirectivesProjectItem();
+
+            public override Stream Read() => new MemoryStream(_defaultImportBytes);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcViewDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcViewDocumentClassifierPass.cs
new file mode 100644
index 0000000000..7ec6a1360e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcViewDocumentClassifierPass.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class MvcViewDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string MvcViewDocumentKind = "mvc.1.0.view";
+
+        protected override string DocumentKind => MvcViewDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) => true;
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument, 
+            NamespaceDeclarationIntermediateNode @namespace, 
+            ClassDeclarationIntermediateNode @class, 
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+            }
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+        }
+
+        private static string BytesToString(byte[] bytes)
+        {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException(nameof(bytes));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/NamespaceDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/NamespaceDirective.cs
new file mode 100644
index 0000000000..de05d354b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/NamespaceDirective.cs
@@ -0,0 +1,204 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class NamespaceDirective
+    {
+        private static readonly char[] Separators = new char[] { '\\', '/' };
+
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "namespace",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddNamespaceToken(
+                    Resources.NamespaceDirective_NamespaceToken_Name,
+                    Resources.NamespaceDirective_NamespaceToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.NamespaceDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+
+        // internal for testing
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                    documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+                {
+                    // Not a page. Skip.
+                    return;
+                }
+
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+
+                var directive = visitor.LastNamespaceDirective;
+                if (directive == null)
+                {
+                    // No namespace set. Skip.
+                    return;
+                }
+
+                var @namespace = visitor.FirstNamespace;
+                if (@namespace == null)
+                {
+                    // No namespace node. Skip.
+                    return;
+                }
+
+                @namespace.Content = GetNamespace(codeDocument.Source.FilePath, directive);
+            }
+        }
+
+        // internal for testing.
+        //
+        // This code does a best-effort attempt to compute a namespace 'suffix' - the path difference between
+        // where the @namespace directive appears and where the current document is on disk.
+        //
+        // In the event that these two source either don't have FileNames set or don't follow a coherent hierarchy,
+        // we will just use the namespace verbatim.
+        internal static string GetNamespace(string source, DirectiveIntermediateNode directive)
+        {
+            var directiveSource = NormalizeDirectory(directive.Source?.FilePath);
+
+            var baseNamespace = directive.Tokens.FirstOrDefault()?.Content;
+            if (string.IsNullOrEmpty(baseNamespace))
+            {
+                // The namespace directive was incomplete.
+                return string.Empty;
+            }
+
+            if (string.IsNullOrEmpty(source) || directiveSource == null)
+            {
+                // No sources, can't compute a suffix.
+                return baseNamespace;
+            }
+
+            // We're specifically using OrdinalIgnoreCase here because Razor treats all paths as case-insensitive.
+            if (!source.StartsWith(directiveSource, StringComparison.OrdinalIgnoreCase) ||
+                source.Length <= directiveSource.Length)
+            {
+                // The imports are not from the directory hierarchy, can't compute a suffix.
+                return baseNamespace;
+            }
+
+            // OK so that this point we know that the 'imports' file containing this directive is in the directory
+            // hierarchy of this soure file. This is the case where we can append a suffix to the baseNamespace.
+            //
+            // Everything so far has just been defensiveness on our part.
+
+            var builder = new StringBuilder(baseNamespace);
+
+            var segments = source.Substring(directiveSource.Length).Split(Separators);
+
+            // Skip the last segment because it's the FileName.
+            for (var i = 0; i < segments.Length - 1; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeClassName(segments[i]));
+            }
+
+            return builder.ToString();
+        }
+
+        // We want to normalize the path of the file containing the '@namespace' directive to just the containing
+        // directory with a trailing separator.
+        //
+        // Not using Path.GetDirectoryName here because it doesn't meet these requirements, and we want to handle
+        // both 'view engine' style paths and absolute paths.
+        //
+        // We also don't normalize the separators here. We expect that all documents are using a consistent style of path.
+        // 
+        // If we can't normalize the path, we just return null so it will be ignored.
+        private static string NormalizeDirectory(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                return null;
+            }
+
+            var lastSeparator = path.LastIndexOfAny(Separators);
+            if (lastSeparator == -1)
+            {
+                return null;
+            }
+
+            // Includes the separator
+            return path.Substring(0, lastSeparator + 1);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode FirstClass { get; private set; }
+
+            public NamespaceDeclarationIntermediateNode FirstNamespace { get; private set; }
+
+            // We want the last one, so get them all and then .
+            public DirectiveIntermediateNode LastNamespaceDirective { get; private set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (FirstNamespace == null)
+                {
+                    FirstNamespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (FirstClass == null)
+                {
+                    FirstClass = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    LastNamespaceDirective = node;
+                }
+
+                base.VisitDirective(node);
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PageDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PageDirective.cs
new file mode 100644
index 0000000000..9b483f9b9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PageDirective.cs
@@ -0,0 +1,121 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class PageDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "page",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddOptionalStringToken(Resources.PageDirective_RouteToken_Name, Resources.PageDirective_RouteToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.PageDirective_Description;
+            });
+
+        private PageDirective(string routeTemplate, IntermediateNode directiveNode)
+        {
+            RouteTemplate = routeTemplate;
+            DirectiveNode = directiveNode;
+        }
+
+        public string RouteTemplate { get; }
+
+        public IntermediateNode DirectiveNode { get; }
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+
+        public static bool TryGetPageDirective(DocumentIntermediateNode documentNode, out PageDirective pageDirective)
+        {
+            var visitor = new Visitor();
+            for (var i = 0; i < documentNode.Children.Count; i++)
+            {
+                visitor.Visit(documentNode.Children[i]);
+            }
+
+            if (visitor.DirectiveTokens == null)
+            {
+                pageDirective = null;
+                return false;
+            }
+
+            var tokens = visitor.DirectiveTokens.ToList();
+            string routeTemplate = null;
+            if (tokens.Count > 0)
+            {
+                routeTemplate = TrimQuotes(tokens[0].Content);
+            }
+
+            pageDirective = new PageDirective(routeTemplate, visitor.DirectiveNode);
+            return true;
+        }
+
+        private static string TrimQuotes(string content)
+        {
+            // Tokens aren't captured if they're malformed. Therefore, this method will
+            // always be called with a valid token content.
+            Debug.Assert(content.Length >= 2);
+            Debug.Assert(content.StartsWith("\"", StringComparison.Ordinal));
+            Debug.Assert(content.EndsWith("\"", StringComparison.Ordinal));
+
+            return content.Substring(1, content.Length - 2);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public IntermediateNode DirectiveNode { get; private set; }
+
+            public IEnumerable<DirectiveTokenIntermediateNode> DirectiveTokens { get; private set; }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    DirectiveNode = node;
+                    DirectiveTokens = node.Tokens;
+                }
+            }
+
+            public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+            {
+                if (DirectiveTokens == null && node.Directive == Directive)
+                {
+                    DirectiveNode = node;
+                    DirectiveTokens = node.Tokens;
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PagesPropertyInjectionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PagesPropertyInjectionPass.cs
new file mode 100644
index 0000000000..4010c1903b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PagesPropertyInjectionPass.cs
@@ -0,0 +1,57 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class PagesPropertyInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+            {
+                return;
+            }
+
+            var modelType = ModelDirective.GetModelType(documentNode);
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+
+            var @class = visitor.Class;
+
+            var viewDataType = $"global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<{modelType}>";
+            var vddProperty = new CSharpCodeIntermediateNode();
+            vddProperty.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
+            });
+            @class.Children.Add(vddProperty);
+
+            var modelProperty = new CSharpCodeIntermediateNode();
+            modelProperty.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"public {modelType} Model => ViewData.Model;",
+            });
+            @class.Children.Add(modelProperty);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..a7a402e09a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// 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.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X;
+using Microsoft.AspNetCore.Razor.Language;
+
+[assembly: ProvideRazorExtensionInitializer("MVC-2.0", typeof(ExtensionInitializer))]
+[assembly: ProvideRazorExtensionInitializer("MVC-2.1", typeof(ExtensionInitializer))]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..ec4883803c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs
@@ -0,0 +1,338 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string InjectDirective_Description
+        {
+            get => GetString("InjectDirective_Description");
+        }
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string FormatInjectDirective_Description()
+            => GetString("InjectDirective_Description");
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Description
+        {
+            get => GetString("InjectDirective_MemberToken_Description");
+        }
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Description()
+            => GetString("InjectDirective_MemberToken_Description");
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Name
+        {
+            get => GetString("InjectDirective_MemberToken_Name");
+        }
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Name()
+            => GetString("InjectDirective_MemberToken_Name");
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Description
+        {
+            get => GetString("InjectDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Description()
+            => GetString("InjectDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Name
+        {
+            get => GetString("InjectDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Name()
+            => GetString("InjectDirective_TypeToken_Name");
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string ModelDirective_Description
+        {
+            get => GetString("ModelDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string FormatModelDirective_Description()
+            => GetString("ModelDirective_Description");
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Description
+        {
+            get => GetString("ModelDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Description()
+            => GetString("ModelDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Name
+        {
+            get => GetString("ModelDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Name()
+            => GetString("ModelDirective_TypeToken_Name");
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
+        {
+            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
+        }
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
+        {
+            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
+        }
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
+        {
+            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
+        }
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
+        {
+            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
+        }
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string MvcRazorParser_InvalidPropertyType
+        {
+            get => GetString("MvcRazorParser_InvalidPropertyType");
+        }
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
+
+        /// <summary>
+        /// Specify the base namespace for the page.
+        /// </summary>
+        internal static string NamespaceDirective_Description
+        {
+            get => GetString("NamespaceDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the base namespace for the page.
+        /// </summary>
+        internal static string FormatNamespaceDirective_Description()
+            => GetString("NamespaceDirective_Description");
+
+        /// <summary>
+        /// The namespace for the page.
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Description
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Description");
+        }
+
+        /// <summary>
+        /// The namespace for the page.
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Description()
+            => GetString("NamespaceDirective_NamespaceToken_Description");
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Name
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Name");
+        }
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Name()
+            => GetString("NamespaceDirective_NamespaceToken_Name");
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string PageDirectiveCannotBeImported
+        {
+            get => GetString("PageDirectiveCannotBeImported");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
+
+        /// <summary>
+        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
+        /// </summary>
+        internal static string PageDirectiveMustExistAtTheTopOfFile
+        {
+            get => GetString("PageDirectiveMustExistAtTheTopOfFile");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
+        /// </summary>
+        internal static string FormatPageDirectiveMustExistAtTheTopOfFile(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveMustExistAtTheTopOfFile"), p0);
+
+        /// <summary>
+        /// Mark the page as a Razor Page.
+        /// </summary>
+        internal static string PageDirective_Description
+        {
+            get => GetString("PageDirective_Description");
+        }
+
+        /// <summary>
+        /// Mark the page as a Razor Page.
+        /// </summary>
+        internal static string FormatPageDirective_Description()
+            => GetString("PageDirective_Description");
+
+        /// <summary>
+        /// An optional route template for the page.
+        /// </summary>
+        internal static string PageDirective_RouteToken_Description
+        {
+            get => GetString("PageDirective_RouteToken_Description");
+        }
+
+        /// <summary>
+        /// An optional route template for the page.
+        /// </summary>
+        internal static string FormatPageDirective_RouteToken_Description()
+            => GetString("PageDirective_RouteToken_Description");
+
+        /// <summary>
+        /// RouteTemplate
+        /// </summary>
+        internal static string PageDirective_RouteToken_Name
+        {
+            get => GetString("PageDirective_RouteToken_Name");
+        }
+
+        /// <summary>
+        /// RouteTemplate
+        /// </summary>
+        internal static string FormatPageDirective_RouteToken_Name()
+            => GetString("PageDirective_RouteToken_Name");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs
new file mode 100644
index 0000000000..3309adf1c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs
@@ -0,0 +1,100 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class ViewComponentResources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string ViewComponent_AmbiguousMethods
+        {
+            get => GetString("ViewComponent_AmbiguousMethods");
+        }
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
+        {
+            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string ViewComponent_CannotFindMethod
+        {
+            get => GetString("ViewComponent_CannotFindMethod");
+        }
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_CannotReturnTask
+        {
+            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_ShouldReturnValue
+        {
+            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
new file mode 100644
index 0000000000..69cf7e2055
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
@@ -0,0 +1,48 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class RazorExtensions
+    {
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            InjectDirective.Register(builder);
+            ModelDirective.Register(builder);
+            NamespaceDirective.Register(builder);
+            PageDirective.Register(builder);
+
+            InheritsDirective.Register(builder);
+            SectionDirective.Register(builder);
+
+            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+
+            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
+            builder.AddTargetExtension(new TemplateTargetExtension()
+            {
+                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
+            });
+
+            builder.Features.Add(new ModelExpressionPass());
+            builder.Features.Add(new PagesPropertyInjectionPass());
+            builder.Features.Add(new ViewComponentTagHelperPass());
+            builder.Features.Add(new RazorPageDocumentClassifierPass());
+            builder.Features.Add(new MvcViewDocumentClassifierPass());
+            builder.Features.Add(new AssemblyAttributeInjectionPass());
+            builder.Features.Add(new InstrumentationPass());
+
+            builder.SetImportFeature(new MvcImportProjectFeature());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensionsDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensionsDiagnosticFactory.cs
new file mode 100644
index 0000000000..05a01d38a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensionsDiagnosticFactory.cs
@@ -0,0 +1,131 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class RazorExtensionsDiagnosticFactory
+    {
+        private const string DiagnosticPrefix = "RZ";
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_CannotFindMethod =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3900",
+                () => ViewComponentResources.ViewComponent_CannotFindMethod,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_CannotFindMethod(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_CannotFindMethod,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AmbiguousMethods =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3901",
+                () => ViewComponentResources.ViewComponent_AmbiguousMethods,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AmbiguousMethods(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AmbiguousMethods,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperType,
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AsyncMethod_ShouldReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3902",
+                () => ViewComponentResources.ViewComponent_AsyncMethod_ShouldReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AsyncMethod_ShouldReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AsyncMethod_ShouldReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_ShouldReturnValue =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3903",
+                () => ViewComponentResources.ViewComponent_SyncMethod_ShouldReturnValue,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_ShouldReturnValue(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_ShouldReturnValue,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_CannotReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3904",
+                () => ViewComponentResources.ViewComponent_SyncMethod_CannotReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_CannotReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_CannotReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor PageDirective_CannotBeImported =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3905",
+                () => Resources.PageDirectiveCannotBeImported,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_CannotBeImported(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_CannotBeImported, source, PageDirective.Directive.Directive, fileName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor PageDirective_MustExistAtTheTopOfFile =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3906",
+                () => Resources.PageDirectiveMustExistAtTheTopOfFile,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_MustExistAtTheTopOfFile(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_MustExistAtTheTopOfFile, source, PageDirective.Directive.Directive);
+
+            return diagnostic;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs
new file mode 100644
index 0000000000..a5de7d0783
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs
@@ -0,0 +1,164 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class RazorPageDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string RazorPageDocumentKind = "mvc.1.0.razor-page";
+        public static readonly string RouteTemplateKey = "RouteTemplate";
+
+        private static readonly RazorProjectEngine LeadingDirectiveParsingEngine = RazorProjectEngine.Create(
+            RazorConfiguration.Default,
+            RazorProjectFileSystem.Create("/"),
+            builder =>
+            {
+                for (var i = builder.Phases.Count - 1; i >= 0; i--)
+                {
+                    var phase = builder.Phases[i];
+                    builder.Phases.RemoveAt(i);
+                    if (phase is IRazorDocumentClassifierPhase)
+                    {
+                        break;
+                    }
+                }
+
+                RazorExtensions.Register(builder);
+                builder.Features.Add(new LeadingDirectiveParserOptionsFeature());
+            });
+
+        protected override string DocumentKind => RazorPageDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            return PageDirective.TryGetPageDirective(documentNode, out var pageDirective);
+        }
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument,
+            NamespaceDeclarationIntermediateNode @namespace,
+            ClassDeclarationIntermediateNode @class,
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.RazorPages.Page";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+            }
+
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+
+            var document = codeDocument.GetDocumentIntermediateNode();
+            PageDirective.TryGetPageDirective(document, out var pageDirective);
+
+            EnsureValidPageDirective(codeDocument, pageDirective);
+
+            AddRouteTemplateMetadataAttribute(@namespace, @class, pageDirective);
+        }
+
+        private static void AddRouteTemplateMetadataAttribute(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, PageDirective pageDirective)
+        {
+            if (string.IsNullOrEmpty(pageDirective.RouteTemplate))
+            {
+                return;
+            }
+
+            var classIndex = @namespace.Children.IndexOf(@class);
+            if (classIndex == -1)
+            {
+                return;
+            }
+
+            var metadataAttributeNode = new RazorCompiledItemMetadataAttributeIntermediateNode
+            {
+                Key = RouteTemplateKey,
+                Value = pageDirective.RouteTemplate,
+            };
+            // Metadata attributes need to be inserted right before the class declaration.
+            @namespace.Children.Insert(classIndex, metadataAttributeNode);
+        }
+
+        private void EnsureValidPageDirective(RazorCodeDocument codeDocument, PageDirective pageDirective)
+        {
+            Debug.Assert(pageDirective != null);
+
+            if (pageDirective.DirectiveNode.IsImported())
+            {
+                pageDirective.DirectiveNode.Diagnostics.Add(
+                    RazorExtensionsDiagnosticFactory.CreatePageDirective_CannotBeImported(pageDirective.DirectiveNode.Source.Value));
+            }
+            else
+            {
+                // The document contains a page directive and it is not imported.
+                // We now want to make sure this page directive exists at the top of the file.
+                // We are going to do that by re-parsing the document until the very first line that is not Razor comment
+                // or whitespace. We then make sure the page directive still exists in the re-parsed IR tree.
+                var leadingDirectiveCodeDocument = RazorCodeDocument.Create(codeDocument.Source);
+                LeadingDirectiveParsingEngine.Engine.Process(leadingDirectiveCodeDocument);
+
+                var leadingDirectiveDocumentNode = leadingDirectiveCodeDocument.GetDocumentIntermediateNode();
+                if (!PageDirective.TryGetPageDirective(leadingDirectiveDocumentNode, out var _))
+                {
+                    // The page directive is not the leading directive. Add an error.
+                    pageDirective.DirectiveNode.Diagnostics.Add(
+                        RazorExtensionsDiagnosticFactory.CreatePageDirective_MustExistAtTheTopOfFile(pageDirective.DirectiveNode.Source.Value));
+                }
+            }
+        }
+
+        private class LeadingDirectiveParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorParserOptionsFeature
+        {
+            public int Order { get; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.ParseLeadingDirectives = true;
+            }
+        }
+
+        private static string BytesToString(byte[] bytes)
+        {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException(nameof(bytes));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Resources.resx
new file mode 100644
index 0000000000..474537197e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Resources.resx
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="InjectDirective_Description" xml:space="preserve">
+    <value>Inject a service from the application's service container into a property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Description" xml:space="preserve">
+    <value>The name of the property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Name" xml:space="preserve">
+    <value>PropertyName</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Description" xml:space="preserve">
+    <value>The type of the service to inject.</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="ModelDirective_Description" xml:space="preserve">
+    <value>Specify the view or page model for the page.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Description" xml:space="preserve">
+    <value>The model type.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword" xml:space="preserve">
+    <value>The 'inherits' keyword is not allowed when a '{0}' keyword is used.</value>
+  </data>
+  <data name="MvcRazorCodeParser_InjectDirectivePropertyNameRequired" xml:space="preserve">
+    <value>A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.</value>
+  </data>
+  <data name="MvcRazorCodeParser_KeywordMustBeFollowedByTypeName" xml:space="preserve">
+    <value>The '{0}' keyword must be followed by a type name on the same line.</value>
+  </data>
+  <data name="MvcRazorCodeParser_OnlyOneModelStatementIsAllowed" xml:space="preserve">
+    <value>Only one '{0}' statement is allowed in a file.</value>
+  </data>
+  <data name="MvcRazorParser_InvalidPropertyType" xml:space="preserve">
+    <value>Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.</value>
+  </data>
+  <data name="NamespaceDirective_Description" xml:space="preserve">
+    <value>Specify the base namespace for the page.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Description" xml:space="preserve">
+    <value>The namespace for the page.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Name" xml:space="preserve">
+    <value>Namespace</value>
+  </data>
+  <data name="PageDirectiveCannotBeImported" xml:space="preserve">
+    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.</value>
+  </data>
+  <data name="PageDirectiveMustExistAtTheTopOfFile" xml:space="preserve">
+    <value>The '@{0}' directive must precede all other elements defined in a Razor file.</value>
+  </data>
+  <data name="PageDirective_Description" xml:space="preserve">
+    <value>Mark the page as a Razor Page.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Description" xml:space="preserve">
+    <value>An optional route template for the page.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Name" xml:space="preserve">
+    <value>RouteTemplate</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/TagHelperDescriptorExtensions.cs
new file mode 100644
index 0000000000..b7bd72ec70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/TagHelperDescriptorExtensions.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class TagHelperDescriptorExtensions
+    {
+        /// <summary>
+        /// Indicates whether a <see cref="TagHelperDescriptor"/> represents a view component.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/> to check.</param>
+        /// <returns>Whether a <see cref="TagHelperDescriptor"/> represents a view component.</returns>
+        public static bool IsViewComponentKind(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return string.Equals(ViewComponentTagHelperConventions.Kind, tagHelper.Kind, StringComparison.Ordinal);
+        }
+
+        public static string GetViewComponentName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(ViewComponentTagHelperMetadata.Name, out var result);
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentResources.resx
new file mode 100644
index 0000000000..d6aad4ff3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentResources.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ViewComponent_AmbiguousMethods" xml:space="preserve">
+    <value>View component '{0}' must have exactly one public method named '{1}' or '{2}'.</value>
+  </data>
+  <data name="ViewComponent_AsyncMethod_ShouldReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.</value>
+  </data>
+  <data name="ViewComponent_CannotFindMethod" xml:space="preserve">
+    <value>Could not find an '{0}' or '{1}' method for the view component '{2}'.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_CannotReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' cannot return a {2}.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_ShouldReturnValue" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return a value.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperConventions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperConventions.cs
new file mode 100644
index 0000000000..30e8d1c36f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperConventions.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class ViewComponentTagHelperConventions
+    {
+        public static readonly string Kind = "MVC.ViewComponent";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
new file mode 100644
index 0000000000..0b1221af72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -0,0 +1,284 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ViewComponentTagHelperDescriptorFactory
+    {
+        private readonly INamedTypeSymbol _viewComponentAttributeSymbol;
+        private readonly INamedTypeSymbol _genericTaskSymbol;
+        private readonly INamedTypeSymbol _taskSymbol;
+        private readonly INamedTypeSymbol _iDictionarySymbol;
+
+        private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+            SymbolDisplayFormat.FullyQualifiedFormat
+                .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+                .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+
+        private static readonly IReadOnlyDictionary<string, string> PrimitiveDisplayTypeNameLookups = new Dictionary<string, string>(StringComparer.Ordinal)
+        {
+            [typeof(byte).FullName] = "byte",
+            [typeof(sbyte).FullName] = "sbyte",
+            [typeof(int).FullName] = "int",
+            [typeof(uint).FullName] = "uint",
+            [typeof(short).FullName] = "short",
+            [typeof(ushort).FullName] = "ushort",
+            [typeof(long).FullName] = "long",
+            [typeof(ulong).FullName] = "ulong",
+            [typeof(float).FullName] = "float",
+            [typeof(double).FullName] = "double",
+            [typeof(char).FullName] = "char",
+            [typeof(bool).FullName] = "bool",
+            [typeof(object).FullName] = "object",
+            [typeof(string).FullName] = "string",
+            [typeof(decimal).FullName] = "decimal",
+        };
+
+        public ViewComponentTagHelperDescriptorFactory(Compilation compilation)
+        {
+            _viewComponentAttributeSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            _genericTaskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.GenericTask);
+            _taskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.Task);
+            _iDictionarySymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.IDictionary);
+        }
+
+        public virtual TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            var assemblyName = type.ContainingAssembly.Name;
+            var shortName = GetShortName(type);
+            var tagName = $"vc:{HtmlConventions.ToHtmlCase(shortName)}";
+            var typeName = $"__Generated__{shortName}ViewComponentTagHelper";
+            var displayName = shortName + "ViewComponentTagHelper";
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+            descriptorBuilder.DisplayName = displayName;
+
+            if (TryFindInvokeMethod(type, out var method, out var diagnostic))
+            {
+                var methodParameters = method.Parameters;
+                descriptorBuilder.TagMatchingRule(ruleBuilder =>
+                {
+                    ruleBuilder.TagName = tagName;
+                    AddRequiredAttributes(methodParameters, ruleBuilder);
+                });
+
+                AddBoundAttributes(methodParameters, displayName, descriptorBuilder);
+            }
+            else
+            {
+                descriptorBuilder.Diagnostics.Add(diagnostic);
+            }
+
+            descriptorBuilder.Metadata[ViewComponentTagHelperMetadata.Name] = shortName;
+
+            var descriptor = descriptorBuilder.Build();
+            return descriptor;
+        }
+
+        private bool TryFindInvokeMethod(INamedTypeSymbol type, out IMethodSymbol method, out RazorDiagnostic diagnostic)
+        {
+            var methods = GetInvokeMethods(type);
+
+            if (methods.Count == 0)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_CannotFindMethod(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+            else if (methods.Count > 1)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AmbiguousMethods(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+
+            var selectedMethod = methods[0];
+            var returnType = selectedMethod.ReturnType as INamedTypeSymbol;
+            if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
+            {
+                // Will invoke asynchronously. Method must not return Task or Task<T>.
+                if (returnType == _taskSymbol)
+                {
+                    // This is ok.
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    // This is ok.
+                }
+                else
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AsyncMethod_ShouldReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+            else
+            {
+                // Will invoke synchronously. Method must not return void, Task or Task<T>.
+                if (returnType.SpecialType == SpecialType.System_Void)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_ShouldReturnValue(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType == _taskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+
+            method = selectedMethod;
+            diagnostic = null;
+            return true;
+        }
+
+        private static IReadOnlyList<IMethodSymbol> GetInvokeMethods(INamedTypeSymbol type)
+        {
+            var methods = new List<IMethodSymbol>();
+            while (type != null)
+            {
+                var currentTypeMethods = type.GetMembers()
+                    .OfType<IMethodSymbol>()
+                    .Where(m =>
+                        m.DeclaredAccessibility == Accessibility.Public &&
+                        !m.IsStatic &&
+                        (string.Equals(m.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal) ||
+                        string.Equals(m.Name, ViewComponentTypes.SyncMethodName, StringComparison.Ordinal)));
+
+                methods.AddRange(currentTypeMethods);
+
+                type = type.BaseType;
+            }
+
+            return methods;
+        }
+
+        private void AddRequiredAttributes(ImmutableArray<IParameterSymbol> methodParameters, TagMatchingRuleDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                if (GetIndexerValueTypeName(parameter) == null)
+                {
+                    // Set required attributes only for non-indexer attributes. Indexer attributes can't be required attributes
+                    // because there are two ways of setting values for the attribute.
+                    builder.Attribute(attributeBuilder =>
+                    {
+                        var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                        attributeBuilder.Name = lowerKebabName;
+                    });
+                }
+            }
+        }
+
+        private void AddBoundAttributes(ImmutableArray<IParameterSymbol> methodParameters, string containingDisplayName, TagHelperDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                var typeName = parameter.Type.ToDisplayString(FullNameTypeDisplayFormat);
+
+                if (!PrimitiveDisplayTypeNameLookups.TryGetValue(typeName, out var simpleName))
+                {
+                    simpleName = typeName;
+                }
+
+                builder.BindAttribute(attributeBuilder =>
+                {
+                    attributeBuilder.Name = lowerKebabName;
+                    attributeBuilder.TypeName = typeName;
+                    attributeBuilder.DisplayName = $"{simpleName} {containingDisplayName}.{parameter.Name}";
+                    attributeBuilder.SetPropertyName(parameter.Name);
+
+                    if (parameter.Type.TypeKind == TypeKind.Enum)
+                    {
+                        attributeBuilder.IsEnum = true;
+                    }
+                    else
+                    {
+                        var dictionaryValueType = GetIndexerValueTypeName(parameter);
+                        if (dictionaryValueType != null)
+                        {
+                            attributeBuilder.AsDictionary(lowerKebabName + "-", dictionaryValueType);
+                        }
+                    }
+                });
+            }
+        }
+
+        private string GetIndexerValueTypeName(IParameterSymbol parameter)
+        {
+            INamedTypeSymbol dictionaryType;
+            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            {
+                dictionaryType = (INamedTypeSymbol)parameter.Type;
+            }
+            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            {
+                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+            }
+            else
+            {
+                dictionaryType = null;
+            }
+
+            if (dictionaryType == null || dictionaryType.TypeArguments[0].SpecialType != SpecialType.System_String)
+            {
+                return null;
+            }
+
+            var type = dictionaryType.TypeArguments[1];
+            var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
+
+            return typeName;
+        }
+
+        private string GetShortName(INamedTypeSymbol componentType)
+        {
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var name = viewComponentAttribute
+                ?.NamedArguments
+                .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
+                .FirstOrDefault()
+                .Value
+                .Value as string;
+
+            if (!string.IsNullOrEmpty(name))
+            {
+                var separatorIndex = name.LastIndexOf('.');
+                if (separatorIndex >= 0)
+                {
+                    return name.Substring(separatorIndex + 1);
+                }
+                else
+                {
+                    return name;
+                }
+            }
+
+            // Get name by convention
+            if (componentType.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix, StringComparison.OrdinalIgnoreCase))
+            {
+                return componentType.Name.Substring(0, componentType.Name.Length - ViewComponentTypes.ViewComponentSuffix.Length);
+            }
+            else
+            {
+                return componentType.Name;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..4806acc806
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorProvider.cs
@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
+            if (vcAttribute == null || vcAttribute.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new ViewComponentTypeVisitor(vcAttribute, nonVCAttribute, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            var factory = new ViewComponentTagHelperDescriptorFactory(compilation);
+            for (var i = 0; i < types.Count; i++)
+            {
+                var descriptor = factory.CreateDescriptor(types[i]);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperIntermediateNode.cs
new file mode 100644
index 0000000000..a42b88416b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperIntermediateNode.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public sealed class ViewComponentTagHelperIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
+
+        public string ClassName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ViewComponentTagHelperIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IViewComponentTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IViewComponentTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteViewComponentTagHelper(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(ClassName);
+
+            formatter.WriteProperty(nameof(ClassName), ClassName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperMetadata.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperMetadata.cs
new file mode 100644
index 0000000000..ad77c7a29e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperMetadata.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class ViewComponentTagHelperMetadata
+    {
+        /// <summary>
+        /// The key in a <see cref="Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor.Metadata"/>  containing 
+        /// the short name of a view component.
+        /// </summary>
+        public static readonly string Name = "MVC.ViewComponent.Name";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperPass.cs
new file mode 100644
index 0000000000..f5c37eb13b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperPass.cs
@@ -0,0 +1,203 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after the default taghelper pass
+        public override int Order => IntermediateNodePassBase.DefaultFeatureOrder + 2000;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            var context = new Context(@namespace, @class);
+
+            // For each VCTH *usage* we need to rewrite the tag helper node to use the tag helper runtime to construct
+            // and set properties on the the correct field, and using the name of the type we will generate.
+            var nodes = documentNode.FindDescendantNodes<TagHelperIntermediateNode>();
+            for (var i = 0; i < nodes.Count; i++)
+            {
+                var node = nodes[i];
+                foreach (var tagHelper in node.TagHelpers)
+                {
+                    RewriteUsage(context, node, tagHelper);
+                }
+            }
+
+            // Then for each VCTH *definition* that we've seen we need to generate the class that implements
+            // ITagHelper and the field that will hold it.
+            foreach (var tagHelper in context.TagHelpers)
+            {
+                AddField(context, tagHelper);
+                AddTagHelperClass(context, tagHelper);
+            }
+        }
+
+        private void RewriteUsage(Context context, TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        {
+            if (!tagHelper.IsViewComponentKind())
+            {
+                return;
+            }
+
+            context.Add(tagHelper);
+
+            // Now we need to insert a create node using the default tag helper runtime. This is similar to
+            // code in DefaultTagHelperOptimizationPass.
+            //
+            // Find the body node.
+            var i = 0;
+            while (i < node.Children.Count && node.Children[i] is TagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now find the last create node.
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperCreateIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now i has the right insertion point.
+            node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = context.GetFieldName(tagHelper),
+                TagHelper = tagHelper,
+                TypeName = context.GetFullyQualifiedName(tagHelper),
+            });
+
+            // Now we need to rewrite any set property nodes to use the default runtime.
+            for (i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode &&
+                    propertyNode.TagHelper == tagHelper)
+                {
+                    // This is a set property for this VCTH - we need to replace it with a node
+                    // that will use our field and property name.
+                    node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
+                    {
+                        FieldName = context.GetFieldName(tagHelper),
+                        PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
+                    };
+                }
+            }
+        }
+
+        private void AddField(Context context, TagHelperDescriptor tagHelper)
+        {
+            // We need to insert a node for the field that will hold the tag helper. We've already generated a field name
+            // at this time and use it for all uses of the same tag helper type.
+            //
+            // We also want to preserve the ordering of the nodes for testability. So insert at the end of any existing
+            // field nodes.
+            var i = 0;
+            while (i < context.Class.Children.Count && context.Class.Children[i] is DefaultTagHelperRuntimeIntermediateNode)
+            {
+                i++;
+            }
+
+            while (i < context.Class.Children.Count && context.Class.Children[i] is FieldDeclarationIntermediateNode)
+            {
+                i++;
+            }
+
+            context.Class.Children.Insert(i, new FieldDeclarationIntermediateNode()
+            {
+                Annotations =
+                {
+                    { CommonAnnotations.DefaultTagHelperExtension.TagHelperField, bool.TrueString },
+                },
+                Modifiers =
+                {
+                    "private",
+                },
+                FieldName = context.GetFieldName(tagHelper),
+                FieldType = "global::" + context.GetFullyQualifiedName(tagHelper),
+            });
+        }
+
+        private void AddTagHelperClass(Context context, TagHelperDescriptor tagHelper)
+        {
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = context.GetClassName(tagHelper),
+                TagHelper = tagHelper
+            };
+
+            context.Class.Children.Add(node);
+        }
+
+        private struct Context
+        {
+            private Dictionary<TagHelperDescriptor, (string className, string fullyQualifiedName, string fieldName)> _tagHelpers;
+
+            public Context(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class)
+            {
+                Namespace = @namespace;
+                Class = @class;
+
+                _tagHelpers = new Dictionary<TagHelperDescriptor, (string, string, string)>();
+            }
+
+            public ClassDeclarationIntermediateNode Class { get; }
+
+            public NamespaceDeclarationIntermediateNode Namespace { get; }
+
+
+            public IEnumerable<TagHelperDescriptor> TagHelpers => _tagHelpers.Keys;
+
+            public bool Add(TagHelperDescriptor tagHelper)
+            {
+                if (_tagHelpers.ContainsKey(tagHelper))
+                {
+                    return false;
+                }
+
+                var className = $"__Generated__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+                var fullyQualifiedName = $"{Namespace.Content}.{Class.ClassName}.{className}";
+                var fieldName = GenerateFieldName(tagHelper);
+
+                _tagHelpers.Add(tagHelper, (className, fullyQualifiedName, fieldName));
+
+                return true;
+            }
+
+            public string GetClassName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].className;
+            }
+
+            public string GetFullyQualifiedName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fullyQualifiedName;
+            }
+
+            public string GetFieldName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fieldName;
+            }
+
+            private static string GenerateFieldName(TagHelperDescriptor tagHelper)
+            {
+                return $"__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..a56e86fdca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,183 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ViewComponentTagHelperTargetExtension : IViewComponentTagHelperTargetExtension
+    {
+        private static readonly string[] PublicModifiers = new[] { "public" };
+
+        public string TagHelperTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper";
+
+        public string ViewComponentHelperTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.IViewComponentHelper";
+
+        public string ViewComponentHelperVariableName { get; set; } = "_helper";
+
+        public string ViewComponentInvokeMethodName { get; set; } = "InvokeAsync";
+
+        public string HtmlAttributeNotBoundAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute";
+
+        public string ViewContextAttributeTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute";
+
+        public string ViewContextTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext";
+
+        public string ViewContextPropertyName { get; set; } = "ViewContext";
+
+        public string HtmlTargetElementAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute";
+
+        public string TagHelperProcessMethodName { get; set; } = "ProcessAsync";
+
+        public string TagHelperContextTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext";
+
+        public string TagHelperContextVariableName { get; set; } = "context";
+
+        public string TagHelperOutputTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput";
+
+        public string TagHelperOutputVariableName { get; set; } = "output";
+
+        public string TagHelperOutputTagNamePropertyName { get; set; } = "TagName";
+
+        public string TagHelperOutputContentPropertyName { get; set; } = "Content";
+
+        public string TagHelperContentSetMethodName { get; set; } = "SetHtmlContent";
+
+        public string TagHelperContentVariableName { get; set; } = "content";
+
+        public string IViewContextAwareTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware";
+
+        public string IViewContextAwareContextualizeMethodName { get; set; } = "Contextualize";
+
+        public void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node)
+        {
+            // Add target element.
+            WriteTargetElementString(context.CodeWriter, node.TagHelper);
+
+            // Initialize declaration.
+            using (context.CodeWriter.BuildClassDeclaration(
+                PublicModifiers,
+                node.ClassName,
+                TagHelperTypeName,
+                interfaces: null,
+                typeParameters: null))
+            {
+                // Add view component helper.
+                context.CodeWriter.WriteVariableDeclaration(
+                    $"private readonly {ViewComponentHelperTypeName}",
+                    ViewComponentHelperVariableName,
+                    value: null);
+
+                // Add constructor.
+                WriteConstructorString(context.CodeWriter, node.ClassName);
+
+                // Add attributes.
+                WriteAttributeDeclarations(context.CodeWriter, node.TagHelper);
+
+                // Add process method.
+                WriteProcessMethodString(context.CodeWriter, node.TagHelper);
+            }
+        }
+
+        private void WriteConstructorString(CodeWriter writer, string className)
+        {
+            writer.Write("public ")
+                .Write(className)
+                .Write("(")
+                .Write($"{ViewComponentHelperTypeName} helper")
+                .WriteLine(")");
+            using (writer.BuildScope())
+            {
+                writer.WriteStartAssignment(ViewComponentHelperVariableName)
+                    .Write("helper")
+                    .WriteLine(";");
+            }
+        }
+
+        private void WriteAttributeDeclarations(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            writer.Write("[")
+              .Write(HtmlAttributeNotBoundAttributeTypeName)
+              .WriteParameterSeparator()
+              .Write(ViewContextAttributeTypeName)
+              .WriteLine("]");
+
+            writer.WriteAutoPropertyDeclaration(
+                PublicModifiers,
+                ViewContextTypeName,
+                ViewContextPropertyName);
+
+            foreach (var attribute in tagHelper.BoundAttributes)
+            {
+                writer.WriteAutoPropertyDeclaration(
+                    PublicModifiers,
+                    attribute.TypeName,
+                    attribute.GetPropertyName());
+
+                if (attribute.IndexerTypeName != null)
+                {
+                    writer.Write(" = ")
+                        .WriteStartNewObject(attribute.TypeName)
+                        .WriteEndMethodInvocation();
+                }
+            }
+        }
+
+        private void WriteProcessMethodString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            using (writer.BuildMethodDeclaration(
+                    $"public override async",
+                    $"global::{typeof(Task).FullName}",
+                    TagHelperProcessMethodName,
+                    new Dictionary<string, string>()
+                    {
+                        { TagHelperContextTypeName, TagHelperContextVariableName },
+                        { TagHelperOutputTypeName, TagHelperOutputVariableName }
+                    }))
+            {
+                writer.WriteInstanceMethodInvocation(
+                    $"({ViewComponentHelperVariableName} as {IViewContextAwareTypeName})?",
+                    IViewContextAwareContextualizeMethodName,
+                    new[] { ViewContextPropertyName });
+
+                var methodParameters = GetMethodParameters(tagHelper);
+                writer.Write("var ")
+                    .WriteStartAssignment(TagHelperContentVariableName)
+                    .WriteInstanceMethodInvocation($"await {ViewComponentHelperVariableName}", ViewComponentInvokeMethodName, methodParameters);
+                writer.WriteStartAssignment($"{TagHelperOutputVariableName}.{TagHelperOutputTagNamePropertyName}")
+                    .WriteLine("null;");
+                writer.WriteInstanceMethodInvocation(
+                    $"{TagHelperOutputVariableName}.{TagHelperOutputContentPropertyName}",
+                    TagHelperContentSetMethodName,
+                    new[] { TagHelperContentVariableName });
+            }
+        }
+
+        private string[] GetMethodParameters(TagHelperDescriptor tagHelper)
+        {
+            var propertyNames = tagHelper.BoundAttributes.Select(attribute => attribute.GetPropertyName());
+            var joinedPropertyNames = string.Join(", ", propertyNames);
+            var parametersString = $"new {{ { joinedPropertyNames } }}";
+            var viewComponentName = tagHelper.GetViewComponentName();
+            var methodParameters = new[] { $"\"{viewComponentName}\"", parametersString };
+            return methodParameters;
+        }
+
+        private void WriteTargetElementString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            Debug.Assert(tagHelper.TagMatchingRules.Count() == 1);
+
+            var rule = tagHelper.TagMatchingRules.First();
+
+            writer.Write("[")
+                .WriteStartMethodInvocation(HtmlTargetElementAttributeTypeName)
+                .WriteStringLiteral(rule.TagName)
+                .WriteLine(")]");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
new file mode 100644
index 0000000000..01eb3fffaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
@@ -0,0 +1,88 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ViewComponentTypeVisitor : SymbolVisitor
+    {
+        private readonly INamedTypeSymbol _viewComponentAttribute;
+        private readonly INamedTypeSymbol _nonViewComponentAttribute;
+        private readonly List<INamedTypeSymbol> _results;
+
+        public ViewComponentTypeVisitor(
+            INamedTypeSymbol viewComponentAttribute,
+            INamedTypeSymbol nonViewComponentAttribute,
+            List<INamedTypeSymbol> results)
+        {
+            _viewComponentAttribute = viewComponentAttribute;
+            _nonViewComponentAttribute = nonViewComponentAttribute;
+            _results = results;
+        }
+
+        public override void VisitNamedType(INamedTypeSymbol symbol)
+        {
+            if (IsViewComponent(symbol))
+            {
+                _results.Add(symbol);
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public)
+            {
+                return;
+            }
+
+            foreach (var member in symbol.GetTypeMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        public override void VisitNamespace(INamespaceSymbol symbol)
+        {
+            foreach (var member in symbol.GetMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        internal bool IsViewComponent(INamedTypeSymbol symbol)
+        {
+            if (_viewComponentAttribute == null)
+            {
+                return false;
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public ||
+                symbol.IsAbstract ||
+                symbol.IsGenericType ||
+                AttributeIsDefined(symbol, _nonViewComponentAttribute))
+            {
+                return false;
+            }
+
+            return symbol.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix) ||
+                AttributeIsDefined(symbol, _viewComponentAttribute);
+        }
+
+        private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+        {
+            if (type == null || queryAttribute == null)
+            {
+                return false;
+            }
+
+            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+
+            if (attribute != null)
+            {
+                return true;
+            }
+
+            return AttributeIsDefined(type.BaseType, queryAttribute);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypes.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypes.cs
new file mode 100644
index 0000000000..cd7e2771be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypes.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal static class ViewComponentTypes
+    {
+        public const string Assembly = "Microsoft.AspNetCore.Mvc.ViewFeatures";
+
+        public static readonly Version AssemblyVersion = new Version(1, 1, 0, 0);
+
+        public const string ViewComponentSuffix = "ViewComponent";
+
+        public const string ViewComponentAttribute = "Microsoft.AspNetCore.Mvc.ViewComponentAttribute";
+
+        public const string NonViewComponentAttribute = "Microsoft.AspNetCore.Mvc.NonViewComponentAttribute";
+
+        public const string GenericTask = "System.Threading.Tasks.Task`1";
+
+        public const string Task = "System.Threading.Tasks.Task";
+
+        public const string IDictionary = "System.Collections.Generic.IDictionary`2";
+
+        public const string AsyncMethodName = "InvokeAsync";
+
+        public const string SyncMethodName = "Invoke";
+
+        public static class ViewComponent
+        {
+            public const string Name = "Name";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netcore.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netcore.json
new file mode 100644
index 0000000000..87b3d074f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netcore.json
@@ -0,0 +1,1180 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.AssemblyAttributeInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemberName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InstrumentationPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IViewComponentTagHelperTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteViewComponentTagHelper",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelType",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelExpressionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.MvcViewDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MvcViewDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.NamespaceDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveNode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "pageDirective",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PagesPropertyInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorPageDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorPageDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RouteTemplateKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsViewComponentKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponentName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClassName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTypes+ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netframework.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netframework.json
new file mode 100644
index 0000000000..9386496226
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/baseline.netframework.json
@@ -0,0 +1,982 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.AssemblyAttributeInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemberName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InstrumentationPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelType",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelExpressionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.MvcViewDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MvcViewDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.NamespaceDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveNode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "pageDirective",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PagesPropertyInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorPageDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorPageDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsViewComponentKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponentName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTypes+ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs
new file mode 100644
index 0000000000..4dbe6c72b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs
@@ -0,0 +1,444 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class AssemblyAttributeInjectionPassTest
+    {
+        [Fact]
+        public void Execute_NoOps_IfNamespaceNodeIsMissing()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Empty(irDocument.Children);
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfNamespaceNodeHasEmptyContent()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = string.Empty };
+            @namespace.Annotations[CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace;
+            builder.Push(@namespace);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfClassNameNodeIsMissing()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
+            builder.Push(@namespace);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfClassNameIsEmpty()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfDocumentIsNotViewOrPage()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = "Default",
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_ForDesignTime()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDesignTimeDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_AddsRazorViewAttribute_ToViews()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_EscapesViewPathWhenAddingAttributeToViews()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "\\test\\\"Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_AddsRazorPagettribute_ToPage()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName), null)]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var pageDirective = new DirectiveIntermediateNode
+            {
+                Directive = PageDirective.Directive,
+            };
+            builder.Add(pageDirective);
+
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(pageDirective, node),
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_EscapesViewPathAndRouteWhenAddingAttributeToPage()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "test\\\"Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectDirectiveTest.cs
new file mode 100644
index 0000000000..ff128921c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectDirectiveTest.cs
@@ -0,0 +1,225 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectDirectiveTest
+    {
+        [Fact]
+        public void InjectDirectivePass_Execute_DefinesProperty()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_DedupesPropertiesByName()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+@inject PropertyType2 PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType2", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<dynamic>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelTypeFirst()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model ModelType
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+@model ModelType
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
+                b.AddDirective(InjectDirective.Directive);
+                b.AddDirective(ModelDirective.Directive);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs
new file mode 100644
index 0000000000..71b2ec20ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectTargetExtensionTest
+    {
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesProperty()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType",
+                MemberName = "PropertyName",
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType PropertyName { get; private set; }" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesPropertyWithLinePragma_WhenSourceIsSet()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType<ModelType>",
+                MemberName = "PropertyName",
+                Source = new SourceSpan(
+                    filePath: "test-path",
+                    absoluteIndex: 0,
+                    lineIndex: 1,
+                    characterIndex: 1,
+                    length: 10)
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "#line 2 \"test-path\"" + Environment.NewLine +
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
+                "#line default" + Environment.NewLine +
+                "#line hidden" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InstrumentationPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InstrumentationPassTest.cs
new file mode 100644
index 0000000000..e1bd402e26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InstrumentationPassTest.cs
@@ -0,0 +1,348 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InstrumentationPassTest
+    {
+        [Fact]
+        public void InstrumentationPass_NoOps_ForDesignTime()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDesignTimeDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new HtmlContentIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.Html,
+            });
+            builder.Pop();
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => IntermediateNodeAssert.Html("Hi", n));
+        }
+
+        [Fact]
+        public void InstrumentationPass_InstrumentsHtml()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new HtmlContentIntermediateNode()
+            {
+                Source = CreateSource(1),
+            });
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.Html,
+                Source = CreateSource(1)
+            });
+            builder.Pop();
+            
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => BeginInstrumentation("1, 1, true", n),
+                n => IntermediateNodeAssert.Html("Hi", n),
+                n => EndInstrumentation(n));
+        }
+
+        [Fact]
+        public void InstrumentationPass_SkipsHtml_WithoutLocation()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new HtmlContentIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.Html,
+            });
+            builder.Pop();
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => IntermediateNodeAssert.Html("Hi", n));
+        }
+
+        [Fact]
+        public void InstrumentationPass_InstrumentsCSharpExpression()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new CSharpExpressionIntermediateNode()
+            {
+                Source = CreateSource(2),
+            });
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.CSharp,
+            });
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => BeginInstrumentation("2, 2, false", n),
+                n => CSharpExpression("Hi", n),
+                n => EndInstrumentation(n));
+        }
+
+        [Fact]
+        public void InstrumentationPass_SkipsCSharpExpression_WithoutLocation()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new CSharpExpressionIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.CSharp,
+            });
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => CSharpExpression("Hi", n));
+        }
+
+        [Fact]
+        public void InstrumentationPass_SkipsCSharpExpression_InsideTagHelperAttribute()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new TagHelperIntermediateNode());
+
+            builder.Push(new TagHelperHtmlAttributeIntermediateNode());
+
+            builder.Push(new CSharpExpressionIntermediateNode()
+            {
+                Source = CreateSource(5)
+            });
+
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.CSharp,
+            });
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n =>
+                {
+                    Assert.IsType<TagHelperIntermediateNode>(n);
+                    Children(
+                        n,
+                        c =>
+                        {
+                            Assert.IsType<TagHelperHtmlAttributeIntermediateNode>(c);
+                            Children(
+                                c,
+                                s => CSharpExpression("Hi", s));
+                        });
+                });
+        }
+
+        [Fact]
+        public void InstrumentationPass_SkipsCSharpExpression_InsideTagHelperProperty()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new TagHelperIntermediateNode());
+
+            builder.Push(new TagHelperPropertyIntermediateNode());
+
+            builder.Push(new CSharpExpressionIntermediateNode()
+            {
+                Source = CreateSource(5)
+            });
+
+            builder.Add(new IntermediateToken()
+            {
+                Content = "Hi",
+                Kind = TokenKind.CSharp,
+            });
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n =>
+                {
+                    Assert.IsType<TagHelperIntermediateNode>(n);
+                    Children(
+                        n,
+                        c =>
+                        {
+                            Assert.IsType<TagHelperPropertyIntermediateNode>(c);
+                            Children(
+                                c,
+                                s => CSharpExpression("Hi", s));
+                        });
+                });
+        }
+
+        [Fact]
+        public void InstrumentationPass_InstrumentsTagHelper()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(new TagHelperIntermediateNode()
+            {
+                Source = CreateSource(3),
+            });
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => BeginInstrumentation("3, 3, false", n),
+                n => Assert.IsType<TagHelperIntermediateNode>(n),
+                n => EndInstrumentation(n));
+        }
+
+        [Fact]
+        public void InstrumentationPass_SkipsTagHelper_WithoutLocation()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(new TagHelperIntermediateNode());
+
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
+
+            // Assert
+            Children(
+                document,
+                n => Assert.IsType<TagHelperIntermediateNode>(n));
+        }
+
+        private SourceSpan CreateSource(int number)
+        {
+            // The actual source span doesn't really matter, we just want to see the values used.
+            return new SourceSpan(new SourceLocation(number, number, number), number);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
new file mode 100644
index 0000000000..1ff7ec5794
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -0,0 +1,961 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests
+{
+    public class CodeGenerationIntegrationTest : IntegrationTestBase
+    {
+        private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode");
+
+        public CodeGenerationIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Create(
+                RazorLanguageVersion.Version_2_0,
+                "MVC-2.1",
+                new[] { new AssemblyExtension("MVC-2.1", typeof(ExtensionInitializer).Assembly) });
+        }
+
+        protected override CSharpCompilation BaseCompilation => DefaultBaseCompilation;
+
+        protected override RazorConfiguration Configuration { get; }
+
+        #region Runtime
+
+        [Fact]
+        public void UsingDirectives_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
+        }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+public abstract class MyPageModel<T> : Page
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+            AddProjectItemFromText(@"@inherits MyPageModel<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void MalformedPageDirective_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void Basic_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Sections_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void _ViewImports_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Inject_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InjectWithModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Model_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ModelExpressionTagHelper_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPages_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPagesWithRouteTemplate_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPagesWithoutModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void PageWithNamespace_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ViewWithNamespace_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPageWithNoLeadingPageDirective_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
+        }
+        #endregion
+
+        #region DesignTime
+
+        [Fact]
+        public void UsingDirectives_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
+        }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+public abstract class MyPageModel<T> : Page
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+
+            AddProjectItemFromText(@"@inherits MyPageModel<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MalformedPageDirective_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void Basic_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Sections_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void _ViewImports_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Inject_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Model_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MultipleModels_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class ThisShouldBeGenerated
+{
+
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ2001", Assert.Single(diagnotics).Id);
+        }
+        
+        [Fact]
+        public void ModelExpressionTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPages_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPagesWithRouteTemplate_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPagesWithoutModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void PageWithNamespace_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewWithNamespace_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPageWithNoLeadingPageDirective_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs
new file mode 100644
index 0000000000..604100a335
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests
+{
+    public class InstrumentationPassIntegrationTest : IntegrationTestBase
+    {
+        [Fact]
+        public void BasicTest()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "p",
+                    typeName: "PTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "form",
+                    typeName: "FormTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "InputTagHelper",
+                    assemblyName: "TestAssembly",
+                    attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("value")
+                            .PropertyName("FooProp")
+                            .TypeName("System.String"),      // Gets preallocated
+                        builder => builder
+                            .Name("date")
+                            .PropertyName("BarProp")
+                            .TypeName("System.DateTime"),    // Doesn't get preallocated
+                    })
+            };
+
+            var engine = CreateProjectEngine(b =>
+            {
+                b.AddTagHelpers(descriptors);
+                b.Features.Add(new InstrumentationPass());
+                
+                // This test includes templates
+                b.AddTargetExtension(new TemplateTargetExtension());
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var document = engine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(document.GetDocumentIntermediateNode());
+
+            var csharpDocument = document.GetCSharpDocument();
+            AssertCSharpDocumentMatchesBaseline(csharpDocument);
+            Assert.Empty(csharpDocument.Diagnostics);
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BoundAttributeDescriptor(attributeBuilder);
+                }
+            }
+
+            builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
new file mode 100644
index 0000000000..0fd06dcdfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Targets>Build</Targets>
+    </ProjectReference>
+
+    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+
+  <Target Name="CopyDepsFromShims" AfterTargets="Build">
+    <ItemGroup>
+      <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.deps.json" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
new file mode 100644
index 0000000000..eedc94d581
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
@@ -0,0 +1,343 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ModelDirectiveTest
+    {
+        [Fact]
+        public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@model Type2
+@model
+");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("Type1", result);
+        }
+
+        [Fact]
+        public void ModelDirective_GetModelType_DefaultsToDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@" ");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("dynamic", result);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DifferentOrdering()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@inherits BaseType<TModel>
+@model Type2
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_NoOpWithoutTModel()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DefaultDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model SomeType
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<SomeType>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::System.Object", usingNode.Content);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private NamespaceDeclarationIntermediateNode FindNamespaceNode(IntermediateNode node)
+        {
+            var visitor = new NamespaceNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return CreateEngineCore();
+        }
+
+        private RazorEngine CreateDesignTimeEngine()
+        {
+            return CreateEngineCore(designTime: true);
+        }
+
+        private RazorEngine CreateEngineCore(bool designTime = false)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
+                b.AddDirective(ModelDirective.Directive);
+
+                // There's some special interaction with the inherits directive
+                InheritsDirective.Register(b);
+
+                b.Features.Add(new DesignTimeOptionsFeature(designTime));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // InheritsDirectivePass needs to run before ModelDirective.
+            var pass = new InheritsDirectivePass()
+            {
+                Engine = engine
+            };
+            pass.Execute(codeDocument, codeDocument.GetDocumentIntermediateNode());
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class NamespaceNodeVisitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private bool _designTime;
+
+            public DesignTimeOptionsFeature(bool designTime)
+            {
+                _designTime = designTime;
+            }
+
+            public int Order { get; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelExpressionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelExpressionPassTest.cs
new file mode 100644
index 0000000000..d18984c900
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelExpressionPassTest.cs
@@ -0,0 +1,208 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ModelExpressionPassTest
+    {
+        [Fact]
+        public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var token = Assert.IsType<IntermediateToken>(Assert.Single(setProperty.Children));
+            Assert.True(token.IsCSharp);
+            Assert.Equal("17", token.Content);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[2]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"@Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[1]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcImportProjectFeatureTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcImportProjectFeatureTest.cs
new file mode 100644
index 0000000000..13c686adf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcImportProjectFeatureTest.cs
@@ -0,0 +1,76 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class MvcImportProjectFeatureTest
+    {
+        [Fact]
+        public void AddDefaultDirectivesImport_AddsSingleDynamicImport()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+
+            // Act
+            MvcImportProjectFeature.AddDefaultDirectivesImport(imports);
+
+            // Assert
+            var import = Assert.Single(imports);
+            Assert.Null(import.FilePath);
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[]
+            {
+                new TestRazorProjectItem("/Index.cshtml"),
+                new TestRazorProjectItem("/_ViewImports.cshtml"),
+                new TestRazorProjectItem("/Contact/_ViewImports.cshtml"),
+                projectItem,
+            });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsNotOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Pages/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[] { projectItem });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcShim.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcShim.cs
new file mode 100644
index 0000000000..acbdea28f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcShim.cs
@@ -0,0 +1,45 @@
+// 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.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal static class MvcShim
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X";
+
+        private static Assembly _assembly;
+        private static CSharpCompilation _baseCompilation;
+
+        public static Assembly Assembly
+        {
+            get
+            {
+                if (_assembly == null)
+                {
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), AssemblyName + ".dll");
+                    _assembly = Assembly.LoadFrom(filePath);
+                }
+
+                return _assembly;
+            }
+        }
+
+        public static CSharpCompilation BaseCompilation
+        {
+            get
+            {
+                if (_baseCompilation == null)
+                {
+                    _baseCompilation = TestCompilation.Create(Assembly);
+                }
+
+                return _baseCompilation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..2d437c158d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
@@ -0,0 +1,264 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class MvcViewDocumentClassifierPassTest
+    {
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.view", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_d9f877a857a7e9928eac04d09a59f25967624155", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void MvcViewDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/NamespaceDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/NamespaceDirectiveTest.cs
new file mode 100644
index 0000000000..8e5d76c678
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/NamespaceDirectiveTest.cs
@@ -0,0 +1,352 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class NamespaceDirectiveTest
+    {
+        [Fact]
+        public void GetNamespace_IncompleteDirective_UsesEmptyNamespace()
+        {
+            // Arrange
+            var source = "c:\\foo\\bar\\bleh.cshtml";
+            var imports = "c:\\foo\\baz\\bleh.cshtml";
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(string.Empty, @namespace);
+        }
+
+        [Fact]
+        public void GetNamespace_EmptyDirective_UsesEmptyNamespace()
+        {
+            // Arrange
+            var source = "c:\\foo\\bar\\bleh.cshtml";
+            var imports = "c:\\foo\\baz\\bleh.cshtml";
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = string.Empty });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(string.Empty, @namespace);
+        }
+
+        // When we don't have a relationship between the source file and the imports file
+        // we will just use the namespace on the node directly.
+        [Theory]
+        [InlineData((string)null, (string)null)]
+        [InlineData("", "")]
+        [InlineData(null, "/foo/bar")]
+        [InlineData("/foo/baz", "/foo/bar/bleh")]
+        [InlineData("/foo.cshtml", "/foo/bar.cshtml")]
+        [InlineData("c:\\foo.cshtml", "d:\\foo\\bar.cshtml")]
+        [InlineData("c:\\foo\\bar\\bleh.cshtml", "c:\\foo\\baz\\bleh.cshtml")]
+        public void GetNamespace_ForNonRelatedFiles_UsesNamespaceVerbatim(string source, string imports)
+        {
+            // Arrange
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal("Base", @namespace);
+        }
+
+        [Theory]
+        [InlineData("/foo.cshtml", "/_ViewImports.cshtml", "Base")]
+        [InlineData("/foo/bar.cshtml", "/_ViewImports.cshtml", "Base.foo")]
+        [InlineData("/foo/bar/baz.cshtml", "/_ViewImports.cshtml", "Base.foo.bar")]
+        [InlineData("/foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
+        [InlineData("/Foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
+        [InlineData("c:\\foo.cshtml", "c:\\_ViewImports.cshtml", "Base")]
+        [InlineData("c:\\foo\\bar.cshtml", "c:\\_ViewImports.cshtml", "Base.foo")]
+        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\_ViewImports.cshtml", "Base.foo.bar")]
+        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
+        [InlineData("c:\\Foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
+        public void GetNamespace_ForRelatedFiles_ComputesNamespaceWithSuffix(string source, string imports, string expected)
+        {
+            // Arrange
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(expected, @namespace);
+        }
+
+        // This is the case where a _ViewImports sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromImports()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This is the case where the source file sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromSource()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            // This will be ignored.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
+            builder.Pop();
+
+            // This will be used.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // Handles cases where invalid characters appears in FileNames. Note that we don't sanitize the part of
+        // the namespace that you put in an import, just the file-based-suffix. Garbage in, garbage out.
+        [Fact]
+        public void Pass_SetsNamespace_SanitizesClassAndNamespace()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage-Info/Add+User.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage_Info", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This is the case where the source file sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromSource_ForView()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            // This will be ignored.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
+            builder.Pop();
+
+            // This will be used.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This handles an error case where we can't determine the relationship between the
+        // imports and the source.
+        [Fact]
+        public void Pass_SetsNamespace_VerbatimFromImports()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(null, 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        [Fact]
+        public void Pass_DoesNothing_ForUnknownDocumentKind()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(null, 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = null;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("default", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/PageDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/PageDirectiveTest.cs
new file mode 100644
index 0000000000..1bdb156298
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/PageDirectiveTest.cs
@@ -0,0 +1,148 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class PageDirectiveTest
+    {
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageIsMalformed()
+        {
+            // Arrange
+            var content = "@page \"some-route-template\" Invalid";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("some-route-template", pageDirective.RouteTemplate);
+            Assert.NotNull(pageDirective.DirectiveNode);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageIsImported()
+        {
+            // Arrange
+            var content = "Hello world";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var importDocument = RazorSourceDocument.Create("@page", "imports.cshtml");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsFalse_IfPageDoesNotHaveDirective()
+        {
+            // Arrange
+            var content = "Hello world";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(pageDirective);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageDoesStartWithDirective()
+        {
+            // Arrange
+            var content = "Hello @page";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+            Assert.NotNull(pageDirective.DirectiveNode);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfContentHasDirective()
+        {
+            // Arrange
+            var content = "@page";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ParsesRouteTemplate()
+        {
+            // Arrange
+            var content = "@page \"some-route-template\"";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("some-route-template", pageDirective.RouteTemplate);
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                PageDirective.Register(b);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..74acfa0c13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
@@ -0,0 +1,417 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class RazorPageDocumentClassifierPassTest
+    {
+        [Fact]
+        public void RazorPageDocumentClassifierPass_LogsErrorForImportedPageDirectives()
+        {
+            // Arrange
+            var sourceSpan = new SourceSpan("import.cshtml", 0, 0, 0, 5);
+            var expectedDiagnostic = RazorExtensionsDiagnosticFactory.CreatePageDirective_CannotBeImported(sourceSpan);
+            var importDocument = RazorSourceDocument.Create("@page", "import.cshtml");
+            var sourceDocument = RazorSourceDocument.Create("<p>Hello World</p>", "main.cshtml");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            var diagnostic = Assert.Single(directive.Node.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_LogsErrorIfDirectiveNotAtTopOfFile()
+        {
+            // Arrange
+            var sourceSpan = new SourceSpan(
+                "Test.cshtml",
+                absoluteIndex: 14 + Environment.NewLine.Length * 2,
+                lineIndex: 2,
+                characterIndex: 0,
+                length: 5 + Environment.NewLine.Length);
+
+            var expectedDiagnostic = RazorExtensionsDiagnosticFactory.CreatePageDirective_MustExistAtTheTopOfFile(sourceSpan);
+            var content = @"
+@somethingelse
+@page
+";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            var diagnostic = Assert.Single(directive.Node.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_DoesNotLogErrorIfCommentAndWhitespaceBeforeDirective()
+        {
+            // Arrange
+            var content = @"
+@* some comment *@
+     
+@page
+";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            Assert.Empty(directive.Node.Diagnostics);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.razor-page", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NoOpsIfPageDirectiveIsMalformed()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page+1", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_74fbaab062bb228ed1ab09c5ff8d6ed2417320e2", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void RazorPageDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_AddsRouteTemplateMetadata()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page \"some-route\"", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var attributeNode = Assert.IsType<RazorCompiledItemMetadataAttributeIntermediateNode>(visitor.ExtensionNode);
+            Assert.Equal("RouteTemplate", attributeNode.Key);
+            Assert.Equal("some-route", attributeNode.Value);
+        }
+
+        private static RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                PageDirective.Register(b);
+            }).Engine;
+        }
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public ExtensionIntermediateNode ExtensionNode { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitExtension(ExtensionIntermediateNode node)
+            {
+                ExtensionNode = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/SourceMappingsSerializer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/SourceMappingsSerializer.cs
new file mode 100644
index 0000000000..8c63fd7444
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/SourceMappingsSerializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class SourceMappingsSerializer
+    {
+        public static string Serialize(RazorCSharpDocument csharpDocument, RazorSourceDocument sourceDocument)
+        {
+            var builder = new StringBuilder();
+            var sourceFilePath = sourceDocument.FilePath;
+            var charBuffer = new char[sourceDocument.Length];
+            sourceDocument.CopyTo(0, charBuffer, 0, sourceDocument.Length);
+            var sourceContent = new string(charBuffer);
+
+            for (var i = 0; i < csharpDocument.SourceMappings.Count; i++)
+            {
+                var sourceMapping = csharpDocument.SourceMappings[i];
+                if (!string.Equals(sourceMapping.OriginalSpan.FilePath, sourceFilePath, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                builder.Append("Source Location: ");
+                AppendMappingLocation(builder, sourceMapping.OriginalSpan, sourceContent);
+
+                builder.Append("Generated Location: ");
+                AppendMappingLocation(builder, sourceMapping.GeneratedSpan, csharpDocument.GeneratedCode);
+
+                builder.AppendLine();
+            }
+
+            return builder.ToString();
+        }
+
+        private static void AppendMappingLocation(StringBuilder builder, SourceSpan location, string content)
+        {
+            builder
+                .AppendLine(location.ToString())
+                .Append("|");
+
+            for (var i = 0; i < location.Length; i++)
+            {
+                builder.Append(content[location.AbsoluteIndex + i]);
+            }
+
+            builder.AppendLine("|");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TagHelperDescriptorExtensionsTest.cs
new file mode 100644
index 0000000000..af0b983b55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TagHelperDescriptorExtensionsTest.cs
@@ -0,0 +1,82 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class TagHelperDescriptorExtensionsTest
+    {
+        [Fact]
+        public void IsViewComponentKind_ReturnsFalse_ForNonVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsViewComponentKind_ReturnsTrue_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsNull_ForNonVCTHDescriptor()
+        {
+            //Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsName_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor("ViewComponentName");
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Equal("ViewComponentName", result);
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor()
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .Build();
+
+            return tagHelper;
+        }
+
+        private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor(string name = "ViewComponentName")
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, name)
+                .Build();
+
+            return tagHelper;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
new file mode 100644
index 0000000000..a20b20dae8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
@@ -0,0 +1,8 @@
+<div class="@this.ToString()">
+    Hello world
+    @string.Format("{0}", "Hello")
+</div>
+@{ 
+    var cls = "foo";
+}
+<p class="@if(cls != null) { @cls }" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d39b64c26d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+       __o = this.ToString();
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+__o = string.Format("{0}", "Hello");
+
+#line default
+#line hidden
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        __o = cls;
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
new file mode 100644
index 0000000000..4074239b9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -0,0 +1,64 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [23] Basic.cshtml) - Html - \n    Hello world\n    
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
new file mode 100644
index 0000000000..372b49cb6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (13:0,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|this.ToString()|
+Generated Location: (1030:26,13 [15] )
+|this.ToString()|
+
+Source Location: (54:2,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|string.Format("{0}", "Hello")|
+Generated Location: (1166:31,6 [29] )
+|string.Format("{0}", "Hello")|
+
+Source Location: (95:4,2 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| 
+    var cls = "foo";
+|
+Generated Location: (1312:36,2 [25] )
+| 
+    var cls = "foo";
+|
+
+Source Location: (134:7,11 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|if(cls != null) { |
+Generated Location: (1460:42,11 [18] )
+|if(cls != null) { |
+
+Source Location: (153:7,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|cls|
+Generated Location: (1622:47,30 [3] )
+|cls|
+
+Source Location: (156:7,33 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| }|
+Generated Location: (1773:52,33 [2] )
+| }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
new file mode 100644
index 0000000000..8e6b1a7bd7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -0,0 +1,95 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6d079dd6c39f39d17a2faff14404b37ab7e8b8fc"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"6d079dd6c39f39d17a2faff14404b37ab7e8b8fc", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 4, true);
+            WriteLiteral("<div");
+            EndContext();
+            BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            BeginContext(29, 24, true);
+            WriteLiteral(">\r\n    Hello world\r\n    ");
+            EndContext();
+            BeginContext(54, 29, false);
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+Write(string.Format("{0}", "Hello"));
+
+#line default
+#line hidden
+            EndContext();
+            BeginContext(83, 10, true);
+            WriteLiteral("\r\n</div>\r\n");
+            EndContext();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+            BeginContext(123, 2, true);
+            WriteLiteral("<p");
+            EndContext();
+            BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
+            WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+                BeginContext(153, 3, false);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        Write(cls);
+
+#line default
+#line hidden
+                EndContext();
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+                PopWriter();
+            }
+            ), 133, 25, false);
+            EndWriteAttribute();
+            BeginContext(159, 5, true);
+            WriteLiteral(" />\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
new file mode 100644
index 0000000000..9173f6251b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -0,0 +1,76 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(0, 4, true);
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(29, 24, true);
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [19] Basic.cshtml) - Html - \n    Hello world\n
+                    IntermediateToken - (49:2,0 [4] Basic.cshtml) - Html -     
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(54, 29, false);
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(83, 10, true);
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(123, 2, true);
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(153, 3, false);
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(159, 5, true);
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
new file mode 100644
index 0000000000..224242197b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
@@ -0,0 +1,15 @@
+@* These test files validate that end-to-end, incomplete directives don't throw. *@
+
+@page
+@page 
+@page "
+
+@model
+@model 
+
+@inject
+@inject 
+@inject MyService<TModel>
+
+@namespace
+@namespace 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..dd100bee00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1cfef392ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
@@ -0,0 +1,12 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(10,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,26): Error RZ1015: The 'inject' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(14,11): Error RZ1014: The 'namespace' directive expects a namespace name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,1): Error RZ2001: The 'namespace' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..2aeddc2fa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -0,0 +1,84 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
+                HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
+                    IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..4bb61bf781
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -0,0 +1,40 @@
+Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (671:18,0 [0] )
+||
+
+Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (724:21,0 [0] )
+||
+
+Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (777:24,0 [0] )
+||
+
+Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (830:27,0 [0] )
+||
+
+Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|MyService<TModel>|
+Generated Location: (980:31,0 [17] )
+|MyService<TModel>|
+
+Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1133:38,0 [0] )
+||
+
+Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1186:41,0 [0] )
+||
+
+Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1239:44,0 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..743eed291e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -0,0 +1,65 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5add9dba0a182cd75498c5b24f64a2547e7f49b0"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5add9dba0a182cd75498c5b24f64a2547e7f49b0", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(83, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(108, 5, true);
+            WriteLiteral("\"\r\n\r\n");
+            EndContext();
+            BeginContext(119, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(128, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(139, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(149, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(176, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(190, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(203, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1cfef392ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
@@ -0,0 +1,12 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(10,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,26): Error RZ1015: The 'inject' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(14,11): Error RZ1014: The 'namespace' directive expects a namespace name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,1): Error RZ2001: The 'namespace' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..bd3bdd87e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -0,0 +1,95 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(83, 4, true);
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(108, 5, true);
+                HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
+                    IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(119, 2, true);
+                HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(128, 4, true);
+                HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(139, 2, true);
+                HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(149, 2, true);
+                HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(176, 4, true);
+                HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(190, 2, true);
+                HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(203, 2, true);
+                HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
new file mode 100644
index 0000000000..38efd570da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
@@ -0,0 +1,2 @@
+@inherits MyBasePageForViews<TModel>
+@model MyModel
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7cdbaf3326
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..3310acfa76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
@@ -0,0 +1,39 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [26] InheritsViewModel.cshtml) - MyBasePageForViews<TModel>
+                DirectiveToken - (45:1,7 [7] InheritsViewModel.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a313a909d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyBasePageForViews<TModel>|
+Generated Location: (740:19,0 [26] )
+|MyBasePageForViews<TModel>|
+
+Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyModel|
+Generated Location: (1004:27,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..9680177b77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3ff83e2f0d946feb387a8ea03a529c64350014f8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"3ff83e2f0d946feb387a8ea03a529c64350014f8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
new file mode 100644
index 0000000000..2468ef4662
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
new file mode 100644
index 0000000000..295e4cf3ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
@@ -0,0 +1,2 @@
+@page
+@model MyModel
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..f174a0fc2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+        public MyModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..bcbf42ae26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyPageModel<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [19] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - MyPageModel<TModel>
+                DirectiveToken - (14:1,7 [7] InheritsWithViewImports.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public MyModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e7daecd874
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
+|MyModel|
+Generated Location: (745:19,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..c1ea0b5c3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d196fc1c66d46d35e35af9b01c737e12bcce6782"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d196fc1c66d46d35e35af9b01c737e12bcce6782", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f311ecbb5c4d63980a59c24af5ffe8baa1c3f99a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+        public MyModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..2704223a57
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyPageModel<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public MyModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
new file mode 100644
index 0000000000..0aa749dd3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
@@ -0,0 +1 @@
+@inject MyApp MyPropertyName
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
new file mode 100644
index 0000000000..d699f1e754
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
@@ -0,0 +1,3 @@
+@model MyModel
+@inject MyApp MyPropertyName
+@inject MyService<TModel> Html
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2120622373
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -0,0 +1,82 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..c1d70d5d89
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithModel.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithModel.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithModel.cshtml) - MyPropertyName
+                DirectiveToken - (54:2,8 [17] InjectWithModel.cshtml) - MyService<TModel>
+                DirectiveToken - (72:2,26 [4] InjectWithModel.cshtml) - Html
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c4838ff64d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyModel|
+Generated Location: (766:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyApp|
+Generated Location: (990:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyPropertyName|
+Generated Location: (1232:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyService<TModel>|
+Generated Location: (1438:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|Html|
+Generated Location: (1704:51,22 [4] )
+|Html|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..36974edf08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2cafb599699b78d76f0355b6f528050b4720789d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2cafb599699b78d76f0355b6f528050b4720789d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
new file mode 100644
index 0000000000..d018107ae2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
new file mode 100644
index 0000000000..8cd61913e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
@@ -0,0 +1,5 @@
+@model MyModel
+@inject MyApp MyPropertyName;   
+@inject MyService<TModel> Html;  
+@inject MyApp MyPropertyName2  ;  
+@inject MyService<TModel> Html2  ;  
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ea95a4e7eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -0,0 +1,118 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
new file mode 100644
index 0000000000..5c4540f366
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
@@ -0,0 +1,49 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithSemicolon.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithSemicolon.cshtml) - MyPropertyName
+                DirectiveToken - (58:2,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (76:2,26 [4] InjectWithSemicolon.cshtml) - Html
+                DirectiveToken - (93:3,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (99:3,14 [15] InjectWithSemicolon.cshtml) - MyPropertyName2
+                DirectiveToken - (129:4,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (147:4,26 [5] InjectWithSemicolon.cshtml) - Html2
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a90f75f3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -0,0 +1,45 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyModel|
+Generated Location: (774:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1002:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName|
+Generated Location: (1248:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (1458:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html|
+Generated Location: (1728:51,22 [4] )
+|Html|
+
+Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1928:59,0 [5] )
+|MyApp|
+
+Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName2|
+Generated Location: (2174:67,22 [15] )
+|MyPropertyName2|
+
+Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (2385:75,0 [17] )
+|MyService<TModel>|
+
+Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html2|
+Generated Location: (2655:83,22 [5] )
+|Html2|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
new file mode 100644
index 0000000000..b8eb5c371d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
@@ -0,0 +1,42 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8a53bde02f202036e674a23018e04268a3a844bb"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8a53bde02f202036e674a23018e04268a3a844bb", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
new file mode 100644
index 0000000000..898557c170
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7b2f4fedc6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
new file mode 100644
index 0000000000..0b8beeae9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [5] Inject.cshtml) - MyApp
+                DirectiveToken - (14:0,14 [14] Inject.cshtml) - MyPropertyName
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
new file mode 100644
index 0000000000..10ed356ecf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyApp|
+Generated Location: (748:19,0 [5] )
+|MyApp|
+
+Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyPropertyName|
+Generated Location: (981:27,22 [14] )
+|MyPropertyName|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
new file mode 100644
index 0000000000..e3493199a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "592a6d8544c71b828d4a3fbf92d398cd3ea72790"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"592a6d8544c71b828d4a3fbf92d398cd3ea72790", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
new file mode 100644
index 0000000000..e05f9d2df9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
new file mode 100644
index 0000000000..6dfb72bc31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
@@ -0,0 +1 @@
+@namespace Test.
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d99c176c52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..90446dc58b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..6f9220aab4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
+                HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..2accba6951
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "010d175bb6c3f7fa6f2ae04c1fecb4e3bfbf928b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"010d175bb6c3f7fa6f2ae04c1fecb4e3bfbf928b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(11, 5, true);
+            WriteLiteral("Test.");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..90446dc58b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..e99ab2d9c2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(11, 5, true);
+                HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
new file mode 100644
index 0000000000..9b4f9d5559
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
@@ -0,0 +1,4 @@
+@page "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.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..15befce0d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..637d1e902b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml(1,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..c3fbc6082e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
@@ -0,0 +1,51 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
+                HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
+                    IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
+                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
+                    IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
+                    IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
+                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
+                    IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..7835a2dae2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "464e008b9a04181fe1e9f2cc6826095698de4739"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"464e008b9a04181fe1e9f2cc6826095698de4739", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(6, 49, true);
+            WriteLiteral("\"foo\r\n\r\n<h1>About Us</h1>\r\n<p>We are awesome.</p>");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..637d1e902b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml(1,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..0692442d42
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(6, 49, true);
+                HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
+                    IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
+                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
+                    IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
+                    IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
+                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
+                    IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
new file mode 100644
index 0000000000..4b73b2dc53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
@@ -0,0 +1 @@
+@model System.Collections.IEnumerable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
new file mode 100644
index 0000000000..c488b1e443
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -0,0 +1,6 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+<input-test for="Date" />
+<input-test for="@Model" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..82441cd663
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..37627e94ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] ModelExpressionTagHelper.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] ModelExpressionTagHelper.cshtml) - "InputTestTagHelper, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (62:2,43 [4] ModelExpressionTagHelper.cshtml) - Html - \n\n
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..63a7d6ccc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|DateTime|
+Generated Location: (851:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1123:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Date|
+Generated Location: (1802:44,102 [4] )
+|Date|
+
+Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Model|
+Generated Location: (2118:50,94 [5] )
+|Model|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..799bbc1362
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -0,0 +1,107 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "741fc99adb54ad906c5cdc5391aeffb51a1e767b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"741fc99adb54ad906c5cdc5391aeffb51a1e767b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(17, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(64, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(66, 25, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(91, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(93, 27, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(120, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..1fb7820a75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -0,0 +1,73 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
+                HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(66, 25, false);
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(91, 2, true);
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(93, 27, false);
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(120, 2, true);
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
new file mode 100644
index 0000000000..63c2a52c6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
new file mode 100644
index 0000000000..1ebdc00df2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [30] Model.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
new file mode 100644
index 0000000000..7d84cf754d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (769:19,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
new file mode 100644
index 0000000000..ae8dc1fe65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2c1e88396568d309c236020e59bf2abacfadd612"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2c1e88396568d309c236020e59bf2abacfadd612", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
new file mode 100644
index 0000000000..2b7dcff085
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
new file mode 100644
index 0000000000..350f93b776
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
@@ -0,0 +1,2 @@
+@model ThisShouldBeGenerated
+@model System.Collections.IEnumerable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e8f705cef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<ThisShouldBeGenerated> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..2fe8233c66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml(2,1): Error RZ2001: The 'model' directive may only occur once per document.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
new file mode 100644
index 0000000000..f63a69601b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
@@ -0,0 +1,41 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [21] MultipleModels.cshtml) - ThisShouldBeGenerated
+                DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (30:1,0 [39] MultipleModels.cshtml) - model
+                    DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
new file mode 100644
index 0000000000..79d7e257c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|ThisShouldBeGenerated|
+Generated Location: (778:19,0 [21] )
+|ThisShouldBeGenerated|
+
+Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (1029:27,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
new file mode 100644
index 0000000000..ecee97de58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
@@ -0,0 +1,3 @@
+@page
+@namespace Test.Namespace
+<h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9d7181bfad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test.Namespace
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml"
+global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
new file mode 100644
index 0000000000..9238a0a419
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
@@ -0,0 +1,47 @@
+Document - 
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (18:1,11 [14] PageWithNamespace.cshtml) - Test.Namespace
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
+                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b41240c9c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:1,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml)
+|Test.Namespace|
+Generated Location: (809:19,44 [14] )
+|Test.Namespace|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
new file mode 100644
index 0000000000..9c1a5b03f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1edfb1ba4f5f6c70e2c72f4f23baf4dc0ae14377"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
+namespace Test.Namespace
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"1edfb1ba4f5f6c70e2c72f4f23baf4dc0ae14377", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(34, 20, true);
+            WriteLiteral("<h1>Hi There!</h1>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
new file mode 100644
index 0000000000..53b89427ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(34, 20, true);
+                HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
+                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
new file mode 100644
index 0000000000..5172f8f791
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
@@ -0,0 +1,2 @@
+<div>Some text here.</div>
+@page
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ec8a4fd5c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..393b35646e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml(2,1): Error RZ3906: The '@page' directive must precede all other elements defined in a Razor file.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..c21d9fc82c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
+                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
+                    IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
+                    IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..107beef619
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40c0ffad85d8fef63edfb5d91a08bd1b3609ba6f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"40c0ffad85d8fef63edfb5d91a08bd1b3609ba6f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 28, true);
+            WriteLiteral("<div>Some text here.</div>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..393b35646e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml(2,1): Error RZ3906: The '@page' directive must precede all other elements defined in a Razor file.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..764b704909
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(0, 28, true);
+                HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
+                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
+                    IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
+                    IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
new file mode 100644
index 0000000000..2bc617c509
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
@@ -0,0 +1,40 @@
+@page
+
+@model NewModel
+@addTagHelper "*, AppCode"
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+}
+
+<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">@Model.Name</label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
new file mode 100644
index 0000000000..63d5955e72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
@@ -0,0 +1,13 @@
+@page "/About"
+
+@model NewModel
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+}
+
+<h1>New Customer @Model.Name</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
new file mode 100644
index 0000000000..8f5d082e6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -0,0 +1,78 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+global::System.Object __typeHelper = "/About";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            __o = Model.Name;
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
new file mode 100644
index 0000000000..c71b835bf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
@@ -0,0 +1,60 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (36:3,1 [41] RazorPagesWithRouteTemplate.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorCompiledItemMetadataAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (6:0,6 [8] RazorPagesWithRouteTemplate.cshtml) - "/About"
+                DirectiveToken - (25:2,7 [8] RazorPagesWithRouteTemplate.cshtml) - NewModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                HtmlContent - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
+                HtmlContent - (191:10,1 [21] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (191:10,1 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
+                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
+                CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
+                HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
+                    IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+            CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
+                IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
new file mode 100644
index 0000000000..cc5e9cad30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -0,0 +1,35 @@
+Source Location: (36:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (492:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (6:0,6 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|"/About"|
+Generated Location: (1108:25,37 [8] )
+|"/About"|
+
+Source Location: (25:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|NewModel|
+Generated Location: (1313:33,0 [8] )
+|NewModel|
+
+Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|Model.Name|
+Generated Location: (1841:48,18 [10] )
+|Model.Name|
+
+Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2049:55,12 [97] )
+|
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
new file mode 100644
index 0000000000..bff519edb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -0,0 +1,72 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "547900310554f446d88da593a245719ee9dbb12f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"547900310554f446d88da593a245719ee9dbb12f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(16, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(79, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(193, 19, true);
+            WriteLiteral("\r\n<h1>New Customer ");
+            EndContext();
+            BeginContext(213, 10, false);
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            Write(Model.Name);
+
+#line default
+#line hidden
+            EndContext();
+            BeginContext(223, 7, true);
+            WriteLiteral("</h1>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
new file mode 100644
index 0000000000..5d54680b90
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -0,0 +1,61 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (36:3,1 [43] RazorPagesWithRouteTemplate.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorCompiledItemMetadataAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(16, 2, true);
+                HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(79, 2, true);
+                HtmlContent - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(193, 19, true);
+                HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(213, 10, false);
+                CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(223, 7, true);
+                HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
+                    IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
+                IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
new file mode 100644
index 0000000000..b78cc65ec7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
@@ -0,0 +1,36 @@
+@page
+
+@addTagHelper "*, AppCode"
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+}
+
+<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">@Name</label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..aeb2631c46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -0,0 +1,83 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+                                         __o = Name;
+
+#line default
+#line hidden
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+            
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..913b80d2aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
@@ -0,0 +1,143 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (38:3,1 [41] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (23:2,14 [12] RazorPagesWithoutModel.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (35:2,26 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (35:2,26 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (79:3,42 [4] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (79:3,42 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
+                HtmlContent - (379:18,1 [77] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (379:18,1 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
+                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (468:22,16 [11] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (468:22,16 [11] RazorPagesWithoutModel.cshtml) - Html - text-danger
+                    DefaultTagHelperExecute - 
+                HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                        CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                        HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (600:25,20 [9] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (600:25,20 [9] RazorPagesWithoutModel.cshtml) - Html - col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (505:23,16 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (505:23,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (782:31,20 [25] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (782:31,20 [25] RazorPagesWithoutModel.cshtml) - Html - col-md-offset-2 col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (748:30,16 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (748:30,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+            CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
+                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..33f7baa377
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -0,0 +1,46 @@
+Source Location: (38:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (487:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|"*, AppCode"|
+Generated Location: (1035:25,37 [12] )
+|"*, AppCode"|
+
+Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|Name|
+Generated Location: (1629:41,47 [4] )
+|Name|
+
+Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2110:52,12 [283] )
+|
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..f11c563667
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -0,0 +1,204 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8bf3954ad78688478de155359db8af32627ee2b8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8bf3954ad78688478de155359db8af32627ee2b8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(7, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(81, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(381, 75, true);
+            WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n    ");
+            EndContext();
+            BeginContext(456, 31, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(487, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(493, 237, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(517, 48, true);
+                WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+                EndContext();
+                BeginContext(566, 4, false);
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+                                         Write(Name);
+
+#line default
+#line hidden
+                EndContext();
+                BeginContext(570, 18, true);
+                WriteLiteral("</label>\r\n        ");
+                EndContext();
+                BeginContext(588, 130, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(611, 101, true);
+                    WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(718, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(730, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(736, 174, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(760, 10, true);
+                WriteLiteral("\r\n        ");
+                EndContext();
+                BeginContext(770, 128, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(809, 83, true);
+                    WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(898, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(910, 11, true);
+            WriteLiteral("\r\n</form>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+            
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
new file mode 100644
index 0000000000..519006aec3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -0,0 +1,193 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
+                HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(81, 2, true);
+                HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(381, 75, true);
+                HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(456, 31, false);
+                TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(487, 6, true);
+                HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(493, 237, false);
+                TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(517, 48, true);
+                        HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(566, 4, false);
+                        CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(570, 18, true);
+                        HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(588, 130, false);
+                        TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(611, 101, true);
+                                HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(718, 6, true);
+                        HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(730, 6, true);
+                HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(736, 174, false);
+                TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(760, 10, true);
+                        HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(770, 128, false);
+                        TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(809, 83, true);
+                                HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(898, 6, true);
+                        HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(910, 11, true);
+                HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
+                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d7acbdf7d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -0,0 +1,94 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+                                         __o = Model.Name;
+
+#line default
+#line hidden
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
new file mode 100644
index 0000000000..2266b746f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
@@ -0,0 +1,144 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (55:4,1 [41] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (16:2,7 [8] RazorPages.cshtml) - NewModel
+                DirectiveToken - (40:3,14 [12] RazorPages.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (52:3,26 [2] RazorPages.cshtml)
+                    IntermediateToken - (52:3,26 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (96:4,42 [4] RazorPages.cshtml)
+                    IntermediateToken - (96:4,42 [4] RazorPages.cshtml) - Html - \n\n
+                HtmlContent - (473:22,1 [78] RazorPages.cshtml)
+                    IntermediateToken - (473:22,1 [4] RazorPages.cshtml) - Html - \n\n
+                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (563:26,16 [11] RazorPages.cshtml)
+                            IntermediateToken - (563:26,16 [11] RazorPages.cshtml) - Html - text-danger
+                    DefaultTagHelperExecute - 
+                HtmlContent - (582:26,35 [6] RazorPages.cshtml)
+                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (612:27,28 [48] RazorPages.cshtml)
+                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                        CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
+                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                        HtmlContent - (671:28,57 [18] RazorPages.cshtml)
+                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (712:29,31 [101] RazorPages.cshtml)
+                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (701:29,20 [9] RazorPages.cshtml)
+                                    IntermediateToken - (701:29,20 [9] RazorPages.cshtml) - Html - col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (819:32,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (600:27,16 [10] RazorPages.cshtml)
+                            IntermediateToken - (600:27,16 [10] RazorPages.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (831:33,10 [6] RazorPages.cshtml)
+                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (861:34,28 [10] RazorPages.cshtml)
+                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (910:35,47 [83] RazorPages.cshtml)
+                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (883:35,20 [25] RazorPages.cshtml)
+                                    IntermediateToken - (883:35,20 [25] RazorPages.cshtml) - Html - col-md-offset-2 col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (999:37,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (849:34,16 [10] RazorPages.cshtml)
+                            IntermediateToken - (849:34,16 [10] RazorPages.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
+                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+            CSharpCode - (112:6,12 [360] RazorPages.cshtml)
+                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
new file mode 100644
index 0000000000..0af8c77dfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -0,0 +1,57 @@
+Source Location: (55:4,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (475:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|NewModel|
+Generated Location: (962:25,0 [8] )
+|NewModel|
+
+Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|"*, AppCode"|
+Generated Location: (1220:33,37 [12] )
+|"*, AppCode"|
+
+Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|Model.Name|
+Generated Location: (1802:49,47 [10] )
+|Model.Name|
+
+Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2277:60,12 [360] )
+|
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
new file mode 100644
index 0000000000..ca08b5e268
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -0,0 +1,207 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d33caff161b646a61b273d7c544111395b652557"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d33caff161b646a61b273d7c544111395b652557", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(7, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(98, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(475, 76, true);
+            WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\" >\r\n    ");
+            EndContext();
+            BeginContext(551, 31, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(582, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(588, 243, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(612, 48, true);
+                WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+                EndContext();
+                BeginContext(661, 10, false);
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+                                         Write(Model.Name);
+
+#line default
+#line hidden
+                EndContext();
+                BeginContext(671, 18, true);
+                WriteLiteral("</label>\r\n        ");
+                EndContext();
+                BeginContext(689, 130, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(712, 101, true);
+                    WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(819, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(831, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(837, 174, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(861, 10, true);
+                WriteLiteral("\r\n        ");
+                EndContext();
+                BeginContext(871, 128, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(910, 83, true);
+                    WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(999, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(1011, 11, true);
+            WriteLiteral("\r\n</form>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
new file mode 100644
index 0000000000..cc1bc6f718
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -0,0 +1,193 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
+                HtmlContent - (7:1,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(98, 2, true);
+                HtmlContent - (98:5,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(475, 76, true);
+                HtmlContent - (475:23,0 [76] RazorPages.cshtml)
+                    IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(551, 31, false);
+                TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(582, 6, true);
+                HtmlContent - (582:26,35 [6] RazorPages.cshtml)
+                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(588, 243, false);
+                TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(612, 48, true);
+                        HtmlContent - (612:27,28 [48] RazorPages.cshtml)
+                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(661, 10, false);
+                        CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
+                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(671, 18, true);
+                        HtmlContent - (671:28,57 [18] RazorPages.cshtml)
+                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(689, 130, false);
+                        TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(712, 101, true);
+                                HtmlContent - (712:29,31 [101] RazorPages.cshtml)
+                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(819, 6, true);
+                        HtmlContent - (819:32,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(831, 6, true);
+                HtmlContent - (831:33,10 [6] RazorPages.cshtml)
+                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(837, 174, false);
+                TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(861, 10, true);
+                        HtmlContent - (861:34,28 [10] RazorPages.cshtml)
+                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(871, 128, false);
+                        TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(910, 83, true);
+                                HtmlContent - (910:35,47 [83] RazorPages.cshtml)
+                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(999, 6, true);
+                        HtmlContent - (999:37,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(1011, 11, true);
+                HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
+                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            CSharpCode - (112:6,12 [360] RazorPages.cshtml)
+                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
new file mode 100644
index 0000000000..7438788ff4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
@@ -0,0 +1,14 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+@{ 
+    Layout = "_SectionTestLayout.cshtml";
+}
+
+<div>Some body</div>
+
+@section Section1 {
+    <div>This is in Section 1</div>
+    <input-test for="Date" />
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3ca46af8a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -0,0 +1,80 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object Section1 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            DefineSection("Section1", async(__razor_section_writer) => {
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
new file mode 100644
index 0000000000..312d7bb7ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -0,0 +1,73 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] Sections.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] Sections.cshtml) - "InputTestTagHelper, AppCode"
+                DirectiveToken - (152:10,9 [8] Sections.cshtml) - Section1
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] Sections.cshtml)
+                    IntermediateToken - (62:2,43 [4] Sections.cshtml) - Html - \n\n
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                Section -  - Section1
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1cc991810c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|DateTime|
+Generated Location: (819:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1075:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Section1|
+Generated Location: (1305:36,22 [8] )
+|Section1|
+
+Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+Generated Location: (1771:51,2 [46] )
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+
+Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Date|
+Generated Location: (2196:59,102 [4] )
+|Date|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
new file mode 100644
index 0000000000..5d5ab480d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -0,0 +1,99 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4b7b87da15db4343c99430c0813fd6bc03643453"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4b7b87da15db4343c99430c0813fd6bc03643453", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(17, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(64, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            BeginContext(117, 26, true);
+            WriteLiteral("\r\n<div>Some body</div>\r\n\r\n");
+            EndContext();
+            DefineSection("Section1", async() => {
+                BeginContext(162, 43, true);
+                WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n    ");
+                EndContext();
+                BeginContext(205, 25, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+                __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+                __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(230, 2, true);
+                WriteLiteral("\r\n");
+                EndContext();
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
new file mode 100644
index 0000000000..8a5b810749
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -0,0 +1,77 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
+                HtmlContent - (64:3,0 [2] Sections.cshtml)
+                    IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(117, 26, true);
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                Section -  - Section1
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - BeginContext(162, 43, true);
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - EndContext();
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - BeginContext(205, 25, false);
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - EndContext();
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - BeginContext(230, 2, true);
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
new file mode 100644
index 0000000000..ed2648a986
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
@@ -0,0 +1,4 @@
+@using System.ComponentModel
+@using System.Collections
+@using System
+@using System
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ad57e4a82b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.ComponentModel;
+
+#line default
+#line hidden
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.Collections;
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..0163b00a81
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [27] UsingDirectives.cshtml) - System.ComponentModel
+        UsingDirective - (31:1,1 [24] UsingDirectives.cshtml) - System.Collections
+        UsingDirective - (58:2,1 [12] UsingDirectives.cshtml) - System
+        UsingDirective - (73:3,1 [12] UsingDirectives.cshtml) - System
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (28:0,28 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (28:0,28 [2] UsingDirectives.cshtml) - Html - \n
+                HtmlContent - (55:1,25 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (55:1,25 [2] UsingDirectives.cshtml) - Html - \n
+                HtmlContent - (70:2,13 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (70:2,13 [2] UsingDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..71a6bf2b2d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (1:0,1 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System.ComponentModel|
+Generated Location: (461:13,0 [27] )
+|using System.ComponentModel|
+
+Source Location: (31:1,1 [24] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System.Collections|
+Generated Location: (613:18,0 [24] )
+|using System.Collections|
+
+Source Location: (58:2,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System|
+Generated Location: (762:23,0 [12] )
+|using System|
+
+Source Location: (73:3,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System|
+Generated Location: (899:28,0 [12] )
+|using System|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..1310cb0d8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
@@ -0,0 +1,55 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "452979e8e4dd77a84a4c50425dd3a162e265990d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
+namespace AspNetCore
+{
+    #line hidden
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.ComponentModel;
+
+#line default
+#line hidden
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.Collections;
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"452979e8e4dd77a84a4c50425dd3a162e265990d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..c3b71e0393
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [29] UsingDirectives.cshtml) - System.ComponentModel
+        UsingDirective - (31:1,1 [26] UsingDirectives.cshtml) - System.Collections
+        UsingDirective - (58:2,1 [14] UsingDirectives.cshtml) - System
+        UsingDirective - (73:3,1 [12] UsingDirectives.cshtml) - System
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
new file mode 100644
index 0000000000..0430ccfc69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
@@ -0,0 +1,6 @@
+@addTagHelper "*, AppCode"
+@{
+    var foo = "Hello";
+}
+
+<vc:test first-name="@foo" bar=" World"></vc:test>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..b6196f6651
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,84 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AllTagHelper __AllTagHelper;
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+                __o = foo;
+
+#line default
+#line hidden
+            __TestViewComponentTagHelper.firstName = string.Empty;
+            __AllTagHelper.Bar = " World";
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..8e7497e7d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
@@ -0,0 +1,59 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (14:0,14 [12] ViewComponentTagHelper.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (26:0,26 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    DefaultTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - bar - string AllTagHelper.Bar - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (93:5,32 [6] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (93:5,32 [6] ViewComponentTagHelper.cshtml) - Html -  World
+                    DefaultTagHelperExecute - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9c5fd32efb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|"*, AppCode"|
+Generated Location: (1057:21,37 [12] )
+|"*, AppCode"|
+
+Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|
+    var foo = "Hello";
+|
+Generated Location: (1534:36,2 [26] )
+|
+    var foo = "Hello";
+|
+
+Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|foo|
+Generated Location: (1985:44,22 [3] )
+|foo|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..28241f9687
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -0,0 +1,112 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "bf860c3a5e96240c9d41a0b950e49c1a165ca44d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"bf860c3a5e96240c9d41a0b950e49c1a165ca44d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::AllTagHelper __AllTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            BeginContext(59, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(61, 50, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __tagHelperExecutionContext.Add(__AllTagHelper);
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+            __tagHelperExecutionContext.Add(__TestViewComponentTagHelper);
+            BeginWriteTagHelperAttribute();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+         WriteLiteral(foo);
+
+#line default
+#line hidden
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestViewComponentTagHelper.firstName = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("first-name", __TestViewComponentTagHelper.firstName, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __AllTagHelper.Bar = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..4c215a09d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - bar -  World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(59, 2, true);
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(61, 50, false);
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
new file mode 100644
index 0000000000..eaf33e48ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
@@ -0,0 +1,2 @@
+@namespace Test.Namespace
+<h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
new file mode 100644
index 0000000000..209d3361f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test.Namespace
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml"
+global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
new file mode 100644
index 0000000000..42d53bcd1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (11:0,11 [14] ViewWithNamespace.cshtml) - Test.Namespace
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
+                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
new file mode 100644
index 0000000000..2b7a295e01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml)
+|Test.Namespace|
+Generated Location: (818:19,44 [14] )
+|Test.Namespace|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
new file mode 100644
index 0000000000..fb4ec5e55e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "471b74bb73c8ae8e0ed24c654340198b9b4a1ec8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
+namespace Test.Namespace
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"471b74bb73c8ae8e0ed24c654340198b9b4a1ec8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(27, 20, true);
+            WriteLiteral("<h1>Hi There!</h1>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
new file mode 100644
index 0000000000..471464c580
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(27, 20, true);
+                HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
+                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
new file mode 100644
index 0000000000..f4e110d289
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
@@ -0,0 +1 @@
+@inject IHtmlHelper<TModel> Helper
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1f60d924cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+global::System.Object Helper = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..b677049ce1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [19] _ViewImports.cshtml) - IHtmlHelper<TModel>
+                DirectiveToken - (28:0,28 [6] _ViewImports.cshtml) - Helper
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..dc03ca32da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|IHtmlHelper<TModel>|
+Generated Location: (760:19,0 [19] )
+|IHtmlHelper<TModel>|
+
+Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|Helper|
+Generated Location: (1027:27,22 [6] )
+|Helper|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..346428fa0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "74c90591b68437a0868e91dc714ea9827ab8e03a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"74c90591b68437a0868e91dc714ea9827ab8e03a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..addc2754ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
new file mode 100644
index 0000000000..8c5b2e0f79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
@@ -0,0 +1,118 @@
+#pragma checksum "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "78993008d95836bec2b9175d4294bf7bd5f5f109"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Razor.Template), @"default", @"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml")]
+namespace Razor
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"78993008d95836bec2b9175d4294bf7bd5f5f109", @"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml")]
+    public class Template
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", "Hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("foo"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::FormTagHelper __FormTagHelper;
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(31, 28, true);
+            WriteLiteral("<span someattr>Hola</span>\r\n");
+            EndContext();
+            BeginContext(61, 7, false);
+#line 3 "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml"
+Write("Hello");
+
+#line default
+#line hidden
+            EndContext();
+            BeginContext(69, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(71, 87, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("form", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(91, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+                BeginContext(97, 52, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+                __tagHelperExecutionContext.Add(__InputTagHelper);
+                __InputTagHelper.FooProp = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#line 5 "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml"
+__InputTagHelper.BarProp = DateTime.Now;
+
+#line default
+#line hidden
+                __tagHelperExecutionContext.AddTagHelperAttribute("date", __InputTagHelper.BarProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(149, 2, true);
+                WriteLiteral("\r\n");
+                EndContext();
+            }
+            );
+            __FormTagHelper = CreateTagHelper<global::FormTagHelper>();
+            __tagHelperExecutionContext.Add(__FormTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(158, 31, true);
+            WriteLiteral("\r\n\r\n<span>Here is some content ");
+            EndContext();
+            BeginContext(207, 9, true);
+            WriteLiteral("</span>\r\n");
+            EndContext();
+            BeginContext(217, 29, false);
+#line 9 "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml"
+Write(Foo(item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    BeginContext(222, 24, true);
+    WriteLiteral("<span>Hello world</span>");
+    EndContext();
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+            EndContext();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml
new file mode 100644
index 0000000000..8b4fdef616
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml
@@ -0,0 +1,9 @@
+@addTagHelper *, TestAssembly
+<span someattr>Hola</span>
+@("Hello")
+<form unbound="foo">
+    <input value=Hello date=@DateTime.Now type='text' />
+</form>
+
+<span>Here is some content @*with a comment*@</span>
+@Foo(@<span>Hello world</span>)
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
new file mode 100644
index 0000000000..c4ba72abd9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
@@ -0,0 +1,100 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::FormTagHelper - __FormTagHelper
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(31, 28, true);
+                HtmlContent - (31:1,0 [28] BasicTest.cshtml)
+                    IntermediateToken - (31:1,0 [5] BasicTest.cshtml) - Html - <span
+                    IntermediateToken - (36:1,5 [9] BasicTest.cshtml) - Html -  someattr
+                    IntermediateToken - (45:1,14 [1] BasicTest.cshtml) - Html - >
+                    IntermediateToken - (46:1,15 [4] BasicTest.cshtml) - Html - Hola
+                    IntermediateToken - (50:1,19 [7] BasicTest.cshtml) - Html - </span>
+                    IntermediateToken - (57:1,26 [2] BasicTest.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(61, 7, false);
+                CSharpExpression - (61:2,2 [7] BasicTest.cshtml)
+                    IntermediateToken - (61:2,2 [7] BasicTest.cshtml) - CSharp - "Hello"
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(69, 2, true);
+                HtmlContent - (69:2,10 [2] BasicTest.cshtml)
+                    IntermediateToken - (69:2,10 [2] BasicTest.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(71, 87, false);
+                TagHelper - (71:3,0 [87] BasicTest.cshtml) - form - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(91, 6, true);
+                        HtmlContent - (91:3,20 [6] BasicTest.cshtml)
+                            IntermediateToken - (91:3,20 [6] BasicTest.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(97, 52, false);
+                        TagHelper - (97:4,4 [52] BasicTest.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - InputTagHelper
+                            PreallocatedTagHelperProperty - (110:4,17 [5] BasicTest.cshtml) - __tagHelperAttribute_0 - value - FooProp
+                            DefaultTagHelperProperty - (121:4,28 [13] BasicTest.cshtml) - date - System.DateTime InputTagHelper.BarProp - HtmlAttributeValueStyle.DoubleQuotes
+                                CSharpExpression - (122:4,29 [12] BasicTest.cshtml)
+                                    IntermediateToken - (122:4,29 [12] BasicTest.cshtml) - CSharp - DateTime.Now
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(149, 2, true);
+                        HtmlContent - (149:4,56 [2] BasicTest.cshtml)
+                            IntermediateToken - (149:4,56 [2] BasicTest.cshtml) - Html - \n
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - FormTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(158, 31, true);
+                HtmlContent - (158:5,7 [31] BasicTest.cshtml)
+                    IntermediateToken - (158:5,7 [4] BasicTest.cshtml) - Html - \n\n
+                    IntermediateToken - (162:7,0 [6] BasicTest.cshtml) - Html - <span>
+                    IntermediateToken - (168:7,6 [21] BasicTest.cshtml) - Html - Here is some content 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(207, 9, true);
+                HtmlContent - (207:7,45 [9] BasicTest.cshtml)
+                    IntermediateToken - (207:7,45 [7] BasicTest.cshtml) - Html - </span>
+                    IntermediateToken - (214:7,52 [2] BasicTest.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(217, 29, false);
+                CSharpExpression - (217:8,1 [29] BasicTest.cshtml)
+                    IntermediateToken - (217:8,1 [4] BasicTest.cshtml) - CSharp - Foo(
+                    Template - (222:8,6 [24] BasicTest.cshtml)
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(222, 24, true);
+                        HtmlContent - (222:8,6 [24] BasicTest.cshtml)
+                            IntermediateToken - (222:8,6 [6] BasicTest.cshtml) - Html - <span>
+                            IntermediateToken - (228:8,12 [11] BasicTest.cshtml) - Html - Hello world
+                            IntermediateToken - (239:8,23 [7] BasicTest.cshtml) - Html - </span>
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    IntermediateToken - (246:8,30 [1] BasicTest.cshtml) - CSharp - )
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
new file mode 100644
index 0000000000..d27fdb3129
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -0,0 +1,485 @@
+// 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.Collections.Generic;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperDescriptorFactoryTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTagHelperDescriptorFactoryTest).GetTypeInfo().Assembly;
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsStringParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsVariousParameterTypes()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__VariousParameterViewComponentTagHelper",
+                typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__VariousParameterViewComponentTagHelper")
+                .DisplayName("VariousParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:various-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-enum"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-string"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("baz")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-enum")
+                    .PropertyName("testEnum")
+                    .TypeName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum))
+                    .AsEnum()
+                    .DisplayName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum) + " VariousParameterViewComponentTagHelper.testEnum"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-string")
+                    .PropertyName("testString")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string VariousParameterViewComponentTagHelper.testString"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("baz")
+                    .PropertyName("baz")
+                    .TypeName(typeof(int).FullName)
+                    .DisplayName("int VariousParameterViewComponentTagHelper.baz"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "VariousParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsGenericParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__GenericParameterViewComponentTagHelper",
+                typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__GenericParameterViewComponentTagHelper")
+                .DisplayName("GenericParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:generic-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("Foo")
+                    .TypeName("System.Collections.Generic.List<System.String>")
+                    .DisplayName("System.Collections.Generic.List<System.String> GenericParameterViewComponentTagHelper.Foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("Bar")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .AsDictionaryAttribute("bar-", typeof(int).FullName)
+                    .DisplayName("System.Collections.Generic.Dictionary<System.String, System.Int32> GenericParameterViewComponentTagHelper.Bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "GenericParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForSyncViewComponentWithInvokeInBaseType_Works()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__SyncDerivedViewComponentTagHelper",
+                typeof(SyncDerivedViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__SyncDerivedViewComponentTagHelper")
+                .DisplayName("SyncDerivedViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:sync-derived")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string SyncDerivedViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string SyncDerivedViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "SyncDerived")
+                .Build();
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncDerivedViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForAsyncViewComponentWithInvokeInBaseType_Works()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__AsyncDerivedViewComponentTagHelper",
+                typeof(AsyncDerivedViewComponent).Assembly.GetName().Name)
+                .TypeName("__Generated__AsyncDerivedViewComponentTagHelper")
+                .DisplayName("AsyncDerivedViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("vc:async-derived"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "AsyncDerived")
+                .Build();
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncDerivedViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(ViewComponentWithoutInvokeMethod).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInstanceInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StaticInvokeAsyncViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoPublicInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(NonPublicInvokeAsyncViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandString()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithVoid).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_ShouldReturnValue.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponent_WithAmbiguousMethods()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(DerivedViewComponentWithAmbiguity).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AmbiguousMethods.Id, diagnostic.Id);
+        }
+    }
+
+    public class StringParameterViewComponent
+    {
+        public string Invoke(string foo, string bar) => null;
+    }
+
+    public class VariousParameterViewComponent
+    {
+        public string Invoke(TestEnum testEnum, string testString, int baz = 5) => null;
+
+        public enum TestEnum
+        {
+            A = 1,
+            B = 2,
+            C = 3
+        }
+    }
+
+    public class GenericParameterViewComponent
+    {
+        public string Invoke(List<string> Foo, Dictionary<string, int> Bar) => null;
+    }
+
+    public class ViewComponentWithoutInvokeMethod
+    {
+    }
+
+    public class AsyncViewComponentWithGenericTask
+    {
+        public Task<string> InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithNonGenericTask
+    {
+        public Task InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithVoid
+    {
+        public void InvokeAsync() { }
+    }
+
+    public class AsyncViewComponentWithString
+    {
+        public string InvokeAsync() => null;
+    }
+
+    public class SyncViewComponentWithVoid
+    {
+        public void Invoke() { }
+    }
+
+    public class SyncViewComponentWithNonGenericTask
+    {
+        public Task Invoke() => null;
+    }
+
+    public class SyncViewComponentWithGenericTask
+    {
+        public Task<string> Invoke() => null;
+    }
+
+    public class SyncDerivedViewComponent : StringParameterViewComponent
+    {
+    }
+
+    public class AsyncDerivedViewComponent : AsyncViewComponentWithNonGenericTask
+    {
+    }
+
+    public class DerivedViewComponentWithAmbiguity : AsyncViewComponentWithNonGenericTask
+    {
+        public string Invoke() => null;
+    }
+
+    public class StaticInvokeAsyncViewComponent
+    {
+        public static Task<string> InvokeAsync() => null;
+    }
+
+    public class NonPublicInvokeAsyncViewComponent
+    {
+        protected Task<string> InvokeAsync() => null;
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..6c15d62a1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,72 @@
+// 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.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    // This is just a basic integration test. There are detailed tests for the VCTH visitor and descriptor factory.
+    public class ViewComponentTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void DescriptorProvider_FindsVCTH()
+        {
+            // Arrange
+            var code = @"
+        public class StringParameterViewComponent
+        {
+            public string Invoke(string foo, string bar) => null;
+        }
+";
+
+            var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ViewComponentTagHelperDescriptorProvider()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                TestCompilation.AssemblyName)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperPassTest.cs
new file mode 100644
index 0000000000..00330a4eef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperPassTest.cs
@@ -0,0 +1,275 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperPassTest
+    {
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_IgnoresRegularTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .TypeName("TestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(3, @class.Children.Count); // No class node created for a VCTH
+            for (var i = 0; i < @class.Children.Count; i++)
+            {
+                Assert.IsNotType<ViewComponentTagHelperIntermediateNode>(@class.Children[i]);
+            }
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32")
+                        .PropertyName("Foo"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud tag-foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                        .PropertyName("Tags")
+                        .AsDictionaryAttribute("foo-", "System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[2]);
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children[3]);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_Nested()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper *, TestAssembly
+<p foo=""17""><tagcloud foo=""17""></p>");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly")
+                    .TypeName("PTestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var outerTagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal("PTestTagHelper", Assert.IsType<DefaultTagHelperCreateIntermediateNode>(outerTagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(outerTagHelper.Children[2]).PropertyName);
+
+            var vcth = FindTagHelperNode(outerTagHelper.Children[0]);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(vcth.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(vcth.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(5, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorProjectEngine CreateProjectEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new MvcViewDocumentClassifierPass());
+
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            });
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // We also expect the default tag helper pass to run first.
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+
+            var defaultTagHelperPass = projectEngine.EngineFeatures.OfType<DefaultTagHelperOptimizationPass>().Single();
+            defaultTagHelperPass.Execute(codeDocument, documentNode);
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassDeclarationNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private class ClassDeclarationNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperTargetExtensionTest.cs
new file mode 100644
index 0000000000..c5c148b6a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperTargetExtensionTest.cs
@@ -0,0 +1,120 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperTargetExtensionTest
+    {
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Int32")
+                    .PropertyName("Foo"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Int32 Foo { get; set; }
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .PropertyName("Tags")
+                    .AsDictionaryAttribute("foo-", "System.Int32"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }
+     = new System.Collections.Generic.Dictionary<System.String, System.Int32>();
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs
new file mode 100644
index 0000000000..206b74375d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs
@@ -0,0 +1,202 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTypeVisitorTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly;
+
+        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+
+        // In practice MVC will provide a marker attribute for ViewComponents. To prevent a circular reference between MVC and Razor
+        // we can use a test class as a marker.
+        private static INamedTypeSymbol TestViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestViewComponentAttribute).FullName);
+        private static INamedTypeSymbol TestNonViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestNonViewComponentAttribute).FullName);
+
+        [Fact]
+        public void IsViewComponent_PlainViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_PlainViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_DecoratedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_InheritedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_AbstractViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_AbstractViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_GenericViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_GenericViewComponent<>).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InternalViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InternalViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_DecoratedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InheritedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        public abstract class Invalid_AbstractViewComponent
+        {
+        }
+
+        public class Invalid_GenericViewComponent<T>
+        {
+        }
+
+        internal class Invalid_InternalViewComponent
+        {
+        }
+
+        public class Valid_PlainViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Valid_DecoratedVC
+        {
+        }
+
+        public class Valid_InheritedVC : Valid_DecoratedVC
+        {
+        }
+
+        [TestNonViewComponent]
+        public class Invalid_DecoratedViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Invalid_InheritedViewComponent : Invalid_DecoratedViewComponent
+        {
+        }
+
+        public class TestViewComponentAttribute : Attribute
+        {
+        }
+
+        public class TestNonViewComponentAttribute : Attribute
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/xunit.runner.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/xunit.runner.json
new file mode 100644
index 0000000000..fcf172c8fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs
new file mode 100644
index 0000000000..cf5549d0f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs
@@ -0,0 +1,102 @@
+// 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.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class AssemblyAttributeInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string RazorViewAttribute = "global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute";
+        private const string RazorPageAttribute = "global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.Options.DesignTime)
+            {
+                return;
+            }
+
+            var @namespace = documentNode.FindPrimaryNamespace();
+            if (@namespace == null || string.IsNullOrEmpty(@namespace.Content))
+            {
+                // No namespace node or it's incomplete. Skip.
+                return;
+            }
+
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null || string.IsNullOrEmpty(@class.ClassName))
+            {
+                // No class node or it's incomplete. Skip.
+                return;
+            }
+
+            var generatedTypeName = $"{@namespace.Content}.{@class.ClassName}";
+
+            // The MVC attributes require a relative path to be specified so that we can make a view engine path.
+            // We can't use a rooted path because we don't know what the project root is.
+            //
+            // If we can't sanitize the path, we'll just set it to null and let is blow up at runtime - we don't
+            // want to create noise if this code has to run in some unanticipated scenario.
+            var escapedPath = MakeVerbatimStringLiteral(ConvertToViewEnginePath(codeDocument.Source.RelativePath));
+
+            string attribute;
+            if (documentNode.DocumentKind == MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+            {
+                attribute = $"[assembly:{RazorViewAttribute}({escapedPath}, typeof({generatedTypeName}))]";
+            }
+            else if (documentNode.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                PageDirective.TryGetPageDirective(documentNode, out var pageDirective))
+            {
+                var escapedRoutePrefix = MakeVerbatimStringLiteral(pageDirective.RouteTemplate);
+                attribute = $"[assembly:{RazorPageAttribute}({escapedPath}, typeof({generatedTypeName}), {escapedRoutePrefix})]";
+            }
+            else
+            {
+                return;
+            }
+
+            var index = documentNode.Children.IndexOf(@namespace);
+            Debug.Assert(index >= 0);
+
+            var pageAttribute = new CSharpCodeIntermediateNode();
+            pageAttribute.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = attribute,
+            });
+
+            documentNode.Children.Insert(index, pageAttribute);
+        }
+
+        private static string MakeVerbatimStringLiteral(string value)
+        {
+            if (value == null)
+            {
+                return "null";
+            }
+
+            value = value.Replace("\"", "\"\"");
+            return $"@\"{value}\"";
+        }
+        
+        private static string ConvertToViewEnginePath(string relativePath)
+        {
+            if (string.IsNullOrEmpty(relativePath))
+            {
+                return null;
+            }
+
+            // Checking for both / and \ because a \ will become a /.
+            if (!relativePath.StartsWith("/") && !relativePath.StartsWith("\\"))
+            {
+                relativePath = "/" + relativePath;
+            }
+            
+            relativePath = relativePath.Replace('\\', '/');
+            return relativePath;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ExtensionInitializer.cs
new file mode 100644
index 0000000000..8c650ebedb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ExtensionInitializer.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal class ExtensionInitializer : RazorExtensionInitializer
+    {
+        public override void Initialize(RazorProjectEngineBuilder builder)
+        {
+            RazorExtensions.Register(builder);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IInjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IInjectTargetExtension.cs
new file mode 100644
index 0000000000..89f74d5aaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IInjectTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public interface IInjectTargetExtension : ICodeTargetExtension
+    {
+        void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..1f303e7422
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/IViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public interface IViewComponentTagHelperTargetExtension : ICodeTargetExtension
+    {
+        void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectDirective.cs
new file mode 100644
index 0000000000..4282ea559f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectDirective.cs
@@ -0,0 +1,131 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class InjectDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "inject",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder
+                    .AddTypeToken(Resources.InjectDirective_TypeToken_Name, Resources.InjectDirective_TypeToken_Description)
+                    .AddMemberToken(Resources.InjectDirective_MemberToken_Name, Resources.InjectDirective_MemberToken_Description);
+
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = Resources.InjectDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @model and @namespace directives
+            public override int Order => 10;
+            
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                   documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+                {
+                    // Not a MVC file. Skip.
+                    return;
+                }
+
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+                var modelType = ModelDirective.GetModelType(documentNode);
+
+                var properties = new HashSet<string>(StringComparer.Ordinal);
+
+                for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+                {
+                    var directive = visitor.Directives[i];
+                    var tokens = directive.Tokens.ToArray();
+                    if (tokens.Length < 2)
+                    {
+                        continue;
+                    }
+
+                    var typeName = tokens[0].Content;
+                    var memberName = tokens[1].Content;
+
+                    if (!properties.Add(memberName))
+                    {
+                        continue;
+                    }
+
+                    typeName = typeName.Replace("<TModel>", "<" + modelType + ">");
+
+                    var injectNode = new InjectIntermediateNode()
+                    {
+                        TypeName = typeName,
+                        MemberName = memberName,
+                    };
+
+                    visitor.Class.Children.Add(injectNode);
+                }
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> Directives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    Directives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectIntermediateNode.cs
new file mode 100644
index 0000000000..572d8bb1dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectIntermediateNode.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class InjectIntermediateNode : ExtensionIntermediateNode
+    {
+        public string TypeName { get; set; }
+
+        public string MemberName { get; set; }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<InjectIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IInjectTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IInjectTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteInjectProperty(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(MemberName);
+
+            formatter.WriteProperty(nameof(MemberName), MemberName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs
new file mode 100644
index 0000000000..9569cca41f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class InjectTargetExtension : IInjectTargetExtension
+    {
+        private const string RazorInjectAttribute = "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]";
+
+        public void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var property = $"public {node.TypeName} {node.MemberName} {{ get; private set; }}";
+
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.CodeWriter
+                        .WriteLine(RazorInjectAttribute)
+                        .WriteLine(property);
+                }
+            }
+            else
+            {
+                context.CodeWriter
+                    .WriteLine(RazorInjectAttribute)
+                    .WriteLine(property);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
new file mode 100644
index 0000000000..afa5ecd679
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs" Link="Shared\CodeWriterExtensions.cs" />
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CSharpIdentifier.cs" Link="Shared\CSharpIdentifier.cs" />
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\Checksum.cs" Link="Shared\Checksum.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="../Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs
new file mode 100644
index 0000000000..a8c4bafbd9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs
@@ -0,0 +1,152 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class ModelDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "model",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(Resources.ModelDirective_TypeToken_Name, Resources.ModelDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.ModelDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+
+        public static string GetModelType(DocumentIntermediateNode document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var visitor = new Visitor();
+            return GetModelType(document, visitor);
+        }
+
+        private static string GetModelType(DocumentIntermediateNode document, Visitor visitor)
+        {
+            visitor.Visit(document);
+
+            for (var i = visitor.ModelDirectives.Count - 1; i >= 0; i--)
+            {
+                var directive = visitor.ModelDirectives[i];
+
+                var tokens = directive.Tokens.ToArray();
+                if (tokens.Length >= 1)
+                {
+                    return tokens[0].Content;
+                }
+            }
+
+            if (document.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+            {
+                return visitor.Class.ClassName;
+            }
+            else
+            {
+                return "dynamic";
+            }
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @inherits directive
+            public override int Order => 5;
+
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                var modelType = GetModelType(documentNode, visitor);
+
+                if (documentNode.Options.DesignTime)
+                {
+                    // Alias the TModel token to a known type.
+                    // This allows design time compilation to succeed for Razor files where the token isn't replaced.
+                    var typeName = $"global::{typeof(object).FullName}";
+                    var usingNode = new UsingDirectiveIntermediateNode()
+                    {
+                        Content = $"TModel = {typeName}"
+                    };
+
+                    visitor.Namespace?.Children.Insert(0, usingNode);
+                }
+
+                var baseType = visitor.Class?.BaseType?.Replace("<TModel>", "<" + modelType + ">");
+                visitor.Class.BaseType = baseType;
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> ModelDirectives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (Namespace == null)
+                {
+                    Namespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    ModelDirectives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelExpressionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelExpressionPass.cs
new file mode 100644
index 0000000000..7b44002ff9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelExpressionPass.cs
@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ModelExpressionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string ModelExpressionTypeName = "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public List<TagHelperIntermediateNode> TagHelpers { get; } = new List<TagHelperIntermediateNode>();
+
+            public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+            {
+                if (string.Equals(node.BoundAttribute.TypeName, ModelExpressionTypeName, StringComparison.Ordinal) ||
+                    (node.IsIndexerNameMatch &&
+                     string.Equals(node.BoundAttribute.IndexerTypeName, ModelExpressionTypeName, StringComparison.Ordinal)))
+                {
+                    var expression = new CSharpExpressionIntermediateNode();
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ",
+                    });
+
+                    if (node.Children.Count == 1 && node.Children[0] is IntermediateToken token && token.IsCSharp)
+                    {
+                        // A 'simple' expression will look like __model => __model.Foo
+
+                        expression.Children.Add(new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = "__model."
+                        });
+
+                        expression.Children.Add(token);
+                    }
+                    else
+                    {
+                        for (var i = 0; i < node.Children.Count; i++)
+                        {
+                            if (node.Children[i] is CSharpExpressionIntermediateNode nestedExpression)
+                            {
+                                for (var j = 0; j < nestedExpression.Children.Count; j++)
+                                {
+                                    if (nestedExpression.Children[j] is IntermediateToken cSharpToken &&
+                                        cSharpToken.IsCSharp)
+                                    {
+                                        expression.Children.Add(cSharpToken);
+                                    }
+                                }
+
+                                continue;
+                            }
+                        }
+                    }
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = ")",
+                    });
+
+                    node.Children.Clear();
+
+                    node.Children.Add(expression);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
new file mode 100644
index 0000000000..5c6ee7361d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
@@ -0,0 +1,91 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal class MvcImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+    {
+        private const string ImportsFileName = "_ViewImports.cshtml";
+
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var imports = new List<RazorProjectItem>();
+            AddDefaultDirectivesImport(imports);
+
+            // We add hierarchical imports second so any default directive imports can be overridden.
+            AddHierarchicalImports(projectItem, imports);
+
+            return imports;
+        }
+
+        // Internal for testing
+        internal static void AddDefaultDirectivesImport(List<RazorProjectItem> imports)
+        {
+            imports.Add(DefaultDirectivesProjectItem.Instance);
+        }
+
+        // Internal for testing
+        internal void AddHierarchicalImports(RazorProjectItem projectItem, List<RazorProjectItem> imports)
+        {
+            // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+            var importProjectItems = ProjectEngine.FileSystem.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse();
+            imports.AddRange(importProjectItems);
+        }
+
+        private class DefaultDirectivesProjectItem : RazorProjectItem
+        {
+            private readonly byte[] _defaultImportBytes;
+
+            private DefaultDirectivesProjectItem()
+            {
+                var preamble = Encoding.UTF8.GetPreamble();
+                var content = @"
+@using System
+@using System.Collections.Generic
+@using System.Linq
+@using System.Threading.Tasks
+@using Microsoft.AspNetCore.Mvc
+@using Microsoft.AspNetCore.Mvc.Rendering
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json
+@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component
+@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url
+@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+";
+                var contentBytes = Encoding.UTF8.GetBytes(content);
+
+                _defaultImportBytes = new byte[preamble.Length + contentBytes.Length];
+                preamble.CopyTo(_defaultImportBytes, 0);
+                contentBytes.CopyTo(_defaultImportBytes, preamble.Length);
+            }
+
+            public override string BasePath => null;
+
+            public override string FilePath => null;
+
+            public override string PhysicalPath => null;
+
+            public override bool Exists => true;
+
+            public static DefaultDirectivesProjectItem Instance { get; } = new DefaultDirectivesProjectItem();
+
+            public override Stream Read() => new MemoryStream(_defaultImportBytes);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs
new file mode 100644
index 0000000000..f278b20a45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs
@@ -0,0 +1,62 @@
+// 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.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    /// <summary>
+    /// A <see cref="RazorTemplateEngine"/> for Mvc Razor views.
+    /// </summary>
+    public class MvcRazorTemplateEngine : RazorTemplateEngine
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="MvcRazorTemplateEngine"/>.
+        /// </summary>
+        /// <param name="engine">The <see cref="RazorEngine"/>.</param>
+        /// <param name="project">The <see cref="RazorProject"/>.</param>
+        public MvcRazorTemplateEngine(
+            RazorEngine engine,
+            RazorProject project)
+            : base(engine, project)
+        {
+            Options.ImportsFileName = "_ViewImports.cshtml";
+            Options.DefaultImports = GetDefaultImports();
+        }
+
+        public override RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem)
+        {
+            return base.CreateCodeDocument(projectItem);
+        }
+
+        // Internal for testing.
+        internal static RazorSourceDocument GetDefaultImports()
+        {
+            using (var stream = new MemoryStream())
+            using (var writer = new StreamWriter(stream, Encoding.UTF8))
+            {
+                writer.WriteLine("@using System");
+                writer.WriteLine("@using System.Collections.Generic");
+                writer.WriteLine("@using System.Linq");
+                writer.WriteLine("@using System.Threading.Tasks");
+                writer.WriteLine("@using Microsoft.AspNetCore.Mvc");
+                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.Rendering");
+                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.ViewFeatures");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url");
+                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider");
+                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor");
+                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor");
+                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor");
+                writer.Flush();
+
+                stream.Position = 0;
+                return RazorSourceDocument.ReadFrom(stream, fileName: null, encoding: Encoding.UTF8);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs
new file mode 100644
index 0000000000..975cf90666
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class MvcViewDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string MvcViewDocumentKind = "mvc.1.0.view";
+
+        protected override string DocumentKind => MvcViewDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) => true;
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument, 
+            NamespaceDeclarationIntermediateNode @namespace, 
+            ClassDeclarationIntermediateNode @class, 
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = GetClassNameFromPath(filePath);
+            }
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+        }
+
+        private static string GetClassNameFromPath(string path)
+        {
+            const string cshtmlExtension = ".cshtml";
+
+            if (string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            if (path.EndsWith(cshtmlExtension, StringComparison.OrdinalIgnoreCase))
+            {
+                path = path.Substring(0, path.Length - cshtmlExtension.Length);
+            }
+
+            return CSharpIdentifier.SanitizeIdentifier(path);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs
new file mode 100644
index 0000000000..1a809c0629
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs
@@ -0,0 +1,204 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class NamespaceDirective
+    {
+        private static readonly char[] Separators = new char[] { '\\', '/' };
+
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "namespace",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddNamespaceToken(
+                    Resources.NamespaceDirective_NamespaceToken_Name,
+                    Resources.NamespaceDirective_NamespaceToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.NamespaceDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+
+        // internal for testing
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                    documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+                {
+                    // Not a page. Skip.
+                    return;
+                }
+
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+
+                var directive = visitor.LastNamespaceDirective;
+                if (directive == null)
+                {
+                    // No namespace set. Skip.
+                    return;
+                }
+
+                var @namespace = visitor.FirstNamespace;
+                if (@namespace == null)
+                {
+                    // No namespace node. Skip.
+                    return;
+                }
+
+                @namespace.Content = GetNamespace(codeDocument.Source.FilePath, directive);
+            }
+        }
+
+        // internal for testing.
+        //
+        // This code does a best-effort attempt to compute a namespace 'suffix' - the path difference between
+        // where the @namespace directive appears and where the current document is on disk.
+        //
+        // In the event that these two source either don't have FileNames set or don't follow a coherent hierarchy,
+        // we will just use the namespace verbatim.
+        internal static string GetNamespace(string source, DirectiveIntermediateNode directive)
+        {
+            var directiveSource = NormalizeDirectory(directive.Source?.FilePath);
+
+            var baseNamespace = directive.Tokens.FirstOrDefault()?.Content;
+            if (string.IsNullOrEmpty(baseNamespace))
+            {
+                // The namespace directive was incomplete.
+                return string.Empty;
+            }
+
+            if (string.IsNullOrEmpty(source) || directiveSource == null)
+            {
+                // No sources, can't compute a suffix.
+                return baseNamespace;
+            }
+
+            // We're specifically using OrdinalIgnoreCase here because Razor treats all paths as case-insensitive.
+            if (!source.StartsWith(directiveSource, StringComparison.OrdinalIgnoreCase) ||
+                source.Length <= directiveSource.Length)
+            {
+                // The imports are not from the directory hierarchy, can't compute a suffix.
+                return baseNamespace;
+            }
+
+            // OK so that this point we know that the 'imports' file containing this directive is in the directory
+            // hierarchy of this soure file. This is the case where we can append a suffix to the baseNamespace.
+            //
+            // Everything so far has just been defensiveness on our part.
+
+            var builder = new StringBuilder(baseNamespace);
+
+            var segments = source.Substring(directiveSource.Length).Split(Separators);
+
+            // Skip the last segment because it's the FileName.
+            for (var i = 0; i < segments.Length - 1; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            return builder.ToString();
+        }
+
+        // We want to normalize the path of the file containing the '@namespace' directive to just the containing
+        // directory with a trailing separator.
+        //
+        // Not using Path.GetDirectoryName here because it doesn't meet these requirements, and we want to handle
+        // both 'view engine' style paths and absolute paths.
+        //
+        // We also don't normalize the separators here. We expect that all documents are using a consistent style of path.
+        // 
+        // If we can't normalize the path, we just return null so it will be ignored.
+        private static string NormalizeDirectory(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                return null;
+            }
+
+            var lastSeparator = path.LastIndexOfAny(Separators);
+            if (lastSeparator == -1)
+            {
+                return null;
+            }
+
+            // Includes the separator
+            return path.Substring(0, lastSeparator + 1);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode FirstClass { get; private set; }
+
+            public NamespaceDeclarationIntermediateNode FirstNamespace { get; private set; }
+
+            // We want the last one, so get them all and then .
+            public DirectiveIntermediateNode LastNamespaceDirective { get; private set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (FirstNamespace == null)
+                {
+                    FirstNamespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (FirstClass == null)
+                {
+                    FirstClass = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    LastNamespaceDirective = node;
+                }
+
+                base.VisitDirective(node);
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PageDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PageDirective.cs
new file mode 100644
index 0000000000..322c6564ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PageDirective.cs
@@ -0,0 +1,121 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class PageDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "page",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddOptionalStringToken(Resources.PageDirective_RouteToken_Name, Resources.PageDirective_RouteToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.PageDirective_Description;
+            });
+
+        private PageDirective(string routeTemplate, IntermediateNode directiveNode)
+        {
+            RouteTemplate = routeTemplate;
+            DirectiveNode = directiveNode;
+        }
+
+        public string RouteTemplate { get; }
+
+        public IntermediateNode DirectiveNode { get; }
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+
+        public static bool TryGetPageDirective(DocumentIntermediateNode documentNode, out PageDirective pageDirective)
+        {
+            var visitor = new Visitor();
+            for (var i = 0; i < documentNode.Children.Count; i++)
+            {
+                visitor.Visit(documentNode.Children[i]);
+            }
+
+            if (visitor.DirectiveTokens == null)
+            {
+                pageDirective = null;
+                return false;
+            }
+
+            var tokens = visitor.DirectiveTokens.ToList();
+            string routeTemplate = null;
+            if (tokens.Count > 0)
+            {
+                routeTemplate = TrimQuotes(tokens[0].Content);
+            }
+
+            pageDirective = new PageDirective(routeTemplate, visitor.DirectiveNode);
+            return true;
+        }
+
+        private static string TrimQuotes(string content)
+        {
+            // Tokens aren't captured if they're malformed. Therefore, this method will
+            // always be called with a valid token content.
+            Debug.Assert(content.Length >= 2);
+            Debug.Assert(content.StartsWith("\"", StringComparison.Ordinal));
+            Debug.Assert(content.EndsWith("\"", StringComparison.Ordinal));
+
+            return content.Substring(1, content.Length - 2);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public IntermediateNode DirectiveNode { get; private set; }
+
+            public IEnumerable<DirectiveTokenIntermediateNode> DirectiveTokens { get; private set; }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    DirectiveNode = node;
+                    DirectiveTokens = node.Tokens;
+                }
+            }
+
+            public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+            {
+                if (DirectiveTokens == null && node.Directive == Directive)
+                {
+                    DirectiveNode = node;
+                    DirectiveTokens = node.Tokens;
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PagesPropertyInjectionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PagesPropertyInjectionPass.cs
new file mode 100644
index 0000000000..4a47275e13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PagesPropertyInjectionPass.cs
@@ -0,0 +1,57 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class PagesPropertyInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+            {
+                return;
+            }
+
+            var modelType = ModelDirective.GetModelType(documentNode);
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+
+            var @class = visitor.Class;
+
+            var viewDataType = $"global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<{modelType}>";
+            var vddProperty = new CSharpCodeIntermediateNode();
+            vddProperty.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
+            });
+            @class.Children.Add(vddProperty);
+
+            var modelProperty = new CSharpCodeIntermediateNode();
+            modelProperty.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"public {modelType} Model => ViewData.Model;",
+            });
+            @class.Children.Add(modelProperty);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..7d8a47bc67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// 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.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Razor.Language;
+
+[assembly: ProvideRazorExtensionInitializer("MVC-3.0", typeof(ExtensionInitializer))]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..dfa9a59ca9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
@@ -0,0 +1,338 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string InjectDirective_Description
+        {
+            get => GetString("InjectDirective_Description");
+        }
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string FormatInjectDirective_Description()
+            => GetString("InjectDirective_Description");
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Description
+        {
+            get => GetString("InjectDirective_MemberToken_Description");
+        }
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Description()
+            => GetString("InjectDirective_MemberToken_Description");
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Name
+        {
+            get => GetString("InjectDirective_MemberToken_Name");
+        }
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Name()
+            => GetString("InjectDirective_MemberToken_Name");
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Description
+        {
+            get => GetString("InjectDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Description()
+            => GetString("InjectDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Name
+        {
+            get => GetString("InjectDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Name()
+            => GetString("InjectDirective_TypeToken_Name");
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string ModelDirective_Description
+        {
+            get => GetString("ModelDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string FormatModelDirective_Description()
+            => GetString("ModelDirective_Description");
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Description
+        {
+            get => GetString("ModelDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Description()
+            => GetString("ModelDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Name
+        {
+            get => GetString("ModelDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Name()
+            => GetString("ModelDirective_TypeToken_Name");
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
+        {
+            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
+        }
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
+        {
+            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
+        }
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
+        {
+            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
+        }
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
+        {
+            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
+        }
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string MvcRazorParser_InvalidPropertyType
+        {
+            get => GetString("MvcRazorParser_InvalidPropertyType");
+        }
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
+
+        /// <summary>
+        /// Specify the base namespace for the page.
+        /// </summary>
+        internal static string NamespaceDirective_Description
+        {
+            get => GetString("NamespaceDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the base namespace for the page.
+        /// </summary>
+        internal static string FormatNamespaceDirective_Description()
+            => GetString("NamespaceDirective_Description");
+
+        /// <summary>
+        /// The namespace for the page.
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Description
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Description");
+        }
+
+        /// <summary>
+        /// The namespace for the page.
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Description()
+            => GetString("NamespaceDirective_NamespaceToken_Description");
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Name
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Name");
+        }
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Name()
+            => GetString("NamespaceDirective_NamespaceToken_Name");
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string PageDirectiveCannotBeImported
+        {
+            get => GetString("PageDirectiveCannotBeImported");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
+
+        /// <summary>
+        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
+        /// </summary>
+        internal static string PageDirectiveMustExistAtTheTopOfFile
+        {
+            get => GetString("PageDirectiveMustExistAtTheTopOfFile");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
+        /// </summary>
+        internal static string FormatPageDirectiveMustExistAtTheTopOfFile(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveMustExistAtTheTopOfFile"), p0);
+
+        /// <summary>
+        /// Mark the page as a Razor Page.
+        /// </summary>
+        internal static string PageDirective_Description
+        {
+            get => GetString("PageDirective_Description");
+        }
+
+        /// <summary>
+        /// Mark the page as a Razor Page.
+        /// </summary>
+        internal static string FormatPageDirective_Description()
+            => GetString("PageDirective_Description");
+
+        /// <summary>
+        /// An optional route template for the page.
+        /// </summary>
+        internal static string PageDirective_RouteToken_Description
+        {
+            get => GetString("PageDirective_RouteToken_Description");
+        }
+
+        /// <summary>
+        /// An optional route template for the page.
+        /// </summary>
+        internal static string FormatPageDirective_RouteToken_Description()
+            => GetString("PageDirective_RouteToken_Description");
+
+        /// <summary>
+        /// RouteTemplate
+        /// </summary>
+        internal static string PageDirective_RouteToken_Name
+        {
+            get => GetString("PageDirective_RouteToken_Name");
+        }
+
+        /// <summary>
+        /// RouteTemplate
+        /// </summary>
+        internal static string FormatPageDirective_RouteToken_Name()
+            => GetString("PageDirective_RouteToken_Name");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs
new file mode 100644
index 0000000000..514af37554
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs
@@ -0,0 +1,100 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class ViewComponentResources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string ViewComponent_AmbiguousMethods
+        {
+            get => GetString("ViewComponent_AmbiguousMethods");
+        }
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
+        {
+            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string ViewComponent_CannotFindMethod
+        {
+            get => GetString("ViewComponent_CannotFindMethod");
+        }
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_CannotReturnTask
+        {
+            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_ShouldReturnValue
+        {
+            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
new file mode 100644
index 0000000000..04febb17d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class RazorExtensions
+    {
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            InjectDirective.Register(builder);
+            ModelDirective.Register(builder);
+            NamespaceDirective.Register(builder);
+            PageDirective.Register(builder);
+
+            InheritsDirective.Register(builder);
+            SectionDirective.Register(builder);
+
+            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+
+            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
+            builder.AddTargetExtension(new TemplateTargetExtension()
+            {
+                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
+            });
+
+            builder.Features.Add(new ModelExpressionPass());
+            builder.Features.Add(new PagesPropertyInjectionPass());
+            builder.Features.Add(new ViewComponentTagHelperPass());
+            builder.Features.Add(new RazorPageDocumentClassifierPass());
+            builder.Features.Add(new MvcViewDocumentClassifierPass());
+            builder.Features.Add(new AssemblyAttributeInjectionPass());
+
+            builder.SetImportFeature(new MvcImportProjectFeature());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensionsDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensionsDiagnosticFactory.cs
new file mode 100644
index 0000000000..74adb4fe93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensionsDiagnosticFactory.cs
@@ -0,0 +1,131 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal class RazorExtensionsDiagnosticFactory
+    {
+        private const string DiagnosticPrefix = "RZ";
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_CannotFindMethod =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3900",
+                () => ViewComponentResources.ViewComponent_CannotFindMethod,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_CannotFindMethod(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_CannotFindMethod,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AmbiguousMethods =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3901",
+                () => ViewComponentResources.ViewComponent_AmbiguousMethods,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AmbiguousMethods(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AmbiguousMethods,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperType,
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AsyncMethod_ShouldReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3902",
+                () => ViewComponentResources.ViewComponent_AsyncMethod_ShouldReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AsyncMethod_ShouldReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AsyncMethod_ShouldReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_ShouldReturnValue =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3903",
+                () => ViewComponentResources.ViewComponent_SyncMethod_ShouldReturnValue,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_ShouldReturnValue(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_ShouldReturnValue,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_CannotReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3904",
+                () => ViewComponentResources.ViewComponent_SyncMethod_CannotReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_CannotReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_CannotReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor PageDirective_CannotBeImported =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3905",
+                () => Resources.PageDirectiveCannotBeImported,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_CannotBeImported(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_CannotBeImported, source, PageDirective.Directive.Directive, fileName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor PageDirective_MustExistAtTheTopOfFile =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3906",
+                () => Resources.PageDirectiveMustExistAtTheTopOfFile,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_MustExistAtTheTopOfFile(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_MustExistAtTheTopOfFile, source, PageDirective.Directive.Directive);
+
+            return diagnostic;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
new file mode 100644
index 0000000000..c6c0df9345
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
@@ -0,0 +1,163 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class RazorPageDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string RazorPageDocumentKind = "mvc.1.0.razor-page";
+        public static readonly string RouteTemplateKey = "RouteTemplate";
+
+        private static readonly RazorProjectEngine LeadingDirectiveParsingEngine = RazorProjectEngine.Create(
+            RazorConfiguration.Default,
+            RazorProjectFileSystem.Create("/"),
+            builder =>
+            {
+                for (var i = builder.Phases.Count - 1; i >= 0; i--)
+                {
+                    var phase = builder.Phases[i];
+                    builder.Phases.RemoveAt(i);
+                    if (phase is IRazorDocumentClassifierPhase)
+                    {
+                        break;
+                    }
+                }
+
+                RazorExtensions.Register(builder);
+                builder.Features.Add(new LeadingDirectiveParserOptionsFeature());
+            });
+
+        protected override string DocumentKind => RazorPageDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            return PageDirective.TryGetPageDirective(documentNode, out var pageDirective);
+        }
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument,
+            NamespaceDeclarationIntermediateNode @namespace,
+            ClassDeclarationIntermediateNode @class,
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.RazorPages.Page";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = GetClassNameFromPath(filePath);
+            }
+
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+
+            var document = codeDocument.GetDocumentIntermediateNode();
+            PageDirective.TryGetPageDirective(document, out var pageDirective);
+
+            EnsureValidPageDirective(codeDocument, pageDirective);
+
+            AddRouteTemplateMetadataAttribute(@namespace, @class, pageDirective);
+        }
+
+        private static void AddRouteTemplateMetadataAttribute(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, PageDirective pageDirective)
+        {
+            if (string.IsNullOrEmpty(pageDirective.RouteTemplate))
+            {
+                return;
+            }
+
+            var classIndex = @namespace.Children.IndexOf(@class);
+            if (classIndex == -1)
+            {
+                return;
+            }
+
+            var metadataAttributeNode = new RazorCompiledItemMetadataAttributeIntermediateNode
+            {
+                Key = RouteTemplateKey,
+                Value = pageDirective.RouteTemplate,
+            };
+            // Metadata attributes need to be inserted right before the class declaration.
+            @namespace.Children.Insert(classIndex, metadataAttributeNode);
+        }
+
+        private void EnsureValidPageDirective(RazorCodeDocument codeDocument, PageDirective pageDirective)
+        {
+            Debug.Assert(pageDirective != null);
+
+            if (pageDirective.DirectiveNode.IsImported())
+            {
+                pageDirective.DirectiveNode.Diagnostics.Add(
+                    RazorExtensionsDiagnosticFactory.CreatePageDirective_CannotBeImported(pageDirective.DirectiveNode.Source.Value));
+            }
+            else
+            {
+                // The document contains a page directive and it is not imported.
+                // We now want to make sure this page directive exists at the top of the file.
+                // We are going to do that by re-parsing the document until the very first line that is not Razor comment
+                // or whitespace. We then make sure the page directive still exists in the re-parsed IR tree.
+                var leadingDirectiveCodeDocument = RazorCodeDocument.Create(codeDocument.Source);
+                LeadingDirectiveParsingEngine.Engine.Process(leadingDirectiveCodeDocument);
+
+                var leadingDirectiveDocumentNode = leadingDirectiveCodeDocument.GetDocumentIntermediateNode();
+                if (!PageDirective.TryGetPageDirective(leadingDirectiveDocumentNode, out var _))
+                {
+                    // The page directive is not the leading directive. Add an error.
+                    pageDirective.DirectiveNode.Diagnostics.Add(
+                        RazorExtensionsDiagnosticFactory.CreatePageDirective_MustExistAtTheTopOfFile(pageDirective.DirectiveNode.Source.Value));
+                }
+            }
+        }
+
+        private class LeadingDirectiveParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorParserOptionsFeature
+        {
+            public int Order { get; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.ParseLeadingDirectives = true;
+            }
+        }
+
+        private static string GetClassNameFromPath(string path)
+        {
+            const string cshtmlExtension = ".cshtml";
+
+            if (string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            if (path.EndsWith(cshtmlExtension, StringComparison.OrdinalIgnoreCase))
+            {
+                path = path.Substring(0, path.Length - cshtmlExtension.Length);
+            }
+
+            return CSharpIdentifier.SanitizeIdentifier(path);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx
new file mode 100644
index 0000000000..474537197e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="InjectDirective_Description" xml:space="preserve">
+    <value>Inject a service from the application's service container into a property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Description" xml:space="preserve">
+    <value>The name of the property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Name" xml:space="preserve">
+    <value>PropertyName</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Description" xml:space="preserve">
+    <value>The type of the service to inject.</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="ModelDirective_Description" xml:space="preserve">
+    <value>Specify the view or page model for the page.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Description" xml:space="preserve">
+    <value>The model type.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword" xml:space="preserve">
+    <value>The 'inherits' keyword is not allowed when a '{0}' keyword is used.</value>
+  </data>
+  <data name="MvcRazorCodeParser_InjectDirectivePropertyNameRequired" xml:space="preserve">
+    <value>A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.</value>
+  </data>
+  <data name="MvcRazorCodeParser_KeywordMustBeFollowedByTypeName" xml:space="preserve">
+    <value>The '{0}' keyword must be followed by a type name on the same line.</value>
+  </data>
+  <data name="MvcRazorCodeParser_OnlyOneModelStatementIsAllowed" xml:space="preserve">
+    <value>Only one '{0}' statement is allowed in a file.</value>
+  </data>
+  <data name="MvcRazorParser_InvalidPropertyType" xml:space="preserve">
+    <value>Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.</value>
+  </data>
+  <data name="NamespaceDirective_Description" xml:space="preserve">
+    <value>Specify the base namespace for the page.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Description" xml:space="preserve">
+    <value>The namespace for the page.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Name" xml:space="preserve">
+    <value>Namespace</value>
+  </data>
+  <data name="PageDirectiveCannotBeImported" xml:space="preserve">
+    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.</value>
+  </data>
+  <data name="PageDirectiveMustExistAtTheTopOfFile" xml:space="preserve">
+    <value>The '@{0}' directive must precede all other elements defined in a Razor file.</value>
+  </data>
+  <data name="PageDirective_Description" xml:space="preserve">
+    <value>Mark the page as a Razor Page.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Description" xml:space="preserve">
+    <value>An optional route template for the page.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Name" xml:space="preserve">
+    <value>RouteTemplate</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/TagHelperDescriptorExtensions.cs
new file mode 100644
index 0000000000..dd32c0b013
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/TagHelperDescriptorExtensions.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class TagHelperDescriptorExtensions
+    {
+        /// <summary>
+        /// Indicates whether a <see cref="TagHelperDescriptor"/> represents a view component.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/> to check.</param>
+        /// <returns>Whether a <see cref="TagHelperDescriptor"/> represents a view component.</returns>
+        public static bool IsViewComponentKind(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return string.Equals(ViewComponentTagHelperConventions.Kind, tagHelper.Kind, StringComparison.Ordinal);
+        }
+
+        public static string GetViewComponentName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(ViewComponentTagHelperMetadata.Name, out var result);
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentResources.resx
new file mode 100644
index 0000000000..d6aad4ff3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentResources.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ViewComponent_AmbiguousMethods" xml:space="preserve">
+    <value>View component '{0}' must have exactly one public method named '{1}' or '{2}'.</value>
+  </data>
+  <data name="ViewComponent_AsyncMethod_ShouldReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.</value>
+  </data>
+  <data name="ViewComponent_CannotFindMethod" xml:space="preserve">
+    <value>Could not find an '{0}' or '{1}' method for the view component '{2}'.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_CannotReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' cannot return a {2}.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_ShouldReturnValue" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return a value.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperConventions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperConventions.cs
new file mode 100644
index 0000000000..fa7563d37b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperConventions.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class ViewComponentTagHelperConventions
+    {
+        public static readonly string Kind = "MVC.ViewComponent";
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
new file mode 100644
index 0000000000..a5181fd789
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -0,0 +1,284 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal class ViewComponentTagHelperDescriptorFactory
+    {
+        private readonly INamedTypeSymbol _viewComponentAttributeSymbol;
+        private readonly INamedTypeSymbol _genericTaskSymbol;
+        private readonly INamedTypeSymbol _taskSymbol;
+        private readonly INamedTypeSymbol _iDictionarySymbol;
+
+        private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+            SymbolDisplayFormat.FullyQualifiedFormat
+                .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+                .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+
+        private static readonly IReadOnlyDictionary<string, string> PrimitiveDisplayTypeNameLookups = new Dictionary<string, string>(StringComparer.Ordinal)
+        {
+            [typeof(byte).FullName] = "byte",
+            [typeof(sbyte).FullName] = "sbyte",
+            [typeof(int).FullName] = "int",
+            [typeof(uint).FullName] = "uint",
+            [typeof(short).FullName] = "short",
+            [typeof(ushort).FullName] = "ushort",
+            [typeof(long).FullName] = "long",
+            [typeof(ulong).FullName] = "ulong",
+            [typeof(float).FullName] = "float",
+            [typeof(double).FullName] = "double",
+            [typeof(char).FullName] = "char",
+            [typeof(bool).FullName] = "bool",
+            [typeof(object).FullName] = "object",
+            [typeof(string).FullName] = "string",
+            [typeof(decimal).FullName] = "decimal",
+        };
+
+        public ViewComponentTagHelperDescriptorFactory(Compilation compilation)
+        {
+            _viewComponentAttributeSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            _genericTaskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.GenericTask);
+            _taskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.Task);
+            _iDictionarySymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.IDictionary);
+        }
+
+        public virtual TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            var assemblyName = type.ContainingAssembly.Name;
+            var shortName = GetShortName(type);
+            var tagName = $"vc:{HtmlConventions.ToHtmlCase(shortName)}";
+            var typeName = $"__Generated__{shortName}ViewComponentTagHelper";
+            var displayName = shortName + "ViewComponentTagHelper";
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+            descriptorBuilder.DisplayName = displayName;
+
+            if (TryFindInvokeMethod(type, out var method, out var diagnostic))
+            {
+                var methodParameters = method.Parameters;
+                descriptorBuilder.TagMatchingRule(ruleBuilder =>
+                {
+                    ruleBuilder.TagName = tagName;
+                    AddRequiredAttributes(methodParameters, ruleBuilder);
+                });
+
+                AddBoundAttributes(methodParameters, displayName, descriptorBuilder);
+            }
+            else
+            {
+                descriptorBuilder.Diagnostics.Add(diagnostic);
+            }
+
+            descriptorBuilder.Metadata[ViewComponentTagHelperMetadata.Name] = shortName;
+
+            var descriptor = descriptorBuilder.Build();
+            return descriptor;
+        }
+
+        private bool TryFindInvokeMethod(INamedTypeSymbol type, out IMethodSymbol method, out RazorDiagnostic diagnostic)
+        {
+            var methods = GetInvokeMethods(type);
+
+            if (methods.Count == 0)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_CannotFindMethod(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+            else if (methods.Count > 1)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AmbiguousMethods(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+
+            var selectedMethod = methods[0];
+            var returnType = selectedMethod.ReturnType as INamedTypeSymbol;
+            if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
+            {
+                // Will invoke asynchronously. Method must not return Task or Task<T>.
+                if (returnType == _taskSymbol)
+                {
+                    // This is ok.
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    // This is ok.
+                }
+                else
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AsyncMethod_ShouldReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+            else
+            {
+                // Will invoke synchronously. Method must not return void, Task or Task<T>.
+                if (returnType.SpecialType == SpecialType.System_Void)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_ShouldReturnValue(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType == _taskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+
+            method = selectedMethod;
+            diagnostic = null;
+            return true;
+        }
+
+        private static IReadOnlyList<IMethodSymbol> GetInvokeMethods(INamedTypeSymbol type)
+        {
+            var methods = new List<IMethodSymbol>();
+            while (type != null)
+            {
+                var currentTypeMethods = type.GetMembers()
+                    .OfType<IMethodSymbol>()
+                    .Where(m =>
+                        m.DeclaredAccessibility == Accessibility.Public &&
+                        !m.IsStatic &&
+                        (string.Equals(m.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal) ||
+                        string.Equals(m.Name, ViewComponentTypes.SyncMethodName, StringComparison.Ordinal)));
+
+                methods.AddRange(currentTypeMethods);
+
+                type = type.BaseType;
+            }
+
+            return methods;
+        }
+
+        private void AddRequiredAttributes(ImmutableArray<IParameterSymbol> methodParameters, TagMatchingRuleDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                if (GetIndexerValueTypeName(parameter) == null)
+                {
+                    // Set required attributes only for non-indexer attributes. Indexer attributes can't be required attributes
+                    // because there are two ways of setting values for the attribute.
+                    builder.Attribute(attributeBuilder =>
+                    {
+                        var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                        attributeBuilder.Name = lowerKebabName;
+                    });
+                }
+            }
+        }
+
+        private void AddBoundAttributes(ImmutableArray<IParameterSymbol> methodParameters, string containingDisplayName, TagHelperDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                var typeName = parameter.Type.ToDisplayString(FullNameTypeDisplayFormat);
+
+                if (!PrimitiveDisplayTypeNameLookups.TryGetValue(typeName, out var simpleName))
+                {
+                    simpleName = typeName;
+                }
+
+                builder.BindAttribute(attributeBuilder =>
+                {
+                    attributeBuilder.Name = lowerKebabName;
+                    attributeBuilder.TypeName = typeName;
+                    attributeBuilder.DisplayName = $"{simpleName} {containingDisplayName}.{parameter.Name}";
+                    attributeBuilder.SetPropertyName(parameter.Name);
+
+                    if (parameter.Type.TypeKind == TypeKind.Enum)
+                    {
+                        attributeBuilder.IsEnum = true;
+                    }
+                    else
+                    {
+                        var dictionaryValueType = GetIndexerValueTypeName(parameter);
+                        if (dictionaryValueType != null)
+                        {
+                            attributeBuilder.AsDictionary(lowerKebabName + "-", dictionaryValueType);
+                        }
+                    }
+                });
+            }
+        }
+
+        private string GetIndexerValueTypeName(IParameterSymbol parameter)
+        {
+            INamedTypeSymbol dictionaryType;
+            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            {
+                dictionaryType = (INamedTypeSymbol)parameter.Type;
+            }
+            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            {
+                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+            }
+            else
+            {
+                dictionaryType = null;
+            }
+
+            if (dictionaryType == null || dictionaryType.TypeArguments[0].SpecialType != SpecialType.System_String)
+            {
+                return null;
+            }
+
+            var type = dictionaryType.TypeArguments[1];
+            var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
+
+            return typeName;
+        }
+
+        private string GetShortName(INamedTypeSymbol componentType)
+        {
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var name = viewComponentAttribute
+                ?.NamedArguments
+                .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
+                .FirstOrDefault()
+                .Value
+                .Value as string;
+
+            if (!string.IsNullOrEmpty(name))
+            {
+                var separatorIndex = name.LastIndexOf('.');
+                if (separatorIndex >= 0)
+                {
+                    return name.Substring(separatorIndex + 1);
+                }
+                else
+                {
+                    return name;
+                }
+            }
+
+            // Get name by convention
+            if (componentType.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix, StringComparison.OrdinalIgnoreCase))
+            {
+                return componentType.Name.Substring(0, componentType.Name.Length - ViewComponentTypes.ViewComponentSuffix.Length);
+            }
+            else
+            {
+                return componentType.Name;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..d0d9805f6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs
@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
+            if (vcAttribute == null || vcAttribute.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new ViewComponentTypeVisitor(vcAttribute, nonVCAttribute, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            var factory = new ViewComponentTagHelperDescriptorFactory(compilation);
+            for (var i = 0; i < types.Count; i++)
+            {
+                var descriptor = factory.CreateDescriptor(types[i]);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperIntermediateNode.cs
new file mode 100644
index 0000000000..9283b2c092
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperIntermediateNode.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public sealed class ViewComponentTagHelperIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
+
+        public string ClassName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ViewComponentTagHelperIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IViewComponentTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IViewComponentTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteViewComponentTagHelper(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(ClassName);
+
+            formatter.WriteProperty(nameof(ClassName), ClassName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperMetadata.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperMetadata.cs
new file mode 100644
index 0000000000..ca8aae361d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperMetadata.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class ViewComponentTagHelperMetadata
+    {
+        /// <summary>
+        /// The key in a <see cref="Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor.Metadata"/>  containing 
+        /// the short name of a view component.
+        /// </summary>
+        public static readonly string Name = "MVC.ViewComponent.Name";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperPass.cs
new file mode 100644
index 0000000000..0c3b14563e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperPass.cs
@@ -0,0 +1,203 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ViewComponentTagHelperPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after the default taghelper pass
+        public override int Order => IntermediateNodePassBase.DefaultFeatureOrder + 2000;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            var context = new Context(@namespace, @class);
+
+            // For each VCTH *usage* we need to rewrite the tag helper node to use the tag helper runtime to construct
+            // and set properties on the the correct field, and using the name of the type we will generate.
+            var nodes = documentNode.FindDescendantNodes<TagHelperIntermediateNode>();
+            for (var i = 0; i < nodes.Count; i++)
+            {
+                var node = nodes[i];
+                foreach (var tagHelper in node.TagHelpers)
+                {
+                    RewriteUsage(context, node, tagHelper);
+                }
+            }
+
+            // Then for each VCTH *definition* that we've seen we need to generate the class that implements
+            // ITagHelper and the field that will hold it.
+            foreach (var tagHelper in context.TagHelpers)
+            {
+                AddField(context, tagHelper);
+                AddTagHelperClass(context, tagHelper);
+            }
+        }
+
+        private void RewriteUsage(Context context, TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        {
+            if (!tagHelper.IsViewComponentKind())
+            {
+                return;
+            }
+
+            context.Add(tagHelper);
+
+            // Now we need to insert a create node using the default tag helper runtime. This is similar to
+            // code in DefaultTagHelperOptimizationPass.
+            //
+            // Find the body node.
+            var i = 0;
+            while (i < node.Children.Count && node.Children[i] is TagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now find the last create node.
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperCreateIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now i has the right insertion point.
+            node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = context.GetFieldName(tagHelper),
+                TagHelper = tagHelper,
+                TypeName = context.GetFullyQualifiedName(tagHelper),
+            });
+
+            // Now we need to rewrite any set property nodes to use the default runtime.
+            for (i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode &&
+                    propertyNode.TagHelper == tagHelper)
+                {
+                    // This is a set property for this VCTH - we need to replace it with a node
+                    // that will use our field and property name.
+                    node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
+                    {
+                        FieldName = context.GetFieldName(tagHelper),
+                        PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
+                    };
+                }
+            }
+        }
+
+        private void AddField(Context context, TagHelperDescriptor tagHelper)
+        {
+            // We need to insert a node for the field that will hold the tag helper. We've already generated a field name
+            // at this time and use it for all uses of the same tag helper type.
+            //
+            // We also want to preserve the ordering of the nodes for testability. So insert at the end of any existing
+            // field nodes.
+            var i = 0;
+            while (i < context.Class.Children.Count && context.Class.Children[i] is DefaultTagHelperRuntimeIntermediateNode)
+            {
+                i++;
+            }
+
+            while (i < context.Class.Children.Count && context.Class.Children[i] is FieldDeclarationIntermediateNode)
+            {
+                i++;
+            }
+
+            context.Class.Children.Insert(i, new FieldDeclarationIntermediateNode()
+            {
+                Annotations =
+                {
+                    { CommonAnnotations.DefaultTagHelperExtension.TagHelperField, bool.TrueString },
+                },
+                Modifiers =
+                {
+                    "private",
+                },
+                FieldName = context.GetFieldName(tagHelper),
+                FieldType = "global::" + context.GetFullyQualifiedName(tagHelper),
+            });
+        }
+
+        private void AddTagHelperClass(Context context, TagHelperDescriptor tagHelper)
+        {
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = context.GetClassName(tagHelper),
+                TagHelper = tagHelper
+            };
+
+            context.Class.Children.Add(node);
+        }
+
+        private struct Context
+        {
+            private Dictionary<TagHelperDescriptor, (string className, string fullyQualifiedName, string fieldName)> _tagHelpers;
+
+            public Context(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class)
+            {
+                Namespace = @namespace;
+                Class = @class;
+
+                _tagHelpers = new Dictionary<TagHelperDescriptor, (string, string, string)>();
+            }
+
+            public ClassDeclarationIntermediateNode Class { get; }
+
+            public NamespaceDeclarationIntermediateNode Namespace { get; }
+
+
+            public IEnumerable<TagHelperDescriptor> TagHelpers => _tagHelpers.Keys;
+
+            public bool Add(TagHelperDescriptor tagHelper)
+            {
+                if (_tagHelpers.ContainsKey(tagHelper))
+                {
+                    return false;
+                }
+
+                var className = $"__Generated__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+                var fullyQualifiedName = $"{Namespace.Content}.{Class.ClassName}.{className}";
+                var fieldName = GenerateFieldName(tagHelper);
+
+                _tagHelpers.Add(tagHelper, (className, fullyQualifiedName, fieldName));
+
+                return true;
+            }
+
+            public string GetClassName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].className;
+            }
+
+            public string GetFullyQualifiedName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fullyQualifiedName;
+            }
+
+            public string GetFieldName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fieldName;
+            }
+
+            private static string GenerateFieldName(TagHelperDescriptor tagHelper)
+            {
+                return $"__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..89aba13222
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,183 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal class ViewComponentTagHelperTargetExtension : IViewComponentTagHelperTargetExtension
+    {
+        private static readonly string[] PublicModifiers = new[] { "public" };
+
+        public string TagHelperTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper";
+
+        public string ViewComponentHelperTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.IViewComponentHelper";
+
+        public string ViewComponentHelperVariableName { get; set; } = "_helper";
+
+        public string ViewComponentInvokeMethodName { get; set; } = "InvokeAsync";
+
+        public string HtmlAttributeNotBoundAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute";
+
+        public string ViewContextAttributeTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute";
+
+        public string ViewContextTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext";
+
+        public string ViewContextPropertyName { get; set; } = "ViewContext";
+
+        public string HtmlTargetElementAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute";
+
+        public string TagHelperProcessMethodName { get; set; } = "ProcessAsync";
+
+        public string TagHelperContextTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext";
+
+        public string TagHelperContextVariableName { get; set; } = "context";
+
+        public string TagHelperOutputTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput";
+
+        public string TagHelperOutputVariableName { get; set; } = "output";
+
+        public string TagHelperOutputTagNamePropertyName { get; set; } = "TagName";
+
+        public string TagHelperOutputContentPropertyName { get; set; } = "Content";
+
+        public string TagHelperContentSetMethodName { get; set; } = "SetHtmlContent";
+
+        public string TagHelperContentVariableName { get; set; } = "content";
+
+        public string IViewContextAwareTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware";
+
+        public string IViewContextAwareContextualizeMethodName { get; set; } = "Contextualize";
+
+        public void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node)
+        {
+            // Add target element.
+            WriteTargetElementString(context.CodeWriter, node.TagHelper);
+
+            // Initialize declaration.
+            using (context.CodeWriter.BuildClassDeclaration(
+                PublicModifiers,
+                node.ClassName,
+                TagHelperTypeName,
+                interfaces: null,
+                typeParameters: null))
+            {
+                // Add view component helper.
+                context.CodeWriter.WriteVariableDeclaration(
+                    $"private readonly {ViewComponentHelperTypeName}",
+                    ViewComponentHelperVariableName,
+                    value: null);
+
+                // Add constructor.
+                WriteConstructorString(context.CodeWriter, node.ClassName);
+
+                // Add attributes.
+                WriteAttributeDeclarations(context.CodeWriter, node.TagHelper);
+
+                // Add process method.
+                WriteProcessMethodString(context.CodeWriter, node.TagHelper);
+            }
+        }
+
+        private void WriteConstructorString(CodeWriter writer, string className)
+        {
+            writer.Write("public ")
+                .Write(className)
+                .Write("(")
+                .Write($"{ViewComponentHelperTypeName} helper")
+                .WriteLine(")");
+            using (writer.BuildScope())
+            {
+                writer.WriteStartAssignment(ViewComponentHelperVariableName)
+                    .Write("helper")
+                    .WriteLine(";");
+            }
+        }
+
+        private void WriteAttributeDeclarations(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            writer.Write("[")
+              .Write(HtmlAttributeNotBoundAttributeTypeName)
+              .WriteParameterSeparator()
+              .Write(ViewContextAttributeTypeName)
+              .WriteLine("]");
+
+            writer.WriteAutoPropertyDeclaration(
+                PublicModifiers,
+                ViewContextTypeName,
+                ViewContextPropertyName);
+
+            foreach (var attribute in tagHelper.BoundAttributes)
+            {
+                writer.WriteAutoPropertyDeclaration(
+                    PublicModifiers,
+                    attribute.TypeName,
+                    attribute.GetPropertyName());
+
+                if (attribute.IndexerTypeName != null)
+                {
+                    writer.Write(" = ")
+                        .WriteStartNewObject(attribute.TypeName)
+                        .WriteEndMethodInvocation();
+                }
+            }
+        }
+
+        private void WriteProcessMethodString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            using (writer.BuildMethodDeclaration(
+                    $"public override async",
+                    $"global::{typeof(Task).FullName}",
+                    TagHelperProcessMethodName,
+                    new Dictionary<string, string>()
+                    {
+                        { TagHelperContextTypeName, TagHelperContextVariableName },
+                        { TagHelperOutputTypeName, TagHelperOutputVariableName }
+                    }))
+            {
+                writer.WriteInstanceMethodInvocation(
+                    $"({ViewComponentHelperVariableName} as {IViewContextAwareTypeName})?",
+                    IViewContextAwareContextualizeMethodName,
+                    new[] { ViewContextPropertyName });
+
+                var methodParameters = GetMethodParameters(tagHelper);
+                writer.Write("var ")
+                    .WriteStartAssignment(TagHelperContentVariableName)
+                    .WriteInstanceMethodInvocation($"await {ViewComponentHelperVariableName}", ViewComponentInvokeMethodName, methodParameters);
+                writer.WriteStartAssignment($"{TagHelperOutputVariableName}.{TagHelperOutputTagNamePropertyName}")
+                    .WriteLine("null;");
+                writer.WriteInstanceMethodInvocation(
+                    $"{TagHelperOutputVariableName}.{TagHelperOutputContentPropertyName}",
+                    TagHelperContentSetMethodName,
+                    new[] { TagHelperContentVariableName });
+            }
+        }
+
+        private string[] GetMethodParameters(TagHelperDescriptor tagHelper)
+        {
+            var propertyNames = tagHelper.BoundAttributes.Select(attribute => attribute.GetPropertyName());
+            var joinedPropertyNames = string.Join(", ", propertyNames);
+            var parametersString = $"new {{ { joinedPropertyNames } }}";
+            var viewComponentName = tagHelper.GetViewComponentName();
+            var methodParameters = new[] { $"\"{viewComponentName}\"", parametersString };
+            return methodParameters;
+        }
+
+        private void WriteTargetElementString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            Debug.Assert(tagHelper.TagMatchingRules.Count() == 1);
+
+            var rule = tagHelper.TagMatchingRules.First();
+
+            writer.Write("[")
+                .WriteStartMethodInvocation(HtmlTargetElementAttributeTypeName)
+                .WriteStringLiteral(rule.TagName)
+                .WriteLine(")]");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
new file mode 100644
index 0000000000..9e1f936060
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
@@ -0,0 +1,88 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal class ViewComponentTypeVisitor : SymbolVisitor
+    {
+        private readonly INamedTypeSymbol _viewComponentAttribute;
+        private readonly INamedTypeSymbol _nonViewComponentAttribute;
+        private readonly List<INamedTypeSymbol> _results;
+
+        public ViewComponentTypeVisitor(
+            INamedTypeSymbol viewComponentAttribute,
+            INamedTypeSymbol nonViewComponentAttribute,
+            List<INamedTypeSymbol> results)
+        {
+            _viewComponentAttribute = viewComponentAttribute;
+            _nonViewComponentAttribute = nonViewComponentAttribute;
+            _results = results;
+        }
+
+        public override void VisitNamedType(INamedTypeSymbol symbol)
+        {
+            if (IsViewComponent(symbol))
+            {
+                _results.Add(symbol);
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public)
+            {
+                return;
+            }
+
+            foreach (var member in symbol.GetTypeMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        public override void VisitNamespace(INamespaceSymbol symbol)
+        {
+            foreach (var member in symbol.GetMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        internal bool IsViewComponent(INamedTypeSymbol symbol)
+        {
+            if (_viewComponentAttribute == null)
+            {
+                return false;
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public ||
+                symbol.IsAbstract ||
+                symbol.IsGenericType ||
+                AttributeIsDefined(symbol, _nonViewComponentAttribute))
+            {
+                return false;
+            }
+
+            return symbol.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix) ||
+                AttributeIsDefined(symbol, _viewComponentAttribute);
+        }
+
+        private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+        {
+            if (type == null || queryAttribute == null)
+            {
+                return false;
+            }
+
+            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+
+            if (attribute != null)
+            {
+                return true;
+            }
+
+            return AttributeIsDefined(type.BaseType, queryAttribute);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypes.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypes.cs
new file mode 100644
index 0000000000..5558ba5e06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypes.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal static class ViewComponentTypes
+    {
+        public const string Assembly = "Microsoft.AspNetCore.Mvc.ViewFeatures";
+
+        public static readonly Version AssemblyVersion = new Version(1, 1, 0, 0);
+
+        public const string ViewComponentSuffix = "ViewComponent";
+
+        public const string ViewComponentAttribute = "Microsoft.AspNetCore.Mvc.ViewComponentAttribute";
+
+        public const string NonViewComponentAttribute = "Microsoft.AspNetCore.Mvc.NonViewComponentAttribute";
+
+        public const string GenericTask = "System.Threading.Tasks.Task`1";
+
+        public const string Task = "System.Threading.Tasks.Task";
+
+        public const string IDictionary = "System.Collections.Generic.IDictionary`2";
+
+        public const string AsyncMethodName = "InvokeAsync";
+
+        public const string SyncMethodName = "Invoke";
+
+        public static class ViewComponent
+        {
+            public const string Name = "Name";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netcore.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netcore.json
new file mode 100644
index 0000000000..488fa33c0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netcore.json
@@ -0,0 +1,1235 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor.Extensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.AssemblyAttributeInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.IInjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemberName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.Extensions.IInjectTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.Extensions.IInjectTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.IViewComponentTagHelperTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteViewComponentTagHelper",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelType",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelExpressionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.MvcRazorTemplateEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngine",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocument",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "engine",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            },
+            {
+              "Name": "project",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProject"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.MvcViewDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MvcViewDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.NamespaceDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveNode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "pageDirective",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.PagesPropertyInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorPageDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorPageDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RouteTemplateKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsViewComponentKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponentName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClassName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTypes+ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netframework.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netframework.json
new file mode 100644
index 0000000000..7d416ca9c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/baseline.netframework.json
@@ -0,0 +1,1023 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor.Extensions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.AssemblyAttributeInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.IInjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemberName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.Extensions.IInjectTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.Extensions.IInjectTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelType",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelExpressionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.MvcRazorTemplateEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngine",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocument",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "engine",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            },
+            {
+              "Name": "project",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProject"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.MvcViewDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MvcViewDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.NamespaceDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveNode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "pageDirective",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.PagesPropertyInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorPageDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorPageDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsViewComponentKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponentName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTypes+ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netcore.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netcore.json
new file mode 100644
index 0000000000..5f5b6444f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netcore.json
@@ -0,0 +1,11 @@
+[
+  {
+    "TypeId": "public static class Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+    "MemberId": "public static System.Void Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder)",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass : Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase, Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+    "Kind": "Removal"
+  }
+]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netframework.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netframework.json
new file mode 100644
index 0000000000..5f5b6444f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/breakingchanges.netframework.json
@@ -0,0 +1,11 @@
+[
+  {
+    "TypeId": "public static class Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+    "MemberId": "public static System.Void Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder)",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass : Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase, Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+    "Kind": "Removal"
+  }
+]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs
new file mode 100644
index 0000000000..0ccd553a08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs
@@ -0,0 +1,444 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class AssemblyAttributeInjectionPassTest
+    {
+        [Fact]
+        public void Execute_NoOps_IfNamespaceNodeIsMissing()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Empty(irDocument.Children);
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfNamespaceNodeHasEmptyContent()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = string.Empty };
+            @namespace.Annotations[CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace;
+            builder.Push(@namespace);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfClassNameNodeIsMissing()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
+            builder.Push(@namespace);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfClassNameIsEmpty()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfDocumentIsNotViewOrPage()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = "Default",
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_ForDesignTime()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDesignTimeDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_AddsRazorViewAttribute_ToViews()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_EscapesViewPathWhenAddingAttributeToViews()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "\\test\\\"Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_AddsRazorPagettribute_ToPage()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName), null)]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var pageDirective = new DirectiveIntermediateNode
+            {
+                Directive = PageDirective.Directive,
+            };
+            builder.Add(pageDirective);
+
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(pageDirective, node),
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_EscapesViewPathAndRouteWhenAddingAttributeToPage()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "test\\\"Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs
new file mode 100644
index 0000000000..54a2fa4fd1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs
@@ -0,0 +1,212 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class InjectDirectiveTest
+    {
+        [Fact]
+        public void InjectDirectivePass_Execute_DefinesProperty()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_DedupesPropertiesByName()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+@inject PropertyType2 PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType2", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<dynamic>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelTypeFirst()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model ModelType
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+@model ModelType
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
+                b.AddDirective(InjectDirective.Directive);
+                b.AddDirective(ModelDirective.Directive);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            irDocument.DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind;
+            return irDocument;
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs
new file mode 100644
index 0000000000..ec36da6564
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class InjectTargetExtensionTest
+    {
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesProperty()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType",
+                MemberName = "PropertyName",
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType PropertyName { get; private set; }" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesPropertyWithLinePragma_WhenSourceIsSet()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType<ModelType>",
+                MemberName = "PropertyName",
+                Source = new SourceSpan(
+                    filePath: "test-path",
+                    absoluteIndex: 0,
+                    lineIndex: 1,
+                    characterIndex: 1,
+                    length: 10)
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "#line 2 \"test-path\"" + Environment.NewLine +
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
+                "#line default" + Environment.NewLine +
+                "#line hidden" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
new file mode 100644
index 0000000000..8273810ca3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -0,0 +1,961 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
+{
+    public class CodeGenerationIntegrationTest : IntegrationTestBase
+    {
+        private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode");
+
+        public CodeGenerationIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Create(
+                RazorLanguageVersion.Version_3_0,
+                "MVC-3.0",
+                new[] { new AssemblyExtension("MVC-3.0", typeof(ExtensionInitializer).Assembly) });
+        }
+
+        protected override CSharpCompilation BaseCompilation => DefaultBaseCompilation;
+
+        protected override RazorConfiguration Configuration { get; }
+
+        #region Runtime
+
+        [Fact]
+        public void UsingDirectives_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
+        }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+public abstract class MyPageModel<T> : Page
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+            AddProjectItemFromText(@"@inherits MyPageModel<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void MalformedPageDirective_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void Basic_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Sections_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void _ViewImports_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Inject_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InjectWithModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Model_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ModelExpressionTagHelper_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPages_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPagesWithRouteTemplate_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPagesWithoutModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void PageWithNamespace_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ViewWithNamespace_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPageWithNoLeadingPageDirective_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
+        }
+        #endregion
+
+        #region DesignTime
+
+        [Fact]
+        public void UsingDirectives_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
+        }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+public abstract class MyPageModel<T> : Page
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+
+            AddProjectItemFromText(@"@inherits MyPageModel<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MalformedPageDirective_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void Basic_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Sections_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void _ViewImports_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Inject_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Model_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MultipleModels_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class ThisShouldBeGenerated
+{
+
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ2001", Assert.Single(diagnotics).Id);
+        }
+        
+        [Fact]
+        public void ModelExpressionTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPages_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPagesWithRouteTemplate_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPagesWithoutModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void PageWithNamespace_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewWithNamespace_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPageWithNoLeadingPageDirective_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
new file mode 100644
index 0000000000..86d975d404
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Targets>Build</Targets>
+    </ProjectReference>
+
+    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+  <Target Name="CopyDepsFromShims" AfterTargets="Build">
+    <ItemGroup>
+      <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
new file mode 100644
index 0000000000..425b1b41c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
@@ -0,0 +1,343 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ModelDirectiveTest
+    {
+        [Fact]
+        public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@model Type2
+@model
+");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("Type1", result);
+        }
+
+        [Fact]
+        public void ModelDirective_GetModelType_DefaultsToDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@" ");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("dynamic", result);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DifferentOrdering()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@inherits BaseType<TModel>
+@model Type2
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_NoOpWithoutTModel()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DefaultDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model SomeType
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<SomeType>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::System.Object", usingNode.Content);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private NamespaceDeclarationIntermediateNode FindNamespaceNode(IntermediateNode node)
+        {
+            var visitor = new NamespaceNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return CreateEngineCore();
+        }
+
+        private RazorEngine CreateDesignTimeEngine()
+        {
+            return CreateEngineCore(designTime: true);
+        }
+
+        private RazorEngine CreateEngineCore(bool designTime = false)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
+                b.AddDirective(ModelDirective.Directive);
+
+                // There's some special interaction with the inherits directive
+                InheritsDirective.Register(b);
+
+                b.Features.Add(new DesignTimeOptionsFeature(designTime));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // InheritsDirectivePass needs to run before ModelDirective.
+            var pass = new InheritsDirectivePass()
+            {
+                Engine = engine
+            };
+            pass.Execute(codeDocument, codeDocument.GetDocumentIntermediateNode());
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class NamespaceNodeVisitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private bool _designTime;
+
+            public DesignTimeOptionsFeature(bool designTime)
+            {
+                _designTime = designTime;
+            }
+
+            public int Order { get; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs
new file mode 100644
index 0000000000..92f6ef816e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs
@@ -0,0 +1,208 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ModelExpressionPassTest
+    {
+        [Fact]
+        public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var token = Assert.IsType<IntermediateToken>(Assert.Single(setProperty.Children));
+            Assert.True(token.IsCSharp);
+            Assert.Equal("17", token.Content);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[2]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"@Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[1]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcImportProjectFeatureTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcImportProjectFeatureTest.cs
new file mode 100644
index 0000000000..7e811ee261
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcImportProjectFeatureTest.cs
@@ -0,0 +1,76 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class MvcImportProjectFeatureTest
+    {
+        [Fact]
+        public void AddDefaultDirectivesImport_AddsSingleDynamicImport()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+
+            // Act
+            MvcImportProjectFeature.AddDefaultDirectivesImport(imports);
+
+            // Assert
+            var import = Assert.Single(imports);
+            Assert.Null(import.FilePath);
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[]
+            {
+                new TestRazorProjectItem("/Index.cshtml"),
+                new TestRazorProjectItem("/_ViewImports.cshtml"),
+                new TestRazorProjectItem("/Contact/_ViewImports.cshtml"),
+                projectItem,
+            });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsNotOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Pages/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[] { projectItem });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
new file mode 100644
index 0000000000..f6c61c42a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
@@ -0,0 +1,94 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class MvcRazorTemplateEngineTest
+    {
+        [Fact]
+        public void GetDefaultImports_IncludesDefaultImports()
+        {
+            // Arrange
+            var expectedImports = new[]
+            {
+                "@using System",
+                "@using System.Collections.Generic",
+                "@using System.Linq",
+                "@using System.Threading.Tasks",
+                "@using Microsoft.AspNetCore.Mvc",
+                "@using Microsoft.AspNetCore.Mvc.Rendering",
+                "@using Microsoft.AspNetCore.Mvc.ViewFeatures",
+            };
+            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
+                RazorProjectEngine.Create().Engine,
+                new TestRazorProjectFileSystem());
+
+            // Act
+            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
+
+            // Assert
+            var importContent = GetContent(imports)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .Where(line => line.StartsWith("@using"));
+            Assert.Equal(expectedImports, importContent);
+        }
+
+        [Fact]
+        public void GetDefaultImports_IncludesDefaulInjects()
+        {
+            // Arrange
+            var expectedImports = new[]
+            {
+                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html",
+                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json",
+                "@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component",
+                "@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url",
+                "@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider",
+            };
+            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
+                RazorProjectEngine.Create().Engine,
+                new TestRazorProjectFileSystem());
+
+            // Act
+            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
+
+            // Assert
+            var importContent = GetContent(imports)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .Where(line => line.StartsWith("@inject"));
+            Assert.Equal(expectedImports, importContent);
+        }
+
+        [Fact]
+        public void GetDefaultImports_IncludesDefaultTagHelpers()
+        {
+            // Arrange
+            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
+                RazorProjectEngine.Create().Engine,
+                new TestRazorProjectFileSystem());
+
+            // Act
+            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
+
+            // Assert
+            var importContent = GetContent(imports)
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .Where(line => line.StartsWith("@addTagHelper"));
+            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
+            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
+            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
+        }
+
+        private string GetContent(RazorSourceDocument imports)
+        {
+            var contentChars = new char[imports.Length];
+            imports.CopyTo(0, contentChars, 0, imports.Length);
+            return new string(contentChars);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcShim.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcShim.cs
new file mode 100644
index 0000000000..0ee1e1a66d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcShim.cs
@@ -0,0 +1,45 @@
+// 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.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    internal static class MvcShim
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Razor.Test.MvcShim";
+
+        private static Assembly _assembly;
+        private static CSharpCompilation _baseCompilation;
+
+        public static Assembly Assembly
+        {
+            get
+            {
+                if (_assembly == null)
+                {
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), AssemblyName + ".dll");
+                    _assembly = Assembly.LoadFrom(filePath);
+                }
+
+                return _assembly;
+            }
+        }
+
+        public static CSharpCompilation BaseCompilation
+        {
+            get
+            {
+                if (_baseCompilation == null)
+                {
+                    _baseCompilation = TestCompilation.Create(Assembly);
+                }
+
+                return _baseCompilation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..d7c0ae6854
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
@@ -0,0 +1,264 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class MvcViewDocumentClassifierPassTest
+    {
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.view", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_d9f877a857a7e9928eac04d09a59f25967624155", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void MvcViewDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs
new file mode 100644
index 0000000000..d744eec9fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs
@@ -0,0 +1,352 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class NamespaceDirectiveTest
+    {
+        [Fact]
+        public void GetNamespace_IncompleteDirective_UsesEmptyNamespace()
+        {
+            // Arrange
+            var source = "c:\\foo\\bar\\bleh.cshtml";
+            var imports = "c:\\foo\\baz\\bleh.cshtml";
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(string.Empty, @namespace);
+        }
+
+        [Fact]
+        public void GetNamespace_EmptyDirective_UsesEmptyNamespace()
+        {
+            // Arrange
+            var source = "c:\\foo\\bar\\bleh.cshtml";
+            var imports = "c:\\foo\\baz\\bleh.cshtml";
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = string.Empty });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(string.Empty, @namespace);
+        }
+
+        // When we don't have a relationship between the source file and the imports file
+        // we will just use the namespace on the node directly.
+        [Theory]
+        [InlineData((string)null, (string)null)]
+        [InlineData("", "")]
+        [InlineData(null, "/foo/bar")]
+        [InlineData("/foo/baz", "/foo/bar/bleh")]
+        [InlineData("/foo.cshtml", "/foo/bar.cshtml")]
+        [InlineData("c:\\foo.cshtml", "d:\\foo\\bar.cshtml")]
+        [InlineData("c:\\foo\\bar\\bleh.cshtml", "c:\\foo\\baz\\bleh.cshtml")]
+        public void GetNamespace_ForNonRelatedFiles_UsesNamespaceVerbatim(string source, string imports)
+        {
+            // Arrange
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal("Base", @namespace);
+        }
+
+        [Theory]
+        [InlineData("/foo.cshtml", "/_ViewImports.cshtml", "Base")]
+        [InlineData("/foo/bar.cshtml", "/_ViewImports.cshtml", "Base.foo")]
+        [InlineData("/foo/bar/baz.cshtml", "/_ViewImports.cshtml", "Base.foo.bar")]
+        [InlineData("/foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
+        [InlineData("/Foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
+        [InlineData("c:\\foo.cshtml", "c:\\_ViewImports.cshtml", "Base")]
+        [InlineData("c:\\foo\\bar.cshtml", "c:\\_ViewImports.cshtml", "Base.foo")]
+        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\_ViewImports.cshtml", "Base.foo.bar")]
+        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
+        [InlineData("c:\\Foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
+        public void GetNamespace_ForRelatedFiles_ComputesNamespaceWithSuffix(string source, string imports, string expected)
+        {
+            // Arrange
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(expected, @namespace);
+        }
+
+        // This is the case where a _ViewImports sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromImports()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This is the case where the source file sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromSource()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            // This will be ignored.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
+            builder.Pop();
+
+            // This will be used.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // Handles cases where invalid characters appears in FileNames. Note that we don't sanitize the part of
+        // the namespace that you put in an import, just the file-based-suffix. Garbage in, garbage out.
+        [Fact]
+        public void Pass_SetsNamespace_SanitizesClassAndNamespace()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage-Info/Add+User.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage_Info", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This is the case where the source file sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromSource_ForView()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            // This will be ignored.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
+            builder.Pop();
+
+            // This will be used.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This handles an error case where we can't determine the relationship between the
+        // imports and the source.
+        [Fact]
+        public void Pass_SetsNamespace_VerbatimFromImports()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(null, 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        [Fact]
+        public void Pass_DoesNothing_ForUnknownDocumentKind()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(null, 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = null;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("default", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/PageDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/PageDirectiveTest.cs
new file mode 100644
index 0000000000..6cf2796358
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/PageDirectiveTest.cs
@@ -0,0 +1,148 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class PageDirectiveTest
+    {
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageIsMalformed()
+        {
+            // Arrange
+            var content = "@page \"some-route-template\" Invalid";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("some-route-template", pageDirective.RouteTemplate);
+            Assert.NotNull(pageDirective.DirectiveNode);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageIsImported()
+        {
+            // Arrange
+            var content = "Hello world";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var importDocument = RazorSourceDocument.Create("@page", "imports.cshtml");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsFalse_IfPageDoesNotHaveDirective()
+        {
+            // Arrange
+            var content = "Hello world";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(pageDirective);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageDoesStartWithDirective()
+        {
+            // Arrange
+            var content = "Hello @page";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+            Assert.NotNull(pageDirective.DirectiveNode);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfContentHasDirective()
+        {
+            // Arrange
+            var content = "@page";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ParsesRouteTemplate()
+        {
+            // Arrange
+            var content = "@page \"some-route-template\"";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("some-route-template", pageDirective.RouteTemplate);
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                PageDirective.Register(b);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..a0cdbd7f80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
@@ -0,0 +1,417 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class RazorPageDocumentClassifierPassTest
+    {
+        [Fact]
+        public void RazorPageDocumentClassifierPass_LogsErrorForImportedPageDirectives()
+        {
+            // Arrange
+            var sourceSpan = new SourceSpan("import.cshtml", 0, 0, 0, 5);
+            var expectedDiagnostic = RazorExtensionsDiagnosticFactory.CreatePageDirective_CannotBeImported(sourceSpan);
+            var importDocument = RazorSourceDocument.Create("@page", "import.cshtml");
+            var sourceDocument = RazorSourceDocument.Create("<p>Hello World</p>", "main.cshtml");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            var diagnostic = Assert.Single(directive.Node.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_LogsErrorIfDirectiveNotAtTopOfFile()
+        {
+            // Arrange
+            var sourceSpan = new SourceSpan(
+                "Test.cshtml",
+                absoluteIndex: 14 + Environment.NewLine.Length * 2,
+                lineIndex: 2,
+                characterIndex: 0,
+                length: 5 + Environment.NewLine.Length);
+
+            var expectedDiagnostic = RazorExtensionsDiagnosticFactory.CreatePageDirective_MustExistAtTheTopOfFile(sourceSpan);
+            var content = @"
+@somethingelse
+@page
+";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            var diagnostic = Assert.Single(directive.Node.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_DoesNotLogErrorIfCommentAndWhitespaceBeforeDirective()
+        {
+            // Arrange
+            var content = @"
+@* some comment *@
+     
+@page
+";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            Assert.Empty(directive.Node.Diagnostics);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.razor-page", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NoOpsIfPageDirectiveIsMalformed()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page+1", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_74fbaab062bb228ed1ab09c5ff8d6ed2417320e2", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void RazorPageDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_AddsRouteTemplateMetadata()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page \"some-route\"", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var attributeNode = Assert.IsType<RazorCompiledItemMetadataAttributeIntermediateNode>(visitor.ExtensionNode);
+            Assert.Equal("RouteTemplate", attributeNode.Key);
+            Assert.Equal("some-route", attributeNode.Value);
+        }
+
+        private static RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                PageDirective.Register(b);
+            }).Engine;
+        }
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public ExtensionIntermediateNode ExtensionNode { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitExtension(ExtensionIntermediateNode node)
+            {
+                ExtensionNode = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/SourceMappingsSerializer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/SourceMappingsSerializer.cs
new file mode 100644
index 0000000000..c2dd799b05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/SourceMappingsSerializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public static class SourceMappingsSerializer
+    {
+        public static string Serialize(RazorCSharpDocument csharpDocument, RazorSourceDocument sourceDocument)
+        {
+            var builder = new StringBuilder();
+            var sourceFilePath = sourceDocument.FilePath;
+            var charBuffer = new char[sourceDocument.Length];
+            sourceDocument.CopyTo(0, charBuffer, 0, sourceDocument.Length);
+            var sourceContent = new string(charBuffer);
+
+            for (var i = 0; i < csharpDocument.SourceMappings.Count; i++)
+            {
+                var sourceMapping = csharpDocument.SourceMappings[i];
+                if (!string.Equals(sourceMapping.OriginalSpan.FilePath, sourceFilePath, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                builder.Append("Source Location: ");
+                AppendMappingLocation(builder, sourceMapping.OriginalSpan, sourceContent);
+
+                builder.Append("Generated Location: ");
+                AppendMappingLocation(builder, sourceMapping.GeneratedSpan, csharpDocument.GeneratedCode);
+
+                builder.AppendLine();
+            }
+
+            return builder.ToString();
+        }
+
+        private static void AppendMappingLocation(StringBuilder builder, SourceSpan location, string content)
+        {
+            builder
+                .AppendLine(location.ToString())
+                .Append("|");
+
+            for (var i = 0; i < location.Length; i++)
+            {
+                builder.Append(content[location.AbsoluteIndex + i]);
+            }
+
+            builder.AppendLine("|");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TagHelperDescriptorExtensionsTest.cs
new file mode 100644
index 0000000000..e9e423853c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TagHelperDescriptorExtensionsTest.cs
@@ -0,0 +1,82 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class TagHelperDescriptorExtensionsTest
+    {
+        [Fact]
+        public void IsViewComponentKind_ReturnsFalse_ForNonVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsViewComponentKind_ReturnsTrue_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsNull_ForNonVCTHDescriptor()
+        {
+            //Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsName_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor("ViewComponentName");
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Equal("ViewComponentName", result);
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor()
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .Build();
+
+            return tagHelper;
+        }
+
+        private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor(string name = "ViewComponentName")
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, name)
+                .Build();
+
+            return tagHelper;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
new file mode 100644
index 0000000000..a20b20dae8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
@@ -0,0 +1,8 @@
+<div class="@this.ToString()">
+    Hello world
+    @string.Format("{0}", "Hello")
+</div>
+@{ 
+    var cls = "foo";
+}
+<p class="@if(cls != null) { @cls }" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d39b64c26d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+       __o = this.ToString();
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+__o = string.Format("{0}", "Hello");
+
+#line default
+#line hidden
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        __o = cls;
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
new file mode 100644
index 0000000000..4074239b9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -0,0 +1,64 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [23] Basic.cshtml) - Html - \n    Hello world\n    
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
new file mode 100644
index 0000000000..372b49cb6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (13:0,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|this.ToString()|
+Generated Location: (1030:26,13 [15] )
+|this.ToString()|
+
+Source Location: (54:2,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|string.Format("{0}", "Hello")|
+Generated Location: (1166:31,6 [29] )
+|string.Format("{0}", "Hello")|
+
+Source Location: (95:4,2 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| 
+    var cls = "foo";
+|
+Generated Location: (1312:36,2 [25] )
+| 
+    var cls = "foo";
+|
+
+Source Location: (134:7,11 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|if(cls != null) { |
+Generated Location: (1460:42,11 [18] )
+|if(cls != null) { |
+
+Source Location: (153:7,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|cls|
+Generated Location: (1622:47,30 [3] )
+|cls|
+
+Source Location: (156:7,33 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| }|
+Generated Location: (1773:52,33 [2] )
+| }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
new file mode 100644
index 0000000000..ec84263550
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -0,0 +1,81 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6d079dd6c39f39d17a2faff14404b37ab7e8b8fc"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"6d079dd6c39f39d17a2faff14404b37ab7e8b8fc", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<div");
+            BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            WriteLiteral(">\r\n    Hello world\r\n    ");
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+Write(string.Format("{0}", "Hello"));
+
+#line default
+#line hidden
+            WriteLiteral("\r\n</div>\r\n");
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+            WriteLiteral("<p");
+            BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
+            WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        Write(cls);
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+                PopWriter();
+            }
+            ), 133, 25, false);
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
new file mode 100644
index 0000000000..8ed7912b0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -0,0 +1,48 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [19] Basic.cshtml) - Html - \n    Hello world\n
+                    IntermediateToken - (49:2,0 [4] Basic.cshtml) - Html -     
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
new file mode 100644
index 0000000000..224242197b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
@@ -0,0 +1,15 @@
+@* These test files validate that end-to-end, incomplete directives don't throw. *@
+
+@page
+@page 
+@page "
+
+@model
+@model 
+
+@inject
+@inject 
+@inject MyService<TModel>
+
+@namespace
+@namespace 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..dd100bee00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1cfef392ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
@@ -0,0 +1,12 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(10,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,26): Error RZ1015: The 'inject' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(14,11): Error RZ1014: The 'namespace' directive expects a namespace name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,1): Error RZ2001: The 'namespace' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..2aeddc2fa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -0,0 +1,84 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
+                HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
+                    IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..4bb61bf781
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -0,0 +1,40 @@
+Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (671:18,0 [0] )
+||
+
+Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (724:21,0 [0] )
+||
+
+Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (777:24,0 [0] )
+||
+
+Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (830:27,0 [0] )
+||
+
+Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|MyService<TModel>|
+Generated Location: (980:31,0 [17] )
+|MyService<TModel>|
+
+Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1133:38,0 [0] )
+||
+
+Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1186:41,0 [0] )
+||
+
+Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1239:44,0 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..31179505bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -0,0 +1,47 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5add9dba0a182cd75498c5b24f64a2547e7f49b0"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5add9dba0a182cd75498c5b24f64a2547e7f49b0", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n\r\n");
+            WriteLiteral("\"\r\n\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1cfef392ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
@@ -0,0 +1,12 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(10,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,26): Error RZ1015: The 'inject' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(14,11): Error RZ1014: The 'namespace' directive expects a namespace name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,1): Error RZ2001: The 'namespace' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..0478bc1e74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -0,0 +1,59 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
+                HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
+                    IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
new file mode 100644
index 0000000000..38efd570da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
@@ -0,0 +1,2 @@
+@inherits MyBasePageForViews<TModel>
+@model MyModel
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7cdbaf3326
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..3310acfa76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
@@ -0,0 +1,39 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [26] InheritsViewModel.cshtml) - MyBasePageForViews<TModel>
+                DirectiveToken - (45:1,7 [7] InheritsViewModel.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a313a909d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyBasePageForViews<TModel>|
+Generated Location: (740:19,0 [26] )
+|MyBasePageForViews<TModel>|
+
+Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyModel|
+Generated Location: (1004:27,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..9680177b77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3ff83e2f0d946feb387a8ea03a529c64350014f8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"3ff83e2f0d946feb387a8ea03a529c64350014f8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
new file mode 100644
index 0000000000..2468ef4662
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
new file mode 100644
index 0000000000..295e4cf3ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
@@ -0,0 +1,2 @@
+@page
+@model MyModel
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..f174a0fc2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+        public MyModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..bcbf42ae26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyPageModel<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [19] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - MyPageModel<TModel>
+                DirectiveToken - (14:1,7 [7] InheritsWithViewImports.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public MyModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e7daecd874
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
+|MyModel|
+Generated Location: (745:19,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..c1ea0b5c3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d196fc1c66d46d35e35af9b01c737e12bcce6782"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d196fc1c66d46d35e35af9b01c737e12bcce6782", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f311ecbb5c4d63980a59c24af5ffe8baa1c3f99a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+        public MyModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..2704223a57
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyPageModel<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public MyModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
new file mode 100644
index 0000000000..0aa749dd3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
@@ -0,0 +1 @@
+@inject MyApp MyPropertyName
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
new file mode 100644
index 0000000000..d699f1e754
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
@@ -0,0 +1,3 @@
+@model MyModel
+@inject MyApp MyPropertyName
+@inject MyService<TModel> Html
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2120622373
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -0,0 +1,82 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..c1d70d5d89
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithModel.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithModel.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithModel.cshtml) - MyPropertyName
+                DirectiveToken - (54:2,8 [17] InjectWithModel.cshtml) - MyService<TModel>
+                DirectiveToken - (72:2,26 [4] InjectWithModel.cshtml) - Html
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c4838ff64d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyModel|
+Generated Location: (766:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyApp|
+Generated Location: (990:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyPropertyName|
+Generated Location: (1232:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyService<TModel>|
+Generated Location: (1438:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|Html|
+Generated Location: (1704:51,22 [4] )
+|Html|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..36974edf08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2cafb599699b78d76f0355b6f528050b4720789d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2cafb599699b78d76f0355b6f528050b4720789d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
new file mode 100644
index 0000000000..d018107ae2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
new file mode 100644
index 0000000000..8cd61913e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
@@ -0,0 +1,5 @@
+@model MyModel
+@inject MyApp MyPropertyName;   
+@inject MyService<TModel> Html;  
+@inject MyApp MyPropertyName2  ;  
+@inject MyService<TModel> Html2  ;  
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ea95a4e7eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -0,0 +1,118 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
new file mode 100644
index 0000000000..5c4540f366
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
@@ -0,0 +1,49 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithSemicolon.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithSemicolon.cshtml) - MyPropertyName
+                DirectiveToken - (58:2,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (76:2,26 [4] InjectWithSemicolon.cshtml) - Html
+                DirectiveToken - (93:3,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (99:3,14 [15] InjectWithSemicolon.cshtml) - MyPropertyName2
+                DirectiveToken - (129:4,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (147:4,26 [5] InjectWithSemicolon.cshtml) - Html2
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a90f75f3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -0,0 +1,45 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyModel|
+Generated Location: (774:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1002:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName|
+Generated Location: (1248:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (1458:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html|
+Generated Location: (1728:51,22 [4] )
+|Html|
+
+Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1928:59,0 [5] )
+|MyApp|
+
+Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName2|
+Generated Location: (2174:67,22 [15] )
+|MyPropertyName2|
+
+Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (2385:75,0 [17] )
+|MyService<TModel>|
+
+Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html2|
+Generated Location: (2655:83,22 [5] )
+|Html2|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
new file mode 100644
index 0000000000..b8eb5c371d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
@@ -0,0 +1,42 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8a53bde02f202036e674a23018e04268a3a844bb"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8a53bde02f202036e674a23018e04268a3a844bb", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
new file mode 100644
index 0000000000..898557c170
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7b2f4fedc6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
new file mode 100644
index 0000000000..0b8beeae9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [5] Inject.cshtml) - MyApp
+                DirectiveToken - (14:0,14 [14] Inject.cshtml) - MyPropertyName
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
new file mode 100644
index 0000000000..10ed356ecf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyApp|
+Generated Location: (748:19,0 [5] )
+|MyApp|
+
+Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyPropertyName|
+Generated Location: (981:27,22 [14] )
+|MyPropertyName|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
new file mode 100644
index 0000000000..e3493199a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "592a6d8544c71b828d4a3fbf92d398cd3ea72790"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"592a6d8544c71b828d4a3fbf92d398cd3ea72790", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
new file mode 100644
index 0000000000..e05f9d2df9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
new file mode 100644
index 0000000000..6dfb72bc31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
@@ -0,0 +1 @@
+@namespace Test.
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d99c176c52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..90446dc58b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..6f9220aab4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
+                HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..2b269092bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -0,0 +1,37 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "010d175bb6c3f7fa6f2ae04c1fecb4e3bfbf928b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"010d175bb6c3f7fa6f2ae04c1fecb4e3bfbf928b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("Test.");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..90446dc58b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..7a0583e5a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
+                HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
new file mode 100644
index 0000000000..9b4f9d5559
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
@@ -0,0 +1,4 @@
+@page "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/MalformedPageDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..15befce0d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..637d1e902b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml(1,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..c3fbc6082e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
@@ -0,0 +1,51 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
+                HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
+                    IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
+                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
+                    IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
+                    IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
+                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
+                    IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..63b6c0a23e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "464e008b9a04181fe1e9f2cc6826095698de4739"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"464e008b9a04181fe1e9f2cc6826095698de4739", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\"foo\r\n\r\n<h1>About Us</h1>\r\n<p>We are awesome.</p>");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..637d1e902b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml(1,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..7a04b0051a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
+                HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
+                    IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
+                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
+                    IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
+                    IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
+                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
+                    IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
new file mode 100644
index 0000000000..4b73b2dc53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
@@ -0,0 +1 @@
+@model System.Collections.IEnumerable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
new file mode 100644
index 0000000000..c488b1e443
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -0,0 +1,6 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+<input-test for="Date" />
+<input-test for="@Model" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..82441cd663
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..37627e94ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] ModelExpressionTagHelper.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] ModelExpressionTagHelper.cshtml) - "InputTestTagHelper, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (62:2,43 [4] ModelExpressionTagHelper.cshtml) - Html - \n\n
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..63a7d6ccc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|DateTime|
+Generated Location: (851:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1123:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Date|
+Generated Location: (1802:44,102 [4] )
+|Date|
+
+Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Model|
+Generated Location: (2118:50,94 [5] )
+|Model|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..d5ec95d2aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -0,0 +1,95 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "741fc99adb54ad906c5cdc5391aeffb51a1e767b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"741fc99adb54ad906c5cdc5391aeffb51a1e767b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..0d8f3b8ec2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -0,0 +1,49 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
new file mode 100644
index 0000000000..63c2a52c6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
new file mode 100644
index 0000000000..1ebdc00df2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [30] Model.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
new file mode 100644
index 0000000000..7d84cf754d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (769:19,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
new file mode 100644
index 0000000000..ae8dc1fe65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2c1e88396568d309c236020e59bf2abacfadd612"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2c1e88396568d309c236020e59bf2abacfadd612", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
new file mode 100644
index 0000000000..2b7dcff085
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
new file mode 100644
index 0000000000..350f93b776
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
@@ -0,0 +1,2 @@
+@model ThisShouldBeGenerated
+@model System.Collections.IEnumerable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e8f705cef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<ThisShouldBeGenerated> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..2fe8233c66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml(2,1): Error RZ2001: The 'model' directive may only occur once per document.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
new file mode 100644
index 0000000000..f63a69601b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
@@ -0,0 +1,41 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [21] MultipleModels.cshtml) - ThisShouldBeGenerated
+                DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (30:1,0 [39] MultipleModels.cshtml) - model
+                    DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
new file mode 100644
index 0000000000..79d7e257c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|ThisShouldBeGenerated|
+Generated Location: (778:19,0 [21] )
+|ThisShouldBeGenerated|
+
+Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (1029:27,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
new file mode 100644
index 0000000000..ecee97de58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
@@ -0,0 +1,3 @@
+@page
+@namespace Test.Namespace
+<h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9d7181bfad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test.Namespace
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml"
+global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
new file mode 100644
index 0000000000..9238a0a419
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
@@ -0,0 +1,47 @@
+Document - 
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (18:1,11 [14] PageWithNamespace.cshtml) - Test.Namespace
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
+                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b41240c9c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:1,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml)
+|Test.Namespace|
+Generated Location: (809:19,44 [14] )
+|Test.Namespace|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
new file mode 100644
index 0000000000..729698a9cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1edfb1ba4f5f6c70e2c72f4f23baf4dc0ae14377"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
+namespace Test.Namespace
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"1edfb1ba4f5f6c70e2c72f4f23baf4dc0ae14377", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<h1>Hi There!</h1>\r\n");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
new file mode 100644
index 0000000000..5be907ee1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
+                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
new file mode 100644
index 0000000000..5172f8f791
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
@@ -0,0 +1,2 @@
+<div>Some text here.</div>
+@page
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ec8a4fd5c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..393b35646e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml(2,1): Error RZ3906: The '@page' directive must precede all other elements defined in a Razor file.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..c21d9fc82c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
+                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
+                    IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
+                    IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..f69dce12eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40c0ffad85d8fef63edfb5d91a08bd1b3609ba6f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"40c0ffad85d8fef63edfb5d91a08bd1b3609ba6f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<div>Some text here.</div>\r\n");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..393b35646e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml(2,1): Error RZ3906: The '@page' directive must precede all other elements defined in a Razor file.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..42eb920742
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
+                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
+                    IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
+                    IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
new file mode 100644
index 0000000000..2bc617c509
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
@@ -0,0 +1,40 @@
+@page
+
+@model NewModel
+@addTagHelper "*, AppCode"
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+}
+
+<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">@Model.Name</label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
new file mode 100644
index 0000000000..63d5955e72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
@@ -0,0 +1,13 @@
+@page "/About"
+
+@model NewModel
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+}
+
+<h1>New Customer @Model.Name</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
new file mode 100644
index 0000000000..8f5d082e6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -0,0 +1,78 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+global::System.Object __typeHelper = "/About";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            __o = Model.Name;
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
new file mode 100644
index 0000000000..c71b835bf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
@@ -0,0 +1,60 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (36:3,1 [41] RazorPagesWithRouteTemplate.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorCompiledItemMetadataAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (6:0,6 [8] RazorPagesWithRouteTemplate.cshtml) - "/About"
+                DirectiveToken - (25:2,7 [8] RazorPagesWithRouteTemplate.cshtml) - NewModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                HtmlContent - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
+                HtmlContent - (191:10,1 [21] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (191:10,1 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
+                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
+                CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
+                HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
+                    IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+            CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
+                IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
new file mode 100644
index 0000000000..cc5e9cad30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -0,0 +1,35 @@
+Source Location: (36:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (492:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (6:0,6 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|"/About"|
+Generated Location: (1108:25,37 [8] )
+|"/About"|
+
+Source Location: (25:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|NewModel|
+Generated Location: (1313:33,0 [8] )
+|NewModel|
+
+Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|Model.Name|
+Generated Location: (1841:48,18 [10] )
+|Model.Name|
+
+Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2049:55,12 [97] )
+|
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
new file mode 100644
index 0000000000..83f08818fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -0,0 +1,62 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "547900310554f446d88da593a245719ee9dbb12f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"547900310554f446d88da593a245719ee9dbb12f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n<h1>New Customer ");
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            Write(Model.Name);
+
+#line default
+#line hidden
+            WriteLiteral("</h1>\r\n");
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
new file mode 100644
index 0000000000..c8fbdea2cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -0,0 +1,41 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (36:3,1 [43] RazorPagesWithRouteTemplate.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorCompiledItemMetadataAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                HtmlContent - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
+                CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
+                HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
+                    IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+            CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
+                IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
new file mode 100644
index 0000000000..b78cc65ec7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
@@ -0,0 +1,36 @@
+@page
+
+@addTagHelper "*, AppCode"
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+}
+
+<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">@Name</label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..aeb2631c46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -0,0 +1,83 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+                                         __o = Name;
+
+#line default
+#line hidden
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+            
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..913b80d2aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
@@ -0,0 +1,143 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (38:3,1 [41] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (23:2,14 [12] RazorPagesWithoutModel.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (35:2,26 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (35:2,26 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (79:3,42 [4] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (79:3,42 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
+                HtmlContent - (379:18,1 [77] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (379:18,1 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
+                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (468:22,16 [11] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (468:22,16 [11] RazorPagesWithoutModel.cshtml) - Html - text-danger
+                    DefaultTagHelperExecute - 
+                HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                        CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                        HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (600:25,20 [9] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (600:25,20 [9] RazorPagesWithoutModel.cshtml) - Html - col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (505:23,16 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (505:23,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (782:31,20 [25] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (782:31,20 [25] RazorPagesWithoutModel.cshtml) - Html - col-md-offset-2 col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (748:30,16 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (748:30,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+            CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
+                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..33f7baa377
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -0,0 +1,46 @@
+Source Location: (38:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (487:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|"*, AppCode"|
+Generated Location: (1035:25,37 [12] )
+|"*, AppCode"|
+
+Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|Name|
+Generated Location: (1629:41,47 [4] )
+|Name|
+
+Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2110:52,12 [283] )
+|
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..2a42ce12f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -0,0 +1,166 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8bf3954ad78688478de155359db8af32627ee2b8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8bf3954ad78688478de155359db8af32627ee2b8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+                                         Write(Name);
+
+#line default
+#line hidden
+                WriteLiteral("</label>\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</form>\r\n");
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+            
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
new file mode 100644
index 0000000000..ea80083dd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -0,0 +1,117 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                        CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                        HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+            CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
+                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d7acbdf7d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -0,0 +1,94 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+                                         __o = Model.Name;
+
+#line default
+#line hidden
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
new file mode 100644
index 0000000000..2266b746f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
@@ -0,0 +1,144 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (55:4,1 [41] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (16:2,7 [8] RazorPages.cshtml) - NewModel
+                DirectiveToken - (40:3,14 [12] RazorPages.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (52:3,26 [2] RazorPages.cshtml)
+                    IntermediateToken - (52:3,26 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (96:4,42 [4] RazorPages.cshtml)
+                    IntermediateToken - (96:4,42 [4] RazorPages.cshtml) - Html - \n\n
+                HtmlContent - (473:22,1 [78] RazorPages.cshtml)
+                    IntermediateToken - (473:22,1 [4] RazorPages.cshtml) - Html - \n\n
+                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (563:26,16 [11] RazorPages.cshtml)
+                            IntermediateToken - (563:26,16 [11] RazorPages.cshtml) - Html - text-danger
+                    DefaultTagHelperExecute - 
+                HtmlContent - (582:26,35 [6] RazorPages.cshtml)
+                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (612:27,28 [48] RazorPages.cshtml)
+                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                        CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
+                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                        HtmlContent - (671:28,57 [18] RazorPages.cshtml)
+                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (712:29,31 [101] RazorPages.cshtml)
+                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (701:29,20 [9] RazorPages.cshtml)
+                                    IntermediateToken - (701:29,20 [9] RazorPages.cshtml) - Html - col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (819:32,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (600:27,16 [10] RazorPages.cshtml)
+                            IntermediateToken - (600:27,16 [10] RazorPages.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (831:33,10 [6] RazorPages.cshtml)
+                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (861:34,28 [10] RazorPages.cshtml)
+                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (910:35,47 [83] RazorPages.cshtml)
+                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (883:35,20 [25] RazorPages.cshtml)
+                                    IntermediateToken - (883:35,20 [25] RazorPages.cshtml) - Html - col-md-offset-2 col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (999:37,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (849:34,16 [10] RazorPages.cshtml)
+                            IntermediateToken - (849:34,16 [10] RazorPages.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
+                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+            CSharpCode - (112:6,12 [360] RazorPages.cshtml)
+                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
new file mode 100644
index 0000000000..0af8c77dfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -0,0 +1,57 @@
+Source Location: (55:4,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (475:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|NewModel|
+Generated Location: (962:25,0 [8] )
+|NewModel|
+
+Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|"*, AppCode"|
+Generated Location: (1220:33,37 [12] )
+|"*, AppCode"|
+
+Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|Model.Name|
+Generated Location: (1802:49,47 [10] )
+|Model.Name|
+
+Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2277:60,12 [360] )
+|
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
new file mode 100644
index 0000000000..8f9b84f114
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -0,0 +1,169 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d33caff161b646a61b273d7c544111395b652557"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d33caff161b646a61b273d7c544111395b652557", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\" >\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+                                         Write(Model.Name);
+
+#line default
+#line hidden
+                WriteLiteral("</label>\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</form>\r\n");
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
new file mode 100644
index 0000000000..8c352308a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -0,0 +1,117 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (98:5,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (475:23,0 [76] RazorPages.cshtml)
+                    IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (582:26,35 [6] RazorPages.cshtml)
+                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (612:27,28 [48] RazorPages.cshtml)
+                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                        CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
+                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                        HtmlContent - (671:28,57 [18] RazorPages.cshtml)
+                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (712:29,31 [101] RazorPages.cshtml)
+                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (819:32,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (831:33,10 [6] RazorPages.cshtml)
+                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (861:34,28 [10] RazorPages.cshtml)
+                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (910:35,47 [83] RazorPages.cshtml)
+                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (999:37,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
+                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+            CSharpCode - (112:6,12 [360] RazorPages.cshtml)
+                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
new file mode 100644
index 0000000000..7438788ff4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
@@ -0,0 +1,14 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+@{ 
+    Layout = "_SectionTestLayout.cshtml";
+}
+
+<div>Some body</div>
+
+@section Section1 {
+    <div>This is in Section 1</div>
+    <input-test for="Date" />
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3ca46af8a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -0,0 +1,80 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object Section1 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            DefineSection("Section1", async(__razor_section_writer) => {
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
new file mode 100644
index 0000000000..312d7bb7ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -0,0 +1,73 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] Sections.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] Sections.cshtml) - "InputTestTagHelper, AppCode"
+                DirectiveToken - (152:10,9 [8] Sections.cshtml) - Section1
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] Sections.cshtml)
+                    IntermediateToken - (62:2,43 [4] Sections.cshtml) - Html - \n\n
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                Section -  - Section1
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1cc991810c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|DateTime|
+Generated Location: (819:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1075:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Section1|
+Generated Location: (1305:36,22 [8] )
+|Section1|
+
+Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+Generated Location: (1771:51,2 [46] )
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+
+Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Date|
+Generated Location: (2196:59,102 [4] )
+|Date|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
new file mode 100644
index 0000000000..9e809e0db5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -0,0 +1,87 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4b7b87da15db4343c99430c0813fd6bc03643453"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4b7b87da15db4343c99430c0813fd6bc03643453", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            WriteLiteral("\r\n<div>Some body</div>\r\n\r\n");
+            DefineSection("Section1", async() => {
+                WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+                __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+                __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
new file mode 100644
index 0000000000..1309bc9423
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -0,0 +1,53 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (64:3,0 [2] Sections.cshtml)
+                    IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                Section -  - Section1
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
new file mode 100644
index 0000000000..ed2648a986
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
@@ -0,0 +1,4 @@
+@using System.ComponentModel
+@using System.Collections
+@using System
+@using System
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ad57e4a82b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.ComponentModel;
+
+#line default
+#line hidden
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.Collections;
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..0163b00a81
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [27] UsingDirectives.cshtml) - System.ComponentModel
+        UsingDirective - (31:1,1 [24] UsingDirectives.cshtml) - System.Collections
+        UsingDirective - (58:2,1 [12] UsingDirectives.cshtml) - System
+        UsingDirective - (73:3,1 [12] UsingDirectives.cshtml) - System
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (28:0,28 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (28:0,28 [2] UsingDirectives.cshtml) - Html - \n
+                HtmlContent - (55:1,25 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (55:1,25 [2] UsingDirectives.cshtml) - Html - \n
+                HtmlContent - (70:2,13 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (70:2,13 [2] UsingDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..71a6bf2b2d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (1:0,1 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System.ComponentModel|
+Generated Location: (461:13,0 [27] )
+|using System.ComponentModel|
+
+Source Location: (31:1,1 [24] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System.Collections|
+Generated Location: (613:18,0 [24] )
+|using System.Collections|
+
+Source Location: (58:2,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System|
+Generated Location: (762:23,0 [12] )
+|using System|
+
+Source Location: (73:3,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System|
+Generated Location: (899:28,0 [12] )
+|using System|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..1310cb0d8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
@@ -0,0 +1,55 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "452979e8e4dd77a84a4c50425dd3a162e265990d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
+namespace AspNetCore
+{
+    #line hidden
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.ComponentModel;
+
+#line default
+#line hidden
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.Collections;
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"452979e8e4dd77a84a4c50425dd3a162e265990d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..c3b71e0393
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [29] UsingDirectives.cshtml) - System.ComponentModel
+        UsingDirective - (31:1,1 [26] UsingDirectives.cshtml) - System.Collections
+        UsingDirective - (58:2,1 [14] UsingDirectives.cshtml) - System
+        UsingDirective - (73:3,1 [12] UsingDirectives.cshtml) - System
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
new file mode 100644
index 0000000000..0430ccfc69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
@@ -0,0 +1,6 @@
+@addTagHelper "*, AppCode"
+@{
+    var foo = "Hello";
+}
+
+<vc:test first-name="@foo" bar=" World"></vc:test>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..b6196f6651
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,84 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AllTagHelper __AllTagHelper;
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+                __o = foo;
+
+#line default
+#line hidden
+            __TestViewComponentTagHelper.firstName = string.Empty;
+            __AllTagHelper.Bar = " World";
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..8e7497e7d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
@@ -0,0 +1,59 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (14:0,14 [12] ViewComponentTagHelper.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (26:0,26 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    DefaultTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - bar - string AllTagHelper.Bar - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (93:5,32 [6] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (93:5,32 [6] ViewComponentTagHelper.cshtml) - Html -  World
+                    DefaultTagHelperExecute - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9c5fd32efb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|"*, AppCode"|
+Generated Location: (1057:21,37 [12] )
+|"*, AppCode"|
+
+Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|
+    var foo = "Hello";
+|
+Generated Location: (1534:36,2 [26] )
+|
+    var foo = "Hello";
+|
+
+Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|foo|
+Generated Location: (1985:44,22 [3] )
+|foo|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..f654e3766e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -0,0 +1,108 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "bf860c3a5e96240c9d41a0b950e49c1a165ca44d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"bf860c3a5e96240c9d41a0b950e49c1a165ca44d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::AllTagHelper __AllTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __tagHelperExecutionContext.Add(__AllTagHelper);
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+            __tagHelperExecutionContext.Add(__TestViewComponentTagHelper);
+            BeginWriteTagHelperAttribute();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+         WriteLiteral(foo);
+
+#line default
+#line hidden
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestViewComponentTagHelper.firstName = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("first-name", __TestViewComponentTagHelper.firstName, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __AllTagHelper.Bar = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..c69014763c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - bar -  World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
+                    DefaultTagHelperExecute - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
new file mode 100644
index 0000000000..eaf33e48ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
@@ -0,0 +1,2 @@
+@namespace Test.Namespace
+<h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
new file mode 100644
index 0000000000..209d3361f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test.Namespace
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml"
+global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
new file mode 100644
index 0000000000..42d53bcd1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (11:0,11 [14] ViewWithNamespace.cshtml) - Test.Namespace
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
+                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
new file mode 100644
index 0000000000..2b7a295e01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml)
+|Test.Namespace|
+Generated Location: (818:19,44 [14] )
+|Test.Namespace|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
new file mode 100644
index 0000000000..ef6c311053
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
@@ -0,0 +1,37 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "471b74bb73c8ae8e0ed24c654340198b9b4a1ec8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
+namespace Test.Namespace
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"471b74bb73c8ae8e0ed24c654340198b9b4a1ec8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<h1>Hi There!</h1>\r\n");
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
new file mode 100644
index 0000000000..17f6801a03
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
+                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
new file mode 100644
index 0000000000..f4e110d289
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
@@ -0,0 +1 @@
+@inject IHtmlHelper<TModel> Helper
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1f60d924cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+global::System.Object Helper = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..b677049ce1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [19] _ViewImports.cshtml) - IHtmlHelper<TModel>
+                DirectiveToken - (28:0,28 [6] _ViewImports.cshtml) - Helper
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..dc03ca32da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|IHtmlHelper<TModel>|
+Generated Location: (760:19,0 [19] )
+|IHtmlHelper<TModel>|
+
+Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|Helper|
+Generated Location: (1027:27,22 [6] )
+|Helper|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..346428fa0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "74c90591b68437a0868e91dc714ea9827ab8e03a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"74c90591b68437a0868e91dc714ea9827ab8e03a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..addc2754ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs
new file mode 100644
index 0000000000..d44f0169a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -0,0 +1,485 @@
+// 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.Collections.Generic;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ViewComponentTagHelperDescriptorFactoryTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTagHelperDescriptorFactoryTest).GetTypeInfo().Assembly;
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsStringParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsVariousParameterTypes()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__VariousParameterViewComponentTagHelper",
+                typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__VariousParameterViewComponentTagHelper")
+                .DisplayName("VariousParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:various-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-enum"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-string"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("baz")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-enum")
+                    .PropertyName("testEnum")
+                    .TypeName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum))
+                    .AsEnum()
+                    .DisplayName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum) + " VariousParameterViewComponentTagHelper.testEnum"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-string")
+                    .PropertyName("testString")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string VariousParameterViewComponentTagHelper.testString"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("baz")
+                    .PropertyName("baz")
+                    .TypeName(typeof(int).FullName)
+                    .DisplayName("int VariousParameterViewComponentTagHelper.baz"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "VariousParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsGenericParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__GenericParameterViewComponentTagHelper",
+                typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__GenericParameterViewComponentTagHelper")
+                .DisplayName("GenericParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:generic-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("Foo")
+                    .TypeName("System.Collections.Generic.List<System.String>")
+                    .DisplayName("System.Collections.Generic.List<System.String> GenericParameterViewComponentTagHelper.Foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("Bar")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .AsDictionaryAttribute("bar-", typeof(int).FullName)
+                    .DisplayName("System.Collections.Generic.Dictionary<System.String, System.Int32> GenericParameterViewComponentTagHelper.Bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "GenericParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForSyncViewComponentWithInvokeInBaseType_Works()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__SyncDerivedViewComponentTagHelper",
+                typeof(SyncDerivedViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__SyncDerivedViewComponentTagHelper")
+                .DisplayName("SyncDerivedViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:sync-derived")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string SyncDerivedViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string SyncDerivedViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "SyncDerived")
+                .Build();
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncDerivedViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForAsyncViewComponentWithInvokeInBaseType_Works()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__AsyncDerivedViewComponentTagHelper",
+                typeof(AsyncDerivedViewComponent).Assembly.GetName().Name)
+                .TypeName("__Generated__AsyncDerivedViewComponentTagHelper")
+                .DisplayName("AsyncDerivedViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("vc:async-derived"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "AsyncDerived")
+                .Build();
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncDerivedViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(ViewComponentWithoutInvokeMethod).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInstanceInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StaticInvokeAsyncViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoPublicInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(NonPublicInvokeAsyncViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandString()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithVoid).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_ShouldReturnValue.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponent_WithAmbiguousMethods()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(DerivedViewComponentWithAmbiguity).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AmbiguousMethods.Id, diagnostic.Id);
+        }
+    }
+
+    public class StringParameterViewComponent
+    {
+        public string Invoke(string foo, string bar) => null;
+    }
+
+    public class VariousParameterViewComponent
+    {
+        public string Invoke(TestEnum testEnum, string testString, int baz = 5) => null;
+
+        public enum TestEnum
+        {
+            A = 1,
+            B = 2,
+            C = 3
+        }
+    }
+
+    public class GenericParameterViewComponent
+    {
+        public string Invoke(List<string> Foo, Dictionary<string, int> Bar) => null;
+    }
+
+    public class ViewComponentWithoutInvokeMethod
+    {
+    }
+
+    public class AsyncViewComponentWithGenericTask
+    {
+        public Task<string> InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithNonGenericTask
+    {
+        public Task InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithVoid
+    {
+        public void InvokeAsync() { }
+    }
+
+    public class AsyncViewComponentWithString
+    {
+        public string InvokeAsync() => null;
+    }
+
+    public class SyncViewComponentWithVoid
+    {
+        public void Invoke() { }
+    }
+
+    public class SyncViewComponentWithNonGenericTask
+    {
+        public Task Invoke() => null;
+    }
+
+    public class SyncViewComponentWithGenericTask
+    {
+        public Task<string> Invoke() => null;
+    }
+
+    public class SyncDerivedViewComponent : StringParameterViewComponent
+    {
+    }
+
+    public class AsyncDerivedViewComponent : AsyncViewComponentWithNonGenericTask
+    {
+    }
+
+    public class DerivedViewComponentWithAmbiguity : AsyncViewComponentWithNonGenericTask
+    {
+        public string Invoke() => null;
+    }
+
+    public class StaticInvokeAsyncViewComponent
+    {
+        public static Task<string> InvokeAsync() => null;
+    }
+
+    public class NonPublicInvokeAsyncViewComponent
+    {
+        protected Task<string> InvokeAsync() => null;
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..16fb3096dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,72 @@
+// 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.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    // This is just a basic integration test. There are detailed tests for the VCTH visitor and descriptor factory.
+    public class ViewComponentTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void DescriptorProvider_FindsVCTH()
+        {
+            // Arrange
+            var code = @"
+        public class StringParameterViewComponent
+        {
+            public string Invoke(string foo, string bar) => null;
+        }
+";
+
+            var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ViewComponentTagHelperDescriptorProvider()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                TestCompilation.AssemblyName)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperPassTest.cs
new file mode 100644
index 0000000000..02039ced8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperPassTest.cs
@@ -0,0 +1,275 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ViewComponentTagHelperPassTest
+    {
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_IgnoresRegularTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .TypeName("TestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(3, @class.Children.Count); // No class node created for a VCTH
+            for (var i = 0; i < @class.Children.Count; i++)
+            {
+                Assert.IsNotType<ViewComponentTagHelperIntermediateNode>(@class.Children[i]);
+            }
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32")
+                        .PropertyName("Foo"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud tag-foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                        .PropertyName("Tags")
+                        .AsDictionaryAttribute("foo-", "System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[2]);
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children[3]);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_Nested()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper *, TestAssembly
+<p foo=""17""><tagcloud foo=""17""></p>");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly")
+                    .TypeName("PTestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var outerTagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal("PTestTagHelper", Assert.IsType<DefaultTagHelperCreateIntermediateNode>(outerTagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(outerTagHelper.Children[2]).PropertyName);
+
+            var vcth = FindTagHelperNode(outerTagHelper.Children[0]);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(vcth.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(vcth.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(5, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorProjectEngine CreateProjectEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new MvcViewDocumentClassifierPass());
+
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            });
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // We also expect the default tag helper pass to run first.
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+
+            var defaultTagHelperPass = projectEngine.EngineFeatures.OfType<DefaultTagHelperOptimizationPass>().Single();
+            defaultTagHelperPass.Execute(codeDocument, documentNode);
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassDeclarationNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private class ClassDeclarationNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
new file mode 100644
index 0000000000..b841a93583
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
@@ -0,0 +1,120 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ViewComponentTagHelperTargetExtensionTest
+    {
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Int32")
+                    .PropertyName("Foo"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Int32 Foo { get; set; }
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .PropertyName("Tags")
+                    .AsDictionaryAttribute("foo-", "System.Int32"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }
+     = new System.Collections.Generic.Dictionary<System.String, System.Int32>();
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs
new file mode 100644
index 0000000000..48e8cfeec8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs
@@ -0,0 +1,202 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+{
+    public class ViewComponentTypeVisitorTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly;
+
+        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+
+        // In practice MVC will provide a marker attribute for ViewComponents. To prevent a circular reference between MVC and Razor
+        // we can use a test class as a marker.
+        private static INamedTypeSymbol TestViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestViewComponentAttribute).FullName);
+        private static INamedTypeSymbol TestNonViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestNonViewComponentAttribute).FullName);
+
+        [Fact]
+        public void IsViewComponent_PlainViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_PlainViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_DecoratedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_InheritedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_AbstractViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_AbstractViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_GenericViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_GenericViewComponent<>).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InternalViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InternalViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_DecoratedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InheritedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        public abstract class Invalid_AbstractViewComponent
+        {
+        }
+
+        public class Invalid_GenericViewComponent<T>
+        {
+        }
+
+        internal class Invalid_InternalViewComponent
+        {
+        }
+
+        public class Valid_PlainViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Valid_DecoratedVC
+        {
+        }
+
+        public class Valid_InheritedVC : Valid_DecoratedVC
+        {
+        }
+
+        [TestNonViewComponent]
+        public class Invalid_DecoratedViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Invalid_InheritedViewComponent : Invalid_DecoratedViewComponent
+        {
+        }
+
+        public class TestViewComponentAttribute : Attribute
+        {
+        }
+
+        public class TestNonViewComponentAttribute : Attribute
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/xunit.runner.json b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/xunit.runner.json
new file mode 100644
index 0000000000..fcf172c8fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptor.cs
new file mode 100644
index 0000000000..84a83b3e8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptor.cs
@@ -0,0 +1,48 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class AllowedChildTagDescriptor : IEquatable<AllowedChildTagDescriptor>
+    {
+        public string Name { get; protected set; }
+
+        public string DisplayName { get; protected set; }
+
+        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                var errors = Diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+
+                return errors;
+            }
+        }
+
+        public override string ToString()
+        {
+            return DisplayName ?? base.ToString();
+        }
+
+        public bool Equals(AllowedChildTagDescriptor other)
+        {
+            return AllowedChildTagDescriptorComparer.Default.Equals(this, other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as AllowedChildTagDescriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            return AllowedChildTagDescriptorComparer.Default.GetHashCode(this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorBuilder.cs
new file mode 100644
index 0000000000..46fc3cc6aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorBuilder.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class AllowedChildTagDescriptorBuilder
+    {
+        public abstract string Name { get; set; }
+
+        public abstract string DisplayName { get; set; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+        
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs
new file mode 100644
index 0000000000..37f0a55417
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class AllowedChildTagDescriptorComparer : IEqualityComparer<AllowedChildTagDescriptor>
+    {
+        /// <summary>
+        /// A default instance of the <see cref="AllowedChildTagDescriptorComparer"/>.
+        /// </summary>
+        public static readonly AllowedChildTagDescriptorComparer Default =
+            new AllowedChildTagDescriptorComparer();
+
+        /// <summary>
+        /// A default instance of the <see cref="AllowedChildTagDescriptorComparer"/> that does case-sensitive comparison.
+        /// </summary>
+        internal static readonly AllowedChildTagDescriptorComparer CaseSensitive =
+            new AllowedChildTagDescriptorComparer(caseSensitive: true);
+
+        private readonly StringComparer _stringComparer;
+        private readonly StringComparison _stringComparison;
+
+        private AllowedChildTagDescriptorComparer(bool caseSensitive = false)
+        {
+            if (caseSensitive)
+            {
+                _stringComparer = StringComparer.Ordinal;
+                _stringComparison = StringComparison.Ordinal;
+            }
+            else
+            {
+                _stringComparer = StringComparer.OrdinalIgnoreCase;
+                _stringComparison = StringComparison.OrdinalIgnoreCase;
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual bool Equals(
+            AllowedChildTagDescriptor descriptorX,
+            AllowedChildTagDescriptor descriptorY)
+        {
+            if (object.ReferenceEquals(descriptorX, descriptorY))
+            {
+                return true;
+            }
+
+            if (descriptorX == null ^ descriptorY == null)
+            {
+                return false;
+            }
+
+            return
+                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal);
+        }
+
+        /// <inheritdoc />
+        public virtual int GetHashCode(AllowedChildTagDescriptor descriptor)
+        {
+            var hash = HashCodeCombiner.Start();
+            hash.Add(descriptor.Name, _stringComparer);
+
+            return hash.CombinedHash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AssemblyExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AssemblyExtension.cs
new file mode 100644
index 0000000000..97f1c31c15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AssemblyExtension.cs
@@ -0,0 +1,55 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class AssemblyExtension : RazorExtension
+    {
+        public AssemblyExtension(string extensionName, Assembly assembly)
+        {
+            if (extensionName == null)
+            {
+                throw new ArgumentNullException(nameof(extensionName));
+            }
+
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            ExtensionName = extensionName;
+            Assembly = assembly;
+        }
+
+        public override string ExtensionName { get; }
+
+        public Assembly Assembly { get; }
+
+        internal RazorExtensionInitializer CreateInitializer()
+        {
+            // It's not an error to have an assembly with no initializers. This is useful to specify a dependency
+            // that doesn't really provide any Razor configuration.
+            var attributes = Assembly.GetCustomAttributes<ProvideRazorExtensionInitializerAttribute>();
+            foreach (var attribute in attributes)
+            {
+                // Using extension names and requiring them to line up allows a single assembly to ship multiple
+                // extensions/initializers for different configurations.
+                if (!string.Equals(attribute.ExtensionName, ExtensionName, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                // There's no real protection/exception handling here because this set isn't really user-extensible
+                // right now. This would be a great place to add some additional diagnostics and hardening in the
+                // future.
+                var initializer = (RazorExtensionInitializer)Activator.CreateInstance(attribute.InitializerType);
+                return initializer;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AttributeStructure.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AttributeStructure.cs
new file mode 100644
index 0000000000..9a191578c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AttributeStructure.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // This is the design time equivalent of Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.
+    // They should be kept in sync.
+    public enum AttributeStructure
+    {
+        DoubleQuotes,
+        SingleQuotes,
+        NoQuotes,
+        Minimized,
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
new file mode 100644
index 0000000000..b416fddd61
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
@@ -0,0 +1,80 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// A metadata class describing a tag helper attribute.
+    /// </summary>
+    public abstract class BoundAttributeDescriptor : IEquatable<BoundAttributeDescriptor>
+    {
+        protected BoundAttributeDescriptor(string kind)
+        {
+            Kind = kind;
+        }
+
+        public string Kind { get; }
+
+        public bool IsIndexerStringProperty { get; protected set; }
+
+        public bool IsIndexerBooleanProperty { get; protected set; }
+
+        public bool IsEnum { get; protected set; }
+
+        public bool IsStringProperty { get; protected set; }
+
+        public bool IsBooleanProperty { get; protected set; }
+
+        public string Name { get; protected set; }
+
+        public string IndexerNamePrefix { get; protected set; }
+
+        public string TypeName { get; protected set; }
+
+        public string IndexerTypeName { get; protected set; }
+
+        public bool HasIndexer { get; protected set; }
+
+        public string Documentation { get; protected set; }
+
+        public string DisplayName { get; protected set; }
+
+        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
+
+        public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                var errors = Diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+
+                return errors;
+            }
+        }
+
+        public override string ToString()
+        {
+            return DisplayName ?? base.ToString();
+        }
+
+        public bool Equals(BoundAttributeDescriptor other)
+        {
+            return BoundAttributeDescriptorComparer.Default.Equals(this, other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as BoundAttributeDescriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            return BoundAttributeDescriptorComparer.Default.GetHashCode(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs
new file mode 100644
index 0000000000..b2cbfba675
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class BoundAttributeDescriptorBuilder
+    {
+        public abstract string Name { get; set; }
+
+        public abstract string TypeName { get; set; }
+
+        public abstract bool IsEnum { get; set; }
+
+        public abstract bool IsDictionary { get; set; }
+
+        public abstract string IndexerAttributeNamePrefix { get; set; }
+
+        public abstract string IndexerValueTypeName { get; set; }
+
+        public abstract string Documentation { get; set; }
+
+        public abstract string DisplayName { get; set; }
+
+        public abstract IDictionary<string, string> Metadata { get; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..8d1ab038ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class BoundAttributeDescriptorBuilderExtensions
+    {
+        public static void SetPropertyName(this BoundAttributeDescriptorBuilder builder, string propertyName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (propertyName == null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            builder.Metadata[TagHelperMetadata.Common.PropertyName] = propertyName;
+        }
+
+        public static string GetPropertyName(this BoundAttributeDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (builder.Metadata.ContainsKey(TagHelperMetadata.Common.PropertyName))
+            {
+                return builder.Metadata[TagHelperMetadata.Common.PropertyName];
+            }
+
+            return null;
+        }
+
+        public static void AsDictionary(
+            this BoundAttributeDescriptorBuilder builder,
+            string attributeNamePrefix,
+            string valueTypeName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.IsDictionary = true;
+            builder.IndexerAttributeNamePrefix = attributeNamePrefix;
+            builder.IndexerValueTypeName = valueTypeName;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs
new file mode 100644
index 0000000000..fbf68929eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs
@@ -0,0 +1,83 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class BoundAttributeDescriptorComparer : IEqualityComparer<BoundAttributeDescriptor>
+    {
+        /// <summary>
+        /// A default instance of the <see cref="BoundAttributeDescriptorComparer"/>.
+        /// </summary>
+        public static readonly BoundAttributeDescriptorComparer Default = new BoundAttributeDescriptorComparer();
+
+        /// <summary>
+        /// A default instance of the <see cref="BoundAttributeDescriptorComparer"/> that does case-sensitive comparison.
+        /// </summary>
+        internal static readonly BoundAttributeDescriptorComparer CaseSensitive =
+            new BoundAttributeDescriptorComparer(caseSensitive: true);
+
+        private readonly StringComparer _stringComparer;
+        private readonly StringComparison _stringComparison;
+
+        private BoundAttributeDescriptorComparer(bool caseSensitive = false)
+        {
+            if (caseSensitive)
+            {
+                _stringComparer = StringComparer.Ordinal;
+                _stringComparison = StringComparison.Ordinal;
+            }
+            else
+            {
+                _stringComparer = StringComparer.OrdinalIgnoreCase;
+                _stringComparison = StringComparison.OrdinalIgnoreCase;
+            }
+        }
+
+        public virtual bool Equals(BoundAttributeDescriptor descriptorX, BoundAttributeDescriptor descriptorY)
+        {
+            if (object.ReferenceEquals(descriptorX, descriptorY))
+            {
+                return true;
+            }
+
+            if (descriptorX == null ^ descriptorY == null)
+            {
+                return false;
+            }
+
+            return
+                string.Equals(descriptorX.Kind, descriptorY.Kind, StringComparison.Ordinal) &&
+                descriptorX.IsIndexerStringProperty == descriptorY.IsIndexerStringProperty &&
+                descriptorX.IsEnum == descriptorY.IsEnum &&
+                descriptorX.HasIndexer == descriptorY.HasIndexer &&
+                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.IndexerNamePrefix, descriptorY.IndexerNamePrefix, _stringComparison) &&
+                string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.IndexerTypeName, descriptorY.IndexerTypeName, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.Documentation, descriptorY.Documentation, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal) &&
+                Enumerable.SequenceEqual(
+                    descriptorX.Metadata.OrderBy(propertyX => propertyX.Key, StringComparer.Ordinal),
+                    descriptorY.Metadata.OrderBy(propertyY => propertyY.Key, StringComparer.Ordinal));
+        }
+
+        public virtual int GetHashCode(BoundAttributeDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var hash = HashCodeCombiner.Start();
+            hash.Add(descriptor.Kind);
+            hash.Add(descriptor.Name, _stringComparer);
+
+            return hash.CombinedHash;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
new file mode 100644
index 0000000000..62b713a8fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class BoundAttributeDescriptorExtensions
+    {
+        public static string GetPropertyName(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            attribute.Metadata.TryGetValue(TagHelperMetadata.Common.PropertyName, out var propertyName);
+            return propertyName;
+        }
+
+        public static bool IsDefaultKind(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return string.Equals(attribute.Kind, TagHelperConventions.DefaultKind, StringComparison.Ordinal);
+        }
+
+        internal static bool ExpectsStringValue(this BoundAttributeDescriptor attribute, string name)
+        {
+            if (attribute.IsStringProperty)
+            {
+                return true;
+            }
+
+            var isIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(name, attribute);
+            return isIndexerNameMatch && attribute.IsIndexerStringProperty;
+        }
+
+        internal static bool ExpectsBooleanValue(this BoundAttributeDescriptor attribute, string name)
+        {
+            if (attribute.IsBooleanProperty)
+            {
+                return true;
+            }
+
+            var isIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(name, attribute);
+            return isIndexerNameMatch && attribute.IsIndexerBooleanProperty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs
new file mode 100644
index 0000000000..1ec6188aed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs
@@ -0,0 +1,53 @@
+// 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.Globalization;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal static class CSharpIdentifier
+    {
+        // CSharp Spec §2.4.2
+        private static bool IsIdentifierStart(char character)
+        {
+            return char.IsLetter(character) ||
+                character == '_' ||
+                CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
+        }
+
+        public static bool IsIdentifierPart(char character)
+        {
+            return char.IsDigit(character) ||
+                   IsIdentifierStart(character) ||
+                   IsIdentifierPartByUnicodeCategory(character);
+        }
+
+        private static bool IsIdentifierPartByUnicodeCategory(char character)
+        {
+            var category = CharUnicodeInfo.GetUnicodeCategory(character);
+
+            return category == UnicodeCategory.NonSpacingMark || // Mn
+                category == UnicodeCategory.SpacingCombiningMark || // Mc
+                category == UnicodeCategory.ConnectorPunctuation || // Pc
+                category == UnicodeCategory.Format; // Cf
+        }
+
+        public static string SanitizeIdentifier(string inputName)
+        {
+            if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
+            {
+                inputName = "_" + inputName;
+            }
+
+            var builder = new StringBuilder(inputName.Length);
+            for (var i = 0; i < inputName.Length; i++)
+            {
+                var ch = inputName[i];
+                builder.Append(IsIdentifierPart(ch) ? ch : '_');
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Checksum.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Checksum.cs
new file mode 100644
index 0000000000..57834739e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Checksum.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal static class Checksum
+    {
+        public static string BytesToString(byte[] bytes)
+        {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException(nameof(bytes));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
new file mode 100644
index 0000000000..ec0e7977d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -0,0 +1,312 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class ClassifiedSpanVisitor : SyntaxWalker
+    {
+        private RazorSourceDocument _source;
+        private List<ClassifiedSpanInternal> _spans;
+        private BlockKindInternal _currentBlockKind;
+        private SyntaxNode _currentBlock;
+
+        public ClassifiedSpanVisitor(RazorSourceDocument source)
+        {
+            _source = source;
+            _spans = new List<ClassifiedSpanInternal>();
+            _currentBlockKind = BlockKindInternal.Markup;
+        }
+
+        public IReadOnlyList<ClassifiedSpanInternal> ClassifiedSpans => _spans;
+
+        public override void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Comment, razorCommentSyntax =>
+            {
+                WriteSpan(razorCommentSyntax.StartCommentTransition, SpanKindInternal.Transition, AcceptedCharactersInternal.None);
+                WriteSpan(razorCommentSyntax.StartCommentStar, SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
+
+                var comment = razorCommentSyntax.Comment;
+                if (comment.IsMissing)
+                {
+                    // We need to generate a classified span at this position. So insert a marker in its place.
+                    comment = (SyntaxToken)SyntaxFactory.Token(SyntaxKind.Marker, string.Empty).Green.CreateRed(razorCommentSyntax, razorCommentSyntax.StartCommentStar.EndPosition);
+                }
+                WriteSpan(comment, SpanKindInternal.Comment, AcceptedCharactersInternal.Any);
+
+                WriteSpan(razorCommentSyntax.EndCommentStar, SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
+                WriteSpan(razorCommentSyntax.EndCommentTransition, SpanKindInternal.Transition, AcceptedCharactersInternal.None);
+            });
+        }
+
+        public override void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+        {
+            if (node.Parent is CSharpStatementBodySyntax ||
+                node.Parent is CSharpExplicitExpressionBodySyntax ||
+                node.Parent is CSharpImplicitExpressionBodySyntax ||
+                node.Parent is RazorDirectiveBodySyntax ||
+                (_currentBlockKind == BlockKindInternal.Directive &&
+                node.Children.Count == 1 &&
+                node.Children[0] is CSharpStatementLiteralSyntax))
+            {
+                base.VisitCSharpCodeBlock(node);
+                return;
+            }
+
+            WriteBlock(node, BlockKindInternal.Statement, base.VisitCSharpCodeBlock);
+        }
+
+        public override void VisitCSharpStatement(CSharpStatementSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Statement, base.VisitCSharpStatement);
+        }
+
+        public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Expression, base.VisitCSharpExplicitExpression);
+        }
+
+        public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Expression, base.VisitCSharpImplicitExpression);
+        }
+
+        public override void VisitRazorDirective(RazorDirectiveSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Directive, base.VisitRazorDirective);
+        }
+
+        public override void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Template, base.VisitCSharpTemplateBlock);
+        }
+
+        public override void VisitMarkupBlock(MarkupBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, base.VisitMarkupBlock);
+        }
+
+        public override void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+        {
+            // We don't generate a classified span when the attribute value is a simple literal value.
+            // This is done so we maintain the classified spans generated in 2.x which
+            // used ConditionalAttributeCollapser (combines markup literal attribute values into one span with no block parent).
+            if (node.Children.Count > 1 ||
+                (node.Children.Count == 1 && node.Children[0] is MarkupDynamicAttributeValueSyntax))
+            {
+                WriteBlock(node, BlockKindInternal.Markup, base.VisitMarkupTagHelperAttributeValue);
+                return;
+            }
+
+            base.VisitMarkupTagHelperAttributeValue(node);
+        }
+
+        public override void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupTagBlock);
+        }
+
+        public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupTagHelperElement);
+        }
+
+        public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+        {
+            foreach (var child in node.Children)
+            {
+                if (child is MarkupTagHelperAttributeSyntax attribute)
+                {
+                    Visit(attribute);
+                }
+            }
+        }
+
+        public override void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+        {
+            // We don't want to generate a classified span for a tag helper end tag. Do nothing.
+        }
+
+        public override void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, n =>
+            {
+                var equalsSyntax = SyntaxFactory.MarkupTextLiteral(new SyntaxList<SyntaxToken>(node.EqualsToken));
+                var mergedAttributePrefix = MergeTextLiteralSpans(node.NamePrefix, node.Name, node.NameSuffix, equalsSyntax, node.ValuePrefix);
+                Visit(mergedAttributePrefix);
+                Visit(node.Value);
+                Visit(node.ValueSuffix);
+            });
+        }
+
+        public override void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+        {
+            Visit(node.Value);
+        }
+
+        public override void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, n =>
+            {
+                var mergedAttributePrefix = MergeTextLiteralSpans(node.NamePrefix, node.Name);
+                Visit(mergedAttributePrefix);
+            });
+        }
+
+        public override void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.HtmlComment, base.VisitMarkupCommentBlock);
+        }
+
+        public override void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, base.VisitMarkupDynamicAttributeValue);
+        }
+
+        public override void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.MetaCode);
+            base.VisitRazorMetaCode(node);
+        }
+
+        public override void VisitCSharpTransition(CSharpTransitionSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Transition);
+            base.VisitCSharpTransition(node);
+        }
+
+        public override void VisitMarkupTransition(MarkupTransitionSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Transition);
+            base.VisitMarkupTransition(node);
+        }
+
+        public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Code);
+            base.VisitCSharpStatementLiteral(node);
+        }
+
+        public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Code);
+            base.VisitCSharpExpressionLiteral(node);
+        }
+
+        public override void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Code);
+            base.VisitCSharpEphemeralTextLiteral(node);
+        }
+
+        public override void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.None);
+            base.VisitUnclassifiedTextLiteral(node);
+        }
+
+        public override void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Markup);
+            base.VisitMarkupLiteralAttributeValue(node);
+        }
+
+        public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+        {
+            if (node.Parent is MarkupLiteralAttributeValueSyntax)
+            {
+                base.VisitMarkupTextLiteral(node);
+                return;
+            }
+
+            WriteSpan(node, SpanKindInternal.Markup);
+            base.VisitMarkupTextLiteral(node);
+        }
+
+        public override void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Markup);
+            base.VisitMarkupEphemeralTextLiteral(node);
+        }
+
+        private void WriteBlock<TNode>(TNode node, BlockKindInternal kind, Action<TNode> handler) where TNode : SyntaxNode
+        {
+            var previousBlock = _currentBlock;
+            var previousKind = _currentBlockKind;
+
+            _currentBlock = node;
+            _currentBlockKind = kind;
+
+            handler(node);
+
+            _currentBlock = previousBlock;
+            _currentBlockKind = previousKind;
+        }
+
+        private void WriteSpan(SyntaxNode node, SpanKindInternal kind, AcceptedCharactersInternal? acceptedCharacters = null)
+        {
+            if (node.IsMissing)
+            {
+                return;
+            }
+
+            var spanSource = node.GetSourceSpan(_source);
+            var blockSource = _currentBlock.GetSourceSpan(_source);
+            if (!acceptedCharacters.HasValue)
+            {
+                acceptedCharacters = AcceptedCharactersInternal.Any;
+                var context = node.GetSpanContext();
+                if (context != null)
+                {
+                    acceptedCharacters = context.EditHandler.AcceptedCharacters;
+                }
+            }
+
+            var span = new ClassifiedSpanInternal(spanSource, blockSource, kind, _currentBlockKind, acceptedCharacters.Value);
+            _spans.Add(span);
+        }
+
+        private MarkupTextLiteralSyntax MergeTextLiteralSpans(params MarkupTextLiteralSyntax[] literalSyntaxes)
+        {
+            if (literalSyntaxes == null || literalSyntaxes.Length == 0)
+            {
+                return null;
+            }
+
+            SyntaxNode parent = null;
+            var position = 0;
+            var seenFirstLiteral = false;
+            var builder = Syntax.InternalSyntax.SyntaxListBuilder.Create();
+
+            foreach (var syntax in literalSyntaxes)
+            {
+                if (syntax == null)
+                {
+                    continue;
+                }
+                else if (!seenFirstLiteral)
+                {
+                    // Set the parent and position of the merged literal to the value of the first non-null literal.
+                    parent = syntax.Parent;
+                    position = syntax.Position;
+                    seenFirstLiteral = true;
+                }
+
+                foreach (var token in syntax.LiteralTokens)
+                {
+                    builder.Add(token.Green);
+                }
+            }
+
+            var mergedLiteralSyntax = Syntax.InternalSyntax.SyntaxFactory.MarkupTextLiteral(
+                builder.ToList<Syntax.InternalSyntax.SyntaxToken>());
+
+            return (MarkupTextLiteralSyntax)mergedLiteralSyntax.CreateRed(parent, position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs
new file mode 100644
index 0000000000..f726e2ad4b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public abstract class CodeRenderingContext
+    {
+        internal static readonly object NewLineString = "NewLineString";
+
+        internal static readonly object SuppressUniqueIds = "SuppressUniqueIds";
+
+        public abstract IEnumerable<IntermediateNode> Ancestors { get; }
+
+        public abstract CodeWriter CodeWriter { get; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+
+        public abstract string DocumentKind { get; }
+
+        public abstract ItemCollection Items { get; }
+
+        public abstract IntermediateNodeWriter NodeWriter { get; }
+
+        public abstract RazorCodeGenerationOptions Options { get; }
+
+        public abstract IntermediateNode Parent { get; }
+
+        public abstract RazorSourceDocument SourceDocument { get; }
+
+        public abstract void AddSourceMappingFor(IntermediateNode node);
+
+        public abstract void RenderNode(IntermediateNode node);
+
+        public abstract void RenderNode(IntermediateNode node, IntermediateNodeWriter writer);
+
+        public abstract void RenderChildren(IntermediateNode node);
+
+        public abstract void RenderChildren(IntermediateNode node, IntermediateNodeWriter writer);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTarget.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTarget.cs
new file mode 100644
index 0000000000..ba8ba8b48c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTarget.cs
@@ -0,0 +1,95 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public abstract class CodeTarget
+    {
+        public static CodeTarget CreateDefault(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            return CreateDefault(codeDocument, options, configure: null);
+        }
+
+        public static CodeTarget CreateDefault(
+            RazorCodeDocument codeDocument,
+            RazorCodeGenerationOptions options,
+            Action<CodeTargetBuilder> configure)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            var builder = new DefaultCodeTargetBuilder(codeDocument, options);
+
+            if (builder.Options.DesignTime)
+            {
+                AddDesignTimeDefaults(builder);
+            }
+            else
+            {
+                AddRuntimeDefaults(builder);
+            }
+
+            if (configure != null)
+            {
+                configure.Invoke(builder);
+            }
+
+            return builder.Build();
+        }
+
+        public static CodeTarget CreateEmpty(
+            RazorCodeDocument codeDocument,
+            RazorCodeGenerationOptions options, 
+            Action<CodeTargetBuilder> configure)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            var builder = new DefaultCodeTargetBuilder(codeDocument, options);
+            configure?.Invoke(builder);
+            return builder.Build();
+        }
+
+        internal static void AddDesignTimeDefaults(CodeTargetBuilder builder)
+        {
+
+        }
+
+        internal static void AddRuntimeDefaults(CodeTargetBuilder builder)
+        {
+
+        }
+
+        public abstract IntermediateNodeWriter CreateNodeWriter();
+
+        public abstract TExtension GetExtension<TExtension>() where TExtension : class, ICodeTargetExtension;
+
+        public abstract bool HasExtension<TExtension>() where TExtension : class, ICodeTargetExtension;
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTargetBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTargetBuilder.cs
new file mode 100644
index 0000000000..de9daf2ea6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeTargetBuilder.cs
@@ -0,0 +1,18 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public abstract class CodeTargetBuilder
+    {
+        public abstract RazorCodeDocument CodeDocument { get; }
+
+        public abstract RazorCodeGenerationOptions Options { get; }
+
+        public abstract ICollection<ICodeTargetExtension> TargetExtensions { get; }
+
+        public abstract CodeTarget Build();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriter.cs
new file mode 100644
index 0000000000..5b44fbc7fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriter.cs
@@ -0,0 +1,207 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public sealed class CodeWriter
+    {
+        private static readonly char[] NewLineCharacters = { '\r', '\n' };
+
+        private readonly StringBuilder _builder;
+
+        private string _newLine;
+
+        private int _absoluteIndex;
+        private int _currentLineIndex;
+        private int _currentLineCharacterIndex;
+
+        public CodeWriter()
+        {
+            NewLine = Environment.NewLine;
+            _builder = new StringBuilder();
+        }
+
+        public int CurrentIndent { get; set; }
+
+        public int Length => _builder.Length;
+
+        public string NewLine
+        {
+            get => _newLine;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                if (value != "\r\n" && value != "\n")
+                {
+                    throw new ArgumentException(Resources.FormatCodeWriter_InvalidNewLine(value), nameof(value));
+                }
+
+                _newLine = value;
+            }
+        }
+
+        public SourceLocation Location => new SourceLocation(_absoluteIndex, _currentLineIndex, _currentLineCharacterIndex);
+
+        public char this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= _builder.Length)
+                {
+                    throw new IndexOutOfRangeException(nameof(index));
+                }
+
+                return _builder[index];
+            }
+        }
+
+        // Internal for testing.
+        internal CodeWriter Indent(int size)
+        {
+            if (Length == 0 || this[Length - 1] == '\n')
+            {
+                _builder.Append(' ', size);
+
+                _currentLineCharacterIndex += size;
+                _absoluteIndex += size;
+            }
+
+            return this;
+        }
+
+        public CodeWriter Write(string value)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return Write(value, 0, value.Length);
+        }
+
+        public CodeWriter Write(string value, int startIndex, int count)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            if (startIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(startIndex));
+            }
+
+            if (count < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            if (startIndex > value.Length - count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(startIndex));
+            }
+
+            if (count == 0)
+            {
+                return this;
+            }
+
+            Indent(CurrentIndent);
+
+            _builder.Append(value, startIndex, count);
+
+            _absoluteIndex += count;
+
+            // The data string might contain a partial newline where the previously
+            // written string has part of the newline.
+            var i = startIndex;
+            int? trailingPartStart = null;
+
+            if (
+                // Check the last character of the previous write operation.
+                _builder.Length - count - 1 >= 0 &&
+                _builder[_builder.Length - count - 1] == '\r' &&
+
+                // Check the first character of the current write operation.
+                _builder[_builder.Length - count] == '\n')
+            {
+                // This is newline that's spread across two writes. Skip the first character of the
+                // current write operation.
+                //
+                // We don't need to increment our newline counter because we already did that when we
+                // saw the \r.
+                i += 1;
+                trailingPartStart = 1;
+            }
+
+            // Iterate the string, stopping at each occurrence of a newline character. This lets us count the
+            // newline occurrences and keep the index of the last one.
+            while ((i = value.IndexOfAny(NewLineCharacters, i)) >= 0)
+            {
+                // Newline found.
+                _currentLineIndex++;
+                _currentLineCharacterIndex = 0;
+
+                i++;
+
+                // We might have stopped at a \r, so check if it's followed by \n and then advance the index to
+                // start the next search after it.
+                if (count > i &&
+                    value[i - 1] == '\r' &&
+                    value[i] == '\n')
+                {
+                    i++;
+                }
+
+                // The 'suffix' of the current line starts after this newline token.
+                trailingPartStart = i;
+            }
+
+            if (trailingPartStart == null)
+            {
+                // No newlines, just add the length of the data buffer
+                _currentLineCharacterIndex += count;
+            }
+            else
+            {
+                // Newlines found, add the trailing part of 'data'
+                _currentLineCharacterIndex += (count - trailingPartStart.Value);
+            }
+
+            return this;
+        }
+
+        public CodeWriter WriteLine()
+        {
+            _builder.Append(NewLine);
+
+            _currentLineIndex++;
+            _currentLineCharacterIndex = 0;
+            _absoluteIndex += NewLine.Length;
+
+            return this;
+        }
+
+        public CodeWriter WriteLine(string value)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return Write(value).WriteLine();
+        }
+
+        public string GenerateCode()
+        {
+            return _builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
new file mode 100644
index 0000000000..f15acdeaf6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -0,0 +1,650 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal static class CodeWriterExtensions
+    {
+        private const string InstanceMethodFormat = "{0}.{1}";
+
+        private static readonly char[] CStyleStringLiteralEscapeChars =
+        {
+            '\r',
+            '\t',
+            '\"',
+            '\'',
+            '\\',
+            '\0',
+            '\n',
+            '\u2028',
+            '\u2029',
+        };
+
+        public static bool IsAtBeginningOfLine(this CodeWriter writer)
+        {
+            return writer.Length == 0 || writer[writer.Length - 1] == '\n';
+        }
+
+        public static CodeWriter WritePadding(this CodeWriter writer, int offset, SourceSpan? span, CodeRenderingContext context)
+        {
+            if (span == null)
+            {
+                return writer;
+            }
+
+            var basePadding = CalculatePadding();
+            var resolvedPadding = Math.Max(basePadding - offset, 0);
+
+            if (context.Options.IndentWithTabs)
+            {
+                // Avoid writing directly to the StringBuilder here, that will throw off the manual indexing 
+                // done by the base class.
+                var tabs = resolvedPadding / context.Options.IndentSize;
+                for (var i = 0; i < tabs; i++)
+                {
+                    writer.Write("\t");
+                }
+
+                var spaces = resolvedPadding % context.Options.IndentSize;
+                for (var i = 0; i < spaces; i++)
+                {
+                    writer.Write(" ");
+                }
+            }
+            else
+            {
+                for (var i = 0; i < resolvedPadding; i++)
+                {
+                    writer.Write(" ");
+                }
+            }
+
+            return writer;
+
+            int CalculatePadding()
+            {
+                var spaceCount = 0;
+                for (var i = span.Value.AbsoluteIndex - 1; i >= 0; i--)
+                {
+                    var @char = context.SourceDocument[i];
+                    if (@char == '\n' || @char == '\r')
+                    {
+                        break;
+                    }
+                    else if (@char == '\t')
+                    {
+                        spaceCount += context.Options.IndentSize;
+                    }
+                    else
+                    {
+                        spaceCount++;
+                    }
+                }
+
+                return spaceCount;
+            }
+        }
+
+        public static CodeWriter WriteVariableDeclaration(this CodeWriter writer, string type, string name, string value)
+        {
+            writer.Write(type).Write(" ").Write(name);
+            if (!string.IsNullOrEmpty(value))
+            {
+                writer.Write(" = ").Write(value);
+            }
+            else
+            {
+                writer.Write(" = null");
+            }
+
+            writer.WriteLine(";");
+
+            return writer;
+        }
+
+        public static CodeWriter WriteBooleanLiteral(this CodeWriter writer, bool value)
+        {
+            return writer.Write(value.ToString().ToLowerInvariant());
+        }
+
+        public static CodeWriter WriteStartAssignment(this CodeWriter writer, string name)
+        {
+            return writer.Write(name).Write(" = ");
+        }
+
+        public static CodeWriter WriteParameterSeparator(this CodeWriter writer)
+        {
+            return writer.Write(", ");
+        }
+
+        public static CodeWriter WriteStartNewObject(this CodeWriter writer, string typeName)
+        {
+            return writer.Write("new ").Write(typeName).Write("(");
+        }
+
+        public static CodeWriter WriteStringLiteral(this CodeWriter writer, string literal)
+        {
+            if (literal.Length >= 256 && literal.Length <= 1500 && literal.IndexOf('\0') == -1)
+            {
+                WriteVerbatimStringLiteral(writer, literal);
+            }
+            else
+            {
+                WriteCStyleStringLiteral(writer, literal);
+            }
+
+            return writer;
+        }
+
+        public static CodeWriter WriteUsing(this CodeWriter writer, string name)
+        {
+            return WriteUsing(writer, name, endLine: true);
+        }
+
+        public static CodeWriter WriteUsing(this CodeWriter writer, string name, bool endLine)
+        {
+            writer.Write("using ");
+            writer.Write(name);
+
+            if (endLine)
+            {
+                writer.WriteLine(";");
+            }
+
+            return writer;
+        }
+
+        public static CodeWriter WriteLineNumberDirective(this CodeWriter writer, SourceSpan span)
+        {
+            if (writer.Length >= writer.NewLine.Length && !IsAtBeginningOfLine(writer))
+            {
+                writer.WriteLine();
+            }
+
+            var lineNumberAsString = (span.LineIndex + 1).ToString(CultureInfo.InvariantCulture);
+            return writer.Write("#line ").Write(lineNumberAsString).Write(" \"").Write(span.FilePath).WriteLine("\"");
+        }
+
+        public static CodeWriter WriteStartMethodInvocation(this CodeWriter writer, string methodName)
+        {
+            writer.Write(methodName);
+
+            return writer.Write("(");
+        }
+
+        public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer)
+        {
+            return WriteEndMethodInvocation(writer, endLine: true);
+        }
+
+        public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer, bool endLine)
+        {
+            writer.Write(")");
+            if (endLine)
+            {
+                writer.WriteLine(";");
+            }
+
+            return writer;
+        }
+
+        // Writes a method invocation for the given instance name.
+        public static CodeWriter WriteInstanceMethodInvocation(
+            this CodeWriter writer,
+            string instanceName,
+            string methodName,
+            params string[] parameters)
+        {
+            if (instanceName == null)
+            {
+                throw new ArgumentNullException(nameof(instanceName));
+            }
+
+            if (methodName == null)
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            return WriteInstanceMethodInvocation(writer, instanceName, methodName, endLine: true, parameters: parameters);
+        }
+
+        // Writes a method invocation for the given instance name.
+        public static CodeWriter WriteInstanceMethodInvocation(
+            this CodeWriter writer,
+            string instanceName,
+            string methodName,
+            bool endLine,
+            params string[] parameters)
+        {
+            if (instanceName == null)
+            {
+                throw new ArgumentNullException(nameof(instanceName));
+            }
+
+            if (methodName == null)
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            return WriteMethodInvocation(
+                writer,
+                string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName),
+                endLine,
+                parameters);
+        }
+
+        public static CodeWriter WriteStartInstanceMethodInvocation(this CodeWriter writer, string instanceName, string methodName)
+        {
+            if (instanceName == null)
+            {
+                throw new ArgumentNullException(nameof(instanceName));
+            }
+
+            if (methodName == null)
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            return WriteStartMethodInvocation(
+                writer,
+                string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName));
+        }
+
+        public static CodeWriter WriteField(this CodeWriter writer, IList<string> modifiers, string typeName, string fieldName)
+        {
+            if (modifiers == null)
+            {
+                throw new ArgumentNullException(nameof(modifiers));
+            }
+
+            if (typeName == null)
+            {
+                throw new ArgumentNullException(nameof(typeName));
+            }
+
+            if (fieldName == null)
+            {
+                throw new ArgumentNullException(nameof(fieldName));
+            }
+
+            for (var i = 0; i < modifiers.Count; i++)
+            {
+                writer.Write(modifiers[i]);
+                writer.Write(" ");
+            }
+
+            writer.Write(typeName);
+            writer.Write(" ");
+            writer.Write(fieldName);
+            writer.Write(";");
+            writer.WriteLine();
+
+            return writer;
+        }
+
+        public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, params string[] parameters)
+        {
+            return WriteMethodInvocation(writer, methodName, endLine: true, parameters: parameters);
+        }
+
+        public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, bool endLine, params string[] parameters)
+        {
+            return 
+                WriteStartMethodInvocation(writer, methodName)
+                .Write(string.Join(", ", parameters))
+                .WriteEndMethodInvocation(endLine);
+        }
+
+        public static CodeWriter WriteAutoPropertyDeclaration(this CodeWriter writer, IList<string> modifiers, string typeName, string propertyName)
+        {
+            if (modifiers == null)
+            {
+                throw new ArgumentNullException(nameof(modifiers));
+            }
+
+            if (typeName == null)
+            {
+                throw new ArgumentNullException(nameof(typeName));
+            }
+
+            if (propertyName == null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            for (var i = 0; i < modifiers.Count; i++)
+            {
+                writer.Write(modifiers[i]);
+                writer.Write(" ");
+            }
+
+            writer.Write(typeName);
+            writer.Write(" ");
+            writer.Write(propertyName);
+            writer.Write(" { get; set; }");
+            writer.WriteLine();
+
+            return writer;
+        }
+
+        public static CSharpCodeWritingScope BuildScope(this CodeWriter writer)
+        {
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static CSharpCodeWritingScope BuildLambda(this CodeWriter writer, params string[] parameterNames)
+        {
+            return BuildLambda(writer, async: false, parameterNames: parameterNames);
+        }
+
+        public static CSharpCodeWritingScope BuildAsyncLambda(this CodeWriter writer, params string[] parameterNames)
+        {
+            return BuildLambda(writer, async: true, parameterNames: parameterNames);
+        }
+
+        private static CSharpCodeWritingScope BuildLambda(CodeWriter writer, bool async, string[] parameterNames)
+        {
+            if (async)
+            {
+                writer.Write("async");
+            }
+
+            writer.Write("(").Write(string.Join(", ", parameterNames)).Write(") => ");
+
+            var scope = new CSharpCodeWritingScope(writer);
+
+            return scope;
+        }
+
+        public static CSharpCodeWritingScope BuildNamespace(this CodeWriter writer, string name)
+        {
+            writer.Write("namespace ").WriteLine(name);
+
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static CSharpCodeWritingScope BuildClassDeclaration(
+            this CodeWriter writer,
+            IList<string> modifiers,
+            string name,
+            string baseType,
+            IList<string> interfaces,
+            IList<string> typeParameters)
+        {
+            for (var i = 0; i < modifiers.Count; i++)
+            {
+                writer.Write(modifiers[i]);
+                writer.Write(" ");
+            }
+
+            writer.Write("class ");
+            writer.Write(name);
+
+            if (typeParameters != null && typeParameters.Count > 0)
+            {
+                writer.Write("<");
+                writer.Write(string.Join(", ", typeParameters));
+                writer.Write(">");
+            }
+
+            var hasBaseType = !string.IsNullOrEmpty(baseType);
+            var hasInterfaces = interfaces != null && interfaces.Count > 0;
+
+            if (hasBaseType || hasInterfaces)
+            {
+                writer.Write(" : ");
+
+                if (hasBaseType)
+                {
+                    writer.Write(baseType);
+
+                    if (hasInterfaces)
+                    {
+                        WriteParameterSeparator(writer);
+                    }
+                }
+
+                if (hasInterfaces)
+                {
+                    writer.Write(string.Join(", ", interfaces));
+                }
+            }
+
+            writer.WriteLine();
+
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static CSharpCodeWritingScope BuildMethodDeclaration(
+            this CodeWriter writer,
+            string accessibility,
+            string returnType,
+            string name,
+            IEnumerable<KeyValuePair<string, string>> parameters)
+        {
+            writer.Write(accessibility)
+                .Write(" ")
+                .Write(returnType)
+                .Write(" ")
+                .Write(name)
+                .Write("(")
+                .Write(string.Join(", ", parameters.Select(p => p.Key + " " + p.Value)))
+                .WriteLine(")");
+
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static IDisposable BuildLinePragma(this CodeWriter writer, SourceSpan? span)
+        {
+            if (string.IsNullOrEmpty(span?.FilePath))
+            {
+                // Can't build a valid line pragma without a file path.
+                return NullDisposable.Default;
+            }
+
+            return new LinePragmaWriter(writer, span.Value);
+        }
+
+        private static void WriteVerbatimStringLiteral(CodeWriter writer, string literal)
+        {
+            writer.Write("@\"");
+
+            // We need to suppress indenting during the writing of the string's content. A
+            // verbatim string literal could contain newlines that don't get escaped.
+            var indent = writer.CurrentIndent;
+            writer.CurrentIndent = 0;
+
+            // We need to find the index of each '"' (double-quote) to escape it.
+            var start = 0;
+            int end;
+            while ((end = literal.IndexOf('\"', start)) > -1)
+            {
+                writer.Write(literal, start, end - start);
+
+                writer.Write("\"\"");
+
+                start = end + 1;
+            }
+
+            Debug.Assert(end == -1); // We've hit all of the double-quotes.
+
+            // Write the remainder after the last double-quote.
+            writer.Write(literal, start, literal.Length - start);
+
+            writer.Write("\"");
+
+            writer.CurrentIndent = indent;
+        }
+
+        private static void WriteCStyleStringLiteral(CodeWriter writer, string literal)
+        {
+            // From CSharpCodeGenerator.QuoteSnippetStringCStyle in CodeDOM
+            writer.Write("\"");
+
+            // We need to find the index of each escapable character to escape it.
+            var start = 0;
+            int end;
+            while ((end = literal.IndexOfAny(CStyleStringLiteralEscapeChars, start)) > -1)
+            {
+                writer.Write(literal, start, end - start);
+
+                switch (literal[end])
+                {
+                    case '\r':
+                        writer.Write("\\r");
+                        break;
+                    case '\t':
+                        writer.Write("\\t");
+                        break;
+                    case '\"':
+                        writer.Write("\\\"");
+                        break;
+                    case '\'':
+                        writer.Write("\\\'");
+                        break;
+                    case '\\':
+                        writer.Write("\\\\");
+                        break;
+                    case '\0':
+                        writer.Write("\\\0");
+                        break;
+                    case '\n':
+                        writer.Write("\\n");
+                        break;
+                    case '\u2028':
+                    case '\u2029':
+                        writer.Write("\\u");
+                        writer.Write(((int)literal[end]).ToString("X4", CultureInfo.InvariantCulture));
+                        break;
+                    default:
+                        Debug.Assert(false, "Unknown escape character.");
+                        break;
+                }
+
+                start = end + 1;
+            }
+
+            Debug.Assert(end == -1); // We've hit all of chars that need escaping.
+
+            // Write the remainder after the last escaped char.
+            writer.Write(literal, start, literal.Length - start);
+
+            writer.Write("\"");
+        }
+
+        public struct CSharpCodeWritingScope : IDisposable
+        {
+            private CodeWriter _writer;
+            private bool _autoSpace;
+            private int _tabSize;
+            private int _startIndent;
+
+            public CSharpCodeWritingScope(CodeWriter writer, int tabSize = 4, bool autoSpace = true)
+            {
+                _writer = writer;
+                _autoSpace = autoSpace;
+                _tabSize = tabSize;
+                _startIndent = -1; // Set in WriteStartScope
+
+                WriteStartScope();
+            }
+
+            public void Dispose()
+            {
+                WriteEndScope();
+            }
+
+            private void WriteStartScope()
+            {
+                TryAutoSpace(" ");
+
+                _writer.WriteLine("{");
+                _writer.CurrentIndent += _tabSize;
+                _startIndent = _writer.CurrentIndent;
+            }
+
+            private void WriteEndScope()
+            {
+                TryAutoSpace(_writer.NewLine);
+
+                // Ensure the scope hasn't been modified
+                if (_writer.CurrentIndent == _startIndent)
+                {
+                    _writer.CurrentIndent -= _tabSize;
+                }
+
+                _writer.WriteLine("}");
+            }
+
+            private void TryAutoSpace(string spaceCharacter)
+            {
+                if (_autoSpace &&
+                    _writer.Length > 0 &&
+                    !char.IsWhiteSpace(_writer[_writer.Length - 1]))
+                {
+                    _writer.Write(spaceCharacter);
+                }
+            }
+        }
+
+        private class LinePragmaWriter : IDisposable
+        {
+            private readonly CodeWriter _writer;
+            private readonly int _startIndent;
+
+            public LinePragmaWriter(CodeWriter writer, SourceSpan span)
+            {
+                if (writer == null)
+                {
+                    throw new ArgumentNullException(nameof(writer));
+                }
+
+                _writer = writer;
+                _startIndent = _writer.CurrentIndent;
+                _writer.CurrentIndent = 0;
+                WriteLineNumberDirective(writer, span);
+            }
+
+            public void Dispose()
+            {
+                // Need to add an additional line at the end IF there wasn't one already written.
+                // This is needed to work with the C# editor's handling of #line ...
+                var endsWithNewline = _writer.Length > 0 && _writer[_writer.Length - 1] == '\n';
+
+                // Always write at least 1 empty line to potentially separate code from pragmas.
+                _writer.WriteLine();
+
+                // Check if the previous empty line wasn't enough to separate code from pragmas.
+                if (!endsWithNewline)
+                {
+                    _writer.WriteLine();
+                }
+
+                _writer
+                    .WriteLine("#line default")
+                    .WriteLine("#line hidden");
+
+                _writer.CurrentIndent = _startIndent;
+            }
+        }
+
+        private class NullDisposable : IDisposable
+        {
+            public static readonly NullDisposable Default = new NullDisposable();
+
+            private NullDisposable()
+            {
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs
new file mode 100644
index 0000000000..848d344c3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs
@@ -0,0 +1,213 @@
+
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class DefaultCodeRenderingContext : CodeRenderingContext
+    {
+        private readonly Stack<IntermediateNode> _ancestors;
+        private readonly RazorCodeDocument _codeDocument;
+        private readonly DocumentIntermediateNode _documentNode;
+        private readonly List<ScopeInternal> _scopes;
+
+        public DefaultCodeRenderingContext(
+            CodeWriter codeWriter,
+            IntermediateNodeWriter nodeWriter,
+            RazorCodeDocument codeDocument,
+            DocumentIntermediateNode documentNode,
+            RazorCodeGenerationOptions options)
+        {
+            if (codeWriter == null)
+            {
+                throw new ArgumentNullException(nameof(codeWriter));
+            }
+
+            if (nodeWriter == null)
+            {
+                throw new ArgumentNullException(nameof(nodeWriter));
+            }
+
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            CodeWriter = codeWriter;
+            _codeDocument = codeDocument;
+            _documentNode = documentNode;
+            Options = options;
+
+            _ancestors = new Stack<IntermediateNode>();
+            Diagnostics = new RazorDiagnosticCollection();
+            Items = new ItemCollection();
+            SourceMappings = new List<SourceMapping>();
+
+            var diagnostics = _documentNode.GetAllDiagnostics();
+            for (var i = 0; i < diagnostics.Count; i++)
+            {
+                Diagnostics.Add(diagnostics[i]);
+            }
+
+            var newLineString = codeDocument.Items[NewLineString];
+            if (newLineString != null)
+            {
+                // Set new line character to a specific string regardless of platform, for testing purposes.
+                codeWriter.NewLine = (string)newLineString;
+            }
+
+            Items[NewLineString] = codeDocument.Items[NewLineString];
+            Items[SuppressUniqueIds] = codeDocument.Items[SuppressUniqueIds];
+
+            _scopes = new List<ScopeInternal>();
+            _scopes.Add(new ScopeInternal(nodeWriter));
+        }
+
+        // This will be initialized by the document writer when the context is 'live'.
+        public IntermediateNodeVisitor Visitor { get; set; }
+
+        public override IEnumerable<IntermediateNode> Ancestors => _ancestors;
+
+        internal Stack<IntermediateNode> AncestorsInternal => _ancestors;
+
+        public override CodeWriter CodeWriter { get; }
+
+        public override RazorDiagnosticCollection Diagnostics { get; }
+
+        public override string DocumentKind { get; }
+
+        public override ItemCollection Items { get; }
+
+        public List<SourceMapping> SourceMappings { get; }
+
+        public override IntermediateNodeWriter NodeWriter => Current.Writer;
+
+        public override RazorCodeGenerationOptions Options { get; }
+
+        public override IntermediateNode Parent => _ancestors.Count == 0 ? null : _ancestors.Peek();
+
+        public override RazorSourceDocument SourceDocument => _codeDocument.Source;
+
+        private ScopeInternal Current => _scopes[_scopes.Count - 1];
+
+        public override void AddSourceMappingFor(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.Source == null)
+            {
+                return;
+            }
+
+            if (SourceDocument.FilePath != null &&
+                !string.Equals(SourceDocument.FilePath, node.Source.Value.FilePath, StringComparison.OrdinalIgnoreCase))
+            {
+                // We don't want to generate line mappings for imports.
+                return;
+            }
+
+            var source = node.Source.Value;
+            var generatedLocation = new SourceSpan(CodeWriter.Location, source.Length);
+            var sourceMapping = new SourceMapping(source, generatedLocation);
+
+            SourceMappings.Add(sourceMapping);
+        }
+
+        public override void RenderChildren(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            _ancestors.Push(node);
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                Visitor.Visit(node.Children[i]);
+            }
+
+            _ancestors.Pop();
+        }
+
+        public override void RenderChildren(IntermediateNode node, IntermediateNodeWriter writer)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            _scopes.Add(new ScopeInternal(writer));
+            _ancestors.Push(node);
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                Visitor.Visit(node.Children[i]);
+            }
+
+            _ancestors.Pop();
+            _scopes.RemoveAt(_scopes.Count - 1);
+        }
+
+        public override void RenderNode(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            Visitor.Visit(node);
+        }
+
+        public override void RenderNode(IntermediateNode node, IntermediateNodeWriter writer)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            _scopes.Add(new ScopeInternal(writer));
+
+            Visitor.Visit(node);
+
+            _scopes.RemoveAt(_scopes.Count - 1);
+        }
+
+        private struct ScopeInternal
+        {
+            public ScopeInternal(IntermediateNodeWriter writer)
+            {
+                Writer = writer;
+            }
+
+            public IntermediateNodeWriter Writer { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTarget.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTarget.cs
new file mode 100644
index 0000000000..e9ef7d1ee7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTarget.cs
@@ -0,0 +1,54 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class DefaultCodeTarget : CodeTarget
+    {
+        private readonly RazorCodeGenerationOptions _options;
+
+        public DefaultCodeTarget(RazorCodeGenerationOptions options, IEnumerable<ICodeTargetExtension> extensions)
+        {
+            _options = options;
+            Extensions = extensions.ToArray();
+        }
+
+        public ICodeTargetExtension[] Extensions { get; }
+
+        public override IntermediateNodeWriter CreateNodeWriter()
+        {
+            return _options.DesignTime ? (IntermediateNodeWriter)new DesignTimeNodeWriter() : new RuntimeNodeWriter();
+        }
+
+        public override TExtension GetExtension<TExtension>()
+        {
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                var match = Extensions[i] as TExtension;
+                if (match != null)
+                {
+                    return match;
+                }
+            }
+
+            return null;
+        }
+
+        public override bool HasExtension<TExtension>()
+        {
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                var match = Extensions[i] as TExtension;
+                if (match != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTargetBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTargetBuilder.cs
new file mode 100644
index 0000000000..8ae23bddf4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeTargetBuilder.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class DefaultCodeTargetBuilder : CodeTargetBuilder
+    {
+        public DefaultCodeTargetBuilder(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
+        {
+            CodeDocument = codeDocument;
+            Options = options;
+
+            TargetExtensions = new List<ICodeTargetExtension>();
+        }
+
+        public override RazorCodeDocument CodeDocument { get; }
+
+        public override RazorCodeGenerationOptions Options { get; }
+
+        public override ICollection<ICodeTargetExtension> TargetExtensions { get; }
+
+        public override CodeTarget Build()
+        {
+            return new DefaultCodeTarget(Options, TargetExtensions);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
new file mode 100644
index 0000000000..a47295143d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -0,0 +1,266 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class DefaultDocumentWriter : DocumentWriter
+    {
+        private readonly CodeTarget _codeTarget;
+        private readonly RazorCodeGenerationOptions _options;
+
+        public DefaultDocumentWriter(CodeTarget codeTarget, RazorCodeGenerationOptions options)
+        {
+            _codeTarget = codeTarget;
+            _options = options;
+        }
+
+        public override RazorCSharpDocument WriteDocument(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            var context = new DefaultCodeRenderingContext(
+                new CodeWriter(),
+                _codeTarget.CreateNodeWriter(),
+                codeDocument,
+                documentNode,
+                _options);
+            context.Visitor = new Visitor(_codeTarget, context);
+
+            context.Visitor.VisitDocument(documentNode);
+
+            var cSharp = context.CodeWriter.GenerateCode();
+            return new DefaultRazorCSharpDocument(
+                cSharp,
+                _options,
+                context.Diagnostics.ToArray(),
+                context.SourceMappings.ToArray());
+        }
+
+        private class Visitor : IntermediateNodeVisitor
+        {
+            private readonly DefaultCodeRenderingContext _context;
+            private readonly CodeTarget _target;
+
+            public Visitor(CodeTarget target, DefaultCodeRenderingContext context)
+            {
+                _target = target;
+                _context = context;
+            }
+
+            private DefaultCodeRenderingContext Context => _context;
+
+            public override void VisitDocument(DocumentIntermediateNode node)
+            {
+                if (!Context.Options.SuppressChecksum)
+                {
+                    // See http://msdn.microsoft.com/en-us/library/system.codedom.codechecksumpragma.checksumalgorithmid.aspx
+                    // And https://github.com/dotnet/roslyn/blob/614299ff83da9959fa07131c6d0ffbc58873b6ae/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs#L67
+                    //
+                    // We only support algorithms that the debugger understands, which is currently SHA1 and SHA256.
+
+                    string algorithmId;
+                    var algorithm = Context.SourceDocument.GetChecksumAlgorithm();
+                    if (string.Equals(algorithm, HashAlgorithmName.SHA256.Name, StringComparison.Ordinal))
+                    {
+                        algorithmId = "{8829d00f-11b8-4213-878b-770e8597ac16}";
+                    }
+                    else if (string.Equals(algorithm, HashAlgorithmName.SHA1.Name, StringComparison.Ordinal) ||
+
+                        // In 2.0, we didn't actually expose the name of the algorithm, so it's possible we could get null here.
+                        // If that's the case, we just assume SHA1 since that's the only thing we supported in 2.0.
+                        algorithm == null)
+                    {
+                        algorithmId = "{ff1816ec-aa5e-4d10-87f7-6f4963833460}";
+                    }
+                    else
+                    {
+                        var supportedAlgorithms = string.Join(" ", new string[]
+                        {
+                            HashAlgorithmName.SHA1.Name,
+                            HashAlgorithmName.SHA256.Name
+                        });
+
+                        var message = Resources.FormatUnsupportedChecksumAlgorithm(
+                            algorithm,
+                            supportedAlgorithms,
+                            nameof(RazorCodeGenerationOptions) + "." + nameof(RazorCodeGenerationOptions.SuppressChecksum),
+                            bool.TrueString);
+                        throw new InvalidOperationException(message);
+                    }
+
+                    var sourceDocument = Context.SourceDocument;
+
+                    var checksum = Checksum.BytesToString(sourceDocument.GetChecksum());
+                    if (!string.IsNullOrEmpty(checksum))
+                    {
+                        Context.CodeWriter
+                            .Write("#pragma checksum \"")
+                            .Write(sourceDocument.FilePath)
+                            .Write("\" \"")
+                            .Write(algorithmId)
+                            .Write("\" \"")
+                            .Write(checksum)
+                            .WriteLine("\"");
+                    }
+                }
+
+                Context.CodeWriter
+                    .WriteLine("// <auto-generated/>")
+                    .WriteLine("#pragma warning disable 1591");
+
+                VisitDefault(node);
+
+                Context.CodeWriter.WriteLine("#pragma warning restore 1591");
+            }
+
+            public override void VisitUsingDirective(UsingDirectiveIntermediateNode node)
+            {
+                Context.NodeWriter.WriteUsingDirective(Context, node);
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                using (Context.CodeWriter.BuildNamespace(node.Content))
+                {
+                    Context.CodeWriter.WriteLine("#line hidden");
+                    VisitDefault(node);
+                }
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                using (Context.CodeWriter.BuildClassDeclaration(
+                    node.Modifiers,
+                    node.ClassName,
+                    node.BaseType,
+                    node.Interfaces,
+                    node.TypeParameters.Select(p => p.ParameterName).ToArray()))
+                {
+                    VisitDefault(node);
+                }
+            }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Context.CodeWriter.WriteLine("#pragma warning disable 1998");
+
+                for (var i = 0; i < node.Modifiers.Count; i++)
+                {
+                    Context.CodeWriter.Write(node.Modifiers[i]);
+                    Context.CodeWriter.Write(" ");
+                }
+
+                Context.CodeWriter.Write(node.ReturnType);
+                Context.CodeWriter.Write(" ");
+
+                Context.CodeWriter.Write(node.MethodName);
+                Context.CodeWriter.Write("(");
+
+                for (var i = 0; i < node.Parameters.Count; i++)
+                {
+                    var parameter = node.Parameters[i];
+
+                    for (var j = 0; j < parameter.Modifiers.Count; j++)
+                    {
+                        Context.CodeWriter.Write(parameter.Modifiers[j]);
+                        Context.CodeWriter.Write(" ");
+                    }
+
+                    Context.CodeWriter.Write(parameter.TypeName);
+                    Context.CodeWriter.Write(" ");
+
+                    Context.CodeWriter.Write(parameter.ParameterName);
+
+                    if (i < node.Parameters.Count - 1)
+                    {
+                        Context.CodeWriter.Write(", ");
+                    }
+                }
+
+                Context.CodeWriter.Write(")");
+                Context.CodeWriter.WriteLine();
+
+                using (Context.CodeWriter.BuildScope())
+                {
+                    VisitDefault(node);
+                }
+
+                Context.CodeWriter.WriteLine("#pragma warning restore 1998");
+            }
+
+            public override void VisitFieldDeclaration(FieldDeclarationIntermediateNode node)
+            {
+                Context.CodeWriter.WriteField(node.Modifiers, node.FieldType, node.FieldName);
+            }
+
+            public override void VisitPropertyDeclaration(PropertyDeclarationIntermediateNode node)
+            {
+                Context.CodeWriter.WriteAutoPropertyDeclaration(node.Modifiers, node.PropertyType, node.PropertyName);
+            }
+
+            public override void VisitExtension(ExtensionIntermediateNode node)
+            {
+                node.WriteNode(_target, Context);
+            }
+
+            public override void VisitCSharpExpression(CSharpExpressionIntermediateNode node)
+            {
+                Context.NodeWriter.WriteCSharpExpression(Context, node);
+            }
+
+            public override void VisitCSharpCode(CSharpCodeIntermediateNode node)
+            {
+                Context.NodeWriter.WriteCSharpCode(Context, node);
+            }
+
+            public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node)
+            {
+                Context.NodeWriter.WriteHtmlAttribute(Context, node);
+            }
+
+            public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
+            {
+                Context.NodeWriter.WriteHtmlAttributeValue(Context, node);
+            }
+
+            public override void VisitCSharpExpressionAttributeValue(CSharpExpressionAttributeValueIntermediateNode node)
+            {
+                Context.NodeWriter.WriteCSharpExpressionAttributeValue(Context, node);
+            }
+
+            public override void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIntermediateNode node)
+            {
+                Context.NodeWriter.WriteCSharpCodeAttributeValue(Context, node);
+            }
+
+            public override void VisitHtml(HtmlContentIntermediateNode node)
+            {
+                Context.NodeWriter.WriteHtmlContent(Context, node);
+            }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                VisitDefault(node);
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                Context.RenderChildren(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs
new file mode 100644
index 0000000000..d937c6f626
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs
@@ -0,0 +1,259 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class DesignTimeNodeWriter : IntermediateNodeWriter
+    {
+        public override void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node)
+        {
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.AddSourceMappingFor(node);
+                    context.CodeWriter.WriteUsing(node.Content);
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteUsing(node.Content);
+            }
+        }
+
+        public override void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.Children.Count == 0)
+            {
+                return;
+            }
+
+            if (node.Source != null)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    var offset = DesignTimeDirectivePass.DesignTimeVariable.Length + " = ".Length;
+                    context.CodeWriter.WritePadding(offset, node.Source, context);
+                    context.CodeWriter.WriteStartAssignment(DesignTimeDirectivePass.DesignTimeVariable);
+
+                    for (var i = 0; i < node.Children.Count; i++)
+                    {
+                        if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                        {
+                            context.AddSourceMappingFor(token);
+                            context.CodeWriter.Write(token.Content);
+                        }
+                        else
+                        {
+                            // There may be something else inside the expression like a Template or another extension node.
+                            context.RenderNode(node.Children[i]);
+                        }
+                    }
+
+                    context.CodeWriter.WriteLine(";");
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteStartAssignment(DesignTimeDirectivePass.DesignTimeVariable);
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                    {
+                        context.CodeWriter.Write(token.Content);
+                    }
+                    else
+                    {
+                        // There may be something else inside the expression like a Template or another extension node.
+                        context.RenderNode(node.Children[i]);
+                    }
+                }
+                context.CodeWriter.WriteLine(";");
+            }
+        }
+
+        public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node)
+        {
+            IDisposable linePragmaScope = null;
+            if (node.Source != null)
+            {
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+
+                context.CodeWriter.WritePadding(0, node.Source.Value, context);
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    context.AddSourceMappingFor(token);
+                    context.CodeWriter.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the statement like an extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            if (linePragmaScope != null)
+            {
+                linePragmaScope.Dispose();
+            }
+            else
+            {
+                context.CodeWriter.WriteLine();
+            }
+        }
+
+        public override void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node)
+        {
+            context.RenderChildren(node);
+        }
+
+        public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node)
+        {
+            context.RenderChildren(node);
+        }
+
+        public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.Children.Count == 0)
+            {
+                return;
+            }
+
+            var firstChild = node.Children[0];
+            if (firstChild.Source != null)
+            {
+                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value))
+                {
+                    var offset = DesignTimeDirectivePass.DesignTimeVariable.Length + " = ".Length;
+                    context.CodeWriter.WritePadding(offset, firstChild.Source, context);
+                    context.CodeWriter.WriteStartAssignment(DesignTimeDirectivePass.DesignTimeVariable);
+
+                    for (var i = 0; i < node.Children.Count; i++)
+                    {
+                        if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                        {
+                            context.AddSourceMappingFor(token);
+                            context.CodeWriter.Write(token.Content);
+                        }
+                        else
+                        {
+                            // There may be something else inside the expression like a Template or another extension node.
+                            context.RenderNode(node.Children[i]);
+                        }
+                    }
+
+                    context.CodeWriter.WriteLine(";");
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteStartAssignment(DesignTimeDirectivePass.DesignTimeVariable);
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                    {
+                        if (token.Source != null)
+                        {
+                            context.AddSourceMappingFor(token);
+                        }
+
+                        context.CodeWriter.Write(token.Content);
+                    }
+                    else
+                    {
+                        // There may be something else inside the expression like a Template or another extension node.
+                        context.RenderNode(node.Children[i]);
+                    }
+                }
+                context.CodeWriter.WriteLine(";");
+            }
+        }
+
+        public override void WriteCSharpCodeAttributeValue(CodeRenderingContext context, CSharpCodeAttributeValueIntermediateNode node)
+        {
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    IDisposable linePragmaScope = null;
+                    var isWhitespaceStatement = string.IsNullOrWhiteSpace(token.Content);
+
+                    if (token.Source != null)
+                    {
+                        if (!isWhitespaceStatement)
+                        {
+                            linePragmaScope = context.CodeWriter.BuildLinePragma(token.Source.Value);
+                        }
+
+                        context.CodeWriter.WritePadding(0, token.Source.Value, context);
+                    }
+                    else if (isWhitespaceStatement)
+                    {
+                        // Don't write whitespace if there is no line mapping for it.
+                        continue;
+                    }
+
+                    context.AddSourceMappingFor(token);
+                    context.CodeWriter.Write(token.Content);
+
+                    if (linePragmaScope != null)
+                    {
+                        linePragmaScope.Dispose();
+                    }
+                    else
+                    {
+                        context.CodeWriter.WriteLine();
+                    }
+                }
+                else
+                {
+                    // There may be something else inside the statement like an extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+        }
+
+        public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node)
+        {
+            // Do nothing
+        }
+
+        public override void BeginWriterScope(CodeRenderingContext context, string writer)
+        {
+            // Do nothing
+        }
+
+        public override void EndWriterScope(CodeRenderingContext context)
+        {
+            // Do nothing
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs
new file mode 100644
index 0000000000..68f7ddffc0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.ComponentModel;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public abstract class DocumentWriter
+    {
+        public static DocumentWriter CreateDefault(CodeTarget codeTarget, RazorCodeGenerationOptions options)
+        {
+            if (codeTarget == null)
+            {
+                throw new ArgumentNullException(nameof(codeTarget));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            return new DefaultDocumentWriter(codeTarget, options);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This method was intended to be static, use CreateDefault instead.")]
+        public DocumentWriter Create(CodeTarget codeTarget, RazorCodeGenerationOptions options)
+        {
+            if (codeTarget == null)
+            {
+                throw new ArgumentNullException(nameof(codeTarget));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            return new DefaultDocumentWriter(codeTarget, options);
+        }
+
+        public abstract RazorCSharpDocument WriteDocument(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/ICodeTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/ICodeTargetExtension.cs
new file mode 100644
index 0000000000..c8414f1335
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/ICodeTargetExtension.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public interface ICodeTargetExtension
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
new file mode 100644
index 0000000000..d8c636f064
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public abstract class IntermediateNodeWriter
+    {
+        public abstract void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node);
+
+        public abstract void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node);
+
+        public abstract void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node);
+
+        public abstract void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node);
+
+        public abstract void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node);
+
+        public abstract void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node);
+
+        public abstract void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node);
+
+        public abstract void WriteCSharpCodeAttributeValue(CodeRenderingContext context, CSharpCodeAttributeValueIntermediateNode node);
+
+        public abstract void BeginWriterScope(CodeRenderingContext context, string writer);
+
+        public abstract void EndWriterScope(CodeRenderingContext context);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LiteralRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LiteralRuntimeNodeWriter.cs
new file mode 100644
index 0000000000..21d542f663
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LiteralRuntimeNodeWriter.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class LiteralRuntimeNodeWriter : RuntimeNodeWriter
+    {
+        public override string WriteCSharpExpressionMethod { get; set; } = "WriteLiteral";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs
new file mode 100644
index 0000000000..f913a53fc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs
@@ -0,0 +1,391 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class RuntimeNodeWriter : IntermediateNodeWriter
+    {
+        public virtual string WriteCSharpExpressionMethod { get; set; } = "Write";
+
+        public virtual string WriteHtmlContentMethod { get; set; } = "WriteLiteral";
+
+        public virtual string BeginWriteAttributeMethod { get; set; } = "BeginWriteAttribute";
+
+        public virtual string EndWriteAttributeMethod { get; set; } = "EndWriteAttribute";
+
+        public virtual string WriteAttributeValueMethod { get; set; } = "WriteAttributeValue";
+
+        public virtual string PushWriterMethod { get; set; } = "PushWriter";
+
+        public virtual string PopWriterMethod { get; set; } = "PopWriter";
+
+        public string TemplateTypeName { get; set; } = "Microsoft.AspNetCore.Mvc.Razor.HelperResult";
+
+        public override void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node)
+        {
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.CodeWriter.WriteUsing(node.Content);
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteUsing(node.Content);
+            }
+        }
+
+        public override void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            IDisposable linePragmaScope = null;
+            if (node.Source != null)
+            {
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                context.CodeWriter.WritePadding(WriteCSharpExpressionMethod.Length + 1, node.Source, context);
+            }
+
+            context.CodeWriter.WriteStartMethodInvocation(WriteCSharpExpressionMethod);
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    context.CodeWriter.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the expression like a Template or another extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            context.CodeWriter.WriteEndMethodInvocation();
+
+            linePragmaScope?.Dispose();
+        }
+
+        public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node)
+        {
+            var isWhitespaceStatement = true;
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var token = node.Children[i] as IntermediateToken;
+                if (token == null || !string.IsNullOrWhiteSpace(token.Content))
+                {
+                    isWhitespaceStatement = false;
+                    break;
+                }
+            }
+
+            if (isWhitespaceStatement)
+            {
+                return;
+            }
+
+            IDisposable linePragmaScope = null;
+            if (node.Source != null)
+            {
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                context.CodeWriter.WritePadding(0, node.Source.Value, context);
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    context.CodeWriter.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the statement like an extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            if (linePragmaScope == null)
+            {
+                context.CodeWriter.WriteLine();
+            }
+
+            linePragmaScope?.Dispose();
+        }
+
+        public override void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node)
+        {
+            var valuePieceCount = node
+                .Children
+                .Count(child =>
+                    child is HtmlAttributeValueIntermediateNode ||
+                    child is CSharpExpressionAttributeValueIntermediateNode ||
+                    child is CSharpCodeAttributeValueIntermediateNode ||
+                    child is ExtensionIntermediateNode);
+
+            var prefixLocation = node.Source.Value.AbsoluteIndex;
+            var suffixLocation = node.Source.Value.AbsoluteIndex + node.Source.Value.Length - node.Suffix.Length;
+            context.CodeWriter
+                .WriteStartMethodInvocation(BeginWriteAttributeMethod)
+                .WriteStringLiteral(node.AttributeName)
+                .WriteParameterSeparator()
+                .WriteStringLiteral(node.Prefix)
+                .WriteParameterSeparator()
+                .Write(prefixLocation.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator()
+                .WriteStringLiteral(node.Suffix)
+                .WriteParameterSeparator()
+                .Write(suffixLocation.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator()
+                .Write(valuePieceCount.ToString(CultureInfo.InvariantCulture))
+                .WriteEndMethodInvocation();
+
+            context.RenderChildren(node);
+
+            context.CodeWriter
+                .WriteStartMethodInvocation(EndWriteAttributeMethod)
+                .WriteEndMethodInvocation();
+        }
+
+        public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node)
+        {
+            var prefixLocation = node.Source.Value.AbsoluteIndex;
+            var valueLocation = node.Source.Value.AbsoluteIndex + node.Prefix.Length;
+            var valueLength = node.Source.Value.Length;
+            context.CodeWriter
+                .WriteStartMethodInvocation(WriteAttributeValueMethod)
+                .WriteStringLiteral(node.Prefix)
+                .WriteParameterSeparator()
+                .Write(prefixLocation.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator();
+
+            // Write content
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsHtml)
+                {
+                    context.CodeWriter.WriteStringLiteral(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the attribute value like an extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            context.CodeWriter
+                .WriteParameterSeparator()
+                .Write(valueLocation.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator()
+                .Write(valueLength.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator()
+                .WriteBooleanLiteral(true)
+                .WriteEndMethodInvocation();
+        }
+
+        public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node)
+        {
+            using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+            {
+                var prefixLocation = node.Source.Value.AbsoluteIndex;
+                context.CodeWriter
+                    .WriteStartMethodInvocation(WriteAttributeValueMethod)
+                    .WriteStringLiteral(node.Prefix)
+                    .WriteParameterSeparator()
+                    .Write(prefixLocation.ToString(CultureInfo.InvariantCulture))
+                    .WriteParameterSeparator();
+
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                    {
+                        context.CodeWriter.Write(token.Content);
+                    }
+                    else
+                    {
+                        // There may be something else inside the expression like an extension node.
+                        context.RenderNode(node.Children[i]);
+                    }
+                }
+
+                var valueLocation = node.Source.Value.AbsoluteIndex + node.Prefix.Length;
+                var valueLength = node.Source.Value.Length - node.Prefix.Length;
+                context.CodeWriter
+                    .WriteParameterSeparator()
+                    .Write(valueLocation.ToString(CultureInfo.InvariantCulture))
+                    .WriteParameterSeparator()
+                    .Write(valueLength.ToString(CultureInfo.InvariantCulture))
+                    .WriteParameterSeparator()
+                    .WriteBooleanLiteral(false)
+                    .WriteEndMethodInvocation();
+            }
+        }
+
+        public override void WriteCSharpCodeAttributeValue(CodeRenderingContext context, CSharpCodeAttributeValueIntermediateNode node)
+        {
+            const string ValueWriterName = "__razor_attribute_value_writer";
+
+            var prefixLocation = node.Source.Value.AbsoluteIndex;
+            var valueLocation = node.Source.Value.AbsoluteIndex + node.Prefix.Length;
+            var valueLength = node.Source.Value.Length - node.Prefix.Length;
+            context.CodeWriter
+                .WriteStartMethodInvocation(WriteAttributeValueMethod)
+                .WriteStringLiteral(node.Prefix)
+                .WriteParameterSeparator()
+                .Write(prefixLocation.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator();
+
+            context.CodeWriter.WriteStartNewObject(TemplateTypeName);
+
+            using (context.CodeWriter.BuildAsyncLambda(ValueWriterName))
+            {
+                BeginWriterScope(context, ValueWriterName);
+
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                    {
+                        var isWhitespaceStatement = string.IsNullOrWhiteSpace(token.Content);
+                        IDisposable linePragmaScope = null;
+                        if (token.Source != null)
+                        {
+                            if (!isWhitespaceStatement)
+                            {
+                                linePragmaScope = context.CodeWriter.BuildLinePragma(token.Source.Value);
+                            }
+
+                            context.CodeWriter.WritePadding(0, token.Source.Value, context);
+                        }
+                        else if (isWhitespaceStatement)
+                        {
+                            // Don't write whitespace if there is no line mapping for it.
+                            continue;
+                        }
+
+                        context.CodeWriter.Write(token.Content);
+
+                        if (linePragmaScope != null)
+                        {
+                            linePragmaScope.Dispose();
+                        }
+                        else
+                        {
+                            context.CodeWriter.WriteLine();
+                        }
+                    }
+                    else
+                    {
+                        // There may be something else inside the statement like an extension node.
+                        context.RenderNode(node.Children[i]);
+                    }
+                }
+
+                EndWriterScope(context);
+            }
+
+            context.CodeWriter.WriteEndMethodInvocation(false);
+
+            context.CodeWriter
+                .WriteParameterSeparator()
+                .Write(valueLocation.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator()
+                .Write(valueLength.ToString(CultureInfo.InvariantCulture))
+                .WriteParameterSeparator()
+                .WriteBooleanLiteral(false)
+                .WriteEndMethodInvocation();
+        }
+
+        public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node)
+        {
+            const int MaxStringLiteralLength = 1024;
+
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsHtml)
+                {
+                    builder.Append(token.Content);
+                }
+            }
+
+            var content = builder.ToString();
+
+            WriteHtmlLiteral(context, MaxStringLiteralLength, content);
+        }
+
+        // Internal for testing
+        internal void WriteHtmlLiteral(CodeRenderingContext context, int maxStringLiteralLength, string literal)
+        {
+            if (literal.Length <= maxStringLiteralLength)
+            {
+                WriteLiteral(literal);
+                return;
+            }
+
+            // String is too large, render the string in pieces to avoid Roslyn OOM exceptions at compile time: https://github.com/aspnet/External/issues/54
+            var charactersConsumed = 0;
+            do
+            {
+                var charactersRemaining = literal.Length - charactersConsumed;
+                var charactersToSubstring = Math.Min(maxStringLiteralLength, charactersRemaining);
+                var lastCharBeforeSplitIndex = charactersConsumed + charactersToSubstring - 1;
+                var lastCharBeforeSplit = literal[lastCharBeforeSplitIndex];
+
+                if (char.IsHighSurrogate(lastCharBeforeSplit))
+                {
+                    if (charactersRemaining > 1)
+                    {
+                        // Take one less character this iteration. We're attempting to split inbetween a surrogate pair.
+                        // This can happen when something like an emoji sits on the barrier between splits; if we were to 
+                        // split the emoji we'd end up with invalid bytes in our output.
+                        charactersToSubstring--;
+                    }
+                    else
+                    {
+                        // The user has an invalid file with a partial surrogate a the splitting point. 
+                        // We'll let the invalid character flow but we'll explode later on.
+                    }
+                }
+
+                var textToRender = literal.Substring(charactersConsumed, charactersToSubstring);
+
+                WriteLiteral(textToRender);
+
+                charactersConsumed += textToRender.Length;
+            } while (charactersConsumed < literal.Length);
+
+            void WriteLiteral(string content)
+            {
+                context.CodeWriter
+                    .WriteStartMethodInvocation(WriteHtmlContentMethod)
+                    .WriteStringLiteral(content)
+                    .WriteEndMethodInvocation();
+            }
+        }
+
+        public override void BeginWriterScope(CodeRenderingContext context, string writer)
+        {
+            context.CodeWriter.WriteMethodInvocation(PushWriterMethod, writer);
+        }
+
+        public override void EndWriterScope(CodeRenderingContext context)
+        {
+            context.CodeWriter.WriteMethodInvocation(PopWriterMethod);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs
new file mode 100644
index 0000000000..eec5a76575
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriter.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class TagHelperHtmlAttributeRuntimeNodeWriter : RuntimeNodeWriter
+    {
+        public override string WriteAttributeValueMethod { get; set; } = "AddHtmlAttributeValue";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperRenderingContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperRenderingContext.cs
new file mode 100644
index 0000000000..a8cbe5c96c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/TagHelperRenderingContext.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    internal class TagHelperRenderingContext
+    {
+        private Dictionary<string, string> _renderedBoundAttributes;
+        private HashSet<string> _verifiedPropertyDictionaries;
+
+        public Dictionary<string, string> RenderedBoundAttributes
+        {
+            get
+            {
+                if (_renderedBoundAttributes == null)
+                {
+                    _renderedBoundAttributes = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                }
+
+                return _renderedBoundAttributes;
+            }
+        }
+
+        public HashSet<string> VerifiedPropertyDictionaries
+        {
+            get
+            {
+                if (_verifiedPropertyDictionaries == null)
+                {
+                    _verifiedPropertyDictionaries = new HashSet<string>(StringComparer.Ordinal);
+                }
+
+                return _verifiedPropertyDictionaries;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
new file mode 100644
index 0000000000..35c176a678
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Constants for method names used in code-generation
+    // Keep these in sync with the actual definitions
+    internal static class CodeGenerationConstants
+    {
+        public static class RazorComponent
+        {
+            public const string FullTypeName = "Microsoft.AspNetCore.Components.Component";
+            public const string BuildRenderTree = "BuildRenderTree";
+            public const string BuildRenderTreeParameter = "builder";
+        }
+
+        public static class RenderTreeBuilder
+        {
+            public const string FullTypeName = "Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder";
+        }
+
+        public static class InjectDirective
+        {
+            public const string FullTypeName = "Microsoft.AspNetCore.Razor.Components.InjectAttribute";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
new file mode 100644
index 0000000000..29afa982af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -0,0 +1,139 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string ComponentDocumentKind = "component.1.0";
+        private static readonly object BuildRenderTreeBaseCallAnnotation = new object();
+        private static readonly char[] PathSeparators = new char[] { '/', '\\' };
+        private static readonly char[] NamespaceSeparators = new char[] { '.' };
+
+        protected override string DocumentKind => ComponentDocumentKind;
+
+        // Ensure this runs before the MVC classifiers which have Order = 0
+        public override int Order => -100;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            return codeDocument.GetInputDocumentKind() == InputDocumentKind.Component;
+        }
+
+        protected override void OnDocumentStructureCreated(RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            if (!TryComputeNamespaceAndClass(
+                   codeDocument.Source.FilePath,
+                   codeDocument.Source.RelativePath,
+                   out var computedNamespace,
+                   out var computedClass))
+            {
+                // If we can't compute a nice namespace (no relative path) then just generate something
+                // mangled.
+                computedNamespace = "AspNetCore";
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
+                computedClass = $"AspNetCore_{checksum}";
+            }
+
+            @namespace.Content = computedNamespace;
+
+            @class.ClassName = computedClass;
+            @class.BaseType = $"global::{CodeGenerationConstants.RazorComponent.FullTypeName}";
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(filePath));
+            }
+
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+            @class.Modifiers.Add("sealed");
+
+            method.MethodName = CodeGenerationConstants.RazorComponent.BuildRenderTree;
+            method.ReturnType = "void";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("override");
+
+            method.Parameters.Clear();
+            method.Parameters.Add(new MethodParameter()
+            {
+                TypeName = CodeGenerationConstants.RenderTreeBuilder.FullTypeName,
+                ParameterName = CodeGenerationConstants.RazorComponent.BuildRenderTreeParameter,
+            });
+
+            // We need to call the 'base' method as the first statement.
+            var callBase = new CSharpCodeIntermediateNode();
+            callBase.Annotations.Add(BuildRenderTreeBaseCallAnnotation, true);
+            callBase.Children.Add(new IntermediateToken
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"base.{CodeGenerationConstants.RazorComponent.BuildRenderTree}({CodeGenerationConstants.RazorComponent.BuildRenderTreeParameter});"
+            });
+            method.Children.Insert(0, callBase);
+        }
+
+        private bool TryComputeNamespaceAndClass(string filePath, string relativePath, out string @namespace, out string @class)
+        {
+            if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
+            {
+                @namespace = null;
+                @class = null;
+                return false;
+            }
+
+            // Try and infer a namespace from the project directory. We don't yet have the ability to pass
+            // the namespace through from the project.
+            var trimLength = relativePath.Length + (relativePath.StartsWith("/") ? 0 : 1);
+            var baseDirectory = filePath.Substring(0, filePath.Length - trimLength);
+
+            var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
+            var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
+            if (string.IsNullOrEmpty(baseNamespace))
+            {
+                @namespace = null;
+                @class = null;
+                return false;
+            }
+
+            var builder = new StringBuilder();
+
+            // Sanitize the base namespace, but leave the dots.
+            var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+            builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[0]));
+            for (var i = 1; i < segments.Length; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+            // Skip the last segment because it's the FileName.
+            for (var i = 0; i < segments.Length - 1; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            @namespace = builder.ToString();
+            @class = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(relativePath));
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs
new file mode 100644
index 0000000000..6f7a2affa4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public static class ComponentExtensions
+    {
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            FunctionsDirective.Register(builder);
+            builder.Features.Add(new ComponentDocumentClassifierPass());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptor.cs
new file mode 100644
index 0000000000..28fa3f0b68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptor.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultAllowedChildTagDescriptor : AllowedChildTagDescriptor
+    {
+        public DefaultAllowedChildTagDescriptor(string name, string displayName, RazorDiagnostic[] diagnostics)
+        {
+            Name = name;
+            DisplayName = displayName;
+            Diagnostics = diagnostics;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptorBuilder.cs
new file mode 100644
index 0000000000..b420992e80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultAllowedChildTagDescriptorBuilder.cs
@@ -0,0 +1,77 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultAllowedChildTagDescriptorBuilder : AllowedChildTagDescriptorBuilder
+    {
+        private readonly DefaultTagHelperDescriptorBuilder _parent;
+        private RazorDiagnosticCollection _diagnostics;
+
+        public DefaultAllowedChildTagDescriptorBuilder(DefaultTagHelperDescriptorBuilder parent)
+        {
+            _parent = parent;
+        }
+
+        public override string Name { get; set; }
+
+        public override string DisplayName { get; set; }
+
+        public override RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public AllowedChildTagDescriptor Build()
+        {
+            var validationDiagnostics = Validate();
+            var diagnostics = new HashSet<RazorDiagnostic>(validationDiagnostics);
+            if (_diagnostics != null)
+            {
+                diagnostics.UnionWith(_diagnostics);
+            }
+
+            var displayName = DisplayName ?? Name;
+            var descriptor = new DefaultAllowedChildTagDescriptor(
+                Name,
+                displayName,
+                diagnostics?.ToArray() ?? Array.Empty<RazorDiagnostic>());
+
+            return descriptor;
+        }
+
+        private IEnumerable<RazorDiagnostic> Validate()
+        {
+            if (string.IsNullOrWhiteSpace(Name))
+            {
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRestrictedChildNullOrWhitespace(_parent.GetDisplayName());
+
+                yield return diagnostic;
+            }
+            else if (Name != TagHelperMatchingConventions.ElementCatchAllName)
+            {
+                foreach (var character in Name)
+                {
+                    if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRestrictedChild(_parent.GetDisplayName(), Name, character);
+
+                        yield return diagnostic;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
new file mode 100644
index 0000000000..597d721a96
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
@@ -0,0 +1,43 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultBoundAttributeDescriptor : BoundAttributeDescriptor
+    {
+        public DefaultBoundAttributeDescriptor(
+            string kind,
+            string name,
+            string typeName,
+            bool isEnum,
+            bool hasIndexer,
+            string indexerNamePrefix,
+            string indexerTypeName,
+            string documentation,
+            string displayName,
+            Dictionary<string, string> metadata,
+            RazorDiagnostic[] diagnostics) 
+            : base(kind)
+        {
+            Name = name;
+            TypeName = typeName;
+            IsEnum = isEnum;
+            HasIndexer = hasIndexer;
+            IndexerNamePrefix = indexerNamePrefix;
+            IndexerTypeName = indexerTypeName;
+            Documentation = documentation;
+            DisplayName = displayName;
+
+            Metadata = metadata;
+            Diagnostics = diagnostics;
+
+            IsIndexerStringProperty = indexerTypeName == typeof(string).FullName || indexerTypeName == "string";
+            IsStringProperty = typeName == typeof(string).FullName || typeName == "string";
+
+            IsIndexerBooleanProperty = indexerTypeName == typeof(bool).FullName || indexerTypeName == "bool";
+            IsBooleanProperty = typeName == typeof(bool).FullName || typeName == "bool";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
new file mode 100644
index 0000000000..0652686dd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
@@ -0,0 +1,209 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultBoundAttributeDescriptorBuilder : BoundAttributeDescriptorBuilder
+    {
+        private static readonly IReadOnlyDictionary<string, string> PrimitiveDisplayTypeNameLookups = new Dictionary<string, string>(StringComparer.Ordinal)
+        {
+            [typeof(byte).FullName] = "byte",
+            [typeof(sbyte).FullName] = "sbyte",
+            [typeof(int).FullName] = "int",
+            [typeof(uint).FullName] = "uint",
+            [typeof(short).FullName] = "short",
+            [typeof(ushort).FullName] = "ushort",
+            [typeof(long).FullName] = "long",
+            [typeof(ulong).FullName] = "ulong",
+            [typeof(float).FullName] = "float",
+            [typeof(double).FullName] = "double",
+            [typeof(char).FullName] = "char",
+            [typeof(bool).FullName] = "bool",
+            [typeof(object).FullName] = "object",
+            [typeof(string).FullName] = "string",
+            [typeof(decimal).FullName] = "decimal",
+        };
+
+        private readonly DefaultTagHelperDescriptorBuilder _parent;
+        private readonly string _kind;
+        private readonly Dictionary<string, string> _metadata;
+
+        private RazorDiagnosticCollection _diagnostics;
+
+        public DefaultBoundAttributeDescriptorBuilder(DefaultTagHelperDescriptorBuilder parent, string kind)
+        {
+            _parent = parent;
+            _kind = kind;
+
+            _metadata = new Dictionary<string, string>();
+        }
+
+        public override string Name { get; set; }
+
+        public override string TypeName { get; set; }
+
+        public override bool IsEnum { get; set; }
+
+        public override bool IsDictionary { get; set; }
+
+        public override string IndexerAttributeNamePrefix { get; set; }
+
+        public override string IndexerValueTypeName { get; set; }
+
+        public override string Documentation { get; set; }
+
+        public override string DisplayName { get; set; }
+
+        public override IDictionary<string, string> Metadata => _metadata;
+
+        public override RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public BoundAttributeDescriptor Build()
+        {
+            var validationDiagnostics = Validate();
+            var diagnostics = new HashSet<RazorDiagnostic>(validationDiagnostics);
+            if (_diagnostics != null)
+            {
+                diagnostics.UnionWith(_diagnostics);
+            }
+
+            var descriptor = new DefaultBoundAttributeDescriptor(
+                _kind,
+                Name,
+                TypeName,
+                IsEnum,
+                IsDictionary,
+                IndexerAttributeNamePrefix,
+                IndexerValueTypeName,
+                Documentation,
+                GetDisplayName(),
+                new Dictionary<string, string>(Metadata),
+                diagnostics.ToArray());
+
+            return descriptor;
+        }
+
+        private string GetDisplayName()
+        {
+            if (DisplayName != null)
+            {
+                return DisplayName;
+            }
+
+            var parentTypeName = _parent.GetTypeName();
+            var propertyName = this.GetPropertyName();
+
+            if (TypeName != null &&
+                propertyName != null &&
+                parentTypeName != null)
+            {
+                // This looks like a normal c# property, so lets compute a display name based on that.
+                if (!PrimitiveDisplayTypeNameLookups.TryGetValue(TypeName, out var simpleTypeName))
+                {
+                    simpleTypeName = TypeName;
+                }
+
+                return $"{simpleTypeName} {parentTypeName}.{propertyName}";
+            }
+
+            return Name;
+        }
+
+        private IEnumerable<RazorDiagnostic> Validate()
+        {
+            // data-* attributes are explicitly not implemented by user agents and are not intended for use on
+            // the server; therefore it's invalid for TagHelpers to bind to them.
+            const string DataDashPrefix = "data-";
+
+            if (string.IsNullOrWhiteSpace(Name))
+            {
+                if (IndexerAttributeNamePrefix == null)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeNullOrWhitespace(
+                        _parent.GetDisplayName(),
+                        GetDisplayName());
+
+                    yield return diagnostic;
+                }
+            }
+            else
+            {
+                if (Name.StartsWith(DataDashPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeNameStartsWith(
+                        _parent.GetDisplayName(),
+                        GetDisplayName(),
+                        Name);
+
+                    yield return diagnostic;
+                }
+
+                foreach (var character in Name)
+                {
+                    if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeName(
+                            _parent.GetDisplayName(),
+                            GetDisplayName(),
+                            Name,
+                            character);
+
+                        yield return diagnostic;
+                    }
+                }
+            }
+
+            if (IndexerAttributeNamePrefix != null)
+            {
+                if (IndexerAttributeNamePrefix.StartsWith(DataDashPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributePrefixStartsWith(
+                        _parent.GetDisplayName(),
+                        GetDisplayName(),
+                        IndexerAttributeNamePrefix);
+
+                    yield return diagnostic;
+                }
+                else if (IndexerAttributeNamePrefix.Length > 0 && string.IsNullOrWhiteSpace(IndexerAttributeNamePrefix))
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeNullOrWhitespace(
+                        _parent.GetDisplayName(),
+                        GetDisplayName());
+
+                    yield return diagnostic;
+                }
+                else
+                {
+                    foreach (var character in IndexerAttributeNamePrefix)
+                    {
+                        if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                        {
+                            var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributePrefix(
+                                _parent.GetDisplayName(),
+                                GetDisplayName(),
+                                IndexerAttributeNamePrefix,
+                                character);
+
+                            yield return diagnostic;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
new file mode 100644
index 0000000000..65e578b5ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
@@ -0,0 +1,66 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultDirectiveSyntaxTreePass : RazorEngineFeatureBase, IRazorSyntaxTreePass
+    {
+        public int Order => 75;
+
+        public RazorSyntaxTree Execute(RazorCodeDocument codeDocument, RazorSyntaxTree syntaxTree)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (syntaxTree == null)
+            {
+                throw new ArgumentNullException(nameof(syntaxTree));
+            }
+            
+            var sectionVerifier = new NestedSectionVerifier(syntaxTree);
+            return sectionVerifier.Verify();
+        }
+
+        private class NestedSectionVerifier : SyntaxRewriter
+        {
+            private int _nestedLevel;
+            private RazorSyntaxTree _syntaxTree;
+
+            public NestedSectionVerifier(RazorSyntaxTree syntaxTree)
+            {
+                _syntaxTree = syntaxTree;
+            }
+
+            public RazorSyntaxTree Verify()
+            {
+                var root = Visit(_syntaxTree.Root);
+                var rewrittenTree = new DefaultRazorSyntaxTree(root, _syntaxTree.Source, _syntaxTree.Diagnostics, _syntaxTree.Options);
+                return rewrittenTree;
+            }
+
+            public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                if (_nestedLevel > 0)
+                {
+                    var directiveStart = node.Transition.GetSourceLocation(_syntaxTree.Source);
+                    var errorLength = /* @ */ 1 + SectionDirective.Directive.Directive.Length;
+                    var error = RazorDiagnosticFactory.CreateParsing_SectionsCannotBeNested(new SourceSpan(directiveStart, errorLength));
+                    node = node.AppendDiagnostic(error);
+                }
+                _nestedLevel++;
+                var result = base.VisitRazorDirective(node);
+                _nestedLevel--;
+
+                return result;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPass.cs
new file mode 100644
index 0000000000..860e42a583
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPass.cs
@@ -0,0 +1,49 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public override int Order => DefaultFeatureOrder;
+
+        protected override string DocumentKind => "default";
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            return true;
+        }
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument,
+            NamespaceDeclarationIntermediateNode @namespace,
+            ClassDeclarationIntermediateNode @class,
+            MethodDeclarationIntermediateNode method)
+        {
+            var configuration = Engine.Features.OfType<DefaultDocumentClassifierPassFeature>().FirstOrDefault();
+            if (configuration != null)
+            {
+                for (var i = 0; i < configuration.ConfigureClass.Count; i++)
+                {
+                    var configureClass = configuration.ConfigureClass[i];
+                    configureClass(codeDocument, @class);
+                }
+
+                for (var i = 0; i < configuration.ConfigureNamespace.Count; i++)
+                {
+                    var configureNamespace = configuration.ConfigureNamespace[i];
+                    configureNamespace(codeDocument, @namespace);
+                }
+
+                for (var i = 0; i < configuration.ConfigureMethod.Count; i++)
+                {
+                    var configureMethod = configuration.ConfigureMethod[i];
+                    configureMethod(codeDocument, @method);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPassFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPassFeature.cs
new file mode 100644
index 0000000000..278e825de7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDocumentClassifierPassFeature.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultDocumentClassifierPassFeature : RazorEngineFeatureBase
+    {
+        public IList<Action<RazorCodeDocument, ClassDeclarationIntermediateNode>> ConfigureClass { get; } =
+            new List<Action<RazorCodeDocument, ClassDeclarationIntermediateNode>>();
+
+        public IList<Action<RazorCodeDocument, NamespaceDeclarationIntermediateNode>> ConfigureNamespace { get; } =
+            new List<Action<RazorCodeDocument, NamespaceDeclarationIntermediateNode>>();
+
+        public IList<Action<RazorCodeDocument, MethodDeclarationIntermediateNode>> ConfigureMethod { get; } =
+            new List<Action<RazorCodeDocument, MethodDeclarationIntermediateNode>>();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultImportProjectFeature.cs
new file mode 100644
index 0000000000..92778322d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultImportProjectFeature.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+    {
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem) => Array.Empty<RazorProjectItem>();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs
new file mode 100644
index 0000000000..cae8cfb69d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorCSharpDocument : RazorCSharpDocument
+    {
+        private readonly string _generatedCode;
+        private readonly RazorDiagnostic[] _diagnostics;
+        private readonly SourceMapping[] _sourceMappings;
+        private readonly RazorCodeGenerationOptions _options;
+
+        public DefaultRazorCSharpDocument(
+            string generatedCode,
+            RazorCodeGenerationOptions options,
+            RazorDiagnostic[] diagnostics,
+            SourceMapping[] sourceMappings)
+        {
+            if (generatedCode == null)
+            {
+                throw new ArgumentNullException(nameof(generatedCode));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            _generatedCode = generatedCode;
+            _options = options;
+
+            _diagnostics = diagnostics ?? Array.Empty<RazorDiagnostic>();
+            _sourceMappings = sourceMappings ?? Array.Empty<SourceMapping>();
+        }
+
+        public override IReadOnlyList<RazorDiagnostic> Diagnostics => _diagnostics;
+
+        public override string GeneratedCode => _generatedCode;
+
+        public override IReadOnlyList<SourceMapping> SourceMappings => _sourceMappings;
+
+        public override RazorCodeGenerationOptions Options => _options;
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
new file mode 100644
index 0000000000..f09c68069a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSharpLoweringPhase
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            ThrowForMissingDocumentDependency(documentNode);
+
+            var target = documentNode.Target;
+            if (target == null)
+            {
+                var message = Resources.FormatDocumentMissingTarget(
+                    documentNode.DocumentKind,
+                    nameof(CodeTarget),
+                    nameof(DocumentIntermediateNode.Target));
+                throw new InvalidOperationException(message);
+            }
+
+            var writer = DocumentWriter.CreateDefault(documentNode.Target, documentNode.Options);
+            var cSharpDocument = writer.WriteDocument(codeDocument, documentNode);
+            codeDocument.SetCSharpDocument(cSharpDocument);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeDocument.cs
new file mode 100644
index 0000000000..bceb14cbda
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeDocument.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorCodeDocument : RazorCodeDocument
+    {
+        public DefaultRazorCodeDocument(
+            RazorSourceDocument source,
+            IEnumerable<RazorSourceDocument> imports)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            Source = source;
+            Imports = imports?.ToArray() ?? RazorSourceDocument.EmptyArray;
+
+            Items = new ItemCollection();
+        }
+
+        public override IReadOnlyList<RazorSourceDocument> Imports { get; }
+
+        public override ItemCollection Items { get; }
+
+        public override RazorSourceDocument Source { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
new file mode 100644
index 0000000000..6b694d9382
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
@@ -0,0 +1,32 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorCodeGenerationOptions : RazorCodeGenerationOptions
+    {
+        public DefaultRazorCodeGenerationOptions(
+            bool indentWithTabs, 
+            int indentSize, 
+            bool designTime, 
+            bool suppressChecksum,
+            bool supressMetadataAttributes,
+            bool suppressPrimaryMethodBody)
+        {
+            IndentWithTabs = indentWithTabs;
+            IndentSize = indentSize;
+            DesignTime = designTime;
+            SuppressChecksum = suppressChecksum;
+            SuppressMetadataAttributes = supressMetadataAttributes;
+            SuppressPrimaryMethodBody = suppressPrimaryMethodBody;
+        }
+
+        public override bool DesignTime { get; }
+
+        public override bool IndentWithTabs { get; }
+
+        public override int IndentSize { get; }
+
+        public override bool SuppressChecksum { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
new file mode 100644
index 0000000000..7507ac0fee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
@@ -0,0 +1,51 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorCodeGenerationOptionsBuilder : RazorCodeGenerationOptionsBuilder
+    {
+        private bool _designTime;
+
+        public DefaultRazorCodeGenerationOptionsBuilder(RazorConfiguration configuration)
+        {
+            if (configuration == null)
+            {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+        }
+
+        public DefaultRazorCodeGenerationOptionsBuilder(bool designTime)
+        {
+            _designTime = designTime;
+        }
+
+        public override RazorConfiguration Configuration { get; }
+
+        public override bool DesignTime => _designTime;
+
+        public override int IndentSize { get; set; } = 4;
+
+        public override bool IndentWithTabs { get; set; }
+
+        public override bool SuppressChecksum { get; set; }
+
+        public override RazorCodeGenerationOptions Build()
+        {
+            return new DefaultRazorCodeGenerationOptions(
+                IndentWithTabs,
+                IndentSize,
+                DesignTime,
+                SuppressChecksum,
+                SuppressMetadataAttributes,
+                SuppressPrimaryMethodBody);
+        }
+
+        public override void SetDesignTime(bool designTime)
+        {
+            _designTime = designTime;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs
new file mode 100644
index 0000000000..db2a25b81f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorCodeGenerationOptionsFactoryProjectFeature : RazorProjectEngineFeatureBase, IRazorCodeGenerationOptionsFactoryProjectFeature
+    {
+        private IConfigureRazorCodeGenerationOptionsFeature[] _configureOptions;
+
+        protected override void OnInitialized()
+        {
+            _configureOptions = ProjectEngine.EngineFeatures.OfType<IConfigureRazorCodeGenerationOptionsFeature>().ToArray();
+        }
+
+        public RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
+        {
+            var builder = new DefaultRazorCodeGenerationOptionsBuilder(ProjectEngine.Configuration);
+            configure?.Invoke(builder);
+
+            for (var i = 0; i < _configureOptions.Length; i++)
+            {
+                _configureOptions[i].Configure(builder);
+            }
+
+            var options = builder.Build();
+            return options;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFeature.cs
new file mode 100644
index 0000000000..1c915364d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFeature.cs
@@ -0,0 +1,38 @@
+// 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.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    internal class DefaultRazorCodeGenerationOptionsFeature : RazorEngineFeatureBase, IRazorCodeGenerationOptionsFeature
+#pragma warning restore CS0618 // Type or member is obsolete
+    {
+        private readonly bool _designTime;
+        private IConfigureRazorCodeGenerationOptionsFeature[] _configureOptions;
+
+        public DefaultRazorCodeGenerationOptionsFeature(bool designTime)
+        {
+            _designTime = designTime;
+        }
+
+        protected override void OnInitialized()
+        {
+            _configureOptions = Engine.Features.OfType<IConfigureRazorCodeGenerationOptionsFeature>().ToArray();
+        }
+
+        public RazorCodeGenerationOptions GetOptions()
+        {
+            return _designTime ? RazorCodeGenerationOptions.CreateDesignTime(ConfigureOptions) : RazorCodeGenerationOptions.Create(ConfigureOptions);
+        }
+
+        private void ConfigureOptions(RazorCodeGenerationOptionsBuilder builder)
+        {
+            for (var i = 0; i < _configureOptions.Length; i++)
+            {
+                _configureOptions[i].Configure(builder);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDiagnostic.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDiagnostic.cs
new file mode 100644
index 0000000000..40f558df26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDiagnostic.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorDiagnostic : RazorDiagnostic
+    {
+        internal DefaultRazorDiagnostic(RazorDiagnosticDescriptor descriptor, SourceSpan span, object[] args)
+        {
+            Descriptor = descriptor;
+            Span = span;
+            Args = args;
+        }
+
+        public override string Id => Descriptor.Id;
+
+        public override RazorDiagnosticSeverity Severity => Descriptor.Severity;
+
+        public override SourceSpan Span { get; }
+
+        // Internal for testing
+        internal RazorDiagnosticDescriptor Descriptor { get; }
+
+        // Internal for testing
+        internal object[] Args { get; }
+
+        public override string GetMessage(IFormatProvider formatProvider)
+        {
+            var format = Descriptor.GetMessageFormat();
+            return string.Format(formatProvider, format, Args);
+        }
+
+        public override bool Equals(RazorDiagnostic obj)
+        {
+            var other = obj as DefaultRazorDiagnostic;
+            if (other == null)
+            {
+                return false;
+            }
+
+            if (!Descriptor.Equals(other.Descriptor))
+            {
+                return false;
+            }
+            
+            if (!Span.Equals(other.Span))
+            {
+                return false;
+            }
+
+            if (Args.Length != other.Args.Length)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < Args.Length; i++)
+            {
+                if (!Args[i].Equals(other.Args[i]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = new HashCodeCombiner();
+            hash.Add(Descriptor.GetHashCode());
+            hash.Add(Span.GetHashCode());
+
+            for (var i = 0; i < Args.Length; i++)
+            {
+                hash.Add(Args[i]);
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveClassifierPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveClassifierPhase.cs
new file mode 100644
index 0000000000..155bf88455
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveClassifierPhase.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorDirectiveClassifierPhase : RazorEnginePhaseBase, IRazorDirectiveClassifierPhase
+    {
+        public IRazorDirectiveClassifierPass[] Passes { get; private set; }
+
+        protected override void OnIntialized()
+        {
+            Passes = Engine.Features.OfType<IRazorDirectiveClassifierPass>().OrderBy(p => p.Order).ToArray();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            ThrowForMissingDocumentDependency(irDocument);
+
+            foreach (var pass in Passes)
+            {
+                pass.Execute(codeDocument, irDocument);
+            }
+
+            codeDocument.SetDocumentIntermediateNode(irDocument);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
new file mode 100644
index 0000000000..9738743079
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorDirectiveFeature : RazorEngineFeatureBase, IRazorDirectiveFeature, IConfigureRazorParserOptionsFeature
+    {
+        public ICollection<DirectiveDescriptor> Directives { get; } = new List<DirectiveDescriptor>();
+
+        public int Order => 100;
+
+        void IConfigureRazorParserOptionsFeature.Configure(RazorParserOptionsBuilder options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.Directives.Clear();
+
+            foreach (var directive in Directives)
+            {
+                options.Directives.Add(directive);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDocumentClassifierPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDocumentClassifierPhase.cs
new file mode 100644
index 0000000000..8a41520dec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDocumentClassifierPhase.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorDocumentClassifierPhase : RazorEnginePhaseBase, IRazorDocumentClassifierPhase
+    {
+        public IRazorDocumentClassifierPass[] Passes { get; private set; }
+
+        protected override void OnIntialized()
+        {
+            Passes = Engine.Features.OfType<IRazorDocumentClassifierPass>().OrderBy(p => p.Order).ToArray();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            ThrowForMissingDocumentDependency(irDocument);
+
+            foreach (var pass in Passes)
+            {
+                pass.Execute(codeDocument, irDocument);
+            }
+
+            codeDocument.SetDocumentIntermediateNode(irDocument);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngine.cs
new file mode 100644
index 0000000000..27f22e01e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngine.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorEngine : RazorEngine
+    {
+        public DefaultRazorEngine(IRazorEngineFeature[] features, IRazorEnginePhase[] phases)
+        {
+            if (features == null)
+            {
+                throw new ArgumentNullException(nameof(features));
+            }
+
+            if (phases == null)
+            {
+                throw new ArgumentNullException(nameof(phases));
+            }
+
+            Features = features;
+            Phases = phases;
+
+            for (var i = 0; i < features.Length; i++)
+            {
+                features[i].Engine = this;
+            }
+
+            for (var i = 0; i < phases.Length; i++)
+            {
+                phases[i].Engine = this;
+            }
+        }
+
+        public override IReadOnlyList<IRazorEngineFeature> Features { get; }
+
+        public override IReadOnlyList<IRazorEnginePhase> Phases { get; }
+
+        public override void Process(RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            for (var i = 0; i < Phases.Count; i++)
+            {
+                var phase = Phases[i];
+                phase.Execute(document);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngineBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngineBuilder.cs
new file mode 100644
index 0000000000..50b3f1a6d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorEngineBuilder.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    internal class DefaultRazorEngineBuilder : IRazorEngineBuilder
+#pragma warning restore CS0618 // Type or member is obsolete
+    {
+        public DefaultRazorEngineBuilder(bool designTime)
+        {
+            DesignTime = designTime;
+            Features = new List<IRazorEngineFeature>();
+            Phases = new List<IRazorEnginePhase>();
+        }
+
+        public ICollection<IRazorEngineFeature> Features { get; }
+
+        public IList<IRazorEnginePhase> Phases { get; }
+
+        public bool DesignTime { get; }
+
+        public RazorEngine Build()
+        {
+            var features = new IRazorEngineFeature[Features.Count];
+            Features.CopyTo(features, arrayIndex: 0);
+
+            var phases = new IRazorEnginePhase[Phases.Count];
+            Phases.CopyTo(phases, arrayIndex: 0);
+
+            return new DefaultRazorEngine(features, phases);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
new file mode 100644
index 0000000000..07e1ad44c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -0,0 +1,1118 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    internal class DefaultRazorIntermediateNodeLoweringPhase : RazorEnginePhaseBase, IRazorIntermediateNodeLoweringPhase
+    {
+        private IRazorCodeGenerationOptionsFeature _optionsFeature;
+
+        protected override void OnIntialized()
+        {
+            _optionsFeature = GetRequiredFeature<IRazorCodeGenerationOptionsFeature>();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            ThrowForMissingDocumentDependency(syntaxTree);
+
+            // This might not have been set if there are no tag helpers.
+            var tagHelperContext = codeDocument.GetTagHelperContext();
+
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            document.Options = codeDocument.GetCodeGenerationOptions() ?? _optionsFeature.GetOptions();
+
+            IReadOnlyList<UsingReference> importedUsings = Array.Empty<UsingReference>();
+
+            // The import documents should be inserted logically before the main document.
+            var imports = codeDocument.GetImportSyntaxTrees();
+            if (imports != null)
+            {
+                var importsVisitor = new ImportsVisitor(document, builder, syntaxTree.Options.FeatureFlags);
+
+                for (var j = 0; j < imports.Count; j++)
+                {
+                    var import = imports[j];
+
+                    importsVisitor.SourceDocument = import.Source;
+                    importsVisitor.Visit(import.Root);
+                }
+
+                importedUsings = importsVisitor.Usings;
+            }
+
+            var tagHelperPrefix = tagHelperContext?.Prefix;
+            var visitor = new MainSourceVisitor(document, builder, tagHelperPrefix, syntaxTree.Options.FeatureFlags)
+            {
+                SourceDocument = syntaxTree.Source,
+            };
+
+            visitor.Visit(syntaxTree.Root);
+
+            // 1. Prioritize non-imported usings over imported ones.
+            // 2. Don't import usings that already exist in primary document.
+            // 3. Allow duplicate usings in primary document (C# warning).
+            var usingReferences = new List<UsingReference>(visitor.Usings);
+            for (var j = importedUsings.Count - 1; j >= 0; j--)
+            {
+                if (!usingReferences.Contains(importedUsings[j]))
+                {
+                    usingReferences.Insert(0, importedUsings[j]);
+                }
+            }
+
+            // In each lowering piece above, namespaces were tracked. We render them here to ensure every
+            // lowering action has a chance to add a source location to a namespace. Ultimately, closest wins.
+
+            var i = 0;
+            foreach (var reference in usingReferences)
+            {
+                var @using = new UsingDirectiveIntermediateNode()
+                {
+                    Content = reference.Namespace,
+                    Source = reference.Source,
+                };
+
+                builder.Insert(i++, @using);
+            }
+
+            ImportDirectives(document);
+
+            // The document should contain all errors that currently exist in the system. This involves
+            // adding the errors from the primary and imported syntax trees.
+            for (i = 0; i < syntaxTree.Diagnostics.Count; i++)
+            {
+                document.Diagnostics.Add(syntaxTree.Diagnostics[i]);
+            }
+
+            if (imports != null)
+            {
+                for (i = 0; i < imports.Count; i++)
+                {
+                    var import = imports[i];
+                    for (var j = 0; j < import.Diagnostics.Count; j++)
+                    {
+                        document.Diagnostics.Add(import.Diagnostics[j]);
+                    }
+                }
+            }
+
+            codeDocument.SetDocumentIntermediateNode(document);
+        }
+
+        private void ImportDirectives(DocumentIntermediateNode document)
+        {
+            var visitor = new DirectiveVisitor();
+            visitor.VisitDocument(document);
+
+            var seenDirectives = new HashSet<DirectiveDescriptor>();
+            for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+            {
+                var reference = visitor.Directives[i];
+                var directive = (DirectiveIntermediateNode)reference.Node;
+                var descriptor = directive.Directive;
+                var seenDirective = !seenDirectives.Add(descriptor);
+
+                if (!directive.IsImported())
+                {
+                    continue;
+                }
+
+                switch (descriptor.Kind)
+                {
+                    case DirectiveKind.SingleLine:
+                        if (seenDirective && descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
+                        {
+                            // This directive has been overridden, it should be removed from the document.
+
+                            break;
+                        }
+
+                        continue;
+                    case DirectiveKind.RazorBlock:
+                    case DirectiveKind.CodeBlock:
+                        if (descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
+                        {
+                            // A block directive cannot be imported.
+
+                            document.Diagnostics.Add(
+                                RazorDiagnosticFactory.CreateDirective_BlockDirectiveCannotBeImported(descriptor.Directive));
+                        }
+                        break;
+                    default:
+                        throw new InvalidOperationException(Resources.FormatUnexpectedDirectiveKind(typeof(DirectiveKind).FullName));
+                }
+
+                // Overridden and invalid imported directives make it to here. They should be removed from the document.
+
+                reference.Remove();
+            }
+        }
+
+        private struct UsingReference : IEquatable<UsingReference>
+        {
+            public UsingReference(string @namespace, SourceSpan? source)
+            {
+                Namespace = @namespace;
+                Source = source;
+            }
+            public string Namespace { get; }
+
+            public SourceSpan? Source { get; }
+
+            public override bool Equals(object other)
+            {
+                if (other is UsingReference reference)
+                {
+                    return Equals(reference);
+                }
+
+                return false;
+            }
+            public bool Equals(UsingReference other)
+            {
+                return string.Equals(Namespace, other.Namespace, StringComparison.Ordinal);
+            }
+
+            public override int GetHashCode() => Namespace.GetHashCode();
+        }
+
+        private class LoweringVisitor : SyntaxWalker
+        {
+            protected readonly IntermediateNodeBuilder _builder;
+            protected readonly DocumentIntermediateNode _document;
+            protected readonly List<UsingReference> _usings;
+            protected readonly RazorParserFeatureFlags _featureFlags;
+
+            public LoweringVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, RazorParserFeatureFlags featureFlags)
+            {
+                _document = document;
+                _builder = builder;
+                _usings = new List<UsingReference>();
+                _featureFlags = featureFlags;
+            }
+
+            public IReadOnlyList<UsingReference> Usings => _usings;
+
+            public RazorSourceDocument SourceDocument { get; set; }
+
+            public override void VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                IntermediateNode directiveNode;
+                var descriptor = node.DirectiveDescriptor;
+
+                if (descriptor != null)
+                {
+                    var diagnostics = node.GetDiagnostics();
+
+                    // This is an extensible directive.
+                    if (IsMalformed(diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = descriptor.Directive,
+                            Directive = descriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = descriptor.Directive,
+                            Directive = descriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < diagnostics.Length; i++)
+                    {
+                        directiveNode.Diagnostics.Add(diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+                }
+
+                Visit(node.Body);
+
+                if (descriptor != null)
+                {
+                    _builder.Pop();
+                }
+            }
+
+            public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context == null)
+                {
+                    base.VisitCSharpStatementLiteral(node);
+                    return;
+                }
+                else if (context.ChunkGenerator is DirectiveTokenChunkGenerator tokenChunkGenerator)
+                {
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = node.GetContent(),
+                        DirectiveToken = tokenChunkGenerator.Descriptor,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+                }
+                else if (context.ChunkGenerator is AddImportChunkGenerator importChunkGenerator)
+                {
+                    var namespaceImport = importChunkGenerator.Namespace.Trim();
+                    var namespaceSpan = BuildSourceSpanFromNode(node);
+                    _usings.Add(new UsingReference(namespaceImport, namespaceSpan));
+                }
+                else if (context.ChunkGenerator is AddTagHelperChunkGenerator addTagHelperChunkGenerator)
+                {
+                    IntermediateNode directiveNode;
+                    if (IsMalformed(addTagHelperChunkGenerator.Diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < addTagHelperChunkGenerator.Diagnostics.Count; i++)
+                    {
+                        directiveNode.Diagnostics.Add(addTagHelperChunkGenerator.Diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = addTagHelperChunkGenerator.LookupText,
+                        DirectiveToken = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Tokens.First(),
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+                }
+                else if (context.ChunkGenerator is RemoveTagHelperChunkGenerator removeTagHelperChunkGenerator)
+                {
+                    IntermediateNode directiveNode;
+                    if (IsMalformed(removeTagHelperChunkGenerator.Diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < removeTagHelperChunkGenerator.Diagnostics.Count; i++)
+                    {
+                        directiveNode.Diagnostics.Add(removeTagHelperChunkGenerator.Diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = removeTagHelperChunkGenerator.LookupText,
+                        DirectiveToken = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Tokens.First(),
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+                }
+                else if (context.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator tagHelperPrefixChunkGenerator)
+                {
+                    IntermediateNode directiveNode;
+                    if (IsMalformed(tagHelperPrefixChunkGenerator.Diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < tagHelperPrefixChunkGenerator.Diagnostics.Count; i++)
+                    {
+                        directiveNode.Diagnostics.Add(tagHelperPrefixChunkGenerator.Diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = tagHelperPrefixChunkGenerator.Prefix,
+                        DirectiveToken = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Tokens.First(),
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+                }
+
+                base.VisitCSharpStatementLiteral(node);
+            }
+
+            protected SourceSpan? BuildSourceSpanFromNode(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return null;
+                }
+
+                return node.GetSourceSpan(SourceDocument);
+            }
+        }
+
+        private class MainSourceVisitor : LoweringVisitor
+        {
+            private readonly HashSet<string> _renderedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            private readonly string _tagHelperPrefix;
+
+            public MainSourceVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, string tagHelperPrefix, RazorParserFeatureFlags featureFlags)
+                : base(document, builder, featureFlags)
+            {
+                _tagHelperPrefix = tagHelperPrefix;
+            }
+
+            // Example
+            // <input` checked="hello-world @false"`/>
+            //  Name=checked
+            //  Prefix= checked="
+            //  Suffix="
+            public override void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+            {
+                var prefixTokens = MergeLiterals(
+                    node.NamePrefix?.LiteralTokens,
+                    node.Name.LiteralTokens,
+                    node.NameSuffix?.LiteralTokens,
+                    node.EqualsToken == null ? new SyntaxList<SyntaxToken>() : new SyntaxList<SyntaxToken>(node.EqualsToken),
+                    node.ValuePrefix?.LiteralTokens);
+                var prefix = (MarkupTextLiteralSyntax)SyntaxFactory.MarkupTextLiteral(prefixTokens).Green.CreateRed(node, node.NamePrefix?.Position ?? node.Name.Position);
+
+                var name = node.Name.GetContent();
+                if (name.StartsWith("data-", StringComparison.OrdinalIgnoreCase) &&
+                    !_featureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes)
+                {
+                    Visit(prefix);
+                    Visit(node.Value);
+                    Visit(node.ValueSuffix);
+                }
+                else
+                {
+                    if (node.Value != null && node.Value.ChildNodes().All(c => c is MarkupLiteralAttributeValueSyntax))
+                    {
+                        // We need to do what ConditionalAttributeCollapser used to do.
+                        var literalAttributeValueNodes = node.Value.ChildNodes().Cast<MarkupLiteralAttributeValueSyntax>().ToArray();
+                        var valueTokens = SyntaxListBuilder<SyntaxToken>.Create();
+                        for (var i = 0; i < literalAttributeValueNodes.Length; i++)
+                        {
+                            var mergedValue = MergeAttributeValue(literalAttributeValueNodes[i]);
+                            valueTokens.AddRange(mergedValue.LiteralTokens);
+                        }
+                        var rewritten = SyntaxFactory.MarkupTextLiteral(valueTokens.ToList());
+
+                        var mergedLiterals = MergeLiterals(prefix?.LiteralTokens, rewritten.LiteralTokens, node.ValueSuffix?.LiteralTokens);
+                        var mergedAttribute = SyntaxFactory.MarkupTextLiteral(mergedLiterals).Green.CreateRed(node.Parent, node.Position);
+                        Visit(mergedAttribute);
+                    }
+                    else
+                    {
+                        _builder.Push(new HtmlAttributeIntermediateNode()
+                        {
+                            AttributeName = node.Name.GetContent(),
+                            Prefix = prefix.GetContent(),
+                            Suffix = node.ValueSuffix?.GetContent() ?? string.Empty,
+                            Source = BuildSourceSpanFromNode(node),
+                        });
+
+                        VisitAttributeValue(node.Value);
+
+                        _builder.Pop();
+                    }
+                }
+            }
+
+            public override void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+            {
+                var name = node.Name.GetContent();
+                if (name.StartsWith("data-", StringComparison.OrdinalIgnoreCase) &&
+                    !_featureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes)
+                {
+                    base.VisitMarkupMinimizedAttributeBlock(node);
+                    return;
+                }
+
+                // Minimized attributes are just html content.
+                var literals = MergeLiterals(
+                    node.NamePrefix?.LiteralTokens,
+                    node.Name?.LiteralTokens);
+                var literal = SyntaxFactory.MarkupTextLiteral(literals).Green.CreateRed(node.Parent, node.Position);
+
+                Visit(literal);
+            }
+
+            // Example
+            // <input checked="hello-world `@false`"/>
+            //  Prefix= (space)
+            //  Children will contain a token for @false.
+            public override void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+            {
+                var containsExpression = false;
+                var descendantNodes = node.DescendantNodes(n =>
+                {
+                    // Don't go into sub block. They may contain expressions but we only care about the top level.
+                    return !(n.Parent is CSharpCodeBlockSyntax);
+                });
+                foreach (var child in descendantNodes)
+                {
+                    if (child is CSharpImplicitExpressionSyntax || child is CSharpExplicitExpressionSyntax)
+                    {
+                        containsExpression = true;
+                    }
+                }
+
+                if (containsExpression)
+                {
+                    _builder.Push(new CSharpExpressionAttributeValueIntermediateNode()
+                    {
+                        Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+                }
+                else
+                {
+                    _builder.Push(new CSharpCodeAttributeValueIntermediateNode()
+                    {
+                        Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+                }
+
+                Visit(node.Value);
+
+                _builder.Pop();
+            }
+
+            public override void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                _builder.Push(new HtmlAttributeValueIntermediateNode()
+                {
+                    Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                    Source = BuildSourceSpanFromNode(node),
+                });
+
+                _builder.Add(new IntermediateToken()
+                {
+                    Content = node.Value?.GetContent() ?? string.Empty,
+                    Kind = TokenKind.Html,
+                    Source = BuildSourceSpanFromNode(node.Value)
+                });
+
+                _builder.Pop();
+            }
+
+            public override void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+            {
+                var templateNode = new TemplateIntermediateNode();
+                _builder.Push(templateNode);
+
+                base.VisitCSharpTemplateBlock(node);
+
+                _builder.Pop();
+
+                if (templateNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = templateNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = templateNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        templateNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            // CSharp expressions are broken up into blocks and spans because Razor allows Razor comments
+            // inside an expression.
+            // Ex:
+            //      @DateTime.@*This is a comment*@Now
+            //
+            // We need to capture this in the IR so that we can give each piece the correct source mappings
+            public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+            {
+                if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
+                {
+                    base.VisitCSharpExplicitExpression(node);
+                    return;
+                }
+
+                var expressionNode = new CSharpExpressionIntermediateNode();
+
+                _builder.Push(expressionNode);
+
+                base.VisitCSharpExplicitExpression(node);
+
+                _builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = expressionNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        expressionNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+            {
+                if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
+                {
+                    base.VisitCSharpImplicitExpression(node);
+                    return;
+                }
+
+                var expressionNode = new CSharpExpressionIntermediateNode();
+
+                _builder.Push(expressionNode);
+
+                base.VisitCSharpImplicitExpression(node);
+
+                _builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = expressionNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        expressionNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                if (_builder.Current is TagHelperHtmlAttributeIntermediateNode)
+                {
+                    // If we are top level in a tag helper HTML attribute, we want to be rendered as markup.
+                    // This case happens for duplicate non-string bound attributes. They would be initially be categorized as
+                    // CSharp but since they are duplicate, they should just be markup.
+                    var markupLiteral = SyntaxFactory.MarkupTextLiteral(node.LiteralTokens).Green.CreateRed(node.Parent, node.Position);
+                    Visit(markupLiteral);
+                    return;
+                }
+
+                _builder.Add(new IntermediateToken()
+                {
+                    Content = node.GetContent(),
+                    Kind = TokenKind.CSharp,
+                    Source = BuildSourceSpanFromNode(node),
+                });
+
+                base.VisitCSharpExpressionLiteral(node);
+            }
+
+            public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context == null || context.ChunkGenerator is StatementChunkGenerator)
+                {
+                    var isAttributeValue = _builder.Current is CSharpCodeAttributeValueIntermediateNode;
+
+                    if (!isAttributeValue)
+                    {
+                        var statementNode = new CSharpCodeIntermediateNode()
+                        {
+                            Source = BuildSourceSpanFromNode(node)
+                        };
+                        _builder.Push(statementNode);
+                    }
+
+                    _builder.Add(new IntermediateToken()
+                    {
+                        Content = node.GetContent(),
+                        Kind = TokenKind.CSharp,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    if (!isAttributeValue)
+                    {
+                        _builder.Pop();
+                    }
+                }
+
+                base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator == SpanChunkGenerator.Null)
+                {
+                    base.VisitMarkupTextLiteral(node);
+                    return;
+                }
+
+                if (node.LiteralTokens.Count == 1)
+                {
+                    var token = node.LiteralTokens[0];
+                    if (token != null &&
+                        token.Kind == SyntaxKind.Marker &&
+                        token.Content.Length == 0)
+                    {
+                        // We don't want to create IR nodes for marker tokens.
+                        base.VisitMarkupTextLiteral(node);
+                        return;
+                    }
+                }
+
+                var source = BuildSourceSpanFromNode(node);
+                var currentChildren = _builder.Current.Children;
+                if (currentChildren.Count > 0 && currentChildren[currentChildren.Count - 1] is HtmlContentIntermediateNode)
+                {
+                    var existingHtmlContent = (HtmlContentIntermediateNode)currentChildren[currentChildren.Count - 1];
+
+                    if (existingHtmlContent.Source == null && source == null)
+                    {
+                        Combine(existingHtmlContent, node);
+                        base.VisitMarkupTextLiteral(node);
+                        return;
+                    }
+
+                    if (source != null &&
+                        existingHtmlContent.Source != null &&
+                        existingHtmlContent.Source.Value.FilePath == source.Value.FilePath &&
+                        existingHtmlContent.Source.Value.AbsoluteIndex + existingHtmlContent.Source.Value.Length == source.Value.AbsoluteIndex)
+                    {
+                        Combine(existingHtmlContent, node);
+                        base.VisitMarkupTextLiteral(node);
+                        return;
+                    }
+                }
+
+                var contentNode = new HtmlContentIntermediateNode()
+                {
+                    Source = source
+                };
+                _builder.Push(contentNode);
+
+                _builder.Add(new IntermediateToken()
+                {
+                    Content = node.GetContent(),
+                    Kind = TokenKind.Html,
+                    Source = source,
+                });
+
+                _builder.Pop();
+
+                base.VisitMarkupTextLiteral(node);
+            }
+
+            public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+            {
+                var info = node.TagHelperInfo;
+                var tagName = info.TagName;
+                if (_tagHelperPrefix != null)
+                {
+                    tagName = tagName.Substring(_tagHelperPrefix.Length);
+                }
+
+                var tagHelperNode = new TagHelperIntermediateNode()
+                {
+                    TagName = tagName,
+                    TagMode = info.TagMode,
+                    Source = BuildSourceSpanFromNode(node)
+                };
+
+                foreach (var tagHelper in info.BindingResult.Descriptors)
+                {
+                    tagHelperNode.TagHelpers.Add(tagHelper);
+                }
+
+                _builder.Push(tagHelperNode);
+
+                _builder.Push(new TagHelperBodyIntermediateNode());
+
+                foreach (var item in node.Body)
+                {
+                    Visit(item);
+                }
+
+                _builder.Pop(); // Pop InitializeTagHelperStructureIntermediateNode
+
+                Visit(node.StartTag);
+
+                _builder.Pop(); // Pop TagHelperIntermediateNode
+
+                // No need to visit the end tag because we don't write any IR for it.
+
+                // We don't want to track attributes from a previous tag helper element.
+                _renderedBoundAttributeNames.Clear();
+            }
+
+            public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+            {
+                foreach (var child in node.Children)
+                {
+                    if (child is MarkupTagHelperAttributeSyntax || child is MarkupMinimizedTagHelperAttributeSyntax)
+                    {
+                        Visit(child);
+                    }
+                }
+            }
+
+            public override void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+            {
+                if (!_featureFlags.AllowMinimizedBooleanTagHelperAttributes)
+                {
+                    // Minimized attributes are not valid for non-boolean bound attributes. TagHelperBlockRewriter
+                    // has already logged an error if it was a non-boolean bound attribute; so we can skip.
+                    return;
+                }
+
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.Name.GetContent();
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        {
+                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
+                        });
+
+                        var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
+
+                        if (!expectsBooleanValue)
+                        {
+                            // We do not allow minimized non-boolean bound attributes.
+                            return;
+                        }
+
+                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                        {
+                            AttributeName = attributeName,
+                            BoundAttribute = associatedAttributeDescriptor,
+                            TagHelper = associatedDescriptor,
+                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                            Source = null,
+                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
+                        };
+
+                        _builder.Add(setTagHelperProperty);
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Add(addHtmlAttribute);
+                }
+            }
+
+            public override void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+            {
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.Name.GetContent();
+                var attributeValueNode = node.Value;
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        {
+                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
+                        });
+
+                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                        {
+                            AttributeName = attributeName,
+                            BoundAttribute = associatedAttributeDescriptor,
+                            TagHelper = associatedDescriptor,
+                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                            Source = BuildSourceSpanFromNode(attributeValueNode),
+                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
+                        };
+
+                        _builder.Push(setTagHelperProperty);
+                        VisitAttributeValue(attributeValueNode);
+                        _builder.Pop();
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Push(addHtmlAttribute);
+                    VisitAttributeValue(attributeValueNode);
+                    _builder.Pop();
+                }
+            }
+
+            private void VisitAttributeValue(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return;
+                }
+
+                IReadOnlyList<SyntaxNode> children = node.ChildNodes();
+                var position = node.Position;
+                if (children.First() is MarkupBlockSyntax markupBlock &&
+                    markupBlock.Children.Count == 2 &&
+                    markupBlock.Children[0] is MarkupTextLiteralSyntax &&
+                    markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)
+                {
+                    // This is a special case when we have an attribute like attr="@@foo".
+                    // In this case, we want the foo to be written out as HtmlContent and not HtmlAttributeValue.
+                    Visit(markupBlock);
+                    children = children.Skip(1).ToList();
+                    position = children.Count > 0 ? children[0].Position : position;
+                }
+
+                if (children.All(c => c is MarkupLiteralAttributeValueSyntax))
+                {
+                    var literalAttributeValueNodes = children.Cast<MarkupLiteralAttributeValueSyntax>().ToArray();
+                    var valueTokens = SyntaxListBuilder<SyntaxToken>.Create();
+                    for (var i = 0; i < literalAttributeValueNodes.Length; i++)
+                    {
+                        var mergedValue = MergeAttributeValue(literalAttributeValueNodes[i]);
+                        valueTokens.AddRange(mergedValue.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.MarkupTextLiteral(valueTokens.ToList()).Green.CreateRed(node.Parent, position);
+                    Visit(rewritten);
+                }
+                else if (children.All(c => c is MarkupTextLiteralSyntax))
+                {
+                    var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                    var markupLiteralArray = children.Cast<MarkupTextLiteralSyntax>();
+                    foreach (var literal in markupLiteralArray)
+                    {
+                        builder.AddRange(literal.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.MarkupTextLiteral(builder.ToList()).Green.CreateRed(node.Parent, position);
+                    Visit(rewritten);
+                }
+                else if (children.All(c => c is CSharpExpressionLiteralSyntax))
+                {
+                    var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                    var expressionLiteralArray = children.Cast<CSharpExpressionLiteralSyntax>();
+                    SpanContext context = null;
+                    foreach (var literal in expressionLiteralArray)
+                    {
+                        context = literal.GetSpanContext();
+                        builder.AddRange(literal.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.CSharpExpressionLiteral(builder.ToList()).Green.CreateRed(node.Parent, position);
+                    rewritten = context != null ? rewritten.WithSpanContext(context) : rewritten;
+                    Visit(rewritten);
+                }
+                else
+                {
+                    Visit(node);
+                }
+            }
+
+            private MarkupTextLiteralSyntax MergeAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                var valueTokens = MergeLiterals(node.Prefix?.LiteralTokens, node.Value?.LiteralTokens);
+                var rewritten = node.Prefix?.Update(valueTokens) ?? node.Value?.Update(valueTokens);
+                rewritten = (MarkupTextLiteralSyntax)rewritten?.Green.CreateRed(node, node.Position);
+                var originalContext = rewritten.GetSpanContext();
+                if (originalContext != null)
+                {
+                    rewritten = rewritten.WithSpanContext(new SpanContext(new MarkupChunkGenerator(), originalContext.EditHandler));
+                }
+
+                return rewritten;
+            }
+
+            private void Combine(HtmlContentIntermediateNode node, SyntaxNode item)
+            {
+                node.Children.Add(new IntermediateToken()
+                {
+                    Content = item.GetContent(),
+                    Kind = TokenKind.Html,
+                    Source = BuildSourceSpanFromNode(item),
+                });
+
+                if (node.Source != null)
+                {
+                    Debug.Assert(node.Source.Value.FilePath != null);
+
+                    node.Source = new SourceSpan(
+                        node.Source.Value.FilePath,
+                        node.Source.Value.AbsoluteIndex,
+                        node.Source.Value.LineIndex,
+                        node.Source.Value.CharacterIndex,
+                        node.Source.Value.Length + item.FullWidth);
+                }
+            }
+
+            private SyntaxList<SyntaxToken> MergeLiterals(params SyntaxList<SyntaxToken>?[] literals)
+            {
+                var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                for (var i = 0; i < literals.Length; i++)
+                {
+                    var literal = literals[i];
+                    if (!literal.HasValue)
+                    {
+                        continue;
+                    }
+
+                    builder.AddRange(literal.Value);
+                }
+
+                return builder.ToList();
+            }
+        }
+
+        private class ImportsVisitor : LoweringVisitor
+        {
+            public ImportsVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, RazorParserFeatureFlags featureFlags)
+                : base(document, new ImportBuilder(builder), featureFlags)
+            {
+            }
+
+            private class ImportBuilder : IntermediateNodeBuilder
+            {
+                private readonly IntermediateNodeBuilder _innerBuilder;
+
+                public ImportBuilder(IntermediateNodeBuilder innerBuilder)
+                {
+                    _innerBuilder = innerBuilder;
+                }
+
+                public override IntermediateNode Current => _innerBuilder.Current;
+
+                public override void Add(IntermediateNode node)
+                {
+                    node.Annotations[CommonAnnotations.Imported] = CommonAnnotations.Imported;
+                    _innerBuilder.Add(node);
+                }
+
+                public override IntermediateNode Build() => _innerBuilder.Build();
+
+                public override void Insert(int index, IntermediateNode node)
+                {
+                    node.Annotations[CommonAnnotations.Imported] = CommonAnnotations.Imported;
+                    _innerBuilder.Insert(index, node);
+                }
+
+                public override IntermediateNode Pop() => _innerBuilder.Pop();
+
+                public override void Push(IntermediateNode node)
+                {
+                    node.Annotations[CommonAnnotations.Imported] = CommonAnnotations.Imported;
+                    _innerBuilder.Push(node);
+                }
+            }
+        }
+
+        private class DirectiveVisitor : IntermediateNodeWalker
+        {
+            public List<IntermediateNodeReference> Directives = new List<IntermediateNodeReference>();
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                Directives.Add(new IntermediateNodeReference(Parent, node));
+
+                base.VisitDirective(node);
+            }
+        }
+
+        private static bool IsMalformed(IEnumerable<RazorDiagnostic> diagnostics)
+            => diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+    }
+#pragma warning restore CS0618 // Type or member is obsolete
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorOptimizationPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorOptimizationPhase.cs
new file mode 100644
index 0000000000..6b1f7c271a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorOptimizationPhase.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorOptimizationPhase : RazorEnginePhaseBase, IRazorOptimizationPhase
+    {
+        public IRazorOptimizationPass[] Passes { get; private set; }
+
+        protected override void OnIntialized()
+        {
+            Passes = Engine.Features.OfType<IRazorOptimizationPass>().OrderBy(p => p.Order).ToArray();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            ThrowForMissingDocumentDependency(documentNode);
+
+            foreach (var pass in Passes)
+            {
+                pass.Execute(codeDocument, documentNode);
+            }
+
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
new file mode 100644
index 0000000000..6bb6d2c284
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorParserOptions : RazorParserOptions
+    {
+        public DefaultRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version)
+        {
+            if (directives == null)
+            {
+                throw new ArgumentNullException(nameof(directives));
+            }
+
+            Directives = directives;
+            DesignTime = designTime;
+            ParseLeadingDirectives = parseLeadingDirectives;
+            Version = version;
+            FeatureFlags = RazorParserFeatureFlags.Create(Version);
+        }
+
+        public override bool DesignTime { get; }
+
+        public override IReadOnlyCollection<DirectiveDescriptor> Directives { get; }
+
+        public override bool ParseLeadingDirectives { get; }
+
+        public override RazorLanguageVersion Version { get; }
+
+        internal override RazorParserFeatureFlags FeatureFlags { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
new file mode 100644
index 0000000000..2e4d3273d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
@@ -0,0 +1,51 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorParserOptionsBuilder : RazorParserOptionsBuilder
+    {
+        private bool _designTime;
+
+        public DefaultRazorParserOptionsBuilder(RazorConfiguration configuration)
+        {
+            if (configuration == null)
+            {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
+            Configuration = configuration;
+            LanguageVersion = configuration.LanguageVersion;
+        }
+
+        public DefaultRazorParserOptionsBuilder(bool designTime, RazorLanguageVersion version)
+        {
+            _designTime = designTime;
+            LanguageVersion = version;
+        }
+
+        public override RazorConfiguration Configuration { get; }
+
+        public override bool DesignTime => _designTime;
+
+        public override ICollection<DirectiveDescriptor> Directives { get; } = new List<DirectiveDescriptor>();
+
+        public override bool ParseLeadingDirectives { get; set; }
+
+        public override RazorLanguageVersion LanguageVersion { get; }
+
+        public override RazorParserOptions Build()
+        {
+            return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseLeadingDirectives, LanguageVersion);
+        }
+
+        public override void SetDesignTime(bool designTime)
+        {
+            _designTime = designTime;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs
new file mode 100644
index 0000000000..32fb04af7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorParserOptionsFactoryProjectFeature : RazorProjectEngineFeatureBase, IRazorParserOptionsFactoryProjectFeature
+    {
+        private IConfigureRazorParserOptionsFeature[] _configureOptions;
+
+        protected override void OnInitialized()
+        {
+            _configureOptions = ProjectEngine.EngineFeatures.OfType<IConfigureRazorParserOptionsFeature>().ToArray();
+        }
+
+        public RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure)
+        {
+            var builder = new DefaultRazorParserOptionsBuilder(ProjectEngine.Configuration);
+            configure?.Invoke(builder);
+
+            for (var i = 0; i < _configureOptions.Length; i++)
+            {
+                _configureOptions[i].Configure(builder);
+            }
+            
+            var options = builder.Build();
+            return options;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs
new file mode 100644
index 0000000000..eecb9bd9cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs
@@ -0,0 +1,40 @@
+// 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.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    internal class DefaultRazorParserOptionsFeature : RazorEngineFeatureBase, IRazorParserOptionsFeature
+#pragma warning restore CS0618 // Type or member is obsolete
+    {
+        private readonly bool _designTime;
+        private readonly RazorLanguageVersion _version;
+        private IConfigureRazorParserOptionsFeature[] _configureOptions;
+
+        public DefaultRazorParserOptionsFeature(bool designTime, RazorLanguageVersion version)
+        {
+            _designTime = designTime;
+            _version = version;
+        }
+
+        protected override void OnInitialized()
+        {
+            _configureOptions = Engine.Features.OfType<IConfigureRazorParserOptionsFeature>().ToArray();
+        }
+
+        public RazorParserOptions GetOptions()
+        {
+            var builder = new DefaultRazorParserOptionsBuilder(_designTime, _version);
+            for (var i = 0; i < _configureOptions.Length; i++)
+            {
+                _configureOptions[i].Configure(builder);
+            }
+
+            var options = builder.Build();
+
+            return options;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParsingPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParsingPhase.cs
new file mode 100644
index 0000000000..8264201271
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParsingPhase.cs
@@ -0,0 +1,31 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    internal class DefaultRazorParsingPhase : RazorEnginePhaseBase, IRazorParsingPhase
+    {
+        private IRazorParserOptionsFeature _optionsFeature;
+
+        protected override void OnIntialized()
+        {
+            _optionsFeature = GetRequiredFeature<IRazorParserOptionsFeature>();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var options = codeDocument.GetParserOptions() ??_optionsFeature.GetOptions();
+            var syntaxTree = RazorSyntaxTree.Parse(codeDocument.Source, options);
+            codeDocument.SetSyntaxTree(syntaxTree);
+
+            var importSyntaxTrees = new RazorSyntaxTree[codeDocument.Imports.Count];
+            for (var i = 0; i < codeDocument.Imports.Count; i++)
+            {
+                importSyntaxTrees[i] = RazorSyntaxTree.Parse(codeDocument.Imports[i], options);
+            }
+            codeDocument.SetImportSyntaxTrees(importSyntaxTrees);
+        }
+    }
+#pragma warning restore CS0618 // Type or member is obsolete
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
new file mode 100644
index 0000000000..a560a0030a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
@@ -0,0 +1,195 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorProjectEngine : RazorProjectEngine
+    {
+        public DefaultRazorProjectEngine(
+            RazorConfiguration configuration,
+            RazorEngine engine,
+            RazorProjectFileSystem fileSystem,
+            IReadOnlyList<IRazorProjectEngineFeature> projectFeatures)
+        {
+            if (configuration == null)
+            {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
+            if (engine == null)
+            {
+                throw new ArgumentNullException(nameof(engine));
+            }
+
+            if (fileSystem == null)
+            {
+                throw new ArgumentNullException(nameof(fileSystem));
+            }
+
+            if (projectFeatures == null)
+            {
+                throw new ArgumentNullException(nameof(projectFeatures));
+            }
+
+            Configuration = configuration;
+            Engine = engine;
+            FileSystem = fileSystem;
+            ProjectFeatures = projectFeatures;
+
+            for (var i = 0; i < projectFeatures.Count; i++)
+            {
+                projectFeatures[i].ProjectEngine = this;
+            }
+        }
+
+        public override RazorConfiguration Configuration { get; }
+
+        public override RazorProjectFileSystem FileSystem { get; }
+
+        public override RazorEngine Engine { get; }
+
+        public override IReadOnlyList<IRazorProjectEngineFeature> ProjectFeatures { get; }
+
+        protected override RazorCodeDocument CreateCodeDocumentCore(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+
+            var importFeature = GetRequiredFeature<IImportProjectFeature>();
+            var importItems = importFeature.GetImports(projectItem);
+            var importSourceDocuments = GetImportSourceDocuments(importItems);
+
+            return CreateCodeDocumentCore(sourceDocument, importSourceDocuments, tagHelpers: null);
+        }
+
+        internal override RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument sourceDocument, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (sourceDocument == null)
+            {
+                throw new ArgumentNullException(nameof(sourceDocument));
+            }
+
+            var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(ConfigureParserOptions);
+            var codeGenerationOptions = GetRequiredFeature<IRazorCodeGenerationOptionsFactoryProjectFeature>().Create(ConfigureCodeGenerationOptions);
+
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, importSourceDocuments, parserOptions, codeGenerationOptions);
+            codeDocument.SetTagHelpers(tagHelpers);
+
+            return codeDocument;
+        }
+
+        protected override RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+
+            var importFeature = GetRequiredFeature<IImportProjectFeature>();
+            var importItems = importFeature.GetImports(projectItem);
+            var importSourceDocuments = GetImportSourceDocuments(importItems, suppressExceptions: true);
+
+            return CreateCodeDocumentDesignTimeCore(sourceDocument, importSourceDocuments, tagHelpers: null);
+        }
+
+        internal override RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument sourceDocument, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (sourceDocument == null)
+            {
+                throw new ArgumentNullException(nameof(sourceDocument));
+            }
+
+            var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(ConfigureDesignTimeParserOptions);
+            var codeGenerationOptions = GetRequiredFeature<IRazorCodeGenerationOptionsFactoryProjectFeature>().Create(ConfigureDesignTimeCodeGenerationOptions);
+
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, importSourceDocuments, parserOptions, codeGenerationOptions);
+            codeDocument.SetTagHelpers(tagHelpers);
+
+            return codeDocument;
+        }
+
+        protected override void ProcessCore(RazorCodeDocument codeDocument)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            Engine.Process(codeDocument);
+        }
+
+        private TFeature GetRequiredFeature<TFeature>() where TFeature : IRazorProjectEngineFeature
+        {
+            var feature = ProjectFeatures.OfType<TFeature>().FirstOrDefault();
+            if (feature == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatRazorProjectEngineMissingFeatureDependency(
+                        typeof(RazorProjectEngine).FullName,
+                        typeof(TFeature).FullName));
+            }
+
+            return feature;
+        }
+
+        private void ConfigureParserOptions(RazorParserOptionsBuilder builder)
+        {
+        }
+
+        private void ConfigureDesignTimeParserOptions(RazorParserOptionsBuilder builder)
+        {
+            builder.SetDesignTime(true);
+        }
+
+        private void ConfigureCodeGenerationOptions(RazorCodeGenerationOptionsBuilder builder)
+        {
+        }
+
+        private void ConfigureDesignTimeCodeGenerationOptions(RazorCodeGenerationOptionsBuilder builder)
+        {
+            builder.SetDesignTime(true);
+            builder.SuppressChecksum = true;
+            builder.SuppressMetadataAttributes = true;
+        }
+
+        // Internal for testing
+        internal static IReadOnlyList<RazorSourceDocument> GetImportSourceDocuments(
+            IReadOnlyList<RazorProjectItem> importItems,
+            bool suppressExceptions = false)
+        {
+            var imports = new List<RazorSourceDocument>();
+            for (var i = 0; i < importItems.Count; i++)
+            {
+                var importItem = importItems[i];
+
+                if (importItem.Exists)
+                {
+                    try
+                    {
+                        // Normal import, has file paths, content etc.
+                        var sourceDocument = RazorSourceDocument.ReadFrom(importItem);
+                        imports.Add(sourceDocument);
+                    }
+                    catch (IOException) when (suppressExceptions)
+                    {
+                        // Something happened when trying to read the item from disk.
+                        // Catch the exception so we don't crash the editor.
+                    }
+                }
+            }
+
+            return imports;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngineBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngineBuilder.cs
new file mode 100644
index 0000000000..4c79c767d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngineBuilder.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorProjectEngineBuilder : RazorProjectEngineBuilder
+    {
+        public DefaultRazorProjectEngineBuilder(RazorConfiguration configuration, RazorProjectFileSystem fileSystem)
+        {
+            if (fileSystem == null)
+            {
+                throw new ArgumentNullException(nameof(fileSystem));
+            }
+
+            Configuration = configuration;
+            FileSystem = fileSystem;
+            Features = new List<IRazorFeature>();
+            Phases = new List<IRazorEnginePhase>();
+        }
+
+        public override RazorConfiguration Configuration { get; }
+
+        public override RazorProjectFileSystem FileSystem { get; }
+
+        public override ICollection<IRazorFeature> Features { get; }
+
+        public override IList<IRazorEnginePhase> Phases { get; }
+        
+        public override RazorProjectEngine Build()
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            var engine = RazorEngine.CreateEmpty(ConfigureRazorEngine);
+#pragma warning restore CS0618 // Type or member is obsolete
+            var projectFeatures = Features.OfType<IRazorProjectEngineFeature>().ToArray();
+            var projectEngine = new DefaultRazorProjectEngine(Configuration, engine, FileSystem, projectFeatures);
+
+            return projectEngine;
+        }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        private void ConfigureRazorEngine(IRazorEngineBuilder engineBuilder)
+#pragma warning disable CS0618 // Type or member is obsolete
+        {
+            var engineFeatures = Features.OfType<IRazorEngineFeature>();
+            foreach (var engineFeature in engineFeatures)
+            {
+                engineBuilder.Features.Add(engineFeature);
+            }
+
+            for (var i = 0; i < Phases.Count; i++)
+            {
+                engineBuilder.Phases.Add(Phases[i]);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..9283088cd1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorProjectFileSystem : RazorProjectFileSystem
+    {
+        public DefaultRazorProjectFileSystem(string root)
+        {
+            if (string.IsNullOrEmpty(root))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(root));
+            }
+            
+            Root = root.Replace('\\', '/').TrimEnd('/');
+        }
+
+        public string Root { get; }
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            var absoluteBasePath = NormalizeAndEnsureValidPath(basePath);
+
+            var directory = new DirectoryInfo(absoluteBasePath);
+            if (!directory.Exists)
+            {
+                return Enumerable.Empty<RazorProjectItem>();
+            }
+
+            return directory
+                .EnumerateFiles("*.cshtml", SearchOption.AllDirectories)
+                .Select(file =>
+                {
+                    var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
+                    var filePath = "/" + relativePhysicalPath.Replace(Path.DirectorySeparatorChar, '/');
+
+                    return new DefaultRazorProjectItem(basePath, filePath, relativePhysicalPath, file);
+                });
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            var absoluteBasePath = NormalizeAndEnsureValidPath("/");
+            var absolutePath = NormalizeAndEnsureValidPath(path);
+
+            var file = new FileInfo(absolutePath);
+            if (!absolutePath.StartsWith(absoluteBasePath))
+            {
+                throw new InvalidOperationException($"The file '{file.FullName}' is not a descendent of the base path '{absoluteBasePath}'.");
+            }
+
+            var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
+            var filePath = "/" + relativePhysicalPath.Replace(Path.DirectorySeparatorChar, '/');
+
+            return new DefaultRazorProjectItem("/", filePath, relativePhysicalPath, new FileInfo(absolutePath));
+        }
+
+        protected override string NormalizeAndEnsureValidPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
+            }
+
+            var absolutePath = path;
+            if (!absolutePath.StartsWith(Root, StringComparison.OrdinalIgnoreCase))
+            {
+                if (path[0] == '/' || path[0] == '\\')
+                {
+                    path = path.Substring(1);
+                }
+
+                absolutePath = Path.Combine(Root, path);
+            }
+
+            absolutePath = absolutePath.Replace('\\', '/');
+
+            return absolutePath;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs
new file mode 100644
index 0000000000..5a3590a121
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs
@@ -0,0 +1,39 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorProjectItem : RazorProjectItem
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultRazorProjectItem"/>.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        /// <param name="relativePhysicalPath">The physical path of the base path.</param>
+        /// <param name="filePath">The path.</param>
+        /// <param name="file">The <see cref="FileInfo"/>.</param>
+        public DefaultRazorProjectItem(string basePath, string filePath, string relativePhysicalPath, FileInfo file)
+        {
+            BasePath = basePath;
+            FilePath = filePath;
+            RelativePhysicalPath = relativePhysicalPath;
+            File = file;
+        }
+
+        public FileInfo File { get; }
+
+        public override string BasePath { get; }
+
+        public override string FilePath { get; }
+
+        public override bool Exists => File.Exists;
+
+        public override string PhysicalPath => File.FullName;
+
+        public override string RelativePhysicalPath { get; }
+
+        public override Stream Read() => new FileStream(PhysicalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSourceLineCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSourceLineCollection.cs
new file mode 100644
index 0000000000..37b5e156f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSourceLineCollection.cs
@@ -0,0 +1,123 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorSourceLineCollection : RazorSourceLineCollection
+    {
+        private readonly RazorSourceDocument _document;
+        private readonly int[] _lineStarts;
+
+        public DefaultRazorSourceLineCollection(RazorSourceDocument document)
+        {
+            _document = document;
+            _lineStarts = GetLineStarts();
+        }
+
+        public override int Count => _lineStarts.Length;
+
+        public override int GetLineLength(int index)
+        {
+            if (index < 0 || index >= _lineStarts.Length)
+            {
+                throw new IndexOutOfRangeException(nameof(index));
+            }
+
+            if (index == _lineStarts.Length - 1)
+            {
+                // Last line is special.
+                return _document.Length - _lineStarts[index];
+            }
+
+            return _lineStarts[index + 1] - _lineStarts[index];
+        }
+
+        internal override SourceLocation GetLocation(int position)
+        {
+            if (position < 0 || position >= _document.Length)
+            {
+                throw new IndexOutOfRangeException(nameof(position));
+            }
+
+            var index = Array.BinarySearch<int>(_lineStarts, position);
+            if (index >= 0)
+            {
+                // We have an exact match for the start of a line.
+                Debug.Assert(_lineStarts[index] == position);
+
+                return new SourceLocation(_document.GetFilePathForDisplay(), position, index, characterIndex: 0);
+            }
+
+
+            // Index is the complement of the line *after* the one we want, because BinarySearch tells
+            // us where we'd put position *if* it were the start of a line.
+            index = (~index) - 1;
+            if (index == -1)
+            {
+                // There's no preceding line, so it's based on the start of the string
+                return new SourceLocation(_document.GetFilePathForDisplay(), position, 0, position);
+            }
+            else
+            {
+                var characterIndex = position - _lineStarts[index];
+                return new SourceLocation(_document.GetFilePathForDisplay(), position, index, characterIndex);
+            }
+        }
+
+        private int[] GetLineStarts()
+        {
+            var starts = new List<int>();
+
+            // We always consider a document to have at least a 0th line, even if it's empty.
+            starts.Add(0);
+
+            var unprocessedCR = false;
+
+            // Length - 1 because we don't care if there was a linebreak as the last character.
+            var length = _document.Length;
+            for (var i = 0; i < length - 1; i++)
+            {
+                var c = _document[i];
+                var isLineBreak = false;
+
+                switch (c)
+                {
+                    case '\r':
+                        unprocessedCR = true;
+                        continue;
+
+                    case '\n':
+                        unprocessedCR = false;
+                        isLineBreak = true;
+                        break;
+
+                    case '\u0085':
+                    case '\u2028':
+                    case '\u2029':
+                        isLineBreak = true;
+                        break;
+
+                }
+
+                if (unprocessedCR)
+                {
+                    // If we get here it means that we had a CR followed by something other than an LF.
+                    // Add the CR as a line break.
+                    starts.Add(i);
+                    unprocessedCR = false;
+                }
+
+                if (isLineBreak)
+                {
+                    starts.Add(i + 1);
+                }
+            }
+
+            return starts.ToArray();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs
new file mode 100644
index 0000000000..018dbfe5fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorSyntaxTree : RazorSyntaxTree
+    {
+        public DefaultRazorSyntaxTree(
+            SyntaxNode root,
+            RazorSourceDocument source,
+            IReadOnlyList<RazorDiagnostic> diagnostics,
+            RazorParserOptions options)
+        {
+            Root = root;
+            Source = source;
+            Diagnostics = diagnostics;
+            Options = options;
+        }
+
+        public override IReadOnlyList<RazorDiagnostic> Diagnostics { get; }
+
+        public override RazorParserOptions Options { get; }
+
+        internal override SyntaxNode Root { get; }
+
+        public override RazorSourceDocument Source { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTreePhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTreePhase.cs
new file mode 100644
index 0000000000..5c0df33dfb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTreePhase.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorSyntaxTreePhase : RazorEnginePhaseBase, IRazorSyntaxTreePhase
+    {
+        public IRazorSyntaxTreePass[] Passes { get; private set; }
+
+        protected override void OnIntialized()
+        {
+            Passes = Engine.Features.OfType<IRazorSyntaxTreePass>().OrderBy(p => p.Order).ToArray();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            ThrowForMissingDocumentDependency(syntaxTree);
+            
+            foreach (var pass in Passes)
+            {
+                syntaxTree = pass.Execute(codeDocument, syntaxTree);
+            }
+
+            codeDocument.SetSyntaxTree(syntaxTree);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
new file mode 100644
index 0000000000..c15aaff04e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -0,0 +1,192 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorTagHelperBinderPhase : RazorEnginePhaseBase, IRazorTagHelperBinderPhase
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            ThrowForMissingDocumentDependency(syntaxTree);
+
+            var descriptors = codeDocument.GetTagHelpers();
+            if (descriptors == null)
+            {
+                var feature = Engine.Features.OfType<ITagHelperFeature>().FirstOrDefault();
+                if (feature == null)
+                {
+                    // No feature, nothing to do.
+                    return;
+                }
+
+                descriptors = feature.GetDescriptors();
+            }
+
+            // We need to find directives in all of the *imports* as well as in the main razor file
+            //
+            // The imports come logically before the main razor file and are in the order they
+            // should be processed.
+            var visitor = new DirectiveVisitor(descriptors);
+            var imports = codeDocument.GetImportSyntaxTrees();
+            if (imports != null)
+            {
+                for (var i = 0; i < imports.Count; i++)
+                {
+                    var import = imports[i];
+                    visitor.Visit(import.Root);
+                }
+            }
+
+            visitor.Visit(syntaxTree.Root);
+
+            var tagHelperPrefix = visitor.TagHelperPrefix;
+            descriptors = visitor.Matches.ToArray();
+
+            var context = TagHelperDocumentContext.Create(tagHelperPrefix, descriptors);
+            codeDocument.SetTagHelperContext(context);
+
+            if (descriptors.Count == 0)
+            {
+                // No descriptors, no-op.
+                return;
+            }
+
+            var rewrittenSyntaxTree = TagHelperParseTreeRewriter.Rewrite(syntaxTree, tagHelperPrefix, descriptors);
+            
+            codeDocument.SetSyntaxTree(rewrittenSyntaxTree);
+        }
+
+        private static bool MatchesDirective(TagHelperDescriptor descriptor, string typePattern, string assemblyName)
+        {
+            if (!string.Equals(descriptor.AssemblyName, assemblyName, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (typePattern.EndsWith("*", StringComparison.Ordinal))
+            {
+                if (typePattern.Length == 1)
+                {
+                    // TypePattern is "*".
+                    return true;
+                }
+
+                var lookupTypeName = typePattern.Substring(0, typePattern.Length - 1);
+
+                return descriptor.Name.StartsWith(lookupTypeName, StringComparison.Ordinal);
+            }
+
+            return string.Equals(descriptor.Name, typePattern, StringComparison.Ordinal);
+        }
+
+        internal class DirectiveVisitor : SyntaxRewriter
+        {
+            private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
+
+            public DirectiveVisitor(IReadOnlyList<TagHelperDescriptor> tagHelpers)
+            {
+                _tagHelpers = tagHelpers;
+            }
+
+            public string TagHelperPrefix { get; private set; }
+
+            public HashSet<TagHelperDescriptor> Matches { get; } = new HashSet<TagHelperDescriptor>();
+
+            public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                var descendantLiterals = node.DescendantNodes();
+                foreach (var child in descendantLiterals)
+                {
+                    if (!(child is CSharpStatementLiteralSyntax literal))
+                    {
+                        continue;
+                    }
+
+                    var context = literal.GetSpanContext();
+                    if (context == null)
+                    {
+                        // We can't find a chunk generator.
+                        continue;
+                    }
+                    else if (context.ChunkGenerator is AddTagHelperChunkGenerator addTagHelper)
+                    {
+                        if (addTagHelper.AssemblyName == null)
+                        {
+                            // Skip this one, it's an error
+                            continue;
+                        }
+
+                        if (!AssemblyContainsTagHelpers(addTagHelper.AssemblyName, _tagHelpers))
+                        {
+                            // No tag helpers in the assembly.
+                            continue;
+                        }
+
+                        for (var i = 0; i < _tagHelpers.Count; i++)
+                        {
+                            var tagHelper = _tagHelpers[i];
+                            if (MatchesDirective(tagHelper, addTagHelper.TypePattern, addTagHelper.AssemblyName))
+                            {
+                                Matches.Add(tagHelper);
+                            }
+                        }
+                    }
+                    else if (context.ChunkGenerator is RemoveTagHelperChunkGenerator removeTagHelper)
+                    {
+                        if (removeTagHelper.AssemblyName == null)
+                        {
+                            // Skip this one, it's an error
+                            continue;
+                        }
+
+
+                        if (!AssemblyContainsTagHelpers(removeTagHelper.AssemblyName, _tagHelpers))
+                        {
+                            // No tag helpers in the assembly.
+                            continue;
+                        }
+
+                        for (var i = 0; i < _tagHelpers.Count; i++)
+                        {
+                            var tagHelper = _tagHelpers[i];
+                            if (MatchesDirective(tagHelper, removeTagHelper.TypePattern, removeTagHelper.AssemblyName))
+                            {
+                                Matches.Remove(tagHelper);
+                            }
+                        }
+                    }
+                    else if (context.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator tagHelperPrefix)
+                    {
+                        if (!string.IsNullOrEmpty(tagHelperPrefix.DirectiveText))
+                        {
+                            // We only expect to see a single one of these per file, but that's enforced at another level.
+                            TagHelperPrefix = tagHelperPrefix.DirectiveText;
+                        }
+                    }
+                }
+
+                return base.VisitRazorDirective(node);
+            }
+
+            private bool AssemblyContainsTagHelpers(string assemblyName, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+            {
+                for (var i = 0; i < tagHelpers.Count; i++)
+                {
+                    if (string.Equals(tagHelpers[i].AssemblyName, assemblyName, StringComparison.Ordinal))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTargetExtensionFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTargetExtensionFeature.cs
new file mode 100644
index 0000000000..076dac88a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTargetExtensionFeature.cs
@@ -0,0 +1,13 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorTargetExtensionFeature : RazorEngineFeatureBase, IRazorTargetExtensionFeature
+    {
+        public ICollection<ICodeTargetExtension> TargetExtensions { get; } = new List<ICodeTargetExtension>();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
new file mode 100644
index 0000000000..8802abcf7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRequiredAttributeDescriptor : RequiredAttributeDescriptor
+    {
+        public DefaultRequiredAttributeDescriptor(
+            string name,
+            NameComparisonMode nameComparison,
+            string value,
+            ValueComparisonMode valueComparison,
+            string displayName,
+            RazorDiagnostic[] diagnostics)
+        {
+            Name = name;
+            NameComparison = nameComparison;
+            Value = value;
+            ValueComparison = valueComparison;
+            DisplayName = displayName;
+            Diagnostics = diagnostics;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
new file mode 100644
index 0000000000..5b611b7b20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
@@ -0,0 +1,78 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRequiredAttributeDescriptorBuilder : RequiredAttributeDescriptorBuilder
+    {
+        private RazorDiagnosticCollection _diagnostics;
+
+        public override string Name { get; set; }
+
+        public override RequiredAttributeDescriptor.NameComparisonMode NameComparisonMode { get; set; }
+
+        public override string Value { get; set; }
+
+        public override RequiredAttributeDescriptor.ValueComparisonMode ValueComparisonMode { get; set; }
+
+        public override RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public RequiredAttributeDescriptor Build()
+        {
+            var validationDiagnostics = Validate();
+            var diagnostics = new HashSet<RazorDiagnostic>(validationDiagnostics);
+            if (_diagnostics != null)
+            {
+                diagnostics.UnionWith(_diagnostics);
+            }
+
+            var displayName = NameComparisonMode == RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch ? string.Concat(Name, "...") : Name;
+            var rule = new DefaultRequiredAttributeDescriptor(
+                Name,
+                NameComparisonMode,
+                Value,
+                ValueComparisonMode,
+                displayName,
+                diagnostics?.ToArray() ?? Array.Empty<RazorDiagnostic>());
+
+            return rule;
+        }
+
+        private IEnumerable<RazorDiagnostic> Validate()
+        {
+            if (string.IsNullOrWhiteSpace(Name))
+            {
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeNameNullOrWhitespace();
+
+                yield return diagnostic;
+            }
+            else
+            {
+                foreach (var character in Name)
+                {
+                    if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeName(Name, character);
+
+                        yield return diagnostic;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs
new file mode 100644
index 0000000000..f9da39f401
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs
@@ -0,0 +1,36 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultTagHelperDescriptor : TagHelperDescriptor
+    {
+        public DefaultTagHelperDescriptor(
+            string kind,
+            string name,
+            string assemblyName,
+            string displayName,
+            string documentation,
+            string tagOutputHint,
+            TagMatchingRuleDescriptor[] tagMatchingRules,
+            BoundAttributeDescriptor[] attributeDescriptors,
+            AllowedChildTagDescriptor[] allowedChildTags,
+            Dictionary<string, string> metadata,
+            RazorDiagnostic[] diagnostics) 
+            : base(kind)
+        {
+            Name = name;
+            AssemblyName = assemblyName;
+            DisplayName = displayName;
+            Documentation = documentation;
+            TagOutputHint = tagOutputHint;
+            TagMatchingRules = tagMatchingRules;
+            BoundAttributes = attributeDescriptors;
+            AllowedChildTags = allowedChildTags;
+            Diagnostics = diagnostics;
+            Metadata = metadata;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs
new file mode 100644
index 0000000000..3dcd280a11
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs
@@ -0,0 +1,237 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultTagHelperDescriptorBuilder : TagHelperDescriptorBuilder
+    {
+        // Required values
+        private readonly Dictionary<string, string> _metadata;
+
+        private List<DefaultAllowedChildTagDescriptorBuilder> _allowedChildTags;
+        private List<DefaultBoundAttributeDescriptorBuilder> _attributeBuilders;
+        private List<DefaultTagMatchingRuleDescriptorBuilder> _tagMatchingRuleBuilders;
+        private RazorDiagnosticCollection _diagnostics;
+
+        public DefaultTagHelperDescriptorBuilder(string kind, string name, string assemblyName)
+        {
+            Kind = kind;
+            Name = name;
+            AssemblyName = assemblyName;
+
+            _metadata = new Dictionary<string, string>(StringComparer.Ordinal);
+
+            // Tells code generation that these tag helpers are compatible with ITagHelper.
+            // For now that's all we support.
+            _metadata.Add(TagHelperMetadata.Runtime.Name, TagHelperConventions.DefaultKind);
+        }
+
+        public override string Name { get; }
+
+        public override string AssemblyName { get; }
+
+        public override string Kind { get; }
+
+        public override string DisplayName { get; set; }
+
+        public override string TagOutputHint { get; set; }
+
+        public override string Documentation { get; set; }
+
+        public override IDictionary<string, string> Metadata => _metadata;
+
+        public override RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public override IReadOnlyList<AllowedChildTagDescriptorBuilder> AllowedChildTags
+        {
+            get
+            {
+                EnsureAllowedChildTags();
+
+                return _allowedChildTags;
+            }
+        }
+
+        public override IReadOnlyList<BoundAttributeDescriptorBuilder> BoundAttributes
+        {
+            get
+            {
+                EnsureAttributeBuilders();
+
+                return _attributeBuilders;
+            }
+        }
+
+        public override IReadOnlyList<TagMatchingRuleDescriptorBuilder> TagMatchingRules
+        {
+            get
+            {
+                EnsureTagMatchingRuleBuilders();
+
+                return _tagMatchingRuleBuilders;
+            }
+        }
+
+        public override void AllowChildTag(Action<AllowedChildTagDescriptorBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            EnsureAllowedChildTags();
+
+            var builder = new DefaultAllowedChildTagDescriptorBuilder(this);
+            configure(builder);
+            _allowedChildTags.Add(builder);
+        }
+
+        public override void BindAttribute(Action<BoundAttributeDescriptorBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            EnsureAttributeBuilders();
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(this, Kind);
+            configure(builder);
+            _attributeBuilders.Add(builder);
+        }
+
+        public override void TagMatchingRule(Action<TagMatchingRuleDescriptorBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            EnsureTagMatchingRuleBuilders();
+
+            var builder = new DefaultTagMatchingRuleDescriptorBuilder();
+            configure(builder);
+            _tagMatchingRuleBuilders.Add(builder);
+        }
+
+        public override TagHelperDescriptor Build()
+        {
+            var diagnostics = new HashSet<RazorDiagnostic>();
+            if (_diagnostics != null)
+            {
+                diagnostics.UnionWith(_diagnostics);
+            }
+
+            var allowedChildTags = Array.Empty<AllowedChildTagDescriptor>();
+            if (_allowedChildTags != null)
+            {
+                var allowedChildTagsSet = new HashSet<AllowedChildTagDescriptor>(AllowedChildTagDescriptorComparer.Default);
+                for (var i = 0; i < _allowedChildTags.Count; i++)
+                {
+                    allowedChildTagsSet.Add(_allowedChildTags[i].Build());
+                }
+
+                allowedChildTags = allowedChildTagsSet.ToArray();
+            }
+
+            var tagMatchingRules = Array.Empty<TagMatchingRuleDescriptor>();
+            if (_tagMatchingRuleBuilders != null)
+            {
+                var tagMatchingRuleSet = new HashSet<TagMatchingRuleDescriptor>(TagMatchingRuleDescriptorComparer.Default);
+                for (var i = 0; i < _tagMatchingRuleBuilders.Count; i++)
+                {
+                    tagMatchingRuleSet.Add(_tagMatchingRuleBuilders[i].Build());
+                }
+
+                tagMatchingRules = tagMatchingRuleSet.ToArray();
+            }
+
+            var attributes = Array.Empty<BoundAttributeDescriptor>();
+            if (_attributeBuilders != null)
+            {
+                var attributeSet = new HashSet<BoundAttributeDescriptor>(BoundAttributeDescriptorComparer.Default);
+                for (var i = 0; i < _attributeBuilders.Count; i++)
+                {
+                    attributeSet.Add(_attributeBuilders[i].Build());
+                }
+
+                attributes = attributeSet.ToArray();
+            }
+
+            var descriptor = new DefaultTagHelperDescriptor(
+                Kind,
+                Name,
+                AssemblyName,
+                GetDisplayName(),
+                Documentation,
+                TagOutputHint,
+                tagMatchingRules,
+                attributes,
+                allowedChildTags,
+                new Dictionary<string, string>(_metadata),
+                diagnostics.ToArray());
+
+            return descriptor;
+        }
+
+        public override void Reset()
+        {
+            Documentation = null;
+            TagOutputHint = null;
+            _allowedChildTags?.Clear();
+            _attributeBuilders?.Clear();
+            _tagMatchingRuleBuilders?.Clear();
+            _metadata.Clear();
+            _diagnostics?.Clear();
+        }
+
+        public string GetDisplayName()
+        {
+            if (DisplayName != null)
+            {
+                return DisplayName;
+            }
+
+            return this.GetTypeName() ?? Name;
+        }
+
+        private void EnsureAllowedChildTags()
+        {
+            if (_allowedChildTags == null)
+            {
+                _allowedChildTags = new List<DefaultAllowedChildTagDescriptorBuilder>();
+            }
+        }
+
+        private void EnsureAttributeBuilders()
+        {
+            if (_attributeBuilders == null)
+            {
+                _attributeBuilders = new List<DefaultBoundAttributeDescriptorBuilder>();
+            }
+        }
+
+        private void EnsureTagMatchingRuleBuilders()
+        {
+            if (_tagMatchingRuleBuilders == null)
+            {
+                _tagMatchingRuleBuilders = new List<DefaultTagMatchingRuleDescriptorBuilder>();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs
new file mode 100644
index 0000000000..78595a9165
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs
@@ -0,0 +1,22 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultTagMatchingRuleDescriptor : TagMatchingRuleDescriptor
+    {
+        public DefaultTagMatchingRuleDescriptor(
+            string tagName,
+            string parentTag,
+            TagStructure tagStructure,
+            RequiredAttributeDescriptor[] attributes,
+            RazorDiagnostic[] diagnostics)
+        {
+            TagName = tagName;
+            ParentTag = parentTag;
+            TagStructure = tagStructure;
+            Attributes = attributes;
+            Diagnostics = diagnostics;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs
new file mode 100644
index 0000000000..7cfb80eebc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs
@@ -0,0 +1,146 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultTagMatchingRuleDescriptorBuilder : TagMatchingRuleDescriptorBuilder
+    {
+        private List<DefaultRequiredAttributeDescriptorBuilder> _requiredAttributeBuilders;
+        private RazorDiagnosticCollection _diagnostics;
+
+        internal DefaultTagMatchingRuleDescriptorBuilder()
+        {
+        }
+
+        public override string TagName { get; set; }
+
+        public override string ParentTag { get; set; }
+
+        public override TagStructure TagStructure { get; set; }
+
+        public override RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public override IReadOnlyList<RequiredAttributeDescriptorBuilder> Attributes
+        {
+            get
+            {
+                EnsureRequiredAttributeBuilders();
+
+                return _requiredAttributeBuilders;
+            }
+        }
+
+        public override void Attribute(Action<RequiredAttributeDescriptorBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            EnsureRequiredAttributeBuilders();
+
+            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+            configure(builder);
+            _requiredAttributeBuilders.Add(builder);
+        }
+
+        public TagMatchingRuleDescriptor Build()
+        {
+            var validationDiagnostics = Validate();
+            var diagnostics = new HashSet<RazorDiagnostic>(validationDiagnostics);
+            if (_diagnostics != null)
+            {
+                diagnostics.UnionWith(_diagnostics);
+            }
+
+            var requiredAttributes = Array.Empty<RequiredAttributeDescriptor>();
+            if (_requiredAttributeBuilders != null)
+            {
+                var requiredAttributeSet = new HashSet<RequiredAttributeDescriptor>(RequiredAttributeDescriptorComparer.Default);
+                for (var i = 0; i < _requiredAttributeBuilders.Count; i++)
+                {
+                    requiredAttributeSet.Add(_requiredAttributeBuilders[i].Build());
+                }
+
+                requiredAttributes = requiredAttributeSet.ToArray();
+            }
+
+            var rule = new DefaultTagMatchingRuleDescriptor(
+                TagName,
+                ParentTag,
+                TagStructure,
+                requiredAttributes,
+                diagnostics.ToArray());
+
+            return rule;
+        }
+
+        private IEnumerable<RazorDiagnostic> Validate()
+        {
+            if (string.IsNullOrWhiteSpace(TagName))
+            {
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedTagNameNullOrWhitespace();
+
+                yield return diagnostic;
+            }
+            else if (TagName != TagHelperMatchingConventions.ElementCatchAllName)
+            {
+                foreach (var character in TagName)
+                {
+                    if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedTagName(TagName, character);
+
+                        yield return diagnostic;
+                    }
+                }
+            }
+
+            if (ParentTag != null)
+            {
+                if (string.IsNullOrWhiteSpace(ParentTag))
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedParentTagNameNullOrWhitespace();
+
+                    yield return diagnostic;
+                }
+                else
+                {
+                    foreach (var character in ParentTag)
+                    {
+                        if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                        {
+                            var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedParentTagName(ParentTag, character);
+
+                            yield return diagnostic;
+                        }
+                    }
+                }
+            }
+        }
+
+        private void EnsureRequiredAttributeBuilders()
+        {
+            if (_requiredAttributeBuilders == null)
+            {
+                _requiredAttributeBuilders = new List<DefaultRequiredAttributeDescriptorBuilder>();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptor.cs
new file mode 100644
index 0000000000..f2591b9f68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptor.cs
@@ -0,0 +1,263 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// A descriptor type for a directive that can be parsed by the Razor parser.
+    /// </summary>
+    public abstract class DirectiveDescriptor
+    {
+        /// <summary>
+        /// Gets the description of the directive.
+        /// </summary>
+        /// <remarks>
+        /// The description is used for information purposes, and has no effect on parsing.
+        /// </remarks>
+        public abstract string Description { get; }
+
+        /// <summary>
+        /// Gets the directive keyword without the leading <c>@</c> token.
+        /// </summary>
+        public abstract string Directive { get; }
+
+        /// <summary>
+        /// Gets the display name of the directive.
+        /// </summary>
+        /// <remarks>
+        /// The display name is used for information purposes, and has no effect on parsing.
+        /// </remarks>
+        public abstract string DisplayName { get; }
+
+        /// <summary>
+        /// Gets the kind of the directive. The kind determines whether or not a directive has an associated block.
+        /// </summary>
+        public abstract DirectiveKind Kind { get; }
+
+        /// <summary>
+        /// Gets the way a directive can be used. The usage determines how many, and where directives can exist per document.
+        /// </summary>
+        public abstract DirectiveUsage Usage { get; }
+
+        /// <summary>
+        /// Gets the list of directive tokens that can follow the directive keyword.
+        /// </summary>
+        public abstract IReadOnlyList<DirectiveTokenDescriptor> Tokens { get; }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/>.
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <param name="kind">The directive kind.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateDirective(string directive, DirectiveKind kind)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, kind, configure: null);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/>.
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <param name="kind">The directive kind.</param>
+        /// <param name="configure">A configuration delegate for the directive.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateDirective(string directive, DirectiveKind kind, Action<IDirectiveDescriptorBuilder> configure)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            var builder = new DefaultDirectiveDescriptorBuilder(directive, kind);
+            configure?.Invoke(builder);
+            return builder.Build();
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/> with <see cref="Kind"/> set to <see cref="DirectiveKind.SingleLine"/>
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateSingleLineDirective(string directive)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, DirectiveKind.SingleLine, configure: null);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/> with <see cref="Kind"/> set to <see cref="DirectiveKind.SingleLine"/>
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <param name="configure">A configuration delegate for the directive.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateSingleLineDirective(string directive, Action<IDirectiveDescriptorBuilder> configure)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, DirectiveKind.SingleLine, configure);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/> with <see cref="Kind"/> set to <see cref="DirectiveKind.RazorBlock"/>
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateRazorBlockDirective(string directive)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, DirectiveKind.RazorBlock, configure: null);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/> with <see cref="Kind"/> set to <see cref="DirectiveKind.RazorBlock"/>
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <param name="configure">A configuration delegate for the directive.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateRazorBlockDirective(string directive, Action<IDirectiveDescriptorBuilder> configure)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, DirectiveKind.RazorBlock, configure);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/> with <see cref="Kind"/> set to <see cref="DirectiveKind.CodeBlock"/>
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateCodeBlockDirective(string directive)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, DirectiveKind.CodeBlock, configure: null);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DirectiveDescriptor"/> with <see cref="Kind"/> set to <see cref="DirectiveKind.CodeBlock"/>
+        /// </summary>
+        /// <param name="directive">The directive keyword.</param>
+        /// <param name="configure">A configuration delegate for the directive.</param>
+        /// <returns>A <see cref="DirectiveDescriptor"/> for the created directive.</returns>
+        public static DirectiveDescriptor CreateCodeBlockDirective(string directive, Action<IDirectiveDescriptorBuilder> configure)
+        {
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            return CreateDirective(directive, DirectiveKind.CodeBlock, configure);
+        }
+
+        private class DefaultDirectiveDescriptorBuilder : IDirectiveDescriptorBuilder
+        {
+            public DefaultDirectiveDescriptorBuilder(string name, DirectiveKind kind)
+            {
+                Directive = name;
+                Kind = kind;
+
+                Tokens = new List<DirectiveTokenDescriptor>();
+            }
+
+            public string Description { get; set; }
+
+            public string Directive { get; }
+
+            public string DisplayName { get; set; }
+
+            public DirectiveKind Kind { get; }
+
+            public DirectiveUsage Usage { get; set; }
+
+            public IList<DirectiveTokenDescriptor> Tokens { get; }
+
+            public DirectiveDescriptor Build()
+            {
+                if (Directive.Length == 0)
+                {
+                    throw new InvalidOperationException(Resources.FormatDirectiveDescriptor_InvalidDirectiveKeyword(Directive));
+                }
+
+                for (var i = 0; i < Directive.Length; i++)
+                {
+                    if (!char.IsLetter(Directive[i]))
+                    {
+                        throw new InvalidOperationException(Resources.FormatDirectiveDescriptor_InvalidDirectiveKeyword(Directive));
+                    }
+                }
+
+                var foundOptionalToken = false;
+                for (var i = 0; i < Tokens.Count; i++)
+                {
+                    var token = Tokens[i];
+                    foundOptionalToken |= token.Optional;
+
+                    if (foundOptionalToken && !token.Optional)
+                    {
+                        throw new InvalidOperationException(Resources.DirectiveDescriptor_InvalidNonOptionalToken);
+                    }
+                }
+
+                return new DefaultDirectiveDescriptor(Directive, Kind, Usage, Tokens.ToArray(), DisplayName, Description);
+            }
+        }
+
+        private class DefaultDirectiveDescriptor : DirectiveDescriptor
+        {
+            public DefaultDirectiveDescriptor(
+                string directive, 
+                DirectiveKind kind, 
+                DirectiveUsage usage,
+                DirectiveTokenDescriptor[] tokens,
+                string displayName,
+                string description)
+            {
+                Directive = directive;
+                Kind = kind;
+                Usage = usage;
+                Tokens = tokens;
+                DisplayName = displayName;
+                Description = description;
+            }
+
+            public override string Description { get; }
+
+            public override string Directive { get; }
+
+            public override string DisplayName { get; }
+
+            public override DirectiveKind Kind { get; }
+
+            public override DirectiveUsage Usage { get; }
+
+            public override IReadOnlyList<DirectiveTokenDescriptor> Tokens { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..1744475609
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
@@ -0,0 +1,186 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class DirectiveDescriptorBuilderExtensions
+    {
+        public static IDirectiveDescriptorBuilder AddMemberToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddMemberToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddMemberToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Member,
+                    optional: false,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddNamespaceToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddNamespaceToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddNamespaceToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Namespace,
+                    optional: false,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddStringToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddStringToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddStringToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.String,
+                    optional: false,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddTypeToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddTypeToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddTypeToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Type,
+                    optional: false,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalMemberToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddOptionalMemberToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalMemberToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Member,
+                    optional: true,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalNamespaceToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddOptionalNamespaceToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalNamespaceToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Namespace,
+                    optional: true,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalStringToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddOptionalStringToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalStringToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.String,
+                    optional: true,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalTypeToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddOptionalTypeToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalTypeToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Type,
+                    optional: true,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorComparer.cs
new file mode 100644
index 0000000000..c3a9590231
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorComparer.cs
@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DirectiveDescriptorComparer : IEqualityComparer<DirectiveDescriptor>
+    {
+        public static readonly DirectiveDescriptorComparer Default = new DirectiveDescriptorComparer();
+
+        protected DirectiveDescriptorComparer()
+        {
+        }
+
+        public bool Equals(DirectiveDescriptor descriptorX, DirectiveDescriptor descriptorY)
+        {
+            if (descriptorX == descriptorY)
+            {
+                return true;
+            }
+
+            return descriptorX != null &&
+                string.Equals(descriptorX.Directive, descriptorY.Directive, StringComparison.Ordinal) &&
+                descriptorX.Kind == descriptorY.Kind &&
+                Enumerable.SequenceEqual(
+                    descriptorX.Tokens,
+                    descriptorY.Tokens,
+                    DirectiveTokenDescriptorComparer.Default);
+        }
+
+        public int GetHashCode(DirectiveDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(descriptor.Directive, StringComparer.Ordinal);
+            hashCodeCombiner.Add(descriptor.Kind);
+
+            return hashCodeCombiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveKind.cs
new file mode 100644
index 0000000000..4c26a3c2af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveKind.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public enum DirectiveKind
+    {
+        SingleLine,
+        RazorBlock,
+        CodeBlock
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveRemovalOptimizationPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveRemovalOptimizationPass.cs
new file mode 100644
index 0000000000..5b7e136d3b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveRemovalOptimizationPass.cs
@@ -0,0 +1,40 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DirectiveRemovalOptimizationPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        public override int Order => DefaultFeatureOrder + 50;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.VisitDocument(documentNode);
+
+            foreach (var nodeReference in visitor.DirectiveNodes)
+            {
+                // Lift the diagnostics in the directive node up to the document node.
+                for (var i = 0; i < nodeReference.Node.Diagnostics.Count; i++)
+                {
+                    documentNode.Diagnostics.Add(nodeReference.Node.Diagnostics[i]);
+                }
+
+                nodeReference.Remove();
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public IList<IntermediateNodeReference> DirectiveNodes { get; } = new List<IntermediateNodeReference>();
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                DirectiveNodes.Add(new IntermediateNodeReference(Parent, node));
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptor.cs
new file mode 100644
index 0000000000..1b6e63762d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptor.cs
@@ -0,0 +1,50 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class DirectiveTokenDescriptor
+    {
+        public abstract DirectiveTokenKind Kind { get; }
+
+        public abstract bool Optional { get; }
+
+        public virtual string Name { get; }
+
+        public virtual string Description { get; }
+
+        public static DirectiveTokenDescriptor CreateToken(DirectiveTokenKind kind)
+        {
+            return CreateToken(kind, optional: false);
+        }
+
+        public static DirectiveTokenDescriptor CreateToken(DirectiveTokenKind kind, bool optional)
+        {
+            return CreateToken(kind, optional, name: null, description: null);
+        }
+
+        public static DirectiveTokenDescriptor CreateToken(DirectiveTokenKind kind, bool optional, string name, string description)
+        {
+            return new DefaultDirectiveTokenDescriptor(kind, optional, name, description);
+        }
+
+        private class DefaultDirectiveTokenDescriptor : DirectiveTokenDescriptor
+        {
+            public DefaultDirectiveTokenDescriptor(DirectiveTokenKind kind, bool optional, string name, string description)
+            {
+                Kind = kind;
+                Optional = optional;
+                Name = name;
+                Description = description;
+            }
+
+            public override DirectiveTokenKind Kind { get; }
+
+            public override bool Optional { get; }
+
+            public override string Name { get; }
+
+            public override string Description { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptorComparer.cs
new file mode 100644
index 0000000000..4ec1ba70d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenDescriptorComparer.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DirectiveTokenDescriptorComparer : IEqualityComparer<DirectiveTokenDescriptor>
+    {
+        public static readonly DirectiveTokenDescriptorComparer Default = new DirectiveTokenDescriptorComparer();
+
+        protected DirectiveTokenDescriptorComparer()
+        {
+        }
+
+        public bool Equals(DirectiveTokenDescriptor descriptorX, DirectiveTokenDescriptor descriptorY)
+        {
+            if (descriptorX == descriptorY)
+            {
+                return true;
+            }
+
+            return descriptorX != null &&
+                descriptorX.Kind == descriptorY.Kind &&
+                descriptorX.Optional == descriptorY.Optional;
+        }
+
+        public int GetHashCode(DirectiveTokenDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(descriptor.Kind);
+            hashCodeCombiner.Add(descriptor.Optional ? 1 : 0);
+
+            return hashCodeCombiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenEditHandler.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenEditHandler.cs
new file mode 100644
index 0000000000..c84d8b0c67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenEditHandler.cs
@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DirectiveTokenEditHandler : SpanEditHandler
+    {
+        public DirectiveTokenEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer) : base(tokenizer)
+        {
+        }
+
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
+        {
+            if (AcceptedCharacters == AcceptedCharactersInternal.NonWhitespace)
+            {
+                var originalText = change.GetOriginalText(target);
+                var editedContent = change.GetEditedContent(target);
+
+                if (!ContainsWhitespace(originalText) && !ContainsWhitespace(editedContent))
+                {
+                    // Did not modify whitespace, directive format should be the same.
+                    // Return provisional so extensible IR/code gen pieces can see the full directive text
+                    // once the user stops editing the document.
+                    return PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional;
+                }
+            }
+
+            return PartialParseResultInternal.Rejected;
+        }
+
+        private static bool ContainsWhitespace(string content)
+        {
+            for (var i = 0; i < content.Length; i++)
+            {
+                if (char.IsWhiteSpace(content[i]))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
new file mode 100644
index 0000000000..4ee292c083
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public enum DirectiveTokenKind
+    {
+        Type,
+        Namespace,
+        Member,
+        String,
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveUsage.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveUsage.cs
new file mode 100644
index 0000000000..40e2eee78a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveUsage.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// The way a directive can be used. The usage determines how many, and where directives can exist per file.
+    /// </summary>
+    public enum DirectiveUsage
+    {
+        /// <summary>
+        /// Directive can exist anywhere in the file.
+        /// </summary>
+        Unrestricted,
+
+        /// <summary>
+        /// Directive must exist prior to any HTML or code and have no duplicates. When importing the directive, if it is 
+        /// <see cref="DirectiveKind.SingleLine"/>, the last occurrence of the directive is imported.
+        /// </summary>
+        FileScopedSinglyOccurring,
+
+        /// <summary>
+        /// Directive must exist prior to any HTML or code.
+        /// </summary>
+        FileScopedMultipleOccurring,
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs
new file mode 100644
index 0000000000..b72c90dd2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs
@@ -0,0 +1,153 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class DocumentClassifierPassBase : IntermediateNodePassBase, IRazorDocumentClassifierPass
+    {
+        private static readonly ICodeTargetExtension[] EmptyExtensionArray = new ICodeTargetExtension[0];
+        private ICodeTargetExtension[] _targetExtensions;
+
+        protected abstract string DocumentKind { get; }
+
+        protected override void OnInitialized()
+        {
+            var feature = Engine.Features.OfType<IRazorTargetExtensionFeature>();
+            _targetExtensions = feature.FirstOrDefault()?.TargetExtensions.ToArray() ?? EmptyExtensionArray;
+        }
+
+        protected sealed override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.DocumentKind != null)
+            {
+                return;
+            }
+
+            if (!IsMatch(codeDocument, documentNode))
+            {
+                return;
+            }
+
+            documentNode.DocumentKind = DocumentKind;
+            documentNode.Target = CreateTarget(codeDocument, documentNode.Options);
+
+            Rewrite(codeDocument, documentNode);
+        }
+
+        private void Rewrite(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            // Rewrite the document from a flat structure to use a sensible default structure,
+            // a namespace and class declaration with a single 'razor' method.
+            var children = new List<IntermediateNode>(documentNode.Children);
+            documentNode.Children.Clear();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode();
+            @namespace.Annotations[CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace;
+
+            var @class = new ClassDeclarationIntermediateNode();
+            @class.Annotations[CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass;
+
+            var method = new MethodDeclarationIntermediateNode();
+            method.Annotations[CommonAnnotations.PrimaryMethod] = CommonAnnotations.PrimaryMethod;
+
+            var documentBuilder = IntermediateNodeBuilder.Create(documentNode);
+
+            var namespaceBuilder = IntermediateNodeBuilder.Create(documentBuilder.Current);
+            namespaceBuilder.Push(@namespace);
+
+            var classBuilder = IntermediateNodeBuilder.Create(namespaceBuilder.Current);
+            classBuilder.Push(@class);
+
+            var methodBuilder = IntermediateNodeBuilder.Create(classBuilder.Current);
+            methodBuilder.Push(method);
+
+            var visitor = new Visitor(documentBuilder, namespaceBuilder, classBuilder, methodBuilder);
+
+            for (var i = 0; i < children.Count; i++)
+            {
+                visitor.Visit(children[i]);
+            }
+
+            // Note that this is called at the *end* of rewriting so that user code can see the tree
+            // and look at its content to make a decision.
+            OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+        }
+
+        protected abstract bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
+
+        private CodeTarget CreateTarget(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
+        {
+            return CodeTarget.CreateDefault(codeDocument, options, (builder) =>
+            {
+                for (var i = 0; i < _targetExtensions.Length; i++)
+                {
+                    builder.TargetExtensions.Add(_targetExtensions[i]);
+                }
+
+                ConfigureTarget(builder);
+            });
+        }
+
+        protected virtual void ConfigureTarget(CodeTargetBuilder builder)
+        {
+            // Intentionally empty.
+        }
+
+        protected virtual void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument,
+            NamespaceDeclarationIntermediateNode @namespace,
+            ClassDeclarationIntermediateNode @class,
+            MethodDeclarationIntermediateNode @method)
+        {
+            // Intentionally empty.
+        }
+
+        private class Visitor : IntermediateNodeVisitor
+        {
+            private readonly IntermediateNodeBuilder _document;
+            private readonly IntermediateNodeBuilder _namespace;
+            private readonly IntermediateNodeBuilder _class;
+            private readonly IntermediateNodeBuilder _method;
+
+            public Visitor(IntermediateNodeBuilder document, IntermediateNodeBuilder @namespace, IntermediateNodeBuilder @class, IntermediateNodeBuilder method)
+            {
+                _document = document;
+                _namespace = @namespace;
+                _class = @class;
+                _method = method;
+            }
+
+            public override void VisitUsingDirective(UsingDirectiveIntermediateNode node)
+            {
+                var children = _namespace.Current.Children;
+                var i = children.Count - 1;
+                for (; i >= 0; i--)
+                {
+                    var child = children[i];
+                    if (child is UsingDirectiveIntermediateNode)
+                    {
+                        break;
+                    }
+                }
+
+                _namespace.Insert(i + 1, node);
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                if (node is MemberDeclarationIntermediateNode)
+                {
+                    _class.Add(node);
+                    return;
+                }
+
+                _method.Add(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs
new file mode 100644
index 0000000000..61ced1271b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs
@@ -0,0 +1,23 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class EmptyProjectFileSystem : RazorProjectFileSystem
+    {
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            NormalizeAndEnsureValidPath(basePath);
+            return Enumerable.Empty<RazorProjectItem>();
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            NormalizeAndEnsureValidPath(path);
+            return new NotFoundProjectItem(string.Empty, path);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultMetadataIdentifierFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultMetadataIdentifierFeature.cs
new file mode 100644
index 0000000000..89dc56c469
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultMetadataIdentifierFeature.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    // The default scheme for identifiers matches MVC's view engine paths:
+    // 1. Normalize backslash to forward-slash
+    // 2. Always include leading slash
+    // 3. Always include file name and extensions
+    internal class DefaultMetadataIdentifierFeature : RazorEngineFeatureBase, IMetadataIdentifierFeature
+    {
+        public string GetIdentifier(RazorCodeDocument codeDocument, RazorSourceDocument sourceDocument)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (sourceDocument == null)
+            {
+                throw new ArgumentNullException(nameof(sourceDocument));
+            }
+
+            if (string.IsNullOrEmpty(sourceDocument.RelativePath))
+            {
+                return null;
+            }
+
+            var identifier = sourceDocument.RelativePath;
+            identifier = identifier.Replace("\\", "/");
+            if (!identifier.StartsWith("/"))
+            {
+                identifier = "/" + identifier;
+            }
+            
+            return identifier;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperBodyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperBodyIntermediateNode.cs
new file mode 100644
index 0000000000..461df52991
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperBodyIntermediateNode.cs
@@ -0,0 +1,74 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class DefaultTagHelperBodyIntermediateNode : ExtensionIntermediateNode
+    {
+        public DefaultTagHelperBodyIntermediateNode()
+        {
+        }
+
+        public DefaultTagHelperBodyIntermediateNode(TagHelperBodyIntermediateNode bodyNode)
+        {
+            if (bodyNode == null)
+            {
+                throw new ArgumentNullException(nameof(bodyNode));
+            }
+
+            Source = bodyNode.Source;
+
+            for (var i = 0; i < bodyNode.Children.Count; i++)
+            {
+                Children.Add(bodyNode.Children[i]);
+            }
+
+            for (var i = 0; i < bodyNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(bodyNode.Diagnostics[i]);
+            }
+        }
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public TagMode TagMode { get; set; }
+
+        public string TagName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DefaultTagHelperBodyIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDefaultTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDefaultTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperBody(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperCreateIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperCreateIntermediateNode.cs
new file mode 100644
index 0000000000..0ef75f1b7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperCreateIntermediateNode.cs
@@ -0,0 +1,61 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class DefaultTagHelperCreateIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
+
+        public string FieldName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public string TypeName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DefaultTagHelperCreateIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDefaultTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDefaultTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperCreate(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(TypeName);
+
+            formatter.WriteProperty(nameof(FieldName), FieldName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperExecuteIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperExecuteIntermediateNode.cs
new file mode 100644
index 0000000000..35d4fa195c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperExecuteIntermediateNode.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class DefaultTagHelperExecuteIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DefaultTagHelperExecuteIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDefaultTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDefaultTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperExecute(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..0290be8323
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperHtmlAttributeIntermediateNode.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class DefaultTagHelperHtmlAttributeIntermediateNode : ExtensionIntermediateNode
+    {
+        public DefaultTagHelperHtmlAttributeIntermediateNode()
+        {
+        }
+
+        public DefaultTagHelperHtmlAttributeIntermediateNode(TagHelperHtmlAttributeIntermediateNode htmlAttributeNode)
+        {
+            if (htmlAttributeNode == null)
+            {
+                throw new ArgumentNullException(nameof(htmlAttributeNode));
+            }
+
+            AttributeName = htmlAttributeNode.AttributeName;
+            AttributeStructure = htmlAttributeNode.AttributeStructure;
+            Source = htmlAttributeNode.Source;
+
+            for (var i = 0; i < htmlAttributeNode.Children.Count; i++)
+            {
+                Children.Add(htmlAttributeNode.Children[i]);
+            }
+
+            for (var i = 0; i < htmlAttributeNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(htmlAttributeNode.Diagnostics[i]);
+            }
+        }
+
+        public string AttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DefaultTagHelperHtmlAttributeIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDefaultTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDefaultTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperHtmlAttribute(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperOptimizationPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperOptimizationPass.cs
new file mode 100644
index 0000000000..ef777ff754
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperOptimizationPass.cs
@@ -0,0 +1,259 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class DefaultTagHelperOptimizationPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run later than default order for user code so other passes have a chance to modify the
+        // tag helper nodes.
+        public override int Order => DefaultFeatureOrder + 1000;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null)
+            {
+                // Bail if we can't find a class node, we need to be able to create fields.
+                return;
+            }
+
+            var context = new Context(@class);
+
+            // First find all tag helper nodes that require the default tag helper runtime.
+            //
+            // This phase lowers the conceptual nodes to default runtime nodes we only care about those.
+            var tagHelperNodes = documentNode
+                .FindDescendantNodes<TagHelperIntermediateNode>()
+                .Where(IsTagHelperRuntimeNode)
+                .ToArray();
+
+            if (tagHelperNodes.Length == 0)
+            {
+                // If nothing uses the default runtime then we're done.
+                return;
+            }
+
+            AddDefaultRuntime(context);
+
+            // Each tagHelperNode should be rewritten to use the default tag helper runtime. That doesn't necessarily
+            // mean that all of these tag helpers are the default kind, just that them are compatible with ITagHelper.
+            for (var i = 0; i < tagHelperNodes.Length; i++)
+            {
+                var tagHelperNode = tagHelperNodes[i];
+
+                RewriteBody(tagHelperNode);
+                RewriteHtmlAttributes(tagHelperNode);
+                AddExecute(tagHelperNode);
+
+                // We need to find all of the 'default' kind tag helpers and rewrite their usage site to use the 
+                // extension nodes for the default tag helper runtime (ITagHelper).
+                foreach (var tagHelper in tagHelperNode.TagHelpers)
+                {
+                    RewriteUsage(context, tagHelperNode, tagHelper);
+                }
+            }
+
+            // Then for each 'default' kind tag helper we need to generate the field that will hold it.
+            foreach (var tagHelper in context.TagHelpers)
+            {
+                AddField(context, tagHelper);
+            }
+        }
+
+        private void AddDefaultRuntime(Context context)
+        {
+            // We need to insert a node for the field that will hold the tag helper. We've already generated a field name
+            // at this time and use it for all uses of the same tag helper type.
+            //
+            // We also want to preserve the ordering of the nodes for testability. So insert at the end of any existing
+            // field nodes.
+            var i = 0;
+            while (i < context.Class.Children.Count && context.Class.Children[i] is FieldDeclarationIntermediateNode)
+            {
+                i++;
+            }
+
+            context.Class.Children.Insert(i, new DefaultTagHelperRuntimeIntermediateNode());
+        }
+
+        private void RewriteBody(TagHelperIntermediateNode node)
+        {
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperBodyIntermediateNode bodyNode)
+                {
+                    // We only expect one body node.
+                    node.Children[i] = new DefaultTagHelperBodyIntermediateNode(bodyNode)
+                    {
+                        TagMode = node.TagMode,
+                        TagName = node.TagName,
+                    };
+                    break;
+                }
+            }
+        }
+
+        private void AddExecute(TagHelperIntermediateNode node)
+        {
+            // Execute the tag helpers at the end, before leaving scope.
+            node.Children.Add(new DefaultTagHelperExecuteIntermediateNode());
+        }
+
+        private void RewriteHtmlAttributes(TagHelperIntermediateNode node)
+        {
+            // We need to rewrite each html attribute, so that it will get added to the execution context.
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperHtmlAttributeIntermediateNode htmlAttributeNode)
+                {
+                    node.Children[i] = new DefaultTagHelperHtmlAttributeIntermediateNode(htmlAttributeNode);
+                }
+            }
+        }
+
+        private void RewriteUsage(Context context, TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        {
+            if (!tagHelper.IsDefaultKind())
+            {
+                return;
+            }
+
+            context.Add(tagHelper);
+
+            // First we need to insert a node for the creation of the tag helper, and the hook up to the execution
+            // context. This should come after the body node and any existing create nodes.
+            //
+            // If we're dealing with something totally malformed, then we'll end up just inserting at the end, and that's not
+            // so bad.
+            var i = 0;
+
+            // Find the body node.
+            while (i < node.Children.Count && node.Children[i] is TagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now find the last create node.
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperCreateIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now i has the right insertion point.
+            node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = context.GetFieldName(tagHelper),
+                TagHelper = tagHelper,
+                TypeName = tagHelper.GetTypeName(),
+            });
+
+            // Next we need to rewrite any property nodes to use the field and property name for this
+            // tag helper.
+            for (i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode &&
+                    propertyNode.TagHelper == tagHelper)
+                {
+                    // This belongs to the current tag helper, replace it.
+                    node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
+                    {
+                        FieldName = context.GetFieldName(tagHelper),
+                        PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
+                    };
+                }
+            }
+        }
+
+        private void AddField(Context context, TagHelperDescriptor tagHelper)
+        {
+            // We need to insert a node for the field that will hold the tag helper. We've already generated a field name
+            // at this time and use it for all uses of the same tag helper type.
+            //
+            // We also want to preserve the ordering of the nodes for testability. So insert at the end of any existing
+            // field nodes.
+            var i = 0;
+            while (i < context.Class.Children.Count && context.Class.Children[i] is DefaultTagHelperRuntimeIntermediateNode)
+            {
+                i++;
+            }
+
+            while (i < context.Class.Children.Count && context.Class.Children[i] is FieldDeclarationIntermediateNode)
+            {
+                i++;
+            }
+
+            context.Class.Children.Insert(i, new FieldDeclarationIntermediateNode()
+            {
+                Annotations =
+                {
+                    { CommonAnnotations.DefaultTagHelperExtension.TagHelperField, bool.TrueString },
+                },
+                Modifiers =
+                {
+                    "private",
+                },
+                FieldName = context.GetFieldName(tagHelper),
+                FieldType = "global::" + tagHelper.GetTypeName(),
+            });
+        }
+
+        private bool IsTagHelperRuntimeNode(TagHelperIntermediateNode node)
+        {
+            foreach (var tagHelper in node.TagHelpers)
+            {
+                if (tagHelper.KindUsesDefaultTagHelperRuntime())
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private struct Context
+        {
+            private readonly Dictionary<TagHelperDescriptor, string> _tagHelpers;
+
+            public Context(ClassDeclarationIntermediateNode @class)
+            {
+                Class = @class;
+
+                _tagHelpers = new Dictionary<TagHelperDescriptor, string>(TagHelperDescriptorComparer.Default);
+            }
+
+            public ClassDeclarationIntermediateNode Class { get; }
+
+            public IEnumerable<TagHelperDescriptor> TagHelpers => _tagHelpers.Keys;
+
+            public bool Add(TagHelperDescriptor tagHelper)
+            {
+                if (_tagHelpers.ContainsKey(tagHelper))
+                {
+                    return false;
+                }
+
+                _tagHelpers.Add(tagHelper, GenerateFieldName(tagHelper));
+                return true;
+            }
+
+            public string GetFieldName(TagHelperDescriptor tagHelper)
+            {
+                return _tagHelpers[tagHelper];
+            }
+
+            private static string GenerateFieldName(TagHelperDescriptor tagHelper)
+            {
+                return "__" + tagHelper.GetTypeName().Replace('.', '_');
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperPropertyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperPropertyIntermediateNode.cs
new file mode 100644
index 0000000000..c0362f0d60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperPropertyIntermediateNode.cs
@@ -0,0 +1,102 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class DefaultTagHelperPropertyIntermediateNode : ExtensionIntermediateNode
+    {
+        public DefaultTagHelperPropertyIntermediateNode()
+        {
+        }
+
+        public DefaultTagHelperPropertyIntermediateNode(TagHelperPropertyIntermediateNode propertyNode)
+        {
+            if (propertyNode == null)
+            {
+                throw new ArgumentNullException(nameof(propertyNode));
+            }
+
+            AttributeName = propertyNode.AttributeName;
+            AttributeStructure = propertyNode.AttributeStructure;
+            BoundAttribute = propertyNode.BoundAttribute;
+            IsIndexerNameMatch = propertyNode.IsIndexerNameMatch;
+            Source = propertyNode.Source;
+            TagHelper = propertyNode.TagHelper;
+
+            for (var i = 0; i < propertyNode.Children.Count; i++)
+            {
+                Children.Add(propertyNode.Children[i]);
+            }
+
+            for (var i = 0; i < propertyNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(propertyNode.Diagnostics[i]);
+            }
+        }
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public string FieldName { get; set; }
+
+        public bool IsIndexerNameMatch { get; set; }
+
+        public string PropertyName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DefaultTagHelperPropertyIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDefaultTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDefaultTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperProperty(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(FieldName), FieldName);
+            formatter.WriteProperty(nameof(IsIndexerNameMatch), IsIndexerNameMatch.ToString());
+            formatter.WriteProperty(nameof(PropertyName), PropertyName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs
new file mode 100644
index 0000000000..74f33baddd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperRuntimeIntermediateNode.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class DefaultTagHelperRuntimeIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DefaultTagHelperRuntimeIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDefaultTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDefaultTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperRuntime(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..884ef07df5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
@@ -0,0 +1,663 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class DefaultTagHelperTargetExtension : IDefaultTagHelperTargetExtension
+    {
+        private static readonly string[] PrivateModifiers = new string[] { "private" };
+
+        public string RunnerVariableName { get; set; } = "__tagHelperRunner";
+
+        public string StringValueBufferVariableName { get; set; } = "__tagHelperStringValueBuffer";
+
+        public string CreateTagHelperMethodName { get; set; } = "CreateTagHelper";
+
+        public string ExecutionContextTypeName { get; set; } = "global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext";
+
+        public string ExecutionContextVariableName { get; set; } = "__tagHelperExecutionContext";
+
+        public string ExecutionContextAddMethodName { get; set; } = "Add";
+
+        public string TagHelperRunnerTypeName { get; set; } = "global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner";
+
+        public string ExecutionContextOutputPropertyName { get; set; } = "Output";
+
+        public string ExecutionContextSetOutputContentAsyncMethodName { get; set; } = "SetOutputContentAsync";
+
+        public string ExecutionContextAddHtmlAttributeMethodName { get; set; } = "AddHtmlAttribute";
+
+        public string ExecutionContextAddTagHelperAttributeMethodName { get; set; } = "AddTagHelperAttribute";
+
+        public string RunnerRunAsyncMethodName { get; set; } = "RunAsync";
+
+        public string ScopeManagerTypeName { get; set; } = "global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager";
+
+        public string ScopeManagerVariableName { get; set; } = "__tagHelperScopeManager";
+
+        public string ScopeManagerBeginMethodName { get; set; } = "Begin";
+
+        public string ScopeManagerEndMethodName { get; set; } = "End";
+
+        public string StartTagHelperWritingScopeMethodName { get; set; } = "StartTagHelperWritingScope";
+
+        public string EndTagHelperWritingScopeMethodName { get; set; } = "EndTagHelperWritingScope";
+
+        public string TagModeTypeName { get; set; } = "global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode";
+
+        public string HtmlAttributeValueStyleTypeName { get; set; } = "global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle";
+
+        public string TagHelperOutputIsContentModifiedPropertyName { get; set; } = "IsContentModified";
+
+        public string BeginAddHtmlAttributeValuesMethodName { get; set; } = "BeginAddHtmlAttributeValues";
+
+        public string EndAddHtmlAttributeValuesMethodName { get; set; } = "EndAddHtmlAttributeValues";
+
+        public string BeginWriteTagHelperAttributeMethodName { get; set; } = "BeginWriteTagHelperAttribute";
+
+        public string EndWriteTagHelperAttributeMethodName { get; set; } = "EndWriteTagHelperAttribute";
+
+        public string MarkAsHtmlEncodedMethodName { get; set; } = "Html.Raw";
+
+        public string FormatInvalidIndexerAssignmentMethodName { get; set; } = "InvalidTagHelperIndexerAssignment";
+
+        public string WriteTagHelperOutputMethod { get; set; } = "Write";
+
+        public void WriteTagHelperBody(CodeRenderingContext context, DefaultTagHelperBodyIntermediateNode node)
+        {
+            if (context.Parent as TagHelperIntermediateNode == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            if (context.Options.DesignTime)
+            {
+                context.RenderChildren(node);
+            }
+            else
+            {
+                // Call into the tag helper scope manager to start a new tag helper scope.
+                // Also capture the value as the current execution context.
+                context.CodeWriter
+                    .WriteStartAssignment(ExecutionContextVariableName)
+                    .WriteStartInstanceMethodInvocation(
+                        ScopeManagerVariableName,
+                        ScopeManagerBeginMethodName);
+
+                // Assign a unique ID for this instance of the source HTML tag. This must be unique
+                // per call site, e.g. if the tag is on the view twice, there should be two IDs.
+                var uniqueId = (string)context.Items[CodeRenderingContext.SuppressUniqueIds];
+                if (uniqueId == null)
+                {
+                    uniqueId = GetDeterministicId(context);
+                }
+
+                context.CodeWriter.WriteStringLiteral(node.TagName)
+                    .WriteParameterSeparator()
+                    .Write(TagModeTypeName)
+                    .Write(".")
+                    .Write(node.TagMode.ToString())
+                    .WriteParameterSeparator()
+                    .WriteStringLiteral(uniqueId)
+                    .WriteParameterSeparator();
+
+                using (context.CodeWriter.BuildAsyncLambda())
+                {
+                    // We remove and redirect writers so TagHelper authors can retrieve content.
+                    context.RenderChildren(node, new RuntimeNodeWriter());
+                }
+
+                context.CodeWriter.WriteEndMethodInvocation();
+            }
+        }
+
+        public void WriteTagHelperCreate(CodeRenderingContext context, DefaultTagHelperCreateIntermediateNode node)
+        {
+            if (context.Parent as TagHelperIntermediateNode == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            context.CodeWriter
+                .WriteStartAssignment(node.FieldName)
+                .Write(CreateTagHelperMethodName)
+                .WriteLine("<global::" + node.TypeName + ">();");
+
+            if (!context.Options.DesignTime)
+            {
+                context.CodeWriter.WriteInstanceMethodInvocation(
+                    ExecutionContextVariableName,
+                    ExecutionContextAddMethodName,
+                    node.FieldName);
+            }
+        }
+
+        public void WriteTagHelperExecute(CodeRenderingContext context, DefaultTagHelperExecuteIntermediateNode node)
+        {
+            if (context.Parent as TagHelperIntermediateNode == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            if (!context.Options.DesignTime)
+            {
+                context.CodeWriter
+                    .Write("await ")
+                    .WriteStartInstanceMethodInvocation(
+                        RunnerVariableName,
+                        RunnerRunAsyncMethodName)
+                    .Write(ExecutionContextVariableName)
+                    .WriteEndMethodInvocation();
+
+                var tagHelperOutputAccessor = $"{ExecutionContextVariableName}.{ExecutionContextOutputPropertyName}";
+
+                context.CodeWriter
+                    .Write("if (!")
+                    .Write(tagHelperOutputAccessor)
+                    .Write(".")
+                    .Write(TagHelperOutputIsContentModifiedPropertyName)
+                    .WriteLine(")");
+
+                using (context.CodeWriter.BuildScope())
+                {
+                    context.CodeWriter
+                        .Write("await ")
+                        .WriteInstanceMethodInvocation(
+                            ExecutionContextVariableName,
+                            ExecutionContextSetOutputContentAsyncMethodName);
+                }
+
+                context.CodeWriter
+                    .WriteStartMethodInvocation(WriteTagHelperOutputMethod)
+                    .Write(tagHelperOutputAccessor)
+                    .WriteEndMethodInvocation()
+                    .WriteStartAssignment(ExecutionContextVariableName)
+                    .WriteInstanceMethodInvocation(
+                        ScopeManagerVariableName,
+                        ScopeManagerEndMethodName);
+            }
+        }
+
+        public void WriteTagHelperHtmlAttribute(CodeRenderingContext context, DefaultTagHelperHtmlAttributeIntermediateNode node)
+        {
+            if (context.Parent as TagHelperIntermediateNode == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            if (context.Options.DesignTime)
+            {
+                context.RenderChildren(node);
+            }
+            else
+            {
+                var attributeValueStyleParameter = $"{HtmlAttributeValueStyleTypeName}.{node.AttributeStructure}";
+                var isConditionalAttributeValue = node.Children.Any(
+                    child => child is CSharpExpressionAttributeValueIntermediateNode || child is CSharpCodeAttributeValueIntermediateNode);
+
+                // All simple text and minimized attributes will be pre-allocated.
+                if (isConditionalAttributeValue)
+                {
+                    // Dynamic attribute value should be run through the conditional attribute removal system. It's
+                    // unbound and contains C#.
+
+                    // TagHelper attribute rendering is buffered by default. We do not want to write to the current
+                    // writer.
+                    var valuePieceCount = node.Children.Count(
+                        child =>
+                            child is HtmlAttributeValueIntermediateNode ||
+                            child is CSharpExpressionAttributeValueIntermediateNode ||
+                            child is CSharpCodeAttributeValueIntermediateNode ||
+                            child is ExtensionIntermediateNode);
+
+                    context.CodeWriter
+                        .WriteStartMethodInvocation(BeginAddHtmlAttributeValuesMethodName)
+                        .Write(ExecutionContextVariableName)
+                        .WriteParameterSeparator()
+                        .WriteStringLiteral(node.AttributeName)
+                        .WriteParameterSeparator()
+                        .Write(valuePieceCount.ToString(CultureInfo.InvariantCulture))
+                        .WriteParameterSeparator()
+                        .Write(attributeValueStyleParameter)
+                        .WriteEndMethodInvocation();
+
+                    context.RenderChildren(node, new TagHelperHtmlAttributeRuntimeNodeWriter());
+
+                    context.CodeWriter
+                        .WriteMethodInvocation(
+                            EndAddHtmlAttributeValuesMethodName,
+                            ExecutionContextVariableName);
+                }
+                else
+                {
+                    // This is a data-* attribute which includes C#. Do not perform the conditional attribute removal or
+                    // other special cases used when IsDynamicAttributeValue(). But the attribute must still be buffered to
+                    // determine its final value.
+
+                    // Attribute value is not plain text, must be buffered to determine its final value.
+                    context.CodeWriter.WriteMethodInvocation(BeginWriteTagHelperAttributeMethodName);
+
+                    // We're building a writing scope around the provided chunks which captures everything written from the
+                    // page. Therefore, we do not want to write to any other buffer since we're using the pages buffer to
+                    // ensure we capture all content that's written, directly or indirectly.
+                    context.RenderChildren(node, new RuntimeNodeWriter());
+
+                    context.CodeWriter
+                        .WriteStartAssignment(StringValueBufferVariableName)
+                        .WriteMethodInvocation(EndWriteTagHelperAttributeMethodName)
+                        .WriteStartInstanceMethodInvocation(
+                            ExecutionContextVariableName,
+                            ExecutionContextAddHtmlAttributeMethodName)
+                        .WriteStringLiteral(node.AttributeName)
+                        .WriteParameterSeparator()
+                        .WriteStartMethodInvocation(MarkAsHtmlEncodedMethodName)
+                        .Write(StringValueBufferVariableName)
+                        .WriteEndMethodInvocation(endLine: false)
+                        .WriteParameterSeparator()
+                        .Write(attributeValueStyleParameter)
+                        .WriteEndMethodInvocation();
+                }
+            }
+        }
+
+        public void WriteTagHelperProperty(CodeRenderingContext context, DefaultTagHelperPropertyIntermediateNode node)
+        {
+            var tagHelperNode = context.Parent as TagHelperIntermediateNode;
+            if (context.Parent == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            if (!context.Options.DesignTime)
+            {
+                // Ensure that the property we're trying to set has initialized its dictionary bound properties.
+                if (node.IsIndexerNameMatch &&
+                    object.ReferenceEquals(FindFirstUseOfIndexer(tagHelperNode, node), node))
+                {
+                    // Throw a reasonable Exception at runtime if the dictionary property is null.
+                    context.CodeWriter
+                        .Write("if (")
+                        .Write(node.FieldName)
+                        .Write(".")
+                        .Write(node.PropertyName)
+                        .WriteLine(" == null)");
+                    using (context.CodeWriter.BuildScope())
+                    {
+                        // System is in Host.NamespaceImports for all MVC scenarios. No need to generate FullName
+                        // of InvalidOperationException type.
+                        context.CodeWriter
+                            .Write("throw ")
+                            .WriteStartNewObject(nameof(InvalidOperationException))
+                            .WriteStartMethodInvocation(FormatInvalidIndexerAssignmentMethodName)
+                            .WriteStringLiteral(node.AttributeName)
+                            .WriteParameterSeparator()
+                            .WriteStringLiteral(node.TagHelper.GetTypeName())
+                            .WriteParameterSeparator()
+                            .WriteStringLiteral(node.PropertyName)
+                            .WriteEndMethodInvocation(endLine: false)   // End of method call
+                            .WriteEndMethodInvocation();   // End of new expression / throw statement
+                    }
+                }
+            }
+
+            // If this is not the first use of the attribute value, we need to evaluate the expression and assign it to
+            // the tag helper property.
+            //
+            // Otherwise, the value has already been computed and assigned to another tag helper. We just need to
+            // copy from that tag helper to this one.
+            //
+            // This is important because we can't evaluate the expression twice due to side-effects.
+            var firstUseOfAttribute = FindFirstUseOfAttribute(tagHelperNode, node);
+            if (!object.ReferenceEquals(firstUseOfAttribute, node))
+            {
+                // If we get here, this value has already been used. We just need to copy the value.
+                context.CodeWriter
+                    .WriteStartAssignment(GetPropertyAccessor(node))
+                    .Write(GetPropertyAccessor(firstUseOfAttribute))
+                    .WriteLine(";");
+
+                return;
+            }
+
+            // If we get there, this is the first time seeing this property so we need to evaluate the expression.
+            if (node.BoundAttribute.ExpectsStringValue(node.AttributeName))
+            {
+                if (context.Options.DesignTime)
+                {
+                    context.RenderChildren(node);
+
+                    context.CodeWriter.WriteStartAssignment(GetPropertyAccessor(node));
+                    if (node.Children.Count == 1 && node.Children.First() is HtmlContentIntermediateNode htmlNode)
+                    {
+                        var content = GetContent(htmlNode);
+                        context.CodeWriter.WriteStringLiteral(content);
+                    }
+                    else
+                    {
+                        context.CodeWriter.Write("string.Empty");
+                    }
+                    context.CodeWriter.WriteLine(";");
+                }
+                else
+                {
+                    context.CodeWriter.WriteMethodInvocation(BeginWriteTagHelperAttributeMethodName);
+
+                    context.RenderChildren(node, new LiteralRuntimeNodeWriter());
+
+                    context.CodeWriter
+                        .WriteStartAssignment(StringValueBufferVariableName)
+                        .WriteMethodInvocation(EndWriteTagHelperAttributeMethodName)
+                        .WriteStartAssignment(GetPropertyAccessor(node))
+                        .Write(StringValueBufferVariableName)
+                        .WriteLine(";");
+                }
+            }
+            else
+            {
+                if (context.Options.DesignTime)
+                {
+                    var firstMappedChild = node.Children.FirstOrDefault(child => child.Source != null) as IntermediateNode;
+                    var valueStart = firstMappedChild?.Source;
+
+                    using (context.CodeWriter.BuildLinePragma(node.Source))
+                    {
+                        var accessor = GetPropertyAccessor(node);
+                        var assignmentPrefixLength = accessor.Length + " = ".Length;
+                        if (node.BoundAttribute.IsEnum &&
+                            node.Children.Count == 1 &&
+                            node.Children.First() is IntermediateToken token &&
+                            token.IsCSharp)
+                        {
+                            assignmentPrefixLength += $"global::{node.BoundAttribute.TypeName}.".Length;
+
+                            if (valueStart != null)
+                            {
+                                context.CodeWriter.WritePadding(assignmentPrefixLength, node.Source, context);
+                            }
+
+                            context.CodeWriter
+                                .WriteStartAssignment(accessor)
+                                .Write("global::")
+                                .Write(node.BoundAttribute.TypeName)
+                                .Write(".");
+                        }
+                        else
+                        {
+                            if (valueStart != null)
+                            {
+                                context.CodeWriter.WritePadding(assignmentPrefixLength, node.Source, context);
+                            }
+
+                            context.CodeWriter.WriteStartAssignment(GetPropertyAccessor(node));
+                        }
+
+                        if (node.Children.Count == 0 &&
+                            node.AttributeStructure == AttributeStructure.Minimized &&
+                            node.BoundAttribute.ExpectsBooleanValue(node.AttributeName))
+                        {
+                            // If this is a minimized boolean attribute, set the value to true.
+                            context.CodeWriter.Write("true");
+                        }
+                        else
+                        {
+                            RenderTagHelperAttributeInline(context, node, node.Source);
+                        }
+
+                        context.CodeWriter.WriteLine(";");
+                    }
+                }
+                else
+                {
+                    using (context.CodeWriter.BuildLinePragma(node.Source))
+                    {
+                        context.CodeWriter.WriteStartAssignment(GetPropertyAccessor(node));
+
+                        if (node.BoundAttribute.IsEnum &&
+                            node.Children.Count == 1 &&
+                            node.Children.First() is IntermediateToken token &&
+                            token.IsCSharp)
+                        {
+                            context.CodeWriter
+                                .Write("global::")
+                                .Write(node.BoundAttribute.TypeName)
+                                .Write(".");
+                        }
+
+                        if (node.Children.Count == 0 &&
+                            node.AttributeStructure == AttributeStructure.Minimized &&
+                            node.BoundAttribute.ExpectsBooleanValue(node.AttributeName))
+                        {
+                            // If this is a minimized boolean attribute, set the value to true.
+                            context.CodeWriter.Write("true");
+                        }
+                        else
+                        {
+                            RenderTagHelperAttributeInline(context, node, node.Source);
+                        }
+
+                        context.CodeWriter.WriteLine(";");
+                    }
+                }
+            }
+
+            if (!context.Options.DesignTime)
+            {
+                // We need to inform the context of the attribute value.
+                context.CodeWriter
+                    .WriteStartInstanceMethodInvocation(
+                        ExecutionContextVariableName,
+                        ExecutionContextAddTagHelperAttributeMethodName)
+                    .WriteStringLiteral(node.AttributeName)
+                    .WriteParameterSeparator()
+                    .Write(GetPropertyAccessor(node))
+                    .WriteParameterSeparator()
+                    .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.AttributeStructure}")
+                    .WriteEndMethodInvocation();
+            }
+        }
+
+        public void WriteTagHelperRuntime(CodeRenderingContext context, DefaultTagHelperRuntimeIntermediateNode node)
+        {
+            if (!context.Options.DesignTime)
+            {
+                context.CodeWriter.WriteLine("#line hidden");
+
+                // Need to disable the warning "X is never used." for the value buffer since
+                // whether it's used depends on how a TagHelper is used.
+                context.CodeWriter.WriteLine("#pragma warning disable 0169");
+                context.CodeWriter.WriteField(PrivateModifiers, "string", StringValueBufferVariableName);
+                context.CodeWriter.WriteLine("#pragma warning restore 0169");
+
+                context.CodeWriter.WriteField(PrivateModifiers, ExecutionContextTypeName, ExecutionContextVariableName);
+
+                context.CodeWriter
+                    .Write("private ")
+                    .Write(TagHelperRunnerTypeName)
+                    .Write(" ")
+                    .Write(RunnerVariableName)
+                    .Write(" = new ")
+                    .Write(TagHelperRunnerTypeName)
+                    .WriteLine("();");
+
+                var backedScopeManageVariableName = "__backed" + ScopeManagerVariableName;
+                context.CodeWriter
+                    .Write("private ")
+                    .WriteVariableDeclaration(
+                        ScopeManagerTypeName,
+                        backedScopeManageVariableName,
+                        value: null);
+
+                context.CodeWriter
+                .Write("private ")
+                .Write(ScopeManagerTypeName)
+                .Write(" ")
+                .WriteLine(ScopeManagerVariableName);
+
+                using (context.CodeWriter.BuildScope())
+                {
+                    context.CodeWriter.WriteLine("get");
+                    using (context.CodeWriter.BuildScope())
+                    {
+                        context.CodeWriter
+                            .Write("if (")
+                            .Write(backedScopeManageVariableName)
+                            .WriteLine(" == null)");
+
+                        using (context.CodeWriter.BuildScope())
+                        {
+                            context.CodeWriter
+                                .WriteStartAssignment(backedScopeManageVariableName)
+                                .WriteStartNewObject(ScopeManagerTypeName)
+                                .Write(StartTagHelperWritingScopeMethodName)
+                                .WriteParameterSeparator()
+                                .Write(EndTagHelperWritingScopeMethodName)
+                                .WriteEndMethodInvocation();
+                        }
+
+                        context.CodeWriter
+                            .Write("return ")
+                            .Write(backedScopeManageVariableName)
+                            .WriteLine(";");
+                    }
+                }
+            }
+        }
+
+        private void RenderTagHelperAttributeInline(
+            CodeRenderingContext context,
+            DefaultTagHelperPropertyIntermediateNode property,
+            SourceSpan? span)
+        {
+            for (var i = 0; i < property.Children.Count; i++)
+            {
+                RenderTagHelperAttributeInline(context, property, property.Children[i], span);
+            }
+        }
+
+        // Internal for testing
+        internal void RenderTagHelperAttributeInline(
+            CodeRenderingContext context,
+            DefaultTagHelperPropertyIntermediateNode property,
+            IntermediateNode node,
+            SourceSpan? span)
+        {
+            if (node is CSharpExpressionIntermediateNode || node is HtmlContentIntermediateNode)
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    RenderTagHelperAttributeInline(context, property, node.Children[i], span);
+                }
+            }
+            else if (node is IntermediateToken token)
+            {
+                if (context.Options.DesignTime && node.Source != null)
+                {
+                    context.AddSourceMappingFor(node);
+                }
+
+                context.CodeWriter.Write(token.Content);
+            }
+            else if (node is CSharpCodeIntermediateNode)
+            {
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CodeBlocksNotSupportedInAttributes(span ?? SourceSpan.Undefined);
+                context.Diagnostics.Add(diagnostic);
+            }
+            else if (node is TemplateIntermediateNode)
+            {
+                var expectedTypeName = property.IsIndexerNameMatch ? property.BoundAttribute.IndexerTypeName : property.BoundAttribute.TypeName;
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InlineMarkupBlocksNotSupportedInAttributes(span ?? SourceSpan.Undefined, expectedTypeName);
+                context.Diagnostics.Add(diagnostic);
+            }
+        }
+
+        private static DefaultTagHelperPropertyIntermediateNode FindFirstUseOfIndexer(
+            TagHelperIntermediateNode tagHelperNode,
+            DefaultTagHelperPropertyIntermediateNode propertyNode)
+        {
+            Debug.Assert(tagHelperNode.Children.Contains(propertyNode));
+            Debug.Assert(propertyNode.IsIndexerNameMatch);
+
+            for (var i = 0; i < tagHelperNode.Children.Count; i++)
+            {
+                if (tagHelperNode.Children[i] is DefaultTagHelperPropertyIntermediateNode otherPropertyNode &&
+                    otherPropertyNode.TagHelper.Equals(propertyNode.TagHelper) &&
+                    otherPropertyNode.BoundAttribute.Equals(propertyNode.BoundAttribute) &&
+                    otherPropertyNode.IsIndexerNameMatch)
+                {
+                    return otherPropertyNode;
+                }
+            }
+
+            // This is unreachable, we should find 'propertyNode' in the list of children.
+            throw new InvalidOperationException();
+        }
+
+        private static DefaultTagHelperPropertyIntermediateNode FindFirstUseOfAttribute(
+            TagHelperIntermediateNode tagHelperNode,
+            DefaultTagHelperPropertyIntermediateNode propertyNode)
+        {
+            for (var i = 0; i < tagHelperNode.Children.Count; i++)
+            {
+                if (tagHelperNode.Children[i] is DefaultTagHelperPropertyIntermediateNode otherPropertyNode &&
+                    string.Equals(otherPropertyNode.AttributeName, propertyNode.AttributeName, StringComparison.Ordinal))
+                {
+                    return otherPropertyNode;
+                }
+            }
+
+            // This is unreachable, we should find 'propertyNode' in the list of children.
+            throw new InvalidOperationException();
+        }
+
+        private string GetContent(HtmlContentIntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsHtml)
+                {
+                    builder.Append(token.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        // Internal for testing
+        internal static string GetDeterministicId(CodeRenderingContext context)
+        {
+            // Use the file checksum along with the absolute position in the generated code to create a unique id for each tag helper call site.
+            var checksum = Checksum.BytesToString(context.SourceDocument.GetChecksum());
+            var uniqueId = checksum + context.CodeWriter.Location.AbsoluteIndex;
+
+            return uniqueId;
+        }
+
+        private static string GetPropertyAccessor(DefaultTagHelperPropertyIntermediateNode node)
+        {
+            var propertyAccessor = $"{node.FieldName}.{node.PropertyName}";
+
+            if (node.IsIndexerNameMatch)
+            {
+                var dictionaryKey = node.AttributeName.Substring(node.BoundAttribute.IndexerNamePrefix.Length);
+                propertyAccessor += $"[\"{dictionaryKey}\"]";
+            }
+
+            return propertyAccessor;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveIntermediateNode.cs
new file mode 100644
index 0000000000..957e73a17d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveIntermediateNode.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class DesignTimeDirectiveIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<DesignTimeDirectiveIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IDesignTimeDirectiveTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IDesignTimeDirectiveTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteDesignTimeDirective(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectivePass.cs
new file mode 100644
index 0000000000..6d6d7e261d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectivePass.cs
@@ -0,0 +1,82 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class DesignTimeDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        internal const string DesignTimeVariable = "__o";
+
+        // This needs to run after other directive classifiers. Any DirectiveToken that is not removed 
+        // by the previous classifiers will have auto-generated design time support.
+        public override int Order => DefaultFeatureOrder;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            // Only supports design time. This pass rewrites directives so they will have the right design time
+            // behavior and would break things if it ran for runtime.
+            if (!documentNode.Options.DesignTime)
+            {
+                return;
+            }
+
+            var walker = new DesignTimeHelperWalker();
+            walker.VisitDocument(documentNode);
+        }
+
+        internal class DesignTimeHelperWalker : IntermediateNodeWalker
+        {
+            private DesignTimeDirectiveIntermediateNode _directiveNode;
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                node.Children.Insert(0, new CSharpCodeIntermediateNode()
+                {
+                    Children =
+                    {
+                        new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = "#pragma warning disable 0414",
+                        }
+                    }
+                });
+                node.Children.Insert(1, new CSharpCodeIntermediateNode()
+                {
+                    Children =
+                    {
+                        new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = $"private static {typeof(object).FullName} {DesignTimeVariable} = null;",
+                        }
+                    }
+                });
+                node.Children.Insert(2, new CSharpCodeIntermediateNode()
+                {
+                    Children =
+                    {
+                        new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = "#pragma warning restore 0414",
+                        }
+                    }
+                });
+
+                _directiveNode = new DesignTimeDirectiveIntermediateNode();
+
+                VisitDefault(node);
+
+                node.Children.Insert(0, _directiveNode);
+            }
+
+            public override void VisitDirectiveToken(DirectiveTokenIntermediateNode node)
+            {
+                _directiveNode.Children.Add(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
new file mode 100644
index 0000000000..29cc438fbb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
@@ -0,0 +1,174 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class DesignTimeDirectiveTargetExtension : IDesignTimeDirectiveTargetExtension
+    {
+        private const string DirectiveTokenHelperMethodName = "__RazorDirectiveTokenHelpers__";
+        private const string TypeHelper = "__typeHelper";
+
+        public void WriteDesignTimeDirective(CodeRenderingContext context, DesignTimeDirectiveIntermediateNode node)
+        {
+            context.CodeWriter
+                .WriteLine("#pragma warning disable 219")
+                .WriteLine($"private void {DirectiveTokenHelperMethodName}() {{");
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is DirectiveTokenIntermediateNode n)
+                {
+                    WriteDesignTimeDirectiveToken(context, n);
+                }
+            }
+
+            context.CodeWriter
+                .WriteLine("}")
+                .WriteLine("#pragma warning restore 219");
+        }
+
+        private void WriteDesignTimeDirectiveToken(CodeRenderingContext context, DirectiveTokenIntermediateNode node)
+        {
+            var tokenKind = node.DirectiveToken.Kind;
+            if (!node.Source.HasValue ||
+                !string.Equals(
+                    context.SourceDocument?.FilePath,
+                    node.Source.Value.FilePath,
+                    StringComparison.OrdinalIgnoreCase))
+            {
+                // We don't want to handle directives from imports.
+                return;
+            }
+
+            // Wrap the directive token in a lambda to isolate variable names.
+            context.CodeWriter
+                .Write("((")
+                .Write(typeof(Action).FullName)
+                .Write(")(");
+            using (context.CodeWriter.BuildLambda())
+            {
+                var originalIndent = context.CodeWriter.CurrentIndent;
+                context.CodeWriter.CurrentIndent = 0;
+                switch (tokenKind)
+                {
+                    case DirectiveTokenKind.Type:
+
+                        if (string.IsNullOrEmpty(node.Content))
+                        {
+                            // This is most likely a marker token.
+                            WriteMarkerToken(context, node);
+                            break;
+                        }
+
+                        // {node.Content} __typeHelper = default({node.Content});
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.AddSourceMappingFor(node);
+                            context.CodeWriter
+                                .Write(node.Content)
+                                .Write(" ")
+                                .WriteStartAssignment(TypeHelper)
+                                .Write("default(")
+                                .Write(node.Content)
+                                .WriteLine(");");
+                        }
+                        break;
+
+                    case DirectiveTokenKind.Member:
+
+                        if (string.IsNullOrEmpty(node.Content))
+                        {
+                            // This is most likely a marker token.
+                            WriteMarkerToken(context, node);
+                            break;
+                        }
+
+                        // global::System.Object {node.content} = null;
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.CodeWriter
+                            .Write("global::")
+                            .Write(typeof(object).FullName)
+                            .Write(" ");
+
+                            context.AddSourceMappingFor(node);
+                            context.CodeWriter
+                                .Write(node.Content)
+                                .WriteLine(" = null;");
+                        }
+                        break;
+
+                    case DirectiveTokenKind.Namespace:
+
+                        if (string.IsNullOrEmpty(node.Content))
+                        {
+                            // This is most likely a marker token.
+                            WriteMarkerToken(context, node);
+                            break;
+                        }
+
+                        // global::System.Object __typeHelper = nameof({node.Content});
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.CodeWriter
+                            .Write("global::")
+                            .Write(typeof(object).FullName)
+                            .Write(" ")
+                            .WriteStartAssignment(TypeHelper);
+
+                            context.CodeWriter.Write("nameof(");
+
+                            context.AddSourceMappingFor(node);
+                            context.CodeWriter
+                                .Write(node.Content)
+                                .WriteLine(");");
+                        }
+                        break;
+
+                    case DirectiveTokenKind.String:
+
+                        // global::System.Object __typeHelper = "{node.Content}";
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.CodeWriter
+                            .Write("global::")
+                            .Write(typeof(object).FullName)
+                            .Write(" ")
+                            .WriteStartAssignment(TypeHelper);
+
+                            if (node.Content.StartsWith("\"", StringComparison.Ordinal))
+                            {
+                                context.AddSourceMappingFor(node);
+                                context.CodeWriter.Write(node.Content);
+                            }
+                            else
+                            {
+                                context.CodeWriter.Write("\"");
+                                context.AddSourceMappingFor(node);
+                                context.CodeWriter
+                                    .Write(node.Content)
+                                    .Write("\"");
+                            }
+
+                            context.CodeWriter.WriteLine(";");
+                        }
+                        break;
+                }
+                context.CodeWriter.CurrentIndent = originalIndent;
+            }
+            context.CodeWriter.WriteLine("))();");
+        }
+
+        private void WriteMarkerToken(CodeRenderingContext context, DirectiveTokenIntermediateNode node)
+        {
+            // We want to map marker tokens to a location in the generated document
+            // that will provide CSharp intellisense.
+            context.AddSourceMappingFor(node);
+            context.CodeWriter.Write(" ");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
new file mode 100644
index 0000000000..96d336ca72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run early in the optimization phase
+        public override int Order => int.MinValue;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            var codeGenerationOptions = codeDocument.GetCodeGenerationOptions();
+            if (codeGenerationOptions == null || !codeGenerationOptions.SuppressPrimaryMethodBody)
+            {
+                return;
+            }
+
+            var method = documentNode.FindPrimaryMethod();
+            if (method == null)
+            {
+                return;
+            }
+
+            method.Children.Clear();
+
+            // After we clear all of the method body there might be some unused fields, which can be
+            // blocking if compiling with warnings as errors. Suppress this warning so that it doesn't
+            // get annoying in VS.
+            documentNode.Children.Insert(documentNode.Children.IndexOf(documentNode.FindPrimaryNamespace()), new CSharpCodeIntermediateNode()
+            {
+                Children =
+                {
+                    // Field is assigned but never used
+                    new IntermediateToken()
+                    {
+                        Content = "#pragma warning disable 0414" + Environment.NewLine,
+                        Kind = TokenKind.CSharp,
+                    },
+
+                    // Field is never assigned
+                    new IntermediateToken()
+                    {
+                        Content = "#pragma warning disable 0649" + Environment.NewLine,
+                        Kind = TokenKind.CSharp,
+                    },
+
+                    // Field is never used
+                    new IntermediateToken()
+                    {
+                        Content = "#pragma warning disable 0169" + Environment.NewLine,
+                        Kind = TokenKind.CSharp,
+                    },
+                },
+            });
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs
new file mode 100644
index 0000000000..630272cdef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public static class FunctionsDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            SyntaxConstants.CSharp.FunctionsKeyword,
+            DirectiveKind.CodeBlock,
+            builder =>
+            {
+                builder.Description = Resources.FunctionsDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new FunctionsDirectivePass());
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new FunctionsDirectivePass());
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
new file mode 100644
index 0000000000..32f79570cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
@@ -0,0 +1,27 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class FunctionsDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null)
+            {
+                return;
+            }
+
+            foreach (var functions in documentNode.FindDirectiveReferences(FunctionsDirective.Directive))
+            {
+                for (var i = 0; i < functions.Node.Children.Count; i++)
+                {
+                    @class.Children.Add(functions.Node.Children[i]);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDefaultTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDefaultTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..1f7cf9beb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDefaultTagHelperTargetExtension.cs
@@ -0,0 +1,22 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public interface IDefaultTagHelperTargetExtension : ICodeTargetExtension
+    {
+        void WriteTagHelperBody(CodeRenderingContext context, DefaultTagHelperBodyIntermediateNode node);
+
+        void WriteTagHelperCreate(CodeRenderingContext context, DefaultTagHelperCreateIntermediateNode node);
+
+        void WriteTagHelperExecute(CodeRenderingContext context, DefaultTagHelperExecuteIntermediateNode node);
+
+        void WriteTagHelperHtmlAttribute(CodeRenderingContext context, DefaultTagHelperHtmlAttributeIntermediateNode node);
+
+        void WriteTagHelperProperty(CodeRenderingContext context, DefaultTagHelperPropertyIntermediateNode node);
+
+        void WriteTagHelperRuntime(CodeRenderingContext context, DefaultTagHelperRuntimeIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDesignTimeDirectiveTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDesignTimeDirectiveTargetExtension.cs
new file mode 100644
index 0000000000..d99ef10241
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IDesignTimeDirectiveTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal interface IDesignTimeDirectiveTargetExtension : ICodeTargetExtension
+    {
+        void WriteDesignTimeDirective(CodeRenderingContext context, DesignTimeDirectiveIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataAttributeTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataAttributeTargetExtension.cs
new file mode 100644
index 0000000000..db2955fadd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataAttributeTargetExtension.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal interface IMetadataAttributeTargetExtension : ICodeTargetExtension
+    {
+        void WriteRazorCompiledItemAttribute(CodeRenderingContext context, RazorCompiledItemAttributeIntermediateNode node);
+
+        void WriteRazorSourceChecksumAttribute(CodeRenderingContext context, RazorSourceChecksumAttributeIntermediateNode node);
+
+        void WriteRazorCompiledItemMetadataAttribute(CodeRenderingContext context, RazorCompiledItemMetadataAttributeIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataIdentifierFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataIdentifierFeature.cs
new file mode 100644
index 0000000000..6948c33a67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IMetadataIdentifierFeature.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal interface IMetadataIdentifierFeature : IRazorEngineFeature
+    {
+        string GetIdentifier(RazorCodeDocument codeDocument, RazorSourceDocument sourceDocument);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IPreallocatedAttributeTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IPreallocatedAttributeTargetExtension.cs
new file mode 100644
index 0000000000..3a3dce2f06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/IPreallocatedAttributeTargetExtension.cs
@@ -0,0 +1,18 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal interface IPreallocatedAttributeTargetExtension : ICodeTargetExtension
+    {
+        void WriteTagHelperHtmlAttribute(CodeRenderingContext context, PreallocatedTagHelperHtmlAttributeIntermediateNode node);
+
+        void WriteTagHelperHtmlAttributeValue(CodeRenderingContext context, PreallocatedTagHelperHtmlAttributeValueIntermediateNode node);
+
+        void WriteTagHelperProperty(CodeRenderingContext context, PreallocatedTagHelperPropertyIntermediateNode node);
+
+        void WriteTagHelperPropertyValue(CodeRenderingContext context, PreallocatedTagHelperPropertyValueIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ISectionTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ISectionTargetExtension.cs
new file mode 100644
index 0000000000..1398eeb9da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ISectionTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public interface ISectionTargetExtension : ICodeTargetExtension
+    {
+        void WriteSection(CodeRenderingContext context, SectionIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ITemplateTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ITemplateTargetExtension.cs
new file mode 100644
index 0000000000..8d1568e624
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ITemplateTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public interface ITemplateTargetExtension : ICodeTargetExtension
+    {
+        void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs
new file mode 100644
index 0000000000..12cdb3708a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public static class InheritsDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            SyntaxConstants.CSharp.InheritsKeyword,
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(Resources.InheritsDirective_TypeToken_Name, Resources.InheritsDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.InheritsDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new InheritsDirectivePass());
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new InheritsDirectivePass());
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirectivePass.cs
new file mode 100644
index 0000000000..f45d6fb982
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirectivePass.cs
@@ -0,0 +1,31 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class InheritsDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null)
+            {
+                return;
+            }
+
+            foreach (var inherits in documentNode.FindDirectiveReferences(InheritsDirective.Directive))
+            {
+                var token = ((DirectiveIntermediateNode)inherits.Node).Tokens.FirstOrDefault();
+                if (token != null)
+                {
+                    @class.BaseType = token.Content;
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs
new file mode 100644
index 0000000000..4383b2e27a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs
@@ -0,0 +1,128 @@
+// 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.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    // Optimization pass is the best choice for this class. It's not an optimization, but it also doesn't add semantically
+    // meaningful information.
+    internal class MetadataAttributePass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private IMetadataIdentifierFeature _identifierFeature;
+
+        protected override void OnInitialized()
+        {
+            _identifierFeature = Engine.Features.OfType<IMetadataIdentifierFeature>().FirstOrDefault();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.Options == null || documentNode.Options.SuppressMetadataAttributes)
+            {
+                // Metadata attributes are turned off (or options not populated), nothing to do.
+                return;
+            }
+
+            // We need to be able to compute the data we need for the [RazorCompiledItem] attribute - that includes
+            // a full type name, and a document kind, and optionally an identifier.
+            // 
+            // If we can't use [RazorCompiledItem] then we don't care about the rest of the attributes.
+            var @namespace = documentNode.FindPrimaryNamespace();
+            if (@namespace == null || string.IsNullOrEmpty(@namespace.Content))
+            {
+                // No namespace node or it's incomplete. Skip.
+                return;
+            }
+
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null || string.IsNullOrEmpty(@class.ClassName))
+            {
+                // No class node or it's incomplete. Skip.
+                return;
+            }
+
+            if (documentNode.DocumentKind == null)
+            {
+                // No document kind. Skip.
+                return;
+            }
+
+            var identifier = _identifierFeature?.GetIdentifier(codeDocument, codeDocument.Source);
+            if (identifier == null)
+            {
+                // No identifier. Skip
+                return;
+            }
+
+            // [RazorCompiledItem] is an [assembly: ... ] attribute, so it needs to be applied at the global scope.
+            documentNode.Children.Insert(0, new RazorCompiledItemAttributeIntermediateNode()
+            {
+                TypeName = @namespace.Content + "." + @class.ClassName,
+                Kind = documentNode.DocumentKind,
+                Identifier = identifier,
+            });
+
+            // Now we need to add a [RazorSourceChecksum] for the source and for each import
+            // these are class attributes, so we need to find the insertion point to put them
+            // right before the class.
+            var insert = (int?)null;
+            for (var j = 0; j < @namespace.Children.Count; j++)
+            {
+                if (object.ReferenceEquals(@namespace.Children[j], @class))
+                {
+                    insert = j;
+                    break;
+                }
+            }
+
+            if (insert == null)
+            {
+                // Can't find a place to put the attributes, just bail.
+                return;
+            }
+
+            // Checksum of the main source
+            var checksum = codeDocument.Source.GetChecksum();
+            var checksumAlgorithm = codeDocument.Source.GetChecksumAlgorithm();
+            if (checksum == null || checksum.Length == 0 || checksumAlgorithm == null || identifier == null)
+            {
+                // Don't generate anything unless we have all of the required information.
+                return;
+            }
+
+            @namespace.Children.Insert((int)insert++, new RazorSourceChecksumAttributeIntermediateNode()
+            {
+                Checksum = checksum,
+                ChecksumAlgorithm = checksumAlgorithm,
+                Identifier = identifier,
+            });
+
+            // Now process the checksums of the imports
+            Debug.Assert(_identifierFeature != null);
+            for (var i = 0; i < codeDocument.Imports.Count; i++)
+            {
+                var import = codeDocument.Imports[i];
+
+                checksum = import.GetChecksum();
+                checksumAlgorithm = import.GetChecksumAlgorithm();
+                identifier = _identifierFeature.GetIdentifier(codeDocument, import);
+
+                if (checksum == null || checksum.Length == 0 || checksumAlgorithm == null || identifier == null)
+                {
+                    // It's ok to skip an import if we don't have all of the required information.
+                    continue;
+                }
+
+                @namespace.Children.Insert((int)insert++, new RazorSourceChecksumAttributeIntermediateNode()
+                {
+                    Checksum = checksum,
+                    ChecksumAlgorithm = checksumAlgorithm,
+                    Identifier = identifier,
+                });
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributeTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributeTargetExtension.cs
new file mode 100644
index 0000000000..7c702bb1a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributeTargetExtension.cs
@@ -0,0 +1,88 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class MetadataAttributeTargetExtension : IMetadataAttributeTargetExtension
+    {
+        public string CompiledItemAttributeName { get; set; } = "global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute";
+
+        public string SourceChecksumAttributeName { get; set; } = "global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute";
+
+        public string CompiledItemMetadataAttributeName { get; set; } = "global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute";
+
+
+        public void WriteRazorCompiledItemAttribute(CodeRenderingContext context, RazorCompiledItemAttributeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // [assembly: global::...RazorCompiledItem(typeof({node.TypeName}), @"{node.Kind}", @"{node.Identifier}")]
+            context.CodeWriter.Write("[assembly: ");
+            context.CodeWriter.Write(CompiledItemAttributeName);
+            context.CodeWriter.Write("(typeof(");
+            context.CodeWriter.Write(node.TypeName);
+            context.CodeWriter.Write("), @\"");
+            context.CodeWriter.Write(node.Kind);
+            context.CodeWriter.Write("\", @\"");
+            context.CodeWriter.Write(node.Identifier);
+            context.CodeWriter.WriteLine("\")]");
+        }
+
+        public void WriteRazorCompiledItemMetadataAttribute(CodeRenderingContext context, RazorCompiledItemMetadataAttributeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // [assembly: global::...RazorCompiledItemAttribute(@"{node.Key}", @"{node.Value}")]
+            context.CodeWriter.Write("[");
+            context.CodeWriter.Write(CompiledItemMetadataAttributeName);
+            context.CodeWriter.Write("(");
+            context.CodeWriter.WriteStringLiteral(node.Key);
+            context.CodeWriter.Write(", ");
+            context.CodeWriter.WriteStringLiteral(node.Value);
+            context.CodeWriter.WriteLine(")]");
+        }
+
+        public void WriteRazorSourceChecksumAttribute(CodeRenderingContext context, RazorSourceChecksumAttributeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // [global::...RazorSourceChecksum(@"{node.ChecksumAlgorithm}", @"{node.Checksum}", @"{node.Identifier}")]
+            context.CodeWriter.Write("[");
+            context.CodeWriter.Write(SourceChecksumAttributeName);
+            context.CodeWriter.Write("(@\"");
+            context.CodeWriter.Write(node.ChecksumAlgorithm);
+            context.CodeWriter.Write("\", @\"");
+            context.CodeWriter.Write(Checksum.BytesToString(node.Checksum));
+            context.CodeWriter.Write("\", @\"");
+            context.CodeWriter.Write(node.Identifier);
+            context.CodeWriter.WriteLine("\")]");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedAttributeTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedAttributeTargetExtension.cs
new file mode 100644
index 0000000000..c371361f4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedAttributeTargetExtension.cs
@@ -0,0 +1,167 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class PreallocatedAttributeTargetExtension : IPreallocatedAttributeTargetExtension
+    {
+        public string TagHelperAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute";
+
+        public string EncodedHtmlStringTypeName { get; set; } = "Microsoft.AspNetCore.Html.HtmlString";
+
+        public string ExecutionContextVariableName { get; set; } = "__tagHelperExecutionContext";
+
+        public string ExecutionContextAddHtmlAttributeMethodName { get; set; } = "AddHtmlAttribute";
+
+        public string ExecutionContextAddTagHelperAttributeMethodName { get; set; } = "AddTagHelperAttribute";
+
+        public string FormatInvalidIndexerAssignmentMethodName { get; set; } = "InvalidTagHelperIndexerAssignment";
+
+        public void WriteTagHelperHtmlAttributeValue(CodeRenderingContext context, PreallocatedTagHelperHtmlAttributeValueIntermediateNode node)
+        {
+            context.CodeWriter
+                .Write("private static readonly global::")
+                .Write(TagHelperAttributeTypeName)
+                .Write(" ")
+                .Write(node.VariableName)
+                .Write(" = ")
+                .WriteStartNewObject("global::" + TagHelperAttributeTypeName)
+                .WriteStringLiteral(node.AttributeName);
+
+            if (node.AttributeStructure == AttributeStructure.Minimized)
+            {
+                context.CodeWriter.WriteEndMethodInvocation();
+            }
+            else
+            {
+                context.CodeWriter
+                    .WriteParameterSeparator()
+                    .WriteStartNewObject("global::" + EncodedHtmlStringTypeName)
+                    .WriteStringLiteral(node.Value)
+                    .WriteEndMethodInvocation(endLine: false)
+                    .WriteParameterSeparator()
+                    .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.AttributeStructure}")
+                    .WriteEndMethodInvocation();
+            }
+        }
+
+        public void WriteTagHelperHtmlAttribute(CodeRenderingContext context, PreallocatedTagHelperHtmlAttributeIntermediateNode node)
+        {
+            if (context.Parent as TagHelperIntermediateNode == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            context.CodeWriter
+                .WriteStartInstanceMethodInvocation(ExecutionContextVariableName, ExecutionContextAddHtmlAttributeMethodName)
+                .Write(node.VariableName)
+                .WriteEndMethodInvocation();
+        }
+
+        public void WriteTagHelperPropertyValue(CodeRenderingContext context, PreallocatedTagHelperPropertyValueIntermediateNode node)
+        {
+            context.CodeWriter
+                .Write("private static readonly global::")
+                .Write(TagHelperAttributeTypeName)
+                .Write(" ")
+                .Write(node.VariableName)
+                .Write(" = ")
+                .WriteStartNewObject("global::" + TagHelperAttributeTypeName)
+                .WriteStringLiteral(node.AttributeName)
+                .WriteParameterSeparator()
+                .WriteStringLiteral(node.Value)
+                .WriteParameterSeparator()
+                .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.AttributeStructure}")
+                .WriteEndMethodInvocation();
+        }
+
+        public void WriteTagHelperProperty(CodeRenderingContext context, PreallocatedTagHelperPropertyIntermediateNode node)
+        {
+            var tagHelperNode = context.Parent as TagHelperIntermediateNode;
+            if (tagHelperNode == null)
+            {
+                var message = Resources.FormatIntermediateNodes_InvalidParentNode(node.GetType(), typeof(TagHelperIntermediateNode));
+                throw new InvalidOperationException(message);
+            }
+
+            // Ensure that the property we're trying to set has initialized its dictionary bound properties.
+            if (node.IsIndexerNameMatch &&
+                object.ReferenceEquals(FindFirstUseOfIndexer(tagHelperNode, node), node))
+            {
+                // Throw a reasonable Exception at runtime if the dictionary property is null.
+                context.CodeWriter
+                    .Write("if (")
+                    .Write(node.FieldName)
+                    .Write(".")
+                    .Write(node.PropertyName)
+                    .WriteLine(" == null)");
+                using (context.CodeWriter.BuildScope())
+                {
+                    // System is in Host.NamespaceImports for all MVC scenarios. No need to generate FullName
+                    // of InvalidOperationException type.
+                    context.CodeWriter
+                        .Write("throw ")
+                        .WriteStartNewObject(nameof(InvalidOperationException))
+                        .WriteStartMethodInvocation(FormatInvalidIndexerAssignmentMethodName)
+                        .WriteStringLiteral(node.AttributeName)
+                        .WriteParameterSeparator()
+                        .WriteStringLiteral(node.TagHelper.GetTypeName())
+                        .WriteParameterSeparator()
+                        .WriteStringLiteral(node.PropertyName)
+                        .WriteEndMethodInvocation(endLine: false)   // End of method call
+                        .WriteEndMethodInvocation();   // End of new expression / throw statement
+                }
+            }
+
+            context.CodeWriter
+                .WriteStartAssignment(GetPropertyAccessor(node))
+                .Write("(string)")
+                .Write($"{node.VariableName}.Value")
+                .WriteLine(";")
+                .WriteStartInstanceMethodInvocation(ExecutionContextVariableName, ExecutionContextAddTagHelperAttributeMethodName)
+                .Write(node.VariableName)
+                .WriteEndMethodInvocation();
+        }
+
+        private static PreallocatedTagHelperPropertyIntermediateNode FindFirstUseOfIndexer(
+            TagHelperIntermediateNode tagHelperNode,
+            PreallocatedTagHelperPropertyIntermediateNode propertyNode)
+        {
+            Debug.Assert(tagHelperNode.Children.Contains(propertyNode));
+            Debug.Assert(propertyNode.IsIndexerNameMatch);
+
+            for (var i = 0; i < tagHelperNode.Children.Count; i++)
+            {
+                if (tagHelperNode.Children[i] is PreallocatedTagHelperPropertyIntermediateNode otherPropertyNode &&
+                    otherPropertyNode.TagHelper.Equals(propertyNode.TagHelper) &&
+                    otherPropertyNode.BoundAttribute.Equals(propertyNode.BoundAttribute) &&
+                    otherPropertyNode.IsIndexerNameMatch)
+                {
+                    return otherPropertyNode;
+                }
+            }
+
+            // This is unreachable, we should find 'propertyNode' in the list of children.
+            throw new InvalidOperationException();
+        }
+
+        private static string GetPropertyAccessor(PreallocatedTagHelperPropertyIntermediateNode node)
+        {
+            var propertyAccessor = $"{node.FieldName}.{node.PropertyName}";
+
+            if (node.IsIndexerNameMatch)
+            {
+                var dictionaryKey = node.AttributeName.Substring(node.BoundAttribute.IndexerNamePrefix.Length);
+                propertyAccessor += $"[\"{dictionaryKey}\"]";
+            }
+
+            return propertyAccessor;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs
new file mode 100644
index 0000000000..ccac531732
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperAttributeOptimizationPass.cs
@@ -0,0 +1,166 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class PreallocatedTagHelperAttributeOptimizationPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // We want to run after the passes that 'lower' tag helpers. We also want this to run after DefaultTagHelperOptimizationPass.
+        public override int Order => DefaultFeatureOrder + 1010;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            // There's no value in executing this pass at design time, it just prevents some allocations.
+            if (documentNode.Options.DesignTime)
+            {
+                return;
+            }
+            
+            var walker = new PreallocatedTagHelperWalker();
+            walker.VisitDocument(documentNode);
+        }
+
+        internal class PreallocatedTagHelperWalker : 
+            IntermediateNodeWalker,
+            IExtensionIntermediateNodeVisitor<DefaultTagHelperHtmlAttributeIntermediateNode>,
+            IExtensionIntermediateNodeVisitor<DefaultTagHelperPropertyIntermediateNode>
+        {
+            private const string PreAllocatedAttributeVariablePrefix = "__tagHelperAttribute_";
+
+            private ClassDeclarationIntermediateNode _classDeclaration;
+            private int _variableCountOffset;
+            private int _preallocatedDeclarationCount = 0;
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                _classDeclaration = node;
+                _variableCountOffset = node.Children.Count;
+
+                VisitDefault(node);
+            }
+
+            public void VisitExtension(DefaultTagHelperHtmlAttributeIntermediateNode node)
+            {
+                if (node.Children.Count != 1 || !(node.Children.First() is HtmlContentIntermediateNode))
+                {
+                    return;
+                }
+
+                var htmlContentNode = node.Children.First() as HtmlContentIntermediateNode;
+                var plainTextValue = GetContent(htmlContentNode);
+
+                PreallocatedTagHelperHtmlAttributeValueIntermediateNode declaration = null;
+
+                for (var i = 0; i < _classDeclaration.Children.Count; i++)
+                {
+                    var current = _classDeclaration.Children[i];
+
+                    if (current is PreallocatedTagHelperHtmlAttributeValueIntermediateNode existingDeclaration)
+                    {
+                        if (string.Equals(existingDeclaration.AttributeName, node.AttributeName, StringComparison.Ordinal) &&
+                            string.Equals(existingDeclaration.Value, plainTextValue, StringComparison.Ordinal) &&
+                            existingDeclaration.AttributeStructure == node.AttributeStructure)
+                        {
+                            declaration = existingDeclaration;
+                            break;
+                        }
+                    }
+                }
+
+                if (declaration == null)
+                {
+                    var variableCount = _classDeclaration.Children.Count - _variableCountOffset;
+                    var preAllocatedAttributeVariableName = PreAllocatedAttributeVariablePrefix + variableCount;
+                    declaration = new PreallocatedTagHelperHtmlAttributeValueIntermediateNode
+                    {
+                        VariableName = preAllocatedAttributeVariableName,
+                        AttributeName = node.AttributeName,
+                        Value = plainTextValue,
+                        AttributeStructure = node.AttributeStructure,
+                    };
+                    _classDeclaration.Children.Insert(_preallocatedDeclarationCount++, declaration);
+                }
+
+                var addPreAllocatedAttribute = new PreallocatedTagHelperHtmlAttributeIntermediateNode
+                {
+                    VariableName = declaration.VariableName,
+                };
+
+                var nodeIndex = Parent.Children.IndexOf(node);
+                Parent.Children[nodeIndex] = addPreAllocatedAttribute;
+            }
+
+            public void VisitExtension(DefaultTagHelperPropertyIntermediateNode node)
+            {
+                if (!(node.BoundAttribute.IsStringProperty || (node.IsIndexerNameMatch && node.BoundAttribute.IsIndexerStringProperty)) ||
+                    node.Children.Count != 1 ||
+                    !(node.Children.First() is HtmlContentIntermediateNode))
+                {
+                    return;
+                }
+
+                var htmlContentNode = node.Children.First() as HtmlContentIntermediateNode;
+                var plainTextValue = GetContent(htmlContentNode);
+
+                PreallocatedTagHelperPropertyValueIntermediateNode declaration = null;
+
+                for (var i = 0; i < _classDeclaration.Children.Count; i++)
+                {
+                    var current = _classDeclaration.Children[i];
+
+                    if (current is PreallocatedTagHelperPropertyValueIntermediateNode existingDeclaration)
+                    {
+                        if (string.Equals(existingDeclaration.AttributeName, node.AttributeName, StringComparison.Ordinal) &&
+                            string.Equals(existingDeclaration.Value, plainTextValue, StringComparison.Ordinal) &&
+                            existingDeclaration.AttributeStructure == node.AttributeStructure)
+                        {
+                            declaration = existingDeclaration;
+                            break;
+                        }
+                    }
+                }
+
+                if (declaration == null)
+                {
+                    var variableCount = _classDeclaration.Children.Count - _variableCountOffset;
+                    var preAllocatedAttributeVariableName = PreAllocatedAttributeVariablePrefix + variableCount;
+                    declaration = new PreallocatedTagHelperPropertyValueIntermediateNode()
+                    {
+                        VariableName = preAllocatedAttributeVariableName,
+                        AttributeName = node.AttributeName,
+                        Value = plainTextValue,
+                        AttributeStructure = node.AttributeStructure,
+                    };
+                    _classDeclaration.Children.Insert(_preallocatedDeclarationCount++, declaration);
+                }
+
+                var setPreallocatedProperty = new PreallocatedTagHelperPropertyIntermediateNode(node)
+                {
+                    VariableName = declaration.VariableName,
+                };
+
+                var nodeIndex = Parent.Children.IndexOf(node);
+                Parent.Children[nodeIndex] = setPreallocatedProperty;
+            }
+
+            private string GetContent(HtmlContentIntermediateNode node)
+            {
+                var builder = new StringBuilder();
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsHtml)
+                    {
+                        builder.Append(token.Content);
+                    }
+                }
+
+               return builder.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..70a9c61fa6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class PreallocatedTagHelperHtmlAttributeIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string VariableName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<PreallocatedTagHelperHtmlAttributeIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IPreallocatedAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperHtmlAttribute(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(VariableName);
+
+            formatter.WriteProperty(nameof(VariableName), VariableName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs
new file mode 100644
index 0000000000..5faed5344b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs
@@ -0,0 +1,88 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class PreallocatedTagHelperHtmlAttributeValueIntermediateNode : ExtensionIntermediateNode
+    {
+        public PreallocatedTagHelperHtmlAttributeValueIntermediateNode()
+        {
+        }
+
+        public PreallocatedTagHelperHtmlAttributeValueIntermediateNode(DefaultTagHelperHtmlAttributeIntermediateNode htmlAttributeNode)
+        {
+            if (htmlAttributeNode == null)
+            {
+                throw new ArgumentNullException(nameof(htmlAttributeNode));
+            }
+
+            Source = htmlAttributeNode.Source;
+
+            for (var i = 0; i < htmlAttributeNode.Children.Count; i++)
+            {
+                Children.Add(htmlAttributeNode.Children[i]);
+            }
+
+            for (var i = 0; i < htmlAttributeNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(htmlAttributeNode.Diagnostics[i]);
+            }
+        }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string VariableName { get; set; }
+
+        public string AttributeName { get; set; }
+
+        public string Value { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<PreallocatedTagHelperHtmlAttributeValueIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IPreallocatedAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperHtmlAttributeValue(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(Value), Value);
+            formatter.WriteProperty(nameof(VariableName), VariableName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs
new file mode 100644
index 0000000000..7db273a1d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs
@@ -0,0 +1,97 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class PreallocatedTagHelperPropertyIntermediateNode : ExtensionIntermediateNode
+    {
+        public PreallocatedTagHelperPropertyIntermediateNode()
+        {
+        }
+
+        public PreallocatedTagHelperPropertyIntermediateNode(DefaultTagHelperPropertyIntermediateNode propertyNode)
+        {
+            if (propertyNode == null)
+            {
+                throw new ArgumentNullException(nameof(propertyNode));
+            }
+
+            AttributeName = propertyNode.AttributeName;
+            AttributeStructure = propertyNode.AttributeStructure;
+            BoundAttribute = propertyNode.BoundAttribute;
+            FieldName = propertyNode.FieldName;
+            IsIndexerNameMatch = propertyNode.IsIndexerNameMatch;
+            PropertyName = propertyNode.PropertyName;
+            Source = propertyNode.Source;
+            TagHelper = propertyNode.TagHelper;
+        }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string AttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public string FieldName { get; set; }
+
+        public bool IsIndexerNameMatch { get; set; }
+
+        public string PropertyName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public string VariableName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<PreallocatedTagHelperPropertyIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IPreallocatedAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperProperty(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(FieldName), FieldName);
+            formatter.WriteProperty(nameof(IsIndexerNameMatch), IsIndexerNameMatch.ToString());
+            formatter.WriteProperty(nameof(PropertyName), PropertyName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+            formatter.WriteProperty(nameof(VariableName), VariableName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs
new file mode 100644
index 0000000000..6516a22133
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs
@@ -0,0 +1,64 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class PreallocatedTagHelperPropertyValueIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string VariableName { get; set; }
+
+        public string AttributeName { get; set; }
+
+        public string Value { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<PreallocatedTagHelperPropertyValueIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IPreallocatedAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTagHelperPropertyValue(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(Value), Value);
+            formatter.WriteProperty(nameof(VariableName), VariableName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..ee82fca81a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemAttributeIntermediateNode.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class RazorCompiledItemAttributeIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string TypeName { get; set; }
+
+        public string Kind { get; set; }
+
+        public string Identifier { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<RazorCompiledItemAttributeIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IMetadataAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IMetadataAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteRazorCompiledItemAttribute(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteProperty(nameof(Identifier), Identifier);
+            formatter.WriteProperty(nameof(Kind), Kind);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..52f7b92012
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorCompiledItemMetadataAttributeIntermediateNode.cs
@@ -0,0 +1,65 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    /// <summary>
+    /// An <see cref="ExtensionIntermediateNode"/> that generates code for <c>RazorCompiledItemMetadataAttribute</c>.
+    /// </summary>
+    public class RazorCompiledItemMetadataAttributeIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        /// <summary>
+        /// Gets or sets the attribute key.
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Gets or sets the attribute value.
+        /// </summary>
+        public string Value { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IMetadataAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IMetadataAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteRazorCompiledItemMetadataAttribute(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteProperty(nameof(Key), Key);
+            formatter.WriteProperty(nameof(Value), Value);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..4aa8d3f978
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/RazorSourceChecksumAttributeIntermediateNode.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class RazorSourceChecksumAttributeIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public byte[] Checksum { get; set; }
+
+        public string ChecksumAlgorithm { get; set; }
+
+        public string Identifier { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<RazorSourceChecksumAttributeIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IMetadataAttributeTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IMetadataAttributeTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteRazorSourceChecksumAttribute(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs
new file mode 100644
index 0000000000..b1f8633122
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public static class SectionDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            SyntaxConstants.CSharp.SectionKeyword,
+            DirectiveKind.RazorBlock,
+            builder =>
+            {
+                builder.AddMemberToken(Resources.SectionDirective_NameToken_Name, Resources.SectionDirective_NameToken_Description);
+                builder.Description = Resources.SectionDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new SectionDirectivePass());
+            builder.AddTargetExtension(new SectionTargetExtension());
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new SectionDirectivePass());
+            builder.AddTargetExtension(new SectionTargetExtension());
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirectivePass.cs
new file mode 100644
index 0000000000..ea2ad395ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirectivePass.cs
@@ -0,0 +1,49 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class SectionDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null)
+            {
+                return;
+            }
+
+            foreach (var directive in documentNode.FindDirectiveReferences(SectionDirective.Directive))
+            {
+                var sectionName = ((DirectiveIntermediateNode)directive.Node).Tokens.FirstOrDefault()?.Content;
+
+                var section = new SectionIntermediateNode()
+                {
+                    SectionName = sectionName,
+                };
+
+                var i = 0;
+                for (; i < directive.Node.Children.Count; i++)
+                {
+                    if (!(directive.Node.Children[i] is DirectiveTokenIntermediateNode))
+                    {
+                        break;
+                    }
+                }
+
+                while (i != directive.Node.Children.Count)
+                {
+                    // Move non-token children over to the section node so we don't have double references to children nodes.
+                    section.Children.Add(directive.Node.Children[i]);
+                    directive.Node.Children.RemoveAt(i);
+                }
+
+                directive.InsertAfter(section);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionIntermediateNode.cs
new file mode 100644
index 0000000000..d3d4c10557
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionIntermediateNode.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class SectionIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string SectionName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<SectionIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<ISectionTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<ISectionTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteSection(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(SectionName);
+
+            formatter.WriteProperty(nameof(SectionName), SectionName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionTargetExtension.cs
new file mode 100644
index 0000000000..ba1f637ad6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionTargetExtension.cs
@@ -0,0 +1,43 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class SectionTargetExtension : ISectionTargetExtension
+    {
+        // Compatibility for 1.X projects
+        private const string DefaultWriterName = "__razor_section_writer";
+
+        public static readonly string DefaultSectionMethodName = "DefineSection";
+
+        public string SectionMethodName { get; set; } = DefaultSectionMethodName;
+
+        public void WriteSection(CodeRenderingContext context, SectionIntermediateNode node)
+        {
+            context.CodeWriter
+                .WriteStartMethodInvocation(SectionMethodName)
+                .Write("\"")
+                .Write(node.SectionName)
+                .Write("\", ");
+
+            if (context.Options.DesignTime)
+            {
+                using (context.CodeWriter.BuildAsyncLambda(DefaultWriterName))
+                {
+                    context.RenderChildren(node);
+                }
+            }
+            else
+            {
+                using (context.CodeWriter.BuildAsyncLambda())
+                {
+                    context.RenderChildren(node);
+                }
+            }
+
+            context.CodeWriter.WriteEndMethodInvocation(endLine: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateIntermediateNode.cs
new file mode 100644
index 0000000000..76c81a94a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateIntermediateNode.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class TemplateIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<TemplateIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<ITemplateTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<ITemplateTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteTemplate(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateTargetExtension.cs
new file mode 100644
index 0000000000..8ec532e21a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/TemplateTargetExtension.cs
@@ -0,0 +1,35 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public sealed class TemplateTargetExtension : ITemplateTargetExtension
+    {
+        public static readonly string DefaultTemplateTypeName = "Template";
+
+        public string TemplateTypeName { get; set; } = DefaultTemplateTypeName;
+
+        public void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node)
+        {
+            const string ItemParameterName = "item";
+            const string TemplateWriterName = "__razor_template_writer";
+
+            context.CodeWriter
+                .Write(ItemParameterName).Write(" => ")
+                .WriteStartNewObject(TemplateTypeName);
+
+            using (context.CodeWriter.BuildAsyncLambda(TemplateWriterName))
+            {
+                context.NodeWriter.BeginWriterScope(context, TemplateWriterName);
+
+                context.RenderChildren(node);
+
+                context.NodeWriter.EndWriterScope(context);
+            }
+
+            context.CodeWriter.WriteEndMethodInvocation(endLine: false);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlConventions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlConventions.cs
new file mode 100644
index 0000000000..be2530cae3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlConventions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class HtmlConventions
+    {
+        private const string HtmlCaseRegexReplacement = "-$1$2";
+
+        // This matches the following AFTER the start of the input string (MATCH).
+        // Any letter/number followed by an uppercase letter then lowercase letter: 1(Aa), a(Aa), A(Aa)
+        // Any lowercase letter followed by an uppercase letter: a(A)
+        // Each match is then prefixed by a "-" via the ToHtmlCase method.
+        private static readonly Regex HtmlCaseRegex =
+            new Regex(
+                "(?<!^)((?<=[a-zA-Z0-9])[A-Z][a-z])|((?<=[a-z])[A-Z])",
+                RegexOptions.None,
+                TimeSpan.FromMilliseconds(500));
+
+        internal static IReadOnlyCollection<char> InvalidNonWhitespaceHtmlCharacters { get; } = new List<char>(
+            new[] { '@', '!', '<', '/', '?', '[', '>', ']', '=', '"', '\'', '*' });
+
+        /// <summary>
+        /// Converts from pascal/camel case to lower kebab-case.
+        /// </summary>
+        /// <example>
+        /// SomeThing => some-thing
+        /// capsONInside => caps-on-inside
+        /// CAPSOnOUTSIDE => caps-on-outside
+        /// ALLCAPS => allcaps
+        /// One1Two2Three3 => one1-two2-three3
+        /// ONE1TWO2THREE3 => one1two2three3
+        /// First_Second_ThirdHi => first_second_third-hi
+        /// </example>
+        public static string ToHtmlCase(string name)
+        {
+            return HtmlCaseRegex.Replace(name, HtmlCaseRegexReplacement).ToLowerInvariant();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlNodeOptimizationPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlNodeOptimizationPass.cs
new file mode 100644
index 0000000000..1b327aa032
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/HtmlNodeOptimizationPass.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class HtmlNodeOptimizationPass : RazorEngineFeatureBase, IRazorSyntaxTreePass
+    {
+        public int Order => 100;
+
+        public RazorSyntaxTree Execute(RazorCodeDocument codeDocument, RazorSyntaxTree syntaxTree)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (syntaxTree == null)
+            {
+                throw new ArgumentNullException(nameof(syntaxTree));
+            }
+
+            var whitespaceRewriter = new WhitespaceRewriter();
+            var rewritten = whitespaceRewriter.Visit(syntaxTree.Root);
+
+            var rewrittenSyntaxTree = RazorSyntaxTree.Create(rewritten, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
+            return rewrittenSyntaxTree;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorCodeGenerationOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorCodeGenerationOptionsFeature.cs
new file mode 100644
index 0000000000..e1f50c0fab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorCodeGenerationOptionsFeature.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IConfigureRazorCodeGenerationOptionsFeature : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        void Configure(RazorCodeGenerationOptionsBuilder options);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorParserOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorParserOptionsFeature.cs
new file mode 100644
index 0000000000..541243ca06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IConfigureRazorParserOptionsFeature.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IConfigureRazorParserOptionsFeature : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        void Configure(RazorParserOptionsBuilder options);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IDirectiveDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IDirectiveDescriptorBuilder.cs
new file mode 100644
index 0000000000..465069dbcf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IDirectiveDescriptorBuilder.cs
@@ -0,0 +1,49 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// A builder interface for configuring a <see cref="DirectiveDescriptor"/>.
+    /// </summary>
+    public interface IDirectiveDescriptorBuilder
+    {
+        /// <summary>
+        /// Gets or sets the description of the directive.
+        /// </summary>
+        string Description { get; set; }
+
+        /// <summary>
+        /// Gets the directive keyword.
+        /// </summary>
+        string Directive { get; }
+
+        /// <summary>
+        /// Gets or sets the display name of the directive.
+        /// </summary>
+        string DisplayName { get; set; }
+
+        /// <summary>
+        /// Gets the directive kind.
+        /// </summary>
+        DirectiveKind Kind { get; }
+
+        /// <summary>
+        /// Gets or sets the directive usage. The usage determines how many, and where directives can exist per document.
+        /// </summary>
+        DirectiveUsage Usage { get; set; }
+
+        /// <summary>
+        /// Gets a list of the directive tokens.
+        /// </summary>
+        IList<DirectiveTokenDescriptor> Tokens { get; }
+
+        /// <summary>
+        /// Creates a <see cref="DirectiveDescriptor"/> based on the current property values of the builder.
+        /// </summary>
+        /// <returns>The created <see cref="DirectiveDescriptor" />.</returns>
+        DirectiveDescriptor Build();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IImportProjectFeature.cs
new file mode 100644
index 0000000000..98d8ffe558
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IImportProjectFeature.cs
@@ -0,0 +1,12 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IImportProjectFeature : IRazorProjectEngineFeature
+    {
+        IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCSharpLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCSharpLoweringPhase.cs
new file mode 100644
index 0000000000..265e4bc494
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCSharpLoweringPhase.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Generates C# code using the intermediate node document.
+    /// </summary>
+    /// <remarks>
+    /// After IR processing, the <see cref="IRazorCSharpLoweringPhase"/> transforms the intermediate node document into
+    /// generated C# code. At this time any directives or other constructs that cannot be understood by code generation
+    /// will result in an error.
+    /// </remarks>
+    public interface IRazorCSharpLoweringPhase : IRazorEnginePhase
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs
new file mode 100644
index 0000000000..6d3ed5156c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal interface IRazorCodeGenerationOptionsFactoryProjectFeature : IRazorProjectEngineFeature
+    {
+        RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFeature.cs
new file mode 100644
index 0000000000..b74bcc3d8d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFeature.cs
@@ -0,0 +1,13 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [Obsolete("In Razor 2.1 and newer, use RazorCodeDocument.GetCodeGenerationOptions().")]
+    public interface IRazorCodeGenerationOptionsFeature : IRazorEngineFeature
+    {
+        RazorCodeGenerationOptions GetOptions();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPass.cs
new file mode 100644
index 0000000000..0adaa290a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPass.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorDirectiveClassifierPass : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPhase.cs
new file mode 100644
index 0000000000..41594a66a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveClassifierPhase.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Understands directive nodes and performs the necessary modifications to the document.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The second phase of intermediate node processing is directive classification. Passes in this phase should interpret
+    /// directives and processing them accordingly by transforming nodes or adding diagnostics. At this time the document 
+    /// kind has been identified, so any directive that can't be applied should trigger
+    /// errors. If implementing a document kind that diverges from the standard structure of Razor documents
+    /// it may be necessary to reimplement processing of default directives.
+    /// </para>
+    /// <para>
+    /// <see cref="IRazorDirectiveClassifierPass"/> objects are executed according to an ascending ordering of the
+    /// <see cref="IRazorDirectiveClassifierPass.Order"/> property.
+    /// </para>
+    /// </remarks>
+    public interface IRazorDirectiveClassifierPhase : IRazorEnginePhase
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveFeature.cs
new file mode 100644
index 0000000000..5483fd4941
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDirectiveFeature.cs
@@ -0,0 +1,12 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorDirectiveFeature : IRazorEngineFeature
+    {
+        ICollection<DirectiveDescriptor> Directives { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPass.cs
new file mode 100644
index 0000000000..0893eaeead
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPass.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorDocumentClassifierPass : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPhase.cs
new file mode 100644
index 0000000000..37a957419e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorDocumentClassifierPhase.cs
@@ -0,0 +1,28 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Modifies the intermediate node document to a desired structure.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The first phase of intermediate node procesing is document classification. Passes in this phase should classify the
+    /// document according to any relevant criteria (project configuration, file extension, directive) and modify
+    /// the intermediate node document to suit the desired document shape. Document classifiers should also set
+    /// <see cref="DocumentIntermediateNode.DocumentKind"/> to prevent other classifiers from running. If no classifier 
+    /// matches the document, then it will be classified as &quot;generic&quot; and processed according to set 
+    /// of reasonable defaults.
+    /// </para>
+    /// <para>
+    /// <see cref="IRazorDocumentClassifierPass"/> objects are executed according to an ascending ordering of the
+    /// <see cref="IRazorDocumentClassifierPass.Order"/> property.
+    /// </para>
+    /// </remarks>
+    public interface IRazorDocumentClassifierPhase : IRazorEnginePhase
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineBuilder.cs
new file mode 100644
index 0000000000..38c411296b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineBuilder.cs
@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [Obsolete("This class is obsolete and will be removed in a future version. The recommended alternative is " + nameof(RazorProjectEngineBuilder) + ".")]
+    public interface IRazorEngineBuilder
+    {
+        ICollection<IRazorEngineFeature> Features { get; }
+
+        IList<IRazorEnginePhase> Phases { get; }
+
+        bool DesignTime { get; }
+
+        RazorEngine Build();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineFeature.cs
new file mode 100644
index 0000000000..e06f3a65ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEngineFeature.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorEngineFeature : IRazorFeature
+    {
+        RazorEngine Engine { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEnginePhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEnginePhase.cs
new file mode 100644
index 0000000000..0afcaaaa15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorEnginePhase.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorEnginePhase
+    {
+        RazorEngine Engine { get; set; }
+
+        void Execute(RazorCodeDocument codeDocument);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorFeature.cs
new file mode 100644
index 0000000000..4b8d602601
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorFeature.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorFeature
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorIntermediateNodeLoweringPhase.cs
new file mode 100644
index 0000000000..6a7bfa05ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorIntermediateNodeLoweringPhase.cs
@@ -0,0 +1,19 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Generates the intermediate node document from <see cref="RazorSyntaxTree"/>.
+    /// </summary>
+    /// <remarks>
+    /// The document is first produced by <see cref="IRazorIntermediateNodeLoweringPhase"/>. At this point no intermediate node
+    /// passes have been executed. The default <see cref="IRazorIntermediateNodeLoweringPhase"/> will perform a mechanical
+    /// transformation of the syntax tree to intermediate nodes, resulting in a mostly flat structure. It is up to later phases 
+    /// to give the document structure and semantics according to a document kind. The default 
+    /// <see cref="IRazorIntermediateNodeLoweringPhase"/> is also responsible for merging nodes from imported documents.
+    /// </remarks>
+    public interface IRazorIntermediateNodeLoweringPhase : IRazorEnginePhase
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPass.cs
new file mode 100644
index 0000000000..693cf96a02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPass.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorOptimizationPass : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPhase.cs
new file mode 100644
index 0000000000..e0c7cccd5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorOptimizationPhase.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Performs necessary modifications to the <see cref="Intermediate.DocumentIntermediateNode"/> to complete and
+    /// optimize code generation.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The last phase of intermediate node document processing is optimization. Passes in this phase perform some 
+    /// kind of transformation on the intermediate node document that optimizes the generated code. The key distinction 
+    /// here is that information may be discarded during this phase.
+    /// </para>
+    /// <para>
+    /// <see cref="IRazorOptimizationPass"/> objects are executed according to an ascending ordering of the
+    /// <see cref="IRazorOptimizationPass.Order"/> property.
+    /// </para>
+    /// </remarks>
+    public interface IRazorOptimizationPhase : IRazorEnginePhase
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs
new file mode 100644
index 0000000000..e73bf8babc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal interface IRazorParserOptionsFactoryProjectFeature : IRazorProjectEngineFeature
+    {
+        RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFeature.cs
new file mode 100644
index 0000000000..b2c1e9ec3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFeature.cs
@@ -0,0 +1,13 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [Obsolete("In Razor 2.1 and newer, use RazorCodeDocument.GetParserOptions().")]
+    public interface IRazorParserOptionsFeature : IRazorEngineFeature
+    {
+        RazorParserOptions GetOptions();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParsingPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParsingPhase.cs
new file mode 100644
index 0000000000..fb409ec33f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParsingPhase.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorParsingPhase : IRazorEnginePhase
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorProjectEngineFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorProjectEngineFeature.cs
new file mode 100644
index 0000000000..3b97dbefd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorProjectEngineFeature.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorProjectEngineFeature : IRazorFeature
+    {
+        RazorProjectEngine ProjectEngine { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePass.cs
new file mode 100644
index 0000000000..aa4ba84650
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePass.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // Internal until we flesh out public RazorSyntaxTree API
+    internal interface IRazorSyntaxTreePass : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        RazorSyntaxTree Execute(RazorCodeDocument codeDocument, RazorSyntaxTree syntaxTree);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePhase.cs
new file mode 100644
index 0000000000..f75baab74a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorSyntaxTreePhase.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // Internal until we flesh out public RazorSyntaxTree API.
+    internal interface IRazorSyntaxTreePhase : IRazorEnginePhase
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTagHelperBinderPhase.cs
new file mode 100644
index 0000000000..1cea097fbd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTagHelperBinderPhase.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorTagHelperBinderPhase : IRazorEnginePhase
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTargetExtensionFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTargetExtensionFeature.cs
new file mode 100644
index 0000000000..33f30c8193
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorTargetExtensionFeature.cs
@@ -0,0 +1,13 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface IRazorTargetExtensionFeature : IRazorEngineFeature
+    {
+        ICollection<ICodeTargetExtension> TargetExtensions { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperDescriptorProvider.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..1b061f59ba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperDescriptorProvider.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface ITagHelperDescriptorProvider : IRazorEngineFeature
+    {
+        int Order { get; }
+
+        void Execute(TagHelperDescriptorProviderContext context);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperFeature.cs
new file mode 100644
index 0000000000..1f33f948dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ITagHelperFeature.cs
@@ -0,0 +1,12 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public interface ITagHelperFeature : IRazorEngineFeature
+    {
+        IReadOnlyList<TagHelperDescriptor> GetDescriptors();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs
new file mode 100644
index 0000000000..4a9ce5d1a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class CSharpCodeAttributeValueIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string Prefix { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitCSharpCodeAttributeValue(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteChildren(Children);
+
+            formatter.WriteProperty(nameof(Prefix), Prefix);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeIntermediateNode.cs
new file mode 100644
index 0000000000..f888a561f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpCodeIntermediateNode.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class CSharpCodeIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitCSharpCode(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteChildren(Children);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs
new file mode 100644
index 0000000000..c058b67acc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class CSharpExpressionAttributeValueIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string Prefix { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitCSharpExpressionAttributeValue(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteChildren(Children);
+
+            formatter.WriteProperty(nameof(Prefix), Prefix);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionIntermediateNode.cs
new file mode 100644
index 0000000000..c4c9e02962
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CSharpExpressionIntermediateNode.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class CSharpExpressionIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitCSharpExpression(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteChildren(Children);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ClassDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ClassDeclarationIntermediateNode.cs
new file mode 100644
index 0000000000..ea178228c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ClassDeclarationIntermediateNode.cs
@@ -0,0 +1,45 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class ClassDeclarationIntermediateNode : MemberDeclarationIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public IList<string> Modifiers { get; } = new List<string>();
+
+        public string ClassName { get; set; }
+
+        public string BaseType { get; set; }
+
+        public IList<string> Interfaces { get; set; } = new List<string>();
+
+        public IList<TypeParameter> TypeParameters { get; set; } = new List<TypeParameter>();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitClassDeclaration(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(ClassName);
+
+            formatter.WriteProperty(nameof(BaseType), BaseType);
+            formatter.WriteProperty(nameof(ClassName), ClassName);
+            formatter.WriteProperty(nameof(Interfaces), string.Join(", ", Interfaces));
+            formatter.WriteProperty(nameof(Modifiers), string.Join(", ", Modifiers));
+            formatter.WriteProperty(nameof(TypeParameters), string.Join(", ", TypeParameters.Select(t => t.ParameterName)));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CommonAnnotations.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CommonAnnotations.cs
new file mode 100644
index 0000000000..fb2f02fc69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/CommonAnnotations.cs
@@ -0,0 +1,21 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public static class CommonAnnotations
+    {
+        public static readonly object Imported = "Imported";
+
+        public static readonly object PrimaryClass = "PrimaryClass";
+
+        public static readonly object PrimaryMethod = "PrimaryMethod";
+
+        public static readonly object PrimaryNamespace = "PrimaryNamespace";
+
+        public static class DefaultTagHelperExtension
+        {
+            public static readonly object TagHelperField = "TagHelperField";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DebuggerDisplayFormatter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DebuggerDisplayFormatter.cs
new file mode 100644
index 0000000000..705148b8ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DebuggerDisplayFormatter.cs
@@ -0,0 +1,21 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal class DebuggerDisplayFormatter : IntermediateNodeFormatterBase
+    {
+        public DebuggerDisplayFormatter()
+        {
+            Writer = new StringWriter();
+            ContentMode = FormatterContentMode.PreferContent;
+        }
+
+        public override string ToString()
+        {
+            return Writer.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DefaultRazorIntermediateNodeBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DefaultRazorIntermediateNodeBuilder.cs
new file mode 100644
index 0000000000..abee297973
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DefaultRazorIntermediateNodeBuilder.cs
@@ -0,0 +1,102 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal class DefaultRazorIntermediateNodeBuilder : IntermediateNodeBuilder
+    {
+        private readonly List<IntermediateNode> _stack;
+        private int _depth;
+
+        public DefaultRazorIntermediateNodeBuilder()
+        {
+            _stack = new List<IntermediateNode>();
+        }
+
+        public override IntermediateNode Current
+        {
+            get
+            {
+                return _depth > 0 ? _stack[_depth - 1] : null;
+            }
+        }
+
+        public override void Add(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            
+            Current.Children.Add(node);
+        }
+
+        public override void Insert(int index, IntermediateNode node)
+        {
+            if (index < 0 || index - Current.Children.Count > 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+            
+            if (index == Current.Children.Count)
+            {
+                // Allow inserting at 'Children.Count' to be friendlier than List<> typically is.
+                Current.Children.Add(node);
+            }
+            else
+            {
+                Current.Children.Insert(index, node);
+            }
+        }
+
+        public override IntermediateNode Build()
+        {
+            IntermediateNode node = null;
+            while (_depth > 0)
+            {
+                node = Pop();
+            }
+
+            return node;
+        }
+
+        public override IntermediateNode Pop()
+        {
+            if (_depth == 0)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeBuilder_PopInvalid(nameof(Pop)));
+            }
+
+            var node = _stack[--_depth];
+            return node;
+        }
+
+        public override void Push(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (_depth >= _stack.Count)
+            {
+                _stack.Add(node);
+            }
+            else
+            {
+                _stack[_depth] = node;
+            }
+
+            if (_depth > 0)
+            {
+                var parent = _stack[_depth - 1];
+                parent.Children.Add(node);
+            }
+
+            _depth++;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveIntermediateNode.cs
new file mode 100644
index 0000000000..6f954a89f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveIntermediateNode.cs
@@ -0,0 +1,32 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class DirectiveIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string DirectiveName { get; set; }
+
+        public IEnumerable<DirectiveTokenIntermediateNode> Tokens => Children.OfType<DirectiveTokenIntermediateNode>();
+
+        public DirectiveDescriptor Directive { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            visitor.VisitDirective(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(DirectiveName);
+
+            formatter.WriteProperty(nameof(Directive), Directive?.DisplayName);
+            formatter.WriteProperty(nameof(DirectiveName), DirectiveName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveTokenIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveTokenIntermediateNode.cs
new file mode 100644
index 0000000000..a01ed25b80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DirectiveTokenIntermediateNode.cs
@@ -0,0 +1,28 @@
+// 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.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class DirectiveTokenIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string Content { get; set; }
+
+        public DirectiveTokenDescriptor DirectiveToken { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            visitor.VisitDirectiveToken(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(Content);
+
+            formatter.WriteProperty(nameof(Content), Content);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNode.cs
new file mode 100644
index 0000000000..9570092e46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNode.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class DocumentIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string DocumentKind { get; set; }
+
+        public RazorCodeGenerationOptions Options { get; set; }
+
+        public CodeTarget Target { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitDocument(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(DocumentKind);
+
+            formatter.WriteProperty(nameof(DocumentKind), DocumentKind);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs
new file mode 100644
index 0000000000..c1482fbb67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs
@@ -0,0 +1,99 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public static class DocumentIntermediateNodeExtensions
+    {
+        public static ClassDeclarationIntermediateNode FindPrimaryClass(this DocumentIntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return FindWithAnnotation<ClassDeclarationIntermediateNode>(node, CommonAnnotations.PrimaryClass);
+        }
+
+        public static MethodDeclarationIntermediateNode FindPrimaryMethod(this DocumentIntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return FindWithAnnotation<MethodDeclarationIntermediateNode>(node, CommonAnnotations.PrimaryMethod);
+        }
+
+        public static NamespaceDeclarationIntermediateNode FindPrimaryNamespace(this DocumentIntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return FindWithAnnotation<NamespaceDeclarationIntermediateNode>(node, CommonAnnotations.PrimaryNamespace);
+        }
+
+        public static IReadOnlyList<IntermediateNodeReference> FindDirectiveReferences(this DocumentIntermediateNode node, DirectiveDescriptor directive)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            var visitor = new DirectiveVisitor(directive);
+            visitor.Visit(node);
+            return visitor.Directives;
+        }
+
+        private static T FindWithAnnotation<T>(IntermediateNode node, object annotation) where T : IntermediateNode
+        {
+            if (node is T target && object.ReferenceEquals(target.Annotations[annotation], annotation))
+            {
+                return target;
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var result = FindWithAnnotation<T>(node.Children[i], annotation);
+                if (result != null)
+                {
+                    return result;
+                }
+            }
+
+            return null;
+        }
+
+        private class DirectiveVisitor : IntermediateNodeWalker
+        {
+            private readonly DirectiveDescriptor _directive;
+
+            public DirectiveVisitor(DirectiveDescriptor directive)
+            {
+                _directive = directive;
+            }
+
+            public List<IntermediateNodeReference> Directives = new List<IntermediateNodeReference>();
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (_directive == node.Directive)
+                {
+                    Directives.Add(new IntermediateNodeReference(Parent, node));
+                }
+
+                base.VisitDirective(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ExtensionIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ExtensionIntermediateNode.cs
new file mode 100644
index 0000000000..2b909da7ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ExtensionIntermediateNode.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public abstract class ExtensionIntermediateNode : IntermediateNode
+    {
+        public abstract void WriteNode(CodeTarget target, CodeRenderingContext context);
+
+        protected static void AcceptExtensionNode<TNode>(TNode node, IntermediateNodeVisitor visitor)
+            where TNode : ExtensionIntermediateNode
+        {
+            var typedVisitor = visitor as IExtensionIntermediateNodeVisitor<TNode>;
+            if (typedVisitor == null)
+            {
+                visitor.VisitExtension(node);
+            }
+            else
+            {
+                typedVisitor.VisitExtension(node);
+            }
+        }
+
+        protected void ReportMissingCodeTargetExtension<TDependency>(CodeRenderingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var documentKind = context.DocumentKind ?? string.Empty;
+            context.Diagnostics.Add(
+                RazorDiagnosticFactory.CreateCodeTarget_UnsupportedExtension(
+                    documentKind, 
+                    typeof(TDependency)));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs
new file mode 100644
index 0000000000..0d6b731390
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class FieldDeclarationIntermediateNode : MemberDeclarationIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public IList<string> Modifiers { get; } = new List<string>();
+
+        public string FieldName { get; set; }
+
+        public string FieldType { get; set; }
+        
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitFieldDeclaration(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(FieldName);
+
+            formatter.WriteProperty(nameof(FieldName), FieldName);
+            formatter.WriteProperty(nameof(FieldType), FieldType);
+            formatter.WriteProperty(nameof(Modifiers), string.Join(" ", Modifiers));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..861b14b227
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class HtmlAttributeIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public string Prefix { get; set; }
+
+        public string Suffix { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitHtmlAttribute(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(Prefix), Prefix);
+            formatter.WriteProperty(nameof(Suffix), Suffix);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeValueIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeValueIntermediateNode.cs
new file mode 100644
index 0000000000..6fdc5247a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeValueIntermediateNode.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class HtmlAttributeValueIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string Prefix { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitHtmlAttributeValue(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteChildren(Children);
+
+            formatter.WriteProperty(nameof(Prefix), Prefix);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNode.cs
new file mode 100644
index 0000000000..3a213fe460
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNode.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class HtmlContentIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitHtml(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteChildren(Children);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IExtensionIntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IExtensionIntermediateNodeVisitor.cs
new file mode 100644
index 0000000000..817439d0ba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IExtensionIntermediateNodeVisitor.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public interface IExtensionIntermediateNodeVisitor<TNode> where TNode : ExtensionIntermediateNode
+    {
+        void VisitExtension(TNode node);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs
new file mode 100644
index 0000000000..7adf2bd8b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal static class InputDocumentKind
+    {
+        public static readonly string Component = "component";
+
+        public static readonly string MvcFile = "mvc";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNode.cs
new file mode 100644
index 0000000000..02c2976c55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNode.cs
@@ -0,0 +1,71 @@
+// 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.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    [DebuggerDisplay("{DebuggerToString(),nq}")]
+    public abstract class IntermediateNode
+    {
+        private ItemCollection _annotations;
+        private RazorDiagnosticCollection _diagnostics;
+
+        public ItemCollection Annotations
+        {
+            get
+            {
+                if (_annotations == null)
+                {
+                    _annotations = new ItemCollection();
+                }
+
+                return _annotations;
+            }
+        }
+
+        public abstract IntermediateNodeCollection Children { get; }
+
+        public RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
+
+        public SourceSpan? Source { get; set; }
+
+        public abstract void Accept(IntermediateNodeVisitor visitor);
+
+        [DebuggerBrowsable(DebuggerBrowsableState.Collapsed)]
+        private string Tree
+        {
+            get
+            {
+                var formatter = new DebuggerDisplayFormatter();
+                formatter.FormatTree(this);
+                return formatter.ToString();
+            }
+        }
+
+        private string DebuggerToString()
+        {
+            var formatter = new DebuggerDisplayFormatter();
+            formatter.FormatNode(this);
+            return formatter.ToString();
+        }
+
+
+        public virtual void FormatNode(IntermediateNodeFormatter formatter)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeBuilder.cs
new file mode 100644
index 0000000000..24e72f5065
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeBuilder.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal abstract class IntermediateNodeBuilder
+    {
+        public static IntermediateNodeBuilder Create(IntermediateNode root)
+        {
+            if (root == null)
+            {
+                throw new ArgumentNullException(nameof(root));
+            }
+
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+            builder.Push(root);
+            return builder;
+        }
+
+        public abstract IntermediateNode Current { get; }
+
+        public abstract void Add(IntermediateNode node);
+
+        public abstract void Insert(int index, IntermediateNode node);
+
+        public abstract IntermediateNode Build();
+
+        public abstract void Push(IntermediateNode node);
+
+        public abstract IntermediateNode Pop();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs
new file mode 100644
index 0000000000..4c50fa1240
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs
@@ -0,0 +1,198 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class IntermediateNodeCollection : IList<IntermediateNode>
+    {
+        public static readonly IntermediateNodeCollection ReadOnly = new IntermediateNodeCollection(new List<IntermediateNode>().AsReadOnly());
+
+        private readonly IList<IntermediateNode> _inner;
+
+        public IntermediateNodeCollection()
+            : this(new List<IntermediateNode>())
+        {
+        }
+
+        private IntermediateNodeCollection(IList<IntermediateNode> inner)
+        {
+            _inner = inner;
+        }
+
+        public IntermediateNode this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= Count)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                }
+
+                return _inner[index];
+            }
+            set
+            {
+                if (index < 0 || index >= Count)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                }
+
+                _inner[index] = value;
+            }
+        }
+
+        public int Count => _inner.Count;
+
+        public bool IsReadOnly => _inner.IsReadOnly;
+
+        public void Add(IntermediateNode item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            _inner.Add(item);
+        }
+
+        public void Clear()
+        {
+            _inner.Clear();
+        }
+
+        public bool Contains(IntermediateNode item)
+        {
+            return _inner.Contains(item);
+        }
+
+        public void CopyTo(IntermediateNode[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            if (arrayIndex < 0 || arrayIndex > array.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+            }
+            else if (array.Length - arrayIndex < Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+            }
+
+            _inner.CopyTo(array, arrayIndex);
+        }
+
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        IEnumerator<IntermediateNode> IEnumerable<IntermediateNode>.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public int IndexOf(IntermediateNode item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return _inner.IndexOf(item);
+        }
+
+        public void Insert(int index, IntermediateNode item)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            _inner.Insert(index, item);
+        }
+
+        public bool Remove(IntermediateNode item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return _inner.Remove(item);
+        }
+
+        public void RemoveAt(int index)
+        {
+            if (index < 0 || index >= Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            _inner.RemoveAt(index);
+        }
+
+        public struct Enumerator : IEnumerator<IntermediateNode>
+        {
+            private readonly IList<IntermediateNode> _items;
+            private int _index;
+
+            public Enumerator(IntermediateNodeCollection collection)
+            {
+                if (collection == null)
+                {
+                    throw new ArgumentNullException(nameof(collection));
+                }
+
+                _items = collection._inner;
+                _index = -1;
+            }
+
+            public IntermediateNode Current
+            {
+                get
+                {
+                    if (_index < 0 || _index >= _items.Count)
+                    {
+                        return null;
+                    }
+
+                    return _items[_index];
+                }
+            }
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
+            }
+
+            public bool MoveNext()
+            {
+                _index++;
+                return _index < _items.Count;
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs
new file mode 100644
index 0000000000..6af13aab2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs
@@ -0,0 +1,81 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public static class IntermediateNodeExtensions
+    {
+        private static readonly IReadOnlyList<RazorDiagnostic> EmptyDiagnostics = Array.Empty<RazorDiagnostic>();
+
+        public static bool IsImported(this IntermediateNode node)
+        {
+            return ReferenceEquals(node.Annotations[CommonAnnotations.Imported], CommonAnnotations.Imported);
+        }
+
+        public static IReadOnlyList<RazorDiagnostic> GetAllDiagnostics(this IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            HashSet<RazorDiagnostic> diagnostics = null;
+
+            AddAllDiagnostics(node);
+
+            return diagnostics?.ToList() ?? EmptyDiagnostics;
+
+            void AddAllDiagnostics(IntermediateNode n)
+            {
+                if (n.HasDiagnostics)
+                {
+                    if (diagnostics == null)
+                    {
+                        diagnostics = new HashSet<RazorDiagnostic>();
+                    }
+
+                    diagnostics.UnionWith(n.Diagnostics);
+                }
+
+                for (var i = 0; i < n.Children.Count; i++)
+                {
+                    AddAllDiagnostics(n.Children[i]);
+                }
+            }
+        }
+
+        public static IReadOnlyList<TNode> FindDescendantNodes<TNode>(this IntermediateNode node)
+            where TNode : IntermediateNode
+        {
+            var visitor = new Visitor<TNode>();
+            visitor.Visit(node);
+
+            if (visitor.Results.Count > 0 && visitor.Results[0] == node)
+            {
+                // Don't put the node itself in the results
+                visitor.Results.Remove((TNode)node);
+            }
+
+            return visitor.Results;
+        }
+
+        private class Visitor<TNode> : IntermediateNodeWalker where TNode : IntermediateNode
+        {
+            public List<TNode> Results { get; } = new List<TNode>();
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                if (node is TNode match)
+                {
+                    Results.Add(match);
+                }
+
+                base.VisitDefault(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatter.cs
new file mode 100644
index 0000000000..c453dbe6e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatter.cs
@@ -0,0 +1,16 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public abstract class IntermediateNodeFormatter
+    {
+        public abstract void WriteChildren(IntermediateNodeCollection children);
+
+        public abstract void WriteContent(string content);
+
+        public abstract void WriteProperty(string key, string value);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatterBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatterBase.cs
new file mode 100644
index 0000000000..54846acaaf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeFormatterBase.cs
@@ -0,0 +1,180 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal class IntermediateNodeFormatterBase : IntermediateNodeFormatter
+    {
+        private string _content;
+        private Dictionary<string, string> _properties = new Dictionary<string, string>(StringComparer.Ordinal);
+
+        protected FormatterContentMode ContentMode { get; set; }
+
+        protected bool IncludeSource { get; set; }
+
+        protected TextWriter Writer { get; set; }
+
+        public override void WriteChildren(IntermediateNodeCollection children)
+        {
+            if (children == null)
+            {
+                throw new ArgumentNullException(nameof(children));
+            }
+
+            Writer.Write(" ");
+            Writer.Write("\"");
+            for (var i = 0; i < children.Count; i++)
+            {
+                var child = children[i] as IntermediateToken;
+                if (child != null)
+                {
+                    Writer.Write(EscapeNewlines(child.Content));
+                }
+            }
+            Writer.Write("\"");
+        }
+
+        public override void WriteContent(string content)
+        {
+            if (content == null)
+            {
+                return;
+            }
+
+            _content = EscapeNewlines(content);
+        }
+
+        public override void WriteProperty(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (value == null)
+            {
+                return;
+            }
+
+            _properties.Add(key, EscapeNewlines(value));
+        }
+
+        public void FormatNode(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            BeginNode(node);
+            node.FormatNode(this);
+            EndNode(node);
+        }
+
+        public void FormatTree(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var visitor = new FormatterVisitor(this);
+            visitor.Visit(node);
+        }
+
+        private void BeginNode(IntermediateNode node)
+        {
+            Writer.Write(GetShortName(node));
+
+            if (IncludeSource)
+            {
+                Writer.Write(" ");
+                Writer.Write(node.Source?.ToString() ?? "(n/a)");
+            }
+        }
+
+        private void EndNode(IntermediateNode node)
+        {
+            if (_content != null && (_properties.Count == 0 || ContentMode == FormatterContentMode.PreferContent))
+            {
+                Writer.Write(" ");
+                Writer.Write("\"");
+                Writer.Write(EscapeNewlines(_content));
+                Writer.Write("\"");
+            }
+
+            if (_properties.Count > 0 && (_content == null || ContentMode == FormatterContentMode.PreferProperties))
+            {
+                Writer.Write(" ");
+                Writer.Write("{ ");
+                Writer.Write(string.Join(", ", _properties.Select(kvp => $"{kvp.Key}: \"{kvp.Value}\"")));
+                Writer.Write(" }");
+            }
+
+            _content = null;
+            _properties.Clear();
+        }
+
+        private string GetShortName(IntermediateNode node)
+        {
+            var typeName = node.GetType().Name;
+            return
+                typeName.EndsWith(nameof(IntermediateNode), StringComparison.Ordinal) ?
+                typeName.Substring(0, typeName.Length - nameof(IntermediateNode).Length) :
+                typeName;
+        }
+
+        private string EscapeNewlines(string content)
+        {
+            return content.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t");
+        }
+
+        // Depending on the usage of the formatter we might prefer thoroughness (properties)
+        // or brevity (content). Generally if a node has a single string that provides value
+        // it has content.
+        //
+        // Some nodes have neither: TagHelperBody
+        // Some nodes have content: HtmlContent
+        // Some nodes have properties: Document
+        // Some nodes have both: TagHelperProperty
+        protected enum FormatterContentMode
+        {
+            PreferContent,
+            PreferProperties,
+        }
+
+        protected class FormatterVisitor : IntermediateNodeWalker
+        {
+            private const int IndentSize = 2;
+
+            private readonly IntermediateNodeFormatterBase _formatter;
+            private int _indent = 0;
+
+            public FormatterVisitor(IntermediateNodeFormatterBase formatter)
+            {
+                _formatter = formatter;
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                // Indent
+                for (var i = 0; i < _indent; i++)
+                {
+                    _formatter.Writer.Write(' ');
+                }
+                _formatter.FormatNode(node);
+                _formatter.Writer.WriteLine();
+                
+                // Process children
+                _indent += IndentSize;
+                base.VisitDefault(node);
+                _indent -= IndentSize;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeReference.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeReference.cs
new file mode 100644
index 0000000000..230ca17484
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeReference.cs
@@ -0,0 +1,209 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public struct IntermediateNodeReference
+    {
+        public IntermediateNodeReference(IntermediateNode parent, IntermediateNode node)
+        {
+            if (parent == null)
+            {
+                throw new ArgumentNullException(nameof(parent));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            Parent = parent;
+            Node = node;
+        }
+
+        public void Deconstruct(out IntermediateNode parent, out IntermediateNode node)
+        {
+            parent = Parent;
+            node = Node;
+        }
+
+        public IntermediateNode Node { get; }
+
+        public IntermediateNode Parent { get; }
+
+        public IntermediateNodeReference InsertAfter(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (Parent == null)
+            {
+                throw new InvalidOperationException(Resources.IntermediateNodeReference_NotInitialized);
+            }
+
+            if (Parent.Children.IsReadOnly)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_CollectionIsReadOnly(Parent));
+            }
+
+            var index = Parent.Children.IndexOf(Node);
+            if (index == -1)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_NodeNotFound(
+                    Node,
+                    Parent));
+            }
+
+            Parent.Children.Insert(index + 1, node);
+            return new IntermediateNodeReference(Parent, node);
+        }
+
+        public void InsertAfter(IEnumerable<IntermediateNode> nodes)
+        {
+            if (nodes == null)
+            {
+                throw new ArgumentNullException(nameof(nodes));
+            }
+
+            if (Parent == null)
+            {
+                throw new InvalidOperationException(Resources.IntermediateNodeReference_NotInitialized);
+            }
+
+            if (Parent.Children.IsReadOnly)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_CollectionIsReadOnly(Parent));
+            }
+
+            var index = Parent.Children.IndexOf(Node);
+            if (index == -1)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_NodeNotFound(
+                    Node,
+                    Parent));
+            }
+
+            foreach (var node in nodes)
+            {
+                Parent.Children.Insert(++index, node);
+            }
+        }
+
+        public IntermediateNodeReference InsertBefore(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (Parent == null)
+            {
+                throw new InvalidOperationException(Resources.IntermediateNodeReference_NotInitialized);
+            }
+
+            if (Parent.Children.IsReadOnly)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_CollectionIsReadOnly(Parent));
+            }
+
+            var index = Parent.Children.IndexOf(Node);
+            if (index == -1)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_NodeNotFound(
+                    Node,
+                    Parent));
+            }
+
+            Parent.Children.Insert(index, node);
+            return new IntermediateNodeReference(Parent, node);
+        }
+
+        public void InsertBefore(IEnumerable<IntermediateNode> nodes)
+        {
+            if (nodes == null)
+            {
+                throw new ArgumentNullException(nameof(nodes));
+            }
+
+            if (Parent == null)
+            {
+                throw new InvalidOperationException(Resources.IntermediateNodeReference_NotInitialized);
+            }
+
+            if (Parent.Children.IsReadOnly)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_CollectionIsReadOnly(Parent));
+            }
+
+            var index = Parent.Children.IndexOf(Node);
+            if (index == -1)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_NodeNotFound(
+                    Node,
+                    Parent));
+            }
+
+            foreach (var node in nodes)
+            {
+                Parent.Children.Insert(index++, node);
+            }
+        }
+
+        public void Remove()
+        {
+            if (Parent == null)
+            {
+                throw new InvalidOperationException(Resources.IntermediateNodeReference_NotInitialized);
+            }
+
+            if (Parent.Children.IsReadOnly)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_CollectionIsReadOnly(Parent));
+            }
+
+            var index = Parent.Children.IndexOf(Node);
+            if (index == -1)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_NodeNotFound(
+                    Node,
+                    Parent));
+            }
+
+            Parent.Children.RemoveAt(index);
+        }
+
+        public IntermediateNodeReference Replace(IntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (Parent == null)
+            {
+                throw new InvalidOperationException(Resources.IntermediateNodeReference_NotInitialized);
+            }
+
+            if (Parent.Children.IsReadOnly)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_CollectionIsReadOnly(Parent));
+            }
+
+            var index = Parent.Children.IndexOf(Node);
+            if (index == -1)
+            {
+                throw new InvalidOperationException(Resources.FormatIntermediateNodeReference_NodeNotFound(
+                    Node,
+                    Parent));
+            }
+
+            Parent.Children[index] = node;
+            return new IntermediateNodeReference(Parent, node);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
new file mode 100644
index 0000000000..bb2c2687a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -0,0 +1,132 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public abstract class IntermediateNodeVisitor
+    {
+        public virtual void Visit(IntermediateNode node)
+        {
+            node.Accept(this);
+        }
+
+        public virtual void VisitDefault(IntermediateNode node)
+        {
+        }
+
+        public virtual void VisitToken(IntermediateToken node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitDirectiveToken(DirectiveTokenIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitDirective(DirectiveIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitExtension(ExtensionIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitCSharpCode(CSharpCodeIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitCSharpExpression(CSharpExpressionIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitCSharpExpressionAttributeValue(CSharpExpressionAttributeValueIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitHtmlAttribute(HtmlAttributeIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitFieldDeclaration(FieldDeclarationIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitPropertyDeclaration(PropertyDeclarationIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitDocument(DocumentIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitHtml(HtmlContentIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitUsingDirective(UsingDirectiveIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitTagHelper(TagHelperIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitTagHelperBody(TagHelperBodyIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeWalker.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeWalker.cs
new file mode 100644
index 0000000000..8cafe05a9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeWalker.cs
@@ -0,0 +1,40 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public abstract class IntermediateNodeWalker : IntermediateNodeVisitor
+    {
+        private readonly List<IntermediateNode> _ancestors = new List<IntermediateNode>();
+
+        protected IReadOnlyList<IntermediateNode> Ancestors => _ancestors;
+
+        protected IntermediateNode Parent => _ancestors.Count > 0 ? _ancestors[0] : null;
+
+        public override void VisitDefault(IntermediateNode node)
+        {
+            var children = node.Children;
+            if (node.Children.Count == 0)
+            {
+                return;
+            }
+
+            _ancestors.Insert(0, node);
+
+            try
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    var child = children[i];
+                    Visit(child);
+                }
+            }
+            finally
+            {
+                _ancestors.RemoveAt(0);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateToken.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateToken.cs
new file mode 100644
index 0000000000..d60643d24a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateToken.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class IntermediateToken : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string Content { get; set; }
+
+        public bool IsCSharp => Kind == TokenKind.CSharp;
+
+        public bool IsHtml => Kind == TokenKind.Html;
+
+        public TokenKind Kind { get; set; } = TokenKind.Unknown;
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitToken(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(Content);
+
+            formatter.WriteProperty(nameof(Content), Content);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MalformedDirectiveIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MalformedDirectiveIntermediateNode.cs
new file mode 100644
index 0000000000..d37a2316a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MalformedDirectiveIntermediateNode.cs
@@ -0,0 +1,32 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class MalformedDirectiveIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string DirectiveName { get; set; }
+
+        public IEnumerable<DirectiveTokenIntermediateNode> Tokens => Children.OfType<DirectiveTokenIntermediateNode>();
+
+        public DirectiveDescriptor Directive { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            visitor.VisitMalformedDirective(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(DirectiveName);
+
+            formatter.WriteProperty(nameof(Directive), Directive?.DisplayName);
+            formatter.WriteProperty(nameof(DirectiveName), DirectiveName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MemberDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MemberDeclarationIntermediateNode.cs
new file mode 100644
index 0000000000..b506fec616
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MemberDeclarationIntermediateNode.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public abstract class MemberDeclarationIntermediateNode : IntermediateNode
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodDeclarationIntermediateNode.cs
new file mode 100644
index 0000000000..ad15636824
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodDeclarationIntermediateNode.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class MethodDeclarationIntermediateNode : MemberDeclarationIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public IList<string> Modifiers { get; } = new List<string>();
+
+        public string MethodName { get; set; }
+
+        public IList<MethodParameter> Parameters { get; } = new List<MethodParameter>();
+
+        public string ReturnType { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitMethodDeclaration(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(MethodName);
+
+            formatter.WriteProperty(nameof(MethodName), MethodName);
+            formatter.WriteProperty(nameof(Modifiers), string.Join(", ", Modifiers));
+            formatter.WriteProperty(nameof(Parameters), string.Join(", ", Parameters.Select(FormatMethodParameter)));
+            formatter.WriteProperty(nameof(ReturnType), ReturnType);
+        }
+
+        private static string FormatMethodParameter(MethodParameter parameter)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i <parameter.Modifiers.Count; i++)
+            {
+                builder.Append(parameter.Modifiers[i]);
+                builder.Append(" ");
+            }
+
+            builder.Append(parameter.TypeName);
+            builder.Append(" ");
+
+            builder.Append(parameter.ParameterName);
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodParameter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodParameter.cs
new file mode 100644
index 0000000000..6838f73d7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MethodParameter.cs
@@ -0,0 +1,16 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class MethodParameter
+    {
+        public IList<string> Modifiers { get; } = new List<string>();
+
+        public string TypeName { get; set; }
+
+        public string ParameterName { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/NamespaceDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/NamespaceDeclarationIntermediateNode.cs
new file mode 100644
index 0000000000..4a828102ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/NamespaceDeclarationIntermediateNode.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class NamespaceDeclarationIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string Content { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitNamespaceDeclaration(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(Content);
+
+            formatter.WriteProperty(nameof(Content), Content);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/PropertyDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/PropertyDeclarationIntermediateNode.cs
new file mode 100644
index 0000000000..3b7242c5bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/PropertyDeclarationIntermediateNode.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class PropertyDeclarationIntermediateNode : MemberDeclarationIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public IList<string> Modifiers { get; } = new List<string>();
+
+        public string PropertyName { get; set; }
+
+        public string PropertyType { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitPropertyDeclaration(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperBodyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperBodyIntermediateNode.cs
new file mode 100644
index 0000000000..ebf5b0eac0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperBodyIntermediateNode.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TagHelperBodyIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitTagHelperBody(this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..bdbf136384
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TagHelperHtmlAttributeIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitTagHelperHtmlAttribute(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperIntermediateNode.cs
new file mode 100644
index 0000000000..9fcd9a645d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperIntermediateNode.cs
@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TagHelperIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public TagMode TagMode { get; set; }
+
+        public string TagName { get; set; }
+
+        public IList<TagHelperDescriptor> TagHelpers { get; } = new List<TagHelperDescriptor>();
+
+        public TagHelperBodyIntermediateNode Body => Children.OfType<TagHelperBodyIntermediateNode>().SingleOrDefault();
+
+        public IEnumerable<TagHelperPropertyIntermediateNode> Properties
+        {
+            get
+            {
+                return Children.OfType<TagHelperPropertyIntermediateNode>();
+            }
+        }
+
+        public IEnumerable<TagHelperHtmlAttributeIntermediateNode> HtmlAttributes
+        {
+            get
+            {
+                return Children.OfType<TagHelperHtmlAttributeIntermediateNode>();
+            }
+        }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitTagHelper(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(TagName);
+
+            formatter.WriteProperty(nameof(TagHelpers), string.Join(", ", TagHelpers.Select(t => t.DisplayName)));
+            formatter.WriteProperty(nameof(TagMode), TagMode.ToString());
+            formatter.WriteProperty(nameof(TagName), TagName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
new file mode 100644
index 0000000000..1a755fe6f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TagHelperPropertyIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public bool IsIndexerNameMatch { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitTagHelperProperty(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(IsIndexerNameMatch), IsIndexerNameMatch.ToString());
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TokenKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TokenKind.cs
new file mode 100644
index 0000000000..b73d6797cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TokenKind.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public enum TokenKind
+    {
+        Unknown,
+        CSharp,
+        Html,
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TypeParameter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TypeParameter.cs
new file mode 100644
index 0000000000..08f953e23a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TypeParameter.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TypeParameter
+    {
+        public string ParameterName { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/UsingDirectiveIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/UsingDirectiveIntermediateNode.cs
new file mode 100644
index 0000000000..67c64f79e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/UsingDirectiveIntermediateNode.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class UsingDirectiveIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public string Content { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitUsingDirective(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(Content);
+
+            formatter.WriteProperty(nameof(Content), Content);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IntermediateNodePassBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IntermediateNodePassBase.cs
new file mode 100644
index 0000000000..c9024fea52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IntermediateNodePassBase.cs
@@ -0,0 +1,45 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class IntermediateNodePassBase : RazorEngineFeatureBase
+    {
+        /// <summary>
+        /// The default implementation of the <see cref="IRazorEngineFeature"/>s that run in a
+        /// <see cref="IRazorEnginePhase"/> will use this value for its Order property.
+        /// </summary>
+        /// <remarks>
+        /// This value is chosen in such a way that the default implementation runs after the other
+        /// custom <see cref="IRazorEngineFeature"/> implementations for a particular <see cref="IRazorEnginePhase"/>.
+        /// </remarks>
+        public static readonly int DefaultFeatureOrder = 1000;
+
+        public virtual int Order { get; }
+
+        public void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            if (Engine == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPhaseMustBeInitialized(nameof(Engine)));
+            }
+
+            ExecuteCore(codeDocument, documentNode);
+        }
+
+        protected abstract void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs
new file mode 100644
index 0000000000..dc6ab9723f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs
@@ -0,0 +1,124 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public sealed class ItemCollection : ICollection<KeyValuePair<object, object>>
+    {
+        private readonly Dictionary<object, object> _inner;
+
+        public ItemCollection()
+        {
+            _inner = new Dictionary<object, object>();
+        }
+
+        public object this[object key]
+        {
+            get
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+                
+                _inner.TryGetValue(key, out var value);
+                return value;
+            }
+            set
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                _inner[key] = value;
+            }
+        }
+
+        public int Count => _inner.Count;
+
+        public bool IsReadOnly => _inner != null;
+
+        int ICollection<KeyValuePair<object, object>>.Count => throw new NotImplementedException();
+
+        bool ICollection<KeyValuePair<object, object>>.IsReadOnly => throw new NotImplementedException();
+
+        public void Add(KeyValuePair<object, object> item)
+        {
+            if (item.Key == null)
+            {
+                throw new ArgumentException(Resources.KeyMustNotBeNull, nameof(item));
+            }
+
+            ((ICollection<KeyValuePair<object, object>>)_inner).Add(item);
+        }
+
+        public void Add(object key, object value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _inner.Add(key, value);
+        }
+
+        public void Clear()
+        {
+            _inner.Clear();
+        }
+
+        public bool Contains(KeyValuePair<object, object> item)
+        {
+            if (item.Key == null)
+            {
+                throw new ArgumentException(Resources.KeyMustNotBeNull, nameof(item));
+            }
+
+            return ((ICollection<KeyValuePair<object, object>>)_inner).Contains(item);
+        }
+
+        public void CopyTo(KeyValuePair<object, object>[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            if (arrayIndex < 0 || arrayIndex > array.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+            }
+            else if (array.Length - arrayIndex < Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+            }
+
+            ((ICollection<KeyValuePair<object, object>>)_inner).CopyTo(array, arrayIndex);
+        }
+
+        public IEnumerator<KeyValuePair<object, object>> GetEnumerator()
+        {
+            return _inner.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public bool Remove(KeyValuePair<object, object> item)
+        {
+            if (item.Key == null)
+            {
+                throw new ArgumentException(Resources.KeyMustNotBeNull, nameof(item));
+            }
+
+            return ((ICollection<KeyValuePair<object, object>>)_inner).Remove(item);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/LargeTextSourceDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/LargeTextSourceDocument.cs
new file mode 100644
index 0000000000..34e72ad984
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/LargeTextSourceDocument.cs
@@ -0,0 +1,159 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class LargeTextSourceDocument : RazorSourceDocument
+    {
+        private readonly List<char[]> _chunks;
+
+        private readonly int _chunkMaxLength;
+
+        private readonly RazorSourceLineCollection _lines;
+
+        private readonly int _length;
+        private byte[] _checksum;
+
+        public LargeTextSourceDocument(StreamReader reader, int chunkMaxLength, Encoding encoding, RazorSourceDocumentProperties properties)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+
+            _chunkMaxLength = chunkMaxLength;
+            Encoding = encoding;
+            FilePath = properties.FilePath;
+            RelativePath = properties.RelativePath;
+
+            ReadChunks(reader, _chunkMaxLength, out _length, out _chunks);
+            _lines = new DefaultRazorSourceLineCollection(this);
+        }
+
+        public override char this[int position]
+        {
+            get
+            {
+                var chunkIndex = position / _chunkMaxLength;
+                var insideChunkPosition = position % _chunkMaxLength;
+
+                return _chunks[chunkIndex][insideChunkPosition];
+            }
+        }
+
+        public override Encoding Encoding { get; }
+
+        public override string FilePath { get; }
+
+        public override int Length => _length;
+
+        public override RazorSourceLineCollection Lines => _lines;
+
+        public override string RelativePath { get; }
+
+        public override void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count)
+        {
+            if (destination == null)
+            {
+                throw new ArgumentNullException(nameof(destination));
+            }
+
+            if (sourceIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(sourceIndex));
+            }
+
+            if (destinationIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(destinationIndex));
+            }
+
+            if (count < 0 || count > Length - sourceIndex || count > destination.Length - destinationIndex)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            if (count == 0)
+            {
+                return;
+            }
+
+            var chunkIndex = sourceIndex / _chunkMaxLength;
+            var insideChunkPosition = sourceIndex % _chunkMaxLength;
+            var remaining = count;
+            var currentDestIndex = destinationIndex;
+
+            while (remaining > 0)
+            {
+                var toCopy = Math.Min(remaining, _chunkMaxLength - insideChunkPosition);
+                Array.Copy(_chunks[chunkIndex], insideChunkPosition, destination, currentDestIndex, toCopy);
+
+                remaining -= toCopy;
+                currentDestIndex += toCopy;
+                chunkIndex++;
+                insideChunkPosition = 0;
+            }
+        }
+
+        public override byte[] GetChecksum()
+        {
+            if (_checksum == null)
+            {
+                var charBuffer = new char[Length];
+                CopyTo(0, charBuffer, 0, Length);
+
+                var encoder = Encoding.GetEncoder();
+                var byteCount = encoder.GetByteCount(charBuffer, 0, charBuffer.Length, flush: true);
+                var bytes = new byte[byteCount];
+                encoder.GetBytes(charBuffer, 0, charBuffer.Length, bytes, 0, flush: true);
+
+                using (var hashAlgorithm = SHA1.Create())
+                {
+                    _checksum = hashAlgorithm.ComputeHash(bytes);
+                }
+            }
+
+            var copiedChecksum = new byte[_checksum.Length];
+            _checksum.CopyTo(copiedChecksum, 0);
+
+            return copiedChecksum;
+        }
+
+        private static void ReadChunks(StreamReader reader, int chunkMaxLength, out int length, out List<char[]> chunks)
+        {
+            length = 0;
+            chunks = new List<char[]>();
+
+            int read;
+            do
+            {
+                var chunk = new char[chunkMaxLength];
+                read = reader.ReadBlock(chunk, 0, chunkMaxLength);
+
+                length += read;
+
+                if (read > 0)
+                {
+                    chunks.Add(chunk);
+                }
+            }
+            while (read == chunkMaxLength);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AcceptedCharactersInternal.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AcceptedCharactersInternal.cs
new file mode 100644
index 0000000000..9838a182b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AcceptedCharactersInternal.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    [Flags]
+    internal enum AcceptedCharactersInternal
+    {
+        None = 0,
+        NewLine = 1,
+        Whitespace = 2,
+
+        NonWhitespace = 4,
+
+        AllWhitespace = NewLine | Whitespace,
+        Any = AllWhitespace | NonWhitespace,
+
+        AnyExceptNewline = NonWhitespace | Whitespace
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs
new file mode 100644
index 0000000000..4cee1abe3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class AddImportChunkGenerator : SpanChunkGenerator
+    {
+        public AddImportChunkGenerator(string ns)
+        {
+            Namespace = ns;
+        }
+
+        public string Namespace { get; }
+
+        public override string ToString()
+        {
+            return "Import:" + Namespace + ";";
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as AddImportChunkGenerator;
+            return other != null &&
+                string.Equals(Namespace, other.Namespace, StringComparison.Ordinal);
+        }
+
+        public override int GetHashCode()
+        {
+            // Hash code should include only immutable properties.
+            return Namespace == null ? 0 : StringComparer.Ordinal.GetHashCode(Namespace);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddTagHelperChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddTagHelperChunkGenerator.cs
new file mode 100644
index 0000000000..2df86b32de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddTagHelperChunkGenerator.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class AddTagHelperChunkGenerator : SpanChunkGenerator
+    {
+        public AddTagHelperChunkGenerator(
+            string lookupText,
+            string directiveText,
+            string typePattern,
+            string assemblyName,
+            List<RazorDiagnostic> diagnostics)
+        {
+            LookupText = lookupText;
+            DirectiveText = directiveText;
+            AssemblyName = assemblyName;
+            TypePattern = typePattern;
+            Diagnostics = diagnostics;
+        }
+
+        public string LookupText { get; }
+
+        public string DirectiveText { get; set; }
+
+        public string TypePattern { get; set; }
+
+        public string AssemblyName { get; set; }
+
+        public List<RazorDiagnostic> Diagnostics { get; }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as AddTagHelperChunkGenerator;
+            return base.Equals(other) &&
+                Enumerable.SequenceEqual(Diagnostics, other.Diagnostics) &&
+                string.Equals(LookupText, other.LookupText, StringComparison.Ordinal) &&
+                string.Equals(DirectiveText, other.DirectiveText, StringComparison.Ordinal) &&
+                string.Equals(TypePattern, other.TypePattern, StringComparison.Ordinal) &&
+                string.Equals(AssemblyName, other.AssemblyName, StringComparison.Ordinal);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var combiner = HashCodeCombiner.Start();
+            combiner.Add(base.GetHashCode());
+            combiner.Add(LookupText, StringComparer.Ordinal);
+            combiner.Add(DirectiveText, StringComparer.Ordinal);
+            combiner.Add(TypePattern, StringComparer.Ordinal);
+            combiner.Add(AssemblyName, StringComparer.Ordinal);
+
+            return combiner.CombinedHash;
+        }
+
+        public override string ToString()
+        {
+            var builder = new StringBuilder("AddTagHelper:{");
+            builder.Append(LookupText);
+            builder.Append(";");
+            builder.Append(DirectiveText);
+            builder.Append(";");
+            builder.Append(TypePattern);
+            builder.Append(";");
+            builder.Append(AssemblyName);
+            builder.Append("}");
+
+            if (Diagnostics.Count > 0)
+            {
+                builder.Append(" [");
+                var ids = string.Join(", ", Diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                builder.Append(ids);
+                builder.Append("]");
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AutoCompleteEditHandler.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AutoCompleteEditHandler.cs
new file mode 100644
index 0000000000..2514377780
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AutoCompleteEditHandler.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class AutoCompleteEditHandler : SpanEditHandler
+    {
+        private static readonly int TypeHashCode = typeof(AutoCompleteEditHandler).GetHashCode();
+
+        public AutoCompleteEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer)
+            : base(tokenizer)
+        {
+        }
+
+        public AutoCompleteEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, bool autoCompleteAtEndOfSpan)
+            : this(tokenizer)
+        {
+            AutoCompleteAtEndOfSpan = autoCompleteAtEndOfSpan;
+        }
+
+        public AutoCompleteEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, AcceptedCharactersInternal accepted)
+            : base(tokenizer, accepted)
+        {
+        }
+
+        public bool AutoCompleteAtEndOfSpan { get; }
+
+        public string AutoCompleteString { get; set; }
+
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
+        {
+            if (((AutoCompleteAtEndOfSpan && IsAtEndOfSpan(target, change)) || IsAtEndOfFirstLine(target, change)) &&
+                change.IsInsert &&
+                ParserHelpers.IsNewLine(change.NewText) &&
+                AutoCompleteString != null)
+            {
+                return PartialParseResultInternal.Rejected | PartialParseResultInternal.AutoCompleteBlock;
+            }
+            return PartialParseResultInternal.Rejected;
+        }
+
+        public override string ToString()
+        {
+            return base.ToString() + ",AutoComplete:[" + (AutoCompleteString ?? "<null>") + "]" + (AutoCompleteAtEndOfSpan ? ";AtEnd" : ";AtEOL");
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as AutoCompleteEditHandler;
+            return base.Equals(other) &&
+                string.Equals(other.AutoCompleteString, AutoCompleteString, StringComparison.Ordinal) &&
+                AutoCompleteAtEndOfSpan == other.AutoCompleteAtEndOfSpan;
+        }
+
+        public override int GetHashCode()
+        {
+            // Hash code should include only immutable properties but Equals also checks the type.
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(TypeHashCode);
+            hashCodeCombiner.Add(AutoCompleteAtEndOfSpan);
+
+            return hashCodeCombiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs
new file mode 100644
index 0000000000..a5adf88a2a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    [Flags]
+    internal enum BalancingModes
+    {
+        None = 0,
+        BacktrackOnFailure = 1,
+        NoErrorOnFailure = 2,
+        AllowCommentsAndTemplates = 4,
+        AllowEmbeddedTransitions = 8
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BlockKindInternal.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BlockKindInternal.cs
new file mode 100644
index 0000000000..6c37427ca7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BlockKindInternal.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal enum BlockKindInternal
+    {
+        // We want this to match the values in BlockKind so that the values are maintained when casting.
+
+        // Code
+        Statement = 0,
+        Directive = 1,
+        Expression = 3,
+
+        // Markup
+        Markup = 5,
+        Template = 7,
+
+        // Special
+        Comment = 8,
+        Tag = 9,
+        HtmlComment = 10
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
new file mode 100644
index 0000000000..44612ee18c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -0,0 +1,2471 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class CSharpCodeParser : TokenizerBackedParser<CSharpTokenizer>
+    {
+        private static HashSet<char> InvalidNonWhitespaceNameCharacters = new HashSet<char>(new[]
+        {
+            '@', '!', '<', '/', '?', '[', '>', ']', '=', '"', '\'', '*'
+        });
+
+        private static readonly Func<SyntaxToken, bool> IsValidStatementSpacingToken =
+            IsSpacingToken(includeNewLines: true, includeComments: true);
+
+        internal static readonly DirectiveDescriptor AddTagHelperDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
+            SyntaxConstants.CSharp.AddTagHelperKeyword,
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddStringToken(Resources.AddTagHelperDirective_StringToken_Name, Resources.AddTagHelperDirective_StringToken_Description);
+                builder.Description = Resources.AddTagHelperDirective_Description;
+            });
+
+        internal static readonly DirectiveDescriptor RemoveTagHelperDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
+            SyntaxConstants.CSharp.RemoveTagHelperKeyword,
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddStringToken(Resources.RemoveTagHelperDirective_StringToken_Name, Resources.RemoveTagHelperDirective_StringToken_Description);
+                builder.Description = Resources.RemoveTagHelperDirective_Description;
+            });
+
+        internal static readonly DirectiveDescriptor TagHelperPrefixDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
+            SyntaxConstants.CSharp.TagHelperPrefixKeyword,
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddStringToken(Resources.TagHelperPrefixDirective_PrefixToken_Name, Resources.TagHelperPrefixDirective_PrefixToken_Description);
+                builder.Description = Resources.TagHelperPrefixDirective_Description;
+            });
+
+        internal static readonly IEnumerable<DirectiveDescriptor> DefaultDirectiveDescriptors = new DirectiveDescriptor[]
+        {
+        };
+
+        internal static ISet<string> DefaultKeywords = new HashSet<string>()
+        {
+            SyntaxConstants.CSharp.TagHelperPrefixKeyword,
+            SyntaxConstants.CSharp.AddTagHelperKeyword,
+            SyntaxConstants.CSharp.RemoveTagHelperKeyword,
+            "if",
+            "do",
+            "try",
+            "for",
+            "foreach",
+            "while",
+            "switch",
+            "lock",
+            "using",
+            "namespace",
+            "class",
+        };
+
+        private readonly ISet<string> CurrentKeywords = new HashSet<string>(DefaultKeywords);
+
+        private Dictionary<CSharpKeyword, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>> _keywordParserMap = new Dictionary<CSharpKeyword, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>>();
+        private Dictionary<string, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>> _directiveParserMap = new Dictionary<string, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>>(StringComparer.Ordinal);
+
+        public CSharpCodeParser(ParserContext context)
+            : this(directives: Enumerable.Empty<DirectiveDescriptor>(), context: context)
+        {
+        }
+
+        public CSharpCodeParser(IEnumerable<DirectiveDescriptor> directives, ParserContext context)
+            : base(context.ParseLeadingDirectives ? FirstDirectiveCSharpLanguageCharacteristics.Instance : CSharpLanguageCharacteristics.Instance, context)
+        {
+            if (directives == null)
+            {
+                throw new ArgumentNullException(nameof(directives));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            Keywords = new HashSet<string>();
+            SetupKeywordParsers();
+            SetupExpressionParsers();
+            SetupDirectiveParsers(directives);
+        }
+
+        public HtmlMarkupParser HtmlParser { get; set; }
+
+        protected internal ISet<string> Keywords { get; private set; }
+
+        public bool IsNested { get; set; }
+
+        public CSharpCodeBlockSyntax ParseBlock()
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            if (EndOfFile)
+            {
+                // Nothing to parse.
+                return null;
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultSpanContextConfig))
+            {
+                var builder = pooledResult.Builder;
+                try
+                {
+                    NextToken();
+
+                    // Unless changed, the block is a statement block
+                    AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                    builder.Add(OutputTokensAsStatementLiteral());
+
+                    // We are usually called when the other parser sees a transition '@'. Look for it.
+                    SyntaxToken transitionToken = null;
+                    if (At(SyntaxKind.StringLiteral) &&
+                        CurrentToken.Content.Length > 0 &&
+                        CurrentToken.Content[0] == SyntaxConstants.TransitionCharacter)
+                    {
+                        var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Transition);
+                        transitionToken = split.Item1;
+
+                        // Back up to the end of the transition
+                        Context.Source.Position -= split.Item2.Content.Length;
+                        NextToken();
+                    }
+                    else if (At(SyntaxKind.Transition))
+                    {
+                        transitionToken = EatCurrentToken();
+                    }
+
+                    if (transitionToken == null)
+                    {
+                        transitionToken = SyntaxFactory.MissingToken(SyntaxKind.Transition);
+                    }
+
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    var transition = GetNodeWithSpanContext(SyntaxFactory.CSharpTransition(transitionToken));
+
+                    if (At(SyntaxKind.LeftBrace))
+                    {
+                        var statementBody = ParseStatementBody();
+                        var statement = SyntaxFactory.CSharpStatement(transition, statementBody);
+                        builder.Add(statement);
+                    }
+                    else if (At(SyntaxKind.LeftParenthesis))
+                    {
+                        var expressionBody = ParseExplicitExpressionBody();
+                        var expression = SyntaxFactory.CSharpExplicitExpression(transition, expressionBody);
+                        builder.Add(expression);
+                    }
+                    else if (At(SyntaxKind.Identifier))
+                    {
+                        if (!TryParseDirective(builder, transition, CurrentToken.Content))
+                        {
+                            if (string.Equals(
+                                CurrentToken.Content,
+                                SyntaxConstants.CSharp.HelperKeyword,
+                                StringComparison.Ordinal))
+                            {
+                                var diagnostic = RazorDiagnosticFactory.CreateParsing_HelperDirectiveNotAvailable(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length));
+                                CurrentToken.SetDiagnostics(new[] { diagnostic });
+                                Context.ErrorSink.OnError(diagnostic);
+                            }
+
+                            var implicitExpressionBody = ParseImplicitExpressionBody();
+                            var implicitExpression = SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody);
+                            builder.Add(implicitExpression);
+                        }
+                    }
+                    else if (At(SyntaxKind.Keyword))
+                    {
+                        if (!TryParseDirective(builder, transition, CurrentToken.Content) &&
+                            !TryParseKeyword(builder, transition))
+                        {
+                            // Not a directive or a special keyword. Just parse as an implicit expression.
+                            var implicitExpressionBody = ParseImplicitExpressionBody();
+                            var implicitExpression = SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody);
+                            builder.Add(implicitExpression);
+                        }
+
+                        builder.Add(OutputTokensAsStatementLiteral());
+                    }
+                    else
+                    {
+                        // Invalid character
+                        SpanContext.ChunkGenerator = new ExpressionChunkGenerator();
+                        SpanContext.EditHandler = new ImplicitExpressionEditHandler(
+                            Language.TokenizeString,
+                            CurrentKeywords,
+                            acceptTrailingDot: IsNested)
+                        {
+                            AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace
+                        };
+
+                        AcceptMarkerTokenIfNecessary();
+                        var expressionLiteral = SyntaxFactory.CSharpCodeBlock(OutputTokensAsExpressionLiteral());
+                        var expressionBody = SyntaxFactory.CSharpImplicitExpressionBody(expressionLiteral);
+                        var expressionBlock = SyntaxFactory.CSharpImplicitExpression(transition, expressionBody);
+                        builder.Add(expressionBlock);
+
+                        if (At(SyntaxKind.Whitespace) || At(SyntaxKind.NewLine))
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedWhiteSpaceAtStartOfCodeBlock(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                        }
+                        else if (EndOfFile)
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedEndOfFileAtStartOfCodeBlock(
+                                    new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
+                        }
+                        else
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedCharacterAtStartOfCodeBlock(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length),
+                                    CurrentToken.Content));
+                        }
+                    }
+
+                    Debug.Assert(TokenBuilder.Count == 0, "We should not have any tokens left.");
+
+                    var codeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+                    return codeBlock;
+                }
+                finally
+                {
+                    // Always put current character back in the buffer for the next parser.
+                    PutCurrentBack();
+                }
+            }
+        }
+
+        private CSharpExplicitExpressionBodySyntax ParseExplicitExpressionBody()
+        {
+            var block = new Block(Resources.BlockName_ExplicitExpression, CurrentStart);
+            Assert(SyntaxKind.LeftParenthesis);
+            var leftParenToken = EatCurrentToken();
+            var leftParen = OutputAsMetaCode(leftParenToken);
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var expressionBuilder = pooledResult.Builder;
+                using (PushSpanContextConfig(ExplicitExpressionSpanContextConfig))
+                {
+                    var success = Balance(
+                        expressionBuilder,
+                        BalancingModes.BacktrackOnFailure |
+                            BalancingModes.NoErrorOnFailure |
+                            BalancingModes.AllowCommentsAndTemplates,
+                        SyntaxKind.LeftParenthesis,
+                        SyntaxKind.RightParenthesis,
+                        block.Start);
+
+                    if (!success)
+                    {
+                        AcceptUntil(SyntaxKind.LessThan);
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                                new SourceSpan(block.Start, contentLength: 1 /* ( */), block.Name, ")", "("));
+                    }
+
+                    // If necessary, put an empty-content marker token here
+                    AcceptMarkerTokenIfNecessary();
+                    expressionBuilder.Add(OutputTokensAsExpressionLiteral());
+                }
+
+                var expressionBlock = SyntaxFactory.CSharpCodeBlock(expressionBuilder.ToList());
+
+                RazorMetaCodeSyntax rightParen = null;
+                if (At(SyntaxKind.RightParenthesis))
+                {
+                    rightParen = OutputAsMetaCode(EatCurrentToken());
+                }
+                else
+                {
+                    var missingToken = SyntaxFactory.MissingToken(SyntaxKind.RightParenthesis);
+                    rightParen = OutputAsMetaCode(missingToken, SpanContext.EditHandler.AcceptedCharacters);
+                }
+                if (!EndOfFile)
+                {
+                    PutCurrentBack();
+                }
+
+                return SyntaxFactory.CSharpExplicitExpressionBody(leftParen, expressionBlock, rightParen);
+            }
+        }
+
+        private CSharpImplicitExpressionBodySyntax ParseImplicitExpressionBody(bool async = false)
+        {
+            var accepted = AcceptedCharactersInternal.NonWhitespace;
+            if (async)
+            {
+                // Async implicit expressions include the "await" keyword and therefore need to allow spaces to
+                // separate the "await" and the following code.
+                accepted = AcceptedCharactersInternal.AnyExceptNewline;
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var expressionBuilder = pooledResult.Builder;
+                ParseImplicitExpression(expressionBuilder, accepted);
+                var codeBlock = SyntaxFactory.CSharpCodeBlock(expressionBuilder.ToList());
+                return SyntaxFactory.CSharpImplicitExpressionBody(codeBlock);
+            }
+        }
+
+        private void ParseImplicitExpression(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal acceptedCharacters)
+        {
+            using (PushSpanContextConfig(spanContext =>
+            {
+                spanContext.EditHandler = new ImplicitExpressionEditHandler(
+                    Language.TokenizeString,
+                    Keywords,
+                    acceptTrailingDot: IsNested);
+                spanContext.EditHandler.AcceptedCharacters = acceptedCharacters;
+                spanContext.ChunkGenerator = new ExpressionChunkGenerator();
+            }))
+            {
+                do
+                {
+                    if (AtIdentifier(allowKeywords: true))
+                    {
+                        AcceptAndMoveNext();
+                    }
+                }
+                while (ParseMethodCallOrArrayIndex(builder, acceptedCharacters));
+
+                PutCurrentBack();
+                builder.Add(OutputTokensAsExpressionLiteral());
+            }
+        }
+
+        private bool ParseMethodCallOrArrayIndex(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal acceptedCharacters)
+        {
+            if (!EndOfFile)
+            {
+                if (CurrentToken.Kind == SyntaxKind.LeftParenthesis ||
+                    CurrentToken.Kind == SyntaxKind.LeftBracket)
+                {
+                    // If we end within "(", whitespace is fine
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+
+                    SyntaxKind right;
+                    bool success;
+
+                    using (PushSpanContextConfig((spanContext, prev) =>
+                    {
+                        prev(spanContext);
+                        spanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                    }))
+                    {
+                        right = Language.FlipBracket(CurrentToken.Kind);
+                        success = Balance(builder, BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates);
+                    }
+
+                    if (!success)
+                    {
+                        AcceptUntil(SyntaxKind.LessThan);
+                    }
+                    if (At(right))
+                    {
+                        AcceptAndMoveNext();
+
+                        // At the ending brace, restore the initial accepted characters.
+                        SpanContext.EditHandler.AcceptedCharacters = acceptedCharacters;
+                    }
+                    return ParseMethodCallOrArrayIndex(builder, acceptedCharacters);
+                }
+                if (At(SyntaxKind.QuestionMark))
+                {
+                    var next = Lookahead(count: 1);
+
+                    if (next != null)
+                    {
+                        if (next.Kind == SyntaxKind.Dot)
+                        {
+                            // Accept null conditional dot operator (?.).
+                            AcceptAndMoveNext();
+                            AcceptAndMoveNext();
+
+                            // If the next piece after the ?. is a keyword or identifier then we want to continue.
+                            return At(SyntaxKind.Identifier) || At(SyntaxKind.Keyword);
+                        }
+                        else if (next.Kind == SyntaxKind.LeftBracket)
+                        {
+                            // We're at the ? for a null conditional bracket operator (?[).
+                            AcceptAndMoveNext();
+
+                            // Accept the [ and any content inside (it will attempt to balance).
+                            return ParseMethodCallOrArrayIndex(builder, acceptedCharacters);
+                        }
+                    }
+                }
+                else if (At(SyntaxKind.Dot))
+                {
+                    var dot = CurrentToken;
+                    if (NextToken())
+                    {
+                        if (At(SyntaxKind.Identifier) || At(SyntaxKind.Keyword))
+                        {
+                            // Accept the dot and return to the start
+                            Accept(dot);
+                            return true; // continue
+                        }
+                        else
+                        {
+                            // Put the token back
+                            PutCurrentBack();
+                        }
+                    }
+                    if (!IsNested)
+                    {
+                        // Put the "." back
+                        PutBack(dot);
+                    }
+                    else
+                    {
+                        Accept(dot);
+                    }
+                }
+                else if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
+                {
+                    PutCurrentBack();
+                }
+            }
+
+            // Implicit Expression is complete
+            return false;
+        }
+
+        private CSharpStatementBodySyntax ParseStatementBody(Block block = null)
+        {
+            Assert(SyntaxKind.LeftBrace);
+            block = block ?? new Block(Resources.BlockName_Code, CurrentStart);
+            var leftBrace = OutputAsMetaCode(EatExpectedToken(SyntaxKind.LeftBrace));
+            CSharpCodeBlockSyntax codeBlock = null;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var builder = pooledResult.Builder;
+                // Set up auto-complete and parse the code block
+                var editHandler = new AutoCompleteEditHandler(Language.TokenizeString);
+                SpanContext.EditHandler = editHandler;
+                ParseCodeBlock(builder, block, acceptTerminatingBrace: false);
+
+                EnsureCurrent();
+                SpanContext.ChunkGenerator = new StatementChunkGenerator();
+                AcceptMarkerTokenIfNecessary();
+                if (!At(SyntaxKind.RightBrace))
+                {
+                    editHandler.AutoCompleteString = "}";
+                }
+                builder.Add(OutputTokensAsStatementLiteral());
+
+                codeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+            }
+
+            RazorMetaCodeSyntax rightBrace = null;
+            if (At(SyntaxKind.RightBrace))
+            {
+                rightBrace = OutputAsMetaCode(EatCurrentToken());
+            }
+            else
+            {
+                rightBrace = OutputAsMetaCode(
+                    SyntaxFactory.MissingToken(SyntaxKind.RightBrace),
+                    SpanContext.EditHandler.AcceptedCharacters);
+            }
+
+            if (!IsNested)
+            {
+                EnsureCurrent();
+                if (At(SyntaxKind.NewLine) ||
+                    (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine)))
+                {
+                    Context.NullGenerateWhitespaceAndNewLine = true;
+                }
+            }
+
+            return SyntaxFactory.CSharpStatementBody(leftBrace, codeBlock, rightBrace);
+        }
+
+        private void ParseCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block, bool acceptTerminatingBrace = true)
+        {
+            EnsureCurrent();
+            while (!EndOfFile && !At(SyntaxKind.RightBrace))
+            {
+                // Parse a statement, then return here
+                ParseStatement(builder, block: block);
+                EnsureCurrent();
+            }
+
+            if (EndOfFile)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                        new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
+            }
+            else if (acceptTerminatingBrace)
+            {
+                Assert(SyntaxKind.RightBrace);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                AcceptAndMoveNext();
+            }
+        }
+
+        private void ParseStatement(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
+        {
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            // Accept whitespace but always keep the last whitespace node so we can put it back if necessary
+            var lastWhitespace = AcceptWhitespaceInLines();
+            if (EndOfFile)
+            {
+                if (lastWhitespace != null)
+                {
+                    Accept(lastWhitespace);
+                }
+
+                builder.Add(OutputTokensAsStatementLiteral());
+                return;
+            }
+
+            var kind = CurrentToken.Kind;
+            var location = CurrentStart;
+
+            // Both cases @: and @:: are triggered as markup, second colon in second case will be triggered as a plain text
+            var isSingleLineMarkup = kind == SyntaxKind.Transition &&
+                (NextIs(SyntaxKind.Colon, SyntaxKind.DoubleColon));
+
+            var isMarkup = isSingleLineMarkup ||
+                kind == SyntaxKind.LessThan ||
+                (kind == SyntaxKind.Transition && NextIs(SyntaxKind.LessThan));
+
+            if (Context.DesignTimeMode || !isMarkup)
+            {
+                // CODE owns whitespace, MARKUP owns it ONLY in DesignTimeMode.
+                if (lastWhitespace != null)
+                {
+                    Accept(lastWhitespace);
+                }
+            }
+            else
+            {
+                var nextToken = Lookahead(1);
+
+                // MARKUP owns whitespace EXCEPT in DesignTimeMode.
+                PutCurrentBack();
+
+                // Put back the whitespace unless it precedes a '<text>' tag.
+                if (nextToken != null &&
+                    !string.Equals(nextToken.Content, SyntaxConstants.TextTagName, StringComparison.Ordinal))
+                {
+                    PutBack(lastWhitespace);
+                }
+                else
+                {
+                    // If it precedes a '<text>' tag, it should be accepted as code.
+                    Accept(lastWhitespace);
+                }
+            }
+
+            if (isMarkup)
+            {
+                if (kind == SyntaxKind.Transition && !isSingleLineMarkup)
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart(
+                            new SourceSpan(location, contentLength: 1 /* @ */)));
+                }
+
+                // Markup block
+                builder.Add(OutputTokensAsStatementLiteral());
+                if (Context.DesignTimeMode && CurrentToken != null &&
+                    (CurrentToken.Kind == SyntaxKind.LessThan || CurrentToken.Kind == SyntaxKind.Transition))
+                {
+                    PutCurrentBack();
+                }
+                OtherParserBlock(builder);
+            }
+            else
+            {
+                // What kind of statement is this?
+                switch (kind)
+                {
+                    case SyntaxKind.RazorCommentTransition:
+                        AcceptMarkerTokenIfNecessary();
+                        builder.Add(OutputTokensAsStatementLiteral());
+                        var comment = ParseRazorComment();
+                        builder.Add(comment);
+                        ParseStatement(builder, block);
+                        break;
+                    case SyntaxKind.LeftBrace:
+                        // Verbatim Block
+                        AcceptAndMoveNext();
+                        ParseCodeBlock(builder, block);
+                        break;
+                    case SyntaxKind.Keyword:
+                        if (!TryParseKeyword(builder, transition: null))
+                        {
+                            ParseStandardStatement(builder);
+                        }
+                        break;
+                    case SyntaxKind.Transition:
+                        // Embedded Expression block
+                        ParseEmbeddedExpression(builder);
+                        break;
+                    case SyntaxKind.RightBrace:
+                        // Possible end of Code Block, just run the continuation
+                        break;
+                    case SyntaxKind.CSharpComment:
+                        Accept(CurrentToken);
+                        NextToken();
+                        break;
+                    default:
+                        // Other statement
+                        ParseStandardStatement(builder);
+                        break;
+                }
+            }
+        }
+
+        private void ParseEmbeddedExpression(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // First, verify the type of the block
+            Assert(SyntaxKind.Transition);
+            var transition = CurrentToken;
+            NextToken();
+
+            if (At(SyntaxKind.Transition))
+            {
+                // Escaped "@"
+                builder.Add(OutputTokensAsStatementLiteral());
+
+                // Output "@" as hidden span
+                Accept(transition);
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputTokensAsEphemeralLiteral());
+
+                Assert(SyntaxKind.Transition);
+                AcceptAndMoveNext();
+                ParseStandardStatement(builder);
+            }
+            else
+            {
+                // Throw errors as necessary, but continue parsing
+                if (At(SyntaxKind.LeftBrace))
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_UnexpectedNestedCodeBlock(
+                            new SourceSpan(CurrentStart, contentLength: 1 /* { */)));
+                }
+
+                // @( or @foo - Nested expression, parse a child block
+                PutCurrentBack();
+                PutBack(transition);
+
+                // Before exiting, add a marker span if necessary
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputTokensAsStatementLiteral());
+
+                var nestedBlock = ParseNestedBlock();
+                builder.Add(nestedBlock);
+            }
+        }
+
+        private RazorSyntaxNode ParseNestedBlock()
+        {
+            var wasNested = IsNested;
+            IsNested = true;
+
+            RazorSyntaxNode nestedBlock;
+            using (PushSpanContextConfig())
+            {
+                nestedBlock = ParseBlock();
+            }
+
+            InitializeContext(SpanContext);
+            IsNested = wasNested;
+            NextToken();
+
+            return nestedBlock;
+        }
+
+        private void ParseStandardStatement(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            while (!EndOfFile)
+            {
+                var bookmark = CurrentStart.AbsoluteIndex;
+                var read = ReadWhile(token =>
+                    token.Kind != SyntaxKind.Semicolon &&
+                    token.Kind != SyntaxKind.RazorCommentTransition &&
+                    token.Kind != SyntaxKind.Transition &&
+                    token.Kind != SyntaxKind.LeftBrace &&
+                    token.Kind != SyntaxKind.LeftParenthesis &&
+                    token.Kind != SyntaxKind.LeftBracket &&
+                    token.Kind != SyntaxKind.RightBrace);
+
+                if (At(SyntaxKind.LeftBrace) ||
+                    At(SyntaxKind.LeftParenthesis) ||
+                    At(SyntaxKind.LeftBracket))
+                {
+                    Accept(read);
+                    if (Balance(builder, BalancingModes.AllowCommentsAndTemplates | BalancingModes.BacktrackOnFailure))
+                    {
+                        TryAccept(SyntaxKind.RightBrace);
+                    }
+                    else
+                    {
+                        // Recovery
+                        AcceptUntil(SyntaxKind.LessThan, SyntaxKind.RightBrace);
+                        return;
+                    }
+                }
+                else if (At(SyntaxKind.Transition) && (NextIs(SyntaxKind.LessThan, SyntaxKind.Colon)))
+                {
+                    Accept(read);
+                    builder.Add(OutputTokensAsStatementLiteral());
+                    ParseTemplate(builder);
+                }
+                else if (At(SyntaxKind.RazorCommentTransition))
+                {
+                    Accept(read);
+                    AcceptMarkerTokenIfNecessary();
+                    builder.Add(OutputTokensAsStatementLiteral());
+                    builder.Add(ParseRazorComment());
+                }
+                else if (At(SyntaxKind.Semicolon))
+                {
+                    Accept(read);
+                    AcceptAndMoveNext();
+                    return;
+                }
+                else if (At(SyntaxKind.RightBrace))
+                {
+                    Accept(read);
+                    return;
+                }
+                else
+                {
+                    Context.Source.Position = bookmark;
+                    NextToken();
+                    AcceptUntil(SyntaxKind.LessThan, SyntaxKind.LeftBrace, SyntaxKind.RightBrace);
+                    return;
+                }
+            }
+        }
+
+        private void ParseTemplate(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (Context.InTemplateContext)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_InlineMarkupBlocksCannotBeNested(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* @ */)));
+            }
+            if (SpanContext.ChunkGenerator is ExpressionChunkGenerator)
+            {
+                builder.Add(OutputTokensAsExpressionLiteral());
+            }
+            else
+            {
+                builder.Add(OutputTokensAsStatementLiteral());
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var templateBuilder = pooledResult.Builder;
+                Context.InTemplateContext = true;
+                PutCurrentBack();
+                OtherParserBlock(templateBuilder);
+
+                var template = SyntaxFactory.CSharpTemplateBlock(templateBuilder.ToList());
+                builder.Add(template);
+
+                Context.InTemplateContext = false;
+            }
+        }
+
+        protected bool TryParseDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, string directive)
+        {
+            if (_directiveParserMap.TryGetValue(directive, out var handler))
+            {
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                handler(builder, transition);
+                return true;
+            }
+
+            return false;
+        }
+
+        private void SetupDirectiveParsers(IEnumerable<DirectiveDescriptor> directiveDescriptors)
+        {
+            var allDirectives = directiveDescriptors.Concat(DefaultDirectiveDescriptors).ToList();
+
+            for (var i = 0; i < allDirectives.Count; i++)
+            {
+                var directiveDescriptor = allDirectives[i];
+                CurrentKeywords.Add(directiveDescriptor.Directive);
+                MapDirectives((builder, transition) => ParseExtensibleDirective(builder, transition, directiveDescriptor), directiveDescriptor.Directive);
+            }
+
+            MapDirectives(ParseTagHelperPrefixDirective, SyntaxConstants.CSharp.TagHelperPrefixKeyword);
+            MapDirectives(ParseAddTagHelperDirective, SyntaxConstants.CSharp.AddTagHelperKeyword);
+            MapDirectives(ParseRemoveTagHelperDirective, SyntaxConstants.CSharp.RemoveTagHelperKeyword);
+        }
+
+        private void EnsureDirectiveIsAtStartOfLine()
+        {
+            // 1 is the offset of the @ transition for the directive.
+            if (CurrentStart.CharacterIndex > 1)
+            {
+                var index = CurrentStart.AbsoluteIndex - 1;
+                var lineStart = CurrentStart.AbsoluteIndex - CurrentStart.CharacterIndex;
+                while (--index >= lineStart)
+                {
+                    var @char = Context.SourceDocument[index];
+
+                    if (!char.IsWhiteSpace(@char))
+                    {
+                        var currentDirective = CurrentToken.Content;
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_DirectiveMustAppearAtStartOfLine(
+                                new SourceSpan(CurrentStart, currentDirective.Length), currentDirective));
+                        break;
+                    }
+                }
+            }
+        }
+
+        protected void MapDirectives(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, params string[] directives)
+        {
+            foreach (var directive in directives)
+            {
+                _directiveParserMap.Add(directive, (builder, transition) =>
+                {
+                    handler(builder, transition);
+                    Context.SeenDirectives.Add(directive);
+                });
+
+                Keywords.Add(directive);
+
+                // These C# keywords are reserved for use in directives. It's an error to use them outside of
+                // a directive. This code removes the error generation if the directive *is* registered.
+                if (string.Equals(directive, "class", StringComparison.OrdinalIgnoreCase))
+                {
+                    _keywordParserMap.Remove(CSharpKeyword.Class);
+                }
+                else if (string.Equals(directive, "namespace", StringComparison.OrdinalIgnoreCase))
+                {
+                    _keywordParserMap.Remove(CSharpKeyword.Namespace);
+                }
+            }
+        }
+
+        private void ParseTagHelperPrefixDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            RazorDiagnostic duplicateDiagnostic = null;
+            if (Context.SeenDirectives.Contains(SyntaxConstants.CSharp.TagHelperPrefixKeyword))
+            {
+                var directiveStart = CurrentStart;
+                if (transition != null)
+                {
+                    // Start the error from the Transition '@'.
+                    directiveStart = new SourceLocation(
+                        directiveStart.FilePath,
+                        directiveStart.AbsoluteIndex - 1,
+                        directiveStart.LineIndex,
+                        directiveStart.CharacterIndex - 1);
+                }
+                var errorLength = /* @ */ 1 + SyntaxConstants.CSharp.TagHelperPrefixKeyword.Length;
+                duplicateDiagnostic = RazorDiagnosticFactory.CreateParsing_DuplicateDirective(
+                    new SourceSpan(directiveStart, errorLength),
+                    SyntaxConstants.CSharp.TagHelperPrefixKeyword);
+            }
+
+            var directiveBody = ParseTagHelperDirective(
+                SyntaxConstants.CSharp.TagHelperPrefixKeyword,
+                (prefix, errors, startLocation) =>
+                {
+                    if (duplicateDiagnostic != null)
+                    {
+                        errors.Add(duplicateDiagnostic);
+                    }
+
+                    var parsedDirective = ParseDirective(prefix, startLocation, TagHelperDirectiveType.TagHelperPrefix, errors);
+
+                    return new TagHelperPrefixDirectiveChunkGenerator(
+                        prefix,
+                        parsedDirective.DirectiveText,
+                        errors);
+                });
+
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        private void ParseAddTagHelperDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var directiveBody = ParseTagHelperDirective(
+                SyntaxConstants.CSharp.AddTagHelperKeyword,
+                (lookupText, errors, startLocation) =>
+                {
+                    var parsedDirective = ParseDirective(lookupText, startLocation, TagHelperDirectiveType.AddTagHelper, errors);
+
+                    return new AddTagHelperChunkGenerator(
+                        lookupText,
+                        parsedDirective.DirectiveText,
+                        parsedDirective.TypePattern,
+                        parsedDirective.AssemblyName,
+                        errors);
+                });
+
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        private void ParseRemoveTagHelperDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var directiveBody = ParseTagHelperDirective(
+                SyntaxConstants.CSharp.RemoveTagHelperKeyword,
+                (lookupText, errors, startLocation) =>
+                {
+                    var parsedDirective = ParseDirective(lookupText, startLocation, TagHelperDirectiveType.RemoveTagHelper, errors);
+
+                    return new RemoveTagHelperChunkGenerator(
+                        lookupText,
+                        parsedDirective.DirectiveText,
+                        parsedDirective.TypePattern,
+                        parsedDirective.AssemblyName,
+                        errors);
+                });
+
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        [Conditional("DEBUG")]
+        protected void AssertDirective(string directive)
+        {
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Identifier || CurrentToken.Kind == SyntaxKind.Keyword);
+            Debug.Assert(string.Equals(CurrentToken.Content, directive, StringComparison.Ordinal));
+        }
+
+        private RazorDirectiveBodySyntax ParseTagHelperDirective(
+            string keyword,
+            Func<string, List<RazorDiagnostic>, SourceLocation, ISpanChunkGenerator> chunkGeneratorFactory)
+        {
+            AssertDirective(keyword);
+
+            var savedErrorSink = Context.ErrorSink;
+            var directiveErrorSink = new ErrorSink();
+            RazorMetaCodeSyntax keywordBlock = null;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var directiveBuilder = pooledResult.Builder;
+                Context.ErrorSink = directiveErrorSink;
+
+                string directiveValue = null;
+                SourceLocation? valueStartLocation = null;
+                try
+                {
+                    EnsureDirectiveIsAtStartOfLine();
+
+                    var keywordStartLocation = CurrentStart;
+
+                    // Accept the directive name
+                    var keywordToken = EatCurrentToken();
+                    var keywordLength = keywordToken.FullWidth + 1 /* @ */;
+
+                    var foundWhitespace = At(SyntaxKind.Whitespace);
+
+                    // If we found whitespace then any content placed within the whitespace MAY cause a destructive change
+                    // to the document.  We can't accept it.
+                    var acceptedCharacters = foundWhitespace ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.AnyExceptNewline;
+                    Accept(keywordToken);
+                    keywordBlock = OutputAsMetaCode(Output(), acceptedCharacters);
+
+                    AcceptWhile(SyntaxKind.Whitespace);
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    SpanContext.EditHandler.AcceptedCharacters = acceptedCharacters;
+                    directiveBuilder.Add(OutputAsMarkupLiteral());
+
+                    if (EndOfFile || At(SyntaxKind.NewLine))
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_DirectiveMustHaveValue(
+                                new SourceSpan(keywordStartLocation, keywordLength), keyword));
+
+                        directiveValue = string.Empty;
+                    }
+                    else
+                    {
+                        // Need to grab the current location before we accept until the end of the line.
+                        valueStartLocation = CurrentStart;
+
+                        // Parse to the end of the line. Essentially accepts anything until end of line, comments, invalid code
+                        // etc.
+                        AcceptUntil(SyntaxKind.NewLine);
+
+                        // Pull out the value and remove whitespaces and optional quotes
+                        var rawValue = string.Concat(TokenBuilder.ToList().Nodes.Select(s => s.Content)).Trim();
+
+                        var startsWithQuote = rawValue.StartsWith("\"", StringComparison.Ordinal);
+                        var endsWithQuote = rawValue.EndsWith("\"", StringComparison.Ordinal);
+                        if (startsWithQuote != endsWithQuote)
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_IncompleteQuotesAroundDirective(
+                                    new SourceSpan(valueStartLocation.Value, rawValue.Length), keyword));
+                        }
+
+                        directiveValue = rawValue;
+                    }
+                }
+                finally
+                {
+                    SpanContext.ChunkGenerator = chunkGeneratorFactory(
+                        directiveValue,
+                        directiveErrorSink.Errors.ToList(),
+                        valueStartLocation ?? CurrentStart);
+                    Context.ErrorSink = savedErrorSink;
+                }
+
+                // Finish the block and output the tokens
+                CompleteBlock();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline;
+
+                directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                var directiveCodeBlock = SyntaxFactory.CSharpCodeBlock(directiveBuilder.ToList());
+
+                return SyntaxFactory.RazorDirectiveBody(keywordBlock, directiveCodeBlock);
+            }
+        }
+
+        private ParsedDirective ParseDirective(
+            string directiveText,
+            SourceLocation directiveLocation,
+            TagHelperDirectiveType directiveType,
+            List<RazorDiagnostic> errors)
+        {
+            var offset = 0;
+            directiveText = directiveText.Trim();
+            if (directiveText.Length >= 2 &&
+                directiveText.StartsWith("\"", StringComparison.Ordinal) &&
+                directiveText.EndsWith("\"", StringComparison.Ordinal))
+            {
+                directiveText = directiveText.Substring(1, directiveText.Length - 2);
+                if (string.IsNullOrEmpty(directiveText))
+                {
+                    offset = 1;
+                }
+            }
+
+            // If this is the "string literal" form of a directive, we'll need to postprocess the location
+            // and content.
+            //
+            // Ex: @addTagHelper "*, Microsoft.AspNetCore.CoolLibrary"
+            //                    ^                                 ^
+            //                  Start                              End
+            if (TokenBuilder.Count == 1 &&
+                TokenBuilder[0] is SyntaxToken token &&
+                token.Kind == SyntaxKind.StringLiteral)
+            {
+                offset += token.Content.IndexOf(directiveText, StringComparison.Ordinal);
+
+                // This is safe because inside one of these directives all of the text needs to be on the
+                // same line.
+                var original = directiveLocation;
+                directiveLocation = new SourceLocation(
+                    original.FilePath,
+                    original.AbsoluteIndex + offset,
+                    original.LineIndex,
+                    original.CharacterIndex + offset);
+            }
+
+            var parsedDirective = new ParsedDirective()
+            {
+                DirectiveText = directiveText
+            };
+
+            if (directiveType == TagHelperDirectiveType.TagHelperPrefix)
+            {
+                ValidateTagHelperPrefix(parsedDirective.DirectiveText, directiveLocation, errors);
+
+                return parsedDirective;
+            }
+
+            return ParseAddOrRemoveDirective(parsedDirective, directiveLocation, errors);
+        }
+
+        // Internal for testing.
+        internal ParsedDirective ParseAddOrRemoveDirective(ParsedDirective directive, SourceLocation directiveLocation, List<RazorDiagnostic> errors)
+        {
+            var text = directive.DirectiveText;
+            var lookupStrings = text?.Split(new[] { ',' });
+
+            // Ensure that we have valid lookupStrings to work with. The valid format is "typeName, assemblyName"
+            if (lookupStrings == null ||
+                lookupStrings.Any(string.IsNullOrWhiteSpace) ||
+                lookupStrings.Length != 2 ||
+                text.StartsWith("'") ||
+                text.EndsWith("'"))
+            {
+                errors.Add(
+                    RazorDiagnosticFactory.CreateParsing_InvalidTagHelperLookupText(
+                        new SourceSpan(directiveLocation, Math.Max(text.Length, 1)), text));
+
+                return directive;
+            }
+
+            var trimmedAssemblyName = lookupStrings[1].Trim();
+
+            // + 1 is for the comma separator in the lookup text.
+            var assemblyNameIndex =
+                lookupStrings[0].Length + 1 + lookupStrings[1].IndexOf(trimmedAssemblyName, StringComparison.Ordinal);
+            var assemblyNamePrefix = directive.DirectiveText.Substring(0, assemblyNameIndex);
+
+            directive.TypePattern = lookupStrings[0].Trim();
+            directive.AssemblyName = trimmedAssemblyName;
+
+            return directive;
+        }
+
+        // Internal for testing.
+        internal void ValidateTagHelperPrefix(
+            string prefix,
+            SourceLocation directiveLocation,
+            List<RazorDiagnostic> diagnostics)
+        {
+            foreach (var character in prefix)
+            {
+                // Prefixes are correlated with tag names, tag names cannot have whitespace.
+                if (char.IsWhiteSpace(character) || InvalidNonWhitespaceNameCharacters.Contains(character))
+                {
+                    diagnostics.Add(
+                        RazorDiagnosticFactory.CreateParsing_InvalidTagHelperPrefixValue(
+                            new SourceSpan(directiveLocation, prefix.Length),
+                            SyntaxConstants.CSharp.TagHelperPrefixKeyword,
+                            character,
+                            prefix));
+
+                    return;
+                }
+            }
+        }
+
+        private void ParseExtensibleDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, DirectiveDescriptor descriptor)
+        {
+            AssertDirective(descriptor.Directive);
+
+            var directiveErrorSink = new ErrorSink();
+            var savedErrorSink = Context.ErrorSink;
+            Context.ErrorSink = directiveErrorSink;
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var directiveBuilder = pooledResult.Builder;
+                RazorMetaCodeSyntax keywordBlock = null;
+
+                try
+                {
+                    EnsureDirectiveIsAtStartOfLine();
+                    var directiveStart = CurrentStart;
+                    if (transition != null)
+                    {
+                        // Start the error from the Transition '@'.
+                        directiveStart = new SourceLocation(
+                            directiveStart.FilePath,
+                            directiveStart.AbsoluteIndex - 1,
+                            directiveStart.LineIndex,
+                            directiveStart.CharacterIndex - 1);
+                    }
+
+                    AcceptAndMoveNext();
+                    keywordBlock = OutputAsMetaCode(Output());
+
+                    // Even if an error was logged do not bail out early. If a directive was used incorrectly it doesn't mean it can't be parsed.
+                    ValidateDirectiveUsage(descriptor, directiveStart);
+
+                    for (var i = 0; i < descriptor.Tokens.Count; i++)
+                    {
+                        if (!At(SyntaxKind.Whitespace) &&
+                            !At(SyntaxKind.NewLine) &&
+                            !EndOfFile)
+                        {
+                            // This case should never happen in a real scenario. We're just being defensive.
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_DirectiveTokensMustBeSeparatedByWhitespace(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+
+                            builder.Add(BuildDirective());
+                            return;
+                        }
+
+                        var tokenDescriptor = descriptor.Tokens[i];
+                        AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+                        if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
+                            tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
+                            tokenDescriptor.Kind == DirectiveTokenKind.Type)
+                        {
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputTokensAsStatementLiteral());
+
+                            if (EndOfFile || At(SyntaxKind.NewLine))
+                            {
+                                // Add a marker token to provide CSharp intellisense when we start typing the directive token.
+                                AcceptMarkerTokenIfNecessary();
+                                SpanContext.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
+                                SpanContext.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+                                directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                            }
+                        }
+                        else
+                        {
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
+                        }
+
+                        if (tokenDescriptor.Optional && (EndOfFile || At(SyntaxKind.NewLine)))
+                        {
+                            break;
+                        }
+                        else if (EndOfFile)
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
+                                    new SourceSpan(CurrentStart, contentLength: 1),
+                                    descriptor.Directive,
+                                    tokenDescriptor.Kind.ToString().ToLowerInvariant()));
+                            builder.Add(BuildDirective());
+                            return;
+                        }
+
+                        switch (tokenDescriptor.Kind)
+                        {
+                            case DirectiveTokenKind.Type:
+                                if (!TryParseNamespaceOrTypeName(directiveBuilder))
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsTypeName(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
+                            case DirectiveTokenKind.Namespace:
+                                if (!TryParseQualifiedIdentifier(out var identifierLength))
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsNamespace(
+                                            new SourceSpan(CurrentStart, identifierLength), descriptor.Directive));
+
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
+                            case DirectiveTokenKind.Member:
+                                if (At(SyntaxKind.Identifier))
+                                {
+                                    AcceptAndMoveNext();
+                                }
+                                else
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsIdentifier(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
+                            case DirectiveTokenKind.String:
+                                if (At(SyntaxKind.StringLiteral) && !CurrentToken.ContainsDiagnostics)
+                                {
+                                    AcceptAndMoveNext();
+                                }
+                                else
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsQuotedStringLiteral(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+                        }
+
+                        SpanContext.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
+                        SpanContext.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+                        directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                    }
+
+                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+                    switch (descriptor.Kind)
+                    {
+                        case DirectiveKind.SingleLine:
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputTokensAsUnclassifiedLiteral());
+
+                            TryAccept(SyntaxKind.Semicolon);
+                            directiveBuilder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Whitespace));
+
+                            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+                            if (At(SyntaxKind.NewLine))
+                            {
+                                AcceptAndMoveNext();
+                            }
+                            else if (!EndOfFile)
+                            {
+                                Context.ErrorSink.OnError(
+                                    RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral(
+                                        new SourceSpan(CurrentStart, CurrentToken.Content.Length),
+                                        descriptor.Directive,
+                                        Resources.ErrorComponent_Newline));
+                            }
+
+
+                            // This should contain the optional whitespace after the optional semicolon and the new line.
+                            // Output as Markup as we want intellisense here.
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
+                            break;
+                        case DirectiveKind.RazorBlock:
+                            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
+                            directiveBuilder.Add(OutputAsMarkupLiteral());
+
+                            ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
+                            {
+                                // When transitioning to the HTML parser we no longer want to act as if we're in a nested C# state.
+                                // For instance, if <div>@hello.</div> is in a nested C# block we don't want the trailing '.' to be handled
+                                // as C#; it should be handled as a period because it's wrapped in markup.
+                                var wasNested = IsNested;
+                                IsNested = false;
+
+                                using (PushSpanContextConfig())
+                                {
+                                    var razorBlock = HtmlParser.ParseRazorBlock(Tuple.Create("{", "}"), caseSensitive: true);
+                                    directiveBuilder.Add(razorBlock);
+                                }
+
+                                InitializeContext(SpanContext);
+                                IsNested = wasNested;
+                                NextToken();
+                            });
+                            break;
+                        case DirectiveKind.CodeBlock:
+                            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
+                            directiveBuilder.Add(OutputAsMarkupLiteral());
+
+                            ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
+                            {
+                                NextToken();
+                                Balance(childBuilder, BalancingModes.NoErrorOnFailure, SyntaxKind.LeftBrace, SyntaxKind.RightBrace, startingBraceLocation);
+                                SpanContext.ChunkGenerator = new StatementChunkGenerator();
+                                var existingEditHandler = SpanContext.EditHandler;
+                                SpanContext.EditHandler = new CodeBlockEditHandler(Language.TokenizeString);
+
+                                AcceptMarkerTokenIfNecessary();
+
+                                childBuilder.Add(OutputTokensAsStatementLiteral());
+
+                                SpanContext.EditHandler = existingEditHandler;
+                            });
+                            break;
+                    }
+                }
+                finally
+                {
+                    Context.ErrorSink = savedErrorSink;
+                }
+
+                builder.Add(BuildDirective());
+
+                RazorDirectiveSyntax BuildDirective()
+                {
+                    directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                    var directiveCodeBlock = SyntaxFactory.CSharpCodeBlock(directiveBuilder.ToList());
+
+                    var directiveBody = SyntaxFactory.RazorDirectiveBody(keywordBlock, directiveCodeBlock);
+                    var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+                    directive = (RazorDirectiveSyntax)directive.SetDiagnostics(directiveErrorSink.Errors.ToArray());
+                    directive = directive.WithDirectiveDescriptor(descriptor);
+                    return directive;
+                }
+            }
+        }
+
+        private void ValidateDirectiveUsage(DirectiveDescriptor descriptor, SourceLocation directiveStart)
+        {
+            if (descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
+            {
+                if (Context.SeenDirectives.Contains(descriptor.Directive))
+                {
+                    // There will always be at least 1 child because of the `@` transition.
+                    var errorLength = /* @ */ 1 + descriptor.Directive.Length;
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_DuplicateDirective(
+                            new SourceSpan(directiveStart, errorLength), descriptor.Directive));
+
+                    return;
+                }
+            }
+        }
+
+        // Used for parsing a qualified name like that which follows the `namespace` keyword.
+        //
+        // qualified-identifier:
+        //      identifier
+        //      qualified-identifier . identifier
+        protected bool TryParseQualifiedIdentifier(out int identifierLength)
+        {
+            var currentIdentifierLength = 0;
+            var expectingDot = false;
+            var tokens = ReadWhile(token =>
+            {
+                var type = token.Kind;
+                if ((expectingDot && type == SyntaxKind.Dot) ||
+                    (!expectingDot && type == SyntaxKind.Identifier))
+                {
+                    expectingDot = !expectingDot;
+                    return true;
+                }
+
+                if (type != SyntaxKind.Whitespace &&
+                    type != SyntaxKind.NewLine)
+                {
+                    expectingDot = false;
+                    currentIdentifierLength += token.Content.Length;
+                }
+
+                return false;
+            });
+
+            identifierLength = currentIdentifierLength;
+            var validQualifiedIdentifier = expectingDot;
+            if (validQualifiedIdentifier)
+            {
+                foreach (var token in tokens)
+                {
+                    identifierLength += token.Content.Length;
+                    Accept(token);
+                }
+
+                return true;
+            }
+            else
+            {
+                PutCurrentBack();
+
+                foreach (var token in tokens)
+                {
+                    identifierLength += token.Content.Length;
+                    PutBack(token);
+                }
+
+                EnsureCurrent();
+                return false;
+            }
+        }
+
+        private void ParseDirectiveBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, DirectiveDescriptor descriptor, Action<SyntaxListBuilder<RazorSyntaxNode>, SourceLocation> parseChildren)
+        {
+            if (EndOfFile)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* { */), descriptor.Directive, "{"));
+            }
+            else if (!At(SyntaxKind.LeftBrace))
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral(
+                        new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive, "{"));
+            }
+            else
+            {
+                var editHandler = new AutoCompleteEditHandler(Language.TokenizeString, autoCompleteAtEndOfSpan: true);
+                SpanContext.EditHandler = editHandler;
+                var startingBraceLocation = CurrentStart;
+                Accept(CurrentToken);
+                builder.Add(OutputAsMetaCode(Output()));
+
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var childBuilder = pooledResult.Builder;
+                    parseChildren(childBuilder, startingBraceLocation);
+                    if (childBuilder.Count > 0)
+                    {
+                        builder.Add(SyntaxFactory.CSharpCodeBlock(childBuilder.ToList()));
+                    }
+                }
+
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                if (!TryAccept(SyntaxKind.RightBrace))
+                {
+                    editHandler.AutoCompleteString = "}";
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                            new SourceSpan(startingBraceLocation, contentLength: 1 /* } */), descriptor.Directive, "}", "{"));
+
+                    Accept(SyntaxFactory.MissingToken(SyntaxKind.RightBrace));
+                }
+                else
+                {
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+                CompleteBlock(insertMarkerIfNecessary: false, captureWhitespaceToEndOfLine: true);
+                builder.Add(OutputAsMetaCode(Output(), SpanContext.EditHandler.AcceptedCharacters));
+            }
+        }
+
+        private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Keyword && result.HasValue);
+            if (_keywordParserMap.TryGetValue(result.Value, out var handler))
+            {
+                handler(builder, transition);
+                return true;
+            }
+
+            return false;
+        }
+
+        private void SetupExpressionParsers()
+        {
+            MapExpressionKeyword(ParseAwaitExpression, CSharpKeyword.Await);
+        }
+
+        private void SetupKeywordParsers()
+        {
+            MapKeywords(
+                ParseConditionalBlock,
+                CSharpKeyword.For,
+                CSharpKeyword.Foreach,
+                CSharpKeyword.While,
+                CSharpKeyword.Switch,
+                CSharpKeyword.Lock);
+            MapKeywords(ParseCaseStatement, false, CSharpKeyword.Case, CSharpKeyword.Default);
+            MapKeywords(ParseIfStatement, CSharpKeyword.If);
+            MapKeywords(ParseTryStatement, CSharpKeyword.Try);
+            MapKeywords(ParseDoStatement, CSharpKeyword.Do);
+            MapKeywords(ParseUsingKeyword, CSharpKeyword.Using);
+            MapKeywords(ParseReservedDirective, CSharpKeyword.Class, CSharpKeyword.Namespace);
+        }
+
+        private void MapExpressionKeyword(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, CSharpKeyword keyword)
+        {
+            _keywordParserMap.Add(keyword, handler);
+
+            // Expression keywords don't belong in the regular keyword list
+        }
+
+        private void MapKeywords(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, params CSharpKeyword[] keywords)
+        {
+            MapKeywords(handler, topLevel: true, keywords: keywords);
+        }
+
+        private void MapKeywords(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, bool topLevel, params CSharpKeyword[] keywords)
+        {
+            foreach (var keyword in keywords)
+            {
+                _keywordParserMap.Add(keyword, handler);
+                if (topLevel)
+                {
+                    Keywords.Add(CSharpLanguageCharacteristics.GetKeyword(keyword));
+                }
+            }
+        }
+
+        private void ParseAwaitExpression(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            // Ensure that we're on the await statement (only runs in debug)
+            Assert(CSharpKeyword.Await);
+
+            // Accept the "await" and move on
+            AcceptAndMoveNext();
+
+            // Accept 1 or more spaces between the await and the following code.
+            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+            // Top level basically indicates if we're within an expression or statement.
+            // Ex: topLevel true = @await Foo()  |  topLevel false = @{ await Foo(); }
+            // Note that in this case @{ <b>@await Foo()</b> } top level is true for await.
+            // Therefore, if we're top level then we want to act like an implicit expression,
+            // otherwise just act as whatever we're contained in.
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                // Setup the Span to be an async implicit expression (an implicit expresison that allows spaces).
+                // Spaces are allowed because of "@await Foo()".
+                var implicitExpressionBody = ParseImplicitExpressionBody(async: true);
+                builder.Add(SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody));
+            }
+        }
+
+        private void ParseConditionalBlock(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var topLevel = transition != null;
+            ParseConditionalBlock(builder, transition, topLevel);
+        }
+
+        private void ParseConditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, bool topLevel)
+        {
+            Assert(SyntaxKind.Keyword);
+            if (transition != null)
+            {
+                builder.Add(transition);
+            }
+
+            var block = new Block(CurrentToken, CurrentStart);
+            ParseConditionalBlock(builder, block);
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseConditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
+        {
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+            // Parse the condition, if present (if not present, we'll let the C# compiler complain)
+            if (TryParseCondition(builder))
+            {
+                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private bool TryParseCondition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (At(SyntaxKind.LeftParenthesis))
+            {
+                var complete = Balance(builder, BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates);
+                if (!complete)
+                {
+                    AcceptUntil(SyntaxKind.NewLine);
+                }
+                else
+                {
+                    TryAccept(SyntaxKind.RightParenthesis);
+                }
+                return complete;
+            }
+            return true;
+        }
+
+        private void ParseExpectedCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
+        {
+            if (!EndOfFile)
+            {
+                // Check for "{" to make sure we're at a block
+                if (!At(SyntaxKind.LeftBrace))
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsNotAllowed(
+                            new SourceSpan(CurrentStart, CurrentToken.Content.Length),
+                            Language.GetSample(SyntaxKind.LeftBrace),
+                            CurrentToken.Content));
+                }
+
+                // Parse the statement and then we're done
+                ParseStatement(builder, block);
+            }
+        }
+
+        private void ParseUnconditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.Keyword);
+            var block = new Block(CurrentToken, CurrentStart);
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            ParseExpectedCodeBlock(builder, block);
+        }
+
+        private void ParseCaseStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(SyntaxKind.Keyword);
+            if (transition != null)
+            {
+                // Normally, case statement won't start with a transition in a valid scenario.
+                // If it does, just accept it and let the compiler complain.
+                builder.Add(transition);
+            }
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            Debug.Assert(result.HasValue &&
+                         (result.Value == CSharpKeyword.Case ||
+                          result.Value == CSharpKeyword.Default));
+            AcceptUntil(SyntaxKind.Colon);
+            TryAccept(SyntaxKind.Colon);
+        }
+
+        private void ParseIfStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.If);
+            ParseConditionalBlock(builder, transition, topLevel: false);
+            ParseAfterIfClause(builder);
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseAfterIfClause(SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Grab whitespace and razor comments
+            var whitespace = SkipToNextImportantToken(builder);
+
+            // Check for an else part
+            if (At(CSharpKeyword.Else))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.Else);
+                ParseElseClause(builder);
+            }
+            else
+            {
+                // No else, return whitespace
+                PutCurrentBack();
+                PutBack(whitespace);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            }
+        }
+
+        private void ParseElseClause(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (!At(CSharpKeyword.Else))
+            {
+                return;
+            }
+            var block = new Block(CurrentToken, CurrentStart);
+
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            if (At(CSharpKeyword.If))
+            {
+                // ElseIf
+                block.Name = SyntaxConstants.CSharp.ElseIfKeyword;
+                ParseConditionalBlock(builder, block);
+                ParseAfterIfClause(builder);
+            }
+            else if (!EndOfFile)
+            {
+                // Else
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private void ParseTryStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.Try);
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                builder.Add(transition);
+            }
+
+            ParseUnconditionalBlock(builder);
+            ParseAfterTryClause(builder);
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseAfterTryClause(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Grab whitespace
+            var whitespace = SkipToNextImportantToken(builder);
+
+            // Check for a catch or finally part
+            if (At(CSharpKeyword.Catch))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.Catch);
+                ParseFilterableCatchBlock(builder);
+                ParseAfterTryClause(builder);
+            }
+            else if (At(CSharpKeyword.Finally))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.Finally);
+                ParseUnconditionalBlock(builder);
+            }
+            else
+            {
+                // Return whitespace and end the block
+                PutCurrentBack();
+                PutBack(whitespace);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            }
+        }
+
+        private void ParseFilterableCatchBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(CSharpKeyword.Catch);
+
+            var block = new Block(CurrentToken, CurrentStart);
+
+            // Accept "catch"
+            AcceptAndMoveNext();
+            AcceptWhile(IsValidStatementSpacingToken);
+
+            // Parse the catch condition if present. If not present, let the C# compiler complain.
+            if (TryParseCondition(builder))
+            {
+                AcceptWhile(IsValidStatementSpacingToken);
+
+                if (At(CSharpKeyword.When))
+                {
+                    // Accept "when".
+                    AcceptAndMoveNext();
+                    AcceptWhile(IsValidStatementSpacingToken);
+
+                    // Parse the filter condition if present. If not present, let the C# compiler complain.
+                    if (!TryParseCondition(builder))
+                    {
+                        // Incomplete condition.
+                        return;
+                    }
+
+                    AcceptWhile(IsValidStatementSpacingToken);
+                }
+
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private void ParseDoStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.Do);
+            if (transition != null)
+            {
+                builder.Add(transition);
+            }
+
+            ParseUnconditionalBlock(builder);
+            ParseWhileClause(builder);
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseWhileClause(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            var whitespace = SkipToNextImportantToken(builder);
+
+            if (At(CSharpKeyword.While))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.While);
+                AcceptAndMoveNext();
+                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                if (TryParseCondition(builder) && TryAccept(SyntaxKind.Semicolon))
+                {
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+            }
+            else
+            {
+                PutCurrentBack();
+                PutBack(whitespace);
+            }
+        }
+
+        private void ParseUsingKeyword(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.Using);
+            var topLevel = transition != null;
+            var block = new Block(CurrentToken, CurrentStart);
+            var usingToken = EatCurrentToken();
+            var whitespaceOrComments = ReadWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            var atLeftParen = At(SyntaxKind.LeftParenthesis);
+            var atIdentifier = At(SyntaxKind.Identifier);
+            var atStatic = At(CSharpKeyword.Static);
+
+            // Put the read tokens back and let them be handled later.
+            PutCurrentBack();
+            PutBack(whitespaceOrComments);
+            PutBack(usingToken);
+            EnsureCurrent();
+
+            if (atLeftParen)
+            {
+                // using ( ==> Using Statement
+                ParseUsingStatement(builder, transition, block);
+            }
+            else if (atIdentifier || atStatic)
+            {
+                // using Identifier ==> Using Declaration
+                if (!topLevel)
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock(
+                            new SourceSpan(block.Start, block.Name.Length)));
+                    if (transition != null)
+                    {
+                        builder.Add(transition);
+                    }
+                    AcceptAndMoveNext();
+                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    ParseStandardStatement(builder);
+                }
+                else
+                {
+                    ParseUsingDeclaration(builder, transition);
+                    return;
+                }
+            }
+            else
+            {
+                AcceptAndMoveNext();
+                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            }
+
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseUsingStatement(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, Block block)
+        {
+            Assert(CSharpKeyword.Using);
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+            Assert(SyntaxKind.LeftParenthesis);
+            if (transition != null)
+            {
+                builder.Add(transition);
+            }
+
+            // Parse condition
+            if (TryParseCondition(builder))
+            {
+                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+                // Parse code block
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private void ParseUsingDeclaration(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            // Using declarations should always be top level. The error case is handled in a different code path.
+            Debug.Assert(transition != null);
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var directiveBuilder = pooledResult.Builder;
+                Assert(CSharpKeyword.Using);
+                AcceptAndMoveNext();
+                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                var start = CurrentStart;
+                if (At(SyntaxKind.Identifier))
+                {
+                    // non-static using
+                    TryParseNamespaceOrTypeName(directiveBuilder);
+                    var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                    if (At(SyntaxKind.Assign))
+                    {
+                        // Alias
+                        Accept(whitespace);
+                        Assert(SyntaxKind.Assign);
+                        AcceptAndMoveNext();
+
+                        AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+                        // One more namespace or type name
+                        TryParseNamespaceOrTypeName(directiveBuilder);
+                    }
+                    else
+                    {
+                        PutCurrentBack();
+                        PutBack(whitespace);
+                    }
+                }
+                else if (At(CSharpKeyword.Static))
+                {
+                    // static using
+                    AcceptAndMoveNext();
+                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    TryParseNamespaceOrTypeName(directiveBuilder);
+                }
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline;
+                SpanContext.ChunkGenerator = new AddImportChunkGenerator(new LocationTagged<string>(
+                    string.Concat(TokenBuilder.ToList().Nodes.Skip(1).Select(s => s.Content)),
+                    start));
+
+                // Optional ";"
+                if (EnsureCurrent())
+                {
+                    TryAccept(SyntaxKind.Semicolon);
+                }
+
+                CompleteBlock();
+                Debug.Assert(directiveBuilder.Count == 0, "We should not have built any blocks so far.");
+                var keywordTokens = OutputTokensAsStatementLiteral();
+                var directiveBody = SyntaxFactory.RazorDirectiveBody(keywordTokens, null);
+                builder.Add(SyntaxFactory.RazorDirective(transition, directiveBody));
+            }
+        }
+
+        private bool TryParseNamespaceOrTypeName(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (TryAccept(SyntaxKind.LeftParenthesis))
+            {
+                while (!TryAccept(SyntaxKind.RightParenthesis) && !EndOfFile)
+                {
+                    TryAccept(SyntaxKind.Whitespace);
+
+                    if (!TryParseNamespaceOrTypeName(builder))
+                    {
+                        return false;
+                    }
+
+                    TryAccept(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.Identifier);
+                    TryAccept(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.Comma);
+                }
+
+                if (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.QuestionMark))
+                {
+                    // Only accept the whitespace if we are going to consume the next token.
+                    AcceptAndMoveNext();
+                }
+
+                TryAccept(SyntaxKind.QuestionMark); // Nullable
+
+                return true;
+            }
+            else if (TryAccept(SyntaxKind.Identifier) || TryAccept(SyntaxKind.Keyword))
+            {
+                if (TryAccept(SyntaxKind.DoubleColon))
+                {
+                    if (!TryAccept(SyntaxKind.Identifier))
+                    {
+                        TryAccept(SyntaxKind.Keyword);
+                    }
+                }
+                if (At(SyntaxKind.LessThan))
+                {
+                    ParseTypeArgumentList(builder);
+                }
+                if (TryAccept(SyntaxKind.Dot))
+                {
+                    TryParseNamespaceOrTypeName(builder);
+                }
+
+                if (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.QuestionMark))
+                {
+                    // Only accept the whitespace if we are going to consume the next token.
+                    AcceptAndMoveNext();
+                }
+
+                TryAccept(SyntaxKind.QuestionMark); // Nullable
+
+                if (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.LeftBracket))
+                {
+                    // Only accept the whitespace if we are going to consume the next token.
+                    AcceptAndMoveNext();
+                }
+
+                while (At(SyntaxKind.LeftBracket))
+                {
+                    Balance(builder, BalancingModes.None);
+                    if (!TryAccept(SyntaxKind.RightBracket))
+                    {
+                        Accept(SyntaxFactory.MissingToken(SyntaxKind.RightBracket));
+                    }
+                }
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void ParseTypeArgumentList(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.LessThan);
+            Balance(builder, BalancingModes.None);
+            if (!TryAccept(SyntaxKind.GreaterThan))
+            {
+                Accept(SyntaxFactory.MissingToken(SyntaxKind.GreaterThan));
+            }
+        }
+
+        private void ParseReservedDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Context.ErrorSink.OnError(
+                RazorDiagnosticFactory.CreateParsing_ReservedWord(
+                    new SourceSpan(CurrentStart, CurrentToken.Content.Length), CurrentToken.Content));
+
+            AcceptAndMoveNext();
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            CompleteBlock();
+            var keyword = OutputAsMetaCode(Output());
+            var directiveBody = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode: null);
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        protected void CompleteBlock()
+        {
+            CompleteBlock(insertMarkerIfNecessary: true);
+        }
+
+        protected void CompleteBlock(bool insertMarkerIfNecessary)
+        {
+            CompleteBlock(insertMarkerIfNecessary, captureWhitespaceToEndOfLine: insertMarkerIfNecessary);
+        }
+
+        protected void CompleteBlock(bool insertMarkerIfNecessary, bool captureWhitespaceToEndOfLine)
+        {
+            if (insertMarkerIfNecessary && Context.LastAcceptedCharacters != AcceptedCharactersInternal.Any)
+            {
+                AcceptMarkerTokenIfNecessary();
+            }
+
+            EnsureCurrent();
+
+            // Read whitespace, but not newlines
+            // If we're not inserting a marker span, we don't need to capture whitespace
+            if (!Context.WhiteSpaceIsSignificantToAncestorBlock &&
+                captureWhitespaceToEndOfLine &&
+                !Context.DesignTimeMode &&
+                !IsNested)
+            {
+                var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace);
+                if (At(SyntaxKind.NewLine))
+                {
+                    Accept(whitespace);
+                    AcceptAndMoveNext();
+                    PutCurrentBack();
+                }
+                else
+                {
+                    PutCurrentBack();
+                    PutBack(whitespace);
+                }
+            }
+            else
+            {
+                PutCurrentBack();
+            }
+        }
+
+        private IEnumerable<SyntaxToken> SkipToNextImportantToken(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            while (!EndOfFile)
+            {
+                var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                if (At(SyntaxKind.RazorCommentTransition))
+                {
+                    Accept(whitespace);
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                    AcceptMarkerTokenIfNecessary();
+                    builder.Add(OutputTokensAsStatementLiteral());
+                    var comment = ParseRazorComment();
+                    builder.Add(comment);
+                }
+                else
+                {
+                    return whitespace;
+                }
+            }
+            return Enumerable.Empty<SyntaxToken>();
+        }
+
+        private void DefaultSpanContextConfig(SpanContextBuilder spanContext)
+        {
+            spanContext.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
+            spanContext.ChunkGenerator = new StatementChunkGenerator();
+        }
+
+        private void ExplicitExpressionSpanContextConfig(SpanContextBuilder spanContext)
+        {
+            spanContext.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
+            spanContext.ChunkGenerator = new ExpressionChunkGenerator();
+        }
+
+        private CSharpStatementLiteralSyntax OutputTokensAsStatementLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.CSharpStatementLiteral(tokens));
+        }
+
+        private CSharpExpressionLiteralSyntax OutputTokensAsExpressionLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.CSharpExpressionLiteral(tokens));
+        }
+
+        private CSharpEphemeralTextLiteralSyntax OutputTokensAsEphemeralLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.CSharpEphemeralTextLiteral(tokens));
+        }
+
+        private UnclassifiedTextLiteralSyntax OutputTokensAsUnclassifiedLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+
+            return GetNodeWithSpanContext(SyntaxFactory.UnclassifiedTextLiteral(tokens));
+        }
+
+        private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // When transitioning to the HTML parser we no longer want to act as if we're in a nested C# state.
+            // For instance, if <div>@hello.</div> is in a nested C# block we don't want the trailing '.' to be handled
+            // as C#; it should be handled as a period because it's wrapped in markup.
+            var wasNested = IsNested;
+            IsNested = false;
+
+            RazorSyntaxNode htmlBlock = null;
+            using (PushSpanContextConfig())
+            {
+                htmlBlock = HtmlParser.ParseBlock();
+            }
+
+            builder.Add(htmlBlock);
+            InitializeContext(SpanContext);
+
+            IsNested = wasNested;
+            NextToken();
+        }
+
+        private bool Balance(SyntaxListBuilder<RazorSyntaxNode> builder, BalancingModes mode)
+        {
+            var left = CurrentToken.Kind;
+            var right = Language.FlipBracket(left);
+            var start = CurrentStart;
+            AcceptAndMoveNext();
+            if (EndOfFile && ((mode & BalancingModes.NoErrorOnFailure) != BalancingModes.NoErrorOnFailure))
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
+                        new SourceSpan(start, contentLength: 1 /* { OR } */),
+                        Language.GetSample(left),
+                        Language.GetSample(right)));
+            }
+
+            return Balance(builder, mode, left, right, start);
+        }
+
+        private bool Balance(SyntaxListBuilder<RazorSyntaxNode> builder, BalancingModes mode, SyntaxKind left, SyntaxKind right, SourceLocation start)
+        {
+            var startPosition = CurrentStart.AbsoluteIndex;
+            var nesting = 1;
+            if (!EndOfFile)
+            {
+                var tokens = new List<SyntaxToken>();
+                do
+                {
+                    if (IsAtEmbeddedTransition(
+                        (mode & BalancingModes.AllowCommentsAndTemplates) == BalancingModes.AllowCommentsAndTemplates,
+                        (mode & BalancingModes.AllowEmbeddedTransitions) == BalancingModes.AllowEmbeddedTransitions))
+                    {
+                        Accept(tokens);
+                        tokens.Clear();
+                        ParseEmbeddedTransition(builder);
+
+                        // Reset backtracking since we've already outputted some spans.
+                        startPosition = CurrentStart.AbsoluteIndex;
+                    }
+                    if (At(left))
+                    {
+                        nesting++;
+                    }
+                    else if (At(right))
+                    {
+                        nesting--;
+                    }
+                    if (nesting > 0)
+                    {
+                        tokens.Add(CurrentToken);
+                    }
+                }
+                while (nesting > 0 && NextToken());
+
+                if (nesting > 0)
+                {
+                    if ((mode & BalancingModes.NoErrorOnFailure) != BalancingModes.NoErrorOnFailure)
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
+                                new SourceSpan(start, contentLength: 1 /* { OR } */),
+                                Language.GetSample(left),
+                                Language.GetSample(right)));
+                    }
+                    if ((mode & BalancingModes.BacktrackOnFailure) == BalancingModes.BacktrackOnFailure)
+                    {
+                        Context.Source.Position = startPosition;
+                        NextToken();
+                    }
+                    else
+                    {
+                        Accept(tokens);
+                    }
+                }
+                else
+                {
+                    // Accept all the tokens we saw
+                    Accept(tokens);
+                }
+            }
+            return nesting == 0;
+        }
+
+        private bool IsAtEmbeddedTransition(bool allowTemplatesAndComments, bool allowTransitions)
+        {
+            // No embedded transitions in C#, so ignore that param
+            return allowTemplatesAndComments
+                   && ((Language.IsTransition(CurrentToken)
+                        && NextIs(SyntaxKind.LessThan, SyntaxKind.Colon, SyntaxKind.DoubleColon))
+                       || Language.IsCommentStart(CurrentToken));
+        }
+
+        private void ParseEmbeddedTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (Language.IsTransition(CurrentToken))
+            {
+                PutCurrentBack();
+                ParseTemplate(builder);
+            }
+            else if (Language.IsCommentStart(CurrentToken))
+            {
+                // Output tokens before parsing the comment.
+                AcceptMarkerTokenIfNecessary();
+                if (SpanContext.ChunkGenerator is ExpressionChunkGenerator)
+                {
+                    builder.Add(OutputTokensAsExpressionLiteral());
+                }
+                else
+                {
+                    builder.Add(OutputTokensAsStatementLiteral());
+                }
+
+                var comment = ParseRazorComment();
+                builder.Add(comment);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        internal void Assert(CSharpKeyword expectedKeyword)
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Keyword &&
+                result.HasValue &&
+                result.Value == expectedKeyword);
+        }
+
+        protected internal bool At(CSharpKeyword keyword)
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            return At(SyntaxKind.Keyword) &&
+                result.HasValue &&
+                result.Value == keyword;
+        }
+
+        protected static Func<SyntaxToken, bool> IsSpacingToken(bool includeNewLines, bool includeComments)
+        {
+            return token => token.Kind == SyntaxKind.Whitespace ||
+                          (includeNewLines && token.Kind == SyntaxKind.NewLine) ||
+                          (includeComments && token.Kind == SyntaxKind.CSharpComment);
+        }
+
+        protected class Block
+        {
+            public Block(string name, SourceLocation start)
+            {
+                Name = name;
+                Start = start;
+            }
+
+            public Block(SyntaxToken token, SourceLocation start)
+                : this(GetName(token), start)
+            {
+            }
+
+            public string Name { get; set; }
+            public SourceLocation Start { get; set; }
+
+            private static string GetName(SyntaxToken token)
+            {
+                var result = CSharpTokenizer.GetTokenKeyword(token);
+                if (result.HasValue && token.Kind == SyntaxKind.Keyword)
+                {
+                    return CSharpLanguageCharacteristics.GetKeyword(result.Value);
+                }
+                return token.Content;
+            }
+        }
+
+        internal class ParsedDirective
+        {
+            public string DirectiveText { get; set; }
+
+            public string AssemblyName { get; set; }
+
+            public string TypePattern { get; set; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpKeyword.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpKeyword.cs
new file mode 100644
index 0000000000..b37807377b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpKeyword.cs
@@ -0,0 +1,88 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal enum CSharpKeyword
+    {
+        Await,
+        Abstract,
+        Byte,
+        Class,
+        Delegate,
+        Event,
+        Fixed,
+        If,
+        Internal,
+        New,
+        Override,
+        Readonly,
+        Short,
+        Struct,
+        Try,
+        Unsafe,
+        Volatile,
+        As,
+        Do,
+        Is,
+        Params,
+        Ref,
+        Switch,
+        Ushort,
+        While,
+        Case,
+        Const,
+        Explicit,
+        Float,
+        Null,
+        Sizeof,
+        Typeof,
+        Implicit,
+        Private,
+        This,
+        Using,
+        Extern,
+        Return,
+        Stackalloc,
+        Uint,
+        Base,
+        Catch,
+        Continue,
+        Double,
+        For,
+        In,
+        Lock,
+        Object,
+        Protected,
+        Static,
+        False,
+        Public,
+        Sbyte,
+        Throw,
+        Virtual,
+        Decimal,
+        Else,
+        Operator,
+        String,
+        Ulong,
+        Bool,
+        Char,
+        Default,
+        Foreach,
+        Long,
+        Void,
+        Enum,
+        Finally,
+        Int,
+        Out,
+        Sealed,
+        True,
+        Goto,
+        Unchecked,
+        Interface,
+        Break,
+        Checked,
+        Namespace,
+        When
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
new file mode 100644
index 0000000000..3a017b54de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
@@ -0,0 +1,176 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class CSharpLanguageCharacteristics : LanguageCharacteristics<CSharpTokenizer>
+    {
+        private static readonly CSharpLanguageCharacteristics _instance = new CSharpLanguageCharacteristics();
+
+        private static Dictionary<SyntaxKind, string> _tokenSamples = new Dictionary<SyntaxKind, string>()
+        {
+            { SyntaxKind.Arrow, "->" },
+            { SyntaxKind.Minus, "-" },
+            { SyntaxKind.Decrement, "--" },
+            { SyntaxKind.MinusAssign, "-=" },
+            { SyntaxKind.NotEqual, "!=" },
+            { SyntaxKind.Not, "!" },
+            { SyntaxKind.Modulo, "%" },
+            { SyntaxKind.ModuloAssign, "%=" },
+            { SyntaxKind.AndAssign, "&=" },
+            { SyntaxKind.And, "&" },
+            { SyntaxKind.DoubleAnd, "&&" },
+            { SyntaxKind.LeftParenthesis, "(" },
+            { SyntaxKind.RightParenthesis, ")" },
+            { SyntaxKind.Star, "*" },
+            { SyntaxKind.MultiplyAssign, "*=" },
+            { SyntaxKind.Comma, "," },
+            { SyntaxKind.Dot, "." },
+            { SyntaxKind.Slash, "/" },
+            { SyntaxKind.DivideAssign, "/=" },
+            { SyntaxKind.DoubleColon, "::" },
+            { SyntaxKind.Colon, ":" },
+            { SyntaxKind.Semicolon, ";" },
+            { SyntaxKind.QuestionMark, "?" },
+            { SyntaxKind.NullCoalesce, "??" },
+            { SyntaxKind.RightBracket, "]" },
+            { SyntaxKind.LeftBracket, "[" },
+            { SyntaxKind.XorAssign, "^=" },
+            { SyntaxKind.Xor, "^" },
+            { SyntaxKind.LeftBrace, "{" },
+            { SyntaxKind.OrAssign, "|=" },
+            { SyntaxKind.DoubleOr, "||" },
+            { SyntaxKind.Or, "|" },
+            { SyntaxKind.RightBrace, "}" },
+            { SyntaxKind.Tilde, "~" },
+            { SyntaxKind.Plus, "+" },
+            { SyntaxKind.PlusAssign, "+=" },
+            { SyntaxKind.Increment, "++" },
+            { SyntaxKind.LessThan, "<" },
+            { SyntaxKind.LessThanEqual, "<=" },
+            { SyntaxKind.LeftShift, "<<" },
+            { SyntaxKind.LeftShiftAssign, "<<=" },
+            { SyntaxKind.Assign, "=" },
+            { SyntaxKind.Equals, "==" },
+            { SyntaxKind.GreaterThan, ">" },
+            { SyntaxKind.GreaterThanEqual, ">=" },
+            { SyntaxKind.RightShift, ">>" },
+            { SyntaxKind.RightShiftAssign, ">>=" },
+            { SyntaxKind.Hash, "#" },
+            { SyntaxKind.Transition, "@" },
+        };
+
+        protected CSharpLanguageCharacteristics()
+        {
+        }
+
+        public static CSharpLanguageCharacteristics Instance => _instance;
+
+        public override CSharpTokenizer CreateTokenizer(ITextDocument source)
+        {
+            return new CSharpTokenizer(source);
+        }
+
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
+        {
+            return SyntaxFactory.Token(kind, content, errors);
+        }
+
+        public override string GetSample(SyntaxKind kind)
+        {
+            string sample;
+            if (!_tokenSamples.TryGetValue(kind, out sample))
+            {
+                switch (kind)
+                {
+                    case SyntaxKind.Identifier:
+                        return Resources.CSharpToken_Identifier;
+                    case SyntaxKind.Keyword:
+                        return Resources.CSharpToken_Keyword;
+                    case SyntaxKind.IntegerLiteral:
+                        return Resources.CSharpToken_IntegerLiteral;
+                    case SyntaxKind.NewLine:
+                        return Resources.CSharpToken_Newline;
+                    case SyntaxKind.Whitespace:
+                        return Resources.CSharpToken_Whitespace;
+                    case SyntaxKind.CSharpComment:
+                        return Resources.CSharpToken_Comment;
+                    case SyntaxKind.RealLiteral:
+                        return Resources.CSharpToken_RealLiteral;
+                    case SyntaxKind.CharacterLiteral:
+                        return Resources.CSharpToken_CharacterLiteral;
+                    case SyntaxKind.StringLiteral:
+                        return Resources.CSharpToken_StringLiteral;
+                    default:
+                        return Resources.Token_Unknown;
+                }
+            }
+            return sample;
+        }
+
+        public override SyntaxToken CreateMarkerToken()
+        {
+            return SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+        }
+
+        public override SyntaxKind GetKnownTokenType(KnownTokenType type)
+        {
+            switch (type)
+            {
+                case KnownTokenType.Identifier:
+                    return SyntaxKind.Identifier;
+                case KnownTokenType.Keyword:
+                    return SyntaxKind.Keyword;
+                case KnownTokenType.NewLine:
+                    return SyntaxKind.NewLine;
+                case KnownTokenType.Whitespace:
+                    return SyntaxKind.Whitespace;
+                case KnownTokenType.Transition:
+                    return SyntaxKind.Transition;
+                case KnownTokenType.CommentStart:
+                    return SyntaxKind.RazorCommentTransition;
+                case KnownTokenType.CommentStar:
+                    return SyntaxKind.RazorCommentStar;
+                case KnownTokenType.CommentBody:
+                    return SyntaxKind.RazorCommentLiteral;
+                default:
+                    return SyntaxKind.Marker;
+            }
+        }
+
+        public override SyntaxKind FlipBracket(SyntaxKind bracket)
+        {
+            switch (bracket)
+            {
+                case SyntaxKind.LeftBrace:
+                    return SyntaxKind.RightBrace;
+                case SyntaxKind.LeftBracket:
+                    return SyntaxKind.RightBracket;
+                case SyntaxKind.LeftParenthesis:
+                    return SyntaxKind.RightParenthesis;
+                case SyntaxKind.LessThan:
+                    return SyntaxKind.GreaterThan;
+                case SyntaxKind.RightBrace:
+                    return SyntaxKind.LeftBrace;
+                case SyntaxKind.RightBracket:
+                    return SyntaxKind.LeftBracket;
+                case SyntaxKind.RightParenthesis:
+                    return SyntaxKind.LeftParenthesis;
+                case SyntaxKind.GreaterThan:
+                    return SyntaxKind.LessThan;
+                default:
+                    Debug.Fail("FlipBracket must be called with a bracket character");
+                    return SyntaxKind.Marker;
+            }
+        }
+
+        public static string GetKeyword(CSharpKeyword keyword)
+        {
+            return keyword.ToString().ToLowerInvariant();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs
new file mode 100644
index 0000000000..21cd0dc00b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs
@@ -0,0 +1,807 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class CSharpTokenizer : Tokenizer
+    {
+        private Dictionary<char, Func<SyntaxKind>> _operatorHandlers;
+
+        private static readonly Dictionary<string, CSharpKeyword> _keywords = new Dictionary<string, CSharpKeyword>(StringComparer.Ordinal)
+        {
+            { "await", CSharpKeyword.Await },
+            { "abstract", CSharpKeyword.Abstract },
+            { "byte", CSharpKeyword.Byte },
+            { "class", CSharpKeyword.Class },
+            { "delegate", CSharpKeyword.Delegate },
+            { "event", CSharpKeyword.Event },
+            { "fixed", CSharpKeyword.Fixed },
+            { "if", CSharpKeyword.If },
+            { "internal", CSharpKeyword.Internal },
+            { "new", CSharpKeyword.New },
+            { "override", CSharpKeyword.Override },
+            { "readonly", CSharpKeyword.Readonly },
+            { "short", CSharpKeyword.Short },
+            { "struct", CSharpKeyword.Struct },
+            { "try", CSharpKeyword.Try },
+            { "unsafe", CSharpKeyword.Unsafe },
+            { "volatile", CSharpKeyword.Volatile },
+            { "as", CSharpKeyword.As },
+            { "do", CSharpKeyword.Do },
+            { "is", CSharpKeyword.Is },
+            { "params", CSharpKeyword.Params },
+            { "ref", CSharpKeyword.Ref },
+            { "switch", CSharpKeyword.Switch },
+            { "ushort", CSharpKeyword.Ushort },
+            { "while", CSharpKeyword.While },
+            { "case", CSharpKeyword.Case },
+            { "const", CSharpKeyword.Const },
+            { "explicit", CSharpKeyword.Explicit },
+            { "float", CSharpKeyword.Float },
+            { "null", CSharpKeyword.Null },
+            { "sizeof", CSharpKeyword.Sizeof },
+            { "typeof", CSharpKeyword.Typeof },
+            { "implicit", CSharpKeyword.Implicit },
+            { "private", CSharpKeyword.Private },
+            { "this", CSharpKeyword.This },
+            { "using", CSharpKeyword.Using },
+            { "extern", CSharpKeyword.Extern },
+            { "return", CSharpKeyword.Return },
+            { "stackalloc", CSharpKeyword.Stackalloc },
+            { "uint", CSharpKeyword.Uint },
+            { "base", CSharpKeyword.Base },
+            { "catch", CSharpKeyword.Catch },
+            { "continue", CSharpKeyword.Continue },
+            { "double", CSharpKeyword.Double },
+            { "for", CSharpKeyword.For },
+            { "in", CSharpKeyword.In },
+            { "lock", CSharpKeyword.Lock },
+            { "object", CSharpKeyword.Object },
+            { "protected", CSharpKeyword.Protected },
+            { "static", CSharpKeyword.Static },
+            { "false", CSharpKeyword.False },
+            { "public", CSharpKeyword.Public },
+            { "sbyte", CSharpKeyword.Sbyte },
+            { "throw", CSharpKeyword.Throw },
+            { "virtual", CSharpKeyword.Virtual },
+            { "decimal", CSharpKeyword.Decimal },
+            { "else", CSharpKeyword.Else },
+            { "operator", CSharpKeyword.Operator },
+            { "string", CSharpKeyword.String },
+            { "ulong", CSharpKeyword.Ulong },
+            { "bool", CSharpKeyword.Bool },
+            { "char", CSharpKeyword.Char },
+            { "default", CSharpKeyword.Default },
+            { "foreach", CSharpKeyword.Foreach },
+            { "long", CSharpKeyword.Long },
+            { "void", CSharpKeyword.Void },
+            { "enum", CSharpKeyword.Enum },
+            { "finally", CSharpKeyword.Finally },
+            { "int", CSharpKeyword.Int },
+            { "out", CSharpKeyword.Out },
+            { "sealed", CSharpKeyword.Sealed },
+            { "true", CSharpKeyword.True },
+            { "goto", CSharpKeyword.Goto },
+            { "unchecked", CSharpKeyword.Unchecked },
+            { "interface", CSharpKeyword.Interface },
+            { "break", CSharpKeyword.Break },
+            { "checked", CSharpKeyword.Checked },
+            { "namespace", CSharpKeyword.Namespace },
+            { "when", CSharpKeyword.When }
+        };
+
+        public CSharpTokenizer(ITextDocument source)
+            : base(source)
+        {
+            base.CurrentState = StartState;
+
+            _operatorHandlers = new Dictionary<char, Func<SyntaxKind>>()
+            {
+                { '-', MinusOperator },
+                { '<', LessThanOperator },
+                { '>', GreaterThanOperator },
+                { '&', CreateTwoCharOperatorHandler(SyntaxKind.And, '=', SyntaxKind.AndAssign, '&', SyntaxKind.DoubleAnd) },
+                { '|', CreateTwoCharOperatorHandler(SyntaxKind.Or, '=', SyntaxKind.OrAssign, '|', SyntaxKind.DoubleOr) },
+                { '+', CreateTwoCharOperatorHandler(SyntaxKind.Plus, '=', SyntaxKind.PlusAssign, '+', SyntaxKind.Increment) },
+                { '=', CreateTwoCharOperatorHandler(SyntaxKind.Assign, '=', SyntaxKind.Equals, '>', SyntaxKind.GreaterThanEqual) },
+                { '!', CreateTwoCharOperatorHandler(SyntaxKind.Not, '=', SyntaxKind.NotEqual) },
+                { '%', CreateTwoCharOperatorHandler(SyntaxKind.Modulo, '=', SyntaxKind.ModuloAssign) },
+                { '*', CreateTwoCharOperatorHandler(SyntaxKind.Star, '=', SyntaxKind.MultiplyAssign) },
+                { ':', CreateTwoCharOperatorHandler(SyntaxKind.Colon, ':', SyntaxKind.DoubleColon) },
+                { '?', CreateTwoCharOperatorHandler(SyntaxKind.QuestionMark, '?', SyntaxKind.NullCoalesce) },
+                { '^', CreateTwoCharOperatorHandler(SyntaxKind.Xor, '=', SyntaxKind.XorAssign) },
+                { '(', () => SyntaxKind.LeftParenthesis },
+                { ')', () => SyntaxKind.RightParenthesis },
+                { '{', () => SyntaxKind.LeftBrace },
+                { '}', () => SyntaxKind.RightBrace },
+                { '[', () => SyntaxKind.LeftBracket },
+                { ']', () => SyntaxKind.RightBracket },
+                { ',', () => SyntaxKind.Comma },
+                { ';', () => SyntaxKind.Semicolon },
+                { '~', () => SyntaxKind.Tilde },
+                { '#', () => SyntaxKind.Hash }
+            };
+        }
+
+        protected override int StartState => (int)CSharpTokenizerState.Data;
+
+        private new CSharpTokenizerState? CurrentState => (CSharpTokenizerState?)base.CurrentState;
+
+        public override SyntaxKind RazorCommentKind => SyntaxKind.RazorCommentLiteral;
+
+        public override SyntaxKind RazorCommentTransitionKind => SyntaxKind.RazorCommentTransition;
+
+        public override SyntaxKind RazorCommentStarKind => SyntaxKind.RazorCommentStar;
+
+        protected override StateResult Dispatch()
+        {
+            switch (CurrentState)
+            {
+                case CSharpTokenizerState.Data:
+                    return Data();
+                case CSharpTokenizerState.BlockComment:
+                    return BlockComment();
+                case CSharpTokenizerState.QuotedCharacterLiteral:
+                    return QuotedCharacterLiteral();
+                case CSharpTokenizerState.QuotedStringLiteral:
+                    return QuotedStringLiteral();
+                case CSharpTokenizerState.VerbatimStringLiteral:
+                    return VerbatimStringLiteral();
+                case CSharpTokenizerState.AfterRazorCommentTransition:
+                    return AfterRazorCommentTransition();
+                case CSharpTokenizerState.EscapedRazorCommentTransition:
+                    return EscapedRazorCommentTransition();
+                case CSharpTokenizerState.RazorCommentBody:
+                    return RazorCommentBody();
+                case CSharpTokenizerState.StarAfterRazorCommentBody:
+                    return StarAfterRazorCommentBody();
+                case CSharpTokenizerState.AtTokenAfterRazorCommentBody:
+                    return AtTokenAfterRazorCommentBody();
+                default:
+                    Debug.Fail("Invalid TokenizerState");
+                    return default(StateResult);
+            }
+        }
+
+        // Optimize memory allocation by returning constants for the most frequent cases
+        protected override string GetTokenContent(SyntaxKind type)
+        {
+            var tokenLength = Buffer.Length;
+
+            if (tokenLength == 1)
+            {
+                switch (type)
+                {
+                    case SyntaxKind.IntegerLiteral:
+                        switch (Buffer[0])
+                        {
+                            case '0':
+                                return "0";
+                            case '1':
+                                return "1";
+                            case '2':
+                                return "2";
+                            case '3':
+                                return "3";
+                            case '4':
+                                return "4";
+                            case '5':
+                                return "5";
+                            case '6':
+                                return "6";
+                            case '7':
+                                return "7";
+                            case '8':
+                                return "8";
+                            case '9':
+                                return "9";
+                        }
+                        break;
+                    case SyntaxKind.NewLine:
+                        if (Buffer[0] == '\n')
+                        {
+                            return "\n";
+                        }
+                        break;
+                    case SyntaxKind.Whitespace:
+                        if (Buffer[0] == ' ')
+                        {
+                            return " ";
+                        }
+                        if (Buffer[0] == '\t')
+                        {
+                            return "\t";
+                        }
+                        break;
+                    case SyntaxKind.Minus:
+                        return "-";
+                    case SyntaxKind.Not:
+                        return "!";
+                    case SyntaxKind.Modulo:
+                        return "%";
+                    case SyntaxKind.And:
+                        return "&";
+                    case SyntaxKind.LeftParenthesis:
+                        return "(";
+                    case SyntaxKind.RightParenthesis:
+                        return ")";
+                    case SyntaxKind.Star:
+                        return "*";
+                    case SyntaxKind.Comma:
+                        return ",";
+                    case SyntaxKind.Dot:
+                        return ".";
+                    case SyntaxKind.Slash:
+                        return "/";
+                    case SyntaxKind.Colon:
+                        return ":";
+                    case SyntaxKind.Semicolon:
+                        return ";";
+                    case SyntaxKind.QuestionMark:
+                        return "?";
+                    case SyntaxKind.RightBracket:
+                        return "]";
+                    case SyntaxKind.LeftBracket:
+                        return "[";
+                    case SyntaxKind.Xor:
+                        return "^";
+                    case SyntaxKind.LeftBrace:
+                        return "{";
+                    case SyntaxKind.Or:
+                        return "|";
+                    case SyntaxKind.RightBrace:
+                        return "}";
+                    case SyntaxKind.Tilde:
+                        return "~";
+                    case SyntaxKind.Plus:
+                        return "+";
+                    case SyntaxKind.LessThan:
+                        return "<";
+                    case SyntaxKind.Assign:
+                        return "=";
+                    case SyntaxKind.GreaterThan:
+                        return ">";
+                    case SyntaxKind.Hash:
+                        return "#";
+                    case SyntaxKind.Transition:
+                        return "@";
+
+                }
+            }
+            else if (tokenLength == 2)
+            {
+                switch (type)
+                {
+                    case SyntaxKind.NewLine:
+                        return "\r\n";
+                    case SyntaxKind.Arrow:
+                        return "->";
+                    case SyntaxKind.Decrement:
+                        return "--";
+                    case SyntaxKind.MinusAssign:
+                        return "-=";
+                    case SyntaxKind.NotEqual:
+                        return "!=";
+                    case SyntaxKind.ModuloAssign:
+                        return "%=";
+                    case SyntaxKind.AndAssign:
+                        return "&=";
+                    case SyntaxKind.DoubleAnd:
+                        return "&&";
+                    case SyntaxKind.MultiplyAssign:
+                        return "*=";
+                    case SyntaxKind.DivideAssign:
+                        return "/=";
+                    case SyntaxKind.DoubleColon:
+                        return "::";
+                    case SyntaxKind.NullCoalesce:
+                        return "??";
+                    case SyntaxKind.XorAssign:
+                        return "^=";
+                    case SyntaxKind.OrAssign:
+                        return "|=";
+                    case SyntaxKind.DoubleOr:
+                        return "||";
+                    case SyntaxKind.PlusAssign:
+                        return "+=";
+                    case SyntaxKind.Increment:
+                        return "++";
+                    case SyntaxKind.LessThanEqual:
+                        return "<=";
+                    case SyntaxKind.LeftShift:
+                        return "<<";
+                    case SyntaxKind.Equals:
+                        return "==";
+                    case SyntaxKind.GreaterThanEqual:
+                        if (Buffer[0] == '=')
+                        {
+                            return "=>";
+                        }
+                        return ">=";
+                    case SyntaxKind.RightShift:
+                        return ">>";
+
+
+                }
+            }
+            else if (tokenLength == 3)
+            {
+                switch (type)
+                {
+                    case SyntaxKind.LeftShiftAssign:
+                        return "<<=";
+                    case SyntaxKind.RightShiftAssign:
+                        return ">>=";
+                }
+            }
+
+            return base.GetTokenContent(type);
+        }
+
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
+        {
+            return SyntaxFactory.Token(kind, content, errors);
+        }
+
+        private StateResult Data()
+        {
+            if (ParserHelpers.IsNewLine(CurrentCharacter))
+            {
+                // CSharp Spec §2.3.1
+                var checkTwoCharNewline = CurrentCharacter == '\r';
+                TakeCurrent();
+                if (checkTwoCharNewline && CurrentCharacter == '\n')
+                {
+                    TakeCurrent();
+                }
+                return Stay(EndToken(SyntaxKind.NewLine));
+            }
+            else if (ParserHelpers.IsWhitespace(CurrentCharacter))
+            {
+                // CSharp Spec §2.3.3
+                TakeUntil(c => !ParserHelpers.IsWhitespace(c));
+                return Stay(EndToken(SyntaxKind.Whitespace));
+            }
+            else if (IsIdentifierStart(CurrentCharacter))
+            {
+                return Identifier();
+            }
+            else if (char.IsDigit(CurrentCharacter))
+            {
+                return NumericLiteral();
+            }
+            switch (CurrentCharacter)
+            {
+                case '@':
+                    return AtToken();
+                case '\'':
+                    TakeCurrent();
+                    return Transition(CSharpTokenizerState.QuotedCharacterLiteral);
+                case '"':
+                    TakeCurrent();
+                    return Transition(CSharpTokenizerState.QuotedStringLiteral);
+                case '.':
+                    if (char.IsDigit(Peek()))
+                    {
+                        return RealLiteral();
+                    }
+                    return Stay(Single(SyntaxKind.Dot));
+                case '/':
+                    TakeCurrent();
+                    if (CurrentCharacter == '/')
+                    {
+                        TakeCurrent();
+                        return SingleLineComment();
+                    }
+                    else if (CurrentCharacter == '*')
+                    {
+                        TakeCurrent();
+                        return Transition(CSharpTokenizerState.BlockComment);
+                    }
+                    else if (CurrentCharacter == '=')
+                    {
+                        TakeCurrent();
+                        return Stay(EndToken(SyntaxKind.DivideAssign));
+                    }
+                    else
+                    {
+                        return Stay(EndToken(SyntaxKind.Slash));
+                    }
+                default:
+                    return Stay(EndToken(Operator()));
+            }
+        }
+
+        private StateResult AtToken()
+        {
+            TakeCurrent();
+            if (CurrentCharacter == '"')
+            {
+                TakeCurrent();
+                return Transition(CSharpTokenizerState.VerbatimStringLiteral);
+            }
+            else if (CurrentCharacter == '*')
+            {
+                return Transition(
+                    CSharpTokenizerState.AfterRazorCommentTransition,
+                    EndToken(SyntaxKind.RazorCommentTransition));
+            }
+            else if (CurrentCharacter == '@')
+            {
+                // Could be escaped comment transition
+                return Transition(
+                    CSharpTokenizerState.EscapedRazorCommentTransition,
+                    EndToken(SyntaxKind.Transition));
+            }
+
+            return Stay(EndToken(SyntaxKind.Transition));
+        }
+
+        private StateResult EscapedRazorCommentTransition()
+        {
+            TakeCurrent();
+            return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.Transition));
+        }
+
+        private SyntaxKind Operator()
+        {
+            var first = CurrentCharacter;
+            TakeCurrent();
+            Func<SyntaxKind> handler;
+            if (_operatorHandlers.TryGetValue(first, out handler))
+            {
+                return handler();
+            }
+            return SyntaxKind.Marker;
+        }
+
+        private SyntaxKind LessThanOperator()
+        {
+            if (CurrentCharacter == '=')
+            {
+                TakeCurrent();
+                return SyntaxKind.LessThanEqual;
+            }
+            return SyntaxKind.LessThan;
+        }
+
+        private SyntaxKind GreaterThanOperator()
+        {
+            if (CurrentCharacter == '=')
+            {
+                TakeCurrent();
+                return SyntaxKind.GreaterThanEqual;
+            }
+            return SyntaxKind.GreaterThan;
+        }
+
+        private SyntaxKind MinusOperator()
+        {
+            if (CurrentCharacter == '>')
+            {
+                TakeCurrent();
+                return SyntaxKind.Arrow;
+            }
+            else if (CurrentCharacter == '-')
+            {
+                TakeCurrent();
+                return SyntaxKind.Decrement;
+            }
+            else if (CurrentCharacter == '=')
+            {
+                TakeCurrent();
+                return SyntaxKind.MinusAssign;
+            }
+            return SyntaxKind.Minus;
+        }
+
+        private Func<SyntaxKind> CreateTwoCharOperatorHandler(SyntaxKind typeIfOnlyFirst, char second, SyntaxKind typeIfBoth)
+        {
+            return () =>
+            {
+                if (CurrentCharacter == second)
+                {
+                    TakeCurrent();
+                    return typeIfBoth;
+                }
+                return typeIfOnlyFirst;
+            };
+        }
+
+        private Func<SyntaxKind> CreateTwoCharOperatorHandler(SyntaxKind typeIfOnlyFirst, char option1, SyntaxKind typeIfOption1, char option2, SyntaxKind typeIfOption2)
+        {
+            return () =>
+            {
+                if (CurrentCharacter == option1)
+                {
+                    TakeCurrent();
+                    return typeIfOption1;
+                }
+                else if (CurrentCharacter == option2)
+                {
+                    TakeCurrent();
+                    return typeIfOption2;
+                }
+                return typeIfOnlyFirst;
+            };
+        }
+
+        private StateResult VerbatimStringLiteral()
+        {
+            TakeUntil(c => c == '"');
+            if (CurrentCharacter == '"')
+            {
+                TakeCurrent();
+                if (CurrentCharacter == '"')
+                {
+                    TakeCurrent();
+                    // Stay in the literal, this is an escaped "
+                    return Stay();
+                }
+            }
+            else if (EndOfFile)
+            {
+                CurrentErrors.Add(
+                    RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
+            }
+            return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.StringLiteral));
+        }
+
+        private StateResult QuotedCharacterLiteral() => QuotedLiteral('\'', SyntaxKind.CharacterLiteral);
+
+        private StateResult QuotedStringLiteral() => QuotedLiteral('\"', SyntaxKind.StringLiteral);
+
+        private StateResult QuotedLiteral(char quote, SyntaxKind literalType)
+        {
+            TakeUntil(c => c == '\\' || c == quote || ParserHelpers.IsNewLine(c));
+            if (CurrentCharacter == '\\')
+            {
+                TakeCurrent(); // Take the '\'
+
+                // If the next char is the same quote that started this
+                if (CurrentCharacter == quote || CurrentCharacter == '\\')
+                {
+                    TakeCurrent(); // Take it so that we don't prematurely end the literal.
+                }
+                return Stay();
+            }
+            else if (EndOfFile || ParserHelpers.IsNewLine(CurrentCharacter))
+            {
+                CurrentErrors.Add(
+                    RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* " */)));
+            }
+            else
+            {
+                TakeCurrent(); // No-op if at EOF
+            }
+            return Transition(CSharpTokenizerState.Data, EndToken(literalType));
+        }
+
+        // CSharp Spec §2.3.2
+        private StateResult BlockComment()
+        {
+            TakeUntil(c => c == '*');
+            if (EndOfFile)
+            {
+                CurrentErrors.Add(
+                    RazorDiagnosticFactory.CreateParsing_BlockCommentNotTerminated(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
+                    
+                return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.CSharpComment));
+            }
+            if (CurrentCharacter == '*')
+            {
+                TakeCurrent();
+                if (CurrentCharacter == '/')
+                {
+                    TakeCurrent();
+                    return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.CSharpComment));
+                }
+            }
+            return Stay();
+        }
+
+        // CSharp Spec §2.3.2
+        private StateResult SingleLineComment()
+        {
+            TakeUntil(c => ParserHelpers.IsNewLine(c));
+            return Stay(EndToken(SyntaxKind.CSharpComment));
+        }
+
+        // CSharp Spec §2.4.4
+        private StateResult NumericLiteral()
+        {
+            if (TakeAll("0x", caseSensitive: true))
+            {
+                return HexLiteral();
+            }
+            else
+            {
+                return DecimalLiteral();
+            }
+        }
+
+        private StateResult HexLiteral()
+        {
+            TakeUntil(c => !IsHexDigit(c));
+            TakeIntegerSuffix();
+            return Stay(EndToken(SyntaxKind.IntegerLiteral));
+        }
+
+        private StateResult DecimalLiteral()
+        {
+            TakeUntil(c => !Char.IsDigit(c));
+            if (CurrentCharacter == '.' && Char.IsDigit(Peek()))
+            {
+                return RealLiteral();
+            }
+            else if (IsRealLiteralSuffix(CurrentCharacter) ||
+                     CurrentCharacter == 'E' || CurrentCharacter == 'e')
+            {
+                return RealLiteralExponentPart();
+            }
+            else
+            {
+                TakeIntegerSuffix();
+                return Stay(EndToken(SyntaxKind.IntegerLiteral));
+            }
+        }
+
+        private StateResult RealLiteralExponentPart()
+        {
+            if (CurrentCharacter == 'E' || CurrentCharacter == 'e')
+            {
+                TakeCurrent();
+                if (CurrentCharacter == '+' || CurrentCharacter == '-')
+                {
+                    TakeCurrent();
+                }
+                TakeUntil(c => !Char.IsDigit(c));
+            }
+            if (IsRealLiteralSuffix(CurrentCharacter))
+            {
+                TakeCurrent();
+            }
+            return Stay(EndToken(SyntaxKind.RealLiteral));
+        }
+
+        // CSharp Spec §2.4.4.3
+        private StateResult RealLiteral()
+        {
+            AssertCurrent('.');
+            TakeCurrent();
+            Debug.Assert(Char.IsDigit(CurrentCharacter));
+            TakeUntil(c => !Char.IsDigit(c));
+            return RealLiteralExponentPart();
+        }
+
+        private void TakeIntegerSuffix()
+        {
+            if (Char.ToLowerInvariant(CurrentCharacter) == 'u')
+            {
+                TakeCurrent();
+                if (Char.ToLowerInvariant(CurrentCharacter) == 'l')
+                {
+                    TakeCurrent();
+                }
+            }
+            else if (Char.ToLowerInvariant(CurrentCharacter) == 'l')
+            {
+                TakeCurrent();
+                if (Char.ToLowerInvariant(CurrentCharacter) == 'u')
+                {
+                    TakeCurrent();
+                }
+            }
+        }
+
+        // CSharp Spec §2.4.2
+        private StateResult Identifier()
+        {
+            Debug.Assert(IsIdentifierStart(CurrentCharacter));
+            TakeCurrent();
+            TakeUntil(c => !IsIdentifierPart(c));
+            SyntaxToken token = null;
+            if (HaveContent)
+            {
+                CSharpKeyword keyword;
+                var type = SyntaxKind.Identifier;
+                var tokenContent = Buffer.ToString();
+                if (_keywords.TryGetValue(tokenContent, out keyword))
+                {
+                    type = SyntaxKind.Keyword;
+                }
+
+                token = SyntaxFactory.Token(type, tokenContent);
+                
+                Buffer.Clear();
+                CurrentErrors.Clear();
+            }
+
+            return Stay(token);
+        }
+
+        private StateResult Transition(CSharpTokenizerState state)
+        {
+            return Transition((int)state, result: null);
+        }
+
+        private StateResult Transition(CSharpTokenizerState state, SyntaxToken result)
+        {
+            return Transition((int)state, result);
+        }
+
+        private static bool IsIdentifierStart(char character)
+        {
+            return char.IsLetter(character) ||
+                   character == '_' ||
+                   CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
+        }
+
+        private static bool IsIdentifierPart(char character)
+        {
+            return char.IsDigit(character) ||
+                   IsIdentifierStart(character) ||
+                   IsIdentifierPartByUnicodeCategory(character);
+        }
+
+        private static bool IsRealLiteralSuffix(char character)
+        {
+            return character == 'F' ||
+                   character == 'f' ||
+                   character == 'D' ||
+                   character == 'd' ||
+                   character == 'M' ||
+                   character == 'm';
+        }
+
+        private static bool IsIdentifierPartByUnicodeCategory(char character)
+        {
+            var category = CharUnicodeInfo.GetUnicodeCategory(character);
+
+            return category == UnicodeCategory.NonSpacingMark || // Mn
+                   category == UnicodeCategory.SpacingCombiningMark || // Mc
+                   category == UnicodeCategory.ConnectorPunctuation || // Pc
+                   category == UnicodeCategory.Format; // Cf
+        }
+
+        private static bool IsHexDigit(char value)
+        {
+            return (value >= '0' && value <= '9') || (value >= 'A' && value <= 'F') || (value >= 'a' && value <= 'f');
+        }
+
+        internal static CSharpKeyword? GetTokenKeyword(SyntaxToken token)
+        {
+            if (token != null && _keywords.TryGetValue(token.Content, out var keyword))
+            {
+                return keyword;
+            }
+
+            return null;
+        }
+
+        private enum CSharpTokenizerState
+        {
+            Data,
+            BlockComment,
+            QuotedCharacterLiteral,
+            QuotedStringLiteral,
+            VerbatimStringLiteral,
+
+            // Razor Comments - need to be the same for HTML and CSharp
+            AfterRazorCommentTransition = RazorCommentTokenizerState.AfterRazorCommentTransition,
+            EscapedRazorCommentTransition = RazorCommentTokenizerState.EscapedRazorCommentTransition,
+            RazorCommentBody = RazorCommentTokenizerState.RazorCommentBody,
+            StarAfterRazorCommentBody = RazorCommentTokenizerState.StarAfterRazorCommentBody,
+            AtTokenAfterRazorCommentBody = RazorCommentTokenizerState.AtTokenAfterRazorCommentBody,
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ClassifiedSpanInternal.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ClassifiedSpanInternal.cs
new file mode 100644
index 0000000000..93c4331923
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ClassifiedSpanInternal.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal struct ClassifiedSpanInternal
+    {
+        public ClassifiedSpanInternal(SourceSpan span, SourceSpan blockSpan, SpanKindInternal spanKind, BlockKindInternal blockKind, AcceptedCharactersInternal acceptedCharacters)
+        {
+            Span = span;
+            BlockSpan = blockSpan;
+            SpanKind = spanKind;
+            BlockKind = blockKind;
+            AcceptedCharacters = acceptedCharacters;
+        }
+
+        public AcceptedCharactersInternal AcceptedCharacters { get; }
+
+        public BlockKindInternal BlockKind { get; }
+
+        public SourceSpan BlockSpan { get; }
+
+        public SourceSpan Span { get; }
+
+        public SpanKindInternal SpanKind { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs
new file mode 100644
index 0000000000..8ecbd85906
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs
@@ -0,0 +1,127 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class CodeBlockEditHandler : SpanEditHandler
+    {
+        public CodeBlockEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer) : base(tokenizer)
+        {
+        }
+
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
+        {
+            if (IsAcceptableDeletion(target, change))
+            {
+                return PartialParseResultInternal.Accepted;
+            }
+
+            if (IsAcceptableReplacement(target, change))
+            {
+                return PartialParseResultInternal.Accepted;
+            }
+
+            if (IsAcceptableInsertion(change))
+            {
+                return PartialParseResultInternal.Accepted;
+            }
+
+            return PartialParseResultInternal.Rejected;
+        }
+
+        // Internal for testing
+        internal static bool IsAcceptableReplacement(SyntaxNode target, SourceChange change)
+        {
+            if (!change.IsReplace)
+            {
+                return false;
+            }
+
+            if (ContainsInvalidContent(change))
+            {
+                return false;
+            }
+
+            if (ModifiesInvalidContent(target, change))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        // Internal for testing
+        internal static bool IsAcceptableDeletion(SyntaxNode target, SourceChange change)
+        {
+            if (!change.IsDelete)
+            {
+                return false;
+            }
+
+            if (ModifiesInvalidContent(target, change))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        // Internal for testing
+        internal static bool ModifiesInvalidContent(SyntaxNode target, SourceChange change)
+        {
+            var relativePosition = change.Span.AbsoluteIndex - target.Position;
+
+            if (target.GetContent().IndexOfAny(new[] { '{', '}' }, relativePosition, change.Span.Length) >= 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        // Internal for testing
+        internal static bool IsAcceptableInsertion(SourceChange change)
+        {
+            if (!change.IsInsert)
+            {
+                return false;
+            }
+
+            if (ContainsInvalidContent(change))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        // Internal for testing
+        internal static bool ContainsInvalidContent(SourceChange change)
+        {
+            if (change.NewText.IndexOfAny(new[] { '{', '}' }) >= 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "{0};CodeBlock", base.ToString());
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is CodeBlockEditHandler other &&
+                base.Equals(other);
+        }
+
+        public override int GetHashCode() => base.GetHashCode();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveCSharpTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveCSharpTokenizer.cs
new file mode 100644
index 0000000000..59224e709f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveCSharpTokenizer.cs
@@ -0,0 +1,63 @@
+// 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.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class DirectiveCSharpTokenizer : CSharpTokenizer
+    {
+        private bool _visitedFirstTokenStart = false;
+        private bool _visitedFirstTokenLineEnd = false;
+
+        public DirectiveCSharpTokenizer(ITextDocument source) : base(source)
+        {
+        }
+
+        protected override StateResult Dispatch()
+        {
+            var result = base.Dispatch();
+            if (result.Result != null && !_visitedFirstTokenStart && IsValidTokenType(result.Result.Kind))
+            {
+                _visitedFirstTokenStart = true;
+            }
+            else if (result.Result != null && _visitedFirstTokenStart && result.Result.Kind == SyntaxKind.NewLine)
+            {
+                _visitedFirstTokenLineEnd = true;
+            }
+
+            return result;
+        }
+
+        public override SyntaxToken NextToken()
+        {
+            // Post-Condition: Buffer should be empty at the start of Next()
+            Debug.Assert(Buffer.Length == 0);
+            StartToken();
+
+            if (EndOfFile || (_visitedFirstTokenStart && _visitedFirstTokenLineEnd))
+            {
+                return null;
+            }
+
+            var token = Turn();
+
+            // Post-Condition: Buffer should be empty at the end of Next()
+            Debug.Assert(Buffer.Length == 0);
+
+            return token;
+        }
+
+        private bool IsValidTokenType(SyntaxKind kind)
+        {
+            return kind != SyntaxKind.Whitespace &&
+                kind != SyntaxKind.NewLine &&
+                kind != SyntaxKind.CSharpComment &&
+                kind != SyntaxKind.RazorCommentLiteral &&
+                kind != SyntaxKind.RazorCommentStar &&
+                kind != SyntaxKind.RazorCommentTransition &&
+                kind != SyntaxKind.Transition;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs
new file mode 100644
index 0000000000..4921c8aa1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs
@@ -0,0 +1,57 @@
+// 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.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class DirectiveHtmlTokenizer : HtmlTokenizer
+    {
+        private bool _visitedFirstTokenStart = false;
+
+        public DirectiveHtmlTokenizer(ITextDocument source) : base(source)
+        {
+        }
+
+        protected override StateResult Dispatch()
+        {
+            var result = base.Dispatch();
+            if (result.Result != null && IsValidTokenType(result.Result.Kind))
+            {
+                _visitedFirstTokenStart = true;
+            }
+
+            return result;
+        }
+
+        public override SyntaxToken NextToken()
+        {
+            // Post-Condition: Buffer should be empty at the start of Next()
+            Debug.Assert(Buffer.Length == 0);
+            StartToken();
+
+            if (EndOfFile || _visitedFirstTokenStart)
+            {
+                return null;
+            }
+
+            var token = Turn();
+
+            // Post-Condition: Buffer should be empty at the end of Next()
+            Debug.Assert(Buffer.Length == 0);
+
+            return token;
+        }
+
+        private bool IsValidTokenType(SyntaxKind kind)
+        {
+            return kind != SyntaxKind.Whitespace &&
+                kind != SyntaxKind.NewLine &&
+                kind != SyntaxKind.RazorCommentLiteral &&
+                kind != SyntaxKind.RazorCommentStar &&
+                kind != SyntaxKind.RazorCommentTransition &&
+                kind != SyntaxKind.Transition;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveTokenChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveTokenChunkGenerator.cs
new file mode 100644
index 0000000000..ea1095bd5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveTokenChunkGenerator.cs
@@ -0,0 +1,50 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class DirectiveTokenChunkGenerator : SpanChunkGenerator
+    {
+        private static readonly Type Type = typeof(DirectiveTokenChunkGenerator);
+
+        public DirectiveTokenChunkGenerator(DirectiveTokenDescriptor tokenDescriptor)
+        {
+            Descriptor = tokenDescriptor;
+        }
+
+        public DirectiveTokenDescriptor Descriptor { get; }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as DirectiveTokenChunkGenerator;
+            return base.Equals(other) &&
+                DirectiveTokenDescriptorComparer.Default.Equals(Descriptor, other.Descriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            var combiner = HashCodeCombiner.Start();
+            combiner.Add(base.GetHashCode());
+            combiner.Add(Type);
+
+            return combiner.CombinedHash;
+        }
+
+        public override string ToString()
+        {
+            var builder = new StringBuilder("DirectiveToken {");
+            builder.Append(Descriptor.Name);
+            builder.Append(";");
+            builder.Append(Descriptor.Kind);
+            builder.Append(";Opt:");
+            builder.Append(Descriptor.Optional);
+            builder.Append("}");
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DisposableAction.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DisposableAction.cs
new file mode 100644
index 0000000000..8dbecff0bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DisposableAction.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class DisposableAction : IDisposable
+    {
+        private readonly Action _action;
+        private bool _invoked;
+
+        public DisposableAction(Action action)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            _action = action;
+        }
+
+        public void Dispose()
+        {
+            if (!_invoked)
+            {
+                _action();
+                _invoked = true;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/EditResult.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/EditResult.cs
new file mode 100644
index 0000000000..13dfb20a71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/EditResult.cs
@@ -0,0 +1,19 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class EditResult
+    {
+        public EditResult(PartialParseResultInternal result, SyntaxNode editedNode)
+        {
+            Result = result;
+            EditedNode = editedNode;
+        }
+
+        public PartialParseResultInternal Result { get; set; }
+        public SyntaxNode EditedNode { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ErrorSink.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ErrorSink.cs
new file mode 100644
index 0000000000..3b4c057cd7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ErrorSink.cs
@@ -0,0 +1,34 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    /// <summary>
+    /// Used to manage <see cref="RazorDiagnostic"/>s encountered during the Razor parsing phase.
+    /// </summary>
+    internal class ErrorSink
+    {
+        private readonly List<RazorDiagnostic> _errors;
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ErrorSink"/>.
+        /// </summary>
+        public ErrorSink()
+        {
+            _errors = new List<RazorDiagnostic>();
+        }
+
+        /// <summary>
+        /// <see cref="RazorDiagnostic"/>s collected.
+        /// </summary>
+        public IReadOnlyList<RazorDiagnostic> Errors => _errors;
+
+        /// <summary>
+        /// Tracks the given <paramref name="error"/>.
+        /// </summary>
+        /// <param name="error">The <see cref="RazorDiagnostic"/> to track.</param>
+        public void OnError(RazorDiagnostic error) =>_errors.Add(error);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ExpressionChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ExpressionChunkGenerator.cs
new file mode 100644
index 0000000000..24eb488c1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ExpressionChunkGenerator.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class ExpressionChunkGenerator : ISpanChunkGenerator
+    {
+        private static readonly int TypeHashCode = typeof(ExpressionChunkGenerator).GetHashCode();
+
+        public override string ToString()
+        {
+            return "Expr";
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj != null &&
+                GetType() == obj.GetType();
+        }
+
+        public override int GetHashCode()
+        {
+            return TypeHashCode;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs
new file mode 100644
index 0000000000..c3761ce5c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveCSharpLanguageCharacteristics.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class FirstDirectiveCSharpLanguageCharacteristics : CSharpLanguageCharacteristics
+    {
+        private static readonly FirstDirectiveCSharpLanguageCharacteristics _instance = new FirstDirectiveCSharpLanguageCharacteristics();
+
+        private FirstDirectiveCSharpLanguageCharacteristics()
+        {
+        }
+
+        public new static FirstDirectiveCSharpLanguageCharacteristics Instance => _instance;
+
+        public override CSharpTokenizer CreateTokenizer(ITextDocument source) => new DirectiveCSharpTokenizer(source);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs
new file mode 100644
index 0000000000..2e2c7bea6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/FirstDirectiveHtmlLanguageCharacteristics.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class FirstDirectiveHtmlLanguageCharacteristics : HtmlLanguageCharacteristics
+    {
+        private static readonly FirstDirectiveHtmlLanguageCharacteristics _instance = new FirstDirectiveHtmlLanguageCharacteristics();
+
+        private FirstDirectiveHtmlLanguageCharacteristics()
+        {
+        }
+
+        public new static FirstDirectiveHtmlLanguageCharacteristics Instance => _instance;
+
+        public override HtmlTokenizer CreateTokenizer(ITextDocument source) => new DirectiveHtmlTokenizer(source);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs
new file mode 100644
index 0000000000..5efd2b80a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs
@@ -0,0 +1,128 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class HtmlLanguageCharacteristics : LanguageCharacteristics<HtmlTokenizer>
+    {
+        private static readonly HtmlLanguageCharacteristics _instance = new HtmlLanguageCharacteristics();
+
+        protected HtmlLanguageCharacteristics()
+        {
+        }
+
+        public static HtmlLanguageCharacteristics Instance
+        {
+            get { return _instance; }
+        }
+
+        public override string GetSample(SyntaxKind type)
+        {
+            switch (type)
+            {
+                case SyntaxKind.Text:
+                    return Resources.HtmlToken_Text;
+                case SyntaxKind.Whitespace:
+                    return Resources.HtmlToken_WhiteSpace;
+                case SyntaxKind.NewLine:
+                    return Resources.HtmlToken_NewLine;
+                case SyntaxKind.OpenAngle:
+                    return "<";
+                case SyntaxKind.Bang:
+                    return "!";
+                case SyntaxKind.ForwardSlash:
+                    return "/";
+                case SyntaxKind.QuestionMark:
+                    return "?";
+                case SyntaxKind.DoubleHyphen:
+                    return "--";
+                case SyntaxKind.LeftBracket:
+                    return "[";
+                case SyntaxKind.CloseAngle:
+                    return ">";
+                case SyntaxKind.RightBracket:
+                    return "]";
+                case SyntaxKind.Equals:
+                    return "=";
+                case SyntaxKind.DoubleQuote:
+                    return "\"";
+                case SyntaxKind.SingleQuote:
+                    return "'";
+                case SyntaxKind.Transition:
+                    return "@";
+                case SyntaxKind.Colon:
+                    return ":";
+                case SyntaxKind.RazorCommentLiteral:
+                    return Resources.HtmlToken_RazorComment;
+                case SyntaxKind.RazorCommentStar:
+                    return "*";
+                case SyntaxKind.RazorCommentTransition:
+                    return "@";
+                default:
+                    return Resources.Token_Unknown;
+            }
+        }
+
+        public override HtmlTokenizer CreateTokenizer(ITextDocument source)
+        {
+            return new HtmlTokenizer(source);
+        }
+
+        public override SyntaxKind FlipBracket(SyntaxKind bracket)
+        {
+            switch (bracket)
+            {
+                case SyntaxKind.LeftBracket:
+                    return SyntaxKind.RightBracket;
+                case SyntaxKind.OpenAngle:
+                    return SyntaxKind.CloseAngle;
+                case SyntaxKind.RightBracket:
+                    return SyntaxKind.LeftBracket;
+                case SyntaxKind.CloseAngle:
+                    return SyntaxKind.OpenAngle;
+                default:
+                    Debug.Fail("FlipBracket must be called with a bracket character");
+                    return SyntaxKind.Marker;
+            }
+        }
+
+        public override SyntaxToken CreateMarkerToken()
+        {
+            return SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+        }
+
+        public override SyntaxKind GetKnownTokenType(KnownTokenType type)
+        {
+            switch (type)
+            {
+                case KnownTokenType.CommentStart:
+                    return SyntaxKind.RazorCommentTransition;
+                case KnownTokenType.CommentStar:
+                    return SyntaxKind.RazorCommentStar;
+                case KnownTokenType.CommentBody:
+                    return SyntaxKind.RazorCommentLiteral;
+                case KnownTokenType.Identifier:
+                    return SyntaxKind.Text;
+                case KnownTokenType.Keyword:
+                    return SyntaxKind.Text;
+                case KnownTokenType.NewLine:
+                    return SyntaxKind.NewLine;
+                case KnownTokenType.Transition:
+                    return SyntaxKind.Transition;
+                case KnownTokenType.Whitespace:
+                    return SyntaxKind.Whitespace;
+                default:
+                    return SyntaxKind.Marker;
+            }
+        }
+
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
+        {
+            return SyntaxFactory.Token(kind, content, errors);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
new file mode 100644
index 0000000000..f06c8db1bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -0,0 +1,1951 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
+    {
+        private const string ScriptTagName = "script";
+
+        private static readonly SyntaxToken[] nonAllowedHtmlCommentEnding = new[]
+        {
+            SyntaxFactory.Token(SyntaxKind.Text, "-"),
+            SyntaxFactory.Token(SyntaxKind.Bang, "!"),
+            SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
+        };
+
+        private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' };
+        private SourceLocation _lastTagStart = SourceLocation.Zero;
+        private SyntaxToken _bufferedOpenAngle;
+
+        //From http://dev.w3.org/html5/spec/Overview.html#elements-0
+        private readonly ISet<string> _voidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "area",
+            "base",
+            "br",
+            "col",
+            "command",
+            "embed",
+            "hr",
+            "img",
+            "input",
+            "keygen",
+            "link",
+            "meta",
+            "param",
+            "source",
+            "track",
+            "wbr"
+        };
+
+        public HtmlMarkupParser(ParserContext context)
+            : base(context.ParseLeadingDirectives ? FirstDirectiveHtmlLanguageCharacteristics.Instance : HtmlLanguageCharacteristics.Instance, context)
+        {
+        }
+
+        public CSharpCodeParser CodeParser { get; set; }
+
+        public ISet<string> VoidElements
+        {
+            get { return _voidElements; }
+        }
+
+        private bool CaseSensitive { get; set; }
+
+        private StringComparison Comparison
+        {
+            get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; }
+        }
+
+        // Special tags include <!--, <!DOCTYPE, <![CDATA and <? tags
+        private bool AtSpecialTag
+        {
+            get
+            {
+                if (At(SyntaxKind.OpenAngle))
+                {
+                    if (NextIs(SyntaxKind.Bang))
+                    {
+                        return !IsBangEscape(lookahead: 1);
+                    }
+
+                    return NextIs(SyntaxKind.QuestionMark);
+                }
+
+                return false;
+            }
+        }
+
+        public RazorDocumentSyntax ParseDocument()
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+                NextToken();
+                while (!EndOfFile)
+                {
+                    SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+                    ParseTagInDocumentContext(builder);
+                }
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputAsMarkupLiteral());
+
+                var markup = SyntaxFactory.MarkupBlock(builder.ToList());
+
+                return SyntaxFactory.RazorDocument(markup);
+            }
+        }
+
+        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind type)
+        {
+            SkipToAndParseCode(builder, token => token.Kind == type);
+        }
+
+        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, Func<SyntaxToken, bool> condition)
+        {
+            SyntaxToken last = null;
+            var startOfLine = false;
+            while (!EndOfFile && !condition(CurrentToken))
+            {
+                if (Context.NullGenerateWhitespaceAndNewLine)
+                {
+                    Context.NullGenerateWhitespaceAndNewLine = false;
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    AcceptWhile(token => token.Kind == SyntaxKind.Whitespace);
+                    if (At(SyntaxKind.NewLine))
+                    {
+                        AcceptAndMoveNext();
+                    }
+
+                    builder.Add(OutputAsMarkupEphemeralLiteral());
+                }
+                else if (At(SyntaxKind.NewLine))
+                {
+                    if (last != null)
+                    {
+                        Accept(last);
+                    }
+
+                    // Mark the start of a new line
+                    startOfLine = true;
+                    last = null;
+                    AcceptAndMoveNext();
+                }
+                else if (At(SyntaxKind.Transition))
+                {
+                    var transition = CurrentToken;
+                    NextToken();
+                    if (At(SyntaxKind.Transition))
+                    {
+                        if (last != null)
+                        {
+                            Accept(last);
+                            last = null;
+                        }
+                        builder.Add(OutputAsMarkupLiteral());
+                        Accept(transition);
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                        AcceptAndMoveNext();
+                        continue; // while
+                    }
+                    else
+                    {
+                        if (!EndOfFile)
+                        {
+                            PutCurrentBack();
+                        }
+                        PutBack(transition);
+                    }
+
+                    // Handle whitespace rewriting
+                    if (last != null)
+                    {
+                        if (!Context.DesignTimeMode && last.Kind == SyntaxKind.Whitespace && startOfLine)
+                        {
+                            // Put the whitespace back too
+                            startOfLine = false;
+                            PutBack(last);
+                            last = null;
+                        }
+                        else
+                        {
+                            // Accept last
+                            Accept(last);
+                            last = null;
+                        }
+                    }
+
+                    OtherParserBlock(builder);
+                }
+                else if (At(SyntaxKind.RazorCommentTransition))
+                {
+                    var shouldRenderWhitespace = true;
+                    if (last != null)
+                    {
+                        // Don't render the whitespace between the start of the line and the razor comment.
+                        if (startOfLine && last.Kind == SyntaxKind.Whitespace)
+                        {
+                            AcceptMarkerTokenIfNecessary();
+                            // Output the tokens that may have been accepted prior to the whitespace.
+                            builder.Add(OutputAsMarkupLiteral());
+
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            shouldRenderWhitespace = false;
+                        }
+
+                        Accept(last);
+                        last = null;
+                    }
+
+                    AcceptMarkerTokenIfNecessary();
+                    if (shouldRenderWhitespace)
+                    {
+                        builder.Add(OutputAsMarkupLiteral());
+                    }
+                    else
+                    {
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                    }
+
+                    var comment = ParseRazorComment();
+                    builder.Add(comment);
+
+                    // Handle the whitespace and newline at the end of a razor comment.
+                    if (startOfLine &&
+                        (At(SyntaxKind.NewLine) ||
+                        (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine))))
+                    {
+                        AcceptWhile(IsSpacingToken(includeNewLines: false));
+                        AcceptAndMoveNext();
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                    }
+                }
+                else
+                {
+                    // As long as we see whitespace, we're still at the "start" of the line
+                    startOfLine &= At(SyntaxKind.Whitespace);
+
+                    // If there's a last token, accept it
+                    if (last != null)
+                    {
+                        Accept(last);
+                        last = null;
+                    }
+
+                    // Advance
+                    last = CurrentToken;
+                    NextToken();
+                }
+            }
+
+            if (last != null)
+            {
+                Accept(last);
+            }
+        }
+
+        /// <summary>
+        /// Reads the content of a tag (if present) in the MarkupDocument (or MarkupSection) context,
+        /// where we don't care about maintaining a stack of tags.
+        /// </summary>
+        private void ParseTagInDocumentContext(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (At(SyntaxKind.OpenAngle))
+            {
+                if (NextIs(SyntaxKind.Bang))
+                {
+                    // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
+                    if (!IsBangEscape(lookahead: 1))
+                    {
+                        if (Lookahead(2)?.Kind == SyntaxKind.DoubleHyphen)
+                        {
+                            builder.Add(OutputAsMarkupLiteral());
+                        }
+
+                        AcceptAndMoveNext(); // Accept '<'
+                        ParseBangTag(builder);
+
+                        return;
+                    }
+
+                    // We should behave like a normal tag that has a parser escape, fall through to the normal
+                    // tag logic.
+                }
+                else if (NextIs(SyntaxKind.QuestionMark))
+                {
+                    AcceptAndMoveNext(); // Accept '<'
+                    TryParseXmlPI(builder);
+                    return;
+                }
+
+                builder.Add(OutputAsMarkupLiteral());
+
+                // Start tag block
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var tagBuilder = pooledResult.Builder;
+                    AcceptAndMoveNext(); // Accept '<'
+
+                    if (!At(SyntaxKind.ForwardSlash))
+                    {
+                        ParseOptionalBangEscape(tagBuilder);
+
+                        // Parsing a start tag
+                        var scriptTag = At(SyntaxKind.Text) &&
+                                        string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
+                        TryAccept(SyntaxKind.Text);
+                        ParseTagContent(tagBuilder); // Parse the tag, don't care about the content
+                        TryAccept(SyntaxKind.ForwardSlash);
+                        TryAccept(SyntaxKind.CloseAngle);
+
+                        // If the script tag expects javascript content then we should do minimal parsing until we reach
+                        // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
+                        if (scriptTag && !CurrentScriptTagExpectsHtml(tagBuilder))
+                        {
+                            tagBuilder.Add(OutputAsMarkupLiteral());
+                            var block = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                            builder.Add(block);
+
+                            SkipToEndScriptAndParseCode(builder);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        // Parsing an end tag
+                        // This section can accept things like: '</p  >' or '</p>' etc.
+                        TryAccept(SyntaxKind.ForwardSlash);
+
+                        // Whitespace here is invalid (according to the spec)
+                        ParseOptionalBangEscape(tagBuilder);
+                        TryAccept(SyntaxKind.Text);
+                        TryAccept(SyntaxKind.Whitespace);
+                        TryAccept(SyntaxKind.CloseAngle);
+                    }
+
+                    tagBuilder.Add(OutputAsMarkupLiteral());
+
+                    // End tag block
+                    var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                    builder.Add(tagBlock);
+                }
+            }
+        }
+
+        private void ParseTagContent(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
+            {
+                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
+                RecoverToEndOfTag(builder);
+            }
+            else
+            {
+                // We are here ($): <tag$ foo="bar" biz="~/Baz" />
+                while (!EndOfFile && !IsEndOfTag())
+                {
+                    BeforeAttribute(builder);
+                }
+            }
+        }
+
+        private bool IsEndOfTag()
+        {
+            if (At(SyntaxKind.ForwardSlash))
+            {
+                if (NextIs(SyntaxKind.CloseAngle))
+                {
+                    return true;
+                }
+                else
+                {
+                    AcceptAndMoveNext();
+                }
+            }
+            return At(SyntaxKind.CloseAngle) || At(SyntaxKind.OpenAngle);
+        }
+
+        private void BeforeAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
+            // Capture whitespace
+            var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
+            {
+                // Transition outside of attribute value => Switch to recovery mode
+                Accept(whitespace);
+                RecoverToEndOfTag(builder);
+                return;
+            }
+
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
+            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
+            var nameTokens = Enumerable.Empty<SyntaxToken>();
+            var whitespaceAfterAttributeName = Enumerable.Empty<SyntaxToken>();
+            if (IsValidAttributeNameToken(CurrentToken))
+            {
+                nameTokens = ReadWhile(token =>
+                                 token.Kind != SyntaxKind.Whitespace &&
+                                 token.Kind != SyntaxKind.NewLine &&
+                                 token.Kind != SyntaxKind.Equals &&
+                                 token.Kind != SyntaxKind.CloseAngle &&
+                                 token.Kind != SyntaxKind.OpenAngle &&
+                                 (token.Kind != SyntaxKind.ForwardSlash || !NextIs(SyntaxKind.CloseAngle)));
+
+                // capture whitespace after attribute name (if any)
+                whitespaceAfterAttributeName = ReadWhile(
+                    token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            }
+            else
+            {
+                // Unexpected character in tag, enter recovery
+                Accept(whitespace);
+                RecoverToEndOfTag(builder);
+                return;
+            }
+
+            if (!At(SyntaxKind.Equals))
+            {
+                // Minimized attribute
+
+                // We are at the prefix of the next attribute or the end of tag. Put it back so it is parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterAttributeName);
+
+                // Output anything prior to the attribute, in most cases this will be the tag name:
+                // |<input| checked />. If in-between other attributes this will noop or output malformed attribute
+                // content (if the previous attribute was malformed).
+                builder.Add(OutputAsMarkupLiteral());
+
+                Accept(whitespace);
+                var namePrefix = OutputAsMarkupLiteral();
+                Accept(nameTokens);
+                var name = OutputAsMarkupLiteral();
+
+                var minimizedAttributeBlock = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+                builder.Add(minimizedAttributeBlock);
+
+                return;
+            }
+
+            // Not a minimized attribute, parse as if it were well-formed (if attribute turns out to be malformed we
+            // will go into recovery).
+            builder.Add(OutputAsMarkupLiteral());
+
+            var attributeBlock = ParseAttributePrefix(whitespace, nameTokens, whitespaceAfterAttributeName);
+
+            builder.Add(attributeBlock);
+        }
+
+        private MarkupAttributeBlockSyntax ParseAttributePrefix(
+            IEnumerable<SyntaxToken> whitespace,
+            IEnumerable<SyntaxToken> nameTokens,
+            IEnumerable<SyntaxToken> whitespaceAfterAttributeName)
+        {
+            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
+            var nameContent = string.Concat(nameTokens.Select(s => s.Content));
+            var attributeCanBeConditional =
+                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
+                !nameContent.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
+
+            // Accept the whitespace and name
+            Accept(whitespace);
+            var namePrefix = OutputAsMarkupLiteral();
+            Accept(nameTokens);
+            var name = OutputAsMarkupLiteral();
+
+            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
+            Accept(whitespaceAfterAttributeName);
+            var nameSuffix = OutputAsMarkupLiteral();
+            Assert(SyntaxKind.Equals); // We should be at "="
+            var equalsToken = EatCurrentToken();
+
+            var whitespaceAfterEquals = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            var quote = SyntaxKind.Marker;
+            if (At(SyntaxKind.SingleQuote) || At(SyntaxKind.DoubleQuote))
+            {
+                // Found a quote, the whitespace belongs to this attribute.
+                Accept(whitespaceAfterEquals);
+                quote = CurrentToken.Kind;
+                AcceptAndMoveNext();
+            }
+            else if (whitespaceAfterEquals.Any())
+            {
+                // No quotes found after the whitespace. Put it back so that it can be parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterEquals);
+            }
+
+            MarkupTextLiteralSyntax valuePrefix = null;
+            RazorBlockSyntax attributeValue = null;
+            MarkupTextLiteralSyntax valueSuffix = null;
+
+            if (attributeCanBeConditional)
+            {
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
+
+                // We now have the value prefix which is usually whitespace and/or a quote
+                valuePrefix = OutputAsMarkupLiteral();
+
+                // Read the attribute value only if the value is quoted
+                // or if there is no whitespace between '=' and the unquoted value.
+                if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+                {
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var attributeValueBuilder = pooledResult.Builder;
+                        // Read the attribute value.
+                        while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
+                        {
+                            ParseAttributeValue(attributeValueBuilder, quote);
+                        }
+
+                        if (attributeValueBuilder.Count > 0)
+                        {
+                            attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+                        }
+                    }
+                }
+
+                // Capture the suffix
+                if (quote != SyntaxKind.Marker && At(quote))
+                {
+                    AcceptAndMoveNext();
+                    // Again, block chunk generator will render the suffix
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+            {
+                valuePrefix = OutputAsMarkupLiteral();
+
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var attributeValueBuilder = pooledResult.Builder;
+                    // Not a "conditional" attribute, so just read the value
+                    SkipToAndParseCode(attributeValueBuilder, token => IsEndOfAttributeValue(quote, token));
+
+                    // Output already accepted tokens if any as markup literal
+                    var literalValue = OutputAsMarkupLiteral();
+                    attributeValueBuilder.Add(literalValue);
+
+                    // Capture the attribute value (will include everything in-between the attribute's quotes).
+                    attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+                }
+
+                if (quote != SyntaxKind.Marker)
+                {
+                    TryAccept(quote);
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else
+            {
+                // There is no quote and there is whitespace after equals. There is no attribute value.
+            }
+
+            return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, attributeValue, valueSuffix);
+        }
+
+        private void ParseAttributeValue(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind quote)
+        {
+            var prefixStart = CurrentStart;
+            var prefixTokens = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition))
+            {
+                if (NextIs(SyntaxKind.Transition))
+                {
+                    // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it.
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var markupBuilder = pooledResult.Builder;
+                        Accept(prefixTokens);
+
+                        // Render a single "@" in place of "@@".
+                        SpanContext.ChunkGenerator = new LiteralAttributeChunkGenerator(
+                            new LocationTagged<string>(string.Concat(prefixTokens.Select(s => s.Content)), prefixStart),
+                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupLiteral());
+
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupEphemeralLiteral());
+
+                        var markupBlock = SyntaxFactory.MarkupBlock(markupBuilder.ToList());
+                        builder.Add(markupBlock);
+                    }
+                }
+                else
+                {
+                    Accept(prefixTokens);
+                    var valueStart = CurrentStart;
+                    PutCurrentBack();
+
+                    var prefix = OutputAsMarkupLiteral();
+
+                    // Dynamic value, start a new block and set the chunk generator
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var dynamicAttributeValueBuilder = pooledResult.Builder;
+
+                        OtherParserBlock(dynamicAttributeValueBuilder);
+                        var value = SyntaxFactory.MarkupDynamicAttributeValue(prefix, SyntaxFactory.GenericBlock(dynamicAttributeValueBuilder.ToList()));
+                        builder.Add(value);
+                    }
+                }
+            }
+            else
+            {
+                Accept(prefixTokens);
+                var prefix = OutputAsMarkupLiteral();
+
+                // Literal value
+                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
+                // "Unknown" type.
+                var valueTokens = ReadWhile(token =>
+                    // These three conditions find separators which break the attribute value into portions
+                    token.Kind != SyntaxKind.Whitespace &&
+                    token.Kind != SyntaxKind.NewLine &&
+                    token.Kind != SyntaxKind.Transition &&
+                    // This condition checks for the end of the attribute value (it repeats some of the checks above
+                    // but for now that's ok)
+                    !IsEndOfAttributeValue(quote, token));
+                Accept(valueTokens);
+                var value = OutputAsMarkupLiteral();
+
+                var literalAttributeValue = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+                builder.Add(literalAttributeValue);
+            }
+        }
+
+        private void RecoverToEndOfTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Accept until ">", "/" or "<", but parse code
+            while (!EndOfFile)
+            {
+                SkipToAndParseCode(builder, IsTagRecoveryStopPoint);
+                if (!EndOfFile)
+                {
+                    EnsureCurrent();
+                    switch (CurrentToken.Kind)
+                    {
+                        case SyntaxKind.SingleQuote:
+                        case SyntaxKind.DoubleQuote:
+                            ParseQuoted(builder);
+                            break;
+                        case SyntaxKind.OpenAngle:
+                        // Another "<" means this tag is invalid.
+                        case SyntaxKind.ForwardSlash:
+                        // Empty tag
+                        case SyntaxKind.CloseAngle:
+                            // End of tag
+                            return;
+                        default:
+                            AcceptAndMoveNext();
+                            break;
+                    }
+                }
+            }
+        }
+
+        private bool IsTagRecoveryStopPoint(SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.ForwardSlash ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.DoubleQuote;
+        }
+
+        private bool IsEndOfAttributeValue(SyntaxKind quote, SyntaxToken token)
+        {
+            return EndOfFile || token == null ||
+                   (quote != SyntaxKind.Marker
+                        ? token.Kind == quote // If quoted, just wait for the quote
+                        : IsUnquotedEndOfAttributeValue(token));
+        }
+
+        private bool IsUnquotedEndOfAttributeValue(SyntaxToken token)
+        {
+            // If unquoted, we have a larger set of terminating characters:
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
+            // Also we need to detect "/" and ">"
+            return token.Kind == SyntaxKind.DoubleQuote ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.Equals ||
+                   (token.Kind == SyntaxKind.ForwardSlash && NextIs(SyntaxKind.CloseAngle)) ||
+                   token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.Whitespace ||
+                   token.Kind == SyntaxKind.NewLine;
+        }
+
+        private void ParseQuoted(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            var type = CurrentToken.Kind;
+            AcceptAndMoveNext();
+            SkipToAndParseCode(builder, type);
+            if (!EndOfFile)
+            {
+                Assert(type);
+                AcceptAndMoveNext();
+            }
+        }
+
+        private bool ParseBangTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Accept "!"
+            Assert(SyntaxKind.Bang);
+
+            if (AcceptAndMoveNext())
+            {
+                if (IsHtmlCommentAhead())
+                {
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var htmlCommentBuilder = pooledResult.Builder;
+
+                        // Accept the double-hyphen token at the beginning of the comment block.
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                        while (!EndOfFile)
+                        {
+                            SkipToAndParseCode(htmlCommentBuilder, SyntaxKind.DoubleHyphen);
+                            var lastDoubleHyphen = AcceptAllButLastDoubleHyphens();
+
+                            if (At(SyntaxKind.CloseAngle))
+                            {
+                                // Output the content in the comment block as a separate markup
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+
+                                // This is the end of a comment block
+                                Accept(lastDoubleHyphen);
+                                AcceptAndMoveNext();
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+                                var commentBlock = SyntaxFactory.MarkupCommentBlock(htmlCommentBuilder.ToList());
+                                builder.Add(commentBlock);
+                                return true;
+                            }
+                            else if (lastDoubleHyphen != null)
+                            {
+                                Accept(lastDoubleHyphen);
+                            }
+                        }
+                    }
+                }
+                else if (CurrentToken.Kind == SyntaxKind.LeftBracket)
+                {
+                    if (AcceptAndMoveNext())
+                    {
+                        return TryParseCData(builder);
+                    }
+                }
+                else
+                {
+                    AcceptAndMoveNext();
+                    return AcceptTokenUntilAll(builder, SyntaxKind.CloseAngle);
+                }
+            }
+
+            return false;
+        }
+
+        internal static bool IsHyphen(SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.Text && token.Content == "-";
+        }
+
+        protected bool IsHtmlCommentAhead()
+        {
+            // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
+
+            // Comments must have the following format:
+            // 1. The string "<!--"
+            // 2. Optionally, text, with the additional restriction that the text
+            //      2.1 must not start with the string ">" nor start with the string "->"
+            //      2.2 nor contain the strings
+            //          2.2.1 "<!--"
+            //          2.2.2 "-->" As we will be treating this as a comment ending, there is no need to handle this case at all.
+            //          2.2.3 "--!>"
+            //      2.3 nor end with the string "<!-".
+            // 3. The string "-->"
+
+            if (CurrentToken.Kind != SyntaxKind.DoubleHyphen)
+            {
+                return false;
+            }
+
+            // Check condition 2.1
+            if (NextIs(SyntaxKind.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(SyntaxKind.CloseAngle)))
+            {
+                return false;
+            }
+
+            // Check condition 2.2
+            var isValidComment = false;
+            LookaheadUntil((token, prevTokens) =>
+            {
+                if (token.Kind == SyntaxKind.DoubleHyphen)
+                {
+                    if (NextIs(SyntaxKind.CloseAngle))
+                    {
+                        // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
+                        isValidComment = !IsCommentContentEndingInvalid(prevTokens);
+                        return true;
+                    }
+                    else if (NextIs(ns => IsHyphen(ns) && NextIs(SyntaxKind.CloseAngle)))
+                    {
+                        // Check condition 2.3: we're at the end of a comment, which has an extra dash.
+                        // Need to treat the dash as part of the content and check the ending.
+                        // However, that case would have already been checked as part of check from 2.2.1 which
+                        // would already fail this iteration and we wouldn't get here
+                        isValidComment = true;
+                        return true;
+                    }
+                    else if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.CloseAngle)))
+                    {
+                        // This is condition 2.2.3
+                        isValidComment = false;
+                        return true;
+                    }
+                }
+                else if (token.Kind == SyntaxKind.OpenAngle)
+                {
+                    // Checking condition 2.2.1
+                    if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.DoubleHyphen)))
+                    {
+                        isValidComment = false;
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+
+            return isValidComment;
+        }
+
+        /// <summary>
+        /// Verifies, that the sequence doesn't end with the "&lt;!-" HtmlTokens. Note, the first token is an opening bracket token
+        /// </summary>
+        internal static bool IsCommentContentEndingInvalid(IEnumerable<SyntaxToken> sequence)
+        {
+            var reversedSequence = sequence.Reverse();
+            var index = 0;
+            foreach (var item in reversedSequence)
+            {
+                if (!item.IsEquivalentTo(nonAllowedHtmlCommentEnding[index++]))
+                {
+                    return false;
+                }
+
+                if (index == nonAllowedHtmlCommentEnding.Length)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool TryParseCData(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
+            {
+                if (AcceptAndMoveNext())
+                {
+                    if (CurrentToken.Kind == SyntaxKind.LeftBracket)
+                    {
+                        return AcceptTokenUntilAll(builder, SyntaxKind.RightBracket, SyntaxKind.RightBracket, SyntaxKind.CloseAngle);
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private bool TryParseXmlPI(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Accept "?"
+            Assert(SyntaxKind.QuestionMark);
+            AcceptAndMoveNext();
+            return AcceptTokenUntilAll(builder, SyntaxKind.QuestionMark, SyntaxKind.CloseAngle);
+        }
+
+        private void ParseOptionalBangEscape(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (IsBangEscape(lookahead: 0))
+            {
+                builder.Add(OutputAsMarkupLiteral());
+
+                // Accept the parser escape character '!'.
+                Assert(SyntaxKind.Bang);
+                AcceptAndMoveNext();
+
+                // Setup the metacode span that we will be outputing.
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output()));
+            }
+        }
+
+        private bool IsBangEscape(int lookahead)
+        {
+            var potentialBang = Lookahead(lookahead);
+
+            if (potentialBang != null &&
+                potentialBang.Kind == SyntaxKind.Bang)
+            {
+                var afterBang = Lookahead(lookahead + 1);
+
+                return afterBang != null &&
+                    afterBang.Kind == SyntaxKind.Text &&
+                    !string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase);
+            }
+
+            return false;
+        }
+
+        private void SkipToEndScriptAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
+        {
+            // Special case for <script>: Skip to end of script tag and parse code
+            var seenEndScript = false;
+
+            while (!seenEndScript && !EndOfFile)
+            {
+                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+                var tagStart = CurrentStart;
+
+                if (NextIs(SyntaxKind.ForwardSlash))
+                {
+                    var openAngle = CurrentToken;
+                    NextToken(); // Skip over '<', current is '/'
+                    var solidus = CurrentToken;
+                    NextToken(); // Skip over '/', current should be text
+
+                    if (At(SyntaxKind.Text) &&
+                        string.Equals(CurrentToken.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        seenEndScript = true;
+                    }
+
+                    // We put everything back because we just wanted to look ahead to see if the current end tag that we're parsing is
+                    // the script tag.  If so we'll generate correct code to encompass it.
+                    PutCurrentBack(); // Put back whatever was after the solidus
+                    PutBack(solidus); // Put back '/'
+                    PutBack(openAngle); // Put back '<'
+
+                    // We just looked ahead, this NextToken will set CurrentToken to an open angle bracket.
+                    NextToken();
+                }
+
+                if (seenEndScript)
+                {
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var tagBuilder = pooledResult.Builder;
+                        SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+
+                        AcceptAndMoveNext(); // '<'
+                        AcceptAndMoveNext(); // '/'
+                        SkipToAndParseCode(tagBuilder, SyntaxKind.CloseAngle);
+                        if (!TryAccept(SyntaxKind.CloseAngle))
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                                    new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
+                                    ScriptTagName));
+                            var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+                            Accept(closeAngle);
+                        }
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+                    }
+                }
+                else
+                {
+                    AcceptAndMoveNext(); // Accept '<' (not the closing script tag's open angle)
+                }
+            }
+        }
+
+        private bool CurrentScriptTagExpectsHtml(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Debug.Assert(!builder.IsNull);
+
+            MarkupAttributeBlockSyntax typeAttribute = null;
+            for (var i = 0; i < builder.Count; i++)
+            {
+                var node = builder[i];
+                if (node.IsToken || node.IsTrivia)
+                {
+                    continue;
+                }
+
+                if (node is MarkupAttributeBlockSyntax attributeBlock &&
+                    attributeBlock.Value.Children.Count > 0 &&
+                    IsTypeAttribute(attributeBlock))
+                {
+                    typeAttribute = attributeBlock;
+                    break;
+                }
+            }
+
+            if (typeAttribute != null)
+            {
+                var contentValues = typeAttribute.Value.CreateRed().DescendantNodes().Where(n => n.IsToken).Cast<Syntax.SyntaxToken>();
+
+                var scriptType = string.Concat(contentValues.Select(t => t.Content)).Trim();
+
+                // Does not allow charset parameter (or any other parameters).
+                return string.Equals(scriptType, "text/html", StringComparison.OrdinalIgnoreCase);
+            }
+
+            return false;
+        }
+
+        private static bool IsTypeAttribute(MarkupAttributeBlockSyntax attributeBlock)
+        {
+            if (attributeBlock.Name.LiteralTokens.Count == 0)
+            {
+                return false;
+            }
+
+            var trimmedStartContent = attributeBlock.Name.ToFullString().TrimStart();
+            if (trimmedStartContent.StartsWith("type", StringComparison.OrdinalIgnoreCase) &&
+                (trimmedStartContent.Length == 4 ||
+                ValidAfterTypeAttributeNameCharacters.Contains(trimmedStartContent[4])))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        protected SyntaxToken AcceptAllButLastDoubleHyphens()
+        {
+            var lastDoubleHyphen = CurrentToken;
+            AcceptWhile(s =>
+            {
+                if (NextIs(SyntaxKind.DoubleHyphen))
+                {
+                    lastDoubleHyphen = s;
+                    return true;
+                }
+
+                return false;
+            });
+
+            NextToken();
+
+            if (At(SyntaxKind.Text) && IsHyphen(CurrentToken))
+            {
+                // Doing this here to maintain the order of tokens
+                if (!NextIs(SyntaxKind.CloseAngle))
+                {
+                    Accept(lastDoubleHyphen);
+                    lastDoubleHyphen = null;
+                }
+
+                AcceptAndMoveNext();
+            }
+
+            return lastDoubleHyphen;
+        }
+
+        private bool AcceptTokenUntilAll(in SyntaxListBuilder<RazorSyntaxNode> builder, params SyntaxKind[] endSequence)
+        {
+            while (!EndOfFile)
+            {
+                SkipToAndParseCode(builder, endSequence[0]);
+                if (AcceptAll(endSequence))
+                {
+                    return true;
+                }
+            }
+            Debug.Assert(EndOfFile);
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            return false;
+        }
+
+        public MarkupBlockSyntax ParseBlock()
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+                if (!NextToken())
+                {
+                    return null;
+                }
+
+                AcceptWhile(IsSpacingToken(includeNewLines: true));
+
+                if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+                {
+                    // "<" => Implicit Tag Block
+                    ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+                }
+                else if (CurrentToken.Kind == SyntaxKind.Transition)
+                {
+                    // "@" => Explicit Tag/Single Line Block OR Template
+
+                    // Output whitespace
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    // Definitely have a transition span
+                    Assert(SyntaxKind.Transition);
+                    AcceptAndMoveNext();
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+                    builder.Add(transition);
+                    if (At(SyntaxKind.Transition))
+                    {
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                    }
+                    ParseAfterTransition(builder);
+                }
+                else
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
+                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                }
+                builder.Add(OutputAsMarkupLiteral());
+
+                var markupBlock = builder.ToList();
+
+                return SyntaxFactory.MarkupBlock(markupBlock);
+            }
+        }
+
+        private void ParseAfterTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // "@:" => Explicit Single Line Block
+            if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
+            {
+                // Split the token
+                var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
+
+                // The first part (left) is added to this span and we return a MetaCode span
+                Accept(split.Item1);
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                if (split.Item2 != null)
+                {
+                    Accept(split.Item2);
+                }
+                NextToken();
+                ParseSingleLineMarkup(builder);
+            }
+            else if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+            {
+                ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+            }
+        }
+
+        private void ParseSingleLineMarkup(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Parse until a newline, it's that simple!
+            // First, signal to code parser that whitespace is significant to us.
+            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
+            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
+            SpanContext.EditHandler = new SpanEditHandler(Language.TokenizeString);
+            SkipToAndParseCode(builder, SyntaxKind.NewLine);
+            if (!EndOfFile && CurrentToken.Kind == SyntaxKind.NewLine)
+            {
+                AcceptAndMoveNext();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            PutCurrentBack();
+            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
+        private void ParseTagBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            // TODO: This is really ugly and needs to be cleaned up.
+
+            // Skip Whitespace and Text
+            var completeTag = false;
+            var blockAlreadyBuilt = false;
+            do
+            {
+                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+
+                // Output everything prior to the OpenAngle into a markup span
+                builder.Add(OutputAsMarkupLiteral());
+
+                var tagBuilder = builder;
+                IDisposable tagBuilderDisposable = null;
+                try
+                {
+                    if (EndOfFile)
+                    {
+                        // Do not want to start a new tag block if we're at the end of the file.
+                        EndTagBlock(builder, tags, complete: true);
+                    }
+                    else
+                    {
+                        var atSpecialTag = AtSpecialTag;
+                        if (!atSpecialTag)
+                        {
+                            // Start a tag block.  This is used to wrap things like <p> or <a class="btn"> etc.
+                            var pooledResult = Pool.Allocate<RazorSyntaxNode>();
+                            tagBuilderDisposable = pooledResult;
+                            tagBuilder = pooledResult.Builder;
+                        }
+                        _bufferedOpenAngle = null;
+                        _lastTagStart = CurrentStart;
+                        Assert(SyntaxKind.OpenAngle);
+                        _bufferedOpenAngle = CurrentToken;
+                        var tagStart = CurrentStart;
+                        if (!NextToken())
+                        {
+                            Accept(_bufferedOpenAngle);
+                            EndTagBlock(tagBuilder, tags, complete: false);
+                        }
+                        else if (atSpecialTag && At(SyntaxKind.Bang))
+                        {
+                            Accept(_bufferedOpenAngle);
+                            completeTag = ParseBangTag(builder);
+                            blockAlreadyBuilt = completeTag;
+                        }
+                        else
+                        {
+                            var result = ParseAfterTagStart(tagBuilder, builder, tagStart, tags);
+                            completeTag = result.Item1;
+                            blockAlreadyBuilt = result.Item2;
+                        }
+                    }
+
+                    if (completeTag)
+                    {
+                        // Completed tags have no accepted characters inside of blocks.
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    }
+
+                    if (blockAlreadyBuilt)
+                    {
+                        // Output the contents of the tag into its own markup span.
+                        builder.Add(OutputAsMarkupLiteral());
+                    }
+                    else if (tagBuilderDisposable != null)
+                    {
+                        // A new tag block was started. Build it.
+                        // Output the contents of the tag into its own markup span.
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                        builder.Add(tagBlock);
+                    }
+                }
+                finally
+                {
+                    // Will be null if we were at end of file or special tag when initially created.
+                    if (tagBuilderDisposable != null)
+                    {
+                        // End tag block
+                        tagBuilderDisposable.Dispose();
+                    }
+                }
+            }
+            while (tags.Count > 0);
+
+            EndTagBlock(builder, tags, completeTag);
+        }
+
+        private Tuple<bool, bool> ParseAfterTagStart(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SourceLocation tagStart,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            var blockAlreadyBuilt = false;
+            if (!EndOfFile)
+            {
+                switch (CurrentToken.Kind)
+                {
+                    case SyntaxKind.ForwardSlash:
+                        // End Tag
+                        return ParseEndTag(builder, parentBuilder, tagStart, tags);
+                    case SyntaxKind.QuestionMark:
+                        // XML PI
+                        Accept(_bufferedOpenAngle);
+                        var complete = TryParseXmlPI(builder);
+                        // No block is created for Xml PI. So return the same value as complete.
+                        blockAlreadyBuilt = complete;
+                        return Tuple.Create(complete, blockAlreadyBuilt);
+                    default:
+                        // Start Tag
+                        return ParseStartTag(builder, parentBuilder, tags);
+                }
+            }
+            if (tags.Count == 0)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_OuterTagMissingName(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
+            }
+
+            return Tuple.Create(false, blockAlreadyBuilt);
+        }
+
+        private Tuple<bool, bool> ParseStartTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            SyntaxToken bangToken = null;
+            SyntaxToken potentialTagNameToken;
+
+            if (At(SyntaxKind.Bang))
+            {
+                bangToken = CurrentToken;
+
+                potentialTagNameToken = Lookahead(count: 1);
+            }
+            else
+            {
+                potentialTagNameToken = CurrentToken;
+            }
+
+            SyntaxToken tagName;
+
+            if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.Text)
+            {
+                tagName = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+            }
+            else if (bangToken != null)
+            {
+                tagName = SyntaxFactory.Token(SyntaxKind.Text, "!" + potentialTagNameToken.Content);
+            }
+            else
+            {
+                tagName = potentialTagNameToken;
+            }
+
+            var tag = Tuple.Create(tagName, _lastTagStart);
+
+            if (tags.Count == 0 &&
+                // Note tagName may contain a '!' escape character. This ensures <!text> doesn't match here.
+                // <!text> tags are treated like any other escaped HTML start tag.
+                string.Equals(tag.Item1.Content, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+            {
+                builder.Add(OutputAsMarkupLiteral());
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+                Accept(_bufferedOpenAngle);
+                var textLocation = CurrentStart;
+                Assert(SyntaxKind.Text);
+
+                AcceptAndMoveNext();
+
+                var bookmark = CurrentStart.AbsoluteIndex;
+                var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+                var empty = At(SyntaxKind.ForwardSlash);
+                if (empty)
+                {
+                    Accept(tokens);
+                    Assert(SyntaxKind.ForwardSlash);
+                    AcceptAndMoveNext();
+                    bookmark = CurrentStart.AbsoluteIndex;
+                    tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+                }
+
+                if (!TryAccept(SyntaxKind.CloseAngle))
+                {
+                    Context.Source.Position = bookmark;
+                    NextToken();
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                    RecoverTextTag();
+                }
+                else
+                {
+                    Accept(tokens);
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+
+                if (!empty)
+                {
+                    tags.Push(tag);
+                }
+
+                var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+                builder.Add(transition);
+                var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                parentBuilder.Add(tagBlock);
+
+                return Tuple.Create(true, true);
+            }
+
+            Accept(_bufferedOpenAngle);
+            ParseOptionalBangEscape(builder);
+            TryAccept(SyntaxKind.Text);
+            return ParseRestOfTag(builder, parentBuilder, tag, tags);
+        }
+
+        private Tuple<bool, bool> ParseRestOfTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            Tuple<SyntaxToken, SourceLocation> tag,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            var blockAlreadyBuilt = false;
+            ParseTagContent(builder);
+
+            // We are now at a possible end of the tag
+            // Found '<', so we just abort this tag.
+            if (At(SyntaxKind.OpenAngle))
+            {
+                return Tuple.Create(false, blockAlreadyBuilt);
+            }
+
+            var isEmpty = At(SyntaxKind.ForwardSlash);
+            // Found a solidus, so don't accept it but DON'T push the tag to the stack
+            if (isEmpty)
+            {
+                AcceptAndMoveNext();
+            }
+
+            // Check for the '>' to determine if the tag is finished
+            var seenClose = TryAccept(SyntaxKind.CloseAngle);
+            if (!seenClose)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(tag.Item2, "<"),
+                            Math.Max(tag.Item1.Content.Length, 1)),
+                        tag.Item1.Content));
+            }
+            else
+            {
+                if (!isEmpty)
+                {
+                    // Is this a void element?
+                    var tagName = tag.Item1.Content.Trim();
+                    if (VoidElements.Contains(tagName))
+                    {
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        builder.Add(OutputAsMarkupLiteral());
+                        var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                        parentBuilder.Add(tagBlock);
+                        blockAlreadyBuilt = true;
+
+                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
+                        // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it
+                        // Place a bookmark
+                        var bookmark = CurrentStart.AbsoluteIndex;
+
+                        // Skip whitespace
+                        var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
+
+                        // Open Angle
+                        if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
+                        {
+                            var openAngle = CurrentToken;
+                            NextToken();
+                            Assert(SyntaxKind.ForwardSlash);
+                            var solidus = CurrentToken;
+                            NextToken();
+                            if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
+                            {
+                                // Accept up to here
+                                Accept(whiteSpace);
+                                parentBuilder.Add(OutputAsMarkupLiteral()); // Output the whitespace
+
+                                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                                {
+                                    var tagBuilder = pooledResult.Builder;
+                                    Accept(openAngle);
+                                    Accept(solidus);
+                                    AcceptAndMoveNext();
+
+                                    // Accept to '>', '<' or EOF
+                                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
+                                    // Accept the '>' if we saw it. And if we do see it, we're complete
+                                    var complete = TryAccept(SyntaxKind.CloseAngle);
+
+                                    if (complete)
+                                    {
+                                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                                    }
+
+                                    // Output the closing void element
+                                    tagBuilder.Add(OutputAsMarkupLiteral());
+                                    parentBuilder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+
+                                    return Tuple.Create(complete, blockAlreadyBuilt);
+                                }
+                            }
+                        }
+
+                        // Go back to the bookmark and just finish this tag at the close angle
+                        Context.Source.Position = bookmark;
+                        NextToken();
+                    }
+                    else if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        if (!CurrentScriptTagExpectsHtml(builder))
+                        {
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                            builder.Add(OutputAsMarkupLiteral());
+                            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                            parentBuilder.Add(tagBlock);
+                            blockAlreadyBuilt = true;
+
+                            SkipToEndScriptAndParseCode(parentBuilder, endTagAcceptedCharacters: AcceptedCharactersInternal.None);
+                        }
+                        else
+                        {
+                            // Push the script tag onto the tag stack, it should be treated like all other HTML tags.
+                            tags.Push(tag);
+                        }
+                    }
+                    else
+                    {
+                        // Push the tag on to the stack
+                        tags.Push(tag);
+                    }
+                }
+            }
+            return Tuple.Create(seenClose, blockAlreadyBuilt);
+        }
+
+        private Tuple<bool, bool> ParseEndTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SourceLocation tagStart,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            // Accept "/" and move next
+            Assert(SyntaxKind.ForwardSlash);
+            var forwardSlash = CurrentToken;
+            if (!NextToken())
+            {
+                Accept(_bufferedOpenAngle);
+                Accept(forwardSlash);
+                return Tuple.Create(false, false);
+            }
+            else
+            {
+                var tagName = string.Empty;
+                SyntaxToken bangToken = null;
+
+                if (At(SyntaxKind.Bang))
+                {
+                    bangToken = CurrentToken;
+
+                    var nextToken = Lookahead(count: 1);
+
+                    if (nextToken != null && nextToken.Kind == SyntaxKind.Text)
+                    {
+                        tagName = "!" + nextToken.Content;
+                    }
+                }
+                else if (At(SyntaxKind.Text))
+                {
+                    tagName = CurrentToken.Content;
+                }
+
+                var matched = RemoveTag(tags, tagName, tagStart);
+
+                if (tags.Count == 0 &&
+                    // Note tagName may contain a '!' escape character. This ensures </!text> doesn't match here.
+                    // </!text> tags are treated like any other escaped HTML end tag.
+                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) &&
+                    matched)
+                {
+                    return EndTextTag(builder, parentBuilder, forwardSlash);
+                }
+                Accept(_bufferedOpenAngle);
+                Accept(forwardSlash);
+
+                ParseOptionalBangEscape(builder);
+
+                AcceptUntil(SyntaxKind.CloseAngle);
+
+                // Accept the ">"
+                return Tuple.Create(TryAccept(SyntaxKind.CloseAngle), false);
+            }
+        }
+
+        private Tuple<bool, bool> EndTextTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SyntaxToken solidus)
+        {
+            Accept(_bufferedOpenAngle);
+            Accept(solidus);
+
+            var textLocation = CurrentStart;
+            Assert(SyntaxKind.Text);
+            AcceptAndMoveNext();
+
+            var seenCloseAngle = TryAccept(SyntaxKind.CloseAngle);
+
+            if (!seenCloseAngle)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                RecoverTextTag();
+            }
+            else
+            {
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+            builder.Add(transition);
+            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+            parentBuilder.Add(tagBlock);
+
+            return Tuple.Create(seenCloseAngle, true);
+        }
+
+        private bool RemoveTag(Stack<Tuple<SyntaxToken, SourceLocation>> tags, string tagName, SourceLocation tagStart)
+        {
+            Tuple<SyntaxToken, SourceLocation> currentTag = null;
+            while (tags.Count > 0)
+            {
+                currentTag = tags.Pop();
+                if (string.Equals(tagName, currentTag.Item1.Content, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Matched the tag
+                    return true;
+                }
+            }
+            if (currentTag != null)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(currentTag.Item2, "<"),
+                            currentTag.Item1.Content.Length),
+                        currentTag.Item1.Content));
+            }
+            else
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
+                        new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), tagName.Length), tagName));
+            }
+            return false;
+        }
+
+        private void RecoverTextTag()
+        {
+            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
+            AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
+
+            // Include the close angle in the text tag block if it's there, otherwise just move on
+            TryAccept(SyntaxKind.CloseAngle);
+        }
+
+        private void EndTagBlock(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags,
+            bool complete)
+        {
+            if (tags.Count > 0)
+            {
+                // Ended because of EOF, not matching close tag.  Throw error for last tag
+                while (tags.Count > 1)
+                {
+                    tags.Pop();
+                }
+                var tag = tags.Pop();
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(tag.Item2, "<"),
+                            tag.Item1.Content.Length),
+                        tag.Item1.Content));
+            }
+            else if (complete)
+            {
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            tags.Clear();
+            if (!Context.DesignTimeMode)
+            {
+                var shouldAcceptWhitespaceAndNewLine = true;
+
+                // Check if the previous span was a transition.
+                var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
+                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
+                {
+                    var tokens = ReadWhile(
+                        f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
+
+                    // Make sure the current token is not markup, which can be html start tag or @:
+                    if (!(At(SyntaxKind.OpenAngle) ||
+                        (At(SyntaxKind.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
+                    {
+                        // Don't accept whitespace as markup if the end text tag is followed by csharp.
+                        shouldAcceptWhitespaceAndNewLine = false;
+                    }
+
+                    PutCurrentBack();
+                    PutBack(tokens);
+                    EnsureCurrent();
+                }
+
+                if (shouldAcceptWhitespaceAndNewLine)
+                {
+                    // Accept whitespace and a single newline if present
+                    AcceptWhile(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.NewLine);
+                }
+            }
+            else if (SpanContext.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any)
+            {
+                AcceptWhile(SyntaxKind.Whitespace);
+                TryAccept(SyntaxKind.NewLine);
+            }
+            PutCurrentBack();
+
+            if (!complete)
+            {
+                AcceptMarkerTokenIfNecessary();
+            }
+
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
+        public MarkupBlockSyntax ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+
+                NextToken();
+                CaseSensitive = caseSensitive;
+                NestingBlock(builder, nestingSequences);
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputAsMarkupLiteral());
+
+                return SyntaxFactory.MarkupBlock(builder.ToList());
+            }
+        }
+
+        private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
+        {
+            var nesting = 1;
+            while (nesting > 0 && !EndOfFile)
+            {
+                SkipToAndParseCode(builder, token =>
+                    token.Kind == SyntaxKind.Text ||
+                    token.Kind == SyntaxKind.OpenAngle);
+                if (At(SyntaxKind.Text))
+                {
+                    nesting += ProcessTextToken(builder, nestingSequences, nesting);
+                    if (CurrentToken != null)
+                    {
+                        AcceptAndMoveNext();
+                    }
+                    else if (nesting > 0)
+                    {
+                        NextToken();
+                    }
+                }
+                else
+                {
+                    ParseTagInDocumentContext(builder);
+                }
+            }
+        }
+
+        private int ProcessTextToken(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences, int currentNesting)
+        {
+            for (var i = 0; i < CurrentToken.Content.Length; i++)
+            {
+                var nestingDelta = HandleNestingSequence(builder, nestingSequences.Item1, i, currentNesting, 1);
+                if (nestingDelta == 0)
+                {
+                    nestingDelta = HandleNestingSequence(builder, nestingSequences.Item2, i, currentNesting, -1);
+                }
+
+                if (nestingDelta != 0)
+                {
+                    return nestingDelta;
+                }
+            }
+            return 0;
+        }
+
+        private int HandleNestingSequence(in SyntaxListBuilder<RazorSyntaxNode> builder, string sequence, int position, int currentNesting, int retIfMatched)
+        {
+            if (sequence != null &&
+                CurrentToken.Content[position] == sequence[0] &&
+                position + sequence.Length <= CurrentToken.Content.Length)
+            {
+                var possibleStart = CurrentToken.Content.Substring(position, sequence.Length);
+                if (string.Equals(possibleStart, sequence, Comparison))
+                {
+                    // Capture the current token and "put it back" (really we just want to clear CurrentToken)
+                    var bookmark = CurrentStart;
+                    var token = CurrentToken;
+                    PutCurrentBack();
+
+                    // Carve up the token
+                    var pair = Language.SplitToken(token, position, SyntaxKind.Text);
+                    var preSequence = pair.Item1;
+                    Debug.Assert(pair.Item2 != null);
+                    pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
+                    var sequenceToken = pair.Item1;
+                    var postSequence = pair.Item2;
+                    var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;
+
+                    // Accept the first chunk (up to the nesting sequence we just saw)
+                    if (!string.IsNullOrEmpty(preSequence.Content))
+                    {
+                        Accept(preSequence);
+                    }
+
+                    if (currentNesting + retIfMatched == 0)
+                    {
+                        // This is 'popping' the final entry on the stack of nesting sequences
+                        // A caller higher in the parsing stack will accept the sequence token, so advance
+                        // to it
+                        Context.Source.Position = bookmark.AbsoluteIndex + preSequence.Content.Length;
+                    }
+                    else
+                    {
+                        // This isn't the end of the last nesting sequence, accept the token and keep going
+                        Accept(sequenceToken);
+
+                        // Position at the start of the postSequence token, which might be null.
+                        Context.Source.Position = postSequenceBookmark;
+                    }
+
+                    // Return the value we were asked to return if matched, since we found a nesting sequence
+                    return retIfMatched;
+                }
+            }
+            return 0;
+        }
+
+        private Syntax.GreenNode GetLastSpan(RazorSyntaxNode node)
+        {
+            if (node == null)
+            {
+                return null;
+            }
+
+            // Find the last token of this node and return its immediate non-list parent.
+            var red = node.CreateRed();
+            var last = red.GetLastTerminal();
+            if (last == null)
+            {
+                return null;
+            }
+
+            while (last.Green.IsToken || last.Green.IsList)
+            {
+                last = last.Parent;
+            }
+
+            return last.Green;
+        }
+
+        private void DefaultMarkupSpanContext(SpanContextBuilder spanContext)
+        {
+            spanContext.ChunkGenerator = new MarkupChunkGenerator();
+            spanContext.EditHandler = new SpanEditHandler(Language.TokenizeString, AcceptedCharactersInternal.Any);
+        }
+
+        private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            AcceptMarkerTokenIfNecessary();
+            builder.Add(OutputAsMarkupLiteral());
+
+            RazorSyntaxNode codeBlock;
+            using (PushSpanContextConfig())
+            {
+                codeBlock = CodeParser.ParseBlock();
+            }
+
+            builder.Add(codeBlock);
+            InitializeContext(SpanContext);
+            NextToken();
+        }
+
+        protected static Func<SyntaxToken, bool> IsSpacingToken(bool includeNewLines)
+        {
+            return token => token.Kind == SyntaxKind.Whitespace || (includeNewLines && token.Kind == SyntaxKind.NewLine);
+        }
+
+        internal static bool IsValidAttributeNameToken(SyntaxToken token)
+        {
+            if (token == null)
+            {
+                return false;
+            }
+
+            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
+            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
+            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
+            // expectation that the parser handles such scenarios prior to falling through to name resolution.
+            var tokenType = token.Kind;
+            return tokenType != SyntaxKind.Whitespace &&
+                tokenType != SyntaxKind.NewLine &&
+                tokenType != SyntaxKind.CloseAngle &&
+                tokenType != SyntaxKind.OpenAngle &&
+                tokenType != SyntaxKind.ForwardSlash &&
+                tokenType != SyntaxKind.DoubleQuote &&
+                tokenType != SyntaxKind.SingleQuote &&
+                tokenType != SyntaxKind.Equals &&
+                tokenType != SyntaxKind.Marker;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
new file mode 100644
index 0000000000..b06f49f9ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
@@ -0,0 +1,296 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    // Tokenizer _loosely_ based on http://dev.w3.org/html5/spec/Overview.html#tokenization
+    internal class HtmlTokenizer : Tokenizer
+    {
+        private const char TransitionChar = '@';
+
+        public HtmlTokenizer(ITextDocument source)
+            : base(source)
+        {
+            base.CurrentState = StartState;
+        }
+
+        protected override int StartState => (int)HtmlTokenizerState.Data;
+
+        private new HtmlTokenizerState? CurrentState => (HtmlTokenizerState?)base.CurrentState;
+
+        public override SyntaxKind RazorCommentKind
+        {
+            get { return SyntaxKind.RazorCommentLiteral; }
+        }
+
+        public override SyntaxKind RazorCommentTransitionKind
+        {
+            get { return SyntaxKind.RazorCommentTransition; }
+        }
+
+        public override SyntaxKind RazorCommentStarKind
+        {
+            get { return SyntaxKind.RazorCommentStar; }
+        }
+
+        protected override SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors)
+        {
+            return SyntaxFactory.Token(type, content, errors);
+        }
+
+        protected override StateResult Dispatch()
+        {
+            switch (CurrentState)
+            {
+                case HtmlTokenizerState.Data:
+                    return Data();
+                case HtmlTokenizerState.Text:
+                    return Text();
+                case HtmlTokenizerState.AfterRazorCommentTransition:
+                    return AfterRazorCommentTransition();
+                case HtmlTokenizerState.EscapedRazorCommentTransition:
+                    return EscapedRazorCommentTransition();
+                case HtmlTokenizerState.RazorCommentBody:
+                    return RazorCommentBody();
+                case HtmlTokenizerState.StarAfterRazorCommentBody:
+                    return StarAfterRazorCommentBody();
+                case HtmlTokenizerState.AtTokenAfterRazorCommentBody:
+                    return AtTokenAfterRazorCommentBody();
+                default:
+                    Debug.Fail("Invalid TokenizerState");
+                    return default(StateResult);
+            }
+        }
+
+        // Optimize memory allocation by returning constants for the most frequent cases
+        protected override string GetTokenContent(SyntaxKind type)
+        {
+            var tokenLength = Buffer.Length;
+
+            if (tokenLength == 1)
+            {
+                switch (type)
+                {
+                    case SyntaxKind.OpenAngle:
+                        return "<";
+                    case SyntaxKind.Bang:
+                        return "!";
+                    case SyntaxKind.ForwardSlash:
+                        return "/";
+                    case SyntaxKind.QuestionMark:
+                        return "?";
+                    case SyntaxKind.LeftBracket:
+                        return "[";
+                    case SyntaxKind.CloseAngle:
+                        return ">";
+                    case SyntaxKind.RightBracket:
+                        return "]";
+                    case SyntaxKind.Equals:
+                        return "=";
+                    case SyntaxKind.DoubleQuote:
+                        return "\"";
+                    case SyntaxKind.SingleQuote:
+                        return "'";
+                    case SyntaxKind.Whitespace:
+                        if (Buffer[0] == ' ')
+                        {
+                            return " ";
+                        }
+                        if (Buffer[0] == '\t')
+                        {
+                            return "\t";
+                        }
+                        break;
+                    case SyntaxKind.NewLine:
+                        if (Buffer[0] == '\n')
+                        {
+                            return "\n";
+                        }
+                        break;
+                }
+            }
+
+            if (tokenLength == 2 && type == SyntaxKind.NewLine)
+            {
+                return "\r\n";
+            }
+
+            return base.GetTokenContent(type);
+        }
+
+        // http://dev.w3.org/html5/spec/Overview.html#data-state
+        private StateResult Data()
+        {
+            if (ParserHelpers.IsWhitespace(CurrentCharacter))
+            {
+                return Stay(Whitespace());
+            }
+            else if (ParserHelpers.IsNewLine(CurrentCharacter))
+            {
+                return Stay(Newline());
+            }
+            else if (CurrentCharacter == '@')
+            {
+                TakeCurrent();
+                if (CurrentCharacter == '*')
+                {
+                    return Transition(
+                        HtmlTokenizerState.AfterRazorCommentTransition,
+                        EndToken(SyntaxKind.RazorCommentTransition));
+                }
+                else if (CurrentCharacter == '@')
+                {
+                    // Could be escaped comment transition
+                    return Transition(
+                        HtmlTokenizerState.EscapedRazorCommentTransition,
+                        EndToken(SyntaxKind.Transition));
+                }
+
+                return Stay(EndToken(SyntaxKind.Transition));
+            }
+            else if (AtToken())
+            {
+                return Stay(Token());
+            }
+            else
+            {
+                return Transition(HtmlTokenizerState.Text);
+            }
+        }
+
+        private StateResult EscapedRazorCommentTransition()
+        {
+            TakeCurrent();
+            return Transition(HtmlTokenizerState.Data, EndToken(SyntaxKind.Transition));
+        }
+
+        private StateResult Text()
+        {
+            var prev = '\0';
+            while (!EndOfFile &&
+                !(ParserHelpers.IsWhitespace(CurrentCharacter) || ParserHelpers.IsNewLine(CurrentCharacter)) &&
+                !AtToken())
+            {
+                prev = CurrentCharacter;
+                TakeCurrent();
+            }
+
+            if (CurrentCharacter == '@')
+            {
+                var next = Peek();
+                if ((ParserHelpers.IsLetter(prev) || ParserHelpers.IsDecimalDigit(prev)) &&
+                    (ParserHelpers.IsLetter(next) || ParserHelpers.IsDecimalDigit(next)))
+                {
+                    TakeCurrent(); // Take the "@"
+                    return Stay(); // Stay in the Text state
+                }
+            }
+
+            // Output the Text token and return to the Data state to tokenize the next character (if there is one)
+            return Transition(HtmlTokenizerState.Data, EndToken(SyntaxKind.Text));
+        }
+
+        private SyntaxToken Token()
+        {
+            Debug.Assert(AtToken());
+            var sym = CurrentCharacter;
+            TakeCurrent();
+            switch (sym)
+            {
+                case '<':
+                    return EndToken(SyntaxKind.OpenAngle);
+                case '!':
+                    return EndToken(SyntaxKind.Bang);
+                case '/':
+                    return EndToken(SyntaxKind.ForwardSlash);
+                case '?':
+                    return EndToken(SyntaxKind.QuestionMark);
+                case '[':
+                    return EndToken(SyntaxKind.LeftBracket);
+                case '>':
+                    return EndToken(SyntaxKind.CloseAngle);
+                case ']':
+                    return EndToken(SyntaxKind.RightBracket);
+                case '=':
+                    return EndToken(SyntaxKind.Equals);
+                case '"':
+                    return EndToken(SyntaxKind.DoubleQuote);
+                case '\'':
+                    return EndToken(SyntaxKind.SingleQuote);
+                case '-':
+                    Debug.Assert(CurrentCharacter == '-');
+                    TakeCurrent();
+                    return EndToken(SyntaxKind.DoubleHyphen);
+                default:
+                    Debug.Fail("Unexpected token!");
+                    return EndToken(SyntaxKind.Marker);
+            }
+        }
+
+        private SyntaxToken Whitespace()
+        {
+            while (ParserHelpers.IsWhitespace(CurrentCharacter))
+            {
+                TakeCurrent();
+            }
+            return EndToken(SyntaxKind.Whitespace);
+        }
+
+        private SyntaxToken Newline()
+        {
+            Debug.Assert(ParserHelpers.IsNewLine(CurrentCharacter));
+            // CSharp Spec §2.3.1
+            var checkTwoCharNewline = CurrentCharacter == '\r';
+            TakeCurrent();
+            if (checkTwoCharNewline && CurrentCharacter == '\n')
+            {
+                TakeCurrent();
+            }
+            return EndToken(SyntaxKind.NewLine);
+        }
+
+        private bool AtToken()
+        {
+            return CurrentCharacter == '<' ||
+                   CurrentCharacter == '<' ||
+                   CurrentCharacter == '!' ||
+                   CurrentCharacter == '/' ||
+                   CurrentCharacter == '?' ||
+                   CurrentCharacter == '[' ||
+                   CurrentCharacter == '>' ||
+                   CurrentCharacter == ']' ||
+                   CurrentCharacter == '=' ||
+                   CurrentCharacter == '"' ||
+                   CurrentCharacter == '\'' ||
+                   CurrentCharacter == '@' ||
+                   (CurrentCharacter == '-' && Peek() == '-');
+        }
+
+        private StateResult Transition(HtmlTokenizerState state)
+        {
+            return Transition((int)state, result: null);
+        }
+
+        private StateResult Transition(HtmlTokenizerState state, SyntaxToken result)
+        {
+            return Transition((int)state, result);
+        }
+
+        private enum HtmlTokenizerState
+        {
+            Data,
+            Text,
+
+            // Razor Comments - need to be the same for HTML and CSharp
+            AfterRazorCommentTransition = RazorCommentTokenizerState.AfterRazorCommentTransition,
+            EscapedRazorCommentTransition = RazorCommentTokenizerState.EscapedRazorCommentTransition,
+            RazorCommentBody = RazorCommentTokenizerState.RazorCommentBody,
+            StarAfterRazorCommentBody = RazorCommentTokenizerState.StarAfterRazorCommentBody,
+            AtTokenAfterRazorCommentBody = RazorCommentTokenizerState.AtTokenAfterRazorCommentBody,
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ISpanChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ISpanChunkGenerator.cs
new file mode 100644
index 0000000000..1ed28f13c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ISpanChunkGenerator.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal interface ISpanChunkGenerator
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextBuffer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextBuffer.cs
new file mode 100644
index 0000000000..bb52e6a066
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextBuffer.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal interface ITextBuffer
+    {
+        int Length { get; }
+        int Position { get; set; }
+        int Read();
+        int Peek();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextDocument.cs
new file mode 100644
index 0000000000..5792467c72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITextDocument.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal interface ITextDocument : ITextBuffer
+    {
+        SourceLocation Location { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITokenizer.cs
new file mode 100644
index 0000000000..0dac9f1b4f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ITokenizer.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal interface ITokenizer
+    {
+        SyntaxToken NextToken();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ImplicitExpressionEditHandler.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ImplicitExpressionEditHandler.cs
new file mode 100644
index 0000000000..6bd5e900ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ImplicitExpressionEditHandler.cs
@@ -0,0 +1,626 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class ImplicitExpressionEditHandler : SpanEditHandler
+    {
+        private readonly ISet<string> _keywords;
+        private readonly IReadOnlyCollection<string> _readOnlyKeywords;
+
+        public ImplicitExpressionEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, ISet<string> keywords, bool acceptTrailingDot)
+            : base(tokenizer)
+        {
+            _keywords = keywords ?? new HashSet<string>();
+
+            // HashSet<T> implements IReadOnlyCollection<T> as of 4.6, but does not for 4.5.1. If the runtime cast
+            // succeeds, avoid creating a new collection.
+            _readOnlyKeywords = (_keywords as IReadOnlyCollection<string>) ?? _keywords.ToArray();
+
+            AcceptTrailingDot = acceptTrailingDot;
+        }
+
+        public bool AcceptTrailingDot { get; }
+
+        public IReadOnlyCollection<string> Keywords
+        {
+            get
+            {
+                return _readOnlyKeywords;
+            }
+        }
+
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "{0};ImplicitExpression[{1}];K{2}", base.ToString(), AcceptTrailingDot ? "ATD" : "RTD", Keywords.Count);
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as ImplicitExpressionEditHandler;
+            return base.Equals(other) &&
+                AcceptTrailingDot == other.AcceptTrailingDot;
+        }
+
+        public override int GetHashCode()
+        {
+            // Hash code should include only immutable properties and base has none.
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(AcceptTrailingDot);
+
+            return hashCodeCombiner;
+        }
+
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
+        {
+            if (AcceptedCharacters == AcceptedCharactersInternal.Any)
+            {
+                return PartialParseResultInternal.Rejected;
+            }
+
+            // In some editors intellisense insertions are handled as "dotless commits".  If an intellisense selection is confirmed
+            // via something like '.' a dotless commit will append a '.' and then insert the remaining intellisense selection prior
+            // to the appended '.'.  This 'if' statement attempts to accept the intermediate steps of a dotless commit via
+            // intellisense.  It will accept two cases:
+            //     1. '@foo.' -> '@foobaz.'.
+            //     2. '@foobaz..' -> '@foobaz.bar.'. Includes Sub-cases '@foobaz()..' -> '@foobaz().bar.' etc.
+            // The key distinction being the double '.' in the second case.
+            if (IsDotlessCommitInsertion(target, change))
+            {
+                return HandleDotlessCommitInsertion(target);
+            }
+
+            if (IsAcceptableIdentifierReplacement(target, change))
+            {
+                return TryAcceptChange(target, change);
+            }
+
+            if (IsAcceptableReplace(target, change))
+            {
+                return HandleReplacement(target, change);
+            }
+            var changeRelativePosition = change.Span.AbsoluteIndex - target.Position;
+
+            // Get the edit context
+            char? lastChar = null;
+            if (changeRelativePosition > 0 && target.FullWidth > 0)
+            {
+                lastChar = target.GetContent()[changeRelativePosition - 1];
+            }
+
+            // Don't support 0->1 length edits
+            if (lastChar == null)
+            {
+                return PartialParseResultInternal.Rejected;
+            }
+
+            // Accepts cases when insertions are made at the end of a span or '.' is inserted within a span.
+            if (IsAcceptableInsertion(target, change))
+            {
+                // Handle the insertion
+                return HandleInsertion(target, lastChar.Value, change);
+            }
+
+            if (IsAcceptableInsertionInBalancedParenthesis(target, change))
+            {
+                return PartialParseResultInternal.Accepted;
+            }
+
+            if (IsAcceptableDeletion(target, change))
+            {
+                return HandleDeletion(target, lastChar.Value, change);
+            }
+
+            if (IsAcceptableDeletionInBalancedParenthesis(target, change))
+            {
+                return PartialParseResultInternal.Accepted;
+            }
+
+            return PartialParseResultInternal.Rejected;
+        }
+
+        // A dotless commit is the process of inserting a '.' with an intellisense selection.
+        private static bool IsDotlessCommitInsertion(SyntaxNode target, SourceChange change)
+        {
+            return IsNewDotlessCommitInsertion(target, change) || IsSecondaryDotlessCommitInsertion(target, change);
+        }
+
+        // Completing 'DateTime' in intellisense with a '.' could result in: '@DateT' -> '@DateT.' -> '@DateTime.' which is accepted.
+        private static bool IsNewDotlessCommitInsertion(SyntaxNode target, SourceChange change)
+        {
+            return !IsAtEndOfSpan(target, change) &&
+                   change.Span.AbsoluteIndex > 0 &&
+                   change.NewText.Length > 0 &&
+                   target.GetContent().Last() == '.' &&
+                   ParserHelpers.IsIdentifier(change.NewText, requireIdentifierStart: false) &&
+                   (change.Span.Length == 0 || ParserHelpers.IsIdentifier(change.GetOriginalText(target), requireIdentifierStart: false));
+        }
+
+        // Once a dotless commit has been performed you then have something like '@DateTime.'.  This scenario is used to detect the
+        // situation when you try to perform another dotless commit resulting in a textchange with '..'.  Completing 'DateTime.Now'
+        // in intellisense with a '.' could result in: '@DateTime.' -> '@DateTime..' -> '@DateTime.Now.' which is accepted.
+        private static bool IsSecondaryDotlessCommitInsertion(SyntaxNode target, SourceChange change)
+        {
+            // Do not need to worry about other punctuation, just looking for double '.' (after change)
+            return change.NewText.Length == 1 &&
+                   change.NewText == "." &&
+                   !string.IsNullOrEmpty(target.GetContent()) &&
+                   target.GetContent().Last() == '.' &&
+                   change.Span.Length == 0;
+        }
+
+        private static bool IsAcceptableReplace(SyntaxNode target, SourceChange change)
+        {
+            return IsEndReplace(target, change) ||
+                   (change.IsReplace && RemainingIsWhitespace(target, change));
+        }
+
+        private bool IsAcceptableIdentifierReplacement(SyntaxNode target, SourceChange change)
+        {
+            if (!change.IsReplace)
+            {
+                return false;
+            }
+
+            var tokens = target.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>().ToArray();
+            for (var i = 0; i < tokens.Length; i++)
+            {
+                var token = tokens[i];
+
+                if (token == null)
+                {
+                    break;
+                }
+
+                var tokenStartIndex = token.Position;
+                var tokenEndIndex = token.EndPosition;
+
+                // We're looking for the first token that contains the SourceChange.
+                if (tokenEndIndex > change.Span.AbsoluteIndex)
+                {
+                    if (tokenEndIndex >= change.Span.AbsoluteIndex + change.Span.Length && token.Kind == SyntaxKind.Identifier)
+                    {
+                        // The token we're changing happens to be an identifier. Need to check if its transformed state is also one.
+                        // We do this transformation logic to capture the case that the new text change happens to not be an identifier;
+                        // i.e. "5". Alone, it's numeric, within an identifier it's classified as identifier.
+                        var transformedContent = change.GetEditedContent(token.Content, change.Span.AbsoluteIndex - tokenStartIndex);
+                        var newTokens = Tokenizer(transformedContent);
+
+                        if (newTokens.Count() != 1)
+                        {
+                            // The transformed content resulted in more than one token; we can only replace a single identifier with
+                            // another single identifier.
+                            break;
+                        }
+
+                        var newToken = newTokens.First();
+                        if (newToken.Kind == SyntaxKind.Identifier)
+                        {
+                            return true;
+                        }
+                    }
+
+                    // Change is touching a non-identifier token or spans multiple tokens.
+
+                    break;
+                }
+            }
+
+            return false;
+        }
+
+        private static bool IsAcceptableDeletion(SyntaxNode target, SourceChange change)
+        {
+            return IsEndDeletion(target, change) ||
+                   (change.IsDelete && RemainingIsWhitespace(target, change));
+        }
+
+        // Acceptable insertions can occur at the end of a span or when a '.' is inserted within a span.
+        private static bool IsAcceptableInsertion(SyntaxNode target, SourceChange change)
+        {
+            return change.IsInsert &&
+                (IsAcceptableEndInsertion(target, change) ||
+                IsAcceptableInnerInsertion(target, change));
+        }
+
+        // Internal for testing
+        internal static bool IsAcceptableDeletionInBalancedParenthesis(SyntaxNode target, SourceChange change)
+        {
+            if (!change.IsDelete)
+            {
+                return false;
+            }
+
+            var changeStart = change.Span.AbsoluteIndex;
+            var changeLength = change.Span.Length;
+            var changeEnd = changeStart + changeLength;
+            var tokens = target.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>().ToArray();
+            if (!IsInsideParenthesis(changeStart, tokens) || !IsInsideParenthesis(changeEnd, tokens))
+            {
+                // Either the start or end of the delete does not fall inside of parenthesis, unacceptable inner deletion.
+                return false;
+            }
+
+            var relativePosition = changeStart - target.Position;
+            var deletionContent = target.GetContent().Substring(relativePosition, changeLength);
+
+            if (deletionContent.IndexOfAny(new[] { '(', ')' }) >= 0)
+            {
+                // Change deleted some parenthesis
+                return false;
+            }
+
+            return true;
+        }
+
+        // Internal for testing
+        internal static bool IsAcceptableInsertionInBalancedParenthesis(SyntaxNode target, SourceChange change)
+        {
+            if (!change.IsInsert)
+            {
+                return false;
+            }
+
+            if (change.NewText.IndexOfAny(new[] { '(', ')' }) >= 0)
+            {
+                // Insertions of parenthesis aren't handled by us. If someone else wants to accept it, they can.
+                return false;
+            }
+
+            var tokens = target.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>().ToArray();
+            if (IsInsideParenthesis(change.Span.AbsoluteIndex, tokens))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        // Internal for testing
+        internal static bool IsInsideParenthesis(int position, IReadOnlyList<SyntaxToken> tokens)
+        {
+            var balanceCount = 0;
+            var foundInsertionPoint = false;
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                var currentToken = tokens[i];
+                if (ContainsPosition(position, currentToken))
+                {
+                    if (balanceCount == 0)
+                    {
+                        // Insertion point is outside of parenthesis, i.e. inserting at the pipe: @Foo|Baz()
+                        return false;
+                    }
+
+                    foundInsertionPoint = true;
+                }
+
+                if (!TryUpdateBalanceCount(currentToken, ref balanceCount))
+                {
+                    // Couldn't update the count. This usually occurrs when we run into a ')' outside of any parenthesis.
+                    return false;
+                }
+
+                if (foundInsertionPoint && balanceCount == 0)
+                {
+                    // Once parenthesis become balanced after the insertion point we return true, no need to go further.
+                    // If they get unbalanced down the line the expression was already unbalanced to begin with and this
+                    // change happens prior to any ambiguity.
+                    return true;
+                }
+            }
+
+            // Unbalanced parenthesis
+            return false;
+        }
+
+        // Internal for testing
+        internal static bool ContainsPosition(int position, SyntaxToken currentToken)
+        {
+            var tokenStart = currentToken.Position;
+            if (tokenStart == position)
+            {
+                // Token is exactly at the insertion point.
+                return true;
+            }
+
+            var tokenEnd = tokenStart + currentToken.Content.Length;
+            if (tokenStart < position && tokenEnd > position)
+            {
+                // Insertion point falls in the middle of the current token.
+                return true;
+            }
+
+            return false;
+        }
+
+        // Internal for testing
+        internal static bool TryUpdateBalanceCount(SyntaxToken token, ref int count)
+        {
+            var updatedCount = count;
+            if (token.Kind == SyntaxKind.LeftParenthesis)
+            {
+                updatedCount++;
+            }
+            else if (token.Kind == SyntaxKind.RightParenthesis)
+            {
+                if (updatedCount == 0)
+                {
+                    return false;
+                }
+
+                updatedCount--;
+            }
+            else if (token.Kind == SyntaxKind.StringLiteral)
+            {
+                var content = token.Content;
+                if (content.Length > 0 && content[content.Length - 1] != '"')
+                {
+                    // Incomplete string literal may have consumed some of our parenthesis and usually occurr during auto-completion of '"' => '""'.
+                    if (!TryUpdateCountFromContent(content, ref updatedCount))
+                    {
+                        return false;
+                    }
+                }
+            }
+            else if (token.Kind == SyntaxKind.CharacterLiteral)
+            {
+                var content = token.Content;
+                if (content.Length > 0 && content[content.Length - 1] != '\'')
+                {
+                    // Incomplete character literal may have consumed some of our parenthesis and usually occurr during auto-completion of "'" => "''".
+                    if (!TryUpdateCountFromContent(content, ref updatedCount))
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            if (updatedCount < 0)
+            {
+                return false;
+            }
+
+            count = updatedCount;
+            return true;
+        }
+
+        // Internal for testing
+        internal static bool TryUpdateCountFromContent(string content, ref int count)
+        {
+            var updatedCount = count;
+            for (var i = 0; i < content.Length; i++)
+            {
+                if (content[i] == '(')
+                {
+                    updatedCount++;
+                }
+                else if (content[i] == ')')
+                {
+                    if (updatedCount == 0)
+                    {
+                        // Unbalanced parenthesis, i.e. @Foo)
+                        return false;
+                    }
+
+                    updatedCount--;
+                }
+            }
+
+            count = updatedCount;
+            return true;
+        }
+
+        // Accepts character insertions at the end of spans.  AKA: '@foo' -> '@fooo' or '@foo' -> '@foo   ' etc.
+        private static bool IsAcceptableEndInsertion(SyntaxNode target, SourceChange change)
+        {
+            Debug.Assert(change.IsInsert);
+
+            return IsAtEndOfSpan(target, change) ||
+                   RemainingIsWhitespace(target, change);
+        }
+
+        // Accepts '.' insertions in the middle of spans. Ex: '@foo.baz.bar' -> '@foo..baz.bar'
+        // This is meant to allow intellisense when editing a span.
+        private static bool IsAcceptableInnerInsertion(SyntaxNode target, SourceChange change)
+        {
+            Debug.Assert(change.IsInsert);
+
+            // Ensure that we're actually inserting in the middle of a span and not at the end.
+            // This case will fail if the IsAcceptableEndInsertion does not capture an end insertion correctly.
+            Debug.Assert(!IsAtEndOfSpan(target, change));
+
+            return change.Span.AbsoluteIndex > 0 &&
+                   change.NewText == ".";
+        }
+
+        private static bool RemainingIsWhitespace(SyntaxNode target, SourceChange change)
+        {
+            var offset = (change.Span.AbsoluteIndex - target.Position) + change.Span.Length;
+            return string.IsNullOrWhiteSpace(target.GetContent().Substring(offset));
+        }
+
+        private PartialParseResultInternal HandleDotlessCommitInsertion(SyntaxNode target)
+        {
+            var result = PartialParseResultInternal.Accepted;
+            if (!AcceptTrailingDot && target.GetContent().LastOrDefault() == '.')
+            {
+                result |= PartialParseResultInternal.Provisional;
+            }
+            return result;
+        }
+
+        private PartialParseResultInternal HandleReplacement(SyntaxNode target, SourceChange change)
+        {
+            // Special Case for IntelliSense commits.
+            //  When IntelliSense commits, we get two changes (for example user typed "Date", then committed "DateTime" by pressing ".")
+            //  1. Insert "." at the end of this span
+            //  2. Replace the "Date." at the end of the span with "DateTime."
+            //  We need partial parsing to accept case #2.
+            var oldText = change.GetOriginalText(target);
+
+            var result = PartialParseResultInternal.Rejected;
+            if (EndsWithDot(oldText) && EndsWithDot(change.NewText))
+            {
+                result = PartialParseResultInternal.Accepted;
+                if (!AcceptTrailingDot)
+                {
+                    result |= PartialParseResultInternal.Provisional;
+                }
+            }
+            return result;
+        }
+
+        private PartialParseResultInternal HandleDeletion(SyntaxNode target, char previousChar, SourceChange change)
+        {
+            // What's left after deleting?
+            if (previousChar == '.')
+            {
+                return TryAcceptChange(target, change, PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional);
+            }
+            else if (ParserHelpers.IsIdentifierPart(previousChar))
+            {
+                return TryAcceptChange(target, change);
+            }
+            else if (previousChar == '(')
+            {
+                var changeRelativePosition = change.Span.AbsoluteIndex - target.Position;
+                if (target.GetContent()[changeRelativePosition] == ')')
+                {
+                    return PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional;
+                }
+            }
+
+            return PartialParseResultInternal.Rejected;
+        }
+
+        private PartialParseResultInternal HandleInsertion(SyntaxNode target, char previousChar, SourceChange change)
+        {
+            // What are we inserting after?
+            if (previousChar == '.')
+            {
+                return HandleInsertionAfterDot(target, change);
+            }
+            else if (ParserHelpers.IsIdentifierPart(previousChar) || previousChar == ')' || previousChar == ']')
+            {
+                return HandleInsertionAfterIdPart(target, change);
+            }
+            else if (previousChar == '(')
+            {
+                return HandleInsertionAfterOpenParenthesis(target, change);
+            }
+            else
+            {
+                return PartialParseResultInternal.Rejected;
+            }
+        }
+
+        private PartialParseResultInternal HandleInsertionAfterIdPart(SyntaxNode target, SourceChange change)
+        {
+            // If the insertion is a full identifier part, accept it
+            if (ParserHelpers.IsIdentifier(change.NewText, requireIdentifierStart: false))
+            {
+                return TryAcceptChange(target, change);
+            }
+            else if (IsDoubleParenthesisInsertion(change) || IsOpenParenthesisInsertion(change))
+            {
+                // Allow inserting parens after an identifier - this is needed to support signature
+                // help intellisense in VS.
+                return TryAcceptChange(target, change);
+            }
+            else if (EndsWithDot(change.NewText))
+            {
+                // Accept it, possibly provisionally
+                var result = PartialParseResultInternal.Accepted;
+                if (!AcceptTrailingDot)
+                {
+                    result |= PartialParseResultInternal.Provisional;
+                }
+                return TryAcceptChange(target, change, result);
+            }
+            else
+            {
+                return PartialParseResultInternal.Rejected;
+            }
+        }
+
+        private PartialParseResultInternal HandleInsertionAfterOpenParenthesis(SyntaxNode target, SourceChange change)
+        {
+            if (IsCloseParenthesisInsertion(change))
+            {
+                return TryAcceptChange(target, change);
+            }
+
+            return PartialParseResultInternal.Rejected;
+        }
+
+        private PartialParseResultInternal HandleInsertionAfterDot(SyntaxNode target, SourceChange change)
+        {
+            // If the insertion is a full identifier or another dot, accept it
+            if (ParserHelpers.IsIdentifier(change.NewText) || change.NewText == ".")
+            {
+                return TryAcceptChange(target, change);
+            }
+            return PartialParseResultInternal.Rejected;
+        }
+
+        private PartialParseResultInternal TryAcceptChange(SyntaxNode target, SourceChange change, PartialParseResultInternal acceptResult = PartialParseResultInternal.Accepted)
+        {
+            var content = change.GetEditedContent(target);
+            if (StartsWithKeyword(content))
+            {
+                return PartialParseResultInternal.Rejected | PartialParseResultInternal.SpanContextChanged;
+            }
+
+            return acceptResult;
+        }
+
+        private static bool IsDoubleParenthesisInsertion(SourceChange change)
+        {
+            return
+                change.IsInsert &&
+                change.NewText.Length == 2 &&
+                change.NewText == "()";
+        }
+
+        private static bool IsOpenParenthesisInsertion(SourceChange change)
+        {
+            return
+                change.IsInsert &&
+                change.NewText.Length == 1 &&
+                change.NewText == "(";
+        }
+
+        private static bool IsCloseParenthesisInsertion(SourceChange change)
+        {
+            return
+                change.IsInsert &&
+                change.NewText.Length == 1 &&
+                change.NewText == ")";
+        }
+
+        private static bool EndsWithDot(string content)
+        {
+            return (content.Length == 1 && content[0] == '.') ||
+                   (content[content.Length - 1] == '.' &&
+                    content.Take(content.Length - 1).All(ParserHelpers.IsIdentifierPart));
+        }
+
+        private bool StartsWithKeyword(string newContent)
+        {
+            using (var reader = new StringReader(newContent))
+            {
+                return _keywords.Contains(reader.ReadWhile(ParserHelpers.IsIdentifierPart));
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/KnownTokenType.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/KnownTokenType.cs
new file mode 100644
index 0000000000..da9290ef53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/KnownTokenType.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal enum KnownTokenType
+    {
+        Whitespace,
+        NewLine,
+        Identifier,
+        Keyword,
+        Transition,
+        Unknown,
+        CommentStart,
+        CommentStar,
+        CommentBody
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs
new file mode 100644
index 0000000000..94b3f9acee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs
@@ -0,0 +1,108 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal abstract class LanguageCharacteristics<TTokenizer>
+        where TTokenizer : Tokenizer
+    {
+        public abstract string GetSample(SyntaxKind type);
+        public abstract TTokenizer CreateTokenizer(ITextDocument source);
+        public abstract SyntaxKind FlipBracket(SyntaxKind bracket);
+        public abstract SyntaxToken CreateMarkerToken();
+
+        public virtual IEnumerable<SyntaxToken> TokenizeString(string content)
+        {
+            return TokenizeString(SourceLocation.Zero, content);
+        }
+
+        public virtual IEnumerable<SyntaxToken> TokenizeString(SourceLocation start, string input)
+        {
+            using (var reader = new SeekableTextReader(input, start.FilePath))
+            {
+                var tok = CreateTokenizer(reader);
+                SyntaxToken token;
+                while ((token = tok.NextToken()) != null)
+                {
+                    yield return token;
+                }
+            }
+        }
+
+        public virtual bool IsWhitespace(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.Whitespace);
+        }
+
+        public virtual bool IsNewLine(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.NewLine);
+        }
+
+        public virtual bool IsIdentifier(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.Identifier);
+        }
+
+        public virtual bool IsKeyword(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.Keyword);
+        }
+
+        public virtual bool IsTransition(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.Transition);
+        }
+
+        public virtual bool IsCommentStart(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.CommentStart);
+        }
+
+        public virtual bool IsCommentStar(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.CommentStar);
+        }
+
+        public virtual bool IsCommentBody(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.CommentBody);
+        }
+
+        public virtual bool IsUnknown(SyntaxToken token)
+        {
+            return IsKnownTokenType(token, KnownTokenType.Unknown);
+        }
+
+        public virtual bool IsKnownTokenType(SyntaxToken token, KnownTokenType type)
+        {
+            return token != null && Equals(token.Kind, GetKnownTokenType(type));
+        }
+
+        public virtual Tuple<SyntaxToken, SyntaxToken> SplitToken(SyntaxToken token, int splitAt, SyntaxKind leftType)
+        {
+            var left = CreateToken(token.Content.Substring(0, splitAt), leftType, RazorDiagnostic.EmptyArray);
+
+            SyntaxToken right = null;
+            if (splitAt < token.Content.Length)
+            {
+                right = CreateToken(token.Content.Substring(splitAt), token.Kind, token.GetDiagnostics());
+            }
+
+            return Tuple.Create(left, right);
+        }
+
+        public abstract SyntaxKind GetKnownTokenType(KnownTokenType type);
+
+        public virtual bool KnowsTokenType(KnownTokenType type)
+        {
+            return type == KnownTokenType.Unknown || !Equals(GetKnownTokenType(type), GetKnownTokenType(KnownTokenType.Unknown));
+        }
+
+        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
new file mode 100644
index 0000000000..cfe840d4f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
@@ -0,0 +1,248 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class LegacySyntaxNodeExtensions
+    {
+        private static readonly SyntaxKind[] TransitionSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.CSharpTransition,
+            SyntaxKind.MarkupTransition,
+        };
+
+        private static readonly SyntaxKind[] MetaCodeSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.RazorMetaCode,
+        };
+
+        private static readonly SyntaxKind[] CommentSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.RazorCommentLiteral,
+        };
+
+        private static readonly SyntaxKind[] CodeSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.CSharpStatementLiteral,
+            SyntaxKind.CSharpExpressionLiteral,
+            SyntaxKind.CSharpEphemeralTextLiteral,
+        };
+
+        private static readonly SyntaxKind[] MarkupSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.MarkupTextLiteral,
+            SyntaxKind.MarkupEphemeralTextLiteral,
+        };
+
+        private static readonly SyntaxKind[] NoneSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.UnclassifiedTextLiteral,
+        };
+
+        public static SpanContext GetSpanContext(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var context = node.GetAnnotationValue(SyntaxConstants.SpanContextKind);
+
+            return context is SpanContext ? (SpanContext)context : null;
+        }
+
+        public static TNode WithSpanContext<TNode>(this TNode node, SpanContext spanContext) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var newAnnotation = new SyntaxAnnotation(SyntaxConstants.SpanContextKind, spanContext);
+
+            var newAnnotations = new List<SyntaxAnnotation>();
+            newAnnotations.Add(newAnnotation);
+            foreach (var annotation in node.GetAnnotations())
+            {
+                if (annotation.Kind != newAnnotation.Kind)
+                {
+                    newAnnotations.Add(annotation);
+                }
+            }
+
+            return node.WithAnnotations(newAnnotations.ToArray());
+        }
+
+        public static SyntaxNode LocateOwner(this SyntaxNode node, SourceChange change)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (change.Span.AbsoluteIndex < node.Position)
+            {
+                // Early escape for cases where changes overlap multiple spans
+                // In those cases, the span will return false, and we don't want to search the whole tree
+                // So if the current span starts after the change, we know we've searched as far as we need to
+                return null;
+            }
+
+            if (IsSpanKind(node))
+            {
+                var editHandler = node.GetSpanContext()?.EditHandler ?? SpanEditHandler.CreateDefault();
+                return editHandler.OwnsChange(node, change) ? node : null;
+            }
+
+            SyntaxNode owner = null;
+            var children = node.ChildNodes();
+            foreach (var child in children)
+            {
+                owner = LocateOwner(child, change);
+                if (owner != null)
+                {
+                    break;
+                }
+            }
+
+            return owner;
+        }
+
+        public static bool IsTransitionSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return TransitionSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsMetaCodeSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return MetaCodeSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsCommentSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return CommentSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsCodeSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return CodeSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsMarkupSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return MarkupSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsNoneSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return NoneSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsSpanKind(this SyntaxNode node)
+        {
+            return IsTransitionSpanKind(node) ||
+                IsMetaCodeSpanKind(node) ||
+                IsCommentSpanKind(node) ||
+                IsCodeSpanKind(node) ||
+                IsMarkupSpanKind(node) ||
+                IsNoneSpanKind(node);
+        }
+
+        public static IEnumerable<SyntaxNode> FlattenSpans(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            foreach (var child in node.DescendantNodes())
+            {
+                if (child.IsSpanKind())
+                {
+                    yield return child;
+                }
+            }
+        }
+
+        public static SyntaxNode PreviousSpan(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var parent = node.Parent;
+            while (parent != null)
+            {
+                var flattenedSpans = parent.FlattenSpans();
+                var prevSpan = flattenedSpans.LastOrDefault(n => n.EndPosition <= node.Position && n != node);
+                if (prevSpan != null)
+                {
+                    return prevSpan;
+                }
+
+                parent = parent.Parent;
+            }
+
+            return null;
+        }
+
+        public static SyntaxNode NextSpan(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var parent = node.Parent;
+            while (parent != null)
+            {
+                var flattenedSpans = parent.FlattenSpans();
+                var nextSpan = flattenedSpans.FirstOrDefault(n => n.Position >= node.EndPosition && n != node);
+                if (nextSpan != null)
+                {
+                    return nextSpan;
+                }
+
+                parent = parent.Parent;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
new file mode 100644
index 0000000000..99879dff15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
@@ -0,0 +1,173 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class LineTrackingStringBuffer
+    {
+        private readonly IList<TextLine> _lines;
+        private readonly string _filePath;
+        private TextLine _currentLine;
+        private TextLine _endLine;
+
+        public LineTrackingStringBuffer(string content, string filePath)
+            : this(content.ToCharArray(), filePath)
+        {
+        }
+
+        public LineTrackingStringBuffer(char[] content, string filePath)
+        {
+            _endLine = new TextLine(0, 0);
+            _lines = new List<TextLine>() { _endLine };
+
+            Append(content);
+
+            _filePath = filePath;
+        }
+
+        public int Length
+        {
+            get { return _endLine.End; }
+        }
+
+        public SourceLocation EndLocation
+        {
+            get { return new SourceLocation(_filePath, Length, _lines.Count - 1, _lines[_lines.Count - 1].Length); }
+        }
+
+        public CharacterReference CharAt(int absoluteIndex)
+        {
+            var line = FindLine(absoluteIndex);
+            if (line == null)
+            {
+                throw new ArgumentOutOfRangeException(nameof(absoluteIndex));
+            }
+            var idx = absoluteIndex - line.Start;
+            return new CharacterReference(line.Content[idx], new SourceLocation(_filePath, absoluteIndex, line.Index, idx));
+        }
+
+        private void Append(char[] content)
+        {
+            for (int i = 0; i < content.Length; i++)
+            {
+                AppendCore(content[i]);
+
+                // \r on it's own: Start a new line, otherwise wait for \n
+                // Other Newline: Start a new line
+                if ((content[i] == '\r' && (i + 1 == content.Length || content[i + 1] != '\n')) || (content[i] != '\r' && ParserHelpers.IsNewLine(content[i])))
+                {
+                    PushNewLine();
+                }
+            }
+        }
+
+        private void PushNewLine()
+        {
+            _endLine = new TextLine(_endLine.End, _endLine.Index + 1);
+            _lines.Add(_endLine);
+        }
+
+        private void AppendCore(char chr)
+        {
+            Debug.Assert(_lines.Count > 0);
+            _lines[_lines.Count - 1].Content.Append(chr);
+        }
+
+        private TextLine FindLine(int absoluteIndex)
+        {
+            TextLine selected = null;
+
+            if (_currentLine != null)
+            {
+                if (_currentLine.Contains(absoluteIndex))
+                {
+                    // This index is on the last read line
+                    selected = _currentLine;
+                }
+                else if (absoluteIndex > _currentLine.Index && _currentLine.Index + 1 < _lines.Count)
+                {
+                    // This index is ahead of the last read line
+                    selected = ScanLines(absoluteIndex, _currentLine.Index);
+                }
+            }
+
+            // Have we found a line yet?
+            if (selected == null)
+            {
+                // Scan from line 0
+                selected = ScanLines(absoluteIndex, 0);
+            }
+
+            Debug.Assert(selected == null || selected.Contains(absoluteIndex));
+            _currentLine = selected;
+            return selected;
+        }
+
+        private TextLine ScanLines(int absoluteIndex, int startPos)
+        {
+            for (int i = 0; i < _lines.Count; i++)
+            {
+                var idx = (i + startPos) % _lines.Count;
+                Debug.Assert(idx >= 0 && idx < _lines.Count);
+
+                if (_lines[idx].Contains(absoluteIndex))
+                {
+                    return _lines[idx];
+                }
+            }
+            return null;
+        }
+
+        internal struct CharacterReference
+        {
+            public CharacterReference(char character, SourceLocation location)
+            {
+                Character = character;
+                Location = location;
+            }
+
+            public char Character { get; }
+
+            public SourceLocation Location { get; }
+        }
+
+        private class TextLine
+        {
+            private StringBuilder _content = new StringBuilder();
+
+            public TextLine(int start, int index)
+            {
+                Start = start;
+                Index = index;
+            }
+
+            public StringBuilder Content
+            {
+                get { return _content; }
+            }
+
+            public int Length
+            {
+                get { return Content.Length; }
+            }
+
+            public int Start { get; set; }
+            public int Index { get; set; }
+
+            public int End
+            {
+                get { return Start + Length; }
+            }
+
+            public bool Contains(int index)
+            {
+                return index < End && index >= Start;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LiteralAttributeChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LiteralAttributeChunkGenerator.cs
new file mode 100644
index 0000000000..4cbdb9bd7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LiteralAttributeChunkGenerator.cs
@@ -0,0 +1,44 @@
+// 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.Globalization;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class LiteralAttributeChunkGenerator : SpanChunkGenerator
+    {
+        public LiteralAttributeChunkGenerator(LocationTagged<string> prefix, LocationTagged<string> value)
+        {
+            Prefix = prefix;
+            Value = value;
+        }
+
+        public LocationTagged<string> Prefix { get; }
+
+        public LocationTagged<string> Value { get; }
+
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.CurrentCulture, "LitAttr:{0:F}", Prefix);
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as LiteralAttributeChunkGenerator;
+            return other != null &&
+                Equals(other.Prefix, Prefix) &&
+                Equals(other.Value, Value);
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCodeCombiner = HashCodeCombiner.Start();
+
+            hashCodeCombiner.Add(Prefix);
+            hashCodeCombiner.Add(Value);
+
+            return hashCodeCombiner;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LocationTagged.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LocationTagged.cs
new file mode 100644
index 0000000000..a1ffeaf00b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LocationTagged.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    [DebuggerDisplay("{" + nameof(DebuggerToString) + "(),nq}")]
+    internal class LocationTagged<TValue> : IFormattable
+    {
+        public LocationTagged(TValue value, int absoluteIndex, int lineIndex, int characterIndex)
+            : this (value, new SourceLocation(absoluteIndex, lineIndex, characterIndex))
+        {
+        }
+
+        public LocationTagged(TValue value, SourceLocation location)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            Location = location;
+            Value = value;
+        }
+
+        public SourceLocation Location { get; }
+
+        public TValue Value { get; }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as LocationTagged<TValue>;
+            if (ReferenceEquals(other, null))
+            {
+                return false;
+            }
+
+            return Equals(other.Location, Location) &&
+                Equals(other.Value, Value);
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(Location);
+            hashCodeCombiner.Add(Value);
+
+            return hashCodeCombiner.CombinedHash;
+        }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
+
+        public string ToString(string format, IFormatProvider formatProvider)
+        {
+            if (string.IsNullOrEmpty(format))
+            {
+                format = "P";
+            }
+            if (formatProvider == null)
+            {
+                formatProvider = CultureInfo.CurrentCulture;
+            }
+            switch (format.ToUpperInvariant())
+            {
+                case "F":
+                    return string.Format(formatProvider, "{0}@{1}", Value, Location);
+                default:
+                    return Value.ToString();
+            }
+        }
+
+        public static implicit operator TValue(LocationTagged<TValue> value)
+        {
+            return value == null ? default(TValue) : value.Value;
+        }
+
+        private string DebuggerToString()
+        {
+            return $@"({Location})""{Value}""";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/MarkupChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/MarkupChunkGenerator.cs
new file mode 100644
index 0000000000..796bf545a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/MarkupChunkGenerator.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class MarkupChunkGenerator : SpanChunkGenerator
+    {
+        public override string ToString()
+        {
+            return "Markup";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserBase.cs
new file mode 100644
index 0000000000..6d07a26c60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserBase.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal abstract class ParserBase
+    {
+        public ParserBase(ParserContext context)
+        {
+            Context = context;
+        }
+
+        public ParserContext Context { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
new file mode 100644
index 0000000000..f8cebfdd35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
@@ -0,0 +1,112 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal partial class ParserContext
+    {
+        public ParserContext(RazorSourceDocument source, RazorParserOptions options)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            SourceDocument = source;
+            var chars = new char[source.Length];
+            source.CopyTo(0, chars, 0, source.Length);
+
+            Source = new SeekableTextReader(chars, source.FilePath);
+            DesignTimeMode = options.DesignTime;
+            FeatureFlags = options.FeatureFlags;
+            ParseLeadingDirectives = options.ParseLeadingDirectives;
+            ErrorSink = new ErrorSink();
+            SeenDirectives = new HashSet<string>(StringComparer.Ordinal);
+        }
+
+        public ErrorSink ErrorSink { get; set; }
+
+        public RazorParserFeatureFlags FeatureFlags { get; }
+
+        public HashSet<string> SeenDirectives { get; }
+
+        public ITextDocument Source { get; }
+
+        public RazorSourceDocument SourceDocument { get; }
+
+        public bool DesignTimeMode { get; }
+
+        public bool ParseLeadingDirectives { get; }
+
+        public bool WhiteSpaceIsSignificantToAncestorBlock { get; set; }
+
+        public bool NullGenerateWhitespaceAndNewLine { get; set; }
+
+        public bool InTemplateContext { get; set; }
+
+        public AcceptedCharactersInternal LastAcceptedCharacters { get; set; } = AcceptedCharactersInternal.None;
+
+        public bool EndOfFile
+        {
+            get { return Source.Peek() == -1; }
+        }
+    }
+
+    // Debug Helpers
+
+#if DEBUG
+    [DebuggerDisplay("{" + nameof(DebuggerToString) + "(),nq}")]
+    internal partial class ParserContext
+    {
+        private const int InfiniteLoopCountThreshold = 1000;
+        private int _infiniteLoopGuardCount = 0;
+        private SourceLocation? _infiniteLoopGuardLocation = null;
+
+        internal string Unparsed
+        {
+            get
+            {
+                var remaining = ((TextReader)Source).ReadToEnd();
+                Source.Position -= remaining.Length;
+                return remaining;
+            }
+        }
+
+        private bool CheckInfiniteLoop()
+        {
+            // Infinite loop guard
+            //  Basically, if this property is accessed 1000 times in a row without having advanced the source reader to the next position, we
+            //  cause a parser error
+            if (_infiniteLoopGuardLocation != null)
+            {
+                if (Source.Location.Equals(_infiniteLoopGuardLocation.Value))
+                {
+                    _infiniteLoopGuardCount++;
+                    if (_infiniteLoopGuardCount > InfiniteLoopCountThreshold)
+                    {
+                        Debug.Fail("An internal parser error is causing an infinite loop at this location.");
+
+                        return true;
+                    }
+                }
+                else
+                {
+                    _infiniteLoopGuardCount = 0;
+                }
+            }
+            _infiniteLoopGuardLocation = Source.Location;
+            return false;
+        }
+
+        private string DebuggerToString()
+        {
+            return Unparsed;
+        }
+    }
+#endif
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
new file mode 100644
index 0000000000..fc5b31a1e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
@@ -0,0 +1,104 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class ParserHelpers
+    {
+        public static char[] NewLineCharacters = new[]
+        {
+            '\r', // Carriage return
+            '\n', // Linefeed
+            '\u0085', // Next Line
+            '\u2028', // Line separator
+            '\u2029' // Paragraph separator
+        };
+
+        public static bool IsNewLine(char value) => Array.IndexOf<char>(NewLineCharacters, value) != -1;
+
+        public static bool IsNewLine(string value)
+        {
+            // We want to handle both LF and CRLF regardless of the platform.
+            // We explicitly check for CRLF and IsNewLine() should return true for LF.
+            return (value.Length == 1 && (IsNewLine(value[0]))) ||
+                   (string.Equals(value, "\r\n", StringComparison.Ordinal));
+        }
+
+        public static bool IsIdentifier(string value)
+        {
+            return IsIdentifier(value, requireIdentifierStart: true);
+        }
+
+        public static bool IsIdentifier(string value, bool requireIdentifierStart)
+        {
+            IEnumerable<char> identifierPart = value;
+            if (requireIdentifierStart)
+            {
+                identifierPart = identifierPart.Skip(1);
+            }
+            return (!requireIdentifierStart || IsIdentifierStart(value[0])) && identifierPart.All(IsIdentifierPart);
+        }
+
+        public static bool IsIdentifierStart(char value)
+        {
+            return value == '_' || IsLetter(value);
+        }
+
+        public static bool IsIdentifierPart(char value)
+        {
+            return IsLetter(value)
+                || IsDecimalDigit(value)
+                || IsConnecting(value)
+                || IsCombining(value)
+                || IsFormatting(value);
+        }
+
+        public static bool IsFormatting(char value)
+        {
+            return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.Format;
+        }
+
+        public static bool IsCombining(char value)
+        {
+            var cat = CharUnicodeInfo.GetUnicodeCategory(value);
+
+            return cat == UnicodeCategory.SpacingCombiningMark || cat == UnicodeCategory.NonSpacingMark;
+        }
+
+        public static bool IsConnecting(char value)
+        {
+            return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.ConnectorPunctuation;
+        }
+
+        public static bool IsWhitespace(char value)
+        {
+            return value == ' ' ||
+                   value == '\f' ||
+                   value == '\t' ||
+                   value == '\u000B' || // Vertical Tab
+                   CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.SpaceSeparator;
+        }
+
+        public static bool IsLetter(char value)
+        {
+            var cat = CharUnicodeInfo.GetUnicodeCategory(value);
+
+            return cat == UnicodeCategory.UppercaseLetter
+                   || cat == UnicodeCategory.LowercaseLetter
+                   || cat == UnicodeCategory.TitlecaseLetter
+                   || cat == UnicodeCategory.ModifierLetter
+                   || cat == UnicodeCategory.OtherLetter
+                   || cat == UnicodeCategory.LetterNumber;
+        }
+
+        public static bool IsDecimalDigit(char value)
+        {
+            return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.DecimalDigitNumber;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/PartialParseResultInternal.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/PartialParseResultInternal.cs
new file mode 100644
index 0000000000..a6a79c01bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/PartialParseResultInternal.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    // Flags:
+    //  Provisional, ContextChanged, Accepted, Rejected
+    //  000001 1  - Rejected,
+    //  000010 2  - Accepted
+    //  000100 4  - Provisional
+    //  001000 8  - Context Changed
+    //  010000 16 - Auto Complete Block
+
+    /// <summary>
+    /// The result of attempting an incremental parse
+    /// </summary>
+    /// <remarks>
+    /// Either the Accepted or Rejected flag is ALWAYS set.
+    /// Additionally, Provisional may be set with Accepted and SpanContextChanged may be set with Rejected.
+    /// Provisional may NOT be set with Rejected and SpanContextChanged may NOT be set with Accepted.
+    /// </remarks>
+    [Flags]
+    internal enum PartialParseResultInternal
+    {
+        /// <summary>
+        /// Indicates that the edit could not be accepted and that a reparse is underway.
+        /// </summary>
+        Rejected = 1,
+
+        /// <summary>
+        /// Indicates that the edit was accepted and has been added to the parse tree
+        /// </summary>
+        Accepted = 2,
+
+        /// <summary>
+        /// Indicates that the edit was accepted, but that a reparse should be forced when idle time is available
+        /// since the edit may be misclassified
+        /// </summary>
+        /// <remarks>
+        /// This generally occurs when a "." is typed in an Implicit Expression, since editors require that this
+        /// be assigned to Code in order to properly support features like IntelliSense.  However, if no further edits
+        /// occur following the ".", it should be treated as Markup.
+        /// </remarks>
+        Provisional = 4,
+
+        /// <summary>
+        /// Indicates that the edit caused a change in the span's context and that if any statement completions were active prior to starting this
+        /// partial parse, they should be reinitialized.
+        /// </summary>
+        SpanContextChanged = 8,
+
+        /// <summary>
+        /// Indicates that the edit requires an auto completion to occur
+        /// </summary>
+        AutoCompleteBlock = 16
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
new file mode 100644
index 0000000000..c840bcb707
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class RazorParser
+    {
+        public RazorParser()
+            : this(RazorParserOptions.CreateDefault())
+        {
+        }
+
+        public RazorParser(RazorParserOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            Options = options;
+        }
+
+        public RazorParserOptions Options { get; }
+
+        public virtual RazorSyntaxTree Parse(RazorSourceDocument source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var context = new ParserContext(source, Options);
+            var codeParser = new CSharpCodeParser(Options.Directives, context);
+            var markupParser = new HtmlMarkupParser(context);
+
+            codeParser.HtmlParser = markupParser;
+            markupParser.CodeParser = codeParser;
+
+            var diagnostics = context.ErrorSink.Errors;
+
+            var root = markupParser.ParseDocument().CreateRed();
+            return RazorSyntaxTree.Create(root, source, diagnostics, Options);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
new file mode 100644
index 0000000000..2a3d016224
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class RazorSyntaxTreeExtensions
+    {
+        public static IReadOnlyList<ClassifiedSpanInternal> GetClassifiedSpans(this RazorSyntaxTree syntaxTree)
+        {
+            if (syntaxTree == null)
+            {
+                throw new ArgumentNullException(nameof(syntaxTree));
+            }
+
+            var visitor = new ClassifiedSpanVisitor(syntaxTree.Source);
+            visitor.Visit(syntaxTree.Root);
+
+            return visitor.ClassifiedSpans;
+        }
+
+        public static IReadOnlyList<TagHelperSpanInternal> GetTagHelperSpans(this RazorSyntaxTree syntaxTree)
+        {
+            if (syntaxTree == null)
+            {
+                throw new ArgumentNullException(nameof(syntaxTree));
+            }
+
+            var visitor = new TagHelperSpanVisitor(syntaxTree.Source);
+            visitor.Visit(syntaxTree.Root);
+
+            return visitor.TagHelperSpans;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RemoveTagHelperChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RemoveTagHelperChunkGenerator.cs
new file mode 100644
index 0000000000..6a05c951f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RemoveTagHelperChunkGenerator.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class RemoveTagHelperChunkGenerator : SpanChunkGenerator
+    {
+        public RemoveTagHelperChunkGenerator(
+            string lookupText,
+            string directiveText,
+            string typePattern,
+            string assemblyName,
+            List<RazorDiagnostic> diagnostics)
+        {
+            LookupText = lookupText;
+            DirectiveText = directiveText;
+            TypePattern = typePattern;
+            AssemblyName = assemblyName;
+            Diagnostics = diagnostics;
+        }
+
+        public string LookupText { get; }
+
+        public string DirectiveText { get; set; }
+
+        public string TypePattern { get; set; }
+
+        public string AssemblyName { get; set; }
+
+        public List<RazorDiagnostic> Diagnostics { get; }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as RemoveTagHelperChunkGenerator;
+            return base.Equals(other) &&
+                Enumerable.SequenceEqual(Diagnostics, other.Diagnostics) &&
+                string.Equals(LookupText, other.LookupText, StringComparison.Ordinal) &&
+                string.Equals(DirectiveText, other.DirectiveText, StringComparison.Ordinal) &&
+                string.Equals(TypePattern, other.TypePattern, StringComparison.Ordinal) &&
+                string.Equals(AssemblyName, other.AssemblyName, StringComparison.Ordinal);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var combiner = HashCodeCombiner.Start();
+            combiner.Add(base.GetHashCode());
+            combiner.Add(LookupText, StringComparer.Ordinal);
+            combiner.Add(DirectiveText, StringComparer.Ordinal);
+            combiner.Add(TypePattern, StringComparer.Ordinal);
+            combiner.Add(AssemblyName, StringComparer.Ordinal);
+
+            return combiner.CombinedHash;
+        }
+
+        public override string ToString()
+        {
+            var builder = new StringBuilder("RemoveTagHelper:{");
+            builder.Append(LookupText);
+            builder.Append(";");
+            builder.Append(DirectiveText);
+            builder.Append(";");
+            builder.Append(TypePattern);
+            builder.Append(";");
+            builder.Append(AssemblyName);
+            builder.Append("}");
+
+            if (Diagnostics.Count > 0)
+            {
+                builder.Append(" [");
+                var ids = string.Join(", ", Diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                builder.Append(ids);
+                builder.Append("]");
+            }
+
+            return builder.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SeekableTextReader.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SeekableTextReader.cs
new file mode 100644
index 0000000000..85057cf9fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SeekableTextReader.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SeekableTextReader : TextReader, ITextDocument
+    {
+        private readonly LineTrackingStringBuffer _buffer;
+        private int _position = 0;
+        private int _current;
+        private SourceLocation _location;
+
+        public SeekableTextReader(string source, string filePath) : this(source.ToCharArray(), filePath) { }
+
+        public SeekableTextReader(char[] source, string filePath)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            _buffer = new LineTrackingStringBuffer(source, filePath);
+            UpdateState();
+        }
+
+        public SourceLocation Location => _location;
+
+        public int Length => _buffer.Length;
+
+        public int Position
+        {
+            get { return _position; }
+            set
+            {
+                if (_position != value)
+                {
+                    _position = value;
+                    UpdateState();
+                }
+            }
+        }
+
+        public override int Read()
+        {
+            var c = _current;
+            _position++;
+            UpdateState();
+            return c;
+        }
+
+        public override int Peek() => _current;
+
+        private void UpdateState()
+        {
+            if (_position < _buffer.Length)
+            {
+                var chr = _buffer.CharAt(_position);
+                _current = chr.Character;
+                _location = chr.Location;
+            }
+            else if (_buffer.Length == 0)
+            {
+                _current = -1;
+                _location = SourceLocation.Zero;
+            }
+            else
+            {
+                _current = -1;
+                _location = _buffer.EndLocation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SourceLocationTracker.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SourceLocationTracker.cs
new file mode 100644
index 0000000000..def2d91df0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SourceLocationTracker.cs
@@ -0,0 +1,113 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SourceLocationTracker
+    {
+        private int _absoluteIndex = 0;
+        private int _characterIndex = 0;
+        private int _lineIndex = 0;
+        private SourceLocation _currentLocation;
+
+        public SourceLocationTracker()
+            : this(SourceLocation.Zero)
+        {
+        }
+
+        public SourceLocationTracker(SourceLocation currentLocation)
+        {
+            CurrentLocation = currentLocation;
+
+            UpdateInternalState();
+        }
+
+        public SourceLocation CurrentLocation
+        {
+            get
+            {
+                return _currentLocation;
+            }
+            set
+            {
+                if (!_currentLocation.Equals(value))
+                {
+                    _currentLocation = value;
+                    UpdateInternalState();
+                }
+            }
+        }
+
+        public static SourceLocation Advance(SourceLocation location, string text)
+        {
+            if (text == null)
+            {
+                throw new ArgumentNullException(nameof(text));
+            }
+
+            var tracker = new SourceLocationTracker(location);
+            tracker.UpdateLocation(text);
+            return tracker.CurrentLocation;
+        }
+
+        public void UpdateLocation(char characterRead, char nextCharacter)
+        {
+            UpdateCharacterCore(characterRead, nextCharacter);
+            RecalculateSourceLocation();
+        }
+
+        public SourceLocationTracker UpdateLocation(string content)
+        {
+            for (int i = 0; i < content.Length; i++)
+            {
+                var nextCharacter = '\0';
+                if (i < content.Length - 1)
+                {
+                    nextCharacter = content[i + 1];
+                }
+                UpdateCharacterCore(content[i], nextCharacter);
+            }
+            RecalculateSourceLocation();
+            return this;
+        }
+
+        private void UpdateCharacterCore(char characterRead, char nextCharacter)
+        {
+            _absoluteIndex++;
+
+            if (Environment.NewLine.Length == 1 && characterRead == Environment.NewLine[0] ||
+                ParserHelpers.IsNewLine(characterRead) && (characterRead != '\r' || nextCharacter != '\n'))
+            {
+                _lineIndex++;
+                _characterIndex = 0;
+            }
+            else
+            {
+                _characterIndex++;
+            }
+        }
+
+        private void UpdateInternalState()
+        {
+            _absoluteIndex = CurrentLocation.AbsoluteIndex;
+            _characterIndex = CurrentLocation.CharacterIndex;
+            _lineIndex = CurrentLocation.LineIndex;
+        }
+
+        private void RecalculateSourceLocation()
+        {
+            _currentLocation = new SourceLocation(
+                _currentLocation.FilePath,
+                _absoluteIndex,
+                _lineIndex,
+                _characterIndex);
+        }
+
+        public static SourceLocation CalculateNewLocation(SourceLocation lastPosition, string newContent)
+        {
+            return new SourceLocationTracker(lastPosition).UpdateLocation(newContent).CurrentLocation;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanChunkGenerator.cs
new file mode 100644
index 0000000000..146a5c7d4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanChunkGenerator.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal abstract class SpanChunkGenerator : ISpanChunkGenerator
+    {
+        private static readonly int TypeHashCode = typeof(SpanChunkGenerator).GetHashCode();
+
+        public static readonly ISpanChunkGenerator Null = new NullSpanChunkGenerator();
+
+        public override bool Equals(object obj)
+        {
+            return obj != null &&
+                GetType() == obj.GetType();
+        }
+
+        public override int GetHashCode()
+        {
+            return TypeHashCode;
+        }
+
+        private class NullSpanChunkGenerator : ISpanChunkGenerator
+        {
+            public override string ToString()
+            {
+                return "None";
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanContext.cs
new file mode 100644
index 0000000000..2eff0fdac1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanContext.cs
@@ -0,0 +1,52 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SpanContext
+    {
+        public SpanContext(ISpanChunkGenerator chunkGenerator, SpanEditHandler editHandler)
+        {
+            ChunkGenerator = chunkGenerator;
+            EditHandler = editHandler;
+        }
+
+        public ISpanChunkGenerator ChunkGenerator { get; }
+
+        public SpanEditHandler EditHandler { get; }
+    }
+
+    internal class SpanContextBuilder
+    {
+        public SpanContextBuilder()
+        {
+            Reset();
+        }
+
+        public SpanContextBuilder(SpanContext context)
+        {
+            EditHandler = context.EditHandler;
+            ChunkGenerator = context.ChunkGenerator;
+        }
+
+        public ISpanChunkGenerator ChunkGenerator { get; set; }
+
+        public SpanEditHandler EditHandler { get; set; }
+
+        public SpanContext Build()
+        {
+            var result = new SpanContext(ChunkGenerator, EditHandler);
+            Reset();
+            return result;
+        }
+
+        public void Reset()
+        {
+            EditHandler = SpanEditHandler.CreateDefault((content) => Enumerable.Empty<SyntaxToken>());
+            ChunkGenerator = SpanChunkGenerator.Null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanEditHandler.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanEditHandler.cs
new file mode 100644
index 0000000000..cf2d7a629d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanEditHandler.cs
@@ -0,0 +1,169 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SpanEditHandler
+    {
+        private static readonly int TypeHashCode = typeof(SpanEditHandler).GetHashCode();
+
+        public SpanEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer)
+            : this(tokenizer, AcceptedCharactersInternal.Any)
+        {
+        }
+
+        public SpanEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, AcceptedCharactersInternal accepted)
+        {
+            AcceptedCharacters = accepted;
+            Tokenizer = tokenizer;
+        }
+
+        public AcceptedCharactersInternal AcceptedCharacters { get; set; }
+
+        public Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> Tokenizer { get; set; }
+
+        public static SpanEditHandler CreateDefault()
+        {
+            return CreateDefault(c => Enumerable.Empty<Syntax.InternalSyntax.SyntaxToken>());
+        }
+
+        public static SpanEditHandler CreateDefault(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer)
+        {
+            return new SpanEditHandler(tokenizer);
+        }
+
+        public virtual EditResult ApplyChange(SyntaxNode target, SourceChange change)
+        {
+            return ApplyChange(target, change, force: false);
+        }
+
+        public virtual EditResult ApplyChange(SyntaxNode target, SourceChange change, bool force)
+        {
+            var result = PartialParseResultInternal.Accepted;
+            if (!force)
+            {
+                result = CanAcceptChange(target, change);
+            }
+
+            // If the change is accepted then apply the change
+            if ((result & PartialParseResultInternal.Accepted) == PartialParseResultInternal.Accepted)
+            {
+                return new EditResult(result, UpdateSpan(target, change));
+            }
+            return new EditResult(result, target);
+        }
+
+        public virtual bool OwnsChange(SyntaxNode target, SourceChange change)
+        {
+            var end = target.EndPosition;
+            var changeOldEnd = change.Span.AbsoluteIndex + change.Span.Length;
+            return change.Span.AbsoluteIndex >= target.Position &&
+                   (changeOldEnd < end || (changeOldEnd == end && AcceptedCharacters != AcceptedCharactersInternal.None));
+        }
+
+        protected virtual PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
+        {
+            return PartialParseResultInternal.Rejected;
+        }
+
+        protected virtual SyntaxNode UpdateSpan(SyntaxNode target, SourceChange change)
+        {
+            var newContent = change.GetEditedContent(target);
+            var builder = Syntax.InternalSyntax.SyntaxListBuilder<Syntax.InternalSyntax.SyntaxToken>.Create();
+            foreach (var token in Tokenizer(newContent))
+            {
+                builder.Add(token);
+            }
+
+            SyntaxNode newTarget = null;
+            if (target is RazorMetaCodeSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.RazorMetaCode(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is MarkupTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is MarkupEphemeralTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.MarkupEphemeralTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is CSharpStatementLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.CSharpStatementLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is CSharpExpressionLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.CSharpExpressionLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is CSharpEphemeralTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.CSharpEphemeralTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is UnclassifiedTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.UnclassifiedTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else
+            {
+                Debug.Fail($"The type {target?.GetType().Name} is not a supported span node.");
+            }
+
+            var context = target.GetSpanContext();
+            newTarget = context != null ? newTarget?.WithSpanContext(context) : newTarget;
+
+            return newTarget;
+        }
+
+        protected internal static bool IsAtEndOfFirstLine(SyntaxNode target, SourceChange change)
+        {
+            var endOfFirstLine = target.GetContent().IndexOfAny(new char[] { (char)0x000d, (char)0x000a, (char)0x2028, (char)0x2029 });
+            return (endOfFirstLine == -1 || (change.Span.AbsoluteIndex - target.Position) <= endOfFirstLine);
+        }
+
+        /// <summary>
+        /// Returns true if the specified change is an insertion of text at the end of this span.
+        /// </summary>
+        protected internal static bool IsEndDeletion(SyntaxNode target, SourceChange change)
+        {
+            return change.IsDelete && IsAtEndOfSpan(target, change);
+        }
+
+        /// <summary>
+        /// Returns true if the specified change is a replacement of text at the end of this span.
+        /// </summary>
+        protected internal static bool IsEndReplace(SyntaxNode target, SourceChange change)
+        {
+            return change.IsReplace && IsAtEndOfSpan(target, change);
+        }
+
+        protected internal static bool IsAtEndOfSpan(SyntaxNode target, SourceChange change)
+        {
+            return (change.Span.AbsoluteIndex + change.Span.Length) == target.EndPosition;
+        }
+
+        public override string ToString()
+        {
+            return GetType().Name + ";Accepts:" + AcceptedCharacters;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is SpanEditHandler other &&
+                GetType() == other.GetType() &&
+                AcceptedCharacters == other.AcceptedCharacters;
+        }
+
+        public override int GetHashCode()
+        {
+            // Hash code should include only immutable properties but Equals also checks the type.
+            return TypeHashCode;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanKindInternal.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanKindInternal.cs
new file mode 100644
index 0000000000..51ad9d1948
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SpanKindInternal.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal enum SpanKindInternal
+    {
+        Transition,
+        MetaCode,
+        Comment,
+        Code,
+        Markup,
+        None
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/StatementChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/StatementChunkGenerator.cs
new file mode 100644
index 0000000000..7874800a96
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/StatementChunkGenerator.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class StatementChunkGenerator : SpanChunkGenerator
+    {
+        public override string ToString()
+        {
+            return "Stmt";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SyntaxConstants.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SyntaxConstants.cs
new file mode 100644
index 0000000000..a4314b285a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/SyntaxConstants.cs
@@ -0,0 +1,32 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class SyntaxConstants
+    {
+        public static readonly string TextTagName = "text";
+        public static readonly char TransitionCharacter = '@';
+        public static readonly string TransitionString = "@";
+        public static readonly string StartCommentSequence = "@*";
+        public static readonly string EndCommentSequence = "*@";
+        public static readonly string SpanContextKind = "SpanData";
+
+        public static class CSharp
+        {
+            public static readonly int UsingKeywordLength = 5;
+            public static readonly string TagHelperPrefixKeyword = "tagHelperPrefix";
+            public static readonly string AddTagHelperKeyword = "addTagHelper";
+            public static readonly string RemoveTagHelperKeyword = "removeTagHelper";
+            public static readonly string InheritsKeyword = "inherits";
+            public static readonly string FunctionsKeyword = "functions";
+            public static readonly string SectionKeyword = "section";
+            public static readonly string ElseIfKeyword = "else if";
+            public static readonly string NamespaceKeyword = "namespace";
+            public static readonly string ClassKeyword = "class";
+
+            // Not supported. Only used for error cases.
+            public static readonly string HelperKeyword = "helper";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperAttributeNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperAttributeNode.cs
new file mode 100644
index 0000000000..139badfe5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperAttributeNode.cs
@@ -0,0 +1,29 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TagHelperAttributeNode
+    {
+        public TagHelperAttributeNode(string name, SyntaxNode value, AttributeStructure attributeStructure)
+        {
+            Name = name;
+            Value = value;
+            AttributeStructure = attributeStructure;
+        }
+
+        // Internal for testing
+        internal TagHelperAttributeNode(string name, SyntaxNode value)
+            : this(name, value, AttributeStructure.DoubleQuotes)
+        {
+        }
+
+        public string Name { get; }
+
+        public SyntaxNode Value { get; }
+
+        public AttributeStructure AttributeStructure { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
new file mode 100644
index 0000000000..421485fdcc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -0,0 +1,649 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class TagHelperBlockRewriter
+    {
+        private static readonly string StringTypeName = typeof(string).FullName;
+
+        public static MarkupTagHelperStartTagSyntax Rewrite(
+            string tagName,
+            bool validStructure,
+            RazorParserFeatureFlags featureFlags,
+            MarkupTagBlockSyntax tag,
+            TagHelperBinding bindingResult,
+            ErrorSink errorSink,
+            RazorSourceDocument source)
+        {
+            // There will always be at least one child for the '<'.
+            var rewrittenChildren = GetRewrittenChildren(tagName, validStructure, tag, bindingResult, featureFlags, errorSink, source);
+
+            return SyntaxFactory.MarkupTagHelperStartTag(rewrittenChildren);
+        }
+
+        public static TagMode GetTagMode(
+            MarkupTagBlockSyntax tagBlock,
+            TagHelperBinding bindingResult,
+            ErrorSink errorSink)
+        {
+            var childSpan = tagBlock.GetLastToken()?.Parent;
+
+            // Self-closing tags are always valid despite descriptors[X].TagStructure.
+            if (childSpan?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false)
+            {
+                return TagMode.SelfClosing;
+            }
+
+            foreach (var descriptor in bindingResult.Descriptors)
+            {
+                var boundRules = bindingResult.GetBoundRules(descriptor);
+                var nonDefaultRule = boundRules.FirstOrDefault(rule => rule.TagStructure != TagStructure.Unspecified);
+
+                if (nonDefaultRule?.TagStructure == TagStructure.WithoutEndTag)
+                {
+                    return TagMode.StartTagOnly;
+                }
+            }
+
+            return TagMode.StartTagAndEndTag;
+        }
+
+        private static SyntaxList<RazorSyntaxNode> GetRewrittenChildren(
+            string tagName,
+            bool validStructure,
+            MarkupTagBlockSyntax tagBlock,
+            TagHelperBinding bindingResult,
+            RazorParserFeatureFlags featureFlags,
+            ErrorSink errorSink,
+            RazorSourceDocument source)
+        {
+            var tagHelperBuilder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+            var processedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            if (tagBlock.Children.Count == 1)
+            {
+                // Tag with no attributes. We have nothing to rewrite here.
+                return tagBlock.Children;
+            }
+
+            // Add the tag start
+            tagHelperBuilder.Add(tagBlock.Children.First());
+
+            // We skip the first child "<tagname" and take everything up to the ending portion of the tag ">" or "/>".
+            // If the tag does not have a valid structure then there's no close angle to ignore.
+            var tokenOffset = validStructure ? 1 : 0;
+            for (var i = 1; i < tagBlock.Children.Count - tokenOffset; i++)
+            {
+                var isMinimized = false;
+                var attributeNameLocation = SourceLocation.Undefined;
+                var child = tagBlock.Children[i];
+                TryParseResult result;
+                if (child is MarkupAttributeBlockSyntax attributeBlock)
+                {
+                    attributeNameLocation = attributeBlock.Name.GetSourceLocation(source);
+                    result = TryParseAttribute(
+                        tagName,
+                        attributeBlock,
+                        bindingResult.Descriptors,
+                        errorSink,
+                        processedBoundAttributeNames);
+                    tagHelperBuilder.Add(result.RewrittenAttribute);
+                }
+                else if (child is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
+                {
+                    isMinimized = true;
+                    attributeNameLocation = minimizedAttributeBlock.Name.GetSourceLocation(source);
+                    result = TryParseMinimizedAttribute(
+                        tagName,
+                        minimizedAttributeBlock,
+                        bindingResult.Descriptors,
+                        errorSink,
+                        processedBoundAttributeNames);
+                    tagHelperBuilder.Add(result.RewrittenAttribute);
+                }
+                else if (child is CSharpCodeBlockSyntax)
+                {
+                    // TODO: Accept more than just Markup attributes: https://github.com/aspnet/Razor/issues/96.
+                    // Something like:
+                    // <input @checked />
+                    var location = new SourceSpan(child.GetSourceLocation(source), child.FullWidth);
+                    var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelpersCannotHaveCSharpInTagDeclaration(location, tagName);
+                    errorSink.OnError(diagnostic);
+
+                    result = null;
+                }
+                else if (child is MarkupTextLiteralSyntax)
+                {
+                    // If the original span content was whitespace it ultimately means the tag
+                    // that owns this "attribute" is malformed and is expecting a user to type a new attribute.
+                    // ex: <myTH class="btn"| |
+                    var literalContent = child.GetContent();
+                    if (!string.IsNullOrWhiteSpace(literalContent))
+                    {
+                        var location = child.GetSourceSpan(source);
+                        var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperAttributeListMustBeWellFormed(location);
+                        errorSink.OnError(diagnostic);
+                    }
+                    result = null;
+                }
+                else
+                {
+                    result = null;
+                }
+
+                // Only want to track the attribute if we succeeded in parsing its corresponding Block/Span.
+                if (result == null)
+                {
+                    // Error occurred while parsing the attribute. Don't try parsing the rest to avoid misleading errors.
+                    for (var j = i; j < tagBlock.Children.Count; j++)
+                    {
+                        tagHelperBuilder.Add(tagBlock.Children[j]);
+                    }
+
+                    return tagHelperBuilder.ToList();
+                }
+
+                // Check if it's a non-boolean bound attribute that is minimized or if it's a bound
+                // non-string attribute that has null or whitespace content.
+                var isValidMinimizedAttribute = featureFlags.AllowMinimizedBooleanTagHelperAttributes && result.IsBoundBooleanAttribute;
+                if ((isMinimized &&
+                    result.IsBoundAttribute &&
+                    !isValidMinimizedAttribute) ||
+                    (!isMinimized &&
+                    result.IsBoundNonStringAttribute &&
+                     string.IsNullOrWhiteSpace(GetAttributeValueContent(result.RewrittenAttribute))))
+                {
+                    var errorLocation = new SourceSpan(attributeNameLocation, result.AttributeName.Length);
+                    var propertyTypeName = GetPropertyType(result.AttributeName, bindingResult.Descriptors);
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_EmptyBoundAttribute(errorLocation, result.AttributeName, tagName, propertyTypeName);
+                    errorSink.OnError(diagnostic);
+                }
+
+                // Check if the attribute was a prefix match for a tag helper dictionary property but the
+                // dictionary key would be the empty string.
+                if (result.IsMissingDictionaryKey)
+                {
+                    var errorLocation = new SourceSpan(attributeNameLocation, result.AttributeName.Length);
+                    var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperIndexerAttributeNameMustIncludeKey(errorLocation, result.AttributeName, tagName);
+                    errorSink.OnError(diagnostic);
+                }
+            }
+
+            if (validStructure)
+            {
+                // Add the tag end.
+                tagHelperBuilder.Add(tagBlock.Children[tagBlock.Children.Count - 1]);
+            }
+
+            return tagHelperBuilder.ToList();
+        }
+
+        private static TryParseResult TryParseMinimizedAttribute(
+            string tagName,
+            MarkupMinimizedAttributeBlockSyntax attributeBlock,
+            IEnumerable<TagHelperDescriptor> descriptors,
+            ErrorSink errorSink,
+            HashSet<string> processedBoundAttributeNames)
+        {
+            // Have a name now. Able to determine correct isBoundNonStringAttribute value.
+            var result = CreateTryParseResult(attributeBlock.Name.GetContent(), descriptors, processedBoundAttributeNames);
+
+            result.AttributeStructure = AttributeStructure.Minimized;
+            var rewritten = SyntaxFactory.MarkupMinimizedTagHelperAttribute(
+                attributeBlock.NamePrefix,
+                attributeBlock.Name);
+
+            rewritten = rewritten.WithTagHelperAttributeInfo(
+                new TagHelperAttributeInfo(result.AttributeName, result.AttributeStructure, result.IsBoundAttribute));
+
+            result.RewrittenAttribute = rewritten;
+
+            return result;
+        }
+
+        private static TryParseResult TryParseAttribute(
+            string tagName,
+            MarkupAttributeBlockSyntax attributeBlock,
+            IEnumerable<TagHelperDescriptor> descriptors,
+            ErrorSink errorSink,
+            HashSet<string> processedBoundAttributeNames)
+        {
+            // Have a name now. Able to determine correct isBoundNonStringAttribute value.
+            var result = CreateTryParseResult(attributeBlock.Name.GetContent(), descriptors, processedBoundAttributeNames);
+
+            if (attributeBlock.ValuePrefix == null)
+            {
+                // We are purposefully not persisting NoQuotes even for unbound attributes because it is still possible to
+                // rewrite the values that introduces a space like in UrlResolutionTagHelper.
+                // The other case is it could be an expression, treat NoQuotes and DoubleQuotes equivalently. We purposefully do not persist NoQuotes
+                // ValueStyles at code generation time to protect users from rendering dynamic content with spaces
+                // that can break attributes.
+                // Ex: <tag my-attribute=@value /> where @value results in the test "hello world".
+                // This way, the above code would render <tag my-attribute="hello world" />.
+                result.AttributeStructure = AttributeStructure.DoubleQuotes;
+            }
+            else
+            {
+                var lastToken = attributeBlock.ValuePrefix.GetLastToken();
+                switch (lastToken.Kind)
+                {
+                    case SyntaxKind.DoubleQuote:
+                        result.AttributeStructure = AttributeStructure.DoubleQuotes;
+                        break;
+                    case SyntaxKind.SingleQuote:
+                        result.AttributeStructure = AttributeStructure.SingleQuotes;
+                        break;
+                    default:
+                        result.AttributeStructure = AttributeStructure.Minimized;
+                        break;
+                }
+            }
+
+            var attributeValue = attributeBlock.Value;
+            if (attributeValue == null)
+            {
+                var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+
+                // Add a marker for attribute value when there are no quotes like, <p class= >
+                builder.Add(SyntaxFactory.MarkupTextLiteral(new SyntaxList<SyntaxToken>()));
+
+                attributeValue = SyntaxFactory.GenericBlock(builder.ToList());
+            }
+            var rewrittenValue = RewriteAttributeValue(result, attributeValue);
+
+            var rewritten = SyntaxFactory.MarkupTagHelperAttribute(
+                attributeBlock.NamePrefix,
+                attributeBlock.Name,
+                attributeBlock.NameSuffix,
+                attributeBlock.EqualsToken,
+                attributeBlock.ValuePrefix,
+                rewrittenValue,
+                attributeBlock.ValueSuffix);
+
+            rewritten = rewritten.WithTagHelperAttributeInfo(
+                new TagHelperAttributeInfo(result.AttributeName, result.AttributeStructure, result.IsBoundAttribute));
+
+            result.RewrittenAttribute = rewritten;
+
+            return result;
+        }
+
+        private static MarkupTagHelperAttributeValueSyntax RewriteAttributeValue(TryParseResult result, RazorBlockSyntax attributeValue)
+        {
+            var rewriter = new AttributeValueRewriter(result);
+            var rewrittenValue = attributeValue;
+            if (result.IsBoundAttribute)
+            {
+                // If the attribute was requested by a tag helper but the corresponding property was not a
+                // string, then treat its value as code. A non-string value can be any C# value so we need
+                // to ensure the tree reflects that.
+                rewrittenValue = (RazorBlockSyntax)rewriter.Visit(attributeValue);
+            }
+
+            return SyntaxFactory.MarkupTagHelperAttributeValue(rewrittenValue.Children);
+        }
+
+        // Determines the full name of the Type of the property corresponding to an attribute with the given name.
+        private static string GetPropertyType(string name, IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            var firstBoundAttribute = FindFirstBoundAttribute(name, descriptors);
+            var isBoundToIndexer = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(name, firstBoundAttribute);
+
+            if (isBoundToIndexer)
+            {
+                return firstBoundAttribute?.IndexerTypeName;
+            }
+            else
+            {
+                return firstBoundAttribute?.TypeName;
+            }
+        }
+
+        // Create a TryParseResult for given name, filling in binding details.
+        private static TryParseResult CreateTryParseResult(
+            string name,
+            IEnumerable<TagHelperDescriptor> descriptors,
+            HashSet<string> processedBoundAttributeNames)
+        {
+            var firstBoundAttribute = FindFirstBoundAttribute(name, descriptors);
+            var isBoundAttribute = firstBoundAttribute != null;
+            var isBoundNonStringAttribute = isBoundAttribute && !firstBoundAttribute.ExpectsStringValue(name);
+            var isBoundBooleanAttribute = isBoundAttribute && firstBoundAttribute.ExpectsBooleanValue(name);
+            var isMissingDictionaryKey = isBoundAttribute &&
+                firstBoundAttribute.IndexerNamePrefix != null &&
+                name.Length == firstBoundAttribute.IndexerNamePrefix.Length;
+
+            var isDuplicateAttribute = false;
+            if (isBoundAttribute && !processedBoundAttributeNames.Add(name))
+            {
+                // A bound attribute with the same name has already been processed.
+                isDuplicateAttribute = true;
+            }
+
+            return new TryParseResult
+            {
+                AttributeName = name,
+                IsBoundAttribute = isBoundAttribute,
+                IsBoundNonStringAttribute = isBoundNonStringAttribute,
+                IsBoundBooleanAttribute = isBoundBooleanAttribute,
+                IsMissingDictionaryKey = isMissingDictionaryKey,
+                IsDuplicateAttribute = isDuplicateAttribute
+            };
+        }
+
+        // Finds first TagHelperAttributeDescriptor matching given name.
+        private static BoundAttributeDescriptor FindFirstBoundAttribute(
+            string name,
+            IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            var firstBoundAttribute = descriptors
+                .SelectMany(descriptor => descriptor.BoundAttributes)
+                .FirstOrDefault(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(name, attributeDescriptor));
+
+            return firstBoundAttribute;
+        }
+
+        private static string GetAttributeValueContent(RazorSyntaxNode attributeBlock)
+        {
+            if (attributeBlock is MarkupTagHelperAttributeSyntax tagHelperAttribute)
+            {
+                return tagHelperAttribute.Value?.GetContent();
+            }
+            else if (attributeBlock is MarkupAttributeBlockSyntax attribute)
+            {
+                return attribute.Value?.GetContent();
+            }
+
+            return null;
+        }
+
+        private class AttributeValueRewriter : SyntaxRewriter
+        {
+            private readonly TryParseResult _tryParseResult;
+            private bool _rewriteAsMarkup = false;
+
+            public AttributeValueRewriter(TryParseResult result)
+            {
+                _tryParseResult = result;
+            }
+
+            public override SyntaxNode VisitCSharpTransition(CSharpTransitionSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitCSharpTransition(node);
+                }
+
+                // For bound non-string attributes, we'll only allow a transition span to appear at the very
+                // beginning of the attribute expression. All later transitions would appear as code so that
+                // they are part of the generated output. E.g.
+                // key="@value" -> MyTagHelper.key = value
+                // key=" @value" -> MyTagHelper.key =  @value
+                // key="1 + @case" -> MyTagHelper.key = 1 + @case
+                // key="@int + @case" -> MyTagHelper.key = int + @case
+                // key="@(a + b) -> MyTagHelper.key = a + b
+                // key="4 + @(a + b)" -> MyTagHelper.key = 4 + @(a + b)
+                if (_rewriteAsMarkup)
+                {
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context.EditHandler);
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.Transition)).WithSpanContext(newContext);
+
+                    return base.VisitCSharpExpressionLiteral(expression);
+                }
+
+                _rewriteAsMarkup = true;
+                return base.VisitCSharpTransition(node);
+            }
+
+            public override SyntaxNode VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+            {
+                if (_rewriteAsMarkup)
+                {
+                    var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+
+                    // Convert transition.
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context?.EditHandler ?? SpanEditHandler.CreateDefault((content) => Enumerable.Empty<Syntax.InternalSyntax.SyntaxToken>()));
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.Transition.Transition)).WithSpanContext(newContext);
+                    expression = (CSharpExpressionLiteralSyntax)VisitCSharpExpressionLiteral(expression);
+                    builder.Add(expression);
+
+                    var rewrittenBody = (CSharpCodeBlockSyntax)VisitCSharpCodeBlock(((CSharpImplicitExpressionBodySyntax)node.Body).CSharpCode);
+                    builder.AddRange(rewrittenBody.Children);
+
+                    // Since the original transition is part of the body, we need something to take it's place.
+                    var transition = SyntaxFactory.CSharpTransition(SyntaxFactory.MissingToken(SyntaxKind.Transition));
+
+                    var rewrittenCodeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+                    return SyntaxFactory.CSharpImplicitExpression(transition, SyntaxFactory.CSharpImplicitExpressionBody(rewrittenCodeBlock));
+                }
+
+                return base.VisitCSharpImplicitExpression(node);
+            }
+
+            public override SyntaxNode VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+            {
+                CSharpTransitionSyntax transition = null;
+                var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                if (_rewriteAsMarkup)
+                {
+                    // Convert transition.
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context?.EditHandler ?? SpanEditHandler.CreateDefault((content) => Enumerable.Empty<Syntax.InternalSyntax.SyntaxToken>()));
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.Transition.Transition)).WithSpanContext(newContext);
+                    expression = (CSharpExpressionLiteralSyntax)VisitCSharpExpressionLiteral(expression);
+                    builder.Add(expression);
+
+                    // Since the original transition is part of the body, we need something to take it's place.
+                    transition = SyntaxFactory.CSharpTransition(SyntaxFactory.MissingToken(SyntaxKind.Transition));
+
+                    var body = (CSharpExplicitExpressionBodySyntax)node.Body;
+                    var rewrittenOpenParen = (RazorSyntaxNode)VisitRazorMetaCode(body.OpenParen);
+                    var rewrittenBody = (CSharpCodeBlockSyntax)VisitCSharpCodeBlock(body.CSharpCode);
+                    var rewrittenCloseParen = (RazorSyntaxNode)VisitRazorMetaCode(body.CloseParen);
+                    builder.Add(rewrittenOpenParen);
+                    builder.AddRange(rewrittenBody.Children);
+                    builder.Add(rewrittenCloseParen);
+                }
+                else
+                {
+                    // This is the first expression of a non-string attribute like attr=@(a + b)
+                    // Below code converts this to an implicit expression to make the parens
+                    // part of the expression so that it is rendered.
+                    transition = (CSharpTransitionSyntax)Visit(node.Transition);
+                    var body = (CSharpExplicitExpressionBodySyntax)node.Body;
+                    var rewrittenOpenParen = (RazorSyntaxNode)VisitRazorMetaCode(body.OpenParen);
+                    var rewrittenBody = (CSharpCodeBlockSyntax)VisitCSharpCodeBlock(body.CSharpCode);
+                    var rewrittenCloseParen = (RazorSyntaxNode)VisitRazorMetaCode(body.CloseParen);
+                    builder.Add(rewrittenOpenParen);
+                    builder.AddRange(rewrittenBody.Children);
+                    builder.Add(rewrittenCloseParen);
+                }
+
+                var rewrittenCodeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+                return SyntaxFactory.CSharpImplicitExpression(transition, SyntaxFactory.CSharpImplicitExpressionBody(rewrittenCodeBlock));
+            }
+
+            public override SyntaxNode VisitRazorMetaCode(RazorMetaCodeSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitRazorMetaCode(node);
+                }
+
+                if (_rewriteAsMarkup)
+                {
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context.EditHandler);
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.MetaCode)).WithSpanContext(newContext);
+
+                    return VisitCSharpExpressionLiteral(expression);
+                }
+
+                _rewriteAsMarkup = true;
+                return base.VisitRazorMetaCode(node);
+            }
+
+            public override SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitCSharpExpressionLiteral(node);
+                }
+
+                node = (CSharpExpressionLiteralSyntax)ConfigureNonStringAttribute(node);
+
+                _rewriteAsMarkup = true;
+                return base.VisitCSharpExpressionLiteral(node);
+            }
+
+            public override SyntaxNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                if (node.Prefix != null)
+                {
+                    builder.AddRange(node.Prefix.LiteralTokens);
+                }
+                if (node.Value != null)
+                {
+                    builder.AddRange(node.Value.LiteralTokens);
+                }
+
+                if (_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    _rewriteAsMarkup = true;
+                    // Since this is a bound non-string attribute, we want to convert LiteralAttributeValue to just be a CSharp Expression literal.
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(builder.ToList());
+                    return VisitCSharpExpressionLiteral(expression);
+                }
+                else
+                {
+                    var literal = SyntaxFactory.MarkupTextLiteral(builder.ToList());
+                    var context = node.Value?.GetSpanContext();
+                    literal = context != null ? literal.WithSpanContext(context) : literal;
+
+                    return Visit(literal);
+                }
+            }
+
+            public override SyntaxNode VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+            {
+                // Move the prefix to be part of the actual value.
+                var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                if (node.Prefix != null)
+                {
+                    builder.Add(node.Prefix);
+                }
+                if (node.Value?.Children != null)
+                {
+                    builder.AddRange(node.Value.Children);
+                }
+                var rewrittenValue = SyntaxFactory.MarkupBlock(builder.ToList());
+
+                return base.VisitMarkupBlock(rewrittenValue);
+            }
+
+            public override SyntaxNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitCSharpStatementLiteral(node);
+                }
+
+                _rewriteAsMarkup = true;
+                return base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitMarkupTextLiteral(node);
+                }
+
+                _rewriteAsMarkup = true;
+                node = (MarkupTextLiteralSyntax)ConfigureNonStringAttribute(node);
+                var tokens = new SyntaxList<SyntaxToken>(node.LiteralTokens);
+                var value = SyntaxFactory.CSharpExpressionLiteral(tokens);
+                return value.WithSpanContext(node.GetSpanContext());
+            }
+
+            public override SyntaxNode VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitMarkupEphemeralTextLiteral(node);
+                }
+
+                // Since this is a non-string attribute we need to rewrite this as code.
+                // Rewriting it to CSharpEphemeralTextLiteral so that it is not rendered to output.
+                _rewriteAsMarkup = true;
+                node = (MarkupEphemeralTextLiteralSyntax)ConfigureNonStringAttribute(node);
+                var tokens = new SyntaxList<SyntaxToken>(node.LiteralTokens);
+                var value = SyntaxFactory.CSharpEphemeralTextLiteral(tokens);
+                return value.WithSpanContext(node.GetSpanContext());
+            }
+
+            private SyntaxNode ConfigureNonStringAttribute(SyntaxNode node)
+            {
+                var context = node.GetSpanContext();
+                var builder = context != null ? new SpanContextBuilder(context) : new SpanContextBuilder();
+                builder.EditHandler = new ImplicitExpressionEditHandler(
+                        builder.EditHandler.Tokenizer,
+                        CSharpCodeParser.DefaultKeywords,
+                        acceptTrailingDot: true)
+                {
+                    AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline
+                };
+
+                if (!_tryParseResult.IsDuplicateAttribute && builder.ChunkGenerator != SpanChunkGenerator.Null)
+                {
+                    // We want to mark the value of non-string bound attributes to be CSharp.
+                    // Except in two cases,
+                    // 1. Cases when we don't want to render the span. Eg: Transition span '@'.
+                    // 2. Cases when it is a duplicate of a bound attribute. This should just be rendered as html.
+
+                    builder.ChunkGenerator = new ExpressionChunkGenerator();
+                }
+
+                context = builder.Build();
+
+                return node.WithSpanContext(context);
+            }
+        }
+
+        private class TryParseResult
+        {
+            public string AttributeName { get; set; }
+
+            public RazorSyntaxNode RewrittenAttribute { get; set; }
+
+            public AttributeStructure AttributeStructure { get; set; }
+
+            public bool IsBoundAttribute { get; set; }
+
+            public bool IsBoundNonStringAttribute { get; set; }
+
+            public bool IsBoundBooleanAttribute { get; set; }
+
+            public bool IsMissingDictionaryKey { get; set; }
+
+            public bool IsDuplicateAttribute { get; set; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperDirectiveType.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperDirectiveType.cs
new file mode 100644
index 0000000000..3b98dfd895
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperDirectiveType.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    /// <summary>
+    /// The type of tag helper directive.
+    /// </summary>
+    internal enum TagHelperDirectiveType
+    {
+        /// <summary>
+        /// An <c>@addTagHelper</c> directive.
+        /// </summary>
+        AddTagHelper,
+
+        /// <summary>
+        /// A <c>@removeTagHelper</c> directive.
+        /// </summary>
+        RemoveTagHelper,
+
+        /// <summary>
+        /// A <c>@tagHelperPrefix</c> directive.
+        /// </summary>
+        TagHelperPrefix
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
new file mode 100644
index 0000000000..18b1cf5c4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -0,0 +1,727 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TagHelperParseTreeRewriter
+    {
+        public static RazorSyntaxTree Rewrite(RazorSyntaxTree syntaxTree, string tagHelperPrefix, IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            var errorSink = new ErrorSink();
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+
+            var rewriter = new Rewriter(
+                syntaxTree.Source,
+                tagHelperPrefix,
+                descriptors,
+                syntaxTree.Options.FeatureFlags,
+                errorSink);
+
+            var rewritten = rewriter.Visit(syntaxTree.Root);
+
+            var errorList = new List<RazorDiagnostic>();
+            errorList.AddRange(errorSink.Errors);
+            errorList.AddRange(descriptors.SelectMany(d => d.GetAllDiagnostics()));
+
+            var diagnostics = CombineErrors(syntaxTree.Diagnostics, errorList).OrderBy(error => error.Span.AbsoluteIndex);
+
+            var newSyntaxTree = RazorSyntaxTree.Create(rewritten, syntaxTree.Source, diagnostics, syntaxTree.Options);
+            newSyntaxTree = MarkupElementRewriter.RemoveMarkupElements(newSyntaxTree);
+
+            return newSyntaxTree;
+        }
+
+        private static IReadOnlyList<RazorDiagnostic> CombineErrors(IReadOnlyList<RazorDiagnostic> errors1, IReadOnlyList<RazorDiagnostic> errors2)
+        {
+            var combinedErrors = new List<RazorDiagnostic>(errors1.Count + errors2.Count);
+            combinedErrors.AddRange(errors1);
+            combinedErrors.AddRange(errors2);
+
+            return combinedErrors;
+        }
+
+        // Internal for testing.
+        internal class Rewriter : SyntaxRewriter
+        {
+            // Internal for testing.
+            // Null characters are invalid markup for HTML attribute values.
+            internal static readonly string InvalidAttributeValueMarker = "\0";
+
+            private readonly RazorSourceDocument _source;
+            private readonly string _tagHelperPrefix;
+            private readonly List<KeyValuePair<string, string>> _htmlAttributeTracker;
+            private readonly StringBuilder _attributeValueBuilder;
+            private readonly TagHelperBinder _tagHelperBinder;
+            private readonly Stack<TagTracker> _trackerStack;
+            private readonly ErrorSink _errorSink;
+            private RazorParserFeatureFlags _featureFlags;
+
+            public Rewriter(
+                RazorSourceDocument source,
+                string tagHelperPrefix,
+                IEnumerable<TagHelperDescriptor> descriptors,
+                RazorParserFeatureFlags featureFlags,
+                ErrorSink errorSink)
+            {
+                _source = source;
+                _tagHelperPrefix = tagHelperPrefix;
+                _tagHelperBinder = new TagHelperBinder(tagHelperPrefix, descriptors);
+                _trackerStack = new Stack<TagTracker>();
+                _attributeValueBuilder = new StringBuilder();
+                _htmlAttributeTracker = new List<KeyValuePair<string, string>>();
+                _featureFlags = featureFlags;
+                _errorSink = errorSink;
+            }
+
+            private TagTracker CurrentTracker => _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
+
+            private string CurrentParentTagName => CurrentTracker?.TagName;
+
+            private bool CurrentParentIsTagHelper => CurrentTracker?.IsTagHelper ?? false;
+
+            private TagHelperTracker CurrentTagHelperTracker => _trackerStack.FirstOrDefault(t => t.IsTagHelper) as TagHelperTracker;
+
+            public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
+            {
+                if (IsPartOfStartTag(node))
+                {
+                    // If this element is inside a start tag, it is some sort of malformed case like
+                    // <p @do { someattribute=\"btn\"></p>, where the end "p" tag is inside the start "p" tag.
+                    // We don't want to do tag helper parsing for this tag.
+                    return base.VisitMarkupElement(node);
+                }
+
+                MarkupTagHelperStartTagSyntax tagHelperStart = null;
+                MarkupTagHelperEndTagSyntax tagHelperEnd = null;
+                TagHelperInfo tagHelperInfo = null;
+
+                // Visit the start tag.
+                var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+                if (startTag != null)
+                {
+                    var tagName = startTag.GetTagName();
+                    if (TryRewriteTagHelperStart(startTag, out tagHelperStart, out tagHelperInfo))
+                    {
+                        // This is a tag helper.
+                        if (tagHelperInfo.TagMode == TagMode.SelfClosing || tagHelperInfo.TagMode == TagMode.StartTagOnly)
+                        {
+                            var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body: new SyntaxList<RazorSyntaxNode>(), endTag: null);
+                            var rewrittenTagHelper = tagHelperElement.WithTagHelperInfo(tagHelperInfo);
+                            if (node.Body.Count == 0)
+                            {
+                                return rewrittenTagHelper;
+                            }
+
+                            // This tag contains a body which needs to be moved to the parent.
+                            var rewrittenNodes = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                            rewrittenNodes.Add(rewrittenTagHelper);
+                            var rewrittenBody = VisitList(node.Body);
+                            rewrittenNodes.AddRange(rewrittenBody);
+
+                            return SyntaxFactory.MarkupElement(startTag: null, body: rewrittenNodes.ToList(), endTag: null);
+                        }
+                        else if (node.EndTag == null)
+                        {
+                            // Start tag helper with no corresponding end tag.
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
+                                    new SourceSpan(SourceLocationTracker.Advance(startTag.GetSourceLocation(_source), "<"), tagName.Length),
+                                    tagName));
+                        }
+                        else
+                        {
+                            // Tag helper start tag. Keep track.
+                            var tracker = new TagHelperTracker(_tagHelperPrefix, tagHelperInfo);
+                            _trackerStack.Push(tracker);
+                        }
+                    }
+                    else
+                    {
+                        // Non-TagHelper tag.
+                        ValidateParentAllowsPlainTag(startTag);
+
+                        if (!startTag.IsSelfClosing() && !startTag.IsVoidElement())
+                        {
+                            var tracker = new TagTracker(tagName, isTagHelper: false);
+                            _trackerStack.Push(tracker);
+                        }
+                    }
+                }
+
+                // Visit body between start and end tags.
+                var body = VisitList(node.Body);
+
+                // Visit end tag.
+                var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+                if (endTag != null)
+                {
+                    var tagName = endTag.GetTagName();
+                    if (TryRewriteTagHelperEnd(endTag, out tagHelperEnd))
+                    {
+                        // This is a tag helper
+                        if (startTag == null)
+                        {
+                            // The end tag helper has no corresponding start tag, create an error.
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
+                                    new SourceSpan(SourceLocationTracker.Advance(endTag.GetSourceLocation(_source), "</"), tagName.Length), tagName));
+                        }
+                    }
+                    else
+                    {
+                        // Non tag helper end tag.
+                        if (startTag == null)
+                        {
+                            // Standalone end tag. We may need to error if it is not supposed to be here.
+                            // If there was a corresponding start tag, we would have already added this error.
+                            ValidateParentAllowsPlainTag(endTag);
+                        }
+                        else if (!endTag.IsVoidElement())
+                        {
+                            // Since a start tag exists, we must already be tracking it.
+                            // Pop the stack as we're done with the end tag.
+                            _trackerStack.Pop();
+                        }
+                    }
+                }
+
+                if (tagHelperInfo != null)
+                {
+                    // If we get here it means this element was rewritten as a tag helper.
+                    var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body, tagHelperEnd);
+                    return tagHelperElement.WithTagHelperInfo(tagHelperInfo);
+                }
+
+                // There was no matching tag helper for this element. Return.
+                return node.Update(startTag, body, endTag);
+            }
+
+            public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+            {
+                var tagParent = node.FirstAncestorOrSelf<SyntaxNode>(n => n is MarkupTagBlockSyntax);
+                var isPartofTagBlock = tagParent != null;
+                if (!isPartofTagBlock)
+                {
+                    ValidateParentAllowsContent(node);
+                }
+
+                return base.VisitMarkupTextLiteral(node);
+            }
+
+            private bool TryRewriteTagHelperStart(MarkupTagBlockSyntax tagBlock, out MarkupTagHelperStartTagSyntax rewritten, out TagHelperInfo tagHelperInfo)
+            {
+                rewritten = null;
+                tagHelperInfo = null;
+
+                // Get tag name of the current block
+                var tagName = tagBlock.GetTagName();
+
+                // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
+                if (tagName == null)
+                {
+                    return false;
+                }
+
+                TagHelperBinding tagHelperBinding;
+
+                if (!IsPotentialTagHelper(tagName, tagBlock))
+                {
+                    return false;
+                }
+
+                var tracker = CurrentTagHelperTracker;
+                var tagNameScope = tracker?.TagName ?? string.Empty;
+
+                // We're now in a start tag block, we first need to see if the tag block is a tag helper.
+                var elementAttributes = GetAttributeNameValuePairs(tagBlock);
+
+                tagHelperBinding = _tagHelperBinder.GetBinding(
+                    tagName,
+                    elementAttributes,
+                    CurrentParentTagName,
+                    CurrentParentIsTagHelper);
+
+                // If there aren't any TagHelperDescriptors registered then we aren't a TagHelper
+                if (tagHelperBinding == null)
+                {
+                    // If the current tag matches the current TagHelper scope it means the parent TagHelper matched
+                    // all the required attributes but the current one did not; therefore, we need to increment the
+                    // OpenMatchingTags counter for current the TagHelperBlock so we don't end it too early.
+                    // ex: <myth req="..."><myth></myth></myth> We don't want the first myth to close on the inside
+                    // tag.
+                    if (string.Equals(tagNameScope, tagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        tracker.OpenMatchingTags++;
+                    }
+
+                    return false;
+                }
+
+                ValidateParentAllowsTagHelper(tagName, tagBlock);
+                ValidateBinding(tagHelperBinding, tagName, tagBlock);
+
+                // We're in a start TagHelper block.
+                var validTagStructure = ValidateTagSyntax(tagName, tagBlock);
+
+                var startTag = TagHelperBlockRewriter.Rewrite(
+                    tagName,
+                    validTagStructure,
+                    _featureFlags,
+                    tagBlock,
+                    tagHelperBinding,
+                    _errorSink,
+                    _source);
+
+                var tagMode = TagHelperBlockRewriter.GetTagMode(tagBlock, tagHelperBinding, _errorSink);
+                tagHelperInfo = new TagHelperInfo(tagName, tagMode, tagHelperBinding);
+                rewritten = startTag;
+
+                return true;
+            }
+
+            private bool TryRewriteTagHelperEnd(MarkupTagBlockSyntax tagBlock, out MarkupTagHelperEndTagSyntax rewritten)
+            {
+                rewritten = null;
+                var tagName = tagBlock.GetTagName();
+                // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
+                if (tagName == null)
+                {
+                    return false;
+                }
+
+                var tracker = CurrentTagHelperTracker;
+                var tagNameScope = tracker?.TagName ?? string.Empty;
+                if (!IsPotentialTagHelper(tagName, tagBlock))
+                {
+                    return false;
+                }
+
+                // Validate that our end tag matches the currently scoped tag, if not we may need to error.
+                if (tagNameScope.Equals(tagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    // If there are additional end tags required before we can build our block it means we're in a
+                    // situation like this: <myth req="..."><myth></myth></myth> where we're at the inside </myth>.
+                    if (tracker.OpenMatchingTags > 0)
+                    {
+                        tracker.OpenMatchingTags--;
+
+                        return false;
+                    }
+
+                    ValidateTagSyntax(tagName, tagBlock);
+
+                    _trackerStack.Pop();
+                }
+                else
+                {
+                    var tagHelperBinding = _tagHelperBinder.GetBinding(
+                        tagName,
+                        attributes: Array.Empty<KeyValuePair<string, string>>(),
+                        parentTagName: CurrentParentTagName,
+                        parentIsTagHelper: CurrentParentIsTagHelper);
+
+                    // If there are not TagHelperDescriptors associated with the end tag block that also have no
+                    // required attributes then it means we can't be a TagHelper, bail out.
+                    if (tagHelperBinding == null)
+                    {
+                        return false;
+                    }
+
+                    foreach (var descriptor in tagHelperBinding.Descriptors)
+                    {
+                        var boundRules = tagHelperBinding.GetBoundRules(descriptor);
+                        var invalidRule = boundRules.FirstOrDefault(rule => rule.TagStructure == TagStructure.WithoutEndTag);
+
+                        if (invalidRule != null)
+                        {
+                            // End tag TagHelper that states it shouldn't have an end tag.
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_TagHelperMustNotHaveAnEndTag(
+                                    new SourceSpan(SourceLocationTracker.Advance(tagBlock.GetSourceLocation(_source), "</"), tagName.Length),
+                                    tagName,
+                                    descriptor.DisplayName,
+                                    invalidRule.TagStructure));
+
+                            return false;
+                        }
+                    }
+                }
+
+                rewritten = SyntaxFactory.MarkupTagHelperEndTag(tagBlock.Children);
+
+                return true;
+            }
+
+            // Internal for testing
+            internal IReadOnlyList<KeyValuePair<string, string>> GetAttributeNameValuePairs(MarkupTagBlockSyntax tagBlock)
+            {
+                // Need to calculate how many children we should take that represent the attributes.
+                var childrenOffset = IsPartialTag(tagBlock) ? 0 : 1;
+                var childCount = tagBlock.Children.Count - childrenOffset;
+
+                if (childCount <= 1)
+                {
+                    return Array.Empty<KeyValuePair<string, string>>();
+                }
+
+                _htmlAttributeTracker.Clear();
+
+                var attributes = _htmlAttributeTracker;
+
+                for (var i = 1; i < childCount; i++)
+                {
+                    if (tagBlock.Children[i] is CSharpCodeBlockSyntax)
+                    {
+                        // Code blocks in the attribute area of tags mangles following attributes.
+                        // It's also not supported by TagHelpers, bail early to avoid creating bad attribute value pairs.
+                        break;
+                    }
+
+                    if (tagBlock.Children[i] is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
+                    {
+                        if (minimizedAttributeBlock.Name == null)
+                        {
+                            _attributeValueBuilder.Append(InvalidAttributeValueMarker);
+                            continue;
+                        }
+
+                        var minimizedAttribute = new KeyValuePair<string, string>(minimizedAttributeBlock.Name.GetContent(), string.Empty);
+                        attributes.Add(minimizedAttribute);
+                        continue;
+                    }
+
+                    if (!(tagBlock.Children[i] is MarkupAttributeBlockSyntax attributeBlock))
+                    {
+                        // If the parser thought these aren't attributes, we don't care about them. Move on.
+                        continue;
+                    }
+
+                    if (attributeBlock.Name == null)
+                    {
+                        _attributeValueBuilder.Append(InvalidAttributeValueMarker);
+                        continue;
+                    }
+
+                    if (attributeBlock.Value != null)
+                    {
+                        for (var j = 0; j < attributeBlock.Value.Children.Count; j++)
+                        {
+                            var child = attributeBlock.Value.Children[j];
+                            if (child is MarkupLiteralAttributeValueSyntax literalValue)
+                            {
+                                _attributeValueBuilder.Append(literalValue.GetContent());
+                            }
+                            else
+                            {
+                                _attributeValueBuilder.Append(InvalidAttributeValueMarker);
+                            }
+                        }
+                    }
+
+                    var attributeName = attributeBlock.Name.GetContent();
+                    var attributeValue = _attributeValueBuilder.ToString();
+                    var attribute = new KeyValuePair<string, string>(attributeName, attributeValue);
+                    attributes.Add(attribute);
+
+                    _attributeValueBuilder.Clear();
+                }
+
+                return attributes;
+            }
+
+            private void ValidateParentAllowsTagHelper(string tagName, MarkupTagBlockSyntax tagBlock)
+            {
+                if (HasAllowedChildren() &&
+                    !CurrentTagHelperTracker.PrefixedAllowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
+                {
+                    OnAllowedChildrenTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                }
+            }
+
+            private void ValidateBinding(
+                TagHelperBinding bindingResult,
+                string tagName,
+                MarkupTagBlockSyntax tagBlock)
+            {
+                // Ensure that all descriptors associated with this tag have appropriate TagStructures. Cannot have
+                // multiple descriptors that expect different TagStructures (other than TagStructure.Unspecified).
+                TagHelperDescriptor baseDescriptor = null;
+                TagStructure? baseStructure = null;
+                foreach (var descriptor in bindingResult.Descriptors)
+                {
+                    var boundRules = bindingResult.GetBoundRules(descriptor);
+                    foreach (var rule in boundRules)
+                    {
+                        if (rule.TagStructure != TagStructure.Unspecified)
+                        {
+                            // Can't have a set of TagHelpers that expect different structures.
+                            if (baseStructure.HasValue && baseStructure != rule.TagStructure)
+                            {
+                                _errorSink.OnError(
+                                    RazorDiagnosticFactory.CreateTagHelper_InconsistentTagStructure(
+                                        new SourceSpan(tagBlock.GetSourceLocation(_source), tagBlock.FullWidth),
+                                        baseDescriptor.DisplayName,
+                                        descriptor.DisplayName,
+                                        tagName));
+                            }
+
+                            baseDescriptor = descriptor;
+                            baseStructure = rule.TagStructure;
+                        }
+                    }
+                }
+            }
+
+            private bool ValidateTagSyntax(string tagName, MarkupTagBlockSyntax tag)
+            {
+                // We assume an invalid syntax until we verify that the tag meets all of our "valid syntax" criteria.
+                if (IsPartialTag(tag))
+                {
+                    var errorStart = GetTagDeclarationErrorStart(tag);
+
+                    _errorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TagHelperMissingCloseAngle(
+                            new SourceSpan(errorStart, tagName.Length), tagName));
+
+                    return false;
+                }
+
+                return true;
+            }
+
+            private bool IsPotentialTagHelper(string tagName, MarkupTagBlockSyntax childBlock)
+            {
+                Debug.Assert(childBlock.Children.Count > 0);
+                var child = childBlock.Children[0];
+
+                return !string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) ||
+                       child.Kind != SyntaxKind.MarkupTransition;
+            }
+
+            private SourceLocation GetTagDeclarationErrorStart(MarkupTagBlockSyntax tagBlock)
+            {
+                var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
+
+                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(_source), advanceBy);
+            }
+
+            private static bool IsPartialTag(MarkupTagBlockSyntax tagBlock)
+            {
+                // No need to validate the tag end because in order to be a tag block it must start with '<'.
+                var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1];
+
+                // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format)
+                if (tagEnd != null && tagEnd is MarkupTextLiteralSyntax tagEndLiteral)
+                {
+                    var endToken = tagEndLiteral.LiteralTokens.Count > 0 ?
+                        tagEndLiteral.LiteralTokens[tagEndLiteral.LiteralTokens.Count - 1] :
+                        null;
+
+                    if (endToken != null && endToken.Kind == SyntaxKind.CloseAngle)
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            private void ValidateParentAllowsContent(SyntaxNode child)
+            {
+                if (HasAllowedChildren())
+                {
+                    var isDisallowedContent = true;
+                    if (_featureFlags.AllowHtmlCommentsInTagHelpers)
+                    {
+                        isDisallowedContent = !IsComment(child) &&
+                            !child.IsTransitionSpanKind() &&
+                            !child.IsCodeSpanKind();
+                    }
+
+                    if (isDisallowedContent)
+                    {
+                        var content = child.GetContent();
+                        if (!string.IsNullOrWhiteSpace(content))
+                        {
+                            var trimmedStart = content.TrimStart();
+                            var whitespace = content.Substring(0, content.Length - trimmedStart.Length);
+                            var errorStart = SourceLocationTracker.Advance(child.GetSourceLocation(_source), whitespace);
+                            var length = trimmedStart.TrimEnd().Length;
+                            var allowedChildren = CurrentTagHelperTracker.AllowedChildren;
+                            var allowedChildrenString = string.Join(", ", allowedChildren);
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateTagHelper_CannotHaveNonTagContent(
+                                    new SourceSpan(errorStart, length),
+                                    CurrentTagHelperTracker.TagName,
+                                    allowedChildrenString));
+                        }
+                    }
+                }
+            }
+
+            private void ValidateParentAllowsPlainTag(MarkupTagBlockSyntax tagBlock)
+            {
+                var tagName = tagBlock.GetTagName();
+
+                // Treat partial tags such as '</' which have no tag names as content.
+                if (string.IsNullOrEmpty(tagName))
+                {
+                    var firstChild = tagBlock.Children.First();
+                    Debug.Assert(firstChild is MarkupTextLiteralSyntax || firstChild is MarkupTransitionSyntax);
+
+                    ValidateParentAllowsContent(tagBlock.Children.First());
+                    return;
+                }
+
+                if (!HasAllowedChildren())
+                {
+                    return;
+                }
+
+                var tagHelperBinding = _tagHelperBinder.GetBinding(
+                    tagName,
+                    attributes: Array.Empty<KeyValuePair<string, string>>(),
+                    parentTagName: CurrentParentTagName,
+                    parentIsTagHelper: CurrentParentIsTagHelper);
+
+                // If we found a binding for the current tag, then it is a tag helper. Use the prefixed allowed children to compare.
+                var allowedChildren = tagHelperBinding != null ? CurrentTagHelperTracker.PrefixedAllowedChildren : CurrentTagHelperTracker.AllowedChildren;
+                if (!allowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
+                {
+                    OnAllowedChildrenTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                }
+            }
+
+            private bool HasAllowedChildren()
+            {
+                // TODO: Questionable logic. Need to revisit
+                var currentTracker = _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
+
+                // If the current tracker is not a TagHelper then there's no AllowedChildren to enforce.
+                if (currentTracker == null || !currentTracker.IsTagHelper)
+                {
+                    return false;
+                }
+
+                return CurrentTagHelperTracker.AllowedChildren != null && CurrentTagHelperTracker.AllowedChildren.Count > 0;
+            }
+
+            private bool IsPartOfStartTag(SyntaxNode node)
+            {
+                // Check if an ancestor is a start tag of a MarkupElement.
+                var parent = node.FirstAncestorOrSelf<SyntaxNode>(n =>
+                {
+                    return n.Parent is MarkupElementSyntax element && element.StartTag == n;
+                });
+
+                return parent != null;
+            }
+
+            internal static bool IsComment(SyntaxNode node)
+            {
+                var commentParent = node.FirstAncestorOrSelf<SyntaxNode>(
+                    n => n is RazorCommentBlockSyntax || n is MarkupCommentBlockSyntax);
+
+                return commentParent != null;
+            }
+
+            private static void OnAllowedChildrenTagError(
+                TagHelperTracker tracker,
+                string tagName,
+                MarkupTagBlockSyntax tagBlock,
+                ErrorSink errorSink,
+                RazorSourceDocument source)
+            {
+                var allowedChildrenString = string.Join(", ", tracker.AllowedChildren);
+                var errorStart = GetTagDeclarationErrorStart(tagBlock, source);
+
+                errorSink.OnError(
+                    RazorDiagnosticFactory.CreateTagHelper_InvalidNestedTag(
+                        new SourceSpan(errorStart, tagName.Length),
+                        tagName,
+                        tracker.TagName,
+                        allowedChildrenString));
+            }
+
+            private static SourceLocation GetTagDeclarationErrorStart(MarkupTagBlockSyntax tagBlock, RazorSourceDocument source)
+            {
+                var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
+
+                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(source), advanceBy);
+            }
+
+            private static bool IsEndTag(MarkupTagBlockSyntax tagBlock)
+            {
+                var childSpan = (MarkupTextLiteralSyntax)tagBlock.Children.First();
+
+                // We grab the token that could be forward slash
+                var relevantToken = childSpan.LiteralTokens[childSpan.LiteralTokens.Count == 1 ? 0 : 1];
+
+                return relevantToken.Kind == SyntaxKind.ForwardSlash;
+            }
+
+            private class TagTracker
+            {
+                public TagTracker(string tagName, bool isTagHelper)
+                {
+                    TagName = tagName;
+                    IsTagHelper = isTagHelper;
+                }
+
+                public string TagName { get; }
+
+                public bool IsTagHelper { get; }
+            }
+
+            private class TagHelperTracker : TagTracker
+            {
+                private IReadOnlyList<string> _prefixedAllowedChildren;
+                private readonly string _tagHelperPrefix;
+
+                public TagHelperTracker(string tagHelperPrefix, TagHelperInfo info)
+                    : base(info.TagName, isTagHelper: true)
+                {
+                    _tagHelperPrefix = tagHelperPrefix;
+                    Info = info;
+
+                    if (Info.BindingResult.Descriptors.Any(descriptor => descriptor.AllowedChildTags != null))
+                    {
+                        AllowedChildren = Info.BindingResult.Descriptors
+                            .Where(descriptor => descriptor.AllowedChildTags != null)
+                            .SelectMany(descriptor => descriptor.AllowedChildTags.Select(childTag => childTag.Name))
+                            .Distinct(StringComparer.OrdinalIgnoreCase)
+                            .ToList();
+                    }
+                }
+
+                public TagHelperInfo Info { get; }
+
+                public uint OpenMatchingTags { get; set; }
+
+                public IReadOnlyList<string> AllowedChildren { get; }
+
+                public IReadOnlyList<string> PrefixedAllowedChildren
+                {
+                    get
+                    {
+                        if (AllowedChildren != null && _prefixedAllowedChildren == null)
+                        {
+                            Debug.Assert(Info.BindingResult.Descriptors.Count() >= 1);
+
+                            _prefixedAllowedChildren = AllowedChildren.Select(allowedChild => _tagHelperPrefix + allowedChild).ToList();
+                        }
+
+                        return _prefixedAllowedChildren;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs
new file mode 100644
index 0000000000..094ec2e9c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs
@@ -0,0 +1,67 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TagHelperPrefixDirectiveChunkGenerator : SpanChunkGenerator
+    {
+        public TagHelperPrefixDirectiveChunkGenerator(string prefix, string directiveText, List<RazorDiagnostic> diagnostics)
+        {
+            Prefix = prefix;
+            DirectiveText = directiveText;
+            Diagnostics = diagnostics;
+        }
+
+        public string Prefix { get; }
+
+        public string DirectiveText { get; }
+
+        public List<RazorDiagnostic> Diagnostics { get; }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as TagHelperPrefixDirectiveChunkGenerator;
+            return base.Equals(other) &&
+                Enumerable.SequenceEqual(Diagnostics, other.Diagnostics) &&
+                string.Equals(Prefix, other.Prefix, StringComparison.Ordinal) &&
+                string.Equals(DirectiveText, other.DirectiveText, StringComparison.Ordinal);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var combiner = HashCodeCombiner.Start();
+            combiner.Add(base.GetHashCode());
+            combiner.Add(Prefix, StringComparer.Ordinal);
+            combiner.Add(DirectiveText, StringComparer.Ordinal);
+
+            return combiner.CombinedHash;
+        }
+
+        public override string ToString()
+        {
+            var builder = new StringBuilder("TagHelperPrefix:{");
+            builder.Append(Prefix);
+            builder.Append(";");
+            builder.Append(DirectiveText);
+            builder.Append("}");
+
+            if (Diagnostics.Count > 0)
+            {
+                builder.Append(" [");
+                var ids = string.Join(", ", Diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                builder.Append(ids);
+                builder.Append("]");
+            }
+
+            return builder.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperSpanInternal.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperSpanInternal.cs
new file mode 100644
index 0000000000..8d5ff92f9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperSpanInternal.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal struct TagHelperSpanInternal
+    {
+        public TagHelperSpanInternal(SourceSpan span, TagHelperBinding binding)
+        {
+            if (binding == null)
+            {
+                throw new ArgumentNullException(nameof(binding));
+            }
+
+            Span = span;
+            Binding = binding;
+        }
+
+        public TagHelperBinding Binding { get; }
+
+        public IEnumerable<TagHelperDescriptor> TagHelpers => Binding.Descriptors;
+
+        public SourceSpan Span { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TextReaderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TextReaderExtensions.cs
new file mode 100644
index 0000000000..1c5f77c314
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TextReaderExtensions.cs
@@ -0,0 +1,167 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class TextReaderExtensions
+    {
+        public static string ReadUntil(this TextReader reader, char terminator)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            return ReadUntil(reader, terminator, inclusive: false);
+        }
+
+        public static string ReadUntil(this TextReader reader, char terminator, bool inclusive)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            // Rather not allocate an array to use ReadUntil(TextReader, params char[]) so we'll just call the predicate version directly
+            return ReadUntil(reader, c => c == terminator, inclusive);
+        }
+
+        public static string ReadUntil(this TextReader reader, params char[] terminators)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (terminators == null)
+            {
+                throw new ArgumentNullException(nameof(terminators));
+            }
+
+            // NOTE: Using named parameters would be difficult here, hence the inline comment
+            return ReadUntil(reader, inclusive: false, terminators: terminators);
+        }
+
+        public static string ReadUntil(
+            this TextReader reader,
+            bool inclusive,
+            params char[] terminators)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (terminators == null)
+            {
+                throw new ArgumentNullException(nameof(terminators));
+            }
+
+            return ReadUntil(reader, c => terminators.Any(tc => tc == c), inclusive: inclusive);
+        }
+
+        public static string ReadUntil(this TextReader reader, Predicate<char> condition)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (condition == null)
+            {
+                throw new ArgumentNullException(nameof(condition));
+            }
+
+            return ReadUntil(reader, condition, inclusive: false);
+        }
+
+        public static string ReadUntil(
+            this TextReader reader,
+            Predicate<char> condition,
+            bool inclusive)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (condition == null)
+            {
+                throw new ArgumentNullException(nameof(condition));
+            }
+
+            var builder = new StringBuilder();
+            var ch = -1;
+            while ((ch = reader.Peek()) != -1 && !condition((char)ch))
+            {
+                reader.Read(); // Advance the reader
+                builder.Append((char)ch);
+            }
+
+            if (inclusive && reader.Peek() != -1)
+            {
+                builder.Append((char)reader.Read());
+            }
+
+            return builder.ToString();
+        }
+
+        public static string ReadWhile(this TextReader reader, Predicate<char> condition)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (condition == null)
+            {
+                throw new ArgumentNullException(nameof(condition));
+            }
+
+            return ReadWhile(reader, condition, inclusive: false);
+        }
+
+        public static string ReadWhile(
+            this TextReader reader,
+            Predicate<char> condition,
+            bool inclusive)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (condition == null)
+            {
+                throw new ArgumentNullException(nameof(condition));
+            }
+
+            return ReadUntil(reader, ch => !condition(ch), inclusive);
+        }
+
+        public static string ReadWhiteSpace(this TextReader reader)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            return ReadWhile(reader, c => Char.IsWhiteSpace(c));
+        }
+
+        public static string ReadUntilWhiteSpace(this TextReader reader)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            return ReadUntil(reader, c => Char.IsWhiteSpace(c));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs
new file mode 100644
index 0000000000..09ad7eb1b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs
@@ -0,0 +1,445 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal abstract class Tokenizer : ITokenizer
+    {
+        protected Tokenizer(ITextDocument source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            Source = source;
+            Buffer = new StringBuilder();
+            CurrentErrors = new List<RazorDiagnostic>();
+            StartToken();
+        }
+
+        protected List<RazorDiagnostic> CurrentErrors { get; }
+
+        protected abstract int StartState { get; }
+
+        protected int? CurrentState { get; set; }
+
+        protected SyntaxToken CurrenSyntaxToken { get; private set; }
+
+        public ITextDocument Source { get; private set; }
+
+        protected StringBuilder Buffer { get; private set; }
+
+        protected bool EndOfFile
+        {
+            get { return Source.Peek() == -1; }
+        }
+
+        public abstract SyntaxKind RazorCommentStarKind { get; }
+        public abstract SyntaxKind RazorCommentKind { get; }
+        public abstract SyntaxKind RazorCommentTransitionKind { get; }
+
+        protected bool HaveContent
+        {
+            get { return Buffer.Length > 0; }
+        }
+
+        protected char CurrentCharacter
+        {
+            get
+            {
+                var peek = Source.Peek();
+                return peek == -1 ? '\0' : (char)peek;
+            }
+        }
+
+        public SourceLocation CurrentLocation => Source.Location;
+
+        public SourceLocation CurrentStart { get; private set; }
+
+        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors);
+
+        protected abstract StateResult Dispatch();
+
+        SyntaxToken ITokenizer.NextToken()
+        {
+            return NextToken();
+        }
+
+        public virtual SyntaxToken NextToken()
+        {
+            // Post-Condition: Buffer should be empty at the start of Next()
+            Debug.Assert(Buffer.Length == 0);
+            StartToken();
+
+            if (EndOfFile)
+            {
+                return null;
+            }
+
+            var token = Turn();
+
+            // Post-Condition: Buffer should be empty at the end of Next()
+            Debug.Assert(Buffer.Length == 0);
+
+            // Post-Condition: Token should be non-zero length unless we're at EOF.
+            Debug.Assert(EndOfFile || !CurrentStart.Equals(CurrentLocation));
+
+            return token;
+        }
+
+        protected virtual SyntaxToken Turn()
+        {
+            if (CurrentState != null)
+            {
+                // Run until we get into the stop state or have a result.
+                do
+                {
+                    var next = Dispatch();
+
+                    CurrentState = next.State;
+                    CurrenSyntaxToken = next.Result;
+                }
+                while (CurrentState != null && CurrenSyntaxToken == null);
+
+                if (CurrentState == null)
+                {
+                    return default(SyntaxToken); // Terminated
+                }
+
+                return CurrenSyntaxToken;
+            }
+
+            return default(SyntaxToken);
+        }
+
+        public void Reset()
+        {
+            CurrentState = StartState;
+        }
+
+        /// <summary>
+        /// Returns a result indicating that the machine should stop executing and return null output.
+        /// </summary>
+        protected StateResult Stop()
+        {
+            return default(StateResult);
+        }
+
+        /// <summary>
+        /// Returns a result indicating that this state has no output and the machine should immediately invoke the specified state
+        /// </summary>
+        /// <remarks>
+        /// By returning no output, the state machine will invoke the next state immediately, before returning
+        /// controller to the caller of <see cref="Turn"/>
+        /// </remarks>
+        protected StateResult Transition(int state)
+        {
+            return new StateResult(state, result: null);
+        }
+
+        /// <summary>
+        /// Returns a result containing the specified output and indicating that the next call to
+        /// <see cref="Turn"/> should invoke the provided state.
+        /// </summary>
+        protected StateResult Transition(int state, SyntaxToken result)
+        {
+            return new StateResult(state, result);
+        }
+
+        protected StateResult Transition(RazorCommentTokenizerState state)
+        {
+            return new StateResult((int)state, result: null);
+        }
+
+        protected StateResult Transition(RazorCommentTokenizerState state, SyntaxToken result)
+        {
+            return new StateResult((int)state, result);
+        }
+
+        /// <summary>
+        /// Returns a result indicating that this state has no output and the machine should remain in this state
+        /// </summary>
+        /// <remarks>
+        /// By returning no output, the state machine will re-invoke the current state again before returning
+        /// controller to the caller of <see cref="Turn"/>
+        /// </remarks>
+        protected StateResult Stay()
+        {
+            return new StateResult(CurrentState, result: null);
+        }
+
+        /// <summary>
+        /// Returns a result containing the specified output and indicating that the next call to
+        /// <see cref="Turn"/> should re-invoke the current state.
+        /// </summary>
+        protected StateResult Stay(SyntaxToken result)
+        {
+            return new StateResult(CurrentState, result);
+        }
+
+        protected SyntaxToken Single(SyntaxKind type)
+        {
+            TakeCurrent();
+            return EndToken(type);
+        }
+
+        protected void StartToken()
+        {
+            Debug.Assert(Buffer.Length == 0);
+            Debug.Assert(CurrentErrors.Count == 0);
+
+            CurrentStart = CurrentLocation;
+        }
+
+        protected SyntaxToken EndToken(SyntaxKind type)
+        {
+            SyntaxToken token = null;
+            if (HaveContent)
+            {
+                // Perf: Don't allocate a new errors array unless necessary.
+                var errors = CurrentErrors.Count == 0 ? RazorDiagnostic.EmptyArray : new RazorDiagnostic[CurrentErrors.Count];
+                for (var i = 0; i < CurrentErrors.Count; i++)
+                {
+                    errors[i] = CurrentErrors[i];
+                }
+
+                var tokenContent = GetTokenContent(type);
+                Debug.Assert(string.Equals(tokenContent, Buffer.ToString(), StringComparison.Ordinal));
+                token = CreateToken(tokenContent, type, errors);
+
+                Buffer.Clear();
+                CurrentErrors.Clear();
+            }
+
+            return token;
+        }
+
+        protected virtual string GetTokenContent(SyntaxKind type)
+        {
+            return Buffer.ToString();
+        }
+
+        protected bool TakeUntil(Func<char, bool> predicate)
+        {
+            // Take all the characters up to the end character
+            while (!EndOfFile && !predicate(CurrentCharacter))
+            {
+                TakeCurrent();
+            }
+
+            // Why did we end?
+            return !EndOfFile;
+        }
+
+        protected void TakeCurrent()
+        {
+            if (EndOfFile)
+            {
+                return;
+            } // No-op
+            Buffer.Append(CurrentCharacter);
+            MoveNext();
+        }
+
+        protected void MoveNext()
+        {
+            Source.Read();
+        }
+
+        protected bool TakeAll(string expected, bool caseSensitive)
+        {
+            return Lookahead(expected, takeIfMatch: true, caseSensitive: caseSensitive);
+        }
+
+        protected char Peek()
+        {
+            using (var lookahead = BeginLookahead(Source))
+            {
+                MoveNext();
+                return CurrentCharacter;
+            }
+        }
+
+        protected StateResult AfterRazorCommentTransition()
+        {
+            if (CurrentCharacter != '*')
+            {
+                // We've been moved since last time we were asked for a token... reset the state
+                return Transition(StartState);
+            }
+
+            AssertCurrent('*');
+            TakeCurrent();
+            return Transition(1002, EndToken(RazorCommentStarKind));
+        }
+
+        protected StateResult RazorCommentBody()
+        {
+            TakeUntil(c => c == '*');
+            if (CurrentCharacter == '*')
+            {
+                if (Peek() == '@')
+                {
+                    if (HaveContent)
+                    {
+                        return Transition(
+                            RazorCommentTokenizerState.StarAfterRazorCommentBody,
+                            EndToken(RazorCommentKind));
+                    }
+                    else
+                    {
+                        return Transition(RazorCommentTokenizerState.StarAfterRazorCommentBody);
+                    }
+                }
+                else
+                {
+                    TakeCurrent();
+                    return Stay();
+                }
+            }
+
+            return Transition(StartState, EndToken(RazorCommentKind));
+        }
+
+        protected StateResult StarAfterRazorCommentBody()
+        {
+            AssertCurrent('*');
+            TakeCurrent();
+            return Transition(
+                RazorCommentTokenizerState.AtTokenAfterRazorCommentBody,
+                EndToken(RazorCommentStarKind));
+        }
+
+        protected StateResult AtTokenAfterRazorCommentBody()
+        {
+            AssertCurrent('@');
+            TakeCurrent();
+            return Transition(StartState, EndToken(RazorCommentTransitionKind));
+        }
+
+        /// <summary>
+        /// Internal for unit testing
+        /// </summary>
+        internal bool Lookahead(string expected, bool takeIfMatch, bool caseSensitive)
+        {
+            Func<char, char> filter = c => c;
+            if (!caseSensitive)
+            {
+                filter = char.ToLowerInvariant;
+            }
+
+            if (expected.Length == 0 || filter(CurrentCharacter) != filter(expected[0]))
+            {
+                return false;
+            }
+
+            // Capture the current buffer content in case we have to backtrack
+            string oldBuffer = null;
+            if (takeIfMatch)
+            {
+                oldBuffer = Buffer.ToString();
+            }
+
+            using (var lookahead = BeginLookahead(Source))
+            {
+                for (int i = 0; i < expected.Length; i++)
+                {
+                    if (filter(CurrentCharacter) != filter(expected[i]))
+                    {
+                        if (takeIfMatch)
+                        {
+                            // Clear the buffer and put the old buffer text back
+                            Buffer.Clear();
+                            Buffer.Append(oldBuffer);
+                        }
+                        // Return without accepting lookahead (thus rejecting it)
+                        return false;
+                    }
+                    if (takeIfMatch)
+                    {
+                        TakeCurrent();
+                    }
+                    else
+                    {
+                        MoveNext();
+                    }
+                }
+                if (takeIfMatch)
+                {
+                    lookahead.Accept();
+                }
+            }
+            return true;
+        }
+
+        [Conditional("DEBUG")]
+        internal void AssertCurrent(char current)
+        {
+            Debug.Assert(CurrentCharacter == current, "CurrentCharacter Assumption violated", "Assumed that the current character would be {0}, but it is actually {1}", current, CurrentCharacter);
+        }
+
+        protected enum RazorCommentTokenizerState
+        {
+            AfterRazorCommentTransition = 1000,
+            EscapedRazorCommentTransition,
+            RazorCommentBody,
+            StarAfterRazorCommentBody,
+            AtTokenAfterRazorCommentBody,
+        }
+
+        protected struct StateResult
+        {
+            public StateResult(int? state, SyntaxToken result)
+            {
+                State = state;
+                Result = result;
+            }
+
+            public int? State { get; }
+
+            public SyntaxToken Result { get; }
+        }
+
+        private static LookaheadToken BeginLookahead(ITextBuffer buffer)
+        {
+            var start = buffer.Position;
+            return new LookaheadToken(buffer);
+        }
+
+        private struct LookaheadToken : IDisposable
+        {
+            private readonly ITextBuffer _buffer;
+            private readonly int _position;
+
+            private bool _accepted;
+
+            public LookaheadToken(ITextBuffer buffer)
+            {
+                _buffer = buffer;
+                _position = buffer.Position;
+
+                _accepted = false;
+            }
+
+            public void Accept()
+            {
+                _accepted = true;
+            }
+
+            public void Dispose()
+            {
+                if (!_accepted)
+                {
+                    _buffer.Position = _position;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
new file mode 100644
index 0000000000..ed4b881939
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
@@ -0,0 +1,594 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal abstract class TokenizerBackedParser<TTokenizer> : ParserBase
+        where TTokenizer : Tokenizer
+    {
+        private readonly SyntaxListPool _pool = new SyntaxListPool();
+        private readonly TokenizerView<TTokenizer> _tokenizer;
+        private SyntaxListBuilder<SyntaxToken>? _tokenBuilder;
+
+        protected TokenizerBackedParser(LanguageCharacteristics<TTokenizer> language, ParserContext context)
+            : base(context)
+        {
+            Language = language;
+
+            var languageTokenizer = Language.CreateTokenizer(Context.Source);
+            _tokenizer = new TokenizerView<TTokenizer>(languageTokenizer);
+            SpanContext = new SpanContextBuilder();
+        }
+
+        protected SyntaxListPool Pool => _pool;
+
+        protected SyntaxListBuilder<SyntaxToken> TokenBuilder
+        {
+            get
+            {
+                if (_tokenBuilder == null)
+                {
+                    var result = _pool.Allocate<SyntaxToken>();
+                    _tokenBuilder = result.Builder;
+                }
+
+                return _tokenBuilder.Value;
+            }
+        }
+
+        protected SpanContextBuilder SpanContext { get; private set; }
+
+        protected Action<SpanContextBuilder> SpanContextConfig { get; set; }
+
+        protected SyntaxToken CurrentToken
+        {
+            get { return _tokenizer.Current; }
+        }
+
+        protected SyntaxToken PreviousToken { get; private set; }
+
+        protected SourceLocation CurrentStart => _tokenizer.Tokenizer.CurrentStart;
+
+        protected bool EndOfFile
+        {
+            get { return _tokenizer.EndOfFile; }
+        }
+
+        protected LanguageCharacteristics<TTokenizer> Language { get; }
+
+        protected SyntaxToken Lookahead(int count)
+        {
+            if (count < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+            else if (count == 0)
+            {
+                return CurrentToken;
+            }
+
+            // We add 1 in order to store the current token.
+            var tokens = new SyntaxToken[count + 1];
+            var currentToken = CurrentToken;
+
+            tokens[0] = currentToken;
+
+            // We need to look forward "count" many times.
+            for (var i = 1; i <= count; i++)
+            {
+                NextToken();
+                tokens[i] = CurrentToken;
+            }
+
+            // Restore Tokenizer's location to where it was pointing before the look-ahead.
+            for (var i = count; i >= 0; i--)
+            {
+                PutBack(tokens[i]);
+            }
+
+            // The PutBacks above will set CurrentToken to null. EnsureCurrent will set our CurrentToken to the
+            // next token.
+            EnsureCurrent();
+
+            return tokens[count];
+        }
+
+        /// <summary>
+        /// Looks forward until the specified condition is met.
+        /// </summary>
+        /// <param name="condition">A predicate accepting the token being evaluated and the list of tokens which have been looped through.</param>
+        /// <returns>true, if the condition was met. false - if the condition wasn't met and the last token has already been processed.</returns>
+        /// <remarks>The list of previous tokens is passed in the reverse order. So the last processed element will be the first one in the list.</remarks>
+        protected bool LookaheadUntil(Func<SyntaxToken, IEnumerable<SyntaxToken>, bool> condition)
+        {
+            if (condition == null)
+            {
+                throw new ArgumentNullException(nameof(condition));
+            }
+
+            var matchFound = false;
+
+            var tokens = new List<SyntaxToken>();
+            tokens.Add(CurrentToken);
+
+            while (true)
+            {
+                if (!NextToken())
+                {
+                    break;
+                }
+
+                tokens.Add(CurrentToken);
+                if (condition(CurrentToken, tokens))
+                {
+                    matchFound = true;
+                    break;
+                }
+            }
+
+            // Restore Tokenizer's location to where it was pointing before the look-ahead.
+            for (var i = tokens.Count - 1; i >= 0; i--)
+            {
+                PutBack(tokens[i]);
+            }
+
+            // The PutBacks above will set CurrentToken to null. EnsureCurrent will set our CurrentToken to the
+            // next token.
+            EnsureCurrent();
+
+            return matchFound;
+        }
+
+        protected internal bool NextToken()
+        {
+            PreviousToken = CurrentToken;
+            return _tokenizer.Next();
+        }
+
+        // Helpers
+        [Conditional("DEBUG")]
+        internal void Assert(SyntaxKind expectedType)
+        {
+            Debug.Assert(!EndOfFile && CurrentToken.Kind == expectedType);
+        }
+
+        protected internal void PutBack(SyntaxToken token)
+        {
+            if (token != null)
+            {
+                _tokenizer.PutBack(token);
+            }
+        }
+
+        /// <summary>
+        /// Put the specified tokens back in the input stream. The provided list MUST be in the ORDER THE TOKENS WERE READ. The
+        /// list WILL be reversed and the Putback(SyntaxToken) will be called on each item.
+        /// </summary>
+        /// <remarks>
+        /// If a document contains tokens: a, b, c, d, e, f
+        /// and AcceptWhile or AcceptUntil is used to collect until d
+        /// the list returned by AcceptWhile/Until will contain: a, b, c IN THAT ORDER
+        /// that is the correct format for providing to this method. The caller of this method would,
+        /// in that case, want to put c, b and a back into the stream, so "a, b, c" is the CORRECT order
+        /// </remarks>
+        protected internal void PutBack(IEnumerable<SyntaxToken> tokens)
+        {
+            foreach (var token in tokens.Reverse())
+            {
+                PutBack(token);
+            }
+        }
+
+        protected internal void PutCurrentBack()
+        {
+            if (!EndOfFile && CurrentToken != null)
+            {
+                PutBack(CurrentToken);
+            }
+        }
+
+        protected internal bool NextIs(SyntaxKind type)
+        {
+            return NextIs(token => token != null && type == token.Kind);
+        }
+
+        protected internal bool NextIs(params SyntaxKind[] types)
+        {
+            return NextIs(token => token != null && types.Any(t => t == token.Kind));
+        }
+
+        protected internal bool NextIs(Func<SyntaxToken, bool> condition)
+        {
+            var cur = CurrentToken;
+            if (NextToken())
+            {
+                var result = condition(CurrentToken);
+                PutCurrentBack();
+                PutBack(cur);
+                EnsureCurrent();
+                return result;
+            }
+            else
+            {
+                PutBack(cur);
+                EnsureCurrent();
+            }
+
+            return false;
+        }
+
+        protected internal bool Was(SyntaxKind type)
+        {
+            return PreviousToken != null && PreviousToken.Kind == type;
+        }
+
+        protected internal bool At(SyntaxKind type)
+        {
+            return !EndOfFile && CurrentToken != null && CurrentToken.Kind == type;
+        }
+
+        protected bool EnsureCurrent()
+        {
+            if (CurrentToken == null)
+            {
+                return NextToken();
+            }
+
+            return true;
+        }
+
+        protected internal IEnumerable<SyntaxToken> ReadWhile(Func<SyntaxToken, bool> condition)
+        {
+            return ReadWhileLazy(condition).ToList();
+        }
+
+        protected bool AtIdentifier(bool allowKeywords)
+        {
+            return CurrentToken != null &&
+                   (Language.IsIdentifier(CurrentToken) ||
+                    (allowKeywords && Language.IsKeyword(CurrentToken)));
+        }
+
+        // Don't open this to sub classes because it's lazy but it looks eager.
+        // You have to advance the Enumerable to read the next characters.
+        internal IEnumerable<SyntaxToken> ReadWhileLazy(Func<SyntaxToken, bool> condition)
+        {
+            while (EnsureCurrent() && condition(CurrentToken))
+            {
+                yield return CurrentToken;
+                NextToken();
+            }
+        }
+
+        protected RazorCommentBlockSyntax ParseRazorComment()
+        {
+            if (!Language.KnowsTokenType(KnownTokenType.CommentStart) ||
+                !Language.KnowsTokenType(KnownTokenType.CommentStar) ||
+                !Language.KnowsTokenType(KnownTokenType.CommentBody))
+            {
+                throw new InvalidOperationException(Resources.Language_Does_Not_Support_RazorComment);
+            }
+
+            RazorCommentBlockSyntax commentBlock;
+            using (PushSpanContextConfig(CommentSpanContextConfig))
+            {
+                EnsureCurrent();
+                var start = CurrentStart;
+                Debug.Assert(At(SyntaxKind.RazorCommentTransition));
+                var startTransition = EatExpectedToken(SyntaxKind.RazorCommentTransition);
+                var startStar = EatExpectedToken(SyntaxKind.RazorCommentStar);
+                var comment = GetOptionalToken(SyntaxKind.RazorCommentLiteral);
+                if (comment == null)
+                {
+                    comment = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentLiteral);
+                }
+                var endStar = GetOptionalToken(SyntaxKind.RazorCommentStar);
+                if (endStar == null)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
+                        new SourceSpan(start, contentLength: 2 /* @* */));
+                    endStar = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentStar, diagnostic);
+                    Context.ErrorSink.OnError(diagnostic);
+                }
+                var endTransition = GetOptionalToken(SyntaxKind.RazorCommentTransition);
+                if (endTransition == null)
+                {
+                    if (!endStar.IsMissing)
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
+                            new SourceSpan(start, contentLength: 2 /* @* */));
+                        Context.ErrorSink.OnError(diagnostic);
+                        endTransition = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentTransition, diagnostic);
+                    }
+
+                    endTransition = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentTransition);
+                }
+
+                commentBlock = SyntaxFactory.RazorCommentBlock(startTransition, startStar, comment, endStar, endTransition);
+
+                // Make sure we generate a marker symbol after a comment if necessary.
+                if (!comment.IsMissing || !endStar.IsMissing || !endTransition.IsMissing)
+                {
+                    Context.LastAcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+            }
+
+            InitializeContext(SpanContext);
+
+            return commentBlock;
+        }
+
+        private void CommentSpanContextConfig(SpanContextBuilder spanContext)
+        {
+            spanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            spanContext.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
+        }
+
+        protected SyntaxToken EatCurrentToken()
+        {
+            Debug.Assert(!EndOfFile && CurrentToken != null);
+            var token = CurrentToken;
+            NextToken();
+            return token;
+        }
+
+        protected SyntaxToken EatExpectedToken(params SyntaxKind[] kinds)
+        {
+            Debug.Assert(!EndOfFile && CurrentToken != null && kinds.Contains(CurrentToken.Kind));
+            var token = CurrentToken;
+            NextToken();
+            return token;
+        }
+
+        protected SyntaxToken GetOptionalToken(SyntaxKind kind)
+        {
+            if (At(kind))
+            {
+                var token = CurrentToken;
+                NextToken();
+                return token;
+            }
+
+            return null;
+        }
+
+        protected internal void AcceptWhile(SyntaxKind type)
+        {
+            AcceptWhile(token => type == token.Kind);
+        }
+
+        // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format
+        protected internal void AcceptWhile(SyntaxKind type1, SyntaxKind type2)
+        {
+            AcceptWhile(token => type1 == token.Kind || type2 == token.Kind);
+        }
+
+        protected internal void AcceptWhile(SyntaxKind type1, SyntaxKind type2, SyntaxKind type3)
+        {
+            AcceptWhile(token => type1 == token.Kind || type2 == token.Kind || type3 == token.Kind);
+        }
+
+        protected internal void AcceptWhile(params SyntaxKind[] types)
+        {
+            AcceptWhile(token => types.Any(expected => expected == token.Kind));
+        }
+
+        protected internal void AcceptUntil(SyntaxKind type)
+        {
+            AcceptWhile(token => type != token.Kind);
+        }
+
+        // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format
+        protected internal void AcceptUntil(SyntaxKind type1, SyntaxKind type2)
+        {
+            AcceptWhile(token => type1 != token.Kind && type2 != token.Kind);
+        }
+
+        protected internal void AcceptUntil(SyntaxKind type1, SyntaxKind type2, SyntaxKind type3)
+        {
+            AcceptWhile(token => type1 != token.Kind && type2 != token.Kind && type3 != token.Kind);
+        }
+
+        protected internal void AcceptUntil(params SyntaxKind[] types)
+        {
+            AcceptWhile(token => types.All(expected => expected != token.Kind));
+        }
+
+        protected internal void AcceptWhile(Func<SyntaxToken, bool> condition)
+        {
+            Accept(ReadWhileLazy(condition));
+        }
+
+        protected internal void Accept(IEnumerable<SyntaxToken> tokens)
+        {
+            foreach (var token in tokens)
+            {
+                foreach (var error in token.GetDiagnostics())
+                {
+                    Context.ErrorSink.OnError(error);
+                }
+
+                TokenBuilder.Add(token);
+            }
+        }
+
+        protected internal void Accept(SyntaxToken token)
+        {
+            if (token != null)
+            {
+                foreach (var error in token.GetDiagnostics())
+                {
+                    Context.ErrorSink.OnError(error);
+                }
+
+                TokenBuilder.Add(token);
+            }
+        }
+
+        protected internal bool AcceptAll(params SyntaxKind[] kinds)
+        {
+            foreach (var kind in kinds)
+            {
+                if (CurrentToken == null || CurrentToken.Kind != kind)
+                {
+                    return false;
+                }
+                AcceptAndMoveNext();
+            }
+            return true;
+        }
+
+        protected internal bool AcceptAndMoveNext()
+        {
+            Accept(CurrentToken);
+            return NextToken();
+        }
+
+        protected SyntaxList<SyntaxToken> Output()
+        {
+            var list = TokenBuilder.ToList();
+            TokenBuilder.Clear();
+            return list;
+        }
+
+        protected SyntaxToken AcceptWhitespaceInLines()
+        {
+            SyntaxToken lastWs = null;
+            while (Language.IsWhitespace(CurrentToken) || Language.IsNewLine(CurrentToken))
+            {
+                // Capture the previous whitespace node
+                if (lastWs != null)
+                {
+                    Accept(lastWs);
+                }
+
+                if (Language.IsWhitespace(CurrentToken))
+                {
+                    lastWs = CurrentToken;
+                }
+                else if (Language.IsNewLine(CurrentToken))
+                {
+                    // Accept newline and reset last whitespace tracker
+                    Accept(CurrentToken);
+                    lastWs = null;
+                }
+
+                NextToken();
+            }
+
+            return lastWs;
+        }
+
+        protected internal bool TryAccept(SyntaxKind type)
+        {
+            if (At(type))
+            {
+                AcceptAndMoveNext();
+                return true;
+            }
+            return false;
+        }
+
+        protected internal void AcceptMarkerTokenIfNecessary()
+        {
+            if (TokenBuilder.Count == 0 && Context.LastAcceptedCharacters != AcceptedCharactersInternal.Any)
+            {
+                Accept(Language.CreateMarkerToken());
+            }
+        }
+
+        protected MarkupTextLiteralSyntax OutputAsMarkupLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.MarkupTextLiteral(tokens));
+        }
+
+        protected MarkupEphemeralTextLiteralSyntax OutputAsMarkupEphemeralLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.MarkupEphemeralTextLiteral(tokens));
+        }
+
+        protected RazorMetaCodeSyntax OutputAsMetaCode(SyntaxList<SyntaxToken> tokens, AcceptedCharactersInternal? accepted = null)
+        {
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            var metacode = SyntaxFactory.RazorMetaCode(tokens);
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            SpanContext.EditHandler.AcceptedCharacters = accepted ?? AcceptedCharactersInternal.None;
+
+            return GetNodeWithSpanContext(metacode);
+        }
+
+        protected TNode GetNodeWithSpanContext<TNode>(TNode node) where TNode : Syntax.GreenNode
+        {
+            var spanContext = SpanContext.Build();
+            Context.LastAcceptedCharacters = spanContext.EditHandler.AcceptedCharacters;
+            InitializeContext(SpanContext);
+            var annotation = new Syntax.SyntaxAnnotation(SyntaxConstants.SpanContextKind, spanContext);
+
+            return (TNode)node.SetAnnotations(new[] { annotation });
+        }
+
+        protected IDisposable PushSpanContextConfig()
+        {
+            return PushSpanContextConfig(newConfig: (Action<SpanContextBuilder, Action<SpanContextBuilder>>)null);
+        }
+
+        protected IDisposable PushSpanContextConfig(Action<SpanContextBuilder> newConfig)
+        {
+            return PushSpanContextConfig(newConfig == null ? (Action<SpanContextBuilder, Action<SpanContextBuilder>>)null : (span, _) => newConfig(span));
+        }
+
+        protected IDisposable PushSpanContextConfig(Action<SpanContextBuilder, Action<SpanContextBuilder>> newConfig)
+        {
+            var old = SpanContextConfig;
+            ConfigureSpanContext(newConfig);
+            return new DisposableAction(() => SpanContextConfig = old);
+        }
+
+        protected void ConfigureSpanContext(Action<SpanContextBuilder> config)
+        {
+            SpanContextConfig = config;
+            InitializeContext(SpanContext);
+        }
+
+        protected void ConfigureSpanContext(Action<SpanContextBuilder, Action<SpanContextBuilder>> config)
+        {
+            var prev = SpanContextConfig;
+            if (config == null)
+            {
+                SpanContextConfig = null;
+            }
+            else
+            {
+                SpanContextConfig = span => config(span, prev);
+            }
+            InitializeContext(SpanContext);
+        }
+
+        protected void InitializeContext(SpanContextBuilder spanContext)
+        {
+            SpanContextConfig?.Invoke(spanContext);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerView.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerView.cs
new file mode 100644
index 0000000000..ef481af1ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerView.cs
@@ -0,0 +1,40 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TokenizerView<TTokenizer>
+        where TTokenizer : Tokenizer
+    {
+        public TokenizerView(TTokenizer tokenizer)
+        {
+            Tokenizer = tokenizer;
+        }
+
+        public TTokenizer Tokenizer { get; private set; }
+        public bool EndOfFile { get; private set; }
+        public SyntaxToken Current { get; private set; }
+
+        public ITextDocument Source
+        {
+            get { return Tokenizer.Source; }
+        }
+
+        public bool Next()
+        {
+            Current = Tokenizer.NextToken();
+            EndOfFile = (Current == null);
+            return !EndOfFile;
+        }
+
+        public void PutBack(SyntaxToken token)
+        {
+            Source.Position -= token.Content.Length;
+            Current = null;
+            EndOfFile = Source.Position >= Source.Length;
+            Tokenizer.Reset();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/WhiteSpaceRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/WhiteSpaceRewriter.cs
new file mode 100644
index 0000000000..af20b925f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/WhiteSpaceRewriter.cs
@@ -0,0 +1,70 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class WhitespaceRewriter : SyntaxRewriter
+    {
+        public override SyntaxNode Visit(SyntaxNode node)
+        {
+            if (node == null)
+            {
+                return base.Visit(node);
+            }
+
+            var children = node.ChildNodes();
+            for (var i = 0; i < children.Count; i++)
+            {
+                var child = children[i];
+                if (child is CSharpCodeBlockSyntax codeBlock &&
+                    TryRewriteWhitespace(codeBlock, out var rewritten, out var whitespaceLiteral))
+                {
+                    // Replace the existing code block with the whitespace literal
+                    // followed by the rewritten code block (with the code whitespace removed).
+                    node = node.ReplaceNode(codeBlock, new SyntaxNode[] { whitespaceLiteral, rewritten });
+
+                    // Since we replaced node, its children are different. Update our collection.
+                    children = node.ChildNodes();
+                }
+            }
+
+            return base.Visit(node);
+        }
+
+        private bool TryRewriteWhitespace(CSharpCodeBlockSyntax codeBlock, out CSharpCodeBlockSyntax rewritten, out SyntaxNode whitespaceLiteral)
+        {
+            // Rewrite any whitespace represented as code at the start of a line preceding an expression block.
+            // We want it to be rendered as Markup.
+
+            rewritten = null;
+            whitespaceLiteral = null;
+            var children = codeBlock.ChildNodes();
+            if (children.Count < 2)
+            {
+                return false;
+            }
+
+            if (children[0] is CSharpStatementLiteralSyntax literal &&
+                (children[1] is CSharpExplicitExpressionSyntax || children[1] is CSharpImplicitExpressionSyntax))
+            {
+                var containsNonWhitespace = literal.DescendantNodes()
+                    .Where(n => n.IsToken)
+                    .Cast<SyntaxToken>()
+                    .Any(t => !string.IsNullOrWhiteSpace(t.Content));
+
+                if (!containsNonWhitespace)
+                {
+                    // Literal node is all whitespace. Can rewrite.
+                    whitespaceLiteral = SyntaxFactory.MarkupTextLiteral(literal.LiteralTokens);
+                    rewritten = codeBlock.ReplaceNode(literal, newNode: null);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
new file mode 100644
index 0000000000..1fd7aeebf5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs
new file mode 100644
index 0000000000..6989ce7f63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// A <see cref="RazorProjectItem"/> that does not exist.
+    /// </summary>
+    internal class NotFoundProjectItem : RazorProjectItem
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="NotFoundProjectItem"/>.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        /// <param name="path">The path.</param>
+        public NotFoundProjectItem(string basePath, string path)
+        {
+            BasePath = basePath;
+            FilePath = path;
+        }
+
+        /// <inheritdoc />
+        public override string BasePath { get; }
+
+        /// <inheritdoc />
+        public override string FilePath { get; }
+
+        /// <inheritdoc />
+        public override bool Exists => false;
+
+        /// <inheritdoc />
+        public override string PhysicalPath => throw new NotSupportedException();
+
+        /// <inheritdoc />
+        public override Stream Read() => throw new NotSupportedException();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..b749fc7ce3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..773fb6de9c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
@@ -0,0 +1,1918 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Razor.Language.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Register Tag Helpers for use in the current document.
+        /// </summary>
+        internal static string AddTagHelperDirective_Description
+        {
+            get => GetString("AddTagHelperDirective_Description");
+        }
+
+        /// <summary>
+        /// Register Tag Helpers for use in the current document.
+        /// </summary>
+        internal static string FormatAddTagHelperDirective_Description()
+            => GetString("AddTagHelperDirective_Description");
+
+        /// <summary>
+        /// Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.
+        /// </summary>
+        internal static string AddTagHelperDirective_StringToken_Description
+        {
+            get => GetString("AddTagHelperDirective_StringToken_Description");
+        }
+
+        /// <summary>
+        /// Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.
+        /// </summary>
+        internal static string FormatAddTagHelperDirective_StringToken_Description()
+            => GetString("AddTagHelperDirective_StringToken_Description");
+
+        /// <summary>
+        /// TypeName, AssemblyName
+        /// </summary>
+        internal static string AddTagHelperDirective_StringToken_Name
+        {
+            get => GetString("AddTagHelperDirective_StringToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName, AssemblyName
+        /// </summary>
+        internal static string FormatAddTagHelperDirective_StringToken_Name()
+            => GetString("AddTagHelperDirective_StringToken_Name");
+
+        /// <summary>
+        /// Value cannot be null or an empty string.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or an empty string.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// Block cannot be built because a Type has not been specified in the BlockBuilder
+        /// </summary>
+        internal static string Block_Type_Not_Specified
+        {
+            get => GetString("Block_Type_Not_Specified");
+        }
+
+        /// <summary>
+        /// Block cannot be built because a Type has not been specified in the BlockBuilder
+        /// </summary>
+        internal static string FormatBlock_Type_Not_Specified()
+            => GetString("Block_Type_Not_Specified");
+
+        /// <summary>
+        /// Block directive '{0}' cannot be imported.
+        /// </summary>
+        internal static string BlockDirectiveCannotBeImported
+        {
+            get => GetString("BlockDirectiveCannotBeImported");
+        }
+
+        /// <summary>
+        /// Block directive '{0}' cannot be imported.
+        /// </summary>
+        internal static string FormatBlockDirectiveCannotBeImported(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BlockDirectiveCannotBeImported"), p0);
+
+        /// <summary>
+        /// code
+        /// </summary>
+        internal static string BlockName_Code
+        {
+            get => GetString("BlockName_Code");
+        }
+
+        /// <summary>
+        /// code
+        /// </summary>
+        internal static string FormatBlockName_Code()
+            => GetString("BlockName_Code");
+
+        /// <summary>
+        /// explicit expression
+        /// </summary>
+        internal static string BlockName_ExplicitExpression
+        {
+            get => GetString("BlockName_ExplicitExpression");
+        }
+
+        /// <summary>
+        /// explicit expression
+        /// </summary>
+        internal static string FormatBlockName_ExplicitExpression()
+            => GetString("BlockName_ExplicitExpression");
+
+        /// <summary>
+        /// Invalid newline sequence '{0}'. Support newline sequences are '\r\n' and '\n'.
+        /// </summary>
+        internal static string CodeWriter_InvalidNewLine
+        {
+            get => GetString("CodeWriter_InvalidNewLine");
+        }
+
+        /// <summary>
+        /// Invalid newline sequence '{0}'. Support newline sequences are '\r\n' and '\n'.
+        /// </summary>
+        internal static string FormatCodeWriter_InvalidNewLine(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CodeWriter_InvalidNewLine"), p0);
+
+        /// <summary>
+        /// &lt;&lt;character literal&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_CharacterLiteral
+        {
+            get => GetString("CSharpToken_CharacterLiteral");
+        }
+
+        /// <summary>
+        /// &lt;&lt;character literal&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_CharacterLiteral()
+            => GetString("CSharpToken_CharacterLiteral");
+
+        /// <summary>
+        /// &lt;&lt;comment&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_Comment
+        {
+            get => GetString("CSharpToken_Comment");
+        }
+
+        /// <summary>
+        /// &lt;&lt;comment&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_Comment()
+            => GetString("CSharpToken_Comment");
+
+        /// <summary>
+        /// &lt;&lt;identifier&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_Identifier
+        {
+            get => GetString("CSharpToken_Identifier");
+        }
+
+        /// <summary>
+        /// &lt;&lt;identifier&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_Identifier()
+            => GetString("CSharpToken_Identifier");
+
+        /// <summary>
+        /// &lt;&lt;integer literal&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_IntegerLiteral
+        {
+            get => GetString("CSharpToken_IntegerLiteral");
+        }
+
+        /// <summary>
+        /// &lt;&lt;integer literal&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_IntegerLiteral()
+            => GetString("CSharpToken_IntegerLiteral");
+
+        /// <summary>
+        /// &lt;&lt;keyword&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_Keyword
+        {
+            get => GetString("CSharpToken_Keyword");
+        }
+
+        /// <summary>
+        /// &lt;&lt;keyword&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_Keyword()
+            => GetString("CSharpToken_Keyword");
+
+        /// <summary>
+        /// &lt;&lt;newline sequence&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_Newline
+        {
+            get => GetString("CSharpToken_Newline");
+        }
+
+        /// <summary>
+        /// &lt;&lt;newline sequence&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_Newline()
+            => GetString("CSharpToken_Newline");
+
+        /// <summary>
+        /// &lt;&lt;real literal&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_RealLiteral
+        {
+            get => GetString("CSharpToken_RealLiteral");
+        }
+
+        /// <summary>
+        /// &lt;&lt;real literal&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_RealLiteral()
+            => GetString("CSharpToken_RealLiteral");
+
+        /// <summary>
+        /// &lt;&lt;string literal&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_StringLiteral
+        {
+            get => GetString("CSharpToken_StringLiteral");
+        }
+
+        /// <summary>
+        /// &lt;&lt;string literal&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_StringLiteral()
+            => GetString("CSharpToken_StringLiteral");
+
+        /// <summary>
+        /// &lt;&lt;white space&gt;&gt;
+        /// </summary>
+        internal static string CSharpToken_Whitespace
+        {
+            get => GetString("CSharpToken_Whitespace");
+        }
+
+        /// <summary>
+        /// &lt;&lt;white space&gt;&gt;
+        /// </summary>
+        internal static string FormatCSharpToken_Whitespace()
+            => GetString("CSharpToken_Whitespace");
+
+        /// <summary>
+        /// The document type '{0}' does not support the extension '{1}'.
+        /// </summary>
+        internal static string Diagnostic_CodeTarget_UnsupportedExtension
+        {
+            get => GetString("Diagnostic_CodeTarget_UnsupportedExtension");
+        }
+
+        /// <summary>
+        /// The document type '{0}' does not support the extension '{1}'.
+        /// </summary>
+        internal static string FormatDiagnostic_CodeTarget_UnsupportedExtension(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Diagnostic_CodeTarget_UnsupportedExtension"), p0, p1);
+
+        /// <summary>
+        /// Invalid directive keyword '{0}'. Directives must have a non-empty keyword that consists only of letters.
+        /// </summary>
+        internal static string DirectiveDescriptor_InvalidDirectiveKeyword
+        {
+            get => GetString("DirectiveDescriptor_InvalidDirectiveKeyword");
+        }
+
+        /// <summary>
+        /// Invalid directive keyword '{0}'. Directives must have a non-empty keyword that consists only of letters.
+        /// </summary>
+        internal static string FormatDirectiveDescriptor_InvalidDirectiveKeyword(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveDescriptor_InvalidDirectiveKeyword"), p0);
+
+        /// <summary>
+        /// A non-optional directive token cannot follow an optional directive token.
+        /// </summary>
+        internal static string DirectiveDescriptor_InvalidNonOptionalToken
+        {
+            get => GetString("DirectiveDescriptor_InvalidNonOptionalToken");
+        }
+
+        /// <summary>
+        /// A non-optional directive token cannot follow an optional directive token.
+        /// </summary>
+        internal static string FormatDirectiveDescriptor_InvalidNonOptionalToken()
+            => GetString("DirectiveDescriptor_InvalidNonOptionalToken");
+
+        /// <summary>
+        /// The '{0}' directive expects an identifier.
+        /// </summary>
+        internal static string DirectiveExpectsIdentifier
+        {
+            get => GetString("DirectiveExpectsIdentifier");
+        }
+
+        /// <summary>
+        /// The '{0}' directive expects an identifier.
+        /// </summary>
+        internal static string FormatDirectiveExpectsIdentifier(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsIdentifier"), p0);
+
+        /// <summary>
+        /// The '{0}' directive expects a namespace name.
+        /// </summary>
+        internal static string DirectiveExpectsNamespace
+        {
+            get => GetString("DirectiveExpectsNamespace");
+        }
+
+        /// <summary>
+        /// The '{0}' directive expects a namespace name.
+        /// </summary>
+        internal static string FormatDirectiveExpectsNamespace(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsNamespace"), p0);
+
+        /// <summary>
+        /// The '{0}' directive expects a string surrounded by double quotes.
+        /// </summary>
+        internal static string DirectiveExpectsQuotedStringLiteral
+        {
+            get => GetString("DirectiveExpectsQuotedStringLiteral");
+        }
+
+        /// <summary>
+        /// The '{0}' directive expects a string surrounded by double quotes.
+        /// </summary>
+        internal static string FormatDirectiveExpectsQuotedStringLiteral(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsQuotedStringLiteral"), p0);
+
+        /// <summary>
+        /// The '{0}' directive expects a type name.
+        /// </summary>
+        internal static string DirectiveExpectsTypeName
+        {
+            get => GetString("DirectiveExpectsTypeName");
+        }
+
+        /// <summary>
+        /// The '{0}' directive expects a type name.
+        /// </summary>
+        internal static string FormatDirectiveExpectsTypeName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsTypeName"), p0);
+
+        /// <summary>
+        /// The '{0}` directive must appear at the start of the line.
+        /// </summary>
+        internal static string DirectiveMustAppearAtStartOfLine
+        {
+            get => GetString("DirectiveMustAppearAtStartOfLine");
+        }
+
+        /// <summary>
+        /// The '{0}` directive must appear at the start of the line.
+        /// </summary>
+        internal static string FormatDirectiveMustAppearAtStartOfLine(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveMustAppearAtStartOfLine"), p0);
+
+        /// <summary>
+        /// The '{0}' directives value(s) must be separated by whitespace.
+        /// </summary>
+        internal static string DirectiveTokensMustBeSeparatedByWhitespace
+        {
+            get => GetString("DirectiveTokensMustBeSeparatedByWhitespace");
+        }
+
+        /// <summary>
+        /// The '{0}' directives value(s) must be separated by whitespace.
+        /// </summary>
+        internal static string FormatDirectiveTokensMustBeSeparatedByWhitespace(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveTokensMustBeSeparatedByWhitespace"), p0);
+
+        /// <summary>
+        /// The document of kind '{0}' does not have a '{1}'. The document classifier must set a value for '{2}'.
+        /// </summary>
+        internal static string DocumentMissingTarget
+        {
+            get => GetString("DocumentMissingTarget");
+        }
+
+        /// <summary>
+        /// The document of kind '{0}' does not have a '{1}'. The document classifier must set a value for '{2}'.
+        /// </summary>
+        internal static string FormatDocumentMissingTarget(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DocumentMissingTarget"), p0, p1, p2);
+
+        /// <summary>
+        /// The '{0}' directive may only occur once per document.
+        /// </summary>
+        internal static string DuplicateDirective
+        {
+            get => GetString("DuplicateDirective");
+        }
+
+        /// <summary>
+        /// The '{0}' directive may only occur once per document.
+        /// </summary>
+        internal static string FormatDuplicateDirective(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DuplicateDirective"), p0);
+
+        /// <summary>
+        /// "EndBlock" was called without a matching call to "StartBlock".
+        /// </summary>
+        internal static string EndBlock_Called_Without_Matching_StartBlock
+        {
+            get => GetString("EndBlock_Called_Without_Matching_StartBlock");
+        }
+
+        /// <summary>
+        /// "EndBlock" was called without a matching call to "StartBlock".
+        /// </summary>
+        internal static string FormatEndBlock_Called_Without_Matching_StartBlock()
+            => GetString("EndBlock_Called_Without_Matching_StartBlock");
+
+        /// <summary>
+        /// line break
+        /// </summary>
+        internal static string ErrorComponent_Newline
+        {
+            get => GetString("ErrorComponent_Newline");
+        }
+
+        /// <summary>
+        /// line break
+        /// </summary>
+        internal static string FormatErrorComponent_Newline()
+            => GetString("ErrorComponent_Newline");
+
+        /// <summary>
+        /// The '{0}' feature requires a '{1}' provided by the '{2}'.
+        /// </summary>
+        internal static string FeatureDependencyMissing
+        {
+            get => GetString("FeatureDependencyMissing");
+        }
+
+        /// <summary>
+        /// The '{0}' feature requires a '{1}' provided by the '{2}'.
+        /// </summary>
+        internal static string FormatFeatureDependencyMissing(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FeatureDependencyMissing"), p0, p1, p2);
+
+        /// <summary>
+        /// The feature must be initialized by setting the '{0}' property.
+        /// </summary>
+        internal static string FeatureMustBeInitialized
+        {
+            get => GetString("FeatureMustBeInitialized");
+        }
+
+        /// <summary>
+        /// The feature must be initialized by setting the '{0}' property.
+        /// </summary>
+        internal static string FormatFeatureMustBeInitialized(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FeatureMustBeInitialized"), p0);
+
+        /// <summary>
+        /// Specify a C# code block.
+        /// </summary>
+        internal static string FunctionsDirective_Description
+        {
+            get => GetString("FunctionsDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify a C# code block.
+        /// </summary>
+        internal static string FormatFunctionsDirective_Description()
+            => GetString("FunctionsDirective_Description");
+
+        /// <summary>
+        /// &lt;&lt;newline sequence&gt;&gt;
+        /// </summary>
+        internal static string HtmlToken_NewLine
+        {
+            get => GetString("HtmlToken_NewLine");
+        }
+
+        /// <summary>
+        /// &lt;&lt;newline sequence&gt;&gt;
+        /// </summary>
+        internal static string FormatHtmlToken_NewLine()
+            => GetString("HtmlToken_NewLine");
+
+        /// <summary>
+        /// &lt;&lt;razor comment&gt;&gt;
+        /// </summary>
+        internal static string HtmlToken_RazorComment
+        {
+            get => GetString("HtmlToken_RazorComment");
+        }
+
+        /// <summary>
+        /// &lt;&lt;razor comment&gt;&gt;
+        /// </summary>
+        internal static string FormatHtmlToken_RazorComment()
+            => GetString("HtmlToken_RazorComment");
+
+        /// <summary>
+        /// &lt;&lt;text&gt;&gt;
+        /// </summary>
+        internal static string HtmlToken_Text
+        {
+            get => GetString("HtmlToken_Text");
+        }
+
+        /// <summary>
+        /// &lt;&lt;text&gt;&gt;
+        /// </summary>
+        internal static string FormatHtmlToken_Text()
+            => GetString("HtmlToken_Text");
+
+        /// <summary>
+        /// &lt;&lt;white space&gt;&gt;
+        /// </summary>
+        internal static string HtmlToken_WhiteSpace
+        {
+            get => GetString("HtmlToken_WhiteSpace");
+        }
+
+        /// <summary>
+        /// &lt;&lt;white space&gt;&gt;
+        /// </summary>
+        internal static string FormatHtmlToken_WhiteSpace()
+            => GetString("HtmlToken_WhiteSpace");
+
+        /// <summary>
+        /// Specify the base class for the current document.
+        /// </summary>
+        internal static string InheritsDirective_Description
+        {
+            get => GetString("InheritsDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the base class for the current document.
+        /// </summary>
+        internal static string FormatInheritsDirective_Description()
+            => GetString("InheritsDirective_Description");
+
+        /// <summary>
+        /// The base type that the current page inherits.
+        /// </summary>
+        internal static string InheritsDirective_TypeToken_Description
+        {
+            get => GetString("InheritsDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The base type that the current page inherits.
+        /// </summary>
+        internal static string FormatInheritsDirective_TypeToken_Description()
+            => GetString("InheritsDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string InheritsDirective_TypeToken_Name
+        {
+            get => GetString("InheritsDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatInheritsDirective_TypeToken_Name()
+            => GetString("InheritsDirective_TypeToken_Name");
+
+        /// <summary>
+        /// The '{0}' operation is not valid when the builder is empty.
+        /// </summary>
+        internal static string IntermediateNodeBuilder_PopInvalid
+        {
+            get => GetString("IntermediateNodeBuilder_PopInvalid");
+        }
+
+        /// <summary>
+        /// The '{0}' operation is not valid when the builder is empty.
+        /// </summary>
+        internal static string FormatIntermediateNodeBuilder_PopInvalid(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodeBuilder_PopInvalid"), p0);
+
+        /// <summary>
+        /// The node '{0}' has a read-only child collection and cannot be modified.
+        /// </summary>
+        internal static string IntermediateNodeReference_CollectionIsReadOnly
+        {
+            get => GetString("IntermediateNodeReference_CollectionIsReadOnly");
+        }
+
+        /// <summary>
+        /// The node '{0}' has a read-only child collection and cannot be modified.
+        /// </summary>
+        internal static string FormatIntermediateNodeReference_CollectionIsReadOnly(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodeReference_CollectionIsReadOnly"), p0);
+
+        /// <summary>
+        /// The reference is invalid. The node '{0}' could not be found as a child of '{1}'.
+        /// </summary>
+        internal static string IntermediateNodeReference_NodeNotFound
+        {
+            get => GetString("IntermediateNodeReference_NodeNotFound");
+        }
+
+        /// <summary>
+        /// The reference is invalid. The node '{0}' could not be found as a child of '{1}'.
+        /// </summary>
+        internal static string FormatIntermediateNodeReference_NodeNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodeReference_NodeNotFound"), p0, p1);
+
+        /// <summary>
+        /// The reference is invalid. References initialized with the default constructor cannot modify nodes.
+        /// </summary>
+        internal static string IntermediateNodeReference_NotInitialized
+        {
+            get => GetString("IntermediateNodeReference_NotInitialized");
+        }
+
+        /// <summary>
+        /// The reference is invalid. References initialized with the default constructor cannot modify nodes.
+        /// </summary>
+        internal static string FormatIntermediateNodeReference_NotInitialized()
+            => GetString("IntermediateNodeReference_NotInitialized");
+
+        /// <summary>
+        /// The '{0}' node type can only be used as a direct child of a '{1}' node.
+        /// </summary>
+        internal static string IntermediateNodes_InvalidParentNode
+        {
+            get => GetString("IntermediateNodes_InvalidParentNode");
+        }
+
+        /// <summary>
+        /// The '{0}' node type can only be used as a direct child of a '{1}' node.
+        /// </summary>
+        internal static string FormatIntermediateNodes_InvalidParentNode(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodes_InvalidParentNode"), p0, p1);
+
+        /// <summary>
+        /// The node '{0}' is not the owner of change '{1}'.
+        /// </summary>
+        internal static string InvalidOperation_SpanIsNotChangeOwner
+        {
+            get => GetString("InvalidOperation_SpanIsNotChangeOwner");
+        }
+
+        /// <summary>
+        /// The node '{0}' is not the owner of change '{1}'.
+        /// </summary>
+        internal static string FormatInvalidOperation_SpanIsNotChangeOwner(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidOperation_SpanIsNotChangeOwner"), p0, p1);
+
+        /// <summary>
+        /// Invalid tag helper directive look up text '{0}'. The correct look up text format is: "name, assemblyName".
+        /// </summary>
+        internal static string InvalidTagHelperLookupText
+        {
+            get => GetString("InvalidTagHelperLookupText");
+        }
+
+        /// <summary>
+        /// Invalid tag helper directive look up text '{0}'. The correct look up text format is: "name, assemblyName".
+        /// </summary>
+        internal static string FormatInvalidTagHelperLookupText(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidTagHelperLookupText"), p0);
+
+        /// <summary>
+        /// Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'.
+        /// </summary>
+        internal static string InvalidTagHelperPrefixValue
+        {
+            get => GetString("InvalidTagHelperPrefixValue");
+        }
+
+        /// <summary>
+        /// Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'.
+        /// </summary>
+        internal static string FormatInvalidTagHelperPrefixValue(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidTagHelperPrefixValue"), p0, p1, p2);
+
+        /// <summary>
+        /// The key must not be null.
+        /// </summary>
+        internal static string KeyMustNotBeNull
+        {
+            get => GetString("KeyMustNotBeNull");
+        }
+
+        /// <summary>
+        /// The key must not be null.
+        /// </summary>
+        internal static string FormatKeyMustNotBeNull()
+            => GetString("KeyMustNotBeNull");
+
+        /// <summary>
+        /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment
+        /// </summary>
+        internal static string Language_Does_Not_Support_RazorComment
+        {
+            get => GetString("Language_Does_Not_Support_RazorComment");
+        }
+
+        /// <summary>
+        /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment
+        /// </summary>
+        internal static string FormatLanguage_Does_Not_Support_RazorComment()
+            => GetString("Language_Does_Not_Support_RazorComment");
+
+        /// <summary>
+        /// The specified encoding '{0}' does not match the content's encoding '{1}'.
+        /// </summary>
+        internal static string MismatchedContentEncoding
+        {
+            get => GetString("MismatchedContentEncoding");
+        }
+
+        /// <summary>
+        /// The specified encoding '{0}' does not match the content's encoding '{1}'.
+        /// </summary>
+        internal static string FormatMismatchedContentEncoding(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MismatchedContentEncoding"), p0, p1);
+
+        /// <summary>
+        /// The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
+        /// 
+        /// @if(isLoggedIn) {{
+        ///     &lt;p&gt;Hello, @user!&lt;/p&gt;
+        /// }}
+        /// </summary>
+        internal static string ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start
+        {
+            get => GetString("ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start");
+        }
+
+        /// <summary>
+        /// The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
+        /// 
+        /// @if(isLoggedIn) {{
+        ///     &lt;p&gt;Hello, @user!&lt;/p&gt;
+        /// }}
+        /// </summary>
+        internal static string FormatParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start()
+            => GetString("ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start");
+
+        /// <summary>
+        /// End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
+        /// </summary>
+        internal static string ParseError_BlockComment_Not_Terminated
+        {
+            get => GetString("ParseError_BlockComment_Not_Terminated");
+        }
+
+        /// <summary>
+        /// End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
+        /// </summary>
+        internal static string FormatParseError_BlockComment_Not_Terminated()
+            => GetString("ParseError_BlockComment_Not_Terminated");
+
+        /// <summary>
+        /// Directive '{0}' must have a value.
+        /// </summary>
+        internal static string ParseError_DirectiveMustHaveValue
+        {
+            get => GetString("ParseError_DirectiveMustHaveValue");
+        }
+
+        /// <summary>
+        /// Directive '{0}' must have a value.
+        /// </summary>
+        internal static string FormatParseError_DirectiveMustHaveValue(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_DirectiveMustHaveValue"), p0);
+
+        /// <summary>
+        /// An opening "{0}" is missing the corresponding closing "{1}".
+        /// </summary>
+        internal static string ParseError_Expected_CloseBracket_Before_EOF
+        {
+            get => GetString("ParseError_Expected_CloseBracket_Before_EOF");
+        }
+
+        /// <summary>
+        /// An opening "{0}" is missing the corresponding closing "{1}".
+        /// </summary>
+        internal static string FormatParseError_Expected_CloseBracket_Before_EOF(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Expected_CloseBracket_Before_EOF"), p0, p1);
+
+        /// <summary>
+        /// The {0} block is missing a closing "{1}" character.  Make sure you have a matching "{1}" character for all the "{2}" characters within this block, and that none of the "{1}" characters are being interpreted as markup.
+        /// </summary>
+        internal static string ParseError_Expected_EndOfBlock_Before_EOF
+        {
+            get => GetString("ParseError_Expected_EndOfBlock_Before_EOF");
+        }
+
+        /// <summary>
+        /// The {0} block is missing a closing "{1}" character.  Make sure you have a matching "{1}" character for all the "{2}" characters within this block, and that none of the "{1}" characters are being interpreted as markup.
+        /// </summary>
+        internal static string FormatParseError_Expected_EndOfBlock_Before_EOF(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Expected_EndOfBlock_Before_EOF"), p0, p1, p2);
+
+        /// <summary>
+        /// The {0} directive is not supported.
+        /// </summary>
+        internal static string ParseError_HelperDirectiveNotAvailable
+        {
+            get => GetString("ParseError_HelperDirectiveNotAvailable");
+        }
+
+        /// <summary>
+        /// The {0} directive is not supported.
+        /// </summary>
+        internal static string FormatParseError_HelperDirectiveNotAvailable(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_HelperDirectiveNotAvailable"), p0);
+
+        /// <summary>
+        /// Optional quote around the directive '{0}' is missing the corresponding opening or closing quote.
+        /// </summary>
+        internal static string ParseError_IncompleteQuotesAroundDirective
+        {
+            get => GetString("ParseError_IncompleteQuotesAroundDirective");
+        }
+
+        /// <summary>
+        /// Optional quote around the directive '{0}' is missing the corresponding opening or closing quote.
+        /// </summary>
+        internal static string FormatParseError_IncompleteQuotesAroundDirective(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_IncompleteQuotesAroundDirective"), p0);
+
+        /// <summary>
+        /// Inline markup blocks (@&lt;p&gt;Content&lt;/p&gt;) cannot be nested.  Only one level of inline markup is allowed.
+        /// </summary>
+        internal static string ParseError_InlineMarkup_Blocks_Cannot_Be_Nested
+        {
+            get => GetString("ParseError_InlineMarkup_Blocks_Cannot_Be_Nested");
+        }
+
+        /// <summary>
+        /// Inline markup blocks (@&lt;p&gt;Content&lt;/p&gt;) cannot be nested.  Only one level of inline markup is allowed.
+        /// </summary>
+        internal static string FormatParseError_InlineMarkup_Blocks_Cannot_Be_Nested()
+            => GetString("ParseError_InlineMarkup_Blocks_Cannot_Be_Nested");
+
+        /// <summary>
+        /// Markup in a code block must start with a tag and all start tags must be matched with end tags.  Do not use unclosed tags like "&lt;br&gt;".  Instead use self-closing tags like "&lt;br/&gt;".
+        /// </summary>
+        internal static string ParseError_MarkupBlock_Must_Start_With_Tag
+        {
+            get => GetString("ParseError_MarkupBlock_Must_Start_With_Tag");
+        }
+
+        /// <summary>
+        /// Markup in a code block must start with a tag and all start tags must be matched with end tags.  Do not use unclosed tags like "&lt;br&gt;".  Instead use self-closing tags like "&lt;br/&gt;".
+        /// </summary>
+        internal static string FormatParseError_MarkupBlock_Must_Start_With_Tag()
+            => GetString("ParseError_MarkupBlock_Must_Start_With_Tag");
+
+        /// <summary>
+        /// The "{0}" element was not closed.  All elements must be either self-closing or have a matching end tag.
+        /// </summary>
+        internal static string ParseError_MissingEndTag
+        {
+            get => GetString("ParseError_MissingEndTag");
+        }
+
+        /// <summary>
+        /// The "{0}" element was not closed.  All elements must be either self-closing or have a matching end tag.
+        /// </summary>
+        internal static string FormatParseError_MissingEndTag(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_MissingEndTag"), p0);
+
+        /// <summary>
+        /// Namespace imports and type aliases cannot be placed within code blocks.  They must immediately follow an "@" character in markup.  It is recommended that you put them at the top of the page, as in the following example:
+        /// 
+        /// @using System.Drawing;
+        /// @{{
+        ///     // OK here to use types from System.Drawing in the page.
+        /// }}
+        /// </summary>
+        internal static string ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock
+        {
+            get => GetString("ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock");
+        }
+
+        /// <summary>
+        /// Namespace imports and type aliases cannot be placed within code blocks.  They must immediately follow an "@" character in markup.  It is recommended that you put them at the top of the page, as in the following example:
+        /// 
+        /// @using System.Drawing;
+        /// @{{
+        ///     // OK here to use types from System.Drawing in the page.
+        /// }}
+        /// </summary>
+        internal static string FormatParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock()
+            => GetString("ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock");
+
+        /// <summary>
+        /// Outer tag is missing a name. The first character of a markup block must be an HTML tag with a valid name.
+        /// </summary>
+        internal static string ParseError_OuterTagMissingName
+        {
+            get => GetString("ParseError_OuterTagMissingName");
+        }
+
+        /// <summary>
+        /// Outer tag is missing a name. The first character of a markup block must be an HTML tag with a valid name.
+        /// </summary>
+        internal static string FormatParseError_OuterTagMissingName()
+            => GetString("ParseError_OuterTagMissingName");
+
+        /// <summary>
+        /// End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
+        /// </summary>
+        internal static string ParseError_RazorComment_Not_Terminated
+        {
+            get => GetString("ParseError_RazorComment_Not_Terminated");
+        }
+
+        /// <summary>
+        /// End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
+        /// </summary>
+        internal static string FormatParseError_RazorComment_Not_Terminated()
+            => GetString("ParseError_RazorComment_Not_Terminated");
+
+        /// <summary>
+        /// "{0}" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
+        /// </summary>
+        internal static string ParseError_ReservedWord
+        {
+            get => GetString("ParseError_ReservedWord");
+        }
+
+        /// <summary>
+        /// "{0}" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
+        /// </summary>
+        internal static string FormatParseError_ReservedWord(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_ReservedWord"), p0);
+
+        /// <summary>
+        /// Section blocks ("{0}") cannot be nested.  Only one level of section blocks are allowed.
+        /// </summary>
+        internal static string ParseError_Sections_Cannot_Be_Nested
+        {
+            get => GetString("ParseError_Sections_Cannot_Be_Nested");
+        }
+
+        /// <summary>
+        /// Section blocks ("{0}") cannot be nested.  Only one level of section blocks are allowed.
+        /// </summary>
+        internal static string FormatParseError_Sections_Cannot_Be_Nested(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Sections_Cannot_Be_Nested"), p0);
+
+        /// <summary>
+        /// Expected a "{0}" but found a "{1}".  Block statements must be enclosed in "{{" and "}}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+        /// 
+        /// @if(isLoggedIn)
+        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
+        /// 
+        /// Instead, wrap the contents of the block in "{{}}":
+        /// 
+        /// @if(isLoggedIn) {{
+        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
+        /// }}
+        /// </summary>
+        internal static string ParseError_SingleLine_ControlFlowStatements_Not_Allowed
+        {
+            get => GetString("ParseError_SingleLine_ControlFlowStatements_Not_Allowed");
+        }
+
+        /// <summary>
+        /// Expected a "{0}" but found a "{1}".  Block statements must be enclosed in "{{" and "}}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+        /// 
+        /// @if(isLoggedIn)
+        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
+        /// 
+        /// Instead, wrap the contents of the block in "{{}}":
+        /// 
+        /// @if(isLoggedIn) {{
+        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
+        /// }}
+        /// </summary>
+        internal static string FormatParseError_SingleLine_ControlFlowStatements_Not_Allowed(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_SingleLine_ControlFlowStatements_Not_Allowed"), p0, p1);
+
+        /// <summary>
+        /// "&lt;text&gt;" and "&lt;/text&gt;" tags cannot contain attributes.
+        /// </summary>
+        internal static string ParseError_TextTagCannotContainAttributes
+        {
+            get => GetString("ParseError_TextTagCannotContainAttributes");
+        }
+
+        /// <summary>
+        /// "&lt;text&gt;" and "&lt;/text&gt;" tags cannot contain attributes.
+        /// </summary>
+        internal static string FormatParseError_TextTagCannotContainAttributes()
+            => GetString("ParseError_TextTagCannotContainAttributes");
+
+        /// <summary>
+        /// "{0}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{{" are valid.
+        /// </summary>
+        internal static string ParseError_Unexpected_Character_At_Start_Of_CodeBlock
+        {
+            get => GetString("ParseError_Unexpected_Character_At_Start_Of_CodeBlock");
+        }
+
+        /// <summary>
+        /// "{0}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{{" are valid.
+        /// </summary>
+        internal static string FormatParseError_Unexpected_Character_At_Start_Of_CodeBlock(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Unexpected_Character_At_Start_Of_CodeBlock"), p0);
+
+        /// <summary>
+        /// End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
+        /// </summary>
+        internal static string ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock
+        {
+            get => GetString("ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock");
+        }
+
+        /// <summary>
+        /// End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
+        /// </summary>
+        internal static string FormatParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock()
+            => GetString("ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock");
+
+        /// <summary>
+        /// Unexpected "{{" after "@" character. Once inside the body of a code block (@if {{}}, @{{}}, etc.) you do not need to use "@{{" to switch to code.
+        /// </summary>
+        internal static string ParseError_Unexpected_Nested_CodeBlock
+        {
+            get => GetString("ParseError_Unexpected_Nested_CodeBlock");
+        }
+
+        /// <summary>
+        /// Unexpected "{{" after "@" character. Once inside the body of a code block (@if {{}}, @{{}}, etc.) you do not need to use "@{{" to switch to code.
+        /// </summary>
+        internal static string FormatParseError_Unexpected_Nested_CodeBlock()
+            => GetString("ParseError_Unexpected_Nested_CodeBlock");
+
+        /// <summary>
+        /// A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
+        /// </summary>
+        internal static string ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock
+        {
+            get => GetString("ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock");
+        }
+
+        /// <summary>
+        /// A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
+        /// </summary>
+        internal static string FormatParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock()
+            => GetString("ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock");
+
+        /// <summary>
+        /// Encountered end tag "{0}" with no matching start tag.  Are your start/end tags properly balanced?
+        /// </summary>
+        internal static string ParseError_UnexpectedEndTag
+        {
+            get => GetString("ParseError_UnexpectedEndTag");
+        }
+
+        /// <summary>
+        /// Encountered end tag "{0}" with no matching start tag.  Are your start/end tags properly balanced?
+        /// </summary>
+        internal static string FormatParseError_UnexpectedEndTag(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_UnexpectedEndTag"), p0);
+
+        /// <summary>
+        /// End of file or an unexpected character was reached before the "{0}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("&lt;br /&gt;") or have matching end tags ("&lt;p&gt;Hello&lt;/p&gt;").  If you intended to display a "&lt;" character, use the "&amp;lt;" HTML entity.
+        /// </summary>
+        internal static string ParseError_UnfinishedTag
+        {
+            get => GetString("ParseError_UnfinishedTag");
+        }
+
+        /// <summary>
+        /// End of file or an unexpected character was reached before the "{0}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("&lt;br /&gt;") or have matching end tags ("&lt;p&gt;Hello&lt;/p&gt;").  If you intended to display a "&lt;" character, use the "&amp;lt;" HTML entity.
+        /// </summary>
+        internal static string FormatParseError_UnfinishedTag(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_UnfinishedTag"), p0);
+
+        /// <summary>
+        /// Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+        /// </summary>
+        internal static string ParseError_Unterminated_String_Literal
+        {
+            get => GetString("ParseError_Unterminated_String_Literal");
+        }
+
+        /// <summary>
+        /// Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+        /// </summary>
+        internal static string FormatParseError_Unterminated_String_Literal()
+            => GetString("ParseError_Unterminated_String_Literal");
+
+        /// <summary>
+        /// Parser was started with a null Context property.  The Context property must be set BEFORE calling any methods on the parser.
+        /// </summary>
+        internal static string Parser_Context_Not_Set
+        {
+            get => GetString("Parser_Context_Not_Set");
+        }
+
+        /// <summary>
+        /// Parser was started with a null Context property.  The Context property must be set BEFORE calling any methods on the parser.
+        /// </summary>
+        internal static string FormatParser_Context_Not_Set()
+            => GetString("Parser_Context_Not_Set");
+
+        /// <summary>
+        /// Cannot complete the tree, StartBlock must be called at least once.
+        /// </summary>
+        internal static string ParserContext_CannotCompleteTree_NoRootBlock
+        {
+            get => GetString("ParserContext_CannotCompleteTree_NoRootBlock");
+        }
+
+        /// <summary>
+        /// Cannot complete the tree, StartBlock must be called at least once.
+        /// </summary>
+        internal static string FormatParserContext_CannotCompleteTree_NoRootBlock()
+            => GetString("ParserContext_CannotCompleteTree_NoRootBlock");
+
+        /// <summary>
+        /// Cannot complete the tree, there are still open blocks.
+        /// </summary>
+        internal static string ParserContext_CannotCompleteTree_OutstandingBlocks
+        {
+            get => GetString("ParserContext_CannotCompleteTree_OutstandingBlocks");
+        }
+
+        /// <summary>
+        /// Cannot complete the tree, there are still open blocks.
+        /// </summary>
+        internal static string FormatParserContext_CannotCompleteTree_OutstandingBlocks()
+            => GetString("ParserContext_CannotCompleteTree_OutstandingBlocks");
+
+        /// <summary>
+        /// Cannot finish span, there is no current block. Call StartBlock at least once before finishing a span
+        /// </summary>
+        internal static string ParserContext_NoCurrentBlock
+        {
+            get => GetString("ParserContext_NoCurrentBlock");
+        }
+
+        /// <summary>
+        /// Cannot finish span, there is no current block. Call StartBlock at least once before finishing a span
+        /// </summary>
+        internal static string FormatParserContext_NoCurrentBlock()
+            => GetString("ParserContext_NoCurrentBlock");
+
+        /// <summary>
+        /// The '{0}' phase requires a '{1}' provided by the '{2}'.
+        /// </summary>
+        internal static string PhaseDependencyMissing
+        {
+            get => GetString("PhaseDependencyMissing");
+        }
+
+        /// <summary>
+        /// The '{0}' phase requires a '{1}' provided by the '{2}'.
+        /// </summary>
+        internal static string FormatPhaseDependencyMissing(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PhaseDependencyMissing"), p0, p1, p2);
+
+        /// <summary>
+        /// The phase must be initialized by setting the '{0}' property.
+        /// </summary>
+        internal static string PhaseMustBeInitialized
+        {
+            get => GetString("PhaseMustBeInitialized");
+        }
+
+        /// <summary>
+        /// The phase must be initialized by setting the '{0}' property.
+        /// </summary>
+        internal static string FormatPhaseMustBeInitialized(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PhaseMustBeInitialized"), p0);
+
+        /// <summary>
+        /// Path must begin with a forward slash '/'.
+        /// </summary>
+        internal static string RazorProject_PathMustStartWithForwardSlash
+        {
+            get => GetString("RazorProject_PathMustStartWithForwardSlash");
+        }
+
+        /// <summary>
+        /// Path must begin with a forward slash '/'.
+        /// </summary>
+        internal static string FormatRazorProject_PathMustStartWithForwardSlash()
+            => GetString("RazorProject_PathMustStartWithForwardSlash");
+
+        /// <summary>
+        /// The item '{0}' could not be found.
+        /// </summary>
+        internal static string RazorTemplateEngine_ItemCouldNotBeFound
+        {
+            get => GetString("RazorTemplateEngine_ItemCouldNotBeFound");
+        }
+
+        /// <summary>
+        /// The item '{0}' could not be found.
+        /// </summary>
+        internal static string FormatRazorTemplateEngine_ItemCouldNotBeFound(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RazorTemplateEngine_ItemCouldNotBeFound"), p0);
+
+        /// <summary>
+        /// Remove Tag Helpers for use in the current document.
+        /// </summary>
+        internal static string RemoveTagHelperDirective_Description
+        {
+            get => GetString("RemoveTagHelperDirective_Description");
+        }
+
+        /// <summary>
+        /// Remove Tag Helpers for use in the current document.
+        /// </summary>
+        internal static string FormatRemoveTagHelperDirective_Description()
+            => GetString("RemoveTagHelperDirective_Description");
+
+        /// <summary>
+        /// Remove tag helpers from the specified type name and assembly name. Specify '*' for the type name to remove all tag helper types from the specified assembly.
+        /// </summary>
+        internal static string RemoveTagHelperDirective_StringToken_Description
+        {
+            get => GetString("RemoveTagHelperDirective_StringToken_Description");
+        }
+
+        /// <summary>
+        /// Remove tag helpers from the specified type name and assembly name. Specify '*' for the type name to remove all tag helper types from the specified assembly.
+        /// </summary>
+        internal static string FormatRemoveTagHelperDirective_StringToken_Description()
+            => GetString("RemoveTagHelperDirective_StringToken_Description");
+
+        /// <summary>
+        /// TypeName, AssemblyName
+        /// </summary>
+        internal static string RemoveTagHelperDirective_StringToken_Name
+        {
+            get => GetString("RemoveTagHelperDirective_StringToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName, AssemblyName
+        /// </summary>
+        internal static string FormatRemoveTagHelperDirective_StringToken_Name()
+            => GetString("RemoveTagHelperDirective_StringToken_Name");
+
+        /// <summary>
+        /// The '{0}' requires a '{1}' delegate to be set.
+        /// </summary>
+        internal static string RenderingContextRequiresDelegate
+        {
+            get => GetString("RenderingContextRequiresDelegate");
+        }
+
+        /// <summary>
+        /// The '{0}' requires a '{1}' delegate to be set.
+        /// </summary>
+        internal static string FormatRenderingContextRequiresDelegate(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RenderingContextRequiresDelegate"), p0, p1);
+
+        /// <summary>
+        /// Attribute '{0}' on tag helper element '{1}' requires a value. Tag helper bound attributes of type '{2}' cannot be empty or contain only whitespace.
+        /// </summary>
+        internal static string RewriterError_EmptyTagHelperBoundAttribute
+        {
+            get => GetString("RewriterError_EmptyTagHelperBoundAttribute");
+        }
+
+        /// <summary>
+        /// Attribute '{0}' on tag helper element '{1}' requires a value. Tag helper bound attributes of type '{2}' cannot be empty or contain only whitespace.
+        /// </summary>
+        internal static string FormatRewriterError_EmptyTagHelperBoundAttribute(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RewriterError_EmptyTagHelperBoundAttribute"), p0, p1, p2);
+
+        /// <summary>
+        /// Define a section to be rendered in the configured layout page.
+        /// </summary>
+        internal static string SectionDirective_Description
+        {
+            get => GetString("SectionDirective_Description");
+        }
+
+        /// <summary>
+        /// Define a section to be rendered in the configured layout page.
+        /// </summary>
+        internal static string FormatSectionDirective_Description()
+            => GetString("SectionDirective_Description");
+
+        /// <summary>
+        /// The name of the section.
+        /// </summary>
+        internal static string SectionDirective_NameToken_Description
+        {
+            get => GetString("SectionDirective_NameToken_Description");
+        }
+
+        /// <summary>
+        /// The name of the section.
+        /// </summary>
+        internal static string FormatSectionDirective_NameToken_Description()
+            => GetString("SectionDirective_NameToken_Description");
+
+        /// <summary>
+        /// SectionName
+        /// </summary>
+        internal static string SectionDirective_NameToken_Name
+        {
+            get => GetString("SectionDirective_NameToken_Name");
+        }
+
+        /// <summary>
+        /// SectionName
+        /// </summary>
+        internal static string FormatSectionDirective_NameToken_Name()
+            => GetString("SectionDirective_NameToken_Name");
+
+        /// <summary>
+        /// @section Header { ... }
+        /// </summary>
+        internal static string SectionExample
+        {
+            get => GetString("SectionExample");
+        }
+
+        /// <summary>
+        /// @section Header { ... }
+        /// </summary>
+        internal static string FormatSectionExample()
+            => GetString("SectionExample");
+
+        /// <summary>
+        /// &lt;&lt;unknown&gt;&gt;
+        /// </summary>
+        internal static string Token_Unknown
+        {
+            get => GetString("Token_Unknown");
+        }
+
+        /// <summary>
+        /// &lt;&lt;unknown&gt;&gt;
+        /// </summary>
+        internal static string FormatToken_Unknown()
+            => GetString("Token_Unknown");
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name contains a '{3}' character.
+        /// </summary>
+        internal static string TagHelper_InvalidBoundAttributeName
+        {
+            get => GetString("TagHelper_InvalidBoundAttributeName");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name contains a '{3}' character.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidBoundAttributeName(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributeName"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name starts with '{3}'.
+        /// </summary>
+        internal static string TagHelper_InvalidBoundAttributeNameStartsWith
+        {
+            get => GetString("TagHelper_InvalidBoundAttributeNameStartsWith");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name starts with '{3}'.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidBoundAttributeNameStartsWith(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributeNameStartsWith"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with a null or empty name.
+        /// </summary>
+        internal static string TagHelper_InvalidBoundAttributeNullOrWhitespace
+        {
+            get => GetString("TagHelper_InvalidBoundAttributeNullOrWhitespace");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with a null or empty name.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidBoundAttributeNullOrWhitespace(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributeNullOrWhitespace"), p0, p1);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix contains a '{3}' character.
+        /// </summary>
+        internal static string TagHelper_InvalidBoundAttributePrefix
+        {
+            get => GetString("TagHelper_InvalidBoundAttributePrefix");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix contains a '{3}' character.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidBoundAttributePrefix(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributePrefix"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix starts with '{3}'.
+        /// </summary>
+        internal static string TagHelper_InvalidBoundAttributePrefixStartsWith
+        {
+            get => GetString("TagHelper_InvalidBoundAttributePrefixStartsWith");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix starts with '{3}'.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidBoundAttributePrefixStartsWith(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributePrefixStartsWith"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// Invalid restricted child '{1}' for tag helper '{0}'. Tag helpers cannot restrict child elements that contain a '{2}' character.
+        /// </summary>
+        internal static string TagHelper_InvalidRestrictedChild
+        {
+            get => GetString("TagHelper_InvalidRestrictedChild");
+        }
+
+        /// <summary>
+        /// Invalid restricted child '{1}' for tag helper '{0}'. Tag helpers cannot restrict child elements that contain a '{2}' character.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidRestrictedChild(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRestrictedChild"), p0, p1, p2);
+
+        /// <summary>
+        /// Invalid restricted child for tag helper '{0}'. Name cannot be null or whitespace.
+        /// </summary>
+        internal static string TagHelper_InvalidRestrictedChildNullOrWhitespace
+        {
+            get => GetString("TagHelper_InvalidRestrictedChildNullOrWhitespace");
+        }
+
+        /// <summary>
+        /// Invalid restricted child for tag helper '{0}'. Name cannot be null or whitespace.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidRestrictedChildNullOrWhitespace(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRestrictedChildNullOrWhitespace"), p0);
+
+        /// <summary>
+        /// Tag helpers cannot target attribute name '{0}' because it contains a '{1}' character.
+        /// </summary>
+        internal static string TagHelper_InvalidTargetedAttributeName
+        {
+            get => GetString("TagHelper_InvalidTargetedAttributeName");
+        }
+
+        /// <summary>
+        /// Tag helpers cannot target attribute name '{0}' because it contains a '{1}' character.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidTargetedAttributeName(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidTargetedAttributeName"), p0, p1);
+
+        /// <summary>
+        /// Targeted attribute name cannot be null or whitespace.
+        /// </summary>
+        internal static string TagHelper_InvalidTargetedAttributeNameNullOrWhitespace
+        {
+            get => GetString("TagHelper_InvalidTargetedAttributeNameNullOrWhitespace");
+        }
+
+        /// <summary>
+        /// Targeted attribute name cannot be null or whitespace.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidTargetedAttributeNameNullOrWhitespace()
+            => GetString("TagHelper_InvalidTargetedAttributeNameNullOrWhitespace");
+
+        /// <summary>
+        /// Tag helpers cannot target parent tag name '{0}' because it contains a '{1}' character.
+        /// </summary>
+        internal static string TagHelper_InvalidTargetedParentTagName
+        {
+            get => GetString("TagHelper_InvalidTargetedParentTagName");
+        }
+
+        /// <summary>
+        /// Tag helpers cannot target parent tag name '{0}' because it contains a '{1}' character.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidTargetedParentTagName(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidTargetedParentTagName"), p0, p1);
+
+        /// <summary>
+        /// Targeted parent tag name cannot be null or whitespace.
+        /// </summary>
+        internal static string TagHelper_InvalidTargetedParentTagNameNullOrWhitespace
+        {
+            get => GetString("TagHelper_InvalidTargetedParentTagNameNullOrWhitespace");
+        }
+
+        /// <summary>
+        /// Targeted parent tag name cannot be null or whitespace.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidTargetedParentTagNameNullOrWhitespace()
+            => GetString("TagHelper_InvalidTargetedParentTagNameNullOrWhitespace");
+
+        /// <summary>
+        /// Tag helpers cannot target tag name '{0}' because it contains a '{1}' character.
+        /// </summary>
+        internal static string TagHelper_InvalidTargetedTagName
+        {
+            get => GetString("TagHelper_InvalidTargetedTagName");
+        }
+
+        /// <summary>
+        /// Tag helpers cannot target tag name '{0}' because it contains a '{1}' character.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidTargetedTagName(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidTargetedTagName"), p0, p1);
+
+        /// <summary>
+        /// Targeted tag name cannot be null or whitespace.
+        /// </summary>
+        internal static string TagHelper_InvalidTargetedTagNameNullOrWhitespace
+        {
+            get => GetString("TagHelper_InvalidTargetedTagNameNullOrWhitespace");
+        }
+
+        /// <summary>
+        /// Targeted tag name cannot be null or whitespace.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidTargetedTagNameNullOrWhitespace()
+            => GetString("TagHelper_InvalidTargetedTagNameNullOrWhitespace");
+
+        /// <summary>
+        /// Tag helper directive assembly name cannot be null or empty.
+        /// </summary>
+        internal static string TagHelperAssemblyNameCannotBeEmptyOrNull
+        {
+            get => GetString("TagHelperAssemblyNameCannotBeEmptyOrNull");
+        }
+
+        /// <summary>
+        /// Tag helper directive assembly name cannot be null or empty.
+        /// </summary>
+        internal static string FormatTagHelperAssemblyNameCannotBeEmptyOrNull()
+            => GetString("TagHelperAssemblyNameCannotBeEmptyOrNull");
+
+        /// <summary>
+        /// The tag helper attribute '{0}' in element '{1}' is missing a key. The syntax is '&lt;{1} {0}{{ key }}="value"&gt;'.
+        /// </summary>
+        internal static string TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey
+        {
+            get => GetString("TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey");
+        }
+
+        /// <summary>
+        /// The tag helper attribute '{0}' in element '{1}' is missing a key. The syntax is '&lt;{1} {0}{{ key }}="value"&gt;'.
+        /// </summary>
+        internal static string FormatTagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey"), p0, p1);
+
+        /// <summary>
+        /// TagHelper attributes must be well-formed.
+        /// </summary>
+        internal static string TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed
+        {
+            get => GetString("TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed");
+        }
+
+        /// <summary>
+        /// TagHelper attributes must be well-formed.
+        /// </summary>
+        internal static string FormatTagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed()
+            => GetString("TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed");
+
+        /// <summary>
+        /// The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed.
+        /// </summary>
+        internal static string TagHelperParseTreeRewriter_CannotHaveNonTagContent
+        {
+            get => GetString("TagHelperParseTreeRewriter_CannotHaveNonTagContent");
+        }
+
+        /// <summary>
+        /// The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed.
+        /// </summary>
+        internal static string FormatTagHelperParseTreeRewriter_CannotHaveNonTagContent(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_CannotHaveNonTagContent"), p0, p1);
+
+        /// <summary>
+        /// Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}').
+        /// </summary>
+        internal static string TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag
+        {
+            get => GetString("TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag");
+        }
+
+        /// <summary>
+        /// Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}').
+        /// </summary>
+        internal static string FormatTagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag"), p0, p1, p2);
+
+        /// <summary>
+        /// Tag helpers '{0}' and '{1}' targeting element '{2}' must not expect different {3} values.
+        /// </summary>
+        internal static string TagHelperParseTreeRewriter_InconsistentTagStructure
+        {
+            get => GetString("TagHelperParseTreeRewriter_InconsistentTagStructure");
+        }
+
+        /// <summary>
+        /// Tag helpers '{0}' and '{1}' targeting element '{2}' must not expect different {3} values.
+        /// </summary>
+        internal static string FormatTagHelperParseTreeRewriter_InconsistentTagStructure(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_InconsistentTagStructure"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tags with name(s) '{2}' are allowed.
+        /// </summary>
+        internal static string TagHelperParseTreeRewriter_InvalidNestedTag
+        {
+            get => GetString("TagHelperParseTreeRewriter_InvalidNestedTag");
+        }
+
+        /// <summary>
+        /// The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tags with name(s) '{2}' are allowed.
+        /// </summary>
+        internal static string FormatTagHelperParseTreeRewriter_InvalidNestedTag(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_InvalidNestedTag"), p0, p1, p2);
+
+        /// <summary>
+        /// Specify a prefix that is required in an element name for it to be included in Tag Helper processing.
+        /// </summary>
+        internal static string TagHelperPrefixDirective_Description
+        {
+            get => GetString("TagHelperPrefixDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify a prefix that is required in an element name for it to be included in Tag Helper processing.
+        /// </summary>
+        internal static string FormatTagHelperPrefixDirective_Description()
+            => GetString("TagHelperPrefixDirective_Description");
+
+        /// <summary>
+        /// The tag prefix to apply to tag helpers.
+        /// </summary>
+        internal static string TagHelperPrefixDirective_PrefixToken_Description
+        {
+            get => GetString("TagHelperPrefixDirective_PrefixToken_Description");
+        }
+
+        /// <summary>
+        /// The tag prefix to apply to tag helpers.
+        /// </summary>
+        internal static string FormatTagHelperPrefixDirective_PrefixToken_Description()
+            => GetString("TagHelperPrefixDirective_PrefixToken_Description");
+
+        /// <summary>
+        /// Prefix
+        /// </summary>
+        internal static string TagHelperPrefixDirective_PrefixToken_Name
+        {
+            get => GetString("TagHelperPrefixDirective_PrefixToken_Name");
+        }
+
+        /// <summary>
+        /// Prefix
+        /// </summary>
+        internal static string FormatTagHelperPrefixDirective_PrefixToken_Name()
+            => GetString("TagHelperPrefixDirective_PrefixToken_Name");
+
+        /// <summary>
+        /// Tag Helper '{0}'s attributes must have names.
+        /// </summary>
+        internal static string TagHelpers_AttributesMustHaveAName
+        {
+            get => GetString("TagHelpers_AttributesMustHaveAName");
+        }
+
+        /// <summary>
+        /// Tag Helper '{0}'s attributes must have names.
+        /// </summary>
+        internal static string FormatTagHelpers_AttributesMustHaveAName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_AttributesMustHaveAName"), p0);
+
+        /// <summary>
+        /// The tag helper '{0}' must not have C# in the element's attribute declaration area.
+        /// </summary>
+        internal static string TagHelpers_CannotHaveCSharpInTagDeclaration
+        {
+            get => GetString("TagHelpers_CannotHaveCSharpInTagDeclaration");
+        }
+
+        /// <summary>
+        /// The tag helper '{0}' must not have C# in the element's attribute declaration area.
+        /// </summary>
+        internal static string FormatTagHelpers_CannotHaveCSharpInTagDeclaration(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_CannotHaveCSharpInTagDeclaration"), p0);
+
+        /// <summary>
+        /// Code blocks (e.g. @{{var variable = 23;}}) must not appear in non-string tag helper attribute values.
+        ///  Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.
+        /// </summary>
+        internal static string TagHelpers_CodeBlocks_NotSupported_InAttributes
+        {
+            get => GetString("TagHelpers_CodeBlocks_NotSupported_InAttributes");
+        }
+
+        /// <summary>
+        /// Code blocks (e.g. @{{var variable = 23;}}) must not appear in non-string tag helper attribute values.
+        ///  Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.
+        /// </summary>
+        internal static string FormatTagHelpers_CodeBlocks_NotSupported_InAttributes()
+            => GetString("TagHelpers_CodeBlocks_NotSupported_InAttributes");
+
+        /// <summary>
+        /// Inline markup blocks (e.g. @&lt;p&gt;content&lt;/p&gt;) must not appear in non-string tag helper attribute values.
+        ///  Expected a '{0}' attribute value, not a string.
+        /// </summary>
+        internal static string TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes
+        {
+            get => GetString("TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes");
+        }
+
+        /// <summary>
+        /// Inline markup blocks (e.g. @&lt;p&gt;content&lt;/p&gt;) must not appear in non-string tag helper attribute values.
+        ///  Expected a '{0}' attribute value, not a string.
+        /// </summary>
+        internal static string FormatTagHelpers_InlineMarkupBlocks_NotSupported_InAttributes(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes"), p0);
+
+        /// <summary>
+        /// Found a malformed '{0}' tag helper. Tag helpers must have a start and end tag or be self closing.
+        /// </summary>
+        internal static string TagHelpersParseTreeRewriter_FoundMalformedTagHelper
+        {
+            get => GetString("TagHelpersParseTreeRewriter_FoundMalformedTagHelper");
+        }
+
+        /// <summary>
+        /// Found a malformed '{0}' tag helper. Tag helpers must have a start and end tag or be self closing.
+        /// </summary>
+        internal static string FormatTagHelpersParseTreeRewriter_FoundMalformedTagHelper(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpersParseTreeRewriter_FoundMalformedTagHelper"), p0);
+
+        /// <summary>
+        /// Missing close angle for tag helper '{0}'.
+        /// </summary>
+        internal static string TagHelpersParseTreeRewriter_MissingCloseAngle
+        {
+            get => GetString("TagHelpersParseTreeRewriter_MissingCloseAngle");
+        }
+
+        /// <summary>
+        /// Missing close angle for tag helper '{0}'.
+        /// </summary>
+        internal static string FormatTagHelpersParseTreeRewriter_MissingCloseAngle(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpersParseTreeRewriter_MissingCloseAngle"), p0);
+
+        /// <summary>
+        /// Unreachable code. This can happen when a new {0} is introduced.
+        /// </summary>
+        internal static string UnexpectedDirectiveKind
+        {
+            get => GetString("UnexpectedDirectiveKind");
+        }
+
+        /// <summary>
+        /// Unreachable code. This can happen when a new {0} is introduced.
+        /// </summary>
+        internal static string FormatUnexpectedDirectiveKind(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedDirectiveKind"), p0);
+
+        /// <summary>
+        /// Unexpected literal following the '{0}' directive. Expected '{1}'.
+        /// </summary>
+        internal static string UnexpectedDirectiveLiteral
+        {
+            get => GetString("UnexpectedDirectiveLiteral");
+        }
+
+        /// <summary>
+        /// Unexpected literal following the '{0}' directive. Expected '{1}'.
+        /// </summary>
+        internal static string FormatUnexpectedDirectiveLiteral(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedDirectiveLiteral"), p0, p1);
+
+        /// <summary>
+        /// Unexpected end of file following the '{0}' directive. Expected '{1}'.
+        /// </summary>
+        internal static string UnexpectedEOFAfterDirective
+        {
+            get => GetString("UnexpectedEOFAfterDirective");
+        }
+
+        /// <summary>
+        /// Unexpected end of file following the '{0}' directive. Expected '{1}'.
+        /// </summary>
+        internal static string FormatUnexpectedEOFAfterDirective(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedEOFAfterDirective"), p0, p1);
+
+        /// <summary>
+        /// The hash algorithm '{0}' is not supported for checksum generation. Supported algorithms are: '{1}'. Set '{2}' to '{3}' to suppress automatic checksum generation.
+        /// </summary>
+        internal static string UnsupportedChecksumAlgorithm
+        {
+            get => GetString("UnsupportedChecksumAlgorithm");
+        }
+
+        /// <summary>
+        /// The hash algorithm '{0}' is not supported for checksum generation. Supported algorithms are: '{1}'. Set '{2}' to '{3}' to suppress automatic checksum generation.
+        /// </summary>
+        internal static string FormatUnsupportedChecksumAlgorithm(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedChecksumAlgorithm"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// The '{0}.{1}' property must not be null.
+        /// </summary>
+        internal static string PropertyMustNotBeNull
+        {
+            get => GetString("PropertyMustNotBeNull");
+        }
+
+        /// <summary>
+        /// The '{0}.{1}' property must not be null.
+        /// </summary>
+        internal static string FormatPropertyMustNotBeNull(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyMustNotBeNull"), p0, p1);
+
+        /// <summary>
+        /// The '{0}' is missing feature '{1}'.
+        /// </summary>
+        internal static string RazorProjectEngineMissingFeatureDependency
+        {
+            get => GetString("RazorProjectEngineMissingFeatureDependency");
+        }
+
+        /// <summary>
+        /// The '{0}' is missing feature '{1}'.
+        /// </summary>
+        internal static string FormatRazorProjectEngineMissingFeatureDependency(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RazorProjectEngineMissingFeatureDependency"), p0, p1);
+
+        /// <summary>
+        /// The Razor language version '{0}' is unrecognized or not supported by this version of Razor.
+        /// </summary>
+        internal static string RazorLanguageVersion_InvalidVersion
+        {
+            get => GetString("RazorLanguageVersion_InvalidVersion");
+        }
+
+        /// <summary>
+        /// The Razor language version '{0}' is unrecognized or not supported by this version of Razor.
+        /// </summary>
+        internal static string FormatRazorLanguageVersion_InvalidVersion(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RazorLanguageVersion_InvalidVersion"), p0);
+
+        /// <summary>
+        /// File path '{0}' does not belong to the directory '{1}'.
+        /// </summary>
+        internal static string VirtualFileSystem_FileDoesNotBelongToDirectory
+        {
+            get => GetString("VirtualFileSystem_FileDoesNotBelongToDirectory");
+        }
+
+        /// <summary>
+        /// File path '{0}' does not belong to the directory '{1}'.
+        /// </summary>
+        internal static string FormatVirtualFileSystem_FileDoesNotBelongToDirectory(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("VirtualFileSystem_FileDoesNotBelongToDirectory"), p0, p1);
+
+        /// <summary>
+        /// The file path '{0}' is invalid. File path is the root relative path of the file starting with '/' and should not contain any '\' characters.
+        /// </summary>
+        internal static string VirtualFileSystem_InvalidRelativePath
+        {
+            get => GetString("VirtualFileSystem_InvalidRelativePath");
+        }
+
+        /// <summary>
+        /// The file path '{0}' is invalid. File path is the root relative path of the file starting with '/' and should not contain any '\' characters.
+        /// </summary>
+        internal static string FormatVirtualFileSystem_InvalidRelativePath(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("VirtualFileSystem_InvalidRelativePath"), p0);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ProvideRazorExtensionInitializerAttribute.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ProvideRazorExtensionInitializerAttribute.cs
new file mode 100644
index 0000000000..374419a676
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ProvideRazorExtensionInitializerAttribute.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public class ProvideRazorExtensionInitializerAttribute : Attribute
+    {
+        public ProvideRazorExtensionInitializerAttribute(string extensionName, Type initializerType)
+        {
+            if (extensionName == null)
+            {
+                throw new ArgumentNullException(nameof(extensionName));
+            }
+
+            if (initializerType == null)
+            {
+                throw new ArgumentNullException(nameof(initializerType));
+            }
+
+            ExtensionName = extensionName;
+            InitializerType = initializerType;
+        }
+
+        public string ExtensionName { get; }
+
+        public Type InitializerType { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs
new file mode 100644
index 0000000000..bfaa53b719
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs
@@ -0,0 +1,69 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorCSharpDocument
+    {
+        public abstract string GeneratedCode { get; }
+
+        public abstract IReadOnlyList<SourceMapping> SourceMappings { get; }
+
+        public abstract IReadOnlyList<RazorDiagnostic> Diagnostics { get; }
+
+        public abstract RazorCodeGenerationOptions Options { get; }
+
+        public static RazorCSharpDocument Create(string generatedCode, RazorCodeGenerationOptions options, IEnumerable<RazorDiagnostic> diagnostics)
+        {
+            if (generatedCode == null)
+            {
+                throw new ArgumentNullException(nameof(generatedCode));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            if (diagnostics == null)
+            {
+                throw new ArgumentNullException(nameof(diagnostics));
+            }
+
+            return new DefaultRazorCSharpDocument(generatedCode, options, diagnostics.ToArray(), sourceMappings: null);
+        }
+
+        public static RazorCSharpDocument Create(
+            string generatedCode,
+            RazorCodeGenerationOptions options,
+            IEnumerable<RazorDiagnostic> diagnostics,
+            IEnumerable<SourceMapping> sourceMappings)
+        {
+            if (generatedCode == null)
+            {
+                throw new ArgumentNullException(nameof(generatedCode));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            if (diagnostics == null)
+            {
+                throw new ArgumentNullException(nameof(diagnostics));
+            }
+
+            if (sourceMappings == null)
+            {
+                throw new ArgumentNullException(nameof(sourceMappings));
+            }
+
+            return new DefaultRazorCSharpDocument(generatedCode, options, diagnostics.ToArray(), sourceMappings.ToArray());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocument.cs
new file mode 100644
index 0000000000..0d57df2815
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocument.cs
@@ -0,0 +1,56 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorCodeDocument
+    {
+        public static RazorCodeDocument Create(RazorSourceDocument source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            return Create(source, imports: null);
+        }
+
+        public static RazorCodeDocument Create(
+            RazorSourceDocument source,
+            IEnumerable<RazorSourceDocument> imports)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+            
+            return new DefaultRazorCodeDocument(source, imports);
+        }
+
+        public static RazorCodeDocument Create(
+            RazorSourceDocument source, 
+            IEnumerable<RazorSourceDocument> imports,
+            RazorParserOptions parserOptions,
+            RazorCodeGenerationOptions codeGenerationOptions)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var codeDocument = new DefaultRazorCodeDocument(source, imports);
+            codeDocument.SetParserOptions(parserOptions);
+            codeDocument.SetCodeGenerationOptions(codeGenerationOptions);
+            return codeDocument;
+        }
+
+        public abstract IReadOnlyList<RazorSourceDocument> Imports { get; }
+
+        public abstract ItemCollection Items { get; }
+
+        public abstract RazorSourceDocument Source { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
new file mode 100644
index 0000000000..6b0a9fde9e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -0,0 +1,222 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class RazorCodeDocumentExtensions
+    {
+        public static TagHelperDocumentContext GetTagHelperContext(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (TagHelperDocumentContext)document.Items[typeof(TagHelperDocumentContext)];
+        }
+
+        public static void SetTagHelperContext(this RazorCodeDocument document, TagHelperDocumentContext context)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(TagHelperDocumentContext)] = context;
+        }
+
+        internal static IReadOnlyList<TagHelperDescriptor> GetTagHelpers(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (document.Items[typeof(TagHelpersHolder)] as TagHelpersHolder)?.TagHelpers;
+        }
+
+        internal static void SetTagHelpers(this RazorCodeDocument document, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(TagHelpersHolder)] = new TagHelpersHolder(tagHelpers);
+        }
+
+        public static RazorSyntaxTree GetSyntaxTree(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return document.Items[typeof(RazorSyntaxTree)] as RazorSyntaxTree;
+        }
+
+        public static void SetSyntaxTree(this RazorCodeDocument document, RazorSyntaxTree syntaxTree)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(RazorSyntaxTree)] = syntaxTree;
+        }
+
+        public static IReadOnlyList<RazorSyntaxTree> GetImportSyntaxTrees(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (document.Items[typeof(ImportSyntaxTreesHolder)] as ImportSyntaxTreesHolder)?.SyntaxTrees;
+        }
+
+        public static void SetImportSyntaxTrees(this RazorCodeDocument document, IReadOnlyList<RazorSyntaxTree> syntaxTrees)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(ImportSyntaxTreesHolder)] = new ImportSyntaxTreesHolder(syntaxTrees);
+        }
+
+        public static DocumentIntermediateNode GetDocumentIntermediateNode(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return document.Items[typeof(DocumentIntermediateNode)] as DocumentIntermediateNode;
+        }
+
+        public static void SetDocumentIntermediateNode(this RazorCodeDocument document, DocumentIntermediateNode documentNode)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(DocumentIntermediateNode)] = documentNode;
+        }
+
+        public static RazorCSharpDocument GetCSharpDocument(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (RazorCSharpDocument)document.Items[typeof(RazorCSharpDocument)];
+        }
+
+        public static void SetCSharpDocument(this RazorCodeDocument document, RazorCSharpDocument csharp)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(RazorCSharpDocument)] = csharp;
+        }
+
+        public static RazorParserOptions GetParserOptions(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (RazorParserOptions)document.Items[typeof(RazorParserOptions)];
+        }
+
+        public static void SetParserOptions(this RazorCodeDocument document, RazorParserOptions parserOptions)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(RazorParserOptions)] = parserOptions;
+        }
+
+        public static RazorCodeGenerationOptions GetCodeGenerationOptions(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (RazorCodeGenerationOptions)document.Items[typeof(RazorCodeGenerationOptions)];
+        }
+
+        public static void SetCodeGenerationOptions(this RazorCodeDocument document, RazorCodeGenerationOptions codeGenerationOptions)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(RazorCodeGenerationOptions)] = codeGenerationOptions;
+        }
+
+        public static string GetInputDocumentKind(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (string)document.Items[typeof(InputDocumentKind)];
+        }
+
+        public static void SetInputDocumentKind(this RazorCodeDocument document, string kind)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(InputDocumentKind)] = kind;
+        }
+
+        private class ImportSyntaxTreesHolder
+        {
+            public ImportSyntaxTreesHolder(IReadOnlyList<RazorSyntaxTree> syntaxTrees)
+            {
+                SyntaxTrees = syntaxTrees;
+            }
+
+            public IReadOnlyList<RazorSyntaxTree> SyntaxTrees { get; }
+        }
+
+        private class IncludeSyntaxTreesHolder
+        {
+            public IncludeSyntaxTreesHolder(IReadOnlyList<RazorSyntaxTree> syntaxTrees)
+            {
+                SyntaxTrees = syntaxTrees;
+            }
+
+            public IReadOnlyList<RazorSyntaxTree> SyntaxTrees { get; }
+        }
+
+        private class TagHelpersHolder
+        {
+            public TagHelpersHolder(IReadOnlyList<TagHelperDescriptor> tagHelpers)
+            {
+                TagHelpers = tagHelpers;
+            }
+
+            public IReadOnlyList<TagHelperDescriptor> TagHelpers { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
new file mode 100644
index 0000000000..ad0a7bc95a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
@@ -0,0 +1,104 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorCodeGenerationOptions
+    {
+        public static RazorCodeGenerationOptions CreateDefault()
+        {
+            return new DefaultRazorCodeGenerationOptions(
+                indentWithTabs: false,
+                indentSize: 4,
+                designTime: false,
+                suppressChecksum: false,
+                supressMetadataAttributes: false,
+                suppressPrimaryMethodBody: false);
+        }
+
+        public static RazorCodeGenerationOptions CreateDesignTimeDefault()
+        {
+            return new DefaultRazorCodeGenerationOptions(
+                indentWithTabs: false,
+                indentSize: 4,
+                designTime: true,
+                suppressChecksum: false,
+                supressMetadataAttributes: true,
+                suppressPrimaryMethodBody: false);
+        }
+
+        public static RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var builder = new DefaultRazorCodeGenerationOptionsBuilder(designTime: false);
+            configure(builder);
+            var options = builder.Build();
+
+            return options;
+        }
+
+        public static RazorCodeGenerationOptions CreateDesignTime(Action<RazorCodeGenerationOptionsBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var builder = new DefaultRazorCodeGenerationOptionsBuilder(designTime: true)
+            {
+                SuppressMetadataAttributes = true,
+            };
+
+            configure(builder);
+            var options = builder.Build();
+
+            return options;
+        }
+
+        public abstract bool DesignTime { get; }
+
+        public abstract bool IndentWithTabs { get; }
+
+        public abstract int IndentSize { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether to suppress the default <c>#pragma checksum</c> directive in the 
+        /// generated C# code. If <c>false</c> the checkum directive will be included, otherwise it will not be
+        /// generated. Defaults to <c>false</c>, meaning that the checksum will be included.
+        /// </summary>
+        /// <remarks>
+        /// The <c>#pragma checksum</c> is required to enable debugging and should only be supressed for testing
+        /// purposes.
+        /// </remarks>
+        public abstract bool SuppressChecksum { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether to suppress the default metadata attributes in the generated 
+        /// C# code. If <c>false</c> the default attributes will be included, otherwise they will not be generated.
+        /// Defaults to <c>false</c> at run time, meaning that the attributes will be included. Defaults to
+        /// <c>true</c> at design time, meaning that the attributes will not be included.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The <c>Microsoft.AspNetCore.Razor.Runtime</c> package includes a default set of attributes intended
+        /// for runtimes to discover metadata about the compiled code.
+        /// </para>
+        /// <para>
+        /// The default metadata attributes should be suppressed if code generation targets a runtime without
+        /// a reference to <c>Microsoft.AspNetCore.Razor.Runtime</c>, or for testing purposes.
+        /// </para>
+        /// </remarks>
+        public virtual bool SuppressMetadataAttributes { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if an empty body is generated for the primary method.
+        /// </summary>
+        public virtual bool SuppressPrimaryMethodBody { get; protected set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
new file mode 100644
index 0000000000..c1a34e1c33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
@@ -0,0 +1,56 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorCodeGenerationOptionsBuilder
+    {
+        public virtual RazorConfiguration Configuration => null;
+
+        public abstract bool DesignTime { get; }
+
+        public abstract int IndentSize { get; set; }
+
+        public abstract bool IndentWithTabs { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether to suppress the default <c>#pragma checksum</c> directive in the 
+        /// generated C# code. If <c>false</c> the checkum directive will be included, otherwise it will not be
+        /// generated. Defaults to <c>false</c>, meaning that the checksum will be included.
+        /// </summary>
+        /// <remarks>
+        /// The <c>#pragma checksum</c> is required to enable debugging and should only be supressed for testing
+        /// purposes.
+        /// </remarks>
+        public abstract bool SuppressChecksum { get; set; }
+
+        /// <summary>
+        /// Gets or setsa value that indicates whether to suppress the default metadata attributes in the generated 
+        /// C# code. If <c>false</c> the default attributes will be included, otherwise they will not be generated.
+        /// Defaults to <c>false</c> at run time, meaning that the attributes will be included. Defaults to
+        /// <c>true</c> at design time, meaning that the attributes will not be included.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The <c>Microsoft.AspNetCore.Razor.Runtime</c> package includes a default set of attributes intended
+        /// for runtimes to discover metadata about the compiled code.
+        /// </para>
+        /// <para>
+        /// The default metadata attributes should be suppressed if code generation targets a runtime without
+        /// a reference to <c>Microsoft.AspNetCore.Razor.Runtime</c>, or for testing purposes.
+        /// </para>
+        /// </remarks>
+        public virtual bool SuppressMetadataAttributes { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if an empty body is generated for the primary method.
+        /// </summary>
+        public virtual bool SuppressPrimaryMethodBody { get; set; }
+
+        public abstract RazorCodeGenerationOptions Build();
+
+        public virtual void SetDesignTime(bool designTime)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorConfiguration.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorConfiguration.cs
new file mode 100644
index 0000000000..1094b0a432
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorConfiguration.cs
@@ -0,0 +1,118 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorConfiguration : IEquatable<RazorConfiguration>
+    {
+        public static readonly RazorConfiguration Default = new DefaultRazorConfiguration(
+            RazorLanguageVersion.Latest, 
+            "unnamed",
+            Array.Empty<RazorExtension>());
+
+        public static RazorConfiguration Create(
+            RazorLanguageVersion languageVersion,
+            string configurationName,
+            IEnumerable<RazorExtension> extensions)
+        {
+            if (languageVersion == null)
+            {
+                throw new ArgumentNullException(nameof(languageVersion));
+            }
+
+            if (configurationName == null)
+            {
+                throw new ArgumentNullException(nameof(configurationName));
+            }
+
+            if (extensions == null)
+            {
+                throw new ArgumentNullException(nameof(extensions));
+            }
+
+            return new DefaultRazorConfiguration(languageVersion, configurationName, extensions.ToArray());
+        }
+
+        public abstract string ConfigurationName { get; }
+
+        public abstract IReadOnlyList<RazorExtension> Extensions { get; }
+
+        public abstract RazorLanguageVersion LanguageVersion { get; }
+
+        public override bool Equals(object obj)
+        {
+            return base.Equals(obj as RazorConfiguration);
+        }
+
+        public virtual bool Equals(RazorConfiguration other)
+        {
+            if (object.ReferenceEquals(other, null))
+            {
+                return false;
+            }
+
+            if (LanguageVersion != other.LanguageVersion)
+            {
+                return false;
+            }
+
+            if (ConfigurationName != other.ConfigurationName)
+            {
+                return false;
+            }
+
+            if (Extensions.Count != other.Extensions.Count)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < Extensions.Count; i++)
+            {
+                if (Extensions[i].ExtensionName != other.Extensions[i].ExtensionName)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = new HashCodeCombiner();
+            hash.Add(LanguageVersion);
+            hash.Add(ConfigurationName);
+
+            for (var i = 0; i < Extensions.Count; i++)
+            {
+                hash.Add(Extensions[i].ExtensionName);
+            }
+
+            return hash;
+        }
+
+        private class DefaultRazorConfiguration : RazorConfiguration
+        {
+            public DefaultRazorConfiguration(
+                RazorLanguageVersion languageVersion,
+                string configurationName,
+                RazorExtension[] extensions)
+            {
+                LanguageVersion = languageVersion;
+                ConfigurationName = configurationName;
+                Extensions = extensions;
+            }
+
+            public override string ConfigurationName { get; }
+
+            public override IReadOnlyList<RazorExtension> Extensions { get; }
+
+            public override RazorLanguageVersion LanguageVersion { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnostic.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnostic.cs
new file mode 100644
index 0000000000..a4bd3c2b5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnostic.cs
@@ -0,0 +1,64 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorDiagnostic : IEquatable<RazorDiagnostic>, IFormattable
+    {
+        internal static readonly RazorDiagnostic[] EmptyArray = new RazorDiagnostic[0];
+        internal static readonly object[] EmptyArgs = new object[0];
+
+        public abstract string Id { get; }
+
+        public abstract RazorDiagnosticSeverity Severity { get; }
+
+        public abstract SourceSpan Span { get; }
+
+        public abstract string GetMessage(IFormatProvider formatProvider);
+
+        public string GetMessage() => GetMessage(null);
+
+        public abstract bool Equals(RazorDiagnostic other);
+
+        public override abstract int GetHashCode();
+
+        public static RazorDiagnostic Create(RazorDiagnosticDescriptor descriptor, SourceSpan span)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            return new DefaultRazorDiagnostic(descriptor, span, EmptyArgs);
+        }
+
+        public static RazorDiagnostic Create(RazorDiagnosticDescriptor descriptor, SourceSpan span, params object[] args)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            return new DefaultRazorDiagnostic(descriptor, span, args);
+        }
+
+        public override string ToString()
+        {
+            return ((IFormattable)this).ToString(null, null);
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as RazorDiagnostic;
+            return other == null ? false : Equals(other);
+        }
+
+        string IFormattable.ToString(string ignore, IFormatProvider formatProvider)
+        {
+            // Our indices are 0-based, but we we want to print them as 1-based.
+            return $"{Span.FilePath}({Span.LineIndex + 1},{Span.CharacterIndex + 1}): {Severity} {Id}: {GetMessage(formatProvider)}";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
new file mode 100644
index 0000000000..46f35ac3e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
@@ -0,0 +1,191 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public sealed class RazorDiagnosticCollection : IList<RazorDiagnostic>
+    {
+        private readonly List<RazorDiagnostic> _inner;
+
+        public RazorDiagnosticCollection()
+        {
+            _inner = new List<RazorDiagnostic>();
+        }
+
+        public RazorDiagnostic this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= Count)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                }
+
+                return _inner[index];
+            }
+            set
+            {
+                if (index < 0 || index >= Count)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index));
+                }
+
+                _inner[index] = value;
+            }
+        }
+
+        public int Count => _inner.Count;
+
+        public bool IsReadOnly => _inner != null;
+
+        public void Add(RazorDiagnostic item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            _inner.Add(item);
+        }
+
+        public void Clear()
+        {
+            _inner.Clear();
+        }
+
+        public bool Contains(RazorDiagnostic item)
+        {
+            return _inner.Contains(item);
+        }
+
+        public void CopyTo(RazorDiagnostic[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            if (arrayIndex < 0 || arrayIndex > array.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+            }
+            else if (array.Length - arrayIndex < Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+            }
+
+            _inner.CopyTo(array, arrayIndex);
+        }
+
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        IEnumerator<RazorDiagnostic> IEnumerable<RazorDiagnostic>.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public int IndexOf(RazorDiagnostic item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return _inner.IndexOf(item);
+        }
+
+        public void Insert(int index, RazorDiagnostic item)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            _inner.Insert(index, item);
+        }
+
+        public bool Remove(RazorDiagnostic item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return _inner.Remove(item);
+        }
+
+        public void RemoveAt(int index)
+        {
+            if (index < 0 || index >= Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            _inner.RemoveAt(index);
+        }
+
+        public struct Enumerator : IEnumerator<RazorDiagnostic>
+        {
+            private readonly IList<RazorDiagnostic> _items;
+            private int _index;
+
+            public Enumerator(RazorDiagnosticCollection collection)
+            {
+                if (collection == null)
+                {
+                    throw new ArgumentNullException(nameof(collection));
+                }
+
+                _items = collection._inner;
+                _index = -1;
+            }
+
+            public RazorDiagnostic Current
+            {
+                get
+                {
+                    if (_index < 0 || _index >= _items.Count)
+                    {
+                        return null;
+                    }
+
+                    return _items[_index];
+                }
+            }
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
+            }
+
+            public bool MoveNext()
+            {
+                _index++;
+                return _index < _items.Count;
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticDescriptor.cs
new file mode 100644
index 0000000000..6d61173768
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticDescriptor.cs
@@ -0,0 +1,65 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [DebuggerDisplay("{" + nameof(DebuggerToString) + "(),nq}")]
+    public sealed class RazorDiagnosticDescriptor : IEquatable<RazorDiagnosticDescriptor>
+    {
+        private readonly Func<string> _messageFormat;
+
+        public RazorDiagnosticDescriptor(
+            string id,
+            Func<string> messageFormat,
+            RazorDiagnosticSeverity severity)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(id));
+            }
+
+            if (messageFormat == null)
+            {
+                throw new ArgumentNullException(nameof(messageFormat));
+            }
+
+            Id = id;
+            _messageFormat = messageFormat;
+            Severity = severity;
+        }
+
+        public string Id { get; }
+
+        public RazorDiagnosticSeverity Severity { get; }
+
+        public string GetMessageFormat() => _messageFormat();
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as RazorDiagnosticDescriptor);
+        }
+
+        public bool Equals(RazorDiagnosticDescriptor other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            return string.Equals(Id, other.Id, StringComparison.Ordinal);
+        }
+
+        public override int GetHashCode()
+        {
+            return StringComparer.Ordinal.GetHashCode(Id);
+        }
+
+        private string DebuggerToString()
+        {
+            return $@"Error ""{Id}"": ""{GetMessageFormat()}""";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
new file mode 100644
index 0000000000..ef111ac0ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -0,0 +1,785 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal static class RazorDiagnosticFactory
+    {
+        private const string DiagnosticPrefix = "RZ";
+
+        #region General Errors
+
+        // General Errors ID Offset = 0
+
+        internal static readonly RazorDiagnosticDescriptor Directive_BlockDirectiveCannotBeImported =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}0000",
+                () => Resources.BlockDirectiveCannotBeImported,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateDirective_BlockDirectiveCannotBeImported(string directive)
+        {
+            return RazorDiagnostic.Create(Directive_BlockDirectiveCannotBeImported, SourceSpan.Undefined, directive);
+        }
+
+        #endregion
+
+        #region Language Errors
+
+        // Language Errors ID Offset = 1000
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnterminatedStringLiteral =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1000",
+                () => Resources.ParseError_Unterminated_String_Literal,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnterminatedStringLiteral(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_UnterminatedStringLiteral, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_BlockCommentNotTerminated =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1001",
+                () => Resources.ParseError_BlockComment_Not_Terminated,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_BlockCommentNotTerminated(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_BlockCommentNotTerminated, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_HelperDirectiveNotAvailable =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1002",
+                () => Resources.ParseError_HelperDirectiveNotAvailable,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_HelperDirectiveNotAvailable(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_HelperDirectiveNotAvailable, location, SyntaxConstants.CSharp.HelperKeyword);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedWhiteSpaceAtStartOfCodeBlock =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1003",
+                () => Resources.ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedWhiteSpaceAtStartOfCodeBlock(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedWhiteSpaceAtStartOfCodeBlock, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedEndOfFileAtStartOfCodeBlock =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1004",
+                () => Resources.ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedEndOfFileAtStartOfCodeBlock(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedEndOfFileAtStartOfCodeBlock, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedCharacterAtStartOfCodeBlock =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1005",
+                () => Resources.ParseError_Unexpected_Character_At_Start_Of_CodeBlock,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedCharacterAtStartOfCodeBlock(SourceSpan location, string content)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedCharacterAtStartOfCodeBlock, location, content);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_ExpectedEndOfBlockBeforeEOF =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1006",
+                () => Resources.ParseError_Expected_EndOfBlock_Before_EOF,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_ExpectedEndOfBlockBeforeEOF(SourceSpan location, string blockName, string closeBlock, string openBlock)
+        {
+            return RazorDiagnostic.Create(Parsing_ExpectedEndOfBlockBeforeEOF, location, blockName, closeBlock, openBlock);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_ReservedWord =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1007",
+                () => Resources.ParseError_ReservedWord,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_ReservedWord(SourceSpan location, string content)
+        {
+            return RazorDiagnostic.Create(Parsing_ReservedWord, location, content);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_SingleLineControlFlowStatementsNotAllowed =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1008",
+                () => Resources.ParseError_SingleLine_ControlFlowStatements_Not_Allowed,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_SingleLineControlFlowStatementsNotAllowed(SourceSpan location, string expected, string actual)
+        {
+            return RazorDiagnostic.Create(Parsing_SingleLineControlFlowStatementsNotAllowed, location, expected, actual);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1009",
+                () => Resources.ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedNestedCodeBlock =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1010",
+                () => Resources.ParseError_Unexpected_Nested_CodeBlock,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedNestedCodeBlock(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedNestedCodeBlock, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveTokensMustBeSeparatedByWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1011",
+                () => Resources.DirectiveTokensMustBeSeparatedByWhitespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveTokensMustBeSeparatedByWhitespace(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveTokensMustBeSeparatedByWhitespace, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedEOFAfterDirective =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1012",
+                () => Resources.UnexpectedEOFAfterDirective,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedEOFAfterDirective(SourceSpan location, string directiveName, string expectedToken)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedEOFAfterDirective, location, directiveName, expectedToken);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveExpectsTypeName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1013",
+                () => Resources.DirectiveExpectsTypeName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveExpectsTypeName(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveExpectsTypeName, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveExpectsNamespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1014",
+                () => Resources.DirectiveExpectsNamespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveExpectsNamespace(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveExpectsNamespace, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveExpectsIdentifier =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1015",
+                () => Resources.DirectiveExpectsIdentifier,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveExpectsIdentifier(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveExpectsIdentifier, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveExpectsQuotedStringLiteral =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1016",
+                () => Resources.DirectiveExpectsQuotedStringLiteral,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveExpectsQuotedStringLiteral(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveExpectsQuotedStringLiteral, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedDirectiveLiteral =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1017",
+                () => Resources.UnexpectedDirectiveLiteral,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedDirectiveLiteral(SourceSpan location, string directiveName, string expected)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedDirectiveLiteral, location, directiveName, expected);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveMustHaveValue =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1018",
+                () => Resources.ParseError_DirectiveMustHaveValue,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveMustHaveValue(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveMustHaveValue, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_IncompleteQuotesAroundDirective =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1019",
+                () => Resources.ParseError_IncompleteQuotesAroundDirective,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_IncompleteQuotesAroundDirective(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_IncompleteQuotesAroundDirective, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_InvalidTagHelperPrefixValue =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1020",
+                () => Resources.InvalidTagHelperPrefixValue,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_InvalidTagHelperPrefixValue(SourceSpan location, string directiveName, char character, string prefix)
+        {
+            return RazorDiagnostic.Create(Parsing_InvalidTagHelperPrefixValue, location, directiveName, character, prefix);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_MarkupBlockMustStartWithTag =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1021",
+                () => Resources.ParseError_MarkupBlock_Must_Start_With_Tag,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_MarkupBlockMustStartWithTag(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_MarkupBlockMustStartWithTag, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_OuterTagMissingName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1022",
+                () => Resources.ParseError_OuterTagMissingName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_OuterTagMissingName(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_OuterTagMissingName, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TextTagCannotContainAttributes =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1023",
+                () => Resources.ParseError_TextTagCannotContainAttributes,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TextTagCannotContainAttributes(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_TextTagCannotContainAttributes, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnfinishedTag =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1024",
+                () => Resources.ParseError_UnfinishedTag,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnfinishedTag(SourceSpan location, string tagName)
+        {
+            return RazorDiagnostic.Create(Parsing_UnfinishedTag, location, tagName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_MissingEndTag =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1025",
+                () => Resources.ParseError_MissingEndTag,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_MissingEndTag(SourceSpan location, string tagName)
+        {
+            return RazorDiagnostic.Create(Parsing_MissingEndTag, location, tagName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_UnexpectedEndTag =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1026",
+                () => Resources.ParseError_UnexpectedEndTag,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_UnexpectedEndTag(SourceSpan location, string tagName)
+        {
+            return RazorDiagnostic.Create(Parsing_UnexpectedEndTag, location, tagName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_ExpectedCloseBracketBeforeEOF =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1027",
+                () => Resources.ParseError_Expected_CloseBracket_Before_EOF,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_ExpectedCloseBracketBeforeEOF(SourceSpan location, string openBrace, string closeBrace)
+        {
+            return RazorDiagnostic.Create(Parsing_ExpectedCloseBracketBeforeEOF, location, openBrace, closeBrace);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_RazorCommentNotTerminated =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1028",
+                () => Resources.ParseError_RazorComment_Not_Terminated,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_RazorCommentNotTerminated(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_RazorCommentNotTerminated, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelperIndexerAttributeNameMustIncludeKey =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1029",
+                () => Resources.TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelperIndexerAttributeNameMustIncludeKey(SourceSpan location, string attributeName, string tagName)
+        {
+            return RazorDiagnostic.Create(Parsing_TagHelperIndexerAttributeNameMustIncludeKey, location, attributeName, tagName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelperAttributeListMustBeWellFormed =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1030",
+                () => Resources.TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelperAttributeListMustBeWellFormed(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_TagHelperAttributeListMustBeWellFormed, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelpersCannotHaveCSharpInTagDeclaration =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1031",
+                () => Resources.TagHelpers_CannotHaveCSharpInTagDeclaration,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelpersCannotHaveCSharpInTagDeclaration(SourceSpan location, string tagName)
+        {
+            return RazorDiagnostic.Create(Parsing_TagHelpersCannotHaveCSharpInTagDeclaration, location, tagName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelperAttributesMustHaveAName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1032",
+                () => Resources.TagHelpers_AttributesMustHaveAName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelperAttributesMustHaveAName(SourceSpan location, string tagName)
+        {
+            return RazorDiagnostic.Create(Parsing_TagHelperAttributesMustHaveAName, location, tagName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelperMustNotHaveAnEndTag =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1033",
+                () => Resources.TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelperMustNotHaveAnEndTag(SourceSpan location, string tagName, string displayName, TagStructure tagStructure)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                Parsing_TagHelperMustNotHaveAnEndTag,
+                location,
+                tagName,
+                displayName,
+                tagStructure);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelperFoundMalformedTagHelper =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1034",
+                () => Resources.TagHelpersParseTreeRewriter_FoundMalformedTagHelper,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelperFoundMalformedTagHelper(SourceSpan location, string tagName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                Parsing_TagHelperFoundMalformedTagHelper,
+                location,
+                tagName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_TagHelperMissingCloseAngle =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1035",
+                () => Resources.TagHelpersParseTreeRewriter_MissingCloseAngle,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_TagHelperMissingCloseAngle(SourceSpan location, string tagName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                Parsing_TagHelperMissingCloseAngle,
+                location,
+                tagName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_InvalidTagHelperLookupText =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1036",
+                () => Resources.InvalidTagHelperLookupText,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_InvalidTagHelperLookupText(SourceSpan location, string lookupText)
+        {
+            return RazorDiagnostic.Create(Parsing_InvalidTagHelperLookupText, location, lookupText);
+        }
+
+        #endregion
+
+        #region Semantic Errors
+
+        // Semantic Errors ID Offset = 2000
+
+        internal static readonly RazorDiagnosticDescriptor CodeTarget_UnsupportedExtension =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2000",
+                () => Resources.Diagnostic_CodeTarget_UnsupportedExtension,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateCodeTarget_UnsupportedExtension(string documentKind, Type extensionType)
+        {
+            return RazorDiagnostic.Create(CodeTarget_UnsupportedExtension, SourceSpan.Undefined, documentKind, extensionType.Name);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DuplicateDirective =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2001",
+                () => Resources.DuplicateDirective,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DuplicateDirective(SourceSpan location, string directive)
+        {
+            return RazorDiagnostic.Create(Parsing_DuplicateDirective, location, directive);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_SectionsCannotBeNested =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2002",
+                () => Resources.ParseError_Sections_Cannot_Be_Nested,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_SectionsCannotBeNested(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_SectionsCannotBeNested, location, Resources.SectionExample);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_InlineMarkupBlocksCannotBeNested =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2003",
+                () => Resources.ParseError_InlineMarkup_Blocks_Cannot_Be_Nested,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_InlineMarkupBlocksCannotBeNested(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_InlineMarkupBlocksCannotBeNested, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2004",
+                () => Resources.ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Parsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock, location);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveMustAppearAtStartOfLine =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2005",
+                () => Resources.DirectiveMustAppearAtStartOfLine,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveMustAppearAtStartOfLine(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveMustAppearAtStartOfLine, location, directiveName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_CodeBlocksNotSupportedInAttributes =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2006",
+                () => Resources.TagHelpers_CodeBlocks_NotSupported_InAttributes,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_CodeBlocksNotSupportedInAttributes(SourceSpan location)
+        {
+            var diagnostic = RazorDiagnostic.Create(TagHelper_CodeBlocksNotSupportedInAttributes, location);
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InlineMarkupBlocksNotSupportedInAttributes =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2007",
+                () => Resources.TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InlineMarkupBlocksNotSupportedInAttributes(SourceSpan location, string expectedTypeName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InlineMarkupBlocksNotSupportedInAttributes,
+                location,
+                expectedTypeName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_EmptyBoundAttribute =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2008",
+                () => Resources.RewriterError_EmptyTagHelperBoundAttribute,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_EmptyBoundAttribute(SourceSpan location, string attributeName, string tagName, string propertyTypeName)
+        {
+            return RazorDiagnostic.Create(TagHelper_EmptyBoundAttribute, location, attributeName, tagName, propertyTypeName);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_CannotHaveNonTagContent =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2009",
+                () => Resources.TagHelperParseTreeRewriter_CannotHaveNonTagContent,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_CannotHaveNonTagContent(SourceSpan location, string tagName, string allowedChildren)
+        {
+            return RazorDiagnostic.Create(TagHelper_CannotHaveNonTagContent, location, tagName, allowedChildren);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidNestedTag =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2010",
+                () => Resources.TagHelperParseTreeRewriter_InvalidNestedTag,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidNestedTag(SourceSpan location, string tagName, string parent, string allowedChildren)
+        {
+            return RazorDiagnostic.Create(TagHelper_InvalidNestedTag, location, tagName, parent, allowedChildren);
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InconsistentTagStructure =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}2011",
+                () => Resources.TagHelperParseTreeRewriter_InconsistentTagStructure,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InconsistentTagStructure(SourceSpan location, string firstDescriptor, string secondDescriptor, string tagName)
+        {
+            return RazorDiagnostic.Create(TagHelper_InconsistentTagStructure, location, firstDescriptor, secondDescriptor, tagName, nameof(TagMatchingRuleDescriptor.TagStructure));
+        }
+
+        #endregion
+
+        #region TagHelper Errors
+
+        // TagHelper Errors ID Offset = 3000
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidRestrictedChildNullOrWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3000",
+                () => Resources.TagHelper_InvalidRestrictedChildNullOrWhitespace,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateTagHelper_InvalidRestrictedChildNullOrWhitespace(string tagHelperDisplayName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidRestrictedChildNullOrWhitespace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidRestrictedChild =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3001",
+                () => Resources.TagHelper_InvalidRestrictedChild,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidRestrictedChild(string tagHelperDisplayName, string restrictedChild, char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidRestrictedChild,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                restrictedChild,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributeNullOrWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3002",
+                () => Resources.TagHelper_InvalidBoundAttributeNullOrWhitespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributeNullOrWhitespace(string tagHelperDisplayName, string propertyDisplayName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributeNullOrWhitespace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributeName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3003",
+                () => Resources.TagHelper_InvalidBoundAttributeName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributeName(
+            string tagHelperDisplayName,
+            string propertyDisplayName,
+            string invalidName,
+            char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributeName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                invalidName,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributeNameStartsWith =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3004",
+                () => Resources.TagHelper_InvalidBoundAttributeNameStartsWith,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributeNameStartsWith(
+            string tagHelperDisplayName,
+            string propertyDisplayName,
+            string invalidName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributeNameStartsWith,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                invalidName,
+                "data-");
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributePrefix =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3005",
+                () => Resources.TagHelper_InvalidBoundAttributePrefix,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributePrefix(
+            string tagHelperDisplayName,
+            string propertyDisplayName,
+            string invalidName,
+            char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributePrefix,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                invalidName,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributePrefixStartsWith =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3006",
+                () => Resources.TagHelper_InvalidBoundAttributePrefixStartsWith,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributePrefixStartsWith(
+            string tagHelperDisplayName,
+            string propertyDisplayName,
+            string invalidName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributePrefixStartsWith,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                invalidName,
+                "data-");
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidTargetedTagNameNullOrWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3007",
+                () => Resources.TagHelper_InvalidTargetedTagNameNullOrWhitespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidTargetedTagNameNullOrWhitespace()
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidTargetedTagNameNullOrWhitespace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidTargetedTagName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3008",
+                () => Resources.TagHelper_InvalidTargetedTagName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidTargetedTagName(string invalidTagName, char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidTargetedTagName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                invalidTagName,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidTargetedParentTagNameNullOrWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3009",
+                () => Resources.TagHelper_InvalidTargetedParentTagNameNullOrWhitespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidTargetedParentTagNameNullOrWhitespace()
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidTargetedParentTagNameNullOrWhitespace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidTargetedParentTagName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3010",
+                () => Resources.TagHelper_InvalidTargetedParentTagName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidTargetedParentTagName(string invalidTagName, char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidTargetedParentTagName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                invalidTagName,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidTargetedAttributeNameNullOrWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3011",
+                () => Resources.TagHelper_InvalidTargetedAttributeNameNullOrWhitespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidTargetedAttributeNameNullOrWhitespace()
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidTargetedAttributeNameNullOrWhitespace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidTargetedAttributeName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3012",
+                () => Resources.TagHelper_InvalidTargetedAttributeName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidTargetedAttributeName(string invalidAttributeName, char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidTargetedAttributeName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                invalidAttributeName,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs
new file mode 100644
index 0000000000..025449f384
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public enum RazorDiagnosticSeverity
+    {
+        // Purposely using the same value as Roslyn here.
+        Error = 3,
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
new file mode 100644
index 0000000000..4ed9ae75e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
@@ -0,0 +1,195 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorEngine
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        private static RazorEngine CreateCore(RazorConfiguration configuration, bool designTime, Action<IRazorEngineBuilder> configure)
+#pragma warning disable CS0618 // Type or member is obsolete
+        {
+            if (configuration == null)
+            {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
+            var builder = new DefaultRazorEngineBuilder(designTime);
+            AddDefaults(builder);
+
+            if (designTime)
+            {
+                AddDefaultDesignTimeFeatures(configuration, builder.Features);
+            }
+            else
+            {
+                AddDefaultRuntimeFeatures(configuration, builder.Features);
+            }
+
+            configure?.Invoke(builder);
+            return builder.Build();
+        }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        private static void AddDefaults(IRazorEngineBuilder builder)
+#pragma warning restore CS0618 // Type or member is obsolete
+        {
+            AddDefaultPhases(builder.Phases);
+            AddDefaultFeatures(builder.Features);
+        }
+
+        private static void AddDefaultPhases(IList<IRazorEnginePhase> phases)
+        {
+            phases.Add(new DefaultRazorParsingPhase());
+            phases.Add(new DefaultRazorSyntaxTreePhase());
+            phases.Add(new DefaultRazorTagHelperBinderPhase());
+            phases.Add(new DefaultRazorIntermediateNodeLoweringPhase());
+            phases.Add(new DefaultRazorDocumentClassifierPhase());
+            phases.Add(new DefaultRazorDirectiveClassifierPhase());
+            phases.Add(new DefaultRazorOptimizationPhase());
+            phases.Add(new DefaultRazorCSharpLoweringPhase());
+        }
+
+        private static void AddDefaultFeatures(ICollection<IRazorEngineFeature> features)
+        {
+            // General extensibility
+            features.Add(new DefaultRazorDirectiveFeature());
+            var targetExtensionFeature = new DefaultRazorTargetExtensionFeature();
+            features.Add(targetExtensionFeature);
+            features.Add(new DefaultMetadataIdentifierFeature());
+
+            // Syntax Tree passes
+            features.Add(new DefaultDirectiveSyntaxTreePass());
+            features.Add(new HtmlNodeOptimizationPass());
+
+            // Intermediate Node Passes
+            features.Add(new DefaultDocumentClassifierPass());
+            features.Add(new MetadataAttributePass());
+            features.Add(new DirectiveRemovalOptimizationPass());
+            features.Add(new DefaultTagHelperOptimizationPass());
+
+            // Default Code Target Extensions
+            targetExtensionFeature.TargetExtensions.Add(new MetadataAttributeTargetExtension());
+
+            // Default configuration
+            var configurationFeature = new DefaultDocumentClassifierPassFeature();
+            configurationFeature.ConfigureClass.Add((document, @class) =>
+            {
+                @class.ClassName = "Template";
+                @class.Modifiers.Add("public");
+            });
+
+            configurationFeature.ConfigureNamespace.Add((document, @namespace) =>
+            {
+                @namespace.Content = "Razor";
+            });
+
+            configurationFeature.ConfigureMethod.Add((document, method) =>
+            {
+                method.MethodName = "ExecuteAsync";
+                method.ReturnType = $"global::{typeof(Task).FullName}";
+
+                method.Modifiers.Add("public");
+                method.Modifiers.Add("async");
+                method.Modifiers.Add("override");
+            });
+
+            features.Add(configurationFeature);
+        }
+
+        private static void AddDefaultRuntimeFeatures(RazorConfiguration configuration, ICollection<IRazorEngineFeature> features)
+        {
+            // Configure options
+            features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: configuration.LanguageVersion));
+            features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+
+            // Intermediate Node Passes
+            features.Add(new PreallocatedTagHelperAttributeOptimizationPass());
+
+            // Code Target Extensions
+            var targetExtension = features.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            Debug.Assert(targetExtension != null);
+
+            targetExtension.TargetExtensions.Add(new DefaultTagHelperTargetExtension());
+            targetExtension.TargetExtensions.Add(new PreallocatedAttributeTargetExtension());
+        }
+
+        private static void AddDefaultDesignTimeFeatures(RazorConfiguration configuration, ICollection<IRazorEngineFeature> features)
+        {
+            // Configure options
+            features.Add(new DefaultRazorParserOptionsFeature(designTime: true, version: configuration.LanguageVersion));
+            features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: true));
+            features.Add(new SuppressChecksumOptionsFeature());
+
+            // Intermediate Node Passes
+            features.Add(new DesignTimeDirectivePass());
+
+            // Code Target Extensions
+            var targetExtension = features.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            Debug.Assert(targetExtension != null);
+
+            targetExtension.TargetExtensions.Add(new DefaultTagHelperTargetExtension());
+            targetExtension.TargetExtensions.Add(new DesignTimeDirectiveTargetExtension());
+        }
+
+        public abstract IReadOnlyList<IRazorEngineFeature> Features { get; }
+
+        public abstract IReadOnlyList<IRazorEnginePhase> Phases { get; }
+
+        public abstract void Process(RazorCodeDocument document);
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static RazorEngine Create()
+        {
+            return Create(configure: null);
+        }
+
+        [Obsolete("This method is obsolete and will be removed in a future version. The recommended alternative is " + nameof(RazorProjectEngine) + "." + nameof(RazorProjectEngine.Create))]
+        public static RazorEngine Create(Action<IRazorEngineBuilder> configure) => CreateCore(RazorConfiguration.Default, false, configure);
+
+        [Obsolete("This method is obsolete and will be removed in a future version. The recommended alternative is " + nameof(RazorProjectEngine) + "." + nameof(RazorProjectEngine.Create))]
+        public static RazorEngine CreateDesignTime()
+        {
+            return CreateDesignTime(configure: null);
+        }
+
+        [Obsolete("This method is obsolete and will be removed in a future version. The recommended alternative is " + nameof(RazorProjectEngine) + "." + nameof(RazorProjectEngine.Create))]
+        public static RazorEngine CreateDesignTime(Action<IRazorEngineBuilder> configure) => CreateCore(RazorConfiguration.Default, true, configure);
+
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static RazorEngine CreateEmpty(Action<IRazorEngineBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var builder = new DefaultRazorEngineBuilder(designTime: false);
+            configure(builder);
+            return builder.Build();
+        }
+
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static RazorEngine CreateDesignTimeEmpty(Action<IRazorEngineBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var builder = new DefaultRazorEngineBuilder(designTime: true);
+            configure(builder);
+            return builder.Build();
+        }
+        #endregion
+    }
+}
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineBuilderExtensions.cs
new file mode 100644
index 0000000000..43c011117c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineBuilderExtensions.cs
@@ -0,0 +1,163 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Extension methods to <see cref="IRazorEngineBuilder" />.
+    /// </summary>
+    [Obsolete("This class is obsolete and will be removed in a future version. The recommended alternative is " + nameof(RazorProjectEngineBuilderExtensions) + ".")]
+    public static class RazorEngineBuilderExtensions
+    {
+        /// <summary>
+        /// Adds the specified <see cref="DirectiveDescriptor"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IRazorEngineBuilder"/>.</param>
+        /// <param name="directive">The <see cref="DirectiveDescriptor"/> to add.</param>
+        /// <returns>The <see cref="IRazorEngineBuilder"/>.</returns>
+        public static IRazorEngineBuilder AddDirective(this IRazorEngineBuilder builder, DirectiveDescriptor directive)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            var directiveFeature = GetDirectiveFeature(builder);
+            directiveFeature.Directives.Add(directive);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds the specified <see cref="ICodeTargetExtension"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IRazorEngineBuilder"/>.</param>
+        /// <param name="extension">The <see cref="ICodeTargetExtension"/> to add.</param>
+        /// <returns>The <see cref="IRazorEngineBuilder"/>.</returns>
+        public static IRazorEngineBuilder AddTargetExtension(this IRazorEngineBuilder builder, ICodeTargetExtension extension)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (extension == null)
+            {
+                throw new ArgumentNullException(nameof(extension));
+            }
+
+            var targetExtensionFeature = GetTargetExtensionFeature(builder);
+            targetExtensionFeature.TargetExtensions.Add(extension);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the base type for generated types.
+        /// </summary>
+        /// <param name="builder">The <see cref="IRazorEngineBuilder"/>.</param>
+        /// <param name="baseType">The name of the base type.</param>
+        /// <returns>The <see cref="IRazorEngineBuilder"/>.</returns>
+        public static IRazorEngineBuilder SetBaseType(this IRazorEngineBuilder builder, string baseType)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var configurationFeature = GetDefaultDocumentClassifierPassFeature(builder);
+            configurationFeature.ConfigureClass.Add((document, @class) => @class.BaseType = baseType);
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers a class configuration delegate that gets invoked during code generation.
+        /// </summary>
+        /// <param name="builder">The <see cref="IRazorEngineBuilder"/>.</param>
+        /// <param name="configureClass"><see cref="Action"/> invoked to configure 
+        /// <see cref="ClassDeclarationIntermediateNode"/> during code generation.</param>
+        /// <returns>The <see cref="IRazorEngineBuilder"/>.</returns>
+        public static IRazorEngineBuilder ConfigureClass(
+            this IRazorEngineBuilder builder, 
+            Action<RazorCodeDocument, ClassDeclarationIntermediateNode> configureClass)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (configureClass == null)
+            {
+                throw new ArgumentNullException(nameof(configureClass));
+            }
+
+            var configurationFeature = GetDefaultDocumentClassifierPassFeature(builder);
+            configurationFeature.ConfigureClass.Add(configureClass);
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the namespace for generated types.
+        /// </summary>
+        /// <param name="builder">The <see cref="IRazorEngineBuilder"/>.</param>
+        /// <param name="namespaceName">The name of the namespace.</param>
+        /// <returns>The <see cref="IRazorEngineBuilder"/>.</returns>
+        public static IRazorEngineBuilder SetNamespace(this IRazorEngineBuilder builder, string namespaceName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var configurationFeature = GetDefaultDocumentClassifierPassFeature(builder);
+            configurationFeature.ConfigureNamespace.Add((document, @namespace) => @namespace.Content = namespaceName);
+            return builder;
+        }
+
+        private static IRazorDirectiveFeature GetDirectiveFeature(IRazorEngineBuilder builder)
+        {
+            var directiveFeature = builder.Features.OfType<IRazorDirectiveFeature>().FirstOrDefault();
+            if (directiveFeature == null)
+            {
+                directiveFeature = new DefaultRazorDirectiveFeature();
+                builder.Features.Add(directiveFeature);
+            }
+
+            return directiveFeature;
+        }
+
+        private static IRazorTargetExtensionFeature GetTargetExtensionFeature(IRazorEngineBuilder builder)
+        {
+            var targetExtensionFeature = builder.Features.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            if (targetExtensionFeature == null)
+            {
+                targetExtensionFeature = new DefaultRazorTargetExtensionFeature();
+                builder.Features.Add(targetExtensionFeature);
+            }
+
+            return targetExtensionFeature;
+        }
+
+        private static DefaultDocumentClassifierPassFeature GetDefaultDocumentClassifierPassFeature(IRazorEngineBuilder builder)
+        {
+            var configurationFeature = builder.Features.OfType<DefaultDocumentClassifierPassFeature>().FirstOrDefault();
+            if (configurationFeature == null)
+            {
+                configurationFeature = new DefaultDocumentClassifierPassFeature();
+                builder.Features.Add(configurationFeature);
+            }
+
+            return configurationFeature;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineFeatureBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineFeatureBase.cs
new file mode 100644
index 0000000000..d19d8ae489
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngineFeatureBase.cs
@@ -0,0 +1,69 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorEngineFeatureBase : IRazorEngineFeature
+    {
+        private RazorEngine _engine;
+
+        public RazorEngine Engine
+        {
+            get { return _engine; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _engine = value;
+                OnInitialized();
+            }
+        }
+
+        protected TFeature GetRequiredFeature<TFeature>() where TFeature : IRazorEngineFeature
+        {
+            if (Engine == null)
+            {
+                throw new InvalidOperationException(Resources.FormatFeatureMustBeInitialized(nameof(Engine)));
+            }
+
+            var feature = Engine.Features.OfType<TFeature>().FirstOrDefault();
+            ThrowForMissingFeatureDependency<TFeature>(feature);
+
+            return feature;
+        }
+
+        protected void ThrowForMissingDocumentDependency<TDocumentDependency>(TDocumentDependency value)
+        {
+            if (value == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatFeatureDependencyMissing(
+                        GetType().Name,
+                        typeof(TDocumentDependency).Name,
+                        typeof(RazorCodeDocument).Name));
+            }
+        }
+
+        protected void ThrowForMissingFeatureDependency<TEngineDependency>(TEngineDependency value)
+        {
+            if (value == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatFeatureDependencyMissing(
+                        GetType().Name,
+                        typeof(TEngineDependency).Name,
+                        typeof(RazorEngine).Name));
+            }
+        }
+
+        protected virtual void OnInitialized()
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEnginePhaseBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEnginePhaseBase.cs
new file mode 100644
index 0000000000..460e3367d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEnginePhaseBase.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorEnginePhaseBase : IRazorEnginePhase
+    {
+        private RazorEngine _engine;
+
+        public RazorEngine Engine
+        {
+            get { return _engine; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _engine = value;
+                OnIntialized();
+            }
+        }
+
+        public void Execute(RazorCodeDocument codeDocument)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (Engine == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPhaseMustBeInitialized(nameof(Engine)));
+            }
+
+            ExecuteCore(codeDocument);
+        }
+
+        protected T GetRequiredFeature<T>()
+        {
+            if (Engine == null)
+            {
+                throw new InvalidOperationException(Resources.FormatFeatureMustBeInitialized(nameof(Engine)));
+            }
+
+            var feature = Engine.Features.OfType<T>().FirstOrDefault();
+            ThrowForMissingFeatureDependency<T>(feature);
+
+            return feature;
+        }
+
+        protected void ThrowForMissingDocumentDependency<TDocumentDependency>(TDocumentDependency value)
+        {
+            if (value == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatPhaseDependencyMissing(
+                        GetType().Name,
+                        typeof(TDocumentDependency).Name,
+                        typeof(RazorCodeDocument).Name));
+            }
+        }
+
+        protected void ThrowForMissingFeatureDependency<TEngineDependency>(TEngineDependency value)
+        {
+            if (value == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatPhaseDependencyMissing(
+                        GetType().Name,
+                        typeof(TEngineDependency).Name,
+                        typeof(RazorEngine).Name));
+            }
+        }
+
+        protected virtual void OnIntialized()
+        {
+        }
+
+        protected abstract void ExecuteCore(RazorCodeDocument codeDocument);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtension.cs
new file mode 100644
index 0000000000..feb94b0ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtension.cs
@@ -0,0 +1,10 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorExtension
+    {
+        public abstract string ExtensionName { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtensionInitializer.cs
new file mode 100644
index 0000000000..5117115af6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorExtensionInitializer.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorExtensionInitializer
+    {
+        public abstract void Initialize(RazorProjectEngineBuilder builder);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs
new file mode 100644
index 0000000000..5d34d258f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs
@@ -0,0 +1,138 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [DebuggerDisplay("{" + nameof(DebuggerToString) + "(),nq}")]
+    public sealed class RazorLanguageVersion : IEquatable<RazorLanguageVersion>, IComparable<RazorLanguageVersion>
+    {
+        public static readonly RazorLanguageVersion Version_1_0 = new RazorLanguageVersion(1, 0);
+
+        public static readonly RazorLanguageVersion Version_1_1 = new RazorLanguageVersion(1, 1);
+
+        public static readonly RazorLanguageVersion Version_2_0 = new RazorLanguageVersion(2, 0);
+
+        public static readonly RazorLanguageVersion Version_2_1 = new RazorLanguageVersion(2, 1);
+
+        public static readonly RazorLanguageVersion Version_3_0 = new RazorLanguageVersion(3, 0);
+
+        public static readonly RazorLanguageVersion Latest = Version_3_0;
+
+        public static readonly RazorLanguageVersion Experimental = new RazorLanguageVersion(1337, 1337);
+
+        public static bool TryParse(string languageVersion, out RazorLanguageVersion version)
+        {
+            if (languageVersion == null)
+            {
+                throw new ArgumentNullException(nameof(languageVersion));
+            }
+
+            if (string.Equals(languageVersion, "latest", StringComparison.OrdinalIgnoreCase))
+            {
+                version = Latest;
+                return true;
+            }
+            else if (string.Equals(languageVersion, "experimental", StringComparison.OrdinalIgnoreCase))
+            {
+                version = Experimental;
+                return true;
+            }
+            else if (languageVersion == "3.0")
+            {
+                version = Version_3_0;
+                return true;
+            }
+            else if (languageVersion == "2.1")
+            {
+                version = Version_2_1;
+                return true; 
+            }
+            else if (languageVersion == "2.0")
+            {
+                version = Version_2_0;
+                return true;
+            }
+            else if (languageVersion == "1.1")
+            {
+                version = Version_1_1;
+                return true;
+            }
+            else if (languageVersion == "1.0")
+            {
+                version = Version_1_0;
+                return true;
+            }
+
+            version = null;
+            return false;
+        }
+
+        public static RazorLanguageVersion Parse(string languageVersion)
+        {
+            if (languageVersion == null)
+            {
+                throw new ArgumentNullException(nameof(languageVersion));
+            }
+
+            if (TryParse(languageVersion, out var parsed))
+            {
+                return parsed;
+            }
+
+            throw new ArgumentException(
+                Resources.FormatRazorLanguageVersion_InvalidVersion(languageVersion), 
+                nameof(languageVersion));
+        }
+
+        // Don't want anyone else constructing language versions.
+        private RazorLanguageVersion(int major, int minor)
+        {
+            Major = major;
+            Minor = minor;
+        }
+
+        public int Major { get; }
+
+        public int Minor { get; }
+
+        public int CompareTo(RazorLanguageVersion other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            var result = Major.CompareTo(other.Major);
+            if (result != 0)
+            {
+                return result;
+            }
+
+            return Minor.CompareTo(other.Minor);
+        }
+
+        public bool Equals(RazorLanguageVersion other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            // We're the only one who can create RazorLanguageVersions so reference equality is sufficient.
+            return ReferenceEquals(this, other);
+        }
+
+        public override int GetHashCode()
+        {
+            // We don't need to do anything special for our hash code since reference equality is what we're going for.
+            return base.GetHashCode();
+        }
+        
+        public override string ToString() => $"{Major}.{Minor}";
+
+        private string DebuggerToString() => $"Razor '{Major}.{Minor}'";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
new file mode 100644
index 0000000000..fbaa2708a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -0,0 +1,57 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal abstract class RazorParserFeatureFlags
+    {
+        public static RazorParserFeatureFlags Create(RazorLanguageVersion version)
+        {
+            var allowMinimizedBooleanTagHelperAttributes = false;
+            var allowHtmlCommentsInTagHelpers = false;
+            var experimental_AllowConditionalDataDashAttributes = false;
+
+            if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
+            {
+                // Added in 2.1
+                allowMinimizedBooleanTagHelperAttributes = true;
+                allowHtmlCommentsInTagHelpers = true;
+            }
+
+            if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
+            {
+                experimental_AllowConditionalDataDashAttributes = true;
+            }
+
+            return new DefaultRazorParserFeatureFlags(
+                allowMinimizedBooleanTagHelperAttributes,
+                allowHtmlCommentsInTagHelpers,
+                experimental_AllowConditionalDataDashAttributes);
+        }
+
+        public abstract bool AllowMinimizedBooleanTagHelperAttributes { get; }
+
+        public abstract bool AllowHtmlCommentsInTagHelpers { get; }
+
+        public abstract bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
+
+        private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
+        {
+            public DefaultRazorParserFeatureFlags(
+                bool allowMinimizedBooleanTagHelperAttributes,
+                bool allowHtmlCommentsInTagHelpers,
+                bool experimental_AllowConditionalDataDashAttributes)
+            {
+                AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
+                AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
+                EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
+            }
+
+            public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
+
+            public override bool AllowHtmlCommentsInTagHelpers { get; }
+
+            public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
new file mode 100644
index 0000000000..3438cdfbe3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorParserOptions
+    {
+        public static RazorParserOptions CreateDefault()
+        {
+            return new DefaultRazorParserOptions(
+                Array.Empty<DirectiveDescriptor>(),
+                designTime: false,
+                parseLeadingDirectives: false,
+                version: RazorLanguageVersion.Latest);
+        }
+
+        public static RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: RazorLanguageVersion.Latest);
+            configure(builder);
+            var options = builder.Build();
+
+            return options;
+        }
+
+        public static RazorParserOptions CreateDesignTime(Action<RazorParserOptionsBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: RazorLanguageVersion.Latest);
+            configure(builder);
+            var options = builder.Build();
+
+            return options;
+        }
+
+        public abstract bool DesignTime { get; }
+
+        public abstract IReadOnlyCollection<DirectiveDescriptor> Directives { get; }
+
+        /// <summary>
+        /// Gets a value which indicates whether the parser will parse only the leading directives. If <c>true</c>
+        /// the parser will halt at the first HTML content or C# code block. If <c>false</c> the whole document is parsed.
+        /// </summary>
+        /// <remarks>
+        /// Currently setting this option to <c>true</c> will result in only the first line of directives being parsed.
+        /// In a future release this may be updated to include all leading directive content.
+        /// </remarks>
+        public abstract bool ParseLeadingDirectives { get; }
+
+        public virtual RazorLanguageVersion Version { get; } = RazorLanguageVersion.Latest;
+
+        internal virtual RazorParserFeatureFlags FeatureFlags { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs
new file mode 100644
index 0000000000..b036e3d58d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs
@@ -0,0 +1,26 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorParserOptionsBuilder
+    {
+        public virtual RazorConfiguration Configuration => null;
+
+        public abstract bool DesignTime { get; }
+
+        public abstract ICollection<DirectiveDescriptor> Directives { get; }
+
+        public abstract bool ParseLeadingDirectives { get; set; }
+
+        public virtual RazorLanguageVersion LanguageVersion { get; }
+
+        public abstract RazorParserOptions Build();
+
+        public virtual void SetDesignTime(bool designTime)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
new file mode 100644
index 0000000000..74b772e142
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
@@ -0,0 +1,138 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// An abstraction for working with a project containing Razor files.
+    /// </summary>
+    public abstract class RazorProject
+    {
+        /// <summary>
+        /// Gets a sequence of <see cref="RazorProjectItem"/> under the specific path in the project.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        /// <returns>The sequence of <see cref="RazorProjectItem"/>.</returns>
+        public abstract IEnumerable<RazorProjectItem> EnumerateItems(string basePath);
+
+        /// <summary>
+        /// Gets a <see cref="RazorProjectItem"/> for the specified path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>The <see cref="RazorProjectItem"/>.</returns>
+        public abstract RazorProjectItem GetItem(string path);
+
+        /// <summary>
+        /// Gets the sequence of files named <paramref name="fileName"/> that are applicable to the specified path.
+        /// </summary>
+        /// <param name="path">The path of a project item.</param>
+        /// <param name="fileName">The file name to seek.</param>
+        /// <returns>A sequence of applicable <see cref="RazorProjectItem"/> instances.</returns>
+        /// <remarks>
+        /// This method returns paths starting from the directory of <paramref name="path"/> and
+        /// traverses to the project root.
+        /// e.g.
+        /// /Views/Home/View.cshtml -> [ /Views/Home/FileName.cshtml, /Views/FileName.cshtml, /FileName.cshtml ]
+        /// </remarks>
+        public IEnumerable<RazorProjectItem> FindHierarchicalItems(string path, string fileName)
+        {
+            return FindHierarchicalItems(basePath: "/", path: path, fileName: fileName);
+        }
+
+        /// <summary>
+        /// Gets the sequence of files named <paramref name="fileName"/> that are applicable to the specified path.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        /// <param name="path">The path of a project item.</param>
+        /// <param name="fileName">The file name to seek.</param>
+        /// <returns>A sequence of applicable <see cref="RazorProjectItem"/> instances.</returns>
+        /// <remarks>
+        /// This method returns paths starting from the directory of <paramref name="path"/> and
+        /// traverses to the <paramref name="basePath"/>.
+        /// e.g.
+        /// (/Views, /Views/Home/View.cshtml) -> [ /Views/Home/FileName.cshtml, /Views/FileName.cshtml ]
+        /// </remarks>
+        public virtual IEnumerable<RazorProjectItem> FindHierarchicalItems(string basePath, string path, string fileName)
+        {
+            basePath = NormalizeAndEnsureValidPath(basePath);
+            path = NormalizeAndEnsureValidPath(path);
+            if (string.IsNullOrEmpty(fileName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(fileName));
+            }
+
+            Debug.Assert(!string.IsNullOrEmpty(path));
+            if (path.Length == 1)
+            {
+                yield break;
+            }
+
+            if (!path.StartsWith(basePath, StringComparison.OrdinalIgnoreCase))
+            {
+                yield break;
+            }
+
+            StringBuilder builder;
+            var fileNameIndex = path.LastIndexOf('/');
+            var length = path.Length;
+            Debug.Assert(fileNameIndex != -1);
+            if (string.Compare(path, fileNameIndex + 1, fileName, 0, fileName.Length) == 0)
+            {
+                // If the specified path is for the file hierarchy being constructed, then the first file that applies
+                // to it is in a parent directory.
+                builder = new StringBuilder(path, 0, fileNameIndex, fileNameIndex + fileName.Length);
+                length = fileNameIndex;
+            }
+            else
+            {
+                builder = new StringBuilder(path);
+            }
+
+            var maxDepth = 255;
+            var index = length;
+            while (maxDepth-- > 0 && index > basePath.Length && (index = path.LastIndexOf('/', index - 1)) != -1)
+            {
+                builder.Length = index + 1;
+                builder.Append(fileName);
+
+                var itemPath = builder.ToString();
+                yield return GetItem(itemPath);
+            }
+        }
+
+        /// <summary>
+        /// Performs validation for paths passed to methods of <see cref="RazorProject"/>.
+        /// </summary>
+        /// <param name="path">The path to validate.</param>
+        protected virtual string NormalizeAndEnsureValidPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
+            }
+
+            if (path[0] != '/')
+            {
+                throw new ArgumentException(Resources.RazorProject_PathMustStartWithForwardSlash, nameof(path));
+            }
+
+            return path;
+        }
+
+        /// <summary>
+        /// Create a Razor project based on a physical file system.
+        /// </summary>
+        /// <param name="rootDirectoryPath">The directory to root the file system at.</param>
+        /// <returns>A <see cref="RazorProject"/></returns>
+        [Obsolete("This method is obsolete and will be removed in a future version. Please use " + nameof(RazorProjectFileSystem) + "." + nameof(RazorProjectFileSystem.Create) + " instead.")]
+        public static RazorProject Create(string rootDirectoryPath)
+        {
+            return new DefaultRazorProjectFileSystem(rootDirectoryPath);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
new file mode 100644
index 0000000000..d37936dbd6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -0,0 +1,232 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorProjectEngine
+    {
+        public abstract RazorConfiguration Configuration { get; }
+
+        public abstract RazorProjectFileSystem FileSystem { get; }
+
+        public abstract RazorEngine Engine { get; }
+
+        public IReadOnlyList<IRazorEngineFeature> EngineFeatures => Engine.Features;
+
+        public IReadOnlyList<IRazorEnginePhase> Phases => Engine.Phases;
+
+        public abstract IReadOnlyList<IRazorProjectEngineFeature> ProjectFeatures { get; }
+
+        public virtual RazorCodeDocument Process(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var codeDocument = CreateCodeDocumentCore(projectItem);
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        internal virtual RazorCodeDocument Process(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var codeDocument = CreateCodeDocumentCore(source, importSources, tagHelpers);
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        public virtual RazorCodeDocument ProcessDesignTime(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var codeDocument = CreateCodeDocumentDesignTimeCore(projectItem);
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        internal virtual RazorCodeDocument ProcessDesignTime(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var codeDocument = CreateCodeDocumentDesignTimeCore(source, importSources, tagHelpers);
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        protected abstract RazorCodeDocument CreateCodeDocumentCore(RazorProjectItem projectItem);
+
+        internal virtual RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            return RazorCodeDocument.Create(source, importSources);
+        }
+
+        protected abstract RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorProjectItem projectItem);
+
+        internal virtual RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            return RazorCodeDocument.Create(source, importSources);
+        }
+
+        protected abstract void ProcessCore(RazorCodeDocument codeDocument);
+
+        internal static RazorProjectEngine CreateEmpty(Action<RazorProjectEngineBuilder> configure = null)
+        {
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, RazorProjectFileSystem.Empty);
+
+            configure?.Invoke(builder);
+
+            return builder.Build();
+        }
+
+        internal static RazorProjectEngine Create() => Create(configure: null);
+
+        internal static RazorProjectEngine Create(Action<RazorProjectEngineBuilder> configure) => Create(RazorConfiguration.Default, RazorProjectFileSystem.Empty, configure);
+
+        public static RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem) => Create(configuration, fileSystem, configure: null);
+
+        public static RazorProjectEngine Create(
+            RazorConfiguration configuration,
+            RazorProjectFileSystem fileSystem,
+            Action<RazorProjectEngineBuilder> configure)
+        {
+            if (fileSystem == null)
+            {
+                throw new ArgumentNullException(nameof(fileSystem));
+            }
+
+            if (configuration == null)
+            {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
+            var builder = new DefaultRazorProjectEngineBuilder(configuration, fileSystem);
+
+            // The intialization order is somewhat important.
+            //
+            // Defaults -> Extensions -> Additional customization
+            //
+            // This allows extensions to rely on default features, and customizations to override choices made by
+            // extensions.
+            AddDefaultPhases(builder.Phases);
+            AddDefaultsFeatures(builder.Features);
+
+            LoadExtensions(builder, configuration.Extensions);
+
+            configure?.Invoke(builder);
+
+            return builder.Build();
+        }
+
+        private static void AddDefaultPhases(IList<IRazorEnginePhase> phases)
+        {
+            phases.Add(new DefaultRazorParsingPhase());
+            phases.Add(new DefaultRazorSyntaxTreePhase());
+            phases.Add(new DefaultRazorTagHelperBinderPhase());
+            phases.Add(new DefaultRazorIntermediateNodeLoweringPhase());
+            phases.Add(new DefaultRazorDocumentClassifierPhase());
+            phases.Add(new DefaultRazorDirectiveClassifierPhase());
+            phases.Add(new DefaultRazorOptimizationPhase());
+            phases.Add(new DefaultRazorCSharpLoweringPhase());
+        }
+
+        private static void AddDefaultsFeatures(ICollection<IRazorFeature> features)
+        {
+            features.Add(new DefaultImportProjectFeature());
+
+            // General extensibility
+            features.Add(new DefaultRazorDirectiveFeature());
+            features.Add(new DefaultMetadataIdentifierFeature());
+
+            // Options features
+            features.Add(new DefaultRazorParserOptionsFactoryProjectFeature());
+            features.Add(new DefaultRazorCodeGenerationOptionsFactoryProjectFeature());
+
+            // Legacy options features
+            //
+            // These features are obsolete as of 2.1. Our code will resolve this but not invoke them.
+            features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Version_2_0));
+            features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+
+            // Syntax Tree passes
+            features.Add(new DefaultDirectiveSyntaxTreePass());
+            features.Add(new HtmlNodeOptimizationPass());
+
+            // Intermediate Node Passes
+            features.Add(new DefaultDocumentClassifierPass());
+            features.Add(new MetadataAttributePass());
+            features.Add(new DesignTimeDirectivePass());
+            features.Add(new DirectiveRemovalOptimizationPass());
+            features.Add(new DefaultTagHelperOptimizationPass());
+            features.Add(new PreallocatedTagHelperAttributeOptimizationPass());
+            features.Add(new EliminateMethodBodyPass());
+
+            // Default Code Target Extensions
+            var targetExtensionFeature = new DefaultRazorTargetExtensionFeature();
+            features.Add(targetExtensionFeature);
+            targetExtensionFeature.TargetExtensions.Add(new MetadataAttributeTargetExtension());
+            targetExtensionFeature.TargetExtensions.Add(new DefaultTagHelperTargetExtension());
+            targetExtensionFeature.TargetExtensions.Add(new PreallocatedAttributeTargetExtension());
+            targetExtensionFeature.TargetExtensions.Add(new DesignTimeDirectiveTargetExtension());
+
+            // Default configuration
+            var configurationFeature = new DefaultDocumentClassifierPassFeature();
+            features.Add(configurationFeature);
+            configurationFeature.ConfigureClass.Add((document, @class) =>
+            {
+                @class.ClassName = "Template";
+                @class.Modifiers.Add("public");
+            });
+
+            configurationFeature.ConfigureNamespace.Add((document, @namespace) =>
+            {
+                @namespace.Content = "Razor";
+            });
+
+            configurationFeature.ConfigureMethod.Add((document, method) =>
+            {
+                method.MethodName = "ExecuteAsync";
+                method.ReturnType = $"global::{typeof(Task).FullName}";
+
+                method.Modifiers.Add("public");
+                method.Modifiers.Add("async");
+                method.Modifiers.Add("override");
+            });
+        }
+
+        private static void LoadExtensions(RazorProjectEngineBuilder builder, IReadOnlyList<RazorExtension> extensions)
+        {
+            for (var i = 0; i < extensions.Count; i++)
+            {
+                // For now we only handle AssemblyExtension - which is not user-constructable. We're keeping a tight
+                // lid on how things work until we add official support for extensibility everywhere. So, this is
+                // intentionally inflexible for the time being.
+                if (extensions[i] is AssemblyExtension extension)
+                {
+                    var initializer = extension.CreateInitializer();
+                    initializer?.Initialize(builder);
+                }
+            }
+
+            // Default extensions.
+            ComponentExtensions.Register(builder);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilder.cs
new file mode 100644
index 0000000000..9fe4356fa9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilder.cs
@@ -0,0 +1,20 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorProjectEngineBuilder
+    {
+        public abstract RazorConfiguration Configuration { get; }
+
+        public abstract RazorProjectFileSystem FileSystem { get; }
+
+        public abstract ICollection<IRazorFeature> Features { get; }
+
+        public abstract IList<IRazorEnginePhase> Phases { get; }
+
+        public abstract RazorProjectEngine Build();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
new file mode 100644
index 0000000000..ae92e4089b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
@@ -0,0 +1,265 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class RazorProjectEngineBuilderExtensions
+    {
+        /// <summary>
+        /// Registers a class configuration delegate that gets invoked during code generation.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="configureClass"><see cref="Action"/> invoked to configure 
+        /// <see cref="ClassDeclarationIntermediateNode"/> during code generation.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder ConfigureClass(
+            this RazorProjectEngineBuilder builder,
+            Action<RazorCodeDocument, ClassDeclarationIntermediateNode> configureClass)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (configureClass == null)
+            {
+                throw new ArgumentNullException(nameof(configureClass));
+            }
+
+            var configurationFeature = GetDefaultDocumentClassifierPassFeature(builder);
+            configurationFeature.ConfigureClass.Add(configureClass);
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the base type for generated types.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="baseType">The name of the base type.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder SetBaseType(this RazorProjectEngineBuilder builder, string baseType)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var configurationFeature = GetDefaultDocumentClassifierPassFeature(builder);
+            configurationFeature.ConfigureClass.Add((document, @class) => @class.BaseType = baseType);
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the namespace for generated types.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="namespaceName">The name of the namespace.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder SetNamespace(this RazorProjectEngineBuilder builder, string namespaceName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var configurationFeature = GetDefaultDocumentClassifierPassFeature(builder);
+            configurationFeature.ConfigureNamespace.Add((document, @namespace) => @namespace.Content = namespaceName);
+            return builder;
+        }
+
+        public static void SetImportFeature(this RazorProjectEngineBuilder builder, IImportProjectFeature feature)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (feature == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            // Remove any existing import features in favor of the new one we're given.
+            var existingFeatures = builder.Features.OfType<IImportProjectFeature>().ToArray();
+            foreach (var existingFeature in existingFeatures)
+            {
+                builder.Features.Remove(existingFeature);
+            }
+
+            builder.Features.Add(feature);
+        }
+
+        /// <summary>
+        /// Adds the specified <see cref="ICodeTargetExtension"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="extension">The <see cref="ICodeTargetExtension"/> to add.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder AddTargetExtension(this RazorProjectEngineBuilder builder, ICodeTargetExtension extension)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (extension == null)
+            {
+                throw new ArgumentNullException(nameof(extension));
+            }
+
+            var targetExtensionFeature = GetTargetExtensionFeature(builder);
+            targetExtensionFeature.TargetExtensions.Add(extension);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds the specified <see cref="DirectiveDescriptor"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="directive">The <see cref="DirectiveDescriptor"/> to add.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder AddDirective(this RazorProjectEngineBuilder builder, DirectiveDescriptor directive)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            var directiveFeature = GetDirectiveFeature(builder);
+            directiveFeature.Directives.Add(directive);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds the provided <see cref="RazorProjectItem" />s as imports to all project items processed
+        /// by the <see cref="RazorProjectEngine"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="imports">The collection of imports.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder AddDefaultImports(this RazorProjectEngineBuilder builder, params string[] imports)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var existingImportFeature = builder.Features.OfType<IImportProjectFeature>().First();
+            var testImportFeature = new AdditionalImportsProjectFeature(existingImportFeature, imports);
+            builder.SetImportFeature(testImportFeature);
+
+            return builder;
+        }
+
+        private static IRazorDirectiveFeature GetDirectiveFeature(RazorProjectEngineBuilder builder)
+        {
+            var directiveFeature = builder.Features.OfType<IRazorDirectiveFeature>().FirstOrDefault();
+            if (directiveFeature == null)
+            {
+                directiveFeature = new DefaultRazorDirectiveFeature();
+                builder.Features.Add(directiveFeature);
+            }
+
+            return directiveFeature;
+        }
+
+        private static IRazorTargetExtensionFeature GetTargetExtensionFeature(RazorProjectEngineBuilder builder)
+        {
+            var targetExtensionFeature = builder.Features.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            if (targetExtensionFeature == null)
+            {
+                targetExtensionFeature = new DefaultRazorTargetExtensionFeature();
+                builder.Features.Add(targetExtensionFeature);
+            }
+
+            return targetExtensionFeature;
+        }
+
+        private static DefaultDocumentClassifierPassFeature GetDefaultDocumentClassifierPassFeature(RazorProjectEngineBuilder builder)
+        {
+            var configurationFeature = builder.Features.OfType<DefaultDocumentClassifierPassFeature>().FirstOrDefault();
+            if (configurationFeature == null)
+            {
+                configurationFeature = new DefaultDocumentClassifierPassFeature();
+                builder.Features.Add(configurationFeature);
+            }
+
+            return configurationFeature;
+        }
+
+        private class AdditionalImportsProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+        {
+            private readonly IImportProjectFeature _existingImportFeature;
+            private readonly IEnumerable<RazorProjectItem> _imports;
+
+            public override RazorProjectEngine ProjectEngine
+            {
+                get => base.ProjectEngine;
+                set
+                {
+                    _existingImportFeature.ProjectEngine = value;
+                    base.ProjectEngine = value;
+                }
+            }
+
+            public AdditionalImportsProjectFeature(IImportProjectFeature existingImportFeature, params string[] imports)
+            {
+                _existingImportFeature = existingImportFeature;
+                _imports = imports.Select(import => new InMemoryProjectItem(import));
+            }
+
+            public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+            {
+                var imports = _existingImportFeature.GetImports(projectItem).ToList();
+                imports.AddRange(_imports);
+
+                return imports;
+            }
+
+            private class InMemoryProjectItem : RazorProjectItem
+            {
+                private readonly byte[] _importBytes;
+
+                public InMemoryProjectItem(string content)
+                {
+                    if (string.IsNullOrEmpty(content))
+                    {
+                        throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(content));
+                    }
+
+                    var preamble = Encoding.UTF8.GetPreamble();
+                    var contentBytes = Encoding.UTF8.GetBytes(content);
+
+                    _importBytes = new byte[preamble.Length + contentBytes.Length];
+                    preamble.CopyTo(_importBytes, 0);
+                    contentBytes.CopyTo(_importBytes, preamble.Length);
+                }
+
+                public override string BasePath => null;
+
+                public override string FilePath => null;
+
+                public override string PhysicalPath => null;
+
+                public override bool Exists => true;
+
+                public override Stream Read() => new MemoryStream(_importBytes);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineFeatureBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineFeatureBase.cs
new file mode 100644
index 0000000000..ec170659e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineFeatureBase.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorProjectEngineFeatureBase : IRazorProjectEngineFeature
+    {
+        private RazorProjectEngine _projectEngine;
+
+        public virtual RazorProjectEngine ProjectEngine
+        {
+            get => _projectEngine;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _projectEngine = value;
+                OnInitialized();
+            }
+        }
+
+        protected virtual void OnInitialized()
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs
new file mode 100644
index 0000000000..799c6bda65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorProjectFileSystem : RazorProject
+    {
+        internal static readonly RazorProjectFileSystem Empty = new EmptyProjectFileSystem();
+
+        /// <summary>
+        /// Create a Razor project file system based off of a root directory.
+        /// </summary>
+        /// <param name="rootDirectoryPath">The directory to root the file system at.</param>
+        /// <returns>A <see cref="RazorProjectFileSystem"/></returns>
+        public new static RazorProjectFileSystem Create(string rootDirectoryPath)
+        {
+            if (string.IsNullOrEmpty(rootDirectoryPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(rootDirectoryPath));
+            }
+
+            return new DefaultRazorProjectFileSystem(rootDirectoryPath);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
new file mode 100644
index 0000000000..6aecb94daa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
@@ -0,0 +1,122 @@
+// 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.Diagnostics;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// An item in a <see cref="RazorProjectFileSystem"/>.
+    /// </summary>
+    [DebuggerDisplay("{" + nameof(DebuggerToString) + "()}")]
+    public abstract class RazorProjectItem
+    {
+        /// <summary>
+        /// Path specified in <see cref="RazorProject.EnumerateItems(string)"/>.
+        /// </summary>
+        public abstract string BasePath { get; }
+
+        /// <summary>
+        /// File path relative to <see cref="BasePath"/>. This property uses the project path syntax,
+        /// using <c>/</c> as a path separator and does not follow the operating system's file system
+        /// conventions.
+        /// </summary>
+        public abstract string FilePath { get; }
+
+        /// <summary>
+        /// The absolute physical (file system) path to the file, including the file name.
+        /// </summary>
+        public abstract string PhysicalPath { get; }
+
+        /// <summary>
+        /// The relative physical (file system) path to the file, including the file name. Relative to the
+        /// physical path of the <see cref="BasePath"/>.
+        /// </summary>
+        public virtual string RelativePhysicalPath => null;
+
+        /// <summary>
+        /// Gets the file contents as readonly <see cref="Stream"/>.
+        /// </summary>
+        /// <returns>The <see cref="Stream"/>.</returns>
+        public abstract Stream Read();
+
+        /// <summary>
+        /// Gets a value that determines if the file exists.
+        /// </summary>
+        public abstract bool Exists { get; }
+
+        /// <summary>
+        /// The root relative path of the item.
+        /// </summary>
+        public string CombinedPath
+        {
+            get
+            {
+                if (BasePath == "/")
+                {
+                    return FilePath;
+                }
+                else
+                {
+                    return BasePath + FilePath;
+                }
+            }
+        }
+
+        /// <summary>
+        /// The extension of the file.
+        /// </summary>
+        public string Extension
+        {
+            get
+            {
+                var index = FileName.LastIndexOf('.');
+                if (index == -1)
+                {
+                    return null;
+                }
+                else
+                {
+                    return FileName.Substring(index);
+                }
+            }
+        }
+
+        /// <summary>
+        /// The name of the file including the extension.
+        /// </summary>
+        public string FileName
+        {
+            get
+            {
+                var index = FilePath.LastIndexOf('/');
+                return FilePath.Substring(index + 1);
+            }
+        }
+
+        /// <summary>
+        /// File path relative to <see cref="BasePath"/> without the extension.
+        /// </summary>
+        public string FilePathWithoutExtension
+        {
+            get
+            {
+                var index = FilePath.LastIndexOf('.');
+                if (index == -1)
+                {
+                    return FilePath;
+                }
+                else
+                {
+                    return FilePath.Substring(0, index);
+                }
+            }
+        }
+
+        private string DebuggerToString()
+        {
+            return CombinedPath;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs
new file mode 100644
index 0000000000..31acb7dfd6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs
@@ -0,0 +1,294 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// The Razor template source.
+    /// </summary>
+    public abstract class RazorSourceDocument
+    {
+        internal const int LargeObjectHeapLimitInChars = 40 * 1024; // 40K Unicode chars is 80KB which is less than the large object heap limit.
+
+        internal static readonly RazorSourceDocument[] EmptyArray = new RazorSourceDocument[0];
+
+        /// <summary>
+        /// Gets the encoding of the text in the original source document.
+        /// </summary>
+        /// <remarks>
+        /// Depending on the method used to create a <see cref="RazorSourceDocument"/> the encoding may be used to
+        /// read the file contents, or it may be solely informational. Refer to the documentation on the method
+        /// used to create the <see cref="RazorSourceDocument"/> for details.
+        /// </remarks>
+        public abstract Encoding Encoding { get; }
+
+        /// <summary>
+        /// Gets the file path of the orginal source document.
+        /// </summary>
+        /// <remarks>
+        /// The file path may be either an absolute path or project-relative path. An absolute path is required
+        /// to generate debuggable assemblies.
+        /// </remarks>
+        public abstract string FilePath { get; }
+
+        /// <summary>
+        /// Gets the project-relative path to the source file. May be <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// The relative path (if provided) is used for display (error messages). The project-relative path may also
+        /// be used to embed checksums of the original source documents to support runtime recompilation of Razor code.
+        /// </remarks>
+        public virtual string RelativePath => null;
+
+        /// <summary>
+        /// Gets a character at given position.
+        /// </summary>
+        /// <param name="position">The position to get the character from.</param>
+        public abstract char this[int position] { get; }
+
+        /// <summary>
+        /// Gets the length of the text in characters.
+        /// </summary>
+        public abstract int Length { get; }
+
+        /// <summary>
+        /// Gets the <see cref="RazorSourceLineCollection"/>.
+        /// </summary>
+        public abstract RazorSourceLineCollection Lines { get; }
+
+        /// <summary>
+        /// Copies a range of characters from the <see cref="RazorSourceDocument"/> to the specified <paramref name="destination"/>.
+        /// </summary>
+        /// <param name="sourceIndex">The index of the first character in this instance to copy.</param>
+        /// <param name="destination">The destination buffer.</param>
+        /// <param name="destinationIndex">The index in destination at which the copy operation begins.</param>
+        /// <param name="count">The number of characters in this instance to copy to destination.</param>
+        public abstract void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count);
+
+        /// <summary>
+        /// Calculates the checksum for the <see cref="RazorSourceDocument"/>.
+        /// </summary>
+        /// <returns>The checksum.</returns>
+        public abstract byte[] GetChecksum();
+
+        /// <summary>
+        /// Gets the name of the algorithm used to compute the checksum returned by <see cref="GetChecksum"/>.
+        /// </summary>
+        /// <remarks>
+        /// This member did not exist in the 2.0 release, so it is possible for an implementation to return
+        /// the wrong value (or <c>null</c>). Implementations of <see cref="RazorSourceDocument"/> should
+        /// override this member and specify their choice of hash algorithm even if it is the same as the
+        /// default (<c>SHA1</c>).
+        /// </remarks>
+        public virtual string GetChecksumAlgorithm()
+        {
+            return HashAlgorithmName.SHA1.Name;
+        }
+
+        /// <summary>
+        /// Gets the file path in a format that should be used for display.
+        /// </summary>
+        /// <returns>The <see cref="RelativePath"/> if set, or the <see cref="FilePath"/>.</returns>
+        public virtual string GetFilePathForDisplay()
+        {
+            return RelativePath ?? FilePath;
+        }
+
+        /// <summary>
+        /// Reads the <see cref="RazorSourceDocument"/> from the specified <paramref name="stream"/>.
+        /// </summary>
+        /// <param name="stream">The <see cref="Stream"/> to read from.</param>
+        /// <param name="fileName">The file name of the template.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        public static RazorSourceDocument ReadFrom(Stream stream, string fileName)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            var properties = new RazorSourceDocumentProperties(fileName, relativePath: null);
+            return new StreamSourceDocument(stream, null, properties);
+        }
+
+        /// <summary>
+        /// Reads the <see cref="RazorSourceDocument"/> from the specified <paramref name="stream"/>.
+        /// </summary>
+        /// <param name="stream">The <see cref="Stream"/> to read from.</param>
+        /// <param name="fileName">The file name of the template.</param>
+        /// <param name="encoding">The <see cref="System.Text.Encoding"/> to use to read the <paramref name="stream"/>.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        public static RazorSourceDocument ReadFrom(Stream stream, string fileName, Encoding encoding)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var properties = new RazorSourceDocumentProperties(fileName, relativePath: null);
+            return new StreamSourceDocument(stream, encoding, properties);
+        }
+
+        /// <summary>
+        /// Reads the <see cref="RazorSourceDocument"/> from the specified <paramref name="stream"/>.
+        /// </summary>
+        /// <param name="stream">The <see cref="Stream"/> to read from.</param>
+        /// <param name="encoding">The <see cref="System.Text.Encoding"/> to use to read the <paramref name="stream"/>.</param>
+        /// <param name="properties">Properties to configure the <see cref="RazorSourceDocument"/>.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        public static RazorSourceDocument ReadFrom(Stream stream, Encoding encoding, RazorSourceDocumentProperties properties)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+            
+            return new StreamSourceDocument(stream, encoding, properties);
+        }
+
+        /// <summary>
+        /// Reads the <see cref="RazorSourceDocument"/> from the specified <paramref name="projectItem"/>.
+        /// </summary>
+        /// <param name="projectItem">The <see cref="RazorProjectItem"/> to read from.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        public static RazorSourceDocument ReadFrom(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            // ProjectItem.PhysicalPath is usually an absolute (rooted) path.
+            var filePath = projectItem.PhysicalPath; 
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // Fall back to the relative path only if necessary.
+                filePath = projectItem.RelativePhysicalPath;
+            }
+
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // Then fall back to the FilePath (yeah it's a bad name) which is like an MVC view engine path
+                // It's much better to have something than nothing.
+                filePath = projectItem.FilePath;
+            }
+
+            using (var stream = projectItem.Read())
+            {
+                // Autodetect the encoding.
+                var relativePath = projectItem.RelativePhysicalPath ?? projectItem.FilePath;
+                return new StreamSourceDocument(stream, null, new RazorSourceDocumentProperties(filePath, relativePath));
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RazorSourceDocument"/> from the specified <paramref name="content"/>.
+        /// </summary>
+        /// <param name="content">The source document content.</param>
+        /// <param name="fileName">The file name of the <see cref="RazorSourceDocument"/>.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        /// <remarks>Uses <see cref="System.Text.Encoding.UTF8" /></remarks>
+        public static RazorSourceDocument Create(string content, string fileName)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            return Create(content, fileName, Encoding.UTF8);
+        }
+           
+
+        /// <summary>
+        /// Creates a <see cref="RazorSourceDocument"/> from the specified <paramref name="content"/>.
+        /// </summary>
+        /// <param name="content">The source document content.</param>
+        /// <param name="properties">Properties to configure the <see cref="RazorSourceDocument"/>.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        /// <remarks>Uses <see cref="System.Text.Encoding.UTF8" /></remarks>
+        public static RazorSourceDocument Create(string content, RazorSourceDocumentProperties properties)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+
+            return Create(content, Encoding.UTF8, properties);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RazorSourceDocument"/> from the specified <paramref name="content"/>.
+        /// </summary>
+        /// <param name="content">The source document content.</param>
+        /// <param name="fileName">The file name of the <see cref="RazorSourceDocument"/>.</param>
+        /// <param name="encoding">The <see cref="System.Text.Encoding"/> of the file <paramref name="content"/> was read from.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        public static RazorSourceDocument Create(string content, string fileName, Encoding encoding)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var properties = new RazorSourceDocumentProperties(fileName, relativePath: null);
+            return new StringSourceDocument(content, encoding, properties);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RazorSourceDocument"/> from the specified <paramref name="content"/>.
+        /// </summary>
+        /// <param name="content">The source document content.</param>
+        /// <param name="encoding">The encoding of the source document.</param>
+        /// <param name="properties">Properties to configure the <see cref="RazorSourceDocument"/>.</param>
+        /// <returns>The <see cref="RazorSourceDocument"/>.</returns>
+        public static RazorSourceDocument Create(string content, Encoding encoding, RazorSourceDocumentProperties properties)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+
+            return new StringSourceDocument(content, encoding, properties);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocumentProperties.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocumentProperties.cs
new file mode 100644
index 0000000000..ed48c00181
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocumentProperties.cs
@@ -0,0 +1,57 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Use to configure optional properties for creating a <see cref="RazorSourceDocument"/>.
+    /// </summary>
+    public sealed class RazorSourceDocumentProperties
+    {
+        /// <summary>
+        /// A <see cref="RazorSourceDocumentProperties"/> with default values.
+        /// </summary>
+        internal static readonly RazorSourceDocumentProperties Default = new RazorSourceDocumentProperties();
+
+        /// <summary>
+        /// Creates a new <see cref="RazorSourceDocumentProperties"/>.
+        /// </summary>
+        public RazorSourceDocumentProperties()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="RazorSourceDocumentProperties"/>.
+        /// </summary>
+        /// <param name="filePath">
+        /// The path to the source file. Provide an rooted path if possible. May be <c>null</c>.
+        /// </param>
+        /// <param name="relativePath">
+        /// The project-relative path to the source file. May be <c>null</c>. Must be a non-rooted path.
+        /// </param>
+        public RazorSourceDocumentProperties(string filePath, string relativePath)
+        {
+            // We don't do any magic or validation here since we don't need to do any I/O or interation
+            // with the file system. We didn't validate anything in 2.0 so we don't want any compat risk.
+            FilePath = filePath;
+            RelativePath = relativePath;
+        }
+
+        /// <summary>
+        /// Gets the path to the source file. May be an absolute or project-relative path. May be <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// An absolute path must be provided to generate debuggable assemblies.
+        /// </remarks>
+        public string FilePath { get; }
+
+        /// <summary>
+        /// Gets the project-relative path to the source file. May be <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// The relative path (if provided) is used for display (error messages). The project-relative path may also
+        /// be used to embed checksums of the original source documents to support runtime recompilation of Razor code.
+        /// </remarks>
+        public string RelativePath { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceLineCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceLineCollection.cs
new file mode 100644
index 0000000000..211ea39ad0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceLineCollection.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorSourceLineCollection
+    {
+        public abstract int Count { get; }
+
+        public abstract int GetLineLength(int index);
+
+        internal abstract SourceLocation GetLocation(int position);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs
new file mode 100644
index 0000000000..340129b2aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorSyntaxTree
+    {
+        internal static RazorSyntaxTree Create(
+            SyntaxNode root,
+            RazorSourceDocument source,
+            IEnumerable<RazorDiagnostic> diagnostics,
+            RazorParserOptions options)
+        {
+            if (root == null)
+            {
+                throw new ArgumentNullException(nameof(root));
+            }
+
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            if (diagnostics == null)
+            {
+                throw new ArgumentNullException(nameof(diagnostics));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            return new DefaultRazorSyntaxTree(root, source, new List<RazorDiagnostic>(diagnostics), options);
+        }
+
+        public static RazorSyntaxTree Parse(RazorSourceDocument source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            return Parse(source, options: null);
+        }
+
+        public static RazorSyntaxTree Parse(RazorSourceDocument source, RazorParserOptions options)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+            
+            var parser = new RazorParser(options ?? RazorParserOptions.CreateDefault());
+            return parser.Parse(source);
+        }
+
+        public abstract IReadOnlyList<RazorDiagnostic> Diagnostics { get; }
+
+        public abstract RazorParserOptions Options { get; }
+
+        internal abstract SyntaxNode Root { get; }
+
+        public abstract RazorSourceDocument Source { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs
new file mode 100644
index 0000000000..298666b56f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs
@@ -0,0 +1,241 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Entry point to parse Razor files and generate code.
+    /// </summary>
+    public class RazorTemplateEngine
+    {
+        private RazorTemplateEngineOptions _options;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="RazorTemplateEngine"/>.
+        /// </summary>
+        /// <param name="engine">The <see cref="RazorEngine"/>.</param>
+        /// <param name="project">The <see cref="RazorProject"/>.</param>
+        public RazorTemplateEngine(
+            RazorEngine engine,
+            RazorProject project)
+        {
+            if (engine == null)
+            {
+                throw new ArgumentNullException(nameof(engine));
+            }
+
+            if (project == null)
+            {
+                throw new ArgumentNullException(nameof(project));
+            }
+
+            Engine = engine;
+            Project = project;
+            _options = new RazorTemplateEngineOptions();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="RazorEngine"/>.
+        /// </summary>
+        public RazorEngine Engine { get; }
+
+        /// <summary>
+        /// Gets the <see cref="RazorProject"/>.
+        /// </summary>
+        public RazorProject Project { get; }
+
+        /// <summary>
+        /// Options to configure <see cref="RazorTemplateEngine"/>.
+        /// </summary>
+        public RazorTemplateEngineOptions Options
+        {
+            get
+            {
+                return _options;
+            }
+            set
+            {
+                _options = value ?? throw new ArgumentNullException(nameof(value));
+            }
+        }
+
+        /// <summary>
+        /// Parses the template specified by the project item <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">The template path.</param>
+        /// <returns>The <see cref="RazorCSharpDocument"/>.</returns>
+        public RazorCSharpDocument GenerateCode(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
+            }
+
+            var projectItem = Project.GetItem(path);
+            return GenerateCode(projectItem);
+        }
+
+        /// <summary>
+        /// Parses the template specified by <paramref name="projectItem"/>.
+        /// </summary>
+        /// <param name="projectItem">The <see cref="RazorProjectItem"/>.</param>
+        /// <returns>The <see cref="RazorCSharpDocument"/>.</returns>
+        public RazorCSharpDocument GenerateCode(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            if (!projectItem.Exists)
+            {
+                throw new InvalidOperationException(Resources.FormatRazorTemplateEngine_ItemCouldNotBeFound(projectItem.FilePath));
+            }
+
+            var codeDocument = CreateCodeDocument(projectItem);
+            return GenerateCode(codeDocument);
+        }
+
+        /// <summary>
+        /// Parses the template specified by <paramref name="codeDocument"/>.
+        /// </summary>
+        /// <param name="codeDocument">The <see cref="RazorProjectItem"/>.</param>
+        /// <returns>The <see cref="RazorCSharpDocument"/>.</returns>
+        public virtual RazorCSharpDocument GenerateCode(RazorCodeDocument codeDocument)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            Engine.Process(codeDocument);
+            return codeDocument.GetCSharpDocument();
+        }
+
+        /// <summary>
+        /// Generates a <see cref="RazorCodeDocument"/> for the specified <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">The template path.</param>
+        /// <returns>The created <see cref="RazorCodeDocument"/>.</returns>
+        public virtual RazorCodeDocument CreateCodeDocument(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
+            }
+
+            var projectItem = Project.GetItem(path);
+            return CreateCodeDocument(projectItem);
+        }
+
+        /// <summary>
+        /// Generates a <see cref="RazorCodeDocument"/> for the specified <paramref name="projectItem"/>.
+        /// </summary>
+        /// <param name="projectItem">The <see cref="RazorProjectItem"/>.</param>
+        /// <returns>The created <see cref="RazorCodeDocument"/>.</returns>
+        public virtual RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            if (!projectItem.Exists)
+            {
+                throw new InvalidOperationException(Resources.FormatRazorTemplateEngine_ItemCouldNotBeFound(projectItem.FilePath));
+            }
+
+            var source = RazorSourceDocument.ReadFrom(projectItem);
+            var imports = GetImports(projectItem);
+
+            return RazorCodeDocument.Create(source, imports);
+        }
+
+        /// <summary>
+        /// Gets <see cref="RazorSourceDocument"/> that are applicable to the specified <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">The template path.</param>
+        /// <returns>The sequence of applicable <see cref="RazorSourceDocument"/>.</returns>
+        public IEnumerable<RazorSourceDocument> GetImports(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
+            }
+
+            var projectItem = Project.GetItem(path);
+            return GetImports(projectItem);
+        }
+
+        /// <summary>
+        /// Gets <see cref="RazorSourceDocument"/> that are applicable to the specified <paramref name="projectItem"/>.
+        /// </summary>
+        /// <param name="projectItem">The <see cref="RazorProjectItem"/>.</param>
+        /// <returns>The sequence of applicable <see cref="RazorSourceDocument"/>.</returns>
+        public virtual IEnumerable<RazorSourceDocument> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+            var result = new List<RazorSourceDocument>();
+
+            var importProjectItems = GetImportItems(projectItem);
+            foreach (var importItem in importProjectItems)
+            {
+                if (importItem.Exists)
+                {
+                    // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+                    result.Insert(0, RazorSourceDocument.ReadFrom(importItem));
+                }
+            }
+
+            if (Options.DefaultImports != null)
+            {
+                result.Insert(0, Options.DefaultImports);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the sequence of imports with the name specified by <see cref="RazorTemplateEngineOptions.ImportsFileName" />
+        /// that apply to <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">The path to look up import items for.</param>
+        /// <returns>A sequence of <see cref="RazorProjectItem"/> instances that apply to the
+        /// <paramref name="path"/>.</returns>
+        public IEnumerable<RazorProjectItem> GetImportItems(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
+            }
+
+            var projectItem = Project.GetItem(path);
+            return GetImportItems(projectItem);
+        }
+
+        /// <summary>
+        /// Gets the sequence of imports with the name specified by <see cref="RazorTemplateEngineOptions.ImportsFileName" />
+        /// that apply to <paramref name="projectItem"/>.
+        /// </summary>
+        /// <param name="projectItem">The <see cref="RazorProjectItem"/> to look up import items for.</param>
+        /// <returns>A sequence of <see cref="RazorProjectItem"/> instances that apply to the
+        /// <paramref name="projectItem"/>.</returns>
+        public virtual IEnumerable<RazorProjectItem> GetImportItems(RazorProjectItem projectItem)
+        {
+            var importsFileName = Options.ImportsFileName;
+            if (!string.IsNullOrEmpty(importsFileName))
+            {
+                return Project.FindHierarchicalItems(projectItem.FilePath, importsFileName);
+            }
+
+            return Enumerable.Empty<RazorProjectItem>();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs
new file mode 100644
index 0000000000..4b46eabbc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs
@@ -0,0 +1,21 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Options for code generation in the <see cref="RazorTemplateEngine"/>.
+    /// </summary>
+    public sealed class RazorTemplateEngineOptions
+    {
+        /// <summary>
+        /// Gets or sets the file name of the imports file (e.g. _ViewImports.cshtml).
+        /// </summary>
+        public string ImportsFileName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the default set of imports.
+        /// </summary>
+        public RazorSourceDocument DefaultImports { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
new file mode 100644
index 0000000000..ce8bdca365
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
@@ -0,0 +1,96 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RequiredAttributeDescriptor : IEquatable<RequiredAttributeDescriptor>
+    {
+        public string Name { get; protected set; }
+
+        public NameComparisonMode NameComparison { get; protected set; }
+
+        public string Value { get; protected set; }
+
+        public ValueComparisonMode ValueComparison { get; protected set; }
+
+        public string DisplayName { get; protected set; }
+
+        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                var errors = Diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+
+                return errors;
+            }
+        }
+
+        public override string ToString()
+        {
+            return DisplayName ?? base.ToString();
+        }
+
+        public bool Equals(RequiredAttributeDescriptor other)
+        {
+            return RequiredAttributeDescriptorComparer.Default.Equals(this, other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as RequiredAttributeDescriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            return RequiredAttributeDescriptorComparer.Default.GetHashCode(this);
+        }
+
+        /// <summary>
+        /// Acceptable <see cref="RequiredAttributeDescriptor.Name"/> comparison modes.
+        /// </summary>
+        public enum NameComparisonMode
+        {
+            /// <summary>
+            /// HTML attribute name case insensitively matches <see cref="RequiredAttributeDescriptor.Name"/>.
+            /// </summary>
+            FullMatch,
+
+            /// <summary>
+            /// HTML attribute name case insensitively starts with <see cref="RequiredAttributeDescriptor.Name"/>.
+            /// </summary>
+            PrefixMatch,
+        }
+
+        /// <summary>
+        /// Acceptable <see cref="RequiredAttributeDescriptor.Value"/> comparison modes.
+        /// </summary>
+        public enum ValueComparisonMode
+        {
+            /// <summary>
+            /// HTML attribute value always matches <see cref="RequiredAttributeDescriptor.Value"/>.
+            /// </summary>
+            None,
+
+            /// <summary>
+            /// HTML attribute value case sensitively matches <see cref="RequiredAttributeDescriptor.Value"/>.
+            /// </summary>
+            FullMatch,
+
+            /// <summary>
+            /// HTML attribute value case sensitively starts with <see cref="RequiredAttributeDescriptor.Value"/>.
+            /// </summary>
+            PrefixMatch,
+
+            /// <summary>
+            /// HTML attribute value case sensitively ends with <see cref="RequiredAttributeDescriptor.Value"/>.
+            /// </summary>
+            SuffixMatch,
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs
new file mode 100644
index 0000000000..5cf368422f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RequiredAttributeDescriptorBuilder
+    {
+        public abstract string Name { get; set; }
+
+        public abstract RequiredAttributeDescriptor.NameComparisonMode NameComparisonMode { get; set; }
+
+        public abstract string Value { get; set; }
+
+        public abstract RequiredAttributeDescriptor.ValueComparisonMode ValueComparisonMode { get; set; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs
new file mode 100644
index 0000000000..149f6a0c3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs
@@ -0,0 +1,77 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// An <see cref="IEqualityComparer{TagHelperRequiredAttributeDescriptor}"/> used to check equality between
+    /// two <see cref="RequiredAttributeDescriptor"/>s.
+    /// </summary>
+    internal class RequiredAttributeDescriptorComparer : IEqualityComparer<RequiredAttributeDescriptor>
+    {
+        /// <summary>
+        /// A default instance of the <see cref="RequiredAttributeDescriptorComparer"/>.
+        /// </summary>
+        public static readonly RequiredAttributeDescriptorComparer Default =
+            new RequiredAttributeDescriptorComparer();
+
+        /// <summary>
+        /// A default instance of the <see cref="RequiredAttributeDescriptorComparer"/> that does case-sensitive comparison.
+        /// </summary>
+        internal static readonly RequiredAttributeDescriptorComparer CaseSensitive =
+            new RequiredAttributeDescriptorComparer(caseSensitive: true);
+
+        private readonly StringComparer _stringComparer;
+        private readonly StringComparison _stringComparison;
+
+        private RequiredAttributeDescriptorComparer(bool caseSensitive = false)
+        {
+            if (caseSensitive)
+            {
+                _stringComparer = StringComparer.Ordinal;
+                _stringComparison = StringComparison.Ordinal;
+            }
+            else
+            {
+                _stringComparer = StringComparer.OrdinalIgnoreCase;
+                _stringComparison = StringComparison.OrdinalIgnoreCase;
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual bool Equals(
+            RequiredAttributeDescriptor descriptorX,
+            RequiredAttributeDescriptor descriptorY)
+        {
+            if (object.ReferenceEquals(descriptorX, descriptorY))
+            {
+                return true;
+            }
+
+            if (descriptorX == null ^ descriptorY == null)
+            {
+                return false;
+            }
+
+            return
+                descriptorX.NameComparison == descriptorY.NameComparison &&
+                descriptorX.ValueComparison == descriptorY.ValueComparison &&
+                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.Value, descriptorY.Value, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal);
+        }
+
+        /// <inheritdoc />
+        public virtual int GetHashCode(RequiredAttributeDescriptor descriptor)
+        {
+            var hash = HashCodeCombiner.Start();
+            hash.Add(descriptor.Name, _stringComparer);
+
+            return hash.CombinedHash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
new file mode 100644
index 0000000000..e23e66c297
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -0,0 +1,545 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AddTagHelperDirective_Description" xml:space="preserve">
+    <value>Register Tag Helpers for use in the current document.</value>
+  </data>
+  <data name="AddTagHelperDirective_StringToken_Description" xml:space="preserve">
+    <value>Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.</value>
+  </data>
+  <data name="AddTagHelperDirective_StringToken_Name" xml:space="preserve">
+    <value>TypeName, AssemblyName</value>
+  </data>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or an empty string.</value>
+  </data>
+  <data name="Block_Type_Not_Specified" xml:space="preserve">
+    <value>Block cannot be built because a Type has not been specified in the BlockBuilder</value>
+  </data>
+  <data name="BlockDirectiveCannotBeImported" xml:space="preserve">
+    <value>Block directive '{0}' cannot be imported.</value>
+  </data>
+  <data name="BlockName_Code" xml:space="preserve">
+    <value>code</value>
+    <comment>This is a literal used when composing ParserError_* messages. Most blocks are named by the keyword that starts them, for example "if".  However, for those without keywords, a (localizable) name must be used.  This literal is ALWAYS used mid-sentence, thus should not be capitalized.</comment>
+  </data>
+  <data name="BlockName_ExplicitExpression" xml:space="preserve">
+    <value>explicit expression</value>
+    <comment>This is a literal used when composing ParserError_* messages. Most blocks are named by the keyword that starts them, for example "if".  However, for those without keywords, a (localizable) name must be used.  This literal is ALWAYS used mid-sentence, thus should not be capitalized.</comment>
+  </data>
+  <data name="CodeWriter_InvalidNewLine" xml:space="preserve">
+    <value>Invalid newline sequence '{0}'. Support newline sequences are '\r\n' and '\n'.</value>
+  </data>
+  <data name="CSharpToken_CharacterLiteral" xml:space="preserve">
+    <value>&lt;&lt;character literal&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_Comment" xml:space="preserve">
+    <value>&lt;&lt;comment&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_Identifier" xml:space="preserve">
+    <value>&lt;&lt;identifier&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_IntegerLiteral" xml:space="preserve">
+    <value>&lt;&lt;integer literal&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_Keyword" xml:space="preserve">
+    <value>&lt;&lt;keyword&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_Newline" xml:space="preserve">
+    <value>&lt;&lt;newline sequence&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_RealLiteral" xml:space="preserve">
+    <value>&lt;&lt;real literal&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_StringLiteral" xml:space="preserve">
+    <value>&lt;&lt;string literal&gt;&gt;</value>
+  </data>
+  <data name="CSharpToken_Whitespace" xml:space="preserve">
+    <value>&lt;&lt;white space&gt;&gt;</value>
+  </data>
+  <data name="Diagnostic_CodeTarget_UnsupportedExtension" xml:space="preserve">
+    <value>The document type '{0}' does not support the extension '{1}'.</value>
+  </data>
+  <data name="DirectiveDescriptor_InvalidDirectiveKeyword" xml:space="preserve">
+    <value>Invalid directive keyword '{0}'. Directives must have a non-empty keyword that consists only of letters.</value>
+  </data>
+  <data name="DirectiveDescriptor_InvalidNonOptionalToken" xml:space="preserve">
+    <value>A non-optional directive token cannot follow an optional directive token.</value>
+  </data>
+  <data name="DirectiveExpectsIdentifier" xml:space="preserve">
+    <value>The '{0}' directive expects an identifier.</value>
+  </data>
+  <data name="DirectiveExpectsNamespace" xml:space="preserve">
+    <value>The '{0}' directive expects a namespace name.</value>
+  </data>
+  <data name="DirectiveExpectsQuotedStringLiteral" xml:space="preserve">
+    <value>The '{0}' directive expects a string surrounded by double quotes.</value>
+  </data>
+  <data name="DirectiveExpectsTypeName" xml:space="preserve">
+    <value>The '{0}' directive expects a type name.</value>
+  </data>
+  <data name="DirectiveMustAppearAtStartOfLine" xml:space="preserve">
+    <value>The '{0}` directive must appear at the start of the line.</value>
+  </data>
+  <data name="DirectiveTokensMustBeSeparatedByWhitespace" xml:space="preserve">
+    <value>The '{0}' directives value(s) must be separated by whitespace.</value>
+  </data>
+  <data name="DocumentMissingTarget" xml:space="preserve">
+    <value>The document of kind '{0}' does not have a '{1}'. The document classifier must set a value for '{2}'.</value>
+  </data>
+  <data name="DuplicateDirective" xml:space="preserve">
+    <value>The '{0}' directive may only occur once per document.</value>
+  </data>
+  <data name="EndBlock_Called_Without_Matching_StartBlock" xml:space="preserve">
+    <value>"EndBlock" was called without a matching call to "StartBlock".</value>
+  </data>
+  <data name="ErrorComponent_Newline" xml:space="preserve">
+    <value>line break</value>
+  </data>
+  <data name="FeatureDependencyMissing" xml:space="preserve">
+    <value>The '{0}' feature requires a '{1}' provided by the '{2}'.</value>
+  </data>
+  <data name="FeatureMustBeInitialized" xml:space="preserve">
+    <value>The feature must be initialized by setting the '{0}' property.</value>
+  </data>
+  <data name="FunctionsDirective_Description" xml:space="preserve">
+    <value>Specify a C# code block.</value>
+  </data>
+  <data name="HtmlToken_NewLine" xml:space="preserve">
+    <value>&lt;&lt;newline sequence&gt;&gt;</value>
+  </data>
+  <data name="HtmlToken_RazorComment" xml:space="preserve">
+    <value>&lt;&lt;razor comment&gt;&gt;</value>
+  </data>
+  <data name="HtmlToken_Text" xml:space="preserve">
+    <value>&lt;&lt;text&gt;&gt;</value>
+  </data>
+  <data name="HtmlToken_WhiteSpace" xml:space="preserve">
+    <value>&lt;&lt;white space&gt;&gt;</value>
+  </data>
+  <data name="InheritsDirective_Description" xml:space="preserve">
+    <value>Specify the base class for the current document.</value>
+  </data>
+  <data name="InheritsDirective_TypeToken_Description" xml:space="preserve">
+    <value>The base type that the current page inherits.</value>
+  </data>
+  <data name="InheritsDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="IntermediateNodeBuilder_PopInvalid" xml:space="preserve">
+    <value>The '{0}' operation is not valid when the builder is empty.</value>
+  </data>
+  <data name="IntermediateNodeReference_CollectionIsReadOnly" xml:space="preserve">
+    <value>The node '{0}' has a read-only child collection and cannot be modified.</value>
+  </data>
+  <data name="IntermediateNodeReference_NodeNotFound" xml:space="preserve">
+    <value>The reference is invalid. The node '{0}' could not be found as a child of '{1}'.</value>
+  </data>
+  <data name="IntermediateNodeReference_NotInitialized" xml:space="preserve">
+    <value>The reference is invalid. References initialized with the default constructor cannot modify nodes.</value>
+  </data>
+  <data name="IntermediateNodes_InvalidParentNode" xml:space="preserve">
+    <value>The '{0}' node type can only be used as a direct child of a '{1}' node.</value>
+  </data>
+  <data name="InvalidOperation_SpanIsNotChangeOwner" xml:space="preserve">
+    <value>The node '{0}' is not the owner of change '{1}'.</value>
+  </data>
+  <data name="InvalidTagHelperLookupText" xml:space="preserve">
+    <value>Invalid tag helper directive look up text '{0}'. The correct look up text format is: "name, assemblyName".</value>
+  </data>
+  <data name="InvalidTagHelperPrefixValue" xml:space="preserve">
+    <value>Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'.</value>
+  </data>
+  <data name="KeyMustNotBeNull" xml:space="preserve">
+    <value>The key must not be null.</value>
+  </data>
+  <data name="Language_Does_Not_Support_RazorComment" xml:space="preserve">
+    <value>Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment</value>
+  </data>
+  <data name="MismatchedContentEncoding" xml:space="preserve">
+    <value>The specified encoding '{0}' does not match the content's encoding '{1}'.</value>
+  </data>
+  <data name="ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start" xml:space="preserve">
+    <value>The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
+
+@if(isLoggedIn) {{
+    &lt;p&gt;Hello, @user!&lt;/p&gt;
+}}</value>
+    <comment>"{{" is an escape sequence for string.Format, when outputted to the user it will be displayed as "{"</comment>
+  </data>
+  <data name="ParseError_BlockComment_Not_Terminated" xml:space="preserve">
+    <value>End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.</value>
+  </data>
+  <data name="ParseError_DirectiveMustHaveValue" xml:space="preserve">
+    <value>Directive '{0}' must have a value.</value>
+  </data>
+  <data name="ParseError_Expected_CloseBracket_Before_EOF" xml:space="preserve">
+    <value>An opening "{0}" is missing the corresponding closing "{1}".</value>
+  </data>
+  <data name="ParseError_Expected_EndOfBlock_Before_EOF" xml:space="preserve">
+    <value>The {0} block is missing a closing "{1}" character.  Make sure you have a matching "{1}" character for all the "{2}" characters within this block, and that none of the "{1}" characters are being interpreted as markup.</value>
+  </data>
+  <data name="ParseError_HelperDirectiveNotAvailable" xml:space="preserve">
+    <value>The {0} directive is not supported.</value>
+  </data>
+  <data name="ParseError_IncompleteQuotesAroundDirective" xml:space="preserve">
+    <value>Optional quote around the directive '{0}' is missing the corresponding opening or closing quote.</value>
+  </data>
+  <data name="ParseError_InlineMarkup_Blocks_Cannot_Be_Nested" xml:space="preserve">
+    <value>Inline markup blocks (@&lt;p&gt;Content&lt;/p&gt;) cannot be nested.  Only one level of inline markup is allowed.</value>
+  </data>
+  <data name="ParseError_MarkupBlock_Must_Start_With_Tag" xml:space="preserve">
+    <value>Markup in a code block must start with a tag and all start tags must be matched with end tags.  Do not use unclosed tags like "&lt;br&gt;".  Instead use self-closing tags like "&lt;br/&gt;".</value>
+  </data>
+  <data name="ParseError_MissingEndTag" xml:space="preserve">
+    <value>The "{0}" element was not closed.  All elements must be either self-closing or have a matching end tag.</value>
+  </data>
+  <data name="ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock" xml:space="preserve">
+    <value>Namespace imports and type aliases cannot be placed within code blocks.  They must immediately follow an "@" character in markup.  It is recommended that you put them at the top of the page, as in the following example:
+
+@using System.Drawing;
+@{{
+    // OK here to use types from System.Drawing in the page.
+}}</value>
+    <comment>"{{" is an escape sequence for string.Format, when outputted to the user it will be displayed as "{"</comment>
+  </data>
+  <data name="ParseError_OuterTagMissingName" xml:space="preserve">
+    <value>Outer tag is missing a name. The first character of a markup block must be an HTML tag with a valid name.</value>
+  </data>
+  <data name="ParseError_RazorComment_Not_Terminated" xml:space="preserve">
+    <value>End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.</value>
+  </data>
+  <data name="ParseError_ReservedWord" xml:space="preserve">
+    <value>"{0}" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.</value>
+  </data>
+  <data name="ParseError_Sections_Cannot_Be_Nested" xml:space="preserve">
+    <value>Section blocks ("{0}") cannot be nested.  Only one level of section blocks are allowed.</value>
+  </data>
+  <data name="ParseError_SingleLine_ControlFlowStatements_Not_Allowed" xml:space="preserve">
+    <value>Expected a "{0}" but found a "{1}".  Block statements must be enclosed in "{{" and "}}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+
+@if(isLoggedIn)
+    &lt;p&gt;Hello, @user&lt;/p&gt;
+
+Instead, wrap the contents of the block in "{{}}":
+
+@if(isLoggedIn) {{
+    &lt;p&gt;Hello, @user&lt;/p&gt;
+}}</value>
+    <comment>{0} is only ever a single character</comment>
+  </data>
+  <data name="ParseError_TextTagCannotContainAttributes" xml:space="preserve">
+    <value>"&lt;text&gt;" and "&lt;/text&gt;" tags cannot contain attributes.</value>
+  </data>
+  <data name="ParseError_Unexpected_Character_At_Start_Of_CodeBlock" xml:space="preserve">
+    <value>"{0}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{{" are valid.</value>
+    <comment>"{{" is an escape sequence for string.Format, when outputted to the user it will be displayed as "{"</comment>
+  </data>
+  <data name="ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock" xml:space="preserve">
+    <value>End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"</value>
+  </data>
+  <data name="ParseError_Unexpected_Nested_CodeBlock" xml:space="preserve">
+    <value>Unexpected "{{" after "@" character. Once inside the body of a code block (@if {{}}, @{{}}, etc.) you do not need to use "@{{" to switch to code.</value>
+    <comment>"{{" is an escape sequence for string.Format, when outputted to the user it will be displayed as "{"</comment>
+  </data>
+  <data name="ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock" xml:space="preserve">
+    <value>A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.</value>
+    <comment>"{{" is an escape sequence for string.Format, when outputted to the user it will be displayed as "{"</comment>
+  </data>
+  <data name="ParseError_UnexpectedEndTag" xml:space="preserve">
+    <value>Encountered end tag "{0}" with no matching start tag.  Are your start/end tags properly balanced?</value>
+  </data>
+  <data name="ParseError_UnfinishedTag" xml:space="preserve">
+    <value>End of file or an unexpected character was reached before the "{0}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("&lt;br /&gt;") or have matching end tags ("&lt;p&gt;Hello&lt;/p&gt;").  If you intended to display a "&lt;" character, use the "&amp;lt;" HTML entity.</value>
+  </data>
+  <data name="ParseError_Unterminated_String_Literal" xml:space="preserve">
+    <value>Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.</value>
+  </data>
+  <data name="Parser_Context_Not_Set" xml:space="preserve">
+    <value>Parser was started with a null Context property.  The Context property must be set BEFORE calling any methods on the parser.</value>
+  </data>
+  <data name="ParserContext_CannotCompleteTree_NoRootBlock" xml:space="preserve">
+    <value>Cannot complete the tree, StartBlock must be called at least once.</value>
+  </data>
+  <data name="ParserContext_CannotCompleteTree_OutstandingBlocks" xml:space="preserve">
+    <value>Cannot complete the tree, there are still open blocks.</value>
+  </data>
+  <data name="ParserContext_NoCurrentBlock" xml:space="preserve">
+    <value>Cannot finish span, there is no current block. Call StartBlock at least once before finishing a span</value>
+  </data>
+  <data name="PhaseDependencyMissing" xml:space="preserve">
+    <value>The '{0}' phase requires a '{1}' provided by the '{2}'.</value>
+  </data>
+  <data name="PhaseMustBeInitialized" xml:space="preserve">
+    <value>The phase must be initialized by setting the '{0}' property.</value>
+  </data>
+  <data name="RazorProject_PathMustStartWithForwardSlash" xml:space="preserve">
+    <value>Path must begin with a forward slash '/'.</value>
+  </data>
+  <data name="RazorTemplateEngine_ItemCouldNotBeFound" xml:space="preserve">
+    <value>The item '{0}' could not be found.</value>
+  </data>
+  <data name="RemoveTagHelperDirective_Description" xml:space="preserve">
+    <value>Remove Tag Helpers for use in the current document.</value>
+  </data>
+  <data name="RemoveTagHelperDirective_StringToken_Description" xml:space="preserve">
+    <value>Remove tag helpers from the specified type name and assembly name. Specify '*' for the type name to remove all tag helper types from the specified assembly.</value>
+  </data>
+  <data name="RemoveTagHelperDirective_StringToken_Name" xml:space="preserve">
+    <value>TypeName, AssemblyName</value>
+  </data>
+  <data name="RenderingContextRequiresDelegate" xml:space="preserve">
+    <value>The '{0}' requires a '{1}' delegate to be set.</value>
+  </data>
+  <data name="RewriterError_EmptyTagHelperBoundAttribute" xml:space="preserve">
+    <value>Attribute '{0}' on tag helper element '{1}' requires a value. Tag helper bound attributes of type '{2}' cannot be empty or contain only whitespace.</value>
+  </data>
+  <data name="SectionDirective_Description" xml:space="preserve">
+    <value>Define a section to be rendered in the configured layout page.</value>
+  </data>
+  <data name="SectionDirective_NameToken_Description" xml:space="preserve">
+    <value>The name of the section.</value>
+  </data>
+  <data name="SectionDirective_NameToken_Name" xml:space="preserve">
+    <value>SectionName</value>
+  </data>
+  <data name="SectionExample" xml:space="preserve">
+    <value>@section Header { ... }</value>
+    <comment>In CSHTML, the @section keyword is case-sensitive and lowercase (as with all C# keywords)</comment>
+  </data>
+  <data name="Token_Unknown" xml:space="preserve">
+    <value>&lt;&lt;unknown&gt;&gt;</value>
+  </data>
+  <data name="TagHelper_InvalidBoundAttributeName" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name contains a '{3}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidBoundAttributeNameStartsWith" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name starts with '{3}'.</value>
+  </data>
+  <data name="TagHelper_InvalidBoundAttributeNullOrWhitespace" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with a null or empty name.</value>
+  </data>
+  <data name="TagHelper_InvalidBoundAttributePrefix" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix contains a '{3}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidBoundAttributePrefixStartsWith" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix starts with '{3}'.</value>
+  </data>
+  <data name="TagHelper_InvalidRestrictedChild" xml:space="preserve">
+    <value>Invalid restricted child '{1}' for tag helper '{0}'. Tag helpers cannot restrict child elements that contain a '{2}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidRestrictedChildNullOrWhitespace" xml:space="preserve">
+    <value>Invalid restricted child for tag helper '{0}'. Name cannot be null or whitespace.</value>
+  </data>
+  <data name="TagHelper_InvalidTargetedAttributeName" xml:space="preserve">
+    <value>Tag helpers cannot target attribute name '{0}' because it contains a '{1}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidTargetedAttributeNameNullOrWhitespace" xml:space="preserve">
+    <value>Targeted attribute name cannot be null or whitespace.</value>
+  </data>
+  <data name="TagHelper_InvalidTargetedParentTagName" xml:space="preserve">
+    <value>Tag helpers cannot target parent tag name '{0}' because it contains a '{1}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidTargetedParentTagNameNullOrWhitespace" xml:space="preserve">
+    <value>Targeted parent tag name cannot be null or whitespace.</value>
+  </data>
+  <data name="TagHelper_InvalidTargetedTagName" xml:space="preserve">
+    <value>Tag helpers cannot target tag name '{0}' because it contains a '{1}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidTargetedTagNameNullOrWhitespace" xml:space="preserve">
+    <value>Targeted tag name cannot be null or whitespace.</value>
+  </data>
+  <data name="TagHelperAssemblyNameCannotBeEmptyOrNull" xml:space="preserve">
+    <value>Tag helper directive assembly name cannot be null or empty.</value>
+  </data>
+  <data name="TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey" xml:space="preserve">
+    <value>The tag helper attribute '{0}' in element '{1}' is missing a key. The syntax is '&lt;{1} {0}{{ key }}="value"&gt;'.</value>
+  </data>
+  <data name="TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed" xml:space="preserve">
+    <value>TagHelper attributes must be well-formed.</value>
+  </data>
+  <data name="TagHelperParseTreeRewriter_CannotHaveNonTagContent" xml:space="preserve">
+    <value>The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed.</value>
+  </data>
+  <data name="TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag" xml:space="preserve">
+    <value>Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}').</value>
+  </data>
+  <data name="TagHelperParseTreeRewriter_InconsistentTagStructure" xml:space="preserve">
+    <value>Tag helpers '{0}' and '{1}' targeting element '{2}' must not expect different {3} values.</value>
+  </data>
+  <data name="TagHelperParseTreeRewriter_InvalidNestedTag" xml:space="preserve">
+    <value>The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tags with name(s) '{2}' are allowed.</value>
+  </data>
+  <data name="TagHelperPrefixDirective_Description" xml:space="preserve">
+    <value>Specify a prefix that is required in an element name for it to be included in Tag Helper processing.</value>
+  </data>
+  <data name="TagHelperPrefixDirective_PrefixToken_Description" xml:space="preserve">
+    <value>The tag prefix to apply to tag helpers.</value>
+  </data>
+  <data name="TagHelperPrefixDirective_PrefixToken_Name" xml:space="preserve">
+    <value>Prefix</value>
+  </data>
+  <data name="TagHelpers_AttributesMustHaveAName" xml:space="preserve">
+    <value>Tag Helper '{0}'s attributes must have names.</value>
+  </data>
+  <data name="TagHelpers_CannotHaveCSharpInTagDeclaration" xml:space="preserve">
+    <value>The tag helper '{0}' must not have C# in the element's attribute declaration area.</value>
+  </data>
+  <data name="TagHelpers_CodeBlocks_NotSupported_InAttributes" xml:space="preserve">
+    <value>Code blocks (e.g. @{{var variable = 23;}}) must not appear in non-string tag helper attribute values.
+ Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.</value>
+  </data>
+  <data name="TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes" xml:space="preserve">
+    <value>Inline markup blocks (e.g. @&lt;p&gt;content&lt;/p&gt;) must not appear in non-string tag helper attribute values.
+ Expected a '{0}' attribute value, not a string.</value>
+  </data>
+  <data name="TagHelpersParseTreeRewriter_FoundMalformedTagHelper" xml:space="preserve">
+    <value>Found a malformed '{0}' tag helper. Tag helpers must have a start and end tag or be self closing.</value>
+  </data>
+  <data name="TagHelpersParseTreeRewriter_MissingCloseAngle" xml:space="preserve">
+    <value>Missing close angle for tag helper '{0}'.</value>
+  </data>
+  <data name="UnexpectedDirectiveKind" xml:space="preserve">
+    <value>Unreachable code. This can happen when a new {0} is introduced.</value>
+  </data>
+  <data name="UnexpectedDirectiveLiteral" xml:space="preserve">
+    <value>Unexpected literal following the '{0}' directive. Expected '{1}'.</value>
+  </data>
+  <data name="UnexpectedEOFAfterDirective" xml:space="preserve">
+    <value>Unexpected end of file following the '{0}' directive. Expected '{1}'.</value>
+  </data>
+  <data name="UnsupportedChecksumAlgorithm" xml:space="preserve">
+    <value>The hash algorithm '{0}' is not supported for checksum generation. Supported algorithms are: '{1}'. Set '{2}' to '{3}' to suppress automatic checksum generation.</value>
+  </data>
+  <data name="PropertyMustNotBeNull" xml:space="preserve">
+    <value>The '{0}.{1}' property must not be null.</value>
+  </data>
+  <data name="RazorProjectEngineMissingFeatureDependency" xml:space="preserve">
+    <value>The '{0}' is missing feature '{1}'.</value>
+  </data>
+  <data name="RazorLanguageVersion_InvalidVersion" xml:space="preserve">
+    <value>The Razor language version '{0}' is unrecognized or not supported by this version of Razor.</value>
+  </data>
+  <data name="VirtualFileSystem_FileDoesNotBelongToDirectory" xml:space="preserve">
+    <value>File path '{0}' does not belong to the directory '{1}'.</value>
+  </data>
+  <data name="VirtualFileSystem_InvalidRelativePath" xml:space="preserve">
+    <value>The file path '{0}' is invalid. File path is the root relative path of the file starting with '/' and should not contain any '\' characters.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceChange.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceChange.cs
new file mode 100644
index 0000000000..bc5d96312f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceChange.cs
@@ -0,0 +1,139 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public sealed class SourceChange : IEquatable<SourceChange>
+    {
+        public SourceChange(int absoluteIndex, int length, string newText)
+        {
+            if (absoluteIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(absoluteIndex));
+            }
+
+            if (length < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            if (newText == null)
+            {
+                throw new ArgumentNullException(nameof(newText));
+            }
+
+            Span = new SourceSpan(absoluteIndex, length);
+            NewText = newText;
+        }
+
+        public SourceChange(SourceSpan span, string newText)
+        {
+            if (newText == null)
+            {
+                throw new ArgumentNullException(nameof(newText));
+            }
+
+            Span = span;
+            NewText = newText;
+        }
+
+        public bool IsDelete => Span.Length > 0 && NewText.Length == 0;
+
+        public bool IsInsert => Span.Length == 0 && NewText.Length > 0;
+
+        public bool IsReplace => Span.Length > 0 && NewText.Length > 0;
+
+        public SourceSpan Span { get; }
+
+        public string NewText { get; }
+
+        internal string GetEditedContent(SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var offset = GetOffset(node);
+            return GetEditedContent(node.GetContent(), offset);
+        }
+
+        internal string GetEditedContent(string text, int offset)
+        {
+            if (text == null)
+            {
+                throw new ArgumentNullException(nameof(text));
+            }
+
+            return text.Remove(offset, Span.Length).Insert(offset, NewText);
+        }
+
+        internal int GetOffset(SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var start = Span.AbsoluteIndex;
+            var end = Span.AbsoluteIndex + Span.Length;
+
+            if (start < node.Position ||
+                start > node.EndPosition ||
+                end < node.Position ||
+                end > node.EndPosition)
+            {
+                throw new InvalidOperationException(Resources.FormatInvalidOperation_SpanIsNotChangeOwner(node, this));
+            }
+
+            return start - node.Position;
+        }
+
+        internal string GetOriginalText(SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.FullWidth == 0)
+            {
+                return string.Empty;
+            }
+
+            var offset = GetOffset(node);
+            return node.GetContent().Substring(offset, Span.Length);
+        }
+
+        public bool Equals(SourceChange other)
+        {
+            return
+                other != null &&
+                Span.Equals(other.Span) &&
+                string.Equals(NewText, other.NewText, StringComparison.Ordinal);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as SourceChange);
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = new HashCodeCombiner();
+            hash.Add(Span);
+            hash.Add(NewText, StringComparer.Ordinal);
+            return hash;
+        }
+
+        public override string ToString()
+        {
+            return Span.ToString() + " : " + NewText;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceLocation.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceLocation.cs
new file mode 100644
index 0000000000..de58f7c2aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceLocation.cs
@@ -0,0 +1,135 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// A location in a Razor file.
+    /// </summary>
+    public struct SourceLocation : IEquatable<SourceLocation>
+    {
+        /// <summary>
+        /// An undefined <see cref="SourceLocation"/>.
+        /// </summary>
+        public static readonly SourceLocation Undefined =
+            new SourceLocation(absoluteIndex: -1, lineIndex: -1, characterIndex: -1);
+
+        /// <summary>
+        /// A <see cref="SourceLocation"/> with <see cref="AbsoluteIndex"/>, <see cref="LineIndex"/>, and
+        /// <see cref="CharacterIndex"/> initialized to 0.
+        /// </summary>
+        public static readonly SourceLocation Zero =
+            new SourceLocation(absoluteIndex: 0, lineIndex: 0, characterIndex: 0);
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SourceLocation"/>.
+        /// </summary>
+        /// <param name="absoluteIndex">The absolute index.</param>
+        /// <param name="lineIndex">The line index.</param>
+        /// <param name="characterIndex">The character index.</param>
+        public SourceLocation(int absoluteIndex, int lineIndex, int characterIndex)
+            : this(filePath: null, absoluteIndex: absoluteIndex, lineIndex: lineIndex, characterIndex: characterIndex)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SourceLocation"/>.
+        /// </summary>
+        /// <param name="filePath">The file path.</param>
+        /// <param name="absoluteIndex">The absolute index.</param>
+        /// <param name="lineIndex">The line index.</param>
+        /// <param name="characterIndex">The character index.</param>
+        public SourceLocation(string filePath, int absoluteIndex, int lineIndex, int characterIndex)
+        {
+            FilePath = filePath;
+            AbsoluteIndex = absoluteIndex;
+            LineIndex = lineIndex;
+            CharacterIndex = characterIndex;
+        }
+
+        /// <summary>
+        /// Path of the file.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// When <c>null</c>, the parser assumes the location is in the file currently being processed.
+        /// </para>
+        /// <para>Set property is only accessible for deserialization purposes.</para>
+        /// </remarks>
+        public string FilePath { get; set;  }
+
+        /// <remarks>Set property is only accessible for deserialization purposes.</remarks>
+        public int AbsoluteIndex { get; set;  }
+
+        /// <remarks>Set property is only accessible for deserialization purposes.</remarks>
+        public int LineIndex { get; set; }
+
+        /// <remarks>Set property is only accessible for deserialization purposes.</remarks>
+        public int CharacterIndex { get; set; }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="SourceLocation"/> from the provided span.
+        /// </summary>
+        /// <param name="span">
+        /// The souce span. If <c>null</c>, <see cref="SourceLocation.Undefined"/> will be returned.
+        /// </param>
+        /// <remarks>A <see cref="SourceLocation"/> that corresponds to the beginning of the span.</remarks>
+        public static SourceLocation FromSpan(SourceSpan? span)
+        {
+            return span == null ? 
+                SourceLocation.Undefined : 
+                new SourceLocation(span.Value.FilePath, span.Value.AbsoluteIndex, span.Value.LineIndex, span.Value.CharacterIndex);
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.CurrentCulture,
+                "({0}:{1},{2})",
+                AbsoluteIndex,
+                LineIndex,
+                CharacterIndex);
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            return obj is SourceLocation &&
+                Equals((SourceLocation)obj);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(FilePath, StringComparer.Ordinal);
+            hashCodeCombiner.Add(AbsoluteIndex);
+
+            return hashCodeCombiner;
+        }
+
+        /// <inheritdoc />
+        public bool Equals(SourceLocation other)
+        {
+            return string.Equals(FilePath, other.FilePath, StringComparison.Ordinal) &&
+                AbsoluteIndex == other.AbsoluteIndex &&
+                LineIndex == other.LineIndex &&
+                CharacterIndex == other.CharacterIndex;
+        }
+
+        public static bool operator==(SourceLocation left, SourceLocation right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(SourceLocation left, SourceLocation right)
+        {
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceMapping.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceMapping.cs
new file mode 100644
index 0000000000..a1ecfd1489
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceMapping.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public sealed class SourceMapping : IEquatable<SourceMapping>
+    {
+        public SourceMapping(SourceSpan originalSpan, SourceSpan generatedSpan)
+        {
+            OriginalSpan = originalSpan;
+            GeneratedSpan = generatedSpan;
+        }
+
+        public SourceSpan OriginalSpan { get; }
+
+        public SourceSpan GeneratedSpan { get; }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as SourceMapping;
+            return Equals(other);
+        }
+
+        public bool Equals(SourceMapping other)
+        {
+            if (ReferenceEquals(other, null))
+            {
+                return false;
+            }
+
+            return OriginalSpan.Equals(other.OriginalSpan) &&
+                GeneratedSpan.Equals(other.GeneratedSpan);
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(OriginalSpan);
+            hashCodeCombiner.Add(GeneratedSpan);
+
+            return hashCodeCombiner;
+        }
+
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.CurrentCulture, "{0} -> {1}", OriginalSpan, GeneratedSpan);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceSpan.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceSpan.cs
new file mode 100644
index 0000000000..5da785c911
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SourceSpan.cs
@@ -0,0 +1,124 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public struct SourceSpan : IEquatable<SourceSpan>
+    {
+        public static readonly SourceSpan Undefined = new SourceSpan(SourceLocation.Undefined, 0);
+
+        public SourceSpan(int absoluteIndex, int length)
+            : this(null, absoluteIndex, -1, -1, length)
+        {
+        }
+
+        public SourceSpan(SourceLocation location, int contentLength)
+            : this(location.FilePath, location.AbsoluteIndex, location.LineIndex, location.CharacterIndex, contentLength)
+        {
+        }
+
+        public SourceSpan(string filePath, int absoluteIndex, int lineIndex, int characterIndex, int length)
+        {
+            AbsoluteIndex = absoluteIndex;
+            LineIndex = lineIndex;
+            CharacterIndex = characterIndex;
+            Length = length;
+            FilePath = filePath;
+        }
+
+        public SourceSpan(int absoluteIndex, int lineIndex, int characterIndex, int length) 
+            : this(filePath: null, absoluteIndex: absoluteIndex, lineIndex: lineIndex, characterIndex: characterIndex, length: length)
+        {
+        }
+
+        public int Length { get; }
+
+        public int AbsoluteIndex { get; }
+
+        public int LineIndex { get; }
+
+        public int CharacterIndex { get; }
+
+        public string FilePath { get; }
+
+        public bool Equals(SourceSpan other)
+        {
+            return
+                string.Equals(FilePath, other.FilePath, StringComparison.Ordinal) &&
+                AbsoluteIndex == other.AbsoluteIndex &&
+                LineIndex == other.LineIndex &&
+                CharacterIndex == other.CharacterIndex &&
+                Length == other.Length;
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as SourceSpan?;
+            if (ReferenceEquals(other, null))
+            {
+                return false;
+            }
+
+            return Equals(other.Value);
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = HashCodeCombiner.Start();
+            hash.Add(FilePath, StringComparer.Ordinal);
+            hash.Add(AbsoluteIndex);
+            hash.Add(LineIndex);
+            hash.Add(CharacterIndex);
+            hash.Add(Length);
+
+            return hash;
+        }
+
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.CurrentCulture, "({0}:{1},{2} [{3}] {4})",
+                AbsoluteIndex,
+                LineIndex,
+                CharacterIndex,
+                Length,
+                FilePath);
+        }
+
+        public static bool operator ==(SourceSpan left, SourceSpan right)
+        {
+            if (ReferenceEquals(left, right))
+            {
+                // Exact equality e.g. both objects are null.
+                return true;
+            }
+
+            if (ReferenceEquals(left, null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(SourceSpan left, SourceSpan right)
+        {
+            if (ReferenceEquals(left, right))
+            {
+                // Exact equality e.g. both objects are null.
+                return false;
+            }
+
+            if (ReferenceEquals(left, null))
+            {
+                return true;
+            }
+
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/StreamSourceDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/StreamSourceDocument.cs
new file mode 100644
index 0000000000..1b9d239e7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/StreamSourceDocument.cs
@@ -0,0 +1,119 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class StreamSourceDocument : RazorSourceDocument
+    {
+        // Internal for testing
+        internal readonly RazorSourceDocument _innerSourceDocument;
+
+        private readonly byte[] _checksum;
+
+        public StreamSourceDocument(Stream stream, Encoding encoding, RazorSourceDocumentProperties properties)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+
+            // Notice we don't validate the encoding here. StreamSourceDocument can compute it.
+            _checksum = ComputeChecksum(stream);
+            _innerSourceDocument = CreateInnerSourceDocument(stream, encoding, properties);
+        }
+
+        public override char this[int position] => _innerSourceDocument[position];
+
+        public override Encoding Encoding => _innerSourceDocument.Encoding;
+
+        public override string FilePath => _innerSourceDocument.FilePath;
+
+        public override int Length => _innerSourceDocument.Length;
+
+        public override RazorSourceLineCollection Lines => _innerSourceDocument.Lines;
+
+        public override string RelativePath => _innerSourceDocument.RelativePath;
+
+        public override void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count)
+            => _innerSourceDocument.CopyTo(sourceIndex, destination, destinationIndex, count);
+
+        public override byte[] GetChecksum()
+        {
+            var copiedChecksum = new byte[_checksum.Length];
+            _checksum.CopyTo(copiedChecksum, 0);
+
+            return copiedChecksum;
+        }
+
+        private static byte[] ComputeChecksum(Stream stream)
+        {
+            using (var hashAlgorithm = SHA1.Create())
+            {
+                var checksum = hashAlgorithm.ComputeHash(stream);
+                stream.Position = 0;
+
+                return checksum;
+            }
+        }
+
+        private static RazorSourceDocument CreateInnerSourceDocument(Stream stream, Encoding encoding, RazorSourceDocumentProperties properties)
+        {
+            var streamLength = (int)stream.Length;
+            var content = string.Empty;
+            var contentEncoding = encoding ?? Encoding.UTF8;
+
+            if (streamLength > 0)
+            {
+                var bufferSize = Math.Min(streamLength, LargeObjectHeapLimitInChars);
+
+                var reader = new StreamReader(
+                    stream,
+                    contentEncoding,
+                    detectEncodingFromByteOrderMarks: true,
+                    bufferSize: bufferSize,
+                    leaveOpen: true);
+
+                using (reader)
+                {
+                    reader.Peek();      // Just to populate the encoding
+
+                    if (encoding == null)
+                    {
+                        contentEncoding = reader.CurrentEncoding;
+                    }
+                    else if (encoding != reader.CurrentEncoding)
+                    {
+                        throw new InvalidOperationException(
+                            Resources.FormatMismatchedContentEncoding(
+                                encoding.EncodingName,
+                                reader.CurrentEncoding.EncodingName));
+                    }
+
+                    if (streamLength > LargeObjectHeapLimitInChars)
+                    {
+                        // If the resulting string would end up on the large object heap, then use LargeTextSourceDocument.
+                        return new LargeTextSourceDocument(
+                            reader,
+                            LargeObjectHeapLimitInChars,
+                            contentEncoding,
+                            properties);
+                    }
+
+                    content = reader.ReadToEnd();
+                }
+            }
+
+            return new StringSourceDocument(content, contentEncoding, properties);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/StringSourceDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/StringSourceDocument.cs
new file mode 100644
index 0000000000..a89ac1b25a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/StringSourceDocument.cs
@@ -0,0 +1,105 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class StringSourceDocument : RazorSourceDocument
+    {
+        private readonly string _content;
+        private readonly RazorSourceLineCollection _lines;
+        private byte[] _checksum;
+
+        public StringSourceDocument(string content, Encoding encoding, RazorSourceDocumentProperties properties)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+
+            _content = content;
+            Encoding = encoding;
+            FilePath = properties.FilePath;
+            RelativePath = properties.RelativePath;
+
+            _lines = new DefaultRazorSourceLineCollection(this);
+        }
+
+        public override char this[int position] => _content[position];
+
+        public override Encoding Encoding { get; }
+
+        public override string FilePath { get; }
+        
+        public override int Length => _content.Length;
+
+        public override RazorSourceLineCollection Lines => _lines;
+
+        public override string RelativePath { get; }
+
+        public override void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count)
+        {
+            if (destination == null)
+            {
+                throw new ArgumentNullException(nameof(destination));
+            }
+
+            if (sourceIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(sourceIndex));
+            }
+
+            if (destinationIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(destinationIndex));
+            }
+
+            if (count < 0 || count > Length - sourceIndex || count > destination.Length - destinationIndex)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            if (count == 0)
+            {
+                return;
+            }
+
+            _content.CopyTo(sourceIndex, destination, destinationIndex, count);
+        }
+
+        public override byte[] GetChecksum()
+        {
+            if (_checksum == null)
+            {
+                var charBuffer = _content.ToCharArray();
+                var encoder = Encoding.GetEncoder();
+                var byteCount = encoder.GetByteCount(charBuffer, 0, charBuffer.Length, flush: true);
+                var bytes = new byte[byteCount];
+                encoder.GetBytes(charBuffer, 0, charBuffer.Length, bytes, 0, flush: true);
+
+                using (var hashAlgorithm = SHA1.Create())
+                {
+                    _checksum = hashAlgorithm.ComputeHash(bytes);
+                }
+            }
+
+            var copiedChecksum = new byte[_checksum.Length];
+            _checksum.CopyTo(copiedChecksum, 0);
+
+            return copiedChecksum;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SuppressChecksumOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SuppressChecksumOptionsFeature.cs
new file mode 100644
index 0000000000..81e9f2a02d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/SuppressChecksumOptionsFeature.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class SuppressChecksumOptionsFeature : RazorEngineFeatureBase, IConfigureRazorCodeGenerationOptionsFeature
+    {
+        public int Order { get; set; }
+
+        public void Configure(RazorCodeGenerationOptionsBuilder options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.SuppressChecksum = true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ArrayElement.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ArrayElement.cs
new file mode 100644
index 0000000000..85345e657b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ArrayElement.cs
@@ -0,0 +1,58 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal struct ArrayElement<T>
+    {
+        public T Value;
+
+        public static implicit operator T(ArrayElement<T> element)
+        {
+            return element.Value;
+        }
+
+        //NOTE: there is no opposite conversion operator T -> ArrayElement<T>
+        //
+        // that is because it is preferred to update array elements in-place
+        // "elements[i].Value = v" results in much better code than "elements[i] = (ArrayElement<T>)v"
+        //
+        // The reason is that x86 ABI requires that structs must be returned in
+        // a return buffer even if they can fit in a register like this one.
+        // Also since struct contains a reference, the write to the buffer is done with a checked GC barrier
+        // as JIT does not know if the write goes to a stack or a heap location.
+        // Assigning to Value directly easily avoids all this redundancy.
+
+        public static ArrayElement<T>[] MakeElementArray(T[] items)
+        {
+            if (items == null)
+            {
+                return null;
+            }
+
+            var array = new ArrayElement<T>[items.Length];
+            for (var i = 0; i < items.Length; i++)
+            {
+                array[i].Value = items[i];
+            }
+
+            return array;
+        }
+
+        public static T[] MakeArray(ArrayElement<T>[] items)
+        {
+            if (items == null)
+            {
+                return null;
+            }
+
+            var array = new T[items.Length];
+            for (var i = 0; i < items.Length; i++)
+            {
+                array[i] = items[i].Value;
+            }
+
+            return array;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ChildSyntaxList.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ChildSyntaxList.cs
new file mode 100644
index 0000000000..5671a5c9f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ChildSyntaxList.cs
@@ -0,0 +1,710 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal readonly struct ChildSyntaxList : IEquatable<ChildSyntaxList>, IReadOnlyList<SyntaxNode>
+    {
+        private readonly SyntaxNode _node;
+        private readonly int _count;
+
+        internal ChildSyntaxList(SyntaxNode node)
+        {
+            _node = node;
+            _count = CountNodes(node.Green);
+        }
+
+        /// <summary>
+        /// Gets the number of children contained in the <see cref="ChildSyntaxList"/>.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return _count;
+            }
+        }
+
+        internal static int CountNodes(GreenNode green)
+        {
+            var n = 0;
+
+            for (int i = 0, s = green.SlotCount; i < s; i++)
+            {
+                var child = green.GetSlot(i);
+                if (child != null)
+                {
+                    if (!child.IsList)
+                    {
+                        n++;
+                    }
+                    else
+                    {
+                        n += child.SlotCount;
+                    }
+                }
+            }
+
+            return n;
+        }
+
+        /// <summary>Gets the child at the specified index.</summary>
+        /// <param name="index">The zero-based index of the child to get.</param>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        ///   <paramref name="index"/> is less than 0.-or-<paramref name="index" /> is equal to or greater than <see cref="ChildSyntaxList.Count"/>. </exception>
+        public SyntaxNode this[int index]
+        {
+            get
+            {
+                if (unchecked((uint)index < (uint)_count))
+                {
+                    return ItemInternal(_node, index);
+                }
+
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+        }
+
+        internal SyntaxNode Node
+        {
+            get { return _node; }
+        }
+
+        private static int Occupancy(GreenNode green)
+        {
+            return green.IsList ? green.SlotCount : 1;
+        }
+
+        /// <summary>
+        /// internal indexer that does not verify index.
+        /// Used when caller has already ensured that index is within bounds.
+        /// </summary>
+        internal static SyntaxNode ItemInternal(SyntaxNode node, int index)
+        {
+            GreenNode greenChild;
+            var green = node.Green;
+            var idx = index;
+            var slotIndex = 0;
+            var position = node.Position;
+
+            // find a slot that contains the node or its parent list (if node is in a list)
+            // we will be skipping whole slots here so we will not loop for long
+            //
+            // at the end of this loop we will have
+            // 1) slot index - slotIdx
+            // 2) if the slot is a list, node index in the list - idx
+            // 3) slot position - position
+            while (true)
+            {
+                greenChild = green.GetSlot(slotIndex);
+                if (greenChild != null)
+                {
+                    var currentOccupancy = Occupancy(greenChild);
+                    if (idx < currentOccupancy)
+                    {
+                        break;
+                    }
+
+                    idx -= currentOccupancy;
+                    position += greenChild.FullWidth;
+                }
+
+                slotIndex++;
+            }
+
+            // get node that represents this slot
+            var red = node.GetNodeSlot(slotIndex);
+            if (!greenChild.IsList)
+            {
+                // this is a single node
+                // if it is a node, we are done
+                if (red != null)
+                {
+                    return red;
+                }
+            }
+            else if (red != null)
+            {
+                // it is a red list of nodes (separated or not), most common case
+                var redChild = red.GetNodeSlot(idx);
+                if (redChild != null)
+                {
+                    // this is our node
+                    return redChild;
+                }
+            }
+
+            return node;
+        }
+
+        /// <summary>
+        /// Locate the node that is a child of the given <see cref="SyntaxNode"/> and contains the given position.
+        /// </summary>
+        /// <param name="node">The <see cref="SyntaxNode"/> to search.</param>
+        /// <param name="targetPosition">The position.</param>
+        /// <returns>The node that spans the given position.</returns>
+        /// <remarks>
+        /// Assumes that <paramref name="targetPosition"/> is within the span of <paramref name="node"/>.
+        /// </remarks>
+        internal static SyntaxNode ChildThatContainsPosition(SyntaxNode node, int targetPosition)
+        {
+            // The targetPosition must already be within this node
+            Debug.Assert(node.FullSpan.Contains(targetPosition));
+
+            var green = node.Green;
+            var position = node.Position;
+            var index = 0;
+
+            Debug.Assert(!green.IsList);
+
+            // Find the green node that spans the target position.
+            // We will be skipping whole slots here so we will not loop for long
+            int slot;
+            for (slot = 0; ; slot++)
+            {
+                var greenChild = green.GetSlot(slot);
+                if (greenChild != null)
+                {
+                    var endPosition = position + greenChild.FullWidth;
+                    if (targetPosition < endPosition)
+                    {
+                        // Descend into the child element
+                        green = greenChild;
+                        break;
+                    }
+
+                    position = endPosition;
+                    index += Occupancy(greenChild);
+                }
+            }
+
+            // Realize the red node (if any)
+            var red = node.GetNodeSlot(slot);
+            if (!green.IsList)
+            {
+                // This is a single node.
+                // If it is a node, we are done.
+                if (red != null)
+                {
+                    return red;
+                }
+            }
+            else
+            {
+                slot = green.FindSlotIndexContainingOffset(targetPosition - position);
+
+                // Realize the red node (if any)
+                if (red != null)
+                {
+                    // It is a red list of nodes
+                    red = red.GetNodeSlot(slot);
+                    if (red != null)
+                    {
+                        return red;
+                    }
+                }
+
+                // Since we can't have "lists of lists", the Occupancy calculation for
+                // child elements in a list is simple.
+                index += slot;
+            }
+
+            return node;
+        }
+
+        /// <summary>
+        /// internal indexer that does not verify index.
+        /// Used when caller has already ensured that index is within bounds.
+        /// </summary>
+        internal static SyntaxNode ItemInternalAsNode(SyntaxNode node, int index)
+        {
+            GreenNode greenChild;
+            var green = node.Green;
+            var idx = index;
+            var slotIndex = 0;
+
+            // find a slot that contains the node or its parent list (if node is in a list)
+            // we will be skipping whole slots here so we will not loop for long
+            //
+            // at the end of this loop we will have
+            // 1) slot index - slotIdx
+            // 2) if the slot is a list, node index in the list - idx
+            while (true)
+            {
+                greenChild = green.GetSlot(slotIndex);
+                if (greenChild != null)
+                {
+                    var currentOccupancy = Occupancy(greenChild);
+                    if (idx < currentOccupancy)
+                    {
+                        break;
+                    }
+
+                    idx -= currentOccupancy;
+                }
+
+                slotIndex++;
+            }
+
+            // get node that represents this slot
+            var red = node.GetNodeSlot(slotIndex);
+            if (greenChild.IsList && red != null)
+            {
+                // it is a red list of nodes, most common case
+                return red.GetNodeSlot(idx);
+            }
+
+            // this is a single node
+            return red;
+        }
+
+        // for debugging
+        private SyntaxNode[] Nodes
+        {
+            get
+            {
+                return this.ToArray();
+            }
+        }
+
+        public bool Any()
+        {
+            return _count != 0;
+        }
+
+        /// <summary>
+        /// Returns the first child in the list.
+        /// </summary>
+        /// <returns>The first child in the list.</returns>
+        /// <exception cref="System.InvalidOperationException">The list is empty.</exception>    
+        public SyntaxNode First()
+        {
+            if (Any())
+            {
+                return this[0];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns the last child in the list.
+        /// </summary>
+        /// <returns>The last child in the list.</returns>
+        /// <exception cref="System.InvalidOperationException">The list is empty.</exception>    
+        public SyntaxNode Last()
+        {
+            if (Any())
+            {
+                return this[_count - 1];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns a list which contains all children of <see cref="ChildSyntaxList"/> in reversed order.
+        /// </summary>
+        /// <returns><see cref="Reversed"/> which contains all children of <see cref="ChildSyntaxList"/> in reversed order</returns>
+        public Reversed Reverse()
+        {
+            return new Reversed(_node, _count);
+        }
+
+        /// <summary>Returns an enumerator that iterates through the <see cref="ChildSyntaxList"/>.</summary>
+        /// <returns>A <see cref="Enumerator"/> for the <see cref="ChildSyntaxList"/>.</returns>
+        public Enumerator GetEnumerator()
+        {
+            if (_node == null)
+            {
+                return default;
+            }
+
+            return new Enumerator(_node, _count);
+        }
+
+        IEnumerator<SyntaxNode> IEnumerable<SyntaxNode>.GetEnumerator()
+        {
+            if (_node == null)
+            {
+                return EmptyEnumerator<SyntaxNode>.Instance;
+            }
+
+            return new EnumeratorImpl(_node, _count);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            if (_node == null)
+            {
+                return EmptyEnumerator<SyntaxNode>.Instance;
+            }
+
+            return new EnumeratorImpl(_node, _count);
+        }
+
+        /// <summary>Determines whether the specified object is equal to the current instance.</summary>
+        /// <returns>true if the specified object is a <see cref="ChildSyntaxList" /> structure and is equal to the current instance; otherwise, false.</returns>
+        /// <param name="obj">The object to be compared with the current instance.</param>
+        public override bool Equals(object obj)
+        {
+            return obj is ChildSyntaxList && Equals((ChildSyntaxList)obj);
+        }
+
+        /// <summary>Determines whether the specified <see cref="ChildSyntaxList" /> structure is equal to the current instance.</summary>
+        /// <returns>true if the specified <see cref="ChildSyntaxList" /> structure is equal to the current instance; otherwise, false.</returns>
+        /// <param name="other">The <see cref="ChildSyntaxList" /> structure to be compared with the current instance.</param>
+        public bool Equals(ChildSyntaxList other)
+        {
+            return _node == other._node;
+        }
+
+        /// <summary>Returns the hash code for the current instance.</summary>
+        /// <returns>A 32-bit signed integer hash code.</returns>
+        public override int GetHashCode()
+        {
+            return _node?.GetHashCode() ?? 0;
+        }
+
+        /// <summary>Indicates whether two <see cref="ChildSyntaxList" /> structures are equal.</summary>
+        /// <returns>true if <paramref name="list1" /> is equal to <paramref name="list2" />; otherwise, false.</returns>
+        /// <param name="list1">The <see cref="ChildSyntaxList" /> structure on the left side of the equality operator.</param>
+        /// <param name="list2">The <see cref="ChildSyntaxList" /> structure on the right side of the equality operator.</param>
+        public static bool operator ==(ChildSyntaxList list1, ChildSyntaxList list2)
+        {
+            return list1.Equals(list2);
+        }
+
+        /// <summary>Indicates whether two <see cref="ChildSyntaxList" /> structures are unequal.</summary>
+        /// <returns>true if <paramref name="list1" /> is equal to <paramref name="list2" />; otherwise, false.</returns>
+        /// <param name="list1">The <see cref="ChildSyntaxList" /> structure on the left side of the inequality operator.</param>
+        /// <param name="list2">The <see cref="ChildSyntaxList" /> structure on the right side of the inequality operator.</param>
+        public static bool operator !=(ChildSyntaxList list1, ChildSyntaxList list2)
+        {
+            return !list1.Equals(list2);
+        }
+
+        /// <summary>Enumerates the elements of a <see cref="ChildSyntaxList" />.</summary>
+        public struct Enumerator
+        {
+            private SyntaxNode _node;
+            private int _count;
+            private int _childIndex;
+
+            internal Enumerator(SyntaxNode node, int count)
+            {
+                _node = node;
+                _count = count;
+                _childIndex = -1;
+            }
+
+            // PERF: Initialize an Enumerator directly from a SyntaxNode without going
+            // via ChildNodes. This saves constructing an intermediate ChildSyntaxList
+            internal void InitializeFrom(SyntaxNode node)
+            {
+                _node = node;
+                _count = CountNodes(node.Green);
+                _childIndex = -1;
+            }
+
+            /// <summary>Advances the enumerator to the next element of the <see cref="ChildSyntaxList" />.</summary>
+            /// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+            public bool MoveNext()
+            {
+                var newIndex = _childIndex + 1;
+                if (newIndex < _count)
+                {
+                    _childIndex = newIndex;
+                    return true;
+                }
+
+                return false;
+            }
+
+            /// <summary>Gets the element at the current position of the enumerator.</summary>
+            /// <returns>The element in the <see cref="ChildSyntaxList" /> at the current position of the enumerator.</returns>
+            public SyntaxNode Current
+            {
+                get
+                {
+                    return ItemInternal(_node, _childIndex);
+                }
+            }
+
+            /// <summary>Sets the enumerator to its initial position, which is before the first element in the collection.</summary>
+            public void Reset()
+            {
+                _childIndex = -1;
+            }
+
+            internal bool TryMoveNextAndGetCurrent(out SyntaxNode current)
+            {
+                if (!MoveNext())
+                {
+                    current = default;
+                    return false;
+                }
+
+                current = ItemInternal(_node, _childIndex);
+                return true;
+            }
+
+            internal SyntaxNode TryMoveNextAndGetCurrentAsNode()
+            {
+                while (MoveNext())
+                {
+                    var nodeValue = ItemInternalAsNode(_node, _childIndex);
+                    if (nodeValue != null)
+                    {
+                        return nodeValue;
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        private class EnumeratorImpl : IEnumerator<SyntaxNode>
+        {
+            private Enumerator _enumerator;
+
+            internal EnumeratorImpl(SyntaxNode node, int count)
+            {
+                _enumerator = new Enumerator(node, count);
+            }
+
+            /// <summary>
+            /// Gets the element in the collection at the current position of the enumerator.
+            /// </summary>
+            /// <returns>
+            /// The element in the collection at the current position of the enumerator.
+            ///   </returns>
+            public SyntaxNode Current
+            {
+                get { return _enumerator.Current; }
+            }
+
+            /// <summary>
+            /// Gets the element in the collection at the current position of the enumerator.
+            /// </summary>
+            /// <returns>
+            /// The element in the collection at the current position of the enumerator.
+            ///   </returns>
+            object IEnumerator.Current
+            {
+                get { return _enumerator.Current; }
+            }
+
+            /// <summary>
+            /// Advances the enumerator to the next element of the collection.
+            /// </summary>
+            /// <returns>
+            /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
+            /// </returns>
+            public bool MoveNext()
+            {
+                return _enumerator.MoveNext();
+            }
+
+            /// <summary>
+            /// Sets the enumerator to its initial position, which is before the first element in the collection.
+            /// </summary>
+            public void Reset()
+            {
+                _enumerator.Reset();
+            }
+
+            /// <summary>
+            /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            /// </summary>
+            public void Dispose()
+            { }
+        }
+
+        public readonly partial struct Reversed : IEnumerable<SyntaxNode>, IEquatable<Reversed>
+        {
+            private readonly SyntaxNode _node;
+            private readonly int _count;
+
+            internal Reversed(SyntaxNode node, int count)
+            {
+                _node = node;
+                _count = count;
+            }
+
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(_node, _count);
+            }
+
+            IEnumerator<SyntaxNode> IEnumerable<SyntaxNode>.GetEnumerator()
+            {
+                if (_node == null)
+                {
+                    return EmptyEnumerator<SyntaxNode>.Instance;
+                }
+
+                return new EnumeratorImpl(_node, _count);
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                if (_node == null)
+                {
+                    return EmptyEnumerator<SyntaxNode>.Instance;
+                }
+
+                return new EnumeratorImpl(_node, _count);
+            }
+
+            public override int GetHashCode()
+            {
+                if (_node == null)
+                {
+                    return 0;
+                }
+
+                var hash = HashCodeCombiner.Start();
+                hash.Add(_node.GetHashCode());
+                hash.Add(_count);
+                return hash.CombinedHash;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return (obj is Reversed) && Equals((Reversed)obj);
+            }
+
+            public bool Equals(Reversed other)
+            {
+                return _node == other._node
+                    && _count == other._count;
+            }
+
+            public struct Enumerator
+            {
+                private readonly SyntaxNode _node;
+                private readonly int _count;
+                private int _childIndex;
+
+                internal Enumerator(SyntaxNode node, int count)
+                {
+                    _node = node;
+                    _count = count;
+                    _childIndex = count;
+                }
+
+                public bool MoveNext()
+                {
+                    return --_childIndex >= 0;
+                }
+
+                public SyntaxNode Current
+                {
+                    get
+                    {
+                        return ItemInternal(_node, _childIndex);
+                    }
+                }
+
+                public void Reset()
+                {
+                    _childIndex = _count;
+                }
+            }
+
+            private class EnumeratorImpl : IEnumerator<SyntaxNode>
+            {
+                private Enumerator _enumerator;
+
+                internal EnumeratorImpl(SyntaxNode node, int count)
+                {
+                    _enumerator = new Enumerator(node, count);
+                }
+
+                /// <summary>
+                /// Gets the element in the collection at the current position of the enumerator.
+                /// </summary>
+                /// <returns>
+                /// The element in the collection at the current position of the enumerator.
+                ///   </returns>
+                public SyntaxNode Current
+                {
+                    get { return _enumerator.Current; }
+                }
+
+                /// <summary>
+                /// Gets the element in the collection at the current position of the enumerator.
+                /// </summary>
+                /// <returns>
+                /// The element in the collection at the current position of the enumerator.
+                ///   </returns>
+                object IEnumerator.Current
+                {
+                    get { return _enumerator.Current; }
+                }
+
+                /// <summary>
+                /// Advances the enumerator to the next element of the collection.
+                /// </summary>
+                /// <returns>
+                /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
+                /// </returns>
+                /// <exception cref="InvalidOperationException">The collection was modified after the enumerator was created. </exception>
+                public bool MoveNext()
+                {
+                    return _enumerator.MoveNext();
+                }
+
+                /// <summary>
+                /// Sets the enumerator to its initial position, which is before the first element in the collection.
+                /// </summary>
+                /// <exception cref="InvalidOperationException">The collection was modified after the enumerator was created. </exception>
+                public void Reset()
+                {
+                    _enumerator.Reset();
+                }
+
+                /// <summary>
+                /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+                /// </summary>
+                public void Dispose()
+                { }
+            }
+        }
+
+        internal class EmptyEnumerator<T> : IEnumerator<T>
+        {
+            public static readonly IEnumerator<T> Instance = new EmptyEnumerator<T>();
+
+            protected EmptyEnumerator()
+            {
+            }
+
+            public T Current => throw new InvalidOperationException();
+
+            object IEnumerator.Current => throw new NotImplementedException();
+
+            public void Dispose()
+            {
+            }
+
+            public bool MoveNext()
+            {
+                return false;
+            }
+
+            public void Reset()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
new file mode 100644
index 0000000000..1849a7b410
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -0,0 +1,4264 @@
+// <auto-generated />
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+  internal abstract partial class RazorBlockSyntax : RazorSyntaxNode
+  {
+    internal RazorBlockSyntax(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal RazorBlockSyntax(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+
+    public abstract SyntaxList<RazorSyntaxNode> Children { get; }
+  }
+
+  internal sealed partial class RazorDocumentSyntax : RazorSyntaxNode
+  {
+    private readonly RazorBlockSyntax _document;
+
+    internal RazorDocumentSyntax(SyntaxKind kind, RazorBlockSyntax document, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(document);
+        _document = document;
+    }
+
+
+    internal RazorDocumentSyntax(SyntaxKind kind, RazorBlockSyntax document)
+        : base(kind)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(document);
+        _document = document;
+    }
+
+    public RazorBlockSyntax Document { get { return _document; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _document;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorDocumentSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDocument(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDocument(this);
+    }
+
+    public RazorDocumentSyntax Update(RazorBlockSyntax document)
+    {
+        if (document != Document)
+        {
+            var newNode = SyntaxFactory.RazorDocument(document);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorDocumentSyntax(Kind, _document, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorDocumentSyntax(Kind, _document, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorCommentBlockSyntax : RazorSyntaxNode
+  {
+    private readonly SyntaxToken _startCommentTransition;
+    private readonly SyntaxToken _startCommentStar;
+    private readonly SyntaxToken _comment;
+    private readonly SyntaxToken _endCommentStar;
+    private readonly SyntaxToken _endCommentTransition;
+
+    internal RazorCommentBlockSyntax(SyntaxKind kind, SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 5;
+        AdjustFlagsAndWidth(startCommentTransition);
+        _startCommentTransition = startCommentTransition;
+        AdjustFlagsAndWidth(startCommentStar);
+        _startCommentStar = startCommentStar;
+        AdjustFlagsAndWidth(comment);
+        _comment = comment;
+        AdjustFlagsAndWidth(endCommentStar);
+        _endCommentStar = endCommentStar;
+        AdjustFlagsAndWidth(endCommentTransition);
+        _endCommentTransition = endCommentTransition;
+    }
+
+
+    internal RazorCommentBlockSyntax(SyntaxKind kind, SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+        : base(kind)
+    {
+        SlotCount = 5;
+        AdjustFlagsAndWidth(startCommentTransition);
+        _startCommentTransition = startCommentTransition;
+        AdjustFlagsAndWidth(startCommentStar);
+        _startCommentStar = startCommentStar;
+        AdjustFlagsAndWidth(comment);
+        _comment = comment;
+        AdjustFlagsAndWidth(endCommentStar);
+        _endCommentStar = endCommentStar;
+        AdjustFlagsAndWidth(endCommentTransition);
+        _endCommentTransition = endCommentTransition;
+    }
+
+    public SyntaxToken StartCommentTransition { get { return _startCommentTransition; } }
+    public SyntaxToken StartCommentStar { get { return _startCommentStar; } }
+    public SyntaxToken Comment { get { return _comment; } }
+    public SyntaxToken EndCommentStar { get { return _endCommentStar; } }
+    public SyntaxToken EndCommentTransition { get { return _endCommentTransition; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startCommentTransition;
+            case 1: return _startCommentStar;
+            case 2: return _comment;
+            case 3: return _endCommentStar;
+            case 4: return _endCommentTransition;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorCommentBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorCommentBlock(this);
+    }
+
+    public RazorCommentBlockSyntax Update(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+        if (startCommentTransition != StartCommentTransition || startCommentStar != StartCommentStar || comment != Comment || endCommentStar != EndCommentStar || endCommentTransition != EndCommentTransition)
+        {
+            var newNode = SyntaxFactory.RazorCommentBlock(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorCommentBlockSyntax(Kind, _startCommentTransition, _startCommentStar, _comment, _endCommentStar, _endCommentTransition, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorCommentBlockSyntax(Kind, _startCommentTransition, _startCommentStar, _comment, _endCommentStar, _endCommentTransition, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorMetaCodeSyntax : RazorSyntaxNode
+  {
+    private readonly GreenNode _metaCode;
+
+    internal RazorMetaCodeSyntax(SyntaxKind kind, GreenNode metaCode, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (metaCode != null)
+        {
+            AdjustFlagsAndWidth(metaCode);
+            _metaCode = metaCode;
+        }
+    }
+
+
+    internal RazorMetaCodeSyntax(SyntaxKind kind, GreenNode metaCode)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (metaCode != null)
+        {
+            AdjustFlagsAndWidth(metaCode);
+            _metaCode = metaCode;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> MetaCode { get { return new SyntaxList<SyntaxToken>(_metaCode); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _metaCode;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorMetaCodeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorMetaCode(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorMetaCode(this);
+    }
+
+    public RazorMetaCodeSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> metaCode)
+    {
+        if (metaCode != MetaCode)
+        {
+            var newNode = SyntaxFactory.RazorMetaCode(metaCode);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorMetaCodeSyntax(Kind, _metaCode, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorMetaCodeSyntax(Kind, _metaCode, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class GenericBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal GenericBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal GenericBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.GenericBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitGenericBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitGenericBlock(this);
+    }
+
+    public GenericBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.GenericBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new GenericBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new GenericBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class UnclassifiedTextLiteralSyntax : RazorSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal UnclassifiedTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal UnclassifiedTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.UnclassifiedTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public UnclassifiedTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.UnclassifiedTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new UnclassifiedTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new UnclassifiedTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal abstract partial class MarkupSyntaxNode : RazorSyntaxNode
+  {
+    internal MarkupSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal MarkupSyntaxNode(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+  }
+
+  internal sealed partial class MarkupBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupBlock(this);
+    }
+
+    public MarkupBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTransitionSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _transitionTokens;
+
+    internal MarkupTransitionSyntax(SyntaxKind kind, GreenNode transitionTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (transitionTokens != null)
+        {
+            AdjustFlagsAndWidth(transitionTokens);
+            _transitionTokens = transitionTokens;
+        }
+    }
+
+
+    internal MarkupTransitionSyntax(SyntaxKind kind, GreenNode transitionTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (transitionTokens != null)
+        {
+            AdjustFlagsAndWidth(transitionTokens);
+            _transitionTokens = transitionTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> TransitionTokens { get { return new SyntaxList<SyntaxToken>(_transitionTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transitionTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTransitionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTransition(this);
+    }
+
+    public MarkupTransitionSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> transitionTokens)
+    {
+        if (transitionTokens != TransitionTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTransition(transitionTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTransitionSyntax(Kind, _transitionTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTransitionSyntax(Kind, _transitionTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal MarkupTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal MarkupTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public MarkupTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupEphemeralTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal MarkupEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal MarkupEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupEphemeralTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public MarkupEphemeralTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupEphemeralTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupEphemeralTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupCommentBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupCommentBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupCommentBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupCommentBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public MarkupCommentBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupCommentBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupCommentBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupCommentBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagBlock(this);
+    }
+
+    public MarkupTagBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+
+    internal MarkupMinimizedAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupMinimizedAttributeBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupMinimizedAttributeBlockSyntax(Kind, _namePrefix, _name, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupMinimizedAttributeBlockSyntax(Kind, _namePrefix, _name, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+    private readonly MarkupTextLiteralSyntax _nameSuffix;
+    private readonly SyntaxToken _equalsToken;
+    private readonly MarkupTextLiteralSyntax _valuePrefix;
+    private readonly RazorBlockSyntax _value;
+    private readonly MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+
+    internal MarkupAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+        : base(kind)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+    public MarkupTextLiteralSyntax NameSuffix { get { return _nameSuffix; } }
+    public SyntaxToken EqualsToken { get { return _equalsToken; } }
+    public MarkupTextLiteralSyntax ValuePrefix { get { return _valuePrefix; } }
+    public RazorBlockSyntax Value { get { return _value; } }
+    public MarkupTextLiteralSyntax ValueSuffix { get { return _valueSuffix; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupAttributeBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public MarkupAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupAttributeBlockSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupAttributeBlockSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupLiteralAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _prefix;
+    private readonly MarkupTextLiteralSyntax _value;
+
+    internal MarkupLiteralAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+    }
+
+
+    internal MarkupLiteralAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+    }
+
+    public MarkupTextLiteralSyntax Prefix { get { return _prefix; } }
+    public MarkupTextLiteralSyntax Value { get { return _value; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupLiteralAttributeValueSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public MarkupLiteralAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupLiteralAttributeValueSyntax(Kind, _prefix, _value, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupLiteralAttributeValueSyntax(Kind, _prefix, _value, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupDynamicAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _prefix;
+    private readonly RazorBlockSyntax _value;
+
+    internal MarkupDynamicAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, RazorBlockSyntax value, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+    }
+
+
+    internal MarkupDynamicAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+    }
+
+    public MarkupTextLiteralSyntax Prefix { get { return _prefix; } }
+    public RazorBlockSyntax Value { get { return _value; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupDynamicAttributeValueSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public MarkupDynamicAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupDynamicAttributeValue(prefix, value);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupDynamicAttributeValueSyntax(Kind, _prefix, _value, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupDynamicAttributeValueSyntax(Kind, _prefix, _value, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupElementSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTagBlockSyntax _startTag;
+    private readonly GreenNode _body;
+    private readonly MarkupTagBlockSyntax _endTag;
+
+    internal MarkupElementSyntax(SyntaxKind kind, MarkupTagBlockSyntax startTag, GreenNode body, MarkupTagBlockSyntax endTag, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        if (startTag != null)
+        {
+            AdjustFlagsAndWidth(startTag);
+            _startTag = startTag;
+        }
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+
+    internal MarkupElementSyntax(SyntaxKind kind, MarkupTagBlockSyntax startTag, GreenNode body, MarkupTagBlockSyntax endTag)
+        : base(kind)
+    {
+        SlotCount = 3;
+        if (startTag != null)
+        {
+            AdjustFlagsAndWidth(startTag);
+            _startTag = startTag;
+        }
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+    public MarkupTagBlockSyntax StartTag { get { return _startTag; } }
+    public SyntaxList<RazorSyntaxNode> Body { get { return new SyntaxList<RazorSyntaxNode>(_body); } }
+    public MarkupTagBlockSyntax EndTag { get { return _endTag; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupElementSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupElement(this);
+    }
+
+    public MarkupElementSyntax Update(MarkupTagBlockSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupElement(startTag, body, endTag);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupElementSyntax(Kind, _startTag, _body, _endTag, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupElementSyntax(Kind, _startTag, _body, _endTag, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperElementSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTagHelperStartTagSyntax _startTag;
+    private readonly GreenNode _body;
+    private readonly MarkupTagHelperEndTagSyntax _endTag;
+
+    internal MarkupTagHelperElementSyntax(SyntaxKind kind, MarkupTagHelperStartTagSyntax startTag, GreenNode body, MarkupTagHelperEndTagSyntax endTag, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(startTag);
+        _startTag = startTag;
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+
+    internal MarkupTagHelperElementSyntax(SyntaxKind kind, MarkupTagHelperStartTagSyntax startTag, GreenNode body, MarkupTagHelperEndTagSyntax endTag)
+        : base(kind)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(startTag);
+        _startTag = startTag;
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+    public MarkupTagHelperStartTagSyntax StartTag { get { return _startTag; } }
+    public SyntaxList<RazorSyntaxNode> Body { get { return new SyntaxList<RazorSyntaxNode>(_body); } }
+    public MarkupTagHelperEndTagSyntax EndTag { get { return _endTag; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperElementSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public MarkupTagHelperElementSyntax Update(MarkupTagHelperStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperElement(startTag, body, endTag);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperElementSyntax(Kind, _startTag, _body, _endTag, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperElementSyntax(Kind, _startTag, _body, _endTag, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperStartTagSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperStartTagSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public MarkupTagHelperStartTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperStartTag(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperStartTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperStartTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperEndTagSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperEndTagSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public MarkupTagHelperEndTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperEndTag(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperEndTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperEndTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+    private readonly MarkupTextLiteralSyntax _nameSuffix;
+    private readonly SyntaxToken _equalsToken;
+    private readonly MarkupTextLiteralSyntax _valuePrefix;
+    private readonly MarkupTagHelperAttributeValueSyntax _value;
+    private readonly MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+
+    internal MarkupTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+        : base(kind)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+    public MarkupTextLiteralSyntax NameSuffix { get { return _nameSuffix; } }
+    public SyntaxToken EqualsToken { get { return _equalsToken; } }
+    public MarkupTextLiteralSyntax ValuePrefix { get { return _valuePrefix; } }
+    public MarkupTagHelperAttributeValueSyntax Value { get { return _value; } }
+    public MarkupTextLiteralSyntax ValueSuffix { get { return _valueSuffix; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperAttributeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public MarkupTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperAttributeSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperAttributeSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+
+    internal MarkupMinimizedTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupMinimizedTagHelperAttributeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix, name);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupMinimizedTagHelperAttributeSyntax(Kind, _namePrefix, _name, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupMinimizedTagHelperAttributeSyntax(Kind, _namePrefix, _name, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeValueSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagHelperAttributeValueSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagHelperAttributeValueSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperAttributeValueSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttributeValue(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperAttributeValueSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperAttributeValueSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal abstract partial class CSharpSyntaxNode : RazorSyntaxNode
+  {
+    internal CSharpSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal CSharpSyntaxNode(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+  }
+
+  internal sealed partial class CSharpCodeBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal CSharpCodeBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal CSharpCodeBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpCodeBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public CSharpCodeBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpCodeBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpCodeBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpCodeBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpTransitionSyntax : CSharpSyntaxNode
+  {
+    private readonly SyntaxToken _transition;
+
+    internal CSharpTransitionSyntax(SyntaxKind kind, SyntaxToken transition, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+    }
+
+
+    internal CSharpTransitionSyntax(SyntaxKind kind, SyntaxToken transition)
+        : base(kind)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+    }
+
+    public SyntaxToken Transition { get { return _transition; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpTransitionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTransition(this);
+    }
+
+    public CSharpTransitionSyntax Update(SyntaxToken transition)
+    {
+        if (transition != Transition)
+        {
+            var newNode = SyntaxFactory.CSharpTransition(transition);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpTransitionSyntax(Kind, _transition, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpTransitionSyntax(Kind, _transition, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpStatementLiteralSyntax : CSharpSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal CSharpStatementLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal CSharpStatementLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpStatementLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public CSharpStatementLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpStatementLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpStatementLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpStatementLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpExpressionLiteralSyntax : CSharpSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal CSharpExpressionLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal CSharpExpressionLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpExpressionLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public CSharpExpressionLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpExpressionLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpExpressionLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpExpressionLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpEphemeralTextLiteralSyntax : CSharpSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal CSharpEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal CSharpEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpEphemeralTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public CSharpEphemeralTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpEphemeralTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpEphemeralTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpTemplateBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal CSharpTemplateBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal CSharpTemplateBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpTemplateBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public CSharpTemplateBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpTemplateBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpTemplateBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpTemplateBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal abstract partial class CSharpRazorBlockSyntax : CSharpSyntaxNode
+  {
+    internal CSharpRazorBlockSyntax(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal CSharpRazorBlockSyntax(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+
+    public abstract CSharpTransitionSyntax Transition { get; }
+
+    public abstract CSharpSyntaxNode Body { get; }
+  }
+
+  internal sealed partial class CSharpStatementSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal CSharpStatementSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal CSharpStatementSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpStatementSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatement(this);
+    }
+
+    public CSharpStatementSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpStatement(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpStatementSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpStatementSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpStatementBodySyntax : CSharpSyntaxNode
+  {
+    private readonly RazorMetaCodeSyntax _openBrace;
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+    private readonly RazorMetaCodeSyntax _closeBrace;
+
+    internal CSharpStatementBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openBrace);
+        _openBrace = openBrace;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeBrace);
+        _closeBrace = closeBrace;
+    }
+
+
+    internal CSharpStatementBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+        : base(kind)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openBrace);
+        _openBrace = openBrace;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeBrace);
+        _closeBrace = closeBrace;
+    }
+
+    public RazorMetaCodeSyntax OpenBrace { get { return _openBrace; } }
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+    public RazorMetaCodeSyntax CloseBrace { get { return _closeBrace; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openBrace;
+            case 1: return _cSharpCode;
+            case 2: return _closeBrace;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpStatementBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementBody(this);
+    }
+
+    public CSharpStatementBodySyntax Update(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+        if (openBrace != OpenBrace || cSharpCode != CSharpCode || closeBrace != CloseBrace)
+        {
+            var newNode = SyntaxFactory.CSharpStatementBody(openBrace, cSharpCode, closeBrace);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpStatementBodySyntax(Kind, _openBrace, _cSharpCode, _closeBrace, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpStatementBodySyntax(Kind, _openBrace, _cSharpCode, _closeBrace, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal CSharpExplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal CSharpExplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpExplicitExpressionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public CSharpExplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpression(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpExplicitExpressionSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpExplicitExpressionSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private readonly RazorMetaCodeSyntax _openParen;
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+    private readonly RazorMetaCodeSyntax _closeParen;
+
+    internal CSharpExplicitExpressionBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openParen);
+        _openParen = openParen;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeParen);
+        _closeParen = closeParen;
+    }
+
+
+    internal CSharpExplicitExpressionBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+        : base(kind)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openParen);
+        _openParen = openParen;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeParen);
+        _closeParen = closeParen;
+    }
+
+    public RazorMetaCodeSyntax OpenParen { get { return _openParen; } }
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+    public RazorMetaCodeSyntax CloseParen { get { return _closeParen; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openParen;
+            case 1: return _cSharpCode;
+            case 2: return _closeParen;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpExplicitExpressionBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public CSharpExplicitExpressionBodySyntax Update(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+        if (openParen != OpenParen || cSharpCode != CSharpCode || closeParen != CloseParen)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpressionBody(openParen, cSharpCode, closeParen);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpExplicitExpressionBodySyntax(Kind, _openParen, _cSharpCode, _closeParen, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpExplicitExpressionBodySyntax(Kind, _openParen, _cSharpCode, _closeParen, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal CSharpImplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal CSharpImplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpImplicitExpressionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public CSharpImplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpression(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpImplicitExpressionSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpImplicitExpressionSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+
+    internal CSharpImplicitExpressionBodySyntax(SyntaxKind kind, CSharpCodeBlockSyntax cSharpCode, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+    }
+
+
+    internal CSharpImplicitExpressionBodySyntax(SyntaxKind kind, CSharpCodeBlockSyntax cSharpCode)
+        : base(kind)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpImplicitExpressionBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public CSharpImplicitExpressionBodySyntax Update(CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpImplicitExpressionBodySyntax(Kind, _cSharpCode, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpImplicitExpressionBodySyntax(Kind, _cSharpCode, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorDirectiveSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal RazorDirectiveSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal RazorDirectiveSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorDirectiveSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirective(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirective(this);
+    }
+
+    public RazorDirectiveSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.RazorDirective(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorDirectiveSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorDirectiveSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorDirectiveBodySyntax : CSharpSyntaxNode
+  {
+    private readonly RazorSyntaxNode _keyword;
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+
+    internal RazorDirectiveBodySyntax(SyntaxKind kind, RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(keyword);
+        _keyword = keyword;
+        if (cSharpCode != null)
+        {
+            AdjustFlagsAndWidth(cSharpCode);
+            _cSharpCode = cSharpCode;
+        }
+    }
+
+
+    internal RazorDirectiveBodySyntax(SyntaxKind kind, RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(keyword);
+        _keyword = keyword;
+        if (cSharpCode != null)
+        {
+            AdjustFlagsAndWidth(cSharpCode);
+            _cSharpCode = cSharpCode;
+        }
+    }
+
+    public RazorSyntaxNode Keyword { get { return _keyword; } }
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _keyword;
+            case 1: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorDirectiveBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public RazorDirectiveBodySyntax Update(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (keyword != Keyword || cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorDirectiveBodySyntax(Kind, _keyword, _cSharpCode, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorDirectiveBodySyntax(Kind, _keyword, _cSharpCode, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal partial class SyntaxVisitor<TResult>
+  {
+    public virtual TResult VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitGenericBlock(GenericBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupElement(MarkupElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+  }
+
+
+  internal partial class SyntaxVisitor
+  {
+    public virtual void VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitGenericBlock(GenericBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupElement(MarkupElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+  }
+
+  internal partial class SyntaxRewriter : SyntaxVisitor<GreenNode>
+  {
+    public override GreenNode VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      var document = (RazorBlockSyntax)Visit(node.Document);
+      return node.Update(document);
+    }
+
+    public override GreenNode VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      var startCommentTransition = (SyntaxToken)Visit(node.StartCommentTransition);
+      var startCommentStar = (SyntaxToken)Visit(node.StartCommentStar);
+      var comment = (SyntaxToken)Visit(node.Comment);
+      var endCommentStar = (SyntaxToken)Visit(node.EndCommentStar);
+      var endCommentTransition = (SyntaxToken)Visit(node.EndCommentTransition);
+      return node.Update(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+    }
+
+    public override GreenNode VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      var metaCode = VisitList(node.MetaCode);
+      return node.Update(metaCode);
+    }
+
+    public override GreenNode VisitGenericBlock(GenericBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      var transitionTokens = VisitList(node.TransitionTokens);
+      return node.Update(transitionTokens);
+    }
+
+    public override GreenNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override GreenNode VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)Visit(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override GreenNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (MarkupTextLiteralSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override GreenNode VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override GreenNode VisitMarkupElement(MarkupElementSyntax node)
+    {
+      var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override GreenNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      var startTag = (MarkupTagHelperStartTagSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagHelperEndTagSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override GreenNode VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)Visit(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (MarkupTagHelperAttributeValueSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override GreenNode VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override GreenNode VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      var transition = (SyntaxToken)Visit(node.Transition);
+      return node.Update(transition);
+    }
+
+    public override GreenNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      var openBrace = (RazorMetaCodeSyntax)Visit(node.OpenBrace);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeBrace = (RazorMetaCodeSyntax)Visit(node.CloseBrace);
+      return node.Update(openBrace, cSharpCode, closeBrace);
+    }
+
+    public override GreenNode VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      var openParen = (RazorMetaCodeSyntax)Visit(node.OpenParen);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeParen = (RazorMetaCodeSyntax)Visit(node.CloseParen);
+      return node.Update(openParen, cSharpCode, closeParen);
+    }
+
+    public override GreenNode VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(cSharpCode);
+    }
+
+    public override GreenNode VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      var keyword = (RazorSyntaxNode)Visit(node.Keyword);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(keyword, cSharpCode);
+    }
+  }
+
+  internal static partial class SyntaxFactory
+  {
+    public static RazorDocumentSyntax RazorDocument(RazorBlockSyntax document)
+    {
+      if (document == null)
+        throw new ArgumentNullException(nameof(document));
+
+      var result = new RazorDocumentSyntax(SyntaxKind.RazorDocument, document);
+
+      return result;
+    }
+
+    public static RazorCommentBlockSyntax RazorCommentBlock(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+      if (startCommentTransition == null)
+        throw new ArgumentNullException(nameof(startCommentTransition));
+      switch (startCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("startCommentTransition");
+      }
+      if (startCommentStar == null)
+        throw new ArgumentNullException(nameof(startCommentStar));
+      switch (startCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("startCommentStar");
+      }
+      if (comment == null)
+        throw new ArgumentNullException(nameof(comment));
+      switch (comment.Kind)
+      {
+        case SyntaxKind.RazorCommentLiteral:
+          break;
+        default:
+          throw new ArgumentException("comment");
+      }
+      if (endCommentStar == null)
+        throw new ArgumentNullException(nameof(endCommentStar));
+      switch (endCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("endCommentStar");
+      }
+      if (endCommentTransition == null)
+        throw new ArgumentNullException(nameof(endCommentTransition));
+      switch (endCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("endCommentTransition");
+      }
+
+      return new RazorCommentBlockSyntax(SyntaxKind.RazorComment, startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+    }
+
+    public static RazorMetaCodeSyntax RazorMetaCode(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> metaCode)
+    {
+      var result = new RazorMetaCodeSyntax(SyntaxKind.RazorMetaCode, metaCode.Node);
+
+      return result;
+    }
+
+    public static GenericBlockSyntax GenericBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new GenericBlockSyntax(SyntaxKind.GenericBlock, children.Node);
+
+      return result;
+    }
+
+    public static UnclassifiedTextLiteralSyntax UnclassifiedTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new UnclassifiedTextLiteralSyntax(SyntaxKind.UnclassifiedTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupBlockSyntax MarkupBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupBlockSyntax(SyntaxKind.MarkupBlock, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTransitionSyntax MarkupTransition(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> transitionTokens)
+    {
+      var result = new MarkupTransitionSyntax(SyntaxKind.MarkupTransition, transitionTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupTextLiteralSyntax MarkupTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new MarkupTextLiteralSyntax(SyntaxKind.MarkupTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupEphemeralTextLiteralSyntax MarkupEphemeralTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new MarkupEphemeralTextLiteralSyntax(SyntaxKind.MarkupEphemeralTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupCommentBlockSyntax MarkupCommentBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupCommentBlockSyntax(SyntaxKind.MarkupCommentBlock, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTagBlockSyntax MarkupTagBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagBlockSyntax(SyntaxKind.MarkupTagBlock, children.Node);
+
+      return result;
+    }
+
+    public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+
+      var result = new MarkupMinimizedAttributeBlockSyntax(SyntaxKind.MarkupMinimizedAttributeBlock, namePrefix, name);
+
+      return result;
+    }
+
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      if (equalsToken == null)
+        throw new ArgumentNullException(nameof(equalsToken));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+
+      return new MarkupAttributeBlockSyntax(SyntaxKind.MarkupAttributeBlock, namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+      var result = new MarkupLiteralAttributeValueSyntax(SyntaxKind.MarkupLiteralAttributeValue, prefix, value);
+
+      return result;
+    }
+
+    public static MarkupDynamicAttributeValueSyntax MarkupDynamicAttributeValue(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+
+      var result = new MarkupDynamicAttributeValueSyntax(SyntaxKind.MarkupDynamicAttributeValue, prefix, value);
+
+      return result;
+    }
+
+    public static MarkupElementSyntax MarkupElement(MarkupTagBlockSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+      var result = new MarkupElementSyntax(SyntaxKind.MarkupElement, startTag, body.Node, endTag);
+
+      return result;
+    }
+
+    public static MarkupTagHelperElementSyntax MarkupTagHelperElement(MarkupTagHelperStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+      if (startTag == null)
+        throw new ArgumentNullException(nameof(startTag));
+
+      var result = new MarkupTagHelperElementSyntax(SyntaxKind.MarkupTagHelperElement, startTag, body.Node, endTag);
+
+      return result;
+    }
+
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagHelperStartTagSyntax(SyntaxKind.MarkupTagHelperStartTag, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagHelperEndTagSyntax(SyntaxKind.MarkupTagHelperEndTag, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      if (equalsToken == null)
+        throw new ArgumentNullException(nameof(equalsToken));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+
+      return new MarkupTagHelperAttributeSyntax(SyntaxKind.MarkupTagHelperAttribute, namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public static MarkupMinimizedTagHelperAttributeSyntax MarkupMinimizedTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+
+      var result = new MarkupMinimizedTagHelperAttributeSyntax(SyntaxKind.MarkupMinimizedTagHelperAttribute, namePrefix, name);
+
+      return result;
+    }
+
+    public static MarkupTagHelperAttributeValueSyntax MarkupTagHelperAttributeValue(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagHelperAttributeValueSyntax(SyntaxKind.MarkupTagHelperAttributeValue, children.Node);
+
+      return result;
+    }
+
+    public static CSharpCodeBlockSyntax CSharpCodeBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new CSharpCodeBlockSyntax(SyntaxKind.CSharpCodeBlock, children.Node);
+
+      return result;
+    }
+
+    public static CSharpTransitionSyntax CSharpTransition(SyntaxToken transition)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      switch (transition.Kind)
+      {
+        case SyntaxKind.Transition:
+          break;
+        default:
+          throw new ArgumentException("transition");
+      }
+
+      var result = new CSharpTransitionSyntax(SyntaxKind.CSharpTransition, transition);
+
+      return result;
+    }
+
+    public static CSharpStatementLiteralSyntax CSharpStatementLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new CSharpStatementLiteralSyntax(SyntaxKind.CSharpStatementLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static CSharpExpressionLiteralSyntax CSharpExpressionLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new CSharpExpressionLiteralSyntax(SyntaxKind.CSharpExpressionLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static CSharpEphemeralTextLiteralSyntax CSharpEphemeralTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new CSharpEphemeralTextLiteralSyntax(SyntaxKind.CSharpEphemeralTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static CSharpTemplateBlockSyntax CSharpTemplateBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new CSharpTemplateBlockSyntax(SyntaxKind.CSharpTemplateBlock, children.Node);
+
+      return result;
+    }
+
+    public static CSharpStatementSyntax CSharpStatement(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new CSharpStatementSyntax(SyntaxKind.CSharpStatement, transition, body);
+
+      return result;
+    }
+
+    public static CSharpStatementBodySyntax CSharpStatementBody(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+      if (openBrace == null)
+        throw new ArgumentNullException(nameof(openBrace));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeBrace == null)
+        throw new ArgumentNullException(nameof(closeBrace));
+
+      var result = new CSharpStatementBodySyntax(SyntaxKind.CSharpStatementBody, openBrace, cSharpCode, closeBrace);
+
+      return result;
+    }
+
+    public static CSharpExplicitExpressionSyntax CSharpExplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new CSharpExplicitExpressionSyntax(SyntaxKind.CSharpExplicitExpression, transition, body);
+
+      return result;
+    }
+
+    public static CSharpExplicitExpressionBodySyntax CSharpExplicitExpressionBody(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+      if (openParen == null)
+        throw new ArgumentNullException(nameof(openParen));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeParen == null)
+        throw new ArgumentNullException(nameof(closeParen));
+
+      var result = new CSharpExplicitExpressionBodySyntax(SyntaxKind.CSharpExplicitExpressionBody, openParen, cSharpCode, closeParen);
+
+      return result;
+    }
+
+    public static CSharpImplicitExpressionSyntax CSharpImplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new CSharpImplicitExpressionSyntax(SyntaxKind.CSharpImplicitExpression, transition, body);
+
+      return result;
+    }
+
+    public static CSharpImplicitExpressionBodySyntax CSharpImplicitExpressionBody(CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+
+      var result = new CSharpImplicitExpressionBodySyntax(SyntaxKind.CSharpImplicitExpressionBody, cSharpCode);
+
+      return result;
+    }
+
+    public static RazorDirectiveSyntax RazorDirective(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new RazorDirectiveSyntax(SyntaxKind.RazorDirective, transition, body);
+
+      return result;
+    }
+
+    public static RazorDirectiveBodySyntax RazorDirectiveBody(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (keyword == null)
+        throw new ArgumentNullException(nameof(keyword));
+
+      var result = new RazorDirectiveBodySyntax(SyntaxKind.RazorDirectiveBody, keyword, cSharpCode);
+
+      return result;
+    }
+
+    internal static IEnumerable<Type> GetNodeTypes()
+    {
+        return new Type[] {
+           typeof(RazorDocumentSyntax),
+           typeof(RazorCommentBlockSyntax),
+           typeof(RazorMetaCodeSyntax),
+           typeof(GenericBlockSyntax),
+           typeof(UnclassifiedTextLiteralSyntax),
+           typeof(MarkupBlockSyntax),
+           typeof(MarkupTransitionSyntax),
+           typeof(MarkupTextLiteralSyntax),
+           typeof(MarkupEphemeralTextLiteralSyntax),
+           typeof(MarkupCommentBlockSyntax),
+           typeof(MarkupTagBlockSyntax),
+           typeof(MarkupMinimizedAttributeBlockSyntax),
+           typeof(MarkupAttributeBlockSyntax),
+           typeof(MarkupLiteralAttributeValueSyntax),
+           typeof(MarkupDynamicAttributeValueSyntax),
+           typeof(MarkupElementSyntax),
+           typeof(MarkupTagHelperElementSyntax),
+           typeof(MarkupTagHelperStartTagSyntax),
+           typeof(MarkupTagHelperEndTagSyntax),
+           typeof(MarkupTagHelperAttributeSyntax),
+           typeof(MarkupMinimizedTagHelperAttributeSyntax),
+           typeof(MarkupTagHelperAttributeValueSyntax),
+           typeof(CSharpCodeBlockSyntax),
+           typeof(CSharpTransitionSyntax),
+           typeof(CSharpStatementLiteralSyntax),
+           typeof(CSharpExpressionLiteralSyntax),
+           typeof(CSharpEphemeralTextLiteralSyntax),
+           typeof(CSharpTemplateBlockSyntax),
+           typeof(CSharpStatementSyntax),
+           typeof(CSharpStatementBodySyntax),
+           typeof(CSharpExplicitExpressionSyntax),
+           typeof(CSharpExplicitExpressionBodySyntax),
+           typeof(CSharpImplicitExpressionSyntax),
+           typeof(CSharpImplicitExpressionBodySyntax),
+           typeof(RazorDirectiveSyntax),
+           typeof(RazorDirectiveBodySyntax)
+        };
+    }
+  }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
new file mode 100644
index 0000000000..b3c122bb05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -0,0 +1,1246 @@
+// <auto-generated />
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+  internal partial class SyntaxVisitor<TResult>
+  {
+    /// <summary>Called when the visitor visits a RazorDocumentSyntax node.</summary>
+    public virtual TResult VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorCommentBlockSyntax node.</summary>
+    public virtual TResult VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorMetaCodeSyntax node.</summary>
+    public virtual TResult VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a GenericBlockSyntax node.</summary>
+    public virtual TResult VisitGenericBlock(GenericBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a UnclassifiedTextLiteralSyntax node.</summary>
+    public virtual TResult VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTransitionSyntax node.</summary>
+    public virtual TResult VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTextLiteralSyntax node.</summary>
+    public virtual TResult VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupEphemeralTextLiteralSyntax node.</summary>
+    public virtual TResult VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupCommentBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedAttributeBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupAttributeBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupLiteralAttributeValueSyntax node.</summary>
+    public virtual TResult VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupDynamicAttributeValueSyntax node.</summary>
+    public virtual TResult VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupElementSyntax node.</summary>
+    public virtual TResult VisitMarkupElement(MarkupElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperElementSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperStartTagSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperEndTagSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedTagHelperAttributeSyntax node.</summary>
+    public virtual TResult VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeValueSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpCodeBlockSyntax node.</summary>
+    public virtual TResult VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTransitionSyntax node.</summary>
+    public virtual TResult VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementLiteralSyntax node.</summary>
+    public virtual TResult VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExpressionLiteralSyntax node.</summary>
+    public virtual TResult VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpEphemeralTextLiteralSyntax node.</summary>
+    public virtual TResult VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTemplateBlockSyntax node.</summary>
+    public virtual TResult VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementSyntax node.</summary>
+    public virtual TResult VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementBodySyntax node.</summary>
+    public virtual TResult VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionSyntax node.</summary>
+    public virtual TResult VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionBodySyntax node.</summary>
+    public virtual TResult VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionSyntax node.</summary>
+    public virtual TResult VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionBodySyntax node.</summary>
+    public virtual TResult VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveSyntax node.</summary>
+    public virtual TResult VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveBodySyntax node.</summary>
+    public virtual TResult VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+  }
+
+  internal partial class SyntaxVisitor
+  {
+    /// <summary>Called when the visitor visits a RazorDocumentSyntax node.</summary>
+    public virtual void VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorCommentBlockSyntax node.</summary>
+    public virtual void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorMetaCodeSyntax node.</summary>
+    public virtual void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a GenericBlockSyntax node.</summary>
+    public virtual void VisitGenericBlock(GenericBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a UnclassifiedTextLiteralSyntax node.</summary>
+    public virtual void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupBlockSyntax node.</summary>
+    public virtual void VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTransitionSyntax node.</summary>
+    public virtual void VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTextLiteralSyntax node.</summary>
+    public virtual void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupEphemeralTextLiteralSyntax node.</summary>
+    public virtual void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupCommentBlockSyntax node.</summary>
+    public virtual void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagBlockSyntax node.</summary>
+    public virtual void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedAttributeBlockSyntax node.</summary>
+    public virtual void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupAttributeBlockSyntax node.</summary>
+    public virtual void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupLiteralAttributeValueSyntax node.</summary>
+    public virtual void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupDynamicAttributeValueSyntax node.</summary>
+    public virtual void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupElementSyntax node.</summary>
+    public virtual void VisitMarkupElement(MarkupElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperElementSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperStartTagSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperEndTagSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedTagHelperAttributeSyntax node.</summary>
+    public virtual void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeValueSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpCodeBlockSyntax node.</summary>
+    public virtual void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTransitionSyntax node.</summary>
+    public virtual void VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementLiteralSyntax node.</summary>
+    public virtual void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExpressionLiteralSyntax node.</summary>
+    public virtual void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpEphemeralTextLiteralSyntax node.</summary>
+    public virtual void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTemplateBlockSyntax node.</summary>
+    public virtual void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementSyntax node.</summary>
+    public virtual void VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementBodySyntax node.</summary>
+    public virtual void VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionSyntax node.</summary>
+    public virtual void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionBodySyntax node.</summary>
+    public virtual void VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionSyntax node.</summary>
+    public virtual void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionBodySyntax node.</summary>
+    public virtual void VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveSyntax node.</summary>
+    public virtual void VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveBodySyntax node.</summary>
+    public virtual void VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+  }
+
+  internal partial class SyntaxRewriter : SyntaxVisitor<SyntaxNode>
+  {
+    public override SyntaxNode VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      var document = (RazorBlockSyntax)Visit(node.Document);
+      return node.Update(document);
+    }
+
+    public override SyntaxNode VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      var startCommentTransition = (SyntaxToken)VisitToken(node.StartCommentTransition);
+      var startCommentStar = (SyntaxToken)VisitToken(node.StartCommentStar);
+      var comment = (SyntaxToken)VisitToken(node.Comment);
+      var endCommentStar = (SyntaxToken)VisitToken(node.EndCommentStar);
+      var endCommentTransition = (SyntaxToken)VisitToken(node.EndCommentTransition);
+      return node.Update(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+    }
+
+    public override SyntaxNode VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      var metaCode = VisitList(node.MetaCode);
+      return node.Update(metaCode);
+    }
+
+    public override SyntaxNode VisitGenericBlock(GenericBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      var transitionTokens = VisitList(node.TransitionTokens);
+      return node.Update(transitionTokens);
+    }
+
+    public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override SyntaxNode VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)VisitToken(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override SyntaxNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (MarkupTextLiteralSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override SyntaxNode VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
+    {
+      var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      var startTag = (MarkupTagHelperStartTagSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagHelperEndTagSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)VisitToken(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (MarkupTagHelperAttributeValueSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override SyntaxNode VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      var transition = (SyntaxToken)VisitToken(node.Transition);
+      return node.Update(transition);
+    }
+
+    public override SyntaxNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      var openBrace = (RazorMetaCodeSyntax)Visit(node.OpenBrace);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeBrace = (RazorMetaCodeSyntax)Visit(node.CloseBrace);
+      return node.Update(openBrace, cSharpCode, closeBrace);
+    }
+
+    public override SyntaxNode VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      var openParen = (RazorMetaCodeSyntax)Visit(node.OpenParen);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeParen = (RazorMetaCodeSyntax)Visit(node.CloseParen);
+      return node.Update(openParen, cSharpCode, closeParen);
+    }
+
+    public override SyntaxNode VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(cSharpCode);
+    }
+
+    public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      var keyword = (RazorSyntaxNode)Visit(node.Keyword);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(keyword, cSharpCode);
+    }
+  }
+
+  internal static partial class SyntaxFactory
+  {
+    /// <summary>Creates a new RazorDocumentSyntax instance.</summary>
+    public static RazorDocumentSyntax RazorDocument(RazorBlockSyntax document)
+    {
+      if (document == null)
+        throw new ArgumentNullException(nameof(document));
+      return (RazorDocumentSyntax)InternalSyntax.SyntaxFactory.RazorDocument(document == null ? null : (InternalSyntax.RazorBlockSyntax)document.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorCommentBlockSyntax instance.</summary>
+    public static RazorCommentBlockSyntax RazorCommentBlock(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+      switch (startCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("startCommentTransition");
+      }
+      switch (startCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("startCommentStar");
+      }
+      switch (comment.Kind)
+      {
+        case SyntaxKind.RazorCommentLiteral:
+          break;
+        default:
+          throw new ArgumentException("comment");
+      }
+      switch (endCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("endCommentStar");
+      }
+      switch (endCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("endCommentTransition");
+      }
+      return (RazorCommentBlockSyntax)InternalSyntax.SyntaxFactory.RazorCommentBlock((Syntax.InternalSyntax.SyntaxToken)startCommentTransition.Green, (Syntax.InternalSyntax.SyntaxToken)startCommentStar.Green, (Syntax.InternalSyntax.SyntaxToken)comment.Green, (Syntax.InternalSyntax.SyntaxToken)endCommentStar.Green, (Syntax.InternalSyntax.SyntaxToken)endCommentTransition.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorCommentBlockSyntax instance.</summary>
+    public static RazorCommentBlockSyntax RazorCommentBlock()
+    {
+      return SyntaxFactory.RazorCommentBlock(SyntaxFactory.Token(SyntaxKind.RazorCommentTransition), SyntaxFactory.Token(SyntaxKind.RazorCommentStar), SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral), SyntaxFactory.Token(SyntaxKind.RazorCommentStar), SyntaxFactory.Token(SyntaxKind.RazorCommentTransition));
+    }
+
+    /// <summary>Creates a new RazorMetaCodeSyntax instance.</summary>
+    public static RazorMetaCodeSyntax RazorMetaCode(SyntaxList<SyntaxToken> metaCode)
+    {
+      return (RazorMetaCodeSyntax)InternalSyntax.SyntaxFactory.RazorMetaCode(metaCode.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorMetaCodeSyntax instance.</summary>
+    public static RazorMetaCodeSyntax RazorMetaCode()
+    {
+      return SyntaxFactory.RazorMetaCode(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new GenericBlockSyntax instance.</summary>
+    public static GenericBlockSyntax GenericBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (GenericBlockSyntax)InternalSyntax.SyntaxFactory.GenericBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new GenericBlockSyntax instance.</summary>
+    public static GenericBlockSyntax GenericBlock()
+    {
+      return SyntaxFactory.GenericBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new UnclassifiedTextLiteralSyntax instance.</summary>
+    public static UnclassifiedTextLiteralSyntax UnclassifiedTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (UnclassifiedTextLiteralSyntax)InternalSyntax.SyntaxFactory.UnclassifiedTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new UnclassifiedTextLiteralSyntax instance.</summary>
+    public static UnclassifiedTextLiteralSyntax UnclassifiedTextLiteral()
+    {
+      return SyntaxFactory.UnclassifiedTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupBlockSyntax instance.</summary>
+    public static MarkupBlockSyntax MarkupBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupBlockSyntax)InternalSyntax.SyntaxFactory.MarkupBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupBlockSyntax instance.</summary>
+    public static MarkupBlockSyntax MarkupBlock()
+    {
+      return SyntaxFactory.MarkupBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTransitionSyntax instance.</summary>
+    public static MarkupTransitionSyntax MarkupTransition(SyntaxList<SyntaxToken> transitionTokens)
+    {
+      return (MarkupTransitionSyntax)InternalSyntax.SyntaxFactory.MarkupTransition(transitionTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTransitionSyntax instance.</summary>
+    public static MarkupTransitionSyntax MarkupTransition()
+    {
+      return SyntaxFactory.MarkupTransition(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupTextLiteralSyntax instance.</summary>
+    public static MarkupTextLiteralSyntax MarkupTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (MarkupTextLiteralSyntax)InternalSyntax.SyntaxFactory.MarkupTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTextLiteralSyntax instance.</summary>
+    public static MarkupTextLiteralSyntax MarkupTextLiteral()
+    {
+      return SyntaxFactory.MarkupTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupEphemeralTextLiteralSyntax instance.</summary>
+    public static MarkupEphemeralTextLiteralSyntax MarkupEphemeralTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (MarkupEphemeralTextLiteralSyntax)InternalSyntax.SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupEphemeralTextLiteralSyntax instance.</summary>
+    public static MarkupEphemeralTextLiteralSyntax MarkupEphemeralTextLiteral()
+    {
+      return SyntaxFactory.MarkupEphemeralTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupCommentBlockSyntax instance.</summary>
+    public static MarkupCommentBlockSyntax MarkupCommentBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupCommentBlockSyntax)InternalSyntax.SyntaxFactory.MarkupCommentBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupCommentBlockSyntax instance.</summary>
+    public static MarkupCommentBlockSyntax MarkupCommentBlock()
+    {
+      return SyntaxFactory.MarkupCommentBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTagBlockSyntax instance.</summary>
+    public static MarkupTagBlockSyntax MarkupTagBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagBlockSyntax)InternalSyntax.SyntaxFactory.MarkupTagBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagBlockSyntax instance.</summary>
+    public static MarkupTagBlockSyntax MarkupTagBlock()
+    {
+      return SyntaxFactory.MarkupTagBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupMinimizedAttributeBlockSyntax instance.</summary>
+    public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      return (MarkupMinimizedAttributeBlockSyntax)InternalSyntax.SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupMinimizedAttributeBlockSyntax instance.</summary>
+    public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock()
+    {
+      return SyntaxFactory.MarkupMinimizedAttributeBlock(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral());
+    }
+
+    /// <summary>Creates a new MarkupAttributeBlockSyntax instance.</summary>
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      return (MarkupAttributeBlockSyntax)InternalSyntax.SyntaxFactory.MarkupAttributeBlock(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green, nameSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)nameSuffix.Green, (Syntax.InternalSyntax.SyntaxToken)equalsToken.Green, valuePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valuePrefix.Green, value == null ? null : (InternalSyntax.RazorBlockSyntax)value.Green, valueSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valueSuffix.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupAttributeBlockSyntax instance.</summary>
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, SyntaxFactory.Token(SyntaxKind.Equals), valuePrefix, value, valueSuffix);
+    }
+
+    /// <summary>Creates a new MarkupAttributeBlockSyntax instance.</summary>
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock()
+    {
+      return SyntaxFactory.MarkupAttributeBlock(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral(), default(MarkupTextLiteralSyntax), SyntaxFactory.Token(SyntaxKind.Equals), default(MarkupTextLiteralSyntax), default(RazorBlockSyntax), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupLiteralAttributeValueSyntax instance.</summary>
+    public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+      return (MarkupLiteralAttributeValueSyntax)InternalSyntax.SyntaxFactory.MarkupLiteralAttributeValue(prefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)prefix.Green, value == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)value.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupLiteralAttributeValueSyntax instance.</summary>
+    public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue()
+    {
+      return SyntaxFactory.MarkupLiteralAttributeValue(default(MarkupTextLiteralSyntax), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupDynamicAttributeValueSyntax instance.</summary>
+    public static MarkupDynamicAttributeValueSyntax MarkupDynamicAttributeValue(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+      return (MarkupDynamicAttributeValueSyntax)InternalSyntax.SyntaxFactory.MarkupDynamicAttributeValue(prefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)prefix.Green, value == null ? null : (InternalSyntax.RazorBlockSyntax)value.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupDynamicAttributeValueSyntax instance.</summary>
+    public static MarkupDynamicAttributeValueSyntax MarkupDynamicAttributeValue(RazorBlockSyntax value)
+    {
+      return SyntaxFactory.MarkupDynamicAttributeValue(default(MarkupTextLiteralSyntax), value);
+    }
+
+    /// <summary>Creates a new MarkupElementSyntax instance.</summary>
+    public static MarkupElementSyntax MarkupElement(MarkupTagBlockSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+      return (MarkupElementSyntax)InternalSyntax.SyntaxFactory.MarkupElement(startTag == null ? null : (InternalSyntax.MarkupTagBlockSyntax)startTag.Green, body.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), endTag == null ? null : (InternalSyntax.MarkupTagBlockSyntax)endTag.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupElementSyntax instance.</summary>
+    public static MarkupElementSyntax MarkupElement(SyntaxList<RazorSyntaxNode> body = default(SyntaxList<RazorSyntaxNode>))
+    {
+      return SyntaxFactory.MarkupElement(default(MarkupTagBlockSyntax), body, default(MarkupTagBlockSyntax));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperElementSyntax instance.</summary>
+    public static MarkupTagHelperElementSyntax MarkupTagHelperElement(MarkupTagHelperStartTagSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+      if (startTag == null)
+        throw new ArgumentNullException(nameof(startTag));
+      return (MarkupTagHelperElementSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperElement(startTag == null ? null : (InternalSyntax.MarkupTagHelperStartTagSyntax)startTag.Green, body.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), endTag == null ? null : (InternalSyntax.MarkupTagHelperEndTagSyntax)endTag.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperElementSyntax instance.</summary>
+    public static MarkupTagHelperElementSyntax MarkupTagHelperElement(SyntaxList<RazorSyntaxNode> body = default(SyntaxList<RazorSyntaxNode>))
+    {
+      return SyntaxFactory.MarkupTagHelperElement(SyntaxFactory.MarkupTagHelperStartTag(), body, default(MarkupTagHelperEndTagSyntax));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperStartTagSyntax instance.</summary>
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagHelperStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperStartTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperStartTagSyntax instance.</summary>
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag()
+    {
+      return SyntaxFactory.MarkupTagHelperStartTag(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperEndTagSyntax instance.</summary>
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagHelperEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperEndTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperEndTagSyntax instance.</summary>
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag()
+    {
+      return SyntaxFactory.MarkupTagHelperEndTag(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+      return (MarkupTagHelperAttributeSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperAttribute(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green, nameSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)nameSuffix.Green, (Syntax.InternalSyntax.SyntaxToken)equalsToken.Green, valuePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valuePrefix.Green, value == null ? null : (InternalSyntax.MarkupTagHelperAttributeValueSyntax)value.Green, valueSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valueSuffix.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      return SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, SyntaxFactory.Token(SyntaxKind.Equals), valuePrefix, value, valueSuffix);
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute()
+    {
+      return SyntaxFactory.MarkupTagHelperAttribute(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral(), default(MarkupTextLiteralSyntax), SyntaxFactory.Token(SyntaxKind.Equals), default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTagHelperAttributeValue(), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupMinimizedTagHelperAttributeSyntax instance.</summary>
+    public static MarkupMinimizedTagHelperAttributeSyntax MarkupMinimizedTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      return (MarkupMinimizedTagHelperAttributeSyntax)InternalSyntax.SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupMinimizedTagHelperAttributeSyntax instance.</summary>
+    public static MarkupMinimizedTagHelperAttributeSyntax MarkupMinimizedTagHelperAttribute()
+    {
+      return SyntaxFactory.MarkupMinimizedTagHelperAttribute(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral());
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeValueSyntax instance.</summary>
+    public static MarkupTagHelperAttributeValueSyntax MarkupTagHelperAttributeValue(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagHelperAttributeValueSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperAttributeValue(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeValueSyntax instance.</summary>
+    public static MarkupTagHelperAttributeValueSyntax MarkupTagHelperAttributeValue()
+    {
+      return SyntaxFactory.MarkupTagHelperAttributeValue(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new CSharpCodeBlockSyntax instance.</summary>
+    public static CSharpCodeBlockSyntax CSharpCodeBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (CSharpCodeBlockSyntax)InternalSyntax.SyntaxFactory.CSharpCodeBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpCodeBlockSyntax instance.</summary>
+    public static CSharpCodeBlockSyntax CSharpCodeBlock()
+    {
+      return SyntaxFactory.CSharpCodeBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new CSharpTransitionSyntax instance.</summary>
+    public static CSharpTransitionSyntax CSharpTransition(SyntaxToken transition)
+    {
+      switch (transition.Kind)
+      {
+        case SyntaxKind.Transition:
+          break;
+        default:
+          throw new ArgumentException("transition");
+      }
+      return (CSharpTransitionSyntax)InternalSyntax.SyntaxFactory.CSharpTransition((Syntax.InternalSyntax.SyntaxToken)transition.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpTransitionSyntax instance.</summary>
+    public static CSharpTransitionSyntax CSharpTransition()
+    {
+      return SyntaxFactory.CSharpTransition(SyntaxFactory.Token(SyntaxKind.Transition));
+    }
+
+    /// <summary>Creates a new CSharpStatementLiteralSyntax instance.</summary>
+    public static CSharpStatementLiteralSyntax CSharpStatementLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (CSharpStatementLiteralSyntax)InternalSyntax.SyntaxFactory.CSharpStatementLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpStatementLiteralSyntax instance.</summary>
+    public static CSharpStatementLiteralSyntax CSharpStatementLiteral()
+    {
+      return SyntaxFactory.CSharpStatementLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new CSharpExpressionLiteralSyntax instance.</summary>
+    public static CSharpExpressionLiteralSyntax CSharpExpressionLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (CSharpExpressionLiteralSyntax)InternalSyntax.SyntaxFactory.CSharpExpressionLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpExpressionLiteralSyntax instance.</summary>
+    public static CSharpExpressionLiteralSyntax CSharpExpressionLiteral()
+    {
+      return SyntaxFactory.CSharpExpressionLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new CSharpEphemeralTextLiteralSyntax instance.</summary>
+    public static CSharpEphemeralTextLiteralSyntax CSharpEphemeralTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (CSharpEphemeralTextLiteralSyntax)InternalSyntax.SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpEphemeralTextLiteralSyntax instance.</summary>
+    public static CSharpEphemeralTextLiteralSyntax CSharpEphemeralTextLiteral()
+    {
+      return SyntaxFactory.CSharpEphemeralTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new CSharpTemplateBlockSyntax instance.</summary>
+    public static CSharpTemplateBlockSyntax CSharpTemplateBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (CSharpTemplateBlockSyntax)InternalSyntax.SyntaxFactory.CSharpTemplateBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpTemplateBlockSyntax instance.</summary>
+    public static CSharpTemplateBlockSyntax CSharpTemplateBlock()
+    {
+      return SyntaxFactory.CSharpTemplateBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new CSharpStatementSyntax instance.</summary>
+    public static CSharpStatementSyntax CSharpStatement(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (CSharpStatementSyntax)InternalSyntax.SyntaxFactory.CSharpStatement(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpStatementSyntax instance.</summary>
+    public static CSharpStatementSyntax CSharpStatement(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.CSharpStatement(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new CSharpStatementBodySyntax instance.</summary>
+    public static CSharpStatementBodySyntax CSharpStatementBody(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+      if (openBrace == null)
+        throw new ArgumentNullException(nameof(openBrace));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeBrace == null)
+        throw new ArgumentNullException(nameof(closeBrace));
+      return (CSharpStatementBodySyntax)InternalSyntax.SyntaxFactory.CSharpStatementBody(openBrace == null ? null : (InternalSyntax.RazorMetaCodeSyntax)openBrace.Green, cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green, closeBrace == null ? null : (InternalSyntax.RazorMetaCodeSyntax)closeBrace.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpStatementBodySyntax instance.</summary>
+    public static CSharpStatementBodySyntax CSharpStatementBody()
+    {
+      return SyntaxFactory.CSharpStatementBody(SyntaxFactory.RazorMetaCode(), SyntaxFactory.CSharpCodeBlock(), SyntaxFactory.RazorMetaCode());
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionSyntax instance.</summary>
+    public static CSharpExplicitExpressionSyntax CSharpExplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (CSharpExplicitExpressionSyntax)InternalSyntax.SyntaxFactory.CSharpExplicitExpression(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionSyntax instance.</summary>
+    public static CSharpExplicitExpressionSyntax CSharpExplicitExpression(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.CSharpExplicitExpression(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionBodySyntax instance.</summary>
+    public static CSharpExplicitExpressionBodySyntax CSharpExplicitExpressionBody(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+      if (openParen == null)
+        throw new ArgumentNullException(nameof(openParen));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeParen == null)
+        throw new ArgumentNullException(nameof(closeParen));
+      return (CSharpExplicitExpressionBodySyntax)InternalSyntax.SyntaxFactory.CSharpExplicitExpressionBody(openParen == null ? null : (InternalSyntax.RazorMetaCodeSyntax)openParen.Green, cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green, closeParen == null ? null : (InternalSyntax.RazorMetaCodeSyntax)closeParen.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionBodySyntax instance.</summary>
+    public static CSharpExplicitExpressionBodySyntax CSharpExplicitExpressionBody()
+    {
+      return SyntaxFactory.CSharpExplicitExpressionBody(SyntaxFactory.RazorMetaCode(), SyntaxFactory.CSharpCodeBlock(), SyntaxFactory.RazorMetaCode());
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionSyntax instance.</summary>
+    public static CSharpImplicitExpressionSyntax CSharpImplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (CSharpImplicitExpressionSyntax)InternalSyntax.SyntaxFactory.CSharpImplicitExpression(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionSyntax instance.</summary>
+    public static CSharpImplicitExpressionSyntax CSharpImplicitExpression(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.CSharpImplicitExpression(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionBodySyntax instance.</summary>
+    public static CSharpImplicitExpressionBodySyntax CSharpImplicitExpressionBody(CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      return (CSharpImplicitExpressionBodySyntax)InternalSyntax.SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionBodySyntax instance.</summary>
+    public static CSharpImplicitExpressionBodySyntax CSharpImplicitExpressionBody()
+    {
+      return SyntaxFactory.CSharpImplicitExpressionBody(SyntaxFactory.CSharpCodeBlock());
+    }
+
+    /// <summary>Creates a new RazorDirectiveSyntax instance.</summary>
+    public static RazorDirectiveSyntax RazorDirective(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (RazorDirectiveSyntax)InternalSyntax.SyntaxFactory.RazorDirective(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorDirectiveSyntax instance.</summary>
+    public static RazorDirectiveSyntax RazorDirective(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.RazorDirective(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new RazorDirectiveBodySyntax instance.</summary>
+    public static RazorDirectiveBodySyntax RazorDirectiveBody(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (keyword == null)
+        throw new ArgumentNullException(nameof(keyword));
+      return (RazorDirectiveBodySyntax)InternalSyntax.SyntaxFactory.RazorDirectiveBody(keyword == null ? null : (InternalSyntax.RazorSyntaxNode)keyword.Green, cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorDirectiveBodySyntax instance.</summary>
+    public static RazorDirectiveBodySyntax RazorDirectiveBody(RazorSyntaxNode keyword)
+    {
+      return SyntaxFactory.RazorDirectiveBody(keyword, default(CSharpCodeBlockSyntax));
+    }
+  }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
new file mode 100644
index 0000000000..8196bdb0ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -0,0 +1,3178 @@
+// <auto-generated />
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+  internal abstract partial class RazorBlockSyntax : RazorSyntaxNode
+  {
+    internal RazorBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+
+    public abstract SyntaxList<RazorSyntaxNode> Children { get; }
+    public RazorBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children) => WithChildrenCore(children);
+    internal abstract RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children);
+
+    public RazorBlockSyntax AddChildren(params RazorSyntaxNode[] items) => AddChildrenCore(items);
+    internal abstract RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items);
+  }
+
+  internal sealed partial class RazorDocumentSyntax : RazorSyntaxNode
+  {
+    private RazorBlockSyntax _document;
+
+    internal RazorDocumentSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorBlockSyntax Document 
+    {
+        get
+        {
+            return GetRedAtZero(ref _document);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _document);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _document;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDocument(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDocument(this);
+    }
+
+    public RazorDocumentSyntax Update(RazorBlockSyntax document)
+    {
+        if (document != Document)
+        {
+            var newNode = SyntaxFactory.RazorDocument(document);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorDocumentSyntax WithDocument(RazorBlockSyntax document)
+    {
+        return Update(document);
+    }
+  }
+
+  internal sealed partial class RazorCommentBlockSyntax : RazorSyntaxNode
+  {
+    private SyntaxToken _startCommentTransition;
+    private SyntaxToken _startCommentStar;
+    private SyntaxToken _comment;
+    private SyntaxToken _endCommentStar;
+    private SyntaxToken _endCommentTransition;
+
+    internal RazorCommentBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxToken StartCommentTransition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _startCommentTransition);
+        }
+    }
+
+    public SyntaxToken StartCommentStar 
+    {
+        get
+        {
+            return GetRed(ref _startCommentStar, 1);
+        }
+    }
+
+    public SyntaxToken Comment 
+    {
+        get
+        {
+            return GetRed(ref _comment, 2);
+        }
+    }
+
+    public SyntaxToken EndCommentStar 
+    {
+        get
+        {
+            return GetRed(ref _endCommentStar, 3);
+        }
+    }
+
+    public SyntaxToken EndCommentTransition 
+    {
+        get
+        {
+            return GetRed(ref _endCommentTransition, 4);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _startCommentTransition);
+            case 1: return GetRed(ref _startCommentStar, 1);
+            case 2: return GetRed(ref _comment, 2);
+            case 3: return GetRed(ref _endCommentStar, 3);
+            case 4: return GetRed(ref _endCommentTransition, 4);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startCommentTransition;
+            case 1: return _startCommentStar;
+            case 2: return _comment;
+            case 3: return _endCommentStar;
+            case 4: return _endCommentTransition;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorCommentBlock(this);
+    }
+
+    public RazorCommentBlockSyntax Update(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+        if (startCommentTransition != StartCommentTransition || startCommentStar != StartCommentStar || comment != Comment || endCommentStar != EndCommentStar || endCommentTransition != EndCommentTransition)
+        {
+            var newNode = SyntaxFactory.RazorCommentBlock(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorCommentBlockSyntax WithStartCommentTransition(SyntaxToken startCommentTransition)
+    {
+        return Update(startCommentTransition, StartCommentStar, Comment, EndCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithStartCommentStar(SyntaxToken startCommentStar)
+    {
+        return Update(StartCommentTransition, startCommentStar, Comment, EndCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithComment(SyntaxToken comment)
+    {
+        return Update(StartCommentTransition, StartCommentStar, comment, EndCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithEndCommentStar(SyntaxToken endCommentStar)
+    {
+        return Update(StartCommentTransition, StartCommentStar, Comment, endCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithEndCommentTransition(SyntaxToken endCommentTransition)
+    {
+        return Update(StartCommentTransition, StartCommentStar, Comment, EndCommentStar, endCommentTransition);
+    }
+  }
+
+  internal sealed partial class RazorMetaCodeSyntax : RazorSyntaxNode
+  {
+    private SyntaxNode _metaCode;
+
+    internal RazorMetaCodeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> MetaCode 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _metaCode, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _metaCode);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _metaCode;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorMetaCode(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorMetaCode(this);
+    }
+
+    public RazorMetaCodeSyntax Update(SyntaxList<SyntaxToken> metaCode)
+    {
+        if (metaCode != MetaCode)
+        {
+            var newNode = SyntaxFactory.RazorMetaCode(metaCode);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorMetaCodeSyntax WithMetaCode(SyntaxList<SyntaxToken> metaCode)
+    {
+        return Update(metaCode);
+    }
+
+    public RazorMetaCodeSyntax AddMetaCode(params SyntaxToken[] items)
+    {
+        return WithMetaCode(this.MetaCode.AddRange(items));
+    }
+  }
+
+  internal sealed partial class GenericBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal GenericBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitGenericBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitGenericBlock(this);
+    }
+
+    public GenericBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.GenericBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new GenericBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new GenericBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class UnclassifiedTextLiteralSyntax : RazorSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal UnclassifiedTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public UnclassifiedTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.UnclassifiedTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public UnclassifiedTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public UnclassifiedTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal abstract partial class MarkupSyntaxNode : RazorSyntaxNode
+  {
+    internal MarkupSyntaxNode(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+  }
+
+  internal sealed partial class MarkupBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupBlock(this);
+    }
+
+    public MarkupBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTransitionSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _transitionTokens;
+
+    internal MarkupTransitionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> TransitionTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _transitionTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transitionTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transitionTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTransition(this);
+    }
+
+    public MarkupTransitionSyntax Update(SyntaxList<SyntaxToken> transitionTokens)
+    {
+        if (transitionTokens != TransitionTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTransition(transitionTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTransitionSyntax WithTransitionTokens(SyntaxList<SyntaxToken> transitionTokens)
+    {
+        return Update(transitionTokens);
+    }
+
+    public MarkupTransitionSyntax AddTransitionTokens(params SyntaxToken[] items)
+    {
+        return WithTransitionTokens(this.TransitionTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal MarkupTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public MarkupTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public MarkupTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupEphemeralTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal MarkupEphemeralTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public MarkupEphemeralTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupEphemeralTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public MarkupEphemeralTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupCommentBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupCommentBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public MarkupCommentBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupCommentBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupCommentBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupCommentBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTagBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagBlock(this);
+    }
+
+    public MarkupTagBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedAttributeBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+    private MarkupTextLiteralSyntax _nameSuffix;
+    private SyntaxToken _equalsToken;
+    private MarkupTextLiteralSyntax _valuePrefix;
+    private RazorBlockSyntax _value;
+    private MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupAttributeBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    public MarkupTextLiteralSyntax NameSuffix 
+    {
+        get
+        {
+            return GetRed(ref _nameSuffix, 2);
+        }
+    }
+
+    public SyntaxToken EqualsToken 
+    {
+        get
+        {
+            return GetRed(ref _equalsToken, 3);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValuePrefix 
+    {
+        get
+        {
+            return GetRed(ref _valuePrefix, 4);
+        }
+    }
+
+    public RazorBlockSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 5);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValueSuffix 
+    {
+        get
+        {
+            return GetRed(ref _valueSuffix, 6);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            case 2: return GetRed(ref _nameSuffix, 2);
+            case 3: return GetRed(ref _equalsToken, 3);
+            case 4: return GetRed(ref _valuePrefix, 4);
+            case 5: return GetRed(ref _value, 5);
+            case 6: return GetRed(ref _valueSuffix, 6);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public MarkupAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupAttributeBlockSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithNameSuffix(MarkupTextLiteralSyntax nameSuffix)
+    {
+        return Update(NamePrefix, Name, nameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithEqualsToken(SyntaxToken equalsToken)
+    {
+        return Update(NamePrefix, Name, NameSuffix, equalsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithValuePrefix(MarkupTextLiteralSyntax valuePrefix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, valuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithValue(RazorBlockSyntax value)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithValueSuffix(MarkupTextLiteralSyntax valueSuffix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, valueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddNameSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _nameSuffix = this.NameSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNameSuffix(_nameSuffix.WithLiteralTokens(_nameSuffix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddValuePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valuePrefix = this.ValuePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValuePrefix(_valuePrefix.WithLiteralTokens(_valuePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddValueSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valueSuffix = this.ValueSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValueSuffix(_valueSuffix.WithLiteralTokens(_valueSuffix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupLiteralAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _prefix;
+    private MarkupTextLiteralSyntax _value;
+
+    internal MarkupLiteralAttributeValueSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax Prefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _prefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _prefix);
+            case 1: return GetRed(ref _value, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public MarkupLiteralAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupLiteralAttributeValueSyntax WithPrefix(MarkupTextLiteralSyntax prefix)
+    {
+        return Update(prefix, Value);
+    }
+
+    public MarkupLiteralAttributeValueSyntax WithValue(MarkupTextLiteralSyntax value)
+    {
+        return Update(Prefix, value);
+    }
+
+    public MarkupLiteralAttributeValueSyntax AddPrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _prefix = this.Prefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithPrefix(_prefix.WithLiteralTokens(_prefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupLiteralAttributeValueSyntax AddValueLiteralTokens(params SyntaxToken[] items)
+    {
+        var _value = this.Value ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValue(_value.WithLiteralTokens(_value.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupDynamicAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _prefix;
+    private RazorBlockSyntax _value;
+
+    internal MarkupDynamicAttributeValueSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax Prefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _prefix);
+        }
+    }
+
+    public RazorBlockSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _prefix);
+            case 1: return GetRed(ref _value, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public MarkupDynamicAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupDynamicAttributeValue(prefix, value);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupDynamicAttributeValueSyntax WithPrefix(MarkupTextLiteralSyntax prefix)
+    {
+        return Update(prefix, Value);
+    }
+
+    public MarkupDynamicAttributeValueSyntax WithValue(RazorBlockSyntax value)
+    {
+        return Update(Prefix, value);
+    }
+
+    public MarkupDynamicAttributeValueSyntax AddPrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _prefix = this.Prefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithPrefix(_prefix.WithLiteralTokens(_prefix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupElementSyntax : MarkupSyntaxNode
+  {
+    private MarkupTagBlockSyntax _startTag;
+    private SyntaxNode _body;
+    private MarkupTagBlockSyntax _endTag;
+
+    internal MarkupElementSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTagBlockSyntax StartTag 
+    {
+        get
+        {
+            return GetRedAtZero(ref _startTag);
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Body 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _body, 1));
+        }
+    }
+
+    public MarkupTagBlockSyntax EndTag 
+    {
+        get
+        {
+            return GetRed(ref _endTag, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _startTag);
+            case 1: return GetRed(ref _body, 1);
+            case 2: return GetRed(ref _endTag, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupElement(this);
+    }
+
+    public MarkupElementSyntax Update(MarkupTagBlockSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupElement(startTag, body, endTag);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupElementSyntax WithStartTag(MarkupTagBlockSyntax startTag)
+    {
+        return Update(startTag, Body, EndTag);
+    }
+
+    public MarkupElementSyntax WithBody(SyntaxList<RazorSyntaxNode> body)
+    {
+        return Update(StartTag, body, EndTag);
+    }
+
+    public MarkupElementSyntax WithEndTag(MarkupTagBlockSyntax endTag)
+    {
+        return Update(StartTag, Body, endTag);
+    }
+
+    public MarkupElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
+    {
+        var _startTag = this.StartTag ?? SyntaxFactory.MarkupTagBlock();
+        return this.WithStartTag(_startTag.WithChildren(_startTag.Children.AddRange(items)));
+    }
+
+    public MarkupElementSyntax AddBody(params RazorSyntaxNode[] items)
+    {
+        return WithBody(this.Body.AddRange(items));
+    }
+
+    public MarkupElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
+    {
+        var _endTag = this.EndTag ?? SyntaxFactory.MarkupTagBlock();
+        return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperElementSyntax : MarkupSyntaxNode
+  {
+    private MarkupTagHelperStartTagSyntax _startTag;
+    private SyntaxNode _body;
+    private MarkupTagHelperEndTagSyntax _endTag;
+
+    internal MarkupTagHelperElementSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTagHelperStartTagSyntax StartTag 
+    {
+        get
+        {
+            return GetRedAtZero(ref _startTag);
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Body 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _body, 1));
+        }
+    }
+
+    public MarkupTagHelperEndTagSyntax EndTag 
+    {
+        get
+        {
+            return GetRed(ref _endTag, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _startTag);
+            case 1: return GetRed(ref _body, 1);
+            case 2: return GetRed(ref _endTag, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public MarkupTagHelperElementSyntax Update(MarkupTagHelperStartTagSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperElement(startTag, body, endTag);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTagHelperElementSyntax WithStartTag(MarkupTagHelperStartTagSyntax startTag)
+    {
+        return Update(startTag, Body, EndTag);
+    }
+
+    public MarkupTagHelperElementSyntax WithBody(SyntaxList<RazorSyntaxNode> body)
+    {
+        return Update(StartTag, body, EndTag);
+    }
+
+    public MarkupTagHelperElementSyntax WithEndTag(MarkupTagHelperEndTagSyntax endTag)
+    {
+        return Update(StartTag, Body, endTag);
+    }
+
+    public MarkupTagHelperElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithStartTag(this.StartTag.WithChildren(this.StartTag.Children.AddRange(items)));
+    }
+
+    public MarkupTagHelperElementSyntax AddBody(params RazorSyntaxNode[] items)
+    {
+        return WithBody(this.Body.AddRange(items));
+    }
+
+    public MarkupTagHelperElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
+    {
+        var _endTag = this.EndTag ?? SyntaxFactory.MarkupTagHelperEndTag();
+        return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperStartTagSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagHelperStartTagSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public MarkupTagHelperStartTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperStartTag(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagHelperStartTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagHelperStartTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperEndTagSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagHelperEndTagSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public MarkupTagHelperEndTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperEndTag(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagHelperEndTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagHelperEndTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+    private MarkupTextLiteralSyntax _nameSuffix;
+    private SyntaxToken _equalsToken;
+    private MarkupTextLiteralSyntax _valuePrefix;
+    private MarkupTagHelperAttributeValueSyntax _value;
+    private MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupTagHelperAttributeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    public MarkupTextLiteralSyntax NameSuffix 
+    {
+        get
+        {
+            return GetRed(ref _nameSuffix, 2);
+        }
+    }
+
+    public SyntaxToken EqualsToken 
+    {
+        get
+        {
+            return GetRed(ref _equalsToken, 3);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValuePrefix 
+    {
+        get
+        {
+            return GetRed(ref _valuePrefix, 4);
+        }
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 5);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValueSuffix 
+    {
+        get
+        {
+            return GetRed(ref _valueSuffix, 6);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            case 2: return GetRed(ref _nameSuffix, 2);
+            case 3: return GetRed(ref _equalsToken, 3);
+            case 4: return GetRed(ref _valuePrefix, 4);
+            case 5: return GetRed(ref _value, 5);
+            case 6: return GetRed(ref _valueSuffix, 6);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public MarkupTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTagHelperAttributeSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithNameSuffix(MarkupTextLiteralSyntax nameSuffix)
+    {
+        return Update(NamePrefix, Name, nameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithEqualsToken(SyntaxToken equalsToken)
+    {
+        return Update(NamePrefix, Name, NameSuffix, equalsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithValuePrefix(MarkupTextLiteralSyntax valuePrefix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, valuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithValue(MarkupTagHelperAttributeValueSyntax value)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithValueSuffix(MarkupTextLiteralSyntax valueSuffix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, valueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddNameSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _nameSuffix = this.NameSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNameSuffix(_nameSuffix.WithLiteralTokens(_nameSuffix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddValuePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valuePrefix = this.ValuePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValuePrefix(_valuePrefix.WithLiteralTokens(_valuePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddValueChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithValue(this.Value.WithChildren(this.Value.Children.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddValueSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valueSuffix = this.ValueSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValueSuffix(_valueSuffix.WithLiteralTokens(_valueSuffix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedTagHelperAttributeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix, name);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeValueSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagHelperAttributeValueSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttributeValue(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagHelperAttributeValueSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagHelperAttributeValueSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal abstract partial class CSharpSyntaxNode : RazorSyntaxNode
+  {
+    internal CSharpSyntaxNode(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+  }
+
+  internal sealed partial class CSharpCodeBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal CSharpCodeBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public CSharpCodeBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpCodeBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new CSharpCodeBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new CSharpCodeBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpTransitionSyntax : CSharpSyntaxNode
+  {
+    private SyntaxToken _transition;
+
+    internal CSharpTransitionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxToken Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTransition(this);
+    }
+
+    public CSharpTransitionSyntax Update(SyntaxToken transition)
+    {
+        if (transition != Transition)
+        {
+            var newNode = SyntaxFactory.CSharpTransition(transition);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpTransitionSyntax WithTransition(SyntaxToken transition)
+    {
+        return Update(transition);
+    }
+  }
+
+  internal sealed partial class CSharpStatementLiteralSyntax : CSharpSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal CSharpStatementLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public CSharpStatementLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpStatementLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpStatementLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public CSharpStatementLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpExpressionLiteralSyntax : CSharpSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal CSharpExpressionLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public CSharpExpressionLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpExpressionLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpExpressionLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public CSharpExpressionLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpEphemeralTextLiteralSyntax : CSharpSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal CSharpEphemeralTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public CSharpEphemeralTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpEphemeralTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public CSharpEphemeralTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpTemplateBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal CSharpTemplateBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public CSharpTemplateBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpTemplateBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new CSharpTemplateBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new CSharpTemplateBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal abstract partial class CSharpRazorBlockSyntax : CSharpSyntaxNode
+  {
+    internal CSharpRazorBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+
+    public abstract CSharpTransitionSyntax Transition { get; }
+    public CSharpRazorBlockSyntax WithTransition(CSharpTransitionSyntax transition) => WithTransitionCore(transition);
+    internal abstract CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition);
+
+    public abstract CSharpSyntaxNode Body { get; }
+    public CSharpRazorBlockSyntax WithBody(CSharpSyntaxNode body) => WithBodyCore(body);
+    internal abstract CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body);
+  }
+
+  internal sealed partial class CSharpStatementSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal CSharpStatementSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatement(this);
+    }
+
+    public CSharpStatementSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpStatement(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new CSharpStatementSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new CSharpStatementSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class CSharpStatementBodySyntax : CSharpSyntaxNode
+  {
+    private RazorMetaCodeSyntax _openBrace;
+    private CSharpCodeBlockSyntax _cSharpCode;
+    private RazorMetaCodeSyntax _closeBrace;
+
+    internal CSharpStatementBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorMetaCodeSyntax OpenBrace 
+    {
+        get
+        {
+            return GetRedAtZero(ref _openBrace);
+        }
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRed(ref _cSharpCode, 1);
+        }
+    }
+
+    public RazorMetaCodeSyntax CloseBrace 
+    {
+        get
+        {
+            return GetRed(ref _closeBrace, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _openBrace);
+            case 1: return GetRed(ref _cSharpCode, 1);
+            case 2: return GetRed(ref _closeBrace, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openBrace;
+            case 1: return _cSharpCode;
+            case 2: return _closeBrace;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementBody(this);
+    }
+
+    public CSharpStatementBodySyntax Update(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+        if (openBrace != OpenBrace || cSharpCode != CSharpCode || closeBrace != CloseBrace)
+        {
+            var newNode = SyntaxFactory.CSharpStatementBody(openBrace, cSharpCode, closeBrace);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpStatementBodySyntax WithOpenBrace(RazorMetaCodeSyntax openBrace)
+    {
+        return Update(openBrace, CSharpCode, CloseBrace);
+    }
+
+    public CSharpStatementBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(OpenBrace, cSharpCode, CloseBrace);
+    }
+
+    public CSharpStatementBodySyntax WithCloseBrace(RazorMetaCodeSyntax closeBrace)
+    {
+        return Update(OpenBrace, CSharpCode, closeBrace);
+    }
+
+    public CSharpStatementBodySyntax AddOpenBraceMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithOpenBrace(this.OpenBrace.WithMetaCode(this.OpenBrace.MetaCode.AddRange(items)));
+    }
+
+    public CSharpStatementBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithCSharpCode(this.CSharpCode.WithChildren(this.CSharpCode.Children.AddRange(items)));
+    }
+
+    public CSharpStatementBodySyntax AddCloseBraceMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithCloseBrace(this.CloseBrace.WithMetaCode(this.CloseBrace.MetaCode.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal CSharpExplicitExpressionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public CSharpExplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpression(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new CSharpExplicitExpressionSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new CSharpExplicitExpressionSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private RazorMetaCodeSyntax _openParen;
+    private CSharpCodeBlockSyntax _cSharpCode;
+    private RazorMetaCodeSyntax _closeParen;
+
+    internal CSharpExplicitExpressionBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorMetaCodeSyntax OpenParen 
+    {
+        get
+        {
+            return GetRedAtZero(ref _openParen);
+        }
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRed(ref _cSharpCode, 1);
+        }
+    }
+
+    public RazorMetaCodeSyntax CloseParen 
+    {
+        get
+        {
+            return GetRed(ref _closeParen, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _openParen);
+            case 1: return GetRed(ref _cSharpCode, 1);
+            case 2: return GetRed(ref _closeParen, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openParen;
+            case 1: return _cSharpCode;
+            case 2: return _closeParen;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public CSharpExplicitExpressionBodySyntax Update(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+        if (openParen != OpenParen || cSharpCode != CSharpCode || closeParen != CloseParen)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpressionBody(openParen, cSharpCode, closeParen);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpExplicitExpressionBodySyntax WithOpenParen(RazorMetaCodeSyntax openParen)
+    {
+        return Update(openParen, CSharpCode, CloseParen);
+    }
+
+    public CSharpExplicitExpressionBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(OpenParen, cSharpCode, CloseParen);
+    }
+
+    public CSharpExplicitExpressionBodySyntax WithCloseParen(RazorMetaCodeSyntax closeParen)
+    {
+        return Update(OpenParen, CSharpCode, closeParen);
+    }
+
+    public CSharpExplicitExpressionBodySyntax AddOpenParenMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithOpenParen(this.OpenParen.WithMetaCode(this.OpenParen.MetaCode.AddRange(items)));
+    }
+
+    public CSharpExplicitExpressionBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithCSharpCode(this.CSharpCode.WithChildren(this.CSharpCode.Children.AddRange(items)));
+    }
+
+    public CSharpExplicitExpressionBodySyntax AddCloseParenMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithCloseParen(this.CloseParen.WithMetaCode(this.CloseParen.MetaCode.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal CSharpImplicitExpressionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public CSharpImplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpression(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new CSharpImplicitExpressionSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new CSharpImplicitExpressionSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private CSharpCodeBlockSyntax _cSharpCode;
+
+    internal CSharpImplicitExpressionBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRedAtZero(ref _cSharpCode);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _cSharpCode);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public CSharpImplicitExpressionBodySyntax Update(CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpImplicitExpressionBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(cSharpCode);
+    }
+
+    public CSharpImplicitExpressionBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithCSharpCode(this.CSharpCode.WithChildren(this.CSharpCode.Children.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class RazorDirectiveSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal RazorDirectiveSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirective(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirective(this);
+    }
+
+    public RazorDirectiveSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.RazorDirective(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new RazorDirectiveSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new RazorDirectiveSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class RazorDirectiveBodySyntax : CSharpSyntaxNode
+  {
+    private RazorSyntaxNode _keyword;
+    private CSharpCodeBlockSyntax _cSharpCode;
+
+    internal RazorDirectiveBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorSyntaxNode Keyword 
+    {
+        get
+        {
+            return GetRedAtZero(ref _keyword);
+        }
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRed(ref _cSharpCode, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _keyword);
+            case 1: return GetRed(ref _cSharpCode, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _keyword;
+            case 1: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public RazorDirectiveBodySyntax Update(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (keyword != Keyword || cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorDirectiveBodySyntax WithKeyword(RazorSyntaxNode keyword)
+    {
+        return Update(keyword, CSharpCode);
+    }
+
+    public RazorDirectiveBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(Keyword, cSharpCode);
+    }
+
+    public RazorDirectiveBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        var _cSharpCode = this.CSharpCode ?? SyntaxFactory.CSharpCodeBlock();
+        return this.WithCSharpCode(_cSharpCode.WithChildren(_cSharpCode.Children.AddRange(items)));
+    }
+  }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNode.cs
new file mode 100644
index 0000000000..3f03464510
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNode.cs
@@ -0,0 +1,583 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract class GreenNode
+    {
+        private static readonly RazorDiagnostic[] EmptyDiagnostics = Array.Empty<RazorDiagnostic>();
+        private static readonly SyntaxAnnotation[] EmptyAnnotations = Array.Empty<SyntaxAnnotation>();
+        private static readonly ConditionalWeakTable<GreenNode, RazorDiagnostic[]> DiagnosticsTable =
+            new ConditionalWeakTable<GreenNode, RazorDiagnostic[]>();
+        private static readonly ConditionalWeakTable<GreenNode, SyntaxAnnotation[]> AnnotationsTable =
+            new ConditionalWeakTable<GreenNode, SyntaxAnnotation[]>();
+        private byte _slotCount;
+
+        protected GreenNode(SyntaxKind kind)
+        {
+            Kind = kind;
+        }
+
+        protected GreenNode(SyntaxKind kind, int fullWidth)
+            : this(kind)
+        {
+            FullWidth = fullWidth;
+        }
+
+        protected GreenNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : this(kind, 0, diagnostics, annotations)
+        {
+        }
+
+        protected GreenNode(SyntaxKind kind, int fullWidth, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : this(kind, fullWidth)
+        {
+            if (diagnostics?.Length > 0)
+            {
+                Flags |= NodeFlags.ContainsDiagnostics;
+                DiagnosticsTable.Add(this, diagnostics);
+            }
+
+            if (annotations?.Length > 0)
+            {
+                foreach (var annotation in annotations)
+                {
+                    if (annotation == null)
+                    {
+                        throw new ArgumentException(nameof(annotations), "Annotation cannot be null");
+                    }
+                }
+
+                Flags |= NodeFlags.ContainsAnnotations;
+                AnnotationsTable.Add(this, annotations);
+            }
+        }
+
+        protected void AdjustFlagsAndWidth(GreenNode node)
+        {
+            if (node == null)
+            {
+                return;
+            }
+
+            Flags |= (node.Flags & NodeFlags.InheritMask);
+            FullWidth += node.FullWidth;
+        }
+
+        #region Kind
+        internal SyntaxKind Kind { get; }
+
+        internal virtual bool IsList => false;
+
+        internal virtual bool IsToken => false;
+
+        internal virtual bool IsTrivia => false;
+        #endregion
+
+        #region Slots
+        public int SlotCount
+        {
+            get
+            {
+                int count = _slotCount;
+                if (count == byte.MaxValue)
+                {
+                    count = GetSlotCount();
+                }
+
+                return count;
+            }
+
+            protected set
+            {
+                _slotCount = (byte)value;
+            }
+        }
+
+        internal abstract GreenNode GetSlot(int index);
+
+        // for slot counts >= byte.MaxValue
+        protected virtual int GetSlotCount()
+        {
+            return _slotCount;
+        }
+
+        public virtual int GetSlotOffset(int index)
+        {
+            var offset = 0;
+            for (var i = 0; i < index; i++)
+            {
+                var child = GetSlot(i);
+                if (child != null)
+                    offset += child.FullWidth;
+            }
+
+            return offset;
+        }
+
+        public virtual int FindSlotIndexContainingOffset(int offset)
+        {
+            Debug.Assert(0 <= offset && offset < FullWidth);
+
+            int i;
+            var accumulatedWidth = 0;
+            for (i = 0; ; i++)
+            {
+                Debug.Assert(i < SlotCount);
+                var child = GetSlot(i);
+                if (child != null)
+                {
+                    accumulatedWidth += child.FullWidth;
+                    if (offset < accumulatedWidth)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return i;
+        }
+        #endregion
+
+        #region Flags
+        public NodeFlags Flags { get; protected set; }
+
+        internal void SetFlags(NodeFlags flags)
+        {
+            Flags |= flags;
+        }
+
+        internal void ClearFlags(NodeFlags flags)
+        {
+            Flags &= ~flags;
+        }
+
+        internal virtual bool IsMissing => (Flags & NodeFlags.IsMissing) != 0;
+
+        public bool ContainsDiagnostics
+        {
+            get
+            {
+                return (Flags & NodeFlags.ContainsDiagnostics) != 0;
+            }
+        }
+
+        public bool ContainsAnnotations
+        {
+            get
+            {
+                return (Flags & NodeFlags.ContainsAnnotations) != 0;
+            }
+        }
+        #endregion
+
+        #region Spans
+        internal int FullWidth { get; private set; }
+
+        public virtual int Width
+        {
+            get
+            {
+                return FullWidth - GetLeadingTriviaWidth() - GetTrailingTriviaWidth();
+            }
+        }
+
+        public virtual int GetLeadingTriviaWidth()
+        {
+            return FullWidth != 0 ? GetFirstTerminal().GetLeadingTriviaWidth() : 0;
+        }
+
+        public virtual int GetTrailingTriviaWidth()
+        {
+            return FullWidth != 0 ? GetLastTerminal().GetTrailingTriviaWidth() : 0;
+        }
+
+        public bool HasLeadingTrivia
+        {
+            get
+            {
+                return GetLeadingTriviaWidth() != 0;
+            }
+        }
+
+        public bool HasTrailingTrivia
+        {
+            get
+            {
+                return GetTrailingTriviaWidth() != 0;
+            }
+        }
+        #endregion
+
+        #region Diagnostics
+        internal abstract GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics);
+
+        internal RazorDiagnostic[] GetDiagnostics()
+        {
+            if (ContainsDiagnostics)
+            {
+                if (DiagnosticsTable.TryGetValue(this, out var diagnostics))
+                {
+                    return diagnostics;
+                }
+            }
+
+            return EmptyDiagnostics;
+        }
+        #endregion
+
+        #region Annotations
+        internal abstract GreenNode SetAnnotations(SyntaxAnnotation[] annotations);
+
+        internal SyntaxAnnotation[] GetAnnotations()
+        {
+            if (ContainsAnnotations)
+            {
+                if (AnnotationsTable.TryGetValue(this, out var annotations))
+                {
+                    Debug.Assert(annotations.Length != 0, "There cannot be an empty annotation entry.");
+                    return annotations;
+                }
+            }
+
+            return EmptyAnnotations;
+        }
+        #endregion
+
+        #region Text
+        public override string ToString()
+        {
+            var builder = new StringBuilder();
+            builder.AppendFormat("{0}<{1}>", GetType().Name, Kind);
+
+            return builder.ToString();
+        }
+
+        public virtual string ToFullString()
+        {
+            var builder = new StringBuilder();
+            var writer = new StringWriter(builder, System.Globalization.CultureInfo.InvariantCulture);
+            WriteTo(writer);
+            return builder.ToString();
+        }
+
+        public virtual void WriteTo(TextWriter writer)
+        {
+            WriteTo(writer, leading: true, trailing: true);
+        }
+
+        protected internal void WriteTo(TextWriter writer, bool leading, bool trailing)
+        {
+            // Use an actual Stack so we can write out deeply recursive structures without overflowing.
+            var stack = new Stack<StackEntry>();
+            stack.Push(new StackEntry(this, leading, trailing));
+
+            // Separated out stack processing logic so that it does not unintentionally refer to 
+            // "this", "leading" or "trailing.
+            ProcessStack(writer, stack);
+        }
+
+        protected virtual void WriteTriviaTo(TextWriter writer)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual void WriteTokenTo(TextWriter writer, bool leading, bool trailing)
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+
+        #region Tokens 
+
+        public virtual object GetValue()
+        {
+            return null;
+        }
+
+        public virtual string GetValueText()
+        {
+            return string.Empty;
+        }
+
+        public virtual GreenNode GetLeadingTrivia()
+        {
+            return null;
+        }
+
+        public virtual GreenNode GetTrailingTrivia()
+        {
+            return null;
+        }
+
+        public virtual GreenNode WithLeadingTrivia(GreenNode trivia)
+        {
+            return this;
+        }
+
+        public virtual GreenNode WithTrailingTrivia(GreenNode trivia)
+        {
+            return this;
+        }
+
+        public InternalSyntax.SyntaxToken GetFirstToken()
+        {
+            return (InternalSyntax.SyntaxToken)GetFirstTerminal();
+        }
+
+        public InternalSyntax.SyntaxToken GetLastToken()
+        {
+            return (InternalSyntax.SyntaxToken)GetLastTerminal();
+        }
+
+        internal GreenNode GetFirstTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                GreenNode firstChild = null;
+                for (int i = 0, n = node.SlotCount; i < n; i++)
+                {
+                    var child = node.GetSlot(i);
+                    if (child != null && child.FullWidth > 0)
+                    {
+                        firstChild = child;
+                        break;
+                    }
+                }
+                node = firstChild;
+            } while (node?._slotCount > 0);
+
+            return node;
+        }
+
+        internal GreenNode GetLastTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                GreenNode lastChild = null;
+                for (var i = node.SlotCount - 1; i >= 0; i--)
+                {
+                    var child = node.GetSlot(i);
+                    if (child != null && child.FullWidth > 0)
+                    {
+                        lastChild = child;
+                        break;
+                    }
+                }
+                node = lastChild;
+            } while (node?._slotCount > 0);
+
+            return node;
+        }
+        #endregion
+
+        #region Equivalence 
+        public virtual bool IsEquivalentTo(GreenNode other)
+        {
+            if (this == other)
+            {
+                return true;
+            }
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return EquivalentToInternal(this, other);
+        }
+
+        private static bool EquivalentToInternal(GreenNode node1, GreenNode node2)
+        {
+            if (node1.Kind != node2.Kind)
+            {
+                // A single-element list is usually represented as just a single node,
+                // but can be represented as a List node with one child. Move to that
+                // child if necessary.
+                if (node1.IsList && node1.SlotCount == 1)
+                {
+                    node1 = node1.GetSlot(0);
+                }
+
+                if (node2.IsList && node2.SlotCount == 1)
+                {
+                    node2 = node2.GetSlot(0);
+                }
+
+                if (node1.Kind != node2.Kind)
+                {
+                    return false;
+                }
+            }
+
+            if (node1.FullWidth != node2.FullWidth)
+            {
+                return false;
+            }
+
+            var n = node1.SlotCount;
+            if (n != node2.SlotCount)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < n; i++)
+            {
+                var node1Child = node1.GetSlot(i);
+                var node2Child = node2.GetSlot(i);
+                if (node1Child != null && node2Child != null && !node1Child.IsEquivalentTo(node2Child))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        #endregion
+
+        #region Factories
+        public virtual GreenNode CreateList(IEnumerable<GreenNode> nodes, bool alwaysCreateListNode = false)
+        {
+            if (nodes == null)
+            {
+                return null;
+            }
+
+            var list = nodes.ToArray();
+
+            switch (list.Length)
+            {
+                case 0:
+                    return null;
+                case 1:
+                    if (alwaysCreateListNode)
+                    {
+                        goto default;
+                    }
+                    else
+                    {
+                        return list[0];
+                    }
+                case 2:
+                    return InternalSyntax.SyntaxList.List(list[0], list[1]);
+                case 3:
+                    return InternalSyntax.SyntaxList.List(list[0], list[1], list[2]);
+                default:
+                    return InternalSyntax.SyntaxList.List(list);
+            }
+        }
+
+        public SyntaxNode CreateRed()
+        {
+            return CreateRed(null, 0);
+        }
+
+        internal abstract SyntaxNode CreateRed(SyntaxNode parent, int position);
+        #endregion
+
+        public abstract TResult Accept<TResult>(InternalSyntax.SyntaxVisitor<TResult> visitor);
+
+        public abstract void Accept(InternalSyntax.SyntaxVisitor visitor);
+
+        #region StaticMethods
+
+        private static void ProcessStack(TextWriter writer,
+            Stack<StackEntry> stack)
+        {
+            while (stack.Count > 0)
+            {
+                var current = stack.Pop();
+                var currentNode = current.Node;
+                var currentLeading = current.Leading;
+                var currentTrailing = current.Trailing;
+
+                if (currentNode.IsToken)
+                {
+                    currentNode.WriteTokenTo(writer, currentLeading, currentTrailing);
+                    continue;
+                }
+
+                if (currentNode.IsTrivia)
+                {
+                    currentNode.WriteTriviaTo(writer);
+                    continue;
+                }
+
+                var firstIndex = GetFirstNonNullChildIndex(currentNode);
+                var lastIndex = GetLastNonNullChildIndex(currentNode);
+
+                for (var i = lastIndex; i >= firstIndex; i--)
+                {
+                    var child = currentNode.GetSlot(i);
+                    if (child != null)
+                    {
+                        var first = i == firstIndex;
+                        var last = i == lastIndex;
+                        stack.Push(new StackEntry(child, currentLeading | !first, currentTrailing | !last));
+                    }
+                }
+            }
+        }
+
+        private static int GetFirstNonNullChildIndex(GreenNode node)
+        {
+            int n = node.SlotCount;
+            int firstIndex = 0;
+            for (; firstIndex < n; firstIndex++)
+            {
+                var child = node.GetSlot(firstIndex);
+                if (child != null)
+                {
+                    break;
+                }
+            }
+
+            return firstIndex;
+        }
+
+        private static int GetLastNonNullChildIndex(GreenNode node)
+        {
+            int n = node.SlotCount;
+            int lastIndex = n - 1;
+            for (; lastIndex >= 0; lastIndex--)
+            {
+                var child = node.GetSlot(lastIndex);
+                if (child != null)
+                {
+                    break;
+                }
+            }
+
+            return lastIndex;
+        }
+
+        private struct StackEntry
+        {
+            public StackEntry(GreenNode node, bool leading, bool trailing)
+            {
+                Node = node;
+                Leading = leading;
+                Trailing = trailing;
+            }
+
+            public GreenNode Node { get; }
+
+            public bool Leading { get; }
+
+            public bool Trailing { get; }
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNodeExtensions.cs
new file mode 100644
index 0000000000..03cb22a20b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/GreenNodeExtensions.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class GreenNodeExtensions
+    {
+        internal static InternalSyntax.SyntaxList<T> ToGreenList<T>(this SyntaxNode node) where T : GreenNode
+        {
+            return node != null ?
+                ToGreenList<T>(node.Green) :
+                default(InternalSyntax.SyntaxList<T>);
+        }
+
+        internal static InternalSyntax.SyntaxList<T> ToGreenList<T>(this GreenNode node) where T : GreenNode
+        {
+            return new InternalSyntax.SyntaxList<T>(node);
+        }
+
+        public static TNode WithAnnotationsGreen<TNode>(this TNode node, params SyntaxAnnotation[] annotations) where TNode : GreenNode
+        {
+            var newAnnotations = new List<SyntaxAnnotation>();
+            foreach (var candidate in annotations)
+            {
+                if (!newAnnotations.Contains(candidate))
+                {
+                    newAnnotations.Add(candidate);
+                }
+            }
+
+            if (newAnnotations.Count == 0)
+            {
+                var existingAnnotations = node.GetAnnotations();
+                if (existingAnnotations == null || existingAnnotations.Length == 0)
+                {
+                    return node;
+                }
+                else
+                {
+                    return (TNode)node.SetAnnotations(null);
+                }
+            }
+            else
+            {
+                return (TNode)node.SetAnnotations(newAnnotations.ToArray());
+            }
+        }
+
+        public static TNode WithDiagnosticsGreen<TNode>(this TNode node, params RazorDiagnostic[] diagnostics) where TNode : GreenNode
+        {
+            return (TNode)node.SetDiagnostics(diagnostics);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorDirectiveSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorDirectiveSyntax.cs
new file mode 100644
index 0000000000..ef27d17600
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorDirectiveSyntax.cs
@@ -0,0 +1,34 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal sealed partial class RazorDirectiveSyntax
+    {
+        private static readonly string DirectiveDescriptorKey = typeof(DirectiveDescriptor).Name;
+
+        public DirectiveDescriptor DirectiveDescriptor
+        {
+            get
+            {
+                var annotation = GetAnnotations().FirstOrDefault(n => n.Kind == DirectiveDescriptorKey);
+                return annotation?.Data as DirectiveDescriptor;
+            }
+        }
+
+        public RazorDirectiveSyntax WithDirectiveDescriptor(DirectiveDescriptor descriptor)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(DirectiveDescriptorKey, descriptor)
+            };
+
+            var newGreen = this.WithAnnotationsGreen(annotations.ToArray());
+
+            return newGreen;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorSyntaxNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorSyntaxNode.cs
new file mode 100644
index 0000000000..a353a13dd7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/RazorSyntaxNode.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract partial class RazorSyntaxNode : GreenNode
+    {
+        protected RazorSyntaxNode(SyntaxKind kind) : base(kind)
+        {
+        }
+
+        protected RazorSyntaxNode(SyntaxKind kind, int fullWidth)
+            : base(kind, fullWidth)
+        {
+        }
+
+        protected RazorSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, diagnostics, annotations)
+        {
+        }
+
+        protected RazorSyntaxNode(SyntaxKind kind, int fullWidth, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, fullWidth, diagnostics, annotations)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
new file mode 100644
index 0000000000..b8dba7bdf7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
@@ -0,0 +1,26 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal static partial class SyntaxFactory
+    {
+        internal static SyntaxToken Token(SyntaxKind kind, string content, IEnumerable<RazorDiagnostic> diagnostics)
+        {
+            return Token(kind, content, diagnostics.ToArray());
+        }
+
+        internal static SyntaxToken Token(SyntaxKind kind, string content, params RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(kind, content, diagnostics);
+        }
+
+        internal static SyntaxToken MissingToken(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return SyntaxToken.CreateMissing(kind, diagnostics);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxList.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxList.cs
new file mode 100644
index 0000000000..ff466af513
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxList.cs
@@ -0,0 +1,428 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract class SyntaxList : GreenNode
+    {
+        internal SyntaxList()
+            : base(SyntaxKind.List)
+        {
+        }
+
+        internal SyntaxList(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(SyntaxKind.List, diagnostics, annotations)
+        {
+        }
+
+        internal override bool IsList => true;
+
+        internal static GreenNode List(GreenNode child)
+        {
+            return child;
+        }
+
+        internal static WithTwoChildren List(GreenNode child0, GreenNode child1)
+        {
+            Debug.Assert(child0 != null);
+            Debug.Assert(child1 != null);
+
+            var result = new WithTwoChildren(child0, child1);
+            return result;
+        }
+
+        internal static WithThreeChildren List(GreenNode child0, GreenNode child1, GreenNode child2)
+        {
+            Debug.Assert(child0 != null);
+            Debug.Assert(child1 != null);
+            Debug.Assert(child2 != null);
+
+            var result = new WithThreeChildren(child0, child1, child2);
+            return result;
+        }
+
+        internal static GreenNode List(GreenNode[] nodes)
+        {
+            return List(nodes, nodes.Length);
+        }
+
+        internal static GreenNode List(GreenNode[] nodes, int count)
+        {
+            var array = new ArrayElement<GreenNode>[count];
+            for (int i = 0; i < count; i++)
+            {
+                Debug.Assert(nodes[i] != null);
+                array[i].Value = nodes[i];
+            }
+
+            return List(array);
+        }
+
+        internal static SyntaxList List(ArrayElement<GreenNode>[] children)
+        {
+            // "WithLotsOfChildren" list will allocate a separate array to hold
+            // precomputed node offsets. It may not be worth it for smallish lists.
+            if (children.Length < 10)
+            {
+                return new WithManyChildren(children);
+            }
+            else
+            {
+                return new WithLotsOfChildren(children);
+            }
+        }
+
+        internal abstract void CopyTo(ArrayElement<GreenNode>[] array, int offset);
+
+        internal static GreenNode Concat(GreenNode left, GreenNode right)
+        {
+            if (left == null)
+            {
+                return right;
+            }
+
+            if (right == null)
+            {
+                return left;
+            }
+
+            var leftList = left as SyntaxList;
+            var rightList = right as SyntaxList;
+            if (leftList != null)
+            {
+                if (rightList != null)
+                {
+                    var tmp = new ArrayElement<GreenNode>[left.SlotCount + right.SlotCount];
+                    leftList.CopyTo(tmp, 0);
+                    rightList.CopyTo(tmp, left.SlotCount);
+                    return List(tmp);
+                }
+                else
+                {
+                    var tmp = new ArrayElement<GreenNode>[left.SlotCount + 1];
+                    leftList.CopyTo(tmp, 0);
+                    tmp[left.SlotCount].Value = right;
+                    return List(tmp);
+                }
+            }
+            else if (rightList != null)
+            {
+                var tmp = new ArrayElement<GreenNode>[rightList.SlotCount + 1];
+                tmp[0].Value = left;
+                rightList.CopyTo(tmp, 1);
+                return List(tmp);
+            }
+            else
+            {
+                return List(left, right);
+            }
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.Visit(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.Visit(this);
+        }
+
+        internal class WithTwoChildren : SyntaxList
+        {
+            private readonly GreenNode _child0;
+            private readonly GreenNode _child1;
+
+            internal WithTwoChildren(GreenNode child0, GreenNode child1)
+            {
+                SlotCount = 2;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+            }
+
+            internal WithTwoChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, GreenNode child0, GreenNode child1)
+            {
+                SlotCount = 2;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+            }
+
+            internal override GreenNode GetSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    default:
+                        return null;
+                }
+            }
+
+            internal override void CopyTo(ArrayElement<GreenNode>[] array, int offset)
+            {
+                array[offset].Value = _child0;
+                array[offset + 1].Value = _child1;
+            }
+
+            internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+            {
+                return new Syntax.SyntaxList.WithTwoChildren(this, parent, position);
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithTwoChildren(errors, this.GetAnnotations(), _child0, _child1);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithTwoChildren(GetDiagnostics(), annotations, _child0, _child1);
+            }
+        }
+
+        internal class WithThreeChildren : SyntaxList
+        {
+            private readonly GreenNode _child0;
+            private readonly GreenNode _child1;
+            private readonly GreenNode _child2;
+
+            internal WithThreeChildren(GreenNode child0, GreenNode child1, GreenNode child2)
+            {
+                SlotCount = 3;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+                AdjustFlagsAndWidth(child2);
+                _child2 = child2;
+            }
+
+            internal WithThreeChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, GreenNode child0, GreenNode child1, GreenNode child2)
+                : base(diagnostics, annotations)
+            {
+                SlotCount = 3;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+                AdjustFlagsAndWidth(child2);
+                _child2 = child2;
+            }
+
+            internal override GreenNode GetSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    case 2:
+                        return _child2;
+                    default:
+                        return null;
+                }
+            }
+
+            internal override void CopyTo(ArrayElement<GreenNode>[] array, int offset)
+            {
+                array[offset].Value = _child0;
+                array[offset + 1].Value = _child1;
+                array[offset + 2].Value = _child2;
+            }
+
+            internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+            {
+                return new Syntax.SyntaxList.WithThreeChildren(this, parent, position);
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithThreeChildren(errors, GetAnnotations(), _child0, _child1, _child2);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithThreeChildren(GetDiagnostics(), annotations, _child0, _child1, _child2);
+            }
+        }
+
+        internal abstract class WithManyChildrenBase : SyntaxList
+        {
+            internal readonly ArrayElement<GreenNode>[] children;
+
+            internal WithManyChildrenBase(ArrayElement<GreenNode>[] children)
+            {
+                this.children = children;
+                this.InitializeChildren();
+            }
+
+            internal WithManyChildrenBase(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, ArrayElement<GreenNode>[] children)
+                : base(diagnostics, annotations)
+            {
+                this.children = children;
+                this.InitializeChildren();
+            }
+
+            private void InitializeChildren()
+            {
+                var n = children.Length;
+                if (n < byte.MaxValue)
+                {
+                    SlotCount = (byte)n;
+                }
+                else
+                {
+                    SlotCount = byte.MaxValue;
+                }
+
+                for (var i = 0; i < children.Length; i++)
+                {
+                    AdjustFlagsAndWidth(children[i]);
+                }
+            }
+
+            protected override int GetSlotCount()
+            {
+                return children.Length;
+            }
+
+            internal override GreenNode GetSlot(int index)
+            {
+                return children[index];
+            }
+
+            internal override void CopyTo(ArrayElement<GreenNode>[] array, int offset)
+            {
+                Array.Copy(children, 0, array, offset, children.Length);
+            }
+
+            internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+            {
+                return new Syntax.SyntaxList.WithManyChildren(this, parent, position);
+            }
+        }
+
+        internal sealed class WithManyChildren : WithManyChildrenBase
+        {
+            internal WithManyChildren(ArrayElement<GreenNode>[] children)
+                : base(children)
+            {
+            }
+
+            internal WithManyChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, ArrayElement<GreenNode>[] children)
+                : base(diagnostics, annotations, children)
+            {
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithManyChildren(errors, GetAnnotations(), children);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithManyChildren(GetDiagnostics(), annotations, children);
+            }
+        }
+
+        internal sealed class WithLotsOfChildren : WithManyChildrenBase
+        {
+            private readonly int[] _childOffsets;
+
+            internal WithLotsOfChildren(ArrayElement<GreenNode>[] children)
+                : base(children)
+            {
+                _childOffsets = CalculateOffsets(children);
+            }
+
+            internal WithLotsOfChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, ArrayElement<GreenNode>[] children, int[] childOffsets)
+                : base(diagnostics, annotations, children)
+            {
+                _childOffsets = childOffsets;
+            }
+
+            public override int GetSlotOffset(int index)
+            {
+                return _childOffsets[index];
+            }
+
+            /// <summary>
+            /// Find the slot that contains the given offset.
+            /// </summary>
+            /// <param name="offset">The target offset. Must be between 0 and <see cref="GreenNode.FullWidth"/>.</param>
+            /// <returns>The slot index of the slot containing the given offset.</returns>
+            /// <remarks>
+            /// This implementation uses a binary search to find the first slot that contains
+            /// the given offset.
+            /// </remarks>
+            public override int FindSlotIndexContainingOffset(int offset)
+            {
+                Debug.Assert(offset >= 0 && offset < FullWidth);
+                return BinarySearchUpperBound(_childOffsets, offset) - 1;
+            }
+
+            private static int[] CalculateOffsets(ArrayElement<GreenNode>[] children)
+            {
+                var n = children.Length;
+                var childOffsets = new int[n];
+                var offset = 0;
+                for (var i = 0; i < n; i++)
+                {
+                    childOffsets[i] = offset;
+                    offset += children[i].Value.FullWidth;
+                }
+                return childOffsets;
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithLotsOfChildren(errors, this.GetAnnotations(), children, _childOffsets);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithLotsOfChildren(GetDiagnostics(), annotations, children, _childOffsets);
+            }
+
+            /// <summary>
+            /// Search a sorted integer array for the target value in O(log N) time.
+            /// </summary>
+            /// <param name="array">The array of integers which must be sorted in ascending order.</param>
+            /// <param name="value">The target value.</param>
+            /// <returns>An index in the array pointing to the position where <paramref name="value"/> should be
+            /// inserted in order to maintain the sorted order. All values to the right of this position will be
+            /// strictly greater than <paramref name="value"/>. Note that this may return a position off the end
+            /// of the array if all elements are less than or equal to <paramref name="value"/>.</returns>
+            private static int BinarySearchUpperBound(int[] array, int value)
+            {
+                var low = 0;
+                var high = array.Length - 1;
+
+                while (low <= high)
+                {
+                    var middle = low + ((high - low) >> 1);
+                    if (array[middle] > value)
+                    {
+                        high = middle - 1;
+                    }
+                    else
+                    {
+                        low = middle + 1;
+                    }
+                }
+
+                return low;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilder.cs
new file mode 100644
index 0000000000..fae8e718a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilder.cs
@@ -0,0 +1,201 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxListBuilder
+    {
+        private ArrayElement<GreenNode>[] _nodes;
+
+        public int Count { get; private set; }
+
+        public SyntaxListBuilder(int size)
+        {
+            _nodes = new ArrayElement<GreenNode>[size];
+        }
+
+        public static SyntaxListBuilder Create()
+        {
+            return new SyntaxListBuilder(8);
+        }
+
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        public GreenNode this[int index]
+        {
+            get
+            {
+                return _nodes[index];
+            }
+
+            set
+            {
+                _nodes[index].Value = value;
+            }
+        }
+
+        public void Add(GreenNode item)
+        {
+            if (item == null) return;
+
+            if (item.IsList)
+            {
+                var slotCount = item.SlotCount;
+
+                // Necessary, but not sufficient (e.g. for nested lists).
+                EnsureAdditionalCapacity(slotCount);
+
+                for (var i = 0; i < slotCount; i++)
+                {
+                    Add(item.GetSlot(i));
+                }
+            }
+            else
+            {
+                EnsureAdditionalCapacity(1);
+
+                _nodes[Count++].Value = item;
+            }
+        }
+
+        public void AddRange(GreenNode[] items)
+        {
+            AddRange(items, 0, items.Length);
+        }
+
+        public void AddRange(GreenNode[] items, int offset, int length)
+        {
+            // Necessary, but not sufficient (e.g. for nested lists).
+            EnsureAdditionalCapacity(length - offset);
+
+            var oldCount = Count;
+
+            for (var i = offset; i < length; i++)
+            {
+                Add(items[i]);
+            }
+
+            Validate(oldCount, Count);
+        }
+
+        [Conditional("DEBUG")]
+        private void Validate(int start, int end)
+        {
+            for (var i = start; i < end; i++)
+            {
+                Debug.Assert(_nodes[i].Value != null);
+            }
+        }
+
+        public void AddRange(SyntaxList<GreenNode> list)
+        {
+            this.AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange(SyntaxList<GreenNode> list, int offset, int length)
+        {
+            // Necessary, but not sufficient (e.g. for nested lists).
+            EnsureAdditionalCapacity(length - offset);
+
+            var oldCount = Count;
+
+            for (var i = offset; i < length; i++)
+            {
+                Add(list[i]);
+            }
+
+            Validate(oldCount, Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list) where TNode : GreenNode
+        {
+            this.AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list, int offset, int length) where TNode : GreenNode
+        {
+            AddRange(new SyntaxList<GreenNode>(list.Node), offset, length);
+        }
+
+        public void RemoveLast()
+        {
+            Count--;
+            _nodes[Count].Value = null;
+        }
+
+        private void EnsureAdditionalCapacity(int additionalCount)
+        {
+            var currentSize = _nodes.Length;
+            var requiredSize = Count + additionalCount;
+
+            if (requiredSize <= currentSize) return;
+
+            var newSize =
+                requiredSize < 8 ? 8 :
+                requiredSize >= (int.MaxValue / 2) ? int.MaxValue :
+                Math.Max(requiredSize, currentSize * 2); // NB: Size will *at least* double.
+            Debug.Assert(newSize >= requiredSize);
+
+            Array.Resize(ref _nodes, newSize);
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                if (_nodes[i].Value.Kind == kind)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public GreenNode[] ToArray()
+        {
+            var array = new GreenNode[Count];
+            for (var i = 0; i < array.Length; i++)
+            {
+                array[i] = _nodes[i];
+            }
+
+            return array;
+        }
+
+        internal GreenNode ToListNode()
+        {
+            switch (Count)
+            {
+                case 0:
+                    return null;
+                case 1:
+                    return _nodes[0];
+                case 2:
+                    return SyntaxList.List(_nodes[0], _nodes[1]);
+                case 3:
+                    return SyntaxList.List(_nodes[0], _nodes[1], _nodes[2]);
+                default:
+                    var tmp = new ArrayElement<GreenNode>[Count];
+                    Array.Copy(_nodes, tmp, Count);
+                    return SyntaxList.List(tmp);
+            }
+        }
+
+        public SyntaxList<GreenNode> ToList()
+        {
+            return new SyntaxList<GreenNode>(ToListNode());
+        }
+
+        public SyntaxList<TNode> ToList<TNode>() where TNode : GreenNode
+        {
+            return new SyntaxList<TNode>(ToListNode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
new file mode 100644
index 0000000000..65a11313f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
@@ -0,0 +1,115 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal readonly struct SyntaxListBuilder<TNode> where TNode : GreenNode
+    {
+        private readonly SyntaxListBuilder _builder;
+
+        public SyntaxListBuilder(int size)
+            : this(new SyntaxListBuilder(size))
+        {
+        }
+
+        public static SyntaxListBuilder<TNode> Create()
+        {
+            return new SyntaxListBuilder<TNode>(8);
+        }
+
+        internal SyntaxListBuilder(SyntaxListBuilder builder)
+        {
+            _builder = builder;
+        }
+
+        public bool IsNull
+        {
+            get
+            {
+                return _builder == null;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return _builder.Count;
+            }
+        }
+
+        public TNode this[int index]
+        {
+            get
+            {
+                return (TNode)_builder[index];
+            }
+
+            set
+            {
+                _builder[index] = value;
+            }
+        }
+
+        public void Clear()
+        {
+            _builder.Clear();
+        }
+
+        public SyntaxListBuilder<TNode> Add(TNode node)
+        {
+            _builder.Add(node);
+            return this;
+        }
+
+        public void AddRange(TNode[] items, int offset, int length)
+        {
+            _builder.AddRange(items, offset, length);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes)
+        {
+            _builder.AddRange(nodes);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes, int offset, int length)
+        {
+            _builder.AddRange(nodes, offset, length);
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            return _builder.Any(kind);
+        }
+
+        public SyntaxList<TNode> ToList()
+        {
+            return _builder.ToList<TNode>();
+        }
+
+        public GreenNode ToListNode()
+        {
+            return _builder.ToListNode();
+        }
+
+        public static implicit operator SyntaxListBuilder(SyntaxListBuilder<TNode> builder)
+        {
+            return builder._builder;
+        }
+
+        public static implicit operator SyntaxList<TNode>(SyntaxListBuilder<TNode> builder)
+        {
+            if (builder._builder != null)
+            {
+                return builder.ToList();
+            }
+
+            return default(SyntaxList<TNode>);
+        }
+
+        public SyntaxList<TDerived> ToList<TDerived>() where TDerived : GreenNode
+        {
+            return new SyntaxList<TDerived>(ToListNode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListOfT.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListOfT.cs
new file mode 100644
index 0000000000..abb34c628c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListOfT.cs
@@ -0,0 +1,187 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal struct SyntaxList<TNode> : IEquatable<SyntaxList<TNode>>
+        where TNode : GreenNode
+    {
+        private readonly GreenNode _node;
+
+        public SyntaxList(GreenNode node)
+        {
+            _node = node;
+        }
+
+        internal GreenNode Node => _node;
+
+        public int Count
+        {
+            get
+            {
+                return (_node == null) ? 0 : _node.IsList ? _node.SlotCount : 1;
+            }
+        }
+
+        public TNode this[int index]
+        {
+            get
+            {
+                if (_node == null)
+                {
+                    return null;
+                }
+                else if (_node.IsList)
+                {
+                    Debug.Assert(index >= 0);
+                    Debug.Assert(index <= _node.SlotCount);
+
+                    return ((TNode)_node.GetSlot(index));
+                }
+                else if (index == 0)
+                {
+                    Debug.Assert(index == 0);
+                    return ((TNode)_node);
+                }
+                else
+                {
+                    throw new InvalidOperationException("This program location is thought to be unreachable.");
+                }
+            }
+        }
+
+        public GreenNode ItemUntyped(int index)
+        {
+            var node = _node;
+            if (node.IsList)
+            {
+                return node.GetSlot(index);
+            }
+
+            Debug.Assert(index == 0);
+            return node;
+        }
+
+        public bool Any()
+        {
+            return _node != null;
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                var element = ItemUntyped(i);
+                if ((element.Kind == kind))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public TNode[] Nodes
+        {
+            get
+            {
+                var arr = new TNode[Count];
+                for (var i = 0; i < Count; i++)
+                {
+                    arr[i] = this[i];
+                }
+
+                return arr;
+            }
+        }
+
+        public TNode Last
+        {
+            get
+            {
+                var node = _node;
+                if (node.IsList)
+                {
+                    return ((TNode)node.GetSlot(node.SlotCount - 1));
+                }
+
+                return ((TNode)node);
+            }
+        }
+
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        public static bool operator ==(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return (left._node == right._node);
+        }
+
+        public static bool operator !=(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return !(left._node == right._node);
+        }
+
+        public bool Equals(SyntaxList<TNode> other)
+        {
+            return _node == other._node;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return (obj is SyntaxList<TNode> && (_node == ((SyntaxList<TNode>)obj)._node));
+        }
+
+        public override int GetHashCode()
+        {
+            return _node != null ? _node.GetHashCode() : 0;
+        }
+
+        public static implicit operator SyntaxList<TNode>(TNode node)
+        {
+            return new SyntaxList<TNode>(node);
+        }
+
+        public static implicit operator SyntaxList<GreenNode>(SyntaxList<TNode> nodes)
+        {
+            return new SyntaxList<GreenNode>(nodes._node);
+        }
+
+        internal struct Enumerator
+        {
+            private SyntaxList<TNode> _list;
+            private int _index;
+
+            internal Enumerator(SyntaxList<TNode> list)
+            {
+                _list = list;
+                _index = -1;
+            }
+
+            public bool MoveNext()
+            {
+                var newIndex = _index + 1;
+                if (newIndex < _list.Count)
+                {
+                    _index = newIndex;
+                    return true;
+                }
+
+                return false;
+            }
+
+            public TNode Current
+            {
+                get
+                {
+                    return _list[_index];
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListPool.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListPool.cs
new file mode 100644
index 0000000000..3f9e88608c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListPool.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxListPool
+    {
+        private ArrayElement<SyntaxListBuilder>[] _freeList = new ArrayElement<SyntaxListBuilder>[10];
+        private int _freeIndex;
+
+#if DEBUG
+        private readonly List<SyntaxListBuilder> _allocated = new List<SyntaxListBuilder>();
+#endif
+
+        internal SyntaxListPool()
+        {
+        }
+
+        internal SyntaxListBuilder Allocate()
+        {
+            SyntaxListBuilder item;
+            if (_freeIndex > 0)
+            {
+                _freeIndex--;
+                item = _freeList[_freeIndex].Value;
+                _freeList[_freeIndex].Value = null;
+            }
+            else
+            {
+                item = new SyntaxListBuilder(10);
+            }
+
+#if DEBUG
+            Debug.Assert(!_allocated.Contains(item));
+            _allocated.Add(item);
+#endif
+            return item;
+        }
+
+        internal PooledResult<TNode> Allocate<TNode>() where TNode : GreenNode
+        {
+            var builder = new SyntaxListBuilder<TNode>(this.Allocate());
+            return new PooledResult<TNode>(this, builder);
+        }
+
+        internal void Free(SyntaxListBuilder item)
+        {
+            item.Clear();
+            if (_freeIndex >= _freeList.Length)
+            {
+                this.Grow();
+            }
+#if DEBUG
+            Debug.Assert(_allocated.Contains(item));
+
+            _allocated.Remove(item);
+#endif
+            _freeList[_freeIndex].Value = item;
+            _freeIndex++;
+        }
+
+        private void Grow()
+        {
+            var tmp = new ArrayElement<SyntaxListBuilder>[_freeList.Length * 2];
+            Array.Copy(_freeList, tmp, _freeList.Length);
+            _freeList = tmp;
+        }
+
+        public SyntaxList<TNode> ToListAndFree<TNode>(SyntaxListBuilder<TNode> item)
+            where TNode : GreenNode
+        {
+            var list = item.ToList();
+            Free(item);
+            return list;
+        }
+
+        public readonly struct PooledResult<TNode> : IDisposable where TNode : GreenNode
+        {
+            private readonly SyntaxListBuilder<TNode> _builder;
+            private readonly SyntaxListPool _pool;
+
+            public PooledResult(SyntaxListPool pool, in SyntaxListBuilder<TNode> builder)
+            {
+                _pool = pool;
+                _builder = builder;
+            }
+
+            public SyntaxListBuilder<TNode> Builder => _builder;
+
+            public void Dispose()
+            {
+                _pool.Free(_builder);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxRewriter.cs
new file mode 100644
index 0000000000..fcf0e04ef5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxRewriter.cs
@@ -0,0 +1,56 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract partial class SyntaxRewriter : SyntaxVisitor<GreenNode>
+    {
+        public override GreenNode VisitToken(SyntaxToken token)
+        {
+            var leading = VisitList(token.LeadingTrivia);
+            var trailing = VisitList(token.TrailingTrivia);
+
+            if (leading != token.LeadingTrivia || trailing != token.TrailingTrivia)
+            {
+                if (leading != token.LeadingTrivia)
+                {
+                    token = token.TokenWithLeadingTrivia(leading.Node);
+                }
+
+                if (trailing != token.TrailingTrivia)
+                {
+                    token = token.TokenWithTrailingTrivia(trailing.Node);
+                }
+            }
+
+            return token;
+        }
+
+        public SyntaxList<TNode> VisitList<TNode>(SyntaxList<TNode> list) where TNode : GreenNode
+        {
+            SyntaxListBuilder alternate = null;
+            for (int i = 0, n = list.Count; i < n; i++)
+            {
+                var item = list[i];
+                var visited = Visit(item);
+                if (item != visited && alternate == null)
+                {
+                    alternate = new SyntaxListBuilder(n);
+                    alternate.AddRange(list, 0, i);
+                }
+
+                if (alternate != null)
+                {
+                    alternate.Add(visited);
+                }
+            }
+
+            if (alternate != null)
+            {
+                return alternate.ToList<TNode>();
+            }
+
+            return list;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxToken.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxToken.cs
new file mode 100644
index 0000000000..2b958788ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxToken.cs
@@ -0,0 +1,226 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxToken : RazorSyntaxNode
+    {
+        private readonly GreenNode _leadingTrivia;
+        private readonly GreenNode _trailingTrivia;
+
+        internal SyntaxToken(SyntaxKind kind, string content, RazorDiagnostic[] diagnostics)
+            : base(kind, content.Length, diagnostics, annotations: null)
+        {
+            Content = content;
+        }
+
+        internal SyntaxToken(SyntaxKind kind, string content, GreenNode leadingTrivia, GreenNode trailingTrivia)
+            : base(kind, content.Length)
+        {
+            Content = content;
+            _leadingTrivia = leadingTrivia;
+            AdjustFlagsAndWidth(leadingTrivia);
+            _trailingTrivia = trailingTrivia;
+            AdjustFlagsAndWidth(trailingTrivia);
+        }
+
+        internal SyntaxToken(SyntaxKind kind, string content, GreenNode leadingTrivia, GreenNode trailingTrivia, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, content.Length, diagnostics, annotations)
+        {
+            Content = content;
+            _leadingTrivia = leadingTrivia;
+            AdjustFlagsAndWidth(leadingTrivia);
+            _trailingTrivia = trailingTrivia;
+            AdjustFlagsAndWidth(trailingTrivia);
+        }
+
+        public string Content { get; }
+
+        public SyntaxList<GreenNode> LeadingTrivia
+        {
+            get { return new SyntaxList<GreenNode>(GetLeadingTrivia()); }
+        }
+
+        public SyntaxList<GreenNode> TrailingTrivia
+        {
+            get { return new SyntaxList<GreenNode>(GetTrailingTrivia()); }
+        }
+
+        internal override bool IsToken => true;
+
+        public override int Width => Content.Length;
+
+        internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+        {
+            return new Syntax.SyntaxToken(this, parent, position);
+        }
+
+        protected override void WriteTokenTo(TextWriter writer, bool leading, bool trailing)
+        {
+            if (leading)
+            {
+                var trivia = GetLeadingTrivia();
+                if (trivia != null)
+                {
+                    trivia.WriteTo(writer, true, true);
+                }
+            }
+
+            writer.Write(Content);
+
+            if (trailing)
+            {
+                var trivia = GetTrailingTrivia();
+                if (trivia != null)
+                {
+                    trivia.WriteTo(writer, true, true);
+                }
+            }
+        }
+
+        public override sealed GreenNode GetLeadingTrivia()
+        {
+            return _leadingTrivia;
+        }
+
+        public override int GetLeadingTriviaWidth()
+        {
+            return _leadingTrivia == null ? 0 : _leadingTrivia.FullWidth;
+        }
+
+        public override sealed GreenNode GetTrailingTrivia()
+        {
+            return _trailingTrivia;
+        }
+
+        public override int GetTrailingTriviaWidth()
+        {
+            return _trailingTrivia == null ? 0 : _trailingTrivia.FullWidth;
+        }
+
+        public sealed override GreenNode WithLeadingTrivia(GreenNode trivia)
+        {
+            return TokenWithLeadingTrivia(trivia);
+        }
+
+        public virtual SyntaxToken TokenWithLeadingTrivia(GreenNode trivia)
+        {
+            return new SyntaxToken(Kind, Content, trivia, _trailingTrivia, GetDiagnostics(), GetAnnotations());
+        }
+
+        public sealed override GreenNode WithTrailingTrivia(GreenNode trivia)
+        {
+            return TokenWithTrailingTrivia(trivia);
+        }
+
+        public virtual SyntaxToken TokenWithTrailingTrivia(GreenNode trivia)
+        {
+            return new SyntaxToken(Kind, Content, _leadingTrivia, trivia, GetDiagnostics(), GetAnnotations());
+        }
+
+        internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(Kind, Content, _leadingTrivia, _trailingTrivia, diagnostics, GetAnnotations());
+        }
+
+        internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+        {
+            return new SyntaxToken(Kind, Content, _leadingTrivia, _trailingTrivia, GetDiagnostics(), annotations);
+        }
+
+        protected override sealed int GetSlotCount()
+        {
+            return 0;
+        }
+
+        internal override sealed GreenNode GetSlot(int index)
+        {
+            throw new InvalidOperationException("Tokens don't have slots.");
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitToken(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitToken(this);
+        }
+
+        public override bool IsEquivalentTo(GreenNode other)
+        {
+            if (!base.IsEquivalentTo(other))
+            {
+                return false;
+            }
+
+            var otherToken = (SyntaxToken)other;
+
+            if (Content != otherToken.Content)
+            {
+                return false;
+            }
+
+            var thisLeading = GetLeadingTrivia();
+            var otherLeading = otherToken.GetLeadingTrivia();
+            if (thisLeading != otherLeading)
+            {
+                if (thisLeading == null || otherLeading == null)
+                {
+                    return false;
+                }
+
+                if (!thisLeading.IsEquivalentTo(otherLeading))
+                {
+                    return false;
+                }
+            }
+
+            var thisTrailing = GetTrailingTrivia();
+            var otherTrailing = otherToken.GetTrailingTrivia();
+            if (thisTrailing != otherTrailing)
+            {
+                if (thisTrailing == null || otherTrailing == null)
+                {
+                    return false;
+                }
+
+                if (!thisTrailing.IsEquivalentTo(otherTrailing))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public override string ToString()
+        {
+            return Content;
+        }
+
+        internal static SyntaxToken CreateMissing(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return new MissingToken(kind, diagnostics);
+        }
+
+        private class MissingToken : SyntaxToken
+        {
+            internal MissingToken(SyntaxKind kind, RazorDiagnostic[] diagnostics)
+                : base(kind, string.Empty, diagnostics)
+            {
+                Flags |= NodeFlags.IsMissing;
+            }
+
+            internal MissingToken(SyntaxKind kind, GreenNode leading, GreenNode trailing, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+                : base(kind, string.Empty, leading, trailing, diagnostics, annotations)
+            {
+                Flags |= NodeFlags.IsMissing;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxTrivia.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxTrivia.cs
new file mode 100644
index 0000000000..84ad53155a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxTrivia.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxTrivia : GreenNode
+    {
+        internal SyntaxTrivia(SyntaxKind kind, string text)
+            : base(kind, text.Length)
+        {
+            Text = text;
+        }
+
+        internal SyntaxTrivia(SyntaxKind kind, string text, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, text.Length, diagnostics, annotations)
+        {
+            Text = text;
+        }
+
+        public string Text { get; }
+
+        internal override bool IsTrivia => true;
+
+        public override int Width => Text.Length;
+
+        protected override void WriteTriviaTo(TextWriter writer)
+        {
+            writer.Write(Text);
+        }
+
+        public sealed override string ToFullString()
+        {
+            return Text;
+        }
+
+        public sealed override int GetLeadingTriviaWidth()
+        {
+            return 0;
+        }
+
+        public sealed override int GetTrailingTriviaWidth()
+        {
+            return 0;
+        }
+
+        protected override sealed int GetSlotCount()
+        {
+            return 0;
+        }
+
+        internal override sealed GreenNode GetSlot(int index)
+        {
+            throw new InvalidOperationException();
+        }
+
+        internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+        {
+            return new Syntax.SyntaxTrivia(this, parent, position);
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitTrivia(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitTrivia(this);
+        }
+
+        internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxTrivia(Kind, Text, diagnostics, GetAnnotations());
+        }
+
+        internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+        {
+            return new SyntaxTrivia(Kind, Text, GetDiagnostics(), annotations);
+        }
+
+        public override bool IsEquivalentTo(GreenNode other)
+        {
+            if (!base.IsEquivalentTo(other))
+            {
+                return false;
+            }
+
+            if (Text != ((SyntaxTrivia)other).Text)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxVisitor.cs
new file mode 100644
index 0000000000..a00f30f477
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxVisitor.cs
@@ -0,0 +1,60 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract partial class SyntaxVisitor<TResult>
+    {
+        public virtual TResult Visit(GreenNode node)
+        {
+            if (node == null)
+            {
+                return default(TResult);
+            }
+
+            return node.Accept(this);
+        }
+
+        public virtual TResult VisitToken(SyntaxToken token)
+        {
+            return DefaultVisit(token);
+        }
+
+        public virtual TResult VisitTrivia(SyntaxTrivia trivia)
+        {
+            return DefaultVisit(trivia);
+        }
+
+        protected virtual TResult DefaultVisit(GreenNode node)
+        {
+            return default(TResult);
+        }
+    }
+
+    internal abstract partial class SyntaxVisitor
+    {
+        public virtual GreenNode Visit(GreenNode node)
+        {
+            if (node != null)
+            {
+                node.Accept(this);
+            }
+
+            return null;
+        }
+
+        public virtual void VisitToken(SyntaxToken token)
+        {
+            DefaultVisit(token);
+        }
+
+        public virtual void VisitTrivia(SyntaxTrivia trivia)
+        {
+            DefaultVisit(trivia);
+        }
+
+        protected virtual void DefaultVisit(GreenNode node)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
new file mode 100644
index 0000000000..7aeda1c349
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
@@ -0,0 +1,290 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class MarkupElementRewriter
+    {
+        public static RazorSyntaxTree AddMarkupElements(RazorSyntaxTree syntaxTree)
+        {
+            var rewriter = new AddMarkupElementRewriter();
+            var rewrittenRoot = rewriter.Visit(syntaxTree.Root);
+
+            var newSyntaxTree = RazorSyntaxTree.Create(rewrittenRoot, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
+            return newSyntaxTree;
+        }
+
+        public static RazorSyntaxTree RemoveMarkupElements(RazorSyntaxTree syntaxTree)
+        {
+            var rewriter = new RemoveMarkupElementRewriter();
+            var rewrittenRoot = rewriter.Visit(syntaxTree.Root);
+
+            var newSyntaxTree = RazorSyntaxTree.Create(rewrittenRoot, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
+            return newSyntaxTree;
+        }
+
+        private class AddMarkupElementRewriter : SyntaxRewriter
+        {
+            private readonly Stack<TagBlockTracker> _startTagTracker = new Stack<TagBlockTracker>();
+
+            private TagBlockTracker CurrentTracker => _startTagTracker.Count > 0 ? _startTagTracker.Peek() : null;
+
+            private string CurrentStartTagName => CurrentTracker?.TagName;
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                node = base.Visit(node);
+                
+                if (node != null)
+                {
+                    node = RewriteNode(node);
+                }
+
+                return node;
+            }
+
+            private SyntaxNode RewriteNode(SyntaxNode node)
+            {
+                if (node.IsToken)
+                {
+                    // Tokens don't have children.
+                    return node;
+                }
+
+                _startTagTracker.Clear();
+                var children = node.ChildNodes().ToList();
+                var rewrittenChildren = new List<SyntaxNode>(children.Count);
+                for (var i = 0; i < children.Count; i++)
+                {
+                    var child = children[i];
+                    if (!(child is MarkupTagBlockSyntax tagBlock))
+                    {
+                        TrackChild(child, rewrittenChildren);
+                        continue;
+                    }
+
+                    var tagName = tagBlock.GetTagName();
+                    if (string.IsNullOrWhiteSpace(tagName) || tagBlock.IsSelfClosing())
+                    {
+                        // Don't want to track incomplete, invalid (Eg. </>, <  >), void or self-closing tags.
+                        // Simply wrap it in a block with no body or start/end tag.
+                        if (IsEndTag(tagBlock))
+                        {
+                            // This is an error case.
+                            BuildMarkupElement(rewrittenChildren, startTag: null, tagChildren: new List<RazorSyntaxNode>(), endTag: tagBlock);
+                        }
+                        else
+                        {
+                            BuildMarkupElement(rewrittenChildren, startTag: tagBlock, tagChildren: new List<RazorSyntaxNode>(), endTag: null);
+                        }
+                    }
+                    else if (IsEndTag(tagBlock))
+                    {
+                        if (string.Equals(CurrentStartTagName, tagName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            var startTagTracker = _startTagTracker.Pop();
+                            var startTag = startTagTracker.TagBlock;
+
+                            // Get the nodes between the start and the end tag.
+                            var tagChildren = startTagTracker.Children;
+
+                            BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag: tagBlock);
+                        }
+                        else
+                        {
+                            // Current tag scope does not match the end tag. Attempt to recover the start tag
+                            // by looking up the previous tag scopes for a matching start tag.
+                            if (!TryRecoverStartTag(rewrittenChildren, tagName, tagBlock))
+                            {
+                                // Could not recover. The end tag doesn't have a corresponding start tag. Wrap it in a block and move on.
+                                var rewritten = SyntaxFactory.MarkupElement(startTag: null, body: new SyntaxList<RazorSyntaxNode>(), endTag: tagBlock);
+                                TrackChild(rewritten, rewrittenChildren);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // This is a start tag. Keep track of it.
+                        _startTagTracker.Push(new TagBlockTracker(tagBlock));
+                    }
+                }
+
+                while (_startTagTracker.Count > 0)
+                {
+                    // We reached the end of the list and still have unmatched start tags
+                    var startTagTracker = _startTagTracker.Pop();
+                    var startTag = startTagTracker.TagBlock;
+                    var tagChildren = startTagTracker.Children;
+                    BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag: null);
+                }
+
+                // We now have finished building our list of rewritten Children.
+                // At this point, We should have a one to one replacement for every child. The replacement can be null.
+                Debug.Assert(children.Count == rewrittenChildren.Count);
+                node = node.ReplaceNodes(children, (original, rewritten) =>
+                {
+                    var originalIndex = children.IndexOf(original);
+                    if (originalIndex != -1)
+                    {
+                        // If this returns null, that node will be removed.
+                        return rewrittenChildren[originalIndex];
+                    }
+
+                    return original;
+                });
+
+                return node;
+            }
+
+            private void BuildMarkupElement(List<SyntaxNode> rewrittenChildren, MarkupTagBlockSyntax startTag, List<RazorSyntaxNode> tagChildren, MarkupTagBlockSyntax endTag)
+            {
+                // We are trying to replace multiple nodes (including the start/end tag) with one rewritten node.
+                // Since we need to have each child node accounted for in our rewritten list,
+                // we'll add "null" in place of them.
+                // The call to SyntaxNode.ReplaceNodes() later will take care removing the nodes whose replacement is null.
+
+                var body = tagChildren.Where(t => t != null).ToList();
+                var rewritten = SyntaxFactory.MarkupElement(startTag, new SyntaxList<RazorSyntaxNode>(body), endTag);
+                if (startTag != null)
+                {
+                    // If there was a start tag, that is where we want to put our new element.
+                    TrackChild(rewritten, rewrittenChildren);
+                }
+
+                foreach (var child in tagChildren)
+                {
+                    TrackChild(null, rewrittenChildren);
+                }
+                if (endTag != null)
+                {
+                    TrackChild(startTag == null ? rewritten : null, rewrittenChildren);
+                }
+            }
+
+            private void TrackChild(SyntaxNode child, List<SyntaxNode> rewrittenChildren)
+            {
+                if (CurrentTracker != null)
+                {
+                    CurrentTracker.Children.Add((RazorSyntaxNode)child);
+                    return;
+                }
+
+                rewrittenChildren.Add(child);
+            }
+
+            private bool TryRecoverStartTag(List<SyntaxNode> rewrittenChildren, string tagName, MarkupTagBlockSyntax endTag)
+            {
+                var malformedTagCount = 0;
+                foreach (var tracker in _startTagTracker)
+                {
+                    if (tracker.TagName.Equals(tagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        break;
+                    }
+
+                    malformedTagCount++;
+                }
+
+                if (_startTagTracker.Count > malformedTagCount)
+                {
+                    RewriteMalformedTags(rewrittenChildren, malformedTagCount);
+
+                    // One final rewrite, this is the rewrite that completes our target tag which is not malformed.
+                    var startTagTracker = _startTagTracker.Pop();
+                    var startTag = startTagTracker.TagBlock;
+                    var tagChildren = startTagTracker.Children;
+
+                    BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag);
+
+                    // We were able to recover
+                    return true;
+                }
+
+                // Could not recover tag. Aka we found an end tag without a corresponding start tag.
+                return false;
+            }
+
+            private void RewriteMalformedTags(List<SyntaxNode> rewrittenChildren, int malformedTagCount)
+            {
+                for (var i = 0; i < malformedTagCount; i++)
+                {
+                    var startTagTracker = _startTagTracker.Pop();
+                    var startTag = startTagTracker.TagBlock;
+
+                    BuildMarkupElement(rewrittenChildren, startTag, startTagTracker.Children, endTag: null);
+                }
+            }
+
+            private bool IsEndTag(MarkupTagBlockSyntax tagBlock)
+            {
+                var childContent = tagBlock.Children.First().GetContent();
+                if (string.IsNullOrEmpty(childContent))
+                {
+                    return false;
+                }
+
+                // We grab the token that could be forward slash
+                return childContent.StartsWith("</") || childContent.StartsWith("/");
+            }
+
+            private class TagBlockTracker
+            {
+                public TagBlockTracker(MarkupTagBlockSyntax tagBlock)
+                {
+                    TagBlock = tagBlock;
+                    TagName = tagBlock.GetTagName();
+                    Children = new List<RazorSyntaxNode>();
+                }
+
+                public MarkupTagBlockSyntax TagBlock { get; }
+
+                public List<RazorSyntaxNode> Children { get; }
+
+                public string TagName { get; }
+            }
+        }
+
+        private class RemoveMarkupElementRewriter : SyntaxRewriter
+        {
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node != null)
+                {
+                    node = RewriteNode(node);
+                }
+
+                return base.Visit(node);
+            }
+
+            private SyntaxNode RewriteNode(SyntaxNode node)
+            {
+                if (node.IsToken)
+                {
+                    return node;
+                }
+
+                var children = node.ChildNodes();
+                for (var i = 0; i < children.Count; i++)
+                {
+                    var child = children[i];
+                    if (!(child is MarkupElementSyntax tagElement))
+                    {
+                        continue;
+                    }
+
+                    node = node.ReplaceNode(tagElement, tagElement.ChildNodes());
+
+                    // Since we rewrote 'node', it's children are different. Update our collection.
+                    children = node.ChildNodes();
+                }
+
+                return node;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs
new file mode 100644
index 0000000000..980616d9c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupMinimizedTagHelperAttributeSyntax
+    {
+        private static readonly string TagHelperAttributeInfoKey = typeof(TagHelperAttributeInfo).Name;
+
+        public TagHelperAttributeInfo TagHelperAttributeInfo
+        {
+            get
+            {
+                var tagHelperAttributeInfo = this.GetAnnotationValue(TagHelperAttributeInfoKey) as TagHelperAttributeInfo;
+                return tagHelperAttributeInfo;
+            }
+        }
+
+        public MarkupMinimizedTagHelperAttributeSyntax WithTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperAttributeInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupMinimizedTagHelperAttributeSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperAttributeSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperAttributeSyntax.cs
new file mode 100644
index 0000000000..4b7aea1e69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperAttributeSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupTagHelperAttributeSyntax
+    {
+        private static readonly string TagHelperAttributeInfoKey = typeof(TagHelperAttributeInfo).Name;
+
+        public TagHelperAttributeInfo TagHelperAttributeInfo
+        {
+            get
+            {
+                var tagHelperAttributeInfo = this.GetAnnotationValue(TagHelperAttributeInfoKey) as TagHelperAttributeInfo;
+                return tagHelperAttributeInfo;
+            }
+        }
+
+        public MarkupTagHelperAttributeSyntax WithTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperAttributeInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupTagHelperAttributeSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperElementSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperElementSyntax.cs
new file mode 100644
index 0000000000..eaca56474a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperElementSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupTagHelperElementSyntax
+    {
+        private static readonly string TagHelperInfoKey = typeof(TagHelperInfo).Name;
+
+        public TagHelperInfo TagHelperInfo
+        {
+            get
+            {
+                var tagHelperInfo = this.GetAnnotationValue(TagHelperInfoKey) as TagHelperInfo;
+                return tagHelperInfo;
+            }
+        }
+
+        public MarkupTagHelperElementSyntax WithTagHelperInfo(TagHelperInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupTagHelperElementSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/NodeFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/NodeFlags.cs
new file mode 100644
index 0000000000..5dd4850e58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/NodeFlags.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    [Flags]
+    internal enum NodeFlags : byte
+    {
+        None = 0,
+        ContainsDiagnostics = 1 << 0,
+        ContainsStructuredTrivia = 1 << 1,
+        ContainsDirectives = 1 << 2,
+        ContainsSkippedText = 1 << 3,
+        ContainsAnnotations = 1 << 4,
+        IsMissing = 1 << 5,
+
+        InheritMask = ContainsDiagnostics | ContainsStructuredTrivia | ContainsDirectives | ContainsSkippedText | ContainsAnnotations | IsMissing,
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ObjectPool.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ObjectPool.cs
new file mode 100644
index 0000000000..2df35b64ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/ObjectPool.cs
@@ -0,0 +1,248 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+#if DETECT_LEAKS
+using System.Runtime.CompilerServices;
+
+#endif
+
+// define TRACE_LEAKS to get additional diagnostics that can lead to the leak sources. note: it will
+// make everything about 2-3x slower
+//
+// #define TRACE_LEAKS
+
+// define DETECT_LEAKS to detect possible leaks
+// #if DEBUG
+// #define DETECT_LEAKS  //for now always enable DETECT_LEAKS in debug.
+// #endif
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Generic implementation of object pooling pattern with predefined pool size limit. The main
+    /// purpose is that limited number of frequently used objects can be kept in the pool for
+    /// further recycling.
+    ///
+    /// Notes:
+    /// 1) it is not the goal to keep all returned objects. Pool is not meant for storage. If there
+    ///    is no space in the pool, extra returned objects will be dropped.
+    ///
+    /// 2) it is implied that if object was obtained from a pool, the caller will return it back in
+    ///    a relatively short time. Keeping checked out objects for long durations is ok, but
+    ///    reduces usefulness of pooling. Just new up your own.
+    ///
+    /// Not returning objects to the pool in not detrimental to the pool's work, but is a bad practice.
+    /// Rationale:
+    ///    If there is no intent for reusing the object, do not use pool - just use "new".
+    /// </summary>
+    internal class ObjectPool<T> where T : class
+    {
+        private struct Element
+        {
+            internal T Value;
+        }
+
+        /// <remarks>
+        /// Not using <see cref="T:System.Func{T}"/> because this file is linked into the (debugger) Formatter,
+        /// which does not have that type (since it compiles against .NET 2.0).
+        /// </remarks>
+        internal delegate T Factory();
+
+        // storage for the pool objects.
+        private readonly Element[] _items;
+
+        // factory is stored for the lifetime of the pool. We will call this only when pool needs to
+        // expand. compared to "new T()", Func gives more flexibility to implementers and faster
+        // than "new T()".
+        private readonly Factory _factory;
+
+#if DETECT_LEAKS
+        private static readonly ConditionalWeakTable<T, LeakTracker> leakTrackers = new ConditionalWeakTable<T, LeakTracker>();
+
+        private class LeakTracker : IDisposable
+        {
+            private volatile bool disposed;
+
+#if TRACE_LEAKS
+            internal volatile System.Diagnostics.StackTrace Trace = null;
+#endif
+
+            public void Dispose()
+            {
+                disposed = true;
+                GC.SuppressFinalize(this);
+            }
+
+            private string GetTrace()
+            {
+#if TRACE_LEAKS
+                return Trace == null? "": Trace.ToString();
+#else
+                return "Leak tracing information is disabled. Define TRACE_LEAKS on ObjectPool`1.cs to get more info \n";
+#endif
+            }
+
+            ~LeakTracker()
+            {
+                if (!this.disposed &&
+                    !Environment.HasShutdownStarted &&
+                    !AppDomain.CurrentDomain.IsFinalizingForUnload())
+                {
+                    string report = string.Format("Pool detected potential leaking of {0}. \n Location of the leak: \n {1} ",
+                        typeof(T).ToString(),
+                        GetTrace());
+
+                    // If you are seeing this message it means that object has been allocated from the pool
+                    // and has not been returned back. This is not critical, but turns pool into rather
+                    // inefficient kind of "new".
+                    Debug.WriteLine("TRACEOBJECTPOOLLEAKS_BEGIN\n" + report + "TRACEOBJECTPOOLLEAKS_END");
+                }
+            }
+        }
+#endif
+
+        internal ObjectPool(Factory factory)
+            : this(factory, Environment.ProcessorCount * 2)
+        { }
+
+        internal ObjectPool(Factory factory, int size)
+        {
+            _factory = factory;
+            _items = new Element[size];
+        }
+
+        private T CreateInstance()
+        {
+            var inst = _factory();
+            return inst;
+        }
+
+        /// <summary>
+        /// Produces an instance.
+        /// </summary>
+        /// <remarks>
+        /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
+        /// Note that Free will try to store recycled objects close to the start thus statistically
+        /// reducing how far we will typically search.
+        /// </remarks>
+        internal T Allocate()
+        {
+            var items = _items;
+            T inst;
+
+            for (var i = 0; i < items.Length; i++)
+            {
+                // Note that the read is optimistically not synchronized. That is intentional.
+                // We will interlock only when we have a candidate. in a worst case we may miss some
+                // recently returned objects. Not a big deal.
+                inst = items[i].Value;
+                if (inst != null)
+                {
+                    if (inst == Interlocked.CompareExchange(ref items[i].Value, null, inst))
+                    {
+                        goto gotInstance;
+                    }
+                }
+            }
+
+            inst = CreateInstance();
+            gotInstance:
+
+#if DETECT_LEAKS
+            var tracker = new LeakTracker();
+            leakTrackers.Add(inst, tracker);
+
+#if TRACE_LEAKS
+            var frame = new System.Diagnostics.StackTrace(false);
+            tracker.Trace = frame;
+#endif
+#endif
+
+            return inst;
+        }
+
+        /// <summary>
+        /// Returns objects to the pool.
+        /// </summary>
+        /// <remarks>
+        /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
+        /// Note that Free will try to store recycled objects close to the start thus statistically
+        /// reducing how far we will typically search in Allocate.
+        /// </remarks>
+        internal void Free(T obj)
+        {
+            Validate(obj);
+            ForgetTrackedObject(obj);
+
+            var items = _items;
+            for (var i = 0; i < items.Length; i++)
+            {
+                if (items[i].Value == null)
+                {
+                    // Intentionally not using interlocked here.
+                    // In a worst case scenario two objects may be stored into same slot.
+                    // It is very unlikely to happen and will only mean that one of the objects will get collected.
+                    items[i].Value = obj;
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes an object from leak tracking.
+        ///
+        /// This is called when an object is returned to the pool.  It may also be explicitly
+        /// called if an object allocated from the pool is intentionally not being returned
+        /// to the pool.  This can be of use with pooled arrays if the consumer wants to
+        /// return a larger array to the pool than was originally allocated.
+        /// </summary>
+        [Conditional("DEBUG")]
+        internal void ForgetTrackedObject(T old, T replacement = null)
+        {
+#if DETECT_LEAKS
+            LeakTracker tracker;
+            if (leakTrackers.TryGetValue(old, out tracker))
+            {
+                tracker.Dispose();
+                leakTrackers.Remove(old);
+            }
+            else
+            {
+                string report = string.Format("Object of type {0} was freed, but was not from pool. \n Callstack: \n {1} ",
+                    typeof(T).ToString(),
+                    new System.Diagnostics.StackTrace(false));
+
+                Debug.WriteLine("TRACEOBJECTPOOLLEAKS_BEGIN\n" + report + "TRACEOBJECTPOOLLEAKS_END");
+            }
+
+            if (replacement != null)
+            {
+                tracker = new LeakTracker();
+                leakTrackers.Add(replacement, tracker);
+            }
+#endif
+        }
+
+        [Conditional("DEBUG")]
+        private void Validate(object obj)
+        {
+            Debug.Assert(obj != null, "freeing null?");
+
+            var items = _items;
+            for (var i = 0; i < items.Length; i++)
+            {
+                var value = items[i].Value;
+                if (value == null)
+                {
+                    return;
+                }
+
+                Debug.Assert(value != obj, "freeing twice?");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorDirectiveSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorDirectiveSyntax.cs
new file mode 100644
index 0000000000..cd23fda502
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorDirectiveSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class RazorDirectiveSyntax
+    {
+        private static readonly string DirectiveDescriptorKey = typeof(DirectiveDescriptor).Name;
+
+        public DirectiveDescriptor DirectiveDescriptor
+        {
+            get
+            {
+                var descriptor = this.GetAnnotationValue(DirectiveDescriptorKey) as DirectiveDescriptor;
+                return descriptor;
+            }
+        }
+
+        public RazorDirectiveSyntax WithDirectiveDescriptor(DirectiveDescriptor descriptor)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(DirectiveDescriptorKey, descriptor)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (RazorDirectiveSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorSyntaxNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorSyntaxNode.cs
new file mode 100644
index 0000000000..6ed220f3d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/RazorSyntaxNode.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract partial class RazorSyntaxNode : SyntaxNode
+    {
+        public RazorSyntaxNode(GreenNode green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SpecializedCollections.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SpecializedCollections.cs
new file mode 100644
index 0000000000..3e1094003f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SpecializedCollections.cs
@@ -0,0 +1,169 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SpecializedCollections
+    {
+        public static IEnumerator<T> EmptyEnumerator<T>()
+        {
+            return Empty.Enumerator<T>.Instance;
+        }
+
+        public static IEnumerable<T> EmptyEnumerable<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        public static ICollection<T> EmptyCollection<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        public static IList<T> EmptyList<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        public static IReadOnlyList<T> EmptyReadOnlyList<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        private class Empty
+        {
+            internal class Enumerator<T> : Enumerator, IEnumerator<T>
+            {
+                public static new readonly IEnumerator<T> Instance = new Enumerator<T>();
+
+                protected Enumerator()
+                {
+                }
+
+                public new T Current => throw new InvalidOperationException();
+
+                public void Dispose()
+                {
+                }
+            }
+
+            internal class Enumerator : IEnumerator
+            {
+                public static readonly IEnumerator Instance = new Enumerator();
+
+                protected Enumerator()
+                {
+                }
+
+                public object Current => throw new InvalidOperationException();
+
+                public bool MoveNext()
+                {
+                    return false;
+                }
+
+                public void Reset()
+                {
+                    throw new InvalidOperationException();
+                }
+            }
+
+            internal class Enumerable<T> : IEnumerable<T>
+            {
+                // PERF: cache the instance of enumerator. 
+                // accessing a generic static field is kinda slow from here,
+                // but since empty enumerables are singletons, there is no harm in having 
+                // one extra instance field
+                private readonly IEnumerator<T> _enumerator = Enumerator<T>.Instance;
+
+                public IEnumerator<T> GetEnumerator()
+                {
+                    return _enumerator;
+                }
+
+                System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+                {
+                    return GetEnumerator();
+                }
+            }
+
+            internal class Collection<T> : Enumerable<T>, ICollection<T>
+            {
+                public static readonly ICollection<T> Instance = new Collection<T>();
+
+                protected Collection()
+                {
+                }
+
+                public void Add(T item)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public void Clear()
+                {
+                    throw new NotSupportedException();
+                }
+
+                public bool Contains(T item)
+                {
+                    return false;
+                }
+
+                public void CopyTo(T[] array, int arrayIndex)
+                {
+                }
+
+                public int Count => 0;
+
+                public bool IsReadOnly => true;
+
+                public bool Remove(T item)
+                {
+                    throw new NotSupportedException();
+                }
+            }
+
+            internal class List<T> : Collection<T>, IList<T>, IReadOnlyList<T>
+            {
+                public static readonly new List<T> Instance = new List<T>();
+
+                protected List()
+                {
+                }
+
+                public int IndexOf(T item)
+                {
+                    return -1;
+                }
+
+                public void Insert(int index, T item)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public void RemoveAt(int index)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public T this[int index]
+                {
+                    get
+                    {
+                        throw new ArgumentOutOfRangeException(nameof(index));
+                    }
+
+                    set
+                    {
+                        throw new NotSupportedException();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
new file mode 100644
index 0000000000..7880c49622
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Tree Root="SyntaxNode">
+  <PredefinedNode Name="RazorSyntaxNode" Base="SyntaxNode" />
+  <PredefinedNode Name="SyntaxToken" Base="RazorSyntaxNode" />
+  
+  <!-- Common -->
+  <AbstractNode Name="RazorBlockSyntax" Base="RazorSyntaxNode">
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
+  </AbstractNode>
+  <Node Name="RazorDocumentSyntax" Base="RazorSyntaxNode">
+    <Kind Name="RazorDocument" />
+    <Field Name="Document" Type="RazorBlockSyntax" />
+  </Node>
+  <Node Name="RazorCommentBlockSyntax" Base="RazorSyntaxNode">
+    <Kind Name="RazorComment" />
+    <Field Name="StartCommentTransition" Type="SyntaxToken">
+      <Kind Name="RazorCommentTransition" />
+    </Field>
+    <Field Name="StartCommentStar" Type="SyntaxToken">
+      <Kind Name="RazorCommentStar" />
+    </Field>
+    <Field Name="Comment" Type="SyntaxToken">
+      <Kind Name="RazorCommentLiteral" />
+    </Field>
+    <Field Name="EndCommentStar" Type="SyntaxToken">
+      <Kind Name="RazorCommentStar" />
+    </Field>
+    <Field Name="EndCommentTransition" Type="SyntaxToken">
+      <Kind Name="RazorCommentTransition" />
+    </Field>
+  </Node>
+  <Node Name="RazorMetaCodeSyntax" Base="RazorSyntaxNode">
+    <Kind Name="RazorMetaCode" />
+    <Field Name="MetaCode" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="GenericBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="GenericBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="UnclassifiedTextLiteralSyntax" Base="RazorSyntaxNode">
+    <Kind Name="UnclassifiedTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+
+  <!-- Markup -->
+  <AbstractNode Name="MarkupSyntaxNode" Base="RazorSyntaxNode" />
+  <Node Name="MarkupBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTransitionSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTransition" />
+    <Field Name="TransitionTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="MarkupTextLiteralSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="MarkupEphemeralTextLiteralSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupEphemeralTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="MarkupCommentBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupCommentBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTagBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupMinimizedAttributeBlockSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupMinimizedAttributeBlock" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+  </Node>
+  <Node Name="MarkupAttributeBlockSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupAttributeBlock" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+    <Field Name="NameSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="EqualsToken" Type="SyntaxToken">
+      <Kind Name="Equals" />
+    </Field>
+    <Field Name="ValuePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="RazorBlockSyntax" Optional="true" />
+    <Field Name="ValueSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupLiteralAttributeValueSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupLiteralAttributeValue" />
+    <Field Name="Prefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupDynamicAttributeValueSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupDynamicAttributeValue" />
+    <Field Name="Prefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="RazorBlockSyntax" />
+  </Node>
+  <Node Name="MarkupElementSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupElement" />
+    <Field Name="StartTag" Type="MarkupTagBlockSyntax" Optional="true" />
+    <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Optional="true" />
+    <Field Name="EndTag" Type="MarkupTagBlockSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupTagHelperElementSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTagHelperElement" />
+    <Field Name="StartTag" Type="MarkupTagHelperStartTagSyntax" />
+    <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Optional="true" />
+    <Field Name="EndTag" Type="MarkupTagHelperEndTagSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupTagHelperStartTagSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagHelperStartTag" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTagHelperEndTagSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagHelperEndTag" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTagHelperAttributeSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTagHelperAttribute" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+    <Field Name="NameSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="EqualsToken" Type="SyntaxToken">
+      <Kind Name="Equals" />
+    </Field>
+    <Field Name="ValuePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="MarkupTagHelperAttributeValueSyntax" />
+    <Field Name="ValueSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupMinimizedTagHelperAttributeSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupMinimizedTagHelperAttribute" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+  </Node>
+  <Node Name="MarkupTagHelperAttributeValueSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagHelperAttributeValue" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  
+  <!-- CSharp -->
+  <AbstractNode Name="CSharpSyntaxNode" Base="RazorSyntaxNode" />
+  <Node Name="CSharpCodeBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="CSharpCodeBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="CSharpTransitionSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpTransition" />
+    <Field Name="Transition" Type="SyntaxToken">
+      <Kind Name="Transition" />
+    </Field>
+  </Node>
+  <Node Name="CSharpStatementLiteralSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpStatementLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="CSharpExpressionLiteralSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpExpressionLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="CSharpEphemeralTextLiteralSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpEphemeralTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="CSharpTemplateBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="CSharpTemplateBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <AbstractNode Name="CSharpRazorBlockSyntax" Base="CSharpSyntaxNode">
+    <Field Name="Transition" Type="CSharpTransitionSyntax" />
+    <Field Name="Body" Type="CSharpSyntaxNode" />
+  </AbstractNode>
+  <Node Name="CSharpStatementSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="CSharpStatement" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="CSharpStatementBody" />
+    </Field>
+  </Node>
+  <Node Name="CSharpStatementBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpStatementBody" />
+    <Field Name="OpenBrace" Type="RazorMetaCodeSyntax" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" />
+    <Field Name="CloseBrace" Type="RazorMetaCodeSyntax" />
+  </Node>
+  <Node Name="CSharpExplicitExpressionSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="CSharpExplicitExpression" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="CSharpExplicitExpressionBody" />
+    </Field>
+  </Node>
+  <Node Name="CSharpExplicitExpressionBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpExplicitExpressionBody" />
+    <Field Name="OpenParen" Type="RazorMetaCodeSyntax" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" />
+    <Field Name="CloseParen" Type="RazorMetaCodeSyntax" />
+  </Node>
+  <Node Name="CSharpImplicitExpressionSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="CSharpImplicitExpression" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="CSharpImplicitExpressionBody" />
+    </Field>
+  </Node>
+  <Node Name="CSharpImplicitExpressionBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpImplicitExpressionBody" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" />
+  </Node>
+  <Node Name="RazorDirectiveSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="RazorDirective" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="RazorDirectiveBody" />
+    </Field>
+  </Node>
+  <Node Name="RazorDirectiveBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="RazorDirectiveBody" />
+    <Field Name="Keyword" Type="RazorSyntaxNode" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" Optional="true" />
+  </Node>
+</Tree>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxAnnotation.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxAnnotation.cs
new file mode 100644
index 0000000000..e639335475
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxAnnotation.cs
@@ -0,0 +1,93 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// A SyntaxAnnotation is used to annotate syntax elements with additional information. 
+    /// 
+    /// Since syntax elements are immutable, annotating them requires creating new instances of them
+    /// with the annotations attached.
+    /// </summary>
+    [DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+    internal sealed class SyntaxAnnotation : IEquatable<SyntaxAnnotation>
+    {
+        // use a value identity instead of object identity so a deserialized instance matches the original instance.
+        private readonly long _id;
+        private static long s_nextId;
+
+        // use a value identity instead of object identity so a deserialized instance matches the original instance.
+        public string Kind { get; }
+        public object Data { get; }
+
+        public SyntaxAnnotation()
+        {
+            _id = System.Threading.Interlocked.Increment(ref s_nextId);
+        }
+
+        public SyntaxAnnotation(string kind)
+            : this()
+        {
+            Kind = kind;
+        }
+
+        public SyntaxAnnotation(string kind, object data)
+            : this(kind)
+        {
+            Data = data;
+        }
+
+        private string GetDebuggerDisplay()
+        {
+            return string.Format("Annotation: Kind='{0}' Data='{1}'", this.Kind ?? "", this.Data ?? "");
+        }
+
+        public bool Equals(SyntaxAnnotation other)
+        {
+            return (object)other != null && _id == other._id;
+        }
+
+        public static bool operator ==(SyntaxAnnotation left, SyntaxAnnotation right)
+        {
+            if ((object)left == (object)right)
+            {
+                return true;
+            }
+
+            if ((object)left == null || (object)right == null)
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(SyntaxAnnotation left, SyntaxAnnotation right)
+        {
+            if ((object)left == (object)right)
+            {
+                return false;
+            }
+
+            if ((object)left == null || (object)right == null)
+            {
+                return true;
+            }
+
+            return !left.Equals(right);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as SyntaxAnnotation);
+        }
+
+        public override int GetHashCode()
+        {
+            return _id.GetHashCode();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxExtensions.cs
new file mode 100644
index 0000000000..055180ca97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxExtensions.cs
@@ -0,0 +1,53 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal partial class MarkupTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class MarkupEphemeralTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class CSharpStatementLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class CSharpExpressionLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class CSharpEphemeralTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class UnclassifiedTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxFactory.cs
new file mode 100644
index 0000000000..4e619799db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxFactory.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static partial class SyntaxFactory
+    {
+        public static SyntaxToken Token(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return Token(kind, content: string.Empty, diagnostics: diagnostics);
+        }
+
+        public static SyntaxToken Token(SyntaxKind kind, string content, params RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(InternalSyntax.SyntaxFactory.Token(kind, content), parent: null, position: 0);
+        }
+
+        internal static SyntaxToken MissingToken(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(InternalSyntax.SyntaxFactory.MissingToken(kind, diagnostics), parent: null, position: 0);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
new file mode 100644
index 0000000000..75dd554ab6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
@@ -0,0 +1,136 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal enum SyntaxKind : byte
+    {
+        #region Nodes
+        // Common
+        RazorDocument,
+        GenericBlock,
+        RazorComment,
+        RazorMetaCode,
+        RazorDirective,
+        RazorDirectiveBody,
+        UnclassifiedTextLiteral,
+
+        // Markup
+        MarkupBlock,
+        MarkupTransition,
+        MarkupElement,
+        MarkupTagBlock,
+        MarkupTextLiteral,
+        MarkupEphemeralTextLiteral,
+        MarkupCommentBlock,
+        MarkupAttributeBlock,
+        MarkupMinimizedAttributeBlock,
+        MarkupLiteralAttributeValue,
+        MarkupDynamicAttributeValue,
+        MarkupTagHelperElement,
+        MarkupTagHelperStartTag,
+        MarkupTagHelperEndTag,
+        MarkupTagHelperAttribute,
+        MarkupMinimizedTagHelperAttribute,
+        MarkupTagHelperAttributeValue,
+
+        // CSharp
+        CSharpStatement,
+        CSharpStatementBody,
+        CSharpExplicitExpression,
+        CSharpExplicitExpressionBody,
+        CSharpImplicitExpression,
+        CSharpImplicitExpressionBody,
+        CSharpCodeBlock,
+        CSharpTemplateBlock,
+        CSharpStatementLiteral,
+        CSharpExpressionLiteral,
+        CSharpEphemeralTextLiteral,
+        CSharpTransition,
+        #endregion
+
+        #region Tokens
+        // Common
+        None,
+        Marker,
+        List,
+        Whitespace,
+        NewLine,
+        Colon,
+        QuestionMark,
+        RightBracket,
+        LeftBracket,
+        Equals,
+        Transition,
+
+        // HTML
+        Text,
+        OpenAngle,
+        Bang,
+        ForwardSlash,
+        DoubleHyphen,
+        CloseAngle,
+        DoubleQuote,
+        SingleQuote,
+
+        // CSharp literals
+        Identifier,
+        Keyword,
+        IntegerLiteral,
+        CSharpComment,
+        RealLiteral,
+        CharacterLiteral,
+        StringLiteral,
+
+        // CSharp operators
+        Arrow,
+        Minus,
+        Decrement,
+        MinusAssign,
+        NotEqual,
+        Not,
+        Modulo,
+        ModuloAssign,
+        AndAssign,
+        And,
+        DoubleAnd,
+        LeftParenthesis,
+        RightParenthesis,
+        Star,
+        MultiplyAssign,
+        Comma,
+        Dot,
+        Slash,
+        DivideAssign,
+        DoubleColon,
+        Semicolon,
+        NullCoalesce,
+        XorAssign,
+        Xor,
+        LeftBrace,
+        OrAssign,
+        DoubleOr,
+        Or,
+        RightBrace,
+        Tilde,
+        Plus,
+        PlusAssign,
+        Increment,
+        LessThan,
+        LessThanEqual,
+        LeftShift,
+        LeftShiftAssign,
+        Assign,
+        GreaterThan,
+        GreaterThanEqual,
+        RightShift,
+        RightShiftAssign,
+        Hash,
+
+        // Razor specific
+        RazorCommentLiteral,
+        RazorCommentStar,
+        RazorCommentTransition,
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxList.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxList.cs
new file mode 100644
index 0000000000..3b7d318e37
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxList.cs
@@ -0,0 +1,123 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract class SyntaxList : SyntaxNode
+    {
+        internal SyntaxList(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.Visit(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.Visit(this);
+        }
+
+        internal class WithTwoChildren : SyntaxList
+        {
+            private SyntaxNode _child0;
+            private SyntaxNode _child1;
+
+            internal WithTwoChildren(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+                : base(green, parent, position)
+            {
+            }
+
+            internal override SyntaxNode GetNodeSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return GetRedElement(ref _child0, 0);
+                    case 1:
+                        return GetRedElement(ref _child1, 1);
+                    default:
+                        return null;
+                }
+            }
+
+            internal override SyntaxNode GetCachedSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        internal class WithThreeChildren : SyntaxList
+        {
+            private SyntaxNode _child0;
+            private SyntaxNode _child1;
+            private SyntaxNode _child2;
+
+            internal WithThreeChildren(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+                : base(green, parent, position)
+            {
+            }
+
+            internal override SyntaxNode GetNodeSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return GetRedElement(ref _child0, 0);
+                    case 1:
+                        return GetRedElement(ref _child1, 1);
+                    case 2:
+                        return GetRedElement(ref _child2, 2);
+                    default:
+                        return null;
+                }
+            }
+
+            internal override SyntaxNode GetCachedSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    case 2:
+                        return _child2;
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        internal class WithManyChildren : SyntaxList
+        {
+            private readonly ArrayElement<SyntaxNode>[] _children;
+
+            internal WithManyChildren(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+                : base(green, parent, position)
+            {
+                _children = new ArrayElement<SyntaxNode>[green.SlotCount];
+            }
+
+            internal override SyntaxNode GetNodeSlot(int index)
+            {
+                return this.GetRedElement(ref _children[index].Value, index);
+            }
+
+            internal override SyntaxNode GetCachedSlot(int index)
+            {
+                return _children[index];
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilder.cs
new file mode 100644
index 0000000000..415b8352bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilder.cs
@@ -0,0 +1,172 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxListBuilder
+    {
+        private ArrayElement<GreenNode>[] _nodes;
+
+        public int Count { get; private set; }
+
+        public SyntaxListBuilder(int size)
+        {
+            _nodes = new ArrayElement<GreenNode>[size];
+        }
+
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        public void Add(SyntaxNode item)
+        {
+            AddInternal(item.Green);
+        }
+
+        internal void AddInternal(GreenNode item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            if (_nodes == null || Count >= _nodes.Length)
+            {
+                Grow(Count == 0 ? 8 : _nodes.Length * 2);
+            }
+
+            _nodes[Count++].Value = item;
+        }
+
+        public void AddRange(SyntaxNode[] items)
+        {
+            AddRange(items, 0, items.Length);
+        }
+
+        public void AddRange(SyntaxNode[] items, int offset, int length)
+        {
+            if (_nodes == null || Count + length > _nodes.Length)
+            {
+                Grow(Count + length);
+            }
+
+            for (int i = offset, j = Count; i < offset + length; ++i, ++j)
+            {
+                _nodes[j].Value = items[i].Green;
+            }
+
+            var start = Count;
+            Count += length;
+            Validate(start, Count);
+        }
+
+        [Conditional("DEBUG")]
+        private void Validate(int start, int end)
+        {
+            for (var i = start; i < end; i++)
+            {
+                if (_nodes[i].Value == null)
+                {
+                    throw new ArgumentException("Cannot add a null node.");
+                }
+            }
+        }
+
+        public void AddRange(SyntaxList<SyntaxNode> list)
+        {
+            AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange(SyntaxList<SyntaxNode> list, int offset, int count)
+        {
+            if (_nodes == null || Count + count > _nodes.Length)
+            {
+                Grow(Count + count);
+            }
+
+            var dst = Count;
+            for (int i = offset, limit = offset + count; i < limit; i++)
+            {
+                _nodes[dst].Value = list.ItemInternal(i).Green;
+                dst++;
+            }
+
+            var start = Count;
+            Count += count;
+            Validate(start, Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list) where TNode : SyntaxNode
+        {
+            AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list, int offset, int count) where TNode : SyntaxNode
+        {
+            AddRange(new SyntaxList<SyntaxNode>(list.Node), offset, count);
+        }
+
+        private void Grow(int size)
+        {
+            var tmp = new ArrayElement<GreenNode>[size];
+            Array.Copy(_nodes, tmp, _nodes.Length);
+            _nodes = tmp;
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                if (_nodes[i].Value.Kind == kind)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        internal GreenNode ToListNode()
+        {
+            switch (Count)
+            {
+                case 0:
+                    return null;
+                case 1:
+                    return _nodes[0].Value;
+                case 2:
+                    return InternalSyntax.SyntaxList.List(_nodes[0].Value, _nodes[1].Value);
+                case 3:
+                    return InternalSyntax.SyntaxList.List(_nodes[0].Value, _nodes[1].Value, _nodes[2].Value);
+                default:
+                    var tmp = new ArrayElement<GreenNode>[Count];
+                    for (var i = 0; i < Count; i++)
+                    {
+                        tmp[i].Value = _nodes[i].Value;
+                    }
+
+                    return InternalSyntax.SyntaxList.List(tmp);
+            }
+        }
+
+        public static implicit operator SyntaxList<SyntaxNode>(SyntaxListBuilder builder)
+        {
+            if (builder == null)
+            {
+                return default(SyntaxList<SyntaxNode>);
+            }
+
+            return builder.ToList();
+        }
+
+        internal void RemoveLast()
+        {
+            Count -= 1;
+            _nodes[Count] = default(ArrayElement<GreenNode>);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderExtensions.cs
new file mode 100644
index 0000000000..5b813c05b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderExtensions.cs
@@ -0,0 +1,29 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxListBuilderExtensions
+    {
+        public static SyntaxList<SyntaxNode> ToList(this SyntaxListBuilder builder)
+        {
+            if (builder == null || builder.Count == 0)
+            {
+                return default(SyntaxList<SyntaxNode>);
+            }
+
+            return new SyntaxList<SyntaxNode>(builder.ToListNode().CreateRed());
+        }
+
+        public static SyntaxList<TNode> ToList<TNode>(this SyntaxListBuilder builder)
+            where TNode : SyntaxNode
+        {
+            if (builder == null || builder.Count == 0)
+            {
+                return new SyntaxList<TNode>();
+            }
+
+            return new SyntaxList<TNode>(builder.ToListNode().CreateRed());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs
new file mode 100644
index 0000000000..8fcd9f2b3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs
@@ -0,0 +1,93 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal readonly struct SyntaxListBuilder<TNode>
+        where TNode : SyntaxNode
+    {
+        private readonly SyntaxListBuilder _builder;
+
+        public SyntaxListBuilder(int size)
+            : this(new SyntaxListBuilder(size))
+        {
+        }
+
+        public static SyntaxListBuilder<TNode> Create()
+        {
+            return new SyntaxListBuilder<TNode>(8);
+        }
+
+        internal SyntaxListBuilder(SyntaxListBuilder builder)
+        {
+            _builder = builder;
+        }
+
+        public bool IsNull
+        {
+            get
+            {
+                return _builder == null;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return _builder.Count;
+            }
+        }
+
+        public void Clear()
+        {
+            _builder.Clear();
+        }
+
+        public SyntaxListBuilder<TNode> Add(TNode node)
+        {
+            _builder.Add(node);
+            return this;
+        }
+
+        public void AddRange(TNode[] items, int offset, int length)
+        {
+            _builder.AddRange(items, offset, length);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes)
+        {
+            _builder.AddRange(nodes);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes, int offset, int length)
+        {
+            _builder.AddRange(nodes, offset, length);
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            return _builder.Any(kind);
+        }
+
+        public SyntaxList<TNode> ToList()
+        {
+            return _builder.ToList();
+        }
+
+        public static implicit operator SyntaxListBuilder(SyntaxListBuilder<TNode> builder)
+        {
+            return builder._builder;
+        }
+
+        public static implicit operator SyntaxList<TNode>(SyntaxListBuilder<TNode> builder)
+        {
+            if (builder._builder != null)
+            {
+                return builder.ToList();
+            }
+
+            return default(SyntaxList<TNode>);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListOfT.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListOfT.cs
new file mode 100644
index 0000000000..158e82859f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListOfT.cs
@@ -0,0 +1,606 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal readonly struct SyntaxList<TNode> : IReadOnlyList<TNode>, IEquatable<SyntaxList<TNode>>
+        where TNode : SyntaxNode
+    {
+        public SyntaxList(SyntaxNode node)
+        {
+            Node = node;
+        }
+
+        /// <summary>
+        /// Creates a singleton list of syntax nodes.
+        /// </summary>
+        /// <param name="node">The single element node.</param>
+        public SyntaxList(TNode node)
+            : this((SyntaxNode)node)
+        {
+        }
+
+        /// <summary>
+        /// Creates a list of syntax nodes.
+        /// </summary>
+        /// <param name="nodes">A sequence of element nodes.</param>
+        public SyntaxList(IEnumerable<TNode> nodes)
+            : this(CreateNode(nodes))
+        {
+        }
+
+        private static SyntaxNode CreateNode(IEnumerable<TNode> nodes)
+        {
+            if (nodes == null)
+            {
+                return null;
+            }
+
+            var builder = (nodes is ICollection<TNode> collection) ? new SyntaxListBuilder<TNode>(collection.Count) : SyntaxListBuilder<TNode>.Create();
+
+            foreach (var node in nodes)
+            {
+                builder.Add(node);
+            }
+
+            return builder.ToList().Node;
+        }
+
+        internal SyntaxNode Node { get; }
+
+        /// <summary>
+        /// The number of nodes in the list.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return Node == null ? 0 : (Node.IsList ? Node.SlotCount : 1);
+            }
+        }
+
+        /// <summary>
+        /// Gets the node at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the node to get or set.</param>
+        /// <returns>The node at the specified index.</returns>
+        public TNode this[int index]
+        {
+            get
+            {
+                if (Node != null)
+                {
+                    if (Node.IsList)
+                    {
+                        if (unchecked((uint)index < (uint)Node.SlotCount))
+                        {
+                            return (TNode)Node.GetNodeSlot(index);
+                        }
+                    }
+                    else if (index == 0)
+                    {
+                        return (TNode)Node;
+                    }
+                }
+                throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        internal SyntaxNode ItemInternal(int index)
+        {
+            if (Node.IsList)
+            {
+                return Node.GetNodeSlot(index);
+            }
+
+            Debug.Assert(index == 0);
+            return Node;
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan FullSpan
+        {
+            get
+            {
+                if (Count == 0)
+                {
+                    return default(TextSpan);
+                }
+                else
+                {
+                    return TextSpan.FromBounds(this[0].FullSpan.Start, this[Count - 1].FullSpan.End);
+                }
+            }
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, not including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan Span
+        {
+            get
+            {
+                if (Count == 0)
+                {
+                    return default(TextSpan);
+                }
+                else
+                {
+                    return TextSpan.FromBounds(this[0].Span.Start, this[Count - 1].Span.End);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the string representation of the nodes in this list, not including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </summary>
+        /// <returns>
+        /// The string representation of the nodes in this list, not including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </returns>
+        public override string ToString()
+        {
+            return Node != null ? Node.ToString() : string.Empty;
+        }
+
+        /// <summary>
+        /// Returns the full string representation of the nodes in this list including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </summary>
+        /// <returns>
+        /// The full string representation of the nodes in this list including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </returns>
+        public string ToFullString()
+        {
+            return Node != null ? Node.ToFullString() : string.Empty;
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified node added at the end.
+        /// </summary>
+        /// <param name="node">The node to add.</param>
+        public SyntaxList<TNode> Add(TNode node)
+        {
+            return Insert(Count, node);
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified nodes added at the end.
+        /// </summary>
+        /// <param name="nodes">The nodes to add.</param>
+        public SyntaxList<TNode> AddRange(IEnumerable<TNode> nodes)
+        {
+            return InsertRange(Count, nodes);
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified node inserted at the index.
+        /// </summary>
+        /// <param name="index">The index to insert at.</param>
+        /// <param name="node">The node to insert.</param>
+        public SyntaxList<TNode> Insert(int index, TNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return InsertRange(index, new[] { node });
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified nodes inserted at the index.
+        /// </summary>
+        /// <param name="index">The index to insert at.</param>
+        /// <param name="nodes">The nodes to insert.</param>
+        public SyntaxList<TNode> InsertRange(int index, IEnumerable<TNode> nodes)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (nodes == null)
+            {
+                throw new ArgumentNullException(nameof(nodes));
+            }
+
+            var list = this.ToList();
+            list.InsertRange(index, nodes);
+
+            if (list.Count == 0)
+            {
+                return this;
+            }
+            else
+            {
+                return CreateList(list[0].Green, list);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new list with the element at specified index removed.
+        /// </summary>
+        /// <param name="index">The index of the element to remove.</param>
+        public SyntaxList<TNode> RemoveAt(int index)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            return Remove(this[index]);
+        }
+
+        /// <summary>
+        /// Creates a new list with the element removed.
+        /// </summary>
+        /// <param name="node">The element to remove.</param>
+        public SyntaxList<TNode> Remove(TNode node)
+        {
+            return CreateList(this.Where(x => x != node).ToList());
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified element replaced with the new node.
+        /// </summary>
+        /// <param name="nodeInList">The element to replace.</param>
+        /// <param name="newNode">The new node.</param>
+        public SyntaxList<TNode> Replace(TNode nodeInList, TNode newNode)
+        {
+            return ReplaceRange(nodeInList, new[] { newNode });
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified element replaced with new nodes.
+        /// </summary>
+        /// <param name="nodeInList">The element to replace.</param>
+        /// <param name="newNodes">The new nodes.</param>
+        public SyntaxList<TNode> ReplaceRange(TNode nodeInList, IEnumerable<TNode> newNodes)
+        {
+            if (nodeInList == null)
+            {
+                throw new ArgumentNullException(nameof(nodeInList));
+            }
+
+            if (newNodes == null)
+            {
+                throw new ArgumentNullException(nameof(newNodes));
+            }
+
+            var index = IndexOf(nodeInList);
+            if (index >= 0 && index < Count)
+            {
+                var list = this.ToList();
+                list.RemoveAt(index);
+                list.InsertRange(index, newNodes);
+                return CreateList(list);
+            }
+            else
+            {
+                throw new ArgumentException(nameof(nodeInList));
+            }
+        }
+
+        static SyntaxList<TNode> CreateList(List<TNode> items)
+        {
+            if (items.Count == 0)
+            {
+                return default(SyntaxList<TNode>);
+            }
+            else
+            {
+                return CreateList(items[0].Green, items);
+            }
+        }
+
+        static SyntaxList<TNode> CreateList(GreenNode creator, List<TNode> items)
+        {
+            if (items.Count == 0)
+            {
+                return default(SyntaxList<TNode>);
+            }
+
+            var newGreen = creator.CreateList(items.Select(n => n.Green));
+            return new SyntaxList<TNode>(newGreen.CreateRed());
+        }
+
+        /// <summary>
+        /// The first node in the list.
+        /// </summary>
+        public TNode First()
+        {
+            return this[0];
+        }
+
+        /// <summary>
+        /// The first node in the list or default if the list is empty.
+        /// </summary>
+        public TNode FirstOrDefault()
+        {
+            if (this.Any())
+            {
+                return this[0];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The last node in the list.
+        /// </summary>
+        public TNode Last()
+        {
+            return this[Count - 1];
+        }
+
+        /// <summary>
+        /// The last node in the list or default if the list is empty.
+        /// </summary>
+        public TNode LastOrDefault()
+        {
+            if (Any())
+            {
+                return this[Count - 1];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// True if the list has at least one node.
+        /// </summary>
+        public bool Any()
+        {
+            Debug.Assert(Node == null || Count != 0);
+            return Node != null;
+        }
+
+        // for debugging
+        private TNode[] Nodes
+        {
+            get { return this.ToArray(); }
+        }
+
+        /// <summary>
+        /// Get's the enumerator for this list.
+        /// </summary>
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(in this);
+        }
+
+        IEnumerator<TNode> IEnumerable<TNode>.GetEnumerator()
+        {
+            if (this.Any())
+            {
+                return new EnumeratorImpl(this);
+            }
+
+            return SpecializedCollections.EmptyEnumerator<TNode>();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            if (this.Any())
+            {
+                return new EnumeratorImpl(this);
+            }
+
+            return SpecializedCollections.EmptyEnumerator<TNode>();
+        }
+
+        public static bool operator ==(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return left.Node == right.Node;
+        }
+
+        public static bool operator !=(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return left.Node != right.Node;
+        }
+
+        public bool Equals(SyntaxList<TNode> other)
+        {
+            return Node == other.Node;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is SyntaxList<TNode> && Equals((SyntaxList<TNode>)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Node?.GetHashCode() ?? 0;
+        }
+
+        public static implicit operator SyntaxList<TNode>(SyntaxList<SyntaxNode> nodes)
+        {
+            return new SyntaxList<TNode>(nodes.Node);
+        }
+
+        public static implicit operator SyntaxList<SyntaxNode>(SyntaxList<TNode> nodes)
+        {
+            return new SyntaxList<SyntaxNode>(nodes.Node);
+        }
+
+        /// <summary>
+        /// The index of the node in this list, or -1 if the node is not in the list.
+        /// </summary>
+        public int IndexOf(TNode node)
+        {
+            var index = 0;
+            foreach (var child in this)
+            {
+                if (object.Equals(child, node))
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
+
+        public int IndexOf(Func<TNode, bool> predicate)
+        {
+            var index = 0;
+            foreach (var child in this)
+            {
+                if (predicate(child))
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
+
+        internal int IndexOf(SyntaxKind kind)
+        {
+            var index = 0;
+            foreach (var child in this)
+            {
+                if (child.Kind == kind)
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
+
+        public int LastIndexOf(TNode node)
+        {
+            for (var i = Count - 1; i >= 0; i--)
+            {
+                if (object.Equals(this[i], node))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        public int LastIndexOf(Func<TNode, bool> predicate)
+        {
+            for (var i = Count - 1; i >= 0; i--)
+            {
+                if (predicate(this[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        public struct Enumerator
+        {
+            private readonly SyntaxList<TNode> _list;
+            private int _index;
+
+            internal Enumerator(in SyntaxList<TNode> list)
+            {
+                _list = list;
+                _index = -1;
+            }
+
+            public bool MoveNext()
+            {
+                var newIndex = _index + 1;
+                if (newIndex < _list.Count)
+                {
+                    _index = newIndex;
+                    return true;
+                }
+
+                return false;
+            }
+
+            public TNode Current
+            {
+                get
+                {
+                    return (TNode)_list.ItemInternal(_index);
+                }
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+            }
+
+            public override bool Equals(object obj)
+            {
+                throw new NotSupportedException();
+            }
+
+            public override int GetHashCode()
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        private class EnumeratorImpl : IEnumerator<TNode>
+        {
+            private Enumerator _e;
+
+            internal EnumeratorImpl(in SyntaxList<TNode> list)
+            {
+                _e = new Enumerator(in list);
+            }
+
+            public bool MoveNext()
+            {
+                return _e.MoveNext();
+            }
+
+            public TNode Current
+            {
+                get
+                {
+                    return _e.Current;
+                }
+            }
+
+            void IDisposable.Dispose()
+            {
+            }
+
+            object IEnumerator.Current
+            {
+                get
+                {
+                    return _e.Current;
+                }
+            }
+
+            void IEnumerator.Reset()
+            {
+                _e.Reset();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.Iterators.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.Iterators.cs
new file mode 100644
index 0000000000..e619a75b2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.Iterators.cs
@@ -0,0 +1,126 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract partial class SyntaxNode
+    {
+        private IEnumerable<SyntaxNode> DescendantNodesImpl(TextSpan span, Func<SyntaxNode, bool> descendIntoChildren, bool includeSelf)
+        {
+            if (includeSelf && IsInSpan(in span, FullSpan))
+            {
+                yield return this;
+            }
+
+            using (var stack = new ChildSyntaxListEnumeratorStack(this, descendIntoChildren))
+            {
+                while (stack.IsNotEmpty)
+                {
+                    var nodeValue = stack.TryGetNextAsNodeInSpan(in span);
+                    if (nodeValue != null)
+                    {
+                        // PERF: Push before yield return so that "nodeValue" is 'dead' after the yield
+                        // and therefore doesn't need to be stored in the iterator state machine. This
+                        // saves a field.
+                        stack.PushChildren(nodeValue, descendIntoChildren);
+
+                        yield return nodeValue;
+                    }
+                }
+            }
+        }
+
+        private static bool IsInSpan(in TextSpan span, TextSpan childSpan)
+        {
+            return span.OverlapsWith(childSpan)
+                // special case for zero-width tokens (OverlapsWith never returns true for these)
+                || (childSpan.Length == 0 && span.IntersectsWith(childSpan));
+        }
+
+        private struct ChildSyntaxListEnumeratorStack : IDisposable
+        {
+            private static readonly ObjectPool<ChildSyntaxList.Enumerator[]> StackPool = new ObjectPool<ChildSyntaxList.Enumerator[]>(() => new ChildSyntaxList.Enumerator[16]);
+
+            private ChildSyntaxList.Enumerator[] _stack;
+            private int _stackPtr;
+
+            public ChildSyntaxListEnumeratorStack(SyntaxNode startingNode, Func<SyntaxNode, bool> descendIntoChildren)
+            {
+                if (descendIntoChildren == null || descendIntoChildren(startingNode))
+                {
+                    _stack = StackPool.Allocate();
+                    _stackPtr = 0;
+                    _stack[0].InitializeFrom(startingNode);
+                }
+                else
+                {
+                    _stack = null;
+                    _stackPtr = -1;
+                }
+            }
+
+            public bool IsNotEmpty { get { return _stackPtr >= 0; } }
+
+            public bool TryGetNextInSpan(in TextSpan span, out SyntaxNode value)
+            {
+                while (_stack[_stackPtr].TryMoveNextAndGetCurrent(out value))
+                {
+                    if (IsInSpan(in span, value.FullSpan))
+                    {
+                        return true;
+                    }
+                }
+
+                _stackPtr--;
+                return false;
+            }
+
+            public SyntaxNode TryGetNextAsNodeInSpan(in TextSpan span)
+            {
+                SyntaxNode nodeValue;
+                while ((nodeValue = _stack[_stackPtr].TryMoveNextAndGetCurrentAsNode()) != null)
+                {
+                    if (IsInSpan(in span, nodeValue.FullSpan))
+                    {
+                        return nodeValue;
+                    }
+                }
+
+                _stackPtr--;
+                return null;
+            }
+
+            public void PushChildren(SyntaxNode node)
+            {
+                if (++_stackPtr >= _stack.Length)
+                {
+                    // Geometric growth
+                    Array.Resize(ref _stack, checked(_stackPtr * 2));
+                }
+
+                _stack[_stackPtr].InitializeFrom(node);
+            }
+
+            public void PushChildren(SyntaxNode node, Func<SyntaxNode, bool> descendIntoChildren)
+            {
+                if (descendIntoChildren == null || descendIntoChildren(node))
+                {
+                    PushChildren(node);
+                }
+            }
+
+            public void Dispose()
+            {
+                // Return only reasonably-sized stacks to the pool.
+                if (_stack?.Length < 256)
+                {
+                    Array.Clear(_stack, 0, _stack.Length);
+                    StackPool.Free(_stack);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs
new file mode 100644
index 0000000000..2f58f13fe3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs
@@ -0,0 +1,413 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    [DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+    internal abstract partial class SyntaxNode
+    {
+        public SyntaxNode(GreenNode green, SyntaxNode parent, int position)
+        {
+            Green = green;
+            Parent = parent;
+            Position = position;
+        }
+
+        internal GreenNode Green { get; }
+
+        public SyntaxNode Parent { get; }
+
+        public int Position { get; }
+
+        public int EndPosition => Position + FullWidth;
+
+        public SyntaxKind Kind => Green.Kind;
+
+        public int Width => Green.Width;
+
+        public int FullWidth => Green.FullWidth;
+
+        public int SpanStart => Position + Green.GetLeadingTriviaWidth();
+
+        public TextSpan FullSpan => new TextSpan(Position, Green.FullWidth);
+
+        public TextSpan Span
+        {
+            get
+            {
+                // Start with the full span.
+                var start = Position;
+                var width = Green.FullWidth;
+
+                // adjust for preceding trivia (avoid calling this twice, do not call Green.Width)
+                var precedingWidth = Green.GetLeadingTriviaWidth();
+                start += precedingWidth;
+                width -= precedingWidth;
+
+                // adjust for following trivia width
+                width -= Green.GetTrailingTriviaWidth();
+
+                Debug.Assert(width >= 0);
+                return new TextSpan(start, width);
+            }
+        }
+
+        internal int SlotCount => Green.SlotCount;
+
+        public bool IsList => Green.IsList;
+
+        public bool IsMissing => Green.IsMissing;
+
+        public bool IsToken => Green.IsToken;
+
+        public bool IsTrivia => Green.IsTrivia;
+
+        public bool HasLeadingTrivia
+        {
+            get
+            {
+                return GetLeadingTrivia().Count > 0;
+            }
+        }
+
+        public bool HasTrailingTrivia
+        {
+            get
+            {
+                return GetTrailingTrivia().Count > 0;
+            }
+        }
+
+        public bool ContainsDiagnostics => Green.ContainsDiagnostics;
+
+        public bool ContainsAnnotations => Green.ContainsAnnotations;
+
+        internal string SerializedValue => SyntaxSerializer.Serialize(this);
+
+        public abstract TResult Accept<TResult>(SyntaxVisitor<TResult> visitor);
+
+        public abstract void Accept(SyntaxVisitor visitor);
+
+        internal abstract SyntaxNode GetNodeSlot(int index);
+
+        internal abstract SyntaxNode GetCachedSlot(int index);
+
+        internal SyntaxNode GetRed(ref SyntaxNode field, int slot)
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(slot);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, green.CreateRed(this, GetChildPosition(slot)), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        // Special case of above function where slot = 0, does not need GetChildPosition 
+        internal SyntaxNode GetRedAtZero(ref SyntaxNode field)
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(0);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, green.CreateRed(this, Position), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        protected T GetRed<T>(ref T field, int slot) where T : SyntaxNode
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(slot);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, (T)green.CreateRed(this, this.GetChildPosition(slot)), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        // special case of above function where slot = 0, does not need GetChildPosition 
+        protected T GetRedAtZero<T>(ref T field) where T : SyntaxNode
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(0);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, (T)green.CreateRed(this, Position), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        internal SyntaxNode GetRedElement(ref SyntaxNode element, int slot)
+        {
+            Debug.Assert(IsList);
+
+            var result = element;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(slot);
+                // passing list's parent
+                Interlocked.CompareExchange(ref element, green.CreateRed(Parent, GetChildPosition(slot)), null);
+                result = element;
+            }
+
+            return result;
+        }
+
+        internal virtual int GetChildPosition(int index)
+        {
+            var offset = 0;
+            var green = Green;
+            while (index > 0)
+            {
+                index--;
+                var prevSibling = GetCachedSlot(index);
+                if (prevSibling != null)
+                {
+                    return prevSibling.EndPosition + offset;
+                }
+                var greenChild = green.GetSlot(index);
+                if (greenChild != null)
+                {
+                    offset += greenChild.FullWidth;
+                }
+            }
+
+            return Position + offset;
+        }
+
+        public virtual SyntaxTriviaList GetLeadingTrivia()
+        {
+            var firstToken = GetFirstToken();
+            return firstToken != null ? firstToken.GetLeadingTrivia() : default(SyntaxTriviaList);
+        }
+
+        public virtual SyntaxTriviaList GetTrailingTrivia()
+        {
+            var lastToken = GetLastToken();
+            return lastToken != null ? lastToken.GetTrailingTrivia() : default(SyntaxTriviaList);
+        }
+
+        internal SyntaxToken GetFirstToken()
+        {
+            return ((SyntaxToken)GetFirstTerminal());
+        }
+
+        internal SyntaxToken GetLastToken()
+        {
+            return ((SyntaxToken)GetLastTerminal());
+        }
+
+        public SyntaxNode GetFirstTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                var foundChild = false;
+                for (int i = 0, n = node.SlotCount; i < n; i++)
+                {
+                    var child = node.GetNodeSlot(i);
+                    if (child != null)
+                    {
+                        node = child;
+                        foundChild = true;
+                        break;
+                    }
+                }
+
+                if (!foundChild)
+                {
+                    return null;
+                }
+            }
+            while (node.SlotCount != 0);
+
+            return node == this ? this : node;
+        }
+
+        public SyntaxNode GetLastTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                SyntaxNode lastChild = null;
+                for (var i = node.SlotCount - 1; i >= 0; i--)
+                {
+                    var child = node.GetNodeSlot(i);
+                    if (child != null && child.FullWidth > 0)
+                    {
+                        lastChild = child;
+                        break;
+                    }
+                }
+                node = lastChild;
+            } while (node?.SlotCount > 0);
+
+            return node;
+        }
+
+        /// <summary>
+        /// The list of child nodes of this node, where each element is a SyntaxNode instance.
+        /// </summary>
+        public ChildSyntaxList ChildNodes()
+        {
+            return new ChildSyntaxList(this);
+        }
+
+        /// <summary>
+        /// Gets a list of ancestor nodes
+        /// </summary>
+        public IEnumerable<SyntaxNode> Ancestors()
+        {
+            return Parent?
+                .AncestorsAndSelf() ??
+                Array.Empty<SyntaxNode>();
+        }
+
+        /// <summary>
+        /// Gets a list of ancestor nodes (including this node) 
+        /// </summary>
+        public IEnumerable<SyntaxNode> AncestorsAndSelf()
+        {
+            for (var node = this; node != null; node = node.Parent)
+            {
+                yield return node;
+            }
+        }
+
+        /// <summary>
+        /// Gets the first node of type TNode that matches the predicate.
+        /// </summary>
+        public TNode FirstAncestorOrSelf<TNode>(Func<TNode, bool> predicate = null)
+            where TNode : SyntaxNode
+        {
+            for (var node = this; node != null; node = node.Parent)
+            {
+                if (node is TNode tnode && (predicate == null || predicate(tnode)))
+                {
+                    return tnode;
+                }
+            }
+
+            return default;
+        }
+
+        /// <summary>
+        /// Gets a list of descendant nodes in prefix document order.
+        /// </summary>
+        /// <param name="descendIntoChildren">An optional function that determines if the search descends into the argument node's children.</param>
+        public IEnumerable<SyntaxNode> DescendantNodes(Func<SyntaxNode, bool> descendIntoChildren = null)
+        {
+            return DescendantNodesImpl(FullSpan, descendIntoChildren, includeSelf: false);
+        }
+
+        /// <summary>
+        /// Gets a list of descendant nodes (including this node) in prefix document order.
+        /// </summary>
+        /// <param name="descendIntoChildren">An optional function that determines if the search descends into the argument node's children.</param>
+        public IEnumerable<SyntaxNode> DescendantNodesAndSelf(Func<SyntaxNode, bool> descendIntoChildren = null)
+        {
+            return DescendantNodesImpl(FullSpan, descendIntoChildren, includeSelf: true);
+        }
+
+        protected internal SyntaxNode ReplaceCore<TNode>(
+            IEnumerable<TNode> nodes = null,
+            Func<TNode, TNode, SyntaxNode> computeReplacementNode = null)
+            where TNode : SyntaxNode
+        {
+            return SyntaxReplacer.Replace(this, nodes, computeReplacementNode);
+        }
+
+        protected internal SyntaxNode ReplaceNodeInListCore(SyntaxNode originalNode, IEnumerable<SyntaxNode> replacementNodes)
+        {
+            return SyntaxReplacer.ReplaceNodeInList(this, originalNode, replacementNodes);
+        }
+
+        protected internal SyntaxNode InsertNodesInListCore(SyntaxNode nodeInList, IEnumerable<SyntaxNode> nodesToInsert, bool insertBefore)
+        {
+            return SyntaxReplacer.InsertNodeInList(this, nodeInList, nodesToInsert, insertBefore);
+        }
+
+        public RazorDiagnostic[] GetDiagnostics()
+        {
+            return Green.GetDiagnostics();
+        }
+
+        public SyntaxAnnotation[] GetAnnotations()
+        {
+            return Green.GetAnnotations();
+        }
+
+        public bool IsEquivalentTo(SyntaxNode other)
+        {
+            if (this == other)
+            {
+                return true;
+            }
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Green.IsEquivalentTo(other.Green);
+        }
+
+        public override string ToString()
+        {
+            var builder = new StringBuilder();
+            builder.Append(Green.ToString());
+            builder.AppendFormat(" at {0}::{1}", Position, FullWidth);
+
+            return builder.ToString();
+        }
+
+        public virtual string ToFullString()
+        {
+            return Green.ToFullString();
+        }
+
+        protected virtual string GetDebuggerDisplay()
+        {
+            if (IsToken)
+            {
+                return string.Format("{0};[{1}]", Kind, ToFullString());
+            }
+
+            return string.Format("{0} [{1}..{2})", Kind, Position, EndPosition);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
new file mode 100644
index 0000000000..86b8cf4a19
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -0,0 +1,339 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxNodeExtensions
+    {
+        // From http://dev.w3.org/html5/spec/Overview.html#elements-0
+        private static readonly HashSet<string> VoidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "area",
+            "base",
+            "br",
+            "col",
+            "command",
+            "embed",
+            "hr",
+            "img",
+            "input",
+            "keygen",
+            "link",
+            "meta",
+            "param",
+            "source",
+            "track",
+            "wbr"
+        };
+
+        public static TNode WithAnnotations<TNode>(this TNode node, params SyntaxAnnotation[] annotations) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return (TNode)node.Green.SetAnnotations(annotations).CreateRed(node.Parent, node.Position);
+        }
+
+        public static object GetAnnotationValue<TNode>(this TNode node, string key) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var annotation = node.GetAnnotations().FirstOrDefault(n => n.Kind == key);
+            return annotation?.Data;
+        }
+
+        public static TNode WithDiagnostics<TNode>(this TNode node, params RazorDiagnostic[] diagnostics) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return (TNode)node.Green.SetDiagnostics(diagnostics).CreateRed(node.Parent, node.Position);
+        }
+
+        public static TNode AppendDiagnostic<TNode>(this TNode node, params RazorDiagnostic[] diagnostics) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var existingDiagnostics = node.GetDiagnostics();
+            var allDiagnostics = existingDiagnostics.Concat(diagnostics).ToArray();
+
+            return (TNode)node.WithDiagnostics(allDiagnostics);
+        }
+
+        public static SourceLocation GetSourceLocation(this SyntaxNode node, RazorSourceDocument source)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            try
+            {
+                if (source.Length == 0)
+                {
+                    // Just a marker symbol
+                    return new SourceLocation(source.FilePath, 0, 0, 0);
+                }
+                if (node.Position == source.Length)
+                {
+                    // E.g. Marker symbol at the end of the document
+                    var lastPosition = source.Length - 1;
+                    var endsWithLineBreak = ParserHelpers.IsNewLine(source[lastPosition]);
+                    var lastLocation = source.Lines.GetLocation(lastPosition);
+                    return new SourceLocation(
+                        source.FilePath, // GetLocation prefers RelativePath but we want FilePath.
+                        lastLocation.AbsoluteIndex + 1,
+                        lastLocation.LineIndex + (endsWithLineBreak ? 1 : 0),
+                        endsWithLineBreak ? 0 : lastLocation.CharacterIndex + 1);
+                }
+
+                var location = source.Lines.GetLocation(node.Position);
+                return new SourceLocation(
+                    source.FilePath, // GetLocation prefers RelativePath but we want FilePath.
+                    location.AbsoluteIndex,
+                    location.LineIndex,
+                    location.CharacterIndex);
+            }
+            catch (IndexOutOfRangeException)
+            {
+                Debug.Assert(false, "Node position should stay within document length.");
+                return new SourceLocation(source.FilePath, node.Position, 0, 0);
+            }
+        }
+
+        public static SourceSpan GetSourceSpan(this SyntaxNode node, RazorSourceDocument source)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var location = node.GetSourceLocation(source);
+
+            return new SourceSpan(location, node.FullWidth);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with the specified nodes, tokens and trivia replaced.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root node of the tree of nodes.</param>
+        /// <param name="nodes">The nodes to be replaced.</param>
+        /// <param name="computeReplacementNode">A function that computes a replacement node for the
+        /// argument nodes. The first argument is the original node. The second argument is the same
+        /// node potentially rewritten with replaced descendants.</param>
+        public static TRoot ReplaceSyntax<TRoot>(
+            this TRoot root,
+            IEnumerable<SyntaxNode> nodes,
+            Func<SyntaxNode, SyntaxNode, SyntaxNode> computeReplacementNode)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.ReplaceCore(
+                nodes: nodes, computeReplacementNode: computeReplacementNode);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with the specified old node replaced with a new node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <typeparam name="TNode">The type of the nodes being replaced.</typeparam>
+        /// <param name="root">The root node of the tree of nodes.</param>
+        /// <param name="nodes">The nodes to be replaced; descendants of the root node.</param>
+        /// <param name="computeReplacementNode">A function that computes a replacement node for the
+        /// argument nodes. The first argument is the original node. The second argument is the same
+        /// node potentially rewritten with replaced descendants.</param>
+        public static TRoot ReplaceNodes<TRoot, TNode>(this TRoot root, IEnumerable<TNode> nodes, Func<TNode, TNode, SyntaxNode> computeReplacementNode)
+            where TRoot : SyntaxNode
+            where TNode : SyntaxNode
+        {
+            return (TRoot)root.ReplaceCore(nodes: nodes, computeReplacementNode: computeReplacementNode);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with the specified old node replaced with a new node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root node of the tree of nodes.</param>
+        /// <param name="oldNode">The node to be replaced; a descendant of the root node.</param>
+        /// <param name="newNode">The new node to use in the new tree in place of the old node.</param>
+        public static TRoot ReplaceNode<TRoot>(this TRoot root, SyntaxNode oldNode, SyntaxNode newNode)
+            where TRoot : SyntaxNode
+        {
+            if (oldNode == newNode)
+            {
+                return root;
+            }
+
+            return (TRoot)root.ReplaceCore(nodes: new[] { oldNode }, computeReplacementNode: (o, r) => newNode);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with specified old node replaced with a new nodes.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root of the tree of nodes.</param>
+        /// <param name="oldNode">The node to be replaced; a descendant of the root node and an element of a list member.</param>
+        /// <param name="newNodes">A sequence of nodes to use in the tree in place of the old node.</param>
+        public static TRoot ReplaceNode<TRoot>(this TRoot root, SyntaxNode oldNode, IEnumerable<SyntaxNode> newNodes)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.ReplaceNodeInListCore(oldNode, newNodes);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with new nodes inserted before the specified node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root of the tree of nodes.</param>
+        /// <param name="nodeInList">The node to insert before; a descendant of the root node an element of a list member.</param>
+        /// <param name="newNodes">A sequence of nodes to insert into the tree immediately before the specified node.</param>
+        public static TRoot InsertNodesBefore<TRoot>(this TRoot root, SyntaxNode nodeInList, IEnumerable<SyntaxNode> newNodes)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.InsertNodesInListCore(nodeInList, newNodes, insertBefore: true);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with new nodes inserted after the specified node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root of the tree of nodes.</param>
+        /// <param name="nodeInList">The node to insert after; a descendant of the root node an element of a list member.</param>
+        /// <param name="newNodes">A sequence of nodes to insert into the tree immediately after the specified node.</param>
+        public static TRoot InsertNodesAfter<TRoot>(this TRoot root, SyntaxNode nodeInList, IEnumerable<SyntaxNode> newNodes)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.InsertNodesInListCore(nodeInList, newNodes, insertBefore: false);
+        }
+
+        public static string GetContent<TNode>(this TNode node) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var tokens = node.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>();
+            var content = string.Concat(tokens.Select(t => t.Content));
+            return content;
+        }
+
+        public static string GetTagName(this MarkupTagBlockSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            var child = tagBlock.Children[0];
+
+            if (tagBlock.Children.Count == 0 || !(child is MarkupTextLiteralSyntax))
+            {
+                return null;
+            }
+
+            var childLiteral = (MarkupTextLiteralSyntax)child;
+            SyntaxToken textToken = null;
+            for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
+            {
+                var token = childLiteral.LiteralTokens[i];
+
+                if (token != null &&
+                    (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
+                {
+                    textToken = token;
+                    break;
+                }
+            }
+
+            if (textToken == null)
+            {
+                return null;
+            }
+
+            return textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+        }
+
+        public static string GetTagName(this MarkupTagHelperStartTagSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            var child = tagBlock.Children[0];
+
+            if (tagBlock.Children.Count == 0 || !(child is MarkupTextLiteralSyntax))
+            {
+                return null;
+            }
+
+            var childLiteral = (MarkupTextLiteralSyntax)child;
+            SyntaxToken textToken = null;
+            for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
+            {
+                var token = childLiteral.LiteralTokens[i];
+
+                if (token != null &&
+                    (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
+                {
+                    textToken = token;
+                    break;
+                }
+            }
+
+            if (textToken == null)
+            {
+                return null;
+            }
+
+            return textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+        }
+
+        public static bool IsSelfClosing(this MarkupTagBlockSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            var lastChild = tagBlock.ChildNodes().LastOrDefault();
+
+            return lastChild?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false;
+        }
+
+        public static bool IsVoidElement(this MarkupTagBlockSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            return VoidElements.Contains(tagBlock.GetTagName());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxReplacer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxReplacer.cs
new file mode 100644
index 0000000000..2d192958e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxReplacer.cs
@@ -0,0 +1,207 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxReplacer
+    {
+        internal static SyntaxNode Replace<TNode>(
+            SyntaxNode root,
+            IEnumerable<TNode> nodes = null,
+            Func<TNode, TNode, SyntaxNode> computeReplacementNode = null)
+            where TNode : SyntaxNode
+        {
+            var replacer = new Replacer<TNode>(nodes, computeReplacementNode);
+
+            if (replacer.HasWork)
+            {
+                return replacer.Visit(root);
+            }
+            else
+            {
+                return root;
+            }
+        }
+
+        internal static SyntaxNode ReplaceNodeInList(SyntaxNode root, SyntaxNode originalNode, IEnumerable<SyntaxNode> newNodes)
+        {
+            return new NodeListEditor(originalNode, newNodes, ListEditKind.Replace).Visit(root);
+        }
+
+        internal static SyntaxNode InsertNodeInList(SyntaxNode root, SyntaxNode nodeInList, IEnumerable<SyntaxNode> nodesToInsert, bool insertBefore)
+        {
+            return new NodeListEditor(nodeInList, nodesToInsert, insertBefore ? ListEditKind.InsertBefore : ListEditKind.InsertAfter).Visit(root);
+        }
+
+        private class Replacer<TNode> : SyntaxRewriter where TNode : SyntaxNode
+        {
+            private readonly Func<TNode, TNode, SyntaxNode> _computeReplacementNode;
+            private readonly HashSet<SyntaxNode> _nodeSet;
+            private readonly HashSet<TextSpan> _spanSet;
+            private readonly TextSpan _totalSpan;
+
+            public Replacer(IEnumerable<TNode> nodes, Func<TNode, TNode, SyntaxNode> computeReplacementNode)
+            {
+                _computeReplacementNode = computeReplacementNode;
+                _nodeSet = nodes != null ? new HashSet<SyntaxNode>(nodes) : new HashSet<SyntaxNode>();
+                _spanSet = new HashSet<TextSpan>(_nodeSet.Select(n => n.FullSpan));
+                _totalSpan = ComputeTotalSpan(_spanSet);
+            }
+
+            public bool HasWork => _nodeSet.Count > 0;
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                var rewritten = node;
+
+                if (node != null)
+                {
+                    if (ShouldVisit(node.FullSpan))
+                    {
+                        rewritten = base.Visit(node);
+                    }
+
+                    if (_nodeSet.Contains(node) && _computeReplacementNode != null)
+                    {
+                        rewritten = _computeReplacementNode((TNode)node, (TNode)rewritten);
+                    }
+                }
+
+                return rewritten;
+            }
+
+            private static TextSpan ComputeTotalSpan(IEnumerable<TextSpan> spans)
+            {
+                var first = true;
+                var start = 0;
+                var end = 0;
+
+                foreach (var span in spans)
+                {
+                    if (first)
+                    {
+                        start = span.Start;
+                        end = span.End;
+                        first = false;
+                    }
+                    else
+                    {
+                        start = Math.Min(start, span.Start);
+                        end = Math.Max(end, span.End);
+                    }
+                }
+
+                return new TextSpan(start, end - start);
+            }
+
+            private bool ShouldVisit(TextSpan span)
+            {
+                // first do quick check against total span
+                if (!span.IntersectsWith(_totalSpan))
+                {
+                    // if the node is outside the total span of the nodes to be replaced
+                    // then we won't find any nodes to replace below it.
+                    return false;
+                }
+
+                foreach (var s in _spanSet)
+                {
+                    if (span.IntersectsWith(s))
+                    {
+                        // node's full span intersects with at least one node to be replaced
+                        // so we need to visit node's children to find it.
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        private class NodeListEditor : SyntaxRewriter
+        {
+            private readonly TextSpan _elementSpan;
+            private readonly SyntaxNode _originalNode;
+            private readonly IEnumerable<SyntaxNode> _newNodes;
+            private readonly ListEditKind _editKind;
+
+            public NodeListEditor(
+                SyntaxNode originalNode,
+                IEnumerable<SyntaxNode> replacementNodes,
+                ListEditKind editKind)
+            {
+                _elementSpan = originalNode.Span;
+                _originalNode = originalNode;
+                _newNodes = replacementNodes;
+                _editKind = editKind;
+            }
+
+            private bool ShouldVisit(TextSpan span)
+            {
+                if (span.IntersectsWith(_elementSpan))
+                {
+                    // node's full span intersects with at least one node to be replaced
+                    // so we need to visit node's children to find it.
+                    return true;
+                }
+
+                return false;
+            }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node == _originalNode)
+                {
+                    throw new InvalidOperationException("Expecting a list");
+                }
+
+                var rewritten = node;
+
+                if (node != null)
+                {
+                    if (ShouldVisit(node.FullSpan))
+                    {
+                        rewritten = base.Visit(node);
+                    }
+                }
+
+                return rewritten;
+            }
+
+            public override SyntaxList<TNode> VisitList<TNode>(SyntaxList<TNode> list)
+            {
+                if (_originalNode is TNode)
+                {
+                    var index = list.IndexOf((TNode)_originalNode);
+                    if (index >= 0 && index < list.Count)
+                    {
+                        switch (_editKind)
+                        {
+                            case ListEditKind.Replace:
+                                return list.ReplaceRange((TNode)_originalNode, _newNodes.Cast<TNode>());
+
+                            case ListEditKind.InsertAfter:
+                                return list.InsertRange(index + 1, _newNodes.Cast<TNode>());
+
+                            case ListEditKind.InsertBefore:
+                                return list.InsertRange(index, _newNodes.Cast<TNode>());
+                        }
+                    }
+                }
+
+                return base.VisitList<TNode>(list);
+            }
+        }
+
+        private enum ListEditKind
+        {
+            InsertBefore,
+            InsertAfter,
+            Replace
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs
new file mode 100644
index 0000000000..d491bd0e88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs
@@ -0,0 +1,148 @@
+// 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.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract partial class SyntaxRewriter : SyntaxVisitor<SyntaxNode>
+    {
+        public override SyntaxNode VisitToken(SyntaxToken token)
+        {
+            // PERF: This is a hot method, so it has been written to minimize the following:
+            // 1. Virtual method calls
+            // 2. Copying of structs
+            // 3. Repeated null checks
+
+            // PERF: Avoid testing node for null more than once
+            var node = token?.Green;
+            if (node == null)
+            {
+                return token;
+            }
+
+            // PERF: Make one virtual method call each to get the leading and trailing trivia
+            var leadingTrivia = node.GetLeadingTrivia();
+            var trailingTrivia = node.GetTrailingTrivia();
+
+            // Trivia is either null or a non-empty list (there's no such thing as an empty green list)
+            Debug.Assert(leadingTrivia == null || !leadingTrivia.IsList || leadingTrivia.SlotCount > 0);
+            Debug.Assert(trailingTrivia == null || !trailingTrivia.IsList || trailingTrivia.SlotCount > 0);
+
+            if (leadingTrivia != null)
+            {
+                // PERF: Expand token.LeadingTrivia when node is not null.
+                var leading = VisitList(new SyntaxTriviaList(leadingTrivia.CreateRed(token, token.Position)));
+
+                if (trailingTrivia != null)
+                {
+                    // Both leading and trailing trivia
+
+                    // PERF: Expand token.TrailingTrivia when node is not null and leadingTrivia is not null.
+                    // Also avoid node.Width because it makes a virtual call to GetText. Instead use node.FullWidth - trailingTrivia.FullWidth.
+                    var index = leadingTrivia.IsList ? leadingTrivia.SlotCount : 1;
+                    var position = token.Position + node.FullWidth - trailingTrivia.FullWidth;
+                    var trailing = VisitList(new SyntaxTriviaList(trailingTrivia.CreateRed(token, position), position, index));
+
+                    if (leading.Node.Green != leadingTrivia)
+                    {
+                        token = token.WithLeadingTrivia(leading);
+                    }
+
+                    return trailing.Node.Green != trailingTrivia ? token.WithTrailingTrivia(trailing) : token;
+                }
+                else
+                {
+                    // Leading trivia only
+                    return leading.Node.Green != leadingTrivia ? token.WithLeadingTrivia(leading) : token;
+                }
+            }
+            else if (trailingTrivia != null)
+            {
+                // Trailing trivia only
+                // PERF: Expand token.TrailingTrivia when node is not null and leading is null.
+                // Also avoid node.Width because it makes a virtual call to GetText. Instead use node.FullWidth - trailingTrivia.FullWidth.
+                var position = token.Position + node.FullWidth - trailingTrivia.FullWidth;
+                var trailing = VisitList(new SyntaxTriviaList(trailingTrivia.CreateRed(token, position), position, index: 0));
+                return trailing.Node.Green != trailingTrivia ? token.WithTrailingTrivia(trailing) : token;
+            }
+            else
+            {
+                // No trivia
+                return token;
+            }
+        }
+
+        public virtual SyntaxList<TNode> VisitList<TNode>(SyntaxList<TNode> list) where TNode : SyntaxNode
+        {
+            SyntaxListBuilder alternate = null;
+            for (int i = 0, n = list.Count; i < n; i++)
+            {
+                var item = list[i];
+                var visited = VisitListElement(item);
+                if (item != visited && alternate == null)
+                {
+                    alternate = new SyntaxListBuilder(n);
+                    alternate.AddRange(list, 0, i);
+                }
+
+                if (alternate != null && visited != null)
+                {
+                    alternate.Add(visited);
+                }
+            }
+
+            if (alternate != null)
+            {
+                return alternate.ToList();
+            }
+
+            return list;
+        }
+
+        public override SyntaxNode VisitTrivia(SyntaxTrivia trivia)
+        {
+            return trivia;
+        }
+
+        public virtual SyntaxTriviaList VisitList(SyntaxTriviaList list)
+        {
+            var count = list.Count;
+            if (count != 0)
+            {
+                SyntaxTriviaListBuilder alternate = null;
+                var index = -1;
+
+                foreach (var item in list)
+                {
+                    index++;
+                    var visited = VisitListElement(item);
+
+                    //skip the null check since SyntaxTrivia is a value type
+                    if (visited != item && alternate == null)
+                    {
+                        alternate = new SyntaxTriviaListBuilder(count);
+                        alternate.Add(list, 0, index);
+                    }
+
+                    if (alternate != null && visited != null)
+                    {
+                        alternate.Add(visited);
+                    }
+                }
+
+                if (alternate != null)
+                {
+                    return alternate.ToList();
+                }
+            }
+
+            return list;
+        }
+
+        public virtual TNode VisitListElement<TNode>(TNode node) where TNode : SyntaxNode
+        {
+            return (TNode)(SyntaxNode)Visit(node);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
new file mode 100644
index 0000000000..5b167b510f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
@@ -0,0 +1,304 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxSerializer
+    {
+        internal static string Serialize(SyntaxNode node)
+        {
+            using (var writer = new StringWriter())
+            {
+                var walker = new Walker(writer);
+                walker.Visit(node);
+
+                return writer.ToString();
+            }
+        }
+
+        private class Walker : SyntaxWalker
+        {
+            private readonly SyntaxWriter _visitor;
+            private readonly TextWriter _writer;
+
+            public Walker(TextWriter writer)
+            {
+                _visitor = new SyntaxWriter(writer);
+                _writer = writer;
+            }
+
+            public TextWriter Writer { get; }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return node;
+                }
+
+                if (node.IsList)
+                {
+                    return base.DefaultVisit(node);
+                }
+
+                _visitor.Visit(node);
+                _writer.WriteLine();
+
+                if (!node.IsToken && !node.IsTrivia)
+                {
+                    _visitor.Depth++;
+                    node = base.DefaultVisit(node);
+                    _visitor.Depth--;
+                }
+
+                return node;
+            }
+        }
+
+        private class SyntaxWalker : SyntaxRewriter
+        {
+            private readonly List<SyntaxNode> _ancestors = new List<SyntaxNode>();
+
+            protected IReadOnlyList<SyntaxNode> Ancestors => _ancestors;
+
+            protected SyntaxNode Parent => _ancestors.Count > 0 ? _ancestors[0] : null;
+
+            protected override SyntaxNode DefaultVisit(SyntaxNode node)
+            {
+                _ancestors.Insert(0, node);
+
+                try
+                {
+                    for (var i = 0; i < node.SlotCount; i++)
+                    {
+                        var child = node.GetNodeSlot(i);
+                        Visit(child);
+                    }
+                }
+                finally
+                {
+                    _ancestors.RemoveAt(0);
+                }
+
+                return node;
+            }
+        }
+
+        private class SyntaxWriter : SyntaxRewriter
+        {
+            private readonly TextWriter _writer;
+            private bool _visitedRoot;
+
+            public SyntaxWriter(TextWriter writer)
+            {
+                _writer = writer;
+            }
+
+            public int Depth { get; set; }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node is SyntaxToken token)
+                {
+                    return VisitToken(token);
+                }
+
+                WriteNode(node);
+                return node;
+            }
+
+            public override SyntaxNode VisitToken(SyntaxToken token)
+            {
+                WriteToken(token);
+                return base.VisitToken(token);
+            }
+
+            public override SyntaxNode VisitTrivia(SyntaxTrivia trivia)
+            {
+                WriteTrivia(trivia);
+                return base.VisitTrivia(trivia);
+            }
+
+            private void WriteNode(SyntaxNode node)
+            {
+                WriteIndent();
+                Write(node.Kind);
+                WriteSeparator();
+                Write($"[{node.Position}..{node.EndPosition})");
+                WriteSeparator();
+                Write($"FullWidth: {node.FullWidth}");
+
+                if (node is RazorDirectiveSyntax razorDirective)
+                {
+                    WriteRazorDirective(razorDirective);
+                }
+                else if (node is MarkupTagHelperElementSyntax tagHelperElement)
+                {
+                    WriteTagHelperElement(tagHelperElement);
+                }
+                else if (node is MarkupTagHelperAttributeSyntax tagHelperAttribute)
+                {
+                    WriteTagHelperAttributeInfo(tagHelperAttribute.TagHelperAttributeInfo);
+                }
+                else if (node is MarkupMinimizedTagHelperAttributeSyntax minimizedTagHelperAttribute)
+                {
+                    WriteTagHelperAttributeInfo(minimizedTagHelperAttribute.TagHelperAttributeInfo);
+                }
+
+                if (ShouldDisplayNodeContent(node))
+                {
+                    WriteSeparator();
+                    Write($"[{node.GetContent()}]");
+                }
+
+                var annotation = node.GetAnnotations().FirstOrDefault(a => a.Kind == SyntaxConstants.SpanContextKind);
+                if (annotation != null && annotation.Data is SpanContext context)
+                {
+                    WriteSpanContext(context);
+                }
+
+                if (!_visitedRoot)
+                {
+                    WriteSeparator();
+                    Write($"[{node.ToFullString()}]");
+                    _visitedRoot = true;
+                }
+            }
+
+            private void WriteRazorDirective(RazorDirectiveSyntax node)
+            {
+                if (node.DirectiveDescriptor == null)
+                {
+                    return;
+                }
+
+                var builder = new StringBuilder("Directive:{");
+                builder.Append(node.DirectiveDescriptor.Directive);
+                builder.Append(";");
+                builder.Append(node.DirectiveDescriptor.Kind);
+                builder.Append(";");
+                builder.Append(node.DirectiveDescriptor.Usage);
+                builder.Append("}");
+
+                var diagnostics = node.GetDiagnostics();
+                if (diagnostics.Length > 0)
+                {
+                    builder.Append(" [");
+                    var ids = string.Join(", ", diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                    builder.Append(ids);
+                    builder.Append("]");
+                }
+
+                WriteSeparator();
+                Write(builder.ToString());
+            }
+
+            private void WriteTagHelperElement(MarkupTagHelperElementSyntax node)
+            {
+                // Write tag name
+                WriteSeparator();
+                Write($"{node.TagHelperInfo.TagName}[{node.TagHelperInfo.TagMode}]");
+
+                // Write descriptors
+                foreach (var descriptor in node.TagHelperInfo.BindingResult.Descriptors)
+                {
+                    WriteSeparator();
+
+                    // Get the type name without the namespace.
+                    var typeName = descriptor.Name.Substring(descriptor.Name.LastIndexOf('.') + 1);
+                    Write(typeName);
+                }
+            }
+
+            private void WriteTagHelperAttributeInfo(TagHelperAttributeInfo info)
+            {
+                // Write attributes
+                WriteSeparator();
+                Write(info.Name);
+                WriteSeparator();
+                Write(info.AttributeStructure);
+                WriteSeparator();
+                Write(info.Bound ? "Bound" : "Unbound");
+            }
+
+            private void WriteToken(SyntaxToken token)
+            {
+                WriteIndent();
+                var content = token.IsMissing ? "<Missing>" : token.Content;
+                var diagnostics = token.GetDiagnostics();
+                var tokenString = $"{token.Kind};[{content}];{string.Join(", ", diagnostics.Select(diagnostic => diagnostic.Id + diagnostic.Span))}";
+                Write(tokenString);
+            }
+
+            private void WriteTrivia(SyntaxTrivia trivia)
+            {
+                throw new NotImplementedException();
+            }
+
+            private void WriteSpanContext(SpanContext context)
+            {
+                WriteSeparator();
+                Write($"Gen<{context.ChunkGenerator}>");
+                WriteSeparator();
+                Write(context.EditHandler);
+            }
+
+            protected void WriteIndent()
+            {
+                for (var i = 0; i < Depth; i++)
+                {
+                    for (var j = 0; j < 4; j++)
+                    {
+                        Write(' ');
+                    }
+                }
+            }
+
+            protected void WriteSeparator()
+            {
+                Write(" - ");
+            }
+
+            protected void WriteNewLine()
+            {
+                _writer.WriteLine();
+            }
+
+            protected void Write(object value)
+            {
+                if (value is string stringValue)
+                {
+                    stringValue = stringValue.Replace(Environment.NewLine, "LF");
+                    _writer.Write(stringValue);
+                    return;
+                }
+
+                _writer.Write(value);
+            }
+
+            private static bool ShouldDisplayNodeContent(SyntaxNode node)
+            {
+                return node.Kind == SyntaxKind.MarkupTextLiteral ||
+                    node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
+                    node.Kind == SyntaxKind.MarkupTagBlock ||
+                    node.Kind == SyntaxKind.MarkupAttributeBlock ||
+                    node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
+                    node.Kind == SyntaxKind.MarkupTagHelperAttribute ||
+                    node.Kind == SyntaxKind.MarkupMinimizedTagHelperAttribute ||
+                    node.Kind == SyntaxKind.MarkupLiteralAttributeValue ||
+                    node.Kind == SyntaxKind.MarkupDynamicAttributeValue ||
+                    node.Kind == SyntaxKind.CSharpStatementLiteral ||
+                    node.Kind == SyntaxKind.CSharpExpressionLiteral ||
+                    node.Kind == SyntaxKind.CSharpEphemeralTextLiteral ||
+                    node.Kind == SyntaxKind.UnclassifiedTextLiteral;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxToken.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxToken.cs
new file mode 100644
index 0000000000..e3ecd35bf6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxToken.cs
@@ -0,0 +1,105 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxToken : RazorSyntaxNode
+    {
+        internal SyntaxToken(GreenNode green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+
+        internal new InternalSyntax.SyntaxToken Green => (InternalSyntax.SyntaxToken)base.Green;
+
+        public string Content => Green.Content;
+
+        internal override sealed SyntaxNode GetCachedSlot(int index)
+        {
+            throw new InvalidOperationException("Tokens can't have slots.");
+        }
+
+        internal override sealed SyntaxNode GetNodeSlot(int slot)
+        {
+            throw new InvalidOperationException("Tokens can't have slots.");
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitToken(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitToken(this);
+        }
+
+        public SyntaxToken WithLeadingTrivia(SyntaxNode trivia)
+        {
+            return Green != null
+                ? new SyntaxToken(Green.WithLeadingTrivia(trivia.Green), parent: null, position: 0)
+                : default(SyntaxToken);
+        }
+
+        public SyntaxToken WithTrailingTrivia(SyntaxNode trivia)
+        {
+            return Green != null
+                ? new SyntaxToken(Green.WithTrailingTrivia(trivia.Green), parent: null, position: 0)
+                : default(SyntaxToken);
+        }
+
+        public SyntaxToken WithLeadingTrivia(IEnumerable<SyntaxTrivia> trivia)
+        {
+            var greenList = trivia?.Select(t => t.Green);
+            return WithLeadingTrivia(Green.CreateList(greenList)?.CreateRed());
+        }
+
+        public SyntaxToken WithTrailingTrivia(IEnumerable<SyntaxTrivia> trivia)
+        {
+            var greenList = trivia?.Select(t => t.Green);
+            return WithTrailingTrivia(Green.CreateList(greenList)?.CreateRed());
+        }
+
+        public override SyntaxTriviaList GetLeadingTrivia()
+        {
+            var leading = Green.GetLeadingTrivia();
+            if (leading == null)
+            {
+                return default(SyntaxTriviaList);
+            }
+
+            return new SyntaxTriviaList(leading.CreateRed(this, Position), Position);
+        }
+
+        public override SyntaxTriviaList GetTrailingTrivia()
+        {
+            var trailing = Green.GetTrailingTrivia();
+            if (trailing == null)
+            {
+                return default(SyntaxTriviaList);
+            }
+
+            var leading = Green.GetLeadingTrivia();
+            var index = 0;
+            if (leading != null)
+            {
+                index = leading.IsList ? leading.SlotCount : 1;
+            }
+            int trailingPosition = Position + FullWidth;
+            trailingPosition -= trailing.FullWidth;
+
+            return new SyntaxTriviaList(trailing.CreateRed(this, trailingPosition), trailingPosition, index);
+        }
+
+        public override string ToString()
+        {
+            return Content;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTrivia.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTrivia.cs
new file mode 100644
index 0000000000..d16e42f1ed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTrivia.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxTrivia : SyntaxNode
+    {
+        internal SyntaxTrivia(GreenNode green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+
+        internal new InternalSyntax.SyntaxTrivia Green => (InternalSyntax.SyntaxTrivia)base.Green;
+
+        public string Text => Green.Text;
+
+        internal override sealed SyntaxNode GetCachedSlot(int index)
+        {
+            throw new InvalidOperationException();
+        }
+
+        internal override sealed SyntaxNode GetNodeSlot(int slot)
+        {
+            throw new InvalidOperationException();
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitTrivia(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitTrivia(this);
+        }
+
+        public sealed override SyntaxTriviaList GetTrailingTrivia()
+        {
+            return default(SyntaxTriviaList);
+        }
+
+        public sealed override SyntaxTriviaList GetLeadingTrivia()
+        {
+            return default(SyntaxTriviaList);
+        }
+
+        public override string ToString()
+        {
+            return Text;
+        }
+
+        public sealed override string ToFullString()
+        {
+            return Text;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaList.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaList.cs
new file mode 100644
index 0000000000..2097e9391c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaList.cs
@@ -0,0 +1,785 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    [StructLayout(LayoutKind.Auto)]
+    internal readonly struct SyntaxTriviaList : IEquatable<SyntaxTriviaList>, IReadOnlyList<SyntaxTrivia>
+    {
+        public static SyntaxTriviaList Empty => default(SyntaxTriviaList);
+
+        internal SyntaxTriviaList(SyntaxNode node, int position, int index = 0)
+        {
+            Node = node;
+            Position = position;
+            Index = index;
+        }
+
+        internal SyntaxTriviaList(SyntaxNode node)
+        {
+            Node = node;
+            Position = node.Position;
+            Index = 0;
+        }
+
+        public SyntaxTriviaList(SyntaxTrivia trivia)
+        {
+            Node = trivia;
+            Position = 0;
+            Index = 0;
+        }
+
+        /// <summary>
+        /// Creates a list of trivia.
+        /// </summary>
+        /// <param name="trivias">An array of trivia.</param>
+        public SyntaxTriviaList(params SyntaxTrivia[] trivias)
+            : this(CreateNode(trivias), 0, 0)
+        {
+        }
+
+        /// <summary>
+        /// Creates a list of trivia.
+        /// </summary>
+        /// <param name="trivias">A sequence of trivia.</param>
+        public SyntaxTriviaList(IEnumerable<SyntaxTrivia> trivias)
+            : this(SyntaxTriviaListBuilder.Create(trivias).Node, 0, 0)
+        {
+        }
+
+        private static SyntaxNode CreateNode(SyntaxTrivia[] trivias)
+        {
+            if (trivias == null)
+            {
+                return null;
+            }
+
+            var builder = new SyntaxTriviaListBuilder(trivias.Length);
+            builder.Add(trivias);
+            return builder.ToList().Node;
+        }
+
+        internal SyntaxNode Node { get; }
+
+        internal int Position { get; }
+
+        internal int Index { get; }
+
+        public int Count
+        {
+            get { return Node == null ? 0 : (Node.IsList ? Node.SlotCount : 1); }
+        }
+
+        public SyntaxTrivia ElementAt(int index)
+        {
+            return this[index];
+        }
+
+        /// <summary>
+        /// Gets the trivia at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the trivia to get.</param>
+        /// <returns>The token at the specified index.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="index" /> is less than 0.-or-<paramref name="index" /> is equal to or greater than <see cref="Count" />. </exception>
+        public SyntaxTrivia this[int index]
+        {
+            get
+            {
+                if (Node != null)
+                {
+                    if (Node.IsList)
+                    {
+                        if (unchecked((uint)index < (uint)Node.SlotCount))
+                        {
+                            return Node.GetNodeSlot(index) as SyntaxTrivia;
+                        }
+                    }
+                    else if (index == 0)
+                    {
+                        return Node as SyntaxTrivia;
+                    }
+                }
+
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan FullSpan
+        {
+            get
+            {
+                if (Node == null)
+                {
+                    return default(TextSpan);
+                }
+
+                return new TextSpan(Position, Node.FullWidth);
+            }
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, not including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan Span
+        {
+            get
+            {
+                if (Node == null)
+                {
+                    return default(TextSpan);
+                }
+
+                return TextSpan.FromBounds(Position + Node.Green.GetLeadingTriviaWidth(),
+                    Position + Node.FullWidth - Node.Green.GetTrailingTriviaWidth());
+            }
+        }
+
+        /// <summary>
+        /// Returns the first trivia in the list.
+        /// </summary>
+        /// <returns>The first trivia in the list.</returns>
+        /// <exception cref="InvalidOperationException">The list is empty.</exception>        
+        public SyntaxTrivia First()
+        {
+            if (Any())
+            {
+                return this[0];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns the last trivia in the list.
+        /// </summary>
+        /// <returns>The last trivia in the list.</returns>
+        /// <exception cref="InvalidOperationException">The list is empty.</exception>        
+        public SyntaxTrivia Last()
+        {
+            if (Any())
+            {
+                return this[Count - 1];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Does this list have any items.
+        /// </summary>
+        public bool Any()
+        {
+            return Node != null;
+        }
+
+        /// <summary>
+        /// Returns a list which contains all elements of <see cref="SyntaxTriviaList"/> in reversed order.
+        /// </summary>
+        /// <returns><see cref="Reversed"/> which contains all elements of <see cref="SyntaxTriviaList"/> in reversed order</returns>
+        public Reversed Reverse()
+        {
+            return new Reversed(this);
+        }
+
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        public int IndexOf(SyntaxTrivia triviaInList)
+        {
+            for (int i = 0, n = Count; i < n; i++)
+            {
+                var trivia = this[i];
+                if (trivia == triviaInList)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        internal int IndexOf(SyntaxKind kind)
+        {
+            for (int i = 0, n = Count; i < n; i++)
+            {
+                if (this[i].Kind == kind)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia added to the end.
+        /// </summary>
+        /// <param name="trivia">The trivia to add.</param>
+        public SyntaxTriviaList Add(SyntaxTrivia trivia)
+        {
+            return Insert(Count, trivia);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia added to the end.
+        /// </summary>
+        /// <param name="trivia">The trivia to add.</param>
+        public SyntaxTriviaList AddRange(IEnumerable<SyntaxTrivia> trivia)
+        {
+            return InsertRange(Count, trivia);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia inserted at the index.
+        /// </summary>
+        /// <param name="index">The index in the list to insert the trivia at.</param>
+        /// <param name="trivia">The trivia to insert.</param>
+        public SyntaxTriviaList Insert(int index, SyntaxTrivia trivia)
+        {
+            if (trivia == default(SyntaxTrivia))
+            {
+                throw new ArgumentOutOfRangeException(nameof(trivia));
+            }
+
+            return InsertRange(index, new[] { trivia });
+        }
+
+        private static readonly ObjectPool<SyntaxTriviaListBuilder> s_builderPool =
+            new ObjectPool<SyntaxTriviaListBuilder>(() => SyntaxTriviaListBuilder.Create());
+
+        private static SyntaxTriviaListBuilder GetBuilder()
+            => s_builderPool.Allocate();
+
+        private static void ClearAndFreeBuilder(SyntaxTriviaListBuilder builder)
+        {
+            // It's possible someone might create a list with a huge amount of trivia
+            // in it.  We don't want to hold onto such items forever.  So only cache
+            // reasonably sized lists.  In IDE testing, around 99% of all trivia lists
+            // were 16 or less elements.
+            const int MaxBuilderCount = 16;
+            if (builder.Count <= MaxBuilderCount)
+            {
+                builder.Clear();
+                s_builderPool.Free(builder);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia inserted at the index.
+        /// </summary>
+        /// <param name="index">The index in the list to insert the trivia at.</param>
+        /// <param name="trivia">The trivia to insert.</param>
+        public SyntaxTriviaList InsertRange(int index, IEnumerable<SyntaxTrivia> trivia)
+        {
+            var thisCount = Count;
+            if (index < 0 || index > thisCount)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (trivia == null)
+            {
+                throw new ArgumentNullException(nameof(trivia));
+            }
+
+            // Just return ourselves if we're not being asked to add anything.
+            if (trivia is ICollection<SyntaxTrivia> triviaCollection && triviaCollection.Count == 0)
+            {
+                return this;
+            }
+
+            var builder = GetBuilder();
+            try
+            {
+                for (var i = 0; i < index; i++)
+                {
+                    builder.Add(this[i]);
+                }
+
+                builder.AddRange(trivia);
+
+                for (var i = index; i < thisCount; i++)
+                {
+                    builder.Add(this[i]);
+                }
+
+                return builder.Count == thisCount ? this : builder.ToList();
+            }
+            finally
+            {
+                ClearAndFreeBuilder(builder);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the element at the specified index removed.
+        /// </summary>
+        /// <param name="index">The index identifying the element to remove.</param>
+        public SyntaxTriviaList RemoveAt(int index)
+        {
+            if (index < 0 || index >= Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            var list = this.ToList();
+            list.RemoveAt(index);
+            return new SyntaxTriviaList(list);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified element removed.
+        /// </summary>
+        /// <param name="triviaInList">The trivia element to remove.</param>
+        public SyntaxTriviaList Remove(SyntaxTrivia triviaInList)
+        {
+            var index = IndexOf(triviaInList);
+            if (index >= 0 && index < Count)
+            {
+                return RemoveAt(index);
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified element replaced with new trivia.
+        /// </summary>
+        /// <param name="triviaInList">The trivia element to replace.</param>
+        /// <param name="newTrivia">The trivia to replace the element with.</param>
+        public SyntaxTriviaList Replace(SyntaxTrivia triviaInList, SyntaxTrivia newTrivia)
+        {
+            if (newTrivia == default(SyntaxTrivia))
+            {
+                throw new ArgumentOutOfRangeException(nameof(newTrivia));
+            }
+
+            return ReplaceRange(triviaInList, new[] { newTrivia });
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified element replaced with new trivia.
+        /// </summary>
+        /// <param name="triviaInList">The trivia element to replace.</param>
+        /// <param name="newTrivia">The trivia to replace the element with.</param>
+        public SyntaxTriviaList ReplaceRange(SyntaxTrivia triviaInList, IEnumerable<SyntaxTrivia> newTrivia)
+        {
+            var index = IndexOf(triviaInList);
+            if (index >= 0 && index < Count)
+            {
+                var list = this.ToList();
+                list.RemoveAt(index);
+                list.InsertRange(index, newTrivia);
+                return new SyntaxTriviaList(list);
+            }
+
+            throw new ArgumentOutOfRangeException(nameof(triviaInList));
+        }
+
+        // for debugging
+        private SyntaxTrivia[] Nodes => this.ToArray();
+
+        IEnumerator<SyntaxTrivia> IEnumerable<SyntaxTrivia>.GetEnumerator()
+        {
+            if (Node == null)
+            {
+                return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+            }
+
+            return new EnumeratorImpl(this);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            if (Node == null)
+            {
+                return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+            }
+
+            return new EnumeratorImpl(this);
+        }
+
+        /// <summary>
+        /// get the green node at the specific slot
+        /// </summary>
+        private SyntaxNode GetNodeAt(int i)
+        {
+            return GetNodeAt(Node, i);
+        }
+
+        private static SyntaxNode GetNodeAt(SyntaxNode node, int i)
+        {
+            Debug.Assert(node.IsList || (i == 0 && !node.IsList));
+            return node.IsList ? node.GetNodeSlot(i) : node;
+        }
+
+        public bool Equals(SyntaxTriviaList other)
+        {
+            return Node == other.Node && Index == other.Index;
+        }
+
+        public static bool operator ==(SyntaxTriviaList left, SyntaxTriviaList right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(SyntaxTriviaList left, SyntaxTriviaList right)
+        {
+            return !left.Equals(right);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return (obj is SyntaxTriviaList) && Equals((SyntaxTriviaList)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = HashCodeCombiner.Start();
+            hash.Add(Node);
+            hash.Add(Index);
+            return hash.CombinedHash;
+        }
+
+        /// <summary>
+        /// Copy <paramref name="count"/> number of items starting at <paramref name="offset"/> from this list into <paramref name="array"/> starting at <paramref name="arrayOffset"/>.
+        /// </summary>
+        internal void CopyTo(int offset, SyntaxTrivia[] array, int arrayOffset, int count)
+        {
+            if (offset < 0 || count < 0 || Count < offset + count)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            if (count == 0)
+            {
+                return;
+            }
+
+            // get first one without creating any red node
+            var first = this[offset];
+            array[arrayOffset] = first;
+
+            // calculate trivia position from the first ourselves from now on
+            var position = first.Position;
+            var current = first;
+
+            for (var i = 1; i < count; i++)
+            {
+                position += current.FullWidth;
+                current = GetNodeAt(offset + i) as SyntaxTrivia;
+
+                array[arrayOffset + i] = current;
+            }
+        }
+
+        public override string ToString()
+        {
+            return Node != null ? Node.ToString() : string.Empty;
+        }
+
+        public string ToFullString()
+        {
+            return Node != null ? Node.ToFullString() : string.Empty;
+        }
+
+        public static SyntaxTriviaList Create(SyntaxTrivia trivia)
+        {
+            return new SyntaxTriviaList(trivia);
+        }
+
+        /// <summary>
+        /// Reversed enumerable.
+        /// </summary>
+        public struct Reversed : IEnumerable<SyntaxTrivia>, IEquatable<Reversed>
+        {
+            private SyntaxTriviaList _list;
+
+            public Reversed(in SyntaxTriviaList list)
+            {
+                _list = list;
+            }
+
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(in _list);
+            }
+
+            IEnumerator<SyntaxTrivia> IEnumerable<SyntaxTrivia>.GetEnumerator()
+            {
+                if (_list.Count == 0)
+                {
+                    return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+                }
+
+                return new ReversedEnumeratorImpl(in _list);
+            }
+
+            IEnumerator
+                IEnumerable.GetEnumerator()
+            {
+                if (_list.Count == 0)
+                {
+                    return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+                }
+
+                return new ReversedEnumeratorImpl(in _list);
+            }
+
+            public override int GetHashCode()
+            {
+                return _list.GetHashCode();
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is Reversed && Equals((Reversed)obj);
+            }
+
+            public bool Equals(Reversed other)
+            {
+                return _list.Equals(other._list);
+            }
+
+            [StructLayout(LayoutKind.Auto)]
+            public struct Enumerator
+            {
+                private readonly SyntaxNode _singleNodeOrList;
+                private readonly int _baseIndex;
+                private readonly int _count;
+
+                private int _index;
+                private SyntaxNode _current;
+                private int _position;
+
+                public Enumerator(in SyntaxTriviaList list)
+                    : this()
+                {
+                    if (list.Any())
+                    {
+                        _singleNodeOrList = list.Node;
+                        _baseIndex = list.Index;
+                        _count = list.Count;
+
+                        _index = _count;
+                        _current = null;
+
+                        var last = list.Last();
+                        _position = last.Position + last.FullWidth;
+                    }
+                }
+
+                public bool MoveNext()
+                {
+                    if (_count == 0 || _index <= 0)
+                    {
+                        _current = null;
+                        return false;
+                    }
+
+                    _index--;
+
+                    _current = GetNodeAt(_singleNodeOrList, _index);
+                    _position -= _current.FullWidth;
+
+                    return true;
+                }
+
+                public SyntaxTrivia Current
+                {
+                    get
+                    {
+                        if (_current == null)
+                        {
+                            throw new InvalidOperationException();
+                        }
+
+                        return (SyntaxTrivia)_current;
+                    }
+                }
+            }
+
+            private class ReversedEnumeratorImpl : IEnumerator<SyntaxTrivia>
+            {
+                private Enumerator _enumerator;
+
+                // SyntaxTriviaList is a relatively big struct so is passed as ref
+                internal ReversedEnumeratorImpl(in SyntaxTriviaList list)
+                {
+                    _enumerator = new Enumerator(in list);
+                }
+
+                public SyntaxTrivia Current => _enumerator.Current;
+
+                object IEnumerator.Current => _enumerator.Current;
+
+                public bool MoveNext()
+                {
+                    return _enumerator.MoveNext();
+                }
+
+                public void Reset()
+                {
+                    throw new NotSupportedException();
+                }
+
+                public void Dispose()
+                {
+                }
+            }
+        }
+
+        [StructLayout(LayoutKind.Auto)]
+        public struct Enumerator
+        {
+            private SyntaxNode _singleNodeOrList;
+            private int _baseIndex;
+            private int _count;
+
+            private int _index;
+            private SyntaxNode _current;
+            private int _position;
+
+            internal Enumerator(in SyntaxTriviaList list)
+            {
+                _singleNodeOrList = list.Node;
+                _baseIndex = list.Index;
+                _count = list.Count;
+
+                _index = -1;
+                _current = null;
+                _position = list.Position;
+            }
+
+            private void InitializeFrom(SyntaxNode node, int index, int position)
+            {
+                _singleNodeOrList = node;
+                _baseIndex = index;
+                _count = node.IsList ? node.SlotCount : 1;
+
+                _index = -1;
+                _current = null;
+                _position = position;
+            }
+
+            // PERF: Used to initialize an enumerator for leading trivia directly from a token.
+            // This saves constructing an intermediate SyntaxTriviaList. Also, passing token
+            // by ref since it's a non-trivial struct
+            internal void InitializeFromLeadingTrivia(in SyntaxToken token)
+            {
+                InitializeFrom(token.GetLeadingTrivia().Node, 0, token.Position);
+            }
+
+            // PERF: Used to initialize an enumerator for trailing trivia directly from a token.
+            // This saves constructing an intermediate SyntaxTriviaList. Also, passing token
+            // by ref since it's a non-trivial struct
+            internal void InitializeFromTrailingTrivia(in SyntaxToken token)
+            {
+                var leading = token.GetLeadingTrivia().Node;
+                var index = 0;
+                if (leading != null)
+                {
+                    index = leading.IsList ? leading.SlotCount : 1;
+                }
+
+                var trailing = token.GetTrailingTrivia().Node;
+                var trailingPosition = token.Position + token.FullWidth;
+                if (trailing != null)
+                {
+                    trailingPosition -= trailing.FullWidth;
+                }
+
+                InitializeFrom(trailing, index, trailingPosition);
+            }
+
+            public bool MoveNext()
+            {
+                var newIndex = _index + 1;
+                if (newIndex >= _count)
+                {
+                    // invalidate iterator
+                    _current = null;
+                    return false;
+                }
+
+                _index = newIndex;
+
+                if (_current != null)
+                {
+                    _position += _current.FullWidth;
+                }
+
+                _current = GetNodeAt(_singleNodeOrList, newIndex);
+                return true;
+            }
+
+            public SyntaxTrivia Current
+            {
+                get
+                {
+                    if (_current == null)
+                    {
+                        throw new InvalidOperationException();
+                    }
+
+                    return _current as SyntaxTrivia;
+                }
+            }
+
+            internal bool TryMoveNextAndGetCurrent(out SyntaxTrivia current)
+            {
+                if (!MoveNext())
+                {
+                    current = default;
+                    return false;
+                }
+
+                current = _current as SyntaxTrivia;
+                return true;
+            }
+        }
+
+        private class EnumeratorImpl : IEnumerator<SyntaxTrivia>
+        {
+            private Enumerator _enumerator;
+
+            // SyntaxTriviaList is a relatively big struct so is passed as ref
+            internal EnumeratorImpl(in SyntaxTriviaList list)
+            {
+                _enumerator = new Enumerator(list);
+            }
+
+            public SyntaxTrivia Current => _enumerator.Current;
+
+            object IEnumerator.Current => _enumerator.Current;
+
+            public bool MoveNext()
+            {
+                return _enumerator.MoveNext();
+            }
+
+            public void Reset()
+            {
+                throw new NotSupportedException();
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaListBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaListBuilder.cs
new file mode 100644
index 0000000000..aa0a8caaec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxTriviaListBuilder.cs
@@ -0,0 +1,138 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxTriviaListBuilder
+    {
+        private SyntaxTrivia[] _nodes;
+
+        public SyntaxTriviaListBuilder(int size)
+        {
+            _nodes = new SyntaxTrivia[size];
+        }
+
+        public static SyntaxTriviaListBuilder Create()
+        {
+            return new SyntaxTriviaListBuilder(4);
+        }
+
+        public static SyntaxTriviaList Create(IEnumerable<SyntaxTrivia> trivia)
+        {
+            if (trivia == null)
+            {
+                return new SyntaxTriviaList();
+            }
+
+            var builder = Create();
+            builder.AddRange(trivia);
+            return builder.ToList();
+        }
+
+        public int Count { get; private set; }
+
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        public SyntaxTrivia this[int index]
+        {
+            get
+            {
+                if (index < 0 || index > Count)
+                {
+                    throw new IndexOutOfRangeException();
+                }
+
+                return _nodes[index];
+            }
+        }
+
+        public void AddRange(IEnumerable<SyntaxTrivia> items)
+        {
+            if (items != null)
+            {
+                foreach (var item in items)
+                {
+                    Add(item);
+                }
+            }
+        }
+
+        public SyntaxTriviaListBuilder Add(SyntaxTrivia item)
+        {
+            if (_nodes == null || Count >= _nodes.Length)
+            {
+                Grow(Count == 0 ? 8 : _nodes.Length * 2);
+            }
+
+            _nodes[Count++] = item;
+            return this;
+        }
+
+        public void Add(SyntaxTrivia[] items)
+        {
+            Add(items, 0, items.Length);
+        }
+
+        public void Add(SyntaxTrivia[] items, int offset, int length)
+        {
+            if (_nodes == null || Count + length > _nodes.Length)
+            {
+                Grow(Count + length);
+            }
+
+            Array.Copy(items, offset, _nodes, Count, length);
+            Count += length;
+        }
+
+        public void Add(in SyntaxTriviaList list)
+        {
+            Add(list, 0, list.Count);
+        }
+
+        public void Add(in SyntaxTriviaList list, int offset, int length)
+        {
+            if (_nodes == null || Count + length > _nodes.Length)
+            {
+                Grow(Count + length);
+            }
+
+            list.CopyTo(offset, _nodes, Count, length);
+            Count += length;
+        }
+
+        private void Grow(int size)
+        {
+            var tmp = new SyntaxTrivia[size];
+            Array.Copy(_nodes, tmp, _nodes.Length);
+            _nodes = tmp;
+        }
+
+        public static implicit operator SyntaxTriviaList(SyntaxTriviaListBuilder builder)
+        {
+            return builder.ToList();
+        }
+
+        public SyntaxTriviaList ToList()
+        {
+            if (Count > 0)
+            {
+                var tmp = new ArrayElement<GreenNode>[Count];
+                for (var i = 0; i < Count; i++)
+                {
+                    tmp[i].Value = _nodes[i].Green;
+                }
+                return new SyntaxTriviaList(InternalSyntax.SyntaxList.List(tmp).CreateRed(), position: 0, index: 0);
+            }
+            else
+            {
+                return default(SyntaxTriviaList);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxVisitor.cs
new file mode 100644
index 0000000000..2ff23683f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxVisitor.cs
@@ -0,0 +1,70 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Represents a <see cref="SyntaxNode"/> visitor that visits only the single SyntaxNode
+    /// passed into its Visit method and produces 
+    /// a value of the type specified by the <typeparamref name="TResult"/> parameter.
+    /// </summary>
+    /// <typeparam name="TResult">
+    /// The type of the return value this visitor's Visit method.
+    /// </typeparam>
+    internal abstract partial class SyntaxVisitor<TResult>
+    {
+        public virtual TResult Visit(SyntaxNode node)
+        {
+            if (node != null)
+            {
+                return node.Accept(this);
+            }
+
+            return default(TResult);
+        }
+
+        public virtual TResult VisitToken(SyntaxToken token)
+        {
+            return DefaultVisit(token);
+        }
+
+        public virtual TResult VisitTrivia(SyntaxTrivia trivia)
+        {
+            return DefaultVisit(trivia);
+        }
+
+        protected virtual TResult DefaultVisit(SyntaxNode node)
+        {
+            return default(TResult);
+        }
+    }
+
+    /// <summary>
+    /// Represents a <see cref="SyntaxNode"/> visitor that visits only the single SyntaxNode
+    /// passed into its Visit method.
+    /// </summary>
+    internal abstract partial class SyntaxVisitor
+    {
+        public virtual void Visit(SyntaxNode node)
+        {
+            if (node != null)
+            {
+                node.Accept(this);
+            }
+        }
+
+        public virtual void VisitToken(SyntaxToken token)
+        {
+            DefaultVisit(token);
+        }
+
+        public virtual void VisitTrivia(SyntaxTrivia trivia)
+        {
+            DefaultVisit(trivia);
+        }
+
+        public virtual void DefaultVisit(SyntaxNode node)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs
new file mode 100644
index 0000000000..214a0039fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs
@@ -0,0 +1,55 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Represents a <see cref="SyntaxVisitor"/> that descends an entire <see cref="SyntaxNode"/> graph
+    /// visiting each SyntaxNode and its child SyntaxNodes and <see cref="SyntaxToken"/>s in depth-first order.
+    /// </summary>
+    internal abstract class SyntaxWalker : SyntaxVisitor
+    {
+        public override void Visit(SyntaxNode node)
+        {
+            node?.Accept(this);
+        }
+
+        public override void DefaultVisit(SyntaxNode node)
+        {
+            var children = node.ChildNodes();
+            for (var i = 0; i < children.Count; i++)
+            {
+                var child = children[i];
+                Visit(child);
+            }
+        }
+
+        public override void VisitToken(SyntaxToken token)
+        {
+            VisitLeadingTrivia(token);
+            VisitTrailingTrivia(token);
+        }
+
+        public virtual void VisitLeadingTrivia(SyntaxToken token)
+        {
+            if (token.HasLeadingTrivia)
+            {
+                foreach (var trivia in token.GetLeadingTrivia())
+                {
+                    VisitTrivia(trivia);
+                }
+            }
+        }
+
+        public virtual void VisitTrailingTrivia(SyntaxToken token)
+        {
+            if (token.HasTrailingTrivia)
+            {
+                foreach (var trivia in token.GetTrailingTrivia())
+                {
+                    VisitTrivia(trivia);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/TextSpan.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/TextSpan.cs
new file mode 100644
index 0000000000..e80562b01b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/TextSpan.cs
@@ -0,0 +1,261 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Immutable abstract representation of a span of text.  For example, in an error diagnostic that reports a
+    /// location, it could come from a parsed string, text from a tool editor buffer, etc.
+    /// </summary>
+    internal readonly struct TextSpan : IEquatable<TextSpan>, IComparable<TextSpan>
+    {
+        /// <summary>
+        /// Creates a TextSpan instance beginning with the position Start and having the Length
+        /// specified with <paramref name="length" />.
+        /// </summary>
+        public TextSpan(int start, int length)
+        {
+            if (start < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start));
+            }
+
+            if (start + length < start)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            Start = start;
+            Length = length;
+        }
+
+        /// <summary>
+        /// Start point of the span.
+        /// </summary>
+        public int Start { get; }
+
+        /// <summary>
+        /// End of the span.
+        /// </summary>
+        public int End => Start + Length;
+
+        /// <summary>
+        /// Length of the span.
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Determines whether or not the span is empty.
+        /// </summary>
+        public bool IsEmpty => Length == 0;
+
+        /// <summary>
+        /// Determines whether the position lies within the span.
+        /// </summary>
+        /// <param name="position">
+        /// The position to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the position is greater than or equal to Start and strictly less
+        /// than End, otherwise <c>false</c>.
+        /// </returns>
+        public bool Contains(int position)
+        {
+            return unchecked((uint)(position - Start) < (uint)Length);
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="span"/> falls completely within this span.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the specified span falls completely within this span, otherwise <c>false</c>.
+        /// </returns>
+        public bool Contains(TextSpan span)
+        {
+            return span.Start >= Start && span.End <= End;
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="span"/> overlaps this span. Two spans are considered to overlap
+        /// if they have positions in common and neither is empty. Empty spans do not overlap with any
+        /// other span.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the spans overlap, otherwise <c>false</c>.
+        /// </returns>
+        public bool OverlapsWith(TextSpan span)
+        {
+            var overlapStart = Math.Max(Start, span.Start);
+            var overlapEnd = Math.Min(End, span.End);
+
+            return overlapStart < overlapEnd;
+        }
+
+        /// <summary>
+        /// Returns the overlap with the given span, or null if there is no overlap.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// The overlap of the spans, or null if the overlap is empty.
+        /// </returns>
+        public TextSpan? Overlap(TextSpan span)
+        {
+            var overlapStart = Math.Max(Start, span.Start);
+            var overlapEnd = Math.Min(End, span.End);
+
+            return overlapStart < overlapEnd
+                ? FromBounds(overlapStart, overlapEnd)
+                : (TextSpan?)null;
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="span"/> intersects this span. Two spans are considered to
+        /// intersect if they have positions in common or the end of one span
+        /// coincides with the start of the other span.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the spans intersect, otherwise <c>false</c>.
+        /// </returns>
+        public bool IntersectsWith(TextSpan span)
+        {
+            return span.Start <= End && span.End >= Start;
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="position"/> intersects this span.
+        /// A position is considered to intersect if it is between the start and
+        /// end positions (inclusive) of this span.
+        /// </summary>
+        /// <param name="position">
+        /// The position to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the position intersects, otherwise <c>false</c>.
+        /// </returns>
+        public bool IntersectsWith(int position)
+        {
+            return unchecked((uint)(position - Start) <= (uint)Length);
+        }
+
+        /// <summary>
+        /// Returns the intersection with the given span, or null if there is no intersection.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// The intersection of the spans, or null if the intersection is empty.
+        /// </returns>
+        public TextSpan? Intersection(TextSpan span)
+        {
+            var intersectStart = Math.Max(Start, span.Start);
+            var intersectEnd = Math.Min(End, span.End);
+
+            return intersectStart <= intersectEnd
+                ? FromBounds(intersectStart, intersectEnd)
+                : (TextSpan?)null;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="TextSpan"/> from <paramref name="start" /> and <paramref
+        /// name="end"/> positions as opposed to a position and length.
+        ///
+        /// The returned TextSpan contains the range with <paramref name="start"/> inclusive,
+        /// and <paramref name="end"/> exclusive.
+        /// </summary>
+        public static TextSpan FromBounds(int start, int end)
+        {
+            if (start < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start), "start must not be negative");
+            }
+
+            if (end < start)
+            {
+                throw new ArgumentOutOfRangeException(nameof(end), "end must not be less than start");
+            }
+
+            return new TextSpan(start, end - start);
+        }
+
+        /// <summary>
+        /// Determines if two instances of <see cref="TextSpan"/> are the same.
+        /// </summary>
+        public static bool operator ==(TextSpan left, TextSpan right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Determines if two instances of <see cref="TextSpan"/> are different.
+        /// </summary>
+        public static bool operator !=(TextSpan left, TextSpan right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <summary>
+        /// Determines if current instance of <see cref="TextSpan"/> is equal to another.
+        /// </summary>
+        public bool Equals(TextSpan other)
+        {
+            return Start == other.Start && Length == other.Length;
+        }
+
+        /// <summary>
+        /// Determines if current instance of <see cref="TextSpan"/> is equal to another.
+        /// </summary>
+        public override bool Equals(object obj)
+        {
+            return obj is TextSpan && Equals((TextSpan)obj);
+        }
+
+        /// <summary>
+        /// Produces a hash code for <see cref="TextSpan"/>.
+        /// </summary>
+        public override int GetHashCode()
+        {
+            var combiner = new HashCodeCombiner();
+            combiner.Add(Start);
+            combiner.Add(Length);
+
+            return combiner.CombinedHash;
+        }
+
+        /// <summary>
+        /// Provides a string representation for <see cref="TextSpan"/>.
+        /// </summary>
+        public override string ToString()
+        {
+            return $"[{Start}..{End})";
+        }
+
+        /// <summary>
+        /// Compares current instance of <see cref="TextSpan"/> with another.
+        /// </summary>
+        public int CompareTo(TextSpan other)
+        {
+            var diff = Start - other.Start;
+            if (diff != 0)
+            {
+                return diff;
+            }
+
+            return Length - other.Length;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs
new file mode 100644
index 0000000000..a3f15f1708
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperAttributeInfo
+    {
+        public TagHelperAttributeInfo(
+            string name,
+            AttributeStructure attributeStructure,
+            bool bound)
+        {
+            Name = name;
+            AttributeStructure = attributeStructure;
+            Bound = bound;
+        }
+
+        public string Name { get; }
+
+        public AttributeStructure AttributeStructure { get; }
+
+        public bool Bound { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinder.cs
new file mode 100644
index 0000000000..067f9d1304
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinder.cs
@@ -0,0 +1,137 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// Enables retrieval of <see cref="TagHelperBinding"/>'s.
+    /// </summary>
+    internal class TagHelperBinder
+    {
+        private IDictionary<string, HashSet<TagHelperDescriptor>> _registrations;
+        private readonly string _tagHelperPrefix;
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="TagHelperBinder"/>.
+        /// </summary>
+        /// <param name="tagHelperPrefix">The tag helper prefix being used by the document.</param>
+        /// <param name="descriptors">The descriptors that the <see cref="TagHelperBinder"/> will pull from.</param>
+        public TagHelperBinder(string tagHelperPrefix, IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            _tagHelperPrefix = tagHelperPrefix;
+            _registrations = new Dictionary<string, HashSet<TagHelperDescriptor>>(StringComparer.OrdinalIgnoreCase);
+
+            // Populate our registrations
+            foreach (var descriptor in descriptors)
+            {
+                Register(descriptor);
+            }
+        }
+
+        /// <summary>
+        /// Gets all tag helpers that match the given HTML tag criteria.
+        /// </summary>
+        /// <param name="tagName">The name of the HTML tag to match. Providing a '*' tag name
+        /// retrieves catch-all <see cref="TagHelperDescriptor"/>s (descriptors that target every tag).</param>
+        /// <param name="attributes">Attributes on the HTML tag.</param>
+        /// <param name="parentTagName">The parent tag name of the given <paramref name="tagName"/> tag.</param>
+        /// <param name="parentIsTagHelper">Is the parent tag of the given <paramref name="tagName"/> tag a tag helper.</param>
+        /// <returns><see cref="TagHelperDescriptor"/>s that apply to the given HTML tag criteria.
+        /// Will return <c>null</c> if no <see cref="TagHelperDescriptor"/>s are a match.</returns>
+        public TagHelperBinding GetBinding(
+            string tagName,
+            IReadOnlyList<KeyValuePair<string, string>> attributes,
+            string parentTagName,
+            bool parentIsTagHelper)
+        {
+            if (!string.IsNullOrEmpty(_tagHelperPrefix) &&
+                (tagName.Length <= _tagHelperPrefix.Length ||
+                !tagName.StartsWith(_tagHelperPrefix, StringComparison.OrdinalIgnoreCase)))
+            {
+                // The tagName doesn't have the tag helper prefix, we can short circuit.
+                return null;
+            }
+
+            IEnumerable<TagHelperDescriptor> descriptors;
+
+            // Ensure there's a HashSet to use.
+            if (!_registrations.TryGetValue(TagHelperMatchingConventions.ElementCatchAllName, out HashSet<TagHelperDescriptor> catchAllDescriptors))
+            {
+                descriptors = new HashSet<TagHelperDescriptor>(TagHelperDescriptorComparer.Default);
+            }
+            else
+            {
+                descriptors = catchAllDescriptors;
+            }
+
+            // If we have a tag name associated with the requested name, we need to combine matchingDescriptors
+            // with all the catch-all descriptors.
+            if (_registrations.TryGetValue(tagName, out HashSet<TagHelperDescriptor> matchingDescriptors))
+            {
+                descriptors = matchingDescriptors.Concat(descriptors);
+            }
+
+            var tagNameWithoutPrefix = _tagHelperPrefix != null ? tagName.Substring(_tagHelperPrefix.Length) : tagName;
+            var parentTagNameWithoutPrefix = parentTagName;
+            if (_tagHelperPrefix != null && parentIsTagHelper)
+            {
+                parentTagNameWithoutPrefix = parentTagName.Substring(_tagHelperPrefix.Length);
+            }
+
+            Dictionary<TagHelperDescriptor, IReadOnlyList<TagMatchingRuleDescriptor>> applicableDescriptorMappings = null;
+            foreach (var descriptor in descriptors)
+            {
+                var applicableRules = descriptor.TagMatchingRules.Where(
+                    rule => TagHelperMatchingConventions.SatisfiesRule(tagNameWithoutPrefix, parentTagNameWithoutPrefix, attributes, rule));
+
+                if (applicableRules.Any())
+                {
+                    if (applicableDescriptorMappings == null)
+                    {
+                        applicableDescriptorMappings = new Dictionary<TagHelperDescriptor, IReadOnlyList<TagMatchingRuleDescriptor>>();
+                    }
+
+                    applicableDescriptorMappings[descriptor] = applicableRules.ToList();
+                }
+            }
+
+            if (applicableDescriptorMappings == null)
+            {
+                return null;
+            }
+
+            var tagHelperBinding = new TagHelperBinding(
+                tagName,
+                attributes,
+                parentTagName,
+                applicableDescriptorMappings,
+                _tagHelperPrefix);
+
+            return tagHelperBinding;
+        }
+
+        private void Register(TagHelperDescriptor descriptor)
+        {
+            foreach (var rule in descriptor.TagMatchingRules)
+            {
+                var registrationKey =
+                    string.Equals(rule.TagName, TagHelperMatchingConventions.ElementCatchAllName, StringComparison.Ordinal) ?
+                    TagHelperMatchingConventions.ElementCatchAllName :
+                    _tagHelperPrefix + rule.TagName;
+
+                // Ensure there's a HashSet to add the descriptor to.
+                if (!_registrations.TryGetValue(registrationKey, out HashSet<TagHelperDescriptor> descriptorSet))
+                {
+                    descriptorSet = new HashSet<TagHelperDescriptor>(TagHelperDescriptorComparer.Default);
+                    _registrations[registrationKey] = descriptorSet;
+                }
+
+                descriptorSet.Add(descriptor);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs
new file mode 100644
index 0000000000..a5590c536e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs
@@ -0,0 +1,42 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public sealed class TagHelperBinding
+    {
+        private IReadOnlyDictionary<TagHelperDescriptor, IReadOnlyList<TagMatchingRuleDescriptor>> _mappings;
+
+        internal TagHelperBinding(
+            string tagName,
+            IReadOnlyList<KeyValuePair<string, string>> attributes,
+            string parentTagName,
+            IReadOnlyDictionary<TagHelperDescriptor, IReadOnlyList<TagMatchingRuleDescriptor>> mappings,
+            string tagHelperPrefix)
+        {
+            TagName = tagName;
+            Attributes = attributes;
+            ParentTagName = parentTagName;
+            TagHelperPrefix = tagHelperPrefix;
+
+            _mappings = mappings;
+        }
+
+        public IEnumerable<TagHelperDescriptor> Descriptors => _mappings.Keys;
+
+        public string TagName { get; }
+
+        public string ParentTagName { get; }
+
+        public IReadOnlyList<KeyValuePair<string, string>> Attributes { get; }
+
+        public string TagHelperPrefix { get; }
+
+        public IReadOnlyList<TagMatchingRuleDescriptor> GetBoundRules(TagHelperDescriptor descriptor)
+        {
+            return _mappings[descriptor];
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperConventions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperConventions.cs
new file mode 100644
index 0000000000..60618a61f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperConventions.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TagHelperConventions
+    {
+        public static readonly string DefaultKind = "ITagHelper";
+
+        public static readonly string ComponentKind = "IComponent";
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs
new file mode 100644
index 0000000000..7c81d5e94f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class TagHelperDescriptor : IEquatable<TagHelperDescriptor>
+    {
+        private IEnumerable<RazorDiagnostic> _allDiagnostics;
+
+        protected TagHelperDescriptor(string kind)
+        {
+            Kind = kind;
+        }
+
+        public string Kind { get; }
+
+        public string Name { get; protected set; }
+
+        public IReadOnlyList<TagMatchingRuleDescriptor> TagMatchingRules { get; protected set; }
+
+        public string AssemblyName { get; protected set; }
+
+        public IReadOnlyList<BoundAttributeDescriptor> BoundAttributes { get; protected set; }
+
+        public IReadOnlyList<AllowedChildTagDescriptor> AllowedChildTags { get; protected set; }
+
+        public string Documentation { get; protected set; }
+
+        public string DisplayName { get; protected set; }
+
+        public string TagOutputHint { get; protected set; }
+
+        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
+
+        public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                var allDiagnostics = GetAllDiagnostics();
+                var errors = allDiagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+
+                return errors;
+            }
+        }
+
+        public virtual IEnumerable<RazorDiagnostic> GetAllDiagnostics()
+        {
+            if (_allDiagnostics == null)
+            {
+                var allowedChildTagDiagnostics = AllowedChildTags.SelectMany(childTag => childTag.Diagnostics);
+                var attributeDiagnostics = BoundAttributes.SelectMany(attribute => attribute.Diagnostics);
+                var ruleDiagnostics = TagMatchingRules.SelectMany(rule => rule.GetAllDiagnostics());
+                var combinedDiagnostics = allowedChildTagDiagnostics
+                    .Concat(attributeDiagnostics)
+                    .Concat(ruleDiagnostics)
+                    .Concat(Diagnostics);
+                _allDiagnostics = combinedDiagnostics.ToArray();
+            }
+
+            return _allDiagnostics;
+        }
+
+        public override string ToString()
+        {
+            return DisplayName ?? base.ToString();
+        }
+
+        public bool Equals(TagHelperDescriptor other)
+        {
+            return TagHelperDescriptorComparer.Default.Equals(this, other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as TagHelperDescriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            return TagHelperDescriptorComparer.Default.GetHashCode(this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs
new file mode 100644
index 0000000000..57a75bf50a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs
@@ -0,0 +1,77 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class TagHelperDescriptorBuilder
+    {
+        public static TagHelperDescriptorBuilder Create(string name, string assemblyName)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (assemblyName == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyName));
+            }
+
+            return new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, name, assemblyName);
+        }
+
+        public static TagHelperDescriptorBuilder Create(string kind, string name, string assemblyName)
+        {
+            if (kind == null)
+            {
+                throw new ArgumentNullException(nameof(kind));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (assemblyName == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyName));
+            }
+
+            return new DefaultTagHelperDescriptorBuilder(kind, name, assemblyName);
+        }
+
+        public abstract string Name { get; }
+
+        public abstract string AssemblyName { get; }
+
+        public abstract string Kind { get; }
+
+        public abstract string DisplayName { get; set; }
+
+        public abstract string TagOutputHint { get; set; }
+
+        public abstract string Documentation { get; set; }
+
+        public abstract IDictionary<string, string> Metadata { get; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+
+        public abstract IReadOnlyList<AllowedChildTagDescriptorBuilder> AllowedChildTags { get; }
+
+        public abstract IReadOnlyList<BoundAttributeDescriptorBuilder> BoundAttributes { get; }
+
+        public abstract IReadOnlyList<TagMatchingRuleDescriptorBuilder> TagMatchingRules { get; }
+
+        public abstract void AllowChildTag(Action<AllowedChildTagDescriptorBuilder> configure);
+
+        public abstract void BindAttribute(Action<BoundAttributeDescriptorBuilder> configure);
+
+        public abstract void TagMatchingRule(Action<TagMatchingRuleDescriptorBuilder> configure);
+
+        public abstract TagHelperDescriptor Build();
+
+        public abstract void Reset();
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..e691035561
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilderExtensions.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TagHelperDescriptorBuilderExtensions
+    {
+        public static void SetTypeName(this TagHelperDescriptorBuilder builder, string typeName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (typeName == null)
+            {
+                throw new ArgumentNullException(nameof(typeName));
+            }
+
+            builder.Metadata[TagHelperMetadata.Common.TypeName] = typeName;
+        }
+
+        public static string GetTypeName(this TagHelperDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (builder.Metadata.ContainsKey(TagHelperMetadata.Common.TypeName))
+            {
+                return builder.Metadata[TagHelperMetadata.Common.TypeName];
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs
new file mode 100644
index 0000000000..5ca9c0fe91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs
@@ -0,0 +1,155 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperDescriptorComparer : IEqualityComparer<TagHelperDescriptor>
+    {
+        /// <summary>
+        /// A default instance of the <see cref="TagHelperDescriptorComparer"/>.
+        /// </summary>
+        public static readonly TagHelperDescriptorComparer Default = new TagHelperDescriptorComparer();
+
+        /// <summary>
+        /// A default instance of the <see cref="TagHelperDescriptorComparer"/> that does case-sensitive comparison.
+        /// </summary>
+        internal static readonly TagHelperDescriptorComparer CaseSensitive =
+            new TagHelperDescriptorComparer(caseSensitive: true);
+
+        private readonly StringComparer _stringComparer;
+        private readonly StringComparison _stringComparison;
+        private readonly AllowedChildTagDescriptorComparer _AllowedChildTagDescriptorComparer;
+        private readonly BoundAttributeDescriptorComparer _boundAttributeComparer;
+        private readonly TagMatchingRuleDescriptorComparer _tagMatchingRuleComparer;
+
+        private TagHelperDescriptorComparer(bool caseSensitive = false)
+        {
+            if (caseSensitive)
+            {
+                _stringComparer = StringComparer.Ordinal;
+                _stringComparison = StringComparison.Ordinal;
+                _AllowedChildTagDescriptorComparer = AllowedChildTagDescriptorComparer.CaseSensitive;
+                _boundAttributeComparer = BoundAttributeDescriptorComparer.CaseSensitive;
+                _tagMatchingRuleComparer = TagMatchingRuleDescriptorComparer.CaseSensitive;
+            }
+            else
+            {
+                _stringComparer = StringComparer.OrdinalIgnoreCase;
+                _stringComparison = StringComparison.OrdinalIgnoreCase;
+                _AllowedChildTagDescriptorComparer = AllowedChildTagDescriptorComparer.Default;
+                _boundAttributeComparer = BoundAttributeDescriptorComparer.Default;
+                _tagMatchingRuleComparer = TagMatchingRuleDescriptorComparer.Default;
+            }
+        }
+
+        public virtual bool Equals(TagHelperDescriptor descriptorX, TagHelperDescriptor descriptorY)
+        {
+            if (object.ReferenceEquals(descriptorX, descriptorY))
+            {
+                return true;
+            }
+
+            if (descriptorX == null ^ descriptorY == null)
+            {
+                return false;
+            }
+
+            if (descriptorX == null)
+            {
+                return false;
+            }
+
+            if (!string.Equals(descriptorX.Kind, descriptorY.Kind, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!string.Equals(descriptorX.AssemblyName, descriptorY.AssemblyName, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!string.Equals(descriptorX.Name, descriptorY.Name, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!Enumerable.SequenceEqual(
+                descriptorX.BoundAttributes.OrderBy(attribute => attribute.Name, _stringComparer),
+                descriptorY.BoundAttributes.OrderBy(attribute => attribute.Name, _stringComparer),
+                _boundAttributeComparer))
+            {
+                return false;
+            }
+
+            if (!Enumerable.SequenceEqual(
+                descriptorX.TagMatchingRules.OrderBy(rule => rule.TagName, _stringComparer),
+                descriptorY.TagMatchingRules.OrderBy(rule => rule.TagName, _stringComparer),
+                _tagMatchingRuleComparer))
+            {
+                return false;
+            }
+
+            if (!(descriptorX.AllowedChildTags == descriptorY.AllowedChildTags ||
+                (descriptorX.AllowedChildTags != null &&
+                descriptorY.AllowedChildTags != null &&
+                Enumerable.SequenceEqual(
+                    descriptorX.AllowedChildTags.OrderBy(childTag => childTag.Name, _stringComparer),
+                    descriptorY.AllowedChildTags.OrderBy(childTag => childTag.Name, _stringComparer),
+                    _AllowedChildTagDescriptorComparer))))
+            {
+                return false;
+            }
+
+            if (!string.Equals(descriptorX.Documentation, descriptorY.Documentation, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!string.Equals(descriptorX.TagOutputHint, descriptorY.TagOutputHint, _stringComparison))
+            {
+                return false;
+            }
+
+            if (!Enumerable.SequenceEqual(descriptorX.Diagnostics, descriptorY.Diagnostics))
+            {
+                return false;
+            }
+
+            if (!Enumerable.SequenceEqual(
+                descriptorX.Metadata.OrderBy(metadataX => metadataX.Key, StringComparer.Ordinal),
+                descriptorY.Metadata.OrderBy(metadataY => metadataY.Key, StringComparer.Ordinal)))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc />
+        public virtual int GetHashCode(TagHelperDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var hash = HashCodeCombiner.Start();
+            hash.Add(descriptor.Kind, StringComparer.Ordinal);
+            hash.Add(descriptor.AssemblyName, StringComparer.Ordinal);
+            hash.Add(descriptor.Name, StringComparer.Ordinal);
+
+            return hash.CombinedHash;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs
new file mode 100644
index 0000000000..f1f812d512
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TagHelperDescriptorExtensions
+    {
+        public static string GetTypeName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(TagHelperMetadata.Common.TypeName, out var typeName);
+            return typeName;
+        }
+
+        public static bool IsDefaultKind(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return string.Equals(tagHelper.Kind, TagHelperConventions.DefaultKind, StringComparison.Ordinal);
+        }
+
+        public static bool KindUsesDefaultTagHelperRuntime(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(TagHelperMetadata.Runtime.Name, out var value);
+            return string.Equals(TagHelperConventions.DefaultKind, value, StringComparison.Ordinal);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorProviderContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorProviderContext.cs
new file mode 100644
index 0000000000..4bf792c62d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorProviderContext.cs
@@ -0,0 +1,48 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class TagHelperDescriptorProviderContext
+    {
+        public virtual bool ExcludeHidden { get; set; }
+
+        public virtual bool IncludeDocumentation { get; set; }
+
+        public abstract ItemCollection Items { get; }
+
+        public abstract ICollection<TagHelperDescriptor> Results { get; }
+
+        public static TagHelperDescriptorProviderContext Create()
+        {
+            return new DefaultContext(new List<TagHelperDescriptor>());
+        }
+
+        public static TagHelperDescriptorProviderContext Create(ICollection<TagHelperDescriptor> results)
+        {
+            if (results == null)
+            {
+                throw new ArgumentNullException(nameof(results));
+            }
+
+            return new DefaultContext(results);
+        }
+
+        private class DefaultContext : TagHelperDescriptorProviderContext
+        {
+            public DefaultContext(ICollection<TagHelperDescriptor> results)
+            {
+                Results = results;
+
+                Items = new ItemCollection();
+            }
+
+            public override ItemCollection Items { get; }
+
+            public override ICollection<TagHelperDescriptor> Results { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDocumentContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDocumentContext.cs
new file mode 100644
index 0000000000..e5fa6e52f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDocumentContext.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// The binding information for Tag Helpers resulted to a <see cref="RazorCodeDocument"/>. Represents the
+    /// Tag Helper information after processing by directives.
+    /// </summary>
+    public abstract class TagHelperDocumentContext
+    {
+        public static TagHelperDocumentContext Create(string prefix, IEnumerable<TagHelperDescriptor> tagHelpers)
+        {
+            if (tagHelpers == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelpers));
+            }
+
+            return new DefaultTagHelperDocumentContext(prefix, tagHelpers.ToArray());
+        }
+
+        public abstract string Prefix { get; }
+
+        public abstract IReadOnlyList<TagHelperDescriptor> TagHelpers { get; }
+
+        private class DefaultTagHelperDocumentContext : TagHelperDocumentContext
+        {
+            private readonly string _prefix;
+            private readonly TagHelperDescriptor[] _tagHelpers;
+
+            public DefaultTagHelperDocumentContext(string prefix, TagHelperDescriptor[] tagHelpers)
+            {
+                _prefix = prefix;
+                _tagHelpers = tagHelpers;
+            }
+
+            public override string Prefix => _prefix;
+
+            public override IReadOnlyList<TagHelperDescriptor> TagHelpers => _tagHelpers;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperInfo.cs
new file mode 100644
index 0000000000..3cc665b4fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperInfo.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperInfo
+    {
+        public TagHelperInfo(
+            string tagName,
+            TagMode tagMode,
+            TagHelperBinding bindingResult)
+        {
+            TagName = tagName;
+            TagMode = tagMode;
+            BindingResult = bindingResult;
+        }
+
+        public string TagName { get; }
+
+        public TagMode TagMode { get; }
+
+        public TagHelperBinding BindingResult { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
new file mode 100644
index 0000000000..1fb483c7ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
@@ -0,0 +1,186 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal static class TagHelperMatchingConventions
+    {
+        public const string ElementCatchAllName = "*";
+
+        public const char ElementOptOutCharacter = '!';
+
+        public static bool SatisfiesRule(
+            string tagNameWithoutPrefix,
+            string parentTagNameWithoutPrefix,
+            IEnumerable<KeyValuePair<string, string>> tagAttributes,
+            TagMatchingRuleDescriptor rule)
+        {
+            if (tagNameWithoutPrefix == null)
+            {
+                throw new ArgumentNullException(nameof(tagNameWithoutPrefix));
+            }
+
+            if (tagAttributes == null)
+            {
+                throw new ArgumentNullException(nameof(tagAttributes));
+            }
+
+            if (rule == null)
+            {
+                throw new ArgumentNullException(nameof(rule));
+            }
+
+            var satisfiesTagName = SatisfiesTagName(tagNameWithoutPrefix, rule);
+            if (!satisfiesTagName)
+            {
+                return false;
+            }
+
+            var satisfiesParentTag = SatisfiesParentTag(parentTagNameWithoutPrefix, rule);
+            if (!satisfiesParentTag)
+            {
+                return false;
+            }
+
+            var satisfiesAttributes = SatisfiesAttributes(tagAttributes, rule);
+            if (!satisfiesAttributes)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool SatisfiesTagName(string tagNameWithoutPrefix, TagMatchingRuleDescriptor rule)
+        {
+            if (tagNameWithoutPrefix == null)
+            {
+                throw new ArgumentNullException(nameof(tagNameWithoutPrefix));
+            }
+
+            if (rule == null)
+            {
+                throw new ArgumentNullException(nameof(rule));
+            }
+
+            if (string.IsNullOrEmpty(tagNameWithoutPrefix))
+            {
+                return false;
+            }
+
+            if (tagNameWithoutPrefix[0] == ElementOptOutCharacter)
+            {
+                // TagHelpers can never satisfy tag names that are prefixed with the opt-out character.
+                return false;
+            }
+
+            if (rule.TagName != ElementCatchAllName &&
+                rule.TagName != null &&
+                !string.Equals(tagNameWithoutPrefix, rule.TagName, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool SatisfiesParentTag(string parentTagNameWithoutPrefix, TagMatchingRuleDescriptor rule)
+        {
+            if (rule == null)
+            {
+                throw new ArgumentNullException(nameof(rule));
+            }
+
+            if (rule.ParentTag != null && !string.Equals(parentTagNameWithoutPrefix, rule.ParentTag, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool SatisfiesAttributes(IEnumerable<KeyValuePair<string, string>> tagAttributes, TagMatchingRuleDescriptor rule)
+        {
+            if (tagAttributes == null)
+            {
+                throw new ArgumentNullException(nameof(tagAttributes));
+            }
+
+            if (rule == null)
+            {
+                throw new ArgumentNullException(nameof(rule));
+            }
+
+            if (!rule.Attributes.All(
+                requiredAttribute => tagAttributes.Any(
+                    attribute => SatisfiesRequiredAttribute(attribute.Key, attribute.Value, requiredAttribute))))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool CanSatisfyBoundAttribute(string name, BoundAttributeDescriptor descriptor)
+        {
+            return SatisfiesBoundAttributeName(name, descriptor) || SatisfiesBoundAttributeIndexer(name, descriptor);
+        }
+
+        public static bool SatisfiesBoundAttributeIndexer(string name, BoundAttributeDescriptor descriptor)
+        {
+            return descriptor.IndexerNamePrefix != null &&
+                !SatisfiesBoundAttributeName(name, descriptor) &&
+                name.StartsWith(descriptor.IndexerNamePrefix, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static bool SatisfiesBoundAttributeName(string name, BoundAttributeDescriptor descriptor)
+        {
+            return string.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase);
+        }
+
+        // Internal for testing
+        internal static bool SatisfiesRequiredAttribute(string attributeName, string attributeValue, RequiredAttributeDescriptor descriptor)
+        {
+            var nameMatches = false;
+            if (descriptor.NameComparison == RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+            {
+                nameMatches = string.Equals(descriptor.Name, attributeName, StringComparison.OrdinalIgnoreCase);
+            }
+            else if (descriptor.NameComparison == RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)
+            {
+                // attributeName cannot equal the Name if comparing as a PrefixMatch.
+                nameMatches = attributeName.Length != descriptor.Name.Length &&
+                    attributeName.StartsWith(descriptor.Name, StringComparison.OrdinalIgnoreCase);
+            }
+            else
+            {
+                Debug.Assert(false, "Unknown name comparison.");
+            }
+
+            if (!nameMatches)
+            {
+                return false;
+            }
+
+            switch (descriptor.ValueComparison)
+            {
+                case RequiredAttributeDescriptor.ValueComparisonMode.None:
+                    return true;
+                case RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch: // Value starts with
+                    return attributeValue.StartsWith(descriptor.Value, StringComparison.Ordinal);
+                case RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch: // Value ends with
+                    return attributeValue.EndsWith(descriptor.Value, StringComparison.Ordinal);
+                case RequiredAttributeDescriptor.ValueComparisonMode.FullMatch: // Value equals
+                    return string.Equals(attributeValue, descriptor.Value, StringComparison.Ordinal);
+                default:
+                    Debug.Assert(false, "Unknown value comparison.");
+                    return false;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs
new file mode 100644
index 0000000000..e53f471a57
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs
@@ -0,0 +1,20 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TagHelperMetadata
+    {
+        public static class Common
+        {
+            public static readonly string PropertyName = "Common.PropertyName";
+
+            public static readonly string TypeName = "Common.TypeName";
+        }
+
+        public static class Runtime
+        {
+            public static readonly string Name = "Runtime.Name";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperSpanVisitor.cs
new file mode 100644
index 0000000000..836a45ae98
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperSpanVisitor.cs
@@ -0,0 +1,31 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperSpanVisitor : SyntaxWalker
+    {
+        private RazorSourceDocument _source;
+        private List<TagHelperSpanInternal> _spans;
+
+        public TagHelperSpanVisitor(RazorSourceDocument source)
+        {
+            _source = source;
+            _spans = new List<TagHelperSpanInternal>();
+        }
+
+        public IReadOnlyList<TagHelperSpanInternal> TagHelperSpans => _spans;
+
+        public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+        {
+            var span = new TagHelperSpanInternal(node.GetSourceSpan(_source), node.TagHelperInfo.BindingResult);
+            _spans.Add(span);
+
+            base.VisitMarkupTagHelperElement(node);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs
new file mode 100644
index 0000000000..d4564b88e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs
@@ -0,0 +1,62 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class TagMatchingRuleDescriptor : IEquatable<TagMatchingRuleDescriptor>
+    {
+        private IEnumerable<RazorDiagnostic> _allDiagnostics;
+
+        public string TagName { get; protected set; }
+
+        public IReadOnlyList<RequiredAttributeDescriptor> Attributes { get; protected set; }
+
+        public string ParentTag { get; protected set; }
+
+        public TagStructure TagStructure { get; protected set; }
+
+        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                var allDiagnostics = GetAllDiagnostics();
+                var errors = allDiagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+
+                return errors;
+            }
+        }
+
+        public virtual IEnumerable<RazorDiagnostic> GetAllDiagnostics()
+        {
+            if (_allDiagnostics == null)
+            {
+                var attributeDiagnostics = Attributes.SelectMany(attribute => attribute.Diagnostics);
+                var combinedDiagnostics = Diagnostics.Concat(attributeDiagnostics);
+                _allDiagnostics = combinedDiagnostics.ToArray();
+            }
+
+            return _allDiagnostics;
+        }
+
+        public bool Equals(TagMatchingRuleDescriptor other)
+        {
+            return TagMatchingRuleDescriptorComparer.Default.Equals(this, other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as TagMatchingRuleDescriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            return TagMatchingRuleDescriptorComparer.Default.GetHashCode(this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorBuilder.cs
new file mode 100644
index 0000000000..49d2526cb3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorBuilder.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class TagMatchingRuleDescriptorBuilder
+    {
+        public abstract string TagName { get; set; }
+
+        public abstract string ParentTag { get; set; }
+
+        public abstract TagStructure TagStructure { get; set; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+
+        public abstract IReadOnlyList<RequiredAttributeDescriptorBuilder> Attributes { get; }
+
+        public abstract void Attribute(Action<RequiredAttributeDescriptorBuilder> configure);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs
new file mode 100644
index 0000000000..734485b3c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs
@@ -0,0 +1,77 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagMatchingRuleDescriptorComparer : IEqualityComparer<TagMatchingRuleDescriptor>
+    {
+        /// <summary>
+        /// A default instance of the <see cref="TagMatchingRuleDescriptorComparer"/>.
+        /// </summary>
+        public static readonly TagMatchingRuleDescriptorComparer Default = new TagMatchingRuleDescriptorComparer();
+
+        /// <summary>
+        /// A default instance of the <see cref="TagMatchingRuleDescriptorComparer"/> that does case-sensitive comparison.
+        /// </summary>
+        internal static readonly TagMatchingRuleDescriptorComparer CaseSensitive =
+            new TagMatchingRuleDescriptorComparer(caseSensitive: true);
+
+        private readonly StringComparer _stringComparer;
+        private readonly StringComparison _stringComparison;
+        private readonly RequiredAttributeDescriptorComparer _requiredAttributeComparer;
+
+        private TagMatchingRuleDescriptorComparer(bool caseSensitive = false)
+        {
+            if (caseSensitive)
+            {
+                _stringComparer = StringComparer.Ordinal;
+                _stringComparison = StringComparison.Ordinal;
+                _requiredAttributeComparer = RequiredAttributeDescriptorComparer.CaseSensitive;
+            }
+            else
+            {
+                _stringComparer = StringComparer.OrdinalIgnoreCase;
+                _stringComparison = StringComparison.OrdinalIgnoreCase;
+                _requiredAttributeComparer = RequiredAttributeDescriptorComparer.Default;
+            }
+        }
+
+        public virtual bool Equals(TagMatchingRuleDescriptor ruleX, TagMatchingRuleDescriptor ruleY)
+        {
+            if (object.ReferenceEquals(ruleX, ruleY))
+            {
+                return true;
+            }
+
+            if (ruleX == null ^ ruleY == null)
+            {
+                return false;
+            }
+
+            return
+                string.Equals(ruleX.TagName, ruleY.TagName, _stringComparison) &&
+                string.Equals(ruleX.ParentTag, ruleY.ParentTag, _stringComparison) &&
+                ruleX.TagStructure == ruleY.TagStructure &&
+                Enumerable.SequenceEqual(ruleX.Attributes, ruleY.Attributes, _requiredAttributeComparer);
+        }
+
+        public virtual int GetHashCode(TagMatchingRuleDescriptor rule)
+        {
+            if (rule == null)
+            {
+                throw new ArgumentNullException(nameof(rule));
+            }
+
+            var hash = HashCodeCombiner.Start();
+            hash.Add(rule.TagName, _stringComparer);
+
+            return hash.CombinedHash;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMode.cs
new file mode 100644
index 0000000000..a723f4cc61
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMode.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// The mode in which an element should render.
+    /// </summary>
+    public enum TagMode
+    {
+        /// <summary>
+        /// Include both start and end tags.
+        /// </summary>
+        StartTagAndEndTag,
+
+        /// <summary>
+        /// A self-closed tag.
+        /// </summary>
+        SelfClosing,
+
+        /// <summary>
+        /// Only a start tag.
+        /// </summary>
+        StartTagOnly
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagStructure.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagStructure.cs
new file mode 100644
index 0000000000..f312f594e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagStructure.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    /// <summary>
+    /// The structure the element should be written in.
+    /// </summary>
+    public enum TagStructure
+    {
+        /// <summary>
+        /// If no other tag helper applies to the same element and specifies a <see cref="TagStructure"/>,
+        /// <see cref="NormalOrSelfClosing"/> will be used.
+        /// </summary>
+        Unspecified,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        NormalOrSelfClosing,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        /// <remarks>Elements with a <see cref="WithoutEndTag"/> structure will never have any content.</remarks>
+        WithoutEndTag
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..6b3737fb73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs
@@ -0,0 +1,215 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class VirtualRazorProjectFileSystem : RazorProjectFileSystem
+    {
+        private readonly DirectoryNode _root = new DirectoryNode("/");
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            basePath = NormalizeAndEnsureValidPath(basePath);
+            var directory = _root.GetDirectory(basePath);
+            return directory?.EnumerateItems() ?? Enumerable.Empty<RazorProjectItem>();
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            path = NormalizeAndEnsureValidPath(path);
+            return _root.GetItem(path) ?? new NotFoundProjectItem(string.Empty, path);
+        }
+
+        public void Add(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var filePath = NormalizeAndEnsureValidPath(projectItem.FilePath);
+            _root.AddFile(new FileNode(filePath, projectItem));
+        }
+
+        // Internal for testing
+        [DebuggerDisplay("{Path}")]
+        internal class DirectoryNode
+        {
+            public DirectoryNode(string path)
+            {
+                Path = path;
+            }
+
+            public string Path { get; }
+
+            public List<DirectoryNode> Directories { get; } = new List<DirectoryNode>();
+
+            public List<FileNode> Files { get; } = new List<FileNode>();
+
+            public void AddFile(FileNode fileNode)
+            {
+                var filePath = fileNode.Path;
+                if (!filePath.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    var message = Resources.FormatVirtualFileSystem_FileDoesNotBelongToDirectory(fileNode.Path, Path);
+                    throw new InvalidOperationException(message);
+                }
+
+                // Look for the first / that appears in the path after the current directory path.
+                var directoryPath = GetDirectoryPath(filePath);
+                var directory = GetOrAddDirectory(this, directoryPath, createIfNotExists: true);
+                Debug.Assert(directory != null);
+                directory.Files.Add(fileNode);
+            }
+
+            public DirectoryNode GetDirectory(string path)
+            {
+                if (!path.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    var message = Resources.FormatVirtualFileSystem_FileDoesNotBelongToDirectory(path, Path);
+                    throw new InvalidOperationException(message);
+                }
+
+                return GetOrAddDirectory(this, path);
+            }
+
+            public IEnumerable<RazorProjectItem> EnumerateItems()
+            {
+                foreach (var file in Files)
+                {
+                    yield return file.ProjectItem;
+                }
+
+                foreach (var directory in Directories)
+                {
+                    foreach (var file in directory.EnumerateItems())
+                    {
+                        yield return file;
+                    }
+                }
+            }
+
+            public RazorProjectItem GetItem(string path)
+            {
+                if (!path.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new InvalidOperationException(Resources.FormatVirtualFileSystem_FileDoesNotBelongToDirectory(path, Path));
+                }
+
+                var directoryPath = GetDirectoryPath(path);
+                var directory = GetOrAddDirectory(this, directoryPath);
+                if (directory == null)
+                {
+                    return null;
+                }
+
+                foreach (var file in directory.Files)
+                {
+                    var filePath = file.Path;
+                    var directoryLength = directory.Path.Length;
+
+                    // path, filePath -> /Views/Home/Index.cshtml
+                    // directory.Path -> /Views/Home/
+                    // We only need to match the file name portion since we've already matched the directory segment.
+                    if (string.Compare(path, directoryLength, filePath, directoryLength, path.Length - directoryLength, StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        return file.ProjectItem;
+                    }
+                }
+
+                return null;
+            }
+
+            private static string GetDirectoryPath(string path)
+            {
+                // /dir1/dir2/file.cshtml -> /dir1/dir2/
+                var fileNameIndex = path.LastIndexOf('/');
+                if (fileNameIndex == -1)
+                {
+                    return path;
+                }
+
+                return path.Substring(0, fileNameIndex + 1);
+            }
+
+            private static DirectoryNode GetOrAddDirectory(
+                DirectoryNode directory,
+                string path,
+                bool createIfNotExists = false)
+            {
+                Debug.Assert(!string.IsNullOrEmpty(path));
+                if (path[path.Length - 1] != '/')
+                {
+                    path += '/';
+                }
+
+                int index;
+                while ((index = path.IndexOf('/', directory.Path.Length)) != -1 && index != path.Length)
+                {
+                    var subDirectory = FindSubDirectory(directory, path);
+
+                    if (subDirectory == null)
+                    {
+                        if (createIfNotExists)
+                        {
+                            var directoryPath = path.Substring(0, index + 1); // + 1 to include trailing slash
+                            subDirectory = new DirectoryNode(directoryPath);
+                            directory.Directories.Add(subDirectory);
+                        }
+                        else
+                        {
+                            return null;
+                        }
+                    }
+
+                    directory = subDirectory;
+                }
+
+                return directory;
+            }
+
+            private static DirectoryNode FindSubDirectory(DirectoryNode parentDirectory, string path)
+            {
+                for (var i = 0; i < parentDirectory.Directories.Count; i++)
+                {
+                    // ParentDirectory.Path -> /Views/Home/
+                    // CurrentDirectory.Path -> /Views/Home/SubDir/
+                    // Path -> /Views/Home/SubDir/MorePath/File.cshtml
+                    // Each invocation of FindSubDirectory returns the immediate subdirectory along the path to the file.
+
+                    var currentDirectory = parentDirectory.Directories[i];
+                    var directoryPath = currentDirectory.Path;
+                    var startIndex = parentDirectory.Path.Length;
+                    var directoryNameLength = directoryPath.Length - startIndex;
+
+                    if (string.Compare(path, startIndex, directoryPath, startIndex, directoryPath.Length - startIndex, StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        return currentDirectory;
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        // Internal for testing
+        [DebuggerDisplay("{Path}")]
+        internal struct FileNode
+        {
+            public FileNode(string path, RazorProjectItem projectItem)
+            {
+                Path = path;
+                ProjectItem = projectItem;
+            }
+
+            public string Path { get; }
+
+            public RazorProjectItem ProjectItem { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netcore.json b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netcore.json
new file mode 100644
index 0000000000..d695b503df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netcore.json
@@ -0,0 +1,15598 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Razor.Language, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AssemblyExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorExtension",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExtensionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Assembly",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.Assembly",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "extensionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "DoubleQuotes",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SingleQuotes",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "NoQuotes",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Minimized",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerStringProperty",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerStringProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerBooleanProperty",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerBooleanProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsEnum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsStringProperty",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsStringProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBooleanProperty",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsBooleanProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerNamePrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerNamePrefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasIndexer",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HasIndexer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsEnum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsDictionary",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsDictionary",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerAttributeNamePrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerAttributeNamePrefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerValueTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerValueTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SetPropertyName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder"
+            },
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetPropertyName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AsDictionary",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder"
+            },
+            {
+              "Name": "attributeNamePrefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueTypeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetPropertyName",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsDefaultKind",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveKind",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Usage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveKind"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveKind"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSingleLineDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSingleLineDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateRazorBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateRazorBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptorBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddMemberToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMemberToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddNamespaceToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddNamespaceToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddStringToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddStringToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTypeToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTypeToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalMemberToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalMemberToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalNamespaceToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalNamespaceToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalStringToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalStringToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalTypeToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalTypeToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "SingleLine",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorBlock",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CodeBlock",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Optional",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateToken",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateToken",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind"
+            },
+            {
+              "Name": "optional",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateToken",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind"
+            },
+            {
+              "Name": "optional",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "description",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Type",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Namespace",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Member",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "String",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unrestricted",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "FileScopedSinglyOccurring",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "FileScopedMultipleOccurring",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDocumentClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureTarget",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.HtmlConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ToHtmlCase",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IConfigureRazorCodeGenerationOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Configure",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IConfigureRazorParserOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Configure",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Description",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveKind",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Usage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Usage",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IImportProjectFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorProjectEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetImports",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultFeatureOrder",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorCodeGenerationOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorCSharpLoweringPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Directives",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDocumentClassifierPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Features",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Phases",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorIntermediateNodeLoweringPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorParserOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorParsingPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorProjectEngineFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ProjectEngine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorTagHelperBinderPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorTargetExtensionFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TargetExtensions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ITagHelperFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetDescriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ProvideRazorExtensionInitializerAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExtensionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_InitializerType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "extensionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "initializerType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            },
+            {
+              "Name": "imports",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            },
+            {
+              "Name": "imports",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>"
+            },
+            {
+              "Name": "parserOptions",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions"
+            },
+            {
+              "Name": "codeGenerationOptions",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Imports",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocumentExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetTagHelperContext",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetTagHelperContext",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSyntaxTree",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetSyntaxTree",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "syntaxTree",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImportSyntaxTrees",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetImportSyntaxTrees",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "syntaxTrees",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetDocumentIntermediateNode",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetDocumentIntermediateNode",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCSharpDocument",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCSharpDocument",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "csharp",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetParserOptions",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetParserOptions",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "parserOptions",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCodeGenerationOptions",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCodeGenerationOptions",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "codeGenerationOptions",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTimeDefault",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentWithTabs",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentSize",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressChecksum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressMetadataAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressMetadataAttributes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentSize",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndentSize",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentWithTabs",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndentWithTabs",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressChecksum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressChecksum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressMetadataAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressMetadataAttributes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetDesignTime",
+          "Parameters": [
+            {
+              "Name": "designTime",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "languageVersion",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion"
+            },
+            {
+              "Name": "configurationName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "extensions",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorExtension>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ConfigurationName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extensions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorExtension>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LanguageVersion",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Default",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_GeneratedCode",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SourceMappings",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.SourceMapping>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "generatedCode",
+              "Type": "System.String"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "diagnostics",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "generatedCode",
+              "Type": "System.String"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "diagnostics",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            },
+            {
+              "Name": "sourceMappings",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.SourceMapping>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+        "System.IFormattable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Severity",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Span",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMessage",
+          "Parameters": [
+            {
+              "Name": "formatProvider",
+              "Type": "System.IFormatProvider"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMessage",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor"
+            },
+            {
+              "Name": "span",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor"
+            },
+            {
+              "Name": "span",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "args",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IndexOf",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Insert",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveAt",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Severity",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMessageFormat",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "id",
+              "Type": "System.String"
+            },
+            {
+              "Name": "messageFormat",
+              "Type": "System.Func<System.String>"
+            },
+            {
+              "Name": "severity",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Error",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Features",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Phases",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmpty",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTimeEmpty",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEngineBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddDirective",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "directive",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTargetExtension",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "extension",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetBaseType",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "baseType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureClass",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "configureClass",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeDocument, Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetNamespace",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "namespaceName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetRequiredFeature<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFeature",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingDocumentDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TDocumentDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingFeatureDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEngineDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEnginePhaseBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetRequiredFeature<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingDocumentDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TDocumentDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingFeatureDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEngineDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnIntialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExtensionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorExtensionInitializer",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Initialize",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion>",
+        "System.IComparable<Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "TryParse",
+          "Parameters": [
+            {
+              "Name": "languageVersion",
+              "Type": "System.String"
+            },
+            {
+              "Name": "version",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Parse",
+          "Parameters": [
+            {
+              "Name": "languageVersion",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Major",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Minor",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CompareTo",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IComparable<Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Version_1_0",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Version_1_1",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Version_2_0",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Version_2_1",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Latest",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Experimental",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directives",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParseLeadingDirectives",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directives",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParseLeadingDirectives",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParseLeadingDirectives",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LanguageVersion",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorLanguageVersion",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetDesignTime",
+          "Parameters": [
+            {
+              "Name": "designTime",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "EnumerateItems",
+          "Parameters": [
+            {
+              "Name": "basePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetItem",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindHierarchicalItems",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindHierarchicalItems",
+          "Parameters": [
+            {
+              "Name": "basePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "path",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NormalizeAndEnsureValidPath",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "rootDirectoryPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileSystem",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EngineFeatures",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Phases",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectFeatures",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorProjectEngineFeature>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessDesignTime",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocumentCore",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocumentDesignTimeCore",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configuration",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration"
+            },
+            {
+              "Name": "fileSystem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configuration",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration"
+            },
+            {
+              "Name": "fileSystem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorConfiguration",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileSystem",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Features",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.IRazorFeature>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Phases",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ConfigureClass",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "configureClass",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeDocument, Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetBaseType",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "baseType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetNamespace",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "namespaceName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetImportFeature",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "feature",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IImportProjectFeature"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTargetExtension",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "extension",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddDirective",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "directive",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddDefaultImports",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            },
+            {
+              "Name": "imports",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineFeatureBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorProjectEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorProjectEngineFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ProjectEngine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorProjectEngineFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "rootDirectoryPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BasePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PhysicalPath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePhysicalPath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Read",
+          "Parameters": [],
+          "ReturnType": "System.IO.Stream",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exists",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CombinedPath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extension",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePathWithoutExtension",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Encoding",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encoding",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "position",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Char",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Lines",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceLineCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "sourceIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "destination",
+              "Type": "System.Char[]"
+            },
+            {
+              "Name": "destinationIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "count",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetChecksum",
+          "Parameters": [],
+          "ReturnType": "System.Byte[]",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetChecksumAlgorithm",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFilePathForDisplay",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocumentProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocumentProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocumentProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocumentProperties",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "filePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "relativePath",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSourceLineCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetLineLength",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Parse",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Parse",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Project",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngineOptions",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Options",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngineOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocument",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocument",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImports",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImports",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImportItems",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImportItems",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "engine",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            },
+            {
+              "Name": "project",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProject"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngineOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ImportsFileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ImportsFileName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DefaultImports",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DefaultImports",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NameComparison",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NameComparison",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueComparison",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueComparison",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NameComparisonMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NameComparisonMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueComparisonMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueComparisonMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceChange",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceChange>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsDelete",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsInsert",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReplace",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Span",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NewText",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceChange"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceChange>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "newText",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "span",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "newText",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceLocation>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FilePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AbsoluteIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AbsoluteIndex",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LineIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_LineIndex",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CharacterIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CharacterIndex",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FromSpan",
+          "Parameters": [
+            {
+              "Name": "span",
+              "Type": "System.Nullable<Microsoft.AspNetCore.Razor.Language.SourceSpan>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceLocation>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "filePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Undefined",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Zero",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceMapping",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceMapping>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_OriginalSpan",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GeneratedSpan",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceMapping"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceMapping>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "originalSpan",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "generatedSpan",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceSpan>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AbsoluteIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LineIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CharacterIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceSpan>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            },
+            {
+              "Name": "contentLength",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "filePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Undefined",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperBinding",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Descriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParentTagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelperPrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetBoundRules",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "DefaultKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMatchingRules",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagMatchingRules",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AssemblyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AssemblyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundAttributes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowedChildTags",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowedChildTags",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagOutputHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagOutputHint",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllDiagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "assemblyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "System.String"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "assemblyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AssemblyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagOutputHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagOutputHint",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowedChildTags",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMatchingRules",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AllowChildTag",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindAttribute",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TagMatchingRule",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SetTypeName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder"
+            },
+            {
+              "Name": "typeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetTypeName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetTypeName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsDefaultKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "KindUsesDefaultTagHelperRuntime",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExcludeHidden",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExcludeHidden",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IncludeDocumentation",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IncludeDocumentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "results",
+              "Type": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tagHelpers",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelpers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Attributes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParentTag",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParentTag",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllDiagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParentTag",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParentTag",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagStructure",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Attribute",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "StartTagAndEndTag",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SelfClosing",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "StartTagOnly",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagStructure",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unspecified",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "NormalOrSelfClosing",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "WithoutEndTag",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClassName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BaseType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BaseType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Interfaces",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Interfaces",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeParameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.TypeParameter>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeParameters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.TypeParameter>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CommonAnnotations",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Imported",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrimaryClass",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrimaryMethod",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrimaryNamespace",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DirectiveName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Directive",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveToken",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DirectiveToken",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DocumentKind",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Options",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Target",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Target",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNodeExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "FindPrimaryClass",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindPrimaryMethod",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindPrimaryNamespace",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindDirectiveReferences",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "directive",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptExtensionNode<T0>",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "T0"
+            },
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TNode",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReportMissingCodeTargetExtension<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.FieldDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Suffix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Suffix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IExtensionIntermediateNodeVisitor<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "VisitExtension",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TNode",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Annotations",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasDiagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<Microsoft.AspNetCore.Razor.Language.SourceSpan>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Source",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<Microsoft.AspNetCore.Razor.Language.SourceSpan>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IndexOf",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Insert",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveAt",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ReadOnly",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsImported",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllDiagnostics",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindDescendantNodes<T0>",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<T0>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TNode",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+              ]
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Deconstruct",
+          "Parameters": [
+            {
+              "Name": "parent",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+              "Direction": "Out"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Node",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertAfter",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertAfter",
+          "Parameters": [
+            {
+              "Name": "nodes",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertBefore",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertBefore",
+          "Parameters": [
+            {
+              "Name": "nodes",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Replace",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "parent",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Visit",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDefault",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitToken",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateToken"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDirectiveToken",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDirective",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitMalformedDirective",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MalformedDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitExtension",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpCode",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitClassDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitMethodDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitFieldDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.FieldDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitPropertyDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.PropertyDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDocument",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitHtml",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitNamespaceDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitUsingDirective",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelper",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelperBody",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelperProperty",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelperHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeWalker",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Ancestors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDefault",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateToken",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsCSharp",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsHtml",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.TokenKind",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Kind",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TokenKind"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MalformedDirectiveIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DirectiveName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Directive",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MethodName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MethodName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.MethodParameter>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ReturnType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ReturnType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodParameter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.PropertyDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelpers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Body",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttribute",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundAttribute",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerNameMatch",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerNameMatch",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TokenKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unknown",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CSharp",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Html",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TypeParameter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperBodyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bodyNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperCreateIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperExecuteIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperHtmlAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "htmlAttributeNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperPropertyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttribute",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundAttribute",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerNameMatch",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerNameMatch",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperRuntimeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.FunctionsDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.FunctionsDirectivePass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.IDefaultTagHelperTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperBody",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperBodyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperCreate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperCreateIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperExecute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperExecuteIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperHtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperPropertyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperRuntime",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperRuntimeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.InheritsDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.InheritsDirectivePass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.ISectionTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteSection",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.ITemplateTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteTemplate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.RazorCompiledItemMetadataAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Key",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionDirectivePass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SectionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SectionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.Extensions.ISectionTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SectionMethodName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SectionMethodName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteSection",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.Extensions.ISectionTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultSectionMethodName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.Extensions.ITemplateTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TemplateTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTemplate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.Extensions.ITemplateTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultTemplateTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Ancestors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CodeWriter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NodeWriter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SourceDocument",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddSourceMappingFor",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderNode",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderNode",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            },
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderChildren",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderChildren",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            },
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmpty",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateNodeWriter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExtension<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TExtension",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "HasExtension<T0>",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TExtension",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CodeDocument",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TargetExtensions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CurrentIndent",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CurrentIndent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NewLine",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NewLine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Location",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Char",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Write",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Write",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "startIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "count",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteLine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteLine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DesignTimeNodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteUsingDirective",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCode",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlContent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DocumentWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [
+            {
+              "Name": "codeTarget",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DocumentWriter",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "codeTarget",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DocumentWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteDocument",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteUsingDirective",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCode",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlContent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.RuntimeNodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WriteCSharpExpressionMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriteCSharpExpressionMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriteHtmlContentMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriteHtmlContentMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BeginWriteAttributeMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BeginWriteAttributeMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EndWriteAttributeMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EndWriteAttributeMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriteAttributeValueMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriteAttributeValueMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PushWriterMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PushWriterMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PopWriterMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PopWriterMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TemplateTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteUsingDirective",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCode",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlContent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "collection",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "FullMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrefixMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "None",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "FullMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrefixMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SuffixMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperMetadata+Common",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperMetadata+Runtime",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.CSharpCodeParser+Block",
+      "Visibility": "Protected",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Start",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Start",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "start",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "symbol",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Legacy.CSharpSymbol"
+            },
+            {
+              "Name": "start",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.SyntaxConstants+CSharp",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "UsingKeywordLength",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "TagHelperPrefixKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "AddTagHelperKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RemoveTagHelperKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "InheritsKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "FunctionsKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "SectionKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ElseIfKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "NamespaceKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ClassKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "HelperKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+RazorCommentTokenizerState",
+      "Visibility": "Protected",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "AfterRazorCommentTransition",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1000"
+        },
+        {
+          "Kind": "Field",
+          "Name": "EscapedRazorCommentTransition",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1001"
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorCommentBody",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1002"
+        },
+        {
+          "Kind": "Field",
+          "Name": "StarAfterRazorCommentBody",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1003"
+        },
+        {
+          "Kind": "Field",
+          "Name": "AtSymbolAfterRazorCommentBody",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1004"
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TSymbol",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1>"
+          ]
+        },
+        {
+          "ParameterName": "TSymbolType",
+          "ParameterPosition": 1,
+          "New": true,
+          "Struct": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+StateResult",
+      "Visibility": "Protected",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_State",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "state",
+              "Type": "System.Nullable<System.Int32>"
+            },
+            {
+              "Name": "result",
+              "Type": "T0"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TSymbol",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1>"
+          ]
+        },
+        {
+          "ParameterName": "TSymbolType",
+          "ParameterPosition": 1,
+          "New": true,
+          "Struct": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CommonAnnotations+DefaultTagHelperExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "TagHelperField",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "collection",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netframework.json b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netframework.json
new file mode 100644
index 0000000000..43b483a949
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/baseline.netframework.json
@@ -0,0 +1,13608 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Razor.Language, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "DoubleQuotes",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SingleQuotes",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "NoQuotes",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Minimized",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerStringProperty",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerStringProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsEnum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsStringProperty",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsStringProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerNamePrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerNamePrefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasIndexer",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HasIndexer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsEnum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsDictionary",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsDictionary",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerAttributeNamePrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerAttributeNamePrefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndexerValueTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndexerValueTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SetPropertyName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder"
+            },
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetPropertyName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AsDictionary",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder"
+            },
+            {
+              "Name": "attributeNamePrefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueTypeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetPropertyName",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsDefaultKind",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveKind",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Usage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveKind"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveKind"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSingleLineDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSingleLineDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateRazorBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateRazorBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeBlockDirective",
+          "Parameters": [
+            {
+              "Name": "directive",
+              "Type": "System.String"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptorBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddMemberToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddNamespaceToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddStringToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTypeToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalMemberToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalNamespaceToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalStringToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddOptionalTypeToken",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "SingleLine",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorBlock",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CodeBlock",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Optional",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateToken",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateToken",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind"
+            },
+            {
+              "Name": "optional",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Type",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Namespace",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Member",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "String",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unrestricted",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "FileScopedSinglyOccurring",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "FileScopedMultipleOccurring",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDocumentClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureTarget",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.HtmlConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ToHtmlCase",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IConfigureRazorCodeGenerationOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Configure",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IConfigureRazorParserOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Configure",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IDirectiveDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Description",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveKind",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Usage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Usage",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveUsage"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultFeatureOrder",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorCodeGenerationOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorCSharpLoweringPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Directives",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorDocumentClassifierPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Features",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Phases",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorIntermediateNodeLoweringPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorParserOptionsFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorParsingPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorTagHelperBinderPhase",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.IRazorTargetExtensionFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TargetExtensions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ITagHelperFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetDescriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            },
+            {
+              "Name": "imports",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Imports",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocumentExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetTagHelperContext",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetTagHelperContext",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSyntaxTree",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetSyntaxTree",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "syntaxTree",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImportSyntaxTrees",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetImportSyntaxTrees",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "syntaxTrees",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetDocumentIntermediateNode",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetDocumentIntermediateNode",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCSharpDocument",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCSharpDocument",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "csharp",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTimeDefault",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentWithTabs",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentSize",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressChecksum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptionsBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentSize",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndentSize",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IndentWithTabs",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IndentWithTabs",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressChecksum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressChecksum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_GeneratedCode",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SourceMappings",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.SourceMapping>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "generatedCode",
+              "Type": "System.String"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "diagnostics",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "generatedCode",
+              "Type": "System.String"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "diagnostics",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            },
+            {
+              "Name": "sourceMappings",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.SourceMapping>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+        "System.IFormattable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Severity",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Span",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMessage",
+          "Parameters": [
+            {
+              "Name": "formatProvider",
+              "Type": "System.IFormatProvider"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMessage",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor"
+            },
+            {
+              "Name": "span",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor"
+            },
+            {
+              "Name": "span",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "args",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IndexOf",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Insert",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveAt",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Severity",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMessageFormat",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RazorDiagnosticDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "id",
+              "Type": "System.String"
+            },
+            {
+              "Name": "messageFormat",
+              "Type": "System.Func<System.String>"
+            },
+            {
+              "Name": "severity",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticSeverity",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Error",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmpty",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Features",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Phases",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEngineBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddDirective",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "directive",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTargetExtension",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "extension",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetBaseType",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "baseType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureClass",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "configureClass",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorCodeDocument, Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetNamespace",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            },
+            {
+              "Name": "namespaceName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetRequiredFeature<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFeature",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingDocumentDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TDocumentDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingFeatureDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEngineDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorEnginePhaseBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Engine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorEnginePhase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetRequiredFeature<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingDocumentDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TDocumentDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ThrowForMissingFeatureDependency<T0>",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEngineDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnIntialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDesignTime",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directives",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParseLeadingDirectives",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorParserOptionsBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directives",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParseLeadingDirectives",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParseLeadingDirectives",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "EnumerateItems",
+          "Parameters": [
+            {
+              "Name": "basePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetItem",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindHierarchicalItems",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindHierarchicalItems",
+          "Parameters": [
+            {
+              "Name": "basePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "path",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NormalizeAndEnsureValidPath",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "rootDirectoryPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BasePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PhysicalPath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Read",
+          "Parameters": [],
+          "ReturnType": "System.IO.Stream",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exists",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CombinedPath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extension",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePathWithoutExtension",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Encoding",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encoding",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "position",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Char",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Lines",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceLineCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "sourceIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "destination",
+              "Type": "System.Char[]"
+            },
+            {
+              "Name": "destinationIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "count",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetChecksum",
+          "Parameters": [],
+          "ReturnType": "System.Byte[]",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadFrom",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSourceLineCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetLineLength",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Parse",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Parse",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSyntaxTree",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorParserOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Engine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Project",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProject",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngineOptions",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Options",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngineOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocument",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateCodeDocument",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImports",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImports",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorSourceDocument>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImportItems",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetImportItems",
+          "Parameters": [
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorProjectItem>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "engine",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorEngine"
+            },
+            {
+              "Name": "project",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProject"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorTemplateEngineOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ImportsFileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ImportsFileName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DefaultImports",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DefaultImports",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NameComparison",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NameComparison",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueComparison",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueComparison",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NameComparisonMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NameComparisonMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueComparisonMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueComparisonMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceChange",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceChange>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsDelete",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsInsert",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReplace",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Span",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NewText",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceChange"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceChange>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "newText",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "span",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "newText",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceLocation>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FilePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AbsoluteIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AbsoluteIndex",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LineIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_LineIndex",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CharacterIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CharacterIndex",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FromSpan",
+          "Parameters": [
+            {
+              "Name": "span",
+              "Type": "System.Nullable<Microsoft.AspNetCore.Razor.Language.SourceSpan>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceLocation>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "filePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Undefined",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Zero",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceMapping",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceMapping>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_OriginalSpan",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GeneratedSpan",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceMapping"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceMapping>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "originalSpan",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "generatedSpan",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceSpan>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AbsoluteIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LineIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CharacterIndex",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.SourceSpan>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceSpan"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            },
+            {
+              "Name": "contentLength",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "filePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "absoluteIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "lineIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "characterIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Undefined",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceSpan",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperBinding",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Descriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParentTagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelperPrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetBoundRules",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "DefaultKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMatchingRules",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagMatchingRules",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AssemblyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AssemblyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundAttributes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowedChildTags",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowedChildTags",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagOutputHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagOutputHint",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllDiagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "assemblyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "kind",
+              "Type": "System.String"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "assemblyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AssemblyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagOutputHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagOutputHint",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Documentation",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Documentation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowedChildTags",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMatchingRules",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AllowChildTag",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.AllowedChildTagDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindAttribute",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TagMatchingRule",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SetTypeName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder"
+            },
+            {
+              "Name": "typeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetTypeName",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorBuilder"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetTypeName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsDefaultKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "KindUsesDefaultTagHelperRuntime",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "results",
+              "Type": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tagHelpers",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDocumentContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelpers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Attributes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParentTag",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParentTag",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Diagnostics",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllDiagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagMatchingRuleDescriptorBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParentTag",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParentTag",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagStructure",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptorBuilder>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Attribute",
+          "Parameters": [
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptorBuilder>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "StartTagAndEndTag",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SelfClosing",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "StartTagOnly",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagStructure",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unspecified",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "NormalOrSelfClosing",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "WithoutEndTag",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClassName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BaseType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BaseType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Interfaces",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Interfaces",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CommonAnnotations",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Imported",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrimaryClass",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrimaryMethod",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrimaryNamespace",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DirectiveName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Directive",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveToken",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DirectiveToken",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveTokenDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DocumentKind",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Options",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Target",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Target",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNodeExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "FindPrimaryClass",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindPrimaryMethod",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindPrimaryNamespace",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindDirectiveReferences",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "directive",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptExtensionNode<T0>",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "T0"
+            },
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TNode",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReportMissingCodeTargetExtension<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TDependency",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.FieldDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Suffix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Suffix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IExtensionIntermediateNodeVisitor<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "VisitExtension",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TNode",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Annotations",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasDiagnostics",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<Microsoft.AspNetCore.Razor.Language.SourceSpan>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Source",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<Microsoft.AspNetCore.Razor.Language.SourceSpan>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IndexOf",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Insert",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveAt",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ReadOnly",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsImported",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllDiagnostics",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindDescendantNodes<T0>",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<T0>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TNode",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+              ]
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Deconstruct",
+          "Parameters": [
+            {
+              "Name": "parent",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+              "Direction": "Out"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Node",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertAfter",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertAfter",
+          "Parameters": [
+            {
+              "Name": "nodes",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertBefore",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertBefore",
+          "Parameters": [
+            {
+              "Name": "nodes",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Replace",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeReference",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "parent",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Visit",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDefault",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitToken",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateToken"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDirectiveToken",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDirective",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitMalformedDirective",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MalformedDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitExtension",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpCode",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitClassDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitMethodDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitFieldDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.FieldDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitPropertyDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.PropertyDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDocument",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitHtml",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitNamespaceDeclaration",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitUsingDirective",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelper",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelperBody",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelperProperty",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitTagHelperHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeWalker",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Ancestors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitDefault",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateToken",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsCSharp",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsHtml",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Kind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.TokenKind",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Kind",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TokenKind"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MalformedDirectiveIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DirectiveName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Tokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.DirectiveTokenIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Directive",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MethodName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MethodName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ReturnType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ReturnType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.PropertyDeclarationIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.MemberDeclarationIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Modifiers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelpers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Body",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttribute",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundAttribute",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerNameMatch",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerNameMatch",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.TokenKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unknown",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CSharp",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Html",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperBodyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bodyNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperBodyIntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperCreateIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperExecuteIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperHtmlAttributeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "htmlAttributeNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperHtmlAttributeIntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperPropertyIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeStructure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.AttributeStructure",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeStructure",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.AttributeStructure"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundAttribute",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundAttribute",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.BoundAttributeDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsIndexerNameMatch",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsIndexerNameMatch",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.TagHelperPropertyIntermediateNode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperRuntimeIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.FunctionsDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.FunctionsDirectivePass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.IDefaultTagHelperTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperBody",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperBodyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperCreate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperCreateIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperExecute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperExecuteIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperHtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperPropertyIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTagHelperRuntime",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.DefaultTagHelperRuntimeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.InheritsDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.InheritsDirectivePass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.ISectionTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteSection",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.ITemplateTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteTemplate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionDirectivePass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorDirectiveClassifierPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SectionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SectionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.Extensions.ISectionTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SectionMethodName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SectionMethodName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteSection",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.SectionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.Extensions.ISectionTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultSectionMethodName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.Extensions.ITemplateTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TemplateTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTemplate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Extensions.TemplateIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.Extensions.ITemplateTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultTemplateTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Ancestors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CodeWriter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Diagnostics",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.ItemCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NodeWriter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SourceDocument",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorSourceDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddSourceMappingFor",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderNode",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderNode",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            },
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderChildren",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderChildren",
+          "Parameters": [
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode"
+            },
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDefault",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmpty",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateNodeWriter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExtension<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TExtension",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "HasExtension<T0>",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TExtension",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTargetBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CodeDocument",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Options",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TargetExtensions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Build",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CurrentIndent",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CurrentIndent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NewLine",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NewLine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Location",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Char",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Write",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Write",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "startIndex",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "count",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteLine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteLine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCode",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DesignTimeNodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteUsingDirective",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCode",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlContent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DocumentWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "codeTarget",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeGenerationOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.DocumentWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteDocument",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorCSharpDocument",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteUsingDirective",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCode",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlContent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.RuntimeNodeWriter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.IntermediateNodeWriter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WriteCSharpExpressionMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriteCSharpExpressionMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriteHtmlContentMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriteHtmlContentMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BeginWriteAttributeMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BeginWriteAttributeMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EndWriteAttributeMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EndWriteAttributeMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriteAttributeValueMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriteAttributeValueMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PushWriterMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PushWriterMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PopWriterMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PopWriterMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TemplateTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteUsingDirective",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.UsingDirectiveIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpression",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCode",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpExpressionAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpExpressionAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteCSharpCodeAttributeValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.CSharpCodeAttributeValueIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteHtmlContent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.HtmlContentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriterScope",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorDiagnostic",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.RazorDiagnostic>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "collection",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorDiagnosticCollection"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+NameComparisonMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "FullMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrefixMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.RequiredAttributeDescriptor+ValueComparisonMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "None",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "FullMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrefixMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SuffixMatch",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperMetadata+Common",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.TagHelperMetadata+Runtime",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.CSharpCodeParser+Block",
+      "Visibility": "Protected",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Start",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.SourceLocation",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Start",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "start",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "symbol",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Legacy.CSharpSymbol"
+            },
+            {
+              "Name": "start",
+              "Type": "Microsoft.AspNetCore.Razor.Language.SourceLocation"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.SyntaxConstants+CSharp",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "UsingKeywordLength",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "TagHelperPrefixKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "AddTagHelperKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RemoveTagHelperKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "InheritsKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "FunctionsKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "SectionKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ElseIfKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "NamespaceKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ClassKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "HelperKeyword",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+RazorCommentTokenizerState",
+      "Visibility": "Protected",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "AfterRazorCommentTransition",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1000"
+        },
+        {
+          "Kind": "Field",
+          "Name": "EscapedRazorCommentTransition",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1001"
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorCommentBody",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1002"
+        },
+        {
+          "Kind": "Field",
+          "Name": "StarAfterRazorCommentBody",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1003"
+        },
+        {
+          "Kind": "Field",
+          "Name": "AtSymbolAfterRazorCommentBody",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1004"
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TSymbol",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1>"
+          ]
+        },
+        {
+          "ParameterName": "TSymbolType",
+          "ParameterPosition": 1,
+          "New": true,
+          "Struct": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+StateResult",
+      "Visibility": "Protected",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_State",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "state",
+              "Type": "System.Nullable<System.Int32>"
+            },
+            {
+              "Name": "result",
+              "Type": "T0"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TSymbol",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1>"
+          ]
+        },
+        {
+          "ParameterName": "TSymbolType",
+          "ParameterPosition": 1,
+          "New": true,
+          "Struct": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.CommonAnnotations+DefaultTagHelperExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "TagHelperField",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "collection",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netcore.json b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netcore.json
new file mode 100644
index 0000000000..a753f1bfc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netcore.json
@@ -0,0 +1,15 @@
+[
+  {
+    "TypeId": "protected enum Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+RazorCommentTokenizerState where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1> where T1 : struct",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "protected struct Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+StateResult where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1> where T1 : struct",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "protected class Microsoft.AspNetCore.Razor.Language.Legacy.CSharpCodeParser+Block",
+    "MemberId": "public .ctor(Microsoft.AspNetCore.Razor.Language.Legacy.CSharpSymbol symbol, Microsoft.AspNetCore.Razor.Language.SourceLocation start)",
+    "Kind": "Removal"
+  }
+]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netframework.json b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netframework.json
new file mode 100644
index 0000000000..a753f1bfc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/breakingchanges.netframework.json
@@ -0,0 +1,15 @@
+[
+  {
+    "TypeId": "protected enum Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+RazorCommentTokenizerState where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1> where T1 : struct",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "protected struct Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer<T0, T1>+StateResult where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase<T1> where T1 : struct",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "protected class Microsoft.AspNetCore.Razor.Language.Legacy.CSharpCodeParser+Block",
+    "MemberId": "public .ctor(Microsoft.AspNetCore.Razor.Language.Legacy.CSharpSymbol symbol, Microsoft.AspNetCore.Razor.Language.SourceLocation start)",
+    "Kind": "Removal"
+  }
+]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Application.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Application.cs
new file mode 100644
index 0000000000..9c63203f66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Application.cs
@@ -0,0 +1,114 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class Application : CommandLineApplication
+    {
+        public Application(
+            CancellationToken cancellationToken,
+            ExtensionAssemblyLoader loader,
+            ExtensionDependencyChecker checker,
+            Func<string, MetadataReferenceProperties, PortableExecutableReference> assemblyReferenceProvider,
+            TextWriter output = null,
+            TextWriter error = null)
+        {
+            CancellationToken = cancellationToken;
+            Checker = checker;
+            Loader = loader;
+            AssemblyReferenceProvider = assemblyReferenceProvider;
+            Out = output ?? Out;
+            Error = error ?? Error;
+
+            Name = "rzc";
+            FullName = "Microsoft ASP.NET Core Razor CLI tool";
+            Description = "CLI interface to perform Razor operations.";
+            ShortVersionGetter = GetInformationalVersion;
+
+            HelpOption("-?|-h|--help");
+
+            Commands.Add(new ServerCommand(this));
+            Commands.Add(new ShutdownCommand(this));
+            Commands.Add(new DiscoverCommand(this));
+            Commands.Add(new GenerateCommand(this));
+        }
+
+        public CancellationToken CancellationToken { get; }
+
+        public ExtensionAssemblyLoader Loader { get; }
+
+        public ExtensionDependencyChecker Checker { get; }
+
+        public Func<string, MetadataReferenceProperties, PortableExecutableReference> AssemblyReferenceProvider { get; }
+
+        public new int Execute(params string[] args)
+        {
+            try
+            {
+                return base.Execute(ExpandResponseFiles(args));
+            }
+            catch (AggregateException ex) when (ex.InnerException != null)
+            {
+                foreach (var innerException in ex.Flatten().InnerExceptions)
+                {
+                    Error.WriteLine(innerException.Message);
+                    Error.WriteLine(innerException.StackTrace);
+                }
+                return 1;
+            }
+            catch (CommandParsingException ex)
+            {
+                // Don't show a call stack when we have unneeded arguments, just print the error message.
+                // The code that throws this exception will print help, so no need to do it here.
+                Error.WriteLine(ex.Message);
+                return 1;
+            }
+            catch (OperationCanceledException)
+            {
+                // This is a cancellation, not a failure.
+                Error.WriteLine("Cancelled");
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                Error.WriteLine(ex.Message);
+                Error.WriteLine(ex.StackTrace);
+                return 1;
+            }
+        }
+
+        private string GetInformationalVersion()
+        {
+            var assembly = typeof(Application).GetTypeInfo().Assembly;
+            var attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            return attribute.InformationalVersion;
+        }
+
+        private static string[] ExpandResponseFiles(string[] args)
+        {
+            var expandedArgs = new List<string>();
+            foreach (var arg in args)
+            {
+                if (!arg.StartsWith("@", StringComparison.Ordinal))
+                {
+                    expandedArgs.Add(arg);
+                }
+                else
+                {
+                    var fileName = arg.Substring(1);
+                    expandedArgs.AddRange(File.ReadLines(fileName));
+                }
+            }
+
+            return expandedArgs.ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CachingMetadataReference.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CachingMetadataReference.cs
new file mode 100644
index 0000000000..0aeb381b21
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CachingMetadataReference.cs
@@ -0,0 +1,32 @@
+// 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 Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal sealed class CachingMetadataReference : PortableExecutableReference
+    {
+        private static readonly MetadataCache _metadataCache = new MetadataCache();
+
+        public CachingMetadataReference(string fullPath, MetadataReferenceProperties properties)
+            : base(properties, fullPath)
+        {
+        }
+
+        protected override DocumentationProvider CreateDocumentationProvider()
+        {
+            return DocumentationProvider.Default;
+        }
+
+        protected override Metadata GetMetadataImpl()
+        {
+            return _metadataCache.GetMetadata(FilePath);
+        }
+
+        protected override PortableExecutableReference WithPropertiesImpl(MetadataReferenceProperties properties)
+        {
+            return new CachingMetadataReference(FilePath, properties);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Client.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Client.cs
new file mode 100644
index 0000000000..cf94173337
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Client.cs
@@ -0,0 +1,200 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.IO.Pipes;
+#if NETFRAMEWORK
+using System.Security.AccessControl;
+using System.Security.Principal;
+#endif
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class Client : IDisposable
+    {
+        private static int counter;
+
+        // From https://github.com/dotnet/corefx/blob/29cd6a0b0ac2993cee23ebaf36ca3d4bce6dd75f/src/System.IO.Pipes/ref/System.IO.Pipes.cs#L93.
+        // Using the enum value directly as this option is not available in netstandard.
+        private const PipeOptions PipeOptionCurrentUserOnly = (PipeOptions)536870912;
+
+        private static readonly PipeOptions _pipeOptions = GetPipeOptions();
+
+        public abstract Stream Stream { get; }
+
+        public abstract string Identifier { get; }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+        }
+
+        public abstract Task WaitForDisconnectAsync(CancellationToken cancellationToken);
+
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        // Based on: https://github.com/dotnet/roslyn/blob/14aed138a01c448143b9acf0fe77a662e3dfe2f4/src/Compilers/Shared/BuildServerConnection.cs#L290
+        public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout, CancellationToken cancellationToken)
+        {
+            var timeoutMilliseconds = timeout == null ? Timeout.Infinite : (int)timeout.Value.TotalMilliseconds;
+
+            try
+            {
+                // Machine-local named pipes are named "\\.\pipe\<pipename>".
+                // We use the SHA1 of the directory the compiler exes live in as the pipe name.
+                // The NamedPipeClientStream class handles the "\\.\pipe\" part for us.
+                ServerLogger.Log("Attempt to open named pipe '{0}'", pipeName);
+
+                var stream = new NamedPipeClientStream(".", pipeName, PipeDirection.InOut, _pipeOptions);
+                cancellationToken.ThrowIfCancellationRequested();
+
+                ServerLogger.Log("Attempt to connect named pipe '{0}'", pipeName);
+                try
+                {
+                    await stream.ConnectAsync(timeoutMilliseconds, cancellationToken);
+                }
+                catch (Exception e) when (e is IOException || e is TimeoutException)
+                {
+                    // Note: IOException can also indicate timeout.
+                    // From docs:
+                    // - TimeoutException: Could not connect to the server within the specified timeout period.
+                    // - IOException: The server is connected to another client and the  time-out period has expired.
+                    ServerLogger.Log($"Connecting to server timed out after {timeoutMilliseconds} ms");
+                    return null;
+                }
+
+                ServerLogger.Log("Named pipe '{0}' connected", pipeName);
+                cancellationToken.ThrowIfCancellationRequested();
+
+#if NETFRAMEWORK
+                // Verify that we own the pipe.
+                if (!CheckPipeConnectionOwnership(stream))
+                {
+                    ServerLogger.Log("Owner of named pipe is incorrect");
+                    return null;
+                }
+#endif
+
+                return new NamedPipeClient(stream, GetNextIdentifier());
+            }
+            catch (Exception e) when (!(e is TaskCanceledException || e is OperationCanceledException))
+            {
+                ServerLogger.LogException(e, "Exception while connecting to process");
+                return null;
+            }
+        }
+
+#if NETFRAMEWORK
+        /// <summary>
+        /// Check to ensure that the named pipe server we connected to is owned by the same
+        /// user.
+        /// </summary>
+        private static bool CheckPipeConnectionOwnership(NamedPipeClientStream pipeStream)
+        {
+            try
+            {
+                if (PlatformInformation.IsWindows)
+                {
+                    using (var currentIdentity = WindowsIdentity.GetCurrent())
+                    {
+                        var currentOwner = currentIdentity.Owner;
+                        var remotePipeSecurity = GetPipeSecurity(pipeStream);
+                        var remoteOwner = remotePipeSecurity.GetOwner(typeof(SecurityIdentifier));
+
+                        return currentOwner.Equals(remoteOwner);
+                    }
+                }
+
+                // We don't need to verify on non-windows as that will be taken care of by the
+                // PipeOptions.CurrentUserOnly flag.
+                return false;
+            }
+            catch (Exception ex)
+            {
+                ServerLogger.LogException(ex, "Checking pipe connection");
+                return false;
+            }
+        }
+
+        private static ObjectSecurity GetPipeSecurity(PipeStream pipeStream)
+        {
+            return pipeStream.GetAccessControl();
+        }
+#endif
+
+        private static PipeOptions GetPipeOptions()
+        {
+            var options = PipeOptions.Asynchronous;
+
+            if (Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
+            {
+                return options | PipeOptionCurrentUserOnly;
+            }
+
+            return options;
+        }
+
+        private static string GetNextIdentifier()
+        {
+            var id = Interlocked.Increment(ref counter);
+            return "clientconnection-" + id;
+        }
+
+        private class NamedPipeClient : Client
+        {
+            public NamedPipeClient(NamedPipeClientStream stream, string identifier)
+            {
+                Stream = stream;
+                Identifier = identifier;
+            }
+
+            public override Stream Stream { get; }
+
+            public override string Identifier { get; }
+
+            public async override Task WaitForDisconnectAsync(CancellationToken cancellationToken)
+            {
+                if (!(Stream is PipeStream pipeStream))
+                {
+                    return;
+                }
+
+                // We have to poll for disconnection by reading, PipeStream.IsConnected isn't reliable unless you
+                // actually do a read - which will cause it to update its state.
+                while (!cancellationToken.IsCancellationRequested && pipeStream.IsConnected)
+                {
+                    await Task.Delay(TimeSpan.FromMilliseconds(100), cancellationToken);
+
+                    try
+                    {
+                        ServerLogger.Log($"Before poking pipe {Identifier}.");
+                        await Stream.ReadAsync(Array.Empty<byte>(), 0, 0, cancellationToken);
+                        ServerLogger.Log($"After poking pipe {Identifier}.");
+                    }
+                    catch (OperationCanceledException)
+                    {
+                    }
+                    catch (Exception e)
+                    {
+                        // It is okay for this call to fail.  Errors will be reflected in the
+                        // IsConnected property which will be read on the next iteration.
+                        ServerLogger.LogException(e, $"Error poking pipe {Identifier}.");
+                    }
+                }
+            }
+
+            protected override void Dispose(bool disposing)
+            {
+                if (disposing)
+                {
+                    Stream.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CommandBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CommandBase.cs
new file mode 100644
index 0000000000..91904ae9f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CommandBase.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class CommandBase : CommandLineApplication
+    {
+        public const int ExitCodeSuccess = 0;
+        public const int ExitCodeFailure = 1;
+        public const int ExitCodeFailureRazorError = 2;
+
+        protected CommandBase(Application parent, string name)
+            : base(throwOnUnexpectedArg: true)
+        {
+            if (parent == null)
+            {
+                throw new ArgumentNullException(nameof(parent));
+            }
+
+            base.Parent = parent;
+            Name = name;
+            Out = parent.Out ?? Out;
+            Error = parent.Error ?? Error;
+
+            Help = HelpOption("-?|-h|--help");
+            OnExecute((Func<Task<int>>)ExecuteAsync);
+        }
+
+        protected new Application Parent => (Application)base.Parent;
+
+        protected CancellationToken Cancelled => Parent?.CancellationToken ?? default;
+
+        protected CommandOption Help { get; }
+
+        protected virtual bool ValidateArguments()
+        {
+            return true;
+        }
+
+        protected abstract Task<int> ExecuteCoreAsync();
+
+        private async Task<int> ExecuteAsync()
+        {
+            if (!ValidateArguments())
+            {
+                ShowHelp();
+                return ExitCodeFailureRazorError;
+            }
+
+            return await ExecuteCoreAsync();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompilerHost.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompilerHost.cs
new file mode 100644
index 0000000000..0525beed06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompilerHost.cs
@@ -0,0 +1,134 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class CompilerHost
+    {
+        public static CompilerHost Create()
+        {
+            return new DefaultCompilerHost();
+        }
+
+        public abstract ServerResponse Execute(ServerRequest request, CancellationToken cancellationToken);
+
+        private class DefaultCompilerHost : CompilerHost
+        {
+            public DefaultCompilerHost()
+            {
+                // The loader needs to live for the lifetime of the server. 
+                //
+                // This means that if a request tries to use a set of binaries that are inconsistent with what
+                // the server already has, then it will be rejected to try again on the client.
+                //
+                // We also check each set of extensions for missing depenencies individually, so that we can
+                // consistently reject a request that doesn't specify everything it needs. Otherwise the request
+                // could succeed sometimes if it relies on transient state.
+                Loader = new DefaultExtensionAssemblyLoader(Path.Combine(Path.GetTempPath(), "Razor-Server"));
+
+                AssemblyReferenceProvider = (path, properties) => new CachingMetadataReference(path, properties);
+            }
+
+            public Func<string, MetadataReferenceProperties, PortableExecutableReference> AssemblyReferenceProvider { get; }
+
+            public ExtensionAssemblyLoader Loader { get; }
+
+            public override ServerResponse Execute(ServerRequest request, CancellationToken cancellationToken)
+            {
+                if (!TryParseArguments(request, out var parsed))
+                {
+                    return new RejectedServerResponse();
+                }
+
+                var exitCode = 0;
+                var commandArgs = parsed.args.ToArray();
+
+                var outputWriter = new StringWriter();
+                var errorWriter = new StringWriter();
+
+                var checker = new DefaultExtensionDependencyChecker(Loader, outputWriter, errorWriter);
+                var app = new Application(cancellationToken, Loader, checker, AssemblyReferenceProvider, outputWriter, errorWriter);
+
+                exitCode = app.Execute(commandArgs);
+
+                var output = outputWriter.ToString();
+                var error = errorWriter.ToString();
+
+                outputWriter.Dispose();
+                errorWriter.Dispose();
+
+                // This will no-op if server logging is not enabled.
+                ServerLogger.Log(output);
+                ServerLogger.Log(error);
+
+                return new CompletedServerResponse(exitCode, utf8output: false, output, error);
+            }
+
+            private bool TryParseArguments(ServerRequest request, out (string workingDirectory, string tempDirectory, string[] args) parsed)
+            {
+                string workingDirectory = null;
+                string tempDirectory = null;
+
+                var args = new List<string>(request.Arguments.Count);
+
+                for (var i = 0; i < request.Arguments.Count; i++)
+                {
+                    var argument = request.Arguments[i];
+                    if (argument.Id == RequestArgument.ArgumentId.CurrentDirectory)
+                    {
+                        workingDirectory = argument.Value;
+                    }
+                    else if (argument.Id == RequestArgument.ArgumentId.TempDirectory)
+                    {
+                        tempDirectory = argument.Value;
+                    }
+                    else if (argument.Id == RequestArgument.ArgumentId.CommandLineArgument)
+                    {
+                        args.Add(argument.Value);
+                    }
+                }
+
+                ServerLogger.Log($"WorkingDirectory = '{workingDirectory}'");
+                ServerLogger.Log($"TempDirectory = '{tempDirectory}'");
+                for (var i = 0; i < args.Count; i++)
+                {
+                    ServerLogger.Log($"Argument[{i}] = '{request.Arguments[i]}'");
+                }
+
+                if (string.IsNullOrEmpty(workingDirectory))
+                {
+                    ServerLogger.Log($"Rejecting build due to missing working directory");
+
+                    parsed = default;
+                    return false;
+                }
+
+                if (string.IsNullOrEmpty(tempDirectory))
+                {
+                    ServerLogger.Log($"Rejecting build due to missing temp directory");
+
+                    parsed = default;
+                    return false;
+                }
+
+                if (string.IsNullOrEmpty(tempDirectory))
+                {
+                    ServerLogger.Log($"Rejecting build due to missing temp directory");
+
+                    parsed = default;
+                    return false;
+                }
+
+                parsed = (workingDirectory, tempDirectory, args.ToArray());
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..63fad347ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class CompositeRazorProjectFileSystem : RazorProjectFileSystem
+    {
+        public CompositeRazorProjectFileSystem(IReadOnlyList<RazorProjectFileSystem> fileSystems)
+        {
+            FileSystems = fileSystems ?? throw new ArgumentNullException(nameof(fileSystems));
+        }
+
+        public IReadOnlyList<RazorProjectFileSystem> FileSystems { get; }
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            foreach (var fileSystem in FileSystems)
+            {
+                foreach (var result in fileSystem.EnumerateItems(basePath))
+                {
+                    yield return result;
+                }
+            }
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            RazorProjectItem razorProjectItem = null;
+            foreach (var fileSystem in FileSystems)
+            {
+                razorProjectItem = fileSystem.GetItem(path);
+                if (razorProjectItem != null && razorProjectItem.Exists)
+                {
+                    return razorProjectItem;
+                }
+            }
+
+            return razorProjectItem;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConcurrentLruCache.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConcurrentLruCache.cs
new file mode 100644
index 0000000000..0220615ec2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConcurrentLruCache.cs
@@ -0,0 +1,207 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    /// <summary>
+    /// Cache with a fixed size that evicts the least recently used members.
+    /// Thread-safe.
+    /// This was taken from https://github.com/dotnet/roslyn/blob/749c0ec135d7d080658dc1aa794d15229c3d10d2/src/Compilers/Core/Portable/InternalUtilities/ConcurrentLruCache.cs.
+    /// </summary>
+    internal class ConcurrentLruCache<TKey, TValue>
+    {
+        private readonly int _capacity;
+
+        private readonly Dictionary<TKey, CacheValue> _cache;
+        private readonly LinkedList<TKey> _nodeList;
+        // This is a naive course-grained lock, it can probably be optimized
+        private readonly object _lockObject = new object();
+
+        public ConcurrentLruCache(int capacity)
+            : this (capacity, EqualityComparer<TKey>.Default)
+        {
+        }
+
+        public ConcurrentLruCache(int capacity, IEqualityComparer<TKey> comparer)
+        {
+            if (capacity <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(capacity));
+            }
+            _capacity = capacity;
+            _cache = new Dictionary<TKey, CacheValue>(capacity, comparer);
+            _nodeList = new LinkedList<TKey>();
+        }
+
+        /// <summary>
+        /// Create cache from an array. The cache capacity will be the size
+        /// of the array. All elements of the array will be added to the 
+        /// cache. If any duplicate keys are found in the array a
+        /// <see cref="ArgumentException"/> will be thrown.
+        /// </summary>
+        public ConcurrentLruCache(KeyValuePair<TKey, TValue>[] array)
+            : this(array.Length)
+        {
+            foreach (var kvp in array)
+            {
+                UnsafeAdd(kvp.Key, kvp.Value);
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                lock (_lockObject)
+                {
+                    return _cache.Count;
+                }
+            }
+        }
+
+        public void Add(TKey key, TValue value)
+        {
+            lock (_lockObject)
+            {
+                UnsafeAdd(key, value);
+            }
+        }
+
+        public TValue GetOrAdd(TKey key, TValue value)
+        {
+            lock (_lockObject)
+            {
+                if (UnsafeTryGetValue(key, out var result))
+                {
+                    return result;
+                }
+                else
+                {
+                    UnsafeAdd(key, value);
+                    return value;
+                }
+            }
+        }
+
+        public bool TryGetValue(TKey key, out TValue value)
+        {
+            lock (_lockObject)
+            {
+                return UnsafeTryGetValue(key, out value);
+            }
+        }
+
+        public bool Remove(TKey key)
+        {
+            lock (_lockObject)
+            {
+                return UnsafeRemove(key);
+            }
+        }
+
+        /// <summary>
+        /// For testing. Very expensive.
+        /// </summary>
+        internal IEnumerable<KeyValuePair<TKey, TValue>> TestingEnumerable
+        {
+            get
+            {
+                lock (_lockObject)
+                {
+                    foreach (var key in _nodeList)
+                    {
+                        var kvp = new KeyValuePair<TKey, TValue>(key, _cache[key].Value);
+                        yield return kvp;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Doesn't lock.
+        /// </summary>
+        private bool UnsafeTryGetValue(TKey key, out TValue value)
+        {
+            if (_cache.TryGetValue(key, out var result))
+            {
+                MoveNodeToTop(result.Node);
+                value = result.Value;
+                return true;
+            }
+            else
+            {
+                value = default(TValue);
+                return false;
+            }
+        }
+
+        private void MoveNodeToTop(LinkedListNode<TKey> node)
+        {
+            if (!object.ReferenceEquals(_nodeList.First, node))
+            {
+                _nodeList.Remove(node);
+                _nodeList.AddFirst(node);
+            }
+        }
+
+        /// <summary>
+        /// Expects non-empty cache. Does not lock.
+        /// </summary>
+        private void UnsafeEvictLastNode()
+        {
+            Debug.Assert(_capacity > 0);
+            var lastNode = _nodeList.Last;
+            _nodeList.Remove(lastNode);
+            _cache.Remove(lastNode.Value);
+        }
+
+        private void UnsafeAddNodeToTop(TKey key, TValue value)
+        {
+            var node = new LinkedListNode<TKey>(key);
+            _cache.Add(key, new CacheValue(value, node));
+            _nodeList.AddFirst(node);
+        }
+
+        /// <summary>
+        /// Doesn't lock.
+        /// </summary>
+        private void UnsafeAdd(TKey key, TValue value)
+        {
+            if (_cache.TryGetValue(key, out var result))
+            {
+                throw new ArgumentException("Key already exists", nameof(key));
+            }
+            else
+            {
+                if (_cache.Count == _capacity)
+                {
+                    UnsafeEvictLastNode();
+                }
+                UnsafeAddNodeToTop(key, value);
+            }
+        }
+
+        private bool UnsafeRemove(TKey key)
+        {
+            _nodeList.Remove(key);
+            return _cache.Remove(key);
+        }
+
+        private struct CacheValue
+        {
+            public CacheValue(TValue value, LinkedListNode<TKey> node)
+            {
+                Value = value;
+                Node = node;
+            }
+
+            public TValue Value { get; }
+
+            public LinkedListNode<TKey> Node { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Connection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Connection.cs
new file mode 100644
index 0000000000..9acf1589c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Connection.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class Connection : IDisposable
+    {
+        public string Identifier { get; protected set; }
+
+        public Stream Stream { get; protected set; }
+
+        public abstract Task WaitForDisconnectAsync(CancellationToken cancellationToken);
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionHost.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionHost.cs
new file mode 100644
index 0000000000..dfa661f77d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionHost.cs
@@ -0,0 +1,148 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.IO.Pipes;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    // Heavily influenced by:
+    // https://github.com/dotnet/roslyn/blob/14aed138a01c448143b9acf0fe77a662e3dfe2f4/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs#L17
+    internal abstract class ConnectionHost
+    {
+        private static int counter;
+
+        public abstract Task<Connection> WaitForConnectionAsync(CancellationToken cancellationToken);
+
+        public static ConnectionHost Create(string pipeName)
+        {
+            return new NamedPipeConnectionHost(pipeName);
+        }
+
+        private static string GetNextIdentifier()
+        {
+            var id = Interlocked.Increment(ref counter);
+            return "connection-" + id;
+        }
+
+        private class NamedPipeConnectionHost : ConnectionHost
+        {
+            // Size of the buffers to use: 64K
+            private const int PipeBufferSize = 0x10000;
+
+            // From https://github.com/dotnet/corefx/blob/29cd6a0b0ac2993cee23ebaf36ca3d4bce6dd75f/src/System.IO.Pipes/ref/System.IO.Pipes.cs#L93.
+            // Using the enum value directly as this option is not available in netstandard.
+            private const PipeOptions PipeOptionCurrentUserOnly = (PipeOptions)536870912;
+
+            private static readonly PipeOptions _pipeOptions = GetPipeOptions();
+
+            public NamedPipeConnectionHost(string pipeName)
+            {
+                PipeName = pipeName;
+            }
+
+            public string PipeName { get; }
+
+            public async override Task<Connection> WaitForConnectionAsync(CancellationToken cancellationToken)
+            {
+                // Create the pipe and begin waiting for a connection. This  doesn't block, but could fail 
+                // in certain circumstances, such as the OS refusing to create the pipe for some reason 
+                // or the pipe was disconnected before we starting listening.
+                var pipeStream = new NamedPipeServerStream(
+                    PipeName,
+                    PipeDirection.InOut,
+                    NamedPipeServerStream.MaxAllowedServerInstances, // Maximum connections.
+                    PipeTransmissionMode.Byte,
+                    _pipeOptions,
+                    PipeBufferSize, // Default input buffer
+                    PipeBufferSize);// Default output buffer
+
+                ServerLogger.Log("Waiting for new connection");
+                await pipeStream.WaitForConnectionAsync(cancellationToken);
+                ServerLogger.Log("Pipe connection detected.");
+
+                if (Environment.Is64BitProcess || Memory.IsMemoryAvailable())
+                {
+                    ServerLogger.Log("Memory available - accepting connection");
+                    return new NamedPipeConnection(pipeStream, GetNextIdentifier());
+                }
+
+                pipeStream.Close();
+                throw new Exception("Insufficient resources to process new connection.");
+            }
+
+            private static PipeOptions GetPipeOptions()
+            {
+                var options = PipeOptions.Asynchronous | PipeOptions.WriteThrough;
+
+                if (Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
+                {
+                    return options | PipeOptionCurrentUserOnly;
+                }
+
+                return options;
+            }
+        }
+
+        private class NamedPipeConnection : Connection
+        {
+            public NamedPipeConnection(NamedPipeServerStream stream, string identifier)
+            {
+                Stream = stream;
+                Identifier = identifier;
+            }
+
+            public async override Task WaitForDisconnectAsync(CancellationToken cancellationToken)
+            {
+                if (!(Stream is PipeStream pipeStream))
+                {
+                    return;
+                }
+
+                // We have to poll for disconnection by reading, PipeStream.IsConnected isn't reliable unless you
+                // actually do a read - which will cause it to update its state.
+                while (!cancellationToken.IsCancellationRequested && pipeStream.IsConnected)
+                {
+                    await Task.Delay(TimeSpan.FromMilliseconds(100), cancellationToken);
+
+                    try
+                    {
+                        ServerLogger.Log($"Before poking pipe {Identifier}.");
+                        await Stream.ReadAsync(Array.Empty<byte>(), 0, 0, cancellationToken);
+                        ServerLogger.Log($"After poking pipe {Identifier}.");
+                    }
+                    catch (OperationCanceledException)
+                    {
+                    }
+                    catch (Exception e)
+                    {
+                        // It is okay for this call to fail.  Errors will be reflected in the
+                        // IsConnected property which will be read on the next iteration.
+                        ServerLogger.LogException(e, $"Error poking pipe {Identifier}.");
+                    }
+                }
+            }
+
+            protected override void Dispose(bool disposing)
+            {
+                ServerLogger.Log($"Pipe {Identifier}: Closing.");
+
+                try
+                {
+                    Stream.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    // The client connection failing to close isn't fatal to the server process.  It is simply a client
+                    // for which we can no longer communicate and that's okay because the Close method indicates we are
+                    // done with the client already.
+                    var message = string.Format($"Pipe {Identifier}: Error closing pipe.");
+                    ServerLogger.LogException(ex, message);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionResult.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionResult.cs
new file mode 100644
index 0000000000..6c20725617
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ConnectionResult.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal struct ConnectionResult
+    {
+        public readonly Reason CloseReason;
+        public readonly TimeSpan? KeepAlive;
+
+        public ConnectionResult(Reason closeReason, TimeSpan? keepAlive = null)
+        {
+            CloseReason = closeReason;
+            KeepAlive = keepAlive;
+        }
+
+        public enum Reason
+        {
+            /// <summary>
+            /// There was an error creating the request object and a compilation was never created.
+            /// </summary>
+            CompilationNotStarted,
+
+            /// <summary>
+            /// The compilation completed and results were provided to the client.
+            /// </summary>
+            CompilationCompleted,
+
+            /// <summary>
+            /// The compilation process was initiated and the client disconnected before the results could be provided to them.
+            /// </summary>
+            ClientDisconnect,
+
+            /// <summary>
+            /// There was an unhandled exception processing the result.
+            /// </summary>
+            ClientException,
+
+            /// <summary>
+            /// There was a request from the client to shutdown the server.
+            /// </summary>
+            ClientShutdownRequest,
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DebugMode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DebugMode.cs
new file mode 100644
index 0000000000..5d38654c52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DebugMode.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class DebugMode
+    {
+        public static void HandleDebugSwitch(ref string[] args)
+        {
+            if (args.Length > 0 && string.Equals("--debug", args[0], StringComparison.OrdinalIgnoreCase))
+            {
+                args = args.Skip(1).ToArray();
+
+                Console.WriteLine("Waiting for debugger in pid: {0}", Process.GetCurrentProcess().Id);
+                while (!Debugger.IsAttached)
+                {
+                    Thread.Sleep(TimeSpan.FromSeconds(3));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionAssemblyLoader.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionAssemblyLoader.cs
new file mode 100644
index 0000000000..05dc4a09eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionAssemblyLoader.cs
@@ -0,0 +1,241 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using System.Runtime.Loader;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class DefaultExtensionAssemblyLoader : ExtensionAssemblyLoader
+    {
+        private readonly string _baseDirectory;
+
+        private readonly object _lock = new object();
+        private readonly Dictionary<string, (Assembly assembly, AssemblyIdentity identity)> _loadedByPath;
+        private readonly Dictionary<AssemblyIdentity, Assembly> _loadedByIdentity;
+        private readonly Dictionary<string, AssemblyIdentity> _identityCache;
+        private readonly Dictionary<string, List<string>> _wellKnownAssemblies;
+
+        private ShadowCopyManager _shadowCopyManager;
+
+        public DefaultExtensionAssemblyLoader(string baseDirectory)
+        {
+            _baseDirectory = baseDirectory;
+
+            _loadedByPath = new Dictionary<string, (Assembly assembly, AssemblyIdentity identity)>(StringComparer.OrdinalIgnoreCase);
+            _loadedByIdentity = new Dictionary<AssemblyIdentity, Assembly>();
+            _identityCache = new Dictionary<string, AssemblyIdentity>(StringComparer.OrdinalIgnoreCase);
+            _wellKnownAssemblies = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+
+            LoadContext = new ExtensionAssemblyLoadContext(AssemblyLoadContext.GetLoadContext(typeof(ExtensionAssemblyLoader).Assembly), this);
+        }
+
+        protected AssemblyLoadContext LoadContext { get; }
+
+        public override void AddAssemblyLocation(string filePath)
+        {
+            if (filePath == null)
+            {
+                throw new ArgumentNullException(nameof(filePath));
+            }
+
+            if (!Path.IsPathRooted(filePath))
+            {
+                throw new ArgumentException(nameof(filePath));
+            }
+
+            var assemblyName = Path.GetFileNameWithoutExtension(filePath);
+            lock (_lock)
+            {
+                if (!_wellKnownAssemblies.TryGetValue(assemblyName, out var paths))
+                {
+                    paths = new List<string>();
+                    _wellKnownAssemblies.Add(assemblyName, paths);
+                }
+
+                if (!paths.Contains(filePath))
+                {
+                    paths.Add(filePath);
+                }
+            }
+        }
+
+        public override Assembly Load(string assemblyName)
+        {
+            if (!AssemblyIdentity.TryParseDisplayName(assemblyName, out var identity))
+            {
+                return null;
+            }
+
+            lock (_lock)
+            {
+                // First, check if this loader already loaded the requested assembly:
+                if (_loadedByIdentity.TryGetValue(identity, out var assembly))
+                {
+                    return assembly;
+                }
+
+                // Second, check if an assembly file of the same simple name was registered with the loader:
+                if (_wellKnownAssemblies.TryGetValue(identity.Name, out var paths))
+                {
+                    // Multiple assemblies of the same simple name but different identities might have been registered.
+                    // Load the one that matches the requested identity (if any).
+                    foreach (var path in paths)
+                    {
+                        var candidateIdentity = GetIdentity(path);
+
+                        if (identity.Equals(candidateIdentity))
+                        {
+                            return LoadFromPathUnsafe(path, candidateIdentity);
+                        }
+                    }
+                }
+
+                // We only support loading by name from 'well-known' paths. If you need to load something by
+                // name and you get here, then that means we don't know where to look.
+                return null;
+            }
+        }
+
+        public override Assembly LoadFromPath(string filePath)
+        {
+            if (filePath == null)
+            {
+                throw new ArgumentNullException(nameof(filePath));
+            }
+
+            if (!Path.IsPathRooted(filePath))
+            {
+                throw new ArgumentException(nameof(filePath));
+            }
+
+            lock (_lock)
+            {
+                return LoadFromPathUnsafe(filePath, identity: null);
+            }
+        }
+
+        private Assembly LoadFromPathUnsafe(string filePath, AssemblyIdentity identity)
+        {
+            // If we've already loaded the assembly by path there should be nothing else to do,
+            // all of our data is up to date.
+            if (_loadedByPath.TryGetValue(filePath, out var entry))
+            {
+                return entry.assembly;
+            }
+
+            // If we've already loaded the assembly by identity, then we might has some updating
+            // to do.
+            identity = identity ?? GetIdentity(filePath);
+            if (identity != null && _loadedByIdentity.TryGetValue(identity, out var assembly))
+            {
+                // An assembly file might be replaced by another file with a different identity.
+                // Last one wins.
+                _loadedByPath[filePath] = (assembly, identity);
+                return assembly;
+            }
+
+            // Ok we don't have this cached. Let's actually try to load the assembly.
+            assembly = LoadFromPathUnsafeCore(CopyAssembly(filePath));
+
+            identity = identity ?? AssemblyIdentity.FromAssemblyDefinition(assembly);
+
+            // It's possible an assembly was loaded by two different paths. Just use the original then.
+            if (_loadedByIdentity.TryGetValue(identity, out var duplicate))
+            {
+                assembly = duplicate;
+            }
+            else
+            {
+                _loadedByIdentity.Add(identity, assembly);
+            }
+
+            _loadedByPath[filePath] = (assembly, identity);
+            return assembly;
+        }
+
+        private AssemblyIdentity GetIdentity(string filePath)
+        {
+            if (!_identityCache.TryGetValue(filePath, out var identity))
+            {
+                identity = ReadAssemblyIdentity(filePath);
+                _identityCache.Add(filePath, identity);
+            }
+
+            return identity;
+        }
+
+        protected virtual string CopyAssembly(string filePath)
+        {
+            if (_baseDirectory == null)
+            {
+                // Don't shadow-copy when base directory is null. This means we're running as a CLI not
+                // a server.
+                return filePath;
+            }
+
+            if (_shadowCopyManager == null)
+            {
+                _shadowCopyManager = new ShadowCopyManager(_baseDirectory);
+            }
+
+            return _shadowCopyManager.AddAssembly(filePath);
+        }
+
+        protected virtual Assembly LoadFromPathUnsafeCore(string filePath)
+        {
+            return LoadContext.LoadFromAssemblyPath(filePath);
+        }
+
+        private static AssemblyIdentity ReadAssemblyIdentity(string filePath)
+        {
+            try
+            {
+                using (var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))
+                using (var reader = new PEReader(stream))
+                {
+                    var metadataReader = reader.GetMetadataReader();
+                    return metadataReader.GetAssemblyIdentity();
+                }
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        private class ExtensionAssemblyLoadContext : AssemblyLoadContext
+        {
+            private readonly AssemblyLoadContext _parent;
+            private readonly DefaultExtensionAssemblyLoader _loader;
+
+            public ExtensionAssemblyLoadContext(AssemblyLoadContext parent, DefaultExtensionAssemblyLoader loader)
+            {
+                _parent = parent;
+                _loader = loader;
+            }
+
+            protected override Assembly Load(AssemblyName assemblyName)
+            {
+                // Try to load from well-known paths. This will be called when loading a dependency of an extension.
+                var assembly = _loader.Load(assemblyName.ToString());
+                if (assembly != null)
+                {
+                    return assembly;
+                }
+
+                // If we don't have an entry, then fall back to the default load context. This allows extensions
+                // to resolve assemblies that are provided by the host.
+                return _parent.LoadFromAssemblyName(assemblyName);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionDependencyChecker.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionDependencyChecker.cs
new file mode 100644
index 0000000000..79d01afb9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultExtensionDependencyChecker.cs
@@ -0,0 +1,158 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class DefaultExtensionDependencyChecker : ExtensionDependencyChecker
+    {
+        // These are treated as prefixes. So `Microsoft.CodeAnalysis.Razor` would be assumed to work.
+        private static readonly string[] DefaultIgnoredAssemblies = new string[]
+        {
+            "mscorlib",
+            "netstandard",
+            "System",
+            "Microsoft.CodeAnalysis",
+            "Microsoft.AspNetCore.Razor.Language",
+        };
+
+        private readonly ExtensionAssemblyLoader _loader;
+        private readonly TextWriter _output;
+        private readonly TextWriter _error;
+        private readonly string[] _ignoredAssemblies;
+
+        public DefaultExtensionDependencyChecker(
+            ExtensionAssemblyLoader loader,
+            TextWriter output,
+            TextWriter error,
+            string[] ignoredAssemblies = null)
+        {
+            _loader = loader;
+            _output = output;
+            _error = error;
+            _ignoredAssemblies = ignoredAssemblies ?? DefaultIgnoredAssemblies;
+        }
+
+        public override bool Check(IEnumerable<string> assmblyFilePaths)
+        {
+            try
+            {
+                return CheckCore(assmblyFilePaths);
+            }
+            catch (Exception ex)
+            {
+                _error.WriteLine("Exception performing Extension dependency check:");
+                _error.WriteLine(ex.ToString());
+                return false;
+            }
+        }
+
+        private bool CheckCore(IEnumerable<string> assemblyFilePaths)
+        {
+            var items = assemblyFilePaths.Select(a => ExtensionVerificationItem.Create(a)).ToArray();
+            var assemblies = new HashSet<AssemblyIdentity>(items.Select(i => i.Identity));
+
+            for (var i = 0; i < items.Length; i++)
+            {
+                var item = items[i];
+                _output.WriteLine($"Verifying assembly at {item.FilePath}");
+
+                if (!Path.IsPathRooted(item.FilePath))
+                {
+                    _error.WriteLine($"The file path '{item.FilePath}' is not a rooted path. File paths must be absolute and fully-qualified.");
+                    return false;
+                }
+
+                foreach (var reference in item.References)
+                {
+                    if (_ignoredAssemblies.Any(n => reference.Name.StartsWith(n)))
+                    {
+                        // This is on the allow list, keep going.
+                        continue;
+                    }
+
+                    if (assemblies.Contains(reference))
+                    {
+                        // This was also provided as a dependency, keep going.
+                        continue;
+                    }
+
+                    // If we get here we can't resolve this assembly. This is an error.
+                    _error.WriteLine($"Extension assembly '{item.Identity.Name}' depends on '{reference.ToString()} which is missing.");
+                    return false;
+                }
+            }
+
+            // Assuming we get this far, the set of assemblies we have is at least a coherent set (barring
+            // version conflicts). Register all of the paths with the loader so they can find each other by
+            // name.
+            for (var i = 0; i < items.Length; i++)
+            {
+                _loader.AddAssemblyLocation(items[i].FilePath);
+            }
+
+            // Now try to load everything. This has the side effect of resolving all of these items
+            // in the loader's caches.
+            for (var i = 0; i < items.Length; i++)
+            {
+                var item = items[i];
+                item.Assembly = _loader.LoadFromPath(item.FilePath);
+            }
+
+            // Third, check that the MVIDs of the files on disk match the MVIDs of the loaded assemblies.
+            for (var i = 0; i < items.Length; i++)
+            {
+                var item = items[i];
+                if (item.Mvid != item.Assembly.ManifestModule.ModuleVersionId)
+                {
+                    _error.WriteLine($"Extension assembly '{item.Identity.Name}' at '{item.FilePath}' has a different ModuleVersionId than loaded assembly '{item.Assembly.FullName}'");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private class ExtensionVerificationItem
+        {
+            public static ExtensionVerificationItem Create(string filePath)
+            {
+                using (var peReader = new PEReader(new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)))
+                {
+                    var metadataReader = peReader.GetMetadataReader();
+                    var identity = metadataReader.GetAssemblyIdentity();
+                    var mvid = metadataReader.GetGuid(metadataReader.GetModuleDefinition().Mvid);
+                    var references = metadataReader.GetReferencedAssembliesOrThrow();
+
+                    return new ExtensionVerificationItem(filePath, identity, mvid, references.ToArray());
+                }
+            }
+
+            private ExtensionVerificationItem(string filePath, AssemblyIdentity identity, Guid mvid, AssemblyIdentity[] references)
+            {
+                FilePath = filePath;
+                Identity = identity;
+                Mvid = mvid;
+                References = references;
+            }
+
+            public string FilePath { get; }
+
+            public Assembly Assembly { get; set; }
+
+            public AssemblyIdentity Identity { get; }
+
+            public Guid Mvid { get; }
+
+            public IReadOnlyList<AssemblyIdentity> References { get; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultRequestDispatcher.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultRequestDispatcher.cs
new file mode 100644
index 0000000000..59d2bbc098
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DefaultRequestDispatcher.cs
@@ -0,0 +1,472 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    // Heavily influenced by:
+    // https://github.com/dotnet/roslyn/blob/14aed138a01c448143b9acf0fe77a662e3dfe2f4/src/Compilers/Server/ServerShared/ServerDispatcher.cs#L15
+    internal class DefaultRequestDispatcher : RequestDispatcher
+    {
+        private readonly CancellationToken _cancellationToken;
+        private readonly CompilerHost _compilerHost;
+        private readonly ConnectionHost _connectionHost;
+        private readonly EventBus _eventBus;
+
+        private KeepAlive _keepAlive;
+        private State _state;
+        private Task _timeoutTask;
+        private Task _gcTask;
+        private Task<Connection> _listenTask;
+        private CancellationTokenSource _listenCancellationTokenSource;
+        private List<Task<ConnectionResult>> _connections = new List<Task<ConnectionResult>>();
+
+        public DefaultRequestDispatcher(
+            ConnectionHost connectionHost,
+            CompilerHost compilerHost,
+            CancellationToken cancellationToken,
+            EventBus eventBus = null,
+            TimeSpan? keepAlive = null)
+        {
+            _connectionHost = connectionHost;
+            _compilerHost = compilerHost;
+            _cancellationToken = cancellationToken;
+
+            _eventBus = eventBus ?? EventBus.Default;
+
+            var keepAliveTimeout = DefaultServerKeepAlive;
+            if (keepAlive.HasValue)
+            {
+                keepAliveTimeout = keepAlive.Value;
+            }
+            _keepAlive = new KeepAlive(keepAliveTimeout, isDefault: true);
+        }
+
+        // The server accepts connections until we reach a state that requires a shutdown. At that
+        // time no new connections will be accepted and the server will drain existing connections.
+        //
+        // The idea is that it's better to let clients fallback to in-proc (and slow down) than it is to keep
+        // running in an undesired state.
+        public override void Run()
+        {
+            _state = State.Running;
+
+            try
+            {
+                Listen();
+
+                do
+                {
+                    Debug.Assert(_listenTask != null);
+
+                    MaybeCreateTimeoutTask();
+                    MaybeCreateGCTask();
+                    WaitForAnyCompletion(_cancellationToken);
+                    CheckCompletedTasks(_cancellationToken);
+                }
+                while (_connections.Count > 0 || _state == State.Running);
+            }
+            finally
+            {
+                _state = State.Completed;
+                _gcTask = null;
+                _timeoutTask = null;
+
+                if (_listenTask != null)
+                {
+                    CloseListenTask();
+                }
+            }
+        }
+
+
+        private void CheckCompletedTasks(CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                HandleCancellation();
+                return;
+            }
+
+            if (_listenTask.IsCompleted)
+            {
+                HandleCompletedListenTask(cancellationToken);
+            }
+
+            if (_timeoutTask?.IsCompleted == true)
+            {
+                HandleCompletedTimeoutTask();
+            }
+
+            if (_gcTask?.IsCompleted == true)
+            {
+                HandleCompletedGCTask();
+            }
+
+            HandleCompletedConnections();
+        }
+
+        private void HandleCancellation()
+        {
+            Debug.Assert(_listenTask != null);
+
+            // If cancellation has been requested then the server needs to be in the process
+            // of shutting down.
+            _state = State.ShuttingDown;
+
+            CloseListenTask();
+
+            try
+            {
+                Task.WaitAll(_connections.ToArray());
+            }
+            catch
+            {
+                // It's expected that some will throw exceptions, in particular OperationCanceledException.  It's
+                // okay for them to throw so long as they complete.
+            }
+
+            HandleCompletedConnections();
+            Debug.Assert(_connections.Count == 0);
+        }
+
+        /// <summary>
+        /// The server farms out work to Task values and this method needs to wait until at least one of them
+        /// has completed.
+        /// </summary>
+        private void WaitForAnyCompletion(CancellationToken cancellationToken)
+        {
+            var all = new List<Task>();
+            all.AddRange(_connections);
+            all.Add(_timeoutTask);
+            all.Add(_listenTask);
+            all.Add(_gcTask);
+
+            try
+            {
+                var waitArray = all.Where(x => x != null).ToArray();
+                Task.WaitAny(waitArray, cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+                // Thrown when the provided cancellationToken is cancelled.  This is handled in the caller,
+                // here it just serves to break out of the WaitAny call.
+            }
+        }
+
+        private void Listen()
+        {
+            Debug.Assert(_listenTask == null);
+            Debug.Assert(_timeoutTask == null);
+
+            _listenCancellationTokenSource = new CancellationTokenSource();
+            _listenTask = _connectionHost.WaitForConnectionAsync(_listenCancellationTokenSource.Token);
+            _eventBus.ConnectionListening();
+        }
+
+        private void CloseListenTask()
+        {
+            Debug.Assert(_listenTask != null);
+
+            _listenCancellationTokenSource.Cancel();
+            _listenCancellationTokenSource = null;
+            _listenTask = null;
+        }
+
+        private void HandleCompletedListenTask(CancellationToken cancellationToken)
+        {
+            _eventBus.ConnectionReceived();
+
+            // Don't accept any new connections once we're in shutdown mode, instead gracefully reject the request.
+            // This should cause the client to run in process.
+            var accept = _state == State.Running;
+            var connectionTask = AcceptConnection(_listenTask, accept, cancellationToken);
+            _connections.Add(connectionTask);
+
+            // Timeout and GC are only done when there are no active connections.  Now that we have a new
+            // connection cancel out these tasks.
+            _timeoutTask = null;
+            _gcTask = null;
+
+            // Begin listening again for new connections.
+            _listenTask = null;
+            Listen();
+        }
+
+        private void HandleCompletedTimeoutTask()
+        {
+            _eventBus.KeepAliveReached();
+            _listenCancellationTokenSource.Cancel();
+            _timeoutTask = null;
+            _state = State.ShuttingDown;
+        }
+
+        private void HandleCompletedGCTask()
+        {
+            _gcTask = null;
+            for (var i = 0; i < 10; i++)
+            {
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+            }
+
+            GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
+            GC.Collect();
+        }
+
+        private void MaybeCreateTimeoutTask()
+        {
+            // If there are no active clients running then the server needs to be in a timeout mode.
+            if (_connections.Count == 0 && _timeoutTask == null)
+            {
+                Debug.Assert(_listenTask != null);
+                _timeoutTask = Task.Delay(_keepAlive.TimeSpan);
+            }
+        }
+
+        private void MaybeCreateGCTask()
+        {
+            if (_connections.Count == 0 && _gcTask == null)
+            {
+                _gcTask = Task.Delay(GCTimeout);
+            }
+        }
+
+        /// <summary>
+        /// Checks the completed connection objects.
+        /// </summary>
+        /// <returns>False if the server needs to begin shutting down</returns>
+        private void HandleCompletedConnections()
+        {
+            var shutdown = false;
+            var processedCount = 0;
+            var i = 0;
+            while (i < _connections.Count)
+            {
+                var current = _connections[i];
+                if (!current.IsCompleted)
+                {
+                    i++;
+                    continue;
+                }
+
+                _connections.RemoveAt(i);
+                processedCount++;
+
+                var result = current.Result;
+                if (result.KeepAlive.HasValue)
+                {
+                    var updated = _keepAlive.Update(result.KeepAlive.Value);
+                    if (updated.Equals(_keepAlive))
+                    {
+                        _eventBus.UpdateKeepAlive(updated.TimeSpan);
+                    }
+                }
+
+                switch (result.CloseReason)
+                {
+                    case ConnectionResult.Reason.CompilationCompleted:
+                    case ConnectionResult.Reason.CompilationNotStarted:
+                        // These are all normal end states.  Nothing to do here.
+                        break;
+
+                    case ConnectionResult.Reason.ClientDisconnect:
+                        // Have to assume the worst here which is user pressing Ctrl+C at the command line and
+                        // hence wanting all compilation to end.
+                        _eventBus.ConnectionRudelyEnded();
+                        shutdown = true;
+                        break;
+
+                    case ConnectionResult.Reason.ClientException:
+                    case ConnectionResult.Reason.ClientShutdownRequest:
+                        _eventBus.ConnectionRudelyEnded();
+                        shutdown = true;
+                        break;
+
+                    default:
+                        throw new InvalidOperationException($"Unexpected enum value {result.CloseReason}");
+                }
+            }
+
+            if (processedCount > 0)
+            {
+                _eventBus.ConnectionCompleted(processedCount);
+            }
+
+            if (shutdown)
+            {
+                _state = State.ShuttingDown;
+            }
+        }
+
+        internal async Task<ConnectionResult> AcceptConnection(Task<Connection> task, bool accept, CancellationToken cancellationToken)
+        {
+            Connection connection;
+            try
+            {
+                connection = await task;
+            }
+            catch (Exception ex)
+            {
+                // Unable to establish a connection with the client.  The client is responsible for
+                // handling this case. Nothing else for us to do here.
+                ServerLogger.LogException(ex, "Error creating client named pipe");
+                return new ConnectionResult(ConnectionResult.Reason.CompilationNotStarted);
+            }
+
+            try
+            {
+                using (connection)
+                {
+                    ServerRequest request;
+                    try
+                    {
+                        ServerLogger.Log("Begin reading request.");
+                        request = await ServerRequest.ReadAsync(connection.Stream, cancellationToken).ConfigureAwait(false);
+                        ServerLogger.Log("End reading request.");
+                    }
+                    catch (Exception e)
+                    {
+                        ServerLogger.LogException(e, "Error reading build request.");
+                        return new ConnectionResult(ConnectionResult.Reason.CompilationNotStarted);
+                    }
+
+                    if (request.IsShutdownRequest())
+                    {
+                        // Reply with the PID of this process so that the client can wait for it to exit.
+                        var response = new ShutdownServerResponse(Process.GetCurrentProcess().Id);
+                        await response.WriteAsync(connection.Stream, cancellationToken);
+
+                        // We can safely disconnect the client, then when this connection gets cleaned up by the event loop
+                        // the server will go to a shutdown state.
+                        return new ConnectionResult(ConnectionResult.Reason.ClientShutdownRequest);
+                    }
+                    else if (!accept)
+                    {
+                        // We're already in shutdown mode, respond gracefully so the client can run in-process.
+                        var response = new RejectedServerResponse();
+                        await response.WriteAsync(connection.Stream, cancellationToken).ConfigureAwait(false);
+
+                        return new ConnectionResult(ConnectionResult.Reason.CompilationNotStarted);
+                    }
+                    else
+                    {
+                        // If we get here then this is a real request that we will accept and process.
+                        //
+                        // Kick off both the compilation and a task to monitor the pipe for closing.
+                        var buildCancelled = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+
+                        var watcher = connection.WaitForDisconnectAsync(buildCancelled.Token);
+                        var worker = ExecuteRequestAsync(request, buildCancelled.Token);
+
+                        // await will end when either the work is complete or the connection is closed.
+                        await Task.WhenAny(worker, watcher);
+
+                        // Do an 'await' on the completed task, preference being compilation, to force
+                        // any exceptions to be realized in this method for logging.
+                        ConnectionResult.Reason reason;
+                        if (worker.IsCompleted)
+                        {
+                            var response = await worker;
+
+                            try
+                            {
+                                ServerLogger.Log("Begin writing response.");
+                                await response.WriteAsync(connection.Stream, cancellationToken);
+                                ServerLogger.Log("End writing response.");
+
+                                reason = ConnectionResult.Reason.CompilationCompleted;
+
+                                _eventBus.CompilationCompleted();
+                            }
+                            catch
+                            {
+                                reason = ConnectionResult.Reason.ClientDisconnect;
+                            }
+                        }
+                        else
+                        {
+                            await watcher;
+                            reason = ConnectionResult.Reason.ClientDisconnect;
+                        }
+
+                        // Begin the tear down of the Task which didn't complete.
+                        buildCancelled.Cancel();
+
+                        return new ConnectionResult(reason, request.KeepAlive);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ServerLogger.LogException(ex, "Error handling connection");
+                return new ConnectionResult(ConnectionResult.Reason.ClientException);
+            }
+        }
+
+        private Task<ServerResponse> ExecuteRequestAsync(ServerRequest buildRequest, CancellationToken cancellationToken)
+        {
+            Func<ServerResponse> func = () =>
+            {
+                ServerLogger.Log("Begin processing request");
+
+                var response = _compilerHost.Execute(buildRequest, cancellationToken);
+
+                ServerLogger.Log("End processing request");
+                return response;
+            };
+
+            var task = new Task<ServerResponse>(func, cancellationToken, TaskCreationOptions.LongRunning);
+            task.Start();
+            return task;
+        }
+
+        private enum State
+        {
+            /// <summary>
+            /// Server running and accepting all requests
+            /// </summary>
+            Running,
+
+            /// <summary>
+            /// Server processing existing requests, responding to shutdown commands but is not accepting
+            /// new build requests.
+            /// </summary>
+            ShuttingDown,
+
+            /// <summary>
+            /// Server is done.
+            /// </summary>
+            Completed,
+        }
+
+        private struct KeepAlive
+        {
+            public TimeSpan TimeSpan;
+            public bool IsDefault;
+
+            public KeepAlive(TimeSpan timeSpan, bool isDefault)
+            {
+                TimeSpan = timeSpan;
+                IsDefault = isDefault;
+            }
+
+            public KeepAlive Update(TimeSpan timeSpan)
+            {
+                if (IsDefault || timeSpan > TimeSpan)
+                {
+                    return new KeepAlive(timeSpan, isDefault: false);
+                }
+
+                return this;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
new file mode 100644
index 0000000000..3ba5eb5ab5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
@@ -0,0 +1,224 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class DiscoverCommand : CommandBase
+    {
+        public DiscoverCommand(Application parent)
+            : base(parent, "discover")
+        {
+            Assemblies = Argument("assemblies", "assemblies to search for tag helpers", multipleValues: true);
+            TagHelperManifest = Option("-o", "output file", CommandOptionType.SingleValue);
+            ProjectDirectory = Option("-p", "project root directory", CommandOptionType.SingleValue);
+            Version = Option("-v|--version", "Razor language version", CommandOptionType.SingleValue);
+            Configuration = Option("-c", "Razor configuration name", CommandOptionType.SingleValue);
+            ExtensionNames = Option("-n", "extension name", CommandOptionType.MultipleValue);
+            ExtensionFilePaths = Option("-e", "extension file path", CommandOptionType.MultipleValue);
+        }
+
+        public CommandArgument Assemblies { get; }
+
+        public CommandOption TagHelperManifest { get; }
+
+        public CommandOption ProjectDirectory { get; }
+
+        public CommandOption Version { get; }
+
+        public CommandOption Configuration { get; }
+
+        public CommandOption ExtensionNames { get; }
+
+        public CommandOption ExtensionFilePaths { get; }
+
+        protected override bool ValidateArguments()
+        {
+            if (string.IsNullOrEmpty(TagHelperManifest.Value()))
+            {
+                Error.WriteLine($"{TagHelperManifest.Description} must be specified.");
+                return false;
+            }
+
+            if (Assemblies.Values.Count == 0)
+            {
+                Error.WriteLine($"{Assemblies.Name} must have at least one value.");
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(ProjectDirectory.Value()))
+            {
+                ProjectDirectory.Values.Add(Environment.CurrentDirectory);
+            }
+
+            if (string.IsNullOrEmpty(Version.Value()))
+            {
+                Error.WriteLine($"{Version.Description} must be specified.");
+                return false;
+            }
+            else if (!RazorLanguageVersion.TryParse(Version.Value(), out _))
+            {
+                Error.WriteLine($"Invalid option {Version.Value()} for Razor language version --version; must be Latest or a valid version in range {RazorLanguageVersion.Version_1_0} to {RazorLanguageVersion.Latest}.");
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(Configuration.Value()))
+            {
+                Error.WriteLine($"{Configuration.Description} must be specified.");
+                return false;
+            }
+
+            if (ExtensionNames.Values.Count != ExtensionFilePaths.Values.Count)
+            {
+                Error.WriteLine($"{ExtensionNames.Description} and {ExtensionFilePaths.Description} should have the same number of values.");
+            }
+
+            foreach (var filePath in ExtensionFilePaths.Values)
+            {
+                if (!Path.IsPathRooted(filePath))
+                {
+                    Error.WriteLine($"Extension file paths must be fully-qualified, absolute paths.");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        protected override Task<int> ExecuteCoreAsync()
+        {
+            if (!Parent.Checker.Check(ExtensionFilePaths.Values))
+            {
+                Error.WriteLine($"Extenions could not be loaded. See output for details.");
+                return Task.FromResult(ExitCodeFailure);
+            }
+
+            // Loading all of the extensions should succeed as the dependency checker will have already
+            // loaded them.
+            var extensions = new RazorExtension[ExtensionNames.Values.Count];
+            for (var i = 0; i < ExtensionNames.Values.Count; i++)
+            {
+                extensions[i] = new AssemblyExtension(ExtensionNames.Values[i], Parent.Loader.LoadFromPath(ExtensionFilePaths.Values[i]));
+            }
+
+            var version = RazorLanguageVersion.Parse(Version.Value());
+            var configuration = RazorConfiguration.Create(version, Configuration.Value(), extensions);
+
+            var result = ExecuteCore(
+                configuration: configuration,
+                projectDirectory: ProjectDirectory.Value(),
+                outputFilePath: TagHelperManifest.Value(),
+                assemblies: Assemblies.Values.ToArray());
+
+            return Task.FromResult(result);
+        }
+
+        private int ExecuteCore(RazorConfiguration configuration, string projectDirectory, string outputFilePath, string[] assemblies)
+        {
+            outputFilePath = Path.Combine(projectDirectory, outputFilePath);
+
+            var metadataReferences = new MetadataReference[assemblies.Length];
+            for (var i = 0; i < assemblies.Length; i++)
+            {
+                metadataReferences[i] = Parent.AssemblyReferenceProvider(assemblies[i], default(MetadataReferenceProperties));
+            }
+
+            var engine = RazorProjectEngine.Create(configuration, RazorProjectFileSystem.Empty, b =>
+            {
+                b.Features.Add(new DefaultMetadataReferenceFeature() { References = metadataReferences });
+                b.Features.Add(new CompilationTagHelperFeature());
+                b.Features.Add(new DefaultTagHelperDescriptorProvider());
+                b.Features.Add(new ComponentTagHelperDescriptorProvider());
+            });
+
+            var feature = engine.Engine.Features.OfType<ITagHelperFeature>().Single();
+            var tagHelpers = feature.GetDescriptors();
+
+            using (var stream = new MemoryStream())
+            {
+                Serialize(stream, tagHelpers);
+
+                stream.Position = 0;
+
+                var newHash = Hash(stream);
+                var existingHash = Hash(outputFilePath);
+
+                if (!HashesEqual(newHash, existingHash))
+                {
+                    stream.Position = 0;
+                    using (var output = File.Open(outputFilePath, FileMode.Create))
+                    {
+                        stream.CopyTo(output);
+                    }
+                }
+            }
+
+            return ExitCodeSuccess;
+        }
+
+        private static byte[] Hash(string path)
+        {
+            if (!File.Exists(path))
+            {
+                return Array.Empty<byte>();
+            }
+
+            using (var stream = File.OpenRead(path))
+            {
+                return Hash(stream);
+            }
+        }
+
+        private static byte[] Hash(Stream stream)
+        {
+            using (var sha = SHA256.Create())
+            {
+                sha.ComputeHash(stream);
+                return sha.Hash;
+            }
+        }
+
+        private bool HashesEqual(byte[] x, byte[] y)
+        {
+            if (x.Length != y.Length)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < x.Length; i++)
+            {
+                if (x[i] != y[i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static void Serialize(Stream stream, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096, leaveOpen: true))
+            {
+                var serializer = new JsonSerializer();
+                serializer.Converters.Add(new TagHelperDescriptorJsonConverter());
+                serializer.Converters.Add(new RazorDiagnosticJsonConverter());
+
+                serializer.Serialize(writer, tagHelpers);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/EventBus.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/EventBus.cs
new file mode 100644
index 0000000000..dacd5c07e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/EventBus.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class EventBus
+    {
+        public static readonly EventBus Default = new DefaultEventBus();
+
+        /// <summary>
+        /// Called when the server updates the keep alive value.
+        /// </summary>
+        public virtual void UpdateKeepAlive(TimeSpan timeSpan)
+        {
+        }
+
+        /// <summary>
+        /// Called each time the server listens for new connections.
+        /// </summary>
+        public virtual void ConnectionListening()
+        {
+        }
+
+        /// <summary>
+        /// Called when a connection to the server occurs.
+        /// </summary>
+        public virtual void ConnectionReceived()
+        {
+        }
+
+        /// <summary>
+        /// Called when one or more connections have completed processing.  The number of connections
+        /// processed is provided in <paramref name="count"/>.
+        /// </summary>
+        public virtual void ConnectionCompleted(int count)
+        {
+        }
+        
+        /// <summary>
+        /// Called when a compilation is completed successfully and the response is written to the stream.
+        /// </summary>
+        public virtual void CompilationCompleted()
+        {
+        }
+
+        /// <summary>
+        /// Called when a bad client connection was detected and the server will be shutting down as a 
+        /// result.
+        /// </summary>
+        public virtual void ConnectionRudelyEnded()
+        {
+        }
+
+        /// <summary>
+        /// Called when the server is shutting down because the keep alive timeout was reached.
+        /// </summary>
+        public virtual void KeepAliveReached()
+        {
+        }
+
+        private class DefaultEventBus : EventBus
+        {
+
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionAssemblyLoader.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionAssemblyLoader.cs
new file mode 100644
index 0000000000..071eec2f82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionAssemblyLoader.cs
@@ -0,0 +1,16 @@
+// 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.Reflection;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class ExtensionAssemblyLoader
+    {
+        public abstract void AddAssemblyLocation(string filePath);
+
+        public abstract Assembly Load(string assemblyName);
+
+        public abstract Assembly LoadFromPath(string filePath);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionDependencyChecker.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionDependencyChecker.cs
new file mode 100644
index 0000000000..02fd86d9e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ExtensionDependencyChecker.cs
@@ -0,0 +1,12 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class ExtensionDependencyChecker
+    {
+        public abstract bool Check(IEnumerable<string> extensionFilePaths);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
new file mode 100644
index 0000000000..338c496033
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -0,0 +1,372 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class GenerateCommand : CommandBase
+    {
+        public GenerateCommand(Application parent)
+            : base(parent, "generate")
+        {
+            Sources = Option("-s", ".cshtml files to compile", CommandOptionType.MultipleValue);
+            Outputs = Option("-o", "Generated output file path", CommandOptionType.MultipleValue);
+            RelativePaths = Option("-r", "Relative path", CommandOptionType.MultipleValue);
+            DocumentKinds = Option("-k", "Document kind", CommandOptionType.MultipleValue);
+            ProjectDirectory = Option("-p", "project root directory", CommandOptionType.SingleValue);
+            TagHelperManifest = Option("-t", "tag helper manifest file", CommandOptionType.SingleValue);
+            Version = Option("-v|--version", "Razor language version", CommandOptionType.SingleValue);
+            Configuration = Option("-c", "Razor configuration name", CommandOptionType.SingleValue);
+            ExtensionNames = Option("-n", "extension name", CommandOptionType.MultipleValue);
+            ExtensionFilePaths = Option("-e", "extension file path", CommandOptionType.MultipleValue);
+            GenerateDeclaration = Option("--generate-declaration", "Generate declaration", CommandOptionType.NoValue);
+        }
+
+        public CommandOption Sources { get; }
+
+        public CommandOption Outputs { get; }
+
+        public CommandOption RelativePaths { get; }
+
+        public CommandOption DocumentKinds { get; }
+
+        public CommandOption ProjectDirectory { get; }
+
+        public CommandOption TagHelperManifest { get; }
+
+        public CommandOption Version { get; }
+
+        public CommandOption Configuration { get; }
+
+        public CommandOption ExtensionNames { get; }
+
+        public CommandOption ExtensionFilePaths { get; }
+
+        public CommandOption GenerateDeclaration { get; }
+
+        protected override Task<int> ExecuteCoreAsync()
+        {
+            if (!Parent.Checker.Check(ExtensionFilePaths.Values))
+            {
+                Error.WriteLine($"Extensions could not be loaded. See output for details.");
+                return Task.FromResult(ExitCodeFailure);
+            }
+
+            // Loading all of the extensions should succeed as the dependency checker will have already
+            // loaded them.
+            var extensions = new RazorExtension[ExtensionNames.Values.Count];
+            for (var i = 0; i < ExtensionNames.Values.Count; i++)
+            {
+                extensions[i] = new AssemblyExtension(ExtensionNames.Values[i], Parent.Loader.LoadFromPath(ExtensionFilePaths.Values[i]));
+            }
+
+            var version = RazorLanguageVersion.Parse(Version.Value());
+            var configuration = RazorConfiguration.Create(version, Configuration.Value(), extensions);
+
+            var sourceItems = GetSourceItems(ProjectDirectory.Value(), Sources.Values, Outputs.Values, RelativePaths.Values, DocumentKinds.Values);
+
+            var result = ExecuteCore(
+                configuration: configuration,
+                projectDirectory: ProjectDirectory.Value(),
+                tagHelperManifest: TagHelperManifest.Value(),
+                sourceItems: sourceItems);
+
+            return Task.FromResult(result);
+        }
+
+        protected override bool ValidateArguments()
+        {
+            if (Sources.Values.Count == 0)
+            {
+                Error.WriteLine($"{Sources.Description} should have at least one value.");
+                return false;
+            }
+
+            if (Outputs.Values.Count != Sources.Values.Count)
+            {
+                Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {Outputs.Description} has {Outputs.Values.Count} values.");
+                return false;
+            }
+
+            if (RelativePaths.Values.Count != Sources.Values.Count)
+            {
+                Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {RelativePaths.Description} has {RelativePaths.Values.Count} values.");
+                return false;
+            }
+
+            if (DocumentKinds.Values.Count != 0 && DocumentKinds.Values.Count != Sources.Values.Count)
+            {
+                // 2.x tasks do not specify DocumentKinds - in which case, no values will be present. If a kind for one document is specified, we expect as many kind entries
+                // as sources.
+                Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {DocumentKinds.Description} has {DocumentKinds.Values.Count} values.");
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(ProjectDirectory.Value()))
+            {
+                ProjectDirectory.Values.Add(Environment.CurrentDirectory);
+            }
+
+            if (string.IsNullOrEmpty(Version.Value()))
+            {
+                Error.WriteLine($"{Version.Description} must be specified.");
+                return false;
+            }
+            else if (!RazorLanguageVersion.TryParse(Version.Value(), out _))
+            {
+                Error.WriteLine($"Invalid option {Version.Value()} for Razor language version --version; must be Latest or a valid version in range {RazorLanguageVersion.Version_1_0} to {RazorLanguageVersion.Latest}.");
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(Configuration.Value()))
+            {
+                Error.WriteLine($"{Configuration.Description} must be specified.");
+                return false;
+            }
+
+            if (ExtensionNames.Values.Count != ExtensionFilePaths.Values.Count)
+            {
+                Error.WriteLine($"{ExtensionNames.Description} and {ExtensionFilePaths.Description} should have the same number of values.");
+            }
+
+            foreach (var filePath in ExtensionFilePaths.Values)
+            {
+                if (!Path.IsPathRooted(filePath))
+                {
+                    Error.WriteLine($"Extension file paths must be fully-qualified, absolute paths.");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private int ExecuteCore(
+            RazorConfiguration configuration,
+            string projectDirectory,
+            string tagHelperManifest,
+            SourceItem[] sourceItems)
+        {
+            tagHelperManifest = Path.Combine(projectDirectory, tagHelperManifest);
+
+            var tagHelpers = GetTagHelpers(tagHelperManifest);
+
+            var compositeFileSystem = new CompositeRazorProjectFileSystem(new[]
+            {
+                GetVirtualRazorProjectSystem(sourceItems),
+                RazorProjectFileSystem.Create(projectDirectory),
+            });
+
+            var engine = RazorProjectEngine.Create(configuration, compositeFileSystem, b =>
+            {
+                b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
+                b.Features.Add(new InputDocumentKindClassifierPass(sourceItems));
+
+                if (GenerateDeclaration.HasValue())
+                {
+                    b.Features.Add(new SetSuppressPrimaryMethodBodyOptionFeature());
+                }
+            });
+
+            var results = GenerateCode(engine, sourceItems);
+
+            var success = true;
+
+            foreach (var result in results)
+            {
+                var errorCount = result.CSharpDocument.Diagnostics.Count;
+                if (errorCount > 0)
+                {
+                    success = false;
+
+                    for (var i = 0; i < errorCount; i++)
+                    {
+                        var error = result.CSharpDocument.Diagnostics[i];
+                        Error.WriteLine(error.ToString());
+
+                        // Only show the first 100 errors to prevent massive string allocations.
+                        if (i == 99)
+                        {
+                            Error.WriteLine($"And {errorCount - i + 1} more errors.");
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    // Only output the file if we generated it without errors.
+                    var outputFilePath = result.InputItem.OutputPath;
+                    File.WriteAllText(outputFilePath, result.CSharpDocument.GeneratedCode);
+                }
+            }
+
+            return success ? ExitCodeSuccess : ExitCodeFailureRazorError;
+        }
+
+        private VirtualRazorProjectFileSystem GetVirtualRazorProjectSystem(SourceItem[] inputItems)
+        {
+            var project = new VirtualRazorProjectFileSystem();
+            foreach (var item in inputItems)
+            {
+                var projectItem = new DefaultRazorProjectItem(
+                    basePath: "/",
+                    filePath: item.FilePath,
+                    relativePhysicalPath: item.RelativePhysicalPath,
+                    file: new FileInfo(item.SourcePath));
+
+                project.Add(projectItem);
+            }
+
+            return project;
+        }
+
+        private IReadOnlyList<TagHelperDescriptor> GetTagHelpers(string tagHelperManifest)
+        {
+            if (!File.Exists(tagHelperManifest))
+            {
+                return Array.Empty<TagHelperDescriptor>();
+            }
+
+            using (var stream = File.OpenRead(tagHelperManifest))
+            {
+                var reader = new JsonTextReader(new StreamReader(stream));
+
+                var serializer = new JsonSerializer();
+                serializer.Converters.Add(new RazorDiagnosticJsonConverter());
+                serializer.Converters.Add(new TagHelperDescriptorJsonConverter());
+
+                var descriptors = serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
+                return descriptors;
+            }
+        }
+
+        private SourceItem[] GetSourceItems(string projectDirectory, List<string> sources, List<string> outputs, List<string> relativePath, List<string> documentKinds)
+        {
+            var items = new SourceItem[sources.Count];
+            for (var i = 0; i < items.Length; i++)
+            {
+                var outputPath = Path.Combine(projectDirectory, outputs[i]);
+                var documentKind = documentKinds.Count > 0 ? documentKinds[i] : "mvc";
+
+                items[i] = new SourceItem(sources[i], outputs[i], relativePath[i], documentKind);
+            }
+
+            return items;
+        }
+
+        private OutputItem[] GenerateCode(RazorProjectEngine engine, SourceItem[] inputs)
+        {
+            var outputs = new OutputItem[inputs.Length];
+            Parallel.For(0, outputs.Length, new ParallelOptions() { MaxDegreeOfParallelism = Debugger.IsAttached ? 1 : 4 }, i =>
+            {
+                var inputItem = inputs[i];
+
+                var codeDocument = engine.Process(engine.FileSystem.GetItem(inputItem.FilePath));
+                var csharpDocument = codeDocument.GetCSharpDocument();
+                outputs[i] = new OutputItem(inputItem, csharpDocument);
+            });
+
+            return outputs;
+        }
+
+        private struct OutputItem
+        {
+            public OutputItem(
+                SourceItem inputItem,
+                RazorCSharpDocument cSharpDocument)
+            {
+                InputItem = inputItem;
+                CSharpDocument = cSharpDocument;
+            }
+
+            public SourceItem InputItem { get; }
+
+            public RazorCSharpDocument CSharpDocument { get; }
+        }
+
+        private readonly struct SourceItem
+        {
+            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath, string documentKind)
+            {
+                SourcePath = sourcePath;
+                OutputPath = outputPath;
+                RelativePhysicalPath = physicalRelativePath;
+                FilePath = '/' + physicalRelativePath
+                    .Replace(Path.DirectorySeparatorChar, '/')
+                    .Replace("//", "/");
+                DocumentKind = documentKind;
+            }
+
+            public string SourcePath { get; }
+
+            public string OutputPath { get; }
+
+            public string RelativePhysicalPath { get; }
+
+            public string FilePath { get; }
+
+            public string DocumentKind { get; }
+        }
+
+        private class StaticTagHelperFeature : ITagHelperFeature
+        {
+            public RazorEngine Engine { get; set; }
+
+            public IReadOnlyList<TagHelperDescriptor> TagHelpers { get; set; }
+
+            public IReadOnlyList<TagHelperDescriptor> GetDescriptors() => TagHelpers;
+        }
+
+        private class SetSuppressPrimaryMethodBodyOptionFeature : RazorEngineFeatureBase, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            public int Order { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                if (options == null)
+                {
+                    throw new ArgumentNullException(nameof(options));
+                }
+
+                options.SuppressPrimaryMethodBody = true;
+            }
+        }
+
+        private class InputDocumentKindClassifierPass : RazorEngineFeatureBase, IRazorDocumentClassifierPass
+        {
+            public InputDocumentKindClassifierPass(SourceItem[] sourceItems)
+            {
+                DocumentKinds = new Dictionary<string, string>(sourceItems.Length, StringComparer.OrdinalIgnoreCase);
+                for (var i = 0; i < sourceItems.Length; i++)
+                {
+                    var item = sourceItems[i];
+                    DocumentKinds[item.SourcePath] = item.DocumentKind;
+                }
+            }
+
+            // Run before other document classifiers
+            public int Order => -1000;
+
+            public Dictionary<string, string> DocumentKinds { get; }
+
+            public void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                if (DocumentKinds.TryGetValue(codeDocument.Source.FilePath, out var kind))
+                {
+                    codeDocument.SetInputDocumentKind(kind);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Memory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Memory.cs
new file mode 100644
index 0000000000..e0187ed633
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Memory.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class Memory
+    {
+        public static bool IsMemoryAvailable()
+        {
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataCache.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataCache.cs
new file mode 100644
index 0000000000..b0f9fd025e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataCache.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection.PortableExecutable;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class MetadataCache
+    {
+        // Store 1000 entries -- arbitrary number
+        private const int CacheSize = 1000;
+        private readonly ConcurrentLruCache<string, MetadataCacheEntry> _metadataCache =
+            new ConcurrentLruCache<string, MetadataCacheEntry>(CacheSize, StringComparer.OrdinalIgnoreCase);
+
+        // For testing purposes only.
+        internal ConcurrentLruCache<string, MetadataCacheEntry> Cache => _metadataCache;
+
+        internal Metadata GetMetadata(string fullPath)
+        {
+            var timestamp = GetFileTimeStamp(fullPath);
+
+            // Check if we have an entry in the dictionary.
+            if (_metadataCache.TryGetValue(fullPath, out var entry))
+            {
+                if (timestamp.HasValue && timestamp.Value == entry.Timestamp)
+                {
+                    // The file has not changed since we cached it. Return the cached entry.
+                    return entry.Metadata;
+                }
+                else
+                {
+                    // The file has changed recently. Remove the cache entry.
+                    _metadataCache.Remove(fullPath);
+                }
+            }
+
+            Metadata metadata;
+            using (var fileStream = File.OpenRead(fullPath))
+            {
+                metadata = AssemblyMetadata.CreateFromStream(fileStream, PEStreamOptions.PrefetchMetadata);
+            }
+
+            _metadataCache.GetOrAdd(fullPath, new MetadataCacheEntry(timestamp.Value, metadata));
+
+            return metadata;
+        }
+
+        private static DateTime? GetFileTimeStamp(string fullPath)
+        {
+            try
+            {
+                Debug.Assert(Path.IsPathRooted(fullPath));
+
+                return File.GetLastWriteTimeUtc(fullPath);
+            }
+            catch (Exception e)
+            {
+                // There are several exceptions that can occur here: NotSupportedException or PathTooLongException
+                // for a bad path, UnauthorizedAccessException for access denied, etc. Rather than listing them all,
+                // just catch all exceptions and log.
+                ServerLogger.LogException(e, $"Error getting timestamp of file {fullPath}.");
+
+                return null;
+            }
+        }
+
+        internal struct MetadataCacheEntry
+        {
+            public MetadataCacheEntry(DateTime timestamp, Metadata metadata)
+            {
+                Debug.Assert(timestamp.Kind == DateTimeKind.Utc);
+
+                Timestamp = timestamp;
+                Metadata = metadata;
+            }
+
+            public DateTime Timestamp { get; }
+
+            public Metadata Metadata { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataReaderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataReaderExtensions.cs
new file mode 100644
index 0000000000..17da6b63be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MetadataReaderExtensions.cs
@@ -0,0 +1,94 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Reflection;
+using System.Reflection.Metadata;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class MetadataReaderExtensions
+    {
+        internal static AssemblyIdentity GetAssemblyIdentity(this MetadataReader reader)
+        {
+            if (!reader.IsAssembly)
+            {
+                throw new BadImageFormatException();
+            }
+
+            var definition = reader.GetAssemblyDefinition();
+
+            return CreateAssemblyIdentity(
+                reader,
+                definition.Version,
+                definition.Flags,
+                definition.PublicKey,
+                definition.Name,
+                definition.Culture,
+                isReference: false);
+        }
+        
+        internal static AssemblyIdentity[] GetReferencedAssembliesOrThrow(this MetadataReader reader)
+        {
+            var references = new List<AssemblyIdentity>();
+
+            foreach (var referenceHandle in reader.AssemblyReferences)
+            {
+                var reference = reader.GetAssemblyReference(referenceHandle);
+                references.Add(CreateAssemblyIdentity(
+                    reader,
+                    reference.Version,
+                    reference.Flags,
+                    reference.PublicKeyOrToken,
+                    reference.Name,
+                    reference.Culture,
+                    isReference: true));
+            }
+
+            return references.ToArray();
+        }
+        
+        private static AssemblyIdentity CreateAssemblyIdentity(
+            MetadataReader reader,
+            Version version,
+            AssemblyFlags flags,
+            BlobHandle publicKey,
+            StringHandle name,
+            StringHandle culture,
+            bool isReference)
+        {
+            var publicKeyOrToken = reader.GetBlobContent(publicKey);
+            bool hasPublicKey;
+
+            if (isReference)
+            {
+                hasPublicKey = (flags & AssemblyFlags.PublicKey) != 0;
+            }
+            else
+            {
+                // Assembly definitions never contain a public key token, they only can have a full key or nothing,
+                // so the flag AssemblyFlags.PublicKey does not make sense for them and is ignored.
+                // See Ecma-335, Partition II Metadata, 22.2 "Assembly : 0x20".
+                // This also corresponds to the behavior of the native C# compiler and sn.exe tool.
+                hasPublicKey = !publicKeyOrToken.IsEmpty;
+            }
+
+            if (publicKeyOrToken.IsEmpty)
+            {
+                publicKeyOrToken = default;
+            }
+
+            return new AssemblyIdentity(
+                name: reader.GetString(name),
+                version: version,
+                cultureName: culture.IsNil ? null : reader.GetString(culture),
+                publicKeyOrToken: publicKeyOrToken,
+                hasPublicKey: hasPublicKey,
+                isRetargetable: (flags & AssemblyFlags.Retargetable) != 0,
+                contentType: (AssemblyContentType)((int)(flags & AssemblyFlags.ContentTypeMask) >> 9));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
new file mode 100644
index 0000000000..a3ab14c41f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>rzc</AssemblyName>
+
+    <!-- This is not a package, it is part of Razor SDK. -->
+    <IsPackable>false</IsPackable>
+    <EnableApiCheck>false</EnableApiCheck>
+
+    <!-- Don't produce rzc.exe -->
+    <UseAppHost>false</UseAppHost>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\TagHelperDescriptorJsonConverter.cs">
+      <Link>Shared\TagHelperDescriptorJsonConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\RazorDiagnosticJsonConverter.cs">
+      <Link>Shared\RazorDiagnosticJsonConverter.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+  <!-- This makes it so that the runtimeconfig.json is included as part of the build output of the project that references this project. -->
+  <Target Name="PreserveRuntimeConfig" BeforeTargets="GetCopyToOutputDirectoryItems">
+    <ItemGroup>
+      <AllItemsFullPathWithTargetPath Include="$(ProjectRuntimeConfigFilePath)">
+        <TargetPath>$(ProjectRuntimeConfigFileName)</TargetPath>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </AllItemsFullPathWithTargetPath>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MutexName.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MutexName.cs
new file mode 100644
index 0000000000..e12888080b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/MutexName.cs
@@ -0,0 +1,22 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class MutexName
+    {
+        public static string GetClientMutexName(string pipeName)
+        {
+            return $"{pipeName}.client";
+        }
+
+        public static string GetServerMutexName(string pipeName)
+        {
+            // We want to prefix this with Global\ because we want this mutex to be visible
+            // across terminal sessions which is useful for cases like shutdown.
+            // https://msdn.microsoft.com/en-us/library/system.threading.mutex(v=vs.110).aspx#Remarks
+            // This still wouldn't allow other users to access the server because the pipe will fail to connect.
+            return $"Global\\{pipeName}.server";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/PipeName.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/PipeName.cs
new file mode 100644
index 0000000000..23fc72f90c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/PipeName.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class PipeName
+    {
+        // We want each pipe to unique and predictable based on the inputs of:
+        // - user (security)
+        // - path of tool on disk (version)
+        // 
+        // This allows us to meet the security and version compat requirements just by selecting a pipe name.
+        //
+        // This is similar to (and based on) the code used by Roslyn in VBCSCompiler:
+        // https://github.com/dotnet/roslyn/blob/c273b6a9f19570a344c274ae89185b3a2b64d93d/src/Compilers/Shared/BuildServerConnection.cs#L528
+        public static string ComputeDefault(string toolDirectory = null)
+        {
+            if (string.IsNullOrEmpty(toolDirectory))
+            {
+                // This can be null in cases where we don't have a way of knowing the tool assembly path like when someone manually
+                // invokes the cli tool without passing in a pipe name as argument.
+                toolDirectory = AppDomain.CurrentDomain.BaseDirectory;
+            }
+
+            // Include a prefix so we can't conflict with VBCSCompiler if we somehow end up in the same directory.
+            // That would be a pretty wacky bug to try and unravel.
+            var baseName = ComputeBaseName("Razor:" + toolDirectory);
+
+            // Prefix with username
+            var userName = Environment.UserName;
+            if (userName == null)
+            {
+                return null;
+            }
+
+            return $"{userName}.{baseName}";
+        }
+        
+        private static string ComputeBaseName(string baseDirectory)
+        {
+            // Normalize away trailing slashes. File APIs are not consistent about including it, so it's
+            // best to normalize and avoid ending up with two servers running accidentally.
+            baseDirectory = baseDirectory.TrimEnd(Path.DirectorySeparatorChar);
+
+            using (var sha = SHA256.Create())
+            {
+                var bytes = sha.ComputeHash(Encoding.UTF8.GetBytes(baseDirectory));
+                return Convert.ToBase64String(bytes)
+                    .Substring(0, 25) // We only have ~50 total characters on Mac, so strip that down
+                    .Replace("/", "_")
+                    .Replace("=", string.Empty);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Program.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Program.cs
new file mode 100644
index 0000000000..3cd93a2335
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Program.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class Program
+    {
+        public static int Main(string[] args)
+        {
+            DebugMode.HandleDebugSwitch(ref args);
+
+            var cancel = new CancellationTokenSource();
+            Console.CancelKeyPress += (sender, e) => { cancel.Cancel(); };
+
+            var outputWriter = new StringWriter();
+            var errorWriter = new StringWriter();
+
+            // Prevent shadow copying.
+            var loader = new DefaultExtensionAssemblyLoader(baseDirectory: null);
+            var checker = new DefaultExtensionDependencyChecker(loader, outputWriter, errorWriter);
+
+            var application = new Application(
+                cancel.Token,
+                loader,
+                checker,
+                (path, properties) => MetadataReference.CreateFromFile(path, properties),
+                outputWriter,
+                errorWriter);
+
+            var result = application.Execute(args);
+
+            var output = outputWriter.ToString();
+            var error = errorWriter.ToString();
+
+            outputWriter.Dispose();
+            errorWriter.Dispose();
+
+            Console.Write(output);
+            Console.Error.Write(error);
+
+            // This will no-op if server logging is not enabled.
+            ServerLogger.Log(output);
+            ServerLogger.Log(error);
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3770a8065e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.NET.Sdk.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/RequestDispatcher.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/RequestDispatcher.cs
new file mode 100644
index 0000000000..1b46d1cbf7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/RequestDispatcher.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal abstract class RequestDispatcher
+    {
+        /// <summary>
+        /// Default time the server will stay alive after the last request disconnects.
+        /// </summary>
+        public static readonly TimeSpan DefaultServerKeepAlive = TimeSpan.FromMinutes(10);
+
+        /// <summary>
+        /// Time to delay after the last connection before initiating a garbage collection
+        /// in the server.
+        /// </summary>
+        public static readonly TimeSpan GCTimeout = TimeSpan.FromSeconds(30);
+
+        public abstract void Run();
+
+        public static RequestDispatcher Create(ConnectionHost connectionHost, CompilerHost compilerHost, CancellationToken cancellationToken, EventBus eventBus, TimeSpan? keepAlive = null)
+        {
+            return new DefaultRequestDispatcher(connectionHost, compilerHost, cancellationToken, eventBus, keepAlive);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerCommand.cs
new file mode 100644
index 0000000000..a4aee01b3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerCommand.cs
@@ -0,0 +1,188 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class ServerCommand : CommandBase
+    {
+        public ServerCommand(Application parent)
+            : base(parent, "server")
+        {
+            Pipe = Option("-p|--pipe", "name of named pipe", CommandOptionType.SingleValue);
+            KeepAlive = Option("-k|--keep-alive", "sets the default idle timeout for the server in seconds", CommandOptionType.SingleValue);
+        }
+
+        // For testing purposes only.
+        internal ServerCommand(Application parent, string pipeName, int? keepAlive = null)
+            : this(parent)
+        {
+            if (!string.IsNullOrEmpty(pipeName))
+            {
+                Pipe.Values.Add(pipeName);
+            }
+
+            if (keepAlive.HasValue)
+            {
+                KeepAlive.Values.Add(keepAlive.Value.ToString());
+            }
+        }
+
+        public CommandOption Pipe { get; }
+
+        public CommandOption KeepAlive { get; }
+
+        protected override bool ValidateArguments()
+        {
+            if (string.IsNullOrEmpty(Pipe.Value()))
+            {
+                Pipe.Values.Add(PipeName.ComputeDefault());
+            }
+
+            return true;
+        }
+
+        protected override Task<int> ExecuteCoreAsync()
+        {
+            // Make sure there's only one server with the same identity at a time.
+            var serverMutexName = MutexName.GetServerMutexName(Pipe.Value());
+            Mutex serverMutex = null;
+            var holdsMutex = false;
+
+            try
+            {
+                serverMutex = new Mutex(initiallyOwned: true, name: serverMutexName, createdNew: out holdsMutex);
+            }
+            catch (Exception ex)
+            {
+                // The Mutex constructor can throw in certain cases. One specific example is docker containers
+                // where the /tmp directory is restricted. In those cases there is no reliable way to execute
+                // the server and we need to fall back to the command line.
+                // Example: https://github.com/dotnet/roslyn/issues/24124
+
+                Error.Write($"Server mutex creation failed. {ex.Message}");
+
+                return Task.FromResult(-1);
+            }
+
+            if (!holdsMutex)
+            {
+                // Another server is running, just exit.
+                Error.Write("Another server already running...");
+                return Task.FromResult(1);
+            }
+
+            FileStream pidFileStream = null;
+            try
+            {
+                try
+                {
+                    // Write the process and pipe information to a file in a well-known location.
+                    pidFileStream = WritePidFile();
+                }
+                catch (Exception ex)
+                {
+                    // Something happened when trying to write to the pid file. Log and move on.
+                    ServerLogger.LogException(ex, "Failed to create PID file.");
+                }
+
+                TimeSpan? keepAlive = null;
+                if (KeepAlive.HasValue() && int.TryParse(KeepAlive.Value(), out var result))
+                {
+                    // Keep alive times are specified in seconds
+                    keepAlive = TimeSpan.FromSeconds(result);
+                }
+
+                var host = ConnectionHost.Create(Pipe.Value());
+
+                var compilerHost = CompilerHost.Create();
+                ExecuteServerCore(host, compilerHost, Cancelled, eventBus: null, keepAlive: keepAlive);
+            }
+            finally
+            {
+                serverMutex.ReleaseMutex();
+                serverMutex.Dispose();
+                pidFileStream?.Close();
+            }
+
+            return Task.FromResult(0);
+        }
+
+        protected virtual void ExecuteServerCore(ConnectionHost host, CompilerHost compilerHost, CancellationToken cancellationToken, EventBus eventBus, TimeSpan? keepAlive)
+        {
+            var dispatcher = RequestDispatcher.Create(host, compilerHost, cancellationToken, eventBus, keepAlive);
+            dispatcher.Run();
+        }
+
+        protected virtual FileStream WritePidFile()
+        {
+            var path = GetPidFilePath(env => Environment.GetEnvironmentVariable(env));
+            return WritePidFile(path);
+        }
+
+        // Internal for testing.
+        internal virtual FileStream WritePidFile(string directoryPath)
+        {
+            if (string.IsNullOrEmpty(directoryPath))
+            {
+                // Invalid path. Bail.
+                return null;
+            }
+
+            // To make all the running rzc servers more discoverable, We want to write the process Id and pipe name to a file.
+            // The file contents will be in the following format,
+            //
+            // <PID>
+            // rzc
+            // path/to/rzc.dll
+            // <pipename>
+
+            const int DefaultBufferSize = 4096;
+            var processId = Process.GetCurrentProcess().Id;
+            var fileName = $"rzc-{processId}";
+
+            // Make sure the directory exists.
+            Directory.CreateDirectory(directoryPath);
+
+            var path = Path.Combine(directoryPath, fileName);
+            var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read, DefaultBufferSize, FileOptions.DeleteOnClose);
+
+            using (var writer = new StreamWriter(fileStream, Encoding.UTF8, DefaultBufferSize, leaveOpen: true))
+            {
+                var rzcPath = Assembly.GetExecutingAssembly().Location;
+                var content = $"{processId}{Environment.NewLine}rzc{Environment.NewLine}{rzcPath}{Environment.NewLine}{Pipe.Value()}";
+                writer.Write(content);
+            }
+
+            return fileStream;
+        }
+
+        // Internal for testing.
+        internal virtual string GetPidFilePath(Func<string, string> getEnvironmentVariable)
+        {
+            var path = getEnvironmentVariable("DOTNET_BUILD_PIDFILE_DIRECTORY");
+            if (string.IsNullOrEmpty(path))
+            {
+                var homeEnvVariable = PlatformInformation.IsWindows ? "USERPROFILE" : "HOME";
+                var homePath = getEnvironmentVariable(homeEnvVariable);
+                if (string.IsNullOrEmpty(homePath))
+                {
+                    // Couldn't locate the user profile directory. Bail.
+                    return null;
+                }
+
+                path = Path.Combine(homePath, ".dotnet", "pids", "build");
+            }
+
+            return path;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/CompletedServerResponse.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/CompletedServerResponse.cs
new file mode 100644
index 0000000000..98a64dba8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/CompletedServerResponse.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    /// <summary>
+    /// Represents a Response from the server. A response is as follows.
+    /// 
+    ///  Field Name         Type            Size (bytes)
+    /// --------------------------------------------------
+    ///  Length             UInteger        4
+    ///  ReturnCode         Integer         4
+    ///  Output             String          Variable
+    ///  ErrorOutput        String          Variable
+    /// 
+    /// Strings are encoded via a character count prefix as a 
+    /// 32-bit integer, followed by an array of characters.
+    /// 
+    /// </summary>
+    internal sealed class CompletedServerResponse : ServerResponse
+    {
+        public readonly int ReturnCode;
+        public readonly bool Utf8Output;
+        public readonly string Output;
+        public readonly string ErrorOutput;
+
+        public CompletedServerResponse(int returnCode, bool utf8output, string output, string error)
+        {
+            ReturnCode = returnCode;
+            Utf8Output = utf8output;
+            Output = output;
+            ErrorOutput = error;
+        }
+
+        public override ResponseType Type => ResponseType.Completed;
+
+        public static CompletedServerResponse Create(BinaryReader reader)
+        {
+            var returnCode = reader.ReadInt32();
+            var utf8Output = reader.ReadBoolean();
+            var output = ServerProtocol.ReadLengthPrefixedString(reader);
+            var errorOutput = ServerProtocol.ReadLengthPrefixedString(reader);
+
+            return new CompletedServerResponse(returnCode, utf8Output, output, errorOutput);
+        }
+
+        protected override void AddResponseBody(BinaryWriter writer)
+        {
+            writer.Write(ReturnCode);
+            writer.Write(Utf8Output);
+            ServerProtocol.WriteLengthPrefixedString(writer, Output);
+            ServerProtocol.WriteLengthPrefixedString(writer, ErrorOutput);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/MismatchedVersionServerResponse.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/MismatchedVersionServerResponse.cs
new file mode 100644
index 0000000000..57293797e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/MismatchedVersionServerResponse.cs
@@ -0,0 +1,17 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal sealed class MismatchedVersionServerResponse : ServerResponse
+    {
+        public override ResponseType Type => ResponseType.MismatchedVersion;
+
+        /// <summary>
+        /// MismatchedVersion has no body.
+        /// </summary>
+        protected override void AddResponseBody(BinaryWriter writer) { }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/NativeMethods.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/NativeMethods.cs
new file mode 100644
index 0000000000..73a7363ecb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/NativeMethods.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    internal struct STARTUPINFO
+    {
+        internal Int32 cb;
+        internal string lpReserved;
+        internal string lpDesktop;
+        internal string lpTitle;
+        internal Int32 dwX;
+        internal Int32 dwY;
+        internal Int32 dwXSize;
+        internal Int32 dwYSize;
+        internal Int32 dwXCountChars;
+        internal Int32 dwYCountChars;
+        internal Int32 dwFillAttribute;
+        internal Int32 dwFlags;
+        internal Int16 wShowWindow;
+        internal Int16 cbReserved2;
+        internal IntPtr lpReserved2;
+        internal IntPtr hStdInput;
+        internal IntPtr hStdOutput;
+        internal IntPtr hStdError;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PROCESS_INFORMATION
+    {
+        public IntPtr hProcess;
+        public IntPtr hThread;
+        public int dwProcessId;
+        public int dwThreadId;
+    }
+
+    /// <summary>
+    /// Interop methods.
+    /// </summary>
+    internal static class NativeMethods
+    {
+        #region Constants
+
+        internal static readonly IntPtr NullPtr = IntPtr.Zero;
+        internal static readonly IntPtr InvalidIntPtr = new IntPtr((int)-1);
+
+        internal const uint NORMAL_PRIORITY_CLASS = 0x0020;
+        internal const uint CREATE_NO_WINDOW = 0x08000000;
+        internal const Int32 STARTF_USESTDHANDLES = 0x00000100;
+        internal const int ERROR_SUCCESS = 0;
+
+        #endregion
+
+        //------------------------------------------------------------------------------
+        // CloseHandle
+        //------------------------------------------------------------------------------
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool CloseHandle(IntPtr hObject);
+
+        //------------------------------------------------------------------------------
+        // CreateProcess
+        //------------------------------------------------------------------------------
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool CreateProcess
+        (
+            string lpApplicationName,
+            [In, Out]StringBuilder lpCommandLine,
+            IntPtr lpProcessAttributes,
+            IntPtr lpThreadAttributes,
+            [In, MarshalAs(UnmanagedType.Bool)]
+            bool bInheritHandles,
+            uint dwCreationFlags,
+            IntPtr lpEnvironment,
+            string lpCurrentDirectory,
+            [In] ref STARTUPINFO lpStartupInfo,
+            out PROCESS_INFORMATION lpProcessInformation
+        );
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr GetCommandLine();
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RejectedServerResponse.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RejectedServerResponse.cs
new file mode 100644
index 0000000000..2b6e3e894b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RejectedServerResponse.cs
@@ -0,0 +1,17 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal sealed class RejectedServerResponse : ServerResponse
+    {
+        public override ResponseType Type => ResponseType.Rejected;
+
+        /// <summary>
+        /// RejectedResponse has no body.
+        /// </summary>
+        protected override void AddResponseBody(BinaryWriter writer) { }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RequestArgument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RequestArgument.cs
new file mode 100644
index 0000000000..96e9ae0312
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/RequestArgument.cs
@@ -0,0 +1,72 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    /// <summary>
+    /// A command line argument to the compilation. 
+    /// An argument is formatted as follows:
+    /// 
+    ///  Field Name         Type            Size (bytes)
+    /// --------------------------------------------------
+    ///  ID                 UInteger        4
+    ///  Index              UInteger        4
+    ///  Value              String          Variable
+    /// 
+    /// Strings are encoded via a length prefix as a signed
+    /// 32-bit integer, followed by an array of characters.
+    /// </summary>
+    internal readonly struct RequestArgument
+    {
+        public readonly ArgumentId Id;
+        public readonly int ArgumentIndex;
+        public readonly string Value;
+
+        public RequestArgument(ArgumentId argumentId, int argumentIndex, string value)
+        {
+            Id = argumentId;
+            ArgumentIndex = argumentIndex;
+            Value = value;
+        }
+
+        public static RequestArgument ReadFromBinaryReader(BinaryReader reader)
+        {
+            var argId = (ArgumentId)reader.ReadInt32();
+            var argIndex = reader.ReadInt32();
+            var value = ServerProtocol.ReadLengthPrefixedString(reader);
+            return new RequestArgument(argId, argIndex, value);
+        }
+
+        public void WriteToBinaryWriter(BinaryWriter writer)
+        {
+            writer.Write((int)Id);
+            writer.Write(ArgumentIndex);
+            ServerProtocol.WriteLengthPrefixedString(writer, Value);
+        }
+
+        public enum ArgumentId
+        {
+            // The current directory of the client
+            CurrentDirectory = 0x51147221,
+
+            // A comment line argument. The argument index indicates which one (0 .. N)
+            CommandLineArgument,
+
+            // Request a longer keep alive time for the server
+            KeepAlive,
+
+            // Request a server shutdown from the client
+            Shutdown,
+
+            // The directory to use for temporary operations.
+            TempDirectory,
+        }
+
+        public override string ToString()
+        {
+            return $"{Id} {Value}";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerConnection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerConnection.cs
new file mode 100644
index 0000000000..d254be4e60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerConnection.cs
@@ -0,0 +1,390 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class ServerConnection
+    {
+        private const string ServerName = "rzc.dll";
+
+        // Spend up to 1s connecting to existing process (existing processes should be always responsive).
+        private const int TimeOutMsExistingProcess = 1000;
+
+        // Spend up to 20s connecting to a new process, to allow time for it to start.
+        private const int TimeOutMsNewProcess = 20000;
+
+        // Custom delegate that contains an out param to use with TryCreateServerCore method.
+        private delegate TResult TryCreateServerCoreDelegate<T1, T2, T3, T4, out TResult>(T1 arg1, T2 arg2, out T3 arg3, T4 arg4);
+
+        public static bool WasServerMutexOpen(string mutexName)
+        {
+            Mutex mutex = null;
+            var open = false;
+            try
+            {
+                open = Mutex.TryOpenExisting(mutexName, out mutex);
+            }
+            catch
+            {
+                // In the case an exception occurred trying to open the Mutex then
+                // the assumption is that it's not open.
+            }
+
+            mutex?.Dispose();
+
+            return open;
+        }
+
+        /// <summary>
+        /// Gets the value of the temporary path for the current environment assuming the working directory
+        /// is <paramref name="workingDir"/>.  This function must emulate <see cref="Path.GetTempPath"/> as 
+        /// closely as possible.
+        /// </summary>
+        public static string GetTempPath(string workingDir)
+        {
+            if (PlatformInformation.IsUnix)
+            {
+                // Unix temp path is fine: it does not use the working directory
+                // (it uses ${TMPDIR} if set, otherwise, it returns /tmp)
+                return Path.GetTempPath();
+            }
+
+            var tmp = Environment.GetEnvironmentVariable("TMP");
+            if (Path.IsPathRooted(tmp))
+            {
+                return tmp;
+            }
+
+            var temp = Environment.GetEnvironmentVariable("TEMP");
+            if (Path.IsPathRooted(temp))
+            {
+                return temp;
+            }
+
+            if (!string.IsNullOrEmpty(workingDir))
+            {
+                if (!string.IsNullOrEmpty(tmp))
+                {
+                    return Path.Combine(workingDir, tmp);
+                }
+
+                if (!string.IsNullOrEmpty(temp))
+                {
+                    return Path.Combine(workingDir, temp);
+                }
+            }
+
+            var userProfile = Environment.GetEnvironmentVariable("USERPROFILE");
+            if (Path.IsPathRooted(userProfile))
+            {
+                return userProfile;
+            }
+
+            return Environment.GetEnvironmentVariable("SYSTEMROOT");
+        }
+
+        public static Task<ServerResponse> RunOnServer(
+            string pipeName,
+            IList<string> arguments,
+            ServerPaths serverPaths,
+            CancellationToken cancellationToken,
+            string keepAlive = null,
+            bool debug = false)
+        {
+            if (string.IsNullOrEmpty(pipeName))
+            {
+                pipeName = PipeName.ComputeDefault(serverPaths.ClientDirectory);
+            }
+
+            return RunOnServerCore(
+                arguments,
+                serverPaths,
+                pipeName: pipeName,
+                keepAlive: keepAlive,
+                timeoutOverride: null,
+                tryCreateServerFunc: TryCreateServerCore,
+                cancellationToken: cancellationToken,
+                debug: debug);
+        }
+
+        private static async Task<ServerResponse> RunOnServerCore(
+            IList<string> arguments,
+            ServerPaths serverPaths,
+            string pipeName,
+            string keepAlive,
+            int? timeoutOverride,
+            TryCreateServerCoreDelegate<string, string, int?, bool, bool> tryCreateServerFunc,
+            CancellationToken cancellationToken,
+            bool debug)
+        {
+            if (pipeName == null)
+            {
+                return new RejectedServerResponse();
+            }
+
+            if (serverPaths.TempDirectory == null)
+            {
+                return new RejectedServerResponse();
+            }
+
+            var clientDir = serverPaths.ClientDirectory;
+            var timeoutNewProcess = timeoutOverride ?? TimeOutMsNewProcess;
+            var timeoutExistingProcess = timeoutOverride ?? TimeOutMsExistingProcess;
+            var clientMutexName = MutexName.GetClientMutexName(pipeName);
+            Task<Client> pipeTask = null;
+
+            Mutex clientMutex = null;
+            var holdsMutex = false;
+
+            try
+            {
+                try
+                {
+                    clientMutex = new Mutex(initiallyOwned: true, name: clientMutexName, createdNew: out holdsMutex);
+                }
+                catch (Exception ex)
+                {
+                    // The Mutex constructor can throw in certain cases. One specific example is docker containers
+                    // where the /tmp directory is restricted. In those cases there is no reliable way to execute
+                    // the server and we need to fall back to the command line.
+                    // Example: https://github.com/dotnet/roslyn/issues/24124
+
+                    ServerLogger.LogException(ex, "Client mutex creation failed.");
+
+                    return new RejectedServerResponse();
+                }
+
+                if (!holdsMutex)
+                {
+                    try
+                    {
+                        holdsMutex = clientMutex.WaitOne(timeoutNewProcess);
+
+                        if (!holdsMutex)
+                        {
+                            return new RejectedServerResponse();
+                        }
+                    }
+                    catch (AbandonedMutexException)
+                    {
+                        holdsMutex = true;
+                    }
+                }
+
+                // Check for an already running server
+                var serverMutexName = MutexName.GetServerMutexName(pipeName);
+                var wasServerRunning = WasServerMutexOpen(serverMutexName);
+                var timeout = wasServerRunning ? timeoutExistingProcess : timeoutNewProcess;
+
+                if (wasServerRunning || tryCreateServerFunc(clientDir, pipeName, out var _, debug))
+                {
+                    pipeTask = Client.ConnectAsync(pipeName, TimeSpan.FromMilliseconds(timeout), cancellationToken);
+                }
+            }
+            finally
+            {
+                if (holdsMutex)
+                {
+                    clientMutex?.ReleaseMutex();
+                }
+
+                clientMutex?.Dispose();
+            }
+
+            if (pipeTask != null)
+            {
+                var client = await pipeTask.ConfigureAwait(false);
+                if (client != null)
+                {
+                    var request = ServerRequest.Create(
+                        serverPaths.WorkingDirectory,
+                        serverPaths.TempDirectory,
+                        arguments,
+                        keepAlive);
+
+                    return await TryProcessRequest(client, request, cancellationToken).ConfigureAwait(false);
+                }
+            }
+
+            return new RejectedServerResponse();
+        }
+
+        /// <summary>
+        /// Try to process the request using the server. Returns a null-containing Task if a response
+        /// from the server cannot be retrieved.
+        /// </summary>
+        private static async Task<ServerResponse> TryProcessRequest(
+            Client client,
+            ServerRequest request,
+            CancellationToken cancellationToken)
+        {
+            ServerResponse response;
+            using (client)
+            {
+                // Write the request
+                try
+                {
+                    ServerLogger.Log("Begin writing request");
+                    await request.WriteAsync(client.Stream, cancellationToken).ConfigureAwait(false);
+                    ServerLogger.Log("End writing request");
+                }
+                catch (Exception e)
+                {
+                    ServerLogger.LogException(e, "Error writing build request.");
+                    return new RejectedServerResponse();
+                }
+
+                // Wait for the compilation and a monitor to detect if the server disconnects
+                var serverCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+
+                ServerLogger.Log("Begin reading response");
+
+                var responseTask = ServerResponse.ReadAsync(client.Stream, serverCts.Token);
+                var monitorTask = client.WaitForDisconnectAsync(serverCts.Token);
+                await Task.WhenAny(responseTask, monitorTask).ConfigureAwait(false);
+
+                ServerLogger.Log("End reading response");
+
+                if (responseTask.IsCompleted)
+                {
+                    // await the task to log any exceptions
+                    try
+                    {
+                        response = await responseTask.ConfigureAwait(false);
+                    }
+                    catch (Exception e)
+                    {
+                        ServerLogger.LogException(e, "Error reading response");
+                        response = new RejectedServerResponse();
+                    }
+                }
+                else
+                {
+                    ServerLogger.Log("Server disconnect");
+                    response = new RejectedServerResponse();
+                }
+
+                // Cancel whatever task is still around
+                serverCts.Cancel();
+                Debug.Assert(response != null);
+                return response;
+            }
+        }
+
+        // Internal for testing.
+        internal static bool TryCreateServerCore(string clientDir, string pipeName, out int? processId, bool debug = false)
+        {
+            processId = null;
+
+            // The server should be in the same directory as the client
+            var expectedCompilerPath = Path.Combine(clientDir, ServerName);
+            var expectedPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH") ?? "dotnet";
+            var argumentList = new string[]
+            {
+                expectedCompilerPath,
+                debug ? "--debug" : "",
+                "server",
+                "-p",
+                pipeName
+            };
+            var processArguments = ArgumentEscaper.EscapeAndConcatenate(argumentList);
+
+            if (!File.Exists(expectedCompilerPath))
+            {
+                return false;
+            }
+
+            if (PlatformInformation.IsWindows)
+            {
+                // Currently, there isn't a way to use the Process class to create a process without
+                // inheriting handles(stdin/stdout/stderr) from its parent. This might cause the parent process
+                // to block on those handles. So we use P/Invoke. This code was taken from MSBuild task starting code.
+                // The work to customize this behavior is being tracked by https://github.com/dotnet/corefx/issues/306.
+
+                var startInfo = new STARTUPINFO();
+                startInfo.cb = Marshal.SizeOf(startInfo);
+                startInfo.hStdError = NativeMethods.InvalidIntPtr;
+                startInfo.hStdInput = NativeMethods.InvalidIntPtr;
+                startInfo.hStdOutput = NativeMethods.InvalidIntPtr;
+                startInfo.dwFlags = NativeMethods.STARTF_USESTDHANDLES;
+                var dwCreationFlags = NativeMethods.NORMAL_PRIORITY_CLASS | NativeMethods.CREATE_NO_WINDOW;
+
+                ServerLogger.Log("Attempting to create process '{0}'", expectedPath);
+
+                var builder = new StringBuilder($@"""{expectedPath}"" {processArguments}");
+
+                var success = NativeMethods.CreateProcess(
+                    lpApplicationName: null,
+                    lpCommandLine: builder,
+                    lpProcessAttributes: NativeMethods.NullPtr,
+                    lpThreadAttributes: NativeMethods.NullPtr,
+                    bInheritHandles: false,
+                    dwCreationFlags: dwCreationFlags,
+                    lpEnvironment: NativeMethods.NullPtr, // Inherit environment
+                    lpCurrentDirectory: clientDir,
+                    lpStartupInfo: ref startInfo,
+                    lpProcessInformation: out var processInfo);
+
+                if (success)
+                {
+                    ServerLogger.Log("Successfully created process with process id {0}", processInfo.dwProcessId);
+                    NativeMethods.CloseHandle(processInfo.hProcess);
+                    NativeMethods.CloseHandle(processInfo.hThread);
+                    processId = processInfo.dwProcessId;
+                }
+                else
+                {
+                    ServerLogger.Log("Failed to create process. GetLastError={0}", Marshal.GetLastWin32Error());
+                }
+                return success;
+            }
+            else
+            {
+                try
+                {
+                    var startInfo = new ProcessStartInfo()
+                    {
+                        FileName = expectedPath,
+                        Arguments = processArguments,
+                        UseShellExecute = false,
+                        WorkingDirectory = clientDir,
+                        RedirectStandardInput = true,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true
+                    };
+
+                    var process = Process.Start(startInfo);
+                    processId = process.Id;
+
+                    return true;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// This class provides simple properties for determining whether the current platform is Windows or Unix-based.
+    /// We intentionally do not use System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(...) because
+    /// it incorrectly reports 'true' for 'Windows' in desktop builds running on Unix-based platforms via Mono.
+    /// </summary>
+    internal static class PlatformInformation
+    {
+        public static bool IsWindows => Path.DirectorySeparatorChar == '\\';
+        public static bool IsUnix => Path.DirectorySeparatorChar == '/';
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerLogger.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerLogger.cs
new file mode 100644
index 0000000000..2e38fc60c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerLogger.cs
@@ -0,0 +1,146 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    /// <summary>
+    /// Class for logging information about what happens in the server and client parts of the 
+    /// Razor command line compiler and build tasks. Useful for debugging what is going on.
+    /// </summary>
+    /// <remarks>
+    /// To use the logging, set the environment variable RAZORBUILDSERVER_LOG to the name
+    /// of a file to log to. This file is logged to by both client and server components.
+    /// </remarks>
+    internal class ServerLogger
+    {
+        // Environment variable, if set, to enable logging and set the file to log to.
+        private const string EnvironmentVariable = "RAZORBUILDSERVER_LOG";
+
+        private static readonly Stream s_loggingStream;
+        private static string s_prefix = "---";
+
+        /// <summary>
+        /// Static class initializer that initializes logging.
+        /// </summary>
+        static ServerLogger()
+        {
+            s_loggingStream = null;
+
+            try
+            {
+                // Check if the environment
+                var loggingFileName = Environment.GetEnvironmentVariable(EnvironmentVariable);
+
+                if (loggingFileName != null)
+                {
+                    IsLoggingEnabled = true;
+
+                    // If the environment variable contains the path of a currently existing directory,
+                    // then use a process-specific name for the log file and put it in that directory.
+                    // Otherwise, assume that the environment variable specifies the name of the log file.
+                    if (Directory.Exists(loggingFileName))
+                    {
+                        loggingFileName = Path.Combine(loggingFileName, $"razorserver.{GetCurrentProcessId()}.log");
+                    }
+
+                    // Open allowing sharing. We allow multiple processes to log to the same file, so we use share mode to allow that.
+                    s_loggingStream = new FileStream(loggingFileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite);
+                }
+            }
+            catch (Exception e)
+            {
+                LogException(e, "Failed to create logging stream");
+            }
+        }
+
+        public static bool IsLoggingEnabled { get; }
+
+        /// <summary>
+        /// Set the logging prefix that describes our role.
+        /// Typically a 3-letter abbreviation. If logging happens before this, it's logged with "---".
+        /// </summary>
+        public static void Initialize(string outputPrefix)
+        {
+            s_prefix = outputPrefix;
+        }
+
+        /// <summary>
+        /// Log an exception. Also logs information about inner exceptions.
+        /// </summary>
+        public static void LogException(Exception e, string reason)
+        {
+            if (IsLoggingEnabled)
+            {
+                Log("Exception '{0}' occurred during '{1}'. Stack trace:\r\n{2}", e.Message, reason, e.StackTrace);
+
+                var innerExceptionLevel = 0;
+
+                e = e.InnerException;
+                while (e != null)
+                {
+                    Log("Inner exception[{0}] '{1}'. Stack trace: \r\n{1}", innerExceptionLevel, e.Message, e.StackTrace);
+                    e = e.InnerException;
+                    innerExceptionLevel += 1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Log a line of text to the logging file, with string.Format arguments.
+        /// </summary>
+        public static void Log(string format, params object[] arguments)
+        {
+            if (IsLoggingEnabled)
+            {
+                Log(string.Format(format, arguments));
+            }
+        }
+
+        /// <summary>
+        /// Log a line of text to the logging file.
+        /// </summary>
+        /// <param name="message"></param>
+        public static void Log(string message)
+        {
+            if (IsLoggingEnabled)
+            {
+                var prefix = GetLoggingPrefix();
+
+                var output = prefix + message + "\r\n";
+                var bytes = Encoding.UTF8.GetBytes(output);
+
+                // Because multiple processes might be logging to the same file, we always seek to the end,
+                // write, and flush.
+                s_loggingStream.Seek(0, SeekOrigin.End);
+                s_loggingStream.Write(bytes, 0, bytes.Length);
+                s_loggingStream.Flush();
+            }
+        }
+
+        private static int GetCurrentProcessId()
+        {
+            var process = Process.GetCurrentProcess();
+            return process.Id;
+        }
+
+        private static int GetCurrentThreadId()
+        {
+            var thread = Thread.CurrentThread;
+            return thread.ManagedThreadId;
+        }
+
+        /// <summary>
+        /// Get the string that prefixes all log entries. Shows the process, thread, and time.
+        /// </summary>
+        private static string GetLoggingPrefix()
+        {
+            return string.Format("{0} PID={1} TID={2} Ticks={3}: ", s_prefix, GetCurrentProcessId(), GetCurrentThreadId(), Environment.TickCount);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerPaths.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerPaths.cs
new file mode 100644
index 0000000000..37cd4a58c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerPaths.cs
@@ -0,0 +1,33 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal struct ServerPaths
+    {
+        internal ServerPaths(string clientDir, string workingDir, string tempDir)
+        {
+            ClientDirectory = clientDir;
+            WorkingDirectory = workingDir;
+            TempDirectory = tempDir;
+        }
+
+        /// <summary>
+        /// The path which contains the Razor compiler binaries and response files.
+        /// </summary>
+        internal string ClientDirectory { get; }
+
+        /// <summary>
+        /// The path in which the Razor compilation takes place.
+        /// </summary>
+        internal string WorkingDirectory { get; }
+
+        /// <summary>
+        /// The temporary directory a compilation should use instead of <see cref="Path.GetTempPath"/>.  The latter
+        /// relies on global state individual compilations should ignore.
+        /// </summary>
+        internal string TempDirectory { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerProtocol.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerProtocol.cs
new file mode 100644
index 0000000000..940dda2845
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerProtocol.cs
@@ -0,0 +1,70 @@
+// 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.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class ServerProtocol
+    {
+        /// <summary>
+        /// The version number for this protocol.
+        /// </summary>
+        public static readonly uint ProtocolVersion = 2;
+
+        /// <summary>
+        /// Read a string from the Reader where the string is encoded
+        /// as a length prefix (signed 32-bit integer) followed by
+        /// a sequence of characters.
+        /// </summary>
+        public static string ReadLengthPrefixedString(BinaryReader reader)
+        {
+            var length = reader.ReadInt32();
+            return new string(reader.ReadChars(length));
+        }
+
+        /// <summary>
+        /// Write a string to the Writer where the string is encoded
+        /// as a length prefix (signed 32-bit integer) follows by
+        /// a sequence of characters.
+        /// </summary>
+        public static void WriteLengthPrefixedString(BinaryWriter writer, string value)
+        {
+            writer.Write(value.Length);
+            writer.Write(value.ToCharArray());
+        }
+
+        /// <summary>
+        /// This task does not complete until we are completely done reading.
+        /// </summary>
+        internal static async Task ReadAllAsync(
+            Stream stream,
+            byte[] buffer,
+            int count,
+            CancellationToken cancellationToken)
+        {
+            var totalBytesRead = 0;
+            do
+            {
+                ServerLogger.Log("Attempting to read {0} bytes from the stream", count - totalBytesRead);
+                var bytesRead = await stream.ReadAsync(
+                    buffer,
+                    totalBytesRead,
+                    count - totalBytesRead,
+                    cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (bytesRead == 0)
+                {
+                    ServerLogger.Log("Unexpected -- read 0 bytes from the stream.");
+                    throw new EndOfStreamException("Reached end of stream before end of read.");
+                }
+                ServerLogger.Log("Read {0} bytes", bytesRead);
+                totalBytesRead += bytesRead;
+            } while (totalBytesRead < count);
+            ServerLogger.Log("Finished read");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerRequest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerRequest.cs
new file mode 100644
index 0000000000..34b6a39eb9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerRequest.cs
@@ -0,0 +1,216 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+// After the server pipe is connected, it forks off a thread to handle the connection, and creates
+// a new instance of the pipe to listen for new clients. When it gets a request, it validates
+// the security and elevation level of the client. If that fails, it disconnects the client. Otherwise,
+// it handles the request, sends a response (described by Response class) back to the client, then
+// disconnects the pipe and ends the thread.
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    /// <summary>
+    /// Represents a request from the client. A request is as follows.
+    /// 
+    ///  Field Name         Type                Size (bytes)
+    /// ----------------------------------------------------
+    ///  Length             Integer             4
+    ///  Argument Count     UInteger            4
+    ///  Arguments          Argument[]          Variable
+    /// 
+    /// See <see cref="RequestArgument"/> for the format of an
+    /// Argument.
+    /// 
+    /// </summary>
+    internal class ServerRequest
+    {
+        public ServerRequest(uint protocolVersion, IEnumerable<RequestArgument> arguments)
+        {
+            ProtocolVersion = protocolVersion;
+            Arguments = new ReadOnlyCollection<RequestArgument>(arguments.ToList());
+
+            if (Arguments.Count > ushort.MaxValue)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(arguments),
+                    $"Too many arguments: maximum of {ushort.MaxValue} arguments allowed.");
+            }
+        }
+
+        public uint ProtocolVersion { get; }
+
+        public ReadOnlyCollection<RequestArgument> Arguments { get; }
+
+        public TimeSpan? KeepAlive
+        {
+            get
+            {
+                TimeSpan? keepAlive = null;
+                foreach (var argument in Arguments)
+                {
+                    if (argument.Id == RequestArgument.ArgumentId.KeepAlive)
+                    {
+                        // If the value is not a valid integer for any reason, ignore it and continue with the current timeout. 
+                        // The client is responsible for validating the argument.
+                        if (int.TryParse(argument.Value, out var result))
+                        {
+                            // Keep alive times are specified in seconds
+                            keepAlive = TimeSpan.FromSeconds(result);
+                        }
+                    }
+                }
+
+                return keepAlive;
+            }
+        }
+
+        public bool IsShutdownRequest()
+        {
+            return Arguments.Count >= 1 && Arguments[0].Id == RequestArgument.ArgumentId.Shutdown;
+        }
+
+        public static ServerRequest Create(
+            string workingDirectory,
+            string tempDirectory,
+            IList<string> args,
+            string keepAlive = null)
+        {
+            ServerLogger.Log("Creating ServerRequest");
+            ServerLogger.Log($"Working directory: {workingDirectory}");
+            ServerLogger.Log($"Temp directory: {tempDirectory}");
+
+            var requestLength = args.Count + 1;
+            var requestArgs = new List<RequestArgument>(requestLength)
+            {
+                new RequestArgument(RequestArgument.ArgumentId.CurrentDirectory, 0, workingDirectory),
+                new RequestArgument(RequestArgument.ArgumentId.TempDirectory, 0, tempDirectory)
+            };
+
+            if (keepAlive != null)
+            {
+                requestArgs.Add(new RequestArgument(RequestArgument.ArgumentId.KeepAlive, 0, keepAlive));
+            }
+
+            for (var i = 0; i < args.Count; ++i)
+            {
+                var arg = args[i];
+                ServerLogger.Log($"argument[{i}] = {arg}");
+                requestArgs.Add(new RequestArgument(RequestArgument.ArgumentId.CommandLineArgument, i, arg));
+            }
+
+            return new ServerRequest(ServerProtocol.ProtocolVersion, requestArgs);
+        }
+
+        public static ServerRequest CreateShutdown()
+        {
+            var requestArgs = new[]
+            {
+                new RequestArgument(RequestArgument.ArgumentId.Shutdown, argumentIndex: 0, value: ""),
+                new RequestArgument(RequestArgument.ArgumentId.CommandLineArgument, argumentIndex: 1, value: "shutdown"),
+            };
+            return new ServerRequest(ServerProtocol.ProtocolVersion, requestArgs);
+        }
+
+        /// <summary>
+        /// Read a Request from the given stream.
+        /// 
+        /// The total request size must be less than 1MB.
+        /// </summary>
+        /// <returns>null if the Request was too large, the Request otherwise.</returns>
+        public static async Task<ServerRequest> ReadAsync(Stream inStream, CancellationToken cancellationToken)
+        {
+            // Read the length of the request
+            var lengthBuffer = new byte[4];
+            ServerLogger.Log("Reading length of request");
+            await ServerProtocol.ReadAllAsync(inStream, lengthBuffer, 4, cancellationToken).ConfigureAwait(false);
+            var length = BitConverter.ToInt32(lengthBuffer, 0);
+
+            // Back out if the request is > 1MB
+            if (length > 0x100000)
+            {
+                ServerLogger.Log("Request is over 1MB in length, cancelling read.");
+                return null;
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Read the full request
+            var requestBuffer = new byte[length];
+            await ServerProtocol.ReadAllAsync(inStream, requestBuffer, length, cancellationToken).ConfigureAwait(false);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            ServerLogger.Log("Parsing request");
+            // Parse the request into the Request data structure.
+            using (var reader = new BinaryReader(new MemoryStream(requestBuffer), Encoding.Unicode))
+            {
+                var protocolVersion = reader.ReadUInt32();
+                var argumentCount = reader.ReadUInt32();
+
+                var argumentsBuilder = new List<RequestArgument>((int)argumentCount);
+
+                for (var i = 0; i < argumentCount; i++)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    argumentsBuilder.Add(RequestArgument.ReadFromBinaryReader(reader));
+                }
+
+                return new ServerRequest(protocolVersion, argumentsBuilder);
+            }
+        }
+
+        /// <summary>
+        /// Write a Request to the stream.
+        /// </summary>
+        public async Task WriteAsync(Stream outStream, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            using (var memoryStream = new MemoryStream())
+            using (var writer = new BinaryWriter(memoryStream, Encoding.Unicode))
+            {
+                // Format the request.
+                ServerLogger.Log("Formatting request");
+                writer.Write(ProtocolVersion);
+                writer.Write(Arguments.Count);
+                foreach (var arg in Arguments)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    arg.WriteToBinaryWriter(writer);
+                }
+                writer.Flush();
+
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // Write the length of the request
+                var length = checked((int)memoryStream.Length);
+
+                // Back out if the request is > 1 MB
+                if (memoryStream.Length > 0x100000)
+                {
+                    ServerLogger.Log("Request is over 1MB in length, cancelling write");
+                    throw new ArgumentOutOfRangeException();
+                }
+
+                // Send the request to the server
+                ServerLogger.Log("Writing length of request.");
+                await outStream
+                    .WriteAsync(BitConverter.GetBytes(length), 0, 4, cancellationToken)
+                    .ConfigureAwait(false);
+
+                ServerLogger.Log("Writing request of size {0}", length);
+                // Write the request
+                memoryStream.Position = 0;
+                await memoryStream
+                    .CopyToAsync(outStream, bufferSize: length, cancellationToken: cancellationToken)
+                    .ConfigureAwait(false);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerResponse.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerResponse.cs
new file mode 100644
index 0000000000..66eb1e63f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ServerResponse.cs
@@ -0,0 +1,132 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+// After the server pipe is connected, it forks off a thread to handle the connection, and creates
+// a new instance of the pipe to listen for new clients. When it gets a request, it validates
+// the security and elevation level of the client. If that fails, it disconnects the client. Otherwise,
+// it handles the request, sends a response (described by Response class) back to the client, then
+// disconnects the pipe and ends the thread.
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    /// <summary>
+    /// Base class for all possible responses to a request.
+    /// The ResponseType enum should list all possible response types
+    /// and ReadResponse creates the appropriate response subclass based
+    /// on the response type sent by the client.
+    /// The format of a response is:
+    ///
+    /// Field Name       Field Type          Size (bytes)
+    /// -------------------------------------------------
+    /// responseLength   int (positive)      4  
+    /// responseType     enum ResponseType   4
+    /// responseBody     Response subclass   variable
+    /// </summary>
+    internal abstract class ServerResponse
+    {
+        public enum ResponseType
+        {
+            // The client and server are using incompatible protocol versions.
+            MismatchedVersion,
+
+            // The build request completed on the server and the results are contained
+            // in the message. 
+            Completed,
+
+            // The shutdown request completed and the server process information is 
+            // contained in the message. 
+            Shutdown,
+
+            // The request was rejected by the server.  
+            Rejected,
+        }
+
+        public abstract ResponseType Type { get; }
+
+        public async Task WriteAsync(Stream outStream, CancellationToken cancellationToken)
+        {
+            using (var memoryStream = new MemoryStream())
+            using (var writer = new BinaryWriter(memoryStream, Encoding.Unicode))
+            {
+                // Format the response
+                ServerLogger.Log("Formatting Response");
+                writer.Write((int)Type);
+
+                AddResponseBody(writer);
+                writer.Flush();
+
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // Send the response to the client
+
+                // Write the length of the response
+                var length = checked((int)memoryStream.Length);
+
+                ServerLogger.Log("Writing response length");
+                // There is no way to know the number of bytes written to
+                // the pipe stream. We just have to assume all of them are written.
+                await outStream
+                    .WriteAsync(BitConverter.GetBytes(length), 0, 4, cancellationToken)
+                    .ConfigureAwait(false);
+
+                // Write the response
+                ServerLogger.Log("Writing response of size {0}", length);
+                memoryStream.Position = 0;
+                await memoryStream
+                    .CopyToAsync(outStream, bufferSize: length, cancellationToken: cancellationToken)
+                    .ConfigureAwait(false);
+            }
+        }
+
+        protected abstract void AddResponseBody(BinaryWriter writer);
+
+        /// <summary>
+        /// May throw exceptions if there are pipe problems.
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public static async Task<ServerResponse> ReadAsync(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            ServerLogger.Log("Reading response length");
+            // Read the response length
+            var lengthBuffer = new byte[4];
+            await ServerProtocol.ReadAllAsync(stream, lengthBuffer, 4, cancellationToken).ConfigureAwait(false);
+            var length = BitConverter.ToUInt32(lengthBuffer, 0);
+
+            // Read the response
+            ServerLogger.Log("Reading response of length {0}", length);
+            var responseBuffer = new byte[length];
+            await ServerProtocol.ReadAllAsync(
+                stream,
+                responseBuffer,
+                responseBuffer.Length,
+                cancellationToken)
+                .ConfigureAwait(false);
+
+            using (var reader = new BinaryReader(new MemoryStream(responseBuffer), Encoding.Unicode))
+            {
+                var responseType = (ResponseType)reader.ReadInt32();
+
+                switch (responseType)
+                {
+                    case ResponseType.Completed:
+                        return CompletedServerResponse.Create(reader);
+                    case ResponseType.MismatchedVersion:
+                        return new MismatchedVersionServerResponse();
+                    case ResponseType.Shutdown:
+                        return ShutdownServerResponse.Create(reader);
+                    case ResponseType.Rejected:
+                        return new RejectedServerResponse();
+                    default:
+                        throw new InvalidOperationException("Received invalid response type from server.");
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ShutdownServerResponse.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ShutdownServerResponse.cs
new file mode 100644
index 0000000000..dbf94e1628
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ServerProtocol/ShutdownServerResponse.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal sealed class ShutdownServerResponse : ServerResponse
+    {
+        public readonly int ServerProcessId;
+
+        public ShutdownServerResponse(int serverProcessId)
+        {
+            ServerProcessId = serverProcessId;
+        }
+
+        public override ResponseType Type => ResponseType.Shutdown;
+
+        protected override void AddResponseBody(BinaryWriter writer)
+        {
+            writer.Write(ServerProcessId);
+        }
+
+        public static ShutdownServerResponse Create(BinaryReader reader)
+        {
+            var serverProcessId = reader.ReadInt32();
+            return new ShutdownServerResponse(serverProcessId);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShadowCopyManager.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShadowCopyManager.cs
new file mode 100644
index 0000000000..317dc5bd74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShadowCopyManager.cs
@@ -0,0 +1,169 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    // Note that this class has no thread-safety guarantees. The caller should use a lock 
+    // if concurrency is required.
+    internal class ShadowCopyManager : IDisposable
+    {
+        // Note that this class uses the *existance* of the Mutex to lock a directory.
+        //
+        // Nothing in this code actually ever acquires the Mutex, we just try to see if it exists
+        // already.
+        private readonly Mutex _mutex;
+
+        private int _counter;
+
+        public ShadowCopyManager(string baseDirectory = null)
+        {
+            BaseDirectory = baseDirectory ?? Path.Combine(Path.GetTempPath(), "Razor", "ShadowCopy");
+
+            var guid = Guid.NewGuid().ToString("N").ToLowerInvariant();
+            UniqueDirectory = Path.Combine(BaseDirectory, guid);
+
+            _mutex = new Mutex(initiallyOwned: false, name: guid);
+
+            Directory.CreateDirectory(UniqueDirectory);
+        }
+
+        public string BaseDirectory { get; }
+
+        public string UniqueDirectory { get; }
+
+        public string AddAssembly(string filePath)
+        {
+            var assemblyDirectory = CreateUniqueDirectory();
+
+            var destination = Path.Combine(assemblyDirectory, Path.GetFileName(filePath));
+            CopyFile(filePath, destination);
+            
+            var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePath);
+            var resourcesNameWithoutExtension = fileNameWithoutExtension + ".resources";
+            var resourcesNameWithExtension = resourcesNameWithoutExtension + ".dll";
+
+            foreach (var directory in Directory.EnumerateDirectories(Path.GetDirectoryName(filePath)))
+            {
+                var directoryName = Path.GetFileName(directory);
+
+                var resourcesPath = Path.Combine(directory, resourcesNameWithExtension);
+                if (File.Exists(resourcesPath))
+                {
+                    var resourcesShadowCopyPath = Path.Combine(assemblyDirectory, directoryName, resourcesNameWithExtension);
+                    CopyFile(resourcesPath, resourcesShadowCopyPath);
+                }
+
+                resourcesPath = Path.Combine(directory, resourcesNameWithoutExtension, resourcesNameWithExtension);
+                if (File.Exists(resourcesPath))
+                {
+                    var resourcesShadowCopyPath = Path.Combine(assemblyDirectory, directoryName, resourcesNameWithoutExtension, resourcesNameWithExtension);
+                    CopyFile(resourcesPath, resourcesShadowCopyPath);
+                }
+            }
+
+            return destination;
+        }
+
+        public void Dispose()
+        {
+            _mutex.ReleaseMutex();
+        }
+
+        public Task PurgeUnusedDirectoriesAsync()
+        {
+            return Task.Run((Action)PurgeUnusedDirectories);
+        }
+
+        private string CreateUniqueDirectory()
+        {
+            var id = _counter++;
+
+            var directory = Path.Combine(UniqueDirectory, id.ToString());
+            Directory.CreateDirectory(directory);
+            return directory;
+        }
+
+        private void CopyFile(string originalPath, string shadowCopyPath)
+        {
+            var directory = Path.GetDirectoryName(shadowCopyPath);
+            Directory.CreateDirectory(directory);
+
+            File.Copy(originalPath, shadowCopyPath);
+
+            MakeWritable(new FileInfo(shadowCopyPath));
+        }
+
+        private void MakeWritable(string directoryPath)
+        {
+            var directory = new DirectoryInfo(directoryPath);
+
+            foreach (var file in directory.EnumerateFiles(searchPattern: "*", searchOption: SearchOption.AllDirectories))
+            {
+                MakeWritable(file);
+            }
+        }
+
+        private void MakeWritable(FileInfo file)
+        {
+            try
+            {
+                if (file.IsReadOnly)
+                {
+                    file.IsReadOnly = false;
+                }
+            }
+            catch
+            {
+                // There are many reasons this could fail. Ignore it and keep going.
+            }
+        }
+
+        private void PurgeUnusedDirectories()
+        {
+            IEnumerable<string> directories;
+            try
+            {
+                directories = Directory.EnumerateDirectories(BaseDirectory);
+            }
+            catch (DirectoryNotFoundException)
+            {
+                return;
+            }
+
+            foreach (var directory in directories)
+            {
+                Mutex mutex = null;
+                try
+                {
+                    // We only want to try deleting the directory if no-one else is currently using it.
+                    //
+                    // Note that the mutex name is the name of the directory. This is OK because we're using
+                    // GUIDs as directory/mutex names.
+                    if (!Mutex.TryOpenExisting(Path.GetFileName(directory).ToLowerInvariant(), out mutex))
+                    {
+                        MakeWritable(directory);
+                        Directory.Delete(directory, recursive: true);
+                    }
+                }
+                catch
+                {
+                    // If something goes wrong we will leave it to the next run to clean up.
+                    // Just swallow the exception and move on.
+                }
+                finally
+                {
+                    if (mutex != null)
+                    {
+                        mutex.Dispose();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShutdownCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShutdownCommand.cs
new file mode 100644
index 0000000000..443f454f77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/ShutdownCommand.cs
@@ -0,0 +1,97 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class ShutdownCommand : CommandBase
+    {
+        public ShutdownCommand(Application parent)
+            : base(parent, "shutdown")
+        {
+            Pipe = Option("-p|--pipe", "name of named pipe", CommandOptionType.SingleValue);
+            Wait = Option("-w|--wait", "wait for shutdown", CommandOptionType.NoValue);
+        }
+
+        public CommandOption Pipe { get; }
+
+        public CommandOption Wait { get; }
+
+        protected override bool ValidateArguments()
+        {
+            if (string.IsNullOrEmpty(Pipe.Value()))
+            {
+                Pipe.Values.Add(PipeName.ComputeDefault());
+            }
+
+            return true;
+        }
+
+        protected async override Task<int> ExecuteCoreAsync()
+        {
+            if (!IsServerRunning())
+            {
+                // server isn't running right now
+                Out.Write("Server is not running.");
+                return 0;
+            }
+
+            try
+            {
+                using (var client = await Client.ConnectAsync(Pipe.Value(), timeout: TimeSpan.FromSeconds(5), cancellationToken: Cancelled))
+                {
+                    if (client == null)
+                    {
+                        throw new InvalidOperationException("Couldn't connect to the server.");
+                    }
+
+                    var request = ServerRequest.CreateShutdown();
+                    await request.WriteAsync(client.Stream, Cancelled).ConfigureAwait(false);
+
+                    var response = ((ShutdownServerResponse)await ServerResponse.ReadAsync(client.Stream, Cancelled));
+
+                    if (Wait.HasValue())
+                    {
+                        try
+                        {
+                            var process = Process.GetProcessById(response.ServerProcessId);
+                            process.WaitForExit();
+                        }
+                        catch (Exception ex)
+                        {
+                            // There is an inherent race here with the server process.  If it has already shutdown
+                            // by the time we try to access it then the operation has succeeded.
+                            Error.Write(ex);
+                        }
+
+                        Out.Write("Server pid:{0} shut down completed.", response.ServerProcessId);
+                    }
+                }
+            }
+            catch (Exception ex) when (IsServerRunning())
+            {
+                // Ignore an exception that occurred while the server was shutting down.
+                Error.Write(ex);
+            }
+
+            return 0;
+        }
+
+        private bool IsServerRunning()
+        {
+            if (Mutex.TryOpenExisting(MutexName.GetServerMutexName(Pipe.Value()), out var mutex))
+            {
+                mutex.Dispose();
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs
new file mode 100644
index 0000000000..68969a5c7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs
@@ -0,0 +1,81 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class CompositeRazorProjectFileSystemTest
+    {
+        [Fact]
+        public void EnumerateItems_ReturnsResultsFromAllFileSystems()
+        {
+            // Arrange
+            var basePath = "base-path";
+            var file1 = new TestRazorProjectItem("file1");
+            var file2 = new TestRazorProjectItem("file2");
+            var file3 = new TestRazorProjectItem("file3");
+            var fileSystem1 = Mock.Of<RazorProjectFileSystem>(
+                f => f.EnumerateItems(basePath) == new[] { file1 });
+            var fileSystem2 = Mock.Of<RazorProjectFileSystem>(
+                f => f.EnumerateItems(basePath) == Enumerable.Empty<RazorProjectItem>());
+            var fileSystem3 = Mock.Of<RazorProjectFileSystem>(
+                f => f.EnumerateItems(basePath) == new[] { file2, file3, });
+
+            var compositeRazorProjectFileSystem = new CompositeRazorProjectFileSystem(new[] { fileSystem1, fileSystem2, fileSystem3 });
+
+            // Act
+            var result = compositeRazorProjectFileSystem.EnumerateItems(basePath);
+
+            // Assert
+            Assert.Equal(new[] { file1, file2, file3 }, result);
+        }
+
+        [Fact]
+        public void EnumerateItems_ReturnsEmptySequence_IfNoFileSystemReturnsResults()
+        {
+            // Arrange
+            var basePath = "base-path";
+            var fileSystem1 = Mock.Of<RazorProjectFileSystem>(
+                f => f.EnumerateItems(basePath) == Enumerable.Empty<RazorProjectItem>());
+            var fileSystem2 = Mock.Of<RazorProjectFileSystem>(
+                f => f.EnumerateItems(basePath) == Enumerable.Empty<RazorProjectItem>());
+
+            var compositeRazorProjectFileSystem = new CompositeRazorProjectFileSystem(new[] { fileSystem1, fileSystem2 });
+
+            // Act
+            var result = compositeRazorProjectFileSystem.EnumerateItems(basePath);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsFirstInstanceThatExists()
+        {
+            // Arrange
+            var basePath = "base-path";
+            var filePath = "file-path";
+            var file1 = new NotFoundProjectItem(basePath, filePath);
+            var file2 = new TestRazorProjectItem(filePath);
+            RazorProjectItem nullItem = null;
+            var fileSystem1 = Mock.Of<RazorProjectFileSystem>(
+                f => f.GetItem(filePath) == file1);
+            var fileSystem2 = Mock.Of<RazorProjectFileSystem>(
+                f => f.GetItem(filePath) == nullItem);
+            var fileSystem3 = Mock.Of<RazorProjectFileSystem>(
+                f => f.GetItem(filePath) == file2);
+
+            var compositeRazorProjectFileSystem = new CompositeRazorProjectFileSystem(new[] { fileSystem1, fileSystem2, fileSystem3 });
+
+            // Act
+            var result = compositeRazorProjectFileSystem.GetItem(filePath);
+
+            // Assert
+            Assert.Same(file2, result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ConcurrentLruCacheTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ConcurrentLruCacheTest.cs
new file mode 100644
index 0000000000..77ad2f0cf4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ConcurrentLruCacheTest.cs
@@ -0,0 +1,120 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class ConcurrentLruCacheTest
+    {
+        [Fact]
+        public void ConcurrentLruCache_HoldsCapacity()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var expected = input.Reverse();
+
+            // Act
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Assert
+            Assert.Equal(expected, cache.TestingEnumerable);
+        }
+
+        [Fact]
+        public void Add_ThrowsIfKeyExists()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Act & Assert
+            var exception = Assert.Throws<ArgumentException>(() => cache.Add(1, 1));
+            Assert.StartsWith("Key already exists", exception.Message);
+        }
+
+        [Fact]
+        public void GetOrAdd_AddsIfKeyDoesNotExist()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var expected = GetKeyValueArray(Enumerable.Range(2, 3)).Reverse();
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Act
+            cache.GetOrAdd(4, 4);
+
+            // Assert
+            Assert.Equal(expected, cache.TestingEnumerable);
+        }
+
+        [Fact]
+        public void Remove_RemovesEntry()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var expected = GetKeyValueArray(Enumerable.Range(1, 2)).Reverse();
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Act
+            var result = cache.Remove(3);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(expected, cache.TestingEnumerable);
+        }
+
+        [Fact]
+        public void Remove_KeyNotFound_ReturnsFalse()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Act
+            var result = cache.Remove(4);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void Add_NoRead_EvictsLastNode()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var expected = GetKeyValueArray(Enumerable.Range(2, 3)).Reverse();
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Act
+            cache.Add(4, 4);
+
+            // Assert
+            Assert.Equal(expected, cache.TestingEnumerable);
+        }
+
+        [Fact]
+        public void Add_ReadLastNode_EvictsSecondOldestNode()
+        {
+            // Arrange
+            var input = GetKeyValueArray(Enumerable.Range(1, 3));
+            var expected = GetKeyValueArray(new int[] { 4, 1, 3 });
+            var cache = new ConcurrentLruCache<int, int>(input);
+
+            // Act
+            cache.GetOrAdd(1, 1); // Read to make this MRU
+            cache.Add(4, 4); // Add a new node
+
+            // Assert
+            Assert.Equal(expected, cache.TestingEnumerable);
+        }
+
+        private KeyValuePair<int, int>[] GetKeyValueArray(IEnumerable<int> inputArray)
+        {
+            return inputArray.Select(v => new KeyValuePair<int, int>(v, v)).ToArray();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
new file mode 100644
index 0000000000..ad619e5570
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
@@ -0,0 +1,128 @@
+// 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.IO;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class DefaultExtensionAssemblyLoaderTest
+    {
+        [Fact]
+        public void LoadFromPath_CanLoadAssembly()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+
+                // Act
+                var assembly = loader.LoadFromPath(alphaFilePath);
+
+                // Assert
+                Assert.NotNull(assembly);
+            }
+        }
+
+        [Fact]
+        public void LoadFromPath_DoesNotAddDuplicates_AfterLoadingByName()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+                var alphaFilePath2 = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha2.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                loader.AddAssemblyLocation(alphaFilePath);
+
+                var assembly1 = loader.Load("Alpha");
+
+                // Act
+                var assembly2 = loader.LoadFromPath(alphaFilePath2);
+
+                // Assert
+                Assert.Same(assembly1, assembly2);
+            }
+        }
+
+        [Fact]
+        public void LoadFromPath_DoesNotAddDuplicates_AfterLoadingByPath()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+                var alphaFilePath2 = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha2.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                var assembly1 = loader.LoadFromPath(alphaFilePath);
+
+                // Act
+                var assembly2 = loader.LoadFromPath(alphaFilePath2);
+
+                // Assert
+                Assert.Same(assembly1, assembly2);
+            }
+        }
+
+        [Fact]
+        public void Load_CanLoadAssemblyByName_AfterLoadingByPath()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                var assembly1 = loader.LoadFromPath(alphaFilePath);
+
+                // Act
+                var assembly2 = loader.Load(assembly1.FullName);
+
+                // Assert
+                Assert.Same(assembly1, assembly2);
+            }
+        }
+
+        [Fact]
+        public void LoadFromPath_WithDependencyPathsSpecified_CanLoadAssemblyDependencies()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+                var betaFilePath = LoaderTestResources.Beta.WriteToFile(directory.DirectoryPath, "Beta.dll");
+                var gammaFilePath = LoaderTestResources.Gamma.WriteToFile(directory.DirectoryPath, "Gamma.dll");
+                var deltaFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                loader.AddAssemblyLocation(gammaFilePath);
+                loader.AddAssemblyLocation(deltaFilePath);
+
+                // Act
+                var alpha = loader.LoadFromPath(alphaFilePath);
+                var beta = loader.LoadFromPath(betaFilePath);
+
+                // Assert
+                var builder = new StringBuilder();
+
+                var a = alpha.CreateInstance("Alpha.A");
+                a.GetType().GetMethod("Write").Invoke(a, new object[] { builder, "Test A" });
+
+                var b = beta.CreateInstance("Beta.B");
+                b.GetType().GetMethod("Write").Invoke(b, new object[] { builder, "Test B" });
+                var expected = @"Delta: Gamma: Alpha: Test A
+Delta: Gamma: Beta: Test B
+";
+
+                var actual = builder.ToString();
+
+                Assert.Equal(expected, actual);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionDependencyCheckerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionDependencyCheckerTest.cs
new file mode 100644
index 0000000000..b9b9c8ac11
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionDependencyCheckerTest.cs
@@ -0,0 +1,111 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class DefaultExtensionDependencyCheckerTest
+    {
+        [Fact]
+        public void Check_ReturnsFalse_WithMissingDependency()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var output = new StringWriter();
+
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                var checker = new DefaultExtensionDependencyChecker(loader, output, output);
+
+                // Act
+                var result = checker.Check(new[] { alphaFilePath, });
+
+                // Assert
+                Assert.False(result, "Check should not have passed: " + output.ToString());
+            }
+        }
+
+        [Fact]
+        public void Check_ReturnsTrue_WithAllDependenciesProvided()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var output = new StringWriter();
+
+                var alphaFilePath = LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+                var betaFilePath = LoaderTestResources.Beta.WriteToFile(directory.DirectoryPath, "Beta.dll");
+                var gammaFilePath = LoaderTestResources.Gamma.WriteToFile(directory.DirectoryPath, "Gamma.dll");
+                var deltaFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                var checker = new DefaultExtensionDependencyChecker(loader, output, output);
+
+                // Act
+                var result = checker.Check(new[] { alphaFilePath, betaFilePath, gammaFilePath, deltaFilePath, });
+
+                // Assert
+                Assert.True(result, "Check should have passed: " + output.ToString());
+            }
+        }
+
+        [Fact]
+        public void Check_ReturnsFalse_WhenAssemblyHasDifferentMVID()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var output = new StringWriter();
+
+                // Load Beta.dll from the future Alpha.dll path to prime the assembly loader
+                var alphaFilePath = LoaderTestResources.Beta.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+                var betaFilePath = LoaderTestResources.Beta.WriteToFile(directory.DirectoryPath, "Beta.dll");
+                var gammaFilePath = LoaderTestResources.Gamma.WriteToFile(directory.DirectoryPath, "Gamma.dll");
+                var deltaFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                var loader = new TestDefaultExtensionAssemblyLoader(Path.Combine(directory.DirectoryPath, "shadow"));
+                var checker = new DefaultExtensionDependencyChecker(loader, output, output);
+
+                // This will cause the loader to cache some inconsistent information.
+                loader.LoadFromPath(alphaFilePath);
+                LoaderTestResources.Alpha.WriteToFile(directory.DirectoryPath, "Alpha.dll");
+
+                // Act
+                var result = checker.Check(new[] { alphaFilePath, gammaFilePath, deltaFilePath, });
+
+                // Assert
+                Assert.False(result, "Check should not have passed: " + output.ToString());
+            }
+        }
+
+        [Fact]
+        public void Check_ReturnsFalse_WhenLoaderThrows()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var output = new StringWriter();
+                
+                var deltaFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                var loader = new Mock<ExtensionAssemblyLoader>();
+                loader
+                    .Setup(l => l.LoadFromPath(It.IsAny<string>()))
+                    .Throws(new InvalidOperationException());
+                var checker = new DefaultExtensionDependencyChecker(loader.Object, output, output);
+
+                // Act
+                var result = checker.Check(new[] { deltaFilePath, });
+
+                // Assert
+                Assert.False(result, "Check should not have passed: " + output.ToString());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultRequestDispatcherTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultRequestDispatcherTest.cs
new file mode 100644
index 0000000000..c852648dc2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultRequestDispatcherTest.cs
@@ -0,0 +1,572 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class DefaultRequestDispatcherTest
+    {
+        private static ServerRequest EmptyServerRequest => new ServerRequest(1, Array.Empty<RequestArgument>());
+
+        private static ServerResponse EmptyServerResponse => new CompletedServerResponse(
+            returnCode: 0,
+            utf8output: false,
+            output: string.Empty,
+            error: string.Empty);
+
+        [Fact]
+        public async Task AcceptConnection_ReadingRequestFails_ClosesConnection()
+        {
+            // Arrange
+            var stream = Mock.Of<Stream>();
+            var compilerHost = CreateCompilerHost();
+            var connectionHost = CreateConnectionHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+            var connection = CreateConnection(stream);
+
+            // Act
+            var result = await dispatcher.AcceptConnection(
+                Task.FromResult<Connection>(connection), accept: true, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.CompilationNotStarted, result.CloseReason);
+        }
+
+        /// <summary>
+        /// A failure to write the results to the client is considered a client disconnection.  Any error
+        /// from when the build starts to when the write completes should be handled this way. 
+        /// </summary>
+        [Fact]
+        public async Task AcceptConnection_WritingResultsFails_ClosesConnection()
+        {
+            // Arrange
+            var memoryStream = new MemoryStream();
+            await EmptyServerRequest.WriteAsync(memoryStream, CancellationToken.None).ConfigureAwait(true);
+            memoryStream.Position = 0;
+
+            var stream = new Mock<Stream>(MockBehavior.Strict);
+            stream
+                .Setup(x => x.ReadAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()))
+                .Returns((byte[] array, int start, int length, CancellationToken ct) => memoryStream.ReadAsync(array, start, length, ct));
+
+            var connection = CreateConnection(stream.Object);
+            var compilerHost = CreateCompilerHost(c =>
+            {
+                c.ExecuteFunc = (req, ct) =>
+                {
+                    return EmptyServerResponse;
+                };
+            });
+            var connectionHost = CreateConnectionHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+
+            // Act
+            // We expect WriteAsync to fail because the mock stream doesn't have a corresponding setup.
+            var connectionResult = await dispatcher.AcceptConnection(
+                Task.FromResult<Connection>(connection), accept: true, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.ClientDisconnect, connectionResult.CloseReason);
+            Assert.Null(connectionResult.KeepAlive);
+        }
+
+        /// <summary>
+        /// Ensure the Connection correctly handles the case where a client disconnects while in the 
+        /// middle of executing a request.
+        /// </summary>
+        [Fact]
+        public async Task AcceptConnection_ClientDisconnectsWhenExecutingRequest_ClosesConnection()
+        {
+            // Arrange
+            var connectionHost = Mock.Of<ConnectionHost>();
+
+            // Fake a long running task here that we can validate later on.
+            var buildTaskSource = new TaskCompletionSource<bool>();
+            var buildTaskCancellationToken = default(CancellationToken);
+            var compilerHost = CreateCompilerHost(c =>
+            {
+                c.ExecuteFunc = (req, ct) =>
+                {
+                    Task.WaitAll(buildTaskSource.Task);
+                    return EmptyServerResponse;
+                };
+            });
+
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+            var readyTaskSource = new TaskCompletionSource<bool>();
+            var disconnectTaskSource = new TaskCompletionSource<bool>();
+            var connectionTask = CreateConnectionWithEmptyServerRequest(c =>
+            {
+                c.WaitForDisconnectAsyncFunc = (ct) =>
+                {
+                    buildTaskCancellationToken = ct;
+                    readyTaskSource.SetResult(true);
+                    return disconnectTaskSource.Task;
+                };
+            });
+
+            var handleTask = dispatcher.AcceptConnection(
+                connectionTask, accept: true, cancellationToken: CancellationToken.None);
+
+            // Wait until WaitForDisconnectAsync task is actually created and running.
+            await readyTaskSource.Task.ConfigureAwait(false);
+
+            // Act
+            // Now simulate a disconnect by the client.
+            disconnectTaskSource.SetResult(true);
+            var connectionResult = await handleTask;
+            buildTaskSource.SetResult(true);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.ClientDisconnect, connectionResult.CloseReason);
+            Assert.Null(connectionResult.KeepAlive);
+            Assert.True(buildTaskCancellationToken.IsCancellationRequested);
+        }
+
+        [Fact]
+        public async Task AcceptConnection_AcceptFalse_RejectsBuildRequest()
+        {
+            // Arrange
+            var stream = new TestableStream();
+            await EmptyServerRequest.WriteAsync(stream.ReadStream, CancellationToken.None);
+            stream.ReadStream.Position = 0;
+
+            var connection = CreateConnection(stream);
+            var connectionHost = CreateConnectionHost();
+            var compilerHost = CreateCompilerHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+
+            // Act
+            var connectionResult = await dispatcher.AcceptConnection(
+                Task.FromResult<Connection>(connection), accept: false, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.CompilationNotStarted, connectionResult.CloseReason);
+            stream.WriteStream.Position = 0;
+            var response = await ServerResponse.ReadAsync(stream.WriteStream).ConfigureAwait(false);
+            Assert.Equal(ServerResponse.ResponseType.Rejected, response.Type);
+        }
+
+        [Fact]
+        public async Task AcceptConnection_ShutdownRequest_ReturnsShutdownResponse()
+        {
+            // Arrange
+            var stream = new TestableStream();
+            await ServerRequest.CreateShutdown().WriteAsync(stream.ReadStream, CancellationToken.None);
+            stream.ReadStream.Position = 0;
+
+            var connection = CreateConnection(stream);
+            var connectionHost = CreateConnectionHost();
+            var compilerHost = CreateCompilerHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+
+            // Act
+            var connectionResult = await dispatcher.AcceptConnection(
+                Task.FromResult<Connection>(connection), accept: true, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.ClientShutdownRequest, connectionResult.CloseReason);
+            stream.WriteStream.Position = 0;
+            var response = await ServerResponse.ReadAsync(stream.WriteStream).ConfigureAwait(false);
+            Assert.Equal(ServerResponse.ResponseType.Shutdown, response.Type);
+        }
+
+        [Fact]
+        public async Task AcceptConnection_ConnectionHostThrowsWhenConnecting_ClosesConnection()
+        {
+            // Arrange
+            var connectionHost = new Mock<ConnectionHost>(MockBehavior.Strict);
+            connectionHost.Setup(c => c.WaitForConnectionAsync(It.IsAny<CancellationToken>())).Throws(new Exception());
+            var compilerHost = CreateCompilerHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost.Object, compilerHost, CancellationToken.None);
+            var connection = CreateConnection(Mock.Of<Stream>());
+
+            // Act
+            var connectionResult = await dispatcher.AcceptConnection(
+                Task.FromResult<Connection>(connection), accept: true, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.CompilationNotStarted, connectionResult.CloseReason);
+            Assert.Null(connectionResult.KeepAlive);
+        }
+
+        [Fact]
+        public async Task AcceptConnection_ClientConnectionThrowsWhenConnecting_ClosesConnection()
+        {
+            // Arrange
+            var compilerHost = CreateCompilerHost();
+            var connectionHost = CreateConnectionHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+            var connectionTask = Task.FromException<Connection>(new Exception());
+
+            // Act
+            var connectionResult = await dispatcher.AcceptConnection(
+                connectionTask, accept: true, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.Equal(ConnectionResult.Reason.CompilationNotStarted, connectionResult.CloseReason);
+            Assert.Null(connectionResult.KeepAlive);
+        }
+
+        [Fact]
+        public async Task Dispatcher_ClientConnectionThrowsWhenExecutingRequest_ClosesConnection()
+        {
+            // Arrange
+            var called = false;
+            var connectionTask = CreateConnectionWithEmptyServerRequest(c =>
+            {
+                c.WaitForDisconnectAsyncFunc = (ct) =>
+                {
+                    called = true;
+                    throw new Exception();
+                };
+            });
+
+            var compilerHost = CreateCompilerHost();
+            var connectionHost = CreateConnectionHost();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None);
+
+            // Act
+            var connectionResult = await dispatcher.AcceptConnection(
+                connectionTask, accept: true, cancellationToken: CancellationToken.None);
+
+            // Assert
+            Assert.True(called);
+            Assert.Equal(ConnectionResult.Reason.ClientException, connectionResult.CloseReason);
+            Assert.Null(connectionResult.KeepAlive);
+        }
+
+        [Fact]
+        public void Dispatcher_NoConnections_HitsKeepAliveTimeout()
+        {
+            // Arrange
+            var keepAlive = TimeSpan.FromSeconds(3);
+            var compilerHost = CreateCompilerHost();
+            var connectionHost = new Mock<ConnectionHost>();
+            connectionHost
+                .Setup(x => x.WaitForConnectionAsync(It.IsAny<CancellationToken>()))
+                .Returns(new TaskCompletionSource<Connection>().Task);
+
+            var eventBus = new TestableEventBus();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost.Object, compilerHost, CancellationToken.None, eventBus, keepAlive);
+            var startTime = DateTime.Now;
+
+            // Act
+            dispatcher.Run();
+
+            // Assert
+            Assert.True(eventBus.HitKeepAliveTimeout);
+        }
+
+        /// <summary>
+        /// Ensure server respects keep alive and shuts down after processing a single connection.
+        /// </summary>
+        [Fact]
+        public void Dispatcher_ProcessSingleConnection_HitsKeepAliveTimeout()
+        {
+            // Arrange
+            var connectionTask = CreateConnectionWithEmptyServerRequest();
+            var keepAlive = TimeSpan.FromSeconds(1);
+            var compilerHost = CreateCompilerHost(c =>
+            {
+                c.ExecuteFunc = (req, ct) =>
+                {
+                    return EmptyServerResponse;
+                };
+            });
+            var connectionHost = CreateConnectionHost(connectionTask, new TaskCompletionSource<Connection>().Task);
+
+            var eventBus = new TestableEventBus();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None, eventBus, keepAlive);
+
+            // Act
+            dispatcher.Run();
+
+            // Assert
+            Assert.Equal(1, eventBus.CompletedCount);
+            Assert.True(eventBus.LastProcessedTime.HasValue);
+            Assert.True(eventBus.HitKeepAliveTimeout);
+        }
+
+        /// <summary>
+        /// Ensure server respects keep alive and shuts down after processing multiple connections.
+        /// </summary>
+        [Fact]
+        public void Dispatcher_ProcessMultipleConnections_HitsKeepAliveTimeout()
+        {
+            // Arrange
+            var count = 5;
+            var list = new List<Task<Connection>>();
+            for (var i = 0; i < count; i++)
+            {
+                var connectionTask = CreateConnectionWithEmptyServerRequest();
+                list.Add(connectionTask);
+            }
+
+            list.Add(new TaskCompletionSource<Connection>().Task);
+            var connectionHost = CreateConnectionHost(list.ToArray());
+            var compilerHost = CreateCompilerHost(c =>
+            {
+                c.ExecuteFunc = (req, ct) =>
+                {
+                    return EmptyServerResponse;
+                };
+            });
+
+            var keepAlive = TimeSpan.FromSeconds(1);
+            var eventBus = new TestableEventBus();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None, eventBus, keepAlive);
+
+            // Act
+            dispatcher.Run();
+
+            // Assert
+            Assert.Equal(count, eventBus.CompletedCount);
+            Assert.True(eventBus.LastProcessedTime.HasValue);
+            Assert.True(eventBus.HitKeepAliveTimeout);
+        }
+
+        /// <summary>
+        /// Ensure server respects keep alive and shuts down after processing simultaneous connections.
+        /// </summary>
+        [Fact]
+        public async Task Dispatcher_ProcessSimultaneousConnections_HitsKeepAliveTimeout()
+        {
+            // Arrange
+            var totalCount = 2;
+            var readySource = new TaskCompletionSource<bool>();
+            var list = new List<TaskCompletionSource<bool>>();
+            var connectionHost = new Mock<ConnectionHost>();
+            connectionHost
+                .Setup(x => x.WaitForConnectionAsync(It.IsAny<CancellationToken>()))
+                .Returns((CancellationToken ct) =>
+                {
+                    if (list.Count < totalCount)
+                    {
+                        var source = new TaskCompletionSource<bool>();
+                        var connectionTask = CreateConnectionWithEmptyServerRequest(c =>
+                        {
+                            // Keep the connection active until we decide to end it.
+                            c.WaitForDisconnectAsyncFunc = _ => source.Task;
+                        });
+                        list.Add(source);
+                        return connectionTask;
+                    }
+
+                    readySource.SetResult(true);
+                    return new TaskCompletionSource<Connection>().Task;
+                });
+
+            var compilerHost = CreateCompilerHost(c =>
+            {
+                c.ExecuteFunc = (req, ct) =>
+                {
+                    return EmptyServerResponse;
+                };
+            });
+
+            var eventBus = new TestableEventBus();
+            var completedCompilations = 0;
+            var allCompilationsComplete = new TaskCompletionSource<bool>();
+            eventBus.CompilationComplete += (obj, args) =>
+            {
+                if (++completedCompilations == totalCount)
+                {
+                    // All compilations have completed.
+                    allCompilationsComplete.SetResult(true);
+                }
+            };
+            var keepAlive = TimeSpan.FromSeconds(1);
+            var dispatcherTask = Task.Run(() =>
+            {
+                var dispatcher = new DefaultRequestDispatcher(connectionHost.Object, compilerHost, CancellationToken.None, eventBus, keepAlive);
+                dispatcher.Run();
+            });
+
+            // Wait for all connections to be created.
+            await readySource.Task;
+
+            // Wait for all compilations to complete.
+            await allCompilationsComplete.Task;
+
+            // Now allow all the connections to be disconnected.
+            foreach (var source in list)
+            {
+                source.SetResult(true);
+            }
+
+            // Act
+            // Now dispatcher should be in an idle state with no active connections.
+            await dispatcherTask;
+
+            // Assert
+            Assert.False(eventBus.HasDetectedBadConnection);
+            Assert.Equal(totalCount, eventBus.CompletedCount);
+            Assert.True(eventBus.LastProcessedTime.HasValue, "LastProcessedTime should have had a value.");
+            Assert.True(eventBus.HitKeepAliveTimeout, "HitKeepAliveTimeout should have been hit.");
+        }
+
+        [Fact]
+        public void Dispatcher_ClientConnectionThrows_BeginsShutdown()
+        {
+            // Arrange
+            var listenCancellationToken = default(CancellationToken);
+            var firstConnectionTask = CreateConnectionWithEmptyServerRequest(c =>
+            {
+                c.WaitForDisconnectAsyncFunc = (ct) =>
+                {
+                    listenCancellationToken = ct;
+                    return Task.Delay(Timeout.Infinite, ct).ContinueWith<Connection>(_ => null);
+                };
+            });
+            var secondConnectionTask = CreateConnectionWithEmptyServerRequest(c =>
+            {
+                c.WaitForDisconnectAsyncFunc = (ct) => throw new Exception();
+            });
+
+            var compilerHost = CreateCompilerHost();
+            var connectionHost = CreateConnectionHost(
+                firstConnectionTask,
+                secondConnectionTask,
+                new TaskCompletionSource<Connection>().Task);
+            var keepAlive = TimeSpan.FromSeconds(10);
+            var eventBus = new TestableEventBus();
+            var dispatcher = new DefaultRequestDispatcher(connectionHost, compilerHost, CancellationToken.None, eventBus, keepAlive);
+
+            // Act
+            dispatcher.Run();
+
+            // Assert
+            Assert.True(eventBus.HasDetectedBadConnection);
+            Assert.True(listenCancellationToken.IsCancellationRequested);
+        }
+
+        private static TestableConnection CreateConnection(Stream stream, string identifier = null)
+        {
+            return new TestableConnection(stream, identifier ?? "identifier");
+        }
+
+        private static async Task<Connection> CreateConnectionWithEmptyServerRequest(Action<TestableConnection> configureConnection = null)
+        {
+            var memoryStream = new MemoryStream();
+            await EmptyServerRequest.WriteAsync(memoryStream, CancellationToken.None);
+            memoryStream.Position = 0;
+            var connection = CreateConnection(memoryStream);
+            configureConnection?.Invoke(connection);
+
+            return connection;
+        }
+
+        private static ConnectionHost CreateConnectionHost(params Task<Connection>[] connections)
+        {
+            var host = new Mock<ConnectionHost>();
+            if (connections.Length > 0)
+            {
+                var index = 0;
+                host
+                    .Setup(x => x.WaitForConnectionAsync(It.IsAny<CancellationToken>()))
+                    .Returns((CancellationToken ct) => connections[index++]);
+            }
+
+            return host.Object;
+        }
+
+        private static TestableCompilerHost CreateCompilerHost(Action<TestableCompilerHost> configureCompilerHost = null)
+        {
+            var compilerHost = new TestableCompilerHost();
+            configureCompilerHost?.Invoke(compilerHost);
+
+            return compilerHost;
+        }
+
+        private class TestableCompilerHost : CompilerHost
+        {
+            internal Func<ServerRequest, CancellationToken, ServerResponse> ExecuteFunc;
+
+            public override ServerResponse Execute(ServerRequest request, CancellationToken cancellationToken)
+            {
+                if (ExecuteFunc != null)
+                {
+                    return ExecuteFunc(request, cancellationToken);
+                }
+
+                return EmptyServerResponse;
+            }
+        }
+
+        private class TestableConnection : Connection
+        {
+            internal Func<CancellationToken, Task> WaitForDisconnectAsyncFunc;
+
+            public TestableConnection(Stream stream, string identifier)
+            {
+                Stream = stream;
+                Identifier = identifier;
+                WaitForDisconnectAsyncFunc = ct => Task.Delay(Timeout.Infinite, ct);
+            }
+
+            public override Task WaitForDisconnectAsync(CancellationToken cancellationToken)
+            {
+                return WaitForDisconnectAsyncFunc(cancellationToken);
+            }
+        }
+
+        private class TestableStream : Stream
+        {
+            internal readonly MemoryStream ReadStream = new MemoryStream();
+            internal readonly MemoryStream WriteStream = new MemoryStream();
+
+            public override bool CanRead => true;
+            public override bool CanSeek => false;
+            public override bool CanWrite => true;
+            public override long Length { get { throw new NotImplementedException(); } }
+            public override long Position
+            {
+                get { throw new NotImplementedException(); }
+                set { throw new NotImplementedException(); }
+            }
+
+            public override void Flush()
+            {
+            }
+
+            public override int Read(byte[] buffer, int offset, int count)
+            {
+                return ReadStream.Read(buffer, offset, count);
+            }
+
+            public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+            {
+                return ReadStream.ReadAsync(buffer, offset, count, cancellationToken);
+            }
+
+            public override long Seek(long offset, SeekOrigin origin)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void SetLength(long value)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void Write(byte[] buffer, int offset, int count)
+            {
+                WriteStream.Write(buffer, offset, count);
+            }
+
+            public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+            {
+                return WriteStream.WriteAsync(buffer, offset, count, cancellationToken);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerData.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerData.cs
new file mode 100644
index 0000000000..37a9d0180a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerData.cs
@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal sealed class ServerData : IDisposable
+    {
+        internal CancellationTokenSource CancellationTokenSource { get; }
+        internal Task<ServerStats> ServerTask { get; }
+        internal Task ListenTask { get; }
+        internal string PipeName { get; }
+
+        internal ServerData(CancellationTokenSource cancellationTokenSource, string pipeName, Task<ServerStats> serverTask, Task listenTask)
+        {
+            CancellationTokenSource = cancellationTokenSource;
+            PipeName = pipeName;
+            ServerTask = serverTask;
+            ListenTask = listenTask;
+        }
+
+        internal async Task<ServerStats> CancelAndCompleteAsync()
+        {
+            CancellationTokenSource.Cancel();
+            return await ServerTask;
+        }
+
+        internal async Task Verify(int connections, int completed)
+        {
+            var stats = await CancelAndCompleteAsync().ConfigureAwait(false);
+            Assert.Equal(connections, stats.Connections);
+            Assert.Equal(completed, stats.CompletedConnections);
+        }
+
+        public void Dispose()
+        {
+            if (!CancellationTokenSource.IsCancellationRequested)
+            {
+                CancellationTokenSource.Cancel();
+            }
+
+            ServerTask.Wait();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerStats.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerStats.cs
new file mode 100644
index 0000000000..ce4064528f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerStats.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal struct ServerStats
+    {
+        internal readonly int Connections;
+        internal readonly int CompletedConnections;
+
+        internal ServerStats(int connections, int completedConnections)
+        {
+            Connections = connections;
+            CompletedConnections = completedConnections;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerUtilities.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerUtilities.cs
new file mode 100644
index 0000000000..65e407f644
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/ServerUtilities.cs
@@ -0,0 +1,156 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Moq;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class ServerUtilities
+    {
+        internal static string DefaultClientDirectory { get; } = Path.GetDirectoryName(typeof(ServerUtilities).Assembly.Location);
+
+        internal static ServerPaths CreateBuildPaths(string workingDir, string tempDir)
+        {
+            return new ServerPaths(
+                clientDir: DefaultClientDirectory,
+                workingDir: workingDir,
+                tempDir: tempDir);
+        }
+
+        internal static ServerData CreateServer(
+            string pipeName = null,
+            CompilerHost compilerHost = null,
+            ConnectionHost connectionHost = null,
+            Action<object, EventArgs> onListening = null)
+        {
+            pipeName = pipeName ?? Guid.NewGuid().ToString();
+            compilerHost = compilerHost ?? CompilerHost.Create();
+            connectionHost = connectionHost ?? ConnectionHost.Create(pipeName);
+
+            var serverStatsSource = new TaskCompletionSource<ServerStats>();
+            var serverListenSource = new TaskCompletionSource<bool>();
+            var cts = new CancellationTokenSource();
+            var mutexName = MutexName.GetServerMutexName(pipeName);
+            var thread = new Thread(_ =>
+            {
+                var eventBus = new TestableEventBus();
+                eventBus.Listening += (sender, e) => { serverListenSource.TrySetResult(true); };
+                if (onListening != null)
+                {
+                    eventBus.Listening += (sender, e) => onListening(sender, e);
+                }
+                try
+                {
+                    RunServer(
+                        pipeName,
+                        connectionHost,
+                        compilerHost,
+                        cts.Token,
+                        eventBus,
+                        Timeout.InfiniteTimeSpan);
+                }
+                finally
+                {
+                    var serverStats = new ServerStats(connections: eventBus.ConnectionCount, completedConnections: eventBus.CompletedCount);
+                    serverStatsSource.SetResult(serverStats);
+                }
+            });
+
+            thread.Start();
+
+            // The contract of this function is that it will return once the server has started.  Spin here until
+            // we can verify the server has started or simply failed to start.
+            while (ServerConnection.WasServerMutexOpen(mutexName) != true && thread.IsAlive)
+            {
+                Thread.Yield();
+            }
+
+            return new ServerData(cts, pipeName, serverStatsSource.Task, serverListenSource.Task);
+        }
+
+        internal static async Task<ServerResponse> Send(string pipeName, ServerRequest request)
+        {
+            using (var client = await Client.ConnectAsync(pipeName, timeout: null, cancellationToken: default).ConfigureAwait(false))
+            {
+                await request.WriteAsync(client.Stream).ConfigureAwait(false);
+                return await ServerResponse.ReadAsync(client.Stream).ConfigureAwait(false);
+            }
+        }
+
+        internal static async Task<int> SendShutdown(string pipeName)
+        {
+            var response = await Send(pipeName, ServerRequest.CreateShutdown());
+            return ((ShutdownServerResponse)response).ServerProcessId;
+        }
+
+        internal static int RunServer(
+            string pipeName,
+            ConnectionHost host,
+            CompilerHost compilerHost,
+            CancellationToken cancellationToken = default,
+            EventBus eventBus = null,
+            TimeSpan? keepAlive = null)
+        {
+            var command = new TestableServerCommand(host, compilerHost, cancellationToken, eventBus, keepAlive);
+            var args = new List<string>
+            {
+                "-p",
+                pipeName
+            };
+
+            var result = command.Execute(args.ToArray());
+            return result;
+        }
+
+        private class TestableServerCommand : ServerCommand
+        {
+            private readonly ConnectionHost _host;
+            private readonly CompilerHost _compilerHost;
+            private readonly EventBus _eventBus;
+            private readonly CancellationToken _cancellationToken;
+            private readonly TimeSpan? _keepAlive;
+
+            public TestableServerCommand(
+                ConnectionHost host,
+                CompilerHost compilerHost,
+                CancellationToken ct,
+                EventBus eventBus,
+                TimeSpan? keepAlive)
+                : base(new Application(ct, Mock.Of<ExtensionAssemblyLoader>(), Mock.Of<ExtensionDependencyChecker>(), (path, properties) => Mock.Of<PortableExecutableReference>()))
+            {
+                _host = host;
+                _compilerHost = compilerHost;
+                _cancellationToken = ct;
+                _eventBus = eventBus;
+                _keepAlive = keepAlive;
+            }
+
+            protected override void ExecuteServerCore(
+                ConnectionHost host,
+                CompilerHost compilerHost,
+                CancellationToken cancellationToken,
+                EventBus eventBus,
+                TimeSpan? keepAlive = null)
+            {
+                base.ExecuteServerCore(
+                    _host ?? host,
+                    _compilerHost ?? compilerHost,
+                    _cancellationToken,
+                    _eventBus ?? eventBus,
+                    _keepAlive ?? keepAlive);
+            }
+
+            protected override FileStream WritePidFile()
+            {
+                // Disable writing PID file as it is tested separately.
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/TestableEventBus.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/TestableEventBus.cs
new file mode 100644
index 0000000000..6430ce05df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Infrastructure/TestableEventBus.cs
@@ -0,0 +1,64 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class TestableEventBus : EventBus
+    {
+        public event EventHandler Listening;
+        public event EventHandler CompilationComplete;
+
+        public int ListeningCount { get; private set; }
+
+        public int ConnectionCount { get; private set; }
+
+        public int CompletedCount { get; private set; }
+
+        public DateTime? LastProcessedTime { get; private set; }
+
+        public TimeSpan? KeepAlive { get; private set; }
+
+        public bool HasDetectedBadConnection { get; private set; }
+
+        public bool HitKeepAliveTimeout { get; private set; }
+
+        public override void ConnectionListening()
+        {
+            ListeningCount++;
+            Listening?.Invoke(this, EventArgs.Empty);
+        }
+
+        public override void ConnectionReceived()
+        {
+            ConnectionCount++;
+        }
+
+        public override void ConnectionCompleted(int count)
+        {
+            CompletedCount += count;
+            LastProcessedTime = DateTime.Now;
+        }
+
+        public override void CompilationCompleted()
+        {
+            CompilationComplete?.Invoke(this, EventArgs.Empty);
+        }
+
+        public override void UpdateKeepAlive(TimeSpan timeSpan)
+        {
+            KeepAlive = timeSpan;
+        }
+
+        public override void ConnectionRudelyEnded()
+        {
+            HasDetectedBadConnection = true;
+        }
+
+        public override void KeepAliveReached()
+        {
+            HitKeepAliveTimeout = true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/LoaderTestResources.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/LoaderTestResources.cs
new file mode 100644
index 0000000000..9478c46684
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/LoaderTestResources.cs
@@ -0,0 +1,146 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class LoaderTestResources
+    {
+        static LoaderTestResources()
+        {
+            Delta = CreateAssemblyBlob("Delta", Array.Empty<AssemblyBlob>(), @"
+using System.Text;
+
+namespace Delta
+{
+    public class D
+    {
+        public void Write(StringBuilder sb, string s)
+        {
+            sb.AppendLine(""Delta: "" + s);
+        }
+    }
+}
+");
+
+            Gamma = CreateAssemblyBlob("Gamma", new[] { Delta, }, @"
+using System.Text;
+using Delta;
+
+namespace Gamma
+{
+    public class G
+    {
+        public void Write(StringBuilder sb, string s)
+        {
+            D d = new D();
+
+            d.Write(sb, ""Gamma: "" + s);
+        }
+    }
+}
+");
+
+            Alpha = CreateAssemblyBlob("Alpha", new[] { Gamma, }, @"
+using System.Text;
+using Gamma;
+
+namespace Alpha
+{
+    public class A
+    {
+        public void Write(StringBuilder sb, string s)
+        {
+            G g = new G();
+
+            g.Write(sb, ""Alpha: "" + s);
+        }
+    }
+}
+");
+
+            Beta = CreateAssemblyBlob("Beta", new[] { Gamma, }, @"
+using System.Text;
+using Gamma;
+
+namespace Beta
+{
+    public class B
+    {
+        public void Write(StringBuilder sb, string s)
+        {
+            G g = new G();
+
+            g.Write(sb, ""Beta: "" + s);
+        }
+    }
+}
+");
+        }
+
+        public static AssemblyBlob Alpha { get; }
+
+        public static AssemblyBlob Beta { get; }
+
+        public static AssemblyBlob Delta { get; }
+
+        public static AssemblyBlob Gamma { get; }
+
+        private static AssemblyBlob CreateAssemblyBlob(string assemblyName, AssemblyBlob[] references, string text)
+        {
+            var defaultReferences = new[]
+            {
+                MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
+            };
+
+            var compilation = CSharpCompilation.Create(
+                assemblyName,
+                new[] { CSharpSyntaxTree.ParseText(text) },
+                references.Select(r => r.ToMetadataReference()).Concat(defaultReferences),
+                new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+
+            using (var assemblyStream = new MemoryStream())
+            using (var symbolStream = new MemoryStream())
+            {
+                var result = compilation.Emit(assemblyStream, symbolStream);
+                Assert.Empty(result.Diagnostics);
+
+                return new AssemblyBlob(assemblyName, assemblyStream.GetBuffer(), symbolStream.GetBuffer());
+            }
+        }
+
+        public class AssemblyBlob
+        {
+            public AssemblyBlob(string assemblyName, byte[] assemblyBytes, byte[] symbolBytes)
+            {
+                AssemblyName = assemblyName;
+                AssemblyBytes = assemblyBytes;
+                SymbolBytes = symbolBytes;
+            }
+
+            public string AssemblyName { get; }
+
+            public byte[] AssemblyBytes { get; }
+
+            public byte[] SymbolBytes { get; }
+
+            public MetadataReference ToMetadataReference()
+            {
+                return MetadataReference.CreateFromImage(AssemblyBytes);
+            }
+
+            internal string WriteToFile(string directoryPath, string fileName)
+            {
+                var filePath = Path.Combine(directoryPath, fileName);
+                File.WriteAllBytes(filePath, AssemblyBytes);
+                return filePath;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MetadataCacheTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MetadataCacheTest.cs
new file mode 100644
index 0000000000..fd4e54197c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MetadataCacheTest.cs
@@ -0,0 +1,103 @@
+// 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.IO;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class MetadataCacheTest
+    {
+        [Fact]
+        public void GetMetadata_AddsToCache()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var metadataCache = new MetadataCache();
+                var assemblyFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                // Act
+                var result = metadataCache.GetMetadata(assemblyFilePath);
+
+                // Assert
+                Assert.NotNull(result);
+                Assert.Equal(1, metadataCache.Cache.Count);
+            }
+        }
+
+        [Fact]
+        public void GetMetadata_UsesCache()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var metadataCache = new MetadataCache();
+                var assemblyFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                // Act 1
+                var result = metadataCache.GetMetadata(assemblyFilePath);
+
+                // Assert 1
+                Assert.NotNull(result);
+                Assert.Equal(1, metadataCache.Cache.Count);
+
+                // Act 2
+                var cacheResult = metadataCache.GetMetadata(assemblyFilePath);
+
+                // Assert 2
+                Assert.Same(result, cacheResult);
+                Assert.Equal(1, metadataCache.Cache.Count);
+            }
+        }
+
+        [Fact]
+        public void GetMetadata_MultipleFiles_ReturnsDifferentResultsAndAddsToCache()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var metadataCache = new MetadataCache();
+                var assemblyFilePath1 = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+                var assemblyFilePath2 = LoaderTestResources.Gamma.WriteToFile(directory.DirectoryPath, "Gamma.dll");
+
+                // Act
+                var result1 = metadataCache.GetMetadata(assemblyFilePath1);
+                var result2 = metadataCache.GetMetadata(assemblyFilePath2);
+
+                // Assert
+                Assert.NotSame(result1, result2);
+                Assert.Equal(2, metadataCache.Cache.Count);
+            }
+        }
+
+        [Fact]
+        public void GetMetadata_ReplacesCache_IfFileTimestampChanged()
+        {
+            using (var directory = TempDirectory.Create())
+            {
+                // Arrange
+                var metadataCache = new MetadataCache();
+                var assemblyFilePath = LoaderTestResources.Delta.WriteToFile(directory.DirectoryPath, "Delta.dll");
+
+                // Act 1
+                var result = metadataCache.GetMetadata(assemblyFilePath);
+
+                // Assert 1
+                Assert.NotNull(result);
+                var entry = Assert.Single(metadataCache.Cache.TestingEnumerable);
+                Assert.Same(result, entry.Value.Metadata);
+
+                // Act 2
+                // Update the timestamp of the file
+                File.SetLastWriteTimeUtc(assemblyFilePath, File.GetLastWriteTimeUtc(assemblyFilePath).AddSeconds(1));
+                var cacheResult = metadataCache.GetMetadata(assemblyFilePath);
+
+                // Assert 2
+                Assert.NotSame(result, cacheResult);
+                entry = Assert.Single(metadataCache.Cache.TestingEnumerable);
+                Assert.Same(cacheResult, entry.Value.Metadata);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
new file mode 100644
index 0000000000..06aacff48d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MvcShim.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MvcShim.cs
new file mode 100644
index 0000000000..f4fae94c35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/MvcShim.cs
@@ -0,0 +1,45 @@
+// 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.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class MvcShim
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Razor.Test.MvcShim";
+
+        private static Assembly _assembly;
+        private static CSharpCompilation _baseCompilation;
+
+        public static Assembly Assembly
+        {
+            get
+            {
+                if (_assembly == null)
+                {
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), AssemblyName + ".dll");
+                    _assembly = Assembly.LoadFrom(filePath);
+                }
+
+                return _assembly;
+            }
+        }
+
+        public static CSharpCompilation BaseCompilation
+        {
+            get
+            {
+                if (_baseCompilation == null)
+                {
+                    _baseCompilation = TestCompilation.Create(Assembly);
+                }
+
+                return _baseCompilation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f0aa552b16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerCommandTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerCommandTest.cs
new file mode 100644
index 0000000000..cd6b2a0c57
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerCommandTest.cs
@@ -0,0 +1,119 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class ServerCommandTest
+    {
+        [Fact]
+        public void WritePidFile_WorksAsExpected()
+        {
+            // Arrange
+            var expectedProcessId = Process.GetCurrentProcess().Id;
+            var expectedRzcPath = typeof(ServerCommand).Assembly.Location;
+            var expectedFileName = $"rzc-{expectedProcessId}";
+            var directoryPath = Path.Combine(Path.GetTempPath(), "RazorTest", Guid.NewGuid().ToString());
+            var path = Path.Combine(directoryPath, expectedFileName);
+
+            var pipeName = Guid.NewGuid().ToString();
+            var server = GetServerCommand(pipeName);
+
+            // Act & Assert
+            try
+            {
+                using (var _ = server.WritePidFile(directoryPath))
+                {
+                    Assert.True(File.Exists(path));
+
+                    // Make sure another stream can be opened while the write stream is still open.
+                    using (var fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Write | FileShare.Delete))
+                    using (var reader = new StreamReader(fileStream, Encoding.UTF8))
+                    {
+                        var lines = reader.ReadToEnd().Split(Environment.NewLine);
+                        Assert.Equal(new[] { expectedProcessId.ToString(), "rzc", expectedRzcPath, pipeName }, lines);
+                    }
+                }
+
+                // Make sure the file is deleted on dispose.
+                Assert.False(File.Exists(path));
+            }
+            finally
+            {
+                // Cleanup after the test.
+                if (Directory.Exists(directoryPath))
+                {
+                    Directory.Delete(directoryPath, recursive: true);
+                }
+            }
+        }
+
+        [Fact]
+        public void GetPidFilePath_ReturnsCorrectDefaultPath()
+        {
+            // Arrange
+            var expectedPath = Path.Combine("homeDir", ".dotnet", "pids", "build");
+            var server = GetServerCommand();
+
+            // Act
+            var directoryPath = server.GetPidFilePath(getEnvironmentVariable: env =>
+            {
+                if (env == "DOTNET_BUILD_PIDFILE_DIRECTORY")
+                {
+                    return null;
+                }
+
+                return "homeDir";
+            });
+
+            // Assert
+            Assert.Equal(expectedPath, directoryPath);
+        }
+
+        [Fact]
+        public void GetPidFilePath_UsesEnvironmentVariablePathIfSpecified()
+        {
+            // Arrange
+            var expectedPath = "/Some/directory/path/";
+            var server = GetServerCommand();
+
+            // Act
+            var directoryPath = server.GetPidFilePath(getEnvironmentVariable: env => expectedPath);
+
+            // Assert
+            Assert.Equal(expectedPath, directoryPath);
+        }
+
+        [Fact]
+        public void GetPidFilePath_NullEnvironmentVariableValue_ReturnsNull()
+        {
+            // Arrange
+            var server = GetServerCommand();
+
+            // Act
+            var directoryPath = server.GetPidFilePath(getEnvironmentVariable: env => null);
+
+            // Assert
+            Assert.Null(directoryPath);
+        }
+
+        private ServerCommand GetServerCommand(string pipeName = null)
+        {
+            var application = new Application(
+                CancellationToken.None,
+                Mock.Of<ExtensionAssemblyLoader>(),
+                Mock.Of<ExtensionDependencyChecker>(),
+                (path, properties) => MetadataReference.CreateFromFile(path, properties));
+
+            return new ServerCommand(application, pipeName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
new file mode 100644
index 0000000000..d2e46631ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
@@ -0,0 +1,291 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class ServerLifecycleTest
+    {
+        private static ServerRequest EmptyServerRequest => new ServerRequest(1, Array.Empty<RequestArgument>());
+
+        private static ServerResponse EmptyServerResponse => new CompletedServerResponse(
+            returnCode: 0,
+            utf8output: false,
+            output: string.Empty,
+            error: string.Empty);
+
+        [Fact]
+        public void ServerStartup_MutexAlreadyAcquired_Fails()
+        {
+            // Arrange
+            var pipeName = Guid.NewGuid().ToString("N");
+            var mutexName = MutexName.GetServerMutexName(pipeName);
+            var compilerHost = new Mock<CompilerHost>(MockBehavior.Strict);
+            var host = new Mock<ConnectionHost>(MockBehavior.Strict);
+
+            // Act & Assert
+            using (var mutex = new Mutex(initiallyOwned: true, name: mutexName, createdNew: out var holdsMutex))
+            {
+                Assert.True(holdsMutex);
+                try
+                {
+                    var result = ServerUtilities.RunServer(pipeName, host.Object, compilerHost.Object);
+
+                    // Assert failure
+                    Assert.Equal(1, result);
+                }
+                finally
+                {
+                    mutex.ReleaseMutex();
+                }
+            }
+        }
+
+        [Fact]
+        public void ServerStartup_SuccessfullyAcquiredMutex()
+        {
+            // Arrange, Act & Assert
+            var pipeName = Guid.NewGuid().ToString("N");
+            var mutexName = MutexName.GetServerMutexName(pipeName);
+            var compilerHost = new Mock<CompilerHost>(MockBehavior.Strict);
+            var host = new Mock<ConnectionHost>(MockBehavior.Strict);
+            host
+                .Setup(x => x.WaitForConnectionAsync(It.IsAny<CancellationToken>()))
+                .Returns(() =>
+                {
+                    // Use a thread instead of Task to guarantee this code runs on a different
+                    // thread and we can validate the mutex state. 
+                    var source = new TaskCompletionSource<bool>();
+                    var thread = new Thread(_ =>
+                    {
+                        Mutex mutex = null;
+                        try
+                        {
+                            Assert.True(Mutex.TryOpenExisting(mutexName, out mutex));
+                            Assert.False(mutex.WaitOne(millisecondsTimeout: 0));
+                            source.SetResult(true);
+                        }
+                        catch (Exception ex)
+                        {
+                            source.SetException(ex);
+                            throw;
+                        }
+                        finally
+                        {
+                            mutex?.Dispose();
+                        }
+                    });
+
+                    // Synchronously wait here.  Don't returned a Task value because we need to 
+                    // ensure the above check completes before the server hits a timeout and 
+                    // releases the mutex. 
+                    thread.Start();
+                    source.Task.Wait();
+
+                    return new TaskCompletionSource<Connection>().Task;
+                });
+
+            var result = ServerUtilities.RunServer(pipeName, host.Object, compilerHost.Object, keepAlive: TimeSpan.FromSeconds(1));
+            Assert.Equal(0, result);
+        }
+
+        [Fact]
+        public async Task ServerRunning_ShutdownRequest_processesSuccessfully()
+        {
+            // Arrange
+            using (var serverData = ServerUtilities.CreateServer())
+            {
+                // Act
+                var serverProcessId = await ServerUtilities.SendShutdown(serverData.PipeName);
+
+                // Assert
+                Assert.Equal(Process.GetCurrentProcess().Id, serverProcessId);
+                await serverData.Verify(connections: 1, completed: 1);
+            }
+        }
+
+        /// <summary>
+        /// A shutdown request should not abort an existing compilation.  It should be allowed to run to 
+        /// completion.
+        /// </summary>
+        [Fact]
+        public async Task ServerRunning_ShutdownRequest_DoesNotAbortCompilation()
+        {
+            // Arrange
+            var startCompilationSource = new TaskCompletionSource<bool>();
+            var finishCompilationSource = new TaskCompletionSource<bool>();
+            var host = CreateCompilerHost(c => c.ExecuteFunc = (req, ct) =>
+            {
+                // At this point, the connection has been accepted and the compilation has started.
+                startCompilationSource.SetResult(true);
+
+                // We want this to keep running even after the shutdown is seen.
+                finishCompilationSource.Task.Wait();
+                return EmptyServerResponse;
+            });
+
+            using (var serverData = ServerUtilities.CreateServer(compilerHost: host))
+            {
+                var compileTask = ServerUtilities.Send(serverData.PipeName, EmptyServerRequest);
+
+                // Wait for the request to go through and trigger compilation.
+                await startCompilationSource.Task;
+
+                // Act
+                // The compilation is now in progress, send the shutdown.
+                await ServerUtilities.SendShutdown(serverData.PipeName);
+                Assert.False(compileTask.IsCompleted);
+
+                // Now let the task complete.
+                finishCompilationSource.SetResult(true);
+
+                // Assert
+                var response = await compileTask;
+                Assert.Equal(ServerResponse.ResponseType.Completed, response.Type);
+                Assert.Equal(0, ((CompletedServerResponse)response).ReturnCode);
+
+                await serverData.Verify(connections: 2, completed: 2);
+            }
+        }
+
+        /// <summary>
+        /// Multiple clients should be able to send shutdown requests to the server.
+        /// </summary>
+        [Fact]
+        public async Task ServerRunning_MultipleShutdownRequests_HandlesSuccessfully()
+        {
+            // Arrange
+            var startCompilationSource = new TaskCompletionSource<bool>();
+            var finishCompilationSource = new TaskCompletionSource<bool>();
+            var host = CreateCompilerHost(c => c.ExecuteFunc = (req, ct) =>
+            {
+                // At this point, the connection has been accepted and the compilation has started.
+                startCompilationSource.SetResult(true);
+
+                // We want this to keep running even after the shutdown is seen.
+                finishCompilationSource.Task.Wait();
+                return EmptyServerResponse;
+            });
+
+            using (var serverData = ServerUtilities.CreateServer(compilerHost: host))
+            {
+                var compileTask = ServerUtilities.Send(serverData.PipeName, EmptyServerRequest);
+
+                // Wait for the request to go through and trigger compilation.
+                await startCompilationSource.Task;
+
+                // Act
+                for (var i = 0; i < 10; i++)
+                {
+                    // The compilation is now in progress, send the shutdown.
+                    var processId = await ServerUtilities.SendShutdown(serverData.PipeName);
+                    Assert.Equal(Process.GetCurrentProcess().Id, processId);
+                    Assert.False(compileTask.IsCompleted);
+                }
+
+                // Now let the task complete.
+                finishCompilationSource.SetResult(true);
+
+                // Assert
+                var response = await compileTask;
+                Assert.Equal(ServerResponse.ResponseType.Completed, response.Type);
+                Assert.Equal(0, ((CompletedServerResponse)response).ReturnCode);
+
+                await serverData.Verify(connections: 11, completed: 11);
+            }
+        }
+
+        // https://github.com/aspnet/Razor/issues/1991
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        public async Task ServerRunning_CancelCompilation_CancelsSuccessfully()
+        {
+            // Arrange
+            const int requestCount = 5;
+            var count = 0;
+            var completionSource = new TaskCompletionSource<bool>();
+            var host = CreateCompilerHost(c => c.ExecuteFunc = (req, ct) =>
+            {
+                if (Interlocked.Increment(ref count) == requestCount)
+                {
+                    completionSource.SetResult(true);
+                }
+
+                ct.WaitHandle.WaitOne();
+                return new RejectedServerResponse();
+            });
+
+            var semaphore = new SemaphoreSlim(1);
+            Action<object, EventArgs> onListening = (s, e) =>
+            {
+                semaphore.Release();
+            };
+            using (var serverData = ServerUtilities.CreateServer(compilerHost: host, onListening: onListening))
+            {
+                // Send all the requests.
+                var clients = new List<Client>();
+                for (var i = 0; i < requestCount; i++)
+                {
+                    // Wait for the server to start listening.
+                    await semaphore.WaitAsync(TimeSpan.FromMinutes(1));
+
+                    var client = await Client.ConnectAsync(serverData.PipeName, timeout: null, cancellationToken: default);
+                    await EmptyServerRequest.WriteAsync(client.Stream);
+                    clients.Add(client);
+                }
+
+                // Act
+                // Wait until all of the connections are being processed by the server. 
+                await completionSource.Task;
+
+                // Now cancel
+                var stats = await serverData.CancelAndCompleteAsync();
+
+                // Assert
+                Assert.Equal(requestCount, stats.Connections);
+                Assert.Equal(requestCount, count);
+
+                // Read the server response to each client.
+                foreach (var client in clients)
+                {
+                    var task = ServerResponse.ReadAsync(client.Stream);
+                    // We expect this to throw because the stream is already closed.
+                    await Assert.ThrowsAnyAsync<IOException>(() => task);
+                    client.Dispose();
+                }
+            }
+        }
+
+        private static TestableCompilerHost CreateCompilerHost(Action<TestableCompilerHost> configureCompilerHost = null)
+        {
+            var compilerHost = new TestableCompilerHost();
+            configureCompilerHost?.Invoke(compilerHost);
+
+            return compilerHost;
+        }
+
+        private class TestableCompilerHost : CompilerHost
+        {
+            internal Func<ServerRequest, CancellationToken, ServerResponse> ExecuteFunc;
+
+            public override ServerResponse Execute(ServerRequest request, CancellationToken cancellationToken)
+            {
+                if (ExecuteFunc != null)
+                {
+                    return ExecuteFunc(request, cancellationToken);
+                }
+
+                return EmptyServerResponse;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerProtocol/ServerProtocolTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerProtocol/ServerProtocolTest.cs
new file mode 100644
index 0000000000..86a7beb8be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerProtocol/ServerProtocolTest.cs
@@ -0,0 +1,128 @@
+// 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.Collections.Immutable;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    public class ServerProtocolTest
+    {
+        [Fact]
+        public async Task ServerResponse_WriteRead_RoundtripsProperly()
+        {
+            // Arrange
+            var response = new CompletedServerResponse(42, utf8output: false, output: "a string", error: "an error");
+            var memoryStream = new MemoryStream();
+
+            // Act
+            await response.WriteAsync(memoryStream, CancellationToken.None);
+
+            // Assert
+            Assert.True(memoryStream.Position > 0);
+            memoryStream.Position = 0;
+            var result = (CompletedServerResponse)await ServerResponse.ReadAsync(memoryStream, CancellationToken.None);
+            Assert.Equal(42, result.ReturnCode);
+            Assert.False(result.Utf8Output);
+            Assert.Equal("a string", result.Output);
+            Assert.Equal("an error", result.ErrorOutput);
+        }
+
+        [Fact]
+        public async Task ServerRequest_WriteRead_RoundtripsProperly()
+        {
+            // Arrange
+            var request = new ServerRequest(
+                ServerProtocol.ProtocolVersion,
+                ImmutableArray.Create(
+                    new RequestArgument(RequestArgument.ArgumentId.CurrentDirectory, argumentIndex: 0, value: "directory"),
+                    new RequestArgument(RequestArgument.ArgumentId.CommandLineArgument, argumentIndex: 1, value: "file")));
+            var memoryStream = new MemoryStream();
+
+            // Act
+            await request.WriteAsync(memoryStream, CancellationToken.None);
+
+            // Assert
+            Assert.True(memoryStream.Position > 0);
+            memoryStream.Position = 0;
+            var read = await ServerRequest.ReadAsync(memoryStream, CancellationToken.None);
+            Assert.Equal(ServerProtocol.ProtocolVersion, read.ProtocolVersion);
+            Assert.Equal(2, read.Arguments.Count);
+            Assert.Equal(RequestArgument.ArgumentId.CurrentDirectory, read.Arguments[0].Id);
+            Assert.Equal(0, read.Arguments[0].ArgumentIndex);
+            Assert.Equal("directory", read.Arguments[0].Value);
+            Assert.Equal(RequestArgument.ArgumentId.CommandLineArgument, read.Arguments[1].Id);
+            Assert.Equal(1, read.Arguments[1].ArgumentIndex);
+            Assert.Equal("file", read.Arguments[1].Value);
+        }
+
+        [Fact]
+        public void CreateShutdown_CreatesCorrectShutdownRequest()
+        {
+            // Arrange & Act
+            var request = ServerRequest.CreateShutdown();
+
+            // Assert
+            Assert.Equal(2, request.Arguments.Count);
+
+            var argument1 = request.Arguments[0];
+            Assert.Equal(RequestArgument.ArgumentId.Shutdown, argument1.Id);
+            Assert.Equal(0, argument1.ArgumentIndex);
+            Assert.Equal("", argument1.Value);
+
+            var argument2 = request.Arguments[1];
+            Assert.Equal(RequestArgument.ArgumentId.CommandLineArgument, argument2.Id);
+            Assert.Equal(1, argument2.ArgumentIndex);
+            Assert.Equal("shutdown", argument2.Value);
+        }
+
+        [Fact]
+        public async Task ShutdownRequest_WriteRead_RoundtripsProperly()
+        {
+            // Arrange
+            var memoryStream = new MemoryStream();
+            var request = ServerRequest.CreateShutdown();
+
+            // Act
+            await request.WriteAsync(memoryStream, CancellationToken.None);
+
+            // Assert
+            memoryStream.Position = 0;
+            var read = await ServerRequest.ReadAsync(memoryStream, CancellationToken.None);
+
+            var argument1 = request.Arguments[0];
+            Assert.Equal(RequestArgument.ArgumentId.Shutdown, argument1.Id);
+            Assert.Equal(0, argument1.ArgumentIndex);
+            Assert.Equal("", argument1.Value);
+
+            var argument2 = request.Arguments[1];
+            Assert.Equal(RequestArgument.ArgumentId.CommandLineArgument, argument2.Id);
+            Assert.Equal(1, argument2.ArgumentIndex);
+            Assert.Equal("shutdown", argument2.Value);
+        }
+
+        [Fact]
+        public async Task ShutdownResponse_WriteRead_RoundtripsProperly()
+        {
+            // Arrange & Act 1
+            var memoryStream = new MemoryStream();
+            var response = new ShutdownServerResponse(42);
+
+            // Assert 1
+            Assert.Equal(ServerResponse.ResponseType.Shutdown, response.Type);
+
+            // Act 2
+            await response.WriteAsync(memoryStream, CancellationToken.None);
+
+            // Assert 2
+            memoryStream.Position = 0;
+            var read = await ServerResponse.ReadAsync(memoryStream, CancellationToken.None);
+            Assert.Equal(ServerResponse.ResponseType.Shutdown, read.Type);
+            var typed = (ShutdownServerResponse)read;
+            Assert.Equal(42, typed.ServerProcessId);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TempDirectory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TempDirectory.cs
new file mode 100644
index 0000000000..d491248465
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TempDirectory.cs
@@ -0,0 +1,30 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class TempDirectory : IDisposable
+    {
+        public static TempDirectory Create()
+        {
+            var directoryPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("n"));
+            Directory.CreateDirectory(directoryPath);
+            return new TempDirectory(directoryPath);
+        }
+
+        private TempDirectory(string directoryPath)
+        {
+            DirectoryPath = directoryPath;
+        }
+
+        public string DirectoryPath { get; }
+        
+        public void Dispose()
+        {
+            Directory.Delete(DirectoryPath, recursive: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TestDefaultExtensionAssemblyLoader.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TestDefaultExtensionAssemblyLoader.cs
new file mode 100644
index 0000000000..d272e1c005
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/TestDefaultExtensionAssemblyLoader.cs
@@ -0,0 +1,25 @@
+// 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.IO;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal class TestDefaultExtensionAssemblyLoader : DefaultExtensionAssemblyLoader
+    {
+        public TestDefaultExtensionAssemblyLoader(string baseDirectory)
+            : base(baseDirectory)
+        {
+        }
+
+        protected override Assembly LoadFromPathUnsafeCore(string filePath)
+        {
+            // Force a load from streams so we don't lock the files on disk. This way we can test
+            // shadow copying without leaving a mess behind.
+            var bytes = File.ReadAllBytes(filePath);
+            var stream = new MemoryStream(bytes);
+            return LoadContext.LoadFromStream(stream);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/AssemblyIdentityEqualityComparer.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/AssemblyIdentityEqualityComparer.cs
new file mode 100644
index 0000000000..e41fc02abc
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/AssemblyIdentityEqualityComparer.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal abstract class AssemblyIdentityEqualityComparer : IEqualityComparer<AssemblyIdentity>
+    {
+        public static readonly AssemblyIdentityEqualityComparer NameAndVersion = new NameAndVersionEqualityComparer();
+
+        public abstract bool Equals(AssemblyIdentity x, AssemblyIdentity y);
+
+        public abstract int GetHashCode(AssemblyIdentity obj);
+
+        private class NameAndVersionEqualityComparer : AssemblyIdentityEqualityComparer
+        {
+            public override bool Equals(AssemblyIdentity x, AssemblyIdentity y)
+            {
+                if (object.ReferenceEquals(x, y))
+                {
+                    return true;
+                }
+                else if (x == null ^ y == null)
+                {
+                    return false;
+                }
+                else
+                {
+                    return string.Equals(x.Name, y.Name, StringComparison.OrdinalIgnoreCase) && object.Equals(x.Version, y.Version);
+                }
+            }
+
+            public override int GetHashCode(AssemblyIdentity obj)
+            {
+                if (obj == null)
+                {
+                    return 0;
+                }
+
+                var hash = new HashCodeCombiner();
+                hash.Add(obj.Name, StringComparer.OrdinalIgnoreCase);
+                hash.Add(obj.Version);
+                return hash;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilationTagHelperFeature.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilationTagHelperFeature.cs
new file mode 100644
index 0000000000..2041cd9eb5
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilationTagHelperFeature.cs
@@ -0,0 +1,50 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public sealed class CompilationTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature
+    {
+        private ITagHelperDescriptorProvider[] _providers;
+        private IMetadataReferenceFeature _referenceFeature;
+
+        public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
+        {
+            var results = new List<TagHelperDescriptor>();
+
+            var context = TagHelperDescriptorProviderContext.Create(results);
+            var compilation = CSharpCompilation.Create("__TagHelpers", references: _referenceFeature.References);
+            if (IsValidCompilation(compilation))
+            {
+                context.SetCompilation(compilation);
+            }
+
+            for (var i = 0; i < _providers.Length; i++)
+            {
+                _providers[i].Execute(context);
+            }
+
+            return results;
+        }
+
+        protected override void OnInitialized()
+        {
+            _referenceFeature = Engine.Features.OfType<IMetadataReferenceFeature>().FirstOrDefault();
+            _providers = Engine.Features.OfType<ITagHelperDescriptorProvider>().OrderBy(f => f.Order).ToArray();
+        }
+
+        internal static bool IsValidCompilation(Compilation compilation)
+        {
+            var @string = compilation.GetSpecialType(SpecialType.System_String);
+
+            // Do some minimal tests to verify the compilation is valid. If symbols for System.String
+            // is missing or errored, the compilation may be missing references.
+            return @string != null && @string.TypeKind != TypeKind.Error;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..def7c30ac0
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -0,0 +1,132 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var componentSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.IComponent);
+            if (componentSymbol == null || componentSymbol.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new ComponentTypeVisitor(componentSymbol, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            for (var i = 0; i < types.Count; i++)
+            {
+                var type = types[i];
+                var descriptor = CreateDescriptor(type);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private static TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            var typeName = type.ToDisplayString(DefaultTagHelperDescriptorFactory.FullNameTypeDisplayFormat);
+            var assemblyName = type.ContainingAssembly.Identity.Name;
+
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(TagHelperConventions.ComponentKind, typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+            descriptorBuilder.Metadata[TagHelperMetadata.Runtime.Name] = TagHelperConventions.ComponentKind;
+
+            // Components have very simple matching rules. The type name (short) matches the tag name.
+            descriptorBuilder.TagMatchingRule(r => r.TagName = type.Name);
+
+            var descriptor = descriptorBuilder.Build();
+            return descriptor;
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+
+        // Visits top-level types and finds interface implementations.
+        internal class ComponentTypeVisitor : SymbolVisitor
+        {
+            private readonly INamedTypeSymbol _componentSymbol;
+            private readonly List<INamedTypeSymbol> _results;
+
+            public ComponentTypeVisitor(INamedTypeSymbol componentSymbol, List<INamedTypeSymbol> results)
+            {
+                _componentSymbol = componentSymbol;
+                _results = results;
+            }
+
+            public override void VisitNamedType(INamedTypeSymbol symbol)
+            {
+                if (IsComponent(symbol))
+                {
+                    _results.Add(symbol);
+                }
+            }
+
+            public override void VisitNamespace(INamespaceSymbol symbol)
+            {
+                foreach (var member in symbol.GetMembers())
+                {
+                    Visit(member);
+                }
+            }
+
+            public override void VisitAssembly(IAssemblySymbol symbol)
+            {
+                // This as a simple yet high-value optimization that excludes the vast majority of
+                // assemblies that (by definition) can't contain a component.
+                if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal))
+                {
+                    Visit(symbol.GlobalNamespace);
+                }
+            }
+
+            internal bool IsComponent(INamedTypeSymbol symbol)
+            {
+                return
+                    symbol.DeclaredAccessibility == Accessibility.Public &&
+                    !symbol.IsAbstract &&
+                    symbol.AllInterfaces.Contains(_componentSymbol);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultMetadataReferenceFeature.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultMetadataReferenceFeature.cs
new file mode 100644
index 0000000000..a8914d7513
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultMetadataReferenceFeature.cs
@@ -0,0 +1,13 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public sealed class DefaultMetadataReferenceFeature : RazorEngineFeatureBase, IMetadataReferenceFeature
+    {
+        public IReadOnlyList<MetadataReference> References { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
new file mode 100644
index 0000000000..333003f5b2
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
@@ -0,0 +1,439 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class DefaultTagHelperDescriptorFactory
+    {
+        private const string DataDashPrefix = "data-";
+        private const string TagHelperNameEnding = "TagHelper";
+
+        private readonly INamedTypeSymbol _htmlAttributeNameAttributeSymbol;
+        private readonly INamedTypeSymbol _htmlAttributeNotBoundAttributeSymbol;
+        private readonly INamedTypeSymbol _htmlTargetElementAttributeSymbol;
+        private readonly INamedTypeSymbol _outputElementHintAttributeSymbol;
+        private readonly INamedTypeSymbol _iDictionarySymbol;
+        private readonly INamedTypeSymbol _restrictChildrenAttributeSymbol;
+        private readonly INamedTypeSymbol _editorBrowsableAttributeSymbol;
+
+        internal static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+            SymbolDisplayFormat.FullyQualifiedFormat
+                .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+                .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+
+        public DefaultTagHelperDescriptorFactory(Compilation compilation, bool includeDocumentation, bool excludeHidden)
+        {
+            IncludeDocumentation = includeDocumentation;
+            ExcludeHidden = excludeHidden;
+
+            _htmlAttributeNameAttributeSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.HtmlAttributeNameAttribute);
+            _htmlAttributeNotBoundAttributeSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.HtmlAttributeNotBoundAttribute);
+            _htmlTargetElementAttributeSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.HtmlTargetElementAttribute);
+            _outputElementHintAttributeSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.OutputElementHintAttribute);
+            _restrictChildrenAttributeSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.RestrictChildrenAttribute);
+            _editorBrowsableAttributeSymbol = compilation.GetTypeByMetadataName(typeof(EditorBrowsableAttribute).FullName);
+            _iDictionarySymbol = compilation.GetTypeByMetadataName(TagHelperTypes.IDictionary);
+        }
+
+        protected bool ExcludeHidden { get; }
+
+        protected bool IncludeDocumentation { get; }
+
+        /// <inheritdoc />
+        public virtual TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (ShouldSkipDescriptorCreation(type))
+            {
+                return null;
+            }
+
+            var typeName = GetFullName(type);
+            var assemblyName = type.ContainingAssembly.Identity.Name;
+
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+
+            AddBoundAttributes(type, descriptorBuilder);
+            AddTagMatchingRules(type, descriptorBuilder);
+            AddAllowedChildren(type, descriptorBuilder);
+            AddDocumentation(type, descriptorBuilder);
+            AddTagOutputHint(type, descriptorBuilder);
+
+            var descriptor = descriptorBuilder.Build();
+
+            return descriptor;
+        }
+
+        private void AddTagMatchingRules(INamedTypeSymbol type, TagHelperDescriptorBuilder descriptorBuilder)
+        {
+            var targetElementAttributes = type
+                .GetAttributes()
+                .Where(attribute => attribute.AttributeClass == _htmlTargetElementAttributeSymbol);
+
+            // If there isn't an attribute specifying the tag name derive it from the name
+            if (!targetElementAttributes.Any())
+            {
+                var name = type.Name;
+
+                if (name.EndsWith(TagHelperNameEnding, StringComparison.OrdinalIgnoreCase))
+                {
+                    name = name.Substring(0, name.Length - TagHelperNameEnding.Length);
+                }
+
+                descriptorBuilder.TagMatchingRule(ruleBuilder =>
+                {
+                    var htmlCasedName = HtmlConventions.ToHtmlCase(name);
+                    ruleBuilder.TagName = htmlCasedName;
+                });
+
+                return;
+            }
+
+            foreach (var targetElementAttribute in targetElementAttributes)
+            {
+                descriptorBuilder.TagMatchingRule(ruleBuilder =>
+                {
+                    var tagName = HtmlTargetElementAttribute_Tag(targetElementAttribute);
+                    ruleBuilder.TagName = tagName;
+
+                    var parentTag = HtmlTargetElementAttribute_ParentTag(targetElementAttribute);
+                    ruleBuilder.ParentTag = parentTag;
+
+                    var tagStructure = HtmlTargetElementAttribute_TagStructure(targetElementAttribute);
+                    ruleBuilder.TagStructure = tagStructure;
+
+                    var requiredAttributeString = HtmlTargetElementAttribute_Attributes(targetElementAttribute);
+                    RequiredAttributeParser.AddRequiredAttributes(requiredAttributeString, ruleBuilder);
+                });
+            }
+        }
+
+        private void AddBoundAttributes(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
+        {
+            var accessibleProperties = GetAccessibleProperties(type);
+            foreach (var property in accessibleProperties)
+            {
+                if (ShouldSkipDescriptorCreation(property))
+                {
+                    continue;
+                }
+
+                builder.BindAttribute(attributeBuilder =>
+                {
+                    ConfigureBoundAttribute(attributeBuilder, property, type);
+                });
+            }
+        }
+
+        private void AddAllowedChildren(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
+        {
+            var restrictChildrenAttribute = type.GetAttributes().Where(a => a.AttributeClass == _restrictChildrenAttributeSymbol).FirstOrDefault();
+            if (restrictChildrenAttribute == null)
+            {
+                return;
+            }
+
+            builder.AllowChildTag(childTagBuilder => childTagBuilder.Name = (string)restrictChildrenAttribute.ConstructorArguments[0].Value);
+
+            if (restrictChildrenAttribute.ConstructorArguments.Length == 2)
+            {
+                foreach (var value in restrictChildrenAttribute.ConstructorArguments[1].Values)
+                {
+                    builder.AllowChildTag(childTagBuilder => childTagBuilder.Name = (string)value.Value);
+                }
+            }
+        }
+
+        private void AddDocumentation(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
+        {
+            if (!IncludeDocumentation)
+            {
+                return;
+            }
+
+            var xml = type.GetDocumentationCommentXml();
+
+            if (!string.IsNullOrEmpty(xml))
+            {
+                builder.Documentation = xml;
+            }
+        }
+
+        private void AddTagOutputHint(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
+        {
+            string outputElementHint = null;
+            var outputElementHintAttribute = type.GetAttributes().Where(a => a.AttributeClass == _outputElementHintAttributeSymbol).FirstOrDefault();
+            if (outputElementHintAttribute != null)
+            {
+                outputElementHint = (string)(outputElementHintAttribute.ConstructorArguments[0]).Value;
+                builder.TagOutputHint = outputElementHint;
+            }
+        }
+
+        private void ConfigureBoundAttribute(
+            BoundAttributeDescriptorBuilder builder,
+            IPropertySymbol property,
+            INamedTypeSymbol containingType)
+        {
+            var attributeNameAttribute = property
+                .GetAttributes()
+                .Where(a => a.AttributeClass == _htmlAttributeNameAttributeSymbol)
+                .FirstOrDefault();
+
+            bool hasExplicitName;
+            string attributeName;
+            if (attributeNameAttribute == null ||
+                attributeNameAttribute.ConstructorArguments.Length == 0 ||
+                string.IsNullOrEmpty((string)attributeNameAttribute.ConstructorArguments[0].Value))
+            {
+                hasExplicitName = false;
+                attributeName = HtmlConventions.ToHtmlCase(property.Name);
+            }
+            else
+            {
+                hasExplicitName = true;
+                attributeName = (string)attributeNameAttribute.ConstructorArguments[0].Value;
+            }
+
+            var hasPublicSetter = property.SetMethod != null && property.SetMethod.DeclaredAccessibility == Accessibility.Public;
+            var typeName = GetFullName(property.Type);
+            builder.TypeName = typeName;
+            builder.SetPropertyName(property.Name);
+
+            if (hasPublicSetter)
+            {
+                builder.Name = attributeName;
+
+                if (property.Type.TypeKind == TypeKind.Enum)
+                {
+                    builder.IsEnum = true;
+                }
+
+                if (IncludeDocumentation)
+                {
+                    var xml = property.GetDocumentationCommentXml();
+
+                    if (!string.IsNullOrEmpty(xml))
+                    {
+                        builder.Documentation = xml;
+                    }
+                }
+            }
+            else if (hasExplicitName && !IsPotentialDictionaryProperty(property))
+            {
+                // Specified HtmlAttributeNameAttribute.Name though property has no public setter.
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidAttributeNameNullOrEmpty(GetFullName(containingType), property.Name);
+                builder.Diagnostics.Add(diagnostic);
+            }
+
+            ConfigureDictionaryBoundAttribute(builder, property, containingType, attributeNameAttribute, attributeName, hasPublicSetter);
+        }
+
+        private void ConfigureDictionaryBoundAttribute(
+            BoundAttributeDescriptorBuilder builder,
+            IPropertySymbol property,
+            INamedTypeSymbol containingType,
+            AttributeData attributeNameAttribute,
+            string attributeName,
+            bool hasPublicSetter)
+        {
+            string dictionaryAttributePrefix = null;
+            var dictionaryAttributePrefixSet = false;
+
+            if (attributeNameAttribute != null)
+            {
+                foreach (var argument in attributeNameAttribute.NamedArguments)
+                {
+                    if (argument.Key == TagHelperTypes.HtmlAttributeName.DictionaryAttributePrefix)
+                    {
+                        dictionaryAttributePrefix = (string)argument.Value.Value;
+                        dictionaryAttributePrefixSet = true;
+                        break;
+                    }
+                }
+            }
+
+            var dictionaryArgumentTypes = GetDictionaryArgumentTypes(property);
+            if (dictionaryArgumentTypes != null)
+            {
+                var prefix = dictionaryAttributePrefix;
+                if (attributeNameAttribute == null || !dictionaryAttributePrefixSet)
+                {
+                    prefix = attributeName + "-";
+                }
+
+                if (prefix != null)
+                {
+                    var dictionaryValueType = dictionaryArgumentTypes[1];
+                    var dictionaryValueTypeName = GetFullName(dictionaryValueType);
+                    builder.AsDictionary(prefix, dictionaryValueTypeName);
+                }
+            }
+
+            var dictionaryKeyType = dictionaryArgumentTypes?[0];
+
+            if (dictionaryKeyType?.SpecialType != SpecialType.System_String)
+            {
+                if (dictionaryAttributePrefix != null)
+                {
+                    // DictionaryAttributePrefix is not supported unless associated with an
+                    // IDictionary<string, TValue> property.
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(GetFullName(containingType), property.Name);
+                    builder.Diagnostics.Add(diagnostic);
+                }
+
+                return;
+            }
+            else if (!hasPublicSetter && attributeNameAttribute != null && !dictionaryAttributePrefixSet)
+            {
+                // Must set DictionaryAttributePrefix when using HtmlAttributeNameAttribute with a dictionary property
+                // that lacks a public setter.
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNull(GetFullName(containingType), property.Name);
+                builder.Diagnostics.Add(diagnostic);
+
+                return;
+            }
+        }
+
+        private IReadOnlyList<ITypeSymbol> GetDictionaryArgumentTypes(IPropertySymbol property)
+        {
+            INamedTypeSymbol dictionaryType;
+            if ((property.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            {
+                dictionaryType = (INamedTypeSymbol)property.Type;
+            }
+            else if (property.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            {
+                dictionaryType = property.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+            }
+            else
+            {
+                dictionaryType = null;
+            }
+
+            return dictionaryType?.TypeArguments;
+        }
+
+        private static string HtmlTargetElementAttribute_Attributes(AttributeData attibute)
+        {
+            foreach (var kvp in attibute.NamedArguments)
+            {
+                if (kvp.Key == TagHelperTypes.HtmlTargetElement.Attributes)
+                {
+                    return (string)kvp.Value.Value;
+                }
+            }
+
+            return null;
+        }
+
+        private static string HtmlTargetElementAttribute_ParentTag(AttributeData attibute)
+        {
+            foreach (var kvp in attibute.NamedArguments)
+            {
+                if (kvp.Key == TagHelperTypes.HtmlTargetElement.ParentTag)
+                {
+                    return (string)kvp.Value.Value;
+                }
+            }
+
+            return null;
+        }
+
+        private static string HtmlTargetElementAttribute_Tag(AttributeData attibute)
+        {
+            if (attibute.ConstructorArguments.Length == 0)
+            {
+                return TagHelperMatchingConventions.ElementCatchAllName;
+            }
+            else
+            {
+                return (string)attibute.ConstructorArguments[0].Value;
+            }
+        }
+
+        private static TagStructure HtmlTargetElementAttribute_TagStructure(AttributeData attibute)
+        {
+            foreach (var kvp in attibute.NamedArguments)
+            {
+                if (kvp.Key == TagHelperTypes.HtmlTargetElement.TagStructure)
+                {
+                    return (TagStructure)kvp.Value.Value;
+                }
+            }
+
+            return TagStructure.Unspecified;
+        }
+
+        private bool IsPotentialDictionaryProperty(IPropertySymbol property)
+        {
+            return
+                ((property.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol || property.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol)) &&
+                GetDictionaryArgumentTypes(property)?[0].SpecialType == SpecialType.System_String;
+        }
+
+        private IEnumerable<IPropertySymbol> GetAccessibleProperties(INamedTypeSymbol typeSymbol)
+        {
+            var accessibleProperties = new Dictionary<string, IPropertySymbol>(StringComparer.Ordinal);
+            do
+            {
+                var members = typeSymbol.GetMembers();
+                for (var i = 0; i < members.Length; i++)
+                {
+                    var property = members[i] as IPropertySymbol;
+                    if (property != null &&
+                        property.Parameters.Length == 0 &&
+                        property.GetMethod != null &&
+                        property.GetMethod.DeclaredAccessibility == Accessibility.Public &&
+                        property.GetAttributes().Where(a => a.AttributeClass == _htmlAttributeNotBoundAttributeSymbol).FirstOrDefault() == null &&
+                        (property.GetAttributes().Any(a => a.AttributeClass == _htmlAttributeNameAttributeSymbol) ||
+                        property.SetMethod != null && property.SetMethod.DeclaredAccessibility == Accessibility.Public ||
+                        IsPotentialDictionaryProperty(property)) &&
+                        !accessibleProperties.ContainsKey(property.Name))
+                    {
+                        accessibleProperties.Add(property.Name, property);
+                    }
+                }
+
+                typeSymbol = typeSymbol.BaseType;
+            }
+            while (typeSymbol != null);
+
+            return accessibleProperties.Values;
+        }
+
+        private bool ShouldSkipDescriptorCreation(ISymbol symbol)
+        {
+            if (ExcludeHidden)
+            {
+                var editorBrowsableAttribute = symbol.GetAttributes().Where(a => a.AttributeClass == _editorBrowsableAttributeSymbol).FirstOrDefault();
+
+                if (editorBrowsableAttribute == null)
+                {
+                    return false;
+                }
+
+                if (editorBrowsableAttribute.ConstructorArguments.Length > 0)
+                {
+                    return (EditorBrowsableState)editorBrowsableAttribute.ConstructorArguments[0].Value == EditorBrowsableState.Never;
+                }
+            }
+
+            return false;
+        }
+
+        protected static string GetFullName(ITypeSymbol type) => type.ToDisplayString(FullNameTypeDisplayFormat);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..ebb649da5b
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
@@ -0,0 +1,75 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public sealed class DefaultTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        [Obsolete(
+            "This property is obsolete will not be honored. Documentation will be included if " +
+            "TagHelperDescriptorProviderContext.IncludeDocumentation is set to true. Hidden tag helpers will" +
+            "be excluded from the results if TagHelperDescriptorProviderContext.ExcludeHidden is set to true.")]
+        public bool DesignTime { get; set; }
+
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var iTagHelper = compilation.GetTypeByMetadataName(TagHelperTypes.ITagHelper);
+            if (iTagHelper == null || iTagHelper.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new TagHelperTypeVisitor(iTagHelper, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, context.IncludeDocumentation, context.ExcludeHidden);
+            for (var i = 0; i < types.Count; i++)
+            {
+                var descriptor = factory.CreateDescriptor(types[i]);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparer.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparer.cs
new file mode 100644
index 0000000000..a0ca3cb9a3
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class FilePathComparer
+    {
+        private static StringComparer _instance;
+
+        public static StringComparer Instance
+        {
+            get
+            {
+                if (_instance == null && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    _instance = StringComparer.Ordinal;
+                }
+                else if (_instance == null)
+                {
+                    _instance = StringComparer.OrdinalIgnoreCase;
+                }
+
+                return _instance;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/IMetadataReferenceFeature.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/IMetadataReferenceFeature.cs
new file mode 100644
index 0000000000..319f5fa1b3
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/IMetadataReferenceFeature.cs
@@ -0,0 +1,13 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using System.Collections.Generic;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public interface IMetadataReferenceFeature : IRazorEngineFeature
+    {
+        IReadOnlyList<MetadataReference> References { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
new file mode 100644
index 0000000000..e1efe71870
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..2da745cbad
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,17 @@
+// 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.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..df00f34c36
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs
@@ -0,0 +1,142 @@
+// <auto-generated />
+namespace Microsoft.CodeAnalysis.Razor
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.CodeAnalysis.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Could not find matching ']' for required attribute '{0}'.
+        /// </summary>
+        internal static string TagHelper_CouldNotFindMatchingEndBrace
+        {
+            get => GetString("TagHelper_CouldNotFindMatchingEndBrace");
+        }
+
+        /// <summary>
+        /// Could not find matching ']' for required attribute '{0}'.
+        /// </summary>
+        internal static string FormatTagHelper_CouldNotFindMatchingEndBrace(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_CouldNotFindMatchingEndBrace"), p0);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null unless property type implements '{4}'.
+        /// </summary>
+        internal static string TagHelper_InvalidAttributePrefixNotNull
+        {
+            get => GetString("TagHelper_InvalidAttributePrefixNotNull");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null unless property type implements '{4}'.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidAttributePrefixNotNull(object p0, object p1, object p2, object p3, object p4)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidAttributePrefixNotNull"), p0, p1, p2, p3, p4);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null or empty if property has no public setter.
+        /// </summary>
+        internal static string TagHelper_InvalidAttributeNameNotNullOrEmpty
+        {
+            get => GetString("TagHelper_InvalidAttributeNameNotNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null or empty if property has no public setter.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidAttributeNameNotNullOrEmpty(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidAttributeNameNotNullOrEmpty"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must not be null if property has no public setter and its type implements '{4}'.
+        /// </summary>
+        internal static string TagHelper_InvalidAttributePrefixNull
+        {
+            get => GetString("TagHelper_InvalidAttributePrefixNull");
+        }
+
+        /// <summary>
+        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must not be null if property has no public setter and its type implements '{4}'.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidAttributePrefixNull(object p0, object p1, object p2, object p3, object p4)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidAttributePrefixNull"), p0, p1, p2, p3, p4);
+
+        /// <summary>
+        /// Invalid required attribute character '{0}' in required attribute '{1}'. Separate required attributes with commas.
+        /// </summary>
+        internal static string TagHelper_InvalidRequiredAttributeCharacter
+        {
+            get => GetString("TagHelper_InvalidRequiredAttributeCharacter");
+        }
+
+        /// <summary>
+        /// Invalid required attribute character '{0}' in required attribute '{1}'. Separate required attributes with commas.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidRequiredAttributeCharacter(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRequiredAttributeCharacter"), p0, p1);
+
+        /// <summary>
+        /// Required attribute '{0}' has mismatched quotes '{1}' around value.
+        /// </summary>
+        internal static string TagHelper_InvalidRequiredAttributeMismatchedQuotes
+        {
+            get => GetString("TagHelper_InvalidRequiredAttributeMismatchedQuotes");
+        }
+
+        /// <summary>
+        /// Required attribute '{0}' has mismatched quotes '{1}' around value.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidRequiredAttributeMismatchedQuotes(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRequiredAttributeMismatchedQuotes"), p0, p1);
+
+        /// <summary>
+        /// Invalid character '{0}' in required attribute '{1}'. Expected supported CSS operator or ']'.
+        /// </summary>
+        internal static string TagHelper_InvalidRequiredAttributeOperator
+        {
+            get => GetString("TagHelper_InvalidRequiredAttributeOperator");
+        }
+
+        /// <summary>
+        /// Invalid character '{0}' in required attribute '{1}'. Expected supported CSS operator or ']'.
+        /// </summary>
+        internal static string FormatTagHelper_InvalidRequiredAttributeOperator(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRequiredAttributeOperator"), p0, p1);
+
+        /// <summary>
+        /// Required attribute '{0}' has a partial CSS operator. '{1}' must be followed by an equals.
+        /// </summary>
+        internal static string TagHelper_PartialRequiredAttributeOperator
+        {
+            get => GetString("TagHelper_PartialRequiredAttributeOperator");
+        }
+
+        /// <summary>
+        /// Required attribute '{0}' has a partial CSS operator. '{1}' must be followed by an equals.
+        /// </summary>
+        internal static string FormatTagHelper_PartialRequiredAttributeOperator(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_PartialRequiredAttributeOperator"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorDiagnosticFactory.cs
new file mode 100644
index 0000000000..55705b5eac
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorDiagnosticFactory.cs
@@ -0,0 +1,175 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class RazorDiagnosticFactory
+    {
+        private const string DiagnosticPrefix = "RZ";
+
+        // Razor.Language starts at 0, 1000, 2000, 3000. Therefore, we should offset by 500 to ensure we can easily
+        // maintain this list of diagnostic descriptors in conjunction with the one in Razor.Language.
+         
+        #region General Errors
+
+        // General Errors ID Offset = 500
+
+        #endregion
+
+        #region Language Errors
+
+        // Language Errors ID Offset = 1500
+
+        #endregion
+
+        #region Semantic Errors
+
+        // Semantic Errors ID Offset = 2500
+
+        #endregion
+
+        #region TagHelper Errors
+
+        // TagHelper Errors ID Offset = 3500
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidAttributeNameNullOrEmpty =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3500",
+                () => Resources.TagHelper_InvalidAttributeNameNotNullOrEmpty,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidAttributeNameNullOrEmpty(string tagHelperDisplayName, string propertyDisplayName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidAttributeNameNullOrEmpty,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                TagHelperTypes.HtmlAttributeNameAttribute,
+                TagHelperTypes.HtmlAttributeName.Name);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidAttributePrefixNotNull =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3501",
+                () => Resources.TagHelper_InvalidAttributePrefixNotNull,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidAttributePrefixNotNull(string tagHelperDisplayName, string propertyDisplayName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidAttributePrefixNotNull,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                TagHelperTypes.HtmlAttributeNameAttribute,
+                TagHelperTypes.HtmlAttributeName.DictionaryAttributePrefix,
+                "IDictionary<string, TValue>");
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidAttributePrefixNull =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3502",
+                () => Resources.TagHelper_InvalidAttributePrefixNull,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidAttributePrefixNull(string tagHelperDisplayName, string propertyDisplayName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidAttributePrefixNull,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                TagHelperTypes.HtmlAttributeNameAttribute,
+                TagHelperTypes.HtmlAttributeName.DictionaryAttributePrefix,
+                "IDictionary<string, TValue>");
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidRequiredAttributeCharacter =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3503",
+                () => Resources.TagHelper_InvalidRequiredAttributeCharacter,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidRequiredAttributeCharacter(char invalidCharacter, string requiredAttributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidRequiredAttributeCharacter,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                invalidCharacter,
+                requiredAttributes);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_PartialRequiredAttributeOperator =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3504",
+                () => Resources.TagHelper_PartialRequiredAttributeOperator,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_PartialRequiredAttributeOperator(char partialOperator, string requiredAttributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_PartialRequiredAttributeOperator,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                requiredAttributes,
+                partialOperator);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidRequiredAttributeOperator =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3505",
+                () => Resources.TagHelper_InvalidRequiredAttributeOperator,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidRequiredAttributeOperator(char invalidOperator, string requiredAttributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidRequiredAttributeOperator,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                invalidOperator,
+                requiredAttributes);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidRequiredAttributeMismatchedQuotes =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3506",
+                () => Resources.TagHelper_InvalidRequiredAttributeMismatchedQuotes,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidRequiredAttributeMismatchedQuotes(char quote, string requiredAttributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidRequiredAttributeMismatchedQuotes,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                requiredAttributes,
+                quote);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_CouldNotFindMatchingEndBrace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3507",
+                () => Resources.TagHelper_CouldNotFindMatchingEndBrace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_CouldNotFindMatchingEndBrace(string requiredAttributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_CouldNotFindMatchingEndBrace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                requiredAttributes);
+
+            return diagnostic;
+        }
+
+
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorLanguage.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorLanguage.cs
new file mode 100644
index 0000000000..cd0bbb148e
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorLanguage.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public static class RazorLanguage
+    {
+        public const string Name = "Razor";
+
+        public const string ContentType = "RazorCSharp";
+
+        public const string CoreContentType = "RazorCoreCSharp";
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RequiredAttributeParser.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RequiredAttributeParser.cs
new file mode 100644
index 0000000000..898e065439
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RequiredAttributeParser.cs
@@ -0,0 +1,304 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    // Internal for testing
+    internal static class RequiredAttributeParser
+    {
+        public static void AddRequiredAttributes(string requiredAttributes, TagMatchingRuleDescriptorBuilder ruleBuilder)
+        {
+            var requiredAttributeParser = new DefaultRequiredAttributeParser(requiredAttributes);
+            requiredAttributeParser.AddRequiredAttributes(ruleBuilder);
+        }
+
+        private class DefaultRequiredAttributeParser
+        {
+            private const char RequiredAttributeWildcardSuffix = '*';
+
+            private static readonly IReadOnlyDictionary<char, RequiredAttributeDescriptor.ValueComparisonMode> CssValueComparisons =
+                new Dictionary<char, RequiredAttributeDescriptor.ValueComparisonMode>
+                {
+                        { '=', RequiredAttributeDescriptor.ValueComparisonMode.FullMatch },
+                        { '^', RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch },
+                        { '$', RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch }
+                };
+            private static readonly char[] InvalidPlainAttributeNameCharacters = { ' ', '\t', ',', RequiredAttributeWildcardSuffix };
+            private static readonly char[] InvalidCssAttributeNameCharacters = (new[] { ' ', '\t', ',', ']' })
+                .Concat(CssValueComparisons.Keys)
+                .ToArray();
+            private static readonly char[] InvalidCssQuotelessValueCharacters = { ' ', '\t', ']' };
+
+            private int _index;
+            private string _requiredAttributes;
+
+            public DefaultRequiredAttributeParser(string requiredAttributes)
+            {
+                _requiredAttributes = requiredAttributes;
+            }
+
+            private char Current => _requiredAttributes[_index];
+
+            private bool AtEnd => _index >= _requiredAttributes.Length;
+
+            public void AddRequiredAttributes(TagMatchingRuleDescriptorBuilder ruleBuilder)
+            {
+                if (string.IsNullOrEmpty(_requiredAttributes))
+                {
+                    return;
+                }
+                var descriptors = new List<RequiredAttributeDescriptor>();
+
+                PassOptionalWhitespace();
+
+                do
+                {
+                    var successfulParse = true;
+                    ruleBuilder.Attribute(attributeBuilder =>
+                    {
+                        if (At('['))
+                        {
+                            if (!TryParseCssSelector(attributeBuilder))
+                            {
+                                successfulParse = false;
+                                return;
+                            }
+                        }
+                        else
+                        {
+                            ParsePlainSelector(attributeBuilder);
+                        }
+
+                        PassOptionalWhitespace();
+
+                        if (At(','))
+                        {
+                            _index++;
+
+                            if (!EnsureNotAtEnd(attributeBuilder))
+                            {
+                                successfulParse = false;
+                                return;
+                            }
+                        }
+                        else if (!AtEnd)
+                        {
+                            var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter(Current, _requiredAttributes);
+                            attributeBuilder.Diagnostics.Add(diagnostic);
+                            successfulParse = false;
+                            return;
+                        }
+
+                        PassOptionalWhitespace();
+                    });
+
+                    if (!successfulParse)
+                    {
+                        break;
+                    }
+                }
+                while (!AtEnd);
+            }
+
+            private void ParsePlainSelector(RequiredAttributeDescriptorBuilder attributeBuilder)
+            {
+                var nameEndIndex = _requiredAttributes.IndexOfAny(InvalidPlainAttributeNameCharacters, _index);
+                string attributeName;
+
+                var nameComparison = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                if (nameEndIndex == -1)
+                {
+                    attributeName = _requiredAttributes.Substring(_index);
+                    _index = _requiredAttributes.Length;
+                }
+                else
+                {
+                    attributeName = _requiredAttributes.Substring(_index, nameEndIndex - _index);
+                    _index = nameEndIndex;
+
+                    if (_requiredAttributes[nameEndIndex] == RequiredAttributeWildcardSuffix)
+                    {
+                        nameComparison = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+
+                        // Move past wild card
+                        _index++;
+                    }
+                }
+
+                attributeBuilder.Name = attributeName;
+                attributeBuilder.NameComparisonMode = nameComparison;
+            }
+
+            private void ParseCssAttributeName(RequiredAttributeDescriptorBuilder builder)
+            {
+                var nameStartIndex = _index;
+                var nameEndIndex = _requiredAttributes.IndexOfAny(InvalidCssAttributeNameCharacters, _index);
+                nameEndIndex = nameEndIndex == -1 ? _requiredAttributes.Length : nameEndIndex;
+                _index = nameEndIndex;
+
+                var attributeName = _requiredAttributes.Substring(nameStartIndex, nameEndIndex - nameStartIndex);
+
+                builder.Name = attributeName;
+            }
+
+            private bool TryParseCssValueComparison(RequiredAttributeDescriptorBuilder builder, out RequiredAttributeDescriptor.ValueComparisonMode valueComparison)
+            {
+                Debug.Assert(!AtEnd);
+
+                if (CssValueComparisons.TryGetValue(Current, out valueComparison))
+                {
+                    var op = Current;
+                    _index++;
+
+                    if (op != '=' && At('='))
+                    {
+                        // Two length operator (ex: ^=). Move past the second piece
+                        _index++;
+                    }
+                    else if (op != '=') // We're at an incomplete operator (ex: [foo^]
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_PartialRequiredAttributeOperator(op, _requiredAttributes);
+                        builder.Diagnostics.Add(diagnostic);
+
+                        return false;
+                    }
+                }
+                else if (!At(']'))
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeOperator(Current, _requiredAttributes);
+                    builder.Diagnostics.Add(diagnostic);
+
+                    return false;
+                }
+
+                builder.ValueComparisonMode = valueComparison;
+
+                return true;
+            }
+
+            private bool TryParseCssValue(RequiredAttributeDescriptorBuilder builder)
+            {
+                int valueStart;
+                int valueEnd;
+                if (At('\'') || At('"'))
+                {
+                    var quote = Current;
+
+                    // Move past the quote
+                    _index++;
+
+                    valueStart = _index;
+                    valueEnd = _requiredAttributes.IndexOf(quote, _index);
+                    if (valueEnd == -1)
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeMismatchedQuotes(quote, _requiredAttributes);
+                        builder.Diagnostics.Add(diagnostic);
+
+                        return false;
+                    }
+                    _index = valueEnd + 1;
+                }
+                else
+                {
+                    valueStart = _index;
+                    var valueEndIndex = _requiredAttributes.IndexOfAny(InvalidCssQuotelessValueCharacters, _index);
+                    valueEnd = valueEndIndex == -1 ? _requiredAttributes.Length : valueEndIndex;
+                    _index = valueEnd;
+                }
+
+                var value = _requiredAttributes.Substring(valueStart, valueEnd - valueStart);
+
+                builder.Value = value;
+
+                return true;
+            }
+
+            private bool TryParseCssSelector(RequiredAttributeDescriptorBuilder attributeBuilder)
+            {
+                Debug.Assert(At('['));
+
+                // Move past '['.
+                _index++;
+                PassOptionalWhitespace();
+
+                ParseCssAttributeName(attributeBuilder);
+
+                PassOptionalWhitespace();
+
+                if (!EnsureNotAtEnd(attributeBuilder))
+                {
+                    return false;
+                }
+
+                if (!TryParseCssValueComparison(attributeBuilder, out RequiredAttributeDescriptor.ValueComparisonMode valueComparison))
+                {
+                    return false;
+                }
+
+                PassOptionalWhitespace();
+
+                if (!EnsureNotAtEnd(attributeBuilder))
+                {
+                    return false;
+                }
+
+                if (valueComparison != RequiredAttributeDescriptor.ValueComparisonMode.None && !TryParseCssValue(attributeBuilder))
+                {
+                    return false;
+                }
+
+                PassOptionalWhitespace();
+
+                if (At(']'))
+                {
+                    // Move past the ending bracket.
+                    _index++;
+                    return true;
+                }
+                else if (AtEnd)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace(_requiredAttributes);
+                    attributeBuilder.Diagnostics.Add(diagnostic);
+                }
+                else
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter(Current, _requiredAttributes);
+                    attributeBuilder.Diagnostics.Add(diagnostic);
+                }
+
+                return false;
+            }
+
+            private bool EnsureNotAtEnd(RequiredAttributeDescriptorBuilder builder)
+            {
+                if (AtEnd)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace(_requiredAttributes);
+                    builder.Diagnostics.Add(diagnostic);
+
+                    return false;
+                }
+
+                return true;
+            }
+
+            private bool At(char c)
+            {
+                return !AtEnd && Current == c;
+            }
+
+            private void PassOptionalWhitespace()
+            {
+                while (!AtEnd && (Current == ' ' || Current == '\t'))
+                {
+                    _index++;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx
new file mode 100644
index 0000000000..fd92b354d9
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="TagHelper_CouldNotFindMatchingEndBrace" xml:space="preserve">
+    <value>Could not find matching ']' for required attribute '{0}'.</value>
+  </data>
+  <data name="TagHelper_InvalidAttributePrefixNotNull" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null unless property type implements '{4}'.</value>
+  </data>
+  <data name="TagHelper_InvalidAttributeNameNotNullOrEmpty" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null or empty if property has no public setter.</value>
+  </data>
+  <data name="TagHelper_InvalidAttributePrefixNull" xml:space="preserve">
+    <value>Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must not be null if property has no public setter and its type implements '{4}'.</value>
+  </data>
+  <data name="TagHelper_InvalidRequiredAttributeCharacter" xml:space="preserve">
+    <value>Invalid required attribute character '{0}' in required attribute '{1}'. Separate required attributes with commas.</value>
+  </data>
+  <data name="TagHelper_InvalidRequiredAttributeMismatchedQuotes" xml:space="preserve">
+    <value>Required attribute '{0}' has mismatched quotes '{1}' around value.</value>
+  </data>
+  <data name="TagHelper_InvalidRequiredAttributeOperator" xml:space="preserve">
+    <value>Invalid character '{0}' in required attribute '{1}'. Expected supported CSS operator or ']'.</value>
+  </data>
+  <data name="TagHelper_PartialRequiredAttributeOperator" xml:space="preserve">
+    <value>Required attribute '{0}' has a partial CSS operator. '{1}' must be followed by an equals.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/SourceSpanExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SourceSpanExtensions.cs
new file mode 100644
index 0000000000..51fd517024
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SourceSpanExtensions.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class SourceSpanExtensions
+    {
+        public static TextSpan AsTextSpan(this SourceSpan sourceSpan)
+        {
+            return new TextSpan(sourceSpan.AbsoluteIndex, sourceSpan.Length);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperDescriptorProviderContextExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperDescriptorProviderContextExtensions.cs
new file mode 100644
index 0000000000..fda4aece22
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperDescriptorProviderContextExtensions.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public static class TagHelperDescriptorProviderContextExtensions
+    {
+        public static Compilation GetCompilation(this TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return (Compilation)context.Items[typeof(Compilation)];
+        }
+
+        public static void SetCompilation(this TagHelperDescriptorProviderContext context, Compilation compilation)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            context.Items[typeof(Compilation)] = compilation;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypeVisitor.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypeVisitor.cs
new file mode 100644
index 0000000000..3387cfd1e8
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypeVisitor.cs
@@ -0,0 +1,51 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    // Visits top-level types and finds interface implementations.
+    internal class TagHelperTypeVisitor : SymbolVisitor
+    {
+        private INamedTypeSymbol _interface;
+        private List<INamedTypeSymbol> _results;
+
+        public TagHelperTypeVisitor(INamedTypeSymbol @interface, List<INamedTypeSymbol> results)
+        {
+            _interface = @interface;
+            _results = results;
+        }
+
+        public override void VisitNamedType(INamedTypeSymbol symbol)
+        {
+            if (IsTagHelper(symbol))
+            {
+                _results.Add(symbol);
+            }
+        }
+
+        public override void VisitNamespace(INamespaceSymbol symbol)
+        {
+            foreach (var member in symbol.GetMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        internal bool IsTagHelper(INamedTypeSymbol symbol)
+        {
+            if (_interface == null)
+            {
+                return false;
+            }
+
+            return
+                symbol.TypeKind != TypeKind.Error &&
+                symbol.DeclaredAccessibility == Accessibility.Public &&
+                !symbol.IsAbstract &&
+                !symbol.IsGenericType &&
+                symbol.AllInterfaces.Contains(_interface);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypes.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypes.cs
new file mode 100644
index 0000000000..c0989576c7
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTypes.cs
@@ -0,0 +1,39 @@
+// 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.
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class TagHelperTypes
+    {
+        public const string ITagHelper = "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper";
+
+        public const string IComponent = "Microsoft.AspNetCore.Components.IComponent";
+
+        public const string IDictionary = "System.Collections.Generic.IDictionary`2";
+
+        public const string HtmlAttributeNameAttribute = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute";
+
+        public const string HtmlAttributeNotBoundAttribute = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute";
+
+        public const string HtmlTargetElementAttribute = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute";
+
+        public const string OutputElementHintAttribute = "Microsoft.AspNetCore.Razor.TagHelpers.OutputElementHintAttribute";
+
+        public const string RestrictChildrenAttribute = "Microsoft.AspNetCore.Razor.TagHelpers.RestrictChildrenAttribute";
+
+        public static class HtmlAttributeName
+        {
+            public const string Name = "Name";
+            public const string DictionaryAttributePrefix = "DictionaryAttributePrefix";
+        }
+
+        public static class HtmlTargetElement
+        {
+            public const string Attributes = "Attributes";
+
+            public const string ParentTag = "ParentTag";
+
+            public const string TagStructure = "TagStructure";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs
new file mode 100644
index 0000000000..95fd6ba899
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class TextChangeExtensions
+    {
+        public static SourceChange AsSourceChange(this TextChange textChange)
+        {
+            if (textChange == null)
+            {
+                throw new ArgumentNullException(nameof(textChange));
+            }
+
+            return new SourceChange(textChange.Span.AsSourceSpan(), textChange.NewText);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextSpanExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextSpanExtensions.cs
new file mode 100644
index 0000000000..32e43de450
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextSpanExtensions.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class TextSpanExtensions
+    {
+        public static SourceSpan AsSourceSpan(this TextSpan textSpan)
+        {
+            return new SourceSpan(filePath: null, absoluteIndex: textSpan.Start, lineIndex: -1, characterIndex: -1, length: textSpan.Length);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netcore.json b/src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netcore.json
new file mode 100644
index 0000000000..f1d4169fe5
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netcore.json
@@ -0,0 +1,360 @@
+{
+  "AssemblyIdentity": "Microsoft.CodeAnalysis.Razor, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.CompilationTagHelperFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetDescriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.DefaultMetadataReferenceFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.CodeAnalysis.Razor.IMetadataReferenceFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_References",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.CodeAnalysis.Razor.IMetadataReferenceFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_References",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.DefaultTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DesignTime",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.IMetadataReferenceFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_References",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.RazorLanguage",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Razor\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"RazorCSharp\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "CoreContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"RazorCoreCSharp\""
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.TagHelperDescriptorProviderContextExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetCompilation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.CodeAnalysis.Compilation",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCompilation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            },
+            {
+              "Name": "compilation",
+              "Type": "Microsoft.CodeAnalysis.Compilation"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.TagHelperTypes+HtmlAttributeName",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "DictionaryAttributePrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"DictionaryAttributePrefix\""
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.TagHelperTypes+HtmlTargetElement",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Attributes",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Attributes\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "ParentTag",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"ParentTag\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "TagStructure",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"TagStructure\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netframework.json b/src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netframework.json
new file mode 100644
index 0000000000..ceae4b237f
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/baseline.netframework.json
@@ -0,0 +1,349 @@
+{
+  "AssemblyIdentity": "Microsoft.CodeAnalysis.Razor, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.CompilationTagHelperFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetDescriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnInitialized",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.DefaultMetadataReferenceFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.CodeAnalysis.Razor.IMetadataReferenceFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_References",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.CodeAnalysis.Razor.IMetadataReferenceFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_References",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.DefaultTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DesignTime",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DesignTime",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.IMetadataReferenceFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorEngineFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_References",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.RazorLanguage",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Razor\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"RazorCSharp\""
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.TagHelperDescriptorProviderContextExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetCompilation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.CodeAnalysis.Compilation",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCompilation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            },
+            {
+              "Name": "compilation",
+              "Type": "Microsoft.CodeAnalysis.Compilation"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.TagHelperTypes+HtmlAttributeName",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "DictionaryAttributePrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"DictionaryAttributePrefix\""
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.CodeAnalysis.Razor.TagHelperTypes+HtmlTargetElement",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Attributes",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Attributes\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "ParentTag",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"ParentTag\""
+        },
+        {
+          "Kind": "Field",
+          "Name": "TagStructure",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"TagStructure\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs
new file mode 100644
index 0000000000..53aeb98031
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs
@@ -0,0 +1,131 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.CodeAnalysis.CSharp;
+using Moq;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class CompilationTagHelperFeatureTest
+    {
+        [Fact]
+        public void IsValidCompilation_ReturnsTrueIfTagHelperInterfaceCannotBeFound()
+        {
+            // Arrange
+            var references = new[]
+            {
+                MetadataReference.CreateFromFile(typeof(string).Assembly.Location),
+            };
+            var compilation = CSharpCompilation.Create("Test", references: references);
+
+            // Act 
+            var result = CompilationTagHelperFeature.IsValidCompilation(compilation);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsValidCompilation_ReturnsFalseIfSystemStringCannotBeFound()
+        {
+            // Arrange
+            var references = new[]
+            {
+                MetadataReference.CreateFromFile(typeof(ITagHelper).Assembly.Location),
+            };
+            var compilation = CSharpCompilation.Create("Test", references: references);
+
+            // Act 
+            var result = CompilationTagHelperFeature.IsValidCompilation(compilation);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsValidCompilation_ReturnsTrueIfWellKnownTypesAreFound()
+        {
+            // Arrange
+            var references = new[]
+            {
+                MetadataReference.CreateFromFile(typeof(string).Assembly.Location),
+                MetadataReference.CreateFromFile(typeof(ITagHelper).Assembly.Location),
+            };
+            var compilation = CSharpCompilation.Create("Test", references: references);
+
+            // Act 
+            var result = CompilationTagHelperFeature.IsValidCompilation(compilation);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void GetDescriptors_DoesNotSetCompilation_IfCompilationIsInvalid()
+        {
+            // Arrange
+            Compilation compilation = null;
+            var provider = new Mock<ITagHelperDescriptorProvider>();
+            provider.Setup(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()))
+                .Callback<TagHelperDescriptorProviderContext>(c => compilation = c.GetCompilation())
+                .Verifiable();
+
+            var engine = RazorProjectEngine.Create(
+                configure =>
+                {
+                    configure.Features.Add(new DefaultMetadataReferenceFeature());
+                    configure.Features.Add(provider.Object);
+                    configure.Features.Add(new CompilationTagHelperFeature());
+                });
+
+            var feature = engine.EngineFeatures.OfType<CompilationTagHelperFeature>().First();
+
+            // Act 
+            var result = feature.GetDescriptors();
+
+            // Assert
+            Assert.Empty(result);
+            provider.Verify();
+            Assert.Null(compilation);
+        }
+
+        [Fact]
+        public void GetDescriptors_SetsCompilation_IfCompilationIsValid()
+        {
+            // Arrange
+            Compilation compilation = null;
+            var provider = new Mock<ITagHelperDescriptorProvider>();
+            provider.Setup(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()))
+                .Callback<TagHelperDescriptorProviderContext>(c => compilation = c.GetCompilation())
+                .Verifiable();
+
+            var references = new[]
+            {
+                MetadataReference.CreateFromFile(typeof(string).Assembly.Location),
+                MetadataReference.CreateFromFile(typeof(ITagHelper).Assembly.Location),
+            };
+
+            var engine = RazorProjectEngine.Create(
+                configure =>
+                {
+                    configure.Features.Add(new DefaultMetadataReferenceFeature { References = references });
+                    configure.Features.Add(provider.Object);
+                    configure.Features.Add(new CompilationTagHelperFeature());
+                });
+
+            var feature = engine.EngineFeatures.OfType<CompilationTagHelperFeature>().First();
+            
+            // Act 
+            var result = feature.GetDescriptors();
+
+            // Assert
+            Assert.Empty(result);
+            provider.Verify();
+            Assert.NotNull(compilation);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs
new file mode 100644
index 0000000000..64f092cdb3
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs
@@ -0,0 +1,2382 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor.Workspaces.Test;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor.Workspaces
+{
+    public class DefaultTagHelperDescriptorFactoryTest
+    {
+        private static readonly Assembly _assembly = typeof(DefaultTagHelperDescriptorFactoryTest).GetTypeInfo().Assembly;
+
+        protected static readonly AssemblyName TagHelperDescriptorFactoryTestAssembly = _assembly.GetName();
+
+        protected static readonly string AssemblyName = TagHelperDescriptorFactoryTestAssembly.Name;
+
+        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+
+        public static TheoryData RequiredAttributeParserErrorData
+        {
+            get
+            {
+                return new TheoryData<string, Action<RequiredAttributeDescriptorBuilder>[]>
+                {
+                    {
+                        "name,",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("name,")),
+                        }
+                    },
+                    {
+                        " ",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name(string.Empty)
+                                .AddDiagnostic(AspNetCore.Razor.Language.RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeNameNullOrWhitespace()),
+                        }
+                    },
+                    {
+                        "n@me",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("n@me")
+                                .AddDiagnostic(AspNetCore.Razor.Language.RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeName("n@me", '@')),
+                        }
+                    },
+                    {
+                        "name extra",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter('e', "name extra")),
+                        }
+                    },
+                    {
+                        "[[ ",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("[")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("[[ ")),
+                        }
+                    },
+                    {
+                        "[ ",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("[ ")),
+                        }
+                    },
+                    {
+                        "[name='unended]",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch)
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeMismatchedQuotes('\'', "[name='unended]")),
+                        }
+                    },
+                    {
+                        "[name='unended",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch)
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeMismatchedQuotes('\'', "[name='unended")),
+                        }
+                    },
+                    {
+                        "[name",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("[name")),
+                        }
+                    },
+                    {
+                        "[ ]",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name(string.Empty)
+                                .AddDiagnostic(AspNetCore.Razor.Language.RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeNameNullOrWhitespace()),
+                        }
+                    },
+                    {
+                        "[n@me]",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("n@me")
+                                .AddDiagnostic(AspNetCore.Razor.Language.RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeName("n@me", '@')),
+                        }
+                    },
+                    {
+                        "[name@]",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name@")
+                                .AddDiagnostic(AspNetCore.Razor.Language.RazorDiagnosticFactory.CreateTagHelper_InvalidTargetedAttributeName("name@", '@')),
+                        }
+                    },
+                    {
+                        "[name^]",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_PartialRequiredAttributeOperator('^', "[name^]")),
+                        }
+                    },
+                    {
+                        "[name='value'",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .Value("value")
+                                .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch)
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("[name='value'")),
+                        }
+                    },
+                    {
+                        "[name ",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("[name ")),
+                        }
+                    },
+                    {
+                        "[name extra]",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeOperator('e', "[name extra]")),
+                        }
+                    },
+                    {
+                        "[name=value ",
+                        new Action<RequiredAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("name")
+                                .Value("value")
+                                .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch)
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace("[name=value ")),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RequiredAttributeParserErrorData))]
+        public void RequiredAttributeParser_ParsesRequiredAttributesAndLogsDiagnosticsCorrectly(
+            string requiredAttributes,
+            IEnumerable<Action<RequiredAttributeDescriptorBuilder>> configureBuilders)
+        {
+            // Arrange
+            var ruleBuilder = new DefaultTagMatchingRuleDescriptorBuilder();
+
+            var expectedRules = new List<RequiredAttributeDescriptor>();
+            foreach (var configureBuilder in configureBuilders)
+            {
+                var builder = new DefaultRequiredAttributeDescriptorBuilder();
+                configureBuilder(builder);
+
+                expectedRules.Add(builder.Build());
+            }
+
+            // Act
+            RequiredAttributeParser.AddRequiredAttributes(requiredAttributes, ruleBuilder);
+
+            // Assert
+            var descriptors = ruleBuilder.Build().Attributes;
+            Assert.Equal(expectedRules, descriptors, RequiredAttributeDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData RequiredAttributeParserData
+        {
+            get
+            {
+                Func<string, RequiredAttributeDescriptor.NameComparisonMode, Action<RequiredAttributeDescriptorBuilder>> plain =
+                    (name, nameComparison) => (builder) => builder
+                        .Name(name)
+                        .NameComparisonMode(nameComparison);
+
+                Func<string, string, RequiredAttributeDescriptor.ValueComparisonMode, Action<RequiredAttributeDescriptorBuilder>> css =
+                    (name, value, valueComparison) => (builder) => builder
+                        .Name(name)
+                        .Value(value)
+                        .ValueComparisonMode(valueComparison);
+
+                return new TheoryData<string, IEnumerable<Action<RequiredAttributeDescriptorBuilder>>>
+                {
+                    { null, Enumerable.Empty<Action<RequiredAttributeDescriptorBuilder>>() },
+                    { string.Empty, Enumerable.Empty<Action<RequiredAttributeDescriptorBuilder>>() },
+                    { "name", new[] { plain("name", RequiredAttributeDescriptor.NameComparisonMode.FullMatch) } },
+                    { "name-*", new[] { plain("name-", RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch) } },
+                    { "  name-*   ", new[] { plain("name-", RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch) } },
+                    {
+                        "asp-route-*,valid  ,  name-*   ,extra",
+                        new[]
+                        {
+                            plain("asp-route-", RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                            plain("valid", RequiredAttributeDescriptor.NameComparisonMode.FullMatch),
+                            plain("name-", RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                            plain("extra", RequiredAttributeDescriptor.NameComparisonMode.FullMatch),
+                        }
+                    },
+                    { "[name]", new[] { css("name", null, RequiredAttributeDescriptor.ValueComparisonMode.None) } },
+                    { "[ name ]", new[] { css("name", null, RequiredAttributeDescriptor.ValueComparisonMode.None) } },
+                    { " [ name ] ", new[] { css("name", null, RequiredAttributeDescriptor.ValueComparisonMode.None) } },
+                    { "[name=]", new[] { css("name", "", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) } },
+                    { "[name='']", new[] { css("name", "", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) } },
+                    { "[name ^=]", new[] { css("name", "", RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch) } },
+                    { "[name=hello]", new[] { css("name", "hello", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) } },
+                    { "[name= hello]", new[] { css("name", "hello", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) } },
+                    { "[name='hello']", new[] { css("name", "hello", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) } },
+                    { "[name=\"hello\"]", new[] { css("name", "hello", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) } },
+                    { " [ name  $= \" hello\" ]  ", new[] { css("name", " hello", RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch) } },
+                    {
+                        "[name=\"hello\"],[other^=something ], [val = 'cool']",
+                        new[]
+                        {
+                            css("name", "hello", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch),
+                            css("other", "something", RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch),
+                            css("val", "cool", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch) }
+                    },
+                    {
+                        "asp-route-*,[name=\"hello\"],valid  ,[other^=something ],   name-*   ,[val = 'cool'],extra",
+                        new[]
+                        {
+                            plain("asp-route-", RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                            css("name", "hello", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch),
+                            plain("valid", RequiredAttributeDescriptor.NameComparisonMode.FullMatch),
+                            css("other", "something", RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch),
+                            plain("name-", RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                            css("val", "cool", RequiredAttributeDescriptor.ValueComparisonMode.FullMatch),
+                            plain("extra", RequiredAttributeDescriptor.NameComparisonMode.FullMatch),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RequiredAttributeParserData))]
+        public void RequiredAttributeParser_ParsesRequiredAttributesCorrectly(
+            string requiredAttributes,
+            IEnumerable<Action<RequiredAttributeDescriptorBuilder>> configureBuilders)
+        {
+            // Arrange
+            var ruleBuilder = new DefaultTagMatchingRuleDescriptorBuilder();
+
+            var expectedRules = new List<RequiredAttributeDescriptor>();
+            foreach (var configureBuilder in configureBuilders)
+            {
+                var builder = new DefaultRequiredAttributeDescriptorBuilder();
+                configureBuilder(builder);
+
+                expectedRules.Add(builder.Build());
+            }
+
+            // Act
+            RequiredAttributeParser.AddRequiredAttributes(requiredAttributes, ruleBuilder);
+
+            // Assert
+            var descriptors = ruleBuilder.Build().Attributes;
+            Assert.Equal(expectedRules, descriptors, RequiredAttributeDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData IsEnumData
+        {
+            get
+            {
+                // tagHelperType, expectedDescriptor
+                return new TheoryData<Type, TagHelperDescriptor>
+                {
+                    {
+                        typeof(EnumTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(EnumTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(EnumTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName("enum"))
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("non-enum-property")
+                                    .PropertyName(nameof(EnumTagHelper.NonEnumProperty))
+                                    .TypeName(typeof(int).FullName))
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("enum-property")
+                                    .PropertyName(nameof(EnumTagHelper.EnumProperty))
+                                    .TypeName(typeof(CustomEnum).FullName)
+                                    .AsEnum())
+                            .Build()
+                    },
+                    {
+                        typeof(MultiEnumTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(MultiEnumTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(MultiEnumTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName("p"))
+                            .TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName("input"))
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("non-enum-property")
+                                    .PropertyName(nameof(MultiEnumTagHelper.NonEnumProperty))
+                                    .TypeName(typeof(int).FullName))
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("enum-property")
+                                    .PropertyName(nameof(MultiEnumTagHelper.EnumProperty))
+                                    .TypeName(typeof(CustomEnum).FullName)
+                                    .AsEnum())
+                            .Build()
+                    },
+                    {
+                        typeof(NestedEnumTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(NestedEnumTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(NestedEnumTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName("nested-enum"))
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("non-enum-property")
+                                    .PropertyName(nameof(NestedEnumTagHelper.NonEnumProperty))
+                                    .TypeName(typeof(int).FullName))
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("enum-property")
+                                    .PropertyName(nameof(NestedEnumTagHelper.EnumProperty))
+                                    .TypeName(typeof(CustomEnum).FullName)
+                                    .AsEnum())
+                            .BoundAttributeDescriptor(builder =>
+                                builder
+                                    .Name("nested-enum-property")
+                                    .PropertyName(nameof(NestedEnumTagHelper.NestedEnumProperty))
+                                    .TypeName($"{typeof(NestedEnumTagHelper).FullName}.{nameof(NestedEnumTagHelper.NestedEnum)}")
+                                    .AsEnum())
+                            .Build()
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IsEnumData))]
+        public void CreateDescriptor_IsEnumIsSetCorrectly(
+            Type tagHelperType,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData RequiredParentData
+        {
+            get
+            {
+                // tagHelperType, expectedDescriptor
+                return new TheoryData<Type, TagHelperDescriptor>
+                {
+                    {
+                        typeof(RequiredParentTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(RequiredParentTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(RequiredParentTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("input").RequireParentTag("div"))
+                            .Build()
+                    },
+                    {
+                        typeof(MultiSpecifiedRequiredParentTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedRequiredParentTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(MultiSpecifiedRequiredParentTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("p").RequireParentTag("div"))
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("input").RequireParentTag("section"))
+                            .Build()
+                    },
+                    {
+                        typeof(MultiWithUnspecifiedRequiredParentTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedRequiredParentTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(MultiWithUnspecifiedRequiredParentTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("p"))
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("input").RequireParentTag("div"))
+                            .Build()
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RequiredParentData))]
+        public void CreateDescriptor_CreatesDesignTimeDescriptorsWithRequiredParent(
+            Type tagHelperType,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData RestrictChildrenData
+        {
+            get
+            {
+                // tagHelperType, expectedDescriptor
+                return new TheoryData<Type, TagHelperDescriptor>
+                {
+                    {
+                        typeof(RestrictChildrenTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(RestrictChildrenTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(RestrictChildrenTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("restrict-children"))
+                            .AllowChildTag("p")
+                            .Build()
+                    },
+                    {
+                        typeof(DoubleRestrictChildrenTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(DoubleRestrictChildrenTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(DoubleRestrictChildrenTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("double-restrict-children"))
+                            .AllowChildTag("p")
+                            .AllowChildTag("strong")
+                            .Build()
+                    },
+                    {
+                        typeof(MultiTargetRestrictChildrenTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(MultiTargetRestrictChildrenTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(MultiTargetRestrictChildrenTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("p"))
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("div"))
+                            .AllowChildTag("p")
+                            .AllowChildTag("strong")
+                            .Build()
+                    },
+                };
+            }
+        }
+
+
+        [Theory]
+        [MemberData(nameof(RestrictChildrenData))]
+        public void CreateDescriptor_CreatesDescriptorsWithAllowedChildren(
+            Type tagHelperType,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData TagStructureData
+        {
+            get
+            {
+                // tagHelperType, expectedDescriptor
+                return new TheoryData<Type, TagHelperDescriptor>
+                {
+                    {
+                        typeof(TagStructureTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(TagStructureTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(TagStructureTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder
+                                .RequireTagName("input")
+                                .RequireTagStructure(TagStructure.WithoutEndTag))
+                            .Build()
+                    },
+                    {
+                        typeof(MultiSpecifiedTagStructureTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedTagStructureTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(MultiSpecifiedTagStructureTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder
+                                .RequireTagName("p")
+                                .RequireTagStructure(TagStructure.NormalOrSelfClosing))
+                            .TagMatchingRuleDescriptor(builder => builder
+                                .RequireTagName("input")
+                                .RequireTagStructure(TagStructure.WithoutEndTag))
+                            .Build()
+                    },
+                    {
+                        typeof(MultiWithUnspecifiedTagStructureTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedTagStructureTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(MultiWithUnspecifiedTagStructureTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder
+                                .RequireTagName("p"))
+                            .TagMatchingRuleDescriptor(builder => builder
+                                .RequireTagName("input")
+                                .RequireTagStructure(TagStructure.WithoutEndTag))
+                            .Build()
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TagStructureData))]
+        public void CreateDescriptor_CreatesDesignTimeDescriptorsWithTagStructure(
+            Type tagHelperType,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData EditorBrowsableData
+        {
+            get
+            {
+                // tagHelperType, designTime, expectedDescriptor
+                return new TheoryData<Type, bool, TagHelperDescriptor>
+                {
+                    {
+                        typeof(InheritedEditorBrowsableTagHelper),
+                        true,
+                        CreateTagHelperDescriptor(
+                            tagName: "inherited-editor-browsable",
+                            typeName: typeof(InheritedEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(InheritedEditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    { typeof(EditorBrowsableTagHelper), true, null },
+                    {
+                        typeof(EditorBrowsableTagHelper),
+                        false,
+                        CreateTagHelperDescriptor(
+                            tagName: "editor-browsable",
+                            typeName: typeof(EditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(EditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    {
+                        typeof(HiddenPropertyEditorBrowsableTagHelper),
+                        true,
+                        CreateTagHelperDescriptor(
+                            tagName: "hidden-property-editor-browsable",
+                            typeName: typeof(HiddenPropertyEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName)
+                    },
+                    {
+                        typeof(HiddenPropertyEditorBrowsableTagHelper),
+                        false,
+                        CreateTagHelperDescriptor(
+                            tagName: "hidden-property-editor-browsable",
+                            typeName: typeof(HiddenPropertyEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(HiddenPropertyEditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    {
+                        typeof(OverriddenEditorBrowsableTagHelper),
+                        true,
+                        CreateTagHelperDescriptor(
+                            tagName: "overridden-editor-browsable",
+                            typeName: typeof(OverriddenEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(OverriddenEditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    {
+                        typeof(MultiPropertyEditorBrowsableTagHelper),
+                        true,
+                        CreateTagHelperDescriptor(
+                            tagName: "multi-property-editor-browsable",
+                            typeName: typeof(MultiPropertyEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property2")
+                                    .PropertyName(nameof(MultiPropertyEditorBrowsableTagHelper.Property2))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    {
+                        typeof(MultiPropertyEditorBrowsableTagHelper),
+                        false,
+                        CreateTagHelperDescriptor(
+                            tagName: "multi-property-editor-browsable",
+                            typeName: typeof(MultiPropertyEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(MultiPropertyEditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                                builder => builder
+                                    .Name("property2")
+                                    .PropertyName(nameof(MultiPropertyEditorBrowsableTagHelper.Property2))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    {
+                        typeof(OverriddenPropertyEditorBrowsableTagHelper),
+                        true,
+                        CreateTagHelperDescriptor(
+                            tagName: "overridden-property-editor-browsable",
+                            typeName: typeof(OverriddenPropertyEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName)
+                    },
+                    {
+                        typeof(OverriddenPropertyEditorBrowsableTagHelper),
+                        false,
+                        CreateTagHelperDescriptor(
+                            tagName: "overridden-property-editor-browsable",
+                            typeName: typeof(OverriddenPropertyEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property2")
+                                    .PropertyName(nameof(OverriddenPropertyEditorBrowsableTagHelper.Property2))
+                                    .TypeName(typeof(int).FullName),
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(OverriddenPropertyEditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    {
+                        typeof(DefaultEditorBrowsableTagHelper),
+                        true,
+                        CreateTagHelperDescriptor(
+                            tagName: "default-editor-browsable",
+                            typeName: typeof(DefaultEditorBrowsableTagHelper).FullName,
+                            assemblyName: AssemblyName,
+                            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .Name("property")
+                                    .PropertyName(nameof(DefaultEditorBrowsableTagHelper.Property))
+                                    .TypeName(typeof(int).FullName),
+                            })
+                    },
+                    { typeof(MultiEditorBrowsableTagHelper), true, null }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EditorBrowsableData))]
+        public void CreateDescriptor_UnderstandsEditorBrowsableAttribute(
+            Type tagHelperType,
+            bool designTime,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, designTime, designTime);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData AttributeTargetData
+        {
+            get
+            {
+                var attributes = Enumerable.Empty<BoundAttributeDescriptor>();
+
+                // tagHelperType, expectedDescriptor
+                return new TheoryData<Type, TagHelperDescriptor>
+                {
+                    {
+                        typeof(AttributeTargetingTagHelper),
+                        CreateTagHelperDescriptor(
+                            TagHelperMatchingConventions.ElementCatchAllName,
+                            typeof(AttributeTargetingTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                            })
+                    },
+                    {
+                        typeof(MultiAttributeTargetingTagHelper),
+                        CreateTagHelperDescriptor(
+                            TagHelperMatchingConventions.ElementCatchAllName,
+                            typeof(MultiAttributeTargetingTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder =>
+                                {
+                                    builder
+                                        .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                                        .RequireAttributeDescriptor(attribute => attribute.Name("style"));
+                                },
+                            })
+                    },
+                    {
+                        typeof(MultiAttributeAttributeTargetingTagHelper),
+                        CreateTagHelperDescriptor(
+                            TagHelperMatchingConventions.ElementCatchAllName,
+                            typeof(MultiAttributeAttributeTargetingTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("custom")),
+                                builder =>
+                                {
+                                    builder
+                                        .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                                        .RequireAttributeDescriptor(attribute => attribute.Name("style"));
+                                },
+                            })
+                    },
+                    {
+                        typeof(InheritedAttributeTargetingTagHelper),
+                        CreateTagHelperDescriptor(
+                            TagHelperMatchingConventions.ElementCatchAllName,
+                            typeof(InheritedAttributeTargetingTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("style")),
+                            })
+                    },
+                    {
+                        typeof(RequiredAttributeTagHelper),
+                        CreateTagHelperDescriptor(
+                            "input",
+                            typeof(RequiredAttributeTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                            })
+                    },
+                    {
+                        typeof(InheritedRequiredAttributeTagHelper),
+                        CreateTagHelperDescriptor(
+                            "div",
+                            typeof(InheritedRequiredAttributeTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                            })
+                    },
+                    {
+                        typeof(MultiAttributeRequiredAttributeTagHelper),
+                        CreateTagHelperDescriptor(
+                            "div",
+                            typeof(MultiAttributeRequiredAttributeTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .RequireTagName("div")
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                                builder => builder
+                                    .RequireTagName("input")
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                            })
+                    },
+                    {
+                        typeof(MultiAttributeSameTagRequiredAttributeTagHelper),
+                        CreateTagHelperDescriptor(
+                            "input",
+                            typeof(MultiAttributeSameTagRequiredAttributeTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("style")),
+                                builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                            })
+                    },
+                    {
+                        typeof(MultiRequiredAttributeTagHelper),
+                        CreateTagHelperDescriptor(
+                            "input",
+                            typeof(MultiRequiredAttributeTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("style")),
+                            })
+                    },
+                    {
+                        typeof(MultiTagMultiRequiredAttributeTagHelper),
+                        CreateTagHelperDescriptor(
+                            "div",
+                            typeof(MultiTagMultiRequiredAttributeTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .RequireTagName("div")
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("style")),
+                                builder => builder
+                                    .RequireTagName("input")
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                                    .RequireAttributeDescriptor(attribute => attribute.Name("style")),
+                            })
+                    },
+                    {
+                        typeof(AttributeWildcardTargetingTagHelper),
+                        CreateTagHelperDescriptor(
+                            TagHelperMatchingConventions.ElementCatchAllName,
+                            typeof(AttributeWildcardTargetingTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .RequireAttributeDescriptor(attribute => attribute
+                                        .Name("class")
+                                        .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)),
+                            })
+                    },
+                    {
+                        typeof(MultiAttributeWildcardTargetingTagHelper),
+                        CreateTagHelperDescriptor(
+                            TagHelperMatchingConventions.ElementCatchAllName,
+                            typeof(MultiAttributeWildcardTargetingTagHelper).FullName,
+                            AssemblyName,
+                            ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                            {
+                                builder => builder
+                                    .RequireAttributeDescriptor(attribute => attribute
+                                        .Name("class")
+                                        .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))
+                                    .RequireAttributeDescriptor(attribute => attribute
+                                        .Name("style")
+                                        .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)),
+                            })
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(AttributeTargetData))]
+        public void CreateDescriptor_ReturnsExpectedDescriptors(
+            Type tagHelperType,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData HtmlCaseData
+        {
+            get
+            {
+                // tagHelperType, expectedTagName, expectedAttributeName
+                return new TheoryData<Type, string, string>
+                {
+                    { typeof(SingleAttributeTagHelper), "single-attribute", "int-attribute" },
+                    { typeof(ALLCAPSTAGHELPER), "allcaps", "allcapsattribute" },
+                    { typeof(CAPSOnOUTSIDETagHelper), "caps-on-outside", "caps-on-outsideattribute" },
+                    { typeof(capsONInsideTagHelper), "caps-on-inside", "caps-on-insideattribute" },
+                    { typeof(One1Two2Three3TagHelper), "one1-two2-three3", "one1-two2-three3-attribute" },
+                    { typeof(ONE1TWO2THREE3TagHelper), "one1two2three3", "one1two2three3-attribute" },
+                    { typeof(First_Second_ThirdHiTagHelper), "first_second_third-hi", "first_second_third-attribute" },
+                    { typeof(UNSuffixedCLASS), "un-suffixed-class", "un-suffixed-attribute" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlCaseData))]
+        public void CreateDescriptor_HtmlCasesTagNameAndAttributeName(
+            Type tagHelperType,
+            string expectedTagName,
+            string expectedAttributeName)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            var rule = Assert.Single(descriptor.TagMatchingRules);
+            Assert.Equal(expectedTagName, rule.TagName, StringComparer.Ordinal);
+            var attributeDescriptor = Assert.Single(descriptor.BoundAttributes);
+            Assert.Equal(expectedAttributeName, attributeDescriptor.Name);
+        }
+
+        [Fact]
+        public void CreateDescriptor_OverridesAttributeNameFromAttribute()
+        {
+            // Arrange
+            var validProperty1 = typeof(OverriddenAttributeTagHelper).GetProperty(
+                nameof(OverriddenAttributeTagHelper.ValidAttribute1));
+            var validProperty2 = typeof(OverriddenAttributeTagHelper).GetProperty(
+                nameof(OverriddenAttributeTagHelper.ValidAttribute2));
+            var expectedDescriptor =
+                CreateTagHelperDescriptor(
+                    "overridden-attribute",
+                    typeof(OverriddenAttributeTagHelper).FullName,
+                    AssemblyName,
+                    new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("SomethingElse")
+                            .PropertyName(validProperty1.Name)
+                            .TypeName(validProperty1.PropertyType.FullName),
+                        builder => builder
+                            .Name("Something-Else")
+                            .PropertyName(validProperty2.Name)
+                            .TypeName(validProperty2.PropertyType.FullName),
+                    });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(OverriddenAttributeTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_DoesNotInheritOverridenAttributeName()
+        {
+            // Arrange
+            var validProperty1 = typeof(InheritedOverriddenAttributeTagHelper).GetProperty(
+                nameof(InheritedOverriddenAttributeTagHelper.ValidAttribute1));
+            var validProperty2 = typeof(InheritedOverriddenAttributeTagHelper).GetProperty(
+                nameof(InheritedOverriddenAttributeTagHelper.ValidAttribute2));
+            var expectedDescriptor =
+                CreateTagHelperDescriptor(
+                    "inherited-overridden-attribute",
+                    typeof(InheritedOverriddenAttributeTagHelper).FullName,
+                    AssemblyName,
+                    new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("valid-attribute1")
+                            .PropertyName(validProperty1.Name)
+                            .TypeName(validProperty1.PropertyType.FullName),
+                        builder => builder
+                            .Name("Something-Else")
+                            .PropertyName(validProperty2.Name)
+                            .TypeName(validProperty2.PropertyType.FullName),
+                    });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedOverriddenAttributeTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AllowsOverriddenAttributeNameOnUnimplementedVirtual()
+        {
+            // Arrange
+            var validProperty1 = typeof(InheritedNotOverriddenAttributeTagHelper).GetProperty(
+                nameof(InheritedNotOverriddenAttributeTagHelper.ValidAttribute1));
+            var validProperty2 = typeof(InheritedNotOverriddenAttributeTagHelper).GetProperty(
+                nameof(InheritedNotOverriddenAttributeTagHelper.ValidAttribute2));
+
+            var expectedDescriptor =  CreateTagHelperDescriptor(
+                    "inherited-not-overridden-attribute",
+                    typeof(InheritedNotOverriddenAttributeTagHelper).FullName,
+                    AssemblyName,
+                    new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("SomethingElse")
+                            .PropertyName(validProperty1.Name)
+                            .TypeName(validProperty1.PropertyType.FullName),
+                        builder => builder
+                            .Name("Something-Else")
+                            .PropertyName(validProperty2.Name)
+                            .TypeName(validProperty2.PropertyType.FullName),
+                    });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedNotOverriddenAttributeTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_BuildsDescriptorsWithInheritedProperties()
+        {
+            // Arrange
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                "inherited-single-attribute",
+                typeof(InheritedSingleAttributeTagHelper).FullName,
+                AssemblyName,
+                new Action<BoundAttributeDescriptorBuilder>[]
+                {
+                    builder => builder
+                        .Name("int-attribute")
+                        .PropertyName(nameof(InheritedSingleAttributeTagHelper.IntAttribute))
+                        .TypeName(typeof(int).FullName)
+                });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedSingleAttributeTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_BuildsDescriptorsWithConventionNames()
+        {
+            // Arrange
+            var intProperty = typeof(SingleAttributeTagHelper).GetProperty(nameof(SingleAttributeTagHelper.IntAttribute));
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                "single-attribute",
+                typeof(SingleAttributeTagHelper).FullName,
+                AssemblyName,
+                new Action<BoundAttributeDescriptorBuilder>[]
+                {
+                    builder => builder
+                        .Name("int-attribute")
+                        .PropertyName(intProperty.Name)
+                        .TypeName(intProperty.PropertyType.FullName)
+                });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(SingleAttributeTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_OnlyAcceptsPropertiesWithGetAndSet()
+        {
+            // Arrange
+            var validProperty = typeof(MissingAccessorTagHelper).GetProperty(
+                nameof(MissingAccessorTagHelper.ValidAttribute));
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                "missing-accessor",
+                typeof(MissingAccessorTagHelper).FullName,
+                AssemblyName,
+                new Action<BoundAttributeDescriptorBuilder>[]
+                {
+                    builder => builder
+                        .Name("valid-attribute")
+                        .PropertyName(validProperty.Name)
+                        .TypeName(validProperty.PropertyType.FullName)
+                });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(MissingAccessorTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_OnlyAcceptsPropertiesWithPublicGetAndSet()
+        {
+            // Arrange
+            var validProperty = typeof(NonPublicAccessorTagHelper).GetProperty(
+                nameof(NonPublicAccessorTagHelper.ValidAttribute));
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                "non-public-accessor",
+                typeof(NonPublicAccessorTagHelper).FullName,
+                AssemblyName,
+                new Action<BoundAttributeDescriptorBuilder>[]
+                {
+                    builder => builder
+                        .Name("valid-attribute")
+                        .PropertyName(validProperty.Name)
+                        .TypeName(validProperty.PropertyType.FullName)
+                });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(NonPublicAccessorTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_DoesNotIncludePropertiesWithNotBound()
+        {
+            // Arrange
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                "not-bound-attribute",
+                typeof(NotBoundAttributeTagHelper).FullName,
+                AssemblyName,
+                new Action<BoundAttributeDescriptorBuilder>[]
+                {
+                    builder => builder
+                        .Name("bound-property")
+                        .PropertyName(nameof(NotBoundAttributeTagHelper.BoundProperty))
+                        .TypeName(typeof(object).FullName)
+                });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(NotBoundAttributeTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ResolvesMultipleTagHelperDescriptorsFromSingleType()
+        {
+            // Arrange
+            var expectedDescriptor =
+                CreateTagHelperDescriptor(
+                    string.Empty,
+                    typeof(MultiTagTagHelper).FullName,
+                    AssemblyName,
+                    new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("valid-attribute")
+                            .PropertyName(nameof(MultiTagTagHelper.ValidAttribute))
+                            .TypeName(typeof(string).FullName),
+                    },
+                    new Action<TagMatchingRuleDescriptorBuilder>[]
+                    {
+                        builder => builder.RequireTagName("p"),
+                        builder => builder.RequireTagName("div"),
+                    });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(MultiTagTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_DoesNotResolveInheritedTagNames()
+        {
+            // Arrange
+            var validProp = typeof(InheritedMultiTagTagHelper).GetProperty(nameof(InheritedMultiTagTagHelper.ValidAttribute));
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                    "inherited-multi-tag",
+                    typeof(InheritedMultiTagTagHelper).FullName,
+                    AssemblyName,
+                    new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("valid-attribute")
+                            .PropertyName(validProp.Name)
+                            .TypeName(validProp.PropertyType.FullName),
+                    });
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedMultiTagTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_IgnoresDuplicateTagNamesFromAttribute()
+        {
+            // Arrange
+            var expectedDescriptor = CreateTagHelperDescriptor(
+                string.Empty,
+                typeof(DuplicateTagNameTagHelper).FullName,
+                AssemblyName,
+                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                {
+                    builder => builder.RequireTagName("p"),
+                    builder => builder.RequireTagName("div"),
+                });
+
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(DuplicateTagNameTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_OverridesTagNameFromAttribute()
+        {
+            // Arrange
+            var expectedDescriptor =
+                CreateTagHelperDescriptor(
+                    "data-condition",
+                    typeof(OverrideNameTagHelper).FullName,
+                    AssemblyName);
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(OverrideNameTagHelper).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        // name, expectedErrorMessages
+        public static TheoryData<string, string[]> InvalidNameData
+        {
+            get
+            {
+                Func<string, string, string> onNameError =
+                    (invalidText, invalidCharacter) => $"Tag helpers cannot target tag name '{invalidText}' because it contains a '{invalidCharacter}' character.";
+                var whitespaceErrorString = "Targeted tag name cannot be null or whitespace.";
+
+                var data = GetInvalidNameOrPrefixData(onNameError, whitespaceErrorString, onDataError: null);
+                data.Add(string.Empty, new[] { whitespaceErrorString });
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidNameData))]
+        public void CreateDescriptor_CreatesErrorOnInvalidNames(
+            string name, string[] expectedErrorMessages)
+        {
+            // Arrange
+            name = name.Replace("\n", "\\n").Replace("\r", "\\r").Replace("\"", "\\\"");
+            var text = $@"
+        [{typeof(AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute).FullName}(""{name}"")]
+        public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+        {{
+        }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var attribute = tagHelperType.GetAttributes().Single();
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            var rule = Assert.Single(descriptor.TagMatchingRules);
+            var errorMessages = rule.GetAllDiagnostics().Select(diagnostic => diagnostic.GetMessage()).ToArray();
+            Assert.Equal(expectedErrorMessages.Length, errorMessages.Length);
+            for (var i = 0; i < expectedErrorMessages.Length; i++)
+            {
+                Assert.Equal(expectedErrorMessages[i], errorMessages[i], StringComparer.Ordinal);
+            }
+        }
+
+        public static TheoryData ValidNameData
+        {
+            get
+            {
+                // name, expectedNames
+                return new TheoryData<string, IEnumerable<string>>
+                {
+                    { "p", new[] { "p" } },
+                    { " p", new[] { "p" } },
+                    { "p ", new[] { "p" } },
+                    { " p ", new[] { "p" } },
+                    { "p,div", new[] { "p", "div" } },
+                    { " p,div", new[] { "p", "div" } },
+                    { "p ,div", new[] { "p", "div" } },
+                    { " p ,div", new[] { "p", "div" } },
+                    { "p, div", new[] { "p", "div" } },
+                    { "p,div ", new[] { "p", "div" } },
+                    { "p, div ", new[] { "p", "div" } },
+                    { " p, div ", new[] { "p", "div" } },
+                    { " p , div ", new[] { "p", "div" } },
+                };
+            }
+        }
+
+        public static TheoryData InvalidTagHelperAttributeDescriptorData
+        {
+            get
+            {
+                var invalidBoundAttributeBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, nameof(InvalidBoundAttribute), "Test");
+                invalidBoundAttributeBuilder.TypeName(typeof(InvalidBoundAttribute).FullName);
+
+                // type, expectedAttributeDescriptors
+                return new TheoryData<Type, IEnumerable<BoundAttributeDescriptor>>
+                {
+                    {
+                        typeof(InvalidBoundAttribute),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(InvalidBoundAttribute), attribute =>
+                            {
+                                attribute
+                                .Name("data-something")
+                                .PropertyName(nameof(InvalidBoundAttribute.DataSomething))
+                                .TypeName(typeof(string).FullName);
+                            }),
+                        }
+                    },
+                    {
+                        typeof(InvalidBoundAttributeWithValid),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(InvalidBoundAttributeWithValid), attribute =>
+                            {
+                                attribute
+                                .Name("data-something")
+                                .PropertyName(nameof(InvalidBoundAttributeWithValid.DataSomething))
+                                .TypeName(typeof(string).FullName); ;
+                            }),
+                            CreateAttributeFor(typeof(InvalidBoundAttributeWithValid), attribute =>
+                            {
+                                attribute
+                                .Name("int-attribute")
+                                .PropertyName(nameof(InvalidBoundAttributeWithValid.IntAttribute))
+                                .TypeName(typeof(int).FullName);
+                            }),
+                        }
+                    },
+                    {
+                        typeof(OverriddenInvalidBoundAttributeWithValid),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(OverriddenInvalidBoundAttributeWithValid), attribute =>
+                            {
+                                attribute
+                                .Name("valid-something")
+                                .PropertyName(nameof(OverriddenInvalidBoundAttributeWithValid.DataSomething))
+                                .TypeName(typeof(string).FullName);
+                            }),
+                        }
+                    },
+                    {
+                        typeof(OverriddenValidBoundAttributeWithInvalid),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(OverriddenValidBoundAttributeWithInvalid), attribute =>
+                            {
+                                attribute
+                                .Name("data-something")
+                                .PropertyName(nameof(OverriddenValidBoundAttributeWithInvalid.ValidSomething))
+                                .TypeName(typeof(string).FullName);
+                            }),
+                        }
+                    },
+                    {
+                        typeof(OverriddenValidBoundAttributeWithInvalidUpperCase),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(OverriddenValidBoundAttributeWithInvalidUpperCase), attribute =>
+                            {
+                                attribute
+                                .Name("DATA-SOMETHING")
+                                .PropertyName(nameof(OverriddenValidBoundAttributeWithInvalidUpperCase.ValidSomething))
+                                .TypeName(typeof(string).FullName);
+                            }),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidTagHelperAttributeDescriptorData))]
+        public void CreateDescriptor_DoesNotAllowDataDashAttributes(
+            Type type,
+            IEnumerable<BoundAttributeDescriptor> expectedAttributeDescriptors)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(type.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(
+                expectedAttributeDescriptors,
+                descriptor.BoundAttributes,
+                BoundAttributeDescriptorComparer.Default);
+
+            var id = AspNetCore.Razor.Language.RazorDiagnosticFactory.TagHelper_InvalidBoundAttributeNameStartsWith.Id;
+            foreach (var attribute in descriptor.BoundAttributes.Where(a => a.Name.StartsWith("data-", StringComparison.OrdinalIgnoreCase)))
+            {
+                var diagnostic = Assert.Single(attribute.Diagnostics);
+                Assert.Equal(id, diagnostic.Id);
+            }
+        }
+
+        public static TheoryData<string> ValidAttributeNameData
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    "data",
+                    "dataa-",
+                    "ValidName",
+                    "valid-name",
+                    "--valid--name--",
+                    ",,--__..oddly.valid::;;",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidAttributeNameData))]
+        public void CreateDescriptor_WithValidAttributeName_HasNoErrors(string name)
+        {
+            // Arrange
+            var text = $@"
+            public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+            {{
+                [{typeof(AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute).FullName}(""{name}"")]
+                public string SomeAttribute {{ get; set; }}
+            }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            Assert.False(descriptor.HasErrors);
+        }
+
+        public static TheoryData<string> ValidAttributePrefixData
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    string.Empty,
+                    "data",
+                    "dataa-",
+                    "ValidName",
+                    "valid-name",
+                    "--valid--name--",
+                    ",,--__..oddly.valid::;;",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidAttributePrefixData))]
+        public void CreateDescriptor_WithValidAttributePrefix_HasNoErrors(string prefix)
+        {
+            // Arrange
+            var text = $@"
+            public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+            {{
+                [{typeof(AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute).FullName}({nameof(AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute.DictionaryAttributePrefix)} = ""{prefix}"")]
+                public System.Collections.Generic.IDictionary<string, int> SomeAttribute {{ get; set; }}
+            }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            Assert.False(descriptor.HasErrors);
+        }
+
+        // name, expectedErrorMessages
+        public static TheoryData<string, string[]> InvalidAttributeNameData
+        {
+            get
+            {
+                Func<string, string, string> onNameError = (invalidText, invalidCharacter) =>
+                    "Invalid tag helper bound property 'string DynamicTestTagHelper.InvalidProperty' on tag helper 'DynamicTestTagHelper'. Tag helpers " +
+                    $"cannot bind to HTML attributes with name '{invalidText}' because the name contains a '{invalidCharacter}' character.";
+                var whitespaceErrorString =
+                    "Invalid tag helper bound property 'string DynamicTestTagHelper.InvalidProperty' on tag helper 'DynamicTestTagHelper'. Tag helpers cannot " +
+                    "bind to HTML attributes with a null or empty name.";
+                Func<string, string> onDataError = invalidText =>
+                "Invalid tag helper bound property 'string DynamicTestTagHelper.InvalidProperty' on tag helper 'DynamicTestTagHelper'. Tag helpers cannot bind " +
+                $"to HTML attributes with name '{invalidText}' because the name starts with 'data-'.";
+
+                return GetInvalidNameOrPrefixData(onNameError, whitespaceErrorString, onDataError);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidAttributeNameData))]
+        public void CreateDescriptor_WithInvalidAttributeName_HasErrors(string name, string[] expectedErrorMessages)
+        {
+            // Arrange
+            name = name.Replace("\n", "\\n").Replace("\r", "\\r").Replace("\"", "\\\"");
+            var text = $@"
+            public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+            {{
+                [{typeof(AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute).FullName}(""{name}"")]
+                public string InvalidProperty {{ get; set; }}
+            }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            var errorMessages = descriptor.GetAllDiagnostics().Select(diagnostic => diagnostic.GetMessage());
+            Assert.Equal(expectedErrorMessages, errorMessages);
+        }
+
+        // prefix, expectedErrorMessages
+        public static TheoryData<string, string[]> InvalidAttributePrefixData
+        {
+            get
+            {
+                Func<string, string, string> onPrefixError = (invalidText, invalidCharacter) =>
+                    "Invalid tag helper bound property 'System.Collections.Generic.IDictionary<System.String, System.Int32> DynamicTestTagHelper.InvalidProperty' " +
+                    "on tag helper 'DynamicTestTagHelper'. Tag helpers " +
+                    $"cannot bind to HTML attributes with prefix '{invalidText}' because the prefix contains a '{invalidCharacter}' character.";
+                var whitespaceErrorString =
+                    "Invalid tag helper bound property 'System.Collections.Generic.IDictionary<System.String, System.Int32> DynamicTestTagHelper.InvalidProperty' " +
+                    "on tag helper 'DynamicTestTagHelper'. Tag helpers cannot bind to HTML attributes with a null or empty name.";
+                Func<string, string> onDataError = invalidText =>
+                    "Invalid tag helper bound property 'System.Collections.Generic.IDictionary<System.String, System.Int32> DynamicTestTagHelper.InvalidProperty' " +
+                    "on tag helper 'DynamicTestTagHelper'. Tag helpers cannot bind to HTML attributes " +
+                    $"with prefix '{invalidText}' because the prefix starts with 'data-'.";
+
+                return GetInvalidNameOrPrefixData(onPrefixError, whitespaceErrorString, onDataError);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidAttributePrefixData))]
+        public void CreateDescriptor_WithInvalidAttributePrefix_HasErrors(string prefix, string[] expectedErrorMessages)
+        {
+            // Arrange
+            prefix = prefix.Replace("\n", "\\n").Replace("\r", "\\r").Replace("\"", "\\\"");
+            var text = $@"
+            public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+            {{
+                [{typeof(AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute).FullName}({nameof(AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute.DictionaryAttributePrefix)} = ""{prefix}"")]
+                public System.Collections.Generic.IDictionary<System.String, System.Int32> InvalidProperty {{ get; set; }}
+            }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            var errorMessages = descriptor.GetAllDiagnostics().Select(diagnostic => diagnostic.GetMessage());
+            Assert.Equal(expectedErrorMessages, errorMessages);
+        }
+
+        public static TheoryData<string, string[]> InvalidRestrictChildrenNameData
+        {
+            get
+            {
+                var nullOrWhiteSpaceError =
+                    AspNetCore.Razor.Language.Resources.FormatTagHelper_InvalidRestrictedChildNullOrWhitespace("DynamicTestTagHelper");
+
+                return GetInvalidNameOrPrefixData(
+                    onNameError: (invalidInput, invalidCharacter) =>
+                        AspNetCore.Razor.Language.Resources.FormatTagHelper_InvalidRestrictedChild(
+                            "DynamicTestTagHelper",
+                            invalidInput,
+                            invalidCharacter),
+                    whitespaceErrorString: nullOrWhiteSpaceError,
+                    onDataError: null);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidRestrictChildrenNameData))]
+        public void CreateDescriptor_WithInvalidAllowedChildren_HasErrors(string name, string[] expectedErrorMessages)
+        {
+            // Arrange
+            name = name.Replace("\n", "\\n").Replace("\r", "\\r").Replace("\"", "\\\"");
+            var text = $@"
+            [{typeof(AspNetCore.Razor.TagHelpers.RestrictChildrenAttribute).FullName}(""{name}"")]
+            public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+            {{
+            }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            var errorMessages = descriptor.GetAllDiagnostics().Select(diagnostic => diagnostic.GetMessage());
+            Assert.Equal(expectedErrorMessages, errorMessages);
+        }
+
+        public static TheoryData<string, string[]> InvalidParentTagData
+        {
+            get
+            {
+                var nullOrWhiteSpaceError =
+                    AspNetCore.Razor.Language.Resources.TagHelper_InvalidTargetedParentTagNameNullOrWhitespace;
+
+                return GetInvalidNameOrPrefixData(
+                    onNameError: (invalidInput, invalidCharacter) =>
+                        AspNetCore.Razor.Language.Resources.FormatTagHelper_InvalidTargetedParentTagName(
+                            invalidInput,
+                            invalidCharacter),
+                    whitespaceErrorString: nullOrWhiteSpaceError,
+                    onDataError: null);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidParentTagData))]
+        public void CreateDescriptor_WithInvalidParentTag_HasErrors(string name, string[] expectedErrorMessages)
+        {
+            // Arrange
+            name = name.Replace("\n", "\\n").Replace("\r", "\\r").Replace("\"", "\\\"");
+            var text = $@"
+            [{typeof(AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute).FullName}({nameof(AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute.ParentTag)} = ""{name}"")]
+            public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName}
+            {{
+            }}";
+            var syntaxTree = CSharpSyntaxTree.ParseText(text);
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var tagHelperType = compilation.GetTypeByMetadataName("DynamicTestTagHelper");
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: false, excludeHidden: false);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(tagHelperType);
+
+            // Assert
+            var errorMessages = descriptor.GetAllDiagnostics().Select(diagnostic => diagnostic.GetMessage());
+            Assert.Equal(expectedErrorMessages, errorMessages);
+        }
+
+        [Fact]
+        public void CreateDescriptor_BuildsDescriptorsFromSimpleTypes()
+        {
+            // Arrange
+            var objectAssemblyName = typeof(Enumerable).GetTypeInfo().Assembly.GetName().Name;
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(typeof(Enumerable).FullName);
+            var expectedDescriptor =
+                CreateTagHelperDescriptor("enumerable", "System.Linq.Enumerable", typeSymbol.ContainingAssembly.Identity.Name);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData TagHelperWithPrefixData
+        {
+            get
+            {
+                var dictionaryNamespace = typeof(IDictionary<,>).FullName;
+                dictionaryNamespace = dictionaryNamespace.Substring(0, dictionaryNamespace.IndexOf('`'));
+
+                // tagHelperType, expectedAttributeDescriptors, expectedDiagnostics
+                return new TheoryData<Type, IEnumerable<BoundAttributeDescriptor>, IEnumerable<RazorDiagnostic>>
+                {
+                    {
+                        typeof(DefaultValidHtmlAttributePrefix),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(DefaultValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("dictionary-property")
+                                .PropertyName(nameof(DefaultValidHtmlAttributePrefix.DictionaryProperty))
+                                .TypeName($"{dictionaryNamespace}<System.String, System.String>")
+                                .AsDictionaryAttribute("dictionary-property-", typeof(string).FullName);
+                            }),
+                        },
+                        Enumerable.Empty<RazorDiagnostic>()
+                    },
+                    {
+                        typeof(SingleValidHtmlAttributePrefix),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(SingleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name")
+                                .PropertyName(nameof(SingleValidHtmlAttributePrefix.DictionaryProperty))
+                                .TypeName($"{dictionaryNamespace}<System.String, System.String>")
+                                .AsDictionaryAttribute("valid-name-", typeof(string).FullName);
+                            }),
+                        },
+                        Enumerable.Empty<RazorDiagnostic>()
+                    },
+                    {
+                        typeof(MultipleValidHtmlAttributePrefix),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name1")
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.DictionaryProperty))
+                                .TypeName($"{typeof(Dictionary<,>).Namespace}.Dictionary<System.String, System.Object>")
+                                .AsDictionaryAttribute("valid-prefix1-", typeof(object).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name2")
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.DictionarySubclassProperty))
+                                .TypeName(typeof(DictionarySubclass).FullName)
+                                .AsDictionaryAttribute("valid-prefix2-", typeof(string).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name3")
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.DictionaryWithoutParameterlessConstructorProperty))
+                                .TypeName(typeof(DictionaryWithoutParameterlessConstructor).FullName)
+                                .AsDictionaryAttribute("valid-prefix3-", typeof(string).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name4")
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.GenericDictionarySubclassProperty))
+                                .TypeName(typeof(GenericDictionarySubclass<object>).Namespace + ".GenericDictionarySubclass<System.Object>")
+                                .AsDictionaryAttribute("valid-prefix4-", typeof(object).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name5")
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.SortedDictionaryProperty))
+                                .TypeName(typeof(SortedDictionary<string, int>).Namespace + ".SortedDictionary<System.String, System.Int32>")
+                                .AsDictionaryAttribute("valid-prefix5-", typeof(int).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name6")
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.StringProperty))
+                                .TypeName(typeof(string).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.GetOnlyDictionaryProperty))
+                                .TypeName($"{dictionaryNamespace}<System.String, System.Int32>")
+                                .AsDictionaryAttribute("get-only-dictionary-property-", typeof(int).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleValidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .PropertyName(nameof(MultipleValidHtmlAttributePrefix.GetOnlyDictionaryPropertyWithAttributePrefix))
+                                .TypeName($"{dictionaryNamespace}<System.String, System.String>")
+                                .AsDictionaryAttribute("valid-prefix6", typeof(string).FullName);
+                            }),
+                        },
+                        Enumerable.Empty<RazorDiagnostic>()
+                    },
+                    {
+                        typeof(SingleInvalidHtmlAttributePrefix),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(SingleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name")
+                                .PropertyName(nameof(SingleInvalidHtmlAttributePrefix.StringProperty))
+                                .TypeName(typeof(string).FullName)
+                                .AddDiagnostic(RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                    typeof(SingleInvalidHtmlAttributePrefix).FullName,
+                                    nameof(SingleInvalidHtmlAttributePrefix.StringProperty)));
+                            }),
+                        },
+                        new[]
+                        {
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                typeof(SingleInvalidHtmlAttributePrefix).FullName,
+                                nameof(SingleInvalidHtmlAttributePrefix.StringProperty))
+                        }
+                    },
+                    {
+                        typeof(MultipleInvalidHtmlAttributePrefix),
+                        new[]
+                        {
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name1")
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.LongProperty))
+                                .TypeName(typeof(long).FullName);
+                            }),
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name2")
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.DictionaryOfIntProperty))
+                                .TypeName($"{typeof(Dictionary<,>).Namespace}.Dictionary<System.Int32, System.String>")
+                                .AsDictionaryAttribute("valid-prefix2-", typeof(string).FullName)
+                                .AddDiagnostic(
+                                    RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                        typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                        nameof(MultipleInvalidHtmlAttributePrefix.DictionaryOfIntProperty)));
+                            }),
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name3")
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.ReadOnlyDictionaryProperty))
+                                .TypeName($"{typeof(IReadOnlyDictionary<,>).Namespace}.IReadOnlyDictionary<System.String, System.Object>")
+                                .AddDiagnostic(
+                                    RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                        typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                        nameof(MultipleInvalidHtmlAttributePrefix.ReadOnlyDictionaryProperty)));
+                            }),
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name4")
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.IntProperty))
+                                .TypeName(typeof(int).FullName)
+                                .AddDiagnostic(
+                                    RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                        typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                        nameof(MultipleInvalidHtmlAttributePrefix.IntProperty)));
+                            }),
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .Name("valid-name5")
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.DictionaryOfIntSubclassProperty))
+                                .TypeName(typeof(DictionaryOfIntSubclass).FullName)
+                                .AsDictionaryAttribute("valid-prefix5-", typeof(string).FullName)
+                                .AddDiagnostic(
+                                    RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                        typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                        nameof(MultipleInvalidHtmlAttributePrefix.DictionaryOfIntSubclassProperty)));
+                            }),
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.GetOnlyDictionaryAttributePrefix))
+                                .TypeName($"{dictionaryNamespace}<System.Int32, System.String>")
+                                .AsDictionaryAttribute("valid-prefix6", typeof(string).FullName)
+                                .AddDiagnostic(
+                                    RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                        typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                        nameof(MultipleInvalidHtmlAttributePrefix.GetOnlyDictionaryAttributePrefix)));
+                            }),
+                            CreateAttributeFor(typeof(MultipleInvalidHtmlAttributePrefix), attribute =>
+                            {
+                                attribute
+                                .PropertyName(nameof(MultipleInvalidHtmlAttributePrefix.GetOnlyDictionaryPropertyWithAttributeName))
+                                .TypeName($"{dictionaryNamespace}<System.String, System.Object>")
+                                .AsDictionaryAttribute("invalid-name7-", typeof(object).FullName)
+                                .AddDiagnostic(
+                                    RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNull(
+                                        typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                        nameof(MultipleInvalidHtmlAttributePrefix.GetOnlyDictionaryPropertyWithAttributeName)));
+                            }),
+                        },
+                        new[]
+                        {
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                nameof(MultipleInvalidHtmlAttributePrefix.DictionaryOfIntProperty)),
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                nameof(MultipleInvalidHtmlAttributePrefix.ReadOnlyDictionaryProperty)),
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                nameof(MultipleInvalidHtmlAttributePrefix.IntProperty)),
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                nameof(MultipleInvalidHtmlAttributePrefix.DictionaryOfIntSubclassProperty)),
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNotNull(
+                                typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                nameof(MultipleInvalidHtmlAttributePrefix.GetOnlyDictionaryAttributePrefix)),
+                            RazorDiagnosticFactory.CreateTagHelper_InvalidAttributePrefixNull(
+                                typeof(MultipleInvalidHtmlAttributePrefix).FullName,
+                                nameof(MultipleInvalidHtmlAttributePrefix.GetOnlyDictionaryPropertyWithAttributeName)),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TagHelperWithPrefixData))]
+        public void CreateDescriptor_WithPrefixes_ReturnsExpectedAttributeDescriptors(
+            Type tagHelperType,
+            IEnumerable<BoundAttributeDescriptor> expectedAttributeDescriptors,
+            IEnumerable<RazorDiagnostic> expectedDiagnostics)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(
+                expectedAttributeDescriptors,
+                descriptor.BoundAttributes,
+                BoundAttributeDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDiagnostics, descriptor.GetAllDiagnostics());
+        }
+
+        public static TheoryData TagOutputHintData
+        {
+            get
+            {
+                // tagHelperType, expectedDescriptor
+                return new TheoryData<Type, TagHelperDescriptor>
+                {
+                    {
+                        typeof(MultipleDescriptorTagHelperWithOutputElementHint),
+                        TagHelperDescriptorBuilder.Create(typeof(MultipleDescriptorTagHelperWithOutputElementHint).FullName, AssemblyName)
+                            .TypeName(typeof(MultipleDescriptorTagHelperWithOutputElementHint).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("a"))
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("p"))
+                            .TagOutputHint("div")
+                            .Build()
+                    },
+                    {
+                        typeof(InheritedOutputElementHintTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(InheritedOutputElementHintTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(InheritedOutputElementHintTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("inherited-output-element-hint"))
+                            .Build()
+                    },
+                    {
+                        typeof(OutputElementHintTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(OutputElementHintTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(OutputElementHintTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("output-element-hint"))
+                            .TagOutputHint("hinted-value")
+                            .Build()
+                    },
+                    {
+                        typeof(OverriddenOutputElementHintTagHelper),
+                        TagHelperDescriptorBuilder.Create(typeof(OverriddenOutputElementHintTagHelper).FullName, AssemblyName)
+                            .TypeName(typeof(OverriddenOutputElementHintTagHelper).FullName)
+                            .TagMatchingRuleDescriptor(builder => builder.RequireTagName("overridden-output-element-hint"))
+                            .TagOutputHint("overridden")
+                            .Build()
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TagOutputHintData))]
+        public void CreateDescriptor_CreatesDescriptorsWithOutputElementHint(
+            Type tagHelperType,
+            TagHelperDescriptor expectedDescriptor)
+        {
+            // Arrange
+            var factory = new DefaultTagHelperDescriptorFactory(Compilation, includeDocumentation: false, excludeHidden: false);
+            var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_CapturesDocumentationOnTagHelperClass()
+        {
+            // Arrange
+            var errorSink = new ErrorSink();
+            var syntaxTree = CSharpSyntaxTree.ParseText(@"
+        using Microsoft.AspNetCore.Razor.TagHelpers;
+
+        /// <summary>
+        /// The summary for <see cref=""DocumentedTagHelper""/>.
+        /// </summary>
+        /// <remarks>
+        /// Inherits from <see cref=""TagHelper""/>.
+        /// </remarks>
+        public class DocumentedTagHelper : " + typeof(AspNetCore.Razor.TagHelpers.TagHelper).Name + @"
+        {
+        }");
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: true, excludeHidden: false);
+            var typeSymbol = compilation.GetTypeByMetadataName("DocumentedTagHelper");
+            var expectedDocumentation =
+@"<member name=""T:DocumentedTagHelper"">
+    <summary>
+    The summary for <see cref=""T:DocumentedTagHelper""/>.
+    </summary>
+    <remarks>
+    Inherits from <see cref=""T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper""/>.
+    </remarks>
+</member>
+";
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            Assert.Equal(expectedDocumentation, descriptor.Documentation);
+        }
+
+        [Fact]
+        public void CreateDescriptor_CapturesDocumentationOnTagHelperProperties()
+        {
+            // Arrange
+            var errorSink = new ErrorSink();
+            var syntaxTree = CSharpSyntaxTree.ParseText(@"
+        using System.Collections.Generic;
+
+        public class DocumentedTagHelper : " + typeof(AspNetCore.Razor.TagHelpers.TagHelper).FullName + @"
+        {
+            /// <summary>
+            /// This <see cref=""SummaryProperty""/> is of type <see cref=""string""/>.
+            /// </summary>
+            public string SummaryProperty { get; set; }
+
+            /// <remarks>
+            /// The <see cref=""SummaryProperty""/> may be <c>null</c>.
+            /// </remarks>
+            public int RemarksProperty { get; set; }
+
+            /// <summary>
+            /// This is a complex <see cref=""List{bool}""/>.
+            /// </summary>
+            /// <remarks>
+            /// <see cref=""SummaryProperty""/><see cref=""RemarksProperty""/>
+            /// </remarks>
+            public List<bool> RemarksAndSummaryProperty { get; set; }
+        }");
+            var compilation = TestCompilation.Create(_assembly, syntaxTree);
+            var factory = new DefaultTagHelperDescriptorFactory(compilation, includeDocumentation: true, excludeHidden: false);
+            var typeSymbol = compilation.GetTypeByMetadataName("DocumentedTagHelper");
+            var expectedDocumentations = new[]
+            {
+
+@"<member name=""P:DocumentedTagHelper.SummaryProperty"">
+    <summary>
+    This <see cref=""P:DocumentedTagHelper.SummaryProperty""/> is of type <see cref=""T:System.String""/>.
+    </summary>
+</member>
+",
+@"<member name=""P:DocumentedTagHelper.RemarksProperty"">
+    <remarks>
+    The <see cref=""P:DocumentedTagHelper.SummaryProperty""/> may be <c>null</c>.
+    </remarks>
+</member>
+",
+@"<member name=""P:DocumentedTagHelper.RemarksAndSummaryProperty"">
+    <summary>
+    This is a complex <see cref=""T:System.Collections.Generic.List`1""/>.
+    </summary>
+    <remarks>
+    <see cref=""P:DocumentedTagHelper.SummaryProperty""/><see cref=""P:DocumentedTagHelper.RemarksProperty""/>
+    </remarks>
+</member>
+",
+                    };
+
+            // Act
+            var descriptor = factory.CreateDescriptor(typeSymbol);
+
+            // Assert
+            var documentations = descriptor.BoundAttributes.Select(boundAttribute => boundAttribute.Documentation);
+            Assert.Equal(expectedDocumentations, documentations);
+        }
+
+        private static TheoryData<string, string[]> GetInvalidNameOrPrefixData(
+            Func<string, string, string> onNameError,
+            string whitespaceErrorString,
+            Func<string, string> onDataError)
+        {
+            // name, expectedErrorMessages
+            var data = new TheoryData<string, string[]>
+            {
+                { "!", new[] {  onNameError("!", "!") } },
+                { "hello!", new[] { onNameError("hello!", "!") } },
+                { "!hello", new[] { onNameError("!hello", "!") } },
+                { "he!lo", new[] { onNameError("he!lo", "!") } },
+                { "!he!lo!", new[] { onNameError("!he!lo!", "!") } },
+                { "@", new[] { onNameError("@", "@") } },
+                { "hello@", new[] { onNameError("hello@", "@") } },
+                { "@hello", new[] { onNameError("@hello", "@") } },
+                { "he@lo", new[] { onNameError("he@lo", "@") } },
+                { "@he@lo@", new[] { onNameError("@he@lo@", "@") } },
+                { "/", new[] { onNameError("/", "/") } },
+                { "hello/", new[] { onNameError("hello/", "/") } },
+                { "/hello", new[] { onNameError("/hello", "/") } },
+                { "he/lo", new[] { onNameError("he/lo", "/") } },
+                { "/he/lo/", new[] { onNameError("/he/lo/", "/") } },
+                { "<", new[] { onNameError("<", "<") } },
+                { "hello<", new[] { onNameError("hello<", "<") } },
+                { "<hello", new[] { onNameError("<hello", "<") } },
+                { "he<lo", new[] { onNameError("he<lo", "<") } },
+                { "<he<lo<", new[] { onNameError("<he<lo<", "<") } },
+                { "?", new[] { onNameError("?", "?") } },
+                { "hello?", new[] { onNameError("hello?", "?") } },
+                { "?hello", new[] { onNameError("?hello", "?") } },
+                { "he?lo", new[] { onNameError("he?lo", "?") } },
+                { "?he?lo?", new[] { onNameError("?he?lo?", "?") } },
+                { "[", new[] { onNameError("[", "[") } },
+                { "hello[", new[] { onNameError("hello[", "[") } },
+                { "[hello", new[] { onNameError("[hello", "[") } },
+                { "he[lo", new[] { onNameError("he[lo", "[") } },
+                { "[he[lo[", new[] { onNameError("[he[lo[", "[") } },
+                { ">", new[] { onNameError(">", ">") } },
+                { "hello>", new[] { onNameError("hello>", ">") } },
+                { ">hello", new[] { onNameError(">hello", ">") } },
+                { "he>lo", new[] { onNameError("he>lo", ">") } },
+                { ">he>lo>", new[] { onNameError(">he>lo>", ">") } },
+                { "]", new[] { onNameError("]", "]") } },
+                { "hello]", new[] { onNameError("hello]", "]") } },
+                { "]hello", new[] { onNameError("]hello", "]") } },
+                { "he]lo", new[] { onNameError("he]lo", "]") } },
+                { "]he]lo]", new[] { onNameError("]he]lo]", "]") } },
+                { "=", new[] { onNameError("=", "=") } },
+                { "hello=", new[] { onNameError("hello=", "=") } },
+                { "=hello", new[] { onNameError("=hello", "=") } },
+                { "he=lo", new[] { onNameError("he=lo", "=") } },
+                { "=he=lo=", new[] { onNameError("=he=lo=", "=") } },
+                { "\"", new[] { onNameError("\"", "\"") } },
+                { "hello\"", new[] { onNameError("hello\"", "\"") } },
+                { "\"hello", new[] { onNameError("\"hello", "\"") } },
+                { "he\"lo", new[] { onNameError("he\"lo", "\"") } },
+                { "\"he\"lo\"", new[] { onNameError("\"he\"lo\"", "\"") } },
+                { "'", new[] { onNameError("'", "'") } },
+                { "hello'", new[] { onNameError("hello'", "'") } },
+                { "'hello", new[] { onNameError("'hello", "'") } },
+                { "he'lo", new[] { onNameError("he'lo", "'") } },
+                { "'he'lo'", new[] { onNameError("'he'lo'", "'") } },
+                { "hello*", new[] { onNameError("hello*", "*") } },
+                { "*hello", new[] { onNameError("*hello", "*") } },
+                { "he*lo", new[] { onNameError("he*lo", "*") } },
+                { "*he*lo*", new[] { onNameError("*he*lo*", "*") } },
+                { Environment.NewLine, new[] { whitespaceErrorString } },
+                { "\t", new[] { whitespaceErrorString } },
+                { " \t ", new[] { whitespaceErrorString } },
+                { " ", new[] { whitespaceErrorString } },
+                { Environment.NewLine + " ", new[] { whitespaceErrorString } },
+                {
+                    "! \t\r\n@/<>?[]=\"'*",
+                    new[]
+                    {
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "!"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", " "),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "\t"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "\r"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "\n"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "@"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "/"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "<"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", ">"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "?"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "["),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "]"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "="),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "\""),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "'"),
+                        onNameError("! \t\r\n@/<>?[]=\"'*", "*"),
+                    }
+                },
+                {
+                    "! \tv\ra\nl@i/d<>?[]=\"'*",
+                    new[]
+                    {
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "!"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", " "),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "\t"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "\r"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "\n"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "@"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "/"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "<"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", ">"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "?"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "["),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "]"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "="),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "\""),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "'"),
+                        onNameError("! \tv\ra\nl@i/d<>?[]=\"'*", "*"),
+                    }
+                },
+            };
+
+            if (onDataError != null)
+            {
+                data.Add("data-", new[] { onDataError("data-") });
+                data.Add("data-something", new[] { onDataError("data-something") });
+                data.Add("Data-Something", new[] { onDataError("Data-Something") });
+                data.Add("DATA-SOMETHING", new[] { onDataError("DATA-SOMETHING") });
+            }
+
+            return data;
+        }
+
+        protected static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null,
+            IEnumerable<Action<TagMatchingRuleDescriptorBuilder>> ruleBuilders = null)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BoundAttributeDescriptor(attributeBuilder);
+                }
+            }
+
+            if (ruleBuilders != null)
+            {
+                foreach (var ruleBuilder in ruleBuilders)
+                {
+                    builder.TagMatchingRuleDescriptor(innerRuleBuilder =>
+                    {
+                        innerRuleBuilder.RequireTagName(tagName);
+                        ruleBuilder(innerRuleBuilder);
+                    });
+                }
+            }
+            else
+            {
+                builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+            }
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+
+        private static BoundAttributeDescriptor CreateAttributeFor(Type tagHelperType, Action<BoundAttributeDescriptorBuilder> configure)
+        {
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, tagHelperType.Name, "Test");
+            tagHelperBuilder.TypeName(tagHelperType.FullName);
+
+            var attributeBuilder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            configure(attributeBuilder);
+            return attributeBuilder.Build();
+        }
+    }
+
+    [AspNetCore.Razor.TagHelpers.OutputElementHint("hinted-value")]
+    public class OutputElementHintTagHelper : AspNetCore.Razor.TagHelpers.TagHelper
+    {
+    }
+
+    public class InheritedOutputElementHintTagHelper : OutputElementHintTagHelper
+    {
+    }
+
+    [AspNetCore.Razor.TagHelpers.OutputElementHint("overridden")]
+    public class OverriddenOutputElementHintTagHelper : OutputElementHintTagHelper
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..0a933ed34f
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,54 @@
+// 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.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class DefaultTagHelperDescriptorProviderTest
+    {
+        private static readonly Assembly _assembly = typeof(DefaultTagHelperDescriptorProviderTest).GetTypeInfo().Assembly;
+
+        [Fact]
+        public void Execute_DoesNotAddEditorBrowsableNeverDescriptorsAtDesignTime()
+        {
+            // Arrange
+            var editorBrowsableTypeName = "Microsoft.CodeAnalysis.Razor.Workspaces.Test.EditorBrowsableTagHelper";
+            var compilation = TestCompilation.Create(_assembly);
+            var descriptorProvider = new DefaultTagHelperDescriptorProvider();
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+            context.ExcludeHidden = true;
+
+            // Act 
+            descriptorProvider.Execute(context);
+
+            // Assert
+            Assert.NotNull(compilation.GetTypeByMetadataName(editorBrowsableTypeName));
+            var nullDescriptors = context.Results.Where(descriptor => descriptor == null);
+            Assert.Empty(nullDescriptors);
+            var editorBrowsableDescriptor = context.Results.Where(descriptor => descriptor.GetTypeName() == editorBrowsableTypeName);
+            Assert.Empty(editorBrowsableDescriptor);
+        }
+
+        [Fact]
+        public void Execute_NoOpsIfCompilationIsNotSet()
+        {
+            // Arrange
+            var descriptorProvider = new DefaultTagHelperDescriptorProvider();
+
+            var context = TagHelperDescriptorProviderContext.Create();
+
+            // Act 
+            descriptorProvider.Execute(context);
+
+            // Assert
+            Assert.Empty(context.Results);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
new file mode 100644
index 0000000000..d95d005405
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**\*" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperDescriptorFactoryTagHelpers.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperDescriptorFactoryTagHelpers.cs
new file mode 100644
index 0000000000..658fca5d94
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperDescriptorFactoryTagHelpers.cs
@@ -0,0 +1,463 @@
+// 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.Collections.Generic;
+using System.ComponentModel;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.CodeAnalysis.Razor.Workspaces.Test
+{
+    public enum CustomEnum
+    {
+        FirstValue,
+        SecondValue
+    }
+
+    public class EnumTagHelper : TagHelper
+    {
+        public int NonEnumProperty { get; set; }
+
+        public CustomEnum EnumProperty { get; set; }
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("input")]
+    public class MultiEnumTagHelper : EnumTagHelper
+    {
+    }
+
+    public class NestedEnumTagHelper : EnumTagHelper
+    {
+        public NestedEnum NestedEnumProperty { get; set; }
+
+        public enum NestedEnum
+        {
+            NestedOne,
+            NestedTwo
+        }
+    }
+
+    [HtmlTargetElement("input", ParentTag = "div")]
+    public class RequiredParentTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("p", ParentTag = "div")]
+    [HtmlTargetElement("input", ParentTag = "section")]
+    public class MultiSpecifiedRequiredParentTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("input", ParentTag = "div")]
+    public class MultiWithUnspecifiedRequiredParentTagHelper : TagHelper
+    {
+    }
+
+
+    [RestrictChildren("p")]
+    public class RestrictChildrenTagHelper
+    {
+    }
+
+    [RestrictChildren("p", "strong")]
+    public class DoubleRestrictChildrenTagHelper
+    {
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("div")]
+    [RestrictChildren("p", "strong")]
+    public class MultiTargetRestrictChildrenTagHelper
+    {
+    }
+
+    [HtmlTargetElement("input", TagStructure = TagStructure.WithoutEndTag)]
+    public class TagStructureTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("p", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("input", TagStructure = TagStructure.WithoutEndTag)]
+    public class MultiSpecifiedTagStructureTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("input", TagStructure = TagStructure.WithoutEndTag)]
+    public class MultiWithUnspecifiedTagStructureTagHelper : TagHelper
+    {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Always)]
+    public class DefaultEditorBrowsableTagHelper : TagHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Always)]
+        public int Property { get; set; }
+    }
+
+    public class HiddenPropertyEditorBrowsableTagHelper : TagHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public int Property { get; set; }
+    }
+
+    public class MultiPropertyEditorBrowsableTagHelper : TagHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public int Property { get; set; }
+
+        public virtual int Property2 { get; set; }
+    }
+
+    public class OverriddenPropertyEditorBrowsableTagHelper : MultiPropertyEditorBrowsableTagHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int Property2 { get; set; }
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class EditorBrowsableTagHelper : TagHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual int Property { get; set; }
+    }
+
+    public class InheritedEditorBrowsableTagHelper : EditorBrowsableTagHelper
+    {
+        public override int Property { get; set; }
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    public class OverriddenEditorBrowsableTagHelper : EditorBrowsableTagHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public override int Property { get; set; }
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("div")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class MultiEditorBrowsableTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement(Attributes = "class*")]
+    public class AttributeWildcardTargetingTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement(Attributes = "class*,style*")]
+    public class MultiAttributeWildcardTargetingTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement(Attributes = "class")]
+    public class AttributeTargetingTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement(Attributes = "class,style")]
+    public class MultiAttributeTargetingTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement(Attributes = "custom")]
+    [HtmlTargetElement(Attributes = "class,style")]
+    public class MultiAttributeAttributeTargetingTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement(Attributes = "style")]
+    public class InheritedAttributeTargetingTagHelper : AttributeTargetingTagHelper
+    {
+    }
+
+    [HtmlTargetElement("input", Attributes = "class")]
+    public class RequiredAttributeTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("div", Attributes = "class")]
+    public class InheritedRequiredAttributeTagHelper : RequiredAttributeTagHelper
+    {
+    }
+
+    [HtmlTargetElement("div", Attributes = "class")]
+    [HtmlTargetElement("input", Attributes = "class")]
+    public class MultiAttributeRequiredAttributeTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("input", Attributes = "style")]
+    [HtmlTargetElement("input", Attributes = "class")]
+    public class MultiAttributeSameTagRequiredAttributeTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("input", Attributes = "class,style")]
+    public class MultiRequiredAttributeTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("div", Attributes = "style")]
+    public class InheritedMultiRequiredAttributeTagHelper : MultiRequiredAttributeTagHelper
+    {
+    }
+
+    [HtmlTargetElement("div", Attributes = "class,style")]
+    [HtmlTargetElement("input", Attributes = "class,style")]
+    public class MultiTagMultiRequiredAttributeTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("div")]
+    public class MultiTagTagHelper
+    {
+        public string ValidAttribute { get; set; }
+    }
+
+    public class InheritedMultiTagTagHelper : MultiTagTagHelper
+    {
+    }
+
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("p")]
+    [HtmlTargetElement("div")]
+    [HtmlTargetElement("div")]
+    public class DuplicateTagNameTagHelper
+    {
+    }
+
+    [HtmlTargetElement("data-condition")]
+    public class OverrideNameTagHelper
+    {
+    }
+
+    public class InheritedSingleAttributeTagHelper : SingleAttributeTagHelper
+    {
+    }
+
+    public class DuplicateAttributeNameTagHelper
+    {
+        public string MyNameIsLegion { get; set; }
+
+        [HtmlAttributeName("my-name-is-legion")]
+        public string Fred { get; set; }
+    }
+
+    public class NotBoundAttributeTagHelper
+    {
+        public object BoundProperty { get; set; }
+
+        [HtmlAttributeNotBound]
+        public string NotBoundProperty { get; set; }
+
+        [HtmlAttributeName("unused")]
+        [HtmlAttributeNotBound]
+        public string NamedNotBoundProperty { get; set; }
+    }
+
+    public class OverriddenAttributeTagHelper
+    {
+        [HtmlAttributeName("SomethingElse")]
+        public virtual string ValidAttribute1 { get; set; }
+
+        [HtmlAttributeName("Something-Else")]
+        public string ValidAttribute2 { get; set; }
+    }
+
+    public class InheritedOverriddenAttributeTagHelper : OverriddenAttributeTagHelper
+    {
+        public override string ValidAttribute1 { get; set; }
+    }
+
+    public class InheritedNotOverriddenAttributeTagHelper : OverriddenAttributeTagHelper
+    {
+    }
+
+    public class ALLCAPSTAGHELPER : TagHelper
+    {
+        public int ALLCAPSATTRIBUTE { get; set; }
+    }
+
+    public class CAPSOnOUTSIDETagHelper : TagHelper
+    {
+        public int CAPSOnOUTSIDEATTRIBUTE { get; set; }
+    }
+
+    public class capsONInsideTagHelper : TagHelper
+    {
+        public int capsONInsideattribute { get; set; }
+    }
+
+    public class One1Two2Three3TagHelper : TagHelper
+    {
+        public int One1Two2Three3Attribute { get; set; }
+    }
+
+    public class ONE1TWO2THREE3TagHelper : TagHelper
+    {
+        public int ONE1TWO2THREE3Attribute { get; set; }
+    }
+
+    public class First_Second_ThirdHiTagHelper : TagHelper
+    {
+        public int First_Second_ThirdAttribute { get; set; }
+    }
+
+    public class UNSuffixedCLASS : TagHelper
+    {
+        public int UNSuffixedATTRIBUTE { get; set; }
+    }
+
+    public class InvalidBoundAttribute : TagHelper
+    {
+        public string DataSomething { get; set; }
+    }
+
+    public class InvalidBoundAttributeWithValid : SingleAttributeTagHelper
+    {
+        public string DataSomething { get; set; }
+    }
+
+    public class OverriddenInvalidBoundAttributeWithValid : TagHelper
+    {
+        [HtmlAttributeName("valid-something")]
+        public string DataSomething { get; set; }
+    }
+
+    public class OverriddenValidBoundAttributeWithInvalid : TagHelper
+    {
+        [HtmlAttributeName("data-something")]
+        public string ValidSomething { get; set; }
+    }
+
+    public class OverriddenValidBoundAttributeWithInvalidUpperCase : TagHelper
+    {
+        [HtmlAttributeName("DATA-SOMETHING")]
+        public string ValidSomething { get; set; }
+    }
+
+    public class DefaultValidHtmlAttributePrefix : TagHelper
+    {
+        public IDictionary<string, string> DictionaryProperty { get; set; }
+    }
+
+    public class SingleValidHtmlAttributePrefix : TagHelper
+    {
+        [HtmlAttributeName("valid-name")]
+        public IDictionary<string, string> DictionaryProperty { get; set; }
+    }
+
+    public class MultipleValidHtmlAttributePrefix : TagHelper
+    {
+        [HtmlAttributeName("valid-name1", DictionaryAttributePrefix = "valid-prefix1-")]
+        public Dictionary<string, object> DictionaryProperty { get; set; }
+
+        [HtmlAttributeName("valid-name2", DictionaryAttributePrefix = "valid-prefix2-")]
+        public DictionarySubclass DictionarySubclassProperty { get; set; }
+
+        [HtmlAttributeName("valid-name3", DictionaryAttributePrefix = "valid-prefix3-")]
+        public DictionaryWithoutParameterlessConstructor DictionaryWithoutParameterlessConstructorProperty { get; set; }
+
+        [HtmlAttributeName("valid-name4", DictionaryAttributePrefix = "valid-prefix4-")]
+        public GenericDictionarySubclass<object> GenericDictionarySubclassProperty { get; set; }
+
+        [HtmlAttributeName("valid-name5", DictionaryAttributePrefix = "valid-prefix5-")]
+        public SortedDictionary<string, int> SortedDictionaryProperty { get; set; }
+
+        [HtmlAttributeName("valid-name6")]
+        public string StringProperty { get; set; }
+
+        public IDictionary<string, int> GetOnlyDictionaryProperty { get; }
+
+        [HtmlAttributeName(DictionaryAttributePrefix = "valid-prefix6")]
+        public IDictionary<string, string> GetOnlyDictionaryPropertyWithAttributePrefix { get; }
+    }
+
+    public class SingleInvalidHtmlAttributePrefix : TagHelper
+    {
+        [HtmlAttributeName("valid-name", DictionaryAttributePrefix = "valid-prefix")]
+        public string StringProperty { get; set; }
+    }
+
+    public class MultipleInvalidHtmlAttributePrefix : TagHelper
+    {
+        [HtmlAttributeName("valid-name1")]
+        public long LongProperty { get; set; }
+
+        [HtmlAttributeName("valid-name2", DictionaryAttributePrefix = "valid-prefix2-")]
+        public Dictionary<int, string> DictionaryOfIntProperty { get; set; }
+
+        [HtmlAttributeName("valid-name3", DictionaryAttributePrefix = "valid-prefix3-")]
+        public IReadOnlyDictionary<string, object> ReadOnlyDictionaryProperty { get; set; }
+
+        [HtmlAttributeName("valid-name4", DictionaryAttributePrefix = "valid-prefix4-")]
+        public int IntProperty { get; set; }
+
+        [HtmlAttributeName("valid-name5", DictionaryAttributePrefix = "valid-prefix5-")]
+        public DictionaryOfIntSubclass DictionaryOfIntSubclassProperty { get; set; }
+
+        [HtmlAttributeName(DictionaryAttributePrefix = "valid-prefix6")]
+        public IDictionary<int, string> GetOnlyDictionaryAttributePrefix { get; }
+
+        [HtmlAttributeName("invalid-name7")]
+        public IDictionary<string, object> GetOnlyDictionaryPropertyWithAttributeName { get; }
+    }
+
+    public class DictionarySubclass : Dictionary<string, string>
+    {
+    }
+
+    public class DictionaryWithoutParameterlessConstructor : Dictionary<string, string>
+    {
+        public DictionaryWithoutParameterlessConstructor(int count)
+            : base()
+        {
+        }
+    }
+
+    public class DictionaryOfIntSubclass : Dictionary<int, string>
+    {
+    }
+
+    public class GenericDictionarySubclass<TValue> : Dictionary<string, TValue>
+    {
+    }
+
+    [OutputElementHint("strong")]
+    public class OutputElementHintTagHelper : TagHelper
+    {
+    }
+
+    [HtmlTargetElement("a")]
+    [HtmlTargetElement("p")]
+    [OutputElementHint("div")]
+    public class MultipleDescriptorTagHelperWithOutputElementHint : TagHelper
+    {
+    }
+
+    public class NonPublicAccessorTagHelper : TagHelper
+    {
+        public string ValidAttribute { get; set; }
+        public string InvalidPrivateSetAttribute { get; private set; }
+        public string InvalidPrivateGetAttribute { private get; set; }
+        protected string InvalidProtectedAttribute { get; set; }
+        internal string InvalidInternalAttribute { get; set; }
+        protected internal string InvalidProtectedInternalAttribute { get; set; }
+    }
+
+    public class SingleAttributeTagHelper : TagHelper
+    {
+        public int IntAttribute { get; set; }
+    }
+
+    public class MissingAccessorTagHelper : TagHelper
+    {
+        public string ValidAttribute { get; set; }
+        public string InvalidNoGetAttribute { set { } }
+        public string InvalidNoSetAttribute { get { return string.Empty; } }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperTypeVisitorTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperTypeVisitorTest.cs
new file mode 100644
index 0000000000..77a85be01a
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/TagHelperTypeVisitorTest.cs
@@ -0,0 +1,118 @@
+// 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 Microsoft.AspNetCore.Razor.TagHelpers;
+using System.Collections.Generic;
+using Xunit;
+using System.Reflection;
+
+namespace Microsoft.CodeAnalysis.Razor.Workspaces
+{
+    public class TagHelperTypeVisitorTest
+    {
+        private static readonly Assembly _assembly = typeof(TagHelperTypeVisitorTest).GetTypeInfo().Assembly;
+
+        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+
+        private static INamedTypeSymbol ITagHelperSymbol { get; } = Compilation.GetTypeByMetadataName(TagHelperTypes.ITagHelper);
+
+        [Fact]
+        public void IsTagHelper_PlainTagHelper_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new TagHelperTypeVisitor(ITagHelperSymbol, new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_PlainTagHelper).FullName);
+
+            // Act
+            var isTagHelper = testVisitor.IsTagHelper(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isTagHelper);
+        }
+
+        [Fact]
+        public void IsTagHelper_InheritedTagHelper_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new TagHelperTypeVisitor(ITagHelperSymbol, new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_InheritedTagHelper).FullName);
+
+            // Act
+            var isTagHelper = testVisitor.IsTagHelper(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isTagHelper);
+        }
+
+        [Fact]
+        public void IsTagHelper_AbstractTagHelper_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new TagHelperTypeVisitor(ITagHelperSymbol, new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_AbstractTagHelper).FullName);
+
+            // Act
+            var isTagHelper = testVisitor.IsTagHelper(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isTagHelper);
+        }
+
+        [Fact]
+        public void IsTagHelper_GenericTagHelper_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new TagHelperTypeVisitor(ITagHelperSymbol, new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_GenericTagHelper<>).FullName);
+
+            // Act
+            var isTagHelper = testVisitor.IsTagHelper(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isTagHelper);
+        }
+
+        [Fact]
+        public void IsTagHelper_InternalTagHelper_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new TagHelperTypeVisitor(ITagHelperSymbol, new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InternalTagHelper).FullName);
+
+            // Act
+            var isTagHelper = testVisitor.IsTagHelper(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isTagHelper);
+        }
+
+        public class Invalid_NestedPublicTagHelper : TagHelper
+        {
+        }
+
+        public class Valid_NestedPublicViewComponent
+        {
+            public string Invoke(string foo) => null;
+        }
+    }
+
+    public abstract class Invalid_AbstractTagHelper : TagHelper
+    {
+    }
+
+    public class Invalid_GenericTagHelper<T> : TagHelper
+    {
+    }
+
+    internal class Invalid_InternalTagHelper : TagHelper
+    {
+    }
+
+    public class Valid_PlainTagHelper : TagHelper
+    {
+    }
+
+    public class Valid_InheritedTagHelper : Valid_PlainTagHelper
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/xunit.runner.json b/src/Razor/Microsoft.CodeAnalysis.Razor/test/xunit.runner.json
new file mode 100644
index 0000000000..c04bb61fe6
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs
new file mode 100644
index 0000000000..79694479a4
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs
@@ -0,0 +1,274 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Pipes;
+using System.Threading;
+using Microsoft.AspNetCore.Razor.Tools;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public abstract class DotNetToolTask : ToolTask
+    {
+        // From https://github.com/dotnet/corefx/blob/29cd6a0b0ac2993cee23ebaf36ca3d4bce6dd75f/src/System.IO.Pipes/ref/System.IO.Pipes.cs#L93.
+        // Using the enum value directly as this option is not available in netstandard.
+        private const PipeOptions PipeOptionCurrentUserOnly = (PipeOptions)536870912;
+
+        private CancellationTokenSource _razorServerCts;
+
+        public bool Debug { get; set; }
+
+        public bool DebugTool { get; set; }
+
+        [Required]
+        public string ToolAssembly { get; set; }
+
+        public bool UseServer { get; set; }
+
+        // Specifies whether we should fallback to in-process execution if server execution fails.
+        public bool ForceServer { get; set; }
+
+        // Specifies whether server execution is allowed when PipeOptions.CurrentUserOnly is not available.
+        // For testing purposes only.
+        public bool SuppressCurrentUserOnlyPipeOptions { get; set; }
+
+        public string PipeName { get; set; }
+
+        protected override string ToolName => "dotnet";
+
+        // If we're debugging then make all of the stdout gets logged in MSBuild
+        protected override MessageImportance StandardOutputLoggingImportance => DebugTool ? MessageImportance.High : base.StandardOutputLoggingImportance;
+
+        protected override MessageImportance StandardErrorLoggingImportance => MessageImportance.High;
+
+        internal abstract string Command { get; }
+
+        protected override string GenerateFullPathToTool()
+        {
+#if NETSTANDARD2_0
+            if (!string.IsNullOrEmpty(DotNetMuxer.MuxerPath))
+            {
+                return DotNetMuxer.MuxerPath;
+            }
+#endif
+
+            // use PATH to find dotnet
+            return ToolExe;
+        }
+
+        protected override string GenerateCommandLineCommands()
+        {
+            return $"exec \"{ToolAssembly}\"" + (DebugTool ? " --debug" : "");
+        }
+
+        protected override string GetResponseFileSwitch(string responseFilePath)
+        {
+            return "@\"" + responseFilePath + "\"";
+        }
+
+        protected abstract override string GenerateResponseFileCommands();
+
+        public override bool Execute()
+        {
+            if (Debug)
+            {
+                Log.LogMessage(MessageImportance.High, "Waiting for debugger in pid: {0}", Process.GetCurrentProcess().Id);
+                while (!Debugger.IsAttached)
+                {
+                    Thread.Sleep(TimeSpan.FromSeconds(3));
+                }
+            }
+
+            return base.Execute();
+        }
+
+        protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
+        {
+            if (UseServer &&
+                TryExecuteOnServer(pathToTool, responseFileCommands, commandLineCommands, out var result))
+            {
+                return result;
+            }
+
+            return base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands);
+        }
+
+        protected override void LogToolCommand(string message)
+        {
+            if (Debug)
+            {
+                Log.LogMessage(MessageImportance.High, message);
+            }
+            else
+            {
+                base.LogToolCommand(message);
+            }
+        }
+
+        public override void Cancel()
+        {
+            base.Cancel();
+
+            _razorServerCts?.Cancel();
+        }
+
+        protected virtual bool TryExecuteOnServer(
+            string pathToTool,
+            string responseFileCommands,
+            string commandLineCommands,
+            out int result)
+        {
+#if !NETFRAMEWORK
+            if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
+            {
+                // For security reasons, we don't want to spin up a server that doesn't
+                // restrict requests only to the current user.
+                result = -1;
+
+                return ForceServer;
+            }
+#endif
+
+            Log.LogMessage(StandardOutputLoggingImportance, "Server execution started.");
+            using (_razorServerCts = new CancellationTokenSource())
+            {
+                Log.LogMessage(StandardOutputLoggingImportance, $"CommandLine = '{commandLineCommands}'");
+                Log.LogMessage(StandardOutputLoggingImportance, $"ServerResponseFile = '{responseFileCommands}'");
+
+                // The server contains the tools for discovering tag helpers and generating Razor code.
+                var clientDir = Path.GetFullPath(Path.GetDirectoryName(ToolAssembly));
+                var workingDir = CurrentDirectoryToUse();
+                var tempDir = ServerConnection.GetTempPath(workingDir);
+                var serverPaths = new ServerPaths(
+                    clientDir,
+                    workingDir: workingDir,
+                    tempDir: tempDir);
+
+                var arguments = GetArguments(responseFileCommands);
+
+                var responseTask = ServerConnection.RunOnServer(PipeName, arguments, serverPaths, _razorServerCts.Token, debug: DebugTool);
+                responseTask.Wait(_razorServerCts.Token);
+
+                var response = responseTask.Result;
+                if (response.Type == ServerResponse.ResponseType.Completed &&
+                    response is CompletedServerResponse completedResponse)
+                {
+                    result = completedResponse.ReturnCode;
+
+                    if (result == 0)
+                    {
+                        // Server execution succeeded.
+                        Log.LogMessage(StandardOutputLoggingImportance, $"Server execution completed with return code {result}.");
+                        return true;
+                    }
+                    else if (result == 2)
+                    {
+                        // Server execution completed with a legit error. No need to fallback to cli execution.
+                        Log.LogMessage(StandardOutputLoggingImportance, $"Server execution completed with return code {result}. For more info, check the server log file in the location specified by the RAZORBUILDSERVER_LOG environment variable.");
+
+                        if (LogStandardErrorAsError)
+                        {
+                            LogErrors(completedResponse.ErrorOutput);
+                        }
+                        else
+                        {
+                            LogMessages(completedResponse.ErrorOutput, StandardErrorLoggingImportance);
+                        }
+
+                        return true;
+                    }
+                    else
+                    {
+                        // Server execution completed with an error but we still want to fallback to cli execution.
+                        Log.LogMessage(StandardOutputLoggingImportance, $"Server execution completed with return code {result}. For more info, check the server log file in the location specified by the RAZORBUILDSERVER_LOG environment variable.");
+                    }
+                }
+                else
+                {
+                    // Server execution failed. Fallback to cli execution.
+                    Log.LogMessage(
+                        StandardOutputLoggingImportance,
+                        $"Server execution failed with response {response.Type}. For more info, check the server log file in the location specified by the RAZORBUILDSERVER_LOG environment variable.");
+
+                    result = -1;
+                }
+
+                if (ForceServer)
+                {
+                    // We don't want to fallback to in-process execution.
+                    return true;
+                }
+
+                Log.LogMessage(StandardOutputLoggingImportance, "Fallback to in-process execution.");
+            }
+
+            return false;
+        }
+
+        private void LogMessages(string output, MessageImportance messageImportance)
+        {
+            var lines = output.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var line in lines)
+            {
+                if (!string.IsNullOrWhiteSpace(line))
+                {
+                    var trimmedMessage = line.Trim();
+                    Log.LogMessageFromText(trimmedMessage, messageImportance);
+                }
+            }
+        }
+
+        private void LogErrors(string output)
+        {
+            var lines = output.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var line in lines)
+            {
+                if (!string.IsNullOrWhiteSpace(line))
+                {
+                    var trimmedMessage = line.Trim();
+                    Log.LogError(trimmedMessage);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the current directory that the compiler should run in.
+        /// </summary>
+        private string CurrentDirectoryToUse()
+        {
+            // ToolTask has a method for this. But it may return null. Use the process directory
+            // if ToolTask didn't override. MSBuild uses the process directory.
+            var workingDirectory = GetWorkingDirectory();
+            if (string.IsNullOrEmpty(workingDirectory))
+            {
+                workingDirectory = Directory.GetCurrentDirectory();
+            }
+            return workingDirectory;
+        }
+
+        private IList<string> GetArguments(string responseFileCommands)
+        {
+            var list = responseFileCommands.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            return list;
+        }
+
+        protected override bool HandleTaskExecutionErrors()
+        {
+            if (!HasLoggedErrors)
+            {
+                var toolCommand = Path.GetFileNameWithoutExtension(ToolAssembly) + " " + Command;
+                // Show a slightly better error than the standard ToolTask message that says "dotnet" failed.
+                Log.LogError($"{toolCommand} exited with code {ExitCode}.");
+                return false;
+            }
+
+            return base.HandleTaskExecutionErrors();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
new file mode 100644
index 0000000000..6f6d4be734
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -0,0 +1,96 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
+    <TargetFrameworks>netcoreapp3.0;netstandard2.0;net46</TargetFrameworks>
+
+    <TargetName>Microsoft.NET.Sdk.Razor.Tasks</TargetName>
+    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+    <Serviceable>true</Serviceable>
+    <SdkOutputPath>bin\$(Configuration)\sdk-output\</SdkOutputPath>
+    <!-- Do not disable ApiCheck. We need to be aware of when we make changes to the Tasks sicne they need to be backwards compatible. -->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netstandard2.0'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Tools\ServerProtocol\*.cs">
+      <Link>Shared\ServerProtocol\%(FileName)</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Tools\PipeName.cs">
+      <Link>Shared\PipeName.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Tools\MutexName.cs">
+      <Link>Shared\MutexName.cs</Link>
+    </Compile>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Tools\Client.cs">
+      <Link>Shared\Client.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <Target Name="LayoutDependencies" BeforeTargets="Build" Condition="'$(IsInnerBuild)' != 'true'">
+    <!-- Layout tasks, compiler, and extensions in the sdk-output folder. The entire folder structure gets packaged as-is into the SDK -->
+    <MSBuild
+      Projects="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj"
+      Properties="PublishDir=$(MSBuildProjectDirectory)\$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
+      Targets="Publish" />
+
+    <ItemGroup>
+      <MvcRazorExtenionOutput Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" />
+
+    <ItemGroup>
+      <ProjectOutput Include="..\Microsoft.NET.Sdk.Razor\bin\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="..\Microsoft.NET.Sdk.Razor\bin\$(Configuration)\netstandard2.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" />
+  </Target>
+
+  <ItemGroup>
+    <SignedPackageFile Include="$(SdkOutputPath)tasks\net46\$(TargetName).dll" Certificate="$(AssemblySigningCertName)"  />
+    <SignedPackageFile Include="$(SdkOutputPath)tasks\netstandard2.0\$(TargetName).dll" Certificate="$(AssemblySigningCertName)"  />
+    <SignedPackageFile Include="$(SdkOutputPath)extensions\**\*.dll" Certificate="$(AssemblySigningCertName)"  />
+
+    <SignedPackageFile Include="$(SdkOutputPath)tools\netcoreapp3.0\rzc.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="$(SdkOutputPath)tools\netcoreapp3.0\Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
+
+    <!-- Binaries that should be signed by corefx/roslyn -->
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.dll" />
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.CSharp.dll" />
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
+  </ItemGroup>
+
+  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="LayoutDependencies">
+
+    <PropertyGroup>
+      <!-- Make sure we create a symbols.nupkg -->
+      <IncludeSymbols>true</IncludeSymbols>
+      <NuspecProperties>
+        id=$(MSBuildProjectName);
+        version=$(PackageVersion);
+        authors=$(Authors);
+        licenseUrl=$(PackageLicenseUrl);
+        projectUrl=$(PackageProjectUrl);
+        iconUrl=$(PackageIconUrl);
+        copyright=$(Copyright);
+        description=$(Description);
+        tags=$([MSBuild]::Escape($(PackageTags)));
+        serviceable=$(Serviceable);
+        repositoryUrl=$(RepositoryUrl);
+        repositoryCommit=$(RepositoryCommit);
+        targetframework=$(TargetFramework);
+        outputpath=$(OutputPath)\sdk-output;
+      </NuspecProperties>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
new file mode 100644
index 0000000000..8593fba340
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <iconUrl>$iconUrl$</iconUrl>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>$tags$</tags>
+    <serviceable>$serviceable$</serviceable>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+  </metadata>
+
+  <files>
+    <file src="Sdk\*" target="Sdk" />
+    <file src="build\**" target="build" />
+    <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
+
+    <file src="$outputpath$\**" target="\" />
+  </files>
+</package>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
new file mode 100644
index 0000000000..61246c8484
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
@@ -0,0 +1,155 @@
+// 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.IO;
+using System.Text;
+using Microsoft.Build.Framework;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class RazorGenerate : DotNetToolTask
+    {
+        private static readonly string[] SourceRequiredMetadata = new string[]
+        {
+            FullPath,
+            GeneratedOutput,
+            TargetPath,
+        };
+
+        private const string GeneratedOutput = "GeneratedOutput";
+        private const string DocumentKind = "DocumentKind";
+        private const string TargetPath = "TargetPath";
+        private const string FullPath = "FullPath";
+        private const string Identity = "Identity";
+        private const string AssemblyName = "AssemblyName";
+        private const string AssemblyFilePath = "AssemblyFilePath";
+
+        [Required]
+        public string Version { get; set; }
+
+        [Required]
+        public ITaskItem[] Configuration { get; set; }
+
+        [Required]
+        public ITaskItem[] Extensions { get;  set; }
+
+        [Required]
+        public ITaskItem[] Sources { get; set; }
+
+        [Required]
+        public string ProjectRoot { get; set; }
+
+        [Required]
+        public string TagHelperManifest { get; set; }
+
+        public bool GenerateDeclaration { get; set; }
+
+        internal override string Command => "generate";
+
+        protected override bool ValidateParameters()
+        {
+            if (!Directory.Exists(ProjectRoot))
+            {
+                Log.LogError("The specified project root directory {0} doesn't exist.", ProjectRoot);
+                return false;
+            }
+
+            if (Configuration.Length == 0)
+            {
+                Log.LogError("The project {0} must provide a value for {1}.", ProjectRoot, nameof(Configuration));
+                return false;
+            }
+
+            for (var i = 0; i < Sources.Length; i++)
+            {
+                if (!EnsureRequiredMetadata(Sources[i], FullPath) ||
+                    !EnsureRequiredMetadata(Sources[i], GeneratedOutput) ||
+                    !EnsureRequiredMetadata(Sources[i], TargetPath))
+                {
+                    Log.LogError("The Razor source item '{0}' is missing a required metadata entry. Required metadata are: '{1}'", Sources[i], SourceRequiredMetadata);
+                    return false;
+                }
+            }
+
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                if (!EnsureRequiredMetadata(Extensions[i], Identity) ||
+                    !EnsureRequiredMetadata(Extensions[i], AssemblyName) ||
+                    !EnsureRequiredMetadata(Extensions[i], AssemblyFilePath))
+                {
+                    return false;
+                }
+            }
+
+            return base.ValidateParameters();
+        }
+
+        protected override string GenerateResponseFileCommands()
+        {
+            var builder = new StringBuilder();
+
+            builder.AppendLine(Command);
+
+            for (var i = 0; i < Sources.Length; i++)
+            {
+                var input = Sources[i];
+                builder.AppendLine("-s");
+                builder.AppendLine(input.GetMetadata(FullPath));
+
+                builder.AppendLine("-r");
+                builder.AppendLine(input.GetMetadata(TargetPath));
+
+                builder.AppendLine("-o");
+                var outputPath = Path.Combine(ProjectRoot, input.GetMetadata(GeneratedOutput));
+                builder.AppendLine(outputPath);
+
+                var kind = input.GetMetadata(DocumentKind);
+                if (!string.IsNullOrEmpty(kind))
+                {
+                    builder.AppendLine("-k");
+                    builder.AppendLine(kind);
+                }
+            }
+
+            builder.AppendLine("-p");
+            builder.AppendLine(ProjectRoot);
+
+            builder.AppendLine("-t");
+            builder.AppendLine(TagHelperManifest);
+
+            builder.AppendLine("-v");
+            builder.AppendLine(Version);
+
+            builder.AppendLine("-c");
+            builder.AppendLine(Configuration[0].GetMetadata(Identity));
+
+            if (GenerateDeclaration)
+            {
+                builder.AppendLine("--generate-declaration");
+            }
+
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                builder.AppendLine("-n");
+                builder.AppendLine(Extensions[i].GetMetadata(Identity));
+
+                builder.AppendLine("-e");
+                builder.AppendLine(Path.GetFullPath(Extensions[i].GetMetadata(AssemblyFilePath)));
+            }
+
+            return builder.ToString();
+        }
+
+        private bool EnsureRequiredMetadata(ITaskItem item, string metadataName)
+        {
+            var value = item.GetMetadata(metadataName);
+            if (string.IsNullOrEmpty(value))
+            {
+                Log.LogError($"Missing required metadata '{metadataName}' for '{item.ItemSpec}.");
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorTagHelper.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorTagHelper.cs
new file mode 100644
index 0000000000..9d764761b1
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorTagHelper.cs
@@ -0,0 +1,133 @@
+// 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.IO;
+using System.Text;
+using Microsoft.Build.Framework;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class RazorTagHelper : DotNetToolTask
+    {
+        private const string Identity = "Identity";
+        private const string AssemblyName = "AssemblyName";
+        private const string AssemblyFilePath = "AssemblyFilePath";
+
+        [Required]
+        public string Version { get; set; }
+
+        [Required]
+        public ITaskItem[] Configuration { get; set; }
+
+        [Required]
+        public ITaskItem[] Extensions { get; set; }
+
+        [Required]
+        public string[] Assemblies { get; set; }
+
+        [Output]
+        [Required]
+        public string TagHelperManifest { get; set; }
+
+        public string ProjectRoot { get; set; }
+
+        internal override string Command => "discover";
+
+        protected override bool SkipTaskExecution()
+        {
+            if (Assemblies.Length == 0)
+            {
+                // If for some reason there are no assemblies, we have nothing to do. Let's just
+                // skip running the tool.
+                File.WriteAllText(TagHelperManifest, "{ }");
+                return true;
+            }
+
+            return false;
+        }
+
+        protected override bool ValidateParameters()
+        {
+            if (!Directory.Exists(ProjectRoot))
+            {
+                Log.LogError("The specified project root directory {0} doesn't exist.", ProjectRoot);
+                return false;
+            }
+
+            if (Configuration.Length == 0)
+            {
+                Log.LogError("The project {0} must provide a value for {1}.", ProjectRoot, nameof(Configuration));
+                return false;
+            }
+
+            for (var i = 0; i < Assemblies.Length; i++)
+            {
+                if (!Path.IsPathRooted(Assemblies[i]))
+                {
+                    Log.LogError("The assembly path {0} is invalid. Assembly paths must be rooted.", Assemblies[i]);
+                    return false;
+                }
+            }
+
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                if (!EnsureRequiredMetadata(Extensions[i], Identity) ||
+                    !EnsureRequiredMetadata(Extensions[i], AssemblyName) ||
+                    !EnsureRequiredMetadata(Extensions[i], AssemblyFilePath))
+                {
+                    return false;
+                }
+            }
+
+            return base.ValidateParameters();
+        }
+
+        protected override string GenerateResponseFileCommands()
+        {
+            var builder = new StringBuilder();
+
+            builder.AppendLine(Command);
+
+            for (var i = 0; i < Assemblies.Length; i++)
+            {
+                builder.AppendLine(Assemblies[i]);
+            }
+
+            builder.AppendLine("-o");
+            builder.AppendLine(TagHelperManifest);
+
+            builder.AppendLine("-p");
+            builder.AppendLine(ProjectRoot);
+
+            builder.AppendLine("-v");
+            builder.AppendLine(Version);
+
+            builder.AppendLine("-c");
+            builder.AppendLine(Configuration[0].GetMetadata(Identity));
+
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                builder.AppendLine("-n");
+                builder.AppendLine(Extensions[i].GetMetadata(Identity));
+
+                builder.AppendLine("-e");
+                builder.AppendLine(Path.GetFullPath(Extensions[i].GetMetadata(AssemblyFilePath)));
+            }
+
+            return builder.ToString();
+        }
+
+        private bool EnsureRequiredMetadata(ITaskItem item, string metadataName)
+        {
+            var value = item.GetMetadata(metadataName);
+            if (string.IsNullOrEmpty(value))
+            {
+                Log.LogError($"Missing required metadata '{metadataName}' for '{item.ItemSpec}.");
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.props
new file mode 100644
index 0000000000..9102f6c805
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.props
@@ -0,0 +1,25 @@
+<!--
+***********************************************************************************************
+Sdk.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <PropertyGroup>
+    <!-- Determines if the Razor Sdk is responsible for importing Microsoft.NET.Sdk. Microsoft.NET.Sdk.Web may have previously imported this. -->
+    <_RazorSdkImportsMicrosoftNetSdk Condition="'$(UsingMicrosoftNETSdk)' != 'true'">true</_RazorSdkImportsMicrosoftNetSdk>
+  </PropertyGroup>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" Condition="'$(_RazorSdkImportsMicrosoftNetSdk)' == 'true'" />
+
+  <PropertyGroup>
+    <RazorSdkCurrentVersionProps Condition="'$(RazorSdkCurrentVersionProps)' == ''">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+  </PropertyGroup>
+
+  <Import Project="$(RazorSdkCurrentVersionProps)" />
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.targets
new file mode 100644
index 0000000000..20b70fd9ab
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.targets
@@ -0,0 +1,23 @@
+<!--
+***********************************************************************************************
+Sdk.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" Condition="'$(_RazorSdkImportsMicrosoftNetSdk)' == 'true'" />
+
+  <PropertyGroup Condition="'$(RazorSdkCurrentVersionTargets)' == ''">
+    <RazorSdkCurrentVersionTargets Condition="'$(IsCrossTargetingBuild)' == 'true'">$(MSBuildThisFileDirectory)..\buildMultiTargeting\Sdk.Razor.CurrentVersion.MultiTargeting.targets</RazorSdkCurrentVersionTargets>
+    <RazorSdkCurrentVersionTargets Condition="'$(IsCrossTargetingBuild)' != 'true'">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
+  </PropertyGroup>
+
+  <Import Project="$(RazorSdkCurrentVersionTargets)" />
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netcore.json b/src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netcore.json
new file mode 100644
index 0000000000..0443192d45
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netcore.json
@@ -0,0 +1,762 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Razor.Tasks, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.Build.Utilities.ToolTask",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.Build.Framework.ITask",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Cancel",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.Build.Framework.ICancelableTask",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Debug",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Debug",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DebugTool",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DebugTool",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ToolAssembly",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ToolAssembly",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UseServer",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UseServer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ForceServer",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ForceServer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressCurrentUserOnlyPipeOptions",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressCurrentUserOnlyPipeOptions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PipeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PipeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ToolName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StandardOutputLoggingImportance",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.MessageImportance",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StandardErrorLoggingImportance",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.MessageImportance",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateFullPathToTool",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCommandLineCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetResponseFileSwitch",
+          "Parameters": [
+            {
+              "Name": "responseFilePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateResponseFileCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteTool",
+          "Parameters": [
+            {
+              "Name": "pathToTool",
+              "Type": "System.String"
+            },
+            {
+              "Name": "responseFileCommands",
+              "Type": "System.String"
+            },
+            {
+              "Name": "commandLineCommands",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LogToolCommand",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryExecuteOnServer",
+          "Parameters": [
+            {
+              "Name": "pathToTool",
+              "Type": "System.String"
+            },
+            {
+              "Name": "responseFileCommands",
+              "Type": "System.String"
+            },
+            {
+              "Name": "commandLineCommands",
+              "Type": "System.String"
+            },
+            {
+              "Name": "result",
+              "Type": "System.Int32",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "HandleTaskExecutionErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tasks.RazorGenerate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Version",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Configuration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extensions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Extensions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Sources",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Sources",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectRoot",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ProjectRoot",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelperManifest",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelperManifest",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidateParameters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateResponseFileCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tasks.RazorTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Version",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Configuration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extensions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Extensions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Assemblies",
+          "Parameters": [],
+          "ReturnType": "System.String[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Assemblies",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelperManifest",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelperManifest",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectRoot",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ProjectRoot",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SkipTaskExecution",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidateParameters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateResponseFileCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tools.RequestArgument+ArgumentId",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "CurrentDirectory",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294433"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CommandLineArgument",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294434"
+        },
+        {
+          "Kind": "Field",
+          "Name": "KeepAlive",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294435"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Shutdown",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294436"
+        },
+        {
+          "Kind": "Field",
+          "Name": "TempDirectory",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294437"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tools.ServerResponse+ResponseType",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "MismatchedVersion",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Completed",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Shutdown",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Rejected",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netframework.json b/src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netframework.json
new file mode 100644
index 0000000000..4cec036ca8
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/baseline.netframework.json
@@ -0,0 +1,762 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Razor.Tasks, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.Build.Utilities.ToolTask",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Debug",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Debug",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DebugTool",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DebugTool",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ToolAssembly",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ToolAssembly",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UseServer",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UseServer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ForceServer",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ForceServer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressCurrentUserOnlyPipeOptions",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressCurrentUserOnlyPipeOptions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PipeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PipeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ToolName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StandardOutputLoggingImportance",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.MessageImportance",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StandardErrorLoggingImportance",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.MessageImportance",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateFullPathToTool",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCommandLineCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetResponseFileSwitch",
+          "Parameters": [
+            {
+              "Name": "responseFilePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateResponseFileCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.Build.Framework.ITask",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteTool",
+          "Parameters": [
+            {
+              "Name": "pathToTool",
+              "Type": "System.String"
+            },
+            {
+              "Name": "responseFileCommands",
+              "Type": "System.String"
+            },
+            {
+              "Name": "commandLineCommands",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LogToolCommand",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Cancel",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.Build.Framework.ICancelableTask",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryExecuteOnServer",
+          "Parameters": [
+            {
+              "Name": "pathToTool",
+              "Type": "System.String"
+            },
+            {
+              "Name": "responseFileCommands",
+              "Type": "System.String"
+            },
+            {
+              "Name": "commandLineCommands",
+              "Type": "System.String"
+            },
+            {
+              "Name": "result",
+              "Type": "System.Int32",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "HandleTaskExecutionErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tasks.RazorGenerate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Version",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Configuration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extensions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Extensions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Sources",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Sources",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectRoot",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ProjectRoot",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelperManifest",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelperManifest",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidateParameters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateResponseFileCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tasks.RazorTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Version",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Configuration",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Configuration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Extensions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Build.Framework.ITaskItem[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Extensions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Build.Framework.ITaskItem[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Assemblies",
+          "Parameters": [],
+          "ReturnType": "System.String[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Assemblies",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelperManifest",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelperManifest",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ProjectRoot",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ProjectRoot",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SkipTaskExecution",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidateParameters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateResponseFileCommands",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tools.RequestArgument+ArgumentId",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "CurrentDirectory",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294433"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CommandLineArgument",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294434"
+        },
+        {
+          "Kind": "Field",
+          "Name": "KeepAlive",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294435"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Shutdown",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294436"
+        },
+        {
+          "Kind": "Field",
+          "Name": "TempDirectory",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1360294437"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Tools.ServerResponse+ResponseType",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "MismatchedVersion",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Completed",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Shutdown",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Rejected",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
new file mode 100644
index 0000000000..72d170a7d2
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -0,0 +1,180 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.CodeGeneration
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+  <!--
+    Targets used for Razor SDK code generation. Support for the RazorCoreGenerate target.
+    This target is explicitly imported by Razor SDK.
+  -->
+
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.RazorGenerate"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.RazorTagHelper"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
+  <!--
+    Consider these properties to be private to this targets file. The main Razor SDK should define all of the properties
+    that we use to pass data back and forth.
+  -->
+  <PropertyGroup>
+    <!-- Used for tag helper discovery -->
+    <_RazorTagHelperInputCache>$(IntermediateOutputPath)$(TargetName).TagHelpers.input.cache</_RazorTagHelperInputCache>
+    <_RazorTagHelperOutputCache>$(IntermediateOutputPath)$(TargetName).TagHelpers.output.cache</_RazorTagHelperOutputCache>
+
+    <!-- Used to hash file inputs for RazorGenerate -->
+    <_RazorGenerateInputsHash></_RazorGenerateInputsHash>
+    <_RazorGenerateInputsHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateInputsHashFile>
+
+    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.0\rzc.dll</_RazorToolAssembly>
+  </PropertyGroup>
+
+  <!--
+    This target will only be called when we have some .cshtml files that are going to participate in code generation.
+
+    This is part of the chain of targets that are called once we've actually committed to generating code.
+  -->
+  <Target
+    Name="_HashRazorGenerateInputs"
+    Condition="'@(RazorGenerateWithTargetPath)' != ''">
+
+    <Hash ItemsToHash="@(RazorGenerateWithTargetPath)">
+      <Output TaskParameter="HashResult" PropertyName="_RazorGenerateInputsHash" />
+    </Hash>
+
+    <MakeDir
+      Directories="$(IntermediateOutputPath)"
+      Condition="!Exists('$(IntermediateOutputPath)')" />
+
+    <WriteLinesToFile
+      Lines="$(_RazorGenerateInputsHash)"
+      File="$(_RazorGenerateInputsHashFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorGenerateInputsHashFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Target
+    Name="_RazorEnsureCompiled"
+    Condition="!Exists('$(_RazorGenerateTargetReferenceAssembly)')"
+    DependsOnTargets="Compile" />
+
+  <Target
+    Name="ResolveTagHelperRazorGenerateInputs"
+    Inputs="$(MSBuildAllProjects);@(RazorReferencePath);$(_RazorGenerateTargetReferenceAssembly)"
+    DependsOnTargets="_RazorEnsureCompiled"
+    Outputs="$(_RazorTagHelperInputCache)"
+    Condition="'@(RazorGenerateWithTargetPath)' != ''">
+
+    <!--
+      We're manipulating our output directly here because we want to separate the actual up-to-date check
+      of RazorCoreGenerate from the output of this target. Many times the set of tag helpers doesn't change
+      so we don't need to regenerate the code.
+      -->
+    <Touch
+      Files="$(_RazorTagHelperInputCache)"
+      AlwaysCreate="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorTagHelperInputCache)" />
+    </ItemGroup>
+
+    <RazorTagHelper
+      Debug="$(_RazorDebugTagHelperTask)"
+      DebugTool="$(_RazorDebugTagHelperTool)"
+      ToolAssembly="$(_RazorToolAssembly)"
+      UseServer="$(UseRazorBuildServer)"
+      ForceServer="$(_RazorForceBuildServer)"
+      PipeName="$(_RazorBuildServerPipeName)"
+      Version="$(RazorLangVersion)"
+      Configuration="@(ResolvedRazorConfiguration)"
+      Extensions="@(ResolvedRazorExtension)"
+      Assemblies="@(RazorReferencePath);$(_RazorGenerateTargetReferenceAssembly)"
+      ProjectRoot="$(MSBuildProjectDirectory)"
+      TagHelperManifest="$(_RazorTagHelperOutputCache)">
+      <Output
+        TaskParameter="TagHelperManifest"
+        ItemName="FileWrites"/>
+    </RazorTagHelper>
+  </Target>
+
+  <Target Name="_ResolveRazorGenerateOutputs" Condition="'@(RazorGenerateWithTargetPath)' != ''">
+    <Error
+      Text="RazorGenerateWithTargetPath item '%(RazorGenerateWithTargetPath.Identity)' does not specify required metadata 'GeneratedOutput'."
+      Condition="'%(RazorGenerateWithTargetPath.GeneratedOutput)' == ''" />
+
+    <ItemGroup>
+      <_RazorGenerateOutput Include="%(RazorGenerateWithTargetPath.GeneratedOutput)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <RazorCoreGenerateDependsOn>
+      _HashRazorGenerateInputs;
+      _ResolveRazorGenerateOutputs;
+    </RazorCoreGenerateDependsOn>
+  </PropertyGroup>
+
+  <Target
+    Name="RazorCoreGenerate"
+    DependsOnTargets="$(RazorCoreGenerateDependsOn)"
+    Inputs="$(MSBuildAllProjects);$(_RazorGenerateInputsHashFile);$(_RazorTagHelperOutputCache);@(RazorGenerateWithTargetPath)"
+    Outputs="@(_RazorGenerateOutput)"
+    Condition="'@(RazorGenerateWithTargetPath)'!= ''">
+
+    <RemoveDir
+      Directories="$(RazorGenerateIntermediateOutputPath)"
+      Condition = "Exists('$(RazorGenerateIntermediateOutputPath)')"/>
+
+    <MakeDir
+      Directories="%(_RazorGenerateOutput.RelativeDir)"
+      Condition="!Exists('%(_RazorGenerateOutput.RelativeDir)')" />
+
+    <RazorGenerate
+      Debug="$(_RazorDebugGenerateCodeTask)"
+      DebugTool="$(_RazorDebugGenerateCodeTool)"
+      ToolAssembly="$(_RazorToolAssembly)"
+      UseServer="$(UseRazorBuildServer)"
+      ForceServer="$(_RazorForceBuildServer)"
+      PipeName="$(_RazorBuildServerPipeName)"
+      Version="$(RazorLangVersion)"
+      Configuration="@(ResolvedRazorConfiguration)"
+      Extensions="@(ResolvedRazorExtension)"
+      Sources="@(RazorGenerateWithTargetPath)"
+      ProjectRoot="$(MSBuildProjectDirectory)"
+      TagHelperManifest="$(_RazorTagHelperOutputCache)" />
+
+    <ItemGroup>
+      <FileWrites Include="@(_RazorGenerateOutput)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <ResolveRazorCompileInputsDependsOn>$(ResolveRazorCompileInputsDependsOn);_ResolveGeneratedRazorCompileInputs</ResolveRazorCompileInputsDependsOn>
+  </PropertyGroup>
+
+  <Target Name="_ResolveGeneratedRazorCompileInputs">
+    <ItemGroup>
+      <RazorCompile 
+        Include="%(RazorGenerateWithTargetPath.GeneratedOutput)" 
+        Condition="'%(RazorGenerateWithTargetPath.DocumentKind)'=='mvc'" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
new file mode 100644
index 0000000000..bf20970c29
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -0,0 +1,182 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.Compilation.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+  <!--
+  What follows in this file is based on:
+     https://github.com/dotnet/roslyn/blob/4d92b18aee99ba8b1b4770ce65133e9ca65a94fe/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
+
+  We need to keep this basically up to date, as well as track the set of modifications we've made. Try to keep the formatting
+  similar to the original to reduce noise. In general try to only deviate from the CoreCompile target when we need to for
+  correctness.
+
+  We also want to avoid doubling up on things that don't make a ton of sense in the Razor views assembly, like
+  embedded files and resources, these are already present in the application's assembly.
+
+  Changes:
+    Name="RazorCoreCompile"
+
+    Replace @(Compile) with @(RazorCompile)
+    Replace @(_DebugSymbolsIntermediatePath) with @(_RazorDebugSymbolsIntermediatePath)
+    Replace @(IntermediateAssembly) with @(RazorIntermediateAssembly)
+    Replace @(ReferencePathWithRefAssemblies) with @(RazorReferencePath)
+    Remove @(_CoreCompileResourceInputs) with @(_RazorCoreCompileResourceInputs)
+
+    Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll
+
+    Remove Returns="@(CscCommandLineArgs)"
+
+    Remove @(EmbeddedFiles)
+    Remove $(ApplicationIcon) $(Win32Resource) $(Win32Manifest)
+    Remove @(EmbeddedDocumentation) and @(EmbeddedFiles)
+    Remove @(CustomAdditionalCompileInputs) and @(CustomAdditionalCompileOutputs)
+    Remove @(DocFileItem)
+    Remove PdbFile="$(PdbFile)"
+    Remove OutputRefAssembly="@(IntermediateRefAssembly)"
+    Remove MainEntryPoint="$(StartupObject)"
+
+    Remove EmbedAllSources="$(EmbedAllSources)" - not supported by our supported version of MSBuild
+
+    Remove additional steps after calling CSC
+
+    Add our FileWrites after the call to CSC
+  -->
+ <Target Name="RazorCoreCompile"
+          Inputs="$(MSBuildAllProjects);
+                  @(RazorCompile);
+                  $(AssemblyOriginatorKeyFile);
+                  $(_RazorCompileTargetReferenceAssembly);
+                  @(RazorReferencePath);
+                  @(CompiledLicenseFile);
+                  @(LinkResource);
+                  $(ResolvedCodeAnalysisRuleSet);
+                  @(AdditionalFiles);
+                  @(_RazorCoreCompileResourceInputs)"
+          Outputs="@(RazorIntermediateAssembly);
+                   @(_RazorDebugSymbolsIntermediatePath);
+                   $(NonExistentFile)"
+          Condition="'@(RazorCompile)'!=''">
+    <!-- These two compiler warnings are raised when a reference is bound to a different version
+             than specified in the assembly reference version number.  MSBuild raises the same warning in this case,
+             so the compiler warning would be redundant. -->
+    <PropertyGroup Condition="('$(TargetFrameworkVersion)' != 'v1.0') and ('$(TargetFrameworkVersion)' != 'v1.1')">
+      <NoWarn>$(NoWarn);1701;1702</NoWarn>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <!-- To match historical behavior, when inside VS11+ disable the warning from csc.exe indicating that no sources were passed in-->
+      <NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' &gt; '10.0'">$(NoWarn);2008</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
+      <ReferencePathWithRefAssemblies>
+        <EmbedInteropTypes />
+      </ReferencePathWithRefAssemblies>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
+                 then we'll use AppConfig -->
+      <AppConfigForCompiler Condition="'$(AppConfigForCompiler)' == '' AND '$(UseAppConfigForCompiler)' == 'true'">$(AppConfig)</AppConfigForCompiler>
+    </PropertyGroup>
+
+    <!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
+    <PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
+      <Prefer32Bit>false</Prefer32Bit>
+    </PropertyGroup>
+
+    <!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
+         https://github.com/dotnet/roslyn/issues/12223 -->
+    <ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
+      <AdditionalFileItems Include="$(AdditionalFileItemNames)" />
+      <AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
+      <UseSharedCompilation>true</UseSharedCompilation>
+    </PropertyGroup>
+
+    <Csc
+         AdditionalLibPaths="$(AdditionalLibPaths)"
+         AddModules="@(AddModules)"
+         AdditionalFiles="@(AdditionalFiles)"
+         AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
+         Analyzers="@(Analyzer)"
+         ApplicationConfiguration="$(AppConfigForCompiler)"
+         BaseAddress="$(BaseAddress)"
+         CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
+         ChecksumAlgorithm="$(ChecksumAlgorithm)"
+         CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
+         CodePage="$(CodePage)"
+         DebugType="$(DebugType)"
+         DefineConstants="$(DefineConstants)"
+         DelaySign="$(DelaySign)"
+         DisabledWarnings="$(NoWarn)"
+         EmitDebugInformation="$(DebugSymbols)"
+         EnvironmentVariables="$(CscEnvironment)"
+         ErrorEndLocation="$(ErrorEndLocation)"
+         ErrorLog="$(ErrorLog)"
+         ErrorReport="$(ErrorReport)"
+         Features="$(Features)"
+         FileAlignment="$(FileAlignment)"
+         GenerateFullPaths="$(GenerateFullPaths)"
+         HighEntropyVA="$(HighEntropyVA)"
+         Instrument="$(Instrument)"
+         KeyContainer="$(KeyContainerName)"
+         KeyFile="$(KeyOriginatorFile)"
+         LangVersion="$(LangVersion)"
+         LinkResources="@(LinkResource)"
+         ModuleAssemblyName="$(ModuleAssemblyName)"
+         NoConfig="true"
+         NoLogo="$(NoLogo)"
+         NoStandardLib="$(NoCompilerStandardLib)"
+         NoWin32Manifest="$(NoWin32Manifest)"
+         Optimize="$(Optimize)"
+         Deterministic="$(Deterministic)"
+         PublicSign="$(PublicSign)"
+         OutputAssembly="@(RazorIntermediateAssembly)"
+         Platform="$(PlatformTarget)"
+         Prefer32Bit="$(Prefer32Bit)"
+         PreferredUILang="$(PreferredUILang)"
+         ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
+         References="@(RazorReferencePath);$(_RazorCompileTargetReferenceAssembly)"
+         ReportAnalyzer="$(ReportAnalyzer)"
+         Resources="@(_RazorCoreCompileResourceInputs);@(CompiledLicenseFile)"
+         ResponseFiles="$(CompilerResponseFile)"
+         RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
+         SharedCompilationId="$(SharedCompilationId)"
+         SkipCompilerExecution="$(SkipCompilerExecution)"
+         Sources="@(RazorCompile)"
+         SubsystemVersion="$(SubsystemVersion)"
+         TargetType="Library"
+         ToolExe="$(CscToolExe)"
+         ToolPath="$(CscToolPath)"
+         TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+         UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
+         UseSharedCompilation="$(UseSharedCompilation)"
+         Utf8Output="$(Utf8Output)"
+         VsSessionGuid="$(VsSessionGuid)"
+         WarningLevel="$(WarningLevel)"
+         WarningsAsErrors="$(WarningsAsErrors)"
+         WarningsNotAsErrors="$(WarningsNotAsErrors)"
+         PathMap="$(PathMap)"
+         SourceLink="$(SourceLink)">
+      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
+    </Csc>
+
+    <ItemGroup>
+      <FileWrites Include="@(_RazorIntermediateAssembly)" Condition="Exists('@(_RazorIntermediateAssembly)')" />
+      <FileWrites Include="@(_RazorDebugSymbolsIntermediatePath)" Condition="Exists('@(_RazorDebugSymbolsIntermediatePath)')" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
new file mode 100644
index 0000000000..15593fa737
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -0,0 +1,285 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.Component.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+
+  <PropertyGroup>
+    <!-- Used for tracking inputs to component generation -->
+    <_RazorComponentInputHash></_RazorComponentInputHash>
+    <_RazorComponentInputCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorComponent.input.cache</_RazorComponentInputCacheFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Path used for the temporary compilation we produce for component discovery -->
+    <_RazorComponentDeclarationAssembly Include="$(_RazorComponentDeclarationOutputPath)$(TargetName).dll" />
+  </ItemGroup>
+
+  <Target Name="_HashRazorComponentInputs" Condition="'@(RazorComponentWithTargetPath->Count())'!='0'">
+    <Hash ItemsToHash="@(RazorComponentWithTargetPath)">
+      <Output TaskParameter="HashResult" PropertyName="_RazorComponentInputHash" />
+    </Hash>
+
+    <MakeDir
+      Directories="$(IntermediateOutputPath)"
+      Condition="!Exists('$(IntermediateOutputPath)')" />
+
+    <WriteLinesToFile
+      Lines="$(_RazorComponentInputHash)"
+      File="$(_RazorComponentInputCacheFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorComponentInputCacheFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_ResolveRazorComponentOutputs" Condition="'@(RazorComponentWithTargetPath->Count())'!='0'">
+    <Error
+      Text="RazorComponentWithTargetPath item '%(RazorComponentWithTargetPath.Identity)' does not specify required metadata 'GeneratedDeclaration'."
+      Condition="'%(RazorComponentWithTargetPath.GeneratedDeclaration)' == ''" />
+
+    <ItemGroup>
+      <_RazorComponentDeclaration Include="%(RazorComponentWithTargetPath.GeneratedDeclaration)" />
+      <_RazorComponentDefinition Include="%(RazorComponentWithTargetPath.GeneratedOutput)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <RazorGenerateComponentDeclarationDependsOn>
+      _HashRazorComponentInputs;
+      _ResolveRazorComponentOutputs;
+    </RazorGenerateComponentDeclarationDependsOn>
+  </PropertyGroup>
+
+  <!--
+    Generates 'declaration' files for each component, that only have that class and member declarations.
+    These files participate in the design-time-build for intellisense, and are used at build-time
+    when discovering components for a 'real' build.
+  -->
+  <Target
+    Name="RazorGenerateComponentDeclaration"
+    DependsOnTargets="$(RazorGenerateComponentDeclarationDependsOn)"
+    Inputs="$(MSBuildAllProjects);@(RazorComponentWithTargetPath);$(_RazorComponentInputCacheFile)"
+    Outputs="@(_RazorComponentDeclaration)"
+    Condition="'@(RazorComponentWithTargetPath->Count())'!='0'">
+
+    <ItemGroup>
+      <_RazorComponentDeclarationSources Include="@(RazorComponentWithTargetPath)">
+        <GeneratedOutput>%(RazorComponentWithTargetPath.GeneratedDeclaration)</GeneratedOutput>
+      </_RazorComponentDeclarationSources>
+    </ItemGroup>
+
+    <MakeDir
+      Directories="%(_RazorComponentDeclaration.RelativeDir)"
+      Condition="!Exists('%(_RazorComponentDeclaration.RelativeDir)')" />
+
+    <PropertyGroup>
+      <!-- This file will not exist, but we need some value -->
+      <_RazorComponentDeclarationManifest>$(IntermediateOutputPath)$(MSBuildProjectName).RazorComponents.declaration.json</_RazorComponentDeclarationManifest>
+    </PropertyGroup>
+
+    <RazorGenerate
+      Debug="$(_RazorDebugGenerateCodeTask)"
+      DebugTool="$(_RazorDebugGenerateCodeTool)"
+      ToolAssembly="$(_RazorToolAssembly)"
+      UseServer="$(UseRazorBuildServer)"
+      ForceServer="$(_RazorForceBuildServer)"
+      PipeName="$(_RazorBuildServerPipeName)"
+      Version="$(RazorLangVersion)"
+      Configuration="@(ResolvedRazorConfiguration)"
+      Extensions="@(ResolvedRazorExtension)"
+      Sources="@(_RazorComponentDeclarationSources)"
+      ProjectRoot="$(MSBuildProjectDirectory)"
+      TagHelperManifest="$(_RazorComponentDeclarationManifest)"
+      GenerateDeclaration="true" />
+
+    <ItemGroup>
+      <FileWrites Include="@(_RazorComponentDeclaration)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(DesignTimeBuild)'=='true'">
+      <Compile Include="@(_RazorComponentDeclaration)" />
+    </ItemGroup>
+  </Target>
+
+  <Target
+    Name="RazorCompileComponentDeclaration"
+    Inputs="
+      $(MSBuildAllProjects);
+      @(_RazorComponentDeclaration);
+      @(Compile);
+      $(AssemblyOriginatorKeyFile);
+      @(ReferencePathWithRefAssemblies);
+      @(CompiledLicenseFile);
+      @(LinkResource);
+      $(ResolvedCodeAnalysisRuleSet);
+      @(AdditionalFiles)"
+    Outputs="@(_RazorComponentDeclarationAssembly);$(NonExistentFile)"
+    Condition="'$(DesignTimeBuild)'!='true' AND '$(Language)'=='C#' AND '@(_RazorComponentDeclaration)' != ''">
+
+    <MakeDir Directories="%(_RazorComponentDeclarationAssembly.RelativeDir)" />
+
+    <!-- These two compiler warnings are raised when a reference is bound to a different version
+             than specified in the assembly reference version number.  MSBuild raises the same warning in this case,
+             so the compiler warning would be redundant. -->
+    <PropertyGroup Condition="('$(TargetFrameworkVersion)' != 'v1.0') and ('$(TargetFrameworkVersion)' != 'v1.1')">
+      <NoWarn>$(NoWarn);1701;1702</NoWarn>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <!-- To match historical behavior, when inside VS11+ disable the warning from csc.exe indicating that no sources were passed in-->
+      <NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' &gt; '10.0'">$(NoWarn);2008</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
+      <ReferencePathWithRefAssemblies>
+        <EmbedInteropTypes />
+      </ReferencePathWithRefAssemblies>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
+                 then we'll use AppConfig -->
+      <AppConfigForCompiler Condition="'$(AppConfigForCompiler)' == '' AND '$(UseAppConfigForCompiler)' == 'true'">$(AppConfig)</AppConfigForCompiler>
+    </PropertyGroup>
+
+    <!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
+    <PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
+      <Prefer32Bit>false</Prefer32Bit>
+    </PropertyGroup>
+
+    <!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
+         https://github.com/dotnet/roslyn/issues/12223 -->
+    <ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
+      <AdditionalFileItems Include="$(AdditionalFileItemNames)" />
+      <AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
+      <UseSharedCompilation>true</UseSharedCompilation>
+    </PropertyGroup>
+
+    <Csc
+         AdditionalLibPaths="$(AdditionalLibPaths)"
+         AddModules="@(AddModules)"
+         AdditionalFiles="@(AdditionalFiles)"
+         AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
+         Analyzers="@(Analyzer)"
+         ApplicationConfiguration="$(AppConfigForCompiler)"
+         BaseAddress="$(BaseAddress)"
+         CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
+         ChecksumAlgorithm="$(ChecksumAlgorithm)"
+         CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
+         CodePage="$(CodePage)"
+         DebugType="$(DebugType)"
+         DefineConstants="$(DefineConstants)"
+         DelaySign="$(DelaySign)"
+         DisabledWarnings="$(NoWarn)"
+         EmitDebugInformation="$(DebugSymbols)"
+         EnvironmentVariables="$(CscEnvironment)"
+         ErrorEndLocation="$(ErrorEndLocation)"
+         ErrorLog="$(ErrorLog)"
+         ErrorReport="$(ErrorReport)"
+         Features="$(Features)"
+         FileAlignment="$(FileAlignment)"
+         GenerateFullPaths="$(GenerateFullPaths)"
+         HighEntropyVA="$(HighEntropyVA)"
+         Instrument="$(Instrument)"
+         KeyContainer="$(KeyContainerName)"
+         KeyFile="$(KeyOriginatorFile)"
+         LangVersion="$(LangVersion)"
+         LinkResources="@(LinkResource)"
+         MainEntryPoint="$(StartupObject)"
+         ModuleAssemblyName="$(ModuleAssemblyName)"
+         NoConfig="true"
+         NoLogo="$(NoLogo)"
+         NoStandardLib="$(NoCompilerStandardLib)"
+         NoWin32Manifest="$(NoWin32Manifest)"
+         Optimize="$(Optimize)"
+         Deterministic="$(Deterministic)"
+         PublicSign="$(PublicSign)"
+         OutputAssembly="@(_RazorComponentDeclarationAssembly)"
+         Platform="$(PlatformTarget)"
+         Prefer32Bit="$(Prefer32Bit)"
+         PreferredUILang="$(PreferredUILang)"
+         ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
+         References="@(ReferencePathWithRefAssemblies)"
+         ReportAnalyzer="$(ReportAnalyzer)"
+         Resources="@(CompiledLicenseFile)"
+         ResponseFiles="$(CompilerResponseFile)"
+         RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
+         SharedCompilationId="$(SharedCompilationId)"
+         SkipCompilerExecution="$(SkipCompilerExecution)"
+         Sources="@(_RazorComponentDeclaration);@(Compile)"
+         SubsystemVersion="$(SubsystemVersion)"
+         TargetType="$(OutputType)"
+         ToolExe="$(CscToolExe)"
+         ToolPath="$(CscToolPath)"
+         TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+         UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
+         UseSharedCompilation="$(UseSharedCompilation)"
+         Utf8Output="$(Utf8Output)"
+         VsSessionGuid="$(VsSessionGuid)"
+         WarningLevel="$(WarningLevel)"
+         WarningsAsErrors="$(WarningsAsErrors)"
+         WarningsNotAsErrors="$(WarningsNotAsErrors)"
+         PathMap="$(PathMap)"
+         SourceLink="$(SourceLink)">
+      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
+    </Csc>
+
+    <ItemGroup>
+      <FileWrites Include="@(_RazorComponentDeclarationAssembly)" Condition="Exists('@(_RazorComponentDeclarationAssembly)')" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_ResolveComponentRazorGenerateInputs">
+    <ItemGroup>
+      <!-- Add RazorComponent files to the set of files to be code-gened. -->
+      <RazorGenerateWithTargetPath Include="@(RazorComponentWithTargetPath)" />
+    </ItemGroup>
+
+    <!-- Point to the declaration assembly to perform taghelper discovery -->
+    <PropertyGroup>
+      <_RazorGenerateTargetReferenceAssembly>@(_RazorComponentDeclarationAssembly->Metadata('FullPath'))</_RazorGenerateTargetReferenceAssembly>
+    </PropertyGroup>
+  </Target>
+
+  <!-- 
+    Once RazorCompileComponentDeclaration is completed, we have all the inputs required for code generation of
+    RazorComponents and RazorGenerate items. We'll initialize the inputs for RazorGenerate and invoke it.
+    This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as 
+    part of PrepareForRun \ PrepareForPublish for non-components (.cshtml) files.
+   -->
+  <Target
+    Name="RazorGenerateComponentDefinition"
+    DependsOnTargets="_ResolveComponentRazorGenerateInputs;RazorGenerate"
+    Condition="'$(DesignTimeBuild)' != 'true' AND '@(_RazorComponentDefinition->Count())' != '0' AND Exists('@(_RazorComponentDeclarationAssembly)')">
+
+    <ItemGroup Condition="'$(DesignTimeBuild)' != 'true'">
+      <Compile Include="@(_RazorComponentDefinition)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <RazorComponentGenerateCoreDependsOn>
+      RazorGenerateComponentDeclaration;
+      RazorCompileComponentDeclaration;
+      RazorGenerateComponentDefinition;
+    </RazorComponentGenerateCoreDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RazorComponentGenerateCore" DependsOnTargets="$(RazorComponentGenerateCoreDependsOn)">
+  </Target>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
new file mode 100644
index 0000000000..995cb2cd90
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -0,0 +1,92 @@
+<!--
+***********************************************************************************************
+Microsoft.Net.Sdk.Razor.Versions.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <!--
+      Initialize properties and items inferred using the project version. This file is not imported in projects referencing
+      MVC \ Razor 2.2 or earlier since values specified here are provided via targets and props imported from NuGet packages
+      such as Microsoft.AspNetCore.Razor.Design.
+
+      The properties and items here are designed to be read by CPS so they should be just simple evaluation-time values
+      and should not require targets to initialize.
+  -->
+  <PropertyGroup>
+    <!--
+      MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
+    -->
+    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">true</GenerateProvideApplicationPartFactoryAttribute>
+
+    <!--
+      Determines if the Sdk is allowed to add additional attributes to the project assembly.
+      For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
+    -->
+    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
+
+    <!--
+      MVC will generally want to add support for runtime compilation, but only for applications.
+    -->
+    <GenerateRazorHostingAssemblyInfo Condition="'$(GenerateRazorHostingAssemblyInfo)'=='' AND '$(OutputType)'=='exe'">$(GenerateRazorAssemblyInfo)</GenerateRazorHostingAssemblyInfo>
+
+    <!--
+      The type name of the ApplicationPartFactory applied to the generated Razor file.
+    -->
+    <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
+
+    <!-- Continue setting this property to maintain compat with legacy Razor.Design -->
+    <IsRazorCompilerReferenced Condition="'$(IsRazorCompilerReferenced)'==''">true</IsRazorCompilerReferenced>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RazorLangVersion)'==''">
+    <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <!--
+    Set the primary configuration supported by this SDK as the default configuration for Razor.
+  -->
+  <PropertyGroup Condition="'$(RazorDefaultConfiguration)'==''">
+    <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">MVC-3.0</RazorDefaultConfiguration>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--
+      While technically the assembly in this package can provide support for the MVC-2.X, don't declare
+      it here. The IDE is hardcoded to inject 2.0 support when needed. The settings flowing through MSBuild should reflect
+      the project's runtime.
+    -->
+    <RazorConfiguration Include="MVC-3.0">
+      <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
+    </RazorConfiguration>
+  </ItemGroup>
+
+  <ItemGroup>
+    <RazorExtension Include="MVC-3.0">
+      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
+      <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
+    </RazorExtension>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">
+    <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute">
+      <_Parameter1>$(RazorTargetName)</_Parameter1>
+    </_RazorAssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(GenerateProvideApplicationPartFactoryAttribute)' == 'true' AND '$(ProvideApplicationPartFactoryAttributeTypeName)'!=''">
+    <RazorTargetAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute">
+      <_Parameter1>$(ProvideApplicationPartFactoryAttributeTypeName)</_Parameter1>
+    </RazorTargetAssemblyAttribute>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
new file mode 100644
index 0000000000..6df58f657e
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -0,0 +1,60 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.DesignTime.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+
+  <ItemGroup>
+    <!--
+      Defines the generic .NET Core 'Razor' capability.
+
+      Note that we don't define any capabilities here that depend on the version of the runtime/toolset
+      in use by the project. Those capabilities are defined by the relevant runtime packages so that
+      we use the lack of the capability to detect downlevel scenarios.
+    -->
+    <ProjectCapability Include="DotNetCoreRazor"/>
+
+    <!--
+      Defines the ability to understand the configuration for the Razor language service provided by
+      the runtime/toolset packages. Introduced in 2.1
+    -->
+    <ProjectCapability Include="DotNetCoreRazorConfiguration"/>
+  </ItemGroup>
+
+  <!--
+    WebSdk imports these capabilities for nesting in DotNetCoreWeb projects.
+    Conditinally import these capabilities if the project isn't targeting the WebSdk.
+   -->
+  <ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)'==''">
+    <ProjectCapability Include="SupportHierarchyContextSvc" />
+    <ProjectCapability Include="DynamicDependentFile" />
+    <ProjectCapability Include="DynamicFileNesting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorConfiguration.xaml">
+      <Context>File</Context>
+    </PropertyPageSchema>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorExtension.xaml">
+      <Context>File</Context>
+    </PropertyPageSchema>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorGeneral.xaml">
+      <Context>Project</Context>
+    </PropertyPageSchema>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorGenerateWithTargetPath.xaml">
+      <Context>Project</Context>
+    </PropertyPageSchema>
+  </ItemGroup>
+
+  <Target Name="RazorGenerateDesignTime" DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" Returns="@(RazorGenerateWithTargetPath)">
+  </Target>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
new file mode 100644
index 0000000000..bc46b453cf
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
@@ -0,0 +1,185 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <PropertyGroup>
+    <!-- Determines if the generated Razor assembly includes an auto-generated assembly info. -->
+    <GenerateRazorTargetAssemblyInfo Condition="'$(GenerateRazorTargetAssemblyInfo)'==''">true</GenerateRazorTargetAssemblyInfo>
+
+    <!-- Set to true, to automatically include some AssemblyAttributes inferred from the project metadata in the generated Razor assembly -->
+    <EnableDefaultRazorTargetAssemblyInfoAttributes Condition="'$(EnableDefaultRazorTargetAssemblyInfoAttributes)'==''">true</EnableDefaultRazorTargetAssemblyInfoAttributes>
+
+    <!-- AssemblyInfo that gets added to the generated Razor dll -->
+    <RazorTargetAssemblyInfo Condition="'$(RazorTargetAssemblyInfo)'==''">$(IntermediateOutputPath)$(MSBuildProjectName).RazorTargetAssemblyInfo.cs</RazorTargetAssemblyInfo>
+    <_RazorTargetAssemblyInfoInputsCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorTargetAssemblyInfo.cache</_RazorTargetAssemblyInfoInputsCacheFile>
+
+    <!-- AssemblyInfo that gets added to the project being compiled -->
+    <_RazorAssemblyInfo>$(IntermediateOutputPath)$(MSBuildProjectName).RazorAssemblyInfo.cs</_RazorAssemblyInfo>
+    <_RazorAssemblyInfoInputsCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorAssemblyInfo.cache</_RazorAssemblyInfoInputsCacheFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateRazorTargetAssemblyInfoDependsOn>
+      GetRazorTargetAssemblyAttributes;
+      _CreateRazorTargetAssemblyInfoInputsCacheFile;
+      CoreGenerateRazorTargetAssemblyInfo
+    </GenerateRazorTargetAssemblyInfoDependsOn>
+  </PropertyGroup>
+
+  <Target
+    Name="GenerateRazorTargetAssemblyInfo"
+    DependsOnTargets="$(GenerateRazorTargetAssemblyInfoDependsOn)">
+  </Target>
+
+  <Target
+    Name="CoreGenerateRazorTargetAssemblyInfo"
+    Inputs="$(_RazorTargetAssemblyInfoInputsCacheFile)"
+    Outputs="$(RazorTargetAssemblyInfo)"
+    Condition="'$(GenerateRazorTargetAssemblyInfo)'=='true' AND '@(RazorCompile)'!=''">
+
+    <ItemGroup Condition="'$(GenerateRazorTargetAssemblyInfo)'=='true'">
+      <!-- Ensure the generated assemblyinfo file is not already part of RazorCompile sources -->
+      <RazorCompile Remove="$(RazorTargetAssemblyInfo)" />
+      <RazorCompile Include="$(RazorTargetAssemblyInfo)" />
+    </ItemGroup>
+
+    <WriteCodeFragment AssemblyAttributes="@(RazorTargetAssemblyAttribute)" Language="C#" OutputFile="$(RazorTargetAssemblyInfo)" />
+
+    <ItemGroup>
+      <FileWrites Include="$(RazorTargetAssemblyInfo)" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target
+    Name="GetRazorTargetAssemblyAttributes"
+    DependsOnTargets="GetAssemblyVersion"
+    Condition="'$(EnableDefaultRazorTargetAssemblyInfoAttributes)'=='true'">
+
+    <PropertyGroup>
+      <RazorAssemblyFileVersion Condition="'$(RazorAssemblyFileVersion)' == ''">$(FileVersion)</RazorAssemblyFileVersion>
+      <RazorAssemblyInformationalVersion Condition="'$(RazorAssemblyInformationalVersion)' == ''">$(InformationalVersion)</RazorAssemblyInformationalVersion>
+      <RazorAssemblyDescription Condition="'$(RazorAssemblyDescription)'==''">$(Description)</RazorAssemblyDescription>
+      <RazorAssemblyTitle Condition="'$(RazorAssemblyTitle)'==''">$(RazorTargetName)</RazorAssemblyTitle>
+      <RazorAssemblyVersion Condition="'$(RazorAssemblyVersion)' == ''">$(AssemblyVersion)</RazorAssemblyVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyCompanyAttribute" Condition="'$(Company)' != '' and '$(GenerateAssemblyCompanyAttribute)' == 'true'">
+        <_Parameter1>$(Company)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyConfigurationAttribute" Condition="'$(Configuration)' != '' and '$(GenerateAssemblyConfigurationAttribute)' == 'true'">
+        <_Parameter1>$(Configuration)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyCopyrightAttribute" Condition="'$(Copyright)' != '' and '$(GenerateAssemblyCopyrightAttribute)' == 'true'">
+        <_Parameter1>$(Copyright)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyProductAttribute" Condition="'$(Product)' != '' and '$(GenerateAssemblyProductAttribute)' == 'true'">
+        <_Parameter1>$(Product)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Resources.NeutralResourcesLanguageAttribute" Condition="'$(NeutralLanguage)' != '' and '$(GenerateNeutralResourcesLanguageAttribute)' == 'true'">
+        <_Parameter1>$(NeutralLanguage)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyDescriptionAttribute" Condition="'$(RazorAssemblyDescription)' != '' and '$(GenerateAssemblyDescriptionAttribute)' == 'true'">
+        <_Parameter1>$(RazorAssemblyDescription)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyFileVersionAttribute" Condition="'$(RazorAssemblyFileVersion)' != '' and '$(GenerateAssemblyFileVersionAttribute)' == 'true'">
+        <_Parameter1>$(RazorAssemblyFileVersion)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute" Condition="'$(RazorAssemblyInformationalVersion)' != '' and '$(GenerateAssemblyInformationalVersionAttribute)' == 'true'">
+        <_Parameter1>$(RazorAssemblyInformationalVersion)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyTitleAttribute" Condition="'$(RazorAssemblyTitle)' != '' and '$(GenerateAssemblyTitleAttribute)' == 'true'">
+        <_Parameter1>$(RazorAssemblyTitle)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+      <RazorTargetAssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute" Condition="'$(RazorAssemblyVersion)' != '' and '$(GenerateAssemblyVersionAttribute)' == 'true'">
+        <_Parameter1>$(RazorAssemblyVersion)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    To allow version changes to be respected on incremental builds (e.g. through CLI parameters),
+    create a hash of all assembly attributes so that the cache file will change with the calculated
+    assembly attribute values and msbuild will then execute CoreGenerateAssembly to generate a new file.
+  -->
+  <Target Name="_CreateRazorTargetAssemblyInfoInputsCacheFile" Condition="'@(RazorTargetAssemblyAttribute)' != ''">
+
+    <!-- We only use up to _Parameter1 for most attributes, but other targets may add additional assembly attributes with multiple parameters. -->
+    <Hash ItemsToHash="@(RazorTargetAssemblyAttribute->'%(Identity)%(_Parameter1)%(_Parameter2)%(_Parameter3)%(_Parameter4)%(_Parameter5)%(_Parameter6)%(_Parameter7)%(_Parameter8)')">
+      <Output TaskParameter="HashResult" PropertyName="_RazorTargetAssemblyAttributesHash" />
+    </Hash>
+
+    <WriteLinesToFile
+      Lines="$(_RazorTargetAssemblyAttributesHash)"
+      File="$(_RazorTargetAssemblyInfoInputsCacheFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorTargetAssemblyInfoInputsCacheFile)" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="_CreateRazorAssemblyInfoInputsCacheFile" Condition="'@(_RazorAssemblyAttribute)' != ''">
+
+    <!-- We only use up to _Parameter1 for most attributes, but other targets may add additional assembly attributes with multiple parameters. -->
+    <Hash ItemsToHash="@(_RazorAssemblyAttribute->'%(Identity)%(_Parameter1)%(_Parameter2)%(_Parameter3)%(_Parameter4)%(_Parameter5)%(_Parameter6)%(_Parameter7)%(_Parameter8)')">
+      <Output TaskParameter="HashResult" PropertyName="_RazorAssemblyAttributesHash" />
+    </Hash>
+
+    <WriteLinesToFile
+      Lines="$(_RazorAssemblyAttributesHash)"
+      File="$(_RazorAssemblyInfoInputsCacheFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorAssemblyInfoInputsCacheFile)" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target
+    Name="_CoreGenerateRazorAssemblyInfo"
+    DependsOnTargets="_CreateRazorAssemblyInfoInputsCacheFile"
+    Inputs="$(_RazorAssemblyInfoInputsCacheFile)"
+    Outputs="$(_RazorAssemblyInfo)"
+    Condition="'@(_RazorAssemblyAttribute)' != ''">
+
+    <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true'">
+      <Compile Remove="$(_RazorAssemblyInfo)" />
+      <Compile Include="$(_RazorAssemblyInfo)" />
+    </ItemGroup>
+
+    <WriteCodeFragment AssemblyAttributes="@(_RazorAssemblyAttribute)" Language="$(Language)" OutputFile="$(_RazorAssemblyInfo)" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorAssemblyInfo)" />
+    </ItemGroup>
+
+  </Target>
+
+  <PropertyGroup>
+    <!-- Generate attributes in the main assembly if we're targeting a C# project and using the Razor Sdk. -->
+    <CoreCompileDependsOn Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(Language)' == 'C#' and '$(GenerateRazorAssemblyInfo)' == 'true'">
+      $(CoreCompileDependsOn);_GenerateRazorAssemblyInfo
+    </CoreCompileDependsOn>
+
+    <_GenerateRazorAssemblyInfoDependsOn>PrepareForBuild;_CoreGenerateRazorAssemblyInfo</_GenerateRazorAssemblyInfoDependsOn>
+  </PropertyGroup>
+
+  <Target Name="_GenerateRazorAssemblyInfo" DependsOnTargets="$(_GenerateRazorAssemblyInfoDependsOn)" />
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props
new file mode 100644
index 0000000000..6fad4d5180
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props
@@ -0,0 +1,17 @@
+<!--
+***********************************************************************************************
+Microsoft.Net.Sdk.Razor.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <PropertyGroup>
+    <RazorSdkCurrentVersionProps>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+    <RazorSdkCurrentVersionTargets>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
+  </PropertyGroup>
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorConfiguration.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorConfiguration.xaml
new file mode 100644
index 0000000000..55ae9abb42
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorConfiguration.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule
+  Description="Configuration Properties"
+  DisplayName="Configuration Properties"
+  Name="RazorConfiguration"
+  PageTemplate="generic"
+  xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <Rule.DataSource>
+    <DataSource
+      Persistence="ProjectFile"
+      HasConfigurationCondition="True" 
+      ItemType="RazorConfiguration" />
+  </Rule.DataSource>
+
+  <Rule.Categories>
+    <Category
+      Name="General"
+      DisplayName="General" />
+  </Rule.Categories>
+
+  <StringProperty
+    Category="General"
+    Description="Razor Extensions"
+    DisplayName="Razor Extensions"
+    Name="Extensions"
+    ReadOnly="True"
+    Visible="True" />
+
+</Rule>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorExtension.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorExtension.xaml
new file mode 100644
index 0000000000..49589142ee
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorExtension.xaml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule
+  Description="Extension Properties"
+  DisplayName="Extension Properties"
+  Name="RazorExtension"
+  PageTemplate="generic"
+  xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <Rule.DataSource>
+    <DataSource
+      Persistence="ProjectFile"
+      HasConfigurationCondition="True"
+      ItemType="RazorExtension" />
+  </Rule.DataSource>
+
+  <Rule.Categories>
+    <Category
+      Name="General"
+      DisplayName="General" />
+  </Rule.Categories>
+
+  <StringProperty
+    Category="General"
+    Description="Razor Extension Assembly Name"
+    DisplayName="Razor Extension Assembly Name"
+    Name="AssemblyName"
+    ReadOnly="True"
+    Visible="True" />
+
+  <StringProperty
+    Category="General"
+    Description="Razor Extension Assembly File Path"
+    DisplayName="Razor Extension Assembly File Path"
+    Name="AssemblyFilePath"
+    ReadOnly="True"
+    Visible="True" />
+
+</Rule>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGeneral.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGeneral.xaml
new file mode 100644
index 0000000000..9a8785f206
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGeneral.xaml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule
+  Description="Razor Properties"
+  DisplayName="Razor Properties"
+  Name="RazorGeneral"
+  PageTemplate="generic"
+  xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <Rule.DataSource>
+    <DataSource
+      Persistence="ProjectFile"
+      HasConfigurationCondition="True" />
+  </Rule.DataSource>
+
+  <Rule.Categories>
+    <Category
+      Name="General"
+      DisplayName="General" />
+  </Rule.Categories>
+
+  <StringProperty
+    Category="General"
+    Description="Razor Language Version"
+    DisplayName="Razor Language Version"
+    Name="RazorLangVersion"
+    ReadOnly="True"
+    Visible="True" />
+
+  <StringProperty
+    Category="General"
+    Description="Razor Configuration Name"
+    DisplayName="Razor Configuration Name"
+    Name="RazorDefaultConfiguration"
+    ReadOnly="True"
+    Visible="True" />
+
+</Rule>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGenerateWithTargetPath.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGenerateWithTargetPath.xaml
new file mode 100644
index 0000000000..bab10bf249
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorGenerateWithTargetPath.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule
+  Description="Razor Document Properties"
+  DisplayName="Razor Document Properties"
+  Name="RazorGenerateWithTargetPath"
+  PageTemplate="generic"
+  xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <Rule.DataSource>
+    <DataSource
+      Persistence="ProjectFile"
+      ItemType="RazorGenerateWithTargetPath"
+      MSBuildTarget="RazorGenerateDesignTime"
+      HasConfigurationCondition="False"
+      SourceOfDefaultValue="AfterContext"
+      SourceType="TargetResults" />
+  </Rule.DataSource>
+
+  <Rule.Categories>
+    <Category
+      Name="General"
+      DisplayName="General" />
+  </Rule.Categories>
+  
+  <StringProperty
+    Category="General"
+    Name="TargetPath"
+    ReadOnly="True"
+    Visible="False" />
+
+</Rule>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
new file mode 100644
index 0000000000..673a61d3da
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -0,0 +1,86 @@
+<!--
+***********************************************************************************************
+Sdk.Razor.CurrentVersion.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <!--
+    Properties and tasks supporting Razor MSBuild integration
+  -->
+
+  <!--
+    Default properties for common Razor SDK behavior.
+  -->
+  <PropertyGroup>
+    <!--
+    Set to true to automatically include certain file types, such as .cshtml files, as content in the project.
+    When referenced via Microsoft.NET.Sdk.Web, this additionally includes all files under wwwroot, and any config files.
+    -->
+    <EnableDefaultContentItems Condition="'$(EnableDefaultContentItems)'==''">true</EnableDefaultContentItems>
+
+    <!--
+      Set to true to automatically include Razor (.cshtml) files in @(RazorGenerate) from @(Content).
+    -->
+    <EnableDefaultRazorGenerateItems Condition="'$(EnableDefaultRazorGenerateItems)'==''">true</EnableDefaultRazorGenerateItems>
+
+    <!--
+      Set to true to automatically include Razor (.razor) files in @(RazorComponent) from @(Content).
+    -->
+    <EnableDefaultRazorComponentItems Condition="'$(EnableDefaultRazorComponentItems)'==''">true</EnableDefaultRazorComponentItems>
+
+    <!--
+      Set to true to copy RazorGenerate items (.cshtml) to the publish directory.
+
+      Typically Razor files are not needed for a published application if they participate in compilation at build-time
+      or publish-time. By default, the Razor SDK will suppress the copying of RazorGenerate items to the publish directory.
+    -->
+    <CopyRazorGenerateFilesToPublishDirectory Condition="'$(CopyRazorGenerateFilesToPublishDirectory)'==''">false</CopyRazorGenerateFilesToPublishDirectory>
+
+    <!--
+      Set to true to copy reference assembly items to the publish directory.
+
+      Typically reference assemblies are not needed for a published application if Razor compilation occurs at build-time
+      or publish-time. By default, the Razor SDK will suppress the copying of reference assemblies to the publish directory.
+    -->
+    <CopyRefAssembliesToPublishDirectory Condition="'$(CopyRefAssembliesToPublishDirectory)'==''">false</CopyRefAssembliesToPublishDirectory>
+
+    <!--
+    Determines the toolset to use to compile Razor (.cshtml) files. Defaults to 'Implicit' to let the Razor Sdk determine the toolset to use.
+    Valid values include 'Implicit', 'RazorSdk', and 'PrecompilationTool'.
+    -->
+    <RazorCompileToolset>Implicit</RazorCompileToolset>
+
+    <!--
+    Configures whether all Razor content items (.cshtml files) will be marked to be included in the produced NuGet package as content.
+
+    All Content items are included in a NuGet package as content files. This setting can be used to control this behavior for Razor content items.
+    -->
+    <IncludeRazorContentInPack Condition="'$(IncludeRazorContentInPack)'==''">false</IncludeRazorContentInPack>
+
+    <!--
+    Configures the file extension used for generated C# files.
+    -->
+    <RazorGenerateOutputFileExtension>.g.cs</RazorGenerateOutputFileExtension>
+
+    <!--
+    Configures the file extension used for the generated C# definition files.
+    -->
+    <RazorGenerateOutputDefinitionFileExtension>.g.i.cs</RazorGenerateOutputDefinitionFileExtension>
+
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true'">
+    <Content Include="**\*.cshtml" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="**\*.razor" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <None Remove="**\*.cshtml" />
+    <None Remove="**\*.razor" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
new file mode 100644
index 0000000000..704b14d22a
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -0,0 +1,722 @@
+<!--
+***********************************************************************************************
+Sdk.Razor.CurrentVersion.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0" TreatAsLocalProperty="_RazorSdkTasksTFM">
+  <!-- 
+    Targets supporting Razor MSBuild integration. Contain support for generating C# code using Razor
+    and including the generated code in the project lifecycle, including compiling, publishing and producing
+    nuget packages.
+  -->
+
+  <!--
+    This is a hook to import a set of targets before the Razor targets. By default this is unused.
+  -->
+  <Import Project="$(CustomBeforeRazorSdkTargets)" Condition="'$(CustomBeforeRazorSdkTargets)' != '' and Exists('$(CustomBeforeRazorSdkTargets)')"/>
+
+  <PropertyGroup>
+    <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
+    <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
+    <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
+    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_RazorSdkTasksTFM>
+    <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
+    <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
+
+    <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
+    <_EnableAllInclusiveRazorSdk Condition="'$(_EnableInclusiveRazorSdk)' == '' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_EnableAllInclusiveRazorSdk>
+  </PropertyGroup>
+
+  <!--
+    Razor defines two primary targets:
+      'RazorGenerate' - which updates generated code
+      'RazorCompile' - compiles an assembly from generated code
+
+    Use these properties and targets to attach behavior to the corresponding phase.
+  -->
+  <PropertyGroup>
+    <PrepareForRazorGenerateDependsOn>
+      ResolveRazorConfiguration;
+      ResolveRazorGenerateInputs;
+      AssignRazorGenerateTargetPaths;
+      ResolveAssemblyReferenceRazorGenerateInputs;
+      _CheckForMissingRazorCompiler;
+      ResolveTagHelperRazorGenerateInputs
+    </PrepareForRazorGenerateDependsOn>
+
+    <PrepareForRazorComponentGenerateDependsOn>
+      ResolveRazorConfiguration;
+      ResolveRazorComponentInputs;
+      AssignRazorComponentTargetPaths;
+    </PrepareForRazorComponentGenerateDependsOn>
+
+    <RazorGenerateDependsOn>
+      PrepareForRazorGenerate;
+      _CheckForMissingRazorCompiler;
+      RazorCoreGenerate
+    </RazorGenerateDependsOn>
+
+    <RazorComponentGenerateDependsOn>
+      PrepareForRazorComponentGenerate;
+      RazorComponentGenerateCore
+    </RazorComponentGenerateDependsOn>
+
+    <PrepareForRazorCompileDependsOn>
+      RazorGenerate;
+      ResolveRazorCompileInputs;
+      GenerateRazorTargetAssemblyInfo
+    </PrepareForRazorCompileDependsOn>
+
+    <ResolveRazorCompileInputsDependsOn>
+      ResolveRazorEmbeddedResources
+    </ResolveRazorCompileInputsDependsOn>
+
+    <RazorCompileDependsOn>
+      PrepareForRazorCompile;
+      RazorCoreCompile
+    </RazorCompileDependsOn>
+
+    <BuiltProjectOutputGroupDependsOn>
+      $(BuiltProjectOutputGroupDependsOn);
+      _RazorAddBuiltProjectOutputGroupOutput
+    </BuiltProjectOutputGroupDependsOn>
+
+    <DebugSymbolsProjectOutputGroupDependsOn>
+      $(DebugSymbolsProjectOutputGroupDependsOn);
+      _RazorAddDebugSymbolsProjectOutputGroupOutput
+    </DebugSymbolsProjectOutputGroupDependsOn>
+
+    <CoreCompileDependsOn>
+      RazorComponentGenerate;
+      $(CoreCompileDependsOn)
+    </CoreCompileDependsOn>
+
+    <PrepareForBuildDependsOn>
+      $(PrepareForBuildDependsOn);
+      ResolveRazorGenerateInputs
+    </PrepareForBuildDependsOn>
+
+    <GenerateNuspecDependsOn>
+      ResolveRazorGenerateInputs;
+      $(GenerateNuspecDependsOn)
+    </GenerateNuspecDependsOn>
+
+    <PrepareForRunDependsOn>
+      _RazorPrepareForRun;
+      $(PrepareForRunDependsOn)
+    </PrepareForRunDependsOn>
+
+    <GetCopyToOutputDirectoryItemsDependsOn>
+      _RazorGetCopyToOutputDirectoryItems;
+      $(GetCopyToOutputDirectoryItems)
+    </GetCopyToOutputDirectoryItemsDependsOn>
+
+  </PropertyGroup>
+
+  <!-- 
+    Default values for properties that affect Razor targets to the standard build lifecycle.
+  -->
+  <PropertyGroup Condition="'$(RazorCompileOnBuild)'=='' AND '$(Language)'=='C#'">
+    <RazorCompileOnBuild>true</RazorCompileOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RazorCompileOnPublish)'=='' AND '$(Language)'=='C#'">
+    <!-- Always compile on publish by default if we're compiling on build -->
+    <RazorCompileOnPublish Condition="'$(RazorCompileOnBuild)'=='true'">true</RazorCompileOnPublish>
+
+    <!-- Compatibility with the old MVC Precompilation setting -->
+    <RazorCompileOnPublish Condition="'$(RazorCompileOnPublish)'==''">$(MvcRazorCompileOnPublish)</RazorCompileOnPublish>
+
+    <!-- Default to on if MvcRazorCompileOnPublish isn't set for some reason -->
+    <RazorCompileOnPublish Condition="'$(RazorCompileOnPublish)'==''">true</RazorCompileOnPublish>
+  </PropertyGroup>
+
+  <!--
+    Properties that configure Razor SDK, but need to be defined in targets due to evaluation order.
+  -->
+  <PropertyGroup>
+    <!-- Output directory used for generated files -->
+    <RazorGenerateIntermediateOutputPath Condition="'$(RazorGenerateIntermediateOutputPath)'==''">$(IntermediateOutputPath)Razor\</RazorGenerateIntermediateOutputPath>
+
+    <_RazorComponentDeclarationOutputPath Condition="'$(_RazorComponentDeclarationOutputPath)'==''">$(IntermediateOutputPath)RazorDeclaration\</_RazorComponentDeclarationOutputPath>
+
+    <!--
+      Use the suffix .Views when producing compiled view assemblies. This matches the requirements for Mvc's ViewsFeatureProvider.
+    -->
+    <RazorTargetNameSuffix Condition="'$(_EnableInclusiveRazorSdk)' == '' AND '$(RazorTargetNameSuffix)'==''">.Views</RazorTargetNameSuffix>
+
+    <!-- Suffix appended to $(TargetName) to produce $(RazorTargetName), the name of the assembly produced by Razor -->
+    <RazorTargetNameSuffix Condition="'$(RazorTargetNameSuffix)' == ''">.Razor</RazorTargetNameSuffix>
+
+    <!-- File name (without extension) of the assembly produced by Razor -->
+    <RazorTargetName Condition="'$(RazorTargetName)'==''">$(TargetName)$(RazorTargetNameSuffix)</RazorTargetName>
+
+    <!--
+      The compatibility zone - these properties were provided by the MVC Precompilation tool and they
+      map to supported settings in Razor SDK.
+
+      We want to set the defaults for these in the .props file, but we need to process the old settings here
+      in case they were set in the project file. The consequence of this is that the old settings will override
+      the new ones if they are set to conflicting values.
+    -->
+    <CopyRazorGenerateFilesToPublishDirectory Condition="'$(MvcRazorExcludeViewFilesFromPublish)'=='true'">false</CopyRazorGenerateFilesToPublishDirectory>
+    <CopyRazorGenerateFilesToPublishDirectory Condition="'$(MvcRazorExcludeViewFilesFromPublish)'=='false'">true</CopyRazorGenerateFilesToPublishDirectory>
+
+    <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</CopyRefAssembliesToPublishDirectory>
+    <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</CopyRefAssembliesToPublishDirectory>
+
+    <!-- 
+      We can't set the actual default value here due to evaluation order (depends on $(OutDir)).
+      
+      This handles a compatibility case with MVC Precompilation.
+    -->
+    <RazorOutputPath Condition="'$(MvcRazorOutputPath)'!=''">$([MSBuild]::EnsureTrailingSlash('$(MvcRazorOutputPath)'))</RazorOutputPath>
+
+    <!--
+      Configures whether all of the @(RazorGenerate) items will be added as embedded files to the produced assembly.
+
+      When true, everything in @(RazorGenerate) will be added to @(RazorEmbeddedFiles) and passed to CSC.  
+    -->
+    <EmbedRazorGenerateSources Condition="'$(MvcRazorEmbedViewSources)'!=''">$(MvcRazorEmbedViewSources)</EmbedRazorGenerateSources>
+    <EmbedRazorGenerateSources Condition="'$(EmbedRazorGenerateSources)'==''">false</EmbedRazorGenerateSources>
+
+    <!--
+    Set to false to disable Razor code generation from using a persistent build server process.
+    -->
+    <UseRazorBuildServer Condition="'$(UseRazorBuildServer)'==''">$(UseSharedCompilation)</UseRazorBuildServer>
+    <UseRazorBuildServer Condition="'$(UseRazorBuildServer)'==''">true</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Similar to https://github.com/Microsoft/msbuild/blob/908cc9ccd4961441628f68e37a148183a87bb067/src/Tasks/Microsoft.Common.CurrentVersion.targets#L146-L153 -->
+    <_RazorDebugSymbolsProduced>false</_RazorDebugSymbolsProduced>
+    <_RazorDebugSymbolsProduced Condition="'$(DebugSymbols)'=='true'">true</_RazorDebugSymbolsProduced>
+    <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='none'">false</_RazorDebugSymbolsProduced>
+    <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='pdbonly'">true</_RazorDebugSymbolsProduced>
+    <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='full'">true</_RazorDebugSymbolsProduced>
+    <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='portable'">true</_RazorDebugSymbolsProduced>
+    <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='embedded'">false</_RazorDebugSymbolsProduced>
+  </PropertyGroup>
+
+  <!-- Resolve the toolset to use -->
+  <PropertyGroup>
+    <!-- Default value for the property 'MvcRazorCompileOnPublish' is empty. If it has been explicitly enabled, continue using precompilation. -->
+    <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
+
+    <!-- The default value for 'RazorCompileToolset' was not modified. In this case, infer the toolset to use as RazorSdk. -->
+    <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == '' AND '$(RazorCompileToolset)' == 'Implicit'">RazorSdk</ResolvedRazorCompileToolset>
+
+    <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == '' AND '$(RazorCompileToolset)' == 'PrecompilationTool'">$(RazorCompileToolset)</ResolvedRazorCompileToolset>
+    <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == '' AND '$(RazorCompileToolset)' == 'RazorSdk'">$(RazorCompileToolset)</ResolvedRazorCompileToolset>
+
+    <!-- If RazorSdk is not referenced, fall-back to Precompilation tool when referenced by a 2.2 or earlier targeting project. -->
+    <ResolvedRazorCompileToolset Condition="'$(ResolvedRazorCompileToolset)' == 'RazorSdk' And '$(IsRazorCompilerReferenced)' != 'true' AND '$(_EnableAllInclusiveRazorSdk)' != 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
+
+    <!-- Previous versions of the precompilation tool still depends on the msbuild property 'MvcRazorCompileOnPublish'. Hence, setting it to the old default value -->
+    <MvcRazorCompileOnPublish Condition="'$(MvcRazorCompileOnPublish)' == ''">true</MvcRazorCompileOnPublish>
+  </PropertyGroup>
+
+  <!--
+    Properties that configure Razor SDK, but need to be defined in targets due to evaluation order.
+  -->
+  <ItemGroup>
+    <!-- Used to creating the final compiled Razor dll -->
+    <RazorIntermediateAssembly Condition="'$(RazorIntermediateAssembly)'==''" Include="$(IntermediateOutputPath)$(RazorTargetName).dll" />
+    <!-- Used in Compilation.targets -->
+    <_RazorDebugSymbolsIntermediatePath Condition="'$(_RazorDebugSymbolsProduced)'=='true'" Include="$(IntermediateOutputPath)$(RazorTargetName).pdb" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!--
+      Add all cshtml files to UpToDateCheckInput - a collection of files used by FastUpToDateCheck to determine
+      if any of the the project inputs have changed.
+    -->
+    <UpToDateCheckInput Condition="'$(RazorCompileOnBuild)'=='true'" Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
+
+    <!--
+      Add Razor output files to UpToDateCheckBuilt - a collection of files used by FastUpToDateCheck to determine
+      if any of the project's outputs have changed.
+    -->
+    <UpToDateCheckBuilt Include="@(RazorIntermediateAssembly)"
+      Condition="'$(RazorCompileOnBuild)'=='true' AND '@(Content->WithMetadataValue('Extension', '.cshtml'))' != ''" />
+  </ItemGroup>
+
+  <!--
+    These are the targets that generate code using Razor, separated from the main file for ease of maintenance.
+    Most targets related to Razor code generation are defined there.
+  -->
+
+  <!-- Determine what compiler and versions of the language to target. For 2.x targeting projects, these are carried by packages referenced by the project. Use this -->
+
+  <!-- Use the 2.x compiler if we're building an application that references Microsoft.AspNetCore.Razor.Design. -->
+  <Import Project="$(RazorCodeGenerationTargetsPath)"
+    Condition="'$(IsRazorCompilerReferenced)' == 'true' AND '$(RazorCodeGenerationTargetsPath)' != '' AND Exists('$(RazorCodeGenerationTargetsPath)')" />
+
+  <!-- When targeting 3.x and later projects, we have to infer configuration by inspecting the project. -->
+  <Import Project="Microsoft.NET.Sdk.Razor.Configuration.targets" Condition="'$(_EnableAllInclusiveRazorSdk)' == 'true'" />
+
+  <!-- For projects targeting 3.x and later, use the compiler that ships in the Sdk -->
+  <Import Project="Microsoft.NET.Sdk.Razor.CodeGeneration.targets" Condition="'$(_EnableAllInclusiveRazorSdk)' == 'true'" />
+
+  <Import Project="Microsoft.NET.Sdk.Razor.Component.targets" />
+
+  <Import Project="Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets" />
+
+  <!-- 
+    These are the targets that actually do compilation using CSC, separated from the main file for ease of maintenance.
+
+    RazorCoreCompile should be defined there.
+  -->
+  <Import Project="Microsoft.NET.Sdk.Razor.Compilation.targets" />
+
+  <Target Name="PrepareForRazorGenerate" DependsOnTargets="$(PrepareForRazorGenerateDependsOn)">
+  </Target>
+
+  <Target Name="PrepareForRazorComponentGenerate" DependsOnTargets="$(PrepareForRazorComponentGenerateDependsOn)">
+  </Target>
+
+  <Target Name="RazorGenerate" DependsOnTargets="$(RazorGenerateDependsOn)">
+  </Target>
+
+  <Target Name="RazorComponentGenerate" DependsOnTargets="$(RazorComponentGenerateDependsOn)">
+  </Target>
+
+  <Target Name="PrepareForRazorCompile" DependsOnTargets="$(PrepareForRazorCompileDependsOn)">
+  </Target>
+
+  <Target Name="RazorCompile" DependsOnTargets="$(RazorCompileDependsOn)">
+  </Target>
+
+  <!-- 
+    Computes the applicable @(ResolvedRazorConfiguration) and @(ResolvedRazorExtension) items that match the project's
+    configuration. 
+  -->
+  <Target
+    Name="ResolveRazorConfiguration"
+    Condition="'$(RazorDefaultConfiguration)'!=''">
+
+    <ItemGroup>
+      <ResolvedRazorConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(RazorDefaultConfiguration)')->Distinct())" />
+    </ItemGroup>
+
+    <FindInList List="@(RazorExtension)" ItemSpecToFind="@(ResolvedRazorConfiguration->Metadata('Extensions'))">
+      <Output TaskParameter="ItemFound" ItemName="ResolvedRazorExtension" />
+    </FindInList>
+  </Target>
+
+  <!--
+    Gets assembly attributes in support for Razor runtime code generation. This is a set of standard
+    metadata attributes (defined in Microsoft.AspNetCore.Razor.Runtime) that capture the build-time
+    Razor configuration of an application to be used at runtime.
+    
+    This allows the project file to act as the source of truth for the applicable Razor configuration regardless 
+    of how Razor is used.
+
+    The SDK expects configurations that use runtime compilation to set $(GenerateRazorHostingAssemblyInfo) to true,
+    it will be unset by default.
+  -->
+  <PropertyGroup>
+    <_GenerateRazorAssemblyInfoDependsOn>RazorGetAssemblyAttributes;$(_GenerateRazorAssemblyInfoDependsOn)</_GenerateRazorAssemblyInfoDependsOn>
+  </PropertyGroup>
+
+  <Target
+    Name="RazorGetAssemblyAttributes"
+    Condition="'$(GenerateRazorHostingAssemblyInfo)'=='true' and '$(RazorDefaultConfiguration)'!=''"
+    DependsOnTargets="ResolveRazorConfiguration">
+    <ItemGroup>
+      <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute">
+        <_Parameter1>$(RazorLangVersion)</_Parameter1>
+      </_RazorAssemblyAttribute>
+      <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute">
+        <_Parameter1>$(RazorDefaultConfiguration)</_Parameter1>
+      </_RazorAssemblyAttribute>
+      <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute" Condition="'%(ResolvedRazorExtension.AssemblyName)'!=''">
+        <_Parameter1>%(ResolvedRazorExtension.Identity)</_Parameter1>
+        <_Parameter2>%(ResolvedRazorExtension.AssemblyName)</_Parameter2>
+      </_RazorAssemblyAttribute>
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    Gathers input source files for code generation. This is a separate target so that we can avoid
+    lots of work when there are no inputs for code generation.
+    This target runs as part of PrepareForBuild. This gives us an opportunitity to change things like CopyToPublishDirectory
+    for Content items before they are processed by other Build targets.
+
+    NOTE: This target is called as part of an incremental build scenario in VS. Do not perform any work
+    outside of calculating RazorGenerate items in this target.
+  -->
+  <Target Name="ResolveRazorGenerateInputs">
+    <!--
+      In MVC Precompilation MvcRazorFilesToCompile also had the effect of suppressing the default
+      items for Razor code generation. As with all of these MVC Precompilation back-compat settings,
+      using the old thing, overrides the new thing.
+    -->
+    <PropertyGroup Condition="'@(MvcRazorFilesToCompile)'!=''">
+      <EnableDefaultRazorGenerateItems>false</EnableDefaultRazorGenerateItems>
+    </PropertyGroup>
+    <ItemGroup>
+      <RazorGenerate Include="@(MvcRazorFilesToCompile)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(EnableDefaultRazorGenerateItems)'=='true'">
+      <RazorGenerate Include="@(Content)" Condition="'%(Content.Extension)'=='.cshtml'" />
+    </ItemGroup>
+
+    <!--
+      Ideally we want to able to update all Content items that also appear in RazorGenerate to have
+      CopyToPublishDirectory=Never. However, there isn't a simple way to do this (https://github.com/Microsoft/msbuild/issues/1618). 
+      Instead, we'll update all cshtml Content items when EnableDefaultRazorGenerateItems=true and Razor Sdk is used for publishing.
+    -->
+    <ItemGroup Condition="
+      '$(EnableDefaultRazorGenerateItems)'=='true' and 
+      '$(CopyRazorGenerateFilesToPublishDirectory)'=='false' and 
+      '$(ResolvedRazorCompileToolset)'=='RazorSdk' and 
+      '$(RazorCompileOnPublish)'=='true'">
+
+      <Content Condition="'%(Content.Extension)'=='.cshtml'" CopyToPublishDirectory="Never" />
+    </ItemGroup>
+
+    <ItemGroup Condition="
+      '$(ResolvedRazorCompileToolset)'=='RazorSdk' and
+      '$(EnableDefaultRazorGenerateItems)'=='true'">
+
+      <Content Condition="'%(Content.Extension)'=='.cshtml'" Pack="$(IncludeRazorContentInPack)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="ResolveRazorComponentInputs">
+    <!--
+    Gathers input source files for Razor component generation. This is a separate target so that we can avoid
+    lots of work when there are no inputs for code generation.
+
+    NOTE: This target is called as part of an incremental build scenario in VS. Do not perform any work
+    outside of calculating RazorComponent items in this target.
+    -->
+
+    <ItemGroup Condition="'$(EnableDefaultRazorComponentItems)'=='true'">
+      <RazorComponent Include="@(Content)" Condition="'%(Content.Extension)'=='.razor'" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AssignRazorComponentTargetPaths" Condition="'@(RazorComponent)' != ''">
+    <AssignTargetPath Files="@(RazorComponent)" RootFolder="$(MSBuildProjectDirectory)">
+      <Output TaskParameter="AssignedFiles" ItemName="RazorComponentWithTargetPath" />
+    </AssignTargetPath>
+
+    <ItemGroup>
+      <RazorComponentWithTargetPath Condition="'%(RazorComponentWithTargetPath.GeneratedOutput)' == ''">
+        <GeneratedOutput>$(RazorGenerateIntermediateOutputPath)%(RazorComponentWithTargetPath.TargetPath)$(RazorGenerateOutputFileExtension)</GeneratedOutput>
+      </RazorComponentWithTargetPath>
+
+      <RazorComponentWithTargetPath Condition="'%(RazorComponentWithTargetPath.GeneratedDeclaration)' == ''">
+        <GeneratedDeclaration>$(_RazorComponentDeclarationOutputPath)%(RazorComponentWithTargetPath.TargetPath)$(RazorGenerateOutputFileExtension)</GeneratedDeclaration>
+      </RazorComponentWithTargetPath>
+
+      <RazorComponentWithTargetPath Condition="'%(RazorComponentWithTargetPath.DocumentKind)' == ''">
+        <DocumentKind>component</DocumentKind>
+      </RazorComponentWithTargetPath>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AssignRazorGenerateTargetPaths" Condition="'@(RazorGenerate)' != ''">
+    <AssignTargetPath Files="@(RazorGenerate)" RootFolder="$(MSBuildProjectDirectory)">
+      <Output TaskParameter="AssignedFiles" ItemName="RazorGenerateWithTargetPath" />
+    </AssignTargetPath>
+
+    <ItemGroup>
+      <RazorGenerateWithTargetPath Condition="'%(RazorGenerateWithTargetPath.GeneratedOutput)' == ''">
+        <GeneratedOutput>$(RazorGenerateIntermediateOutputPath)%(RazorGenerateWithTargetPath.TargetPath)$(RazorGenerateOutputFileExtension)</GeneratedOutput>
+      </RazorGenerateWithTargetPath>
+
+      <RazorGenerateWithTargetPath Condition="'%(RazorGenerateWithTargetPath.DocumentKind)' == ''">
+        <DocumentKind>mvc</DocumentKind>
+      </RazorGenerateWithTargetPath>
+    </ItemGroup>
+  </Target>
+
+  <!-- 
+    Gathers input assemblies for Tag Helper discovery and compilation. Add items to @(ReferencePath)
+  -->
+  <Target
+    Name="ResolveAssemblyReferenceRazorGenerateInputs"
+    DependsOnTargets="ResolveReferences">
+    <ItemGroup>
+      <RazorReferencePath Include="@(ReferencePath)"/>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <!--
+        Assembly of the project used as input in RazorGenerate. This property is overwritten to point to the definition assembly when components are present.
+      -->
+      <_RazorGenerateTargetReferenceAssembly Condition="'$(_RazorGenerateTargetReferenceAssembly)'==''">
+        @(IntermediateAssembly->Metadata('FullPath'))
+      </_RazorGenerateTargetReferenceAssembly>
+
+      <_RazorCompileTargetReferenceAssembly Condition="'$(_RazorCompileTargetReferenceAssembly)'==''">
+        @(IntermediateAssembly->Metadata('FullPath'))
+      </_RazorCompileTargetReferenceAssembly>
+    </PropertyGroup>
+  </Target>
+
+  <!--
+    Gathers inputs to the RazorCoreCompile target into the @(RazorCompile) itemgroup.
+
+    This is marker target so that the code generation targets can attach.
+  -->
+  <Target Name="ResolveRazorCompileInputs" DependsOnTargets="$(ResolveRazorCompileInputsDependsOn)">
+  </Target>
+
+  <Target Name="ResolveRazorEmbeddedResources" Condition="'$(EmbedRazorGenerateSources)'=='true'">
+    <ItemGroup>
+      <RazorEmbeddedResource Include="@(RazorGenerateWithTargetPath)">
+        <LogicalName>/$([System.String]::Copy('%(RazorGenerateWithTargetPath.TargetPath)').Replace('\','/'))</LogicalName>
+        <Type>Non-Resx</Type>
+        <WithCulture>false</WithCulture>
+      </RazorEmbeddedResource>
+
+      <!-- Similar to _GenerateCompileInputs -->
+      <_RazorCoreCompileResourceInputs
+        Include="@(RazorEmbeddedResource)"
+        Condition="'%(RazorEmbeddedResource.WithCulture)'=='false' and '%(RazorEmbeddedResource.Type)'=='Non-Resx' " />
+    </ItemGroup>
+  </Target>
+
+  <!--
+    This target is called after PrepareForPublish when RazorCompileOnPublish=true so that we can hook into publish.
+    This target just hooks up other targets since Publish and PrepareForPublish don't have a DependsOnTargets
+    property we can use. 
+  -->
+  <Target
+    Name="_RazorPrepareForPublish"
+    AfterTargets="PrepareForPublish"
+    DependsOnTargets="RazorCompile"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '$(NoBuild)'!='true'">
+  </Target>
+
+  <!--
+    This target adds the Razor assembly to the BuiltProjectOutputGroupOutput - which is used as input to the Pack target.
+  -->
+  <Target
+    Name="_RazorAddBuiltProjectOutputGroupOutput"
+    DependsOnTargets="_ResolveRazorTargetPath;ResolveRazorGenerateInputs"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
+
+    <ItemGroup Condition="'@(RazorGenerate)'!= ''">
+      <BuiltProjectOutputGroupOutput Include="%(RazorIntermediateAssembly.FullPath)" FinalOutputPath="$(RazorTargetPath)" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target
+    Name="_RazorAddDebugSymbolsProjectOutputGroupOutput"
+    DependsOnTargets="_ResolveRazorTargetPath;ResolveRazorGenerateInputs"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
+
+    <ItemGroup Condition="Exists('@(_RazorDebugSymbolsIntermediatePath)')">
+      <DebugSymbolsProjectOutputGroupOutput Include="%(_RazorDebugSymbolsIntermediatePath.FullPath)" FinalOutputPath="$(RazorTargetDir)$(RazorTargetName).pdb" />
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    Set up RazorCompile to run before PrepareForRun. This should ensure that the Razor dll and pdbs are available to be copied
+    as part of GetCopyToOutputDirectoryItems which is invoked during PrepareForRun.
+  -->
+  <Target
+    Name="_RazorPrepareForRun"
+    DependsOnTargets="RazorCompile"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'" />
+
+  <!--
+    Called as part of GetCopyToOutputDirectoryItems - this target populates the list of items that get
+    copied to the output directory when building as a project reference.
+  -->
+  <Target
+    Name="_RazorGetCopyToOutputDirectoryItems"
+    DependsOnTargets="ResolveRazorGenerateInputs"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
+
+    <!-- 
+      This condition needs to be inside the target because it the itemgroup will be populated after the target's
+      condition is evaluated.
+    -->
+    <ItemGroup Condition="'@(RazorGenerate)'!=''">
+      <AllItemsFullPathWithTargetPath Include="@(RazorIntermediateAssembly->'%(FullPath)')">
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </AllItemsFullPathWithTargetPath>
+      <AllItemsFullPathWithTargetPath Include="@(_RazorDebugSymbolsIntermediatePath->'%(FullPath)')">
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </AllItemsFullPathWithTargetPath>
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    Called as part of GetCopyToPublishDirectoryItems - this target populates the list of items that get
+    copied to the publish directory when publishing as a project reference.
+
+    The dependency on RazorCompile is needed because this will be called during publish on each P2P
+    reference without calling RazorCompile for the P2P references.
+  -->
+  <Target
+    Name="_RazorGetCopyToPublishDirectoryItems"
+    BeforeTargets="GetCopyToPublishDirectoryItems"
+    DependsOnTargets="ResolveRazorGenerateInputs"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true'">
+
+    <!-- 
+      This condition needs to be inside the target because it the itemgroup will be populated after the target's
+      condition is evaluated.
+    -->
+    <ItemGroup Condition="'@(RazorGenerate)'!=''">
+      <AllPublishItemsFullPathWithTargetPath Include="@(RazorIntermediateAssembly->'%(FullPath)')">
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </AllPublishItemsFullPathWithTargetPath>
+      <AllPublishItemsFullPathWithTargetPath Include="@(_RazorDebugSymbolsIntermediatePath->'%(FullPath)')">
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </AllPublishItemsFullPathWithTargetPath>
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    Called as part of CopyFilesToOutputDirectory - this target is called when building the project to copy
+    files to the output directory.
+  -->
+  <Target
+    Name="_RazorCopyFilesToOutputDirectory"
+    DependsOnTargets="_ResolveRazorTargetPath;RazorCompile"
+    AfterTargets="CopyFilesToOutputDirectory"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
+
+    <!-- Copy the Razor dll  -->
+    <Copy
+      SourceFiles="@(RazorIntermediateAssembly)"
+      DestinationFiles="$(RazorTargetPath)"
+      SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
+      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+      Retries="$(CopyRetryCount)"
+      RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+      UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
+      UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+      Condition="Exists('@(RazorIntermediateAssembly)') and '$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)' != 'true'">
+
+      <Output TaskParameter="DestinationFiles" ItemName="_RazorAssembly"/>
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+
+    <Message
+      Importance="High"
+      Text="$(MSBuildProjectName) -&gt; @(_RazorAssembly->'%(FullPath)')"
+      Condition="Exists('@(RazorIntermediateAssembly)') and '$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)'!='true'" />
+
+    <!-- Copy the Razor debug information file (.pdb), if any -->
+    <Copy
+      SourceFiles="@(_RazorDebugSymbolsIntermediatePath)"
+      DestinationFolder="$(RazorOutputPath)"
+      SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
+      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+      Retries="$(CopyRetryCount)"
+      RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+      UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
+      UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+      Condition="Exists('@(_RazorDebugSymbolsIntermediatePath)') and '$(SkipCopyingSymbolsToOutputDirectory)' != 'true' and '$(CopyOutputSymbolsToOutputDirectory)'=='true'">
+
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+
+    <!--
+    FastUpToDate check in VS does not consider the Views dll when determining if referencing projects need to be rebuilt.
+    We'll touch a marker file that is used during as input for up to date check. Based on
+    https://github.com/Microsoft/msbuild/blob/637f06e31ef46892faeb40044899a62a15b77f79/src/Tasks/Microsoft.Common.CurrentVersion.targets#L4364-L4368
+    -->
+    <Touch Files="@(CopyUpToDateMarker)" AlwaysCreate="true" Condition="'@(_RazorAssembly)' != ''">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
+
+  </Target>
+
+  <!--
+    Called after ComputeFilesToPublish and ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when 
+    publishing the project to get a list of files to the output directory.
+  -->
+  <Target
+    Name="_RazorComputeFilesToPublish"
+    AfterTargets="ComputeRefAssembliesToPublish"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '@(RazorGenerate)'!=''">
+
+    <!-- If we generated an assembly/pdb then include those -->
+    <ItemGroup>
+      <ResolvedFileToPublish Include="@(RazorIntermediateAssembly)" Condition="'$(CopyBuildOutputToPublishDirectory)'=='true'">
+        <RelativePath>@(RazorIntermediateAssembly->'%(Filename)%(Extension)')</RelativePath>
+      </ResolvedFileToPublish>
+      <ResolvedFileToPublish Include="@(_RazorDebugSymbolsIntermediatePath)" Condition="'$(CopyOutputSymbolsToPublishDirectory)'=='true'">
+        <RelativePath>@(_RazorDebugSymbolsIntermediatePath->'%(Filename)%(Extension)')</RelativePath>
+      </ResolvedFileToPublish>
+    </ItemGroup>
+
+    <!--
+      RazorGenerate items are usually populated from the '.cshtml' files in @(Content). These are published by default
+      so all we need to do is exclude them. 
+    -->
+    <ItemGroup Condition="'$(CopyRazorGenerateFilesToPublishDirectory)'=='false'">
+      <ResolvedFileToPublish Remove="%(RazorGenerate.FullPath)"/>
+    </ItemGroup>
+  </Target>
+
+  <Target
+    Name="_RazorRemoveRefAssembliesFromPublish"
+    AfterTargets="ComputeRefAssembliesToPublish"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '$(CopyRefAssembliesToPublishDirectory)'=='false'">
+    <!--
+      The ref assemblies are published whenever PreserveCompilationContext is true, which we expect to be true for
+      most usages of Razor. There's no setting that excludes just the ref assemblies, so we do it ourselves. 
+    -->
+    <ItemGroup>
+      <ResolvedFileToPublish
+        Remove="%(ResolvedFileToPublish.Identity)"
+        Condition="'%(ResolvedFileToPublish.RelativePath)'=='$(RefAssembliesFolderName)\%(Filename)%(Extension)'"/>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_CheckForMissingRazorCompiler" Condition="'$(IsRazorCompilerReferenced)' != 'true'">
+    <Error
+      Text="A PackageReference for 'Microsoft.AspNetCore.Razor.Design' was not included in your project. This package is required to compile Razor files. Typically, a
+      transitive reference to 'Microsoft.AspNetCore.Razor.Design' and references required to compile Razor files are obtained by adding a PackageReference
+      for 'Microsoft.AspNetCore.Mvc' in your project. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
+  </Target>
+
+  <Target Name="_ResolveRazorTargetPath">
+    <PropertyGroup>
+      <RazorOutputPath Condition="'$(RazorOutputPath)'==''">$([MSBuild]::EnsureTrailingSlash('$(OutDir)'))</RazorOutputPath>
+      <RazorTargetDir>$([MSBuild]::Escape($([MSBuild]::EnsureTrailingSlash($([System.IO.Path]::GetFullPath('$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(RazorOutputPath)'))'))))))</RazorTargetDir>
+      <!-- Example, c:\MyProjects\MyProject\bin\debug\MyAssembly.Views.dll -->
+      <RazorTargetPath Condition=" '$(RazorTargetPath)' == '' ">$(RazorTargetDir)$(RazorTargetName).dll</RazorTargetPath>
+    </PropertyGroup>
+  </Target>
+
+  <PropertyGroup Condition="'$(RazorDesignTimeTargets)'==''">
+    <RazorDesignTimeTargets>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Razor\Microsoft.NET.Sdk.Razor.DesignTime.targets</RazorDesignTimeTargets>
+    <RazorDesignTimeTargets Condition="!Exists('$(RazorDesignTimeTargets)')">$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Razor.DesignTime.targets</RazorDesignTimeTargets>
+  </PropertyGroup>
+
+  <Import Project="$(RazorDesignTimeTargets)" />
+
+  <!--
+    This is a hook to import a set of targets after the Razor targets. By default this is unused.
+  -->
+  <Import Project="$(CustomAfterRazorSdkTargets)" Condition="'$(CustomAfterRazorSdkTargets)' != '' and Exists('$(CustomAfterRazorSdkTargets)')"/>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
new file mode 100644
index 0000000000..3515931928
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
@@ -0,0 +1,17 @@
+<!--
+***********************************************************************************************
+Microsoft.Net.Sdk.Razor.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <PropertyGroup>
+    <RazorSdkCurrentVersionProps>$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+    <RazorSdkCurrentVersionTargets>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.MultiTargeting.targets</RazorSdkCurrentVersionTargets>
+  </PropertyGroup>
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets
new file mode 100644
index 0000000000..a4e070ef57
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets
@@ -0,0 +1,22 @@
+<!--
+***********************************************************************************************
+Sdk.Razor.CurrentVersion.MultiTargeting.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+
+  <Target Name="RazorCompile">
+    <Error Text="The 'RazorCompile' target is not supported without specifying a target framework. The current project targets multiple frameworks, please specify a framework to execute this target." />
+  </Target>
+
+  <Target Name="RazorGenerate">
+    <Error Text="The 'RazorGenerate' target is not supported without specifying a target framework. The current project targets multiple frameworks, please specify a framework to execute this target." />
+  </Target>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
new file mode 100644
index 0000000000..00e8491e1f
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
@@ -0,0 +1,41 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal static partial class BuildVariables
+    {
+        private static string _msBuildPath = string.Empty;
+        private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
+        private static string _netStandardLibrary20PackageVersion = string.Empty;
+
+        static partial void InitializeVariables();
+
+        public static string MSBuildPath
+        {
+            get
+            {
+                InitializeVariables();
+                return _msBuildPath;
+            }
+        }
+
+        public static string MicrosoftNETCoreApp30PackageVersion
+        {
+            get
+            {
+                InitializeVariables();
+                return _microsoftNETCoreApp30PackageVersion;
+            }
+        }
+
+        public static string NETStandardLibrary20PackageVersion
+        {
+            get
+            {
+                InitializeVariables();
+                return _netStandardLibrary20PackageVersion;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template
new file mode 100644
index 0000000000..4b0b995bc6
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal static partial class BuildVariables
+    {
+        static partial void InitializeVariables()
+        {
+            _msBuildPath = @"${MSBuildLocation}";
+            _microsoftNETCoreApp30PackageVersion = "${MicrosoftNETCoreApp30PackageVersion}";
+            _netStandardLibrary20PackageVersion = "${NETStandardLibrary20PackageVersion}";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
new file mode 100644
index 0000000000..273c90ddda
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -0,0 +1,733 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal class Assert : Xunit.Assert
+    {
+        // Matches `{filename}: error {code}: {message} [{project}]
+        // See https://stackoverflow.com/questions/3441452/msbuild-and-ignorestandarderrorwarningformat/5180353#5180353
+        private static readonly Regex ErrorRegex = new Regex(@"^(?'location'.+): error (?'errorcode'[A-Z0-9]+): (?'message'.+) \[(?'project'.+)\]$");
+
+        public static void BuildPassed(MSBuildResult result)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (result.ExitCode != 0)
+            {
+                throw new BuildFailedException(result);
+            }
+        }
+
+        public static void BuildError(MSBuildResult result, string errorCode, string location = null)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            // We don't really need to search line by line, I'm doing this so that it's possible/easy to debug.
+            var lines = result.Output.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i];
+                var match = ErrorRegex.Match(line);
+                if (match.Success)
+                {
+                    if (match.Groups["errorcode"].Value != errorCode)
+                    {
+                        continue;
+                    }
+
+                    if (location != null && match.Groups["location"].Value.Trim() != location)
+                    {
+                        continue;
+                    }
+
+                    // This is a match
+                    return;
+                }
+            }
+
+            throw new BuildErrorMissingException(result, errorCode, location);
+        }
+
+        public static void BuildFailed(MSBuildResult result)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            };
+
+            if (result.ExitCode == 0)
+            {
+                throw new BuildPassedException(result);
+            }
+        }
+
+        public static void BuildOutputContainsLine(MSBuildResult result, string match)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (match == null)
+            {
+                throw new ArgumentNullException(nameof(match));
+            }
+
+            // We don't really need to search line by line, I'm doing this so that it's possible/easy to debug.
+            var lines = result.Output.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i].Trim();
+                if (line == match)
+                {
+                    return;
+                }
+            }
+
+            throw new BuildOutputMissingException(result, match);
+        }
+
+        public static void BuildOutputDoesNotContainLine(MSBuildResult result, string match)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (match == null)
+            {
+                throw new ArgumentNullException(nameof(match));
+            }
+
+            // We don't really need to search line by line, I'm doing this so that it's possible/easy to debug.
+            var lines = result.Output.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i].Trim();
+                if (line == match)
+                {
+                    throw new BuildOutputContainsLineException(result, match);
+                }
+            }
+        }
+
+        public static void FileContains(MSBuildResult result, string filePath, string match)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            filePath = Path.Combine(result.Project.DirectoryPath, filePath);
+            FileExists(result, filePath);
+
+            var text = File.ReadAllText(filePath);
+            if (text.Contains(match))
+            {
+                return;
+            }
+
+            throw new FileContentMissingException(result, filePath, File.ReadAllText(filePath), match);
+        }
+
+        public static void FileDoesNotContain(MSBuildResult result, string filePath, string match)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            filePath = Path.Combine(result.Project.DirectoryPath, filePath);
+            FileExists(result, filePath);
+
+            var text = File.ReadAllText(filePath);
+            if (text.Contains(match))
+            {
+                throw new FileContentFoundException(result, filePath, File.ReadAllText(filePath), match);
+            }
+        }
+
+        public static void FileContentEquals(MSBuildResult result, string filePath, string expected)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            filePath = Path.Combine(result.Project.DirectoryPath, filePath);
+            FileExists(result, filePath);
+
+            var actual = File.ReadAllText(filePath);
+            if (!actual.Equals(expected, StringComparison.Ordinal))
+            {
+                throw new FileContentNotEqualException(result, filePath, expected, actual);
+            }
+        }
+
+        public static void FileContainsLine(MSBuildResult result, string filePath, string match)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            filePath = Path.Combine(result.Project.DirectoryPath, filePath);
+            FileExists(result, filePath);
+
+            var lines = File.ReadAllLines(filePath);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i].Trim();
+                if (line == match)
+                {
+                    return;
+                }
+            }
+
+            throw new FileContentMissingException(result, filePath, File.ReadAllText(filePath), match);
+        }
+
+        public static void FileDoesNotContainLine(MSBuildResult result, string filePath, string match)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            filePath = Path.Combine(result.Project.DirectoryPath, filePath);
+            FileExists(result, filePath);
+
+            var lines = File.ReadAllLines(filePath);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i].Trim();
+                if (line == match)
+                {
+                    throw new FileContentFoundException(result, filePath, File.ReadAllText(filePath), match);
+                }
+            }
+        }
+
+        public static string FileExists(MSBuildResult result, params string[] paths)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var filePath = Path.Combine(result.Project.DirectoryPath, Path.Combine(paths));
+            if (!File.Exists(filePath))
+            {
+                throw new FileMissingException(result, filePath);
+            }
+
+            return filePath;
+        }
+
+        public static void FileCountEquals(MSBuildResult result, int expected, string directoryPath, string searchPattern)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (directoryPath == null)
+            {
+                throw new ArgumentNullException(nameof(directoryPath));
+            }
+
+            if (searchPattern == null)
+            {
+                throw new ArgumentNullException(nameof(searchPattern));
+            }
+
+            directoryPath = Path.Combine(result.Project.DirectoryPath, directoryPath);
+
+            if (Directory.Exists(directoryPath))
+            {
+                var files = Directory.GetFiles(directoryPath, searchPattern, SearchOption.AllDirectories);
+                if (files.Length != expected)
+                {
+                    throw new FileCountException(result, expected, directoryPath, searchPattern, files);
+                }
+            }
+            else if (expected > 0)
+            {
+                // directory doesn't exist, that's OK if we expected to find nothing.
+                throw new FileCountException(result, expected, directoryPath, searchPattern, Array.Empty<string>());
+            }
+        }
+
+        public static void FileDoesNotExist(MSBuildResult result, params string[] paths)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var filePath = Path.Combine(result.Project.DirectoryPath, Path.Combine(paths));
+            if (File.Exists(filePath))
+            {
+                throw new FileFoundException(result, filePath);
+            }
+        }
+
+        public static void NuspecContains(MSBuildResult result, string nuspecPath, string expected)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (nuspecPath == null)
+            {
+                throw new ArgumentNullException(nameof(nuspecPath));
+            }
+
+            if (expected == null)
+            {
+                throw new ArgumentNullException(nameof(expected));
+            }
+
+            nuspecPath = Path.Combine(result.Project.DirectoryPath, nuspecPath);
+            FileExists(result, nuspecPath);
+
+            var content = File.ReadAllText(nuspecPath);
+            if (!content.Contains(expected))
+            {
+                throw new NuspecException(result, nuspecPath, content, expected);
+            }
+        }
+
+        public static void NuspecDoesNotContain(MSBuildResult result, string nuspecPath, string expected)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (nuspecPath == null)
+            {
+                throw new ArgumentNullException(nameof(nuspecPath));
+            }
+
+            if (expected == null)
+            {
+                throw new ArgumentNullException(nameof(expected));
+            }
+
+            nuspecPath = Path.Combine(result.Project.DirectoryPath, nuspecPath);
+            FileExists(result, nuspecPath);
+
+            var content = File.ReadAllText(nuspecPath);
+            if (content.Contains(expected))
+            {
+                throw new NuspecFoundException(result, nuspecPath, content, expected);
+            }
+        }
+
+        // This method extracts the nupkg to a fixed directory path. To avoid the extra work of
+        // cleaning up after each invocation, this method accepts multiple files.
+        public static void NupkgContains(MSBuildResult result, string nupkgPath, params string[] filePaths)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (nupkgPath == null)
+            {
+                throw new ArgumentNullException(nameof(nupkgPath));
+            }
+
+            if (filePaths == null)
+            {
+                throw new ArgumentNullException(nameof(filePaths));
+            }
+
+            nupkgPath = Path.Combine(result.Project.DirectoryPath, nupkgPath);
+            FileExists(result, nupkgPath);
+
+            var unzipped = Path.Combine(result.Project.DirectoryPath, Path.GetFileNameWithoutExtension(nupkgPath));
+            ZipFile.ExtractToDirectory(nupkgPath, unzipped);
+
+            foreach (var filePath in filePaths)
+            {
+                if (!File.Exists(Path.Combine(unzipped, filePath)))
+                {
+                    throw new NupkgFileMissingException(result, nupkgPath, filePath);
+                }
+            }
+        }
+
+        public static void AssemblyContainsType(MSBuildResult result, string assemblyPath, string fullTypeName)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            assemblyPath = Path.Combine(result.Project.DirectoryPath, Path.Combine(assemblyPath));
+            using (var file = File.OpenRead(assemblyPath))
+            {
+                var peReader = new PEReader(file);
+                var metadataReader = peReader.GetMetadataReader();
+                var typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
+                {
+                    var type = metadataReader.GetTypeDefinition(t);
+                    return metadataReader.GetString(type.Namespace) + "." + metadataReader.GetString(type.Name);
+                });
+
+                Assert.Contains(fullTypeName, typeNames);
+            }
+        }
+
+        private abstract class MSBuildXunitException : Xunit.Sdk.XunitException
+        {
+            protected MSBuildXunitException(MSBuildResult result)
+            {
+                Result = result;
+            }
+
+            protected abstract string Heading { get; }
+
+            public MSBuildResult Result { get; }
+
+            public override string Message
+            {
+                get
+                {
+                    var message = new StringBuilder();
+                    message.AppendLine(Heading);
+                    message.Append(Result.FileName);
+                    message.Append(" ");
+                    message.Append(Result.Arguments);
+                    message.AppendLine();
+                    message.AppendLine();
+                    message.Append(Result.Output);
+                    return message.ToString();
+                }
+            }
+        }
+
+        private class BuildErrorMissingException : MSBuildXunitException
+        {
+            public BuildErrorMissingException(MSBuildResult result, string errorCode, string location)
+                : base(result)
+            {
+                ErrorCode = errorCode;
+                Location = location;
+            }
+
+            public string ErrorCode { get; }
+
+            public string Location { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    return
+                        $"Error code '{ErrorCode}' was not found." + Environment.NewLine +
+                        $"Looking for '{Location ?? ".*"}: error {ErrorCode}: .*'";
+                }
+            }
+        }
+
+        private class BuildFailedException : MSBuildXunitException
+        {
+            public BuildFailedException(MSBuildResult result)
+                : base(result)
+            {
+            }
+
+            protected override string Heading => "Build failed.";
+        }
+
+        private class BuildPassedException : MSBuildXunitException
+        {
+            public BuildPassedException(MSBuildResult result)
+                : base(result)
+            {
+            }
+
+            protected override string Heading => "Build should have failed, but it passed.";
+        }
+
+        private class BuildOutputMissingException : MSBuildXunitException
+        {
+            public BuildOutputMissingException(MSBuildResult result, string match)
+                : base(result)
+            {
+                Match = match;
+            }
+
+            public string Match { get; }
+
+            protected override string Heading => $"Build did not contain the line: '{Match}'.";
+        }
+
+        private class BuildOutputContainsLineException : MSBuildXunitException
+        {
+            public BuildOutputContainsLineException(MSBuildResult result, string match)
+                : base(result)
+            {
+                Match = match;
+            }
+
+            public string Match { get; }
+
+            protected override string Heading => $"Build output contains the line: '{Match}'.";
+        }
+
+        private class FileContentFoundException : MSBuildXunitException
+        {
+            public FileContentFoundException(MSBuildResult result, string filePath, string content, string match)
+                : base(result)
+            {
+                FilePath = filePath;
+                Content = content;
+                Match = match;
+            }
+
+            public string Content { get; }
+
+            public string FilePath { get; }
+
+            public string Match { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendFormat("File content of '{0}' should not contain line: '{1}'.", FilePath, Match);
+                    builder.AppendLine();
+                    builder.AppendLine();
+                    builder.AppendLine(Content);
+                    return builder.ToString();
+                }
+            }
+        }
+
+        private class FileContentMissingException : MSBuildXunitException
+        {
+            public FileContentMissingException(MSBuildResult result, string filePath, string content, string match)
+                : base(result)
+            {
+                FilePath = filePath;
+                Content = content;
+                Match = match;
+            }
+
+            public string Content { get; }
+
+            public string FilePath { get; }
+
+            public string Match { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendFormat("File content of '{0}' did not contain the line: '{1}'.", FilePath, Match);
+                    builder.AppendLine();
+                    builder.AppendLine();
+                    builder.AppendLine(Content);
+                    return builder.ToString();
+                }
+            }
+        }
+
+        private class FileContentNotEqualException : MSBuildXunitException
+        {
+            public FileContentNotEqualException(MSBuildResult result, string filePath, string expected, string actual)
+                : base(result)
+            {
+                FilePath = filePath;
+                Expected = expected;
+                Actual = actual;
+            }
+
+            public string Actual { get; }
+
+            public string FilePath { get; }
+
+            public string Expected { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendFormat("File content of '{0}' did not match the expected content: '{1}'.", FilePath, Expected);
+                    builder.AppendLine();
+                    builder.AppendLine();
+                    builder.AppendLine(Actual);
+                    return builder.ToString();
+                }
+            }
+        }
+
+        private class FileMissingException : MSBuildXunitException
+        {
+            public FileMissingException(MSBuildResult result, string filePath)
+                : base(result)
+            {
+                FilePath = filePath;
+            }
+
+            public string FilePath { get; }
+
+            protected override string Heading => $"File: '{FilePath}' was not found.";
+        }
+
+        private class FileCountException : MSBuildXunitException
+        {
+            public FileCountException(MSBuildResult result, int expected, string directoryPath, string searchPattern, string[] files)
+                : base(result)
+            {
+                Expected = expected;
+                DirectoryPath = directoryPath;
+                SearchPattern = searchPattern;
+                Files = files;
+            }
+
+            public string DirectoryPath { get; }
+
+            public int Expected { get; }
+
+            public string[] Files { get; }
+
+            public string SearchPattern { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    var heading = new StringBuilder();
+                    heading.AppendLine($"Expected {Expected} files matching {SearchPattern} in {DirectoryPath}, found {Files.Length}.");
+
+                    if (Files.Length > 0)
+                    {
+                        heading.AppendLine("Files:");
+
+                        foreach (var file in Files)
+                        {
+                            heading.Append("\t");
+                            heading.Append(file);
+                        }
+
+                        heading.AppendLine();
+                    }
+
+                    return heading.ToString();
+                }
+            }
+        }
+
+        private class FileFoundException : MSBuildXunitException
+        {
+            public FileFoundException(MSBuildResult result, string filePath)
+                : base(result)
+            {
+                FilePath = filePath;
+            }
+
+            public string FilePath { get; }
+
+            protected override string Heading => $"File: '{FilePath}' was found, but should not exist.";
+        }
+
+        private class NuspecException : MSBuildXunitException
+        {
+            public NuspecException(MSBuildResult result, string filePath, string content, string expected)
+                : base(result)
+            {
+                FilePath = filePath;
+                Content = content;
+                Expected = expected;
+            }
+
+            public string Content { get; }
+
+            public string Expected { get; }
+
+            public string FilePath { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    return
+                        $"nuspec: '{FilePath}' did not contain the expected content." + Environment.NewLine +
+                        Environment.NewLine +
+                        $"expected: {Expected}" + Environment.NewLine +
+                        Environment.NewLine +
+                        $"actual: {Content}";
+                }
+            }
+        }
+
+        private class NuspecFoundException : MSBuildXunitException
+        {
+            public NuspecFoundException(MSBuildResult result, string filePath, string content, string expected)
+                : base(result)
+            {
+                FilePath = filePath;
+                Content = content;
+                Expected = expected;
+            }
+
+            public string Content { get; }
+
+            public string Expected { get; }
+
+            public string FilePath { get; }
+
+            protected override string Heading
+            {
+                get
+                {
+                    return
+                        $"nuspec: '{FilePath}' should not contain the content {Expected}." +
+                        Environment.NewLine +
+                        $"actual content: {Content}";
+                }
+            }
+        }
+
+        private class NupkgFileMissingException : MSBuildXunitException
+        {
+            public NupkgFileMissingException(MSBuildResult result, string nupkgPath, string filePath)
+                : base(result)
+            {
+                NupkgPath = nupkgPath;
+                FilePath = filePath;
+            }
+
+            public string FilePath { get; }
+
+            public string NupkgPath { get; }
+
+            protected override string Heading => $"File: '{FilePath}' was not found was not found in {NupkgPath}.";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
new file mode 100644
index 0000000000..074e3083e4
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -0,0 +1,360 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIncrementalismTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildIncrementalismTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "See https://github.com/aspnet/Razor/issues/2219")]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task BuildIncremental_SimpleMvc_PersistsTargetInputFile()
+        {
+            // Arrange
+            var thumbprintLookup = new Dictionary<string, FileThumbPrint>();
+
+            // Act 1
+            var result = await DotnetMSBuild("Build");
+
+            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
+            var filesToIgnore = new[]
+            {
+                // These files are generated on every build.
+                Path.Combine(directoryPath, "SimpleMvc.csproj.CopyComplete"),
+                Path.Combine(directoryPath, "SimpleMvc.csproj.FileListAbsolute.txt"),
+            };
+
+            var files = Directory.GetFiles(directoryPath).Where(p => !filesToIgnore.Contains(p));
+            foreach (var file in files)
+            {
+                var thumbprint = GetThumbPrint(file);
+                thumbprintLookup[file] = thumbprint;
+            }
+
+            // Assert 1
+            Assert.BuildPassed(result);
+
+            // Act & Assert 2
+            for (var i = 0; i < 2; i++)
+            {
+                // We want to make sure nothing changed between multiple incremental builds.
+                using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
+                {
+                    result = await DotnetMSBuild("Build");
+                }
+
+                Assert.BuildPassed(result);
+                foreach (var file in files)
+                {
+                    var thumbprint = GetThumbPrint(file);
+                    Assert.Equal(thumbprintLookup[file], thumbprint);
+                }
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_RegeneratesTagHelperInputs_IfFileChanges()
+        {
+            // Act - 1
+            var expectedTagHelperCacheContent = @"""Name"":""SimpleMvc.SimpleTagHelper""";
+            var result = await DotnetMSBuild("Build");
+            var file = Path.Combine(Project.DirectoryPath, "SimpleTagHelper.cs");
+            var tagHelperOutputCache = Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            // Assert - 1
+            Assert.BuildPassed(result);
+            Assert.FileContains(result, tagHelperOutputCache, expectedTagHelperCacheContent);
+            var fileThumbPrint = GetThumbPrint(generatedFile);
+
+            // Act - 2
+            // Update the source content and build. We should expect the outputs to be regenerated.
+            ReplaceContent(string.Empty, file);
+            result = await DotnetMSBuild("Build");
+
+            // Assert - 2
+            Assert.BuildPassed(result);
+            Assert.FileContentEquals(result, tagHelperOutputCache, "[]");
+            var newThumbPrint = GetThumbPrint(generatedFile);
+            Assert.NotEqual(fileThumbPrint, newThumbPrint);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ErrorInGeneratedCode_ReportsMSBuildError_OnIncrementalBuild()
+        {
+            // Introducing a Razor semantic error
+            ReplaceContent("@{ // Unterminated code block", "Views", "Home", "Index.cshtml");
+
+            // Regular build
+            await VerifyError();
+
+            // Incremental build
+            await VerifyError();
+
+            async Task VerifyError()
+            {
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildFailed(result);
+
+                // This needs to be relative path. Tracked by https://github.com/aspnet/Razor/issues/2187.
+                var filePath = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
+                var location = filePath + "(1,2)";
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    // Absolute paths on OSX don't work well.
+                    location = null;
+                }
+
+                Assert.BuildError(result, "RZ1006", location: location);
+
+                // Compilation failed without creating the views assembly
+                Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+                // File with error does not get written to disk.
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "Razor", "Views", "Home", "Index.cshtml.g.cs");
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildComponents_ErrorInGeneratedCode_ReportsMSBuildError_OnIncrementalBuild()
+        {
+            // Introducing a Razor semantic error
+            ReplaceContent("@{ // Unterminated code block", "Views", "Shared", "NavMenu.razor");
+
+            // Regular build
+            await VerifyError();
+
+            // Incremental build
+            await VerifyError();
+
+            async Task VerifyError()
+            {
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildFailed(result);
+
+                // This needs to be relative path. Tracked by https://github.com/aspnet/Razor/issues/2187.
+                var filePath = Path.Combine(Project.DirectoryPath, "Views", "Shared", "NavMenu.razor");
+                var location = filePath + "(1,2)";
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    // Absolute paths on OSX don't work well.
+                    location = null;
+                }
+
+                Assert.BuildError(result, "RZ1006", location: location);
+
+                // Compilation failed without creating the views assembly
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "MvcWithComponents.dll");
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "MvcWithComponents.Views.dll");
+
+                // File with error does not get written to disk.
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "RazorComponents", "Views", "Shared", "NavMenu.razor.g.cs");
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildComponents_RegeneratesComponentDefinition_WhenFilesChange()
+        {
+            // Act - 1
+            var tagHelperOutputCache = Path.Combine(IntermediateOutputPath, "MvcWithComponents.TagHelpers.output.cache");
+
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+            var generatedDefinitionFile = Path.Combine(RazorComponentIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+
+            // Assert - 1
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            var outputFile = Path.Combine(OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            var outputAssemblyThumbprint = GetThumbPrint(outputFile);
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            var generatedDefinitionThumbprint = GetThumbPrint(generatedDefinitionFile);
+            Assert.FileExists(result, generatedFile);
+            var generatedFileThumbprint = GetThumbPrint(generatedFile);
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            var definitionThumbprint = GetThumbPrint(tagHelperOutputCache);
+
+            // Act - 2
+            ReplaceContent("Different things", "Views", "Shared", "NavMenu.razor");
+            result = await DotnetMSBuild("Build");
+
+            // Assert - 2
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.NotEqual(outputAssemblyThumbprint, GetThumbPrint(outputFile));
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            Assert.NotEqual(generatedDefinitionThumbprint, GetThumbPrint(generatedDefinitionFile));
+            Assert.FileExists(result, generatedFile);
+            Assert.NotEqual(generatedFileThumbprint, GetThumbPrint(generatedFile));
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            // TODO:
+            Assert.Equal(definitionThumbprint, GetThumbPrint(tagHelperOutputCache));
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildComponents_DoesNotModifyFiles_IfFilesDoNotChange()
+        {
+            // Act - 1
+            var tagHelperOutputCache = Path.Combine(IntermediateOutputPath, "MvcWithComponents.TagHelpers.output.cache");
+
+            var file = Path.Combine(Project.DirectoryPath, "Views", "Shared", "NavMenu.razor.g.cs");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+            var generatedDefinitionFile = Path.Combine(RazorComponentIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+
+            // Assert - 1
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            var outputFile = Path.Combine(OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            var outputAssemblyThumbprint = GetThumbPrint(outputFile);
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            var generatedDefinitionThumbprint = GetThumbPrint(generatedDefinitionFile);
+            Assert.FileExists(result, generatedFile);
+            var generatedFileThumbprint = GetThumbPrint(generatedFile);
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            var definitionThumbprint = GetThumbPrint(tagHelperOutputCache);
+
+            // Act - 2
+            result = await DotnetMSBuild("Build");
+
+            // Assert - 2
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.Equal(outputAssemblyThumbprint, GetThumbPrint(outputFile));
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            Assert.Equal(generatedDefinitionThumbprint, GetThumbPrint(generatedDefinitionFile));
+            Assert.FileExists(result, generatedFile);
+            Assert.Equal(generatedFileThumbprint, GetThumbPrint(generatedFile));
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            Assert.Equal(definitionThumbprint, GetThumbPrint(tagHelperOutputCache));
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task IncrementalBuild_WithP2P_WorksWhenBuildProjectReferencesIsDisabled()
+        {
+            // Simulates building the same way VS does by setting BuildProjectReferences=false.
+            // With this flag, the only target called is GetCopyToOutputDirectoryItems on the referenced project.
+            // We need to ensure that we continue providing Razor binaries and symbols as files to be copied over.
+            var result = await DotnetMSBuild(target: default);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.pdb");
+
+            result = await DotnetMSBuild(target: "Clean", "/p:BuildProjectReferences=false", suppressRestore: true);
+            Assert.BuildPassed(result);
+
+            Assert.FileDoesNotExist(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "ClassLibrary.Views.pdb");
+
+            // dotnet msbuild /p:BuildProjectReferences=false
+            result = await DotnetMSBuild(target: default, "/p:BuildProjectReferences=false", suppressRestore: true);
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_TouchesUpToDateMarkerFile()
+        {
+            var classLibraryDll = Path.Combine(IntermediateOutputPath, "ClassLibrary.dll");
+            var classLibraryViewsDll = Path.Combine(IntermediateOutputPath, "ClassLibrary.Views.dll");
+            var markerFile = Path.Combine(IntermediateOutputPath, "ClassLibrary.csproj.CopyComplete");
+
+            var result = await DotnetMSBuild("Build");
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, classLibraryDll);
+            Assert.FileExists(result, classLibraryViewsDll);
+            Assert.FileExists(result, markerFile);
+
+            // Gather thumbprints before incremental build.
+            var classLibraryThumbPrint = GetThumbPrint(classLibraryDll);
+            var classLibraryViewsThumbPrint = GetThumbPrint(classLibraryViewsDll);
+            var markerFileThumbPrint = GetThumbPrint(markerFile);
+
+            result = await DotnetMSBuild("Build");
+            Assert.BuildPassed(result);
+
+            // Verify thumbprint file is unchanged between true incremental builds
+            Assert.Equal(classLibraryThumbPrint, GetThumbPrint(classLibraryDll));
+            Assert.Equal(classLibraryViewsThumbPrint, GetThumbPrint(classLibraryViewsDll));
+            // In practice, this should remain unchanged. However, since our tests reference
+            // binaries from other projects, this file gets updated by Microsoft.Common.targets
+            Assert.NotEqual(markerFileThumbPrint, GetThumbPrint(markerFile));
+
+            // Change a cshtml file and verify ClassLibrary.Views.dll and marker file are updated
+            File.AppendAllText(Path.Combine(Project.DirectoryPath, "Views", "_ViewImports.cshtml"), Environment.NewLine);
+
+            result = await DotnetMSBuild("Build");
+            Assert.BuildPassed(result);
+
+            Assert.Equal(classLibraryThumbPrint, GetThumbPrint(classLibraryDll));
+            Assert.NotEqual(classLibraryViewsThumbPrint, GetThumbPrint(classLibraryViewsDll));
+            Assert.NotEqual(markerFileThumbPrint, GetThumbPrint(markerFile));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
new file mode 100644
index 0000000000..564b8b2745
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -0,0 +1,684 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.DependencyModel;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public Task Build_SimpleMvc_UsingDotnetMSBuildAndWithoutBuildServer_CanBuildSuccessfully()
+            => Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind.Dotnet);
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("SimpleMvc")]
+        public Task Build_SimpleMvc_UsingDesktopMSBuildAndWithoutBuildServer_CanBuildSuccessfully()
+            => Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind.Desktop);
+
+        // This test is identical to the ones in BuildServerIntegrationTest except this one explicitly disables the Razor build server.
+        private async Task Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind msBuildProcessKind)
+        {
+            var result = await DotnetMSBuild("Build",
+                "/p:UseRazorBuildServer=false",
+                suppressBuildServer: true,
+                msBuildProcessKind: msBuildProcessKind);
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
+
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // GetFullPath on OSX doesn't work well in travis. We end up computing a different path than will
+                // end up in the MSBuild logs.
+                Assert.BuildOutputContainsLine(result, $"SimpleMvc -> {Path.Combine(Path.GetFullPath(Project.DirectoryPath), OutputPath, "SimpleMvc.Views.dll")}");
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_SimpleMvc_NoopsWithNoFiles()
+        {
+            Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
+
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_SimpleMvc_NoopsWithRazorCompileOnBuild_False()
+        {
+            var result = await DotnetMSBuild("Build", "/p:RazorCompileOnBuild=false");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ErrorInGeneratedCode_ReportsMSBuildError()
+        {
+            // Introducing a C# semantic error
+            ReplaceContent("@{ var foo = \"\".Substring(\"bleh\"); }", "Views", "Home", "Index.cshtml");
+
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildFailed(result);
+
+            // Verifying that the error correctly gets mapped to the original source
+            Assert.BuildError(result, "CS1503", location: Path.Combine("Views", "Home", "Index.cshtml") + "(1,27)");
+
+            // Compilation failed without creating the views assembly
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimplePages")]
+        public async Task Build_Works_WhenFilesAtDifferentPathsHaveSameNamespaceHierarchy()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimplePages.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimplePages.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_RazorOutputPath_SetToNonDefault()
+        {
+            var customOutputPath = Path.Combine("bin", Configuration, TargetFramework, "Razor");
+            var result = await DotnetMSBuild("Build", $"/p:RazorOutputPath={customOutputPath}");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, customOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, customOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_MvcRazorOutputPath_SetToNonDefault()
+        {
+            var customOutputPath = Path.Combine("bin", Configuration, TargetFramework, "Razor");
+            var result = await DotnetMSBuild("Build", $"/p:MvcRazorOutputPath={customOutputPath}");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, customOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, customOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_SkipsCopyingBinariesToOutputDirectory_IfCopyBuildOutputToOutputDirectory_IsUnset()
+        {
+            var result = await DotnetMSBuild("Build", "/p:CopyBuildOutputToOutputDirectory=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_SkipsCopyingBinariesToOutputDirectory_IfCopyOutputSymbolsToOutputDirectory_IsUnset()
+        {
+            var result = await DotnetMSBuild("Build", "/p:CopyOutputSymbolsToOutputDirectory=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_Works_WhenSymbolsAreNotGenerated()
+        {
+            var result = await DotnetMSBuild("Build", "/p:DebugType=none");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task Build_WithP2P_CopiesRazorAssembly()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.pdb");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.pdb");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.pdb");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimplePages", additionalProjects: "LinkedDir")]
+        public async Task Build_SetsUpEmbeddedResourcesWithLogicalName()
+        {
+            // Arrange
+            var additionalProjectContent = @"
+<ItemGroup>
+  <Content Include=""..\LinkedDir\LinkedFile.cshtml"" Link=""LinkedFileOut\LinkedFile.cshtml"" />
+</ItemGroup>
+";
+            AddProjectFileContent(additionalProjectContent);
+            Directory.CreateDirectory(Path.Combine(Project.DirectoryPath, "..", "LinkedDir"));
+
+            var result = await DotnetMSBuild("Build", "/t:_IntrospectRazorEmbeddedResources /p:EmbedRazorGenerateSources=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.BuildOutputContainsLine(result, $@"CompileResource: {Path.Combine("Pages", "Index.cshtml")} /Pages/Index.cshtml");
+            Assert.BuildOutputContainsLine(result, $@"CompileResource: {Path.Combine("Areas", "Products", "Pages", "_ViewStart.cshtml")} /Areas/Products/Pages/_ViewStart.cshtml");
+            Assert.BuildOutputContainsLine(result, $@"CompileResource: {Path.Combine("..", "LinkedDir", "LinkedFile.cshtml")} /LinkedFileOut/LinkedFile.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithViews_ProducesDepsFileWithCompilationContext()
+        {
+            var customDefine = "RazorSdkTest";
+            var result = await DotnetMSBuild("Build", $"/p:DefineConstants={customDefine}");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "SimpleMvc.deps.json");
+            var depsFilePath = Path.Combine(Project.DirectoryPath, OutputPath, "SimpleMvc.deps.json");
+            var dependencyContext = ReadDependencyContext(depsFilePath);
+            // Pick a couple of libraries and ensure they have some compile references
+            var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "Microsoft.AspNetCore.Html.Abstractions");
+            Assert.NotEmpty(packageReference.Assemblies);
+
+            var projectReference = dependencyContext.CompileLibraries.First(l => l.Name == "SimpleMvc");
+            Assert.NotEmpty(packageReference.Assemblies);
+
+            Assert.Contains(customDefine, dependencyContext.CompilationOptions.Defines);
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_CodeGensAssemblyInfoUsingValuesFromProject()
+        {
+            var razorAssemblyInfoPath = Path.Combine(IntermediateOutputPath, "ClassLibrary.RazorTargetAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfoPath);
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyCopyrightAttribute(\"© Microsoft\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyProductAttribute(\"Razor Test\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyCompanyAttribute(\"Microsoft\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyTitleAttribute(\"ClassLibrary.Views\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyVersionAttribute(\"1.0.0.0\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyFileVersionAttribute(\"1.0.0.0\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyInformationalVersionAttribute(\"1.0.0\")]");
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: System.Reflection.AssemblyDescriptionAttribute(\"ClassLibrary Description\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_UsesRazorSpecificAssemblyProperties()
+        {
+            var razorTargetAssemblyInfo = Path.Combine(IntermediateOutputPath, "ClassLibrary.RazorTargetAssemblyInfo.cs");
+            var buildArguments = "/p:RazorAssemblyFileVersion=2.0.0.100 /p:RazorAssemblyInformationalVersion=2.0.0-preview " +
+                "/p:RazorAssemblyTitle=MyRazorViews /p:RazorAssemblyVersion=2.0.0 " +
+                "/p:RazorAssemblyDescription=MyRazorDescription";
+            var result = await DotnetMSBuild("Build", buildArguments);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorTargetAssemblyInfo);
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyDescriptionAttribute(\"MyRazorDescription\")]");
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyTitleAttribute(\"MyRazorViews\")]");
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyVersionAttribute(\"2.0.0\")]");
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyFileVersionAttribute(\"2.0.0.100\")]");
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyInformationalVersionAttribute(\"2.0.0-preview\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_DoesNotGenerateAssemblyInfo_IfGenerateRazorTargetAssemblyInfo_IsSetToFalse()
+        {
+            var result = await DotnetMSBuild("Build", "/p:GenerateRazorTargetAssemblyInfo=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "ClassLibrary.AssemblyInfo.cs");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "ClassLibrary.RazorTargetAssemblyInfo.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_AddsApplicationPartAttributes()
+        {
+            var razorAssemblyInfoPath = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var razorTargetAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfoPath);
+            Assert.FileContains(result, razorAssemblyInfoPath, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute(\"SimpleMvc.Views\")]");
+
+            Assert.FileExists(result, razorTargetAssemblyInfo);
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyTitleAttribute(\"SimpleMvc.Views\")]");
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute(\"Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFac\"");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_AddsApplicationPartAttributes_WhenEnableDefaultRazorTargetAssemblyInfoAttributes_IsFalse()
+        {
+            var razorTargetAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:EnableDefaultRazorTargetAssemblyInfoAttributes=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.AssemblyInfo.cs");
+            Assert.FileExists(result, razorTargetAssemblyInfo);
+            Assert.FileDoesNotContain(result, razorTargetAssemblyInfo, "[assembly: System.Reflection.AssemblyTitleAttribute");
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute(\"Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFac\"");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_UsesSpecifiedApplicationPartFactoryTypeName()
+        {
+            var razorTargetAssemblyInfo = Path.Combine(IntermediateOutputPath, "ClassLibrary.RazorTargetAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:ProvideApplicationPartFactoryAttributeTypeName=CustomFactory");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorTargetAssemblyInfo);
+            Assert.FileContains(result, razorTargetAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute(\"CustomFactory\"");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_DoesNotGenerateProvideApplicationPartFactoryAttribute_IfGenerateProvideApplicationPartFactoryAttributeIsUnset()
+        {
+            var razorTargetAssemblyInfo = Path.Combine(IntermediateOutputPath, "ClassLibrary.RazorTargetAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateProvideApplicationPartFactoryAttribute=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorTargetAssemblyInfo);
+            Assert.FileDoesNotContain(result, razorTargetAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:RazorCompileToolSet=MvcPrecompilation");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileDoesNotExist(result, razorAssemblyInfo);
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_DoesNotAddRelatedAssemblyPart_IfViewCompilationIsDisabled()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:RazorCompileOnBuild=false /p:RazorCompileOnPublish=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "RelatedAssemblyAttribute");
+
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_AddsRelatedAssemblyPart_IfCompileOnPublishIsAllowed()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:RazorCompileOnBuild=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileContains(result, razorAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute(\"SimpleMvc.Views\")]");
+
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_AddsRelatedAssemblyPart_IfGenerateAssemblyInfoIsFalse()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateAssemblyInfo=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileContains(result, razorAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute(\"SimpleMvc.Views\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithGenerateRazorHostingAssemblyInfoFalse_DoesNotGenerateHostingAttributes()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateRazorHostingAssemblyInfo=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute");
+            Assert.FileContains(result, razorAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute(\"SimpleMvc.Views\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_DoesNotGenerateHostingAttributes_InClassLibraryProjects()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "ClassLibrary.AssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_GeneratesHostingAttributesByDefault()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.AssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateRazorHostingAssemblyInfo=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"2.1\")");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-2-1\")");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvcFSharp", language: "F#")]
+        public async Task Build_SimpleMvcFSharp_NoopsWithoutFailing()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "SimpleMvcFSharp.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvcFSharp.pdb");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvcFSharp.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvcFSharp.pdb");
+
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvcFSharp.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvcFSharp.Views.pdb");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvcFSharp.RazorAssemblyInfo.cs");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvcFSharp.RazorAssemblyInfo.fs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithGenerateRazorAssemblyInfo_False_DoesNotGenerateAssemblyInfo()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateRazorAssemblyInfo=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileDoesNotExist(result, razorAssemblyInfo);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithGenerateRazorTargetAssemblyInfo_False_DoesNotGenerateAssemblyInfo()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var razorTargetAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateRazorTargetAssemblyInfo=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileDoesNotExist(result, razorTargetAssemblyInfo);
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        public async Task Build_WithP2P_WorksWhenBuildProjectReferencesIsDisabled()
+        {
+            // Simulates building the same way VS does by setting BuildProjectReferences=false.
+            // With this flag, P2P references aren't resolved during GetCopyToOutputDirectoryItems. This test ensures that
+            // no Razor work is done in such a scenario and the build succeeds.
+            var additionalProjectContent = @"
+<ItemGroup>
+  <ProjectReference Include=""..\ClassLibrary2\ClassLibrary2.csproj"" />
+</ItemGroup>
+";
+            AddProjectFileContent(additionalProjectContent);
+
+            var result = await DotnetMSBuild(target: default);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary2.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary2.Views.dll");
+
+            // Force a rebuild of ClassLibrary2 by changing a file
+            var class2Path = Path.Combine(Project.SolutionPath, "ClassLibrary2", "Class2.cs");
+            File.AppendAllText(class2Path, Environment.NewLine + "// Some changes");
+
+            // dotnet msbuild /p:BuildProjectReferences=false
+            result = await DotnetMSBuild(target: default, "/p:BuildProjectReferences=false", suppressRestore: true);
+
+            Assert.BuildPassed(result);
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibraryMvc21" })]
+        public async Task Build_WithP2P_Referencing21Project_Works()
+        {
+            // Verifies building with different versions of Razor.Tasks works. Loosely modeled after the repro
+            // scenario listed in https://github.com/Microsoft/msbuild/issues/3572
+            var additionalProjectContent = @"
+<ItemGroup>
+  <ProjectReference Include=""..\ClassLibraryMvc21\ClassLibraryMvc21.csproj"" />
+</ItemGroup>
+";
+            AddProjectFileContent(additionalProjectContent);
+
+            var result = await DotnetMSBuild(target: default);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibraryMvc21.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibraryMvc21.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithStartupObjectSpecified_Works()
+        {
+            var result = await DotnetMSBuild("Build", $"/p:StartupObject=SimpleMvc.Program");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithDeterministicFlagSet_OutputsDeterministicViewsAssembly()
+        {
+            // Build 1
+            var result = await DotnetMSBuild("Build", $"/p:Deterministic=true");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            var filePath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            var firstAssemblyBytes = File.ReadAllBytes(filePath);
+
+            // Build 2
+            result = await DotnetMSBuild("Rebuild", $"/p:Deterministic=true");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            var secondAssemblyBytes = File.ReadAllBytes(filePath);
+
+            Assert.Equal(firstAssemblyBytes, secondAssemblyBytes);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc21")]
+        public async Task Building_NETCoreApp21TargetingProject()
+        {
+            TargetFramework = "netcoreapp2.1";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc21")]
+        public async Task Building_WorksWhenMultipleRazorConfigurationsArePresent()
+        {
+            TargetFramework = "netcoreapp2.1";
+            AddProjectFileContent(@"
+<ItemGroup>
+    <RazorConfiguration Include=""MVC-2.1"">
+      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
+    </RazorConfiguration>
+</ItemGroup>");
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithoutServer_ErrorDuringBuild_DisplaysErrorInMsBuildOutput()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:UseRazorBuildServer=false /p:RazorLangVersion=5.0",
+                suppressBuildServer: true);
+
+            Assert.BuildFailed(result);
+            Assert.BuildOutputContainsLine(
+                result,
+                $"Invalid option 5.0 for Razor language version --version; must be Latest or a valid version in range {RazorLanguageVersion.Version_1_0} to {RazorLanguageVersion.Latest}.");
+
+            // Compilation failed without creating the views assembly
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        private static DependencyContext ReadDependencyContext(string depsFilePath)
+        {
+            var reader = new DependencyContextJsonReader();
+            using (var stream = File.OpenRead(depsFilePath))
+            {
+                return reader.Read(stream);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
new file mode 100644
index 0000000000..2c676fd8fe
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -0,0 +1,76 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntrospectionTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildIntrospectionTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorSdk_AddsCshtmlFilesToUpToDateCheckInput()
+        {
+            var result = await DotnetMSBuild("_IntrospectUpToDateCheck");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, $"UpToDateCheckInput: {Path.Combine("Views", "Home", "Index.cshtml")}");
+            Assert.BuildOutputContainsLine(result, $"UpToDateCheckInput: {Path.Combine("Views", "_ViewStart.cshtml")}");
+            Assert.BuildOutputContainsLine(result, $"UpToDateCheckBuilt: {Path.Combine(IntermediateOutputPath, "SimpleMvc.Views.dll")}");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorSdk_AddsGeneratedRazorFilesAndAssemblyInfoToRazorCompile()
+        {
+            var result = await DotnetMSBuild("Build", "/t:_IntrospectRazorCompileItems");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, $"RazorCompile: {Path.Combine(IntermediateOutputPath, "Razor", "Views", "Home", "Index.cshtml.g.cs")}");
+            Assert.BuildOutputContainsLine(result, $"RazorCompile: {Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs")}");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorSdk_UsesUseSharedCompilationToSetDefaultValueOfUseRazorBuildServer()
+        {
+            var result = await DotnetMSBuild("Build", "/t:_IntrospectUseRazorBuildServer /p:UseSharedCompilation=false");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "UseRazorBuildServer: false");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task GetCopyToOutputDirectoryItems_WhenNoFileIsPresent_ReturnsEmptySequence()
+        {
+            var result = await DotnetMSBuild(target: default);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+
+            result = await DotnetMSBuild(target: "GetCopyToOutputDirectoryItems", "/t:_IntrospectGetCopyToOutputDirectoryItems /p:BuildProjectReferences=false", suppressRestore: true);
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.dll");
+            Assert.BuildOutputContainsLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.pdb");
+
+            // Remove all views from the class library
+            Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
+
+            // dotnet msbuild /p:BuildProjectReferences=false
+            result = await DotnetMSBuild(target: "GetCopyToOutputDirectoryItems", "/t:_IntrospectGetCopyToOutputDirectoryItems /p:BuildProjectReferences=false", suppressRestore: true);
+
+            Assert.BuildOutputDoesNotContainLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.dll");
+            Assert.BuildOutputDoesNotContainLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.pdb");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
new file mode 100644
index 0000000000..67462d9c4c
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
@@ -0,0 +1,109 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildPerformanceTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildPerformanceTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task BuildMvcApp()
+        {
+            var result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+            Assert.BuildPassed(result);
+            var summary = ParseTaskPerformanceSummary(result.Output);
+
+            Assert.Equal(1, summary.First(f => f.Name == "RazorGenerate").Calls);
+            Assert.Equal(1, summary.First(f => f.Name == "RazorTagHelper").Calls);
+
+            // Incremental builds
+            for (var i = 0; i < 2; i++)
+            {
+                result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+                Assert.BuildPassed(result);
+                summary = ParseTaskPerformanceSummary(result.Output);
+
+                Assert.DoesNotContain(summary, item => item.Name == "RazorGenerate");
+                Assert.DoesNotContain(summary, item => item.Name == "RazorTagHelper");
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildMvcAppWithComponents()
+        {
+            var result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+            Assert.BuildPassed(result);
+            var summary = ParseTaskPerformanceSummary(result.Output);
+
+            // One for declaration build, one for the "real" code gen
+            Assert.Equal(2, summary.First(f => f.Name == "RazorGenerate").Calls);
+            Assert.Equal(1, summary.First(f => f.Name == "RazorTagHelper").Calls);
+
+            // Incremental builds
+            for (var i = 0; i < 2; i++)
+            {
+                result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+                Assert.BuildPassed(result);
+                summary = ParseTaskPerformanceSummary(result.Output);
+
+                Assert.DoesNotContain(summary, item => item.Name == "RazorGenerate");
+                Assert.DoesNotContain(summary, item => item.Name == "RazorTagHelper");
+            }
+        }
+
+        private List<PerformanceSummaryEntry> ParseTaskPerformanceSummary(string output)
+        {
+            const string Header = "Task Performance Summary:";
+            var lines = output.Split(Environment.NewLine);
+            var taskSection = Array.LastIndexOf(lines, Header);
+            Assert.True(taskSection != -1, $"Could not find line ${Header} in {output}");
+
+            var entries = new List<PerformanceSummaryEntry>();
+            // 6 ms  FindAppConfigFile                          4 calls
+            var matcher = new Regex(@"\s+(?<time>\w+) ms\s+(?<name>\w+)\s+(?<calls>\d+) calls");
+            for (var i = taskSection + 1; i < lines.Length; i++)
+            {
+                if (string.IsNullOrWhiteSpace(lines[i]))
+                {
+                    continue;
+                }
+
+                var match = matcher.Match(lines[i]);
+                Assert.True(match.Success, $"Line {lines[i]} did not match.");
+
+                var entry = new PerformanceSummaryEntry
+                {
+                    Name = match.Groups["name"].Value,
+                    Calls = int.Parse(match.Groups["calls"].Value),
+                };
+                entries.Add(entry);
+            }
+
+            return entries;
+        }
+
+        private class PerformanceSummaryEntry
+        {
+            public string Name { get; set; }
+
+            public int Calls { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
new file mode 100644
index 0000000000..30330b0a5f
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -0,0 +1,266 @@
+// 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.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildServerIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        private BuildServerTestFixture _buildServer;
+
+        public BuildServerIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+            _buildServer = buildServer;
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public Task Build_SimpleMvc_WithServer_UsingDotnetMSBuild_CanBuildSuccessfully()
+            => Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind.Dotnet);
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("SimpleMvc")]
+        public Task Build_SimpleMvc_WithServer_UsingDesktopMSBuild_CanBuildSuccessfully()
+            => Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind.Desktop);
+
+        private async Task Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind msBuildProcessKind)
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true",
+                msBuildProcessKind: msBuildProcessKind);
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
+
+            // Verify RazorTagHelper works
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.TagHelpers.input.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache");
+            Assert.FileContains(
+                result,
+                Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache"),
+                @"""Name"":""SimpleMvc.SimpleTagHelper""");
+
+            // Verify RazorGenerate works
+            Assert.FileCountEquals(result, 8, RazorIntermediateOutputPath, "*.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject(originalProjectName: "SimpleMvc", targetProjectName: "SimpleMvc", baseDirectory: "Whitespace in path")]
+        public async Task Build_AppWithWhitespaceInPath_CanBuildSuccessfully()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject(originalProjectName: "SimpleMvc", targetProjectName: "Whitespace in name", baseDirectory: "")]
+        public async Task Build_AppWithWhitespaceInName_CanBuildSuccessfully()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "Whitespace in name.dll");
+            Assert.FileExists(result, OutputPath, "Whitespace in name.pdb");
+            Assert.FileExists(result, OutputPath, "Whitespace in name.Views.dll");
+            Assert.FileExists(result, OutputPath, "Whitespace in name.Views.pdb");
+
+            Assert.FileExists(result, IntermediateOutputPath, "Whitespace in name.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "Whitespace in name.RazorCoreGenerate.cache");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ErrorInServer_DisplaysErrorInMsBuildOutput()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true /p:RazorLangVersion=5.0");
+
+            Assert.BuildFailed(result);
+            Assert.BuildOutputContainsLine(
+                result,
+                $"Invalid option 5.0 for Razor language version --version; must be Latest or a valid version in range {RazorLanguageVersion.Version_1_0} to {RazorLanguageVersion.Latest}.");
+
+            // Compilation failed without creating the views assembly
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact(Skip = "https://github.com/aspnet/Razor/issues/2723")]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ServerConnectionMutexCreationFails_FallsBackToInProcessRzc()
+        {
+            // Use a pipe name longer that 260 characters to make the Mutex constructor throw.
+            var pipeName = new string('P', 261);
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true",
+                buildServerPipeName: pipeName);
+
+            // We expect this to fail because we don't allow it to fallback to in process execution.
+            Assert.BuildFailed(result);
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            // Try to build again without forcing it to run on build server.
+            result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=false",
+                buildServerPipeName: pipeName);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            // Note: We don't need to handle server clean up here because it will fail before
+            // it reaches server creation part.
+        }
+
+        // Skipping on MacOS because of https://github.com/dotnet/corefx/issues/33141.
+        // Skipping on Linux because of https://github.com/aspnet/Razor/issues/2525.
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task ManualServerShutdown_NoPipeName_ShutsDownServer()
+        {
+            // We are trying to test whether the correct pipe name is generated (from the location of rzc tool)
+            // when we don't explicitly specify a pipe name.
+
+            // Publish rzc tool to a temporary path. This is the location based on which the pipe name is generated.
+            var solutionRoot = TestPathUtilities.GetSolutionRootDirectory("Razor");
+            var toolAssemblyDirectory = Path.Combine(solutionRoot, "src", "Microsoft.AspNetCore.Razor.Tools");
+            var toolAssemblyPath = Path.Combine(toolAssemblyDirectory, "Microsoft.AspNetCore.Razor.Tools.csproj");
+            var projectDirectory = new TestProjectDirectory(solutionRoot, toolAssemblyDirectory, toolAssemblyPath);
+            var publishDir = Path.Combine(Path.GetTempPath(), "Razor", Path.GetRandomFileName(), "RzcPublish");
+            var publishResult = await MSBuildProcessManager.RunProcessAsync(projectDirectory, $"/t:Publish /p:PublishDir=\"{publishDir}\"");
+
+            try
+            {
+                // Make sure publish succeeded.
+                Assert.BuildPassed(publishResult);
+
+                // Run the build using the published tool
+                var toolAssembly = Path.Combine(publishDir, "rzc.dll");
+                var result = await DotnetMSBuild(
+                    "Build",
+                    $"/p:_RazorForceBuildServer=true /p:_RazorToolAssembly={toolAssembly}",
+                    suppressBuildServer: true); // We don't want to specify a pipe name
+
+                Assert.BuildPassed(result);
+
+                // Manually shutdown the server
+                var processStartInfo = new ProcessStartInfo()
+                {
+                    WorkingDirectory = publishDir,
+                    UseShellExecute = false,
+                    RedirectStandardError = true,
+                    RedirectStandardOutput = true,
+                    FileName = "dotnet",
+                    Arguments = $"{toolAssembly} shutdown -w"
+                };
+
+                var logFilePath = Path.Combine(publishDir, "out.log");
+                processStartInfo.Environment.Add("RAZORBUILDSERVER_LOG", logFilePath);
+                var shutdownResult = await MSBuildProcessManager.RunProcessCoreAsync(processStartInfo);
+
+                Assert.Equal(0, shutdownResult.ExitCode);
+                var output = await File.ReadAllTextAsync(logFilePath);
+                Assert.Contains("shut down completed", output);
+            }
+            finally
+            {
+                // Finally delete the temporary publish directory
+                ProjectDirectory.CleanupDirectory(publishDir);
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithWhiteSpaceInPipeName_BuildsSuccessfully()
+        {
+            // Start the server
+            var pipeName = "pipe with whitespace";
+            var fixture = new BuildServerTestFixture(pipeName);
+
+            try
+            {
+                // Run a build
+                var result = await DotnetMSBuild(
+                    "Build",
+                    "/p:_RazorForceBuildServer=true",
+                    buildServerPipeName: pipeName);
+
+                Assert.BuildPassed(result);
+                Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+                Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+                Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+                Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
+            }
+            finally
+            {
+                // Shutdown the server
+                fixture.Dispose();
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task Build_MvcWithComponents()
+        {
+            var tagHelperOutputCacheFile = Path.Combine(IntermediateOutputPath, "MvcWithComponents.TagHelpers.output.cache");
+
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.pdb");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.pdb");
+
+            // Verify tag helper discovery from components work
+            Assert.FileExists(result, tagHelperOutputCacheFile);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCacheFile,
+                @"""Name"":""MvcWithComponents.TestComponent""");
+
+            Assert.FileContains(
+                result,
+                tagHelperOutputCacheFile,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+        }
+
+        private class TestProjectDirectory : ProjectDirectory
+        {
+            public TestProjectDirectory(string solutionPath, string directoryPath, string projectFilePath)
+                : base(solutionPath, directoryPath, projectFilePath)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs
new file mode 100644
index 0000000000..5c1a17e5c7
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs
@@ -0,0 +1,62 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.AspNetCore.Razor.Tools;
+using Microsoft.CodeAnalysis;
+using Moq;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildServerTestFixture : IDisposable
+    {
+        private static readonly TimeSpan _defaultShutdownTimeout = TimeSpan.FromSeconds(60);
+
+        public BuildServerTestFixture() : this(Guid.NewGuid().ToString())
+        {
+        }
+
+        internal BuildServerTestFixture(string pipeName)
+        {
+            PipeName = pipeName;
+
+            if (!ServerConnection.TryCreateServerCore(Environment.CurrentDirectory, PipeName, out var processId))
+            {
+                throw new InvalidOperationException($"Failed to start the build server at pipe {PipeName}.");
+            }
+
+            ProcessId = processId;
+        }
+
+        public string PipeName { get; }
+
+        public int? ProcessId { get; }
+
+        public void Dispose()
+        {
+            // Shutdown the build server.
+            using (var cts = new CancellationTokenSource(_defaultShutdownTimeout))
+            {
+                var writer = new StringWriter();
+
+                cts.Token.Register(() =>
+                {
+                    var output = writer.ToString();
+                    throw new TimeoutException($"Shutting down the build server at pipe {PipeName} took longer than expected.{Environment.NewLine}Output: {output}.");
+                });
+
+                var application = new Application(cts.Token, Mock.Of<ExtensionAssemblyLoader>(), Mock.Of<ExtensionDependencyChecker>(), (path, properties) => Mock.Of<PortableExecutableReference>(), writer, writer);
+
+                var exitCode = application.Execute("shutdown", "-w", "-p", PipeName);
+                if (exitCode != 0)
+                {
+                    var output = writer.ToString();
+                    throw new InvalidOperationException(
+                        $"Build server at pipe {PipeName} failed to shutdown with exit code {exitCode}. Output: {output}");
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
new file mode 100644
index 0000000000..a12945f1f0
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -0,0 +1,41 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildWithComponentsIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildWithComponentsIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public Task Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Dotnet);
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("MvcWithComponents")]
+        public Task Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Desktop);
+
+        private async Task Build_ComponentsWorks(MSBuildProcessKind msBuildProcessKind)
+        {
+            var result = await DotnetMSBuild("Build", msBuildProcessKind: msBuildProcessKind);
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.pdb");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.pdb");
+
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.TestComponent");
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Shared.NavMenu");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
new file mode 100644
index 0000000000..183627bd2c
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
@@ -0,0 +1,71 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class ConfigurationMetadataIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public ConfigurationMetadataIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithMvc_AddsConfigurationMetadata()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileContainsLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"3.0\")]");
+            Assert.FileContainsLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-3.0\")]");
+            Assert.FileContainsLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-3.0\", \"Microsoft.AspNetCore.Mvc.Razor.Extensions\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_ForClassLibrary_SuppressesConfigurationMetadata()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "ClassLibrary.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "ClassLibrary.Views.pdb");
+
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileDoesNotContainLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"3.0\")]");
+            Assert.FileDoesNotContainLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-3.0\")]");
+            Assert.FileDoesNotContainLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-3.0\", \"Microsoft.AspNetCore.Razor.Extensions\")]");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
new file mode 100644
index 0000000000..6514e73057
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -0,0 +1,68 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class DesignTimeBuildIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public DesignTimeBuildIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task DesignTimeBuild_DoesNotRunRazorTargets()
+        {
+            // Using Compile here instead of CompileDesignTime because the latter is only defined when using
+            // the VS targets. This is a close enough simulation for an SDK project
+            var result = await DotnetMSBuild("Compile", "/p:DesignTimeBuild=true /clp:PerformanceSummary");
+
+            Assert.BuildPassed(result);
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
+
+            // This target should be part of the design time build.
+            Assert.Contains("RazorGetAssemblyAttributes", result.Output);
+
+            // We don't want to see the expensive Razor targets in the performance summary, since they shouldn't run
+            // during a design time build.
+            Assert.DoesNotContain("RazorCoreGenerate", result.Output);
+            Assert.DoesNotContain("RazorCoreCompile", result.Output);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerateDesignTime_ReturnsRazorGenerateWithTargetPath()
+        {
+            var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorGenerateWithTargetPath");
+
+            Assert.BuildPassed(result);
+
+            var filePaths = new string[]
+            {
+                Path.Combine("Views", "Home", "About.cshtml"),
+                Path.Combine("Views", "Home", "Contact.cshtml"),
+                Path.Combine("Views", "Home", "Index.cshtml"),
+                Path.Combine("Views", "Shared", "Error.cshtml"),
+                Path.Combine("Views", "Shared", "_Layout.cshtml"),
+                Path.Combine("Views", "Shared", "_ValidationScriptsPartial.cshtml"),
+                Path.Combine("Views", "_ViewImports.cshtml"),
+                Path.Combine("Views", "_ViewStart.cshtml"),
+            };
+
+            foreach (var filePath in filePaths)
+            {
+                Assert.BuildOutputContainsLine(
+                    result,
+                    $@"RazorGenerateWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, filePath + ".g.cs")}");
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/FIleThumbPrint.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/FIleThumbPrint.cs
new file mode 100644
index 0000000000..0266ecdd1b
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/FIleThumbPrint.cs
@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class FileThumbPrint : IEquatable<FileThumbPrint>
+    {
+        private FileThumbPrint(string path, DateTime lastWriteTimeUtc, string hash)
+        {
+            Path = path;
+            LastWriteTimeUtc = lastWriteTimeUtc;
+            Hash = hash;
+        }
+
+        public string Path { get; }
+
+        public DateTime LastWriteTimeUtc { get; }
+
+        public string Hash { get; }
+
+        public static FileThumbPrint Create(string path)
+        {
+            byte[] hashBytes;
+            using (var sha1 = SHA1.Create())
+            using (var fileStream = File.OpenRead(path))
+            {
+                hashBytes = sha1.ComputeHash(fileStream);
+            }
+
+            var hash = Convert.ToBase64String(hashBytes);
+            var lastWriteTimeUtc = File.GetLastWriteTimeUtc(path);
+            return new FileThumbPrint(path, lastWriteTimeUtc, hash);
+        }
+
+        public bool Equals(FileThumbPrint other)
+        {
+            return
+                string.Equals(Path, other.Path, StringComparison.Ordinal) &&
+                LastWriteTimeUtc == other.LastWriteTimeUtc &&
+                string.Equals(Hash, other.Hash, StringComparison.Ordinal);
+        }
+
+        public override int GetHashCode() => LastWriteTimeUtc.GetHashCode();
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
new file mode 100644
index 0000000000..f04a14c449
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Reflection;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class InitializeTestProjectAttribute : BeforeAfterTestAttribute
+    {
+        private readonly string _originalProjectName;
+        private readonly string _testProjectName;
+        private readonly string _baseDirectory;
+        private readonly string[] _additionalProjects;
+        private readonly string _language;
+
+        public InitializeTestProjectAttribute(string projectName, string language = "C#", params string[] additionalProjects)
+            : this (projectName, projectName, string.Empty, language, additionalProjects)
+        {
+        }
+
+        public InitializeTestProjectAttribute(string originalProjectName, string targetProjectName, string baseDirectory, string language = "C#", string[] additionalProjects = null)
+        {
+            _originalProjectName = originalProjectName;
+            _testProjectName = targetProjectName;
+            _baseDirectory = baseDirectory;
+            _additionalProjects = additionalProjects ?? Array.Empty<string>();
+            _language = language;
+        }
+
+        public override void Before(MethodInfo methodUnderTest)
+        {
+            if (!typeof(MSBuildIntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                throw new InvalidOperationException($"This should be used on a class derived from {typeof(MSBuildIntegrationTestBase)}");
+            }
+
+            MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
+            MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp3.0";
+        }
+
+        public override void After(MethodInfo methodUnderTest)
+        {
+            if (!typeof(MSBuildIntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                throw new InvalidOperationException($"This should be used on a class derived from {typeof(MSBuildIntegrationTestBase)}");
+            }
+
+            MSBuildIntegrationTestBase.Project.Dispose();
+            MSBuildIntegrationTestBase.Project = null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
new file mode 100644
index 0000000000..07ffd2aa9d
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -0,0 +1,173 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Moq;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public abstract class MSBuildIntegrationTestBase
+    {
+        private static readonly AsyncLocal<ProjectDirectory> _project = new AsyncLocal<ProjectDirectory>();
+        private static readonly AsyncLocal<string> _projectTfm = new AsyncLocal<string>();
+
+        protected MSBuildIntegrationTestBase(BuildServerTestFixture buildServer)
+        {
+            BuildServer = buildServer;
+        }
+
+#if DEBUG
+        protected string Configuration => "Debug";
+#elif RELEASE
+        protected string Configuration => "Release";
+#else
+#error Configuration not supported
+#endif
+
+        protected string IntermediateOutputPath => Path.Combine("obj", Configuration, TargetFramework);
+
+        protected string OutputPath => Path.Combine("bin", Configuration, TargetFramework);
+
+        protected string PublishOutputPath => Path.Combine(OutputPath, "publish");
+
+        // Used by the test framework to set the project that we're working with
+        internal static ProjectDirectory Project
+        {
+            get { return _project.Value; }
+            set { _project.Value = value; }
+        }
+
+        protected string RazorIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "Razor");
+
+        protected string RazorComponentIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "RazorDeclaration");
+
+        internal static string TargetFramework
+        {
+            get => _projectTfm.Value;
+            set => _projectTfm.Value = value;
+        }
+
+        protected BuildServerTestFixture BuildServer { get; set; }
+
+        internal Task<MSBuildResult> DotnetMSBuild(
+            string target,
+            string args = null,
+            bool suppressRestore = false,
+            bool suppressTimeout = false,
+            bool suppressBuildServer = false,
+            string buildServerPipeName = null,
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
+        {
+            var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
+            var buildArgumentList = new List<string>
+            {
+                // Disable node-reuse. We don't want msbuild processes to stick around
+                // once the test is completed.
+                "/nr:false",
+
+                // Let the test app know it is running as part of a test.
+                "/p:RunningAsTest=true",
+
+                $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
+                $"/p:NETStandardLibrary20PackageVersion={BuildVariables.NETStandardLibrary20PackageVersion}",
+            };
+
+            if (!suppressRestore)
+            {
+                buildArgumentList.Add("/restore");
+            }
+
+            if (!suppressBuildServer)
+            {
+                buildArgumentList.Add($@"/p:_RazorBuildServerPipeName=""{buildServerPipeName ?? BuildServer.PipeName}""");
+            }
+
+            if (!string.IsNullOrEmpty(target))
+            {
+                buildArgumentList.Add($"/t:{target}");
+            }
+
+            buildArgumentList.Add($"/p:Configuration={Configuration} {args}");
+            var buildArguments = string.Join(" ", buildArgumentList);
+
+            return MSBuildProcessManager.RunProcessAsync(
+                Project,
+                buildArguments,
+                timeout,
+                msBuildProcessKind);
+        }
+
+        internal void AddProjectFileContent(string content)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            var existing = File.ReadAllText(Project.ProjectFilePath);
+            var updated = existing.Replace("<!-- Test Placeholder -->", content);
+            File.WriteAllText(Project.ProjectFilePath, updated);
+        }
+
+        internal void ReplaceContent(string content, params string[] paths)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (paths == null)
+            {
+                throw new ArgumentNullException(nameof(paths));
+            }
+
+            var filePath = Path.Combine(Project.DirectoryPath, Path.Combine(paths));
+            if (!File.Exists(filePath))
+            {
+                throw new InvalidOperationException($"File {filePath} could not be found.");
+            }
+
+            File.WriteAllText(filePath, content, Encoding.UTF8);
+            // Timestamps on xplat are precise only to a second. Update it's last write time by at least 1 second
+            // so we can ensure that MSBuild recognizes the file change. See https://github.com/dotnet/corefx/issues/26024
+            File.SetLastWriteTimeUtc(filePath, File.GetLastWriteTimeUtc(filePath).AddSeconds(1));
+        }
+
+        /// <summary>
+        /// Locks all files, discovered at the time of method invocation, under the
+        /// specified <paramref name="directory" /> from reads or writes.
+        /// </summary>
+        public IDisposable LockDirectory(string directory)
+        {
+            directory = Path.Combine(Project.DirectoryPath, directory);
+            var disposables = new List<IDisposable>();
+            foreach (var file in Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories))
+            {
+                disposables.Add(LockFile(file));
+            }
+
+            var disposable = new Mock<IDisposable>();
+            disposable.Setup(d => d.Dispose())
+                .Callback(() => disposables.ForEach(d => d.Dispose()));
+
+            return disposable.Object;
+        }
+
+        public IDisposable LockFile(string path)
+        {
+            path = Path.Combine(Project.DirectoryPath, path);
+            return File.Open(path, FileMode.Open, FileAccess.Read, FileShare.None);
+        }
+
+        public FileThumbPrint GetThumbPrint(string path)
+        {
+            path = Path.Combine(Project.DirectoryPath, path);
+            return FileThumbPrint.Create(path);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessKind.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessKind.cs
new file mode 100644
index 0000000000..d9077e7a93
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessKind.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal enum MSBuildProcessKind
+    {
+        /// <summary>dotnet msbuild</summary>
+        Dotnet,
+
+        /// <summary>msbuild.exe</summary>
+        Desktop,
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
new file mode 100644
index 0000000000..d38ae9f5f5
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -0,0 +1,152 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal static class MSBuildProcessManager
+    {
+        public static async Task<MSBuildResult> RunProcessAsync(
+            ProjectDirectory project,
+            string arguments,
+            TimeSpan? timeout = null,
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
+        {
+            var processStartInfo = new ProcessStartInfo()
+            {
+                WorkingDirectory = project.DirectoryPath,
+                UseShellExecute = false,
+                RedirectStandardError = true,
+                RedirectStandardOutput = true,
+            };
+
+            if (msBuildProcessKind == MSBuildProcessKind.Desktop)
+            {
+                if (string.IsNullOrEmpty(BuildVariables.MSBuildPath))
+                {
+                    throw new ArgumentException("Unable to locate MSBuild.exe to run desktop tests. " +
+                        "MSBuild.exe is located using state created as part of running build[cmd|sh] at the root of the repository. Run build /t:Prepare to set this up if this hasn't been done.");
+                }
+
+                processStartInfo.FileName = BuildVariables.MSBuildPath;
+                processStartInfo.Arguments = arguments;
+            }
+            else
+            {
+                processStartInfo.FileName = "dotnet";
+                processStartInfo.Arguments = $"msbuild {arguments}";
+            }
+
+            var processResult = await RunProcessCoreAsync(processStartInfo, timeout);
+
+            return new MSBuildResult(project, processResult.FileName, processResult.Arguments, processResult.ExitCode, processResult.Output);
+        }
+
+        internal static Task<ProcessResult> RunProcessCoreAsync(
+            ProcessStartInfo processStartInfo,
+            TimeSpan? timeout = null)
+        {
+            timeout = timeout ?? TimeSpan.FromSeconds(120);
+
+            var process = new Process()
+            {
+                StartInfo = processStartInfo,
+                EnableRaisingEvents = true,
+            };
+
+            var output = new StringBuilder();
+            var outputLock = new object();
+
+            process.ErrorDataReceived += Process_ErrorDataReceived;
+            process.OutputDataReceived += Process_OutputDataReceived;
+
+            process.Start();
+            process.BeginOutputReadLine();
+            process.BeginErrorReadLine();
+
+            var timeoutTask = Task.Delay(timeout.Value).ContinueWith<ProcessResult>((t) =>
+            {
+                // Don't timeout during debug sessions
+                while (Debugger.IsAttached)
+                {
+                    Thread.Sleep(TimeSpan.FromSeconds(1));
+                }
+
+                if (!process.HasExited)
+                {
+                    // This is a timeout.
+                    process.Kill();
+                }
+
+                throw new TimeoutException($"command '${process.StartInfo.FileName} {process.StartInfo.Arguments}' timed out after {timeout}. Output: {output.ToString()}");
+            });
+
+            var waitTask = Task.Run(() =>
+            {
+                // We need to use two WaitForExit calls to ensure that all of the output/events are processed. Previously
+                // this code used Process.Exited, which could result in us missing some output due to the ordering of
+                // events.
+                //
+                // See the remarks here: https://msdn.microsoft.com/en-us/library/ty0d8k56(v=vs.110).aspx
+                if (!process.WaitForExit(Int32.MaxValue))
+                {
+                    // unreachable - the timeoutTask will kill the process before this happens.
+                    throw new TimeoutException();
+                }
+
+                process.WaitForExit();
+
+                string outputString;
+                lock (outputLock)
+                {
+                    outputString = output.ToString();
+                }
+
+                var result = new ProcessResult(process.StartInfo.FileName, process.StartInfo.Arguments, process.ExitCode, outputString);
+                return result;
+            });
+
+            return Task.WhenAny<ProcessResult>(waitTask, timeoutTask).Unwrap();
+
+            void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e)
+            {
+                lock (outputLock)
+                {
+                    output.AppendLine(e.Data);
+                }
+            }
+
+            void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
+            {
+                lock (outputLock)
+                {
+                    output.AppendLine(e.Data);
+                }
+            }
+        }
+
+        internal class ProcessResult
+        {
+            public ProcessResult(string fileName, string arguments, int exitCode, string output)
+            {
+                FileName = fileName;
+                Arguments = arguments;
+                ExitCode = exitCode;
+                Output = output;
+            }
+
+            public string Arguments { get; }
+
+            public string FileName { get; }
+
+            public int ExitCode { get; }
+
+            public string Output { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildResult.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildResult.cs
new file mode 100644
index 0000000000..d26bed720b
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildResult.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal class MSBuildResult
+    {
+        public MSBuildResult(ProjectDirectory project, string fileName, string arguments, int exitCode, string output)
+        {
+            Project = project;
+            FileName = fileName;
+            Arguments = arguments;
+            ExitCode = exitCode;
+            Output = output;
+        }
+
+        public ProjectDirectory Project { get; }
+
+        public string Arguments { get; }
+
+        public string FileName { get; }
+
+        public int ExitCode { get; }
+
+        public string Output { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
new file mode 100644
index 0000000000..3037ba3171
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -0,0 +1,180 @@
+// 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.IO;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class PackIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public PackIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Pack_NoBuild_IncludeRazorContent_IncludesRazorViewContent()
+        {
+            var result = await DotnetMSBuild("Build");
+            Assert.BuildPassed(result);
+
+            result = await DotnetMSBuild("Pack", "/p:NoBuild=true /p:IncludeRazorContentInPack=true");
+            Assert.BuildPassed(result);
+
+            Assert.NuspecContains(
+                result,
+                Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+
+            Assert.NupkgContains(
+                result,
+                Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
+                Path.Combine("contentFiles", "any", "netstandard2.0", "Views", "Shared", "_Layout.cshtml"));
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Pack_NoBuild_Works_IncludesRazorAssembly()
+        {
+            var result = await DotnetMSBuild("Build");
+            Assert.BuildPassed(result);
+
+            result = await DotnetMSBuild("Pack", "/p:NoBuild=true");
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // Travis on OSX produces different full paths in C# and MSBuild
+                Assert.NuspecContains(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+
+                Assert.NuspecDoesNotContain(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb")}\" />");
+            }
+
+            Assert.NuspecDoesNotContain(
+                result,
+                Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+
+            Assert.NupkgContains(
+                result,
+                Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
+                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"));
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Pack_Works_IncludesRazorAssembly()
+        {
+            var result = await DotnetMSBuild("Pack");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // Travis on OSX produces different full paths in C# and MSBuild
+                Assert.NuspecContains(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+
+                Assert.NuspecDoesNotContain(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb")}\" />");
+            }
+
+            Assert.NuspecDoesNotContain(
+                result,
+                Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+
+            Assert.NupkgContains(
+                result,
+                Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
+                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"));
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Pack_WithIncludeSymbols_IncludesRazorPdb()
+        {
+            var result = await DotnetMSBuild("Pack", "/p:RazorCompileOnBuild=true /p:IncludeSymbols=true");
+
+            Assert.BuildPassed(result);
+
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // Travis on OSX produces different full paths in C# and MSBuild
+                Assert.NuspecContains(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+
+                Assert.NuspecContains(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb")}\" />");
+            }
+
+            Assert.NupkgContains(
+                result,
+                Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.symbols.nupkg"),
+                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"),
+                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb"));
+        }
+
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Pack_IncludesRazorFilesAsContent_WhenIncludeRazorContentInPack_IsSet()
+        {
+            var result = await DotnetMSBuild("Pack", "/p:IncludeRazorContentInPack=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // Travis on OSX produces different full paths in C# and MSBuild
+                Assert.NuspecContains(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+
+                Assert.NuspecContains(
+                    result,
+                    Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
+                    @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+            }
+
+            Assert.NupkgContains(
+                result,
+                Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
+                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
new file mode 100644
index 0000000000..3cdb16592a
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
@@ -0,0 +1,187 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Testing;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal class ProjectDirectory : IDisposable
+    {
+#if PRESERVE_WORKING_DIRECTORY
+        public bool PreserveWorkingDirectory { get; set; } = true;
+#else
+        public bool PreserveWorkingDirectory { get; set; }
+#endif
+
+        public static ProjectDirectory Create(string originalProjectName, string targetProjectName, string baseDirectory, string[] additionalProjects, string language)
+        {
+            var destinationPath = Path.Combine(Path.GetTempPath(), "Razor", baseDirectory, Path.GetRandomFileName());
+            Directory.CreateDirectory(destinationPath);
+
+            try
+            {
+                if (Directory.EnumerateFiles(destinationPath).Any())
+                {
+                    throw new InvalidOperationException($"{destinationPath} should be empty");
+                }
+
+                var solutionRoot = TestPathUtilities.GetSolutionRootDirectory("Razor");
+                if (solutionRoot == null)
+                {
+                    throw new InvalidOperationException("Could not find solution root.");
+                }
+
+                var binariesRoot = Path.GetDirectoryName(typeof(ProjectDirectory).Assembly.Location);
+
+                foreach (var project in new string[] { originalProjectName, }.Concat(additionalProjects))
+                {
+                    var testAppsRoot = Path.Combine(solutionRoot, "test", "testapps");
+                    var projectRoot = Path.Combine(testAppsRoot, project);
+                    if (!Directory.Exists(projectRoot))
+                    {
+                        throw new InvalidOperationException($"Could not find project at '{projectRoot}'");
+                    }
+
+                    var projectDestination = Path.Combine(destinationPath, project);
+                    var projectDestinationDir = Directory.CreateDirectory(projectDestination);
+                    CopyDirectory(new DirectoryInfo(projectRoot), projectDestinationDir);
+                    SetupDirectoryBuildFiles(solutionRoot, binariesRoot, testAppsRoot, projectDestination);
+                }
+
+                // Rename the csproj/fsproj
+                string extension;
+                if (language.Equals("C#", StringComparison.OrdinalIgnoreCase))
+                {
+                    extension = ".csproj";
+                }
+                else if (language.Equals("F#", StringComparison.OrdinalIgnoreCase))
+                {
+                    extension = ".fsproj";
+                }
+                else
+                {
+                    throw new InvalidOperationException($"Language {language} is not supported.");
+                }
+                var directoryPath = Path.Combine(destinationPath, originalProjectName);
+                var oldProjectFilePath = Path.Combine(directoryPath, originalProjectName + extension);
+                var newProjectFilePath = Path.Combine(directoryPath, targetProjectName + extension);
+                File.Move(oldProjectFilePath, newProjectFilePath);
+
+                CopyGlobalJson(solutionRoot, destinationPath);
+
+                return new ProjectDirectory(
+                    destinationPath,
+                    directoryPath,
+                    newProjectFilePath);
+            }
+            catch
+            {
+                CleanupDirectory(destinationPath);
+                throw;
+            }
+
+            void CopyDirectory(DirectoryInfo source, DirectoryInfo destination)
+            {
+                foreach (var directory in source.EnumerateDirectories())
+                {
+                    if (directory.Name == "bin" || directory.Name == "obj")
+                    {
+                        // Just in case someone has opened the project in an IDE or built it. We don't want to copy
+                        // these folders.
+                        continue;
+                    }
+
+                    var created = destination.CreateSubdirectory(directory.Name);
+                    CopyDirectory(directory, created);
+                }
+
+                foreach (var file in source.EnumerateFiles())
+                {
+                    file.CopyTo(Path.Combine(destination.FullName, file.Name));
+                }
+            }
+
+            void SetupDirectoryBuildFiles(string solutionRoot, string binariesRoot, string testAppsRoot, string projectDestination)
+            {
+                var beforeDirectoryPropsContent =
+$@"<Project>
+  <PropertyGroup>
+    <SolutionRoot>{solutionRoot}</SolutionRoot>
+    <BinariesRoot>{binariesRoot}</BinariesRoot>
+  </PropertyGroup>
+</Project>";
+                File.WriteAllText(Path.Combine(projectDestination, "Before.Directory.Build.props"), beforeDirectoryPropsContent);
+
+                new List<string> { "Directory.Build.props", "Directory.Build.targets", "RazorTest.Introspection.targets" }
+                    .ForEach(file =>
+                    {
+                        var source = Path.Combine(testAppsRoot, file);
+                        var destination = Path.Combine(projectDestination, file);
+                        File.Copy(source, destination);
+                    });
+            }
+
+            void CopyGlobalJson(string solutionRoot, string projectRoot)
+            {
+                var srcGlobalJson = Path.Combine(solutionRoot, "global.json");
+                if (!File.Exists(srcGlobalJson))
+                {
+                    throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests.");
+                }
+
+                var destinationGlobalJson = Path.Combine(projectRoot, "global.json");
+                File.Copy(srcGlobalJson, destinationGlobalJson);
+            }
+        }
+
+        protected ProjectDirectory(string solutionPath, string directoryPath, string projectFilePath)
+        {
+            SolutionPath = solutionPath;
+            DirectoryPath = directoryPath;
+            ProjectFilePath = projectFilePath;
+        }
+
+        public string DirectoryPath { get; }
+
+        public string ProjectFilePath { get;}
+
+        public string SolutionPath { get; }
+
+        public void Dispose()
+        {
+            if (PreserveWorkingDirectory)
+            {
+                Console.WriteLine($"Skipping deletion of working directory {SolutionPath}");
+            }
+            else
+            {
+                CleanupDirectory(SolutionPath);
+            }
+        }
+
+        internal static void CleanupDirectory(string filePath)
+        {
+            var tries = 5;
+            var sleep = TimeSpan.FromSeconds(3);
+
+            for (var i = 0; i < tries; i++)
+            {
+                try
+                {
+                    Directory.Delete(filePath, recursive: true);
+                    return;
+                }
+                catch when (i < tries - 1)
+                {
+                    Console.WriteLine($"Failed to delete directory {filePath}, trying again.");
+                    Thread.Sleep(sleep);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
new file mode 100644
index 0000000000..7734f7dc16
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -0,0 +1,446 @@
+// 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.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class PublishIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public PublishIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_RazorCompileOnPublish_IsDefault()
+        {
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // Verify assets get published
+            Assert.FileExists(result, PublishOutputPath, "wwwroot", "js", "SimpleMvc.js");
+            Assert.FileExists(result, PublishOutputPath, "wwwroot", "css", "site.css");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_PublishesAssembly()
+        {
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithRazorCompileOnPublish_PublishesAssembly()
+        {
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithRazorCompileOnBuildFalse_PublishesAssembly()
+        {
+            // RazorCompileOnBuild is turned off, but RazorCompileOnPublish should still be enabled
+            var result = await DotnetMSBuild("Publish", "/p:RazorCompileOnBuild=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithMvcRazorCompileOnPublish_Noops()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact] // This is an override to force the new toolset
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithMvcRazorCompileOnPublish_AndRazorSDK_PublishesAssembly()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=true /p:ResolvedRazorCompileToolset=RazorSDK");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_NoopsWithNoFiles()
+        {
+            Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
+
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            // Everything we do should noop - including building the app.
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=false");
+
+            Assert.BuildPassed(result);
+
+            // Everything we do should noop - including building the app.
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_NoopsWith_RazorCompileOnPublishFalse()
+        {
+            Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
+
+            var result = await DotnetMSBuild("Publish", "/p:RazorCompileOnPublish=false");
+
+            Assert.BuildPassed(result);
+
+            // Everything we do should noop - including building the app.
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_SkipsCopyingBinariesToOutputDirectory_IfCopyBuildOutputToOutputDirectory_IsUnset()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:CopyBuildOutputToPublishDirectory=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_SkipsCopyingBinariesToOutputDirectory_IfCopyOutputSymbolsToOutputDirectory_IsUnset()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:CopyOutputSymbolsToPublishDirectory=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_Works_WhenSymbolsAreNotGenerated()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:DebugType=none");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_IncludeCshtmlAndRefAssemblies_CopiesFiles()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:CopyRazorGenerateFilesToPublishDirectory=true /p:CopyRefAssembliesToPublishDirectory=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileExists(result, PublishOutputPath, "refs", "mscorlib.dll");
+            Assert.FileCountEquals(result, 8, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact] // Tests old MvcPrecompilation behavior that we support for compat.
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_MvcRazorExcludeFilesFromPublish_False_CopiesFiles()
+        {
+            var result = await DotnetMSBuild("Publish", "/p:MvcRazorExcludeViewFilesFromPublish=false /p:MvcRazorExcludeRefAssembliesFromPublish=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileExists(result, PublishOutputPath, "refs", "mscorlib.dll");
+            Assert.FileCountEquals(result, 8, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task Publish_WithP2P_AndRazorCompileOnBuild_CopiesRazorAssembly()
+        {
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.pdb");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.Views.pdb");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.pdb");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task Publish_WithP2P_AndRazorCompileOnPublish_CopiesRazorAssembly()
+        {
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.pdb");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.Views.pdb");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.pdb");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.Views.pdb");
+
+            // Verify fix for https://github.com/aspnet/Razor/issues/2295. No cshtml files should be published from the app
+            // or the ClassLibrary.
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvcFSharp", language: "F#")]
+        public async Task Publish_SimpleMvcFSharp_NoopsWithoutFailing()
+        {
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvcFSharp.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvcFSharp.pdb");
+
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvcFSharp.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvcFSharp.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_DoesNotPublishCustomRazorGenerateItems()
+        {
+            var additionalProjectContent = @"
+<PropertyGroup>
+    <EnableDefaultRazorGenerateItems>false</EnableDefaultRazorGenerateItems>
+</PropertyGroup>
+<ItemGroup>
+  <RazorGenerate Include=""Views\_ViewImports.cshtml"" />
+  <RazorGenerate Include=""Views\Home\Index.cshtml"" />
+</ItemGroup>
+";
+            AddProjectFileContent(additionalProjectContent);
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // Verify assets get published
+            Assert.FileExists(result, PublishOutputPath, "wwwroot", "js", "SimpleMvc.js");
+            Assert.FileExists(result, PublishOutputPath, "wwwroot", "css", "site.css");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            // Custom RazorGenerate item does not get published
+            Assert.FileDoesNotExist(result, PublishOutputPath, "Views", "Home", "Home.cshtml");
+            // cshtml Content item that's not part of RazorGenerate gets published.
+            Assert.FileExists(result, PublishOutputPath, "Views", "Home", "About.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        public async Task Publish_WithP2P_WorksWhenBuildProjectReferencesIsDisabled()
+        {
+            // Simulates publishing the same way VS does by setting BuildProjectReferences=false.
+            // With this flag, P2P references aren't resolved during GetCopyToPublishDirectoryItems which would cause
+            // any target that uses References as inputs to not be incremental. This test verifies no Razor Sdk work
+            // is performed at this time.
+            var additionalProjectContent = @"
+<ItemGroup>
+  <ProjectReference Include=""..\ClassLibrary2\ClassLibrary2.csproj"" />
+</ItemGroup>
+";
+            AddProjectFileContent(additionalProjectContent);
+
+            var result = await DotnetMSBuild(target: default);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, OutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary2.dll");
+            Assert.FileExists(result, OutputPath, "ClassLibrary2.Views.dll");
+
+            // dotnet msbuild /t:Publish /p:BuildProjectReferences=false
+            result = await DotnetMSBuild(target: "Publish", "/p:BuildProjectReferences=false", suppressRestore: true);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.dll");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.pdb");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "AppWithP2PReference.Views.pdb");
+
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.pdb");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary.Views.pdb");
+
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary2.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary2.pdb");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary2.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "ClassLibrary2.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithNoBuild_FailsWithoutBuild()
+        {
+            // Publish without building shouldn't succeed.
+            var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
+
+            Assert.BuildFailed(result);
+            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp3.0/SimpleMvc.dll because it couldn't be found.
+
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithNoBuild_CopiesAlreadyCompiledViews()
+        {
+            // Build
+            var result = await DotnetMSBuild("Build", "/p:AssemblyVersion=1.1.1.1");
+
+            Assert.BuildPassed(result);
+            var assemblyPath = Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            var viewsAssemblyPath = Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
+            var assemblyVersion = AssemblyName.GetAssemblyName(assemblyPath).Version;
+            var viewsAssemblyVersion = AssemblyName.GetAssemblyName(viewsAssemblyPath).Version;
+
+            // Publish should copy dlls from OutputPath
+            result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
+
+            Assert.BuildPassed(result);
+            var publishAssemblyPath = Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            var publishViewsAssemblyPath = Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            var publishAssemblyVersion = AssemblyName.GetAssemblyName(publishAssemblyPath).Version;
+            var publishViewsAssemblyVersion = AssemblyName.GetAssemblyName(publishViewsAssemblyPath).Version;
+
+            Assert.Equal(assemblyVersion, publishAssemblyVersion);
+            Assert.Equal(viewsAssemblyVersion, publishViewsAssemblyVersion);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs
new file mode 100644
index 0000000000..c5398f0a13
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs
@@ -0,0 +1,114 @@
+// 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.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class RazorCompileIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public RazorCompileIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorCompile_Success_CompilesAssembly()
+        {
+            var result = await DotnetMSBuild("RazorCompile");
+
+            Assert.BuildPassed(result);
+
+            // RazorGenerate should compile the assembly and pdb.
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorCompile_NoopsWithNoFiles()
+        {
+            Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
+
+            var result = await DotnetMSBuild("RazorCompile");
+
+            Assert.BuildPassed(result);
+
+            // Everything we do should noop - including building the app.
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.pdb");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorCompile_EmbedRazorGenerateSources_EmbedsCshtmlFiles()
+        {
+            var result = await DotnetMSBuild("RazorCompile", "/p:EmbedRazorGenerateSources=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            var assembly = LoadAssemblyFromBytes(result.Project.DirectoryPath, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            var resources = assembly.GetManifestResourceNames();
+
+            Assert.Equal(new string[]
+            {
+                "/Views/_ViewImports.cshtml",
+                "/Views/_ViewStart.cshtml",
+                "/Views/Home/About.cshtml",
+                "/Views/Home/Contact.cshtml",
+                "/Views/Home/Index.cshtml",
+                "/Views/Shared/_Layout.cshtml",
+                "/Views/Shared/_ValidationScriptsPartial.cshtml",
+                "/Views/Shared/Error.cshtml",
+            },
+            resources.OrderBy(r => r));
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorCompile_MvcRazorEmbedViewSources_EmbedsCshtmlFiles()
+        {
+            var result = await DotnetMSBuild("RazorCompile", "/p:EmbedRazorGenerateSources=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            var assembly = LoadAssemblyFromBytes(result.Project.DirectoryPath, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            var resources = assembly.GetManifestResourceNames();
+
+            Assert.Equal(new string[]
+            {
+                "/Views/_ViewImports.cshtml",
+                "/Views/_ViewStart.cshtml",
+                "/Views/Home/About.cshtml",
+                "/Views/Home/Contact.cshtml",
+                "/Views/Home/Index.cshtml",
+                "/Views/Shared/_Layout.cshtml",
+                "/Views/Shared/_ValidationScriptsPartial.cshtml",
+                "/Views/Shared/Error.cshtml",
+            },
+            resources.OrderBy(r => r));
+        }
+
+        private Assembly LoadAssemblyFromBytes(params string[] paths)
+        {
+            // We need to load the assembly from bytes to load it without locking the file - and yes, we need to
+            // load the pdb too, or else the CLR will load/lock it based on the path specified in the assembly.
+            var assemblyBytes = File.ReadAllBytes(Path.Combine(paths));
+            var symbolBytes = File.ReadAllBytes(Path.ChangeExtension(Path.Combine(paths), ".pdb"));
+            return Assembly.Load(assemblyBytes, symbolBytes);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs
new file mode 100644
index 0000000000..646c21cc77
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs
@@ -0,0 +1,358 @@
+// 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.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class RazorGenerateIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        private const string RazorGenerateTarget = "RazorGenerate";
+
+        public RazorGenerateIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_Success_GeneratesFilesOnDisk()
+        {
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildPassed(result);
+
+            // RazorGenerate should compile the assembly, but not the views.
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            // RazorGenerate should generate correct TagHelper caches
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.TagHelpers.input.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache");
+            Assert.FileContains(
+                result,
+                Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache"),
+                @"""Name"":""SimpleMvc.SimpleTagHelper""");
+
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewImports.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewStart.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Contact.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_Layout.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_ValidationScriptsPartial.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "Error.cshtml.g.cs");
+            Assert.FileCountEquals(result, 8, RazorIntermediateOutputPath, "*.cshtml.g.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_ErrorInRazorFile_ReportsMSBuildError()
+        {
+            // Introducing a syntax error, an unclosed brace
+            ReplaceContent("@{", "Views", "Home", "Index.cshtml");
+
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildFailed(result);
+
+            // Looks like C:\...\Views\Home\Index.cshtml(1,2): error RZ1006: The code block is missi... [C:\Users\rynowak\AppData\Local\Temp\rwnv03ll.wb0\SimpleMvc.csproj]
+            Assert.BuildError(result, "RZ1006");
+
+            // RazorGenerate should compile the assembly, but not the views.
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            // If there's a parser error, the generated file contents is likely incorrect. The file should not be written to disk.
+            Assert.FileDoesNotExist(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_LotOfErrorsInRazorFile_ReportsFirstHundredErrors()
+        {
+            // Introducing a syntax error, an unclosed brace
+            var content = new StringBuilder().Insert(0, "@{ ", 100).ToString();
+            ReplaceContent(content, "Views", "Home", "Index.cshtml");
+
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildFailed(result);
+
+            Assert.BuildOutputContainsLine(result, "And 101 more errors.");
+
+            // RazorGenerate should compile the assembly, but not the views.
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_BuildsIncrementally()
+        {
+            // Act - 1
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+            var generatedFile = Path.Combine(Project.DirectoryPath, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+
+            // Assert - 1
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, generatedFile);
+            var thumbPrint = GetThumbPrint(generatedFile);
+
+            // Act - 2
+            using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
+            {
+                result = await DotnetMSBuild(RazorGenerateTarget);
+            }
+
+            // Assert - 2
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, generatedFile);
+            var currentThumbPrint = GetThumbPrint(generatedFile);
+            Assert.Equal(thumbPrint, currentThumbPrint);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_Rebuilds_IfSourcesAreUpdated()
+        {
+            // Act - 1
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+            var file = Path.Combine(Project.DirectoryPath, "Views", "Home", "Contact.cshtml");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Contact.cshtml.g.cs");
+
+            // Assert - 1
+            Assert.BuildPassed(result);
+            var fileThumbPrint = GetThumbPrint(generatedFile);
+
+            // Act - 2
+            // Update the source content and build. We should expect the outputs to be regenerated.
+            ReplaceContent("Uodated content", file);
+            result = await DotnetMSBuild(RazorGenerateTarget);
+
+            // Assert - 2
+            Assert.BuildPassed(result);
+            var newThumbPrint = GetThumbPrint(generatedFile);
+            Assert.NotEqual(fileThumbPrint, newThumbPrint);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_Rebuilds_IfOutputFilesAreMissing()
+        {
+            // Act - 1
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+            var file = Path.Combine(Project.DirectoryPath, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+
+            // Assert - 1
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, file);
+
+            // Act - 2
+            File.Delete(file);
+            result = await DotnetMSBuild(RazorGenerateTarget);
+
+            // Assert - 2
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, file);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_Rebuilds_IfInputFilesAreRenamed()
+        {
+            // Act - 1
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+            var file = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
+            var renamed = Path.Combine(Project.DirectoryPath, "Views", "Home", "NewIndex.cshtml");
+            var generated = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            // Assert - 1
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, file);
+            Assert.FileExists(result, generated);
+
+            // Act - 2
+            File.Move(file, renamed);
+            result = await DotnetMSBuild(RazorGenerateTarget);
+
+            // Assert - 2
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "NewIndex.cshtml.g.cs");
+            Assert.FileDoesNotExist(result, generated);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_Rebuilds_IfInputFilesAreDeleted()
+        {
+            // Act - 1
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+            var file = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            // Assert - 1
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, generatedFile);
+
+            // Act - 2
+            File.Delete(file);
+            result = await DotnetMSBuild(RazorGenerateTarget);
+
+            // Assert - 2
+            Assert.BuildPassed(result);
+            Assert.FileDoesNotExist(result, generatedFile);
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_Noops_WithNoFiles()
+        {
+            Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
+
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildPassed(result);
+
+            // We shouldn't need to look for tag helpers
+            Assert.FileDoesNotExist(result, Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.input.cache"));
+            Assert.FileDoesNotExist(result, Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache"));
+
+            // We shouldn't need to hash the files
+            Assert.FileDoesNotExist(result, Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorCoreGenerate.cache"));
+
+            Assert.FileCountEquals(result, 0, RazorIntermediateOutputPath, "*.cshtml.g.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_MvcRazorFilesToCompile_OverridesDefaultItems()
+        {
+            var projectContent = @"
+<ItemGroup>
+  <MvcRazorFilesToCompile Include=""Views/Home/About.cshtml"" />
+</ItemGroup>
+";
+            AddProjectFileContent(projectContent);
+
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileCountEquals(result, 1, RazorIntermediateOutputPath, "*.cshtml.g.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_EnableDefaultRazorGenerateItems_False_OverridesDefaultItems()
+        {
+            var projectContent = @"
+ <PropertyGroup>
+   <EnableDefaultRazorGenerateItems>false</EnableDefaultRazorGenerateItems>
+ </PropertyGroup>
+ <ItemGroup>
+   <RazorGenerate Include=""Views/Home/About.cshtml"" />
+ </ItemGroup>
+";
+            AddProjectFileContent(projectContent);
+
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileCountEquals(result, 1, RazorIntermediateOutputPath, "*.cshtml.g.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc", additionalProjects: "LinkedDir")]
+        public async Task RazorGenerate_WorksWithLinkedFiles()
+        {
+            // Arrange
+            var projectContent = @"
+<ItemGroup>
+  <Content Include=""..\LinkedDir\LinkedFile.cshtml"" />
+  <Content Include=""..\LinkedDir\LinkedFile2.cshtml"" Link=""LinkedFileOut\LinkedFile2.cshtml"" />
+  <Content Include=""..\LinkedDir\LinkedFile3.cshtml"" Link=""LinkedFileOut\LinkedFileWithRename.cshtml"" />
+</ItemGroup>
+";
+            AddProjectFileContent(projectContent);
+
+            var result = await DotnetMSBuild(RazorGenerateTarget, "/t:_IntrospectRazorGenerateWithTargetPath");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFile.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFile2.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFileWithRename.cshtml.g.cs");
+
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile.cshtml")} LinkedFile.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFile.cshtml.g.cs")}");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile2.cshtml")} LinkedFileOut\LinkedFile2.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFile2.cshtml.g.cs")}");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile3.cshtml")} LinkedFileOut\LinkedFileWithRename.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFileWithRename.cshtml.g.cs")}");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc", additionalProjects: "LinkedDir")]
+        public async Task RazorGenerate_PrintsErrorsFromLinkedFiles()
+        {
+            // Arrange
+            var file = @"..\LinkedDir\LinkedErrorFile.cshtml";
+            var projectContent = $@"
+<ItemGroup>
+  <Content Include=""{file}"" Link=""LinkedFileOut\LinkedFile.cshtml"" />
+</ItemGroup>
+";
+            AddProjectFileContent(projectContent);
+
+            var result = await DotnetMSBuild(RazorGenerateTarget);
+
+            Assert.BuildFailed(result);
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // GetFullPath on OSX doesn't work well in travis. We end up computing a different path than will
+                // end up in the MSBuild logs.
+                var errorLocation = Path.GetFullPath(Path.Combine(Project.DirectoryPath, "..", "LinkedDir", "LinkedErrorFile.cshtml")) + "(1,2)";
+                Assert.BuildError(result, "RZ1006", errorLocation);
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorGenerate_FileWithAbsolutePath()
+        {
+            // In preview1 we totally ignore files that are specified with an absolute path
+            var filePath = Path.Combine(Project.SolutionPath, "temp.cshtml");
+            File.WriteAllText(filePath, string.Empty);
+
+            AddProjectFileContent($@"
+<ItemGroup>
+  <Content Include=""{filePath}""/>
+</ItemGroup>");
+
+            var result = await DotnetMSBuild(RazorGenerateTarget, "/t:_IntrospectRazorGenerateWithTargetPath");
+
+            Assert.BuildPassed(result);
+
+            // RazorGenerate should compile the assembly, but not the views.
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewImports.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewStart.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Contact.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_Layout.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_ValidationScriptsPartial.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "Error.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "temp.cshtml.g.cs");
+            Assert.FileCountEquals(result, 9, RazorIntermediateOutputPath, "*.cshtml.g.cs");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {filePath} temp.cshtml {Path.Combine(RazorIntermediateOutputPath, "temp.cshtml.g.cs")}");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
new file mode 100644
index 0000000000..7cabd6927a
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!--
+      There's not much value in multi-targeting here, this doesn't run much .NET code, it tests MSBuild.
+
+      This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project
+      has netcoreapp dependencies that need to be built first.
+    -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants>
+    <!-- Copy references locally so that we can use them in the test. -->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <BuildVariablesGeneratedFile>$(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs</BuildVariablesGeneratedFile>
+    <CompileDependsOn>EnsureBuildVariablesGeneratedFile;$(CompileDependsOn)</CompileDependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+    <Compile Include="$(BuildVariablesGeneratedFile)" Condition="Exists('$(BuildVariablesGeneratedFile)')" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+  <!-- The test projects rely on these binaries being available -->
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We don't need anything in this assembly, we just want to make sure it's built -->
+    <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj" />
+  </ItemGroup>
+
+  <Target Name="EnsureBuildVariablesGeneratedFile">
+    <Error Text="BuildVariables.generated.cs was not found. Run .\build /t:Prepare from the root of the repository to generate it." Condition="!Exists('$(BuildVariablesGeneratedFile)')" />
+  </Target>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/xunit.runner.json b/src/Razor/Microsoft.NET.Sdk.Razor/test/xunit.runner.json
new file mode 100644
index 0000000000..d00e4ae907
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/xunit.runner.json
@@ -0,0 +1,5 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false,
+  "maxParallelThreads": -1
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs
new file mode 100644
index 0000000000..2791dbcf62
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/CodeGeneration/TestCodeRenderingContext.cs
@@ -0,0 +1,99 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public static class TestCodeRenderingContext
+    {
+        public static CodeRenderingContext CreateDesignTime(
+            string newLineString = null,
+            string suppressUniqueIds = "test",
+            RazorSourceDocument source = null,
+            IntermediateNodeWriter nodeWriter = null)
+        {
+            var codeWriter = new CodeWriter();
+            var documentNode = new DocumentIntermediateNode();
+            var options = RazorCodeGenerationOptions.CreateDesignTimeDefault();
+
+            if (source == null)
+            {
+                source = TestRazorSourceDocument.Create(); 
+            }
+
+            var codeDocument = RazorCodeDocument.Create(source);
+            if (newLineString != null)
+            {
+                codeDocument.Items[CodeRenderingContext.NewLineString] = newLineString;
+            }
+
+            if (suppressUniqueIds != null)
+            {
+                codeDocument.Items[CodeRenderingContext.SuppressUniqueIds] = suppressUniqueIds;
+            }
+
+            if (nodeWriter == null)
+            {
+                nodeWriter = new DesignTimeNodeWriter();
+            }
+
+            var context = new DefaultCodeRenderingContext(codeWriter, nodeWriter, codeDocument, documentNode, options);
+            context.Visitor = new RenderChildrenVisitor(context);
+
+            return context;
+        }
+
+        public static CodeRenderingContext CreateRuntime(
+            string newLineString = null,
+            string suppressUniqueIds = "test",
+            RazorSourceDocument source = null,
+            IntermediateNodeWriter nodeWriter = null)
+        {
+            var codeWriter = new CodeWriter();
+            var documentNode = new DocumentIntermediateNode();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            if (source == null)
+            {
+                source = TestRazorSourceDocument.Create();
+            }
+
+            var codeDocument = RazorCodeDocument.Create(source);
+            if (newLineString != null)
+            {
+                codeDocument.Items[CodeRenderingContext.NewLineString] = newLineString;
+            }
+
+            if (suppressUniqueIds != null)
+            {
+                codeDocument.Items[CodeRenderingContext.SuppressUniqueIds] = suppressUniqueIds;
+            }
+
+            if (nodeWriter == null)
+            {
+                nodeWriter = new RuntimeNodeWriter();
+            }
+
+            var context = new DefaultCodeRenderingContext(codeWriter, nodeWriter, codeDocument, documentNode, options);
+            context.Visitor = new RenderChildrenVisitor(context);
+
+            return context;
+        }
+
+        private class RenderChildrenVisitor : IntermediateNodeVisitor
+        {
+            private readonly CodeRenderingContext _context;
+            public RenderChildrenVisitor(CodeRenderingContext context)
+            {
+                _context = context;
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                _context.CodeWriter.WriteLine("Render Children");
+            }
+        }
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompilationFailedException.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompilationFailedException.cs
new file mode 100644
index 0000000000..febd3f69c6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompilationFailedException.cs
@@ -0,0 +1,58 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class CompilationFailedException : XunitException
+    {
+        public CompilationFailedException(Compilation compilation, Diagnostic[] diagnostics)
+        {
+            Compilation = compilation;
+            Diagnostics = diagnostics;
+        }
+
+        public Compilation Compilation { get; }
+
+        public Diagnostic[] Diagnostics { get; }
+
+        public override string Message
+        {
+            get
+            {
+                var builder = new StringBuilder();
+                builder.AppendLine("Compilation failed: ");
+
+                var syntaxTreesWithErrors = new HashSet<SyntaxTree>();
+                foreach (var diagnostic in Diagnostics)
+                {
+                    builder.AppendLine(diagnostic.ToString());
+
+                    if (diagnostic.Location.IsInSource)
+                    {
+                        syntaxTreesWithErrors.Add(diagnostic.Location.SourceTree);
+                    }
+                }
+
+                if (syntaxTreesWithErrors.Any())
+                {
+                    builder.AppendLine();
+                    builder.AppendLine();
+
+                    foreach (var syntaxTree in syntaxTreesWithErrors)
+                    {
+                        builder.AppendLine($"File {syntaxTree.FilePath ?? "unknown"}:");
+                        builder.AppendLine(syntaxTree.GetText().ToString());
+                    }
+                }
+
+                return builder.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledAssembly.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledAssembly.cs
new file mode 100644
index 0000000000..4024de0f49
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledAssembly.cs
@@ -0,0 +1,24 @@
+// 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.Reflection;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class CompiledAssembly
+    {
+        public CompiledAssembly(Compilation compilation, RazorCodeDocument codeDocument, Assembly assembly)
+        {
+            Compilation = compilation;
+            CodeDocument = codeDocument;
+            Assembly = assembly;
+        }
+
+        public Assembly Assembly { get; }
+
+        public RazorCodeDocument CodeDocument { get; }
+
+        public Compilation Compilation { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledCSharpCode.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledCSharpCode.cs
new file mode 100644
index 0000000000..9d10341428
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/CompiledCSharpCode.cs
@@ -0,0 +1,21 @@
+// 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 Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class CompiledCSharpCode
+    {
+        public CompiledCSharpCode(Compilation baseCompilation, RazorCodeDocument codeDocument)
+        {
+            BaseCompilation = baseCompilation;
+            CodeDocument = codeDocument;
+        }
+
+        // A compilation that can be used *with* this code to compile an assembly
+        public Compilation BaseCompilation { get; set; }
+
+        public RazorCodeDocument CodeDocument { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
new file mode 100644
index 0000000000..c42bb4ef91
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -0,0 +1,639 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    [IntializeTestFile]
+    public abstract class IntegrationTestBase
+    {
+        private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
+
+        private static readonly CSharpCompilation DefaultBaseCompilation;
+
+        static IntegrationTestBase()
+        {
+            var referenceAssemblyRoots = new[]
+            {
+                typeof(System.Runtime.AssemblyTargetedPatchBandAttribute).Assembly, // System.Runtime
+            };
+
+            var referenceAssemblies = referenceAssemblyRoots
+                .SelectMany(assembly => assembly.GetReferencedAssemblies().Concat(new[] { assembly.GetName() }))
+                .Distinct()
+                .Select(Assembly.Load)
+                .Select(assembly => MetadataReference.CreateFromFile(assembly.Location))
+                .ToList();
+            DefaultBaseCompilation = CSharpCompilation.Create(
+                "TestAssembly",
+                Array.Empty<SyntaxTree>(),
+                referenceAssemblies,
+                new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+        }
+
+        protected IntegrationTestBase(bool? generateBaselines = null)
+        {
+            TestProjectRoot = TestProject.GetProjectDirectory(GetType());
+
+            if (generateBaselines.HasValue)
+            {
+                GenerateBaselines = generateBaselines.Value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="CSharpCompilation"/> that will be used as the 'app' compilation.
+        /// </summary>
+        protected virtual CSharpCompilation BaseCompilation => DefaultBaseCompilation;
+
+        /// <summary>
+        /// Gets the parse options applied when using <see cref="AddCSharpSyntaxTree(string, string)"/>.
+        /// </summary>
+        protected virtual CSharpParseOptions CSharpParseOptions { get; } = new CSharpParseOptions(LanguageVersion.Latest);
+
+        /// <summary>
+        /// Gets the compilation options applied when compiling assemblies.
+        /// </summary>
+        protected virtual CSharpCompilationOptions CSharpCompilationOptions { get; } = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
+
+        /// <summary>
+        /// Gets a list of CSharp syntax trees used that are considered part of the 'app'.
+        /// </summary>
+        protected virtual List<CSharpSyntaxTree> CSharpSyntaxTrees { get; } = new List<CSharpSyntaxTree>();
+
+        /// <summary>
+        /// Gets the <see cref="RazorConfiguration"/> that will be used for code generation.
+        /// </summary>
+        protected virtual RazorConfiguration Configuration { get; } = RazorConfiguration.Default;
+
+        protected virtual bool DesignTime { get; } = false;
+
+        /// <summary>
+        /// Gets the 
+        /// </summary>
+        internal VirtualRazorProjectFileSystem FileSystem { get; } = new VirtualRazorProjectFileSystem();
+
+        /// <summary>
+        /// Used to force a specific style of line-endings for testing. This matters for the baseline tests that exercise line mappings. 
+        /// Even though we normalize newlines for testing, the difference between platforms affects the data through the *count* of 
+        /// characters written.
+        /// </summary>
+        protected virtual string LineEnding { get; } = "\r\n";
+
+#if GENERATE_BASELINES
+        protected bool GenerateBaselines { get; } = true;
+#else
+        protected bool GenerateBaselines { get; } = false;
+#endif
+
+        protected string TestProjectRoot { get; }
+
+        // Used by the test framework to set the 'base' name for test files.
+        public static string FileName
+        {
+            get { return _fileName.Value; }
+            set { _fileName.Value = value; }
+        }
+
+        public string FileExtension { get; set; } = ".cshtml";
+
+        protected virtual void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+        }
+
+        protected CSharpSyntaxTree AddCSharpSyntaxTree(string text, string filePath = null)
+        {
+            var syntaxTree = (CSharpSyntaxTree)CSharpSyntaxTree.ParseText(text, CSharpParseOptions, path: filePath);
+            CSharpSyntaxTrees.Add(syntaxTree);
+            return syntaxTree;
+        }
+
+        protected RazorProjectItem AddProjectItemFromText(string text, string filePath = "_ViewImports.cshtml")
+        {
+            var projectItem = CreateProjectItemFromText(text, filePath);
+            FileSystem.Add(projectItem);
+            return projectItem;
+        }
+
+        private RazorProjectItem CreateProjectItemFromText(string text, string filePath)
+        {
+            // Consider the file path to be relative to the 'FileName' of the test.
+            var workingDirectory = Path.GetDirectoryName(FileName);
+
+            // Since these paths are used in baselines, we normalize them to windows style. We
+            // use "" as the base path by convention to avoid baking in an actual file system
+            // path.
+            var basePath = "";
+            var physicalPath = Path.Combine(workingDirectory, filePath).Replace('/', '\\');
+            var relativePhysicalPath = physicalPath;
+
+            // FilePaths in Razor are **always** are of the form '/a/b/c.cshtml'
+            filePath = physicalPath.Replace('\\', '/');
+            if (!filePath.StartsWith("/"))
+            {
+                filePath = '/' + filePath;
+            }
+
+            text = NormalizeNewLines(text);
+
+            var projectItem = new TestRazorProjectItem(
+                basePath: basePath,
+                filePath: filePath,
+                physicalPath: physicalPath,
+                relativePhysicalPath: relativePhysicalPath)
+            {
+                Content = text,
+            };
+            
+            return projectItem;
+        }
+
+        protected RazorProjectItem CreateProjectItemFromFile(string filePath = null)
+        {
+            if (FileName == null)
+            {
+                var message = $"{nameof(CreateProjectItemFromFile)} should only be called from an integration test, ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            var suffixIndex = FileName.LastIndexOf("_");
+            var normalizedFileName = suffixIndex == -1 ? FileName : FileName.Substring(0, suffixIndex);
+            var sourceFileName = Path.ChangeExtension(normalizedFileName, FileExtension);
+            var testFile = TestFile.Create(sourceFileName, GetType().GetTypeInfo().Assembly);
+            if (!testFile.Exists())
+            {
+                throw new XunitException($"The resource {sourceFileName} was not found.");
+            }
+            var fileContent = testFile.ReadAllText();
+            var normalizedContent = NormalizeNewLines(fileContent);
+
+            var workingDirectory = Path.GetDirectoryName(FileName);
+            var fullPath = sourceFileName;
+
+            // Normalize to forward-slash - these strings end up in the baselines.
+            fullPath = fullPath.Replace('\\', '/');
+            sourceFileName = sourceFileName.Replace('\\', '/');
+
+            // FilePaths in Razor are **always** are of the form '/a/b/c.cshtml'
+            filePath = filePath ?? sourceFileName;
+            if (!filePath.StartsWith("/"))
+            {
+                filePath = '/' + filePath;
+            }
+
+            var projectItem = new TestRazorProjectItem(
+                basePath: workingDirectory,
+                filePath: filePath,
+                physicalPath: fullPath,
+                relativePhysicalPath: sourceFileName)
+            {
+                Content = fileContent,
+            };
+            
+            return projectItem;
+        }
+
+        protected CompiledCSharpCode CompileToCSharp(string text, string path = "test.cshtml", bool? designTime = null)
+        {
+            var projectItem = CreateProjectItemFromText(text, path);
+            return CompileToCSharp(projectItem, designTime);
+        }
+
+        protected CompiledCSharpCode CompileToCSharp(RazorProjectItem projectItem, bool? designTime = null)
+        {
+            var compilation = CreateCompilation();
+            var references = compilation.References.Concat(new[] { compilation.ToMetadataReference(), }).ToArray();
+
+            var projectEngine = CreateProjectEngine(Configuration, references, ConfigureProjectEngine);
+            var codeDocument = (designTime ?? DesignTime) ? projectEngine.ProcessDesignTime(projectItem) : projectEngine.Process(projectItem);
+
+            return new CompiledCSharpCode(CSharpCompilation.Create(compilation.AssemblyName + ".Views", references: references, options: CSharpCompilationOptions), codeDocument);
+        }
+
+        protected CompiledAssembly CompileToAssembly(string text, string path = "test.cshtml", bool? designTime = null, bool throwOnFailure = true)
+        {
+            var compiled = CompileToCSharp(text, path, designTime);
+            return CompileToAssembly(compiled);
+        }
+
+        protected CompiledAssembly CompileToAssembly(RazorProjectItem projectItem, bool? designTime = null, bool throwOnFailure = true)
+        {
+            var compiled = CompileToCSharp(projectItem, designTime);
+            return CompileToAssembly(compiled, throwOnFailure: throwOnFailure);
+        }
+
+        protected CompiledAssembly CompileToAssembly(CompiledCSharpCode code, bool throwOnFailure = true)
+        {
+            var cSharpDocument = code.CodeDocument.GetCSharpDocument();
+            if (cSharpDocument.Diagnostics.Any())
+            {
+                var diagnosticsLog = string.Join(Environment.NewLine, cSharpDocument.Diagnostics.Select(d => d.ToString()).ToArray());
+                throw new InvalidOperationException($"Aborting compilation to assembly because RazorCompiler returned nonempty diagnostics: {diagnosticsLog}");
+            }
+
+            var syntaxTrees = new[]
+            {
+                (CSharpSyntaxTree)CSharpSyntaxTree.ParseText(cSharpDocument.GeneratedCode, CSharpParseOptions, path: code.CodeDocument.Source.FilePath),
+            };
+
+            var compilation = code.BaseCompilation.AddSyntaxTrees(syntaxTrees);
+
+            var diagnostics = compilation
+                .GetDiagnostics()
+                .Where(d => d.Severity >= DiagnosticSeverity.Warning)
+                .ToArray();
+
+            if (diagnostics.Length > 0 && throwOnFailure)
+            {
+                throw new CompilationFailedException(compilation, diagnostics);
+            }
+            else if (diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error))
+            {
+                return new CompiledAssembly(compilation, code.CodeDocument, assembly: null);
+            }
+
+            using (var peStream = new MemoryStream())
+            {
+                var emit = compilation.Emit(peStream);
+                diagnostics = emit
+                    .Diagnostics
+                    .Where(d => d.Severity >= DiagnosticSeverity.Warning)
+                    .ToArray();
+                if (diagnostics.Length > 0 && throwOnFailure)
+                {
+                    throw new CompilationFailedException(compilation, diagnostics);
+                }
+
+                return new CompiledAssembly(compilation, code.CodeDocument, Assembly.Load(peStream.ToArray()));
+            }
+        }
+
+        private CSharpCompilation CreateCompilation()
+        {
+            var compilation = BaseCompilation.AddSyntaxTrees(CSharpSyntaxTrees);
+            var diagnostics = compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning).ToArray();
+            if (diagnostics.Length > 0)
+            {
+                throw new CompilationFailedException(compilation, diagnostics);
+            }
+
+            return compilation;
+        }
+
+        protected RazorProjectEngine CreateProjectEngine(Action<RazorProjectEngineBuilder> configure = null)
+        {
+            var compilation = CreateCompilation();
+            var references = compilation.References.Concat(new[] { compilation.ToMetadataReference(), }).ToArray();
+            return CreateProjectEngine(Configuration, references, configure);
+        }
+
+        private RazorProjectEngine CreateProjectEngine(RazorConfiguration configuration, MetadataReference[] references, Action<RazorProjectEngineBuilder> configure)
+        {
+            return RazorProjectEngine.Create(configuration, FileSystem, b =>
+            {
+                b.Phases.Insert(0, new ConfigureCodeRenderingPhase(LineEnding));
+
+                configure?.Invoke(b);
+
+                // Allow the test to do custom things with tag helpers, but do the default thing most of the time.
+                if (!b.Features.OfType<ITagHelperFeature>().Any())
+                {
+                    b.Features.Add(new CompilationTagHelperFeature());
+                    b.Features.Add(new DefaultMetadataReferenceFeature()
+                    {
+                        References = references,
+                    });
+                }
+
+                // Decorate the import feature so we can normalize line endings.
+                var importFeature = b.Features.OfType<IImportProjectFeature>().FirstOrDefault();
+                b.Features.Add(new NormalizedDefaultImportFeature(importFeature, LineEnding));
+                b.Features.Remove(importFeature);
+            });
+        }
+
+        protected void AssertDocumentNodeMatchesBaseline(DocumentIntermediateNode document)
+        {
+            if (FileName == null)
+            {
+                var message = $"{nameof(AssertDocumentNodeMatchesBaseline)} should only be called from an integration test ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            var baselineFileName = Path.ChangeExtension(FileName, ".ir.txt");
+
+            if (GenerateBaselines)
+            {
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
+                File.WriteAllText(baselineFullPath, IntermediateNodeSerializer.Serialize(document));
+                return;
+            }
+
+            var irFile = TestFile.Create(baselineFileName, GetType().GetTypeInfo().Assembly);
+            if (!irFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFileName} was not found.");
+            }
+
+            var baseline = irFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            IntermediateNodeVerifier.Verify(document, baseline);
+        }
+
+        protected void AssertCSharpDocumentMatchesBaseline(RazorCSharpDocument cSharpDocument)
+        {
+            if (FileName == null)
+            {
+                var message = $"{nameof(AssertCSharpDocumentMatchesBaseline)} should only be called from an integration test ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            var baselineFileName = Path.ChangeExtension(FileName, ".codegen.cs");
+            var baselineDiagnosticsFileName = Path.ChangeExtension(FileName, ".diagnostics.txt");
+
+            if (GenerateBaselines)
+            {
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
+                File.WriteAllText(baselineFullPath, cSharpDocument.GeneratedCode);
+
+                var baselineDiagnosticsFullPath = Path.Combine(TestProjectRoot, baselineDiagnosticsFileName);
+                var lines = cSharpDocument.Diagnostics.Select(RazorDiagnosticSerializer.Serialize).ToArray();
+                if (lines.Any())
+                {
+                    File.WriteAllLines(baselineDiagnosticsFullPath, lines);
+                }
+                else if (File.Exists(baselineDiagnosticsFullPath))
+                {
+                    File.Delete(baselineDiagnosticsFullPath);
+                }
+
+                return;
+            }
+
+            var codegenFile = TestFile.Create(baselineFileName, GetType().GetTypeInfo().Assembly);
+            if (!codegenFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFileName} was not found.");
+            }
+
+            var baseline = codegenFile.ReadAllText();
+
+            // Normalize newlines to match those in the baseline.
+            var actual = cSharpDocument.GeneratedCode.Replace("\r", "").Replace("\n", "\r\n");
+            Assert.Equal(baseline, actual);
+
+            var baselineDiagnostics = string.Empty;
+            var diagnosticsFile = TestFile.Create(baselineDiagnosticsFileName, GetType().GetTypeInfo().Assembly);
+            if (diagnosticsFile.Exists())
+            {
+                baselineDiagnostics = diagnosticsFile.ReadAllText();
+            }
+
+            var actualDiagnostics = string.Concat(cSharpDocument.Diagnostics.Select(d => RazorDiagnosticSerializer.Serialize(d) + "\r\n"));
+            Assert.Equal(baselineDiagnostics, actualDiagnostics);
+        }
+
+        protected void AssertSourceMappingsMatchBaseline(RazorCodeDocument codeDocument)
+        {
+            if (FileName == null)
+            {
+                var message = $"{nameof(AssertSourceMappingsMatchBaseline)} should only be called from an integration test ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            var csharpDocument = codeDocument.GetCSharpDocument();
+            Assert.NotNull(csharpDocument);
+
+            var baselineFileName = Path.ChangeExtension(FileName, ".mappings.txt");
+            var serializedMappings = SourceMappingsSerializer.Serialize(csharpDocument, codeDocument.Source);
+
+            if (GenerateBaselines)
+            {
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
+                File.WriteAllText(baselineFullPath, serializedMappings);
+                return;
+            }
+
+            var testFile = TestFile.Create(baselineFileName, GetType().GetTypeInfo().Assembly);
+            if (!testFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFileName} was not found.");
+            }
+
+            var baseline = testFile.ReadAllText();
+
+            // Normalize newlines to match those in the baseline.
+            var actualBaseline = serializedMappings.Replace("\r", "").Replace("\n", "\r\n");
+
+            Assert.Equal(baseline, actualBaseline);
+
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            var visitor = new CodeSpanVisitor();
+            visitor.Visit(syntaxTree.Root);
+
+            var charBuffer = new char[codeDocument.Source.Length];
+            codeDocument.Source.CopyTo(0, charBuffer, 0, codeDocument.Source.Length);
+            var sourceContent = new string(charBuffer);
+
+            var spans = visitor.CodeSpans;
+            for (var i = 0; i < spans.Count; i++)
+            {
+                var span = spans[i];
+                var sourceSpan = span.GetSourceSpan(codeDocument.Source);
+                if (sourceSpan == null)
+                {
+                    // Not in the main file, skip.
+                    continue;
+                }
+
+                var expectedSpan = sourceContent.Substring(sourceSpan.AbsoluteIndex, sourceSpan.Length);
+
+                // See #2593
+                if (string.IsNullOrWhiteSpace(expectedSpan))
+                {
+                    // For now we don't verify whitespace inside of a directive. We know that directives cheat
+                    // with how they bound whitespace/C#/markup to make completion work.
+                    if (span.FirstAncestorOrSelf<RazorDirectiveSyntax>() != null)
+                    {
+                        continue;
+                    }
+                }
+
+                // See #2594
+                if (string.Equals("@", expectedSpan))
+                {
+                    // For now we don't verify an escaped transition. In some cases one of the @ tokens in @@foo
+                    // will be mapped as C# but will not be present in the output buffer because it's not actually C#.
+                    continue;
+                }
+
+                var found = false;
+                for (var j = 0; j < csharpDocument.SourceMappings.Count; j++)
+                {
+                    var mapping = csharpDocument.SourceMappings[j];
+                    if (mapping.OriginalSpan == sourceSpan)
+                    {
+                        var actualSpan = csharpDocument.GeneratedCode.Substring(
+                            mapping.GeneratedSpan.AbsoluteIndex,
+                            mapping.GeneratedSpan.Length);
+
+                        if (!string.Equals(expectedSpan, actualSpan, StringComparison.Ordinal))
+                        {
+                            throw new XunitException(
+                                $"Found the span {sourceSpan} in the output mappings but it contains " +
+                                $"'{EscapeWhitespace(actualSpan)}' instead of '{EscapeWhitespace(expectedSpan)}'.");
+                        }
+
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (!found)
+                {
+                    throw new XunitException(
+                        $"Could not find the span {sourceSpan} - containing '{EscapeWhitespace(expectedSpan)}' " +
+                        $"in the output.");
+                }
+            }
+        }
+
+        private class CodeSpanVisitor : SyntaxRewriter
+        {
+            public List<Syntax.SyntaxNode> CodeSpans { get; } = new List<Syntax.SyntaxNode>();
+
+            public override Syntax.SyntaxNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator != SpanChunkGenerator.Null)
+                {
+                    CodeSpans.Add(node);
+                }
+                return base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override Syntax.SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator != SpanChunkGenerator.Null)
+                {
+                    CodeSpans.Add(node);
+                }
+                return base.VisitCSharpExpressionLiteral(node);
+            }
+        }
+
+        private static string EscapeWhitespace(string content)
+        {
+            return content
+                .Replace("\n", "\\n")
+                .Replace("\r", "\\r")
+                .Replace("\t", "\\t");
+        }
+
+        private string NormalizeNewLines(string content)
+        {
+            return NormalizeNewLines(content, LineEnding);
+        }
+
+        private static string NormalizeNewLines(string content, string lineEnding)
+        {
+            return Regex.Replace(content, "(?<!\r)\n", lineEnding, RegexOptions.None, TimeSpan.FromSeconds(10));
+        }
+
+        // This is to prevent you from accidentally checking in with GenerateBaselines = true
+        [Fact]
+        public void GenerateBaselinesMustBeFalse()
+        {
+            Assert.False(GenerateBaselines, "GenerateBaselines should be set back to false before you check in!");
+        }
+
+        private class ConfigureCodeRenderingPhase : RazorEnginePhaseBase
+        {
+            public ConfigureCodeRenderingPhase(string lineEnding)
+            {
+                LineEnding = lineEnding;
+            }
+
+            public string LineEnding { get; }
+
+            protected override void ExecuteCore(RazorCodeDocument codeDocument)
+            {
+                codeDocument.Items[CodeRenderingContext.SuppressUniqueIds] = "test";
+                codeDocument.Items[CodeRenderingContext.NewLineString] = LineEnding;
+            }
+        }
+
+        // 'Default' imports won't have normalized line-endings, which is unfriendly for testing.
+        private class NormalizedDefaultImportFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+        {
+            private readonly IImportProjectFeature _inner;
+            private readonly string _lineEnding;
+
+            public NormalizedDefaultImportFeature(IImportProjectFeature inner, string lineEnding)
+            {
+                _inner = inner;
+                _lineEnding = lineEnding;
+            }
+
+            protected override void OnInitialized()
+            {
+                if (_inner != null)
+                {
+                    _inner.ProjectEngine = ProjectEngine;
+                }
+            }
+
+            public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+            {
+                if (_inner == null)
+                {
+                    return Array.Empty<RazorProjectItem>();
+                }
+
+                var normalizedImports = new List<RazorProjectItem>();
+                var imports = _inner.GetImports(projectItem);
+                foreach (var import in imports)
+                {
+                    if (import.Exists)
+                    {
+                        var text = string.Empty;
+                        using (var stream = import.Read())
+                        using (var reader = new StreamReader(stream))
+                        {
+                            text = reader.ReadToEnd().Trim();
+                        }
+
+                        // It's important that we normalize the newlines in the default imports. The default imports will
+                        // be created with Environment.NewLine, but we need to normalize to `\r\n` so that the indices
+                        // are the same on xplat.
+                        var normalizedText = NormalizeNewLines(text, _lineEnding);
+                        var normalizedImport = new TestRazorProjectItem(import.FilePath, import.PhysicalPath, import.RelativePhysicalPath, import.BasePath)
+                        {
+                            Content = normalizedText
+                        };
+
+                        normalizedImports.Add(normalizedImport);
+                    }
+                }
+
+                return normalizedImports;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs
new file mode 100644
index 0000000000..891a4849ed
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeSerializer.cs
@@ -0,0 +1,46 @@
+// 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.IO;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public static class IntermediateNodeSerializer
+    {
+        public static string Serialize(IntermediateNode node)
+        {
+            using (var writer = new StringWriter())
+            {
+                var walker = new Walker(writer);
+                walker.Visit(node);
+
+                return writer.ToString();
+            }
+        }
+
+        private class Walker : IntermediateNodeWalker
+        {
+            private readonly IntermediateNodeWriter _visitor;
+            private readonly TextWriter _writer;
+
+            public Walker(TextWriter writer)
+            {
+                _visitor = new IntermediateNodeWriter(writer);
+                _writer = writer;
+            }
+
+            public TextWriter Writer { get; }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                _visitor.Visit(node);
+                _writer.WriteLine();
+
+                _visitor.Depth++;
+                base.VisitDefault(node);
+                _visitor.Depth--;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs
new file mode 100644
index 0000000000..a75da6a2fc
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeVerifier.cs
@@ -0,0 +1,275 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public static class IntermediateNodeVerifier
+    {
+        public static void Verify(IntermediateNode node, string[] baseline)
+        {
+            var walker = new Walker(baseline);
+            walker.Visit(node);
+            walker.AssertReachedEndOfBaseline();
+        }
+
+        private class Walker : IntermediateNodeWalker
+        {
+            private readonly string[] _baseline;
+            private readonly IntermediateNodeWriter _visitor;
+            private readonly StringWriter _writer;
+
+            private int _index;
+
+            public Walker(string[] baseline)
+            {
+                _writer = new StringWriter();
+
+                _visitor = new IntermediateNodeWriter(_writer);
+                _baseline = baseline;
+
+            }
+
+            public TextWriter Writer { get; }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                var expected = _index < _baseline.Length ? _baseline[_index++] : null;
+
+                // Write the node as text for comparison
+                _writer.GetStringBuilder().Clear();
+                _visitor.Visit(node);
+                var actual = _writer.GetStringBuilder().ToString();
+
+                AssertNodeEquals(node, Ancestors, expected, actual);
+
+                _visitor.Depth++;
+                base.VisitDefault(node);
+                _visitor.Depth--;
+            }
+
+            public void AssertReachedEndOfBaseline()
+            {
+                // Since we're walking the nodes of our generated code there's the chance that our baseline is longer.
+                Assert.True(_baseline.Length == _index, "Not all lines of the baseline were visited!");
+            }
+
+            private void AssertNodeEquals(IntermediateNode node, IEnumerable<IntermediateNode> ancestors, string expected, string actual)
+            {
+                if (string.Equals(expected, actual))
+                {
+                    // YAY!!! everything is great.
+                    return;
+                }
+
+                if (expected == null)
+                {
+                    var message = "The node is missing from baseline.";
+                    throw new IntermediateNodeBaselineException(node, Ancestors.ToArray(), expected, actual, message);
+                }
+
+                int charsVerified = 0;
+                AssertNestingEqual(node, ancestors, expected, actual, ref charsVerified);
+                AssertNameEqual(node, ancestors, expected, actual, ref charsVerified);
+                AssertDelimiter(node, expected, actual, true, ref charsVerified);
+                AssertLocationEqual(node, ancestors, expected, actual, ref charsVerified);
+                AssertDelimiter(node, expected, actual, false, ref charsVerified);
+                AssertContentEqual(node, ancestors, expected, actual, ref charsVerified);
+
+                throw new InvalidOperationException("We can't figure out HOW these two things are different. This is a bug.");
+            }
+
+            private void AssertNestingEqual(IntermediateNode node, IEnumerable<IntermediateNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var i = 0;
+                for (; i < expected.Length; i++)
+                {
+                    if (expected[i] != ' ')
+                    {
+                        break;
+                    }
+                }
+
+                var failed = false;
+                var j = 0;
+                for (; j < i; j++)
+                {
+                    if (actual.Length <= j || actual[j] != ' ')
+                    {
+                        failed = true;
+                        break;
+                    }
+                }
+
+                if (actual.Length <= j + 1 || actual[j] == ' ')
+                {
+                    failed = true;
+                }
+
+                if (failed)
+                {
+                    var message = "The node is at the wrong level of nesting. This usually means a child is missing.";
+                    throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified = j;
+            }
+
+            private void AssertNameEqual(IntermediateNode node, IEnumerable<IntermediateNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var expectedName = GetName(expected, charsVerified);
+                var actualName = GetName(actual, charsVerified);
+
+                if (!string.Equals(expectedName, actualName))
+                {
+                    var message = $"Node names are not equal.";
+                    throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified += expectedName.Length;
+            }
+
+            // Either both strings need to have a delimiter next or neither should.
+            private void AssertDelimiter(IntermediateNode node, string expected, string actual, bool required, ref int charsVerified)
+            {
+                if (charsVerified == expected.Length && required)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{expected}'.");
+                }
+
+                if (charsVerified == actual.Length && required)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'.");
+                }
+
+                if (charsVerified == expected.Length && charsVerified == actual.Length)
+                {
+                    return;
+                }
+
+                var expectedDelimiter = expected.IndexOf(" - ", charsVerified);
+                if (expectedDelimiter != charsVerified && expectedDelimiter != -1)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'.");
+                }
+
+                var actualDelimiter = actual.IndexOf(" - ", charsVerified);
+                if (actualDelimiter != charsVerified && actualDelimiter != -1)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'.");
+                }
+
+                Assert.Equal(expectedDelimiter, actualDelimiter);
+
+                charsVerified += 3;
+            }
+
+            private void AssertLocationEqual(IntermediateNode node, IEnumerable<IntermediateNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var expectedLocation = GetLocation(expected, charsVerified);
+                var actualLocation = GetLocation(actual, charsVerified);
+
+                if (!string.Equals(expectedLocation, actualLocation))
+                {
+                    var message = $"Locations are not equal.";
+                    throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified += expectedLocation.Length;
+            }
+
+            private void AssertContentEqual(IntermediateNode node, IEnumerable<IntermediateNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var expectedContent = GetContent(expected, charsVerified);
+                var actualContent = GetContent(actual, charsVerified);
+
+                if (!string.Equals(expectedContent, actualContent))
+                {
+                    var message = $"Contents are not equal.";
+                    throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified += expectedContent.Length;
+            }
+
+            private string GetName(string text, int start)
+            {
+                var delimiter = text.IndexOf(" - ", start);
+                if (delimiter == -1)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{text}'.");
+                }
+
+                return text.Substring(start, delimiter - start);
+            }
+
+            private string GetLocation(string text, int start)
+            {
+                var delimiter = text.IndexOf(" - ", start);
+                return delimiter == -1 ? text.Substring(start) : text.Substring(start, delimiter - start);
+            }
+
+            private string GetContent(string text, int start)
+            {
+                return start == text.Length ? string.Empty : text.Substring(start);
+            }
+
+            private class IntermediateNodeBaselineException : XunitException
+            {
+                public IntermediateNodeBaselineException(IntermediateNode node, IntermediateNode[] ancestors, string expected, string actual, string userMessage)
+                    : base(Format(node, ancestors, expected, actual, userMessage))
+                {
+                    Node = node;
+                    Expected = expected;
+                    Actual = actual;
+                }
+
+                public IntermediateNode Node { get; }
+
+                public string Actual { get; }
+
+                public string Expected { get; }
+
+                private static string Format(IntermediateNode node, IntermediateNode[] ancestors, string expected, string actual, string userMessage)
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendLine(userMessage);
+                    builder.AppendLine();
+
+                    if (expected != null)
+                    {
+                        builder.Append("Expected: ");
+                        builder.AppendLine(expected);
+                    }
+
+                    if (actual != null)
+                    {
+                        builder.Append("Actual: ");
+                        builder.AppendLine(actual);
+                    }
+
+                    if (ancestors != null)
+                    {
+                        builder.AppendLine();
+                        builder.AppendLine("Path:");
+
+                        foreach (var ancestor in ancestors)
+                        {
+                            builder.AppendLine(ancestor.ToString());
+                        }
+                    }
+
+                    return builder.ToString();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
new file mode 100644
index 0000000000..4329c0d02d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
@@ -0,0 +1,306 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    // Serializes single IR nodes (shallow).
+    public class IntermediateNodeWriter :
+        IntermediateNodeVisitor,
+        IExtensionIntermediateNodeVisitor<SectionIntermediateNode>
+    {
+        private readonly TextWriter _writer;
+
+        public IntermediateNodeWriter(TextWriter writer)
+        {
+            _writer = writer;
+        }
+
+        public int Depth { get; set; }
+
+        public override void VisitDefault(IntermediateNode node)
+        {
+            WriteBasicNode(node);
+        }
+
+        public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+        {
+            var entries = new List<string>()
+            {
+                string.Join(" ", node.Modifiers),
+                node.ClassName,
+                node.BaseType,
+                string.Join(", ", node.Interfaces ?? Array.Empty<string>())
+            };
+
+            // Avoid adding the type parameters to the baseline if they aren't present.
+            if (node.TypeParameters != null && node.TypeParameters.Count > 0)
+            {
+                entries.Add(string.Join(", ", node.TypeParameters));
+            }
+
+            WriteContentNode(node, entries.ToArray());
+        }
+
+        public override void VisitCSharpExpressionAttributeValue(CSharpExpressionAttributeValueIntermediateNode node)
+        {
+            WriteContentNode(node, node.Prefix);
+        }
+
+        public override void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIntermediateNode node)
+        {
+            WriteContentNode(node, node.Prefix);
+        }
+
+        public override void VisitToken(IntermediateToken node)
+        {
+            WriteContentNode(node, node.Kind.ToString(), node.Content);
+        }
+
+        public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+        {
+            WriteContentNode(node, node.DirectiveName);
+        }
+
+        public override void VisitDirective(DirectiveIntermediateNode node)
+        {
+            WriteContentNode(node, node.DirectiveName);
+        }
+
+        public override void VisitDirectiveToken(DirectiveTokenIntermediateNode node)
+        {
+            WriteContentNode(node, node.Content);
+        }
+
+        public override void VisitFieldDeclaration(FieldDeclarationIntermediateNode node)
+        {
+            WriteContentNode(node, string.Join(" ", node.Modifiers), node.FieldType, node.FieldName);
+        }
+
+        public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node)
+        {
+            WriteContentNode(node, node.Prefix, node.Suffix);
+        }
+
+        public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
+        {
+            WriteContentNode(node, node.Prefix);
+        }
+
+        public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+        {
+            WriteContentNode(node, node.Content);
+        }
+
+        public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+        {
+            WriteContentNode(node, string.Join(" ", node.Modifiers), node.ReturnType, node.MethodName);
+        }
+
+        public override void VisitUsingDirective(UsingDirectiveIntermediateNode node)
+        {
+            WriteContentNode(node, node.Content);
+        }
+
+        public override void VisitTagHelper(TagHelperIntermediateNode node)
+        {
+            WriteContentNode(node, node.TagName, string.Format("{0}.{1}", nameof(TagMode), node.TagMode));
+        }
+
+        public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+        {
+            WriteContentNode(node, node.AttributeName, node.BoundAttribute.DisplayName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
+        }
+
+        public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node)
+        {
+            WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
+        }
+
+        public override void VisitExtension(ExtensionIntermediateNode node)
+        {
+            switch (node)
+            {
+                case PreallocatedTagHelperHtmlAttributeIntermediateNode n:
+                    WriteContentNode(n, n.VariableName);
+                    break;
+                case PreallocatedTagHelperHtmlAttributeValueIntermediateNode n:
+                    WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure));
+                    break;
+                case PreallocatedTagHelperPropertyIntermediateNode n:
+                    WriteContentNode(n, n.VariableName, n.AttributeName, n.PropertyName);
+                    break;
+                case PreallocatedTagHelperPropertyValueIntermediateNode n:
+                    WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure));
+                    break;
+                case DefaultTagHelperCreateIntermediateNode n:
+                    WriteContentNode(n, n.TypeName);
+                    break;
+                case DefaultTagHelperExecuteIntermediateNode n:
+                    WriteBasicNode(n);
+                    break;
+                case DefaultTagHelperHtmlAttributeIntermediateNode n:
+                    WriteContentNode(n, n.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure));
+                    break;
+                case DefaultTagHelperPropertyIntermediateNode n:
+                    WriteContentNode(n, n.AttributeName, n.BoundAttribute.DisplayName, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure));
+                    break;
+                case DefaultTagHelperRuntimeIntermediateNode n:
+                    WriteBasicNode(n);
+                    break;
+                default:
+                    base.VisitExtension(node);
+                    break;
+            }
+        }
+
+        public void VisitExtension(SectionIntermediateNode node)
+        {
+            WriteContentNode(node, node.SectionName);
+        }
+
+        protected void WriteBasicNode(IntermediateNode node)
+        {
+            WriteIndent();
+            WriteName(node);
+            WriteSeparator();
+            WriteSourceRange(node);
+        }
+
+        protected void WriteContentNode(IntermediateNode node, params string[] content)
+        {
+            WriteIndent();
+            WriteName(node);
+            WriteSeparator();
+            WriteSourceRange(node);
+
+            for (var i = 0; i < content.Length; i++)
+            {
+                WriteSeparator();
+                WriteContent(content[i]);
+            }
+        }
+
+        protected void WriteIndent()
+        {
+            for (var i = 0; i < Depth; i++)
+            {
+                for (var j = 0; j < 4; j++)
+                {
+                    _writer.Write(' ');
+                }
+            }
+        }
+
+        protected void WriteSeparator()
+        {
+            _writer.Write(" - ");
+        }
+
+        protected void WriteNewLine()
+        {
+            _writer.WriteLine();
+        }
+
+        protected void WriteName(IntermediateNode node)
+        {
+            var typeName = node.GetType().Name;
+            if (typeName.EndsWith("IntermediateNode"))
+            {
+                _writer.Write(typeName.Substring(0, typeName.Length - "IntermediateNode".Length));
+            }
+            else
+            {
+                _writer.Write(typeName);
+            }
+        }
+
+        protected void WriteSourceRange(IntermediateNode node)
+        {
+            if (node.Source != null)
+            {
+                WriteSourceRange(node.Source.Value);
+            }
+        }
+
+        protected void WriteSourceRange(SourceSpan sourceRange)
+        {
+            _writer.Write("(");
+            _writer.Write(sourceRange.AbsoluteIndex);
+            _writer.Write(":");
+            _writer.Write(sourceRange.LineIndex);
+            _writer.Write(",");
+            _writer.Write(sourceRange.CharacterIndex);
+            _writer.Write(" [");
+            _writer.Write(sourceRange.Length);
+            _writer.Write("] ");
+
+            if (sourceRange.FilePath != null)
+            {
+                var fileName = sourceRange.FilePath.Substring(sourceRange.FilePath.LastIndexOf('/') + 1);
+                _writer.Write(fileName);
+            }
+
+            _writer.Write(")");
+        }
+
+        protected void WriteDiagnostics(IntermediateNode node)
+        {
+            if (node.HasDiagnostics)
+            {
+                _writer.Write("| ");
+                for (var i = 0; i < node.Diagnostics.Count; i++)
+                {
+                    var diagnostic = node.Diagnostics[i];
+                    _writer.Write("{");
+                    WriteSourceRange(diagnostic.Span);
+                    _writer.Write(": ");
+                    _writer.Write(diagnostic.Severity);
+                    _writer.Write(" ");
+                    _writer.Write(diagnostic.Id);
+                    _writer.Write(": ");
+
+                    // Purposefully not writing out the entire message to ensure readable IR and because messages 
+                    // can span multiple lines. Not using string.GetHashCode because we can't have any collisions.
+                    using (var md5 = MD5.Create())
+                    {
+                        var diagnosticMessage = diagnostic.GetMessage();
+                        var messageBytes = Encoding.UTF8.GetBytes(diagnosticMessage);
+                        var messageHash = md5.ComputeHash(messageBytes);
+                        var stringHashBuilder = new StringBuilder();
+
+                        for (var j = 0; j < messageHash.Length; j++)
+                        {
+                            stringHashBuilder.Append(messageHash[j].ToString("x2"));
+                        }
+
+                        var stringHash = stringHashBuilder.ToString();
+                        _writer.Write(stringHash);
+                    }
+                    _writer.Write("} ");
+                }
+            }
+        }
+
+        protected void WriteContent(string content)
+        {
+            if (content == null)
+            {
+                return;
+            }
+
+            // We explicitly escape newlines in node content so that the IR can be compared line-by-line. The escaped
+            // newline cannot be platform specific so we need to drop the windows \r.
+            // Also, escape our separator so we can search for ` - `to find delimiters.
+            _writer.Write(content.Replace("\r", string.Empty).Replace("\n", "\\n").Replace(" - ", "\\-"));
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs
new file mode 100644
index 0000000000..0b1c78a53e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs
@@ -0,0 +1,28 @@
+// 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.Reflection;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class IntializeTestFileAttribute : BeforeAfterTestAttribute
+    {
+        public override void Before(MethodInfo methodUnderTest)
+        {
+            if (typeof(IntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                var typeName = methodUnderTest.DeclaringType.Name;
+                IntegrationTestBase.FileName = $"TestFiles/IntegrationTests/{typeName}/{methodUnderTest.Name}";
+            }
+        }
+
+        public override void After(MethodInfo methodUnderTest)
+        {
+            if (typeof(IntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                IntegrationTestBase.FileName = null;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs
new file mode 100644
index 0000000000..bb92350872
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorDiagnosticSerializer.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorDiagnosticSerializer
+    {
+        public static string Serialize(RazorDiagnostic diagnostic)
+        {
+            return diagnostic.ToString();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs
new file mode 100644
index 0000000000..40d95625f4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs
@@ -0,0 +1,48 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public static class SourceMappingsSerializer
+    {
+        public static string Serialize(RazorCSharpDocument csharpDocument, RazorSourceDocument sourceDocument)
+        {
+            var builder = new StringBuilder();
+            var charBuffer = new char[sourceDocument.Length];
+            sourceDocument.CopyTo(0, charBuffer, 0, sourceDocument.Length);
+            var sourceContent = new string(charBuffer);
+
+            for (var i = 0; i < csharpDocument.SourceMappings.Count; i++)
+            {
+                var sourceMapping = csharpDocument.SourceMappings[i];
+
+                builder.Append("Source Location: ");
+                AppendMappingLocation(builder, sourceMapping.OriginalSpan, sourceContent);
+
+                builder.Append("Generated Location: ");
+                AppendMappingLocation(builder, sourceMapping.GeneratedSpan, csharpDocument.GeneratedCode);
+
+                builder.AppendLine();
+            }
+
+            return builder.ToString();
+        }
+
+        private static void AppendMappingLocation(StringBuilder builder, SourceSpan location, string content)
+        {
+            builder
+                .AppendLine(location.ToString())
+                .Append("|");
+
+            for (var i = 0; i < location.Length; i++)
+            {
+                builder.Append(content[location.AbsoluteIndex + i]);
+            }
+
+            builder.AppendLine("|");
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
new file mode 100644
index 0000000000..b4fc6f105e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
@@ -0,0 +1,495 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public static class IntermediateNodeAssert
+    {
+        public static TNode SingleChild<TNode>(IntermediateNode node)
+        {
+            if (node.Children.Count == 0)
+            {
+                throw new IntermediateNodeAssertException(node, "The node has no children.");
+            }
+            else if (node.Children.Count > 1)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, "The node has multiple children");
+            }
+
+            var child = node.Children[0];
+            return Assert.IsType<TNode>(child);
+        }
+
+        public static void NoChildren(IntermediateNode node)
+        {
+            if (node.Children.Count > 0)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, "The node has children.");
+            }
+        }
+
+        public static void Children(IntermediateNode node, params Action<IntermediateNode>[] validators)
+        {
+            var i = 0;
+            for (; i < validators.Length; i++)
+            {
+                if (node.Children.Count == i)
+                {
+                    throw new IntermediateNodeAssertException(node, node.Children, $"The node only has {node.Children.Count} children.");
+                }
+
+                try
+                {
+                    validators[i].Invoke(node.Children[i]);
+                }
+                catch (XunitException e)
+                {
+                    throw new IntermediateNodeAssertException(node, node.Children, $"Failed while validating node {node.Children[i]} at {i}.", e);
+                }
+            }
+
+            if (i < node.Children.Count)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, $"The node has extra child {node.Children[i]} at {i}.");
+            }
+        }
+
+        public static void AnnotationEquals(IntermediateNode node, object value)
+        {
+            AnnotationEquals(node, value, value);
+        }
+
+        public static void AnnotationEquals(IntermediateNode node, object key, object value)
+        {
+            try
+            {
+                Assert.NotNull(node);
+                Assert.Equal(value, node.Annotations[key]);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void HasAnnotation(IntermediateNode node, object key)
+        {
+            try
+            {
+                Assert.NotNull(node);
+                Assert.NotNull(node.Annotations[key]);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void Html(string expected, IntermediateNode node)
+        {
+            try
+            {
+                var html = Assert.IsType<HtmlContentIntermediateNode>(node);
+                var content = new StringBuilder();
+                for (var i = 0; i < html.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(html.Children[i]);
+                    Assert.Equal(TokenKind.Html, token.Kind);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal(expected, content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void CSharpCode(string expected, IntermediateNode node)
+        {
+            try
+            {
+                var statement = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                var content = new StringBuilder();
+                for (var i = 0; i < statement.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(statement.Children[i]);
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal(expected, content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void Directive(string expectedName, IntermediateNode node, params Action<IntermediateNode>[] childValidators)
+        {
+            try
+            {
+                var directive = Assert.IsType<DirectiveIntermediateNode>(node);
+                Assert.Equal(expectedName, directive.DirectiveName);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+
+            Children(node, childValidators);
+        }
+
+        public static void DirectiveToken(DirectiveTokenKind expectedKind, string expectedContent, IntermediateNode node)
+        {
+            try
+            {
+                var token = Assert.IsType<DirectiveTokenIntermediateNode>(node);
+                Assert.Equal(expectedKind, token.DirectiveToken.Kind);
+                Assert.Equal(expectedContent, token.Content);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void Using(string expected, IntermediateNode node)
+        {
+            try
+            {
+                var @using = Assert.IsType<UsingDirectiveIntermediateNode>(node);
+                Assert.Equal(expected, @using.Content);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void ConditionalAttribute(
+            string prefix,
+            string name,
+            string suffix,
+            IntermediateNode node,
+            params Action<IntermediateNode>[] valueValidators)
+        {
+            var attribute = Assert.IsType<HtmlAttributeIntermediateNode>(node);
+
+            try
+            {
+                Assert.Equal(prefix, attribute.Prefix);
+                Assert.Equal(name, attribute.AttributeName);
+                Assert.Equal(suffix, attribute.Suffix);
+
+                Children(attribute, valueValidators);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(attribute, attribute.Children, e.Message, e);
+            }
+        }
+
+        public static void CSharpExpressionAttributeValue(string prefix, string expected, IntermediateNode node)
+        {
+            var attributeValue = Assert.IsType<CSharpExpressionAttributeValueIntermediateNode>(node);
+
+            try
+            {
+                var content = new StringBuilder();
+                for (var i = 0; i < attributeValue.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(attributeValue.Children[i]);
+                    Assert.True(token.IsCSharp);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal(prefix, attributeValue.Prefix);
+                Assert.Equal(expected, content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(attributeValue, attributeValue.Children, e.Message, e);
+            }
+        }
+
+        public static void LiteralAttributeValue(string prefix, string expected, IntermediateNode node)
+        {
+            var attributeValue = Assert.IsType<HtmlAttributeValueIntermediateNode>(node);
+            
+            try
+            {
+                var content = new StringBuilder();
+                for (var i = 0; i < attributeValue.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(attributeValue.Children[i]);
+                    Assert.True(token.IsHtml);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal(prefix, attributeValue.Prefix);
+                Assert.Equal(expected, content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(attributeValue, e.Message);
+            }
+        }
+
+        public static void CSharpExpression(string expected, IntermediateNode node)
+        {
+            try
+            {
+                var cSharp = Assert.IsType<CSharpExpressionIntermediateNode>(node);
+
+                var content = new StringBuilder();
+                for (var i = 0; i < cSharp.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(cSharp.Children[i]);
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal(expected, content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void BeginInstrumentation(string expected, IntermediateNode node)
+        {
+            try
+            {
+                var beginNode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                var content = new StringBuilder();
+                for (var i = 0; i < beginNode.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(beginNode.Children[i]);
+                    Assert.True(token.IsCSharp);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal($"BeginContext({expected});", content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        public static void EndInstrumentation(IntermediateNode node)
+        {
+            try
+            {
+                var endNode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                var content = new StringBuilder();
+                for (var i = 0; i < endNode.Children.Count; i++)
+                {
+                    var token = Assert.IsType<IntermediateToken>(endNode.Children[i]);
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    content.Append(token.Content);
+                }
+                Assert.Equal("EndContext();", content.ToString());
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, node.Children, e.Message, e);
+            }
+        }
+
+        internal static void TagHelperFieldDeclaration(IntermediateNode node, string typeFullName)
+        {
+            try
+            {
+                var fieldNode = Assert.IsType<FieldDeclarationIntermediateNode>(node);
+                Assert.Equal(typeFullName, fieldNode.FieldType);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(node, e.Message);
+            }
+        }
+
+        internal static void PreallocatedTagHelperPropertyValue(
+            IntermediateNode node,
+            string attributeName,
+            string value,
+            AttributeStructure valueStyle)
+        {
+            var propertyValueNode = Assert.IsType<PreallocatedTagHelperPropertyValueIntermediateNode>(node);
+
+            try
+            {
+                Assert.Equal(attributeName, propertyValueNode.AttributeName);
+                Assert.Equal(value, propertyValueNode.Value);
+                Assert.Equal(valueStyle, propertyValueNode.AttributeStructure);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(propertyValueNode, e.Message);
+            }
+        }
+        
+        internal static void TagHelper(string tagName, TagMode tagMode, IEnumerable<TagHelperDescriptor> tagHelpers, IntermediateNode node, params Action<IntermediateNode>[] childValidators)
+        {
+            var tagHelperNode = Assert.IsType<TagHelperIntermediateNode>(node);
+
+            try
+            {
+                Assert.Equal(tagName, tagHelperNode.TagName);
+                Assert.Equal(tagMode, tagHelperNode.TagMode);
+
+                Assert.Equal(tagHelpers, tagHelperNode.TagHelpers, TagHelperDescriptorComparer.CaseSensitive);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(tagHelperNode, e.Message);
+            }
+
+            Children(node, childValidators);
+        }
+
+        internal static void TagHelperHtmlAttribute(
+            string name,
+            AttributeStructure valueStyle,
+            IntermediateNode node,
+            params Action<IntermediateNode>[] valueValidators)
+        {
+            var tagHelperHtmlAttribute = Assert.IsType<TagHelperHtmlAttributeIntermediateNode>(node);
+
+            try
+            {
+                Assert.Equal(name, tagHelperHtmlAttribute.AttributeName);
+                Assert.Equal(valueStyle, tagHelperHtmlAttribute.AttributeStructure);
+                Children(tagHelperHtmlAttribute, valueValidators);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(tagHelperHtmlAttribute, tagHelperHtmlAttribute.Children, e.Message, e);
+            }
+        }
+
+        internal static void SetPreallocatedTagHelperProperty(IntermediateNode node, string attributeName, string propertyName)
+        {
+            var setPreallocatedTagHelperProperty = Assert.IsType<PreallocatedTagHelperPropertyIntermediateNode>(node);
+
+            try
+            {
+                Assert.Equal(attributeName, setPreallocatedTagHelperProperty.AttributeName);
+                Assert.Equal(propertyName, setPreallocatedTagHelperProperty.PropertyName);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(setPreallocatedTagHelperProperty, e.Message);
+            }
+        }
+
+        internal static void SetTagHelperProperty(
+            string name,
+            string propertyName,
+            AttributeStructure valueStyle,
+            IntermediateNode node,
+            params Action<IntermediateNode>[] valueValidators)
+        {
+            var propertyNode = Assert.IsType<TagHelperPropertyIntermediateNode>(node);
+
+            try
+            {
+                Assert.Equal(name, propertyNode.AttributeName);
+                Assert.Equal(propertyName, propertyNode.BoundAttribute.GetPropertyName());
+                Assert.Equal(valueStyle, propertyNode.AttributeStructure);
+                Children(propertyNode, valueValidators);
+            }
+            catch (XunitException e)
+            {
+                throw new IntermediateNodeAssertException(propertyNode, propertyNode.Children, e.Message, e);
+            }
+        }
+
+        private class IntermediateNodeAssertException : XunitException
+        {
+            public IntermediateNodeAssertException(IntermediateNode node, string userMessage)
+                : base(Format(node, null, null, userMessage))
+            {
+                Node = node;
+            }
+
+            public IntermediateNodeAssertException(IntermediateNode node, IEnumerable<IntermediateNode> nodes, string userMessage)
+                : base(Format(node, null, nodes, userMessage))
+            {
+                Node = node;
+                Nodes = nodes;
+            }
+
+            public IntermediateNodeAssertException(
+                IntermediateNode node,
+                IEnumerable<IntermediateNode> nodes,
+                string userMessage,
+                Exception innerException)
+                : base(Format(node, null, nodes, userMessage), innerException)
+            {
+            }
+
+            public IntermediateNodeAssertException(
+                IntermediateNode node,
+                IntermediateNode[] ancestors,
+                IEnumerable<IntermediateNode> nodes,
+                string userMessage,
+                Exception innerException)
+                : base(Format(node, ancestors, nodes, userMessage), innerException)
+            {
+            }
+
+            public IntermediateNode Node { get; }
+
+            public IEnumerable<IntermediateNode> Nodes { get; }
+
+            private static string Format(IntermediateNode node, IntermediateNode[] ancestors, IEnumerable<IntermediateNode> nodes, string userMessage)
+            {
+                var builder = new StringBuilder();
+                builder.AppendLine(userMessage);
+                builder.AppendLine();
+
+                if (nodes != null)
+                {
+                    builder.AppendLine("Nodes:");
+
+                    foreach (var n in nodes)
+                    {
+                        builder.AppendLine(n.ToString());
+                    }
+
+                    builder.AppendLine();
+                }
+
+
+                builder.AppendLine("Path:");
+
+                if (ancestors != null)
+                {
+                    builder.AppendLine();
+                    builder.AppendLine("Path:");
+
+                    foreach (var ancestor in ancestors)
+                    {
+                        builder.AppendLine(ancestor.ToString());
+                    }
+                }
+
+                return builder.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs
new file mode 100644
index 0000000000..f38e4fb838
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class ClassifiedSpanSerializer
+    {
+        internal static string Serialize(RazorSyntaxTree syntaxTree)
+        {
+            using (var writer = new StringWriter())
+            {
+                var visitor = new ClassifiedSpanWriter(writer, syntaxTree);
+                visitor.Visit();
+
+                return writer.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs
new file mode 100644
index 0000000000..4894d4cf72
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs
@@ -0,0 +1,111 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class ClassifiedSpanVerifier
+    {
+        internal static void Verify(RazorSyntaxTree syntaxTree, string[] baseline)
+        {
+            using (var writer = new StringWriter())
+            {
+                var walker = new Walker(writer, syntaxTree, baseline);
+                walker.Visit();
+                walker.AssertReachedEndOfBaseline();
+            }
+        }
+
+        private class Walker : ClassifiedSpanWriter
+        {
+            private readonly string[] _baseline;
+            private readonly StringWriter _writer;
+
+            private int _index;
+
+            public Walker(StringWriter writer, RazorSyntaxTree syntaxTree, string[] baseline) : base(writer, syntaxTree)
+            {
+                _writer = writer;
+                _baseline = baseline;
+            }
+
+            public override void VisitClassifiedSpan(ClassifiedSpanInternal span)
+            {
+                var expected = _index < _baseline.Length ? _baseline[_index++] : null;
+
+                _writer.GetStringBuilder().Clear();
+                base.VisitClassifiedSpan(span);
+                var actual = _writer.GetStringBuilder().ToString();
+                AssertEqual(span, expected, actual);
+            }
+
+            public void AssertReachedEndOfBaseline()
+            {
+                // Since we're walking the list of classified spans there's the chance that our baseline is longer.
+                Assert.True(_baseline.Length == _index, $"Not all lines of the baseline were visited! {_baseline.Length} {_index}");
+            }
+
+            private void AssertEqual(ClassifiedSpanInternal span, string expected, string actual)
+            {
+                if (string.Equals(expected, actual))
+                {
+                    return;
+                }
+
+                if (expected == null)
+                {
+                    var message = "The span is missing from baseline.";
+                    throw new ClassifiedSpanBaselineException(span, expected, actual, message);
+                }
+                else
+                {
+                    var message = $"Contents are not equal.";
+                    throw new ClassifiedSpanBaselineException(span, expected, actual, message);
+                }
+            }
+
+            private class ClassifiedSpanBaselineException : XunitException
+            {
+                public ClassifiedSpanBaselineException(ClassifiedSpanInternal span, string expected, string actual, string userMessage)
+                    : base(Format(span, expected, actual, userMessage))
+                {
+                    Span = span;
+                    Expected = expected;
+                    Actual = actual;
+                }
+
+                public ClassifiedSpanInternal Span { get; }
+
+                public string Actual { get; }
+
+                public string Expected { get; }
+
+                private static string Format(ClassifiedSpanInternal span, string expected, string actual, string userMessage)
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendLine(userMessage);
+                    builder.AppendLine();
+
+                    if (expected != null)
+                    {
+                        builder.Append("Expected: ");
+                        builder.AppendLine(expected);
+                    }
+
+                    if (actual != null)
+                    {
+                        builder.Append("Actual: ");
+                        builder.AppendLine(actual);
+                    }
+
+                    return builder.ToString();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs
new file mode 100644
index 0000000000..ceaf79d935
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs
@@ -0,0 +1,56 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class ClassifiedSpanWriter
+    {
+        private readonly RazorSyntaxTree _syntaxTree;
+        private readonly TextWriter _writer;
+
+        public ClassifiedSpanWriter(TextWriter writer, RazorSyntaxTree syntaxTree)
+        {
+            _writer = writer;
+            _syntaxTree = syntaxTree;
+        }
+
+        public virtual void Visit()
+        {
+            var classifiedSpans = _syntaxTree.GetClassifiedSpans();
+            foreach (var span in classifiedSpans)
+            {
+                VisitClassifiedSpan(span);
+                WriteNewLine();
+            }
+        }
+
+        public virtual void VisitClassifiedSpan(ClassifiedSpanInternal span)
+        {
+            WriteClassifiedSpan(span);
+        }
+
+        protected void WriteClassifiedSpan(ClassifiedSpanInternal span)
+        {
+            Write($"{span.SpanKind} span at {span.Span} (Accepts:{span.AcceptedCharacters})");
+            WriteSeparator();
+            Write($"Parent: {span.BlockKind} block at {span.BlockSpan}");
+        }
+
+        protected void WriteSeparator()
+        {
+            Write(" - ");
+        }
+
+        protected void WriteNewLine()
+        {
+            _writer.WriteLine();
+        }
+
+        protected void Write(object value)
+        {
+            _writer.Write(value);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/IntializeTestFileAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/IntializeTestFileAttribute.cs
new file mode 100644
index 0000000000..b860241356
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/IntializeTestFileAttribute.cs
@@ -0,0 +1,36 @@
+// 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.Reflection;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class IntializeTestFileAttribute : BeforeAfterTestAttribute
+    {
+        public override void Before(MethodInfo methodUnderTest)
+        {
+            if (typeof(ParserTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                var typeName = methodUnderTest.DeclaringType.Name;
+                ParserTestBase.FileName = $"TestFiles/ParserTests/{typeName}/{methodUnderTest.Name}";
+                ParserTestBase.IsTheory = false;
+
+                if (methodUnderTest.GetCustomAttributes(typeof(TheoryAttribute), inherit: false).Length > 0)
+                {
+                    ParserTestBase.IsTheory = true;
+                }
+            }
+        }
+
+        public override void After(MethodInfo methodUnderTest)
+        {
+            if (typeof(ParserTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                ParserTestBase.FileName = null;
+                ParserTestBase.IsTheory = false;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
new file mode 100644
index 0000000000..1e88100c46
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -0,0 +1,463 @@
+
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Text;
+using Xunit;
+using Xunit.Sdk;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    [IntializeTestFile]
+    public abstract class ParserTestBase
+    {
+        private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
+        private static readonly AsyncLocal<bool> _isTheory = new AsyncLocal<bool>();
+
+        internal ParserTestBase()
+        {
+            TestProjectRoot = TestProject.GetProjectDirectory(GetType());
+        }
+
+        /// <summary>
+        /// Set to true to autocorrect the locations of spans to appear in document order with no gaps.
+        /// Use this when spans were not created in document order.
+        /// </summary>
+        protected bool FixupSpans { get; set; }
+
+#if GENERATE_BASELINES
+        protected bool GenerateBaselines { get; set; } = true;
+#else
+        protected bool GenerateBaselines { get; set; } = false;
+#endif
+
+        protected string TestProjectRoot { get; }
+
+        // Used by the test framework to set the 'base' name for test files.
+        public static string FileName
+        {
+            get { return _fileName.Value; }
+            set { _fileName.Value = value; }
+        }
+
+        public static bool IsTheory
+        {
+            get { return _isTheory.Value; }
+            set { _isTheory.Value = value; }
+        }
+
+        protected int BaselineTestCount { get; set; }
+
+        internal virtual void AssertSyntaxTreeNodeMatchesBaseline(RazorSyntaxTree syntaxTree)
+        {
+            var root = syntaxTree.Root;
+            var diagnostics = syntaxTree.Diagnostics;
+            var filePath = syntaxTree.Source.FilePath;
+            if (FileName == null)
+            {
+                var message = $"{nameof(AssertSyntaxTreeNodeMatchesBaseline)} should only be called from a parser test ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            if (IsTheory)
+            {
+                var message = $"{nameof(AssertSyntaxTreeNodeMatchesBaseline)} should not be called from a [Theory] test.";
+                throw new InvalidOperationException(message);
+            }
+
+            var fileName = BaselineTestCount > 0 ? FileName + $"_{BaselineTestCount}" : FileName;
+            var baselineFileName = Path.ChangeExtension(fileName, ".stree.txt");
+            var baselineDiagnosticsFileName = Path.ChangeExtension(fileName, ".diag.txt");
+            var baselineClassifiedSpansFileName = Path.ChangeExtension(fileName, ".cspans.txt");
+            var baselineTagHelperSpansFileName = Path.ChangeExtension(fileName, ".tspans.txt");
+            BaselineTestCount++;
+
+            if (GenerateBaselines)
+            {
+                // Write syntax tree baseline
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
+                File.WriteAllText(baselineFullPath, SyntaxNodeSerializer.Serialize(root));
+
+                // Write diagnostics baseline
+                var baselineDiagnosticsFullPath = Path.Combine(TestProjectRoot, baselineDiagnosticsFileName);
+                var lines = diagnostics.Select(SerializeDiagnostic).ToArray();
+                if (lines.Any())
+                {
+                    File.WriteAllLines(baselineDiagnosticsFullPath, lines);
+                }
+                else if (File.Exists(baselineDiagnosticsFullPath))
+                {
+                    File.Delete(baselineDiagnosticsFullPath);
+                }
+
+                // Write classified spans baseline
+                var classifiedSpansBaselineFullPath = Path.Combine(TestProjectRoot, baselineClassifiedSpansFileName);
+                File.WriteAllText(classifiedSpansBaselineFullPath, ClassifiedSpanSerializer.Serialize(syntaxTree));
+
+                // Write tag helper spans baseline
+                var tagHelperSpansBaselineFullPath = Path.Combine(TestProjectRoot, baselineTagHelperSpansFileName);
+                var serializedTagHelperSpans = TagHelperSpanSerializer.Serialize(syntaxTree);
+                if (!string.IsNullOrEmpty(serializedTagHelperSpans))
+                {
+                    File.WriteAllText(tagHelperSpansBaselineFullPath, serializedTagHelperSpans);
+                }
+                else if (File.Exists(tagHelperSpansBaselineFullPath))
+                {
+                    File.Delete(tagHelperSpansBaselineFullPath);
+                }
+
+                return;
+            }
+
+            // Verify syntax tree
+            var stFile = TestFile.Create(baselineFileName, GetType().GetTypeInfo().Assembly);
+            if (!stFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFileName} was not found.");
+            }
+
+            var baseline = stFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            SyntaxNodeVerifier.Verify(root, baseline);
+
+            // Verify diagnostics
+            var baselineDiagnostics = string.Empty;
+            var diagnosticsFile = TestFile.Create(baselineDiagnosticsFileName, GetType().GetTypeInfo().Assembly);
+            if (diagnosticsFile.Exists())
+            {
+                baselineDiagnostics = diagnosticsFile.ReadAllText();
+            }
+
+            var actualDiagnostics = string.Concat(diagnostics.Select(d => SerializeDiagnostic(d) + "\r\n"));
+            Assert.Equal(baselineDiagnostics, actualDiagnostics);
+
+            // Verify classified spans
+            var classifiedSpanFile = TestFile.Create(baselineClassifiedSpansFileName, GetType().GetTypeInfo().Assembly);
+            if (!classifiedSpanFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineClassifiedSpansFileName} was not found.");
+            }
+            else
+            {
+                var classifiedSpanBaseline = new string[0];
+                classifiedSpanBaseline = classifiedSpanFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                ClassifiedSpanVerifier.Verify(syntaxTree, classifiedSpanBaseline);
+            }
+
+            // Verify tag helper spans
+            var tagHelperSpanFile = TestFile.Create(baselineTagHelperSpansFileName, GetType().GetTypeInfo().Assembly);
+            var tagHelperSpanBaseline = new string[0];
+            if (tagHelperSpanFile.Exists())
+            {
+                tagHelperSpanBaseline = tagHelperSpanFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                TagHelperSpanVerifier.Verify(syntaxTree, tagHelperSpanBaseline);
+            }
+        }
+
+        protected static string SerializeDiagnostic(RazorDiagnostic diagnostic)
+        {
+            var content = RazorDiagnosticSerializer.Serialize(diagnostic);
+            var normalized = NormalizeNewLines(content);
+
+            return normalized;
+        }
+
+        private static string NormalizeNewLines(string content)
+        {
+            return Regex.Replace(content, "(?<!\r)\n", "\r\n", RegexOptions.None, TimeSpan.FromSeconds(10));
+        }
+
+        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true)
+        {
+            if (verifySyntaxTree)
+            {
+                SyntaxTreeVerifier.Verify(syntaxTree);
+            }
+
+            AssertSyntaxTreeNodeMatchesBaseline(syntaxTree);
+        }
+
+        internal RazorSyntaxTree ParseBlock(string document, bool designTime)
+        {
+            return ParseBlock(RazorLanguageVersion.Latest, document, designTime);
+        }
+
+        internal RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, bool designTime)
+        {
+            return ParseBlock(version, document, null, designTime);
+        }
+
+        internal RazorSyntaxTree ParseBlock(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
+        {
+            return ParseBlock(RazorLanguageVersion.Latest, document, directives, designTime);
+        }
+
+        internal abstract RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime);
+
+        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
+        {
+            return ParseDocument(RazorLanguageVersion.Latest, document, designTime, featureFlags);
+        }
+
+        internal RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
+        {
+            return ParseDocument(version, document, null, designTime, featureFlags);
+        }
+
+        internal RazorSyntaxTree ParseDocument(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
+        {
+            return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime, featureFlags);
+        }
+
+        internal virtual RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
+        {
+            directives = directives ?? Array.Empty<DirectiveDescriptor>();
+
+            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
+
+            var options = CreateParserOptions(version, directives, designTime, featureFlags);
+            var context = new ParserContext(source, options);
+
+            var codeParser = new CSharpCodeParser(directives, context);
+            var markupParser = new HtmlMarkupParser(context);
+
+            codeParser.HtmlParser = markupParser;
+            markupParser.CodeParser = codeParser;
+
+            var root = markupParser.ParseDocument().CreateRed();
+
+            var diagnostics = context.ErrorSink.Errors;
+
+            var codeDocument = RazorCodeDocument.Create(source);
+
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
+            codeDocument.SetSyntaxTree(syntaxTree);
+
+            var defaultDirectivePass = new DefaultDirectiveSyntaxTreePass();
+            syntaxTree = defaultDirectivePass.Execute(codeDocument, syntaxTree);
+
+            return syntaxTree;
+        }
+
+        internal virtual RazorSyntaxTree ParseHtmlBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false)
+        {
+            directives = directives ?? Array.Empty<DirectiveDescriptor>();
+
+            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
+
+            var options = CreateParserOptions(version, directives, designTime);
+            var context = new ParserContext(source, options);
+
+            var codeParser = new CSharpCodeParser(directives, context);
+            var markupParser = new HtmlMarkupParser(context);
+
+            codeParser.HtmlParser = markupParser;
+            markupParser.CodeParser = codeParser;
+
+            var root = markupParser.ParseBlock().CreateRed();
+
+            var diagnostics = context.ErrorSink.Errors;
+
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
+
+            return syntaxTree;
+        }
+
+        internal RazorSyntaxTree ParseCodeBlock(string document, bool designTime = false)
+        {
+            return ParseCodeBlock(RazorLanguageVersion.Latest, document, Enumerable.Empty<DirectiveDescriptor>(), designTime);
+        }
+
+        internal virtual RazorSyntaxTree ParseCodeBlock(
+            RazorLanguageVersion version,
+            string document,
+            IEnumerable<DirectiveDescriptor> directives,
+            bool designTime)
+        {
+            directives = directives ?? Array.Empty<DirectiveDescriptor>();
+
+            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
+
+            var options = CreateParserOptions(version, directives, designTime);
+            var context = new ParserContext(source, options);
+
+            var codeParser = new CSharpCodeParser(directives, context);
+            var markupParser = new HtmlMarkupParser(context);
+
+            codeParser.HtmlParser = markupParser;
+            markupParser.CodeParser = codeParser;
+
+            var root = codeParser.ParseBlock().CreateRed();
+
+            var diagnostics = context.ErrorSink.Errors;
+
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
+
+            return syntaxTree;
+        }
+
+        internal virtual void ParseBlockTest(string document)
+        {
+            ParseBlockTest(document, null, false, new RazorDiagnostic[0]);
+        }
+
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives)
+        {
+            ParseBlockTest(document, directives, null);
+        }
+
+        internal virtual void ParseBlockTest(string document, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseBlockTest(document, false, expectedErrors);
+        }
+
+        internal virtual void ParseBlockTest(string document, bool designTime, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseBlockTest(document, null, designTime, expectedErrors);
+        }
+
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document)
+        {
+            ParseBlockTest(version, document, false, null);
+        }
+
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseBlockTest(document, directives, false, expectedErrors);
+        }
+
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, bool designTime, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseBlockTest(version, document, null, designTime, expectedErrors);
+        }
+
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime, expectedErrors);
+        }
+
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
+        {
+            var result = ParseBlock(version, document, directives, designTime);
+
+            BaselineTest(result);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document)
+        {
+            SingleSpanBlockTest(document, default, default);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
+        {
+            SingleSpanBlockTest(document, blockKind, spanType, acceptedCharacters, expectedError: null);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
+        {
+            SingleSpanBlockTest(document, spanContent, blockKind, spanType, acceptedCharacters, expectedErrors: null);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, params RazorDiagnostic[] expectedError)
+        {
+            SingleSpanBlockTest(document, document, blockKind, spanType, expectedError);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockKindInternal blockKind, SpanKindInternal spanType, params RazorDiagnostic[] expectedErrors)
+        {
+            SingleSpanBlockTest(document, spanContent, blockKind, spanType, AcceptedCharactersInternal.Any, expectedErrors ?? new RazorDiagnostic[0]);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters, params RazorDiagnostic[] expectedError)
+        {
+            SingleSpanBlockTest(document, document, blockKind, spanType, acceptedCharacters, expectedError);
+        }
+
+        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters, params RazorDiagnostic[] expectedErrors)
+        {
+            var result = ParseBlock(document, designTime: false);
+
+            BaselineTest(result);
+        }
+
+        internal virtual void ParseDocumentTest(string document)
+        {
+            ParseDocumentTest(document, null, false);
+        }
+
+        internal virtual void ParseDocumentTest(string document, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseDocumentTest(document, false, expectedErrors);
+        }
+
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseDocumentTest(document, directives, false, expectedErrors);
+        }
+
+        internal virtual void ParseDocumentTest(string document, bool designTime)
+        {
+            ParseDocumentTest(document, null, designTime);
+        }
+
+        internal virtual void ParseDocumentTest(string document, bool designTime, params RazorDiagnostic[] expectedErrors)
+        {
+            ParseDocumentTest(document, null, designTime, expectedErrors);
+        }
+
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
+        {
+            var result = ParseDocument(document, directives, designTime);
+
+            BaselineTest(result);
+        }
+
+        internal static RazorParserOptions CreateParserOptions(
+            RazorLanguageVersion version, 
+            IEnumerable<DirectiveDescriptor> directives, 
+            bool designTime,
+            RazorParserFeatureFlags featureFlags = null)
+        {
+            return new TestRazorParserOptions(
+                directives.ToArray(),
+                designTime,
+                parseLeadingDirectives: false,
+                version: version,
+                featureFlags: featureFlags);
+        }
+
+        private class TestRazorParserOptions : RazorParserOptions
+        {
+            public TestRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version, RazorParserFeatureFlags featureFlags = null)
+            {
+                if (directives == null)
+                {
+                    throw new ArgumentNullException(nameof(directives));
+                }
+
+                Directives = directives;
+                DesignTime = designTime;
+                ParseLeadingDirectives = parseLeadingDirectives;
+                Version = version;
+                FeatureFlags = featureFlags ?? RazorParserFeatureFlags.Create(Version);
+            }
+
+            public override bool DesignTime { get; }
+
+            public override IReadOnlyCollection<DirectiveDescriptor> Directives { get; }
+
+            public override bool ParseLeadingDirectives { get; }
+
+            public override RazorLanguageVersion Version { get; }
+
+            internal override RazorParserFeatureFlags FeatureFlags { get; }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs
new file mode 100644
index 0000000000..df81d12351
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs
@@ -0,0 +1,61 @@
+// 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.IO;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public static class SyntaxNodeSerializer
+    {
+        internal static string Serialize(SyntaxNode node)
+        {
+            using (var writer = new StringWriter())
+            {
+                var walker = new Walker(writer);
+                walker.Visit(node);
+
+                return writer.ToString();
+            }
+        }
+
+        private class Walker : SyntaxNodeWalker
+        {
+            private readonly SyntaxNodeWriter _visitor;
+            private readonly TextWriter _writer;
+
+            public Walker(TextWriter writer)
+            {
+                _visitor = new SyntaxNodeWriter(writer);
+                _writer = writer;
+            }
+
+            public TextWriter Writer { get; }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return node;
+                }
+
+                if (node.IsList)
+                {
+                    return base.DefaultVisit(node);
+                }
+
+                _visitor.Visit(node);
+                _writer.WriteLine();
+
+                if (!node.IsToken && !node.IsTrivia)
+                {
+                    _visitor.Depth++;
+                    node = base.DefaultVisit(node);
+                    _visitor.Depth--;
+                }
+
+                return node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.cs
new file mode 100644
index 0000000000..17a0cbf72f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.cs
@@ -0,0 +1,296 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public static class SyntaxNodeVerifier
+    {
+        internal static void Verify(SyntaxNode node, string[] baseline)
+        {
+            var walker = new Walker(baseline);
+            walker.Visit(node);
+            walker.AssertReachedEndOfBaseline();
+        }
+
+        private class Walker : SyntaxNodeWalker
+        {
+            private readonly string[] _baseline;
+            private readonly SyntaxNodeWriter _visitor;
+            private readonly StringWriter _writer;
+
+            private int _index;
+
+            public Walker(string[] baseline)
+            {
+                _writer = new StringWriter();
+
+                _visitor = new SyntaxNodeWriter(_writer);
+                _baseline = baseline;
+            }
+
+            public TextWriter Writer { get; }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return node;
+                }
+
+                if (node.IsList)
+                {
+                    return base.DefaultVisit(node);
+                }
+
+                var expected = _index < _baseline.Length ? _baseline[_index++] : null;
+
+                // Write the node as text for comparison
+                _writer.GetStringBuilder().Clear();
+                _visitor.Visit(node);
+                var actual = _writer.GetStringBuilder().ToString();
+                var actualLineCount = actual.Split(new[] { _writer.NewLine }, StringSplitOptions.None).Length;
+
+                var expectedLineIndex = 1;
+                while (expectedLineIndex++ < actualLineCount && _index < _baseline.Length)
+                {
+                    expected += $"{_writer.NewLine}{_baseline[_index++]}";
+                }
+
+                AssertNodeEquals(node, Ancestors, expected, actual);
+
+                if (!node.IsToken && !node.IsTrivia)
+                {
+                    _visitor.Depth++;
+                    base.DefaultVisit(node);
+                    _visitor.Depth--;
+                }
+
+                return node;
+            }
+
+            public void AssertReachedEndOfBaseline()
+            {
+                // Since we're walking the nodes of our generated code there's the chance that our baseline is longer.
+                Assert.True(_baseline.Length == _index, "Not all lines of the baseline were visited!");
+            }
+
+            private void AssertNodeEquals(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual)
+            {
+                if (string.Equals(expected, actual))
+                {
+                    // YAY!!! everything is great.
+                    return;
+                }
+
+                if (expected == null)
+                {
+                    var message = "The node is missing from baseline.";
+                    throw new SyntaxNodeBaselineException(node, Ancestors.ToArray(), expected, actual, message);
+                }
+
+                int charsVerified = 0;
+                AssertNestingEqual(node, ancestors, expected, actual, ref charsVerified);
+                AssertNameEqual(node, ancestors, expected, actual, ref charsVerified);
+                AssertDelimiter(node, expected, actual, true, ref charsVerified);
+                AssertLocationEqual(node, ancestors, expected, actual, ref charsVerified);
+                AssertDelimiter(node, expected, actual, false, ref charsVerified);
+                AssertContentEqual(node, ancestors, expected, actual, ref charsVerified);
+
+                throw new InvalidOperationException("We can't figure out HOW these two things are different. This is a bug.");
+            }
+
+            private void AssertNestingEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var i = 0;
+                for (; i < expected.Length; i++)
+                {
+                    if (expected[i] != ' ')
+                    {
+                        break;
+                    }
+                }
+
+                var failed = false;
+                var j = 0;
+                for (; j < i; j++)
+                {
+                    if (actual.Length <= j || actual[j] != ' ')
+                    {
+                        failed = true;
+                        break;
+                    }
+                }
+
+                if (actual.Length <= j + 1 || actual[j] == ' ')
+                {
+                    failed = true;
+                }
+
+                if (failed)
+                {
+                    var message = "The node is at the wrong level of nesting. This usually means a child is missing.";
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified = j;
+            }
+
+            private void AssertNameEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var expectedName = GetName(expected, charsVerified);
+                var actualName = GetName(actual, charsVerified);
+
+                if (!string.Equals(expectedName, actualName))
+                {
+                    var message = $"Node names are not equal.";
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified += expectedName.Length;
+            }
+
+            // Either both strings need to have a delimiter next or neither should.
+            private void AssertDelimiter(SyntaxNode node, string expected, string actual, bool required, ref int charsVerified)
+            {
+                if (charsVerified == expected.Length && required)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{expected}'.");
+                }
+
+                if (charsVerified == actual.Length && required)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'.");
+                }
+
+                if (charsVerified == expected.Length && charsVerified == actual.Length)
+                {
+                    return;
+                }
+
+                var expectedDelimiter = expected.IndexOf(" - ", charsVerified);
+                if (expectedDelimiter != charsVerified && expectedDelimiter != -1)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'.");
+                }
+
+                var actualDelimiter = actual.IndexOf(" - ", charsVerified);
+                if (actualDelimiter != charsVerified && actualDelimiter != -1)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'.");
+                }
+
+                Assert.Equal(expectedDelimiter, actualDelimiter);
+
+                charsVerified += 3;
+            }
+
+            private void AssertLocationEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var expectedLocation = GetLocation(expected, charsVerified);
+                var actualLocation = GetLocation(actual, charsVerified);
+
+                if (!string.Equals(expectedLocation, actualLocation))
+                {
+                    var message = $"Locations are not equal.";
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified += expectedLocation.Length;
+            }
+
+            private void AssertContentEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
+            {
+                var expectedContent = GetContent(expected, charsVerified);
+                var actualContent = GetContent(actual, charsVerified);
+
+                if (!string.Equals(expectedContent, actualContent))
+                {
+                    var message = $"Contents are not equal.";
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                }
+
+                charsVerified += expectedContent.Length;
+            }
+
+            private string GetName(string text, int start)
+            {
+                var delimiter = text.IndexOf(" - ", start);
+                if (delimiter == -1)
+                {
+                    throw new InvalidOperationException($"Baseline text is not well-formed: '{text}'.");
+                }
+
+                return text.Substring(start, delimiter - start);
+            }
+
+            private string GetLocation(string text, int start)
+            {
+                var delimiter = text.IndexOf(" - ", start);
+                return delimiter == -1 ? text.Substring(start) : text.Substring(start, delimiter - start);
+            }
+
+            private string GetContent(string text, int start)
+            {
+                return start == text.Length ? string.Empty : text.Substring(start);
+            }
+
+            private class SyntaxNodeBaselineException : XunitException
+            {
+                public SyntaxNodeBaselineException(SyntaxNode node, SyntaxNode[] ancestors, string expected, string actual, string userMessage)
+                    : base(Format(node, ancestors, expected, actual, userMessage))
+                {
+                    Node = node;
+                    Expected = expected;
+                    Actual = actual;
+                }
+
+                public SyntaxNode Node { get; }
+
+                public string Actual { get; }
+
+                public string Expected { get; }
+
+                private static string Format(SyntaxNode node, SyntaxNode[] ancestors, string expected, string actual, string userMessage)
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendLine(userMessage);
+                    builder.AppendLine();
+
+                    if (expected != null)
+                    {
+                        builder.Append("Expected: ");
+                        builder.AppendLine(expected);
+                    }
+
+                    if (actual != null)
+                    {
+                        builder.Append("Actual: ");
+                        builder.AppendLine(actual);
+                    }
+
+                    if (ancestors != null)
+                    {
+                        builder.AppendLine();
+                        builder.AppendLine("Path:");
+
+                        foreach (var ancestor in ancestors)
+                        {
+                            builder.AppendLine(ancestor.ToString());
+                        }
+                    }
+
+                    return builder.ToString();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs
new file mode 100644
index 0000000000..818732d685
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs
@@ -0,0 +1,37 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SyntaxNodeWalker : SyntaxRewriter
+    {
+        private readonly List<SyntaxNode> _ancestors = new List<SyntaxNode>();
+
+        protected IReadOnlyList<SyntaxNode> Ancestors => _ancestors;
+
+        protected SyntaxNode Parent => _ancestors.Count > 0 ? _ancestors[0] : null;
+
+        protected override SyntaxNode DefaultVisit(SyntaxNode node)
+        {
+            _ancestors.Insert(0, node);
+
+            try
+            {
+                for (var i = 0; i < node.SlotCount; i++)
+                {
+                    var child = node.GetNodeSlot(i);
+                    Visit(child);
+                }
+            }
+            finally
+            {
+                _ancestors.RemoveAt(0);
+            }
+
+            return node;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
new file mode 100644
index 0000000000..3d1faba30e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
@@ -0,0 +1,219 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxNodeWriter : SyntaxRewriter
+    {
+        private readonly TextWriter _writer;
+        private bool _visitedRoot;
+
+        public SyntaxNodeWriter(TextWriter writer)
+        {
+            _writer = writer;
+        }
+
+        public int Depth { get; set; }
+
+        public override SyntaxNode Visit(SyntaxNode node)
+        {
+            if (node is SyntaxToken token)
+            {
+                return VisitToken(token);
+            }
+
+            WriteNode(node);
+            return node;
+        }
+
+        public override SyntaxNode VisitToken(SyntaxToken token)
+        {
+            WriteToken(token);
+            return base.VisitToken(token);
+        }
+
+        public override SyntaxNode VisitTrivia(SyntaxTrivia trivia)
+        {
+            WriteTrivia(trivia);
+            return base.VisitTrivia(trivia);
+        }
+
+        private void WriteNode(SyntaxNode node)
+        {
+            WriteIndent();
+            Write(node.Kind);
+            WriteSeparator();
+            Write($"[{node.Position}..{node.EndPosition})::{node.FullWidth}");
+
+            if (node is RazorDirectiveSyntax razorDirective)
+            {
+                WriteRazorDirective(razorDirective);
+            }
+            else if (node is MarkupTagHelperElementSyntax tagHelperElement)
+            {
+                WriteTagHelperElement(tagHelperElement);
+            }
+            else if (node is MarkupTagHelperAttributeSyntax tagHelperAttribute)
+            {
+                WriteTagHelperAttributeInfo(tagHelperAttribute.TagHelperAttributeInfo);
+            }
+            else if (node is MarkupMinimizedTagHelperAttributeSyntax minimizedTagHelperAttribute)
+            {
+                WriteTagHelperAttributeInfo(minimizedTagHelperAttribute.TagHelperAttributeInfo);
+            }
+
+            if (ShouldDisplayNodeContent(node))
+            {
+                WriteSeparator();
+                Write($"[{node.GetContent()}]");
+            }
+
+            var annotation = node.GetAnnotations().FirstOrDefault(a => a.Kind == SyntaxConstants.SpanContextKind);
+            if (annotation != null && annotation.Data is SpanContext context)
+            {
+                WriteSpanContext(context);
+            }
+
+            if (!_visitedRoot)
+            {
+                WriteSeparator();
+                Write($"[{node.ToFullString()}]");
+                _visitedRoot = true;
+            }
+        }
+
+        private void WriteRazorDirective(RazorDirectiveSyntax node)
+        {
+            if (node.DirectiveDescriptor == null)
+            {
+                return;
+            }
+
+            var builder = new StringBuilder("Directive:{");
+            builder.Append(node.DirectiveDescriptor.Directive);
+            builder.Append(";");
+            builder.Append(node.DirectiveDescriptor.Kind);
+            builder.Append(";");
+            builder.Append(node.DirectiveDescriptor.Usage);
+            builder.Append("}");
+
+            var diagnostics = node.GetDiagnostics();
+            if (diagnostics.Length > 0)
+            {
+                builder.Append(" [");
+                var ids = string.Join(", ", diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                builder.Append(ids);
+                builder.Append("]");
+            }
+
+            WriteSeparator();
+            Write(builder.ToString());
+        }
+
+        private void WriteTagHelperElement(MarkupTagHelperElementSyntax node)
+        {
+            // Write tag name
+            WriteSeparator();
+            Write($"{node.TagHelperInfo.TagName}[{node.TagHelperInfo.TagMode}]");
+
+            // Write descriptors
+            foreach (var descriptor in node.TagHelperInfo.BindingResult.Descriptors)
+            {
+                WriteSeparator();
+
+                // Get the type name without the namespace.
+                var typeName = descriptor.Name.Substring(descriptor.Name.LastIndexOf('.') + 1);
+                Write(typeName);
+            }
+        }
+
+        private void WriteTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            // Write attributes
+            WriteSeparator();
+            Write(info.Name);
+            WriteSeparator();
+            Write(info.AttributeStructure);
+            WriteSeparator();
+            Write(info.Bound ? "Bound" : "Unbound");
+        }
+
+        private void WriteToken(SyntaxToken token)
+        {
+            WriteIndent();
+            var content = token.IsMissing ? "<Missing>" : token.Content;
+            var diagnostics = token.GetDiagnostics();
+            var tokenString = $"{token.Kind};[{content}];{string.Join(", ", diagnostics.Select(diagnostic => diagnostic.Id + diagnostic.Span))}";
+            Write(tokenString);
+        }
+
+        private void WriteTrivia(SyntaxTrivia trivia)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void WriteSpanContext(SpanContext context)
+        {
+            WriteSeparator();
+            Write($"Gen<{context.ChunkGenerator}>");
+            WriteSeparator();
+            Write(context.EditHandler);
+        }
+
+        protected void WriteIndent()
+        {
+            for (var i = 0; i < Depth; i++)
+            {
+                for (var j = 0; j < 4; j++)
+                {
+                    Write(' ');
+                }
+            }
+        }
+
+        protected void WriteSeparator()
+        {
+            Write(" - ");
+        }
+
+        protected void WriteNewLine()
+        {
+            _writer.WriteLine();
+        }
+
+        protected void Write(object value)
+        {
+            if (value is string stringValue)
+            {
+                stringValue = stringValue.Replace("\r\n", "LF");
+                _writer.Write(stringValue);
+                return;
+            }
+
+            _writer.Write(value);
+        }
+
+        private static bool ShouldDisplayNodeContent(SyntaxNode node)
+        {
+            return node.Kind == SyntaxKind.MarkupTextLiteral ||
+                node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
+                node.Kind == SyntaxKind.MarkupTagBlock ||
+                node.Kind == SyntaxKind.MarkupAttributeBlock ||
+                node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
+                node.Kind == SyntaxKind.MarkupTagHelperAttribute ||
+                node.Kind == SyntaxKind.MarkupMinimizedTagHelperAttribute ||
+                node.Kind == SyntaxKind.MarkupLiteralAttributeValue ||
+                node.Kind == SyntaxKind.MarkupDynamicAttributeValue ||
+                node.Kind == SyntaxKind.CSharpStatementLiteral ||
+                node.Kind == SyntaxKind.CSharpExpressionLiteral ||
+                node.Kind == SyntaxKind.CSharpEphemeralTextLiteral ||
+                node.Kind == SyntaxKind.UnclassifiedTextLiteral;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs
new file mode 100644
index 0000000000..8b4e0bd8ed
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TagHelperSpanSerializer
+    {
+        internal static string Serialize(RazorSyntaxTree syntaxTree)
+        {
+            using (var writer = new StringWriter())
+            {
+                var visitor = new TagHelperSpanWriter(writer, syntaxTree);
+                visitor.Visit();
+
+                return writer.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs
new file mode 100644
index 0000000000..3b5a08a271
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs
@@ -0,0 +1,111 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TagHelperSpanVerifier
+    {
+        internal static void Verify(RazorSyntaxTree syntaxTree, string[] baseline)
+        {
+            using (var writer = new StringWriter())
+            {
+                var walker = new Walker(writer, syntaxTree, baseline);
+                walker.Visit();
+                walker.AssertReachedEndOfBaseline();
+            }
+        }
+
+        private class Walker : TagHelperSpanWriter
+        {
+            private readonly string[] _baseline;
+            private readonly StringWriter _writer;
+
+            private int _index;
+
+            public Walker(StringWriter writer, RazorSyntaxTree syntaxTree, string[] baseline) : base(writer, syntaxTree)
+            {
+                _writer = writer;
+                _baseline = baseline;
+            }
+
+            public override void VisitTagHelperSpan(TagHelperSpanInternal span)
+            {
+                var expected = _index < _baseline.Length ? _baseline[_index++] : null;
+
+                _writer.GetStringBuilder().Clear();
+                base.VisitTagHelperSpan(span);
+                var actual = _writer.GetStringBuilder().ToString();
+                AssertEqual(span, expected, actual);
+            }
+
+            public void AssertReachedEndOfBaseline()
+            {
+                // Since we're walking the list of classified spans there's the chance that our baseline is longer.
+                Assert.True(_baseline.Length == _index, $"Not all lines of the baseline were visited! {_baseline.Length} {_index}");
+            }
+
+            private void AssertEqual(TagHelperSpanInternal span, string expected, string actual)
+            {
+                if (string.Equals(expected, actual))
+                {
+                    return;
+                }
+
+                if (expected == null)
+                {
+                    var message = "The span is missing from baseline.";
+                    throw new TagHelperSpanBaselineException(span, expected, actual, message);
+                }
+                else
+                {
+                    var message = $"Contents are not equal.";
+                    throw new TagHelperSpanBaselineException(span, expected, actual, message);
+                }
+            }
+
+            private class TagHelperSpanBaselineException : XunitException
+            {
+                public TagHelperSpanBaselineException(TagHelperSpanInternal span, string expected, string actual, string userMessage)
+                    : base(Format(span, expected, actual, userMessage))
+                {
+                    Span = span;
+                    Expected = expected;
+                    Actual = actual;
+                }
+
+                public TagHelperSpanInternal Span { get; }
+
+                public string Actual { get; }
+
+                public string Expected { get; }
+
+                private static string Format(TagHelperSpanInternal span, string expected, string actual, string userMessage)
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendLine(userMessage);
+                    builder.AppendLine();
+
+                    if (expected != null)
+                    {
+                        builder.Append("Expected: ");
+                        builder.AppendLine(expected);
+                    }
+
+                    if (actual != null)
+                    {
+                        builder.Append("Actual: ");
+                        builder.AppendLine(actual);
+                    }
+
+                    return builder.ToString();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs
new file mode 100644
index 0000000000..3a814aa067
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs
@@ -0,0 +1,62 @@
+// 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.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class TagHelperSpanWriter
+    {
+        private readonly RazorSyntaxTree _syntaxTree;
+        private readonly TextWriter _writer;
+
+        public TagHelperSpanWriter(TextWriter writer, RazorSyntaxTree syntaxTree)
+        {
+            _writer = writer;
+            _syntaxTree = syntaxTree;
+        }
+
+        public virtual void Visit()
+        {
+            var tagHelperSpans = _syntaxTree.GetTagHelperSpans();
+            foreach (var span in tagHelperSpans)
+            {
+                VisitTagHelperSpan(span);
+                WriteNewLine();
+            }
+        }
+
+        public virtual void VisitTagHelperSpan(TagHelperSpanInternal span)
+        {
+            WriteTagHelperSpan(span);
+        }
+
+        protected void WriteTagHelperSpan(TagHelperSpanInternal span)
+        {
+            Write($"TagHelper span at {span.Span}");
+            foreach (var tagHelper in span.TagHelpers)
+            {
+                WriteSeparator();
+
+                // Get the type name without the namespace.
+                var typeName = tagHelper.Name.Substring(tagHelper.Name.LastIndexOf('.') + 1);
+                Write(typeName);
+            }
+        }
+
+        protected void WriteSeparator()
+        {
+            Write(" - ");
+        }
+
+        protected void WriteNewLine()
+        {
+            _writer.WriteLine();
+        }
+
+        protected void Write(object value)
+        {
+            _writer.Write(value);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs
new file mode 100644
index 0000000000..3d7977ea2d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorEngineBuilderExtensions.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    [Obsolete("This class is obsolete and will be removed in a future version.")]
+    public static class RazorEngineBuilderExtensions
+    {
+        public static IRazorEngineBuilder AddTagHelpers(this IRazorEngineBuilder builder, params TagHelperDescriptor[] tagHelpers)
+        {
+            return AddTagHelpers(builder, (IEnumerable<TagHelperDescriptor>)tagHelpers);
+        }
+
+        public static IRazorEngineBuilder AddTagHelpers(this IRazorEngineBuilder builder, IEnumerable<TagHelperDescriptor> tagHelpers)
+        {
+            var feature = (TestTagHelperFeature)builder.Features.OfType<ITagHelperFeature>().FirstOrDefault();
+            if (feature == null)
+            {
+                feature = new TestTagHelperFeature();
+                builder.Features.Add(feature);
+            }
+
+            feature.TagHelpers.AddRange(tagHelpers);
+            return builder;
+        }
+
+        public static IRazorEngineBuilder ConfigureDocumentClassifier(this IRazorEngineBuilder builder)
+        {
+            var feature = builder.Features.OfType<DefaultDocumentClassifierPassFeature>().FirstOrDefault();
+            if (feature == null)
+            {
+                feature = new DefaultDocumentClassifierPassFeature();
+                builder.Features.Add(feature);
+            }
+
+            feature.ConfigureNamespace.Clear();
+            feature.ConfigureClass.Clear();
+            feature.ConfigureMethod.Clear();
+
+            feature.ConfigureNamespace.Add((RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode node) =>
+            {
+                node.Content = "Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles";
+            });
+
+            feature.ConfigureClass.Add((RazorCodeDocument codeDocument, ClassDeclarationIntermediateNode node) =>
+            {
+                node.ClassName = IntegrationTestBase.FileName.Replace('/', '_');
+                node.Modifiers.Clear();
+                node.Modifiers.Add("public");
+            });
+
+            feature.ConfigureMethod.Add((RazorCodeDocument codeDocument, MethodDeclarationIntermediateNode node) =>
+            {
+                node.Modifiers.Clear();
+                node.Modifiers.Add("public");
+                node.Modifiers.Add("async");
+                node.MethodName = "ExecuteAsync";
+                node.ReturnType = typeof(Task).FullName;
+            });
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs
new file mode 100644
index 0000000000..bcea84e918
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineBuilderExtensions.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class RazorProjectEngineBuilderExtensions
+    {
+        public static RazorProjectEngineBuilder AddTagHelpers(this RazorProjectEngineBuilder builder, params TagHelperDescriptor[] tagHelpers)
+        {
+            return AddTagHelpers(builder, (IEnumerable<TagHelperDescriptor>)tagHelpers);
+        }
+
+        public static RazorProjectEngineBuilder AddTagHelpers(this RazorProjectEngineBuilder builder, IEnumerable<TagHelperDescriptor> tagHelpers)
+        {
+            var feature = (TestTagHelperFeature)builder.Features.OfType<ITagHelperFeature>().FirstOrDefault();
+            if (feature == null)
+            {
+                feature = new TestTagHelperFeature();
+                builder.Features.Add(feature);
+            }
+
+            feature.TagHelpers.AddRange(tagHelpers);
+            return builder;
+        }
+
+        public static RazorProjectEngineBuilder ConfigureDocumentClassifier(this RazorProjectEngineBuilder builder)
+        {
+            var feature = builder.Features.OfType<DefaultDocumentClassifierPassFeature>().FirstOrDefault();
+            if (feature == null)
+            {
+                feature = new DefaultDocumentClassifierPassFeature();
+                builder.Features.Add(feature);
+            }
+
+            feature.ConfigureNamespace.Clear();
+            feature.ConfigureClass.Clear();
+            feature.ConfigureMethod.Clear();
+
+            feature.ConfigureNamespace.Add((RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode node) =>
+            {
+                node.Content = "Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles";
+            });
+
+            feature.ConfigureClass.Add((RazorCodeDocument codeDocument, ClassDeclarationIntermediateNode node) =>
+            {
+                node.ClassName = IntegrationTestBase.FileName.Replace('/', '_');
+                node.Modifiers.Clear();
+                node.Modifiers.Add("public");
+            });
+
+            feature.ConfigureMethod.Add((RazorCodeDocument codeDocument, MethodDeclarationIntermediateNode node) =>
+            {
+                node.Modifiers.Clear();
+                node.Modifiers.Add("public");
+                node.Modifiers.Add("async");
+                node.MethodName = "ExecuteAsync";
+                node.ReturnType = typeof(Task).FullName;
+            });
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
new file mode 100644
index 0000000000..fee17d1368
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // Verifies recursively that a syntax tree has no gaps in terms of position/location.
+    internal class SyntaxTreeVerifier
+    {
+        public static void Verify(RazorSyntaxTree syntaxTree)
+        {
+            new Verifier(syntaxTree.Source).Visit(syntaxTree.Root);
+        }
+
+        private class Verifier : SyntaxRewriter
+        {
+            private readonly SourceLocationTracker _tracker;
+            private readonly RazorSourceDocument _source;
+
+            public Verifier(RazorSourceDocument source)
+            {
+                _tracker = new SourceLocationTracker(new SourceLocation(source.FilePath, 0, 0, 0));
+                _source = source;
+            }
+
+            public override SyntaxNode VisitToken(SyntaxToken token)
+            {
+                if (token != null && !token.IsMissing && token.Kind != SyntaxKind.Marker)
+                {
+                    var start = token.GetSourceLocation(_source);
+                    if (!start.Equals(_tracker.CurrentLocation))
+                    {
+                        throw new InvalidOperationException($"Token starting at {start} should start at {_tracker.CurrentLocation} - {token} ");
+                    }
+
+                    _tracker.UpdateLocation(token.Content);
+                }
+
+                return base.VisitToken(token);
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..23987d03bf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestBoundAttributeDescriptorBuilderExtensions.cs
@@ -0,0 +1,123 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestBoundAttributeDescriptorBuilderExtensions
+    {
+        public static BoundAttributeDescriptorBuilder Name(this BoundAttributeDescriptorBuilder builder, string name)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Name = name;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder TypeName(this BoundAttributeDescriptorBuilder builder, string typeName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.TypeName = typeName;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder PropertyName(this BoundAttributeDescriptorBuilder builder, string propertyName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.SetPropertyName(propertyName);
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder DisplayName(this BoundAttributeDescriptorBuilder builder, string displayName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.DisplayName = displayName;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder AsEnum(this BoundAttributeDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.IsEnum = true;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder AsDictionaryAttribute(
+            this BoundAttributeDescriptorBuilder builder,
+            string attributeNamePrefix,
+            string valueTypeName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.IsDictionary = true;
+            builder.IndexerAttributeNamePrefix = attributeNamePrefix;
+            builder.IndexerValueTypeName = valueTypeName;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder Documentation(this BoundAttributeDescriptorBuilder builder, string documentation)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Documentation = documentation;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder AddMetadata(this BoundAttributeDescriptorBuilder builder, string key, string value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Metadata[key] = value;
+
+            return builder;
+        }
+
+        public static BoundAttributeDescriptorBuilder AddDiagnostic(this BoundAttributeDescriptorBuilder builder, RazorDiagnostic diagnostic)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Diagnostics.Add(diagnostic);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs
new file mode 100644
index 0000000000..c04b9243ff
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TestFile
+    {
+        private TestFile(string resourceName, Assembly assembly)
+        {
+            Assembly = assembly;
+            ResourceName = Assembly.GetName().Name + "." + resourceName.Replace('/', '.');
+        }
+
+        public Assembly Assembly { get; }
+
+        public string ResourceName { get; }
+
+        public static TestFile Create(string resourceName, Type type)
+        {
+            return new TestFile(resourceName, type.GetTypeInfo().Assembly);
+        }
+
+        public static TestFile Create(string resourceName, Assembly assembly)
+        {
+            return new TestFile(resourceName, assembly);
+        }
+
+        public Stream OpenRead()
+        {
+            var stream = Assembly.GetManifestResourceStream(ResourceName);
+            if (stream == null)
+            {
+                Assert.True(false, string.Format("Manifest resource: {0} not found", ResourceName));
+            }
+
+            return stream;
+        }
+
+        public bool Exists()
+        {
+            var resourceNames = Assembly.GetManifestResourceNames();
+            foreach (var resourceName in resourceNames)
+            {
+                // Resource names are case-sensitive.
+                if (string.Equals(ResourceName, resourceName, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public string ReadAllText()
+        {
+            using (var reader = new StreamReader(OpenRead()))
+            {
+                // The .Replace() calls normalize line endings, in case you get \n instead of \r\n
+                // since all the unit tests rely on the assumption that the files will have \r\n endings.
+                return reader.ReadToEnd().Replace("\r", "").Replace("\n", "\r\n");
+            }
+        }
+
+        /// <summary>
+        /// Saves the file to the specified path.
+        /// </summary>
+        public void Save(string filePath)
+        {
+            var directory = Path.GetDirectoryName(filePath);
+            if (!Directory.Exists(directory))
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            using (var outStream = File.Create(filePath))
+            {
+                using (var inStream = OpenRead())
+                {
+                    inStream.CopyTo(outStream);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
new file mode 100644
index 0000000000..4cc8d85d61
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Testing;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestProject
+    {
+        public static string GetProjectDirectory(Type type)
+        {
+            var solutionDir = TestPathUtilities.GetSolutionRootDirectory("Razor");
+
+            var assemblyName = type.Assembly.GetName().Name;
+            var projectDirectory = Path.Combine(solutionDir, "test", assemblyName);
+            if (!Directory.Exists(projectDirectory))
+            {
+                throw new InvalidOperationException(
+$@"Could not locate project directory for type {type.FullName}.
+Directory probe path: {projectDirectory}.");
+            }
+
+            return projectDirectory;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs
new file mode 100644
index 0000000000..00afb4fb5d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs
@@ -0,0 +1,27 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestRazorCodeDocument
+    {
+        public static RazorCodeDocument CreateEmpty()
+        {
+            var source = TestRazorSourceDocument.Create(content: string.Empty);
+            return new DefaultRazorCodeDocument(source, imports: null);
+        }
+
+        public static RazorCodeDocument Create(string content, bool normalizeNewLines = false)
+        {
+            var source = TestRazorSourceDocument.Create(content, normalizeNewLines: normalizeNewLines);
+            return new DefaultRazorCodeDocument(source, imports: null);
+        }
+
+        public static RazorCodeDocument Create(RazorSourceDocument source, IEnumerable<RazorSourceDocument> imports)
+        {
+            return new DefaultRazorCodeDocument(source, imports);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..f16fff0274
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TestRazorProjectFileSystem : DefaultRazorProjectFileSystem
+    {
+        public new static RazorProjectFileSystem Empty = new TestRazorProjectFileSystem();
+
+        private readonly Dictionary<string, RazorProjectItem> _lookup;
+
+        public TestRazorProjectFileSystem()
+            : this(new RazorProjectItem[0])
+        {
+        }
+
+        public TestRazorProjectFileSystem(IList<RazorProjectItem> items) : base("/")
+        {
+            _lookup = items.ToDictionary(item => item.FilePath);
+        }
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            if (!_lookup.TryGetValue(path, out var value))
+            {
+                value = new NotFoundProjectItem("", path);
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs
new file mode 100644
index 0000000000..d4f03fbf0d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs
@@ -0,0 +1,49 @@
+// 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.IO;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TestRazorProjectItem : RazorProjectItem
+    {
+        public TestRazorProjectItem(
+            string filePath, 
+            string physicalPath = null,
+            string relativePhysicalPath = null,
+            string basePath = "/")
+        {
+            FilePath = filePath;
+            PhysicalPath = physicalPath;
+            RelativePhysicalPath = relativePhysicalPath;
+            BasePath = basePath;
+        }
+
+        public override string BasePath { get; }
+
+        public override string FilePath { get; }
+
+        public override string PhysicalPath { get; }
+
+        public override string RelativePhysicalPath { get; }
+
+        public override bool Exists { get; } = true;
+
+        public string Content { get; set; } = "Default content";
+
+        public override Stream Read()
+        {
+            // Act like a file and have a UTF8 BOM.
+            var preamble = Encoding.UTF8.GetPreamble();
+            var contentBytes = Encoding.UTF8.GetBytes(Content);
+            var buffer = new byte[preamble.Length + contentBytes.Length];
+            preamble.CopyTo(buffer, 0);
+            contentBytes.CopyTo(buffer, preamble.Length);
+
+            var stream = new MemoryStream(buffer);
+
+            return stream;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorSourceDocument.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorSourceDocument.cs
new file mode 100644
index 0000000000..e731b03594
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorSourceDocument.cs
@@ -0,0 +1,113 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestRazorSourceDocument
+    {
+        public static RazorSourceDocument CreateResource(string resourcePath, Type type, Encoding encoding = null, bool normalizeNewLines = false)
+        {
+            return CreateResource(resourcePath, type.GetTypeInfo().Assembly, encoding, normalizeNewLines);
+        }
+
+        public static RazorSourceDocument CreateResource(string resourcePath, Assembly assembly, Encoding encoding = null, bool normalizeNewLines = false)
+        {
+            var file = TestFile.Create(resourcePath, assembly);
+
+            using (var input = file.OpenRead())
+            using (var reader = new StreamReader(input))
+            {
+                var content = reader.ReadToEnd();
+                if (normalizeNewLines)
+                {
+                    content = NormalizeNewLines(content);
+                }
+
+                var properties = new RazorSourceDocumentProperties(resourcePath, resourcePath);
+                return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties);
+            }
+        }
+
+        public static RazorSourceDocument CreateResource(
+            string path,
+            Assembly assembly,
+            Encoding encoding,
+            RazorSourceDocumentProperties properties,
+            bool normalizeNewLines = false)
+        {
+            var file = TestFile.Create(path, assembly);
+
+            using (var input = file.OpenRead())
+            using (var reader = new StreamReader(input))
+            {
+                var content = reader.ReadToEnd();
+                if (normalizeNewLines)
+                {
+                    content = NormalizeNewLines(content);
+                }
+                
+                return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties);
+            }
+        }
+
+        public static MemoryStream CreateStreamContent(string content = "Hello, World!", Encoding encoding = null, bool normalizeNewLines = false)
+        {
+            var stream = new MemoryStream();
+            encoding = encoding ?? Encoding.UTF8;
+            using (var writer = new StreamWriter(stream, encoding, bufferSize: 1024, leaveOpen: true))
+            {
+                if (normalizeNewLines)
+                {
+                    content = NormalizeNewLines(content);
+                }
+
+                writer.Write(content);
+            }
+
+            stream.Seek(0L, SeekOrigin.Begin);
+
+            return stream;
+        }
+
+        public static RazorSourceDocument Create(
+            string content = "Hello, world!",
+            Encoding encoding = null,
+            bool normalizeNewLines = false,
+            string filePath = "test.cshtml",
+            string relativePath = "test.cshtml")
+        {
+            if (normalizeNewLines)
+            {
+                content = NormalizeNewLines(content);
+            }
+
+            var properties = new RazorSourceDocumentProperties(filePath, relativePath);
+            return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties);
+        }
+
+        public static RazorSourceDocument Create(
+            string content, 
+            RazorSourceDocumentProperties properties,
+            Encoding encoding = null, 
+            bool normalizeNewLines = false)
+        {
+            if (normalizeNewLines)
+            {
+                content = NormalizeNewLines(content);
+            }
+            
+            return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties);
+        }
+
+        private static string NormalizeNewLines(string content)
+        {
+            return Regex.Replace(content, "(?<!\r)\n", "\r\n", RegexOptions.None, TimeSpan.FromSeconds(10));
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..da638e1750
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRequiredAttributeDescriptorBuilderExtensions.cs
@@ -0,0 +1,69 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestRequiredAttributeDescriptorBuilderExtensions
+    {
+        public static RequiredAttributeDescriptorBuilder Name(this RequiredAttributeDescriptorBuilder builder, string name)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Name = name;
+
+            return builder;
+        }
+
+        public static RequiredAttributeDescriptorBuilder NameComparisonMode(
+            this RequiredAttributeDescriptorBuilder builder,
+            RequiredAttributeDescriptor.NameComparisonMode nameComparison)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.NameComparisonMode = nameComparison;
+
+            return builder;
+        }
+
+        public static RequiredAttributeDescriptorBuilder Value(this RequiredAttributeDescriptorBuilder builder, string value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Value = value;
+
+            return builder;
+        }
+
+        public static RequiredAttributeDescriptorBuilder ValueComparisonMode(
+            this RequiredAttributeDescriptorBuilder builder,
+            RequiredAttributeDescriptor.ValueComparisonMode valueComparison)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.ValueComparisonMode = valueComparison;
+
+            return builder;
+        }
+
+        public static RequiredAttributeDescriptorBuilder AddDiagnostic(this RequiredAttributeDescriptorBuilder builder, RazorDiagnostic diagnostic)
+        {
+            builder.Diagnostics.Add(diagnostic);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..5bc81a7792
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs
@@ -0,0 +1,122 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestTagHelperDescriptorBuilderExtensions
+    {
+        public static TagHelperDescriptorBuilder TypeName(this TagHelperDescriptorBuilder builder, string typeName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.SetTypeName(typeName);
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder DisplayName(this TagHelperDescriptorBuilder builder, string displayName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.DisplayName = displayName;
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder AllowChildTag(this TagHelperDescriptorBuilder builder, string allowedChild)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AllowChildTag(childTagBuilder => childTagBuilder.Name = allowedChild);
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder TagOutputHint(this TagHelperDescriptorBuilder builder, string hint)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.TagOutputHint = hint;
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder Documentation(this TagHelperDescriptorBuilder builder, string documentation)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Documentation = documentation;
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder AddMetadata(this TagHelperDescriptorBuilder builder, string key, string value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Metadata[key] = value;
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder AddDiagnostic(this TagHelperDescriptorBuilder builder, RazorDiagnostic diagnostic)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Diagnostics.Add(diagnostic);
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder BoundAttributeDescriptor(
+            this TagHelperDescriptorBuilder builder,
+            Action<BoundAttributeDescriptorBuilder> configure)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.BindAttribute(configure);
+
+            return builder;
+        }
+
+        public static TagHelperDescriptorBuilder TagMatchingRuleDescriptor(
+            this TagHelperDescriptorBuilder builder,
+            Action<TagMatchingRuleDescriptorBuilder> configure)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.TagMatchingRule(configure);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperFeature.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperFeature.cs
new file mode 100644
index 0000000000..ad4039007e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperFeature.cs
@@ -0,0 +1,27 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TestTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature
+    {
+        public TestTagHelperFeature()
+        {
+            TagHelpers = new List<TagHelperDescriptor>();
+        }
+
+        public TestTagHelperFeature(IEnumerable<TagHelperDescriptor> tagHelpers)
+        {
+            TagHelpers = new List<TagHelperDescriptor>(tagHelpers);
+        }
+
+        public List<TagHelperDescriptor> TagHelpers { get; }
+
+        public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
+        {
+            return TagHelpers.ToArray();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..f052818fe6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagMatchingRuleDescriptorBuilderExtensions.cs
@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class TestTagMatchingRuleDescriptorBuilderExtensions
+    {
+        public static TagMatchingRuleDescriptorBuilder RequireTagName(this TagMatchingRuleDescriptorBuilder builder, string tagName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.TagName = tagName;
+
+            return builder;
+        }
+
+        public static TagMatchingRuleDescriptorBuilder RequireParentTag(this TagMatchingRuleDescriptorBuilder builder, string parentTag)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.ParentTag = parentTag;
+
+            return builder;
+        }
+
+        public static TagMatchingRuleDescriptorBuilder RequireTagStructure(this TagMatchingRuleDescriptorBuilder builder, TagStructure tagStructure)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.TagStructure = tagStructure;
+
+            return builder;
+        }
+
+        public static TagMatchingRuleDescriptorBuilder AddDiagnostic(this TagMatchingRuleDescriptorBuilder builder, RazorDiagnostic diagnostic)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Diagnostics.Add(diagnostic);
+
+            return builder;
+        }
+
+        public static TagMatchingRuleDescriptorBuilder RequireAttributeDescriptor(
+            this TagMatchingRuleDescriptorBuilder builder,
+            Action<RequiredAttributeDescriptorBuilder> configure)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Attribute(configure);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
new file mode 100644
index 0000000000..a68e6182b4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
+    <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
+    <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..098d7b5b27
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
@@ -0,0 +1,15 @@
+// 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.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
new file mode 100644
index 0000000000..ffa7fd66d4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Extensions.DependencyModel;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis
+{
+    public static class TestCompilation
+    {
+        private static readonly ConcurrentDictionary<Assembly, IEnumerable<MetadataReference>> _referenceCache =
+            new ConcurrentDictionary<Assembly, IEnumerable<MetadataReference>>();
+
+        public static IEnumerable<MetadataReference> GetMetadataReferences(Assembly assembly)
+        {
+            var dependencyContext = DependencyContext.Load(assembly);
+
+            var metadataReferences = dependencyContext.CompileLibraries
+                .SelectMany(l => l.ResolveReferencePaths())
+                .Select(assemblyPath => MetadataReference.CreateFromFile(assemblyPath))
+                .ToArray();
+
+            return metadataReferences;
+        }
+
+        public static string AssemblyName => "TestAssembly";
+
+        public static CSharpCompilation Create(Assembly assembly, SyntaxTree syntaxTree = null)
+        {
+            IEnumerable<SyntaxTree> syntaxTrees = null;
+
+            if (syntaxTree != null)
+            {
+                syntaxTrees = new[] { syntaxTree };
+            }
+
+            if (!_referenceCache.TryGetValue(assembly, out IEnumerable<MetadataReference> metadataReferences))
+            {
+                metadataReferences = GetMetadataReferences(assembly);
+                _referenceCache.TryAdd(assembly, metadataReferences);
+            }
+
+            var compilation = CSharpCompilation.Create(AssemblyName, syntaxTrees, metadataReferences, new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+
+            EnsureValidCompilation(compilation);
+
+            return compilation;
+        }
+
+        private static void EnsureValidCompilation(CSharpCompilation compilation)
+        {
+            using (var stream = new MemoryStream())
+            {
+                var emitResult = compilation
+                    .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
+                    .Emit(stream);
+                var diagnostics = string.Join(
+                    Environment.NewLine,
+                    emitResult.Diagnostics.Select(d => CSharpDiagnosticFormatter.Instance.Format(d)));
+                Assert.True(emitResult.Success, $"Compilation is invalid : {Environment.NewLine}{diagnostics}");
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
new file mode 100644
index 0000000000..7043de7d02
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.*\**\*.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
new file mode 100644
index 0000000000..094a762152
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class HelperResult : IHtmlContent
+    {
+        public HelperResult(Func<TextWriter, Task> asyncAction)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
new file mode 100644
index 0000000000..34a1b208da
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
@@ -0,0 +1,31 @@
+// 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.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public interface IRazorPage
+    {
+        ViewContext ViewContext { get; set; }
+
+        IHtmlContent BodyContent { get; set; }
+
+        bool IsLayoutBeingRendered { get; set; }
+
+        string Path { get; set; }
+
+        string Layout { get; set; }
+
+        IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        IDictionary<string, RenderAsyncDelegate> SectionWriters { get; }
+
+        Task ExecuteAsync();
+
+        void EnsureRenderedBodyOrSections();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
new file mode 100644
index 0000000000..321129faea
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorInjectAttribute : Attribute
+    {
+        public RazorInjectAttribute ()
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
new file mode 100644
index 0000000000..b47d37d067
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage : IRazorPage
+    {
+        public ViewContext ViewContext { get; set; }
+
+        public IHtmlContent BodyContent { get; set; }
+
+        public bool IsLayoutBeingRendered { get; set; }
+
+        public string Path { get; set; }
+
+        public string Layout { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> SectionWriters { get; }
+
+        public ITempDataDictionary TempData { get; }
+
+        public void EnsureRenderedBodyOrSections()
+        {
+        }
+
+        public void DefineSection(string name, RenderAsyncDelegate section)
+        {
+        }
+
+        public abstract Task ExecuteAsync();
+
+        public void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public void EndContext()
+        {
+        }
+
+        public TTagHelper CreateTagHelper<TTagHelper>() where TTagHelper : ITagHelper
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
new file mode 100644
index 0000000000..e1460a5f82
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage<TModel> : RazorPage
+    {
+        public TModel Model { get; }
+
+        public ViewDataDictionary<TModel> ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
new file mode 100644
index 0000000000..75f6fb3974
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public delegate Task RenderAsyncDelegate(TextWriter writer);
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
new file mode 100644
index 0000000000..32d8c06988
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IHtmlHelper<TModel>
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
new file mode 100644
index 0000000000..acc44e7b61
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IJsonHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
new file mode 100644
index 0000000000..0f8a3b5bb6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class ViewContext
+    {
+        public ViewDataDictionary ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
new file mode 100644
index 0000000000..508b0cbda7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IModelExpressionProvider
+    {
+        ModelExpression CreateModelExpression<TModel, TValue>(
+               ViewDataDictionary<TModel> viewData,
+               Expression<Func<TModel, TValue>> expression);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
new file mode 100644
index 0000000000..2cfa53744b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface ITempDataDictionary
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
new file mode 100644
index 0000000000..0090cf91b1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IViewContextAware
+    {
+        void Contextualize(ViewContext viewContext);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
new file mode 100644
index 0000000000..3ee8ddc801
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public sealed class ModelExpression
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
new file mode 100644
index 0000000000..8a97b136cf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
new file mode 100644
index 0000000000..fa4a7d7c60
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary : IDictionary<string, object>
+    {
+        #region IDictionary properties
+        public object this[string index]
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public int Count { get; }
+
+        public bool IsReadOnly { get; }
+
+        public ICollection<string> Keys { get; }
+
+        public ICollection<object> Values { get; }
+        #endregion
+
+        #region IDictionary methods
+        public void Add(string key, object value)
+        {
+        }
+
+        public bool ContainsKey(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Remove(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetValue(string key, out object value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Add(KeyValuePair<string, object> item)
+        {
+        }
+
+        public void Clear()
+        {
+        }
+
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+        }
+
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
new file mode 100644
index 0000000000..f96eb55805
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary<TModel> : ViewDataDictionary
+    {
+        public TModel Model { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
new file mode 100644
index 0000000000..049f20183c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IUrlHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
new file mode 100644
index 0000000000..75f23a78aa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IViewComponentHelper
+    {
+        Task<IHtmlContent> InvokeAsync(string name, object arguments);
+
+        Task<IHtmlContent> InvokeAsync(Type componentType, object arguments);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
new file mode 100644
index 0000000000..5b470744c6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public sealed class ViewComponentAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
new file mode 100644
index 0000000000..9fa0e8c4ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
new file mode 100644
index 0000000000..9b07e85ed5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class CompiledRazorAssemblyApplicationPartFactory
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
new file mode 100644
index 0000000000..d5a3c744d1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class ProvideApplicationPartFactoryAttribute : Attribute
+    {
+        public ProvideApplicationPartFactoryAttribute(Type factoryType)
+        {
+        }
+
+        public ProvideApplicationPartFactoryAttribute(string factoryTypeName)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
new file mode 100644
index 0000000000..3722dd1229
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class RelatedAssemblyAttribute : Attribute
+    {
+        public RelatedAssemblyAttribute(string name)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
new file mode 100644
index 0000000000..094a762152
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class HelperResult : IHtmlContent
+    {
+        public HelperResult(Func<TextWriter, Task> asyncAction)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
new file mode 100644
index 0000000000..321129faea
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorInjectAttribute : Attribute
+    {
+        public RazorInjectAttribute ()
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
new file mode 100644
index 0000000000..2b7b7450cd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
@@ -0,0 +1,48 @@
+// 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.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage : RazorPageBase
+    {
+        public override void EndContext()
+        {
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public override void EnsureRenderedBodyOrSections()
+        {
+        }
+
+        protected virtual IHtmlContent RenderBody()
+        {
+            return null;
+        }
+
+        public HtmlString RenderSection(string name)
+        {
+            return null;
+        }
+
+        public HtmlString RenderSection(string name, bool required)
+        {
+            return null;
+        }
+
+        public Task<HtmlString> RenderSectionAsync(string name)
+        {
+            return null;
+        }
+
+        public Task<HtmlString> RenderSectionAsync(string name, bool required)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
new file mode 100644
index 0000000000..a4916e5378
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
@@ -0,0 +1,165 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPageBase
+    {
+        public virtual ViewContext ViewContext { get; set; }
+
+        public string Layout { get; set; }
+
+        public virtual TextWriter Output { get; }
+
+        public string Path { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> SectionWriters { get; }
+
+        public dynamic ViewBag { get; }
+
+        public bool IsLayoutBeingRendered { get; set; }
+
+        public IHtmlContent BodyContent { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        public DiagnosticSource DiagnosticSource { get; set; }
+
+        public HtmlEncoder HtmlEncoder { get; set; }
+
+        // This was "ClaimsPrincipal" but we didn't want to add the reference.
+        public virtual object User { get; }
+
+        public ITempDataDictionary TempData { get; }
+
+        public abstract Task ExecuteAsync();
+
+        public TTagHelper CreateTagHelper<TTagHelper>() where TTagHelper : ITagHelper
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual void PushWriter(TextWriter writer)
+        {
+        }
+
+        protected virtual TextWriter PopWriter()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void StartTagHelperWritingScope(HtmlEncoder encoder)
+        {
+        }
+
+        public TagHelperContent EndTagHelperWritingScope()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void BeginWriteTagHelperAttribute()
+        {
+        }
+
+        public string EndWriteTagHelperAttribute()
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual string Href(string contentPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        // Compatibility for 1.X projects
+        protected void DefineSection(string name, Func<object, Task> section)
+        {
+        }
+
+        public virtual void DefineSection(string name, RenderAsyncDelegate section)
+        {
+        }
+
+        public virtual void Write(object value)
+        {
+        }
+
+        public virtual void WriteLiteral(object value)
+        {
+        }
+
+        public virtual void BeginWriteAttribute(
+            string name,
+            string prefix,
+            int prefixOffset,
+            string suffix,
+            int suffixOffset,
+            int attributeValuesCount)
+        {
+        }
+
+        public void WriteAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+        }
+
+        public virtual void EndWriteAttribute()
+        {
+        }
+
+        public void BeginAddHtmlAttributeValues(
+            TagHelperExecutionContext executionContext,
+            string attributeName,
+            int attributeValuesCount,
+            HtmlAttributeValueStyle attributeValueStyle)
+        {
+        }
+
+        public void AddHtmlAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+        }
+
+        public void EndAddHtmlAttributeValues(TagHelperExecutionContext executionContext)
+        {
+        }
+
+        public virtual Task<HtmlString> FlushAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual HtmlString SetAntiforgeryCookieAndHeader()
+        {
+            throw new NotImplementedException();
+        }
+
+        public abstract void BeginContext(int position, int length, bool isLiteral);
+
+        public abstract void EndContext();
+
+        public abstract void EnsureRenderedBodyOrSections();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
new file mode 100644
index 0000000000..e1460a5f82
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage<TModel> : RazorPage
+    {
+        public TModel Model { get; }
+
+        public ViewDataDictionary<TModel> ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
new file mode 100644
index 0000000000..1ac6aba09a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public class RazorViewAttribute : Attribute
+    {
+        public RazorViewAttribute(string path, Type viewType)
+        {
+            Path = path;
+            ViewType = viewType;
+        }
+
+        /// <summary>
+        /// Gets the path of the view.
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// Gets the view type.
+        /// </summary>
+        public Type ViewType { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
new file mode 100644
index 0000000000..05d0ccc236
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
@@ -0,0 +1,9 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public delegate Task RenderAsyncDelegate();
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
new file mode 100644
index 0000000000..b6b67e75b0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public abstract class Page : RazorPageBase
+    {
+        public PageContext PageContext { get; set; }
+
+        public virtual RedirectResult Redirect(string url) => throw new NotImplementedException();
+
+        public override void EnsureRenderedBodyOrSections()
+        {
+
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public override void EndContext()
+        {
+        }
+
+        public virtual bool TryValidateModel(object model) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model, string prefix) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
new file mode 100644
index 0000000000..2f2a1ea9ed
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageContext : ViewContext
+    {
+        public Page Page { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
new file mode 100644
index 0000000000..c851d7a1c1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public abstract class PageModel
+    {
+        public IUrlHelper Url { get; set; }
+
+        public Page Page => PageContext?.Page;
+
+        public PageContext PageContext { get; set; }
+
+        public ViewContext ViewContext => PageContext;
+
+        public ITempDataDictionary TempData { get; }
+
+        public ViewDataDictionary ViewData { get; }
+
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model)
+            where TModel : class
+        {
+            throw new NotImplementedException();
+        }
+
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model, string name)
+            where TModel : class
+        {
+            throw new NotImplementedException();
+        }
+
+        protected internal RedirectResult Redirect(string url) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model, string name) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
new file mode 100644
index 0000000000..900827a018
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class RazorPageAttribute : RazorViewAttribute
+    {
+        public RazorPageAttribute(string path, Type viewType, string routeTemplate)
+            : base(path, viewType)
+        {
+            RouteTemplate = routeTemplate;
+        }
+
+        public string RouteTemplate { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
new file mode 100644
index 0000000000..32d8c06988
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IHtmlHelper<TModel>
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
new file mode 100644
index 0000000000..acc44e7b61
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IJsonHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
new file mode 100644
index 0000000000..0f8a3b5bb6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class ViewContext
+    {
+        public ViewDataDictionary ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
new file mode 100644
index 0000000000..508b0cbda7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IModelExpressionProvider
+    {
+        ModelExpression CreateModelExpression<TModel, TValue>(
+               ViewDataDictionary<TModel> viewData,
+               Expression<Func<TModel, TValue>> expression);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
new file mode 100644
index 0000000000..2cfa53744b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface ITempDataDictionary
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
new file mode 100644
index 0000000000..0090cf91b1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IViewContextAware
+    {
+        void Contextualize(ViewContext viewContext);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
new file mode 100644
index 0000000000..3ee8ddc801
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public sealed class ModelExpression
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
new file mode 100644
index 0000000000..8a97b136cf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
new file mode 100644
index 0000000000..fa4a7d7c60
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary : IDictionary<string, object>
+    {
+        #region IDictionary properties
+        public object this[string index]
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public int Count { get; }
+
+        public bool IsReadOnly { get; }
+
+        public ICollection<string> Keys { get; }
+
+        public ICollection<object> Values { get; }
+        #endregion
+
+        #region IDictionary methods
+        public void Add(string key, object value)
+        {
+        }
+
+        public bool ContainsKey(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Remove(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetValue(string key, out object value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Add(KeyValuePair<string, object> item)
+        {
+        }
+
+        public void Clear()
+        {
+        }
+
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+        }
+
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
new file mode 100644
index 0000000000..f96eb55805
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary<TModel> : ViewDataDictionary
+    {
+        public TModel Model { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs
new file mode 100644
index 0000000000..790e9499c5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ActionResult : IActionResult
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs
new file mode 100644
index 0000000000..afc2e87bf7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IActionResult
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
new file mode 100644
index 0000000000..049f20183c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IUrlHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
new file mode 100644
index 0000000000..75f23a78aa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IViewComponentHelper
+    {
+        Task<IHtmlContent> InvokeAsync(string name, object arguments);
+
+        Task<IHtmlContent> InvokeAsync(Type componentType, object arguments);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs
new file mode 100644
index 0000000000..93d00ade21
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectResult : ActionResult
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
new file mode 100644
index 0000000000..5b470744c6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public sealed class ViewComponentAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
new file mode 100644
index 0000000000..9fa0e8c4ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
new file mode 100644
index 0000000000..87301deb92
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Components.RenderTree;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public abstract class Component : IComponent
+    {
+        public virtual void BuildRenderTree(RenderTreeBuilder builder)
+        {
+        }
+
+        protected void WriteLiteral(string literal) { }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
new file mode 100644
index 0000000000..c2fe5924da
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    public interface IComponent
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
new file mode 100644
index 0000000000..f250e0bb39
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    public abstract class RenderTreeBuilder
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
new file mode 100644
index 0000000000..9b07e85ed5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class CompiledRazorAssemblyApplicationPartFactory
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
new file mode 100644
index 0000000000..d5a3c744d1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class ProvideApplicationPartFactoryAttribute : Attribute
+    {
+        public ProvideApplicationPartFactoryAttribute(Type factoryType)
+        {
+        }
+
+        public ProvideApplicationPartFactoryAttribute(string factoryTypeName)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
new file mode 100644
index 0000000000..3722dd1229
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class RelatedAssemblyAttribute : Attribute
+    {
+        public RelatedAssemblyAttribute(string name)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
new file mode 100644
index 0000000000..094a762152
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class HelperResult : IHtmlContent
+    {
+        public HelperResult(Func<TextWriter, Task> asyncAction)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
new file mode 100644
index 0000000000..321129faea
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorInjectAttribute : Attribute
+    {
+        public RazorInjectAttribute ()
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
new file mode 100644
index 0000000000..2b7b7450cd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
@@ -0,0 +1,48 @@
+// 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.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage : RazorPageBase
+    {
+        public override void EndContext()
+        {
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public override void EnsureRenderedBodyOrSections()
+        {
+        }
+
+        protected virtual IHtmlContent RenderBody()
+        {
+            return null;
+        }
+
+        public HtmlString RenderSection(string name)
+        {
+            return null;
+        }
+
+        public HtmlString RenderSection(string name, bool required)
+        {
+            return null;
+        }
+
+        public Task<HtmlString> RenderSectionAsync(string name)
+        {
+            return null;
+        }
+
+        public Task<HtmlString> RenderSectionAsync(string name, bool required)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
new file mode 100644
index 0000000000..a4916e5378
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
@@ -0,0 +1,165 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPageBase
+    {
+        public virtual ViewContext ViewContext { get; set; }
+
+        public string Layout { get; set; }
+
+        public virtual TextWriter Output { get; }
+
+        public string Path { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> SectionWriters { get; }
+
+        public dynamic ViewBag { get; }
+
+        public bool IsLayoutBeingRendered { get; set; }
+
+        public IHtmlContent BodyContent { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        public DiagnosticSource DiagnosticSource { get; set; }
+
+        public HtmlEncoder HtmlEncoder { get; set; }
+
+        // This was "ClaimsPrincipal" but we didn't want to add the reference.
+        public virtual object User { get; }
+
+        public ITempDataDictionary TempData { get; }
+
+        public abstract Task ExecuteAsync();
+
+        public TTagHelper CreateTagHelper<TTagHelper>() where TTagHelper : ITagHelper
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual void PushWriter(TextWriter writer)
+        {
+        }
+
+        protected virtual TextWriter PopWriter()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void StartTagHelperWritingScope(HtmlEncoder encoder)
+        {
+        }
+
+        public TagHelperContent EndTagHelperWritingScope()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void BeginWriteTagHelperAttribute()
+        {
+        }
+
+        public string EndWriteTagHelperAttribute()
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual string Href(string contentPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        // Compatibility for 1.X projects
+        protected void DefineSection(string name, Func<object, Task> section)
+        {
+        }
+
+        public virtual void DefineSection(string name, RenderAsyncDelegate section)
+        {
+        }
+
+        public virtual void Write(object value)
+        {
+        }
+
+        public virtual void WriteLiteral(object value)
+        {
+        }
+
+        public virtual void BeginWriteAttribute(
+            string name,
+            string prefix,
+            int prefixOffset,
+            string suffix,
+            int suffixOffset,
+            int attributeValuesCount)
+        {
+        }
+
+        public void WriteAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+        }
+
+        public virtual void EndWriteAttribute()
+        {
+        }
+
+        public void BeginAddHtmlAttributeValues(
+            TagHelperExecutionContext executionContext,
+            string attributeName,
+            int attributeValuesCount,
+            HtmlAttributeValueStyle attributeValueStyle)
+        {
+        }
+
+        public void AddHtmlAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+        }
+
+        public void EndAddHtmlAttributeValues(TagHelperExecutionContext executionContext)
+        {
+        }
+
+        public virtual Task<HtmlString> FlushAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual HtmlString SetAntiforgeryCookieAndHeader()
+        {
+            throw new NotImplementedException();
+        }
+
+        public abstract void BeginContext(int position, int length, bool isLiteral);
+
+        public abstract void EndContext();
+
+        public abstract void EnsureRenderedBodyOrSections();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
new file mode 100644
index 0000000000..e1460a5f82
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage<TModel> : RazorPage
+    {
+        public TModel Model { get; }
+
+        public ViewDataDictionary<TModel> ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
new file mode 100644
index 0000000000..1ac6aba09a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public class RazorViewAttribute : Attribute
+    {
+        public RazorViewAttribute(string path, Type viewType)
+        {
+            Path = path;
+            ViewType = viewType;
+        }
+
+        /// <summary>
+        /// Gets the path of the view.
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// Gets the view type.
+        /// </summary>
+        public Type ViewType { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
new file mode 100644
index 0000000000..05d0ccc236
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
@@ -0,0 +1,9 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public delegate Task RenderAsyncDelegate();
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
new file mode 100644
index 0000000000..b6b67e75b0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public abstract class Page : RazorPageBase
+    {
+        public PageContext PageContext { get; set; }
+
+        public virtual RedirectResult Redirect(string url) => throw new NotImplementedException();
+
+        public override void EnsureRenderedBodyOrSections()
+        {
+
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public override void EndContext()
+        {
+        }
+
+        public virtual bool TryValidateModel(object model) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model, string prefix) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
new file mode 100644
index 0000000000..2f2a1ea9ed
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageContext : ViewContext
+    {
+        public Page Page { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
new file mode 100644
index 0000000000..c851d7a1c1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public abstract class PageModel
+    {
+        public IUrlHelper Url { get; set; }
+
+        public Page Page => PageContext?.Page;
+
+        public PageContext PageContext { get; set; }
+
+        public ViewContext ViewContext => PageContext;
+
+        public ITempDataDictionary TempData { get; }
+
+        public ViewDataDictionary ViewData { get; }
+
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model)
+            where TModel : class
+        {
+            throw new NotImplementedException();
+        }
+
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model, string name)
+            where TModel : class
+        {
+            throw new NotImplementedException();
+        }
+
+        protected internal RedirectResult Redirect(string url) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model, string name) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
new file mode 100644
index 0000000000..900827a018
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class RazorPageAttribute : RazorViewAttribute
+    {
+        public RazorPageAttribute(string path, Type viewType, string routeTemplate)
+            : base(path, viewType)
+        {
+            RouteTemplate = routeTemplate;
+        }
+
+        public string RouteTemplate { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
new file mode 100644
index 0000000000..32d8c06988
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IHtmlHelper<TModel>
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
new file mode 100644
index 0000000000..acc44e7b61
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IJsonHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
new file mode 100644
index 0000000000..0f8a3b5bb6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class ViewContext
+    {
+        public ViewDataDictionary ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
new file mode 100644
index 0000000000..508b0cbda7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IModelExpressionProvider
+    {
+        ModelExpression CreateModelExpression<TModel, TValue>(
+               ViewDataDictionary<TModel> viewData,
+               Expression<Func<TModel, TValue>> expression);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
new file mode 100644
index 0000000000..2cfa53744b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface ITempDataDictionary
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
new file mode 100644
index 0000000000..0090cf91b1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IViewContextAware
+    {
+        void Contextualize(ViewContext viewContext);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
new file mode 100644
index 0000000000..3ee8ddc801
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public sealed class ModelExpression
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
new file mode 100644
index 0000000000..8a97b136cf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
new file mode 100644
index 0000000000..fa4a7d7c60
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary : IDictionary<string, object>
+    {
+        #region IDictionary properties
+        public object this[string index]
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public int Count { get; }
+
+        public bool IsReadOnly { get; }
+
+        public ICollection<string> Keys { get; }
+
+        public ICollection<object> Values { get; }
+        #endregion
+
+        #region IDictionary methods
+        public void Add(string key, object value)
+        {
+        }
+
+        public bool ContainsKey(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Remove(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetValue(string key, out object value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Add(KeyValuePair<string, object> item)
+        {
+        }
+
+        public void Clear()
+        {
+        }
+
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+        }
+
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
new file mode 100644
index 0000000000..f96eb55805
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary<TModel> : ViewDataDictionary
+    {
+        public TModel Model { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs
new file mode 100644
index 0000000000..790e9499c5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ActionResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ActionResult : IActionResult
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs
new file mode 100644
index 0000000000..afc2e87bf7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IActionResult.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IActionResult
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
new file mode 100644
index 0000000000..049f20183c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IUrlHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
new file mode 100644
index 0000000000..75f23a78aa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IViewComponentHelper
+    {
+        Task<IHtmlContent> InvokeAsync(string name, object arguments);
+
+        Task<IHtmlContent> InvokeAsync(Type componentType, object arguments);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs
new file mode 100644
index 0000000000..93d00ade21
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/RedirectResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectResult : ActionResult
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
new file mode 100644
index 0000000000..5b470744c6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public sealed class ViewComponentAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
new file mode 100644
index 0000000000..9fa0e8c4ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
new file mode 100644
index 0000000000..10866769b7
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+</Project>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Models/ErrorViewModel.cs b/src/Razor/test/testassets/AppWithP2PReference/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..ecc6e00ab2
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace AppWithP2PReference.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Program.cs b/src/Razor/test/testassets/AppWithP2PReference/Program.cs
new file mode 100644
index 0000000000..dc3ac4e250
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Program.cs
@@ -0,0 +1,13 @@
+
+namespace AppWithP2PReference
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/Home/About.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/Home/About.cshtml
new file mode 100644
index 0000000000..3674e37a86
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/Home/About.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/Home/Contact.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/Home/Contact.cshtml
new file mode 100644
index 0000000000..a11a1867cf
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/Home/Contact.cshtml
@@ -0,0 +1,17 @@
+@{
+    ViewData["Title"] = "Contact";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<address>
+    One Microsoft Way<br />
+    Redmond, WA 98052-6399<br />
+    <abbr title="Phone">P:</abbr>
+    425.555.0100
+</address>
+
+<address>
+    <strong>Support:</strong> <a href="mailto:Support@example.com">Support@example.com</a><br />
+    <strong>Marketing:</strong> <a href="mailto:Marketing@example.com">Marketing@example.com</a>
+</address>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/Home/Index.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/Error.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/Error.cshtml
new file mode 100644
index 0000000000..ec2ea6bd03
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/Error.cshtml
@@ -0,0 +1,22 @@
+@model ErrorViewModel
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (Model.ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
+</p>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml
new file mode 100644
index 0000000000..a699aafa97
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,18 @@
+<environment include="Development">
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+</environment>
+<environment exclude="Development">
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
+    </script>
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
+    </script>
+</environment>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..601a427791
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using AppWithP2PReference
+@using AppWithP2PReference.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewStart.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/ClassLibrary/Class1.cs b/src/Razor/test/testassets/ClassLibrary/Class1.cs
new file mode 100644
index 0000000000..62a93d35fc
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary/Class1.cs
@@ -0,0 +1,7 @@
+namespace ClassLibrary
+{
+    public class Class1
+    {
+        // Just here so this assembly has some compilation inputs.
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
new file mode 100644
index 0000000000..717524a947
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <Copyright>© Microsoft</Copyright>
+    <Product>Razor Test</Product>
+    <Company>Microsoft</Company>
+    <Description>ClassLibrary Description</Description>
+
+    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/ClassLibrary/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/ClassLibrary/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..1a9473e464
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml b/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..1dbbe8a4c2
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using ClassLibrary
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/ClassLibrary2/Class2.cs b/src/Razor/test/testassets/ClassLibrary2/Class2.cs
new file mode 100644
index 0000000000..76bd2e956f
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary2/Class2.cs
@@ -0,0 +1,13 @@
+using System;
+using ClassLibrary;
+
+namespace ClassLibrary2
+{
+    public class Class2
+    {
+        public void Method()
+        {
+            Console.WriteLine(typeof(Class1));
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
new file mode 100644
index 0000000000..2576345aa3
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/ClassLibrary2/Views/Shared/Index.cshtml b/src/Razor/test/testassets/ClassLibrary2/Views/Shared/Index.cshtml
new file mode 100644
index 0000000000..415ad5c4f8
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary2/Views/Shared/Index.cshtml
@@ -0,0 +1,2 @@
+@{ var message = "Hello world";}
+@message
diff --git a/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml b/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..1dbbe8a4c2
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using ClassLibrary
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml b/src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml
new file mode 100644
index 0000000000..69112690e7
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml
@@ -0,0 +1,16 @@
+@page
+@model ClassLibraryMvc21.MyFeature.Pages.Page1Model
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Page1</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml.cs b/src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml.cs
new file mode 100644
index 0000000000..c1fe87da2d
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibraryMvc21/Areas/MyFeature/Pages/Page1.cshtml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace ClassLibraryMvc21.MyFeature.Pages
+{
+    public class Page1Model : PageModel
+    {
+        public void OnGet()
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj b/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj
new file mode 100644
index 0000000000..04fdcf55f3
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <!-- 
+  This project references a shipped version of MVC and should not reference local builds of 
+  the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
new file mode 100644
index 0000000000..8020d32ee0
--- /dev/null
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -0,0 +1,35 @@
+<Project>
+  <Import Project="Before.Directory.Build.props" Condition="Exists('Before.Directory.Build.props')" />
+
+  <PropertyGroup>
+    <SolutionRoot Condition="'$(SolutionRoot)' == ''">$(MSBuildThisFileDirectory)..\..\</SolutionRoot>
+    <SolutionRoot>$([MSBuild]::EnsureTrailingSlash('$(SolutionRoot)'))</SolutionRoot>
+
+    <!-- Retarget tests to use the copy of the Sdk from source -->
+    <RazorSdkProjectDirectory>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\</RazorSdkProjectDirectory>
+
+    <RazorSdkCurrentVersionProps>$(RazorSdkProjectDirectory)build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+    <RazorSdkCurrentVersionTargets>$(RazorSdkProjectDirectory)build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
+  </PropertyGroup>
+
+  <!-- Import solution dependencies.props when building in place -->
+  <Import Project="..\..\build\dependencies.props" Condition="'$(BinariesRoot)'==''"/>
+
+  <PropertyGroup>
+    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
+    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
+
+    <NETStandardImplicitPackageVersion>$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+
+    <!-- Working around an issue in XDT transforms -->
+    <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
+  </PropertyGroup>
+
+  <!-- Don't use the server when building in place. This locks up rzc.dll -->
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" />
+
+</Project>
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
new file mode 100644
index 0000000000..39f4f47645
--- /dev/null
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="RazorTest.Introspection.targets" />
+
+  <PropertyGroup>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
+    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
+    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
new file mode 100644
index 0000000000..5f755a4dfd
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>  
+
+  <!-- Test Placeholder -->
+  
+</Project>
diff --git a/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml b/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml
new file mode 100644
index 0000000000..3b3157002e
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimplePages</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-page="/Index" class="navbar-brand">SimplePages</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-page="/Index">Home</a></li>
+                    <li><a asp-page="/About">About</a></li>
+                    <li><a asp-page="/Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimplePages</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LargeProject/Views/Home/View001.cshtml b/src/Razor/test/testassets/LargeProject/Views/Home/View001.cshtml
new file mode 100644
index 0000000000..6229fde63d
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Home/View001.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LargeProject/Views/Home/View002.cshtml b/src/Razor/test/testassets/LargeProject/Views/Home/View002.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Home/View002.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/LargeProject/Views/Home/View003.cshtml b/src/Razor/test/testassets/LargeProject/Views/Home/View003.cshtml
new file mode 100644
index 0000000000..a11a1867cf
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Home/View003.cshtml
@@ -0,0 +1,17 @@
+@{
+    ViewData["Title"] = "Contact";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<address>
+    One Microsoft Way<br />
+    Redmond, WA 98052-6399<br />
+    <abbr title="Phone">P:</abbr>
+    425.555.0100
+</address>
+
+<address>
+    <strong>Support:</strong> <a href="mailto:Support@example.com">Support@example.com</a><br />
+    <strong>Marketing:</strong> <a href="mailto:Marketing@example.com">Marketing@example.com</a>
+</address>
diff --git a/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..694a3223d1
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimplePages</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-page="/Index" class="navbar-brand">SimplePages</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-page="/Index">Home</a></li>
+                    <li><a asp-page="/About">About</a></li>
+                    <li><a asp-page="/Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimplePages</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml b/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml
new file mode 100644
index 0000000000..46477e769f
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using LargeProject
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewStart.cshtml b/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml
new file mode 100644
index 0000000000..2567b2c379
--- /dev/null
+++ b/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml
@@ -0,0 +1 @@
+@(
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml
new file mode 100644
index 0000000000..3611531b13
--- /dev/null
+++ b/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml
@@ -0,0 +1 @@
+@DateTime.UtcNow
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml
new file mode 100644
index 0000000000..3611531b13
--- /dev/null
+++ b/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml
@@ -0,0 +1 @@
+@DateTime.UtcNow
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml
new file mode 100644
index 0000000000..3611531b13
--- /dev/null
+++ b/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml
@@ -0,0 +1 @@
+@DateTime.UtcNow
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/Models/ErrorViewModel.cs b/src/Razor/test/testassets/MvcWithComponents/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..df07aa87c0
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MvcWithComponents.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
new file mode 100644
index 0000000000..660a620ff1
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/MvcWithComponents/Program.cs b/src/Razor/test/testassets/MvcWithComponents/Program.cs
new file mode 100644
index 0000000000..2011ae9687
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Program.cs
@@ -0,0 +1,13 @@
+
+namespace MvcWithComponents
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor b/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor
new file mode 100644
index 0000000000..558c8aaa24
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor
@@ -0,0 +1 @@
+Hello from component
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..8832e1ad15
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
@@ -0,0 +1,5 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+Hello world!
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor b/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
new file mode 100644
index 0000000000..d6eede9b18
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
@@ -0,0 +1,2 @@
+NavMenu content
+
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..7e47b2893e
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using MvcWithComponents
+@using MvcWithComponents.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewStart.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
new file mode 100644
index 0000000000..a22622b0d6
--- /dev/null
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -0,0 +1,28 @@
+<Project>
+  <Target Name="_IntrospectRazorGenerateWithTargetPath">
+    <Message Text="RazorGenerateWithTargetPath: %(RazorGenerateWithTargetPath.Identity) %(RazorGenerateWithTargetPath.TargetPath) %(RazorGenerateWithTargetPath.GeneratedOutput)" Importance="High" />
+  </Target>
+
+  <Target Name="_IntrospectRazorEmbeddedResources">
+    <Message Text="CompileResource: %(_RazorCoreCompileResourceInputs.Identity) %(_RazorCoreCompileResourceInputs.LogicalName)" Importance="High" />
+  </Target>
+
+  <Target Name="_IntrospectUpToDateCheck">
+    <Message Text="UpToDateCheckInput: %(UpToDateCheckInput.Identity)" Importance="High" />
+    <Message Text="No UpToDateCheckInput input found" Importance="High" Condition="'@(UpToDateCheckInput->Count)' == '0'" />
+    <Message Text="UpToDateCheckBuilt: %(UpToDateCheckBuilt.Identity)" Importance="High" />
+    <Message Text="No UpToDateCheckBuilt input found" Importance="High" Condition="'@(UpToDateCheckBuilt->Count)' == '0'" />
+  </Target>
+
+  <Target Name="_IntrospectRazorCompileItems">
+    <Message Text="RazorCompile: %(RazorCompile.Identity)" Importance="High" />
+  </Target>
+
+  <Target Name="_IntrospectUseRazorBuildServer">
+    <Message Text="UseRazorBuildServer: $(UseRazorBuildServer)" Importance="High" />
+  </Target>
+
+  <Target Name="_IntrospectGetCopyToOutputDirectoryItems">
+    <Message Text="AllItemsFullPathWithTargetPath: %(AllItemsFullPathWithTargetPath.TargetPath)" Importance="High" />
+  </Target>
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc/Models/ErrorViewModel.cs b/src/Razor/test/testassets/SimpleMvc/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..b4aa044914
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SimpleMvc.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/SimpleMvc/Program.cs b/src/Razor/test/testassets/SimpleMvc/Program.cs
new file mode 100644
index 0000000000..e62b11efe5
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
new file mode 100644
index 0000000000..925a8c7194
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleTagHelper.cs b/src/Razor/test/testassets/SimpleMvc/SimpleTagHelper.cs
new file mode 100644
index 0000000000..7cc52922d9
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleTagHelper.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace SimpleMvc
+{
+    public class SimpleTagHelper : TagHelper
+    {
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Home/About.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Home/About.cshtml
new file mode 100644
index 0000000000..3674e37a86
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Home/About.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Home/Contact.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Home/Contact.cshtml
new file mode 100644
index 0000000000..a11a1867cf
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Home/Contact.cshtml
@@ -0,0 +1,17 @@
+@{
+    ViewData["Title"] = "Contact";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<address>
+    One Microsoft Way<br />
+    Redmond, WA 98052-6399<br />
+    <abbr title="Phone">P:</abbr>
+    425.555.0100
+</address>
+
+<address>
+    <strong>Support:</strong> <a href="mailto:Support@example.com">Support@example.com</a><br />
+    <strong>Marketing:</strong> <a href="mailto:Marketing@example.com">Marketing@example.com</a>
+</address>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Shared/Error.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Shared/Error.cshtml
new file mode 100644
index 0000000000..ec2ea6bd03
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Shared/Error.cshtml
@@ -0,0 +1,22 @@
+@model ErrorViewModel
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (Model.ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
+</p>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..1a9473e464
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml
new file mode 100644
index 0000000000..a699aafa97
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,18 @@
+<environment include="Development">
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+</environment>
+<environment exclude="Development">
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
+    </script>
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
+    </script>
+</environment>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..da00289ea5
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using SimpleMvc
+@using SimpleMvc.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/SimpleMvc/wwwroot/css/site.css b/src/Razor/test/testassets/SimpleMvc/wwwroot/css/site.css
new file mode 100644
index 0000000000..6b0e6c3ab2
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/wwwroot/css/site.css
@@ -0,0 +1,37 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification\ 
+for details on configuring this project to bundle and minify static web assets. */
+body {
+    padding-top: 50px;
+    padding-bottom: 20px;
+}
+
+/* Wrapping element */
+/* Set some basic padding to keep content from hitting the edges */
+.body-content {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+/* Carousel */
+.carousel-caption p {
+    font-size: 20px;
+    line-height: 1.4;
+}
+
+/* Make .svg files in the carousel display properly in older browsers */
+.carousel-inner .item img[src$=".svg"] {
+    width: 100%;
+}
+
+/* QR code generator */
+#qrCode {
+    margin: 15px;
+}
+
+/* Hide/rearrange for smaller screens */
+@media screen and (max-width: 767px) {
+    /* Hide captions */
+    .carousel-caption {
+        display: none;
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc/wwwroot/js/SimpleMvc.js b/src/Razor/test/testassets/SimpleMvc/wwwroot/js/SimpleMvc.js
new file mode 100644
index 0000000000..ad51101cd1
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/wwwroot/js/SimpleMvc.js
@@ -0,0 +1 @@
+// This is a test file
diff --git a/src/Razor/test/testassets/SimpleMvc21/Models/ErrorViewModel.cs b/src/Razor/test/testassets/SimpleMvc21/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..b4aa044914
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SimpleMvc.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/SimpleMvc21/Program.cs b/src/Razor/test/testassets/SimpleMvc21/Program.cs
new file mode 100644
index 0000000000..39ec364271
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MVC 2.1
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc21/SimpleMvc21.csproj b/src/Razor/test/testassets/SimpleMvc21/SimpleMvc21.csproj
new file mode 100644
index 0000000000..2f53950aa6
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/SimpleMvc21.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC and should not reference local builds of
+    the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+
+     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/Home/About.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/Home/About.cshtml
new file mode 100644
index 0000000000..3674e37a86
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/Home/About.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..1a9473e464
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
new file mode 100644
index 0000000000..a699aafa97
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,18 @@
+<environment include="Development">
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+</environment>
+<environment exclude="Development">
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
+    </script>
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
+    </script>
+</environment>
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..477d4ba603
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@using SimpleMvc
+@using SimpleMvc.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@namespace SimpleMvc21
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/Models/ErrorViewModel.fs b/src/Razor/test/testassets/SimpleMvcFSharp/Models/ErrorViewModel.fs
new file mode 100644
index 0000000000..111eba32de
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/Models/ErrorViewModel.fs
@@ -0,0 +1,8 @@
+namespace SimpleMvcFSharp
+
+open System
+
+type ErrorViewModel private () =
+    member val RequestId : string = null with get, set
+
+    member val ShowRequestId : bool = true with get, set
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/Program.fs b/src/Razor/test/testassets/SimpleMvcFSharp/Program.fs
new file mode 100644
index 0000000000..10f99aa34f
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/Program.fs
@@ -0,0 +1,11 @@
+namespace SimpleMvcFSharp
+
+module Program =
+    let exitCode = 0
+
+    [<EntryPoint>]
+    let main args =
+        let t = typeof<Microsoft.AspNetCore.Mvc.IActionResult>
+        System.Console.WriteLine(t.FullName)
+
+        exitCode
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
new file mode 100644
index 0000000000..6f2c4cc5c1
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Models/ErrorViewModel.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>  
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/Views/Home/About.cshtml b/src/Razor/test/testassets/SimpleMvcFSharp/Views/Home/About.cshtml
new file mode 100644
index 0000000000..50476d1fbd
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/Views/Home/About.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"].</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvcFSharp/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..8df2746fd7
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using SimpleMvcFSharp
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/Index.cshtml b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/Index.cshtml
new file mode 100644
index 0000000000..a574e3f403
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/Index.cshtml
@@ -0,0 +1,107 @@
+@page
+@{
+    ViewData["Title"] = "Home page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core Razor Pages</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?linkid=852130">Working with Razor Pages.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure App Service</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..6686959c4a
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using SimplePages
+@namespace SimplePages.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewStart.cshtml b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/SimplePages/Pages/About.cshtml b/src/Razor/test/testassets/SimplePages/Pages/About.cshtml
new file mode 100644
index 0000000000..3c090d15f0
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/About.cshtml
@@ -0,0 +1,9 @@
+@page
+@model AboutModel
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@Model.Message</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testassets/SimplePages/Pages/About.cshtml.cs b/src/Razor/test/testassets/SimplePages/Pages/About.cshtml.cs
new file mode 100644
index 0000000000..969985072e
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/About.cshtml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace SimplePages.Pages
+{
+    public class AboutModel : PageModel
+    {
+        public string Message { get; set; }
+
+        public void OnGet()
+        {
+            Message = "Your application description page.";
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml b/src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml
new file mode 100644
index 0000000000..b683c8216c
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml
@@ -0,0 +1,19 @@
+@page
+@model ContactModel
+@{
+    ViewData["Title"] = "Contact";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@Model.Message</h3>
+
+<address>
+    One Microsoft Way<br />
+    Redmond, WA 98052-6399<br />
+    <abbr title="Phone">P:</abbr>
+    425.555.0100
+</address>
+
+<address>
+    <strong>Support:</strong> <a href="mailto:Support@example.com">Support@example.com</a><br />
+    <strong>Marketing:</strong> <a href="mailto:Marketing@example.com">Marketing@example.com</a>
+</address>
diff --git a/src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml.cs b/src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml.cs
new file mode 100644
index 0000000000..6444b7e64d
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/Contact.cshtml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace SimplePages.Pages
+{
+    public class ContactModel : PageModel
+    {
+        public string Message { get; set; }
+
+        public void OnGet()
+        {
+            Message = "Your contact page.";
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimplePages/Pages/Index.cshtml b/src/Razor/test/testassets/SimplePages/Pages/Index.cshtml
new file mode 100644
index 0000000000..728fdfc943
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/Index.cshtml
@@ -0,0 +1,108 @@
+@page
+@model IndexModel
+@{
+    ViewData["Title"] = "Home page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core Razor Pages</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?linkid=852130">Working with Razor Pages.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure App Service</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimplePages/Pages/Index.cshtml.cs b/src/Razor/test/testassets/SimplePages/Pages/Index.cshtml.cs
new file mode 100644
index 0000000000..1e507ea24a
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/Index.cshtml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace SimplePages.Pages
+{
+    public class IndexModel : PageModel
+    {
+        public void OnGet()
+        {
+
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml b/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml
new file mode 100644
index 0000000000..694a3223d1
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimplePages</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-page="/Index" class="navbar-brand">SimplePages</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-page="/Index">Home</a></li>
+                    <li><a asp-page="/About">About</a></li>
+                    <li><a asp-page="/Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimplePages</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml b/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..6686959c4a
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using SimplePages
+@namespace SimplePages.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimplePages/Pages/_ViewStart.cshtml b/src/Razor/test/testassets/SimplePages/Pages/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Pages/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/SimplePages/Program.cs b/src/Razor/test/testassets/SimplePages/Program.cs
new file mode 100644
index 0000000000..16c6459a55
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/Program.cs
@@ -0,0 +1,10 @@
+
+namespace SimplePages
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
new file mode 100644
index 0000000000..23f9ef1c2e
--- /dev/null
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+  
+</Project>
diff --git a/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs b/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
new file mode 100644
index 0000000000..029530c471
--- /dev/null
+++ b/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
@@ -0,0 +1,66 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
+{
+    internal class RazorDiagnosticJsonConverter : JsonConverter
+    {
+        public static readonly RazorDiagnosticJsonConverter Instance = new RazorDiagnosticJsonConverter();
+        private const string RazorDiagnosticMessageKey = "Message";
+
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(RazorDiagnostic).IsAssignableFrom(objectType);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType != JsonToken.StartObject)
+            {
+                return null;
+            }
+
+            var diagnostic = JObject.Load(reader);
+            var span = diagnostic[nameof(RazorDiagnostic.Span)].Value<JObject>();
+            var absoluteIndex = span[nameof(SourceSpan.AbsoluteIndex)].Value<int>();
+            var lineIndex = span[nameof(SourceSpan.LineIndex)].Value<int>();
+            var characterIndex = span[nameof(SourceSpan.CharacterIndex)].Value<int>();
+            var length = span[nameof(SourceSpan.Length)].Value<int>();
+            var filePath = span[nameof(SourceSpan.FilePath)].Value<string>();
+            var message = diagnostic[RazorDiagnosticMessageKey].Value<string>();
+            var id = diagnostic[nameof(RazorDiagnostic.Id)].Value<string>();
+            var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value<int>();
+
+            var descriptor = new RazorDiagnosticDescriptor(id, () => message, (RazorDiagnosticSeverity)severity);
+            var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length);
+
+            return RazorDiagnostic.Create(descriptor, sourceSpan);
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var diagnostic = (RazorDiagnostic)value;
+
+            writer.WriteStartObject();
+            WriteProperty(writer, nameof(RazorDiagnostic.Id), diagnostic.Id);
+            WriteProperty(writer, nameof(RazorDiagnostic.Severity), (int)diagnostic.Severity);
+            WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage());
+
+            writer.WritePropertyName(nameof(RazorDiagnostic.Span));
+            serializer.Serialize(writer, diagnostic.Span);
+
+            writer.WriteEndObject();
+        }
+
+        private void WriteProperty<T>(JsonWriter writer, string key, T value)
+        {
+            writer.WritePropertyName(key);
+            writer.WriteValue(value);
+        }
+    }
+}

From 7df54be754fa7717e4d5792d26091fb335def249 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 2 Dec 2018 00:25:55 +0000
Subject: [PATCH 002/337] Merged PR 304: Enable local builds with dotnet/Arcade

[WIP] Enable local builds with dotnet/Arcade
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/409618521f688ae106e0aa87a444445c4a672980
---
 ...ore.Mvc.Razor.Extensions.Version1_X.csproj |  1 +
 ...vc.Razor.Extensions.Version1_X.Test.csproj |  5 +-
 ...ore.Mvc.Razor.Extensions.Version2_X.csproj |  1 +
 ...vc.Razor.Extensions.Version2_X.Test.csproj |  5 +-
 ...spNetCore.Mvc.Razor.Extensions.Test.csproj |  5 +-
 .../src/Properties/AssemblyInfo.cs            |  2 +-
 .../Microsoft.AspNetCore.Razor.Tools.csproj   |  1 +
 ...crosoft.AspNetCore.Razor.Tools.Test.csproj |  3 -
 .../src/Properties/AssemblyInfo.cs            |  2 +-
 .../Microsoft.CodeAnalysis.Razor.Test.csproj  |  3 -
 .../src/Microsoft.NET.Sdk.Razor.csproj        | 17 +++---
 .../test/BuildVariables.cs.template           | 15 -----
 .../BuildServerIntegrationTest.cs             |  4 +-
 .../test/IntegrationTests/ProjectDirectory.cs | 30 ++++++++--
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  | 58 +++++++++++++++++--
 .../Language/TestProject.cs                   | 27 ++++++---
 .../TestCompilation.cs                        | 24 +++++++-
 .../AppWithP2PReference.csproj                |  2 +-
 .../ClassLibrary/ClassLibrary.csproj          |  2 +-
 .../ClassLibrary2/ClassLibrary2.csproj        |  2 +-
 .../test/testassets/Directory.Build.props     |  6 +-
 .../LargeProject/LargeProject.csproj          |  2 +-
 .../MvcWithComponents.csproj                  |  2 +-
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  2 +-
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  2 +-
 .../testassets/SimplePages/SimplePages.csproj |  2 +-
 26 files changed, 151 insertions(+), 74 deletions(-)
 delete mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
index 0d61d12b26..f949a8e8ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
     <EnableApiCheck>false</EnableApiCheck>
+    <IsShipping>false</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index 808b0f3eea..c6a894ee1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -22,10 +22,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -42,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.deps.json" />
+    <MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.deps.json" />
   </ItemGroup>
 
   <Target Name="CopyDepsFromShims" AfterTargets="Build">
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
index e77d4c3837..ce96dad3fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
@@ -4,6 +4,7 @@
     <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
+    <IsShipping>false</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
index 0fd06dcdfd..82d2483d0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -22,10 +22,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,7 +41,7 @@
 
   <Target Name="CopyDepsFromShims" AfterTargets="Build">
     <ItemGroup>
-      <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.deps.json" />
+      <MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.deps.json" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 86d975d404..35bf3f778c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -22,10 +22,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -43,7 +40,7 @@
 
   <Target Name="CopyDepsFromShims" AfterTargets="Build">
     <ItemGroup>
-      <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
+      <MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
index b749fc7ce3..4eb3dedaa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("RazorDeveloperTools, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
index a3ab14c41f..cec75baae8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -9,6 +9,7 @@
 
     <!-- This is not a package, it is part of Razor SDK. -->
     <IsPackable>false</IsPackable>
+    <IsShipping>false</IsShipping>
     <EnableApiCheck>false</EnableApiCheck>
 
     <!-- Don't produce rzc.exe -->
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
index 06aacff48d..48976ae144 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
@@ -12,10 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 2da745cbad..942ae946b0 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("RazorDeveloperTools, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
index d95d005405..fa77866791 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -22,10 +22,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 6f6d4be734..01d37b1b8d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -6,8 +6,11 @@
     <TargetName>Microsoft.NET.Sdk.Razor.Tasks</TargetName>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <Serviceable>true</Serviceable>
-    <SdkOutputPath>bin\$(Configuration)\sdk-output\</SdkOutputPath>
-    <!-- Do not disable ApiCheck. We need to be aware of when we make changes to the Tasks sicne they need to be backwards compatible. -->
+    <SdkOutputPath>$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\sdk-output\</SdkOutputPath>
+    <!-- Do not disable ApiCheck. We need to be aware of when we make changes to the Tasks since they need to be backwards compatible. -->
+
+    <!-- Allow assemblies outside of lib in the package -->
+    <NoWarn>$(NoWarn);NU5100</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,18 +41,18 @@
     <!-- Layout tasks, compiler, and extensions in the sdk-output folder. The entire folder structure gets packaged as-is into the SDK -->
     <MSBuild
       Projects="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj"
-      Properties="PublishDir=$(MSBuildProjectDirectory)\$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
+      Properties="PublishDir=$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
       Targets="Publish" />
 
     <ItemGroup>
-      <MvcRazorExtenionOutput Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
+      <MvcRazorExtenionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" />
 
     <ItemGroup>
-      <ProjectOutput Include="..\Microsoft.NET.Sdk.Razor\bin\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
-      <ProjectOutput Include="..\Microsoft.NET.Sdk.Razor\bin\$(Configuration)\netstandard2.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netstandard2.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" />
@@ -70,7 +73,7 @@
     <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
   </ItemGroup>
 
-  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="LayoutDependencies">
+  <Target Name="PopulateNuspec" AfterTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
 
     <PropertyGroup>
       <!-- Make sure we create a symbols.nupkg -->
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template
deleted file mode 100644
index 4b0b995bc6..0000000000
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs.template
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
-{
-    internal static partial class BuildVariables
-    {
-        static partial void InitializeVariables()
-        {
-            _msBuildPath = @"${MSBuildLocation}";
-            _microsoftNETCoreApp30PackageVersion = "${MicrosoftNETCoreApp30PackageVersion}";
-            _netStandardLibrary20PackageVersion = "${NETStandardLibrary20PackageVersion}";
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 30330b0a5f..cad1a57355 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
@@ -150,7 +151,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // when we don't explicitly specify a pipe name.
 
             // Publish rzc tool to a temporary path. This is the location based on which the pipe name is generated.
-            var solutionRoot = TestPathUtilities.GetSolutionRootDirectory("Razor");
+            var repositoryRoot = ProjectDirectory.SearchUp(AppContext.BaseDirectory, "global.json");
+            var solutionRoot = Path.Combine(repositoryRoot, "src", "Razor");
             var toolAssemblyDirectory = Path.Combine(solutionRoot, "src", "Microsoft.AspNetCore.Razor.Tools");
             var toolAssemblyPath = Path.Combine(toolAssemblyDirectory, "Microsoft.AspNetCore.Razor.Tools.csproj");
             var projectDirectory = new TestProjectDirectory(solutionRoot, toolAssemblyDirectory, toolAssemblyPath);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
index 3cdb16592a..6a73ab84cd 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
@@ -30,12 +30,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     throw new InvalidOperationException($"{destinationPath} should be empty");
                 }
 
-                var solutionRoot = TestPathUtilities.GetSolutionRootDirectory("Razor");
-                if (solutionRoot == null)
+                var repositoryRoot = SearchUp(AppContext.BaseDirectory, "global.json");
+                if (repositoryRoot == null)
                 {
-                    throw new InvalidOperationException("Could not find solution root.");
+                    throw new InvalidOperationException("Could not find repository root.");
                 }
 
+                var solutionRoot = Path.Combine(repositoryRoot, "src", "Razor");
                 var binariesRoot = Path.GetDirectoryName(typeof(ProjectDirectory).Assembly.Location);
 
                 foreach (var project in new string[] { originalProjectName, }.Concat(additionalProjects))
@@ -72,7 +73,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 var newProjectFilePath = Path.Combine(directoryPath, targetProjectName + extension);
                 File.Move(oldProjectFilePath, newProjectFilePath);
 
-                CopyGlobalJson(solutionRoot, destinationPath);
+                CopyGlobalJson(repositoryRoot, destinationPath);
 
                 return new ProjectDirectory(
                     destinationPath,
@@ -126,9 +127,9 @@ $@"<Project>
                     });
             }
 
-            void CopyGlobalJson(string solutionRoot, string projectRoot)
+            void CopyGlobalJson(string repositoryRoot, string projectRoot)
             {
-                var srcGlobalJson = Path.Combine(solutionRoot, "global.json");
+                var srcGlobalJson = Path.Combine(repositoryRoot, "global.json");
                 if (!File.Exists(srcGlobalJson))
                 {
                     throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests.");
@@ -183,5 +184,22 @@ $@"<Project>
                 }
             }
         }
+
+        public static string SearchUp(string baseDirectory, string fileName)
+        {
+            var directoryInfo = new DirectoryInfo(baseDirectory);
+            do
+            {
+                var fileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, fileName));
+                if (fileInfo.Exists)
+                {
+                    return fileInfo.DirectoryName;
+                }
+                directoryInfo = directoryInfo.Parent;
+            }
+            while (directoryInfo.Parent != null);
+
+            throw new Exception($"File {fileName} could not be found in {baseDirectory} or its parent directories.");
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 7cabd6927a..9aee6cab0f 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -13,7 +13,6 @@
     <!-- Copy references locally so that we can use them in the test. -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <BuildVariablesGeneratedFile>$(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs</BuildVariablesGeneratedFile>
-    <CompileDependsOn>EnsureBuildVariablesGeneratedFile;$(CompileDependsOn)</CompileDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,11 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
   <!-- The test projects rely on these binaries being available -->
@@ -47,8 +44,57 @@
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj" />
   </ItemGroup>
 
-  <Target Name="EnsureBuildVariablesGeneratedFile">
-    <Error Text="BuildVariables.generated.cs was not found. Run .\build /t:Prepare from the root of the repository to generate it." Condition="!Exists('$(BuildVariablesGeneratedFile)')" />
+  <PropertyGroup>
+    <MSBuildLocationFileOutput>$(IntermediateOutputPath)BuildVariables.generated.cs</MSBuildLocationFileOutput>
+  </PropertyGroup>
+
+  <Target 
+    Name="GenerateMSBuildLocationFile"
+    Condition="'$(TargetFramework)'!=''"
+    AfterTargets="BeforeBuild"
+    Inputs="$(MSBuildAllProjects)"
+    Outputs="$(MSBuildLocationFileOutput)">
+
+    <Exec
+      Condition="'$(OS)' == 'Windows_NT'"
+      Command='"$(NuGetPackageRoot)vswhere\$(VSWhereVersion)\tools\vswhere.exe" -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild'
+      ConsoleToMsBuild="true"
+      StandardErrorImportance="high">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_VSInstallDir" />
+    </Exec>
+    <Error Condition="'$(OS)' == 'Windows_NT' and '$(_VSInstallDir)'==''" Text="Visual Studio not found on Windows." />
+
+    <PropertyGroup>
+      <_DesktopMSBuildPath Condition="'$(OS)' == 'Windows_NT' and Exists('$(_VSInstallDir)\MSBuild\Current\Bin\msbuild.exe')">$(_VSInstallDir)\MSBuild\Current\Bin\msbuild.exe</_DesktopMSBuildPath>
+      <_DesktopMSBuildPath Condition="'$(OS)' == 'Windows_NT' and Exists('$(_VSInstallDir)\MSBuild\15.0\Bin\msbuild.exe')">$(_VSInstallDir)\MSBuild\15.0\Bin\msbuild.exe</_DesktopMSBuildPath>
+      <_Content><![CDATA[
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    internal static partial class BuildVariables
+    {
+        static partial void InitializeVariables()
+        {
+            _msBuildPath = @"$(_DesktopMSBuildPath)";
+            _microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
+            _netStandardLibrary20PackageVersion = "$(NETStandardLibrary20PackageVersion)";
+        }
+    }
+}
+]]>
+      </_Content>
+    </PropertyGroup>
+
+    <Error Condition="'$(OS)' == 'Windows_NT' and '$(_DesktopMSBuildPath)'==''" Text="MSBuild.exe not found on Windows." />
+
+    <MakeDir Directories="$(IntermediateOutputPath)" />
+    <WriteLinesToFile Lines="$([MSBuild]::Escape($(_Content)))" File="$(MSBuildLocationFileOutput)" Overwrite="True" WriteOnlyWhenDifferent="True" />
+    <ItemGroup>
+      <Compile Include="$(MSBuildLocationFileOutput)">
+        <Visible>false</Visible>
+      </Compile>
+      <FileWrites Include="$(MSBuildLocationFileOutput)" />
+    </ItemGroup>
+
   </Target>
 
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
index 4cc8d85d61..1f0d079cb9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -11,18 +10,32 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         public static string GetProjectDirectory(Type type)
         {
-            var solutionDir = TestPathUtilities.GetSolutionRootDirectory("Razor");
-
+            var repoRoot = SearchUp(AppContext.BaseDirectory, "global.json");
             var assemblyName = type.Assembly.GetName().Name;
-            var projectDirectory = Path.Combine(solutionDir, "test", assemblyName);
+            var projectDirectory = Path.Combine(repoRoot, "src", "Razor", "test", assemblyName);
             if (!Directory.Exists(projectDirectory))
             {
-                throw new InvalidOperationException(
-$@"Could not locate project directory for type {type.FullName}.
-Directory probe path: {projectDirectory}.");
+                throw new InvalidOperationException($@"Could not locate project directory for type {type.FullName}. Directory probe path: {projectDirectory}.");
             }
 
             return projectDirectory;
         }
+
+        private static string SearchUp(string baseDirectory, string fileName)
+        {
+            var directoryInfo = new DirectoryInfo(baseDirectory);
+            do
+            {
+                var fileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, fileName));
+                if (fileInfo.Exists)
+                {
+                    return fileInfo.DirectoryName;
+                }
+                directoryInfo = directoryInfo.Parent;
+            }
+            while (directoryInfo.Parent != null);
+
+            throw new Exception($"File {fileName} could not be found in {baseDirectory} or its parent directories.");
+        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
index ffa7fd66d4..a3ae5fbed3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
@@ -23,13 +23,35 @@ namespace Microsoft.CodeAnalysis
             var dependencyContext = DependencyContext.Load(assembly);
 
             var metadataReferences = dependencyContext.CompileLibraries
-                .SelectMany(l => l.ResolveReferencePaths())
+                .SelectMany(l => ResolvePaths(l))
                 .Select(assemblyPath => MetadataReference.CreateFromFile(assemblyPath))
                 .ToArray();
 
             return metadataReferences;
         }
 
+        private static IEnumerable<string> ResolvePaths(CompilationLibrary library)
+        {
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            for (var i = 0; i < assemblies.Length; i++)
+            {
+                if (assemblies[i].GetName().Name == library.Name)
+                {
+                    return new[] { assemblies[i].Location };
+                }
+            }
+
+            try
+            {
+                return library.ResolveReferencePaths();
+            }
+            catch (InvalidOperationException)
+            {
+            }
+
+            return Array.Empty<string>();
+        }
+
         public static string AssemblyName => "TestAssembly";
 
         public static CSharpCompilation Create(Assembly assembly, SyntaxTree syntaxTree = null)
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 10866769b7..5fe34308bc 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 717524a947..3325932c1e 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 2576345aa3..4337c0f72c 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 8020d32ee0..4c86b8bd41 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -6,10 +6,10 @@
     <SolutionRoot>$([MSBuild]::EnsureTrailingSlash('$(SolutionRoot)'))</SolutionRoot>
 
     <!-- Retarget tests to use the copy of the Sdk from source -->
-    <RazorSdkProjectDirectory>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\</RazorSdkProjectDirectory>
+    <RazorSdkArtifactsDirectory>$(SolutionRoot)..\..\artifacts\bin\Microsoft.NET.Sdk.Razor\</RazorSdkArtifactsDirectory>
 
-    <RazorSdkCurrentVersionProps>$(RazorSdkProjectDirectory)build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
-    <RazorSdkCurrentVersionTargets>$(RazorSdkProjectDirectory)build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
+    <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+    <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
   </PropertyGroup>
 
   <!-- Import solution dependencies.props when building in place -->
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 5f755a4dfd..0d61cb941b 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 660a620ff1..723b5fa1d1 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 925a8c7194..0b62bda87c 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 6f2c4cc5c1..3e409f1d78 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 23f9ef1c2e..304df87d0e 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>

From 6fa46903e2cc9ebc0ea43508941ccff73bf6e6b9 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 28 Nov 2018 12:32:14 -0800
Subject: [PATCH 003/337] Fix DevDiv 736427

When a user builds a 2.1 or 2.2 project with a 3.0 they can get an error
due to invalid command line options from rzc. What happens is that the
3.0 tasks (which are a singleton) are talking to the 2.X build tool
(which is NOT a singleton).

Recently some changes were make to the 3.0 tasks which caused this bug
because it did not properly accomodate downlevel versions of rzc. We
have an integration test for this scenario for but the regression was
not detected, so obviously something is wrong with the test setup. I'll
investigate that separately.

(cherry picked from commit dotnet/aspnetcore-tooling@1aace2b6c799108ee4b99e7a714b210e01732be5)
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d2654d0847cc90350d37dcb36ce0ffb4264519e0
---
 .../src/RazorGenerate.cs                      | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
index 61246c8484..07892cfa38 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         public ITaskItem[] Configuration { get; set; }
 
         [Required]
-        public ITaskItem[] Extensions { get;  set; }
+        public ITaskItem[] Extensions { get; set; }
 
         [Required]
         public ITaskItem[] Sources { get; set; }
@@ -90,6 +90,14 @@ namespace Microsoft.AspNetCore.Razor.Tasks
 
             builder.AppendLine(Command);
 
+            // We might be talking to a downlevel version of the command line tool, which doesn't
+            // understand certain parameters. Assume 2.1 if we can't parse the version because 2.1
+            // 2.2 are the releases that have command line tool delivered by a package.
+            if (!System.Version.TryParse(Version, out var parsedVersion))
+            {
+                parsedVersion = new System.Version(2, 1);
+            }
+
             for (var i = 0; i < Sources.Length; i++)
             {
                 var input = Sources[i];
@@ -103,11 +111,15 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 var outputPath = Path.Combine(ProjectRoot, input.GetMetadata(GeneratedOutput));
                 builder.AppendLine(outputPath);
 
-                var kind = input.GetMetadata(DocumentKind);
-                if (!string.IsNullOrEmpty(kind))
+                // Added in 3.0
+                if (parsedVersion.Major >= 3)
                 {
-                    builder.AppendLine("-k");
-                    builder.AppendLine(kind);
+                    var kind = input.GetMetadata(DocumentKind);
+                    if (!string.IsNullOrEmpty(kind))
+                    {
+                        builder.AppendLine("-k");
+                        builder.AppendLine(kind);
+                    }
                 }
             }
 
@@ -123,7 +135,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             builder.AppendLine("-c");
             builder.AppendLine(Configuration[0].GetMetadata(Identity));
 
-            if (GenerateDeclaration)
+            // Added in 3.0
+            if (parsedVersion.Major >= 3 && GenerateDeclaration)
             {
                 builder.AppendLine("--generate-declaration");
             }
@@ -152,4 +165,4 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             return true;
         }
     }
-}
+}
\ No newline at end of file

From 5bb16b1a14196f3d45f33fc6d490c0c8ec031e3e Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 20 Nov 2018 17:16:07 -0800
Subject: [PATCH 004/337] Refactored Html parser - part 1

(cherry picked from commit dotnet/aspnetcore-tooling@31f53d44b508bef7e3d25b70019dfb2ca64fd5b9)
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b154e53f06106cad9772d13dbe2ec1702b609b7f
---
 .../src/Legacy/DirectiveHtmlTokenizer.cs      |    7 +-
 .../src/Legacy/HtmlMarkupParser.Legacy.cs     | 1745 +++++++++++++
 .../src/Legacy/HtmlMarkupParser.cs            | 2258 +++++------------
 .../src/Legacy/ParserContext.cs               |    2 +
 .../src/Legacy/ParserHelpers.cs               |   21 +
 .../src/Legacy/ParserState.cs                 |   23 +
 .../src/Legacy/TokenizerBackedParser.cs       |   21 +-
 .../src/Syntax/SyntaxNodeExtensions.cs        |   23 +-
 8 files changed, 2408 insertions(+), 1692 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserState.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs
index 4921c8aa1e..7c69a1c3b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/DirectiveHtmlTokenizer.cs
@@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     internal class DirectiveHtmlTokenizer : HtmlTokenizer
     {
         private bool _visitedFirstTokenStart = false;
+        private SourceLocation _firstTokenVisitLocation = SourceLocation.Undefined;
 
         public DirectiveHtmlTokenizer(ITextDocument source) : base(source)
         {
@@ -16,10 +17,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         protected override StateResult Dispatch()
         {
+            var location = CurrentLocation;
             var result = base.Dispatch();
             if (result.Result != null && IsValidTokenType(result.Result.Kind))
             {
                 _visitedFirstTokenStart = true;
+                _firstTokenVisitLocation = location;
             }
 
             return result;
@@ -31,8 +34,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Debug.Assert(Buffer.Length == 0);
             StartToken();
 
-            if (EndOfFile || _visitedFirstTokenStart)
+            if (EndOfFile || (_visitedFirstTokenStart && _firstTokenVisitLocation != CurrentLocation))
             {
+                // We also need to make sure we are currently past the position where we found the first token.
+                // If the position is equal, that means the parser put the token back for later parsing.
                 return null;
             }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
new file mode 100644
index 0000000000..ac7b174c7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
@@ -0,0 +1,1745 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
+    {
+        private SourceLocation _lastTagStart = SourceLocation.Zero;
+        private SyntaxToken _bufferedOpenAngle;
+
+        private bool CaseSensitive { get; set; }
+
+        private StringComparison Comparison
+        {
+            get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; }
+        }
+
+        // Special tags include <!--, <!DOCTYPE, <![CDATA and <? tags
+        private bool AtSpecialTag
+        {
+            get
+            {
+                if (At(SyntaxKind.OpenAngle))
+                {
+                    if (NextIs(SyntaxKind.Bang))
+                    {
+                        return !IsBangEscape(lookahead: 1);
+                    }
+
+                    return NextIs(SyntaxKind.QuestionMark);
+                }
+
+                return false;
+            }
+        }
+
+        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind type)
+        {
+            SkipToAndParseCode(builder, token => token.Kind == type);
+        }
+
+        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, Func<SyntaxToken, bool> condition)
+        {
+            SyntaxToken last = null;
+            var startOfLine = false;
+            while (!EndOfFile && !condition(CurrentToken))
+            {
+                if (Context.NullGenerateWhitespaceAndNewLine)
+                {
+                    Context.NullGenerateWhitespaceAndNewLine = false;
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    AcceptWhile(token => token.Kind == SyntaxKind.Whitespace);
+                    if (At(SyntaxKind.NewLine))
+                    {
+                        AcceptAndMoveNext();
+                    }
+
+                    builder.Add(OutputAsMarkupEphemeralLiteral());
+                }
+                else if (At(SyntaxKind.NewLine))
+                {
+                    if (last != null)
+                    {
+                        Accept(last);
+                    }
+
+                    // Mark the start of a new line
+                    startOfLine = true;
+                    last = null;
+                    AcceptAndMoveNext();
+                }
+                else if (At(SyntaxKind.Transition))
+                {
+                    var transition = CurrentToken;
+                    NextToken();
+                    if (At(SyntaxKind.Transition))
+                    {
+                        if (last != null)
+                        {
+                            Accept(last);
+                            last = null;
+                        }
+                        builder.Add(OutputAsMarkupLiteral());
+                        Accept(transition);
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                        AcceptAndMoveNext();
+                        continue; // while
+                    }
+                    else
+                    {
+                        if (!EndOfFile)
+                        {
+                            PutCurrentBack();
+                        }
+                        PutBack(transition);
+                    }
+
+                    // Handle whitespace rewriting
+                    if (last != null)
+                    {
+                        if (!Context.DesignTimeMode && last.Kind == SyntaxKind.Whitespace && startOfLine)
+                        {
+                            // Put the whitespace back too
+                            startOfLine = false;
+                            PutBack(last);
+                            last = null;
+                        }
+                        else
+                        {
+                            // Accept last
+                            Accept(last);
+                            last = null;
+                        }
+                    }
+
+                    OtherParserBlock(builder);
+                }
+                else if (At(SyntaxKind.RazorCommentTransition))
+                {
+                    var shouldRenderWhitespace = true;
+                    if (last != null)
+                    {
+                        // Don't render the whitespace between the start of the line and the razor comment.
+                        if (startOfLine && last.Kind == SyntaxKind.Whitespace)
+                        {
+                            AcceptMarkerTokenIfNecessary();
+                            // Output the tokens that may have been accepted prior to the whitespace.
+                            builder.Add(OutputAsMarkupLiteral());
+
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            shouldRenderWhitespace = false;
+                        }
+
+                        Accept(last);
+                        last = null;
+                    }
+
+                    AcceptMarkerTokenIfNecessary();
+                    if (shouldRenderWhitespace)
+                    {
+                        builder.Add(OutputAsMarkupLiteral());
+                    }
+                    else
+                    {
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                    }
+
+                    var comment = ParseRazorComment();
+                    builder.Add(comment);
+
+                    // Handle the whitespace and newline at the end of a razor comment.
+                    if (startOfLine &&
+                        (At(SyntaxKind.NewLine) ||
+                        (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine))))
+                    {
+                        AcceptWhile(IsSpacingToken(includeNewLines: false));
+                        AcceptAndMoveNext();
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                    }
+                }
+                else
+                {
+                    // As long as we see whitespace, we're still at the "start" of the line
+                    startOfLine &= At(SyntaxKind.Whitespace);
+
+                    // If there's a last token, accept it
+                    if (last != null)
+                    {
+                        Accept(last);
+                        last = null;
+                    }
+
+                    // Advance
+                    last = CurrentToken;
+                    NextToken();
+                }
+            }
+
+            if (last != null)
+            {
+                Accept(last);
+            }
+        }
+
+        /// <summary>
+        /// Reads the content of a tag (if present) in the MarkupDocument (or MarkupSection) context,
+        /// where we don't care about maintaining a stack of tags.
+        /// </summary>
+        private void ParseTagInDocumentContext(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (At(SyntaxKind.OpenAngle))
+            {
+                if (NextIs(SyntaxKind.Bang))
+                {
+                    // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
+                    if (!IsBangEscape(lookahead: 1))
+                    {
+                        if (Lookahead(2)?.Kind == SyntaxKind.DoubleHyphen)
+                        {
+                            builder.Add(OutputAsMarkupLiteral());
+                        }
+
+                        AcceptAndMoveNext(); // Accept '<'
+                        ParseBangTag(builder);
+
+                        return;
+                    }
+
+                    // We should behave like a normal tag that has a parser escape, fall through to the normal
+                    // tag logic.
+                }
+                else if (NextIs(SyntaxKind.QuestionMark))
+                {
+                    AcceptAndMoveNext(); // Accept '<'
+                    TryParseXmlPI(builder);
+                    return;
+                }
+
+                builder.Add(OutputAsMarkupLiteral());
+
+                // Start tag block
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var tagBuilder = pooledResult.Builder;
+                    AcceptAndMoveNext(); // Accept '<'
+
+                    if (!At(SyntaxKind.ForwardSlash))
+                    {
+                        TryParseBangEscape(tagBuilder);
+
+                        // Parsing a start tag
+                        var scriptTag = At(SyntaxKind.Text) &&
+                                        string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
+                        TryAccept(SyntaxKind.Text);
+                        LegacyParseTagContent(tagBuilder); // Parse the tag, don't care about the content
+                        TryAccept(SyntaxKind.ForwardSlash);
+                        TryAccept(SyntaxKind.CloseAngle);
+
+                        // If the script tag expects javascript content then we should do minimal parsing until we reach
+                        // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
+                        if (scriptTag && !CurrentScriptTagExpectsHtml(tagBuilder))
+                        {
+                            tagBuilder.Add(OutputAsMarkupLiteral());
+                            var block = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                            builder.Add(block);
+
+                            SkipToEndScriptAndParseCode(builder);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        // Parsing an end tag
+                        // This section can accept things like: '</p  >' or '</p>' etc.
+                        TryAccept(SyntaxKind.ForwardSlash);
+
+                        // Whitespace here is invalid (according to the spec)
+                        TryParseBangEscape(tagBuilder);
+                        TryAccept(SyntaxKind.Text);
+                        TryAccept(SyntaxKind.Whitespace);
+                        TryAccept(SyntaxKind.CloseAngle);
+                    }
+
+                    tagBuilder.Add(OutputAsMarkupLiteral());
+
+                    // End tag block
+                    var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                    builder.Add(tagBlock);
+                }
+            }
+        }
+
+        private void LegacyParseTagContent(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
+            {
+                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
+                RecoverToEndOfTag(builder);
+            }
+            else
+            {
+                // We are here ($): <tag$ foo="bar" biz="~/Baz" />
+                while (!EndOfFile && !IsEndOfTag())
+                {
+                    BeforeAttribute(builder);
+                }
+            }
+        }
+
+        private bool IsEndOfTag()
+        {
+            if (At(SyntaxKind.ForwardSlash))
+            {
+                if (NextIs(SyntaxKind.CloseAngle))
+                {
+                    return true;
+                }
+                else
+                {
+                    AcceptAndMoveNext();
+                }
+            }
+            return At(SyntaxKind.CloseAngle) || At(SyntaxKind.OpenAngle);
+        }
+
+        private void BeforeAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
+            // Capture whitespace
+            var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
+            {
+                // Transition outside of attribute value => Switch to recovery mode
+                Accept(whitespace);
+                RecoverToEndOfTag(builder);
+                return;
+            }
+
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
+            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
+            var nameTokens = Enumerable.Empty<SyntaxToken>();
+            var whitespaceAfterAttributeName = Enumerable.Empty<SyntaxToken>();
+            if (IsValidAttributeNameToken(CurrentToken))
+            {
+                nameTokens = ReadWhile(token =>
+                                 token.Kind != SyntaxKind.Whitespace &&
+                                 token.Kind != SyntaxKind.NewLine &&
+                                 token.Kind != SyntaxKind.Equals &&
+                                 token.Kind != SyntaxKind.CloseAngle &&
+                                 token.Kind != SyntaxKind.OpenAngle &&
+                                 (token.Kind != SyntaxKind.ForwardSlash || !NextIs(SyntaxKind.CloseAngle)));
+
+                // capture whitespace after attribute name (if any)
+                whitespaceAfterAttributeName = ReadWhile(
+                    token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            }
+            else
+            {
+                // Unexpected character in tag, enter recovery
+                Accept(whitespace);
+                RecoverToEndOfTag(builder);
+                return;
+            }
+
+            if (!At(SyntaxKind.Equals))
+            {
+                // Minimized attribute
+
+                // We are at the prefix of the next attribute or the end of tag. Put it back so it is parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterAttributeName);
+
+                // Output anything prior to the attribute, in most cases this will be the tag name:
+                // |<input| checked />. If in-between other attributes this will noop or output malformed attribute
+                // content (if the previous attribute was malformed).
+                builder.Add(OutputAsMarkupLiteral());
+
+                Accept(whitespace);
+                var namePrefix = OutputAsMarkupLiteral();
+                Accept(nameTokens);
+                var name = OutputAsMarkupLiteral();
+
+                var minimizedAttributeBlock = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+                builder.Add(minimizedAttributeBlock);
+
+                return;
+            }
+
+            // Not a minimized attribute, parse as if it were well-formed (if attribute turns out to be malformed we
+            // will go into recovery).
+            builder.Add(OutputAsMarkupLiteral());
+
+            var attributeBlock = ParseAttributePrefix(whitespace, nameTokens, whitespaceAfterAttributeName);
+
+            builder.Add(attributeBlock);
+        }
+
+        private MarkupAttributeBlockSyntax ParseAttributePrefix(
+            IEnumerable<SyntaxToken> whitespace,
+            IEnumerable<SyntaxToken> nameTokens,
+            IEnumerable<SyntaxToken> whitespaceAfterAttributeName)
+        {
+            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
+            var nameContent = string.Concat(nameTokens.Select(s => s.Content));
+            var attributeCanBeConditional =
+                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
+                !nameContent.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
+
+            // Accept the whitespace and name
+            Accept(whitespace);
+            var namePrefix = OutputAsMarkupLiteral();
+            Accept(nameTokens);
+            var name = OutputAsMarkupLiteral();
+
+            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
+            Accept(whitespaceAfterAttributeName);
+            var nameSuffix = OutputAsMarkupLiteral();
+            Assert(SyntaxKind.Equals); // We should be at "="
+            var equalsToken = EatCurrentToken();
+
+            var whitespaceAfterEquals = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            var quote = SyntaxKind.Marker;
+            if (At(SyntaxKind.SingleQuote) || At(SyntaxKind.DoubleQuote))
+            {
+                // Found a quote, the whitespace belongs to this attribute.
+                Accept(whitespaceAfterEquals);
+                quote = CurrentToken.Kind;
+                AcceptAndMoveNext();
+            }
+            else if (whitespaceAfterEquals.Any())
+            {
+                // No quotes found after the whitespace. Put it back so that it can be parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterEquals);
+            }
+
+            MarkupTextLiteralSyntax valuePrefix = null;
+            RazorBlockSyntax attributeValue = null;
+            MarkupTextLiteralSyntax valueSuffix = null;
+
+            if (attributeCanBeConditional)
+            {
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
+
+                // We now have the value prefix which is usually whitespace and/or a quote
+                valuePrefix = OutputAsMarkupLiteral();
+
+                // Read the attribute value only if the value is quoted
+                // or if there is no whitespace between '=' and the unquoted value.
+                if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+                {
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var attributeValueBuilder = pooledResult.Builder;
+                        // Read the attribute value.
+                        while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
+                        {
+                            ParseAttributeValue(attributeValueBuilder, quote);
+                        }
+
+                        if (attributeValueBuilder.Count > 0)
+                        {
+                            attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+                        }
+                    }
+                }
+
+                // Capture the suffix
+                if (quote != SyntaxKind.Marker && At(quote))
+                {
+                    AcceptAndMoveNext();
+                    // Again, block chunk generator will render the suffix
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+            {
+                valuePrefix = OutputAsMarkupLiteral();
+
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var attributeValueBuilder = pooledResult.Builder;
+                    // Not a "conditional" attribute, so just read the value
+                    SkipToAndParseCode(attributeValueBuilder, token => IsEndOfAttributeValue(quote, token));
+
+                    // Output already accepted tokens if any as markup literal
+                    var literalValue = OutputAsMarkupLiteral();
+                    attributeValueBuilder.Add(literalValue);
+
+                    // Capture the attribute value (will include everything in-between the attribute's quotes).
+                    attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+                }
+
+                if (quote != SyntaxKind.Marker)
+                {
+                    TryAccept(quote);
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else
+            {
+                // There is no quote and there is whitespace after equals. There is no attribute value.
+            }
+
+            return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, attributeValue, valueSuffix);
+        }
+
+        private void ParseAttributeValue(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind quote)
+        {
+            var prefixStart = CurrentStart;
+            var prefixTokens = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition))
+            {
+                if (NextIs(SyntaxKind.Transition))
+                {
+                    // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it.
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var markupBuilder = pooledResult.Builder;
+                        Accept(prefixTokens);
+
+                        // Render a single "@" in place of "@@".
+                        SpanContext.ChunkGenerator = new LiteralAttributeChunkGenerator(
+                            new LocationTagged<string>(string.Concat(prefixTokens.Select(s => s.Content)), prefixStart),
+                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupLiteral());
+
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupEphemeralLiteral());
+
+                        var markupBlock = SyntaxFactory.MarkupBlock(markupBuilder.ToList());
+                        builder.Add(markupBlock);
+                    }
+                }
+                else
+                {
+                    Accept(prefixTokens);
+                    var valueStart = CurrentStart;
+                    PutCurrentBack();
+
+                    var prefix = OutputAsMarkupLiteral();
+
+                    // Dynamic value, start a new block and set the chunk generator
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var dynamicAttributeValueBuilder = pooledResult.Builder;
+
+                        OtherParserBlock(dynamicAttributeValueBuilder);
+                        var value = SyntaxFactory.MarkupDynamicAttributeValue(prefix, SyntaxFactory.GenericBlock(dynamicAttributeValueBuilder.ToList()));
+                        builder.Add(value);
+                    }
+                }
+            }
+            else
+            {
+                Accept(prefixTokens);
+                var prefix = OutputAsMarkupLiteral();
+
+                // Literal value
+                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
+                // "Unknown" type.
+                var valueTokens = ReadWhile(token =>
+                    // These three conditions find separators which break the attribute value into portions
+                    token.Kind != SyntaxKind.Whitespace &&
+                    token.Kind != SyntaxKind.NewLine &&
+                    token.Kind != SyntaxKind.Transition &&
+                    // This condition checks for the end of the attribute value (it repeats some of the checks above
+                    // but for now that's ok)
+                    !IsEndOfAttributeValue(quote, token));
+                Accept(valueTokens);
+                var value = OutputAsMarkupLiteral();
+
+                var literalAttributeValue = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+                builder.Add(literalAttributeValue);
+            }
+        }
+
+        private void RecoverToEndOfTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Accept until ">", "/" or "<", but parse code
+            while (!EndOfFile)
+            {
+                SkipToAndParseCode(builder, IsTagRecoveryStopPoint);
+                if (!EndOfFile)
+                {
+                    EnsureCurrent();
+                    switch (CurrentToken.Kind)
+                    {
+                        case SyntaxKind.SingleQuote:
+                        case SyntaxKind.DoubleQuote:
+                            ParseQuoted(builder);
+                            break;
+                        case SyntaxKind.OpenAngle:
+                        // Another "<" means this tag is invalid.
+                        case SyntaxKind.ForwardSlash:
+                        // Empty tag
+                        case SyntaxKind.CloseAngle:
+                            // End of tag
+                            return;
+                        default:
+                            AcceptAndMoveNext();
+                            break;
+                    }
+                }
+            }
+        }
+
+        private bool IsTagRecoveryStopPoint(SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.ForwardSlash ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.DoubleQuote;
+        }
+
+        private bool IsEndOfAttributeValue(SyntaxKind quote, SyntaxToken token)
+        {
+            return EndOfFile || token == null ||
+                   (quote != SyntaxKind.Marker
+                        ? token.Kind == quote // If quoted, just wait for the quote
+                        : IsUnquotedEndOfAttributeValue(token));
+        }
+
+        private bool IsUnquotedEndOfAttributeValue(SyntaxToken token)
+        {
+            // If unquoted, we have a larger set of terminating characters:
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
+            // Also we need to detect "/" and ">"
+            return token.Kind == SyntaxKind.DoubleQuote ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.Equals ||
+                   (token.Kind == SyntaxKind.ForwardSlash && NextIs(SyntaxKind.CloseAngle)) ||
+                   token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.Whitespace ||
+                   token.Kind == SyntaxKind.NewLine;
+        }
+
+        private void ParseQuoted(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            var type = CurrentToken.Kind;
+            AcceptAndMoveNext();
+            SkipToAndParseCode(builder, type);
+            if (!EndOfFile)
+            {
+                Assert(type);
+                AcceptAndMoveNext();
+            }
+        }
+
+        private bool ParseBangTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Accept "!"
+            Assert(SyntaxKind.Bang);
+
+            if (AcceptAndMoveNext())
+            {
+                if (LegacyIsHtmlCommentAhead())
+                {
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var htmlCommentBuilder = pooledResult.Builder;
+
+                        // Accept the double-hyphen token at the beginning of the comment block.
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                        while (!EndOfFile)
+                        {
+                            SkipToAndParseCode(htmlCommentBuilder, SyntaxKind.DoubleHyphen);
+                            var lastDoubleHyphen = AcceptAllButLastDoubleHyphens();
+
+                            if (At(SyntaxKind.CloseAngle))
+                            {
+                                // Output the content in the comment block as a separate markup
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+
+                                // This is the end of a comment block
+                                Accept(lastDoubleHyphen);
+                                AcceptAndMoveNext();
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+                                var commentBlock = SyntaxFactory.MarkupCommentBlock(htmlCommentBuilder.ToList());
+                                builder.Add(commentBlock);
+                                return true;
+                            }
+                            else if (lastDoubleHyphen != null)
+                            {
+                                Accept(lastDoubleHyphen);
+                            }
+                        }
+                    }
+                }
+                else if (CurrentToken.Kind == SyntaxKind.LeftBracket)
+                {
+                    if (AcceptAndMoveNext())
+                    {
+                        return TryParseCData(builder);
+                    }
+                }
+                else
+                {
+                    AcceptAndMoveNext();
+                    return LegacyAcceptTokenUntilAll(builder, SyntaxKind.CloseAngle);
+                }
+            }
+
+            return false;
+        }
+
+        protected bool LegacyIsHtmlCommentAhead()
+        {
+            // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
+
+            // Comments must have the following format:
+            // 1. The string "<!--"
+            // 2. Optionally, text, with the additional restriction that the text
+            //      2.1 must not start with the string ">" nor start with the string "->"
+            //      2.2 nor contain the strings
+            //          2.2.1 "<!--"
+            //          2.2.2 "-->" As we will be treating this as a comment ending, there is no need to handle this case at all.
+            //          2.2.3 "--!>"
+            //      2.3 nor end with the string "<!-".
+            // 3. The string "-->"
+
+            if (CurrentToken.Kind != SyntaxKind.DoubleHyphen)
+            {
+                return false;
+            }
+
+            // Check condition 2.1
+            if (NextIs(SyntaxKind.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(SyntaxKind.CloseAngle)))
+            {
+                return false;
+            }
+
+            // Check condition 2.2
+            var isValidComment = false;
+            LookaheadUntil((token, prevTokens) =>
+            {
+                if (token.Kind == SyntaxKind.DoubleHyphen)
+                {
+                    if (NextIs(SyntaxKind.CloseAngle))
+                    {
+                        // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
+                        isValidComment = !IsCommentContentEndingInvalid(prevTokens);
+                        return true;
+                    }
+                    else if (NextIs(ns => IsHyphen(ns) && NextIs(SyntaxKind.CloseAngle)))
+                    {
+                        // Check condition 2.3: we're at the end of a comment, which has an extra dash.
+                        // Need to treat the dash as part of the content and check the ending.
+                        // However, that case would have already been checked as part of check from 2.2.1 which
+                        // would already fail this iteration and we wouldn't get here
+                        isValidComment = true;
+                        return true;
+                    }
+                    else if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.CloseAngle)))
+                    {
+                        // This is condition 2.2.3
+                        isValidComment = false;
+                        return true;
+                    }
+                }
+                else if (token.Kind == SyntaxKind.OpenAngle)
+                {
+                    // Checking condition 2.2.1
+                    if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.DoubleHyphen)))
+                    {
+                        isValidComment = false;
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+
+            return isValidComment;
+        }
+
+        private bool TryParseCData(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
+            {
+                if (AcceptAndMoveNext())
+                {
+                    if (CurrentToken.Kind == SyntaxKind.LeftBracket)
+                    {
+                        return LegacyAcceptTokenUntilAll(builder, SyntaxKind.RightBracket, SyntaxKind.RightBracket, SyntaxKind.CloseAngle);
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private bool TryParseXmlPI(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Accept "?"
+            Assert(SyntaxKind.QuestionMark);
+            AcceptAndMoveNext();
+            return LegacyAcceptTokenUntilAll(builder, SyntaxKind.QuestionMark, SyntaxKind.CloseAngle);
+        }
+
+        private void SkipToEndScriptAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
+        {
+            // Special case for <script>: Skip to end of script tag and parse code
+            var seenEndScript = false;
+
+            while (!seenEndScript && !EndOfFile)
+            {
+                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+                var tagStart = CurrentStart;
+
+                if (NextIs(SyntaxKind.ForwardSlash))
+                {
+                    var openAngle = CurrentToken;
+                    NextToken(); // Skip over '<', current is '/'
+                    var solidus = CurrentToken;
+                    NextToken(); // Skip over '/', current should be text
+
+                    if (At(SyntaxKind.Text) &&
+                        string.Equals(CurrentToken.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        seenEndScript = true;
+                    }
+
+                    // We put everything back because we just wanted to look ahead to see if the current end tag that we're parsing is
+                    // the script tag.  If so we'll generate correct code to encompass it.
+                    PutCurrentBack(); // Put back whatever was after the solidus
+                    PutBack(solidus); // Put back '/'
+                    PutBack(openAngle); // Put back '<'
+
+                    // We just looked ahead, this NextToken will set CurrentToken to an open angle bracket.
+                    NextToken();
+                }
+
+                if (seenEndScript)
+                {
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var tagBuilder = pooledResult.Builder;
+                        SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+
+                        AcceptAndMoveNext(); // '<'
+                        AcceptAndMoveNext(); // '/'
+                        SkipToAndParseCode(tagBuilder, SyntaxKind.CloseAngle);
+                        if (!TryAccept(SyntaxKind.CloseAngle))
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                                    new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
+                                    ScriptTagName));
+                            var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+                            Accept(closeAngle);
+                        }
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+                    }
+                }
+                else
+                {
+                    AcceptAndMoveNext(); // Accept '<' (not the closing script tag's open angle)
+                }
+            }
+        }
+
+        private bool CurrentScriptTagExpectsHtml(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Debug.Assert(!builder.IsNull);
+
+            MarkupAttributeBlockSyntax typeAttribute = null;
+            for (var i = 0; i < builder.Count; i++)
+            {
+                var node = builder[i];
+                if (node.IsToken || node.IsTrivia)
+                {
+                    continue;
+                }
+
+                if (node is MarkupAttributeBlockSyntax attributeBlock &&
+                    attributeBlock.Value.Children.Count > 0 &&
+                    IsTypeAttribute(attributeBlock))
+                {
+                    typeAttribute = attributeBlock;
+                    break;
+                }
+            }
+
+            if (typeAttribute != null)
+            {
+                var contentValues = typeAttribute.Value.CreateRed().DescendantNodes().Where(n => n.IsToken).Cast<Syntax.SyntaxToken>();
+
+                var scriptType = string.Concat(contentValues.Select(t => t.Content)).Trim();
+
+                // Does not allow charset parameter (or any other parameters).
+                return string.Equals(scriptType, "text/html", StringComparison.OrdinalIgnoreCase);
+            }
+
+            return false;
+        }
+
+        private bool LegacyAcceptTokenUntilAll(in SyntaxListBuilder<RazorSyntaxNode> builder, params SyntaxKind[] endSequence)
+        {
+            while (!EndOfFile)
+            {
+                SkipToAndParseCode(builder, endSequence[0]);
+                if (AcceptAll(endSequence))
+                {
+                    return true;
+                }
+            }
+            Debug.Assert(EndOfFile);
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            return false;
+        }
+
+        public MarkupBlockSyntax ParseBlock()
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+                if (!NextToken())
+                {
+                    return null;
+                }
+
+                AcceptWhile(IsSpacingToken(includeNewLines: true));
+
+                if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+                {
+                    // "<" => Implicit Tag Block
+                    ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+                }
+                else if (CurrentToken.Kind == SyntaxKind.Transition)
+                {
+                    // "@" => Explicit Tag/Single Line Block OR Template
+
+                    // Output whitespace
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    // Definitely have a transition span
+                    Assert(SyntaxKind.Transition);
+                    AcceptAndMoveNext();
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+                    builder.Add(transition);
+                    if (At(SyntaxKind.Transition))
+                    {
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                    }
+                    ParseAfterTransition(builder);
+                }
+                else
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
+                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                }
+                builder.Add(OutputAsMarkupLiteral());
+
+                var markupBlock = builder.ToList();
+
+                return SyntaxFactory.MarkupBlock(markupBlock);
+            }
+        }
+
+        private void ParseAfterTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // "@:" => Explicit Single Line Block
+            if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
+            {
+                // Split the token
+                var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
+
+                // The first part (left) is added to this span and we return a MetaCode span
+                Accept(split.Item1);
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                if (split.Item2 != null)
+                {
+                    Accept(split.Item2);
+                }
+                NextToken();
+                ParseSingleLineMarkup(builder);
+            }
+            else if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+            {
+                ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+            }
+        }
+
+        private void ParseSingleLineMarkup(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Parse until a newline, it's that simple!
+            // First, signal to code parser that whitespace is significant to us.
+            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
+            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
+            SpanContext.EditHandler = new SpanEditHandler(Language.TokenizeString);
+            SkipToAndParseCode(builder, SyntaxKind.NewLine);
+            if (!EndOfFile && CurrentToken.Kind == SyntaxKind.NewLine)
+            {
+                AcceptAndMoveNext();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            PutCurrentBack();
+            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
+        private void ParseTagBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            // TODO: This is really ugly and needs to be cleaned up.
+
+            // Skip Whitespace and Text
+            var completeTag = false;
+            var blockAlreadyBuilt = false;
+            do
+            {
+                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+
+                // Output everything prior to the OpenAngle into a markup span
+                builder.Add(OutputAsMarkupLiteral());
+
+                var tagBuilder = builder;
+                IDisposable tagBuilderDisposable = null;
+                try
+                {
+                    if (EndOfFile)
+                    {
+                        // Do not want to start a new tag block if we're at the end of the file.
+                        EndTagBlock(builder, tags, complete: true);
+                    }
+                    else
+                    {
+                        var atSpecialTag = AtSpecialTag;
+                        if (!atSpecialTag)
+                        {
+                            // Start a tag block.  This is used to wrap things like <p> or <a class="btn"> etc.
+                            var pooledResult = Pool.Allocate<RazorSyntaxNode>();
+                            tagBuilderDisposable = pooledResult;
+                            tagBuilder = pooledResult.Builder;
+                        }
+                        _bufferedOpenAngle = null;
+                        _lastTagStart = CurrentStart;
+                        Assert(SyntaxKind.OpenAngle);
+                        _bufferedOpenAngle = CurrentToken;
+                        var tagStart = CurrentStart;
+                        if (!NextToken())
+                        {
+                            Accept(_bufferedOpenAngle);
+                            EndTagBlock(tagBuilder, tags, complete: false);
+                        }
+                        else if (atSpecialTag && At(SyntaxKind.Bang))
+                        {
+                            Accept(_bufferedOpenAngle);
+                            completeTag = ParseBangTag(builder);
+                            blockAlreadyBuilt = completeTag;
+                        }
+                        else
+                        {
+                            var result = ParseAfterTagStart(tagBuilder, builder, tagStart, tags);
+                            completeTag = result.Item1;
+                            blockAlreadyBuilt = result.Item2;
+                        }
+                    }
+
+                    if (completeTag)
+                    {
+                        // Completed tags have no accepted characters inside of blocks.
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    }
+
+                    if (blockAlreadyBuilt)
+                    {
+                        // Output the contents of the tag into its own markup span.
+                        builder.Add(OutputAsMarkupLiteral());
+                    }
+                    else if (tagBuilderDisposable != null)
+                    {
+                        // A new tag block was started. Build it.
+                        // Output the contents of the tag into its own markup span.
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                        builder.Add(tagBlock);
+                    }
+                }
+                finally
+                {
+                    // Will be null if we were at end of file or special tag when initially created.
+                    if (tagBuilderDisposable != null)
+                    {
+                        // End tag block
+                        tagBuilderDisposable.Dispose();
+                    }
+                }
+            }
+            while (tags.Count > 0);
+
+            EndTagBlock(builder, tags, completeTag);
+        }
+
+        private Tuple<bool, bool> ParseAfterTagStart(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SourceLocation tagStart,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            var blockAlreadyBuilt = false;
+            if (!EndOfFile)
+            {
+                switch (CurrentToken.Kind)
+                {
+                    case SyntaxKind.ForwardSlash:
+                        // End Tag
+                        return ParseEndTag(builder, parentBuilder, tagStart, tags);
+                    case SyntaxKind.QuestionMark:
+                        // XML PI
+                        Accept(_bufferedOpenAngle);
+                        var complete = TryParseXmlPI(builder);
+                        // No block is created for Xml PI. So return the same value as complete.
+                        blockAlreadyBuilt = complete;
+                        return Tuple.Create(complete, blockAlreadyBuilt);
+                    default:
+                        // Start Tag
+                        return ParseStartTag(builder, parentBuilder, tags);
+                }
+            }
+            if (tags.Count == 0)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_OuterTagMissingName(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
+            }
+
+            return Tuple.Create(false, blockAlreadyBuilt);
+        }
+
+        private Tuple<bool, bool> ParseStartTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            SyntaxToken bangToken = null;
+            SyntaxToken potentialTagNameToken;
+
+            if (At(SyntaxKind.Bang))
+            {
+                bangToken = CurrentToken;
+
+                potentialTagNameToken = Lookahead(count: 1);
+            }
+            else
+            {
+                potentialTagNameToken = CurrentToken;
+            }
+
+            SyntaxToken tagName;
+
+            if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.Text)
+            {
+                tagName = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+            }
+            else if (bangToken != null)
+            {
+                tagName = SyntaxFactory.Token(SyntaxKind.Text, "!" + potentialTagNameToken.Content);
+            }
+            else
+            {
+                tagName = potentialTagNameToken;
+            }
+
+            var tag = Tuple.Create(tagName, _lastTagStart);
+
+            if (tags.Count == 0 &&
+                // Note tagName may contain a '!' escape character. This ensures <!text> doesn't match here.
+                // <!text> tags are treated like any other escaped HTML start tag.
+                string.Equals(tag.Item1.Content, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+            {
+                builder.Add(OutputAsMarkupLiteral());
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+                Accept(_bufferedOpenAngle);
+                var textLocation = CurrentStart;
+                Assert(SyntaxKind.Text);
+
+                AcceptAndMoveNext();
+
+                var bookmark = CurrentStart.AbsoluteIndex;
+                var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+                var empty = At(SyntaxKind.ForwardSlash);
+                if (empty)
+                {
+                    Accept(tokens);
+                    Assert(SyntaxKind.ForwardSlash);
+                    AcceptAndMoveNext();
+                    bookmark = CurrentStart.AbsoluteIndex;
+                    tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+                }
+
+                if (!TryAccept(SyntaxKind.CloseAngle))
+                {
+                    Context.Source.Position = bookmark;
+                    NextToken();
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                    RecoverTextTag();
+                }
+                else
+                {
+                    Accept(tokens);
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+
+                if (!empty)
+                {
+                    tags.Push(tag);
+                }
+
+                var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+                builder.Add(transition);
+                var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                parentBuilder.Add(tagBlock);
+
+                return Tuple.Create(true, true);
+            }
+
+            Accept(_bufferedOpenAngle);
+            TryParseBangEscape(builder);
+            TryAccept(SyntaxKind.Text);
+            return ParseRestOfTag(builder, parentBuilder, tag, tags);
+        }
+
+        private Tuple<bool, bool> ParseRestOfTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            Tuple<SyntaxToken, SourceLocation> tag,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            var blockAlreadyBuilt = false;
+            LegacyParseTagContent(builder);
+
+            // We are now at a possible end of the tag
+            // Found '<', so we just abort this tag.
+            if (At(SyntaxKind.OpenAngle))
+            {
+                return Tuple.Create(false, blockAlreadyBuilt);
+            }
+
+            var isEmpty = At(SyntaxKind.ForwardSlash);
+            // Found a solidus, so don't accept it but DON'T push the tag to the stack
+            if (isEmpty)
+            {
+                AcceptAndMoveNext();
+            }
+
+            // Check for the '>' to determine if the tag is finished
+            var seenClose = TryAccept(SyntaxKind.CloseAngle);
+            if (!seenClose)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(tag.Item2, "<"),
+                            Math.Max(tag.Item1.Content.Length, 1)),
+                        tag.Item1.Content));
+            }
+            else
+            {
+                if (!isEmpty)
+                {
+                    // Is this a void element?
+                    var tagName = tag.Item1.Content.Trim();
+                    if (ParserHelpers.VoidElements.Contains(tagName))
+                    {
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        builder.Add(OutputAsMarkupLiteral());
+                        var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                        parentBuilder.Add(tagBlock);
+                        blockAlreadyBuilt = true;
+
+                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
+                        // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it
+                        // Place a bookmark
+                        var bookmark = CurrentStart.AbsoluteIndex;
+
+                        // Skip whitespace
+                        var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
+
+                        // Open Angle
+                        if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
+                        {
+                            var openAngle = CurrentToken;
+                            NextToken();
+                            Assert(SyntaxKind.ForwardSlash);
+                            var solidus = CurrentToken;
+                            NextToken();
+                            if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
+                            {
+                                // Accept up to here
+                                Accept(whiteSpace);
+                                parentBuilder.Add(OutputAsMarkupLiteral()); // Output the whitespace
+
+                                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                                {
+                                    var tagBuilder = pooledResult.Builder;
+                                    Accept(openAngle);
+                                    Accept(solidus);
+                                    AcceptAndMoveNext();
+
+                                    // Accept to '>', '<' or EOF
+                                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
+                                    // Accept the '>' if we saw it. And if we do see it, we're complete
+                                    var complete = TryAccept(SyntaxKind.CloseAngle);
+
+                                    if (complete)
+                                    {
+                                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                                    }
+
+                                    // Output the closing void element
+                                    tagBuilder.Add(OutputAsMarkupLiteral());
+                                    parentBuilder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+
+                                    return Tuple.Create(complete, blockAlreadyBuilt);
+                                }
+                            }
+                        }
+
+                        // Go back to the bookmark and just finish this tag at the close angle
+                        Context.Source.Position = bookmark;
+                        NextToken();
+                    }
+                    else if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        if (!CurrentScriptTagExpectsHtml(builder))
+                        {
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                            builder.Add(OutputAsMarkupLiteral());
+                            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                            parentBuilder.Add(tagBlock);
+                            blockAlreadyBuilt = true;
+
+                            SkipToEndScriptAndParseCode(parentBuilder, endTagAcceptedCharacters: AcceptedCharactersInternal.None);
+                        }
+                        else
+                        {
+                            // Push the script tag onto the tag stack, it should be treated like all other HTML tags.
+                            tags.Push(tag);
+                        }
+                    }
+                    else
+                    {
+                        // Push the tag on to the stack
+                        tags.Push(tag);
+                    }
+                }
+            }
+            return Tuple.Create(seenClose, blockAlreadyBuilt);
+        }
+
+        private Tuple<bool, bool> ParseEndTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SourceLocation tagStart,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            // Accept "/" and move next
+            Assert(SyntaxKind.ForwardSlash);
+            var forwardSlash = CurrentToken;
+            if (!NextToken())
+            {
+                Accept(_bufferedOpenAngle);
+                Accept(forwardSlash);
+                return Tuple.Create(false, false);
+            }
+            else
+            {
+                var tagName = string.Empty;
+                SyntaxToken bangToken = null;
+
+                if (At(SyntaxKind.Bang))
+                {
+                    bangToken = CurrentToken;
+
+                    var nextToken = Lookahead(count: 1);
+
+                    if (nextToken != null && nextToken.Kind == SyntaxKind.Text)
+                    {
+                        tagName = "!" + nextToken.Content;
+                    }
+                }
+                else if (At(SyntaxKind.Text))
+                {
+                    tagName = CurrentToken.Content;
+                }
+
+                var matched = RemoveTag(tags, tagName, tagStart);
+
+                if (tags.Count == 0 &&
+                    // Note tagName may contain a '!' escape character. This ensures </!text> doesn't match here.
+                    // </!text> tags are treated like any other escaped HTML end tag.
+                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) &&
+                    matched)
+                {
+                    return EndTextTag(builder, parentBuilder, forwardSlash);
+                }
+                Accept(_bufferedOpenAngle);
+                Accept(forwardSlash);
+
+                TryParseBangEscape(builder);
+
+                AcceptUntil(SyntaxKind.CloseAngle);
+
+                // Accept the ">"
+                return Tuple.Create(TryAccept(SyntaxKind.CloseAngle), false);
+            }
+        }
+
+        private Tuple<bool, bool> EndTextTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SyntaxToken solidus)
+        {
+            Accept(_bufferedOpenAngle);
+            Accept(solidus);
+
+            var textLocation = CurrentStart;
+            Assert(SyntaxKind.Text);
+            AcceptAndMoveNext();
+
+            var seenCloseAngle = TryAccept(SyntaxKind.CloseAngle);
+
+            if (!seenCloseAngle)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                RecoverTextTag();
+            }
+            else
+            {
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+            builder.Add(transition);
+            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+            parentBuilder.Add(tagBlock);
+
+            return Tuple.Create(seenCloseAngle, true);
+        }
+
+        private bool RemoveTag(Stack<Tuple<SyntaxToken, SourceLocation>> tags, string tagName, SourceLocation tagStart)
+        {
+            Tuple<SyntaxToken, SourceLocation> currentTag = null;
+            while (tags.Count > 0)
+            {
+                currentTag = tags.Pop();
+                if (string.Equals(tagName, currentTag.Item1.Content, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Matched the tag
+                    return true;
+                }
+            }
+            if (currentTag != null)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(currentTag.Item2, "<"),
+                            currentTag.Item1.Content.Length),
+                        currentTag.Item1.Content));
+            }
+            else
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
+                        new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), tagName.Length), tagName));
+            }
+            return false;
+        }
+
+        private void RecoverTextTag()
+        {
+            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
+            AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
+
+            // Include the close angle in the text tag block if it's there, otherwise just move on
+            TryAccept(SyntaxKind.CloseAngle);
+        }
+
+        private void EndTagBlock(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags,
+            bool complete)
+        {
+            if (tags.Count > 0)
+            {
+                // Ended because of EOF, not matching close tag.  Throw error for last tag
+                while (tags.Count > 1)
+                {
+                    tags.Pop();
+                }
+                var tag = tags.Pop();
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(tag.Item2, "<"),
+                            tag.Item1.Content.Length),
+                        tag.Item1.Content));
+            }
+            else if (complete)
+            {
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            tags.Clear();
+            if (!Context.DesignTimeMode)
+            {
+                var shouldAcceptWhitespaceAndNewLine = true;
+
+                // Check if the previous span was a transition.
+                var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
+                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
+                {
+                    var tokens = ReadWhile(
+                        f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
+
+                    // Make sure the current token is not markup, which can be html start tag or @:
+                    if (!(At(SyntaxKind.OpenAngle) ||
+                        (At(SyntaxKind.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
+                    {
+                        // Don't accept whitespace as markup if the end text tag is followed by csharp.
+                        shouldAcceptWhitespaceAndNewLine = false;
+                    }
+
+                    PutCurrentBack();
+                    PutBack(tokens);
+                    EnsureCurrent();
+                }
+
+                if (shouldAcceptWhitespaceAndNewLine)
+                {
+                    // Accept whitespace and a single newline if present
+                    AcceptWhile(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.NewLine);
+                }
+            }
+            else if (SpanContext.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any)
+            {
+                AcceptWhile(SyntaxKind.Whitespace);
+                TryAccept(SyntaxKind.NewLine);
+            }
+            PutCurrentBack();
+
+            if (!complete)
+            {
+                AcceptMarkerTokenIfNecessary();
+            }
+
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
+        public MarkupBlockSyntax ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+
+                NextToken();
+                CaseSensitive = caseSensitive;
+                NestingBlock(builder, nestingSequences);
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputAsMarkupLiteral());
+
+                return SyntaxFactory.MarkupBlock(builder.ToList());
+            }
+        }
+
+        private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
+        {
+            var nesting = 1;
+            while (nesting > 0 && !EndOfFile)
+            {
+                SkipToAndParseCode(builder, token =>
+                    token.Kind == SyntaxKind.Text ||
+                    token.Kind == SyntaxKind.OpenAngle);
+                if (At(SyntaxKind.Text))
+                {
+                    nesting += ProcessTextToken(builder, nestingSequences, nesting);
+                    if (CurrentToken != null)
+                    {
+                        AcceptAndMoveNext();
+                    }
+                    else if (nesting > 0)
+                    {
+                        NextToken();
+                    }
+                }
+                else
+                {
+                    ParseTagInDocumentContext(builder);
+                }
+            }
+        }
+
+        private int ProcessTextToken(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences, int currentNesting)
+        {
+            for (var i = 0; i < CurrentToken.Content.Length; i++)
+            {
+                var nestingDelta = HandleNestingSequence(builder, nestingSequences.Item1, i, currentNesting, 1);
+                if (nestingDelta == 0)
+                {
+                    nestingDelta = HandleNestingSequence(builder, nestingSequences.Item2, i, currentNesting, -1);
+                }
+
+                if (nestingDelta != 0)
+                {
+                    return nestingDelta;
+                }
+            }
+            return 0;
+        }
+
+        private int HandleNestingSequence(in SyntaxListBuilder<RazorSyntaxNode> builder, string sequence, int position, int currentNesting, int retIfMatched)
+        {
+            if (sequence != null &&
+                CurrentToken.Content[position] == sequence[0] &&
+                position + sequence.Length <= CurrentToken.Content.Length)
+            {
+                var possibleStart = CurrentToken.Content.Substring(position, sequence.Length);
+                if (string.Equals(possibleStart, sequence, Comparison))
+                {
+                    // Capture the current token and "put it back" (really we just want to clear CurrentToken)
+                    var bookmark = CurrentStart;
+                    var token = CurrentToken;
+                    PutCurrentBack();
+
+                    // Carve up the token
+                    var pair = Language.SplitToken(token, position, SyntaxKind.Text);
+                    var preSequence = pair.Item1;
+                    Debug.Assert(pair.Item2 != null);
+                    pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
+                    var sequenceToken = pair.Item1;
+                    var postSequence = pair.Item2;
+                    var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;
+
+                    // Accept the first chunk (up to the nesting sequence we just saw)
+                    if (!string.IsNullOrEmpty(preSequence.Content))
+                    {
+                        Accept(preSequence);
+                    }
+
+                    if (currentNesting + retIfMatched == 0)
+                    {
+                        // This is 'popping' the final entry on the stack of nesting sequences
+                        // A caller higher in the parsing stack will accept the sequence token, so advance
+                        // to it
+                        Context.Source.Position = bookmark.AbsoluteIndex + preSequence.Content.Length;
+                    }
+                    else
+                    {
+                        // This isn't the end of the last nesting sequence, accept the token and keep going
+                        Accept(sequenceToken);
+
+                        // Position at the start of the postSequence token, which might be null.
+                        Context.Source.Position = postSequenceBookmark;
+                    }
+
+                    // Return the value we were asked to return if matched, since we found a nesting sequence
+                    return retIfMatched;
+                }
+            }
+            return 0;
+        }
+
+        private Syntax.GreenNode GetLastSpan(RazorSyntaxNode node)
+        {
+            if (node == null)
+            {
+                return null;
+            }
+
+            // Find the last token of this node and return its immediate non-list parent.
+            var red = node.CreateRed();
+            var last = red.GetLastTerminal();
+            if (last == null)
+            {
+                return null;
+            }
+
+            while (last.Green.IsToken || last.Green.IsList)
+            {
+                last = last.Parent;
+            }
+
+            return last.Green;
+        }
+
+        internal static bool IsValidAttributeNameToken(SyntaxToken token)
+        {
+            if (token == null)
+            {
+                return false;
+            }
+
+            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
+            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
+            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
+            // expectation that the parser handles such scenarios prior to falling through to name resolution.
+            var tokenType = token.Kind;
+            return tokenType != SyntaxKind.Whitespace &&
+                tokenType != SyntaxKind.NewLine &&
+                tokenType != SyntaxKind.CloseAngle &&
+                tokenType != SyntaxKind.OpenAngle &&
+                tokenType != SyntaxKind.ForwardSlash &&
+                tokenType != SyntaxKind.DoubleQuote &&
+                tokenType != SyntaxKind.SingleQuote &&
+                tokenType != SyntaxKind.Equals &&
+                tokenType != SyntaxKind.Marker;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index f06c8db1bc..89b844c769 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.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;
@@ -9,10 +9,11 @@ using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
+    internal partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
     {
         private const string ScriptTagName = "script";
 
+        private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' };
         private static readonly SyntaxToken[] nonAllowedHtmlCommentEnding = new[]
         {
             SyntaxFactory.Token(SyntaxKind.Text, "-"),
@@ -20,31 +21,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
         };
 
-        private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' };
-        private SourceLocation _lastTagStart = SourceLocation.Zero;
-        private SyntaxToken _bufferedOpenAngle;
-
-        //From http://dev.w3.org/html5/spec/Overview.html#elements-0
-        private readonly ISet<string> _voidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-        {
-            "area",
-            "base",
-            "br",
-            "col",
-            "command",
-            "embed",
-            "hr",
-            "img",
-            "input",
-            "keygen",
-            "link",
-            "meta",
-            "param",
-            "source",
-            "track",
-            "wbr"
-        };
-
         public HtmlMarkupParser(ParserContext context)
             : base(context.ParseLeadingDirectives ? FirstDirectiveHtmlLanguageCharacteristics.Instance : HtmlLanguageCharacteristics.Instance, context)
         {
@@ -52,37 +28,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public CSharpCodeParser CodeParser { get; set; }
 
-        public ISet<string> VoidElements
-        {
-            get { return _voidElements; }
-        }
-
-        private bool CaseSensitive { get; set; }
-
-        private StringComparison Comparison
-        {
-            get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; }
-        }
-
-        // Special tags include <!--, <!DOCTYPE, <![CDATA and <? tags
-        private bool AtSpecialTag
-        {
-            get
-            {
-                if (At(SyntaxKind.OpenAngle))
-                {
-                    if (NextIs(SyntaxKind.Bang))
-                    {
-                        return !IsBangEscape(lookahead: 1);
-                    }
-
-                    return NextIs(SyntaxKind.QuestionMark);
-                }
-
-                return false;
-            }
-        }
-
         public RazorDocumentSyntax ParseDocument()
         {
             if (Context == null)
@@ -95,11 +40,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 var builder = pooledResult.Builder;
                 NextToken();
-                while (!EndOfFile)
-                {
-                    SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
-                    ParseTagInDocumentContext(builder);
-                }
+
+                ParseMarkupNodes(builder, ParseMode.Markup);
                 AcceptMarkerTokenIfNecessary();
                 builder.Add(OutputAsMarkupLiteral());
 
@@ -109,836 +51,202 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind type)
+        private void ParseMarkupNodes(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            ParseMode mode,
+            Func<SyntaxToken, bool> stopCondition = null)
         {
-            SkipToAndParseCode(builder, token => token.Kind == type);
+            stopCondition = stopCondition ?? (token => false);
+            while (!EndOfFile && !stopCondition(CurrentToken))
+            {
+                ParseMarkupNode(builder, mode);
+            }
         }
 
-        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, Func<SyntaxToken, bool> condition)
+        private void ParseMarkupNode(in SyntaxListBuilder<RazorSyntaxNode> builder, ParseMode mode)
         {
-            SyntaxToken last = null;
-            var startOfLine = false;
-            while (!EndOfFile && !condition(CurrentToken))
+            switch (GetParserState(mode))
             {
-                if (Context.NullGenerateWhitespaceAndNewLine)
-                {
-                    Context.NullGenerateWhitespaceAndNewLine = false;
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                    AcceptWhile(token => token.Kind == SyntaxKind.Whitespace);
-                    if (At(SyntaxKind.NewLine))
-                    {
-                        AcceptAndMoveNext();
-                    }
-
-                    builder.Add(OutputAsMarkupEphemeralLiteral());
-                }
-                else if (At(SyntaxKind.NewLine))
-                {
-                    if (last != null)
-                    {
-                        Accept(last);
-                    }
-
-                    // Mark the start of a new line
-                    startOfLine = true;
-                    last = null;
+                case ParserState.MarkupText:
+                    ParseMarkupText(builder);
+                    break;
+                case ParserState.Tag:
+                    ParseMarkupElement(builder);
+                    break;
+                case ParserState.SpecialTag:
+                    ParseSpecialTag(builder);
+                    break;
+                case ParserState.XmlPI:
+                    ParseXmlPI(builder);
+                    break;
+                case ParserState.CData:
+                    ParseCData(builder);
+                    break;
+                case ParserState.MarkupComment:
+                    ParseMarkupComment(builder);
+                    break;
+                case ParserState.RazorComment:
+                    ParseRazorCommentWithLeadingAndTrailingWhitespace(builder);
+                    break;
+                case ParserState.DoubleTransition:
+                    ParseDoubleTransition(builder);
+                    break;
+                case ParserState.CodeTransition:
+                    ParseCodeTransition(builder);
+                    break;
+                case ParserState.Misc:
+                    ParseMisc(builder);
+                    break;
+                case ParserState.Unknown:
                     AcceptAndMoveNext();
-                }
-                else if (At(SyntaxKind.Transition))
-                {
-                    var transition = CurrentToken;
-                    NextToken();
-                    if (At(SyntaxKind.Transition))
-                    {
-                        if (last != null)
-                        {
-                            Accept(last);
-                            last = null;
-                        }
-                        builder.Add(OutputAsMarkupLiteral());
-                        Accept(transition);
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        builder.Add(OutputAsMarkupEphemeralLiteral());
-                        AcceptAndMoveNext();
-                        continue; // while
-                    }
-                    else
-                    {
-                        if (!EndOfFile)
-                        {
-                            PutCurrentBack();
-                        }
-                        PutBack(transition);
-                    }
-
-                    // Handle whitespace rewriting
-                    if (last != null)
-                    {
-                        if (!Context.DesignTimeMode && last.Kind == SyntaxKind.Whitespace && startOfLine)
-                        {
-                            // Put the whitespace back too
-                            startOfLine = false;
-                            PutBack(last);
-                            last = null;
-                        }
-                        else
-                        {
-                            // Accept last
-                            Accept(last);
-                            last = null;
-                        }
-                    }
-
-                    OtherParserBlock(builder);
-                }
-                else if (At(SyntaxKind.RazorCommentTransition))
-                {
-                    var shouldRenderWhitespace = true;
-                    if (last != null)
-                    {
-                        // Don't render the whitespace between the start of the line and the razor comment.
-                        if (startOfLine && last.Kind == SyntaxKind.Whitespace)
-                        {
-                            AcceptMarkerTokenIfNecessary();
-                            // Output the tokens that may have been accepted prior to the whitespace.
-                            builder.Add(OutputAsMarkupLiteral());
-
-                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                            shouldRenderWhitespace = false;
-                        }
-
-                        Accept(last);
-                        last = null;
-                    }
-
-                    AcceptMarkerTokenIfNecessary();
-                    if (shouldRenderWhitespace)
-                    {
-                        builder.Add(OutputAsMarkupLiteral());
-                    }
-                    else
-                    {
-                        builder.Add(OutputAsMarkupEphemeralLiteral());
-                    }
-
-                    var comment = ParseRazorComment();
-                    builder.Add(comment);
-
-                    // Handle the whitespace and newline at the end of a razor comment.
-                    if (startOfLine &&
-                        (At(SyntaxKind.NewLine) ||
-                        (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine))))
-                    {
-                        AcceptWhile(IsSpacingToken(includeNewLines: false));
-                        AcceptAndMoveNext();
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        builder.Add(OutputAsMarkupEphemeralLiteral());
-                    }
-                }
-                else
-                {
-                    // As long as we see whitespace, we're still at the "start" of the line
-                    startOfLine &= At(SyntaxKind.Whitespace);
-
-                    // If there's a last token, accept it
-                    if (last != null)
-                    {
-                        Accept(last);
-                        last = null;
-                    }
-
-                    // Advance
-                    last = CurrentToken;
-                    NextToken();
-                }
-            }
-
-            if (last != null)
-            {
-                Accept(last);
+                    break;
+                case ParserState.EOF:
+                    builder.Add(OutputAsMarkupLiteral());
+                    break;
             }
         }
 
-        /// <summary>
-        /// Reads the content of a tag (if present) in the MarkupDocument (or MarkupSection) context,
-        /// where we don't care about maintaining a stack of tags.
-        /// </summary>
-        private void ParseTagInDocumentContext(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        private void ParseMarkupText(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            if (At(SyntaxKind.OpenAngle))
+            AcceptAndMoveNext();
+        }
+
+        private void ParseMarkupElement(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.OpenAngle);
+
+            // Output already accepted tokens if any.
+            builder.Add(OutputAsMarkupLiteral());
+
+            if (!NextIs(SyntaxKind.ForwardSlash))
             {
-                if (NextIs(SyntaxKind.Bang))
+                // Parsing a start tag
+                var startTag = ParseStartTag(out var tagName, out var tagMode);
+                builder.Add(startTag);
+
+                if (tagMode == MarkupTagMode.Script)
                 {
-                    // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
-                    if (!IsBangEscape(lookahead: 1))
-                    {
-                        if (Lookahead(2)?.Kind == SyntaxKind.DoubleHyphen)
-                        {
-                            builder.Add(OutputAsMarkupLiteral());
-                        }
-
-                        AcceptAndMoveNext(); // Accept '<'
-                        ParseBangTag(builder);
-
-                        return;
-                    }
-
-                    // We should behave like a normal tag that has a parser escape, fall through to the normal
-                    // tag logic.
-                }
-                else if (NextIs(SyntaxKind.QuestionMark))
-                {
-                    AcceptAndMoveNext(); // Accept '<'
-                    TryParseXmlPI(builder);
+                    ParseJavascriptAndEndScriptTag(builder);
                     return;
                 }
-
-                builder.Add(OutputAsMarkupLiteral());
-
-                // Start tag block
-                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                else if (tagMode != MarkupTagMode.Void && tagMode != MarkupTagMode.SelfClosing)
                 {
-                    var tagBuilder = pooledResult.Builder;
-                    AcceptAndMoveNext(); // Accept '<'
-
-                    if (!At(SyntaxKind.ForwardSlash))
+                    var body = ParseTagBody(tagName, out var seenEndTag);
+                    if (body != null)
                     {
-                        ParseOptionalBangEscape(tagBuilder);
-
-                        // Parsing a start tag
-                        var scriptTag = At(SyntaxKind.Text) &&
-                                        string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
-                        TryAccept(SyntaxKind.Text);
-                        ParseTagContent(tagBuilder); // Parse the tag, don't care about the content
-                        TryAccept(SyntaxKind.ForwardSlash);
-                        TryAccept(SyntaxKind.CloseAngle);
-
-                        // If the script tag expects javascript content then we should do minimal parsing until we reach
-                        // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
-                        if (scriptTag && !CurrentScriptTagExpectsHtml(tagBuilder))
-                        {
-                            tagBuilder.Add(OutputAsMarkupLiteral());
-                            var block = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
-                            builder.Add(block);
-
-                            SkipToEndScriptAndParseCode(builder);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        // Parsing an end tag
-                        // This section can accept things like: '</p  >' or '</p>' etc.
-                        TryAccept(SyntaxKind.ForwardSlash);
-
-                        // Whitespace here is invalid (according to the spec)
-                        ParseOptionalBangEscape(tagBuilder);
-                        TryAccept(SyntaxKind.Text);
-                        TryAccept(SyntaxKind.Whitespace);
-                        TryAccept(SyntaxKind.CloseAngle);
+                        builder.AddRange(body);
                     }
 
-                    tagBuilder.Add(OutputAsMarkupLiteral());
-
-                    // End tag block
-                    var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
-                    builder.Add(tagBlock);
+                    if (seenEndTag)
+                    {
+                        var endTag = ParseEndTag();
+                        builder.Add(endTag);
+                    }
                 }
             }
+            else
+            {
+                // Parsing an end tag.
+                var endTag = ParseEndTag();
+                builder.Add(endTag);
+            }
+        }
+
+        private MarkupTagBlockSyntax ParseStartTag(out string tagName, out MarkupTagMode tagMode)
+        {
+            tagName = null;
+            tagMode = MarkupTagMode.Normal;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var tagBuilder = pooledResult.Builder;
+
+                AcceptAndMoveNext(); // Accept '<'
+                TryParseBangEscape(tagBuilder);
+
+                if (At(SyntaxKind.Text))
+                {
+                    tagName = CurrentToken.Content;
+                    if (ParserHelpers.VoidElements.Contains(tagName))
+                    {
+                        // This is a void element.
+                        tagMode = MarkupTagMode.Void;
+                    }
+                }
+                TryAccept(SyntaxKind.Text);
+
+                // Parse the contents of a tag like attributes.
+                ParseTagContent(tagBuilder);
+
+                if (TryAccept(SyntaxKind.ForwardSlash))
+                {
+                    // This is a self closing tag.
+                    tagMode = MarkupTagMode.SelfClosing;
+                }
+                TryAccept(SyntaxKind.CloseAngle);
+
+                // End tag block
+                tagBuilder.Add(OutputAsMarkupLiteral());
+                var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    // If the script tag expects javascript content then we should do minimal parsing until we reach
+                    // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
+                    if (!ScriptTagExpectsHtml(tagBlock))
+                    {
+                        tagMode = MarkupTagMode.Script;
+                    }
+                }
+
+                return tagBlock;
+            }
+        }
+
+        private MarkupTagBlockSyntax ParseEndTag()
+        {
+            // This section can accept things like: '</p  >' or '</p>' etc.
+            Assert(SyntaxKind.OpenAngle);
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var tagBuilder = pooledResult.Builder;
+
+                AcceptAndMoveNext(); // Accept '<'
+                TryAccept(SyntaxKind.ForwardSlash);
+
+                // Whitespace here is invalid (according to the spec)
+                TryParseBangEscape(tagBuilder);
+                TryAccept(SyntaxKind.Text);
+                TryAccept(SyntaxKind.Whitespace);
+                TryAccept(SyntaxKind.CloseAngle);
+
+                // End tag block
+                tagBuilder.Add(OutputAsMarkupLiteral());
+                var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                return tagBlock;
+            }
+        }
+
+        private SyntaxList<RazorSyntaxNode> ParseTagBody(string tagName, out bool seenEndTag)
+        {
+            // No-op here for now.
+            seenEndTag = false;
+            return null;
         }
 
         private void ParseTagContent(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
-            {
-                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
-                RecoverToEndOfTag(builder);
-            }
-            else
-            {
-                // We are here ($): <tag$ foo="bar" biz="~/Baz" />
-                while (!EndOfFile && !IsEndOfTag())
-                {
-                    BeforeAttribute(builder);
-                }
-            }
+            // Calling to legacy code for now.
+            LegacyParseTagContent(builder);
         }
 
-        private bool IsEndOfTag()
-        {
-            if (At(SyntaxKind.ForwardSlash))
-            {
-                if (NextIs(SyntaxKind.CloseAngle))
-                {
-                    return true;
-                }
-                else
-                {
-                    AcceptAndMoveNext();
-                }
-            }
-            return At(SyntaxKind.CloseAngle) || At(SyntaxKind.OpenAngle);
-        }
-
-        private void BeforeAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
-            // Capture whitespace
-            var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-
-            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
-            {
-                // Transition outside of attribute value => Switch to recovery mode
-                Accept(whitespace);
-                RecoverToEndOfTag(builder);
-                return;
-            }
-
-            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
-            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
-            var nameTokens = Enumerable.Empty<SyntaxToken>();
-            var whitespaceAfterAttributeName = Enumerable.Empty<SyntaxToken>();
-            if (IsValidAttributeNameToken(CurrentToken))
-            {
-                nameTokens = ReadWhile(token =>
-                                 token.Kind != SyntaxKind.Whitespace &&
-                                 token.Kind != SyntaxKind.NewLine &&
-                                 token.Kind != SyntaxKind.Equals &&
-                                 token.Kind != SyntaxKind.CloseAngle &&
-                                 token.Kind != SyntaxKind.OpenAngle &&
-                                 (token.Kind != SyntaxKind.ForwardSlash || !NextIs(SyntaxKind.CloseAngle)));
-
-                // capture whitespace after attribute name (if any)
-                whitespaceAfterAttributeName = ReadWhile(
-                    token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-            }
-            else
-            {
-                // Unexpected character in tag, enter recovery
-                Accept(whitespace);
-                RecoverToEndOfTag(builder);
-                return;
-            }
-
-            if (!At(SyntaxKind.Equals))
-            {
-                // Minimized attribute
-
-                // We are at the prefix of the next attribute or the end of tag. Put it back so it is parsed later.
-                PutCurrentBack();
-                PutBack(whitespaceAfterAttributeName);
-
-                // Output anything prior to the attribute, in most cases this will be the tag name:
-                // |<input| checked />. If in-between other attributes this will noop or output malformed attribute
-                // content (if the previous attribute was malformed).
-                builder.Add(OutputAsMarkupLiteral());
-
-                Accept(whitespace);
-                var namePrefix = OutputAsMarkupLiteral();
-                Accept(nameTokens);
-                var name = OutputAsMarkupLiteral();
-
-                var minimizedAttributeBlock = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
-                builder.Add(minimizedAttributeBlock);
-
-                return;
-            }
-
-            // Not a minimized attribute, parse as if it were well-formed (if attribute turns out to be malformed we
-            // will go into recovery).
-            builder.Add(OutputAsMarkupLiteral());
-
-            var attributeBlock = ParseAttributePrefix(whitespace, nameTokens, whitespaceAfterAttributeName);
-
-            builder.Add(attributeBlock);
-        }
-
-        private MarkupAttributeBlockSyntax ParseAttributePrefix(
-            IEnumerable<SyntaxToken> whitespace,
-            IEnumerable<SyntaxToken> nameTokens,
-            IEnumerable<SyntaxToken> whitespaceAfterAttributeName)
-        {
-            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
-            var nameContent = string.Concat(nameTokens.Select(s => s.Content));
-            var attributeCanBeConditional =
-                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
-                !nameContent.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
-
-            // Accept the whitespace and name
-            Accept(whitespace);
-            var namePrefix = OutputAsMarkupLiteral();
-            Accept(nameTokens);
-            var name = OutputAsMarkupLiteral();
-
-            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
-            Accept(whitespaceAfterAttributeName);
-            var nameSuffix = OutputAsMarkupLiteral();
-            Assert(SyntaxKind.Equals); // We should be at "="
-            var equalsToken = EatCurrentToken();
-
-            var whitespaceAfterEquals = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-            var quote = SyntaxKind.Marker;
-            if (At(SyntaxKind.SingleQuote) || At(SyntaxKind.DoubleQuote))
-            {
-                // Found a quote, the whitespace belongs to this attribute.
-                Accept(whitespaceAfterEquals);
-                quote = CurrentToken.Kind;
-                AcceptAndMoveNext();
-            }
-            else if (whitespaceAfterEquals.Any())
-            {
-                // No quotes found after the whitespace. Put it back so that it can be parsed later.
-                PutCurrentBack();
-                PutBack(whitespaceAfterEquals);
-            }
-
-            MarkupTextLiteralSyntax valuePrefix = null;
-            RazorBlockSyntax attributeValue = null;
-            MarkupTextLiteralSyntax valueSuffix = null;
-
-            if (attributeCanBeConditional)
-            {
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
-
-                // We now have the value prefix which is usually whitespace and/or a quote
-                valuePrefix = OutputAsMarkupLiteral();
-
-                // Read the attribute value only if the value is quoted
-                // or if there is no whitespace between '=' and the unquoted value.
-                if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
-                {
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var attributeValueBuilder = pooledResult.Builder;
-                        // Read the attribute value.
-                        while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
-                        {
-                            ParseAttributeValue(attributeValueBuilder, quote);
-                        }
-
-                        if (attributeValueBuilder.Count > 0)
-                        {
-                            attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
-                        }
-                    }
-                }
-
-                // Capture the suffix
-                if (quote != SyntaxKind.Marker && At(quote))
-                {
-                    AcceptAndMoveNext();
-                    // Again, block chunk generator will render the suffix
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                    valueSuffix = OutputAsMarkupLiteral();
-                }
-            }
-            else if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
-            {
-                valuePrefix = OutputAsMarkupLiteral();
-
-                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                {
-                    var attributeValueBuilder = pooledResult.Builder;
-                    // Not a "conditional" attribute, so just read the value
-                    SkipToAndParseCode(attributeValueBuilder, token => IsEndOfAttributeValue(quote, token));
-
-                    // Output already accepted tokens if any as markup literal
-                    var literalValue = OutputAsMarkupLiteral();
-                    attributeValueBuilder.Add(literalValue);
-
-                    // Capture the attribute value (will include everything in-between the attribute's quotes).
-                    attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
-                }
-
-                if (quote != SyntaxKind.Marker)
-                {
-                    TryAccept(quote);
-                    valueSuffix = OutputAsMarkupLiteral();
-                }
-            }
-            else
-            {
-                // There is no quote and there is whitespace after equals. There is no attribute value.
-            }
-
-            return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, attributeValue, valueSuffix);
-        }
-
-        private void ParseAttributeValue(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind quote)
-        {
-            var prefixStart = CurrentStart;
-            var prefixTokens = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-
-            if (At(SyntaxKind.Transition))
-            {
-                if (NextIs(SyntaxKind.Transition))
-                {
-                    // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it.
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var markupBuilder = pooledResult.Builder;
-                        Accept(prefixTokens);
-
-                        // Render a single "@" in place of "@@".
-                        SpanContext.ChunkGenerator = new LiteralAttributeChunkGenerator(
-                            new LocationTagged<string>(string.Concat(prefixTokens.Select(s => s.Content)), prefixStart),
-                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
-                        AcceptAndMoveNext();
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        markupBuilder.Add(OutputAsMarkupLiteral());
-
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        AcceptAndMoveNext();
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        markupBuilder.Add(OutputAsMarkupEphemeralLiteral());
-
-                        var markupBlock = SyntaxFactory.MarkupBlock(markupBuilder.ToList());
-                        builder.Add(markupBlock);
-                    }
-                }
-                else
-                {
-                    Accept(prefixTokens);
-                    var valueStart = CurrentStart;
-                    PutCurrentBack();
-
-                    var prefix = OutputAsMarkupLiteral();
-
-                    // Dynamic value, start a new block and set the chunk generator
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var dynamicAttributeValueBuilder = pooledResult.Builder;
-
-                        OtherParserBlock(dynamicAttributeValueBuilder);
-                        var value = SyntaxFactory.MarkupDynamicAttributeValue(prefix, SyntaxFactory.GenericBlock(dynamicAttributeValueBuilder.ToList()));
-                        builder.Add(value);
-                    }
-                }
-            }
-            else
-            {
-                Accept(prefixTokens);
-                var prefix = OutputAsMarkupLiteral();
-
-                // Literal value
-                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
-                // "Unknown" type.
-                var valueTokens = ReadWhile(token =>
-                    // These three conditions find separators which break the attribute value into portions
-                    token.Kind != SyntaxKind.Whitespace &&
-                    token.Kind != SyntaxKind.NewLine &&
-                    token.Kind != SyntaxKind.Transition &&
-                    // This condition checks for the end of the attribute value (it repeats some of the checks above
-                    // but for now that's ok)
-                    !IsEndOfAttributeValue(quote, token));
-                Accept(valueTokens);
-                var value = OutputAsMarkupLiteral();
-
-                var literalAttributeValue = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
-                builder.Add(literalAttributeValue);
-            }
-        }
-
-        private void RecoverToEndOfTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Accept until ">", "/" or "<", but parse code
-            while (!EndOfFile)
-            {
-                SkipToAndParseCode(builder, IsTagRecoveryStopPoint);
-                if (!EndOfFile)
-                {
-                    EnsureCurrent();
-                    switch (CurrentToken.Kind)
-                    {
-                        case SyntaxKind.SingleQuote:
-                        case SyntaxKind.DoubleQuote:
-                            ParseQuoted(builder);
-                            break;
-                        case SyntaxKind.OpenAngle:
-                        // Another "<" means this tag is invalid.
-                        case SyntaxKind.ForwardSlash:
-                        // Empty tag
-                        case SyntaxKind.CloseAngle:
-                            // End of tag
-                            return;
-                        default:
-                            AcceptAndMoveNext();
-                            break;
-                    }
-                }
-            }
-        }
-
-        private bool IsTagRecoveryStopPoint(SyntaxToken token)
-        {
-            return token.Kind == SyntaxKind.CloseAngle ||
-                   token.Kind == SyntaxKind.ForwardSlash ||
-                   token.Kind == SyntaxKind.OpenAngle ||
-                   token.Kind == SyntaxKind.SingleQuote ||
-                   token.Kind == SyntaxKind.DoubleQuote;
-        }
-
-        private bool IsEndOfAttributeValue(SyntaxKind quote, SyntaxToken token)
-        {
-            return EndOfFile || token == null ||
-                   (quote != SyntaxKind.Marker
-                        ? token.Kind == quote // If quoted, just wait for the quote
-                        : IsUnquotedEndOfAttributeValue(token));
-        }
-
-        private bool IsUnquotedEndOfAttributeValue(SyntaxToken token)
-        {
-            // If unquoted, we have a larger set of terminating characters:
-            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
-            // Also we need to detect "/" and ">"
-            return token.Kind == SyntaxKind.DoubleQuote ||
-                   token.Kind == SyntaxKind.SingleQuote ||
-                   token.Kind == SyntaxKind.OpenAngle ||
-                   token.Kind == SyntaxKind.Equals ||
-                   (token.Kind == SyntaxKind.ForwardSlash && NextIs(SyntaxKind.CloseAngle)) ||
-                   token.Kind == SyntaxKind.CloseAngle ||
-                   token.Kind == SyntaxKind.Whitespace ||
-                   token.Kind == SyntaxKind.NewLine;
-        }
-
-        private void ParseQuoted(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            var type = CurrentToken.Kind;
-            AcceptAndMoveNext();
-            SkipToAndParseCode(builder, type);
-            if (!EndOfFile)
-            {
-                Assert(type);
-                AcceptAndMoveNext();
-            }
-        }
-
-        private bool ParseBangTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Accept "!"
-            Assert(SyntaxKind.Bang);
-
-            if (AcceptAndMoveNext())
-            {
-                if (IsHtmlCommentAhead())
-                {
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var htmlCommentBuilder = pooledResult.Builder;
-
-                        // Accept the double-hyphen token at the beginning of the comment block.
-                        AcceptAndMoveNext();
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
-
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
-                        while (!EndOfFile)
-                        {
-                            SkipToAndParseCode(htmlCommentBuilder, SyntaxKind.DoubleHyphen);
-                            var lastDoubleHyphen = AcceptAllButLastDoubleHyphens();
-
-                            if (At(SyntaxKind.CloseAngle))
-                            {
-                                // Output the content in the comment block as a separate markup
-                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
-                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
-
-                                // This is the end of a comment block
-                                Accept(lastDoubleHyphen);
-                                AcceptAndMoveNext();
-                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
-                                var commentBlock = SyntaxFactory.MarkupCommentBlock(htmlCommentBuilder.ToList());
-                                builder.Add(commentBlock);
-                                return true;
-                            }
-                            else if (lastDoubleHyphen != null)
-                            {
-                                Accept(lastDoubleHyphen);
-                            }
-                        }
-                    }
-                }
-                else if (CurrentToken.Kind == SyntaxKind.LeftBracket)
-                {
-                    if (AcceptAndMoveNext())
-                    {
-                        return TryParseCData(builder);
-                    }
-                }
-                else
-                {
-                    AcceptAndMoveNext();
-                    return AcceptTokenUntilAll(builder, SyntaxKind.CloseAngle);
-                }
-            }
-
-            return false;
-        }
-
-        internal static bool IsHyphen(SyntaxToken token)
-        {
-            return token.Kind == SyntaxKind.Text && token.Content == "-";
-        }
-
-        protected bool IsHtmlCommentAhead()
-        {
-            // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
-
-            // Comments must have the following format:
-            // 1. The string "<!--"
-            // 2. Optionally, text, with the additional restriction that the text
-            //      2.1 must not start with the string ">" nor start with the string "->"
-            //      2.2 nor contain the strings
-            //          2.2.1 "<!--"
-            //          2.2.2 "-->" As we will be treating this as a comment ending, there is no need to handle this case at all.
-            //          2.2.3 "--!>"
-            //      2.3 nor end with the string "<!-".
-            // 3. The string "-->"
-
-            if (CurrentToken.Kind != SyntaxKind.DoubleHyphen)
-            {
-                return false;
-            }
-
-            // Check condition 2.1
-            if (NextIs(SyntaxKind.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(SyntaxKind.CloseAngle)))
-            {
-                return false;
-            }
-
-            // Check condition 2.2
-            var isValidComment = false;
-            LookaheadUntil((token, prevTokens) =>
-            {
-                if (token.Kind == SyntaxKind.DoubleHyphen)
-                {
-                    if (NextIs(SyntaxKind.CloseAngle))
-                    {
-                        // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
-                        isValidComment = !IsCommentContentEndingInvalid(prevTokens);
-                        return true;
-                    }
-                    else if (NextIs(ns => IsHyphen(ns) && NextIs(SyntaxKind.CloseAngle)))
-                    {
-                        // Check condition 2.3: we're at the end of a comment, which has an extra dash.
-                        // Need to treat the dash as part of the content and check the ending.
-                        // However, that case would have already been checked as part of check from 2.2.1 which
-                        // would already fail this iteration and we wouldn't get here
-                        isValidComment = true;
-                        return true;
-                    }
-                    else if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.CloseAngle)))
-                    {
-                        // This is condition 2.2.3
-                        isValidComment = false;
-                        return true;
-                    }
-                }
-                else if (token.Kind == SyntaxKind.OpenAngle)
-                {
-                    // Checking condition 2.2.1
-                    if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.DoubleHyphen)))
-                    {
-                        isValidComment = false;
-                        return true;
-                    }
-                }
-
-                return false;
-            });
-
-            return isValidComment;
-        }
-
-        /// <summary>
-        /// Verifies, that the sequence doesn't end with the "&lt;!-" HtmlTokens. Note, the first token is an opening bracket token
-        /// </summary>
-        internal static bool IsCommentContentEndingInvalid(IEnumerable<SyntaxToken> sequence)
-        {
-            var reversedSequence = sequence.Reverse();
-            var index = 0;
-            foreach (var item in reversedSequence)
-            {
-                if (!item.IsEquivalentTo(nonAllowedHtmlCommentEnding[index++]))
-                {
-                    return false;
-                }
-
-                if (index == nonAllowedHtmlCommentEnding.Length)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private bool TryParseCData(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            if (CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
-            {
-                if (AcceptAndMoveNext())
-                {
-                    if (CurrentToken.Kind == SyntaxKind.LeftBracket)
-                    {
-                        return AcceptTokenUntilAll(builder, SyntaxKind.RightBracket, SyntaxKind.RightBracket, SyntaxKind.CloseAngle);
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        private bool TryParseXmlPI(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Accept "?"
-            Assert(SyntaxKind.QuestionMark);
-            AcceptAndMoveNext();
-            return AcceptTokenUntilAll(builder, SyntaxKind.QuestionMark, SyntaxKind.CloseAngle);
-        }
-
-        private void ParseOptionalBangEscape(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            if (IsBangEscape(lookahead: 0))
-            {
-                builder.Add(OutputAsMarkupLiteral());
-
-                // Accept the parser escape character '!'.
-                Assert(SyntaxKind.Bang);
-                AcceptAndMoveNext();
-
-                // Setup the metacode span that we will be outputing.
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                builder.Add(OutputAsMetaCode(Output()));
-            }
-        }
-
-        private bool IsBangEscape(int lookahead)
-        {
-            var potentialBang = Lookahead(lookahead);
-
-            if (potentialBang != null &&
-                potentialBang.Kind == SyntaxKind.Bang)
-            {
-                var afterBang = Lookahead(lookahead + 1);
-
-                return afterBang != null &&
-                    afterBang.Kind == SyntaxKind.Text &&
-                    !string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase);
-            }
-
-            return false;
-        }
-
-        private void SkipToEndScriptAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
+        private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
         {
             // Special case for <script>: Skip to end of script tag and parse code
             var seenEndScript = false;
 
             while (!seenEndScript && !EndOfFile)
             {
-                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+                ParseMarkupNodes(builder, ParseMode.Text, token => token.Kind == SyntaxKind.OpenAngle);
                 var tagStart = CurrentStart;
 
                 if (NextIs(SyntaxKind.ForwardSlash))
@@ -964,46 +272,244 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     NextToken();
                 }
 
-                if (seenEndScript)
-                {
-                    builder.Add(OutputAsMarkupLiteral());
-
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var tagBuilder = pooledResult.Builder;
-                        SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
-
-                        AcceptAndMoveNext(); // '<'
-                        AcceptAndMoveNext(); // '/'
-                        SkipToAndParseCode(tagBuilder, SyntaxKind.CloseAngle);
-                        if (!TryAccept(SyntaxKind.CloseAngle))
-                        {
-                            Context.ErrorSink.OnError(
-                                RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
-                                    new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
-                                    ScriptTagName));
-                            var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
-                            Accept(closeAngle);
-                        }
-                        tagBuilder.Add(OutputAsMarkupLiteral());
-                        builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
-                    }
-                }
-                else
+                if (!seenEndScript)
                 {
                     AcceptAndMoveNext(); // Accept '<' (not the closing script tag's open angle)
                 }
             }
+
+            if (seenEndScript)
+            {
+                var tagStart = CurrentStart;
+                builder.Add(OutputAsMarkupLiteral());
+
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var tagBuilder = pooledResult.Builder;
+                    SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+
+                    AcceptAndMoveNext(); // '<'
+                    AcceptAndMoveNext(); // '/'
+                    ParseMarkupNodes(tagBuilder, ParseMode.Text, token => token.Kind == SyntaxKind.CloseAngle);
+                    if (!TryAccept(SyntaxKind.CloseAngle))
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                                new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
+                                ScriptTagName));
+                        var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+                        Accept(closeAngle);
+                    }
+                    tagBuilder.Add(OutputAsMarkupLiteral());
+                    builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+                }
+            }
         }
 
-        private bool CurrentScriptTagExpectsHtml(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        private bool ParseSpecialTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            Debug.Assert(!builder.IsNull);
+            // Clear the current token builder.
+            builder.Add(OutputAsMarkupLiteral());
 
-            MarkupAttributeBlockSyntax typeAttribute = null;
-            for (var i = 0; i < builder.Count; i++)
+            return AcceptTokenUntilAll(builder, SyntaxKind.CloseAngle);
+        }
+
+        private bool ParseXmlPI(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.OpenAngle);
+            AcceptAndMoveNext();
+            Assert(SyntaxKind.QuestionMark);
+            AcceptAndMoveNext();
+            return AcceptTokenUntilAll(builder, SyntaxKind.QuestionMark, SyntaxKind.CloseAngle);
+        }
+
+        private bool ParseCData(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // <![CDATA[...]]>
+            Assert(SyntaxKind.OpenAngle);
+            AcceptAndMoveNext(); // '<'
+            AcceptAndMoveNext(); // '!'
+            AcceptAndMoveNext(); // '['
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase));
+            AcceptAndMoveNext();
+            Assert(SyntaxKind.LeftBracket);
+            return AcceptTokenUntilAll(builder, SyntaxKind.RightBracket, SyntaxKind.RightBracket, SyntaxKind.CloseAngle);
+        }
+
+        private void ParseDoubleTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            AcceptWhile(IsSpacingToken(includeNewLines: true));
+            builder.Add(OutputAsMarkupLiteral());
+
+            // First transition
+            Assert(SyntaxKind.Transition);
+            AcceptAndMoveNext();
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            builder.Add(OutputAsMarkupEphemeralLiteral());
+
+            // Second transition
+            AcceptAndMoveNext();
+        }
+
+        private void ParseCodeTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (Context.NullGenerateWhitespaceAndNewLine)
             {
-                var node = builder[i];
+                // Usually this is set to true when a Code block ends and there is whitespace left after it.
+                // We don't want to write it to output.
+                Context.NullGenerateWhitespaceAndNewLine = false;
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                AcceptWhile(IsSpacingToken(includeNewLines: false));
+                if (At(SyntaxKind.NewLine))
+                {
+                    AcceptAndMoveNext();
+                }
+
+                builder.Add(OutputAsMarkupEphemeralLiteral());
+            }
+
+            var lastWhitespace = AcceptWhitespaceInLines();
+            if (lastWhitespace != null)
+            {
+                if (Context.DesignTimeMode || !Context.StartOfLine)
+                {
+                    // Markup owns whitespace in design time mode.
+                    Accept(lastWhitespace);
+                    lastWhitespace = null;
+                }
+            }
+
+            PutCurrentBack();
+            if (lastWhitespace != null)
+            {
+                PutBack(lastWhitespace);
+            }
+
+            OtherParserBlock(builder);
+        }
+
+        private void ParseMarkupComment(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.OpenAngle);
+
+            // Clear the current token builder.
+            builder.Add(OutputAsMarkupLiteral());
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var htmlCommentBuilder = pooledResult.Builder;
+
+                // Accept the '<', '!' and double-hyphen token at the beginning of the comment block.
+                AcceptAndMoveNext();
+                AcceptAndMoveNext();
+                AcceptAndMoveNext();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                while (!EndOfFile)
+                {
+                    ParseMarkupNodes(htmlCommentBuilder, ParseMode.Text, t => t.Kind == SyntaxKind.DoubleHyphen);
+                    var lastDoubleHyphen = AcceptAllButLastDoubleHyphens();
+
+                    if (At(SyntaxKind.CloseAngle))
+                    {
+                        // Output the content in the comment block as a separate markup
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+
+                        // This is the end of a comment block
+                        Accept(lastDoubleHyphen);
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+                        var commentBlock = SyntaxFactory.MarkupCommentBlock(htmlCommentBuilder.ToList());
+                        builder.Add(commentBlock);
+                        return;
+                    }
+                    else if (lastDoubleHyphen != null)
+                    {
+                        Accept(lastDoubleHyphen);
+                    }
+                }
+
+                builder.Add(OutputAsMarkupLiteral());
+            }
+        }
+
+        private void ParseRazorCommentWithLeadingAndTrailingWhitespace(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            var shouldRenderWhitespace = true;
+            var lastWhitespace = AcceptWhitespaceInLines();
+            var startOfLine = Context.StartOfLine;
+            if (lastWhitespace != null)
+            {
+                // Don't render the whitespace between the start of the line and the razor comment.
+                if (startOfLine)
+                {
+                    AcceptMarkerTokenIfNecessary();
+                    // Output the tokens that may have been accepted prior to the whitespace.
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    shouldRenderWhitespace = false;
+                }
+
+                Accept(lastWhitespace);
+                lastWhitespace = null;
+            }
+
+            AcceptMarkerTokenIfNecessary();
+            if (shouldRenderWhitespace)
+            {
+                builder.Add(OutputAsMarkupLiteral());
+            }
+            else
+            {
+                builder.Add(OutputAsMarkupEphemeralLiteral());
+            }
+
+            var comment = ParseRazorComment();
+            builder.Add(comment);
+
+            // Handle the whitespace and newline at the end of a razor comment.
+            if (startOfLine &&
+                (At(SyntaxKind.NewLine) ||
+                (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine))))
+            {
+                AcceptWhile(IsSpacingToken(includeNewLines: false));
+                AcceptAndMoveNext();
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMarkupEphemeralLiteral());
+            }
+        }
+
+        private void ParseMisc(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (Context.NullGenerateWhitespaceAndNewLine)
+            {
+                // Usually this is set to true when a Code block ends and there is whitespace left after it.
+                // We don't want to write it to output.
+                Context.NullGenerateWhitespaceAndNewLine = false;
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                AcceptWhile(IsSpacingToken(includeNewLines: false));
+                if (At(SyntaxKind.NewLine))
+                {
+                    AcceptAndMoveNext();
+                }
+
+                builder.Add(OutputAsMarkupEphemeralLiteral());
+            }
+
+            AcceptWhile(IsSpacingToken(includeNewLines: true));
+        }
+
+        private bool ScriptTagExpectsHtml(MarkupTagBlockSyntax tagBlock)
+        {
+            MarkupAttributeBlockSyntax typeAttribute = null;
+            for (var i = 0; i < tagBlock.Children.Count; i++)
+            {
+                var node = tagBlock.Children[i];
                 if (node.IsToken || node.IsTrivia)
                 {
                     continue;
@@ -1049,7 +555,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        protected SyntaxToken AcceptAllButLastDoubleHyphens()
+        // Internal for testing.
+        internal SyntaxToken AcceptAllButLastDoubleHyphens()
         {
             var lastDoubleHyphen = CurrentToken;
             AcceptWhile(s =>
@@ -1084,7 +591,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             while (!EndOfFile)
             {
-                SkipToAndParseCode(builder, endSequence[0]);
+                ParseMarkupNodes(builder, ParseMode.Text, t => t.Kind == endSequence[0]);
                 if (AcceptAll(endSequence))
                 {
                     return true;
@@ -1095,813 +602,213 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        public MarkupBlockSyntax ParseBlock()
+        private ParserState GetParserState(ParseMode mode)
         {
-            if (Context == null)
+            var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true));
+            try
             {
-                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-            }
-
-            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-            using (PushSpanContextConfig(DefaultMarkupSpanContext))
-            {
-                var builder = pooledResult.Builder;
-                if (!NextToken())
+                if (!whitespace.Any() && EndOfFile)
                 {
-                    return null;
+                    return ParserState.EOF;
                 }
-
-                AcceptWhile(IsSpacingToken(includeNewLines: true));
-
-                if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+                else if (At(SyntaxKind.RazorCommentTransition))
                 {
-                    // "<" => Implicit Tag Block
-                    ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+                    // Let the comment parser handle the preceding whitespace.
+                    return ParserState.RazorComment;
                 }
-                else if (CurrentToken.Kind == SyntaxKind.Transition)
+                else if (At(SyntaxKind.Transition))
                 {
-                    // "@" => Explicit Tag/Single Line Block OR Template
-
-                    // Output whitespace
-                    builder.Add(OutputAsMarkupLiteral());
-
-                    // Definitely have a transition span
-                    Assert(SyntaxKind.Transition);
-                    AcceptAndMoveNext();
-                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                    var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-                    builder.Add(transition);
-                    if (At(SyntaxKind.Transition))
+                    if (NextIs(SyntaxKind.Transition))
                     {
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        AcceptAndMoveNext();
-                        builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                        return ParserState.DoubleTransition;
                     }
-                    ParseAfterTransition(builder);
+
+                    // Let the transition parser handle the preceding whitespace.
+                    return ParserState.CodeTransition;
                 }
-                else
+                else if (whitespace.Any())
                 {
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
-                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                    // This whitespace isn't sensitive to what comes after it.
+                    return ParserState.Misc;
                 }
-                builder.Add(OutputAsMarkupLiteral());
-
-                var markupBlock = builder.ToList();
-
-                return SyntaxFactory.MarkupBlock(markupBlock);
-            }
-        }
-
-        private void ParseAfterTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // "@:" => Explicit Single Line Block
-            if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
-            {
-                // Split the token
-                var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
-
-                // The first part (left) is added to this span and we return a MetaCode span
-                Accept(split.Item1);
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
-                if (split.Item2 != null)
+                else if (mode == ParseMode.Text)
                 {
-                    Accept(split.Item2);
+                    // We don't want to parse as tags in Text mode. We do this for cases like script tags or <!-- -->.
+                    return ParserState.MarkupText;
                 }
-                NextToken();
-                ParseSingleLineMarkup(builder);
-            }
-            else if (CurrentToken.Kind == SyntaxKind.OpenAngle)
-            {
-                ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
-            }
-        }
-
-        private void ParseSingleLineMarkup(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Parse until a newline, it's that simple!
-            // First, signal to code parser that whitespace is significant to us.
-            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
-            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
-            SpanContext.EditHandler = new SpanEditHandler(Language.TokenizeString);
-            SkipToAndParseCode(builder, SyntaxKind.NewLine);
-            if (!EndOfFile && CurrentToken.Kind == SyntaxKind.NewLine)
-            {
-                AcceptAndMoveNext();
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-            PutCurrentBack();
-            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
-            builder.Add(OutputAsMarkupLiteral());
-        }
-
-        private void ParseTagBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            // TODO: This is really ugly and needs to be cleaned up.
-
-            // Skip Whitespace and Text
-            var completeTag = false;
-            var blockAlreadyBuilt = false;
-            do
-            {
-                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
-
-                // Output everything prior to the OpenAngle into a markup span
-                builder.Add(OutputAsMarkupLiteral());
-
-                var tagBuilder = builder;
-                IDisposable tagBuilderDisposable = null;
-                try
+                else if (At(SyntaxKind.OpenAngle))
                 {
-                    if (EndOfFile)
+                    if (NextIs(SyntaxKind.Bang))
                     {
-                        // Do not want to start a new tag block if we're at the end of the file.
-                        EndTagBlock(builder, tags, complete: true);
-                    }
-                    else
-                    {
-                        var atSpecialTag = AtSpecialTag;
-                        if (!atSpecialTag)
+                        // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
+                        if (!IsBangEscape(lookahead: 1))
                         {
-                            // Start a tag block.  This is used to wrap things like <p> or <a class="btn"> etc.
-                            var pooledResult = Pool.Allocate<RazorSyntaxNode>();
-                            tagBuilderDisposable = pooledResult;
-                            tagBuilder = pooledResult.Builder;
-                        }
-                        _bufferedOpenAngle = null;
-                        _lastTagStart = CurrentStart;
-                        Assert(SyntaxKind.OpenAngle);
-                        _bufferedOpenAngle = CurrentToken;
-                        var tagStart = CurrentStart;
-                        if (!NextToken())
-                        {
-                            Accept(_bufferedOpenAngle);
-                            EndTagBlock(tagBuilder, tags, complete: false);
-                        }
-                        else if (atSpecialTag && At(SyntaxKind.Bang))
-                        {
-                            Accept(_bufferedOpenAngle);
-                            completeTag = ParseBangTag(builder);
-                            blockAlreadyBuilt = completeTag;
-                        }
-                        else
-                        {
-                            var result = ParseAfterTagStart(tagBuilder, builder, tagStart, tags);
-                            completeTag = result.Item1;
-                            blockAlreadyBuilt = result.Item2;
-                        }
-                    }
-
-                    if (completeTag)
-                    {
-                        // Completed tags have no accepted characters inside of blocks.
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                    }
-
-                    if (blockAlreadyBuilt)
-                    {
-                        // Output the contents of the tag into its own markup span.
-                        builder.Add(OutputAsMarkupLiteral());
-                    }
-                    else if (tagBuilderDisposable != null)
-                    {
-                        // A new tag block was started. Build it.
-                        // Output the contents of the tag into its own markup span.
-                        tagBuilder.Add(OutputAsMarkupLiteral());
-                        var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
-                        builder.Add(tagBlock);
-                    }
-                }
-                finally
-                {
-                    // Will be null if we were at end of file or special tag when initially created.
-                    if (tagBuilderDisposable != null)
-                    {
-                        // End tag block
-                        tagBuilderDisposable.Dispose();
-                    }
-                }
-            }
-            while (tags.Count > 0);
-
-            EndTagBlock(builder, tags, completeTag);
-        }
-
-        private Tuple<bool, bool> ParseAfterTagStart(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            SourceLocation tagStart,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            var blockAlreadyBuilt = false;
-            if (!EndOfFile)
-            {
-                switch (CurrentToken.Kind)
-                {
-                    case SyntaxKind.ForwardSlash:
-                        // End Tag
-                        return ParseEndTag(builder, parentBuilder, tagStart, tags);
-                    case SyntaxKind.QuestionMark:
-                        // XML PI
-                        Accept(_bufferedOpenAngle);
-                        var complete = TryParseXmlPI(builder);
-                        // No block is created for Xml PI. So return the same value as complete.
-                        blockAlreadyBuilt = complete;
-                        return Tuple.Create(complete, blockAlreadyBuilt);
-                    default:
-                        // Start Tag
-                        return ParseStartTag(builder, parentBuilder, tags);
-                }
-            }
-            if (tags.Count == 0)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_OuterTagMissingName(
-                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
-            }
-
-            return Tuple.Create(false, blockAlreadyBuilt);
-        }
-
-        private Tuple<bool, bool> ParseStartTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            SyntaxToken bangToken = null;
-            SyntaxToken potentialTagNameToken;
-
-            if (At(SyntaxKind.Bang))
-            {
-                bangToken = CurrentToken;
-
-                potentialTagNameToken = Lookahead(count: 1);
-            }
-            else
-            {
-                potentialTagNameToken = CurrentToken;
-            }
-
-            SyntaxToken tagName;
-
-            if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.Text)
-            {
-                tagName = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
-            }
-            else if (bangToken != null)
-            {
-                tagName = SyntaxFactory.Token(SyntaxKind.Text, "!" + potentialTagNameToken.Content);
-            }
-            else
-            {
-                tagName = potentialTagNameToken;
-            }
-
-            var tag = Tuple.Create(tagName, _lastTagStart);
-
-            if (tags.Count == 0 &&
-                // Note tagName may contain a '!' escape character. This ensures <!text> doesn't match here.
-                // <!text> tags are treated like any other escaped HTML start tag.
-                string.Equals(tag.Item1.Content, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
-            {
-                builder.Add(OutputAsMarkupLiteral());
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-
-                Accept(_bufferedOpenAngle);
-                var textLocation = CurrentStart;
-                Assert(SyntaxKind.Text);
-
-                AcceptAndMoveNext();
-
-                var bookmark = CurrentStart.AbsoluteIndex;
-                var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-                var empty = At(SyntaxKind.ForwardSlash);
-                if (empty)
-                {
-                    Accept(tokens);
-                    Assert(SyntaxKind.ForwardSlash);
-                    AcceptAndMoveNext();
-                    bookmark = CurrentStart.AbsoluteIndex;
-                    tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-                }
-
-                if (!TryAccept(SyntaxKind.CloseAngle))
-                {
-                    Context.Source.Position = bookmark;
-                    NextToken();
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
-
-                    RecoverTextTag();
-                }
-                else
-                {
-                    Accept(tokens);
-                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                }
-
-                if (!empty)
-                {
-                    tags.Push(tag);
-                }
-
-                var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-                builder.Add(transition);
-                var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-                parentBuilder.Add(tagBlock);
-
-                return Tuple.Create(true, true);
-            }
-
-            Accept(_bufferedOpenAngle);
-            ParseOptionalBangEscape(builder);
-            TryAccept(SyntaxKind.Text);
-            return ParseRestOfTag(builder, parentBuilder, tag, tags);
-        }
-
-        private Tuple<bool, bool> ParseRestOfTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            Tuple<SyntaxToken, SourceLocation> tag,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            var blockAlreadyBuilt = false;
-            ParseTagContent(builder);
-
-            // We are now at a possible end of the tag
-            // Found '<', so we just abort this tag.
-            if (At(SyntaxKind.OpenAngle))
-            {
-                return Tuple.Create(false, blockAlreadyBuilt);
-            }
-
-            var isEmpty = At(SyntaxKind.ForwardSlash);
-            // Found a solidus, so don't accept it but DON'T push the tag to the stack
-            if (isEmpty)
-            {
-                AcceptAndMoveNext();
-            }
-
-            // Check for the '>' to determine if the tag is finished
-            var seenClose = TryAccept(SyntaxKind.CloseAngle);
-            if (!seenClose)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(tag.Item2, "<"),
-                            Math.Max(tag.Item1.Content.Length, 1)),
-                        tag.Item1.Content));
-            }
-            else
-            {
-                if (!isEmpty)
-                {
-                    // Is this a void element?
-                    var tagName = tag.Item1.Content.Trim();
-                    if (VoidElements.Contains(tagName))
-                    {
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        builder.Add(OutputAsMarkupLiteral());
-                        var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-                        parentBuilder.Add(tagBlock);
-                        blockAlreadyBuilt = true;
-
-                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
-                        // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it
-                        // Place a bookmark
-                        var bookmark = CurrentStart.AbsoluteIndex;
-
-                        // Skip whitespace
-                        var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
-
-                        // Open Angle
-                        if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
-                        {
-                            var openAngle = CurrentToken;
-                            NextToken();
-                            Assert(SyntaxKind.ForwardSlash);
-                            var solidus = CurrentToken;
-                            NextToken();
-                            if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
+                            if (IsHtmlCommentAhead())
                             {
-                                // Accept up to here
-                                Accept(whiteSpace);
-                                parentBuilder.Add(OutputAsMarkupLiteral()); // Output the whitespace
-
-                                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                                {
-                                    var tagBuilder = pooledResult.Builder;
-                                    Accept(openAngle);
-                                    Accept(solidus);
-                                    AcceptAndMoveNext();
-
-                                    // Accept to '>', '<' or EOF
-                                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
-                                    // Accept the '>' if we saw it. And if we do see it, we're complete
-                                    var complete = TryAccept(SyntaxKind.CloseAngle);
-
-                                    if (complete)
-                                    {
-                                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                                    }
-
-                                    // Output the closing void element
-                                    tagBuilder.Add(OutputAsMarkupLiteral());
-                                    parentBuilder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
-
-                                    return Tuple.Create(complete, blockAlreadyBuilt);
-                                }
+                                return ParserState.MarkupComment;
+                            }
+                            else if (Lookahead(2)?.Kind == SyntaxKind.LeftBracket &&
+                                Lookahead(3) is SyntaxToken tagName &&
+                                string.Equals(tagName.Content, "cdata", StringComparison.OrdinalIgnoreCase) &&
+                                Lookahead(4)?.Kind == SyntaxKind.LeftBracket)
+                            {
+                                return ParserState.CData;
+                            }
+                            else
+                            {
+                                // E.g. <!DOCTYPE ...
+                                return ParserState.SpecialTag;
                             }
                         }
-
-                        // Go back to the bookmark and just finish this tag at the close angle
-                        Context.Source.Position = bookmark;
-                        NextToken();
                     }
-                    else if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                    else if (NextIs(SyntaxKind.QuestionMark))
                     {
-                        if (!CurrentScriptTagExpectsHtml(builder))
-                        {
-                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                            builder.Add(OutputAsMarkupLiteral());
-                            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-                            parentBuilder.Add(tagBlock);
-                            blockAlreadyBuilt = true;
+                        return ParserState.XmlPI;
+                    }
 
-                            SkipToEndScriptAndParseCode(parentBuilder, endTagAcceptedCharacters: AcceptedCharactersInternal.None);
-                        }
-                        else
-                        {
-                            // Push the script tag onto the tag stack, it should be treated like all other HTML tags.
-                            tags.Push(tag);
-                        }
-                    }
-                    else
-                    {
-                        // Push the tag on to the stack
-                        tags.Push(tag);
-                    }
+                    // Regular tag
+                    return ParserState.Tag;
+                }
+                else
+                {
+                    return ParserState.Unknown;
                 }
             }
-            return Tuple.Create(seenClose, blockAlreadyBuilt);
-        }
-
-        private Tuple<bool, bool> ParseEndTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            SourceLocation tagStart,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            // Accept "/" and move next
-            Assert(SyntaxKind.ForwardSlash);
-            var forwardSlash = CurrentToken;
-            if (!NextToken())
+            finally
             {
-                Accept(_bufferedOpenAngle);
-                Accept(forwardSlash);
-                return Tuple.Create(false, false);
-            }
-            else
-            {
-                var tagName = string.Empty;
-                SyntaxToken bangToken = null;
-
-                if (At(SyntaxKind.Bang))
+                if (whitespace.Any())
                 {
-                    bangToken = CurrentToken;
-
-                    var nextToken = Lookahead(count: 1);
-
-                    if (nextToken != null && nextToken.Kind == SyntaxKind.Text)
-                    {
-                        tagName = "!" + nextToken.Content;
-                    }
+                    PutCurrentBack();
+                    PutBack(whitespace);
+                    EnsureCurrent();
                 }
-                else if (At(SyntaxKind.Text))
-                {
-                    tagName = CurrentToken.Content;
-                }
-
-                var matched = RemoveTag(tags, tagName, tagStart);
-
-                if (tags.Count == 0 &&
-                    // Note tagName may contain a '!' escape character. This ensures </!text> doesn't match here.
-                    // </!text> tags are treated like any other escaped HTML end tag.
-                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) &&
-                    matched)
-                {
-                    return EndTextTag(builder, parentBuilder, forwardSlash);
-                }
-                Accept(_bufferedOpenAngle);
-                Accept(forwardSlash);
-
-                ParseOptionalBangEscape(builder);
-
-                AcceptUntil(SyntaxKind.CloseAngle);
-
-                // Accept the ">"
-                return Tuple.Create(TryAccept(SyntaxKind.CloseAngle), false);
             }
         }
 
-        private Tuple<bool, bool> EndTextTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            SyntaxToken solidus)
+        private bool TryParseBangEscape(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            Accept(_bufferedOpenAngle);
-            Accept(solidus);
-
-            var textLocation = CurrentStart;
-            Assert(SyntaxKind.Text);
-            AcceptAndMoveNext();
-
-            var seenCloseAngle = TryAccept(SyntaxKind.CloseAngle);
-
-            if (!seenCloseAngle)
+            if (IsBangEscape(lookahead: 0))
             {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+                builder.Add(OutputAsMarkupLiteral());
 
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-                RecoverTextTag();
-            }
-            else
-            {
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                // Accept the parser escape character '!'.
+                Assert(SyntaxKind.Bang);
+                AcceptAndMoveNext();
+
+                // Setup the metacode span that we will be outputing.
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output()));
+                return true;
             }
 
-            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-
-            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-            builder.Add(transition);
-            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-            parentBuilder.Add(tagBlock);
-
-            return Tuple.Create(seenCloseAngle, true);
-        }
-
-        private bool RemoveTag(Stack<Tuple<SyntaxToken, SourceLocation>> tags, string tagName, SourceLocation tagStart)
-        {
-            Tuple<SyntaxToken, SourceLocation> currentTag = null;
-            while (tags.Count > 0)
-            {
-                currentTag = tags.Pop();
-                if (string.Equals(tagName, currentTag.Item1.Content, StringComparison.OrdinalIgnoreCase))
-                {
-                    // Matched the tag
-                    return true;
-                }
-            }
-            if (currentTag != null)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(currentTag.Item2, "<"),
-                            currentTag.Item1.Content.Length),
-                        currentTag.Item1.Content));
-            }
-            else
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
-                        new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), tagName.Length), tagName));
-            }
             return false;
         }
 
-        private void RecoverTextTag()
+        private bool IsBangEscape(int lookahead)
         {
-            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
-            AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
+            var potentialBang = Lookahead(lookahead);
 
-            // Include the close angle in the text tag block if it's there, otherwise just move on
-            TryAccept(SyntaxKind.CloseAngle);
+            if (potentialBang != null &&
+                potentialBang.Kind == SyntaxKind.Bang)
+            {
+                var afterBang = Lookahead(lookahead + 1);
+
+                return afterBang != null &&
+                    afterBang.Kind == SyntaxKind.Text &&
+                    !string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase);
+            }
+
+            return false;
         }
 
-        private void EndTagBlock(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags,
-            bool complete)
+        private bool IsHtmlCommentAhead()
         {
-            if (tags.Count > 0)
+            // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
+
+            // Comments must have the following format:
+            // 1. The string "<!--"
+            // 2. Optionally, text, with the additional restriction that the text
+            //      2.1 must not start with the string ">" nor start with the string "->"
+            //      2.2 nor contain the strings
+            //          2.2.1 "<!--"
+            //          2.2.2 "-->" As we will be treating this as a comment ending, there is no need to handle this case at all.
+            //          2.2.3 "--!>"
+            //      2.3 nor end with the string "<!-".
+            // 3. The string "-->"
+
+            if (!(At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.Bang)))
             {
-                // Ended because of EOF, not matching close tag.  Throw error for last tag
-                while (tags.Count > 1)
+                return false;
+            }
+
+            // Consume '<' and '!'
+            var openAngle = EatCurrentToken();
+            var bangToken = EatCurrentToken();
+
+            try
+            {
+                if (EndOfFile || CurrentToken.Kind != SyntaxKind.DoubleHyphen)
                 {
-                    tags.Pop();
+                    return false;
                 }
-                var tag = tags.Pop();
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(tag.Item2, "<"),
-                            tag.Item1.Content.Length),
-                        tag.Item1.Content));
-            }
-            else if (complete)
-            {
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-            tags.Clear();
-            if (!Context.DesignTimeMode)
-            {
-                var shouldAcceptWhitespaceAndNewLine = true;
 
-                // Check if the previous span was a transition.
-                var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
-                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
+                // Check condition 2.1
+                if (NextIs(SyntaxKind.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(SyntaxKind.CloseAngle)))
                 {
-                    var tokens = ReadWhile(
-                        f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
+                    return false;
+                }
 
-                    // Make sure the current token is not markup, which can be html start tag or @:
-                    if (!(At(SyntaxKind.OpenAngle) ||
-                        (At(SyntaxKind.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
+                // Check condition 2.2
+                var isValidComment = false;
+                LookaheadUntil((token, prevTokens) =>
+                {
+                    if (token.Kind == SyntaxKind.DoubleHyphen)
                     {
-                        // Don't accept whitespace as markup if the end text tag is followed by csharp.
-                        shouldAcceptWhitespaceAndNewLine = false;
+                        if (NextIs(SyntaxKind.CloseAngle))
+                        {
+                            // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
+                            isValidComment = !IsCommentContentEndingInvalid(prevTokens);
+                            return true;
+                        }
+                        else if (NextIs(ns => IsHyphen(ns) && NextIs(SyntaxKind.CloseAngle)))
+                        {
+                            // Check condition 2.3: we're at the end of a comment, which has an extra dash.
+                            // Need to treat the dash as part of the content and check the ending.
+                            // However, that case would have already been checked as part of check from 2.2.1 which
+                            // would already fail this iteration and we wouldn't get here
+                            isValidComment = true;
+                            return true;
+                        }
+                        else if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.CloseAngle)))
+                        {
+                            // This is condition 2.2.3
+                            isValidComment = false;
+                            return true;
+                        }
+                    }
+                    else if (token.Kind == SyntaxKind.OpenAngle)
+                    {
+                        // Checking condition 2.2.1
+                        if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.DoubleHyphen)))
+                        {
+                            isValidComment = false;
+                            return true;
+                        }
                     }
 
-                    PutCurrentBack();
-                    PutBack(tokens);
-                    EnsureCurrent();
-                }
+                    return false;
+                });
 
-                if (shouldAcceptWhitespaceAndNewLine)
-                {
-                    // Accept whitespace and a single newline if present
-                    AcceptWhile(SyntaxKind.Whitespace);
-                    TryAccept(SyntaxKind.NewLine);
-                }
+                return isValidComment;
             }
-            else if (SpanContext.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any)
+            finally
             {
-                AcceptWhile(SyntaxKind.Whitespace);
-                TryAccept(SyntaxKind.NewLine);
+                // Put back the consumed tokens for later parsing.
+                PutCurrentBack();
+                PutBack(bangToken);
+                PutBack(openAngle);
+                EnsureCurrent();
             }
-            PutCurrentBack();
-
-            if (!complete)
-            {
-                AcceptMarkerTokenIfNecessary();
-            }
-
-            builder.Add(OutputAsMarkupLiteral());
-        }
-
-        public MarkupBlockSyntax ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
-        {
-            if (Context == null)
-            {
-                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-            }
-
-            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-            using (PushSpanContextConfig(DefaultMarkupSpanContext))
-            {
-                var builder = pooledResult.Builder;
-
-                NextToken();
-                CaseSensitive = caseSensitive;
-                NestingBlock(builder, nestingSequences);
-                AcceptMarkerTokenIfNecessary();
-                builder.Add(OutputAsMarkupLiteral());
-
-                return SyntaxFactory.MarkupBlock(builder.ToList());
-            }
-        }
-
-        private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
-        {
-            var nesting = 1;
-            while (nesting > 0 && !EndOfFile)
-            {
-                SkipToAndParseCode(builder, token =>
-                    token.Kind == SyntaxKind.Text ||
-                    token.Kind == SyntaxKind.OpenAngle);
-                if (At(SyntaxKind.Text))
-                {
-                    nesting += ProcessTextToken(builder, nestingSequences, nesting);
-                    if (CurrentToken != null)
-                    {
-                        AcceptAndMoveNext();
-                    }
-                    else if (nesting > 0)
-                    {
-                        NextToken();
-                    }
-                }
-                else
-                {
-                    ParseTagInDocumentContext(builder);
-                }
-            }
-        }
-
-        private int ProcessTextToken(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences, int currentNesting)
-        {
-            for (var i = 0; i < CurrentToken.Content.Length; i++)
-            {
-                var nestingDelta = HandleNestingSequence(builder, nestingSequences.Item1, i, currentNesting, 1);
-                if (nestingDelta == 0)
-                {
-                    nestingDelta = HandleNestingSequence(builder, nestingSequences.Item2, i, currentNesting, -1);
-                }
-
-                if (nestingDelta != 0)
-                {
-                    return nestingDelta;
-                }
-            }
-            return 0;
-        }
-
-        private int HandleNestingSequence(in SyntaxListBuilder<RazorSyntaxNode> builder, string sequence, int position, int currentNesting, int retIfMatched)
-        {
-            if (sequence != null &&
-                CurrentToken.Content[position] == sequence[0] &&
-                position + sequence.Length <= CurrentToken.Content.Length)
-            {
-                var possibleStart = CurrentToken.Content.Substring(position, sequence.Length);
-                if (string.Equals(possibleStart, sequence, Comparison))
-                {
-                    // Capture the current token and "put it back" (really we just want to clear CurrentToken)
-                    var bookmark = CurrentStart;
-                    var token = CurrentToken;
-                    PutCurrentBack();
-
-                    // Carve up the token
-                    var pair = Language.SplitToken(token, position, SyntaxKind.Text);
-                    var preSequence = pair.Item1;
-                    Debug.Assert(pair.Item2 != null);
-                    pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
-                    var sequenceToken = pair.Item1;
-                    var postSequence = pair.Item2;
-                    var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;
-
-                    // Accept the first chunk (up to the nesting sequence we just saw)
-                    if (!string.IsNullOrEmpty(preSequence.Content))
-                    {
-                        Accept(preSequence);
-                    }
-
-                    if (currentNesting + retIfMatched == 0)
-                    {
-                        // This is 'popping' the final entry on the stack of nesting sequences
-                        // A caller higher in the parsing stack will accept the sequence token, so advance
-                        // to it
-                        Context.Source.Position = bookmark.AbsoluteIndex + preSequence.Content.Length;
-                    }
-                    else
-                    {
-                        // This isn't the end of the last nesting sequence, accept the token and keep going
-                        Accept(sequenceToken);
-
-                        // Position at the start of the postSequence token, which might be null.
-                        Context.Source.Position = postSequenceBookmark;
-                    }
-
-                    // Return the value we were asked to return if matched, since we found a nesting sequence
-                    return retIfMatched;
-                }
-            }
-            return 0;
-        }
-
-        private Syntax.GreenNode GetLastSpan(RazorSyntaxNode node)
-        {
-            if (node == null)
-            {
-                return null;
-            }
-
-            // Find the last token of this node and return its immediate non-list parent.
-            var red = node.CreateRed();
-            var last = red.GetLastTerminal();
-            if (last == null)
-            {
-                return null;
-            }
-
-            while (last.Green.IsToken || last.Green.IsList)
-            {
-                last = last.Parent;
-            }
-
-            return last.Green;
-        }
-
-        private void DefaultMarkupSpanContext(SpanContextBuilder spanContext)
-        {
-            spanContext.ChunkGenerator = new MarkupChunkGenerator();
-            spanContext.EditHandler = new SpanEditHandler(Language.TokenizeString, AcceptedCharactersInternal.Any);
         }
 
         private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
@@ -1920,32 +827,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             NextToken();
         }
 
+        /// <summary>
+        /// Verifies, that the sequence doesn't end with the "&lt;!-" HtmlTokens. Note, the first token is an opening bracket token
+        /// </summary>
+        internal static bool IsCommentContentEndingInvalid(IEnumerable<SyntaxToken> sequence)
+        {
+            var reversedSequence = sequence.Reverse();
+            var index = 0;
+            foreach (var item in reversedSequence)
+            {
+                if (!item.IsEquivalentTo(nonAllowedHtmlCommentEnding[index++]))
+                {
+                    return false;
+                }
+
+                if (index == nonAllowedHtmlCommentEnding.Length)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         protected static Func<SyntaxToken, bool> IsSpacingToken(bool includeNewLines)
         {
             return token => token.Kind == SyntaxKind.Whitespace || (includeNewLines && token.Kind == SyntaxKind.NewLine);
         }
 
-        internal static bool IsValidAttributeNameToken(SyntaxToken token)
+        internal static bool IsHyphen(SyntaxToken token)
         {
-            if (token == null)
-            {
-                return false;
-            }
+            return token.Kind == SyntaxKind.Text && token.Content == "-";
+        }
 
-            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
-            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
-            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
-            // expectation that the parser handles such scenarios prior to falling through to name resolution.
-            var tokenType = token.Kind;
-            return tokenType != SyntaxKind.Whitespace &&
-                tokenType != SyntaxKind.NewLine &&
-                tokenType != SyntaxKind.CloseAngle &&
-                tokenType != SyntaxKind.OpenAngle &&
-                tokenType != SyntaxKind.ForwardSlash &&
-                tokenType != SyntaxKind.DoubleQuote &&
-                tokenType != SyntaxKind.SingleQuote &&
-                tokenType != SyntaxKind.Equals &&
-                tokenType != SyntaxKind.Marker;
+        private void DefaultMarkupSpanContext(SpanContextBuilder spanContext)
+        {
+            spanContext.ChunkGenerator = new MarkupChunkGenerator();
+            spanContext.EditHandler = new SpanEditHandler(Language.TokenizeString, AcceptedCharactersInternal.Any);
+        }
+
+        private enum ParseMode
+        {
+            Markup,
+            Text,
+        }
+
+        private enum MarkupTagMode
+        {
+            Normal,
+            Void,
+            SelfClosing,
+            Script
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
index f8cebfdd35..47799e94e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
@@ -49,6 +49,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public bool InTemplateContext { get; set; }
 
+        public bool StartOfLine { get; set; }
+
         public AcceptedCharactersInternal LastAcceptedCharacters { get; set; } = AcceptedCharactersInternal.None;
 
         public bool EndOfFile
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
index fc5b31a1e3..659d79d400 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
@@ -100,5 +100,26 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.DecimalDigitNumber;
         }
+
+        // From http://dev.w3.org/html5/spec/Overview.html#elements-0
+        public static readonly HashSet<string> VoidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "area",
+            "base",
+            "br",
+            "col",
+            "command",
+            "embed",
+            "hr",
+            "img",
+            "input",
+            "keygen",
+            "link",
+            "meta",
+            "param",
+            "source",
+            "track",
+            "wbr"
+        };
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserState.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserState.cs
new file mode 100644
index 0000000000..972fe08cca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserState.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal enum ParserState
+    {
+        CData,
+        CodeTransition,
+        DoubleTransition,
+        EOF,
+        MarkupComment,
+        MarkupText,
+        Misc,
+        RazorComment,
+        SpecialTag,
+        Tag,
+        Unknown,
+        XmlPI,
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
index ed4b881939..3ea1049ca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
@@ -243,6 +243,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return true;
         }
 
+        protected internal IEnumerable<SyntaxToken> ReadWhile(params SyntaxKind[] types)
+        {
+            return ReadWhile(token => types.Any(expected => expected == token.Kind));
+        }
+
         protected internal IEnumerable<SyntaxToken> ReadWhile(Func<SyntaxToken, bool> condition)
         {
             return ReadWhileLazy(condition).ToList();
@@ -409,12 +414,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             foreach (var token in tokens)
             {
-                foreach (var error in token.GetDiagnostics())
-                {
-                    Context.ErrorSink.OnError(error);
-                }
-
-                TokenBuilder.Add(token);
+                Accept(token);
             }
         }
 
@@ -422,6 +422,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             if (token != null)
             {
+                if (token.Kind == SyntaxKind.NewLine)
+                {
+                    Context.StartOfLine = true;
+                }
+                else if (token.Kind != SyntaxKind.Whitespace)
+                {
+                    Context.StartOfLine = false;
+                }
+
                 foreach (var error in token.GetDiagnostics())
                 {
                     Context.ErrorSink.OnError(error);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index 86b8cf4a19..4955f15294 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -11,27 +11,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 {
     internal static class SyntaxNodeExtensions
     {
-        // From http://dev.w3.org/html5/spec/Overview.html#elements-0
-        private static readonly HashSet<string> VoidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-        {
-            "area",
-            "base",
-            "br",
-            "col",
-            "command",
-            "embed",
-            "hr",
-            "img",
-            "input",
-            "keygen",
-            "link",
-            "meta",
-            "param",
-            "source",
-            "track",
-            "wbr"
-        };
-
         public static TNode WithAnnotations<TNode>(this TNode node, params SyntaxAnnotation[] annotations) where TNode : SyntaxNode
         {
             if (node == null)
@@ -333,7 +312,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 throw new ArgumentNullException(nameof(tagBlock));
             }
 
-            return VoidElements.Contains(tagBlock.GetTagName());
+            return ParserHelpers.VoidElements.Contains(tagBlock.GetTagName());
         }
     }
 }

From c8bb6c34bb98376fbcd6d31bc2fba5f0d951d885 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 29 Nov 2018 12:41:29 -0800
Subject: [PATCH 005/337] Use MVC 2.1 at design time for Razor 3.0 projects.
 (dotnet/aspnetcore-tooling#4324)

- When we detect a design time build we force tooling to use 2.1
- In runtime builds (i.e. rzc) it still uses the 3.0 configuration for 3.0 apps.

(cherry picked from commit dotnet/aspnetcore-tooling@0326abe530a99832640c3b7893de93a466fde7cf)
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a6dc88e4555a76e53eec4b99768d98b8f0d11a60
---
 ...rosoft.NET.Sdk.Razor.Configuration.targets | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index 995cb2cd90..f4a4284ca4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -50,6 +50,12 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup Condition="'$(RazorLangVersion)'==''">
     <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
+
+    <!--
+      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
+      functionally equivalent. This will be undone in the near future.
+    -->
+    <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true' AND '$(DesignTimeBuild)' == 'true'">2.1</RazorLangVersion>
   </PropertyGroup>
 
   <!--
@@ -57,6 +63,12 @@ Copyright (c) .NET Foundation. All rights reserved.
   -->
   <PropertyGroup Condition="'$(RazorDefaultConfiguration)'==''">
     <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">MVC-3.0</RazorDefaultConfiguration>
+
+    <!--
+      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
+      functionally equivalent. This will be undone in the near future.
+    -->
+    <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true' AND '$(DesignTimeBuild)' == 'true'">MVC-2.1</RazorDefaultConfiguration>
   </PropertyGroup>
 
   <ItemGroup>
@@ -65,16 +77,33 @@ Copyright (c) .NET Foundation. All rights reserved.
       it here. The IDE is hardcoded to inject 2.0 support when needed. The settings flowing through MSBuild should reflect
       the project's runtime.
     -->
-    <RazorConfiguration Include="MVC-3.0">
+    <RazorConfiguration Include="MVC-3.0" Condition="'$(DesignTimeBuild)' != 'true'">
       <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
     </RazorConfiguration>
+
+    <!--
+      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
+      functionally equivalent. This will be undone in the near future.
+    -->
+    <RazorConfiguration Include="MVC-2.1" Condition="'$(DesignTimeBuild)' == 'true'">
+      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
+    </RazorConfiguration>
   </ItemGroup>
 
   <ItemGroup>
-    <RazorExtension Include="MVC-3.0">
+    <RazorExtension Include="MVC-3.0" Condition="'$(DesignTimeBuild)' != 'true'">
       <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
       <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
     </RazorExtension>
+
+    <!--
+      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
+      functionally equivalent. This will be undone in the near future.
+    -->
+    <RazorExtension Include="MVC-2.1" Condition="'$(DesignTimeBuild)' == 'true'">
+      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
+      <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-2-1\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
+    </RazorExtension>
   </ItemGroup>
 
   <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">

From 616ec1445977fc66f2828831b67a55d5e8f5071c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Sun, 2 Dec 2018 12:36:44 -0800
Subject: [PATCH 006/337] Remove Razor Runtime projects \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/39472ca0d6ea8f25712c4888d5b2bbc5afd24bb2

---
 ...vc.Razor.Extensions.Version1_X.Test.csproj |  18 +-
 ...vc.Razor.Extensions.Version2_X.Test.csproj |  19 +-
 .../test/ViewComponentTypeVisitorTest.cs      |   3 +-
 ...spNetCore.Mvc.Razor.Extensions.Test.csproj |  17 +-
 .../test/ViewComponentTypeVisitorTest.cs      |   3 +-
 .../Microsoft.CodeAnalysis.Razor.Test.csproj  |   5 +-
 ...NetCore.Razor.Test.MvcShim.ClassLib.csproj |   5 +-
 .../TagHelperExecutionContext.cs              |  70 ++++++
 .../TagHelperRunner.cs                        |  18 ++
 .../TagHelperScopeManager.cs                  |  34 +++
 .../HtmlAttributeNameAttribute.cs             |  92 +++++++
 .../HtmlAttributeNotBoundAttribute.cs         |  21 ++
 .../HtmlAttributeValueStyle.cs                |  13 +
 .../HtmlTargetElementAttribute.cs             |  86 +++++++
 .../ITagHelper.cs                             |  16 ++
 .../OutputElementHintAttribute.cs             |  35 +++
 .../ReadOnlyTagHelperAttributeList.cs         | 190 +++++++++++++++
 .../RestrictChildrenAttribute.cs              |  42 ++++
 .../TagHelper.cs                              |  26 ++
 .../TagHelperAttribute.cs                     |  43 ++++
 .../TagHelperAttributeList.cs                 | 230 ++++++++++++++++++
 .../TagHelperContent.cs                       | 179 ++++++++++++++
 .../TagHelperContext.cs                       | 118 +++++++++
 .../TagHelperOutput.cs                        |  79 ++++++
 .../TagMode.cs                                |  26 ++
 .../TagStructure.cs                           |  28 +++
 ...tCore.Razor.Test.MvcShim.Version1_X.csproj |   5 +-
 .../DefaultRazorCompiledItem.cs               |  54 ++++
 .../IRazorSourceChecksumMetadata.cs           |  26 ++
 .../RazorCompiledItem.cs                      |  40 +++
 .../RazorCompiledItemAttribute.cs             |  60 +++++
 .../RazorCompiledItemExtensions.cs            |  30 +++
 .../RazorCompiledItemMetadataAttribute.cs     |  35 +++
 .../RazorConfigurationNameAttribute.cs        |  38 +++
 .../RazorExtensionAssemblyNameAttribute.cs    |  50 ++++
 .../RazorLanguageVersionAttribute.cs          |  38 +++
 .../RazorSourceChecksumAttribute.cs           |  67 +++++
 .../TagHelperExecutionContext.cs              |  70 ++++++
 .../TagHelperRunner.cs                        |  18 ++
 .../TagHelperScopeManager.cs                  |  34 +++
 .../HtmlAttributeNameAttribute.cs             |  92 +++++++
 .../HtmlAttributeNotBoundAttribute.cs         |  21 ++
 .../HtmlAttributeValueStyle.cs                |  13 +
 .../HtmlTargetElementAttribute.cs             |  86 +++++++
 .../ITagHelper.cs                             |  13 +
 .../ITagHelperComponent.cs                    |  41 ++++
 .../OutputElementHintAttribute.cs             |  35 +++
 .../ReadOnlyTagHelperAttributeList.cs         | 190 +++++++++++++++
 .../RestrictChildrenAttribute.cs              |  42 ++++
 .../TagHelper.cs                              |  26 ++
 .../TagHelperAttribute.cs                     |  43 ++++
 .../TagHelperAttributeList.cs                 | 230 ++++++++++++++++++
 .../TagHelperComponent.cs                     |  39 +++
 .../TagHelperContent.cs                       | 179 ++++++++++++++
 .../TagHelperContext.cs                       | 118 +++++++++
 .../TagHelperOutput.cs                        |  79 ++++++
 .../TagMode.cs                                |  26 ++
 .../TagStructure.cs                           |  28 +++
 ...tCore.Razor.Test.MvcShim.Version2_X.csproj |   5 +-
 .../DefaultRazorCompiledItem.cs               |  54 ++++
 .../IRazorSourceChecksumMetadata.cs           |  26 ++
 .../RazorCompiledItem.cs                      |  40 +++
 .../RazorCompiledItemAttribute.cs             |  60 +++++
 .../RazorCompiledItemExtensions.cs            |  30 +++
 .../RazorCompiledItemMetadataAttribute.cs     |  35 +++
 .../RazorConfigurationNameAttribute.cs        |  38 +++
 .../RazorExtensionAssemblyNameAttribute.cs    |  50 ++++
 .../RazorLanguageVersionAttribute.cs          |  38 +++
 .../RazorSourceChecksumAttribute.cs           |  67 +++++
 .../TagHelperExecutionContext.cs              |  70 ++++++
 .../TagHelperRunner.cs                        |  18 ++
 .../TagHelperScopeManager.cs                  |  34 +++
 .../HtmlAttributeNameAttribute.cs             |  92 +++++++
 .../HtmlAttributeNotBoundAttribute.cs         |  21 ++
 .../HtmlAttributeValueStyle.cs                |  13 +
 .../HtmlTargetElementAttribute.cs             |  86 +++++++
 .../ITagHelper.cs                             |  13 +
 .../ITagHelperComponent.cs                    |  41 ++++
 .../OutputElementHintAttribute.cs             |  35 +++
 .../ReadOnlyTagHelperAttributeList.cs         | 190 +++++++++++++++
 .../RestrictChildrenAttribute.cs              |  42 ++++
 .../TagHelper.cs                              |  26 ++
 .../TagHelperAttribute.cs                     |  43 ++++
 .../TagHelperAttributeList.cs                 | 230 ++++++++++++++++++
 .../TagHelperComponent.cs                     |  39 +++
 .../TagHelperContent.cs                       | 179 ++++++++++++++
 .../TagHelperContext.cs                       | 118 +++++++++
 .../TagHelperOutput.cs                        |  79 ++++++
 .../TagMode.cs                                |  26 ++
 .../TagStructure.cs                           |  28 +++
 ...osoft.AspNetCore.Razor.Test.MvcShim.csproj |   5 +-
 .../AppWithP2PReference.csproj                |   3 -
 .../ClassLibrary/ClassLibrary.csproj          |   3 -
 .../ClassLibrary2/ClassLibrary2.csproj        |   3 -
 .../LargeProject/LargeProject.csproj          |   3 -
 .../MvcWithComponents.csproj                  |   3 -
 .../testassets/SimpleMvc/SimpleMvc.csproj     |   3 -
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |   3 -
 .../testassets/SimplePages/SimplePages.csproj |   3 -
 99 files changed, 5087 insertions(+), 90 deletions(-)
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index c6a894ee1f..60f85d388f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -13,9 +13,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+    
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,19 +26,6 @@
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>Content</OutputItemType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Targets>Build</Targets>
-    </ProjectReference>
-
-    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.deps.json" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
index 82d2483d0b..5f09868d52 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -13,9 +13,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+    
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,20 +26,6 @@
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>Content</OutputItemType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Targets>Build</Targets>
-    </ProjectReference>
-
-    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
-  </ItemGroup>
-
-
   <Target Name="CopyDepsFromShims" AfterTargets="Build">
     <ItemGroup>
       <MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.deps.json" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs
index 206b74375d..ad75c89bfb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTypeVisitorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
@@ -13,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
     {
         private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly;
 
-        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+        private static CSharpCompilation Compilation { get; } = TestCompilation.Create(_assembly);
 
         // In practice MVC will provide a marker attribute for ViewComponents. To prevent a circular reference between MVC and Razor
         // we can use a test class as a marker.
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 35bf3f778c..310177f1b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -13,9 +13,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,19 +25,6 @@
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>Content</OutputItemType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Targets>Build</Targets>
-    </ProjectReference>
-
-    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
-  </ItemGroup>
-
   <Target Name="CopyDepsFromShims" AfterTargets="Build">
     <ItemGroup>
       <MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs
index 48e8cfeec8..3e72a824bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTypeVisitorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
@@ -13,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
     {
         private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly;
 
-        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+        private static CSharpCompilation Compilation { get; } = TestCompilation.Create(_assembly);
 
         // In practice MVC will provide a marker attribute for ViewComponents. To prevent a circular reference between MVC and Razor
         // we can use a test class as a marker.
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
index fa77866791..8334edb354 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -14,9 +14,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    
+     <!-- Included for definitions of Tag Helper types -->
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
index 7043de7d02..ec9b435178 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
@@ -5,10 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
new file mode 100644
index 0000000000..011d59083c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperExecutionContext
+    {
+        public TagHelperExecutionContext(
+            string tagName,
+            TagMode tagMode,
+            IDictionary<object, object> items,
+            string uniqueId,
+            Func<Task> executeChildContentAsync,
+            Action<HtmlEncoder> startTagHelperWritingScope,
+            Func<TagHelperContent> endTagHelperWritingScope)
+        {
+        }
+
+        public bool ChildContentRetrieved => false;
+
+        public IDictionary<object, object> Items { get; private set; }
+
+        public IList<ITagHelper> TagHelpers => null;
+
+        public TagHelperOutput Output { get; internal set; }
+
+        public TagHelperContext Context { get; }
+
+        public void Add(ITagHelper tagHelper)
+        {
+        }
+
+        public void AddHtmlAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public void AddHtmlAttribute(TagHelperAttribute attribute)
+        {
+        }
+
+        public void AddTagHelperAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public void AddTagHelperAttribute(TagHelperAttribute attribute)
+        {
+        }
+
+        public void Reinitialize(
+            string tagName,
+            TagMode tagMode,
+            IDictionary<object, object> items,
+            string uniqueId,
+            Func<Task> executeChildContentAsync)
+        {
+        }
+
+        public Task SetOutputContentAsync()
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
new file mode 100644
index 0000000000..21f2b5b6fa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperRunner
+    {
+        public Task RunAsync(TagHelperExecutionContext executionContext)
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
new file mode 100644
index 0000000000..70f072bbc4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperScopeManager
+    {
+        public TagHelperScopeManager(
+            Action<HtmlEncoder> startTagHelperWritingScope,
+            Func<TagHelperContent> endTagHelperWritingScope)
+        {
+        }
+
+        public TagHelperExecutionContext Begin(
+            string tagName,
+            TagMode tagMode,
+            string uniqueId,
+            Func<Task> executeChildContentAsync)
+        {
+            throw null;
+        }
+
+        public TagHelperExecutionContext End()
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
new file mode 100644
index 0000000000..aca16610b0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Used to override an <see cref="ITagHelper"/> property's HTML attribute name.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class HtmlAttributeNameAttribute : Attribute
+    {
+        private string _dictionaryAttributePrefix;
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNameAttribute"/> class with <see cref="Name"/>
+        /// equal to <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// Associated property must not have a public setter and must be compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </remarks>
+        public HtmlAttributeNameAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNameAttribute"/> class.
+        /// </summary>
+        /// <param name="name">
+        /// HTML attribute name for the associated property. Must be <c>null</c> or empty if associated property does
+        /// not have a public setter and is compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>. Otherwise must not be <c>null</c> or empty.
+        /// </param>
+        public HtmlAttributeNameAttribute(string name)
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// HTML attribute name of the associated property.
+        /// </summary>
+        /// <value>
+        /// <c>null</c> or empty if and only if associated property does not have a public setter and is compatible
+        /// with <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets or sets the prefix used to match HTML attribute names. Matching attributes are added to the
+        /// associated property (an <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/>).
+        /// </summary>
+        /// <remarks>
+        /// If non-<c>null</c> associated property must be compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </remarks>
+        /// <value>
+        /// <para>
+        /// If associated property is compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/>, default value is <c>Name + "-"</c>.
+        /// <see cref="Name"/> must not be <c>null</c> or empty in this case.
+        /// </para>
+        /// <para>
+        /// Otherwise default value is <c>null</c>.
+        /// </para>
+        /// </value>
+        public string DictionaryAttributePrefix
+        {
+            get
+            {
+                return _dictionaryAttributePrefix;
+            }
+            set
+            {
+                _dictionaryAttributePrefix = value;
+                DictionaryAttributePrefixSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets an indication whether <see cref="DictionaryAttributePrefix"/> has been set. Used to distinguish an
+        /// uninitialized <see cref="DictionaryAttributePrefix"/> value from an explicit <c>null</c> setting.
+        /// </summary>
+        /// <value><c>true</c> if <see cref="DictionaryAttributePrefix"/> was set. <c>false</c> otherwise.</value>
+        public bool DictionaryAttributePrefixSet { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
new file mode 100644
index 0000000000..9d23480abd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Indicates the associated <see cref="ITagHelper"/> property should not be bound to HTML attributes.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class HtmlAttributeNotBoundAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNotBoundAttribute"/> class.
+        /// </summary>
+        public HtmlAttributeNotBoundAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
new file mode 100644
index 0000000000..7ac198567f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public enum HtmlAttributeValueStyle
+    {
+        DoubleQuotes,
+        SingleQuotes,
+        NoQuotes,
+        Minimized,
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
new file mode 100644
index 0000000000..857d6a0e5d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides an <see cref="ITagHelper"/>'s target.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
+    public sealed class HtmlTargetElementAttribute : Attribute
+    {
+        public const string ElementCatchAllTarget = "*";
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlTargetElementAttribute"/> class that targets all HTML
+        /// elements with the required <see cref="Attributes"/>.
+        /// </summary>
+        /// <remarks><see cref="Tag"/> is set to <c>*</c>.</remarks>
+        public HtmlTargetElementAttribute()
+            : this(ElementCatchAllTarget)
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlTargetElementAttribute"/> class with the given
+        /// <paramref name="tag"/> as its <see cref="Tag"/> value.
+        /// </summary>
+        /// <param name="tag">
+        /// The HTML tag the <see cref="ITagHelper"/> targets.
+        /// </param>
+        /// <remarks>A <c>*</c> <paramref name="tag"/> value indicates this <see cref="ITagHelper"/>
+        /// targets all HTML elements with the required <see cref="Attributes"/>.</remarks>
+        public HtmlTargetElementAttribute(string tag)
+        {
+            Tag = tag;
+        }
+
+        /// <summary>
+        /// The HTML tag the <see cref="ITagHelper"/> targets. A <c>*</c> value indicates this <see cref="ITagHelper"/>
+        /// targets all HTML elements with the required <see cref="Attributes"/>.
+        /// </summary>
+        public string Tag { get; }
+
+        /// <summary>
+        /// A comma-separated <see cref="string"/> of attribute selectors the HTML element must match for the
+        /// <see cref="ITagHelper"/> to run. <c>*</c> at the end of an attribute name acts as a prefix match. A value
+        /// surrounded by square brackets is handled as a CSS attribute value selector. Operators <c>^=</c>, <c>$=</c> and
+        /// <c>=</c> are supported e.g. <c>"name"</c>, <c>"[name]"</c>, <c>"[name=value]"</c>, <c>"[ name ^= 'value' ]"</c>.
+        /// </summary>
+        public string Attributes { get; set; }
+
+        /// <summary>
+        /// The expected tag structure. Defaults to <see cref="TagStructure.Unspecified"/>.
+        /// </summary>
+        /// <remarks>
+        /// If <see cref="TagStructure.Unspecified"/> and no other tag helpers applying to the same element specify
+        /// their <see cref="TagStructure"/> the <see cref="TagStructure.NormalOrSelfClosing"/> behavior is used:
+        /// <para>
+        /// <code>
+        /// &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt;
+        /// &lt;!-- OR --&gt;
+        /// &lt;my-tag-helper /&gt;
+        /// </code>
+        /// Otherwise, if another tag helper applying to the same element does specify their behavior, that behavior
+        /// is used.
+        /// </para>
+        /// <para>
+        /// If <see cref="TagStructure.WithoutEndTag"/> HTML elements can be written in the following formats:
+        /// <code>
+        /// &lt;my-tag-helper&gt;
+        /// &lt;!-- OR --&gt;
+        /// &lt;my-tag-helper /&gt;
+        /// </code>
+        /// </para>
+        /// </remarks>
+        public TagStructure TagStructure { get; set; }
+
+        /// <summary>
+        /// The required HTML element name of the direct parent. A <c>null</c> value indicates any HTML element name is
+        /// allowed.
+        /// </summary>
+        public string ParentTag { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
new file mode 100644
index 0000000000..2f175f386a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
@@ -0,0 +1,16 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public interface ITagHelper
+    {
+        int Order { get; }
+
+        void Init(TagHelperContext context);
+
+        Task ProcessAsync(TagHelperContext context, TagHelperOutput output);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
new file mode 100644
index 0000000000..a97b5ef9ab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides a hint of the <see cref="ITagHelper"/>'s output element.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+    public sealed class OutputElementHintAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="OutputElementHintAttribute"/> class.
+        /// </summary>
+        /// <param name="outputElement">
+        /// The HTML element the <see cref="ITagHelper"/> may output.
+        /// </param>
+        public OutputElementHintAttribute(string outputElement)
+        {
+            if (outputElement == null)
+            {
+                throw new ArgumentNullException(nameof(outputElement));
+            }
+
+            OutputElement = outputElement;
+        }
+
+        /// <summary>
+        /// The HTML element the <see cref="ITagHelper"/> may output.
+        /// </summary>
+        public string OutputElement { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
new file mode 100644
index 0000000000..f3d1569a59
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
@@ -0,0 +1,190 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// A read-only collection of <see cref="TagHelperAttribute"/>s.
+    /// </summary>
+    public abstract class ReadOnlyTagHelperAttributeList : ReadOnlyCollection<TagHelperAttribute>
+    {
+        private static readonly IReadOnlyList<TagHelperAttribute> EmptyList = new TagHelperAttribute[0];
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ReadOnlyTagHelperAttributeList"/> with an empty
+        /// collection.
+        /// </summary>
+        protected ReadOnlyTagHelperAttributeList()
+            : base(new List<TagHelperAttribute>())
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ReadOnlyTagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public ReadOnlyTagHelperAttributeList(IList<TagHelperAttribute> attributes)
+            : base(attributes)
+        {
+        }
+
+        /// <summary>
+        /// Gets the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of the <see cref="TagHelperAttribute"/> to get.
+        /// </param>
+        /// <returns>The first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public TagHelperAttribute this[string name]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                // Perf: Avoid allocating enumerator
+                for (var i = 0; i < Items.Count; i++)
+                {
+                    if (NameEquals(name, Items[i]))
+                    {
+                        return Items[i];
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/> exists in the collection.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/> to get.</param>
+        /// <returns>
+        /// <c>true</c> if a <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool ContainsName(string name)
+        {
+            return this[name] != null;
+        }
+
+        /// <summary>
+        /// Retrieves the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/> to get.</param>
+        /// <param name="attribute">When this method returns, the first <see cref="TagHelperAttribute"/> with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>, if found; otherwise,
+        /// <c>null</c>.</param>
+        /// <returns><c>true</c> if a <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.</returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool TryGetAttribute(string name, out TagHelperAttribute attribute)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            attribute = this[name];
+
+            return attribute != null;
+        }
+
+        /// <summary>
+        /// Retrieves <see cref="TagHelperAttribute"/>s in the collection with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/>s to get.</param>
+        /// <param name="attributes">When this method returns, the <see cref="TagHelperAttribute"/>s with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>.</param>
+        /// <returns><c>true</c> if at least one <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.</returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool TryGetAttributes(string name, out IReadOnlyList<TagHelperAttribute> attributes)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            // Perf: Avoid allocating enumerator
+            List<TagHelperAttribute> matchedAttributes = null;
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    if (matchedAttributes == null)
+                    {
+                        matchedAttributes = new List<TagHelperAttribute>();
+                    }
+
+                    matchedAttributes.Add(Items[i]);
+                }
+            }
+            attributes = matchedAttributes ?? EmptyList;
+
+            return matchedAttributes != null;
+        }
+
+        /// <summary>
+        /// Searches for a <see cref="TagHelperAttribute"/> who's <see cref="TagHelperAttribute.Name"/>
+        /// case-insensitively matches <paramref name="name"/> and returns the zero-based index of the first
+        /// occurrence.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> to locate in the collection.</param>
+        /// <returns>The zero-based index of the first matching <see cref="TagHelperAttribute"/> within the collection,
+        /// if found; otherwise, -1.</returns>
+        public int IndexOfName(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Determines if the specified <paramref name="attribute"/> has the same name as <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The value to compare against <paramref name="attribute"/>s
+        /// <see cref="TagHelperAttribute.Name"/>.</param>
+        /// <param name="attribute">The attribute to compare against.</param>
+        /// <returns><c>true</c> if <paramref name="name"/> case-insensitively matches <paramref name="attribute"/>s
+        /// <see cref="TagHelperAttribute.Name"/>.</returns>
+        protected static bool NameEquals(string name, TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return string.Equals(name, attribute.Name, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
new file mode 100644
index 0000000000..bc4f6bac35
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Restricts children of the <see cref="ITagHelper"/>'s element.
+    /// </summary>
+    /// <remarks>Combining this attribute with a <see cref="HtmlTargetElementAttribute"/> that specifies its
+    /// <see cref="HtmlTargetElementAttribute.TagStructure"/> as <see cref="TagStructure.WithoutEndTag"/> will result
+    /// in this attribute being ignored.</remarks>
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    public class RestrictChildrenAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="RestrictChildrenAttribute"/> class.
+        /// </summary>
+        /// <param name="childTag">
+        /// The tag name of an element allowed as a child.
+        /// </param>
+        /// <param name="childTags">
+        /// Additional names of elements allowed as children.
+        /// </param>
+        public RestrictChildrenAttribute(string childTag, params string[] childTags)
+        {
+            var concatenatedNames = new string[1 + childTags.Length];
+            concatenatedNames[0] = childTag;
+
+            childTags.CopyTo(concatenatedNames, 1);
+
+            ChildTags = concatenatedNames;
+        }
+
+        /// <summary>
+        /// Get the names of elements allowed as children.
+        /// </summary>
+        public IEnumerable<string> ChildTags { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
new file mode 100644
index 0000000000..ed9faca1bb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
@@ -0,0 +1,26 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public abstract class TagHelper : ITagHelper
+    {
+        public virtual int Order { get; } = 0;
+
+        public virtual void Init(TagHelperContext context)
+        {
+        }
+
+        public virtual void Process(TagHelperContext context, TagHelperOutput output)
+        {
+        }
+
+        public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            Process(context, output);
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
new file mode 100644
index 0000000000..7bdd2aea22
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public class TagHelperAttribute : IHtmlContentContainer
+    {
+        public TagHelperAttribute(string name)
+        {
+        }
+
+        public TagHelperAttribute(string name, object value)
+        {
+        }
+
+        public TagHelperAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public string Name { get; }
+
+        public object Value { get; }
+
+        public HtmlAttributeValueStyle ValueStyle { get; }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+
+        public void CopyTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        public void MoveTo(IHtmlContentBuilder destination)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
new file mode 100644
index 0000000000..308292294c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
@@ -0,0 +1,230 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// A collection of <see cref="TagHelperAttribute"/>s.
+    /// </summary>
+    public class TagHelperAttributeList : ReadOnlyTagHelperAttributeList, IList<TagHelperAttribute>
+    {
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with an empty collection.
+        /// </summary>
+        public TagHelperAttributeList()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public TagHelperAttributeList(IEnumerable<TagHelperAttribute> attributes)
+            : base (new List<TagHelperAttribute>(attributes))
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public TagHelperAttributeList(List<TagHelperAttribute> attributes)
+            : base(attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <paramref name="value"/>'s <see cref="TagHelperAttribute.Name"/> must not be <c>null</c>.
+        /// </remarks>
+        public new TagHelperAttribute this[int index]
+        {
+            get
+            {
+                return base[index];
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                Items[index] = value;
+            }
+        }
+
+        /// <summary>
+        /// Replaces the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="name"/> and removes any additional matching <see cref="TagHelperAttribute"/>s. If a
+        /// matching <see cref="TagHelperAttribute"/> is not found, adds a <see cref="TagHelperAttribute"/> with
+        /// <paramref name="name"/> and <paramref name="value"/> to the end of the collection.</summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of the <see cref="TagHelperAttribute"/> to set.
+        /// </param>
+        /// <param name="value">
+        /// The <see cref="TagHelperAttribute.Value"/> to set.
+        /// </param>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public void SetAttribute(string name, object value)
+        {
+            var attribute = new TagHelperAttribute(name, value);
+            SetAttribute(attribute);
+        }
+
+        /// <summary>
+        /// Replaces the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="attribute"/>'s <see cref="TagHelperAttribute.Name"/> and removes any additional matching
+        /// <see cref="TagHelperAttribute"/>s. If a matching <see cref="TagHelperAttribute"/> is not found, adds the
+        /// specified <paramref name="attribute"/> to the end of the collection.
+        /// </summary>
+        /// <param name="attribute">
+        /// The <see cref="TagHelperAttribute"/> to set.
+        /// </param>
+        /// <remarks><paramref name="attribute"/>'s <see cref="TagHelperAttribute.Name"/> is compared
+        /// case-insensitively.</remarks>
+        public void SetAttribute(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var attributeReplaced = false;
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(attribute.Name, Items[i]))
+                {
+                    // We replace the first attribute with the provided attribute, remove all the rest.
+                    if (!attributeReplaced)
+                    {
+                        // We replace the first attribute we find with the same name.
+                        Items[i] = attribute;
+                        attributeReplaced = true;
+                    }
+                    else
+                    {
+                        Items.RemoveAt(i--);
+                    }
+                }
+            }
+
+            // If we didn't replace an attribute value we should add value to the end of the collection.
+            if (!attributeReplaced)
+            {
+                Add(attribute);
+            }
+        }
+
+        /// <inheritdoc />
+        bool ICollection<TagHelperAttribute>.IsReadOnly => false;
+
+        /// <summary>
+        /// Adds a <see cref="TagHelperAttribute"/> to the end of the collection with the specified
+        /// <paramref name="name"/> and <paramref name="value"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the attribute to add.</param>
+        /// <param name="value">The <see cref="TagHelperAttribute.Value"/> of the attribute to add.</param>
+        public void Add(string name, object value)
+        {
+            var attribute = new TagHelperAttribute(name, value);
+            Items.Add(attribute);
+        }
+
+        /// <inheritdoc />
+        public void Add(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            Items.Add(attribute);
+        }
+
+        /// <inheritdoc />
+        public void Insert(int index, TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            Items.Insert(index, attribute);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <paramref name="attribute"/>s <see cref="TagHelperAttribute.Name"/> is compared case-insensitively.
+        /// </remarks>
+        public bool Remove(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return Items.Remove(attribute);
+        }
+
+        /// <inheritdoc />
+        public void RemoveAt(int index)
+        {
+            Items.RemoveAt(index);
+        }
+
+        /// <summary>
+        /// Removes all <see cref="TagHelperAttribute"/>s with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of <see cref="TagHelperAttribute"/>s to remove.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if at least 1 <see cref="TagHelperAttribute"/> was removed; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool RemoveAll(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            // Perf: Avoid allocating enumerator
+            var removedAtLeastOne = false;
+            for (var i = Items.Count - 1; i >= 0; i--)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    Items.RemoveAt(i);
+                    removedAtLeastOne = true;
+                }
+            }
+
+            return removedAtLeastOne;
+        }
+
+        /// <inheritdoc />
+        public void Clear()
+        {
+            Items.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
new file mode 100644
index 0000000000..7a6d380215
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
@@ -0,0 +1,179 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Abstract class used to buffer content returned by <see cref="ITagHelper"/>s.
+    /// </summary>
+    public abstract class TagHelperContent : IHtmlContentBuilder
+    {
+        /// <summary>
+        /// Gets a value indicating whether the content was modified.
+        /// </summary>
+        public abstract bool IsModified { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the content is empty or whitespace.
+        /// </summary>
+        public abstract bool IsEmptyOrWhiteSpace { get; }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="htmlContent">The <see cref="IHtmlContent"/> that replaces the content.</param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
+        {
+            HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="unencoded">
+        /// The <see cref="string"/> that replaces the content. The value is assume to be unencoded
+        /// as-provided and will be HTML encoded before being written.
+        /// </param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetContent(string unencoded)
+        {
+            HtmlContentBuilderExtensions.SetContent(this, unencoded);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="encoded">
+        /// The <see cref="string"/> that replaces the content. The value is assume to be HTML encoded
+        /// as-provided and no further encoding will be performed.
+        /// </param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetHtmlContent(string encoded)
+        {
+            HtmlContentBuilderExtensions.SetHtmlContent(this, encoded);
+            return this;
+        }
+
+        /// <summary>
+        /// Appends <paramref name="unencoded"/> to the existing content.
+        /// </summary>
+        /// <param name="unencoded">The <see cref="string"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent Append(string unencoded);
+
+        /// <summary>
+        /// Appends <paramref name="htmlContent"/> to the existing content.
+        /// </summary>
+        /// <param name="htmlContent">The <see cref="IHtmlContent"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent AppendHtml(IHtmlContent htmlContent);
+
+        /// <summary>
+        /// Appends <paramref name="encoded"/> to the existing content. <paramref name="encoded"/> is assumed
+        /// to be an HTML encoded <see cref="string"/> and no further encoding will be performed.
+        /// </summary>
+        /// <param name="encoded">The <see cref="string"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent AppendHtml(string encoded);
+
+        /// <summary>
+        /// Appends the specified <paramref name="format"/> to the existing content after
+        /// replacing each format item with the HTML encoded <see cref="string"/> representation of the
+        /// corresponding item in the <paramref name="args"/> array.
+        /// </summary>
+        /// <param name="format">
+        /// The composite format <see cref="string"/> (see http://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <param name="args">The object array to format.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public TagHelperContent AppendFormat(string format, params object[] args)
+        {
+            HtmlContentBuilderExtensions.AppendFormat(this, null, format, args);
+            return this;
+        }
+
+        /// <summary>
+        /// Appends the specified <paramref name="format"/> to the existing content with information from the
+        /// <paramref name="provider"/> after replacing each format item with the HTML encoded <see cref="string"/>
+        /// representation of the corresponding item in the <paramref name="args"/> array.
+        /// </summary>
+        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+        /// <param name="format">
+        /// The composite format <see cref="string"/> (see http://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <param name="args">The object array to format.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public TagHelperContent AppendFormat(IFormatProvider provider, string format, params object[] args)
+        {
+            HtmlContentBuilderExtensions.AppendFormat(this, provider, format, args);
+            return this;
+        }
+
+        /// <summary>
+        /// Clears the content.
+        /// </summary>
+        /// <returns>A reference to this instance after the clear operation has completed.</returns>
+        public abstract TagHelperContent Clear();
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContent"/>,  so it can be reused.
+        /// </summary>
+        /// <remarks>This method does more than what <see cref="Clear"/> does. It also resets the
+        /// <see cref="IsModified"/> flag.</remarks>
+        public abstract void Reinitialize();
+
+        /// <inheritdoc />
+        public abstract void CopyTo(IHtmlContentBuilder destination);
+
+        /// <inheritdoc />
+        public abstract void MoveTo(IHtmlContentBuilder destination);
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <returns>A <see cref="string"/> containing the content.</returns>
+        public abstract string GetContent();
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <returns>A <see cref="string"/> containing the content.</returns>
+        public abstract string GetContent(HtmlEncoder encoder);
+
+        /// <inheritdoc />
+        public abstract void WriteTo(TextWriter writer, HtmlEncoder encoder);
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.AppendHtml(IHtmlContent content)
+        {
+            return AppendHtml(content);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.Append(string unencoded)
+        {
+            return Append(unencoded);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.AppendHtml(string encoded)
+        {
+            return AppendHtml(encoded);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.Clear()
+        {
+            return Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
new file mode 100644
index 0000000000..e09a552a0b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
@@ -0,0 +1,118 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contains information related to the execution of <see cref="ITagHelper"/>s.
+    /// </summary>
+    public class TagHelperContext
+    {
+        private readonly TagHelperAttributeList _allAttributes;
+
+        /// <summary>
+        /// Instantiates a new <see cref="TagHelperContext"/>.
+        /// </summary>
+        /// <param name="tagName">The parsed HTML tag name of the element.</param>
+        /// <param name="allAttributes">Every attribute associated with the current HTML element.</param>
+        /// <param name="items">Collection of items used to communicate with other <see cref="ITagHelper"/>s.</param>
+        /// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
+        /// applies to.</param>
+        public TagHelperContext(
+            string tagName,
+            TagHelperAttributeList allAttributes,
+            IDictionary<object, object> items,
+            string uniqueId) : this(allAttributes, items, uniqueId)
+        {
+            if (tagName == null)
+            {
+                throw new ArgumentNullException(nameof(tagName));
+            }
+
+            TagName = tagName;
+        }
+
+        /// <summary>
+        /// Instantiates a new <see cref="TagHelperContext"/>.
+        /// </summary>
+        /// <param name="allAttributes">Every attribute associated with the current HTML element.</param>
+        /// <param name="items">Collection of items used to communicate with other <see cref="ITagHelper"/>s.</param>
+        /// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
+        /// applies to.</param>
+        public TagHelperContext(
+            TagHelperAttributeList allAttributes,
+            IDictionary<object, object> items,
+            string uniqueId)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            if (uniqueId == null)
+            {
+                throw new ArgumentNullException(nameof(uniqueId));
+            }
+
+            if (allAttributes == null)
+            {
+                throw new ArgumentNullException(nameof(allAttributes));
+            }
+
+            _allAttributes = allAttributes;
+            Items = items;
+            UniqueId = uniqueId;
+        }
+
+        /// <summary>
+        /// The parsed HTML tag name of the element.
+        /// </summary>
+        public string TagName { get; private set; }
+
+        /// <summary>
+        /// Every attribute associated with the current HTML element.
+        /// </summary>
+        public ReadOnlyTagHelperAttributeList AllAttributes => _allAttributes;
+
+        /// <summary>
+        /// Gets the collection of items used to communicate with other <see cref="ITagHelper"/>s.
+        /// </summary>
+        /// <remarks>
+        /// This <see cref="IDictionary{Object, Object}" /> is copy-on-write in order to ensure items added to this
+        /// collection are visible only to other <see cref="ITagHelper"/>s targeting child elements.
+        /// </remarks>
+        public IDictionary<object, object> Items { get; private set; }
+
+        /// <summary>
+        /// An identifier unique to the HTML element this context is for.
+        /// </summary>
+        public string UniqueId { get; private set; }
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
+        /// </summary>
+        /// <param name="tagName">The HTML tag name to use.</param>
+        /// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
+        /// <param name="uniqueId">The unique id to use.</param>
+        public void Reinitialize(string tagName, IDictionary<object, object> items, string uniqueId)
+        {
+            TagName = tagName;
+            Reinitialize(items, uniqueId);
+        }
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
+        /// </summary>
+        /// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
+        /// <param name="uniqueId">The unique id to use.</param>
+        public void Reinitialize(IDictionary<object, object> items, string uniqueId)
+        {
+            _allAttributes.Clear();
+            Items = items;
+            UniqueId = uniqueId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
new file mode 100644
index 0000000000..ed0c1e5308
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
@@ -0,0 +1,79 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public class TagHelperOutput : IHtmlContentContainer
+    {
+        public TagHelperOutput(
+            string tagName,
+            TagHelperAttributeList attributes,
+            Func<bool, HtmlEncoder, Task<TagHelperContent>> getChildContentAsync)
+        {
+        }
+
+        public string TagName { get; set; }
+
+        public TagHelperContent PreElement => null;
+
+        public TagHelperContent PreContent => null;
+
+        public TagHelperContent Content => null;
+
+        public TagHelperContent PostContent => null;
+
+        public TagHelperContent PostElement => null;
+
+        public bool IsContentModified => true;
+
+        public TagMode TagMode { get; set; }
+
+        public TagHelperAttributeList Attributes { get; }
+
+        public void Reinitialize(string tagName, TagMode tagMode)
+        {
+        }
+
+        public void SuppressOutput()
+        {
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync()
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(bool useCachedResult)
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(HtmlEncoder encoder)
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(bool useCachedResult, HtmlEncoder encoder)
+        {
+            throw null;
+        }
+
+        void IHtmlContentContainer.CopyTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        void IHtmlContentContainer.MoveTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
new file mode 100644
index 0000000000..b9d60a706a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// The mode in which an element should render.
+    /// </summary>
+    public enum TagMode
+    {
+        /// <summary>
+        /// Include both start and end tags.
+        /// </summary>
+        StartTagAndEndTag,
+
+        /// <summary>
+        /// A self-closed tag.
+        /// </summary>
+        SelfClosing,
+
+        /// <summary>
+        /// Only a start tag.
+        /// </summary>
+        StartTagOnly
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
new file mode 100644
index 0000000000..370f9372f2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// The structure the element should be written in.
+    /// </summary>
+    public enum TagStructure
+    {
+        /// <summary>
+        /// If no other tag helper applies to the same element and specifies a <see cref="TagStructure"/>,
+        /// <see cref="NormalOrSelfClosing"/> will be used.
+        /// </summary>
+        Unspecified,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        NormalOrSelfClosing,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        /// <remarks>Elements with a <see cref="WithoutEndTag"/> structure will never have any content.</remarks>
+        WithoutEndTag
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
index 9fa0e8c4ae..bd2e0104cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -6,10 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs
new file mode 100644
index 0000000000..b5390b7c87
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    internal class DefaultRazorCompiledItem : RazorCompiledItem
+    {
+        private object[] _metadata;
+
+        public DefaultRazorCompiledItem(Type type, string kind, string identifier)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (kind == null)
+            {
+                throw new ArgumentNullException(nameof(kind));
+            }
+
+            if (identifier == null)
+            {
+                throw new ArgumentNullException(nameof(identifier));
+            }
+
+            Type = type;
+            Kind = kind;
+            Identifier = identifier;
+        }
+
+        public override string Identifier { get; }
+
+        public override string Kind { get; }
+
+        public override IReadOnlyList<object> Metadata
+        {
+            get
+            {
+                if (_metadata == null)
+                {
+                    _metadata = Type.GetCustomAttributes(inherit: true);
+                }
+
+                return _metadata;
+            }
+        }
+
+        public override Type Type { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs
new file mode 100644
index 0000000000..dccdb2f871
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// A metadata object containing the checksum of a source file that contributed to a compiled item.
+    /// </summary>
+    public interface IRazorSourceChecksumMetadata
+    {
+        /// <summary>
+        /// Gets the checksum as string of hex-encoded bytes.
+        /// </summary>
+        string Checksum { get; }
+
+        /// <summary>
+        /// Gets the name of the algorithm used to create this checksum.
+        /// </summary>
+        string ChecksumAlgorithm { get; }
+
+        /// <summary>
+        /// Gets the identifier of the source file associated with this checksum.
+        /// </summary>
+        string Identifier { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs
new file mode 100644
index 0000000000..8eff0f4ea2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Identifies a compiled item that can be identified and loaded. 
+    /// </summary>
+    public abstract class RazorCompiledItem
+    {
+        /// <summary>
+        /// Gets the identifier associated with the compiled item. The identifier is used programmatically to locate
+        /// a specific item of a specific kind and should be uniqure within the assembly.
+        /// </summary>
+        public abstract string Identifier { get; }
+
+        /// <summary>
+        /// Gets the kind of compiled item. The kind is used programmatically to associate behaviors and semantics
+        /// with the item.
+        /// </summary>
+        public abstract string Kind { get; }
+
+        /// <summary>
+        /// Gets a collection of arbitrary metadata associated with the item.
+        /// </summary>
+        /// <remarks>
+        /// For items loaded with the default implementation of <see cref="RazorCompiledItemLoader"/>, the 
+        /// metadata collection will return all attributes defined on the <see cref="Type"/>.
+        /// </remarks>
+        public abstract IReadOnlyList<object> Metadata { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of the compiled item.
+        /// </summary>
+        public abstract Type Type { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs
new file mode 100644
index 0000000000..8e4c003f87
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies that an assembly contains a compiled Razor asset.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public sealed class RazorCompiledItemAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new <see cref="RazorCompiledItemAttribute"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of the compiled item.</param>
+        /// <param name="kind">
+        /// The kind of the compiled item. The kind is used programmatically to associate behaviors with the item.
+        /// </param>
+        /// <param name="identifier">
+        /// The identifier associated with the item. The identifier is used programmatically to locate
+        /// a specific item of a specific kind, and should be unique within the assembly.
+        /// </param>
+        public RazorCompiledItemAttribute(Type type, string kind, string identifier)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (kind == null)
+            {
+                throw new ArgumentNullException(nameof(kind));
+            }
+
+            Type = type;
+            Kind = kind;
+            Identifier = identifier;
+        }
+
+        /// <summary>
+        /// Gets the kind of compiled item. The kind is used programmatically to associate behaviors and semantics
+        /// with the item.
+        /// </summary>
+        public string Kind { get; }
+
+        /// <summary>
+        /// Gets the identifier associated with the compiled item. The identifier is used programmatically to locate
+        /// a specific item of a specific kind and should be uniqure within the assembly.
+        /// </summary>
+        public string Identifier { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of the compiled item. The type should be contained in the assembly associated
+        /// with this instance of <see cref="RazorCompiledItemAttribute"/>.
+        /// </summary>
+        public Type Type { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs
new file mode 100644
index 0000000000..d6287e3253
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Extension methods for <see cref="RazorCompiledItem"/>.
+    /// </summary>
+    public static class RazorCompiledItemExtensions
+    {
+        /// <summary>
+        /// Gets the list of <see cref="IRazorSourceChecksumMetadata"/> associated with <paramref name="item"/>.
+        /// </summary>
+        /// <param name="item">The <see cref="RazorCompiledItem"/>.</param>
+        /// <returns>A list of <see cref="IRazorSourceChecksumMetadata"/>.</returns>
+        public static IReadOnlyList<IRazorSourceChecksumMetadata> GetChecksumMetadata(this RazorCompiledItem item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return item.Metadata.OfType<IRazorSourceChecksumMetadata>().ToArray();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs
new file mode 100644
index 0000000000..0b52fd5f1b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Defines a key/value metadata pair for the decorated Razor type.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class RazorCompiledItemMetadataAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new <see cref="RazorCompiledItemMetadataAttribute"/>.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        public RazorCompiledItemMetadataAttribute(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the key.
+        /// </summary>
+        public string Key { get; }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        public string Value { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs
new file mode 100644
index 0000000000..034e64c309
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the name of a Razor configuration as defined by the Razor SDK.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is applied to an application's entry point assembly by the Razor SDK during the build, 
+    /// so that the Razor configuration can be loaded at runtime based on the settings provided by the project
+    /// file.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+    public sealed class RazorConfigurationNameAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="RazorConfigurationNameAttribute"/>.
+        /// </summary>
+        /// <param name="configurationName">The name of the Razor configuration.</param>
+        public RazorConfigurationNameAttribute(string configurationName)
+        {
+            if (configurationName == null)
+            {
+                throw new ArgumentNullException(nameof(configurationName));
+            }
+
+            ConfigurationName = configurationName;
+        }
+
+        /// <summary>
+        /// Gets the name of the Razor configuration.
+        /// </summary>
+        public string ConfigurationName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs
new file mode 100644
index 0000000000..92a9d1c6ec
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the name of a Razor extension as defined by the Razor SDK.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is applied to an application's entry point assembly by the Razor SDK during the build, 
+    /// so that the Razor configuration can be loaded at runtime based on the settings provided by the project
+    /// file.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public sealed class RazorExtensionAssemblyNameAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="RazorExtensionAssemblyNameAttribute"/>.
+        /// </summary>
+        /// <param name="extensionName">The name of the extension.</param>
+        /// <param name="assemblyName">The assembly name of the extension.</param>
+        public RazorExtensionAssemblyNameAttribute(string extensionName, string assemblyName)
+        {
+            if (extensionName == null)
+            {
+                throw new ArgumentNullException(nameof(extensionName));
+            }
+
+            if (assemblyName == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyName));
+            }
+
+            ExtensionName = extensionName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>
+        /// Gets the assembly name of the extension.
+        /// </summary>
+        public string AssemblyName { get; }
+
+        /// <summary>
+        /// Gets the name of the extension.
+        /// </summary>
+        public string ExtensionName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs
new file mode 100644
index 0000000000..8f261143d0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the name of a Razor configuration as defined by the Razor SDK.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is part of a set of metadata attributes that can be applied to an assembly at build
+    /// time by the Razor SDK. These attributes allow the Razor configuration to be loaded at runtime based 
+    /// on the settings originally provided by the project file.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+    public sealed class RazorLanguageVersionAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="RazorLanguageVersionAttribute"/>.
+        /// </summary>
+        /// <param name="languageVersion">The language version of Razor</param>
+        public RazorLanguageVersionAttribute(string languageVersion)
+        {
+            if (languageVersion == null)
+            {
+                throw new ArgumentNullException(nameof(languageVersion));
+            }
+
+            LanguageVersion = languageVersion;
+        }
+
+        /// <summary>
+        /// Gets the Razor language version.
+        /// </summary>
+        public string LanguageVersion { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs
new file mode 100644
index 0000000000..d1da25b300
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs
@@ -0,0 +1,67 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the checksum of a source file that contributed to a compiled item.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// These attributes are added by the Razor infrastructure when generating code to assist runtime
+    /// implementations to determine the integrity of compiled items.
+    /// </para>
+    /// <para>
+    /// Runtime implementations should access the checksum metadata for an item using
+    /// <see cref="RazorCompiledItemExtensions.GetChecksumMetadata(RazorCompiledItem)"/>.
+    /// </para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class RazorSourceChecksumAttribute : Attribute, IRazorSourceChecksumMetadata
+    {
+        /// <summary>
+        /// Creates a new <see cref="RazorSourceChecksumAttribute"/>.
+        /// </summary>
+        /// <param name="checksumAlgorithm">The algorithm used to create this checksum.</param>
+        /// <param name="checksum">The checksum as a string of hex-encoded bytes.</param>
+        /// <param name="identifier">The identifier associated with this thumbprint.</param>
+        public RazorSourceChecksumAttribute(string checksumAlgorithm, string checksum, string identifier)
+        {
+            if (checksumAlgorithm == null)
+            {
+                throw new ArgumentNullException(nameof(checksumAlgorithm));
+            }
+
+            if (checksum == null)
+            {
+                throw new ArgumentNullException(nameof(checksum));
+            }
+
+            if (identifier == null)
+            {
+                throw new ArgumentNullException(nameof(identifier));
+            }
+
+            ChecksumAlgorithm = checksumAlgorithm;
+            Checksum = checksum;
+            Identifier = identifier;
+        }
+
+        /// <summary>
+        /// Gets the checksum as string of hex-encoded bytes.
+        /// </summary>
+        public string Checksum { get; }
+
+        /// <summary>
+        /// Gets the name of the algorithm used to create this checksum.
+        /// </summary>
+        public string ChecksumAlgorithm { get; }
+        
+        /// <summary>
+        /// Gets the identifier of the source file associated with this checksum.
+        /// </summary>
+        public string Identifier { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
new file mode 100644
index 0000000000..011d59083c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperExecutionContext
+    {
+        public TagHelperExecutionContext(
+            string tagName,
+            TagMode tagMode,
+            IDictionary<object, object> items,
+            string uniqueId,
+            Func<Task> executeChildContentAsync,
+            Action<HtmlEncoder> startTagHelperWritingScope,
+            Func<TagHelperContent> endTagHelperWritingScope)
+        {
+        }
+
+        public bool ChildContentRetrieved => false;
+
+        public IDictionary<object, object> Items { get; private set; }
+
+        public IList<ITagHelper> TagHelpers => null;
+
+        public TagHelperOutput Output { get; internal set; }
+
+        public TagHelperContext Context { get; }
+
+        public void Add(ITagHelper tagHelper)
+        {
+        }
+
+        public void AddHtmlAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public void AddHtmlAttribute(TagHelperAttribute attribute)
+        {
+        }
+
+        public void AddTagHelperAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public void AddTagHelperAttribute(TagHelperAttribute attribute)
+        {
+        }
+
+        public void Reinitialize(
+            string tagName,
+            TagMode tagMode,
+            IDictionary<object, object> items,
+            string uniqueId,
+            Func<Task> executeChildContentAsync)
+        {
+        }
+
+        public Task SetOutputContentAsync()
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
new file mode 100644
index 0000000000..21f2b5b6fa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperRunner
+    {
+        public Task RunAsync(TagHelperExecutionContext executionContext)
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
new file mode 100644
index 0000000000..70f072bbc4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperScopeManager
+    {
+        public TagHelperScopeManager(
+            Action<HtmlEncoder> startTagHelperWritingScope,
+            Func<TagHelperContent> endTagHelperWritingScope)
+        {
+        }
+
+        public TagHelperExecutionContext Begin(
+            string tagName,
+            TagMode tagMode,
+            string uniqueId,
+            Func<Task> executeChildContentAsync)
+        {
+            throw null;
+        }
+
+        public TagHelperExecutionContext End()
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
new file mode 100644
index 0000000000..aca16610b0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Used to override an <see cref="ITagHelper"/> property's HTML attribute name.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class HtmlAttributeNameAttribute : Attribute
+    {
+        private string _dictionaryAttributePrefix;
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNameAttribute"/> class with <see cref="Name"/>
+        /// equal to <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// Associated property must not have a public setter and must be compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </remarks>
+        public HtmlAttributeNameAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNameAttribute"/> class.
+        /// </summary>
+        /// <param name="name">
+        /// HTML attribute name for the associated property. Must be <c>null</c> or empty if associated property does
+        /// not have a public setter and is compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>. Otherwise must not be <c>null</c> or empty.
+        /// </param>
+        public HtmlAttributeNameAttribute(string name)
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// HTML attribute name of the associated property.
+        /// </summary>
+        /// <value>
+        /// <c>null</c> or empty if and only if associated property does not have a public setter and is compatible
+        /// with <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets or sets the prefix used to match HTML attribute names. Matching attributes are added to the
+        /// associated property (an <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/>).
+        /// </summary>
+        /// <remarks>
+        /// If non-<c>null</c> associated property must be compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </remarks>
+        /// <value>
+        /// <para>
+        /// If associated property is compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/>, default value is <c>Name + "-"</c>.
+        /// <see cref="Name"/> must not be <c>null</c> or empty in this case.
+        /// </para>
+        /// <para>
+        /// Otherwise default value is <c>null</c>.
+        /// </para>
+        /// </value>
+        public string DictionaryAttributePrefix
+        {
+            get
+            {
+                return _dictionaryAttributePrefix;
+            }
+            set
+            {
+                _dictionaryAttributePrefix = value;
+                DictionaryAttributePrefixSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets an indication whether <see cref="DictionaryAttributePrefix"/> has been set. Used to distinguish an
+        /// uninitialized <see cref="DictionaryAttributePrefix"/> value from an explicit <c>null</c> setting.
+        /// </summary>
+        /// <value><c>true</c> if <see cref="DictionaryAttributePrefix"/> was set. <c>false</c> otherwise.</value>
+        public bool DictionaryAttributePrefixSet { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
new file mode 100644
index 0000000000..9d23480abd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Indicates the associated <see cref="ITagHelper"/> property should not be bound to HTML attributes.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class HtmlAttributeNotBoundAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNotBoundAttribute"/> class.
+        /// </summary>
+        public HtmlAttributeNotBoundAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
new file mode 100644
index 0000000000..7ac198567f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public enum HtmlAttributeValueStyle
+    {
+        DoubleQuotes,
+        SingleQuotes,
+        NoQuotes,
+        Minimized,
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
new file mode 100644
index 0000000000..857d6a0e5d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides an <see cref="ITagHelper"/>'s target.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
+    public sealed class HtmlTargetElementAttribute : Attribute
+    {
+        public const string ElementCatchAllTarget = "*";
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlTargetElementAttribute"/> class that targets all HTML
+        /// elements with the required <see cref="Attributes"/>.
+        /// </summary>
+        /// <remarks><see cref="Tag"/> is set to <c>*</c>.</remarks>
+        public HtmlTargetElementAttribute()
+            : this(ElementCatchAllTarget)
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlTargetElementAttribute"/> class with the given
+        /// <paramref name="tag"/> as its <see cref="Tag"/> value.
+        /// </summary>
+        /// <param name="tag">
+        /// The HTML tag the <see cref="ITagHelper"/> targets.
+        /// </param>
+        /// <remarks>A <c>*</c> <paramref name="tag"/> value indicates this <see cref="ITagHelper"/>
+        /// targets all HTML elements with the required <see cref="Attributes"/>.</remarks>
+        public HtmlTargetElementAttribute(string tag)
+        {
+            Tag = tag;
+        }
+
+        /// <summary>
+        /// The HTML tag the <see cref="ITagHelper"/> targets. A <c>*</c> value indicates this <see cref="ITagHelper"/>
+        /// targets all HTML elements with the required <see cref="Attributes"/>.
+        /// </summary>
+        public string Tag { get; }
+
+        /// <summary>
+        /// A comma-separated <see cref="string"/> of attribute selectors the HTML element must match for the
+        /// <see cref="ITagHelper"/> to run. <c>*</c> at the end of an attribute name acts as a prefix match. A value
+        /// surrounded by square brackets is handled as a CSS attribute value selector. Operators <c>^=</c>, <c>$=</c> and
+        /// <c>=</c> are supported e.g. <c>"name"</c>, <c>"[name]"</c>, <c>"[name=value]"</c>, <c>"[ name ^= 'value' ]"</c>.
+        /// </summary>
+        public string Attributes { get; set; }
+
+        /// <summary>
+        /// The expected tag structure. Defaults to <see cref="TagStructure.Unspecified"/>.
+        /// </summary>
+        /// <remarks>
+        /// If <see cref="TagStructure.Unspecified"/> and no other tag helpers applying to the same element specify
+        /// their <see cref="TagStructure"/> the <see cref="TagStructure.NormalOrSelfClosing"/> behavior is used:
+        /// <para>
+        /// <code>
+        /// &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt;
+        /// &lt;!-- OR --&gt;
+        /// &lt;my-tag-helper /&gt;
+        /// </code>
+        /// Otherwise, if another tag helper applying to the same element does specify their behavior, that behavior
+        /// is used.
+        /// </para>
+        /// <para>
+        /// If <see cref="TagStructure.WithoutEndTag"/> HTML elements can be written in the following formats:
+        /// <code>
+        /// &lt;my-tag-helper&gt;
+        /// &lt;!-- OR --&gt;
+        /// &lt;my-tag-helper /&gt;
+        /// </code>
+        /// </para>
+        /// </remarks>
+        public TagStructure TagStructure { get; set; }
+
+        /// <summary>
+        /// The required HTML element name of the direct parent. A <c>null</c> value indicates any HTML element name is
+        /// allowed.
+        /// </summary>
+        public string ParentTag { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
new file mode 100644
index 0000000000..ec86a32a11
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contract used to filter matching HTML elements.
+    /// Marker interface for <see cref="TagHelper"/>s.
+    /// </summary>
+    public interface ITagHelper : ITagHelperComponent
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs
new file mode 100644
index 0000000000..3b2059be51
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs
@@ -0,0 +1,41 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contract used to modify an HTML element. 
+    /// </summary>
+    public interface ITagHelperComponent
+    {
+        /// <summary>
+        /// When a set of <see cref="ITagHelperComponent"/>s are executed, their <see cref="Init(TagHelperContext)"/>'s
+        /// are first invoked in the specified <see cref="Order"/>; then their
+        /// <see cref="ProcessAsync(TagHelperContext, TagHelperOutput)"/>'s are invoked in the specified
+        /// <see cref="Order"/>. Lower values are executed first.
+        /// </summary>
+        int Order { get; }
+
+        /// <summary>
+        /// Initializes the <see cref="ITagHelperComponent"/> with the given <paramref name="context"/>. Additions to
+        /// <see cref="TagHelperContext.Items"/> should be done within this method to ensure they're added prior to
+        /// executing the children.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <remarks>When more than one <see cref="ITagHelperComponent"/> runs on the same element,
+        /// <see cref="M:TagHelperOutput.GetChildContentAsync"/> may be invoked prior to <see cref="ProcessAsync"/>.
+        /// </remarks>
+        void Init(TagHelperContext context);
+
+        /// <summary>
+        /// Asynchronously executes the <see cref="ITagHelperComponent"/> with the given <paramref name="context"/> and
+        /// <paramref name="output"/>.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
+        /// <returns>A <see cref="Task"/> that on completion updates the <paramref name="output"/>.</returns>
+        Task ProcessAsync(TagHelperContext context, TagHelperOutput output);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
new file mode 100644
index 0000000000..a97b5ef9ab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides a hint of the <see cref="ITagHelper"/>'s output element.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+    public sealed class OutputElementHintAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="OutputElementHintAttribute"/> class.
+        /// </summary>
+        /// <param name="outputElement">
+        /// The HTML element the <see cref="ITagHelper"/> may output.
+        /// </param>
+        public OutputElementHintAttribute(string outputElement)
+        {
+            if (outputElement == null)
+            {
+                throw new ArgumentNullException(nameof(outputElement));
+            }
+
+            OutputElement = outputElement;
+        }
+
+        /// <summary>
+        /// The HTML element the <see cref="ITagHelper"/> may output.
+        /// </summary>
+        public string OutputElement { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
new file mode 100644
index 0000000000..f3d1569a59
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
@@ -0,0 +1,190 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// A read-only collection of <see cref="TagHelperAttribute"/>s.
+    /// </summary>
+    public abstract class ReadOnlyTagHelperAttributeList : ReadOnlyCollection<TagHelperAttribute>
+    {
+        private static readonly IReadOnlyList<TagHelperAttribute> EmptyList = new TagHelperAttribute[0];
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ReadOnlyTagHelperAttributeList"/> with an empty
+        /// collection.
+        /// </summary>
+        protected ReadOnlyTagHelperAttributeList()
+            : base(new List<TagHelperAttribute>())
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ReadOnlyTagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public ReadOnlyTagHelperAttributeList(IList<TagHelperAttribute> attributes)
+            : base(attributes)
+        {
+        }
+
+        /// <summary>
+        /// Gets the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of the <see cref="TagHelperAttribute"/> to get.
+        /// </param>
+        /// <returns>The first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public TagHelperAttribute this[string name]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                // Perf: Avoid allocating enumerator
+                for (var i = 0; i < Items.Count; i++)
+                {
+                    if (NameEquals(name, Items[i]))
+                    {
+                        return Items[i];
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/> exists in the collection.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/> to get.</param>
+        /// <returns>
+        /// <c>true</c> if a <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool ContainsName(string name)
+        {
+            return this[name] != null;
+        }
+
+        /// <summary>
+        /// Retrieves the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/> to get.</param>
+        /// <param name="attribute">When this method returns, the first <see cref="TagHelperAttribute"/> with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>, if found; otherwise,
+        /// <c>null</c>.</param>
+        /// <returns><c>true</c> if a <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.</returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool TryGetAttribute(string name, out TagHelperAttribute attribute)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            attribute = this[name];
+
+            return attribute != null;
+        }
+
+        /// <summary>
+        /// Retrieves <see cref="TagHelperAttribute"/>s in the collection with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/>s to get.</param>
+        /// <param name="attributes">When this method returns, the <see cref="TagHelperAttribute"/>s with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>.</param>
+        /// <returns><c>true</c> if at least one <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.</returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool TryGetAttributes(string name, out IReadOnlyList<TagHelperAttribute> attributes)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            // Perf: Avoid allocating enumerator
+            List<TagHelperAttribute> matchedAttributes = null;
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    if (matchedAttributes == null)
+                    {
+                        matchedAttributes = new List<TagHelperAttribute>();
+                    }
+
+                    matchedAttributes.Add(Items[i]);
+                }
+            }
+            attributes = matchedAttributes ?? EmptyList;
+
+            return matchedAttributes != null;
+        }
+
+        /// <summary>
+        /// Searches for a <see cref="TagHelperAttribute"/> who's <see cref="TagHelperAttribute.Name"/>
+        /// case-insensitively matches <paramref name="name"/> and returns the zero-based index of the first
+        /// occurrence.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> to locate in the collection.</param>
+        /// <returns>The zero-based index of the first matching <see cref="TagHelperAttribute"/> within the collection,
+        /// if found; otherwise, -1.</returns>
+        public int IndexOfName(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Determines if the specified <paramref name="attribute"/> has the same name as <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The value to compare against <paramref name="attribute"/>s
+        /// <see cref="TagHelperAttribute.Name"/>.</param>
+        /// <param name="attribute">The attribute to compare against.</param>
+        /// <returns><c>true</c> if <paramref name="name"/> case-insensitively matches <paramref name="attribute"/>s
+        /// <see cref="TagHelperAttribute.Name"/>.</returns>
+        protected static bool NameEquals(string name, TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return string.Equals(name, attribute.Name, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
new file mode 100644
index 0000000000..bc4f6bac35
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Restricts children of the <see cref="ITagHelper"/>'s element.
+    /// </summary>
+    /// <remarks>Combining this attribute with a <see cref="HtmlTargetElementAttribute"/> that specifies its
+    /// <see cref="HtmlTargetElementAttribute.TagStructure"/> as <see cref="TagStructure.WithoutEndTag"/> will result
+    /// in this attribute being ignored.</remarks>
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    public class RestrictChildrenAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="RestrictChildrenAttribute"/> class.
+        /// </summary>
+        /// <param name="childTag">
+        /// The tag name of an element allowed as a child.
+        /// </param>
+        /// <param name="childTags">
+        /// Additional names of elements allowed as children.
+        /// </param>
+        public RestrictChildrenAttribute(string childTag, params string[] childTags)
+        {
+            var concatenatedNames = new string[1 + childTags.Length];
+            concatenatedNames[0] = childTag;
+
+            childTags.CopyTo(concatenatedNames, 1);
+
+            ChildTags = concatenatedNames;
+        }
+
+        /// <summary>
+        /// Get the names of elements allowed as children.
+        /// </summary>
+        public IEnumerable<string> ChildTags { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
new file mode 100644
index 0000000000..ed9faca1bb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
@@ -0,0 +1,26 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public abstract class TagHelper : ITagHelper
+    {
+        public virtual int Order { get; } = 0;
+
+        public virtual void Init(TagHelperContext context)
+        {
+        }
+
+        public virtual void Process(TagHelperContext context, TagHelperOutput output)
+        {
+        }
+
+        public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            Process(context, output);
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
new file mode 100644
index 0000000000..7bdd2aea22
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public class TagHelperAttribute : IHtmlContentContainer
+    {
+        public TagHelperAttribute(string name)
+        {
+        }
+
+        public TagHelperAttribute(string name, object value)
+        {
+        }
+
+        public TagHelperAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public string Name { get; }
+
+        public object Value { get; }
+
+        public HtmlAttributeValueStyle ValueStyle { get; }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+
+        public void CopyTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        public void MoveTo(IHtmlContentBuilder destination)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
new file mode 100644
index 0000000000..308292294c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
@@ -0,0 +1,230 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// A collection of <see cref="TagHelperAttribute"/>s.
+    /// </summary>
+    public class TagHelperAttributeList : ReadOnlyTagHelperAttributeList, IList<TagHelperAttribute>
+    {
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with an empty collection.
+        /// </summary>
+        public TagHelperAttributeList()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public TagHelperAttributeList(IEnumerable<TagHelperAttribute> attributes)
+            : base (new List<TagHelperAttribute>(attributes))
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public TagHelperAttributeList(List<TagHelperAttribute> attributes)
+            : base(attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <paramref name="value"/>'s <see cref="TagHelperAttribute.Name"/> must not be <c>null</c>.
+        /// </remarks>
+        public new TagHelperAttribute this[int index]
+        {
+            get
+            {
+                return base[index];
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                Items[index] = value;
+            }
+        }
+
+        /// <summary>
+        /// Replaces the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="name"/> and removes any additional matching <see cref="TagHelperAttribute"/>s. If a
+        /// matching <see cref="TagHelperAttribute"/> is not found, adds a <see cref="TagHelperAttribute"/> with
+        /// <paramref name="name"/> and <paramref name="value"/> to the end of the collection.</summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of the <see cref="TagHelperAttribute"/> to set.
+        /// </param>
+        /// <param name="value">
+        /// The <see cref="TagHelperAttribute.Value"/> to set.
+        /// </param>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public void SetAttribute(string name, object value)
+        {
+            var attribute = new TagHelperAttribute(name, value);
+            SetAttribute(attribute);
+        }
+
+        /// <summary>
+        /// Replaces the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="attribute"/>'s <see cref="TagHelperAttribute.Name"/> and removes any additional matching
+        /// <see cref="TagHelperAttribute"/>s. If a matching <see cref="TagHelperAttribute"/> is not found, adds the
+        /// specified <paramref name="attribute"/> to the end of the collection.
+        /// </summary>
+        /// <param name="attribute">
+        /// The <see cref="TagHelperAttribute"/> to set.
+        /// </param>
+        /// <remarks><paramref name="attribute"/>'s <see cref="TagHelperAttribute.Name"/> is compared
+        /// case-insensitively.</remarks>
+        public void SetAttribute(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var attributeReplaced = false;
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(attribute.Name, Items[i]))
+                {
+                    // We replace the first attribute with the provided attribute, remove all the rest.
+                    if (!attributeReplaced)
+                    {
+                        // We replace the first attribute we find with the same name.
+                        Items[i] = attribute;
+                        attributeReplaced = true;
+                    }
+                    else
+                    {
+                        Items.RemoveAt(i--);
+                    }
+                }
+            }
+
+            // If we didn't replace an attribute value we should add value to the end of the collection.
+            if (!attributeReplaced)
+            {
+                Add(attribute);
+            }
+        }
+
+        /// <inheritdoc />
+        bool ICollection<TagHelperAttribute>.IsReadOnly => false;
+
+        /// <summary>
+        /// Adds a <see cref="TagHelperAttribute"/> to the end of the collection with the specified
+        /// <paramref name="name"/> and <paramref name="value"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the attribute to add.</param>
+        /// <param name="value">The <see cref="TagHelperAttribute.Value"/> of the attribute to add.</param>
+        public void Add(string name, object value)
+        {
+            var attribute = new TagHelperAttribute(name, value);
+            Items.Add(attribute);
+        }
+
+        /// <inheritdoc />
+        public void Add(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            Items.Add(attribute);
+        }
+
+        /// <inheritdoc />
+        public void Insert(int index, TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            Items.Insert(index, attribute);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <paramref name="attribute"/>s <see cref="TagHelperAttribute.Name"/> is compared case-insensitively.
+        /// </remarks>
+        public bool Remove(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return Items.Remove(attribute);
+        }
+
+        /// <inheritdoc />
+        public void RemoveAt(int index)
+        {
+            Items.RemoveAt(index);
+        }
+
+        /// <summary>
+        /// Removes all <see cref="TagHelperAttribute"/>s with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of <see cref="TagHelperAttribute"/>s to remove.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if at least 1 <see cref="TagHelperAttribute"/> was removed; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool RemoveAll(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            // Perf: Avoid allocating enumerator
+            var removedAtLeastOne = false;
+            for (var i = Items.Count - 1; i >= 0; i--)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    Items.RemoveAt(i);
+                    removedAtLeastOne = true;
+                }
+            }
+
+            return removedAtLeastOne;
+        }
+
+        /// <inheritdoc />
+        public void Clear()
+        {
+            Items.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs
new file mode 100644
index 0000000000..1a2c748cab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs
@@ -0,0 +1,39 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// An abstract base class for <see cref="ITagHelperComponent"/>.
+    /// </summary>
+    public abstract class TagHelperComponent : ITagHelperComponent
+    {
+        /// <inheritdoc />
+        /// <remarks>Default order is <c>0</c>.</remarks>
+        public virtual int Order => 0;
+
+        /// <inheritdoc />
+        public virtual void Init(TagHelperContext context)
+        {
+        }
+
+        /// <summary>
+        /// Synchronously executes the <see cref="ITagHelperComponent"/> with the given <paramref name="context"/> and
+        /// <paramref name="output"/>.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
+        public virtual void Process(TagHelperContext context, TagHelperOutput output)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            Process(context, output);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
new file mode 100644
index 0000000000..7a6d380215
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
@@ -0,0 +1,179 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Abstract class used to buffer content returned by <see cref="ITagHelper"/>s.
+    /// </summary>
+    public abstract class TagHelperContent : IHtmlContentBuilder
+    {
+        /// <summary>
+        /// Gets a value indicating whether the content was modified.
+        /// </summary>
+        public abstract bool IsModified { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the content is empty or whitespace.
+        /// </summary>
+        public abstract bool IsEmptyOrWhiteSpace { get; }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="htmlContent">The <see cref="IHtmlContent"/> that replaces the content.</param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
+        {
+            HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="unencoded">
+        /// The <see cref="string"/> that replaces the content. The value is assume to be unencoded
+        /// as-provided and will be HTML encoded before being written.
+        /// </param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetContent(string unencoded)
+        {
+            HtmlContentBuilderExtensions.SetContent(this, unencoded);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="encoded">
+        /// The <see cref="string"/> that replaces the content. The value is assume to be HTML encoded
+        /// as-provided and no further encoding will be performed.
+        /// </param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetHtmlContent(string encoded)
+        {
+            HtmlContentBuilderExtensions.SetHtmlContent(this, encoded);
+            return this;
+        }
+
+        /// <summary>
+        /// Appends <paramref name="unencoded"/> to the existing content.
+        /// </summary>
+        /// <param name="unencoded">The <see cref="string"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent Append(string unencoded);
+
+        /// <summary>
+        /// Appends <paramref name="htmlContent"/> to the existing content.
+        /// </summary>
+        /// <param name="htmlContent">The <see cref="IHtmlContent"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent AppendHtml(IHtmlContent htmlContent);
+
+        /// <summary>
+        /// Appends <paramref name="encoded"/> to the existing content. <paramref name="encoded"/> is assumed
+        /// to be an HTML encoded <see cref="string"/> and no further encoding will be performed.
+        /// </summary>
+        /// <param name="encoded">The <see cref="string"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent AppendHtml(string encoded);
+
+        /// <summary>
+        /// Appends the specified <paramref name="format"/> to the existing content after
+        /// replacing each format item with the HTML encoded <see cref="string"/> representation of the
+        /// corresponding item in the <paramref name="args"/> array.
+        /// </summary>
+        /// <param name="format">
+        /// The composite format <see cref="string"/> (see http://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <param name="args">The object array to format.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public TagHelperContent AppendFormat(string format, params object[] args)
+        {
+            HtmlContentBuilderExtensions.AppendFormat(this, null, format, args);
+            return this;
+        }
+
+        /// <summary>
+        /// Appends the specified <paramref name="format"/> to the existing content with information from the
+        /// <paramref name="provider"/> after replacing each format item with the HTML encoded <see cref="string"/>
+        /// representation of the corresponding item in the <paramref name="args"/> array.
+        /// </summary>
+        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+        /// <param name="format">
+        /// The composite format <see cref="string"/> (see http://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <param name="args">The object array to format.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public TagHelperContent AppendFormat(IFormatProvider provider, string format, params object[] args)
+        {
+            HtmlContentBuilderExtensions.AppendFormat(this, provider, format, args);
+            return this;
+        }
+
+        /// <summary>
+        /// Clears the content.
+        /// </summary>
+        /// <returns>A reference to this instance after the clear operation has completed.</returns>
+        public abstract TagHelperContent Clear();
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContent"/>,  so it can be reused.
+        /// </summary>
+        /// <remarks>This method does more than what <see cref="Clear"/> does. It also resets the
+        /// <see cref="IsModified"/> flag.</remarks>
+        public abstract void Reinitialize();
+
+        /// <inheritdoc />
+        public abstract void CopyTo(IHtmlContentBuilder destination);
+
+        /// <inheritdoc />
+        public abstract void MoveTo(IHtmlContentBuilder destination);
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <returns>A <see cref="string"/> containing the content.</returns>
+        public abstract string GetContent();
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <returns>A <see cref="string"/> containing the content.</returns>
+        public abstract string GetContent(HtmlEncoder encoder);
+
+        /// <inheritdoc />
+        public abstract void WriteTo(TextWriter writer, HtmlEncoder encoder);
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.AppendHtml(IHtmlContent content)
+        {
+            return AppendHtml(content);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.Append(string unencoded)
+        {
+            return Append(unencoded);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.AppendHtml(string encoded)
+        {
+            return AppendHtml(encoded);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.Clear()
+        {
+            return Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
new file mode 100644
index 0000000000..e09a552a0b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
@@ -0,0 +1,118 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contains information related to the execution of <see cref="ITagHelper"/>s.
+    /// </summary>
+    public class TagHelperContext
+    {
+        private readonly TagHelperAttributeList _allAttributes;
+
+        /// <summary>
+        /// Instantiates a new <see cref="TagHelperContext"/>.
+        /// </summary>
+        /// <param name="tagName">The parsed HTML tag name of the element.</param>
+        /// <param name="allAttributes">Every attribute associated with the current HTML element.</param>
+        /// <param name="items">Collection of items used to communicate with other <see cref="ITagHelper"/>s.</param>
+        /// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
+        /// applies to.</param>
+        public TagHelperContext(
+            string tagName,
+            TagHelperAttributeList allAttributes,
+            IDictionary<object, object> items,
+            string uniqueId) : this(allAttributes, items, uniqueId)
+        {
+            if (tagName == null)
+            {
+                throw new ArgumentNullException(nameof(tagName));
+            }
+
+            TagName = tagName;
+        }
+
+        /// <summary>
+        /// Instantiates a new <see cref="TagHelperContext"/>.
+        /// </summary>
+        /// <param name="allAttributes">Every attribute associated with the current HTML element.</param>
+        /// <param name="items">Collection of items used to communicate with other <see cref="ITagHelper"/>s.</param>
+        /// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
+        /// applies to.</param>
+        public TagHelperContext(
+            TagHelperAttributeList allAttributes,
+            IDictionary<object, object> items,
+            string uniqueId)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            if (uniqueId == null)
+            {
+                throw new ArgumentNullException(nameof(uniqueId));
+            }
+
+            if (allAttributes == null)
+            {
+                throw new ArgumentNullException(nameof(allAttributes));
+            }
+
+            _allAttributes = allAttributes;
+            Items = items;
+            UniqueId = uniqueId;
+        }
+
+        /// <summary>
+        /// The parsed HTML tag name of the element.
+        /// </summary>
+        public string TagName { get; private set; }
+
+        /// <summary>
+        /// Every attribute associated with the current HTML element.
+        /// </summary>
+        public ReadOnlyTagHelperAttributeList AllAttributes => _allAttributes;
+
+        /// <summary>
+        /// Gets the collection of items used to communicate with other <see cref="ITagHelper"/>s.
+        /// </summary>
+        /// <remarks>
+        /// This <see cref="IDictionary{Object, Object}" /> is copy-on-write in order to ensure items added to this
+        /// collection are visible only to other <see cref="ITagHelper"/>s targeting child elements.
+        /// </remarks>
+        public IDictionary<object, object> Items { get; private set; }
+
+        /// <summary>
+        /// An identifier unique to the HTML element this context is for.
+        /// </summary>
+        public string UniqueId { get; private set; }
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
+        /// </summary>
+        /// <param name="tagName">The HTML tag name to use.</param>
+        /// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
+        /// <param name="uniqueId">The unique id to use.</param>
+        public void Reinitialize(string tagName, IDictionary<object, object> items, string uniqueId)
+        {
+            TagName = tagName;
+            Reinitialize(items, uniqueId);
+        }
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
+        /// </summary>
+        /// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
+        /// <param name="uniqueId">The unique id to use.</param>
+        public void Reinitialize(IDictionary<object, object> items, string uniqueId)
+        {
+            _allAttributes.Clear();
+            Items = items;
+            UniqueId = uniqueId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
new file mode 100644
index 0000000000..ed0c1e5308
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
@@ -0,0 +1,79 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public class TagHelperOutput : IHtmlContentContainer
+    {
+        public TagHelperOutput(
+            string tagName,
+            TagHelperAttributeList attributes,
+            Func<bool, HtmlEncoder, Task<TagHelperContent>> getChildContentAsync)
+        {
+        }
+
+        public string TagName { get; set; }
+
+        public TagHelperContent PreElement => null;
+
+        public TagHelperContent PreContent => null;
+
+        public TagHelperContent Content => null;
+
+        public TagHelperContent PostContent => null;
+
+        public TagHelperContent PostElement => null;
+
+        public bool IsContentModified => true;
+
+        public TagMode TagMode { get; set; }
+
+        public TagHelperAttributeList Attributes { get; }
+
+        public void Reinitialize(string tagName, TagMode tagMode)
+        {
+        }
+
+        public void SuppressOutput()
+        {
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync()
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(bool useCachedResult)
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(HtmlEncoder encoder)
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(bool useCachedResult, HtmlEncoder encoder)
+        {
+            throw null;
+        }
+
+        void IHtmlContentContainer.CopyTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        void IHtmlContentContainer.MoveTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
new file mode 100644
index 0000000000..b9d60a706a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// The mode in which an element should render.
+    /// </summary>
+    public enum TagMode
+    {
+        /// <summary>
+        /// Include both start and end tags.
+        /// </summary>
+        StartTagAndEndTag,
+
+        /// <summary>
+        /// A self-closed tag.
+        /// </summary>
+        SelfClosing,
+
+        /// <summary>
+        /// Only a start tag.
+        /// </summary>
+        StartTagOnly
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
new file mode 100644
index 0000000000..370f9372f2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// The structure the element should be written in.
+    /// </summary>
+    public enum TagStructure
+    {
+        /// <summary>
+        /// If no other tag helper applies to the same element and specifies a <see cref="TagStructure"/>,
+        /// <see cref="NormalOrSelfClosing"/> will be used.
+        /// </summary>
+        Unspecified,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        NormalOrSelfClosing,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        /// <remarks>Elements with a <see cref="WithoutEndTag"/> structure will never have any content.</remarks>
+        WithoutEndTag
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
index 9fa0e8c4ae..bd2e0104cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
@@ -6,10 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs
new file mode 100644
index 0000000000..b5390b7c87
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/DefaultRazorCompiledItem.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    internal class DefaultRazorCompiledItem : RazorCompiledItem
+    {
+        private object[] _metadata;
+
+        public DefaultRazorCompiledItem(Type type, string kind, string identifier)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (kind == null)
+            {
+                throw new ArgumentNullException(nameof(kind));
+            }
+
+            if (identifier == null)
+            {
+                throw new ArgumentNullException(nameof(identifier));
+            }
+
+            Type = type;
+            Kind = kind;
+            Identifier = identifier;
+        }
+
+        public override string Identifier { get; }
+
+        public override string Kind { get; }
+
+        public override IReadOnlyList<object> Metadata
+        {
+            get
+            {
+                if (_metadata == null)
+                {
+                    _metadata = Type.GetCustomAttributes(inherit: true);
+                }
+
+                return _metadata;
+            }
+        }
+
+        public override Type Type { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs
new file mode 100644
index 0000000000..dccdb2f871
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/IRazorSourceChecksumMetadata.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// A metadata object containing the checksum of a source file that contributed to a compiled item.
+    /// </summary>
+    public interface IRazorSourceChecksumMetadata
+    {
+        /// <summary>
+        /// Gets the checksum as string of hex-encoded bytes.
+        /// </summary>
+        string Checksum { get; }
+
+        /// <summary>
+        /// Gets the name of the algorithm used to create this checksum.
+        /// </summary>
+        string ChecksumAlgorithm { get; }
+
+        /// <summary>
+        /// Gets the identifier of the source file associated with this checksum.
+        /// </summary>
+        string Identifier { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs
new file mode 100644
index 0000000000..8eff0f4ea2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItem.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Identifies a compiled item that can be identified and loaded. 
+    /// </summary>
+    public abstract class RazorCompiledItem
+    {
+        /// <summary>
+        /// Gets the identifier associated with the compiled item. The identifier is used programmatically to locate
+        /// a specific item of a specific kind and should be uniqure within the assembly.
+        /// </summary>
+        public abstract string Identifier { get; }
+
+        /// <summary>
+        /// Gets the kind of compiled item. The kind is used programmatically to associate behaviors and semantics
+        /// with the item.
+        /// </summary>
+        public abstract string Kind { get; }
+
+        /// <summary>
+        /// Gets a collection of arbitrary metadata associated with the item.
+        /// </summary>
+        /// <remarks>
+        /// For items loaded with the default implementation of <see cref="RazorCompiledItemLoader"/>, the 
+        /// metadata collection will return all attributes defined on the <see cref="Type"/>.
+        /// </remarks>
+        public abstract IReadOnlyList<object> Metadata { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of the compiled item.
+        /// </summary>
+        public abstract Type Type { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs
new file mode 100644
index 0000000000..8e4c003f87
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemAttribute.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies that an assembly contains a compiled Razor asset.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public sealed class RazorCompiledItemAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new <see cref="RazorCompiledItemAttribute"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of the compiled item.</param>
+        /// <param name="kind">
+        /// The kind of the compiled item. The kind is used programmatically to associate behaviors with the item.
+        /// </param>
+        /// <param name="identifier">
+        /// The identifier associated with the item. The identifier is used programmatically to locate
+        /// a specific item of a specific kind, and should be unique within the assembly.
+        /// </param>
+        public RazorCompiledItemAttribute(Type type, string kind, string identifier)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (kind == null)
+            {
+                throw new ArgumentNullException(nameof(kind));
+            }
+
+            Type = type;
+            Kind = kind;
+            Identifier = identifier;
+        }
+
+        /// <summary>
+        /// Gets the kind of compiled item. The kind is used programmatically to associate behaviors and semantics
+        /// with the item.
+        /// </summary>
+        public string Kind { get; }
+
+        /// <summary>
+        /// Gets the identifier associated with the compiled item. The identifier is used programmatically to locate
+        /// a specific item of a specific kind and should be uniqure within the assembly.
+        /// </summary>
+        public string Identifier { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of the compiled item. The type should be contained in the assembly associated
+        /// with this instance of <see cref="RazorCompiledItemAttribute"/>.
+        /// </summary>
+        public Type Type { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs
new file mode 100644
index 0000000000..d6287e3253
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemExtensions.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Extension methods for <see cref="RazorCompiledItem"/>.
+    /// </summary>
+    public static class RazorCompiledItemExtensions
+    {
+        /// <summary>
+        /// Gets the list of <see cref="IRazorSourceChecksumMetadata"/> associated with <paramref name="item"/>.
+        /// </summary>
+        /// <param name="item">The <see cref="RazorCompiledItem"/>.</param>
+        /// <returns>A list of <see cref="IRazorSourceChecksumMetadata"/>.</returns>
+        public static IReadOnlyList<IRazorSourceChecksumMetadata> GetChecksumMetadata(this RazorCompiledItem item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return item.Metadata.OfType<IRazorSourceChecksumMetadata>().ToArray();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs
new file mode 100644
index 0000000000..0b52fd5f1b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorCompiledItemMetadataAttribute.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Defines a key/value metadata pair for the decorated Razor type.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class RazorCompiledItemMetadataAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new <see cref="RazorCompiledItemMetadataAttribute"/>.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        public RazorCompiledItemMetadataAttribute(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the key.
+        /// </summary>
+        public string Key { get; }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        public string Value { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs
new file mode 100644
index 0000000000..034e64c309
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorConfigurationNameAttribute.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the name of a Razor configuration as defined by the Razor SDK.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is applied to an application's entry point assembly by the Razor SDK during the build, 
+    /// so that the Razor configuration can be loaded at runtime based on the settings provided by the project
+    /// file.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+    public sealed class RazorConfigurationNameAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="RazorConfigurationNameAttribute"/>.
+        /// </summary>
+        /// <param name="configurationName">The name of the Razor configuration.</param>
+        public RazorConfigurationNameAttribute(string configurationName)
+        {
+            if (configurationName == null)
+            {
+                throw new ArgumentNullException(nameof(configurationName));
+            }
+
+            ConfigurationName = configurationName;
+        }
+
+        /// <summary>
+        /// Gets the name of the Razor configuration.
+        /// </summary>
+        public string ConfigurationName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs
new file mode 100644
index 0000000000..92a9d1c6ec
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorExtensionAssemblyNameAttribute.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the name of a Razor extension as defined by the Razor SDK.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is applied to an application's entry point assembly by the Razor SDK during the build, 
+    /// so that the Razor configuration can be loaded at runtime based on the settings provided by the project
+    /// file.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public sealed class RazorExtensionAssemblyNameAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="RazorExtensionAssemblyNameAttribute"/>.
+        /// </summary>
+        /// <param name="extensionName">The name of the extension.</param>
+        /// <param name="assemblyName">The assembly name of the extension.</param>
+        public RazorExtensionAssemblyNameAttribute(string extensionName, string assemblyName)
+        {
+            if (extensionName == null)
+            {
+                throw new ArgumentNullException(nameof(extensionName));
+            }
+
+            if (assemblyName == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyName));
+            }
+
+            ExtensionName = extensionName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>
+        /// Gets the assembly name of the extension.
+        /// </summary>
+        public string AssemblyName { get; }
+
+        /// <summary>
+        /// Gets the name of the extension.
+        /// </summary>
+        public string ExtensionName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs
new file mode 100644
index 0000000000..8f261143d0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorLanguageVersionAttribute.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the name of a Razor configuration as defined by the Razor SDK.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is part of a set of metadata attributes that can be applied to an assembly at build
+    /// time by the Razor SDK. These attributes allow the Razor configuration to be loaded at runtime based 
+    /// on the settings originally provided by the project file.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+    public sealed class RazorLanguageVersionAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="RazorLanguageVersionAttribute"/>.
+        /// </summary>
+        /// <param name="languageVersion">The language version of Razor</param>
+        public RazorLanguageVersionAttribute(string languageVersion)
+        {
+            if (languageVersion == null)
+            {
+                throw new ArgumentNullException(nameof(languageVersion));
+            }
+
+            LanguageVersion = languageVersion;
+        }
+
+        /// <summary>
+        /// Gets the Razor language version.
+        /// </summary>
+        public string LanguageVersion { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs
new file mode 100644
index 0000000000..d1da25b300
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Hosting/RazorSourceChecksumAttribute.cs
@@ -0,0 +1,67 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    /// <summary>
+    /// Specifies the checksum of a source file that contributed to a compiled item.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// These attributes are added by the Razor infrastructure when generating code to assist runtime
+    /// implementations to determine the integrity of compiled items.
+    /// </para>
+    /// <para>
+    /// Runtime implementations should access the checksum metadata for an item using
+    /// <see cref="RazorCompiledItemExtensions.GetChecksumMetadata(RazorCompiledItem)"/>.
+    /// </para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class RazorSourceChecksumAttribute : Attribute, IRazorSourceChecksumMetadata
+    {
+        /// <summary>
+        /// Creates a new <see cref="RazorSourceChecksumAttribute"/>.
+        /// </summary>
+        /// <param name="checksumAlgorithm">The algorithm used to create this checksum.</param>
+        /// <param name="checksum">The checksum as a string of hex-encoded bytes.</param>
+        /// <param name="identifier">The identifier associated with this thumbprint.</param>
+        public RazorSourceChecksumAttribute(string checksumAlgorithm, string checksum, string identifier)
+        {
+            if (checksumAlgorithm == null)
+            {
+                throw new ArgumentNullException(nameof(checksumAlgorithm));
+            }
+
+            if (checksum == null)
+            {
+                throw new ArgumentNullException(nameof(checksum));
+            }
+
+            if (identifier == null)
+            {
+                throw new ArgumentNullException(nameof(identifier));
+            }
+
+            ChecksumAlgorithm = checksumAlgorithm;
+            Checksum = checksum;
+            Identifier = identifier;
+        }
+
+        /// <summary>
+        /// Gets the checksum as string of hex-encoded bytes.
+        /// </summary>
+        public string Checksum { get; }
+
+        /// <summary>
+        /// Gets the name of the algorithm used to create this checksum.
+        /// </summary>
+        public string ChecksumAlgorithm { get; }
+        
+        /// <summary>
+        /// Gets the identifier of the source file associated with this checksum.
+        /// </summary>
+        public string Identifier { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
new file mode 100644
index 0000000000..011d59083c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperExecutionContext.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperExecutionContext
+    {
+        public TagHelperExecutionContext(
+            string tagName,
+            TagMode tagMode,
+            IDictionary<object, object> items,
+            string uniqueId,
+            Func<Task> executeChildContentAsync,
+            Action<HtmlEncoder> startTagHelperWritingScope,
+            Func<TagHelperContent> endTagHelperWritingScope)
+        {
+        }
+
+        public bool ChildContentRetrieved => false;
+
+        public IDictionary<object, object> Items { get; private set; }
+
+        public IList<ITagHelper> TagHelpers => null;
+
+        public TagHelperOutput Output { get; internal set; }
+
+        public TagHelperContext Context { get; }
+
+        public void Add(ITagHelper tagHelper)
+        {
+        }
+
+        public void AddHtmlAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public void AddHtmlAttribute(TagHelperAttribute attribute)
+        {
+        }
+
+        public void AddTagHelperAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public void AddTagHelperAttribute(TagHelperAttribute attribute)
+        {
+        }
+
+        public void Reinitialize(
+            string tagName,
+            TagMode tagMode,
+            IDictionary<object, object> items,
+            string uniqueId,
+            Func<Task> executeChildContentAsync)
+        {
+        }
+
+        public Task SetOutputContentAsync()
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
new file mode 100644
index 0000000000..21f2b5b6fa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperRunner.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperRunner
+    {
+        public Task RunAsync(TagHelperExecutionContext executionContext)
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
new file mode 100644
index 0000000000..70f072bbc4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Runtime.TagHelpers/TagHelperScopeManager.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
+{
+    public class TagHelperScopeManager
+    {
+        public TagHelperScopeManager(
+            Action<HtmlEncoder> startTagHelperWritingScope,
+            Func<TagHelperContent> endTagHelperWritingScope)
+        {
+        }
+
+        public TagHelperExecutionContext Begin(
+            string tagName,
+            TagMode tagMode,
+            string uniqueId,
+            Func<Task> executeChildContentAsync)
+        {
+            throw null;
+        }
+
+        public TagHelperExecutionContext End()
+        {
+            throw null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
new file mode 100644
index 0000000000..aca16610b0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNameAttribute.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Used to override an <see cref="ITagHelper"/> property's HTML attribute name.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class HtmlAttributeNameAttribute : Attribute
+    {
+        private string _dictionaryAttributePrefix;
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNameAttribute"/> class with <see cref="Name"/>
+        /// equal to <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// Associated property must not have a public setter and must be compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </remarks>
+        public HtmlAttributeNameAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNameAttribute"/> class.
+        /// </summary>
+        /// <param name="name">
+        /// HTML attribute name for the associated property. Must be <c>null</c> or empty if associated property does
+        /// not have a public setter and is compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>. Otherwise must not be <c>null</c> or empty.
+        /// </param>
+        public HtmlAttributeNameAttribute(string name)
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// HTML attribute name of the associated property.
+        /// </summary>
+        /// <value>
+        /// <c>null</c> or empty if and only if associated property does not have a public setter and is compatible
+        /// with <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets or sets the prefix used to match HTML attribute names. Matching attributes are added to the
+        /// associated property (an <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/>).
+        /// </summary>
+        /// <remarks>
+        /// If non-<c>null</c> associated property must be compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/> where <c>TKey</c> is
+        /// <see cref="string"/>.
+        /// </remarks>
+        /// <value>
+        /// <para>
+        /// If associated property is compatible with
+        /// <see cref="System.Collections.Generic.IDictionary{TKey, TValue}"/>, default value is <c>Name + "-"</c>.
+        /// <see cref="Name"/> must not be <c>null</c> or empty in this case.
+        /// </para>
+        /// <para>
+        /// Otherwise default value is <c>null</c>.
+        /// </para>
+        /// </value>
+        public string DictionaryAttributePrefix
+        {
+            get
+            {
+                return _dictionaryAttributePrefix;
+            }
+            set
+            {
+                _dictionaryAttributePrefix = value;
+                DictionaryAttributePrefixSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets an indication whether <see cref="DictionaryAttributePrefix"/> has been set. Used to distinguish an
+        /// uninitialized <see cref="DictionaryAttributePrefix"/> value from an explicit <c>null</c> setting.
+        /// </summary>
+        /// <value><c>true</c> if <see cref="DictionaryAttributePrefix"/> was set. <c>false</c> otherwise.</value>
+        public bool DictionaryAttributePrefixSet { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
new file mode 100644
index 0000000000..9d23480abd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeNotBoundAttribute.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Indicates the associated <see cref="ITagHelper"/> property should not be bound to HTML attributes.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class HtmlAttributeNotBoundAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlAttributeNotBoundAttribute"/> class.
+        /// </summary>
+        public HtmlAttributeNotBoundAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
new file mode 100644
index 0000000000..7ac198567f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlAttributeValueStyle.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public enum HtmlAttributeValueStyle
+    {
+        DoubleQuotes,
+        SingleQuotes,
+        NoQuotes,
+        Minimized,
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
new file mode 100644
index 0000000000..857d6a0e5d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/HtmlTargetElementAttribute.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides an <see cref="ITagHelper"/>'s target.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
+    public sealed class HtmlTargetElementAttribute : Attribute
+    {
+        public const string ElementCatchAllTarget = "*";
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlTargetElementAttribute"/> class that targets all HTML
+        /// elements with the required <see cref="Attributes"/>.
+        /// </summary>
+        /// <remarks><see cref="Tag"/> is set to <c>*</c>.</remarks>
+        public HtmlTargetElementAttribute()
+            : this(ElementCatchAllTarget)
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HtmlTargetElementAttribute"/> class with the given
+        /// <paramref name="tag"/> as its <see cref="Tag"/> value.
+        /// </summary>
+        /// <param name="tag">
+        /// The HTML tag the <see cref="ITagHelper"/> targets.
+        /// </param>
+        /// <remarks>A <c>*</c> <paramref name="tag"/> value indicates this <see cref="ITagHelper"/>
+        /// targets all HTML elements with the required <see cref="Attributes"/>.</remarks>
+        public HtmlTargetElementAttribute(string tag)
+        {
+            Tag = tag;
+        }
+
+        /// <summary>
+        /// The HTML tag the <see cref="ITagHelper"/> targets. A <c>*</c> value indicates this <see cref="ITagHelper"/>
+        /// targets all HTML elements with the required <see cref="Attributes"/>.
+        /// </summary>
+        public string Tag { get; }
+
+        /// <summary>
+        /// A comma-separated <see cref="string"/> of attribute selectors the HTML element must match for the
+        /// <see cref="ITagHelper"/> to run. <c>*</c> at the end of an attribute name acts as a prefix match. A value
+        /// surrounded by square brackets is handled as a CSS attribute value selector. Operators <c>^=</c>, <c>$=</c> and
+        /// <c>=</c> are supported e.g. <c>"name"</c>, <c>"[name]"</c>, <c>"[name=value]"</c>, <c>"[ name ^= 'value' ]"</c>.
+        /// </summary>
+        public string Attributes { get; set; }
+
+        /// <summary>
+        /// The expected tag structure. Defaults to <see cref="TagStructure.Unspecified"/>.
+        /// </summary>
+        /// <remarks>
+        /// If <see cref="TagStructure.Unspecified"/> and no other tag helpers applying to the same element specify
+        /// their <see cref="TagStructure"/> the <see cref="TagStructure.NormalOrSelfClosing"/> behavior is used:
+        /// <para>
+        /// <code>
+        /// &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt;
+        /// &lt;!-- OR --&gt;
+        /// &lt;my-tag-helper /&gt;
+        /// </code>
+        /// Otherwise, if another tag helper applying to the same element does specify their behavior, that behavior
+        /// is used.
+        /// </para>
+        /// <para>
+        /// If <see cref="TagStructure.WithoutEndTag"/> HTML elements can be written in the following formats:
+        /// <code>
+        /// &lt;my-tag-helper&gt;
+        /// &lt;!-- OR --&gt;
+        /// &lt;my-tag-helper /&gt;
+        /// </code>
+        /// </para>
+        /// </remarks>
+        public TagStructure TagStructure { get; set; }
+
+        /// <summary>
+        /// The required HTML element name of the direct parent. A <c>null</c> value indicates any HTML element name is
+        /// allowed.
+        /// </summary>
+        public string ParentTag { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
new file mode 100644
index 0000000000..ec86a32a11
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelper.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contract used to filter matching HTML elements.
+    /// Marker interface for <see cref="TagHelper"/>s.
+    /// </summary>
+    public interface ITagHelper : ITagHelperComponent
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs
new file mode 100644
index 0000000000..3b2059be51
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ITagHelperComponent.cs
@@ -0,0 +1,41 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contract used to modify an HTML element. 
+    /// </summary>
+    public interface ITagHelperComponent
+    {
+        /// <summary>
+        /// When a set of <see cref="ITagHelperComponent"/>s are executed, their <see cref="Init(TagHelperContext)"/>'s
+        /// are first invoked in the specified <see cref="Order"/>; then their
+        /// <see cref="ProcessAsync(TagHelperContext, TagHelperOutput)"/>'s are invoked in the specified
+        /// <see cref="Order"/>. Lower values are executed first.
+        /// </summary>
+        int Order { get; }
+
+        /// <summary>
+        /// Initializes the <see cref="ITagHelperComponent"/> with the given <paramref name="context"/>. Additions to
+        /// <see cref="TagHelperContext.Items"/> should be done within this method to ensure they're added prior to
+        /// executing the children.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <remarks>When more than one <see cref="ITagHelperComponent"/> runs on the same element,
+        /// <see cref="M:TagHelperOutput.GetChildContentAsync"/> may be invoked prior to <see cref="ProcessAsync"/>.
+        /// </remarks>
+        void Init(TagHelperContext context);
+
+        /// <summary>
+        /// Asynchronously executes the <see cref="ITagHelperComponent"/> with the given <paramref name="context"/> and
+        /// <paramref name="output"/>.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
+        /// <returns>A <see cref="Task"/> that on completion updates the <paramref name="output"/>.</returns>
+        Task ProcessAsync(TagHelperContext context, TagHelperOutput output);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
new file mode 100644
index 0000000000..a97b5ef9ab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/OutputElementHintAttribute.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides a hint of the <see cref="ITagHelper"/>'s output element.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+    public sealed class OutputElementHintAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="OutputElementHintAttribute"/> class.
+        /// </summary>
+        /// <param name="outputElement">
+        /// The HTML element the <see cref="ITagHelper"/> may output.
+        /// </param>
+        public OutputElementHintAttribute(string outputElement)
+        {
+            if (outputElement == null)
+            {
+                throw new ArgumentNullException(nameof(outputElement));
+            }
+
+            OutputElement = outputElement;
+        }
+
+        /// <summary>
+        /// The HTML element the <see cref="ITagHelper"/> may output.
+        /// </summary>
+        public string OutputElement { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
new file mode 100644
index 0000000000..f3d1569a59
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/ReadOnlyTagHelperAttributeList.cs
@@ -0,0 +1,190 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// A read-only collection of <see cref="TagHelperAttribute"/>s.
+    /// </summary>
+    public abstract class ReadOnlyTagHelperAttributeList : ReadOnlyCollection<TagHelperAttribute>
+    {
+        private static readonly IReadOnlyList<TagHelperAttribute> EmptyList = new TagHelperAttribute[0];
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ReadOnlyTagHelperAttributeList"/> with an empty
+        /// collection.
+        /// </summary>
+        protected ReadOnlyTagHelperAttributeList()
+            : base(new List<TagHelperAttribute>())
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="ReadOnlyTagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public ReadOnlyTagHelperAttributeList(IList<TagHelperAttribute> attributes)
+            : base(attributes)
+        {
+        }
+
+        /// <summary>
+        /// Gets the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of the <see cref="TagHelperAttribute"/> to get.
+        /// </param>
+        /// <returns>The first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public TagHelperAttribute this[string name]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                // Perf: Avoid allocating enumerator
+                for (var i = 0; i < Items.Count; i++)
+                {
+                    if (NameEquals(name, Items[i]))
+                    {
+                        return Items[i];
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/> exists in the collection.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/> to get.</param>
+        /// <returns>
+        /// <c>true</c> if a <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool ContainsName(string name)
+        {
+            return this[name] != null;
+        }
+
+        /// <summary>
+        /// Retrieves the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/>
+        /// matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/> to get.</param>
+        /// <param name="attribute">When this method returns, the first <see cref="TagHelperAttribute"/> with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>, if found; otherwise,
+        /// <c>null</c>.</param>
+        /// <returns><c>true</c> if a <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.</returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool TryGetAttribute(string name, out TagHelperAttribute attribute)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            attribute = this[name];
+
+            return attribute != null;
+        }
+
+        /// <summary>
+        /// Retrieves <see cref="TagHelperAttribute"/>s in the collection with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the
+        /// <see cref="TagHelperAttribute"/>s to get.</param>
+        /// <param name="attributes">When this method returns, the <see cref="TagHelperAttribute"/>s with
+        /// <see cref="TagHelperAttribute.Name"/> matching <paramref name="name"/>.</param>
+        /// <returns><c>true</c> if at least one <see cref="TagHelperAttribute"/> with the same
+        /// <see cref="TagHelperAttribute.Name"/> exists in the collection; otherwise, <c>false</c>.</returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool TryGetAttributes(string name, out IReadOnlyList<TagHelperAttribute> attributes)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            // Perf: Avoid allocating enumerator
+            List<TagHelperAttribute> matchedAttributes = null;
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    if (matchedAttributes == null)
+                    {
+                        matchedAttributes = new List<TagHelperAttribute>();
+                    }
+
+                    matchedAttributes.Add(Items[i]);
+                }
+            }
+            attributes = matchedAttributes ?? EmptyList;
+
+            return matchedAttributes != null;
+        }
+
+        /// <summary>
+        /// Searches for a <see cref="TagHelperAttribute"/> who's <see cref="TagHelperAttribute.Name"/>
+        /// case-insensitively matches <paramref name="name"/> and returns the zero-based index of the first
+        /// occurrence.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> to locate in the collection.</param>
+        /// <returns>The zero-based index of the first matching <see cref="TagHelperAttribute"/> within the collection,
+        /// if found; otherwise, -1.</returns>
+        public int IndexOfName(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Determines if the specified <paramref name="attribute"/> has the same name as <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The value to compare against <paramref name="attribute"/>s
+        /// <see cref="TagHelperAttribute.Name"/>.</param>
+        /// <param name="attribute">The attribute to compare against.</param>
+        /// <returns><c>true</c> if <paramref name="name"/> case-insensitively matches <paramref name="attribute"/>s
+        /// <see cref="TagHelperAttribute.Name"/>.</returns>
+        protected static bool NameEquals(string name, TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return string.Equals(name, attribute.Name, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
new file mode 100644
index 0000000000..bc4f6bac35
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/RestrictChildrenAttribute.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Restricts children of the <see cref="ITagHelper"/>'s element.
+    /// </summary>
+    /// <remarks>Combining this attribute with a <see cref="HtmlTargetElementAttribute"/> that specifies its
+    /// <see cref="HtmlTargetElementAttribute.TagStructure"/> as <see cref="TagStructure.WithoutEndTag"/> will result
+    /// in this attribute being ignored.</remarks>
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    public class RestrictChildrenAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="RestrictChildrenAttribute"/> class.
+        /// </summary>
+        /// <param name="childTag">
+        /// The tag name of an element allowed as a child.
+        /// </param>
+        /// <param name="childTags">
+        /// Additional names of elements allowed as children.
+        /// </param>
+        public RestrictChildrenAttribute(string childTag, params string[] childTags)
+        {
+            var concatenatedNames = new string[1 + childTags.Length];
+            concatenatedNames[0] = childTag;
+
+            childTags.CopyTo(concatenatedNames, 1);
+
+            ChildTags = concatenatedNames;
+        }
+
+        /// <summary>
+        /// Get the names of elements allowed as children.
+        /// </summary>
+        public IEnumerable<string> ChildTags { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
new file mode 100644
index 0000000000..ed9faca1bb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelper.cs
@@ -0,0 +1,26 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public abstract class TagHelper : ITagHelper
+    {
+        public virtual int Order { get; } = 0;
+
+        public virtual void Init(TagHelperContext context)
+        {
+        }
+
+        public virtual void Process(TagHelperContext context, TagHelperOutput output)
+        {
+        }
+
+        public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            Process(context, output);
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
new file mode 100644
index 0000000000..7bdd2aea22
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttribute.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public class TagHelperAttribute : IHtmlContentContainer
+    {
+        public TagHelperAttribute(string name)
+        {
+        }
+
+        public TagHelperAttribute(string name, object value)
+        {
+        }
+
+        public TagHelperAttribute(string name, object value, HtmlAttributeValueStyle valueStyle)
+        {
+        }
+
+        public string Name { get; }
+
+        public object Value { get; }
+
+        public HtmlAttributeValueStyle ValueStyle { get; }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+
+        public void CopyTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        public void MoveTo(IHtmlContentBuilder destination)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
new file mode 100644
index 0000000000..308292294c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperAttributeList.cs
@@ -0,0 +1,230 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// A collection of <see cref="TagHelperAttribute"/>s.
+    /// </summary>
+    public class TagHelperAttributeList : ReadOnlyTagHelperAttributeList, IList<TagHelperAttribute>
+    {
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with an empty collection.
+        /// </summary>
+        public TagHelperAttributeList()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public TagHelperAttributeList(IEnumerable<TagHelperAttribute> attributes)
+            : base (new List<TagHelperAttribute>(attributes))
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperAttributeList"/> with the specified
+        /// <paramref name="attributes"/>.
+        /// </summary>
+        /// <param name="attributes">The collection to wrap.</param>
+        public TagHelperAttributeList(List<TagHelperAttribute> attributes)
+            : base(attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <paramref name="value"/>'s <see cref="TagHelperAttribute.Name"/> must not be <c>null</c>.
+        /// </remarks>
+        public new TagHelperAttribute this[int index]
+        {
+            get
+            {
+                return base[index];
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                Items[index] = value;
+            }
+        }
+
+        /// <summary>
+        /// Replaces the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="name"/> and removes any additional matching <see cref="TagHelperAttribute"/>s. If a
+        /// matching <see cref="TagHelperAttribute"/> is not found, adds a <see cref="TagHelperAttribute"/> with
+        /// <paramref name="name"/> and <paramref name="value"/> to the end of the collection.</summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of the <see cref="TagHelperAttribute"/> to set.
+        /// </param>
+        /// <param name="value">
+        /// The <see cref="TagHelperAttribute.Value"/> to set.
+        /// </param>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public void SetAttribute(string name, object value)
+        {
+            var attribute = new TagHelperAttribute(name, value);
+            SetAttribute(attribute);
+        }
+
+        /// <summary>
+        /// Replaces the first <see cref="TagHelperAttribute"/> with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="attribute"/>'s <see cref="TagHelperAttribute.Name"/> and removes any additional matching
+        /// <see cref="TagHelperAttribute"/>s. If a matching <see cref="TagHelperAttribute"/> is not found, adds the
+        /// specified <paramref name="attribute"/> to the end of the collection.
+        /// </summary>
+        /// <param name="attribute">
+        /// The <see cref="TagHelperAttribute"/> to set.
+        /// </param>
+        /// <remarks><paramref name="attribute"/>'s <see cref="TagHelperAttribute.Name"/> is compared
+        /// case-insensitively.</remarks>
+        public void SetAttribute(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var attributeReplaced = false;
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (NameEquals(attribute.Name, Items[i]))
+                {
+                    // We replace the first attribute with the provided attribute, remove all the rest.
+                    if (!attributeReplaced)
+                    {
+                        // We replace the first attribute we find with the same name.
+                        Items[i] = attribute;
+                        attributeReplaced = true;
+                    }
+                    else
+                    {
+                        Items.RemoveAt(i--);
+                    }
+                }
+            }
+
+            // If we didn't replace an attribute value we should add value to the end of the collection.
+            if (!attributeReplaced)
+            {
+                Add(attribute);
+            }
+        }
+
+        /// <inheritdoc />
+        bool ICollection<TagHelperAttribute>.IsReadOnly => false;
+
+        /// <summary>
+        /// Adds a <see cref="TagHelperAttribute"/> to the end of the collection with the specified
+        /// <paramref name="name"/> and <paramref name="value"/>.
+        /// </summary>
+        /// <param name="name">The <see cref="TagHelperAttribute.Name"/> of the attribute to add.</param>
+        /// <param name="value">The <see cref="TagHelperAttribute.Value"/> of the attribute to add.</param>
+        public void Add(string name, object value)
+        {
+            var attribute = new TagHelperAttribute(name, value);
+            Items.Add(attribute);
+        }
+
+        /// <inheritdoc />
+        public void Add(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            Items.Add(attribute);
+        }
+
+        /// <inheritdoc />
+        public void Insert(int index, TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            Items.Insert(index, attribute);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <paramref name="attribute"/>s <see cref="TagHelperAttribute.Name"/> is compared case-insensitively.
+        /// </remarks>
+        public bool Remove(TagHelperAttribute attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return Items.Remove(attribute);
+        }
+
+        /// <inheritdoc />
+        public void RemoveAt(int index)
+        {
+            Items.RemoveAt(index);
+        }
+
+        /// <summary>
+        /// Removes all <see cref="TagHelperAttribute"/>s with <see cref="TagHelperAttribute.Name"/> matching
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The <see cref="TagHelperAttribute.Name"/> of <see cref="TagHelperAttribute"/>s to remove.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if at least 1 <see cref="TagHelperAttribute"/> was removed; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks><paramref name="name"/> is compared case-insensitively.</remarks>
+        public bool RemoveAll(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            // Perf: Avoid allocating enumerator
+            var removedAtLeastOne = false;
+            for (var i = Items.Count - 1; i >= 0; i--)
+            {
+                if (NameEquals(name, Items[i]))
+                {
+                    Items.RemoveAt(i);
+                    removedAtLeastOne = true;
+                }
+            }
+
+            return removedAtLeastOne;
+        }
+
+        /// <inheritdoc />
+        public void Clear()
+        {
+            Items.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs
new file mode 100644
index 0000000000..1a2c748cab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperComponent.cs
@@ -0,0 +1,39 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// An abstract base class for <see cref="ITagHelperComponent"/>.
+    /// </summary>
+    public abstract class TagHelperComponent : ITagHelperComponent
+    {
+        /// <inheritdoc />
+        /// <remarks>Default order is <c>0</c>.</remarks>
+        public virtual int Order => 0;
+
+        /// <inheritdoc />
+        public virtual void Init(TagHelperContext context)
+        {
+        }
+
+        /// <summary>
+        /// Synchronously executes the <see cref="ITagHelperComponent"/> with the given <paramref name="context"/> and
+        /// <paramref name="output"/>.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
+        public virtual void Process(TagHelperContext context, TagHelperOutput output)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            Process(context, output);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
new file mode 100644
index 0000000000..7a6d380215
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
@@ -0,0 +1,179 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Abstract class used to buffer content returned by <see cref="ITagHelper"/>s.
+    /// </summary>
+    public abstract class TagHelperContent : IHtmlContentBuilder
+    {
+        /// <summary>
+        /// Gets a value indicating whether the content was modified.
+        /// </summary>
+        public abstract bool IsModified { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the content is empty or whitespace.
+        /// </summary>
+        public abstract bool IsEmptyOrWhiteSpace { get; }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="htmlContent">The <see cref="IHtmlContent"/> that replaces the content.</param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
+        {
+            HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="unencoded">
+        /// The <see cref="string"/> that replaces the content. The value is assume to be unencoded
+        /// as-provided and will be HTML encoded before being written.
+        /// </param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetContent(string unencoded)
+        {
+            HtmlContentBuilderExtensions.SetContent(this, unencoded);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the content.
+        /// </summary>
+        /// <param name="encoded">
+        /// The <see cref="string"/> that replaces the content. The value is assume to be HTML encoded
+        /// as-provided and no further encoding will be performed.
+        /// </param>
+        /// <returns>A reference to this instance after the set operation has completed.</returns>
+        public TagHelperContent SetHtmlContent(string encoded)
+        {
+            HtmlContentBuilderExtensions.SetHtmlContent(this, encoded);
+            return this;
+        }
+
+        /// <summary>
+        /// Appends <paramref name="unencoded"/> to the existing content.
+        /// </summary>
+        /// <param name="unencoded">The <see cref="string"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent Append(string unencoded);
+
+        /// <summary>
+        /// Appends <paramref name="htmlContent"/> to the existing content.
+        /// </summary>
+        /// <param name="htmlContent">The <see cref="IHtmlContent"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent AppendHtml(IHtmlContent htmlContent);
+
+        /// <summary>
+        /// Appends <paramref name="encoded"/> to the existing content. <paramref name="encoded"/> is assumed
+        /// to be an HTML encoded <see cref="string"/> and no further encoding will be performed.
+        /// </summary>
+        /// <param name="encoded">The <see cref="string"/> to be appended.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public abstract TagHelperContent AppendHtml(string encoded);
+
+        /// <summary>
+        /// Appends the specified <paramref name="format"/> to the existing content after
+        /// replacing each format item with the HTML encoded <see cref="string"/> representation of the
+        /// corresponding item in the <paramref name="args"/> array.
+        /// </summary>
+        /// <param name="format">
+        /// The composite format <see cref="string"/> (see http://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <param name="args">The object array to format.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public TagHelperContent AppendFormat(string format, params object[] args)
+        {
+            HtmlContentBuilderExtensions.AppendFormat(this, null, format, args);
+            return this;
+        }
+
+        /// <summary>
+        /// Appends the specified <paramref name="format"/> to the existing content with information from the
+        /// <paramref name="provider"/> after replacing each format item with the HTML encoded <see cref="string"/>
+        /// representation of the corresponding item in the <paramref name="args"/> array.
+        /// </summary>
+        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+        /// <param name="format">
+        /// The composite format <see cref="string"/> (see http://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <param name="args">The object array to format.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public TagHelperContent AppendFormat(IFormatProvider provider, string format, params object[] args)
+        {
+            HtmlContentBuilderExtensions.AppendFormat(this, provider, format, args);
+            return this;
+        }
+
+        /// <summary>
+        /// Clears the content.
+        /// </summary>
+        /// <returns>A reference to this instance after the clear operation has completed.</returns>
+        public abstract TagHelperContent Clear();
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContent"/>,  so it can be reused.
+        /// </summary>
+        /// <remarks>This method does more than what <see cref="Clear"/> does. It also resets the
+        /// <see cref="IsModified"/> flag.</remarks>
+        public abstract void Reinitialize();
+
+        /// <inheritdoc />
+        public abstract void CopyTo(IHtmlContentBuilder destination);
+
+        /// <inheritdoc />
+        public abstract void MoveTo(IHtmlContentBuilder destination);
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <returns>A <see cref="string"/> containing the content.</returns>
+        public abstract string GetContent();
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <returns>A <see cref="string"/> containing the content.</returns>
+        public abstract string GetContent(HtmlEncoder encoder);
+
+        /// <inheritdoc />
+        public abstract void WriteTo(TextWriter writer, HtmlEncoder encoder);
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.AppendHtml(IHtmlContent content)
+        {
+            return AppendHtml(content);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.Append(string unencoded)
+        {
+            return Append(unencoded);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.AppendHtml(string encoded)
+        {
+            return AppendHtml(encoded);
+        }
+
+        /// <inheritdoc />
+        IHtmlContentBuilder IHtmlContentBuilder.Clear()
+        {
+            return Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
new file mode 100644
index 0000000000..e09a552a0b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContext.cs
@@ -0,0 +1,118 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// Contains information related to the execution of <see cref="ITagHelper"/>s.
+    /// </summary>
+    public class TagHelperContext
+    {
+        private readonly TagHelperAttributeList _allAttributes;
+
+        /// <summary>
+        /// Instantiates a new <see cref="TagHelperContext"/>.
+        /// </summary>
+        /// <param name="tagName">The parsed HTML tag name of the element.</param>
+        /// <param name="allAttributes">Every attribute associated with the current HTML element.</param>
+        /// <param name="items">Collection of items used to communicate with other <see cref="ITagHelper"/>s.</param>
+        /// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
+        /// applies to.</param>
+        public TagHelperContext(
+            string tagName,
+            TagHelperAttributeList allAttributes,
+            IDictionary<object, object> items,
+            string uniqueId) : this(allAttributes, items, uniqueId)
+        {
+            if (tagName == null)
+            {
+                throw new ArgumentNullException(nameof(tagName));
+            }
+
+            TagName = tagName;
+        }
+
+        /// <summary>
+        /// Instantiates a new <see cref="TagHelperContext"/>.
+        /// </summary>
+        /// <param name="allAttributes">Every attribute associated with the current HTML element.</param>
+        /// <param name="items">Collection of items used to communicate with other <see cref="ITagHelper"/>s.</param>
+        /// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
+        /// applies to.</param>
+        public TagHelperContext(
+            TagHelperAttributeList allAttributes,
+            IDictionary<object, object> items,
+            string uniqueId)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            if (uniqueId == null)
+            {
+                throw new ArgumentNullException(nameof(uniqueId));
+            }
+
+            if (allAttributes == null)
+            {
+                throw new ArgumentNullException(nameof(allAttributes));
+            }
+
+            _allAttributes = allAttributes;
+            Items = items;
+            UniqueId = uniqueId;
+        }
+
+        /// <summary>
+        /// The parsed HTML tag name of the element.
+        /// </summary>
+        public string TagName { get; private set; }
+
+        /// <summary>
+        /// Every attribute associated with the current HTML element.
+        /// </summary>
+        public ReadOnlyTagHelperAttributeList AllAttributes => _allAttributes;
+
+        /// <summary>
+        /// Gets the collection of items used to communicate with other <see cref="ITagHelper"/>s.
+        /// </summary>
+        /// <remarks>
+        /// This <see cref="IDictionary{Object, Object}" /> is copy-on-write in order to ensure items added to this
+        /// collection are visible only to other <see cref="ITagHelper"/>s targeting child elements.
+        /// </remarks>
+        public IDictionary<object, object> Items { get; private set; }
+
+        /// <summary>
+        /// An identifier unique to the HTML element this context is for.
+        /// </summary>
+        public string UniqueId { get; private set; }
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
+        /// </summary>
+        /// <param name="tagName">The HTML tag name to use.</param>
+        /// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
+        /// <param name="uniqueId">The unique id to use.</param>
+        public void Reinitialize(string tagName, IDictionary<object, object> items, string uniqueId)
+        {
+            TagName = tagName;
+            Reinitialize(items, uniqueId);
+        }
+
+        /// <summary>
+        /// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
+        /// </summary>
+        /// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
+        /// <param name="uniqueId">The unique id to use.</param>
+        public void Reinitialize(IDictionary<object, object> items, string uniqueId)
+        {
+            _allAttributes.Clear();
+            Items = items;
+            UniqueId = uniqueId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
new file mode 100644
index 0000000000..ed0c1e5308
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperOutput.cs
@@ -0,0 +1,79 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    public class TagHelperOutput : IHtmlContentContainer
+    {
+        public TagHelperOutput(
+            string tagName,
+            TagHelperAttributeList attributes,
+            Func<bool, HtmlEncoder, Task<TagHelperContent>> getChildContentAsync)
+        {
+        }
+
+        public string TagName { get; set; }
+
+        public TagHelperContent PreElement => null;
+
+        public TagHelperContent PreContent => null;
+
+        public TagHelperContent Content => null;
+
+        public TagHelperContent PostContent => null;
+
+        public TagHelperContent PostElement => null;
+
+        public bool IsContentModified => true;
+
+        public TagMode TagMode { get; set; }
+
+        public TagHelperAttributeList Attributes { get; }
+
+        public void Reinitialize(string tagName, TagMode tagMode)
+        {
+        }
+
+        public void SuppressOutput()
+        {
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync()
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(bool useCachedResult)
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(HtmlEncoder encoder)
+        {
+            throw null;
+        }
+
+        public Task<TagHelperContent> GetChildContentAsync(bool useCachedResult, HtmlEncoder encoder)
+        {
+            throw null;
+        }
+
+        void IHtmlContentContainer.CopyTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        void IHtmlContentContainer.MoveTo(IHtmlContentBuilder destination)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
new file mode 100644
index 0000000000..b9d60a706a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagMode.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// The mode in which an element should render.
+    /// </summary>
+    public enum TagMode
+    {
+        /// <summary>
+        /// Include both start and end tags.
+        /// </summary>
+        StartTagAndEndTag,
+
+        /// <summary>
+        /// A self-closed tag.
+        /// </summary>
+        SelfClosing,
+
+        /// <summary>
+        /// Only a start tag.
+        /// </summary>
+        StartTagOnly
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
new file mode 100644
index 0000000000..370f9372f2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagStructure.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.TagHelpers
+{
+    /// <summary>
+    /// The structure the element should be written in.
+    /// </summary>
+    public enum TagStructure
+    {
+        /// <summary>
+        /// If no other tag helper applies to the same element and specifies a <see cref="TagStructure"/>,
+        /// <see cref="NormalOrSelfClosing"/> will be used.
+        /// </summary>
+        Unspecified,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt;&lt;/my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        NormalOrSelfClosing,
+
+        /// <summary>
+        /// Element can be written as &lt;my-tag-helper&gt; or &lt;my-tag-helper /&gt;.
+        /// </summary>
+        /// <remarks>Elements with a <see cref="WithoutEndTag"/> structure will never have any content.</remarks>
+        WithoutEndTag
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index 9fa0e8c4ae..bd2e0104cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -6,10 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 5fe34308bc..550e8fa2d7 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -22,13 +22,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 </Project>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 3325932c1e..9b38b6b7f6 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -25,13 +25,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 4337c0f72c..b13a9c8071 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -24,13 +24,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 0d61cb941b..a4b035712a 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -16,13 +16,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>  
 
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 723b5fa1d1..23d69bef39 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -16,13 +16,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 0b62bda87c..275ae61610 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -16,13 +16,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 3e409f1d78..5264c82b76 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -21,13 +21,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>  
 
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 304df87d0e..d131016beb 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -16,13 +16,10 @@
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 

From f2bc93d0f65a0ab002e30b1dd333ef222c001de5 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Sun, 2 Dec 2018 14:17:26 -0800
Subject: [PATCH 007/337] Port changes from 16.0-preview1 \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/446af416140f38c6d908d1b52a8ca3d0b6e24e4e

---
 src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs b/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
index 029530c471..8f67591eb2 100644
--- a/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
+++ b/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Globalization;
 using Microsoft.AspNetCore.Razor.Language;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -49,7 +50,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
             writer.WriteStartObject();
             WriteProperty(writer, nameof(RazorDiagnostic.Id), diagnostic.Id);
             WriteProperty(writer, nameof(RazorDiagnostic.Severity), (int)diagnostic.Severity);
-            WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage());
+            WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage(CultureInfo.CurrentCulture));
 
             writer.WritePropertyName(nameof(RazorDiagnostic.Span));
             serializer.Serialize(writer, diagnostic.Span);

From 19f5798c2afd1fee891b7bd62784e8bd272ba7f4 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 3 Dec 2018 12:24:12 -0800
Subject: [PATCH 008/337] Refactor attribute parsing
 (dotnet/aspnetcore-tooling#3)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b7441d433f8853f9c50b3d50722b070da78a77ec
---
 .../Basic_DesignTime.ir.txt                   |   3 +-
 .../Sections_DesignTime.ir.txt                |   6 +-
 .../Basic_DesignTime.ir.txt                   |   3 +-
 .../Basic_Runtime.ir.txt                      |   3 +-
 .../MalformedPageDirective_DesignTime.ir.txt  |   6 +-
 .../MalformedPageDirective_Runtime.ir.txt     |   6 +-
 .../PageWithNamespace_DesignTime.ir.txt       |   3 +-
 .../PageWithNamespace_Runtime.ir.txt          |   3 +-
 ...thNoLeadingPageDirective_DesignTime.ir.txt |   3 +-
 ...eWithNoLeadingPageDirective_Runtime.ir.txt |   3 +-
 ...orPagesWithRouteTemplate_DesignTime.ir.txt |   3 +-
 ...RazorPagesWithRouteTemplate_Runtime.ir.txt |   3 +-
 .../RazorPagesWithoutModel_DesignTime.ir.txt  |   6 +-
 .../RazorPagesWithoutModel_Runtime.ir.txt     |   6 +-
 .../RazorPages_DesignTime.ir.txt              |   9 +-
 .../RazorPages_Runtime.ir.txt                 |   9 +-
 .../Sections_DesignTime.ir.txt                |   6 +-
 .../Sections_Runtime.ir.txt                   |   6 +-
 .../ViewWithNamespace_DesignTime.ir.txt       |   3 +-
 .../ViewWithNamespace_Runtime.ir.txt          |   3 +-
 .../BasicTest.ir.txt                          |   6 +-
 .../Basic_DesignTime.ir.txt                   |   3 +-
 .../Basic_Runtime.ir.txt                      |   3 +-
 .../MalformedPageDirective_DesignTime.ir.txt  |   6 +-
 .../MalformedPageDirective_Runtime.ir.txt     |   6 +-
 .../PageWithNamespace_DesignTime.ir.txt       |   3 +-
 .../PageWithNamespace_Runtime.ir.txt          |   3 +-
 ...thNoLeadingPageDirective_DesignTime.ir.txt |   3 +-
 ...eWithNoLeadingPageDirective_Runtime.ir.txt |   3 +-
 ...orPagesWithRouteTemplate_DesignTime.ir.txt |   3 +-
 ...RazorPagesWithRouteTemplate_Runtime.ir.txt |   3 +-
 .../RazorPagesWithoutModel_DesignTime.ir.txt  |   6 +-
 .../RazorPagesWithoutModel_Runtime.ir.txt     |   6 +-
 .../RazorPages_DesignTime.ir.txt              |   9 +-
 .../RazorPages_Runtime.ir.txt                 |   9 +-
 .../Sections_DesignTime.ir.txt                |   6 +-
 .../Sections_Runtime.ir.txt                   |   6 +-
 .../ViewWithNamespace_DesignTime.ir.txt       |   3 +-
 .../ViewWithNamespace_Runtime.ir.txt          |   3 +-
 .../src/ClassifiedSpanRewriter.cs             |  65 +++
 .../src/ClassifiedSpanVisitor.cs              |  42 +-
 .../src/Legacy/HtmlMarkupParser.Legacy.cs     | 403 +----------------
 .../src/Legacy/HtmlMarkupParser.cs            | 407 +++++++++++++++++-
 .../src/Legacy/RazorSyntaxTreeExtensions.cs   |   4 +-
 .../src/Legacy/TagHelperBlockRewriter.cs      |  47 +-
 .../src/Legacy/TokenizerBackedParser.cs       |  15 +
 .../Syntax.xml.Internal.Generated.cs          | 105 +++++
 .../Generated/Syntax.xml.Main.Generated.cs    |  30 ++
 .../Generated/Syntax.xml.Syntax.Generated.cs  |  69 +++
 .../src/Syntax/Syntax.xml                     |   6 +-
 .../src/Syntax/SyntaxKind.cs                  |   1 +
 .../src/Syntax/SyntaxUtilities.cs             |  46 ++
 52 files changed, 905 insertions(+), 518 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxUtilities.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
index 24d84bf975..eb3470593e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -53,7 +53,8 @@ Document -
                             IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
                         IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
-                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -  
+                    IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
             Inject - 
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
index 515e48bee6..35c27f4abb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -41,14 +41,16 @@ Document -
                     IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
                 Section -  - Section1
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
index 4074239b9f..959329c714 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -55,7 +55,8 @@ Document -
                             IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
                         IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
-                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -  
+                    IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
             Inject - 
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
index 9173f6251b..1341da69cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -65,7 +65,8 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(159, 5, true);
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
-                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -  
+                    IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
index c3fbc6082e..8db9133a4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
@@ -33,11 +33,13 @@ Document -
                 MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
-                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (14:2,0 [3] MalformedPageDirective.cshtml) - Html - <h1
+                    IntermediateToken - (17:2,3 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
                     IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
                     IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
-                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (33:3,0 [2] MalformedPageDirective.cshtml) - Html - <p
+                    IntermediateToken - (35:3,2 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
                     IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
index 0692442d42..d98f501792 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -18,11 +18,13 @@ Document -
                     IntermediateToken -  - CSharp - BeginContext(6, 49, true);
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
-                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (14:2,0 [3] MalformedPageDirective.cshtml) - Html - <h1
+                    IntermediateToken - (17:2,3 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
                     IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
                     IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
-                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (33:3,0 [2] MalformedPageDirective.cshtml) - Html - <p
+                    IntermediateToken - (35:3,2 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
                     IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
                 CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
index 9238a0a419..099c37355f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
@@ -32,7 +32,8 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
-                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (34:2,0 [3] PageWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (37:2,3 [1] PageWithNamespace.cshtml) - Html - >
                     IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
index 53b89427ee..4d26b5c3fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -16,7 +16,8 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(34, 20, true);
                 HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
-                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (34:2,0 [3] PageWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (37:2,3 [1] PageWithNamespace.cshtml) - Html - >
                     IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
index c21d9fc82c..6139c62c14 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
@@ -31,7 +31,8 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
-                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (0:0,0 [4] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] RazorPageWithNoLeadingPageDirective.cshtml) - Html - >
                     IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
                     IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
                     IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
index 764b704909..c4ad8ed82d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -16,7 +16,8 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(0, 28, true);
                 HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
-                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (0:0,0 [4] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] RazorPageWithNoLeadingPageDirective.cshtml) - Html - >
                     IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
                     IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
                     IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
index c71b835bf9..721dfa649d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
@@ -40,7 +40,8 @@ Document -
                     IntermediateToken - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
                 HtmlContent - (191:10,1 [21] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (191:10,1 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
-                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (195:12,0 [3] RazorPagesWithRouteTemplate.cshtml) - Html - <h1
+                    IntermediateToken - (198:12,3 [1] RazorPagesWithRouteTemplate.cshtml) - Html - >
                     IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
                 CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
index 5d54680b90..86990e5de4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -31,7 +31,8 @@ Document -
                     IntermediateToken -  - CSharp - BeginContext(193, 19, true);
                 HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (195:12,0 [3] RazorPagesWithRouteTemplate.cshtml) - Html - <h1
+                    IntermediateToken - (198:12,3 [1] RazorPagesWithRouteTemplate.cshtml) - Html - >
                     IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
index 913b80d2aa..de7cd9dd4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
@@ -42,7 +42,8 @@ Document -
                     IntermediateToken - (79:3,42 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
                 HtmlContent - (379:18,1 [77] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (379:18,1 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
-                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
+                    IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
                     IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
                     IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
                     IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
@@ -78,7 +79,8 @@ Document -
                                     IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
                                     IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
+                                    IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
                                     IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
                                     IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index 519006aec3..d48303ec80 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -36,7 +36,8 @@ Document -
                     IntermediateToken -  - CSharp - BeginContext(381, 75, true);
                 HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
+                    IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
                     IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
                     IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
                     IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
@@ -98,7 +99,8 @@ Document -
                                     IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
                                     IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
+                                    IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
                                     IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
                                     IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
index 2266b746f6..c142630de7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
@@ -43,14 +43,16 @@ Document -
                     IntermediateToken - (96:4,42 [4] RazorPages.cshtml) - Html - \n\n
                 HtmlContent - (473:22,1 [78] RazorPages.cshtml)
                     IntermediateToken - (473:22,1 [4] RazorPages.cshtml) - Html - \n\n
-                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
+                    IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
                     IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
                     IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
                     IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
                     IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
+                    IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
                 TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
@@ -79,7 +81,8 @@ Document -
                                     IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
                                     IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
+                                    IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
                                     IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
                                     IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index cc1bc6f718..a8ea42c44c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -36,14 +36,16 @@ Document -
                     IntermediateToken -  - CSharp - BeginContext(475, 76, true);
                 HtmlContent - (475:23,0 [76] RazorPages.cshtml)
                     IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
+                    IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
                     IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
                     IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
                     IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
                     IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
+                    IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
@@ -98,7 +100,8 @@ Document -
                                     IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
                                     IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
+                                    IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
                                     IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
                                     IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
index 312d7bb7ae..f043a5f6d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -43,14 +43,16 @@ Document -
                     IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
                 Section -  - Section1
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 8a5b810749..eca96a425a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -33,7 +33,8 @@ Document -
                     IntermediateToken -  - CSharp - BeginContext(117, 26, true);
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
@@ -44,7 +45,8 @@ Document -
                         IntermediateToken -  - CSharp - BeginContext(162, 43, true);
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
index 42d53bcd1b..0af8488598 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
@@ -32,7 +32,8 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
-                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (27:1,0 [3] ViewWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (30:1,3 [1] ViewWithNamespace.cshtml) - Html - >
                     IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
index 471464c580..5a45f13f76 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -16,7 +16,8 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(27, 20, true);
                 HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
-                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (27:1,0 [3] ViewWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (30:1,3 [1] ViewWithNamespace.cshtml) - Html - >
                     IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
index c4ba72abd9..6ac51fb0e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
@@ -71,7 +71,8 @@ Document -
                     IntermediateToken -  - CSharp - BeginContext(158, 31, true);
                 HtmlContent - (158:5,7 [31] BasicTest.cshtml)
                     IntermediateToken - (158:5,7 [4] BasicTest.cshtml) - Html - \n\n
-                    IntermediateToken - (162:7,0 [6] BasicTest.cshtml) - Html - <span>
+                    IntermediateToken - (162:7,0 [5] BasicTest.cshtml) - Html - <span
+                    IntermediateToken - (167:7,5 [1] BasicTest.cshtml) - Html - >
                     IntermediateToken - (168:7,6 [21] BasicTest.cshtml) - Html - Here is some content 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
@@ -90,7 +91,8 @@ Document -
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(222, 24, true);
                         HtmlContent - (222:8,6 [24] BasicTest.cshtml)
-                            IntermediateToken - (222:8,6 [6] BasicTest.cshtml) - Html - <span>
+                            IntermediateToken - (222:8,6 [5] BasicTest.cshtml) - Html - <span
+                            IntermediateToken - (227:8,11 [1] BasicTest.cshtml) - Html - >
                             IntermediateToken - (228:8,12 [11] BasicTest.cshtml) - Html - Hello world
                             IntermediateToken - (239:8,23 [7] BasicTest.cshtml) - Html - </span>
                         CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
index 4074239b9f..959329c714 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -55,7 +55,8 @@ Document -
                             IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
                         IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
-                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -  
+                    IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
             Inject - 
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
index 8ed7912b0a..e33f48cfef 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -39,7 +39,8 @@ Document -
                             IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
                         IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
-                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -  
+                    IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
             Inject - 
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
index c3fbc6082e..8db9133a4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
@@ -33,11 +33,13 @@ Document -
                 MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
-                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (14:2,0 [3] MalformedPageDirective.cshtml) - Html - <h1
+                    IntermediateToken - (17:2,3 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
                     IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
                     IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
-                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (33:3,0 [2] MalformedPageDirective.cshtml) - Html - <p
+                    IntermediateToken - (35:3,2 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
                     IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
index 7a04b0051a..077b331edd 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -16,11 +16,13 @@ Document -
                 MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
-                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (14:2,0 [3] MalformedPageDirective.cshtml) - Html - <h1
+                    IntermediateToken - (17:2,3 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
                     IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
                     IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
-                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (33:3,0 [2] MalformedPageDirective.cshtml) - Html - <p
+                    IntermediateToken - (35:3,2 [1] MalformedPageDirective.cshtml) - Html - >
                     IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
                     IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
index 9238a0a419..099c37355f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
@@ -32,7 +32,8 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
-                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (34:2,0 [3] PageWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (37:2,3 [1] PageWithNamespace.cshtml) - Html - >
                     IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
index 5be907ee1d..5a8cf210d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -14,7 +14,8 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
-                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (34:2,0 [3] PageWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (37:2,3 [1] PageWithNamespace.cshtml) - Html - >
                     IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
index c21d9fc82c..6139c62c14 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
@@ -31,7 +31,8 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
-                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (0:0,0 [4] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] RazorPageWithNoLeadingPageDirective.cshtml) - Html - >
                     IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
                     IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
                     IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
index 42eb920742..ebd8d792ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -14,7 +14,8 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
-                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (0:0,0 [4] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] RazorPageWithNoLeadingPageDirective.cshtml) - Html - >
                     IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
                     IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
                     IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
index c71b835bf9..721dfa649d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
@@ -40,7 +40,8 @@ Document -
                     IntermediateToken - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
                 HtmlContent - (191:10,1 [21] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (191:10,1 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
-                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (195:12,0 [3] RazorPagesWithRouteTemplate.cshtml) - Html - <h1
+                    IntermediateToken - (198:12,3 [1] RazorPagesWithRouteTemplate.cshtml) - Html - >
                     IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
                 CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
index c8fbdea2cc..c51a1fd492 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -21,7 +21,8 @@ Document -
                     IntermediateToken - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
                 HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (195:12,0 [3] RazorPagesWithRouteTemplate.cshtml) - Html - <h1
+                    IntermediateToken - (198:12,3 [1] RazorPagesWithRouteTemplate.cshtml) - Html - >
                     IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
                 CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
index 913b80d2aa..de7cd9dd4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
@@ -42,7 +42,8 @@ Document -
                     IntermediateToken - (79:3,42 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
                 HtmlContent - (379:18,1 [77] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (379:18,1 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
-                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
+                    IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
                     IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
                     IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
                     IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
@@ -78,7 +79,8 @@ Document -
                                     IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
                                     IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
+                                    IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
                                     IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
                                     IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index ea80083dd2..35b06f9da4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -26,7 +26,8 @@ Document -
                     IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                 HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
+                    IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
                     IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
                     IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
                     IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
@@ -60,7 +61,8 @@ Document -
                                     IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
                                     IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
+                                    IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
                                     IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
                                     IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
index 2266b746f6..c142630de7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
@@ -43,14 +43,16 @@ Document -
                     IntermediateToken - (96:4,42 [4] RazorPages.cshtml) - Html - \n\n
                 HtmlContent - (473:22,1 [78] RazorPages.cshtml)
                     IntermediateToken - (473:22,1 [4] RazorPages.cshtml) - Html - \n\n
-                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
+                    IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
                     IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
                     IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
                     IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
                     IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
+                    IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
                 TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
@@ -79,7 +81,8 @@ Document -
                                     IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
                                     IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
+                                    IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
                                     IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
                                     IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index 8c352308a0..990f1fa5ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -26,14 +26,16 @@ Document -
                     IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
                 HtmlContent - (475:23,0 [76] RazorPages.cshtml)
                     IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
+                    IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
                     IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
                     IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
                     IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
                     IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
+                    IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
                     IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
                 TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
@@ -60,7 +62,8 @@ Document -
                                     IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
                                     IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
+                                    IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
                                     IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
                                     IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
index 312d7bb7ae..f043a5f6d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -43,14 +43,16 @@ Document -
                     IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
                 Section -  - Section1
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 1309bc9423..1fe445a31e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -23,14 +23,16 @@ Document -
                     IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
                 Section -  - Section1
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
index 42d53bcd1b..0af8488598 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
@@ -32,7 +32,8 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
-                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (27:1,0 [3] ViewWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (30:1,3 [1] ViewWithNamespace.cshtml) - Html - >
                     IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
index 17f6801a03..f507dfd9ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -14,7 +14,8 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
-                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (27:1,0 [3] ViewWithNamespace.cshtml) - Html - <h1
+                    IntermediateToken - (30:1,3 [1] ViewWithNamespace.cshtml) - Html - >
                     IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
new file mode 100644
index 0000000000..dedb8c22fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
@@ -0,0 +1,65 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class ClassifiedSpanRewriter : SyntaxRewriter
+    {
+        public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        {
+            SpanContext latestSpanContext = null;
+            var newChildren = SyntaxListBuilder<RazorSyntaxNode>.Create();
+            var literals = new List<MarkupTextLiteralSyntax>();
+            foreach (var child in node.Children)
+            {
+                if (child is MarkupTextLiteralSyntax literal)
+                {
+                    literals.Add(literal);
+                    latestSpanContext = literal.GetSpanContext() ?? latestSpanContext;
+                }
+                else if (child is MarkupMiscAttributeContentSyntax miscContent)
+                {
+                    foreach (var contentChild in miscContent.Children)
+                    {
+                        if (contentChild is MarkupTextLiteralSyntax contentLiteral)
+                        {
+                            literals.Add(contentLiteral);
+                            latestSpanContext = contentLiteral.GetSpanContext() ?? latestSpanContext;
+                        }
+                        else
+                        {
+                            // Pop stack
+                            AddLiteralIfExists();
+                            newChildren.Add(contentChild);
+                        }
+                    }
+                }
+                else
+                {
+                    AddLiteralIfExists();
+                    newChildren.Add(child);
+                }
+            }
+
+            AddLiteralIfExists();
+
+            return SyntaxFactory.MarkupTagBlock(newChildren.ToList()).Green.CreateRed(node.Parent, node.Position);
+
+            void AddLiteralIfExists()
+            {
+                if (literals.Count > 0)
+                {
+                    var mergedLiteral = SyntaxUtilities.MergeTextLiterals(literals.ToArray());
+                    mergedLiteral = mergedLiteral.WithSpanContext(latestSpanContext);
+                    literals.Clear();
+                    latestSpanContext = null;
+                    newChildren.Add(mergedLiteral);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
index ec0e7977d0..416765c992 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             WriteBlock(node, BlockKindInternal.Markup, n =>
             {
                 var equalsSyntax = SyntaxFactory.MarkupTextLiteral(new SyntaxList<SyntaxToken>(node.EqualsToken));
-                var mergedAttributePrefix = MergeTextLiteralSpans(node.NamePrefix, node.Name, node.NameSuffix, equalsSyntax, node.ValuePrefix);
+                var mergedAttributePrefix = SyntaxUtilities.MergeTextLiterals(node.NamePrefix, node.Name, node.NameSuffix, equalsSyntax, node.ValuePrefix);
                 Visit(mergedAttributePrefix);
                 Visit(node.Value);
                 Visit(node.ValueSuffix);
@@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             WriteBlock(node, BlockKindInternal.Markup, n =>
             {
-                var mergedAttributePrefix = MergeTextLiteralSpans(node.NamePrefix, node.Name);
+                var mergedAttributePrefix = SyntaxUtilities.MergeTextLiterals(node.NamePrefix, node.Name);
                 Visit(mergedAttributePrefix);
             });
         }
@@ -270,43 +270,5 @@ namespace Microsoft.AspNetCore.Razor.Language
             var span = new ClassifiedSpanInternal(spanSource, blockSource, kind, _currentBlockKind, acceptedCharacters.Value);
             _spans.Add(span);
         }
-
-        private MarkupTextLiteralSyntax MergeTextLiteralSpans(params MarkupTextLiteralSyntax[] literalSyntaxes)
-        {
-            if (literalSyntaxes == null || literalSyntaxes.Length == 0)
-            {
-                return null;
-            }
-
-            SyntaxNode parent = null;
-            var position = 0;
-            var seenFirstLiteral = false;
-            var builder = Syntax.InternalSyntax.SyntaxListBuilder.Create();
-
-            foreach (var syntax in literalSyntaxes)
-            {
-                if (syntax == null)
-                {
-                    continue;
-                }
-                else if (!seenFirstLiteral)
-                {
-                    // Set the parent and position of the merged literal to the value of the first non-null literal.
-                    parent = syntax.Parent;
-                    position = syntax.Position;
-                    seenFirstLiteral = true;
-                }
-
-                foreach (var token in syntax.LiteralTokens)
-                {
-                    builder.Add(token.Green);
-                }
-            }
-
-            var mergedLiteralSyntax = Syntax.InternalSyntax.SyntaxFactory.MarkupTextLiteral(
-                builder.ToList<Syntax.InternalSyntax.SyntaxToken>());
-
-            return (MarkupTextLiteralSyntax)mergedLiteralSyntax.CreateRed(parent, position);
-        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
index ac7b174c7f..e858000fac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
@@ -240,7 +240,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         var scriptTag = At(SyntaxKind.Text) &&
                                         string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
                         TryAccept(SyntaxKind.Text);
-                        LegacyParseTagContent(tagBuilder); // Parse the tag, don't care about the content
+                        // Output open angle and tag name
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        ParseAttributes(tagBuilder); // Parse the tag, don't care about the content
                         TryAccept(SyntaxKind.ForwardSlash);
                         TryAccept(SyntaxKind.CloseAngle);
 
@@ -278,372 +280,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private void LegacyParseTagContent(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
-            {
-                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
-                RecoverToEndOfTag(builder);
-            }
-            else
-            {
-                // We are here ($): <tag$ foo="bar" biz="~/Baz" />
-                while (!EndOfFile && !IsEndOfTag())
-                {
-                    BeforeAttribute(builder);
-                }
-            }
-        }
-
-        private bool IsEndOfTag()
-        {
-            if (At(SyntaxKind.ForwardSlash))
-            {
-                if (NextIs(SyntaxKind.CloseAngle))
-                {
-                    return true;
-                }
-                else
-                {
-                    AcceptAndMoveNext();
-                }
-            }
-            return At(SyntaxKind.CloseAngle) || At(SyntaxKind.OpenAngle);
-        }
-
-        private void BeforeAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
-            // Capture whitespace
-            var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-
-            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
-            {
-                // Transition outside of attribute value => Switch to recovery mode
-                Accept(whitespace);
-                RecoverToEndOfTag(builder);
-                return;
-            }
-
-            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
-            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
-            var nameTokens = Enumerable.Empty<SyntaxToken>();
-            var whitespaceAfterAttributeName = Enumerable.Empty<SyntaxToken>();
-            if (IsValidAttributeNameToken(CurrentToken))
-            {
-                nameTokens = ReadWhile(token =>
-                                 token.Kind != SyntaxKind.Whitespace &&
-                                 token.Kind != SyntaxKind.NewLine &&
-                                 token.Kind != SyntaxKind.Equals &&
-                                 token.Kind != SyntaxKind.CloseAngle &&
-                                 token.Kind != SyntaxKind.OpenAngle &&
-                                 (token.Kind != SyntaxKind.ForwardSlash || !NextIs(SyntaxKind.CloseAngle)));
-
-                // capture whitespace after attribute name (if any)
-                whitespaceAfterAttributeName = ReadWhile(
-                    token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-            }
-            else
-            {
-                // Unexpected character in tag, enter recovery
-                Accept(whitespace);
-                RecoverToEndOfTag(builder);
-                return;
-            }
-
-            if (!At(SyntaxKind.Equals))
-            {
-                // Minimized attribute
-
-                // We are at the prefix of the next attribute or the end of tag. Put it back so it is parsed later.
-                PutCurrentBack();
-                PutBack(whitespaceAfterAttributeName);
-
-                // Output anything prior to the attribute, in most cases this will be the tag name:
-                // |<input| checked />. If in-between other attributes this will noop or output malformed attribute
-                // content (if the previous attribute was malformed).
-                builder.Add(OutputAsMarkupLiteral());
-
-                Accept(whitespace);
-                var namePrefix = OutputAsMarkupLiteral();
-                Accept(nameTokens);
-                var name = OutputAsMarkupLiteral();
-
-                var minimizedAttributeBlock = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
-                builder.Add(minimizedAttributeBlock);
-
-                return;
-            }
-
-            // Not a minimized attribute, parse as if it were well-formed (if attribute turns out to be malformed we
-            // will go into recovery).
-            builder.Add(OutputAsMarkupLiteral());
-
-            var attributeBlock = ParseAttributePrefix(whitespace, nameTokens, whitespaceAfterAttributeName);
-
-            builder.Add(attributeBlock);
-        }
-
-        private MarkupAttributeBlockSyntax ParseAttributePrefix(
-            IEnumerable<SyntaxToken> whitespace,
-            IEnumerable<SyntaxToken> nameTokens,
-            IEnumerable<SyntaxToken> whitespaceAfterAttributeName)
-        {
-            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
-            var nameContent = string.Concat(nameTokens.Select(s => s.Content));
-            var attributeCanBeConditional =
-                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
-                !nameContent.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
-
-            // Accept the whitespace and name
-            Accept(whitespace);
-            var namePrefix = OutputAsMarkupLiteral();
-            Accept(nameTokens);
-            var name = OutputAsMarkupLiteral();
-
-            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
-            Accept(whitespaceAfterAttributeName);
-            var nameSuffix = OutputAsMarkupLiteral();
-            Assert(SyntaxKind.Equals); // We should be at "="
-            var equalsToken = EatCurrentToken();
-
-            var whitespaceAfterEquals = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-            var quote = SyntaxKind.Marker;
-            if (At(SyntaxKind.SingleQuote) || At(SyntaxKind.DoubleQuote))
-            {
-                // Found a quote, the whitespace belongs to this attribute.
-                Accept(whitespaceAfterEquals);
-                quote = CurrentToken.Kind;
-                AcceptAndMoveNext();
-            }
-            else if (whitespaceAfterEquals.Any())
-            {
-                // No quotes found after the whitespace. Put it back so that it can be parsed later.
-                PutCurrentBack();
-                PutBack(whitespaceAfterEquals);
-            }
-
-            MarkupTextLiteralSyntax valuePrefix = null;
-            RazorBlockSyntax attributeValue = null;
-            MarkupTextLiteralSyntax valueSuffix = null;
-
-            if (attributeCanBeConditional)
-            {
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
-
-                // We now have the value prefix which is usually whitespace and/or a quote
-                valuePrefix = OutputAsMarkupLiteral();
-
-                // Read the attribute value only if the value is quoted
-                // or if there is no whitespace between '=' and the unquoted value.
-                if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
-                {
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var attributeValueBuilder = pooledResult.Builder;
-                        // Read the attribute value.
-                        while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
-                        {
-                            ParseAttributeValue(attributeValueBuilder, quote);
-                        }
-
-                        if (attributeValueBuilder.Count > 0)
-                        {
-                            attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
-                        }
-                    }
-                }
-
-                // Capture the suffix
-                if (quote != SyntaxKind.Marker && At(quote))
-                {
-                    AcceptAndMoveNext();
-                    // Again, block chunk generator will render the suffix
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                    valueSuffix = OutputAsMarkupLiteral();
-                }
-            }
-            else if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
-            {
-                valuePrefix = OutputAsMarkupLiteral();
-
-                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                {
-                    var attributeValueBuilder = pooledResult.Builder;
-                    // Not a "conditional" attribute, so just read the value
-                    SkipToAndParseCode(attributeValueBuilder, token => IsEndOfAttributeValue(quote, token));
-
-                    // Output already accepted tokens if any as markup literal
-                    var literalValue = OutputAsMarkupLiteral();
-                    attributeValueBuilder.Add(literalValue);
-
-                    // Capture the attribute value (will include everything in-between the attribute's quotes).
-                    attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
-                }
-
-                if (quote != SyntaxKind.Marker)
-                {
-                    TryAccept(quote);
-                    valueSuffix = OutputAsMarkupLiteral();
-                }
-            }
-            else
-            {
-                // There is no quote and there is whitespace after equals. There is no attribute value.
-            }
-
-            return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, attributeValue, valueSuffix);
-        }
-
-        private void ParseAttributeValue(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind quote)
-        {
-            var prefixStart = CurrentStart;
-            var prefixTokens = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
-
-            if (At(SyntaxKind.Transition))
-            {
-                if (NextIs(SyntaxKind.Transition))
-                {
-                    // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it.
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var markupBuilder = pooledResult.Builder;
-                        Accept(prefixTokens);
-
-                        // Render a single "@" in place of "@@".
-                        SpanContext.ChunkGenerator = new LiteralAttributeChunkGenerator(
-                            new LocationTagged<string>(string.Concat(prefixTokens.Select(s => s.Content)), prefixStart),
-                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
-                        AcceptAndMoveNext();
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        markupBuilder.Add(OutputAsMarkupLiteral());
-
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        AcceptAndMoveNext();
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        markupBuilder.Add(OutputAsMarkupEphemeralLiteral());
-
-                        var markupBlock = SyntaxFactory.MarkupBlock(markupBuilder.ToList());
-                        builder.Add(markupBlock);
-                    }
-                }
-                else
-                {
-                    Accept(prefixTokens);
-                    var valueStart = CurrentStart;
-                    PutCurrentBack();
-
-                    var prefix = OutputAsMarkupLiteral();
-
-                    // Dynamic value, start a new block and set the chunk generator
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var dynamicAttributeValueBuilder = pooledResult.Builder;
-
-                        OtherParserBlock(dynamicAttributeValueBuilder);
-                        var value = SyntaxFactory.MarkupDynamicAttributeValue(prefix, SyntaxFactory.GenericBlock(dynamicAttributeValueBuilder.ToList()));
-                        builder.Add(value);
-                    }
-                }
-            }
-            else
-            {
-                Accept(prefixTokens);
-                var prefix = OutputAsMarkupLiteral();
-
-                // Literal value
-                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
-                // "Unknown" type.
-                var valueTokens = ReadWhile(token =>
-                    // These three conditions find separators which break the attribute value into portions
-                    token.Kind != SyntaxKind.Whitespace &&
-                    token.Kind != SyntaxKind.NewLine &&
-                    token.Kind != SyntaxKind.Transition &&
-                    // This condition checks for the end of the attribute value (it repeats some of the checks above
-                    // but for now that's ok)
-                    !IsEndOfAttributeValue(quote, token));
-                Accept(valueTokens);
-                var value = OutputAsMarkupLiteral();
-
-                var literalAttributeValue = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
-                builder.Add(literalAttributeValue);
-            }
-        }
-
-        private void RecoverToEndOfTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Accept until ">", "/" or "<", but parse code
-            while (!EndOfFile)
-            {
-                SkipToAndParseCode(builder, IsTagRecoveryStopPoint);
-                if (!EndOfFile)
-                {
-                    EnsureCurrent();
-                    switch (CurrentToken.Kind)
-                    {
-                        case SyntaxKind.SingleQuote:
-                        case SyntaxKind.DoubleQuote:
-                            ParseQuoted(builder);
-                            break;
-                        case SyntaxKind.OpenAngle:
-                        // Another "<" means this tag is invalid.
-                        case SyntaxKind.ForwardSlash:
-                        // Empty tag
-                        case SyntaxKind.CloseAngle:
-                            // End of tag
-                            return;
-                        default:
-                            AcceptAndMoveNext();
-                            break;
-                    }
-                }
-            }
-        }
-
-        private bool IsTagRecoveryStopPoint(SyntaxToken token)
-        {
-            return token.Kind == SyntaxKind.CloseAngle ||
-                   token.Kind == SyntaxKind.ForwardSlash ||
-                   token.Kind == SyntaxKind.OpenAngle ||
-                   token.Kind == SyntaxKind.SingleQuote ||
-                   token.Kind == SyntaxKind.DoubleQuote;
-        }
-
-        private bool IsEndOfAttributeValue(SyntaxKind quote, SyntaxToken token)
-        {
-            return EndOfFile || token == null ||
-                   (quote != SyntaxKind.Marker
-                        ? token.Kind == quote // If quoted, just wait for the quote
-                        : IsUnquotedEndOfAttributeValue(token));
-        }
-
-        private bool IsUnquotedEndOfAttributeValue(SyntaxToken token)
-        {
-            // If unquoted, we have a larger set of terminating characters:
-            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
-            // Also we need to detect "/" and ">"
-            return token.Kind == SyntaxKind.DoubleQuote ||
-                   token.Kind == SyntaxKind.SingleQuote ||
-                   token.Kind == SyntaxKind.OpenAngle ||
-                   token.Kind == SyntaxKind.Equals ||
-                   (token.Kind == SyntaxKind.ForwardSlash && NextIs(SyntaxKind.CloseAngle)) ||
-                   token.Kind == SyntaxKind.CloseAngle ||
-                   token.Kind == SyntaxKind.Whitespace ||
-                   token.Kind == SyntaxKind.NewLine;
-        }
-
-        private void ParseQuoted(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            var type = CurrentToken.Kind;
-            AcceptAndMoveNext();
-            SkipToAndParseCode(builder, type);
-            if (!EndOfFile)
-            {
-                Assert(type);
-                AcceptAndMoveNext();
-            }
-        }
-
         private bool ParseBangTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             // Accept "!"
@@ -1240,6 +876,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Accept(_bufferedOpenAngle);
             TryParseBangEscape(builder);
             TryAccept(SyntaxKind.Text);
+            
+            if (At(SyntaxKind.CloseAngle))
+            {
+                // Completed tags have no accepted characters inside of blocks.
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            // Output open angle and tag name
+            builder.Add(OutputAsMarkupLiteral());
             return ParseRestOfTag(builder, parentBuilder, tag, tags);
         }
 
@@ -1250,7 +894,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Stack<Tuple<SyntaxToken, SourceLocation>> tags)
         {
             var blockAlreadyBuilt = false;
-            LegacyParseTagContent(builder);
+            ParseAttributes(builder);
 
             // We are now at a possible end of the tag
             // Found '<', so we just abort this tag.
@@ -1718,28 +1362,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             return last.Green;
         }
-
-        internal static bool IsValidAttributeNameToken(SyntaxToken token)
-        {
-            if (token == null)
-            {
-                return false;
-            }
-
-            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
-            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
-            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
-            // expectation that the parser handles such scenarios prior to falling through to name resolution.
-            var tokenType = token.Kind;
-            return tokenType != SyntaxKind.Whitespace &&
-                tokenType != SyntaxKind.NewLine &&
-                tokenType != SyntaxKind.CloseAngle &&
-                tokenType != SyntaxKind.OpenAngle &&
-                tokenType != SyntaxKind.ForwardSlash &&
-                tokenType != SyntaxKind.DoubleQuote &&
-                tokenType != SyntaxKind.SingleQuote &&
-                tokenType != SyntaxKind.Equals &&
-                tokenType != SyntaxKind.Marker;
-        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 89b844c769..a30d5b2de1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -174,8 +174,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
                 TryAccept(SyntaxKind.Text);
 
+                // Output open angle and tag name
+                tagBuilder.Add(OutputAsMarkupLiteral());
+
                 // Parse the contents of a tag like attributes.
-                ParseTagContent(tagBuilder);
+                ParseAttributes(tagBuilder);
 
                 if (TryAccept(SyntaxKind.ForwardSlash))
                 {
@@ -233,10 +236,366 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return null;
         }
 
-        private void ParseTagContent(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        private void ParseAttributes(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            // Calling to legacy code for now.
-            LegacyParseTagContent(builder);
+            if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
+            {
+                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
+                ParseMiscAttribute(builder);
+                return;
+            }
+
+            // We are here ($): <tag$ foo="bar" biz="~/Baz" />
+
+            while (!EndOfFile && !IsEndOfTag())
+            {
+                if (At(SyntaxKind.ForwardSlash))
+                {
+                    // This means we're at a '/' but it's not considered end of tag. E.g. <p / class=foo>
+                    // We are at the '/' but the tag isn't closed. Accept and continue parsing the next attribute.
+                    AcceptAndMoveNext();
+                }
+
+                ParseAttribute(builder);
+            }
+        }
+
+        private bool IsEndOfTag()
+        {
+            if (At(SyntaxKind.ForwardSlash))
+            {
+                if (NextIs(SyntaxKind.CloseAngle) || NextIs(SyntaxKind.OpenAngle))
+                {
+                    return true;
+                }
+            }
+
+            return At(SyntaxKind.CloseAngle) || At(SyntaxKind.OpenAngle);
+        }
+
+        private void ParseMiscAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var miscAttributeContentBuilder = pooledResult.Builder;
+                while (!EndOfFile)
+                {
+                    ParseMarkupNodes(miscAttributeContentBuilder, ParseMode.Text, IsTagRecoveryStopPoint);
+                    if (!EndOfFile)
+                    {
+                        EnsureCurrent();
+                        switch (CurrentToken.Kind)
+                        {
+                            case SyntaxKind.SingleQuote:
+                            case SyntaxKind.DoubleQuote:
+                                // We should parse until we reach a matching quote.
+                                var openQuoteKind = CurrentToken.Kind;
+                                AcceptAndMoveNext();
+                                ParseMarkupNodes(miscAttributeContentBuilder, ParseMode.Text, token => token.Kind == openQuoteKind);
+                                if (!EndOfFile)
+                                {
+                                    Assert(openQuoteKind);
+                                    AcceptAndMoveNext();
+                                }
+                                break;
+                            case SyntaxKind.OpenAngle: // Another "<" means this tag is invalid.
+                            case SyntaxKind.ForwardSlash: // Empty tag
+                            case SyntaxKind.CloseAngle: // End of tag
+                                miscAttributeContentBuilder.Add(OutputAsMarkupLiteral());
+                                if (miscAttributeContentBuilder.Count > 0)
+                                {
+                                    var miscAttributeContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeContentBuilder.ToList());
+                                    builder.Add(miscAttributeContent);
+                                }
+                                return;
+                            default:
+                                AcceptAndMoveNext();
+                                break;
+                        }
+                    }
+                }
+
+                miscAttributeContentBuilder.Add(OutputAsMarkupLiteral());
+                if (miscAttributeContentBuilder.Count > 0)
+                {
+                    var miscAttributeContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeContentBuilder.ToList());
+                    builder.Add(miscAttributeContent);
+                }
+            }
+        }
+
+        private void ParseAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Output anything prior to the attribute, in most cases this will be any invalid content after the tag name or a previous attribute:
+            // <input| /| checked />. If there is nothing in-between other attributes this will noop.
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var miscAttributeContentBuilder = pooledResult.Builder;
+                miscAttributeContentBuilder.Add(OutputAsMarkupLiteral());
+                if (miscAttributeContentBuilder.Count > 0)
+                {
+                    var invalidAttributeBlock = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeContentBuilder.ToList());
+                    builder.Add(invalidAttributeBlock);
+                }
+            }
+
+            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
+            // Capture whitespace
+            var attributePrefixWhitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
+            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
+            if (!TryParseAttributeName(out var nameTokens))
+            {
+                // Unexpected character in tag, enter recovery
+                Accept(attributePrefixWhitespace);
+                ParseMiscAttribute(builder);
+                return;
+            }
+
+            Accept(attributePrefixWhitespace); // Whitespace before attribute name
+            var namePrefix = OutputAsMarkupLiteral();
+            Accept(nameTokens); // Attribute name
+            var name = OutputAsMarkupLiteral();
+
+            var atMinimizedAttribute = !TokenExistsAfterWhitespace(SyntaxKind.Equals);
+            if (atMinimizedAttribute)
+            {
+                // Minimized attribute
+                var minimizedAttributeBlock = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+                builder.Add(minimizedAttributeBlock);
+            }
+            else
+            {
+                // Not a minimized attribute
+                var attributeBlock = ParseRemainingAttribute(namePrefix, name);
+                builder.Add(attributeBlock);
+            }
+        }
+
+        private bool TryParseAttributeName(out IEnumerable<SyntaxToken> nameTokens)
+        {
+            nameTokens = Enumerable.Empty<SyntaxToken>();
+            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
+            {
+                return false;
+            }
+
+            if (IsValidAttributeNameToken(CurrentToken))
+            {
+                nameTokens = ReadWhile(token =>
+                    token.Kind != SyntaxKind.Whitespace &&
+                    token.Kind != SyntaxKind.NewLine &&
+                    token.Kind != SyntaxKind.Equals &&
+                    token.Kind != SyntaxKind.CloseAngle &&
+                    token.Kind != SyntaxKind.OpenAngle &&
+                    (token.Kind != SyntaxKind.ForwardSlash || !NextIs(SyntaxKind.CloseAngle)));
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private MarkupAttributeBlockSyntax ParseRemainingAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+        {
+            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
+            AcceptWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            var nameSuffix = OutputAsMarkupLiteral();
+
+            Assert(SyntaxKind.Equals); // We should be at "="
+            var equalsToken = EatCurrentToken();
+
+            var whitespaceAfterEquals = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            var quote = SyntaxKind.Marker;
+            if (At(SyntaxKind.SingleQuote) || At(SyntaxKind.DoubleQuote))
+            {
+                // Found a quote, the whitespace belongs to this attribute.
+                Accept(whitespaceAfterEquals);
+                quote = CurrentToken.Kind;
+                AcceptAndMoveNext();
+            }
+            else if (whitespaceAfterEquals.Any())
+            {
+                // No quotes found after the whitespace. Put it back so that it can be parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterEquals);
+            }
+
+            MarkupTextLiteralSyntax valuePrefix = null;
+            RazorBlockSyntax attributeValue = null;
+            MarkupTextLiteralSyntax valueSuffix = null;
+
+            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
+            var nameContent = string.Concat(name.LiteralTokens.Nodes.Select(s => s.Content));
+            if (IsConditionalAttributeName(nameContent))
+            {
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
+
+                // We now have the value prefix which is usually whitespace and/or a quote
+                valuePrefix = OutputAsMarkupLiteral();
+
+                // Read the attribute value only if the value is quoted
+                // or if there is no whitespace between '=' and the unquoted value.
+                if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+                {
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var attributeValueBuilder = pooledResult.Builder;
+                        // Read the attribute value.
+                        while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
+                        {
+                            ParseConditionalAttributeValue(attributeValueBuilder, quote);
+                        }
+
+                        if (attributeValueBuilder.Count > 0)
+                        {
+                            attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+                        }
+                    }
+                }
+
+                // Capture the suffix
+                if (quote != SyntaxKind.Marker && At(quote))
+                {
+                    AcceptAndMoveNext();
+                    // Again, block chunk generator will render the suffix
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+            {
+                valuePrefix = OutputAsMarkupLiteral();
+
+                attributeValue = ParseNonConditionalAttributeValue(quote);
+
+                if (quote != SyntaxKind.Marker)
+                {
+                    TryAccept(quote);
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else
+            {
+                // There is no quote and there is whitespace after equals. There is no attribute value.
+            }
+
+            return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, attributeValue, valueSuffix);
+        }
+
+        private RazorBlockSyntax ParseNonConditionalAttributeValue(SyntaxKind quote)
+        {
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var attributeValueBuilder = pooledResult.Builder;
+                // Not a "conditional" attribute, so just read the value
+                ParseMarkupNodes(attributeValueBuilder, ParseMode.Text, token => IsEndOfAttributeValue(quote, token));
+
+                // Output already accepted tokens if any as markup literal
+                var literalValue = OutputAsMarkupLiteral();
+                attributeValueBuilder.Add(literalValue);
+
+                // Capture the attribute value (will include everything in-between the attribute's quotes).
+                return SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+            }
+        }
+
+        private void ParseConditionalAttributeValue(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind quote)
+        {
+            var prefixStart = CurrentStart;
+            var prefixTokens = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition))
+            {
+                if (NextIs(SyntaxKind.Transition))
+                {
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var markupBuilder = pooledResult.Builder;
+                        Accept(prefixTokens);
+
+                        // Render a single "@" in place of "@@".
+                        SpanContext.ChunkGenerator = new LiteralAttributeChunkGenerator(
+                            new LocationTagged<string>(string.Concat(prefixTokens.Select(s => s.Content)), prefixStart),
+                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupLiteral());
+
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupEphemeralLiteral());
+
+                        var markupBlock = SyntaxFactory.MarkupBlock(markupBuilder.ToList());
+                        builder.Add(markupBlock);
+                    }
+                }
+                else
+                {
+                    Accept(prefixTokens);
+                    var valueStart = CurrentStart;
+                    PutCurrentBack();
+
+                    var prefix = OutputAsMarkupLiteral();
+
+                    // Dynamic value, start a new block and set the chunk generator
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var dynamicAttributeValueBuilder = pooledResult.Builder;
+
+                        OtherParserBlock(dynamicAttributeValueBuilder);
+                        var value = SyntaxFactory.MarkupDynamicAttributeValue(prefix, SyntaxFactory.GenericBlock(dynamicAttributeValueBuilder.ToList()));
+                        builder.Add(value);
+                    }
+                }
+            }
+            else
+            {
+                Accept(prefixTokens);
+                var prefix = OutputAsMarkupLiteral();
+
+                // Literal value
+                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
+                // "Unknown" type.
+                var valueTokens = ReadWhile(token =>
+                    // These three conditions find separators which break the attribute value into portions
+                    token.Kind != SyntaxKind.Whitespace &&
+                    token.Kind != SyntaxKind.NewLine &&
+                    token.Kind != SyntaxKind.Transition &&
+                    // This condition checks for the end of the attribute value (it repeats some of the checks above
+                    // but for now that's ok)
+                    !IsEndOfAttributeValue(quote, token));
+                Accept(valueTokens);
+                var value = OutputAsMarkupLiteral();
+
+                var literalAttributeValue = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+                builder.Add(literalAttributeValue);
+            }
+        }
+
+        private bool IsEndOfAttributeValue(SyntaxKind quote, SyntaxToken token)
+        {
+            return EndOfFile || token == null ||
+                   (quote != SyntaxKind.Marker
+                        ? token.Kind == quote // If quoted, just wait for the quote
+                        : IsUnquotedEndOfAttributeValue(token));
+        }
+
+        private bool IsUnquotedEndOfAttributeValue(SyntaxToken token)
+        {
+            // If unquoted, we have a larger set of terminating characters:
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
+            // Also we need to detect "/" and ">"
+            return token.Kind == SyntaxKind.DoubleQuote ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.Equals ||
+                   (token.Kind == SyntaxKind.ForwardSlash && NextIs(SyntaxKind.CloseAngle)) ||
+                   token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.Whitespace ||
+                   token.Kind == SyntaxKind.NewLine;
         }
 
         private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
@@ -811,6 +1170,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
+        private bool IsConditionalAttributeName(string name)
+        {
+            var attributeCanBeConditional =
+                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
+                !name.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
+            return attributeCanBeConditional;
+        }
+
         private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             AcceptMarkerTokenIfNecessary();
@@ -860,6 +1227,38 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return token.Kind == SyntaxKind.Text && token.Content == "-";
         }
 
+        internal static bool IsValidAttributeNameToken(SyntaxToken token)
+        {
+            if (token == null)
+            {
+                return false;
+            }
+
+            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
+            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
+            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
+            // expectation that the parser handles such scenarios prior to falling through to name resolution.
+            var tokenType = token.Kind;
+            return tokenType != SyntaxKind.Whitespace &&
+                tokenType != SyntaxKind.NewLine &&
+                tokenType != SyntaxKind.CloseAngle &&
+                tokenType != SyntaxKind.OpenAngle &&
+                tokenType != SyntaxKind.ForwardSlash &&
+                tokenType != SyntaxKind.DoubleQuote &&
+                tokenType != SyntaxKind.SingleQuote &&
+                tokenType != SyntaxKind.Equals &&
+                tokenType != SyntaxKind.Marker;
+        }
+
+        private static bool IsTagRecoveryStopPoint(SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.ForwardSlash ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.DoubleQuote;
+        }
+
         private void DefaultMarkupSpanContext(SpanContextBuilder spanContext)
         {
             spanContext.ChunkGenerator = new MarkupChunkGenerator();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
index 2a3d016224..de1945316e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
@@ -16,8 +16,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
 
+            var rewriter = new ClassifiedSpanRewriter();
+            var rewritten = rewriter.Visit(syntaxTree.Root);
             var visitor = new ClassifiedSpanVisitor(syntaxTree.Source);
-            visitor.Visit(syntaxTree.Root);
+            visitor.Visit(rewritten);
 
             return visitor.ClassifiedSpans;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index 421485fdcc..4c11269695 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -107,29 +107,36 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         processedBoundAttributeNames);
                     tagHelperBuilder.Add(result.RewrittenAttribute);
                 }
-                else if (child is CSharpCodeBlockSyntax)
+                else if (child is MarkupMiscAttributeContentSyntax miscContent)
                 {
-                    // TODO: Accept more than just Markup attributes: https://github.com/aspnet/Razor/issues/96.
-                    // Something like:
-                    // <input @checked />
-                    var location = new SourceSpan(child.GetSourceLocation(source), child.FullWidth);
-                    var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelpersCannotHaveCSharpInTagDeclaration(location, tagName);
-                    errorSink.OnError(diagnostic);
-
-                    result = null;
-                }
-                else if (child is MarkupTextLiteralSyntax)
-                {
-                    // If the original span content was whitespace it ultimately means the tag
-                    // that owns this "attribute" is malformed and is expecting a user to type a new attribute.
-                    // ex: <myTH class="btn"| |
-                    var literalContent = child.GetContent();
-                    if (!string.IsNullOrWhiteSpace(literalContent))
+                    foreach (var contentChild in miscContent.Children)
                     {
-                        var location = child.GetSourceSpan(source);
-                        var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperAttributeListMustBeWellFormed(location);
-                        errorSink.OnError(diagnostic);
+                        if (contentChild is CSharpCodeBlockSyntax codeBlock)
+                        {
+                            // TODO: Accept more than just Markup attributes: https://github.com/aspnet/Razor/issues/96.
+                            // Something like:
+                            // <input @checked />
+                            var location = new SourceSpan(codeBlock.GetSourceLocation(source), codeBlock.FullWidth);
+                            var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelpersCannotHaveCSharpInTagDeclaration(location, tagName);
+                            errorSink.OnError(diagnostic);
+                            break;
+                        }
+                        else
+                        {
+                            // If the original span content was whitespace it ultimately means the tag
+                            // that owns this "attribute" is malformed and is expecting a user to type a new attribute.
+                            // ex: <myTH class="btn"| |
+                            var literalContent = contentChild.GetContent();
+                            if (!string.IsNullOrWhiteSpace(literalContent))
+                            {
+                                var location = contentChild.GetSourceSpan(source);
+                                var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperAttributeListMustBeWellFormed(location);
+                                errorSink.OnError(diagnostic);
+                                break;
+                            }
+                        }
                     }
+
                     result = null;
                 }
                 else
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
index 3ea1049ca5..66c5977d3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
@@ -233,6 +233,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return !EndOfFile && CurrentToken != null && CurrentToken.Kind == type;
         }
 
+        protected bool TokenExistsAfterWhitespace(SyntaxKind kind, bool includeNewLines = true)
+        {
+            var tokenFound = false;
+            var whitespace = ReadWhile(token =>
+                token.Kind == SyntaxKind.Whitespace ||
+                (includeNewLines && token.Kind == SyntaxKind.NewLine));
+            tokenFound = At(kind);
+
+            PutCurrentBack();
+            PutBack(whitespace);
+            EnsureCurrent();
+
+            return tokenFound;
+        }
+
         protected bool EnsureCurrent()
         {
             if (CurrentToken == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
index 1849a7b410..b495c48787 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -1176,6 +1176,87 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
   }
 
+  internal sealed partial class MarkupMiscAttributeContentSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupMiscAttributeContentSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupMiscAttributeContentSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupMiscAttributeContentSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMiscAttributeContent(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMiscAttributeContent(this);
+    }
+
+    public MarkupMiscAttributeContentSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupMiscAttributeContent(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupMiscAttributeContentSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupMiscAttributeContentSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
   internal sealed partial class MarkupLiteralAttributeValueSyntax : MarkupSyntaxNode
   {
     private readonly MarkupTextLiteralSyntax _prefix;
@@ -3282,6 +3363,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return DefaultVisit(node);
     }
 
+    public virtual TResult VisitMarkupMiscAttributeContent(MarkupMiscAttributeContentSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
     public virtual TResult VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
     {
       return DefaultVisit(node);
@@ -3466,6 +3552,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       DefaultVisit(node);
     }
 
+    public virtual void VisitMarkupMiscAttributeContent(MarkupMiscAttributeContentSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
     public virtual void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
     {
       DefaultVisit(node);
@@ -3673,6 +3764,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
     }
 
+    public override GreenNode VisitMarkupMiscAttributeContent(MarkupMiscAttributeContentSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
     public override GreenNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
     {
       var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
@@ -3987,6 +4084,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return new MarkupAttributeBlockSyntax(SyntaxKind.MarkupAttributeBlock, namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
     }
 
+    public static MarkupMiscAttributeContentSyntax MarkupMiscAttributeContent(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupMiscAttributeContentSyntax(SyntaxKind.MarkupMiscAttributeContent, children.Node);
+
+      return result;
+    }
+
     public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
     {
       var result = new MarkupLiteralAttributeValueSyntax(SyntaxKind.MarkupLiteralAttributeValue, prefix, value);
@@ -4235,6 +4339,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
            typeof(MarkupTagBlockSyntax),
            typeof(MarkupMinimizedAttributeBlockSyntax),
            typeof(MarkupAttributeBlockSyntax),
+           typeof(MarkupMiscAttributeContentSyntax),
            typeof(MarkupLiteralAttributeValueSyntax),
            typeof(MarkupDynamicAttributeValueSyntax),
            typeof(MarkupElementSyntax),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
index b3c122bb05..019d64dc8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -89,6 +89,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return DefaultVisit(node);
     }
 
+    /// <summary>Called when the visitor visits a MarkupMiscAttributeContentSyntax node.</summary>
+    public virtual TResult VisitMarkupMiscAttributeContent(MarkupMiscAttributeContentSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
     /// <summary>Called when the visitor visits a MarkupLiteralAttributeValueSyntax node.</summary>
     public virtual TResult VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
     {
@@ -308,6 +314,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       DefaultVisit(node);
     }
 
+    /// <summary>Called when the visitor visits a MarkupMiscAttributeContentSyntax node.</summary>
+    public virtual void VisitMarkupMiscAttributeContent(MarkupMiscAttributeContentSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
     /// <summary>Called when the visitor visits a MarkupLiteralAttributeValueSyntax node.</summary>
     public virtual void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
     {
@@ -538,6 +550,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
     }
 
+    public override SyntaxNode VisitMarkupMiscAttributeContent(MarkupMiscAttributeContentSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
     public override SyntaxNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
     {
       var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
@@ -905,6 +923,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return SyntaxFactory.MarkupAttributeBlock(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral(), default(MarkupTextLiteralSyntax), SyntaxFactory.Token(SyntaxKind.Equals), default(MarkupTextLiteralSyntax), default(RazorBlockSyntax), default(MarkupTextLiteralSyntax));
     }
 
+    /// <summary>Creates a new MarkupMiscAttributeContentSyntax instance.</summary>
+    public static MarkupMiscAttributeContentSyntax MarkupMiscAttributeContent(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupMiscAttributeContentSyntax)InternalSyntax.SyntaxFactory.MarkupMiscAttributeContent(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupMiscAttributeContentSyntax instance.</summary>
+    public static MarkupMiscAttributeContentSyntax MarkupMiscAttributeContent()
+    {
+      return SyntaxFactory.MarkupMiscAttributeContent(default(SyntaxList<RazorSyntaxNode>));
+    }
+
     /// <summary>Creates a new MarkupLiteralAttributeValueSyntax instance.</summary>
     public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
index 8196bdb0ea..4c0878d99f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -1133,6 +1133,75 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     }
   }
 
+  internal sealed partial class MarkupMiscAttributeContentSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _children;
+
+    internal MarkupMiscAttributeContentSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMiscAttributeContent(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMiscAttributeContent(this);
+    }
+
+    public MarkupMiscAttributeContentSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupMiscAttributeContent(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupMiscAttributeContentSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+
+    public MarkupMiscAttributeContentSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
   internal sealed partial class MarkupLiteralAttributeValueSyntax : MarkupSyntaxNode
   {
     private MarkupTextLiteralSyntax _prefix;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
index 7880c49622..bb0ae07673 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
@@ -86,6 +86,10 @@
     <Field Name="Value" Type="RazorBlockSyntax" Optional="true" />
     <Field Name="ValueSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
   </Node>
+  <Node Name="MarkupMiscAttributeContentSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupMiscAttributeContent" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
+  </Node>
   <Node Name="MarkupLiteralAttributeValueSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupLiteralAttributeValue" />
     <Field Name="Prefix" Type="MarkupTextLiteralSyntax" Optional="true" />
@@ -99,7 +103,7 @@
   <Node Name="MarkupElementSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupElement" />
     <Field Name="StartTag" Type="MarkupTagBlockSyntax" Optional="true" />
-    <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Optional="true" />
+    <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
     <Field Name="EndTag" Type="MarkupTagBlockSyntax" Optional="true" />
   </Node>
   <Node Name="MarkupTagHelperElementSyntax" Base="MarkupSyntaxNode">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
index 75dd554ab6..d8c68ec77e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
@@ -25,6 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         MarkupCommentBlock,
         MarkupAttributeBlock,
         MarkupMinimizedAttributeBlock,
+        MarkupMiscAttributeContent,
         MarkupLiteralAttributeValue,
         MarkupDynamicAttributeValue,
         MarkupTagHelperElement,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxUtilities.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxUtilities.cs
new file mode 100644
index 0000000000..e308c92934
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxUtilities.cs
@@ -0,0 +1,46 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxUtilities
+    {
+        public static MarkupTextLiteralSyntax MergeTextLiterals(params MarkupTextLiteralSyntax[] literalSyntaxes)
+        {
+            if (literalSyntaxes == null || literalSyntaxes.Length == 0)
+            {
+                return null;
+            }
+
+            SyntaxNode parent = null;
+            var position = 0;
+            var seenFirstLiteral = false;
+            var builder = Syntax.InternalSyntax.SyntaxListBuilder.Create();
+
+            foreach (var syntax in literalSyntaxes)
+            {
+                if (syntax == null)
+                {
+                    continue;
+                }
+                else if (!seenFirstLiteral)
+                {
+                    // Set the parent and position of the merged literal to the value of the first non-null literal.
+                    parent = syntax.Parent;
+                    position = syntax.Position;
+                    seenFirstLiteral = true;
+                }
+
+                foreach (var token in syntax.LiteralTokens)
+                {
+                    builder.Add(token.Green);
+                }
+            }
+
+            var mergedLiteralSyntax = Syntax.InternalSyntax.SyntaxFactory.MarkupTextLiteral(
+                builder.ToList<Syntax.InternalSyntax.SyntaxToken>());
+
+            return (MarkupTextLiteralSyntax)mergedLiteralSyntax.CreateRed(parent, position);
+        }
+    }
+}

From c9f0acd5fded42a40729f550e89f2892a4c40030 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 3 Dec 2018 12:59:56 -0800
Subject: [PATCH 009/337] Increase timeout \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/5f1204a960ac3bb845f79444d2e0fe48ac54f6f8

---
 .../test/IntegrationTests/MSBuildProcessManager.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index d38ae9f5f5..30b8469289 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             ProcessStartInfo processStartInfo,
             TimeSpan? timeout = null)
         {
-            timeout = timeout ?? TimeSpan.FromSeconds(120);
+            timeout = timeout ?? TimeSpan.FromSeconds(5 * 60);
 
             var process = new Process()
             {

From 3c3d6998040e2c148414b29633349b6d7bbcd79b Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 4 Dec 2018 12:14:59 -0800
Subject: [PATCH 010/337] Only add DotNetCoreRazorConfiguration capability in
 SDK for netcoreapp3.0.

- Prior to this we were unconditionally adding the `DotNetCoreRazorConfiguration` capability resulting in 1.0 projects looking like 2.1+ projects.
- Added a project capability test that verifies we're maintaining project capabilities for netcoreapp3.0 projects.
- Added a project capability test that verifies we don't muck with 1.1 project capabilities.

aspnet/Razordotnet/aspnetcore-tooling#2751
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8d733ecc0422a56ae8dfc7dd296d475bb8b3d790
---
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets |   2 +-
 .../BuildIntrospectionTest.cs                 |  22 ++++
 .../RazorTest.Introspection.targets           |   4 +
 .../test/testassets/SimpleMvc11/Program.cs    |  13 +++
 .../testassets/SimpleMvc11/SimpleMvc11.csproj |  23 ++++
 .../SimpleMvc11/Views/Home/Index.cshtml       | 108 ++++++++++++++++++
 .../SimpleMvc11/Views/Shared/_Layout.cshtml   |  71 ++++++++++++
 .../SimpleMvc11/Views/_ViewImports.cshtml     |   2 +
 .../SimpleMvc11/Views/_ViewStart.cshtml       |   3 +
 9 files changed, 247 insertions(+), 1 deletion(-)
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 6df58f657e..cfb0e4e046 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -26,7 +26,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Defines the ability to understand the configuration for the Razor language service provided by
       the runtime/toolset packages. Introduced in 2.1
     -->
-    <ProjectCapability Include="DotNetCoreRazorConfiguration"/>
+    <ProjectCapability Include="DotNetCoreRazorConfiguration" Condition="'$(_TargetingNETCoreApp30OrLater)'=='true'"/>
   </ItemGroup>
 
   <!--
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 2c676fd8fe..669a014e81 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -14,6 +14,28 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
+        [Fact]
+        [InitializeTestProject("SimpleMvc11")]
+        public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects()
+        {
+            var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor");
+            Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorSdk_AddsProjectCapabilities()
+        {
+            var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor");
+            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
+        }
+
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task RazorSdk_AddsCshtmlFilesToUpToDateCheckInput()
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index a22622b0d6..f0e8f860ab 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -25,4 +25,8 @@
   <Target Name="_IntrospectGetCopyToOutputDirectoryItems">
     <Message Text="AllItemsFullPathWithTargetPath: %(AllItemsFullPathWithTargetPath.TargetPath)" Importance="High" />
   </Target>
+
+  <Target Name="_IntrospectProjectCapabilityItems">
+    <Message Text="ProjectCapability: %(ProjectCapability.Identity)" Importance="High" />
+  </Target>
 </Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Program.cs b/src/Razor/test/testassets/SimpleMvc11/Program.cs
new file mode 100644
index 0000000000..5fbbd9ded7
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc11
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to MVC 1.1
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj b/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
new file mode 100644
index 0000000000..b1523f9512
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC and should not reference local builds of
+    the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.8">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..2172e5e566
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc11</title>
+
+    <environment names="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment names="Staging,Production">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc11</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2018 - SimpleMvc11</p>
+        </footer>
+    </div>
+
+    <environment names="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment names="Staging,Production">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..ab07b6cfbc
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using SimpleMvc11
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

From ebd37599b610bccc03d0b1d25dddd7e60c6c1c1c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 4 Dec 2018 13:48:23 -0800
Subject: [PATCH 011/337] PR feedback \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/d38687acf2de2ba43765303fb6bfd6f2ad97d566

---
 .../src/Microsoft.NET.Sdk.Razor.csproj         | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 01d37b1b8d..2c7c8b4de2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -58,26 +58,8 @@
     <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" />
   </Target>
 
-  <ItemGroup>
-    <SignedPackageFile Include="$(SdkOutputPath)tasks\net46\$(TargetName).dll" Certificate="$(AssemblySigningCertName)"  />
-    <SignedPackageFile Include="$(SdkOutputPath)tasks\netstandard2.0\$(TargetName).dll" Certificate="$(AssemblySigningCertName)"  />
-    <SignedPackageFile Include="$(SdkOutputPath)extensions\**\*.dll" Certificate="$(AssemblySigningCertName)"  />
-
-    <SignedPackageFile Include="$(SdkOutputPath)tools\netcoreapp3.0\rzc.dll" Certificate="$(AssemblySigningCertName)" />
-    <SignedPackageFile Include="$(SdkOutputPath)tools\netcoreapp3.0\Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
-
-    <!-- Binaries that should be signed by corefx/roslyn -->
-    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.dll" />
-    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.CSharp.dll" />
-    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
-    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
-  </ItemGroup>
-
   <Target Name="PopulateNuspec" AfterTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
-
     <PropertyGroup>
-      <!-- Make sure we create a symbols.nupkg -->
-      <IncludeSymbols>true</IncludeSymbols>
       <NuspecProperties>
         id=$(MSBuildProjectName);
         version=$(PackageVersion);

From ad0f2a5af45f7dc1f48311db3dffd1288fb2c47b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 4 Dec 2018 16:04:20 -0800
Subject: [PATCH 012/337] Group HTML tags (dotnet/aspnetcore-tooling#6)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a2d1ac4cea8c2b77efd3a5a4686bf85466e5ef6c
---
 .../src/ClassifiedSpanRewriter.cs             |   4 +-
 .../src/ClassifiedSpanVisitor.cs              |   9 +-
 .../src/Legacy/RazorParser.cs                 |   8 +-
 .../src/Legacy/TagHelperBlockRewriter.cs      |   8 +-
 .../src/Legacy/TagHelperParseTreeRewriter.cs  | 181 ++++++++++----
 .../Syntax.xml.Internal.Generated.cs          | 230 +++++++++++++++++-
 .../Generated/Syntax.xml.Main.Generated.cs    |  70 +++++-
 .../Generated/Syntax.xml.Syntax.Generated.cs  | 160 +++++++++++-
 .../src/Syntax/MarkupElementRewriter.cs       |  87 +++----
 .../src/Syntax/Syntax.xml                     |  12 +-
 .../src/Syntax/SyntaxKind.cs                  |   2 +
 .../src/Syntax/SyntaxNodeExtensions.cs        |  68 ++----
 .../src/Syntax/SyntaxSerializer.cs            |   3 +-
 .../Language/Legacy/ParserTestBase.cs         |  10 +
 .../Language/Legacy/SyntaxNodeWriter.cs       |   3 +-
 15 files changed, 674 insertions(+), 181 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
index dedb8c22fd..724203bd0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class ClassifiedSpanRewriter : SyntaxRewriter
     {
-        public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        public override SyntaxNode VisitMarkupStartTag(MarkupStartTagSyntax node)
         {
             SpanContext latestSpanContext = null;
             var newChildren = SyntaxListBuilder<RazorSyntaxNode>.Create();
@@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             AddLiteralIfExists();
 
-            return SyntaxFactory.MarkupTagBlock(newChildren.ToList()).Green.CreateRed(node.Parent, node.Position);
+            return SyntaxFactory.MarkupStartTag(newChildren.ToList()).Green.CreateRed(node.Parent, node.Position);
 
             void AddLiteralIfExists()
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
index 416765c992..f6711c0ed5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -106,9 +106,14 @@ namespace Microsoft.AspNetCore.Razor.Language
             base.VisitMarkupTagHelperAttributeValue(node);
         }
 
-        public override void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
         {
-            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupTagBlock);
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupStartTag);
+        }
+
+        public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupEndTag);
         }
 
         public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
index c840bcb707..0caff21144 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -41,7 +42,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var diagnostics = context.ErrorSink.Errors;
 
             var root = markupParser.ParseDocument().CreateRed();
-            return RazorSyntaxTree.Create(root, source, diagnostics, Options);
+
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, Options);
+
+            // Group markup elements
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+            return syntaxTree;
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index 4c11269695..fefcf4aeee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -10,13 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal static class TagHelperBlockRewriter
     {
-        private static readonly string StringTypeName = typeof(string).FullName;
-
         public static MarkupTagHelperStartTagSyntax Rewrite(
             string tagName,
             bool validStructure,
             RazorParserFeatureFlags featureFlags,
-            MarkupTagBlockSyntax tag,
+            MarkupStartTagSyntax tag,
             TagHelperBinding bindingResult,
             ErrorSink errorSink,
             RazorSourceDocument source)
@@ -28,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         public static TagMode GetTagMode(
-            MarkupTagBlockSyntax tagBlock,
+            MarkupStartTagSyntax tagBlock,
             TagHelperBinding bindingResult,
             ErrorSink errorSink)
         {
@@ -57,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private static SyntaxList<RazorSyntaxNode> GetRewrittenChildren(
             string tagName,
             bool validStructure,
-            MarkupTagBlockSyntax tagBlock,
+            MarkupStartTagSyntax tagBlock,
             TagHelperBinding bindingResult,
             RazorParserFeatureFlags featureFlags,
             ErrorSink errorSink,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 18b1cf5c4d..ca0bc08809 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public static RazorSyntaxTree Rewrite(RazorSyntaxTree syntaxTree, string tagHelperPrefix, IEnumerable<TagHelperDescriptor> descriptors)
         {
             var errorSink = new ErrorSink();
-            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
 
             var rewriter = new Rewriter(
                 syntaxTree.Source,
@@ -33,8 +32,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var diagnostics = CombineErrors(syntaxTree.Diagnostics, errorList).OrderBy(error => error.Span.AbsoluteIndex);
 
             var newSyntaxTree = RazorSyntaxTree.Create(rewritten, syntaxTree.Source, diagnostics, syntaxTree.Options);
-            newSyntaxTree = MarkupElementRewriter.RemoveMarkupElements(newSyntaxTree);
-
             return newSyntaxTree;
         }
 
@@ -103,7 +100,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 TagHelperInfo tagHelperInfo = null;
 
                 // Visit the start tag.
-                var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+                var startTag = (MarkupStartTagSyntax)Visit(node.StartTag);
                 if (startTag != null)
                 {
                     var tagName = startTag.GetTagName();
@@ -145,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     else
                     {
                         // Non-TagHelper tag.
-                        ValidateParentAllowsPlainTag(startTag);
+                        ValidateParentAllowsPlainStartTag(startTag);
 
                         if (!startTag.IsSelfClosing() && !startTag.IsVoidElement())
                         {
@@ -159,7 +156,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var body = VisitList(node.Body);
 
                 // Visit end tag.
-                var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+                var endTag = (MarkupEndTagSyntax)Visit(node.EndTag);
                 if (endTag != null)
                 {
                     var tagName = endTag.GetTagName();
@@ -181,9 +178,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         {
                             // Standalone end tag. We may need to error if it is not supposed to be here.
                             // If there was a corresponding start tag, we would have already added this error.
-                            ValidateParentAllowsPlainTag(endTag);
+                            ValidateParentAllowsPlainEndTag(endTag);
                         }
-                        else if (!endTag.IsVoidElement())
+                        else
                         {
                             // Since a start tag exists, we must already be tracking it.
                             // Pop the stack as we're done with the end tag.
@@ -205,7 +202,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
             {
-                var tagParent = node.FirstAncestorOrSelf<SyntaxNode>(n => n is MarkupTagBlockSyntax);
+                var tagParent = node.FirstAncestorOrSelf<SyntaxNode>(n => n is MarkupStartTagSyntax || n is MarkupEndTagSyntax);
                 var isPartofTagBlock = tagParent != null;
                 if (!isPartofTagBlock)
                 {
@@ -215,13 +212,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return base.VisitMarkupTextLiteral(node);
             }
 
-            private bool TryRewriteTagHelperStart(MarkupTagBlockSyntax tagBlock, out MarkupTagHelperStartTagSyntax rewritten, out TagHelperInfo tagHelperInfo)
+            private bool TryRewriteTagHelperStart(MarkupStartTagSyntax startTag, out MarkupTagHelperStartTagSyntax rewritten, out TagHelperInfo tagHelperInfo)
             {
                 rewritten = null;
                 tagHelperInfo = null;
 
                 // Get tag name of the current block
-                var tagName = tagBlock.GetTagName();
+                var tagName = startTag.GetTagName();
 
                 // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
                 if (tagName == null)
@@ -231,7 +228,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 TagHelperBinding tagHelperBinding;
 
-                if (!IsPotentialTagHelper(tagName, tagBlock))
+                if (!IsPotentialTagHelperStart(tagName, startTag))
                 {
                     return false;
                 }
@@ -240,7 +237,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var tagNameScope = tracker?.TagName ?? string.Empty;
 
                 // We're now in a start tag block, we first need to see if the tag block is a tag helper.
-                var elementAttributes = GetAttributeNameValuePairs(tagBlock);
+                var elementAttributes = GetAttributeNameValuePairs(startTag);
 
                 tagHelperBinding = _tagHelperBinder.GetBinding(
                     tagName,
@@ -264,29 +261,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     return false;
                 }
 
-                ValidateParentAllowsTagHelper(tagName, tagBlock);
-                ValidateBinding(tagHelperBinding, tagName, tagBlock);
+                ValidateParentAllowsTagHelper(tagName, startTag);
+                ValidateBinding(tagHelperBinding, tagName, startTag);
 
                 // We're in a start TagHelper block.
-                var validTagStructure = ValidateTagSyntax(tagName, tagBlock);
+                var validTagStructure = ValidateStartTagSyntax(tagName, startTag);
 
-                var startTag = TagHelperBlockRewriter.Rewrite(
+                var rewrittenStartTag = TagHelperBlockRewriter.Rewrite(
                     tagName,
                     validTagStructure,
                     _featureFlags,
-                    tagBlock,
+                    startTag,
                     tagHelperBinding,
                     _errorSink,
                     _source);
 
-                var tagMode = TagHelperBlockRewriter.GetTagMode(tagBlock, tagHelperBinding, _errorSink);
+                var tagMode = TagHelperBlockRewriter.GetTagMode(startTag, tagHelperBinding, _errorSink);
                 tagHelperInfo = new TagHelperInfo(tagName, tagMode, tagHelperBinding);
-                rewritten = startTag;
+                rewritten = rewrittenStartTag;
 
                 return true;
             }
 
-            private bool TryRewriteTagHelperEnd(MarkupTagBlockSyntax tagBlock, out MarkupTagHelperEndTagSyntax rewritten)
+            private bool TryRewriteTagHelperEnd(MarkupEndTagSyntax tagBlock, out MarkupTagHelperEndTagSyntax rewritten)
             {
                 rewritten = null;
                 var tagName = tagBlock.GetTagName();
@@ -298,7 +295,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 var tracker = CurrentTagHelperTracker;
                 var tagNameScope = tracker?.TagName ?? string.Empty;
-                if (!IsPotentialTagHelper(tagName, tagBlock))
+                if (!IsPotentialTagHelperEnd(tagName, tagBlock))
                 {
                     return false;
                 }
@@ -315,7 +312,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         return false;
                     }
 
-                    ValidateTagSyntax(tagName, tagBlock);
+                    ValidateEndTagSyntax(tagName, tagBlock);
 
                     _trackerStack.Pop();
                 }
@@ -360,10 +357,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             // Internal for testing
-            internal IReadOnlyList<KeyValuePair<string, string>> GetAttributeNameValuePairs(MarkupTagBlockSyntax tagBlock)
+            internal IReadOnlyList<KeyValuePair<string, string>> GetAttributeNameValuePairs(MarkupStartTagSyntax tagBlock)
             {
                 // Need to calculate how many children we should take that represent the attributes.
-                var childrenOffset = IsPartialTag(tagBlock) ? 0 : 1;
+                var childrenOffset = IsPartialStartTag(tagBlock) ? 0 : 1;
                 var childCount = tagBlock.Children.Count - childrenOffset;
 
                 if (childCount <= 1)
@@ -436,19 +433,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return attributes;
             }
 
-            private void ValidateParentAllowsTagHelper(string tagName, MarkupTagBlockSyntax tagBlock)
+            private void ValidateParentAllowsTagHelper(string tagName, MarkupStartTagSyntax tagBlock)
             {
                 if (HasAllowedChildren() &&
                     !CurrentTagHelperTracker.PrefixedAllowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
                 {
-                    OnAllowedChildrenTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                    OnAllowedChildrenStartTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
                 }
             }
 
             private void ValidateBinding(
                 TagHelperBinding bindingResult,
                 string tagName,
-                MarkupTagBlockSyntax tagBlock)
+                MarkupStartTagSyntax tagBlock)
             {
                 // Ensure that all descriptors associated with this tag have appropriate TagStructures. Cannot have
                 // multiple descriptors that expect different TagStructures (other than TagStructure.Unspecified).
@@ -479,12 +476,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            private bool ValidateTagSyntax(string tagName, MarkupTagBlockSyntax tag)
+            private bool ValidateStartTagSyntax(string tagName, MarkupStartTagSyntax tag)
             {
                 // We assume an invalid syntax until we verify that the tag meets all of our "valid syntax" criteria.
-                if (IsPartialTag(tag))
+                if (IsPartialStartTag(tag))
                 {
-                    var errorStart = GetTagDeclarationErrorStart(tag);
+                    var errorStart = GetStartTagDeclarationErrorStart(tag, _source);
 
                     _errorSink.OnError(
                         RazorDiagnosticFactory.CreateParsing_TagHelperMissingCloseAngle(
@@ -496,7 +493,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return true;
             }
 
-            private bool IsPotentialTagHelper(string tagName, MarkupTagBlockSyntax childBlock)
+            private bool ValidateEndTagSyntax(string tagName, MarkupEndTagSyntax tag)
+            {
+                // We assume an invalid syntax until we verify that the tag meets all of our "valid syntax" criteria.
+                if (IsPartialEndTag(tag))
+                {
+                    var errorStart = GetEndTagDeclarationErrorStart(tag, _source);
+
+                    _errorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TagHelperMissingCloseAngle(
+                            new SourceSpan(errorStart, tagName.Length), tagName));
+
+                    return false;
+                }
+
+                return true;
+            }
+
+            private bool IsPotentialTagHelperStart(string tagName, MarkupStartTagSyntax childBlock)
             {
                 Debug.Assert(childBlock.Children.Count > 0);
                 var child = childBlock.Children[0];
@@ -505,14 +519,37 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                        child.Kind != SyntaxKind.MarkupTransition;
             }
 
-            private SourceLocation GetTagDeclarationErrorStart(MarkupTagBlockSyntax tagBlock)
+            private bool IsPotentialTagHelperEnd(string tagName, MarkupEndTagSyntax childBlock)
             {
-                var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
+                Debug.Assert(childBlock.Children.Count > 0);
+                var child = childBlock.Children[0];
 
-                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(_source), advanceBy);
+                return !string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) ||
+                       child.Kind != SyntaxKind.MarkupTransition;
             }
 
-            private static bool IsPartialTag(MarkupTagBlockSyntax tagBlock)
+            private static bool IsPartialStartTag(MarkupStartTagSyntax tagBlock)
+            {
+                // No need to validate the tag end because in order to be a tag block it must start with '<'.
+                var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1];
+
+                // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format)
+                if (tagEnd != null && tagEnd is MarkupTextLiteralSyntax tagEndLiteral)
+                {
+                    var endToken = tagEndLiteral.LiteralTokens.Count > 0 ?
+                        tagEndLiteral.LiteralTokens[tagEndLiteral.LiteralTokens.Count - 1] :
+                        null;
+
+                    if (endToken != null && endToken.Kind == SyntaxKind.CloseAngle)
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            private static bool IsPartialEndTag(MarkupEndTagSyntax tagBlock)
             {
                 // No need to validate the tag end because in order to be a tag block it must start with '<'.
                 var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1];
@@ -566,7 +603,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            private void ValidateParentAllowsPlainTag(MarkupTagBlockSyntax tagBlock)
+            private void ValidateParentAllowsPlainStartTag(MarkupStartTagSyntax tagBlock)
             {
                 var tagName = tagBlock.GetTagName();
 
@@ -595,7 +632,40 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var allowedChildren = tagHelperBinding != null ? CurrentTagHelperTracker.PrefixedAllowedChildren : CurrentTagHelperTracker.AllowedChildren;
                 if (!allowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
                 {
-                    OnAllowedChildrenTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                    OnAllowedChildrenStartTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                }
+            }
+
+            private void ValidateParentAllowsPlainEndTag(MarkupEndTagSyntax tagBlock)
+            {
+                var tagName = tagBlock.GetTagName();
+
+                // Treat partial tags such as '</' which have no tag names as content.
+                if (string.IsNullOrEmpty(tagName))
+                {
+                    var firstChild = tagBlock.Children.First();
+                    Debug.Assert(firstChild is MarkupTextLiteralSyntax || firstChild is MarkupTransitionSyntax);
+
+                    ValidateParentAllowsContent(tagBlock.Children.First());
+                    return;
+                }
+
+                if (!HasAllowedChildren())
+                {
+                    return;
+                }
+
+                var tagHelperBinding = _tagHelperBinder.GetBinding(
+                    tagName,
+                    attributes: Array.Empty<KeyValuePair<string, string>>(),
+                    parentTagName: CurrentParentTagName,
+                    parentIsTagHelper: CurrentParentIsTagHelper);
+
+                // If we found a binding for the current tag, then it is a tag helper. Use the prefixed allowed children to compare.
+                var allowedChildren = tagHelperBinding != null ? CurrentTagHelperTracker.PrefixedAllowedChildren : CurrentTagHelperTracker.AllowedChildren;
+                if (!allowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
+                {
+                    OnAllowedChildrenEndTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
                 }
             }
 
@@ -632,15 +702,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return commentParent != null;
             }
 
-            private static void OnAllowedChildrenTagError(
+            private static void OnAllowedChildrenStartTagError(
                 TagHelperTracker tracker,
                 string tagName,
-                MarkupTagBlockSyntax tagBlock,
+                MarkupStartTagSyntax tagBlock,
                 ErrorSink errorSink,
                 RazorSourceDocument source)
             {
                 var allowedChildrenString = string.Join(", ", tracker.AllowedChildren);
-                var errorStart = GetTagDeclarationErrorStart(tagBlock, source);
+                var errorStart = GetStartTagDeclarationErrorStart(tagBlock, source);
 
                 errorSink.OnError(
                     RazorDiagnosticFactory.CreateTagHelper_InvalidNestedTag(
@@ -650,21 +720,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         allowedChildrenString));
             }
 
-            private static SourceLocation GetTagDeclarationErrorStart(MarkupTagBlockSyntax tagBlock, RazorSourceDocument source)
+            private static void OnAllowedChildrenEndTagError(
+                TagHelperTracker tracker,
+                string tagName,
+                MarkupEndTagSyntax tagBlock,
+                ErrorSink errorSink,
+                RazorSourceDocument source)
             {
-                var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
+                var allowedChildrenString = string.Join(", ", tracker.AllowedChildren);
+                var errorStart = GetEndTagDeclarationErrorStart(tagBlock, source);
 
-                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(source), advanceBy);
+                errorSink.OnError(
+                    RazorDiagnosticFactory.CreateTagHelper_InvalidNestedTag(
+                        new SourceSpan(errorStart, tagName.Length),
+                        tagName,
+                        tracker.TagName,
+                        allowedChildrenString));
             }
 
-            private static bool IsEndTag(MarkupTagBlockSyntax tagBlock)
+            private static SourceLocation GetStartTagDeclarationErrorStart(MarkupStartTagSyntax tagBlock, RazorSourceDocument source)
             {
-                var childSpan = (MarkupTextLiteralSyntax)tagBlock.Children.First();
+                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(source), "<");
+            }
 
-                // We grab the token that could be forward slash
-                var relevantToken = childSpan.LiteralTokens[childSpan.LiteralTokens.Count == 1 ? 0 : 1];
-
-                return relevantToken.Kind == SyntaxKind.ForwardSlash;
+            private static SourceLocation GetEndTagDeclarationErrorStart(MarkupEndTagSyntax tagBlock, RazorSourceDocument source)
+            {
+                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(source), "</");
             }
 
             private class TagTracker
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
index b495c48787..5142975836 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -1441,11 +1441,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
   internal sealed partial class MarkupElementSyntax : MarkupSyntaxNode
   {
-    private readonly MarkupTagBlockSyntax _startTag;
+    private readonly MarkupStartTagSyntax _startTag;
     private readonly GreenNode _body;
-    private readonly MarkupTagBlockSyntax _endTag;
+    private readonly MarkupEndTagSyntax _endTag;
 
-    internal MarkupElementSyntax(SyntaxKind kind, MarkupTagBlockSyntax startTag, GreenNode body, MarkupTagBlockSyntax endTag, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+    internal MarkupElementSyntax(SyntaxKind kind, MarkupStartTagSyntax startTag, GreenNode body, MarkupEndTagSyntax endTag, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
         : base(kind, diagnostics, annotations)
     {
         SlotCount = 3;
@@ -1467,7 +1467,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
 
 
-    internal MarkupElementSyntax(SyntaxKind kind, MarkupTagBlockSyntax startTag, GreenNode body, MarkupTagBlockSyntax endTag)
+    internal MarkupElementSyntax(SyntaxKind kind, MarkupStartTagSyntax startTag, GreenNode body, MarkupEndTagSyntax endTag)
         : base(kind)
     {
         SlotCount = 3;
@@ -1488,9 +1488,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
         }
     }
 
-    public MarkupTagBlockSyntax StartTag { get { return _startTag; } }
+    public MarkupStartTagSyntax StartTag { get { return _startTag; } }
     public SyntaxList<RazorSyntaxNode> Body { get { return new SyntaxList<RazorSyntaxNode>(_body); } }
-    public MarkupTagBlockSyntax EndTag { get { return _endTag; } }
+    public MarkupEndTagSyntax EndTag { get { return _endTag; } }
 
     internal override GreenNode GetSlot(int index)
     {
@@ -1518,7 +1518,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
         visitor.VisitMarkupElement(this);
     }
 
-    public MarkupElementSyntax Update(MarkupTagBlockSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    public MarkupElementSyntax Update(MarkupStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupEndTagSyntax endTag)
     {
         if (startTag != StartTag || body != Body || endTag != EndTag)
         {
@@ -1546,6 +1546,168 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
   }
 
+  internal sealed partial class MarkupStartTagSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupStartTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupStartTagSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupStartTagSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupStartTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupStartTag(this);
+    }
+
+    public MarkupStartTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupStartTag(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupStartTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupStartTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupEndTagSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupEndTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupEndTagSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupEndTagSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupEndTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupEndTag(this);
+    }
+
+    public MarkupEndTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupEndTag(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupEndTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupEndTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
   internal sealed partial class MarkupTagHelperElementSyntax : MarkupSyntaxNode
   {
     private readonly MarkupTagHelperStartTagSyntax _startTag;
@@ -3383,6 +3545,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return DefaultVisit(node);
     }
 
+    public virtual TResult VisitMarkupStartTag(MarkupStartTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupEndTag(MarkupEndTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
     public virtual TResult VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
       return DefaultVisit(node);
@@ -3572,6 +3744,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       DefaultVisit(node);
     }
 
+    public virtual void VisitMarkupStartTag(MarkupStartTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupEndTag(MarkupEndTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
     public virtual void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
       DefaultVisit(node);
@@ -3786,12 +3968,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     public override GreenNode VisitMarkupElement(MarkupElementSyntax node)
     {
-      var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+      var startTag = (MarkupStartTagSyntax)Visit(node.StartTag);
       var body = VisitList(node.Body);
-      var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+      var endTag = (MarkupEndTagSyntax)Visit(node.EndTag);
       return node.Update(startTag, body, endTag);
     }
 
+    public override GreenNode VisitMarkupStartTag(MarkupStartTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupEndTag(MarkupEndTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
     public override GreenNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
       var startTag = (MarkupTagHelperStartTagSyntax)Visit(node.StartTag);
@@ -4108,13 +4302,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return result;
     }
 
-    public static MarkupElementSyntax MarkupElement(MarkupTagBlockSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    public static MarkupElementSyntax MarkupElement(MarkupStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupEndTagSyntax endTag)
     {
       var result = new MarkupElementSyntax(SyntaxKind.MarkupElement, startTag, body.Node, endTag);
 
       return result;
     }
 
+    public static MarkupStartTagSyntax MarkupStartTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupStartTagSyntax(SyntaxKind.MarkupStartTag, children.Node);
+
+      return result;
+    }
+
+    public static MarkupEndTagSyntax MarkupEndTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupEndTagSyntax(SyntaxKind.MarkupEndTag, children.Node);
+
+      return result;
+    }
+
     public static MarkupTagHelperElementSyntax MarkupTagHelperElement(MarkupTagHelperStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
     {
       if (startTag == null)
@@ -4343,6 +4551,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
            typeof(MarkupLiteralAttributeValueSyntax),
            typeof(MarkupDynamicAttributeValueSyntax),
            typeof(MarkupElementSyntax),
+           typeof(MarkupStartTagSyntax),
+           typeof(MarkupEndTagSyntax),
            typeof(MarkupTagHelperElementSyntax),
            typeof(MarkupTagHelperStartTagSyntax),
            typeof(MarkupTagHelperEndTagSyntax),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
index 019d64dc8d..a5f908438a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -113,6 +113,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return DefaultVisit(node);
     }
 
+    /// <summary>Called when the visitor visits a MarkupStartTagSyntax node.</summary>
+    public virtual TResult VisitMarkupStartTag(MarkupStartTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupEndTagSyntax node.</summary>
+    public virtual TResult VisitMarkupEndTag(MarkupEndTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
     /// <summary>Called when the visitor visits a MarkupTagHelperElementSyntax node.</summary>
     public virtual TResult VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
@@ -338,6 +350,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       DefaultVisit(node);
     }
 
+    /// <summary>Called when the visitor visits a MarkupStartTagSyntax node.</summary>
+    public virtual void VisitMarkupStartTag(MarkupStartTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupEndTagSyntax node.</summary>
+    public virtual void VisitMarkupEndTag(MarkupEndTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
     /// <summary>Called when the visitor visits a MarkupTagHelperElementSyntax node.</summary>
     public virtual void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
@@ -572,12 +596,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
     public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
     {
-      var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+      var startTag = (MarkupStartTagSyntax)Visit(node.StartTag);
       var body = VisitList(node.Body);
-      var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+      var endTag = (MarkupEndTagSyntax)Visit(node.EndTag);
       return node.Update(startTag, body, endTag);
     }
 
+    public override SyntaxNode VisitMarkupStartTag(MarkupStartTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupEndTag(MarkupEndTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
     public override SyntaxNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
       var startTag = (MarkupTagHelperStartTagSyntax)Visit(node.StartTag);
@@ -962,15 +998,39 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     }
 
     /// <summary>Creates a new MarkupElementSyntax instance.</summary>
-    public static MarkupElementSyntax MarkupElement(MarkupTagBlockSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    public static MarkupElementSyntax MarkupElement(MarkupStartTagSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupEndTagSyntax endTag)
     {
-      return (MarkupElementSyntax)InternalSyntax.SyntaxFactory.MarkupElement(startTag == null ? null : (InternalSyntax.MarkupTagBlockSyntax)startTag.Green, body.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), endTag == null ? null : (InternalSyntax.MarkupTagBlockSyntax)endTag.Green).CreateRed();
+      return (MarkupElementSyntax)InternalSyntax.SyntaxFactory.MarkupElement(startTag == null ? null : (InternalSyntax.MarkupStartTagSyntax)startTag.Green, body.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), endTag == null ? null : (InternalSyntax.MarkupEndTagSyntax)endTag.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupElementSyntax instance.</summary>
     public static MarkupElementSyntax MarkupElement(SyntaxList<RazorSyntaxNode> body = default(SyntaxList<RazorSyntaxNode>))
     {
-      return SyntaxFactory.MarkupElement(default(MarkupTagBlockSyntax), body, default(MarkupTagBlockSyntax));
+      return SyntaxFactory.MarkupElement(default(MarkupStartTagSyntax), body, default(MarkupEndTagSyntax));
+    }
+
+    /// <summary>Creates a new MarkupStartTagSyntax instance.</summary>
+    public static MarkupStartTagSyntax MarkupStartTag(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupStartTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupStartTagSyntax instance.</summary>
+    public static MarkupStartTagSyntax MarkupStartTag()
+    {
+      return SyntaxFactory.MarkupStartTag(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupEndTagSyntax instance.</summary>
+    public static MarkupEndTagSyntax MarkupEndTag(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupEndTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupEndTagSyntax instance.</summary>
+    public static MarkupEndTagSyntax MarkupEndTag()
+    {
+      return SyntaxFactory.MarkupEndTag(default(SyntaxList<RazorSyntaxNode>));
     }
 
     /// <summary>Creates a new MarkupTagHelperElementSyntax instance.</summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
index 4c0878d99f..92ba8867d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -1382,16 +1382,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
   internal sealed partial class MarkupElementSyntax : MarkupSyntaxNode
   {
-    private MarkupTagBlockSyntax _startTag;
+    private MarkupStartTagSyntax _startTag;
     private SyntaxNode _body;
-    private MarkupTagBlockSyntax _endTag;
+    private MarkupEndTagSyntax _endTag;
 
     internal MarkupElementSyntax(GreenNode green, SyntaxNode parent, int position)
         : base(green, parent, position)
     {
     }
 
-    public MarkupTagBlockSyntax StartTag 
+    public MarkupStartTagSyntax StartTag 
     {
         get
         {
@@ -1407,7 +1407,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         }
     }
 
-    public MarkupTagBlockSyntax EndTag 
+    public MarkupEndTagSyntax EndTag 
     {
         get
         {
@@ -1446,7 +1446,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         visitor.VisitMarkupElement(this);
     }
 
-    public MarkupElementSyntax Update(MarkupTagBlockSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    public MarkupElementSyntax Update(MarkupStartTagSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupEndTagSyntax endTag)
     {
         if (startTag != StartTag || body != Body || endTag != EndTag)
         {
@@ -1460,7 +1460,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return this;
     }
 
-    public MarkupElementSyntax WithStartTag(MarkupTagBlockSyntax startTag)
+    public MarkupElementSyntax WithStartTag(MarkupStartTagSyntax startTag)
     {
         return Update(startTag, Body, EndTag);
     }
@@ -1470,14 +1470,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return Update(StartTag, body, EndTag);
     }
 
-    public MarkupElementSyntax WithEndTag(MarkupTagBlockSyntax endTag)
+    public MarkupElementSyntax WithEndTag(MarkupEndTagSyntax endTag)
     {
         return Update(StartTag, Body, endTag);
     }
 
     public MarkupElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
     {
-        var _startTag = this.StartTag ?? SyntaxFactory.MarkupTagBlock();
+        var _startTag = this.StartTag ?? SyntaxFactory.MarkupStartTag();
         return this.WithStartTag(_startTag.WithChildren(_startTag.Children.AddRange(items)));
     }
 
@@ -1488,11 +1488,153 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
     public MarkupElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
     {
-        var _endTag = this.EndTag ?? SyntaxFactory.MarkupTagBlock();
+        var _endTag = this.EndTag ?? SyntaxFactory.MarkupEndTag();
         return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
     }
   }
 
+  internal sealed partial class MarkupStartTagSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupStartTagSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupStartTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupStartTag(this);
+    }
+
+    public MarkupStartTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupStartTag(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupStartTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupStartTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupEndTagSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupEndTagSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupEndTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupEndTag(this);
+    }
+
+    public MarkupEndTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupEndTag(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupEndTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupEndTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
   internal sealed partial class MarkupTagHelperElementSyntax : MarkupSyntaxNode
   {
     private MarkupTagHelperStartTagSyntax _startTag;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
index 7aeda1c349..b0d9e82624 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
@@ -19,15 +19,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             return newSyntaxTree;
         }
 
-        public static RazorSyntaxTree RemoveMarkupElements(RazorSyntaxTree syntaxTree)
-        {
-            var rewriter = new RemoveMarkupElementRewriter();
-            var rewrittenRoot = rewriter.Visit(syntaxTree.Root);
-
-            var newSyntaxTree = RazorSyntaxTree.Create(rewrittenRoot, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
-            return newSyntaxTree;
-        }
-
         private class AddMarkupElementRewriter : SyntaxRewriter
         {
             private readonly Stack<TagBlockTracker> _startTagTracker = new Stack<TagBlockTracker>();
@@ -38,10 +29,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
             public override SyntaxNode Visit(SyntaxNode node)
             {
-                node = base.Visit(node);
-                
                 if (node != null)
                 {
+                    var diagnostics = node.GetDiagnostics();
+                    node = base.Visit(node);
+                    if (diagnostics.Length > 0)
+                    {
+                        // Persist node diagnostics.
+                        node = node.WithDiagnostics(diagnostics);
+                    }
+
                     node = RewriteNode(node);
                 }
 
@@ -71,7 +68,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                     var tagName = tagBlock.GetTagName();
                     if (string.IsNullOrWhiteSpace(tagName) || tagBlock.IsSelfClosing())
                     {
-                        // Don't want to track incomplete, invalid (Eg. </>, <  >), void or self-closing tags.
+                        // Don't want to track incomplete, invalid (Eg. </>, <  >) or self-closing tags.
                         // Simply wrap it in a block with no body or start/end tag.
                         if (IsEndTag(tagBlock))
                         {
@@ -102,7 +99,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                             if (!TryRecoverStartTag(rewrittenChildren, tagName, tagBlock))
                             {
                                 // Could not recover. The end tag doesn't have a corresponding start tag. Wrap it in a block and move on.
-                                var rewritten = SyntaxFactory.MarkupElement(startTag: null, body: new SyntaxList<RazorSyntaxNode>(), endTag: tagBlock);
+                                var rewritten = SyntaxFactory.MarkupElement(startTag: null, body: new SyntaxList<RazorSyntaxNode>(), endTag: GetEndTagSyntax(tagBlock));
                                 TrackChild(rewritten, rewrittenChildren);
                             }
                         }
@@ -149,7 +146,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 // The call to SyntaxNode.ReplaceNodes() later will take care removing the nodes whose replacement is null.
 
                 var body = tagChildren.Where(t => t != null).ToList();
-                var rewritten = SyntaxFactory.MarkupElement(startTag, new SyntaxList<RazorSyntaxNode>(body), endTag);
+                var rewritten = SyntaxFactory.MarkupElement(
+                    GetStartTagSyntax(startTag),
+                    new SyntaxList<RazorSyntaxNode>(body),
+                    GetEndTagSyntax(endTag));
+
                 if (startTag != null)
                 {
                     // If there was a start tag, that is where we want to put our new element.
@@ -232,6 +233,26 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 return childContent.StartsWith("</") || childContent.StartsWith("/");
             }
 
+            private static MarkupStartTagSyntax GetStartTagSyntax(MarkupTagBlockSyntax tagBlock)
+            {
+                if (tagBlock == null)
+                {
+                    return null;
+                }
+
+                return SyntaxFactory.MarkupStartTag(tagBlock.Children);
+            }
+
+            private static MarkupEndTagSyntax GetEndTagSyntax(MarkupTagBlockSyntax tagBlock)
+            {
+                if (tagBlock == null)
+                {
+                    return null;
+                }
+
+                return SyntaxFactory.MarkupEndTag(tagBlock.Children);
+            }
+
             private class TagBlockTracker
             {
                 public TagBlockTracker(MarkupTagBlockSyntax tagBlock)
@@ -248,43 +269,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 public string TagName { get; }
             }
         }
-
-        private class RemoveMarkupElementRewriter : SyntaxRewriter
-        {
-            public override SyntaxNode Visit(SyntaxNode node)
-            {
-                if (node != null)
-                {
-                    node = RewriteNode(node);
-                }
-
-                return base.Visit(node);
-            }
-
-            private SyntaxNode RewriteNode(SyntaxNode node)
-            {
-                if (node.IsToken)
-                {
-                    return node;
-                }
-
-                var children = node.ChildNodes();
-                for (var i = 0; i < children.Count; i++)
-                {
-                    var child = children[i];
-                    if (!(child is MarkupElementSyntax tagElement))
-                    {
-                        continue;
-                    }
-
-                    node = node.ReplaceNode(tagElement, tagElement.ChildNodes());
-
-                    // Since we rewrote 'node', it's children are different. Update our collection.
-                    children = node.ChildNodes();
-                }
-
-                return node;
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
index bb0ae07673..5aa4852271 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
@@ -102,9 +102,17 @@
   </Node>
   <Node Name="MarkupElementSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupElement" />
-    <Field Name="StartTag" Type="MarkupTagBlockSyntax" Optional="true" />
+    <Field Name="StartTag" Type="MarkupStartTagSyntax" Optional="true" />
     <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
-    <Field Name="EndTag" Type="MarkupTagBlockSyntax" Optional="true" />
+    <Field Name="EndTag" Type="MarkupEndTagSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupStartTagSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupStartTag" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupEndTagSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupEndTag" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
   </Node>
   <Node Name="MarkupTagHelperElementSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupTagHelperElement" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
index d8c68ec77e..66be02fdfa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
@@ -19,6 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         MarkupBlock,
         MarkupTransition,
         MarkupElement,
+        MarkupStartTag,
+        MarkupEndTag,
         MarkupTagBlock,
         MarkupTextLiteral,
         MarkupEphemeralTextLiteral,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index 4955f15294..521bb4ed79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -223,55 +223,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
         public static string GetTagName(this MarkupTagBlockSyntax tagBlock)
         {
-            if (tagBlock == null)
-            {
-                throw new ArgumentNullException(nameof(tagBlock));
-            }
-
-            var child = tagBlock.Children[0];
-
-            if (tagBlock.Children.Count == 0 || !(child is MarkupTextLiteralSyntax))
-            {
-                return null;
-            }
-
-            var childLiteral = (MarkupTextLiteralSyntax)child;
-            SyntaxToken textToken = null;
-            for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
-            {
-                var token = childLiteral.LiteralTokens[i];
-
-                if (token != null &&
-                    (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
-                {
-                    textToken = token;
-                    break;
-                }
-            }
-
-            if (textToken == null)
-            {
-                return null;
-            }
-
-            return textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+            return GetTagNameCore(tagBlock);
         }
 
-        public static string GetTagName(this MarkupTagHelperStartTagSyntax tagBlock)
+        public static string GetTagName(this MarkupStartTagSyntax startTag)
+        {
+            return GetTagNameCore(startTag);
+        }
+
+        public static string GetTagName(this MarkupEndTagSyntax endTag)
+        {
+            return GetTagNameCore(endTag);
+        }
+
+        private static string GetTagNameCore(RazorBlockSyntax tagBlock)
         {
             if (tagBlock == null)
             {
                 throw new ArgumentNullException(nameof(tagBlock));
             }
 
-            var child = tagBlock.Children[0];
-
-            if (tagBlock.Children.Count == 0 || !(child is MarkupTextLiteralSyntax))
+            if (tagBlock.Children.Count == 0 || !(tagBlock.Children[0] is MarkupTextLiteralSyntax childLiteral))
             {
                 return null;
             }
 
-            var childLiteral = (MarkupTextLiteralSyntax)child;
             SyntaxToken textToken = null;
             for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
             {
@@ -294,6 +270,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         }
 
         public static bool IsSelfClosing(this MarkupTagBlockSyntax tagBlock)
+        {
+            return IsSelfClosingCore(tagBlock);
+        }
+
+        public static bool IsSelfClosing(this MarkupStartTagSyntax startTag)
+        {
+            return IsSelfClosingCore(startTag);
+        }
+
+        private static bool IsSelfClosingCore(RazorBlockSyntax tagBlock)
         {
             if (tagBlock == null)
             {
@@ -305,14 +291,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             return lastChild?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false;
         }
 
-        public static bool IsVoidElement(this MarkupTagBlockSyntax tagBlock)
+        public static bool IsVoidElement(this MarkupStartTagSyntax startTag)
         {
-            if (tagBlock == null)
+            if (startTag == null)
             {
-                throw new ArgumentNullException(nameof(tagBlock));
+                throw new ArgumentNullException(nameof(startTag));
             }
 
-            return ParserHelpers.VoidElements.Contains(tagBlock.GetTagName());
+            return ParserHelpers.VoidElements.Contains(startTag.GetTagName());
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
index 5b167b510f..a811d79aa2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
@@ -287,7 +287,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             {
                 return node.Kind == SyntaxKind.MarkupTextLiteral ||
                     node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
-                    node.Kind == SyntaxKind.MarkupTagBlock ||
+                    node.Kind == SyntaxKind.MarkupStartTag ||
+                    node.Kind == SyntaxKind.MarkupEndTag ||
                     node.Kind == SyntaxKind.MarkupAttributeBlock ||
                     node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
                     node.Kind == SyntaxKind.MarkupTagHelperAttribute ||
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 1e88100c46..22d088d7d5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -13,6 +13,7 @@ using System.Text;
 using Xunit;
 using Xunit.Sdk;
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -240,6 +241,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
             codeDocument.SetSyntaxTree(syntaxTree);
 
+            // Group markup elements
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+
             var defaultDirectivePass = new DefaultDirectiveSyntaxTreePass();
             syntaxTree = defaultDirectivePass.Execute(codeDocument, syntaxTree);
 
@@ -267,6 +271,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
 
+            // Group markup elements
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+
             return syntaxTree;
         }
 
@@ -300,6 +307,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
 
+            // Group markup elements
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+
             return syntaxTree;
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
index 3d1faba30e..0974b6a7b9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
@@ -203,7 +203,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         {
             return node.Kind == SyntaxKind.MarkupTextLiteral ||
                 node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
-                node.Kind == SyntaxKind.MarkupTagBlock ||
+                node.Kind == SyntaxKind.MarkupStartTag ||
+                node.Kind == SyntaxKind.MarkupEndTag ||
                 node.Kind == SyntaxKind.MarkupAttributeBlock ||
                 node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
                 node.Kind == SyntaxKind.MarkupTagHelperAttribute ||

From 0c71f4f520f1915e405d113dd4774264c9f415fa Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 5 Dec 2018 11:48:33 -0800
Subject: [PATCH 013/337] Added test for razor comment between code block and
 markup (dotnet/aspnetcore-tooling#14)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/131003d0c33ea0f4cae0c5bb20ada98dbf54e272
---
 .../src/Legacy/HtmlMarkupParser.cs                | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index a30d5b2de1..9d7400dd11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -798,6 +798,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private void ParseRazorCommentWithLeadingAndTrailingWhitespace(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
+            if (Context.NullGenerateWhitespaceAndNewLine)
+            {
+                // Usually this is set to true when a Code block ends and there is whitespace left after it.
+                // We don't want to write it to output.
+                Context.NullGenerateWhitespaceAndNewLine = false;
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                AcceptWhile(IsSpacingToken(includeNewLines: false));
+                if (At(SyntaxKind.NewLine))
+                {
+                    AcceptAndMoveNext();
+                }
+
+                builder.Add(OutputAsMarkupEphemeralLiteral());
+            }
+
             var shouldRenderWhitespace = true;
             var lastWhitespace = AcceptWhitespaceInLines();
             var startOfLine = Context.StartOfLine;

From cf6b1d7135e1003f6839306ab214165ef1ea1154 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Thu, 6 Dec 2018 01:12:07 -0800
Subject: [PATCH 014/337] Correct logic for GetTagName \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/72a389149acd31b7e28546b004b6bb7186fbe3c6

---
 .../src/Legacy/TagHelperParseTreeRewriter.cs  |  4 +--
 .../src/Syntax/SyntaxNodeExtensions.cs        | 32 ++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index ca0bc08809..c46a0b0bab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var tagName = startTag.GetTagName();
 
                 // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
-                if (tagName == null)
+                if (tagName == null || tagName.StartsWith("!"))
                 {
                     return false;
                 }
@@ -288,7 +288,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 rewritten = null;
                 var tagName = tagBlock.GetTagName();
                 // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
-                if (tagName == null)
+                if (tagName == null || tagName.StartsWith("!"))
                 {
                     return false;
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index 521bb4ed79..b696e221da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -243,15 +243,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 throw new ArgumentNullException(nameof(tagBlock));
             }
 
-            if (tagBlock.Children.Count == 0 || !(tagBlock.Children[0] is MarkupTextLiteralSyntax childLiteral))
+            MarkupTextLiteralSyntax nameLiteral = null;
+            var isBangTag = false;
+            if (tagBlock.Children.Count > 0 && tagBlock.Children[0] is MarkupTextLiteralSyntax firstChild)
+            {
+                if (firstChild.GetContent().StartsWith("<") &&
+                    tagBlock.Children.Count >= 3 &&
+                    tagBlock.Children[1] is RazorMetaCodeSyntax &&
+                    tagBlock.Children[2] is MarkupTextLiteralSyntax potentialBangTagName)
+                {
+                    isBangTag = true;
+                    nameLiteral = potentialBangTagName;
+                }
+                else
+                {
+                    nameLiteral = firstChild;
+                }
+            }
+
+            if (nameLiteral == null)
             {
                 return null;
             }
 
             SyntaxToken textToken = null;
-            for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
+            for (var i = 0; i < nameLiteral.LiteralTokens.Count; i++)
             {
-                var token = childLiteral.LiteralTokens[i];
+                var token = nameLiteral.LiteralTokens[i];
 
                 if (token != null &&
                     (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
@@ -266,7 +284,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 return null;
             }
 
-            return textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+            var name = textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+            if (name != null && isBangTag)
+            {
+                name = "!" + name;
+            }
+
+            return name;
         }
 
         public static bool IsSelfClosing(this MarkupTagBlockSyntax tagBlock)

From 9f93a212f0633e5ea5563a07c6adf08774617edb Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 6 Dec 2018 16:07:17 -0800
Subject: [PATCH 015/337] Partially moved tag grouping logic to the parser
 (dotnet/aspnetcore-tooling#20)

* Partially moved tag grouping logic to the parser
- Added StackGuard

* Feedback

* More feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0a37f5dafaaf16a61a3c032f439a7a09ed1e5afd
---
 .../src/Legacy/HtmlMarkupParser.cs            | 183 +++++++++++++++---
 .../InternalSyntax/SyntaxListBuilderOfT.cs    |   7 +
 .../src/Syntax/StackGuard.cs                  |  30 +++
 .../src/Syntax/SyntaxRewriter.cs              |  20 ++
 .../src/Syntax/SyntaxWalker.cs                |  12 +-
 5 files changed, 220 insertions(+), 32 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/StackGuard.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 9d7400dd11..919c314d56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     internal partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
     {
         private const string ScriptTagName = "script";
+        private static readonly SyntaxList<RazorSyntaxNode> EmptySyntaxList = new SyntaxListBuilder<RazorSyntaxNode>(0).ToList();
 
         private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' };
         private static readonly SyntaxToken[] nonAllowedHtmlCommentEnding = new[]
@@ -21,11 +22,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
         };
 
+        private Stack<TagTracker> _tagTracker = new Stack<TagTracker>();
+
         public HtmlMarkupParser(ParserContext context)
             : base(context.ParseLeadingDirectives ? FirstDirectiveHtmlLanguageCharacteristics.Instance : HtmlLanguageCharacteristics.Instance, context)
         {
         }
 
+        private TagTracker CurrentTracker => _tagTracker.Count > 0 ? _tagTracker.Peek() : null;
+
+        private string CurrentStartTagName => CurrentTracker?.TagName;
+
+        private SourceLocation CurrentStartTagLocation => CurrentTracker?.TagLocation ?? SourceLocation.Undefined;
+
         public CSharpCodeParser CodeParser { get; set; }
 
         public RazorDocumentSyntax ParseDocument()
@@ -45,6 +54,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 AcceptMarkerTokenIfNecessary();
                 builder.Add(OutputAsMarkupLiteral());
 
+                // If we are still tracking any unclosed start tags, we need to close them.
+                while (_tagTracker.Count > 0)
+                {
+                    var tracker = _tagTracker.Pop();
+                    var element = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
+                    builder.AddRange(tracker.PreviousNodes);
+                    builder.Add(element);
+                }
+
                 var markup = SyntaxFactory.MarkupBlock(builder.ToList());
 
                 return SyntaxFactory.RazorDocument(markup);
@@ -71,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     ParseMarkupText(builder);
                     break;
                 case ParserState.Tag:
-                    ParseMarkupElement(builder);
+                    ParseMarkupElement(builder, mode);
                     break;
                 case ParserState.SpecialTag:
                     ParseSpecialTag(builder);
@@ -111,7 +129,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             AcceptAndMoveNext();
         }
 
-        private void ParseMarkupElement(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        private void ParseMarkupElement(in SyntaxListBuilder<RazorSyntaxNode> builder, ParseMode mode)
         {
             Assert(SyntaxKind.OpenAngle);
 
@@ -121,47 +139,101 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             if (!NextIs(SyntaxKind.ForwardSlash))
             {
                 // Parsing a start tag
+                var tagStart = CurrentStart;
                 var startTag = ParseStartTag(out var tagName, out var tagMode);
-                builder.Add(startTag);
-
                 if (tagMode == MarkupTagMode.Script)
                 {
-                    ParseJavascriptAndEndScriptTag(builder);
+                    ParseJavascriptAndEndScriptTag(builder, startTag);
                     return;
                 }
-                else if (tagMode != MarkupTagMode.Void && tagMode != MarkupTagMode.SelfClosing)
+                else if (tagMode == MarkupTagMode.SelfClosing || tagMode == MarkupTagMode.Invalid)
                 {
-                    var body = ParseTagBody(tagName, out var seenEndTag);
-                    if (body != null)
-                    {
-                        builder.AddRange(body);
-                    }
-
-                    if (seenEndTag)
-                    {
-                        var endTag = ParseEndTag();
-                        builder.Add(endTag);
-                    }
+                    // For cases like <foo /> or invalid cases like |<|<p>
+                    var element = SyntaxFactory.MarkupElement(startTag, EmptySyntaxList, endTag: null);
+                    builder.Add(element);
+                    return;
+                }
+                else
+                {
+                    // This is a normal start tag. We need to keep track of it.
+                    var tracker = new TagTracker(tagName, startTag, tagStart, builder.Consume());
+                    _tagTracker.Push(tracker);
+                    return;
                 }
             }
             else
             {
                 // Parsing an end tag.
-                var endTag = ParseEndTag();
-                builder.Add(endTag);
+                var endTag = ParseEndTag(out var endTagName);
+                if (endTagName != null && string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Happy path. Found a matching start tag. Create the element and reset the builder.
+                    var tracker = _tagTracker.Pop();
+                    var element = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag);
+                    builder.AddRange(tracker.PreviousNodes);
+                    builder.Add(element);
+                    return;
+                }
+                else
+                {
+                    // Current tag scope does not match the end tag. Attempt to recover the start tag
+                    // by looking up the previous tag scopes for a matching start tag.
+                    if (!TryRecoverStartTag(builder, endTagName, endTag))
+                    {
+                        // Could not recover.
+                        var element = SyntaxFactory.MarkupElement(startTag: null, body: EmptySyntaxList, endTag: endTag);
+                        builder.Add(element);
+                    }
+                }
             }
         }
 
-        private MarkupTagBlockSyntax ParseStartTag(out string tagName, out MarkupTagMode tagMode)
+        private bool TryRecoverStartTag(in SyntaxListBuilder<RazorSyntaxNode> builder, string endTagName, MarkupEndTagSyntax endTag)
+        {
+            var malformedTagCount = 0;
+            foreach (var tag in _tagTracker)
+            {
+                if (string.Equals(tag.TagName, endTagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    break;
+                }
+
+                malformedTagCount++;
+            }
+
+            if (malformedTagCount != _tagTracker.Count)
+            {
+                // This means we found a matching tag.
+                for (var i = 0; i < malformedTagCount; i++)
+                {
+                    var tracker = _tagTracker.Pop();
+                    var malformedElement = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
+                    builder.AddRange(tracker.PreviousNodes);
+                    builder.Add(malformedElement);
+                }
+
+                // Now complete our target tag which is not malformed.
+                var tagTracker = _tagTracker.Pop();
+                var element = SyntaxFactory.MarkupElement(tagTracker.StartTag, builder.Consume(), endTag);
+                builder.AddRange(tagTracker.PreviousNodes);
+                builder.Add(element);
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private MarkupStartTagSyntax ParseStartTag(out string tagName, out MarkupTagMode tagMode)
         {
             tagName = null;
-            tagMode = MarkupTagMode.Normal;
+            tagMode = MarkupTagMode.Invalid;
             using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
                 var tagBuilder = pooledResult.Builder;
 
                 AcceptAndMoveNext(); // Accept '<'
-                TryParseBangEscape(tagBuilder);
+                var isBangEscape = TryParseBangEscape(tagBuilder);
 
                 if (At(SyntaxKind.Text))
                 {
@@ -171,6 +243,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         // This is a void element.
                         tagMode = MarkupTagMode.Void;
                     }
+                    else
+                    {
+                        tagMode = MarkupTagMode.Normal;
+                    }
+
+                    if (isBangEscape)
+                    {
+                        // We don't want to group <p> and </!p> together.
+                        tagName = "!" + tagName;
+                    }
                 }
                 TryAccept(SyntaxKind.Text);
 
@@ -189,7 +271,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 // End tag block
                 tagBuilder.Add(OutputAsMarkupLiteral());
-                var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                var tagBlock = SyntaxFactory.MarkupStartTag(tagBuilder.ToList());
                 if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
                 {
                     // If the script tag expects javascript content then we should do minimal parsing until we reach
@@ -204,11 +286,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private MarkupTagBlockSyntax ParseEndTag()
+        private MarkupEndTagSyntax ParseEndTag(out string tagName)
         {
             // This section can accept things like: '</p  >' or '</p>' etc.
             Assert(SyntaxKind.OpenAngle);
 
+            tagName = null;
+
             using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
                 var tagBuilder = pooledResult.Builder;
@@ -217,14 +301,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 TryAccept(SyntaxKind.ForwardSlash);
 
                 // Whitespace here is invalid (according to the spec)
-                TryParseBangEscape(tagBuilder);
-                TryAccept(SyntaxKind.Text);
+                var isBangEscape = TryParseBangEscape(tagBuilder);
+                if (At(SyntaxKind.Text))
+                {
+                    tagName = isBangEscape ? "!" : string.Empty;
+                    tagName += CurrentToken.Content;
+                    AcceptAndMoveNext();
+                }
                 TryAccept(SyntaxKind.Whitespace);
                 TryAccept(SyntaxKind.CloseAngle);
 
                 // End tag block
                 tagBuilder.Add(OutputAsMarkupLiteral());
-                var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                var tagBlock = SyntaxFactory.MarkupEndTag(tagBuilder.ToList());
                 return tagBlock;
             }
         }
@@ -598,8 +687,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                    token.Kind == SyntaxKind.NewLine;
         }
 
-        private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
+        private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode> builder, MarkupStartTagSyntax startTag, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
         {
+            var previousNodes = builder.Consume();
+
             // Special case for <script>: Skip to end of script tag and parse code
             var seenEndScript = false;
 
@@ -637,6 +728,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
+            MarkupEndTagSyntax endTag = null;
             if (seenEndScript)
             {
                 var tagStart = CurrentStart;
@@ -660,9 +752,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         Accept(closeAngle);
                     }
                     tagBuilder.Add(OutputAsMarkupLiteral());
-                    builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+                    endTag = SyntaxFactory.MarkupEndTag(tagBuilder.ToList());
                 }
             }
+
+            var element = SyntaxFactory.MarkupElement(startTag, builder.Consume(), endTag);
+            builder.AddRange(previousNodes);
+            builder.Add(element);
         }
 
         private bool ParseSpecialTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
@@ -878,7 +974,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             AcceptWhile(IsSpacingToken(includeNewLines: true));
         }
 
-        private bool ScriptTagExpectsHtml(MarkupTagBlockSyntax tagBlock)
+        private bool ScriptTagExpectsHtml(MarkupStartTagSyntax tagBlock)
         {
             MarkupAttributeBlockSyntax typeAttribute = null;
             for (var i = 0; i < tagBlock.Children.Count; i++)
@@ -1283,6 +1379,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private enum ParseMode
         {
             Markup,
+            MarkupInCodeBlock,
             Text,
         }
 
@@ -1291,7 +1388,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Normal,
             Void,
             SelfClosing,
-            Script
+            Script,
+            Invalid,
+        }
+
+        private class TagTracker
+        {
+            public TagTracker(
+                string tagName,
+                MarkupStartTagSyntax startTag,
+                SourceLocation tagLocation,
+                SyntaxList<RazorSyntaxNode> previousNodes)
+            {
+                TagName = tagName;
+                StartTag = startTag;
+                TagLocation = tagLocation;
+                PreviousNodes = previousNodes;
+            }
+
+            public string TagName { get; }
+
+            public MarkupStartTagSyntax StartTag { get; }
+
+            public SourceLocation TagLocation { get; }
+
+            public SyntaxList<RazorSyntaxNode> PreviousNodes { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
index 65a11313f6..d880bb842d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
@@ -87,6 +87,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
             return _builder.ToList<TNode>();
         }
 
+        public SyntaxList<TNode> Consume()
+        {
+            var list = ToList();
+            Clear();
+            return list;
+        }
+
         public GreenNode ToListNode()
         {
             return _builder.ToListNode();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/StackGuard.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/StackGuard.cs
new file mode 100644
index 0000000000..955dae602a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/StackGuard.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class StackGuard
+    {
+        public const int MaxUncheckedRecursionDepth = 20;
+
+        /// <summary>
+        ///     Ensures that the remaining stack space is large enough to execute
+        ///     the average function.
+        /// </summary>
+        /// <param name="recursionDepth">how many times the calling function has recursed</param>
+        /// <exception cref="InsufficientExecutionStackException">
+        ///     The available stack space is insufficient to execute
+        ///     the average function.
+        /// </exception>
+        public static void EnsureSufficientExecutionStack(int recursionDepth)
+        {
+            if (recursionDepth > MaxUncheckedRecursionDepth)
+            {
+                RuntimeHelpers.EnsureSufficientExecutionStack();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs
index d491bd0e88..2fd26e349d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxRewriter.cs
@@ -7,6 +7,26 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 {
     internal abstract partial class SyntaxRewriter : SyntaxVisitor<SyntaxNode>
     {
+        private int _recursionDepth;
+
+        public override SyntaxNode Visit(SyntaxNode node)
+        {
+            if (node != null)
+            {
+                _recursionDepth++;
+                StackGuard.EnsureSufficientExecutionStack(_recursionDepth);
+
+                var result = node.Accept(this);
+
+                _recursionDepth--;
+                return result;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         public override SyntaxNode VisitToken(SyntaxToken token)
         {
             // PERF: This is a hot method, so it has been written to minimize the following:
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs
index 214a0039fe..456400864a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxWalker.cs
@@ -9,9 +9,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     /// </summary>
     internal abstract class SyntaxWalker : SyntaxVisitor
     {
+        private int _recursionDepth;
+
         public override void Visit(SyntaxNode node)
         {
-            node?.Accept(this);
+            if (node != null)
+            {
+                _recursionDepth++;
+                StackGuard.EnsureSufficientExecutionStack(_recursionDepth);
+
+                node.Accept(this);
+
+                _recursionDepth--;
+            }
         }
 
         public override void DefaultVisit(SyntaxNode node)

From 910565362937b071b72f0a47bd1df91cc05458c1 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 11 Dec 2018 18:24:39 -0800
Subject: [PATCH 016/337] Completely moved tag grouping logic to the parser
 (dotnet/aspnetcore-tooling#28)

* Completely moved tag grouping logic to the parser
- Removed MarkupElementRewriter
- Removed legacy Html parser
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c98b2fe1be5a715afeca68cdd2d4e770b6a5f65b
---
 .../src/DefaultDirectiveSyntaxTreePass.cs     |   23 +-
 .../src/Legacy/HtmlMarkupParser.Legacy.cs     | 1366 -----------------
 .../src/Legacy/HtmlMarkupParser.cs            |  727 ++++++++-
 .../src/Legacy/RazorParser.cs                 |    3 -
 .../src/Properties/Resources.Designer.cs      |   14 +
 .../src/RazorDiagnosticFactory.cs             |   17 +-
 .../src/Resources.resx                        |    3 +
 .../src/Syntax/MarkupElementRewriter.cs       |  273 ----
 .../Language/Legacy/ParserTestBase.cs         |    9 -
 9 files changed, 752 insertions(+), 1683 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
index 65e578b5ce..8455c9e197 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
@@ -2,9 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -33,19 +32,37 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             private int _nestedLevel;
             private RazorSyntaxTree _syntaxTree;
+            private List<RazorDiagnostic> _diagnostics;
 
             public NestedSectionVerifier(RazorSyntaxTree syntaxTree)
             {
                 _syntaxTree = syntaxTree;
+                _diagnostics = new List<RazorDiagnostic>(syntaxTree.Diagnostics);
             }
 
             public RazorSyntaxTree Verify()
             {
                 var root = Visit(_syntaxTree.Root);
-                var rewrittenTree = new DefaultRazorSyntaxTree(root, _syntaxTree.Source, _syntaxTree.Diagnostics, _syntaxTree.Options);
+                var rewrittenTree = new DefaultRazorSyntaxTree(root, _syntaxTree.Source, _diagnostics, _syntaxTree.Options);
                 return rewrittenTree;
             }
 
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                try
+                {
+                    return base.Visit(node);
+                }
+                catch (InsufficientExecutionStackException)
+                {
+                    // We're very close to reaching the stack limit. Let's not go any deeper.
+                    // It's okay to not show nested section errors in deeply nested cases instead of crashing.
+                    _diagnostics.Add(RazorDiagnosticFactory.CreateRewriter_InsufficientStack(SourceSpan.Undefined));
+
+                    return node;
+                }
+            }
+
             public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
             {
                 if (_nestedLevel > 0)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
deleted file mode 100644
index e858000fac..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.Legacy.cs
+++ /dev/null
@@ -1,1366 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
-    {
-        private SourceLocation _lastTagStart = SourceLocation.Zero;
-        private SyntaxToken _bufferedOpenAngle;
-
-        private bool CaseSensitive { get; set; }
-
-        private StringComparison Comparison
-        {
-            get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; }
-        }
-
-        // Special tags include <!--, <!DOCTYPE, <![CDATA and <? tags
-        private bool AtSpecialTag
-        {
-            get
-            {
-                if (At(SyntaxKind.OpenAngle))
-                {
-                    if (NextIs(SyntaxKind.Bang))
-                    {
-                        return !IsBangEscape(lookahead: 1);
-                    }
-
-                    return NextIs(SyntaxKind.QuestionMark);
-                }
-
-                return false;
-            }
-        }
-
-        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind type)
-        {
-            SkipToAndParseCode(builder, token => token.Kind == type);
-        }
-
-        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, Func<SyntaxToken, bool> condition)
-        {
-            SyntaxToken last = null;
-            var startOfLine = false;
-            while (!EndOfFile && !condition(CurrentToken))
-            {
-                if (Context.NullGenerateWhitespaceAndNewLine)
-                {
-                    Context.NullGenerateWhitespaceAndNewLine = false;
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                    AcceptWhile(token => token.Kind == SyntaxKind.Whitespace);
-                    if (At(SyntaxKind.NewLine))
-                    {
-                        AcceptAndMoveNext();
-                    }
-
-                    builder.Add(OutputAsMarkupEphemeralLiteral());
-                }
-                else if (At(SyntaxKind.NewLine))
-                {
-                    if (last != null)
-                    {
-                        Accept(last);
-                    }
-
-                    // Mark the start of a new line
-                    startOfLine = true;
-                    last = null;
-                    AcceptAndMoveNext();
-                }
-                else if (At(SyntaxKind.Transition))
-                {
-                    var transition = CurrentToken;
-                    NextToken();
-                    if (At(SyntaxKind.Transition))
-                    {
-                        if (last != null)
-                        {
-                            Accept(last);
-                            last = null;
-                        }
-                        builder.Add(OutputAsMarkupLiteral());
-                        Accept(transition);
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        builder.Add(OutputAsMarkupEphemeralLiteral());
-                        AcceptAndMoveNext();
-                        continue; // while
-                    }
-                    else
-                    {
-                        if (!EndOfFile)
-                        {
-                            PutCurrentBack();
-                        }
-                        PutBack(transition);
-                    }
-
-                    // Handle whitespace rewriting
-                    if (last != null)
-                    {
-                        if (!Context.DesignTimeMode && last.Kind == SyntaxKind.Whitespace && startOfLine)
-                        {
-                            // Put the whitespace back too
-                            startOfLine = false;
-                            PutBack(last);
-                            last = null;
-                        }
-                        else
-                        {
-                            // Accept last
-                            Accept(last);
-                            last = null;
-                        }
-                    }
-
-                    OtherParserBlock(builder);
-                }
-                else if (At(SyntaxKind.RazorCommentTransition))
-                {
-                    var shouldRenderWhitespace = true;
-                    if (last != null)
-                    {
-                        // Don't render the whitespace between the start of the line and the razor comment.
-                        if (startOfLine && last.Kind == SyntaxKind.Whitespace)
-                        {
-                            AcceptMarkerTokenIfNecessary();
-                            // Output the tokens that may have been accepted prior to the whitespace.
-                            builder.Add(OutputAsMarkupLiteral());
-
-                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                            shouldRenderWhitespace = false;
-                        }
-
-                        Accept(last);
-                        last = null;
-                    }
-
-                    AcceptMarkerTokenIfNecessary();
-                    if (shouldRenderWhitespace)
-                    {
-                        builder.Add(OutputAsMarkupLiteral());
-                    }
-                    else
-                    {
-                        builder.Add(OutputAsMarkupEphemeralLiteral());
-                    }
-
-                    var comment = ParseRazorComment();
-                    builder.Add(comment);
-
-                    // Handle the whitespace and newline at the end of a razor comment.
-                    if (startOfLine &&
-                        (At(SyntaxKind.NewLine) ||
-                        (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine))))
-                    {
-                        AcceptWhile(IsSpacingToken(includeNewLines: false));
-                        AcceptAndMoveNext();
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        builder.Add(OutputAsMarkupEphemeralLiteral());
-                    }
-                }
-                else
-                {
-                    // As long as we see whitespace, we're still at the "start" of the line
-                    startOfLine &= At(SyntaxKind.Whitespace);
-
-                    // If there's a last token, accept it
-                    if (last != null)
-                    {
-                        Accept(last);
-                        last = null;
-                    }
-
-                    // Advance
-                    last = CurrentToken;
-                    NextToken();
-                }
-            }
-
-            if (last != null)
-            {
-                Accept(last);
-            }
-        }
-
-        /// <summary>
-        /// Reads the content of a tag (if present) in the MarkupDocument (or MarkupSection) context,
-        /// where we don't care about maintaining a stack of tags.
-        /// </summary>
-        private void ParseTagInDocumentContext(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            if (At(SyntaxKind.OpenAngle))
-            {
-                if (NextIs(SyntaxKind.Bang))
-                {
-                    // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
-                    if (!IsBangEscape(lookahead: 1))
-                    {
-                        if (Lookahead(2)?.Kind == SyntaxKind.DoubleHyphen)
-                        {
-                            builder.Add(OutputAsMarkupLiteral());
-                        }
-
-                        AcceptAndMoveNext(); // Accept '<'
-                        ParseBangTag(builder);
-
-                        return;
-                    }
-
-                    // We should behave like a normal tag that has a parser escape, fall through to the normal
-                    // tag logic.
-                }
-                else if (NextIs(SyntaxKind.QuestionMark))
-                {
-                    AcceptAndMoveNext(); // Accept '<'
-                    TryParseXmlPI(builder);
-                    return;
-                }
-
-                builder.Add(OutputAsMarkupLiteral());
-
-                // Start tag block
-                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                {
-                    var tagBuilder = pooledResult.Builder;
-                    AcceptAndMoveNext(); // Accept '<'
-
-                    if (!At(SyntaxKind.ForwardSlash))
-                    {
-                        TryParseBangEscape(tagBuilder);
-
-                        // Parsing a start tag
-                        var scriptTag = At(SyntaxKind.Text) &&
-                                        string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
-                        TryAccept(SyntaxKind.Text);
-                        // Output open angle and tag name
-                        tagBuilder.Add(OutputAsMarkupLiteral());
-                        ParseAttributes(tagBuilder); // Parse the tag, don't care about the content
-                        TryAccept(SyntaxKind.ForwardSlash);
-                        TryAccept(SyntaxKind.CloseAngle);
-
-                        // If the script tag expects javascript content then we should do minimal parsing until we reach
-                        // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
-                        if (scriptTag && !CurrentScriptTagExpectsHtml(tagBuilder))
-                        {
-                            tagBuilder.Add(OutputAsMarkupLiteral());
-                            var block = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
-                            builder.Add(block);
-
-                            SkipToEndScriptAndParseCode(builder);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        // Parsing an end tag
-                        // This section can accept things like: '</p  >' or '</p>' etc.
-                        TryAccept(SyntaxKind.ForwardSlash);
-
-                        // Whitespace here is invalid (according to the spec)
-                        TryParseBangEscape(tagBuilder);
-                        TryAccept(SyntaxKind.Text);
-                        TryAccept(SyntaxKind.Whitespace);
-                        TryAccept(SyntaxKind.CloseAngle);
-                    }
-
-                    tagBuilder.Add(OutputAsMarkupLiteral());
-
-                    // End tag block
-                    var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
-                    builder.Add(tagBlock);
-                }
-            }
-        }
-
-        private bool ParseBangTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Accept "!"
-            Assert(SyntaxKind.Bang);
-
-            if (AcceptAndMoveNext())
-            {
-                if (LegacyIsHtmlCommentAhead())
-                {
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var htmlCommentBuilder = pooledResult.Builder;
-
-                        // Accept the double-hyphen token at the beginning of the comment block.
-                        AcceptAndMoveNext();
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
-
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
-                        while (!EndOfFile)
-                        {
-                            SkipToAndParseCode(htmlCommentBuilder, SyntaxKind.DoubleHyphen);
-                            var lastDoubleHyphen = AcceptAllButLastDoubleHyphens();
-
-                            if (At(SyntaxKind.CloseAngle))
-                            {
-                                // Output the content in the comment block as a separate markup
-                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
-                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
-
-                                // This is the end of a comment block
-                                Accept(lastDoubleHyphen);
-                                AcceptAndMoveNext();
-                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
-                                var commentBlock = SyntaxFactory.MarkupCommentBlock(htmlCommentBuilder.ToList());
-                                builder.Add(commentBlock);
-                                return true;
-                            }
-                            else if (lastDoubleHyphen != null)
-                            {
-                                Accept(lastDoubleHyphen);
-                            }
-                        }
-                    }
-                }
-                else if (CurrentToken.Kind == SyntaxKind.LeftBracket)
-                {
-                    if (AcceptAndMoveNext())
-                    {
-                        return TryParseCData(builder);
-                    }
-                }
-                else
-                {
-                    AcceptAndMoveNext();
-                    return LegacyAcceptTokenUntilAll(builder, SyntaxKind.CloseAngle);
-                }
-            }
-
-            return false;
-        }
-
-        protected bool LegacyIsHtmlCommentAhead()
-        {
-            // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
-
-            // Comments must have the following format:
-            // 1. The string "<!--"
-            // 2. Optionally, text, with the additional restriction that the text
-            //      2.1 must not start with the string ">" nor start with the string "->"
-            //      2.2 nor contain the strings
-            //          2.2.1 "<!--"
-            //          2.2.2 "-->" As we will be treating this as a comment ending, there is no need to handle this case at all.
-            //          2.2.3 "--!>"
-            //      2.3 nor end with the string "<!-".
-            // 3. The string "-->"
-
-            if (CurrentToken.Kind != SyntaxKind.DoubleHyphen)
-            {
-                return false;
-            }
-
-            // Check condition 2.1
-            if (NextIs(SyntaxKind.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(SyntaxKind.CloseAngle)))
-            {
-                return false;
-            }
-
-            // Check condition 2.2
-            var isValidComment = false;
-            LookaheadUntil((token, prevTokens) =>
-            {
-                if (token.Kind == SyntaxKind.DoubleHyphen)
-                {
-                    if (NextIs(SyntaxKind.CloseAngle))
-                    {
-                        // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
-                        isValidComment = !IsCommentContentEndingInvalid(prevTokens);
-                        return true;
-                    }
-                    else if (NextIs(ns => IsHyphen(ns) && NextIs(SyntaxKind.CloseAngle)))
-                    {
-                        // Check condition 2.3: we're at the end of a comment, which has an extra dash.
-                        // Need to treat the dash as part of the content and check the ending.
-                        // However, that case would have already been checked as part of check from 2.2.1 which
-                        // would already fail this iteration and we wouldn't get here
-                        isValidComment = true;
-                        return true;
-                    }
-                    else if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.CloseAngle)))
-                    {
-                        // This is condition 2.2.3
-                        isValidComment = false;
-                        return true;
-                    }
-                }
-                else if (token.Kind == SyntaxKind.OpenAngle)
-                {
-                    // Checking condition 2.2.1
-                    if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.DoubleHyphen)))
-                    {
-                        isValidComment = false;
-                        return true;
-                    }
-                }
-
-                return false;
-            });
-
-            return isValidComment;
-        }
-
-        private bool TryParseCData(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            if (CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
-            {
-                if (AcceptAndMoveNext())
-                {
-                    if (CurrentToken.Kind == SyntaxKind.LeftBracket)
-                    {
-                        return LegacyAcceptTokenUntilAll(builder, SyntaxKind.RightBracket, SyntaxKind.RightBracket, SyntaxKind.CloseAngle);
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        private bool TryParseXmlPI(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Accept "?"
-            Assert(SyntaxKind.QuestionMark);
-            AcceptAndMoveNext();
-            return LegacyAcceptTokenUntilAll(builder, SyntaxKind.QuestionMark, SyntaxKind.CloseAngle);
-        }
-
-        private void SkipToEndScriptAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
-        {
-            // Special case for <script>: Skip to end of script tag and parse code
-            var seenEndScript = false;
-
-            while (!seenEndScript && !EndOfFile)
-            {
-                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
-                var tagStart = CurrentStart;
-
-                if (NextIs(SyntaxKind.ForwardSlash))
-                {
-                    var openAngle = CurrentToken;
-                    NextToken(); // Skip over '<', current is '/'
-                    var solidus = CurrentToken;
-                    NextToken(); // Skip over '/', current should be text
-
-                    if (At(SyntaxKind.Text) &&
-                        string.Equals(CurrentToken.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        seenEndScript = true;
-                    }
-
-                    // We put everything back because we just wanted to look ahead to see if the current end tag that we're parsing is
-                    // the script tag.  If so we'll generate correct code to encompass it.
-                    PutCurrentBack(); // Put back whatever was after the solidus
-                    PutBack(solidus); // Put back '/'
-                    PutBack(openAngle); // Put back '<'
-
-                    // We just looked ahead, this NextToken will set CurrentToken to an open angle bracket.
-                    NextToken();
-                }
-
-                if (seenEndScript)
-                {
-                    builder.Add(OutputAsMarkupLiteral());
-
-                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                    {
-                        var tagBuilder = pooledResult.Builder;
-                        SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
-
-                        AcceptAndMoveNext(); // '<'
-                        AcceptAndMoveNext(); // '/'
-                        SkipToAndParseCode(tagBuilder, SyntaxKind.CloseAngle);
-                        if (!TryAccept(SyntaxKind.CloseAngle))
-                        {
-                            Context.ErrorSink.OnError(
-                                RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
-                                    new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
-                                    ScriptTagName));
-                            var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
-                            Accept(closeAngle);
-                        }
-                        tagBuilder.Add(OutputAsMarkupLiteral());
-                        builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
-                    }
-                }
-                else
-                {
-                    AcceptAndMoveNext(); // Accept '<' (not the closing script tag's open angle)
-                }
-            }
-        }
-
-        private bool CurrentScriptTagExpectsHtml(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            Debug.Assert(!builder.IsNull);
-
-            MarkupAttributeBlockSyntax typeAttribute = null;
-            for (var i = 0; i < builder.Count; i++)
-            {
-                var node = builder[i];
-                if (node.IsToken || node.IsTrivia)
-                {
-                    continue;
-                }
-
-                if (node is MarkupAttributeBlockSyntax attributeBlock &&
-                    attributeBlock.Value.Children.Count > 0 &&
-                    IsTypeAttribute(attributeBlock))
-                {
-                    typeAttribute = attributeBlock;
-                    break;
-                }
-            }
-
-            if (typeAttribute != null)
-            {
-                var contentValues = typeAttribute.Value.CreateRed().DescendantNodes().Where(n => n.IsToken).Cast<Syntax.SyntaxToken>();
-
-                var scriptType = string.Concat(contentValues.Select(t => t.Content)).Trim();
-
-                // Does not allow charset parameter (or any other parameters).
-                return string.Equals(scriptType, "text/html", StringComparison.OrdinalIgnoreCase);
-            }
-
-            return false;
-        }
-
-        private bool LegacyAcceptTokenUntilAll(in SyntaxListBuilder<RazorSyntaxNode> builder, params SyntaxKind[] endSequence)
-        {
-            while (!EndOfFile)
-            {
-                SkipToAndParseCode(builder, endSequence[0]);
-                if (AcceptAll(endSequence))
-                {
-                    return true;
-                }
-            }
-            Debug.Assert(EndOfFile);
-            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-            return false;
-        }
-
-        public MarkupBlockSyntax ParseBlock()
-        {
-            if (Context == null)
-            {
-                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-            }
-
-            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-            using (PushSpanContextConfig(DefaultMarkupSpanContext))
-            {
-                var builder = pooledResult.Builder;
-                if (!NextToken())
-                {
-                    return null;
-                }
-
-                AcceptWhile(IsSpacingToken(includeNewLines: true));
-
-                if (CurrentToken.Kind == SyntaxKind.OpenAngle)
-                {
-                    // "<" => Implicit Tag Block
-                    ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
-                }
-                else if (CurrentToken.Kind == SyntaxKind.Transition)
-                {
-                    // "@" => Explicit Tag/Single Line Block OR Template
-
-                    // Output whitespace
-                    builder.Add(OutputAsMarkupLiteral());
-
-                    // Definitely have a transition span
-                    Assert(SyntaxKind.Transition);
-                    AcceptAndMoveNext();
-                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                    var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-                    builder.Add(transition);
-                    if (At(SyntaxKind.Transition))
-                    {
-                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                        AcceptAndMoveNext();
-                        builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
-                    }
-                    ParseAfterTransition(builder);
-                }
-                else
-                {
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
-                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
-                }
-                builder.Add(OutputAsMarkupLiteral());
-
-                var markupBlock = builder.ToList();
-
-                return SyntaxFactory.MarkupBlock(markupBlock);
-            }
-        }
-
-        private void ParseAfterTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // "@:" => Explicit Single Line Block
-            if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
-            {
-                // Split the token
-                var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
-
-                // The first part (left) is added to this span and we return a MetaCode span
-                Accept(split.Item1);
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
-                if (split.Item2 != null)
-                {
-                    Accept(split.Item2);
-                }
-                NextToken();
-                ParseSingleLineMarkup(builder);
-            }
-            else if (CurrentToken.Kind == SyntaxKind.OpenAngle)
-            {
-                ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
-            }
-        }
-
-        private void ParseSingleLineMarkup(in SyntaxListBuilder<RazorSyntaxNode> builder)
-        {
-            // Parse until a newline, it's that simple!
-            // First, signal to code parser that whitespace is significant to us.
-            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
-            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
-            SpanContext.EditHandler = new SpanEditHandler(Language.TokenizeString);
-            SkipToAndParseCode(builder, SyntaxKind.NewLine);
-            if (!EndOfFile && CurrentToken.Kind == SyntaxKind.NewLine)
-            {
-                AcceptAndMoveNext();
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-            PutCurrentBack();
-            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
-            builder.Add(OutputAsMarkupLiteral());
-        }
-
-        private void ParseTagBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            // TODO: This is really ugly and needs to be cleaned up.
-
-            // Skip Whitespace and Text
-            var completeTag = false;
-            var blockAlreadyBuilt = false;
-            do
-            {
-                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
-
-                // Output everything prior to the OpenAngle into a markup span
-                builder.Add(OutputAsMarkupLiteral());
-
-                var tagBuilder = builder;
-                IDisposable tagBuilderDisposable = null;
-                try
-                {
-                    if (EndOfFile)
-                    {
-                        // Do not want to start a new tag block if we're at the end of the file.
-                        EndTagBlock(builder, tags, complete: true);
-                    }
-                    else
-                    {
-                        var atSpecialTag = AtSpecialTag;
-                        if (!atSpecialTag)
-                        {
-                            // Start a tag block.  This is used to wrap things like <p> or <a class="btn"> etc.
-                            var pooledResult = Pool.Allocate<RazorSyntaxNode>();
-                            tagBuilderDisposable = pooledResult;
-                            tagBuilder = pooledResult.Builder;
-                        }
-                        _bufferedOpenAngle = null;
-                        _lastTagStart = CurrentStart;
-                        Assert(SyntaxKind.OpenAngle);
-                        _bufferedOpenAngle = CurrentToken;
-                        var tagStart = CurrentStart;
-                        if (!NextToken())
-                        {
-                            Accept(_bufferedOpenAngle);
-                            EndTagBlock(tagBuilder, tags, complete: false);
-                        }
-                        else if (atSpecialTag && At(SyntaxKind.Bang))
-                        {
-                            Accept(_bufferedOpenAngle);
-                            completeTag = ParseBangTag(builder);
-                            blockAlreadyBuilt = completeTag;
-                        }
-                        else
-                        {
-                            var result = ParseAfterTagStart(tagBuilder, builder, tagStart, tags);
-                            completeTag = result.Item1;
-                            blockAlreadyBuilt = result.Item2;
-                        }
-                    }
-
-                    if (completeTag)
-                    {
-                        // Completed tags have no accepted characters inside of blocks.
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                    }
-
-                    if (blockAlreadyBuilt)
-                    {
-                        // Output the contents of the tag into its own markup span.
-                        builder.Add(OutputAsMarkupLiteral());
-                    }
-                    else if (tagBuilderDisposable != null)
-                    {
-                        // A new tag block was started. Build it.
-                        // Output the contents of the tag into its own markup span.
-                        tagBuilder.Add(OutputAsMarkupLiteral());
-                        var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
-                        builder.Add(tagBlock);
-                    }
-                }
-                finally
-                {
-                    // Will be null if we were at end of file or special tag when initially created.
-                    if (tagBuilderDisposable != null)
-                    {
-                        // End tag block
-                        tagBuilderDisposable.Dispose();
-                    }
-                }
-            }
-            while (tags.Count > 0);
-
-            EndTagBlock(builder, tags, completeTag);
-        }
-
-        private Tuple<bool, bool> ParseAfterTagStart(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            SourceLocation tagStart,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            var blockAlreadyBuilt = false;
-            if (!EndOfFile)
-            {
-                switch (CurrentToken.Kind)
-                {
-                    case SyntaxKind.ForwardSlash:
-                        // End Tag
-                        return ParseEndTag(builder, parentBuilder, tagStart, tags);
-                    case SyntaxKind.QuestionMark:
-                        // XML PI
-                        Accept(_bufferedOpenAngle);
-                        var complete = TryParseXmlPI(builder);
-                        // No block is created for Xml PI. So return the same value as complete.
-                        blockAlreadyBuilt = complete;
-                        return Tuple.Create(complete, blockAlreadyBuilt);
-                    default:
-                        // Start Tag
-                        return ParseStartTag(builder, parentBuilder, tags);
-                }
-            }
-            if (tags.Count == 0)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_OuterTagMissingName(
-                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
-            }
-
-            return Tuple.Create(false, blockAlreadyBuilt);
-        }
-
-        private Tuple<bool, bool> ParseStartTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            SyntaxToken bangToken = null;
-            SyntaxToken potentialTagNameToken;
-
-            if (At(SyntaxKind.Bang))
-            {
-                bangToken = CurrentToken;
-
-                potentialTagNameToken = Lookahead(count: 1);
-            }
-            else
-            {
-                potentialTagNameToken = CurrentToken;
-            }
-
-            SyntaxToken tagName;
-
-            if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.Text)
-            {
-                tagName = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
-            }
-            else if (bangToken != null)
-            {
-                tagName = SyntaxFactory.Token(SyntaxKind.Text, "!" + potentialTagNameToken.Content);
-            }
-            else
-            {
-                tagName = potentialTagNameToken;
-            }
-
-            var tag = Tuple.Create(tagName, _lastTagStart);
-
-            if (tags.Count == 0 &&
-                // Note tagName may contain a '!' escape character. This ensures <!text> doesn't match here.
-                // <!text> tags are treated like any other escaped HTML start tag.
-                string.Equals(tag.Item1.Content, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
-            {
-                builder.Add(OutputAsMarkupLiteral());
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-
-                Accept(_bufferedOpenAngle);
-                var textLocation = CurrentStart;
-                Assert(SyntaxKind.Text);
-
-                AcceptAndMoveNext();
-
-                var bookmark = CurrentStart.AbsoluteIndex;
-                var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-                var empty = At(SyntaxKind.ForwardSlash);
-                if (empty)
-                {
-                    Accept(tokens);
-                    Assert(SyntaxKind.ForwardSlash);
-                    AcceptAndMoveNext();
-                    bookmark = CurrentStart.AbsoluteIndex;
-                    tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-                }
-
-                if (!TryAccept(SyntaxKind.CloseAngle))
-                {
-                    Context.Source.Position = bookmark;
-                    NextToken();
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
-
-                    RecoverTextTag();
-                }
-                else
-                {
-                    Accept(tokens);
-                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                }
-
-                if (!empty)
-                {
-                    tags.Push(tag);
-                }
-
-                var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-                builder.Add(transition);
-                var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-                parentBuilder.Add(tagBlock);
-
-                return Tuple.Create(true, true);
-            }
-
-            Accept(_bufferedOpenAngle);
-            TryParseBangEscape(builder);
-            TryAccept(SyntaxKind.Text);
-            
-            if (At(SyntaxKind.CloseAngle))
-            {
-                // Completed tags have no accepted characters inside of blocks.
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-            // Output open angle and tag name
-            builder.Add(OutputAsMarkupLiteral());
-            return ParseRestOfTag(builder, parentBuilder, tag, tags);
-        }
-
-        private Tuple<bool, bool> ParseRestOfTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            Tuple<SyntaxToken, SourceLocation> tag,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            var blockAlreadyBuilt = false;
-            ParseAttributes(builder);
-
-            // We are now at a possible end of the tag
-            // Found '<', so we just abort this tag.
-            if (At(SyntaxKind.OpenAngle))
-            {
-                return Tuple.Create(false, blockAlreadyBuilt);
-            }
-
-            var isEmpty = At(SyntaxKind.ForwardSlash);
-            // Found a solidus, so don't accept it but DON'T push the tag to the stack
-            if (isEmpty)
-            {
-                AcceptAndMoveNext();
-            }
-
-            // Check for the '>' to determine if the tag is finished
-            var seenClose = TryAccept(SyntaxKind.CloseAngle);
-            if (!seenClose)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(tag.Item2, "<"),
-                            Math.Max(tag.Item1.Content.Length, 1)),
-                        tag.Item1.Content));
-            }
-            else
-            {
-                if (!isEmpty)
-                {
-                    // Is this a void element?
-                    var tagName = tag.Item1.Content.Trim();
-                    if (ParserHelpers.VoidElements.Contains(tagName))
-                    {
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        builder.Add(OutputAsMarkupLiteral());
-                        var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-                        parentBuilder.Add(tagBlock);
-                        blockAlreadyBuilt = true;
-
-                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
-                        // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it
-                        // Place a bookmark
-                        var bookmark = CurrentStart.AbsoluteIndex;
-
-                        // Skip whitespace
-                        var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
-
-                        // Open Angle
-                        if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
-                        {
-                            var openAngle = CurrentToken;
-                            NextToken();
-                            Assert(SyntaxKind.ForwardSlash);
-                            var solidus = CurrentToken;
-                            NextToken();
-                            if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
-                            {
-                                // Accept up to here
-                                Accept(whiteSpace);
-                                parentBuilder.Add(OutputAsMarkupLiteral()); // Output the whitespace
-
-                                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-                                {
-                                    var tagBuilder = pooledResult.Builder;
-                                    Accept(openAngle);
-                                    Accept(solidus);
-                                    AcceptAndMoveNext();
-
-                                    // Accept to '>', '<' or EOF
-                                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
-                                    // Accept the '>' if we saw it. And if we do see it, we're complete
-                                    var complete = TryAccept(SyntaxKind.CloseAngle);
-
-                                    if (complete)
-                                    {
-                                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                                    }
-
-                                    // Output the closing void element
-                                    tagBuilder.Add(OutputAsMarkupLiteral());
-                                    parentBuilder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
-
-                                    return Tuple.Create(complete, blockAlreadyBuilt);
-                                }
-                            }
-                        }
-
-                        // Go back to the bookmark and just finish this tag at the close angle
-                        Context.Source.Position = bookmark;
-                        NextToken();
-                    }
-                    else if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        if (!CurrentScriptTagExpectsHtml(builder))
-                        {
-                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                            builder.Add(OutputAsMarkupLiteral());
-                            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-                            parentBuilder.Add(tagBlock);
-                            blockAlreadyBuilt = true;
-
-                            SkipToEndScriptAndParseCode(parentBuilder, endTagAcceptedCharacters: AcceptedCharactersInternal.None);
-                        }
-                        else
-                        {
-                            // Push the script tag onto the tag stack, it should be treated like all other HTML tags.
-                            tags.Push(tag);
-                        }
-                    }
-                    else
-                    {
-                        // Push the tag on to the stack
-                        tags.Push(tag);
-                    }
-                }
-            }
-            return Tuple.Create(seenClose, blockAlreadyBuilt);
-        }
-
-        private Tuple<bool, bool> ParseEndTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            SourceLocation tagStart,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
-        {
-            // Accept "/" and move next
-            Assert(SyntaxKind.ForwardSlash);
-            var forwardSlash = CurrentToken;
-            if (!NextToken())
-            {
-                Accept(_bufferedOpenAngle);
-                Accept(forwardSlash);
-                return Tuple.Create(false, false);
-            }
-            else
-            {
-                var tagName = string.Empty;
-                SyntaxToken bangToken = null;
-
-                if (At(SyntaxKind.Bang))
-                {
-                    bangToken = CurrentToken;
-
-                    var nextToken = Lookahead(count: 1);
-
-                    if (nextToken != null && nextToken.Kind == SyntaxKind.Text)
-                    {
-                        tagName = "!" + nextToken.Content;
-                    }
-                }
-                else if (At(SyntaxKind.Text))
-                {
-                    tagName = CurrentToken.Content;
-                }
-
-                var matched = RemoveTag(tags, tagName, tagStart);
-
-                if (tags.Count == 0 &&
-                    // Note tagName may contain a '!' escape character. This ensures </!text> doesn't match here.
-                    // </!text> tags are treated like any other escaped HTML end tag.
-                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) &&
-                    matched)
-                {
-                    return EndTextTag(builder, parentBuilder, forwardSlash);
-                }
-                Accept(_bufferedOpenAngle);
-                Accept(forwardSlash);
-
-                TryParseBangEscape(builder);
-
-                AcceptUntil(SyntaxKind.CloseAngle);
-
-                // Accept the ">"
-                return Tuple.Create(TryAccept(SyntaxKind.CloseAngle), false);
-            }
-        }
-
-        private Tuple<bool, bool> EndTextTag(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
-            SyntaxToken solidus)
-        {
-            Accept(_bufferedOpenAngle);
-            Accept(solidus);
-
-            var textLocation = CurrentStart;
-            Assert(SyntaxKind.Text);
-            AcceptAndMoveNext();
-
-            var seenCloseAngle = TryAccept(SyntaxKind.CloseAngle);
-
-            if (!seenCloseAngle)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
-
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-                RecoverTextTag();
-            }
-            else
-            {
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-
-            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-
-            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-            builder.Add(transition);
-            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
-            parentBuilder.Add(tagBlock);
-
-            return Tuple.Create(seenCloseAngle, true);
-        }
-
-        private bool RemoveTag(Stack<Tuple<SyntaxToken, SourceLocation>> tags, string tagName, SourceLocation tagStart)
-        {
-            Tuple<SyntaxToken, SourceLocation> currentTag = null;
-            while (tags.Count > 0)
-            {
-                currentTag = tags.Pop();
-                if (string.Equals(tagName, currentTag.Item1.Content, StringComparison.OrdinalIgnoreCase))
-                {
-                    // Matched the tag
-                    return true;
-                }
-            }
-            if (currentTag != null)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(currentTag.Item2, "<"),
-                            currentTag.Item1.Content.Length),
-                        currentTag.Item1.Content));
-            }
-            else
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
-                        new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), tagName.Length), tagName));
-            }
-            return false;
-        }
-
-        private void RecoverTextTag()
-        {
-            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
-            AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
-
-            // Include the close angle in the text tag block if it's there, otherwise just move on
-            TryAccept(SyntaxKind.CloseAngle);
-        }
-
-        private void EndTagBlock(
-            in SyntaxListBuilder<RazorSyntaxNode> builder,
-            Stack<Tuple<SyntaxToken, SourceLocation>> tags,
-            bool complete)
-        {
-            if (tags.Count > 0)
-            {
-                // Ended because of EOF, not matching close tag.  Throw error for last tag
-                while (tags.Count > 1)
-                {
-                    tags.Pop();
-                }
-                var tag = tags.Pop();
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_MissingEndTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(tag.Item2, "<"),
-                            tag.Item1.Content.Length),
-                        tag.Item1.Content));
-            }
-            else if (complete)
-            {
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-            tags.Clear();
-            if (!Context.DesignTimeMode)
-            {
-                var shouldAcceptWhitespaceAndNewLine = true;
-
-                // Check if the previous span was a transition.
-                var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
-                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
-                {
-                    var tokens = ReadWhile(
-                        f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
-
-                    // Make sure the current token is not markup, which can be html start tag or @:
-                    if (!(At(SyntaxKind.OpenAngle) ||
-                        (At(SyntaxKind.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
-                    {
-                        // Don't accept whitespace as markup if the end text tag is followed by csharp.
-                        shouldAcceptWhitespaceAndNewLine = false;
-                    }
-
-                    PutCurrentBack();
-                    PutBack(tokens);
-                    EnsureCurrent();
-                }
-
-                if (shouldAcceptWhitespaceAndNewLine)
-                {
-                    // Accept whitespace and a single newline if present
-                    AcceptWhile(SyntaxKind.Whitespace);
-                    TryAccept(SyntaxKind.NewLine);
-                }
-            }
-            else if (SpanContext.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any)
-            {
-                AcceptWhile(SyntaxKind.Whitespace);
-                TryAccept(SyntaxKind.NewLine);
-            }
-            PutCurrentBack();
-
-            if (!complete)
-            {
-                AcceptMarkerTokenIfNecessary();
-            }
-
-            builder.Add(OutputAsMarkupLiteral());
-        }
-
-        public MarkupBlockSyntax ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
-        {
-            if (Context == null)
-            {
-                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-            }
-
-            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
-            using (PushSpanContextConfig(DefaultMarkupSpanContext))
-            {
-                var builder = pooledResult.Builder;
-
-                NextToken();
-                CaseSensitive = caseSensitive;
-                NestingBlock(builder, nestingSequences);
-                AcceptMarkerTokenIfNecessary();
-                builder.Add(OutputAsMarkupLiteral());
-
-                return SyntaxFactory.MarkupBlock(builder.ToList());
-            }
-        }
-
-        private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
-        {
-            var nesting = 1;
-            while (nesting > 0 && !EndOfFile)
-            {
-                SkipToAndParseCode(builder, token =>
-                    token.Kind == SyntaxKind.Text ||
-                    token.Kind == SyntaxKind.OpenAngle);
-                if (At(SyntaxKind.Text))
-                {
-                    nesting += ProcessTextToken(builder, nestingSequences, nesting);
-                    if (CurrentToken != null)
-                    {
-                        AcceptAndMoveNext();
-                    }
-                    else if (nesting > 0)
-                    {
-                        NextToken();
-                    }
-                }
-                else
-                {
-                    ParseTagInDocumentContext(builder);
-                }
-            }
-        }
-
-        private int ProcessTextToken(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences, int currentNesting)
-        {
-            for (var i = 0; i < CurrentToken.Content.Length; i++)
-            {
-                var nestingDelta = HandleNestingSequence(builder, nestingSequences.Item1, i, currentNesting, 1);
-                if (nestingDelta == 0)
-                {
-                    nestingDelta = HandleNestingSequence(builder, nestingSequences.Item2, i, currentNesting, -1);
-                }
-
-                if (nestingDelta != 0)
-                {
-                    return nestingDelta;
-                }
-            }
-            return 0;
-        }
-
-        private int HandleNestingSequence(in SyntaxListBuilder<RazorSyntaxNode> builder, string sequence, int position, int currentNesting, int retIfMatched)
-        {
-            if (sequence != null &&
-                CurrentToken.Content[position] == sequence[0] &&
-                position + sequence.Length <= CurrentToken.Content.Length)
-            {
-                var possibleStart = CurrentToken.Content.Substring(position, sequence.Length);
-                if (string.Equals(possibleStart, sequence, Comparison))
-                {
-                    // Capture the current token and "put it back" (really we just want to clear CurrentToken)
-                    var bookmark = CurrentStart;
-                    var token = CurrentToken;
-                    PutCurrentBack();
-
-                    // Carve up the token
-                    var pair = Language.SplitToken(token, position, SyntaxKind.Text);
-                    var preSequence = pair.Item1;
-                    Debug.Assert(pair.Item2 != null);
-                    pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
-                    var sequenceToken = pair.Item1;
-                    var postSequence = pair.Item2;
-                    var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;
-
-                    // Accept the first chunk (up to the nesting sequence we just saw)
-                    if (!string.IsNullOrEmpty(preSequence.Content))
-                    {
-                        Accept(preSequence);
-                    }
-
-                    if (currentNesting + retIfMatched == 0)
-                    {
-                        // This is 'popping' the final entry on the stack of nesting sequences
-                        // A caller higher in the parsing stack will accept the sequence token, so advance
-                        // to it
-                        Context.Source.Position = bookmark.AbsoluteIndex + preSequence.Content.Length;
-                    }
-                    else
-                    {
-                        // This isn't the end of the last nesting sequence, accept the token and keep going
-                        Accept(sequenceToken);
-
-                        // Position at the start of the postSequence token, which might be null.
-                        Context.Source.Position = postSequenceBookmark;
-                    }
-
-                    // Return the value we were asked to return if matched, since we found a nesting sequence
-                    return retIfMatched;
-                }
-            }
-            return 0;
-        }
-
-        private Syntax.GreenNode GetLastSpan(RazorSyntaxNode node)
-        {
-            if (node == null)
-            {
-                return null;
-            }
-
-            // Find the last token of this node and return its immediate non-list parent.
-            var red = node.CreateRed();
-            var last = red.GetLastTerminal();
-            if (last == null)
-            {
-                return null;
-            }
-
-            while (last.Green.IsToken || last.Green.IsList)
-            {
-                last = last.Parent;
-            }
-
-            return last.Green;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 919c314d56..65fc3f0640 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
+    internal class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
     {
         private const string ScriptTagName = "script";
         private static readonly SyntaxList<RazorSyntaxNode> EmptySyntaxList = new SyntaxListBuilder<RazorSyntaxNode>(0).ToList();
@@ -33,10 +33,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private string CurrentStartTagName => CurrentTracker?.TagName;
 
-        private SourceLocation CurrentStartTagLocation => CurrentTracker?.TagLocation ?? SourceLocation.Undefined;
-
         public CSharpCodeParser CodeParser { get; set; }
 
+        private bool CaseSensitive { get; set; }
+
+        private StringComparison Comparison
+        {
+            get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; }
+        }
+
+        //
+        // This is the main entry point into the Razor parser. This will be called only once.
+        // Anything outside of code blocks like @{} are parsed here.
+        // This calls into the code parser whenever a '@' transition is encountered.
+        // In this mode, we group markup elements with the appropriate Start tag, End tag and body
+        // but we don't perform any validation on the structure. We don't produce errors for cases like missing end tags etc.
+        // We let the editor take care of that.
+        //
         public RazorDocumentSyntax ParseDocument()
         {
             if (Context == null)
@@ -69,6 +82,113 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
+        //
+        // This will be called by the code parser whenever any markup is encountered inside a code block @{}.
+        // It can either be a single line markup like @: or a tag. In this case, we want to keep track of tag nesting
+        // and add appropriate errors for any malformed cases.
+        // In addition to parsing regular tags, we also understand special "text" tags. These tags are not rendered to the output
+        // but used to render a block of text it encloses as markup. They are a multiline alternative to the single line markup syntax @:
+        // One caveat is that the tags in single markup as parsed as plain text.
+        //
+        // The tag stack inside a code block is different from the stack outside the block.
+        // E.g, `<div> @{ </div> }` will be parsed as two separate elements with missing end and start tags respectively.
+        //
+        public MarkupBlockSyntax ParseBlock()
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            var oldTagTracker = _tagTracker;
+            try
+            {
+                // This is the start of a new block. We don't want the current tag stack to mix with the tags in this block.
+                // Initialize a new stack.
+                _tagTracker = new Stack<TagTracker>();
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                using (PushSpanContextConfig(DefaultMarkupSpanContext))
+                {
+                    var builder = pooledResult.Builder;
+                    if (!NextToken())
+                    {
+                        return null;
+                    }
+
+                    AcceptWhile(IsSpacingToken(includeNewLines: true));
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    if (At(SyntaxKind.OpenAngle))
+                    {
+                        ParseMarkupInCodeBlock(builder);
+                    }
+                    else if (At(SyntaxKind.Transition))
+                    {
+                        ParseMarkupTransition(builder);
+                    }
+                    else
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
+                                new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                    }
+
+                    // Add any remaining tokens to the builder.
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    var markupBlock = builder.ToList();
+
+                    return SyntaxFactory.MarkupBlock(markupBlock);
+                }
+            }
+            finally
+            {
+                _tagTracker = oldTagTracker;
+            }
+        }
+
+        //
+        // This is called when the body of a Razor block directive needs to be parsed. E.g @section |{ ... }|
+        // This parses markup in 'document' mode, which means we don't add any errors for malformed tags.
+        // Since, a razor block can also have several code blocks @{} within it, we need to keep track of the block nesting level
+        // to make sure we exit when we reach the final '}'.
+        //
+        // Similar to ParseBlock, the tag stack inside a razor block is different from the stack outside the block.
+        // E.g, `@section Foo { </div> } <div>` will be parsed as two separate elements.
+        //
+        public MarkupBlockSyntax ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
+        {
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            var oldTagTracker = _tagTracker;
+            try
+            {
+                // This is the start of a new block. We don't want the current tag stack to mix with the tags in this block.
+                // Initialize a new stack.
+                _tagTracker = new Stack<TagTracker>();
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                using (PushSpanContextConfig(DefaultMarkupSpanContext))
+                {
+                    var builder = pooledResult.Builder;
+
+                    NextToken();
+                    CaseSensitive = caseSensitive;
+                    NestingBlock(builder, nestingSequences);
+                    AcceptMarkerTokenIfNecessary();
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    return SyntaxFactory.MarkupBlock(builder.ToList());
+                }
+            }
+            finally
+            {
+                _tagTracker = oldTagTracker;
+            }
+        }
+
         private void ParseMarkupNodes(
             in SyntaxListBuilder<RazorSyntaxNode> builder,
             ParseMode mode,
@@ -129,6 +249,182 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             AcceptAndMoveNext();
         }
 
+        private void ParseMarkupInCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            do
+            {
+                switch (GetParserState(ParseMode.MarkupInCodeBlock))
+                {
+                    case ParserState.EOF:
+                        break;
+                    case ParserState.Tag:
+                        ParseMarkupElement(builder, ParseMode.MarkupInCodeBlock);
+                        break;
+                    case ParserState.SpecialTag:
+                    case ParserState.XmlPI:
+                    case ParserState.MarkupComment:
+                    case ParserState.CData:
+                        ParseMarkupNode(builder, ParseMode.MarkupInCodeBlock);
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        builder.Add(OutputAsMarkupLiteral());
+                        break;
+                    default:
+                        ParseMarkupNode(builder, ParseMode.Text);
+                        break;
+                }
+            } while (!EndOfFile && _tagTracker.Count > 0);
+
+            CompleteMarkupInCodeBlock(builder);
+        }
+
+        private void CompleteMarkupInCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Output anything we've accepted so far.
+            builder.Add(OutputAsMarkupLiteral());
+
+            var isOuterTagWellFormed = true;
+            while (_tagTracker.Count > 0)
+            {
+                var tracker = _tagTracker.Pop();
+                var element = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
+                builder.AddRange(tracker.PreviousNodes);
+                builder.Add(element);
+
+                if (_tagTracker.Count == 0)
+                {
+                    isOuterTagWellFormed = tracker.IsWellFormed;
+                    if (isOuterTagWellFormed)
+                    {
+                        // We're at the outermost start tag. Add an error.
+                        // We don't want to add this error if the tag is unfinished. A different error would have already been added.
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_MissingEndTag(
+                                new SourceSpan(
+                                    SourceLocationTracker.Advance(tracker.TagLocation, "<"),
+                                    tracker.TagName.Length),
+                                tracker.TagName));
+                    }
+                }
+            }
+
+            if (!Context.DesignTimeMode)
+            {
+                // We want to accept the whitespace and newline at the end of the markup.
+                // E.g, 
+                // @{
+                //     <div>Foo</div>|   
+                // |}
+                // Except in two cases,
+                // 1. Design time
+                // 2. Text tags
+                //
+                var shouldAcceptWhitespaceAndNewLine = true;
+
+                // Check if the previous span was a transition.
+                var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
+                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
+                {
+                    var tokens = ReadWhile(
+                        f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
+
+                    // Make sure the current token is not markup, which can be html start tag or @:
+                    if (!(At(SyntaxKind.OpenAngle) ||
+                        (At(SyntaxKind.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
+                    {
+                        // Don't accept whitespace as markup if the end text tag is followed by csharp.
+                        shouldAcceptWhitespaceAndNewLine = false;
+                    }
+
+                    PutCurrentBack();
+                    PutBack(tokens);
+                    EnsureCurrent();
+                }
+                if (shouldAcceptWhitespaceAndNewLine)
+                {
+                    // Accept whitespace and a single newline if present
+                    AcceptWhile(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.NewLine);
+
+                    if (isOuterTagWellFormed)
+                    {
+                        // Completed tags have no accepted characters inside blocks.
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    }
+                }
+            }
+
+            PutCurrentBack();
+            if (!isOuterTagWellFormed)
+            {
+                AcceptMarkerTokenIfNecessary();
+            }
+
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
+        private void ParseMarkupTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.Transition);
+
+            AcceptAndMoveNext();
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+            builder.Add(transition);
+
+            // "@:" => Explicit Single Line Block
+            if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
+            {
+                // Split the token
+                var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
+
+                // The first part (left) is output as MetaCode
+                Accept(split.Item1);
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                if (split.Item2 != null)
+                {
+                    Accept(split.Item2);
+                }
+                NextToken();
+                ParseSingleLineMarkup(builder);
+            }
+            else if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+            {
+                // Template
+                // E.g, @<div>Foo</div>
+                ParseMarkupInCodeBlock(builder);
+            }
+        }
+
+        private void ParseSingleLineMarkup(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Parse until a newline.
+            // First, signal to code parser that whitespace is significant to us.
+            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
+            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
+            SpanContext.EditHandler = new SpanEditHandler(Language.TokenizeString);
+
+            // Now parse until a new line.
+            do
+            {
+                ParseMarkupNodes(builder, ParseMode.Text, token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+                if (At(SyntaxKind.Whitespace))
+                {
+                    AcceptAndMoveNext();
+                }
+            } while (!EndOfFile && CurrentToken.Kind != SyntaxKind.NewLine);
+
+            if (!EndOfFile && CurrentToken.Kind == SyntaxKind.NewLine)
+            {
+                AcceptAndMoveNext();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            PutCurrentBack();
+            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
         private void ParseMarkupElement(in SyntaxListBuilder<RazorSyntaxNode> builder, ParseMode mode)
         {
             Assert(SyntaxKind.OpenAngle);
@@ -140,15 +436,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 // Parsing a start tag
                 var tagStart = CurrentStart;
-                var startTag = ParseStartTag(out var tagName, out var tagMode);
+                var startTag = ParseStartTag(mode, tagStart, out var tagName, out var tagMode, out var isWellFormed);
                 if (tagMode == MarkupTagMode.Script)
                 {
-                    ParseJavascriptAndEndScriptTag(builder, startTag);
+                    var acceptedCharacters = mode == ParseMode.MarkupInCodeBlock ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.Any;
+                    ParseJavascriptAndEndScriptTag(builder, startTag, acceptedCharacters);
                     return;
                 }
-                else if (tagMode == MarkupTagMode.SelfClosing || tagMode == MarkupTagMode.Invalid)
+
+                if (tagMode == MarkupTagMode.SelfClosing || tagMode == MarkupTagMode.Invalid || tagMode == MarkupTagMode.Void)
                 {
-                    // For cases like <foo /> or invalid cases like |<|<p>
+                    // For cases like <foo />, <input> or invalid cases like |<|<p>
                     var element = SyntaxFactory.MarkupElement(startTag, EmptySyntaxList, endTag: null);
                     builder.Add(element);
                     return;
@@ -156,7 +454,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 else
                 {
                     // This is a normal start tag. We need to keep track of it.
-                    var tracker = new TagTracker(tagName, startTag, tagStart, builder.Consume());
+                    var tracker = new TagTracker(tagName, startTag, tagStart, builder.Consume(), isWellFormed);
                     _tagTracker.Push(tracker);
                     return;
                 }
@@ -164,7 +462,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             else
             {
                 // Parsing an end tag.
-                var endTag = ParseEndTag(out var endTagName);
+                var endTagStart = CurrentStart;
+                var endTag = ParseEndTag(mode, out var endTagName, out var _);
+
                 if (endTagName != null && string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
                 {
                     // Happy path. Found a matching start tag. Create the element and reset the builder.
@@ -183,11 +483,52 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         // Could not recover.
                         var element = SyntaxFactory.MarkupElement(startTag: null, body: EmptySyntaxList, endTag: endTag);
                         builder.Add(element);
+
+                        if (mode == ParseMode.MarkupInCodeBlock)
+                        {
+                            CompleteEndTag(builder, endTagName, endTagStart, endTag);
+                        }
                     }
                 }
             }
         }
 
+        private void CompleteEndTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            string endTagName,
+            SourceLocation endTagStartLocation,
+            MarkupEndTagSyntax endTag)
+        {
+            // At this point we already know we don't have a matching start tag. Just build whatever is left.
+            if (_tagTracker.Count == 0)
+            {
+                // We can't possibly have a matching start tag.
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
+                        new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), endTagName.Length), endTagName));
+                return;
+            }
+
+            while (_tagTracker.Count > 0)
+            {
+                var tracker = _tagTracker.Pop();
+                var unclosedElement = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
+                builder.AddRange(tracker.PreviousNodes);
+                builder.Add(unclosedElement);
+
+                if (_tagTracker.Count == 0)
+                {
+                    // This means we couldn't find a match and we're at the outermost start tag. Add an error.
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_MissingEndTag(
+                            new SourceSpan(
+                                SourceLocationTracker.Advance(tracker.TagLocation, "<"),
+                                tracker.TagName.Length),
+                            tracker.TagName));
+                }
+            }
+        }
+
         private bool TryRecoverStartTag(in SyntaxListBuilder<RazorSyntaxNode> builder, string endTagName, MarkupEndTagSyntax endTag)
         {
             var malformedTagCount = 0;
@@ -224,8 +565,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        private MarkupStartTagSyntax ParseStartTag(out string tagName, out MarkupTagMode tagMode)
+        private MarkupStartTagSyntax ParseStartTag(
+            ParseMode mode,
+            SourceLocation tagStartLocation,
+            out string tagName,
+            out MarkupTagMode tagMode,
+            out bool isWellFormed)
         {
+            Assert(SyntaxKind.OpenAngle);
+
             tagName = null;
             tagMode = MarkupTagMode.Invalid;
             using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
@@ -238,15 +586,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (At(SyntaxKind.Text))
                 {
                     tagName = CurrentToken.Content;
-                    if (ParserHelpers.VoidElements.Contains(tagName))
-                    {
-                        // This is a void element.
-                        tagMode = MarkupTagMode.Void;
-                    }
-                    else
-                    {
-                        tagMode = MarkupTagMode.Normal;
-                    }
+                    tagMode = MarkupTagMode.Normal;
 
                     if (isBangEscape)
                     {
@@ -254,8 +594,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         tagName = "!" + tagName;
                     }
                 }
+
+                if (mode == ParseMode.MarkupInCodeBlock &&
+                    _tagTracker.Count == 0 &&
+                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    // "<text>" tag is special only if it is the outermost tag.
+                    return ParseStartTextTag(out tagMode, out isWellFormed);
+                }
+
                 TryAccept(SyntaxKind.Text);
 
+                if (At(SyntaxKind.CloseAngle) && mode == ParseMode.MarkupInCodeBlock)
+                {
+                    // Completed tags in code blocks have no accepted characters.
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+
                 // Output open angle and tag name
                 tagBuilder.Add(OutputAsMarkupLiteral());
 
@@ -267,7 +622,69 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     // This is a self closing tag.
                     tagMode = MarkupTagMode.SelfClosing;
                 }
-                TryAccept(SyntaxKind.CloseAngle);
+
+                if (mode == ParseMode.MarkupInCodeBlock)
+                {
+                    if (EndOfFile || !At(SyntaxKind.CloseAngle))
+                    {
+                        // Unfinished tag
+                        isWellFormed = false;
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                                new SourceSpan(
+                                    tagName == null ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
+                                    Math.Max(tagName?.Length ?? 0, 1)),
+                                tagName ?? string.Empty));
+                    }
+                    else
+                    {
+                        isWellFormed = TryAccept(SyntaxKind.CloseAngle);
+
+                        // Completed tags in code blocks have no accepted characters.
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+
+                        if (tagMode != MarkupTagMode.SelfClosing && ParserHelpers.VoidElements.Contains(tagName))
+                        {
+                            // This is a void element.
+                            // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
+                            // we need to look ahead at the next set of tokens.
+
+                            // Place a bookmark
+                            var bookmark = CurrentStart.AbsoluteIndex;
+
+                            // Skip whitespace
+                            var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
+
+                            // Open Angle
+                            if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
+                            {
+                                var openAngle = CurrentToken;
+                                NextToken();
+                                Assert(SyntaxKind.ForwardSlash);
+                                var forwardSlash = CurrentToken;
+                                NextToken();
+                                if (!At(SyntaxKind.Text) || !string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
+                                {
+                                    // There is no matching end void tag.
+                                    tagMode = MarkupTagMode.Void;
+                                }
+                            }
+                            else
+                            {
+                                // There is no matching end void tag.
+                                tagMode = MarkupTagMode.Void;
+                            }
+
+                            // Go back to the bookmark and just finish this tag at the close angle
+                            Context.Source.Position = bookmark;
+                            NextToken();
+                        }
+                    }
+                }
+                else
+                {
+                    isWellFormed = TryAccept(SyntaxKind.CloseAngle);
+                }
 
                 // End tag block
                 tagBuilder.Add(OutputAsMarkupLiteral());
@@ -286,7 +703,63 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private MarkupEndTagSyntax ParseEndTag(out string tagName)
+        private MarkupStartTagSyntax ParseStartTextTag(out MarkupTagMode tagMode, out bool isWellFormed)
+        {
+            // At this point, we should have already accepted the open angle. We won't get here if the tag is escaped.
+            tagMode = MarkupTagMode.Normal;
+            var textLocation = CurrentStart;
+            Assert(SyntaxKind.Text);
+
+            AcceptAndMoveNext();
+
+            var bookmark = CurrentStart.AbsoluteIndex;
+            var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+            var selfClosing = At(SyntaxKind.ForwardSlash);
+            if (selfClosing)
+            {
+                tagMode = MarkupTagMode.SelfClosing;
+                Accept(tokens);
+                Assert(SyntaxKind.ForwardSlash);
+                AcceptAndMoveNext();
+                bookmark = CurrentStart.AbsoluteIndex;
+                tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+            }
+
+            if (!At(SyntaxKind.CloseAngle))
+            {
+                Context.Source.Position = bookmark;
+                NextToken();
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                RecoverTextTag();
+            }
+            else
+            {
+                Accept(tokens);
+                TryAccept(SyntaxKind.CloseAngle);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+
+            isWellFormed = true;
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+            var startTextTag = SyntaxFactory.MarkupStartTag(transition);
+
+            return startTextTag;
+        }
+
+        private void RecoverTextTag()
+        {
+            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
+            AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
+
+            // Include the close angle in the text tag block if it's there, otherwise just move on
+            TryAccept(SyntaxKind.CloseAngle);
+        }
+
+        private MarkupEndTagSyntax ParseEndTag(ParseMode mode, out string tagName, out bool isWellFormed)
         {
             // This section can accept things like: '</p  >' or '</p>' etc.
             Assert(SyntaxKind.OpenAngle);
@@ -306,10 +779,46 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     tagName = isBangEscape ? "!" : string.Empty;
                     tagName += CurrentToken.Content;
+
+                    if (mode == ParseMode.MarkupInCodeBlock &&
+                        string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // "<text>" tag is special only if it is the outermost tag. We need to figure out if the current end text tag
+                        // matches the outermost start text tag.
+                        var openTextTagCount = 0;
+                        foreach (var tracker in _tagTracker)
+                        {
+                            if (string.Equals(tracker.TagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+                            {
+                                openTextTagCount++;
+                            }
+                        }
+
+                        if (openTextTagCount == 1 &&
+                            string.Equals(_tagTracker.Last().TagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            // This means there is only one open text tag and it is the outermost tag.
+                            return ParseEndTextTag(out isWellFormed);
+                        }
+                    }
+
                     AcceptAndMoveNext();
                 }
                 TryAccept(SyntaxKind.Whitespace);
-                TryAccept(SyntaxKind.CloseAngle);
+
+                if (mode == ParseMode.MarkupInCodeBlock)
+                {
+                    // We want to accept malformed end tags as content.
+                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
+
+                    if (At(SyntaxKind.CloseAngle))
+                    {
+                        // Completed tags in code blocks have no accepted characters.
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    }
+                }
+
+                isWellFormed = TryAccept(SyntaxKind.CloseAngle);
 
                 // End tag block
                 tagBuilder.Add(OutputAsMarkupLiteral());
@@ -318,11 +827,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private SyntaxList<RazorSyntaxNode> ParseTagBody(string tagName, out bool seenEndTag)
+        private MarkupEndTagSyntax ParseEndTextTag(out bool isWellFormed)
         {
-            // No-op here for now.
-            seenEndTag = false;
-            return null;
+            // At this point, we should have already accepted the open angle and forward slash. We won't get here if the tag is escaped.
+            var textLocation = CurrentStart;
+            Assert(SyntaxKind.Text);
+            AcceptAndMoveNext();
+
+            isWellFormed = TryAccept(SyntaxKind.CloseAngle);
+            if (!isWellFormed)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                RecoverTextTag();
+            }
+            else
+            {
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+            var endTextTag = SyntaxFactory.MarkupEndTag(transition);
+            return endTextTag;
         }
 
         private void ParseAttributes(in SyntaxListBuilder<RazorSyntaxNode> builder)
@@ -1191,7 +1722,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        private bool IsHtmlCommentAhead()
+        // Internal for testing
+        internal bool IsHtmlCommentAhead()
         {
             // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
 
@@ -1289,6 +1821,118 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return attributeCanBeConditional;
         }
 
+        private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
+        {
+            var nesting = 1;
+            while (nesting > 0 && !EndOfFile)
+            {
+                ParseMarkupNodes(builder, ParseMode.Text, token =>
+                    token.Kind == SyntaxKind.Text ||
+                    token.Kind == SyntaxKind.OpenAngle);
+                if (At(SyntaxKind.Text))
+                {
+                    // We need to inspect this text token to figure out if this could be the end of the Razor block
+                    // or if it is the start of a new block in which case we need to keep track of the nesting level.
+                    nesting += ProcessTextToken(builder, nestingSequences, nesting);
+                    if (CurrentToken != null)
+                    {
+                        // This was just some regular text. Accept and move on.
+                        // If we were at the end of a block, we would have already accepted it and CurrentToken will be null.
+                        AcceptAndMoveNext();
+                    }
+                    else if (nesting > 0)
+                    {
+                        // This was the start of a new block. We've already consumed the text. Move on.
+                        NextToken();
+                    }
+                }
+                else
+                {
+                    // We're at a tag. Parse it and continue.
+                    ParseMarkupNode(builder, ParseMode.Markup);
+                }
+            }
+
+            // If we are still tracking any unclosed start tags, we need to close them.
+            while (_tagTracker.Count > 0)
+            {
+                var tracker = _tagTracker.Pop();
+                var element = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
+                builder.AddRange(tracker.PreviousNodes);
+                builder.Add(element);
+            }
+        }
+
+        private int ProcessTextToken(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences, int currentNesting)
+        {
+            for (var i = 0; i < CurrentToken.Content.Length; i++)
+            {
+                var nestingDelta = HandleNestingSequence(builder, nestingSequences.Item1, i, currentNesting, 1);
+                if (nestingDelta == 0)
+                {
+                    nestingDelta = HandleNestingSequence(builder, nestingSequences.Item2, i, currentNesting, -1);
+                }
+
+                if (nestingDelta != 0)
+                {
+                    return nestingDelta;
+                }
+            }
+            return 0;
+        }
+
+        private int HandleNestingSequence(in SyntaxListBuilder<RazorSyntaxNode> builder, string sequence, int position, int currentNesting, int retIfMatched)
+        {
+            if (sequence != null &&
+                CurrentToken.Content[position] == sequence[0] &&
+                position + sequence.Length <= CurrentToken.Content.Length)
+            {
+                var possibleStart = CurrentToken.Content.Substring(position, sequence.Length);
+                if (string.Equals(possibleStart, sequence, Comparison))
+                {
+                    // Capture the current token and "put it back" (really we just want to clear CurrentToken)
+                    var bookmark = CurrentStart;
+                    var token = CurrentToken;
+                    PutCurrentBack();
+
+                    // Carve up the token
+                    var pair = Language.SplitToken(token, position, SyntaxKind.Text);
+                    var preSequence = pair.Item1;
+                    Debug.Assert(pair.Item2 != null);
+                    pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
+                    var sequenceToken = pair.Item1;
+                    var postSequence = pair.Item2;
+                    var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;
+
+                    // Accept the first chunk (up to the nesting sequence we just saw)
+                    if (!string.IsNullOrEmpty(preSequence.Content))
+                    {
+                        Accept(preSequence);
+                    }
+
+                    if (currentNesting + retIfMatched == 0)
+                    {
+                        // This is 'popping' the final entry on the stack of nesting sequences
+                        // A caller higher in the parsing stack will accept the sequence token, so advance
+                        // to it
+                        Context.Source.Position = bookmark.AbsoluteIndex + preSequence.Content.Length;
+                    }
+                    else
+                    {
+                        // This isn't the end of the last nesting sequence, accept the token and keep going
+                        Accept(sequenceToken);
+
+                        // Position at the start of the postSequence token, which might be null.
+                        Context.Source.Position = postSequenceBookmark;
+                    }
+
+                    // Return the value we were asked to return if matched, since we found a nesting sequence
+                    return retIfMatched;
+                }
+            }
+            return 0;
+        }
+
         private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             AcceptMarkerTokenIfNecessary();
@@ -1376,6 +2020,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             spanContext.EditHandler = new SpanEditHandler(Language.TokenizeString, AcceptedCharactersInternal.Any);
         }
 
+        private Syntax.GreenNode GetLastSpan(RazorSyntaxNode node)
+        {
+            if (node == null)
+            {
+                return null;
+            }
+
+            // Find the last token of this node and return its immediate non-list parent.
+            var red = node.CreateRed();
+            var last = red.GetLastTerminal();
+            if (last == null)
+            {
+                return null;
+            }
+
+            while (last.Green.IsToken || last.Green.IsList)
+            {
+                last = last.Parent;
+            }
+
+            return last.Green;
+        }
+
         private enum ParseMode
         {
             Markup,
@@ -1398,12 +2065,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 string tagName,
                 MarkupStartTagSyntax startTag,
                 SourceLocation tagLocation,
-                SyntaxList<RazorSyntaxNode> previousNodes)
+                SyntaxList<RazorSyntaxNode> previousNodes,
+                bool isWellFormed)
             {
                 TagName = tagName;
                 StartTag = startTag;
                 TagLocation = tagLocation;
                 PreviousNodes = previousNodes;
+                IsWellFormed = isWellFormed;
             }
 
             public string TagName { get; }
@@ -1413,6 +2082,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             public SourceLocation TagLocation { get; }
 
             public SyntaxList<RazorSyntaxNode> PreviousNodes { get; }
+
+            public bool IsWellFormed { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
index 0caff21144..042ba4cc7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs
@@ -44,9 +44,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var root = markupParser.ParseDocument().CreateRed();
 
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, Options);
-
-            // Group markup elements
-            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
             return syntaxTree;
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
index 773fb6de9c..c8581e85d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
@@ -1898,6 +1898,20 @@ namespace Microsoft.AspNetCore.Razor.Language
         internal static string FormatVirtualFileSystem_InvalidRelativePath(object p0)
             => string.Format(CultureInfo.CurrentCulture, GetString("VirtualFileSystem_InvalidRelativePath"), p0);
 
+        /// <summary>
+        /// Not enough stack space to continue parsing this document. Razor doesn't support more than 500 nested elements.
+        /// </summary>
+        internal static string Rewriter_InsufficientStack
+        {
+            get => GetString("Rewriter_InsufficientStack");
+        }
+
+        /// <summary>
+        /// Not enough stack space to continue parsing this document. Razor doesn't support deeply nested elements.
+        /// </summary>
+        internal static string FormatRewriter_InsufficientStack()
+            => GetString("Rewriter_InsufficientStack");
+
         private static string GetString(string name, params string[] formatterNames)
         {
             var value = _resourceManager.GetString(name);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
index ef111ac0ae..95bda8d4b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -416,7 +416,6 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             return RazorDiagnostic.Create(Parsing_InvalidTagHelperLookupText, location, lookupText);
         }
-
         #endregion
 
         #region Semantic Errors
@@ -781,5 +780,21 @@ namespace Microsoft.AspNetCore.Razor.Language
         }
 
         #endregion
+
+        #region Rewriter Errors
+
+        // Rewriter Errors ID Offset = 4000
+
+        internal static readonly RazorDiagnosticDescriptor Rewriter_InsufficientStack =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}4000",
+                () => Resources.Rewriter_InsufficientStack,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateRewriter_InsufficientStack(SourceSpan location)
+        {
+            return RazorDiagnostic.Create(Rewriter_InsufficientStack, location);
+        }
+
+        #endregion
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index e23e66c297..bf15e72279 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -542,4 +542,7 @@ Instead, wrap the contents of the block in "{{}}":
   <data name="VirtualFileSystem_InvalidRelativePath" xml:space="preserve">
     <value>The file path '{0}' is invalid. File path is the root relative path of the file starting with '/' and should not contain any '\' characters.</value>
   </data>
+  <data name="Rewriter_InsufficientStack" xml:space="preserve">
+    <value>Not enough stack space to continue parsing this document. Razor doesn't support deeply nested elements.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
deleted file mode 100644
index b0d9e82624..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupElementRewriter.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Razor.Language.Syntax
-{
-    internal static class MarkupElementRewriter
-    {
-        public static RazorSyntaxTree AddMarkupElements(RazorSyntaxTree syntaxTree)
-        {
-            var rewriter = new AddMarkupElementRewriter();
-            var rewrittenRoot = rewriter.Visit(syntaxTree.Root);
-
-            var newSyntaxTree = RazorSyntaxTree.Create(rewrittenRoot, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
-            return newSyntaxTree;
-        }
-
-        private class AddMarkupElementRewriter : SyntaxRewriter
-        {
-            private readonly Stack<TagBlockTracker> _startTagTracker = new Stack<TagBlockTracker>();
-
-            private TagBlockTracker CurrentTracker => _startTagTracker.Count > 0 ? _startTagTracker.Peek() : null;
-
-            private string CurrentStartTagName => CurrentTracker?.TagName;
-
-            public override SyntaxNode Visit(SyntaxNode node)
-            {
-                if (node != null)
-                {
-                    var diagnostics = node.GetDiagnostics();
-                    node = base.Visit(node);
-                    if (diagnostics.Length > 0)
-                    {
-                        // Persist node diagnostics.
-                        node = node.WithDiagnostics(diagnostics);
-                    }
-
-                    node = RewriteNode(node);
-                }
-
-                return node;
-            }
-
-            private SyntaxNode RewriteNode(SyntaxNode node)
-            {
-                if (node.IsToken)
-                {
-                    // Tokens don't have children.
-                    return node;
-                }
-
-                _startTagTracker.Clear();
-                var children = node.ChildNodes().ToList();
-                var rewrittenChildren = new List<SyntaxNode>(children.Count);
-                for (var i = 0; i < children.Count; i++)
-                {
-                    var child = children[i];
-                    if (!(child is MarkupTagBlockSyntax tagBlock))
-                    {
-                        TrackChild(child, rewrittenChildren);
-                        continue;
-                    }
-
-                    var tagName = tagBlock.GetTagName();
-                    if (string.IsNullOrWhiteSpace(tagName) || tagBlock.IsSelfClosing())
-                    {
-                        // Don't want to track incomplete, invalid (Eg. </>, <  >) or self-closing tags.
-                        // Simply wrap it in a block with no body or start/end tag.
-                        if (IsEndTag(tagBlock))
-                        {
-                            // This is an error case.
-                            BuildMarkupElement(rewrittenChildren, startTag: null, tagChildren: new List<RazorSyntaxNode>(), endTag: tagBlock);
-                        }
-                        else
-                        {
-                            BuildMarkupElement(rewrittenChildren, startTag: tagBlock, tagChildren: new List<RazorSyntaxNode>(), endTag: null);
-                        }
-                    }
-                    else if (IsEndTag(tagBlock))
-                    {
-                        if (string.Equals(CurrentStartTagName, tagName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            var startTagTracker = _startTagTracker.Pop();
-                            var startTag = startTagTracker.TagBlock;
-
-                            // Get the nodes between the start and the end tag.
-                            var tagChildren = startTagTracker.Children;
-
-                            BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag: tagBlock);
-                        }
-                        else
-                        {
-                            // Current tag scope does not match the end tag. Attempt to recover the start tag
-                            // by looking up the previous tag scopes for a matching start tag.
-                            if (!TryRecoverStartTag(rewrittenChildren, tagName, tagBlock))
-                            {
-                                // Could not recover. The end tag doesn't have a corresponding start tag. Wrap it in a block and move on.
-                                var rewritten = SyntaxFactory.MarkupElement(startTag: null, body: new SyntaxList<RazorSyntaxNode>(), endTag: GetEndTagSyntax(tagBlock));
-                                TrackChild(rewritten, rewrittenChildren);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        // This is a start tag. Keep track of it.
-                        _startTagTracker.Push(new TagBlockTracker(tagBlock));
-                    }
-                }
-
-                while (_startTagTracker.Count > 0)
-                {
-                    // We reached the end of the list and still have unmatched start tags
-                    var startTagTracker = _startTagTracker.Pop();
-                    var startTag = startTagTracker.TagBlock;
-                    var tagChildren = startTagTracker.Children;
-                    BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag: null);
-                }
-
-                // We now have finished building our list of rewritten Children.
-                // At this point, We should have a one to one replacement for every child. The replacement can be null.
-                Debug.Assert(children.Count == rewrittenChildren.Count);
-                node = node.ReplaceNodes(children, (original, rewritten) =>
-                {
-                    var originalIndex = children.IndexOf(original);
-                    if (originalIndex != -1)
-                    {
-                        // If this returns null, that node will be removed.
-                        return rewrittenChildren[originalIndex];
-                    }
-
-                    return original;
-                });
-
-                return node;
-            }
-
-            private void BuildMarkupElement(List<SyntaxNode> rewrittenChildren, MarkupTagBlockSyntax startTag, List<RazorSyntaxNode> tagChildren, MarkupTagBlockSyntax endTag)
-            {
-                // We are trying to replace multiple nodes (including the start/end tag) with one rewritten node.
-                // Since we need to have each child node accounted for in our rewritten list,
-                // we'll add "null" in place of them.
-                // The call to SyntaxNode.ReplaceNodes() later will take care removing the nodes whose replacement is null.
-
-                var body = tagChildren.Where(t => t != null).ToList();
-                var rewritten = SyntaxFactory.MarkupElement(
-                    GetStartTagSyntax(startTag),
-                    new SyntaxList<RazorSyntaxNode>(body),
-                    GetEndTagSyntax(endTag));
-
-                if (startTag != null)
-                {
-                    // If there was a start tag, that is where we want to put our new element.
-                    TrackChild(rewritten, rewrittenChildren);
-                }
-
-                foreach (var child in tagChildren)
-                {
-                    TrackChild(null, rewrittenChildren);
-                }
-                if (endTag != null)
-                {
-                    TrackChild(startTag == null ? rewritten : null, rewrittenChildren);
-                }
-            }
-
-            private void TrackChild(SyntaxNode child, List<SyntaxNode> rewrittenChildren)
-            {
-                if (CurrentTracker != null)
-                {
-                    CurrentTracker.Children.Add((RazorSyntaxNode)child);
-                    return;
-                }
-
-                rewrittenChildren.Add(child);
-            }
-
-            private bool TryRecoverStartTag(List<SyntaxNode> rewrittenChildren, string tagName, MarkupTagBlockSyntax endTag)
-            {
-                var malformedTagCount = 0;
-                foreach (var tracker in _startTagTracker)
-                {
-                    if (tracker.TagName.Equals(tagName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        break;
-                    }
-
-                    malformedTagCount++;
-                }
-
-                if (_startTagTracker.Count > malformedTagCount)
-                {
-                    RewriteMalformedTags(rewrittenChildren, malformedTagCount);
-
-                    // One final rewrite, this is the rewrite that completes our target tag which is not malformed.
-                    var startTagTracker = _startTagTracker.Pop();
-                    var startTag = startTagTracker.TagBlock;
-                    var tagChildren = startTagTracker.Children;
-
-                    BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag);
-
-                    // We were able to recover
-                    return true;
-                }
-
-                // Could not recover tag. Aka we found an end tag without a corresponding start tag.
-                return false;
-            }
-
-            private void RewriteMalformedTags(List<SyntaxNode> rewrittenChildren, int malformedTagCount)
-            {
-                for (var i = 0; i < malformedTagCount; i++)
-                {
-                    var startTagTracker = _startTagTracker.Pop();
-                    var startTag = startTagTracker.TagBlock;
-
-                    BuildMarkupElement(rewrittenChildren, startTag, startTagTracker.Children, endTag: null);
-                }
-            }
-
-            private bool IsEndTag(MarkupTagBlockSyntax tagBlock)
-            {
-                var childContent = tagBlock.Children.First().GetContent();
-                if (string.IsNullOrEmpty(childContent))
-                {
-                    return false;
-                }
-
-                // We grab the token that could be forward slash
-                return childContent.StartsWith("</") || childContent.StartsWith("/");
-            }
-
-            private static MarkupStartTagSyntax GetStartTagSyntax(MarkupTagBlockSyntax tagBlock)
-            {
-                if (tagBlock == null)
-                {
-                    return null;
-                }
-
-                return SyntaxFactory.MarkupStartTag(tagBlock.Children);
-            }
-
-            private static MarkupEndTagSyntax GetEndTagSyntax(MarkupTagBlockSyntax tagBlock)
-            {
-                if (tagBlock == null)
-                {
-                    return null;
-                }
-
-                return SyntaxFactory.MarkupEndTag(tagBlock.Children);
-            }
-
-            private class TagBlockTracker
-            {
-                public TagBlockTracker(MarkupTagBlockSyntax tagBlock)
-                {
-                    TagBlock = tagBlock;
-                    TagName = tagBlock.GetTagName();
-                    Children = new List<RazorSyntaxNode>();
-                }
-
-                public MarkupTagBlockSyntax TagBlock { get; }
-
-                public List<RazorSyntaxNode> Children { get; }
-
-                public string TagName { get; }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 22d088d7d5..80287a2f9e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -241,9 +241,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
             codeDocument.SetSyntaxTree(syntaxTree);
 
-            // Group markup elements
-            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
-
             var defaultDirectivePass = new DefaultDirectiveSyntaxTreePass();
             syntaxTree = defaultDirectivePass.Execute(codeDocument, syntaxTree);
 
@@ -271,9 +268,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
 
-            // Group markup elements
-            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
-
             return syntaxTree;
         }
 
@@ -307,9 +301,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
 
-            // Group markup elements
-            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
-
             return syntaxTree;
         }
 

From e8a584729f44a4026505850562d78471a3ce1136 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 13 Dec 2018 15:39:45 -0800
Subject: [PATCH 017/337] Fix racey directive token auto-complete.

- This happens because a completion session starts when we've rendered a marker directive token without a line pragma and then we return our parse results which provide a C# buffer with a line pragma. This pull request fixes that.
- Updated tests and verified in VS d16.0stg.

aspnet/AspNetCoredotnet/aspnetcore-tooling#4810
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ca593c80f750495d0b215a7fc5671706747348e0
---
 ...IncompleteDirectives_DesignTime.codegen.cs | 35 +++++++++++--
 ...completeDirectives_DesignTime.mappings.txt | 12 ++---
 ...IncompleteDirectives_DesignTime.codegen.cs | 49 ++++++++++++++++---
 ...completeDirectives_DesignTime.mappings.txt | 16 +++---
 ...IncompleteDirectives_DesignTime.codegen.cs | 49 ++++++++++++++++---
 ...completeDirectives_DesignTime.mappings.txt | 16 +++---
 .../DesignTimeDirectiveTargetExtension.cs     | 17 +++++--
 7 files changed, 149 insertions(+), 45 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 9fdc70a98b..c5fa34abec 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -16,16 +16,36 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
- }
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
@@ -36,7 +56,12 @@ MyService<TModel> __typeHelper = default(MyService<TModel>);
         }
         ))();
         ((System.Action)(() => {
- }
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         }
         #pragma warning restore 219
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index cb37b8b1a0..929d8f49e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,30 +1,30 @@
 Source Location: (93:2,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (680:18,0 [0] )
+Generated Location: (776:19,0 [0] )
 ||
 
 Source Location: (102:3,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (733:21,0 [0] )
+Generated Location: (966:27,0 [0] )
 ||
 
 Source Location: (113:5,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (786:24,0 [0] )
+Generated Location: (1156:35,0 [0] )
 ||
 
 Source Location: (123:6,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (839:27,0 [0] )
+Generated Location: (1346:43,0 [0] )
 ||
 
 Source Location: (133:7,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (988:31,0 [17] )
+Generated Location: (1536:51,0 [17] )
 |MyService<TModel>|
 
 Source Location: (150:7,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1141:38,0 [0] )
+Generated Location: (1785:59,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index dd100bee00..0e78caebf8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -16,16 +16,36 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
- }
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
@@ -36,13 +56,28 @@ MyService<TModel> __typeHelper = default(MyService<TModel>);
         }
         ))();
         ((System.Action)(() => {
- }
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         }
         #pragma warning restore 219
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 4bb61bf781..f7d4a23a9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,40 +1,40 @@
 Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (671:18,0 [0] )
+Generated Location: (767:19,0 [0] )
 ||
 
 Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (724:21,0 [0] )
+Generated Location: (957:27,0 [0] )
 ||
 
 Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (777:24,0 [0] )
+Generated Location: (1148:35,0 [0] )
 ||
 
 Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (830:27,0 [0] )
+Generated Location: (1339:43,0 [0] )
 ||
 
 Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (980:31,0 [17] )
+Generated Location: (1530:51,0 [17] )
 |MyService<TModel>|
 
 Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1133:38,0 [0] )
+Generated Location: (1780:59,0 [0] )
 ||
 
 Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1186:41,0 [0] )
+Generated Location: (1971:67,0 [0] )
 ||
 
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1239:44,0 [0] )
+Generated Location: (2162:75,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index dd100bee00..0e78caebf8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -16,16 +16,36 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
- }
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
@@ -36,13 +56,28 @@ MyService<TModel> __typeHelper = default(MyService<TModel>);
         }
         ))();
         ((System.Action)(() => {
- }
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         ((System.Action)(() => {
- }
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+        }
         ))();
         }
         #pragma warning restore 219
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 4bb61bf781..f7d4a23a9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,40 +1,40 @@
 Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (671:18,0 [0] )
+Generated Location: (767:19,0 [0] )
 ||
 
 Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (724:21,0 [0] )
+Generated Location: (957:27,0 [0] )
 ||
 
 Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (777:24,0 [0] )
+Generated Location: (1148:35,0 [0] )
 ||
 
 Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (830:27,0 [0] )
+Generated Location: (1339:43,0 [0] )
 ||
 
 Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (980:31,0 [17] )
+Generated Location: (1530:51,0 [17] )
 |MyService<TModel>|
 
 Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1133:38,0 [0] )
+Generated Location: (1780:59,0 [0] )
 ||
 
 Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1186:41,0 [0] )
+Generated Location: (1971:67,0 [0] )
 ||
 
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1239:44,0 [0] )
+Generated Location: (2162:75,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
index 29cc438fbb..61300f7efa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
@@ -165,10 +165,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 
         private void WriteMarkerToken(CodeRenderingContext context, DirectiveTokenIntermediateNode node)
         {
-            // We want to map marker tokens to a location in the generated document
-            // that will provide CSharp intellisense.
-            context.AddSourceMappingFor(node);
-            context.CodeWriter.Write(" ");
+            // Marker tokens exist to be filled with other content a user might write. In an end-to-end
+            // scenario markers prep the Razor documents C# projections to have an empty projection that
+            // can be filled with other user content. This content can trigger a multitude of other events,
+            // such as completion. In the case of completion, a completion session can occur when a marker
+            // hasn't been filled and then we will fill it as a user types. The line pragma is necessary
+            // for consistency so when a C# completion session starts, filling user code doesn't result in
+            // a previously non-existent line pragma from being added and destroying the context in which
+            // the completion session was started.
+            using (context.CodeWriter.BuildLinePragma(node.Source))
+            {
+                context.AddSourceMappingFor(node);
+                context.CodeWriter.Write(" ");
+            }
         }
     }
 }

From 9fc340553fa65d0587714d16bdf5510f9a5c16e5 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Fri, 14 Dec 2018 16:34:03 -0800
Subject: [PATCH 018/337] Minor text tag fix \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/5787d1e7d4bc208664fcb0ff57e376785388419c

---
 .../src/Legacy/HtmlMarkupParser.cs            | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 65fc3f0640..3286cbbc66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -712,35 +712,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             AcceptAndMoveNext();
 
-            var bookmark = CurrentStart.AbsoluteIndex;
-            var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-            var selfClosing = At(SyntaxKind.ForwardSlash);
-            if (selfClosing)
+            AcceptWhile(IsSpacingToken(includeNewLines: false));
+            if (At(SyntaxKind.CloseAngle) ||
+                (At(SyntaxKind.ForwardSlash) && NextIs(SyntaxKind.CloseAngle)))
             {
-                tagMode = MarkupTagMode.SelfClosing;
-                Accept(tokens);
-                Assert(SyntaxKind.ForwardSlash);
-                AcceptAndMoveNext();
-                bookmark = CurrentStart.AbsoluteIndex;
-                tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-            }
+                if (At(SyntaxKind.ForwardSlash))
+                {
+                    tagMode = MarkupTagMode.SelfClosing;
+                    AcceptAndMoveNext(); // '/'
+                }
 
-            if (!At(SyntaxKind.CloseAngle))
+                AcceptAndMoveNext(); // '>'
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            else
             {
-                Context.Source.Position = bookmark;
-                NextToken();
                 Context.ErrorSink.OnError(
                     RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
                         new SourceSpan(textLocation, contentLength: 4 /* text */)));
 
                 RecoverTextTag();
             }
-            else
-            {
-                Accept(tokens);
-                TryAccept(SyntaxKind.CloseAngle);
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
 
             isWellFormed = true;
             SpanContext.ChunkGenerator = SpanChunkGenerator.Null;

From 2c2ff1f592c3e4ed1c3000e576c5f6b5dec08be2 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 17 Dec 2018 18:01:02 -0800
Subject: [PATCH 019/337] Code dump of component tests

This is a dump of the existing component codegen tests from
the Blazor effort.

I'm also adding the minimal Component types as a new shim to get things
to compile. This is similar to how our shims work already for MVC.

The next step will be add port functionality until the tests pass.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/49f49dd9f04f62202f4f7b73afa79353e3fc95de
---
 .../src/ComponentDiagnosticFactory.cs         | 322 +++++++++++
 .../src/ComponentResources.Designer.cs        | 270 +++++++++
 .../src/ComponentResources.resx               | 189 +++++++
 .../src/Components/CodeGenerationConstants.cs |   4 +-
 .../ComponentDocumentClassifierPass.cs        |   8 +-
 ...Microsoft.AspNetCore.Razor.Language.csproj |  15 +
 .../LayoutAttribute.cs                        |  21 +
 .../ComponentBase.cs}                         |  10 +-
 .../ElementRef.cs                             |  12 +
 .../IComponent.cs                             |   4 +
 .../InjectAttribute.cs                        |  16 +
 .../ParameterAttribute.cs                     |  15 +
 .../ParameterCollection.cs                    |  13 +
 .../RenderHandle.cs                           |  12 +
 .../RenderTree/RenderTreeBuilder.cs           |   0
 .../UIEventArgs.cs                            | 518 ++++++++++++++++++
 ...AspNetCore.Razor.Test.ComponentShim.csproj |   7 +
 .../RenderFrame.cs                            |  22 +
 ...NetCore.Razor.Test.MvcShim.ClassLib.csproj |   2 +
 ...osoft.AspNetCore.Razor.Test.MvcShim.csproj |   4 +-
 .../AppWithP2PReference.csproj                |   1 +
 .../ClassLibrary/ClassLibrary.csproj          |   1 +
 .../ClassLibrary2/ClassLibrary2.csproj        |   1 +
 .../LargeProject/LargeProject.csproj          |   1 +
 .../MvcWithComponents.csproj                  |   1 +
 .../testassets/SimpleMvc/SimpleMvc.csproj     |   1 +
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |   1 +
 .../testassets/SimplePages/SimplePages.csproj |   1 +
 28 files changed, 1464 insertions(+), 8 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/LayoutAttribute.cs
 rename src/Razor/test/{Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs => Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs} (65%)
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs
 rename src/Razor/test/{Microsoft.AspNetCore.Razor.Test.MvcShim => Microsoft.AspNetCore.Razor.Test.ComponentShim}/Microsoft.AspNetCore.Components/IComponent.cs (70%)
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs
 rename src/Razor/test/{Microsoft.AspNetCore.Razor.Test.MvcShim => Microsoft.AspNetCore.Razor.Test.ComponentShim}/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs (100%)
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/RenderFrame.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs
new file mode 100644
index 0000000000..684bcbcec7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs
@@ -0,0 +1,322 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal static class ComponentDiagnosticFactory
+    {
+        public static readonly RazorDiagnosticDescriptor CodeBlockInAttribute =
+            new RazorDiagnosticDescriptor(
+            "BL9979",
+            () =>
+                "Code blocks delimited by '@{...}' like '@{{ {0} }}' for attributes are no longer supported " +
+                "These features have been changed to use attribute syntax. " +
+                "Use 'attr=\"@(x => {... }\"'.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_CodeBlockInAttribute(SourceSpan? source, string expression)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                CodeBlockInAttribute,
+                source ?? SourceSpan.Undefined,
+                expression);
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor UnclosedTag = new RazorDiagnosticDescriptor(
+            "BL9980",
+            () => "Unclosed tag '{0}' with no matching end tag.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_UnclosedTag(SourceSpan? span, string tagName)
+        {
+            return RazorDiagnostic.Create(UnclosedTag, span ?? SourceSpan.Undefined, tagName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor UnexpectedClosingTag = new RazorDiagnosticDescriptor(
+            "BL9981",
+            () => "Unexpected closing tag '{0}' with no matching start tag.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_UnexpectedClosingTag(SourceSpan? span, string tagName)
+        {
+            return RazorDiagnostic.Create(UnexpectedClosingTag, span ?? SourceSpan.Undefined, tagName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor MismatchedClosingTag = new RazorDiagnosticDescriptor(
+            "BL9982",
+            () => "Mismatching closing tag. Found '{0}' but expected '{1}'.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_MismatchedClosingTag(SourceSpan? span, string expectedTagName, string tagName)
+        {
+            return RazorDiagnostic.Create(MismatchedClosingTag, span ?? SourceSpan.Undefined, expectedTagName, tagName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor UnexpectedClosingTagForVoidElement = new RazorDiagnosticDescriptor(
+            "BL9983",
+            () => "Unexpected closing tag '{0}'. The element '{0}' is a void element, and should be used without a closing tag.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_UnexpectedClosingTagForVoidElement(SourceSpan? span, string tagName)
+        {
+            return RazorDiagnostic.Create(UnexpectedClosingTagForVoidElement, span ?? SourceSpan.Undefined, tagName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor InvalidHtmlContent = new RazorDiagnosticDescriptor(
+            "BL9984",
+            () => "Found invalid HTML content. Text '{0}'",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_InvalidHtmlContent(SourceSpan? span, string text)
+        {
+            return RazorDiagnostic.Create(InvalidHtmlContent, span ?? SourceSpan.Undefined, text);
+        }
+
+        public static readonly RazorDiagnosticDescriptor MultipleComponents = new RazorDiagnosticDescriptor(
+            "BL9985",
+            () => "Multiple components use the tag '{0}'. Components: {1}",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_MultipleComponents(SourceSpan? span, string tagName, IEnumerable<TagHelperDescriptor> components)
+        {
+            return RazorDiagnostic.Create(MultipleComponents, span ?? SourceSpan.Undefined, tagName, string.Join(", ", components.Select(c => c.DisplayName)));
+        }
+
+        public static readonly RazorDiagnosticDescriptor UnsupportedComplexContent = new RazorDiagnosticDescriptor(
+            "BL9986",
+            () => "Component attributes do not support complex content (mixed C# and markup). Attribute: '{0}', text '{1}'",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_UnsupportedComplexContent(IntermediateNode node, string attributeName)
+        {
+            var content = string.Join("", node.FindDescendantNodes<IntermediateToken>().Select(t => t.Content));
+            return RazorDiagnostic.Create(UnsupportedComplexContent, node.Source ?? SourceSpan.Undefined, attributeName, content);
+        }
+
+        public static readonly RazorDiagnosticDescriptor PageDirective_CannotBeImported =
+            new RazorDiagnosticDescriptor(
+            "BL9987",
+            () => ComponentResources.PageDirectiveCannotBeImported,
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_CannotBeImported(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_CannotBeImported, source, "page", fileName);
+
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor PageDirective_MustSpecifyRoute =
+            new RazorDiagnosticDescriptor(
+            "BL9988",
+            () => "The @page directive must specify a route template. The route template must be enclosed in quotes and begin with the '/' character.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_MustSpecifyRoute(SourceSpan? source)
+        {
+            var diagnostic = RazorDiagnostic.Create(PageDirective_MustSpecifyRoute, source ?? SourceSpan.Undefined);
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor BindAttribute_Duplicates =
+            new RazorDiagnosticDescriptor(
+            "BL9989",
+            () => "The attribute '{0}' was matched by multiple bind attributes. Duplicates:{1}",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateBindAttribute_Duplicates(SourceSpan? source, string attribute, TagHelperPropertyIntermediateNode[] attributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                BindAttribute_Duplicates,
+                source ?? SourceSpan.Undefined,
+                attribute,
+                Environment.NewLine + string.Join(Environment.NewLine, attributes.Select(p => p.TagHelper.DisplayName)));
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor EventHandler_Duplicates =
+            new RazorDiagnosticDescriptor(
+            "BL9990",
+            () => "The attribute '{0}' was matched by multiple event handlers attributes. Duplicates:{1}",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateEventHandler_Duplicates(SourceSpan? source, string attribute, TagHelperPropertyIntermediateNode[] attributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                EventHandler_Duplicates,
+                source ?? SourceSpan.Undefined,
+                attribute,
+                Environment.NewLine + string.Join(Environment.NewLine, attributes.Select(p => p.TagHelper.DisplayName)));
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor BindAttribute_InvalidSyntax =
+            new RazorDiagnosticDescriptor(
+            "BL9991",
+            () => "The attribute names could not be inferred from bind attribute '{0}'. Bind attributes should be of the form" +
+                "'bind', 'bind-value' or 'bind-value-change'",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateBindAttribute_InvalidSyntax(SourceSpan? source, string attribute)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                BindAttribute_InvalidSyntax,
+                source ?? SourceSpan.Undefined,
+                attribute);
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor DisallowedScriptTag = new RazorDiagnosticDescriptor(
+            "BL9992",
+            () => "Script tags should not be placed inside components because they cannot be updated dynamically. To fix this, move the script tag to the 'index.html' file or another static location. For more information see https://go.microsoft.com/fwlink/?linkid=872131",
+            RazorDiagnosticSeverity.Error);
+
+        // Reserved: BL9993 Component parameters should not be public
+
+        public static RazorDiagnostic Create_DisallowedScriptTag(SourceSpan? source)
+        {
+            var diagnostic = RazorDiagnostic.Create(DisallowedScriptTag, source ?? SourceSpan.Undefined);
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor TemplateInvalidLocation =
+            new RazorDiagnosticDescriptor(
+            "BL9994",
+            () => "Razor templates cannot be used in attributes.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_TemplateInvalidLocation(SourceSpan? source)
+        {
+            return RazorDiagnostic.Create(TemplateInvalidLocation, source ?? SourceSpan.Undefined);
+        }
+
+        public static readonly RazorDiagnosticDescriptor ChildContentSetByAttributeAndBody =
+            new RazorDiagnosticDescriptor(
+                "BL9995",
+                () => "The child content property '{0}' is set by both the attribute and the element contents.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_ChildContentSetByAttributeAndBody(SourceSpan? source, string attribute)
+        {
+            return RazorDiagnostic.Create(ChildContentSetByAttributeAndBody, source ?? SourceSpan.Undefined, attribute);
+        }
+
+        public static readonly RazorDiagnosticDescriptor ChildContentMixedWithExplicitChildContent =
+            new RazorDiagnosticDescriptor(
+                "BL9996",
+                () => "Unrecognized child content inside component '{0}'. The component '{0}' accepts child content through the " +
+                "following top-level items: {1}.",
+                RazorDiagnosticSeverity.Error);
+
+        //public static RazorDiagnostic Create_ChildContentMixedWithExplicitChildContent(SourceSpan? source, ComponentExtensionNode component)
+        //{
+        //    var supportedElements = string.Join(", ", component.Component.GetChildContentProperties().Select(p => $"'{p.Name}'"));
+        //    return RazorDiagnostic.Create(ChildContentMixedWithExplicitChildContent, source ?? SourceSpan.Undefined, component.TagName, supportedElements);
+        //}
+
+        public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidAttribute =
+            new RazorDiagnosticDescriptor(
+                "BL9997",
+                () => "Unrecognized attribute '{0}' on child content element '{1}'.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_ChildContentHasInvalidAttribute(SourceSpan? source, string attribute, string element)
+        {
+            return RazorDiagnostic.Create(ChildContentHasInvalidAttribute, source ?? SourceSpan.Undefined, attribute, element);
+        }
+
+        public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameter =
+            new RazorDiagnosticDescriptor(
+                "BL9998",
+                () => "Invalid parameter name. The parameter name attribute '{0}' on child content element '{1}' can only include literal text.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_ChildContentHasInvalidParameter(SourceSpan? source, string attribute, string element)
+        {
+            return RazorDiagnostic.Create(ChildContentHasInvalidParameter, source ?? SourceSpan.Undefined, attribute, element);
+        }
+
+        public static readonly RazorDiagnosticDescriptor ChildContentRepeatedParameterName =
+            new RazorDiagnosticDescriptor(
+                "BL9999",
+                () => "The child content element '{0}' of component '{1}' uses the same parameter name ('{2}') as enclosing child content " +
+                "element '{3}' of component '{4}'. Specify the parameter name like: '<{0} Context=\"another_name\"> to resolve the ambiguity",
+                RazorDiagnosticSeverity.Error);
+
+        //public static RazorDiagnostic Create_ChildContentRepeatedParameterName(
+        //    SourceSpan? source,
+        //    ComponentChildContentIntermediateNode childContent1,
+        //    ComponentExtensionNode component1,
+        //    ComponentChildContentIntermediateNode childContent2,
+        //    ComponentExtensionNode component2)
+        //{
+        //    Debug.Assert(childContent1.ParameterName == childContent2.ParameterName);
+        //    Debug.Assert(childContent1.IsParameterized);
+        //    Debug.Assert(childContent2.IsParameterized);
+
+        //    return RazorDiagnostic.Create(
+        //        ChildContentRepeatedParameterName,
+        //        source ?? SourceSpan.Undefined,
+        //        childContent1.AttributeName,
+        //        component1.TagName,
+        //        childContent1.ParameterName,
+        //        childContent2.AttributeName,
+        //        component2.TagName);
+        //}
+
+        public static readonly RazorDiagnosticDescriptor GenericComponentMissingTypeArgument =
+            new RazorDiagnosticDescriptor(
+                "BL10000",
+                () => "The component '{0}' is missing required type arguments. Specify the missing types using the attributes: {1}.",
+                RazorDiagnosticSeverity.Error);
+
+        //public static RazorDiagnostic Create_GenericComponentMissingTypeArgument(
+        //    SourceSpan? source,
+        //    ComponentExtensionNode component,
+        //    IEnumerable<BoundAttributeDescriptor> attributes)
+        //{
+        //    Debug.Assert(component.Component.IsGenericTypedComponent());
+
+        //    var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'"));
+        //    return RazorDiagnostic.Create(GenericComponentMissingTypeArgument, source ?? SourceSpan.Undefined, component.TagName, attributesText);
+        //}
+
+        public static readonly RazorDiagnosticDescriptor GenericComponentTypeInferenceUnderspecified =
+            new RazorDiagnosticDescriptor(
+                "BL10001",
+                () => "The type of component '{0}' cannot be inferred based on the values provided. Consider specifying the type arguments " +
+                    "directly using the following attributes: {1}.",
+                RazorDiagnosticSeverity.Error);
+
+        //public static RazorDiagnostic Create_GenericComponentTypeInferenceUnderspecified(
+        //    SourceSpan? source,
+        //    ComponentExtensionNode component,
+        //    IEnumerable<BoundAttributeDescriptor> attributes)
+        //{
+        //    Debug.Assert(component.Component.IsGenericTypedComponent());
+
+        //    var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'"));
+        //    return RazorDiagnostic.Create(GenericComponentTypeInferenceUnderspecified, source ?? SourceSpan.Undefined, component.TagName, attributesText);
+        //}
+
+        public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameterOnComponent =
+            new RazorDiagnosticDescriptor(
+                "BL10002",
+                () => "Invalid parameter name. The parameter name attribute '{0}' on component '{1}' can only include literal text.",
+                RazorDiagnosticSeverity.Error);
+
+        //public static RazorDiagnostic Create_ChildContentHasInvalidParameterOnComponent(SourceSpan? source, string attribute, string element)
+        //{
+        //    return RazorDiagnostic.Create(ChildContentHasInvalidParameterOnComponent, source ?? SourceSpan.Undefined, attribute, element);
+        //}
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
new file mode 100644
index 0000000000..3a7ce3183a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
@@ -0,0 +1,270 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.AspNetCore.Razor.Language {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class ComponentResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal ComponentResources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Razor.Language.ComponentResources", typeof(ComponentResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Binds the provided expression to the &apos;{0}&apos; property and a change event delegate to the &apos;{1}&apos; property of the component..
+        /// </summary>
+        internal static string BindTagHelper_Component_Documentation {
+            get {
+                return ResourceManager.GetString("BindTagHelper_Component_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Binds the provided expression to the &apos;{0}&apos; attribute and a change event delegate to the &apos;{1}&apos; attribute..
+        /// </summary>
+        internal static string BindTagHelper_Element_Documentation {
+            get {
+                return ResourceManager.GetString("BindTagHelper_Element_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specifies a format to convert the value specified by the &apos;{0}&apos; attribute. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;..
+        /// </summary>
+        internal static string BindTagHelper_Element_Format_Documentation {
+            get {
+                return ResourceManager.GetString("BindTagHelper_Element_Format_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;bind-value-onchange=&quot;...&quot;&lt;/code&gt; will assign the current value of the expression to the &apos;value&apos; attribute, and assign a delegate that attempts to set the value to the &apos;onchange&apos; attribute..
+        /// </summary>
+        internal static string BindTagHelper_Fallback_Documentation {
+            get {
+                return ResourceManager.GetString("BindTagHelper_Fallback_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;format-value=&quot;...&quot;&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;bind-value-...&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;..
+        /// </summary>
+        internal static string BindTagHelper_Fallback_Format_Documentation {
+            get {
+                return ResourceManager.GetString("BindTagHelper_Fallback_Format_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specifies the parameter name for the &apos;{0}&apos; child content expression..
+        /// </summary>
+        internal static string ChildContentParameterName_Documentation {
+            get {
+                return ResourceManager.GetString("ChildContentParameterName_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specifies the parameter name for all child content expressions..
+        /// </summary>
+        internal static string ChildContentParameterName_TopLevelDocumentation {
+            get {
+                return ResourceManager.GetString("ChildContentParameterName_TopLevelDocumentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specifies the type of the type parameter {0} for the {1} component..
+        /// </summary>
+        internal static string ComponentTypeParameter_Documentation {
+            get {
+                return ResourceManager.GetString("ComponentTypeParameter_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sets the &apos;{0}&apos; attribute to the provided string or delegate value. A delegate value should be of type &apos;{1}&apos;..
+        /// </summary>
+        internal static string EventHandlerTagHelper_Documentation {
+            get {
+                return ResourceManager.GetString("EventHandlerTagHelper_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declares an interface implementation for the current document..
+        /// </summary>
+        internal static string ImplementsDirective_Description {
+            get {
+                return ResourceManager.GetString("ImplementsDirective_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The interface type implemented by the current document..
+        /// </summary>
+        internal static string ImplementsDirective_TypeToken_Description {
+            get {
+                return ResourceManager.GetString("ImplementsDirective_TypeToken_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to TypeName.
+        /// </summary>
+        internal static string ImplementsDirective_TypeToken_Name {
+            get {
+                return ResourceManager.GetString("ImplementsDirective_TypeToken_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declares a layout type for the current document..
+        /// </summary>
+        internal static string LayoutDirective_Description {
+            get {
+                return ResourceManager.GetString("LayoutDirective_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The interface type implemented by the current document..
+        /// </summary>
+        internal static string LayoutDirective_TypeToken_Description {
+            get {
+                return ResourceManager.GetString("LayoutDirective_TypeToken_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to TypeName.
+        /// </summary>
+        internal static string LayoutDirective_TypeToken_Name {
+            get {
+                return ResourceManager.GetString("LayoutDirective_TypeToken_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mark the page as a routable component..
+        /// </summary>
+        internal static string PageDirective_Description {
+            get {
+                return ResourceManager.GetString("PageDirective_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An optional route template for the component..
+        /// </summary>
+        internal static string PageDirective_RouteToken_Description {
+            get {
+                return ResourceManager.GetString("PageDirective_RouteToken_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to route template.
+        /// </summary>
+        internal static string PageDirective_RouteToken_Name {
+            get {
+                return ResourceManager.GetString("PageDirective_RouteToken_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The &apos;@{0}&apos; directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string PageDirectiveCannotBeImported {
+            get {
+                return ResourceManager.GetString("PageDirectiveCannotBeImported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Populates the specified field or property with a reference to the element or component..
+        /// </summary>
+        internal static string RefTagHelper_Documentation {
+            get {
+                return ResourceManager.GetString("RefTagHelper_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declares a generic type parameter for the generated component class..
+        /// </summary>
+        internal static string TypeParamDirective_Description {
+            get {
+                return ResourceManager.GetString("TypeParamDirective_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The name of the type parameter..
+        /// </summary>
+        internal static string TypeParamDirective_Token_Description {
+            get {
+                return ResourceManager.GetString("TypeParamDirective_Token_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to type parameter.
+        /// </summary>
+        internal static string TypeParamDirective_Token_Name {
+            get {
+                return ResourceManager.GetString("TypeParamDirective_Token_Name", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
new file mode 100644
index 0000000000..3fe9868ecd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="BindTagHelper_Component_Documentation" xml:space="preserve">
+    <value>Binds the provided expression to the '{0}' property and a change event delegate to the '{1}' property of the component.</value>
+  </data>
+  <data name="BindTagHelper_Element_Documentation" xml:space="preserve">
+    <value>Binds the provided expression to the '{0}' attribute and a change event delegate to the '{1}' attribute.</value>
+  </data>
+  <data name="BindTagHelper_Element_Format_Documentation" xml:space="preserve">
+    <value>Specifies a format to convert the value specified by the '{0}' attribute. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
+  </data>
+  <data name="BindTagHelper_Fallback_Documentation" xml:space="preserve">
+    <value>Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;bind-value-onchange="..."&lt;/code&gt; will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute.</value>
+  </data>
+  <data name="BindTagHelper_Fallback_Format_Documentation" xml:space="preserve">
+    <value>Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;format-value="..."&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;bind-value-...&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
+  </data>
+  <data name="ChildContentParameterName_Documentation" xml:space="preserve">
+    <value>Specifies the parameter name for the '{0}' child content expression.</value>
+  </data>
+  <data name="ChildContentParameterName_TopLevelDocumentation" xml:space="preserve">
+    <value>Specifies the parameter name for all child content expressions.</value>
+  </data>
+  <data name="ComponentTypeParameter_Documentation" xml:space="preserve">
+    <value>Specifies the type of the type parameter {0} for the {1} component.</value>
+  </data>
+  <data name="EventHandlerTagHelper_Documentation" xml:space="preserve">
+    <value>Sets the '{0}' attribute to the provided string or delegate value. A delegate value should be of type '{1}'.</value>
+  </data>
+  <data name="ImplementsDirective_Description" xml:space="preserve">
+    <value>Declares an interface implementation for the current document.</value>
+  </data>
+  <data name="ImplementsDirective_TypeToken_Description" xml:space="preserve">
+    <value>The interface type implemented by the current document.</value>
+  </data>
+  <data name="ImplementsDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="LayoutDirective_Description" xml:space="preserve">
+    <value>Declares a layout type for the current document.</value>
+  </data>
+  <data name="LayoutDirective_TypeToken_Description" xml:space="preserve">
+    <value>The interface type implemented by the current document.</value>
+  </data>
+  <data name="LayoutDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="PageDirectiveCannotBeImported" xml:space="preserve">
+    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file</value>
+  </data>
+  <data name="PageDirective_Description" xml:space="preserve">
+    <value>Mark the page as a routable component.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Description" xml:space="preserve">
+    <value>An optional route template for the component.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Name" xml:space="preserve">
+    <value>route template</value>
+  </data>
+  <data name="RefTagHelper_Documentation" xml:space="preserve">
+    <value>Populates the specified field or property with a reference to the element or component.</value>
+  </data>
+  <data name="TypeParamDirective_Description" xml:space="preserve">
+    <value>Declares a generic type parameter for the generated component class.</value>
+  </data>
+  <data name="TypeParamDirective_Token_Description" xml:space="preserve">
+    <value>The name of the type parameter.</value>
+  </data>
+  <data name="TypeParamDirective_Token_Name" xml:space="preserve">
+    <value>type parameter</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
index 35c176a678..43f0cb1909 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
@@ -7,9 +7,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     // Keep these in sync with the actual definitions
     internal static class CodeGenerationConstants
     {
-        public static class RazorComponent
+        public static class ComponentBase
         {
-            public const string FullTypeName = "Microsoft.AspNetCore.Components.Component";
+            public const string FullTypeName = "Microsoft.AspNetCore.Components.ComponentBase";
             public const string BuildRenderTree = "BuildRenderTree";
             public const string BuildRenderTreeParameter = "builder";
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 29afa982af..2e1f24cdb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             @namespace.Content = computedNamespace;
 
             @class.ClassName = computedClass;
-            @class.BaseType = $"global::{CodeGenerationConstants.RazorComponent.FullTypeName}";
+            @class.BaseType = $"global::{CodeGenerationConstants.ComponentBase.FullTypeName}";
             var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
             if (string.IsNullOrEmpty(filePath))
             {
@@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             @class.Modifiers.Add("public");
             @class.Modifiers.Add("sealed");
 
-            method.MethodName = CodeGenerationConstants.RazorComponent.BuildRenderTree;
+            method.MethodName = CodeGenerationConstants.ComponentBase.BuildRenderTree;
             method.ReturnType = "void";
             method.Modifiers.Clear();
             method.Modifiers.Add("public");
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             method.Parameters.Add(new MethodParameter()
             {
                 TypeName = CodeGenerationConstants.RenderTreeBuilder.FullTypeName,
-                ParameterName = CodeGenerationConstants.RazorComponent.BuildRenderTreeParameter,
+                ParameterName = CodeGenerationConstants.ComponentBase.BuildRenderTreeParameter,
             });
 
             // We need to call the 'base' method as the first statement.
@@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             callBase.Children.Add(new IntermediateToken
             {
                 Kind = TokenKind.CSharp,
-                Content = $"base.{CodeGenerationConstants.RazorComponent.BuildRenderTree}({CodeGenerationConstants.RazorComponent.BuildRenderTreeParameter});"
+                Content = $"base.{CodeGenerationConstants.ComponentBase.BuildRenderTree}({CodeGenerationConstants.ComponentBase.BuildRenderTreeParameter});"
             });
             method.Children.Insert(0, callBase);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
index 1fd7aeebf5..d27b1d8dd6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
@@ -9,4 +9,19 @@
     <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="ComponentResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ComponentResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="ComponentResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ComponentResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/LayoutAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/LayoutAttribute.cs
new file mode 100644
index 0000000000..63f6d64e4a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/LayoutAttribute.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components.Layouts
+{
+    /// <summary>
+    /// Indicates that the associated component type uses a specified layout.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class LayoutAttribute : Attribute
+    {
+        public LayoutAttribute(Type layoutType)
+        {
+            LayoutType = layoutType ?? throw new ArgumentNullException(nameof(layoutType));
+        }
+
+        public Type LayoutType { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
similarity index 65%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
index 87301deb92..208b3aad25 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
@@ -5,12 +5,20 @@ using Microsoft.AspNetCore.Components.RenderTree;
 
 namespace Microsoft.AspNetCore.Components
 {
-    public abstract class Component : IComponent
+    public abstract class ComponentBase : IComponent
     {
         public virtual void BuildRenderTree(RenderTreeBuilder builder)
         {
         }
 
+        public virtual void SetParameters(ParameterCollection parameters)
+        {
+        }
+
+        void IComponent.Init(RenderHandle renderHandle)
+        {
+        }
+
         protected void WriteLiteral(string literal) { }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs
new file mode 100644
index 0000000000..06d6c9d370
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Represents a reference to a rendered element.
+    /// </summary>
+    public struct ElementRef
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs
similarity index 70%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs
index c2fe5924da..0f909c5d71 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs
@@ -5,5 +5,9 @@ namespace Microsoft.AspNetCore.Components
 {
     public interface IComponent
     {
+        void Init(RenderHandle renderHandle);
+
+
+        void SetParameters(ParameterCollection parameters);
     }
 }
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs
new file mode 100644
index 0000000000..3490c456ce
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs
@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Indicates that the associated property should have a value injected from the
+    /// service provider during initialization.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+    public class InjectAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs
new file mode 100644
index 0000000000..5351c619fb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Denotes the target member as a component parameter.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class ParameterAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs
new file mode 100644
index 0000000000..f055fa6e9b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Represents a collection of parameters supplied to an <see cref="IComponent"/>
+    /// by its parent in the render tree.
+    /// </summary>
+    public struct ParameterCollection
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs
new file mode 100644
index 0000000000..b0034b801f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Allows a component to notify the renderer that it should be rendered.
+    /// </summary>
+    public struct RenderHandle
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs
new file mode 100644
index 0000000000..953300d8a9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs
@@ -0,0 +1,518 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Supplies information about an event that is being raised.
+    /// </summary>
+    public class UIEventArgs
+    {
+        /// <summary>
+        /// Gets or sets the type of the event.
+        /// </summary>
+        public string Type { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about an input change event that is being raised.
+    /// </summary>
+    public class UIChangeEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// Gets or sets the new value of the input. This may be a <see cref="string"/>
+        /// or a <see cref="bool"/>.
+        /// </summary>
+        public object Value { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about an clipboard event that is being raised.
+    /// </summary>
+    public class UIClipboardEventArgs : UIEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Supplies information about an drag event that is being raised.
+    /// </summary>
+    public class UIDragEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
+        /// </summary>
+        public long Detail { get; set; }
+
+        /// <summary>
+        /// The data that underlies a drag-and-drop operation, known as the drag data store.
+        /// See <see cref="DataTransfer"/>.
+        /// </summary>
+        public DataTransfer DataTransfer { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the mouse pointer in global (screen) coordinates.
+        /// </summary>
+        public long ScreenX { get; set; }
+
+        /// <summary>
+        /// The Y coordinate of the mouse pointer in global (screen) coordinates.
+        /// </summary>
+        public long ScreenY { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the mouse pointer in local (DOM content) coordinates.
+        /// </summary>
+        public long ClientX { get; set; }
+
+        /// <summary>
+        /// 	The Y coordinate of the mouse pointer in local (DOM content) coordinates.
+        /// </summary>
+        public long ClientY { get; set; }
+
+        /// <summary>
+        /// The button number that was pressed when the mouse event was fired:
+        /// Left button=0,
+        /// middle button=1 (if present),
+        /// right button=2.
+        /// For mice configured for left handed use in which the button actions are reversed the values are instead read from right to left.
+        /// </summary>
+        public long Button { get; set; }
+
+        /// <summary>
+        /// The buttons being pressed when the mouse event was fired:
+        /// Left button=1,
+        /// Right button=2,
+        /// Middle (wheel) button=4,
+        /// 4th button (typically, "Browser Back" button)=8,
+        /// 5th button (typically, "Browser Forward" button)=16.
+        /// If two or more buttons are pressed, returns the logical sum of the values.
+        /// E.g., if Left button and Right button are pressed, returns 3 (=1 | 2).
+        /// </summary>
+        public long Buttons { get; set; }
+
+        /// <summary>
+        /// true if the control key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool CtrlKey { get; set; }
+
+        /// <summary>
+        /// true if the shift key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool ShiftKey { get; set; }
+
+        /// <summary>
+        /// true if the alt key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool AltKey { get; set; }
+
+        /// <summary>
+        /// true if the meta key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool MetaKey { get; set; }
+    }
+
+    /// <summary>
+    /// The <see cref="DataTransfer"/> object is used to hold the data that is being dragged during a drag and drop operation.
+    /// It may hold one or more <see cref="UIDataTransferItem"/>, each of one or more data types.
+    /// For more information about drag and drop, see HTML Drag and Drop API.
+    /// </summary>
+    public class DataTransfer
+    {
+        /// <summary>
+        /// Gets the type of drag-and-drop operation currently selected or sets the operation to a new type.
+        /// The value must be none, copy, link or move.
+        /// </summary>
+        public string DropEffect { get; set; }
+
+        /// <summary>
+        /// Provides all of the types of operations that are possible.
+        /// Must be one of none, copy, copyLink, copyMove, link, linkMove, move, all or uninitialized.
+        /// </summary>
+        public string EffectAllowed { get; set; }
+
+        /// <summary>
+        /// Contains a list of all the local files available on the data transfer.
+        /// If the drag operation doesn't involve dragging files, this property is an empty list.
+        /// </summary>
+        public string[] Files { get; set; }
+
+        /// <summary>
+        /// Gives a <see cref="UIDataTransferItem"/> array which is a list of all of the drag data.
+        /// </summary>
+        public UIDataTransferItem[] Items { get; set; }
+
+        /// <summary>
+        /// An array of <see cref="string"/> giving the formats that were set in the dragstart event.
+        /// </summary>
+        public string[] Types { get; set; }
+    }
+
+    /// <summary>
+    /// The <see cref="UIDataTransferItem"/> object represents one drag data item.
+    /// During a drag operation, each drag event has a dataTransfer property which contains a list of drag data items.
+    /// Each item in the list is a <see cref="UIDataTransferItem"/> object.
+    /// </summary>
+    public class UIDataTransferItem
+    {
+        /// <summary>
+        /// The kind of drag data item, string or file
+        /// </summary>
+        public string Kind { get; set; }
+
+        /// <summary>
+        /// The drag data item's type, typically a MIME type
+        /// </summary>
+        public string Type { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about an error event that is being raised.
+    /// </summary>
+    public class UIErrorEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// Gets a a human-readable error message describing the problem.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Gets the name of the script file in which the error occurred.
+        /// </summary>
+        public string Filename { get; set; }
+
+        /// <summary>
+        /// Gets the line number of the script file on which the error occurred.
+        /// </summary>
+        public int Lineno { get; set; }
+
+        /// <summary>
+        /// Gets the column number of the script file on which the error occurred.
+        /// </summary>
+        public int Colno { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about a focus event that is being raised.
+    /// </summary>
+    public class UIFocusEventArgs : UIEventArgs
+    {
+        // Not including support for 'relatedTarget' since we don't have a good way to represent it.
+        // see: https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent
+    }
+
+    /// <summary>
+    /// Supplies information about a keyboard event that is being raised.
+    /// </summary>
+    public class UIKeyboardEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// The key value of the key represented by the event. 
+        /// If the value has a printed representation, this attribute's value is the same as the char attribute. 
+        /// Otherwise, it's one of the key value strings specified in 'Key values'. 
+        /// If the key can't be identified, this is the string "Unidentified"
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Holds a string that identifies the physical key being pressed. 
+        /// The value is not affected by the current keyboard layout or modifier state, so a particular key will always return the same value.
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// The location of the key on the device.
+        /// </summary>
+        public float Location { get; set; }
+
+        /// <summary>
+        /// true if a key has been depressed long enough to trigger key repetition, otherwise false.
+        /// </summary>
+        public bool Repeat { get; set; }
+
+        /// <summary>
+        /// true if the control key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool CtrlKey { get; set; }
+
+        /// <summary>
+        /// true if the shift key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool ShiftKey { get; set; }
+
+        /// <summary>
+        /// true if the alt key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool AltKey { get; set; }
+
+        /// <summary>
+        /// true if the meta key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool MetaKey { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about a mouse event that is being raised.
+    /// </summary>
+    public class UIMouseEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
+        /// </summary>
+        public long Detail { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the mouse pointer in global (screen) coordinates.
+        /// </summary>
+        public long ScreenX { get; set; }
+
+        /// <summary>
+        /// The Y coordinate of the mouse pointer in global (screen) coordinates.
+        /// </summary>
+        public long ScreenY { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the mouse pointer in local (DOM content) coordinates.
+        /// </summary>
+        public long ClientX { get; set; }
+
+        /// <summary>
+        /// 	The Y coordinate of the mouse pointer in local (DOM content) coordinates.
+        /// </summary>
+        public long ClientY { get; set; }
+
+        /// <summary>
+        /// The button number that was pressed when the mouse event was fired:
+        /// Left button=0,
+        /// middle button=1 (if present),
+        /// right button=2.
+        /// For mice configured for left handed use in which the button actions are reversed the values are instead read from right to left.
+        /// </summary>
+        public long Button { get; set; }
+
+        /// <summary>
+        /// The buttons being pressed when the mouse event was fired:
+        /// Left button=1,
+        /// Right button=2,
+        /// Middle (wheel) button=4,
+        /// 4th button (typically, "Browser Back" button)=8,
+        /// 5th button (typically, "Browser Forward" button)=16.
+        /// If two or more buttons are pressed, returns the logical sum of the values.
+        /// E.g., if Left button and Right button are pressed, returns 3 (=1 | 2).
+        /// </summary>
+        public long Buttons { get; set; }
+
+        /// <summary>
+        /// true if the control key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool CtrlKey { get; set; }
+
+        /// <summary>
+        /// true if the shift key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool ShiftKey { get; set; }
+
+        /// <summary>
+        /// true if the alt key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool AltKey { get; set; }
+
+        /// <summary>
+        /// true if the meta key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool MetaKey { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about a mouse event that is being raised.
+    /// </summary>
+    public class UIPointerEventArgs : UIMouseEventArgs
+    {
+        /// <summary>
+        /// A unique identifier for the pointer causing the event.
+        /// </summary>
+        public string PointerId { get; set; }
+
+        /// <summary>
+        /// The width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer.
+        /// </summary>
+        public float Width { get; set; }
+
+        /// <summary>
+        /// The height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
+        /// </summary>
+        public float Height { get; set; }
+
+        /// <summary>
+        /// The normalized pressure of the pointer input in the range of 0 to 1,
+        /// where 0 and 1 represent the minimum and maximum pressure the hardware is capable of detecting, respectively.
+        /// </summary>
+        public float Pressure { get; set; }
+
+        /// <summary>
+        /// The plane angle (in degrees, in the range of -90 to 90) between the Y-Z plane
+        /// and the plane containing both the transducer (e.g. pen stylus) axis and the Y axis.
+        /// </summary>
+        public float TiltX { get; set; }
+
+        /// <summary>
+        /// The plane angle (in degrees, in the range of -90 to 90) between the X-Z plane
+        /// and the plane containing both the transducer (e.g. pen stylus) axis and the X axis.
+        /// </summary>
+        public float TiltY { get; set; }
+
+        /// <summary>
+        /// Indicates the device type that caused the event.
+        /// Must be one of the strings mouse, pen or touch, or an empty string.
+        /// </summary>
+        public string PointerType { get; set; }
+
+        /// <summary>
+        /// Indicates if the pointer represents the primary pointer of this pointer type.
+        /// </summary>
+        public bool IsPrimary { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about a progress event that is being raised.
+    /// </summary>
+    public class UIProgressEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// Whether or not the total size of the transfer is known.
+        /// </summary>
+        public bool LengthComputable { get; set; }
+
+        /// <summary>
+        /// The number of bytes transferred since the beginning of the operation.
+        /// This doesn't include headers and other overhead, but only the content itself.
+        /// </summary>
+        public long Loaded { get; set; }
+
+        /// <summary>
+        /// The total number of bytes of content that will be transferred during the operation.
+        /// If the total size is unknown, this value is zero. 
+        /// </summary>
+        public long Total { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about a touch event that is being raised.
+    /// </summary>
+    public class UITouchEventArgs : UIEventArgs
+    {
+        /// <summary>
+        /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
+        /// </summary>
+        public long Detail { get; set; }
+
+        /// <summary>
+        /// A list of <see cref="UITouchPoint"/> for every point of contact currently touching the surface.
+        /// </summary>
+        public UITouchPoint[] Touches { get; set; }
+
+        /// <summary>
+        /// A list of <see cref="UITouchPoint"/> for every point of contact that is touching the surface and started on the element that is the target of the current event.
+        /// </summary>
+        public UITouchPoint[] TargetTouches { get; set; }
+
+        /// <summary>
+        /// A list of Touches for every point of contact which contributed to the event.
+        /// For the touchstart event this must be a list of the touch points that just became active with the current event.
+        /// For the touchmove event this must be a list of the touch points that have moved since the last event.
+        /// For the touchend and touchcancel events this must be a list of the touch points that have just been removed from the surface.
+        /// </summary>
+        public UITouchPoint[] ChangedTouches { get; set; }
+
+        /// <summary>
+        /// true if the control key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool CtrlKey { get; set; }
+
+        /// <summary>
+        /// true if the shift key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool ShiftKey { get; set; }
+
+        /// <summary>
+        /// true if the alt key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool AltKey { get; set; }
+
+        /// <summary>
+        /// true if the meta key was down when the event was fired. false otherwise.
+        /// </summary>
+        public bool MetaKey { get; set; }
+    }
+
+    /// <summary>
+    /// Represents a single contact point on a touch-sensitive device.
+    /// The contact point is commonly a finger or stylus and the device may be a touchscreen or trackpad.
+    /// </summary>
+    public class UITouchPoint
+    {
+        /// <summary>
+        /// A unique identifier for this Touch object.
+        /// A given touch point (say, by a finger) will have the same identifier for the duration of its movement around the surface.
+        /// This lets you ensure that you're tracking the same touch all the time.
+        /// </summary>
+        public long Identifier { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the touch point relative to the left edge of the screen.
+        /// </summary>
+        public long ScreenX { get; set; }
+
+        /// <summary>
+        /// The Y coordinate of the touch point relative to the top edge of the screen.
+        /// </summary>
+        public long ScreenY { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the touch point relative to the left edge of the browser viewport, not including any scroll offset.
+        /// </summary>
+        public long ClientX { get; set; }
+
+        /// <summary>
+        /// The Y coordinate of the touch point relative to the top edge of the browser viewport, not including any scroll offset.
+        /// </summary>
+        public long ClientY { get; set; }
+
+        /// <summary>
+        /// The X coordinate of the touch point relative to the left edge of the document.
+        /// Unlike <see cref="ClientX"/>, this value includes the horizontal scroll offset, if any.
+        /// </summary>
+        public long PageX { get; set; }
+
+        /// <summary>
+        /// The Y coordinate of the touch point relative to the top of the document.
+        /// Unlike <see cref="ClientY"/>, this value includes the vertical scroll offset, if any.
+        /// </summary>
+        public long PageY { get; set; }
+    }
+
+    /// <summary>
+    /// Supplies information about a mouse wheel event that is being raised.
+    /// </summary>
+    public class UIWheelEventArgs : UIMouseEventArgs
+    {
+        /// <summary>
+        /// The horizontal scroll amount.
+        /// </summary>
+        public double DeltaX { get; set; }
+
+        /// <summary>
+        /// The vertical scroll amount.
+        /// </summary>
+        public double DeltaY { get; set; }
+
+        /// <summary>
+        /// The scroll amount for the z-axis.
+        /// </summary>
+        public double DeltaZ { get; set; }
+
+        /// <summary>
+        /// The unit of the delta values scroll amount. 
+        /// </summary>
+        public long DeltaMode { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj
new file mode 100644
index 0000000000..756371e76d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/RenderFrame.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/RenderFrame.cs
new file mode 100644
index 0000000000..01c9e70b1a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/RenderFrame.cs
@@ -0,0 +1,22 @@
+// 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 Microsoft.AspNetCore.Components.RenderTree;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Represents a segment of UI content, implemented as a delegate that
+    /// writes the content to a <see cref="RenderTreeBuilder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="RenderTreeBuilder"/> to which the content should be written.</param>
+    public delegate void RenderFragment(RenderTreeBuilder builder);
+
+    /// <summary>
+    /// Represents a segment of UI content for an object of type <typeparamref name="T"/>, implemented as
+    /// a function that returns a <see cref="RenderFragment"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of object.</typeparam>
+    /// <param name="value">The value used to build the content.</param>
+    public delegate RenderFragment RenderFragment<T>(T value);
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
index ec9b435178..bbfde1da9b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
@@ -7,6 +7,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index bd2e0104cc..10bebabe02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
@@ -8,6 +8,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 550e8fa2d7..f299f64e13 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -26,6 +26,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 </Project>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 9b38b6b7f6..37172bc6b7 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -29,6 +29,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index b13a9c8071..4d4cd2f2a3 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index a4b035712a..69cada3019 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>  
 
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 23d69bef39..b9fd86c876 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 275ae61610..276589868f 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 5264c82b76..c32a88baa1 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -25,6 +25,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>  
 
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index d131016beb..362406340c 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 

From ceb1189b2ee29feec990c457f4d00f642a4187e3 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 18 Dec 2018 08:16:54 -0800
Subject: [PATCH 020/337] Stop generating page/view attribute in 3.0 \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/4eb93869b94758f8d2df9650da0a7e0b949adb4f

---
 .../src/AssemblyAttributeInjectionPass.cs     | 102 ----
 .../src/RazorExtensions.cs                    |   1 -
 .../AssemblyAttributeInjectionPassTest.cs     | 444 ------------------
 .../Basic_Runtime.codegen.cs                  |   1 -
 .../Basic_Runtime.ir.txt                      |   2 -
 .../IncompleteDirectives_Runtime.codegen.cs   |   1 -
 .../IncompleteDirectives_Runtime.ir.txt       |   2 -
 .../InheritsViewModel_Runtime.codegen.cs      |   1 -
 .../InheritsViewModel_Runtime.ir.txt          |   2 -
 ...InheritsWithViewImports_Runtime.codegen.cs |   1 -
 .../InheritsWithViewImports_Runtime.ir.txt    |   2 -
 .../InjectWithModel_Runtime.codegen.cs        |   1 -
 .../InjectWithModel_Runtime.ir.txt            |   2 -
 .../InjectWithSemicolon_Runtime.codegen.cs    |   1 -
 .../InjectWithSemicolon_Runtime.ir.txt        |   2 -
 .../Inject_Runtime.codegen.cs                 |   1 -
 .../Inject_Runtime.ir.txt                     |   2 -
 .../InvalidNamespaceAtEOF_Runtime.codegen.cs  |   1 -
 .../InvalidNamespaceAtEOF_Runtime.ir.txt      |   2 -
 .../MalformedPageDirective_Runtime.codegen.cs |   1 -
 .../MalformedPageDirective_Runtime.ir.txt     |   2 -
 ...odelExpressionTagHelper_Runtime.codegen.cs |   1 -
 .../ModelExpressionTagHelper_Runtime.ir.txt   |   2 -
 .../Model_Runtime.codegen.cs                  |   1 -
 .../Model_Runtime.ir.txt                      |   2 -
 .../PageWithNamespace_Runtime.codegen.cs      |   1 -
 .../PageWithNamespace_Runtime.ir.txt          |   2 -
 ...hNoLeadingPageDirective_Runtime.codegen.cs |   1 -
 ...eWithNoLeadingPageDirective_Runtime.ir.txt |   2 -
 ...rPagesWithRouteTemplate_Runtime.codegen.cs |   1 -
 ...RazorPagesWithRouteTemplate_Runtime.ir.txt |   2 -
 .../RazorPagesWithoutModel_Runtime.codegen.cs |   1 -
 .../RazorPagesWithoutModel_Runtime.ir.txt     |   2 -
 .../RazorPages_Runtime.codegen.cs             |   1 -
 .../RazorPages_Runtime.ir.txt                 |   2 -
 .../Sections_Runtime.codegen.cs               |   1 -
 .../Sections_Runtime.ir.txt                   |   2 -
 .../UsingDirectives_Runtime.codegen.cs        |   1 -
 .../UsingDirectives_Runtime.ir.txt            |   2 -
 .../ViewComponentTagHelper_Runtime.codegen.cs |   1 -
 .../ViewComponentTagHelper_Runtime.ir.txt     |   2 -
 .../ViewWithNamespace_Runtime.codegen.cs      |   1 -
 .../ViewWithNamespace_Runtime.ir.txt          |   2 -
 .../_ViewImports_Runtime.codegen.cs           |   1 -
 .../_ViewImports_Runtime.ir.txt               |   2 -
 .../RazorViewAttribute.cs                     |  27 --
 .../RazorPageAttribute.cs                     |  19 -
 47 files changed, 656 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs
deleted file mode 100644
index cf5549d0f5..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/AssemblyAttributeInjectionPass.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// 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.Diagnostics;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public class AssemblyAttributeInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
-    {
-        private const string RazorViewAttribute = "global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute";
-        private const string RazorPageAttribute = "global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute";
-
-        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
-        {
-            if (documentNode.Options.DesignTime)
-            {
-                return;
-            }
-
-            var @namespace = documentNode.FindPrimaryNamespace();
-            if (@namespace == null || string.IsNullOrEmpty(@namespace.Content))
-            {
-                // No namespace node or it's incomplete. Skip.
-                return;
-            }
-
-            var @class = documentNode.FindPrimaryClass();
-            if (@class == null || string.IsNullOrEmpty(@class.ClassName))
-            {
-                // No class node or it's incomplete. Skip.
-                return;
-            }
-
-            var generatedTypeName = $"{@namespace.Content}.{@class.ClassName}";
-
-            // The MVC attributes require a relative path to be specified so that we can make a view engine path.
-            // We can't use a rooted path because we don't know what the project root is.
-            //
-            // If we can't sanitize the path, we'll just set it to null and let is blow up at runtime - we don't
-            // want to create noise if this code has to run in some unanticipated scenario.
-            var escapedPath = MakeVerbatimStringLiteral(ConvertToViewEnginePath(codeDocument.Source.RelativePath));
-
-            string attribute;
-            if (documentNode.DocumentKind == MvcViewDocumentClassifierPass.MvcViewDocumentKind)
-            {
-                attribute = $"[assembly:{RazorViewAttribute}({escapedPath}, typeof({generatedTypeName}))]";
-            }
-            else if (documentNode.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
-                PageDirective.TryGetPageDirective(documentNode, out var pageDirective))
-            {
-                var escapedRoutePrefix = MakeVerbatimStringLiteral(pageDirective.RouteTemplate);
-                attribute = $"[assembly:{RazorPageAttribute}({escapedPath}, typeof({generatedTypeName}), {escapedRoutePrefix})]";
-            }
-            else
-            {
-                return;
-            }
-
-            var index = documentNode.Children.IndexOf(@namespace);
-            Debug.Assert(index >= 0);
-
-            var pageAttribute = new CSharpCodeIntermediateNode();
-            pageAttribute.Children.Add(new IntermediateToken()
-            {
-                Kind = TokenKind.CSharp,
-                Content = attribute,
-            });
-
-            documentNode.Children.Insert(index, pageAttribute);
-        }
-
-        private static string MakeVerbatimStringLiteral(string value)
-        {
-            if (value == null)
-            {
-                return "null";
-            }
-
-            value = value.Replace("\"", "\"\"");
-            return $"@\"{value}\"";
-        }
-        
-        private static string ConvertToViewEnginePath(string relativePath)
-        {
-            if (string.IsNullOrEmpty(relativePath))
-            {
-                return null;
-            }
-
-            // Checking for both / and \ because a \ will become a /.
-            if (!relativePath.StartsWith("/") && !relativePath.StartsWith("\\"))
-            {
-                relativePath = "/" + relativePath;
-            }
-            
-            relativePath = relativePath.Replace('\\', '/');
-            return relativePath;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
index 04febb17d6..99e202724a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
@@ -39,7 +39,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             builder.Features.Add(new ViewComponentTagHelperPass());
             builder.Features.Add(new RazorPageDocumentClassifierPass());
             builder.Features.Add(new MvcViewDocumentClassifierPass());
-            builder.Features.Add(new AssemblyAttributeInjectionPass());
 
             builder.SetImportFeature(new MvcImportProjectFeature());
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs
deleted file mode 100644
index 0ccd553a08..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/AssemblyAttributeInjectionPassTest.cs
+++ /dev/null
@@ -1,444 +0,0 @@
-// 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 Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public class AssemblyAttributeInjectionPassTest
-    {
-        [Fact]
-        public void Execute_NoOps_IfNamespaceNodeIsMissing()
-        {
-            // Arrange
-            var irDocument = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
-
-            // Assert
-            Assert.Empty(irDocument.Children);
-        }
-
-        [Fact]
-        public void Execute_NoOps_IfNamespaceNodeHasEmptyContent()
-        {
-            // Arrange
-            var irDocument = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = string.Empty };
-            @namespace.Annotations[CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace;
-            builder.Push(@namespace);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
-
-            // Assert
-            Assert.Collection(irDocument.Children,
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_NoOps_IfClassNameNodeIsMissing()
-        {
-            // Arrange
-            var irDocument = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
-            builder.Push(@namespace);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
-
-            // Assert
-            Assert.Collection(
-                irDocument.Children,
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_NoOps_IfClassNameIsEmpty()
-        {
-            // Arrange
-            var irDocument = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode
-            {
-                Content = "SomeNamespace",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
-                },
-            };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
-
-            // Assert
-            Assert.Collection(irDocument.Children,
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_NoOps_IfDocumentIsNotViewOrPage()
-        {
-            // Arrange
-            var irDocument = new DocumentIntermediateNode
-            {
-                DocumentKind = "Default",
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                ClassName = "SomeName",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
-
-            // Assert
-            Assert.Collection(
-                irDocument.Children,
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_NoOps_ForDesignTime()
-        {
-            // Arrange
-            var irDocument = new DocumentIntermediateNode
-            {
-                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
-                Options = RazorCodeGenerationOptions.CreateDesignTimeDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode
-            {
-                Content = "SomeNamespace",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
-                },
-            };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                ClassName = "SomeName",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
-            var document = RazorCodeDocument.Create(source);
-
-            // Act
-            pass.Execute(document, irDocument);
-
-            // Assert
-            Assert.Collection(
-                irDocument.Children,
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_AddsRazorViewAttribute_ToViews()
-        {
-            // Arrange
-            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName))]";
-            var irDocument = new DocumentIntermediateNode
-            {
-                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode
-            {
-                Content = "SomeNamespace",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
-                },
-            };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                ClassName = "SomeName",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
-            var document = RazorCodeDocument.Create(source);
-
-            // Act
-            pass.Execute(document, irDocument);
-
-            // Assert
-            Assert.Collection(irDocument.Children,
-                node =>
-                {
-                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
-                    Assert.Equal(TokenKind.CSharp, token.Kind);
-                    Assert.Equal(expectedAttribute, token.Content);
-                },
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_EscapesViewPathWhenAddingAttributeToViews()
-        {
-            // Arrange
-            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
-            var irDocument = new DocumentIntermediateNode
-            {
-                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode
-            {
-                Content = "SomeNamespace",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
-                },
-            };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                ClassName = "SomeName",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "\\test\\\"Index.cshtml"));
-            var document = RazorCodeDocument.Create(source);
-
-            // Act
-            pass.Execute(document, irDocument);
-
-            // Assert
-            Assert.Collection(irDocument.Children,
-                node =>
-                {
-                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
-                    Assert.Equal(TokenKind.CSharp, token.Kind);
-                    Assert.Equal(expectedAttribute, token.Content);
-                },
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_AddsRazorPagettribute_ToPage()
-        {
-            // Arrange
-            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName), null)]";
-            var irDocument = new DocumentIntermediateNode
-            {
-                DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind,
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var pageDirective = new DirectiveIntermediateNode
-            {
-                Directive = PageDirective.Directive,
-            };
-            builder.Add(pageDirective);
-
-            var @namespace = new NamespaceDeclarationIntermediateNode
-            {
-                Content = "SomeNamespace",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
-                },
-            };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                ClassName = "SomeName",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
-            var document = RazorCodeDocument.Create(source);
-
-            // Act
-            pass.Execute(document, irDocument);
-
-            // Assert
-            Assert.Collection(irDocument.Children,
-                node => Assert.Same(pageDirective, node),
-                node =>
-                {
-                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
-                    Assert.Equal(TokenKind.CSharp, token.Kind);
-                    Assert.Equal(expectedAttribute, token.Content);
-                },
-                node => Assert.Same(@namespace, node));
-        }
-
-        [Fact]
-        public void Execute_EscapesViewPathAndRouteWhenAddingAttributeToPage()
-        {
-            // Arrange
-            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
-            var irDocument = new DocumentIntermediateNode
-            {
-                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-            var builder = IntermediateNodeBuilder.Create(irDocument);
-            var @namespace = new NamespaceDeclarationIntermediateNode
-            {
-                Content = "SomeNamespace",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
-                },
-            };
-            builder.Push(@namespace);
-            var @class = new ClassDeclarationIntermediateNode
-            {
-                ClassName = "SomeName",
-                Annotations =
-                {
-                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
-                },
-            };
-
-            builder.Add(@class);
-
-            var pass = new AssemblyAttributeInjectionPass
-            {
-                Engine = RazorProjectEngine.Create().Engine,
-            };
-
-            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "test\\\"Index.cshtml"));
-            var document = RazorCodeDocument.Create(source);
-
-            // Act
-            pass.Execute(document, irDocument);
-
-            // Assert
-            Assert.Collection(irDocument.Children,
-                node =>
-                {
-                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
-                    Assert.Equal(TokenKind.CSharp, token.Kind);
-                    Assert.Equal(expectedAttribute, token.Content);
-                },
-                node => Assert.Same(@namespace, node));
-        }
-
-        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
-        {
-            for (var i = 0; i < engine.Phases.Count; i++)
-            {
-                var phase = engine.Phases[i];
-                phase.Execute(codeDocument);
-
-                if (phase is IRazorDocumentClassifierPhase)
-                {
-                    break;
-                }
-            }
-
-            return codeDocument.GetDocumentIntermediateNode();
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
index ec84263550..b6640c206d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
index e33f48cfef..2b0c607f49 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
index 31179505bf..890a758536 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index 0478bc1e74..ee2a61fcb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
index 9680177b77..ba04e112a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
index 2468ef4662..c9350fc966 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
index c1ea0b5c3e..b1adc79c5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
index 2704223a57..9432b939ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
index 36974edf08..526da9d107 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
index d018107ae2..5072c066c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
index b8eb5c371d..b88abec1b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
index 898557c170..518747b642 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
index e3493199a4..0d61a8c1ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
index e05f9d2df9..8be484dac7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
index 2b269092bb..df5eecceee 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
index 7a0583e5a0..c64540ac63 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
index 63b6c0a23e..5dae856544 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
index 077b331edd..d3369badef 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index d5ec95d2aa..8f900536ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
index 0d8f3b8ec2..681d19e1be 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
index ae8dc1fe65..8f3494ed1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
index 2b7dcff085..37e82ffb6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
index 729698a9cc..f5a8fb31ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
 namespace Test.Namespace
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
index 5a8cf210d2..7909f65e7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
     NamespaceDeclaration -  - Test.Namespace
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
index f69dce12eb..848c33ffd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
index ebd8d792ae..1007d84ea5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
index 83f08818fc..d61cd1b60b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
index c51a1fd492..f43b667b2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index 2a42ce12f2..c4f7c2473f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index 35b06f9da4..68f1bee78c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index 8f9b84f114..856f8eb8ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index 990f1fa5ec..169b9f0254 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 9e809e0db5..4366057292 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 1fe445a31e..cd3fe0dbad 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
index 1310cb0d8c..4b1e4e8805 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
index c3b71e0393..a2ef127e9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
         UsingDirective - (51:2,1 [19] ) - System.Linq
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index f654e3766e..002512387b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
index c69014763c..2390c1e5c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
index ef6c311053..8bc8dc2d56 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
 namespace Test.Namespace
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
index f507dfd9ca..f0b68a6453 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
     NamespaceDeclaration -  - Test.Namespace
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
index 346428fa0d..d319412226 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
@@ -2,7 +2,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
-[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
 namespace AspNetCore
 {
     #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
index addc2754ec..f4eeece9fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
@@ -1,7 +1,5 @@
 Document - 
     RazorCompiledItemAttribute - 
-    CSharpCode - 
-        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
     NamespaceDeclaration -  - AspNetCore
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
deleted file mode 100644
index 1ac6aba09a..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
-{
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-    public class RazorViewAttribute : Attribute
-    {
-        public RazorViewAttribute(string path, Type viewType)
-        {
-            Path = path;
-            ViewType = viewType;
-        }
-
-        /// <summary>
-        /// Gets the path of the view.
-        /// </summary>
-        public string Path { get; }
-
-        /// <summary>
-        /// Gets the view type.
-        /// </summary>
-        public Type ViewType { get; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
deleted file mode 100644
index 900827a018..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
-
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
-{
-    public class RazorPageAttribute : RazorViewAttribute
-    {
-        public RazorPageAttribute(string path, Type viewType, string routeTemplate)
-            : base(path, viewType)
-        {
-            RouteTemplate = routeTemplate;
-        }
-
-        public string RouteTemplate { get; }
-    }
-}

From c37dada0dc2e889010911d213141ed4d7fdc2dff Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 18 Dec 2018 17:58:02 -0800
Subject: [PATCH 021/337] Flow FileKind from project items -> code document

This is a bit of a rework of how we initially set this up, but with more
forethought to how this will work in the project system. I have not yet
surfaced this through VS.

My immediate next step is to light up the component integration tests
and something like this is on the critical path to get that work since
we need a way to specify in tests that a document should be treated as
a component.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6b81da3f02afb5ee2c95b7b16654d58a590cc613
---
 .../ComponentDocumentClassifierPass.cs        |  2 +-
 .../src/DefaultRazorProjectEngine.cs          | 18 +++++--
 .../src/DefaultRazorProjectFileSystem.cs      |  5 +-
 .../src/DefaultRazorProjectItem.cs            |  8 ++-
 .../InputDocumentKind.cs => FileKinds.cs}     |  6 +--
 .../src/RazorCodeDocumentExtensions.cs        |  8 +--
 .../src/RazorProjectEngine.cs                 | 26 +++++++---
 .../src/RazorProjectItem.cs                   | 25 +++++++++
 .../src/GenerateCommand.cs                    | 52 +++++--------------
 .../Language/TestRazorProjectItem.cs          |  8 ++-
 10 files changed, 95 insertions(+), 63 deletions(-)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Intermediate/InputDocumentKind.cs => FileKinds.cs} (61%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 2e1f24cdb5..a48f49994f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
-            return codeDocument.GetInputDocumentKind() == InputDocumentKind.Component;
+            return string.Equals(codeDocument.GetFileKind(), FileKinds.Component);
         }
 
         protected override void OnDocumentStructureCreated(RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, MethodDeclarationIntermediateNode method)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
index a560a0030a..4b9b50ef8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
@@ -68,10 +68,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             var importItems = importFeature.GetImports(projectItem);
             var importSourceDocuments = GetImportSourceDocuments(importItems);
 
-            return CreateCodeDocumentCore(sourceDocument, importSourceDocuments, tagHelpers: null);
+            return CreateCodeDocumentCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null);
         }
 
-        internal override RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument sourceDocument, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        internal override RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument sourceDocument, string fileKind, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
             if (sourceDocument == null)
             {
@@ -84,6 +84,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             var codeDocument = RazorCodeDocument.Create(sourceDocument, importSourceDocuments, parserOptions, codeGenerationOptions);
             codeDocument.SetTagHelpers(tagHelpers);
 
+            if (fileKind != null)
+            {
+                codeDocument.SetFileKind(fileKind);
+            }
+
             return codeDocument;
         }
 
@@ -100,10 +105,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             var importItems = importFeature.GetImports(projectItem);
             var importSourceDocuments = GetImportSourceDocuments(importItems, suppressExceptions: true);
 
-            return CreateCodeDocumentDesignTimeCore(sourceDocument, importSourceDocuments, tagHelpers: null);
+            return CreateCodeDocumentDesignTimeCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null);
         }
 
-        internal override RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument sourceDocument, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        internal override RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument sourceDocument, string fileKind, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
             if (sourceDocument == null)
             {
@@ -116,6 +121,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             var codeDocument = RazorCodeDocument.Create(sourceDocument, importSourceDocuments, parserOptions, codeGenerationOptions);
             codeDocument.SetTagHelpers(tagHelpers);
 
+            if (fileKind != null)
+            {
+                codeDocument.SetFileKind(fileKind);
+            }
+
             return codeDocument;
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
index 9283088cd1..8fdefe7d1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
@@ -34,12 +34,13 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             return directory
                 .EnumerateFiles("*.cshtml", SearchOption.AllDirectories)
+                .Concat(directory.EnumerateFiles("*.razor", SearchOption.AllDirectories))
                 .Select(file =>
                 {
                     var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
                     var filePath = "/" + relativePhysicalPath.Replace(Path.DirectorySeparatorChar, '/');
 
-                    return new DefaultRazorProjectItem(basePath, filePath, relativePhysicalPath, file);
+                    return new DefaultRazorProjectItem(basePath, filePath, relativePhysicalPath, fileKind: null, file);
                 });
         }
 
@@ -57,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
             var filePath = "/" + relativePhysicalPath.Replace(Path.DirectorySeparatorChar, '/');
 
-            return new DefaultRazorProjectItem("/", filePath, relativePhysicalPath, new FileInfo(absolutePath));
+            return new DefaultRazorProjectItem("/", filePath, relativePhysicalPath, fileKind: null, new FileInfo(absolutePath));
         }
 
         protected override string NormalizeAndEnsureValidPath(string path)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs
index 5a3590a121..082ed4666a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectItem.cs
@@ -7,18 +7,22 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRazorProjectItem : RazorProjectItem
     {
+        private readonly string _fileKind;
+
         /// <summary>
         /// Initializes a new instance of <see cref="DefaultRazorProjectItem"/>.
         /// </summary>
         /// <param name="basePath">The base path.</param>
         /// <param name="relativePhysicalPath">The physical path of the base path.</param>
         /// <param name="filePath">The path.</param>
+        /// <param name="fileKind">The file kind. If null, the document kind will be inferred from the file extension.</param>
         /// <param name="file">The <see cref="FileInfo"/>.</param>
-        public DefaultRazorProjectItem(string basePath, string filePath, string relativePhysicalPath, FileInfo file)
+        public DefaultRazorProjectItem(string basePath, string filePath, string relativePhysicalPath, string fileKind, FileInfo file)
         {
             BasePath = basePath;
             FilePath = filePath;
             RelativePhysicalPath = relativePhysicalPath;
+            _fileKind = fileKind;
             File = file;
         }
 
@@ -34,6 +38,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override string RelativePhysicalPath { get; }
 
+        public override string FileKind => _fileKind ?? base.FileKind;
+
         public override Stream Read() => new FileStream(PhysicalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
similarity index 61%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
index 7adf2bd8b5..a1163e702e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/InputDocumentKind.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
@@ -1,12 +1,12 @@
 // 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.
 
-namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+namespace Microsoft.AspNetCore.Razor.Language
 {
-    internal static class InputDocumentKind
+    internal static class FileKinds
     {
         public static readonly string Component = "component";
 
-        public static readonly string MvcFile = "mvc";
+        public static readonly string Legacy = "mvc";
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
index 6b0a9fde9e..5d31bfcf73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -169,24 +169,24 @@ namespace Microsoft.AspNetCore.Razor.Language
             document.Items[typeof(RazorCodeGenerationOptions)] = codeGenerationOptions;
         }
 
-        public static string GetInputDocumentKind(this RazorCodeDocument document)
+        public static string GetFileKind(this RazorCodeDocument document)
         {
             if (document == null)
             {
                 throw new ArgumentNullException(nameof(document));
             }
 
-            return (string)document.Items[typeof(InputDocumentKind)];
+            return (string)document.Items[typeof(FileKinds)];
         }
 
-        public static void SetInputDocumentKind(this RazorCodeDocument document, string kind)
+        public static void SetFileKind(this RazorCodeDocument document, string fileKind)
         {
             if (document == null)
             {
                 throw new ArgumentNullException(nameof(document));
             }
 
-            document.Items[typeof(InputDocumentKind)] = kind;
+            document.Items[typeof(FileKinds)] = fileKind;
         }
 
         private class ImportSyntaxTreesHolder
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index d37936dbd6..e6ef8738c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -35,14 +35,14 @@ namespace Microsoft.AspNetCore.Razor.Language
             return codeDocument;
         }
 
-        internal virtual RazorCodeDocument Process(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        internal virtual RazorCodeDocument Process(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
             if (source == null)
             {
                 throw new ArgumentNullException(nameof(source));
             }
 
-            var codeDocument = CreateCodeDocumentCore(source, importSources, tagHelpers);
+            var codeDocument = CreateCodeDocumentCore(source, fileKind, importSources, tagHelpers);
             ProcessCore(codeDocument);
             return codeDocument;
         }
@@ -59,30 +59,40 @@ namespace Microsoft.AspNetCore.Razor.Language
             return codeDocument;
         }
 
-        internal virtual RazorCodeDocument ProcessDesignTime(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        internal virtual RazorCodeDocument ProcessDesignTime(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
             if (source == null)
             {
                 throw new ArgumentNullException(nameof(source));
             }
 
-            var codeDocument = CreateCodeDocumentDesignTimeCore(source, importSources, tagHelpers);
+            var codeDocument = CreateCodeDocumentDesignTimeCore(source, fileKind, importSources, tagHelpers);
             ProcessCore(codeDocument);
             return codeDocument;
         }
 
         protected abstract RazorCodeDocument CreateCodeDocumentCore(RazorProjectItem projectItem);
 
-        internal virtual RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        internal virtual RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
-            return RazorCodeDocument.Create(source, importSources);
+            var codeDocument = RazorCodeDocument.Create(source, importSources);
+            if (fileKind != null)
+            {
+                codeDocument.SetFileKind(fileKind);
+            }
+            return codeDocument;
         }
 
         protected abstract RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorProjectItem projectItem);
 
-        internal virtual RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument source, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        internal virtual RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
-            return RazorCodeDocument.Create(source, importSources);
+            var codeDocument = RazorCodeDocument.Create(source, importSources);
+            if (fileKind != null)
+            {
+                codeDocument.SetFileKind(fileKind);
+            }
+            return codeDocument;
         }
 
         protected abstract void ProcessCore(RazorCodeDocument codeDocument);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
index 6aecb94daa..cdc50b8948 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
@@ -1,8 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Diagnostics;
 using System.IO;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -35,6 +38,28 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         public virtual string RelativePhysicalPath => null;
 
+        /// <summary>
+        /// Gets the document kind that should be used for the generated document. If possible this will be inferred from the file path. May be null.
+        /// </summary>
+        public virtual string FileKind
+        {
+            get
+            {
+                if (FilePath == null)
+                {
+                    return null;
+                }
+                else if (string.Equals(".razor", Path.GetExtension(FilePath), StringComparison.OrdinalIgnoreCase))
+                {
+                    return FileKinds.Component;
+                }
+                else
+                {
+                    return FileKinds.Legacy;
+                }
+            }
+        }
+
         /// <summary>
         /// Gets the file contents as readonly <see cref="Stream"/>.
         /// </summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index 338c496033..401183445f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             Sources = Option("-s", ".cshtml files to compile", CommandOptionType.MultipleValue);
             Outputs = Option("-o", "Generated output file path", CommandOptionType.MultipleValue);
             RelativePaths = Option("-r", "Relative path", CommandOptionType.MultipleValue);
-            DocumentKinds = Option("-k", "Document kind", CommandOptionType.MultipleValue);
+            FileKinds = Option("-k", "File kind", CommandOptionType.MultipleValue);
             ProjectDirectory = Option("-p", "project root directory", CommandOptionType.SingleValue);
             TagHelperManifest = Option("-t", "tag helper manifest file", CommandOptionType.SingleValue);
             Version = Option("-v|--version", "Razor language version", CommandOptionType.SingleValue);
@@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
         public CommandOption RelativePaths { get; }
 
-        public CommandOption DocumentKinds { get; }
+        public CommandOption FileKinds { get; }
 
         public CommandOption ProjectDirectory { get; }
 
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             var version = RazorLanguageVersion.Parse(Version.Value());
             var configuration = RazorConfiguration.Create(version, Configuration.Value(), extensions);
 
-            var sourceItems = GetSourceItems(ProjectDirectory.Value(), Sources.Values, Outputs.Values, RelativePaths.Values, DocumentKinds.Values);
+            var sourceItems = GetSourceItems(ProjectDirectory.Value(), Sources.Values, Outputs.Values, RelativePaths.Values, FileKinds.Values);
 
             var result = ExecuteCore(
                 configuration: configuration,
@@ -105,11 +105,11 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 return false;
             }
 
-            if (DocumentKinds.Values.Count != 0 && DocumentKinds.Values.Count != Sources.Values.Count)
+            if (FileKinds.Values.Count != 0 && FileKinds.Values.Count != Sources.Values.Count)
             {
-                // 2.x tasks do not specify DocumentKinds - in which case, no values will be present. If a kind for one document is specified, we expect as many kind entries
+                // 2.x tasks do not specify FileKinds - in which case, no values will be present. If a kind for one file is specified, we expect as many kind entries
                 // as sources.
-                Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {DocumentKinds.Description} has {DocumentKinds.Values.Count} values.");
+                Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {FileKinds.Description} has {FileKinds.Values.Count} values.");
                 return false;
             }
 
@@ -171,7 +171,6 @@ namespace Microsoft.AspNetCore.Razor.Tools
             var engine = RazorProjectEngine.Create(configuration, compositeFileSystem, b =>
             {
                 b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
-                b.Features.Add(new InputDocumentKindClassifierPass(sourceItems));
 
                 if (GenerateDeclaration.HasValue())
                 {
@@ -223,6 +222,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
                     basePath: "/",
                     filePath: item.FilePath,
                     relativePhysicalPath: item.RelativePhysicalPath,
+                    fileKind: item.FileKind,
                     file: new FileInfo(item.SourcePath));
 
                 project.Add(projectItem);
@@ -251,15 +251,15 @@ namespace Microsoft.AspNetCore.Razor.Tools
             }
         }
 
-        private SourceItem[] GetSourceItems(string projectDirectory, List<string> sources, List<string> outputs, List<string> relativePath, List<string> documentKinds)
+        private SourceItem[] GetSourceItems(string projectDirectory, List<string> sources, List<string> outputs, List<string> relativePath, List<string> fileKinds)
         {
             var items = new SourceItem[sources.Count];
             for (var i = 0; i < items.Length; i++)
             {
                 var outputPath = Path.Combine(projectDirectory, outputs[i]);
-                var documentKind = documentKinds.Count > 0 ? documentKinds[i] : "mvc";
+                var fileKind = fileKinds.Count > 0 ? fileKinds[i] : "mvc";
 
-                items[i] = new SourceItem(sources[i], outputs[i], relativePath[i], documentKind);
+                items[i] = new SourceItem(sources[i], outputs[i], relativePath[i], fileKind);
             }
 
             return items;
@@ -297,7 +297,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
         private readonly struct SourceItem
         {
-            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath, string documentKind)
+            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath, string fileKind)
             {
                 SourcePath = sourcePath;
                 OutputPath = outputPath;
@@ -305,7 +305,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 FilePath = '/' + physicalRelativePath
                     .Replace(Path.DirectorySeparatorChar, '/')
                     .Replace("//", "/");
-                DocumentKind = documentKind;
+                FileKind = fileKind;
             }
 
             public string SourcePath { get; }
@@ -316,7 +316,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
             public string FilePath { get; }
 
-            public string DocumentKind { get; }
+            public string FileKind { get; }
         }
 
         private class StaticTagHelperFeature : ITagHelperFeature
@@ -342,31 +342,5 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 options.SuppressPrimaryMethodBody = true;
             }
         }
-
-        private class InputDocumentKindClassifierPass : RazorEngineFeatureBase, IRazorDocumentClassifierPass
-        {
-            public InputDocumentKindClassifierPass(SourceItem[] sourceItems)
-            {
-                DocumentKinds = new Dictionary<string, string>(sourceItems.Length, StringComparer.OrdinalIgnoreCase);
-                for (var i = 0; i < sourceItems.Length; i++)
-                {
-                    var item = sourceItems[i];
-                    DocumentKinds[item.SourcePath] = item.DocumentKind;
-                }
-            }
-
-            // Run before other document classifiers
-            public int Order => -1000;
-
-            public Dictionary<string, string> DocumentKinds { get; }
-
-            public void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
-            {
-                if (DocumentKinds.TryGetValue(codeDocument.Source.FilePath, out var kind))
-                {
-                    codeDocument.SetInputDocumentKind(kind);
-                }
-            }
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs
index d4f03fbf0d..e811043206 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectItem.cs
@@ -8,20 +8,26 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     public class TestRazorProjectItem : RazorProjectItem
     {
+        private readonly string _fileKind;
+
         public TestRazorProjectItem(
             string filePath, 
             string physicalPath = null,
             string relativePhysicalPath = null,
-            string basePath = "/")
+            string basePath = "/",
+            string fileKind = null)
         {
             FilePath = filePath;
             PhysicalPath = physicalPath;
             RelativePhysicalPath = relativePhysicalPath;
             BasePath = basePath;
+            _fileKind = fileKind;
         }
 
         public override string BasePath { get; }
 
+        public override string FileKind => _fileKind ?? base.FileKind;
+
         public override string FilePath { get; }
 
         public override string PhysicalPath { get; }

From 51d19d174575621ec25ccddbf80bc2beae8adf2b Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 19 Dec 2018 22:43:10 -0800
Subject: [PATCH 022/337] Code dump of Blazor compiler
 BindTagHelperDescriptorProvider

This change adds all of the code from the Blazor/Components compiler into
the Razor language assembly. Minimal refactoring or integration work has
been done, that is next :)

All of the code compiles and all unit tests pass, except the one I had
to skip until integration work is done.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/aa5c82ca5eb057ca7ce20824be4ad9a7b1f1c995
---
 .../src/Components/BindLoweringPass.cs        |  517 +++++++
 .../Components/BlazorCSharpLoweringPhase.cs   |   42 +
 .../src/Components/BlazorCodeTarget.cs        |   59 +
 .../Components/BlazorDesignTimeNodeWriter.cs  |  773 ++++++++++
 .../Components/BlazorExtensionInitializer.cs  |  130 ++
 .../Components/BlazorImportProjectFeature.cs  |   97 ++
 .../src/Components/BlazorMetadata.cs          |   83 ++
 .../src/Components/BlazorNodeWriter.cs        |  217 +++
 .../src/Components/BlazorRuntimeNodeWriter.cs |  764 ++++++++++
 .../BlazorTemplateTargetExtension.cs          |   16 +
 .../Components/ChildContentDiagnosticPass.cs  |   72 +
 .../src/Components/CodeWriterExtensions.cs    |  647 +++++++++
 .../Components/ComplexAttributeContentPass.cs |  107 ++
 .../ComponentAttributeExtensionNode.cs        |  131 ++
 .../ComponentChildContentIntermediateNode.cs  |   50 +
 .../ComponentDiagnosticFactory.cs             |   94 +-
 .../ComponentDocumentClassifierPass.cs        |    7 +-
 .../src/Components/ComponentExtensionNode.cs  |  107 ++
 .../src/Components/ComponentLoweringPass.cs   |  488 +++++++
 .../ComponentTypeArgumentExtensionNode.cs     |   69 +
 ...nentTypeInferenceMethodIntermediateNode.cs |   59 +
 .../src/Components/ComponentsApi.cs           |  133 ++
 .../Components/EventHandlerLoweringPass.cs    |  209 +++
 .../src/Components/GenericComponentPass.cs    |  314 +++++
 .../Components/HtmlBlockIntermediateNode.cs   |   46 +
 .../src/Components/HtmlBlockPass.cs           |  331 +++++
 .../Components/HtmlElementIntermediateNode.cs |   91 ++
 .../src/Components/ImplementsDirective.cs     |   32 +
 .../src/Components/ImplementsDirectivePass.cs |   37 +
 .../src/Components/InjectDirective.cs         |  111 ++
 .../src/Components/LayoutDirective.cs         |   32 +
 .../src/Components/LayoutDirectivePass.cs     |   51 +
 ...NetCore.Components.Razor.Extensions.csproj |   38 +
 .../src/Components/PageDirective.cs           |   44 +
 .../src/Components/PageDirectivePass.cs       |   82 ++
 .../src/Components/RazorCompilerException.cs  |   29 +
 .../src/Components/RefExtensionNode.cs        |   66 +
 .../src/Components/RefLoweringPass.cs         |   82 ++
 .../Components/RouteAttributeExtensionNode.cs |   33 +
 .../src/Components/ScopeStack.cs              |   91 ++
 .../src/Components/ScriptTagPass.cs           |   59 +
 ...elperBoundAttributeDescriptorExtensions.cs |  154 ++
 .../TagHelperDescriptorExtensions.cs          |  199 +++
 .../src/Components/TemplateDiagnosticPass.cs  |   60 +
 .../src/Components/TrimWhitespacePass.cs      |  101 ++
 .../src/Components/TypeParamDirective.cs      |   32 +
 .../DocumentIntermediateNodeExtensions.cs     |   33 +
 .../src/TypeNameFeature.cs                    |   18 +
 .../src/TypeNameRewriter.cs                   |   12 +
 .../src/GenerateCommand.cs                    |    2 -
 .../src/BindTagHelperDescriptorProvider.cs    |  490 +++++++
 .../ComponentTagHelperDescriptorProvider.cs   |  440 +++++-
 .../src/DefaultTypeNameFeature.cs             |   56 +
 ...EventHandlerTagHelperDescriptorProvider.cs |  218 +++
 .../src/GenericTypeNameRewriter.cs            |   70 +
 .../src/GlobalQualifiedTypeNameRewriter.cs    |   79 ++
 .../src/Properties/AssemblyInfo.cs            |    1 +
 .../src/RefTagHelperDescriptorProvider.cs     |   62 +
 .../BaseTagHelperDescriptorProviderTest.cs    |   41 +
 .../BindTagHelperDescriptorProviderTest.cs    |  683 +++++++++
 ...omponentTagHelperDescriptorProviderTest.cs | 1243 +++++++++++++++++
 ...tHandlerTagHelperDescriptorProviderTest.cs |  125 ++
 .../test/GenericTypeNameRewriterTest.cs       |   44 +
 .../GlobalQualifiedTypeNameRewriterTest.cs    |   35 +
 .../RefTagHelperDescriptorProviderTest.cs     |   85 ++
 .../src/Microsoft.NET.Sdk.Razor.csproj        |    8 +-
 .../BindElementAttribute.cs                   |   64 +
 .../BindInputElementAttribute.cs              |   59 +
 .../BindMethods.cs                            |  229 +++
 .../EventHandlerAttribute.cs                  |   45 +
 .../Layouts}/LayoutAttribute.cs               |    0
 .../RenderFrame.cs                            |    0
 .../test/testassets/Directory.Build.props     |    3 -
 73 files changed, 11040 insertions(+), 91 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{ => Components}/ComponentDiagnosticFactory.cs (82%)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RouteAttributeExtensionNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameFeature.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameRewriter.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTypeNameFeature.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/GenericTypeNameRewriter.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/GlobalQualifiedTypeNameRewriter.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/GenericTypeNameRewriterTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/GlobalQualifiedTypeNameRewriterTest.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs
 rename src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/{ => Microsoft.AspNetCore.Components/Layouts}/LayoutAttribute.cs (100%)
 rename src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/{ => Microsoft.AspNetCore.Components}/RenderFrame.cs (100%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
new file mode 100644
index 0000000000..c03cb3e707
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
@@ -0,0 +1,517 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class BindLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after event handler pass
+        public override int Order => 100;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            // For each bind *usage* we need to rewrite the tag helper node to map to basic constructs.
+            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+
+            var parents = new HashSet<IntermediateNode>();
+            for (var i = 0; i < references.Count; i++)
+            {
+                parents.Add(references[i].Parent);
+            }
+
+            foreach (var parent in parents)
+            {
+                ProcessDuplicates(parent);
+            }
+
+            for (var i = 0; i < references.Count; i++)
+            {
+                var reference = references[i];
+                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+
+                if (!reference.Parent.Children.Contains(node))
+                {
+                    // This node was removed as a duplicate, skip it.
+                    continue;
+                }
+
+                if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
+                {
+                    // Workaround for https://github.com/aspnet/Blazor/issues/703
+                    var rewritten = RewriteUsage(reference.Parent, node);
+                    reference.Remove();
+
+                    for (var j = 0; j < rewritten.Length; j++)
+                    {
+                        reference.Parent.Children.Add(rewritten[j]);
+                    }
+                }
+            }
+        }
+
+        private void ProcessDuplicates(IntermediateNode node)
+        {
+            // Reverse order because we will remove nodes.
+            //
+            // Each 'property' node could be duplicated if there are multiple tag helpers that match that
+            // particular attribute. This is common in our approach, which relies on 'fallback' tag helpers
+            // that overlap with more specific ones.
+            for (var i = node.Children.Count - 1; i >= 0; i--)
+            {
+                // For each usage of the general 'fallback' bind tag helper, it could duplicate
+                // the usage of a more specific one. Look for duplicates and remove the fallback.
+                var attribute = node.Children[i] as TagHelperPropertyIntermediateNode;
+                if (attribute != null &&
+                    attribute.TagHelper != null &&
+                    attribute.TagHelper.IsFallbackBindTagHelper())
+                {
+                    for (var j = 0; j < node.Children.Count; j++)
+                    {
+                        var duplicate = node.Children[j] as TagHelperPropertyIntermediateNode;
+                        if (duplicate != null &&
+                            duplicate.TagHelper != null &&
+                            duplicate.TagHelper.IsBindTagHelper() &&
+                            duplicate.AttributeName == attribute.AttributeName &&
+                            !object.ReferenceEquals(attribute, duplicate))
+                        {
+                            // Found a duplicate - remove the 'fallback' in favor of the
+                            // more specific tag helper.
+                            node.Children.RemoveAt(i);
+                            break;
+                        }
+                    }
+                }
+
+                // Also treat the general <input bind="..." /> as a 'fallback' for that case and remove it.
+                // This is a workaround for a limitation where you can't write a tag helper that binds only
+                // when a specific attribute is **not** present.
+                if (attribute != null &&
+                    attribute.TagHelper != null &&
+                    attribute.TagHelper.IsInputElementFallbackBindTagHelper())
+                {
+                    for (var j = 0; j < node.Children.Count; j++)
+                    {
+                        var duplicate = node.Children[j] as TagHelperPropertyIntermediateNode;
+                        if (duplicate != null &&
+                            duplicate.TagHelper != null &&
+                            duplicate.TagHelper.IsInputElementBindTagHelper() &&
+                            duplicate.AttributeName == attribute.AttributeName &&
+                            !object.ReferenceEquals(attribute, duplicate))
+                        {
+                            // Found a duplicate - remove the 'fallback' input tag helper in favor of the
+                            // more specific tag helper.
+                            node.Children.RemoveAt(i);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // If we still have duplicates at this point then they are genuine conflicts.
+            var duplicates = node.Children
+                .OfType<TagHelperPropertyIntermediateNode>()
+                .GroupBy(p => p.AttributeName)
+                .Where(g => g.Count() > 1);
+
+            foreach (var duplicate in duplicates)
+            {
+                node.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_Duplicates(
+                    node.Source,
+                    duplicate.Key,
+                    duplicate.ToArray()));
+                foreach (var property in duplicate)
+                {
+                    node.Children.Remove(property);
+                }
+            }
+        }
+
+        private IntermediateNode[] RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        {
+            // Bind works similarly to a macro, it always expands to code that the user could have written.
+            //
+            // For the nodes that are related to the bind-attribute rewrite them to look like a pair of
+            // 'normal' HTML attributes similar to the following transformation.
+            //
+            // Input:   <MyComponent bind-Value="@currentCount" />
+            // Output:  <MyComponent Value ="...<get the value>..." ValueChanged ="... <set the value>..." />
+            //
+            // This means that the expression that appears inside of 'bind' must be an LValue or else
+            // there will be errors. In general the errors that come from C# in this case are good enough
+            // to understand the problem.
+            //
+            // The BindMethods calls are required in this case because to give us a good experience. They
+            // use overloading to ensure that can get an Action<object> that will convert and set an arbitrary
+            // value.
+            //
+            // We also assume that the element will be treated as a component for now because
+            // multiple passes handle 'special' tag helpers. We have another pass that translates
+            // a tag helper node back into 'regular' element when it doesn't have an associated component
+            if (!TryComputeAttributeNames(
+                parent,
+                node,
+                node.AttributeName,
+                out var valueAttributeName,
+                out var changeAttributeName,
+                out var valueAttribute,
+                out var changeAttribute))
+            {
+                // Skip anything we can't understand. It's important that we don't crash, that will bring down
+                // the build.
+                node.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_InvalidSyntax(
+                    node.Source, 
+                    node.AttributeName));
+                return new[] { node };
+            }
+
+            var original = GetAttributeContent(node);
+            if (string.IsNullOrEmpty(original.Content))
+            {
+                // This can happen in error cases, the parser will already have flagged this
+                // as an error, so ignore it.
+                return new[] { node };
+            }
+
+            // Look for a matching format node. If we find one then we need to pass the format into the
+            // two nodes we generate.
+            IntermediateToken format = null;
+            if (TryGetFormatNode(
+                parent,
+                node,
+                valueAttributeName,
+                out var formatNode))
+            {
+                // Don't write the format out as its own attribute, just capture it as a string
+                // or expression.
+                parent.Children.Remove(formatNode);
+                format = GetAttributeContent(formatNode);
+            }
+
+            // Now rewrite the content of the value node to look like:
+            //
+            // BindMethods.GetValue(<code>) OR
+            // BindMethods.GetValue(<code>, <format>)
+            var valueExpressionTokens = new List<IntermediateToken>();
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = $"{ComponentsApi.BindMethods.GetValue}(",
+                Kind = TokenKind.CSharp
+            });
+            valueExpressionTokens.Add(original);
+            if (!string.IsNullOrEmpty(format?.Content))
+            {
+                valueExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ", ",
+                    Kind = TokenKind.CSharp,
+                });
+                valueExpressionTokens.Add(format);
+            }
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = ")",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Now rewrite the content of the change-handler node. There are two cases we care about
+            // here. If it's a component attribute, then don't use the 'BindMethods wrapper. We expect
+            // component attributes to always 'match' on type.
+            //
+            // __value => <code> = __value
+            //
+            // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
+            // so we use BindMethods.SetValueHandler
+            //
+            // BindMethods.SetValueHandler(__value => <code> = __value, <code>) OR
+            // BindMethods.SetValueHandler(__value => <code> = __value, <code>, <format>)
+            //
+            // Note that the linemappings here are applied to the value attribute, not the change attribute.
+            
+            string changeExpressionContent = null;
+            if (changeAttribute == null && format == null)
+            {
+                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})";
+            }
+            else if (changeAttribute == null && format != null)
+            {
+                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})";
+            }
+            else
+            {
+                changeExpressionContent = $"__value => {original.Content} = __value";
+            }
+            var changeExpressionTokens = new List<IntermediateToken>()
+            {
+                new IntermediateToken()
+                {
+                    Content = changeExpressionContent,
+                    Kind = TokenKind.CSharp
+                }
+            };
+
+            if (parent is HtmlElementIntermediateNode)
+            {
+                var valueNode = new HtmlAttributeIntermediateNode()
+                {
+                    AttributeName = valueAttributeName,
+                    Source = node.Source,
+
+                    Prefix = valueAttributeName + "=\"",
+                    Suffix = "\"",
+                };
+
+                for (var i = 0; i < node.Diagnostics.Count; i++)
+                {
+                    valueNode.Diagnostics.Add(node.Diagnostics[i]);
+                }
+
+                valueNode.Children.Add(new CSharpExpressionAttributeValueIntermediateNode());
+                for (var i = 0; i < valueExpressionTokens.Count; i++)
+                {
+                    valueNode.Children[0].Children.Add(valueExpressionTokens[i]);
+                }
+
+                var changeNode = new HtmlAttributeIntermediateNode()
+                {
+                    AttributeName = changeAttributeName,
+                    Source = node.Source,
+
+                    Prefix = changeAttributeName + "=\"",
+                    Suffix = "\"",
+                };
+
+                changeNode.Children.Add(new CSharpExpressionAttributeValueIntermediateNode());
+                for (var i = 0; i < changeExpressionTokens.Count; i++)
+                {
+                    changeNode.Children[0].Children.Add(changeExpressionTokens[i]);
+                }
+
+                return  new[] { valueNode, changeNode };
+            }
+            else
+            {
+                var valueNode = new ComponentAttributeExtensionNode(node)
+                {
+                    AttributeName = valueAttributeName,
+                    BoundAttribute = valueAttribute, // Might be null if it doesn't match a component attribute
+                    PropertyName = valueAttribute?.GetPropertyName(),
+                    TagHelper = valueAttribute == null ? null : node.TagHelper,
+                    TypeName = valueAttribute?.IsWeaklyTyped() == false ? valueAttribute.TypeName : null,
+                };
+
+                valueNode.Children.Clear();
+                valueNode.Children.Add(new CSharpExpressionIntermediateNode());
+                for (var i = 0; i < valueExpressionTokens.Count; i++)
+                {
+                    valueNode.Children[0].Children.Add(valueExpressionTokens[i]);
+                }
+
+                var changeNode = new ComponentAttributeExtensionNode(node)
+                {
+                    AttributeName = changeAttributeName,
+                    BoundAttribute = changeAttribute, // Might be null if it doesn't match a component attribute
+                    PropertyName = changeAttribute?.GetPropertyName(),
+                    TagHelper = changeAttribute == null ? null : node.TagHelper,
+                    TypeName = changeAttribute?.IsWeaklyTyped() == false ? changeAttribute.TypeName : null,
+                };
+
+                changeNode.Children.Clear();
+                changeNode.Children.Add(new CSharpExpressionIntermediateNode());
+                for (var i = 0; i < changeExpressionTokens.Count; i++)
+                {
+                    changeNode.Children[0].Children.Add(changeExpressionTokens[i]);
+                }
+
+                return new[] { valueNode, changeNode };
+            }
+        }
+
+        private bool TryParseBindAttribute(
+            string attributeName,
+            out string valueAttributeName,
+            out string changeAttributeName)
+        {
+            valueAttributeName = null;
+            changeAttributeName = null;
+
+            if (!attributeName.StartsWith("bind"))
+            {
+                return false;
+            }
+
+            if (attributeName == "bind")
+            {
+                return true;
+            }
+
+            var segments = attributeName.Split('-');
+            for (var i = 0; i < segments.Length; i++)
+            {
+                if (string.IsNullOrEmpty(segments[i]))
+                {
+                    return false;
+                }
+            }
+
+            switch (segments.Length)
+            {
+                case 2:
+                    valueAttributeName = segments[1];
+                    return true;
+
+                case 3:
+                    changeAttributeName = segments[2];
+                    valueAttributeName = segments[1];
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        // Attempts to compute the attribute names that should be used for an instance of 'bind'.
+        private bool TryComputeAttributeNames(
+            IntermediateNode parent,
+            TagHelperPropertyIntermediateNode node,
+            string attributeName,
+            out string valueAttributeName,
+            out string changeAttributeName,
+            out BoundAttributeDescriptor valueAttribute,
+            out BoundAttributeDescriptor changeAttribute)
+        {
+            valueAttribute = null;
+            changeAttribute = null;
+
+            // Even though some of our 'bind' tag helpers specify the attribute names, they
+            // should still satisfy one of the valid syntaxes.
+            if (!TryParseBindAttribute(attributeName, out valueAttributeName, out changeAttributeName))
+            {
+                return false;
+            }
+
+            // The tag helper specifies attribute names, they should win.
+            //
+            // This handles cases like <input type="text" bind="@Foo" /> where the tag helper is 
+            // generated to match a specific tag and has metadata that identify the attributes.
+            //
+            // We expect 1 bind tag helper per-node.
+            valueAttributeName = node.TagHelper.GetValueAttributeName() ?? valueAttributeName;
+            changeAttributeName = node.TagHelper.GetChangeAttributeName() ?? changeAttributeName;
+
+            // We expect 0-1 components per-node.
+            var componentTagHelper = (parent as ComponentExtensionNode)?.Component;
+            if (componentTagHelper == null)
+            {
+                // If it's not a component node then there isn't too much else to figure out.
+                return attributeName != null && changeAttributeName != null;
+            }
+
+            // If this is a component, we need an attribute name for the value.
+            if (attributeName == null)
+            {
+                return false;
+            }
+
+            // If this is a component, then we can infer '<PropertyName>Changed' as the name
+            // of the change event.
+            if (changeAttributeName == null)
+            {
+                changeAttributeName = valueAttributeName + "Changed";
+            }
+
+            for (var i = 0; i < componentTagHelper.BoundAttributes.Count; i++)
+            {
+                var attribute = componentTagHelper.BoundAttributes[i];
+
+                if (string.Equals(valueAttributeName, attribute.Name))
+                {
+                    valueAttribute = attribute;
+                }
+
+                if (string.Equals(changeAttributeName, attribute.Name))
+                {
+                    changeAttribute = attribute;
+                }
+            }
+
+            return true;
+        }
+
+        private bool TryGetFormatNode(
+            IntermediateNode node,
+            TagHelperPropertyIntermediateNode attributeNode,
+            string valueAttributeName,
+            out TagHelperPropertyIntermediateNode formatNode)
+        {
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as TagHelperPropertyIntermediateNode;
+                if (child != null &&
+                    child.TagHelper != null &&
+                    child.TagHelper == attributeNode.TagHelper &&
+                    child.AttributeName == "format-" + valueAttributeName)
+                {
+                    formatNode = child;
+                    return true;
+                }
+            }
+
+            formatNode = null;
+            return false;
+        }
+
+        private static IntermediateToken GetAttributeContent(TagHelperPropertyIntermediateNode node)
+        {
+            var template = node.FindDescendantNodes<TemplateIntermediateNode>().FirstOrDefault();
+            if (template != null)
+            {
+                // See comments in TemplateDiagnosticPass
+                node.Diagnostics.Add(ComponentDiagnosticFactory.Create_TemplateInvalidLocation(template.Source));
+                return new IntermediateToken() { Kind = TokenKind.CSharp, Content = string.Empty, };
+            }
+
+            if (node.Children[0] is HtmlContentIntermediateNode htmlContentNode)
+            {
+                // This case can be hit for a 'string' attribute. We want to turn it into
+                // an expression.
+                var content = "\"" + string.Join(string.Empty, htmlContentNode.Children.OfType<IntermediateToken>().Select(t => t.Content)) + "\"";
+                return new IntermediateToken() { Kind = TokenKind.CSharp, Content = content };
+            }
+            else if (node.Children[0] is CSharpExpressionIntermediateNode cSharpNode)
+            {
+                // This case can be hit when the attribute has an explicit @ inside, which
+                // 'escapes' any special sugar we provide for codegen.
+                return GetToken(cSharpNode);
+            }
+            else
+            {
+                // This is the common case for 'mixed' content
+                return GetToken(node);
+            }
+
+            // In error cases we won't have a single token, but we still want to generate the code.
+            IntermediateToken GetToken(IntermediateNode parent)
+            {
+                return
+                    parent.Children.Count == 1 ? (IntermediateToken)parent.Children[0] : new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = string.Join(string.Empty, parent.Children.OfType<IntermediateToken>().Select(t => t.Content)),
+                    };
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs
new file mode 100644
index 0000000000..fd9a026f13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class BlazorRazorCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSharpLoweringPhase
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        {
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            ThrowForMissingDocumentDependency(documentNode);
+#pragma warning disable CS0618
+            var writer = new DocumentWriterWorkaround().Create(documentNode.Target, documentNode.Options);
+#pragma warning restore CS0618
+            try
+            {
+                var cSharpDocument = writer.WriteDocument(codeDocument, documentNode);
+                codeDocument.SetCSharpDocument(cSharpDocument);
+            }
+            catch (RazorCompilerException ex)
+            {
+                // Currently the Blazor code generation has some 'fatal errors' that can cause code generation
+                // to fail completely. This class is here to make that implementation work gracefully.
+                var cSharpDocument = RazorCSharpDocument.Create("", documentNode.Options, new[] { ex.Diagnostic });
+                codeDocument.SetCSharpDocument(cSharpDocument);
+            }
+        }
+
+        private class DocumentWriterWorkaround : DocumentWriter
+        {
+            public override RazorCSharpDocument WriteDocument(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs
new file mode 100644
index 0000000000..1437e5432b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs
@@ -0,0 +1,59 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    /// <summary>
+    /// Directs a <see cref="DocumentWriter"/> to use <see cref="BlazorRuntimeNodeWriter"/>.
+    /// </summary>
+    internal class BlazorCodeTarget : CodeTarget
+    {
+        private readonly RazorCodeGenerationOptions _options;
+
+        public BlazorCodeTarget(RazorCodeGenerationOptions options, IEnumerable<ICodeTargetExtension> extensions)
+        {
+            _options = options;
+            Extensions = extensions.ToArray();
+        }
+
+        public ICodeTargetExtension[] Extensions { get; }
+
+        public override IntermediateNodeWriter CreateNodeWriter()
+        {
+            return _options.DesignTime ? (BlazorNodeWriter)new BlazorDesignTimeNodeWriter() : new BlazorRuntimeNodeWriter();
+        }
+
+        public override TExtension GetExtension<TExtension>()
+        {
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                var match = Extensions[i] as TExtension;
+                if (match != null)
+                {
+                    return match;
+                }
+            }
+
+            return null;
+        }
+
+        public override bool HasExtension<TExtension>()
+        {
+            for (var i = 0; i < Extensions.Length; i++)
+            {
+                var match = Extensions[i] as TExtension;
+                if (match != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
new file mode 100644
index 0000000000..963ea24f44
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
@@ -0,0 +1,773 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Based on the DesignTimeNodeWriter from Razor repo.
+    internal class BlazorDesignTimeNodeWriter : BlazorNodeWriter
+    {
+        private readonly ScopeStack _scopeStack = new ScopeStack();
+
+        private static readonly string DesignTimeVariable = "__o";
+
+        public override void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Do nothing
+        }
+
+        public override void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            context.RenderChildren(node);
+        }
+
+        public override void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.AddSourceMappingFor(node);
+                    context.CodeWriter.WriteUsing(node.Content);
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteUsing(node.Content);
+            }
+        }
+
+        public override void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.Children.Count == 0)
+            {
+                return;
+            }
+
+            if (node.Source != null)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    var offset = DesignTimeVariable.Length + " = ".Length;
+                    context.CodeWriter.WritePadding(offset, node.Source, context);
+                    context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
+
+                    for (var i = 0; i < node.Children.Count; i++)
+                    {
+                        if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                        {
+                            context.AddSourceMappingFor(token);
+                            context.CodeWriter.Write(token.Content);
+                        }
+                        else
+                        {
+                            // There may be something else inside the expression like a Template or another extension node.
+                            context.RenderNode(node.Children[i]);
+                        }
+                    }
+
+                    context.CodeWriter.WriteLine(";");
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                    {
+                        context.CodeWriter.Write(token.Content);
+                    }
+                    else
+                    {
+                        // There may be something else inside the expression like a Template or another extension node.
+                        context.RenderNode(node.Children[i]);
+                    }
+                }
+                context.CodeWriter.WriteLine(";");
+            }
+        }
+
+        public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var isWhitespaceStatement = true;
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var token = node.Children[i] as IntermediateToken;
+                if (token == null || !string.IsNullOrWhiteSpace(token.Content))
+                {
+                    isWhitespaceStatement = false;
+                    break;
+                }
+            }
+
+            IDisposable linePragmaScope = null;
+            if (node.Source != null)
+            {
+                if (!isWhitespaceStatement)
+                {
+                    linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                }
+
+                context.CodeWriter.WritePadding(0, node.Source.Value, context);
+            }
+            else if (isWhitespaceStatement)
+            {
+                // Don't write whitespace if there is no line mapping for it.
+                return;
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    context.AddSourceMappingFor(token);
+                    context.CodeWriter.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the statement like an extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            if (linePragmaScope != null)
+            {
+                linePragmaScope.Dispose();
+            }
+            else
+            {
+                context.CodeWriter.WriteLine();
+            }
+        }
+
+        public override void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            context.RenderChildren(node);
+        }
+
+        public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Do nothing, this can't contain code.
+        }
+
+        public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.Children.Count == 0)
+            {
+                return;
+            }
+
+            var firstChild = node.Children[0];
+            if (firstChild.Source != null)
+            {
+                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value))
+                {
+                    var offset = DesignTimeVariable.Length + " = ".Length;
+                    context.CodeWriter.WritePadding(offset, firstChild.Source, context);
+                    context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
+
+                    for (var i = 0; i < node.Children.Count; i++)
+                    {
+                        if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                        {
+                            context.AddSourceMappingFor(token);
+                            context.CodeWriter.Write(token.Content);
+                        }
+                        else
+                        {
+                            // There may be something else inside the expression like a Template or another extension node.
+                            context.RenderNode(node.Children[i]);
+                        }
+                    }
+
+                    context.CodeWriter.WriteLine(";");
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                    {
+                        if (token.Source != null)
+                        {
+                            context.AddSourceMappingFor(token);
+                        }
+
+                        context.CodeWriter.Write(token.Content);
+                    }
+                    else
+                    {
+                        // There may be something else inside the expression like a Template or another extension node.
+                        context.RenderNode(node.Children[i]);
+                    }
+                }
+                context.CodeWriter.WriteLine(";");
+            }
+        }
+
+        public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Do nothing
+        }
+
+        public override void BeginWriteAttribute(CodeWriter codeWriter, string key)
+        {
+            if (codeWriter == null)
+            {
+                throw new ArgumentNullException(nameof(codeWriter));
+            }
+
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            codeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}")
+                .Write("-1")
+                .WriteParameterSeparator()
+                .WriteStringLiteral(key)
+                .WriteParameterSeparator();
+        }
+
+        public override void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.TypeInferenceNode == null)
+            {
+                // Writes something like:
+                //
+                // builder.OpenComponent<MyComponent>(0);
+                // builder.AddAttribute(1, "Foo", ...);
+                // builder.AddAttribute(2, "ChildContent", ...);
+                // builder.AddElementCapture(3, (__value) => _field = __value);
+                // builder.CloseComponent();
+                foreach (var typeArgument in node.TypeArguments)
+                {
+                    context.RenderNode(typeArgument);
+                }
+
+                foreach (var attribute in node.Attributes)
+                {
+                    context.RenderNode(attribute);
+                }
+
+                if (node.ChildContents.Any())
+                {
+                    foreach (var childContent in node.ChildContents)
+                    {
+                        context.RenderNode(childContent);
+                    }
+                }
+                else
+                {
+                    // We eliminate 'empty' child content when building the tree so that usage like
+                    // '<MyComponent>\r\n</MyComponent>' doesn't create a child content.
+                    //
+                    // Consider what would happen if the user's cursor was inside the element. At
+                    // design -time we want to render an empty lambda to provide proper scoping
+                    // for any code that the user types.
+                    context.RenderNode(new ComponentChildContentIntermediateNode()
+                    {
+                        TypeName = ComponentsApi.RenderFragment.FullTypeName,
+                    });
+                }
+
+                foreach (var capture in node.Captures)
+                {
+                    context.RenderNode(capture);
+                }
+            }
+            else
+            {
+                // When we're doing type inference, we can't write all of the code inline to initialize
+                // the component on the builder. We generate a method elsewhere, and then pass all of the information
+                // to that method. We pass in all of the attribute values + the sequence numbers.
+                //
+                // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ....);
+                var attributes = node.Attributes.ToList();
+                var childContents = node.ChildContents.ToList();
+                var captures = node.Captures.ToList();
+                var remaining = attributes.Count + childContents.Count + captures.Count;
+
+                context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName);
+                context.CodeWriter.Write(".");
+                context.CodeWriter.Write(node.TypeInferenceNode.MethodName);
+                context.CodeWriter.Write("(");
+
+                context.CodeWriter.Write(_scopeStack.BuilderVarName);
+                context.CodeWriter.Write(", ");
+
+                context.CodeWriter.Write("-1");
+                context.CodeWriter.Write(", ");
+
+                for (var i = 0; i < attributes.Count; i++)
+                {
+                    context.CodeWriter.Write("-1");
+                    context.CodeWriter.Write(", ");
+
+                    // Don't type check generics, since we can't actually write the type name.
+                    // The type checking with happen anyway since we defined a method and we're generating
+                    // a call to it.
+                    WriteComponentAttributeInnards(context, attributes[i], canTypeCheck: false);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
+                for (var i = 0; i < childContents.Count; i++)
+                {
+                    context.CodeWriter.Write("-1");
+                    context.CodeWriter.Write(", ");
+
+                    WriteComponentChildContentInnards(context, childContents[i]);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
+                for (var i = 0; i < captures.Count; i++)
+                {
+                    context.CodeWriter.Write("-1");
+                    context.CodeWriter.Write(", ");
+
+                    WriteReferenceCaptureInnards(context, captures[i], shouldTypeCheck: false);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
+                context.CodeWriter.Write(");");
+                context.CodeWriter.WriteLine();
+            }
+        }
+
+        public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            // __o = 17;
+            context.CodeWriter.Write(DesignTimeVariable);
+            context.CodeWriter.Write(" = ");
+
+            // Following the same design pattern as the runtime codegen
+            WriteComponentAttributeInnards(context, node, canTypeCheck: true);
+
+            context.CodeWriter.Write(";");
+            context.CodeWriter.WriteLine();
+        }
+
+        private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeExtensionNode node, bool canTypeCheck)
+        {
+            // We limit component attributes to simple cases. However there is still a lot of complexity
+            // to handle here, since there are a few different cases for how an attribute might be structured.
+            //
+            // This roughly follows the design of the runtime writer for simplicity.
+            if (node.AttributeStructure == AttributeStructure.Minimized)
+            {
+                // Minimized attributes always map to 'true'
+                context.CodeWriter.Write("true");
+            }
+            else if (node.Children.Count > 1)
+            {
+                // We don't expect this to happen, we just want to know if it can.
+                throw new InvalidOperationException("Attribute nodes should either be minimized or a single type of content." + string.Join(", ", node.Children));
+            }
+            else if (node.Children.Count == 1 && node.Children[0] is HtmlContentIntermediateNode)
+            {
+                // We don't actually need the content at designtime, an empty string will do.
+                context.CodeWriter.Write("\"\"");
+            }
+            else
+            {
+                // There are a few different forms that could be used to contain all of the tokens, but we don't really care
+                // exactly what it looks like - we just want all of the content.
+                //
+                // This can include an empty list in some cases like the following (sic):
+                //      <MyComponent Value="
+                //
+                // Or a CSharpExpressionIntermediateNode when the attribute has an explicit transition like:
+                //      <MyComponent Value="@value" />
+                //
+                // Of a list of tokens directly in the attribute.
+                var tokens = GetCSharpTokens(node);
+
+                if ((node.BoundAttribute?.IsDelegateProperty() ?? false) ||
+                    (node.BoundAttribute?.IsChildContentProperty() ?? false))
+                {
+                    // We always surround the expression with the delegate constructor. This makes type
+                    // inference inside lambdas, and method group conversion do the right thing.
+                    if (canTypeCheck)
+                    {
+                        context.CodeWriter.Write("new ");
+                        context.CodeWriter.Write(node.TypeName);
+                        context.CodeWriter.Write("(");
+                    }
+                    context.CodeWriter.WriteLine();
+
+                    for (var i = 0; i < tokens.Count; i++)
+                    {
+                        WriteCSharpToken(context, tokens[i]);
+                    }
+
+                    if (canTypeCheck)
+                    {
+                        context.CodeWriter.Write(")");
+                    }
+                }
+                else
+                {
+                    // This is the case when an attribute contains C# code
+                    //
+                    // If we have a parameter type, then add a type check.
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck);
+                        context.CodeWriter.Write("<");
+                        context.CodeWriter.Write(node.TypeName);
+                        context.CodeWriter.Write(">");
+                        context.CodeWriter.Write("(");
+                    }
+
+                    for (var i = 0; i < tokens.Count; i++)
+                    {
+                        WriteCSharpToken(context, tokens[i]);
+                    }
+
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(")");
+                    }
+                }
+            }
+
+            bool NeedsTypeCheck(ComponentAttributeExtensionNode n)
+            {
+                return n.BoundAttribute != null && !n.BoundAttribute.IsWeaklyTyped();
+            }
+
+            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeExtensionNode attribute)
+            {
+                // We generally expect all children to be CSharp, this is here just in case.
+                return attribute.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
+            }
+        }
+
+        public override void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Writes something like:
+            //
+            // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
+            // OR
+            // builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
+            BeginWriteAttribute(context.CodeWriter, node.AttributeName);
+            context.CodeWriter.Write($"({node.TypeName})(");
+
+            WriteComponentChildContentInnards(context, node);
+
+            context.CodeWriter.Write(")");
+            context.CodeWriter.WriteEndMethodInvocation();
+        }
+
+        private void WriteComponentChildContentInnards(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
+        {
+            // Writes something like:
+            //
+            // ((__builder73) => { ... })
+            // OR
+            // ((person) => (__builder73) => { })
+            _scopeStack.OpenComponentScope(
+                context,
+                node.AttributeName,
+                node.IsParameterized ? node.ParameterName : null);
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                context.RenderNode(node.Children[i]);
+            }
+            _scopeStack.CloseScope(context);
+        }
+
+        public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // At design type we want write the equivalent of:
+            //
+            // __o = typeof(TItem);
+            context.CodeWriter.Write(DesignTimeVariable);
+            context.CodeWriter.Write(" = ");
+            context.CodeWriter.Write("typeof(");
+
+            var tokens = GetCSharpTokens(node);
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                WriteCSharpToken(context, tokens[i]);
+            }
+
+            context.CodeWriter.Write(");");
+            context.CodeWriter.WriteLine();
+
+            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentTypeArgumentExtensionNode arg)
+            {
+                // We generally expect all children to be CSharp, this is here just in case.
+                return arg.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
+            }
+        }
+
+        public override void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            //
+            // (__builder73) => { ... }
+            _scopeStack.OpenTemplateScope(context);
+            context.RenderChildren(node);
+            _scopeStack.CloseScope(context);
+        }
+
+        public override void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            //
+            // __field = default(MyComponent);
+            WriteReferenceCaptureInnards(context, node, shouldTypeCheck: true);
+        }
+
+        protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck)
+        {
+            // We specialize this code based on whether or not we can type check. When we're calling into
+            // a type-inferenced component, we can't do the type check. See the comments in WriteTypeInferenceMethod.
+            if (shouldTypeCheck)
+            {
+                // The runtime node writer moves the call elsewhere. At design time we
+                // just want sufficiently similar code that any unknown-identifier or type
+                // errors will be equivalent
+                var captureTypeName = node.IsComponentCapture
+                    ? node.ComponentCaptureTypeName
+                    : ComponentsApi.ElementRef.FullTypeName;
+                WriteCSharpCode(context, new CSharpCodeIntermediateNode
+                {
+                    Source = node.Source,
+                    Children =
+                    {
+                        node.IdentifierToken,
+                        new IntermediateToken
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = $" = default({captureTypeName});"
+                        }
+                    }
+                });
+            }
+            else
+            {
+                // Looks like:
+                //
+                // (__value) = { _field = (MyComponent)__value; }
+                // OR
+                // (__value) = { _field = (ElementRef)__value; }
+                const string refCaptureParamName = "__value";
+                using (var lambdaScope = context.CodeWriter.BuildLambda(refCaptureParamName))
+                {
+                    WriteCSharpCode(context, new CSharpCodeIntermediateNode
+                    {
+                        Source = node.Source,
+                        Children =
+                        {
+                            node.IdentifierToken,
+                            new IntermediateToken
+                            {
+                                Kind = TokenKind.CSharp,
+                                Content = $" = {refCaptureParamName};"
+                            }
+                        }
+                    });
+                }
+            }
+        }
+
+        private void WriteCSharpToken(CodeRenderingContext context, IntermediateToken token)
+        {
+            if (string.IsNullOrWhiteSpace(token.Content))
+            {
+                return;
+            }
+
+            if (token.Source?.FilePath == null)
+            {
+                context.CodeWriter.Write(token.Content);
+                return;
+            }
+
+            using (context.CodeWriter.BuildLinePragma(token.Source))
+            {
+                context.CodeWriter.WritePadding(0, token.Source.Value, context);
+                context.AddSourceMappingFor(token);
+                context.CodeWriter.Write(token.Content);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
new file mode 100644
index 0000000000..9a8003de3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
@@ -0,0 +1,130 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    /// <summary>
+    /// Initializes the Blazor extension.
+    /// </summary>
+    public class BlazorExtensionInitializer : RazorExtensionInitializer
+    {
+        /// <summary>
+        /// Specifies the declaration configuration.
+        /// </summary>
+        public static readonly RazorConfiguration DeclarationConfiguration;
+
+        /// <summary>
+        /// Specifies the default configuration.
+        /// </summary>
+        public static readonly RazorConfiguration DefaultConfiguration;
+
+        static BlazorExtensionInitializer()
+        {
+            // The configuration names here need to match what we put in the MSBuild configuration
+            DeclarationConfiguration = RazorConfiguration.Create(
+                RazorLanguageVersion.Experimental,
+                "BlazorDeclaration-0.1",
+                Array.Empty<RazorExtension>());
+
+            DefaultConfiguration = RazorConfiguration.Create(
+                RazorLanguageVersion.Experimental,
+                "Blazor-0.1",
+                Array.Empty<RazorExtension>());
+        }
+
+        /// <summary>
+        /// Registers the Blazor extension.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            FunctionsDirective.Register(builder);
+            ImplementsDirective.Register(builder);
+            InheritsDirective.Register(builder);
+            InjectDirective.Register(builder);
+            LayoutDirective.Register(builder);
+            PageDirective.Register(builder);
+            TypeParamDirective.Register(builder);
+
+            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
+            builder.Features.Add(new BlazorImportProjectFeature());
+
+            var index = builder.Phases.IndexOf(builder.Phases.OfType<IRazorCSharpLoweringPhase>().Single());
+            builder.Phases[index] = new BlazorRazorCSharpLoweringPhase();
+
+            builder.Features.Add(new ConfigureBlazorCodeGenerationOptions());
+
+            builder.AddTargetExtension(new BlazorTemplateTargetExtension());
+
+            var isDeclarationOnlyCompile = builder.Configuration.ConfigurationName == DeclarationConfiguration.ConfigurationName;
+
+            // Blazor-specific passes, in order.
+            if (!isDeclarationOnlyCompile)
+            {
+                // There's no benefit in this optimization during the declaration-only compile
+                builder.Features.Add(new TrimWhitespacePass());
+            }
+            builder.Features.Add(new ComponentDocumentClassifierPass());
+            builder.Features.Add(new ScriptTagPass());
+            builder.Features.Add(new ComplexAttributeContentPass());
+            builder.Features.Add(new ComponentLoweringPass());
+            builder.Features.Add(new EventHandlerLoweringPass());
+            builder.Features.Add(new RefLoweringPass());
+            builder.Features.Add(new BindLoweringPass());
+            builder.Features.Add(new TemplateDiagnosticPass());
+            builder.Features.Add(new GenericComponentPass());
+            builder.Features.Add(new ChildContentDiagnosticPass());
+            builder.Features.Add(new HtmlBlockPass());
+
+            if (isDeclarationOnlyCompile)
+            {
+                // This is for 'declaration only' processing. We don't want to try and emit any method bodies during
+                // the design time build because we can't do it correctly until the set of components is known.
+                builder.Features.Add(new EliminateMethodBodyPass());
+            }
+        }
+
+        /// <summary>
+        /// Initializes the Blazor extension.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        public override void Initialize(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            Register(builder);
+        }
+
+        private class ConfigureBlazorCodeGenerationOptions : IConfigureRazorCodeGenerationOptionsFeature
+        {
+            public int Order => 0;
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                if (options == null)
+                {
+                    throw new ArgumentNullException(nameof(options));
+                }
+
+                // These metadata attributes require a reference to the Razor.Runtime package which we don't
+                // otherwise need.
+                options.SuppressMetadataAttributes = true;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs
new file mode 100644
index 0000000000..a180d58f74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs
@@ -0,0 +1,97 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class BlazorImportProjectFeature : IImportProjectFeature
+    {
+        private const string ImportsFileName = "_ViewImports.cshtml";
+
+        private static readonly char[] PathSeparators = new char[]{ '/', '\\' };
+
+        // Using explicit newlines here to avoid fooling our baseline tests
+        private readonly static string DefaultUsingImportContent =
+            "\r\n" +
+            "@using System\r\n" +
+            "@using System.Collections.Generic\r\n" +
+            "@using System.Linq\r\n" +
+            "@using System.Threading.Tasks\r\n" +
+            "@using " + ComponentsApi.RenderFragment.Namespace + "\r\n"; // Microsoft.AspNetCore.Components
+
+        public RazorProjectEngine ProjectEngine { get; set; }
+
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var imports = new List<RazorProjectItem>()
+            {
+                 new VirtualProjectItem(DefaultUsingImportContent),
+                 new VirtualProjectItem(@"@addTagHelper ""*, Microsoft.AspNetCore.Components"""),
+            };
+
+            // Try and infer a namespace from the project directory. We don't yet have the ability to pass
+            // the namespace through from the project.
+            if (projectItem.PhysicalPath != null && projectItem.FilePath != null)
+            {
+                // Avoiding the path-specific APIs here, we want to handle all styles of paths
+                // on all platforms
+                var trimLength = projectItem.FilePath.Length + (projectItem.FilePath.StartsWith("/") ? 0 : 1);
+                var baseDirectory = projectItem.PhysicalPath.Substring(0, projectItem.PhysicalPath.Length - trimLength);
+                
+                var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
+                var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
+                if (!string.IsNullOrEmpty(baseNamespace))
+                {
+                    imports.Add(new VirtualProjectItem($@"@addTagHelper ""*, {baseNamespace}"""));
+                }
+            }
+
+            // We add hierarchical imports second so any default directive imports can be overridden.
+            imports.AddRange(GetHierarchicalImports(ProjectEngine.FileSystem, projectItem));
+
+            return imports;
+        }
+
+        // Temporary API until we fully convert to RazorProjectEngine
+        public IEnumerable<RazorProjectItem> GetHierarchicalImports(RazorProject project, RazorProjectItem projectItem)
+        {
+            // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+            return project.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse();
+        }
+
+        private class VirtualProjectItem : RazorProjectItem
+        {
+            private readonly byte[] _bytes;
+
+            public VirtualProjectItem(string content)
+            {
+                var preamble = Encoding.UTF8.GetPreamble();
+                var contentBytes = Encoding.UTF8.GetBytes(content);
+
+                _bytes = new byte[preamble.Length + contentBytes.Length];
+                preamble.CopyTo(_bytes, 0);
+                contentBytes.CopyTo(_bytes, preamble.Length);
+            }
+
+            public override string BasePath => null;
+
+            public override string FilePath => null;
+
+            public override string PhysicalPath => null;
+
+            public override bool Exists => true;
+
+            public override Stream Read() => new MemoryStream(_bytes);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
new file mode 100644
index 0000000000..688d3a6135
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
@@ -0,0 +1,83 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Metadata used for Blazor's interactions with the tag helper system
+    internal static class BlazorMetadata
+    {
+        // There's a bug in the 15.7 preview 1 Razor that prevents 'Kind' from being serialized
+        // this affects both tooling and build. For now our workaround is to ignore 'Kind' and
+        // use our own metadata entry to denote non-Component tag helpers.
+        public static readonly string SpecialKindKey = "Blazor.IsSpecialKind";
+
+        public static class Bind
+        {
+            public static readonly string RuntimeName = "Blazor.None";
+
+            public readonly static string TagHelperKind = "Blazor.Bind";
+
+            public readonly static string FallbackKey = "Blazor.Bind.Fallback";
+
+            public readonly static string TypeAttribute = "Blazor.Bind.TypeAttribute";
+
+            public readonly static string ValueAttribute = "Blazor.Bind.ValueAttribute";
+
+            public readonly static string ChangeAttribute = "Blazor.Bind.ChangeAttribute";
+        }
+
+        public static class ChildContent
+        {
+            public static readonly string RuntimeName = "Blazor.None";
+
+            public static readonly string TagHelperKind = "Blazor.ChildContent";
+
+            public static readonly string ParameterNameBoundAttributeKind = "Blazor.ChildContentParameterName";
+
+            /// <summary>
+            /// The name of the synthesized attribute used to set a child content parameter.
+            /// </summary>
+            public static readonly string ParameterAttributeName = "Context";
+
+            /// <summary>
+            /// The default name of the child content parameter (unless set by a Context attribute).
+            /// </summary>
+            public static readonly string DefaultParameterName = "context";
+        }
+
+        public static class Component
+        {
+            public static readonly string ChildContentKey = "Blazor.ChildContent";
+
+            public static readonly string ChildContentParameterNameKey = "Blazor.ChildContentParameterName";
+
+            public static readonly string DelegateSignatureKey = "Blazor.DelegateSignature";
+
+            public static readonly string WeaklyTypedKey = "Blazor.IsWeaklyTyped";
+
+            public static readonly string RuntimeName = "Blazor.IComponent";
+
+            public readonly static string TagHelperKind = "Blazor.Component";
+
+            public readonly static string GenericTypedKey = "Blazor.GenericTyped";
+
+            public readonly static string TypeParameterKey = "Blazor.TypeParameter";
+        }
+
+        public static class EventHandler
+        {
+            public static readonly string EventArgsType = "Blazor.EventHandler.EventArgs";
+
+            public static readonly string RuntimeName = "Blazor.None";
+
+            public readonly static string TagHelperKind = "Blazor.EventHandler";
+        }
+
+        public static class Ref
+        {
+            public readonly static string TagHelperKind = "Blazor.Ref";
+
+            public static readonly string RuntimeName = "Blazor.None";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
new file mode 100644
index 0000000000..7e3a8e199d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
@@ -0,0 +1,217 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal abstract class BlazorNodeWriter : IntermediateNodeWriter
+    {
+        public abstract void BeginWriteAttribute(CodeWriter codeWriter, string key);
+
+        public abstract void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node);
+
+        public abstract void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node);
+
+        public abstract void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node);
+
+        public abstract void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node);
+
+        public abstract void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node);
+
+        public abstract void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node);
+
+        public abstract void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node);
+
+        protected abstract void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck);
+
+        public abstract void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node);
+
+        public sealed override void BeginWriterScope(CodeRenderingContext context, string writer)
+        {
+            throw new NotImplementedException(nameof(BeginWriterScope));
+        }
+
+        public sealed override void EndWriterScope(CodeRenderingContext context)
+        {
+            throw new NotImplementedException(nameof(EndWriterScope));
+        }
+
+        public sealed override void WriteCSharpCodeAttributeValue(CodeRenderingContext context, CSharpCodeAttributeValueIntermediateNode node)
+        {
+            // We used to support syntaxes like <elem onsomeevent=@{ /* some C# code */ } /> but this is no longer the 
+            // case.
+            //
+            // We provide an error for this case just to be friendly.
+            var content = string.Join("", node.Children.OfType<IntermediateToken>().Select(t => t.Content));
+            context.Diagnostics.Add(ComponentDiagnosticFactory.Create_CodeBlockInAttribute(node.Source, content));
+            return;
+        }
+
+
+        // Currently the same for design time and runtime
+        public void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // This is ugly because CodeWriter doesn't allow us to erase, but we need to comma-delimit. So we have to
+            // materizalize something can iterate, or use string.Join. We'll need this multiple times, so materializing
+            // it.
+            var parameters = GetParameterDeclarations();
+
+            // This is really similar to the code in WriteComponentAttribute and WriteComponentChildContent - except simpler because
+            // attributes and child contents look like variables. 
+            //
+            // Looks like:
+            //
+            //  public static void CreateFoo_0<T1, T2>(RenderTreeBuilder builder, int seq, int __seq0, T1 __arg0, int __seq1, global::System.Collections.Generic.List<T2> __arg1, int __seq2, string __arg2)
+            //  {
+            //      builder.OpenComponent<Foo<T1, T2>>();
+            //      builder.AddAttribute(__seq0, "Attr0", __arg0);
+            //      builder.AddAttribute(__seq1, "Attr1", __arg1);
+            //      builder.AddAttribute(__seq2, "Attr2", __arg2);
+            //      builder.CloseComponent();
+            //  }
+            //
+            // As a special case, we need to generate a thunk for captures in this block instead of using
+            // them verbatim.
+            //
+            // The problem is that RenderTreeBuilder wants an Action<object>. The caller can't write the type
+            // name if it contains generics, and we can't write the variable they want to assign to. 
+            var writer = context.CodeWriter;
+
+            writer.Write("public static void ");
+            writer.Write(node.MethodName);
+
+            writer.Write("<");
+            writer.Write(string.Join(", ", node.Component.Component.GetTypeParameters().Select(a => a.Name)));
+            writer.Write(">");
+
+            writer.Write("(");
+            writer.Write("global::");
+            writer.Write(ComponentsApi.RenderTreeBuilder.FullTypeName);
+            writer.Write(" builder");
+            writer.Write(", ");
+            writer.Write("int seq");
+
+            if (parameters.Count > 0)
+            {
+                writer.Write(", ");
+            }
+
+            for (var i = 0; i < parameters.Count; i++)
+            {
+                writer.Write("int ");
+                writer.Write(parameters[i].seqName);
+
+                writer.Write(", ");
+                writer.Write(parameters[i].typeName);
+                writer.Write(" ");
+                writer.Write(parameters[i].parameterName);
+
+                if (i < parameters.Count - 1)
+                {
+                    writer.Write(", ");
+                }
+            }
+
+            writer.Write(")");
+            writer.WriteLine();
+
+            writer.WriteLine("{");
+
+            // builder.OpenComponent<TComponent>(42);
+            context.CodeWriter.Write("builder");
+            context.CodeWriter.Write(".");
+            context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
+            context.CodeWriter.Write("<");
+            context.CodeWriter.Write(node.Component.TypeName);
+            context.CodeWriter.Write(">(");
+            context.CodeWriter.Write("seq");
+            context.CodeWriter.Write(");");
+            context.CodeWriter.WriteLine();
+
+            var index = 0;
+            foreach (var attribute in node.Component.Attributes)
+            {
+                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                context.CodeWriter.Write(parameters[index].seqName);
+                context.CodeWriter.Write(", ");
+
+                context.CodeWriter.Write($"\"{attribute.AttributeName}\"");
+                context.CodeWriter.Write(", ");
+
+                context.CodeWriter.Write(parameters[index].parameterName);
+                context.CodeWriter.WriteEndMethodInvocation();
+
+                index++;
+            }
+
+            foreach (var childContent in node.Component.ChildContents)
+            {
+                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                context.CodeWriter.Write(parameters[index].seqName);
+                context.CodeWriter.Write(", ");
+
+                context.CodeWriter.Write($"\"{childContent.AttributeName}\"");
+                context.CodeWriter.Write(", ");
+
+                context.CodeWriter.Write(parameters[index].parameterName);
+                context.CodeWriter.WriteEndMethodInvocation();
+
+                index++;
+            }
+
+            foreach (var capture in node.Component.Captures)
+            {
+                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
+                context.CodeWriter.Write(parameters[index].seqName);
+                context.CodeWriter.Write(", ");
+
+                var cast = capture.IsComponentCapture ? $"({capture.ComponentCaptureTypeName})" : string.Empty;
+                context.CodeWriter.Write($"(__value) => {{ {parameters[index].parameterName}({cast}__value); }}");
+                context.CodeWriter.WriteEndMethodInvocation();
+
+                index++;
+            }
+
+            context.CodeWriter.WriteInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.CloseComponent);
+
+            writer.WriteLine("}");
+
+            List<(string seqName, string typeName, string parameterName)> GetParameterDeclarations()
+            {
+                var p = new List<(string seqName, string typeName, string parameterName)>();
+                foreach (var attribute in node.Component.Attributes)
+                {
+                    p.Add(($"__seq{p.Count}", attribute.TypeName, $"__arg{p.Count}"));
+                }
+
+                foreach (var childContent in node.Component.ChildContents)
+                {
+                    p.Add(($"__seq{p.Count}", childContent.TypeName, $"__arg{p.Count}"));
+                }
+
+                foreach (var capture in node.Component.Captures)
+                {
+                    p.Add(($"__seq{p.Count}", capture.TypeName, $"__arg{p.Count}"));
+                }
+
+                return p;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
new file mode 100644
index 0000000000..70a8965c18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
@@ -0,0 +1,764 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    /// <summary>
+    /// Generates the C# code corresponding to Razor source document contents.
+    /// </summary>
+    internal class BlazorRuntimeNodeWriter : BlazorNodeWriter
+    {
+        private readonly List<IntermediateToken> _currentAttributeValues = new List<IntermediateToken>();
+        private readonly ScopeStack _scopeStack = new ScopeStack();
+        private int _sourceSequence = 0;
+
+        public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var isWhitespaceStatement = true;
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var token = node.Children[i] as IntermediateToken;
+                if (token == null || !string.IsNullOrWhiteSpace(token.Content))
+                {
+                    isWhitespaceStatement = false;
+                    break;
+                }
+            }
+
+            if (isWhitespaceStatement)
+            {
+                // The runtime and design time code differ in their handling of whitespace-only
+                // statements. At runtime we can discard them completely. At design time we need
+                // to keep them for the editor.
+                return;
+            }
+
+            IDisposable linePragmaScope = null;
+            if (node.Source != null)
+            {
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                context.CodeWriter.WritePadding(0, node.Source.Value, context);
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    context.AddSourceMappingFor(token);
+                    context.CodeWriter.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the statement like an extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            if (linePragmaScope != null)
+            {
+                linePragmaScope.Dispose();
+            }
+            else
+            {
+                context.CodeWriter.WriteLine();
+            }
+        }
+
+        public override void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Since we're not in the middle of writing an element, this must evaluate as some
+            // text to display
+            context.CodeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}")
+                .Write((_sourceSequence++).ToString())
+                .WriteParameterSeparator();
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
+                {
+                    context.CodeWriter.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the expression like a Template or another extension node.
+                    context.RenderNode(node.Children[i]);
+                }
+            }
+
+            context.CodeWriter.WriteEndMethodInvocation();
+        }
+
+        public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // In cases like "somestring @variable", Razor tokenizes it as:
+            //  [0] HtmlContent="somestring"
+            //  [1] CsharpContent="variable" Prefix=" "
+            // ... so to avoid losing whitespace, convert the prefix to a further token in the list
+            if (!string.IsNullOrEmpty(node.Prefix))
+            {
+                _currentAttributeValues.Add(new IntermediateToken() { Kind = TokenKind.Html, Content = node.Prefix });
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                _currentAttributeValues.Add((IntermediateToken)node.Children[i]);
+            }
+        }
+
+        public override void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            context.CodeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddMarkupContent)}")
+                .Write((_sourceSequence++).ToString())
+                .WriteParameterSeparator()
+                .WriteStringLiteral(node.Content)
+                .WriteEndMethodInvocation();
+        }
+
+        public override void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            context.CodeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.OpenElement)}")
+                .Write((_sourceSequence++).ToString())
+                .WriteParameterSeparator()
+                .WriteStringLiteral(node.TagName)
+                .WriteEndMethodInvocation();
+
+            // Render Attributes before creating the scope.
+            foreach (var attribute in node.Attributes)
+            {
+                context.RenderNode(attribute);
+            }
+
+            foreach (var capture in node.Captures)
+            {
+                context.RenderNode(capture);
+            }
+
+            // Render body of the tag inside the scope
+            foreach (var child in node.Body)
+            {
+                context.RenderNode(child);
+            }
+
+            context.CodeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.CloseElement}")
+                .WriteEndMethodInvocation();
+        }
+
+        public override void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            Debug.Assert(_currentAttributeValues.Count == 0);
+            context.RenderChildren(node);
+
+            WriteAttribute(context.CodeWriter, node.AttributeName, _currentAttributeValues);
+            _currentAttributeValues.Clear();
+        }
+
+        public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var stringContent = ((IntermediateToken)node.Children.Single()).Content;
+            _currentAttributeValues.Add(new IntermediateToken() { Kind = TokenKind.Html, Content = node.Prefix + stringContent, });
+        }
+
+        public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Text node
+            var content = GetHtmlContent(node);
+            context.CodeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}")
+                .Write((_sourceSequence++).ToString())
+                .WriteParameterSeparator()
+                .WriteStringLiteral(content)
+                .WriteEndMethodInvocation();
+        }
+
+        public override void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            context.CodeWriter.WriteUsing(node.Content, endLine: true);
+        }
+
+        public override void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (node.TypeInferenceNode == null)
+            {
+                // If the component is using not using type inference then we just write an open/close with a series
+                // of add attribute calls in between.
+                //
+                // Writes something like:
+                //
+                // builder.OpenComponent<MyComponent>(0);
+                // builder.AddAttribute(1, "Foo", ...);
+                // builder.AddAttribute(2, "ChildContent", ...);
+                // builder.AddElementCapture(3, (__value) => _field = __value);
+                // builder.CloseComponent();
+
+                // builder.OpenComponent<TComponent>(42);
+                context.CodeWriter.Write(_scopeStack.BuilderVarName);
+                context.CodeWriter.Write(".");
+                context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
+                context.CodeWriter.Write("<");
+                context.CodeWriter.Write(node.TypeName);
+                context.CodeWriter.Write(">(");
+                context.CodeWriter.Write((_sourceSequence++).ToString());
+                context.CodeWriter.Write(");");
+                context.CodeWriter.WriteLine();
+
+                // We can skip type arguments during runtime codegen, they are handled in the
+                // type/parameter declarations.
+
+                foreach (var attribute in node.Attributes)
+                {
+                    context.RenderNode(attribute);
+                }
+
+                foreach (var childContent in node.ChildContents)
+                {
+                    context.RenderNode(childContent);
+                }
+
+                foreach (var capture in node.Captures)
+                {
+                    context.RenderNode(capture);
+                }
+
+                // builder.CloseComponent();
+                context.CodeWriter.Write(_scopeStack.BuilderVarName);
+                context.CodeWriter.Write(".");
+                context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.CloseComponent);
+                context.CodeWriter.Write("();");
+                context.CodeWriter.WriteLine();
+            }
+            else
+            {
+                // When we're doing type inference, we can't write all of the code inline to initialize
+                // the component on the builder. We generate a method elsewhere, and then pass all of the information
+                // to that method. We pass in all of the attribute values + the sequence numbers.
+                //
+                // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ...);
+                var attributes = node.Attributes.ToList();
+                var childContents = node.ChildContents.ToList();
+                var captures = node.Captures.ToList();
+                var remaining = attributes.Count + childContents.Count + captures.Count;
+
+                context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName);
+                context.CodeWriter.Write(".");
+                context.CodeWriter.Write(node.TypeInferenceNode.MethodName);
+                context.CodeWriter.Write("(");
+
+                context.CodeWriter.Write(_scopeStack.BuilderVarName);
+                context.CodeWriter.Write(", ");
+
+                context.CodeWriter.Write((_sourceSequence++).ToString());
+                context.CodeWriter.Write(", ");
+
+                for (var i = 0; i < attributes.Count; i++)
+                {
+                    context.CodeWriter.Write((_sourceSequence++).ToString());
+                    context.CodeWriter.Write(", ");
+
+                    // Don't type check generics, since we can't actually write the type name.
+                    // The type checking with happen anyway since we defined a method and we're generating
+                    // a call to it.
+                    WriteComponentAttributeInnards(context, attributes[i], canTypeCheck: false);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
+                for (var i = 0; i < childContents.Count; i++)
+                {
+                    context.CodeWriter.Write((_sourceSequence++).ToString());
+                    context.CodeWriter.Write(", ");
+
+                    WriteComponentChildContentInnards(context, childContents[i]);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+                
+                for (var i = 0; i < captures.Count; i++)
+                {
+                    context.CodeWriter.Write((_sourceSequence++).ToString());
+                    context.CodeWriter.Write(", ");
+
+                    WriteReferenceCaptureInnards(context, captures[i], shouldTypeCheck: false);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
+                context.CodeWriter.Write(");");
+                context.CodeWriter.WriteLine();
+            }
+        }
+
+        public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // builder.AddAttribute(1, "Foo", 42);
+            context.CodeWriter.Write(_scopeStack.BuilderVarName);
+            context.CodeWriter.Write(".");
+            context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.AddAttribute);
+            context.CodeWriter.Write("(");
+            context.CodeWriter.Write((_sourceSequence++).ToString());
+            context.CodeWriter.Write(", ");
+            context.CodeWriter.WriteStringLiteral(node.AttributeName);
+            context.CodeWriter.Write(", ");
+
+            WriteComponentAttributeInnards(context, node, canTypeCheck: true);
+
+            context.CodeWriter.Write(");");
+            context.CodeWriter.WriteLine();
+        }
+
+        private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeExtensionNode node, bool canTypeCheck)
+        {
+            if (node.AttributeStructure == AttributeStructure.Minimized)
+            {
+                // Minimized attributes always map to 'true'
+                context.CodeWriter.Write("true");
+            }
+            else if (node.Children.Count > 1)
+            {
+                // We don't expect this to happen, we just want to know if it can.
+                throw new InvalidOperationException("Attribute nodes should either be minimized or a single type of content." + string.Join(", ", node.Children));
+            }
+            else if (node.Children.Count == 1 && node.Children[0] is HtmlContentIntermediateNode htmlNode)
+            {
+                // This is how string attributes are lowered by default, a single HTML node with a single HTML token.
+                var content = string.Join(string.Empty, GetHtmlTokens(htmlNode).Select(t => t.Content));
+                context.CodeWriter.WriteStringLiteral(content);
+            }
+            else
+            {
+                // See comments in BlazorDesignTimeNodeWriter for a description of the cases that are possible.
+                var tokens = GetCSharpTokens(node);
+                if ((node.BoundAttribute?.IsDelegateProperty() ?? false) ||
+                    (node.BoundAttribute?.IsChildContentProperty() ?? false))
+                {
+                    if (canTypeCheck)
+                    {
+                        context.CodeWriter.Write("new ");
+                        context.CodeWriter.Write(node.TypeName);
+                        context.CodeWriter.Write("(");
+                    }
+
+                    for (var i = 0; i < tokens.Count; i++)
+                    {
+                        context.CodeWriter.Write(tokens[i].Content);
+                    }
+
+                    if (canTypeCheck)
+                    {
+                        context.CodeWriter.Write(")");
+                    }
+                }
+                else
+                {
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck);
+                        context.CodeWriter.Write("<");
+                        context.CodeWriter.Write(node.TypeName);
+                        context.CodeWriter.Write(">");
+                        context.CodeWriter.Write("(");
+                    }
+
+                    for (var i = 0; i < tokens.Count; i++)
+                    {
+                        context.CodeWriter.Write(tokens[i].Content);
+                    }
+
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(")");
+                    }
+                }
+            }
+
+            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeExtensionNode attribute)
+            {
+                // We generally expect all children to be CSharp, this is here just in case.
+                return attribute.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
+            }
+
+            IReadOnlyList<IntermediateToken> GetHtmlTokens(HtmlContentIntermediateNode html)
+            {
+                // We generally expect all children to be HTML, this is here just in case.
+                return html.FindDescendantNodes<IntermediateToken>().Where(t => t.IsHtml).ToArray();
+            }
+
+            bool NeedsTypeCheck(ComponentAttributeExtensionNode n)
+            {
+                return node.BoundAttribute != null && !node.BoundAttribute.IsWeaklyTyped();
+            }
+        }
+
+        public override void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Writes something like:
+            //
+            // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
+            // OR
+            // builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
+            BeginWriteAttribute(context.CodeWriter, node.AttributeName);
+            context.CodeWriter.Write($"({node.TypeName})(");
+
+            WriteComponentChildContentInnards(context, node);
+
+            context.CodeWriter.Write(")");
+            context.CodeWriter.WriteEndMethodInvocation();
+        }
+
+        private void WriteComponentChildContentInnards(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
+        {
+            // Writes something like:
+            //
+            // ((__builder73) => { ... })
+            // OR
+            // ((person) => (__builder73) => { })
+            _scopeStack.OpenComponentScope(
+                context,
+                node.AttributeName,
+                node.IsParameterized ? node.ParameterName : null);
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                context.RenderNode(node.Children[i]);
+            }
+            _scopeStack.CloseScope(context);
+        }
+
+        public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node)
+        {
+            // We can skip type arguments during runtime codegen, they are handled in the
+            // type/parameter declarations.
+        }
+
+        public override void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            //
+            // (__builder73) => { ... }
+            _scopeStack.OpenTemplateScope(context);
+            context.RenderChildren(node);
+            _scopeStack.CloseScope(context);
+        }
+
+        public override void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node)
+        {
+            // Looks like:
+            //
+            // builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; });
+            // OR
+            // builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementRef)__value; });
+            var codeWriter = context.CodeWriter;
+
+            var methodName = node.IsComponentCapture
+                ? nameof(ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture)
+                : nameof(ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
+            codeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{methodName}")
+                .Write((_sourceSequence++).ToString())
+                .WriteParameterSeparator();
+
+            WriteReferenceCaptureInnards(context, node, shouldTypeCheck: true);
+
+            codeWriter.WriteEndMethodInvocation();
+        }
+
+        protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck)
+        {
+            // Looks like:
+            //
+            // (__value) = { _field = (MyComponent)__value; }
+            // OR
+            // (__value) = { _field = (ElementRef)__value; }
+            const string refCaptureParamName = "__value";
+            using (var lambdaScope = context.CodeWriter.BuildLambda(refCaptureParamName))
+            {
+                var typecastIfNeeded = shouldTypeCheck && node.IsComponentCapture ? $"({node.ComponentCaptureTypeName})" : string.Empty;
+                WriteCSharpCode(context, new CSharpCodeIntermediateNode
+                {
+                    Source = node.Source,
+                    Children =
+                    {
+                        node.IdentifierToken,
+                        new IntermediateToken
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = $" = {typecastIfNeeded}{refCaptureParamName};"
+                        }
+                    }
+                });
+            }
+        }
+
+        private void WriteAttribute(CodeWriter codeWriter, string key, IList<IntermediateToken> value)
+        {
+            BeginWriteAttribute(codeWriter, key);
+            WriteAttributeValue(codeWriter, value);
+            codeWriter.WriteEndMethodInvocation();
+        }
+
+        public override void BeginWriteAttribute(CodeWriter codeWriter, string key)
+        {
+            codeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}")
+                .Write((_sourceSequence++).ToString())
+                .WriteParameterSeparator()
+                .WriteStringLiteral(key)
+                .WriteParameterSeparator();
+        }
+
+        private static string GetHtmlContent(HtmlContentIntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            var htmlTokens = node.Children.OfType<IntermediateToken>().Where(t => t.IsHtml);
+            foreach (var htmlToken in htmlTokens)
+            {
+                builder.Append(htmlToken.Content);
+            }
+            return builder.ToString();
+        }
+
+        // There are a few cases here, we need to handle:
+        // - Pure HTML
+        // - Pure CSharp
+        // - Mixed HTML and CSharp
+        //
+        // Only the mixed case is complicated, we want to turn it into code that will concatenate
+        // the values into a string at runtime.
+
+        private static void WriteAttributeValue(CodeWriter writer, IList<IntermediateToken> tokens)
+        {
+            if (tokens == null)
+            {
+                throw new ArgumentNullException(nameof(tokens));
+            }
+
+            var hasHtml = false;
+            var hasCSharp = false;
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                if (tokens[i].IsCSharp)
+                {
+                    hasCSharp |= true;
+                }
+                else
+                {
+                    hasHtml |= true;
+                }
+            }
+
+            if (hasHtml && hasCSharp)
+            {
+                // If it's a C# expression, we have to wrap it in parens, otherwise things like ternary 
+                // expressions don't compose with concatenation. However, this is a little complicated
+                // because C# tokens themselves aren't guaranteed to be distinct expressions. We want
+                // to treat all contiguous C# tokens as a single expression.
+                var insideCSharp = false;
+                for (var i = 0; i < tokens.Count; i++)
+                {
+                    var token = tokens[i];
+                    if (token.IsCSharp)
+                    {
+                        if (!insideCSharp)
+                        {
+                            if (i != 0)
+                            {
+                                writer.Write(" + ");
+                            }
+
+                            writer.Write("(");
+                            insideCSharp = true;
+                        }
+
+                        writer.Write(token.Content);
+                    }
+                    else
+                    {
+                        if (insideCSharp)
+                        {
+                            writer.Write(")");
+                            insideCSharp = false;
+                        }
+
+                        if (i != 0)
+                        {
+                            writer.Write(" + ");
+                        }
+
+                        writer.WriteStringLiteral(token.Content);
+                    }
+                }
+
+                if (insideCSharp)
+                {
+                    writer.Write(")");
+                }
+            }
+            else if (hasCSharp)
+            {
+                writer.Write(string.Join("", tokens.Select(t => t.Content)));
+            }
+            else if (hasHtml)
+            {
+                writer.WriteStringLiteral(string.Join("", tokens.Select(t => t.Content)));
+            }
+            else
+            {
+                // Minimized attributes always map to 'true'
+                writer.Write("true");
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs
new file mode 100644
index 0000000000..9c90eadc94
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class BlazorTemplateTargetExtension : ITemplateTargetExtension
+    {
+        public void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node)
+        {
+            ((BlazorNodeWriter)context.NodeWriter).WriteTemplate(context, node);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
new file mode 100644
index 0000000000..bcf31bb031
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ChildContentDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Runs after components/eventhandlers/ref/bind/templates. We want to validate every component
+        // and it's usage of ChildContent.
+        public override int Order => 160;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<ComponentExtensionNode>, IExtensionIntermediateNodeVisitor<ComponentChildContentIntermediateNode>
+        {
+            public void VisitExtension(ComponentExtensionNode node)
+            {
+                // Check for properties that are set by both element contents (body) and the attribute itself.
+                foreach (var childContent in node.ChildContents)
+                {
+                    foreach (var attribute in node.Attributes)
+                    {
+                        if (attribute.AttributeName == childContent.AttributeName)
+                        {
+                            node.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentSetByAttributeAndBody(
+                                attribute.Source,
+                                attribute.AttributeName));
+                        }
+                    }
+                }
+
+                base.VisitDefault(node);
+            }
+
+            public void VisitExtension(ComponentChildContentIntermediateNode node)
+            {
+                // Check that each child content has a unique parameter name within its scope. This is important
+                // because the parameter name can be implicit, and it doesn't work well when nested.
+                if (node.IsParameterized)
+                {
+                    for (var i = 0; i < Ancestors.Count - 1; i++)
+                    {
+                        var ancestor = Ancestors[i] as ComponentChildContentIntermediateNode;
+                        if (ancestor != null &&
+                            ancestor.IsParameterized &&
+                            string.Equals(node.ParameterName, ancestor.ParameterName, StringComparison.Ordinal))
+                        {
+                            // Duplicate name. We report an error because this will almost certainly also lead to an error
+                            // from the C# compiler that's way less clear.
+                            node.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentRepeatedParameterName(
+                                node.Source,
+                                node,
+                                (ComponentExtensionNode)Ancestors[0], // Enclosing component
+                                ancestor, // conflicting child content node
+                                (ComponentExtensionNode)Ancestors[i + 1]));  // Enclosing component of conflicting child content node
+                        }
+                    }
+                }
+                
+                base.VisitDefault(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs
new file mode 100644
index 0000000000..e458d88d6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs
@@ -0,0 +1,647 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+
+// Copied directly from https://github.com/aspnet/Razor/blob/ff40124594b58b17988d50841175430a4b73d1a9/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs
+// (other than the namespace change) because it's internal
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class CodeWriterExtensions
+    {
+        private const string InstanceMethodFormat = "{0}.{1}";
+
+        private static readonly char[] CStyleStringLiteralEscapeChars =
+        {
+            '\r',
+            '\t',
+            '\"',
+            '\'',
+            '\\',
+            '\0',
+            '\n',
+            '\u2028',
+            '\u2029',
+        };
+
+        public static bool IsAtBeginningOfLine(this CodeWriter writer)
+        {
+            return writer.Length == 0 || writer[writer.Length - 1] == '\n';
+        }
+
+        public static CodeWriter WritePadding(this CodeWriter writer, int offset, SourceSpan? span, CodeRenderingContext context)
+        {
+            if (span == null)
+            {
+                return writer;
+            }
+
+            var basePadding = CalculatePadding();
+            var resolvedPadding = Math.Max(basePadding - offset, 0);
+
+            if (context.Options.IndentWithTabs)
+            {
+                // Avoid writing directly to the StringBuilder here, that will throw off the manual indexing 
+                // done by the base class.
+                var tabs = resolvedPadding / context.Options.IndentSize;
+                for (var i = 0; i < tabs; i++)
+                {
+                    writer.Write("\t");
+                }
+
+                var spaces = resolvedPadding % context.Options.IndentSize;
+                for (var i = 0; i < spaces; i++)
+                {
+                    writer.Write(" ");
+                }
+            }
+            else
+            {
+                for (var i = 0; i < resolvedPadding; i++)
+                {
+                    writer.Write(" ");
+                }
+            }
+
+            return writer;
+
+            int CalculatePadding()
+            {
+                var spaceCount = 0;
+                for (var i = span.Value.AbsoluteIndex - 1; i >= 0; i--)
+                {
+                    var @char = context.SourceDocument[i];
+                    if (@char == '\n' || @char == '\r')
+                    {
+                        break;
+                    }
+                    else if (@char == '\t')
+                    {
+                        spaceCount += context.Options.IndentSize;
+                    }
+                    else
+                    {
+                        spaceCount++;
+                    }
+                }
+
+                return spaceCount;
+            }
+        }
+
+        public static CodeWriter WriteVariableDeclaration(this CodeWriter writer, string type, string name, string value)
+        {
+            writer.Write(type).Write(" ").Write(name);
+            if (!string.IsNullOrEmpty(value))
+            {
+                writer.Write(" = ").Write(value);
+            }
+            else
+            {
+                writer.Write(" = null");
+            }
+
+            writer.WriteLine(";");
+
+            return writer;
+        }
+
+        public static CodeWriter WriteBooleanLiteral(this CodeWriter writer, bool value)
+        {
+            return writer.Write(value.ToString().ToLowerInvariant());
+        }
+
+        public static CodeWriter WriteStartAssignment(this CodeWriter writer, string name)
+        {
+            return writer.Write(name).Write(" = ");
+        }
+
+        public static CodeWriter WriteParameterSeparator(this CodeWriter writer)
+        {
+            return writer.Write(", ");
+        }
+
+        public static CodeWriter WriteStartNewObject(this CodeWriter writer, string typeName)
+        {
+            return writer.Write("new ").Write(typeName).Write("(");
+        }
+
+        public static CodeWriter WriteStringLiteral(this CodeWriter writer, string literal)
+        {
+            if (literal.Length >= 256 && literal.Length <= 1500 && literal.IndexOf('\0') == -1)
+            {
+                WriteVerbatimStringLiteral(writer, literal);
+            }
+            else
+            {
+                WriteCStyleStringLiteral(writer, literal);
+            }
+
+            return writer;
+        }
+
+        public static CodeWriter WriteUsing(this CodeWriter writer, string name)
+        {
+            return WriteUsing(writer, name, endLine: true);
+        }
+
+        public static CodeWriter WriteUsing(this CodeWriter writer, string name, bool endLine)
+        {
+            writer.Write("using ");
+            writer.Write(name);
+
+            if (endLine)
+            {
+                writer.WriteLine(";");
+            }
+
+            return writer;
+        }
+
+        public static CodeWriter WriteLineNumberDirective(this CodeWriter writer, SourceSpan span)
+        {
+            if (writer.Length >= writer.NewLine.Length && !IsAtBeginningOfLine(writer))
+            {
+                writer.WriteLine();
+            }
+
+            var lineNumberAsString = (span.LineIndex + 1).ToString(CultureInfo.InvariantCulture);
+            return writer.Write("#line ").Write(lineNumberAsString).Write(" \"").Write(span.FilePath).WriteLine("\"");
+        }
+
+        public static CodeWriter WriteStartMethodInvocation(this CodeWriter writer, string methodName)
+        {
+            writer.Write(methodName);
+
+            return writer.Write("(");
+        }
+
+        public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer)
+        {
+            return WriteEndMethodInvocation(writer, endLine: true);
+        }
+
+        public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer, bool endLine)
+        {
+            writer.Write(")");
+            if (endLine)
+            {
+                writer.WriteLine(";");
+            }
+
+            return writer;
+        }
+
+        // Writes a method invocation for the given instance name.
+        public static CodeWriter WriteInstanceMethodInvocation(
+            this CodeWriter writer,
+            string instanceName,
+            string methodName,
+            params string[] parameters)
+        {
+            if (instanceName == null)
+            {
+                throw new ArgumentNullException(nameof(instanceName));
+            }
+
+            if (methodName == null)
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            return WriteInstanceMethodInvocation(writer, instanceName, methodName, endLine: true, parameters: parameters);
+        }
+
+        // Writes a method invocation for the given instance name.
+        public static CodeWriter WriteInstanceMethodInvocation(
+            this CodeWriter writer,
+            string instanceName,
+            string methodName,
+            bool endLine,
+            params string[] parameters)
+        {
+            if (instanceName == null)
+            {
+                throw new ArgumentNullException(nameof(instanceName));
+            }
+
+            if (methodName == null)
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            return WriteMethodInvocation(
+                writer,
+                string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName),
+                endLine,
+                parameters);
+        }
+
+        public static CodeWriter WriteStartInstanceMethodInvocation(this CodeWriter writer, string instanceName, string methodName)
+        {
+            if (instanceName == null)
+            {
+                throw new ArgumentNullException(nameof(instanceName));
+            }
+
+            if (methodName == null)
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            return WriteStartMethodInvocation(
+                writer,
+                string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName));
+        }
+
+        public static CodeWriter WriteField(this CodeWriter writer, IList<string> modifiers, string typeName, string fieldName)
+        {
+            if (modifiers == null)
+            {
+                throw new ArgumentNullException(nameof(modifiers));
+            }
+
+            if (typeName == null)
+            {
+                throw new ArgumentNullException(nameof(typeName));
+            }
+
+            if (fieldName == null)
+            {
+                throw new ArgumentNullException(nameof(fieldName));
+            }
+
+            for (var i = 0; i < modifiers.Count; i++)
+            {
+                writer.Write(modifiers[i]);
+                writer.Write(" ");
+            }
+
+            writer.Write(typeName);
+            writer.Write(" ");
+            writer.Write(fieldName);
+            writer.Write(";");
+            writer.WriteLine();
+
+            return writer;
+        }
+
+        public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, params string[] parameters)
+        {
+            return WriteMethodInvocation(writer, methodName, endLine: true, parameters: parameters);
+        }
+
+        public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, bool endLine, params string[] parameters)
+        {
+            return 
+                WriteStartMethodInvocation(writer, methodName)
+                .Write(string.Join(", ", parameters))
+                .WriteEndMethodInvocation(endLine);
+        }
+
+        public static CodeWriter WriteAutoPropertyDeclaration(this CodeWriter writer, IList<string> modifiers, string typeName, string propertyName)
+        {
+            if (modifiers == null)
+            {
+                throw new ArgumentNullException(nameof(modifiers));
+            }
+
+            if (typeName == null)
+            {
+                throw new ArgumentNullException(nameof(typeName));
+            }
+
+            if (propertyName == null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            for (var i = 0; i < modifiers.Count; i++)
+            {
+                writer.Write(modifiers[i]);
+                writer.Write(" ");
+            }
+
+            writer.Write(typeName);
+            writer.Write(" ");
+            writer.Write(propertyName);
+            writer.Write(" { get; set; }");
+            writer.WriteLine();
+
+            return writer;
+        }
+
+        public static CSharpCodeWritingScope BuildScope(this CodeWriter writer)
+        {
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static CSharpCodeWritingScope BuildLambda(this CodeWriter writer, params string[] parameterNames)
+        {
+            return BuildLambda(writer, async: false, parameterNames: parameterNames);
+        }
+
+        public static CSharpCodeWritingScope BuildAsyncLambda(this CodeWriter writer, params string[] parameterNames)
+        {
+            return BuildLambda(writer, async: true, parameterNames: parameterNames);
+        }
+
+        private static CSharpCodeWritingScope BuildLambda(CodeWriter writer, bool async, string[] parameterNames)
+        {
+            if (async)
+            {
+                writer.Write("async");
+            }
+
+            writer.Write("(").Write(string.Join(", ", parameterNames)).Write(") => ");
+
+            var scope = new CSharpCodeWritingScope(writer);
+
+            return scope;
+        }
+
+        public static CSharpCodeWritingScope BuildNamespace(this CodeWriter writer, string name)
+        {
+            writer.Write("namespace ").WriteLine(name);
+
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static CSharpCodeWritingScope BuildClassDeclaration(
+            this CodeWriter writer,
+            IList<string> modifiers,
+            string name,
+            string baseType,
+            IEnumerable<string> interfaces)
+        {
+            for (var i = 0; i < modifiers.Count; i++)
+            {
+                writer.Write(modifiers[i]);
+                writer.Write(" ");
+            }
+
+            writer.Write("class ");
+            writer.Write(name);
+
+            var hasBaseType = !string.IsNullOrEmpty(baseType);
+            var hasInterfaces = interfaces != null && interfaces.Count() > 0;
+
+            if (hasBaseType || hasInterfaces)
+            {
+                writer.Write(" : ");
+
+                if (hasBaseType)
+                {
+                    writer.Write(baseType);
+
+                    if (hasInterfaces)
+                    {
+                        WriteParameterSeparator(writer);
+                    }
+                }
+
+                if (hasInterfaces)
+                {
+                    writer.Write(string.Join(", ", interfaces));
+                }
+            }
+
+            writer.WriteLine();
+
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static CSharpCodeWritingScope BuildMethodDeclaration(
+            this CodeWriter writer,
+            string accessibility,
+            string returnType,
+            string name,
+            IEnumerable<KeyValuePair<string, string>> parameters)
+        {
+            writer.Write(accessibility)
+                .Write(" ")
+                .Write(returnType)
+                .Write(" ")
+                .Write(name)
+                .Write("(")
+                .Write(string.Join(", ", parameters.Select(p => p.Key + " " + p.Value)))
+                .WriteLine(")");
+
+            return new CSharpCodeWritingScope(writer);
+        }
+
+        public static IDisposable BuildLinePragma(this CodeWriter writer, SourceSpan? span)
+        {
+            if (string.IsNullOrEmpty(span?.FilePath))
+            {
+                // Can't build a valid line pragma without a file path.
+                return NullDisposable.Default;
+            }
+
+            return new LinePragmaWriter(writer, span.Value);
+        }
+
+        private static void WriteVerbatimStringLiteral(CodeWriter writer, string literal)
+        {
+            writer.Write("@\"");
+
+            // We need to suppress indenting during the writing of the string's content. A
+            // verbatim string literal could contain newlines that don't get escaped.
+            var indent = writer.CurrentIndent;
+            writer.CurrentIndent = 0;
+
+            // We need to find the index of each '"' (double-quote) to escape it.
+            var start = 0;
+            int end;
+            while ((end = literal.IndexOf('\"', start)) > -1)
+            {
+                writer.Write(literal, start, end - start);
+
+                writer.Write("\"\"");
+
+                start = end + 1;
+            }
+
+            Debug.Assert(end == -1); // We've hit all of the double-quotes.
+
+            // Write the remainder after the last double-quote.
+            writer.Write(literal, start, literal.Length - start);
+
+            writer.Write("\"");
+
+            writer.CurrentIndent = indent;
+        }
+
+        private static void WriteCStyleStringLiteral(CodeWriter writer, string literal)
+        {
+            // From CSharpCodeGenerator.QuoteSnippetStringCStyle in CodeDOM
+            writer.Write("\"");
+
+            // We need to find the index of each escapable character to escape it.
+            var start = 0;
+            int end;
+            while ((end = literal.IndexOfAny(CStyleStringLiteralEscapeChars, start)) > -1)
+            {
+                writer.Write(literal, start, end - start);
+
+                switch (literal[end])
+                {
+                    case '\r':
+                        writer.Write("\\r");
+                        break;
+                    case '\t':
+                        writer.Write("\\t");
+                        break;
+                    case '\"':
+                        writer.Write("\\\"");
+                        break;
+                    case '\'':
+                        writer.Write("\\\'");
+                        break;
+                    case '\\':
+                        writer.Write("\\\\");
+                        break;
+                    case '\0':
+                        writer.Write("\\\0");
+                        break;
+                    case '\n':
+                        writer.Write("\\n");
+                        break;
+                    case '\u2028':
+                    case '\u2029':
+                        writer.Write("\\u");
+                        writer.Write(((int)literal[end]).ToString("X4", CultureInfo.InvariantCulture));
+                        break;
+                    default:
+                        Debug.Assert(false, "Unknown escape character.");
+                        break;
+                }
+
+                start = end + 1;
+            }
+
+            Debug.Assert(end == -1); // We've hit all of chars that need escaping.
+
+            // Write the remainder after the last escaped char.
+            writer.Write(literal, start, literal.Length - start);
+
+            writer.Write("\"");
+        }
+
+        public struct CSharpCodeWritingScope : IDisposable
+        {
+            private CodeWriter _writer;
+            private bool _autoSpace;
+            private int _tabSize;
+            private int _startIndent;
+
+            public CSharpCodeWritingScope(CodeWriter writer, int tabSize = 4, bool autoSpace = true)
+            {
+                _writer = writer;
+                _autoSpace = autoSpace;
+                _tabSize = tabSize;
+                _startIndent = -1; // Set in WriteStartScope
+
+                WriteStartScope();
+            }
+
+            public void Dispose()
+            {
+                WriteEndScope();
+            }
+
+            private void WriteStartScope()
+            {
+                TryAutoSpace(" ");
+
+                _writer.WriteLine("{");
+                _writer.CurrentIndent += _tabSize;
+                _startIndent = _writer.CurrentIndent;
+            }
+
+            private void WriteEndScope()
+            {
+                TryAutoSpace(_writer.NewLine);
+
+                // Ensure the scope hasn't been modified
+                if (_writer.CurrentIndent == _startIndent)
+                {
+                    _writer.CurrentIndent -= _tabSize;
+                }
+
+                _writer.WriteLine("}");
+            }
+
+            private void TryAutoSpace(string spaceCharacter)
+            {
+                if (_autoSpace &&
+                    _writer.Length > 0 &&
+                    !char.IsWhiteSpace(_writer[_writer.Length - 1]))
+                {
+                    _writer.Write(spaceCharacter);
+                }
+            }
+        }
+
+        private class LinePragmaWriter : IDisposable
+        {
+            private readonly CodeWriter _writer;
+            private readonly int _startIndent;
+
+            public LinePragmaWriter(CodeWriter writer, SourceSpan span)
+            {
+                if (writer == null)
+                {
+                    throw new ArgumentNullException(nameof(writer));
+                }
+
+                _writer = writer;
+                _startIndent = _writer.CurrentIndent;
+                _writer.CurrentIndent = 0;
+                WriteLineNumberDirective(writer, span);
+            }
+
+            public void Dispose()
+            {
+                // Need to add an additional line at the end IF there wasn't one already written.
+                // This is needed to work with the C# editor's handling of #line ...
+                var endsWithNewline = _writer.Length > 0 && _writer[_writer.Length - 1] == '\n';
+
+                // Always write at least 1 empty line to potentially separate code from pragmas.
+                _writer.WriteLine();
+
+                // Check if the previous empty line wasn't enough to separate code from pragmas.
+                if (!endsWithNewline)
+                {
+                    _writer.WriteLine();
+                }
+
+                _writer
+                    .WriteLine("#line default")
+                    .WriteLine("#line hidden");
+
+                _writer.CurrentIndent = _startIndent;
+            }
+        }
+
+        private class NullDisposable : IDisposable
+        {
+            public static readonly NullDisposable Default = new NullDisposable();
+
+            private NullDisposable()
+            {
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs
new file mode 100644
index 0000000000..f500fedcb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs
@@ -0,0 +1,107 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // We don't support 'complex' content for components (mixed C# and markup) right now.
+    // It's not clear yet if Blazor will have a good scenario to use these constructs.
+    //
+    // This is where a lot of the complexity in the Razor/TagHelpers model creeps in and we
+    // might be able to avoid it if these features aren't needed.
+    internal class ComplexAttributeContentPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run before other Blazor passes
+        public override int Order => -1000;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var nodes = documentNode.FindDescendantNodes<TagHelperIntermediateNode>();
+            for (var i = 0; i < nodes.Count; i++)
+            {
+                ProcessAttributes(nodes[i]);
+            }
+        }
+
+        private void ProcessAttributes(TagHelperIntermediateNode node)
+        {
+            for (var i = node.Children.Count - 1; i >= 0; i--)
+            {
+                if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode)
+                {
+                    if (TrySimplifyContent(propertyNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper()))
+                    {
+                        node.Diagnostics.Add(ComponentDiagnosticFactory.Create_UnsupportedComplexContent(
+                            propertyNode,
+                            propertyNode.AttributeName));
+                        node.Children.RemoveAt(i);
+                        continue;
+                    }
+                }
+                else if (node.Children[i] is TagHelperHtmlAttributeIntermediateNode htmlNode)
+                {
+                    if (TrySimplifyContent(htmlNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper()))
+                    {
+                        node.Diagnostics.Add(ComponentDiagnosticFactory.Create_UnsupportedComplexContent(
+                            htmlNode,
+                            htmlNode.AttributeName));
+                        node.Children.RemoveAt(i);
+                        continue;
+                    }
+                }
+            }
+        }
+
+        private static bool TrySimplifyContent(IntermediateNode node)
+        {
+            if (node.Children.Count == 1 &&
+                node.Children[0] is HtmlAttributeIntermediateNode htmlNode &&
+                htmlNode.Children.Count > 1)
+            {
+                // This case can be hit for a 'string' attribute
+                return true;
+            }
+            else if (node.Children.Count == 1 &&
+                node.Children[0] is CSharpExpressionIntermediateNode cSharpNode &&
+                cSharpNode.Children.Count > 1)
+            {
+                // This case can be hit when the attribute has an explicit @ inside, which
+                // 'escapes' any special sugar we provide for codegen.
+                //
+                // There's a special case here for explicit expressions. See https://github.com/aspnet/Razor/issues/2203
+                // handling this case as a tactical matter since it's important for lambdas.
+                if (cSharpNode.Children.Count == 3 &&
+                    cSharpNode.Children[0] is IntermediateToken token0 &&
+                    cSharpNode.Children[2] is IntermediateToken token2 &&
+                    token0.Content == "(" &&
+                    token2.Content == ")")
+                {
+                    cSharpNode.Children.RemoveAt(2);
+                    cSharpNode.Children.RemoveAt(0);
+
+                    // We were able to simplify it, all good.
+                    return false;
+                }
+
+                return true;
+            }
+            else if (node.Children.Count == 1 &&
+                node.Children[0] is CSharpCodeIntermediateNode cSharpCodeNode)
+            {
+                // This is the case when an attribute contains a code block @{ ... }
+                // We don't support this.
+                return true;
+            }
+            else if (node.Children.Count > 1)
+            {
+                // This is the common case for 'mixed' content
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs
new file mode 100644
index 0000000000..075ae4db4a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs
@@ -0,0 +1,131 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentAttributeExtensionNode : ExtensionIntermediateNode
+    {
+        public ComponentAttributeExtensionNode()
+        {
+        }
+
+        public ComponentAttributeExtensionNode(TagHelperHtmlAttributeIntermediateNode attributeNode)
+        {
+            if (attributeNode == null)
+            {
+                throw new ArgumentNullException(nameof(attributeNode));
+            }
+
+            AttributeName = attributeNode.AttributeName;
+            AttributeStructure = attributeNode.AttributeStructure;
+            Source = attributeNode.Source;
+
+            for (var i = 0; i < attributeNode.Children.Count; i++)
+            {
+                Children.Add(attributeNode.Children[i]);
+            }
+
+            for (var i = 0; i < attributeNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(attributeNode.Diagnostics[i]);
+            }
+        }
+
+        public ComponentAttributeExtensionNode(TagHelperPropertyIntermediateNode propertyNode)
+        {
+            if (propertyNode == null)
+            {
+                throw new ArgumentNullException(nameof(propertyNode));
+            }
+
+            AttributeName = propertyNode.AttributeName;
+            AttributeStructure = propertyNode.AttributeStructure;
+            BoundAttribute = propertyNode.BoundAttribute;
+            PropertyName = propertyNode.BoundAttribute.GetPropertyName();
+            Source = propertyNode.Source;
+            TagHelper = propertyNode.TagHelper;
+            TypeName = propertyNode.BoundAttribute.IsWeaklyTyped() ? null : propertyNode.BoundAttribute.TypeName;
+
+            for (var i = 0; i < propertyNode.Children.Count; i++)
+            {
+                Children.Add(propertyNode.Children[i]);
+            }
+
+            for (var i = 0; i < propertyNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(propertyNode.Diagnostics[i]);
+            }
+        }
+
+        public ComponentAttributeExtensionNode(ComponentAttributeExtensionNode attributeNode)
+        {
+            if (attributeNode == null)
+            {
+                throw new ArgumentNullException(nameof(attributeNode));
+            }
+
+            AttributeName = attributeNode.AttributeName;
+            AttributeStructure = attributeNode.AttributeStructure;
+            BoundAttribute = attributeNode.BoundAttribute;
+            PropertyName = attributeNode.BoundAttribute.GetPropertyName();
+            Source = attributeNode.Source;
+            TagHelper = attributeNode.TagHelper;
+            TypeName = attributeNode.BoundAttribute.IsWeaklyTyped() ? null : attributeNode.BoundAttribute.TypeName;
+
+            for (var i = 0; i < attributeNode.Children.Count; i++)
+            {
+                Children.Add(attributeNode.Children[i]);
+            }
+
+            for (var i = 0; i < attributeNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(attributeNode.Diagnostics[i]);
+            }
+        }
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public string PropertyName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public string TypeName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ComponentAttributeExtensionNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteComponentAttribute(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs
new file mode 100644
index 0000000000..e5236bb1f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentChildContentIntermediateNode : ExtensionIntermediateNode
+    {
+        public string AttributeName => BoundAttribute?.Name ?? ComponentsApi.RenderTreeBuilder.ChildContent;
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public bool IsParameterized => BoundAttribute?.IsParameterizedChildContentProperty() ?? false;
+
+        public string ParameterName { get; set; }
+
+        public string TypeName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ComponentChildContentIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteComponentChildContent(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
similarity index 82%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 684bcbcec7..14df6420ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
-namespace Microsoft.AspNetCore.Razor.Language
+namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     internal static class ComponentDiagnosticFactory
     {
@@ -217,11 +217,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 "following top-level items: {1}.",
                 RazorDiagnosticSeverity.Error);
 
-        //public static RazorDiagnostic Create_ChildContentMixedWithExplicitChildContent(SourceSpan? source, ComponentExtensionNode component)
-        //{
-        //    var supportedElements = string.Join(", ", component.Component.GetChildContentProperties().Select(p => $"'{p.Name}'"));
-        //    return RazorDiagnostic.Create(ChildContentMixedWithExplicitChildContent, source ?? SourceSpan.Undefined, component.TagName, supportedElements);
-        //}
+        public static RazorDiagnostic Create_ChildContentMixedWithExplicitChildContent(SourceSpan? source, ComponentExtensionNode component)
+        {
+            var supportedElements = string.Join(", ", component.Component.GetChildContentProperties().Select(p => $"'{p.Name}'"));
+            return RazorDiagnostic.Create(ChildContentMixedWithExplicitChildContent, source ?? SourceSpan.Undefined, component.TagName, supportedElements);
+        }
 
         public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidAttribute =
             new RazorDiagnosticDescriptor(
@@ -252,26 +252,26 @@ namespace Microsoft.AspNetCore.Razor.Language
                 "element '{3}' of component '{4}'. Specify the parameter name like: '<{0} Context=\"another_name\"> to resolve the ambiguity",
                 RazorDiagnosticSeverity.Error);
 
-        //public static RazorDiagnostic Create_ChildContentRepeatedParameterName(
-        //    SourceSpan? source,
-        //    ComponentChildContentIntermediateNode childContent1,
-        //    ComponentExtensionNode component1,
-        //    ComponentChildContentIntermediateNode childContent2,
-        //    ComponentExtensionNode component2)
-        //{
-        //    Debug.Assert(childContent1.ParameterName == childContent2.ParameterName);
-        //    Debug.Assert(childContent1.IsParameterized);
-        //    Debug.Assert(childContent2.IsParameterized);
+        public static RazorDiagnostic Create_ChildContentRepeatedParameterName(
+            SourceSpan? source,
+            ComponentChildContentIntermediateNode childContent1,
+            ComponentExtensionNode component1,
+            ComponentChildContentIntermediateNode childContent2,
+            ComponentExtensionNode component2)
+        {
+            Debug.Assert(childContent1.ParameterName == childContent2.ParameterName);
+            Debug.Assert(childContent1.IsParameterized);
+            Debug.Assert(childContent2.IsParameterized);
 
-        //    return RazorDiagnostic.Create(
-        //        ChildContentRepeatedParameterName,
-        //        source ?? SourceSpan.Undefined,
-        //        childContent1.AttributeName,
-        //        component1.TagName,
-        //        childContent1.ParameterName,
-        //        childContent2.AttributeName,
-        //        component2.TagName);
-        //}
+            return RazorDiagnostic.Create(
+                ChildContentRepeatedParameterName,
+                source ?? SourceSpan.Undefined,
+                childContent1.AttributeName,
+                component1.TagName,
+                childContent1.ParameterName,
+                childContent2.AttributeName,
+                component2.TagName);
+        }
 
         public static readonly RazorDiagnosticDescriptor GenericComponentMissingTypeArgument =
             new RazorDiagnosticDescriptor(
@@ -279,16 +279,16 @@ namespace Microsoft.AspNetCore.Razor.Language
                 () => "The component '{0}' is missing required type arguments. Specify the missing types using the attributes: {1}.",
                 RazorDiagnosticSeverity.Error);
 
-        //public static RazorDiagnostic Create_GenericComponentMissingTypeArgument(
-        //    SourceSpan? source,
-        //    ComponentExtensionNode component,
-        //    IEnumerable<BoundAttributeDescriptor> attributes)
-        //{
-        //    Debug.Assert(component.Component.IsGenericTypedComponent());
+        public static RazorDiagnostic Create_GenericComponentMissingTypeArgument(
+            SourceSpan? source,
+            ComponentExtensionNode component,
+            IEnumerable<BoundAttributeDescriptor> attributes)
+        {
+            Debug.Assert(component.Component.IsGenericTypedComponent());
 
-        //    var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'"));
-        //    return RazorDiagnostic.Create(GenericComponentMissingTypeArgument, source ?? SourceSpan.Undefined, component.TagName, attributesText);
-        //}
+            var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'"));
+            return RazorDiagnostic.Create(GenericComponentMissingTypeArgument, source ?? SourceSpan.Undefined, component.TagName, attributesText);
+        }
 
         public static readonly RazorDiagnosticDescriptor GenericComponentTypeInferenceUnderspecified =
             new RazorDiagnosticDescriptor(
@@ -297,16 +297,16 @@ namespace Microsoft.AspNetCore.Razor.Language
                     "directly using the following attributes: {1}.",
                 RazorDiagnosticSeverity.Error);
 
-        //public static RazorDiagnostic Create_GenericComponentTypeInferenceUnderspecified(
-        //    SourceSpan? source,
-        //    ComponentExtensionNode component,
-        //    IEnumerable<BoundAttributeDescriptor> attributes)
-        //{
-        //    Debug.Assert(component.Component.IsGenericTypedComponent());
+        public static RazorDiagnostic Create_GenericComponentTypeInferenceUnderspecified(
+            SourceSpan? source,
+            ComponentExtensionNode component,
+            IEnumerable<BoundAttributeDescriptor> attributes)
+        {
+            Debug.Assert(component.Component.IsGenericTypedComponent());
 
-        //    var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'"));
-        //    return RazorDiagnostic.Create(GenericComponentTypeInferenceUnderspecified, source ?? SourceSpan.Undefined, component.TagName, attributesText);
-        //}
+            var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'"));
+            return RazorDiagnostic.Create(GenericComponentTypeInferenceUnderspecified, source ?? SourceSpan.Undefined, component.TagName, attributesText);
+        }
 
         public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameterOnComponent =
             new RazorDiagnosticDescriptor(
@@ -314,9 +314,9 @@ namespace Microsoft.AspNetCore.Razor.Language
                 () => "Invalid parameter name. The parameter name attribute '{0}' on component '{1}' can only include literal text.",
                 RazorDiagnosticSeverity.Error);
 
-        //public static RazorDiagnostic Create_ChildContentHasInvalidParameterOnComponent(SourceSpan? source, string attribute, string element)
-        //{
-        //    return RazorDiagnostic.Create(ChildContentHasInvalidParameterOnComponent, source ?? SourceSpan.Undefined, attribute, element);
-        //}
+        public static RazorDiagnostic Create_ChildContentHasInvalidParameterOnComponent(SourceSpan? source, string attribute, string element)
+        {
+            return RazorDiagnostic.Create(ChildContentHasInvalidParameterOnComponent, source ?? SourceSpan.Undefined, attribute, element);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index a48f49994f..dbf5bb100d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.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;
@@ -135,5 +135,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             return true;
         }
+
+        internal static bool IsBuildRenderTreeBaseCall(CSharpCodeIntermediateNode node)
+            => node.Annotations[BuildRenderTreeBaseCallAnnotation] != null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs
new file mode 100644
index 0000000000..cbd9ac592a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs
@@ -0,0 +1,107 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentExtensionNode : ExtensionIntermediateNode
+    {
+        public IEnumerable<ComponentAttributeExtensionNode> Attributes => Children.OfType<ComponentAttributeExtensionNode>();
+
+        public IEnumerable<RefExtensionNode> Captures => Children.OfType<RefExtensionNode>();
+
+        public IEnumerable<ComponentChildContentIntermediateNode> ChildContents => Children.OfType<ComponentChildContentIntermediateNode>();
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public TagHelperDescriptor Component { get; set; }
+
+        /// <summary>
+        /// Gets the child content parameter name (null if unset) that was applied at the component level.
+        /// </summary>
+        public string ChildContentParameterName { get; set; }
+
+        public IEnumerable<ComponentTypeArgumentExtensionNode> TypeArguments => Children.OfType<ComponentTypeArgumentExtensionNode>();
+
+        public string TagName { get; set; }
+        
+        // An optional type inference node. This will be populated (and point to a different part of the tree)
+        // if this component call site requires type inference.
+        public ComponentTypeInferenceMethodIntermediateNode TypeInferenceNode { get; set; }
+        
+        public string TypeName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ComponentExtensionNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteComponent(context, this);
+        }
+
+        private string DebuggerDisplay
+        {
+            get
+            {
+                var builder = new StringBuilder();
+                builder.Append("Component: ");
+                builder.Append("<");
+                builder.Append(TagName);
+
+                foreach (var attribute in Attributes)
+                {
+                    builder.Append(" ");
+                    builder.Append(attribute.AttributeName);
+                    builder.Append("=\"...\"");
+                }
+
+                foreach (var capture in Captures)
+                {
+                    builder.Append(" ");
+                    builder.Append("ref");
+                    builder.Append("=\"...\"");
+                }
+
+                foreach (var typeArgument in TypeArguments)
+                {
+                    builder.Append(" ");
+                    builder.Append(typeArgument.TypeParameterName);
+                    builder.Append("=\"...\"");
+                }
+
+                builder.Append(">");
+                builder.Append(ChildContents.Any() ? "..." : string.Empty);
+                builder.Append("</");
+                builder.Append(TagName);
+                builder.Append(">");
+
+                return builder.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
new file mode 100644
index 0000000000..0f9008c09e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -0,0 +1,488 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // This pass runs earlier than our other passes that 'lower' specific kinds of attributes.
+        public override int Order => 0;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            // For each component *usage* we need to rewrite the tag helper node to map to the relevant component
+            // APIs.
+            var references = documentNode.FindDescendantReferences<TagHelperIntermediateNode>();
+            for (var i = 0; i < references.Count; i++)
+            {
+                var reference = references[i];
+                var node = (TagHelperIntermediateNode)reference.Node;
+
+                var count = 0;
+                for (var j = 0; j < node.TagHelpers.Count; j++)
+                {
+                    if (node.TagHelpers[j].IsComponentTagHelper())
+                    {
+                        // Only allow a single component tag helper per element. If there are multiple, we'll just consider
+                        // the first one and ignore the others.
+                        if (count++ > 1)
+                        {
+                            node.Diagnostics.Add(ComponentDiagnosticFactory.Create_MultipleComponents(node.Source, node.TagName, node.TagHelpers));
+                            break;
+                        }
+                    }
+                }
+
+                if (count >= 1)
+                {
+                    reference.Replace(RewriteAsComponent(node, node.TagHelpers.First(t => t.IsComponentTagHelper())));
+                }
+                else if (node.TagHelpers.Any(t => t.IsChildContentTagHelper()))
+                {
+                    // Ignore, this will be handled when we rewrite the parent.
+                }
+                else
+                {
+                    reference.Replace(RewriteAsElement(node));
+                }
+            }
+        }
+
+        private ComponentExtensionNode RewriteAsComponent(TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        {
+            var component = new ComponentExtensionNode()
+            {
+                Component = tagHelper,
+                Source = node.Source,
+                TagName = node.TagName,
+                TypeName = tagHelper.GetTypeName(),
+            };
+
+            for (var i = 0; i < node.Diagnostics.Count; i++)
+            {
+                component.Diagnostics.Add(node.Diagnostics[i]);
+            }
+
+            var visitor = new ComponentRewriteVisitor(component);
+            visitor.Visit(node);
+
+            // Fixup the parameter names of child content elements. We can't do this during the rewrite
+            // because we see the nodes in the wrong order.
+            foreach (var childContent in component.ChildContents)
+            {
+                childContent.ParameterName = childContent.ParameterName ?? component.ChildContentParameterName ?? BlazorMetadata.ChildContent.DefaultParameterName;
+            }
+
+            return component;
+        }
+
+        private HtmlElementIntermediateNode RewriteAsElement(TagHelperIntermediateNode node)
+        {
+            var result = new HtmlElementIntermediateNode()
+            {
+                Source = node.Source,
+                TagName = node.TagName,
+            };
+
+            for (var i = 0; i < node.Diagnostics.Count; i++)
+            {
+                result.Diagnostics.Add(node.Diagnostics[i]);
+            }
+
+            var visitor = new ElementRewriteVisitor(result.Children);
+            visitor.Visit(node);
+
+            return result;
+        }
+
+        private class ComponentRewriteVisitor : IntermediateNodeWalker
+        {
+            private readonly ComponentExtensionNode _component;
+            private readonly IntermediateNodeCollection _children;
+
+            public ComponentRewriteVisitor(ComponentExtensionNode component)
+            {
+                _component = component;
+                _children = component.Children;
+            }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                // Visit children, we're replacing this node.
+                base.VisitDefault(node);
+            }
+
+            public override void VisitTagHelperBody(TagHelperBodyIntermediateNode node)
+            {
+                // Wrap the component's children in a ChildContent node if we have some significant
+                // content.
+                if (node.Children.Count == 0)
+                {
+                    return;
+                }
+
+                // If we get a single HTML content node containing only whitespace,
+                // then this is probably a tag that looks like '<MyComponent>  </MyComponent>
+                //
+                // We don't want to create a child content for this case, because it can conflict
+                // with a child content that's set via an attribute. We don't want the formatting
+                // of insignificant whitespace to be annoying when setting attributes directly.
+                if (node.Children.Count == 1 && IsIgnorableWhitespace(node.Children[0]))
+                {
+                    return;
+                }
+
+                // From here we fork and behave differently based on whether the component's child content is
+                // implicit or explicit.
+                //
+                // Explicit child content will look like: <MyComponent><ChildContent><div>...</div></ChildContent></MyComponent>
+                // compared with implicit: <MyComponent><div></div></MyComponent>
+                //
+                // Using implicit child content:
+                // 1. All content is grouped into a single child content lambda, and assigned to the property 'ChildContent'
+                //
+                // Using explicit child content:
+                // 1. All content must be contained within 'child content' elements that are direct children
+                // 2. Whitespace outside of 'child content' elements will be ignored (not an error)
+                // 3. Non-whitespace outside of 'child content' elements will cause an error
+                // 4. All 'child content' elements must match parameters on the component (exception for ChildContent,
+                //    which is always allowed.
+                // 5. Each 'child content' element will generate its own lambda, and be assigned to the property
+                //    that matches the element name.
+                if (!node.Children.OfType<TagHelperIntermediateNode>().Any(t => t.TagHelpers.Any(th => th.IsChildContentTagHelper())))
+                {
+                    // This node has implicit child content. It may or may not have an attribute that matches.
+                    var attribute = _component.Component.BoundAttributes
+                        .Where(a => string.Equals(a.Name, ComponentsApi.RenderTreeBuilder.ChildContent, StringComparison.Ordinal))
+                        .FirstOrDefault();
+                    _children.Add(RewriteChildContent(attribute, node.Source, node.Children));
+                    return;
+                }
+
+                // OK this node has explicit child content, we can rewrite it by visiting each node
+                // in sequence, since we:
+                // a) need to rewrite each child content element
+                // b) any significant content outside of a child content is an error
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    var child = node.Children[i];
+                    if (IsIgnorableWhitespace(child))
+                    {
+                        continue;
+                    }
+
+                    if (child is TagHelperIntermediateNode tagHelperNode &&
+                        tagHelperNode.TagHelpers.Any(th => th.IsChildContentTagHelper()))
+                    {
+                        // This is a child content element
+                        var attribute = _component.Component.BoundAttributes
+                            .Where(a => string.Equals(a.Name, tagHelperNode.TagName, StringComparison.Ordinal))
+                            .FirstOrDefault();
+                        _children.Add(RewriteChildContent(attribute, child.Source, child.Children));
+                        continue;
+                    }
+                    
+                    // If we get here then this is significant content inside a component with explicit child content.
+                    child.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentMixedWithExplicitChildContent(child.Source, _component));
+                    _children.Add(child);
+                }
+
+                bool IsIgnorableWhitespace(IntermediateNode n)
+                {
+                    if (n is HtmlContentIntermediateNode html &&
+                        html.Children.Count == 1 &&
+                        html.Children[0] is IntermediateToken token &&
+                        string.IsNullOrWhiteSpace(token.Content))
+                    {
+                        return true;
+                    }
+
+                    return false;
+                }
+            }
+
+            private ComponentChildContentIntermediateNode RewriteChildContent(BoundAttributeDescriptor attribute, SourceSpan? source, IntermediateNodeCollection children)
+            {
+                var childContent = new ComponentChildContentIntermediateNode()
+                {
+                    BoundAttribute = attribute,
+                    Source = source,
+                    TypeName = attribute?.TypeName ?? ComponentsApi.RenderFragment.FullTypeName,
+                };
+
+                // There are two cases here:
+                // 1. Implicit child content - the children will be non-taghelper nodes, just accept them
+                // 2. Explicit child content - the children will be various tag helper nodes, that need special processing.
+                for (var i = 0; i < children.Count; i++)
+                {
+                    var child = children[i];
+                    if (child is TagHelperBodyIntermediateNode body)
+                    {
+                        // The body is all of the content we want to render, the rest of the children will
+                        // be the attributes.
+                        for (var j = 0; j < body.Children.Count; j++)
+                        {
+                            childContent.Children.Add(body.Children[j]);
+                        }
+                    }
+                    else if (child is TagHelperPropertyIntermediateNode property)
+                    {
+                        if (property.BoundAttribute.IsChildContentParameterNameProperty())
+                        {
+                            // Check for each child content with a parameter name, that the parameter name is specified
+                            // with literal text. For instance, the following is not allowed and should generate a diagnostic.
+                            //
+                            // <MyComponent><ChildContent Context="@Foo()">...</ChildContent></MyComponent>
+                            if (TryGetAttributeStringContent(property, out var parameterName))
+                            {
+                                childContent.ParameterName = parameterName;
+                                continue;
+                            }
+
+                            // The parameter name is invalid.
+                            childContent.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidParameter(property.Source, property.AttributeName, attribute.Name));
+                            continue;
+                        }
+
+                        // This is an unrecognized attribute, this is possible if you try to do something like put 'ref' on a child content.
+                        childContent.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidAttribute(property.Source, property.AttributeName, attribute.Name));
+                    }
+                    else if (child is TagHelperHtmlAttributeIntermediateNode a)
+                    {
+                        // This is an HTML attribute on a child content.
+                        childContent.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidAttribute(a.Source, a.AttributeName, attribute.Name));
+                    }
+                    else
+                    {
+                        // This is some other kind of node (likely an implicit child content)
+                        childContent.Children.Add(child);
+                    }
+                }
+
+                return childContent;
+            }
+
+            private bool TryGetAttributeStringContent(TagHelperPropertyIntermediateNode property, out string content)
+            {
+                // The success path looks like - a single HTML Attribute Value node with tokens
+                if (property.Children.Count == 1 &&
+                    property.Children[0] is HtmlContentIntermediateNode html)
+                {
+                    content = string.Join(string.Empty, html.Children.OfType<IntermediateToken>().Select(n => n.Content));
+                    return true;
+                }
+
+                content = null;
+                return false;
+            }
+
+            public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node)
+            {
+                var attribute = new ComponentAttributeExtensionNode(node);
+                _children.Add(attribute);
+
+                // Since we don't support complex content, we can rewrite the inside of this
+                // node to the rather simpler form that property nodes usually have.
+                for (var i = 0; i < attribute.Children.Count; i++)
+                {
+                    if (attribute.Children[i] is HtmlAttributeValueIntermediateNode htmlValue)
+                    {
+                        attribute.Children[i] = new HtmlContentIntermediateNode()
+                        {
+                            Children =
+                            {
+                                htmlValue.Children.Single(),
+                            },
+                            Source = htmlValue.Source,
+                        };
+                    }
+                    else if (attribute.Children[i] is CSharpExpressionAttributeValueIntermediateNode expressionValue)
+                    {
+                        attribute.Children[i] = new CSharpExpressionIntermediateNode()
+                        {
+                            Children =
+                            {
+                                expressionValue.Children.Single(),
+                            },
+                            Source = expressionValue.Source,
+                        };
+                    }
+                    else if (attribute.Children[i] is CSharpCodeAttributeValueIntermediateNode codeValue)
+                    {
+                        attribute.Children[i] = new CSharpExpressionIntermediateNode()
+                        {
+                            Children =
+                            {
+                                codeValue.Children.Single(),
+                            },
+                            Source = codeValue.Source,
+                        };
+                    }
+                }
+            }
+
+            public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+            {
+                // Each 'tag helper property' belongs to a specific tag helper. We want to handle
+                // the cases for components, but leave others alone. This allows our other passes
+                // to handle those cases.
+                if (!node.TagHelper.IsComponentTagHelper())
+                {
+                    _children.Add(node);
+                    return;
+                }
+
+                // Another special case here - this might be a type argument. These don't represent 'real' parameters
+                // that get passed to the component, it needs special code generation support.
+                if (node.TagHelper.IsGenericTypedComponent() && node.BoundAttribute.IsTypeParameterProperty())
+                {
+                    _children.Add(new ComponentTypeArgumentExtensionNode(node));
+                    return;
+                }
+
+                // Another special case here -- this might be a 'Context' parameter, which specifies the name
+                // for lambda parameter for parameterized child content
+                if (node.BoundAttribute.IsChildContentParameterNameProperty())
+                {
+                    // Check for each child content with a parameter name, that the parameter name is specified
+                    // with literal text. For instance, the following is not allowed and should generate a diagnostic.
+                    //
+                    // <MyComponent Context="@Foo()">...</MyComponent>
+                    if (TryGetAttributeStringContent(node, out var parameterName))
+                    {
+                        _component.ChildContentParameterName = parameterName;
+                        return;
+                    }
+
+                    // The parameter name is invalid.
+                    _component.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidParameterOnComponent(node.Source, node.AttributeName, _component.TagName));
+                    return;
+                }
+
+                _children.Add(new ComponentAttributeExtensionNode(node));
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                _children.Add(node);
+            }
+        }
+
+        private class ElementRewriteVisitor : IntermediateNodeWalker
+        {
+            private readonly IntermediateNodeCollection _children;
+
+            public ElementRewriteVisitor(IntermediateNodeCollection children)
+            {
+                _children = children;
+            }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                // Visit children, we're replacing this node.
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    Visit(node.Children[i]);
+                }
+            }
+
+            public override void VisitTagHelperBody(TagHelperBodyIntermediateNode node)
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    _children.Add(node.Children[i]);
+                }
+            }
+
+            public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node)
+            {
+                var attribute = new HtmlAttributeIntermediateNode()
+                {
+                    AttributeName = node.AttributeName,
+                    Source = node.Source,
+                };
+                _children.Add(attribute);
+
+                for (var i = 0; i < node.Diagnostics.Count; i++)
+                {
+                    attribute.Diagnostics.Add(node.Diagnostics[i]);
+                }
+
+                switch (node.AttributeStructure)
+                {
+                    case AttributeStructure.Minimized:
+
+                        attribute.Prefix = node.AttributeName;
+                        attribute.Suffix = string.Empty;
+                        break;
+
+                    case AttributeStructure.NoQuotes:
+                    case AttributeStructure.SingleQuotes:
+                    case AttributeStructure.DoubleQuotes:
+
+                        // We're ignoring attribute structure here for simplicity, it doesn't effect us.
+                        attribute.Prefix = node.AttributeName + "=\"";
+                        attribute.Suffix = "\"";
+
+                        for (var i = 0; i < node.Children.Count; i++)
+                        {
+                            attribute.Children.Add(RewriteAttributeContent(node.Children[i]));
+                        }
+
+                        break;
+                }
+
+                IntermediateNode RewriteAttributeContent(IntermediateNode content)
+                {
+                    if (content is HtmlContentIntermediateNode html)
+                    {
+                        var value = new HtmlAttributeValueIntermediateNode()
+                        {
+                            Source = content.Source,
+                        };
+
+                        for (var i = 0; i < html.Children.Count; i++)
+                        {
+                            value.Children.Add(html.Children[i]);
+                        }
+
+                        for (var i = 0; i < html.Diagnostics.Count; i++)
+                        {
+                            value.Diagnostics.Add(html.Diagnostics[i]);
+                        }
+
+                        return value;
+                    }
+
+
+                    return content;
+                }
+            }
+
+            public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+            {
+                // Each 'tag helper property' belongs to a specific tag helper. We want to handle
+                // the cases for components, but leave others alone. This allows our other passes
+                // to handle those cases.
+                _children.Add(node.TagHelper.IsComponentTagHelper() ? (IntermediateNode)new ComponentAttributeExtensionNode(node) : node);
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                _children.Add(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs
new file mode 100644
index 0000000000..cbefe42a7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs
@@ -0,0 +1,69 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentTypeArgumentExtensionNode : ExtensionIntermediateNode
+    {
+        public ComponentTypeArgumentExtensionNode(TagHelperPropertyIntermediateNode propertyNode)
+        {
+            if (propertyNode == null)
+            {
+                throw new ArgumentNullException(nameof(propertyNode));
+            }
+
+            BoundAttribute = propertyNode.BoundAttribute;
+            Source = propertyNode.Source;
+            TagHelper = propertyNode.TagHelper;
+
+            for (var i = 0; i < propertyNode.Children.Count; i++)
+            {
+                Children.Add(propertyNode.Children[i]);
+            }
+
+            for (var i = 0; i < propertyNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(propertyNode.Diagnostics[i]);
+            }
+        }
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public string TypeParameterName => BoundAttribute.Name;
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ComponentTypeArgumentExtensionNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteComponentTypeArgument(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs
new file mode 100644
index 0000000000..8411198cb9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    /// <summary>
+    /// Represents a type-inference thunk that is used by the generated component code.
+    /// </summary>
+    internal class ComponentTypeInferenceMethodIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+        
+        /// <summary>
+        /// Gets the component usage linked to this type inference method.
+        /// </summary>
+        public ComponentExtensionNode Component { get; set; }
+        
+        /// <summary>
+        /// Gets the full type name of the generated class containing this method.
+        /// </summary>
+        public string FullTypeName { get; internal set; }
+
+        /// <summary>
+        /// Gets the name of the generated method.
+        /// </summary>
+        public string MethodName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ComponentTypeInferenceMethodIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteComponentTypeInferenceMethod(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
new file mode 100644
index 0000000000..8d3133b03c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -0,0 +1,133 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Constants for method names used in code-generation
+    // Keep these in sync with the actual definitions
+    internal static class ComponentsApi
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Components";
+
+        public static class ComponentBase
+        {
+            public static readonly string Namespace = "Microsoft.AspNetCore.Components";
+            public static readonly string FullTypeName = Namespace + ".ComponentBase";
+            public static readonly string MetadataName = FullTypeName;
+
+            public static readonly string BuildRenderTree = nameof(BuildRenderTree);
+        }
+
+        public static class ParameterAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ParameterAttribute";
+            public static readonly string MetadataName = FullTypeName;
+        }
+
+        public static class LayoutAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Layouts.LayoutAttribute";
+        }
+
+        public static class InjectAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.InjectAttribute";
+        }
+
+        public static class IComponent
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.IComponent";
+
+            public static readonly string MetadataName = FullTypeName;
+        }
+
+        public static class IDictionary
+        {
+            public static readonly string MetadataName = "System.Collection.IDictionary`2";
+        }
+
+        public static class RenderFragment
+        {
+            public static readonly string Namespace = "Microsoft.AspNetCore.Components";
+            public static readonly string FullTypeName = Namespace + ".RenderFragment";
+            public static readonly string MetadataName = FullTypeName;
+        }
+
+        public static class RenderFragmentOfT
+        {
+            public static readonly string Namespace = "Microsoft.AspNetCore.Components";
+            public static readonly string FullTypeName = Namespace + ".RenderFragment<>";
+            public static readonly string MetadataName = Namespace + ".RenderFragment`1";
+        }
+
+        public static class RenderTreeBuilder
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder";
+
+            public static readonly string OpenElement = nameof(OpenElement);
+
+            public static readonly string CloseElement = nameof(CloseElement);
+
+            public static readonly string OpenComponent = nameof(OpenComponent);
+
+            public static readonly string CloseComponent = nameof(CloseComponent);
+
+            public static readonly string AddMarkupContent = nameof(AddMarkupContent);
+
+            public static readonly string AddContent = nameof(AddContent);
+
+            public static readonly string AddAttribute = nameof(AddAttribute);
+
+            public static readonly string AddElementReferenceCapture = nameof(AddElementReferenceCapture);
+
+            public static readonly string AddComponentReferenceCapture = nameof(AddComponentReferenceCapture);
+
+            public static readonly string Clear = nameof(Clear);
+
+            public static readonly string GetFrames = nameof(GetFrames);
+
+            public static readonly string ChildContent = nameof(ChildContent);
+        }
+
+        public static class RuntimeHelpers
+        {
+            public static readonly string TypeCheck = "Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck";
+        }
+
+        public static class RouteAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.RouteAttribute";
+        }
+
+        public static class BindElementAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindElementAttribute";
+        }
+
+        public static class BindInputElementAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindInputElementAttribute";
+        }
+
+        public static class BindMethods
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindMethods";
+
+            public static readonly string GetValue = "Microsoft.AspNetCore.Components.BindMethods.GetValue";
+
+            public static readonly string GetEventHandlerValue = "Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue";
+
+            public static readonly string SetValueHandler = "Microsoft.AspNetCore.Components.BindMethods.SetValueHandler";
+        }
+
+        public static class EventHandlerAttribute
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.EventHandlerAttribute";
+        }
+
+        public static class ElementRef
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ElementRef";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
new file mode 100644
index 0000000000..49c05935e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
@@ -0,0 +1,209 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class EventHandlerLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        public override int Order => 50;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            // For each event handler *usage* we need to rewrite the tag helper node to map to basic constructs.
+            // Each usage will be represented by a tag helper property that is a descendant of either
+            // a component or element.
+            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+
+            var parents = new HashSet<IntermediateNode>();
+            for (var i = 0; i < references.Count; i++)
+            {
+                parents.Add(references[i].Parent);
+            }
+
+            foreach (var parent in parents)
+            {
+                ProcessDuplicates(parent);
+            }
+
+            for (var i = 0; i < references.Count; i++)
+            {
+                var reference = references[i];
+                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+
+                if (!reference.Parent.Children.Contains(node))
+                {
+                    // This node was removed as a duplicate, skip it.
+                    continue;
+                }
+
+                if (node.TagHelper.IsEventHandlerTagHelper())
+                {
+                    reference.Replace(RewriteUsage(reference.Parent, node));
+                }
+            }
+        }
+
+        private void ProcessDuplicates(IntermediateNode parent)
+        {
+            // Reverse order because we will remove nodes.
+            //
+            // Each 'property' node could be duplicated if there are multiple tag helpers that match that
+            // particular attribute. This is likely to happen when a component also defines something like
+            // OnClick. We want to remove the 'onclick' and let it fall back to be handled by the component.
+            for (var i = parent.Children.Count - 1; i >= 0; i--)
+            {
+                var eventHandler = parent.Children[i] as TagHelperPropertyIntermediateNode;
+                if (eventHandler != null &&
+                    eventHandler.TagHelper != null &&
+                    eventHandler.TagHelper.IsEventHandlerTagHelper())
+                {
+                    for (var j = 0; j < parent.Children.Count; j++)
+                    {
+                        var componentAttribute = parent.Children[j] as ComponentAttributeExtensionNode;
+                        if (componentAttribute != null &&
+                            componentAttribute.TagHelper != null &&
+                            componentAttribute.TagHelper.IsComponentTagHelper() &&
+                            componentAttribute.AttributeName == eventHandler.AttributeName)
+                        {
+                            // Found a duplicate - remove the 'fallback' in favor of the component's own handling.
+                            parent.Children.RemoveAt(i);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // If we still have duplicates at this point then they are genuine conflicts.
+            var duplicates = parent.Children
+                .OfType<TagHelperPropertyIntermediateNode>()
+                .Where(p => p.TagHelper?.IsEventHandlerTagHelper() ?? false)
+                .GroupBy(p => p.AttributeName)
+                .Where(g => g.Count() > 1);
+
+            foreach (var duplicate in duplicates)
+            {
+                parent.Diagnostics.Add(ComponentDiagnosticFactory.CreateEventHandler_Duplicates(
+                    parent.Source,
+                    duplicate.Key,
+                    duplicate.ToArray()));
+                foreach (var property in duplicate)
+                {
+                    parent.Children.Remove(property);
+                }
+            }
+        }
+
+        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        {
+            var original = GetAttributeContent(node);
+            if (original.Count == 0)
+            {
+                // This can happen in error cases, the parser will already have flagged this
+                // as an error, so ignore it.
+                return node;
+            }
+
+            // Now rewrite the content of the value node to look like:
+            //
+            // BindMethods.GetEventHandlerValue<TDelegate>(<code>)
+            //
+            // This method is overloaded on string and TDelegate, which means that it will put the code in the
+            // correct context for intellisense when typing in the attribute.
+            var eventArgsType = node.TagHelper.GetEventArgsType();
+            var tokens = new List<IntermediateToken>()
+            {
+                new IntermediateToken()
+                {
+                    Content = $"{ComponentsApi.BindMethods.GetEventHandlerValue}<{eventArgsType}>(",
+                    Kind = TokenKind.CSharp
+                },
+                new IntermediateToken()
+                {
+                    Content = $")",
+                    Kind = TokenKind.CSharp
+                }
+            };
+
+            for (var i = 0; i < original.Count; i++)
+            {
+                tokens.Insert(i + 1, original[i]);
+            }
+
+            if (parent is HtmlElementIntermediateNode)
+            {
+                var result = new HtmlAttributeIntermediateNode()
+                {
+                    AttributeName = node.AttributeName,
+                    Source = node.Source,
+
+                    Prefix = node.AttributeName + "=\"",
+                    Suffix = "\"",
+                };
+
+                for (var i = 0; i < node.Diagnostics.Count; i++)
+                {
+                    result.Diagnostics.Add(node.Diagnostics[i]);
+                }
+
+                result.Children.Add(new CSharpExpressionAttributeValueIntermediateNode());
+                for (var i = 0; i < tokens.Count; i++)
+                {
+                    result.Children[0].Children.Add(tokens[i]);
+                }
+
+                return result;
+            }
+            else
+            {
+                var result = new ComponentAttributeExtensionNode(node);
+
+                result.Children.Clear();
+                result.Children.Add(new CSharpExpressionIntermediateNode());
+                for (var i = 0; i < tokens.Count; i++)
+                {
+                    result.Children[0].Children.Add(tokens[i]);
+                }
+
+                return result;
+            }
+        }
+
+        private static IReadOnlyList<IntermediateToken> GetAttributeContent(TagHelperPropertyIntermediateNode node)
+        {
+            var template = node.FindDescendantNodes<TemplateIntermediateNode>().FirstOrDefault();
+            if (template != null)
+            {
+                // See comments in TemplateDiagnosticPass
+                node.Diagnostics.Add(ComponentDiagnosticFactory.Create_TemplateInvalidLocation(template.Source));
+                return new[] { new IntermediateToken() { Kind = TokenKind.CSharp, Content = string.Empty, }, };
+            }
+
+            if (node.Children.Count == 1 && node.Children[0] is HtmlContentIntermediateNode htmlContentNode)
+            {
+                // This case can be hit for a 'string' attribute. We want to turn it into
+                // an expression.
+                var tokens = htmlContentNode.FindDescendantNodes<IntermediateToken>();
+
+                var content = "\"" + string.Join(string.Empty, tokens.Select(t => t.Content.Replace("\"", "\\\""))) + "\"";
+                return new[] { new IntermediateToken() { Content = content, Kind = TokenKind.CSharp, } };
+            }
+            else
+            {
+                return node.FindDescendantNodes<IntermediateToken>();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
new file mode 100644
index 0000000000..eebe7db984
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
@@ -0,0 +1,314 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // This pass:
+    // 1. Adds diagnostics for missing generic type arguments
+    // 2. Rewrites the type name of the component to substitute generic type arguments
+    // 3. Rewrites the type names of parameters/child content to substitute generic type arguments
+    internal class GenericComponentPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private TypeNameFeature _typeNameFeature;
+
+        // Runs after components/eventhandlers/ref/bind/templates. We want to validate every component
+        // and it's usage of ChildContent.
+        public override int Order => 160;
+
+        protected override void OnInitialized()
+        {
+            _typeNameFeature = GetRequiredFeature<TypeNameFeature>();
+        }
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor(_typeNameFeature);
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<ComponentExtensionNode>
+        {
+            private readonly TypeNameFeature _typeNameFeature;
+
+            // Incrementing ID for type inference method names
+            private int _id;
+
+            public Visitor(TypeNameFeature typeNameFeature)
+            {
+                _typeNameFeature = typeNameFeature;
+            }
+
+            public void VisitExtension(ComponentExtensionNode node)
+            {
+                if (node.Component.IsGenericTypedComponent())
+                {
+                    // Not generic, ignore.
+                    Process(node);
+                }
+
+                base.VisitDefault(node);
+            }
+
+            private void Process(ComponentExtensionNode node)
+            {
+                // First collect all of the information we have about each type parameter
+                //
+                // Listing all type parameters that exist
+                var bindings = new Dictionary<string, Binding>();
+                foreach (var attribute in node.Component.GetTypeParameters())
+                {
+                    bindings.Add(attribute.Name, new Binding() { Attribute = attribute, });
+                }
+
+                // Listing all type arguments that have been specified.
+                var hasTypeArgumentSpecified = false;
+                foreach (var typeArgumentNode in node.TypeArguments)
+                {
+                    hasTypeArgumentSpecified = true;
+
+                    var binding = bindings[typeArgumentNode.TypeParameterName];
+                    binding.Node = typeArgumentNode;
+                    binding.Content = GetContent(typeArgumentNode);
+                }
+
+                if (hasTypeArgumentSpecified)
+                {
+                    // OK this means that the developer has specified at least one type parameter.
+                    // Either they specified everything and its OK to rewrite, or its an error.
+                    if (ValidateTypeArguments(node, bindings))
+                    {
+                        var mappings = bindings.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Content);
+                        RewriteTypeNames(_typeNameFeature.CreateGenericTypeRewriter(mappings), node);
+                    }
+
+                    return;
+                }
+
+                // OK if we get here that means that no type arguments were specified, so we will try to infer
+                // the type.
+                //
+                // The actual inference is done by the C# compiler, we just emit an a method that represents the
+                // use of this component.
+
+                // Since we're generating code in a different namespace, we need to 'global qualify' all of the types
+                // to avoid clashes with our generated code.
+                RewriteTypeNames(_typeNameFeature.CreateGlobalQualifiedTypeNameRewriter(bindings.Keys), node);
+
+                //
+                // We need to verify that an argument was provided that 'covers' each type parameter.
+                //
+                // For example, consider a repeater where the generic type is the 'item' type, but the developer has
+                // not set the items. We won't be able to do type inference on this and so it will just be nonsense.
+                var attributes = node.Attributes.Select(a => a.BoundAttribute).Concat(node.ChildContents.Select(c => c.BoundAttribute));
+                foreach (var attribute in attributes)
+                {
+                    if (attribute == null)
+                    {
+                        // Will be null for attributes set on the component that don't match a declared component parameter
+                        continue;
+                    }
+
+                    // Now we need to parse the type name and extract the generic parameters.
+                    //
+                    // Two cases;
+                    // 1. name is a simple identifier like TItem
+                    // 2. name contains type parameters like Dictionary<string, TItem>
+                    if (!attribute.IsGenericTypedProperty())
+                    {
+                        continue;
+                    }
+
+                    var typeParameters = _typeNameFeature.ParseTypeParameters(attribute.TypeName);
+                    if (typeParameters.Count == 0)
+                    {
+                        bindings.Remove(attribute.TypeName);
+                    }
+                    else
+                    {
+                        for (var i = 0; i < typeParameters.Count; i++)
+                        {
+                            var typeParameter = typeParameters[i];
+                            bindings.Remove(typeParameter.ToString());
+                        }
+                    }
+                }
+
+                // If any bindings remain then this means we would never be able to infer the arguments of this
+                // component usage because the user hasn't set properties that include all of the types.
+                if (bindings.Count > 0)
+                {
+                    // However we still want to generate 'type inference' code because we want the errors to be as
+                    // helpful as possible. So let's substitute 'object' for all of those type parameters, and add
+                    // an error.
+                    var mappings = bindings.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Content);
+                    RewriteTypeNames(_typeNameFeature.CreateGenericTypeRewriter(mappings), node);
+
+                    node.Diagnostics.Add(ComponentDiagnosticFactory.Create_GenericComponentTypeInferenceUnderspecified(node.Source, node, node.Component.GetTypeParameters()));
+                }
+
+                // Next we need to generate a type inference 'method' node. This represents a method that we will codegen that
+                // contains all of the operations on the render tree building. Calling a method to operate on the builder
+                // will allow the C# compiler to perform type inference.
+                var documentNode = (DocumentIntermediateNode)Ancestors[Ancestors.Count - 1];
+                CreateTypeInferenceMethod(documentNode, node);
+            }
+
+            private string GetContent(ComponentTypeArgumentExtensionNode node)
+            {
+                return string.Join(string.Empty, node.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).Select(t => t.Content));
+            }
+
+            private static bool ValidateTypeArguments(ComponentExtensionNode node, Dictionary<string, Binding> bindings)
+            {
+                var missing = new List<BoundAttributeDescriptor>();
+                foreach (var binding in bindings)
+                {
+                    if (binding.Value.Node == null || string.IsNullOrWhiteSpace(binding.Value.Content))
+                    {
+                        missing.Add(binding.Value.Attribute);
+                    }
+                }
+
+                if (missing.Count > 0)
+                {
+                    // We add our own error for this because its likely the user will see other errors due
+                    // to incorrect codegen without the types. Our errors message will pretty clearly indicate
+                    // what to do, whereas the other errors might be confusing.
+                    node.Diagnostics.Add(ComponentDiagnosticFactory.Create_GenericComponentMissingTypeArgument(node.Source, node, missing));
+                    return false;
+                }
+
+                return true;
+            }
+
+            private void RewriteTypeNames(TypeNameRewriter rewriter, ComponentExtensionNode node)
+            {
+                // Rewrite the component type name
+                node.TypeName = rewriter.Rewrite(node.TypeName);
+
+                foreach (var attribute in node.Attributes)
+                {
+                    if (attribute.BoundAttribute?.IsGenericTypedProperty() ?? false && attribute.TypeName != null)
+                    {
+                        // If we know the type name, then replace any generic type parameter inside it with
+                        // the known types.
+                        attribute.TypeName = rewriter.Rewrite(attribute.TypeName);
+                    }
+                    else if (attribute.TypeName == null && (attribute.BoundAttribute?.IsDelegateProperty() ?? false))
+                    {
+                        // This is a weakly typed delegate, treat it as Action<object>
+                        attribute.TypeName = "System.Action<System.Object>";
+                    }
+                    else if (attribute.TypeName == null)
+                    {
+                        // This is a weakly typed attribute, treat it as System.Object
+                        attribute.TypeName = "System.Object";
+                    }
+                }
+
+                foreach (var capture in node.Captures)
+                {
+                    if (capture.IsComponentCapture && capture.ComponentCaptureTypeName != null)
+                    {
+                        capture.ComponentCaptureTypeName = rewriter.Rewrite(capture.ComponentCaptureTypeName);
+                    }
+                    else if (capture.IsComponentCapture)
+                    {
+                        capture.ComponentCaptureTypeName = "System.Object";
+                    }
+                }
+
+                foreach (var childContent in node.ChildContents)
+                {
+                    if (childContent.BoundAttribute?.IsGenericTypedProperty() ?? false && childContent.TypeName != null)
+                    {
+                        // If we know the type name, then replace any generic type parameter inside it with
+                        // the known types.
+                        childContent.TypeName = rewriter.Rewrite(childContent.TypeName);
+                    }
+                    else if (childContent.IsParameterized)
+                    {
+                        // This is a weakly typed parameterized child content, treat it as RenderFragment<object>
+                        childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + "<System.Object>";
+                    }
+                    else
+                    {
+                        // This is a weakly typed child content, treat it as RenderFragment
+                        childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName;
+                    }
+                }
+            }
+
+            private void CreateTypeInferenceMethod(DocumentIntermediateNode documentNode, ComponentExtensionNode node)
+            {
+                var @namespace = documentNode.FindPrimaryNamespace().Content;
+                @namespace = string.IsNullOrEmpty(@namespace) ? "__Blazor" : "__Blazor." + @namespace;
+                @namespace += "." + documentNode.FindPrimaryClass().ClassName;
+
+                var typeInferenceNode = new ComponentTypeInferenceMethodIntermediateNode()
+                {
+                    Component = node,
+
+                    // Method name is generated and guaranteed not to collide, since it's unique for each
+                    // component call site.
+                    MethodName = $"Create{node.TagName}_{_id++}",
+                    FullTypeName = @namespace + ".TypeInference",
+                };
+
+                node.TypeInferenceNode = typeInferenceNode;
+
+                // Now we need to insert the type inference node into the tree.
+                var namespaceNode = documentNode.Children
+                    .OfType<NamespaceDeclarationIntermediateNode>()
+                    .Where(n => n.Annotations.Contains(new KeyValuePair<object, object>(BlazorMetadata.Component.GenericTypedKey, bool.TrueString)))
+                    .FirstOrDefault();
+                if (namespaceNode == null)
+                {
+                    namespaceNode = new NamespaceDeclarationIntermediateNode()
+                    {
+                        Annotations =
+                        {
+                            { BlazorMetadata.Component.GenericTypedKey, bool.TrueString },
+                        },
+                        Content = @namespace,
+                    };
+
+                    documentNode.Children.Add(namespaceNode);
+                }
+
+                var classNode = namespaceNode.Children
+                    .OfType<ClassDeclarationIntermediateNode>()
+                    .Where(n => n.ClassName == "TypeInference")
+                    .FirstOrDefault();
+                if (classNode == null)
+                {
+                    classNode = new ClassDeclarationIntermediateNode()
+                    {
+                        ClassName = "TypeInference",
+                        Modifiers =
+                        {
+                            "internal",
+                            "static",
+                        },
+                    };
+                    namespaceNode.Children.Add(classNode);
+                }
+
+                classNode.Children.Add(typeInferenceNode);
+            }
+        }
+
+        private class Binding
+        {
+            public BoundAttributeDescriptor Attribute { get; set; }
+
+            public string Content { get; set; }
+
+            public ComponentTypeArgumentExtensionNode Node { get; set; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs
new file mode 100644
index 0000000000..756474f366
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    internal class HtmlBlockIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string Content { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<HtmlBlockIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteHtmlBlock(context, this);
+        }
+
+        private string DebuggerDisplay => Content;
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
new file mode 100644
index 0000000000..3106bbbaaf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
@@ -0,0 +1,331 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Rewrites contiguous subtrees of HTML into a special node type to reduce the
+    // size of the Render tree.
+    //
+    // Does not preserve insignificant details of the HTML, like tag closing style
+    // or quote style.
+    internal class HtmlBlockPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Runs LATE because we want to destroy structure.
+        public override int Order => 10000;
+
+        protected override void ExecuteCore(
+            RazorCodeDocument codeDocument,
+            DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.Options.DesignTime)
+            {
+                // Nothing to do during design time.
+                return;
+            }
+
+            var findVisitor = new FindHtmlTreeVisitor();
+            findVisitor.Visit(documentNode);
+
+            var trees = findVisitor.Trees;
+            var rewriteVisitor = new RewriteVisitor(trees);
+            while (trees.Count > 0)
+            {
+                // Walk backwards since we did a postorder traversal.
+                var reference = trees[trees.Count - 1];
+
+                // Forcibly remove a node to prevent infinite loops.
+                trees.RemoveAt(trees.Count - 1);
+
+                // We want to fold together siblings where possible. To do this, first we find
+                // the index of the node we're looking at now - then we need to walk backwards
+                // and identify a set of contiguous nodes we can merge.
+                var start = reference.Parent.Children.Count - 1;
+                for (; start >= 0; start--)
+                {
+                    if (ReferenceEquals(reference.Node, reference.Parent.Children[start]))
+                    {
+                        break;
+                    }
+                }
+
+                // This is the current node. Check if the left sibling is always a candidate
+                // for rewriting. Due to the order we processed the nodes, we know that the
+                // left sibling is next in the list to process if it's a candidate.
+                var end = start;
+                while (start - 1 >= 0)
+                {
+                    var candidate = reference.Parent.Children[start - 1];
+                    if (trees.Count == 0 || !ReferenceEquals(trees[trees.Count - 1].Node, candidate))
+                    {
+                        // This means the we're out of nodes, or the left sibling is not in the list.
+                        break;
+                    }
+
+                    // This means that the left sibling is valid to merge.
+                    start--;
+
+                    // Remove this since we're combining it.
+                    trees.RemoveAt(trees.Count - 1);
+                }
+
+                // As a degenerate case, don't bother rewriting an single HtmlContent node
+                // It doesn't add any value.
+                if (end - start == 0 && reference.Node is HtmlContentIntermediateNode)
+                {
+                    continue;
+                }
+
+                // Now we know the range of nodes to rewrite (end is inclusive)
+                var length = end + 1 - start;
+                while (length > 0)
+                {
+                    // Keep using start since we're removing nodes.
+                    var node = reference.Parent.Children[start];
+                    reference.Parent.Children.RemoveAt(start);
+
+                    rewriteVisitor.Visit(node);
+
+                    length--;
+                }
+
+                reference.Parent.Children.Insert(start, new HtmlBlockIntermediateNode()
+                {
+                    Content = rewriteVisitor.Builder.ToString(),
+                });
+
+                rewriteVisitor.Builder.Clear();
+            }
+        }
+
+        // Finds HTML-blocks using a postorder traversal. We store nodes in an
+        // ordered list so we can avoid redundant rewrites.
+        //
+        // Consider a case like:
+        //  <div>
+        //    <a href="...">click me</a>
+        //  </div>
+        //
+        // We would store both the div and a tag in a list, but make sure to visit
+        // the div first. Then when we process the div (recursively), we would remove
+        // the a from the list.
+        private class FindHtmlTreeVisitor :
+            IntermediateNodeWalker,
+            IExtensionIntermediateNodeVisitor<HtmlElementIntermediateNode>
+        {
+            private bool _foundNonHtml;
+
+            public List<IntermediateNodeReference> Trees { get; } = new List<IntermediateNodeReference>();
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                // If we get here, we found a non-HTML node. Keep traversing.
+                _foundNonHtml = true;
+                base.VisitDefault(node);
+            }
+
+            public void VisitExtension(HtmlElementIntermediateNode node)
+            {
+                // We need to restore the state after processing this node.
+                // We might have found a leaf-block of HTML, but that shouldn't
+                // affect our parent's state.
+                var originalState = _foundNonHtml;
+
+                _foundNonHtml = false;
+
+                if (node.HasDiagnostics)
+                {
+                    // Treat node with errors as non-HTML - don't let the parent rewrite this either.
+                    _foundNonHtml = true;
+                }
+
+                if (string.Equals("script", node.TagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Treat script tags as non-HTML - we trigger errors for script tags
+                    // later.
+                    _foundNonHtml = true;
+                }
+
+                base.VisitDefault(node);
+
+                if (!_foundNonHtml)
+                {
+                    Trees.Add(new IntermediateNodeReference(Parent, node));
+                }
+
+                _foundNonHtml = originalState |= _foundNonHtml;
+            }
+
+            public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node)
+            {
+                if (node.HasDiagnostics)
+                {
+                    // Treat node with errors as non-HTML
+                    _foundNonHtml = true;
+                }
+
+                // Visit Children
+                base.VisitDefault(node);
+            }
+
+            public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
+            {
+                if (node.HasDiagnostics)
+                {
+                    // Treat node with errors as non-HTML
+                    _foundNonHtml = true;
+                }
+
+                // Visit Children
+                base.VisitDefault(node);
+            }
+
+            public override void VisitHtml(HtmlContentIntermediateNode node)
+            {
+                // We need to restore the state after processing this node.
+                // We might have found a leaf-block of HTML, but that shouldn't
+                // affect our parent's state.
+                var originalState = _foundNonHtml;
+
+                _foundNonHtml = false;
+
+                if (node.HasDiagnostics)
+                {
+                    // Treat node with errors as non-HTML
+                    _foundNonHtml = true;
+                }
+                
+                // Visit Children
+                base.VisitDefault(node);
+
+                if (!_foundNonHtml)
+                {
+                    Trees.Add(new IntermediateNodeReference(Parent, node));
+                }
+
+                _foundNonHtml = originalState |= _foundNonHtml;
+            }
+
+            public override void VisitToken(IntermediateToken node)
+            {
+                if (node.HasDiagnostics)
+                {
+                    // Treat node with errors as non-HTML
+                    _foundNonHtml = true;
+                }
+
+                if (node.IsCSharp)
+                {
+                    _foundNonHtml = true;
+                }
+            }
+        }
+
+        private class RewriteVisitor :
+            IntermediateNodeWalker,
+            IExtensionIntermediateNodeVisitor<HtmlElementIntermediateNode>
+        {
+            private readonly StringBuilder _encodingBuilder;
+
+            private readonly List<IntermediateNodeReference> _trees;
+
+            public RewriteVisitor(List<IntermediateNodeReference> trees)
+            {
+                _trees = trees;
+
+                _encodingBuilder = new StringBuilder();
+            }
+
+            public StringBuilder Builder { get; } = new StringBuilder();
+
+            public void VisitExtension(HtmlElementIntermediateNode node)
+            {
+                for (var i = 0; i < _trees.Count; i++)
+                {
+                    // Remove this node if it's in the list. This ensures that we don't
+                    // do redundant operations.
+                    if (ReferenceEquals(_trees[i].Node, node))
+                    {
+                        _trees.RemoveAt(i);
+                        break;
+                    }
+                }
+
+                var isVoid = Legacy.ParserHelpers.VoidElements.Contains(node.TagName);
+                var hasBodyContent = node.Body.Any();
+
+                Builder.Append("<");
+                Builder.Append(node.TagName);
+
+                foreach (var attribute in node.Attributes)
+                {
+                    Visit(attribute);
+                }
+
+                // If for some reason a void element contains body, then treat it as a
+                // start/end tag.
+                if (!hasBodyContent && isVoid)
+                {
+                    // void
+                    Builder.Append(">");
+                    return;
+                }
+                else if (!hasBodyContent)
+                {
+                    // In HTML5, we can't have self-closing non-void elements, so explicitly
+                    // add a close tag
+                    Builder.Append("></");
+                    Builder.Append(node.TagName);
+                    Builder.Append(">");
+                    return;
+                }
+
+                // start/end tag with body.
+                Builder.Append(">");
+
+                foreach (var item in node.Body)
+                {
+                    Visit(item);
+                }
+
+                Builder.Append("</");
+                Builder.Append(node.TagName);
+                Builder.Append(">");
+            }
+
+            public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node)
+            {
+                Builder.Append(" ");
+                Builder.Append(node.AttributeName);
+
+                if (node.Children.Count == 0)
+                {
+                    // Minimized attribute
+                    return;
+                }
+
+                Builder.Append("=\"");
+
+                // Visit Children
+                base.VisitDefault(node);
+
+                Builder.Append("\"");
+            }
+
+            public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
+            {
+                Builder.Append(node.Children);
+            }
+
+            public override void VisitHtml(HtmlContentIntermediateNode node)
+            {
+                Builder.Append(node.Children);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs
new file mode 100644
index 0000000000..839547106c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs
@@ -0,0 +1,91 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    internal class HtmlElementIntermediateNode : ExtensionIntermediateNode
+    {
+        public IEnumerable<HtmlAttributeIntermediateNode> Attributes => Children.OfType<HtmlAttributeIntermediateNode>();
+
+        public IEnumerable<RefExtensionNode> Captures => Children.OfType<RefExtensionNode>();
+
+        public IEnumerable<IntermediateNode> Body => Children.Where(c =>
+        {
+            return
+                c as HtmlAttributeIntermediateNode == null &&
+                c as RefExtensionNode == null;
+        });
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string TagName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<HtmlElementIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteHtmlElement(context, this);
+        }
+
+        private string DebuggerDisplay
+        {
+            get
+            {
+                var builder = new StringBuilder();
+                builder.Append("Element: ");
+                builder.Append("<");
+                builder.Append(TagName);
+
+                foreach (var attribute in Attributes)
+                {
+                    builder.Append(" ");
+                    builder.Append(attribute.AttributeName);
+                    builder.Append("=\"...\"");
+                }
+
+                foreach (var capture in Captures)
+                {
+                    builder.Append(" ");
+                    builder.Append("ref");
+                    builder.Append("=\"...\"");
+                }
+
+                builder.Append(">");
+                builder.Append(Body.Any() ? "..." : string.Empty);
+                builder.Append("</");
+                builder.Append(TagName);
+                builder.Append(">");
+
+                return builder.ToString();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs
new file mode 100644
index 0000000000..ec450ea8a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class ImplementsDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "implements",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(ComponentResources.ImplementsDirective_TypeToken_Name, ComponentResources.ImplementsDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = ComponentResources.ImplementsDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new ImplementsDirectivePass());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs
new file mode 100644
index 0000000000..e67b22736c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs
@@ -0,0 +1,37 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ImplementsDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null)
+            {
+                return;
+            }
+
+            if (@class.Interfaces == null)
+            {
+                @class.Interfaces = new List<string>();
+            }
+
+            foreach (var implements in documentNode.FindDirectiveReferences(ImplementsDirective.Directive))
+            {
+                var token = ((DirectiveIntermediateNode)implements.Node).Tokens.FirstOrDefault();
+                if (token != null)
+                {
+                    @class.Interfaces.Add(token.Content);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs
new file mode 100644
index 0000000000..1fcead8afa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs
@@ -0,0 +1,111 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Much of the following is equivalent to Microsoft.AspNetCore.Mvc.Razor.Extensions's InjectDirective,
+    // but this one outputs properties annotated for Blazor's property injector, plus it doesn't need to
+    // support multiple CodeTargets.
+
+    internal class InjectDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "inject",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken("TypeName", "The type of the service to inject.");
+                builder.AddMemberToken("PropertyName", "The name of the property.");
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = "Inject a service from the application's service container into a property.";
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+
+        private class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            protected override void ExecuteCore(
+                RazorCodeDocument codeDocument,
+                DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+
+                var properties = new HashSet<string>(StringComparer.Ordinal);
+                var classNode = documentNode.FindPrimaryClass();
+
+                for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+                {
+                    var directive = visitor.Directives[i];
+                    var tokens = directive.Tokens.ToArray();
+                    if (tokens.Length < 2)
+                    {
+                        continue;
+                    }
+
+                    var typeName = tokens[0].Content;
+                    var memberName = tokens[1].Content;
+
+                    if (!properties.Add(memberName))
+                    {
+                        continue;
+                    }
+
+                    classNode.Children.Add(new InjectIntermediateNode(typeName, memberName));
+                }
+            }
+
+            private class Visitor : IntermediateNodeWalker
+            {
+                public IList<DirectiveIntermediateNode> Directives { get; }
+                    = new List<DirectiveIntermediateNode>();
+
+                public override void VisitDirective(DirectiveIntermediateNode node)
+                {
+                    if (node.Directive == Directive)
+                    {
+                        Directives.Add(node);
+                    }
+                }
+            }
+
+            internal class InjectIntermediateNode : ExtensionIntermediateNode
+            {
+                private static readonly IList<string> _injectedPropertyModifiers = new[]
+                {
+                    $"[global::{ComponentsApi.InjectAttribute.FullTypeName}]",
+                    "private" // Encapsulation is the default
+                };
+
+                public string TypeName { get; }
+                public string MemberName { get; }
+                public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+                public InjectIntermediateNode(string typeName, string memberName)
+                {
+                    TypeName = typeName;
+                    MemberName = memberName;
+                }
+
+                public override void Accept(IntermediateNodeVisitor visitor)
+                    => AcceptExtensionNode(this, visitor);
+
+                public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+                    => context.CodeWriter.WriteAutoPropertyDeclaration(
+                        _injectedPropertyModifiers,
+                        TypeName,
+                        MemberName);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs
new file mode 100644
index 0000000000..0d2d586260
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class LayoutDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "layout",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(ComponentResources.LayoutDirective_TypeToken_Name, ComponentResources.LayoutDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = ComponentResources.LayoutDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new LayoutDirectivePass());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs
new file mode 100644
index 0000000000..a22160570d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs
@@ -0,0 +1,51 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class LayoutDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                return;
+            }
+
+            var directives = documentNode.FindDirectiveReferences(LayoutDirective.Directive);
+            if (directives.Count == 0)
+            {
+                return;
+            }
+
+            var token = ((DirectiveIntermediateNode)directives[0].Node).Tokens.FirstOrDefault();
+            if (token == null)
+            {
+                return;
+            }
+
+            var attributeNode = new CSharpCodeIntermediateNode();
+            attributeNode.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"[{ComponentsApi.LayoutAttribute.FullTypeName}(typeof({token.Content}))]" + Environment.NewLine,
+            });
+            
+            // Insert the new attribute on top of the class
+            for (var i = 0; i < @namespace.Children.Count; i++)
+            {
+                if (object.ReferenceEquals(@namespace.Children[i], @class))
+                {
+                    @namespace.Children.Insert(i, attributeNode);
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
new file mode 100644
index 0000000000..215a562aaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
+    <RootNamespace>Microsoft.AspNetCore.Components.Razor</RootNamespace>
+    <Description>Extensions to the Razor compiler to support building Razor Components.</Description>
+    <IsProductPackage>true</IsProductPackage>
+
+    <!-- Copy package references to output, needed so the build project can find them -->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="0.9.9.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(RazorPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(RazorPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\shared\ComponentsApi.cs" Link="shared\%(Filename)%(Extension)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs
new file mode 100644
index 0000000000..08b5ec74b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class PageDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "page",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddStringToken(ComponentResources.PageDirective_RouteToken_Name, ComponentResources.PageDirective_RouteToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = ComponentResources.PageDirective_Description;
+            });
+
+        private PageDirective(string routeTemplate, IntermediateNode directiveNode)
+        {
+            RouteTemplate = routeTemplate;
+            DirectiveNode = directiveNode;
+        }
+
+        public string RouteTemplate { get; }
+
+        public IntermediateNode DirectiveNode { get; }
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new PageDirectivePass());
+            return builder;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs
new file mode 100644
index 0000000000..224b85b503
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs
@@ -0,0 +1,82 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class PageDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                return;
+            }
+
+            var directives = documentNode.FindDirectiveReferences(PageDirective.Directive);
+            if (directives.Count == 0)
+            {
+                return;
+            }
+
+            // We don't allow @page directives in imports
+            for (var i = 0; i < directives.Count; i++)
+            {
+                var directive = directives[i];
+                if (directive.Node.IsImported())
+                {
+                    directive.Node.Diagnostics.Add(ComponentDiagnosticFactory.CreatePageDirective_CannotBeImported(directive.Node.Source.Value));
+                }
+            }
+
+            // Insert the attributes 'on-top' of the class declaration, since classes don't directly support attributes.
+            var index = 0;
+            for (; index < @namespace.Children.Count; index++)
+            {
+                if (object.ReferenceEquals(@class, @namespace.Children[index]))
+                {
+                    break;
+                }
+            }
+
+            for (var i = 0; i < directives.Count; i++)
+            {
+                var pageDirective = (DirectiveIntermediateNode)directives[i].Node;
+
+                // The parser also adds errors for invalid syntax, we just need to not crash.
+                var routeToken = pageDirective.Tokens.FirstOrDefault();
+
+                if (routeToken != null &&
+                    routeToken.Content.Length >= 3 &&
+                    routeToken.Content[0] == '\"' &&
+                    routeToken.Content[1] == '/' &&
+                    routeToken.Content[routeToken.Content.Length - 1] == '\"')
+                {
+                    var template = routeToken.Content.Substring(1, routeToken.Content.Length - 2);
+                    @namespace.Children.Insert(index++, new RouteAttributeExtensionNode(template));
+                }
+                else
+                {
+                    pageDirective.Diagnostics.Add(ComponentDiagnosticFactory.CreatePageDirective_MustSpecifyRoute(pageDirective.Source));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs
new file mode 100644
index 0000000000..d44b29db2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs
@@ -0,0 +1,29 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    /// <summary>
+    /// Represents a fatal error during the transformation of a Blazor component from
+    /// Razor source code to C# source code.
+    /// </summary>
+    public class RazorCompilerException : Exception
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="RazorCompilerException"/>.
+        /// </summary>
+        /// <param name="diagnostic"></param>
+        public RazorCompilerException(RazorDiagnostic diagnostic)
+        {
+            Diagnostic = diagnostic;
+        }
+
+        /// <summary>
+        /// Gets the diagnostic value.
+        /// </summary>
+        public RazorDiagnostic Diagnostic { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs
new file mode 100644
index 0000000000..b822b9345a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs
@@ -0,0 +1,66 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class RefExtensionNode : ExtensionIntermediateNode
+    {
+        public RefExtensionNode(IntermediateToken identifierToken)
+        {
+            IdentifierToken = identifierToken ?? throw new ArgumentNullException(nameof(identifierToken));
+            Source = IdentifierToken.Source;
+        }
+
+        public RefExtensionNode(IntermediateToken identifierToken, string componentCaptureTypeName)
+            : this(identifierToken)
+        {
+            if (string.IsNullOrEmpty(componentCaptureTypeName))
+            {
+                throw new ArgumentException("Cannot be null or empty", nameof(componentCaptureTypeName));
+            }
+
+            IsComponentCapture = true;
+            ComponentCaptureTypeName = componentCaptureTypeName;
+        }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public IntermediateToken IdentifierToken { get; }
+
+        public bool IsComponentCapture { get; }
+
+        public string ComponentCaptureTypeName { get; set; }
+
+        public string TypeName => $"global::System.Action<{(IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementRef.FullTypeName)}>";
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<RefExtensionNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var writer = (BlazorNodeWriter)context.NodeWriter;
+            writer.WriteReferenceCapture(context, this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs
new file mode 100644
index 0000000000..f53c7d33a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs
@@ -0,0 +1,82 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class RefLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after component lowering pass
+        public override int Order => 50;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+            for (var i = 0; i < references.Count; i++)
+            {
+                var reference = references[i];
+                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+
+                if (node.TagHelper.IsRefTagHelper())
+                {
+                    reference.Replace(RewriteUsage(@class, reference.Parent, node));
+                }
+            }
+        }
+
+        private IntermediateNode RewriteUsage(ClassDeclarationIntermediateNode classNode, IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        {
+            // If we can't get a nonempty attribute name, do nothing because there will
+            // already be a diagnostic for empty values
+            var identifierToken = DetermineIdentifierToken(node);
+            if (identifierToken == null)
+            {
+                return node;
+            }
+
+            // Determine whether this is an element capture or a component capture, and
+            // if applicable the type name that will appear in the resulting capture code
+            var componentTagHelper = (parent as ComponentExtensionNode)?.Component;
+            if (componentTagHelper != null)
+            {
+                return new RefExtensionNode(identifierToken, componentTagHelper.GetTypeName());
+            }
+            else
+            {
+                return new RefExtensionNode(identifierToken);
+            }
+        }
+
+        private IntermediateToken DetermineIdentifierToken(TagHelperPropertyIntermediateNode attributeNode)
+        {
+            IntermediateToken foundToken = null;
+
+            if (attributeNode.Children.Count == 1)
+            {
+                if (attributeNode.Children[0] is IntermediateToken token)
+                {
+                    foundToken = token;
+                }
+                else if (attributeNode.Children[0] is CSharpExpressionIntermediateNode csharpNode)
+                {
+                    if (csharpNode.Children.Count == 1)
+                    {
+                        foundToken = csharpNode.Children[0] as IntermediateToken;
+                    }
+                }
+            }
+            
+            return !string.IsNullOrWhiteSpace(foundToken?.Content) ? foundToken : null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RouteAttributeExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RouteAttributeExtensionNode.cs
new file mode 100644
index 0000000000..5d70fbb034
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RouteAttributeExtensionNode.cs
@@ -0,0 +1,33 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class RouteAttributeExtensionNode : ExtensionIntermediateNode
+    {
+        public RouteAttributeExtensionNode(string template)
+        {
+            Template = template;
+        }
+
+        public string Template { get; }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public override void Accept(IntermediateNodeVisitor visitor) => AcceptExtensionNode(this, visitor);
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            context.CodeWriter.Write("[");
+            context.CodeWriter.Write(ComponentsApi.RouteAttribute.FullTypeName);
+            context.CodeWriter.Write("(\"");
+            context.CodeWriter.Write(Template);
+            context.CodeWriter.Write("\")");
+            context.CodeWriter.Write("]");
+            context.CodeWriter.WriteLine();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
new file mode 100644
index 0000000000..5349310415
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
@@ -0,0 +1,91 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    /// <summary>
+    /// Keeps track of the nesting of elements/containers while writing out the C# source code
+    /// for a component. This allows us to detect mismatched start/end tags, as well as inject
+    /// additional C# source to capture component descendants in a lambda.
+    /// </summary>
+    internal class ScopeStack
+    {
+        private readonly Stack<ScopeEntry> _stack = new Stack<ScopeEntry>();
+        private int _builderVarNumber = 1;
+
+        public string BuilderVarName { get; private set; } = "builder";
+
+        public void OpenComponentScope(CodeRenderingContext context, string name, string parameterName)
+        {
+            var scope = new ScopeEntry(name, ScopeKind.Component);
+            _stack.Push(scope);
+
+            OffsetBuilderVarNumber(1);
+
+            // Writes code that looks like:
+            //
+            // ((__builder) => { ... })
+            // OR
+            // ((context) => (__builder) => { ... })
+
+            if (parameterName != null)
+            {
+                context.CodeWriter.Write($"({parameterName}) => ");
+            }
+
+            scope.LambdaScope = context.CodeWriter.BuildLambda(BuilderVarName);
+        }
+
+        public void OpenTemplateScope(CodeRenderingContext context)
+        {
+            var currentScope = new ScopeEntry("__template", ScopeKind.Template);
+            _stack.Push(currentScope);
+
+            // Templates always get a lambda scope, because they are defined as a lambda.
+            OffsetBuilderVarNumber(1);
+            currentScope.LambdaScope = context.CodeWriter.BuildLambda(BuilderVarName);
+        }
+
+        public void CloseScope(CodeRenderingContext context)
+        {
+            var currentScope = _stack.Pop();
+            currentScope.LambdaScope.Dispose();
+            OffsetBuilderVarNumber(-1);
+        }
+
+        private void OffsetBuilderVarNumber(int delta)
+        {
+            _builderVarNumber += delta;
+            BuilderVarName = _builderVarNumber == 1
+                ? "builder"
+                : $"builder{_builderVarNumber}";
+        }
+
+        private class ScopeEntry
+        {
+            public readonly string Name;
+            public ScopeKind Kind;
+            public int ChildCount;
+            public IDisposable LambdaScope;
+
+            public ScopeEntry(string name, ScopeKind kind)
+            {
+                Name = name;
+                Kind = kind;
+                ChildCount = 0;
+            }
+
+            public override string ToString() => $"<{Name}> ({Kind})";
+        }
+
+        private enum ScopeKind
+        {
+            Component,
+            Template,
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
new file mode 100644
index 0000000000..52c2b39a50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ScriptTagPass : IntermediateNodePassBase, IRazorDocumentClassifierPass
+    {
+        // Run as soon as possible after the Component rewrite pass
+        public override int Order => ComponentDocumentClassifierPass.DefaultFeatureOrder + 2;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.DocumentKind != ComponentDocumentClassifierPass.ComponentDocumentKind)
+            {
+                return;
+            }
+
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<HtmlElementIntermediateNode>
+        {
+            public void VisitExtension(HtmlElementIntermediateNode node)
+            {
+                // Disallow <script> in components as per #552
+                if (string.Equals(node.TagName, "script", StringComparison.OrdinalIgnoreCase))
+                {
+                    for (var i = 0; i < node.Children.Count; i++)
+                    {
+                        // We allow you to suppress this error like:
+                        // <script suppress-error="BL9992" />
+                        var attribute = node.Children[i] as HtmlAttributeIntermediateNode;
+                        if (attribute != null && 
+                            attribute.AttributeName == "suppress-error" &&
+                            attribute.Children.Count == 1 &&
+                            attribute.Children[0] is HtmlAttributeValueIntermediateNode value &&
+                            value.Children.Count == 1 &&
+                            value.Children[0] is IntermediateToken token &&
+                            token.IsHtml &&
+                            string.Equals(token.Content, "BL9992", StringComparison.Ordinal))
+                        {
+                            node.Children.RemoveAt(i);
+                            return;
+                        }
+                    }
+                    
+                    var diagnostic = ComponentDiagnosticFactory.Create_DisallowedScriptTag(node.Source);
+                    node.Diagnostics.Add(diagnostic);
+                }
+
+                base.VisitDefault(node);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
new file mode 100644
index 0000000000..07d0d538af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
@@ -0,0 +1,154 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class TagHelperBoundAttributeDescriptorExtensions
+    {
+        public static bool IsDelegateProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var key = BlazorMetadata.Component.DelegateSignatureKey;
+            return 
+                attribute.Metadata.TryGetValue(key, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
+        public static bool IsGenericTypedProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+            
+            return
+                attribute.Metadata.TryGetValue(BlazorMetadata.Component.GenericTypedKey, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
+        public static bool IsTypeParameterProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return
+                attribute.Metadata.TryGetValue(BlazorMetadata.Component.TypeParameterKey, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
+        public static bool IsWeaklyTyped(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var key = BlazorMetadata.Component.WeaklyTypedKey;
+            return
+                attribute.Metadata.TryGetValue(key, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property is a child content property. Properties are
+        /// considered child content if they have the type <c>RenderFragment</c> or <c>RenderFragment{T}</c>.
+        /// </summary>
+        /// <param name="attribute">The <see cref="BoundAttributeDescriptor"/>.</param>
+        /// <returns>Returns <c>true</c> if the property is child content, otherwise <c>false</c>.</returns>
+        public static bool IsChildContentProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var key = BlazorMetadata.Component.ChildContentKey;
+            return
+                attribute.Metadata.TryGetValue(key, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property is a child content property. Properties are
+        /// considered child content if they have the type <c>RenderFragment</c> or <c>RenderFragment{T}</c>.
+        /// </summary>
+        /// <param name="attribute">The <see cref="BoundAttributeDescriptorBuilder"/>.</param>
+        /// <returns>Returns <c>true</c> if the property is child content, otherwise <c>false</c>.</returns>
+        public static bool IsChildContentProperty(this BoundAttributeDescriptorBuilder attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var key = BlazorMetadata.Component.ChildContentKey;
+            return
+                attribute.Metadata.TryGetValue(key, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property is a parameterized child content property. Properties are
+        /// considered parameterized child content if they have the type <c>RenderFragment{T}</c> (for some T).
+        /// </summary>
+        /// <param name="attribute">The <see cref="BoundAttributeDescriptor"/>.</param>
+        /// <returns>Returns <c>true</c> if the property is parameterized child content, otherwise <c>false</c>.</returns>
+        public static bool IsParameterizedChildContentProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return attribute.IsChildContentProperty() &&
+                !string.Equals(attribute.TypeName, ComponentsApi.RenderFragment.FullTypeName, StringComparison.Ordinal);
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property is a parameterized child content property. Properties are
+        /// considered parameterized child content if they have the type <c>RenderFragment{T}</c> (for some T).
+        /// </summary>
+        /// <param name="attribute">The <see cref="BoundAttributeDescriptor"/>.</param>
+        /// <returns>Returns <c>true</c> if the property is parameterized child content, otherwise <c>false</c>.</returns>
+        public static bool IsParameterizedChildContentProperty(this BoundAttributeDescriptorBuilder attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return attribute.IsChildContentProperty() &&
+                !string.Equals(attribute.TypeName, ComponentsApi.RenderFragment.FullTypeName, StringComparison.Ordinal);
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property is used to specify the name of the parameter
+        /// for a parameterized child content property.
+        /// </summary>
+        /// <param name="attribute">The <see cref="BoundAttributeDescriptor"/>.</param>
+        /// <returns>
+        /// Returns <c>true</c> if the property specifies the name of a parameter for a parameterized child content,
+        /// otherwise <c>false</c>.
+        /// </returns>
+        public static bool IsChildContentParameterNameProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var key = BlazorMetadata.Component.ChildContentParameterNameKey;
+            return
+                attribute.Metadata.TryGetValue(key, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
new file mode 100644
index 0000000000..ddc2edcec1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -0,0 +1,199 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class TagHelperDescriptorExtensions
+    {
+        public static bool IsBindTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+            
+            return 
+                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var kind) && 
+                string.Equals(BlazorMetadata.Bind.TagHelperKind, kind);
+        }
+
+        public static bool IsFallbackBindTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.IsBindTagHelper() &&
+                tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.FallbackKey, out var fallback) &&
+                string.Equals(bool.TrueString, fallback);
+        }
+
+        public static bool IsGenericTypedComponent(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                IsComponentTagHelper(tagHelper) &&
+                tagHelper.Metadata.TryGetValue(BlazorMetadata.Component.GenericTypedKey, out var value) &&
+                string.Equals(bool.TrueString, value);
+        }
+
+        public static bool IsInputElementBindTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.IsBindTagHelper() &&
+                tagHelper.TagMatchingRules.Count == 1 &&
+                string.Equals("input", tagHelper.TagMatchingRules[0].TagName);
+        }
+
+        public static bool IsInputElementFallbackBindTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.IsInputElementBindTagHelper() &&
+                !tagHelper.Metadata.ContainsKey(BlazorMetadata.Bind.TypeAttribute);
+        }
+
+        public static string GetValueAttributeName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.ValueAttribute, out var result);
+            return result;
+        }
+
+        public static string GetChangeAttributeName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.ChangeAttribute, out var result);
+            return result;
+        }
+
+        public static bool IsChildContentTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var value) &&
+                string.Equals(value, BlazorMetadata.ChildContent.TagHelperKind, StringComparison.Ordinal);
+        }
+
+        public static bool IsComponentTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return !tagHelper.Metadata.ContainsKey(BlazorMetadata.SpecialKindKey);
+        }
+
+        public static bool IsEventHandlerTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var kind) &&
+                string.Equals(BlazorMetadata.EventHandler.TagHelperKind, kind);
+        }
+
+        public static bool IsRefTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var kind) &&
+                string.Equals(BlazorMetadata.Ref.TagHelperKind, kind);
+        }
+
+        public static string GetEventArgsType(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(BlazorMetadata.EventHandler.EventArgsType, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the set of component attributes that can accept child content (<c>RenderFragment</c> or <c>RenderFragment{T}</c>).
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/>.</param>
+        /// <returns>The child content attributes</returns>
+        public static IEnumerable<BoundAttributeDescriptor> GetChildContentProperties(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            for (var i = 0; i < tagHelper.BoundAttributes.Count; i++)
+            {
+                var attribute = tagHelper.BoundAttributes[i];
+                if (attribute.IsChildContentProperty())
+                {
+                    yield return attribute;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the set of component attributes that represent generic type parameters of the component type.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/>.</param>
+        /// <returns>The type parameter attributes</returns>
+        public static IEnumerable<BoundAttributeDescriptor> GetTypeParameters(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            for (var i = 0; i < tagHelper.BoundAttributes.Count; i++)
+            {
+                var attribute = tagHelper.BoundAttributes[i];
+                if (attribute.IsTypeParameterProperty())
+                {
+                    yield return attribute;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
new file mode 100644
index 0000000000..5f733e92a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
@@ -0,0 +1,60 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class TemplateDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Runs after components/eventhandlers/ref/bind. We need to check for templates in all of those
+        // places.
+        public override int Order => 150;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+
+            for (var i = 0; i < visitor.Candidates.Count; i++)
+            {
+                var candidate = visitor.Candidates[i];
+                candidate.Parent.Diagnostics.Add(ComponentDiagnosticFactory.Create_TemplateInvalidLocation(candidate.Node.Source));
+
+                // Remove the offending node since we don't know how to render it. This means that the user won't get C#
+                // completion at this location, which is fine because it's inside an HTML attribute.
+                candidate.Remove();
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<TemplateIntermediateNode>
+        {
+            public List<IntermediateNodeReference> Candidates { get; } = new List<IntermediateNodeReference>();
+
+            public void VisitExtension(TemplateIntermediateNode node)
+            {
+                // We found a template, let's check where it's located.
+                for (var i = 0; i < Ancestors.Count; i++)
+                {
+                    var ancestor = Ancestors[i];
+
+                    if (
+                        // Inside markup attribute
+                        ancestor is HtmlAttributeIntermediateNode ||
+
+                        // Inside component attribute
+                        ancestor is ComponentAttributeExtensionNode ||
+
+                        // Inside malformed ref attribute
+                        ancestor is TagHelperPropertyIntermediateNode)
+                    {
+                        Candidates.Add(new IntermediateNodeReference(Parent, node));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
new file mode 100644
index 0000000000..4add4f4c39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
@@ -0,0 +1,101 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class TrimWhitespacePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            // There's no benefit running the whitespace trimmer during design-time builds
+            if (!documentNode.Options.DesignTime)
+            {
+                var method = documentNode.FindPrimaryMethod();
+                if (method != null)
+                {
+                    RemoveContiguousWhitespace(method.Children, TraversalDirection.Forwards);
+                    RemoveContiguousWhitespace(method.Children, TraversalDirection.Backwards);
+                }
+            }
+        }
+
+        private static void RemoveContiguousWhitespace(IntermediateNodeCollection nodes, TraversalDirection direction)
+        {
+            var position = direction == TraversalDirection.Forwards ? 0 : nodes.Count - 1;
+            while (position >= 0 && position < nodes.Count)
+            {
+                var node = nodes[position];
+                bool shouldRemoveNode;
+                bool shouldContinueIteration;
+
+                switch (node)
+                {
+                    case IntermediateToken intermediateToken:
+                        shouldRemoveNode = string.IsNullOrWhiteSpace(intermediateToken.Content);
+                        shouldContinueIteration = shouldRemoveNode;
+                        break;
+
+                    case HtmlContentIntermediateNode htmlContentIntermediateNode:
+                        RemoveContiguousWhitespace(htmlContentIntermediateNode.Children, direction);
+                        shouldRemoveNode = htmlContentIntermediateNode.Children.Count == 0;
+                        shouldContinueIteration = shouldRemoveNode;
+                        break;
+
+                    case HtmlElementIntermediateNode _:
+                    case CSharpExpressionIntermediateNode _:
+                    case TagHelperIntermediateNode _:
+                        // These node types may produce non-whitespace output at runtime
+                        shouldRemoveNode = false;
+                        shouldContinueIteration = false;
+                        break;
+
+                    case CSharpCodeIntermediateNode codeIntermediateNode:
+                        shouldRemoveNode = false;
+                        shouldContinueIteration = ComponentDocumentClassifierPass.IsBuildRenderTreeBaseCall(codeIntermediateNode);
+                        break;
+
+                    default:
+                        shouldRemoveNode = false;
+                        shouldContinueIteration = true; // Because other types of nodes don't produce output
+                        break;
+                }
+
+                if (shouldRemoveNode)
+                {
+                    nodes.RemoveAt(position);
+                    if (direction == TraversalDirection.Forwards)
+                    {
+                        position--;
+                    }
+                }
+
+                position += direction == TraversalDirection.Forwards ? 1 : -1;
+
+                if (!shouldContinueIteration)
+                {
+                    break;
+                }
+            }
+        }
+
+        enum TraversalDirection
+        {
+            Forwards,
+            Backwards
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs
new file mode 100644
index 0000000000..558a4b2488
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class TypeParamDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "typeparam",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddMemberToken(ComponentResources.TypeParamDirective_Token_Name, ComponentResources.TypeParamDirective_Token_Description);
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = ComponentResources.TypeParamDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs
index c1482fbb67..60bdbd36e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/DocumentIntermediateNodeExtensions.cs
@@ -54,6 +54,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             visitor.Visit(node);
             return visitor.Directives;
         }
+        
+        public static IReadOnlyList<IntermediateNodeReference> FindDescendantReferences<TNode>(this DocumentIntermediateNode document)
+            where TNode : IntermediateNode
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var visitor = new ReferenceVisitor<TNode>();
+            visitor.Visit(document);
+            return visitor.References;
+        }
 
         private static T FindWithAnnotation<T>(IntermediateNode node, object annotation) where T : IntermediateNode
         {
@@ -95,5 +108,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
                 base.VisitDirective(node);
             }
         }
+        
+        private class ReferenceVisitor<TNode> : IntermediateNodeWalker
+            where TNode : IntermediateNode
+        {
+            public List<IntermediateNodeReference> References = new List<IntermediateNodeReference>();
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                base.VisitDefault(node);
+
+                // Use a post-order traversal because references are used to replace nodes, and thus
+                // change the parent nodes.
+                //
+                // This ensures that we always operate on the leaf nodes first.
+                if (node is TNode)
+                {
+                    References.Add(new IntermediateNodeReference(Parent, node));
+                }
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameFeature.cs
new file mode 100644
index 0000000000..cecf937f77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameFeature.cs
@@ -0,0 +1,18 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // Razor.Language doesn't reference Microsoft.CodeAnalysis.CSharp so we
+    // need some indirection.
+    internal abstract class TypeNameFeature : RazorEngineFeatureBase
+    {
+        public abstract IReadOnlyList<string> ParseTypeParameters(string typeName);
+
+        public abstract TypeNameRewriter CreateGenericTypeRewriter(Dictionary<string, string> bindings);
+
+        public abstract TypeNameRewriter CreateGlobalQualifiedTypeNameRewriter(ICollection<string> ignore);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameRewriter.cs
new file mode 100644
index 0000000000..3dd24851c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TypeNameRewriter.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // Razor.Language doesn't reference Microsoft.CodeAnalysis.CSharp so we
+    // need some indirection.
+    internal abstract class TypeNameRewriter
+    {
+        public abstract string Rewrite(string typeName);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index 401183445f..f32075f5bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -5,10 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
 using Newtonsoft.Json;
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..4f9f0df338
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -0,0 +1,490 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class BindTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+    {
+        // Run after the component tag helper provider, because we need to see the results.
+        public int Order { get; set; } = 1000;
+
+        public RazorEngine Engine { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // This provider returns tag helper information for 'bind' which doesn't necessarily
+            // map to any real component. Bind behaviors more like a macro, which can map a single LValue to
+            // both a 'value' attribute and a 'value changed' attribute.
+            //
+            // User types: 
+            //      <input type="text" bind="@FirstName"/>
+            //
+            // We generate:
+            //      <input type="text" 
+            //          value="@BindMethods.GetValue(FirstName)" 
+            //          onchange="@BindMethods.SetValue(__value => FirstName = __value, FirstName)"/>
+            //
+            // This isn't very different from code the user could write themselves - thus the pronouncement
+            // that bind is very much like a macro.
+            //
+            // A lot of the value that provide in this case is that the associations between the
+            // elements, and the attributes aren't straightforward.
+            //
+            // For instance on <input type="text" /> we need to listen to 'value' and 'onchange',
+            // but on <input type="checked" we need to listen to 'checked' and 'onchange'.
+            //
+            // We handle a few different cases here:
+            //
+            //  1.  When given an attribute like **anywhere**'bind-value-onchange="@FirstName"' we will
+            //      generate the 'value' attribute and 'onchange' attribute. 
+            //
+            //      We don't do any transformation or inference for this case, because the developer has
+            //      told us exactly what to do. This is the *full* form of bind, and should support any
+            //      combination of element, component, and attributes.
+            //
+            //      This is the most general case, and is implemented with a built-in tag helper that applies
+            //      to everything, and binds to a dictionary of attributes that start with bind-.
+            //
+            //  2.  We also support cases like 'bind-value="@FirstName"' where we will generate the 'value'
+            //      attribute and another attribute based for a changed handler based on the metadata.
+            //
+            //     These mappings are provided by attributes that tell us what attributes, suffixes, and
+            //      elements to map.
+            //
+            //  3.  When given an attribute like 'bind="@FirstName"' we will generate a value and change
+            //      attribute solely based on the context. We need the context of an HTML tag to know
+            //      what attributes to generate.
+            //
+            //      Similar to case #2, this should 'just work' from the users point of view. We expect
+            //      using this syntax most frequently with input elements.
+            //
+            //      These mappings are also provided by attributes. Primarily these are used by <input />
+            //      and so we have a special case for input elements and their type attributes.
+            //
+            //  4.  For components, we have a bit of a special case. We can infer a syntax that matches
+            //      case #2 based on property names. So if a component provides both 'Value' and 'ValueChanged'
+            //      we will turn that into an instance of bind.
+            //
+            // So case #1 here is the most general case. Case #2 and #3 are data-driven based on attribute data
+            // we have. Case #4 is data-driven based on component definitions.
+            //
+            // We provide a good set of attributes that map to the HTML dom. This set is user extensible.
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                return;
+            }
+
+            var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName);
+            if (bindMethods == null)
+            {
+                // If we can't find BindMethods, then just bail. We won't be able to compile the
+                // generated code anyway.
+                return;
+            }
+
+            // Tag Helper defintion for case #1. This is the most general case.
+            context.Results.Add(CreateFallbackBindTagHelper());
+
+            // For case #2 & #3 we have a whole bunch of attribute entries on BindMethods that we can use
+            // to data-drive the definitions of these tag helpers.
+            var elementBindData = GetElementBindData(compilation);
+
+            // Case #2 & #3
+            foreach (var tagHelper in CreateElementBindTagHelpers(elementBindData))
+            {
+                context.Results.Add(tagHelper);
+            }
+
+            // For case #4 we look at the tag helpers that were already created corresponding to components
+            // and pattern match on properties.
+            foreach (var tagHelper in CreateComponentBindTagHelpers(context.Results))
+            {
+                context.Results.Add(tagHelper);
+            }
+        }
+
+        private TagHelperDescriptor CreateFallbackBindTagHelper()
+        {
+            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName);
+            builder.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
+
+            builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
+            builder.Metadata[BlazorMetadata.Bind.FallbackKey] = bool.TrueString;
+
+            // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
+            // a C# property will crash trying to create the toolips.
+            builder.SetTypeName("Microsoft.AspNetCore.Components.Bind");
+
+            builder.TagMatchingRule(rule =>
+            {
+                rule.TagName = "*";
+                rule.Attribute(attribute =>
+                {
+                    attribute.Name = "bind-";
+                    attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+                });
+            });
+
+            builder.BindAttribute(attribute =>
+            {
+                attribute.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
+
+                attribute.Name = "bind-...";
+                attribute.AsDictionary("bind-", typeof(object).FullName);
+
+                // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the toolips.
+                attribute.SetPropertyName("Bind");
+                attribute.TypeName = "System.Collections.Generic.Dictionary<string, object>";
+            });
+
+            builder.BindAttribute(attribute =>
+            {
+                attribute.Documentation = ComponentResources.BindTagHelper_Fallback_Format_Documentation;
+
+                attribute.Name = "format-...";
+                attribute.AsDictionary("format-", typeof(string).FullName);
+
+                // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the toolips.
+                attribute.SetPropertyName("Format");
+                attribute.TypeName = "System.Collections.Generic.Dictionary<string, string>";
+            });
+
+            return builder.Build();
+        }
+
+        private List<ElementBindData> GetElementBindData(Compilation compilation)
+        {
+            var bindElement = compilation.GetTypeByMetadataName(ComponentsApi.BindElementAttribute.FullTypeName);
+            var bindInputElement = compilation.GetTypeByMetadataName(ComponentsApi.BindInputElementAttribute.FullTypeName);
+
+            if (bindElement == null || bindInputElement == null)
+            {
+                // This won't likely happen, but just in case.
+                return new List<ElementBindData>();
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new BindElementDataVisitor(types);
+
+            // Visit the primary output of this compilation, as well as all references.
+            visitor.Visit(compilation.Assembly);
+            foreach (var reference in compilation.References)
+            {
+                // We ignore .netmodules here - there really isn't a case where they are used by user code
+                // even though the Roslyn APIs all support them.
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    visitor.Visit(assembly);
+                }
+            }
+
+            var results = new List<ElementBindData>();
+
+            for (var i = 0; i < types.Count; i++)
+            {
+                var type = types[i];
+                var attributes = type.GetAttributes();
+
+                // Not handling duplicates here for now since we're the primary ones extending this.
+                // If we see users adding to the set of 'bind' constructs we will want to add deduplication
+                // and potentially diagnostics.
+                for (var j = 0; j < attributes.Length; j++)
+                {
+                    var attribute = attributes[j];
+
+                    if (attribute.AttributeClass == bindElement)
+                    {
+                        results.Add(new ElementBindData(
+                            type.ContainingAssembly.Name,
+                            type.ToDisplayString(),
+                            (string)attribute.ConstructorArguments[0].Value,
+                            null,
+                            (string)attribute.ConstructorArguments[1].Value,
+                            (string)attribute.ConstructorArguments[2].Value,
+                            (string)attribute.ConstructorArguments[3].Value));
+                    }
+                    else if (attribute.AttributeClass == bindInputElement)
+                    {
+                        results.Add(new ElementBindData(
+                            type.ContainingAssembly.Name,
+                            type.ToDisplayString(),
+                            "input",
+                            (string)attribute.ConstructorArguments[0].Value,
+                            (string)attribute.ConstructorArguments[1].Value,
+                            (string)attribute.ConstructorArguments[2].Value,
+                            (string)attribute.ConstructorArguments[3].Value));
+                    }
+                }
+            }
+
+            return results;
+        }
+        private List<TagHelperDescriptor> CreateElementBindTagHelpers(List<ElementBindData> data)
+        {
+            var results = new List<TagHelperDescriptor>();
+
+            for (var i = 0; i < data.Count; i++)
+            {
+                var entry = data[i];
+
+                var name = entry.Suffix == null ? "Bind" : "Bind_" + entry.Suffix;
+                var attributeName = entry.Suffix == null ? "bind" : "bind-" + entry.Suffix;
+
+                var formatName = entry.Suffix == null ? "Format_" + entry.ValueAttribute : "Format_" + entry.Suffix;
+                var formatAttributeName = entry.Suffix == null ? "format-" + entry.ValueAttribute : "format-" + entry.Suffix;
+
+                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, name, entry.Assembly);
+                builder.Documentation = string.Format(
+                    ComponentResources.BindTagHelper_Element_Documentation,
+                    entry.ValueAttribute,
+                    entry.ChangeAttribute);
+
+                builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+                builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
+                builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = entry.ValueAttribute;
+                builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = entry.ChangeAttribute;
+
+                if (entry.TypeAttribute != null)
+                {
+                    // For entries that map to the <input /> element, we need to be able to know
+                    // the difference between <input /> and <input type="text" .../> for which we
+                    // want to use the same attributes.
+                    //
+                    // We provide a tag helper for <input /> that should match all input elements,
+                    // but we only want it to be used when a more specific one is used.
+                    // 
+                    // Therefore we use this metadata to know which one is more specific when two
+                    // tag helpers match.
+                    builder.Metadata[BlazorMetadata.Bind.TypeAttribute] = entry.TypeAttribute;
+                }
+
+                // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the toolips.
+                builder.SetTypeName(entry.TypeName);
+
+                builder.TagMatchingRule(rule =>
+                {
+                    rule.TagName = entry.Element;
+                    if (entry.TypeAttribute != null)
+                    {
+                        rule.Attribute(a =>
+                        {
+                            a.Name = "type";
+                            a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                            a.Value = entry.TypeAttribute;
+                            a.ValueComparisonMode = RequiredAttributeDescriptor.ValueComparisonMode.FullMatch;
+                        });
+                    }
+                    
+                    rule.Attribute(a =>
+                    {
+                        a.Name = attributeName;
+                        a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                    });
+                });
+
+                builder.BindAttribute(a =>
+                {
+                    a.Documentation = string.Format(
+                        ComponentResources.BindTagHelper_Element_Documentation,
+                        entry.ValueAttribute,
+                        entry.ChangeAttribute);
+
+                    a.Name = attributeName;
+                    a.TypeName = typeof(object).FullName;
+
+                    // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                    // a C# property will crash trying to create the toolips.
+                    a.SetPropertyName(name);
+                });
+
+                builder.BindAttribute(attribute =>
+                {
+                    attribute.Documentation = string.Format(ComponentResources.BindTagHelper_Element_Format_Documentation, attributeName);
+
+                    attribute.Name = formatAttributeName;
+                    attribute.TypeName = "System.String";
+
+                    // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                    // a C# property will crash trying to create the toolips.
+                    attribute.SetPropertyName(formatName);
+                });
+
+                results.Add(builder.Build());
+            }
+
+            return results;
+        }
+
+        private List<TagHelperDescriptor> CreateComponentBindTagHelpers(ICollection<TagHelperDescriptor> tagHelpers)
+        {
+            var results = new List<TagHelperDescriptor>();
+
+            foreach (var tagHelper in tagHelpers)
+            {
+                if (!tagHelper.IsComponentTagHelper())
+                {
+                    continue;
+                }
+
+                // We want to create a 'bind' tag helper everywhere we see a pair of properties like `Foo`, `FooChanged`
+                // where `FooChanged` is a delegate and `Foo` is not.
+                //
+                // The easiest way to figure this out without a lot of backtracking is to look for `FooChanged` and then
+                // try to find a matching "Foo".
+                for (var i = 0; i < tagHelper.BoundAttributes.Count; i++)
+                {
+                    var changeAttribute = tagHelper.BoundAttributes[i];
+                    if (!changeAttribute.Name.EndsWith("Changed") || !changeAttribute.IsDelegateProperty())
+                    {
+                        continue;
+                    }
+
+                    BoundAttributeDescriptor valueAttribute = null;
+                    var valueAttributeName = changeAttribute.Name.Substring(0, changeAttribute.Name.Length - "Changed".Length);
+                    for (var j = 0; j < tagHelper.BoundAttributes.Count; j++)
+                    {
+                        if (tagHelper.BoundAttributes[j].Name == valueAttributeName && !tagHelper.BoundAttributes[j].IsDelegateProperty())
+                        {
+                            valueAttribute = tagHelper.BoundAttributes[j];
+                            break;
+                        }
+                    }
+
+                    if (valueAttribute == null)
+                    {
+                        // No matching attribute found.
+                        continue;
+                    }
+
+                    var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, tagHelper.Name, tagHelper.AssemblyName);
+                    builder.DisplayName = tagHelper.DisplayName;
+                    builder.Documentation = string.Format(
+                        ComponentResources.BindTagHelper_Component_Documentation,
+                        valueAttribute.Name,
+                        changeAttribute.Name);
+
+                    builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+                    builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
+                    builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = valueAttribute.Name;
+                    builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = changeAttribute.Name;
+
+                    // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                    // a C# property will crash trying to create the toolips.
+                    builder.SetTypeName(tagHelper.GetTypeName());
+
+                    // Match the component and attribute name
+                    builder.TagMatchingRule(rule =>
+                    {
+                        rule.TagName = tagHelper.TagMatchingRules.Single().TagName;
+                        rule.Attribute(attribute =>
+                        {
+                            attribute.Name = "bind-" + valueAttribute.Name;
+                            attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                        });
+                    });
+
+                    builder.BindAttribute(attribute =>
+                    {
+                        attribute.Documentation = string.Format(
+                            ComponentResources.BindTagHelper_Component_Documentation,
+                            valueAttribute.Name,
+                            changeAttribute.Name);
+
+                        attribute.Name = "bind-" + valueAttribute.Name;
+                        attribute.TypeName = valueAttribute.TypeName;
+                        attribute.IsEnum = valueAttribute.IsEnum;
+
+                        // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                        // a C# property will crash trying to create the toolips.
+                        attribute.SetPropertyName(valueAttribute.GetPropertyName());
+                    });
+
+                    results.Add(builder.Build());
+                }
+            }
+
+            return results;
+        }
+
+        private struct ElementBindData
+        {
+            public ElementBindData(
+                string assembly,
+                string typeName,
+                string element,
+                string typeAttribute,
+                string suffix,
+                string valueAttribute,
+                string changeAttribute)
+            {
+                Assembly = assembly;
+                TypeName = typeName;
+                Element = element;
+                TypeAttribute = typeAttribute;
+                Suffix = suffix;
+                ValueAttribute = valueAttribute;
+                ChangeAttribute = changeAttribute;
+            }
+
+            public string Assembly { get; }
+            public string TypeName { get; }
+            public string Element { get; }
+            public string TypeAttribute { get; }
+            public string Suffix { get; }
+            public string ValueAttribute { get; }
+            public string ChangeAttribute { get; }
+        }
+
+        private class BindElementDataVisitor : SymbolVisitor
+        {
+            private List<INamedTypeSymbol> _results;
+
+            public BindElementDataVisitor(List<INamedTypeSymbol> results)
+            {
+                _results = results;
+            }
+
+            public override void VisitNamedType(INamedTypeSymbol symbol)
+            {
+                if (symbol.Name == "BindAttributes" && symbol.DeclaredAccessibility == Accessibility.Public)
+                {
+                    _results.Add(symbol);
+                }
+            }
+
+            public override void VisitNamespace(INamespaceSymbol symbol)
+            {
+                foreach (var member in symbol.GetMembers())
+                {
+                    Visit(member);
+                }
+            }
+
+            public override void VisitAssembly(IAssemblySymbol symbol)
+            {
+                // This as a simple yet high-value optimization that excludes the vast majority of
+                // assemblies that (by definition) can't contain a component.
+                if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal))
+                {
+                    Visit(symbol.GlobalNamespace);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index def7c30ac0..1474e86055 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -1,14 +1,29 @@
-// 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;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    internal class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
     {
+        private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+            SymbolDisplayFormat.FullyQualifiedFormat
+                .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+                .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+
+        private static MethodInfo WithMetadataImportOptionsMethodInfo =
+            typeof(CSharpCompilationOptions)
+                .GetMethod("WithMetadataImportOptions", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+        public bool IncludeDocumentation { get; set; }
+
         public int Order { get; set; }
 
         public void Execute(TagHelperDescriptorProviderContext context)
@@ -25,72 +40,422 @@ namespace Microsoft.CodeAnalysis.Razor
                 return;
             }
 
-            var componentSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.IComponent);
-            if (componentSymbol == null || componentSymbol.TypeKind == TypeKind.Error)
-            {
-                // Could not find attributes we care about in the compilation. Nothing to do.
-                return;
-            }
+            // We need to see private members too
+            compilation = WithMetadataImportOptionsAll(compilation);
+
+            var symbols = BlazorSymbols.Create(compilation);
 
             var types = new List<INamedTypeSymbol>();
-            var visitor = new ComponentTypeVisitor(componentSymbol, types);
-
-            // We always visit the global namespace.
-            visitor.Visit(compilation.Assembly.GlobalNamespace);
+            var visitor = new ComponentTypeVisitor(symbols, types);
 
+            // Visit the primary output of this compilation, as well as all references.
+            visitor.Visit(compilation.Assembly);
             foreach (var reference in compilation.References)
             {
+                // We ignore .netmodules here - there really isn't a case where they are used by user code
+                // even though the Roslyn APIs all support them.
                 if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
                 {
-                    if (IsTagHelperAssembly(assembly))
-                    {
-                        visitor.Visit(assembly.GlobalNamespace);
-                    }
+                    visitor.Visit(assembly);
                 }
             }
 
             for (var i = 0; i < types.Count; i++)
             {
                 var type = types[i];
-                var descriptor = CreateDescriptor(type);
+                var descriptor = CreateDescriptor(symbols, type);
+                context.Results.Add(descriptor);
 
-                if (descriptor != null)
+                foreach (var childContent in descriptor.GetChildContentProperties())
                 {
-                    context.Results.Add(descriptor);
+                    // Synthesize a separate tag helper for each child content property that's declared.
+                    context.Results.Add(CreateChildContentDescriptor(symbols, descriptor, childContent));
                 }
             }
         }
 
-        private static TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        private Compilation WithMetadataImportOptionsAll(Compilation compilation)
         {
-            var typeName = type.ToDisplayString(DefaultTagHelperDescriptorFactory.FullNameTypeDisplayFormat);
+            var newCompilationOptions = (CSharpCompilationOptions)WithMetadataImportOptionsMethodInfo
+                .Invoke(compilation.Options, new object[] { /* All */ (byte)2 });
+            return compilation.WithOptions(newCompilationOptions);
+        }
+
+        private TagHelperDescriptor CreateDescriptor(BlazorSymbols symbols, INamedTypeSymbol type)
+        {
+            var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
             var assemblyName = type.ContainingAssembly.Identity.Name;
 
-            var descriptorBuilder = TagHelperDescriptorBuilder.Create(TagHelperConventions.ComponentKind, typeName, assemblyName);
-            descriptorBuilder.SetTypeName(typeName);
-            descriptorBuilder.Metadata[TagHelperMetadata.Runtime.Name] = TagHelperConventions.ComponentKind;
+            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Component.TagHelperKind, typeName, assemblyName);
+            builder.SetTypeName(typeName);
+
+            // This opts out this 'component' tag helper for any processing that's specific to the default
+            // Razor ITagHelper runtime.
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Component.RuntimeName;
+
+            if (type.IsGenericType)
+            {
+                builder.Metadata[BlazorMetadata.Component.GenericTypedKey] = bool.TrueString;
+
+                for (var i = 0; i < type.TypeArguments.Length; i++)
+                {
+                    var typeParameter = type.TypeArguments[i] as ITypeParameterSymbol;
+                    if (typeParameter != null)
+                    {
+                        CreateTypeParameterProperty(builder, typeParameter);
+                    }
+                }
+            }
+
+            var xml = type.GetDocumentationCommentXml();
+            if (!string.IsNullOrEmpty(xml))
+            {
+                builder.Documentation = xml;
+            }
 
             // Components have very simple matching rules. The type name (short) matches the tag name.
-            descriptorBuilder.TagMatchingRule(r => r.TagName = type.Name);
+            builder.TagMatchingRule(r => r.TagName = type.Name);
 
-            var descriptor = descriptorBuilder.Build();
+            foreach (var property in GetProperties(symbols, type))
+            {
+                if (property.kind == PropertyKind.Ignored)
+                {
+                    continue;
+                }
+
+                CreateProperty(builder, property.property, property.kind);
+            }
+
+            if (builder.BoundAttributes.Any(a => a.IsParameterizedChildContentProperty()) &&
+                !builder.BoundAttributes.Any(a => string.Equals(a.Name, BlazorMetadata.ChildContent.ParameterAttributeName, StringComparison.OrdinalIgnoreCase)))
+            {
+                // If we have any parameterized child content parameters, synthesize a 'Context' parameter to be
+                // able to set the variable name (for all child content). If the developer defined a 'Context' parameter
+                // already, then theirs wins.
+                CreateContextParameter(builder, childContentName: null);
+            }
+
+            var descriptor = builder.Build();
             return descriptor;
         }
 
-        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        private void CreateProperty(TagHelperDescriptorBuilder builder, IPropertySymbol property, PropertyKind kind)
         {
-            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+            builder.BindAttribute(pb =>
+            {
+                pb.Name = property.Name;
+                pb.TypeName = property.Type.ToDisplayString(FullNameTypeDisplayFormat);
+                pb.SetPropertyName(property.Name);
+
+                if (kind == PropertyKind.Enum)
+                {
+                    pb.IsEnum = true;
+                }
+
+                if (kind == PropertyKind.ChildContent)
+                {
+                    pb.Metadata.Add(BlazorMetadata.Component.ChildContentKey, bool.TrueString);
+                }
+
+                if (kind == PropertyKind.Delegate)
+                {
+                    pb.Metadata.Add(BlazorMetadata.Component.DelegateSignatureKey, bool.TrueString);
+                }
+
+                if (HasTypeParameter(property.Type))
+                {
+                    pb.Metadata.Add(BlazorMetadata.Component.GenericTypedKey, bool.TrueString);
+                }
+
+                var xml = property.GetDocumentationCommentXml();
+                if (!string.IsNullOrEmpty(xml))
+                {
+                    pb.Documentation = xml;
+                }
+            });
+
+            bool HasTypeParameter(ITypeSymbol type)
+            {
+                if (type is ITypeParameterSymbol)
+                {
+                    return true;
+                }
+
+                // We need to check for cases like:
+                // [Parameter] List<T> MyProperty { get; set; }
+                // AND
+                // [Parameter] List<string> MyProperty { get; set; }
+                //
+                // We need to inspect the type arguments to tell the difference between a property that
+                // uses the containing class' type parameter(s) and a vanilla usage of generic types like
+                // List<> and Dictionary<,>
+                //
+                // Since we need to handle cases like RenderFragment<List<T>>, this check must be recursive.
+                if (type is INamedTypeSymbol namedType && namedType.IsGenericType)
+                {
+                    var typeArguments = namedType.TypeArguments;
+                    for (var i = 0; i < typeArguments.Length; i++)
+                    {
+                        if (HasTypeParameter(typeArguments[i]))
+                        {
+                            return true;
+                        }
+                    }
+
+                    // Another case to handle - if the type being inspected is a nested type
+                    // inside a generic containing class. The common usage for this would be a case
+                    // where a generic templated component defines a 'context' nested class.
+                    if (namedType.ContainingType != null && HasTypeParameter(namedType.ContainingType))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
         }
 
-        // Visits top-level types and finds interface implementations.
-        internal class ComponentTypeVisitor : SymbolVisitor
+        private void CreateTypeParameterProperty(TagHelperDescriptorBuilder builder, ITypeSymbol typeParameter)
         {
-            private readonly INamedTypeSymbol _componentSymbol;
+            builder.BindAttribute(pb =>
+            {
+                pb.DisplayName = typeParameter.Name;
+                pb.Name = typeParameter.Name;
+                pb.TypeName = typeof(Type).FullName;
+                pb.SetPropertyName(typeParameter.Name);
+
+                pb.Metadata[BlazorMetadata.Component.TypeParameterKey] = bool.TrueString;
+
+                pb.Documentation = string.Format(ComponentResources.ComponentTypeParameter_Documentation, typeParameter.Name, builder.Name);
+            });
+        }
+
+        private TagHelperDescriptor CreateChildContentDescriptor(BlazorSymbols symbols, TagHelperDescriptor component, BoundAttributeDescriptor attribute)
+        {
+            var typeName = component.GetTypeName() + "." + attribute.Name;
+            var assemblyName = component.AssemblyName;
+
+            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.ChildContent.TagHelperKind, typeName, assemblyName);
+            builder.SetTypeName(typeName);
+
+            // This opts out this 'component' tag helper for any processing that's specific to the default
+            // Razor ITagHelper runtime.
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.ChildContent.RuntimeName;
+
+            // Opt out of processing as a component. We'll process this specially as part of the component's body.
+            builder.Metadata[BlazorMetadata.SpecialKindKey] = BlazorMetadata.ChildContent.TagHelperKind;
+
+            var xml = attribute.Documentation;
+            if (!string.IsNullOrEmpty(xml))
+            {
+                builder.Documentation = xml;
+            }
+
+            // Child content matches the property name, but only as a direct child of the component.
+            builder.TagMatchingRule(r =>
+            {
+                r.TagName = attribute.Name;
+                r.ParentTag = component.TagMatchingRules.First().TagName;
+            });
+
+            if (attribute.IsParameterizedChildContentProperty())
+            {
+                // For child content attributes with a parameter, synthesize an attribute that allows you to name
+                // the parameter.
+                CreateContextParameter(builder, attribute.Name);
+            }
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+
+        private void CreateContextParameter(TagHelperDescriptorBuilder builder, string childContentName)
+        {
+            builder.BindAttribute(b =>
+            {
+                b.Name = BlazorMetadata.ChildContent.ParameterAttributeName;
+                b.TypeName = typeof(string).FullName;
+                b.Metadata.Add(BlazorMetadata.Component.ChildContentParameterNameKey, bool.TrueString);
+
+                if (childContentName == null)
+                {
+                    b.Documentation = ComponentResources.ChildContentParameterName_TopLevelDocumentation;
+                }
+                else
+                {
+                    b.Documentation = string.Format(ComponentResources.ChildContentParameterName_Documentation, childContentName);
+                }
+            });
+        }
+
+        // Does a walk up the inheritance chain to determine the set of parameters by using
+        // a dictionary keyed on property name.
+        //
+        // We consider parameters to be defined by properties satisfying all of the following:
+        // - are visible (not shadowed)
+        // - have the [Parameter] attribute
+        // - have a setter, even if private
+        // - are not indexers
+        private IEnumerable<(IPropertySymbol property, PropertyKind kind)> GetProperties(BlazorSymbols symbols, INamedTypeSymbol type)
+        {
+            var properties = new Dictionary<string, (IPropertySymbol, PropertyKind)>(StringComparer.Ordinal);
+            do
+            {
+                if (type == symbols.ComponentBase)
+                {
+                    // The ComponentBase base class doesn't have any [Parameter].
+                    // Bail out now to avoid walking through its many members, plus the members
+                    // of the System.Object base class.
+                    break;
+                }
+
+                var members = type.GetMembers();
+                for (var i = 0; i < members.Length; i++)
+                {
+                    var property = members[i] as IPropertySymbol;
+                    if (property == null)
+                    {
+                        // Not a property
+                        continue;
+                    }
+
+                    if (properties.ContainsKey(property.Name))
+                    {
+                        // Not visible
+                        continue;
+                    }
+
+                    var kind = PropertyKind.Default;
+                    if (property.Parameters.Length != 0)
+                    {
+                        // Indexer
+                        kind = PropertyKind.Ignored;
+                    }
+
+                    if (property.SetMethod == null)
+                    {
+                        // No setter
+                        kind = PropertyKind.Ignored;
+                    }
+
+                    if (property.IsStatic)
+                    {
+                        kind = PropertyKind.Ignored;
+                    }
+
+                    if (!property.GetAttributes().Any(a => a.AttributeClass == symbols.ParameterAttribute))
+                    {
+                        // Does not have [Parameter]
+                        kind = PropertyKind.Ignored;
+                    }
+
+                    if (kind == PropertyKind.Default && property.Type.TypeKind == TypeKind.Enum)
+                    {
+                        kind = PropertyKind.Enum;
+                    }
+
+                    if (kind == PropertyKind.Default && property.Type == symbols.RenderFragment)
+                    {
+                        kind = PropertyKind.ChildContent;
+                    }
+
+                    if (kind == PropertyKind.Default &&
+                        property.Type is INamedTypeSymbol namedType &&
+                        namedType.IsGenericType &&
+                        namedType.ConstructedFrom == symbols.RenderFragmentOfT)
+                    {
+                        kind = PropertyKind.ChildContent;
+                    }
+
+                    if (kind == PropertyKind.Default && property.Type.TypeKind == TypeKind.Delegate)
+                    {
+                        kind = PropertyKind.Delegate;
+                    }
+
+                    properties.Add(property.Name, (property, kind));
+                }
+
+                type = type.BaseType;
+            }
+            while (type != null);
+
+            return properties.Values;
+        }
+
+        private enum PropertyKind
+        {
+            Ignored,
+            Default,
+            Enum,
+            ChildContent,
+            Delegate,
+        }
+
+        private class BlazorSymbols
+        {
+            public static BlazorSymbols Create(Compilation compilation)
+            {
+                var symbols = new BlazorSymbols();
+                symbols.ComponentBase = compilation.GetTypeByMetadataName(ComponentsApi.ComponentBase.MetadataName);
+                if (symbols.ComponentBase == null)
+                {
+                    // No definition for ComponentBase, nothing to do.
+                    return null;
+                }
+
+                symbols.IComponent = compilation.GetTypeByMetadataName(ComponentsApi.IComponent.MetadataName);
+                if (symbols.IComponent == null)
+                {
+                    // No definition for IComponent, nothing to do.
+                    return null;
+                }
+
+                symbols.ParameterAttribute = compilation.GetTypeByMetadataName(ComponentsApi.ParameterAttribute.MetadataName);
+                if (symbols.ParameterAttribute == null)
+                {
+                    // No definition for [Parameter], nothing to do.
+                    return null;
+                }
+
+                symbols.RenderFragment = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragment.MetadataName);
+                if (symbols.RenderFragment == null)
+                {
+                    // No definition for RenderFragment, nothing to do.
+                }
+
+                symbols.RenderFragmentOfT = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragmentOfT.MetadataName);
+                if (symbols.RenderFragmentOfT == null)
+                {
+                    // No definition for RenderFragment, nothing to do.
+                }
+
+                return symbols;
+            }
+
+            private BlazorSymbols()
+            {
+            }
+
+            public INamedTypeSymbol ComponentBase { get; private set; }
+
+            public INamedTypeSymbol IComponent { get; private set; }
+
+            public INamedTypeSymbol ParameterAttribute { get; private set; }
+
+            public INamedTypeSymbol RenderFragment { get; private set; }
+
+            public INamedTypeSymbol RenderFragmentOfT { get; private set; }
+        }
+
+        private class ComponentTypeVisitor : SymbolVisitor
+        {
+            private readonly BlazorSymbols _symbols;
             private readonly List<INamedTypeSymbol> _results;
 
-            public ComponentTypeVisitor(INamedTypeSymbol componentSymbol, List<INamedTypeSymbol> results)
+            public ComponentTypeVisitor(BlazorSymbols symbols, List<INamedTypeSymbol> results)
             {
-                _componentSymbol = componentSymbol;
+                _symbols = symbols;
                 _results = results;
             }
 
@@ -122,11 +487,16 @@ namespace Microsoft.CodeAnalysis.Razor
 
             internal bool IsComponent(INamedTypeSymbol symbol)
             {
+                if (_symbols == null)
+                {
+                    return false;
+                }
+
                 return
                     symbol.DeclaredAccessibility == Accessibility.Public &&
                     !symbol.IsAbstract &&
-                    symbol.AllInterfaces.Contains(_componentSymbol);
+                    symbol.AllInterfaces.Contains(_symbols.IComponent);
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTypeNameFeature.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTypeNameFeature.cs
new file mode 100644
index 0000000000..fa8bd25e27
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTypeNameFeature.cs
@@ -0,0 +1,56 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class DefaultTypeNameFeature : TypeNameFeature
+    {
+        public override IReadOnlyList<string> ParseTypeParameters(string typeName)
+        {
+            if (typeName == null)
+            {
+                throw new ArgumentNullException(nameof(typeName));
+            }
+
+            var parsed = SyntaxFactory.ParseTypeName(typeName);
+            if (parsed is IdentifierNameSyntax identifier)
+            {
+                return Array.Empty<string>();
+            }
+            else
+            {
+                return parsed.DescendantNodesAndSelf()
+                    .OfType<TypeArgumentListSyntax>()
+                    .SelectMany(arg => arg.Arguments)
+                    .Select(a => a.ToString()).ToList();        
+            }
+        }
+
+        public override TypeNameRewriter CreateGenericTypeRewriter(Dictionary<string, string> bindings)
+        {
+            if (bindings == null)
+            {
+                throw new ArgumentNullException(nameof(bindings));
+            }
+
+            return new GenericTypeNameRewriter(bindings);
+        }
+
+        public override TypeNameRewriter CreateGlobalQualifiedTypeNameRewriter(ICollection<string> ignore)
+        {
+            if (ignore == null)
+            {
+                throw new ArgumentNullException(nameof(ignore));
+            }
+
+            return new GlobalQualifiedTypeNameRewriter(ignore);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..b86485a615
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -0,0 +1,218 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class EventHandlerTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public RazorEngine Engine { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                return;
+            }
+
+            var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName);
+            if (bindMethods == null)
+            {
+                // If we can't find BindMethods, then just bail. We won't be able to compile the
+                // generated code anyway.
+                return;
+            }
+
+
+            var eventHandlerData = GetEventHandlerData(compilation);
+
+            foreach (var tagHelper in CreateEventHandlerTagHelpers(eventHandlerData))
+            {
+                context.Results.Add(tagHelper);
+            }
+        }
+
+        private List<EventHandlerData> GetEventHandlerData(Compilation compilation)
+        {
+            var eventHandlerAttribute = compilation.GetTypeByMetadataName(ComponentsApi.EventHandlerAttribute.FullTypeName);
+            if (eventHandlerAttribute == null)
+            {
+                // This won't likely happen, but just in case.
+                return new List<EventHandlerData>();
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new EventHandlerDataVisitor(types);
+
+            // Visit the primary output of this compilation, as well as all references.
+            visitor.Visit(compilation.Assembly);
+            foreach (var reference in compilation.References)
+            {
+                // We ignore .netmodules here - there really isn't a case where they are used by user code
+                // even though the Roslyn APIs all support them.
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    visitor.Visit(assembly);
+                }
+            }
+
+            var results = new List<EventHandlerData>();
+
+            for (var i = 0; i < types.Count; i++)
+            {
+                var type = types[i];
+                var attributes = type.GetAttributes();
+
+                // Not handling duplicates here for now since we're the primary ones extending this.
+                // If we see users adding to the set of event handler constructs we will want to add deduplication
+                // and potentially diagnostics.
+                for (var j = 0; j < attributes.Length; j++)
+                {
+                    var attribute = attributes[j];
+
+                    if (attribute.AttributeClass == eventHandlerAttribute)
+                    {
+                        results.Add(new EventHandlerData(
+                            type.ContainingAssembly.Name,
+                            type.ToDisplayString(),
+                            (string)attribute.ConstructorArguments[0].Value,
+                            (INamedTypeSymbol)attribute.ConstructorArguments[1].Value));
+                    }
+                }
+            }
+
+            return results;
+        }
+
+        private List<TagHelperDescriptor> CreateEventHandlerTagHelpers(List<EventHandlerData> data)
+        {
+            var results = new List<TagHelperDescriptor>();
+
+            for (var i = 0; i < data.Count; i++)
+            {
+                var entry = data[i];
+
+                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.EventHandler.TagHelperKind, entry.Attribute, entry.Assembly);
+                builder.Documentation = string.Format(
+                    ComponentResources.EventHandlerTagHelper_Documentation,
+                    entry.Attribute,
+                    entry.EventArgsType.ToDisplayString());
+
+                builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.EventHandler.TagHelperKind);
+                builder.Metadata.Add(BlazorMetadata.EventHandler.EventArgsType, entry.EventArgsType.ToDisplayString());
+                builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.EventHandler.RuntimeName;
+
+                // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the tooltips.
+                builder.SetTypeName(entry.TypeName);
+
+                builder.TagMatchingRule(rule =>
+                {
+                    rule.TagName = "*";
+
+                    rule.Attribute(a =>
+                    {
+                        a.Name = entry.Attribute;
+                        a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                    });
+                });
+
+                builder.BindAttribute(a =>
+                {
+                    a.Documentation = string.Format(
+                        ComponentResources.EventHandlerTagHelper_Documentation,
+                        entry.Attribute,
+                        entry.EventArgsType.ToDisplayString());
+
+                    a.Name = entry.Attribute;
+
+                    // Use a string here so that we get HTML context by default.
+                    a.TypeName = typeof(string).FullName;
+
+                    // But make this weakly typed (don't type check) - delegates have their own type-checking
+                    // logic that we don't want to interfere with.
+                    a.Metadata.Add(BlazorMetadata.Component.WeaklyTypedKey, bool.TrueString);
+
+                    // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                    // a C# property will crash trying to create the tooltips.
+                    a.SetPropertyName(entry.Attribute);
+                });
+
+                results.Add(builder.Build());
+            }
+
+            return results;
+        }
+
+        private struct EventHandlerData
+        {
+            public EventHandlerData(
+                string assembly,
+                string typeName,
+                string element,
+                INamedTypeSymbol eventArgsType)
+            {
+                Assembly = assembly;
+                TypeName = typeName;
+                Attribute = element;
+                EventArgsType = eventArgsType;
+            }
+
+            public string Assembly { get; }
+
+            public string TypeName { get; }
+
+            public string Attribute { get; }
+
+            public INamedTypeSymbol EventArgsType { get; }
+        }
+
+        private class EventHandlerDataVisitor : SymbolVisitor
+        {
+            private List<INamedTypeSymbol> _results;
+
+            public EventHandlerDataVisitor(List<INamedTypeSymbol> results)
+            {
+                _results = results;
+            }
+
+            public override void VisitNamedType(INamedTypeSymbol symbol)
+            {
+                if (symbol.Name == "EventHandlers" && symbol.DeclaredAccessibility == Accessibility.Public)
+                {
+                    _results.Add(symbol);
+                }
+            }
+
+            public override void VisitNamespace(INamespaceSymbol symbol)
+            {
+                foreach (var member in symbol.GetMembers())
+                {
+                    Visit(member);
+                }
+            }
+
+            public override void VisitAssembly(IAssemblySymbol symbol)
+            {
+                // This as a simple yet high-value optimization that excludes the vast majority of
+                // assemblies that (by definition) can't contain a component.
+                if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal))
+                {
+                    Visit(symbol.GlobalNamespace);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/GenericTypeNameRewriter.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/GenericTypeNameRewriter.cs
new file mode 100644
index 0000000000..f1b13b728a
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/GenericTypeNameRewriter.cs
@@ -0,0 +1,70 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class GenericTypeNameRewriter : TypeNameRewriter
+    {
+        private readonly Dictionary<string, string> _bindings;
+
+        public GenericTypeNameRewriter(Dictionary<string, string> bindings)
+        {
+            _bindings = bindings;
+        }
+
+        public override string Rewrite(string typeName)
+        {
+            var parsed = SyntaxFactory.ParseTypeName(typeName);
+            var rewritten = (TypeSyntax)new Visitor(_bindings).Visit(parsed);
+            return rewritten.ToFullString();
+        }
+
+        private class Visitor : CSharpSyntaxRewriter
+        {
+            private readonly Dictionary<string, string> _bindings;
+
+            public Visitor(Dictionary<string, string> bindings)
+            {
+                _bindings = bindings;
+            }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                // We can handle a single IdentifierNameSyntax at the top level (like 'TItem)
+                // OR a GenericNameSyntax recursively (like `List<T>`)
+                if (node is IdentifierNameSyntax identifier && !(identifier.Parent is QualifiedNameSyntax))
+                {
+                    if (_bindings.TryGetValue(identifier.Identifier.Text, out var binding))
+                    {
+                        // If we don't have a valid replacement, use object. This will make the code at least reasonable
+                        // compared to leaving the type parameter in place.
+                        //
+                        // We add our own diagnostics for missing/invalid type parameters anyway.
+                        var replacement = binding == null ? typeof(object).FullName : binding;
+                        return identifier.Update(SyntaxFactory.Identifier(replacement));
+                    }
+                }
+
+                return base.Visit(node);
+            }
+
+            public override SyntaxNode VisitGenericName(GenericNameSyntax node)
+            {
+                var args = node.TypeArgumentList.Arguments;
+                for (var i = 0; i < args.Count; i++)
+                {
+                    var typeArgument = args[i];
+                    args = args.Replace(typeArgument, (TypeSyntax)Visit(typeArgument));
+                }
+
+                return node.WithTypeArgumentList(node.TypeArgumentList.WithArguments(args));
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/GlobalQualifiedTypeNameRewriter.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/GlobalQualifiedTypeNameRewriter.cs
new file mode 100644
index 0000000000..6796f269ac
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/GlobalQualifiedTypeNameRewriter.cs
@@ -0,0 +1,79 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    // Rewrites type names to use the 'global::' prefix for identifiers.
+    //
+    // This is useful when we're generating code in a different namespace than
+    // what the user code lives in. When we synthesize a namespace it's easy to have
+    // clashes.
+    internal class GlobalQualifiedTypeNameRewriter : TypeNameRewriter
+    {
+        // List of names to ignore.
+        //
+        // NOTE: this is the list of type parameters defined on the component.
+        private readonly HashSet<string> _ignore;
+
+        public GlobalQualifiedTypeNameRewriter(ICollection<string> ignore)
+        {
+            _ignore = new HashSet<string>(ignore);
+        }
+
+        public override string Rewrite(string typeName)
+        {
+            var parsed = SyntaxFactory.ParseTypeName(typeName);
+            var rewritten = (TypeSyntax)new Visitor(_ignore).Visit(parsed);
+            return rewritten.ToFullString();
+        }
+
+        private class Visitor : CSharpSyntaxRewriter
+        {
+            private readonly HashSet<string> _ignore;
+
+            public Visitor(HashSet<string> ignore)
+            {
+                _ignore = ignore;
+            }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                return base.Visit(node);
+            }
+
+            public override SyntaxNode VisitQualifiedName(QualifiedNameSyntax node)
+            {
+                if (node.Parent is QualifiedNameSyntax)
+                {
+                    return base.VisitQualifiedName(node);
+                }
+
+                // Need to rewrite postorder so we can rewrite the names of generic type arguments.
+                node = (QualifiedNameSyntax)base.VisitQualifiedName(node);
+
+                // Rewriting these is complicated, best to just tostring and parse again.
+                return SyntaxFactory.ParseTypeName("global::" + node.ToString());
+            }
+
+            public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+            {
+                if (_ignore.Contains(node.ToString()))
+                {
+                    return node;
+                }
+
+                if (node.Parent != null)
+                {
+                    return node;
+                }
+
+                return SyntaxFactory.AliasQualifiedName(SyntaxFactory.IdentifierName(SyntaxFactory.Token(CSharp.SyntaxKind.GlobalKeyword)), node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 942ae946b0..46a0ac8f50 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -3,6 +3,7 @@
 
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..858f9428d7
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -0,0 +1,62 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class RefTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+    {
+        // Run after the component tag helper provider, because later we may want component-type-specific variants of this
+        public int Order { get; set; } = 1000;
+
+        public RazorEngine Engine { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            context.Results.Add(CreateRefTagHelper());
+        }
+
+        private TagHelperDescriptor CreateRefTagHelper()
+        {
+            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName);
+            builder.Documentation = ComponentResources.RefTagHelper_Documentation;
+
+            builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Ref.TagHelperKind);
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Ref.RuntimeName;
+
+            // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
+            // a C# property will crash trying to create the tooltips.
+            builder.SetTypeName("Microsoft.AspNetCore.Components.Ref");
+
+            builder.TagMatchingRule(rule =>
+            {
+                rule.TagName = "*";
+                rule.Attribute(attribute =>
+                {
+                    attribute.Name = "ref";
+                });
+            });
+
+            builder.BindAttribute(attribute =>
+            {
+                attribute.Documentation = ComponentResources.RefTagHelper_Documentation;
+                attribute.Name = "ref";
+
+                // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the tooltips.
+                attribute.SetPropertyName("Ref");
+                attribute.TypeName = typeof(object).FullName;
+            });
+
+            return builder.Build();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..fdabc4c11d
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public abstract class BaseTagHelperDescriptorProviderTest
+    {
+        static BaseTagHelperDescriptorProviderTest()
+        {
+            BaseCompilation = TestCompilation.Create(typeof(ComponentTagHelperDescriptorProviderTest).Assembly);
+            CSharpParseOptions = new CSharpParseOptions(LanguageVersion.CSharp7_3);
+        }
+
+        protected static Compilation BaseCompilation { get; }
+
+        protected static CSharpParseOptions CSharpParseOptions { get; }
+
+        protected static CSharpSyntaxTree Parse(string text)
+        {
+            return (CSharpSyntaxTree)CSharpSyntaxTree.ParseText(text, CSharpParseOptions);
+        }
+
+        // For simplicity in testing, exclude the built-in components. We'll add more and we
+        // don't want to update the tests when that happens.
+        protected static TagHelperDescriptor[] ExcludeBuiltInComponents(TagHelperDescriptorProviderContext context)
+        {
+            return context.Results
+                .Where(c => c.AssemblyName == "TestAssembly")
+                .OrderBy(c => c.Name)
+                .ToArray();
+        }
+
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..4797ebfe5d
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,683 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class BindTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void Execute_FindsBindTagHelperOnComponentType_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : IComponent
+    {
+        public void Init(RenderHandle renderHandle) { }
+
+        public void SetParameters(ParameterCollection parameters) { }
+
+        [Parameter]
+        string MyProperty { get; set; }
+
+        [Parameter]
+        Action<string> MyPropertyChanged { get; set; }
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            // We run after component discovery and depend on the results.
+            var componentProvider = new ComponentTagHelperDescriptorProvider();
+            componentProvider.Execute(context);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            // These are features Bind Tags Helpers don't use. Verifying them once here and
+            // then ignoring them.
+            Assert.Empty(bind.AllowedChildTags);
+            Assert.Null(bind.TagOutputHint);
+
+            // These are features that are invariants of all Bind Tag Helpers. Verifying them once
+            // here and then ignoring them.
+            Assert.Empty(bind.Diagnostics);
+            Assert.False(bind.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(bind.IsDefaultKind());
+            Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal("MyProperty", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("MyPropertyChanged", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+
+            Assert.Equal(
+                "Binds the provided expression to the 'MyProperty' property and a change event " +
+                    "delegate to the 'MyPropertyChanged' property of the component.",
+                bind.Documentation);
+
+            // These are all trivially derived from the assembly/namespace/type name
+            Assert.Equal("TestAssembly", bind.AssemblyName);
+            Assert.Equal("Test.MyComponent", bind.Name);
+            Assert.Equal("Test.MyComponent", bind.DisplayName);
+            Assert.Equal("Test.MyComponent", bind.GetTypeName());
+
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("MyComponent", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("bind-MyProperty", requiredAttribute.DisplayName);
+            Assert.Equal("bind-MyProperty", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(bind.BoundAttributes);
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Binds the provided expression to the 'MyProperty' property and a change event " +
+                    "delegate to the 'MyPropertyChanged' property of the component.",
+                attribute.Documentation);
+
+            Assert.Equal("bind-MyProperty", attribute.Name);
+            Assert.Equal("MyProperty", attribute.GetPropertyName());
+            Assert.Equal("string Test.MyComponent.MyProperty", attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.String", attribute.TypeName);
+            Assert.True(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+
+        [Fact]
+        public void Execute_NoMatchedPropertiesOnComponent_IgnoresComponent()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : IComponent
+    {
+        public void Init(RenderHandle renderHandle) { }
+
+        public void SetParameters(ParameterCollection parameters) { }
+
+        public string MyProperty { get; set; }
+
+        public Action<string> MyPropertyChangedNotMatch { get; set; }
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            // We run after component discovery and depend on the results.
+            var componentProvider = new ComponentTagHelperDescriptorProvider();
+            componentProvider.Execute(context);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            Assert.Empty(matches);
+        }
+
+        [Fact]
+        public void Execute_BindOnElement_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", null, ""myprop"", ""myevent"")]
+    public class BindAttributes
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            // These are features Bind Tags Helpers don't use. Verifying them once here and
+            // then ignoring them.
+            Assert.Empty(bind.AllowedChildTags);
+            Assert.Null(bind.TagOutputHint);
+
+            // These are features that are invariants of all Bind Tag Helpers. Verifying them once
+            // here and then ignoring them.
+            Assert.Empty(bind.Diagnostics);
+            Assert.False(bind.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(bind.IsDefaultKind());
+            Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.False(bind.IsInputElementBindTagHelper());
+            Assert.False(bind.IsInputElementFallbackBindTagHelper());
+
+            Assert.Equal(
+                "Binds the provided expression to the 'myprop' attribute and a change event " +
+                    "delegate to the 'myevent' attribute.",
+                bind.Documentation);
+
+            // These are all trivially derived from the assembly/namespace/type name
+            Assert.Equal("TestAssembly", bind.AssemblyName);
+            Assert.Equal("Bind", bind.Name);
+            Assert.Equal("Test.BindAttributes", bind.DisplayName);
+            Assert.Equal("Test.BindAttributes", bind.GetTypeName());
+
+            // The tag matching rule for a bind-Component is always the component name + the attribute name
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("div", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("bind", requiredAttribute.DisplayName);
+            Assert.Equal("bind", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Binds the provided expression to the 'myprop' attribute and a change event " +
+                    "delegate to the 'myevent' attribute.",
+                attribute.Documentation);
+
+            Assert.Equal("bind", attribute.Name);
+            Assert.Equal("Bind", attribute.GetPropertyName());
+            Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.Object", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+
+            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Specifies a format to convert the value specified by the 'bind' attribute. " + 
+                "The format string can currently only be used with expressions of type <code>DateTime</code>.",
+                attribute.Documentation);
+
+            Assert.Equal("format-myprop", attribute.Name);
+            Assert.Equal("Format_myprop", attribute.GetPropertyName());
+            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.String", attribute.TypeName);
+            Assert.True(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+
+        [Fact]
+        public void Execute_BindOnElementWithSuffix_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""myprop"", ""myprop"", ""myevent"")]
+    public class BindAttributes
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.False(bind.IsInputElementBindTagHelper());
+            Assert.False(bind.IsInputElementFallbackBindTagHelper());
+
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Equal("div", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Equal("bind-myprop", requiredAttribute.DisplayName);
+            Assert.Equal("bind-myprop", requiredAttribute.Name);
+
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+            Assert.Equal("bind-myprop", attribute.Name);
+            Assert.Equal("Bind_myprop", attribute.GetPropertyName());
+            Assert.Equal("object Test.BindAttributes.Bind_myprop", attribute.DisplayName);
+
+            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+            Assert.Equal("format-myprop", attribute.Name);
+            Assert.Equal("Format_myprop", attribute.GetPropertyName());
+            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+        }
+
+        [Fact]
+        public void Execute_BindOnInputElementWithoutTypeAttribute_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(null, null, ""myprop"", ""myevent"")]
+    public class BindAttributes
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.False(bind.Metadata.ContainsKey(BlazorMetadata.Bind.TypeAttribute));
+            Assert.True(bind.IsInputElementBindTagHelper());
+            Assert.True(bind.IsInputElementFallbackBindTagHelper());
+
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Equal("input", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Equal("bind", requiredAttribute.DisplayName);
+            Assert.Equal("bind", requiredAttribute.Name);
+
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+            Assert.Equal("bind", attribute.Name);
+            Assert.Equal("Bind", attribute.GetPropertyName());
+            Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
+
+            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+            Assert.Equal("format-myprop", attribute.Name);
+            Assert.Equal("Format_myprop", attribute.GetPropertyName());
+            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+        }
+
+        [Fact]
+        public void Execute_BindOnInputElementWithTypeAttribute_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""checkbox"", null, ""myprop"", ""myevent"")]
+    public class BindAttributes
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("checkbox", bind.Metadata[BlazorMetadata.Bind.TypeAttribute]);
+            Assert.True(bind.IsInputElementBindTagHelper());
+            Assert.False(bind.IsInputElementFallbackBindTagHelper());
+
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Equal("input", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            Assert.Collection(
+                rule.Attributes,
+                a =>
+                {
+                    Assert.Equal("type", a.DisplayName);
+                    Assert.Equal("type", a.Name);
+                    Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, a.NameComparison);
+                    Assert.Equal("checkbox", a.Value);
+                    Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch, a.ValueComparison);
+                },
+                a =>
+                {
+                    Assert.Equal("bind", a.DisplayName);
+                    Assert.Equal("bind", a.Name);
+                });
+
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+            Assert.Equal("bind", attribute.Name);
+            Assert.Equal("Bind", attribute.GetPropertyName());
+            Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
+
+            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+            Assert.Equal("format-myprop", attribute.Name);
+            Assert.Equal("Format_myprop", attribute.GetPropertyName());
+            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+        }
+
+        [Fact]
+        public void Execute_BindOnInputElementWithTypeAttributeAndSuffix_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""checkbox"", ""somevalue"", ""myprop"", ""myevent"")]
+    public class BindAttributes
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("checkbox", bind.Metadata[BlazorMetadata.Bind.TypeAttribute]);
+            Assert.True(bind.IsInputElementBindTagHelper());
+            Assert.False(bind.IsInputElementFallbackBindTagHelper());
+
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Equal("input", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            Assert.Collection(
+                rule.Attributes,
+                a =>
+                {
+                    Assert.Equal("type", a.DisplayName);
+                    Assert.Equal("type", a.Name);
+                    Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, a.NameComparison);
+                    Assert.Equal("checkbox", a.Value);
+                    Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch, a.ValueComparison);
+                },
+                a =>
+                {
+                    Assert.Equal("bind-somevalue", a.DisplayName);
+                    Assert.Equal("bind-somevalue", a.Name);
+                });
+
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+            Assert.Equal("bind-somevalue", attribute.Name);
+            Assert.Equal("Bind_somevalue", attribute.GetPropertyName());
+            Assert.Equal("object Test.BindAttributes.Bind_somevalue", attribute.DisplayName);
+
+            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+            Assert.Equal("format-somevalue", attribute.Name);
+            Assert.Equal("Format_somevalue", attribute.GetPropertyName());
+            Assert.Equal("string Test.BindAttributes.Format_somevalue", attribute.DisplayName);
+        }
+
+        [Fact]
+        public void Execute_BindFallback_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation;
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var bind = Assert.Single(context.Results, r => r.IsFallbackBindTagHelper());
+
+            // These are features Bind Tags Helpers don't use. Verifying them once here and
+            // then ignoring them.
+            Assert.Empty(bind.AllowedChildTags);
+            Assert.Null(bind.TagOutputHint);
+
+            // These are features that are invariants of all Bind Tag Helpers. Verifying them once
+            // here and then ignoring them.
+            Assert.Empty(bind.Diagnostics);
+            Assert.False(bind.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(bind.IsDefaultKind());
+            Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+
+            Assert.False(bind.Metadata.ContainsKey(BlazorMetadata.Bind.ValueAttribute));
+            Assert.False(bind.Metadata.ContainsKey(BlazorMetadata.Bind.ChangeAttribute));
+            Assert.True(bind.IsFallbackBindTagHelper());
+
+            Assert.Equal(
+                "Binds the provided expression to an attribute and a change event, based on the naming of " +
+                    "the bind attribute. For example: <code>bind-value-onchange=\"...\"</code> will assign the " +
+                    "current value of the expression to the 'value' attribute, and assign a delegate that attempts " +
+                    "to set the value to the 'onchange' attribute.",
+                bind.Documentation);
+
+            // These are all trivially derived from the assembly/namespace/type name
+            Assert.Equal("Microsoft.AspNetCore.Components", bind.AssemblyName);
+            Assert.Equal("Bind", bind.Name);
+            Assert.Equal("Microsoft.AspNetCore.Components.Bind", bind.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.Bind", bind.GetTypeName());
+
+            // The tag matching rule for a bind-Component is always the component name + the attribute name
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("*", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("bind-...", requiredAttribute.DisplayName);
+            Assert.Equal("bind-", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.True(attribute.HasIndexer);
+            Assert.Equal("bind-", attribute.IndexerNamePrefix);
+            Assert.Equal("System.Object", attribute.IndexerTypeName);
+
+            Assert.Equal(
+                "Binds the provided expression to an attribute and a change event, based on the naming of " +
+                    "the bind attribute. For example: <code>bind-value-onchange=\"...\"</code> will assign the " +
+                    "current value of the expression to the 'value' attribute, and assign a delegate that attempts " +
+                    "to set the value to the 'onchange' attribute.",
+                attribute.Documentation);
+
+            Assert.Equal("bind-...", attribute.Name);
+            Assert.Equal("Bind", attribute.GetPropertyName());
+            Assert.Equal(
+                "System.Collections.Generic.Dictionary<string, object> Microsoft.AspNetCore.Components.Bind.Bind",
+                attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.Collections.Generic.Dictionary<string, object>", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+
+            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.True(attribute.HasIndexer);
+            Assert.Equal("format-", attribute.IndexerNamePrefix);
+            Assert.Equal("System.String", attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.True(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Specifies a format to convert the value specified by the corresponding bind attribute. " +
+                    "For example: <code>format-value=\"...\"</code> will apply a format string to the value " +
+                    "specified in <code>bind-value-...</code>. The format string can currently only be used with " +
+                    "expressions of type <code>DateTime</code>.",
+                attribute.Documentation);
+
+            Assert.Equal("format-...", attribute.Name);
+            Assert.Equal("Format", attribute.GetPropertyName());
+            Assert.Equal(
+                "System.Collections.Generic.Dictionary<string, string> Microsoft.AspNetCore.Components.Bind.Format",
+                attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.Collections.Generic.Dictionary<string, string>", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+
+
+        private static TagHelperDescriptor[] GetBindTagHelpers(TagHelperDescriptorProviderContext context)
+        {
+            return ExcludeBuiltInComponents(context).Where(t => t.IsBindTagHelper()).ToArray();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..52752cf28b
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,1243 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class ComponentTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void Execute_FindsIComponentType_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : IComponent
+    {
+        public void Init(RenderHandle renderHandle) { }
+
+        public void SetParameters(ParameterCollection parameters) { }
+
+        [Parameter]
+        private string MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            // These are features Components don't use. Verifying them once here and
+            // then ignoring them.
+            Assert.Empty(component.AllowedChildTags);
+            Assert.Null(component.TagOutputHint);
+
+            // These are features that are invariants of all Components. Verifying them once
+            // here and then ignoring them.
+            Assert.Empty(component.Diagnostics);
+            Assert.False(component.HasErrors);
+            Assert.Equal(BlazorMetadata.Component.TagHelperKind, component.Kind);
+            Assert.False(component.IsDefaultKind());
+            Assert.False(component.KindUsesDefaultTagHelperRuntime());
+
+            // No documentation in this test
+            Assert.Null(component.Documentation);
+
+            // These are all trivially derived from the assembly/namespace/type name
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+            Assert.Equal("Test.MyComponent", component.DisplayName);
+            Assert.Equal("Test.MyComponent", component.GetTypeName());
+
+            // Our use of matching rules is also very simple, and derived from the name. Verifying
+            // it once in detail here and then ignoring it.
+            var rule = Assert.Single(component.TagMatchingRules);
+            Assert.Empty(rule.Attributes);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("MyComponent", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            // Our use of metadata is also (for now) an invariant for all Components - other than the type name
+            // which is trivial. Verifying it once in detail and then ignoring it.
+            Assert.Collection(
+                component.Metadata.OrderBy(kvp => kvp.Key),
+                kvp => { Assert.Equal(TagHelperMetadata.Common.TypeName, kvp.Key); Assert.Equal("Test.MyComponent", kvp.Value); },
+                kvp => { Assert.Equal(TagHelperMetadata.Runtime.Name, kvp.Key); Assert.Equal("Blazor.IComponent", kvp.Value); });
+
+            // Our use of bound attributes is what tests will focus on. As you might expect right now, this test
+            // is going to cover a lot of trivial stuff that will be true for all components/component-properties.
+            var attribute = Assert.Single(component.BoundAttributes);
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal("Blazor.Component", attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+
+            // Related to dictionaries/indexers, not supported currently, not sure if we ever will
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            // No documentation in this test
+            Assert.Null(attribute.Documentation);
+
+            // Names are trivially derived from the property name
+            Assert.Equal("MyProperty", attribute.Name);
+            Assert.Equal("MyProperty", attribute.GetPropertyName());
+            Assert.Equal("string Test.MyComponent.MyProperty", attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.String", attribute.TypeName);
+            Assert.True(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+
+            // Our use of metadata is also (for now) an invariant for all Component properties - other than the type name
+            // which is trivial. Verifying it once in detail and then ignoring it.
+            Assert.Collection(
+                attribute.Metadata.OrderBy(kvp => kvp.Key),
+                kvp => { Assert.Equal(TagHelperMetadata.Common.PropertyName, kvp.Key); Assert.Equal("MyProperty", kvp.Value); });
+        }
+
+        [Fact]
+        public void Execute_FindsIComponentType_CreatesDescriptor_Generic()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : IComponent
+    {
+        public void Init(RenderHandle renderHandle) { }
+
+        public void SetParameters(ParameterCollection parameters) { }
+
+        [Parameter]
+        private string MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+            Assert.Equal("Test.MyComponent<T>", component.DisplayName);
+            Assert.Equal("Test.MyComponent<T>", component.GetTypeName());
+
+            Assert.True(component.IsGenericTypedComponent());
+
+            var rule = Assert.Single(component.TagMatchingRules);
+            Assert.Equal("MyComponent", rule.TagName);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("MyProperty", a.Name);
+                    Assert.Equal("MyProperty", a.GetPropertyName());
+                    Assert.Equal("string Test.MyComponent<T>.MyProperty", a.DisplayName);
+                    Assert.Equal("System.String", a.TypeName);
+
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+        }
+
+        [Fact]
+        public void Execute_FindsBlazorComponentType_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        string MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            var attribute = Assert.Single(component.BoundAttributes);
+            Assert.Equal("MyProperty", attribute.Name);
+            Assert.Equal("System.String", attribute.TypeName);
+        }
+
+        [Fact] // bool properties support minimized attributes
+        public void Execute_BoolProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        bool MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            var attribute = Assert.Single(component.BoundAttributes);
+            Assert.Equal("MyProperty", attribute.Name);
+            Assert.Equal("System.Boolean", attribute.TypeName);
+
+            Assert.False(attribute.HasIndexer);
+            Assert.True(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+            Assert.False(attribute.IsStringProperty);
+        }
+
+        [Fact] // enum properties have some special intellisense behavior
+        public void Execute_EnumProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public enum MyEnum
+    {
+        One,
+        Two
+    }
+
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        MyEnum MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            var attribute = Assert.Single(component.BoundAttributes);
+            Assert.Equal("MyProperty", attribute.Name);
+            Assert.Equal("Test.MyEnum", attribute.TypeName);
+
+            Assert.False(attribute.HasIndexer);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.True(attribute.IsEnum);
+            Assert.False(attribute.IsStringProperty);
+        }
+
+        [Fact]
+        public void Execute_GenericProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        T MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("MyProperty", a.Name);
+                    Assert.Equal("MyProperty", a.GetPropertyName());
+                    Assert.Equal("T Test.MyComponent<T>.MyProperty", a.DisplayName);
+                    Assert.Equal("T", a.TypeName);
+                    Assert.True(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+        }
+
+        [Fact]
+        public void Execute_MultipleGenerics_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T, U, V> : ComponentBase
+    {
+        [Parameter]
+        T MyProperty1 { get; set; }
+
+        [Parameter]
+        U MyProperty2 { get; set; }
+
+        [Parameter]
+        V MyProperty3 { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T, U, V>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("MyProperty1", a.Name);
+                    Assert.Equal("T", a.TypeName);
+                    Assert.True(a.IsGenericTypedProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("MyProperty2", a.Name);
+                    Assert.Equal("U", a.TypeName);
+                    Assert.True(a.IsGenericTypedProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("MyProperty3", a.Name);
+                    Assert.Equal("V", a.TypeName);
+                    Assert.True(a.IsGenericTypedProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.True(a.IsTypeParameterProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("U", a.Name);
+                    Assert.True(a.IsTypeParameterProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("V", a.Name);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+        }
+
+        [Fact]
+        public void Execute_DelegateProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        Action<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            var attribute = Assert.Single(component.BoundAttributes);
+            Assert.Equal("OnClick", attribute.Name);
+            Assert.Equal("System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>", attribute.TypeName);
+
+            Assert.False(attribute.HasIndexer);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+            Assert.False(attribute.IsStringProperty);
+            Assert.True(attribute.IsDelegateProperty());
+            Assert.False(attribute.IsChildContentProperty());
+        }
+
+        [Fact]
+        public void Execute_DelegateProperty_CreatesDescriptor_Generic()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        Action<T> OnClick { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("OnClick", a.Name);
+                    Assert.Equal("System.Action<T>", a.TypeName);
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.True(a.IsDelegateProperty());
+                    Assert.False(a.IsChildContentProperty());
+                    Assert.True(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentProperty_CreatesDescriptors()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment ChildContent2 { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            var attribute = Assert.Single(component.BoundAttributes);
+            Assert.Equal("ChildContent2", attribute.Name);
+            Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", attribute.TypeName);
+
+            Assert.False(attribute.HasIndexer);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+            Assert.True(attribute.IsChildContentProperty());
+            Assert.False(attribute.IsParameterizedChildContentProperty());
+
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent.ChildContent2", childContent.Name);
+
+            Assert.Empty(childContent.BoundAttributes);
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentOfTProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<string> ChildContent2 { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes,
+                a =>
+                {
+                    Assert.Equal("ChildContent2", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<System.String>", a.TypeName);
+
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.False(a.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+                    Assert.True(a.IsChildContentProperty());
+                    Assert.True(a.IsParameterizedChildContentProperty());
+                    Assert.False(a.IsGenericTypedProperty());
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.True(a.IsChildContentParameterNameProperty());
+                });
+
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent.ChildContent2", childContent.Name);
+
+            // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
+            var contextAttribute = Assert.Single(childContent.BoundAttributes);
+            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal("System.String", contextAttribute.TypeName);
+            Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
+            Assert.True(contextAttribute.IsChildContentParameterNameProperty());
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentOfTProperty_ComponentDefinesContextParameter()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<string> ChildContent2 { get; set; }
+
+        [Parameter]
+        string Context { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes,
+                a =>
+                {
+                    Assert.Equal("ChildContent2", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<System.String>", a.TypeName);
+
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.False(a.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+                    Assert.True(a.IsChildContentProperty());
+                    Assert.True(a.IsParameterizedChildContentProperty());
+                    Assert.False(a.IsGenericTypedProperty());
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.False(a.IsChildContentParameterNameProperty());
+                });
+
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent.ChildContent2", childContent.Name);
+
+            // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
+            var contextAttribute = Assert.Single(childContent.BoundAttributes);
+            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal("System.String", contextAttribute.TypeName);
+            Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
+            Assert.True(contextAttribute.IsChildContentParameterNameProperty());
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentGenericProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<T> ChildContent2 { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("ChildContent2", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<T>", a.TypeName);
+
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.False(a.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+                    Assert.True(a.IsChildContentProperty());
+                    Assert.True(a.IsParameterizedChildContentProperty());
+                    Assert.True(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.True(a.IsChildContentParameterNameProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>.ChildContent2", childContent.Name);
+
+            // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
+            var contextAttribute = Assert.Single(childContent.BoundAttributes);
+            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal("System.String", contextAttribute.TypeName);
+            Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
+            Assert.True(contextAttribute.IsChildContentParameterNameProperty());
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentClosedGenericListProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<List<string>> ChildContent2 { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("ChildContent2", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<System.Collections.Generic.List<System.String>>", a.TypeName);
+
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.False(a.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+                    Assert.True(a.IsChildContentProperty());
+                    Assert.True(a.IsParameterizedChildContentProperty());
+                    Assert.False(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.True(a.IsChildContentParameterNameProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>.ChildContent2", childContent.Name);
+
+            // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
+            var contextAttribute = Assert.Single(childContent.BoundAttributes);
+            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal("System.String", contextAttribute.TypeName);
+            Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
+            Assert.True(contextAttribute.IsChildContentParameterNameProperty());
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentGenericListProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<List<T>> ChildContent2 { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("ChildContent2", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<System.Collections.Generic.List<T>>", a.TypeName);
+
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.False(a.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+                    Assert.True(a.IsChildContentProperty());
+                    Assert.True(a.IsParameterizedChildContentProperty());
+                    Assert.True(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.True(a.IsChildContentParameterNameProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+            
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>.ChildContent2", childContent.Name);
+
+            // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
+            var contextAttribute = Assert.Single(childContent.BoundAttributes);
+            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal("System.String", contextAttribute.TypeName);
+            Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
+            Assert.True(contextAttribute.IsChildContentParameterNameProperty());
+        }
+
+        [Fact]
+        public void Execute_RenderFragmentGenericContextProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<Context> ChildContent2 { get; set; }
+
+        public class Context
+        {
+            public T Item { get; set; }
+        }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("ChildContent2", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<T>.Context>", a.TypeName);
+
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.False(a.IsDelegateProperty()); // We treat RenderFragment as separate from generalized delegates
+                    Assert.True(a.IsChildContentProperty());
+                    Assert.True(a.IsParameterizedChildContentProperty());
+                    Assert.True(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.True(a.IsChildContentParameterNameProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+
+            var childContent = Assert.Single(components, c => c.IsChildContentTagHelper());
+
+            Assert.Equal("TestAssembly", childContent.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>.ChildContent2", childContent.Name);
+
+            // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
+            var contextAttribute = Assert.Single(childContent.BoundAttributes);
+            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal("System.String", contextAttribute.TypeName);
+            Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
+        }
+
+        [Fact]
+        public void Execute_MultipleRenderFragmentProperties_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment ChildContent { get; set; }
+
+        [Parameter]
+        RenderFragment<string> Header { get; set; }
+
+        [Parameter]
+        RenderFragment<string> Footer { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("ChildContent", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName);
+                    Assert.True(a.IsChildContentProperty());
+                },
+                a =>
+                {
+                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.True(a.IsChildContentParameterNameProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("Footer", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<System.String>", a.TypeName);
+                    Assert.True(a.IsChildContentProperty());
+                },
+                a =>
+                {
+                    Assert.Equal("Header", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment<System.String>", a.TypeName);
+                    Assert.True(a.IsChildContentProperty());
+                });
+
+
+            var childContents = components.Where(c => c.IsChildContentTagHelper()).OrderBy(c => c.Name);
+            Assert.Collection(
+                childContents,
+                c => Assert.Equal("Test.MyComponent.ChildContent", c.Name),
+                c => Assert.Equal("Test.MyComponent.Footer", c.Name),
+                c => Assert.Equal("Test.MyComponent.Header", c.Name));
+        }
+
+        [Fact] // This component has lots of properties that don't become components.
+        public void Execute_IgnoredProperties_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public abstract class MyBase : ComponentBase
+    {
+        [Parameter]
+        protected string Hidden { get; set; }
+    }
+
+    public class MyComponent : MyBase
+    {
+        [Parameter]
+        string NoSetter { get; }
+
+        [Parameter]
+        static string StaticProperty { get; set; }
+
+        public string NoParameterAttribute { get; set; }
+
+        // No attribute here, hides base-class property of the same name.
+        protected new int Hidden { get; set; }
+
+        public string this[int i]
+        {
+            get { throw null; }
+            set { throw null; }
+        }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Empty(component.BoundAttributes);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..760239916f
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,125 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public class EventHandlerTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void Execute_EventHandler_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [EventHandler(""onclick"", typeof(Action<UIMouseEventArgs>))]
+    public class EventHandlers
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new EventHandlerTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetEventHandlerTagHelpers(context);
+            var item = Assert.Single(matches);
+
+            // These are features Event Handler Tag Helpers don't use. Verifying them once here and
+            // then ignoring them.
+            Assert.Empty(item.AllowedChildTags);
+            Assert.Null(item.TagOutputHint);
+
+            // These are features that are invariants of all Event Handler Helpers. Verifying them once
+            // here and then ignoring them.
+            Assert.Empty(item.Diagnostics);
+            Assert.False(item.HasErrors);
+            Assert.Equal(BlazorMetadata.EventHandler.TagHelperKind, item.Kind);
+            Assert.Equal(BlazorMetadata.EventHandler.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(item.IsDefaultKind());
+            Assert.False(item.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal(
+                "Sets the 'onclick' attribute to the provided string or delegate value. " +
+                "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>'.",
+                item.Documentation);
+
+            // These are all trivially derived from the assembly/namespace/type name
+            Assert.Equal("TestAssembly", item.AssemblyName);
+            Assert.Equal("onclick", item.Name);
+            Assert.Equal("Test.EventHandlers", item.DisplayName);
+            Assert.Equal("Test.EventHandlers", item.GetTypeName());
+
+            // The tag matching rule for an event handler is just the attribute name
+            var rule = Assert.Single(item.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("*", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("onclick", requiredAttribute.DisplayName);
+            Assert.Equal("onclick", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(item.BoundAttributes);
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.EventHandler.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Collection(
+                attribute.Metadata.OrderBy(kvp => kvp.Key),
+                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>(BlazorMetadata.Component.WeaklyTypedKey, bool.TrueString)),
+                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>("Common.PropertyName", "onclick")));
+
+            Assert.Equal(
+                "Sets the 'onclick' attribute to the provided string or delegate value. " +
+                "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>'.",
+                attribute.Documentation);
+
+            Assert.Equal("onclick", attribute.Name);
+            Assert.Equal("onclick", attribute.GetPropertyName());
+            Assert.Equal("string Test.EventHandlers.onclick", attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.String", attribute.TypeName);
+            Assert.True(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+
+        private static TagHelperDescriptor[] GetEventHandlerTagHelpers(TagHelperDescriptorProviderContext context)
+        {
+            return ExcludeBuiltInComponents(context).Where(t => t.IsEventHandlerTagHelper()).ToArray();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/GenericTypeNameRewriterTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/GenericTypeNameRewriterTest.cs
new file mode 100644
index 0000000000..9dfd35dbc5
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/GenericTypeNameRewriterTest.cs
@@ -0,0 +1,44 @@
+// 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.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class GenericTypeNameRewriterTest
+    {
+        [Theory]
+        [InlineData("TItem2", "Type2")]
+
+        // Unspecified argument -> System.Object
+        [InlineData("TItem3", "System.Object")]
+
+        // Not a type parameter
+        [InlineData("TItem4", "TItem4")]
+
+        // In a qualified name, not a type parameter
+        [InlineData("TItem1.TItem2", "TItem1.TItem2")]
+
+        // Type parameters can't have type parameters
+        [InlineData("TItem1.TItem2<TItem1, TItem2, TItem3>", "TItem1.TItem2<Type1, Type2, System.Object>")]
+        [InlineData("TItem2<TItem1<TItem3>, System.TItem2, RenderFragment<List<TItem1>>", "TItem2<TItem1<System.Object>, System.TItem2, RenderFragment<List<Type1>>")]
+        public void GenericTypeNameRewriter_CanReplaceTypeParametersWithTypeArguments(string original, string expected)
+        {
+            // Arrange
+            var visitor = new GenericTypeNameRewriter(new Dictionary<string, string>()
+            {
+                { "TItem1", "Type1" },
+                { "TItem2", "Type2" },
+                { "TItem3", null },
+            });
+
+            // Act
+            var actual = visitor.Rewrite(original);
+
+            // Assert
+            Assert.Equal(expected, actual.ToString());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/GlobalQualifiedTypeNameRewriterTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/GlobalQualifiedTypeNameRewriterTest.cs
new file mode 100644
index 0000000000..26ed2e94b6
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/GlobalQualifiedTypeNameRewriterTest.cs
@@ -0,0 +1,35 @@
+// 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 Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class GlobalQualifiedTypeNameRewriterTest
+    {
+        [Theory]
+        [InlineData("String", "global::String")]
+        [InlineData("System.String", "global::System.String")]
+        [InlineData("TItem2", "TItem2")]
+        [InlineData("System.Collections.Generic.List<System.String>", "global::System.Collections.Generic.List<global::System.String>")]
+        [InlineData("System.Collections.Generic.Dictionary<System.String, TItem1>", "global::System.Collections.Generic.Dictionary<global::System.String, TItem1>")]
+        [InlineData("System.Collections.TItem3.Dictionary<System.String, TItem1>", "global::System.Collections.TItem3.Dictionary<global::System.String, TItem1>")]
+        [InlineData("System.Collections.TItem3.TItem1<System.String, TItem1>", "global::System.Collections.TItem3.TItem1<global::System.String, TItem1>")]
+
+        // This case is interesting because we know TITem2 to be a generic type parameter,
+        // and we know that this will never be valid, which is why we don't bother rewriting.
+        [InlineData("TItem2<System.String, TItem1>", "TItem2<global::System.String, TItem1>")]
+        public void GlobalQualifiedTypeNameRewriter_CanQualifyNames(string original, string expected)
+        {
+            // Arrange
+            var visitor = new GlobalQualifiedTypeNameRewriter(new[] { "TItem1", "TItem2", "TItem3" });
+
+            // Act
+            var actual = visitor.Rewrite(original);
+
+            // Assert
+            Assert.Equal(expected, actual.ToString());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..0c6939336a
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,85 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class RefTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void Execute_CreatesDescriptor()
+        {
+            // Arrange
+            var context = TagHelperDescriptorProviderContext.Create();
+            var provider = new RefTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = context.Results.Where(result => result.IsRefTagHelper());
+            var item = Assert.Single(matches);
+
+            Assert.Empty(item.AllowedChildTags);
+            Assert.Null(item.TagOutputHint);
+            Assert.Empty(item.Diagnostics);
+            Assert.False(item.HasErrors);
+            Assert.Equal(BlazorMetadata.Ref.TagHelperKind, item.Kind);
+            Assert.Equal(BlazorMetadata.Ref.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(item.IsDefaultKind());
+            Assert.False(item.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal(
+                "Populates the specified field or property with a reference to the element or component.",
+                item.Documentation);
+
+            Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName);
+            Assert.Equal("Ref", item.Name);
+            Assert.Equal("Microsoft.AspNetCore.Components.Ref", item.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.Ref", item.GetTypeName());
+
+            // The tag matching rule for a ref is just the attribute name "ref"
+            var rule = Assert.Single(item.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("*", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("ref", requiredAttribute.DisplayName);
+            Assert.Equal("ref", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(item.BoundAttributes);
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Ref.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Populates the specified field or property with a reference to the element or component.",
+                attribute.Documentation);
+
+            Assert.Equal("ref", attribute.Name);
+            Assert.Equal("Ref", attribute.GetPropertyName());
+            Assert.Equal("object Microsoft.AspNetCore.Components.Ref.Ref", attribute.DisplayName);
+            Assert.Equal("System.Object", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 2c7c8b4de2..bf1a78efca 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -48,14 +48,18 @@
       <MvcRazorExtenionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" />
+    <Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" SkipUnchangedFiles="true">
+      <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
+    </Copy>
 
     <ItemGroup>
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netstandard2.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" />
+    <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" SkipUnchangedFiles="true">
+      <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
+    </Copy>
   </Target>
 
   <Target Name="PopulateNuspec" AfterTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs
new file mode 100644
index 0000000000..710ab6c9f9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs
@@ -0,0 +1,64 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Configures options for binding specific element types.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class BindElementAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="BindElementAttribute"/>.
+        /// </summary>
+        /// <param name="element">The tag name of the element.</param>
+        /// <param name="suffix">The suffix value. For example, set this to <code>value</code> for <code>bind-value</code>, or set this to <code>null</code> for <code>bind</code>.</param>
+        /// <param name="valueAttribute">The name of the value attribute to be bound.</param>
+        /// <param name="changeAttribute">The name of an attribute that will register an associated change event.</param>
+        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute)
+        {
+            if (element == null)
+            {
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            if (valueAttribute == null)
+            {
+                throw new ArgumentNullException(nameof(valueAttribute));
+            }
+
+            if (changeAttribute == null)
+            {
+                throw new ArgumentNullException(nameof(changeAttribute));
+            }
+
+            Element = element;
+            ValueAttribute = valueAttribute;
+            ChangeAttribute = changeAttribute;
+        }
+
+        /// <summary>
+        /// Gets the tag name of the element.
+        /// </summary>
+        public string Element { get; }
+
+        /// <summary>
+        /// Gets the suffix value.
+        /// For example, this will be <code>value</code> to mean <code>bind-value</code>, or <code>null</code> to mean <code>bind</code>.
+        /// </summary>
+        public string Suffix { get; }
+
+        /// <summary>
+        /// Gets the name of the value attribute to be bound.
+        /// </summary>
+        public string ValueAttribute { get; }
+
+        /// <summary>
+        /// Gets the name of an attribute that will register an associated change event.
+        /// </summary>
+        public string ChangeAttribute { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs
new file mode 100644
index 0000000000..16c65cf536
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Configures options for binding subtypes of an HTML <code>input</code> element.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class BindInputElementAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="BindInputElementAttribute"/>.
+        /// </summary>
+        /// <param name="type">The value of the element's <code>type</code> attribute.</param>
+        /// <param name="suffix">The suffix value.</param>
+        /// <param name="valueAttribute">The name of the value attribute to be bound.</param>
+        /// <param name="changeAttribute">The name of an attribute that will register an associated change event.</param>
+        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute)
+        {
+            if (valueAttribute == null)
+            {
+                throw new ArgumentNullException(nameof(valueAttribute));
+            }
+
+            if (changeAttribute == null)
+            {
+                throw new ArgumentNullException(nameof(changeAttribute));
+            }
+
+            Type = type;
+            Suffix = suffix;
+            ValueAttribute = valueAttribute;
+            ChangeAttribute = changeAttribute;
+        }
+
+        /// <summary>
+        /// Gets the value of the element's <code>type</code> attribute.
+        /// </summary>
+        public string Type { get; }
+
+        /// <summary>
+        /// Gets the suffix value.
+        /// </summary>
+        public string Suffix { get; }
+
+        /// <summary>
+        /// Gets the name of the value attribute to be bound.
+        /// </summary>
+        public string ValueAttribute { get; }
+
+        /// <summary>
+        /// Gets the name of an attribute that will register an associated change event.
+        /// </summary>
+        public string ChangeAttribute { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
new file mode 100644
index 0000000000..1e23d5a70f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
@@ -0,0 +1,229 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Methods used internally by @bind syntax. Not intended to be used directly.
+    /// </summary>
+    public static class BindMethods
+    {
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static T GetValue<T>(T value) => value;
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static string GetValue(DateTime value, string format) =>
+            value == default ? null
+            : (format == null ? value.ToString() : value.ToString(format));
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static string GetEventHandlerValue<T>(string value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static MulticastDelegate GetEventHandlerValue<T>(Action value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static MulticastDelegate GetEventHandlerValue<T>(Func<Task> value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static MulticastDelegate GetEventHandlerValue<T>(Action<T> value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static MulticastDelegate GetEventHandlerValue<T>(Func<T, Task> value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<string> setter, string existingValue)
+        {
+            return _ => setter((string)((UIChangeEventArgs)_).Value);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<bool> setter, bool existingValue)
+        {
+            return _ => setter((bool)((UIChangeEventArgs)_).Value);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<bool?> setter, bool? existingValue)
+        {
+            return _ => setter((bool?)((UIChangeEventArgs)_).Value);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<int> setter, int existingValue)
+        {
+            return _ => setter(int.Parse((string)((UIChangeEventArgs)_).Value));
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<int?> setter, int? existingValue)
+        {
+            return _ => setter(int.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
+                ? tmpvalue
+                : (int?)null);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<long> setter, long existingValue)
+        {
+            return _ => setter(long.Parse((string)((UIChangeEventArgs)_).Value));
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<long?> setter, long? existingValue)
+        {
+            return _ => setter(long.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
+                ? tmpvalue
+                : (long?)null);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<float> setter, float existingValue)
+        {
+            return _ => setter(float.Parse((string)((UIChangeEventArgs)_).Value));
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<float?> setter, float? existingValue)
+        {
+            return _ => setter(float.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
+                ? tmpvalue
+                : (float?)null);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<double> setter, double existingValue)
+        {
+            return _ => setter(double.Parse((string)((UIChangeEventArgs)_).Value));
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<double?> setter, double? existingValue)
+        {
+            return _ => setter(double.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
+                ? tmpvalue
+                : (double?)null);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<decimal> setter, decimal existingValue)
+        {
+            return _ => setter(decimal.Parse((string)((UIChangeEventArgs)_).Value));
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<decimal?> setter, decimal? existingValue)
+        {
+            return _ => setter(decimal.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
+                ? tmpvalue
+                : (decimal?)null);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<DateTime> setter, DateTime existingValue)
+        {
+            return _ => SetDateTimeValue(setter, ((UIChangeEventArgs)_).Value, null);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler(Action<DateTime> setter, DateTime existingValue, string format)
+        {
+            return _ => SetDateTimeValue(setter, ((UIChangeEventArgs)_).Value, format);
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static Action<UIEventArgs> SetValueHandler<T>(Action<T> setter, T existingValue)
+        {
+            if (!typeof(T).IsEnum)
+            {
+                throw new ArgumentException($"'bind' does not accept values of type {typeof(T).FullName}. To read and write this value type, wrap it in a property of type string with suitable getters and setters.");
+            }
+
+            return _ =>
+            {
+                var value = (string)((UIChangeEventArgs)_).Value;
+                var parsed = (T)Enum.Parse(typeof(T), value);
+                setter(parsed);
+            };
+        }
+
+        private static void SetDateTimeValue(Action<DateTime> setter, object objValue, string format)
+        {
+            var stringValue = (string)objValue;
+            var parsedValue = string.IsNullOrEmpty(stringValue) ? default
+                : format != null && DateTime.TryParseExact(stringValue, format, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var parsedExact) ? parsedExact
+                : DateTime.Parse(stringValue);
+            setter(parsedValue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs
new file mode 100644
index 0000000000..8397d4ac12
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs
@@ -0,0 +1,45 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Associates an event argument type with an event attribute name.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public sealed class EventHandlerAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="EventHandlerAttribute"/>.
+        /// </summary>
+        /// <param name="attributeName"></param>
+        /// <param name="eventArgsType"></param>
+        public EventHandlerAttribute(string attributeName, Type eventArgsType)
+        {
+            if (attributeName == null)
+            {
+                throw new ArgumentNullException(nameof(attributeName));
+            }
+
+            if (eventArgsType == null)
+            {
+                throw new ArgumentNullException(nameof(eventArgsType));
+            }
+
+            AttributeName = attributeName;
+            EventArgsType = eventArgsType;
+        }
+
+        /// <summary>
+        /// Gets the attribute name.
+        /// </summary>
+        public string AttributeName { get; }
+
+        /// <summary>
+        /// Gets the event argument type.
+        /// </summary>
+        public Type EventArgsType { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/LayoutAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/LayoutAttribute.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/RenderFrame.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderFrame.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/RenderFrame.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderFrame.cs
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 4c86b8bd41..ca9e0ca4d7 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -12,9 +12,6 @@
     <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
   </PropertyGroup>
 
-  <!-- Import solution dependencies.props when building in place -->
-  <Import Project="..\..\build\dependencies.props" Condition="'$(BinariesRoot)'==''"/>
-
   <PropertyGroup>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>

From 45ad1c0ae80db4b13daac62b2884f5d8d53b0ccf Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 21 Dec 2018 00:38:15 -0800
Subject: [PATCH 023/337] Formalize Component node types

This change cleans up the intermediate node types that we have so far
for components and changes the naming, visibility, etc to match our
existing nodes.

The next change will integrate these types with the IR lowering process.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/34cf523c0dfe612997f366546cc044f91b8a23a7
---
 .../src/Components/BindLoweringPass.cs        |   8 +-
 .../Components/BlazorDesignTimeNodeWriter.cs  |  22 ++--
 .../Components/BlazorExtensionInitializer.cs  |   2 +-
 .../src/Components/BlazorNodeWriter.cs        |  14 +--
 .../src/Components/BlazorRuntimeNodeWriter.cs |  20 ++--
 .../Components/ChildContentDiagnosticPass.cs  |  10 +-
 .../Components/ComponentDiagnosticFactory.cs  |  10 +-
 .../src/Components/ComponentExtensionNode.cs  | 107 ------------------
 .../src/Components/ComponentLoweringPass.cs   |  20 ++--
 .../Components/EventHandlerLoweringPass.cs    |   6 +-
 .../src/Components/GenericComponentPass.cs    |  16 +--
 .../src/Components/HtmlBlockPass.cs           |  10 +-
 ...ass.cs => ReferenceCaptureLoweringPass.cs} |   8 +-
 .../src/Components/ScriptTagPass.cs           |   4 +-
 .../src/Components/TemplateDiagnosticPass.cs  |   2 +-
 .../src/Components/TrimWhitespacePass.cs      |   2 +-
 .../ComponentAttributeIntermediateNode.cs}    |  64 ++++-------
 .../ComponentChildContentIntermediateNode.cs  |  29 +++--
 .../Intermediate/ComponentIntermediateNode.cs |  58 ++++++++++
 .../ComponentTypeArgumentIntermediateNode.cs} |  30 +++--
 ...nentTypeInferenceMethodIntermediateNode.cs |  29 +++--
 .../Intermediate/IntermediateNodeVisitor.cs   |  30 +++++
 .../MarkupBlockIntermediateNode.cs}           |   8 +-
 .../MarkupElementIntermediateNode.cs}         |  12 +-
 .../ReferenceCaptureIntermediateNode.cs}      |  31 +++--
 25 files changed, 248 insertions(+), 304 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{RefLoweringPass.cs => ReferenceCaptureLoweringPass.cs} (88%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components/ComponentAttributeExtensionNode.cs => Intermediate/ComponentAttributeIntermediateNode.cs} (55%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components => Intermediate}/ComponentChildContentIntermediateNode.cs (55%)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components/ComponentTypeArgumentExtensionNode.cs => Intermediate/ComponentTypeArgumentIntermediateNode.cs} (62%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components => Intermediate}/ComponentTypeInferenceMethodIntermediateNode.cs (59%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components/HtmlBlockIntermediateNode.cs => Intermediate/MarkupBlockIntermediateNode.cs} (82%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components/HtmlElementIntermediateNode.cs => Intermediate/MarkupElementIntermediateNode.cs} (84%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components/RefExtensionNode.cs => Intermediate/ReferenceCaptureIntermediateNode.cs} (62%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
index c03cb3e707..34fdd2d26c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
@@ -262,7 +262,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
             };
 
-            if (parent is HtmlElementIntermediateNode)
+            if (parent is MarkupElementIntermediateNode)
             {
                 var valueNode = new HtmlAttributeIntermediateNode()
                 {
@@ -303,7 +303,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             else
             {
-                var valueNode = new ComponentAttributeExtensionNode(node)
+                var valueNode = new ComponentAttributeIntermediateNode(node)
                 {
                     AttributeName = valueAttributeName,
                     BoundAttribute = valueAttribute, // Might be null if it doesn't match a component attribute
@@ -319,7 +319,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     valueNode.Children[0].Children.Add(valueExpressionTokens[i]);
                 }
 
-                var changeNode = new ComponentAttributeExtensionNode(node)
+                var changeNode = new ComponentAttributeIntermediateNode(node)
                 {
                     AttributeName = changeAttributeName,
                     BoundAttribute = changeAttribute, // Might be null if it doesn't match a component attribute
@@ -412,7 +412,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             changeAttributeName = node.TagHelper.GetChangeAttributeName() ?? changeAttributeName;
 
             // We expect 0-1 components per-node.
-            var componentTagHelper = (parent as ComponentExtensionNode)?.Component;
+            var componentTagHelper = (parent as ComponentIntermediateNode)?.Component;
             if (componentTagHelper == null)
             {
                 // If it's not a component node then there isn't too much else to figure out.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
index 963ea24f44..753c220e87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         private static readonly string DesignTimeVariable = "__o";
 
-        public override void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node)
+        public override void WriteHtmlBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
         {
             if (context == null)
             {
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Do nothing
         }
 
-        public override void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node)
+        public override void WriteHtmlElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
         {
             if (context == null)
             {
@@ -329,7 +329,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 .WriteParameterSeparator();
         }
 
-        public override void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node)
+        public override void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node)
         {
             if (context == null)
             {
@@ -459,7 +459,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node)
+        public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node)
         {
             if (context == null)
             {
@@ -483,7 +483,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             context.CodeWriter.WriteLine();
         }
 
-        private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeExtensionNode node, bool canTypeCheck)
+        private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeIntermediateNode node, bool canTypeCheck)
         {
             // We limit component attributes to simple cases. However there is still a lot of complexity
             // to handle here, since there are a few different cases for how an attribute might be structured.
@@ -567,12 +567,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
             }
 
-            bool NeedsTypeCheck(ComponentAttributeExtensionNode n)
+            bool NeedsTypeCheck(ComponentAttributeIntermediateNode n)
             {
                 return n.BoundAttribute != null && !n.BoundAttribute.IsWeaklyTyped();
             }
 
-            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeExtensionNode attribute)
+            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeIntermediateNode attribute)
             {
                 // We generally expect all children to be CSharp, this is here just in case.
                 return attribute.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
@@ -623,7 +623,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             _scopeStack.CloseScope(context);
         }
 
-        public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node)
+        public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentIntermediateNode node)
         {
             if (context == null)
             {
@@ -651,7 +651,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             context.CodeWriter.Write(");");
             context.CodeWriter.WriteLine();
 
-            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentTypeArgumentExtensionNode arg)
+            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentTypeArgumentIntermediateNode arg)
             {
                 // We generally expect all children to be CSharp, this is here just in case.
                 return arg.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
@@ -678,7 +678,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             _scopeStack.CloseScope(context);
         }
 
-        public override void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node)
+        public override void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
         {
             if (context == null)
             {
@@ -696,7 +696,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             WriteReferenceCaptureInnards(context, node, shouldTypeCheck: true);
         }
 
-        protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck)
+        protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, ReferenceCaptureIntermediateNode node, bool shouldTypeCheck)
         {
             // We specialize this code based on whether or not we can type check. When we're calling into
             // a type-inferenced component, we can't do the type check. See the comments in WriteTypeInferenceMethod.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
index 9a8003de3d..6a03dc07e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
@@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             builder.Features.Add(new ComplexAttributeContentPass());
             builder.Features.Add(new ComponentLoweringPass());
             builder.Features.Add(new EventHandlerLoweringPass());
-            builder.Features.Add(new RefLoweringPass());
+            builder.Features.Add(new ReferenceCaptureLoweringPass());
             builder.Features.Add(new BindLoweringPass());
             builder.Features.Add(new TemplateDiagnosticPass());
             builder.Features.Add(new GenericComponentPass());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
index 7e3a8e199d..256ffbee8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
@@ -14,21 +14,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     {
         public abstract void BeginWriteAttribute(CodeWriter codeWriter, string key);
 
-        public abstract void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node);
+        public abstract void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node);
 
-        public abstract void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node);
+        public abstract void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node);
 
         public abstract void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node);
 
-        public abstract void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node);
+        public abstract void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentIntermediateNode node);
 
-        public abstract void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node);
+        public abstract void WriteHtmlElement(CodeRenderingContext context, MarkupElementIntermediateNode node);
 
-        public abstract void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node);
+        public abstract void WriteHtmlBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node);
 
-        public abstract void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node);
+        public abstract void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node);
 
-        protected abstract void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck);
+        protected abstract void WriteReferenceCaptureInnards(CodeRenderingContext context, ReferenceCaptureIntermediateNode node, bool shouldTypeCheck);
 
         public abstract void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
index 70a8965c18..4d7fc4db3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
@@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        public override void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node)
+        public override void WriteHtmlBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
         {
             if (context == null)
             {
@@ -165,7 +165,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 .WriteEndMethodInvocation();
         }
 
-        public override void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node)
+        public override void WriteHtmlElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
         {
             if (context == null)
             {
@@ -278,7 +278,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             context.CodeWriter.WriteUsing(node.Content, endLine: true);
         }
 
-        public override void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node)
+        public override void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node)
         {
             if (context == null)
             {
@@ -412,7 +412,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node)
+        public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node)
         {
             if (context == null)
             {
@@ -440,7 +440,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             context.CodeWriter.WriteLine();
         }
 
-        private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeExtensionNode node, bool canTypeCheck)
+        private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeIntermediateNode node, bool canTypeCheck)
         {
             if (node.AttributeStructure == AttributeStructure.Minimized)
             {
@@ -505,7 +505,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
             }
 
-            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeExtensionNode attribute)
+            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeIntermediateNode attribute)
             {
                 // We generally expect all children to be CSharp, this is here just in case.
                 return attribute.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
@@ -517,7 +517,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return html.FindDescendantNodes<IntermediateToken>().Where(t => t.IsHtml).ToArray();
             }
 
-            bool NeedsTypeCheck(ComponentAttributeExtensionNode n)
+            bool NeedsTypeCheck(ComponentAttributeIntermediateNode n)
             {
                 return node.BoundAttribute != null && !node.BoundAttribute.IsWeaklyTyped();
             }
@@ -567,7 +567,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             _scopeStack.CloseScope(context);
         }
 
-        public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node)
+        public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentIntermediateNode node)
         {
             // We can skip type arguments during runtime codegen, they are handled in the
             // type/parameter declarations.
@@ -593,7 +593,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             _scopeStack.CloseScope(context);
         }
 
-        public override void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node)
+        public override void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
         {
             // Looks like:
             //
@@ -615,7 +615,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             codeWriter.WriteEndMethodInvocation();
         }
 
-        protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck)
+        protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, ReferenceCaptureIntermediateNode node, bool shouldTypeCheck)
         {
             // Looks like:
             //
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
index bcf31bb031..c004e51bca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
@@ -19,9 +19,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             visitor.Visit(documentNode);
         }
 
-        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<ComponentExtensionNode>, IExtensionIntermediateNodeVisitor<ComponentChildContentIntermediateNode>
+        private class Visitor : IntermediateNodeWalker
         {
-            public void VisitExtension(ComponentExtensionNode node)
+            public override void VisitComponent(ComponentIntermediateNode node)
             {
                 // Check for properties that are set by both element contents (body) and the attribute itself.
                 foreach (var childContent in node.ChildContents)
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 base.VisitDefault(node);
             }
 
-            public void VisitExtension(ComponentChildContentIntermediateNode node)
+            public override void VisitComponentChildContent(ComponentChildContentIntermediateNode node)
             {
                 // Check that each child content has a unique parameter name within its scope. This is important
                 // because the parameter name can be implicit, and it doesn't work well when nested.
@@ -58,9 +58,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                             node.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentRepeatedParameterName(
                                 node.Source,
                                 node,
-                                (ComponentExtensionNode)Ancestors[0], // Enclosing component
+                                (ComponentIntermediateNode)Ancestors[0], // Enclosing component
                                 ancestor, // conflicting child content node
-                                (ComponentExtensionNode)Ancestors[i + 1]));  // Enclosing component of conflicting child content node
+                                (ComponentIntermediateNode)Ancestors[i + 1]));  // Enclosing component of conflicting child content node
                         }
                     }
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 14df6420ad..7d83745575 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -217,7 +217,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 "following top-level items: {1}.",
                 RazorDiagnosticSeverity.Error);
 
-        public static RazorDiagnostic Create_ChildContentMixedWithExplicitChildContent(SourceSpan? source, ComponentExtensionNode component)
+        public static RazorDiagnostic Create_ChildContentMixedWithExplicitChildContent(SourceSpan? source, ComponentIntermediateNode component)
         {
             var supportedElements = string.Join(", ", component.Component.GetChildContentProperties().Select(p => $"'{p.Name}'"));
             return RazorDiagnostic.Create(ChildContentMixedWithExplicitChildContent, source ?? SourceSpan.Undefined, component.TagName, supportedElements);
@@ -255,9 +255,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static RazorDiagnostic Create_ChildContentRepeatedParameterName(
             SourceSpan? source,
             ComponentChildContentIntermediateNode childContent1,
-            ComponentExtensionNode component1,
+            ComponentIntermediateNode component1,
             ComponentChildContentIntermediateNode childContent2,
-            ComponentExtensionNode component2)
+            ComponentIntermediateNode component2)
         {
             Debug.Assert(childContent1.ParameterName == childContent2.ParameterName);
             Debug.Assert(childContent1.IsParameterized);
@@ -281,7 +281,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static RazorDiagnostic Create_GenericComponentMissingTypeArgument(
             SourceSpan? source,
-            ComponentExtensionNode component,
+            ComponentIntermediateNode component,
             IEnumerable<BoundAttributeDescriptor> attributes)
         {
             Debug.Assert(component.Component.IsGenericTypedComponent());
@@ -299,7 +299,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static RazorDiagnostic Create_GenericComponentTypeInferenceUnderspecified(
             SourceSpan? source,
-            ComponentExtensionNode component,
+            ComponentIntermediateNode component,
             IEnumerable<BoundAttributeDescriptor> attributes)
         {
             Debug.Assert(component.Component.IsGenericTypedComponent());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs
deleted file mode 100644
index cbd9ac592a..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensionNode.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    internal class ComponentExtensionNode : ExtensionIntermediateNode
-    {
-        public IEnumerable<ComponentAttributeExtensionNode> Attributes => Children.OfType<ComponentAttributeExtensionNode>();
-
-        public IEnumerable<RefExtensionNode> Captures => Children.OfType<RefExtensionNode>();
-
-        public IEnumerable<ComponentChildContentIntermediateNode> ChildContents => Children.OfType<ComponentChildContentIntermediateNode>();
-
-        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
-
-        public TagHelperDescriptor Component { get; set; }
-
-        /// <summary>
-        /// Gets the child content parameter name (null if unset) that was applied at the component level.
-        /// </summary>
-        public string ChildContentParameterName { get; set; }
-
-        public IEnumerable<ComponentTypeArgumentExtensionNode> TypeArguments => Children.OfType<ComponentTypeArgumentExtensionNode>();
-
-        public string TagName { get; set; }
-        
-        // An optional type inference node. This will be populated (and point to a different part of the tree)
-        // if this component call site requires type inference.
-        public ComponentTypeInferenceMethodIntermediateNode TypeInferenceNode { get; set; }
-        
-        public string TypeName { get; set; }
-
-        public override void Accept(IntermediateNodeVisitor visitor)
-        {
-            if (visitor == null)
-            {
-                throw new ArgumentNullException(nameof(visitor));
-            }
-
-            AcceptExtensionNode<ComponentExtensionNode>(this, visitor);
-        }
-
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
-        {
-            if (target == null)
-            {
-                throw new ArgumentNullException(nameof(target));
-            }
-
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteComponent(context, this);
-        }
-
-        private string DebuggerDisplay
-        {
-            get
-            {
-                var builder = new StringBuilder();
-                builder.Append("Component: ");
-                builder.Append("<");
-                builder.Append(TagName);
-
-                foreach (var attribute in Attributes)
-                {
-                    builder.Append(" ");
-                    builder.Append(attribute.AttributeName);
-                    builder.Append("=\"...\"");
-                }
-
-                foreach (var capture in Captures)
-                {
-                    builder.Append(" ");
-                    builder.Append("ref");
-                    builder.Append("=\"...\"");
-                }
-
-                foreach (var typeArgument in TypeArguments)
-                {
-                    builder.Append(" ");
-                    builder.Append(typeArgument.TypeParameterName);
-                    builder.Append("=\"...\"");
-                }
-
-                builder.Append(">");
-                builder.Append(ChildContents.Any() ? "..." : string.Empty);
-                builder.Append("</");
-                builder.Append(TagName);
-                builder.Append(">");
-
-                return builder.ToString();
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
index 0f9008c09e..c32df5738d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -60,9 +60,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private ComponentExtensionNode RewriteAsComponent(TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        private ComponentIntermediateNode RewriteAsComponent(TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
         {
-            var component = new ComponentExtensionNode()
+            var component = new ComponentIntermediateNode()
             {
                 Component = tagHelper,
                 Source = node.Source,
@@ -88,9 +88,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return component;
         }
 
-        private HtmlElementIntermediateNode RewriteAsElement(TagHelperIntermediateNode node)
+        private MarkupElementIntermediateNode RewriteAsElement(TagHelperIntermediateNode node)
         {
-            var result = new HtmlElementIntermediateNode()
+            var result = new MarkupElementIntermediateNode()
             {
                 Source = node.Source,
                 TagName = node.TagName,
@@ -109,10 +109,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         private class ComponentRewriteVisitor : IntermediateNodeWalker
         {
-            private readonly ComponentExtensionNode _component;
+            private readonly ComponentIntermediateNode _component;
             private readonly IntermediateNodeCollection _children;
 
-            public ComponentRewriteVisitor(ComponentExtensionNode component)
+            public ComponentRewriteVisitor(ComponentIntermediateNode component)
             {
                 _component = component;
                 _children = component.Children;
@@ -290,7 +290,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node)
             {
-                var attribute = new ComponentAttributeExtensionNode(node);
+                var attribute = new ComponentAttributeIntermediateNode(node);
                 _children.Add(attribute);
 
                 // Since we don't support complex content, we can rewrite the inside of this
@@ -348,7 +348,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // that get passed to the component, it needs special code generation support.
                 if (node.TagHelper.IsGenericTypedComponent() && node.BoundAttribute.IsTypeParameterProperty())
                 {
-                    _children.Add(new ComponentTypeArgumentExtensionNode(node));
+                    _children.Add(new ComponentTypeArgumentIntermediateNode(node));
                     return;
                 }
 
@@ -371,7 +371,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     return;
                 }
 
-                _children.Add(new ComponentAttributeExtensionNode(node));
+                _children.Add(new ComponentAttributeIntermediateNode(node));
             }
 
             public override void VisitDefault(IntermediateNode node)
@@ -476,7 +476,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // Each 'tag helper property' belongs to a specific tag helper. We want to handle
                 // the cases for components, but leave others alone. This allows our other passes
                 // to handle those cases.
-                _children.Add(node.TagHelper.IsComponentTagHelper() ? (IntermediateNode)new ComponentAttributeExtensionNode(node) : node);
+                _children.Add(node.TagHelper.IsComponentTagHelper() ? (IntermediateNode)new ComponentAttributeIntermediateNode(node) : node);
             }
 
             public override void VisitDefault(IntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
index 49c05935e1..4ee38ed992 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
@@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     for (var j = 0; j < parent.Children.Count; j++)
                     {
-                        var componentAttribute = parent.Children[j] as ComponentAttributeExtensionNode;
+                        var componentAttribute = parent.Children[j] as ComponentAttributeIntermediateNode;
                         if (componentAttribute != null &&
                             componentAttribute.TagHelper != null &&
                             componentAttribute.TagHelper.IsComponentTagHelper() &&
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 tokens.Insert(i + 1, original[i]);
             }
 
-            if (parent is HtmlElementIntermediateNode)
+            if (parent is MarkupElementIntermediateNode)
             {
                 var result = new HtmlAttributeIntermediateNode()
                 {
@@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             else
             {
-                var result = new ComponentAttributeExtensionNode(node);
+                var result = new ComponentAttributeIntermediateNode(node);
 
                 result.Children.Clear();
                 result.Children.Add(new CSharpExpressionIntermediateNode());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
index eebe7db984..f1932742a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
@@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             visitor.Visit(documentNode);
         }
 
-        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<ComponentExtensionNode>
+        private class Visitor : IntermediateNodeWalker
         {
             private readonly TypeNameFeature _typeNameFeature;
 
@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 _typeNameFeature = typeNameFeature;
             }
 
-            public void VisitExtension(ComponentExtensionNode node)
+            public override void VisitComponent(ComponentIntermediateNode node)
             {
                 if (node.Component.IsGenericTypedComponent())
                 {
@@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 base.VisitDefault(node);
             }
 
-            private void Process(ComponentExtensionNode node)
+            private void Process(ComponentIntermediateNode node)
             {
                 // First collect all of the information we have about each type parameter
                 //
@@ -157,12 +157,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 CreateTypeInferenceMethod(documentNode, node);
             }
 
-            private string GetContent(ComponentTypeArgumentExtensionNode node)
+            private string GetContent(ComponentTypeArgumentIntermediateNode node)
             {
                 return string.Join(string.Empty, node.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).Select(t => t.Content));
             }
 
-            private static bool ValidateTypeArguments(ComponentExtensionNode node, Dictionary<string, Binding> bindings)
+            private static bool ValidateTypeArguments(ComponentIntermediateNode node, Dictionary<string, Binding> bindings)
             {
                 var missing = new List<BoundAttributeDescriptor>();
                 foreach (var binding in bindings)
@@ -185,7 +185,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return true;
             }
 
-            private void RewriteTypeNames(TypeNameRewriter rewriter, ComponentExtensionNode node)
+            private void RewriteTypeNames(TypeNameRewriter rewriter, ComponentIntermediateNode node)
             {
                 // Rewrite the component type name
                 node.TypeName = rewriter.Rewrite(node.TypeName);
@@ -243,7 +243,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
             }
 
-            private void CreateTypeInferenceMethod(DocumentIntermediateNode documentNode, ComponentExtensionNode node)
+            private void CreateTypeInferenceMethod(DocumentIntermediateNode documentNode, ComponentIntermediateNode node)
             {
                 var @namespace = documentNode.FindPrimaryNamespace().Content;
                 @namespace = string.IsNullOrEmpty(@namespace) ? "__Blazor" : "__Blazor." + @namespace;
@@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public string Content { get; set; }
 
-            public ComponentTypeArgumentExtensionNode Node { get; set; }
+            public ComponentTypeArgumentIntermediateNode Node { get; set; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
index 3106bbbaaf..e2cb256ff8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
@@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     length--;
                 }
 
-                reference.Parent.Children.Insert(start, new HtmlBlockIntermediateNode()
+                reference.Parent.Children.Insert(start, new MarkupBlockIntermediateNode()
                 {
                     Content = rewriteVisitor.Builder.ToString(),
                 });
@@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         // the a from the list.
         private class FindHtmlTreeVisitor :
             IntermediateNodeWalker,
-            IExtensionIntermediateNodeVisitor<HtmlElementIntermediateNode>
+            IExtensionIntermediateNodeVisitor<MarkupElementIntermediateNode>
         {
             private bool _foundNonHtml;
 
@@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 base.VisitDefault(node);
             }
 
-            public void VisitExtension(HtmlElementIntermediateNode node)
+            public void VisitExtension(MarkupElementIntermediateNode node)
             {
                 // We need to restore the state after processing this node.
                 // We might have found a leaf-block of HTML, but that shouldn't
@@ -228,7 +228,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         private class RewriteVisitor :
             IntermediateNodeWalker,
-            IExtensionIntermediateNodeVisitor<HtmlElementIntermediateNode>
+            IExtensionIntermediateNodeVisitor<MarkupElementIntermediateNode>
         {
             private readonly StringBuilder _encodingBuilder;
 
@@ -243,7 +243,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public StringBuilder Builder { get; } = new StringBuilder();
 
-            public void VisitExtension(HtmlElementIntermediateNode node)
+            public void VisitExtension(MarkupElementIntermediateNode node)
             {
                 for (var i = 0; i < _trees.Count; i++)
                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ReferenceCaptureLoweringPass.cs
similarity index 88%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ReferenceCaptureLoweringPass.cs
index f53c7d33a2..c5a9cbac02 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ReferenceCaptureLoweringPass.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class RefLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ReferenceCaptureLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
     {
         // Run after component lowering pass
         public override int Order => 50;
@@ -46,14 +46,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Determine whether this is an element capture or a component capture, and
             // if applicable the type name that will appear in the resulting capture code
-            var componentTagHelper = (parent as ComponentExtensionNode)?.Component;
+            var componentTagHelper = (parent as ComponentIntermediateNode)?.Component;
             if (componentTagHelper != null)
             {
-                return new RefExtensionNode(identifierToken, componentTagHelper.GetTypeName());
+                return new ReferenceCaptureIntermediateNode(identifierToken, componentTagHelper.GetTypeName());
             }
             else
             {
-                return new RefExtensionNode(identifierToken);
+                return new ReferenceCaptureIntermediateNode(identifierToken);
             }
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
index 52c2b39a50..01086ec3ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
@@ -22,9 +22,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             visitor.Visit(documentNode);
         }
 
-        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<HtmlElementIntermediateNode>
+        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<MarkupElementIntermediateNode>
         {
-            public void VisitExtension(HtmlElementIntermediateNode node)
+            public void VisitExtension(MarkupElementIntermediateNode node)
             {
                 // Disallow <script> in components as per #552
                 if (string.Equals(node.TagName, "script", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
index 5f733e92a5..89df3f3378 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         ancestor is HtmlAttributeIntermediateNode ||
 
                         // Inside component attribute
-                        ancestor is ComponentAttributeExtensionNode ||
+                        ancestor is ComponentAttributeIntermediateNode ||
 
                         // Inside malformed ref attribute
                         ancestor is TagHelperPropertyIntermediateNode)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
index 4add4f4c39..32fc1341e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         shouldContinueIteration = shouldRemoveNode;
                         break;
 
-                    case HtmlElementIntermediateNode _:
+                    case MarkupElementIntermediateNode _:
                     case CSharpExpressionIntermediateNode _:
                     case TagHelperIntermediateNode _:
                         // These node types may produce non-whitespace output at runtime
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
similarity index 55%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
index 075ae4db4a..1b63ad3984 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentAttributeExtensionNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
@@ -2,19 +2,18 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    internal class ComponentAttributeExtensionNode : ExtensionIntermediateNode
+    public sealed class ComponentAttributeIntermediateNode : IntermediateNode
     {
-        public ComponentAttributeExtensionNode()
+        public ComponentAttributeIntermediateNode()
         {
         }
 
-        public ComponentAttributeExtensionNode(TagHelperHtmlAttributeIntermediateNode attributeNode)
+        public ComponentAttributeIntermediateNode(TagHelperHtmlAttributeIntermediateNode attributeNode)
         {
             if (attributeNode == null)
             {
@@ -36,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        public ComponentAttributeExtensionNode(TagHelperPropertyIntermediateNode propertyNode)
+        public ComponentAttributeIntermediateNode(TagHelperPropertyIntermediateNode propertyNode)
         {
             if (propertyNode == null)
             {
@@ -62,36 +61,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        public ComponentAttributeExtensionNode(ComponentAttributeExtensionNode attributeNode)
-        {
-            if (attributeNode == null)
-            {
-                throw new ArgumentNullException(nameof(attributeNode));
-            }
-
-            AttributeName = attributeNode.AttributeName;
-            AttributeStructure = attributeNode.AttributeStructure;
-            BoundAttribute = attributeNode.BoundAttribute;
-            PropertyName = attributeNode.BoundAttribute.GetPropertyName();
-            Source = attributeNode.Source;
-            TagHelper = attributeNode.TagHelper;
-            TypeName = attributeNode.BoundAttribute.IsWeaklyTyped() ? null : attributeNode.BoundAttribute.TypeName;
-
-            for (var i = 0; i < attributeNode.Children.Count; i++)
-            {
-                Children.Add(attributeNode.Children[i]);
-            }
-
-            for (var i = 0; i < attributeNode.Diagnostics.Count; i++)
-            {
-                Diagnostics.Add(attributeNode.Diagnostics[i]);
-            }
-        }
-
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
         public string AttributeName { get; set; }
-
+        
         public AttributeStructure AttributeStructure { get; set; }
 
         public BoundAttributeDescriptor BoundAttribute { get; set; }
@@ -109,23 +82,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<ComponentAttributeExtensionNode>(this, visitor);
+            visitor.VisitComponentAttribute(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
+            
+            formatter.WriteContent(AttributeName);
 
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteComponentAttribute(context, this);
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(PropertyName), PropertyName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentChildContentIntermediateNode.cs
similarity index 55%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentChildContentIntermediateNode.cs
index e5236bb1f7..85c5f71865 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentChildContentIntermediateNode.cs
@@ -3,11 +3,11 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    internal class ComponentChildContentIntermediateNode : ExtensionIntermediateNode
+    public sealed class ComponentChildContentIntermediateNode : IntermediateNode
     {
         public string AttributeName => BoundAttribute?.Name ?? ComponentsApi.RenderTreeBuilder.ChildContent;
 
@@ -28,23 +28,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<ComponentChildContentIntermediateNode>(this, visitor);
+            visitor.VisitComponentChildContent(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
-
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteComponentChildContent(context, this);
+            
+            formatter.WriteContent(AttributeName);
+            
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(ParameterName), ParameterName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
new file mode 100644
index 0000000000..19edf3ece7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class ComponentIntermediateNode : IntermediateNode
+    {
+        public IEnumerable<ComponentAttributeIntermediateNode> Attributes => Children.OfType<ComponentAttributeIntermediateNode>();
+
+        public IEnumerable<ReferenceCaptureIntermediateNode> Captures => Children.OfType<ReferenceCaptureIntermediateNode>();
+
+        public IEnumerable<ComponentChildContentIntermediateNode> ChildContents => Children.OfType<ComponentChildContentIntermediateNode>();
+
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public TagHelperDescriptor Component { get; set; }
+
+        /// <summary>
+        /// Gets the child content parameter name (null if unset) that was applied at the component level.
+        /// </summary>
+        public string ChildContentParameterName { get; set; }
+
+        public IEnumerable<ComponentTypeArgumentIntermediateNode> TypeArguments => Children.OfType<ComponentTypeArgumentIntermediateNode>();
+
+        public string TagName { get; set; }
+        
+        // An optional type inference node. This will be populated (and point to a different part of the tree)
+        // if this component call site requires type inference.
+        public ComponentTypeInferenceMethodIntermediateNode TypeInferenceNode { get; set; }
+        
+        public string TypeName { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitComponent(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(TagName);
+            
+            formatter.WriteProperty(nameof(Component), Component?.DisplayName);
+            formatter.WriteProperty(nameof(TagName), TagName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeArgumentIntermediateNode.cs
similarity index 62%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeArgumentIntermediateNode.cs
index cbefe42a7b..e729d32d46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeArgumentExtensionNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeArgumentIntermediateNode.cs
@@ -2,15 +2,14 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    internal class ComponentTypeArgumentExtensionNode : ExtensionIntermediateNode
+    public sealed class ComponentTypeArgumentIntermediateNode : IntermediateNode
     {
-        public ComponentTypeArgumentExtensionNode(TagHelperPropertyIntermediateNode propertyNode)
+        public ComponentTypeArgumentIntermediateNode(TagHelperPropertyIntermediateNode propertyNode)
         {
             if (propertyNode == null)
             {
@@ -47,23 +46,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<ComponentTypeArgumentExtensionNode>(this, visitor);
+            visitor.VisitComponentTypeArgument(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
-
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteComponentTypeArgument(context, this);
+            
+            formatter.WriteContent(TypeParameterName);
+            
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs
similarity index 59%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs
index 8411198cb9..97829bbcbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeInferenceMethodIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs
@@ -2,23 +2,22 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
     /// <summary>
     /// Represents a type-inference thunk that is used by the generated component code.
     /// </summary>
-    internal class ComponentTypeInferenceMethodIntermediateNode : ExtensionIntermediateNode
+    public sealed class ComponentTypeInferenceMethodIntermediateNode : IntermediateNode
     {
         public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
         
         /// <summary>
         /// Gets the component usage linked to this type inference method.
         /// </summary>
-        public ComponentExtensionNode Component { get; set; }
+        public ComponentIntermediateNode Component { get; set; }
         
         /// <summary>
         /// Gets the full type name of the generated class containing this method.
@@ -37,23 +36,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<ComponentTypeInferenceMethodIntermediateNode>(this, visitor);
+            visitor.VisitComponentTypeInferenceMethod(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
 
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteComponentTypeInferenceMethod(context, this);
+            formatter.WriteContent(Component?.TagName);        
+            
+            formatter.WriteProperty(nameof(Component), Component?.Component?.DisplayName);
+            formatter.WriteProperty(nameof(FullTypeName), FullTypeName);
+            formatter.WriteProperty(nameof(MethodName), MethodName);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
index bb2c2687a2..933525c260 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -128,5 +128,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
         {
             VisitDefault(node);
         }
+
+        public virtual void VisitComponent(ComponentIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitComponentAttribute(ComponentAttributeIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitComponentChildContent(ComponentChildContentIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitComponentTypeArgument(ComponentTypeArgumentIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitComponentTypeInferenceMethod(ComponentTypeInferenceMethodIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitReferenceCapture(ReferenceCaptureIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs
similarity index 82%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs
index 756474f366..52369b351b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    internal class HtmlBlockIntermediateNode : ExtensionIntermediateNode
+    internal class MarkupBlockIntermediateNode : ExtensionIntermediateNode
     {
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<HtmlBlockIntermediateNode>(this, visitor);
+            AcceptExtensionNode<MarkupBlockIntermediateNode>(this, visitor);
         }
 
         public override void WriteNode(CodeTarget target, CodeRenderingContext context)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
similarity index 84%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
index 839547106c..352adab4b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlElementIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
@@ -7,22 +7,22 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    internal class HtmlElementIntermediateNode : ExtensionIntermediateNode
+    internal class MarkupElementIntermediateNode : ExtensionIntermediateNode
     {
         public IEnumerable<HtmlAttributeIntermediateNode> Attributes => Children.OfType<HtmlAttributeIntermediateNode>();
 
-        public IEnumerable<RefExtensionNode> Captures => Children.OfType<RefExtensionNode>();
+        public IEnumerable<ReferenceCaptureIntermediateNode> Captures => Children.OfType<ReferenceCaptureIntermediateNode>();
 
         public IEnumerable<IntermediateNode> Body => Children.Where(c =>
         {
             return
                 c as HtmlAttributeIntermediateNode == null &&
-                c as RefExtensionNode == null;
+                c as ReferenceCaptureIntermediateNode == null;
         });
 
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
@@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<HtmlElementIntermediateNode>(this, visitor);
+            AcceptExtensionNode<MarkupElementIntermediateNode>(this, visitor);
         }
 
         public override void WriteNode(CodeTarget target, CodeRenderingContext context)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
similarity index 62%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
index b822b9345a..f70c7525a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RefExtensionNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
@@ -3,19 +3,19 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    internal class RefExtensionNode : ExtensionIntermediateNode
+    public sealed class ReferenceCaptureIntermediateNode : IntermediateNode
     {
-        public RefExtensionNode(IntermediateToken identifierToken)
+        public ReferenceCaptureIntermediateNode(IntermediateToken identifierToken)
         {
             IdentifierToken = identifierToken ?? throw new ArgumentNullException(nameof(identifierToken));
             Source = IdentifierToken.Source;
         }
 
-        public RefExtensionNode(IntermediateToken identifierToken, string componentCaptureTypeName)
+        public ReferenceCaptureIntermediateNode(IntermediateToken identifierToken, string componentCaptureTypeName)
             : this(identifierToken)
         {
             if (string.IsNullOrEmpty(componentCaptureTypeName))
@@ -44,23 +44,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<RefExtensionNode>(this, visitor);
+            visitor.VisitReferenceCapture(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
-
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteReferenceCapture(context, this);
+            
+            formatter.WriteContent(IdentifierToken?.Content);
+            
+            formatter.WriteProperty(nameof(IdentifierToken), IdentifierToken?.Content);
+            formatter.WriteProperty(nameof(ComponentCaptureTypeName), ComponentCaptureTypeName);
         }
     }
 }

From 0c1c05efc6b4e08902caca52fc61de1c91417fc9 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 21 Dec 2018 12:35:48 -0800
Subject: [PATCH 024/337] Implement Components with new HTML parser

This change ports the existing Blazor component compiler features to
work on top of the Razor compiler. These new features are on once Razor
Language version is set to V3 or higher.

The tests and code for the old Blazor compiler were added to this repo
in previous changes. This change adds the necessary enabling features,
and gets the tests working.

Code generation for tests tests is identical with a few exceptions.
Design time directives now include line mappings (as they should). The
infrastructure seems to prefer windows style line-endings whereas the
Blazor code did the opposite. I plan to leave this alone unless it's a
problem for testing on *nix.

IR Generation will be cosmetically different due to different node names
and formatting. Structure should generally be the same.

----

In order to implement this support, I had to add the following core
features.

Configuring passes/engine-features based on the langauge version. This
required revisiting a *lot* of old tests and forcing them to use a
version appropriate Razor engine. A lot of our tests for legacy things
were using new versions of the language :(.

Configuring passes/engine-features to switch on/off depending on the
document kind.

Configuring directives depending on the file-kind. Directives are a
parser feature, so this decision needs to be made before the IR phase.
Directives that are specific to a file kind will override directives
that are not - this allows components to customize templates for
instance.

Adding functions/inherits/implements directive as mainline features that
are always on in V3. I'm not quite motivated to do this yet for
typeparam, but we might end up there. Remember that directives are
reserved words in Razor.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a04addb86f88cf1321e27d0e9f5440585934cffc
---
 .../src/MvcImportProjectFeature.cs            |   6 +
 .../src/RazorExtensions.cs                    |   2 +-
 .../test/InjectDirectiveTest.cs               |   4 +-
 .../test/ModelDirectiveTest.cs                |  20 +-
 .../test/MvcRazorTemplateEngineTest.cs        |  10 +-
 .../test/MvcViewDocumentClassifierPassTest.cs |   6 +-
 .../src/MvcImportProjectFeature.cs            |   6 +
 .../src/RazorExtensions.cs                    |   3 +-
 .../src/RazorPageDocumentClassifierPass.cs    |   2 +-
 .../AssemblyAttributeInjectionPassTest.cs     |  24 +-
 .../InstrumentationPassIntegrationTest.cs     |  16 +
 .../test/ModelDirectiveTest.cs                |  22 +-
 .../test/MvcViewDocumentClassifierPassTest.cs |   6 +-
 .../RazorPageDocumentClassifierPassTest.cs    |  41 +-
 .../BasicTest.codegen.cs                      |  48 +-
 .../BasicTest.ir.txt                          |  62 +-
 .../src/MvcImportProjectFeature.cs            |   6 +
 .../src/RazorExtensions.cs                    |   5 +-
 .../src/RazorPageDocumentClassifierPass.cs    |   2 +-
 .../test/InjectDirectiveTest.cs               |  16 +-
 .../CodeGenerationIntegrationTest.cs          |  29 +
 .../test/ModelDirectiveTest.cs                |  27 +-
 .../test/MvcRazorTemplateEngineTest.cs        |  11 +-
 .../test/MvcViewDocumentClassifierPassTest.cs |   6 +-
 .../RazorPageDocumentClassifierPassTest.cs    |  36 +-
 .../BasicComponent.cshtml                     |   9 +
 .../BasicComponent_DesignTime.codegen.cs      |  53 ++
 .../BasicComponent_DesignTime.ir.txt          |  37 +
 .../BasicComponent_DesignTime.mappings.txt    |  24 +
 .../BasicComponent_Runtime.codegen.cs         |  34 +
 .../BasicComponent_Runtime.ir.txt             |  24 +
 .../CodeGeneration/DefaultDocumentWriter.cs   |  40 +
 .../CodeGeneration/IntermediateNodeWriter.cs  |  41 +
 .../Components/BlazorCSharpLoweringPhase.cs   |  42 -
 .../Components/BlazorExtensionInitializer.cs  | 130 ---
 .../src/Components/CodeWriterExtensions.cs    | 647 ---------------
 ...ngPass.cs => ComponentBindLoweringPass.cs} |   7 +-
 ...=> ComponentChildContentDiagnosticPass.cs} |   8 +-
 ...orCodeTarget.cs => ComponentCodeTarget.cs} |  15 +-
 ...> ComponentComplexAttributeContentPass.cs} |  10 +-
 ...er.cs => ComponentDesignTimeNodeWriter.cs} |   8 +-
 .../ComponentDocumentClassifierPass.cs        |  25 +-
 ...s => ComponentEventHandlerLoweringPass.cs} |   7 +-
 .../src/Components/ComponentExtensions.cs     |  22 -
 ...entPass.cs => ComponentGenericTypePass.cs} |  37 +-
 ...BlockPass.cs => ComponentHtmlBlockPass.cs} |  35 +-
 ...re.cs => ComponentImportProjectFeature.cs} |  22 +-
 .../Components/ComponentInjectDirective.cs    |  36 +
 .../ComponentInjectDirectivePass.cs           |  58 ++
 .../ComponentInjectIntermediateNode.cs        |  60 ++
 .../ComponentIntermediateNodePassBase.cs      |  21 +
 ...rective.cs => ComponentLayoutDirective.cs} |   7 +-
 ...ass.cs => ComponentLayoutDirectivePass.cs} |   4 +-
 .../src/Components/ComponentLoweringPass.cs   |   7 +-
 ...orNodeWriter.cs => ComponentNodeWriter.cs} |  21 +-
 ...Directive.cs => ComponentPageDirective.cs} |   9 +-
 ...ePass.cs => ComponentPageDirectivePass.cs} |   6 +-
 ... ComponentReferenceCaptureLoweringPass.cs} |   8 +-
 ...riter.cs => ComponentRuntimeNodeWriter.cs} |  10 +-
 ...ptTagPass.cs => ComponentScriptTagPass.cs} |  10 +-
 ....cs => ComponentTemplateDiagnosticPass.cs} |  10 +-
 ...cs => ComponentTemplateTargetExtension.cs} |   6 +-
 ...tive.cs => ComponentTypeParamDirective.cs} |   5 +-
 ...pacePass.cs => ComponentWhitespacePass.cs} |  35 +-
 .../src/Components/InjectDirective.cs         | 111 ---
 .../src/Components/RazorCompilerException.cs  |  29 -
 ...efaultRazorCodeGenerationOptionsBuilder.cs |   7 +-
 ...eGenerationOptionsFactoryProjectFeature.cs |   4 +-
 .../src/DefaultRazorDirectiveFeature.cs       |  18 +
 ...faultRazorIntermediateNodeLoweringPhase.cs | 783 ++++++++++++++++--
 .../src/DefaultRazorParserOptionsBuilder.cs   |   5 +-
 ...RazorParserOptionsFactoryProjectFeature.cs |   4 +-
 .../src/DefaultRazorProjectEngine.cs          | 158 +++-
 .../src/DocumentClassifierPassBase.cs         |  19 +-
 .../ImplementsDirective.cs                    |   3 +-
 .../ImplementsDirectivePass.cs                |   4 +-
 .../src/Extensions/MetadataAttributePass.cs   |   8 +
 .../src/FileKindDirectiveFeature.cs           |  10 +
 .../src/FileKinds.cs                          |   2 +-
 ...eGenerationOptionsFactoryProjectFeature.cs |   2 +-
 ...RazorParserOptionsFactoryProjectFeature.cs |   2 +-
 .../Intermediate/ComponentIntermediateNode.cs |   2 +-
 .../Intermediate/IntermediateNodeVisitor.cs   |  10 +
 .../MarkupBlockIntermediateNode.cs            |  24 +-
 .../MarkupElementIntermediateNode.cs          |  55 +-
 .../src/ItemCollection.cs                     |  11 +-
 .../src/RazorCodeGenerationOptionsBuilder.cs  |   2 +
 .../src/RazorParserFeatureFlags.cs            |  14 +
 .../src/RazorParserOptionsBuilder.cs          |   2 +
 .../src/RazorProjectEngine.cs                 | 106 +--
 .../RazorProjectEngineBuilderExtensions.cs    |  70 +-
 .../src/BindTagHelperDescriptorProvider.cs    |   2 +-
 ...EventHandlerTagHelperDescriptorProvider.cs |   2 +-
 .../src/Properties/AssemblyInfo.cs            |   4 +-
 .../BaseTagHelperDescriptorProviderTest.cs    |   4 +-
 .../BindTagHelperDescriptorProviderTest.cs    |   2 +-
 ...tHandlerTagHelperDescriptorProviderTest.cs |   2 +-
 .../Components/RenderTreeFrame.cs             | 344 ++++++++
 .../Components/RenderTreeFrameType.cs         |  54 ++
 .../IntegrationTests/IntegrationTestBase.cs   |  17 +-
 .../IntermediateNodeWriter.cs                 |  52 +-
 .../IntializeTestFileAttribute.cs             |  11 +-
 .../RazorBaselineIntegrationTestBase.cs       | 209 +++++
 .../RazorIntegrationTestBase.cs               | 470 +++++++++++
 .../Language/RazorProjectEngineTestBase.cs    |  34 +
 .../Language/TestFile.cs                      |   2 +-
 ...rosoft.AspNetCore.Razor.Test.Common.csproj |   1 +
 .../BindAttributes.cs                         |  26 +
 .../ComponentBase.cs                          |   2 +-
 .../EventHandlers.cs                          | 128 +++
 .../MarkupString.cs                           |  36 +
 .../RenderTree/RenderTreeBuilder.cs           |  94 ++-
 .../RouteAttribute.cs                         |  33 +
 .../RuntimeHelpers.cs                         |  20 +
 .../UIEventArgsRenderTreeBuilderExtensions.cs | 547 ++++++++++++
 115 files changed, 4089 insertions(+), 1478 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BindLoweringPass.cs => ComponentBindLoweringPass.cs} (99%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{ChildContentDiagnosticPass.cs => ComponentChildContentDiagnosticPass.cs} (93%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BlazorCodeTarget.cs => ComponentCodeTarget.cs} (71%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{ComplexAttributeContentPass.cs => ComponentComplexAttributeContentPass.cs} (94%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BlazorDesignTimeNodeWriter.cs => ComponentDesignTimeNodeWriter.cs} (98%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{EventHandlerLoweringPass.cs => ComponentEventHandlerLoweringPass.cs} (97%)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{GenericComponentPass.cs => ComponentGenericTypePass.cs} (91%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{HtmlBlockPass.cs => ComponentHtmlBlockPass.cs} (91%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BlazorImportProjectFeature.cs => ComponentImportProjectFeature.cs} (79%)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentIntermediateNodePassBase.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{LayoutDirective.cs => ComponentLayoutDirective.cs} (83%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{LayoutDirectivePass.cs => ComponentLayoutDirectivePass.cs} (92%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BlazorNodeWriter.cs => ComponentNodeWriter.cs} (88%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{PageDirective.cs => ComponentPageDirective.cs} (82%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{PageDirectivePass.cs => ComponentPageDirectivePass.cs} (93%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{ReferenceCaptureLoweringPass.cs => ComponentReferenceCaptureLoweringPass.cs} (93%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BlazorRuntimeNodeWriter.cs => ComponentRuntimeNodeWriter.cs} (98%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{ScriptTagPass.cs => ComponentScriptTagPass.cs} (81%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{TemplateDiagnosticPass.cs => ComponentTemplateDiagnosticPass.cs} (91%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{BlazorTemplateTargetExtension.cs => ComponentTemplateTargetExtension.cs} (62%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{TypeParamDirective.cs => ComponentTypeParamDirective.cs} (89%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{TrimWhitespacePass.cs => ComponentWhitespacePass.cs} (80%)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components => Extensions}/ImplementsDirective.cs (91%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/{Components => Extensions}/ImplementsDirectivePass.cs (88%)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKindDirectiveFeature.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineTestBase.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
index 254c57c1c4..e117a5298c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
@@ -21,6 +21,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                 throw new ArgumentNullException(nameof(projectItem));
             }
 
+            // Don't add MVC imports for a component - this shouldn't happen for v1, but just in case.
+            if (string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            {
+                return Array.Empty<RazorProjectItem>();
+            }
+
             var imports = new List<RazorProjectItem>();
             AddDefaultDirectivesImport(imports);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
index 55e8929457..f8cf7f5cb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             builder.Features.Add(new ModelExpressionPass());
             builder.Features.Add(new MvcViewDocumentClassifierPass());
 
-            builder.SetImportFeature(new MvcImportProjectFeature());
+            builder.Features.Add(new MvcImportProjectFeature());
         }
 
         public static void RegisterViewComponentTagHelpers(RazorProjectEngineBuilder builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs
index a5579d645a..63560c0f1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -173,7 +174,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 
         private RazorEngine CreateEngine()
         {
-            return RazorProjectEngine.Create(b =>
+            var configuration = RazorConfiguration.Create(RazorLanguageVersion.Version_1_1, "test", Array.Empty<RazorExtension>());
+            return RazorProjectEngine.Create(configuration, RazorProjectFileSystem.Empty, b =>
             {
                 // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
                 b.AddDirective(InjectDirective.Directive);
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
index cc6cf53097..7a4c811dbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
@@ -11,8 +11,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 {
-    public class ModelDirectiveTest
+    public class ModelDirectiveTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_1_1;
+
         [Fact]
         public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
         {
@@ -23,7 +25,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 @model
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
 
             var irDocument = CreateIRDocument(engine, codeDocument);
 
@@ -40,7 +42,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             // Arrange
             var codeDocument = CreateDocument(@" ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
 
             var irDocument = CreateIRDocument(engine, codeDocument);
 
@@ -60,7 +62,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 @model Type1
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -87,7 +89,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 @model Type2
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -113,7 +115,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 @model Type1
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -138,7 +140,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 @inherits BaseType<TModel>
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -234,7 +236,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             return visitor.Node;
         }
 
-        private RazorEngine CreateEngine()
+        private RazorEngine CreateRuntimeEngine()
         {
             return CreateEngineCore();
         }
@@ -246,7 +248,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 
         private RazorEngine CreateEngineCore(bool designTime = false)
         {
-            return RazorProjectEngine.Create(b =>
+            return CreateProjectEngine(b =>
             {
                 // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
                 b.AddDirective(ModelDirective.Directive);
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
index 45186848ae..eca2b8d49b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
@@ -8,8 +8,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 {
-    public class MvcRazorTemplateEngineTest
+    public class MvcRazorTemplateEngineTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_1_1;
+
         [Fact]
         public void GetDefaultImports_IncludesDefaultImports()
         {
@@ -25,7 +27,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                 "@using Microsoft.AspNetCore.Mvc.ViewFeatures",
             };
             var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                RazorProjectEngine.Create().Engine,
+                CreateProjectEngine().Engine,
                 new TestRazorProjectFileSystem());
 
             // Act
@@ -51,7 +53,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                 "@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider",
             };
             var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                RazorProjectEngine.Create().Engine,
+                CreateProjectEngine().Engine,
                 new TestRazorProjectFileSystem());
 
             // Act
@@ -69,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
         {
             // Arrange
             var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                RazorProjectEngine.Create().Engine,
+                CreateProjectEngine().Engine,
                 new TestRazorProjectFileSystem());
 
             // Act
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
index 663aff4518..a0a3825267 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
@@ -7,8 +7,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 {
-    public class MvcViewDocumentClassifierPassTest
+    public class MvcViewDocumentClassifierPassTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_1_1;
+
         [Fact]
         public void MvcViewDocumentClassifierPass_SetsDocumentKind()
         {
@@ -217,8 +219,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
         }
 
-        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
-
         private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine engine, RazorCodeDocument codeDocument)
         {
             for (var i = 0; i < engine.Phases.Count; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
index c25cb0d063..d7844d9eee 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
@@ -21,6 +21,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
                 throw new ArgumentNullException(nameof(projectItem));
             }
 
+            // Don't add MVC imports for a component - this shouldn't happen for v2, but just in case.
+            if (string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            {
+                return Array.Empty<RazorProjectItem>();
+            }
+
             var imports = new List<RazorProjectItem>();
             AddDefaultDirectivesImport(imports);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
index 69cf7e2055..0e52eb00d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
@@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
                 throw new ArgumentNullException(nameof(builder));
             }
 
+            FunctionsDirective.Register(builder);
             InjectDirective.Register(builder);
             ModelDirective.Register(builder);
             NamespaceDirective.Register(builder);
@@ -42,7 +43,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             builder.Features.Add(new AssemblyAttributeInjectionPass());
             builder.Features.Add(new InstrumentationPass());
 
-            builder.SetImportFeature(new MvcImportProjectFeature());
+            builder.Features.Add(new MvcImportProjectFeature());
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs
index a5de7d0783..b11912ff81 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorPageDocumentClassifierPass.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
         public static readonly string RouteTemplateKey = "RouteTemplate";
 
         private static readonly RazorProjectEngine LeadingDirectiveParsingEngine = RazorProjectEngine.Create(
-            RazorConfiguration.Default,
+            RazorConfiguration.Create(RazorLanguageVersion.Version_2_1, "leading-directive-parser", Array.Empty<RazorExtension>()),
             RazorProjectFileSystem.Create("/"),
             builder =>
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs
index 4dbe6c72b4..29127a5cd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs
@@ -7,8 +7,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
-    public class AssemblyAttributeInjectionPassTest
+    public class AssemblyAttributeInjectionPassTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_2_1;
+
         [Fact]
         public void Execute_NoOps_IfNamespaceNodeIsMissing()
         {
@@ -20,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             // Act
@@ -45,7 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             // Act
@@ -71,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             // Act
@@ -112,7 +114,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             // Act
@@ -147,7 +149,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             // Act
@@ -190,7 +192,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
@@ -237,7 +239,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
@@ -290,7 +292,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "\\test\\\"Index.cshtml"));
@@ -349,7 +351,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
@@ -404,7 +406,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             var pass = new AssemblyAttributeInjectionPass
             {
-                Engine = RazorProjectEngine.Create().Engine,
+                Engine = CreateProjectEngine().Engine,
             };
 
             var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "test\\\"Index.cshtml"));
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs
index 604100a335..58d6a46df0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs
@@ -6,12 +6,28 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests
 {
     public class InstrumentationPassIntegrationTest : IntegrationTestBase
     {
+        private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode");
+
+        public InstrumentationPassIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Create(
+                RazorLanguageVersion.Version_2_0,
+                "MVC-2.1",
+                new[] { new AssemblyExtension("MVC-2.1", typeof(ExtensionInitializer).Assembly) });
+        }
+
+        protected override CSharpCompilation BaseCompilation => DefaultBaseCompilation;
+
+        protected override RazorConfiguration Configuration { get; }
+
         [Fact]
         public void BasicTest()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
index eedc94d581..d01195906b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
@@ -11,8 +9,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
-    public class ModelDirectiveTest
+    public class ModelDirectiveTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_2_1;
+
         [Fact]
         public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
         {
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 @model
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
 
             var irDocument = CreateIRDocument(engine, codeDocument);
 
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var codeDocument = CreateDocument(@" ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
 
             var irDocument = CreateIRDocument(engine, codeDocument);
 
@@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 @model Type1
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 @model Type2
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 @model Type1
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 @inherits BaseType<TModel>
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -234,7 +234,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             return visitor.Node;
         }
 
-        private RazorEngine CreateEngine()
+        private RazorEngine CreateRuntimeEngine()
         {
             return CreateEngineCore();
         }
@@ -246,7 +246,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
         private RazorEngine CreateEngineCore(bool designTime = false)
         {
-            return RazorProjectEngine.Create(b =>
+            return CreateProjectEngine(b =>
             {
                 // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
                 b.AddDirective(ModelDirective.Directive);
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
index 2d437c158d..455ed1ba21 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
@@ -7,8 +7,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
-    public class MvcViewDocumentClassifierPassTest
+    public class MvcViewDocumentClassifierPassTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_2_1;
+
         [Fact]
         public void MvcViewDocumentClassifierPass_SetsDocumentKind()
         {
@@ -217,8 +219,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
         }
 
-        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
-
         private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
         {
             for (var i = 0; i < projectEngine.Phases.Count; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
index 74acfa0c13..8e9f111579 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
@@ -9,8 +9,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
-    public class RazorPageDocumentClassifierPassTest
+    public class RazorPageDocumentClassifierPassTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_2_1;
+
         [Fact]
         public void RazorPageDocumentClassifierPass_LogsErrorForImportedPageDirectives()
         {
@@ -20,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var importDocument = RazorSourceDocument.Create("@page", "import.cshtml");
             var sourceDocument = RazorSourceDocument.Create("<p>Hello World</p>", "main.cshtml");
             var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -55,7 +57,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 ";
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -85,7 +87,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 ";
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -109,7 +111,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -129,7 +131,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             irDocument.DocumentKind = "some-value";
             var pass = new RazorPageDocumentClassifierPass
@@ -150,7 +152,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page+1", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             irDocument.DocumentKind = "some-value";
             var pass = new RazorPageDocumentClassifierPass
@@ -171,7 +173,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -194,7 +196,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -219,7 +221,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -246,7 +248,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -269,7 +271,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -292,7 +294,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -314,7 +316,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -339,7 +341,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page \"some-route\"", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateProjectEngine().Engine;
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -357,14 +359,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             Assert.Equal("some-route", attributeNode.Value);
         }
 
-        private static RazorEngine CreateEngine()
+        protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
         {
-            return RazorProjectEngine.Create(b =>
-            {
-                PageDirective.Register(b);
-            }).Engine;
+            PageDirective.Register(builder);
         }
-
+        
         private static DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
         {
             for (var i = 0; i < engine.Phases.Count; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
index 8c5b2e0f79..804cb2af89 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
@@ -1,12 +1,20 @@
 #pragma checksum "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "78993008d95836bec2b9175d4294bf7bd5f5f109"
 // <auto-generated/>
 #pragma warning disable 1591
-[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Razor.Template), @"default", @"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml")]
-namespace Razor
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_InstrumentationPassIntegrationTest_BasicTest), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_InstrumentationPassIntegrationTest_BasicTest))]
+namespace AspNetCore
 {
     #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"78993008d95836bec2b9175d4294bf7bd5f5f109", @"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml")]
-    public class Template
+    public class TestFiles_IntegrationTests_InstrumentationPassIntegrationTest_BasicTest : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", "Hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
@@ -34,9 +42,12 @@ namespace Razor
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
+            BeginContext(31, 28, true);
             BeginContext(31, 28, true);
             WriteLiteral("<span someattr>Hola</span>\r\n");
             EndContext();
+            EndContext();
+            BeginContext(61, 7, false);
             BeginContext(61, 7, false);
 #line 3 "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml"
 Write("Hello");
@@ -44,14 +55,21 @@ Write("Hello");
 #line default
 #line hidden
             EndContext();
+            EndContext();
+            BeginContext(69, 2, true);
             BeginContext(69, 2, true);
             WriteLiteral("\r\n");
             EndContext();
+            EndContext();
+            BeginContext(71, 87, false);
             BeginContext(71, 87, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("form", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(91, 6, true);
                 BeginContext(91, 6, true);
                 WriteLiteral("\r\n    ");
                 EndContext();
+                EndContext();
+                BeginContext(97, 52, false);
                 BeginContext(97, 52, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
@@ -75,9 +93,12 @@ __InputTagHelper.BarProp = DateTime.Now;
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
                 EndContext();
+                EndContext();
+                BeginContext(149, 2, true);
                 BeginContext(149, 2, true);
                 WriteLiteral("\r\n");
                 EndContext();
+                EndContext();
             }
             );
             __FormTagHelper = CreateTagHelper<global::FormTagHelper>();
@@ -91,19 +112,27 @@ __InputTagHelper.BarProp = DateTime.Now;
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
             EndContext();
+            EndContext();
+            BeginContext(158, 31, true);
             BeginContext(158, 31, true);
             WriteLiteral("\r\n\r\n<span>Here is some content ");
             EndContext();
+            EndContext();
+            BeginContext(207, 9, true);
             BeginContext(207, 9, true);
             WriteLiteral("</span>\r\n");
             EndContext();
+            EndContext();
+            BeginContext(217, 29, false);
             BeginContext(217, 29, false);
 #line 9 "TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml"
-Write(Foo(item => new Template(async(__razor_template_writer) => {
+Write(Foo(item => new global::Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_template_writer) => {
     PushWriter(__razor_template_writer);
     BeginContext(222, 24, true);
+    BeginContext(222, 24, true);
     WriteLiteral("<span>Hello world</span>");
     EndContext();
+    EndContext();
     PopWriter();
 }
 )));
@@ -111,8 +140,19 @@ Write(Foo(item => new Template(async(__razor_template_writer) => {
 #line default
 #line hidden
             EndContext();
+            EndContext();
         }
         #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
index 6ac51fb0e8..a54315062c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
@@ -1,8 +1,17 @@
 Document - 
     RazorCompiledItemAttribute - 
-    NamespaceDeclaration -  - Razor
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_InstrumentationPassIntegrationTest_BasicTest))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         RazorSourceChecksumAttribute - 
-        ClassDeclaration -  - public - Template -  - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_InstrumentationPassIntegrationTest_BasicTest - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes
@@ -10,6 +19,8 @@ Document -
             FieldDeclaration -  - private - global::FormTagHelper - __FormTagHelper
             FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(31, 28, true);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(31, 28, true);
                 HtmlContent - (31:1,0 [28] BasicTest.cshtml)
@@ -21,28 +32,46 @@ Document -
                     IntermediateToken - (57:1,26 [2] BasicTest.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(61, 7, false);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(61, 7, false);
                 CSharpExpression - (61:2,2 [7] BasicTest.cshtml)
                     IntermediateToken - (61:2,2 [7] BasicTest.cshtml) - CSharp - "Hello"
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(69, 2, true);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(69, 2, true);
                 HtmlContent - (69:2,10 [2] BasicTest.cshtml)
                     IntermediateToken - (69:2,10 [2] BasicTest.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(71, 87, false);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(71, 87, false);
                 TagHelper - (71:3,0 [87] BasicTest.cshtml) - form - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(91, 6, true);
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(91, 6, true);
                         HtmlContent - (91:3,20 [6] BasicTest.cshtml)
                             IntermediateToken - (91:3,20 [6] BasicTest.cshtml) - Html - \n    
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(97, 52, false);
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(97, 52, false);
                         TagHelper - (97:4,4 [52] BasicTest.cshtml) - input - TagMode.SelfClosing
@@ -56,17 +85,27 @@ Document -
                             DefaultTagHelperExecute - 
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(149, 2, true);
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(149, 2, true);
                         HtmlContent - (149:4,56 [2] BasicTest.cshtml)
                             IntermediateToken - (149:4,56 [2] BasicTest.cshtml) - Html - \n
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - FormTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(158, 31, true);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(158, 31, true);
                 HtmlContent - (158:5,7 [31] BasicTest.cshtml)
@@ -76,6 +115,10 @@ Document -
                     IntermediateToken - (168:7,6 [21] BasicTest.cshtml) - Html - Here is some content 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(207, 9, true);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(207, 9, true);
                 HtmlContent - (207:7,45 [9] BasicTest.cshtml)
@@ -83,11 +126,17 @@ Document -
                     IntermediateToken - (214:7,52 [2] BasicTest.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(217, 29, false);
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(217, 29, false);
                 CSharpExpression - (217:8,1 [29] BasicTest.cshtml)
                     IntermediateToken - (217:8,1 [4] BasicTest.cshtml) - CSharp - Foo(
                     Template - (222:8,6 [24] BasicTest.cshtml)
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(222, 24, true);
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(222, 24, true);
                         HtmlContent - (222:8,6 [24] BasicTest.cshtml)
@@ -97,6 +146,15 @@ Document -
                             IntermediateToken - (239:8,23 [7] BasicTest.cshtml) - Html - </span>
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
                     IntermediateToken - (246:8,30 [1] BasicTest.cshtml) - CSharp - )
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
index 5c6ee7361d..5a56cd19d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
@@ -21,6 +21,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 throw new ArgumentNullException(nameof(projectItem));
             }
 
+            // Don't add MVC imports for a component
+            if (string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            {
+                return Array.Empty<RazorProjectItem>();
+            }
+
             var imports = new List<RazorProjectItem>();
             AddDefaultDirectivesImport(imports);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
index 99e202724a..26e641d7aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
@@ -21,8 +21,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             ModelDirective.Register(builder);
             NamespaceDirective.Register(builder);
             PageDirective.Register(builder);
-
-            InheritsDirective.Register(builder);
+            
             SectionDirective.Register(builder);
 
             builder.Features.Add(new DefaultTagHelperDescriptorProvider());
@@ -40,7 +39,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             builder.Features.Add(new RazorPageDocumentClassifierPass());
             builder.Features.Add(new MvcViewDocumentClassifierPass());
 
-            builder.SetImportFeature(new MvcImportProjectFeature());
+            builder.Features.Add(new MvcImportProjectFeature());
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
index c6c0df9345..96a05cfc22 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         public static readonly string RouteTemplateKey = "RouteTemplate";
 
         private static readonly RazorProjectEngine LeadingDirectiveParsingEngine = RazorProjectEngine.Create(
-            RazorConfiguration.Default,
+            RazorConfiguration.Create(RazorLanguageVersion.Version_3_0, "leading-directive-parser", Array.Empty<RazorExtension>()),
             RazorProjectFileSystem.Create("/"),
             builder =>
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs
index 54a2fa4fd1..a935b23bfb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectDirectiveTest.cs
@@ -1,15 +1,16 @@
 // 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.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
-    public class InjectDirectiveTest
+    public class InjectDirectiveTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_3_0;
+
         [Fact]
         public void InjectDirectivePass_Execute_DefinesProperty()
         {
@@ -171,14 +172,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             return visitor.Node;
         }
 
-        private RazorEngine CreateEngine()
+        protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
         {
-            return RazorProjectEngine.Create(b =>
-            {
-                // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
-                b.AddDirective(InjectDirective.Directive);
-                b.AddDirective(ModelDirective.Directive);
-            }).Engine;
+            // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
+            builder.AddDirective(InjectDirective.Directive);
+            builder.AddDirective(ModelDirective.Directive);
         }
 
         private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 8273810ca3..05d14e1184 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -181,6 +181,20 @@ public class MyModel
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
         }
 
+        [Fact]
+        public void BasicComponent_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile(fileKind: FileKinds.Component);
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
         [Fact]
         public void Sections_Runtime()
         {
@@ -631,6 +645,21 @@ public class MyModel
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
+        [Fact]
+        public void BasicComponent_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile(fileKind: FileKinds.Component);
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
         [Fact]
         public void Sections_DesignTime()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
index 425b1b41c6..881557aa4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
@@ -11,8 +9,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
-    public class ModelDirectiveTest
+    public class ModelDirectiveTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_3_0;
+
         [Fact]
         public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
         {
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 @model
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
 
             var irDocument = CreateIRDocument(engine, codeDocument);
 
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var codeDocument = CreateDocument(@" ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
 
             var irDocument = CreateIRDocument(engine, codeDocument);
 
@@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 @model Type1
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 @model Type2
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 @model Type1
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 @inherits BaseType<TModel>
 ");
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var pass = new ModelDirective.Pass()
             {
                 Engine = engine,
@@ -234,9 +234,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             return visitor.Node;
         }
 
-        private RazorEngine CreateEngine()
+        private RazorEngine CreateRuntimeEngine()
         {
-            return CreateEngineCore();
+            return CreateEngineCore(designTime: false);
         }
 
         private RazorEngine CreateDesignTimeEngine()
@@ -246,14 +246,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         private RazorEngine CreateEngineCore(bool designTime = false)
         {
-            return RazorProjectEngine.Create(b =>
+            return CreateProjectEngine(b =>
             {
                 // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
                 b.AddDirective(ModelDirective.Directive);
 
-                // There's some special interaction with the inherits directive
-                InheritsDirective.Register(b);
-
                 b.Features.Add(new DesignTimeOptionsFeature(designTime));
             }).Engine;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
index f6c61c42a6..c5a25d29aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
@@ -8,8 +8,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
-    public class MvcRazorTemplateEngineTest
+    public class MvcRazorTemplateEngineTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_3_0;
+
         [Fact]
         public void GetDefaultImports_IncludesDefaultImports()
         {
@@ -24,8 +26,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 "@using Microsoft.AspNetCore.Mvc.Rendering",
                 "@using Microsoft.AspNetCore.Mvc.ViewFeatures",
             };
+
             var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                RazorProjectEngine.Create().Engine,
+                CreateProjectEngine().Engine,
                 new TestRazorProjectFileSystem());
 
             // Act
@@ -51,7 +54,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 "@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider",
             };
             var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                RazorProjectEngine.Create().Engine,
+                CreateProjectEngine().Engine,
                 new TestRazorProjectFileSystem());
 
             // Act
@@ -69,7 +72,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         {
             // Arrange
             var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                RazorProjectEngine.Create().Engine,
+                CreateProjectEngine().Engine,
                 new TestRazorProjectFileSystem());
 
             // Act
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
index d7c0ae6854..3cb503f9fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
@@ -7,8 +7,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
-    public class MvcViewDocumentClassifierPassTest
+    public class MvcViewDocumentClassifierPassTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_3_0;
+
         [Fact]
         public void MvcViewDocumentClassifierPass_SetsDocumentKind()
         {
@@ -217,8 +219,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
         }
 
-        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
-
         private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
         {
             for (var i = 0; i < projectEngine.Phases.Count; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
index a0cdbd7f80..286edb49bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
@@ -9,8 +9,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
-    public class RazorPageDocumentClassifierPassTest
+    public class RazorPageDocumentClassifierPassTest : RazorProjectEngineTestBase
     {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_3_0;
+
         [Fact]
         public void RazorPageDocumentClassifierPass_LogsErrorForImportedPageDirectives()
         {
@@ -20,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var importDocument = RazorSourceDocument.Create("@page", "import.cshtml");
             var sourceDocument = RazorSourceDocument.Create("<p>Hello World</p>", "main.cshtml");
             var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -55,7 +57,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 ";
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -85,7 +87,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 ";
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -109,7 +111,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -129,7 +131,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             irDocument.DocumentKind = "some-value";
             var pass = new RazorPageDocumentClassifierPass
@@ -150,7 +152,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page+1", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             irDocument.DocumentKind = "some-value";
             var pass = new RazorPageDocumentClassifierPass
@@ -171,7 +173,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -194,7 +196,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -219,7 +221,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -246,7 +248,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -269,7 +271,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -292,7 +294,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -314,7 +316,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -339,7 +341,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page \"some-route\"", properties));
 
-            var engine = CreateEngine();
+            var engine = CreateRuntimeEngine();
             var irDocument = CreateIRDocument(engine, codeDocument);
             var pass = new RazorPageDocumentClassifierPass
             {
@@ -357,9 +359,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             Assert.Equal("some-route", attributeNode.Value);
         }
 
-        private static RazorEngine CreateEngine()
+        private RazorEngine CreateRuntimeEngine()
         {
-            return RazorProjectEngine.Create(b =>
+            return CreateProjectEngine(b =>
             {
                 PageDirective.Register(b);
             }).Engine;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml
new file mode 100644
index 0000000000..85206b7b78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml
@@ -0,0 +1,9 @@
+@implements IDisposable
+<div class="@this.ToString()">
+    Hello world
+    @string.Format("{0}", "Hello")
+</div>
+
+@functions {
+    void IDisposable.Dispose(){ }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
new file mode 100644
index 0000000000..5fe69361a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class BasicComponent : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+IDisposable __typeHelper = default(IDisposable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+       __o = this.ToString();
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+__o = string.Format("{0}", "Hello");
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+            
+    void IDisposable.Dispose(){ }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
new file mode 100644
index 0000000000..73d65846a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - BasicComponent - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components"
+                DirectiveToken - (12:0,12 [11] BasicComponent.cshtml) - IDisposable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                MarkupElement - (25:1,0 [91] BasicComponent.cshtml) - div
+                    HtmlAttribute - (29:1,4 [25] BasicComponent.cshtml) -  class=" - "
+                        CSharpExpressionAttributeValue - (37:1,12 [16] BasicComponent.cshtml) - 
+                            IntermediateToken - (38:1,13 [15] BasicComponent.cshtml) - CSharp - this.ToString()
+                    HtmlContent - (55:1,30 [23] BasicComponent.cshtml)
+                        IntermediateToken - (55:1,30 [23] BasicComponent.cshtml) - Html - \n    Hello world\n    
+                    CSharpExpression - (79:3,5 [29] BasicComponent.cshtml)
+                        IntermediateToken - (79:3,5 [29] BasicComponent.cshtml) - CSharp - string.Format("{0}", "Hello")
+                    HtmlContent - (108:3,34 [2] BasicComponent.cshtml)
+                        IntermediateToken - (108:3,34 [2] BasicComponent.cshtml) - Html - \n
+                HtmlContent - (116:4,6 [4] BasicComponent.cshtml)
+                    IntermediateToken - (116:4,6 [4] BasicComponent.cshtml) - Html - \n\n
+                HtmlContent - (170:8,1 [2] BasicComponent.cshtml)
+                    IntermediateToken - (170:8,1 [2] BasicComponent.cshtml) - Html - \n
+            CSharpCode - (132:6,12 [37] BasicComponent.cshtml)
+                IntermediateToken - (132:6,12 [37] BasicComponent.cshtml) - CSharp - \n    void IDisposable.Dispose(){ }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
new file mode 100644
index 0000000000..abc4f51e55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
+|IDisposable|
+Generated Location: (618:17,0 [11] )
+|IDisposable|
+
+Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
+|this.ToString()|
+Generated Location: (1214:33,13 [15] )
+|this.ToString()|
+
+Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
+|string.Format("{0}", "Hello")|
+Generated Location: (1359:38,6 [29] )
+|string.Format("{0}", "Hello")|
+
+Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
+|
+    void IDisposable.Dispose(){ }
+|
+Generated Location: (1573:45,12 [37] )
+|
+    void IDisposable.Dispose(){ }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
new file mode 100644
index 0000000000..65fa29f408
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -0,0 +1,34 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d3c3d6059615673cb46fc4974164d61eabadb890"
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class BasicComponent : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "class", this.ToString());
+            builder.AddContent(2, "\r\n    Hello world\r\n    ");
+            builder.AddContent(3, string.Format("{0}", "Hello"));
+            builder.AddContent(4, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+            
+    void IDisposable.Dispose(){ }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
new file mode 100644
index 0000000000..58d2bd23dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - BasicComponent - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                MarkupElement - (25:1,0 [91] BasicComponent.cshtml) - div
+                    HtmlAttribute - (29:1,4 [25] BasicComponent.cshtml) -  class=" - "
+                        CSharpExpressionAttributeValue - (37:1,12 [16] BasicComponent.cshtml) - 
+                            IntermediateToken - (38:1,13 [15] BasicComponent.cshtml) - CSharp - this.ToString()
+                    HtmlContent - (55:1,30 [23] BasicComponent.cshtml)
+                        IntermediateToken - (55:1,30 [19] BasicComponent.cshtml) - Html - \n    Hello world\n
+                        IntermediateToken - (74:3,0 [4] BasicComponent.cshtml) - Html -     
+                    CSharpExpression - (79:3,5 [29] BasicComponent.cshtml)
+                        IntermediateToken - (79:3,5 [29] BasicComponent.cshtml) - CSharp - string.Format("{0}", "Hello")
+                    HtmlContent - (108:3,34 [2] BasicComponent.cshtml)
+                        IntermediateToken - (108:3,34 [2] BasicComponent.cshtml) - Html - \n
+            CSharpCode - (132:6,12 [37] BasicComponent.cshtml)
+                IntermediateToken - (132:6,12 [37] BasicComponent.cshtml) - CSharp - \n    void IDisposable.Dispose(){ }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
index a47295143d..8a6865f7ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -257,6 +257,46 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 VisitDefault(node);
             }
 
+            public override void VisitComponent(ComponentIntermediateNode node)
+            {
+                Context.NodeWriter.WriteComponent(Context, node);
+            }
+
+            public override void VisitComponentAttribute(ComponentAttributeIntermediateNode node)
+            {
+                Context.NodeWriter.WriteComponentAttribute(Context, node);
+            }
+
+            public override void VisitComponentChildContent(ComponentChildContentIntermediateNode node)
+            {
+                Context.NodeWriter.WriteComponentChildContent(Context, node);
+            }
+
+            public override void VisitComponentTypeArgument(ComponentTypeArgumentIntermediateNode node)
+            {
+                Context.NodeWriter.WriteComponentTypeArgument(Context, node);
+            }
+
+            public override void VisitComponentTypeInferenceMethod(ComponentTypeInferenceMethodIntermediateNode node)
+            {
+                Context.NodeWriter.WriteComponentTypeInferenceMethod(Context, node);
+            }
+
+            public override void VisitMarkupElement(MarkupElementIntermediateNode node)
+            {
+                Context.NodeWriter.WriteMarkupElement(Context, node);
+            }
+
+            public override void VisitMarkupBlock(MarkupBlockIntermediateNode node)
+            {
+                Context.NodeWriter.WriteMarkupBlock(Context, node);
+            }
+
+            public override void VisitReferenceCapture(ReferenceCaptureIntermediateNode node)
+            {
+                Context.NodeWriter.WriteReferenceCapture(Context, node);
+            }
+
             public override void VisitDefault(IntermediateNode node)
             {
                 Context.RenderChildren(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
index d8c636f064..c8a3c6659a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
@@ -23,6 +24,46 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
 
         public abstract void WriteCSharpCodeAttributeValue(CodeRenderingContext context, CSharpCodeAttributeValueIntermediateNode node);
 
+        public virtual void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
+        public virtual void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+        
+        public virtual void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
+        public virtual void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
+        public virtual void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
+        public virtual void WriteMarkupElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
+        public virtual void WriteMarkupBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
+        public virtual void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
         public abstract void BeginWriterScope(CodeRenderingContext context, string writer);
 
         public abstract void EndWriterScope(CodeRenderingContext context);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs
deleted file mode 100644
index fd9a026f13..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCSharpLoweringPhase.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    internal class BlazorRazorCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSharpLoweringPhase
-    {
-        protected override void ExecuteCore(RazorCodeDocument codeDocument)
-        {
-            var documentNode = codeDocument.GetDocumentIntermediateNode();
-            ThrowForMissingDocumentDependency(documentNode);
-#pragma warning disable CS0618
-            var writer = new DocumentWriterWorkaround().Create(documentNode.Target, documentNode.Options);
-#pragma warning restore CS0618
-            try
-            {
-                var cSharpDocument = writer.WriteDocument(codeDocument, documentNode);
-                codeDocument.SetCSharpDocument(cSharpDocument);
-            }
-            catch (RazorCompilerException ex)
-            {
-                // Currently the Blazor code generation has some 'fatal errors' that can cause code generation
-                // to fail completely. This class is here to make that implementation work gracefully.
-                var cSharpDocument = RazorCSharpDocument.Create("", documentNode.Options, new[] { ex.Diagnostic });
-                codeDocument.SetCSharpDocument(cSharpDocument);
-            }
-        }
-
-        private class DocumentWriterWorkaround : DocumentWriter
-        {
-            public override RazorCSharpDocument WriteDocument(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
deleted file mode 100644
index 6a03dc07e8..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorExtensionInitializer.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    /// <summary>
-    /// Initializes the Blazor extension.
-    /// </summary>
-    public class BlazorExtensionInitializer : RazorExtensionInitializer
-    {
-        /// <summary>
-        /// Specifies the declaration configuration.
-        /// </summary>
-        public static readonly RazorConfiguration DeclarationConfiguration;
-
-        /// <summary>
-        /// Specifies the default configuration.
-        /// </summary>
-        public static readonly RazorConfiguration DefaultConfiguration;
-
-        static BlazorExtensionInitializer()
-        {
-            // The configuration names here need to match what we put in the MSBuild configuration
-            DeclarationConfiguration = RazorConfiguration.Create(
-                RazorLanguageVersion.Experimental,
-                "BlazorDeclaration-0.1",
-                Array.Empty<RazorExtension>());
-
-            DefaultConfiguration = RazorConfiguration.Create(
-                RazorLanguageVersion.Experimental,
-                "Blazor-0.1",
-                Array.Empty<RazorExtension>());
-        }
-
-        /// <summary>
-        /// Registers the Blazor extension.
-        /// </summary>
-        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
-        public static void Register(RazorProjectEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            FunctionsDirective.Register(builder);
-            ImplementsDirective.Register(builder);
-            InheritsDirective.Register(builder);
-            InjectDirective.Register(builder);
-            LayoutDirective.Register(builder);
-            PageDirective.Register(builder);
-            TypeParamDirective.Register(builder);
-
-            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
-            builder.Features.Add(new BlazorImportProjectFeature());
-
-            var index = builder.Phases.IndexOf(builder.Phases.OfType<IRazorCSharpLoweringPhase>().Single());
-            builder.Phases[index] = new BlazorRazorCSharpLoweringPhase();
-
-            builder.Features.Add(new ConfigureBlazorCodeGenerationOptions());
-
-            builder.AddTargetExtension(new BlazorTemplateTargetExtension());
-
-            var isDeclarationOnlyCompile = builder.Configuration.ConfigurationName == DeclarationConfiguration.ConfigurationName;
-
-            // Blazor-specific passes, in order.
-            if (!isDeclarationOnlyCompile)
-            {
-                // There's no benefit in this optimization during the declaration-only compile
-                builder.Features.Add(new TrimWhitespacePass());
-            }
-            builder.Features.Add(new ComponentDocumentClassifierPass());
-            builder.Features.Add(new ScriptTagPass());
-            builder.Features.Add(new ComplexAttributeContentPass());
-            builder.Features.Add(new ComponentLoweringPass());
-            builder.Features.Add(new EventHandlerLoweringPass());
-            builder.Features.Add(new ReferenceCaptureLoweringPass());
-            builder.Features.Add(new BindLoweringPass());
-            builder.Features.Add(new TemplateDiagnosticPass());
-            builder.Features.Add(new GenericComponentPass());
-            builder.Features.Add(new ChildContentDiagnosticPass());
-            builder.Features.Add(new HtmlBlockPass());
-
-            if (isDeclarationOnlyCompile)
-            {
-                // This is for 'declaration only' processing. We don't want to try and emit any method bodies during
-                // the design time build because we can't do it correctly until the set of components is known.
-                builder.Features.Add(new EliminateMethodBodyPass());
-            }
-        }
-
-        /// <summary>
-        /// Initializes the Blazor extension.
-        /// </summary>
-        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
-        public override void Initialize(RazorProjectEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            Register(builder);
-        }
-
-        private class ConfigureBlazorCodeGenerationOptions : IConfigureRazorCodeGenerationOptionsFeature
-        {
-            public int Order => 0;
-
-            public RazorEngine Engine { get; set; }
-
-            public void Configure(RazorCodeGenerationOptionsBuilder options)
-            {
-                if (options == null)
-                {
-                    throw new ArgumentNullException(nameof(options));
-                }
-
-                // These metadata attributes require a reference to the Razor.Runtime package which we don't
-                // otherwise need.
-                options.SuppressMetadataAttributes = true;
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs
deleted file mode 100644
index e458d88d6a..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeWriterExtensions.cs
+++ /dev/null
@@ -1,647 +0,0 @@
-// 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 Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-
-// Copied directly from https://github.com/aspnet/Razor/blob/ff40124594b58b17988d50841175430a4b73d1a9/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs
-// (other than the namespace change) because it's internal
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    internal static class CodeWriterExtensions
-    {
-        private const string InstanceMethodFormat = "{0}.{1}";
-
-        private static readonly char[] CStyleStringLiteralEscapeChars =
-        {
-            '\r',
-            '\t',
-            '\"',
-            '\'',
-            '\\',
-            '\0',
-            '\n',
-            '\u2028',
-            '\u2029',
-        };
-
-        public static bool IsAtBeginningOfLine(this CodeWriter writer)
-        {
-            return writer.Length == 0 || writer[writer.Length - 1] == '\n';
-        }
-
-        public static CodeWriter WritePadding(this CodeWriter writer, int offset, SourceSpan? span, CodeRenderingContext context)
-        {
-            if (span == null)
-            {
-                return writer;
-            }
-
-            var basePadding = CalculatePadding();
-            var resolvedPadding = Math.Max(basePadding - offset, 0);
-
-            if (context.Options.IndentWithTabs)
-            {
-                // Avoid writing directly to the StringBuilder here, that will throw off the manual indexing 
-                // done by the base class.
-                var tabs = resolvedPadding / context.Options.IndentSize;
-                for (var i = 0; i < tabs; i++)
-                {
-                    writer.Write("\t");
-                }
-
-                var spaces = resolvedPadding % context.Options.IndentSize;
-                for (var i = 0; i < spaces; i++)
-                {
-                    writer.Write(" ");
-                }
-            }
-            else
-            {
-                for (var i = 0; i < resolvedPadding; i++)
-                {
-                    writer.Write(" ");
-                }
-            }
-
-            return writer;
-
-            int CalculatePadding()
-            {
-                var spaceCount = 0;
-                for (var i = span.Value.AbsoluteIndex - 1; i >= 0; i--)
-                {
-                    var @char = context.SourceDocument[i];
-                    if (@char == '\n' || @char == '\r')
-                    {
-                        break;
-                    }
-                    else if (@char == '\t')
-                    {
-                        spaceCount += context.Options.IndentSize;
-                    }
-                    else
-                    {
-                        spaceCount++;
-                    }
-                }
-
-                return spaceCount;
-            }
-        }
-
-        public static CodeWriter WriteVariableDeclaration(this CodeWriter writer, string type, string name, string value)
-        {
-            writer.Write(type).Write(" ").Write(name);
-            if (!string.IsNullOrEmpty(value))
-            {
-                writer.Write(" = ").Write(value);
-            }
-            else
-            {
-                writer.Write(" = null");
-            }
-
-            writer.WriteLine(";");
-
-            return writer;
-        }
-
-        public static CodeWriter WriteBooleanLiteral(this CodeWriter writer, bool value)
-        {
-            return writer.Write(value.ToString().ToLowerInvariant());
-        }
-
-        public static CodeWriter WriteStartAssignment(this CodeWriter writer, string name)
-        {
-            return writer.Write(name).Write(" = ");
-        }
-
-        public static CodeWriter WriteParameterSeparator(this CodeWriter writer)
-        {
-            return writer.Write(", ");
-        }
-
-        public static CodeWriter WriteStartNewObject(this CodeWriter writer, string typeName)
-        {
-            return writer.Write("new ").Write(typeName).Write("(");
-        }
-
-        public static CodeWriter WriteStringLiteral(this CodeWriter writer, string literal)
-        {
-            if (literal.Length >= 256 && literal.Length <= 1500 && literal.IndexOf('\0') == -1)
-            {
-                WriteVerbatimStringLiteral(writer, literal);
-            }
-            else
-            {
-                WriteCStyleStringLiteral(writer, literal);
-            }
-
-            return writer;
-        }
-
-        public static CodeWriter WriteUsing(this CodeWriter writer, string name)
-        {
-            return WriteUsing(writer, name, endLine: true);
-        }
-
-        public static CodeWriter WriteUsing(this CodeWriter writer, string name, bool endLine)
-        {
-            writer.Write("using ");
-            writer.Write(name);
-
-            if (endLine)
-            {
-                writer.WriteLine(";");
-            }
-
-            return writer;
-        }
-
-        public static CodeWriter WriteLineNumberDirective(this CodeWriter writer, SourceSpan span)
-        {
-            if (writer.Length >= writer.NewLine.Length && !IsAtBeginningOfLine(writer))
-            {
-                writer.WriteLine();
-            }
-
-            var lineNumberAsString = (span.LineIndex + 1).ToString(CultureInfo.InvariantCulture);
-            return writer.Write("#line ").Write(lineNumberAsString).Write(" \"").Write(span.FilePath).WriteLine("\"");
-        }
-
-        public static CodeWriter WriteStartMethodInvocation(this CodeWriter writer, string methodName)
-        {
-            writer.Write(methodName);
-
-            return writer.Write("(");
-        }
-
-        public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer)
-        {
-            return WriteEndMethodInvocation(writer, endLine: true);
-        }
-
-        public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer, bool endLine)
-        {
-            writer.Write(")");
-            if (endLine)
-            {
-                writer.WriteLine(";");
-            }
-
-            return writer;
-        }
-
-        // Writes a method invocation for the given instance name.
-        public static CodeWriter WriteInstanceMethodInvocation(
-            this CodeWriter writer,
-            string instanceName,
-            string methodName,
-            params string[] parameters)
-        {
-            if (instanceName == null)
-            {
-                throw new ArgumentNullException(nameof(instanceName));
-            }
-
-            if (methodName == null)
-            {
-                throw new ArgumentNullException(nameof(methodName));
-            }
-
-            return WriteInstanceMethodInvocation(writer, instanceName, methodName, endLine: true, parameters: parameters);
-        }
-
-        // Writes a method invocation for the given instance name.
-        public static CodeWriter WriteInstanceMethodInvocation(
-            this CodeWriter writer,
-            string instanceName,
-            string methodName,
-            bool endLine,
-            params string[] parameters)
-        {
-            if (instanceName == null)
-            {
-                throw new ArgumentNullException(nameof(instanceName));
-            }
-
-            if (methodName == null)
-            {
-                throw new ArgumentNullException(nameof(methodName));
-            }
-
-            return WriteMethodInvocation(
-                writer,
-                string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName),
-                endLine,
-                parameters);
-        }
-
-        public static CodeWriter WriteStartInstanceMethodInvocation(this CodeWriter writer, string instanceName, string methodName)
-        {
-            if (instanceName == null)
-            {
-                throw new ArgumentNullException(nameof(instanceName));
-            }
-
-            if (methodName == null)
-            {
-                throw new ArgumentNullException(nameof(methodName));
-            }
-
-            return WriteStartMethodInvocation(
-                writer,
-                string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName));
-        }
-
-        public static CodeWriter WriteField(this CodeWriter writer, IList<string> modifiers, string typeName, string fieldName)
-        {
-            if (modifiers == null)
-            {
-                throw new ArgumentNullException(nameof(modifiers));
-            }
-
-            if (typeName == null)
-            {
-                throw new ArgumentNullException(nameof(typeName));
-            }
-
-            if (fieldName == null)
-            {
-                throw new ArgumentNullException(nameof(fieldName));
-            }
-
-            for (var i = 0; i < modifiers.Count; i++)
-            {
-                writer.Write(modifiers[i]);
-                writer.Write(" ");
-            }
-
-            writer.Write(typeName);
-            writer.Write(" ");
-            writer.Write(fieldName);
-            writer.Write(";");
-            writer.WriteLine();
-
-            return writer;
-        }
-
-        public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, params string[] parameters)
-        {
-            return WriteMethodInvocation(writer, methodName, endLine: true, parameters: parameters);
-        }
-
-        public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, bool endLine, params string[] parameters)
-        {
-            return 
-                WriteStartMethodInvocation(writer, methodName)
-                .Write(string.Join(", ", parameters))
-                .WriteEndMethodInvocation(endLine);
-        }
-
-        public static CodeWriter WriteAutoPropertyDeclaration(this CodeWriter writer, IList<string> modifiers, string typeName, string propertyName)
-        {
-            if (modifiers == null)
-            {
-                throw new ArgumentNullException(nameof(modifiers));
-            }
-
-            if (typeName == null)
-            {
-                throw new ArgumentNullException(nameof(typeName));
-            }
-
-            if (propertyName == null)
-            {
-                throw new ArgumentNullException(nameof(propertyName));
-            }
-
-            for (var i = 0; i < modifiers.Count; i++)
-            {
-                writer.Write(modifiers[i]);
-                writer.Write(" ");
-            }
-
-            writer.Write(typeName);
-            writer.Write(" ");
-            writer.Write(propertyName);
-            writer.Write(" { get; set; }");
-            writer.WriteLine();
-
-            return writer;
-        }
-
-        public static CSharpCodeWritingScope BuildScope(this CodeWriter writer)
-        {
-            return new CSharpCodeWritingScope(writer);
-        }
-
-        public static CSharpCodeWritingScope BuildLambda(this CodeWriter writer, params string[] parameterNames)
-        {
-            return BuildLambda(writer, async: false, parameterNames: parameterNames);
-        }
-
-        public static CSharpCodeWritingScope BuildAsyncLambda(this CodeWriter writer, params string[] parameterNames)
-        {
-            return BuildLambda(writer, async: true, parameterNames: parameterNames);
-        }
-
-        private static CSharpCodeWritingScope BuildLambda(CodeWriter writer, bool async, string[] parameterNames)
-        {
-            if (async)
-            {
-                writer.Write("async");
-            }
-
-            writer.Write("(").Write(string.Join(", ", parameterNames)).Write(") => ");
-
-            var scope = new CSharpCodeWritingScope(writer);
-
-            return scope;
-        }
-
-        public static CSharpCodeWritingScope BuildNamespace(this CodeWriter writer, string name)
-        {
-            writer.Write("namespace ").WriteLine(name);
-
-            return new CSharpCodeWritingScope(writer);
-        }
-
-        public static CSharpCodeWritingScope BuildClassDeclaration(
-            this CodeWriter writer,
-            IList<string> modifiers,
-            string name,
-            string baseType,
-            IEnumerable<string> interfaces)
-        {
-            for (var i = 0; i < modifiers.Count; i++)
-            {
-                writer.Write(modifiers[i]);
-                writer.Write(" ");
-            }
-
-            writer.Write("class ");
-            writer.Write(name);
-
-            var hasBaseType = !string.IsNullOrEmpty(baseType);
-            var hasInterfaces = interfaces != null && interfaces.Count() > 0;
-
-            if (hasBaseType || hasInterfaces)
-            {
-                writer.Write(" : ");
-
-                if (hasBaseType)
-                {
-                    writer.Write(baseType);
-
-                    if (hasInterfaces)
-                    {
-                        WriteParameterSeparator(writer);
-                    }
-                }
-
-                if (hasInterfaces)
-                {
-                    writer.Write(string.Join(", ", interfaces));
-                }
-            }
-
-            writer.WriteLine();
-
-            return new CSharpCodeWritingScope(writer);
-        }
-
-        public static CSharpCodeWritingScope BuildMethodDeclaration(
-            this CodeWriter writer,
-            string accessibility,
-            string returnType,
-            string name,
-            IEnumerable<KeyValuePair<string, string>> parameters)
-        {
-            writer.Write(accessibility)
-                .Write(" ")
-                .Write(returnType)
-                .Write(" ")
-                .Write(name)
-                .Write("(")
-                .Write(string.Join(", ", parameters.Select(p => p.Key + " " + p.Value)))
-                .WriteLine(")");
-
-            return new CSharpCodeWritingScope(writer);
-        }
-
-        public static IDisposable BuildLinePragma(this CodeWriter writer, SourceSpan? span)
-        {
-            if (string.IsNullOrEmpty(span?.FilePath))
-            {
-                // Can't build a valid line pragma without a file path.
-                return NullDisposable.Default;
-            }
-
-            return new LinePragmaWriter(writer, span.Value);
-        }
-
-        private static void WriteVerbatimStringLiteral(CodeWriter writer, string literal)
-        {
-            writer.Write("@\"");
-
-            // We need to suppress indenting during the writing of the string's content. A
-            // verbatim string literal could contain newlines that don't get escaped.
-            var indent = writer.CurrentIndent;
-            writer.CurrentIndent = 0;
-
-            // We need to find the index of each '"' (double-quote) to escape it.
-            var start = 0;
-            int end;
-            while ((end = literal.IndexOf('\"', start)) > -1)
-            {
-                writer.Write(literal, start, end - start);
-
-                writer.Write("\"\"");
-
-                start = end + 1;
-            }
-
-            Debug.Assert(end == -1); // We've hit all of the double-quotes.
-
-            // Write the remainder after the last double-quote.
-            writer.Write(literal, start, literal.Length - start);
-
-            writer.Write("\"");
-
-            writer.CurrentIndent = indent;
-        }
-
-        private static void WriteCStyleStringLiteral(CodeWriter writer, string literal)
-        {
-            // From CSharpCodeGenerator.QuoteSnippetStringCStyle in CodeDOM
-            writer.Write("\"");
-
-            // We need to find the index of each escapable character to escape it.
-            var start = 0;
-            int end;
-            while ((end = literal.IndexOfAny(CStyleStringLiteralEscapeChars, start)) > -1)
-            {
-                writer.Write(literal, start, end - start);
-
-                switch (literal[end])
-                {
-                    case '\r':
-                        writer.Write("\\r");
-                        break;
-                    case '\t':
-                        writer.Write("\\t");
-                        break;
-                    case '\"':
-                        writer.Write("\\\"");
-                        break;
-                    case '\'':
-                        writer.Write("\\\'");
-                        break;
-                    case '\\':
-                        writer.Write("\\\\");
-                        break;
-                    case '\0':
-                        writer.Write("\\\0");
-                        break;
-                    case '\n':
-                        writer.Write("\\n");
-                        break;
-                    case '\u2028':
-                    case '\u2029':
-                        writer.Write("\\u");
-                        writer.Write(((int)literal[end]).ToString("X4", CultureInfo.InvariantCulture));
-                        break;
-                    default:
-                        Debug.Assert(false, "Unknown escape character.");
-                        break;
-                }
-
-                start = end + 1;
-            }
-
-            Debug.Assert(end == -1); // We've hit all of chars that need escaping.
-
-            // Write the remainder after the last escaped char.
-            writer.Write(literal, start, literal.Length - start);
-
-            writer.Write("\"");
-        }
-
-        public struct CSharpCodeWritingScope : IDisposable
-        {
-            private CodeWriter _writer;
-            private bool _autoSpace;
-            private int _tabSize;
-            private int _startIndent;
-
-            public CSharpCodeWritingScope(CodeWriter writer, int tabSize = 4, bool autoSpace = true)
-            {
-                _writer = writer;
-                _autoSpace = autoSpace;
-                _tabSize = tabSize;
-                _startIndent = -1; // Set in WriteStartScope
-
-                WriteStartScope();
-            }
-
-            public void Dispose()
-            {
-                WriteEndScope();
-            }
-
-            private void WriteStartScope()
-            {
-                TryAutoSpace(" ");
-
-                _writer.WriteLine("{");
-                _writer.CurrentIndent += _tabSize;
-                _startIndent = _writer.CurrentIndent;
-            }
-
-            private void WriteEndScope()
-            {
-                TryAutoSpace(_writer.NewLine);
-
-                // Ensure the scope hasn't been modified
-                if (_writer.CurrentIndent == _startIndent)
-                {
-                    _writer.CurrentIndent -= _tabSize;
-                }
-
-                _writer.WriteLine("}");
-            }
-
-            private void TryAutoSpace(string spaceCharacter)
-            {
-                if (_autoSpace &&
-                    _writer.Length > 0 &&
-                    !char.IsWhiteSpace(_writer[_writer.Length - 1]))
-                {
-                    _writer.Write(spaceCharacter);
-                }
-            }
-        }
-
-        private class LinePragmaWriter : IDisposable
-        {
-            private readonly CodeWriter _writer;
-            private readonly int _startIndent;
-
-            public LinePragmaWriter(CodeWriter writer, SourceSpan span)
-            {
-                if (writer == null)
-                {
-                    throw new ArgumentNullException(nameof(writer));
-                }
-
-                _writer = writer;
-                _startIndent = _writer.CurrentIndent;
-                _writer.CurrentIndent = 0;
-                WriteLineNumberDirective(writer, span);
-            }
-
-            public void Dispose()
-            {
-                // Need to add an additional line at the end IF there wasn't one already written.
-                // This is needed to work with the C# editor's handling of #line ...
-                var endsWithNewline = _writer.Length > 0 && _writer[_writer.Length - 1] == '\n';
-
-                // Always write at least 1 empty line to potentially separate code from pragmas.
-                _writer.WriteLine();
-
-                // Check if the previous empty line wasn't enough to separate code from pragmas.
-                if (!endsWithNewline)
-                {
-                    _writer.WriteLine();
-                }
-
-                _writer
-                    .WriteLine("#line default")
-                    .WriteLine("#line hidden");
-
-                _writer.CurrentIndent = _startIndent;
-            }
-        }
-
-        private class NullDisposable : IDisposable
-        {
-            public static readonly NullDisposable Default = new NullDisposable();
-
-            private NullDisposable()
-            {
-            }
-
-            public void Dispose()
-            {
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
similarity index 99%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 34fdd2d26c..9e979b515f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -8,13 +8,18 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class BindLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentBindLoweringPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Run after event handler pass
         public override int Order => 100;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var @namespace = documentNode.FindPrimaryNamespace();
             var @class = documentNode.FindPrimaryClass();
             if (@namespace == null || @class == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentDiagnosticPass.cs
similarity index 93%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentDiagnosticPass.cs
index c004e51bca..ea102fa9c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ChildContentDiagnosticPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentChildContentDiagnosticPass.cs
@@ -2,12 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class ChildContentDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentChildContentDiagnosticPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Runs after components/eventhandlers/ref/bind/templates. We want to validate every component
         // and it's usage of ChildContent.
@@ -15,6 +14,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var visitor = new Visitor();
             visitor.Visit(documentNode);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeTarget.cs
similarity index 71%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeTarget.cs
index 1437e5432b..a106dd5d5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorCodeTarget.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeTarget.cs
@@ -3,29 +3,28 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    /// <summary>
-    /// Directs a <see cref="DocumentWriter"/> to use <see cref="BlazorRuntimeNodeWriter"/>.
-    /// </summary>
-    internal class BlazorCodeTarget : CodeTarget
+    internal class ComponentCodeTarget : CodeTarget
     {
         private readonly RazorCodeGenerationOptions _options;
 
-        public BlazorCodeTarget(RazorCodeGenerationOptions options, IEnumerable<ICodeTargetExtension> extensions)
+        public ComponentCodeTarget(RazorCodeGenerationOptions options, IEnumerable<ICodeTargetExtension> extensions)
         {
             _options = options;
-            Extensions = extensions.ToArray();
+
+            // Components provide some built-in target extensions that don't apply to
+            // legacy documents.
+            Extensions = new[] { new ComponentTemplateTargetExtension(), }.Concat(extensions).ToArray();
         }
 
         public ICodeTargetExtension[] Extensions { get; }
 
         public override IntermediateNodeWriter CreateNodeWriter()
         {
-            return _options.DesignTime ? (BlazorNodeWriter)new BlazorDesignTimeNodeWriter() : new BlazorRuntimeNodeWriter();
+            return _options.DesignTime ? (IntermediateNodeWriter)new ComponentDesignTimeNodeWriter() : new ComponentRuntimeNodeWriter();
         }
 
         public override TExtension GetExtension<TExtension>()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
similarity index 94%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
index f500fedcb2..8b7c73d306 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComplexAttributeContentPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
@@ -12,13 +11,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     //
     // This is where a lot of the complexity in the Razor/TagHelpers model creeps in and we
     // might be able to avoid it if these features aren't needed.
-    internal class ComplexAttributeContentPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentComplexAttributeContentPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
-        // Run before other Blazor passes
+        // Run before other Component passes
         public override int Order => -1000;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var nodes = documentNode.FindDescendantNodes<TagHelperIntermediateNode>();
             for (var i = 0; i < nodes.Count; i++)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
similarity index 98%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 753c220e87..da3c03b2d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -11,13 +11,13 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     // Based on the DesignTimeNodeWriter from Razor repo.
-    internal class BlazorDesignTimeNodeWriter : BlazorNodeWriter
+    internal class ComponentDesignTimeNodeWriter : ComponentNodeWriter
     {
         private readonly ScopeStack _scopeStack = new ScopeStack();
 
         private static readonly string DesignTimeVariable = "__o";
 
-        public override void WriteHtmlBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
+        public override void WriteMarkupBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
         {
             if (context == null)
             {
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Do nothing
         }
 
-        public override void WriteHtmlElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
+        public override void WriteMarkupElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
         {
             if (context == null)
             {
@@ -309,7 +309,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Do nothing
         }
 
-        public override void BeginWriteAttribute(CodeWriter codeWriter, string key)
+        protected override void BeginWriteAttribute(CodeWriter codeWriter, string key)
         {
             if (codeWriter == null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index dbf5bb100d..08b9dc7b03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
@@ -25,6 +27,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return string.Equals(codeDocument.GetFileKind(), FileKinds.Component);
         }
 
+        protected override CodeTarget CreateTarget(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
+        {
+            return new ComponentCodeTarget(options, TargetExtensions);
+        }
+
         protected override void OnDocumentStructureCreated(RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, MethodDeclarationIntermediateNode method)
         {
             base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
@@ -45,7 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             @namespace.Content = computedNamespace;
 
             @class.ClassName = computedClass;
-            @class.BaseType = $"global::{CodeGenerationConstants.ComponentBase.FullTypeName}";
+            @class.BaseType = $"{CodeGenerationConstants.ComponentBase.FullTypeName}";
             var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
             if (string.IsNullOrEmpty(filePath))
             {
@@ -61,12 +68,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             @class.Modifiers.Clear();
             @class.Modifiers.Add("public");
-            @class.Modifiers.Add("sealed");
+
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var typeParamReferences = documentNode.FindDirectiveReferences(ComponentTypeParamDirective.Directive);
+            for (var i = 0; i < typeParamReferences.Count; i++)
+            {
+                var typeParamNode = (DirectiveIntermediateNode)typeParamReferences[i].Node;
+                if (typeParamNode.HasDiagnostics)
+                {
+                    continue;
+                }
+
+                @class.TypeParameters.Add(new TypeParameter() { ParameterName = typeParamNode.Tokens.First().Content, });
+            }
 
             method.MethodName = CodeGenerationConstants.ComponentBase.BuildRenderTree;
             method.ReturnType = "void";
             method.Modifiers.Clear();
-            method.Modifiers.Add("public");
+            method.Modifiers.Add("protected");
             method.Modifiers.Add("override");
 
             method.Parameters.Clear();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
similarity index 97%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index 4ee38ed992..7a731dabdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/EventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -8,12 +8,17 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class EventHandlerLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentEventHandlerLoweringPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         public override int Order => 50;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var @namespace = documentNode.FindPrimaryNamespace();
             var @class = documentNode.FindPrimaryClass();
             if (@namespace == null || @class == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs
deleted file mode 100644
index 6f7a2affa4..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentExtensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    public static class ComponentExtensions
-    {
-        public static void Register(RazorProjectEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            FunctionsDirective.Register(builder);
-            builder.Features.Add(new ComponentDocumentClassifierPass());
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
similarity index 91%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index f1932742a0..a3646ba767 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/GenericComponentPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     // 1. Adds diagnostics for missing generic type arguments
     // 2. Rewrites the type name of the component to substitute generic type arguments
     // 3. Rewrites the type names of parameters/child content to substitute generic type arguments
-    internal class GenericComponentPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentGenericTypePass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         private TypeNameFeature _typeNameFeature;
 
@@ -19,27 +19,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         // and it's usage of ChildContent.
         public override int Order => 160;
 
-        protected override void OnInitialized()
+        private TypeNameFeature TypeNameFeature
         {
-            _typeNameFeature = GetRequiredFeature<TypeNameFeature>();
+            get
+            {
+                // Doing lazy intialization here to avoid making things really complicated when we don't
+                // need to exercise this code in tests.
+                if (_typeNameFeature == null)
+                {
+                    _typeNameFeature = GetRequiredFeature<TypeNameFeature>();
+                }
+
+                return _typeNameFeature;
+            }
         }
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
-            var visitor = new Visitor(_typeNameFeature);
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
+            var visitor = new Visitor(this);
             visitor.Visit(documentNode);
         }
 
         private class Visitor : IntermediateNodeWalker
         {
-            private readonly TypeNameFeature _typeNameFeature;
+            private readonly ComponentGenericTypePass _pass;
 
             // Incrementing ID for type inference method names
             private int _id;
 
-            public Visitor(TypeNameFeature typeNameFeature)
+            public Visitor(ComponentGenericTypePass pass)
             {
-                _typeNameFeature = typeNameFeature;
+                _pass = pass;
             }
 
             public override void VisitComponent(ComponentIntermediateNode node)
@@ -82,7 +97,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     if (ValidateTypeArguments(node, bindings))
                     {
                         var mappings = bindings.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Content);
-                        RewriteTypeNames(_typeNameFeature.CreateGenericTypeRewriter(mappings), node);
+                        RewriteTypeNames(_pass.TypeNameFeature.CreateGenericTypeRewriter(mappings), node);
                     }
 
                     return;
@@ -96,7 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 // Since we're generating code in a different namespace, we need to 'global qualify' all of the types
                 // to avoid clashes with our generated code.
-                RewriteTypeNames(_typeNameFeature.CreateGlobalQualifiedTypeNameRewriter(bindings.Keys), node);
+                RewriteTypeNames(_pass.TypeNameFeature.CreateGlobalQualifiedTypeNameRewriter(bindings.Keys), node);
 
                 //
                 // We need to verify that an argument was provided that 'covers' each type parameter.
@@ -122,7 +137,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         continue;
                     }
 
-                    var typeParameters = _typeNameFeature.ParseTypeParameters(attribute.TypeName);
+                    var typeParameters = _pass.TypeNameFeature.ParseTypeParameters(attribute.TypeName);
                     if (typeParameters.Count == 0)
                     {
                         bindings.Remove(attribute.TypeName);
@@ -145,7 +160,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     // helpful as possible. So let's substitute 'object' for all of those type parameters, and add
                     // an error.
                     var mappings = bindings.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Content);
-                    RewriteTypeNames(_typeNameFeature.CreateGenericTypeRewriter(mappings), node);
+                    RewriteTypeNames(_pass.TypeNameFeature.CreateGenericTypeRewriter(mappings), node);
 
                     node.Diagnostics.Add(ComponentDiagnosticFactory.Create_GenericComponentTypeInferenceUnderspecified(node.Source, node, node.Component.GetTypeParameters()));
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentHtmlBlockPass.cs
similarity index 91%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentHtmlBlockPass.cs
index e2cb256ff8..8327b33318 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/HtmlBlockPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentHtmlBlockPass.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     //
     // Does not preserve insignificant details of the HTML, like tag closing style
     // or quote style.
-    internal class HtmlBlockPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentHtmlBlockPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Runs LATE because we want to destroy structure.
         public override int Order => 10000;
@@ -23,6 +23,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             RazorCodeDocument codeDocument,
             DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             if (documentNode.Options.DesignTime)
             {
                 // Nothing to do during design time.
@@ -114,9 +119,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         // We would store both the div and a tag in a list, but make sure to visit
         // the div first. Then when we process the div (recursively), we would remove
         // the a from the list.
-        private class FindHtmlTreeVisitor :
-            IntermediateNodeWalker,
-            IExtensionIntermediateNodeVisitor<MarkupElementIntermediateNode>
+        private class FindHtmlTreeVisitor : IntermediateNodeWalker
         {
             private bool _foundNonHtml;
 
@@ -129,7 +132,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 base.VisitDefault(node);
             }
 
-            public void VisitExtension(MarkupElementIntermediateNode node)
+            public override void VisitMarkupElement(MarkupElementIntermediateNode node)
             {
                 // We need to restore the state after processing this node.
                 // We might have found a leaf-block of HTML, but that shouldn't
@@ -226,9 +229,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private class RewriteVisitor :
-            IntermediateNodeWalker,
-            IExtensionIntermediateNodeVisitor<MarkupElementIntermediateNode>
+        private class RewriteVisitor : IntermediateNodeWalker
         {
             private readonly StringBuilder _encodingBuilder;
 
@@ -243,7 +244,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public StringBuilder Builder { get; } = new StringBuilder();
 
-            public void VisitExtension(MarkupElementIntermediateNode node)
+            public override void VisitMarkupElement(MarkupElementIntermediateNode node)
             {
                 for (var i = 0; i < _trees.Count; i++)
                 {
@@ -319,12 +320,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
             {
-                Builder.Append(node.Children);
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token)
+                    {
+                        Builder.Append(token.Content);
+                    }
+                }
             }
 
             public override void VisitHtml(HtmlContentIntermediateNode node)
             {
-                Builder.Append(node.Children);
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is IntermediateToken token)
+                    {
+                        Builder.Append(token.Content);
+                    }
+                }
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
similarity index 79%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
index a180d58f74..dea07160f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
@@ -9,7 +9,7 @@ using System.Text;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class BlazorImportProjectFeature : IImportProjectFeature
+    internal class ComponentImportProjectFeature : IImportProjectFeature
     {
         private const string ImportsFileName = "_ViewImports.cshtml";
 
@@ -33,6 +33,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(projectItem));
             }
 
+            // Don't add Component imports for a non-component.
+            if (!string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            {
+                return Array.Empty<RazorProjectItem>();
+            }
+
             var imports = new List<RazorProjectItem>()
             {
                  new VirtualProjectItem(DefaultUsingImportContent),
@@ -46,13 +52,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // Avoiding the path-specific APIs here, we want to handle all styles of paths
                 // on all platforms
                 var trimLength = projectItem.FilePath.Length + (projectItem.FilePath.StartsWith("/") ? 0 : 1);
-                var baseDirectory = projectItem.PhysicalPath.Substring(0, projectItem.PhysicalPath.Length - trimLength);
-                
-                var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
-                var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
-                if (!string.IsNullOrEmpty(baseNamespace))
+                if (projectItem.PhysicalPath.Length > trimLength)
                 {
-                    imports.Add(new VirtualProjectItem($@"@addTagHelper ""*, {baseNamespace}"""));
+                    var baseDirectory = projectItem.PhysicalPath.Substring(0, projectItem.PhysicalPath.Length - trimLength);
+                    var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
+                    var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
+                    if (!string.IsNullOrEmpty(baseNamespace))
+                    {
+                        imports.Add(new VirtualProjectItem($@"@addTagHelper ""*, {baseNamespace}"""));
+                    }
                 }
             }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
new file mode 100644
index 0000000000..3c9923008b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Much of the following is equivalent to Microsoft.AspNetCore.Mvc.Razor.Extensions's InjectDirective,
+    // but this one outputs properties annotated for Blazor's property injector, plus it doesn't need to
+    // support multiple CodeTargets.
+
+    internal class ComponentInjectDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "inject",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken("TypeName", "The type of the service to inject.");
+                builder.AddMemberToken("PropertyName", "The name of the property.");
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = "Inject a service from the application's service container into a property.";
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(FileKinds.Component, Directive);
+            builder.Features.Add(new ComponentInjectDirectivePass());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirectivePass.cs
new file mode 100644
index 0000000000..6ad554b03a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirectivePass.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentInjectDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(
+            RazorCodeDocument codeDocument,
+            DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+
+            var properties = new HashSet<string>(StringComparer.Ordinal);
+            var classNode = documentNode.FindPrimaryClass();
+
+            for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+            {
+                var directive = visitor.Directives[i];
+                var tokens = directive.Tokens.ToArray();
+                if (tokens.Length < 2)
+                {
+                    continue;
+                }
+
+                var typeName = tokens[0].Content;
+                var memberName = tokens[1].Content;
+
+                if (!properties.Add(memberName))
+                {
+                    continue;
+                }
+
+                classNode.Children.Add(new ComponentInjectIntermediateNode(typeName, memberName));
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public IList<DirectiveIntermediateNode> Directives { get; }
+                = new List<DirectiveIntermediateNode>();
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == ComponentInjectDirective.Directive)
+                {
+                    Directives.Add(node);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectIntermediateNode.cs
new file mode 100644
index 0000000000..ee0363fd7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectIntermediateNode.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentInjectIntermediateNode : ExtensionIntermediateNode
+    {
+        private static readonly IList<string> _injectedPropertyModifiers = new[]
+        {
+            $"[global::{ComponentsApi.InjectAttribute.FullTypeName}]",
+            "private" // Encapsulation is the default
+        };
+
+        public ComponentInjectIntermediateNode(string typeName, string memberName)
+        {
+            TypeName = typeName;
+            MemberName = memberName;
+        }
+
+        public string TypeName { get; }
+
+        public string MemberName { get; }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+        
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            context.CodeWriter.WriteAutoPropertyDeclaration(
+                _injectedPropertyModifiers,
+                TypeName,
+                MemberName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentIntermediateNodePassBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentIntermediateNodePassBase.cs
new file mode 100644
index 0000000000..5aa169ff4f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentIntermediateNodePassBase.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal abstract class ComponentIntermediateNodePassBase : IntermediateNodePassBase
+    {
+        protected bool IsComponentDocument(DocumentIntermediateNode document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return string.Equals(document.DocumentKind, ComponentDocumentClassifierPass.ComponentDocumentKind, StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs
similarity index 83%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs
index 0d2d586260..c746b75d7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs
@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal static class LayoutDirective
+    internal static class ComponentLayoutDirective
     {
         public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
             "layout",
@@ -25,8 +24,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
-            builder.Features.Add(new LayoutDirectivePass());
+            builder.AddDirective(FileKinds.Component, Directive);
+            builder.Features.Add(new ComponentLayoutDirectivePass());
         }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs
similarity index 92%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs
index a22160570d..b1c36f3152 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/LayoutDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class LayoutDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    internal class ComponentLayoutDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
     {
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            var directives = documentNode.FindDirectiveReferences(LayoutDirective.Directive);
+            var directives = documentNode.FindDirectiveReferences(ComponentLayoutDirective.Directive);
             if (directives.Count == 0)
             {
                 return;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
index c32df5738d..61fd26cad0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -7,13 +7,18 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class ComponentLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentLoweringPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // This pass runs earlier than our other passes that 'lower' specific kinds of attributes.
         public override int Order => 0;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var @namespace = documentNode.FindPrimaryNamespace();
             var @class = documentNode.FindPrimaryClass();
             if (@namespace == null || @class == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
similarity index 88%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index 256ffbee8f..0de9d18a89 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -10,23 +10,9 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal abstract class BlazorNodeWriter : IntermediateNodeWriter
+    internal abstract class ComponentNodeWriter : IntermediateNodeWriter, ITemplateTargetExtension
     {
-        public abstract void BeginWriteAttribute(CodeWriter codeWriter, string key);
-
-        public abstract void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node);
-
-        public abstract void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node);
-
-        public abstract void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node);
-
-        public abstract void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentIntermediateNode node);
-
-        public abstract void WriteHtmlElement(CodeRenderingContext context, MarkupElementIntermediateNode node);
-
-        public abstract void WriteHtmlBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node);
-
-        public abstract void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node);
+        protected abstract void BeginWriteAttribute(CodeWriter codeWriter, string key);
 
         protected abstract void WriteReferenceCaptureInnards(CodeRenderingContext context, ReferenceCaptureIntermediateNode node, bool shouldTypeCheck);
 
@@ -53,9 +39,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return;
         }
 
-
         // Currently the same for design time and runtime
-        public void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node)
+        public override void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node)
         {
             if (context == null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs
similarity index 82%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs
index 08b5ec74b8..80ebd9ffca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs
@@ -2,12 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class PageDirective
+    internal class ComponentPageDirective
     {
         public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
             "page",
@@ -19,7 +18,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 builder.Description = ComponentResources.PageDirective_Description;
             });
 
-        private PageDirective(string routeTemplate, IntermediateNode directiveNode)
+        private ComponentPageDirective(string routeTemplate, IntermediateNode directiveNode)
         {
             RouteTemplate = routeTemplate;
             DirectiveNode = directiveNode;
@@ -36,8 +35,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
-            builder.Features.Add(new PageDirectivePass());
+            builder.AddDirective(FileKinds.Component, Directive);
+            builder.Features.Add(new ComponentPageDirectivePass());
             return builder;
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs
similarity index 93%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs
index 224b85b503..0fe0ac5e26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/PageDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs
@@ -3,13 +3,11 @@
 
 using System;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class PageDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    internal class ComponentPageDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
     {
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
@@ -30,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            var directives = documentNode.FindDirectiveReferences(PageDirective.Directive);
+            var directives = documentNode.FindDirectiveReferences(ComponentPageDirective.Directive);
             if (directives.Count == 0)
             {
                 return;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ReferenceCaptureLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
similarity index 93%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ReferenceCaptureLoweringPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
index c5a9cbac02..aa66e07c8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ReferenceCaptureLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
@@ -1,18 +1,22 @@
 // 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 Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class ReferenceCaptureLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentReferenceCaptureLoweringPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Run after component lowering pass
         public override int Order => 50;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var @namespace = documentNode.FindPrimaryNamespace();
             var @class = documentNode.FindPrimaryClass();
             if (@namespace == null || @class == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
similarity index 98%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 4d7fc4db3c..8fcf48ec18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     /// <summary>
     /// Generates the C# code corresponding to Razor source document contents.
     /// </summary>
-    internal class BlazorRuntimeNodeWriter : BlazorNodeWriter
+    internal class ComponentRuntimeNodeWriter : ComponentNodeWriter
     {
         private readonly List<IntermediateToken> _currentAttributeValues = new List<IntermediateToken>();
         private readonly ScopeStack _scopeStack = new ScopeStack();
@@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        public override void WriteHtmlBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
+        public override void WriteMarkupBlock(CodeRenderingContext context, MarkupBlockIntermediateNode node)
         {
             if (context == null)
             {
@@ -165,7 +165,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 .WriteEndMethodInvocation();
         }
 
-        public override void WriteHtmlElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
+        public override void WriteMarkupElement(CodeRenderingContext context, MarkupElementIntermediateNode node)
         {
             if (context == null)
             {
@@ -641,7 +641,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 });
             }
         }
-
+        
         private void WriteAttribute(CodeWriter codeWriter, string key, IList<IntermediateToken> value)
         {
             BeginWriteAttribute(codeWriter, key);
@@ -649,7 +649,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             codeWriter.WriteEndMethodInvocation();
         }
 
-        public override void BeginWriteAttribute(CodeWriter codeWriter, string key)
+        protected override void BeginWriteAttribute(CodeWriter codeWriter, string key)
         {
             codeWriter
                 .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}")
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentScriptTagPass.cs
similarity index 81%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentScriptTagPass.cs
index 01086ec3ac..6fad5cfca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScriptTagPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentScriptTagPass.cs
@@ -6,14 +6,14 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class ScriptTagPass : IntermediateNodePassBase, IRazorDocumentClassifierPass
+    internal class ComponentScriptTagPass : ComponentIntermediateNodePassBase, IRazorDocumentClassifierPass
     {
         // Run as soon as possible after the Component rewrite pass
-        public override int Order => ComponentDocumentClassifierPass.DefaultFeatureOrder + 2;
+        public override int Order => 5;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
-            if (documentNode.DocumentKind != ComponentDocumentClassifierPass.ComponentDocumentKind)
+            if (!IsComponentDocument(documentNode))
             {
                 return;
             }
@@ -22,9 +22,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             visitor.Visit(documentNode);
         }
 
-        private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor<MarkupElementIntermediateNode>
+        private class Visitor : IntermediateNodeWalker
         {
-            public void VisitExtension(MarkupElementIntermediateNode node)
+            public override void VisitMarkupElement(MarkupElementIntermediateNode node)
             {
                 // Disallow <script> in components as per #552
                 if (string.Equals(node.TagName, "script", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs
similarity index 91%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs
index 89df3f3378..b545237f4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TemplateDiagnosticPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs
@@ -1,14 +1,13 @@
 // 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 Microsoft.AspNetCore.Razor.Language;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class TemplateDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentTemplateDiagnosticPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Runs after components/eventhandlers/ref/bind. We need to check for templates in all of those
         // places.
@@ -16,6 +15,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
             var visitor = new Visitor();
             visitor.Visit(documentNode);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateTargetExtension.cs
similarity index 62%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateTargetExtension.cs
index 9c90eadc94..73697c25a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorTemplateTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateTargetExtension.cs
@@ -6,11 +6,13 @@ using Microsoft.AspNetCore.Razor.Language.Extensions;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class BlazorTemplateTargetExtension : ITemplateTargetExtension
+    internal class ComponentTemplateTargetExtension : ITemplateTargetExtension
     {
         public void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node)
         {
-            ((BlazorNodeWriter)context.NodeWriter).WriteTemplate(context, node);
+            // This is OK because this will only be plugged in by the component code target
+            // not globally.
+            ((ComponentNodeWriter)context.NodeWriter).WriteTemplate(context, node);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs
similarity index 89%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs
index 558a4b2488..d0e3c12627 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TypeParamDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs
@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class TypeParamDirective
+    internal class ComponentTypeParamDirective
     {
         public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
             "typeparam",
@@ -25,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
+            builder.AddDirective(FileKinds.Component, Directive);
             return builder;
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
similarity index 80%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
index 32fc1341e6..2713f96de8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TrimWhitespacePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
@@ -1,13 +1,12 @@
 // 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 Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
-    internal class TrimWhitespacePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    internal class ComponentWhitespacePass : ComponentIntermediateNodePassBase, IRazorDirectiveClassifierPass
     {
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
@@ -21,15 +20,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(documentNode));
             }
 
-            // There's no benefit running the whitespace trimmer during design-time builds
-            if (!documentNode.Options.DesignTime)
+            if (!IsComponentDocument(documentNode))
             {
-                var method = documentNode.FindPrimaryMethod();
-                if (method != null)
-                {
-                    RemoveContiguousWhitespace(method.Children, TraversalDirection.Forwards);
-                    RemoveContiguousWhitespace(method.Children, TraversalDirection.Backwards);
-                }
+                return;
+            }
+
+            if (documentNode.Options.SuppressPrimaryMethodBody)
+            {
+                // There's no benefit running the whitespace trimmer if we're not emitting
+                // the method bodies.
+                return;
+            }
+
+            // There's no benefit running the whitespace trimmer during design-time builds
+            if (documentNode.Options.DesignTime)
+            {
+                return;
+            }
+
+            var method = documentNode.FindPrimaryMethod();
+            if (method != null)
+            {
+                RemoveContiguousWhitespace(method.Children, TraversalDirection.Forwards);
+                RemoveContiguousWhitespace(method.Children, TraversalDirection.Backwards);
             }
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs
deleted file mode 100644
index 1fcead8afa..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/InjectDirective.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    // Much of the following is equivalent to Microsoft.AspNetCore.Mvc.Razor.Extensions's InjectDirective,
-    // but this one outputs properties annotated for Blazor's property injector, plus it doesn't need to
-    // support multiple CodeTargets.
-
-    internal class InjectDirective
-    {
-        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
-            "inject",
-            DirectiveKind.SingleLine,
-            builder =>
-            {
-                builder.AddTypeToken("TypeName", "The type of the service to inject.");
-                builder.AddMemberToken("PropertyName", "The name of the property.");
-                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
-                builder.Description = "Inject a service from the application's service container into a property.";
-            });
-
-        public static void Register(RazorProjectEngineBuilder builder)
-        {
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-        }
-
-        private class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
-        {
-            protected override void ExecuteCore(
-                RazorCodeDocument codeDocument,
-                DocumentIntermediateNode documentNode)
-            {
-                var visitor = new Visitor();
-                visitor.Visit(documentNode);
-
-                var properties = new HashSet<string>(StringComparer.Ordinal);
-                var classNode = documentNode.FindPrimaryClass();
-
-                for (var i = visitor.Directives.Count - 1; i >= 0; i--)
-                {
-                    var directive = visitor.Directives[i];
-                    var tokens = directive.Tokens.ToArray();
-                    if (tokens.Length < 2)
-                    {
-                        continue;
-                    }
-
-                    var typeName = tokens[0].Content;
-                    var memberName = tokens[1].Content;
-
-                    if (!properties.Add(memberName))
-                    {
-                        continue;
-                    }
-
-                    classNode.Children.Add(new InjectIntermediateNode(typeName, memberName));
-                }
-            }
-
-            private class Visitor : IntermediateNodeWalker
-            {
-                public IList<DirectiveIntermediateNode> Directives { get; }
-                    = new List<DirectiveIntermediateNode>();
-
-                public override void VisitDirective(DirectiveIntermediateNode node)
-                {
-                    if (node.Directive == Directive)
-                    {
-                        Directives.Add(node);
-                    }
-                }
-            }
-
-            internal class InjectIntermediateNode : ExtensionIntermediateNode
-            {
-                private static readonly IList<string> _injectedPropertyModifiers = new[]
-                {
-                    $"[global::{ComponentsApi.InjectAttribute.FullTypeName}]",
-                    "private" // Encapsulation is the default
-                };
-
-                public string TypeName { get; }
-                public string MemberName { get; }
-                public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
-
-                public InjectIntermediateNode(string typeName, string memberName)
-                {
-                    TypeName = typeName;
-                    MemberName = memberName;
-                }
-
-                public override void Accept(IntermediateNodeVisitor visitor)
-                    => AcceptExtensionNode(this, visitor);
-
-                public override void WriteNode(CodeTarget target, CodeRenderingContext context)
-                    => context.CodeWriter.WriteAutoPropertyDeclaration(
-                        _injectedPropertyModifiers,
-                        TypeName,
-                        MemberName);
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs
deleted file mode 100644
index d44b29db2c..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/RazorCompilerException.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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 Microsoft.AspNetCore.Razor.Language;
-using System;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    /// <summary>
-    /// Represents a fatal error during the transformation of a Blazor component from
-    /// Razor source code to C# source code.
-    /// </summary>
-    public class RazorCompilerException : Exception
-    {
-        /// <summary>
-        /// Constructs an instance of <see cref="RazorCompilerException"/>.
-        /// </summary>
-        /// <param name="diagnostic"></param>
-        public RazorCompilerException(RazorDiagnostic diagnostic)
-        {
-            Diagnostic = diagnostic;
-        }
-
-        /// <summary>
-        /// Gets the diagnostic value.
-        /// </summary>
-        public RazorDiagnostic Diagnostic { get; }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
index 7507ac0fee..b54f339b51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
@@ -9,12 +9,15 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         private bool _designTime;
 
-        public DefaultRazorCodeGenerationOptionsBuilder(RazorConfiguration configuration)
+        public DefaultRazorCodeGenerationOptionsBuilder(RazorConfiguration configuration, string fileKind)
         {
             if (configuration == null)
             {
                 throw new ArgumentNullException(nameof(configuration));
             }
+
+            Configuration = configuration;
+            FileKind = fileKind;
         }
 
         public DefaultRazorCodeGenerationOptionsBuilder(bool designTime)
@@ -26,6 +29,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override bool DesignTime => _designTime;
 
+        public override string FileKind { get; }
+
         public override int IndentSize { get; set; } = 4;
 
         public override bool IndentWithTabs { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs
index db2a25b81f..59bba21913 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsFactoryProjectFeature.cs
@@ -15,9 +15,9 @@ namespace Microsoft.AspNetCore.Razor.Language
             _configureOptions = ProjectEngine.EngineFeatures.OfType<IConfigureRazorCodeGenerationOptionsFeature>().ToArray();
         }
 
-        public RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
+        public RazorCodeGenerationOptions Create(string fileKind, Action<RazorCodeGenerationOptionsBuilder> configure)
         {
-            var builder = new DefaultRazorCodeGenerationOptionsBuilder(ProjectEngine.Configuration);
+            var builder = new DefaultRazorCodeGenerationOptionsBuilder(ProjectEngine.Configuration, fileKind);
             configure?.Invoke(builder);
 
             for (var i = 0; i < _configureOptions.Length; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
index 9738743079..f766b4b14a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -10,6 +11,8 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         public ICollection<DirectiveDescriptor> Directives { get; } = new List<DirectiveDescriptor>();
 
+        public IDictionary<string, ICollection<DirectiveDescriptor>> DirectivesByFileKind { get; } = new Dictionary<string, ICollection<DirectiveDescriptor>>(StringComparer.OrdinalIgnoreCase);
+
         public int Order => 100;
 
         void IConfigureRazorParserOptionsFeature.Configure(RazorParserOptionsBuilder options)
@@ -25,6 +28,21 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 options.Directives.Add(directive);
             }
+
+            if (options.FileKind != null && DirectivesByFileKind.TryGetValue(options.FileKind, out var directives))
+            {
+                foreach (var directive in directives)
+                {
+                    // Replace any non-file-kind-specific directives
+                    var replaces = options.Directives.Where(d => string.Equals(d.Directive, directive.Directive, StringComparison.Ordinal)).ToArray();
+                    foreach (var replace in replaces)
+                    {
+                        options.Directives.Remove(replace);
+                    }
+
+                    options.Directives.Add(directive);
+                }
+            }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 07e1ad44c8..a25300b4ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -35,32 +35,34 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             document.Options = codeDocument.GetCodeGenerationOptions() ?? _optionsFeature.GetOptions();
 
-            IReadOnlyList<UsingReference> importedUsings = Array.Empty<UsingReference>();
-
             // The import documents should be inserted logically before the main document.
             var imports = codeDocument.GetImportSyntaxTrees();
-            if (imports != null)
-            {
-                var importsVisitor = new ImportsVisitor(document, builder, syntaxTree.Options.FeatureFlags);
+            var importedUsings = ImportDirectives(document, builder, syntaxTree.Options, imports);
 
-                for (var j = 0; j < imports.Count; j++)
+            // Lower the main document, appending after the imported directives.
+            //
+            // We need to decide up front if this document is a "component" file. This will affect how
+            // lowering behaves.
+            LoweringVisitor visitor;
+            if (string.Equals(FileKinds.Component, codeDocument.GetFileKind(), StringComparison.OrdinalIgnoreCase) &&
+                syntaxTree.Options.FeatureFlags.AllowComponentFileKind)
+            {
+                visitor = new ComponentFileKindVisitor(document, builder, syntaxTree.Options.FeatureFlags)
                 {
-                    var import = imports[j];
+                    SourceDocument = syntaxTree.Source,
+                };
 
-                    importsVisitor.SourceDocument = import.Source;
-                    importsVisitor.Visit(import.Root);
-                }
-
-                importedUsings = importsVisitor.Usings;
+                visitor.Visit(syntaxTree.Root);
             }
-
-            var tagHelperPrefix = tagHelperContext?.Prefix;
-            var visitor = new MainSourceVisitor(document, builder, tagHelperPrefix, syntaxTree.Options.FeatureFlags)
+            else
             {
-                SourceDocument = syntaxTree.Source,
-            };
+                visitor = new LegacyFileKindVisitor(document, builder, tagHelperContext?.Prefix, syntaxTree.Options.FeatureFlags)
+                {
+                    SourceDocument = syntaxTree.Source,
+                };
 
-            visitor.Visit(syntaxTree.Root);
+                visitor.Visit(syntaxTree.Root);
+            }
 
             // 1. Prioritize non-imported usings over imported ones.
             // 2. Don't import usings that already exist in primary document.
@@ -76,7 +78,6 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // In each lowering piece above, namespaces were tracked. We render them here to ensure every
             // lowering action has a chance to add a source location to a namespace. Ultimately, closest wins.
-
             var i = 0;
             foreach (var reference in usingReferences)
             {
@@ -89,7 +90,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 builder.Insert(i++, @using);
             }
 
-            ImportDirectives(document);
+            PostProcessImportedDirectives(document);
 
             // The document should contain all errors that currently exist in the system. This involves
             // adding the errors from the primary and imported syntax trees.
@@ -113,15 +114,36 @@ namespace Microsoft.AspNetCore.Razor.Language
             codeDocument.SetDocumentIntermediateNode(document);
         }
 
-        private void ImportDirectives(DocumentIntermediateNode document)
+        private IReadOnlyList<UsingReference> ImportDirectives(
+            DocumentIntermediateNode document,
+            IntermediateNodeBuilder builder,
+            RazorParserOptions options,
+            IReadOnlyList<RazorSyntaxTree> imports)
         {
-            var visitor = new DirectiveVisitor();
-            visitor.VisitDocument(document);
-
-            var seenDirectives = new HashSet<DirectiveDescriptor>();
-            for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+            if (imports == null)
             {
-                var reference = visitor.Directives[i];
+                return Array.Empty<UsingReference>();
+            }
+
+            var importsVisitor = new ImportsVisitor(document, builder, options.FeatureFlags);
+            for (var i = 0; i < imports.Count; i++)
+            {
+                var import = imports[i];
+
+                importsVisitor.SourceDocument = import.Source;
+                importsVisitor.Visit(import.Root);
+            }
+
+            return importsVisitor.Usings;
+        }
+
+        private void PostProcessImportedDirectives(DocumentIntermediateNode document)
+        {
+            var directives = document.FindDescendantReferences<DirectiveIntermediateNode>();
+            var seenDirectives = new HashSet<DirectiveDescriptor>();
+            for (var i = directives.Count - 1; i >= 0; i--)
+            {
+                var reference = directives[i];
                 var directive = (DirectiveIntermediateNode)reference.Node;
                 var descriptor = directive.Directive;
                 var seenDirective = !seenDirectives.Add(descriptor);
@@ -134,24 +156,29 @@ namespace Microsoft.AspNetCore.Razor.Language
                 switch (descriptor.Kind)
                 {
                     case DirectiveKind.SingleLine:
-                        if (seenDirective && descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
                         {
-                            // This directive has been overridden, it should be removed from the document.
+                            if (seenDirective && descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
+                            {
+                                // This directive has been overridden, it should be removed from the document.
+                                break;
+                            }
+
+                            continue;
+                        }
+
+                    case DirectiveKind.RazorBlock:
+                    case DirectiveKind.CodeBlock:
+                        {
+                            if (descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
+                            {
+                                // A block directive cannot be imported.
+                                document.Diagnostics.Add(
+                                    RazorDiagnosticFactory.CreateDirective_BlockDirectiveCannotBeImported(descriptor.Directive));
+                            }
 
                             break;
                         }
 
-                        continue;
-                    case DirectiveKind.RazorBlock:
-                    case DirectiveKind.CodeBlock:
-                        if (descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
-                        {
-                            // A block directive cannot be imported.
-
-                            document.Diagnostics.Add(
-                                RazorDiagnosticFactory.CreateDirective_BlockDirectiveCannotBeImported(descriptor.Directive));
-                        }
-                        break;
                     default:
                         throw new InvalidOperationException(Resources.FormatUnexpectedDirectiveKind(typeof(DirectiveKind).FullName));
                 }
@@ -406,12 +433,13 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
-        private class MainSourceVisitor : LoweringVisitor
+        // Lowers a document using *html-as-text* and Tag Helpers
+        private class LegacyFileKindVisitor : LoweringVisitor
         {
             private readonly HashSet<string> _renderedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
             private readonly string _tagHelperPrefix;
 
-            public MainSourceVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, string tagHelperPrefix, RazorParserFeatureFlags featureFlags)
+            public LegacyFileKindVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, string tagHelperPrefix, RazorParserFeatureFlags featureFlags)
                 : base(document, builder, featureFlags)
             {
                 _tagHelperPrefix = tagHelperPrefix;
@@ -1057,6 +1085,665 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
+        // Lowers a document using *html-as-nodes* and Components
+        private class ComponentFileKindVisitor : LoweringVisitor
+        {
+            private readonly HashSet<string> _renderedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            public ComponentFileKindVisitor(
+                DocumentIntermediateNode document,
+                IntermediateNodeBuilder builder,
+                RazorParserFeatureFlags featureFlags)
+                : base(document, builder, featureFlags)
+            {
+            }
+
+            public override void DefaultVisit(SyntaxNode node)
+            {
+                base.DefaultVisit(node);
+            }
+
+            public override void VisitMarkupElement(MarkupElementSyntax node)
+            {
+                _builder.Push(new MarkupElementIntermediateNode()
+                {
+                    Source = BuildSourceSpanFromNode(node),
+
+                    // Could be empty while the tag is being typed in.
+                    TagName = node.StartTag?.GetTagName() ?? node.EndTag?.GetTagName() ?? string.Empty,
+                });
+
+                base.VisitMarkupElement(node);
+
+                _builder.Pop();
+            }
+
+            public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
+            {
+                // We want to skip over the other misc tokens that make up a start tag, and 
+                // just process the attributes.
+                //
+                // Visit the attributes
+                foreach (var block in node.Children)
+                {
+                    if (block is MarkupAttributeBlockSyntax attribute)
+                    {
+                        VisitMarkupAttributeBlock(attribute);
+                    }
+                    else if (block is MarkupMinimizedAttributeBlockSyntax minimized)
+                    {
+                        VisitMarkupMinimizedAttributeBlock(minimized);
+                    }
+                }
+            }
+
+            public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
+            {
+                // We want to skip over the other misc tokens that make up a start tag, and 
+                // just process the attributes.
+                //
+                // Nothing to do here
+            }
+
+            // Example
+            // <input` checked="hello-world @false"`/>
+            //  Name=checked
+            //  Prefix= checked="
+            //  Suffix="
+            public override void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+            {
+                // For now we're using HtmlAttributeIntermediateNode for these so we're still
+                // building Prefix and Suffix, even though we don't really use them. If we
+                // end up using another node type in the future this can be simplified quite
+                // a lot.
+                var prefixTokens = MergeLiterals(
+                    node.NamePrefix?.LiteralTokens,
+                    node.Name.LiteralTokens,
+                    node.NameSuffix?.LiteralTokens,
+                    node.EqualsToken == null ? new SyntaxList<SyntaxToken>() : new SyntaxList<SyntaxToken>(node.EqualsToken),
+                    node.ValuePrefix?.LiteralTokens);
+                var prefix = (MarkupTextLiteralSyntax)SyntaxFactory.MarkupTextLiteral(prefixTokens).Green.CreateRed(node, node.NamePrefix?.Position ?? node.Name.Position);
+
+                var name = node.Name.GetContent();
+                _builder.Push(new HtmlAttributeIntermediateNode()
+                {
+                    AttributeName = node.Name.GetContent(),
+                    Prefix = prefix.GetContent(),
+                    Suffix = node.ValueSuffix?.GetContent() ?? string.Empty,
+                    Source = BuildSourceSpanFromNode(node),
+                });
+
+                Visit(node.Value);
+
+                _builder.Pop();
+            }
+
+            public override void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+            {
+                var prefixTokens = MergeLiterals(node.NamePrefix?.LiteralTokens, node.Name.LiteralTokens);
+                var prefix = (MarkupTextLiteralSyntax)SyntaxFactory.MarkupTextLiteral(prefixTokens).Green.CreateRed(node, node.NamePrefix?.Position ?? node.Name.Position);
+
+                var name = node.Name.GetContent();
+                _builder.Add(new HtmlAttributeIntermediateNode()
+                {
+                    AttributeName = node.Name.GetContent(),
+                    Prefix = prefix.GetContent(),
+                    Suffix = null,
+                    Source = BuildSourceSpanFromNode(node),
+                });
+            }
+
+            // Example
+            // <input checked="hello-world `@false`"/>
+            //  Prefix= (space)
+            //  Children will contain a token for @false.
+            public override void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+            {
+                var containsExpression = false;
+                var descendantNodes = node.DescendantNodes(n =>
+                {
+                    // Don't go into sub block. They may contain expressions but we only care about the top level.
+                    return !(n.Parent is CSharpCodeBlockSyntax);
+                });
+                foreach (var child in descendantNodes)
+                {
+                    if (child is CSharpImplicitExpressionSyntax || child is CSharpExplicitExpressionSyntax)
+                    {
+                        containsExpression = true;
+                    }
+                }
+
+                if (containsExpression)
+                {
+                    _builder.Push(new CSharpExpressionAttributeValueIntermediateNode()
+                    {
+                        Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+                }
+                else
+                {
+                    _builder.Push(new CSharpCodeAttributeValueIntermediateNode()
+                    {
+                        Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+                }
+
+                Visit(node.Value);
+
+                _builder.Pop();
+            }
+
+            public override void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                _builder.Push(new HtmlAttributeValueIntermediateNode()
+                {
+                    Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                    Source = BuildSourceSpanFromNode(node),
+                });
+
+                _builder.Add(new IntermediateToken()
+                {
+                    Content = node.Value?.GetContent() ?? string.Empty,
+                    Kind = TokenKind.Html,
+                    Source = BuildSourceSpanFromNode(node.Value)
+                });
+
+                _builder.Pop();
+            }
+
+            public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator == SpanChunkGenerator.Null)
+                {
+                    return;
+                }
+
+                if (node.LiteralTokens.Count == 1)
+                {
+                    var token = node.LiteralTokens[0];
+                    if (token != null &&
+                        token.Kind == SyntaxKind.Marker &&
+                        token.Content.Length == 0)
+                    {
+                        // We don't want to create IR nodes for marker tokens.
+                        return;
+                    }
+                }
+
+                // Combine chunks of HTML literal text if possible.
+                var source = BuildSourceSpanFromNode(node);
+                var currentChildren = _builder.Current.Children;
+                if (currentChildren.Count > 0 &&
+                    currentChildren[currentChildren.Count - 1] is HtmlContentIntermediateNode existingHtmlContent)
+                {
+                    if (existingHtmlContent.Source == null && source == null)
+                    {
+                        Combine(existingHtmlContent, node);
+                        return;
+                    }
+
+                    if (source != null &&
+                        existingHtmlContent.Source != null &&
+                        existingHtmlContent.Source.Value.FilePath == source.Value.FilePath &&
+                        existingHtmlContent.Source.Value.AbsoluteIndex + existingHtmlContent.Source.Value.Length == source.Value.AbsoluteIndex)
+                    {
+                        Combine(existingHtmlContent, node);
+                        return;
+                    }
+                }
+
+                _builder.Add(new HtmlContentIntermediateNode()
+                {
+                    Source = source,
+                    Children =
+                    {
+                        new IntermediateToken()
+                        {
+                            Content = node.GetContent(),
+                            Kind = TokenKind.Html,
+                            Source = source,
+                        }
+                    }
+                });
+            }
+
+            public override void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+            {
+                var templateNode = new TemplateIntermediateNode();
+                _builder.Push(templateNode);
+
+                base.VisitCSharpTemplateBlock(node);
+
+                _builder.Pop();
+
+                if (templateNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = templateNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = templateNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        templateNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            // CSharp expressions are broken up into blocks and spans because Razor allows Razor comments
+            // inside an expression.
+            // Ex:
+            //      @DateTime.@*This is a comment*@Now
+            //
+            // We need to capture this in the IR so that we can give each piece the correct source mappings
+            public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+            {
+                if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
+                {
+                    base.VisitCSharpExplicitExpression(node);
+                    return;
+                }
+
+                var expressionNode = new CSharpExpressionIntermediateNode();
+
+                _builder.Push(expressionNode);
+
+                base.VisitCSharpExplicitExpression(node);
+
+                _builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = expressionNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        expressionNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+            {
+                if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
+                {
+                    base.VisitCSharpImplicitExpression(node);
+                    return;
+                }
+
+                var expressionNode = new CSharpExpressionIntermediateNode();
+
+                _builder.Push(expressionNode);
+
+                base.VisitCSharpImplicitExpression(node);
+
+                _builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = expressionNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        expressionNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                if (_builder.Current is TagHelperHtmlAttributeIntermediateNode)
+                {
+                    // If we are top level in a tag helper HTML attribute, we want to be rendered as markup.
+                    // This case happens for duplicate non-string bound attributes. They would be initially be categorized as
+                    // CSharp but since they are duplicate, they should just be markup.
+                    var markupLiteral = SyntaxFactory.MarkupTextLiteral(node.LiteralTokens).Green.CreateRed(node.Parent, node.Position);
+                    Visit(markupLiteral);
+                    return;
+                }
+
+                _builder.Add(new IntermediateToken()
+                {
+                    Content = node.GetContent(),
+                    Kind = TokenKind.CSharp,
+                    Source = BuildSourceSpanFromNode(node),
+                });
+
+                base.VisitCSharpExpressionLiteral(node);
+            }
+
+            public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context == null || context.ChunkGenerator is StatementChunkGenerator)
+                {
+                    var isAttributeValue = _builder.Current is CSharpCodeAttributeValueIntermediateNode;
+
+                    if (!isAttributeValue)
+                    {
+                        var statementNode = new CSharpCodeIntermediateNode()
+                        {
+                            Source = BuildSourceSpanFromNode(node)
+                        };
+                        _builder.Push(statementNode);
+                    }
+
+                    _builder.Add(new IntermediateToken()
+                    {
+                        Content = node.GetContent(),
+                        Kind = TokenKind.CSharp,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    if (!isAttributeValue)
+                    {
+                        _builder.Pop();
+                    }
+                }
+
+                base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+            {
+                var info = node.TagHelperInfo;
+                var tagName = info.TagName;
+                var tagHelperNode = new TagHelperIntermediateNode()
+                {
+                    TagName = tagName,
+                    TagMode = info.TagMode,
+                    Source = BuildSourceSpanFromNode(node)
+                };
+
+                foreach (var tagHelper in info.BindingResult.Descriptors)
+                {
+                    tagHelperNode.TagHelpers.Add(tagHelper);
+                }
+
+                _builder.Push(tagHelperNode);
+
+                _builder.Push(new TagHelperBodyIntermediateNode());
+
+                foreach (var item in node.Body)
+                {
+                    Visit(item);
+                }
+
+                _builder.Pop(); // Pop InitializeTagHelperStructureIntermediateNode
+
+                Visit(node.StartTag);
+
+                _builder.Pop(); // Pop TagHelperIntermediateNode
+
+                // No need to visit the end tag because we don't write any IR for it.
+
+                // We don't want to track attributes from a previous tag helper element.
+                _renderedBoundAttributeNames.Clear();
+            }
+
+            public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+            {
+                foreach (var child in node.Children)
+                {
+                    if (child is MarkupTagHelperAttributeSyntax || child is MarkupMinimizedTagHelperAttributeSyntax)
+                    {
+                        Visit(child);
+                    }
+                }
+            }
+
+            public override void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+            {
+                if (!_featureFlags.AllowMinimizedBooleanTagHelperAttributes)
+                {
+                    // Minimized attributes are not valid for non-boolean bound attributes. TagHelperBlockRewriter
+                    // has already logged an error if it was a non-boolean bound attribute; so we can skip.
+                    return;
+                }
+
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.Name.GetContent();
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        {
+                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
+                        });
+
+                        var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
+
+                        if (!expectsBooleanValue)
+                        {
+                            // We do not allow minimized non-boolean bound attributes.
+                            return;
+                        }
+
+                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                        {
+                            AttributeName = attributeName,
+                            BoundAttribute = associatedAttributeDescriptor,
+                            TagHelper = associatedDescriptor,
+                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                            Source = null,
+                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
+                        };
+
+                        _builder.Add(setTagHelperProperty);
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Add(addHtmlAttribute);
+                }
+            }
+
+            public override void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+            {
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.Name.GetContent();
+                var attributeValueNode = node.Value;
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        {
+                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
+                        });
+
+                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                        {
+                            AttributeName = attributeName,
+                            BoundAttribute = associatedAttributeDescriptor,
+                            TagHelper = associatedDescriptor,
+                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                            Source = BuildSourceSpanFromNode(attributeValueNode),
+                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
+                        };
+
+                        _builder.Push(setTagHelperProperty);
+                        VisitAttributeValue(attributeValueNode);
+                        _builder.Pop();
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Push(addHtmlAttribute);
+                    VisitAttributeValue(attributeValueNode);
+                    _builder.Pop();
+                }
+            }
+
+            private void VisitAttributeValue(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return;
+                }
+
+                IReadOnlyList<SyntaxNode> children = node.ChildNodes();
+                var position = node.Position;
+                if (children.First() is MarkupBlockSyntax markupBlock &&
+                    markupBlock.Children.Count == 2 &&
+                    markupBlock.Children[0] is MarkupTextLiteralSyntax &&
+                    markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)
+                {
+                    // This is a special case when we have an attribute like attr="@@foo".
+                    // In this case, we want the foo to be written out as HtmlContent and not HtmlAttributeValue.
+                    Visit(markupBlock);
+                    children = children.Skip(1).ToList();
+                    position = children.Count > 0 ? children[0].Position : position;
+                }
+
+                if (children.All(c => c is MarkupLiteralAttributeValueSyntax))
+                {
+                    var literalAttributeValueNodes = children.Cast<MarkupLiteralAttributeValueSyntax>().ToArray();
+                    var valueTokens = SyntaxListBuilder<SyntaxToken>.Create();
+                    for (var i = 0; i < literalAttributeValueNodes.Length; i++)
+                    {
+                        var mergedValue = MergeAttributeValue(literalAttributeValueNodes[i]);
+                        valueTokens.AddRange(mergedValue.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.MarkupTextLiteral(valueTokens.ToList()).Green.CreateRed(node.Parent, position);
+                    Visit(rewritten);
+                }
+                else if (children.All(c => c is MarkupTextLiteralSyntax))
+                {
+                    var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                    var markupLiteralArray = children.Cast<MarkupTextLiteralSyntax>();
+                    foreach (var literal in markupLiteralArray)
+                    {
+                        builder.AddRange(literal.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.MarkupTextLiteral(builder.ToList()).Green.CreateRed(node.Parent, position);
+                    Visit(rewritten);
+                }
+                else if (children.All(c => c is CSharpExpressionLiteralSyntax))
+                {
+                    var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                    var expressionLiteralArray = children.Cast<CSharpExpressionLiteralSyntax>();
+                    SpanContext context = null;
+                    foreach (var literal in expressionLiteralArray)
+                    {
+                        context = literal.GetSpanContext();
+                        builder.AddRange(literal.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.CSharpExpressionLiteral(builder.ToList()).Green.CreateRed(node.Parent, position);
+                    rewritten = context != null ? rewritten.WithSpanContext(context) : rewritten;
+                    Visit(rewritten);
+                }
+                else
+                {
+                    Visit(node);
+                }
+            }
+
+            private MarkupTextLiteralSyntax MergeAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                var valueTokens = MergeLiterals(node.Prefix?.LiteralTokens, node.Value?.LiteralTokens);
+                var rewritten = node.Prefix?.Update(valueTokens) ?? node.Value?.Update(valueTokens);
+                rewritten = (MarkupTextLiteralSyntax)rewritten?.Green.CreateRed(node, node.Position);
+                var originalContext = rewritten.GetSpanContext();
+                if (originalContext != null)
+                {
+                    rewritten = rewritten.WithSpanContext(new SpanContext(new MarkupChunkGenerator(), originalContext.EditHandler));
+                }
+
+                return rewritten;
+            }
+
+            private void Combine(HtmlContentIntermediateNode node, SyntaxNode item)
+            {
+                node.Children.Add(new IntermediateToken()
+                {
+                    Content = item.GetContent(),
+                    Kind = TokenKind.Html,
+                    Source = BuildSourceSpanFromNode(item),
+                });
+
+                if (node.Source != null)
+                {
+                    Debug.Assert(node.Source.Value.FilePath != null);
+
+                    node.Source = new SourceSpan(
+                        node.Source.Value.FilePath,
+                        node.Source.Value.AbsoluteIndex,
+                        node.Source.Value.LineIndex,
+                        node.Source.Value.CharacterIndex,
+                        node.Source.Value.Length + item.FullWidth);
+                }
+            }
+
+            private SyntaxList<SyntaxToken> MergeLiterals(params SyntaxList<SyntaxToken>?[] literals)
+            {
+                var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                for (var i = 0; i < literals.Length; i++)
+                {
+                    var literal = literals[i];
+                    if (!literal.HasValue)
+                    {
+                        continue;
+                    }
+
+                    builder.AddRange(literal.Value);
+                }
+
+                return builder.ToList();
+            }
+        }
+
         private class ImportsVisitor : LoweringVisitor
         {
             public ImportsVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, RazorParserFeatureFlags featureFlags)
@@ -1099,18 +1786,6 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
-        private class DirectiveVisitor : IntermediateNodeWalker
-        {
-            public List<IntermediateNodeReference> Directives = new List<IntermediateNodeReference>();
-
-            public override void VisitDirective(DirectiveIntermediateNode node)
-            {
-                Directives.Add(new IntermediateNodeReference(Parent, node));
-
-                base.VisitDirective(node);
-            }
-        }
-
         private static bool IsMalformed(IEnumerable<RazorDiagnostic> diagnostics)
             => diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
index 2e4d3273d2..1f3deb7213 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         private bool _designTime;
 
-        public DefaultRazorParserOptionsBuilder(RazorConfiguration configuration)
+        public DefaultRazorParserOptionsBuilder(RazorConfiguration configuration, string fileKind)
         {
             if (configuration == null)
             {
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             Configuration = configuration;
             LanguageVersion = configuration.LanguageVersion;
+            FileKind = fileKind;
         }
 
         public DefaultRazorParserOptionsBuilder(bool designTime, RazorLanguageVersion version)
@@ -34,6 +35,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override ICollection<DirectiveDescriptor> Directives { get; } = new List<DirectiveDescriptor>();
 
+        public override string FileKind { get; }
+
         public override bool ParseLeadingDirectives { get; set; }
 
         public override RazorLanguageVersion LanguageVersion { get; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs
index 32fb04af7f..28d9306242 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFactoryProjectFeature.cs
@@ -15,9 +15,9 @@ namespace Microsoft.AspNetCore.Razor.Language
             _configureOptions = ProjectEngine.EngineFeatures.OfType<IConfigureRazorParserOptionsFeature>().ToArray();
         }
 
-        public RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure)
+        public RazorParserOptions Create(string fileKind, Action<RazorParserOptionsBuilder> configure)
         {
-            var builder = new DefaultRazorParserOptionsBuilder(ProjectEngine.Configuration);
+            var builder = new DefaultRazorParserOptionsBuilder(ProjectEngine.Configuration, fileKind);
             configure?.Invoke(builder);
 
             for (var i = 0; i < _configureOptions.Length; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
index 4b9b50ef8e..1099be4c72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
@@ -62,24 +62,55 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(projectItem));
             }
 
-            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
-
-            var importFeature = GetRequiredFeature<IImportProjectFeature>();
-            var importItems = importFeature.GetImports(projectItem);
-            var importSourceDocuments = GetImportSourceDocuments(importItems);
-
-            return CreateCodeDocumentCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null);
+            return CreateCodeDocumentCore(projectItem, configureParser: null, configureCodeGeneration: null);
         }
 
-        internal override RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument sourceDocument, string fileKind, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        protected RazorCodeDocument CreateCodeDocumentCore(
+            RazorProjectItem projectItem, 
+            Action<RazorParserOptionsBuilder> configureParser, 
+            Action<RazorCodeGenerationOptionsBuilder> configureCodeGeneration)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+
+            var importItems = new List<RazorProjectItem>();
+            var features = ProjectFeatures.OfType<IImportProjectFeature>();
+            foreach (var feature in features)
+            {
+                importItems.AddRange(feature.GetImports(projectItem));
+            }
+
+            var importSourceDocuments = GetImportSourceDocuments(importItems);
+            return CreateCodeDocumentCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null, configureParser, configureCodeGeneration);
+        }
+
+        protected RazorCodeDocument CreateCodeDocumentCore(
+            RazorSourceDocument sourceDocument, 
+            string fileKind, 
+            IReadOnlyList<RazorSourceDocument> importSourceDocuments, 
+            IReadOnlyList<TagHelperDescriptor> tagHelpers,
+            Action<RazorParserOptionsBuilder> configureParser,
+            Action<RazorCodeGenerationOptionsBuilder> configureCodeGeneration)
         {
             if (sourceDocument == null)
             {
                 throw new ArgumentNullException(nameof(sourceDocument));
             }
 
-            var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(ConfigureParserOptions);
-            var codeGenerationOptions = GetRequiredFeature<IRazorCodeGenerationOptionsFactoryProjectFeature>().Create(ConfigureCodeGenerationOptions);
+            var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(fileKind, builder =>
+            {
+                ConfigureParserOptions(builder);
+                configureParser?.Invoke(builder);
+            });
+            var codeGenerationOptions = GetRequiredFeature<IRazorCodeGenerationOptionsFactoryProjectFeature>().Create(fileKind, builder =>
+            {
+                ConfigureCodeGenerationOptions(builder);
+                configureCodeGeneration?.Invoke(builder);
+            });
 
             var codeDocument = RazorCodeDocument.Create(sourceDocument, importSourceDocuments, parserOptions, codeGenerationOptions);
             codeDocument.SetTagHelpers(tagHelpers);
@@ -99,24 +130,55 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(projectItem));
             }
 
-            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
-
-            var importFeature = GetRequiredFeature<IImportProjectFeature>();
-            var importItems = importFeature.GetImports(projectItem);
-            var importSourceDocuments = GetImportSourceDocuments(importItems, suppressExceptions: true);
-
-            return CreateCodeDocumentDesignTimeCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null);
+            return CreateCodeDocumentDesignTimeCore(projectItem, configureParser: null, configureCodeGeneration: null);
         }
 
-        internal override RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument sourceDocument, string fileKind, IReadOnlyList<RazorSourceDocument> importSourceDocuments, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        protected RazorCodeDocument CreateCodeDocumentDesignTimeCore(
+            RazorProjectItem projectItem,
+            Action<RazorParserOptionsBuilder> configureParser,
+            Action<RazorCodeGenerationOptionsBuilder> configureCodeGeneration)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+
+            var importItems = new List<RazorProjectItem>();
+            var features = ProjectFeatures.OfType<IImportProjectFeature>();
+            foreach (var feature in features)
+            {
+                importItems.AddRange(feature.GetImports(projectItem));
+            }
+
+            var importSourceDocuments = GetImportSourceDocuments(importItems, suppressExceptions: true);
+            return CreateCodeDocumentDesignTimeCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null, configureParser, configureCodeGeneration);
+        }
+
+        protected RazorCodeDocument CreateCodeDocumentDesignTimeCore(
+            RazorSourceDocument sourceDocument, 
+            string fileKind, 
+            IReadOnlyList<RazorSourceDocument> importSourceDocuments, 
+            IReadOnlyList<TagHelperDescriptor> tagHelpers,
+            Action<RazorParserOptionsBuilder> configureParser,
+            Action<RazorCodeGenerationOptionsBuilder> configureCodeGeneration)
         {
             if (sourceDocument == null)
             {
                 throw new ArgumentNullException(nameof(sourceDocument));
             }
 
-            var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(ConfigureDesignTimeParserOptions);
-            var codeGenerationOptions = GetRequiredFeature<IRazorCodeGenerationOptionsFactoryProjectFeature>().Create(ConfigureDesignTimeCodeGenerationOptions);
+            var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(fileKind, builder =>
+            {
+                ConfigureDesignTimeParserOptions(builder);
+                configureParser?.Invoke(builder);
+            });
+            var codeGenerationOptions = GetRequiredFeature<IRazorCodeGenerationOptionsFactoryProjectFeature>().Create(fileKind, builder =>
+            {
+                ConfigureDesignTimeCodeGenerationOptions(builder);
+                configureCodeGeneration?.Invoke(builder);
+            });
 
             var codeDocument = RazorCodeDocument.Create(sourceDocument, importSourceDocuments, parserOptions, codeGenerationOptions);
             codeDocument.SetTagHelpers(tagHelpers);
@@ -129,6 +191,62 @@ namespace Microsoft.AspNetCore.Razor.Language
             return codeDocument;
         }
 
+        public override RazorCodeDocument Process(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var codeDocument = CreateCodeDocumentCore(source, fileKind, importSources, tagHelpers, configureParser: null, configureCodeGeneration: null);
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        public override RazorCodeDocument ProcessDeclarationOnly(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var codeDocument = CreateCodeDocumentCore(projectItem, configureParser: null, configureCodeGeneration: (builder) =>
+            {
+                builder.SuppressPrimaryMethodBody = true;
+            });
+
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        public override RazorCodeDocument ProcessDeclarationOnly(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var codeDocument = CreateCodeDocumentCore(source, fileKind, importSources, tagHelpers, configureParser: null, configureCodeGeneration: (builder) =>
+            {
+                builder.SuppressPrimaryMethodBody = true;
+            });
+
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
+        public override RazorCodeDocument ProcessDesignTime(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var codeDocument = CreateCodeDocumentDesignTimeCore(source, fileKind, importSources, tagHelpers, configureParser: null, configureCodeGeneration: null);
+            ProcessCore(codeDocument);
+            return codeDocument;
+        }
+
         protected override void ProcessCore(RazorCodeDocument codeDocument)
         {
             if (codeDocument == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs
index b72c90dd2f..ae8a0c44c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DocumentClassifierPassBase.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
@@ -10,15 +11,14 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     public abstract class DocumentClassifierPassBase : IntermediateNodePassBase, IRazorDocumentClassifierPass
     {
-        private static readonly ICodeTargetExtension[] EmptyExtensionArray = new ICodeTargetExtension[0];
-        private ICodeTargetExtension[] _targetExtensions;
-
         protected abstract string DocumentKind { get; }
 
+        protected IReadOnlyList<ICodeTargetExtension> TargetExtensions { get; private set; }
+
         protected override void OnInitialized()
         {
             var feature = Engine.Features.OfType<IRazorTargetExtensionFeature>();
-            _targetExtensions = feature.FirstOrDefault()?.TargetExtensions.ToArray() ?? EmptyExtensionArray;
+            TargetExtensions = feature.FirstOrDefault()?.TargetExtensions.ToArray() ?? Array.Empty<ICodeTargetExtension>();
         }
 
         protected sealed override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
@@ -35,6 +35,10 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             documentNode.DocumentKind = DocumentKind;
             documentNode.Target = CreateTarget(codeDocument, documentNode.Options);
+            if (documentNode.Target == null)
+            {
+                throw new InvalidOperationException($"{nameof(CreateTarget)} must return a non-null {nameof(CodeTarget)}.");
+            }
 
             Rewrite(codeDocument, documentNode);
         }
@@ -80,13 +84,14 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         protected abstract bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
 
-        private CodeTarget CreateTarget(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
+        // virtual to allow replacing the code target wholesale.
+        protected virtual CodeTarget CreateTarget(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
         {
             return CodeTarget.CreateDefault(codeDocument, options, (builder) =>
             {
-                for (var i = 0; i < _targetExtensions.Length; i++)
+                for (var i = 0; i < TargetExtensions.Count; i++)
                 {
-                    builder.TargetExtensions.Add(_targetExtensions[i]);
+                    builder.TargetExtensions.Add(TargetExtensions[i]);
                 }
 
                 ConfigureTarget(builder);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs
similarity index 91%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs
index ec450ea8a2..b160ff8773 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs
@@ -2,9 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
 {
     internal static class ImplementsDirective
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirectivePass.cs
similarity index 88%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirectivePass.cs
index e67b22736c..efd06a4152 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ImplementsDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirectivePass.cs
@@ -3,11 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
 {
     internal class ImplementsDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs
index 4383b2e27a..89bbde1075 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/MetadataAttributePass.cs
@@ -1,8 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Extensions
@@ -26,6 +28,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 return;
             }
 
+            if (string.Equals(documentNode.DocumentKind, ComponentDocumentClassifierPass.ComponentDocumentKind, StringComparison.Ordinal))
+            {
+                // Metadata attributes are not used for components.
+                return;
+            }
+
             // We need to be able to compute the data we need for the [RazorCompiledItem] attribute - that includes
             // a full type name, and a document kind, and optionally an identifier.
             // 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKindDirectiveFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKindDirectiveFeature.cs
new file mode 100644
index 0000000000..88bd6230c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKindDirectiveFeature.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    class FileKindDirectiveFeature
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
index a1163e702e..030bcf6b6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
-    internal static class FileKinds
+    public static class FileKinds
     {
         public static readonly string Component = "component";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs
index 6d3ed5156c..52b3ad66b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorCodeGenerationOptionsFactoryProjectFeature.cs
@@ -7,6 +7,6 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal interface IRazorCodeGenerationOptionsFactoryProjectFeature : IRazorProjectEngineFeature
     {
-        RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure);
+        RazorCodeGenerationOptions Create(string fileKind, Action<RazorCodeGenerationOptionsBuilder> configure);
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs
index e73bf8babc..af64f5826a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/IRazorParserOptionsFactoryProjectFeature.cs
@@ -7,6 +7,6 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal interface IRazorParserOptionsFactoryProjectFeature : IRazorProjectEngineFeature
     {
-        RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure);
+        RazorParserOptions Create(string fileKind, Action<RazorParserOptionsBuilder> configure);
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
index 19edf3ece7..f3cb7feea0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
         // An optional type inference node. This will be populated (and point to a different part of the tree)
         // if this component call site requires type inference.
         public ComponentTypeInferenceMethodIntermediateNode TypeInferenceNode { get; set; }
-        
+
         public string TypeName { get; set; }
 
         public override void Accept(IntermediateNodeVisitor visitor)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
index 933525c260..af4c6c41af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -154,6 +154,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             VisitDefault(node);
         }
 
+        public virtual void VisitMarkupElement(MarkupElementIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
+        public virtual void VisitMarkupBlock(MarkupBlockIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
         public virtual void VisitReferenceCapture(ReferenceCaptureIntermediateNode node)
         {
             VisitDefault(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs
index 52369b351b..c3481722c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupBlockIntermediateNode.cs
@@ -2,14 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Diagnostics;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    internal class MarkupBlockIntermediateNode : ExtensionIntermediateNode
+    public sealed class MarkupBlockIntermediateNode : IntermediateNode
     {
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
@@ -22,25 +18,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<MarkupBlockIntermediateNode>(this, visitor);
+            visitor.VisitMarkupBlock(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
 
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteHtmlBlock(context, this);
+            formatter.WriteContent(Content);
         }
-
-        private string DebuggerDisplay => Content;
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
index 352adab4b7..7ea2b95882 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
@@ -5,14 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    internal class MarkupElementIntermediateNode : ExtensionIntermediateNode
+    public sealed class MarkupElementIntermediateNode : IntermediateNode
     {
         public IEnumerable<HtmlAttributeIntermediateNode> Attributes => Children.OfType<HtmlAttributeIntermediateNode>();
 
@@ -36,56 +32,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            AcceptExtensionNode<MarkupElementIntermediateNode>(this, visitor);
+            visitor.VisitMarkupElement(this);
         }
 
-        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        public override void FormatNode(IntermediateNodeFormatter formatter)
         {
-            if (target == null)
+            if (formatter == null)
             {
-                throw new ArgumentNullException(nameof(target));
+                throw new ArgumentNullException(nameof(formatter));
             }
 
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
+            formatter.WriteContent(TagName);
 
-            var writer = (BlazorNodeWriter)context.NodeWriter;
-            writer.WriteHtmlElement(context, this);
-        }
-
-        private string DebuggerDisplay
-        {
-            get
-            {
-                var builder = new StringBuilder();
-                builder.Append("Element: ");
-                builder.Append("<");
-                builder.Append(TagName);
-
-                foreach (var attribute in Attributes)
-                {
-                    builder.Append(" ");
-                    builder.Append(attribute.AttributeName);
-                    builder.Append("=\"...\"");
-                }
-
-                foreach (var capture in Captures)
-                {
-                    builder.Append(" ");
-                    builder.Append("ref");
-                    builder.Append("=\"...\"");
-                }
-
-                builder.Append(">");
-                builder.Append(Body.Any() ? "..." : string.Empty);
-                builder.Append("</");
-                builder.Append(TagName);
-                builder.Append(">");
-
-                return builder.ToString();
-            }
+            formatter.WriteProperty(nameof(TagName), TagName);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs
index dc6ab9723f..951fa40cf4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ItemCollection.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
-    public sealed class ItemCollection : ICollection<KeyValuePair<object, object>>
+    public sealed class ItemCollection : ICollection<KeyValuePair<object, object>>, ICollection
     {
         private readonly Dictionary<object, object> _inner;
 
@@ -43,9 +43,9 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public bool IsReadOnly => _inner != null;
 
-        int ICollection<KeyValuePair<object, object>>.Count => throw new NotImplementedException();
+        bool ICollection.IsSynchronized => ((ICollection)_inner).IsSynchronized;
 
-        bool ICollection<KeyValuePair<object, object>>.IsReadOnly => throw new NotImplementedException();
+        object ICollection.SyncRoot => ((ICollection)_inner).SyncRoot;
 
         public void Add(KeyValuePair<object, object> item)
         {
@@ -120,5 +120,10 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             return ((ICollection<KeyValuePair<object, object>>)_inner).Remove(item);
         }
+
+        void ICollection.CopyTo(Array array, int index)
+        {
+            ((ICollection)_inner).CopyTo(array, index);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
index c1a34e1c33..8d9ea917f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
@@ -9,6 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool DesignTime { get; }
 
+        public virtual string FileKind => null;
+
         public abstract int IndentSize { get; set; }
 
         public abstract bool IndentWithTabs { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
index fbaa2708a2..e70f892384 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             var allowMinimizedBooleanTagHelperAttributes = false;
             var allowHtmlCommentsInTagHelpers = false;
+            var allowComponentFileKind = false;
             var experimental_AllowConditionalDataDashAttributes = false;
 
             if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
@@ -18,6 +19,12 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowHtmlCommentsInTagHelpers = true;
             }
 
+            if (version.CompareTo(RazorLanguageVersion.Version_3_0) >= 0)
+            {
+                // Added in 3.0
+                allowComponentFileKind = true;
+            }
+
             if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
             {
                 experimental_AllowConditionalDataDashAttributes = true;
@@ -26,6 +33,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             return new DefaultRazorParserFeatureFlags(
                 allowMinimizedBooleanTagHelperAttributes,
                 allowHtmlCommentsInTagHelpers,
+                allowComponentFileKind,
                 experimental_AllowConditionalDataDashAttributes);
         }
 
@@ -33,6 +41,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool AllowHtmlCommentsInTagHelpers { get; }
 
+        public abstract bool AllowComponentFileKind { get; }
+
         public abstract bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
 
         private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
@@ -40,10 +50,12 @@ namespace Microsoft.AspNetCore.Razor.Language
             public DefaultRazorParserFeatureFlags(
                 bool allowMinimizedBooleanTagHelperAttributes,
                 bool allowHtmlCommentsInTagHelpers,
+                bool allowComponentFileKind,
                 bool experimental_AllowConditionalDataDashAttributes)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
+                AllowComponentFileKind = allowComponentFileKind;
                 EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
             }
 
@@ -51,6 +63,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override bool AllowHtmlCommentsInTagHelpers { get; }
 
+            public override bool AllowComponentFileKind { get; }
+
             public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs
index b036e3d58d..d759457cda 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptionsBuilder.cs
@@ -13,6 +13,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract ICollection<DirectiveDescriptor> Directives { get; }
 
+        public virtual string FileKind => null;
+
         public abstract bool ParseLeadingDirectives { get; set; }
 
         public virtual RazorLanguageVersion LanguageVersion { get; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index e6ef8738c7..d29ba2e775 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -35,18 +35,26 @@ namespace Microsoft.AspNetCore.Razor.Language
             return codeDocument;
         }
 
-        internal virtual RazorCodeDocument Process(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        public virtual RazorCodeDocument Process(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
-            if (source == null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
-
-            var codeDocument = CreateCodeDocumentCore(source, fileKind, importSources, tagHelpers);
-            ProcessCore(codeDocument);
-            return codeDocument;
+            throw new NotImplementedException();
         }
 
+        public virtual RazorCodeDocument ProcessDeclarationOnly(RazorProjectItem projectItem)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual RazorCodeDocument ProcessDeclarationOnly(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual RazorCodeDocument ProcessDesignTime(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
+        {
+            throw new NotImplementedException();
+        }
+        
         public virtual RazorCodeDocument ProcessDesignTime(RazorProjectItem projectItem)
         {
             if (projectItem == null)
@@ -59,42 +67,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             return codeDocument;
         }
 
-        internal virtual RazorCodeDocument ProcessDesignTime(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
-        {
-            if (source == null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
-
-            var codeDocument = CreateCodeDocumentDesignTimeCore(source, fileKind, importSources, tagHelpers);
-            ProcessCore(codeDocument);
-            return codeDocument;
-        }
-
         protected abstract RazorCodeDocument CreateCodeDocumentCore(RazorProjectItem projectItem);
 
-        internal virtual RazorCodeDocument CreateCodeDocumentCore(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
-        {
-            var codeDocument = RazorCodeDocument.Create(source, importSources);
-            if (fileKind != null)
-            {
-                codeDocument.SetFileKind(fileKind);
-            }
-            return codeDocument;
-        }
-
         protected abstract RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorProjectItem projectItem);
 
-        internal virtual RazorCodeDocument CreateCodeDocumentDesignTimeCore(RazorSourceDocument source, string fileKind, IReadOnlyList<RazorSourceDocument> importSources, IReadOnlyList<TagHelperDescriptor> tagHelpers)
-        {
-            var codeDocument = RazorCodeDocument.Create(source, importSources);
-            if (fileKind != null)
-            {
-                codeDocument.SetFileKind(fileKind);
-            }
-            return codeDocument;
-        }
-
         protected abstract void ProcessCore(RazorCodeDocument codeDocument);
 
         internal static RazorProjectEngine CreateEmpty(Action<RazorProjectEngineBuilder> configure = null)
@@ -106,8 +82,6 @@ namespace Microsoft.AspNetCore.Razor.Language
             return builder.Build();
         }
 
-        internal static RazorProjectEngine Create() => Create(configure: null);
-
         internal static RazorProjectEngine Create(Action<RazorProjectEngineBuilder> configure) => Create(RazorConfiguration.Default, RazorProjectFileSystem.Empty, configure);
 
         public static RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem) => Create(configuration, fileSystem, configure: null);
@@ -136,7 +110,16 @@ namespace Microsoft.AspNetCore.Razor.Language
             // This allows extensions to rely on default features, and customizations to override choices made by
             // extensions.
             AddDefaultPhases(builder.Phases);
-            AddDefaultsFeatures(builder.Features);
+            AddDefaultFeatures(builder.Features);
+
+            if (configuration.LanguageVersion.CompareTo(RazorLanguageVersion.Version_3_0) >= 0)
+            {
+                FunctionsDirective.Register(builder);
+                ImplementsDirective.Register(builder);
+                InheritsDirective.Register(builder);
+
+                AddComponentFeatures(builder);
+            }
 
             LoadExtensions(builder, configuration.Extensions);
 
@@ -157,7 +140,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             phases.Add(new DefaultRazorCSharpLoweringPhase());
         }
 
-        private static void AddDefaultsFeatures(ICollection<IRazorFeature> features)
+        private static void AddDefaultFeatures(ICollection<IRazorFeature> features)
         {
             features.Add(new DefaultImportProjectFeature());
 
@@ -221,6 +204,36 @@ namespace Microsoft.AspNetCore.Razor.Language
             });
         }
 
+        private static void AddComponentFeatures(RazorProjectEngineBuilder builder)
+        {
+            // Project Engine Features
+            builder.Features.Add(new ComponentImportProjectFeature());
+
+            // Directives (conditional on file kind)
+            ComponentInjectDirective.Register(builder);
+            ComponentLayoutDirective.Register(builder);
+            ComponentPageDirective.Register(builder);
+            ComponentTypeParamDirective.Register(builder);
+
+            // Document Classifier
+            builder.Features.Add(new ComponentDocumentClassifierPass());
+
+            // Directive Classifier
+            builder.Features.Add(new ComponentWhitespacePass());
+            
+            // Optimization
+            builder.Features.Add(new ComponentComplexAttributeContentPass());
+            builder.Features.Add(new ComponentLoweringPass());
+            builder.Features.Add(new ComponentScriptTagPass());
+            builder.Features.Add(new ComponentEventHandlerLoweringPass());
+            builder.Features.Add(new ComponentReferenceCaptureLoweringPass());
+            builder.Features.Add(new ComponentBindLoweringPass());
+            builder.Features.Add(new ComponentTemplateDiagnosticPass());
+            builder.Features.Add(new ComponentGenericTypePass());
+            builder.Features.Add(new ComponentChildContentDiagnosticPass());
+            builder.Features.Add(new ComponentHtmlBlockPass());
+        }
+
         private static void LoadExtensions(RazorProjectEngineBuilder builder, IReadOnlyList<RazorExtension> extensions)
         {
             for (var i = 0; i < extensions.Count; i++)
@@ -234,9 +247,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                     initializer?.Initialize(builder);
                 }
             }
-
-            // Default extensions.
-            ComponentExtensions.Register(builder);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
index ae92e4089b..cffead3a8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
@@ -145,6 +145,43 @@ namespace Microsoft.AspNetCore.Razor.Language
             return builder;
         }
 
+        /// <summary>
+        /// Adds the specified <see cref="DirectiveDescriptor"/> for the provided file kind.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="fileKind">The file kind, for which to register the directive. See <see cref="FileKinds"/>.</param>
+        /// <param name="directive">The <see cref="DirectiveDescriptor"/> to add.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder AddDirective(this RazorProjectEngineBuilder builder, string fileKind, DirectiveDescriptor directive)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (fileKind == null)
+            {
+                throw new ArgumentNullException(nameof(fileKind));
+            }
+
+            if (directive == null)
+            {
+                throw new ArgumentNullException(nameof(directive));
+            }
+
+            var directiveFeature = GetDirectiveFeature(builder);
+
+            if (!directiveFeature.DirectivesByFileKind.TryGetValue(fileKind, out var directives))
+            {
+                directives = new List<DirectiveDescriptor>();
+                directiveFeature.DirectivesByFileKind.Add(fileKind, directives);
+            }
+
+            directives.Add(directive);
+
+            return builder;
+        }
+
         /// <summary>
         /// Adds the provided <see cref="RazorProjectItem" />s as imports to all project items processed
         /// by the <see cref="RazorProjectEngine"/>.
@@ -158,17 +195,15 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 throw new ArgumentNullException(nameof(builder));
             }
-
-            var existingImportFeature = builder.Features.OfType<IImportProjectFeature>().First();
-            var testImportFeature = new AdditionalImportsProjectFeature(existingImportFeature, imports);
-            builder.SetImportFeature(testImportFeature);
+            
+            builder.Features.Add(new AdditionalImportsProjectFeature(imports));
 
             return builder;
         }
 
-        private static IRazorDirectiveFeature GetDirectiveFeature(RazorProjectEngineBuilder builder)
+        private static DefaultRazorDirectiveFeature GetDirectiveFeature(RazorProjectEngineBuilder builder)
         {
-            var directiveFeature = builder.Features.OfType<IRazorDirectiveFeature>().FirstOrDefault();
+            var directiveFeature = builder.Features.OfType<DefaultRazorDirectiveFeature>().FirstOrDefault();
             if (directiveFeature == null)
             {
                 directiveFeature = new DefaultRazorDirectiveFeature();
@@ -204,31 +239,16 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         private class AdditionalImportsProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
         {
-            private readonly IImportProjectFeature _existingImportFeature;
-            private readonly IEnumerable<RazorProjectItem> _imports;
+            private readonly IReadOnlyList<RazorProjectItem> _imports;
 
-            public override RazorProjectEngine ProjectEngine
+            public AdditionalImportsProjectFeature(params string[] imports)
             {
-                get => base.ProjectEngine;
-                set
-                {
-                    _existingImportFeature.ProjectEngine = value;
-                    base.ProjectEngine = value;
-                }
-            }
-
-            public AdditionalImportsProjectFeature(IImportProjectFeature existingImportFeature, params string[] imports)
-            {
-                _existingImportFeature = existingImportFeature;
-                _imports = imports.Select(import => new InMemoryProjectItem(import));
+                _imports = imports.Select(import => new InMemoryProjectItem(import)).ToArray();
             }
 
             public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
             {
-                var imports = _existingImportFeature.GetImports(projectItem).ToList();
-                imports.AddRange(_imports);
-
-                return imports;
+                return _imports;
             }
 
             private class InMemoryProjectItem : RazorProjectItem
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 4f9f0df338..91aa32f4f3 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -248,7 +248,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 var formatName = entry.Suffix == null ? "Format_" + entry.ValueAttribute : "Format_" + entry.Suffix;
                 var formatAttributeName = entry.Suffix == null ? "format-" + entry.ValueAttribute : "format-" + entry.Suffix;
 
-                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, name, entry.Assembly);
+                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, name, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.BindTagHelper_Element_Documentation,
                     entry.ValueAttribute,
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index b86485a615..17ed23ae1b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -104,7 +104,7 @@ namespace Microsoft.CodeAnalysis.Razor
             {
                 var entry = data[i];
 
-                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.EventHandler.TagHelperKind, entry.Attribute, entry.Assembly);
+                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.EventHandler.TagHelperKind, entry.Attribute, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.EventHandlerTagHelper_Documentation,
                     entry.Attribute,
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 46a0ac8f50..fc489b11de 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -4,11 +4,13 @@
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
index fdabc4c11d..5896f2d333 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
@@ -32,7 +32,9 @@ namespace Microsoft.CodeAnalysis.Razor
         protected static TagHelperDescriptor[] ExcludeBuiltInComponents(TagHelperDescriptorProviderContext context)
         {
             return context.Results
-                .Where(c => c.AssemblyName == "TestAssembly")
+                .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.Bind")
+                .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.BindAttributes")
+                .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.EventHandlers")
                 .OrderBy(c => c.Name)
                 .ToArray();
         }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 4797ebfe5d..5551fcdf53 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -222,7 +222,7 @@ namespace Test
                 bind.Documentation);
 
             // These are all trivially derived from the assembly/namespace/type name
-            Assert.Equal("TestAssembly", bind.AssemblyName);
+            Assert.Equal("Microsoft.AspNetCore.Components", bind.AssemblyName);
             Assert.Equal("Bind", bind.Name);
             Assert.Equal("Test.BindAttributes", bind.DisplayName);
             Assert.Equal("Test.BindAttributes", bind.GetTypeName());
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index 760239916f..f2f18c1997 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -62,7 +62,7 @@ namespace Test
                 item.Documentation);
 
             // These are all trivially derived from the assembly/namespace/type name
-            Assert.Equal("TestAssembly", item.AssemblyName);
+            Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName);
             Assert.Equal("onclick", item.Name);
             Assert.Equal("Test.EventHandlers", item.DisplayName);
             Assert.Equal("Test.EventHandlers", item.GetTypeName());
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs
new file mode 100644
index 0000000000..4441c06c9b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs
@@ -0,0 +1,344 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    /// <summary>
+    /// Represents an entry in a tree of user interface (UI) items.
+    /// </summary>
+    [StructLayout(LayoutKind.Explicit)]
+    public readonly struct RenderTreeFrame
+    {
+        // Note that the struct layout has to be valid in both 32-bit and 64-bit runtime platforms,
+        // which means that all reference-type fields need to take up 8 bytes (except for the last
+        // one, which will be sized as either 4 or 8 bytes depending on the runtime platform).
+        // This is not optimal for the Mono-WebAssembly case because that's always 32-bit so the
+        // reference-type fields could be reduced to 4 bytes each. We could use ifdefs to have
+        // different fields offsets for the 32 and 64 bit compile targets, but then we'd have the
+        // complexity of needing different binaries when loaded into Mono-WASM vs desktop.
+        // Eventually we might stop using this shared memory interop altogether (and would have to
+        // if running as a web worker) so for now to keep things simple, treat reference types as
+        // 8 bytes here.
+
+        // --------------------------------------------------------------------------------
+        // Common
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// Gets the sequence number of the frame. Sequence numbers indicate the relative source
+        /// positions of the instructions that inserted the frames. Sequence numbers are only
+        /// comparable within the same sequence (typically, the same source method).
+        /// </summary>
+        [FieldOffset(0)] public readonly int Sequence;
+
+        /// <summary>
+        /// Describes the type of this frame.
+        /// </summary>
+        [FieldOffset(4)] public readonly RenderTreeFrameType FrameType;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.Element
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Element"/>
+        /// gets the number of frames in the subtree for which this frame is the root.
+        /// The value is zero if the frame has not yet been closed.
+        /// </summary>
+        [FieldOffset(8)] public readonly int ElementSubtreeLength;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Element"/>,
+        /// gets a name representing the type of the element. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(16)] public readonly string ElementName;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.Text
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Text"/>,
+        /// gets the content of the text frame. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(16)] public readonly string TextContent;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.Attribute
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Attribute"/>
+        /// gets the ID of the corresponding event handler, if any.
+        /// </summary>
+        [FieldOffset(8)] public readonly int AttributeEventHandlerId;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Attribute"/>,
+        /// gets the attribute name. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(16)] public readonly string AttributeName;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Attribute"/>,
+        /// gets the attribute value. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(24)] public readonly object AttributeValue;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.Component
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>
+        /// gets the number of frames in the subtree for which this frame is the root.
+        /// The value is zero if the frame has not yet been closed.
+        /// </summary>
+        [FieldOffset(8)] public readonly int ComponentSubtreeLength;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>,
+        /// gets the child component instance identifier.
+        /// </summary>
+        [FieldOffset(12)] public readonly int ComponentId;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>,
+        /// gets the type of the child component.
+        /// </summary>
+        [FieldOffset(16)] public readonly Type ComponentType;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>,
+        /// gets the child component instance. Otherwise, the value is undefined.
+        /// </summary>
+        public IComponent Component => null;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.Region
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Region"/>
+        /// gets the number of frames in the subtree for which this frame is the root.
+        /// The value is zero if the frame has not yet been closed.
+        /// </summary>
+        [FieldOffset(8)] public readonly int RegionSubtreeLength;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.ElementReferenceCapture
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ElementReferenceCapture"/>,
+        /// gets the ID of the reference capture. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(16)] public readonly string ElementReferenceCaptureId;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ElementReferenceCapture"/>,
+        /// gets the action that writes the reference to its target. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(24)] public readonly Action<ElementRef> ElementReferenceCaptureAction;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.ComponentReferenceCapture
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ComponentReferenceCapture"/>,
+        /// gets the index of the parent frame representing the component being captured. Otherwise, the value is undefined.
+        /// WARNING: This index can only be used in the context of the frame's original render tree. If the frame is
+        ///          copied elsewhere, such as to the ReferenceFrames buffer of a RenderTreeDiff, then the index will
+        ///          not relate to entries in that other buffer.
+        ///          Currently there's no scenario where this matters, but if there was, we could change all of the subtree
+        ///          initialization logic in RenderTreeDiffBuilder to walk the frames hierarchically, then it would know
+        ///          the parent index at the point where it wants to initialize the ComponentReferenceCapture frame.
+        /// </summary>
+        [FieldOffset(8)] public readonly int ComponentReferenceCaptureParentFrameIndex;
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ComponentReferenceCapture"/>,
+        /// gets the action that writes the reference to its target. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(16)] public readonly Action<object> ComponentReferenceCaptureAction;
+
+        // --------------------------------------------------------------------------------
+        // RenderTreeFrameType.Markup
+        // --------------------------------------------------------------------------------
+
+        /// <summary>
+        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Markup"/>,
+        /// gets the content of the markup frame. Otherwise, the value is undefined.
+        /// </summary>
+        [FieldOffset(16)] public readonly string MarkupContent;
+
+        private RenderTreeFrame(int sequence, string elementName, int elementSubtreeLength)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.Element;
+            Sequence = sequence;
+            ElementName = elementName;
+            ElementSubtreeLength = elementSubtreeLength;
+        }
+
+        private RenderTreeFrame(int sequence, Type componentType, int componentSubtreeLength)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.Component;
+            Sequence = sequence;
+            ComponentType = componentType;
+            ComponentSubtreeLength = componentSubtreeLength;
+        }
+
+        private RenderTreeFrame(int sequence, string textContent)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.Text;
+            Sequence = sequence;
+            TextContent = textContent;
+        }
+
+        private RenderTreeFrame(int sequence, string attributeName, object attributeValue)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.Attribute;
+            Sequence = sequence;
+            AttributeName = attributeName;
+            AttributeValue = attributeValue;
+        }
+
+        private RenderTreeFrame(int sequence, string attributeName, object attributeValue, int eventHandlerId)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.Attribute;
+            Sequence = sequence;
+            AttributeName = attributeName;
+            AttributeValue = attributeValue;
+            AttributeEventHandlerId = eventHandlerId;
+        }
+
+        private RenderTreeFrame(int sequence, int regionSubtreeLength)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.Region;
+            Sequence = sequence;
+            RegionSubtreeLength = regionSubtreeLength;
+        }
+
+        private RenderTreeFrame(int sequence, Action<ElementRef> elementReferenceCaptureAction, string elementReferenceCaptureId)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.ElementReferenceCapture;
+            Sequence = sequence;
+            ElementReferenceCaptureAction = elementReferenceCaptureAction;
+            ElementReferenceCaptureId = elementReferenceCaptureId;
+        }
+
+        private RenderTreeFrame(int sequence, Action<object> componentReferenceCaptureAction, int parentFrameIndex)
+            : this()
+        {
+            FrameType = RenderTreeFrameType.ComponentReferenceCapture;
+            Sequence = sequence;
+            ComponentReferenceCaptureAction = componentReferenceCaptureAction;
+            ComponentReferenceCaptureParentFrameIndex = parentFrameIndex;
+        }
+
+        // If we need further constructors whose signatures clash with the patterns above,
+        // we can add extra args to this general-purpose one.
+        private RenderTreeFrame(int sequence, RenderTreeFrameType frameType, string markupContent)
+            : this()
+        {
+            FrameType = frameType;
+            Sequence = sequence;
+            MarkupContent = markupContent;
+        }
+
+        internal static RenderTreeFrame Element(int sequence, string elementName)
+            => new RenderTreeFrame(sequence, elementName: elementName, elementSubtreeLength: 0);
+
+        internal static RenderTreeFrame Text(int sequence, string textContent)
+            => new RenderTreeFrame(sequence, textContent: textContent);
+
+        internal static RenderTreeFrame Markup(int sequence, string markupContent)
+            => new RenderTreeFrame(sequence, RenderTreeFrameType.Markup, markupContent);
+
+        internal static RenderTreeFrame Attribute(int sequence, string name, MulticastDelegate value)
+             => new RenderTreeFrame(sequence, attributeName: name, attributeValue: value);
+
+        internal static RenderTreeFrame Attribute(int sequence, string name, object value)
+            => new RenderTreeFrame(sequence, attributeName: name, attributeValue: value);
+
+        internal static RenderTreeFrame ChildComponent(int sequence, Type componentType)
+            => new RenderTreeFrame(sequence, componentType, 0);
+
+        internal static RenderTreeFrame PlaceholderChildComponentWithSubtreeLength(int subtreeLength)
+            => new RenderTreeFrame(0, typeof(IComponent), subtreeLength);
+
+        internal static RenderTreeFrame Region(int sequence)
+            => new RenderTreeFrame(sequence, regionSubtreeLength: 0);
+
+        internal static RenderTreeFrame ElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)
+            => new RenderTreeFrame(sequence, elementReferenceCaptureAction: elementReferenceCaptureAction, elementReferenceCaptureId: null);
+
+        internal static RenderTreeFrame ComponentReferenceCapture(int sequence, Action<object> componentReferenceCaptureAction, int parentFrameIndex)
+            => new RenderTreeFrame(sequence, componentReferenceCaptureAction: componentReferenceCaptureAction, parentFrameIndex: parentFrameIndex);
+
+        internal RenderTreeFrame WithElementSubtreeLength(int elementSubtreeLength)
+            => new RenderTreeFrame(Sequence, elementName: ElementName, elementSubtreeLength: elementSubtreeLength);
+
+        internal RenderTreeFrame WithComponentSubtreeLength(int componentSubtreeLength)
+            => new RenderTreeFrame(Sequence, componentType: ComponentType, componentSubtreeLength: componentSubtreeLength);
+
+        internal RenderTreeFrame WithAttributeSequence(int sequence)
+            => new RenderTreeFrame(sequence, attributeName: AttributeName, attributeValue: AttributeValue);
+
+        internal RenderTreeFrame WithAttributeEventHandlerId(int eventHandlerId)
+            => new RenderTreeFrame(Sequence, AttributeName, AttributeValue, eventHandlerId);
+
+        internal RenderTreeFrame WithRegionSubtreeLength(int regionSubtreeLength)
+            => new RenderTreeFrame(Sequence, regionSubtreeLength: regionSubtreeLength);
+
+        internal RenderTreeFrame WithElementReferenceCaptureId(string elementReferenceCaptureId)
+            => new RenderTreeFrame(Sequence, ElementReferenceCaptureAction, elementReferenceCaptureId);
+
+        /// <inheritdoc />
+        // Just to be nice for debugging and unit tests.
+        public override string ToString()
+        {
+            switch (FrameType)
+            {
+                case RenderTreeFrameType.Attribute:
+                    return $"Attribute: (seq={Sequence}, id={AttributeEventHandlerId}) '{AttributeName}'='{AttributeValue}'";
+
+                case RenderTreeFrameType.Component:
+                    return $"Component: (seq={Sequence}, len={ComponentSubtreeLength}) {ComponentType}";
+
+                case RenderTreeFrameType.Element:
+                    return $"Element: (seq={Sequence}, len={ElementSubtreeLength}) {ElementName}";
+
+                case RenderTreeFrameType.Region:
+                    return $"Region: (seq={Sequence}, len={RegionSubtreeLength})";
+
+                case RenderTreeFrameType.Text:
+                    return $"Text: (seq={Sequence}, len=n/a) {EscapeNewlines(TextContent)}";
+
+                case RenderTreeFrameType.Markup:
+                    return $"Markup: (seq={Sequence}, len=n/a) {EscapeNewlines(TextContent)}";
+
+                case RenderTreeFrameType.ElementReferenceCapture:
+                    return $"ElementReferenceCapture: (seq={Sequence}, len=n/a) {ElementReferenceCaptureAction}";
+            }
+
+            return base.ToString();
+        }
+
+        private static string EscapeNewlines(string text)
+        {
+            return text.Replace("\n", "\\n").Replace("\r\n", "\\r\\n");
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs
new file mode 100644
index 0000000000..5a64846ae9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs
@@ -0,0 +1,54 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    /// <summary>
+    /// Describes the type of a <see cref="RenderTreeFrame"/>.
+    /// </summary>
+    public enum RenderTreeFrameType : int
+    {
+        /// <summary>
+        /// Represents a container for other frames.
+        /// </summary>
+        Element = 1,
+
+        /// <summary>
+        /// Represents text content.
+        /// </summary>
+        Text = 2,
+
+        /// <summary>
+        /// Represents a key-value pair associated with another <see cref="RenderTreeFrame"/>.
+        /// </summary>
+        Attribute = 3,
+
+        /// <summary>
+        /// Represents a child component.
+        /// </summary>
+        Component = 4,
+
+        /// <summary>
+        /// Defines the boundary around range of sibling frames that should be treated as an
+        /// unsplittable group for the purposes of diffing. This is typically used when appending
+        /// a tree fragment generated by external code, because the sequence numbers in that tree
+        /// fragment are not comparable to sequence numbers outside it.
+        /// </summary>
+        Region = 5,
+
+        /// <summary>
+        /// Represents an instruction to capture or update a reference to the parent element.
+        /// </summary>
+        ElementReferenceCapture = 6,
+
+        /// <summary>
+        /// Represents an instruction to capture or update a reference to the parent component.
+        /// </summary>
+        ComponentReferenceCapture = 7,
+
+        /// <summary>
+        /// Represents a block of markup content.
+        /// </summary>
+        Markup = 8,
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index c42bb4ef91..11818a68dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             return projectItem;
         }
 
-        protected RazorProjectItem CreateProjectItemFromFile(string filePath = null)
+        protected RazorProjectItem CreateProjectItemFromFile(string filePath = null, string fileKind = null)
         {
             if (FileName == null)
             {
@@ -201,7 +201,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 basePath: workingDirectory,
                 filePath: filePath,
                 physicalPath: fullPath,
-                relativePhysicalPath: sourceFileName)
+                relativePhysicalPath: sourceFileName,
+                fileKind: fileKind)
             {
                 Content = fileContent,
             };
@@ -321,10 +322,14 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                     });
                 }
 
-                // Decorate the import feature so we can normalize line endings.
-                var importFeature = b.Features.OfType<IImportProjectFeature>().FirstOrDefault();
-                b.Features.Add(new NormalizedDefaultImportFeature(importFeature, LineEnding));
-                b.Features.Remove(importFeature);
+                b.Features.Add(new DefaultTypeNameFeature());
+
+                // Decorate each import feature so we can normalize line endings.
+                foreach (var feature in b.Features.OfType<IImportProjectFeature>().ToArray())
+                {
+                    b.Features.Remove(feature);
+                    b.Features.Add(new NormalizedDefaultImportFeature(feature, LineEnding));
+                }
             });
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
index 4329c0d02d..4ae07f5e8d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
@@ -15,7 +16,9 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
     // Serializes single IR nodes (shallow).
     public class IntermediateNodeWriter :
         IntermediateNodeVisitor,
-        IExtensionIntermediateNodeVisitor<SectionIntermediateNode>
+        IExtensionIntermediateNodeVisitor<SectionIntermediateNode>,
+        IExtensionIntermediateNodeVisitor<RouteAttributeExtensionNode>
+
     {
         private readonly TextWriter _writer;
 
@@ -44,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             // Avoid adding the type parameters to the baseline if they aren't present.
             if (node.TypeParameters != null && node.TypeParameters.Count > 0)
             {
-                entries.Add(string.Join(", ", node.TypeParameters));
+                entries.Add(string.Join(", ", node.TypeParameters.Select(p => p.ParameterName)));
             }
 
             WriteContentNode(node, entries.ToArray());
@@ -125,6 +128,51 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
         }
 
+        public override void VisitComponent(ComponentIntermediateNode node)
+        {
+            WriteContentNode(node, node.TagName);
+        }
+
+        public override void VisitComponentAttribute(ComponentAttributeIntermediateNode node)
+        {
+            WriteContentNode(node, node.AttributeName, string.Format("AttributeStructure.{0}", node.AttributeStructure));
+        }
+
+        public override void VisitComponentChildContent(ComponentChildContentIntermediateNode node)
+        {
+            WriteContentNode(node, node.AttributeName, node.ParameterName);
+        }
+
+        public override void VisitComponentTypeArgument(ComponentTypeArgumentIntermediateNode node)
+        {
+            WriteContentNode(node, node.TypeParameterName);
+        }
+
+        public override void VisitComponentTypeInferenceMethod(ComponentTypeInferenceMethodIntermediateNode node)
+        {
+            WriteContentNode(node, node.FullTypeName, node.MethodName);
+        }
+
+        public override void VisitMarkupElement(MarkupElementIntermediateNode node)
+        {
+            WriteContentNode(node, node.TagName);
+        }
+
+        public override void VisitMarkupBlock(MarkupBlockIntermediateNode node)
+        {
+            WriteContentNode(node, node.Content);
+        }
+
+        public override void VisitReferenceCapture(ReferenceCaptureIntermediateNode node)
+        {
+            WriteContentNode(node, node.IdentifierToken?.Content);
+        }
+
+        void IExtensionIntermediateNodeVisitor<RouteAttributeExtensionNode>.VisitExtension(RouteAttributeExtensionNode node)
+        {
+            WriteContentNode(node, node.Template);
+        }
+
         public override void VisitExtension(ExtensionIntermediateNode node)
         {
             switch (node)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs
index 0b1c78a53e..b8cf0a4ddf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntializeTestFileAttribute.cs
@@ -12,9 +12,14 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         {
             if (typeof(IntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
             {
-                var typeName = methodUnderTest.DeclaringType.Name;
+                var typeName = methodUnderTest.ReflectedType.Name;
                 IntegrationTestBase.FileName = $"TestFiles/IntegrationTests/{typeName}/{methodUnderTest.Name}";
             }
+            else if (typeof(RazorBaselineIntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                var typeName = methodUnderTest.ReflectedType.Name;
+                RazorBaselineIntegrationTestBase.DirectoryPath = $"TestFiles/IntegrationTests/{typeName}/{methodUnderTest.Name}";
+            }
         }
 
         public override void After(MethodInfo methodUnderTest)
@@ -23,6 +28,10 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             {
                 IntegrationTestBase.FileName = null;
             }
+            else if (typeof(RazorBaselineIntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.DeclaringType.GetTypeInfo()))
+            {
+                RazorBaselineIntegrationTestBase.DirectoryPath = null;
+            }
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs
new file mode 100644
index 0000000000..60821b285e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs
@@ -0,0 +1,209 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    [IntializeTestFile]
+    public abstract class RazorBaselineIntegrationTestBase : RazorIntegrationTestBase
+    {
+        private static readonly AsyncLocal<string> _directoryPath = new AsyncLocal<string>();
+
+        protected RazorBaselineIntegrationTestBase(bool? generateBaselines = null)
+        {
+            TestProjectRoot = TestProject.GetProjectDirectory(GetType());
+
+            if (generateBaselines.HasValue)
+            {
+                GenerateBaselines = generateBaselines.Value;
+            }
+        }
+
+        // Used by the test framework to set the directory for test files.
+        public static string DirectoryPath
+        {
+            get { return _directoryPath.Value; }
+            set { _directoryPath.Value = value; }
+        }
+
+#if GENERATE_BASELINES
+        protected bool GenerateBaselines { get; } = true;
+#else
+        protected bool GenerateBaselines { get; } = false;
+#endif
+        
+        protected string TestProjectRoot { get; }
+        
+        // For consistent line endings because the character counts are going to be recorded in files.
+        internal override string LineEnding => "\r\n";
+
+        internal override bool NormalizeSourceLineEndings => true;
+
+        internal override string PathSeparator => "\\";
+
+        // Force consistent paths since they are going to be recorded in files.
+        internal override string WorkingDirectory => ArbitraryWindowsPath;
+
+        [Fact]
+        public void GenerateBaselinesMustBeFalse()
+        {
+            Assert.False(GenerateBaselines, "GenerateBaselines should be set back to false before you check in!");
+        }
+
+        protected void AssertDocumentNodeMatchesBaseline(RazorCodeDocument codeDocument)
+        {
+            var document = codeDocument.GetDocumentIntermediateNode();
+            var baselineFilePath = GetBaselineFilePath(codeDocument, ".ir.txt");
+
+            if (GenerateBaselines)
+            {
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFilePath);
+                Directory.CreateDirectory(Path.GetDirectoryName(baselineFullPath));
+                WriteBaseline(IntermediateNodeSerializer.Serialize(document), baselineFullPath);
+
+                return;
+            }
+
+            var irFile = TestFile.Create(baselineFilePath, GetType().Assembly);
+            if (!irFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFilePath} was not found.");
+            }
+
+            // Normalize newlines by splitting into an array.
+            var baseline = irFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            IntermediateNodeVerifier.Verify(document, baseline);
+        }
+
+        protected void AssertCSharpDocumentMatchesBaseline(RazorCodeDocument codeDocument)
+        {
+            var document = codeDocument.GetCSharpDocument();
+
+            // Normalize newlines to match those in the baseline.
+            var actualCode = document.GeneratedCode.Replace("\r", "").Replace("\n", "\r\n");
+
+            var baselineFilePath = GetBaselineFilePath(codeDocument, ".codegen.cs");
+            var baselineDiagnosticsFilePath = GetBaselineFilePath(codeDocument, ".diagnostics.txt");
+            var baselineMappingsFilePath = GetBaselineFilePath(codeDocument, ".mappings.txt");
+
+            var serializedMappings = SourceMappingsSerializer.Serialize(document, codeDocument.Source);
+
+            if (GenerateBaselines)
+            {
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFilePath);
+                Directory.CreateDirectory(Path.GetDirectoryName(baselineFullPath));
+                WriteBaseline(actualCode, baselineFullPath);
+
+                var baselineDiagnosticsFullPath = Path.Combine(TestProjectRoot, baselineDiagnosticsFilePath);
+                var lines = document.Diagnostics.Select(RazorDiagnosticSerializer.Serialize).ToArray();
+                if (lines.Any())
+                {
+                    WriteBaseline(lines, baselineDiagnosticsFullPath);
+                }
+                else if (File.Exists(baselineDiagnosticsFullPath))
+                {
+                    File.Delete(baselineDiagnosticsFullPath);
+                }
+
+                var baselineMappingsFullPath = Path.Combine(TestProjectRoot, baselineMappingsFilePath);
+                var text = SourceMappingsSerializer.Serialize(document, codeDocument.Source);
+                if (!string.IsNullOrEmpty(text))
+                {
+                    WriteBaseline(text, baselineMappingsFullPath);
+                }
+                else if (File.Exists(baselineMappingsFullPath))
+                {
+                    File.Delete(baselineMappingsFullPath);
+                }
+
+                return;
+            }
+
+            var codegenFile = TestFile.Create(baselineFilePath, GetType().Assembly);
+            if (!codegenFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFilePath} was not found.");
+            }
+
+            var baseline = codegenFile.ReadAllText();
+            Assert.Equal(baseline, actualCode);
+
+            var baselineDiagnostics = string.Empty;
+            var diagnosticsFile = TestFile.Create(baselineDiagnosticsFilePath, GetType().Assembly);
+            if (diagnosticsFile.Exists())
+            {
+                baselineDiagnostics = diagnosticsFile.ReadAllText();
+            }
+
+            var actualDiagnostics = string.Concat(document.Diagnostics.Select(d => RazorDiagnosticSerializer.Serialize(d) + "\r\n"));
+            Assert.Equal(baselineDiagnostics, actualDiagnostics);
+
+            var baselineMappings = string.Empty;
+            var mappingsFile = TestFile.Create(baselineMappingsFilePath, GetType().Assembly);
+            if (mappingsFile.Exists())
+            {
+                baselineMappings = mappingsFile.ReadAllText();
+            }
+
+            var actualMappings = SourceMappingsSerializer.Serialize(document, codeDocument.Source);
+            actualMappings = actualMappings.Replace("\r", "").Replace("\n", "\r\n");
+            Assert.Equal(baselineMappings, actualMappings);
+        }
+
+        private string GetBaselineFilePath(RazorCodeDocument codeDocument, string extension)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (extension == null)
+            {
+                throw new ArgumentNullException(nameof(extension));
+            }
+
+            var lastSlash = codeDocument.Source.FilePath.LastIndexOfAny(new []{ '/', '\\' });
+            var fileName = lastSlash == -1 ? null : codeDocument.Source.FilePath.Substring(lastSlash + 1);
+            if (string.IsNullOrEmpty(fileName))
+            {
+                var message = "Integration tests require a filename";
+                throw new InvalidOperationException(message);
+            }
+
+            if (DirectoryPath == null)
+            {
+                var message = $"{nameof(AssertDocumentNodeMatchesBaseline)} should only be called from an integration test..";
+                throw new InvalidOperationException(message);
+            }
+
+            return Path.Combine(DirectoryPath, Path.ChangeExtension(fileName, extension));
+        }
+
+        private static void WriteBaseline(string text, string filePath)
+        {
+            var lines = text.Replace("\r", "").Replace("\n", "\r\n");
+            File.WriteAllText(filePath, text);
+        }
+
+        private static void WriteBaseline(string[] lines, string filePath)
+        {
+            using (var writer = new StreamWriter(File.Open(filePath, FileMode.Create)))
+            {
+                // Force windows-style line endings so that we're consistent. This isn't
+                // required for correctness, but will prevent churn when developing on OSX.
+                writer.NewLine = "\r\n";
+
+                for (var i = 0; i < lines.Length; i++)
+                {
+                    writer.WriteLine(lines[i]);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
new file mode 100644
index 0000000000..cdadb037d4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -0,0 +1,470 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class RazorIntegrationTestBase
+    {
+        internal const string ArbitraryWindowsPath = "x:\\dir\\subdir\\Test";
+        internal const string ArbitraryMacLinuxPath = "/dir/subdir/Test";
+
+        // Creating the initial compilation + reading references is on the order of 250ms without caching
+        // so making sure it doesn't happen for each test.
+        protected static readonly CSharpCompilation DefaultBaseCompilation;
+
+        private static CSharpParseOptions CSharpParseOptions { get; }
+
+        static RazorIntegrationTestBase()
+        {
+            var referenceAssemblyRoots = new[]
+            {
+                typeof(System.Runtime.AssemblyTargetedPatchBandAttribute).Assembly, // System.Runtime
+                typeof(Enumerable).Assembly, // Other .NET fundamental types
+                typeof(ComponentBase).Assembly,
+            };
+
+            var referenceAssemblies = referenceAssemblyRoots
+                .SelectMany(assembly => assembly.GetReferencedAssemblies().Concat(new[] { assembly.GetName() }))
+                .Distinct()
+                .Select(Assembly.Load)
+                .Select(assembly => MetadataReference.CreateFromFile(assembly.Location))
+                .ToList();
+            DefaultBaseCompilation = CSharpCompilation.Create(
+                "TestAssembly",
+                Array.Empty<SyntaxTree>(),
+                referenceAssemblies,
+                new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+
+            CSharpParseOptions = new CSharpParseOptions(LanguageVersion.CSharp7_3);
+        }
+
+        public RazorIntegrationTestBase()
+        {
+            AdditionalSyntaxTrees = new List<SyntaxTree>();
+            AdditionalRazorItems = new List<RazorProjectItem>();
+
+            BaseCompilation = DefaultBaseCompilation;
+            Configuration = RazorConfiguration.Default;
+            FileSystem = new VirtualRazorProjectFileSystem();
+            PathSeparator = Path.DirectorySeparatorChar.ToString();
+            WorkingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ArbitraryWindowsPath : ArbitraryMacLinuxPath;
+
+            DefaultBaseNamespace = "Test"; // Matches the default working directory
+            DefaultFileName = "TestComponent.cshtml";
+        }
+
+        internal List<RazorProjectItem> AdditionalRazorItems { get; }
+
+        internal List<SyntaxTree> AdditionalSyntaxTrees { get; }
+
+        internal virtual CSharpCompilation BaseCompilation { get; }
+
+        internal virtual RazorConfiguration Configuration { get; }
+
+        internal virtual string DefaultBaseNamespace { get; }
+
+        internal virtual string DefaultFileName { get; }
+
+        internal virtual bool DesignTime { get; }
+
+        internal virtual bool DeclarationOnly { get; }
+
+        /// <summary>
+        /// Gets a hardcoded document kind to be added to each code document that's created. This can
+        /// be used to generate components.
+        /// </summary>
+        internal virtual string FileKind { get; }
+
+        internal virtual VirtualRazorProjectFileSystem FileSystem { get; }
+
+        // Used to force a specific style of line-endings for testing. This matters
+        // for the baseline tests that exercise line mappings. Even though we normalize
+        // newlines for testing, the difference between platforms affects the data through
+        // the *count* of characters written.
+        internal virtual string LineEnding { get; }
+
+        internal virtual string PathSeparator { get; }
+
+        internal virtual bool NormalizeSourceLineEndings { get; }
+
+        internal virtual bool UseTwoPhaseCompilation { get; }
+
+        internal virtual string WorkingDirectory { get; }
+
+        // intentionally private - we don't want individual tests messing with the project engine
+        private RazorProjectEngine CreateProjectEngine(RazorConfiguration configuration, MetadataReference[] references)
+        {
+            return RazorProjectEngine.Create(configuration, FileSystem, b =>
+            {
+                // Turn off checksums, we're testing code generation.
+                b.Features.Add(new SuppressChecksum());
+
+                if (LineEnding != null)
+                {
+                    b.Phases.Insert(0, new ForceLineEndingPhase(LineEnding));
+                }
+
+                b.Features.Add(new CompilationTagHelperFeature());
+                b.Features.Add(new DefaultMetadataReferenceFeature()
+                {
+                    References = references,
+                });
+
+                b.Features.Add(new ComponentTagHelperDescriptorProvider());
+                b.Features.Add(new BindTagHelperDescriptorProvider());
+                b.Features.Add(new EventHandlerTagHelperDescriptorProvider());
+                b.Features.Add(new RefTagHelperDescriptorProvider());
+
+                b.Features.Add(new DefaultTypeNameFeature());
+            });
+        }
+
+        internal RazorProjectItem CreateProjectItem(string cshtmlRelativePath, string cshtmlContent)
+        {
+            var fullPath = WorkingDirectory + PathSeparator + cshtmlRelativePath;
+
+            // FilePaths in Razor are **always** are of the form '/a/b/c.cshtml'
+            var filePath = cshtmlRelativePath.Replace('\\', '/');
+            if (!filePath.StartsWith("/"))
+            {
+                filePath = '/' + filePath;
+            }
+
+            if (NormalizeSourceLineEndings)
+            {
+                cshtmlContent = cshtmlContent.Replace("\r", "").Replace("\n", LineEnding);
+            }
+
+            return new TestRazorProjectItem(
+                filePath: filePath,
+                physicalPath: fullPath,
+                relativePhysicalPath: cshtmlRelativePath,
+                basePath: WorkingDirectory,
+                fileKind: FileKind)
+            {
+                Content = cshtmlContent.TrimStart(),
+            };
+        }
+
+        protected CompileToCSharpResult CompileToCSharp(string cshtmlContent)
+        {
+            return CompileToCSharp(DefaultFileName, cshtmlContent);
+        }
+
+        protected CompileToCSharpResult CompileToCSharp(string cshtmlRelativePath, string cshtmlContent)
+        {
+            if (DeclarationOnly && DesignTime)
+            {
+                throw new InvalidOperationException($"{nameof(DeclarationOnly)} cannot be used with {nameof(DesignTime)}.");
+            }
+
+            if (DeclarationOnly && UseTwoPhaseCompilation)
+            {
+                throw new InvalidOperationException($"{nameof(DeclarationOnly)} cannot be used with {nameof(UseTwoPhaseCompilation)}.");
+            }
+
+            if (UseTwoPhaseCompilation)
+            {
+                // The first phase won't include any metadata references for component discovery. This mirrors
+                // what the build does.
+                var projectEngine = CreateProjectEngine(RazorConfiguration.Default, Array.Empty<MetadataReference>());
+
+                RazorCodeDocument codeDocument;
+                foreach (var item in AdditionalRazorItems)
+                {
+                    // Result of generating declarations
+                    codeDocument = projectEngine.ProcessDeclarationOnly(item);
+                    Assert.Empty(codeDocument.GetCSharpDocument().Diagnostics);
+
+                    var syntaxTree = Parse(codeDocument.GetCSharpDocument().GeneratedCode, path: item.FilePath);
+                    AdditionalSyntaxTrees.Add(syntaxTree);
+                }
+
+                // Result of generating declarations
+                var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent);
+                codeDocument = projectEngine.ProcessDeclarationOnly(projectItem);
+                var declaration = new CompileToCSharpResult
+                {
+                    BaseCompilation = BaseCompilation.AddSyntaxTrees(AdditionalSyntaxTrees),
+                    CodeDocument = codeDocument,
+                    Code = codeDocument.GetCSharpDocument().GeneratedCode,
+                    Diagnostics = codeDocument.GetCSharpDocument().Diagnostics,
+                };
+
+                // Result of doing 'temp' compilation
+                var tempAssembly = CompileToAssembly(declaration);
+
+                // Add the 'temp' compilation as a metadata reference 
+                var references = BaseCompilation.References.Concat(new[] { tempAssembly.Compilation.ToMetadataReference() }).ToArray();
+                projectEngine = CreateProjectEngine(RazorConfiguration.Default, references);
+
+                // Now update the any additional files
+                foreach (var item in AdditionalRazorItems)
+                {
+                    // Result of generating definition
+                    codeDocument = DesignTime ? projectEngine.ProcessDesignTime(item) : projectEngine.Process(item);
+                    Assert.Empty(codeDocument.GetCSharpDocument().Diagnostics);
+
+                    // Replace the 'declaration' syntax tree
+                    var syntaxTree = Parse(codeDocument.GetCSharpDocument().GeneratedCode, path: item.FilePath);
+                    AdditionalSyntaxTrees.RemoveAll(st => st.FilePath == item.FilePath);
+                    AdditionalSyntaxTrees.Add(syntaxTree);
+                }
+
+                // Result of real code generation for the document under test
+                codeDocument = DesignTime ? projectEngine.ProcessDesignTime(projectItem) : projectEngine.Process(projectItem);
+                return new CompileToCSharpResult
+                {
+                    BaseCompilation = BaseCompilation.AddSyntaxTrees(AdditionalSyntaxTrees),
+                    CodeDocument = codeDocument,
+                    Code = codeDocument.GetCSharpDocument().GeneratedCode,
+                    Diagnostics = codeDocument.GetCSharpDocument().Diagnostics,
+                };
+            }
+            else
+            {
+                // For single phase compilation tests just use the base compilation's references.
+                // This will include the built-in Blazor components.
+                var projectEngine = CreateProjectEngine(Configuration, BaseCompilation.References.ToArray());
+
+                var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent);
+
+                RazorCodeDocument codeDocument;
+                if (DeclarationOnly)
+                {
+                    codeDocument = projectEngine.ProcessDeclarationOnly(projectItem);
+                }
+                else if (DesignTime)
+                {
+                    codeDocument = projectEngine.ProcessDesignTime(projectItem);
+                }
+                else
+                {
+                    codeDocument = projectEngine.Process(projectItem);
+                }
+
+                return new CompileToCSharpResult
+                {
+                    BaseCompilation = BaseCompilation.AddSyntaxTrees(AdditionalSyntaxTrees),
+                    CodeDocument = codeDocument,
+                    Code = codeDocument.GetCSharpDocument().GeneratedCode,
+                    Diagnostics = codeDocument.GetCSharpDocument().Diagnostics,
+                };
+            }
+        }
+
+        protected CompileToAssemblyResult CompileToAssembly(string cshtmlRelativePath, string cshtmlContent)
+        {
+            var cSharpResult = CompileToCSharp(cshtmlRelativePath, cshtmlContent);
+            return CompileToAssembly(cSharpResult);
+        }
+
+        protected CompileToAssemblyResult CompileToAssembly(CompileToCSharpResult cSharpResult, bool throwOnFailure = true)
+        {
+            if (cSharpResult.Diagnostics.Any())
+            {
+                var diagnosticsLog = string.Join(Environment.NewLine, cSharpResult.Diagnostics.Select(d => d.ToString()).ToArray());
+                throw new InvalidOperationException($"Aborting compilation to assembly because RazorCompiler returned nonempty diagnostics: {diagnosticsLog}");
+            }
+
+            var syntaxTrees = new[]
+            {
+                Parse(cSharpResult.Code),
+            };
+
+            var compilation = cSharpResult.BaseCompilation.AddSyntaxTrees(syntaxTrees);
+
+            var diagnostics = compilation
+                .GetDiagnostics()
+                .Where(d => d.Severity != DiagnosticSeverity.Hidden);
+
+            if (diagnostics.Any() && throwOnFailure)
+            {
+                throw new CompilationFailedException(compilation);
+            }
+            else if (diagnostics.Any())
+            {
+                return new CompileToAssemblyResult
+                {
+                    Compilation = compilation,
+                    Diagnostics = diagnostics,
+                };
+            }
+
+            using (var peStream = new MemoryStream())
+            {
+                compilation.Emit(peStream);
+
+                return new CompileToAssemblyResult
+                {
+                    Compilation = compilation,
+                    Diagnostics = diagnostics,
+                    Assembly = diagnostics.Any() ? null : Assembly.Load(peStream.ToArray())
+                };
+            }
+        }
+
+        protected IComponent CompileToComponent(string cshtmlSource)
+        {
+            var assemblyResult = CompileToAssembly(DefaultFileName, cshtmlSource);
+
+            var componentFullTypeName = $"{DefaultBaseNamespace}.{Path.GetFileNameWithoutExtension(DefaultFileName)}";
+            return CompileToComponent(assemblyResult, componentFullTypeName);
+        }
+
+        protected IComponent CompileToComponent(CompileToCSharpResult cSharpResult, string fullTypeName)
+        {
+            return CompileToComponent(CompileToAssembly(cSharpResult), fullTypeName);
+        }
+
+        protected IComponent CompileToComponent(CompileToAssemblyResult assemblyResult, string fullTypeName)
+        {
+            var componentType = assemblyResult.Assembly.GetType(fullTypeName);
+            if (componentType == null)
+            {
+                throw new XunitException(
+                    $"Failed to find component type '{fullTypeName}'. Found types:" + Environment.NewLine +
+                    string.Join(Environment.NewLine, assemblyResult.Assembly.ExportedTypes.Select(t => t.FullName)));
+            }
+
+            return (IComponent)Activator.CreateInstance(componentType);
+        }
+
+        protected static CSharpSyntaxTree Parse(string text, string path = null)
+        {
+            return (CSharpSyntaxTree)CSharpSyntaxTree.ParseText(text, CSharpParseOptions, path: path);
+        }
+
+        protected static string FullTypeName<T>() => typeof(T).FullName.Replace('+', '.');
+
+        protected RenderTreeFrame[] GetRenderTree(IComponent component)
+        {
+            throw null;
+        }
+
+        protected RenderTreeFrame[] GetFrames(RenderFragment fragment)
+        {
+            throw null;
+        }
+
+        protected static void AssertSourceEquals(string expected, CompileToCSharpResult generated)
+        {
+            // Normalize the paths inside the expected result to match the OS paths
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                var windowsPath = Path.Combine(ArbitraryWindowsPath, generated.CodeDocument.Source.RelativePath).Replace('/', '\\');
+                expected = expected.Replace(windowsPath, generated.CodeDocument.Source.FilePath);
+            }
+
+            expected = expected.Trim();
+            Assert.Equal(expected, generated.Code.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        protected class CompileToCSharpResult
+        {
+            // A compilation that can be used *with* this code to compile an assembly
+            public Compilation BaseCompilation { get; set; }
+            public RazorCodeDocument CodeDocument { get; set; }
+            public string Code { get; set; }
+            public IEnumerable<RazorDiagnostic> Diagnostics { get; set; }
+        }
+
+        protected class CompileToAssemblyResult
+        {
+            public Assembly Assembly { get; set; }
+            public Compilation Compilation { get; set; }
+            public string VerboseLog { get; set; }
+            public IEnumerable<Diagnostic> Diagnostics { get; set; }
+        }
+
+        private class CompilationFailedException : XunitException
+        {
+            public CompilationFailedException(Compilation compilation)
+            {
+                Compilation = compilation;
+            }
+
+            public Compilation Compilation { get; }
+
+            public override string Message
+            {
+                get
+                {
+                    var builder = new StringBuilder();
+                    builder.AppendLine("Compilation failed: ");
+
+                    var diagnostics = Compilation.GetDiagnostics();
+                    var syntaxTreesWithErrors = new HashSet<SyntaxTree>();
+                    foreach (var diagnostic in diagnostics)
+                    {
+                        builder.AppendLine(diagnostic.ToString());
+
+                        if (diagnostic.Location.IsInSource)
+                        {
+                            syntaxTreesWithErrors.Add(diagnostic.Location.SourceTree);
+                        }
+                    }
+
+                    if (syntaxTreesWithErrors.Any())
+                    {
+                        builder.AppendLine();
+                        builder.AppendLine();
+
+                        foreach (var syntaxTree in syntaxTreesWithErrors)
+                        {
+                            builder.AppendLine($"File {syntaxTree.FilePath ?? "unknown"}:");
+                            builder.AppendLine(syntaxTree.GetText().ToString());
+                        }
+                    }
+
+                    return builder.ToString();
+                }
+            }
+        }
+
+        private class SuppressChecksum : IConfigureRazorCodeGenerationOptionsFeature
+        {
+            public int Order => 0;
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SuppressChecksum = true;
+            }
+        }
+
+        private class ForceLineEndingPhase : RazorEnginePhaseBase
+        {
+            public ForceLineEndingPhase(string lineEnding)
+            {
+                LineEnding = lineEnding;
+            }
+
+            public string LineEnding { get; }
+
+            protected override void ExecuteCore(RazorCodeDocument codeDocument)
+            {
+                var field = typeof(CodeRenderingContext).GetField("NewLineString", BindingFlags.Static | BindingFlags.NonPublic);
+                var key = field.GetValue(null);
+                codeDocument.Items[key] = LineEnding;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineTestBase.cs
new file mode 100644
index 0000000000..5c655150ff
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineTestBase.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class RazorProjectEngineTestBase
+    {
+        protected abstract RazorLanguageVersion Version { get; }
+
+        protected virtual void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+        }
+
+        protected RazorEngine CreateEngine() => CreateProjectEngine().Engine;
+
+        protected RazorProjectEngine CreateProjectEngine()
+        {
+            var configuration = RazorConfiguration.Create(Version, "test", Array.Empty<RazorExtension>());
+            return RazorProjectEngine.Create(configuration, RazorProjectFileSystem.Empty, ConfigureProjectEngine);
+        }
+
+        protected RazorProjectEngine CreateProjectEngine(Action<RazorProjectEngineBuilder> configure)
+        {
+            var configuration = RazorConfiguration.Create(Version, "test", Array.Empty<RazorExtension>());
+            return RazorProjectEngine.Create(configuration, RazorProjectFileSystem.Empty, b =>
+            {
+                ConfigureProjectEngine(b);
+                configure?.Invoke(b);
+            });
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs
index c04b9243ff..4742fb94ba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestFile.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         private TestFile(string resourceName, Assembly assembly)
         {
             Assembly = assembly;
-            ResourceName = Assembly.GetName().Name + "." + resourceName.Replace('/', '.');
+            ResourceName = Assembly.GetName().Name + "." + resourceName.Replace('/', '.').Replace('\\', '.');
         }
 
         public Assembly Assembly { get; }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index a68e6182b4..8cf7f123d1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
new file mode 100644
index 0000000000..bb87b6efe5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Infrastructure for the discovery of <c>bind</c> attributes for markup elements.
+    /// </summary>
+    /// <remarks>
+    /// To extend the set of <c>bind</c> attributes, define a public class named 
+    /// <c>BindAttributes</c> and annotate it with the appropriate attributes.
+    /// </remarks>
+
+    // Handles cases like <input bind="..." /> - this is a fallback and will be ignored
+    // when a specific type attribute is applied.
+    [BindInputElement(null, null, "value", "onchange")]
+
+    [BindInputElement("checkbox", null, "checked", "onchange")]
+    [BindInputElement("text", null, "value", "onchange")]
+
+    [BindElement("select", null, "value", "onchange")]
+    [BindElement("textarea", null, "value", "onchange")]
+    public static class BindAttributes
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
index 208b3aad25..5675391bf3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Components
 {
     public abstract class ComponentBase : IComponent
     {
-        public virtual void BuildRenderTree(RenderTreeBuilder builder)
+        protected virtual void BuildRenderTree(RenderTreeBuilder builder)
         {
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs
new file mode 100644
index 0000000000..6ae6031d9b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs
@@ -0,0 +1,128 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Holds <see cref="EventHandler"/> attributes to configure the mappings between event names and
+    /// event argument types.
+    /// </summary>
+
+    // Focus events
+    [EventHandler("onfocus", typeof(UIFocusEventArgs))]
+    [EventHandler("onblur", typeof(UIFocusEventArgs))]
+    [EventHandler("onfocusin", typeof(UIFocusEventArgs))]
+    [EventHandler("onfocusout", typeof(UIFocusEventArgs))]
+
+    // Mouse events
+    [EventHandler("onmouseover", typeof(UIMouseEventArgs))]
+    [EventHandler("onmouseout", typeof(UIMouseEventArgs))]
+    [EventHandler("onmousemove", typeof(UIMouseEventArgs))]
+    [EventHandler("onmousedown", typeof(UIMouseEventArgs))]
+    [EventHandler("onmouseup", typeof(UIMouseEventArgs))]
+    [EventHandler("onclick", typeof(UIMouseEventArgs))]
+    [EventHandler("ondblclick", typeof(UIMouseEventArgs))]
+    [EventHandler("onwheel", typeof(UIWheelEventArgs))]
+    [EventHandler("onmousewheel", typeof(UIWheelEventArgs))]
+    [EventHandler("oncontextmenu", typeof(UIMouseEventArgs))]
+
+    // Drag events
+    [EventHandler("ondrag", typeof(UIDragEventArgs))]
+    [EventHandler("ondragend", typeof(UIDragEventArgs))]
+    [EventHandler("ondragenter", typeof(UIDragEventArgs))]
+    [EventHandler("ondragleave", typeof(UIDragEventArgs))]
+    [EventHandler("ondragover", typeof(UIDragEventArgs))]
+    [EventHandler("ondragstart", typeof(UIDragEventArgs))]
+    [EventHandler("ondrop", typeof(UIDragEventArgs))]
+
+    // Keyboard events
+    [EventHandler("onkeydown", typeof(UIKeyboardEventArgs))]
+    [EventHandler("onkeyup", typeof(UIKeyboardEventArgs))]
+    [EventHandler("onkeypress", typeof(UIKeyboardEventArgs))]
+
+    // Input events
+    [EventHandler("onchange", typeof(UIChangeEventArgs))]
+    [EventHandler("oninput", typeof(UIChangeEventArgs))]
+    [EventHandler("oninvalid", typeof(UIEventArgs))]
+    [EventHandler("onreset", typeof(UIEventArgs))]
+    [EventHandler("onselect", typeof(UIEventArgs))]
+    [EventHandler("onselectstart", typeof(UIEventArgs))]
+    [EventHandler("onselectionchange", typeof(UIEventArgs))]
+    [EventHandler("onsubmit", typeof(UIEventArgs))]
+
+    // Clipboard events
+    [EventHandler("onbeforecopy", typeof(UIEventArgs))]
+    [EventHandler("onbeforecut", typeof(UIEventArgs))]
+    [EventHandler("onbeforepaste", typeof(UIEventArgs))]
+    [EventHandler("oncopy", typeof(UIClipboardEventArgs))]
+    [EventHandler("oncut", typeof(UIClipboardEventArgs))]
+    [EventHandler("onpaste", typeof(UIClipboardEventArgs))]
+
+    // Touch events 
+    [EventHandler("ontouchcancel", typeof(UITouchEventArgs))]
+    [EventHandler("ontouchend", typeof(UITouchEventArgs))]
+    [EventHandler("ontouchmove", typeof(UITouchEventArgs))]
+    [EventHandler("ontouchstart", typeof(UITouchEventArgs))]
+    [EventHandler("ontouchenter", typeof(UITouchEventArgs))]
+    [EventHandler("ontouchleave", typeof(UITouchEventArgs))]
+
+    // Pointer events
+    [EventHandler("gotpointercapture", typeof(UIPointerEventArgs))]
+    [EventHandler("lostpointercapture", typeof(UIPointerEventArgs))]
+    [EventHandler("pointercancel", typeof(UIPointerEventArgs))]
+    [EventHandler("pointerdown", typeof(UIPointerEventArgs))]
+    [EventHandler("pointerenter", typeof(UIPointerEventArgs))]
+    [EventHandler("pointerleave", typeof(UIPointerEventArgs))]
+    [EventHandler("pointermove", typeof(UIPointerEventArgs))]
+    [EventHandler("pointerout", typeof(UIPointerEventArgs))]
+    [EventHandler("pointerover", typeof(UIPointerEventArgs))]
+    [EventHandler("pointerup", typeof(UIPointerEventArgs))]
+
+    // Media events
+    [EventHandler("oncanplay", typeof(UIEventArgs))]
+    [EventHandler("oncanplaythrough", typeof(UIEventArgs))]
+    [EventHandler("oncuechange", typeof(UIEventArgs))]
+    [EventHandler("ondurationchange", typeof(UIEventArgs))]
+    [EventHandler("onemptied", typeof(UIEventArgs))]
+    [EventHandler("onpause", typeof(UIEventArgs))]
+    [EventHandler("onplay", typeof(UIEventArgs))]
+    [EventHandler("onplaying", typeof(UIEventArgs))]
+    [EventHandler("onratechange", typeof(UIEventArgs))]
+    [EventHandler("onseeked", typeof(UIEventArgs))]
+    [EventHandler("onseeking", typeof(UIEventArgs))]
+    [EventHandler("onstalled", typeof(UIEventArgs))]
+    [EventHandler("onstop", typeof(UIEventArgs))]
+    [EventHandler("onsuspend", typeof(UIEventArgs))]
+    [EventHandler("ontimeupdate", typeof(UIEventArgs))]
+    [EventHandler("onvolumechange", typeof(UIEventArgs))]
+    [EventHandler("onwaiting", typeof(UIEventArgs))]
+
+    // Progress events
+    [EventHandler("onloadstart", typeof(UIProgressEventArgs))]
+    [EventHandler("ontimeout", typeof(UIProgressEventArgs))]
+    [EventHandler("onabort", typeof(UIProgressEventArgs))]
+    [EventHandler("onload", typeof(UIProgressEventArgs))]
+    [EventHandler("onloadend", typeof(UIProgressEventArgs))]
+    [EventHandler("onprogress", typeof(UIProgressEventArgs))]
+    [EventHandler("onerror", typeof(UIErrorEventArgs))]
+
+    // General events
+    [EventHandler("onactivate", typeof(UIEventArgs))]
+    [EventHandler("onbeforeactivate", typeof(UIEventArgs))]
+    [EventHandler("onbeforedeactivate", typeof(UIEventArgs))]
+    [EventHandler("ondeactivate", typeof(UIEventArgs))]
+    [EventHandler("onended", typeof(UIEventArgs))]
+    [EventHandler("onfullscreenchange", typeof(UIEventArgs))]
+    [EventHandler("onfullscreenerror", typeof(UIEventArgs))]
+    [EventHandler("onloadeddata", typeof(UIEventArgs))]
+    [EventHandler("onloadedmetadata", typeof(UIEventArgs))]
+    [EventHandler("onpointerlockchange", typeof(UIEventArgs))]
+    [EventHandler("onpointerlockerror", typeof(UIEventArgs))]
+    [EventHandler("onreadystatechange", typeof(UIEventArgs))]
+    [EventHandler("onscroll", typeof(UIEventArgs))]
+    public static class EventHandlers
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs
new file mode 100644
index 0000000000..16ec54fd3b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs
@@ -0,0 +1,36 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// A string value that can be rendered as markup such as HTML.
+    /// </summary>
+    public struct MarkupString
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="MarkupString"/>.
+        /// </summary>
+        /// <param name="value">The value for the new instance.</param>
+        public MarkupString(string value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the value of the <see cref="MarkupString"/>.
+        /// </summary>
+        public string Value { get; }
+
+        /// <summary>
+        /// Casts a <see cref="string"/> to a <see cref="MarkupString"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="string"/> value.</param>
+        public static explicit operator MarkupString(string value)
+            => new MarkupString(value);
+
+        /// <inheritdoc />
+        public override string ToString()
+            => Value ?? string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
index f250e0bb39..8cbcb3712d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -1,9 +1,99 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
 namespace Microsoft.AspNetCore.Components.RenderTree
 {
-    public abstract class RenderTreeBuilder
+    /// <summary>
+    /// Provides methods for building a collection of <see cref="RenderTreeFrame"/> entries.
+    /// </summary>
+    public class RenderTreeBuilder
     {
+        public void OpenElement(int sequence, string elementName)
+        {
+        }
+
+        public void CloseElement()
+        {
+        }
+
+        public void AddMarkupContent(int sequence, string markupContent)
+        {
+        }
+
+        public void AddContent(int sequence, string textContent)
+        {
+        }
+
+        public void AddContent(int sequence, RenderFragment fragment)
+        {
+        }
+
+        public void AddContent<T>(int sequence, RenderFragment<T> fragment, T value)
+        {
+        }
+
+        public void AddContent(int sequence, MarkupString markupContent)
+        {
+        }
+
+        public void AddContent(int sequence, object textContent)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, bool value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, string value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, Action value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, Action<UIEventArgs> value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, Func<Task> value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, Func<UIEventArgs, Task> value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, MulticastDelegate value)
+        {
+        }
+
+        public void AddAttribute(int sequence, string name, object value)
+        {
+        }
+
+        public void OpenComponent<TComponent>(int sequence) where TComponent : IComponent
+        {
+        }
+
+        public void OpenComponent(int sequence, Type componentType)
+        {
+        }
+
+        public void CloseComponent()
+        {
+        }
+        
+        public void AddElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)
+        {
+        }
+
+        public void AddComponentReferenceCapture(int sequence, Action<object> componentReferenceCaptureAction)
+        {
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs
new file mode 100644
index 0000000000..e8c4880072
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Indicates that the associated component should match the specified route template pattern.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public class RouteAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="RouteAttribute"/>.
+        /// </summary>
+        /// <param name="template">The route template.</param>
+        public RouteAttribute(string template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+
+            Template = template;
+        }
+
+        /// <summary>
+        /// Gets the route template.
+        /// </summary>
+        public string Template { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs
new file mode 100644
index 0000000000..84ab120f01
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs
@@ -0,0 +1,20 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Used by generated code produced by the code generator. Not intended or supported
+    /// for use in application code.
+    /// </summary>
+    public static class RuntimeHelpers
+    {
+        /// <summary>
+        /// Not intended for use by application code.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static T TypeCheck<T>(T value) => value;
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs
new file mode 100644
index 0000000000..bc32af071d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs
@@ -0,0 +1,547 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.RenderTree;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Extensions methods on <see cref="RenderTreeBuilder"/> for event handlers.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// These methods enable method-group to delegate conversion for delegates and methods that accept
+    /// types derived from <see cref="UIEventArgs"/>.
+    /// </para>
+    /// <para>
+    /// This enhances the programming experience for using event handlers with the render tree builder
+    /// in components written in pure C#. These extension methods make it possible to write code like:
+    /// <code>
+    /// builder.AddAttribute(0, "onkeypress", MyKeyPressHandler);
+    /// </code>
+    /// Where <c>void MyKeyPressHandler(UIKeyboardEventArgs e)</c> is a method defined in the same class.
+    /// In this example, the author knows that the <c>onclick</c> event is associated with the
+    /// <see cref="UIKeyboardEventArgs"/> event args type. The component author is responsible for 
+    /// providing a delegate that matches the expected event args type, an error will result in a failure
+    /// at runtime.
+    /// </para>
+    /// <para>
+    /// When a component is authored in Razor (.cshtml), the Razor code generator will maintain a mapping
+    /// between event names and event arg types that can be used to generate more strongly typed code.
+    /// Generated code for the same case will look like:
+    /// <code>
+    /// builder.AddAttribute(0, "onkeypress", BindMethods.GetEventHandlerValue&lt;UIKeyboardEventArgs&gt;(MyKeyPressHandler));
+    /// </code>
+    /// </para>
+    /// </remarks>
+    public static class UIEventArgsRenderTreeBuilderExtensions
+    {
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIChangeEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIChangeEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIChangeEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIChangeEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIDragEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIDragEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIDragEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIDragEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIClipboardEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIClipboardEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIClipboardEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIClipboardEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIErrorEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIErrorEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIErrorEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIErrorEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIFocusEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIFocusEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIFocusEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIFocusEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIKeyboardEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIKeyboardEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIKeyboardEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIKeyboardEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIMouseEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIMouseEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIMouseEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIMouseEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIPointerEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIPointerEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIPointerEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIPointerEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIProgressEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIProgressEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIProgressEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIProgressEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UITouchEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UITouchEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UITouchEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UITouchEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Action{UIWheelEventArgs}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIWheelEventArgs> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Appends a frame representing an <see cref="Func{UIWheelEventArgs, Task}"/>-valued attribute.
+        /// </para>
+        /// <para>
+        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
+        /// current element is not a component, the frame will be omitted.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
+        /// <param name="name">The name of the attribute.</param>
+        /// <param name="value">The value of the attribute.</param>
+        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIWheelEventArgs, Task> value)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
+        }
+    }
+}
\ No newline at end of file

From 14a815991919c21e657d47da1280b8c82095d7f8 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 27 Dec 2018 22:15:23 -0800
Subject: [PATCH 025/337] Enable component class libraries in SDK

This change contains the enabling features to use Razor Components in a
class library. Currently we require a few workarounds, see the test
project file. This is good enough to get things unblocked.

One part that was needed was to register the correct component features
in the rzc. This is a good example, of why we don't like to add new
features that get registered conditionally, it's error-prone :)

The other part that was needed was to make some of the MVC-related
features for assembly attributes conditional on the TFM. We need to be
able to use the 3.0 (all inclusive) SDK, but without the MVC-related
features. This isn't the right heuristic, but it gets us unblocked.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8dbf02076b6105f1da7946072ba76abf7e3bca20
---
 .../src/DiscoverCommand.cs                    |  5 ++
 .../src/GenerateCommand.cs                    |  2 +
 ...rosoft.NET.Sdk.Razor.Configuration.targets | 16 +++---
 .../BuildIncrementalismTest.cs                |  2 +-
 .../IntegrationTests/BuildIntegrationTest.cs  | 16 ++++++
 .../ClassLibrary/ClassLibrary.csproj          |  2 +
 .../testassets/ComponentLibrary/Class1.cs     | 12 +++++
 .../ComponentLibrary/ComponentLibrary.csproj  | 51 +++++++++++++++++++
 .../ComponentLibrary/GenericComponent.razor   |  8 +++
 .../ComponentLibrary/MyComponent.cshtml       |  1 +
 10 files changed, 108 insertions(+), 7 deletions(-)
 create mode 100644 src/Razor/test/testassets/ComponentLibrary/Class1.cs
 create mode 100644 src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
 create mode 100644 src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
 create mode 100644 src/Razor/test/testassets/ComponentLibrary/MyComponent.cshtml

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
index 3ba5eb5ab5..65329ee46b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
@@ -142,6 +142,11 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 b.Features.Add(new CompilationTagHelperFeature());
                 b.Features.Add(new DefaultTagHelperDescriptorProvider());
                 b.Features.Add(new ComponentTagHelperDescriptorProvider());
+                b.Features.Add(new BindTagHelperDescriptorProvider());
+                b.Features.Add(new EventHandlerTagHelperDescriptorProvider());
+                b.Features.Add(new RefTagHelperDescriptorProvider());
+
+                b.Features.Add(new DefaultTypeNameFeature());
             });
 
             var feature = engine.Engine.Features.OfType<ITagHelperFeature>().Single();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index f32075f5bb..e912b8ec26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
 using Newtonsoft.Json;
@@ -169,6 +170,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             var engine = RazorProjectEngine.Create(configuration, compositeFileSystem, b =>
             {
                 b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
+                b.Features.Add(new DefaultTypeNameFeature());
 
                 if (GenerateDeclaration.HasValue())
                 {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index f4a4284ca4..7b27791129 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -10,6 +10,11 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project ToolsVersion="14.0">
+
+  <PropertyGroup>
+    <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
+  </PropertyGroup>
+  
   <!--
       Initialize properties and items inferred using the project version. This file is not imported in projects referencing
       MVC \ Razor 2.2 or earlier since values specified here are provided via targets and props imported from NuGet packages
@@ -17,18 +22,21 @@ Copyright (c) .NET Foundation. All rights reserved.
 
       The properties and items here are designed to be read by CPS so they should be just simple evaluation-time values
       and should not require targets to initialize.
+
+      Also, these values are based on whether the library is targeting netcoreapp3.0 for now. A better heuristic
+      would be to detect whether the ASP.NET Core shared framework is referenced.
   -->
   <PropertyGroup>
     <!--
       MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
     -->
-    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">true</GenerateProvideApplicationPartFactoryAttribute>
+    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">$(_TargetingNETCoreApp30OrLater)</GenerateProvideApplicationPartFactoryAttribute>
 
     <!--
       Determines if the Sdk is allowed to add additional attributes to the project assembly.
       For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
     -->
-    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
+    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">$(_TargetingNETCoreApp30OrLater)</GenerateRazorAssemblyInfo>
 
     <!--
       MVC will generally want to add support for runtime compilation, but only for applications.
@@ -44,10 +52,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <IsRazorCompilerReferenced Condition="'$(IsRazorCompilerReferenced)'==''">true</IsRazorCompilerReferenced>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RazorLangVersion)'==''">
     <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index 074e3083e4..bdd22d4c08 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             // Assert - 2
             Assert.BuildPassed(result);
-            Assert.FileContentEquals(result, tagHelperOutputCache, "[]");
+            Assert.FileDoesNotContain(result, tagHelperOutputCache, @"""Name"":""SimpleMvc.SimpleTagHelper""");
             var newThumbPrint = GetThumbPrint(generatedFile);
             Assert.NotEqual(fileThumbPrint, newThumbPrint);
         }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 564b8b2745..a756360999 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -672,6 +672,22 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
         }
 
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task Building_NetstandardComponentLibrary()
+        {
+            TargetFramework = "netstandard2.0";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "ComponentLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ComponentLibrary.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.pdb");
+        }
+
         private static DependencyContext ReadDependencyContext(string depsFilePath)
         {
             var reader = new DependencyContextJsonReader();
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 37172bc6b7..fdb58e05fe 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -15,6 +15,8 @@
     <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
     <RazorLangVersion>3.0</RazorLangVersion>
     <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+    <GenerateRazorAssemblyInfo>true</GenerateRazorAssemblyInfo>
+    <GenerateProvideApplicationPartFactoryAttribute>true</GenerateProvideApplicationPartFactoryAttribute>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/ComponentLibrary/Class1.cs b/src/Razor/test/testassets/ComponentLibrary/Class1.cs
new file mode 100644
index 0000000000..2c74d8f522
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentLibrary/Class1.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace ComponentLibrary
+{
+    public class Class1
+    {
+        public void Method()
+        {
+            Console.WriteLine(typeof(Class1));
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
new file mode 100644
index 0000000000..f3ad8532a3
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+  </ItemGroup>
+
+  <!-- 
+    BEGIN COMPONENT .cshtml WORKAROUND
+
+    This is the current workaround used by the components codebase to treat .cshtml files as components
+    so that we can have tooling support. Testing it here so it won't break.
+  -->
+  <ItemGroup>
+    <RazorComponent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
+  </ItemGroup>
+
+  <Target Name="_RemoveFilesFromRazorGenerate" AfterTargets="ResolveRazorGenerateInputs">
+    <ItemGroup>
+      <RazorGenerate Remove="@(RazorGenerate)" />
+    </ItemGroup>
+  </Target>
+  <!--
+    END COMPONENT .cshtml WORKAROUND
+  -->
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor b/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
new file mode 100644
index 0000000000..5037fef5c0
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
@@ -0,0 +1,8 @@
+@typeparam TItem
+
+<h1>@Title - @Item</h1>
+
+@functions {
+    [Parameter] TItem Item { get; set; }
+    [Parameter] string Title { get; set; }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/ComponentLibrary/MyComponent.cshtml b/src/Razor/test/testassets/ComponentLibrary/MyComponent.cshtml
new file mode 100644
index 0000000000..e1a56ee3ae
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentLibrary/MyComponent.cshtml
@@ -0,0 +1 @@
+<GenericComponent Item="17" Title="nameof(Class1)" />
\ No newline at end of file

From 7f3a187455ffa568d82a6823725629dba83f1d1b Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 31 Dec 2018 14:00:14 -0800
Subject: [PATCH 026/337] Fix aspnet/AspNetCoredotnet/aspnetcore-tooling#6187

The bug here is that we have extra whitespace being written out when the
component renders. This happens because parser adds an empty C#
statement node to wrap all of the whitespace that precedes `@functions`.
This is tracked by aspnet/AspNetCoredotnet/aspnetcore-tooling#6207.

To fix this issue I'm allowing the whitespace pass to skip over an empty
C# statement to remove whitespace. This is sound because an empty C#
statement produces no output - we allow removing whitespace before and
after all nodes that produce no output.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e68d93f458d3820b1e879c3e16326d455aa80322
---
 .../src/Components/ComponentWhitespacePass.cs  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
index 2713f96de8..0cc0e117e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
@@ -77,8 +77,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         break;
 
                     case CSharpCodeIntermediateNode codeIntermediateNode:
+                        // A C# code node could be empty. We can't remove them, but we can skip them. 
                         shouldRemoveNode = false;
-                        shouldContinueIteration = ComponentDocumentClassifierPass.IsBuildRenderTreeBaseCall(codeIntermediateNode);
+                        shouldContinueIteration = 
+                            IsEmpty(codeIntermediateNode) || 
+                            ComponentDocumentClassifierPass.IsBuildRenderTreeBaseCall(codeIntermediateNode);
                         break;
 
                     default:
@@ -110,5 +113,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Forwards,
             Backwards
         }
+
+        private static bool IsEmpty(CSharpCodeIntermediateNode node)
+        {
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (!(node.Children[i] is IntermediateToken token && string.IsNullOrWhiteSpace(token.Content)))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 }

From f973693438dc122ae4db6b8ed0fb4cb7d394c3da Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 31 Dec 2018 14:54:10 -0800
Subject: [PATCH 027/337] Fix aspnet/AspNetCoredotnet/aspnetcore-tooling#6186

The issue here is that the compiler generates a different syntax tree
for `data-` attributes :(. I've added a note to dotnet/aspnetcore-tooling#6112 to follow up on
the compiler behavior. We used to parse data- attributes differently for
components, but I really don't think having the compiler special case
them makes sense.

For now I've added a workaround here to lower `data-` attributes in a
fashion similar to other dynamic attribute values.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f5109fbfecc5a4100bec177c4325b054bc65c205
---
 ...faultRazorIntermediateNodeLoweringPhase.cs | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index a25300b4ae..084fd628fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1192,7 +1192,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                     Source = BuildSourceSpanFromNode(node),
                 });
             }
-
+            
             // Example
             // <input checked="hello-world `@false`"/>
             //  Prefix= (space)
@@ -1348,6 +1348,22 @@ namespace Microsoft.AspNetCore.Razor.Language
             // We need to capture this in the IR so that we can give each piece the correct source mappings
             public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
             {
+                if (_builder.Current is HtmlAttributeIntermediateNode)
+                {
+                    // This can happen inside a data- attribute
+                    _builder.Push(new CSharpExpressionAttributeValueIntermediateNode()
+                    {
+                        Prefix = string.Empty,
+                        Source = this.BuildSourceSpanFromNode(node),
+                    });
+
+                    base.VisitCSharpExplicitExpression(node);
+
+                    _builder.Pop();
+
+                    return;
+                }
+
                 if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
                 {
                     base.VisitCSharpExplicitExpression(node);
@@ -1385,6 +1401,22 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
             {
+                if (_builder.Current is HtmlAttributeIntermediateNode)
+                {
+                    // This can happen inside a data- attribute
+                    _builder.Push(new CSharpExpressionAttributeValueIntermediateNode()
+                    {
+                        Prefix = string.Empty,
+                        Source = this.BuildSourceSpanFromNode(node),
+                    });
+
+                    base.VisitCSharpImplicitExpression(node);
+
+                    _builder.Pop();
+
+                    return;
+                }
+
                 if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
                 {
                     base.VisitCSharpImplicitExpression(node);

From 724178680f5cf46569a02c115d49e78d20c1c731 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 1 Jan 2019 16:02:33 -0800
Subject: [PATCH 028/337] Provide a public entry point for Roslyn features

We need to be able to wire up these features from outside of the Razor
repo. For layering reasons this can't be done in the main Razor
assembly, so it can't be done by default.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/386e2b37970a8d8430a2ca75430ffb4b9524334e
---
 .../src/DiscoverCommand.cs                    |  6 +---
 .../src/CompilerFeatures.cs                   | 36 +++++++++++++++++++
 .../RazorIntegrationTestBase.cs               |  7 +---
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
index 65329ee46b..91ac10fea3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
@@ -141,12 +141,8 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 b.Features.Add(new DefaultMetadataReferenceFeature() { References = metadataReferences });
                 b.Features.Add(new CompilationTagHelperFeature());
                 b.Features.Add(new DefaultTagHelperDescriptorProvider());
-                b.Features.Add(new ComponentTagHelperDescriptorProvider());
-                b.Features.Add(new BindTagHelperDescriptorProvider());
-                b.Features.Add(new EventHandlerTagHelperDescriptorProvider());
-                b.Features.Add(new RefTagHelperDescriptorProvider());
 
-                b.Features.Add(new DefaultTypeNameFeature());
+                CompilerFeatures.Register(b);
             });
 
             var feature = engine.Engine.Features.OfType<ITagHelperFeature>().Single();
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
new file mode 100644
index 0000000000..b42e6b5cc8
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    /// <summary>
+    /// Provides access to built-in Razor features that require a reference to <c>Microsoft.CodeAnalysis.CSharp</c>.
+    /// </summary>
+    public static class CompilerFeatures
+    {
+        /// <summary>
+        /// Registers built-in Razor features that require a reference to <c>Microsoft.CodeAnalysis.CSharp</c>.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+            
+            if (builder.Configuration.LanguageVersion.CompareTo(RazorLanguageVersion.Version_3_0) >= 0)
+            {
+                builder.Features.Add(new BindTagHelperDescriptorProvider());
+                builder.Features.Add(new ComponentTagHelperDescriptorProvider());
+                builder.Features.Add(new EventHandlerTagHelperDescriptorProvider());
+                builder.Features.Add(new RefTagHelperDescriptorProvider());
+
+                builder.Features.Add(new DefaultTypeNameFeature());
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index cdadb037d4..36166cfa79 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -126,12 +126,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                     References = references,
                 });
 
-                b.Features.Add(new ComponentTagHelperDescriptorProvider());
-                b.Features.Add(new BindTagHelperDescriptorProvider());
-                b.Features.Add(new EventHandlerTagHelperDescriptorProvider());
-                b.Features.Add(new RefTagHelperDescriptorProvider());
-
-                b.Features.Add(new DefaultTypeNameFeature());
+                CompilerFeatures.Register(b);
             });
         }
 

From f74124117138f65eec8b022e5b7b2722f1061b66 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 1 Jan 2019 19:22:41 -0800
Subject: [PATCH 029/337] Fix lowering of data- with HTML for components

This was missed in the previous attempt to fix data- attributes. HTML
wasn't being translated into the correct IR.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/239a88d97316b21319dcf7246f97889f76d7900d
---
 ...faultRazorIntermediateNodeLoweringPhase.cs | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 084fd628fa..84f4d12f8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1255,6 +1255,27 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
             {
+                if (_builder.Current is HtmlAttributeIntermediateNode)
+                {
+                    // This can happen inside a data- attribute 
+                    _builder.Push(new HtmlAttributeValueIntermediateNode()
+                    {
+                        Prefix = string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Add(new IntermediateToken()
+                    {
+                        Content = node.GetContent() ?? string.Empty,
+                        Kind = TokenKind.Html,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+
+                    return;
+                }
+
                 var context = node.GetSpanContext();
                 if (context != null && context.ChunkGenerator == SpanChunkGenerator.Null)
                 {

From 74d56ce02435a80dfb4cd59ec666ae82d9bdca6c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 1 Jan 2019 19:51:29 -0800
Subject: [PATCH 030/337] Ignore markup comments in components

Fixes: aspnet/AspNetCoredotnet/aspnetcore-tooling#6184

This gives us parity with the current behavior. Since comments aren't
meaningful in a component/render-tree context, we ignore everything
inside of them for codegen/lowering.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7250dd262492e675661f011d5677a7d97182d52c
---
 .../src/DefaultRazorIntermediateNodeLoweringPhase.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 84f4d12f8f..290b9d3bd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1331,6 +1331,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 });
             }
 
+            public override void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+            {
+                // Comments are ignored by components. We skip over anything that appears inside.
+            }
+
             public override void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
             {
                 var templateNode = new TemplateIntermediateNode();

From 583113686c840248d56350230626d2ed34369fee Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 1 Jan 2019 21:55:02 -0800
Subject: [PATCH 031/337] Test cleanup for component tests

This code all got dumped here during the port. This change deletes tests
that have already **moved** to the aspnet/AspNetCore repo.

Also fixed the markup rewriter tests for components.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/86cc90400418c1dc3354d5f4c88b8105cae12243
---
 .../src/DefaultRazorProjectEngine.cs               | 14 ++++++++------
 .../IntegrationTests/RazorIntegrationTestBase.cs   | 10 ----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
index 1099be4c72..c8fc4f6f9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectEngine.cs
@@ -88,19 +88,21 @@ namespace Microsoft.AspNetCore.Razor.Language
             return CreateCodeDocumentCore(sourceDocument, projectItem.FileKind, importSourceDocuments, tagHelpers: null, configureParser, configureCodeGeneration);
         }
 
-        protected RazorCodeDocument CreateCodeDocumentCore(
+        protected internal RazorCodeDocument CreateCodeDocumentCore(
             RazorSourceDocument sourceDocument, 
-            string fileKind, 
-            IReadOnlyList<RazorSourceDocument> importSourceDocuments, 
-            IReadOnlyList<TagHelperDescriptor> tagHelpers,
-            Action<RazorParserOptionsBuilder> configureParser,
-            Action<RazorCodeGenerationOptionsBuilder> configureCodeGeneration)
+            string fileKind = null, 
+            IReadOnlyList<RazorSourceDocument> importSourceDocuments = null, 
+            IReadOnlyList<TagHelperDescriptor> tagHelpers = null,
+            Action<RazorParserOptionsBuilder> configureParser = null,
+            Action<RazorCodeGenerationOptionsBuilder> configureCodeGeneration = null)
         {
             if (sourceDocument == null)
             {
                 throw new ArgumentNullException(nameof(sourceDocument));
             }
 
+            importSourceDocuments = importSourceDocuments ?? Array.Empty<RazorSourceDocument>();
+
             var parserOptions = GetRequiredFeature<IRazorParserOptionsFactoryProjectFeature>().Create(fileKind, builder =>
             {
                 ConfigureParserOptions(builder);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index 36166cfa79..aa716ece02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -348,16 +348,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         protected static string FullTypeName<T>() => typeof(T).FullName.Replace('+', '.');
 
-        protected RenderTreeFrame[] GetRenderTree(IComponent component)
-        {
-            throw null;
-        }
-
-        protected RenderTreeFrame[] GetFrames(RenderFragment fragment)
-        {
-            throw null;
-        }
-
         protected static void AssertSourceEquals(string expected, CompileToCSharpResult generated)
         {
             // Normalize the paths inside the expected result to match the OS paths

From 053121e0b7a2bdd27c8f995a174a3471aa55c64c Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 2 Jan 2019 15:32:55 -0800
Subject: [PATCH 032/337] Refined Start tag and End tag structure
 (dotnet/aspnetcore-tooling#62)

Regenerated baselines\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d54460296fc374ba767e99a4d3cb4dcb54fd0c3e
---
 .../src/ClassifiedSpanRewriter.cs             |  65 ---
 .../src/ClassifiedSpanVisitor.cs              | 114 +++-
 ...faultRazorIntermediateNodeLoweringPhase.cs |  18 +-
 .../src/Legacy/HtmlMarkupParser.cs            | 490 ++++++++++--------
 .../src/Legacy/LegacySyntaxNodeExtensions.cs  |  37 +-
 .../src/Legacy/RazorSyntaxTreeExtensions.cs   |   4 +-
 .../src/Legacy/TagHelperParseTreeRewriter.cs  |  24 +-
 .../Syntax.xml.Internal.Generated.cs          | 393 ++++++++------
 .../Generated/Syntax.xml.Main.Generated.cs    | 137 +++--
 .../Generated/Syntax.xml.Syntax.Generated.cs  | 298 +++++++----
 .../InternalSyntax/MarkupEndTagSyntax.cs      |  34 ++
 .../InternalSyntax/MarkupStartTagSyntax.cs    |  34 ++
 .../src/Syntax/MarkupEndTagSyntax.cs          |  72 +++
 .../src/Syntax/MarkupStartTagSyntax.cs        |  98 ++++
 .../src/Syntax/Syntax.xml                     |  42 +-
 .../src/Syntax/SyntaxListBuilderOfT.cs        |   7 +
 .../src/Syntax/SyntaxNodeExtensions.cs        | 104 ----
 .../src/Syntax/SyntaxSerializer.cs            |  16 +
 .../Language/Legacy/SyntaxNodeWriter.cs       |  16 +
 19 files changed, 1293 insertions(+), 710 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupEndTagSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupStartTagSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupStartTagSyntax.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
deleted file mode 100644
index 724203bd0a..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.AspNetCore.Razor.Language.Syntax;
-
-namespace Microsoft.AspNetCore.Razor.Language
-{
-    internal class ClassifiedSpanRewriter : SyntaxRewriter
-    {
-        public override SyntaxNode VisitMarkupStartTag(MarkupStartTagSyntax node)
-        {
-            SpanContext latestSpanContext = null;
-            var newChildren = SyntaxListBuilder<RazorSyntaxNode>.Create();
-            var literals = new List<MarkupTextLiteralSyntax>();
-            foreach (var child in node.Children)
-            {
-                if (child is MarkupTextLiteralSyntax literal)
-                {
-                    literals.Add(literal);
-                    latestSpanContext = literal.GetSpanContext() ?? latestSpanContext;
-                }
-                else if (child is MarkupMiscAttributeContentSyntax miscContent)
-                {
-                    foreach (var contentChild in miscContent.Children)
-                    {
-                        if (contentChild is MarkupTextLiteralSyntax contentLiteral)
-                        {
-                            literals.Add(contentLiteral);
-                            latestSpanContext = contentLiteral.GetSpanContext() ?? latestSpanContext;
-                        }
-                        else
-                        {
-                            // Pop stack
-                            AddLiteralIfExists();
-                            newChildren.Add(contentChild);
-                        }
-                    }
-                }
-                else
-                {
-                    AddLiteralIfExists();
-                    newChildren.Add(child);
-                }
-            }
-
-            AddLiteralIfExists();
-
-            return SyntaxFactory.MarkupStartTag(newChildren.ToList()).Green.CreateRed(node.Parent, node.Position);
-
-            void AddLiteralIfExists()
-            {
-                if (literals.Count > 0)
-                {
-                    var mergedLiteral = SyntaxUtilities.MergeTextLiterals(literals.ToArray());
-                    mergedLiteral = mergedLiteral.WithSpanContext(latestSpanContext);
-                    literals.Clear();
-                    latestSpanContext = null;
-                    newChildren.Add(mergedLiteral);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
index f6711c0ed5..46d69157f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 
@@ -108,12 +109,26 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
         {
-            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupStartTag);
+            WriteBlock(node, BlockKindInternal.Tag, n =>
+            {
+                var children = GetRewrittenMarkupStartTagChildren(node);
+                foreach (var child in children)
+                {
+                    Visit(child);
+                }
+            });
         }
 
         public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
         {
-            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupEndTag);
+            WriteBlock(node, BlockKindInternal.Tag, n =>
+            {
+                var children = GetRewrittenMarkupEndTagChildren(node);
+                foreach (var child in children)
+                {
+                    Visit(child);
+                }
+            });
         }
 
         public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
@@ -275,5 +290,100 @@ namespace Microsoft.AspNetCore.Razor.Language
             var span = new ClassifiedSpanInternal(spanSource, blockSource, kind, _currentBlockKind, acceptedCharacters.Value);
             _spans.Add(span);
         }
+
+        private static SyntaxList<RazorSyntaxNode> GetRewrittenMarkupStartTagChildren(MarkupStartTagSyntax node)
+        {
+            // Rewrites the children of the start tag to look like the legacy syntax tree.
+            if (node.IsMarkupTransition)
+            {
+                var tokens = node.DescendantNodes().Where(n => n is SyntaxToken token && !token.IsMissing).Cast<SyntaxToken>().ToArray();
+                var tokenBuilder = SyntaxListBuilder<SyntaxToken>.Create();
+                tokenBuilder.AddRange(tokens, 0, tokens.Length);
+                var markupTransition = SyntaxFactory.MarkupTransition(tokenBuilder.ToList()).Green.CreateRed(node, node.Position);
+                var spanContext = node.GetSpanContext();
+                if (spanContext != null)
+                {
+                    markupTransition = markupTransition.WithSpanContext(spanContext);
+                }
+
+                var builder = new SyntaxListBuilder(1);
+                builder.Add(markupTransition);
+                return new SyntaxList<RazorSyntaxNode>(builder.ToListNode().CreateRed(node, node.Position));
+            }
+
+            SpanContext latestSpanContext = null;
+            var children = node.Children;
+            var newChildren = new SyntaxListBuilder(children.Count);
+            var literals = new List<MarkupTextLiteralSyntax>();
+            foreach (var child in children)
+            {
+                if (child is MarkupTextLiteralSyntax literal)
+                {
+                    literals.Add(literal);
+                    latestSpanContext = literal.GetSpanContext() ?? latestSpanContext;
+                }
+                else if (child is MarkupMiscAttributeContentSyntax miscContent)
+                {
+                    foreach (var contentChild in miscContent.Children)
+                    {
+                        if (contentChild is MarkupTextLiteralSyntax contentLiteral)
+                        {
+                            literals.Add(contentLiteral);
+                            latestSpanContext = contentLiteral.GetSpanContext() ?? latestSpanContext;
+                        }
+                        else
+                        {
+                            // Pop stack
+                            AddLiteralIfExists();
+                            newChildren.Add(contentChild);
+                        }
+                    }
+                }
+                else
+                {
+                    AddLiteralIfExists();
+                    newChildren.Add(child);
+                }
+            }
+
+            AddLiteralIfExists();
+
+            return new SyntaxList<RazorSyntaxNode>(newChildren.ToListNode().CreateRed(node, node.Position));
+
+            void AddLiteralIfExists()
+            {
+                if (literals.Count > 0)
+                {
+                    var mergedLiteral = SyntaxUtilities.MergeTextLiterals(literals.ToArray());
+                    mergedLiteral = mergedLiteral.WithSpanContext(latestSpanContext);
+                    literals.Clear();
+                    latestSpanContext = null;
+                    newChildren.Add(mergedLiteral);
+                }
+            }
+        }
+
+        private static SyntaxList<RazorSyntaxNode> GetRewrittenMarkupEndTagChildren(MarkupEndTagSyntax node)
+        {
+            // Rewrites the children of the end tag to look like the legacy syntax tree.
+            if (node.IsMarkupTransition)
+            {
+                var tokens = node.DescendantNodes().Where(n => n is SyntaxToken token && !token.IsMissing).Cast<SyntaxToken>().ToArray();
+                var tokenBuilder = SyntaxListBuilder<SyntaxToken>.Create();
+                tokenBuilder.AddRange(tokens, 0, tokens.Length);
+                var markupTransition = SyntaxFactory.MarkupTransition(tokenBuilder.ToList()).Green.CreateRed(node, node.Position);
+                var spanContext = node.GetSpanContext();
+                if (spanContext != null)
+                {
+                    markupTransition = markupTransition.WithSpanContext(spanContext);
+                }
+
+                var builder = new SyntaxListBuilder(1);
+                builder.Add(markupTransition);
+                return new SyntaxList<RazorSyntaxNode>(builder.ToListNode().CreateRed(node, node.Position));
+            }
+
+            return node.Children;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 290b9d3bd9..c92f08c1b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -810,6 +810,22 @@ namespace Microsoft.AspNetCore.Razor.Language
                 base.VisitMarkupTextLiteral(node);
             }
 
+            public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
+            {
+                foreach (var child in node.Children)
+                {
+                    Visit(child);
+                }
+            }
+
+            public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
+            {
+                foreach (var child in node.Children)
+                {
+                    Visit(child);
+                }
+            }
+
             public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
             {
                 var info = node.TagHelperInfo;
@@ -1110,7 +1126,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                     Source = BuildSourceSpanFromNode(node),
 
                     // Could be empty while the tag is being typed in.
-                    TagName = node.StartTag?.GetTagName() ?? node.EndTag?.GetTagName() ?? string.Empty,
+                    TagName = node.StartTag?.GetTagNameWithOptionalBang() ?? node.EndTag?.GetTagName() ?? string.Empty,
                 });
 
                 base.VisitMarkupElement(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 3286cbbc66..ed20cc9617 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -322,7 +322,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 // Check if the previous span was a transition.
                 var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
-                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
+                if (previousSpan != null &&
+                    ((previousSpan is MarkupStartTagSyntax startTag && startTag.IsMarkupTransition) ||
+                    (previousSpan is MarkupEndTagSyntax endTag && endTag.IsMarkupTransition)))
                 {
                     var tokens = ReadWhile(
                         f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
@@ -576,179 +578,201 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             tagName = null;
             tagMode = MarkupTagMode.Invalid;
+            isWellFormed = false;
+
+            var openAngleToken = EatCurrentToken(); // Accept '<'
+            var isBangEscape = TryParseBangEscape(out var bangToken);
+
+            if (At(SyntaxKind.Text))
+            {
+                tagName = CurrentToken.Content;
+                tagMode = MarkupTagMode.Normal;
+
+                if (isBangEscape)
+                {
+                    // We don't want to group <p> and </!p> together.
+                    tagName = "!" + tagName;
+                }
+            }
+
+            if (mode == ParseMode.MarkupInCodeBlock &&
+                _tagTracker.Count == 0 &&
+                string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+            {
+                // "<text>" tag is special only if it is the outermost tag.
+                return ParseStartTextTag(openAngleToken, out tagMode, out isWellFormed);
+            }
+
+            var tagNameToken = At(SyntaxKind.Text) ? EatCurrentToken() : SyntaxFactory.MissingToken(SyntaxKind.Text);
+
+            var attributes = EmptySyntaxList;
             using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                var tagBuilder = pooledResult.Builder;
+                var attributeBuilder = pooledResult.Builder;
+                
+                // Parse the contents of a tag like attributes.
+                ParseAttributes(attributeBuilder);
+                attributes = attributeBuilder.ToList();
+            }
 
-                AcceptAndMoveNext(); // Accept '<'
-                var isBangEscape = TryParseBangEscape(tagBuilder);
+            SyntaxToken forwardSlashToken = null;
+            if (At(SyntaxKind.ForwardSlash))
+            {
+                // This is a self closing tag.
+                tagMode = MarkupTagMode.SelfClosing;
+                forwardSlashToken = EatCurrentToken();
+            }
 
-                if (At(SyntaxKind.Text))
+            var closeAngleToken = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+            if (mode == ParseMode.MarkupInCodeBlock)
+            {
+                if (EndOfFile || !At(SyntaxKind.CloseAngle))
                 {
-                    tagName = CurrentToken.Content;
-                    tagMode = MarkupTagMode.Normal;
-
-                    if (isBangEscape)
+                    // Unfinished tag
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                            new SourceSpan(
+                                tagName == null ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
+                                Math.Max(tagName?.Length ?? 0, 1)),
+                            tagName ?? string.Empty));
+                }
+                else
+                {
+                    if (At(SyntaxKind.CloseAngle))
                     {
-                        // We don't want to group <p> and </!p> together.
-                        tagName = "!" + tagName;
+                        isWellFormed = true;
+                        closeAngleToken = EatCurrentToken();
                     }
-                }
 
-                if (mode == ParseMode.MarkupInCodeBlock &&
-                    _tagTracker.Count == 0 &&
-                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
-                {
-                    // "<text>" tag is special only if it is the outermost tag.
-                    return ParseStartTextTag(out tagMode, out isWellFormed);
-                }
-
-                TryAccept(SyntaxKind.Text);
-
-                if (At(SyntaxKind.CloseAngle) && mode == ParseMode.MarkupInCodeBlock)
-                {
                     // Completed tags in code blocks have no accepted characters.
                     SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                }
 
-                // Output open angle and tag name
-                tagBuilder.Add(OutputAsMarkupLiteral());
-
-                // Parse the contents of a tag like attributes.
-                ParseAttributes(tagBuilder);
-
-                if (TryAccept(SyntaxKind.ForwardSlash))
-                {
-                    // This is a self closing tag.
-                    tagMode = MarkupTagMode.SelfClosing;
-                }
-
-                if (mode == ParseMode.MarkupInCodeBlock)
-                {
-                    if (EndOfFile || !At(SyntaxKind.CloseAngle))
+                    if (tagMode != MarkupTagMode.SelfClosing && ParserHelpers.VoidElements.Contains(tagName))
                     {
-                        // Unfinished tag
-                        isWellFormed = false;
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
-                                new SourceSpan(
-                                    tagName == null ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
-                                    Math.Max(tagName?.Length ?? 0, 1)),
-                                tagName ?? string.Empty));
-                    }
-                    else
-                    {
-                        isWellFormed = TryAccept(SyntaxKind.CloseAngle);
+                        // This is a void element.
+                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
+                        // we need to look ahead at the next set of tokens.
 
-                        // Completed tags in code blocks have no accepted characters.
-                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        // Place a bookmark
+                        var bookmark = CurrentStart.AbsoluteIndex;
 
-                        if (tagMode != MarkupTagMode.SelfClosing && ParserHelpers.VoidElements.Contains(tagName))
+                        // Skip whitespace
+                        ReadWhile(IsSpacingToken(includeNewLines: true));
+
+                        // Open Angle
+                        if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
                         {
-                            // This is a void element.
-                            // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
-                            // we need to look ahead at the next set of tokens.
-
-                            // Place a bookmark
-                            var bookmark = CurrentStart.AbsoluteIndex;
-
-                            // Skip whitespace
-                            var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
-
-                            // Open Angle
-                            if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
-                            {
-                                var openAngle = CurrentToken;
-                                NextToken();
-                                Assert(SyntaxKind.ForwardSlash);
-                                var forwardSlash = CurrentToken;
-                                NextToken();
-                                if (!At(SyntaxKind.Text) || !string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
-                                {
-                                    // There is no matching end void tag.
-                                    tagMode = MarkupTagMode.Void;
-                                }
-                            }
-                            else
+                            NextToken();
+                            Assert(SyntaxKind.ForwardSlash);
+                            NextToken();
+                            if (!At(SyntaxKind.Text) || !string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
                             {
                                 // There is no matching end void tag.
                                 tagMode = MarkupTagMode.Void;
                             }
-
-                            // Go back to the bookmark and just finish this tag at the close angle
-                            Context.Source.Position = bookmark;
-                            NextToken();
                         }
+                        else
+                        {
+                            // There is no matching end void tag.
+                            tagMode = MarkupTagMode.Void;
+                        }
+
+                        // Go back to the bookmark and just finish this tag at the close angle
+                        Context.Source.Position = bookmark;
+                        NextToken();
                     }
                 }
-                else
-                {
-                    isWellFormed = TryAccept(SyntaxKind.CloseAngle);
-                }
-
-                // End tag block
-                tagBuilder.Add(OutputAsMarkupLiteral());
-                var tagBlock = SyntaxFactory.MarkupStartTag(tagBuilder.ToList());
-                if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
-                {
-                    // If the script tag expects javascript content then we should do minimal parsing until we reach
-                    // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
-                    if (!ScriptTagExpectsHtml(tagBlock))
-                    {
-                        tagMode = MarkupTagMode.Script;
-                    }
-                }
-
-                return tagBlock;
             }
+            else if (At(SyntaxKind.CloseAngle))
+            {
+                isWellFormed = true;
+                closeAngleToken = EatCurrentToken();
+            }
+
+            // End tag block
+            var startTag = SyntaxFactory.MarkupStartTag(openAngleToken, bangToken, tagNameToken, attributes, forwardSlashToken, closeAngleToken);
+            if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+            {
+                // If the script tag expects javascript content then we should do minimal parsing until we reach
+                // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
+                if (!ScriptTagExpectsHtml(startTag))
+                {
+                    tagMode = MarkupTagMode.Script;
+                }
+            }
+
+            return GetNodeWithSpanContext(startTag);
         }
 
-        private MarkupStartTagSyntax ParseStartTextTag(out MarkupTagMode tagMode, out bool isWellFormed)
+        private MarkupStartTagSyntax ParseStartTextTag(SyntaxToken openAngleToken, out MarkupTagMode tagMode, out bool isWellFormed)
         {
             // At this point, we should have already accepted the open angle. We won't get here if the tag is escaped.
             tagMode = MarkupTagMode.Normal;
             var textLocation = CurrentStart;
             Assert(SyntaxKind.Text);
 
-            AcceptAndMoveNext();
+            var tagNameToken = EatCurrentToken();
 
-            AcceptWhile(IsSpacingToken(includeNewLines: false));
-            if (At(SyntaxKind.CloseAngle) ||
-                (At(SyntaxKind.ForwardSlash) && NextIs(SyntaxKind.CloseAngle)))
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                if (At(SyntaxKind.ForwardSlash))
+                var miscAttributeContentBuilder = pooledResult.Builder;
+                SyntaxToken forwardSlashToken = null;
+                SyntaxToken closeAngleToken = null;
+
+                AcceptWhile(IsSpacingToken(includeNewLines: false));
+                miscAttributeContentBuilder.Add(OutputAsMarkupLiteral());
+
+                if (At(SyntaxKind.CloseAngle) ||
+                    (At(SyntaxKind.ForwardSlash) && NextIs(SyntaxKind.CloseAngle)))
                 {
-                    tagMode = MarkupTagMode.SelfClosing;
-                    AcceptAndMoveNext(); // '/'
+                    if (At(SyntaxKind.ForwardSlash))
+                    {
+                        tagMode = MarkupTagMode.SelfClosing;
+                        forwardSlashToken = EatCurrentToken();
+                    }
+
+                    closeAngleToken = EatCurrentToken();
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+                else
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                    RecoverTextTag(out var miscContent, out closeAngleToken);
+                    miscAttributeContentBuilder.Add(miscContent);
                 }
 
-                AcceptAndMoveNext(); // '>'
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                isWellFormed = true;
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                var startTextTag = SyntaxFactory.MarkupStartTag(
+                    openAngleToken,
+                    bang: null,
+                    name: tagNameToken,
+                    attributes: miscAttributeContentBuilder.ToList(),
+                    forwardSlash: forwardSlashToken,
+                    closeAngle: closeAngleToken);
+
+                return GetNodeWithSpanContext(startTextTag).AsMarkupTransition();
             }
-            else
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
-
-                RecoverTextTag();
-            }
-
-            isWellFormed = true;
-            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-            var startTextTag = SyntaxFactory.MarkupStartTag(transition);
-
-            return startTextTag;
         }
 
-        private void RecoverTextTag()
+        private void RecoverTextTag(out MarkupTextLiteralSyntax miscContent, out SyntaxToken closeAngleToken)
         {
             // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
             AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
+            miscContent = OutputAsMarkupLiteral();
 
             // Include the close angle in the text tag block if it's there, otherwise just move on
-            TryAccept(SyntaxKind.CloseAngle);
+            if (At(SyntaxKind.CloseAngle))
+            {
+                closeAngleToken = EatCurrentToken();
+            }
+            else
+            {
+                closeAngleToken = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+            }
         }
 
         private MarkupEndTagSyntax ParseEndTag(ParseMode mode, out string tagName, out bool isWellFormed)
@@ -757,51 +781,61 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Assert(SyntaxKind.OpenAngle);
 
             tagName = null;
+            SyntaxToken tagNameToken = null;
 
-            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            var openAngleToken = EatCurrentToken(); // Accept '<'
+            var forwardSlashToken = At(SyntaxKind.ForwardSlash) ? EatCurrentToken() : SyntaxFactory.MissingToken(SyntaxKind.ForwardSlash);
+
+            // Whitespace here is invalid (according to the spec)
+            var isBangEscape = TryParseBangEscape(out var bangToken);
+            if (At(SyntaxKind.Text))
             {
-                var tagBuilder = pooledResult.Builder;
+                tagName = isBangEscape ? "!" : string.Empty;
+                tagName += CurrentToken.Content;
 
-                AcceptAndMoveNext(); // Accept '<'
-                TryAccept(SyntaxKind.ForwardSlash);
-
-                // Whitespace here is invalid (according to the spec)
-                var isBangEscape = TryParseBangEscape(tagBuilder);
-                if (At(SyntaxKind.Text))
+                if (mode == ParseMode.MarkupInCodeBlock &&
+                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
                 {
-                    tagName = isBangEscape ? "!" : string.Empty;
-                    tagName += CurrentToken.Content;
-
-                    if (mode == ParseMode.MarkupInCodeBlock &&
-                        string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+                    // "<text>" tag is special only if it is the outermost tag. We need to figure out if the current end text tag
+                    // matches the outermost start text tag.
+                    var openTextTagCount = 0;
+                    foreach (var tracker in _tagTracker)
                     {
-                        // "<text>" tag is special only if it is the outermost tag. We need to figure out if the current end text tag
-                        // matches the outermost start text tag.
-                        var openTextTagCount = 0;
-                        foreach (var tracker in _tagTracker)
+                        if (string.Equals(tracker.TagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
                         {
-                            if (string.Equals(tracker.TagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
-                            {
-                                openTextTagCount++;
-                            }
-                        }
-
-                        if (openTextTagCount == 1 &&
-                            string.Equals(_tagTracker.Last().TagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            // This means there is only one open text tag and it is the outermost tag.
-                            return ParseEndTextTag(out isWellFormed);
+                            openTextTagCount++;
                         }
                     }
 
-                    AcceptAndMoveNext();
+                    if (openTextTagCount == 1 &&
+                        string.Equals(_tagTracker.Last().TagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // This means there is only one open text tag and it is the outermost tag.
+                        return ParseEndTextTag(openAngleToken, forwardSlashToken, out isWellFormed);
+                    }
                 }
-                TryAccept(SyntaxKind.Whitespace);
+
+                tagNameToken = EatCurrentToken();
+            }
+            else
+            {
+                tagNameToken = SyntaxFactory.MissingToken(SyntaxKind.Text);
+            }
+
+            SyntaxToken closeAngleToken = null;
+            MarkupMiscAttributeContentSyntax miscAttributeContent = null;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var miscAttributeBuilder = pooledResult.Builder;
+
+                AcceptWhile(SyntaxKind.Whitespace);
+                miscAttributeBuilder.Add(OutputAsMarkupLiteral());
 
                 if (mode == ParseMode.MarkupInCodeBlock)
                 {
                     // We want to accept malformed end tags as content.
                     AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
+                    miscAttributeBuilder.Add(OutputAsMarkupLiteral());
 
                     if (At(SyntaxKind.CloseAngle))
                     {
@@ -810,42 +844,73 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                 }
 
-                isWellFormed = TryAccept(SyntaxKind.CloseAngle);
-
-                // End tag block
-                tagBuilder.Add(OutputAsMarkupLiteral());
-                var tagBlock = SyntaxFactory.MarkupEndTag(tagBuilder.ToList());
-                return tagBlock;
+                if (miscAttributeBuilder.Count > 0)
+                {
+                    miscAttributeContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeBuilder.ToList());
+                }
             }
+
+            if (At(SyntaxKind.CloseAngle))
+            {
+                isWellFormed = true;
+                closeAngleToken = EatCurrentToken();
+            }
+            else
+            {
+                isWellFormed = false;
+                closeAngleToken = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+            }
+
+            // End tag block
+            var endTag = SyntaxFactory.MarkupEndTag(openAngleToken, forwardSlashToken, bangToken, tagNameToken, miscAttributeContent, closeAngleToken);
+            return GetNodeWithSpanContext(endTag);
         }
 
-        private MarkupEndTagSyntax ParseEndTextTag(out bool isWellFormed)
+        private MarkupEndTagSyntax ParseEndTextTag(SyntaxToken openAngleToken, SyntaxToken forwardSlashToken, out bool isWellFormed)
         {
             // At this point, we should have already accepted the open angle and forward slash. We won't get here if the tag is escaped.
             var textLocation = CurrentStart;
             Assert(SyntaxKind.Text);
-            AcceptAndMoveNext();
+            var tagNameToken = EatCurrentToken();
 
-            isWellFormed = TryAccept(SyntaxKind.CloseAngle);
-            if (!isWellFormed)
+            MarkupMiscAttributeContentSyntax miscAttributeContent = null;
+            SyntaxToken closeAngleToken = null;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+                var miscAttributeBuilder = pooledResult.Builder;
 
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-                RecoverTextTag();
-            }
-            else
-            {
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                isWellFormed = At(SyntaxKind.CloseAngle);
+                if (!isWellFormed)
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                    RecoverTextTag(out var miscContent, out closeAngleToken);
+                    miscAttributeBuilder.Add(miscContent);
+                }
+                else
+                {
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    closeAngleToken = EatCurrentToken();
+                }
+
+                if (miscAttributeBuilder.Count > 0)
+                {
+                    miscAttributeContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeBuilder.ToList());
+                }
             }
 
             SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-
-            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
-            var endTextTag = SyntaxFactory.MarkupEndTag(transition);
-            return endTextTag;
+            var endTextTag = SyntaxFactory.MarkupEndTag(
+                openAngleToken,
+                forwardSlashToken,
+                bang: null,
+                name: tagNameToken,
+                miscAttributeContent: miscAttributeContent,
+                closeAngle: closeAngleToken);
+            return GetNodeWithSpanContext(endTextTag).AsMarkupTransition();
         }
 
         private void ParseAttributes(in SyntaxListBuilder<RazorSyntaxNode> builder)
@@ -1257,26 +1322,47 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var tagStart = CurrentStart;
                 builder.Add(OutputAsMarkupLiteral());
 
+                SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+
+                var openAngleToken = EatCurrentToken(); // '<'
+                var forwardSlashToken = EatCurrentToken(); // '/'
+                var tagNameToken = EatCurrentToken(); // 'script'
+                MarkupMiscAttributeContentSyntax miscContent = null;
+                SyntaxToken closeAngleToken = null;
+
                 using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
                 {
-                    var tagBuilder = pooledResult.Builder;
-                    SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+                    var miscAttributeBuilder = pooledResult.Builder;
 
-                    AcceptAndMoveNext(); // '<'
-                    AcceptAndMoveNext(); // '/'
-                    ParseMarkupNodes(tagBuilder, ParseMode.Text, token => token.Kind == SyntaxKind.CloseAngle);
-                    if (!TryAccept(SyntaxKind.CloseAngle))
+                    ParseMarkupNodes(miscAttributeBuilder, ParseMode.Text, token => token.Kind == SyntaxKind.CloseAngle);
+                    miscAttributeBuilder.Add(OutputAsMarkupLiteral());
+                    if (miscAttributeBuilder.Count > 0)
+                    {
+                        miscContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeBuilder.ToList());
+                    }
+
+                    if (!At(SyntaxKind.CloseAngle))
                     {
                         Context.ErrorSink.OnError(
                             RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
                                 new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
                                 ScriptTagName));
-                        var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
-                        Accept(closeAngle);
+                        closeAngleToken = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+                    }
+                    else
+                    {
+                        closeAngleToken = EatCurrentToken();
                     }
-                    tagBuilder.Add(OutputAsMarkupLiteral());
-                    endTag = SyntaxFactory.MarkupEndTag(tagBuilder.ToList());
                 }
+
+                endTag = SyntaxFactory.MarkupEndTag(
+                    openAngleToken,
+                    forwardSlashToken,
+                    bang: null,
+                    name: tagNameToken,
+                    miscAttributeContent: miscContent,
+                    closeAngle: closeAngleToken);
+                endTag = GetNodeWithSpanContext(endTag);
             }
 
             var element = SyntaxFactory.MarkupElement(startTag, builder.Consume(), endTag);
@@ -1500,13 +1586,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private bool ScriptTagExpectsHtml(MarkupStartTagSyntax tagBlock)
         {
             MarkupAttributeBlockSyntax typeAttribute = null;
-            for (var i = 0; i < tagBlock.Children.Count; i++)
+            for (var i = 0; i < tagBlock.Attributes.Count; i++)
             {
-                var node = tagBlock.Children[i];
-                if (node.IsToken || node.IsTrivia)
-                {
-                    continue;
-                }
+                var node = tagBlock.Attributes[i];
 
                 if (node is MarkupAttributeBlockSyntax attributeBlock &&
                     attributeBlock.Value.Children.Count > 0 &&
@@ -1678,19 +1760,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private bool TryParseBangEscape(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        private bool TryParseBangEscape(out SyntaxToken bangToken)
         {
+            bangToken = null;
             if (IsBangEscape(lookahead: 0))
             {
-                builder.Add(OutputAsMarkupLiteral());
-
                 // Accept the parser escape character '!'.
                 Assert(SyntaxKind.Bang);
-                AcceptAndMoveNext();
+                bangToken = EatCurrentToken();
 
-                // Setup the metacode span that we will be outputing.
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                builder.Add(OutputAsMetaCode(Output()));
                 return true;
             }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
index cfe840d4f3..9949ce8a62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
@@ -100,7 +100,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             SyntaxNode owner = null;
-            var children = node.ChildNodes();
+            IEnumerable<SyntaxNode> children = null;
+            if (node is MarkupStartTagSyntax startTag)
+            {
+                children = startTag.Children;
+            }
+            else if (node is MarkupEndTagSyntax endTag)
+            {
+                children = endTag.Children;
+            }
+            else
+            {
+                children = node.ChildNodes();
+            }
+
             foreach (var child in children)
             {
                 owner = LocateOwner(child, change);
@@ -192,7 +205,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             foreach (var child in node.DescendantNodes())
             {
-                if (child.IsSpanKind())
+                if (child is MarkupStartTagSyntax startTag)
+                {
+                    foreach (var tagChild in startTag.Children)
+                    {
+                        if (tagChild.IsSpanKind())
+                        {
+                            yield return tagChild;
+                        }
+                    }
+                }
+                else if (child is MarkupEndTagSyntax endTag)
+                {
+                    foreach (var tagChild in endTag.Children)
+                    {
+                        if (tagChild.IsSpanKind())
+                        {
+                            yield return tagChild;
+                        }
+                    }
+                }
+                else if (child.IsSpanKind())
                 {
                     yield return child;
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
index de1945316e..2a3d016224 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
@@ -16,10 +16,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
 
-            var rewriter = new ClassifiedSpanRewriter();
-            var rewritten = rewriter.Visit(syntaxTree.Root);
             var visitor = new ClassifiedSpanVisitor(syntaxTree.Source);
-            visitor.Visit(rewritten);
+            visitor.Visit(syntaxTree.Root);
 
             return visitor.ClassifiedSpans;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index c46a0b0bab..13a6a89cdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var startTag = (MarkupStartTagSyntax)Visit(node.StartTag);
                 if (startTag != null)
                 {
-                    var tagName = startTag.GetTagName();
+                    var tagName = startTag.GetTagNameWithOptionalBang();
                     if (TryRewriteTagHelperStart(startTag, out tagHelperStart, out tagHelperInfo))
                     {
                         // This is a tag helper.
@@ -218,10 +218,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 tagHelperInfo = null;
 
                 // Get tag name of the current block
-                var tagName = startTag.GetTagName();
+                var tagName = startTag.GetTagNameWithOptionalBang();
 
                 // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
-                if (tagName == null || tagName.StartsWith("!"))
+                if (string.IsNullOrEmpty(tagName) || tagName.StartsWith("!"))
                 {
                     return false;
                 }
@@ -288,7 +288,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 rewritten = null;
                 var tagName = tagBlock.GetTagName();
                 // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
-                if (tagName == null || tagName.StartsWith("!"))
+                if (string.IsNullOrEmpty(tagName) || tagName.StartsWith("!"))
                 {
                     return false;
                 }
@@ -510,22 +510,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return true;
             }
 
-            private bool IsPotentialTagHelperStart(string tagName, MarkupStartTagSyntax childBlock)
+            private bool IsPotentialTagHelperStart(string tagName, MarkupStartTagSyntax startTag)
             {
-                Debug.Assert(childBlock.Children.Count > 0);
-                var child = childBlock.Children[0];
-
                 return !string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) ||
-                       child.Kind != SyntaxKind.MarkupTransition;
+                       !startTag.IsMarkupTransition;
             }
 
-            private bool IsPotentialTagHelperEnd(string tagName, MarkupEndTagSyntax childBlock)
+            private bool IsPotentialTagHelperEnd(string tagName, MarkupEndTagSyntax endTag)
             {
-                Debug.Assert(childBlock.Children.Count > 0);
-                var child = childBlock.Children[0];
-
                 return !string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) ||
-                       child.Kind != SyntaxKind.MarkupTransition;
+                       !endTag.IsMarkupTransition;
             }
 
             private static bool IsPartialStartTag(MarkupStartTagSyntax tagBlock)
@@ -605,7 +599,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             private void ValidateParentAllowsPlainStartTag(MarkupStartTagSyntax tagBlock)
             {
-                var tagName = tagBlock.GetTagName();
+                var tagName = tagBlock.GetTagNameWithOptionalBang();
 
                 // Treat partial tags such as '</' which have no tag names as content.
                 if (string.IsNullOrEmpty(tagName))
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
index 5142975836..6c319e6d08 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -860,87 +860,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
   }
 
-  internal sealed partial class MarkupTagBlockSyntax : RazorBlockSyntax
-  {
-    private readonly GreenNode _children;
-
-    internal MarkupTagBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
-        : base(kind, diagnostics, annotations)
-    {
-        SlotCount = 1;
-        if (children != null)
-        {
-            AdjustFlagsAndWidth(children);
-            _children = children;
-        }
-    }
-
-
-    internal MarkupTagBlockSyntax(SyntaxKind kind, GreenNode children)
-        : base(kind)
-    {
-        SlotCount = 1;
-        if (children != null)
-        {
-            AdjustFlagsAndWidth(children);
-            _children = children;
-        }
-    }
-
-    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
-
-    internal override GreenNode GetSlot(int index)
-    {
-        switch (index)
-        {
-            case 0: return _children;
-            default: return null;
-        }
-    }
-
-    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
-    {
-      return new Syntax.MarkupTagBlockSyntax(this, parent, position);
-    }
-
-    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
-    {
-        return visitor.VisitMarkupTagBlock(this);
-    }
-
-    public override void Accept(SyntaxVisitor visitor)
-    {
-        visitor.VisitMarkupTagBlock(this);
-    }
-
-    public MarkupTagBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
-    {
-        if (children != Children)
-        {
-            var newNode = SyntaxFactory.MarkupTagBlock(children);
-            var diags = GetDiagnostics();
-            if (diags != null && diags.Length > 0)
-               newNode = newNode.WithDiagnosticsGreen(diags);
-            var annotations = GetAnnotations();
-            if (annotations != null && annotations.Length > 0)
-               newNode = newNode.WithAnnotationsGreen(annotations);
-            return newNode;
-        }
-
-        return this;
-    }
-
-    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
-    {
-         return new MarkupTagBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
-    }
-
-    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
-    {
-         return new MarkupTagBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
-    }
-  }
-
   internal sealed partial class MarkupMinimizedAttributeBlockSyntax : MarkupSyntaxNode
   {
     private readonly MarkupTextLiteralSyntax _namePrefix;
@@ -1546,40 +1465,87 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
   }
 
-  internal sealed partial class MarkupStartTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupStartTagSyntax : MarkupSyntaxNode
   {
-    private readonly GreenNode _children;
+    private readonly SyntaxToken _openAngle;
+    private readonly SyntaxToken _bang;
+    private readonly SyntaxToken _name;
+    private readonly GreenNode _attributes;
+    private readonly SyntaxToken _forwardSlash;
+    private readonly SyntaxToken _closeAngle;
 
-    internal MarkupStartTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+    internal MarkupStartTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, GreenNode attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
         : base(kind, diagnostics, annotations)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (attributes != null)
+        {
+            AdjustFlagsAndWidth(attributes);
+            _attributes = attributes;
+        }
+        if (forwardSlash != null)
+        {
+            AdjustFlagsAndWidth(forwardSlash);
+            _forwardSlash = forwardSlash;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
 
-    internal MarkupStartTagSyntax(SyntaxKind kind, GreenNode children)
+    internal MarkupStartTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, GreenNode attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
         : base(kind)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (attributes != null)
+        {
+            AdjustFlagsAndWidth(attributes);
+            _attributes = attributes;
+        }
+        if (forwardSlash != null)
+        {
+            AdjustFlagsAndWidth(forwardSlash);
+            _forwardSlash = forwardSlash;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+    public SyntaxToken OpenAngle { get { return _openAngle; } }
+    public SyntaxToken Bang { get { return _bang; } }
+    public SyntaxToken Name { get { return _name; } }
+    public SyntaxList<RazorSyntaxNode> Attributes { get { return new SyntaxList<RazorSyntaxNode>(_attributes); } }
+    public SyntaxToken ForwardSlash { get { return _forwardSlash; } }
+    public SyntaxToken CloseAngle { get { return _closeAngle; } }
 
     internal override GreenNode GetSlot(int index)
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _bang;
+            case 2: return _name;
+            case 3: return _attributes;
+            case 4: return _forwardSlash;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1599,11 +1565,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
         visitor.VisitMarkupStartTag(this);
     }
 
-    public MarkupStartTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public MarkupStartTagSyntax Update(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || bang != Bang || name != Name || attributes != Attributes || forwardSlash != ForwardSlash || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupStartTag(children);
+            var newNode = SyntaxFactory.MarkupStartTag(openAngle, bang, name, attributes, forwardSlash, closeAngle);
             var diags = GetDiagnostics();
             if (diags != null && diags.Length > 0)
                newNode = newNode.WithDiagnosticsGreen(diags);
@@ -1618,49 +1584,90 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
     {
-         return new MarkupStartTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+         return new MarkupStartTagSyntax(Kind, _openAngle, _bang, _name, _attributes, _forwardSlash, _closeAngle, diagnostics, GetAnnotations());
     }
 
     internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
     {
-         return new MarkupStartTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+         return new MarkupStartTagSyntax(Kind, _openAngle, _bang, _name, _attributes, _forwardSlash, _closeAngle, GetDiagnostics(), annotations);
     }
   }
 
-  internal sealed partial class MarkupEndTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupEndTagSyntax : MarkupSyntaxNode
   {
-    private readonly GreenNode _children;
+    private readonly SyntaxToken _openAngle;
+    private readonly SyntaxToken _forwardSlash;
+    private readonly SyntaxToken _bang;
+    private readonly SyntaxToken _name;
+    private readonly MarkupMiscAttributeContentSyntax _miscAttributeContent;
+    private readonly SyntaxToken _closeAngle;
 
-    internal MarkupEndTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+    internal MarkupEndTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
         : base(kind, diagnostics, annotations)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        AdjustFlagsAndWidth(forwardSlash);
+        _forwardSlash = forwardSlash;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (miscAttributeContent != null)
+        {
+            AdjustFlagsAndWidth(miscAttributeContent);
+            _miscAttributeContent = miscAttributeContent;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
 
-    internal MarkupEndTagSyntax(SyntaxKind kind, GreenNode children)
+    internal MarkupEndTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
         : base(kind)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        AdjustFlagsAndWidth(forwardSlash);
+        _forwardSlash = forwardSlash;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (miscAttributeContent != null)
+        {
+            AdjustFlagsAndWidth(miscAttributeContent);
+            _miscAttributeContent = miscAttributeContent;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+    public SyntaxToken OpenAngle { get { return _openAngle; } }
+    public SyntaxToken ForwardSlash { get { return _forwardSlash; } }
+    public SyntaxToken Bang { get { return _bang; } }
+    public SyntaxToken Name { get { return _name; } }
+    public MarkupMiscAttributeContentSyntax MiscAttributeContent { get { return _miscAttributeContent; } }
+    public SyntaxToken CloseAngle { get { return _closeAngle; } }
 
     internal override GreenNode GetSlot(int index)
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _forwardSlash;
+            case 2: return _bang;
+            case 3: return _name;
+            case 4: return _miscAttributeContent;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1680,11 +1687,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
         visitor.VisitMarkupEndTag(this);
     }
 
-    public MarkupEndTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public MarkupEndTagSyntax Update(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || forwardSlash != ForwardSlash || bang != Bang || name != Name || miscAttributeContent != MiscAttributeContent || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupEndTag(children);
+            var newNode = SyntaxFactory.MarkupEndTag(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
             var diags = GetDiagnostics();
             if (diags != null && diags.Length > 0)
                newNode = newNode.WithDiagnosticsGreen(diags);
@@ -1699,12 +1706,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
     {
-         return new MarkupEndTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+         return new MarkupEndTagSyntax(Kind, _openAngle, _forwardSlash, _bang, _name, _miscAttributeContent, _closeAngle, diagnostics, GetAnnotations());
     }
 
     internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
     {
-         return new MarkupEndTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+         return new MarkupEndTagSyntax(Kind, _openAngle, _forwardSlash, _bang, _name, _miscAttributeContent, _closeAngle, GetDiagnostics(), annotations);
     }
   }
 
@@ -3510,11 +3517,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return DefaultVisit(node);
     }
 
-    public virtual TResult VisitMarkupTagBlock(MarkupTagBlockSyntax node)
-    {
-      return DefaultVisit(node);
-    }
-
     public virtual TResult VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
     {
       return DefaultVisit(node);
@@ -3709,11 +3711,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       DefaultVisit(node);
     }
 
-    public virtual void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
-    {
-      DefaultVisit(node);
-    }
-
     public virtual void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
     {
       DefaultVisit(node);
@@ -3921,12 +3918,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return node.Update(children);
     }
 
-    public override GreenNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
-    {
-      var children = VisitList(node.Children);
-      return node.Update(children);
-    }
-
     public override GreenNode VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
     {
       var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
@@ -3976,14 +3967,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     public override GreenNode VisitMarkupStartTag(MarkupStartTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)Visit(node.OpenAngle);
+      var bang = (SyntaxToken)Visit(node.Bang);
+      var name = (SyntaxToken)Visit(node.Name);
+      var attributes = VisitList(node.Attributes);
+      var forwardSlash = (SyntaxToken)Visit(node.ForwardSlash);
+      var closeAngle = (SyntaxToken)Visit(node.CloseAngle);
+      return node.Update(openAngle, bang, name, attributes, forwardSlash, closeAngle);
     }
 
     public override GreenNode VisitMarkupEndTag(MarkupEndTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)Visit(node.OpenAngle);
+      var forwardSlash = (SyntaxToken)Visit(node.ForwardSlash);
+      var bang = (SyntaxToken)Visit(node.Bang);
+      var name = (SyntaxToken)Visit(node.Name);
+      var miscAttributeContent = (MarkupMiscAttributeContentSyntax)Visit(node.MiscAttributeContent);
+      var closeAngle = (SyntaxToken)Visit(node.CloseAngle);
+      return node.Update(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
     }
 
     public override GreenNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
@@ -4244,13 +4245,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return result;
     }
 
-    public static MarkupTagBlockSyntax MarkupTagBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
-    {
-      var result = new MarkupTagBlockSyntax(SyntaxKind.MarkupTagBlock, children.Node);
-
-      return result;
-    }
-
     public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
     {
       if (name == null)
@@ -4309,18 +4303,112 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return result;
     }
 
-    public static MarkupStartTagSyntax MarkupStartTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public static MarkupStartTagSyntax MarkupStartTag(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-      var result = new MarkupStartTagSyntax(SyntaxKind.MarkupStartTag, children.Node);
+      if (openAngle == null)
+        throw new ArgumentNullException(nameof(openAngle));
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      if (bang != null)
+      {
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      }
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      if (forwardSlash != null)
+      {
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      }
+      if (closeAngle == null)
+        throw new ArgumentNullException(nameof(closeAngle));
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
 
-      return result;
+      return new MarkupStartTagSyntax(SyntaxKind.MarkupStartTag, openAngle, bang, name, attributes.Node, forwardSlash, closeAngle);
     }
 
-    public static MarkupEndTagSyntax MarkupEndTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public static MarkupEndTagSyntax MarkupEndTag(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-      var result = new MarkupEndTagSyntax(SyntaxKind.MarkupEndTag, children.Node);
+      if (openAngle == null)
+        throw new ArgumentNullException(nameof(openAngle));
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      if (forwardSlash == null)
+        throw new ArgumentNullException(nameof(forwardSlash));
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      if (bang != null)
+      {
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      }
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      if (closeAngle == null)
+        throw new ArgumentNullException(nameof(closeAngle));
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
 
-      return result;
+      return new MarkupEndTagSyntax(SyntaxKind.MarkupEndTag, openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
     }
 
     public static MarkupTagHelperElementSyntax MarkupTagHelperElement(MarkupTagHelperStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
@@ -4544,7 +4632,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
            typeof(MarkupTextLiteralSyntax),
            typeof(MarkupEphemeralTextLiteralSyntax),
            typeof(MarkupCommentBlockSyntax),
-           typeof(MarkupTagBlockSyntax),
            typeof(MarkupMinimizedAttributeBlockSyntax),
            typeof(MarkupAttributeBlockSyntax),
            typeof(MarkupMiscAttributeContentSyntax),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
index a5f908438a..c33baf1f06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -71,12 +71,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return DefaultVisit(node);
     }
 
-    /// <summary>Called when the visitor visits a MarkupTagBlockSyntax node.</summary>
-    public virtual TResult VisitMarkupTagBlock(MarkupTagBlockSyntax node)
-    {
-      return DefaultVisit(node);
-    }
-
     /// <summary>Called when the visitor visits a MarkupMinimizedAttributeBlockSyntax node.</summary>
     public virtual TResult VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
     {
@@ -308,12 +302,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       DefaultVisit(node);
     }
 
-    /// <summary>Called when the visitor visits a MarkupTagBlockSyntax node.</summary>
-    public virtual void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
-    {
-      DefaultVisit(node);
-    }
-
     /// <summary>Called when the visitor visits a MarkupMinimizedAttributeBlockSyntax node.</summary>
     public virtual void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
     {
@@ -549,12 +537,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return node.Update(children);
     }
 
-    public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
-    {
-      var children = VisitList(node.Children);
-      return node.Update(children);
-    }
-
     public override SyntaxNode VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
     {
       var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
@@ -604,14 +586,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
     public override SyntaxNode VisitMarkupStartTag(MarkupStartTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)VisitToken(node.OpenAngle);
+      var bang = (SyntaxToken)VisitToken(node.Bang);
+      var name = (SyntaxToken)VisitToken(node.Name);
+      var attributes = VisitList(node.Attributes);
+      var forwardSlash = (SyntaxToken)VisitToken(node.ForwardSlash);
+      var closeAngle = (SyntaxToken)VisitToken(node.CloseAngle);
+      return node.Update(openAngle, bang, name, attributes, forwardSlash, closeAngle);
     }
 
     public override SyntaxNode VisitMarkupEndTag(MarkupEndTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)VisitToken(node.OpenAngle);
+      var forwardSlash = (SyntaxToken)VisitToken(node.ForwardSlash);
+      var bang = (SyntaxToken)VisitToken(node.Bang);
+      var name = (SyntaxToken)VisitToken(node.Name);
+      var miscAttributeContent = (MarkupMiscAttributeContentSyntax)Visit(node.MiscAttributeContent);
+      var closeAngle = (SyntaxToken)VisitToken(node.CloseAngle);
+      return node.Update(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
     }
 
     public override SyntaxNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
@@ -906,18 +898,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return SyntaxFactory.MarkupCommentBlock(default(SyntaxList<RazorSyntaxNode>));
     }
 
-    /// <summary>Creates a new MarkupTagBlockSyntax instance.</summary>
-    public static MarkupTagBlockSyntax MarkupTagBlock(SyntaxList<RazorSyntaxNode> children)
-    {
-      return (MarkupTagBlockSyntax)InternalSyntax.SyntaxFactory.MarkupTagBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
-    }
-
-    /// <summary>Creates a new MarkupTagBlockSyntax instance.</summary>
-    public static MarkupTagBlockSyntax MarkupTagBlock()
-    {
-      return SyntaxFactory.MarkupTagBlock(default(SyntaxList<RazorSyntaxNode>));
-    }
-
     /// <summary>Creates a new MarkupMinimizedAttributeBlockSyntax instance.</summary>
     public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
     {
@@ -1010,27 +990,100 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     }
 
     /// <summary>Creates a new MarkupStartTagSyntax instance.</summary>
-    public static MarkupStartTagSyntax MarkupStartTag(SyntaxList<RazorSyntaxNode> children)
+    public static MarkupStartTagSyntax MarkupStartTag(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-      return (MarkupStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupStartTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
+      return (MarkupStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupStartTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)bang.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, attributes.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), (Syntax.InternalSyntax.SyntaxToken)forwardSlash.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupStartTagSyntax instance.</summary>
-    public static MarkupStartTagSyntax MarkupStartTag()
+    public static MarkupStartTagSyntax MarkupStartTag(SyntaxList<RazorSyntaxNode> attributes = default(SyntaxList<RazorSyntaxNode>))
     {
-      return SyntaxFactory.MarkupStartTag(default(SyntaxList<RazorSyntaxNode>));
+      return SyntaxFactory.MarkupStartTag(SyntaxFactory.Token(SyntaxKind.OpenAngle), default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.Text), attributes, default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.CloseAngle));
     }
 
     /// <summary>Creates a new MarkupEndTagSyntax instance.</summary>
-    public static MarkupEndTagSyntax MarkupEndTag(SyntaxList<RazorSyntaxNode> children)
+    public static MarkupEndTagSyntax MarkupEndTag(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-      return (MarkupEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupEndTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
+      return (MarkupEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupEndTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)forwardSlash.Green, (Syntax.InternalSyntax.SyntaxToken)bang.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, miscAttributeContent == null ? null : (InternalSyntax.MarkupMiscAttributeContentSyntax)miscAttributeContent.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupEndTagSyntax instance.</summary>
-    public static MarkupEndTagSyntax MarkupEndTag()
+    public static MarkupEndTagSyntax MarkupEndTag(MarkupMiscAttributeContentSyntax miscAttributeContent = default(MarkupMiscAttributeContentSyntax))
     {
-      return SyntaxFactory.MarkupEndTag(default(SyntaxList<RazorSyntaxNode>));
+      return SyntaxFactory.MarkupEndTag(SyntaxFactory.Token(SyntaxKind.OpenAngle), SyntaxFactory.Token(SyntaxKind.ForwardSlash), default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.Text), miscAttributeContent, SyntaxFactory.Token(SyntaxKind.CloseAngle));
     }
 
     /// <summary>Creates a new MarkupTagHelperElementSyntax instance.</summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
index 92ba8867d0..42cf2587aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -782,77 +782,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     }
   }
 
-  internal sealed partial class MarkupTagBlockSyntax : RazorBlockSyntax
-  {
-    private SyntaxNode _children;
-
-    internal MarkupTagBlockSyntax(GreenNode green, SyntaxNode parent, int position)
-        : base(green, parent, position)
-    {
-    }
-
-    public override SyntaxList<RazorSyntaxNode> Children 
-    {
-        get
-        {
-            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
-        }
-    }
-
-    internal override SyntaxNode GetNodeSlot(int index)
-    {
-        switch (index)
-        {
-            case 0: return GetRedAtZero(ref _children);
-            default: return null;
-        }
-    }
-    internal override SyntaxNode GetCachedSlot(int index)
-    {
-        switch (index)
-        {
-            case 0: return _children;
-            default: return null;
-        }
-    }
-
-    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
-    {
-        return visitor.VisitMarkupTagBlock(this);
-    }
-
-    public override void Accept(SyntaxVisitor visitor)
-    {
-        visitor.VisitMarkupTagBlock(this);
-    }
-
-    public MarkupTagBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
-    {
-        if (children != Children)
-        {
-            var newNode = SyntaxFactory.MarkupTagBlock(children);
-            var annotations = GetAnnotations();
-            if (annotations != null && annotations.Length > 0)
-               return newNode.WithAnnotations(annotations);
-            return newNode;
-        }
-
-        return this;
-    }
-
-    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
-    public new MarkupTagBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
-    {
-        return Update(children);
-    }
-    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
-
-    public new MarkupTagBlockSyntax AddChildren(params RazorSyntaxNode[] items)
-    {
-        return WithChildren(this.Children.AddRange(items));
-    }
-  }
-
   internal sealed partial class MarkupMinimizedAttributeBlockSyntax : MarkupSyntaxNode
   {
     private MarkupTextLiteralSyntax _namePrefix;
@@ -1475,38 +1404,77 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return Update(StartTag, Body, endTag);
     }
 
-    public MarkupElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
+    public MarkupElementSyntax AddStartTagAttributes(params RazorSyntaxNode[] items)
     {
         var _startTag = this.StartTag ?? SyntaxFactory.MarkupStartTag();
-        return this.WithStartTag(_startTag.WithChildren(_startTag.Children.AddRange(items)));
+        return this.WithStartTag(_startTag.WithAttributes(_startTag.Attributes.AddRange(items)));
     }
 
     public MarkupElementSyntax AddBody(params RazorSyntaxNode[] items)
     {
         return WithBody(this.Body.AddRange(items));
     }
-
-    public MarkupElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
-    {
-        var _endTag = this.EndTag ?? SyntaxFactory.MarkupEndTag();
-        return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
-    }
   }
 
-  internal sealed partial class MarkupStartTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupStartTagSyntax : MarkupSyntaxNode
   {
-    private SyntaxNode _children;
+    private SyntaxToken _openAngle;
+    private SyntaxToken _bang;
+    private SyntaxToken _name;
+    private SyntaxNode _attributes;
+    private SyntaxToken _forwardSlash;
+    private SyntaxToken _closeAngle;
 
     internal MarkupStartTagSyntax(GreenNode green, SyntaxNode parent, int position)
         : base(green, parent, position)
     {
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children 
+    public SyntaxToken OpenAngle 
     {
         get
         {
-            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+            return GetRedAtZero(ref _openAngle);
+        }
+    }
+
+    public SyntaxToken Bang 
+    {
+        get
+        {
+            return GetRed(ref _bang, 1);
+        }
+    }
+
+    public SyntaxToken Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 2);
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Attributes 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _attributes, 3));
+        }
+    }
+
+    public SyntaxToken ForwardSlash 
+    {
+        get
+        {
+            return GetRed(ref _forwardSlash, 4);
+        }
+    }
+
+    public SyntaxToken CloseAngle 
+    {
+        get
+        {
+            return GetRed(ref _closeAngle, 5);
         }
     }
 
@@ -1514,7 +1482,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return GetRedAtZero(ref _children);
+            case 0: return GetRedAtZero(ref _openAngle);
+            case 1: return GetRed(ref _bang, 1);
+            case 2: return GetRed(ref _name, 2);
+            case 3: return GetRed(ref _attributes, 3);
+            case 4: return GetRed(ref _forwardSlash, 4);
+            case 5: return GetRed(ref _closeAngle, 5);
             default: return null;
         }
     }
@@ -1522,7 +1495,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _bang;
+            case 2: return _name;
+            case 3: return _attributes;
+            case 4: return _forwardSlash;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1537,11 +1515,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         visitor.VisitMarkupStartTag(this);
     }
 
-    public MarkupStartTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    public MarkupStartTagSyntax Update(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || bang != Bang || name != Name || attributes != Attributes || forwardSlash != ForwardSlash || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupStartTag(children);
+            var newNode = SyntaxFactory.MarkupStartTag(openAngle, bang, name, attributes, forwardSlash, closeAngle);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1551,33 +1529,101 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return this;
     }
 
-    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
-    public new MarkupStartTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    public MarkupStartTagSyntax WithOpenAngle(SyntaxToken openAngle)
     {
-        return Update(children);
+        return Update(openAngle, Bang, Name, Attributes, ForwardSlash, CloseAngle);
     }
-    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
 
-    public new MarkupStartTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    public MarkupStartTagSyntax WithBang(SyntaxToken bang)
     {
-        return WithChildren(this.Children.AddRange(items));
+        return Update(OpenAngle, bang, Name, Attributes, ForwardSlash, CloseAngle);
+    }
+
+    public MarkupStartTagSyntax WithName(SyntaxToken name)
+    {
+        return Update(OpenAngle, Bang, name, Attributes, ForwardSlash, CloseAngle);
+    }
+
+    public MarkupStartTagSyntax WithAttributes(SyntaxList<RazorSyntaxNode> attributes)
+    {
+        return Update(OpenAngle, Bang, Name, attributes, ForwardSlash, CloseAngle);
+    }
+
+    public MarkupStartTagSyntax WithForwardSlash(SyntaxToken forwardSlash)
+    {
+        return Update(OpenAngle, Bang, Name, Attributes, forwardSlash, CloseAngle);
+    }
+
+    public MarkupStartTagSyntax WithCloseAngle(SyntaxToken closeAngle)
+    {
+        return Update(OpenAngle, Bang, Name, Attributes, ForwardSlash, closeAngle);
+    }
+
+    public MarkupStartTagSyntax AddAttributes(params RazorSyntaxNode[] items)
+    {
+        return WithAttributes(this.Attributes.AddRange(items));
     }
   }
 
-  internal sealed partial class MarkupEndTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupEndTagSyntax : MarkupSyntaxNode
   {
-    private SyntaxNode _children;
+    private SyntaxToken _openAngle;
+    private SyntaxToken _forwardSlash;
+    private SyntaxToken _bang;
+    private SyntaxToken _name;
+    private MarkupMiscAttributeContentSyntax _miscAttributeContent;
+    private SyntaxToken _closeAngle;
 
     internal MarkupEndTagSyntax(GreenNode green, SyntaxNode parent, int position)
         : base(green, parent, position)
     {
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children 
+    public SyntaxToken OpenAngle 
     {
         get
         {
-            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+            return GetRedAtZero(ref _openAngle);
+        }
+    }
+
+    public SyntaxToken ForwardSlash 
+    {
+        get
+        {
+            return GetRed(ref _forwardSlash, 1);
+        }
+    }
+
+    public SyntaxToken Bang 
+    {
+        get
+        {
+            return GetRed(ref _bang, 2);
+        }
+    }
+
+    public SyntaxToken Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 3);
+        }
+    }
+
+    public MarkupMiscAttributeContentSyntax MiscAttributeContent 
+    {
+        get
+        {
+            return GetRed(ref _miscAttributeContent, 4);
+        }
+    }
+
+    public SyntaxToken CloseAngle 
+    {
+        get
+        {
+            return GetRed(ref _closeAngle, 5);
         }
     }
 
@@ -1585,7 +1631,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return GetRedAtZero(ref _children);
+            case 0: return GetRedAtZero(ref _openAngle);
+            case 1: return GetRed(ref _forwardSlash, 1);
+            case 2: return GetRed(ref _bang, 2);
+            case 3: return GetRed(ref _name, 3);
+            case 4: return GetRed(ref _miscAttributeContent, 4);
+            case 5: return GetRed(ref _closeAngle, 5);
             default: return null;
         }
     }
@@ -1593,7 +1644,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _forwardSlash;
+            case 2: return _bang;
+            case 3: return _name;
+            case 4: return _miscAttributeContent;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1608,11 +1664,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         visitor.VisitMarkupEndTag(this);
     }
 
-    public MarkupEndTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    public MarkupEndTagSyntax Update(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || forwardSlash != ForwardSlash || bang != Bang || name != Name || miscAttributeContent != MiscAttributeContent || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupEndTag(children);
+            var newNode = SyntaxFactory.MarkupEndTag(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1622,16 +1678,40 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return this;
     }
 
-    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
-    public new MarkupEndTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    public MarkupEndTagSyntax WithOpenAngle(SyntaxToken openAngle)
     {
-        return Update(children);
+        return Update(openAngle, ForwardSlash, Bang, Name, MiscAttributeContent, CloseAngle);
     }
-    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
 
-    public new MarkupEndTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    public MarkupEndTagSyntax WithForwardSlash(SyntaxToken forwardSlash)
     {
-        return WithChildren(this.Children.AddRange(items));
+        return Update(OpenAngle, forwardSlash, Bang, Name, MiscAttributeContent, CloseAngle);
+    }
+
+    public MarkupEndTagSyntax WithBang(SyntaxToken bang)
+    {
+        return Update(OpenAngle, ForwardSlash, bang, Name, MiscAttributeContent, CloseAngle);
+    }
+
+    public MarkupEndTagSyntax WithName(SyntaxToken name)
+    {
+        return Update(OpenAngle, ForwardSlash, Bang, name, MiscAttributeContent, CloseAngle);
+    }
+
+    public MarkupEndTagSyntax WithMiscAttributeContent(MarkupMiscAttributeContentSyntax miscAttributeContent)
+    {
+        return Update(OpenAngle, ForwardSlash, Bang, Name, miscAttributeContent, CloseAngle);
+    }
+
+    public MarkupEndTagSyntax WithCloseAngle(SyntaxToken closeAngle)
+    {
+        return Update(OpenAngle, ForwardSlash, Bang, Name, MiscAttributeContent, closeAngle);
+    }
+
+    public MarkupEndTagSyntax AddMiscAttributeContentChildren(params RazorSyntaxNode[] items)
+    {
+        var _miscAttributeContent = this.MiscAttributeContent ?? SyntaxFactory.MarkupMiscAttributeContent();
+        return this.WithMiscAttributeContent(_miscAttributeContent.WithChildren(_miscAttributeContent.Children.AddRange(items)));
     }
   }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupEndTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupEndTagSyntax.cs
new file mode 100644
index 0000000000..2f0277287a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupEndTagSyntax.cs
@@ -0,0 +1,34 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal sealed partial class MarkupEndTagSyntax
+    {
+        private static readonly string MarkupTransitionKey = "MarkupTransition";
+
+        public bool IsMarkupTransition
+        {
+            get
+            {
+                var annotation = GetAnnotations().FirstOrDefault(n => n.Kind == MarkupTransitionKey);
+                return annotation != null;
+            }
+        }
+
+        public MarkupEndTagSyntax AsMarkupTransition()
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(MarkupTransitionKey, new object())
+            };
+
+            var newGreen = this.WithAnnotationsGreen(annotations.ToArray());
+
+            return newGreen;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupStartTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupStartTagSyntax.cs
new file mode 100644
index 0000000000..47565e6e93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/MarkupStartTagSyntax.cs
@@ -0,0 +1,34 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal sealed partial class MarkupStartTagSyntax
+    {
+        private static readonly string MarkupTransitionKey = "MarkupTransition";
+
+        public bool IsMarkupTransition
+        {
+            get
+            {
+                var annotation = GetAnnotations().FirstOrDefault(n => n.Kind == MarkupTransitionKey);
+                return annotation != null;
+            }
+        }
+
+        public MarkupStartTagSyntax AsMarkupTransition()
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(MarkupTransitionKey, new object())
+            };
+
+            var newGreen = this.WithAnnotationsGreen(annotations.ToArray());
+
+            return newGreen;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs
new file mode 100644
index 0000000000..2f2a529f55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs
@@ -0,0 +1,72 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal partial class MarkupEndTagSyntax
+    {
+        public bool IsMarkupTransition
+        {
+            get
+            {
+                return ((InternalSyntax.MarkupEndTagSyntax)Green).IsMarkupTransition;
+            }
+        }
+
+        public SyntaxList<RazorSyntaxNode> Children => GetLegacyChildren();
+
+        public string GetTagName()
+        {
+            return Name.IsMissing ? string.Empty : Bang?.Content + Name.Content;
+        }
+
+        private SyntaxList<RazorSyntaxNode> GetLegacyChildren()
+        {
+            // This method returns the children of this end tag in legacy format.
+            // This is needed to generate the same classified spans as the legacy syntax tree.
+            var builder = new SyntaxListBuilder(3);
+            var tokens = SyntaxListBuilder<SyntaxToken>.Create();
+            var context = this.GetSpanContext();
+            if (!OpenAngle.IsMissing)
+            {
+                tokens.Add(OpenAngle);
+            }
+            if (!ForwardSlash.IsMissing)
+            {
+                tokens.Add(ForwardSlash);
+            }
+            if (Bang != null)
+            {
+                // The prefix of an end tag(E.g '|</|!foo>') will have 'Any' accepted characters if a bang exists.
+                var acceptsAnyContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+                acceptsAnyContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(acceptsAnyContext));
+                
+                tokens.Add(Bang);
+                var acceptsNoneContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+                acceptsNoneContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                builder.Add(SyntaxFactory.RazorMetaCode(tokens.Consume()).WithSpanContext(acceptsNoneContext));
+            }
+            if (!Name.IsMissing)
+            {
+                tokens.Add(Name);
+            }
+            if (MiscAttributeContent?.Children != null && MiscAttributeContent.Children.Count > 0)
+            {
+                foreach (var content in MiscAttributeContent.Children)
+                {
+                    tokens.AddRange(((MarkupTextLiteralSyntax)content).LiteralTokens);
+                }
+            }
+            if (!CloseAngle.IsMissing)
+            {
+                tokens.Add(CloseAngle);
+            }
+            builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(context));
+
+            return new SyntaxList<RazorSyntaxNode>(builder.ToListNode().CreateRed(this, Position));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupStartTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupStartTagSyntax.cs
new file mode 100644
index 0000000000..dc5d10c39f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupStartTagSyntax.cs
@@ -0,0 +1,98 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal partial class MarkupStartTagSyntax
+    {
+        public bool IsMarkupTransition
+        {
+            get
+            {
+                return ((InternalSyntax.MarkupStartTagSyntax)Green).IsMarkupTransition;
+            }
+        }
+
+        public SyntaxList<RazorSyntaxNode> Children => GetLegacyChildren();
+
+        public string GetTagNameWithOptionalBang()
+        {
+            return Name.IsMissing ? string.Empty : Bang?.Content + Name.Content;
+        }
+
+        public bool IsSelfClosing()
+        {
+            return ForwardSlash != null &&
+                !ForwardSlash.IsMissing &&
+                !CloseAngle.IsMissing;
+        }
+
+        public bool IsVoidElement()
+        {
+            return ParserHelpers.VoidElements.Contains(Name.Content);
+        }
+
+        private SyntaxList<RazorSyntaxNode> GetLegacyChildren()
+        {
+            // This method returns the children of this start tag in legacy format.
+            // This is needed to generate the same classified spans as the legacy syntax tree.
+            var builder = new SyntaxListBuilder(5);
+            var tokens = SyntaxListBuilder<SyntaxToken>.Create();
+            var context = this.GetSpanContext();
+
+            // We want to know if this tag contains non-whitespace attribute content to set the appropriate AcceptedCharacters.
+            // The prefix of a start tag(E.g '|<foo| attr>') will have 'Any' accepted characters if non-whitespace attribute content exists.
+            var acceptsAnyContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+            acceptsAnyContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            var containsAttributesContent = false;
+            foreach (var attribute in Attributes)
+            {
+                if (!string.IsNullOrWhiteSpace(attribute.GetContent()))
+                {
+                    containsAttributesContent = true;
+                    break;
+                }
+            }
+
+            if (!OpenAngle.IsMissing)
+            {
+                tokens.Add(OpenAngle);
+            }
+            if (Bang != null)
+            {
+                builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(acceptsAnyContext));
+                
+                tokens.Add(Bang);
+                var acceptsNoneContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+                acceptsNoneContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                builder.Add(SyntaxFactory.RazorMetaCode(tokens.Consume()).WithSpanContext(acceptsNoneContext));
+            }
+            if (!Name.IsMissing)
+            {
+                tokens.Add(Name);
+            }
+
+            builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(containsAttributesContent ? acceptsAnyContext : context));
+
+            builder.AddRange(Attributes);
+
+            if (ForwardSlash != null)
+            {
+                tokens.Add(ForwardSlash);
+            }
+            if (!CloseAngle.IsMissing)
+            {
+                tokens.Add(CloseAngle);
+            }
+
+            if (tokens.Count > 0)
+            {
+                builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(context));
+            }
+
+            return new SyntaxList<RazorSyntaxNode>(builder.ToListNode().CreateRed(this, Position));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
index 5aa4852271..89cc6623e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
@@ -65,10 +65,6 @@
     <Kind Name="MarkupCommentBlock" />
     <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
   </Node>
-  <Node Name="MarkupTagBlockSyntax" Base="RazorBlockSyntax">
-    <Kind Name="MarkupTagBlock" />
-    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
-  </Node>
   <Node Name="MarkupMinimizedAttributeBlockSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupMinimizedAttributeBlock" />
     <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
@@ -106,13 +102,43 @@
     <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
     <Field Name="EndTag" Type="MarkupEndTagSyntax" Optional="true" />
   </Node>
-  <Node Name="MarkupStartTagSyntax" Base="RazorBlockSyntax">
+  <Node Name="MarkupStartTagSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupStartTag" />
-    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+    <Field Name="OpenAngle" Type="SyntaxToken">
+      <Kind Name="OpenAngle" />
+    </Field>
+    <Field Name="Bang" Type="SyntaxToken" Optional="true">
+      <Kind Name="Bang" />
+    </Field>
+    <Field Name="Name" Type="SyntaxToken">
+      <Kind Name="Text" />
+    </Field>
+    <Field Name="Attributes" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
+    <Field Name="ForwardSlash" Type="SyntaxToken" Optional="true">
+      <Kind Name="ForwardSlash" />
+    </Field>
+    <Field Name="CloseAngle" Type="SyntaxToken">
+      <Kind Name="CloseAngle" />
+    </Field>
   </Node>
-  <Node Name="MarkupEndTagSyntax" Base="RazorBlockSyntax">
+  <Node Name="MarkupEndTagSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupEndTag" />
-    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+    <Field Name="OpenAngle" Type="SyntaxToken">
+      <Kind Name="OpenAngle" />
+    </Field>
+    <Field Name="ForwardSlash" Type="SyntaxToken">
+      <Kind Name="ForwardSlash" />
+    </Field>
+    <Field Name="Bang" Type="SyntaxToken" Optional="true">
+      <Kind Name="Bang" />
+    </Field>
+    <Field Name="Name" Type="SyntaxToken">
+      <Kind Name="Text" />
+    </Field>
+    <Field Name="MiscAttributeContent" Type="MarkupMiscAttributeContentSyntax" Optional="true" />
+    <Field Name="CloseAngle" Type="SyntaxToken">
+      <Kind Name="CloseAngle" />
+    </Field>
   </Node>
   <Node Name="MarkupTagHelperElementSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupTagHelperElement" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs
index 8fcd9f2b3a..1c9e4435a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxListBuilderOfT.cs
@@ -75,6 +75,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             return _builder.ToList();
         }
 
+        public SyntaxList<TNode> Consume()
+        {
+            var list = ToList();
+            Clear();
+            return list;
+        }
+
         public static implicit operator SyntaxListBuilder(SyntaxListBuilder<TNode> builder)
         {
             return builder._builder;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index b696e221da..1b916ea75e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -220,109 +220,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             var content = string.Concat(tokens.Select(t => t.Content));
             return content;
         }
-
-        public static string GetTagName(this MarkupTagBlockSyntax tagBlock)
-        {
-            return GetTagNameCore(tagBlock);
-        }
-
-        public static string GetTagName(this MarkupStartTagSyntax startTag)
-        {
-            return GetTagNameCore(startTag);
-        }
-
-        public static string GetTagName(this MarkupEndTagSyntax endTag)
-        {
-            return GetTagNameCore(endTag);
-        }
-
-        private static string GetTagNameCore(RazorBlockSyntax tagBlock)
-        {
-            if (tagBlock == null)
-            {
-                throw new ArgumentNullException(nameof(tagBlock));
-            }
-
-            MarkupTextLiteralSyntax nameLiteral = null;
-            var isBangTag = false;
-            if (tagBlock.Children.Count > 0 && tagBlock.Children[0] is MarkupTextLiteralSyntax firstChild)
-            {
-                if (firstChild.GetContent().StartsWith("<") &&
-                    tagBlock.Children.Count >= 3 &&
-                    tagBlock.Children[1] is RazorMetaCodeSyntax &&
-                    tagBlock.Children[2] is MarkupTextLiteralSyntax potentialBangTagName)
-                {
-                    isBangTag = true;
-                    nameLiteral = potentialBangTagName;
-                }
-                else
-                {
-                    nameLiteral = firstChild;
-                }
-            }
-
-            if (nameLiteral == null)
-            {
-                return null;
-            }
-
-            SyntaxToken textToken = null;
-            for (var i = 0; i < nameLiteral.LiteralTokens.Count; i++)
-            {
-                var token = nameLiteral.LiteralTokens[i];
-
-                if (token != null &&
-                    (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
-                {
-                    textToken = token;
-                    break;
-                }
-            }
-
-            if (textToken == null)
-            {
-                return null;
-            }
-
-            var name = textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
-            if (name != null && isBangTag)
-            {
-                name = "!" + name;
-            }
-
-            return name;
-        }
-
-        public static bool IsSelfClosing(this MarkupTagBlockSyntax tagBlock)
-        {
-            return IsSelfClosingCore(tagBlock);
-        }
-
-        public static bool IsSelfClosing(this MarkupStartTagSyntax startTag)
-        {
-            return IsSelfClosingCore(startTag);
-        }
-
-        private static bool IsSelfClosingCore(RazorBlockSyntax tagBlock)
-        {
-            if (tagBlock == null)
-            {
-                throw new ArgumentNullException(nameof(tagBlock));
-            }
-
-            var lastChild = tagBlock.ChildNodes().LastOrDefault();
-
-            return lastChild?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false;
-        }
-
-        public static bool IsVoidElement(this MarkupStartTagSyntax startTag)
-        {
-            if (startTag == null)
-            {
-                throw new ArgumentNullException(nameof(startTag));
-            }
-
-            return ParserHelpers.VoidElements.Contains(startTag.GetTagName());
-        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
index a811d79aa2..77052dcd18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
@@ -151,6 +151,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 {
                     WriteTagHelperAttributeInfo(minimizedTagHelperAttribute.TagHelperAttributeInfo);
                 }
+                else if (node is MarkupStartTagSyntax startTag)
+                {
+                    if (startTag.IsMarkupTransition)
+                    {
+                        WriteSeparator();
+                        Write("MarkupTransition");
+                    }
+                }
+                else if (node is MarkupEndTagSyntax endTag)
+                {
+                    if (endTag.IsMarkupTransition)
+                    {
+                        WriteSeparator();
+                        Write("MarkupTransition");
+                    }
+                }
 
                 if (ShouldDisplayNodeContent(node))
                 {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
index 0974b6a7b9..33fef39d49 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
@@ -67,6 +67,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             {
                 WriteTagHelperAttributeInfo(minimizedTagHelperAttribute.TagHelperAttributeInfo);
             }
+            else if (node is MarkupStartTagSyntax startTag)
+            {
+                if (startTag.IsMarkupTransition)
+                {
+                    WriteSeparator();
+                    Write("MarkupTransition");
+                }
+            }
+            else if (node is MarkupEndTagSyntax endTag)
+            {
+                if (endTag.IsMarkupTransition)
+                {
+                    WriteSeparator();
+                    Write("MarkupTransition");
+                }
+            }
 
             if (ShouldDisplayNodeContent(node))
             {

From 14abd88648b87fa53912e209b0205578bc00911e Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 2 Jan 2019 15:02:23 -0800
Subject: [PATCH 033/337] Clean up usage of FileKinds \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/b45125a75550889b1c10323edd0a72de9722e6a1

---
 .../src/MvcImportProjectFeature.cs            |  2 +-
 .../src/MvcImportProjectFeature.cs            |  2 +-
 .../src/MvcImportProjectFeature.cs            |  2 +-
 .../ComponentDocumentClassifierPass.cs        |  2 +-
 .../ComponentImportProjectFeature.cs          |  2 +-
 ...faultRazorIntermediateNodeLoweringPhase.cs |  2 +-
 .../src/FileKinds.cs                          | 26 +++++++++++++++++++
 .../src/RazorProjectItem.cs                   | 16 +-----------
 8 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
index e117a5298c..fa8a40fedb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcImportProjectFeature.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             }
 
             // Don't add MVC imports for a component - this shouldn't happen for v1, but just in case.
-            if (string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            if (FileKinds.IsComponent(projectItem.FileKind))
             {
                 return Array.Empty<RazorProjectItem>();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
index d7844d9eee..b5a5851922 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/MvcImportProjectFeature.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             }
 
             // Don't add MVC imports for a component - this shouldn't happen for v2, but just in case.
-            if (string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            if (FileKinds.IsComponent(projectItem.FileKind))
             {
                 return Array.Empty<RazorProjectItem>();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
index 5a56cd19d0..b85402ef79 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcImportProjectFeature.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             }
 
             // Don't add MVC imports for a component
-            if (string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            if (FileKinds.IsComponent(projectItem.FileKind))
             {
                 return Array.Empty<RazorProjectItem>();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 08b9dc7b03..09197b56b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
-            return string.Equals(codeDocument.GetFileKind(), FileKinds.Component);
+            return FileKinds.IsComponent(codeDocument.GetFileKind());
         }
 
         protected override CodeTarget CreateTarget(RazorCodeDocument codeDocument, RazorCodeGenerationOptions options)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
index dea07160f1..701c484dae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             // Don't add Component imports for a non-component.
-            if (!string.Equals(projectItem.FileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase))
+            if (!FileKinds.IsComponent(projectItem.FileKind))
             {
                 return Array.Empty<RazorProjectItem>();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index c92f08c1b4..b92fea9890 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             // We need to decide up front if this document is a "component" file. This will affect how
             // lowering behaves.
             LoweringVisitor visitor;
-            if (string.Equals(FileKinds.Component, codeDocument.GetFileKind(), StringComparison.OrdinalIgnoreCase) &&
+            if (FileKinds.IsComponent(codeDocument.GetFileKind()) &&
                 syntaxTree.Options.FeatureFlags.AllowComponentFileKind)
             {
                 visitor = new ComponentFileKindVisitor(document, builder, syntaxTree.Options.FeatureFlags)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
index 030bcf6b6b..93a5a21c03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
@@ -1,6 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.IO;
+
 namespace Microsoft.AspNetCore.Razor.Language
 {
     public static class FileKinds
@@ -8,5 +11,28 @@ namespace Microsoft.AspNetCore.Razor.Language
         public static readonly string Component = "component";
 
         public static readonly string Legacy = "mvc";
+
+        public static bool IsComponent(string fileKind)
+        {
+            // fileKind might be null.
+            return string.Equals(fileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static string GetFileKindFromFilePath(string filePath)
+        {
+            if (filePath == null)
+            {
+                throw new ArgumentNullException(nameof(filePath));
+            }
+
+            if (string.Equals(".razor", Path.GetExtension(filePath), StringComparison.OrdinalIgnoreCase))
+            {
+                return FileKinds.Component;
+            }
+            else
+            {
+                return FileKinds.Legacy;
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
index cdc50b8948..5ee33824d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs
@@ -1,11 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Diagnostics;
 using System.IO;
-using Microsoft.AspNetCore.Razor.Language.Components;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -45,18 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             get
             {
-                if (FilePath == null)
-                {
-                    return null;
-                }
-                else if (string.Equals(".razor", Path.GetExtension(FilePath), StringComparison.OrdinalIgnoreCase))
-                {
-                    return FileKinds.Component;
-                }
-                else
-                {
-                    return FileKinds.Legacy;
-                }
+                return FilePath == null ? null : FileKinds.GetFileKindFromFilePath(FilePath);
             }
         }
 

From 19bc651858d49c3eb80af41f8f39c2b1b7aaa16f Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 2 Jan 2019 16:22:43 -0800
Subject: [PATCH 034/337] Add design-time MSBuild support for components
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/f6f6e164672c0488115423f2db3d7ce1c1c92a1b

---
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets |  8 ++++-
 .../Rules/RazorComponentWithTargetPath.xaml   | 30 +++++++++++++++++++
 .../Sdk.Razor.CurrentVersion.props            |  5 ----
 .../DesignTimeBuildIntegrationTest.cs         | 24 +++++++++++++++
 .../RazorTest.Introspection.targets           |  4 +++
 5 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index cfb0e4e046..bd66729778 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -52,9 +52,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorGenerateWithTargetPath.xaml">
       <Context>Project</Context>
     </PropertyPageSchema>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorComponentWithTargetPath.xaml">
+      <Context>Project</Context>
+    </PropertyPageSchema>
   </ItemGroup>
 
-  <Target Name="RazorGenerateDesignTime" DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" Returns="@(RazorGenerateWithTargetPath)">
+  <Target 
+    Name="RazorGenerateDesignTime" 
+    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
+    Returns="@(RazorGenerateWithTargetPath);@(RazorComponentWithTargetPath)">
   </Target>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
new file mode 100644
index 0000000000..14a479afe3
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule
+  Description="Razor Document Properties"
+  DisplayName="Razor Document Properties"
+  Name="RazorGenerateWithTargetPath"
+  PageTemplate="generic"
+  xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <Rule.DataSource>
+    <DataSource
+      Persistence="ProjectFile"
+      ItemType="RazorComponentWithTargetPath"
+      MSBuildTarget="RazorGenerateDesignTime"
+      HasConfigurationCondition="False"
+      SourceOfDefaultValue="AfterContext"
+      SourceType="TargetResults" />
+  </Rule.DataSource>
+
+  <Rule.Categories>
+    <Category
+      Name="General"
+      DisplayName="General" />
+  </Rule.Categories>
+  
+  <StringProperty
+    Category="General"
+    Name="TargetPath"
+    ReadOnly="True"
+    Visible="False" />
+
+</Rule>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 673a61d3da..71100e6541 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -68,11 +68,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <RazorGenerateOutputFileExtension>.g.cs</RazorGenerateOutputFileExtension>
 
-    <!--
-    Configures the file extension used for the generated C# definition files.
-    -->
-    <RazorGenerateOutputDefinitionFileExtension>.g.i.cs</RazorGenerateOutputDefinitionFileExtension>
-
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index 6514e73057..7d5f88d9fb 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -64,5 +64,29 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     $@"RazorGenerateWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, filePath + ".g.cs")}");
             }
         }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task RazorGenerateDesignTime_ReturnsRazorComponentWithTargetPath()
+        {
+            TargetFramework = "netstandard2.0";
+
+            var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorComponentWithTargetPath");
+
+            Assert.BuildPassed(result);
+
+            var filePaths = new string[]
+            {
+                Path.Combine("MyComponent.cshtml"),
+                Path.Combine("GenericComponent.razor"),
+            };
+
+            foreach (var filePath in filePaths)
+            {
+                Assert.BuildOutputContainsLine(
+                    result,
+                    $@"RazorComponentWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, filePath + ".g.cs")} {Path.Combine(RazorComponentIntermediateOutputPath, filePath + ".g.cs")}");
+            }
+        }
     }
 }
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index f0e8f860ab..b3e93737f3 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -3,6 +3,10 @@
     <Message Text="RazorGenerateWithTargetPath: %(RazorGenerateWithTargetPath.Identity) %(RazorGenerateWithTargetPath.TargetPath) %(RazorGenerateWithTargetPath.GeneratedOutput)" Importance="High" />
   </Target>
 
+  <Target Name="_IntrospectRazorComponentWithTargetPath">
+    <Message Text="RazorComponentWithTargetPath: %(RazorComponentWithTargetPath.Identity) %(RazorComponentWithTargetPath.TargetPath) %(RazorComponentWithTargetPath.GeneratedOutput) %(RazorComponentWithTargetPath.GeneratedDeclaration)" Importance="High" />
+  </Target>
+
   <Target Name="_IntrospectRazorEmbeddedResources">
     <Message Text="CompileResource: %(_RazorCoreCompileResourceInputs.Identity) %(_RazorCoreCompileResourceInputs.LogicalName)" Importance="High" />
   </Target>

From 07a62871d0565d413fcd783d8538b65775e483ad Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 3 Jan 2019 15:58:48 -0800
Subject: [PATCH 035/337] Make whitespace in extensible directives be
 SpanKind.None (dotnet/aspnetcore-tooling#90)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9035677e462dbb3ff766c00e870305f74fde8dfd
---
 .../src/Legacy/CSharpCodeParser.cs                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index 44612ee18c..e63c1dbe90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1356,7 +1356,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         case DirectiveKind.RazorBlock:
                             AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
                             SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
-                            directiveBuilder.Add(OutputAsMarkupLiteral());
+                            directiveBuilder.Add(OutputTokensAsUnclassifiedLiteral());
 
                             ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
                             {
@@ -1380,7 +1380,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         case DirectiveKind.CodeBlock:
                             AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
                             SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
-                            directiveBuilder.Add(OutputAsMarkupLiteral());
+                            directiveBuilder.Add(OutputTokensAsUnclassifiedLiteral());
 
                             ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
                             {

From 49dfd7daccc119e292f0f5bff02f3d2e2f1e8889 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 4 Jan 2019 10:36:41 -0800
Subject: [PATCH 036/337] Add a test using 2.2 project with current Sdk
 (dotnet/aspnetcore-tooling#91)

* Add a test using 2.2 project with current Sdk

Fixes https://github.com/aspnet/AspNetCore/issues/5101

* Do not reference Microsoft.AspNetCore.App in test apps
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9b4fd448d43d66dc3f47edb0740bc27cfbc7b9a9
---
 .../IntegrationTests/BuildIntegrationTest.cs  |  16 ---
 .../BuildIntegrationTest21.cs                 |  32 ++++++
 .../BuildIntegrationTest22.cs                 |  32 ++++++
 .../BuildServerTestFixture.cs                 |  51 ++-------
 .../BuildServerTestFixtureBase.cs             |  66 +++++++++++
 .../LegacyBuildServerTestFixture.cs           |  18 +++
 .../MSBuildIntegrationTestBase.cs             |   4 +-
 .../AppWithP2PReference.csproj                |   2 +
 .../LargeProject/LargeProject.csproj          |   5 +
 .../MvcWithComponents.csproj                  |   5 +
 .../testassets/SimpleMvc/SimpleMvc.csproj     |   5 +
 .../SimpleMvc22/Models/ErrorViewModel.cs      |  11 ++
 .../test/testassets/SimpleMvc22/Program.cs    |  13 +++
 .../testassets/SimpleMvc22/SimpleMvc22.csproj |  26 +++++
 .../SimpleMvc22/Views/Home/About.cshtml       |   7 ++
 .../SimpleMvc22/Views/Home/Index.cshtml       | 108 ++++++++++++++++++
 .../SimpleMvc22/Views/Shared/_Layout.cshtml   |  71 ++++++++++++
 .../Shared/_ValidationScriptsPartial.cshtml   |  18 +++
 .../SimpleMvc22/Views/_ViewImports.cshtml     |   4 +
 .../SimpleMvc22/Views/_ViewStart.cshtml       |   3 +
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |   5 +
 .../testassets/SimplePages/SimplePages.csproj |   5 +
 22 files changed, 447 insertions(+), 60 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/LegacyBuildServerTestFixture.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Models/ErrorViewModel.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Views/Home/About.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Views/Shared/_ValidationScriptsPartial.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/Views/_ViewStart.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index a756360999..6ba9ac9be8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -615,22 +615,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.Equal(firstAssemblyBytes, secondAssemblyBytes);
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc21")]
-        public async Task Building_NETCoreApp21TargetingProject()
-        {
-            TargetFramework = "netcoreapp2.1";
-
-            // Build
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
-        }
-
         [Fact]
         [InitializeTestProject("SimpleMvc21")]
         public async Task Building_WorksWhenMultipleRazorConfigurationsArePresent()
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
new file mode 100644
index 0000000000..1da9401aba
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
@@ -0,0 +1,32 @@
+// 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.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntegrationTest21 : MSBuildIntegrationTestBase, IClassFixture<LegacyBuildServerTestFixture>
+    {
+        public BuildIntegrationTest21(LegacyBuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc21")]
+        public async Task Building_NETCoreApp21TargetingProject()
+        {
+            TargetFramework = "netcoreapp2.1";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
new file mode 100644
index 0000000000..e3e0b890b4
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
@@ -0,0 +1,32 @@
+// 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.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntegrationTest22 : MSBuildIntegrationTestBase, IClassFixture<LegacyBuildServerTestFixture>
+    {
+        public BuildIntegrationTest22(LegacyBuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc22")]
+        public async Task Building_NETCoreApp22TargetingProject()
+        {
+            TargetFramework = "netcoreapp2.2";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc22.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc22.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc22.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc22.Views.pdb");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs
index 5c1a17e5c7..52c242cc31 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixture.cs
@@ -2,60 +2,27 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
-using System.Threading;
 using Microsoft.AspNetCore.Razor.Tools;
-using Microsoft.CodeAnalysis;
-using Moq;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
-    public class BuildServerTestFixture : IDisposable
+    /// <summary>
+    /// A test fixture that initializes a server as part of it's ctor.
+    /// Note that this fixture will always initialize a server of the current version since it
+    /// invokes the ServerConnection API from the referenced rzc.
+    /// </summary>
+    public class BuildServerTestFixture : BuildServerTestFixtureBase, IDisposable
     {
-        private static readonly TimeSpan _defaultShutdownTimeout = TimeSpan.FromSeconds(60);
-
         public BuildServerTestFixture() : this(Guid.NewGuid().ToString())
         {
         }
 
         internal BuildServerTestFixture(string pipeName)
+            : base(pipeName)
         {
-            PipeName = pipeName;
-
-            if (!ServerConnection.TryCreateServerCore(Environment.CurrentDirectory, PipeName, out var processId))
+            if (!ServerConnection.TryCreateServerCore(Environment.CurrentDirectory, pipeName, out _))
             {
-                throw new InvalidOperationException($"Failed to start the build server at pipe {PipeName}.");
-            }
-
-            ProcessId = processId;
-        }
-
-        public string PipeName { get; }
-
-        public int? ProcessId { get; }
-
-        public void Dispose()
-        {
-            // Shutdown the build server.
-            using (var cts = new CancellationTokenSource(_defaultShutdownTimeout))
-            {
-                var writer = new StringWriter();
-
-                cts.Token.Register(() =>
-                {
-                    var output = writer.ToString();
-                    throw new TimeoutException($"Shutting down the build server at pipe {PipeName} took longer than expected.{Environment.NewLine}Output: {output}.");
-                });
-
-                var application = new Application(cts.Token, Mock.Of<ExtensionAssemblyLoader>(), Mock.Of<ExtensionDependencyChecker>(), (path, properties) => Mock.Of<PortableExecutableReference>(), writer, writer);
-
-                var exitCode = application.Execute("shutdown", "-w", "-p", PipeName);
-                if (exitCode != 0)
-                {
-                    var output = writer.ToString();
-                    throw new InvalidOperationException(
-                        $"Build server at pipe {PipeName} failed to shutdown with exit code {exitCode}. Output: {output}");
-                }
+                throw new InvalidOperationException($"Failed to start the build server at pipe {pipeName}.");
             }
         }
     }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs
new file mode 100644
index 0000000000..5275d96e89
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs
@@ -0,0 +1,66 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.AspNetCore.Razor.Tools;
+using Microsoft.CodeAnalysis;
+using Moq;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public abstract class BuildServerTestFixtureBase : IDisposable
+    {
+        private static readonly TimeSpan _defaultShutdownTimeout = TimeSpan.FromSeconds(60);
+
+
+        protected BuildServerTestFixtureBase(string pipeName)
+        {
+            PipeName = pipeName;
+        }
+
+        public string PipeName { get; }
+
+        public void Dispose()
+        {
+            // Shutdown the build server.
+            using (var cts = new CancellationTokenSource(_defaultShutdownTimeout))
+            {
+                var writer = new StringWriter();
+
+                cts.Token.Register(() =>
+                {
+                    var output = writer.ToString();
+                    throw new TimeoutException($"Shutting down the build server at pipe {PipeName} took longer than expected.{Environment.NewLine}Output: {output}.");
+                });
+
+                var application = new Application(cts.Token, Mock.Of<ExtensionAssemblyLoader>(), Mock.Of<ExtensionDependencyChecker>(), (path, properties) => Mock.Of<PortableExecutableReference>(), writer, writer);
+
+                var args = new List<string>
+                {
+                    "shutdown",
+                    "-p",
+                    PipeName,
+                };
+
+                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    // Workaround for https://github.com/dotnet/corefx/issues/31713. On Linux, the server shuts down but hangs around as defunct process
+                    // We'll send a shutdown request but not wait for it.
+                    args.Add("-w");
+                }
+
+                var exitCode = application.Execute(args.ToArray());
+                if (exitCode != 0)
+                {
+                    var output = writer.ToString();
+                    throw new InvalidOperationException(
+                        $"Build server at pipe {PipeName} failed to shutdown with exit code {exitCode}. Output: {output}");
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/LegacyBuildServerTestFixture.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/LegacyBuildServerTestFixture.cs
new file mode 100644
index 0000000000..e1da868fea
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/LegacyBuildServerTestFixture.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    /// <summary>
+    /// A fixture that relies on the build task to spin up the build server.
+    /// </summary>
+    public class LegacyBuildServerTestFixture : BuildServerTestFixtureBase
+    {
+        public LegacyBuildServerTestFixture()
+            : base(Guid.NewGuid().ToString())
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index 07ffd2aa9d..a1a9a1b3a8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         private static readonly AsyncLocal<ProjectDirectory> _project = new AsyncLocal<ProjectDirectory>();
         private static readonly AsyncLocal<string> _projectTfm = new AsyncLocal<string>();
 
-        protected MSBuildIntegrationTestBase(BuildServerTestFixture buildServer)
+        protected MSBuildIntegrationTestBase(BuildServerTestFixtureBase buildServer)
         {
             BuildServer = buildServer;
         }
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             set => _projectTfm.Value = value;
         }
 
-        protected BuildServerTestFixture BuildServer { get; set; }
+        protected BuildServerTestFixtureBase BuildServer { get; set; }
 
         internal Task<MSBuildResult> DotnetMSBuild(
             string target,
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index f299f64e13..271eb90067 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -2,6 +2,7 @@
   
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -16,6 +17,7 @@
   <!-- Test Placeholder -->
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 69cada3019..e2cdd3ae0f 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,6 +14,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index b9fd86c876..c50aefcff5 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,6 +14,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 276589868f..160e4d5686 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -2,6 +2,7 @@
   
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,6 +14,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/SimpleMvc22/Models/ErrorViewModel.cs b/src/Razor/test/testassets/SimpleMvc22/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..b4aa044914
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SimpleMvc.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/SimpleMvc22/Program.cs b/src/Razor/test/testassets/SimpleMvc22/Program.cs
new file mode 100644
index 0000000000..25883d6b8b
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MVC 2.2
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj b/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj
new file mode 100644
index 0000000000..d21c831710
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC. It will reference the local build of Tasks but not the compiler or any test shims.
+  -->
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/Home/About.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/Home/About.cshtml
new file mode 100644
index 0000000000..3674e37a86
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/Home/About.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..1a9473e464
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/Shared/_ValidationScriptsPartial.cshtml
new file mode 100644
index 0000000000..a699aafa97
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,18 @@
+<environment include="Development">
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+</environment>
+<environment exclude="Development">
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
+    </script>
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
+    </script>
+</environment>
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..477d4ba603
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@using SimpleMvc
+@using SimpleMvc.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@namespace SimpleMvc21
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index c32a88baa1..c972b84e4b 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -18,6 +19,10 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 362406340c..afc2b469d0 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,6 +14,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>

From e6e8fba39c3124550eea1885cefd894075974d3e Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 4 Jan 2019 11:17:40 -0800
Subject: [PATCH 037/337] SDK updates for components tooling

This is a bug fix for the RazorComponentWithTargetPath xaml rule. We
need to have separate targets for components and views.

The other fix here is a change to the set of workarounds we're using for
components currently. We need this project capability for the correct
project host to be used when loading the project.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/78163f7e4f38937831cea526d682c30aad7bf80c
---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets         | 10 ++++++++--
 .../Rules/RazorComponentWithTargetPath.xaml            |  4 ++--
 .../IntegrationTests/DesignTimeBuildIntegrationTest.cs |  4 ++--
 .../ComponentLibrary/ComponentLibrary.csproj           |  4 ++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index bd66729778..2a9f95d7e4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -59,8 +59,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target 
     Name="RazorGenerateDesignTime" 
-    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
-    Returns="@(RazorGenerateWithTargetPath);@(RazorComponentWithTargetPath)">
+    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" 
+    Returns="@(RazorGenerateWithTargetPath)">
+  </Target>
+
+  <Target 
+    Name="RazorGenerateComponentDesignTime" 
+    DependsOnTargets="ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
+    Returns="@(RazorComponentWithTargetPath)">
   </Target>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
index 14a479afe3..668c85bd59 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
@@ -2,14 +2,14 @@
 <Rule
   Description="Razor Document Properties"
   DisplayName="Razor Document Properties"
-  Name="RazorGenerateWithTargetPath"
+  Name="RazorComponentWithTargetPath"
   PageTemplate="generic"
   xmlns="http://schemas.microsoft.com/build/2009/properties">
   <Rule.DataSource>
     <DataSource
       Persistence="ProjectFile"
       ItemType="RazorComponentWithTargetPath"
-      MSBuildTarget="RazorGenerateDesignTime"
+      MSBuildTarget="RazorGenerateComponentDesignTime"
       HasConfigurationCondition="False"
       SourceOfDefaultValue="AfterContext"
       SourceType="TargetResults" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index 7d5f88d9fb..c6b33539ad 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -67,11 +67,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("ComponentLibrary")]
-        public async Task RazorGenerateDesignTime_ReturnsRazorComponentWithTargetPath()
+        public async Task RazorGenerateComponentDesignTime_ReturnsRazorComponentWithTargetPath()
         {
             TargetFramework = "netstandard2.0";
 
-            var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorComponentWithTargetPath");
+            var result = await DotnetMSBuild("RazorGenerateComponentDesignTime;_IntrospectRazorComponentWithTargetPath");
 
             Assert.BuildPassed(result);
 
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index f3ad8532a3..631a4c0a46 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -42,6 +42,10 @@
       <RazorGenerate Remove="@(RazorGenerate)" />
     </ItemGroup>
   </Target>
+
+  <ItemGroup>
+    <ProjectCapability Include="DotNetCoreRazorConfiguration" />
+  </ItemGroup>
   <!--
     END COMPONENT .cshtml WORKAROUND
   -->

From b10374a368b7f590126019cd7c2844328f285cf2 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 4 Jan 2019 11:17:40 -0800
Subject: [PATCH 038/337] SDK updates for components tooling

This is a bug fix for the RazorComponentWithTargetPath xaml rule. We
need to have separate targets for components and views.

The other fix here is a change to the set of workarounds we're using for
components currently. We need this project capability for the correct
project host to be used when loading the project.

(cherry picked from commit dotnet/aspnetcore-tooling@78163f7e4f38937831cea526d682c30aad7bf80c)
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f8835ce7a88b188ff397b1be1b06e8e3e75dc1d1
---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets         | 10 ++++++++--
 .../Rules/RazorComponentWithTargetPath.xaml            |  4 ++--
 .../IntegrationTests/DesignTimeBuildIntegrationTest.cs |  4 ++--
 .../ComponentLibrary/ComponentLibrary.csproj           |  4 ++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index bd66729778..2a9f95d7e4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -59,8 +59,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target 
     Name="RazorGenerateDesignTime" 
-    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
-    Returns="@(RazorGenerateWithTargetPath);@(RazorComponentWithTargetPath)">
+    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" 
+    Returns="@(RazorGenerateWithTargetPath)">
+  </Target>
+
+  <Target 
+    Name="RazorGenerateComponentDesignTime" 
+    DependsOnTargets="ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
+    Returns="@(RazorComponentWithTargetPath)">
   </Target>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
index 14a479afe3..668c85bd59 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
@@ -2,14 +2,14 @@
 <Rule
   Description="Razor Document Properties"
   DisplayName="Razor Document Properties"
-  Name="RazorGenerateWithTargetPath"
+  Name="RazorComponentWithTargetPath"
   PageTemplate="generic"
   xmlns="http://schemas.microsoft.com/build/2009/properties">
   <Rule.DataSource>
     <DataSource
       Persistence="ProjectFile"
       ItemType="RazorComponentWithTargetPath"
-      MSBuildTarget="RazorGenerateDesignTime"
+      MSBuildTarget="RazorGenerateComponentDesignTime"
       HasConfigurationCondition="False"
       SourceOfDefaultValue="AfterContext"
       SourceType="TargetResults" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index 7d5f88d9fb..c6b33539ad 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -67,11 +67,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("ComponentLibrary")]
-        public async Task RazorGenerateDesignTime_ReturnsRazorComponentWithTargetPath()
+        public async Task RazorGenerateComponentDesignTime_ReturnsRazorComponentWithTargetPath()
         {
             TargetFramework = "netstandard2.0";
 
-            var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorComponentWithTargetPath");
+            var result = await DotnetMSBuild("RazorGenerateComponentDesignTime;_IntrospectRazorComponentWithTargetPath");
 
             Assert.BuildPassed(result);
 
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index f3ad8532a3..631a4c0a46 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -42,6 +42,10 @@
       <RazorGenerate Remove="@(RazorGenerate)" />
     </ItemGroup>
   </Target>
+
+  <ItemGroup>
+    <ProjectCapability Include="DotNetCoreRazorConfiguration" />
+  </ItemGroup>
   <!--
     END COMPONENT .cshtml WORKAROUND
   -->

From 500bdc1fd42ba0bdd3058006a6275db1be8166b4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 7 Jan 2019 15:09:56 -0800
Subject: [PATCH 039/337] Exclude RazorComponent items from RazorGenerate item
 group

Interim solution to allow components to share the .cshtml extension. When declared in
the project file, the SDK will prevent RazorComponent items from being included
in the RazorGenerate itemgroup.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/92e2c70b699a35b1410b80863aa0c3415aa0bbc6
---
 .../Sdk.Razor.CurrentVersion.targets          |  5 +++-
 .../test/IntegrationTests/Assert.cs           | 26 ++++++++++++++++---
 .../BuildWithComponentsIntegrationTest.cs     |  2 ++
 .../ComponentLibrary/ComponentLibrary.csproj  | 15 -----------
 .../Components/Counter.cshtml                 |  1 +
 .../MvcWithComponents.csproj                  |  4 +++
 6 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 704b14d22a..a4cb71a514 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -367,7 +367,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
 
     <ItemGroup Condition="'$(EnableDefaultRazorGenerateItems)'=='true'">
-      <RazorGenerate Include="@(Content)" Condition="'%(Content.Extension)'=='.cshtml'" />
+      <RazorGenerate
+        Include="@(Content)"
+        Exclude="@(RazorComponent)"
+        Condition="'%(Content.Extension)'=='.cshtml'" />
     </ItemGroup>
 
     <!--
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index 273c90ddda..d94289e180 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -384,18 +385,37 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             assemblyPath = Path.Combine(result.Project.DirectoryPath, Path.Combine(assemblyPath));
+
+            var typeNames = GetDeclaredTypeNames(assemblyPath);
+            Assert.Contains(fullTypeName, typeNames);
+        }
+
+        public static void AssemblyDoesNotContainType(MSBuildResult result, string assemblyPath, string fullTypeName)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var typeNames = GetDeclaredTypeNames(assemblyPath);
+            Assert.DoesNotContain(fullTypeName, typeNames);
+        }
+
+        private static IEnumerable<string> GetDeclaredTypeNames(string assemblyPath)
+        {
+            IEnumerable<string> typeNames;
             using (var file = File.OpenRead(assemblyPath))
             {
                 var peReader = new PEReader(file);
                 var metadataReader = peReader.GetMetadataReader();
-                var typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
+                typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
                 {
                     var type = metadataReader.GetTypeDefinition(t);
                     return metadataReader.GetString(type.Namespace) + "." + metadataReader.GetString(type.Name);
                 });
-
-                Assert.Contains(fullTypeName, typeNames);
             }
+
+            return typeNames;
         }
 
         private abstract class MSBuildXunitException : Xunit.Sdk.XunitException
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index a12945f1f0..4ce8344550 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -36,6 +36,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.TestComponent");
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Shared.NavMenu");
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Components.Counter");
+            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Home.Index");
         }
     }
 }
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index 631a4c0a46..f4cf248c2b 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -27,28 +27,13 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
 
-  <!-- 
-    BEGIN COMPONENT .cshtml WORKAROUND
-
-    This is the current workaround used by the components codebase to treat .cshtml files as components
-    so that we can have tooling support. Testing it here so it won't break.
-  -->
   <ItemGroup>
     <RazorComponent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
   </ItemGroup>
 
-  <Target Name="_RemoveFilesFromRazorGenerate" AfterTargets="ResolveRazorGenerateInputs">
-    <ItemGroup>
-      <RazorGenerate Remove="@(RazorGenerate)" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <ProjectCapability Include="DotNetCoreRazorConfiguration" />
   </ItemGroup>
-  <!--
-    END COMPONENT .cshtml WORKAROUND
-  -->
 
   <!-- Test Placeholder -->
 
diff --git a/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml
new file mode 100644
index 0000000000..f8b81d88c7
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml
@@ -0,0 +1 @@
+This file should produce a component
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index c50aefcff5..1d3cf1b9ed 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -29,6 +29,10 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <RazorComponent Include="Components/**/*.cshtml" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>

From 4e909515a7e75d95a850fee59cd3bc97472249f3 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 7 Jan 2019 15:43:28 -0800
Subject: [PATCH 040/337] PR changes \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/ef1a7507c9ecc6db6dc4148e8bb9338729524456

---
 .../test/IntegrationTests/Assert.cs                    |  9 ++++-----
 .../BuildWithComponentsIntegrationTest.cs              | 10 +++++++++-
 .../ComponentLibrary/ComponentLibrary.csproj           |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index d94289e180..f2ee9393f6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -397,25 +397,24 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 throw new ArgumentNullException(nameof(result));
             }
 
+            assemblyPath = Path.Combine(result.Project.DirectoryPath, Path.Combine(assemblyPath));
+
             var typeNames = GetDeclaredTypeNames(assemblyPath);
             Assert.DoesNotContain(fullTypeName, typeNames);
         }
 
         private static IEnumerable<string> GetDeclaredTypeNames(string assemblyPath)
         {
-            IEnumerable<string> typeNames;
             using (var file = File.OpenRead(assemblyPath))
             {
                 var peReader = new PEReader(file);
                 var metadataReader = peReader.GetMetadataReader();
-                typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
+                return metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
                 {
                     var type = metadataReader.GetTypeDefinition(t);
                     return metadataReader.GetString(type.Namespace) + "." + metadataReader.GetString(type.Name);
-                });
+                }).ToArray();
             }
-
-            return typeNames;
         }
 
         private abstract class MSBuildXunitException : Xunit.Sdk.XunitException
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 4ce8344550..847fccafc3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -36,8 +36,16 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.TestComponent");
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Shared.NavMenu");
+
+            // This is a component file with a .cshtml extension. It should appear in the main assembly, but not in the views dll.
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Components.Counter");
-            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Home.Index");
+            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.Views.dll"), "MvcWithComponents.Components.Counter");
+            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.Views.dll"), "AspNetCore.Components_Counter");
+
+            // Verify a regular View appears in the views dll, but not in the main assembly.
+            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "AspNetCore.Views.Home.Index");
+            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "AspNetCore.Views_Home_Index");
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.Views.dll"), "AspNetCore.Views_Home_Index");
         }
     }
 }
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index f4cf248c2b..077e7ae96b 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <RazorComponent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
+    <RazorComponent Include="**/*.cshtml" />
   </ItemGroup>
 
   <ItemGroup>

From d46aa2e2bd96b5b8455f629e2f0e47498f40cb5d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 2 Jan 2019 18:21:34 -0800
Subject: [PATCH 041/337] Enabling features for Components in VS

This is the final set of enabling features for VS.. including:
- Adding component types to IDE project engine
- Using file kind in the editor
- Enabling component documents in the project system
- Fixing some bugs in the xaml/msbuild authoring
- Adding a missing capability for component projects

The only thing here that probably bears explaining is the class name
mangling. This is a carry over from Blazor, basically because the
generated code is part of the workspace, we have to mangle the class
name to avoid collisions. The work to resolve this is tracked
separately, and will require coordination from a few teams to resolve.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d0a8aa3f9717994f2567e4caf7c0061dd89d3459
---
 .../BasicComponent_DesignTime.codegen.cs      |  4 +-
 .../BasicComponent_DesignTime.ir.txt          |  4 +-
 .../BasicComponent_DesignTime.mappings.txt    |  8 +-
 .../BasicComponent_Runtime.codegen.cs         |  4 +-
 .../BasicComponent_Runtime.ir.txt             |  4 +-
 .../ComponentDocumentClassifierPass.cs        | 73 ++++++++++++-------
 .../src/BindTagHelperDescriptorProvider.cs    |  6 +-
 .../Microsoft.NET.Sdk.Razor.Component.targets |  4 +-
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets | 17 +++++
 9 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 5fe69361a5..a440afb781 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -1,6 +1,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
-namespace AspNetCore
+namespace __BlazorGenerated
 {
     #line hidden
     using TModel = global::System.Object;
@@ -9,7 +9,7 @@ namespace AspNetCore
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class BasicComponent : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index 73d65846a2..2f6aa48182 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -1,12 +1,12 @@
 Document - 
-    NamespaceDeclaration -  - AspNetCore
+    NamespaceDeclaration -  - __BlazorGenerated
         UsingDirective -  - TModel = global::System.Object
         UsingDirective - (1:0,1 [12] ) - System
         UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
         UsingDirective - (51:2,1 [17] ) - System.Linq
         UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - BasicComponent - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+        ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             DesignTimeDirective - 
                 DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components"
                 DirectiveToken - (12:0,12 [11] BasicComponent.cshtml) - IDisposable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index abc4f51e55..0baa77e8ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |IDisposable|
-Generated Location: (618:17,0 [11] )
+Generated Location: (662:17,0 [11] )
 |IDisposable|
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1214:33,13 [15] )
+Generated Location: (1258:33,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1359:38,6 [29] )
+Generated Location: (1403:38,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1573:45,12 [37] )
+Generated Location: (1617:45,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 65fa29f408..c376721682 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -1,7 +1,7 @@
 #pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d3c3d6059615673cb46fc4974164d61eabadb890"
 // <auto-generated/>
 #pragma warning disable 1591
-namespace AspNetCore
+namespace __BlazorGenerated
 {
     #line hidden
     using System;
@@ -9,7 +9,7 @@ namespace AspNetCore
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class BasicComponent : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
index 58d2bd23dd..65c88c6ce0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -1,11 +1,11 @@
 Document - 
-    NamespaceDeclaration -  - AspNetCore
+    NamespaceDeclaration -  - __BlazorGenerated
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
         UsingDirective - (51:2,1 [19] ) - System.Linq
         UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - BasicComponent - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+        ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - 
                     IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 09197b56b5..4a992de20a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -17,6 +17,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         private static readonly char[] PathSeparators = new char[] { '/', '\\' };
         private static readonly char[] NamespaceSeparators = new char[] { '.' };
 
+        /// <summary>
+        /// The base namespace.
+        /// </summary>
+        // This is a fallback value and will only be used if we can't compute
+        // a reasonable namespace.
+        public string BaseNamespace { get; set; } = "__BlazorGenerated";
+
+        /// <summary>
+        /// Gets or sets whether to mangle class names.
+        /// 
+        /// Set to true in the IDE so we can generated mangled class names. This is needed
+        /// to avoid conflicts between generated design-time code and the code in the editor.
+        ///
+        /// A better workaround for this would be to create a singlefilegenerator that overrides
+        /// the codegen process when a document is open, but this is more involved, so hacking
+        /// it for now.
+        /// </summary>
+        public bool MangleClassNames { get; set; } = false;
+
         protected override string DocumentKind => ComponentDocumentKind;
 
         // Ensure this runs before the MVC classifiers which have Order = 0
@@ -32,40 +51,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return new ComponentCodeTarget(options, TargetExtensions);
         }
 
-        protected override void OnDocumentStructureCreated(RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, MethodDeclarationIntermediateNode method)
+        /// <inheritdoc />
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument,
+            NamespaceDeclarationIntermediateNode @namespace,
+            ClassDeclarationIntermediateNode @class,
+            MethodDeclarationIntermediateNode method)
         {
-            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
-
             if (!TryComputeNamespaceAndClass(
-                   codeDocument.Source.FilePath,
-                   codeDocument.Source.RelativePath,
-                   out var computedNamespace,
-                   out var computedClass))
+                codeDocument.Source.FilePath,
+                codeDocument.Source.RelativePath,
+                out var computedNamespace,
+                out var computedClass))
             {
                 // If we can't compute a nice namespace (no relative path) then just generate something
                 // mangled.
-                computedNamespace = "AspNetCore";
+                computedNamespace = BaseNamespace;
                 var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
                 computedClass = $"AspNetCore_{checksum}";
             }
 
+            if (MangleClassNames)
+            {
+                computedClass = "__" + computedClass;
+            }
+
             @namespace.Content = computedNamespace;
 
+            @class.BaseType = ComponentsApi.ComponentBase.FullTypeName;
             @class.ClassName = computedClass;
-            @class.BaseType = $"{CodeGenerationConstants.ComponentBase.FullTypeName}";
-            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
-            if (string.IsNullOrEmpty(filePath))
-            {
-                // It's possible for a Razor document to not have a file path.
-                // Eg. When we try to generate code for an in memory document like default imports.
-                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
-                @class.ClassName = $"AspNetCore_{checksum}";
-            }
-            else
-            {
-                @class.ClassName = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(filePath));
-            }
-
             @class.Modifiers.Clear();
             @class.Modifiers.Add("public");
 
@@ -82,8 +96,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 @class.TypeParameters.Add(new TypeParameter() { ParameterName = typeParamNode.Tokens.First().Content, });
             }
 
-            method.MethodName = CodeGenerationConstants.ComponentBase.BuildRenderTree;
             method.ReturnType = "void";
+            method.MethodName = ComponentsApi.ComponentBase.BuildRenderTree;
             method.Modifiers.Clear();
             method.Modifiers.Add("protected");
             method.Modifiers.Add("override");
@@ -91,8 +105,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             method.Parameters.Clear();
             method.Parameters.Add(new MethodParameter()
             {
-                TypeName = CodeGenerationConstants.RenderTreeBuilder.FullTypeName,
-                ParameterName = CodeGenerationConstants.ComponentBase.BuildRenderTreeParameter,
+                ParameterName = "builder",
+                TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName,
             });
 
             // We need to call the 'base' method as the first statement.
@@ -101,11 +115,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             callBase.Children.Add(new IntermediateToken
             {
                 Kind = TokenKind.CSharp,
-                Content = $"base.{CodeGenerationConstants.ComponentBase.BuildRenderTree}({CodeGenerationConstants.ComponentBase.BuildRenderTreeParameter});"
+                Content = $"base.{ComponentsApi.ComponentBase.BuildRenderTree}(builder);"
             });
             method.Children.Insert(0, callBase);
         }
 
+        // In general documents will have a relative path (relative to the project root).
+        // We can only really compute a nice class/namespace when we know a relative path.
+        //
+        // However all kinds of thing are possible in tools. We shouldn't barf here if the document isn't 
+        // set up correctly.
         private bool TryComputeNamespaceAndClass(string filePath, string relativePath, out string @namespace, out string @class)
         {
             if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
@@ -158,4 +177,4 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         internal static bool IsBuildRenderTreeBaseCall(CSharpCodeIntermediateNode node)
             => node.Annotations[BuildRenderTreeBaseCallAnnotation] != null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 91aa32f4f3..02bf8e3fcf 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -207,7 +207,9 @@ namespace Microsoft.CodeAnalysis.Razor
                 {
                     var attribute = attributes[j];
 
-                    if (attribute.AttributeClass == bindElement)
+                    // We need to check the constructor argument length here, because this can show up as 0
+                    // if the language service fails to initialize. This is an invalid case, so skip it.
+                    if (attribute.AttributeClass == bindElement && attribute.ConstructorArguments.Length == 4)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
@@ -218,7 +220,7 @@ namespace Microsoft.CodeAnalysis.Razor
                             (string)attribute.ConstructorArguments[2].Value,
                             (string)attribute.ConstructorArguments[3].Value));
                     }
-                    else if (attribute.AttributeClass == bindInputElement)
+                    else if (attribute.AttributeClass == bindInputElement && attribute.ConstructorArguments.Length == 4)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 15593fa737..af7427334c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -49,7 +49,9 @@ Copyright (c) .NET Foundation. All rights reserved.
       Condition="'%(RazorComponentWithTargetPath.GeneratedDeclaration)' == ''" />
 
     <ItemGroup>
-      <_RazorComponentDeclaration Include="%(RazorComponentWithTargetPath.GeneratedDeclaration)" />
+      <_RazorComponentDeclaration Include="@(RazorComponentWithTargetPath->'%(GeneratedDeclaration)')">
+        <DependentUpon>%(Identity)</DependentUpon>
+      </_RazorComponentDeclaration>
       <_RazorComponentDefinition Include="%(RazorComponentWithTargetPath.GeneratedOutput)" />
     </ItemGroup>
   </Target>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 2a9f95d7e4..a1b33cf7cc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -29,6 +29,17 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectCapability Include="DotNetCoreRazorConfiguration" Condition="'$(_TargetingNETCoreApp30OrLater)'=='true'"/>
   </ItemGroup>
 
+  <!-- 
+    For now we need to treat component files as if they have a single file generator. This will allow us
+    to trigger a workspace update for the declaration files when they change.
+  -->
+  <ItemGroup>
+    <Content Update="@(RazorComponent)">
+      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
   <!--
     WebSdk imports these capabilities for nesting in DotNetCoreWeb projects.
     Conditinally import these capabilities if the project isn't targeting the WebSdk.
@@ -69,4 +80,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     Returns="@(RazorComponentWithTargetPath)">
   </Target>
 
+  <!-- Called by the project system to update generated declaration files -->
+  <Target 
+    Name="RazorGenerateComponentDeclarationDesignTime" 
+    DependsOnTargets="ResolveRazorConfiguration;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths;RazorGenerateComponentDeclaration">
+  </Target>
+
 </Project>

From 32a8a7485eb49828ebddeb2ef4be6a6b2230832d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 7 Jan 2019 16:33:11 -0800
Subject: [PATCH 042/337] Remove workarounds for missing 3.0 support

Leading up the release of VS 16.0p1 we added workarounds to the SDK to
make Razor fall back to the 2.1 configuration for design-time. Since
we're adding the 3.0 language support to preview2 we can remove these
workarounds. These features have been available in internal builds for
some time.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e6be8a7a3e092cd79c3243fb42521e85b8245573
---
 ...rosoft.NET.Sdk.Razor.Configuration.targets | 33 ++-----------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index 7b27791129..f904665aee 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -54,12 +54,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup Condition="'$(RazorLangVersion)'==''">
     <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
-
-    <!--
-      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
-      functionally equivalent. This will be undone in the near future.
-    -->
-    <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true' AND '$(DesignTimeBuild)' == 'true'">2.1</RazorLangVersion>
   </PropertyGroup>
 
   <!--
@@ -67,12 +61,6 @@ Copyright (c) .NET Foundation. All rights reserved.
   -->
   <PropertyGroup Condition="'$(RazorDefaultConfiguration)'==''">
     <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">MVC-3.0</RazorDefaultConfiguration>
-
-    <!--
-      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
-      functionally equivalent. This will be undone in the near future.
-    -->
-    <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true' AND '$(DesignTimeBuild)' == 'true'">MVC-2.1</RazorDefaultConfiguration>
   </PropertyGroup>
 
   <ItemGroup>
@@ -81,33 +69,16 @@ Copyright (c) .NET Foundation. All rights reserved.
       it here. The IDE is hardcoded to inject 2.0 support when needed. The settings flowing through MSBuild should reflect
       the project's runtime.
     -->
-    <RazorConfiguration Include="MVC-3.0" Condition="'$(DesignTimeBuild)' != 'true'">
+    <RazorConfiguration Include="MVC-3.0">
       <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
     </RazorConfiguration>
-
-    <!--
-      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
-      functionally equivalent. This will be undone in the near future.
-    -->
-    <RazorConfiguration Include="MVC-2.1" Condition="'$(DesignTimeBuild)' == 'true'">
-      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
-    </RazorConfiguration>
   </ItemGroup>
 
   <ItemGroup>
-    <RazorExtension Include="MVC-3.0" Condition="'$(DesignTimeBuild)' != 'true'">
+    <RazorExtension Include="MVC-3.0">
       <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
       <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
     </RazorExtension>
-
-    <!--
-      For dev16 the Razor toolings bits don't currently understand 3.0 projects. Therefore, we default to 2.1 which is currently
-      functionally equivalent. This will be undone in the near future.
-    -->
-    <RazorExtension Include="MVC-2.1" Condition="'$(DesignTimeBuild)' == 'true'">
-      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
-      <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-2-1\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
-    </RazorExtension>
   </ItemGroup>
 
   <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">

From f87d9b533576352e80ec4c6c41dd7f76e6f4dec5 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 7 Jan 2019 20:18:39 -0800
Subject: [PATCH 043/337] Fix null ref in the parser
 (dotnet/aspnetcore-tooling#103)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8e1629b60b26c438b7bfbbf0e654a4bf15141788
---
 .../src/Legacy/HtmlMarkupParser.cs                               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index ed20cc9617..60bca288c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1591,6 +1591,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var node = tagBlock.Attributes[i];
 
                 if (node is MarkupAttributeBlockSyntax attributeBlock &&
+                    attributeBlock.Value != null &&
                     attributeBlock.Value.Children.Count > 0 &&
                     IsTypeAttribute(attributeBlock))
                 {

From 77bd9d343cae6329c1980e0faf3b9855e4dd1602 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Mon, 7 Jan 2019 19:37:08 -0800
Subject: [PATCH 044/337] Fixed exception with non taghelper start/end void
 tags \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/ee8fdae75612e9d5c20b6947c1e3945d5c917cbd

---
 .../src/Legacy/TagHelperParseTreeRewriter.cs                 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 13a6a89cdc..3ad6edcff9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -144,8 +144,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         // Non-TagHelper tag.
                         ValidateParentAllowsPlainStartTag(startTag);
 
-                        if (!startTag.IsSelfClosing() && !startTag.IsVoidElement())
+                        if (node.EndTag != null || (!startTag.IsSelfClosing() && !startTag.IsVoidElement()))
                         {
+                            // Ideally we don't want to keep track of self-closing or void tags.
+                            // But if a matching end tag exists, keep track of the start tag no matter what.
+                            // We will just assume the parser had a good reason to do this.
                             var tracker = new TagTracker(tagName, isTagHelper: false);
                             _trackerStack.Push(tracker);
                         }

From 5b5aa6837fd0c3d23e40c32129a6eb2cb62f0fa8 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 8 Jan 2019 09:42:01 -0800
Subject: [PATCH 045/337] Properly handle attr-value prefix in markup pass

Fixes aspnet/AspNetCoredotnet/aspnetcore-tooling#6480

We were missing handling for the attribute value prefix of a markup
attribute during the markup block rewrite pass. This is properly handled
inside the runtime code writer so you wouldn't see this bug if the
contents of the element were dynamic (and thus could not be rewritten).

Most of the churn here is due to renaming classes. We generally prefer
the term *markup* over *html* in code artifacts, and this was one piece
of new code that refers to html.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d16eafd667a04e40944158dd92d786cebadc1a2b
---
 ...{ComponentHtmlBlockPass.cs => ComponentMarkupBlockPass.cs} | 4 +++-
 .../src/RazorProjectEngine.cs                                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/{ComponentHtmlBlockPass.cs => ComponentMarkupBlockPass.cs} (98%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentHtmlBlockPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
similarity index 98%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentHtmlBlockPass.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
index 8327b33318..4d467d6203 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentHtmlBlockPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     //
     // Does not preserve insignificant details of the HTML, like tag closing style
     // or quote style.
-    internal class ComponentHtmlBlockPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
+    internal class ComponentMarkupBlockPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Runs LATE because we want to destroy structure.
         public override int Order => 10000;
@@ -322,6 +322,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 for (var i = 0; i < node.Children.Count; i++)
                 {
+                    Builder.Append(node.Prefix);
+
                     if (node.Children[i] is IntermediateToken token)
                     {
                         Builder.Append(token.Content);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index d29ba2e775..39afa6b0ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -231,7 +231,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.Features.Add(new ComponentTemplateDiagnosticPass());
             builder.Features.Add(new ComponentGenericTypePass());
             builder.Features.Add(new ComponentChildContentDiagnosticPass());
-            builder.Features.Add(new ComponentHtmlBlockPass());
+            builder.Features.Add(new ComponentMarkupBlockPass());
         }
 
         private static void LoadExtensions(RazorProjectEngineBuilder builder, IReadOnlyList<RazorExtension> extensions)

From e1245d874f695ac5f65cf9412b0cbbfc9be53c5b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 8 Jan 2019 16:11:18 -0800
Subject: [PATCH 046/337] Fix: Missing void end tag when targeted by TH with
 WithoutEndTag structure (dotnet/aspnetcore-tooling#105)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/33bf2691d5a58e9a071b9774c3867d8c5120cf4a
---
 .../src/Legacy/TagHelperParseTreeRewriter.cs                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 3ad6edcff9..47f96d7d3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -111,18 +111,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         {
                             var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body: new SyntaxList<RazorSyntaxNode>(), endTag: null);
                             var rewrittenTagHelper = tagHelperElement.WithTagHelperInfo(tagHelperInfo);
-                            if (node.Body.Count == 0)
+                            if (node.Body.Count == 0 && node.EndTag == null)
                             {
                                 return rewrittenTagHelper;
                             }
 
-                            // This tag contains a body which needs to be moved to the parent.
+                            // This tag contains a body and/or an end tag which needs to be moved to the parent.
                             var rewrittenNodes = SyntaxListBuilder<RazorSyntaxNode>.Create();
                             rewrittenNodes.Add(rewrittenTagHelper);
                             var rewrittenBody = VisitList(node.Body);
                             rewrittenNodes.AddRange(rewrittenBody);
 
-                            return SyntaxFactory.MarkupElement(startTag: null, body: rewrittenNodes.ToList(), endTag: null);
+                            return SyntaxFactory.MarkupElement(startTag: null, body: rewrittenNodes.ToList(), endTag: node.EndTag);
                         }
                         else if (node.EndTag == null)
                         {

From 14afcc3eafacad0afa81ba6089b6b1b8ed67f359 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 9 Jan 2019 11:39:02 -0800
Subject: [PATCH 047/337] Reenable skipped test (dotnet/aspnetcore-tooling#99)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2ad0641b1e8e0cebb17115e3b8a7eb878f460d5c
---
 .../test/IntegrationTests/BuildServerIntegrationTest.cs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index cad1a57355..bb144b162e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -141,9 +141,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         // Skipping on MacOS because of https://github.com/dotnet/corefx/issues/33141.
-        // Skipping on Linux because of https://github.com/aspnet/Razor/issues/2525.
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [OSSkipCondition(OperatingSystems.MacOSX)]
         [InitializeTestProject("SimpleMvc")]
         public async Task ManualServerShutdown_NoPipeName_ShutsDownServer()
         {

From b449a444408dda116d0716f74d5c2d6b9445c12a Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 9 Jan 2019 11:41:10 -0800
Subject: [PATCH 048/337] Fix void tags grouping logic
 (dotnet/aspnetcore-tooling#110)

* Fix void tags grouping logic

* Handle bang in tag name
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2c41ae95503b6fcc0b2f067130b8113de5ccb674
---
 .../src/Legacy/HtmlMarkupParser.cs            | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 60bca288c6..85f7540dd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -71,9 +71,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 while (_tagTracker.Count > 0)
                 {
                     var tracker = _tagTracker.Pop();
-                    var element = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
-                    builder.AddRange(tracker.PreviousNodes);
-                    builder.Add(element);
+                    if (IsVoidElement(tracker.TagName))
+                    {
+                        // We were tracking a void element but we reached the end of the document without finding a matching end tag.
+                        // So, close that element and move its content to its parent.
+                        var children = builder.Consume();
+                        var voidElement = SyntaxFactory.MarkupElement(tracker.StartTag, EmptySyntaxList, endTag: null);
+                        builder.AddRange(tracker.PreviousNodes);
+                        builder.Add(voidElement);
+                        builder.AddRange(children);
+                    }
+                    else
+                    {
+                        var element = SyntaxFactory.MarkupElement(tracker.StartTag, builder.Consume(), endTag: null);
+                        builder.AddRange(tracker.PreviousNodes);
+                        builder.Add(element);
+                    }
                 }
 
                 var markup = SyntaxFactory.MarkupBlock(builder.ToList());
@@ -533,6 +546,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private bool TryRecoverStartTag(in SyntaxListBuilder<RazorSyntaxNode> builder, string endTagName, MarkupEndTagSyntax endTag)
         {
+            // First check if the tag we're tracking is a void tag. If so, we need to close it out before moving on.
+            while (_tagTracker.Count > 0 &&
+                !string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase) &&
+                IsVoidElement(CurrentStartTagName))
+            {
+                var tracker = _tagTracker.Pop();
+                var children = builder.Consume();
+                var voidElement = SyntaxFactory.MarkupElement(tracker.StartTag, EmptySyntaxList, endTag: null);
+                builder.AddRange(tracker.PreviousNodes);
+                builder.Add(voidElement);
+                builder.AddRange(children);
+            }
+
             var malformedTagCount = 0;
             foreach (var tag in _tagTracker)
             {
@@ -647,7 +673,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     // Completed tags in code blocks have no accepted characters.
                     SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
 
-                    if (tagMode != MarkupTagMode.SelfClosing && ParserHelpers.VoidElements.Contains(tagName))
+                    if (tagMode != MarkupTagMode.SelfClosing && IsVoidElement(tagName))
                     {
                         // This is a void element.
                         // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
@@ -2114,6 +2140,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return last.Green;
         }
 
+        private static bool IsVoidElement(string tagName)
+        {
+            if (string.IsNullOrEmpty(tagName))
+            {
+                return false;
+            }
+
+            if (tagName.StartsWith("!"))
+            {
+                tagName = tagName.Substring(1);
+            }
+
+            return ParserHelpers.VoidElements.Contains(tagName);
+        }
+
         private enum ParseMode
         {
             Markup,

From b0e2dc2addb46661ac39fdce3253193eab40c33d Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 10 Jan 2019 13:55:28 -0800
Subject: [PATCH 049/337] Added check to ensure we generate syntax tree with
 full fidelity (dotnet/aspnetcore-tooling#111)

* Added check to ensure we generate syntax tree with full fidelity

* Better check

* Feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/88653fc34823633fbad1e7e9b7dffbbce8e27a36
---
 .../Language/Legacy/ParserTestBase.cs         | 130 +++---------------
 .../Language/SyntaxTreeVerifier.cs            |  29 +++-
 2 files changed, 44 insertions(+), 115 deletions(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 80287a2f9e..522fa00289 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -4,16 +4,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading;
-using System.Text;
 using Xunit;
 using Xunit.Sdk;
-using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -175,44 +172,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return Regex.Replace(content, "(?<!\r)\n", "\r\n", RegexOptions.None, TimeSpan.FromSeconds(10));
         }
 
-        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true)
+        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true, bool ensureFullFidelity = true)
         {
             if (verifySyntaxTree)
             {
-                SyntaxTreeVerifier.Verify(syntaxTree);
+                SyntaxTreeVerifier.Verify(syntaxTree, ensureFullFidelity);
             }
 
             AssertSyntaxTreeNodeMatchesBaseline(syntaxTree);
         }
 
-        internal RazorSyntaxTree ParseBlock(string document, bool designTime)
-        {
-            return ParseBlock(RazorLanguageVersion.Latest, document, designTime);
-        }
-
-        internal RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, bool designTime)
-        {
-            return ParseBlock(version, document, null, designTime);
-        }
-
-        internal RazorSyntaxTree ParseBlock(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
-        {
-            return ParseBlock(RazorLanguageVersion.Latest, document, directives, designTime);
-        }
-
         internal abstract RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime);
 
-        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
-        {
-            return ParseDocument(RazorLanguageVersion.Latest, document, designTime, featureFlags);
-        }
-
-        internal RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
-        {
-            return ParseDocument(version, document, null, designTime, featureFlags);
-        }
-
-        internal RazorSyntaxTree ParseDocument(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
+        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, IEnumerable<DirectiveDescriptor> directives = null, RazorParserFeatureFlags featureFlags = null)
         {
             return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime, featureFlags);
         }
@@ -271,11 +243,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return syntaxTree;
         }
 
-        internal RazorSyntaxTree ParseCodeBlock(string document, bool designTime = false)
-        {
-            return ParseCodeBlock(RazorLanguageVersion.Latest, document, Enumerable.Empty<DirectiveDescriptor>(), designTime);
-        }
-
         internal virtual RazorSyntaxTree ParseCodeBlock(
             RazorLanguageVersion version,
             string document,
@@ -306,86 +273,39 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         internal virtual void ParseBlockTest(string document)
         {
-            ParseBlockTest(document, null, false, new RazorDiagnostic[0]);
+            ParseBlockTest(document, null, false);
         }
 
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives)
+        internal virtual void ParseBlockTest(string document, bool designTime)
         {
-            ParseBlockTest(document, directives, null);
-        }
-
-        internal virtual void ParseBlockTest(string document, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(document, false, expectedErrors);
-        }
-
-        internal virtual void ParseBlockTest(string document, bool designTime, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(document, null, designTime, expectedErrors);
+            ParseBlockTest(document, null, designTime);
         }
 
         internal virtual void ParseBlockTest(RazorLanguageVersion version, string document)
         {
-            ParseBlockTest(version, document, false, null);
+            ParseBlockTest(version, document, false);
         }
 
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives)
         {
-            ParseBlockTest(document, directives, false, expectedErrors);
+            ParseBlockTest(document, directives, false);
         }
 
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, bool designTime, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, bool designTime)
         {
-            ParseBlockTest(version, document, null, designTime, expectedErrors);
+            ParseBlockTest(version, document, null, designTime);
         }
 
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
         {
-            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime, expectedErrors);
+            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime);
         }
 
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
         {
             var result = ParseBlock(version, document, directives, designTime);
 
-            BaselineTest(result);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document)
-        {
-            SingleSpanBlockTest(document, default, default);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
-        {
-            SingleSpanBlockTest(document, blockKind, spanType, acceptedCharacters, expectedError: null);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
-        {
-            SingleSpanBlockTest(document, spanContent, blockKind, spanType, acceptedCharacters, expectedErrors: null);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, params RazorDiagnostic[] expectedError)
-        {
-            SingleSpanBlockTest(document, document, blockKind, spanType, expectedError);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockKindInternal blockKind, SpanKindInternal spanType, params RazorDiagnostic[] expectedErrors)
-        {
-            SingleSpanBlockTest(document, spanContent, blockKind, spanType, AcceptedCharactersInternal.Any, expectedErrors ?? new RazorDiagnostic[0]);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters, params RazorDiagnostic[] expectedError)
-        {
-            SingleSpanBlockTest(document, document, blockKind, spanType, acceptedCharacters, expectedError);
-        }
-
-        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters, params RazorDiagnostic[] expectedErrors)
-        {
-            var result = ParseBlock(document, designTime: false);
-
-            BaselineTest(result);
+            BaselineTest(result, ensureFullFidelity: false);
         }
 
         internal virtual void ParseDocumentTest(string document)
@@ -393,14 +313,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(document, null, false);
         }
 
-        internal virtual void ParseDocumentTest(string document, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives)
         {
-            ParseDocumentTest(document, false, expectedErrors);
-        }
-
-        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseDocumentTest(document, directives, false, expectedErrors);
+            ParseDocumentTest(document, directives, false);
         }
 
         internal virtual void ParseDocumentTest(string document, bool designTime)
@@ -408,14 +323,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(document, null, designTime);
         }
 
-        internal virtual void ParseDocumentTest(string document, bool designTime, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
         {
-            ParseDocumentTest(document, null, designTime, expectedErrors);
-        }
-
-        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
-        {
-            var result = ParseDocument(document, directives, designTime);
+            var result = ParseDocument(document, designTime, directives);
 
             BaselineTest(result);
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
index fee17d1368..f4f416616c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
@@ -2,20 +2,37 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     // Verifies recursively that a syntax tree has no gaps in terms of position/location.
     internal class SyntaxTreeVerifier
     {
-        public static void Verify(RazorSyntaxTree syntaxTree)
+        public static void Verify(RazorSyntaxTree syntaxTree, bool ensureFullFidelity = true)
         {
-            new Verifier(syntaxTree.Source).Visit(syntaxTree.Root);
+            var verifier = new Verifier(syntaxTree.Source);
+            verifier.Visit(syntaxTree.Root);
+
+            if (ensureFullFidelity)
+            {
+                var syntaxTreeString = syntaxTree.Root.ToFullString();
+                var builder = new StringBuilder(syntaxTree.Source.Length);
+                for (var i = 0; i < syntaxTree.Source.Length; i++)
+                {
+                    builder.Append(syntaxTree.Source[i]);
+                }
+                var sourceString = builder.ToString();
+
+                // Make sure the syntax tree contains all of the text in the document.
+                Assert.Equal(sourceString, syntaxTreeString);
+            }
         }
 
-        private class Verifier : SyntaxRewriter
+        private class Verifier : SyntaxWalker
         {
             private readonly SourceLocationTracker _tracker;
             private readonly RazorSourceDocument _source;
@@ -26,7 +43,9 @@ namespace Microsoft.AspNetCore.Razor.Language
                 _source = source;
             }
 
-            public override SyntaxNode VisitToken(SyntaxToken token)
+            public SourceLocationTracker SourceLocationTracker => _tracker;
+
+            public override void VisitToken(SyntaxToken token)
             {
                 if (token != null && !token.IsMissing && token.Kind != SyntaxKind.Marker)
                 {
@@ -39,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                     _tracker.UpdateLocation(token.Content);
                 }
 
-                return base.VisitToken(token);
+                base.VisitToken(token);
             }
         }
     }

From 95419383271d581e2de102025c7cfe0a8910ac8d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 11 Jan 2019 12:39:35 -0800
Subject: [PATCH 050/337] Fix A VS issue

The issue here is that the downlevel SDK (2.1/2.2) don't define the
component-related targets needed for the component design time build.
Depending on the ordering of targets, this can break all features in VS
that depend on the design-time build.

Since we want this to noop in those cases, the best fix is to make our
targets depend on a target property that will be empty in the downlevel
SDKS, but will contain our targets in the 3.0 SDK.

(cherry picked from commit dotnet/aspnetcore-tooling@b88b32c73ac823febf2319690e5b7ff9f23e9e28)
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/1c4b19ae88c4a4f53671b85f8afb0a6c32c0efbf
---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets   | 16 +++++++++++++---
 .../Sdk.Razor.CurrentVersion.props               |  9 +++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index a1b33cf7cc..29d5e8ea4c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -74,16 +74,26 @@ Copyright (c) .NET Foundation. All rights reserved.
     Returns="@(RazorGenerateWithTargetPath)">
   </Target>
 
+  <!--
+    Using DependsOnTargets here because real dependencies of this target aren't defined in
+    a downlevel (pre-3.0) SDK.
+  -->
   <Target 
     Name="RazorGenerateComponentDesignTime" 
-    DependsOnTargets="ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
+    DependsOnTargets="$(_RazorGenerateComponentDesignTimeDependsOn)" 
     Returns="@(RazorComponentWithTargetPath)">
   </Target>
 
-  <!-- Called by the project system to update generated declaration files -->
+
+  <!--
+    Using DependsOnTargets here because real dependencies of this target aren't defined in
+    a downlevel (pre-3.0) SDK.
+
+    Called by the project system to update generated declaration files
+  -->
   <Target 
     Name="RazorGenerateComponentDeclarationDesignTime" 
-    DependsOnTargets="ResolveRazorConfiguration;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths;RazorGenerateComponentDeclaration">
+    DependsOnTargets="$(_RazorGenerateComponentDeclarationDesignTimeDependsOn)">
   </Target>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 71100e6541..aa0a8da485 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -78,4 +78,13 @@ Copyright (c) .NET Foundation. All rights reserved.
     <None Remove="**\*.razor" />
   </ItemGroup>
 
+  <!-- 
+    Wire-ups for design-time build targets. These have to be here because the design time targetes need to exist
+    on a downlevel SDK which doesn't have components support.
+  -->
+  <PropertyGroup>
+    <_RazorGenerateComponentDeclarationDesignTimeDependsOn>ResolveRazorConfiguration;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths;RazorGenerateComponentDeclaration</_RazorGenerateComponentDeclarationDesignTimeDependsOn>
+    <_RazorGenerateComponentDesignTimeDependsOn>ResolveRazorComponentInputs;AssignRazorComponentTargetPaths</_RazorGenerateComponentDesignTimeDependsOn>
+  </PropertyGroup>
+
 </Project>

From d5e9a153c736816c954b74d90147819a80b3de60 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 14 Jan 2019 11:59:37 -0800
Subject: [PATCH 051/337] Correctly handle whitespace that precedes a Razor
 directive (dotnet/aspnetcore-tooling#117)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/15556c8ff3a15c41794c45a2d8fe31adf8bbd94d
---
 .../src/Components/ComponentWhitespacePass.cs | 18 +------
 .../src/Legacy/CSharpCodeParser.cs            | 51 +++++++++++++++----
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
index 0cc0e117e9..2713f96de8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
@@ -77,11 +77,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         break;
 
                     case CSharpCodeIntermediateNode codeIntermediateNode:
-                        // A C# code node could be empty. We can't remove them, but we can skip them. 
                         shouldRemoveNode = false;
-                        shouldContinueIteration = 
-                            IsEmpty(codeIntermediateNode) || 
-                            ComponentDocumentClassifierPass.IsBuildRenderTreeBaseCall(codeIntermediateNode);
+                        shouldContinueIteration = ComponentDocumentClassifierPass.IsBuildRenderTreeBaseCall(codeIntermediateNode);
                         break;
 
                     default:
@@ -113,18 +110,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Forwards,
             Backwards
         }
-
-        private static bool IsEmpty(CSharpCodeIntermediateNode node)
-        {
-            for (var i = 0; i < node.Children.Count; i++)
-            {
-                if (!(node.Children[i] is IntermediateToken token && string.IsNullOrWhiteSpace(token.Content)))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index e63c1dbe90..bfdcbad2aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -124,9 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     NextToken();
 
-                    // Unless changed, the block is a statement block
-                    AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                    builder.Add(OutputTokensAsStatementLiteral());
+                    var precedingWhitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
 
                     // We are usually called when the other parser sees a transition '@'. Look for it.
                     SyntaxToken transitionToken = null;
@@ -157,20 +155,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                     if (At(SyntaxKind.LeftBrace))
                     {
+                        // This is a statement. We want to preserve preceding whitespace in the output.
+                        Accept(precedingWhitespace);
+                        builder.Add(OutputTokensAsStatementLiteral());
+
                         var statementBody = ParseStatementBody();
                         var statement = SyntaxFactory.CSharpStatement(transition, statementBody);
                         builder.Add(statement);
                     }
                     else if (At(SyntaxKind.LeftParenthesis))
                     {
+                        // This is an explicit expression. We want to preserve preceding whitespace in the output.
+                        Accept(precedingWhitespace);
+                        builder.Add(OutputTokensAsStatementLiteral());
+
                         var expressionBody = ParseExplicitExpressionBody();
                         var expression = SyntaxFactory.CSharpExplicitExpression(transition, expressionBody);
                         builder.Add(expression);
                     }
                     else if (At(SyntaxKind.Identifier))
                     {
-                        if (!TryParseDirective(builder, transition, CurrentToken.Content))
+                        if (!TryParseDirective(builder, precedingWhitespace, transition, CurrentToken.Content))
                         {
+                            // Not a directive.
+                            // This is an implicit expression. We want to preserve preceding whitespace in the output.
+                            Accept(precedingWhitespace);
+                            builder.Add(OutputTokensAsStatementLiteral());
+
                             if (string.Equals(
                                 CurrentToken.Content,
                                 SyntaxConstants.CSharp.HelperKeyword,
@@ -189,9 +200,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                     else if (At(SyntaxKind.Keyword))
                     {
-                        if (!TryParseDirective(builder, transition, CurrentToken.Content) &&
-                            !TryParseKeyword(builder, transition))
+                        if (!TryParseDirective(builder, precedingWhitespace, transition, CurrentToken.Content) &&
+                            !TryParseKeyword(builder, precedingWhitespace, transition))
                         {
+                            // Not a directive or keyword.
+                            // This is an implicit expression. We want to preserve preceding whitespace in the output.
+                            Accept(precedingWhitespace);
+                            builder.Add(OutputTokensAsStatementLiteral());
+
                             // Not a directive or a special keyword. Just parse as an implicit expression.
                             var implicitExpressionBody = ParseImplicitExpressionBody();
                             var implicitExpression = SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody);
@@ -202,7 +218,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                     else
                     {
-                        // Invalid character
+                        // Invalid character after transition.
+                        // Preserve the preceding whitespace in the output
+                        Accept(precedingWhitespace);
+                        builder.Add(OutputTokensAsStatementLiteral());
+
                         SpanContext.ChunkGenerator = new ExpressionChunkGenerator();
                         SpanContext.EditHandler = new ImplicitExpressionEditHandler(
                             Language.TokenizeString,
@@ -616,7 +636,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         ParseCodeBlock(builder, block);
                         break;
                     case SyntaxKind.Keyword:
-                        if (!TryParseKeyword(builder, transition: null))
+                        if (!TryParseKeyword(builder, whitespace: null, transition: null))
                         {
                             ParseStandardStatement(builder);
                         }
@@ -797,10 +817,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        protected bool TryParseDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, string directive)
+        protected bool TryParseDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, IEnumerable<SyntaxToken> whitespace, CSharpTransitionSyntax transition, string directive)
         {
             if (_directiveParserMap.TryGetValue(directive, out var handler))
             {
+                // This is a directive. We don't want to generate the preceding whitespace in the output.
+                Accept(whitespace);
+                builder.Add(OutputTokensAsEphemeralLiteral());
+
                 SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
                 handler(builder, transition);
                 return true;
@@ -1544,12 +1568,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder, IEnumerable<SyntaxToken> whitespace, CSharpTransitionSyntax transition)
         {
             var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
             Debug.Assert(CurrentToken.Kind == SyntaxKind.Keyword && result.HasValue);
             if (_keywordParserMap.TryGetValue(result.Value, out var handler))
             {
+                if (whitespace != null)
+                {
+                    // This is a keyword. We want to preserve preceding whitespace in the output.
+                    Accept(whitespace);
+                    builder.Add(OutputTokensAsStatementLiteral());
+                }
+
                 handler(builder, transition);
                 return true;
             }

From 56695d17c98acfd3356dac358aeef4b1aceb6a5d Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 14 Jan 2019 14:17:22 -0800
Subject: [PATCH 052/337] Set ParserContext.StartOfLine to true when parsing
 starts (dotnet/aspnetcore-tooling#116)

* Set ParserContext.StartOfLine to true when parsing starts

* Missed baselines
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a80c3a981aa332bb9b1ed77e09214c04cc1abf8b
---
 .../IncompleteDirectives_DesignTime.ir.txt                  | 4 ++--
 .../IncompleteDirectives_DesignTime.ir.txt                  | 4 ++--
 .../IncompleteDirectives_Runtime.codegen.cs                 | 4 ++--
 .../IncompleteDirectives_Runtime.ir.txt                     | 6 +++---
 .../IncompleteDirectives_DesignTime.ir.txt                  | 4 ++--
 .../IncompleteDirectives_Runtime.codegen.cs                 | 2 +-
 .../IncompleteDirectives_Runtime.ir.txt                     | 4 ++--
 .../src/Legacy/ParserContext.cs                             | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index 3a6d24fc1e..b39482f802 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -34,8 +34,8 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
-                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
                     DirectiveToken - (93:2,6 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index 2aeddc2fa2..bafb3e68a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -38,8 +38,8 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
-                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
                 MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
index 743eed291e..25d746e332 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -19,8 +19,8 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(83, 4, true);
-            WriteLiteral("\r\n\r\n");
+            BeginContext(85, 2, true);
+            WriteLiteral("\r\n");
             EndContext();
             BeginContext(108, 5, true);
             WriteLiteral("\"\r\n\r\n");
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index bd3bdd87e2..1b5f45c4bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -14,9 +14,9 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(83, 4, true);
-                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
-                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                    IntermediateToken -  - CSharp - BeginContext(85, 2, true);
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index 2aeddc2fa2..bafb3e68a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -38,8 +38,8 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
-                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
                 MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
index 890a758536..fa72740aa3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            WriteLiteral("\r\n\r\n");
+            WriteLiteral("\r\n");
             WriteLiteral("\"\r\n\r\n");
             WriteLiteral("\r\n");
             WriteLiteral("\r\n\r\n");
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index ee2a61fcb4..54ba239858 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -11,8 +11,8 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
-                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
                 MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
index 47799e94e9..e976191f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserContext.cs
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public bool InTemplateContext { get; set; }
 
-        public bool StartOfLine { get; set; }
+        public bool StartOfLine { get; set; } = true;
 
         public AcceptedCharactersInternal LastAcceptedCharacters { get; set; } = AcceptedCharactersInternal.None;
 

From 148bc99cce07b26f3516882515849c5430103857 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 14 Jan 2019 10:07:08 -0800
Subject: [PATCH 053/337] Use a property to allow specifying component globbing
 pattern

Workaround for https://github.com/aspnet/AspNetCore/issues/6500
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/cee02237329f71823d54572c8fe79f2a9ea0d3c1
---
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets    | 3 ++-
 .../test/testassets/ComponentLibrary/ComponentLibrary.csproj | 5 +----
 .../testassets/MvcWithComponents/MvcWithComponents.csproj    | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index a4cb71a514..245a4e0143 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -369,7 +369,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup Condition="'$(EnableDefaultRazorGenerateItems)'=='true'">
       <RazorGenerate
         Include="@(Content)"
-        Exclude="@(RazorComponent)"
+        Exclude="$(_RazorComponentInclude)"
         Condition="'%(Content.Extension)'=='.cshtml'" />
     </ItemGroup>
 
@@ -406,6 +406,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ItemGroup Condition="'$(EnableDefaultRazorComponentItems)'=='true'">
       <RazorComponent Include="@(Content)" Condition="'%(Content.Extension)'=='.razor'" />
+      <RazorComponent Include="$(_RazorComponentInclude)" />
     </ItemGroup>
   </Target>
 
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index 077e7ae96b..0aca4f7bc1 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -2,6 +2,7 @@
   
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,10 +28,6 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <RazorComponent Include="**/*.cshtml" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectCapability Include="DotNetCoreRazorConfiguration" />
   </ItemGroup>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 1d3cf1b9ed..9de30c05d9 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <_RazorComponentInclude>Components\**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -29,10 +30,6 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <RazorComponent Include="Components/**/*.cshtml" />
-  </ItemGroup>
-
   <!-- Test Placeholder -->
 
 </Project>

From 40633dde21a1ce42bb56f762ca8f74ca0c1cd512 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 14 Jan 2019 08:24:20 -0800
Subject: [PATCH 054/337] Add attribute only bindings and fix
 dotnet/aspnetcore-tooling#6373

Adds a new API for WTE to call given a TagHelperBinding to determine if
the binding should colorize/classify only the attributes of the HTML
element in source code. This is driven by a new metadata item that the
Components 'directive attributes' all set. There's no way for a user to
access this feature via tag helpers currently, but it could be added
easily in the future.

Also fixing dotnet/aspnetcore-tooling#6376 while I'm in there. :+1:
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/df449beea9085221a1ba75ee61dcfbd2beb3aa34
---
 .../src/Legacy/TagHelperBlockRewriter.cs      |  2 +-
 .../src/Legacy/TagHelperParseTreeRewriter.cs  |  4 +-
 .../src/TagHelperBinding.cs                   | 46 +++++++++++++++++--
 .../src/TagHelperMetadata.cs                  |  2 +
 .../src/BindTagHelperDescriptorProvider.cs    |  2 +
 ...EventHandlerTagHelperDescriptorProvider.cs |  2 +-
 .../src/RefTagHelperDescriptorProvider.cs     | 15 ++++++
 .../BindTagHelperDescriptorProviderTest.cs    |  2 +
 ...tHandlerTagHelperDescriptorProviderTest.cs |  5 +-
 .../RefTagHelperDescriptorProviderTest.cs     |  3 ++
 10 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index fefcf4aeee..23a0a488a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             foreach (var descriptor in bindingResult.Descriptors)
             {
-                var boundRules = bindingResult.GetBoundRules(descriptor);
+                var boundRules = bindingResult.Mappings[descriptor];
                 var nonDefaultRule = boundRules.FirstOrDefault(rule => rule.TagStructure != TagStructure.Unspecified);
 
                 if (nonDefaultRule?.TagStructure == TagStructure.WithoutEndTag)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 47f96d7d3b..1619f42240 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -336,7 +336,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                     foreach (var descriptor in tagHelperBinding.Descriptors)
                     {
-                        var boundRules = tagHelperBinding.GetBoundRules(descriptor);
+                        var boundRules = tagHelperBinding.Mappings[descriptor];
                         var invalidRule = boundRules.FirstOrDefault(rule => rule.TagStructure == TagStructure.WithoutEndTag);
 
                         if (invalidRule != null)
@@ -456,7 +456,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 TagStructure? baseStructure = null;
                 foreach (var descriptor in bindingResult.Descriptors)
                 {
-                    var boundRules = bindingResult.GetBoundRules(descriptor);
+                    var boundRules = bindingResult.Mappings[descriptor];
                     foreach (var rule in boundRules)
                     {
                         if (rule.TagStructure != TagStructure.Unspecified)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs
index a5590c536e..4b88cf5b12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperBinding.cs
@@ -1,14 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     public sealed class TagHelperBinding
     {
-        private IReadOnlyDictionary<TagHelperDescriptor, IReadOnlyList<TagMatchingRuleDescriptor>> _mappings;
-
         internal TagHelperBinding(
             string tagName,
             IReadOnlyList<KeyValuePair<string, string>> attributes,
@@ -19,12 +18,42 @@ namespace Microsoft.AspNetCore.Razor.Language
             TagName = tagName;
             Attributes = attributes;
             ParentTagName = parentTagName;
+            Mappings = mappings;
             TagHelperPrefix = tagHelperPrefix;
 
-            _mappings = mappings;
         }
 
-        public IEnumerable<TagHelperDescriptor> Descriptors => _mappings.Keys;
+        public IEnumerable<TagHelperDescriptor> Descriptors => Mappings.Keys;
+
+        /// <summary>
+        /// Gets a value that indicates whether the the binding matched on attributes only.
+        /// </summary>
+        /// <returns><c>false</c> if the entire element should be classified as a tag helper.</returns>
+        /// <remarks>
+        /// If this returns <c>true</c>, use <c>TagHelperFactsService.GetBoundTagHelperAttributes</c> to find the 
+        /// set of attributes that should be considered part of the match.
+        /// </remarks>
+        public bool IsAttributeMatch
+        {
+            get
+            {
+                foreach (var descriptor in Mappings.Keys)
+                {
+                    if (!descriptor.Metadata.TryGetValue(TagHelperMetadata.Common.ClassifyAttributesOnly, out var value) ||
+                        !string.Equals(value, bool.TrueString, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return false;
+                    }
+                }
+
+                // All the matching tag helpers want to be classified with **attributes only**.
+                //
+                // Ex: (components)
+                //
+                //      <button onclick="..." />
+                return true;
+            }
+        }
 
         public string TagName { get; }
 
@@ -32,11 +61,18 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public IReadOnlyList<KeyValuePair<string, string>> Attributes { get; }
 
+        public IReadOnlyDictionary<TagHelperDescriptor, IReadOnlyList<TagMatchingRuleDescriptor>> Mappings { get; }
+
         public string TagHelperPrefix { get; }
 
         public IReadOnlyList<TagMatchingRuleDescriptor> GetBoundRules(TagHelperDescriptor descriptor)
         {
-            return _mappings[descriptor];
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            return Mappings[descriptor];
         }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs
index e53f471a57..f1cf98ebd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMetadata.cs
@@ -10,6 +10,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             public static readonly string PropertyName = "Common.PropertyName";
 
             public static readonly string TypeName = "Common.TypeName";
+
+            public static readonly string ClassifyAttributesOnly = "Common.ClassifyAttributesOnly";
         }
 
         public static class Runtime
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 02bf8e3fcf..4310a9f24e 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -121,6 +121,7 @@ namespace Microsoft.CodeAnalysis.Razor
             builder.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
 
             builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+            builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
             builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
             builder.Metadata[BlazorMetadata.Bind.FallbackKey] = bool.TrueString;
 
@@ -257,6 +258,7 @@ namespace Microsoft.CodeAnalysis.Razor
                     entry.ChangeAttribute);
 
                 builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+                builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
                 builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
                 builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = entry.ValueAttribute;
                 builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = entry.ChangeAttribute;
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 17ed23ae1b..370702706f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -35,7 +35,6 @@ namespace Microsoft.CodeAnalysis.Razor
                 return;
             }
 
-
             var eventHandlerData = GetEventHandlerData(compilation);
 
             foreach (var tagHelper in CreateEventHandlerTagHelpers(eventHandlerData))
@@ -112,6 +111,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
                 builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.EventHandler.TagHelperKind);
                 builder.Metadata.Add(BlazorMetadata.EventHandler.EventArgsType, entry.EventArgsType.ToDisplayString());
+                builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
                 builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.EventHandler.RuntimeName;
 
                 // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index 858f9428d7..735269334f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -21,6 +21,20 @@ namespace Microsoft.CodeAnalysis.Razor
                 throw new ArgumentNullException(nameof(context));
             }
 
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                return;
+            }
+
+            var elementRef = compilation.GetTypeByMetadataName(ComponentsApi.ElementRef.FullTypeName);
+            if (elementRef == null)
+            {
+                // If we can't find ElementRef, then just bail. We won't be able to compile the
+                // generated code anyway.
+                return;
+            }
+
             context.Results.Add(CreateRefTagHelper());
         }
 
@@ -30,6 +44,7 @@ namespace Microsoft.CodeAnalysis.Razor
             builder.Documentation = ComponentResources.RefTagHelper_Documentation;
 
             builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Ref.TagHelperKind);
+            builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
             builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Ref.RuntimeName;
 
             // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 5551fcdf53..9c28a2be24 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -207,6 +207,7 @@ namespace Test
             Assert.Empty(bind.Diagnostics);
             Assert.False(bind.HasErrors);
             Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(bool.TrueString, bind.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
             Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
@@ -571,6 +572,7 @@ namespace Test
             Assert.Empty(bind.Diagnostics);
             Assert.False(bind.HasErrors);
             Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(bool.TrueString, bind.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
             Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index f2f18c1997..c0140ebbcd 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -4,10 +4,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Razor;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Language.Components
+namespace Microsoft.CodeAnalysis.Razor
 {
     public class EventHandlerTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
     {
@@ -52,6 +52,7 @@ namespace Test
             Assert.Empty(item.Diagnostics);
             Assert.False(item.HasErrors);
             Assert.Equal(BlazorMetadata.EventHandler.TagHelperKind, item.Kind);
+            Assert.Equal(bool.TrueString, item.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
             Assert.Equal(BlazorMetadata.EventHandler.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index 0c6939336a..fa47fce6b7 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -15,6 +15,8 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             // Arrange
             var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(BaseCompilation);
+
             var provider = new RefTagHelperDescriptorProvider();
 
             // Act
@@ -29,6 +31,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.Empty(item.Diagnostics);
             Assert.False(item.HasErrors);
             Assert.Equal(BlazorMetadata.Ref.TagHelperKind, item.Kind);
+            Assert.Equal(bool.TrueString, item.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
             Assert.Equal(BlazorMetadata.Ref.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());

From ceb4d0853afe572a7b4688b647d7cf1a38d673b1 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 15 Jan 2019 15:26:44 -0800
Subject: [PATCH 055/337] Some minor cleanup (dotnet/aspnetcore-tooling#123)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/97930b91f8040d121dce3407256cb086465591c9
---
 ...faultRazorIntermediateNodeLoweringPhase.cs | 62 ++++++++++++-------
 .../src/Syntax/SyntaxNodeExtensions.cs        |  2 +-
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index b92fea9890..395dc97d11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -751,7 +751,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                 var context = node.GetSpanContext();
                 if (context != null && context.ChunkGenerator == SpanChunkGenerator.Null)
                 {
-                    base.VisitMarkupTextLiteral(node);
                     return;
                 }
 
@@ -763,11 +762,48 @@ namespace Microsoft.AspNetCore.Razor.Language
                         token.Content.Length == 0)
                     {
                         // We don't want to create IR nodes for marker tokens.
-                        base.VisitMarkupTextLiteral(node);
                         return;
                     }
                 }
 
+                VisitHtmlContent(node);
+            }
+
+            public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
+            {
+                if (node.IsMarkupTransition)
+                {
+                    // No need to visit <text> tags.
+                    return;
+                }
+
+                foreach (var child in node.Children)
+                {
+                    Visit(child);
+                }
+            }
+
+            public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
+            {
+                if (node.IsMarkupTransition)
+                {
+                    // No need to visit </text> tags.
+                    return;
+                }
+
+                foreach (var child in node.Children)
+                {
+                    Visit(child);
+                }
+            }
+
+            private void VisitHtmlContent(SyntaxNode node)
+            {
+                if (node == null || (node is SyntaxToken token && token.IsMissing))
+                {
+                    return;
+                }
+
                 var source = BuildSourceSpanFromNode(node);
                 var currentChildren = _builder.Current.Children;
                 if (currentChildren.Count > 0 && currentChildren[currentChildren.Count - 1] is HtmlContentIntermediateNode)
@@ -777,7 +813,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                     if (existingHtmlContent.Source == null && source == null)
                     {
                         Combine(existingHtmlContent, node);
-                        base.VisitMarkupTextLiteral(node);
                         return;
                     }
 
@@ -787,7 +822,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                         existingHtmlContent.Source.Value.AbsoluteIndex + existingHtmlContent.Source.Value.Length == source.Value.AbsoluteIndex)
                     {
                         Combine(existingHtmlContent, node);
-                        base.VisitMarkupTextLiteral(node);
                         return;
                     }
                 }
@@ -806,24 +840,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                 });
 
                 _builder.Pop();
-
-                base.VisitMarkupTextLiteral(node);
-            }
-
-            public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
-            {
-                foreach (var child in node.Children)
-                {
-                    Visit(child);
-                }
-            }
-
-            public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
-            {
-                foreach (var child in node.Children)
-                {
-                    Visit(child);
-                }
             }
 
             public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
@@ -1140,7 +1156,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 // just process the attributes.
                 //
                 // Visit the attributes
-                foreach (var block in node.Children)
+                foreach (var block in node.Attributes)
                 {
                     if (block is MarkupAttributeBlockSyntax attribute)
                     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index 1b916ea75e..626eac6d29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -216,7 +216,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 throw new ArgumentNullException(nameof(node));
             }
 
-            var tokens = node.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>();
+            var tokens = node.DescendantNodesAndSelf().Where(n => n.IsToken).Cast<SyntaxToken>();
             var content = string.Concat(tokens.Select(t => t.Content));
             return content;
         }

From 7eb90cbbbd1807898d8ba33923a92508823f683f Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 15 Jan 2019 15:07:18 -0800
Subject: [PATCH 056/337] Remove obsolete RazorProject ViewEngine based create
 method.

aspnet/AspNetCoredotnet/aspnetcore-tooling#4876
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/57df0ea9cf71b3424de8b32bcf6e79e7453b57a5
---
 .../src/RazorProject.cs                               | 11 -----------
 .../src/RazorProjectFileSystem.cs                     |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
index 74b772e142..931d38abc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
@@ -123,16 +123,5 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             return path;
         }
-
-        /// <summary>
-        /// Create a Razor project based on a physical file system.
-        /// </summary>
-        /// <param name="rootDirectoryPath">The directory to root the file system at.</param>
-        /// <returns>A <see cref="RazorProject"/></returns>
-        [Obsolete("This method is obsolete and will be removed in a future version. Please use " + nameof(RazorProjectFileSystem) + "." + nameof(RazorProjectFileSystem.Create) + " instead.")]
-        public static RazorProject Create(string rootDirectoryPath)
-        {
-            return new DefaultRazorProjectFileSystem(rootDirectoryPath);
-        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs
index 799c6bda65..384516d2ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectFileSystem.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         /// <param name="rootDirectoryPath">The directory to root the file system at.</param>
         /// <returns>A <see cref="RazorProjectFileSystem"/></returns>
-        public new static RazorProjectFileSystem Create(string rootDirectoryPath)
+        public static RazorProjectFileSystem Create(string rootDirectoryPath)
         {
             if (string.IsNullOrEmpty(rootDirectoryPath))
             {

From 439349899b0e069f1df01c17602396a4e25692ca Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 15 Jan 2019 14:53:20 -0800
Subject: [PATCH 057/337] Prioritize local dotnet when running SDK Razor tests.

- The SDK tests were occasionally failing with access denied due to the test using the machines dotnet.exe (instead of the local projects dotnet.exe).

dotnet/aspnetcore-tooling#1667
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/bb2134a536f7fd5aeec4466cde3ba3e891f78af2
---
 .../test/IntegrationTests/MSBuildProcessManager.cs             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index 30b8469289..c420b47bb8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
@@ -38,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
             else
             {
-                processStartInfo.FileName = "dotnet";
+                processStartInfo.FileName = DotNetMuxer.MuxerPathOrDefault();
                 processStartInfo.Arguments = $"msbuild {arguments}";
             }
 

From 060c8e63b1a849caed775463700c22d30ef43710 Mon Sep 17 00:00:00 2001
From: NTaylorMullen <nimullen@microsoft.com>
Date: Wed, 16 Jan 2019 14:12:39 -0800
Subject: [PATCH 058/337] Remove RazorTemplateEngine and friends.

- Also nuked tests and resource entries specific to the template engine.

Addresses aspnet/AspNetCoredotnet/aspnetcore-tooling#5079
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d5f0b4c0b4e48e14ce235036af67623290218372
---
 .../src/MvcRazorTemplateEngine.cs             |  60 -----
 .../test/MvcRazorTemplateEngineTest.cs        |  94 -------
 .../src/MvcRazorTemplateEngine.cs             |  62 -----
 .../test/MvcRazorTemplateEngineTest.cs        |  97 -------
 .../src/Properties/Resources.Designer.cs      |  14 -
 .../src/RazorTemplateEngine.cs                | 241 ------------------
 .../src/RazorTemplateEngineOptions.cs         |  21 --
 .../src/Resources.resx                        |   3 -
 8 files changed, 592 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs
deleted file mode 100644
index 497d173e4e..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/MvcRazorTemplateEngine.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.IO;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
-{
-    /// <summary>
-    /// A <see cref="RazorTemplateEngine"/> for Mvc Razor views.
-    /// </summary>
-    public class MvcRazorTemplateEngine : RazorTemplateEngine
-    {
-        /// <summary>
-        /// Initializes a new instance of <see cref="MvcRazorTemplateEngine"/>.
-        /// </summary>
-        /// <param name="engine">The <see cref="RazorEngine"/>.</param>
-        /// <param name="project">The <see cref="RazorProject"/>.</param>
-        public MvcRazorTemplateEngine(
-            RazorEngine engine,
-            RazorProject project)
-            : base(engine, project)
-        {
-            Options.ImportsFileName = "_ViewImports.cshtml";
-            Options.DefaultImports = GetDefaultImports();
-        }
-
-        public override RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem)
-        {
-            return base.CreateCodeDocument(projectItem);
-        }
-
-        // Internal for testing.
-        internal static RazorSourceDocument GetDefaultImports()
-        {
-            using (var stream = new MemoryStream())
-            using (var writer = new StreamWriter(stream, Encoding.UTF8))
-            {
-                writer.WriteLine("@using System");
-                writer.WriteLine("@using System.Collections.Generic");
-                writer.WriteLine("@using System.Linq");
-                writer.WriteLine("@using System.Threading.Tasks");
-                writer.WriteLine("@using Microsoft.AspNetCore.Mvc");
-                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.Rendering");
-                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.ViewFeatures");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider");
-                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor");
-                writer.Flush();
-
-                stream.Position = 0;
-                return RazorSourceDocument.ReadFrom(stream, fileName: null, encoding: Encoding.UTF8);
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
deleted file mode 100644
index eca2b8d49b..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcRazorTemplateEngineTest.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
-{
-    public class MvcRazorTemplateEngineTest : RazorProjectEngineTestBase
-    {
-        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_1_1;
-
-        [Fact]
-        public void GetDefaultImports_IncludesDefaultImports()
-        {
-            // Arrange
-            var expectedImports = new[]
-            {
-                "@using System",
-                "@using System.Collections.Generic",
-                "@using System.Linq",
-                "@using System.Threading.Tasks",
-                "@using Microsoft.AspNetCore.Mvc",
-                "@using Microsoft.AspNetCore.Mvc.Rendering",
-                "@using Microsoft.AspNetCore.Mvc.ViewFeatures",
-            };
-            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                CreateProjectEngine().Engine,
-                new TestRazorProjectFileSystem());
-
-            // Act
-            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
-
-            // Assert
-            var importContent = GetContent(imports)
-                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
-                .Where(line => line.StartsWith("@using"));
-            Assert.Equal(expectedImports, importContent);
-        }
-
-        [Fact]
-        public void GetDefaultImports_IncludesDefaulInjects()
-        {
-            // Arrange
-            var expectedImports = new[]
-            {
-                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html",
-                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json",
-                "@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component",
-                "@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url",
-                "@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider",
-            };
-            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                CreateProjectEngine().Engine,
-                new TestRazorProjectFileSystem());
-
-            // Act
-            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
-
-            // Assert
-            var importContent = GetContent(imports)
-                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
-                .Where(line => line.StartsWith("@inject"));
-            Assert.Equal(expectedImports, importContent);
-        }
-
-        [Fact]
-        public void GetDefaultImports_IncludesDefaultTagHelpers()
-        {
-            // Arrange
-            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                CreateProjectEngine().Engine,
-                new TestRazorProjectFileSystem());
-
-            // Act
-            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
-
-            // Assert
-            var importContent = GetContent(imports)
-                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
-                .Where(line => line.StartsWith("@addTagHelper"));
-            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
-        }
-
-        private string GetContent(RazorSourceDocument imports)
-        {
-            var contentChars = new char[imports.Length];
-            imports.CopyTo(0, contentChars, 0, imports.Length);
-            return new string(contentChars);
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs
deleted file mode 100644
index f278b20a45..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcRazorTemplateEngine.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.IO;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    /// <summary>
-    /// A <see cref="RazorTemplateEngine"/> for Mvc Razor views.
-    /// </summary>
-    public class MvcRazorTemplateEngine : RazorTemplateEngine
-    {
-        /// <summary>
-        /// Initializes a new instance of <see cref="MvcRazorTemplateEngine"/>.
-        /// </summary>
-        /// <param name="engine">The <see cref="RazorEngine"/>.</param>
-        /// <param name="project">The <see cref="RazorProject"/>.</param>
-        public MvcRazorTemplateEngine(
-            RazorEngine engine,
-            RazorProject project)
-            : base(engine, project)
-        {
-            Options.ImportsFileName = "_ViewImports.cshtml";
-            Options.DefaultImports = GetDefaultImports();
-        }
-
-        public override RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem)
-        {
-            return base.CreateCodeDocument(projectItem);
-        }
-
-        // Internal for testing.
-        internal static RazorSourceDocument GetDefaultImports()
-        {
-            using (var stream = new MemoryStream())
-            using (var writer = new StreamWriter(stream, Encoding.UTF8))
-            {
-                writer.WriteLine("@using System");
-                writer.WriteLine("@using System.Collections.Generic");
-                writer.WriteLine("@using System.Linq");
-                writer.WriteLine("@using System.Threading.Tasks");
-                writer.WriteLine("@using Microsoft.AspNetCore.Mvc");
-                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.Rendering");
-                writer.WriteLine("@using Microsoft.AspNetCore.Mvc.ViewFeatures");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url");
-                writer.WriteLine("@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider");
-                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor");
-                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor");
-                writer.WriteLine("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor");
-                writer.Flush();
-
-                stream.Position = 0;
-                return RazorSourceDocument.ReadFrom(stream, fileName: null, encoding: Encoding.UTF8);
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
deleted file mode 100644
index c5a25d29aa..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcRazorTemplateEngineTest.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using Microsoft.AspNetCore.Razor.Language;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public class MvcRazorTemplateEngineTest : RazorProjectEngineTestBase
-    {
-        protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_3_0;
-
-        [Fact]
-        public void GetDefaultImports_IncludesDefaultImports()
-        {
-            // Arrange
-            var expectedImports = new[]
-            {
-                "@using System",
-                "@using System.Collections.Generic",
-                "@using System.Linq",
-                "@using System.Threading.Tasks",
-                "@using Microsoft.AspNetCore.Mvc",
-                "@using Microsoft.AspNetCore.Mvc.Rendering",
-                "@using Microsoft.AspNetCore.Mvc.ViewFeatures",
-            };
-
-            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                CreateProjectEngine().Engine,
-                new TestRazorProjectFileSystem());
-
-            // Act
-            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
-
-            // Assert
-            var importContent = GetContent(imports)
-                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
-                .Where(line => line.StartsWith("@using"));
-            Assert.Equal(expectedImports, importContent);
-        }
-
-        [Fact]
-        public void GetDefaultImports_IncludesDefaulInjects()
-        {
-            // Arrange
-            var expectedImports = new[]
-            {
-                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html",
-                "@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json",
-                "@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component",
-                "@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url",
-                "@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider",
-            };
-            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                CreateProjectEngine().Engine,
-                new TestRazorProjectFileSystem());
-
-            // Act
-            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
-
-            // Assert
-            var importContent = GetContent(imports)
-                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
-                .Where(line => line.StartsWith("@inject"));
-            Assert.Equal(expectedImports, importContent);
-        }
-
-        [Fact]
-        public void GetDefaultImports_IncludesDefaultTagHelpers()
-        {
-            // Arrange
-            var mvcRazorTemplateEngine = new MvcRazorTemplateEngine(
-                CreateProjectEngine().Engine,
-                new TestRazorProjectFileSystem());
-
-            // Act
-            var imports = mvcRazorTemplateEngine.Options.DefaultImports;
-
-            // Assert
-            var importContent = GetContent(imports)
-                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
-                .Where(line => line.StartsWith("@addTagHelper"));
-            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
-            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
-            Assert.Contains("@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor", importContent);
-        }
-
-        private string GetContent(RazorSourceDocument imports)
-        {
-            var contentChars = new char[imports.Length];
-            imports.CopyTo(0, contentChars, 0, imports.Length);
-            return new string(contentChars);
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
index c8581e85d8..be43f4d896 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
@@ -1208,20 +1208,6 @@ namespace Microsoft.AspNetCore.Razor.Language
         internal static string FormatRazorProject_PathMustStartWithForwardSlash()
             => GetString("RazorProject_PathMustStartWithForwardSlash");
 
-        /// <summary>
-        /// The item '{0}' could not be found.
-        /// </summary>
-        internal static string RazorTemplateEngine_ItemCouldNotBeFound
-        {
-            get => GetString("RazorTemplateEngine_ItemCouldNotBeFound");
-        }
-
-        /// <summary>
-        /// The item '{0}' could not be found.
-        /// </summary>
-        internal static string FormatRazorTemplateEngine_ItemCouldNotBeFound(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RazorTemplateEngine_ItemCouldNotBeFound"), p0);
-
         /// <summary>
         /// Remove Tag Helpers for use in the current document.
         /// </summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs
deleted file mode 100644
index 298666b56f..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngine.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Razor.Language
-{
-    /// <summary>
-    /// Entry point to parse Razor files and generate code.
-    /// </summary>
-    public class RazorTemplateEngine
-    {
-        private RazorTemplateEngineOptions _options;
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="RazorTemplateEngine"/>.
-        /// </summary>
-        /// <param name="engine">The <see cref="RazorEngine"/>.</param>
-        /// <param name="project">The <see cref="RazorProject"/>.</param>
-        public RazorTemplateEngine(
-            RazorEngine engine,
-            RazorProject project)
-        {
-            if (engine == null)
-            {
-                throw new ArgumentNullException(nameof(engine));
-            }
-
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            Engine = engine;
-            Project = project;
-            _options = new RazorTemplateEngineOptions();
-        }
-
-        /// <summary>
-        /// Gets the <see cref="RazorEngine"/>.
-        /// </summary>
-        public RazorEngine Engine { get; }
-
-        /// <summary>
-        /// Gets the <see cref="RazorProject"/>.
-        /// </summary>
-        public RazorProject Project { get; }
-
-        /// <summary>
-        /// Options to configure <see cref="RazorTemplateEngine"/>.
-        /// </summary>
-        public RazorTemplateEngineOptions Options
-        {
-            get
-            {
-                return _options;
-            }
-            set
-            {
-                _options = value ?? throw new ArgumentNullException(nameof(value));
-            }
-        }
-
-        /// <summary>
-        /// Parses the template specified by the project item <paramref name="path"/>.
-        /// </summary>
-        /// <param name="path">The template path.</param>
-        /// <returns>The <see cref="RazorCSharpDocument"/>.</returns>
-        public RazorCSharpDocument GenerateCode(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
-            }
-
-            var projectItem = Project.GetItem(path);
-            return GenerateCode(projectItem);
-        }
-
-        /// <summary>
-        /// Parses the template specified by <paramref name="projectItem"/>.
-        /// </summary>
-        /// <param name="projectItem">The <see cref="RazorProjectItem"/>.</param>
-        /// <returns>The <see cref="RazorCSharpDocument"/>.</returns>
-        public RazorCSharpDocument GenerateCode(RazorProjectItem projectItem)
-        {
-            if (projectItem == null)
-            {
-                throw new ArgumentNullException(nameof(projectItem));
-            }
-
-            if (!projectItem.Exists)
-            {
-                throw new InvalidOperationException(Resources.FormatRazorTemplateEngine_ItemCouldNotBeFound(projectItem.FilePath));
-            }
-
-            var codeDocument = CreateCodeDocument(projectItem);
-            return GenerateCode(codeDocument);
-        }
-
-        /// <summary>
-        /// Parses the template specified by <paramref name="codeDocument"/>.
-        /// </summary>
-        /// <param name="codeDocument">The <see cref="RazorProjectItem"/>.</param>
-        /// <returns>The <see cref="RazorCSharpDocument"/>.</returns>
-        public virtual RazorCSharpDocument GenerateCode(RazorCodeDocument codeDocument)
-        {
-            if (codeDocument == null)
-            {
-                throw new ArgumentNullException(nameof(codeDocument));
-            }
-
-            Engine.Process(codeDocument);
-            return codeDocument.GetCSharpDocument();
-        }
-
-        /// <summary>
-        /// Generates a <see cref="RazorCodeDocument"/> for the specified <paramref name="path"/>.
-        /// </summary>
-        /// <param name="path">The template path.</param>
-        /// <returns>The created <see cref="RazorCodeDocument"/>.</returns>
-        public virtual RazorCodeDocument CreateCodeDocument(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
-            }
-
-            var projectItem = Project.GetItem(path);
-            return CreateCodeDocument(projectItem);
-        }
-
-        /// <summary>
-        /// Generates a <see cref="RazorCodeDocument"/> for the specified <paramref name="projectItem"/>.
-        /// </summary>
-        /// <param name="projectItem">The <see cref="RazorProjectItem"/>.</param>
-        /// <returns>The created <see cref="RazorCodeDocument"/>.</returns>
-        public virtual RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem)
-        {
-            if (projectItem == null)
-            {
-                throw new ArgumentNullException(nameof(projectItem));
-            }
-
-            if (!projectItem.Exists)
-            {
-                throw new InvalidOperationException(Resources.FormatRazorTemplateEngine_ItemCouldNotBeFound(projectItem.FilePath));
-            }
-
-            var source = RazorSourceDocument.ReadFrom(projectItem);
-            var imports = GetImports(projectItem);
-
-            return RazorCodeDocument.Create(source, imports);
-        }
-
-        /// <summary>
-        /// Gets <see cref="RazorSourceDocument"/> that are applicable to the specified <paramref name="path"/>.
-        /// </summary>
-        /// <param name="path">The template path.</param>
-        /// <returns>The sequence of applicable <see cref="RazorSourceDocument"/>.</returns>
-        public IEnumerable<RazorSourceDocument> GetImports(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
-            }
-
-            var projectItem = Project.GetItem(path);
-            return GetImports(projectItem);
-        }
-
-        /// <summary>
-        /// Gets <see cref="RazorSourceDocument"/> that are applicable to the specified <paramref name="projectItem"/>.
-        /// </summary>
-        /// <param name="projectItem">The <see cref="RazorProjectItem"/>.</param>
-        /// <returns>The sequence of applicable <see cref="RazorSourceDocument"/>.</returns>
-        public virtual IEnumerable<RazorSourceDocument> GetImports(RazorProjectItem projectItem)
-        {
-            if (projectItem == null)
-            {
-                throw new ArgumentNullException(nameof(projectItem));
-            }
-            var result = new List<RazorSourceDocument>();
-
-            var importProjectItems = GetImportItems(projectItem);
-            foreach (var importItem in importProjectItems)
-            {
-                if (importItem.Exists)
-                {
-                    // We want items in descending order. FindHierarchicalItems returns items in ascending order.
-                    result.Insert(0, RazorSourceDocument.ReadFrom(importItem));
-                }
-            }
-
-            if (Options.DefaultImports != null)
-            {
-                result.Insert(0, Options.DefaultImports);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Gets the sequence of imports with the name specified by <see cref="RazorTemplateEngineOptions.ImportsFileName" />
-        /// that apply to <paramref name="path"/>.
-        /// </summary>
-        /// <param name="path">The path to look up import items for.</param>
-        /// <returns>A sequence of <see cref="RazorProjectItem"/> instances that apply to the
-        /// <paramref name="path"/>.</returns>
-        public IEnumerable<RazorProjectItem> GetImportItems(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
-            }
-
-            var projectItem = Project.GetItem(path);
-            return GetImportItems(projectItem);
-        }
-
-        /// <summary>
-        /// Gets the sequence of imports with the name specified by <see cref="RazorTemplateEngineOptions.ImportsFileName" />
-        /// that apply to <paramref name="projectItem"/>.
-        /// </summary>
-        /// <param name="projectItem">The <see cref="RazorProjectItem"/> to look up import items for.</param>
-        /// <returns>A sequence of <see cref="RazorProjectItem"/> instances that apply to the
-        /// <paramref name="projectItem"/>.</returns>
-        public virtual IEnumerable<RazorProjectItem> GetImportItems(RazorProjectItem projectItem)
-        {
-            var importsFileName = Options.ImportsFileName;
-            if (!string.IsNullOrEmpty(importsFileName))
-            {
-                return Project.FindHierarchicalItems(projectItem.FilePath, importsFileName);
-            }
-
-            return Enumerable.Empty<RazorProjectItem>();
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs
deleted file mode 100644
index 4b46eabbc8..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorTemplateEngineOptions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language
-{
-    /// <summary>
-    /// Options for code generation in the <see cref="RazorTemplateEngine"/>.
-    /// </summary>
-    public sealed class RazorTemplateEngineOptions
-    {
-        /// <summary>
-        /// Gets or sets the file name of the imports file (e.g. _ViewImports.cshtml).
-        /// </summary>
-        public string ImportsFileName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default set of imports.
-        /// </summary>
-        public RazorSourceDocument DefaultImports { get; set; }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index bf15e72279..d7f21d9466 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -392,9 +392,6 @@ Instead, wrap the contents of the block in "{{}}":
   <data name="RazorProject_PathMustStartWithForwardSlash" xml:space="preserve">
     <value>Path must begin with a forward slash '/'.</value>
   </data>
-  <data name="RazorTemplateEngine_ItemCouldNotBeFound" xml:space="preserve">
-    <value>The item '{0}' could not be found.</value>
-  </data>
   <data name="RemoveTagHelperDirective_Description" xml:space="preserve">
     <value>Remove Tag Helpers for use in the current document.</value>
   </data>

From e6b8c86a4832c0999d334f58f17750853a265e08 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 17 Jan 2019 13:38:17 -0800
Subject: [PATCH 059/337] Better structure for Tag helper start/end tags
 (dotnet/aspnetcore-tooling#132)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f6ab4cc1d1883def0df35ad0ac6486c03c263941
---
 .../src/ClassifiedSpanVisitor.cs              |   2 +-
 ...faultRazorIntermediateNodeLoweringPhase.cs |   4 +-
 .../src/Legacy/TagHelperBlockRewriter.cs      |  62 ++--
 .../src/Legacy/TagHelperParseTreeRewriter.cs  |  68 +----
 .../Syntax.xml.Internal.Generated.cs          | 288 +++++++++++++++---
 .../Generated/Syntax.xml.Main.Generated.cs    | 129 +++++++-
 .../Generated/Syntax.xml.Syntax.Generated.cs  | 227 +++++++++++---
 .../src/Syntax/Syntax.xml                     |  38 ++-
 .../src/Syntax/SyntaxSerializer.cs            |   2 +
 .../Language/Legacy/SyntaxNodeWriter.cs       |   2 +
 10 files changed, 620 insertions(+), 202 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
index 46d69157f9..73f5d1fa11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
         {
-            foreach (var child in node.Children)
+            foreach (var child in node.Attributes)
             {
                 if (child is MarkupTagHelperAttributeSyntax attribute)
                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index b92fea9890..9e0a0c0cf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -870,7 +870,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
             {
-                foreach (var child in node.Children)
+                foreach (var child in node.Attributes)
                 {
                     if (child is MarkupTagHelperAttributeSyntax || child is MarkupMinimizedTagHelperAttributeSyntax)
                     {
@@ -1587,7 +1587,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
             {
-                foreach (var child in node.Children)
+                foreach (var child in node.Attributes)
                 {
                     if (child is MarkupTagHelperAttributeSyntax || child is MarkupMinimizedTagHelperAttributeSyntax)
                     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index 23a0a488a1..ebf32e9f70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -10,21 +10,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal static class TagHelperBlockRewriter
     {
-        public static MarkupTagHelperStartTagSyntax Rewrite(
-            string tagName,
-            bool validStructure,
-            RazorParserFeatureFlags featureFlags,
-            MarkupStartTagSyntax tag,
-            TagHelperBinding bindingResult,
-            ErrorSink errorSink,
-            RazorSourceDocument source)
-        {
-            // There will always be at least one child for the '<'.
-            var rewrittenChildren = GetRewrittenChildren(tagName, validStructure, tag, bindingResult, featureFlags, errorSink, source);
-
-            return SyntaxFactory.MarkupTagHelperStartTag(rewrittenChildren);
-        }
-
         public static TagMode GetTagMode(
             MarkupStartTagSyntax tagBlock,
             TagHelperBinding bindingResult,
@@ -52,35 +37,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return TagMode.StartTagAndEndTag;
         }
 
-        private static SyntaxList<RazorSyntaxNode> GetRewrittenChildren(
+        public static MarkupTagHelperStartTagSyntax Rewrite(
             string tagName,
-            bool validStructure,
-            MarkupStartTagSyntax tagBlock,
-            TagHelperBinding bindingResult,
             RazorParserFeatureFlags featureFlags,
+            MarkupStartTagSyntax startTag,
+            TagHelperBinding bindingResult,
             ErrorSink errorSink,
             RazorSourceDocument source)
         {
-            var tagHelperBuilder = SyntaxListBuilder<RazorSyntaxNode>.Create();
             var processedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            if (tagBlock.Children.Count == 1)
-            {
-                // Tag with no attributes. We have nothing to rewrite here.
-                return tagBlock.Children;
-            }
-
-            // Add the tag start
-            tagHelperBuilder.Add(tagBlock.Children.First());
-
-            // We skip the first child "<tagname" and take everything up to the ending portion of the tag ">" or "/>".
-            // If the tag does not have a valid structure then there's no close angle to ignore.
-            var tokenOffset = validStructure ? 1 : 0;
-            for (var i = 1; i < tagBlock.Children.Count - tokenOffset; i++)
+            var attributes = startTag.Attributes;
+            var attributeBuilder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+            for (var i = 0; i < startTag.Attributes.Count; i++)
             {
                 var isMinimized = false;
                 var attributeNameLocation = SourceLocation.Undefined;
-                var child = tagBlock.Children[i];
+                var child = startTag.Attributes[i];
                 TryParseResult result;
                 if (child is MarkupAttributeBlockSyntax attributeBlock)
                 {
@@ -91,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         bindingResult.Descriptors,
                         errorSink,
                         processedBoundAttributeNames);
-                    tagHelperBuilder.Add(result.RewrittenAttribute);
+                    attributeBuilder.Add(result.RewrittenAttribute);
                 }
                 else if (child is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
                 {
@@ -103,7 +76,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         bindingResult.Descriptors,
                         errorSink,
                         processedBoundAttributeNames);
-                    tagHelperBuilder.Add(result.RewrittenAttribute);
+                    attributeBuilder.Add(result.RewrittenAttribute);
                 }
                 else if (child is MarkupMiscAttributeContentSyntax miscContent)
                 {
@@ -146,12 +119,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (result == null)
                 {
                     // Error occurred while parsing the attribute. Don't try parsing the rest to avoid misleading errors.
-                    for (var j = i; j < tagBlock.Children.Count; j++)
+                    for (var j = i; j < startTag.Attributes.Count; j++)
                     {
-                        tagHelperBuilder.Add(tagBlock.Children[j]);
+                        attributeBuilder.Add(startTag.Attributes[j]);
                     }
 
-                    return tagHelperBuilder.ToList();
+                    break;
                 }
 
                 // Check if it's a non-boolean bound attribute that is minimized or if it's a bound
@@ -180,13 +153,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            if (validStructure)
+            if (attributeBuilder.Count > 0)
             {
-                // Add the tag end.
-                tagHelperBuilder.Add(tagBlock.Children[tagBlock.Children.Count - 1]);
+                // This means we rewrote something. Use the new set of attributes.
+                attributes = attributeBuilder.ToList();
             }
 
-            return tagHelperBuilder.ToList();
+            var tagHelperStartTag = SyntaxFactory.MarkupTagHelperStartTag(
+                startTag.OpenAngle, startTag.Bang, startTag.Name, attributes, startTag.ForwardSlash, startTag.CloseAngle);
+
+            return tagHelperStartTag.WithSpanContext(startTag.GetSpanContext());
         }
 
         private static TryParseResult TryParseMinimizedAttribute(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 1619f42240..4b1d8355f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -268,11 +268,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 ValidateBinding(tagHelperBinding, tagName, startTag);
 
                 // We're in a start TagHelper block.
-                var validTagStructure = ValidateStartTagSyntax(tagName, startTag);
+                ValidateStartTagSyntax(tagName, startTag);
 
                 var rewrittenStartTag = TagHelperBlockRewriter.Rewrite(
                     tagName,
-                    validTagStructure,
                     _featureFlags,
                     startTag,
                     tagHelperBinding,
@@ -354,7 +353,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                 }
 
-                rewritten = SyntaxFactory.MarkupTagHelperEndTag(tagBlock.Children);
+                rewritten = SyntaxFactory.MarkupTagHelperEndTag(
+                    tagBlock.OpenAngle, tagBlock.ForwardSlash, tagBlock.Bang, tagBlock.Name, tagBlock.MiscAttributeContent, tagBlock.CloseAngle);
 
                 return true;
             }
@@ -362,11 +362,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Internal for testing
             internal IReadOnlyList<KeyValuePair<string, string>> GetAttributeNameValuePairs(MarkupStartTagSyntax tagBlock)
             {
-                // Need to calculate how many children we should take that represent the attributes.
-                var childrenOffset = IsPartialStartTag(tagBlock) ? 0 : 1;
-                var childCount = tagBlock.Children.Count - childrenOffset;
-
-                if (childCount <= 1)
+                if (tagBlock.Attributes.Count == 0)
                 {
                     return Array.Empty<KeyValuePair<string, string>>();
                 }
@@ -375,16 +371,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 var attributes = _htmlAttributeTracker;
 
-                for (var i = 1; i < childCount; i++)
+                for (var i = 0; i < tagBlock.Attributes.Count; i++)
                 {
-                    if (tagBlock.Children[i] is CSharpCodeBlockSyntax)
+                    if (tagBlock.Attributes[i] is CSharpCodeBlockSyntax)
                     {
                         // Code blocks in the attribute area of tags mangles following attributes.
                         // It's also not supported by TagHelpers, bail early to avoid creating bad attribute value pairs.
                         break;
                     }
 
-                    if (tagBlock.Children[i] is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
+                    if (tagBlock.Attributes[i] is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
                     {
                         if (minimizedAttributeBlock.Name == null)
                         {
@@ -397,7 +393,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         continue;
                     }
 
-                    if (!(tagBlock.Children[i] is MarkupAttributeBlockSyntax attributeBlock))
+                    if (!(tagBlock.Attributes[i] is MarkupAttributeBlockSyntax attributeBlock))
                     {
                         // If the parser thought these aren't attributes, we don't care about them. Move on.
                         continue;
@@ -525,46 +521,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                        !endTag.IsMarkupTransition;
             }
 
-            private static bool IsPartialStartTag(MarkupStartTagSyntax tagBlock)
+            private static bool IsPartialStartTag(MarkupStartTagSyntax startTag)
             {
-                // No need to validate the tag end because in order to be a tag block it must start with '<'.
-                var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1];
-
-                // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format)
-                if (tagEnd != null && tagEnd is MarkupTextLiteralSyntax tagEndLiteral)
-                {
-                    var endToken = tagEndLiteral.LiteralTokens.Count > 0 ?
-                        tagEndLiteral.LiteralTokens[tagEndLiteral.LiteralTokens.Count - 1] :
-                        null;
-
-                    if (endToken != null && endToken.Kind == SyntaxKind.CloseAngle)
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
+                return startTag.CloseAngle.IsMissing;
             }
 
-            private static bool IsPartialEndTag(MarkupEndTagSyntax tagBlock)
+            private static bool IsPartialEndTag(MarkupEndTagSyntax endTag)
             {
-                // No need to validate the tag end because in order to be a tag block it must start with '<'.
-                var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1];
-
-                // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format)
-                if (tagEnd != null && tagEnd is MarkupTextLiteralSyntax tagEndLiteral)
-                {
-                    var endToken = tagEndLiteral.LiteralTokens.Count > 0 ?
-                        tagEndLiteral.LiteralTokens[tagEndLiteral.LiteralTokens.Count - 1] :
-                        null;
-
-                    if (endToken != null && endToken.Kind == SyntaxKind.CloseAngle)
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
+                return endTag.CloseAngle.IsMissing;
             }
 
             private void ValidateParentAllowsContent(SyntaxNode child)
@@ -608,9 +572,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (string.IsNullOrEmpty(tagName))
                 {
                     var firstChild = tagBlock.Children.First();
-                    Debug.Assert(firstChild is MarkupTextLiteralSyntax || firstChild is MarkupTransitionSyntax);
+                    Debug.Assert(firstChild is MarkupTextLiteralSyntax);
 
-                    ValidateParentAllowsContent(tagBlock.Children.First());
+                    ValidateParentAllowsContent(firstChild);
                     return;
                 }
 
@@ -641,9 +605,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (string.IsNullOrEmpty(tagName))
                 {
                     var firstChild = tagBlock.Children.First();
-                    Debug.Assert(firstChild is MarkupTextLiteralSyntax || firstChild is MarkupTransitionSyntax);
+                    Debug.Assert(firstChild is MarkupTextLiteralSyntax);
 
-                    ValidateParentAllowsContent(tagBlock.Children.First());
+                    ValidateParentAllowsContent(firstChild);
                     return;
                 }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
index 6c319e6d08..4fe3309e14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -1816,40 +1816,87 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
   }
 
-  internal sealed partial class MarkupTagHelperStartTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupTagHelperStartTagSyntax : MarkupSyntaxNode
   {
-    private readonly GreenNode _children;
+    private readonly SyntaxToken _openAngle;
+    private readonly SyntaxToken _bang;
+    private readonly SyntaxToken _name;
+    private readonly GreenNode _attributes;
+    private readonly SyntaxToken _forwardSlash;
+    private readonly SyntaxToken _closeAngle;
 
-    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, GreenNode attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
         : base(kind, diagnostics, annotations)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (attributes != null)
+        {
+            AdjustFlagsAndWidth(attributes);
+            _attributes = attributes;
+        }
+        if (forwardSlash != null)
+        {
+            AdjustFlagsAndWidth(forwardSlash);
+            _forwardSlash = forwardSlash;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
 
-    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, GreenNode children)
+    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, GreenNode attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
         : base(kind)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (attributes != null)
+        {
+            AdjustFlagsAndWidth(attributes);
+            _attributes = attributes;
+        }
+        if (forwardSlash != null)
+        {
+            AdjustFlagsAndWidth(forwardSlash);
+            _forwardSlash = forwardSlash;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+    public SyntaxToken OpenAngle { get { return _openAngle; } }
+    public SyntaxToken Bang { get { return _bang; } }
+    public SyntaxToken Name { get { return _name; } }
+    public SyntaxList<RazorSyntaxNode> Attributes { get { return new SyntaxList<RazorSyntaxNode>(_attributes); } }
+    public SyntaxToken ForwardSlash { get { return _forwardSlash; } }
+    public SyntaxToken CloseAngle { get { return _closeAngle; } }
 
     internal override GreenNode GetSlot(int index)
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _bang;
+            case 2: return _name;
+            case 3: return _attributes;
+            case 4: return _forwardSlash;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1869,11 +1916,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
         visitor.VisitMarkupTagHelperStartTag(this);
     }
 
-    public MarkupTagHelperStartTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public MarkupTagHelperStartTagSyntax Update(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || bang != Bang || name != Name || attributes != Attributes || forwardSlash != ForwardSlash || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupTagHelperStartTag(children);
+            var newNode = SyntaxFactory.MarkupTagHelperStartTag(openAngle, bang, name, attributes, forwardSlash, closeAngle);
             var diags = GetDiagnostics();
             if (diags != null && diags.Length > 0)
                newNode = newNode.WithDiagnosticsGreen(diags);
@@ -1888,49 +1935,90 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
     {
-         return new MarkupTagHelperStartTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+         return new MarkupTagHelperStartTagSyntax(Kind, _openAngle, _bang, _name, _attributes, _forwardSlash, _closeAngle, diagnostics, GetAnnotations());
     }
 
     internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
     {
-         return new MarkupTagHelperStartTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+         return new MarkupTagHelperStartTagSyntax(Kind, _openAngle, _bang, _name, _attributes, _forwardSlash, _closeAngle, GetDiagnostics(), annotations);
     }
   }
 
-  internal sealed partial class MarkupTagHelperEndTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupTagHelperEndTagSyntax : MarkupSyntaxNode
   {
-    private readonly GreenNode _children;
+    private readonly SyntaxToken _openAngle;
+    private readonly SyntaxToken _forwardSlash;
+    private readonly SyntaxToken _bang;
+    private readonly SyntaxToken _name;
+    private readonly MarkupMiscAttributeContentSyntax _miscAttributeContent;
+    private readonly SyntaxToken _closeAngle;
 
-    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
         : base(kind, diagnostics, annotations)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        AdjustFlagsAndWidth(forwardSlash);
+        _forwardSlash = forwardSlash;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (miscAttributeContent != null)
+        {
+            AdjustFlagsAndWidth(miscAttributeContent);
+            _miscAttributeContent = miscAttributeContent;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
 
-    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, GreenNode children)
+    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
         : base(kind)
     {
-        SlotCount = 1;
-        if (children != null)
+        SlotCount = 6;
+        AdjustFlagsAndWidth(openAngle);
+        _openAngle = openAngle;
+        AdjustFlagsAndWidth(forwardSlash);
+        _forwardSlash = forwardSlash;
+        if (bang != null)
         {
-            AdjustFlagsAndWidth(children);
-            _children = children;
+            AdjustFlagsAndWidth(bang);
+            _bang = bang;
         }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (miscAttributeContent != null)
+        {
+            AdjustFlagsAndWidth(miscAttributeContent);
+            _miscAttributeContent = miscAttributeContent;
+        }
+        AdjustFlagsAndWidth(closeAngle);
+        _closeAngle = closeAngle;
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+    public SyntaxToken OpenAngle { get { return _openAngle; } }
+    public SyntaxToken ForwardSlash { get { return _forwardSlash; } }
+    public SyntaxToken Bang { get { return _bang; } }
+    public SyntaxToken Name { get { return _name; } }
+    public MarkupMiscAttributeContentSyntax MiscAttributeContent { get { return _miscAttributeContent; } }
+    public SyntaxToken CloseAngle { get { return _closeAngle; } }
 
     internal override GreenNode GetSlot(int index)
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _forwardSlash;
+            case 2: return _bang;
+            case 3: return _name;
+            case 4: return _miscAttributeContent;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1950,11 +2038,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
         visitor.VisitMarkupTagHelperEndTag(this);
     }
 
-    public MarkupTagHelperEndTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public MarkupTagHelperEndTagSyntax Update(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || forwardSlash != ForwardSlash || bang != Bang || name != Name || miscAttributeContent != MiscAttributeContent || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupTagHelperEndTag(children);
+            var newNode = SyntaxFactory.MarkupTagHelperEndTag(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
             var diags = GetDiagnostics();
             if (diags != null && diags.Length > 0)
                newNode = newNode.WithDiagnosticsGreen(diags);
@@ -1969,12 +2057,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
     {
-         return new MarkupTagHelperEndTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+         return new MarkupTagHelperEndTagSyntax(Kind, _openAngle, _forwardSlash, _bang, _name, _miscAttributeContent, _closeAngle, diagnostics, GetAnnotations());
     }
 
     internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
     {
-         return new MarkupTagHelperEndTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+         return new MarkupTagHelperEndTagSyntax(Kind, _openAngle, _forwardSlash, _bang, _name, _miscAttributeContent, _closeAngle, GetDiagnostics(), annotations);
     }
   }
 
@@ -3997,14 +4085,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 
     public override GreenNode VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)Visit(node.OpenAngle);
+      var bang = (SyntaxToken)Visit(node.Bang);
+      var name = (SyntaxToken)Visit(node.Name);
+      var attributes = VisitList(node.Attributes);
+      var forwardSlash = (SyntaxToken)Visit(node.ForwardSlash);
+      var closeAngle = (SyntaxToken)Visit(node.CloseAngle);
+      return node.Update(openAngle, bang, name, attributes, forwardSlash, closeAngle);
     }
 
     public override GreenNode VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)Visit(node.OpenAngle);
+      var forwardSlash = (SyntaxToken)Visit(node.ForwardSlash);
+      var bang = (SyntaxToken)Visit(node.Bang);
+      var name = (SyntaxToken)Visit(node.Name);
+      var miscAttributeContent = (MarkupMiscAttributeContentSyntax)Visit(node.MiscAttributeContent);
+      var closeAngle = (SyntaxToken)Visit(node.CloseAngle);
+      return node.Update(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
     }
 
     public override GreenNode VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
@@ -4421,18 +4519,112 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return result;
     }
 
-    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-      var result = new MarkupTagHelperStartTagSyntax(SyntaxKind.MarkupTagHelperStartTag, children.Node);
+      if (openAngle == null)
+        throw new ArgumentNullException(nameof(openAngle));
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      if (bang != null)
+      {
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      }
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      if (forwardSlash != null)
+      {
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      }
+      if (closeAngle == null)
+        throw new ArgumentNullException(nameof(closeAngle));
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
 
-      return result;
+      return new MarkupTagHelperStartTagSyntax(SyntaxKind.MarkupTagHelperStartTag, openAngle, bang, name, attributes.Node, forwardSlash, closeAngle);
     }
 
-    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-      var result = new MarkupTagHelperEndTagSyntax(SyntaxKind.MarkupTagHelperEndTag, children.Node);
+      if (openAngle == null)
+        throw new ArgumentNullException(nameof(openAngle));
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      if (forwardSlash == null)
+        throw new ArgumentNullException(nameof(forwardSlash));
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      if (bang != null)
+      {
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      }
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      if (closeAngle == null)
+        throw new ArgumentNullException(nameof(closeAngle));
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
 
-      return result;
+      return new MarkupTagHelperEndTagSyntax(SyntaxKind.MarkupTagHelperEndTag, openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
     }
 
     public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
index c33baf1f06..cf1c0aa0a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -616,14 +616,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
     public override SyntaxNode VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)VisitToken(node.OpenAngle);
+      var bang = (SyntaxToken)VisitToken(node.Bang);
+      var name = (SyntaxToken)VisitToken(node.Name);
+      var attributes = VisitList(node.Attributes);
+      var forwardSlash = (SyntaxToken)VisitToken(node.ForwardSlash);
+      var closeAngle = (SyntaxToken)VisitToken(node.CloseAngle);
+      return node.Update(openAngle, bang, name, attributes, forwardSlash, closeAngle);
     }
 
     public override SyntaxNode VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
     {
-      var children = VisitList(node.Children);
-      return node.Update(children);
+      var openAngle = (SyntaxToken)VisitToken(node.OpenAngle);
+      var forwardSlash = (SyntaxToken)VisitToken(node.ForwardSlash);
+      var bang = (SyntaxToken)VisitToken(node.Bang);
+      var name = (SyntaxToken)VisitToken(node.Name);
+      var miscAttributeContent = (MarkupMiscAttributeContentSyntax)Visit(node.MiscAttributeContent);
+      var closeAngle = (SyntaxToken)VisitToken(node.CloseAngle);
+      return node.Update(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
     }
 
     public override SyntaxNode VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
@@ -999,6 +1009,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("openAngle");
       }
+      if (bang != null)
+      {
       switch (bang.Kind)
       {
         case SyntaxKind.Bang:
@@ -1007,6 +1019,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("bang");
       }
+      }
       switch (name.Kind)
       {
         case SyntaxKind.Text:
@@ -1014,6 +1027,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("name");
       }
+      if (forwardSlash != null)
+      {
       switch (forwardSlash.Kind)
       {
         case SyntaxKind.ForwardSlash:
@@ -1022,6 +1037,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("forwardSlash");
       }
+      }
       switch (closeAngle.Kind)
       {
         case SyntaxKind.CloseAngle:
@@ -1029,7 +1045,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("closeAngle");
       }
-      return (MarkupStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupStartTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)bang.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, attributes.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), (Syntax.InternalSyntax.SyntaxToken)forwardSlash.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
+      return (MarkupStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupStartTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)bang?.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, attributes.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), (Syntax.InternalSyntax.SyntaxToken)forwardSlash?.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupStartTagSyntax instance.</summary>
@@ -1055,6 +1071,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("forwardSlash");
       }
+      if (bang != null)
+      {
       switch (bang.Kind)
       {
         case SyntaxKind.Bang:
@@ -1063,6 +1081,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("bang");
       }
+      }
       switch (name.Kind)
       {
         case SyntaxKind.Text:
@@ -1077,7 +1096,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         default:
           throw new ArgumentException("closeAngle");
       }
-      return (MarkupEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupEndTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)forwardSlash.Green, (Syntax.InternalSyntax.SyntaxToken)bang.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, miscAttributeContent == null ? null : (InternalSyntax.MarkupMiscAttributeContentSyntax)miscAttributeContent.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
+      return (MarkupEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupEndTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)forwardSlash.Green, (Syntax.InternalSyntax.SyntaxToken)bang?.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, miscAttributeContent == null ? null : (InternalSyntax.MarkupMiscAttributeContentSyntax)miscAttributeContent.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupEndTagSyntax instance.</summary>
@@ -1101,27 +1120,109 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     }
 
     /// <summary>Creates a new MarkupTagHelperStartTagSyntax instance.</summary>
-    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(SyntaxList<RazorSyntaxNode> children)
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-      return (MarkupTagHelperStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperStartTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      if (bang != null)
+      {
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      }
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      if (forwardSlash != null)
+      {
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      }
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
+      return (MarkupTagHelperStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperStartTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)bang?.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, attributes.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), (Syntax.InternalSyntax.SyntaxToken)forwardSlash?.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupTagHelperStartTagSyntax instance.</summary>
-    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag()
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(SyntaxList<RazorSyntaxNode> attributes = default(SyntaxList<RazorSyntaxNode>))
     {
-      return SyntaxFactory.MarkupTagHelperStartTag(default(SyntaxList<RazorSyntaxNode>));
+      return SyntaxFactory.MarkupTagHelperStartTag(SyntaxFactory.Token(SyntaxKind.OpenAngle), default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.Text), attributes, default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.CloseAngle));
     }
 
     /// <summary>Creates a new MarkupTagHelperEndTagSyntax instance.</summary>
-    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(SyntaxList<RazorSyntaxNode> children)
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-      return (MarkupTagHelperEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperEndTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+      switch (openAngle.Kind)
+      {
+        case SyntaxKind.OpenAngle:
+          break;
+        default:
+          throw new ArgumentException("openAngle");
+      }
+      switch (forwardSlash.Kind)
+      {
+        case SyntaxKind.ForwardSlash:
+          break;
+        default:
+          throw new ArgumentException("forwardSlash");
+      }
+      if (bang != null)
+      {
+      switch (bang.Kind)
+      {
+        case SyntaxKind.Bang:
+        case SyntaxKind.None:
+          break;
+        default:
+          throw new ArgumentException("bang");
+      }
+      }
+      switch (name.Kind)
+      {
+        case SyntaxKind.Text:
+          break;
+        default:
+          throw new ArgumentException("name");
+      }
+      switch (closeAngle.Kind)
+      {
+        case SyntaxKind.CloseAngle:
+          break;
+        default:
+          throw new ArgumentException("closeAngle");
+      }
+      return (MarkupTagHelperEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperEndTag((Syntax.InternalSyntax.SyntaxToken)openAngle.Green, (Syntax.InternalSyntax.SyntaxToken)forwardSlash.Green, (Syntax.InternalSyntax.SyntaxToken)bang?.Green, (Syntax.InternalSyntax.SyntaxToken)name.Green, miscAttributeContent == null ? null : (InternalSyntax.MarkupMiscAttributeContentSyntax)miscAttributeContent.Green, (Syntax.InternalSyntax.SyntaxToken)closeAngle.Green).CreateRed();
     }
 
     /// <summary>Creates a new MarkupTagHelperEndTagSyntax instance.</summary>
-    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag()
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(MarkupMiscAttributeContentSyntax miscAttributeContent = default(MarkupMiscAttributeContentSyntax))
     {
-      return SyntaxFactory.MarkupTagHelperEndTag(default(SyntaxList<RazorSyntaxNode>));
+      return SyntaxFactory.MarkupTagHelperEndTag(SyntaxFactory.Token(SyntaxKind.OpenAngle), SyntaxFactory.Token(SyntaxKind.ForwardSlash), default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.Text), miscAttributeContent, SyntaxFactory.Token(SyntaxKind.CloseAngle));
     }
 
     /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
index 42cf2587aa..8a6cfb5a32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -1810,37 +1810,76 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return Update(StartTag, Body, endTag);
     }
 
-    public MarkupTagHelperElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
+    public MarkupTagHelperElementSyntax AddStartTagAttributes(params RazorSyntaxNode[] items)
     {
-        return this.WithStartTag(this.StartTag.WithChildren(this.StartTag.Children.AddRange(items)));
+        return this.WithStartTag(this.StartTag.WithAttributes(this.StartTag.Attributes.AddRange(items)));
     }
 
     public MarkupTagHelperElementSyntax AddBody(params RazorSyntaxNode[] items)
     {
         return WithBody(this.Body.AddRange(items));
     }
-
-    public MarkupTagHelperElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
-    {
-        var _endTag = this.EndTag ?? SyntaxFactory.MarkupTagHelperEndTag();
-        return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
-    }
   }
 
-  internal sealed partial class MarkupTagHelperStartTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupTagHelperStartTagSyntax : MarkupSyntaxNode
   {
-    private SyntaxNode _children;
+    private SyntaxToken _openAngle;
+    private SyntaxToken _bang;
+    private SyntaxToken _name;
+    private SyntaxNode _attributes;
+    private SyntaxToken _forwardSlash;
+    private SyntaxToken _closeAngle;
 
     internal MarkupTagHelperStartTagSyntax(GreenNode green, SyntaxNode parent, int position)
         : base(green, parent, position)
     {
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children 
+    public SyntaxToken OpenAngle 
     {
         get
         {
-            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+            return GetRedAtZero(ref _openAngle);
+        }
+    }
+
+    public SyntaxToken Bang 
+    {
+        get
+        {
+            return GetRed(ref _bang, 1);
+        }
+    }
+
+    public SyntaxToken Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 2);
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Attributes 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _attributes, 3));
+        }
+    }
+
+    public SyntaxToken ForwardSlash 
+    {
+        get
+        {
+            return GetRed(ref _forwardSlash, 4);
+        }
+    }
+
+    public SyntaxToken CloseAngle 
+    {
+        get
+        {
+            return GetRed(ref _closeAngle, 5);
         }
     }
 
@@ -1848,7 +1887,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return GetRedAtZero(ref _children);
+            case 0: return GetRedAtZero(ref _openAngle);
+            case 1: return GetRed(ref _bang, 1);
+            case 2: return GetRed(ref _name, 2);
+            case 3: return GetRed(ref _attributes, 3);
+            case 4: return GetRed(ref _forwardSlash, 4);
+            case 5: return GetRed(ref _closeAngle, 5);
             default: return null;
         }
     }
@@ -1856,7 +1900,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _bang;
+            case 2: return _name;
+            case 3: return _attributes;
+            case 4: return _forwardSlash;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1871,11 +1920,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         visitor.VisitMarkupTagHelperStartTag(this);
     }
 
-    public MarkupTagHelperStartTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    public MarkupTagHelperStartTagSyntax Update(SyntaxToken openAngle, SyntaxToken bang, SyntaxToken name, SyntaxList<RazorSyntaxNode> attributes, SyntaxToken forwardSlash, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || bang != Bang || name != Name || attributes != Attributes || forwardSlash != ForwardSlash || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupTagHelperStartTag(children);
+            var newNode = SyntaxFactory.MarkupTagHelperStartTag(openAngle, bang, name, attributes, forwardSlash, closeAngle);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1885,33 +1934,101 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return this;
     }
 
-    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
-    public new MarkupTagHelperStartTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    public MarkupTagHelperStartTagSyntax WithOpenAngle(SyntaxToken openAngle)
     {
-        return Update(children);
+        return Update(openAngle, Bang, Name, Attributes, ForwardSlash, CloseAngle);
     }
-    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
 
-    public new MarkupTagHelperStartTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    public MarkupTagHelperStartTagSyntax WithBang(SyntaxToken bang)
     {
-        return WithChildren(this.Children.AddRange(items));
+        return Update(OpenAngle, bang, Name, Attributes, ForwardSlash, CloseAngle);
+    }
+
+    public MarkupTagHelperStartTagSyntax WithName(SyntaxToken name)
+    {
+        return Update(OpenAngle, Bang, name, Attributes, ForwardSlash, CloseAngle);
+    }
+
+    public MarkupTagHelperStartTagSyntax WithAttributes(SyntaxList<RazorSyntaxNode> attributes)
+    {
+        return Update(OpenAngle, Bang, Name, attributes, ForwardSlash, CloseAngle);
+    }
+
+    public MarkupTagHelperStartTagSyntax WithForwardSlash(SyntaxToken forwardSlash)
+    {
+        return Update(OpenAngle, Bang, Name, Attributes, forwardSlash, CloseAngle);
+    }
+
+    public MarkupTagHelperStartTagSyntax WithCloseAngle(SyntaxToken closeAngle)
+    {
+        return Update(OpenAngle, Bang, Name, Attributes, ForwardSlash, closeAngle);
+    }
+
+    public MarkupTagHelperStartTagSyntax AddAttributes(params RazorSyntaxNode[] items)
+    {
+        return WithAttributes(this.Attributes.AddRange(items));
     }
   }
 
-  internal sealed partial class MarkupTagHelperEndTagSyntax : RazorBlockSyntax
+  internal sealed partial class MarkupTagHelperEndTagSyntax : MarkupSyntaxNode
   {
-    private SyntaxNode _children;
+    private SyntaxToken _openAngle;
+    private SyntaxToken _forwardSlash;
+    private SyntaxToken _bang;
+    private SyntaxToken _name;
+    private MarkupMiscAttributeContentSyntax _miscAttributeContent;
+    private SyntaxToken _closeAngle;
 
     internal MarkupTagHelperEndTagSyntax(GreenNode green, SyntaxNode parent, int position)
         : base(green, parent, position)
     {
     }
 
-    public override SyntaxList<RazorSyntaxNode> Children 
+    public SyntaxToken OpenAngle 
     {
         get
         {
-            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+            return GetRedAtZero(ref _openAngle);
+        }
+    }
+
+    public SyntaxToken ForwardSlash 
+    {
+        get
+        {
+            return GetRed(ref _forwardSlash, 1);
+        }
+    }
+
+    public SyntaxToken Bang 
+    {
+        get
+        {
+            return GetRed(ref _bang, 2);
+        }
+    }
+
+    public SyntaxToken Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 3);
+        }
+    }
+
+    public MarkupMiscAttributeContentSyntax MiscAttributeContent 
+    {
+        get
+        {
+            return GetRed(ref _miscAttributeContent, 4);
+        }
+    }
+
+    public SyntaxToken CloseAngle 
+    {
+        get
+        {
+            return GetRed(ref _closeAngle, 5);
         }
     }
 
@@ -1919,7 +2036,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return GetRedAtZero(ref _children);
+            case 0: return GetRedAtZero(ref _openAngle);
+            case 1: return GetRed(ref _forwardSlash, 1);
+            case 2: return GetRed(ref _bang, 2);
+            case 3: return GetRed(ref _name, 3);
+            case 4: return GetRed(ref _miscAttributeContent, 4);
+            case 5: return GetRed(ref _closeAngle, 5);
             default: return null;
         }
     }
@@ -1927,7 +2049,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     {
         switch (index)
         {
-            case 0: return _children;
+            case 0: return _openAngle;
+            case 1: return _forwardSlash;
+            case 2: return _bang;
+            case 3: return _name;
+            case 4: return _miscAttributeContent;
+            case 5: return _closeAngle;
             default: return null;
         }
     }
@@ -1942,11 +2069,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         visitor.VisitMarkupTagHelperEndTag(this);
     }
 
-    public MarkupTagHelperEndTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    public MarkupTagHelperEndTagSyntax Update(SyntaxToken openAngle, SyntaxToken forwardSlash, SyntaxToken bang, SyntaxToken name, MarkupMiscAttributeContentSyntax miscAttributeContent, SyntaxToken closeAngle)
     {
-        if (children != Children)
+        if (openAngle != OpenAngle || forwardSlash != ForwardSlash || bang != Bang || name != Name || miscAttributeContent != MiscAttributeContent || closeAngle != CloseAngle)
         {
-            var newNode = SyntaxFactory.MarkupTagHelperEndTag(children);
+            var newNode = SyntaxFactory.MarkupTagHelperEndTag(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1956,16 +2083,40 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         return this;
     }
 
-    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
-    public new MarkupTagHelperEndTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    public MarkupTagHelperEndTagSyntax WithOpenAngle(SyntaxToken openAngle)
     {
-        return Update(children);
+        return Update(openAngle, ForwardSlash, Bang, Name, MiscAttributeContent, CloseAngle);
     }
-    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
 
-    public new MarkupTagHelperEndTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    public MarkupTagHelperEndTagSyntax WithForwardSlash(SyntaxToken forwardSlash)
     {
-        return WithChildren(this.Children.AddRange(items));
+        return Update(OpenAngle, forwardSlash, Bang, Name, MiscAttributeContent, CloseAngle);
+    }
+
+    public MarkupTagHelperEndTagSyntax WithBang(SyntaxToken bang)
+    {
+        return Update(OpenAngle, ForwardSlash, bang, Name, MiscAttributeContent, CloseAngle);
+    }
+
+    public MarkupTagHelperEndTagSyntax WithName(SyntaxToken name)
+    {
+        return Update(OpenAngle, ForwardSlash, Bang, name, MiscAttributeContent, CloseAngle);
+    }
+
+    public MarkupTagHelperEndTagSyntax WithMiscAttributeContent(MarkupMiscAttributeContentSyntax miscAttributeContent)
+    {
+        return Update(OpenAngle, ForwardSlash, Bang, Name, miscAttributeContent, CloseAngle);
+    }
+
+    public MarkupTagHelperEndTagSyntax WithCloseAngle(SyntaxToken closeAngle)
+    {
+        return Update(OpenAngle, ForwardSlash, Bang, Name, MiscAttributeContent, closeAngle);
+    }
+
+    public MarkupTagHelperEndTagSyntax AddMiscAttributeContentChildren(params RazorSyntaxNode[] items)
+    {
+        var _miscAttributeContent = this.MiscAttributeContent ?? SyntaxFactory.MarkupMiscAttributeContent();
+        return this.WithMiscAttributeContent(_miscAttributeContent.WithChildren(_miscAttributeContent.Children.AddRange(items)));
     }
   }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
index 89cc6623e7..bca21d77db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
@@ -146,13 +146,43 @@
     <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Optional="true" />
     <Field Name="EndTag" Type="MarkupTagHelperEndTagSyntax" Optional="true" />
   </Node>
-  <Node Name="MarkupTagHelperStartTagSyntax" Base="RazorBlockSyntax">
+  <Node Name="MarkupTagHelperStartTagSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupTagHelperStartTag" />
-    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+    <Field Name="OpenAngle" Type="SyntaxToken">
+      <Kind Name="OpenAngle" />
+    </Field>
+    <Field Name="Bang" Type="SyntaxToken" Optional="true">
+      <Kind Name="Bang" />
+    </Field>
+    <Field Name="Name" Type="SyntaxToken">
+      <Kind Name="Text" />
+    </Field>
+    <Field Name="Attributes" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
+    <Field Name="ForwardSlash" Type="SyntaxToken" Optional="true">
+      <Kind Name="ForwardSlash" />
+    </Field>
+    <Field Name="CloseAngle" Type="SyntaxToken">
+      <Kind Name="CloseAngle" />
+    </Field>
   </Node>
-  <Node Name="MarkupTagHelperEndTagSyntax" Base="RazorBlockSyntax">
+  <Node Name="MarkupTagHelperEndTagSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupTagHelperEndTag" />
-    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+    <Field Name="OpenAngle" Type="SyntaxToken">
+      <Kind Name="OpenAngle" />
+    </Field>
+    <Field Name="ForwardSlash" Type="SyntaxToken">
+      <Kind Name="ForwardSlash" />
+    </Field>
+    <Field Name="Bang" Type="SyntaxToken" Optional="true">
+      <Kind Name="Bang" />
+    </Field>
+    <Field Name="Name" Type="SyntaxToken">
+      <Kind Name="Text" />
+    </Field>
+    <Field Name="MiscAttributeContent" Type="MarkupMiscAttributeContentSyntax" Optional="true" />
+    <Field Name="CloseAngle" Type="SyntaxToken">
+      <Kind Name="CloseAngle" />
+    </Field>
   </Node>
   <Node Name="MarkupTagHelperAttributeSyntax" Base="MarkupSyntaxNode">
     <Kind Name="MarkupTagHelperAttribute" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
index 77052dcd18..817bcf8829 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxSerializer.cs
@@ -305,6 +305,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                     node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
                     node.Kind == SyntaxKind.MarkupStartTag ||
                     node.Kind == SyntaxKind.MarkupEndTag ||
+                    node.Kind == SyntaxKind.MarkupTagHelperStartTag ||
+                    node.Kind == SyntaxKind.MarkupTagHelperEndTag ||
                     node.Kind == SyntaxKind.MarkupAttributeBlock ||
                     node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
                     node.Kind == SyntaxKind.MarkupTagHelperAttribute ||
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
index 33fef39d49..914f035f67 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
@@ -221,6 +221,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
                 node.Kind == SyntaxKind.MarkupStartTag ||
                 node.Kind == SyntaxKind.MarkupEndTag ||
+                node.Kind == SyntaxKind.MarkupTagHelperStartTag ||
+                node.Kind == SyntaxKind.MarkupTagHelperEndTag ||
                 node.Kind == SyntaxKind.MarkupAttributeBlock ||
                 node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
                 node.Kind == SyntaxKind.MarkupTagHelperAttribute ||

From 31e2271134d1af91b93c3d444e0e7af63a40d113 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 17 Jan 2019 17:30:15 -0800
Subject: [PATCH 060/337] Enable full fidelity check for ParseBlock tests as
 well (dotnet/aspnetcore-tooling#137)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6ca6a37f9b4a986c1050bd12662675ea935bb020
---
 .../Language/Legacy/ParserTestBase.cs         | 34 +++++++------------
 .../Language/SyntaxTreeVerifier.cs            |  5 +--
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 522fa00289..1899cf90c7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -172,11 +172,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return Regex.Replace(content, "(?<!\r)\n", "\r\n", RegexOptions.None, TimeSpan.FromSeconds(10));
         }
 
-        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true, bool ensureFullFidelity = true)
+        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true, bool ensureFullFidelity = true, int? expectedParseLength = null)
         {
             if (verifySyntaxTree)
             {
-                SyntaxTreeVerifier.Verify(syntaxTree, ensureFullFidelity);
+                SyntaxTreeVerifier.Verify(syntaxTree, ensureFullFidelity, expectedParseLength);
             }
 
             AssertSyntaxTreeNodeMatchesBaseline(syntaxTree);
@@ -271,41 +271,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return syntaxTree;
         }
 
-        internal virtual void ParseBlockTest(string document)
+        internal virtual void ParseBlockTest(string document, int? expectedParseLength = null)
         {
-            ParseBlockTest(document, null, false);
+            ParseBlockTest(document, null, false, expectedParseLength);
         }
 
-        internal virtual void ParseBlockTest(string document, bool designTime)
+        internal virtual void ParseBlockTest(string document, bool designTime, int? expectedParseLength = null)
         {
-            ParseBlockTest(document, null, designTime);
+            ParseBlockTest(document, null, designTime, expectedParseLength);
         }
 
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document)
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, int? expectedParseLength = null)
         {
-            ParseBlockTest(version, document, false);
+            ParseBlockTest(document, directives, false, expectedParseLength);
         }
 
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives)
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, int? expectedParseLength = null)
         {
-            ParseBlockTest(document, directives, false);
+            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime, expectedParseLength);
         }
 
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, bool designTime)
-        {
-            ParseBlockTest(version, document, null, designTime);
-        }
-
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
-        {
-            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime);
-        }
-
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, int? expectedParseLength = null)
         {
             var result = ParseBlock(version, document, directives, designTime);
 
-            BaselineTest(result, ensureFullFidelity: false);
+            BaselineTest(result, expectedParseLength: expectedParseLength);
         }
 
         internal virtual void ParseDocumentTest(string document)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
index f4f416616c..f0627432cb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     // Verifies recursively that a syntax tree has no gaps in terms of position/location.
     internal class SyntaxTreeVerifier
     {
-        public static void Verify(RazorSyntaxTree syntaxTree, bool ensureFullFidelity = true)
+        public static void Verify(RazorSyntaxTree syntaxTree, bool ensureFullFidelity = true, int? expectedParseLength = null)
         {
             var verifier = new Verifier(syntaxTree.Source);
             verifier.Visit(syntaxTree.Root);
@@ -21,7 +21,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 var syntaxTreeString = syntaxTree.Root.ToFullString();
                 var builder = new StringBuilder(syntaxTree.Source.Length);
-                for (var i = 0; i < syntaxTree.Source.Length; i++)
+                var sourceLength = expectedParseLength ?? syntaxTree.Source.Length;
+                for (var i = 0; i < sourceLength; i++)
                 {
                     builder.Append(syntaxTree.Source[i]);
                 }

From e7d5ee95ed3ecc8317eb337cc18362ba6e599c71 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 18 Jan 2019 08:50:22 -0800
Subject: [PATCH 061/337] Port: Fix failing file comparison tests
 (dotnet/aspnetcore-tooling#135)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5166fec846624811fab64492df835cb7d5ce434a
---
 .../RazorCompileIntegrationTest.cs              | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs
index c5398f0a13..77f4627fab 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorCompileIntegrationTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -63,16 +64,16 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.Equal(new string[]
             {
-                "/Views/_ViewImports.cshtml",
-                "/Views/_ViewStart.cshtml",
                 "/Views/Home/About.cshtml",
                 "/Views/Home/Contact.cshtml",
                 "/Views/Home/Index.cshtml",
+                "/Views/Shared/Error.cshtml",
                 "/Views/Shared/_Layout.cshtml",
                 "/Views/Shared/_ValidationScriptsPartial.cshtml",
-                "/Views/Shared/Error.cshtml",
+                "/Views/_ViewImports.cshtml",
+                "/Views/_ViewStart.cshtml",
             },
-            resources.OrderBy(r => r));
+            resources.OrderBy(r => r, StringComparer.Ordinal));
         }
 
         [Fact]
@@ -90,16 +91,16 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.Equal(new string[]
             {
-                "/Views/_ViewImports.cshtml",
-                "/Views/_ViewStart.cshtml",
                 "/Views/Home/About.cshtml",
                 "/Views/Home/Contact.cshtml",
                 "/Views/Home/Index.cshtml",
+                "/Views/Shared/Error.cshtml",
                 "/Views/Shared/_Layout.cshtml",
                 "/Views/Shared/_ValidationScriptsPartial.cshtml",
-                "/Views/Shared/Error.cshtml",
+                "/Views/_ViewImports.cshtml",
+                "/Views/_ViewStart.cshtml",
             },
-            resources.OrderBy(r => r));
+            resources.OrderBy(r => r, StringComparer.Ordinal));
         }
 
         private Assembly LoadAssemblyFromBytes(params string[] paths)

From 2bbd247b1340513150ce5c5e541b1594e55aa893 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 18 Jan 2019 13:26:58 -0800
Subject: [PATCH 062/337] Convert CSharpNestedStatementsTest,
 CSharpReservedWordsTest, CSharpSpecialBlockTest and CSharpStatementTest to
 use ParseDocumentTest (dotnet/aspnetcore-tooling#148)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/45b304a348a2cf63c298dce19282d53d815cdaaf
---
 .../Language/Legacy/ParserTestBase.cs                            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 1899cf90c7..aed0d86c3e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -1,4 +1,3 @@
-
 // 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.
 

From ada61cf03ddaab359c47f69fc84ebd3192aed906 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 18 Jan 2019 17:54:20 -0800
Subject: [PATCH 063/337] Ensure updates to Razor components trigger design
 time build

* Use _RazorComponentInclude to determine the set of files to set Generator property for
* Run RazorGenerateComponentDeclarationDesignTime instead of RazorComponentGenerate during design time builds
* Update design time targets to set Generator for content files with .razor extension.

Fixes https://github.com/aspnet/AspNetCore/issues/6859
Fixes https://github.com/aspnet/AspNetCore/issues/6860
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/37d96aa4177e6bcdf50f4ceea579b2b278d5ba2c
---
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets |  7 +++++--
 .../Sdk.Razor.CurrentVersion.targets          | 21 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 29d5e8ea4c..6a40423d94 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -34,9 +34,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     to trigger a workspace update for the declaration files when they change.
   -->
   <ItemGroup>
-    <Content Update="@(RazorComponent)">
+    <Content Update="**\*.razor">
+      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
+    </Content>
+
+    <Content Update="$(_RazorComponentInclude)">
       <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 245a4e0143..5aa5c6ffb0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -92,11 +92,16 @@ Copyright (c) .NET Foundation. All rights reserved.
       _RazorAddDebugSymbolsProjectOutputGroupOutput
     </DebugSymbolsProjectOutputGroupDependsOn>
 
-    <CoreCompileDependsOn>
+    <CoreCompileDependsOn Condition="'$(DesignTimeBuild)'!='true'">
       RazorComponentGenerate;
       $(CoreCompileDependsOn)
     </CoreCompileDependsOn>
 
+    <CoreCompileDependsOn Condition="'$(DesignTimeBuild)'=='true'">
+      RazorGenerateComponentDeclarationDesignTime;
+      $(CoreCompileDependsOn)
+    </CoreCompileDependsOn>
+
     <PrepareForBuildDependsOn>
       $(PrepareForBuildDependsOn);
       ResolveRazorGenerateInputs
@@ -408,8 +413,22 @@ Copyright (c) .NET Foundation. All rights reserved.
       <RazorComponent Include="@(Content)" Condition="'%(Content.Extension)'=='.razor'" />
       <RazorComponent Include="$(_RazorComponentInclude)" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Content Condition="'%(Content.Extension)'=='.razor'" CopyToPublishDirectory="Never" />
+    </ItemGroup>
   </Target>
 
+  <!--
+    Temporarary workaround for https://github.com/aspnet/AspNetCore/issues/6859. This can be removed after a VS insertion with a newer copy of the DesignTime targets.
+  -->
+  <ItemGroup>
+    <Content Update="$(_RazorComponentInclude)">
+      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
   <Target Name="AssignRazorComponentTargetPaths" Condition="'@(RazorComponent)' != ''">
     <AssignTargetPath Files="@(RazorComponent)" RootFolder="$(MSBuildProjectDirectory)">
       <Output TaskParameter="AssignedFiles" ItemName="RazorComponentWithTargetPath" />

From f97ab076b555e4c3e0afc066706cf5a233e1d0d4 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 22 Jan 2019 11:21:17 -0800
Subject: [PATCH 064/337] Fix missing transition in using keyword \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/dd45375f72ade5310f8c7ce92079584e4177496d

---
 .../src/Legacy/CSharpCodeParser.cs                           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index bfdcbad2aa..2abfa4ff27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1982,6 +1982,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             else
             {
+                if (transition != null)
+                {
+                    builder.Add(transition);
+                }
+
                 AcceptAndMoveNext();
                 AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
             }

From 542d17bbfa8d815cae8d781b0fae963d31cbf21f Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 22 Jan 2019 12:48:43 -0800
Subject: [PATCH 065/337] Fix tag grouping for tags with no name \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/e24c9b25a47fc4bf3a6c1e8de2710de0ee960612

---
 .../src/Legacy/HtmlMarkupParser.cs            | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 85f7540dd9..02c7eec22d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -480,7 +480,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var endTagStart = CurrentStart;
                 var endTag = ParseEndTag(mode, out var endTagName, out var _);
 
-                if (endTagName != null && string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
+                Debug.Assert(endTagName != null);
+                if (string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
                 {
                     // Happy path. Found a matching start tag. Create the element and reset the builder.
                     var tracker = _tagTracker.Pop();
@@ -520,7 +521,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 // We can't possibly have a matching start tag.
                 Context.ErrorSink.OnError(
                     RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
-                        new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), endTagName.Length), endTagName));
+                        new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), Math.Max(endTagName.Length, 1)), endTagName));
                 return;
             }
 
@@ -602,8 +603,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             Assert(SyntaxKind.OpenAngle);
 
-            tagName = null;
-            tagMode = MarkupTagMode.Invalid;
+            tagName = string.Empty;
+            tagMode = MarkupTagMode.Normal;
             isWellFormed = false;
 
             var openAngleToken = EatCurrentToken(); // Accept '<'
@@ -612,7 +613,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             if (At(SyntaxKind.Text))
             {
                 tagName = CurrentToken.Content;
-                tagMode = MarkupTagMode.Normal;
 
                 if (isBangEscape)
                 {
@@ -658,9 +658,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     Context.ErrorSink.OnError(
                         RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
                             new SourceSpan(
-                                tagName == null ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
-                                Math.Max(tagName?.Length ?? 0, 1)),
-                            tagName ?? string.Empty));
+                                tagName.Length == 0 ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
+                                Math.Max(tagName.Length, 1)),
+                            tagName));
                 }
                 else
                 {
@@ -727,6 +727,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
+            if (tagNameToken.IsMissing && closeAngleToken.IsMissing)
+            {
+                // We want to consider tags with no name and no closing angle as invalid.
+                // E.g,
+                // <, <  @DateTime.Now are all invalid tags
+                // <>, < @DateTime.Now>, <strong are all still valid.
+                tagMode = MarkupTagMode.Invalid;
+            }
+
             return GetNodeWithSpanContext(startTag);
         }
 
@@ -806,7 +815,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // This section can accept things like: '</p  >' or '</p>' etc.
             Assert(SyntaxKind.OpenAngle);
 
-            tagName = null;
+            tagName = string.Empty;
             SyntaxToken tagNameToken = null;
 
             var openAngleToken = EatCurrentToken(); // Accept '<'

From 6c6e048dccc0809a70c23507122f90b6abd8d965 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 22 Jan 2019 11:21:17 -0800
Subject: [PATCH 066/337] Fix missing transition in using keyword \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/02781b17cd5bd4d124da5e648c2d414cf6125659

---
 .../src/Legacy/CSharpCodeParser.cs                           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index bfdcbad2aa..2abfa4ff27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1982,6 +1982,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             else
             {
+                if (transition != null)
+                {
+                    builder.Add(transition);
+                }
+
                 AcceptAndMoveNext();
                 AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
             }

From cdaad2964d71a97cea550ea845f001ad91177872 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 22 Jan 2019 12:48:43 -0800
Subject: [PATCH 067/337] Fix tag grouping for tags with no name \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/f5c1068d88784b7f6e07eef707138e2f02792f2c

---
 .../src/Legacy/HtmlMarkupParser.cs            | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 85f7540dd9..02c7eec22d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -480,7 +480,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var endTagStart = CurrentStart;
                 var endTag = ParseEndTag(mode, out var endTagName, out var _);
 
-                if (endTagName != null && string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
+                Debug.Assert(endTagName != null);
+                if (string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
                 {
                     // Happy path. Found a matching start tag. Create the element and reset the builder.
                     var tracker = _tagTracker.Pop();
@@ -520,7 +521,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 // We can't possibly have a matching start tag.
                 Context.ErrorSink.OnError(
                     RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
-                        new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), endTagName.Length), endTagName));
+                        new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), Math.Max(endTagName.Length, 1)), endTagName));
                 return;
             }
 
@@ -602,8 +603,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             Assert(SyntaxKind.OpenAngle);
 
-            tagName = null;
-            tagMode = MarkupTagMode.Invalid;
+            tagName = string.Empty;
+            tagMode = MarkupTagMode.Normal;
             isWellFormed = false;
 
             var openAngleToken = EatCurrentToken(); // Accept '<'
@@ -612,7 +613,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             if (At(SyntaxKind.Text))
             {
                 tagName = CurrentToken.Content;
-                tagMode = MarkupTagMode.Normal;
 
                 if (isBangEscape)
                 {
@@ -658,9 +658,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     Context.ErrorSink.OnError(
                         RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
                             new SourceSpan(
-                                tagName == null ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
-                                Math.Max(tagName?.Length ?? 0, 1)),
-                            tagName ?? string.Empty));
+                                tagName.Length == 0 ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
+                                Math.Max(tagName.Length, 1)),
+                            tagName));
                 }
                 else
                 {
@@ -727,6 +727,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
+            if (tagNameToken.IsMissing && closeAngleToken.IsMissing)
+            {
+                // We want to consider tags with no name and no closing angle as invalid.
+                // E.g,
+                // <, <  @DateTime.Now are all invalid tags
+                // <>, < @DateTime.Now>, <strong are all still valid.
+                tagMode = MarkupTagMode.Invalid;
+            }
+
             return GetNodeWithSpanContext(startTag);
         }
 
@@ -806,7 +815,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // This section can accept things like: '</p  >' or '</p>' etc.
             Assert(SyntaxKind.OpenAngle);
 
-            tagName = null;
+            tagName = string.Empty;
             SyntaxToken tagNameToken = null;
 
             var openAngleToken = EatCurrentToken(); // Accept '<'

From 67588374aae99a51e6acb6fec722b10fa5d43fdb Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 23 Jan 2019 15:38:37 -0800
Subject: [PATCH 068/337] Convert HtmlAttributeTest to use ParseDocument

aspnet/AspNetCoredotnet/aspnetcore-tooling#6470
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/61b7265bed9d72e0d2cf3ba74701aae02df1d49a
---
 .../Language/Legacy/ParserTestBase.cs                      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index aed0d86c3e..7338819a95 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -314,7 +314,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
         {
-            var result = ParseDocument(document, designTime, directives);
+            ParseDocumentTest(RazorLanguageVersion.Latest, document, directives, designTime);
+        }
+
+        internal virtual void ParseDocumentTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
+        {
+            var result = ParseDocument(version, document, directives, designTime);
 
             BaselineTest(result);
         }

From 642a2f57893d7be987216e6cc76fde80fbd80884 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 24 Jan 2019 12:42:10 -0800
Subject: [PATCH 069/337] Final cleanup to remove all traces of ParseBlockTest
 (dotnet/aspnetcore-tooling#169)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e1608721428fb79fbaa0f42cdd0896e80a884356
---
 .../Language/Legacy/ParserTestBase.cs         | 85 +------------------
 .../Language/SyntaxTreeVerifier.cs            |  5 +-
 2 files changed, 4 insertions(+), 86 deletions(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 7338819a95..15b9138276 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -171,18 +171,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return Regex.Replace(content, "(?<!\r)\n", "\r\n", RegexOptions.None, TimeSpan.FromSeconds(10));
         }
 
-        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true, bool ensureFullFidelity = true, int? expectedParseLength = null)
+        internal virtual void BaselineTest(RazorSyntaxTree syntaxTree, bool verifySyntaxTree = true, bool ensureFullFidelity = true)
         {
             if (verifySyntaxTree)
             {
-                SyntaxTreeVerifier.Verify(syntaxTree, ensureFullFidelity, expectedParseLength);
+                SyntaxTreeVerifier.Verify(syntaxTree, ensureFullFidelity);
             }
 
             AssertSyntaxTreeNodeMatchesBaseline(syntaxTree);
         }
 
-        internal abstract RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime);
-
         internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, IEnumerable<DirectiveDescriptor> directives = null, RazorParserFeatureFlags featureFlags = null)
         {
             return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime, featureFlags);
@@ -218,85 +216,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return syntaxTree;
         }
 
-        internal virtual RazorSyntaxTree ParseHtmlBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false)
-        {
-            directives = directives ?? Array.Empty<DirectiveDescriptor>();
-
-            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
-
-            var options = CreateParserOptions(version, directives, designTime);
-            var context = new ParserContext(source, options);
-
-            var codeParser = new CSharpCodeParser(directives, context);
-            var markupParser = new HtmlMarkupParser(context);
-
-            codeParser.HtmlParser = markupParser;
-            markupParser.CodeParser = codeParser;
-
-            var root = markupParser.ParseBlock().CreateRed();
-
-            var diagnostics = context.ErrorSink.Errors;
-
-            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
-
-            return syntaxTree;
-        }
-
-        internal virtual RazorSyntaxTree ParseCodeBlock(
-            RazorLanguageVersion version,
-            string document,
-            IEnumerable<DirectiveDescriptor> directives,
-            bool designTime)
-        {
-            directives = directives ?? Array.Empty<DirectiveDescriptor>();
-
-            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
-
-            var options = CreateParserOptions(version, directives, designTime);
-            var context = new ParserContext(source, options);
-
-            var codeParser = new CSharpCodeParser(directives, context);
-            var markupParser = new HtmlMarkupParser(context);
-
-            codeParser.HtmlParser = markupParser;
-            markupParser.CodeParser = codeParser;
-
-            var root = codeParser.ParseBlock().CreateRed();
-
-            var diagnostics = context.ErrorSink.Errors;
-
-            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
-
-            return syntaxTree;
-        }
-
-        internal virtual void ParseBlockTest(string document, int? expectedParseLength = null)
-        {
-            ParseBlockTest(document, null, false, expectedParseLength);
-        }
-
-        internal virtual void ParseBlockTest(string document, bool designTime, int? expectedParseLength = null)
-        {
-            ParseBlockTest(document, null, designTime, expectedParseLength);
-        }
-
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, int? expectedParseLength = null)
-        {
-            ParseBlockTest(document, directives, false, expectedParseLength);
-        }
-
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, int? expectedParseLength = null)
-        {
-            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime, expectedParseLength);
-        }
-
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, int? expectedParseLength = null)
-        {
-            var result = ParseBlock(version, document, directives, designTime);
-
-            BaselineTest(result, expectedParseLength: expectedParseLength);
-        }
-
         internal virtual void ParseDocumentTest(string document)
         {
             ParseDocumentTest(document, null, false);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
index f0627432cb..f4f416616c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     // Verifies recursively that a syntax tree has no gaps in terms of position/location.
     internal class SyntaxTreeVerifier
     {
-        public static void Verify(RazorSyntaxTree syntaxTree, bool ensureFullFidelity = true, int? expectedParseLength = null)
+        public static void Verify(RazorSyntaxTree syntaxTree, bool ensureFullFidelity = true)
         {
             var verifier = new Verifier(syntaxTree.Source);
             verifier.Visit(syntaxTree.Root);
@@ -21,8 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 var syntaxTreeString = syntaxTree.Root.ToFullString();
                 var builder = new StringBuilder(syntaxTree.Source.Length);
-                var sourceLength = expectedParseLength ?? syntaxTree.Source.Length;
-                for (var i = 0; i < sourceLength; i++)
+                for (var i = 0; i < syntaxTree.Source.Length; i++)
                 {
                     builder.Append(syntaxTree.Source[i]);
                 }

From d4c3a2fbd9c020dbfdecfbe27e594db1da1202c6 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 24 Jan 2019 16:57:16 -0800
Subject: [PATCH 070/337] Fix dependency to aspnet/AspNetCore-Tooling
 (dotnet/aspnetcore-tooling#170)

* Remove unused package versions
* Remove references to Html.Abstractions
Removing this package since it's from the aspnet/AspNetCore.

* Remove System.ValueTuple package inside remove
* Add versions.details.xml items from corefx
* Add Microsoft.NETCore.App
* Fill up Version.Details.xml
* Update dependencies
* Fix failing test
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/bd7fc9ddf67dec0d582168bcd3d1d4681747f81a
---
 .../IntegrationTests/BuildIntegrationTest.cs  |  5 +-
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  1 -
 ...NetCore.Razor.Test.MvcShim.ClassLib.csproj |  4 +-
 .../Microsoft.AspNetCore.Html/IHtmlContent.cs | 22 +++++++
 .../IHtmlContentBuilder.cs                    | 40 ++++++++++++
 .../IHtmlContentContainer.cs                  | 30 +++++++++
 .../TagHelperContent.cs                       |  5 --
 ...tCore.Razor.Test.MvcShim.Version1_X.csproj |  2 +-
 .../Microsoft.AspNetCore.Html/HtmlString.cs   | 61 +++++++++++++++++++
 .../Microsoft.AspNetCore.Html/IHtmlContent.cs | 22 +++++++
 .../IHtmlContentBuilder.cs                    | 40 ++++++++++++
 .../IHtmlContentContainer.cs                  | 30 +++++++++
 .../TagHelperContent.cs                       |  5 --
 ...tCore.Razor.Test.MvcShim.Version2_X.csproj |  2 +-
 .../Microsoft.AspNetCore.Html/HtmlString.cs   | 61 +++++++++++++++++++
 .../Microsoft.AspNetCore.Html/IHtmlContent.cs | 22 +++++++
 .../IHtmlContentBuilder.cs                    | 40 ++++++++++++
 .../IHtmlContentContainer.cs                  | 30 +++++++++
 .../TagHelperContent.cs                       |  5 --
 ...osoft.AspNetCore.Razor.Test.MvcShim.csproj |  4 +-
 .../AppWithP2PReference.csproj                |  1 -
 .../ClassLibrary/ClassLibrary.csproj          |  1 -
 .../ClassLibrary2/ClassLibrary2.csproj        |  1 -
 .../LargeProject/LargeProject.csproj          |  1 -
 .../MvcWithComponents.csproj                  |  1 -
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  1 -
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  1 -
 .../testassets/SimplePages/SimplePages.csproj |  1 -
 28 files changed, 407 insertions(+), 32 deletions(-)
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/HtmlString.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/HtmlString.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContent.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 6ba9ac9be8..5c0562d7dc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -245,12 +245,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "SimpleMvc.deps.json");
             var depsFilePath = Path.Combine(Project.DirectoryPath, OutputPath, "SimpleMvc.deps.json");
             var dependencyContext = ReadDependencyContext(depsFilePath);
+
             // Pick a couple of libraries and ensure they have some compile references
-            var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "Microsoft.AspNetCore.Html.Abstractions");
+            var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "Microsoft.NETCore.App");
             Assert.NotEmpty(packageReference.Assemblies);
 
             var projectReference = dependencyContext.CompileLibraries.First(l => l.Name == "SimpleMvc");
-            Assert.NotEmpty(packageReference.Assemblies);
+            Assert.NotEmpty(projectReference.Assemblies);
 
             Assert.Contains(customDefine, dependencyContext.CompilationOptions.Defines);
         }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 9aee6cab0f..65b089fc15 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -29,7 +29,6 @@
   <!-- The test projects rely on these binaries being available -->
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
index bbfde1da9b..8ce2215ec2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
-
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+    
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
   </ItemGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContent.cs
new file mode 100644
index 0000000000..2e9a0f19e2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContent.cs
@@ -0,0 +1,22 @@
+// 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.IO;
+using System.Text.Encodings.Web;
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// HTML content which can be written to a TextWriter.
+    /// </summary>
+    public interface IHtmlContent
+    {
+        /// <summary>
+        /// Writes the content by encoding it with the specified <paramref name="encoder"/>
+        /// to the specified <paramref name="writer"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/> to which the content is written.</param>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/> which encodes the content to be written.</param>
+        void WriteTo(TextWriter writer, HtmlEncoder encoder);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
new file mode 100644
index 0000000000..3cf3a65aab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
@@ -0,0 +1,40 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// A builder for HTML content.
+    /// </summary>
+    public interface IHtmlContentBuilder : IHtmlContentContainer
+    {
+        /// <summary>
+        /// Appends an <see cref="IHtmlContent"/> instance.
+        /// </summary>
+        /// <param name="content">The <see cref="IHtmlContent"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder AppendHtml(IHtmlContent content);
+
+        /// <summary>
+        /// Appends a <see cref="string"/> value. The value is treated as unencoded as-provided, and will be HTML
+        /// encoded before writing to output.
+        /// </summary>
+        /// <param name="unencoded">The <see cref="string"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder Append(string unencoded);
+
+        /// <summary>
+        /// Appends an HTML encoded <see cref="string"/> value. The value is treated as HTML encoded as-provided, and
+        /// no further encoding will be performed.
+        /// </summary>
+        /// <param name="encoded">The HTML encoded <see cref="string"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder AppendHtml(string encoded);
+
+        /// <summary>
+        /// Clears the content.
+        /// </summary>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder Clear();
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
new file mode 100644
index 0000000000..0cddf6e0d6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// Defines a contract for <see cref="IHtmlContent"/> instances made up of several components which
+    /// can be copied into an <see cref="IHtmlContentBuilder"/>.
+    /// </summary>
+    public interface IHtmlContentContainer : IHtmlContent
+    {
+        /// <summary>
+        /// Copies the contained content of this <see cref="IHtmlContentContainer"/> into <paramref name="builder"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IHtmlContentBuilder"/>.</param>
+        void CopyTo(IHtmlContentBuilder builder);
+
+        /// <summary>
+        /// <para>
+        /// Moves the contained content of this <see cref="IHtmlContentContainer"/> into <paramref name="builder"/>.
+        /// </para>
+        /// <para>
+        /// After <see cref="MoveTo"/> is called, this <see cref="IHtmlContentContainer"/> instance should be left
+        /// in an empty state.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="IHtmlContentBuilder"/>.</param>
+        void MoveTo(IHtmlContentBuilder builder);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
index 7a6d380215..b144bd3689 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
@@ -30,7 +30,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
         {
-            HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
             return this;
         }
 
@@ -44,7 +43,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetContent(string unencoded)
         {
-            HtmlContentBuilderExtensions.SetContent(this, unencoded);
             return this;
         }
 
@@ -58,7 +56,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetHtmlContent(string encoded)
         {
-            HtmlContentBuilderExtensions.SetHtmlContent(this, encoded);
             return this;
         }
 
@@ -96,7 +93,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the append operation has completed.</returns>
         public TagHelperContent AppendFormat(string format, params object[] args)
         {
-            HtmlContentBuilderExtensions.AppendFormat(this, null, format, args);
             return this;
         }
 
@@ -113,7 +109,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the append operation has completed.</returns>
         public TagHelperContent AppendFormat(IFormatProvider provider, string format, params object[] args)
         {
-            HtmlContentBuilderExtensions.AppendFormat(this, provider, format, args);
             return this;
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
index bd2e0104cc..b3c5ef2c7b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/HtmlString.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/HtmlString.cs
new file mode 100644
index 0000000000..6cb37dec3b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/HtmlString.cs
@@ -0,0 +1,61 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// An <see cref="IHtmlContent"/> implementation that wraps an HTML encoded <see cref="string"/>.
+    /// </summary>
+    public class HtmlString : IHtmlContent
+    {
+        /// <summary>
+        /// An <see cref="HtmlString"/> instance for <see cref="Environment.NewLine"/>.
+        /// </summary>
+        public static readonly HtmlString NewLine = new HtmlString(Environment.NewLine);
+
+        /// <summary>
+        /// An <see cref="HtmlString"/> instance for <see cref="string.Empty"/>.
+        /// </summary>
+        public static readonly HtmlString Empty = new HtmlString(string.Empty);
+
+        /// <summary>
+        /// Creates a new <see cref="HtmlString"/>.
+        /// </summary>
+        /// <param name="value">The HTML encoded value.</param>
+        public HtmlString(string value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the HTML encoded value.
+        /// </summary>
+        public string Value { get; }
+
+        /// <inheritdoc />
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            writer.Write(Value);
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Value ?? string.Empty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContent.cs
new file mode 100644
index 0000000000..2e9a0f19e2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContent.cs
@@ -0,0 +1,22 @@
+// 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.IO;
+using System.Text.Encodings.Web;
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// HTML content which can be written to a TextWriter.
+    /// </summary>
+    public interface IHtmlContent
+    {
+        /// <summary>
+        /// Writes the content by encoding it with the specified <paramref name="encoder"/>
+        /// to the specified <paramref name="writer"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/> to which the content is written.</param>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/> which encodes the content to be written.</param>
+        void WriteTo(TextWriter writer, HtmlEncoder encoder);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
new file mode 100644
index 0000000000..3cf3a65aab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
@@ -0,0 +1,40 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// A builder for HTML content.
+    /// </summary>
+    public interface IHtmlContentBuilder : IHtmlContentContainer
+    {
+        /// <summary>
+        /// Appends an <see cref="IHtmlContent"/> instance.
+        /// </summary>
+        /// <param name="content">The <see cref="IHtmlContent"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder AppendHtml(IHtmlContent content);
+
+        /// <summary>
+        /// Appends a <see cref="string"/> value. The value is treated as unencoded as-provided, and will be HTML
+        /// encoded before writing to output.
+        /// </summary>
+        /// <param name="unencoded">The <see cref="string"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder Append(string unencoded);
+
+        /// <summary>
+        /// Appends an HTML encoded <see cref="string"/> value. The value is treated as HTML encoded as-provided, and
+        /// no further encoding will be performed.
+        /// </summary>
+        /// <param name="encoded">The HTML encoded <see cref="string"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder AppendHtml(string encoded);
+
+        /// <summary>
+        /// Clears the content.
+        /// </summary>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder Clear();
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
new file mode 100644
index 0000000000..0cddf6e0d6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// Defines a contract for <see cref="IHtmlContent"/> instances made up of several components which
+    /// can be copied into an <see cref="IHtmlContentBuilder"/>.
+    /// </summary>
+    public interface IHtmlContentContainer : IHtmlContent
+    {
+        /// <summary>
+        /// Copies the contained content of this <see cref="IHtmlContentContainer"/> into <paramref name="builder"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IHtmlContentBuilder"/>.</param>
+        void CopyTo(IHtmlContentBuilder builder);
+
+        /// <summary>
+        /// <para>
+        /// Moves the contained content of this <see cref="IHtmlContentContainer"/> into <paramref name="builder"/>.
+        /// </para>
+        /// <para>
+        /// After <see cref="MoveTo"/> is called, this <see cref="IHtmlContentContainer"/> instance should be left
+        /// in an empty state.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="IHtmlContentBuilder"/>.</param>
+        void MoveTo(IHtmlContentBuilder builder);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
index 7a6d380215..b144bd3689 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
@@ -30,7 +30,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
         {
-            HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
             return this;
         }
 
@@ -44,7 +43,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetContent(string unencoded)
         {
-            HtmlContentBuilderExtensions.SetContent(this, unencoded);
             return this;
         }
 
@@ -58,7 +56,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetHtmlContent(string encoded)
         {
-            HtmlContentBuilderExtensions.SetHtmlContent(this, encoded);
             return this;
         }
 
@@ -96,7 +93,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the append operation has completed.</returns>
         public TagHelperContent AppendFormat(string format, params object[] args)
         {
-            HtmlContentBuilderExtensions.AppendFormat(this, null, format, args);
             return this;
         }
 
@@ -113,7 +109,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the append operation has completed.</returns>
         public TagHelperContent AppendFormat(IFormatProvider provider, string format, params object[] args)
         {
-            HtmlContentBuilderExtensions.AppendFormat(this, provider, format, args);
             return this;
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
index bd2e0104cc..b3c5ef2c7b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/HtmlString.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/HtmlString.cs
new file mode 100644
index 0000000000..6cb37dec3b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/HtmlString.cs
@@ -0,0 +1,61 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// An <see cref="IHtmlContent"/> implementation that wraps an HTML encoded <see cref="string"/>.
+    /// </summary>
+    public class HtmlString : IHtmlContent
+    {
+        /// <summary>
+        /// An <see cref="HtmlString"/> instance for <see cref="Environment.NewLine"/>.
+        /// </summary>
+        public static readonly HtmlString NewLine = new HtmlString(Environment.NewLine);
+
+        /// <summary>
+        /// An <see cref="HtmlString"/> instance for <see cref="string.Empty"/>.
+        /// </summary>
+        public static readonly HtmlString Empty = new HtmlString(string.Empty);
+
+        /// <summary>
+        /// Creates a new <see cref="HtmlString"/>.
+        /// </summary>
+        /// <param name="value">The HTML encoded value.</param>
+        public HtmlString(string value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the HTML encoded value.
+        /// </summary>
+        public string Value { get; }
+
+        /// <inheritdoc />
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            writer.Write(Value);
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Value ?? string.Empty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContent.cs
new file mode 100644
index 0000000000..2e9a0f19e2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContent.cs
@@ -0,0 +1,22 @@
+// 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.IO;
+using System.Text.Encodings.Web;
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// HTML content which can be written to a TextWriter.
+    /// </summary>
+    public interface IHtmlContent
+    {
+        /// <summary>
+        /// Writes the content by encoding it with the specified <paramref name="encoder"/>
+        /// to the specified <paramref name="writer"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/> to which the content is written.</param>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/> which encodes the content to be written.</param>
+        void WriteTo(TextWriter writer, HtmlEncoder encoder);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
new file mode 100644
index 0000000000..3cf3a65aab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentBuilder.cs
@@ -0,0 +1,40 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// A builder for HTML content.
+    /// </summary>
+    public interface IHtmlContentBuilder : IHtmlContentContainer
+    {
+        /// <summary>
+        /// Appends an <see cref="IHtmlContent"/> instance.
+        /// </summary>
+        /// <param name="content">The <see cref="IHtmlContent"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder AppendHtml(IHtmlContent content);
+
+        /// <summary>
+        /// Appends a <see cref="string"/> value. The value is treated as unencoded as-provided, and will be HTML
+        /// encoded before writing to output.
+        /// </summary>
+        /// <param name="unencoded">The <see cref="string"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder Append(string unencoded);
+
+        /// <summary>
+        /// Appends an HTML encoded <see cref="string"/> value. The value is treated as HTML encoded as-provided, and
+        /// no further encoding will be performed.
+        /// </summary>
+        /// <param name="encoded">The HTML encoded <see cref="string"/> to append.</param>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder AppendHtml(string encoded);
+
+        /// <summary>
+        /// Clears the content.
+        /// </summary>
+        /// <returns>The <see cref="IHtmlContentBuilder"/>.</returns>
+        IHtmlContentBuilder Clear();
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
new file mode 100644
index 0000000000..0cddf6e0d6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Html/IHtmlContentContainer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Html
+{
+    /// <summary>
+    /// Defines a contract for <see cref="IHtmlContent"/> instances made up of several components which
+    /// can be copied into an <see cref="IHtmlContentBuilder"/>.
+    /// </summary>
+    public interface IHtmlContentContainer : IHtmlContent
+    {
+        /// <summary>
+        /// Copies the contained content of this <see cref="IHtmlContentContainer"/> into <paramref name="builder"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IHtmlContentBuilder"/>.</param>
+        void CopyTo(IHtmlContentBuilder builder);
+
+        /// <summary>
+        /// <para>
+        /// Moves the contained content of this <see cref="IHtmlContentContainer"/> into <paramref name="builder"/>.
+        /// </para>
+        /// <para>
+        /// After <see cref="MoveTo"/> is called, this <see cref="IHtmlContentContainer"/> instance should be left
+        /// in an empty state.
+        /// </para>
+        /// </summary>
+        /// <param name="builder">The <see cref="IHtmlContentBuilder"/>.</param>
+        void MoveTo(IHtmlContentBuilder builder);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
index 7a6d380215..b144bd3689 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.TagHelpers/TagHelperContent.cs
@@ -30,7 +30,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetHtmlContent(IHtmlContent htmlContent)
         {
-            HtmlContentBuilderExtensions.SetHtmlContent(this, htmlContent);
             return this;
         }
 
@@ -44,7 +43,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetContent(string unencoded)
         {
-            HtmlContentBuilderExtensions.SetContent(this, unencoded);
             return this;
         }
 
@@ -58,7 +56,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the set operation has completed.</returns>
         public TagHelperContent SetHtmlContent(string encoded)
         {
-            HtmlContentBuilderExtensions.SetHtmlContent(this, encoded);
             return this;
         }
 
@@ -96,7 +93,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the append operation has completed.</returns>
         public TagHelperContent AppendFormat(string format, params object[] args)
         {
-            HtmlContentBuilderExtensions.AppendFormat(this, null, format, args);
             return this;
         }
 
@@ -113,7 +109,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         /// <returns>A reference to this instance after the append operation has completed.</returns>
         public TagHelperContent AppendFormat(IFormatProvider provider, string format, params object[] args)
         {
-            HtmlContentBuilderExtensions.AppendFormat(this, provider, format, args);
             return this;
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index 10bebabe02..868c485056 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
-
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+    
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 271eb90067..bbd86a5772 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index fdb58e05fe..036f56d5cb 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -30,7 +30,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 4d4cd2f2a3..eaf99c9257 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index e2cdd3ae0f..0581e93450 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>  
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 9de30c05d9..d89f94bc3e 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 160e4d5686..12fca67a75 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index c972b84e4b..4edd0713ca 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -29,7 +29,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>  
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index afc2b469d0..858eeeb71e 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
-    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>

From 4505f76987cda3f26cbae15ef034b614591bc7e4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 24 Jan 2019 11:40:59 -0800
Subject: [PATCH 071/337] Ensure TagHelpers from the current project are
 discovered for projects targeting 2.x

As part of migrating the CodeGeneration targets in to the Razor.Sdk,
the SDK broke the contract that RazorReferencePaths includes the full closure
of assemblies during tag helper discovery.

This change restores the behavior to be compatible with the 2.x Razor.Design
package and adds tests to verify TagHelper discovery works in a range of projects.

Fixes https://github.com/aspnet/AspNetCore/issues/6825
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/99938c9b7e62896060b7d6f8a225cceb28da2c8d
---
 ...osoft.NET.Sdk.Razor.CodeGeneration.targets |  9 ++---
 ...icrosoft.NET.Sdk.Razor.Compilation.targets |  3 +-
 .../Microsoft.NET.Sdk.Razor.Component.targets |  2 +-
 .../Sdk.Razor.CurrentVersion.targets          | 34 +++++++++++++------
 .../BuildIntegrationTest21.cs                 |  9 +++++
 .../BuildIntegrationTest22.cs                 |  9 +++++
 .../BuildServerIntegrationTest.cs             |  5 +++
 .../MvcWithComponents/SimpleTagHelper.cs      |  8 +++++
 .../testassets/SimpleMvc21/SimpleTagHelper.cs |  8 +++++
 .../testassets/SimpleMvc22/SimpleTagHelper.cs |  8 +++++
 10 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/SimpleTagHelper.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc21/SimpleTagHelper.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/SimpleTagHelper.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 72d170a7d2..72599af998 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -70,14 +70,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
-  <Target
+   <!-- Force a Compile to happen if we are not doing a components build. This keeps parity with 2.x CodeGeneration targets -->
+   <Target
     Name="_RazorEnsureCompiled"
-    Condition="!Exists('$(_RazorGenerateTargetReferenceAssembly)')"
+    Condition="'$(_RazorComponentDeclarationAssemblyFullPath)' == ''"
     DependsOnTargets="Compile" />
 
   <Target
     Name="ResolveTagHelperRazorGenerateInputs"
-    Inputs="$(MSBuildAllProjects);@(RazorReferencePath);$(_RazorGenerateTargetReferenceAssembly)"
+    Inputs="$(MSBuildAllProjects);@(RazorReferencePath)"
     DependsOnTargets="_RazorEnsureCompiled"
     Outputs="$(_RazorTagHelperInputCache)"
     Condition="'@(RazorGenerateWithTargetPath)' != ''">
@@ -105,7 +106,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Version="$(RazorLangVersion)"
       Configuration="@(ResolvedRazorConfiguration)"
       Extensions="@(ResolvedRazorExtension)"
-      Assemblies="@(RazorReferencePath);$(_RazorGenerateTargetReferenceAssembly)"
+      Assemblies="@(RazorReferencePath)"
       ProjectRoot="$(MSBuildProjectDirectory)"
       TagHelperManifest="$(_RazorTagHelperOutputCache)">
       <Output
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index bf20970c29..102315ebc4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -54,7 +54,6 @@ Copyright (c) .NET Foundation. All rights reserved.
           Inputs="$(MSBuildAllProjects);
                   @(RazorCompile);
                   $(AssemblyOriginatorKeyFile);
-                  $(_RazorCompileTargetReferenceAssembly);
                   @(RazorReferencePath);
                   @(CompiledLicenseFile);
                   @(LinkResource);
@@ -148,7 +147,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          Prefer32Bit="$(Prefer32Bit)"
          PreferredUILang="$(PreferredUILang)"
          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
-         References="@(RazorReferencePath);$(_RazorCompileTargetReferenceAssembly)"
+         References="@(RazorReferencePath)"
          ReportAnalyzer="$(ReportAnalyzer)"
          Resources="@(_RazorCoreCompileResourceInputs);@(CompiledLicenseFile)"
          ResponseFiles="$(CompilerResponseFile)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index af7427334c..15088d3206 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -253,7 +253,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- Point to the declaration assembly to perform taghelper discovery -->
     <PropertyGroup>
-      <_RazorGenerateTargetReferenceAssembly>@(_RazorComponentDeclarationAssembly->Metadata('FullPath'))</_RazorGenerateTargetReferenceAssembly>
+      <_RazorComponentDeclarationAssemblyFullPath>@(_RazorComponentDeclarationAssembly->Metadata('FullPath'))</_RazorComponentDeclarationAssemblyFullPath>
     </PropertyGroup>
   </Target>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 5aa5c6ffb0..e148904829 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -74,7 +74,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PrepareForRazorCompileDependsOn>
 
     <ResolveRazorCompileInputsDependsOn>
-      ResolveRazorEmbeddedResources
+      ResolveRazorEmbeddedResources;
+      _FixupRazorReferencePathForRazorCompile;
     </ResolveRazorCompileInputsDependsOn>
 
     <RazorCompileDependsOn>
@@ -471,22 +472,33 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target
     Name="ResolveAssemblyReferenceRazorGenerateInputs"
     DependsOnTargets="ResolveReferences">
+
     <ItemGroup>
       <RazorReferencePath Include="@(ReferencePath)"/>
-    </ItemGroup>
 
-    <PropertyGroup>
       <!--
-        Assembly of the project used as input in RazorGenerate. This property is overwritten to point to the definition assembly when components are present.
+      RazorReferencePath must include the closure of assemblies required for tag helper discovery to keep parity with the 2.1 Razor.Design package.
+      Use the component declaration assembly, if available or the IntermediateAssembly if no components are involved in the build.
       -->
-      <_RazorGenerateTargetReferenceAssembly Condition="'$(_RazorGenerateTargetReferenceAssembly)'==''">
-        @(IntermediateAssembly->Metadata('FullPath'))
-      </_RazorGenerateTargetReferenceAssembly>
+      <RazorReferencePath
+        Include="$(_RazorComponentDeclarationAssemblyFullPath)"
+        Condition="'$(_RazorComponentDeclarationAssemblyFullPath)' != ''" />
 
-      <_RazorCompileTargetReferenceAssembly Condition="'$(_RazorCompileTargetReferenceAssembly)'==''">
-        @(IntermediateAssembly->Metadata('FullPath'))
-      </_RazorCompileTargetReferenceAssembly>
-    </PropertyGroup>
+      <RazorReferencePath
+        Include="@(IntermediateAssembly->Metadata('FullPath'))"
+        Condition="'$(_RazorComponentDeclarationAssemblyFullPath)' == ''" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_FixupRazorReferencePathForRazorCompile" Condition="'$(_RazorComponentDeclarationAssemblyFullPath)' != ''">
+    <!--
+      ResolveAssemblyReferenceRazorGenerateInputs may have added the component declaration assembly to RazorReferencePath to perform tag helper discovery.
+      However, we want to compile the Razor assembly against the actual output of the project build i.e. the IntermediateAssembly.
+    -->
+    <ItemGroup>
+      <RazorReferencePath Remove="$(_RazorComponentDeclarationAssemblyFullPath)" />
+      <RazorReferencePath Include="@(IntermediateAssembly->Metadata('FullPath'))" />
+    </ItemGroup>
   </Target>
 
   <!--
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
index 1da9401aba..ee221c6022 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
@@ -1,6 +1,7 @@
 // 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.IO;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -27,6 +28,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
             Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
             Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+
+            // Verify RazorTagHelper works
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc21.TagHelpers.input.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc21.TagHelpers.output.cache");
+            Assert.FileContains(
+                result,
+                Path.Combine(IntermediateOutputPath, "SimpleMvc21.TagHelpers.output.cache"),
+                @"""Name"":""SimpleMvc.SimpleTagHelper""");
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
index e3e0b890b4..00a4bdc1dc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
@@ -1,6 +1,7 @@
 // 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.IO;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -27,6 +28,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "SimpleMvc22.pdb");
             Assert.FileExists(result, OutputPath, "SimpleMvc22.Views.dll");
             Assert.FileExists(result, OutputPath, "SimpleMvc22.Views.pdb");
+
+            // Verify RazorTagHelper works
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc22.TagHelpers.input.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc22.TagHelpers.output.cache");
+            Assert.FileContains(
+                result,
+                Path.Combine(IntermediateOutputPath, "SimpleMvc22.TagHelpers.output.cache"),
+                @"""Name"":""SimpleMvc.SimpleTagHelper""");
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index bb144b162e..63d25a15b5 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -254,6 +254,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 result,
                 tagHelperOutputCacheFile,
                 @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            Assert.FileContains(
+                result,
+                tagHelperOutputCacheFile,
+                @"""Name"":""MvcWithComponents.SimpleTagHelper""");
         }
 
         private class TestProjectDirectory : ProjectDirectory
diff --git a/src/Razor/test/testassets/MvcWithComponents/SimpleTagHelper.cs b/src/Razor/test/testassets/MvcWithComponents/SimpleTagHelper.cs
new file mode 100644
index 0000000000..860954a44e
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/SimpleTagHelper.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace MvcWithComponents
+{
+    public class SimpleTagHelper : TagHelper
+    {
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc21/SimpleTagHelper.cs b/src/Razor/test/testassets/SimpleMvc21/SimpleTagHelper.cs
new file mode 100644
index 0000000000..7cc52922d9
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc21/SimpleTagHelper.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace SimpleMvc
+{
+    public class SimpleTagHelper : TagHelper
+    {
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc22/SimpleTagHelper.cs b/src/Razor/test/testassets/SimpleMvc22/SimpleTagHelper.cs
new file mode 100644
index 0000000000..7cc52922d9
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/SimpleTagHelper.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace SimpleMvc
+{
+    public class SimpleTagHelper : TagHelper
+    {
+    }
+}

From 57211a33db199fbb3f74773c5e0cd451b1b8277b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 30 Jan 2019 09:12:37 -0800
Subject: [PATCH 072/337] Fix: Exception for empty data- attributes in tag
 helpers (dotnet/aspnetcore-tooling#173)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6d71b6a265a221e49bc2f2f5b343fe45b0f952d4
---
 .../src/DefaultRazorIntermediateNodeLoweringPhase.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 9e0a0c0cf2..65c5d6c15e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -992,7 +992,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 IReadOnlyList<SyntaxNode> children = node.ChildNodes();
                 var position = node.Position;
-                if (children.First() is MarkupBlockSyntax markupBlock &&
+                if (children.FirstOrDefault() is MarkupBlockSyntax markupBlock &&
                     markupBlock.Children.Count == 2 &&
                     markupBlock.Children[0] is MarkupTextLiteralSyntax &&
                     markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)
@@ -1709,7 +1709,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 IReadOnlyList<SyntaxNode> children = node.ChildNodes();
                 var position = node.Position;
-                if (children.First() is MarkupBlockSyntax markupBlock &&
+                if (children.FirstOrDefault() is MarkupBlockSyntax markupBlock &&
                     markupBlock.Children.Count == 2 &&
                     markupBlock.Children[0] is MarkupTextLiteralSyntax &&
                     markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)

From 12a6864710331f312feef906e2e5ba5821d45adf Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 15 Jan 2019 14:53:20 -0800
Subject: [PATCH 073/337] Prioritize local dotnet when running SDK Razor tests.

- The SDK tests were occasionally failing with access denied due to the test using the machines dotnet.exe (instead of the local projects dotnet.exe).

dotnet/aspnetcore-tooling#1667
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/1a96714921c4e2edd2fa8c1e9c062cdf33ffbe33
---
 .../test/IntegrationTests/MSBuildProcessManager.cs             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index 30b8469289..c420b47bb8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
@@ -38,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
             else
             {
-                processStartInfo.FileName = "dotnet";
+                processStartInfo.FileName = DotNetMuxer.MuxerPathOrDefault();
                 processStartInfo.Arguments = $"msbuild {arguments}";
             }
 

From 83c8c0cba20db90ecafb3bf6eaf986c9295c03e3 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 15 Jan 2019 12:17:09 -0800
Subject: [PATCH 074/337] Don't associate Roslyn workspace project with
 ProjectSnapshot.

- Removed the differences of workspace project and `HostProject` in regards to `ProjectSnapshotManager` methods. We now just have `ProjectAdded`, `ProjectRemoved` etc.
- Obsoleted Workspace related members from the `ProjectSnapshot`in order to ensure that current LiveShare continues to work. Once LiveShare has been incorporated into Razor we can remove these members from the project snapshot.
- Removed several TagHelper calculating logic pieces from the document tracker. This is now done entirely from the ProjectSnapshotManager so there's no secondary route that needs to be taken in order to resolve TagHelpers for VS windows cases.
- Updated the `ProjectState` to take in TagHelpers and removed the internal logic it had to resolve TagHelpers.
- Added a TagHelpers property to ProjectSnapshot to indicate that they're no longer calculated, they're part of the project inputs.
- Added a ProjectWorkspaceChange generator to be responsible for calculating any workspace related information that is needed for a `ProjectSnapshot`. For now, this just calculates TagHelpers but in the future it may do more.
- Added a `FilePathComparison` static helper class which acts similarly to `FilePathComparer`.
- Changed our dynamic file info provider to no longer care about `ProjectIds`. Before this, it kept track of the project ids internally but never used them so this is a noop functional change.
- Changed how the out of process remote TagHelper resolution flow works. Prior to this you'd pass a Project across the wire as part of a project snapshot handle and then resolve TagHelpers the old fashioned way.
- Updated all existing tests to respect the new `ProjectWorkspaceState` flows.
- Added tests for new APIs.

dotnet/aspnetcore-tooling#6672
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a5621641f839dfa8e43c8d3d6b01552bf308a1b9
---
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index fc489b11de..adee145e23 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -16,5 +16,6 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("RazorDeveloperTools, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

From 1cbc513cfbbba7dbe56e57bda795e671e58aaf57 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 6 Feb 2019 13:11:57 -0800
Subject: [PATCH 075/337] Restore packages as part of build to avoid restore
 timeouts as part of running tests

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/1701
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7f49b97eb5b2b3eeeea71c8ceedad01715e1522a
---
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  | 12 +++++------
 .../RestoreTestProjects.csproj                | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 65b089fc15..e920cbae07 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -32,15 +32,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- We don't need anything in this assembly, we just want to make sure it's built -->
-    <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj" />
+
+    <!-- We don't need anything in this assembly, we just want to make sure it's built -->
+    <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
new file mode 100644
index 0000000000..c82a224ccd
--- /dev/null
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -0,0 +1,20 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ComponentLibrary\ComponentLibrary.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\LargeProject\LargeProject.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\SimplePages\SimplePages.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+</Project>

From b15af76917d6d7ace90d94c3f4b2465d734ccbd5 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 7 Feb 2019 14:02:10 -0800
Subject: [PATCH 076/337] Fix crash with code blocks in tag helper attributes
 (dotnet/aspnetcore-tooling#190)

* Fix crash with code blocks in tag helper attributes

* Better fix

* Fixed another case
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9e97ba9b9728ff874e68c591b15df3eb5293b40b
---
 .../src/Legacy/TagHelperBlockRewriter.cs      | 22 ++++++++++++++++
 .../IntegrationTests/IntegrationTestBase.cs   | 26 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index ebf32e9f70..a585b8781b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -480,6 +480,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return base.VisitRazorMetaCode(node);
             }
 
+            public override SyntaxNode VisitCSharpStatement(CSharpStatementSyntax node)
+            {
+                // We don't support code blocks inside tag helper attributes. Don't rewrite anything inside a code block.
+                // E.g, <p age="@{1 + 2}"> is not supported.
+                return node;
+            }
+
+            public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                // We don't support directives inside tag helper attributes. Don't rewrite anything inside a directive.
+                // E.g, <p age="@functions { }"> is not supported.
+                return node;
+            }
+
+            public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
+            {
+                // We're visiting an attribute value. If we encounter a MarkupElement this means the attribute value is invalid.
+                // We don't want to rewrite anything here.
+                // E.g, <my age="@if (true) { <my4 age=... }"></my4>
+                return node;
+            }
+
             public override SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
             {
                 if (!_tryParseResult.IsBoundNonStringAttribute)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index 11818a68dc..61890d8f61 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -409,7 +409,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 baselineDiagnostics = diagnosticsFile.ReadAllText();
             }
 
-            var actualDiagnostics = string.Concat(cSharpDocument.Diagnostics.Select(d => RazorDiagnosticSerializer.Serialize(d) + "\r\n"));
+            var actualDiagnostics = string.Concat(cSharpDocument.Diagnostics.Select(d => NormalizeNewLines(RazorDiagnosticSerializer.Serialize(d)) + "\r\n"));
             Assert.Equal(baselineDiagnostics, actualDiagnostics);
         }
 
@@ -541,6 +541,30 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 }
                 return base.VisitCSharpExpressionLiteral(node);
             }
+
+            public override Syntax.SyntaxNode VisitCSharpStatement(CSharpStatementSyntax node)
+            {
+                if (node.FirstAncestorOrSelf<MarkupTagHelperAttributeValueSyntax>() != null)
+                {
+                    // We don't support code blocks inside tag helper attribute values.
+                    // If it exists, we don't want to track its code spans for source mappings.
+                    return node;
+                }
+
+                return base.VisitCSharpStatement(node);
+            }
+
+            public override Syntax.SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                if (node.FirstAncestorOrSelf<MarkupTagHelperAttributeValueSyntax>() != null)
+                {
+                    // We don't support Razor directives inside tag helper attribute values.
+                    // If it exists, we don't want to track its code spans for source mappings.
+                    return node;
+                }
+
+                return base.VisitRazorDirective(node);
+            }
         }
 
         private static string EscapeWhitespace(string content)

From 57c10c0321acbca33ce2f470b8d8d6583032deff Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 7 Feb 2019 14:03:23 -0800
Subject: [PATCH 077/337] Fixed null-ref with reserved word inside a code block
 (dotnet/aspnetcore-tooling#192)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/10dbc434ee4ea10bb5add4be01dba838bc1e7718
---
 .../src/Legacy/CSharpCodeParser.cs                             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index 2abfa4ff27..b9dc3bc9d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -2179,6 +2179,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             CompleteBlock();
             var keyword = OutputAsMetaCode(Output());
             var directiveBody = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode: null);
+
+            // transition could be null if we're already inside a code block.
+            transition = transition ?? SyntaxFactory.CSharpTransition(SyntaxFactory.MissingToken(SyntaxKind.Transition));
             var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
             builder.Add(directive);
         }

From 73ca91f603a5091b6a2ade740cd1d4fe87d4e773 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 7 Feb 2019 14:04:57 -0800
Subject: [PATCH 078/337] Handle multiple nested sections correctly
 (dotnet/aspnetcore-tooling#196)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/26e8d86b2164ab1b324df935b8387872bd4d42b1
---
 .../src/DefaultDirectiveSyntaxTreePass.cs        | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
index 8455c9e197..7f567b1109 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultDirectiveSyntaxTreePass.cs
@@ -65,15 +65,23 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
             {
-                if (_nestedLevel > 0)
+                if (node.DirectiveDescriptor?.Directive != SectionDirective.Directive.Directive)
+                {
+                    // We only want to track the nesting of section directives.
+                    return base.VisitRazorDirective(node);
+                }
+
+                _nestedLevel++;
+                var result = (RazorDirectiveSyntax)base.VisitRazorDirective(node);
+
+                if (_nestedLevel > 1)
                 {
                     var directiveStart = node.Transition.GetSourceLocation(_syntaxTree.Source);
                     var errorLength = /* @ */ 1 + SectionDirective.Directive.Directive.Length;
                     var error = RazorDiagnosticFactory.CreateParsing_SectionsCannotBeNested(new SourceSpan(directiveStart, errorLength));
-                    node = node.AppendDiagnostic(error);
+                    result = result.AppendDiagnostic(error);
                 }
-                _nestedLevel++;
-                var result = base.VisitRazorDirective(node);
+
                 _nestedLevel--;
 
                 return result;

From daeb4f80d1f07da857ca83a18de3cf6e6ba47f60 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 7 Feb 2019 15:06:26 -0800
Subject: [PATCH 079/337] Fix invalid cast with end script tag containing code
 (dotnet/aspnetcore-tooling#193)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/56fa17b094b61aaedf9b8c8454c84f2cf5e0a63a
---
 .../src/Legacy/HtmlMarkupParser.cs                        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 02c7eec22d..e66b9c531c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1357,8 +1357,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var tagStart = CurrentStart;
                 builder.Add(OutputAsMarkupLiteral());
 
-                SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
-
                 var openAngleToken = EatCurrentToken(); // '<'
                 var forwardSlashToken = EatCurrentToken(); // '/'
                 var tagNameToken = EatCurrentToken(); // 'script'
@@ -1369,8 +1367,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     var miscAttributeBuilder = pooledResult.Builder;
 
-                    ParseMarkupNodes(miscAttributeBuilder, ParseMode.Text, token => token.Kind == SyntaxKind.CloseAngle);
+                    // We want to accept malformed end tags as content.
+                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
                     miscAttributeBuilder.Add(OutputAsMarkupLiteral());
+
                     if (miscAttributeBuilder.Count > 0)
                     {
                         miscContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeBuilder.ToList());
@@ -1390,6 +1390,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                 }
 
+                SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+
                 endTag = SyntaxFactory.MarkupEndTag(
                     openAngleToken,
                     forwardSlashToken,

From 824796b4e4ef6aa3f2f2a0a6582840ce16e04a79 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 8 Feb 2019 17:31:48 -0800
Subject: [PATCH 080/337] Add IVT to LanguageServer.Common project. \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/b18dcbff5704a36dd485bb039bb33a6cef5d760b

---
 .../src/Properties/AssemblyInfo.cs                               | 1 +
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
index 4eb3dedaa1..ead294ed20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index adee145e23..4647f3e781 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

From abd5ab8080afe40e4ecab4b66c19b4cbf1cf5e0b Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 7 Feb 2019 09:47:42 -0800
Subject: [PATCH 081/337] Add @await foreach for C# 8

- Added general C# 8 tests that we can use to include nullability when the time comes.
- Added statement test to ensure syntax tree is correct for await foreach.

aspnet/AspNetCoredotnet/aspnetcore-tooling#5078
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/27e1d8c0113034b85d7f8443403d9737d21c1c82
---
 .../src/Legacy/CSharpCodeParser.cs                  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index b9dc3bc9d2..e0fc7790c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1651,7 +1651,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Therefore, if we're top level then we want to act like an implicit expression,
             // otherwise just act as whatever we're contained in.
             var topLevel = transition != null;
-            if (topLevel)
+            if (!topLevel)
+            {
+                return;
+            }
+
+            if (At(CSharpKeyword.Foreach))
+            {
+                // C# 8 async streams. @await foreach (var value in asyncEnumerable) { .... }
+
+                ParseConditionalBlock(builder, transition);
+            }
+            else
             {
                 // Setup the Span to be an async implicit expression (an implicit expresison that allows spaces).
                 // Spaces are allowed because of "@await Foo()".

From 8b61ae71961fb1cdfaa108d3f71193b374362ed1 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 11 Feb 2019 19:54:04 -0800
Subject: [PATCH 082/337] Use new PreserveCompilationReferences in Razor Sdk
 (dotnet/aspnetcore-tooling#187)

* Use new PreserveCompilationReferences in Razor Sdk

Fixes https://github.com/aspnet/AspNetCore/issues/6512
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f58c4369618bd91762b369c0052c619382442a6b
---
 .../Sdk.Razor.CurrentVersion.props            | 12 +++----
 .../Sdk.Razor.CurrentVersion.targets          | 35 ++++++++++---------
 .../IntegrationTests/BuildIntegrationTest.cs  |  7 ++--
 .../BuildIntegrationTest21.cs                 | 20 +++++++++++
 .../PublishIntegrationTest.cs                 | 24 +++++++++++++
 ...rosoft.AspNetCore.Razor.Test.Common.csproj |  2 +-
 .../TestCompilation.cs                        |  2 ++
 .../AppWithP2PReference.csproj                |  2 +-
 .../LargeProject/LargeProject.csproj          |  2 +-
 .../MvcWithComponents.csproj                  |  2 +-
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  2 +-
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  2 +-
 .../testassets/SimplePages/SimplePages.csproj |  2 +-
 13 files changed, 80 insertions(+), 34 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index aa0a8da485..4d60b543ae 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -42,14 +42,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(CopyRazorGenerateFilesToPublishDirectory)'==''">false</CopyRazorGenerateFilesToPublishDirectory>
 
-    <!--
-      Set to true to copy reference assembly items to the publish directory.
-
-      Typically reference assemblies are not needed for a published application if Razor compilation occurs at build-time
-      or publish-time. By default, the Razor SDK will suppress the copying of reference assemblies to the publish directory.
-    -->
-    <CopyRefAssembliesToPublishDirectory Condition="'$(CopyRefAssembliesToPublishDirectory)'==''">false</CopyRefAssembliesToPublishDirectory>
-
     <!--
     Determines the toolset to use to compile Razor (.cshtml) files. Defaults to 'Implicit' to let the Razor Sdk determine the toolset to use.
     Valid values include 'Implicit', 'RazorSdk', and 'PrecompilationTool'.
@@ -68,7 +60,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <RazorGenerateOutputFileExtension>.g.cs</RazorGenerateOutputFileExtension>
 
+    <!-- Determines if the deps file includes complication context -->
     <PreserveCompilationContext>true</PreserveCompilationContext>
+
+    <!-- Determines if the refs folder is produced as part of build \ publish -->
+    <PreserveCompilationReferences>false</PreserveCompilationReferences>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true'">
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index e148904829..ffb77fce72 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -174,8 +174,14 @@ Copyright (c) .NET Foundation. All rights reserved.
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(MvcRazorExcludeViewFilesFromPublish)'=='true'">false</CopyRazorGenerateFilesToPublishDirectory>
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(MvcRazorExcludeViewFilesFromPublish)'=='false'">true</CopyRazorGenerateFilesToPublishDirectory>
 
-    <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</CopyRefAssembliesToPublishDirectory>
-    <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</CopyRefAssembliesToPublishDirectory>
+    <!--
+    In 2.x, setting CopyRefAssembliesToPublishDirectory controlled copying of the refs directory to the publish directory.
+    If explicitly specified, use it to override PreserveCompilationReferences.
+    -->
+    <PreserveCompilationReferences Condition="'$(CopyRefAssembliesToPublishDirectory)'!=''">$(CopyRefAssembliesToPublishDirectory)</PreserveCompilationReferences>
+
+    <PreserveCompilationReferences Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</PreserveCompilationReferences>
+    <PreserveCompilationReferences Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</PreserveCompilationReferences>
 
     <!-- 
       We can't set the actual default value here due to evaluation order (depends on $(OutDir)).
@@ -228,6 +234,16 @@ Copyright (c) .NET Foundation. All rights reserved.
     <MvcRazorCompileOnPublish Condition="'$(MvcRazorCompileOnPublish)' == ''">true</MvcRazorCompileOnPublish>
   </PropertyGroup>
 
+  <!-- Back-compat for PrecompilationTool -->
+  <PropertyGroup>
+    <!--
+      For 2.x desktop targeting projects using MvcPrecompilation, ref assemblies are required to compile the PrecompiledViews.dll,
+      but are removed by the tool once done. Set PreserveCompilationReferences = true, ignoring any value configured in the project,
+      if the project is using the precompilation tool.
+    -->
+    <PreserveCompilationReferences Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'">true</PreserveCompilationReferences>
+  </PropertyGroup>
+
   <!--
     Properties that configure Razor SDK, but need to be defined in targets due to evaluation order.
   -->
@@ -711,21 +727,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
-  <Target
-    Name="_RazorRemoveRefAssembliesFromPublish"
-    AfterTargets="ComputeRefAssembliesToPublish"
-    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '$(CopyRefAssembliesToPublishDirectory)'=='false'">
-    <!--
-      The ref assemblies are published whenever PreserveCompilationContext is true, which we expect to be true for
-      most usages of Razor. There's no setting that excludes just the ref assemblies, so we do it ourselves. 
-    -->
-    <ItemGroup>
-      <ResolvedFileToPublish
-        Remove="%(ResolvedFileToPublish.Identity)"
-        Condition="'%(ResolvedFileToPublish.RelativePath)'=='$(RefAssembliesFolderName)\%(Filename)%(Extension)'"/>
-    </ItemGroup>
-  </Target>
-
   <Target Name="_CheckForMissingRazorCompiler" Condition="'$(IsRazorCompilerReferenced)' != 'true'">
     <Error
       Text="A PackageReference for 'Microsoft.AspNetCore.Razor.Design' was not included in your project. This package is required to compile Razor files. Typically, a
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 5c0562d7dc..d430c85650 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -235,7 +235,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]
-        public async Task Build_WithViews_ProducesDepsFileWithCompilationContext()
+        public async Task Build_WithViews_ProducesDepsFileWithCompilationContext_ButNoReferences()
         {
             var customDefine = "RazorSdkTest";
             var result = await DotnetMSBuild("Build", $"/p:DefineConstants={customDefine}");
@@ -247,13 +247,16 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var dependencyContext = ReadDependencyContext(depsFilePath);
 
             // Pick a couple of libraries and ensure they have some compile references
-            var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "Microsoft.NETCore.App");
+            var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "System.Diagnostics.DiagnosticSource");
             Assert.NotEmpty(packageReference.Assemblies);
 
             var projectReference = dependencyContext.CompileLibraries.First(l => l.Name == "SimpleMvc");
             Assert.NotEmpty(projectReference.Assemblies);
 
             Assert.Contains(customDefine, dependencyContext.CompilationOptions.Defines);
+
+            // Verify no refs folder is produced
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
index ee221c6022..061399ddfc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
@@ -37,5 +37,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Path.Combine(IntermediateOutputPath, "SimpleMvc21.TagHelpers.output.cache"),
                 @"""Name"":""SimpleMvc.SimpleTagHelper""");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc21")]
+        public async Task Publish_NETCoreApp21TargetingProject()
+        {
+            TargetFramework = "netcoreapp2.1";
+
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index 7734f7dc16..52a0582328 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -247,6 +247,30 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 8, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
         }
 
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithCopySettingsInProjectFile_CopiesFiles()
+        {
+            AddProjectFileContent(@"
+            <PropertyGroup>
+                <CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
+                <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
+            </PropertyGroup>");
+
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileExists(result, PublishOutputPath, "refs", "mscorlib.dll");
+            Assert.FileCountEquals(result, 8, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+        }
+
         [Fact] // Tests old MvcPrecompilation behavior that we support for compat.
         [InitializeTestProject("SimpleMvc")]
         public async Task Publish_MvcRazorExcludeFilesFromPublish_False_CopiesFiles()
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index 8cf7f123d1..b061917f3c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -4,7 +4,7 @@
     <!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
index a3ae5fbed3..920fd2566e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
@@ -32,6 +32,7 @@ namespace Microsoft.CodeAnalysis
 
         private static IEnumerable<string> ResolvePaths(CompilationLibrary library)
         {
+#if NETFRAMEWORK
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
             for (var i = 0; i < assemblies.Length; i++)
             {
@@ -40,6 +41,7 @@ namespace Microsoft.CodeAnalysis
                     return new[] { assemblies[i].Location };
                 }
             }
+#endif
 
             try
             {
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index bbd86a5772..9386f89689 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -17,7 +17,7 @@
   <!-- Test Placeholder -->
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+    <FrameworkReference Include="Microsoft.NETCore.App" />
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 0581e93450..8e8dea1809 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+    <FrameworkReference Include="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'==''">
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index d89f94bc3e..523061d189 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+    <FrameworkReference Include="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'==''">
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 12fca67a75..21ed48c476 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+    <FrameworkReference Include="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'==''">
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 4edd0713ca..e9a2f2c754 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+    <FrameworkReference Include="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'==''">
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 858eeeb71e..66d48660f4 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true" />
+    <FrameworkReference Include="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'==''">

From 0ab2a1e5869187846e834980a08b80fe0242aea1 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 14 Feb 2019 17:25:52 -0800
Subject: [PATCH 083/337] Fix an assumption in ComponentBindLoweringPass
 (dotnet/aspnetcore-tooling#212)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/315f804d6ebed407ef05d64ce620afc3e6c42f9b
---
 .../Components/ComponentBindLoweringPass.cs    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 9e979b515f..fc053b71d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -507,15 +507,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return GetToken(node);
             }
 
-            // In error cases we won't have a single token, but we still want to generate the code.
             IntermediateToken GetToken(IntermediateNode parent)
             {
-                return
-                    parent.Children.Count == 1 ? (IntermediateToken)parent.Children[0] : new IntermediateToken()
-                    {
-                        Kind = TokenKind.CSharp,
-                        Content = string.Join(string.Empty, parent.Children.OfType<IntermediateToken>().Select(t => t.Content)),
-                    };
+                if (parent.Children.Count == 1 && parent.Children[0] is IntermediateToken token)
+                {
+                    return token;
+                }
+
+                // In error cases we won't have a single token, but we still want to generate the code.
+                return new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = string.Join(string.Empty, parent.Children.OfType<IntermediateToken>().Select(t => t.Content)),
+                };
             }
         }
     }

From 82d850d3a7a81a446dff5bde09154d9a004c32aa Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 18 Feb 2019 09:37:41 +0000
Subject: [PATCH 084/337] Components that accept bind-Something can request
 SomethingExpression (dotnet/aspnetcore-tooling#213)

* In binding to components, automatically supply FooExpression when requested

* Fix tests

* CR feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ca9de74f4ead1fc544fb73b00212db9c677b8a9b
---
 .../src/Components/BlazorMetadata.cs          |  2 +
 .../Components/ComponentBindLoweringPass.cs   | 53 +++++++++++++++++--
 .../TagHelperDescriptorExtensions.cs          | 11 ++++
 .../src/BindTagHelperDescriptorProvider.cs    | 20 +++++++
 .../BindTagHelperDescriptorProviderTest.cs    |  5 ++
 .../RazorIntegrationTestBase.cs               |  1 +
 6 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
index 688d3a6135..1c15fd28fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
@@ -24,6 +24,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public readonly static string ValueAttribute = "Blazor.Bind.ValueAttribute";
 
             public readonly static string ChangeAttribute = "Blazor.Bind.ChangeAttribute";
+
+            public readonly static string ExpressionAttribute = "Blazor.Bind.ExpressionAttribute";
         }
 
         public static class ChildContent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index fc053b71d4..cd3c831ae6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -148,11 +148,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             // Bind works similarly to a macro, it always expands to code that the user could have written.
             //
-            // For the nodes that are related to the bind-attribute rewrite them to look like a pair of
+            // For the nodes that are related to the bind-attribute rewrite them to look like a set of
             // 'normal' HTML attributes similar to the following transformation.
             //
             // Input:   <MyComponent bind-Value="@currentCount" />
-            // Output:  <MyComponent Value ="...<get the value>..." ValueChanged ="... <set the value>..." />
+            // Output:  <MyComponent Value ="...<get the value>..." ValueChanged ="... <set the value>..." ValueExpression ="() => ...<get the value>..." />
             //
             // This means that the expression that appears inside of 'bind' must be an LValue or else
             // there will be errors. In general the errors that come from C# in this case are good enough
@@ -171,8 +171,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 node.AttributeName,
                 out var valueAttributeName,
                 out var changeAttributeName,
+                out var expressionAttributeName,
                 out var valueAttribute,
-                out var changeAttribute))
+                out var changeAttribute,
+                out var expressionAttribute))
             {
                 // Skip anything we can't understand. It's important that we don't crash, that will bring down
                 // the build.
@@ -340,7 +342,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     changeNode.Children[0].Children.Add(changeExpressionTokens[i]);
                 }
 
-                return new[] { valueNode, changeNode };
+                // Finally, also emit a node for the "Expression" attribute, but only if the target
+                // component is defined to accept one
+                ComponentAttributeIntermediateNode expressionNode = null;
+                if (expressionAttribute != null)
+                {
+                    expressionNode = new ComponentAttributeIntermediateNode(node)
+                    {
+                        AttributeName = expressionAttributeName,
+                        BoundAttribute = expressionAttribute,
+                        PropertyName = expressionAttribute.GetPropertyName(),
+                        TagHelper = node.TagHelper,
+                        TypeName = expressionAttribute.IsWeaklyTyped() ? null : expressionAttribute.TypeName,
+                    };
+
+                    expressionNode.Children.Clear();
+                    expressionNode.Children.Add(new CSharpExpressionIntermediateNode());
+                    expressionNode.Children[0].Children.Add(new IntermediateToken()
+                    {
+                        Content = $"() => {original.Content}",
+                        Kind = TokenKind.CSharp
+                    });
+                }
+
+                return expressionNode == null
+                    ? new[] { valueNode, changeNode }
+                    : new[] { valueNode, changeNode, expressionNode };
             }
         }
 
@@ -394,11 +421,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             string attributeName,
             out string valueAttributeName,
             out string changeAttributeName,
+            out string expressionAttributeName,
             out BoundAttributeDescriptor valueAttribute,
-            out BoundAttributeDescriptor changeAttribute)
+            out BoundAttributeDescriptor changeAttribute,
+            out BoundAttributeDescriptor expressionAttribute)
         {
             valueAttribute = null;
             changeAttribute = null;
+            expressionAttribute = null;
+            expressionAttributeName = null;
 
             // Even though some of our 'bind' tag helpers specify the attribute names, they
             // should still satisfy one of the valid syntaxes.
@@ -415,6 +446,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // We expect 1 bind tag helper per-node.
             valueAttributeName = node.TagHelper.GetValueAttributeName() ?? valueAttributeName;
             changeAttributeName = node.TagHelper.GetChangeAttributeName() ?? changeAttributeName;
+            expressionAttributeName = node.TagHelper.GetExpressionAttributeName() ?? expressionAttributeName;
 
             // We expect 0-1 components per-node.
             var componentTagHelper = (parent as ComponentIntermediateNode)?.Component;
@@ -437,6 +469,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 changeAttributeName = valueAttributeName + "Changed";
             }
 
+            // Likewise for the expression attribute
+            if (expressionAttributeName == null)
+            {
+                expressionAttributeName = valueAttributeName + "Expression";
+            }
+
             for (var i = 0; i < componentTagHelper.BoundAttributes.Count; i++)
             {
                 var attribute = componentTagHelper.BoundAttributes[i];
@@ -450,6 +488,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     changeAttribute = attribute;
                 }
+
+                if (string.Equals(expressionAttributeName, attribute.Name))
+                {
+                    expressionAttribute = attribute;
+                }
             }
 
             return true;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index ddc2edcec1..76b7932ab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -95,6 +95,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return result;
         }
 
+        public static string GetExpressionAttributeName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.ExpressionAttribute, out var result);
+            return result;
+        }
+
         public static bool IsChildContentTagHelper(this TagHelperDescriptor tagHelper)
         {
             if (tagHelper == null)
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 4310a9f24e..97fd3b0483 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -351,6 +351,8 @@ namespace Microsoft.CodeAnalysis.Razor
                 //
                 // The easiest way to figure this out without a lot of backtracking is to look for `FooChanged` and then
                 // try to find a matching "Foo".
+                //
+                // We also look for a corresponding FooExpression attribute, though its presence is optional.
                 for (var i = 0; i < tagHelper.BoundAttributes.Count; i++)
                 {
                     var changeAttribute = tagHelper.BoundAttributes[i];
@@ -360,12 +362,25 @@ namespace Microsoft.CodeAnalysis.Razor
                     }
 
                     BoundAttributeDescriptor valueAttribute = null;
+                    BoundAttributeDescriptor expressionAttribute = null;
                     var valueAttributeName = changeAttribute.Name.Substring(0, changeAttribute.Name.Length - "Changed".Length);
+                    var expressionAttributeName = valueAttributeName + "Expression";
                     for (var j = 0; j < tagHelper.BoundAttributes.Count; j++)
                     {
                         if (tagHelper.BoundAttributes[j].Name == valueAttributeName && !tagHelper.BoundAttributes[j].IsDelegateProperty())
                         {
                             valueAttribute = tagHelper.BoundAttributes[j];
+                            
+                        }
+
+                        if (tagHelper.BoundAttributes[j].Name == expressionAttributeName)
+                        {
+                            expressionAttribute = tagHelper.BoundAttributes[j];
+                        }
+
+                        if (valueAttribute != null && expressionAttribute != null)
+                        {
+                            // We found both, so we can stop looking now
                             break;
                         }
                     }
@@ -388,6 +403,11 @@ namespace Microsoft.CodeAnalysis.Razor
                     builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = valueAttribute.Name;
                     builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = changeAttribute.Name;
 
+                    if (expressionAttribute != null)
+                    {
+                        builder.Metadata[BlazorMetadata.Bind.ExpressionAttribute] = expressionAttribute.Name;
+                    }
+
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                     // a C# property will crash trying to create the toolips.
                     builder.SetTypeName(tagHelper.GetTypeName());
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 9c28a2be24..6aa2b87c1d 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -16,6 +16,7 @@ namespace Microsoft.CodeAnalysis.Razor
             // Arrange
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
 using System;
+using System.Linq.Expressions;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
@@ -31,6 +32,9 @@ namespace Test
 
         [Parameter]
         Action<string> MyPropertyChanged { get; set; }
+
+        [Parameter]
+        Expression<Func<string>> MyPropertyExpression { get; set; }
     }
 }
 "));
@@ -69,6 +73,7 @@ namespace Test
 
             Assert.Equal("MyProperty", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
             Assert.Equal("MyPropertyChanged", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("MyPropertyExpression", bind.Metadata[BlazorMetadata.Bind.ExpressionAttribute]);
 
             Assert.Equal(
                 "Binds the provided expression to the 'MyProperty' property and a change event " +
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index aa716ece02..fe405bcce6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -36,6 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             {
                 typeof(System.Runtime.AssemblyTargetedPatchBandAttribute).Assembly, // System.Runtime
                 typeof(Enumerable).Assembly, // Other .NET fundamental types
+                typeof(System.Linq.Expressions.Expression).Assembly,
                 typeof(ComponentBase).Assembly,
             };
 

From 1243e07e5659f317309a70c7a6758cab5e72a126 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 19 Feb 2019 12:06:57 -0800
Subject: [PATCH 085/337] Make TagHelper & Razor comments locatable at design
 time.

- Added a step to full fidelity verification that does a `LocateOwner` at every source location. If we find a `null` owner we build a snippet with a detailed response to enable us to diagnose the problem.

Addresses aspnet/AspNetCoredotnet/aspnetcore-tooling#7718
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/08587a30fd75f5392ece1a56ee23d36a22a8bc66
---
 .../src/Legacy/LegacySyntaxNodeExtensions.cs  | 12 ++-
 .../src/Syntax/MarkupTagHelperEndTagSyntax.cs | 60 +++++++++++++++
 .../Syntax/MarkupTagHelperStartTagSyntax.cs   | 75 +++++++++++++++++++
 .../Language/SyntaxTreeVerifier.cs            | 33 ++++++++
 4 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperEndTagSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperStartTagSyntax.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
index 9949ce8a62..bdfbb27c43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
@@ -23,6 +23,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private static readonly SyntaxKind[] CommentSpanKinds = new SyntaxKind[]
         {
+            SyntaxKind.RazorCommentTransition,
+            SyntaxKind.RazorCommentStar,
             SyntaxKind.RazorCommentLiteral,
         };
 
@@ -100,7 +102,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             SyntaxNode owner = null;
-            IEnumerable<SyntaxNode> children = null;
+            IEnumerable<SyntaxNode> children;
             if (node is MarkupStartTagSyntax startTag)
             {
                 children = startTag.Children;
@@ -109,6 +111,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 children = endTag.Children;
             }
+            else if (node is MarkupTagHelperStartTagSyntax startTagHelper)
+            {
+                children = startTagHelper.Children;
+            }
+            else if (node is MarkupTagHelperEndTagSyntax endTagHelper)
+            {
+                children = endTagHelper.Children;
+            }
             else
             {
                 children = node.ChildNodes();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperEndTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperEndTagSyntax.cs
new file mode 100644
index 0000000000..2536f5ae32
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperEndTagSyntax.cs
@@ -0,0 +1,60 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal partial class MarkupTagHelperEndTagSyntax
+    {
+        // Copied directly from MarkupEndTagSyntax Children & GetLegacyChildren.
+        public SyntaxList<RazorSyntaxNode> Children => GetLegacyChildren();
+
+        private SyntaxList<RazorSyntaxNode> GetLegacyChildren()
+        {
+            // This method returns the children of this end tag in legacy format.
+            // This is needed to generate the same classified spans as the legacy syntax tree.
+            var builder = new SyntaxListBuilder(3);
+            var tokens = SyntaxListBuilder<SyntaxToken>.Create();
+            var context = this.GetSpanContext();
+            if (!OpenAngle.IsMissing)
+            {
+                tokens.Add(OpenAngle);
+            }
+            if (!ForwardSlash.IsMissing)
+            {
+                tokens.Add(ForwardSlash);
+            }
+            if (Bang != null)
+            {
+                // The prefix of an end tag(E.g '|</|!foo>') will have 'Any' accepted characters if a bang exists.
+                var acceptsAnyContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+                acceptsAnyContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(acceptsAnyContext));
+
+                tokens.Add(Bang);
+                var acceptsNoneContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+                acceptsNoneContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                builder.Add(SyntaxFactory.RazorMetaCode(tokens.Consume()).WithSpanContext(acceptsNoneContext));
+            }
+            if (!Name.IsMissing)
+            {
+                tokens.Add(Name);
+            }
+            if (MiscAttributeContent?.Children != null && MiscAttributeContent.Children.Count > 0)
+            {
+                foreach (var content in MiscAttributeContent.Children)
+                {
+                    tokens.AddRange(((MarkupTextLiteralSyntax)content).LiteralTokens);
+                }
+            }
+            if (!CloseAngle.IsMissing)
+            {
+                tokens.Add(CloseAngle);
+            }
+            builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(context));
+
+            return new SyntaxList<RazorSyntaxNode>(builder.ToListNode().CreateRed(this, Position));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperStartTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperStartTagSyntax.cs
new file mode 100644
index 0000000000..bebec4f425
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperStartTagSyntax.cs
@@ -0,0 +1,75 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal partial class MarkupTagHelperStartTagSyntax
+    {
+        // Copied directly from MarkupStartTagSyntax Children & GetLegacyChildren.
+
+        public SyntaxList<RazorSyntaxNode> Children => GetLegacyChildren();
+
+        private SyntaxList<RazorSyntaxNode> GetLegacyChildren()
+        {
+            // This method returns the children of this start tag in legacy format.
+            // This is needed to generate the same classified spans as the legacy syntax tree.
+            var builder = new SyntaxListBuilder(5);
+            var tokens = SyntaxListBuilder<SyntaxToken>.Create();
+            var context = this.GetSpanContext();
+
+            // We want to know if this tag contains non-whitespace attribute content to set the appropriate AcceptedCharacters.
+            // The prefix of a start tag(E.g '|<foo| attr>') will have 'Any' accepted characters if non-whitespace attribute content exists.
+            var acceptsAnyContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+            acceptsAnyContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            var containsAttributesContent = false;
+            foreach (var attribute in Attributes)
+            {
+                if (!string.IsNullOrWhiteSpace(attribute.GetContent()))
+                {
+                    containsAttributesContent = true;
+                    break;
+                }
+            }
+
+            if (!OpenAngle.IsMissing)
+            {
+                tokens.Add(OpenAngle);
+            }
+            if (Bang != null)
+            {
+                builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(acceptsAnyContext));
+
+                tokens.Add(Bang);
+                var acceptsNoneContext = new SpanContext(context.ChunkGenerator, SpanEditHandler.CreateDefault());
+                acceptsNoneContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                builder.Add(SyntaxFactory.RazorMetaCode(tokens.Consume()).WithSpanContext(acceptsNoneContext));
+            }
+            if (!Name.IsMissing)
+            {
+                tokens.Add(Name);
+            }
+
+            builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(containsAttributesContent ? acceptsAnyContext : context));
+
+            builder.AddRange(Attributes);
+
+            if (ForwardSlash != null)
+            {
+                tokens.Add(ForwardSlash);
+            }
+            if (!CloseAngle.IsMissing)
+            {
+                tokens.Add(CloseAngle);
+            }
+
+            if (tokens.Count > 0)
+            {
+                builder.Add(SyntaxFactory.MarkupTextLiteral(tokens.Consume()).WithSpanContext(context));
+            }
+
+            return new SyntaxList<RazorSyntaxNode>(builder.ToListNode().CreateRed(this, Position));
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
index f4f416616c..e92858cc9a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
@@ -6,6 +6,7 @@ using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
+using Xunit.Sdk;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -29,6 +30,38 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 // Make sure the syntax tree contains all of the text in the document.
                 Assert.Equal(sourceString, syntaxTreeString);
+
+                // Ensure all source is locatable
+                for (var i = 0; i < syntaxTree.Source.Length; i++)
+                {
+                    var span = new SourceSpan(i, 0);
+                    var location = new SourceChange(span, string.Empty);
+                    var owner = syntaxTree.Root.LocateOwner(location);
+
+                    if (owner == null)
+                    {
+                        var snippetStartIndex = Math.Max(0, i - 10);
+                        var snippetStartLength = i - snippetStartIndex;
+                        var snippetStart = new char[snippetStartLength];
+                        syntaxTree.Source.CopyTo(snippetStartIndex, snippetStart, 0, snippetStartLength);
+
+                        var snippetEndIndex = Math.Min(syntaxTree.Source.Length - 1, i + 10);
+                        var snippetEndLength = snippetEndIndex - i;
+                        var snippetEnd = new char[snippetEndLength];
+                        syntaxTree.Source.CopyTo(i, snippetEnd, 0, snippetEndLength);
+
+                        var snippet = new char[snippetStart.Length + snippetEnd.Length + 1];
+                        snippetStart.CopyTo(snippet, 0);
+                        snippet[snippetStart.Length] = '|';
+                        snippetEnd.CopyTo(snippet, snippetStart.Length + 1);
+
+                        var snippetString = new string(snippet);
+
+                        throw new XunitException(
+$@"Could not locate Syntax Node owner at position '{i}':
+{snippetString}");
+                    }
+                }
             }
         }
 

From 54e79153ec2563bc89cace65a77e0d3b205d3b39 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 19 Feb 2019 12:39:33 -0800
Subject: [PATCH 086/337] Add compiler support for EventCallback
 (dotnet/aspnetcore-tooling#222)

* Add new APIs to ComponentShim

* Add new APIs to ComponentsApi

* Add EventCallback metadata

* Add discovery of EventCallback properties

* Errata for Runtime APIs

* Add ability to use EventCallback as parameter

* Add support for bind to component

* Use EventCallback for bind-... to elements

* Use EventCallback<T> for event handlers
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a0b6bc0e52ec4aa53beb5e5fa07346696967b25d
---
 .../src/Components/BlazorMetadata.cs          |   2 +
 .../Components/ComponentBindLoweringPass.cs   | 223 +++++++++++++-----
 .../ComponentDesignTimeNodeWriter.cs          |  49 ++++
 .../ComponentEventHandlerLoweringPass.cs      |   6 +-
 .../Components/ComponentGenericTypePass.cs    |   5 +
 .../Components/ComponentRuntimeNodeWriter.cs  |  43 +++-
 .../src/Components/ComponentsApi.cs           |  20 ++
 ...elperBoundAttributeDescriptorExtensions.cs |  19 ++
 .../ComponentAttributeIntermediateNode.cs     |  37 +++
 .../src/BindTagHelperDescriptorProvider.cs    |  12 +-
 .../ComponentTagHelperDescriptorProvider.cs   |  65 ++++-
 .../BindTagHelperDescriptorProviderTest.cs    | 116 ++++++++-
 ...omponentTagHelperDescriptorProviderTest.cs | 165 +++++++++++++
 .../BindMethods.cs                            |  18 ++
 .../EventCallback.cs                          |  33 +++
 .../EventCallbackFactory.cs                   |  43 ++++
 .../EventCallbackFactoryBinderExtensions.cs   | 107 +++++++++
 ...entCallbackFactoryUIEventArgsExtensions.cs |  59 +++++
 .../IHandleEvent.cs                           |   9 +
 .../RenderTree/RenderTreeBuilder.cs           |   8 +
 20 files changed, 963 insertions(+), 76 deletions(-)
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
index 1c15fd28fa..32a52899e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
@@ -55,6 +55,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public static readonly string DelegateSignatureKey = "Blazor.DelegateSignature";
 
+            public static readonly string EventCallbackKey = "Blazor.EventCallback";
+
             public static readonly string WeaklyTypedKey = "Blazor.IsWeaklyTyped";
 
             public static readonly string RuntimeName = "Blazor.IComponent";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index cd3c831ae6..a02fd59235 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -158,9 +158,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // there will be errors. In general the errors that come from C# in this case are good enough
             // to understand the problem.
             //
-            // The BindMethods calls are required in this case because to give us a good experience. They
+            // We also support and encourage the use of EventCallback<> with bind. So in the above example
+            // the ValueChanged property could be an Action<> or an EventCallback<>.
+            //
+            // The BindMethods calls are required with Action<> because to give us a good experience. They
             // use overloading to ensure that can get an Action<object> that will convert and set an arbitrary
-            // value.
+            // value. We have a similar set of APIs to use with EventCallback<>.
             //
             // We also assume that the element will be treated as a component for now because
             // multiple passes handle 'special' tag helpers. We have another pass that translates
@@ -207,67 +210,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 format = GetAttributeContent(formatNode);
             }
 
-            // Now rewrite the content of the value node to look like:
-            //
-            // BindMethods.GetValue(<code>) OR
-            // BindMethods.GetValue(<code>, <format>)
             var valueExpressionTokens = new List<IntermediateToken>();
-            valueExpressionTokens.Add(new IntermediateToken()
+            var changeExpressionTokens = new List<IntermediateToken>();
+            if (changeAttribute != null && changeAttribute.IsDelegateProperty())
             {
-                Content = $"{ComponentsApi.BindMethods.GetValue}(",
-                Kind = TokenKind.CSharp
-            });
-            valueExpressionTokens.Add(original);
-            if (!string.IsNullOrEmpty(format?.Content))
-            {
-                valueExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = ", ",
-                    Kind = TokenKind.CSharp,
-                });
-                valueExpressionTokens.Add(format);
-            }
-            valueExpressionTokens.Add(new IntermediateToken()
-            {
-                Content = ")",
-                Kind = TokenKind.CSharp,
-            });
-
-            // Now rewrite the content of the change-handler node. There are two cases we care about
-            // here. If it's a component attribute, then don't use the 'BindMethods wrapper. We expect
-            // component attributes to always 'match' on type.
-            //
-            // __value => <code> = __value
-            //
-            // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
-            // so we use BindMethods.SetValueHandler
-            //
-            // BindMethods.SetValueHandler(__value => <code> = __value, <code>) OR
-            // BindMethods.SetValueHandler(__value => <code> = __value, <code>, <format>)
-            //
-            // Note that the linemappings here are applied to the value attribute, not the change attribute.
-            
-            string changeExpressionContent = null;
-            if (changeAttribute == null && format == null)
-            {
-                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})";
-            }
-            else if (changeAttribute == null && format != null)
-            {
-                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})";
+                RewriteNodesForDelegateBind(
+                    original,
+                    format,
+                    valueAttribute,
+                    changeAttribute,
+                    valueExpressionTokens, 
+                    changeExpressionTokens);
             }
             else
             {
-                changeExpressionContent = $"__value => {original.Content} = __value";
+                RewriteNodesForEventCallbackBind(
+                    original,
+                    format,
+                    valueAttribute,
+                    changeAttribute,
+                    valueExpressionTokens,
+                    changeExpressionTokens);
             }
-            var changeExpressionTokens = new List<IntermediateToken>()
-            {
-                new IntermediateToken()
-                {
-                    Content = changeExpressionContent,
-                    Kind = TokenKind.CSharp
-                }
-            };
 
             if (parent is MarkupElementIntermediateNode)
             {
@@ -521,6 +485,151 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return false;
         }
 
+        private void RewriteNodesForDelegateBind(
+            IntermediateToken original,
+            IntermediateToken format,
+            BoundAttributeDescriptor valueAttribute,
+            BoundAttributeDescriptor changeAttribute,
+            List<IntermediateToken> valueExpressionTokens, 
+            List<IntermediateToken> changeExpressionTokens)
+        {
+            // Now rewrite the content of the value node to look like:
+            //
+            // BindMethods.GetValue(<code>) OR
+            // BindMethods.GetValue(<code>, <format>)
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = $"{ComponentsApi.BindMethods.GetValue}(",
+                Kind = TokenKind.CSharp
+            });
+            valueExpressionTokens.Add(original);
+            if (!string.IsNullOrEmpty(format?.Content))
+            {
+                valueExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ", ",
+                    Kind = TokenKind.CSharp,
+                });
+                valueExpressionTokens.Add(format);
+            }
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = ")",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Now rewrite the content of the change-handler node. There are two cases we care about
+            // here. If it's a component attribute, then don't use the 'BindMethods' wrapper. We expect
+            // component attributes to always 'match' on type.
+            //
+            // __value => <code> = __value
+            //
+            // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
+            // so we use BindMethods.SetValueHandler
+            //
+            // BindMethods.SetValueHandler(__value => <code> = __value, <code>) OR
+            // BindMethods.SetValueHandler(__value => <code> = __value, <code>, <format>)
+            //
+            // Note that the linemappings here are applied to the value attribute, not the change attribute.
+
+            string changeExpressionContent;
+            if (changeAttribute == null && format == null)
+            {
+                // DOM
+                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})";
+            }
+            else if (changeAttribute == null && format != null)
+            {
+                // DOM + format
+                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})";
+            }
+            else
+            {
+                // Component
+                changeExpressionContent = $"__value => {original.Content} = __value";
+            }
+            changeExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = changeExpressionContent,
+                Kind = TokenKind.CSharp
+            });              
+        }
+
+        private void RewriteNodesForEventCallbackBind(
+            IntermediateToken original,
+            IntermediateToken format,
+            BoundAttributeDescriptor valueAttribute,
+            BoundAttributeDescriptor changeAttribute,
+            List<IntermediateToken> valueExpressionTokens,
+            List<IntermediateToken> changeExpressionTokens)
+        {
+            // Now rewrite the content of the value node to look like:
+            //
+            // BindMethods.GetValue(<code>) OR
+            // BindMethods.GetValue(<code>, <format>)
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = $"{ComponentsApi.BindMethods.GetValue}(",
+                Kind = TokenKind.CSharp
+            });
+            valueExpressionTokens.Add(original);
+            if (!string.IsNullOrEmpty(format?.Content))
+            {
+                valueExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ", ",
+                    Kind = TokenKind.CSharp,
+                });
+                valueExpressionTokens.Add(format);
+            }
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = ")",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Now rewrite the content of the change-handler node. There are two cases we care about
+            // here. If it's a component attribute, then don't use the 'CreateBinder' wrapper. We expect
+            // component attributes to always 'match' on type.
+            //
+            // The really tricky part of this is that we CANNOT write the type name of of the EventCallback we
+            // intend to create. Doing so would really complicate the story for how we deal with generic types,
+            // since the generic type lowering pass runs after this. To keep this simple we're relying on
+            // the compiler to resolve overloads for us.
+            //
+            // EventCallbackFactory.CreateInferred(this, __value => <code> = __value, <code>)
+            //
+            // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
+            // so we use 'CreateBinder'
+            //
+            // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>) OR
+            // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>, <format>)
+            //
+            // Note that the linemappings here are applied to the value attribute, not the change attribute.
+
+            string changeExpressionContent;
+            if (changeAttribute == null && format == null)
+            {
+                // DOM
+                changeExpressionContent = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, {original.Content})";
+            }
+            else if (changeAttribute == null && format != null)
+            {
+                // DOM + format
+                changeExpressionContent = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, {original.Content}, {format.Content})";
+            }
+            else
+            {
+                // Component
+                changeExpressionContent = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateInferredMethod}(this, __value => {original.Content} = __value, {original.Content})";
+            }
+            changeExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = changeExpressionContent,
+                Kind = TokenKind.CSharp
+            });
+        }
+
         private static IntermediateToken GetAttributeContent(TagHelperPropertyIntermediateNode node)
         {
             var template = node.FindDescendantNodes<TemplateIntermediateNode>().FirstOrDefault();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index da3c03b2d8..62c1fab448 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -541,6 +541,55 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         context.CodeWriter.Write(")");
                     }
                 }
+                else if (node.BoundAttribute?.IsEventCallbackProperty() ?? false)
+                {
+                    // This is the case where we are writing an EventCallback (a delegate with super-powers).
+                    //
+                    // An event callback can either be passed verbatim, or it can be created by the EventCallbackFactory.
+                    // Since we don't look at the code the user typed inside the attribute value, this is always
+                    // resolved via overloading.
+
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck);
+                        context.CodeWriter.Write("<");
+                        context.CodeWriter.Write(node.TypeName);
+                        context.CodeWriter.Write(">");
+                        context.CodeWriter.Write("(");
+                    }
+
+                    // Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, ...) OR
+                    // Microsoft.AspNetCore.Components.EventCallback.Factory.Create<T>(this, ...)
+
+                    context.CodeWriter.Write(ComponentsApi.EventCallback.FactoryAccessor);
+                    context.CodeWriter.Write(".");
+                    context.CodeWriter.Write(ComponentsApi.EventCallbackFactory.CreateMethod);
+
+                    if (node.TryParseEventCallbackTypeArgument(out var argument))
+                    {
+                        context.CodeWriter.Write("<");
+                        context.CodeWriter.Write(argument);
+                        context.CodeWriter.Write(">");
+                    }
+
+                    context.CodeWriter.Write("(");
+                    context.CodeWriter.Write("this");
+                    context.CodeWriter.Write(", ");
+
+                    context.CodeWriter.WriteLine();
+
+                    for (var i = 0; i < tokens.Count; i++)
+                    {
+                        WriteCSharpToken(context, tokens[i]);
+                    }
+
+                    context.CodeWriter.Write(")");
+
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(")");
+                    }
+                }
                 else
                 {
                     // This is the case when an attribute contains C# code
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index 7a731dabdd..aeefbab150 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -123,16 +123,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Now rewrite the content of the value node to look like:
             //
-            // BindMethods.GetEventHandlerValue<TDelegate>(<code>)
+            // EventCallback.Factory.Create<T>(this, <code>)
             //
-            // This method is overloaded on string and TDelegate, which means that it will put the code in the
+            // This method is overloaded on string and T, which means that it will put the code in the
             // correct context for intellisense when typing in the attribute.
             var eventArgsType = node.TagHelper.GetEventArgsType();
             var tokens = new List<IntermediateToken>()
             {
                 new IntermediateToken()
                 {
-                    Content = $"{ComponentsApi.BindMethods.GetEventHandlerValue}<{eventArgsType}>(",
+                    Content = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateMethod}<{eventArgsType}>(this, ",
                     Kind = TokenKind.CSharp
                 },
                 new IntermediateToken()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index a3646ba767..a7709d3116 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -218,6 +218,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         // This is a weakly typed delegate, treat it as Action<object>
                         attribute.TypeName = "System.Action<System.Object>";
                     }
+                    else if (attribute.TypeName == null && (attribute.BoundAttribute?.IsEventCallbackProperty() ?? false))
+                    {
+                        // This is a weakly typed event-callback, treat it as EventCallback (non-generic)
+                        attribute.TypeName = ComponentsApi.EventCallback.FullTypeName;
+                    }
                     else if (attribute.TypeName == null)
                     {
                         // This is a weakly typed attribute, treat it as System.Object
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 8fcf48ec18..96aa4ceb79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -460,7 +460,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             else
             {
-                // See comments in BlazorDesignTimeNodeWriter for a description of the cases that are possible.
+                // See comments in ComponentDesignTimeNodeWriter for a description of the cases that are possible.
                 var tokens = GetCSharpTokens(node);
                 if ((node.BoundAttribute?.IsDelegateProperty() ?? false) ||
                     (node.BoundAttribute?.IsChildContentProperty() ?? false))
@@ -482,6 +482,47 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         context.CodeWriter.Write(")");
                     }
                 }
+                else if (node.BoundAttribute?.IsEventCallbackProperty() ?? false)
+                {
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck);
+                        context.CodeWriter.Write("<");
+                        context.CodeWriter.Write(node.TypeName);
+                        context.CodeWriter.Write(">");
+                        context.CodeWriter.Write("(");
+                    }
+
+                    // Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, ...) OR
+                    // Microsoft.AspNetCore.Components.EventCallback.Factory.Create<T>(this, ...)
+
+                    context.CodeWriter.Write(ComponentsApi.EventCallback.FactoryAccessor);
+                    context.CodeWriter.Write(".");
+                    context.CodeWriter.Write(ComponentsApi.EventCallbackFactory.CreateMethod);
+
+                    if (node.TryParseEventCallbackTypeArgument(out var argument))
+                    {
+                        context.CodeWriter.Write("<");
+                        context.CodeWriter.Write(argument);
+                        context.CodeWriter.Write(">");
+                    }
+
+                    context.CodeWriter.Write("(");
+                    context.CodeWriter.Write("this");
+                    context.CodeWriter.Write(", ");
+
+                    for (var i = 0; i < tokens.Count; i++)
+                    {
+                        context.CodeWriter.Write(tokens[i].Content);
+                    }
+
+                    context.CodeWriter.Write(")");
+
+                    if (canTypeCheck && NeedsTypeCheck(node))
+                    {
+                        context.CodeWriter.Write(")");
+                    }
+                }
                 else
                 {
                     if (canTypeCheck && NeedsTypeCheck(node))
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 8d3133b03c..59db7873dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -129,5 +129,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ElementRef";
         }
+
+        public static class EventCallback
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.EventCallback";
+            public static readonly string MetadataName = FullTypeName;
+
+            public static readonly string FactoryAccessor = FullTypeName + ".Factory";
+        }
+
+        public static class EventCallbackOfT
+        {
+            public static readonly string MetadataName = "Microsoft.AspNetCore.Components.EventCallback`1";
+        }
+
+        public static class EventCallbackFactory
+        {
+            public static readonly string CreateMethod = "Create";
+            public static readonly string CreateInferredMethod = "CreateInferred";
+            public static readonly string CreateBinderMethod = "CreateBinder";
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
index 07d0d538af..0a99a07b63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
@@ -20,6 +20,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 string.Equals(value, bool.TrueString);
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the attribute is of type <c>EventCallback</c> or
+        /// <c>EventCallback{T}</c>
+        /// </summary>
+        /// <param name="attribute">The <see cref="BoundAttributeDescriptor"/>.</param>
+        /// <returns><c>true</c> if the attribute is an event callback, otherwise <c>false</c>.</returns>
+        public static bool IsEventCallbackProperty(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            var key = BlazorMetadata.Component.EventCallbackKey;
+            return
+                attribute.Metadata.TryGetValue(key, out var value) &&
+                string.Equals(value, bool.TrueString);
+        }
+
         public static bool IsGenericTypedProperty(this BoundAttributeDescriptor attribute)
         {
             if (attribute == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
index 1b63ad3984..d5b94bde14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
@@ -101,5 +101,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
             formatter.WriteProperty(nameof(TypeName), TypeName);
         }
+
+        public bool TryParseEventCallbackTypeArgument(out string argument)
+        {
+            // This is ugly and ad-hoc, but for various layering reasons we can't just use Roslyn APIs
+            // to parse this. We need to parse this just before we write it out to the code generator,
+            // so we can't compute it up front either.
+
+            if (BoundAttribute == null || !BoundAttribute.IsEventCallbackProperty())
+            {
+                throw new InvalidOperationException("This attribute is not an EventCallback attribute.");
+            }
+
+            if (string.Equals(TypeName, ComponentsApi.EventCallback.FullTypeName, StringComparison.Ordinal))
+            {
+                // Non-Generic
+                argument = null;
+                return false;
+            }
+
+            if (TypeName != null && 
+                TypeName.Length > ComponentsApi.EventCallback.FullTypeName.Length + "<>".Length &&
+                TypeName.StartsWith(ComponentsApi.EventCallback.FullTypeName, StringComparison.Ordinal) &&
+                TypeName[ComponentsApi.EventCallback.FullTypeName.Length] == '<' &&
+                TypeName[TypeName.Length - 1] == '>')
+            {
+                // OK this is promising.
+                //
+                // Chop off leading `...EventCallback<` and let the length so the ending `>` is cut off as well.
+                argument = TypeName.Substring(ComponentsApi.EventCallback.FullTypeName.Length + 1, TypeName.Length - (ComponentsApi.EventCallback.FullTypeName.Length + "<>".Length));
+                return true;
+            }
+
+            // If we get here this is a failure. This should only happen if someone manages to mangle the name with extensibility.
+            // We don't really want to crash though.
+            argument = null;
+            return false;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 97fd3b0483..8f62491145 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -33,7 +33,7 @@ namespace Microsoft.CodeAnalysis.Razor
             // We generate:
             //      <input type="text" 
             //          value="@BindMethods.GetValue(FirstName)" 
-            //          onchange="@BindMethods.SetValue(__value => FirstName = __value, FirstName)"/>
+            //          onchange="@EventCallbackFactory.CreateBinder(this, __value => FirstName = __value, FirstName)"/>
             //
             // This isn't very different from code the user could write themselves - thus the pronouncement
             // that bind is very much like a macro.
@@ -356,7 +356,13 @@ namespace Microsoft.CodeAnalysis.Razor
                 for (var i = 0; i < tagHelper.BoundAttributes.Count; i++)
                 {
                     var changeAttribute = tagHelper.BoundAttributes[i];
-                    if (!changeAttribute.Name.EndsWith("Changed") || !changeAttribute.IsDelegateProperty())
+                    if (!changeAttribute.Name.EndsWith("Changed") || 
+
+                        // Allow the ValueChanged attribute to be a delegate or EventCallback<>.
+                        //
+                        // We assume that the Delegate or EventCallback<> has a matching type, and the C# compiler will help
+                        // you figure figure it out if you did it wrongly.
+                        (!changeAttribute.IsDelegateProperty() && !changeAttribute.IsEventCallbackProperty()))
                     {
                         continue;
                     }
@@ -367,7 +373,7 @@ namespace Microsoft.CodeAnalysis.Razor
                     var expressionAttributeName = valueAttributeName + "Expression";
                     for (var j = 0; j < tagHelper.BoundAttributes.Count; j++)
                     {
-                        if (tagHelper.BoundAttributes[j].Name == valueAttributeName && !tagHelper.BoundAttributes[j].IsDelegateProperty())
+                        if (tagHelper.BoundAttributes[j].Name == valueAttributeName)
                         {
                             valueAttribute = tagHelper.BoundAttributes[j];
                             
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 1474e86055..322c69e4cf 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -43,7 +43,7 @@ namespace Microsoft.CodeAnalysis.Razor
             // We need to see private members too
             compilation = WithMetadataImportOptionsAll(compilation);
 
-            var symbols = BlazorSymbols.Create(compilation);
+            var symbols = ComponentSymbols.Create(compilation);
 
             var types = new List<INamedTypeSymbol>();
             var visitor = new ComponentTypeVisitor(symbols, types);
@@ -81,7 +81,7 @@ namespace Microsoft.CodeAnalysis.Razor
             return compilation.WithOptions(newCompilationOptions);
         }
 
-        private TagHelperDescriptor CreateDescriptor(BlazorSymbols symbols, INamedTypeSymbol type)
+        private TagHelperDescriptor CreateDescriptor(ComponentSymbols symbols, INamedTypeSymbol type)
         {
             var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
             var assemblyName = type.ContainingAssembly.Identity.Name;
@@ -157,6 +157,11 @@ namespace Microsoft.CodeAnalysis.Razor
                     pb.Metadata.Add(BlazorMetadata.Component.ChildContentKey, bool.TrueString);
                 }
 
+                if (kind == PropertyKind.EventCallback)
+                {
+                    pb.Metadata.Add(BlazorMetadata.Component.EventCallbackKey, bool.TrueString);
+                }
+
                 if (kind == PropertyKind.Delegate)
                 {
                     pb.Metadata.Add(BlazorMetadata.Component.DelegateSignatureKey, bool.TrueString);
@@ -230,7 +235,7 @@ namespace Microsoft.CodeAnalysis.Razor
             });
         }
 
-        private TagHelperDescriptor CreateChildContentDescriptor(BlazorSymbols symbols, TagHelperDescriptor component, BoundAttributeDescriptor attribute)
+        private TagHelperDescriptor CreateChildContentDescriptor(ComponentSymbols symbols, TagHelperDescriptor component, BoundAttributeDescriptor attribute)
         {
             var typeName = component.GetTypeName() + "." + attribute.Name;
             var assemblyName = component.AssemblyName;
@@ -297,7 +302,7 @@ namespace Microsoft.CodeAnalysis.Razor
         // - have the [Parameter] attribute
         // - have a setter, even if private
         // - are not indexers
-        private IEnumerable<(IPropertySymbol property, PropertyKind kind)> GetProperties(BlazorSymbols symbols, INamedTypeSymbol type)
+        private IEnumerable<(IPropertySymbol property, PropertyKind kind)> GetProperties(ComponentSymbols symbols, INamedTypeSymbol type)
         {
             var properties = new Dictionary<string, (IPropertySymbol, PropertyKind)>(StringComparer.Ordinal);
             do
@@ -368,6 +373,19 @@ namespace Microsoft.CodeAnalysis.Razor
                         kind = PropertyKind.ChildContent;
                     }
 
+                    if (kind == PropertyKind.Default && property.Type == symbols.EventCallback)
+                    {
+                        kind = PropertyKind.EventCallback;
+                    }
+
+                    if (kind == PropertyKind.Default &&
+                        property.Type is INamedTypeSymbol namedType2 &&
+                        namedType2.IsGenericType &&
+                        namedType2.ConstructedFrom == symbols.EventCallbackOfT)
+                    {
+                        kind = PropertyKind.EventCallback;
+                    }
+
                     if (kind == PropertyKind.Default && property.Type.TypeKind == TypeKind.Delegate)
                     {
                         kind = PropertyKind.Delegate;
@@ -390,13 +408,18 @@ namespace Microsoft.CodeAnalysis.Razor
             Enum,
             ChildContent,
             Delegate,
+            EventCallback,
         }
 
-        private class BlazorSymbols
+        private class ComponentSymbols
         {
-            public static BlazorSymbols Create(Compilation compilation)
+            public static ComponentSymbols Create(Compilation compilation)
             {
-                var symbols = new BlazorSymbols();
+                // We find a bunch of important and fundamental types here that are needed to discover
+                // components. If one of these isn't defined then we just bail, because the results will
+                // be unpredictable.
+                var symbols = new ComponentSymbols();
+
                 symbols.ComponentBase = compilation.GetTypeByMetadataName(ComponentsApi.ComponentBase.MetadataName);
                 if (symbols.ComponentBase == null)
                 {
@@ -422,18 +445,34 @@ namespace Microsoft.CodeAnalysis.Razor
                 if (symbols.RenderFragment == null)
                 {
                     // No definition for RenderFragment, nothing to do.
+                    return null;
                 }
 
                 symbols.RenderFragmentOfT = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragmentOfT.MetadataName);
                 if (symbols.RenderFragmentOfT == null)
                 {
-                    // No definition for RenderFragment, nothing to do.
+                    // No definition for RenderFragment<T>, nothing to do.
+                    return null;
+                }
+
+                symbols.EventCallback = compilation.GetTypeByMetadataName(ComponentsApi.EventCallback.MetadataName);
+                if (symbols.EventCallback == null)
+                {
+                    // No definition for EventCallback, nothing to do.
+                    return null;
+                }
+
+                symbols.EventCallbackOfT = compilation.GetTypeByMetadataName(ComponentsApi.EventCallbackOfT.MetadataName);
+                if (symbols.EventCallbackOfT == null)
+                {
+                    // No definition for EventCallback<T>, nothing to do.
+                    return null;
                 }
 
                 return symbols;
             }
 
-            private BlazorSymbols()
+            private ComponentSymbols()
             {
             }
 
@@ -446,14 +485,18 @@ namespace Microsoft.CodeAnalysis.Razor
             public INamedTypeSymbol RenderFragment { get; private set; }
 
             public INamedTypeSymbol RenderFragmentOfT { get; private set; }
+
+            public INamedTypeSymbol EventCallback { get; private set; }
+
+            public INamedTypeSymbol EventCallbackOfT { get; private set; }
         }
 
         private class ComponentTypeVisitor : SymbolVisitor
         {
-            private readonly BlazorSymbols _symbols;
+            private readonly ComponentSymbols _symbols;
             private readonly List<INamedTypeSymbol> _results;
 
-            public ComponentTypeVisitor(BlazorSymbols symbols, List<INamedTypeSymbol> results)
+            public ComponentTypeVisitor(ComponentSymbols symbols, List<INamedTypeSymbol> results)
             {
                 _symbols = symbols;
                 _results = results;
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 6aa2b87c1d..be41787fd3 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -11,7 +11,7 @@ namespace Microsoft.CodeAnalysis.Razor
     public class BindTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
     {
         [Fact]
-        public void Execute_FindsBindTagHelperOnComponentType_CreatesDescriptor()
+        public void Execute_FindsBindTagHelperOnComponentType_Delegate_CreatesDescriptor()
         {
             // Arrange
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
@@ -130,6 +130,120 @@ namespace Test
             Assert.False(attribute.IsEnum);
         }
 
+        [Fact]
+        public void Execute_FindsBindTagHelperOnComponentType_EventCallback_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : IComponent
+    {
+        public void Init(RenderHandle renderHandle) { }
+
+        public void SetParameters(ParameterCollection parameters) { }
+
+        [Parameter]
+        string MyProperty { get; set; }
+
+        [Parameter]
+        EventCallback<string> MyPropertyChanged { get; set; }
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            // We run after component discovery and depend on the results.
+            var componentProvider = new ComponentTagHelperDescriptorProvider();
+            componentProvider.Execute(context);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            var bind = Assert.Single(matches);
+
+            // These are features Bind Tags Helpers don't use. Verifying them once here and
+            // then ignoring them.
+            Assert.Empty(bind.AllowedChildTags);
+            Assert.Null(bind.TagOutputHint);
+
+            // These are features that are invariants of all Bind Tag Helpers. Verifying them once
+            // here and then ignoring them.
+            Assert.Empty(bind.Diagnostics);
+            Assert.False(bind.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(bind.IsDefaultKind());
+            Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal("MyProperty", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
+            Assert.Equal("MyPropertyChanged", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+
+            Assert.Equal(
+                "Binds the provided expression to the 'MyProperty' property and a change event " +
+                    "delegate to the 'MyPropertyChanged' property of the component.",
+                bind.Documentation);
+
+            // These are all trivially derived from the assembly/namespace/type name
+            Assert.Equal("TestAssembly", bind.AssemblyName);
+            Assert.Equal("Test.MyComponent", bind.Name);
+            Assert.Equal("Test.MyComponent", bind.DisplayName);
+            Assert.Equal("Test.MyComponent", bind.GetTypeName());
+
+            var rule = Assert.Single(bind.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("MyComponent", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("bind-MyProperty", requiredAttribute.DisplayName);
+            Assert.Equal("bind-MyProperty", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(bind.BoundAttributes);
+
+            // Invariants
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Binds the provided expression to the 'MyProperty' property and a change event " +
+                    "delegate to the 'MyPropertyChanged' property of the component.",
+                attribute.Documentation);
+
+            Assert.Equal("bind-MyProperty", attribute.Name);
+            Assert.Equal("MyProperty", attribute.GetPropertyName());
+            Assert.Equal("string Test.MyComponent.MyProperty", attribute.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.String", attribute.TypeName);
+            Assert.True(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+
         [Fact]
         public void Execute_NoMatchedPropertiesOnComponent_IgnoresComponent()
         {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 52752cf28b..42be5cb115 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -577,6 +577,171 @@ namespace Test
                 });
         }
 
+        [Fact]
+        public void Execute_EventCallbackProperty_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback OnClick { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            var attribute = Assert.Single(component.BoundAttributes);
+            Assert.Equal("OnClick", attribute.Name);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback", attribute.TypeName);
+
+            Assert.False(attribute.HasIndexer);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+            Assert.False(attribute.IsStringProperty);
+            Assert.True(attribute.IsEventCallbackProperty());
+            Assert.False(attribute.IsDelegateProperty());
+            Assert.False(attribute.IsChildContentProperty());
+        }
+
+        [Fact]
+        public void Execute_EventCallbackProperty_CreatesDescriptor_ClosedGeneric()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("OnClick", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>", a.TypeName);
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.True(a.IsEventCallbackProperty());
+                    Assert.False(a.IsDelegateProperty());
+                    Assert.False(a.IsChildContentProperty());
+                    Assert.False(a.IsGenericTypedProperty());
+
+                });
+        }
+
+        [Fact]
+        public void Execute_EventCallbackProperty_CreatesDescriptor_OpenGeneric()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        EventCallback<T> OnClick { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent<T>", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("OnClick", a.Name);
+                    Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<T>", a.TypeName);
+                    Assert.False(a.HasIndexer);
+                    Assert.False(a.IsBooleanProperty);
+                    Assert.False(a.IsEnum);
+                    Assert.False(a.IsStringProperty);
+                    Assert.True(a.IsEventCallbackProperty());
+                    Assert.False(a.IsDelegateProperty());
+                    Assert.False(a.IsChildContentProperty());
+                    Assert.True(a.IsGenericTypedProperty());
+
+                },
+                a =>
+                {
+                    Assert.Equal("T", a.Name);
+                    Assert.Equal("T", a.GetPropertyName());
+                    Assert.Equal("T", a.DisplayName);
+                    Assert.Equal("System.Type", a.TypeName);
+                    Assert.True(a.IsTypeParameterProperty());
+                });
+        }
+
         [Fact]
         public void Execute_RenderFragmentProperty_CreatesDescriptors()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
index 1e23d5a70f..3e4b51b60e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
@@ -69,6 +69,24 @@ namespace Microsoft.AspNetCore.Components
             return value;
         }
 
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static EventCallback GetEventHandlerValue<T>(EventCallback value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Not intended to be used directly.
+        /// </summary>
+        public static EventCallback<T> GetEventHandlerValue<T>(EventCallback<T> value)
+            where T : UIEventArgs
+        {
+            return value;
+        }
+
         /// <summary>
         /// Not intended to be used directly.
         /// </summary>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs
new file mode 100644
index 0000000000..52c4fe1aab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public readonly struct EventCallback
+    {
+        public static readonly EventCallbackFactory Factory = new EventCallbackFactory();
+
+        internal readonly MulticastDelegate Delegate;
+        internal readonly IHandleEvent Receiver;
+
+        public EventCallback(IHandleEvent receiver, MulticastDelegate @delegate)
+        {
+            Receiver = receiver;
+            Delegate = @delegate;
+        }
+    }
+
+    public readonly struct EventCallback<T>
+    {
+        internal readonly MulticastDelegate Delegate;
+        internal readonly IHandleEvent Receiver;
+
+        public EventCallback(IHandleEvent receiver, MulticastDelegate @delegate)
+        {
+            Receiver = receiver;
+            Delegate = @delegate;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
new file mode 100644
index 0000000000..6f54596a1f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public sealed class EventCallbackFactory
+    {
+        public EventCallback Create(object receiver, EventCallback callback) => default;
+
+        public EventCallback Create(object receiver, Action callback) => default;
+
+        public EventCallback Create(object receiver, Action<object> callback) => default;
+
+        public EventCallback Create(object receiver, Func<Task> callback) => default;
+
+        public EventCallback Create(object receiver, Func<object, Task> callback) => default;
+
+        public EventCallback<T> Create<T>(object receiver, string callback) => default;
+
+        public EventCallback<T> Create<T>(object receiver, EventCallback<T> callback) => default;
+
+        public EventCallback<T> Create<T>(object receiver, Action callback) => default;
+
+        public EventCallback<T> Create<T>(object receiver, Action<T> callback) => default;
+
+        public EventCallback<T> Create<T>(object receiver, Func<Task> callback) => default;
+
+        public EventCallback<T> Create<T>(object receiver, Func<T, Task> callback) => default;
+
+        public EventCallback<T> CreateInferred<T>(object receiver, Action<T> callback, T value)
+        {
+            return Create(receiver, callback);
+        }
+
+        public EventCallback<T> CreateInferred<T>(object receiver, Func<T, Task> callback, T value)
+        {
+            return Create(receiver, callback);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs
new file mode 100644
index 0000000000..8a920ff53c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs
@@ -0,0 +1,107 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public static class EventCallbackFactoryBinderExtensions
+    {
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<string> setter,
+            string existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<bool> setter,
+            bool existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<bool?> setter,
+            bool? existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<int> setter,
+            int existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<int?> setter,
+            int? existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<long> setter,
+            long existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<long?> setter,
+            long? existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<float> setter,
+            float existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<float?> setter,
+            float? existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<double> setter,
+            double existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<double?> setter,
+            double? existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<decimal> setter,
+            decimal existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<decimal?> setter,
+            decimal? existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<DateTime> setter,
+            DateTime existingValue) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<DateTime> setter,
+            DateTime existingValue,
+            string format) => default;
+
+        public static EventCallback<UIChangeEventArgs> CreateBinder<T>(
+            this EventCallbackFactory factory,
+            object receiver,
+            Action<T> setter,
+            T existingValue) where T : Enum => default;
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs
new file mode 100644
index 0000000000..c81d09fd07
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public static class EventCallbackFactoryUIEventArgsExtensions
+    {
+        public static EventCallback<UIEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIEventArgs> callback) => default;
+
+        public static EventCallback<UIEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIChangeEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIChangeEventArgs> callback) => default;
+
+        public static EventCallback<UIChangeEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIChangeEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIClipboardEventArgs> callback) => default;
+
+        public static EventCallback<UIClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIClipboardEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIDragEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIDragEventArgs> callback) => default;
+
+        public static EventCallback<UIDragEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIDragEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIErrorEventArgs> callback) => default;
+
+        public static EventCallback<UIErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIErrorEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIFocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIFocusEventArgs> callback) => default;
+
+        public static EventCallback<UIFocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIFocusEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIKeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIKeyboardEventArgs> callback) => default;
+
+        public static EventCallback<UIKeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIKeyboardEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIMouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIMouseEventArgs> callback) => default;
+
+        public static EventCallback<UIMouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIMouseEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIPointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIPointerEventArgs> callback) => default;
+
+        public static EventCallback<UIPointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIPointerEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIProgressEventArgs> callback) => default;
+
+        public static EventCallback<UIProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIProgressEventArgs, Task> callback) => default;
+
+        public static EventCallback<UITouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UITouchEventArgs> callback) => default;
+
+        public static EventCallback<UITouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UITouchEventArgs, Task> callback) => default;
+
+        public static EventCallback<UIWheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIWheelEventArgs> callback) => default;
+
+        public static EventCallback<UIWheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIWheelEventArgs, Task> callback) => default;
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs
new file mode 100644
index 0000000000..b5ba9a87c8
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    public interface IHandleEvent
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
index 8cbcb3712d..e07c337a4d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -72,6 +72,14 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         {
         }
 
+        public void AddAttribute(int sequence, string name, EventCallback value)
+        {
+        }
+
+        public void AddAttribute<T>(int sequence, string name, EventCallback<T> value)
+        {
+        }
+
         public void AddAttribute(int sequence, string name, object value)
         {
         }

From ca3e094beedef0464de16e9d2a6d0f3ddcb68556 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 20 Feb 2019 09:25:12 -0800
Subject: [PATCH 087/337] Fixed an assumption in ComponentLoweringPass
 (dotnet/aspnetcore-tooling#226)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/87bb13830437d9b36a76a7ebdac87ef91e854e79
---
 .../src/Components/ComponentLoweringPass.cs   | 36 +++++++++++--------
 .../RazorIntegrationTestBase.cs               | 10 +++---
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
index 61fd26cad0..61d8240f29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -304,36 +304,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     if (attribute.Children[i] is HtmlAttributeValueIntermediateNode htmlValue)
                     {
-                        attribute.Children[i] = new HtmlContentIntermediateNode()
+                        var newNode = new HtmlContentIntermediateNode()
                         {
-                            Children =
-                            {
-                                htmlValue.Children.Single(),
-                            },
                             Source = htmlValue.Source,
                         };
+                        for (var j = 0; j < htmlValue.Children.Count; j++)
+                        {
+                            newNode.Children.Add(htmlValue.Children[j]);
+                        }
+
+                        attribute.Children[i] = newNode;
                     }
                     else if (attribute.Children[i] is CSharpExpressionAttributeValueIntermediateNode expressionValue)
                     {
-                        attribute.Children[i] = new CSharpExpressionIntermediateNode()
+                        var newNode = new CSharpExpressionIntermediateNode()
                         {
-                            Children =
-                            {
-                                expressionValue.Children.Single(),
-                            },
                             Source = expressionValue.Source,
                         };
+                        for (var j = 0; j < expressionValue.Children.Count; j++)
+                        {
+                            newNode.Children.Add(expressionValue.Children[j]);
+                        }
+
+                        attribute.Children[i] = newNode;
                     }
                     else if (attribute.Children[i] is CSharpCodeAttributeValueIntermediateNode codeValue)
                     {
-                        attribute.Children[i] = new CSharpExpressionIntermediateNode()
+                        var newNode = new CSharpExpressionIntermediateNode()
                         {
-                            Children =
-                            {
-                                codeValue.Children.Single(),
-                            },
                             Source = codeValue.Source,
                         };
+                        for (var j = 0; j < codeValue.Children.Count; j++)
+                        {
+                            newNode.Children.Add(codeValue.Children[j]);
+                        }
+
+                        attribute.Children[i] = newNode;
                     }
                 }
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index fe405bcce6..ab134a23eb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -158,12 +158,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             };
         }
 
-        protected CompileToCSharpResult CompileToCSharp(string cshtmlContent)
+        protected CompileToCSharpResult CompileToCSharp(string cshtmlContent, bool throwOnFailure=true)
         {
-            return CompileToCSharp(DefaultFileName, cshtmlContent);
+            return CompileToCSharp(DefaultFileName, cshtmlContent, throwOnFailure);
         }
 
-        protected CompileToCSharpResult CompileToCSharp(string cshtmlRelativePath, string cshtmlContent)
+        protected CompileToCSharpResult CompileToCSharp(string cshtmlRelativePath, string cshtmlContent, bool throwOnFailure = true)
         {
             if (DeclarationOnly && DesignTime)
             {
@@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 };
 
                 // Result of doing 'temp' compilation
-                var tempAssembly = CompileToAssembly(declaration);
+                var tempAssembly = CompileToAssembly(declaration, throwOnFailure);
 
                 // Add the 'temp' compilation as a metadata reference 
                 var references = BaseCompilation.References.Concat(new[] { tempAssembly.Compilation.ToMetadataReference() }).ToArray();
@@ -273,7 +273,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         protected CompileToAssemblyResult CompileToAssembly(CompileToCSharpResult cSharpResult, bool throwOnFailure = true)
         {
-            if (cSharpResult.Diagnostics.Any())
+            if (cSharpResult.Diagnostics.Any() && throwOnFailure)
             {
                 var diagnosticsLog = string.Join(Environment.NewLine, cSharpResult.Diagnostics.Select(d => d.ToString()).ToArray());
                 throw new InvalidOperationException($"Aborting compilation to assembly because RazorCompiler returned nonempty diagnostics: {diagnosticsLog}");

From 81ac40e82dbb106d6b8402affde2aec6dfb0eebf Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 19 Feb 2019 15:46:34 -0800
Subject: [PATCH 088/337] Fix a bad copy-paste \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/d63c6bbc2cfdc6e89ebc06763674b94ab66ae3fb

---
 .../Microsoft.AspNetCore.Components/EventCallbackFactory.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
index 6f54596a1f..882490199c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Components
 
         public EventCallback Create(object receiver, Func<object, Task> callback) => default;
 
-        public EventCallback<T> Create<T>(object receiver, string callback) => default;
+        public string Create<T>(object receiver, string callback) => default;
 
         public EventCallback<T> Create<T>(object receiver, EventCallback<T> callback) => default;
 

From 61e85256a65313991f3ff6bcca139e4dd6740dc1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 22 Feb 2019 10:24:51 -0800
Subject: [PATCH 089/337] Update dependencies and remove some unused version
 variable overrides (dotnet/aspnetcore-tooling#238)

* Update dependencies
* Add workaround for dotnet/sdkdotnet/aspnetcore-tooling#2976
* Remove unused NETStandard package version variable and overrides
* Update xunit to 2.4.1
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/67082970b7dd5aa8845d50acb7f601f4f723e012
---
 .../Microsoft.NET.Sdk.Razor/test/BuildVariables.cs     | 10 ----------
 .../IntegrationTests/MSBuildIntegrationTestBase.cs     |  1 -
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj           |  1 -
 .../Microsoft.AspNetCore.Razor.Test.Common.csproj      |  2 +-
 src/Razor/test/testassets/Directory.Build.props        |  5 -----
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
index 00e8491e1f..f6379ae723 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
@@ -7,7 +7,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     {
         private static string _msBuildPath = string.Empty;
         private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
-        private static string _netStandardLibrary20PackageVersion = string.Empty;
 
         static partial void InitializeVariables();
 
@@ -28,14 +27,5 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 return _microsoftNETCoreApp30PackageVersion;
             }
         }
-
-        public static string NETStandardLibrary20PackageVersion
-        {
-            get
-            {
-                InitializeVariables();
-                return _netStandardLibrary20PackageVersion;
-            }
-        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index a1a9a1b3a8..9ae25f1705 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -74,7 +74,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 "/p:RunningAsTest=true",
 
                 $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
-                $"/p:NETStandardLibrary20PackageVersion={BuildVariables.NETStandardLibrary20PackageVersion}",
             };
 
             if (!suppressRestore)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index e920cbae07..fcd837e7aa 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -73,7 +73,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             _msBuildPath = @"$(_DesktopMSBuildPath)";
             _microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
-            _netStandardLibrary20PackageVersion = "$(NETStandardLibrary20PackageVersion)";
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index b061917f3c..ecc1c90709 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index ca9e0ca4d7..4d6fd942d0 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -13,11 +13,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
-
-    <NETStandardImplicitPackageVersion>$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-
     <!-- Working around an issue in XDT transforms -->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
   </PropertyGroup>

From 921373b0a6330434762de7a0b4e39da659236abf Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 22 Feb 2019 16:03:14 -0800
Subject: [PATCH 090/337] Add IVT to OmniSharpPlugin.StrongNamed. \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/b66f016af8da6a6f83683ac54432656454229ee9

---
 .../src/Properties/AssemblyInfo.cs                               | 1 +
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
index ead294ed20..fdf845dd06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.OmniSharpPlugin.StrongNamed, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 4647f3e781..4c2f00e90b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.OmniSharpPlugin.StrongNamed, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

From 8f76b905856412ce096389c684b19abfab9df629 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Fri, 22 Feb 2019 17:58:57 -0800
Subject: [PATCH 091/337] Add new nesting capability \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/2ca30ed836de529f814939fba619c64bcc613933

---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 6a40423d94..7238792f50 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -27,6 +27,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       the runtime/toolset packages. Introduced in 2.1
     -->
     <ProjectCapability Include="DotNetCoreRazorConfiguration" Condition="'$(_TargetingNETCoreApp30OrLater)'=='true'"/>
+
+
+    <!--
+      Activates the set of nesting behaviors we want from solution explorer.
+    -->
+    <ProjectCapability Include="WebNestingDefaults" />
   </ItemGroup>
 
   <!-- 

From 6274d4ec8638a20b49d230e62addd4fa02296059 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 25 Feb 2019 15:06:29 -0800
Subject: [PATCH 092/337] Update naming and branding for components \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/f8208949411158188ad3f16253d4a682616ba58d

---
 .../src/Components/BlazorMetadata.cs          | 87 -------------------
 .../ComponentComplexAttributeContentPass.cs   |  2 +-
 .../Components/ComponentGenericTypePass.cs    |  4 +-
 .../Components/ComponentInjectDirective.cs    |  2 +-
 .../src/Components/ComponentLoweringPass.cs   |  2 +-
 .../src/Components/ComponentMetadata.cs       | 87 +++++++++++++++++++
 ...elperBoundAttributeDescriptorExtensions.cs | 16 ++--
 .../TagHelperDescriptorExtensions.cs          | 32 +++----
 .../src/BindTagHelperDescriptorProvider.cs    | 32 +++----
 .../ComponentTagHelperDescriptorProvider.cs   | 28 +++---
 ...EventHandlerTagHelperDescriptorProvider.cs | 10 +--
 .../src/RefTagHelperDescriptorProvider.cs     |  6 +-
 .../BindTagHelperDescriptorProviderTest.cs    | 68 +++++++--------
 ...omponentTagHelperDescriptorProviderTest.cs | 32 +++----
 ...tHandlerTagHelperDescriptorProviderTest.cs | 10 +--
 .../RefTagHelperDescriptorProviderTest.cs     |  6 +-
 .../RazorIntegrationTestBase.cs               |  2 +-
 17 files changed, 213 insertions(+), 213 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
deleted file mode 100644
index 32a52899e8..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/BlazorMetadata.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    // Metadata used for Blazor's interactions with the tag helper system
-    internal static class BlazorMetadata
-    {
-        // There's a bug in the 15.7 preview 1 Razor that prevents 'Kind' from being serialized
-        // this affects both tooling and build. For now our workaround is to ignore 'Kind' and
-        // use our own metadata entry to denote non-Component tag helpers.
-        public static readonly string SpecialKindKey = "Blazor.IsSpecialKind";
-
-        public static class Bind
-        {
-            public static readonly string RuntimeName = "Blazor.None";
-
-            public readonly static string TagHelperKind = "Blazor.Bind";
-
-            public readonly static string FallbackKey = "Blazor.Bind.Fallback";
-
-            public readonly static string TypeAttribute = "Blazor.Bind.TypeAttribute";
-
-            public readonly static string ValueAttribute = "Blazor.Bind.ValueAttribute";
-
-            public readonly static string ChangeAttribute = "Blazor.Bind.ChangeAttribute";
-
-            public readonly static string ExpressionAttribute = "Blazor.Bind.ExpressionAttribute";
-        }
-
-        public static class ChildContent
-        {
-            public static readonly string RuntimeName = "Blazor.None";
-
-            public static readonly string TagHelperKind = "Blazor.ChildContent";
-
-            public static readonly string ParameterNameBoundAttributeKind = "Blazor.ChildContentParameterName";
-
-            /// <summary>
-            /// The name of the synthesized attribute used to set a child content parameter.
-            /// </summary>
-            public static readonly string ParameterAttributeName = "Context";
-
-            /// <summary>
-            /// The default name of the child content parameter (unless set by a Context attribute).
-            /// </summary>
-            public static readonly string DefaultParameterName = "context";
-        }
-
-        public static class Component
-        {
-            public static readonly string ChildContentKey = "Blazor.ChildContent";
-
-            public static readonly string ChildContentParameterNameKey = "Blazor.ChildContentParameterName";
-
-            public static readonly string DelegateSignatureKey = "Blazor.DelegateSignature";
-
-            public static readonly string EventCallbackKey = "Blazor.EventCallback";
-
-            public static readonly string WeaklyTypedKey = "Blazor.IsWeaklyTyped";
-
-            public static readonly string RuntimeName = "Blazor.IComponent";
-
-            public readonly static string TagHelperKind = "Blazor.Component";
-
-            public readonly static string GenericTypedKey = "Blazor.GenericTyped";
-
-            public readonly static string TypeParameterKey = "Blazor.TypeParameter";
-        }
-
-        public static class EventHandler
-        {
-            public static readonly string EventArgsType = "Blazor.EventHandler.EventArgs";
-
-            public static readonly string RuntimeName = "Blazor.None";
-
-            public readonly static string TagHelperKind = "Blazor.EventHandler";
-        }
-
-        public static class Ref
-        {
-            public readonly static string TagHelperKind = "Blazor.Ref";
-
-            public static readonly string RuntimeName = "Blazor.None";
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
index 8b7c73d306..3a6984f397 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     // We don't support 'complex' content for components (mixed C# and markup) right now.
-    // It's not clear yet if Blazor will have a good scenario to use these constructs.
+    // It's not clear yet if components will have a good scenario to use these constructs.
     //
     // This is where a lot of the complexity in the Razor/TagHelpers model creeps in and we
     // might be able to avoid it if these features aren't needed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index a7709d3116..62ee1a8980 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -284,7 +284,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // Now we need to insert the type inference node into the tree.
                 var namespaceNode = documentNode.Children
                     .OfType<NamespaceDeclarationIntermediateNode>()
-                    .Where(n => n.Annotations.Contains(new KeyValuePair<object, object>(BlazorMetadata.Component.GenericTypedKey, bool.TrueString)))
+                    .Where(n => n.Annotations.Contains(new KeyValuePair<object, object>(ComponentMetadata.Component.GenericTypedKey, bool.TrueString)))
                     .FirstOrDefault();
                 if (namespaceNode == null)
                 {
@@ -292,7 +292,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     {
                         Annotations =
                         {
-                            { BlazorMetadata.Component.GenericTypedKey, bool.TrueString },
+                            { ComponentMetadata.Component.GenericTypedKey, bool.TrueString },
                         },
                         Content = @namespace,
                     };
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
index 3c9923008b..7d123442ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
@@ -6,7 +6,7 @@ using System;
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     // Much of the following is equivalent to Microsoft.AspNetCore.Mvc.Razor.Extensions's InjectDirective,
-    // but this one outputs properties annotated for Blazor's property injector, plus it doesn't need to
+    // but this one outputs properties annotated for Components's property injector, plus it doesn't need to
     // support multiple CodeTargets.
 
     internal class ComponentInjectDirective
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
index 61d8240f29..4b8da7a490 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // because we see the nodes in the wrong order.
             foreach (var childContent in component.ChildContents)
             {
-                childContent.ParameterName = childContent.ParameterName ?? component.ChildContentParameterName ?? BlazorMetadata.ChildContent.DefaultParameterName;
+                childContent.ParameterName = childContent.ParameterName ?? component.ChildContentParameterName ?? ComponentMetadata.ChildContent.DefaultParameterName;
             }
 
             return component;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
new file mode 100644
index 0000000000..a203bb2690
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -0,0 +1,87 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Metadata used for Components interactions with the tag helper system
+    internal static class ComponentMetadata
+    {
+        // There's a bug in the 15.7 preview 1 Razor that prevents 'Kind' from being serialized
+        // this affects both tooling and build. For now our workaround is to ignore 'Kind' and
+        // use our own metadata entry to denote non-Component tag helpers.
+        public static readonly string SpecialKindKey = "Components.IsSpecialKind";
+
+        public static class Bind
+        {
+            public static readonly string RuntimeName = "Components.None";
+
+            public readonly static string TagHelperKind = "Components.Bind";
+
+            public readonly static string FallbackKey = "Components.Bind.Fallback";
+
+            public readonly static string TypeAttribute = "Components.Bind.TypeAttribute";
+
+            public readonly static string ValueAttribute = "Components.Bind.ValueAttribute";
+
+            public readonly static string ChangeAttribute = "Components.Bind.ChangeAttribute";
+
+            public readonly static string ExpressionAttribute = "Components.Bind.ExpressionAttribute";
+        }
+
+        public static class ChildContent
+        {
+            public static readonly string RuntimeName = "Components.None";
+
+            public static readonly string TagHelperKind = "Components.ChildContent";
+
+            public static readonly string ParameterNameBoundAttributeKind = "Components.ChildContentParameterName";
+
+            /// <summary>
+            /// The name of the synthesized attribute used to set a child content parameter.
+            /// </summary>
+            public static readonly string ParameterAttributeName = "Context";
+
+            /// <summary>
+            /// The default name of the child content parameter (unless set by a Context attribute).
+            /// </summary>
+            public static readonly string DefaultParameterName = "context";
+        }
+
+        public static class Component
+        {
+            public static readonly string ChildContentKey = "Components.ChildContent";
+
+            public static readonly string ChildContentParameterNameKey = "Components.ChildContentParameterName";
+
+            public static readonly string DelegateSignatureKey = "Components.DelegateSignature";
+
+            public static readonly string EventCallbackKey = "Components.EventCallback";
+
+            public static readonly string WeaklyTypedKey = "Components.IsWeaklyTyped";
+
+            public static readonly string RuntimeName = "Components.IComponent";
+
+            public readonly static string TagHelperKind = "Components.Component";
+
+            public readonly static string GenericTypedKey = "Components.GenericTyped";
+
+            public readonly static string TypeParameterKey = "Components.TypeParameter";
+        }
+
+        public static class EventHandler
+        {
+            public static readonly string EventArgsType = "Components.EventHandler.EventArgs";
+
+            public static readonly string RuntimeName = "Components.None";
+
+            public readonly static string TagHelperKind = "Components.EventHandler";
+        }
+
+        public static class Ref
+        {
+            public readonly static string TagHelperKind = "Components.Ref";
+
+            public static readonly string RuntimeName = "Components.None";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
index 0a99a07b63..11c626fc9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperBoundAttributeDescriptorExtensions.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(attribute));
             }
 
-            var key = BlazorMetadata.Component.DelegateSignatureKey;
+            var key = ComponentMetadata.Component.DelegateSignatureKey;
             return 
                 attribute.Metadata.TryGetValue(key, out var value) &&
                 string.Equals(value, bool.TrueString);
@@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(attribute));
             }
 
-            var key = BlazorMetadata.Component.EventCallbackKey;
+            var key = ComponentMetadata.Component.EventCallbackKey;
             return
                 attribute.Metadata.TryGetValue(key, out var value) &&
                 string.Equals(value, bool.TrueString);
@@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             
             return
-                attribute.Metadata.TryGetValue(BlazorMetadata.Component.GenericTypedKey, out var value) &&
+                attribute.Metadata.TryGetValue(ComponentMetadata.Component.GenericTypedKey, out var value) &&
                 string.Equals(value, bool.TrueString);
         }
 
@@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             return
-                attribute.Metadata.TryGetValue(BlazorMetadata.Component.TypeParameterKey, out var value) &&
+                attribute.Metadata.TryGetValue(ComponentMetadata.Component.TypeParameterKey, out var value) &&
                 string.Equals(value, bool.TrueString);
         }
 
@@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(attribute));
             }
 
-            var key = BlazorMetadata.Component.WeaklyTypedKey;
+            var key = ComponentMetadata.Component.WeaklyTypedKey;
             return
                 attribute.Metadata.TryGetValue(key, out var value) &&
                 string.Equals(value, bool.TrueString);
@@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(attribute));
             }
 
-            var key = BlazorMetadata.Component.ChildContentKey;
+            var key = ComponentMetadata.Component.ChildContentKey;
             return
                 attribute.Metadata.TryGetValue(key, out var value) &&
                 string.Equals(value, bool.TrueString);
@@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(attribute));
             }
 
-            var key = BlazorMetadata.Component.ChildContentKey;
+            var key = ComponentMetadata.Component.ChildContentKey;
             return
                 attribute.Metadata.TryGetValue(key, out var value) &&
                 string.Equals(value, bool.TrueString);
@@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(attribute));
             }
 
-            var key = BlazorMetadata.Component.ChildContentParameterNameKey;
+            var key = ComponentMetadata.Component.ChildContentParameterNameKey;
             return
                 attribute.Metadata.TryGetValue(key, out var value) &&
                 string.Equals(value, bool.TrueString);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index 76b7932ab8..005da7cccd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -18,8 +18,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             
             return 
-                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var kind) && 
-                string.Equals(BlazorMetadata.Bind.TagHelperKind, kind);
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.SpecialKindKey, out var kind) && 
+                string.Equals(ComponentMetadata.Bind.TagHelperKind, kind);
         }
 
         public static bool IsFallbackBindTagHelper(this TagHelperDescriptor tagHelper)
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             return
                 tagHelper.IsBindTagHelper() &&
-                tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.FallbackKey, out var fallback) &&
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.Bind.FallbackKey, out var fallback) &&
                 string.Equals(bool.TrueString, fallback);
         }
 
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             return
                 IsComponentTagHelper(tagHelper) &&
-                tagHelper.Metadata.TryGetValue(BlazorMetadata.Component.GenericTypedKey, out var value) &&
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.Component.GenericTypedKey, out var value) &&
                 string.Equals(bool.TrueString, value);
         }
 
@@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             return
                 tagHelper.IsInputElementBindTagHelper() &&
-                !tagHelper.Metadata.ContainsKey(BlazorMetadata.Bind.TypeAttribute);
+                !tagHelper.Metadata.ContainsKey(ComponentMetadata.Bind.TypeAttribute);
         }
 
         public static string GetValueAttributeName(this TagHelperDescriptor tagHelper)
@@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(tagHelper));
             }
 
-            tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.ValueAttribute, out var result);
+            tagHelper.Metadata.TryGetValue(ComponentMetadata.Bind.ValueAttribute, out var result);
             return result;
         }
 
@@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(tagHelper));
             }
 
-            tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.ChangeAttribute, out var result);
+            tagHelper.Metadata.TryGetValue(ComponentMetadata.Bind.ChangeAttribute, out var result);
             return result;
         }
 
@@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(tagHelper));
             }
 
-            tagHelper.Metadata.TryGetValue(BlazorMetadata.Bind.ExpressionAttribute, out var result);
+            tagHelper.Metadata.TryGetValue(ComponentMetadata.Bind.ExpressionAttribute, out var result);
             return result;
         }
 
@@ -114,8 +114,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             return
-                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var value) &&
-                string.Equals(value, BlazorMetadata.ChildContent.TagHelperKind, StringComparison.Ordinal);
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.SpecialKindKey, out var value) &&
+                string.Equals(value, ComponentMetadata.ChildContent.TagHelperKind, StringComparison.Ordinal);
         }
 
         public static bool IsComponentTagHelper(this TagHelperDescriptor tagHelper)
@@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(tagHelper));
             }
 
-            return !tagHelper.Metadata.ContainsKey(BlazorMetadata.SpecialKindKey);
+            return !tagHelper.Metadata.ContainsKey(ComponentMetadata.SpecialKindKey);
         }
 
         public static bool IsEventHandlerTagHelper(this TagHelperDescriptor tagHelper)
@@ -136,8 +136,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             return
-                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var kind) &&
-                string.Equals(BlazorMetadata.EventHandler.TagHelperKind, kind);
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.SpecialKindKey, out var kind) &&
+                string.Equals(ComponentMetadata.EventHandler.TagHelperKind, kind);
         }
 
         public static bool IsRefTagHelper(this TagHelperDescriptor tagHelper)
@@ -148,8 +148,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             return
-                tagHelper.Metadata.TryGetValue(BlazorMetadata.SpecialKindKey, out var kind) &&
-                string.Equals(BlazorMetadata.Ref.TagHelperKind, kind);
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.SpecialKindKey, out var kind) &&
+                string.Equals(ComponentMetadata.Ref.TagHelperKind, kind);
         }
 
         public static string GetEventArgsType(this TagHelperDescriptor tagHelper)
@@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(tagHelper));
             }
 
-            tagHelper.Metadata.TryGetValue(BlazorMetadata.EventHandler.EventArgsType, out var result);
+            tagHelper.Metadata.TryGetValue(ComponentMetadata.EventHandler.EventArgsType, out var result);
             return result;
         }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 8f62491145..e3c28d488b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -117,13 +117,13 @@ namespace Microsoft.CodeAnalysis.Razor
 
         private TagHelperDescriptor CreateFallbackBindTagHelper()
         {
-            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName);
+            var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName);
             builder.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
 
-            builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+            builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Bind.TagHelperKind);
             builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
-            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
-            builder.Metadata[BlazorMetadata.Bind.FallbackKey] = bool.TrueString;
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Bind.RuntimeName;
+            builder.Metadata[ComponentMetadata.Bind.FallbackKey] = bool.TrueString;
 
             // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
             // a C# property will crash trying to create the toolips.
@@ -251,17 +251,17 @@ namespace Microsoft.CodeAnalysis.Razor
                 var formatName = entry.Suffix == null ? "Format_" + entry.ValueAttribute : "Format_" + entry.Suffix;
                 var formatAttributeName = entry.Suffix == null ? "format-" + entry.ValueAttribute : "format-" + entry.Suffix;
 
-                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, name, ComponentsApi.AssemblyName);
+                var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, name, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.BindTagHelper_Element_Documentation,
                     entry.ValueAttribute,
                     entry.ChangeAttribute);
 
-                builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
+                builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Bind.TagHelperKind);
                 builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
-                builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
-                builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = entry.ValueAttribute;
-                builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = entry.ChangeAttribute;
+                builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Bind.RuntimeName;
+                builder.Metadata[ComponentMetadata.Bind.ValueAttribute] = entry.ValueAttribute;
+                builder.Metadata[ComponentMetadata.Bind.ChangeAttribute] = entry.ChangeAttribute;
 
                 if (entry.TypeAttribute != null)
                 {
@@ -274,7 +274,7 @@ namespace Microsoft.CodeAnalysis.Razor
                     // 
                     // Therefore we use this metadata to know which one is more specific when two
                     // tag helpers match.
-                    builder.Metadata[BlazorMetadata.Bind.TypeAttribute] = entry.TypeAttribute;
+                    builder.Metadata[ComponentMetadata.Bind.TypeAttribute] = entry.TypeAttribute;
                 }
 
                 // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
@@ -397,21 +397,21 @@ namespace Microsoft.CodeAnalysis.Razor
                         continue;
                     }
 
-                    var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, tagHelper.Name, tagHelper.AssemblyName);
+                    var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, tagHelper.Name, tagHelper.AssemblyName);
                     builder.DisplayName = tagHelper.DisplayName;
                     builder.Documentation = string.Format(
                         ComponentResources.BindTagHelper_Component_Documentation,
                         valueAttribute.Name,
                         changeAttribute.Name);
 
-                    builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind);
-                    builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName;
-                    builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = valueAttribute.Name;
-                    builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = changeAttribute.Name;
+                    builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Bind.TagHelperKind);
+                    builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Bind.RuntimeName;
+                    builder.Metadata[ComponentMetadata.Bind.ValueAttribute] = valueAttribute.Name;
+                    builder.Metadata[ComponentMetadata.Bind.ChangeAttribute] = changeAttribute.Name;
 
                     if (expressionAttribute != null)
                     {
-                        builder.Metadata[BlazorMetadata.Bind.ExpressionAttribute] = expressionAttribute.Name;
+                        builder.Metadata[ComponentMetadata.Bind.ExpressionAttribute] = expressionAttribute.Name;
                     }
 
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 322c69e4cf..f6f9bca9ab 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -86,16 +86,16 @@ namespace Microsoft.CodeAnalysis.Razor
             var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
             var assemblyName = type.ContainingAssembly.Identity.Name;
 
-            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Component.TagHelperKind, typeName, assemblyName);
+            var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Component.TagHelperKind, typeName, assemblyName);
             builder.SetTypeName(typeName);
 
             // This opts out this 'component' tag helper for any processing that's specific to the default
             // Razor ITagHelper runtime.
-            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Component.RuntimeName;
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Component.RuntimeName;
 
             if (type.IsGenericType)
             {
-                builder.Metadata[BlazorMetadata.Component.GenericTypedKey] = bool.TrueString;
+                builder.Metadata[ComponentMetadata.Component.GenericTypedKey] = bool.TrueString;
 
                 for (var i = 0; i < type.TypeArguments.Length; i++)
                 {
@@ -127,7 +127,7 @@ namespace Microsoft.CodeAnalysis.Razor
             }
 
             if (builder.BoundAttributes.Any(a => a.IsParameterizedChildContentProperty()) &&
-                !builder.BoundAttributes.Any(a => string.Equals(a.Name, BlazorMetadata.ChildContent.ParameterAttributeName, StringComparison.OrdinalIgnoreCase)))
+                !builder.BoundAttributes.Any(a => string.Equals(a.Name, ComponentMetadata.ChildContent.ParameterAttributeName, StringComparison.OrdinalIgnoreCase)))
             {
                 // If we have any parameterized child content parameters, synthesize a 'Context' parameter to be
                 // able to set the variable name (for all child content). If the developer defined a 'Context' parameter
@@ -154,22 +154,22 @@ namespace Microsoft.CodeAnalysis.Razor
 
                 if (kind == PropertyKind.ChildContent)
                 {
-                    pb.Metadata.Add(BlazorMetadata.Component.ChildContentKey, bool.TrueString);
+                    pb.Metadata.Add(ComponentMetadata.Component.ChildContentKey, bool.TrueString);
                 }
 
                 if (kind == PropertyKind.EventCallback)
                 {
-                    pb.Metadata.Add(BlazorMetadata.Component.EventCallbackKey, bool.TrueString);
+                    pb.Metadata.Add(ComponentMetadata.Component.EventCallbackKey, bool.TrueString);
                 }
 
                 if (kind == PropertyKind.Delegate)
                 {
-                    pb.Metadata.Add(BlazorMetadata.Component.DelegateSignatureKey, bool.TrueString);
+                    pb.Metadata.Add(ComponentMetadata.Component.DelegateSignatureKey, bool.TrueString);
                 }
 
                 if (HasTypeParameter(property.Type))
                 {
-                    pb.Metadata.Add(BlazorMetadata.Component.GenericTypedKey, bool.TrueString);
+                    pb.Metadata.Add(ComponentMetadata.Component.GenericTypedKey, bool.TrueString);
                 }
 
                 var xml = property.GetDocumentationCommentXml();
@@ -229,7 +229,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 pb.TypeName = typeof(Type).FullName;
                 pb.SetPropertyName(typeParameter.Name);
 
-                pb.Metadata[BlazorMetadata.Component.TypeParameterKey] = bool.TrueString;
+                pb.Metadata[ComponentMetadata.Component.TypeParameterKey] = bool.TrueString;
 
                 pb.Documentation = string.Format(ComponentResources.ComponentTypeParameter_Documentation, typeParameter.Name, builder.Name);
             });
@@ -240,15 +240,15 @@ namespace Microsoft.CodeAnalysis.Razor
             var typeName = component.GetTypeName() + "." + attribute.Name;
             var assemblyName = component.AssemblyName;
 
-            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.ChildContent.TagHelperKind, typeName, assemblyName);
+            var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.ChildContent.TagHelperKind, typeName, assemblyName);
             builder.SetTypeName(typeName);
 
             // This opts out this 'component' tag helper for any processing that's specific to the default
             // Razor ITagHelper runtime.
-            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.ChildContent.RuntimeName;
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.ChildContent.RuntimeName;
 
             // Opt out of processing as a component. We'll process this specially as part of the component's body.
-            builder.Metadata[BlazorMetadata.SpecialKindKey] = BlazorMetadata.ChildContent.TagHelperKind;
+            builder.Metadata[ComponentMetadata.SpecialKindKey] = ComponentMetadata.ChildContent.TagHelperKind;
 
             var xml = attribute.Documentation;
             if (!string.IsNullOrEmpty(xml))
@@ -279,9 +279,9 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             builder.BindAttribute(b =>
             {
-                b.Name = BlazorMetadata.ChildContent.ParameterAttributeName;
+                b.Name = ComponentMetadata.ChildContent.ParameterAttributeName;
                 b.TypeName = typeof(string).FullName;
-                b.Metadata.Add(BlazorMetadata.Component.ChildContentParameterNameKey, bool.TrueString);
+                b.Metadata.Add(ComponentMetadata.Component.ChildContentParameterNameKey, bool.TrueString);
 
                 if (childContentName == null)
                 {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 370702706f..9698aac5ea 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -103,16 +103,16 @@ namespace Microsoft.CodeAnalysis.Razor
             {
                 var entry = data[i];
 
-                var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.EventHandler.TagHelperKind, entry.Attribute, ComponentsApi.AssemblyName);
+                var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.EventHandler.TagHelperKind, entry.Attribute, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.EventHandlerTagHelper_Documentation,
                     entry.Attribute,
                     entry.EventArgsType.ToDisplayString());
 
-                builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.EventHandler.TagHelperKind);
-                builder.Metadata.Add(BlazorMetadata.EventHandler.EventArgsType, entry.EventArgsType.ToDisplayString());
+                builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.EventHandler.TagHelperKind);
+                builder.Metadata.Add(ComponentMetadata.EventHandler.EventArgsType, entry.EventArgsType.ToDisplayString());
                 builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
-                builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.EventHandler.RuntimeName;
+                builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.EventHandler.RuntimeName;
 
                 // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the tooltips.
@@ -143,7 +143,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     // But make this weakly typed (don't type check) - delegates have their own type-checking
                     // logic that we don't want to interfere with.
-                    a.Metadata.Add(BlazorMetadata.Component.WeaklyTypedKey, bool.TrueString);
+                    a.Metadata.Add(ComponentMetadata.Component.WeaklyTypedKey, bool.TrueString);
 
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                     // a C# property will crash trying to create the tooltips.
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index 735269334f..3ff471acdc 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -40,12 +40,12 @@ namespace Microsoft.CodeAnalysis.Razor
 
         private TagHelperDescriptor CreateRefTagHelper()
         {
-            var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName);
+            var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName);
             builder.Documentation = ComponentResources.RefTagHelper_Documentation;
 
-            builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Ref.TagHelperKind);
+            builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Ref.TagHelperKind);
             builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
-            builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Ref.RuntimeName;
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Ref.RuntimeName;
 
             // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
             // a C# property will crash trying to create the tooltips.
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index be41787fd3..8864268033 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -66,14 +66,14 @@ namespace Test
             // here and then ignoring them.
             Assert.Empty(bind.Diagnostics);
             Assert.False(bind.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
-            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
 
-            Assert.Equal("MyProperty", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("MyPropertyChanged", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
-            Assert.Equal("MyPropertyExpression", bind.Metadata[BlazorMetadata.Bind.ExpressionAttribute]);
+            Assert.Equal("MyProperty", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("MyPropertyChanged", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("MyPropertyExpression", bind.Metadata[ComponentMetadata.Bind.ExpressionAttribute]);
 
             Assert.Equal(
                 "Binds the provided expression to the 'MyProperty' property and a change event " +
@@ -106,7 +106,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.HasIndexer);
             Assert.Null(attribute.IndexerNamePrefix);
@@ -181,13 +181,13 @@ namespace Test
             // here and then ignoring them.
             Assert.Empty(bind.Diagnostics);
             Assert.False(bind.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
-            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
 
-            Assert.Equal("MyProperty", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("MyPropertyChanged", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("MyProperty", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("MyPropertyChanged", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
 
             Assert.Equal(
                 "Binds the provided expression to the 'MyProperty' property and a change event " +
@@ -220,7 +220,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.HasIndexer);
             Assert.Null(attribute.IndexerNamePrefix);
@@ -325,14 +325,14 @@ namespace Test
             // here and then ignoring them.
             Assert.Empty(bind.Diagnostics);
             Assert.False(bind.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, bind.Kind);
             Assert.Equal(bool.TrueString, bind.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
-            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
 
-            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
             Assert.False(bind.IsInputElementBindTagHelper());
             Assert.False(bind.IsInputElementFallbackBindTagHelper());
 
@@ -368,7 +368,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.HasIndexer);
             Assert.Null(attribute.IndexerNamePrefix);
@@ -396,7 +396,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.HasIndexer);
             Assert.Null(attribute.IndexerNamePrefix);
@@ -450,8 +450,8 @@ namespace Test
             var matches = GetBindTagHelpers(context);
             var bind = Assert.Single(matches);
 
-            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
             Assert.False(bind.IsInputElementBindTagHelper());
             Assert.False(bind.IsInputElementFallbackBindTagHelper());
 
@@ -504,9 +504,9 @@ namespace Test
             var matches = GetBindTagHelpers(context);
             var bind = Assert.Single(matches);
 
-            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
-            Assert.False(bind.Metadata.ContainsKey(BlazorMetadata.Bind.TypeAttribute));
+            Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
+            Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.TypeAttribute));
             Assert.True(bind.IsInputElementBindTagHelper());
             Assert.True(bind.IsInputElementFallbackBindTagHelper());
 
@@ -559,9 +559,9 @@ namespace Test
             var matches = GetBindTagHelpers(context);
             var bind = Assert.Single(matches);
 
-            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
-            Assert.Equal("checkbox", bind.Metadata[BlazorMetadata.Bind.TypeAttribute]);
+            Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("checkbox", bind.Metadata[ComponentMetadata.Bind.TypeAttribute]);
             Assert.True(bind.IsInputElementBindTagHelper());
             Assert.False(bind.IsInputElementFallbackBindTagHelper());
 
@@ -626,9 +626,9 @@ namespace Test
             var matches = GetBindTagHelpers(context);
             var bind = Assert.Single(matches);
 
-            Assert.Equal("myprop", bind.Metadata[BlazorMetadata.Bind.ValueAttribute]);
-            Assert.Equal("myevent", bind.Metadata[BlazorMetadata.Bind.ChangeAttribute]);
-            Assert.Equal("checkbox", bind.Metadata[BlazorMetadata.Bind.TypeAttribute]);
+            Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("checkbox", bind.Metadata[ComponentMetadata.Bind.TypeAttribute]);
             Assert.True(bind.IsInputElementBindTagHelper());
             Assert.False(bind.IsInputElementFallbackBindTagHelper());
 
@@ -690,14 +690,14 @@ namespace Test
             // here and then ignoring them.
             Assert.Empty(bind.Diagnostics);
             Assert.False(bind.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, bind.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, bind.Kind);
             Assert.Equal(bool.TrueString, bind.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
-            Assert.Equal(BlazorMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
 
-            Assert.False(bind.Metadata.ContainsKey(BlazorMetadata.Bind.ValueAttribute));
-            Assert.False(bind.Metadata.ContainsKey(BlazorMetadata.Bind.ChangeAttribute));
+            Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.ValueAttribute));
+            Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.ChangeAttribute));
             Assert.True(bind.IsFallbackBindTagHelper());
 
             Assert.Equal(
@@ -734,7 +734,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.IsIndexerBooleanProperty);
             Assert.False(attribute.IsIndexerStringProperty);
@@ -767,7 +767,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Bind.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.True(attribute.HasIndexer);
             Assert.Equal("format-", attribute.IndexerNamePrefix);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 42be5cb115..8592486139 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -56,7 +56,7 @@ namespace Test
             // here and then ignoring them.
             Assert.Empty(component.Diagnostics);
             Assert.False(component.HasErrors);
-            Assert.Equal(BlazorMetadata.Component.TagHelperKind, component.Kind);
+            Assert.Equal(ComponentMetadata.Component.TagHelperKind, component.Kind);
             Assert.False(component.IsDefaultKind());
             Assert.False(component.KindUsesDefaultTagHelperRuntime());
 
@@ -84,7 +84,7 @@ namespace Test
             Assert.Collection(
                 component.Metadata.OrderBy(kvp => kvp.Key),
                 kvp => { Assert.Equal(TagHelperMetadata.Common.TypeName, kvp.Key); Assert.Equal("Test.MyComponent", kvp.Value); },
-                kvp => { Assert.Equal(TagHelperMetadata.Runtime.Name, kvp.Key); Assert.Equal("Blazor.IComponent", kvp.Value); });
+                kvp => { Assert.Equal(TagHelperMetadata.Runtime.Name, kvp.Key); Assert.Equal("Components.IComponent", kvp.Value); });
 
             // Our use of bound attributes is what tests will focus on. As you might expect right now, this test
             // is going to cover a lot of trivial stuff that will be true for all components/component-properties.
@@ -93,7 +93,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal("Blazor.Component", attribute.Kind);
+            Assert.Equal("Components.Component", attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
 
             // Related to dictionaries/indexers, not supported currently, not sure if we ever will
@@ -852,7 +852,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.True(a.IsChildContentParameterNameProperty());
                 });
 
@@ -863,7 +863,7 @@ namespace Test
 
             // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
             var contextAttribute = Assert.Single(childContent.BoundAttributes);
-            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
             Assert.Equal("System.String", contextAttribute.TypeName);
             Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
             Assert.True(contextAttribute.IsChildContentParameterNameProperty());
@@ -926,7 +926,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.False(a.IsChildContentParameterNameProperty());
                 });
 
@@ -937,7 +937,7 @@ namespace Test
 
             // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
             var contextAttribute = Assert.Single(childContent.BoundAttributes);
-            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
             Assert.Equal("System.String", contextAttribute.TypeName);
             Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
             Assert.True(contextAttribute.IsChildContentParameterNameProperty());
@@ -998,7 +998,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.True(a.IsChildContentParameterNameProperty());
                 },
                 a =>
@@ -1017,7 +1017,7 @@ namespace Test
 
             // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
             var contextAttribute = Assert.Single(childContent.BoundAttributes);
-            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
             Assert.Equal("System.String", contextAttribute.TypeName);
             Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
             Assert.True(contextAttribute.IsChildContentParameterNameProperty());
@@ -1079,7 +1079,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.True(a.IsChildContentParameterNameProperty());
                 },
                 a =>
@@ -1098,7 +1098,7 @@ namespace Test
 
             // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
             var contextAttribute = Assert.Single(childContent.BoundAttributes);
-            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
             Assert.Equal("System.String", contextAttribute.TypeName);
             Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
             Assert.True(contextAttribute.IsChildContentParameterNameProperty());
@@ -1160,7 +1160,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.True(a.IsChildContentParameterNameProperty());
                 },
                 a =>
@@ -1179,7 +1179,7 @@ namespace Test
 
             // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
             var contextAttribute = Assert.Single(childContent.BoundAttributes);
-            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
             Assert.Equal("System.String", contextAttribute.TypeName);
             Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
             Assert.True(contextAttribute.IsChildContentParameterNameProperty());
@@ -1245,7 +1245,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.True(a.IsChildContentParameterNameProperty());
                 },
                 a =>
@@ -1264,7 +1264,7 @@ namespace Test
 
             // A RenderFragment<T> tag helper has a parameter to allow you to set the lambda parameter name.
             var contextAttribute = Assert.Single(childContent.BoundAttributes);
-            Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
+            Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, contextAttribute.Name);
             Assert.Equal("System.String", contextAttribute.TypeName);
             Assert.Equal("Specifies the parameter name for the 'ChildContent2' child content expression.", contextAttribute.Documentation);
         }
@@ -1321,7 +1321,7 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal(BlazorMetadata.ChildContent.ParameterAttributeName, a.Name);
+                    Assert.Equal(ComponentMetadata.ChildContent.ParameterAttributeName, a.Name);
                     Assert.True(a.IsChildContentParameterNameProperty());
                 },
                 a =>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index c0140ebbcd..86d045195b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -51,9 +51,9 @@ namespace Test
             // here and then ignoring them.
             Assert.Empty(item.Diagnostics);
             Assert.False(item.HasErrors);
-            Assert.Equal(BlazorMetadata.EventHandler.TagHelperKind, item.Kind);
+            Assert.Equal(ComponentMetadata.EventHandler.TagHelperKind, item.Kind);
             Assert.Equal(bool.TrueString, item.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
-            Assert.Equal(BlazorMetadata.EventHandler.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.Equal(ComponentMetadata.EventHandler.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
 
@@ -89,7 +89,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.EventHandler.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.EventHandler.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.HasIndexer);
             Assert.Null(attribute.IndexerNamePrefix);
@@ -99,8 +99,8 @@ namespace Test
 
             Assert.Collection(
                 attribute.Metadata.OrderBy(kvp => kvp.Key),
-                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>(BlazorMetadata.Component.WeaklyTypedKey, bool.TrueString)),
-                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>("Common.PropertyName", "onclick")));
+                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>("Common.PropertyName", "onclick")),
+                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>(ComponentMetadata.Component.WeaklyTypedKey, bool.TrueString)));
 
             Assert.Equal(
                 "Sets the 'onclick' attribute to the provided string or delegate value. " +
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index fa47fce6b7..349f0f5cee 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -30,9 +30,9 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.Null(item.TagOutputHint);
             Assert.Empty(item.Diagnostics);
             Assert.False(item.HasErrors);
-            Assert.Equal(BlazorMetadata.Ref.TagHelperKind, item.Kind);
+            Assert.Equal(ComponentMetadata.Ref.TagHelperKind, item.Kind);
             Assert.Equal(bool.TrueString, item.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
-            Assert.Equal(BlazorMetadata.Ref.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.Equal(ComponentMetadata.Ref.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
 
@@ -64,7 +64,7 @@ namespace Microsoft.CodeAnalysis.Razor
             var attribute = Assert.Single(item.BoundAttributes);
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal(BlazorMetadata.Ref.TagHelperKind, attribute.Kind);
+            Assert.Equal(ComponentMetadata.Ref.TagHelperKind, attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
             Assert.False(attribute.HasIndexer);
             Assert.Null(attribute.IndexerNamePrefix);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index ab134a23eb..6c6ca1fc49 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -236,7 +236,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             else
             {
                 // For single phase compilation tests just use the base compilation's references.
-                // This will include the built-in Blazor components.
+                // This will include the built-in components.
                 var projectEngine = CreateProjectEngine(Configuration, BaseCompilation.References.ToArray());
 
                 var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent);

From 875e40a5c1f65509c42ce1ad08192e0bc9642b49 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 28 Feb 2019 15:01:52 -0800
Subject: [PATCH 093/337] Skip first run experience locally and on azure
 pipelines.

- This would cause our functional tests to time out and occasionally crash due to dotnet first run experience sentinels being locked.

aspnet/AspNetCore-Internaldotnet/aspnetcore-tooling#1859
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2668a0e8a9458f8fd85b815036e448095bce9a73
---
 .../test/IntegrationTests/MSBuildProcessManager.cs            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index c420b47bb8..0d598ce741 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -41,6 +41,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             {
                 processStartInfo.FileName = DotNetMuxer.MuxerPathOrDefault();
                 processStartInfo.Arguments = $"msbuild {arguments}";
+
+                // Suppresses the 'Welcome to .NET Core!' output that times out tests and causes locked file issues.
+                // When using dotnet we're not guarunteed to run in an environment where the dotnet.exe has had its first run experience already invoked.
+                processStartInfo.EnvironmentVariables["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "true";
             }
 
             var processResult = await RunProcessCoreAsync(processStartInfo, timeout);

From c7b34a9184923766763c65c48dede9c325f19d42 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 28 Feb 2019 17:21:55 -0800
Subject: [PATCH 094/337] Unskip test (dotnet/aspnetcore-tooling#231)

* Unskip test

* Better test
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/933d0919adabd9db2abe3c4c0ca0402e32fc8f04
---
 .../test/IntegrationTests/BuildServerIntegrationTest.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 63d25a15b5..6121bc9646 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -110,12 +110,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/Razor/issues/2723")]
+        [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_ServerConnectionMutexCreationFails_FallsBackToInProcessRzc()
         {
-            // Use a pipe name longer that 260 characters to make the Mutex constructor throw.
-            var pipeName = new string('P', 261);
+            // Use an invalid pipe name to make the Mutex constructor throw.
+            var pipeName = "Invalid\\name";
             var result = await DotnetMSBuild(
                 "Build",
                 "/p:_RazorForceBuildServer=true",

From 1af49ef26f328722037af64a9ee922e9f5321fb2 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 1 Mar 2019 09:35:52 -0800
Subject: [PATCH 095/337] Reference the SDK project to make build time restore
 actually work (dotnet/aspnetcore-tooling#278)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/22f4c134c1aad3adb11f8c01600d7eabaad022ac
---
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  5 +++-
 .../RestoreTestProjects.csproj                | 27 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index fcd837e7aa..8bda9b03d2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -38,7 +38,6 @@
     <!-- We don't need anything in this assembly, we just want to make sure it's built -->
     <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -93,4 +92,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
   </Target>
 
+  <Target Name="RestoreTestProjects" BeforeTargets="Restore">
+    <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" />
+  </Target>
+
 </Project>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index c82a224ccd..051be921c2 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -1,20 +1,21 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\ComponentLibrary\ComponentLibrary.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\LargeProject\LargeProject.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\SimplePages\SimplePages.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" />
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
+    <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
+    <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />
+    <ProjectReference Include="..\ComponentLibrary\ComponentLibrary.csproj" />
+    <ProjectReference Include="..\LargeProject\LargeProject.csproj" />
+    <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
+    <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
+    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
+    <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
+    <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
+    <ProjectReference Include="..\SimplePages\SimplePages.csproj" />
   </ItemGroup>
+
 </Project>

From ede3a6809e0c04221178a3e52ae3b4e9ea03fc90 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 1 Mar 2019 11:48:46 -0800
Subject: [PATCH 096/337] Temporarily skip test (dotnet/aspnetcore-tooling#288)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0598ec449702813456129996dc854b75ac64649a
---
 .../test/IntegrationTests/BuildPerformanceTest.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
index 67462d9c4c..74f4221358 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1860")]
         [InitializeTestProject("SimpleMvc")]
         public async Task BuildMvcApp()
         {
@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1860")]
         [InitializeTestProject("MvcWithComponents")]
         public async Task BuildMvcAppWithComponents()
         {

From 53392ba761bfb31fc1f48455d61d78b32525a6d5 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 4 Mar 2019 15:08:49 -0800
Subject: [PATCH 097/337] Add LanguageServer Common IVTs \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/29b0e92bcd50bd299ac3e0be8b40206cc01ff111

---
 .../src/Properties/AssemblyInfo.cs                              | 2 ++
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
index fdf845dd06..0abe91703d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -6,7 +6,9 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 4c2f00e90b..923cde5083 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -6,7 +6,9 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

From 9ffd08c06188dbc7eb72525e4c5b8b05b6d08b82 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 4 Mar 2019 15:51:29 -0800
Subject: [PATCH 098/337] Remove rarely used public obsolete public API.

- The `DocumentWriter` case should never be called because you need to override a lot of the internals of the RazorEngine to get to the document writer. Therefore, little harm in removing the method.
- `ProjectChangeEventArgs` used to be uised by the LiveShare extension. We've since taken ownership of those bits and no longer need to maintain those constructors.
- `DefaultTagHelperDescriptorProvider.DesignTime` didn't actually do anything. Removing since the code was truly dead and did nothing functionally.

dotnet/aspnetcore-tooling#7146
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ba6450a69532875cd1878c4729fa6b8693c95188
---
 .../src/CodeGeneration/DocumentWriter.cs        | 17 -----------------
 .../src/DefaultTagHelperDescriptorProvider.cs   |  6 ------
 2 files changed, 23 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs
index 68f7ddffc0..abe058078b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DocumentWriter.cs
@@ -24,23 +24,6 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             return new DefaultDocumentWriter(codeTarget, options);
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("This method was intended to be static, use CreateDefault instead.")]
-        public DocumentWriter Create(CodeTarget codeTarget, RazorCodeGenerationOptions options)
-        {
-            if (codeTarget == null)
-            {
-                throw new ArgumentNullException(nameof(codeTarget));
-            }
-
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            return new DefaultDocumentWriter(codeTarget, options);
-        }
-
         public abstract RazorCSharpDocument WriteDocument(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode);
     }
 }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
index ebb649da5b..074ad68527 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
@@ -9,12 +9,6 @@ namespace Microsoft.CodeAnalysis.Razor
 {
     public sealed class DefaultTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
     {
-        [Obsolete(
-            "This property is obsolete will not be honored. Documentation will be included if " +
-            "TagHelperDescriptorProviderContext.IncludeDocumentation is set to true. Hidden tag helpers will" +
-            "be excluded from the results if TagHelperDescriptorProviderContext.ExcludeHidden is set to true.")]
-        public bool DesignTime { get; set; }
-
         public int Order { get; set; }
 
         public void Execute(TagHelperDescriptorProviderContext context)

From 8775af33097c824bb70d48d3a3b630d39dda983b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 5 Mar 2019 12:22:21 -0800
Subject: [PATCH 099/337] Re-enable skipped test
 (dotnet/aspnetcore-tooling#303)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/14eee079bfa381b7b4c42030f4a05afea3ef644c
---
 .../test/IntegrationTests/BuildPerformanceTest.cs           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
index 74f4221358..08d2bef5ae 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildPerformanceTest.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1860")]
+        [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task BuildMvcApp()
         {
@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1860")]
+        [Fact]
         [InitializeTestProject("MvcWithComponents")]
         public async Task BuildMvcAppWithComponents()
         {
@@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 }
 
                 var match = matcher.Match(lines[i]);
-                Assert.True(match.Success, $"Line {lines[i]} did not match.");
+                Assert.True(match.Success, $"Line {lines[i]} did not match. Full Output: {output}");
 
                 var entry = new PerformanceSummaryEntry
                 {

From 165708058955fc3114e1caeecc4ece8c78cb3d13 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 5 Mar 2019 15:13:54 -0800
Subject: [PATCH 100/337] Correctly normalize file path from network shares
 (dotnet/aspnetcore-tooling#298)

* Correctly normalize file path from network shares

* Feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8ee676d84cea1a375f6179aaf2db86f87f73625d
---
 .../src/DefaultRazorProjectFileSystem.cs             | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
index 8fdefe7d1c..26b03a14ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var file = new FileInfo(absolutePath);
             if (!absolutePath.StartsWith(absoluteBasePath))
             {
-                throw new InvalidOperationException($"The file '{file.FullName}' is not a descendent of the base path '{absoluteBasePath}'.");
+                throw new InvalidOperationException($"The file '{absolutePath}' is not a descendent of the base path '{absoluteBasePath}'.");
             }
 
             var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
@@ -68,9 +68,15 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(path));
             }
 
-            var absolutePath = path;
-            if (!absolutePath.StartsWith(Root, StringComparison.OrdinalIgnoreCase))
+            var absolutePath = path.Replace('\\', '/');
+
+            // Check if the given path is an absolute path. It is absolute if,
+            // 1. It starts with Root or
+            // 2. It is a network share path and starts with a '//'. Eg. //servername/some/network/folder
+            if (!absolutePath.StartsWith(Root, StringComparison.OrdinalIgnoreCase) &&
+                !absolutePath.StartsWith("//", StringComparison.OrdinalIgnoreCase))
             {
+                // This is not an absolute path. Strip the leading slash if any and combine it with Root.
                 if (path[0] == '/' || path[0] == '\\')
                 {
                     path = path.Substring(1);

From b3d727b6318e2c9cfe13c063ebf7271ee96e14d4 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 7 Mar 2019 15:49:29 -0800
Subject: [PATCH 101/337] Enable IntelliSense for new component parameters.

- Added a `FilePathComparison` object since not all string methods allow a comparer.
- Updated `RazorDirectiveCompletionProvider` to also understand `.razor` files. This is an edge case scenario where users have disabled modern completion and are using Razor components (you need a reg key to disable the modern completion or MS needs to disable it).
- Tested this in VS by referencing the latest Razor SDK (preview 3) from NuGet and then replacing the Razor design time targets in VS to be the ones from the preview 3 package.
- Added workspace project state change detector tests.

dotnet/aspnetcore-tooling#8064
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6a83ed13fcb127cae7e89414e878e075352fdbe4
---
 .../src/FilePathComparison.cs                 | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparison.cs

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparison.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparison.cs
new file mode 100644
index 0000000000..057f71cb86
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/FilePathComparison.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class FilePathComparison
+    {
+        private static StringComparison? _instance;
+
+        public static StringComparison Instance
+        {
+            get
+            {
+                if (_instance == null && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    _instance = StringComparison.Ordinal;
+                }
+                else if (_instance == null)
+                {
+                    _instance = StringComparison.OrdinalIgnoreCase;
+                }
+
+                return _instance.Value;
+            }
+        }
+    }
+}

From c5c30e460ee574478988bddffaf99ae17917dc2a Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 11 Mar 2019 10:31:37 -0700
Subject: [PATCH 102/337] Preserve diagnostics when rewriting Red nodes
 (dotnet/aspnetcore-tooling#319)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/276532454ec16b002be2c664dbf2f4f260f42a2a
---
 .../Generated/Syntax.xml.Syntax.Generated.cs  | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
index 8a6cfb5a32..e18d495f3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -73,6 +73,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (document != Document)
         {
             var newNode = SyntaxFactory.RazorDocument(document);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -181,6 +184,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (startCommentTransition != StartCommentTransition || startCommentStar != StartCommentStar || comment != Comment || endCommentStar != EndCommentStar || endCommentTransition != EndCommentTransition)
         {
             var newNode = SyntaxFactory.RazorCommentBlock(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -265,6 +271,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (metaCode != MetaCode)
         {
             var newNode = SyntaxFactory.RazorMetaCode(metaCode);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -334,6 +343,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.GenericBlock(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -405,6 +417,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (literalTokens != LiteralTokens)
         {
             var newNode = SyntaxFactory.UnclassifiedTextLiteral(literalTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -482,6 +497,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.MarkupBlock(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -553,6 +571,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (transitionTokens != TransitionTokens)
         {
             var newNode = SyntaxFactory.MarkupTransition(transitionTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -622,6 +643,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (literalTokens != LiteralTokens)
         {
             var newNode = SyntaxFactory.MarkupTextLiteral(literalTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -691,6 +715,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (literalTokens != LiteralTokens)
         {
             var newNode = SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -760,6 +787,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.MarkupCommentBlock(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -842,6 +872,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (namePrefix != NamePrefix || name != Name)
         {
             var newNode = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -988,6 +1021,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
         {
             var newNode = SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1111,6 +1147,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.MarkupMiscAttributeContent(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1191,6 +1230,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (prefix != Prefix || value != Value)
         {
             var newNode = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1283,6 +1325,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (prefix != Prefix || value != Value)
         {
             var newNode = SyntaxFactory.MarkupDynamicAttributeValue(prefix, value);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1380,6 +1425,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (startTag != StartTag || body != Body || endTag != EndTag)
         {
             var newNode = SyntaxFactory.MarkupElement(startTag, body, endTag);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1520,6 +1568,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (openAngle != OpenAngle || bang != Bang || name != Name || attributes != Attributes || forwardSlash != ForwardSlash || closeAngle != CloseAngle)
         {
             var newNode = SyntaxFactory.MarkupStartTag(openAngle, bang, name, attributes, forwardSlash, closeAngle);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1669,6 +1720,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (openAngle != OpenAngle || forwardSlash != ForwardSlash || bang != Bang || name != Name || miscAttributeContent != MiscAttributeContent || closeAngle != CloseAngle)
         {
             var newNode = SyntaxFactory.MarkupEndTag(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1786,6 +1840,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (startTag != StartTag || body != Body || endTag != EndTag)
         {
             var newNode = SyntaxFactory.MarkupTagHelperElement(startTag, body, endTag);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -1925,6 +1982,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (openAngle != OpenAngle || bang != Bang || name != Name || attributes != Attributes || forwardSlash != ForwardSlash || closeAngle != CloseAngle)
         {
             var newNode = SyntaxFactory.MarkupTagHelperStartTag(openAngle, bang, name, attributes, forwardSlash, closeAngle);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2074,6 +2134,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (openAngle != OpenAngle || forwardSlash != ForwardSlash || bang != Bang || name != Name || miscAttributeContent != MiscAttributeContent || closeAngle != CloseAngle)
         {
             var newNode = SyntaxFactory.MarkupTagHelperEndTag(openAngle, forwardSlash, bang, name, miscAttributeContent, closeAngle);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2235,6 +2298,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
         {
             var newNode = SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2374,6 +2440,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (namePrefix != NamePrefix || name != Name)
         {
             var newNode = SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix, name);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2454,6 +2523,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.MarkupTagHelperAttributeValue(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2533,6 +2605,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.CSharpCodeBlock(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2604,6 +2679,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (transition != Transition)
         {
             var newNode = SyntaxFactory.CSharpTransition(transition);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2668,6 +2746,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (literalTokens != LiteralTokens)
         {
             var newNode = SyntaxFactory.CSharpStatementLiteral(literalTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2737,6 +2818,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (literalTokens != LiteralTokens)
         {
             var newNode = SyntaxFactory.CSharpExpressionLiteral(literalTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2806,6 +2890,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (literalTokens != LiteralTokens)
         {
             var newNode = SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2875,6 +2962,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (children != Children)
         {
             var newNode = SyntaxFactory.CSharpTemplateBlock(children);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -2973,6 +3063,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (transition != Transition || body != Body)
         {
             var newNode = SyntaxFactory.CSharpStatement(transition, body);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3066,6 +3159,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (openBrace != OpenBrace || cSharpCode != CSharpCode || closeBrace != CloseBrace)
         {
             var newNode = SyntaxFactory.CSharpStatementBody(openBrace, cSharpCode, closeBrace);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3166,6 +3262,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (transition != Transition || body != Body)
         {
             var newNode = SyntaxFactory.CSharpExplicitExpression(transition, body);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3259,6 +3358,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (openParen != OpenParen || cSharpCode != CSharpCode || closeParen != CloseParen)
         {
             var newNode = SyntaxFactory.CSharpExplicitExpressionBody(openParen, cSharpCode, closeParen);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3359,6 +3461,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (transition != Transition || body != Body)
         {
             var newNode = SyntaxFactory.CSharpImplicitExpression(transition, body);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3430,6 +3535,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (cSharpCode != CSharpCode)
         {
             var newNode = SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3510,6 +3618,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (transition != Transition || body != Body)
         {
             var newNode = SyntaxFactory.RazorDirective(transition, body);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);
@@ -3592,6 +3703,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
         if (keyword != Keyword || cSharpCode != CSharpCode)
         {
             var newNode = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
             var annotations = GetAnnotations();
             if (annotations != null && annotations.Length > 0)
                return newNode.WithAnnotations(annotations);

From eeabe9ee71cbb0600fdda8798e8a9808e9e504ba Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Tue, 12 Mar 2019 09:51:35 -0700
Subject: [PATCH 103/337] skip flaky razor build integration test
 (dotnet/aspnetcore-tooling#326)

mitigates aspnet/AspNetCore-Internaldotnet/aspnetcore-tooling#1931\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/128efdd177a8d99eda619cec8a24416168fbb6d6
---
 .../test/IntegrationTests/BuildIntegrationTest.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index d430c85650..0df7da2139 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -233,7 +233,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputContainsLine(result, $@"CompileResource: {Path.Combine("..", "LinkedDir", "LinkedFile.cshtml")} /LinkedFileOut/LinkedFile.cshtml");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1931")]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_WithViews_ProducesDepsFileWithCompilationContext_ButNoReferences()
         {

From 2c3945730659b871d7f40b0a56729820ea9df09f Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 13 Mar 2019 14:18:07 -0700
Subject: [PATCH 104/337] Flow RootNamespace from MSBuild
 (dotnet/aspnetcore-tooling#331)

- Flow Root namespace through in command line builds

- Flow Root namespace through in design time builds

- Feedback\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/057d4f35705187a0b553f83c6c3e5e101acef5d1
---
 .../BasicComponent_DesignTime.codegen.cs      |  2 +-
 .../BasicComponent_DesignTime.ir.txt          |  2 +-
 .../BasicComponent_DesignTime.mappings.txt    |  8 ++--
 .../BasicComponent_Runtime.codegen.cs         |  2 +-
 .../BasicComponent_Runtime.ir.txt             |  2 +-
 .../ComponentDocumentClassifierPass.cs        | 30 +++++++-------
 .../src/DefaultRazorCodeGenerationOptions.cs  |  6 ++-
 ...efaultRazorCodeGenerationOptionsBuilder.cs |  1 +
 .../src/RazorCodeGenerationOptions.cs         |  7 ++++
 .../src/RazorCodeGenerationOptionsBuilder.cs  |  5 +++
 .../RazorProjectEngineBuilderExtensions.cs    | 41 +++++++++++++++++++
 .../src/GenerateCommand.cs                    |  8 ++++
 .../src/RazorGenerate.cs                      |  9 ++++
 ...osoft.NET.Sdk.Razor.CodeGeneration.targets |  1 +
 .../Microsoft.NET.Sdk.Razor.Component.targets |  1 +
 .../RazorIntegrationTestBase.cs               |  8 ++--
 16 files changed, 106 insertions(+), 27 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index a440afb781..ee8a246582 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -1,6 +1,6 @@
 // <auto-generated/>
 #pragma warning disable 1591
-namespace __BlazorGenerated
+namespace __GeneratedComponent
 {
     #line hidden
     using TModel = global::System.Object;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index 2f6aa48182..7cc88c4c21 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -1,5 +1,5 @@
 Document - 
-    NamespaceDeclaration -  - __BlazorGenerated
+    NamespaceDeclaration -  - __GeneratedComponent
         UsingDirective -  - TModel = global::System.Object
         UsingDirective - (1:0,1 [12] ) - System
         UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 0baa77e8ca..9220571512 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |IDisposable|
-Generated Location: (662:17,0 [11] )
+Generated Location: (665:17,0 [11] )
 |IDisposable|
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1258:33,13 [15] )
+Generated Location: (1261:33,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1403:38,6 [29] )
+Generated Location: (1406:38,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1617:45,12 [37] )
+Generated Location: (1620:45,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index c376721682..63ec0d9879 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -1,7 +1,7 @@
 #pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d3c3d6059615673cb46fc4974164d61eabadb890"
 // <auto-generated/>
 #pragma warning disable 1591
-namespace __BlazorGenerated
+namespace __GeneratedComponent
 {
     #line hidden
     using System;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
index 65c88c6ce0..ab41d275db 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -1,5 +1,5 @@
 Document - 
-    NamespaceDeclaration -  - __BlazorGenerated
+    NamespaceDeclaration -  - __GeneratedComponent
         UsingDirective - (1:0,1 [14] ) - System
         UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
         UsingDirective - (51:2,1 [19] ) - System.Linq
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 4a992de20a..9c4a7a9f2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -18,11 +18,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         private static readonly char[] NamespaceSeparators = new char[] { '.' };
 
         /// <summary>
-        /// The base namespace.
+        /// The fallback value of the root namespace. Only used if the fallback root namespace
+        /// was not passed in.
         /// </summary>
-        // This is a fallback value and will only be used if we can't compute
-        // a reasonable namespace.
-        public string BaseNamespace { get; set; } = "__BlazorGenerated";
+        public string FallbackRootNamespace { get; set; } = "__GeneratedComponent";
 
         /// <summary>
         /// Gets or sets whether to mangle class names.
@@ -58,7 +57,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             ClassDeclarationIntermediateNode @class,
             MethodDeclarationIntermediateNode method)
         {
+            var options = codeDocument.GetDocumentIntermediateNode().Options;
             if (!TryComputeNamespaceAndClass(
+                options,
                 codeDocument.Source.FilePath,
                 codeDocument.Source.RelativePath,
                 out var computedNamespace,
@@ -66,7 +67,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 // If we can't compute a nice namespace (no relative path) then just generate something
                 // mangled.
-                computedNamespace = BaseNamespace;
+                computedNamespace = FallbackRootNamespace;
                 var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
                 computedClass = $"AspNetCore_{checksum}";
             }
@@ -125,7 +126,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         //
         // However all kinds of thing are possible in tools. We shouldn't barf here if the document isn't 
         // set up correctly.
-        private bool TryComputeNamespaceAndClass(string filePath, string relativePath, out string @namespace, out string @class)
+        private bool TryComputeNamespaceAndClass(
+            RazorCodeGenerationOptions options, 
+            string filePath, 
+            string relativePath, 
+            out string @namespace, 
+            out string @class)
         {
             if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
             {
@@ -134,14 +140,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return false;
             }
 
-            // Try and infer a namespace from the project directory. We don't yet have the ability to pass
-            // the namespace through from the project.
-            var trimLength = relativePath.Length + (relativePath.StartsWith("/") ? 0 : 1);
-            var baseDirectory = filePath.Substring(0, filePath.Length - trimLength);
-
-            var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
-            var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
-            if (string.IsNullOrEmpty(baseNamespace))
+            var rootNamespace = options.RootNamespace;
+            if (string.IsNullOrEmpty(rootNamespace))
             {
                 @namespace = null;
                 @class = null;
@@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             var builder = new StringBuilder();
 
             // Sanitize the base namespace, but leave the dots.
-            var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+            var segments = rootNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
             builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[0]));
             for (var i = 1; i < segments.Length; i++)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
index 6b694d9382..d97eb15af8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
@@ -8,7 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         public DefaultRazorCodeGenerationOptions(
             bool indentWithTabs, 
             int indentSize, 
-            bool designTime, 
+            bool designTime,
+            string rootNamespace,
             bool suppressChecksum,
             bool supressMetadataAttributes,
             bool suppressPrimaryMethodBody)
@@ -16,6 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             IndentWithTabs = indentWithTabs;
             IndentSize = indentSize;
             DesignTime = designTime;
+            RootNamespace = rootNamespace;
             SuppressChecksum = suppressChecksum;
             SuppressMetadataAttributes = supressMetadataAttributes;
             SuppressPrimaryMethodBody = suppressPrimaryMethodBody;
@@ -27,6 +29,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override int IndentSize { get; }
 
+        public override string RootNamespace { get; }
+
         public override bool SuppressChecksum { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
index b54f339b51..dbf795587f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
@@ -43,6 +43,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 IndentWithTabs,
                 IndentSize,
                 DesignTime,
+                RootNamespace,
                 SuppressChecksum,
                 SuppressMetadataAttributes,
                 SuppressPrimaryMethodBody);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
index ad0a7bc95a..4a3f479396 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
@@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 indentSize: 4,
                 designTime: false,
                 suppressChecksum: false,
+                rootNamespace: null,
                 supressMetadataAttributes: false,
                 suppressPrimaryMethodBody: false);
         }
@@ -24,6 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 indentWithTabs: false,
                 indentSize: 4,
                 designTime: true,
+                rootNamespace: null,
                 suppressChecksum: false,
                 supressMetadataAttributes: true,
                 suppressPrimaryMethodBody: false);
@@ -67,6 +69,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract int IndentSize { get; }
 
+        /// <summary>
+        /// Gets the root namespace for the generated code.
+        /// </summary>
+        public virtual string RootNamespace { get; }
+
         /// <summary>
         /// Gets a value that indicates whether to suppress the default <c>#pragma checksum</c> directive in the 
         /// generated C# code. If <c>false</c> the checkum directive will be included, otherwise it will not be
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
index 8d9ea917f4..e2813630c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
@@ -15,6 +15,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool IndentWithTabs { get; set; }
 
+        /// <summary>
+        /// Gets or sets the root namespace of the generated code.
+        /// </summary>
+        public virtual string RootNamespace { get; set; }
+
         /// <summary>
         /// Gets or sets a value that indicates whether to suppress the default <c>#pragma checksum</c> directive in the 
         /// generated C# code. If <c>false</c> the checkum directive will be included, otherwise it will not be
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
index cffead3a8a..09fdf087f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
@@ -75,6 +75,23 @@ namespace Microsoft.AspNetCore.Razor.Language
             return builder;
         }
 
+        /// <summary>
+        /// Sets the root namespace for the generated code.
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="rootNamespace">The root namespace.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder SetRootNamespace(this RazorProjectEngineBuilder builder, string rootNamespace)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Features.Add(new ConfigureRootNamespaceFeature(rootNamespace));
+            return builder;
+        }
+
         public static void SetImportFeature(this RazorProjectEngineBuilder builder, IImportProjectFeature feature)
         {
             if (builder == null)
@@ -281,5 +298,29 @@ namespace Microsoft.AspNetCore.Razor.Language
                 public override Stream Read() => new MemoryStream(_importBytes);
             }
         }
+
+        private class ConfigureRootNamespaceFeature : IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private readonly string _rootNamespace;
+
+            public ConfigureRootNamespaceFeature(string rootNamespace)
+            {
+                _rootNamespace = rootNamespace;
+            }
+
+            public int Order { get; set; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                if (options == null)
+                {
+                    throw new ArgumentNullException(nameof(options));
+                }
+
+                options.RootNamespace = _rootNamespace;
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index e912b8ec26..f2e1b76b7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -29,6 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             Configuration = Option("-c", "Razor configuration name", CommandOptionType.SingleValue);
             ExtensionNames = Option("-n", "extension name", CommandOptionType.MultipleValue);
             ExtensionFilePaths = Option("-e", "extension file path", CommandOptionType.MultipleValue);
+            RootNamespace = Option("--root-namespace", "root namespace for generated code", CommandOptionType.SingleValue);
             GenerateDeclaration = Option("--generate-declaration", "Generate declaration", CommandOptionType.NoValue);
         }
 
@@ -52,6 +53,8 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
         public CommandOption ExtensionFilePaths { get; }
 
+        public CommandOption RootNamespace { get; }
+
         public CommandOption GenerateDeclaration { get; }
 
         protected override Task<int> ExecuteCoreAsync()
@@ -176,6 +179,11 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 {
                     b.Features.Add(new SetSuppressPrimaryMethodBodyOptionFeature());
                 }
+
+                if (RootNamespace.HasValue())
+                {
+                    b.SetRootNamespace(RootNamespace.Value());
+                }
             });
 
             var results = GenerateCode(engine, sourceItems);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
index 07892cfa38..6e8364eea5 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
@@ -24,6 +24,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         private const string AssemblyName = "AssemblyName";
         private const string AssemblyFilePath = "AssemblyFilePath";
 
+        public string RootNamespace { get; set; }
+
         [Required]
         public string Version { get; set; }
 
@@ -135,6 +137,13 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             builder.AppendLine("-c");
             builder.AppendLine(Configuration[0].GetMetadata(Identity));
 
+            // Added in 3.0
+            if (parsedVersion.Major >= 3 && !string.IsNullOrEmpty(RootNamespace))
+            {
+                builder.AppendLine("--root-namespace");
+                builder.AppendLine(RootNamespace);
+            }
+
             // Added in 3.0
             if (parsedVersion.Major >= 3 && GenerateDeclaration)
             {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 72599af998..89b921e422 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -155,6 +155,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       ForceServer="$(_RazorForceBuildServer)"
       PipeName="$(_RazorBuildServerPipeName)"
       Version="$(RazorLangVersion)"
+      RootNamespace="$(RootNamespace)"
       Configuration="@(ResolvedRazorConfiguration)"
       Extensions="@(ResolvedRazorExtension)"
       Sources="@(RazorGenerateWithTargetPath)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 15088d3206..6061d8cbc8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -98,6 +98,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       ForceServer="$(_RazorForceBuildServer)"
       PipeName="$(_RazorBuildServerPipeName)"
       Version="$(RazorLangVersion)"
+      RootNamespace="$(RootNamespace)"
       Configuration="@(ResolvedRazorConfiguration)"
       Extensions="@(ResolvedRazorExtension)"
       Sources="@(_RazorComponentDeclarationSources)"
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index 6c6ca1fc49..8a9c10aa8c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             PathSeparator = Path.DirectorySeparatorChar.ToString();
             WorkingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ArbitraryWindowsPath : ArbitraryMacLinuxPath;
 
-            DefaultBaseNamespace = "Test"; // Matches the default working directory
+            DefaultRootNamespace = "Test"; // Matches the default working directory
             DefaultFileName = "TestComponent.cshtml";
         }
 
@@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         internal virtual RazorConfiguration Configuration { get; }
 
-        internal virtual string DefaultBaseNamespace { get; }
+        internal virtual string DefaultRootNamespace { get; }
 
         internal virtual string DefaultFileName { get; }
 
@@ -113,6 +113,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         {
             return RazorProjectEngine.Create(configuration, FileSystem, b =>
             {
+                b.SetRootNamespace(DefaultRootNamespace);
+
                 // Turn off checksums, we're testing code generation.
                 b.Features.Add(new SuppressChecksum());
 
@@ -320,7 +322,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         {
             var assemblyResult = CompileToAssembly(DefaultFileName, cshtmlSource);
 
-            var componentFullTypeName = $"{DefaultBaseNamespace}.{Path.GetFileNameWithoutExtension(DefaultFileName)}";
+            var componentFullTypeName = $"{DefaultRootNamespace}.{Path.GetFileNameWithoutExtension(DefaultFileName)}";
             return CompileToComponent(assemblyResult, componentFullTypeName);
         }
 

From 25e5a4ffabc2cdd5fe437c648fd152933a2aeb40 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 19 Mar 2019 16:33:26 -0700
Subject: [PATCH 105/337] Infer Razor Configuration \ RazorLangVersion based on
 TFM (dotnet/aspnetcore-tooling#343)

* Infer Razor Configuration \ RazorLangVersion based on TFM

Fixes https://github.com/aspnet/AspNetCore/issues/6392
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/cfee40a19eb42f0c02365104c0a460e1025ad84c
---
 .../src/RazorLanguageVersion.cs               |   1 +
 .../Microsoft.NET.Sdk.Razor.Component.targets |   8 +
 ...rosoft.NET.Sdk.Razor.Configuration.targets |  31 ++--
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets |   3 +-
 .../Sdk.Razor.CurrentVersion.targets          | 116 +++++++++++---
 .../test/IntegrationTests/Assert.cs           |  66 +++++++-
 .../IntegrationTests/BuildIntegrationTest.cs  |  31 +---
 .../BuildIntegrationTest21.cs                 |  51 +-----
 .../BuildIntegrationTest22.cs                 |  31 +---
 .../BuildIntegrationTestLegacy.cs             | 145 ++++++++++++++++++
 .../BuildIntrospectionTest.cs                 |  59 +++++++
 .../BuildWithComponentsIntegrationTest.cs     |  50 ++++++
 .../InitializeTestProjectAttribute.cs         |   6 +-
 .../IntegrationTests/PackIntegrationTest.cs   |  48 +++---
 .../PublishIntegrationTest.cs                 |  27 ----
 .../ComponentBase.cs                          |   3 +
 .../AppWithP2PReference.csproj                |  11 +-
 .../ClassLibrary/ClassLibrary.csproj          |  20 ++-
 .../ClassLibrary2/ClassLibrary2.csproj        |  13 +-
 .../ComponentApp/ComponentApp.csproj          |  35 +++++
 .../ComponentApp/Components/App.razor         |   5 +
 .../Components/Pages/Counter.razor            |  16 ++
 .../Components/Pages/FetchData.razor          |  45 ++++++
 .../ComponentApp/Components/Pages/Index.razor |   5 +
 .../Components/Pages/_ViewImports.cshtml      |   1 +
 .../Components/Shared/MainLayout.razor        |  12 ++
 .../Components/Shared/NavMenu.razor           |  37 +++++
 .../Components/_ViewImports.cshtml            |   1 +
 .../test/testassets/ComponentApp/Program.cs   |  10 ++
 .../ComponentApp/Services/WeatherForecast.cs  |  15 ++
 .../Services/WeatherForecastService.cs        |  25 +++
 .../ComponentLibrary/ComponentLibrary.csproj  |   7 -
 .../LargeProject/LargeProject.csproj          |  18 ++-
 .../MvcWithComponents.csproj                  |  14 +-
 .../RazorTest.Introspection.targets           |   5 +
 .../RestoreTestProjects.csproj                |   1 +
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  16 +-
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  13 +-
 .../testassets/SimplePages/SimplePages.csproj |  16 +-
 39 files changed, 779 insertions(+), 238 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
 create mode 100644 src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/App.razor
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/Pages/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/Shared/MainLayout.razor
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
 create mode 100644 src/Razor/test/testassets/ComponentApp/Components/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/ComponentApp/Program.cs
 create mode 100644 src/Razor/test/testassets/ComponentApp/Services/WeatherForecast.cs
 create mode 100644 src/Razor/test/testassets/ComponentApp/Services/WeatherForecastService.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs
index 5d34d258f8..9fed605e2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorLanguageVersion.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
+    // Note: RazorSDK is aware of version monikers such as "latest", and "experimental". Update it if we introduce new monikers.
     [DebuggerDisplay("{" + nameof(DebuggerToString) + "(),nq}")]
     public sealed class RazorLanguageVersion : IEquatable<RazorLanguageVersion>, IComparable<RazorLanguageVersion>
     {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 6061d8cbc8..4d5f644760 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -12,6 +12,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
 <Project ToolsVersion="14.0">
 
+  <!-- Wire up RazorComponentGenerateCore only once we know we are importing this target file. This prevents avoidable build failures. -->
+  <PropertyGroup>
+    <RazorComponentGenerateDependsOn>
+      $(RazorComponentGenerateDependsOn);
+      RazorComponentGenerateCore
+    </RazorComponentGenerateDependsOn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Used for tracking inputs to component generation -->
     <_RazorComponentInputHash></_RazorComponentInputHash>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index f904665aee..348888a839 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -11,10 +11,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project ToolsVersion="14.0">
 
-  <PropertyGroup>
-    <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
-  </PropertyGroup>
-  
   <!--
       Initialize properties and items inferred using the project version. This file is not imported in projects referencing
       MVC \ Razor 2.2 or earlier since values specified here are provided via targets and props imported from NuGet packages
@@ -27,16 +23,24 @@ Copyright (c) .NET Foundation. All rights reserved.
       would be to detect whether the ASP.NET Core shared framework is referenced.
   -->
   <PropertyGroup>
+    <!-- Continue setting this property to maintain compat with legacy Razor.Design -->
+    <IsRazorCompilerReferenced Condition="'$(IsRazorCompilerReferenced)'==''">true</IsRazorCompilerReferenced>
+  </PropertyGroup>
+
+  <!--
+      Configure MVC specific configuration if the application uses a configuration that supports MVC.
+  -->
+  <PropertyGroup Condition="'$(AddRazorSupportForMvc)' == 'true'">
     <!--
       MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
     -->
-    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">$(_TargetingNETCoreApp30OrLater)</GenerateProvideApplicationPartFactoryAttribute>
+    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">true</GenerateProvideApplicationPartFactoryAttribute>
 
     <!--
       Determines if the Sdk is allowed to add additional attributes to the project assembly.
       For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
     -->
-    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">$(_TargetingNETCoreApp30OrLater)</GenerateRazorAssemblyInfo>
+    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
 
     <!--
       MVC will generally want to add support for runtime compilation, but only for applications.
@@ -47,20 +51,14 @@ Copyright (c) .NET Foundation. All rights reserved.
       The type name of the ApplicationPartFactory applied to the generated Razor file.
     -->
     <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
-
-    <!-- Continue setting this property to maintain compat with legacy Razor.Design -->
-    <IsRazorCompilerReferenced Condition="'$(IsRazorCompilerReferenced)'==''">true</IsRazorCompilerReferenced>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RazorLangVersion)'==''">
-    <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
   </PropertyGroup>
 
   <!--
-    Set the primary configuration supported by this SDK as the default configuration for Razor.
+    Determine the default Razor configuration
   -->
   <PropertyGroup Condition="'$(RazorDefaultConfiguration)'==''">
-    <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">MVC-3.0</RazorDefaultConfiguration>
+    <RazorDefaultConfiguration Condition="'$(AddRazorSupportForMvc)'=='true'">MVC-3.0</RazorDefaultConfiguration>
+    <RazorDefaultConfiguration Condition="'$(RazorDefaultConfiguration)'==''">Default</RazorDefaultConfiguration>
   </PropertyGroup>
 
   <ItemGroup>
@@ -69,7 +67,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       it here. The IDE is hardcoded to inject 2.0 support when needed. The settings flowing through MSBuild should reflect
       the project's runtime.
     -->
-    <RazorConfiguration Include="MVC-3.0">
+    <RazorConfiguration Include="Default" />
+    <RazorConfiguration Include="MVC-3.0" >
       <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
     </RazorConfiguration>
   </ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 7238792f50..330a192ea3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -26,8 +26,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Defines the ability to understand the configuration for the Razor language service provided by
       the runtime/toolset packages. Introduced in 2.1
     -->
-    <ProjectCapability Include="DotNetCoreRazorConfiguration" Condition="'$(_TargetingNETCoreApp30OrLater)'=='true'"/>
-
+    <ProjectCapability Include="DotNetCoreRazorConfiguration" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'"/>
 
     <!--
       Activates the set of nesting behaviors we want from solution explorer.
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index ffb77fce72..d4771c2c3a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -9,7 +9,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project ToolsVersion="14.0" TreatAsLocalProperty="_RazorSdkTasksTFM">
+<Project ToolsVersion="14.0" TreatAsLocalProperty="_RazorSdkTasksTFM;_Targeting30OrNewerRazorLangVersion">
   <!-- 
     Targets supporting Razor MSBuild integration. Contain support for generating C# code using Razor
     and including the generated code in the project lifecycle, including compiling, publishing and producing
@@ -28,9 +28,38 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
+  </PropertyGroup>
 
+  <!-- Resolve the RazorLangVersion based on values imported or TFM. -->
+  <PropertyGroup>
     <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
-    <_EnableAllInclusiveRazorSdk Condition="'$(_EnableInclusiveRazorSdk)' == '' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_EnableAllInclusiveRazorSdk>
+
+    <!--
+      Infer the RazorLangVersion if no value was specified. When adding support for newer target frameworks, list newer language versions first.
+    -->
+    <RazorLangVersion Condition="'$(RazorLangVersion)' == '' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">3.0</RazorLangVersion>
+
+    <!--
+      In 3.0, we expect RazorLangVersion to either be specified in the template or inferred via TFM. In 2.x, RazorLangVersion is
+      specified via the Razor.Design package. We'll default to a version of 2.1, the earliest version that the SDK supports.
+      A 2.1 version should result in a build warning if the project contains Components.
+    -->
+    <RazorLangVersion Condition="'$(RazorLangVersion)' == ''">2.1</RazorLangVersion>
+
+    <!-- Keep this in sync with RazorLangVersion.cs if we introduce new text based values. -->
+    <_Targeting30OrNewerRazorLangVersion Condition="
+        '$(RazorLangVersion)' == 'Latest' OR
+        '$(RazorLangVersion)' == 'Experimental' OR
+        ('$(RazorLangVersion)' != '' AND '$(RazorLangVersion)' &gt; '2.9')">true</_Targeting30OrNewerRazorLangVersion>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <!--
+      The property IsRazorCompilerReferenced is defined by the 2.x Razor.Design package. We can use this as a best guess to determine if a project is targeting 2.x or earlier.
+      This is useful to provide 3.0 or newer specific build warnings. However, since it's not very reliable, we should not use this to make build-altering decisions.
+    -->
+    <_IsTargetingRazor2X Condition="'$(IsRazorCompilerReferenced)'=='true'">true</_IsTargetingRazor2X>
   </PropertyGroup>
 
   <!--
@@ -47,12 +76,14 @@ Copyright (c) .NET Foundation. All rights reserved.
       AssignRazorGenerateTargetPaths;
       ResolveAssemblyReferenceRazorGenerateInputs;
       _CheckForMissingRazorCompiler;
+      _CheckForIncorrectMvcConfiguration;
       ResolveTagHelperRazorGenerateInputs
     </PrepareForRazorGenerateDependsOn>
 
     <PrepareForRazorComponentGenerateDependsOn>
       ResolveRazorConfiguration;
       ResolveRazorComponentInputs;
+      _CheckForIncorrectComponentsConfiguration;
       AssignRazorComponentTargetPaths;
     </PrepareForRazorComponentGenerateDependsOn>
 
@@ -63,8 +94,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </RazorGenerateDependsOn>
 
     <RazorComponentGenerateDependsOn>
-      PrepareForRazorComponentGenerate;
-      RazorComponentGenerateCore
+      PrepareForRazorComponentGenerate
     </RazorComponentGenerateDependsOn>
 
     <PrepareForRazorCompileDependsOn>
@@ -155,7 +185,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!--
       Use the suffix .Views when producing compiled view assemblies. This matches the requirements for Mvc's ViewsFeatureProvider.
     -->
-    <RazorTargetNameSuffix Condition="'$(_EnableInclusiveRazorSdk)' == '' AND '$(RazorTargetNameSuffix)'==''">.Views</RazorTargetNameSuffix>
+    <RazorTargetNameSuffix Condition="'$(RazorTargetNameSuffix)'=='' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true'">.Views</RazorTargetNameSuffix>
 
     <!-- Suffix appended to $(TargetName) to produce $(RazorTargetName), the name of the assembly produced by Razor -->
     <RazorTargetNameSuffix Condition="'$(RazorTargetNameSuffix)' == ''">.Razor</RazorTargetNameSuffix>
@@ -216,8 +246,16 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='embedded'">false</_RazorDebugSymbolsProduced>
   </PropertyGroup>
 
-  <!-- Resolve the toolset to use -->
-  <PropertyGroup>
+  <!--
+    Resolve the toolset to use. This specifically applies to compilation with 2.x projects where compilation could be performed either using
+    the PrecompilationTool (Microsoft.AspNetCore.Mvc.Razor.ViewCompilation) or the RazorSDK and we have to infer the tool that is to be used.
+    In 3.0 or later, there is only the RazorSdk.
+   -->
+  <PropertyGroup Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
+    <ResolvedRazorCompileToolset>RazorSdk</ResolvedRazorCompileToolset>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ResolvedRazorCompileToolset)' == ''">
     <!-- Default value for the property 'MvcRazorCompileOnPublish' is empty. If it has been explicitly enabled, continue using precompilation. -->
     <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
 
@@ -228,7 +266,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == '' AND '$(RazorCompileToolset)' == 'RazorSdk'">$(RazorCompileToolset)</ResolvedRazorCompileToolset>
 
     <!-- If RazorSdk is not referenced, fall-back to Precompilation tool when referenced by a 2.2 or earlier targeting project. -->
-    <ResolvedRazorCompileToolset Condition="'$(ResolvedRazorCompileToolset)' == 'RazorSdk' And '$(IsRazorCompilerReferenced)' != 'true' AND '$(_EnableAllInclusiveRazorSdk)' != 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
+    <ResolvedRazorCompileToolset Condition="'$(ResolvedRazorCompileToolset)' == 'RazorSdk' And '$(IsRazorCompilerReferenced)' != 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
 
     <!-- Previous versions of the precompilation tool still depends on the msbuild property 'MvcRazorCompileOnPublish'. Hence, setting it to the old default value -->
     <MvcRazorCompileOnPublish Condition="'$(MvcRazorCompileOnPublish)' == ''">true</MvcRazorCompileOnPublish>
@@ -281,12 +319,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     Condition="'$(IsRazorCompilerReferenced)' == 'true' AND '$(RazorCodeGenerationTargetsPath)' != '' AND Exists('$(RazorCodeGenerationTargetsPath)')" />
 
   <!-- When targeting 3.x and later projects, we have to infer configuration by inspecting the project. -->
-  <Import Project="Microsoft.NET.Sdk.Razor.Configuration.targets" Condition="'$(_EnableAllInclusiveRazorSdk)' == 'true'" />
+  <Import Project="Microsoft.NET.Sdk.Razor.Configuration.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
 
-  <!-- For projects targeting 3.x and later, use the compiler that ships in the Sdk -->
-  <Import Project="Microsoft.NET.Sdk.Razor.CodeGeneration.targets" Condition="'$(_EnableAllInclusiveRazorSdk)' == 'true'" />
+  <!-- For projects targeting 3.x and later, use the compiler that ships in the SDK -->
+  <Import Project="Microsoft.NET.Sdk.Razor.CodeGeneration.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
 
-  <Import Project="Microsoft.NET.Sdk.Razor.Component.targets" />
+  <Import Project="Microsoft.NET.Sdk.Razor.Component.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
 
   <Import Project="Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets" />
 
@@ -319,15 +357,28 @@ Copyright (c) .NET Foundation. All rights reserved.
     Computes the applicable @(ResolvedRazorConfiguration) and @(ResolvedRazorExtension) items that match the project's
     configuration. 
   -->
-  <Target
-    Name="ResolveRazorConfiguration"
-    Condition="'$(RazorDefaultConfiguration)'!=''">
-
-    <ItemGroup>
+  <Target Name="ResolveRazorConfiguration">
+    <ItemGroup Condition="'$(RazorDefaultConfiguration)'!=''">
       <ResolvedRazorConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(RazorDefaultConfiguration)')->Distinct())" />
     </ItemGroup>
 
-    <FindInList List="@(RazorExtension)" ItemSpecToFind="@(ResolvedRazorConfiguration->Metadata('Extensions'))">
+    <!--
+      ResolvedRazorConfiguration should only ever have one item in it. If misconfigured, we may resolve more than one item which
+      may result in incorrect results or poorly worded build errors.
+    -->
+    <Warning Text="Unable to resolve a Razor configuration for the value '$(_RazorConfiguration)'. Available configurations '@(RazorConfiguration)'.'"
+      Code="RazorSDK1000"
+      Condition="'@(ResolvedRazorConfiguration->Count())' == '0'" />
+
+    <Warning Text="More than one Razor configuration was resolved for the value '$(_RazorConfiguration)'. Available configurations '@(RazorConfiguration)'.
+A common cause is a reference to an incompatible version of the 'Microsoft.AspNetCore.Mvc' or 'Microsoft.AspNetCore.Razor.Design' package."
+      Code="RazorSDK1001"
+      Condition="'@(ResolvedRazorConfiguration->Count())' &gt; '1'" />
+
+    <FindInList
+        List="@(RazorExtension)"
+        ItemSpecToFind="@(ResolvedRazorConfiguration->Metadata('Extensions'))"
+        Condition="'@(ResolvedRazorConfiguration->HasMetadata('Extensions')->Count())' != '0'">
       <Output TaskParameter="ItemFound" ItemName="ResolvedRazorExtension" />
     </FindInList>
   </Target>
@@ -729,9 +780,34 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="_CheckForMissingRazorCompiler" Condition="'$(IsRazorCompilerReferenced)' != 'true'">
     <Error
+      Code="RAZORSDK1003"
       Text="A PackageReference for 'Microsoft.AspNetCore.Razor.Design' was not included in your project. This package is required to compile Razor files. Typically, a
-      transitive reference to 'Microsoft.AspNetCore.Razor.Design' and references required to compile Razor files are obtained by adding a PackageReference
-      for 'Microsoft.AspNetCore.Mvc' in your project. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
+ transitive reference to 'Microsoft.AspNetCore.Razor.Design' and references required to compile Razor files are obtained by adding a PackageReference
+ for 'Microsoft.AspNetCore.Mvc' in your project. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
+  </Target>
+
+  <Target Name="_CheckForIncorrectMvcConfiguration"
+    Condition="'@(ResolvedRazorConfiguration)' == 'Default' AND
+      ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' =='true') AND
+      '@(RazorGenerate->Count())' != '0' AND
+      '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND
+      '$(_IsTargetingRazor2X)' != 'true'">
+    <Warning
+       Code="RAZORSDK1004"
+       Text="One or more Razor view or page files were found, but the project is not configured to add Razor support for MVC. The MSBuild property 'AddRazorSupportForMvc' must be set to correctly
+ compile Razor files that target MVC. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
+  </Target>
+
+  <Target Name="_CheckForIncorrectComponentsConfiguration"
+    Condition="('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' =='true') AND
+      '@(RazorComponent->Count())' != '0' AND
+      '$(_Targeting30OrNewerRazorLangVersion)' != 'true' AND
+      '$(_IsTargetingRazor2X)' != 'true'">
+
+    <Warning
+       Code="RAZORSDK1005"
+       Text="One or more Razor component files (.razor) were found, but the project is not configured to compile Razor Components. Configure the project by targeting RazorLangVersion 3.0 or newer.
+ For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
   </Target>
 
   <Target Name="_ResolveRazorTargetPath">
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index f2ee9393f6..deb92de412 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -18,8 +18,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         // Matches `{filename}: error {code}: {message} [{project}]
         // See https://stackoverflow.com/questions/3441452/msbuild-and-ignorestandarderrorwarningformat/5180353#5180353
         private static readonly Regex ErrorRegex = new Regex(@"^(?'location'.+): error (?'errorcode'[A-Z0-9]+): (?'message'.+) \[(?'project'.+)\]$");
+        private static readonly Regex WarningRegex = new Regex(@"^(?'location'.+): warning (?'errorcode'[A-Z0-9]+): (?'message'.+) \[(?'project'.+)\]$");
 
-        public static void BuildPassed(MSBuildResult result)
+        public static void BuildPassed(MSBuildResult result, bool allowWarnings = false)
         {
             if (result == null)
             {
@@ -30,6 +31,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             {
                 throw new BuildFailedException(result);
             }
+
+            var buildWarnings = GetBuildWarnings(result).Select(m => m.line);
+            if (!allowWarnings && buildWarnings.Any())
+            {
+                throw new BuildWarningsException(result, buildWarnings);
+            }
         }
 
         public static void BuildError(MSBuildResult result, string errorCode, string location = null)
@@ -65,6 +72,47 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             throw new BuildErrorMissingException(result, errorCode, location);
         }
 
+        public static void BuildWarning(MSBuildResult result, string errorCode, string location = null)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            // We don't really need to search line by line, I'm doing this so that it's possible/easy to debug.
+            foreach (var (_, match) in GetBuildWarnings(result))
+            {
+                if (match.Groups["errorcode"].Value != errorCode)
+                {
+                    continue;
+                }
+
+                if (location != null && match.Groups["location"].Value.Trim() != location)
+                {
+                    continue;
+                }
+
+                // This is a match
+                return;
+            }
+
+            throw new BuildErrorMissingException(result, errorCode, location);
+        }
+
+        private static IEnumerable<(string line, Match match)> GetBuildWarnings(MSBuildResult result)
+        {
+            var lines = result.Output.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i];
+                var match = WarningRegex.Match(line);
+                if (match.Success)
+                {
+                    yield return (line, match);
+                }
+            }
+        }
+
         public static void BuildFailed(MSBuildResult result)
         {
             if (result == null)
@@ -440,6 +488,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     message.AppendLine();
                     message.AppendLine();
                     message.Append(Result.Output);
+                    message.AppendLine();
+                    message.Append("Exit Code:");
+                    message.Append(Result.ExitCode);
                     return message.ToString();
                 }
             }
@@ -479,6 +530,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             protected override string Heading => "Build failed.";
         }
 
+        private class BuildWarningsException : MSBuildXunitException
+        {
+            public BuildWarningsException(MSBuildResult result, IEnumerable<string> warnings)
+                : base(result)
+            {
+                Warnings = warnings.ToList();
+            }
+
+            public List<string> Warnings { get; }
+
+            protected override string Heading => "Build contains unexpected warnings: " + string.Join(Environment.NewLine, Warnings);
+        }
+
         private class BuildPassedException : MSBuildXunitException
         {
             public BuildPassedException(MSBuildResult result)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 0df7da2139..ee8c87d889 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -370,19 +370,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotContain(result, razorTargetAssemblyInfo, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute");
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc")]
-        public async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
-        {
-            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
-            var result = await DotnetMSBuild("Build", "/p:RazorCompileToolSet=MvcPrecompilation");
-
-            Assert.BuildPassed(result);
-
-            Assert.FileDoesNotExist(result, razorAssemblyInfo);
-            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
-        }
-
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_DoesNotAddRelatedAssemblyPart_IfViewCompilationIsDisabled()
@@ -661,19 +648,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("ComponentLibrary")]
-        public async Task Building_NetstandardComponentLibrary()
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_Mvc_WithoutAddRazorSupportForMvc()
         {
-            TargetFramework = "netstandard2.0";
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:AddRazorSupportForMvc=false",
+                suppressBuildServer: true);
 
-            // Build
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "ComponentLibrary.dll");
-            Assert.FileExists(result, OutputPath, "ComponentLibrary.pdb");
-            Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.dll");
-            Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.pdb");
+            Assert.BuildWarning(result, "RAZORSDK1004");
         }
 
         private static DependencyContext ReadDependencyContext(string depsFilePath)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
index 061399ddfc..a513f29aa7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
@@ -1,61 +1,16 @@
 // 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.IO;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
-    public class BuildIntegrationTest21 : MSBuildIntegrationTestBase, IClassFixture<LegacyBuildServerTestFixture>
+    public class BuildIntegrationTest21 : BuildIntegrationTestLegacy
     {
         public BuildIntegrationTest21(LegacyBuildServerTestFixture buildServer)
             : base(buildServer)
         {
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc21")]
-        public async Task Building_NETCoreApp21TargetingProject()
-        {
-            TargetFramework = "netcoreapp2.1";
-
-            // Build
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
-
-            // Verify RazorTagHelper works
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc21.TagHelpers.input.cache");
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc21.TagHelpers.output.cache");
-            Assert.FileContains(
-                result,
-                Path.Combine(IntermediateOutputPath, "SimpleMvc21.TagHelpers.output.cache"),
-                @"""Name"":""SimpleMvc.SimpleTagHelper""");
-        }
-
-        [Fact]
-        [InitializeTestProject("SimpleMvc21")]
-        public async Task Publish_NETCoreApp21TargetingProject()
-        {
-            TargetFramework = "netcoreapp2.1";
-
-            var result = await DotnetMSBuild("Publish");
-
-            Assert.BuildPassed(result);
-
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.dll");
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.pdb");
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.Views.dll");
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc21.Views.pdb");
-
-            // By default refs and .cshtml files will not be copied on publish
-            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
-            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
-        }
+        public override string TestProjectName => "SimpleMvc21";
+        public override string TargetFramework => "netcoreapp2.1";
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
index 00a4bdc1dc..d857955351 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22.cs
@@ -1,41 +1,16 @@
 // 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.IO;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
-    public class BuildIntegrationTest22 : MSBuildIntegrationTestBase, IClassFixture<LegacyBuildServerTestFixture>
+    public class BuildIntegrationTest22 : BuildIntegrationTestLegacy
     {
         public BuildIntegrationTest22(LegacyBuildServerTestFixture buildServer)
             : base(buildServer)
         {
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc22")]
-        public async Task Building_NETCoreApp22TargetingProject()
-        {
-            TargetFramework = "netcoreapp2.2";
-
-            // Build
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "SimpleMvc22.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc22.pdb");
-            Assert.FileExists(result, OutputPath, "SimpleMvc22.Views.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc22.Views.pdb");
-
-            // Verify RazorTagHelper works
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc22.TagHelpers.input.cache");
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc22.TagHelpers.output.cache");
-            Assert.FileContains(
-                result,
-                Path.Combine(IntermediateOutputPath, "SimpleMvc22.TagHelpers.output.cache"),
-                @"""Name"":""SimpleMvc.SimpleTagHelper""");
-        }
+        public override string TestProjectName => "SimpleMvc22";
+        public override string TargetFramework => "netcoreapp2.2";
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
new file mode 100644
index 0000000000..460cd6e117
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
@@ -0,0 +1,145 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public abstract class BuildIntegrationTestLegacy :
+        MSBuildIntegrationTestBase,
+        IClassFixture<LegacyBuildServerTestFixture>
+    {
+        public abstract string TestProjectName { get; }
+        public abstract new string TargetFramework { get; }
+
+        public BuildIntegrationTestLegacy(LegacyBuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        protected IDisposable CreateTestProject()
+        {
+            Project = ProjectDirectory.Create(TestProjectName, TestProjectName, string.Empty, Array.Empty<string>(), "C#");
+            MSBuildIntegrationTestBase.TargetFramework = TargetFramework;
+
+            return new Disposable();
+        }
+
+        [Fact]
+        public async Task Building_Project()
+        {
+            using (CreateTestProject())
+            {
+                // Build
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildPassed(result);
+                Assert.FileExists(result, OutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, OutputPath, $"{TestProjectName}.pdb");
+                Assert.FileExists(result, OutputPath, $"{TestProjectName}.Views.dll");
+                Assert.FileExists(result, OutputPath, $"{TestProjectName}.Views.pdb");
+
+                // Verify RazorTagHelper works
+                Assert.FileExists(result, IntermediateOutputPath, $"{TestProjectName}.TagHelpers.input.cache");
+                Assert.FileExists(result, IntermediateOutputPath, $"{TestProjectName}.TagHelpers.output.cache");
+                Assert.FileContains(
+                    result,
+                    Path.Combine(IntermediateOutputPath, $"{TestProjectName}.TagHelpers.output.cache"),
+                    @"""Name"":""SimpleMvc.SimpleTagHelper""");
+            }
+        }
+
+        [Fact]
+        public async Task Publish_Project()
+        {
+            using (CreateTestProject())
+            {
+                var result = await DotnetMSBuild("Publish");
+
+                Assert.BuildPassed(result);
+
+                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.pdb");
+                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.Views.dll");
+                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.Views.pdb");
+
+                // By default refs and .cshtml files will not be copied on publish
+                Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+                Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+            }
+        }
+
+        [Fact]
+        public async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
+        {
+            using (CreateTestProject())
+            {
+                var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=false");
+
+                Assert.BuildPassed(result);
+
+                // Everything we do should noop - including building the app.
+                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.pdb");
+                Assert.FileDoesNotExist(result, PublishOutputPath, $"{TestProjectName}.Views.dll");
+                Assert.FileDoesNotExist(result, PublishOutputPath, $"{TestProjectName}.Views.pdb");
+            }
+        }
+
+        [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
+        public async Task Build_WithMvcRazorCompileOnPublish_Noops()
+        {
+            using (CreateTestProject())
+            {
+                var result = await DotnetMSBuild("Build", "/p:MvcRazorCompileOnPublish=true");
+
+                Assert.BuildPassed(result);
+
+                Assert.FileExists(result, IntermediateOutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, IntermediateOutputPath, $"{TestProjectName}.dll");
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, $"{TestProjectName}.Views.dll");
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, $"{TestProjectName}.Views.pdb");
+            }
+        }
+
+        [Fact]
+        public async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
+        {
+            using (CreateTestProject())
+            {
+                var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, $"{TestProjectName}.RazorAssemblyInfo.cs");
+                var result = await DotnetMSBuild("Build", "/p:RazorCompileToolSet=MvcPrecompilation");
+
+                Assert.BuildPassed(result);
+
+                Assert.FileDoesNotExist(result, razorAssemblyInfo);
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, $"{TestProjectName}.RazorTargetAssemblyInfo.cs");
+            }
+        }
+
+        [Fact]
+        public async Task Build_DoesNotPrintsWarnings_IfProjectFileContainsRazorFiles()
+        {
+            using (CreateTestProject())
+            {
+                File.WriteAllText(Path.Combine(Project.DirectoryPath, "Index.razor"), "Hello world");
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildPassed(result);
+                Assert.DoesNotContain("RAZORSDK1005", result.Output);
+            }
+        }
+
+        private class Disposable : IDisposable
+        {
+            public void Dispose()
+            {
+                Project.Dispose();
+                Project = null;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 669a014e81..986fecd991 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -94,5 +94,64 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputDoesNotContainLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.dll");
             Assert.BuildOutputDoesNotContainLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.pdb");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorSdk_ResolvesRazorLangVersionTo30ForNetCoreApp30Projects()
+        {
+            var result = await DotnetMSBuild("ResolveRazorConfiguration", "/t:_IntrospectResolvedConfiguration");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "RazorLangVersion: 3.0");
+            Assert.BuildOutputContainsLine(result, "ResolvedRazorConfiguration: MVC-3.0");
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task RazorSdk_ResolvesRazorLangVersionFromValueSpecified()
+        {
+            var result = await DotnetMSBuild("ResolveRazorConfiguration", "/t:_IntrospectResolvedConfiguration");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "RazorLangVersion: 3.0");
+            Assert.BuildOutputContainsLine(result, "ResolvedRazorConfiguration: Default");
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task RazorSdk_ResolvesRazorLangVersionTo21WhenUnspecified()
+        {
+            // This is equivalent to not specifying a value for RazorLangVersion
+            AddProjectFileContent("<PropertyGroup><RazorLangVersion /></PropertyGroup>");
+
+            var result = await DotnetMSBuild("ResolveRazorConfiguration", "/t:_IntrospectResolvedConfiguration");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+            Assert.BuildOutputContainsLine(result, "RazorLangVersion: 2.1");
+            // BuildOutputContainsLine matches entire lines, so it's fine to Assert the following.
+            Assert.BuildOutputContainsLine(result, "ResolvedRazorConfiguration:");
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task RazorSdk_WithRazorLangVersionLatest()
+        {
+            var result = await DotnetMSBuild("ResolveRazorConfiguration", "/t:_IntrospectResolvedConfiguration /p:RazorLangVersion=Latest");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "RazorLangVersion: Latest");
+            Assert.BuildOutputContainsLine(result, "ResolvedRazorConfiguration: Default");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task RazorSdk_ResolvesRazorConfigurationToMvc30()
+        {
+            var result = await DotnetMSBuild("ResolveRazorConfiguration", "/t:_IntrospectResolvedConfiguration");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "RazorLangVersion: 3.0");
+            Assert.BuildOutputContainsLine(result, "ResolvedRazorConfiguration: MVC-3.0");
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 847fccafc3..1503141b88 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -24,6 +24,56 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("MvcWithComponents")]
         public Task Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Desktop);
 
+        [Fact]
+        [InitializeTestProject("ComponentApp")]
+        public async Task Build_DoesNotProduceMvcArtifacts_IfAddRazorSupportForMvcIsFalse()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "ComponentApp.dll");
+            Assert.FileExists(result, OutputPath, "ComponentApp.pdb");
+
+            // Verify component compilation succeeded
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "ComponentApp.dll"), "ComponentApp.Components.Pages.Counter");
+
+            // Verify MVC artifacts do not appear in the output.
+            Assert.FileDoesNotExist(result, OutputPath, "ComponentApp.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "ComponentApp.Views.pdb");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task Build_WithoutRazorLangVersion_ProducesWarning()
+        {
+            TargetFramework = "netstandard2.0";
+            var result = await DotnetMSBuild("Build", "/p:RazorLangVersion=");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            // We should see a build warning
+            Assert.BuildWarning(result, "RAZORSDK1005");
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task Building_NetstandardComponentLibrary()
+        {
+            TargetFramework = "netstandard2.0";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "ComponentLibrary.dll");
+            Assert.FileExists(result, OutputPath, "ComponentLibrary.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.pdb");
+        }
+
         private async Task Build_ComponentsWorks(MSBuildProcessKind msBuildProcessKind)
         {
             var result = await DotnetMSBuild("Build", msBuildProcessKind: msBuildProcessKind);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
index f04a14c449..5dc1651e47 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
@@ -37,7 +37,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
-            MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp3.0";
+#if NETCOREAPP3_0
+            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp3.0";
+#else
+#error Target frameworks need to be updated
+#endif
         }
 
         public override void After(MethodInfo methodUnderTest)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index 3037ba3171..be0a44c78b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -28,12 +28,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.NuspecContains(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("contentFiles", "any", "netstandard2.0", "Views", "Shared", "_Layout.cshtml"));
+                Path.Combine("contentFiles", "any", "netcoreapp3.0", "Views", "Shared", "_Layout.cshtml"));
         }
 
         [Fact]
@@ -55,25 +55,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecDoesNotContain(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NuspecDoesNotContain(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
         }
 
         [Fact]
@@ -93,25 +93,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecDoesNotContain(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NuspecDoesNotContain(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
         }
 
         [Fact]
@@ -128,21 +128,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.symbols.nupkg"),
-                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"),
-                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.pdb"));
+                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"),
+                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb"));
         }
 
         [Fact]
@@ -162,19 +162,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netstandard2.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    @"<files include=""any/netstandard2.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                    @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
             }
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netstandard2.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index 52a0582328..eb19bd2b5b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -100,20 +100,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
         }
 
-        [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
-        [InitializeTestProject("SimpleMvc")]
-        public async Task Publish_WithMvcRazorCompileOnPublish_Noops()
-        {
-            var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=true");
-
-            Assert.BuildPassed(result);
-
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
-            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
-            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
-        }
-
         [Fact] // This is an override to force the new toolset
         [InitializeTestProject("SimpleMvc")]
         public async Task Publish_WithMvcRazorCompileOnPublish_AndRazorSDK_PublishesAssembly()
@@ -152,20 +138,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc")]
-        public async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
-        {
-            var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=false");
 
-            Assert.BuildPassed(result);
-
-            // Everything we do should noop - including building the app.
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
-            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
-            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
-            Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.pdb");
-        }
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
index 5675391bf3..4ec8e784fe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
@@ -1,6 +1,7 @@
 // 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.Threading.Tasks;
 using Microsoft.AspNetCore.Components.RenderTree;
 
 namespace Microsoft.AspNetCore.Components
@@ -19,6 +20,8 @@ namespace Microsoft.AspNetCore.Components
         {
         }
 
+        protected virtual Task OnInitAsync() => Task.CompletedTask;
+
         protected void WriteLiteral(string literal) { }
     }
 }
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 9386f89689..d85a5ebfb8 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -2,9 +2,17 @@
   
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
@@ -17,7 +25,6 @@
   <!-- Test Placeholder -->
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj"/>
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 036f56d5cb..caab60a992 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -4,19 +4,25 @@
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
+  <!--
+  The AspNetCore repo depends on AspNetCore-Tooling, and we want to avoid creating a cylical dependency between the two
+  by adding a reference to Microsoft.AspNetCore.App. We'll instead simulate the presence of the reference.
+  -->
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <Copyright>© Microsoft</Copyright>
     <Product>Razor Test</Product>
     <Company>Microsoft</Company>
     <Description>ClassLibrary Description</Description>
-
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
-    <GenerateRazorAssemblyInfo>true</GenerateRazorAssemblyInfo>
-    <GenerateProvideApplicationPartFactoryAttribute>true</GenerateProvideApplicationPartFactoryAttribute>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index eaf99c9257..ea67bc1e7f 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -5,11 +5,16 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
 
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
new file mode 100644
index 0000000000..a346743179
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testassets/ComponentApp/Components/App.razor b/src/Razor/test/testassets/ComponentApp/Components/App.razor
new file mode 100644
index 0000000000..03eee81cef
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/App.razor
@@ -0,0 +1,5 @@
+@*
+    The Router component displays whichever component has a @page
+    directive matching the current URI.
+*@
+<Router AppAssembly="typeof(Startup).Assembly" />
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
new file mode 100644
index 0000000000..e7244066a2
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
@@ -0,0 +1,16 @@
+@page "/counter"
+
+<h1>Counter</h1>
+
+<p>Current count: @currentCount</p>
+
+<button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
+
+@functions {
+    int currentCount = 0;
+
+    void IncrementCount()
+    {
+        currentCount++;
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
new file mode 100644
index 0000000000..f06b62f911
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
@@ -0,0 +1,45 @@
+@page "/fetchdata"
+@using ComponentApp.Services
+@inject WeatherForecastService ForecastService
+
+<h1>Weather forecast</h1>
+
+<p>This component demonstrates fetching data from a service.</p>
+
+@if (forecasts == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Date</th>
+                <th>Temp. (C)</th>
+                <th>Temp. (F)</th>
+                <th>Summary</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var forecast in forecasts)
+            {
+                <tr>
+                    <td>@forecast.Date.ToShortDateString()</td>
+                    <td>@forecast.TemperatureC</td>
+                    <td>@forecast.TemperatureF</td>
+                    <td>@forecast.Summary</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
+
+@functions {
+    WeatherForecast[] forecasts;
+
+    protected override async Task OnInitAsync()
+    {
+        forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor
new file mode 100644
index 0000000000..16dac31925
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor
@@ -0,0 +1,5 @@
+@page "/"
+
+<h1>Hello, world!</h1>
+
+Welcome to your new app.
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/_ViewImports.cshtml b/src/Razor/test/testassets/ComponentApp/Components/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..0f24edaf1d
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/_ViewImports.cshtml
@@ -0,0 +1 @@
+@layout MainLayout
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Shared/MainLayout.razor b/src/Razor/test/testassets/ComponentApp/Components/Shared/MainLayout.razor
new file mode 100644
index 0000000000..160546ccca
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/Shared/MainLayout.razor
@@ -0,0 +1,12 @@
+<div class="sidebar">
+    <NavMenu />
+</div>
+
+<div class="main">
+    <div class="top-row px-4">
+        <a href="https://docs.microsoft.com/en-us/aspnet/" target="_blank" class="ml-md-auto">About</a>
+    </div>
+
+    <div class="content px-4">
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor b/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
new file mode 100644
index 0000000000..8269b96b25
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
@@ -0,0 +1,37 @@
+<div class="top-row pl-4 navbar navbar-dark">
+    <a class="navbar-brand" href="">ComponentApp</a>
+    <button class="navbar-toggler" onclick="@ToggleNavMenu">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+</div>
+
+<div class="@NavMenuCssClass" onclick="@ToggleNavMenu">
+    <ul class="nav flex-column">
+        <li class="nav-item px-3">
+            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
+                <span class="oi oi-home" aria-hidden="true"></span> Home
+            </NavLink>
+        </li>
+        <li class="nav-item px-3">
+            <NavLink class="nav-link" href="counter">
+                <span class="oi oi-plus" aria-hidden="true"></span> Counter
+            </NavLink>
+        </li>
+        <li class="nav-item px-3">
+            <NavLink class="nav-link" href="fetchdata">
+                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
+            </NavLink>
+        </li>
+    </ul>
+</div>
+
+@functions {
+    bool collapseNavMenu = true;
+
+    string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+
+    void ToggleNavMenu()
+    {
+        collapseNavMenu = !collapseNavMenu;
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentApp/Components/_ViewImports.cshtml b/src/Razor/test/testassets/ComponentApp/Components/_ViewImports.cshtml
new file mode 100644
index 0000000000..08636e04e8
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Components/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using ComponentApp.Components.Shared
diff --git a/src/Razor/test/testassets/ComponentApp/Program.cs b/src/Razor/test/testassets/ComponentApp/Program.cs
new file mode 100644
index 0000000000..6c1ff60bcd
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Program.cs
@@ -0,0 +1,10 @@
+
+namespace ComponentApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentApp/Services/WeatherForecast.cs b/src/Razor/test/testassets/ComponentApp/Services/WeatherForecast.cs
new file mode 100644
index 0000000000..e55989b058
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Services/WeatherForecast.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace ComponentApp.Services
+{
+    public class WeatherForecast
+    {
+        public DateTime Date { get; set; }
+
+        public int TemperatureC { get; set; }
+
+        public int TemperatureF { get; set; }
+
+        public string Summary { get; set; }
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentApp/Services/WeatherForecastService.cs b/src/Razor/test/testassets/ComponentApp/Services/WeatherForecastService.cs
new file mode 100644
index 0000000000..a1020e22b8
--- /dev/null
+++ b/src/Razor/test/testassets/ComponentApp/Services/WeatherForecastService.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ComponentApp.Services
+{
+    public class WeatherForecastService
+    {
+        private static string[] Summaries = new[]
+        {
+            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+        };
+
+        public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
+        {
+            var rng = new Random();
+            return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
+            {
+                Date = startDate.AddDays(index),
+                TemperatureC = rng.Next(-20, 55),
+                Summary = Summaries[rng.Next(Summaries.Length)]
+            }).ToArray());
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index 0aca4f7bc1..c1b50b877b 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -7,10 +7,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
     <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -28,10 +25,6 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectCapability Include="DotNetCoreRazorConfiguration" />
-  </ItemGroup>
-
   <!-- Test Placeholder -->
 
 </Project>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 8e8dea1809..c9dcbb4f7c 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -2,9 +2,21 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <!--
+  The AspNetCore repo depends on AspNetCore-Tooling, and we want to avoid creating a cylical dependency between the two
+  by adding a reference to Microsoft.AspNetCore.App. We'll instead simulate the presence of the reference.
+  -->
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <_ReferencesAspNetCoreApp>true</_ReferencesAspNetCoreApp>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
@@ -14,10 +26,6 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 523061d189..eead930882 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -2,10 +2,18 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <_RazorComponentInclude>Components\**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
@@ -15,10 +23,6 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index b3e93737f3..ea4f3d100e 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -33,4 +33,9 @@
   <Target Name="_IntrospectProjectCapabilityItems">
     <Message Text="ProjectCapability: %(ProjectCapability.Identity)" Importance="High" />
   </Target>
+
+  <Target Name="_IntrospectResolvedConfiguration">
+    <Message Text="RazorLangVersion: $(RazorLangVersion)" Importance="High" />
+    <Message Text="ResolvedRazorConfiguration: @(ResolvedRazorConfiguration)" Importance="High" />
+  </Target>
 </Project>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 051be921c2..05505c5df3 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -9,6 +9,7 @@
     <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
     <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />
     <ProjectReference Include="..\ComponentLibrary\ComponentLibrary.csproj" />
+    <ProjectReference Include="..\ComponentApp\ComponentApp.csproj" />
     <ProjectReference Include="..\LargeProject\LargeProject.csproj" />
     <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
     <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 21ed48c476..634cf28232 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -1,10 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
@@ -14,10 +22,6 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index e9a2f2c754..eaad6c8d99 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -2,9 +2,16 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
@@ -19,10 +26,6 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
@@ -31,7 +34,7 @@
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
-  </ItemGroup>  
+  </ItemGroup>
 
   <!-- Test Placeholder -->
 
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 66d48660f4..634cf28232 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -2,9 +2,17 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.NETCore.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
@@ -14,10 +22,6 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
@@ -29,5 +33,5 @@
   </ItemGroup>
 
   <!-- Test Placeholder -->
-  
+
 </Project>

From e5064d3c76bd70d508e2bfe73167ce8687cf5e75 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 14 Mar 2019 15:48:16 -0700
Subject: [PATCH 106/337] Allow markup in local functions and @functions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Allow markup to exist in all code blocks. Prior to this change whenever we'd see nested curly braces we would do dumb brace matching to skip over any potentially risky code; now we treat every curly brace as an opportunity to intermingle Markup.
- One fix I had to introduce was now that functions blocks are parsed like `@{}` blocks I ran into cases where certain reserved keywords would get improperly parsed. This exposed a bug in our parsing where we’d treat **class** and **namespace** as directives without a transition in a `@{}` block. For instance this:
```
@{
    class
}
```
would barf in the old parser by treating the `class` piece as a directive even though it did not have a transition. To account for this I changed our reserved directives to be parsed as directives instead of keywords (it's how they should have been parsed anyhow). This isn't a breaking change because the directive parsing logic is a subset of how keywords get parsed.

- One quirk this change introduces is a difference in behavior in regards to one error case. Before this change if you were to have `@if (foo)) { var bar = foo; }` the entire statement would be classified as C# and you'd get a C# error on the trailing `)`. With my changes we try to keep group statements together more closely and allow for HTML in unexpected or end of statement scenarios. So, with these new changes the above example would only have `@if (foo))` classified as C# and the rest as markup because the original was invalid.
- Added lots of tests,
- Modified the feature flag to maintain the old behavior when disabled.

aspnet/AspNetCoredotnet/aspnetcore-tooling#5110
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5ffd84e56dd3d21b48d55feea5bc1493d0293fd1
---
 .../src/Legacy/CSharpCodeParser.cs            | 87 ++++++++++++-------
 .../src/Legacy/CodeBlockEditHandler.cs        |  4 +-
 .../src/RazorParserFeatureFlags.cs            |  9 ++
 3 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index e0fc7790c1..a6e048f189 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -482,7 +482,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 // Set up auto-complete and parse the code block
                 var editHandler = new AutoCompleteEditHandler(Language.TokenizeString);
                 SpanContext.EditHandler = editHandler;
-                ParseCodeBlock(builder, block, acceptTerminatingBrace: false);
+                ParseCodeBlock(builder, block);
+
+                if (EndOfFile)
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                            new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
+                }
 
                 EnsureCurrent();
                 SpanContext.ChunkGenerator = new StatementChunkGenerator();
@@ -521,7 +528,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return SyntaxFactory.CSharpStatementBody(leftBrace, codeBlock, rightBrace);
         }
 
-        private void ParseCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block, bool acceptTerminatingBrace = true)
+        private void ParseCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
         {
             EnsureCurrent();
             while (!EndOfFile && !At(SyntaxKind.RightBrace))
@@ -530,19 +537,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 ParseStatement(builder, block: block);
                 EnsureCurrent();
             }
-
-            if (EndOfFile)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
-                        new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
-            }
-            else if (acceptTerminatingBrace)
-            {
-                Assert(SyntaxKind.RightBrace);
-                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                AcceptAndMoveNext();
-            }
         }
 
         private void ParseStatement(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
@@ -634,6 +628,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         // Verbatim Block
                         AcceptAndMoveNext();
                         ParseCodeBlock(builder, block);
+
+                        // ParseCodeBlock is responsible for parsing the insides of a code block (non-inclusive of braces).
+                        // Therefore, there's one of two cases after parsing: 
+                        //  1. We've hit the End of File (incomplete parse block).
+                        //  2. It's a complete parse block and we're at a right brace.
+
+                        if (EndOfFile)
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                                    new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
+                        }
+                        else
+                        {
+                            Assert(SyntaxKind.RightBrace);
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                            AcceptAndMoveNext();
+                        }
                         break;
                     case SyntaxKind.Keyword:
                         if (!TryParseKeyword(builder, whitespace: null, transition: null))
@@ -736,7 +748,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     token.Kind != SyntaxKind.LeftBracket &&
                     token.Kind != SyntaxKind.RightBrace);
 
-                if (At(SyntaxKind.LeftBrace) ||
+                if ((!Context.FeatureFlags.AllowRazorInAllCodeBlocks && At(SyntaxKind.LeftBrace)) ||
                     At(SyntaxKind.LeftParenthesis) ||
                     At(SyntaxKind.LeftBracket))
                 {
@@ -752,6 +764,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         return;
                     }
                 }
+                else if (Context.FeatureFlags.AllowRazorInAllCodeBlocks && At(SyntaxKind.LeftBrace))
+                {
+                    Accept(read);
+                    return;
+                }
                 else if (At(SyntaxKind.Transition) && (NextIs(SyntaxKind.LessThan, SyntaxKind.Colon)))
                 {
                     Accept(read);
@@ -847,6 +864,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             MapDirectives(ParseTagHelperPrefixDirective, SyntaxConstants.CSharp.TagHelperPrefixKeyword);
             MapDirectives(ParseAddTagHelperDirective, SyntaxConstants.CSharp.AddTagHelperKeyword);
             MapDirectives(ParseRemoveTagHelperDirective, SyntaxConstants.CSharp.RemoveTagHelperKeyword);
+
+            // If there wasn't any extensible directives relating to the reserved directives then map them.
+            if (!_directiveParserMap.ContainsKey("class"))
+            {
+                MapDirectives(ParseReservedDirective, "class");
+            }
+
+            if (!_directiveParserMap.ContainsKey("namespace"))
+            {
+                MapDirectives(ParseReservedDirective, "namespace");
+            }
         }
 
         private void EnsureDirectiveIsAtStartOfLine()
@@ -883,17 +911,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 });
 
                 Keywords.Add(directive);
-
-                // These C# keywords are reserved for use in directives. It's an error to use them outside of
-                // a directive. This code removes the error generation if the directive *is* registered.
-                if (string.Equals(directive, "class", StringComparison.OrdinalIgnoreCase))
-                {
-                    _keywordParserMap.Remove(CSharpKeyword.Class);
-                }
-                else if (string.Equals(directive, "namespace", StringComparison.OrdinalIgnoreCase))
-                {
-                    _keywordParserMap.Remove(CSharpKeyword.Namespace);
-                }
             }
         }
 
@@ -1409,11 +1426,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
                             {
                                 NextToken();
-                                Balance(childBuilder, BalancingModes.NoErrorOnFailure, SyntaxKind.LeftBrace, SyntaxKind.RightBrace, startingBraceLocation);
-                                SpanContext.ChunkGenerator = new StatementChunkGenerator();
+
                                 var existingEditHandler = SpanContext.EditHandler;
                                 SpanContext.EditHandler = new CodeBlockEditHandler(Language.TokenizeString);
 
+                                if (Context.FeatureFlags.AllowRazorInAllCodeBlocks)
+                                {
+                                    var block = new Block(descriptor.Directive, directiveStart);
+                                    ParseCodeBlock(childBuilder, block);
+                                }
+                                else
+                                {
+                                    Balance(childBuilder, BalancingModes.NoErrorOnFailure, SyntaxKind.LeftBrace, SyntaxKind.RightBrace, startingBraceLocation);
+                                }
+
+                                SpanContext.ChunkGenerator = new StatementChunkGenerator();
+
                                 AcceptMarkerTokenIfNecessary();
 
                                 childBuilder.Add(OutputTokensAsStatementLiteral());
@@ -1607,7 +1635,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             MapKeywords(ParseTryStatement, CSharpKeyword.Try);
             MapKeywords(ParseDoStatement, CSharpKeyword.Do);
             MapKeywords(ParseUsingKeyword, CSharpKeyword.Using);
-            MapKeywords(ParseReservedDirective, CSharpKeyword.Class, CSharpKeyword.Namespace);
         }
 
         private void MapExpressionKeyword(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, CSharpKeyword keyword)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs
index 8ecbd85906..db4f7920ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CodeBlockEditHandler.cs
@@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             var relativePosition = change.Span.AbsoluteIndex - target.Position;
 
-            if (target.GetContent().IndexOfAny(new[] { '{', '}' }, relativePosition, change.Span.Length) >= 0)
+            if (target.GetContent().IndexOfAny(new[] { '{', '}', '@', '<', '*', }, relativePosition, change.Span.Length) >= 0)
             {
                 return true;
             }
@@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         // Internal for testing
         internal static bool ContainsInvalidContent(SourceChange change)
         {
-            if (change.NewText.IndexOfAny(new[] { '{', '}' }) >= 0)
+            if (change.NewText.IndexOfAny(new[] { '{', '}', '@', '<', '*', }) >= 0)
             {
                 return true;
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
index e70f892384..22a1d731df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var allowMinimizedBooleanTagHelperAttributes = false;
             var allowHtmlCommentsInTagHelpers = false;
             var allowComponentFileKind = false;
+            var allowRazorInAllCodeBlocks = false;
             var experimental_AllowConditionalDataDashAttributes = false;
 
             if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
@@ -23,6 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 // Added in 3.0
                 allowComponentFileKind = true;
+                allowRazorInAllCodeBlocks = true;
             }
 
             if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
@@ -34,6 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowMinimizedBooleanTagHelperAttributes,
                 allowHtmlCommentsInTagHelpers,
                 allowComponentFileKind,
+                allowRazorInAllCodeBlocks,
                 experimental_AllowConditionalDataDashAttributes);
         }
 
@@ -43,6 +46,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool AllowComponentFileKind { get; }
 
+        public abstract bool AllowRazorInAllCodeBlocks { get; }
+
         public abstract bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
 
         private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
@@ -51,11 +56,13 @@ namespace Microsoft.AspNetCore.Razor.Language
                 bool allowMinimizedBooleanTagHelperAttributes,
                 bool allowHtmlCommentsInTagHelpers,
                 bool allowComponentFileKind,
+                bool allowRazorInAllCodeBlocks,
                 bool experimental_AllowConditionalDataDashAttributes)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
                 AllowComponentFileKind = allowComponentFileKind;
+                AllowRazorInAllCodeBlocks = allowRazorInAllCodeBlocks;
                 EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
             }
 
@@ -65,6 +72,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override bool AllowComponentFileKind { get; }
 
+            public override bool AllowRazorInAllCodeBlocks { get; }
+
             public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
         }
     }

From cf116d619b0fec9502620ceea2e427ca03da8901 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 21 Mar 2019 09:28:44 -0700
Subject: [PATCH 107/337] Do not restore as part of test
 (dotnet/aspnetcore-tooling#350)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/84bc53671fe926c150509c797a6af9aefde82e80
---
 .../BuildIncrementalismTest.cs                |  4 +--
 .../IntegrationTests/BuildIntegrationTest.cs  |  2 +-
 .../BuildIntrospectionTest.cs                 |  4 +--
 .../MSBuildIntegrationTestBase.cs             |  6 ----
 .../test/IntegrationTests/ProjectDirectory.cs | 29 ++++++++++++++-----
 .../PublishIntegrationTest.cs                 |  2 +-
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  2 +-
 .../AppWithP2PReference.csproj                |  6 ++--
 .../ClassLibrary/ClassLibrary.csproj          |  6 ++--
 .../ClassLibrary2/ClassLibrary2.csproj        |  6 ++--
 .../ComponentApp/ComponentApp.csproj          |  8 ++---
 .../ComponentLibrary/ComponentLibrary.csproj  |  8 ++---
 .../test/testassets/Directory.Build.props     |  1 +
 .../LargeProject/LargeProject.csproj          |  6 ++--
 .../MvcWithComponents.csproj                  |  6 ++--
 .../RestoreTestProjects.csproj                |  4 +++
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  6 ++--
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  6 ++--
 .../testassets/SimplePages/SimplePages.csproj |  6 ++--
 19 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index bdd22d4c08..fb0a5f0abe 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
             Assert.FileExists(result, OutputPath, "ClassLibrary.Views.pdb");
 
-            result = await DotnetMSBuild(target: "Clean", "/p:BuildProjectReferences=false", suppressRestore: true);
+            result = await DotnetMSBuild(target: "Clean", "/p:BuildProjectReferences=false");
             Assert.BuildPassed(result);
 
             Assert.FileDoesNotExist(result, OutputPath, "AppWithP2PReference.dll");
@@ -306,7 +306,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, OutputPath, "ClassLibrary.Views.pdb");
 
             // dotnet msbuild /p:BuildProjectReferences=false
-            result = await DotnetMSBuild(target: default, "/p:BuildProjectReferences=false", suppressRestore: true);
+            result = await DotnetMSBuild(target: default, "/p:BuildProjectReferences=false");
 
             Assert.BuildPassed(result);
             Assert.FileExists(result, OutputPath, "AppWithP2PReference.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index ee8c87d889..04b7151649 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -539,7 +539,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             File.AppendAllText(class2Path, Environment.NewLine + "// Some changes");
 
             // dotnet msbuild /p:BuildProjectReferences=false
-            result = await DotnetMSBuild(target: default, "/p:BuildProjectReferences=false", suppressRestore: true);
+            result = await DotnetMSBuild(target: default, "/p:BuildProjectReferences=false");
 
             Assert.BuildPassed(result);
         }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 986fecd991..eb7c93e3ff 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
             Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
 
-            result = await DotnetMSBuild(target: "GetCopyToOutputDirectoryItems", "/t:_IntrospectGetCopyToOutputDirectoryItems /p:BuildProjectReferences=false", suppressRestore: true);
+            result = await DotnetMSBuild(target: "GetCopyToOutputDirectoryItems", "/t:_IntrospectGetCopyToOutputDirectoryItems /p:BuildProjectReferences=false");
             Assert.BuildPassed(result);
             Assert.BuildOutputContainsLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.dll");
             Assert.BuildOutputContainsLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.pdb");
@@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Directory.Delete(Path.Combine(Project.DirectoryPath, "Views"), recursive: true);
 
             // dotnet msbuild /p:BuildProjectReferences=false
-            result = await DotnetMSBuild(target: "GetCopyToOutputDirectoryItems", "/t:_IntrospectGetCopyToOutputDirectoryItems /p:BuildProjectReferences=false", suppressRestore: true);
+            result = await DotnetMSBuild(target: "GetCopyToOutputDirectoryItems", "/t:_IntrospectGetCopyToOutputDirectoryItems /p:BuildProjectReferences=false");
 
             Assert.BuildOutputDoesNotContainLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.dll");
             Assert.BuildOutputDoesNotContainLine(result, "AllItemsFullPathWithTargetPath: ClassLibrary.Views.pdb");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index 9ae25f1705..4803f4d46d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -57,7 +57,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         internal Task<MSBuildResult> DotnetMSBuild(
             string target,
             string args = null,
-            bool suppressRestore = false,
             bool suppressTimeout = false,
             bool suppressBuildServer = false,
             string buildServerPipeName = null,
@@ -76,11 +75,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
             };
 
-            if (!suppressRestore)
-            {
-                buildArgumentList.Add("/restore");
-            }
-
             if (!suppressBuildServer)
             {
                 buildArgumentList.Add($@"/p:_RazorBuildServerPipeName=""{buildServerPipeName ?? BuildServer.PipeName}""");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
index 6a73ab84cd..6f19052ebb 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
@@ -86,11 +86,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 throw;
             }
 
-            void CopyDirectory(DirectoryInfo source, DirectoryInfo destination)
+            void CopyDirectory(DirectoryInfo source, DirectoryInfo destination, bool recursive = true)
             {
+                foreach (var file in source.EnumerateFiles())
+                {
+                    file.CopyTo(Path.Combine(destination.FullName, file.Name));
+                }
+
+                if (!recursive)
+                {
+                    return;
+                }
+
                 foreach (var directory in source.EnumerateDirectories())
                 {
-                    if (directory.Name == "bin" || directory.Name == "obj")
+                    if (directory.Name == "bin")
                     {
                         // Just in case someone has opened the project in an IDE or built it. We don't want to copy
                         // these folders.
@@ -98,12 +108,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     }
 
                     var created = destination.CreateSubdirectory(directory.Name);
-                    CopyDirectory(directory, created);
-                }
-
-                foreach (var file in source.EnumerateFiles())
-                {
-                    file.CopyTo(Path.Combine(destination.FullName, file.Name));
+                    if (directory.Name == "obj")
+                    {
+                        // Copy NuGet restore assets (viz all the files at the root of the obj directory, but stop there.)
+                        CopyDirectory(directory, created, recursive: false);
+                    }
+                    else
+                    {
+                        CopyDirectory(directory, created);
+                    }
                 }
             }
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index eb19bd2b5b..ef50fffce3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -380,7 +380,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "ClassLibrary2.Views.dll");
 
             // dotnet msbuild /t:Publish /p:BuildProjectReferences=false
-            result = await DotnetMSBuild(target: "Publish", "/p:BuildProjectReferences=false", suppressRestore: true);
+            result = await DotnetMSBuild(target: "Publish", "/p:BuildProjectReferences=false");
 
             Assert.BuildPassed(result);
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 8bda9b03d2..b1d8222aa7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
   </Target>
 
-  <Target Name="RestoreTestProjects" BeforeTargets="Restore">
+  <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build">
     <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" />
   </Target>
 
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index d85a5ebfb8..45907b402f 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -28,10 +28,10 @@
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index caab60a992..4e4b461927 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -30,10 +30,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index ea67bc1e7f..f07e194311 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -26,10 +26,10 @@
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
index a346743179..a5a31a82f7 100644
--- a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
+++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
@@ -20,12 +20,12 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index c1b50b877b..e695e52b28 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -15,12 +15,12 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 4d6fd942d0..3f73654c48 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <SolutionRoot Condition="'$(SolutionRoot)' == ''">$(MSBuildThisFileDirectory)..\..\</SolutionRoot>
     <SolutionRoot>$([MSBuild]::EnsureTrailingSlash('$(SolutionRoot)'))</SolutionRoot>
+    <RepositoryRoot>$(SolutionRoot)..\..\</RepositoryRoot>
 
     <!-- Retarget tests to use the copy of the Sdk from source -->
     <RazorSdkArtifactsDirectory>$(SolutionRoot)..\..\artifacts\bin\Microsoft.NET.Sdk.Razor\</RazorSdkArtifactsDirectory>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index c9dcbb4f7c..364466f735 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -26,10 +26,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index eead930882..d225ac2239 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -23,10 +23,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 05505c5df3..60f70f66ac 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -11,12 +11,16 @@
     <ProjectReference Include="..\ComponentLibrary\ComponentLibrary.csproj" />
     <ProjectReference Include="..\ComponentApp\ComponentApp.csproj" />
     <ProjectReference Include="..\LargeProject\LargeProject.csproj" />
+    <ProjectReference Include="..\MvcWithComponents\MvcWithComponents.csproj" />
     <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
     <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
     <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
     <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
     <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
     <ProjectReference Include="..\SimplePages\SimplePages.csproj" />
+
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 634cf28232..13621d0e0c 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -22,10 +22,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index eaad6c8d99..b4a810124c 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -26,10 +26,10 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 634cf28232..13621d0e0c 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -22,10 +22,10 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(BinariesRoot)'==''">
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
-    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
-  </ItemGroup>
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>

From b2b207faa18fd42daa8ca07be20488303f24141c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 21 Mar 2019 12:10:16 -0700
Subject: [PATCH 108/337] Allow some warnings (dotnet/aspnetcore-tooling#353)

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/2050\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e2b1df744e8ce4294488cf7270d4a01aeebf7d57
---
 .../test/IntegrationTests/Assert.cs                      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index deb92de412..d43d0e6d2c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -19,6 +19,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         // See https://stackoverflow.com/questions/3441452/msbuild-and-ignorestandarderrorwarningformat/5180353#5180353
         private static readonly Regex ErrorRegex = new Regex(@"^(?'location'.+): error (?'errorcode'[A-Z0-9]+): (?'message'.+) \[(?'project'.+)\]$");
         private static readonly Regex WarningRegex = new Regex(@"^(?'location'.+): warning (?'errorcode'[A-Z0-9]+): (?'message'.+) \[(?'project'.+)\]$");
+        private static readonly string[] AllowedBuildWarnings = new[]
+        {
+            "MSB3491" , // The process cannot access the file. As long as the build succeeds, we're ok.
+        };
 
         public static void BuildPassed(MSBuildResult result, bool allowWarnings = false)
         {
@@ -32,7 +36,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 throw new BuildFailedException(result);
             }
 
-            var buildWarnings = GetBuildWarnings(result).Select(m => m.line);
+            var buildWarnings = GetBuildWarnings(result)
+                .Where(m => !AllowedBuildWarnings.Contains(m.match.Groups["errorcode"].Value))
+                .Select(m => m.line);
+
             if (!allowWarnings && buildWarnings.Any())
             {
                 throw new BuildWarningsException(result, buildWarnings);

From 62199e21956fb946a22950c9c4ae5356b4a10ed3 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 21 Mar 2019 12:22:28 -0700
Subject: [PATCH 109/337] Bring back errors for missing tags in component
 documents (dotnet/aspnetcore-tooling#351)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ca1e656f6b4f1ddb6209aa1ec185a83ecfa18168
---
 .../Components/ComponentDiagnosticFactory.cs  | 10 -------
 ...faultRazorIntermediateNodeLoweringPhase.cs | 28 +++++++++++++++++--
 .../src/Legacy/TagHelperParseTreeRewriter.cs  |  6 ++--
 .../src/Syntax/MarkupEndTagSyntax.cs          |  2 +-
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 7d83745575..06902eb7e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -50,16 +50,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return RazorDiagnostic.Create(UnexpectedClosingTag, span ?? SourceSpan.Undefined, tagName);
         }
 
-        public static readonly RazorDiagnosticDescriptor MismatchedClosingTag = new RazorDiagnosticDescriptor(
-            "BL9982",
-            () => "Mismatching closing tag. Found '{0}' but expected '{1}'.",
-            RazorDiagnosticSeverity.Error);
-
-        public static RazorDiagnostic Create_MismatchedClosingTag(SourceSpan? span, string expectedTagName, string tagName)
-        {
-            return RazorDiagnostic.Create(MismatchedClosingTag, span ?? SourceSpan.Undefined, expectedTagName, tagName);
-        }
-
         public static readonly RazorDiagnosticDescriptor UnexpectedClosingTagForVoidElement = new RazorDiagnosticDescriptor(
             "BL9983",
             () => "Unexpected closing tag '{0}'. The element '{0}' is a void element, and should be used without a closing tag.",
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index dd0d281f34..38f05d593b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
@@ -1137,13 +1138,34 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override void VisitMarkupElement(MarkupElementSyntax node)
             {
-                _builder.Push(new MarkupElementIntermediateNode()
+                var element = new MarkupElementIntermediateNode()
                 {
                     Source = BuildSourceSpanFromNode(node),
 
                     // Could be empty while the tag is being typed in.
-                    TagName = node.StartTag?.GetTagNameWithOptionalBang() ?? node.EndTag?.GetTagName() ?? string.Empty,
-                });
+                    TagName = node.StartTag?.GetTagNameWithOptionalBang() ?? node.EndTag?.GetTagNameWithOptionalBang() ?? string.Empty,
+                };
+
+                if (node.StartTag != null && node.EndTag != null && node.StartTag.IsVoidElement())
+                {
+                    element.Diagnostics.Add(
+                            ComponentDiagnosticFactory.Create_UnexpectedClosingTagForVoidElement(
+                                BuildSourceSpanFromNode(node.EndTag), node.EndTag.GetTagNameWithOptionalBang()));
+                }
+                else if (node.StartTag != null && node.EndTag == null && !node.StartTag.IsVoidElement() && !node.StartTag.IsSelfClosing())
+                {
+                    element.Diagnostics.Add(
+                        ComponentDiagnosticFactory.Create_UnclosedTag(
+                            BuildSourceSpanFromNode(node.StartTag), node.StartTag.GetTagNameWithOptionalBang()));
+                }
+                else if (node.StartTag == null && node.EndTag != null)
+                {
+                    element.Diagnostics.Add(
+                        ComponentDiagnosticFactory.Create_UnexpectedClosingTag(
+                            BuildSourceSpanFromNode(node.EndTag), node.EndTag.GetTagNameWithOptionalBang()));
+                }
+
+                _builder.Push(element);
 
                 base.VisitMarkupElement(node);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 4b1d8355f5..0af7a34363 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -162,7 +162,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var endTag = (MarkupEndTagSyntax)Visit(node.EndTag);
                 if (endTag != null)
                 {
-                    var tagName = endTag.GetTagName();
+                    var tagName = endTag.GetTagNameWithOptionalBang();
                     if (TryRewriteTagHelperEnd(endTag, out tagHelperEnd))
                     {
                         // This is a tag helper
@@ -288,7 +288,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             private bool TryRewriteTagHelperEnd(MarkupEndTagSyntax tagBlock, out MarkupTagHelperEndTagSyntax rewritten)
             {
                 rewritten = null;
-                var tagName = tagBlock.GetTagName();
+                var tagName = tagBlock.GetTagNameWithOptionalBang();
                 // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
                 if (string.IsNullOrEmpty(tagName) || tagName.StartsWith("!"))
                 {
@@ -599,7 +599,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             private void ValidateParentAllowsPlainEndTag(MarkupEndTagSyntax tagBlock)
             {
-                var tagName = tagBlock.GetTagName();
+                var tagName = tagBlock.GetTagNameWithOptionalBang();
 
                 // Treat partial tags such as '</' which have no tag names as content.
                 if (string.IsNullOrEmpty(tagName))
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs
index 2f2a529f55..b4fc904f25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupEndTagSyntax.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
 
         public SyntaxList<RazorSyntaxNode> Children => GetLegacyChildren();
 
-        public string GetTagName()
+        public string GetTagNameWithOptionalBang()
         {
             return Name.IsMissing ? string.Empty : Bang?.Content + Name.Content;
         }

From 91a383ad3b96ae3a625732d06583a27642d84a4a Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 22 Mar 2019 09:19:56 -0700
Subject: [PATCH 110/337] Add support for _Imports.razor
 (dotnet/aspnetcore-tooling#354)

* Added support _Imports.razor

* Feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/14704054f2fcb1dbc803516d3e5d3a5069cde027
---
 .../Components/ComponentImportProjectFeature.cs |  6 +++---
 .../src/Components/ComponentMetadata.cs         |  2 ++
 .../src/FileKinds.cs                            | 17 +++++++++++++++--
 .../{_ViewImports.cshtml => _Imports.razor}     |  0
 4 files changed, 20 insertions(+), 5 deletions(-)
 rename src/Razor/test/testassets/ComponentApp/Components/{_ViewImports.cshtml => _Imports.razor} (100%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
index 701c484dae..367bca910d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
@@ -11,8 +11,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     internal class ComponentImportProjectFeature : IImportProjectFeature
     {
-        private const string ImportsFileName = "_ViewImports.cshtml";
-
         private static readonly char[] PathSeparators = new char[]{ '/', '\\' };
 
         // Using explicit newlines here to avoid fooling our baseline tests
@@ -74,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public IEnumerable<RazorProjectItem> GetHierarchicalImports(RazorProject project, RazorProjectItem projectItem)
         {
             // We want items in descending order. FindHierarchicalItems returns items in ascending order.
-            return project.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse();
+            return project.FindHierarchicalItems(projectItem.FilePath, ComponentMetadata.ImportsFileName).Reverse();
         }
 
         private class VirtualProjectItem : RazorProjectItem
@@ -99,6 +97,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public override bool Exists => true;
 
+            public override string FileKind => FileKinds.ComponentImport;
+
             public override Stream Read() => new MemoryStream(_bytes);
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index a203bb2690..ad3a7cd44d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -11,6 +11,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         // use our own metadata entry to denote non-Component tag helpers.
         public static readonly string SpecialKindKey = "Components.IsSpecialKind";
 
+        public static readonly string ImportsFileName = "_Imports.razor";
+
         public static class Bind
         {
             public static readonly string RuntimeName = "Components.None";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
index 93a5a21c03..c69df04e60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -10,12 +11,20 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         public static readonly string Component = "component";
 
+        public static readonly string ComponentImport = "componentImport";
+
         public static readonly string Legacy = "mvc";
 
         public static bool IsComponent(string fileKind)
         {
             // fileKind might be null.
-            return string.Equals(fileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase);
+            return string.Equals(fileKind, FileKinds.Component, StringComparison.OrdinalIgnoreCase) || IsComponentImport(fileKind);
+        }
+
+        public static bool IsComponentImport(string fileKind)
+        {
+            // fileKind might be null.
+            return string.Equals(fileKind, FileKinds.ComponentImport, StringComparison.OrdinalIgnoreCase);
         }
 
         public static string GetFileKindFromFilePath(string filePath)
@@ -25,7 +34,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(filePath));
             }
 
-            if (string.Equals(".razor", Path.GetExtension(filePath), StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(ComponentMetadata.ImportsFileName, Path.GetFileName(filePath), StringComparison.Ordinal))
+            {
+                return FileKinds.ComponentImport;
+            }
+            else if (string.Equals(".razor", Path.GetExtension(filePath), StringComparison.OrdinalIgnoreCase))
             {
                 return FileKinds.Component;
             }
diff --git a/src/Razor/test/testassets/ComponentApp/Components/_ViewImports.cshtml b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
similarity index 100%
rename from src/Razor/test/testassets/ComponentApp/Components/_ViewImports.cshtml
rename to src/Razor/test/testassets/ComponentApp/Components/_Imports.razor

From 92d931c229bac260fdea8c5ed72f85071de5517d Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 22 Mar 2019 10:29:38 -0700
Subject: [PATCH 111/337]  Support importing components with @using directives
 (dotnet/aspnetcore-tooling#276)

* Support importing components with @using directives

* Suppress taghelper directive completion in component documents

* feedback

* More feedback

* Update tests

* Update CodeAnalysis.Razor tests

* Flow filekind

* Changes

* More code gen tests

* More tests

* fix

* Added more tests

* Made stuff internal

* Filter out temporary tag helper descriptors

* update

* Do the needful
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/343f37748e145ff96a64097749a80461cc9f22d5
---
 .../BasicComponent_DesignTime.ir.txt          |   1 -
 .../ComponentDesignTimeNodeWriter.cs          |  24 ++
 .../Components/ComponentDiagnosticFactory.cs  |  61 ++--
 .../ComponentDocumentClassifierPass.cs        |  65 +---
 .../ComponentImportProjectFeature.cs          |  20 --
 .../src/Components/ComponentMetadata.cs       |  37 +++
 .../TagHelperDescriptorExtensions.cs          |  17 +-
 .../src/DefaultRazorParserOptions.cs          |   5 +-
 .../src/DefaultRazorParserOptionsBuilder.cs   |   5 +-
 .../src/DefaultRazorParserOptionsFeature.cs   |   6 +-
 .../src/DefaultRazorTagHelperBinderPhase.cs   | 280 +++++++++++++++++-
 .../src/Legacy/AddImportChunkGenerator.cs     |  10 +-
 .../src/Legacy/CSharpCodeParser.cs            |  18 +-
 .../src/RazorCodeDocumentExtensions.cs        |  70 +++++
 .../src/RazorEngine.cs                        |   4 +-
 .../src/RazorParserOptions.cs                 |  19 +-
 .../src/RazorProjectEngine.cs                 |   2 +-
 .../src/BindTagHelperDescriptorProvider.cs    |   5 +
 .../ComponentTagHelperDescriptorProvider.cs   |  47 ++-
 .../BaseTagHelperDescriptorProviderTest.cs    |  33 ++-
 .../BindTagHelperDescriptorProviderTest.cs    |  10 +-
 ...omponentTagHelperDescriptorProviderTest.cs |  23 +-
 ...tHandlerTagHelperDescriptorProviderTest.cs |   2 +-
 .../RefTagHelperDescriptorProviderTest.cs     |   2 +-
 24 files changed, 610 insertions(+), 156 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index 7cc88c4c21..cc83c0d2a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -8,7 +8,6 @@ Document -
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             DesignTimeDirective - 
-                DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components"
                 DirectiveToken - (12:0,12 [11] BasicComponent.cshtml) - IDisposable
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 62c1fab448..9a3fd27c1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -457,6 +457,30 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 context.CodeWriter.Write(");");
                 context.CodeWriter.WriteLine();
             }
+
+            // We want to generate something that references the Component type to avoid
+            // the "usings directive is unnecessary" message.
+            // Looks like:
+            // __o = typeof(SomeNamespace.SomeComponent);
+            using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+            {
+                context.CodeWriter.Write(DesignTimeVariable);
+                context.CodeWriter.Write(" = ");
+                context.CodeWriter.Write("typeof(");
+                context.CodeWriter.Write(node.TagName);
+                if (node.Component.IsGenericTypedComponent())
+                {
+                    context.CodeWriter.Write("<");
+                    var typeArgumentCount = node.Component.GetTypeParameters().Count();
+                    for (var i = 1; i < typeArgumentCount; i++)
+                    {
+                        context.CodeWriter.Write(",");
+                    }
+                    context.CodeWriter.Write(">");
+                }
+                context.CodeWriter.Write(");");
+                context.CodeWriter.WriteLine();
+            }
         }
 
         public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 06902eb7e2..ba2f30fa2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -12,9 +12,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     internal static class ComponentDiagnosticFactory
     {
-        public static readonly RazorDiagnosticDescriptor CodeBlockInAttribute =
-            new RazorDiagnosticDescriptor(
-            "BL9979",
+        private const string DiagnosticPrefix = "RZ";
+
+        public static readonly RazorDiagnosticDescriptor UnsupportedTagHelperDirective = new RazorDiagnosticDescriptor(
+            $"{DiagnosticPrefix}9978",
+            () => 
+                "The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document." +
+                "Use '@using <namespace>' directive instead.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_UnsupportedTagHelperDirective(SourceSpan? source)
+        {
+            return RazorDiagnostic.Create(UnsupportedTagHelperDirective, source ?? SourceSpan.Undefined);
+        }
+
+        public static readonly RazorDiagnosticDescriptor CodeBlockInAttribute = new RazorDiagnosticDescriptor(
+            $"{DiagnosticPrefix}9979",
             () =>
                 "Code blocks delimited by '@{...}' like '@{{ {0} }}' for attributes are no longer supported " +
                 "These features have been changed to use attribute syntax. " +
@@ -31,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor UnclosedTag = new RazorDiagnosticDescriptor(
-            "BL9980",
+            $"{DiagnosticPrefix}9980",
             () => "Unclosed tag '{0}' with no matching end tag.",
             RazorDiagnosticSeverity.Error);
 
@@ -41,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor UnexpectedClosingTag = new RazorDiagnosticDescriptor(
-            "BL9981",
+            $"{DiagnosticPrefix}9981",
             () => "Unexpected closing tag '{0}' with no matching start tag.",
             RazorDiagnosticSeverity.Error);
 
@@ -51,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor UnexpectedClosingTagForVoidElement = new RazorDiagnosticDescriptor(
-            "BL9983",
+            $"{DiagnosticPrefix}9983",
             () => "Unexpected closing tag '{0}'. The element '{0}' is a void element, and should be used without a closing tag.",
             RazorDiagnosticSeverity.Error);
 
@@ -61,7 +74,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor InvalidHtmlContent = new RazorDiagnosticDescriptor(
-            "BL9984",
+            $"{DiagnosticPrefix}9984",
             () => "Found invalid HTML content. Text '{0}'",
             RazorDiagnosticSeverity.Error);
 
@@ -71,7 +84,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor MultipleComponents = new RazorDiagnosticDescriptor(
-            "BL9985",
+            $"{DiagnosticPrefix}9985",
             () => "Multiple components use the tag '{0}'. Components: {1}",
             RazorDiagnosticSeverity.Error);
 
@@ -81,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor UnsupportedComplexContent = new RazorDiagnosticDescriptor(
-            "BL9986",
+            $"{DiagnosticPrefix}9986",
             () => "Component attributes do not support complex content (mixed C# and markup). Attribute: '{0}', text '{1}'",
             RazorDiagnosticSeverity.Error);
 
@@ -93,7 +106,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor PageDirective_CannotBeImported =
             new RazorDiagnosticDescriptor(
-            "BL9987",
+            $"{DiagnosticPrefix}9987",
             () => ComponentResources.PageDirectiveCannotBeImported,
             RazorDiagnosticSeverity.Error);
 
@@ -107,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor PageDirective_MustSpecifyRoute =
             new RazorDiagnosticDescriptor(
-            "BL9988",
+            $"{DiagnosticPrefix}9988",
             () => "The @page directive must specify a route template. The route template must be enclosed in quotes and begin with the '/' character.",
             RazorDiagnosticSeverity.Error);
 
@@ -119,7 +132,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor BindAttribute_Duplicates =
             new RazorDiagnosticDescriptor(
-            "BL9989",
+            $"{DiagnosticPrefix}9989",
             () => "The attribute '{0}' was matched by multiple bind attributes. Duplicates:{1}",
             RazorDiagnosticSeverity.Error);
 
@@ -135,7 +148,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor EventHandler_Duplicates =
             new RazorDiagnosticDescriptor(
-            "BL9990",
+            $"{DiagnosticPrefix}9990",
             () => "The attribute '{0}' was matched by multiple event handlers attributes. Duplicates:{1}",
             RazorDiagnosticSeverity.Error);
 
@@ -151,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor BindAttribute_InvalidSyntax =
             new RazorDiagnosticDescriptor(
-            "BL9991",
+            $"{DiagnosticPrefix}9991",
             () => "The attribute names could not be inferred from bind attribute '{0}'. Bind attributes should be of the form" +
                 "'bind', 'bind-value' or 'bind-value-change'",
             RazorDiagnosticSeverity.Error);
@@ -166,7 +179,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         public static readonly RazorDiagnosticDescriptor DisallowedScriptTag = new RazorDiagnosticDescriptor(
-            "BL9992",
+            $"{DiagnosticPrefix}9992",
             () => "Script tags should not be placed inside components because they cannot be updated dynamically. To fix this, move the script tag to the 'index.html' file or another static location. For more information see https://go.microsoft.com/fwlink/?linkid=872131",
             RazorDiagnosticSeverity.Error);
 
@@ -180,7 +193,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor TemplateInvalidLocation =
             new RazorDiagnosticDescriptor(
-            "BL9994",
+            $"{DiagnosticPrefix}9994",
             () => "Razor templates cannot be used in attributes.",
             RazorDiagnosticSeverity.Error);
 
@@ -191,7 +204,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor ChildContentSetByAttributeAndBody =
             new RazorDiagnosticDescriptor(
-                "BL9995",
+                $"{DiagnosticPrefix}9995",
                 () => "The child content property '{0}' is set by both the attribute and the element contents.",
                 RazorDiagnosticSeverity.Error);
 
@@ -202,7 +215,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor ChildContentMixedWithExplicitChildContent =
             new RazorDiagnosticDescriptor(
-                "BL9996",
+                $"{DiagnosticPrefix}9996",
                 () => "Unrecognized child content inside component '{0}'. The component '{0}' accepts child content through the " +
                 "following top-level items: {1}.",
                 RazorDiagnosticSeverity.Error);
@@ -215,7 +228,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidAttribute =
             new RazorDiagnosticDescriptor(
-                "BL9997",
+                $"{DiagnosticPrefix}9997",
                 () => "Unrecognized attribute '{0}' on child content element '{1}'.",
                 RazorDiagnosticSeverity.Error);
 
@@ -226,7 +239,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameter =
             new RazorDiagnosticDescriptor(
-                "BL9998",
+                $"{DiagnosticPrefix}9998",
                 () => "Invalid parameter name. The parameter name attribute '{0}' on child content element '{1}' can only include literal text.",
                 RazorDiagnosticSeverity.Error);
 
@@ -237,7 +250,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor ChildContentRepeatedParameterName =
             new RazorDiagnosticDescriptor(
-                "BL9999",
+                $"{DiagnosticPrefix}9999",
                 () => "The child content element '{0}' of component '{1}' uses the same parameter name ('{2}') as enclosing child content " +
                 "element '{3}' of component '{4}'. Specify the parameter name like: '<{0} Context=\"another_name\"> to resolve the ambiguity",
                 RazorDiagnosticSeverity.Error);
@@ -265,7 +278,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor GenericComponentMissingTypeArgument =
             new RazorDiagnosticDescriptor(
-                "BL10000",
+                $"{DiagnosticPrefix}10000",
                 () => "The component '{0}' is missing required type arguments. Specify the missing types using the attributes: {1}.",
                 RazorDiagnosticSeverity.Error);
 
@@ -282,7 +295,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor GenericComponentTypeInferenceUnderspecified =
             new RazorDiagnosticDescriptor(
-                "BL10001",
+                $"{DiagnosticPrefix}10001",
                 () => "The type of component '{0}' cannot be inferred based on the values provided. Consider specifying the type arguments " +
                     "directly using the following attributes: {1}.",
                 RazorDiagnosticSeverity.Error);
@@ -300,7 +313,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameterOnComponent =
             new RazorDiagnosticDescriptor(
-                "BL10002",
+                $"{DiagnosticPrefix}10002",
                 () => "Invalid parameter name. The parameter name attribute '{0}' on component '{1}' can only include literal text.",
                 RazorDiagnosticSeverity.Error);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 9c4a7a9f2a..1fa21843f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -14,8 +14,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     {
         public static readonly string ComponentDocumentKind = "component.1.0";
         private static readonly object BuildRenderTreeBaseCallAnnotation = new object();
-        private static readonly char[] PathSeparators = new char[] { '/', '\\' };
-        private static readonly char[] NamespaceSeparators = new char[] { '.' };
 
         /// <summary>
         /// The fallback value of the root namespace. Only used if the fallback root namespace
@@ -57,13 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             ClassDeclarationIntermediateNode @class,
             MethodDeclarationIntermediateNode method)
         {
-            var options = codeDocument.GetDocumentIntermediateNode().Options;
-            if (!TryComputeNamespaceAndClass(
-                options,
-                codeDocument.Source.FilePath,
-                codeDocument.Source.RelativePath,
-                out var computedNamespace,
-                out var computedClass))
+            if (!codeDocument.TryComputeNamespaceAndClass(out var computedNamespace, out var computedClass))
             {
                 // If we can't compute a nice namespace (no relative path) then just generate something
                 // mangled.
@@ -74,7 +66,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             if (MangleClassNames)
             {
-                computedClass = "__" + computedClass;
+                computedClass = ComponentMetadata.MangleClassName(computedClass);
             }
 
             @namespace.Content = computedNamespace;
@@ -121,59 +113,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             method.Children.Insert(0, callBase);
         }
 
-        // In general documents will have a relative path (relative to the project root).
-        // We can only really compute a nice class/namespace when we know a relative path.
-        //
-        // However all kinds of thing are possible in tools. We shouldn't barf here if the document isn't 
-        // set up correctly.
-        private bool TryComputeNamespaceAndClass(
-            RazorCodeGenerationOptions options, 
-            string filePath, 
-            string relativePath, 
-            out string @namespace, 
-            out string @class)
-        {
-            if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
-            {
-                @namespace = null;
-                @class = null;
-                return false;
-            }
-
-            var rootNamespace = options.RootNamespace;
-            if (string.IsNullOrEmpty(rootNamespace))
-            {
-                @namespace = null;
-                @class = null;
-                return false;
-            }
-
-            var builder = new StringBuilder();
-
-            // Sanitize the base namespace, but leave the dots.
-            var segments = rootNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
-            builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[0]));
-            for (var i = 1; i < segments.Length; i++)
-            {
-                builder.Append('.');
-                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
-            }
-
-            segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);
-
-            // Skip the last segment because it's the FileName.
-            for (var i = 0; i < segments.Length - 1; i++)
-            {
-                builder.Append('.');
-                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
-            }
-
-            @namespace = builder.ToString();
-            @class = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(relativePath));
-
-            return true;
-        }
-
         internal static bool IsBuildRenderTreeBaseCall(CSharpCodeIntermediateNode node)
             => node.Annotations[BuildRenderTreeBaseCallAnnotation] != null;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
index 367bca910d..2e689044de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentImportProjectFeature.cs
@@ -40,28 +40,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             var imports = new List<RazorProjectItem>()
             {
                  new VirtualProjectItem(DefaultUsingImportContent),
-                 new VirtualProjectItem(@"@addTagHelper ""*, Microsoft.AspNetCore.Components"""),
             };
 
-            // Try and infer a namespace from the project directory. We don't yet have the ability to pass
-            // the namespace through from the project.
-            if (projectItem.PhysicalPath != null && projectItem.FilePath != null)
-            {
-                // Avoiding the path-specific APIs here, we want to handle all styles of paths
-                // on all platforms
-                var trimLength = projectItem.FilePath.Length + (projectItem.FilePath.StartsWith("/") ? 0 : 1);
-                if (projectItem.PhysicalPath.Length > trimLength)
-                {
-                    var baseDirectory = projectItem.PhysicalPath.Substring(0, projectItem.PhysicalPath.Length - trimLength);
-                    var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
-                    var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
-                    if (!string.IsNullOrEmpty(baseNamespace))
-                    {
-                        imports.Add(new VirtualProjectItem($@"@addTagHelper ""*, {baseNamespace}"""));
-                    }
-                }
-            }
-
             // We add hierarchical imports second so any default directive imports can be overridden.
             imports.AddRange(GetHierarchicalImports(ProjectEngine.FileSystem, projectItem));
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index ad3a7cd44d..17966db799 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -1,11 +1,15 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     // Metadata used for Components interactions with the tag helper system
     internal static class ComponentMetadata
     {
+        private static readonly string MangledClassNamePrefix = "__generated__";
+
         // There's a bug in the 15.7 preview 1 Razor that prevents 'Kind' from being serialized
         // this affects both tooling and build. For now our workaround is to ignore 'Kind' and
         // use our own metadata entry to denote non-Component tag helpers.
@@ -13,6 +17,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly string ImportsFileName = "_Imports.razor";
 
+        public static bool IsComponentTagHelperKind(string tagHelperKind)
+        {
+            return tagHelperKind == Component.TagHelperKind ||
+                tagHelperKind == ChildContent.TagHelperKind ||
+                tagHelperKind == EventHandler.TagHelperKind ||
+                tagHelperKind == Bind.TagHelperKind ||
+                tagHelperKind == Ref.TagHelperKind;
+        }
+
+        public static string MangleClassName(string className)
+        {
+            if (string.IsNullOrEmpty(className))
+            {
+                return string.Empty;
+            }
+
+            return MangledClassNamePrefix + className;
+        }
+
+        public static bool IsMangledClass(string className)
+        {
+            if (string.IsNullOrEmpty(className))
+            {
+                return false;
+            }
+
+            return className.StartsWith(MangledClassNamePrefix, StringComparison.Ordinal);
+        }
+
         public static class Bind
         {
             public static readonly string RuntimeName = "Components.None";
@@ -68,6 +101,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public readonly static string GenericTypedKey = "Components.GenericTyped";
 
             public readonly static string TypeParameterKey = "Components.TypeParameter";
+
+            public readonly static string NameMatchKey = "Components.NameMatch";
+
+            public readonly static string FullyQualifiedNameMatch = "Components.FullyQualifiedNameMatch";
         }
 
         public static class EventHandler
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index 005da7cccd..1bbd8d8ace 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
@@ -152,6 +151,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 string.Equals(ComponentMetadata.Ref.TagHelperKind, kind);
         }
 
+        /// <summary>
+        /// Gets whether the component matches a tag with a fully qualified name.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/>.</param>
+        public static bool IsComponentFullyQualifiedNameMatch(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.Component.NameMatchKey, out var matchType) &&
+                string.Equals(ComponentMetadata.Component.FullyQualifiedNameMatch, matchType);
+        }
+
         public static string GetEventArgsType(this TagHelperDescriptor tagHelper)
         {
             if (tagHelper == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
index 6bb6d2c284..b6156641b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRazorParserOptions : RazorParserOptions
     {
-        public DefaultRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version)
+        public DefaultRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version, string fileKind)
         {
             if (directives == null)
             {
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             ParseLeadingDirectives = parseLeadingDirectives;
             Version = version;
             FeatureFlags = RazorParserFeatureFlags.Create(Version);
+            FileKind = fileKind;
         }
 
         public override bool DesignTime { get; }
@@ -30,6 +31,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override RazorLanguageVersion Version { get; }
 
+        internal override string FileKind { get; }
+
         internal override RazorParserFeatureFlags FeatureFlags { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
index 1f3deb7213..e19a4d1660 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
@@ -23,10 +23,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             FileKind = fileKind;
         }
 
-        public DefaultRazorParserOptionsBuilder(bool designTime, RazorLanguageVersion version)
+        public DefaultRazorParserOptionsBuilder(bool designTime, RazorLanguageVersion version, string fileKind)
         {
             _designTime = designTime;
             LanguageVersion = version;
+            FileKind = fileKind;
         }
 
         public override RazorConfiguration Configuration { get; }
@@ -43,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override RazorParserOptions Build()
         {
-            return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseLeadingDirectives, LanguageVersion);
+            return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseLeadingDirectives, LanguageVersion, FileKind);
         }
 
         public override void SetDesignTime(bool designTime)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs
index eecb9bd9cc..956d63ff46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsFeature.cs
@@ -11,12 +11,14 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         private readonly bool _designTime;
         private readonly RazorLanguageVersion _version;
+        private readonly string _fileKind;
         private IConfigureRazorParserOptionsFeature[] _configureOptions;
 
-        public DefaultRazorParserOptionsFeature(bool designTime, RazorLanguageVersion version)
+        public DefaultRazorParserOptionsFeature(bool designTime, RazorLanguageVersion version, string fileKind)
         {
             _designTime = designTime;
             _version = version;
+            _fileKind = fileKind;
         }
 
         protected override void OnInitialized()
@@ -26,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public RazorParserOptions GetOptions()
         {
-            var builder = new DefaultRazorParserOptionsBuilder(_designTime, _version);
+            var builder = new DefaultRazorParserOptionsBuilder(_designTime, _version, _fileKind);
             for (var i = 0; i < _configureOptions.Length; i++)
             {
                 _configureOptions[i].Configure(builder);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
index c15aaff04e..34a2d77613 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 
@@ -11,6 +12,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRazorTagHelperBinderPhase : RazorEnginePhaseBase, IRazorTagHelperBinderPhase
     {
+        private static readonly char[] NamespaceSeparators = new char[] { '.' };
+
         protected override void ExecuteCore(RazorCodeDocument codeDocument)
         {
             var syntaxTree = codeDocument.GetSyntaxTree();
@@ -33,20 +36,31 @@ namespace Microsoft.AspNetCore.Razor.Language
             //
             // The imports come logically before the main razor file and are in the order they
             // should be processed.
-            var visitor = new DirectiveVisitor(descriptors);
+            DirectiveVisitor visitor = null;
+            if (FileKinds.IsComponent(codeDocument.GetFileKind()))
+            {
+                codeDocument.TryComputeNamespaceAndClass(out var currentNamespace, out var _);
+                visitor = new ComponentDirectiveVisitor(codeDocument.Source.FilePath, descriptors, currentNamespace);
+            }
+            else
+            {
+                visitor = new TagHelperDirectiveVisitor(descriptors);
+            }
             var imports = codeDocument.GetImportSyntaxTrees();
             if (imports != null)
             {
                 for (var i = 0; i < imports.Count; i++)
                 {
                     var import = imports[i];
-                    visitor.Visit(import.Root);
+                    visitor.Visit(import);
                 }
             }
 
-            visitor.Visit(syntaxTree.Root);
+            visitor.Visit(syntaxTree);
 
+            // This will always be null for a component document.
             var tagHelperPrefix = visitor.TagHelperPrefix;
+
             descriptors = visitor.Matches.ToArray();
 
             var context = TagHelperDocumentContext.Create(tagHelperPrefix, descriptors);
@@ -86,20 +100,38 @@ namespace Microsoft.AspNetCore.Razor.Language
             return string.Equals(descriptor.Name, typePattern, StringComparison.Ordinal);
         }
 
-        internal class DirectiveVisitor : SyntaxRewriter
+        
+
+        internal abstract class DirectiveVisitor : SyntaxWalker
+        {
+            public abstract HashSet<TagHelperDescriptor> Matches { get; }
+
+            public abstract string TagHelperPrefix { get; }
+
+            public abstract void Visit(RazorSyntaxTree tree);
+        }
+
+        internal class TagHelperDirectiveVisitor : DirectiveVisitor
         {
             private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
+            private string _tagHelperPrefix;
 
-            public DirectiveVisitor(IReadOnlyList<TagHelperDescriptor> tagHelpers)
+            public TagHelperDirectiveVisitor(IReadOnlyList<TagHelperDescriptor> tagHelpers)
             {
-                _tagHelpers = tagHelpers;
+                // We don't want to consider components in a view document.
+                _tagHelpers = tagHelpers.Where(t => !ComponentMetadata.IsComponentTagHelperKind(t.Kind)).ToList();
             }
 
-            public string TagHelperPrefix { get; private set; }
+            public override string TagHelperPrefix => _tagHelperPrefix;
 
-            public HashSet<TagHelperDescriptor> Matches { get; } = new HashSet<TagHelperDescriptor>();
+            public override HashSet<TagHelperDescriptor> Matches { get; } = new HashSet<TagHelperDescriptor>();
 
-            public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+            public override void Visit(RazorSyntaxTree tree)
+            {
+                Visit(tree.Root);
+            }
+
+            public override void VisitRazorDirective(RazorDirectiveSyntax node)
             {
                 var descendantLiterals = node.DescendantNodes();
                 foreach (var child in descendantLiterals)
@@ -167,12 +199,10 @@ namespace Microsoft.AspNetCore.Razor.Language
                         if (!string.IsNullOrEmpty(tagHelperPrefix.DirectiveText))
                         {
                             // We only expect to see a single one of these per file, but that's enforced at another level.
-                            TagHelperPrefix = tagHelperPrefix.DirectiveText;
+                            _tagHelperPrefix = tagHelperPrefix.DirectiveText;
                         }
                     }
                 }
-
-                return base.VisitRazorDirective(node);
             }
 
             private bool AssemblyContainsTagHelpers(string assemblyName, IReadOnlyList<TagHelperDescriptor> tagHelpers)
@@ -188,5 +218,231 @@ namespace Microsoft.AspNetCore.Razor.Language
                 return false;
             }
         }
+
+        internal class ComponentDirectiveVisitor : DirectiveVisitor
+        {
+            private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
+            private string _filePath;
+            private RazorSourceDocument _source;
+
+            public ComponentDirectiveVisitor(string filePath, IReadOnlyList<TagHelperDescriptor> tagHelpers, string currentNamespace)
+            {
+                _filePath = filePath;
+
+                // We don't want to consider non-component tag helpers in a component document.
+                _tagHelpers = tagHelpers.Where(t => ComponentMetadata.IsComponentTagHelperKind(t.Kind) && !IsTagHelperFromMangledClass(t)).ToList();
+
+                for (var i = 0; i < _tagHelpers.Count; i++)
+                {
+                    var tagHelper = _tagHelpers[i];
+                    if (tagHelper.IsComponentFullyQualifiedNameMatch())
+                    {
+                        // If the component descriptor matches for a fully qualified name, using directives shouldn't matter.
+                        Matches.Add(tagHelper);
+                        continue;
+                    }
+
+                    var typeName = tagHelper.GetTypeName();
+                    if (tagHelper.IsChildContentTagHelper())
+                    {
+                        // If this is a child content tag helper, we want to add it if it's original type is in scope.
+                        // E.g, if the type name is `Test.MyComponent.ChildContent`, we want to add it if `Test.MyComponent` is in scope.
+                        TrySplitNamespaceAndType(typeName, out typeName, out var _);
+                    }
+
+                    if (currentNamespace != null && IsTypeInScope(typeName, currentNamespace))
+                    {
+                        // Also, if the type is already in scope of the document's namespace, using isn't necessary.
+                        Matches.Add(tagHelper);
+                    }
+                }
+            }
+
+            public override HashSet<TagHelperDescriptor> Matches { get; } = new HashSet<TagHelperDescriptor>();
+
+            // There is no support for tag helper prefix in component documents.
+            public override string TagHelperPrefix => null;
+
+            public override void Visit(RazorSyntaxTree tree)
+            {
+                _source = tree.Source;
+                Visit(tree.Root);
+            }
+
+            public override void VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                var descendantLiterals = node.DescendantNodes();
+                foreach (var child in descendantLiterals)
+                {
+                    if (!(child is CSharpStatementLiteralSyntax literal))
+                    {
+                        continue;
+                    }
+
+                    var context = literal.GetSpanContext();
+                    if (context == null)
+                    {
+                        // We can't find a chunk generator.
+                        continue;
+                    }
+                    else if (context.ChunkGenerator is AddTagHelperChunkGenerator addTagHelper)
+                    {
+                        // Make sure this node exists in the file we're parsing and not in its imports.
+                        if (_filePath.Equals(_source.FilePath, StringComparison.Ordinal))
+                        {
+                            addTagHelper.Diagnostics.Add(
+                                ComponentDiagnosticFactory.Create_UnsupportedTagHelperDirective(node.GetSourceSpan(_source)));
+                        }
+                    }
+                    else if (context.ChunkGenerator is RemoveTagHelperChunkGenerator removeTagHelper)
+                    {
+                        // Make sure this node exists in the file we're parsing and not in its imports.
+                        if (_filePath.Equals(_source.FilePath, StringComparison.Ordinal))
+                        {
+                            removeTagHelper.Diagnostics.Add(
+                                ComponentDiagnosticFactory.Create_UnsupportedTagHelperDirective(node.GetSourceSpan(_source)));
+                        }
+                    }
+                    else if (context.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator tagHelperPrefix)
+                    {
+                        // Make sure this node exists in the file we're parsing and not in its imports.
+                        if (_filePath.Equals(_source.FilePath, StringComparison.Ordinal))
+                        {
+                            tagHelperPrefix.Diagnostics.Add(
+                                ComponentDiagnosticFactory.Create_UnsupportedTagHelperDirective(node.GetSourceSpan(_source)));
+                        }
+                    }
+                    else if (context.ChunkGenerator is AddImportChunkGenerator usingStatement && !usingStatement.IsStatic)
+                    {
+                        // Get the namespace from the using statement.
+                        var @namespace = usingStatement.ParsedNamespace;
+                        if (@namespace.Contains('='))
+                        {
+                            // We don't support usings with alias.
+                            continue;
+                        }
+
+                        for (var i = 0; i < _tagHelpers.Count; i++)
+                        {
+                            var tagHelper = _tagHelpers[i];
+                            if (tagHelper.IsComponentFullyQualifiedNameMatch())
+                            {
+                                // We've already added these to our list of matches.
+                                continue;
+                            }
+
+                            var typeName = tagHelper.GetTypeName();
+                            if (typeName != null && IsTypeInNamespace(typeName, @namespace))
+                            {
+                                // If the type is at the top-level or if the type's namespace matches the using's namespace, add it.
+                                Matches.Add(tagHelper);
+                            }
+                        }
+                    }
+                }
+            }
+
+            internal static bool IsTypeInNamespace(string typeName, string @namespace)
+            {
+                if (!TrySplitNamespaceAndType(typeName, out var typeNamespace, out var _) || typeNamespace == string.Empty)
+                {
+                    // Either the typeName is not the full type name or this type is at the top level.
+                    return true;
+                }
+
+                return typeNamespace.Equals(@namespace, StringComparison.Ordinal);
+            }
+
+            // Check if the given type is already in scope given the namespace of the current document.
+            // E.g,
+            // If the namespace of the document is `MyComponents.Components.Shared`,
+            // then the types `MyComponents.FooComponent`, `MyComponents.Components.BarComponent`, `MyComponents.Components.Shared.BazComponent` are all in scope.
+            // Whereas `MyComponents.SomethingElse.OtherComponent` is not in scope.
+            internal static bool IsTypeInScope(string typeName, string currentNamespace)
+            {
+                if (!TrySplitNamespaceAndType(typeName, out var typeNamespace, out var _) || typeNamespace == string.Empty)
+                {
+                    // Either the typeName is not the full type name or this type is at the top level.
+                    return true;
+                }
+
+                var typeNamespaceSegments = typeNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+                var currentNamespaceSegments = currentNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+                if (typeNamespaceSegments.Length > currentNamespaceSegments.Length)
+                {
+                    return false;
+                }
+
+                for (var i = 0; i < typeNamespaceSegments.Length; i++)
+                {
+                    if (!typeNamespaceSegments[i].Equals(currentNamespaceSegments[i], StringComparison.Ordinal))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            // We need to filter out the duplicate tag helper descriptors that come from the 
+            // open file in the editor. We mangle the class name for its generated code, so using that here to filter these out.
+            internal static bool IsTagHelperFromMangledClass(TagHelperDescriptor tagHelper)
+            {
+                if (!TrySplitNamespaceAndType(tagHelper.GetTypeName(), out var _, out var className))
+                {
+                    return false;
+                }
+
+                return ComponentMetadata.IsMangledClass(className);
+            }
+
+            // Internal for testing.
+            internal static bool TrySplitNamespaceAndType(string fullTypeName, out string @namespace, out string typeName)
+            {
+                @namespace = string.Empty;
+                typeName = string.Empty;
+
+                if (string.IsNullOrEmpty(fullTypeName))
+                {
+                    return false;
+                }
+
+                var nestingLevel = 0;
+                var splitLocation = -1;
+                for (var i = fullTypeName.Length - 1; i >= 0; i--)
+                {
+                    var c = fullTypeName[i];
+                    if (c == Type.Delimiter && nestingLevel == 0)
+                    {
+                        splitLocation = i;
+                        break;
+                    }
+                    else if (c == '>')
+                    {
+                        nestingLevel++;
+                    }
+                    else if (c == '<')
+                    {
+                        nestingLevel--;
+                    }
+                }
+
+                if (splitLocation == -1)
+                {
+                    typeName = fullTypeName;
+                    return true;
+                }
+
+                @namespace = fullTypeName.Substring(0, splitLocation);
+
+                var typeNameStartLocation = splitLocation + 1;
+                if (typeNameStartLocation < fullTypeName.Length)
+                {
+                    typeName = fullTypeName.Substring(typeNameStartLocation, fullTypeName.Length - typeNameStartLocation);
+                }
+
+                return true;
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs
index 4cee1abe3e..bb585eaa53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/AddImportChunkGenerator.cs
@@ -7,13 +7,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class AddImportChunkGenerator : SpanChunkGenerator
     {
-        public AddImportChunkGenerator(string ns)
+        public AddImportChunkGenerator(string usingContent, string parsedNamespace, bool isStatic)
         {
-            Namespace = ns;
+            Namespace = usingContent;
+            ParsedNamespace = parsedNamespace;
+            IsStatic = isStatic;
         }
 
         public string Namespace { get; }
 
+        public string ParsedNamespace { get; }
+
+        public bool IsStatic { get; }
+
         public override string ToString()
         {
             return "Import:" + Namespace + ";";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index a6e048f189..6852e76534 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -2066,11 +2066,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 var directiveBuilder = pooledResult.Builder;
                 Assert(CSharpKeyword.Using);
                 AcceptAndMoveNext();
+                var isStatic = false;
+                var nonNamespaceTokenCount = TokenBuilder.Count;
                 AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
                 var start = CurrentStart;
                 if (At(SyntaxKind.Identifier))
                 {
                     // non-static using
+                    nonNamespaceTokenCount = TokenBuilder.Count;
                     TryParseNamespaceOrTypeName(directiveBuilder);
                     var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
                     if (At(SyntaxKind.Assign))
@@ -2094,15 +2097,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 else if (At(CSharpKeyword.Static))
                 {
                     // static using
+                    isStatic = true;
                     AcceptAndMoveNext();
                     AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    nonNamespaceTokenCount = TokenBuilder.Count;
                     TryParseNamespaceOrTypeName(directiveBuilder);
                 }
 
+                var usingStatementTokens = TokenBuilder.ToList().Nodes;
+                var usingContentTokens = usingStatementTokens.Skip(1);
+                var parsedNamespaceTokens = usingStatementTokens
+                    .Skip(nonNamespaceTokenCount)
+                    .Where(s => s.Kind != SyntaxKind.CSharpComment && s.Kind != SyntaxKind.Whitespace && s.Kind != SyntaxKind.NewLine);
+
                 SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline;
-                SpanContext.ChunkGenerator = new AddImportChunkGenerator(new LocationTagged<string>(
-                    string.Concat(TokenBuilder.ToList().Nodes.Skip(1).Select(s => s.Content)),
-                    start));
+                SpanContext.ChunkGenerator = new AddImportChunkGenerator(
+                    string.Concat(usingContentTokens.Select(s => s.Content)),
+                    string.Concat(parsedNamespaceTokens.Select(s => s.Content)),
+                    isStatic);
 
                 // Optional ";"
                 if (EnsureCurrent())
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
index 5d31bfcf73..e1cd262573 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -3,12 +3,17 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     public static class RazorCodeDocumentExtensions
     {
+        private static readonly char[] PathSeparators = new char[] { '/', '\\' };
+        private static readonly char[] NamespaceSeparators = new char[] { '.' };
+
         public static TagHelperDocumentContext GetTagHelperContext(this RazorCodeDocument document)
         {
             if (document == null)
@@ -189,6 +194,71 @@ namespace Microsoft.AspNetCore.Razor.Language
             document.Items[typeof(FileKinds)] = fileKind;
         }
 
+        // In general documents will have a relative path (relative to the project root).
+        // We can only really compute a nice class/namespace when we know a relative path.
+        //
+        // However all kinds of thing are possible in tools. We shouldn't barf here if the document isn't 
+        // set up correctly.
+        internal static bool TryComputeNamespaceAndClass(this RazorCodeDocument document, out string @namespace, out string @class)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var filePath = document.Source.FilePath;
+            var relativePath = document.Source.RelativePath;
+            if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
+            {
+                @namespace = null;
+                @class = null;
+                return false;
+            }
+
+            filePath = NormalizePath(filePath);
+            relativePath = NormalizePath(relativePath);
+            var options = document.GetCodeGenerationOptions() ?? document.GetDocumentIntermediateNode()?.Options;
+            var rootNamespace = options?.RootNamespace;
+            if (string.IsNullOrEmpty(rootNamespace))
+            {
+                @namespace = null;
+                @class = null;
+                return false;
+            }
+
+            var builder = new StringBuilder();
+
+            // Sanitize the base namespace, but leave the dots.
+            var segments = rootNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+            builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[0]));
+            for (var i = 1; i < segments.Length; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+            // Skip the last segment because it's the FileName.
+            for (var i = 0; i < segments.Length - 1; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            @namespace = builder.ToString();
+            @class = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(relativePath));
+
+            return true;
+        }
+
+        private static string NormalizePath(string path)
+        {
+            path = path.Replace('\\', '/');
+
+            return path;
+        }
+
         private class ImportSyntaxTreesHolder
         {
             public ImportSyntaxTreesHolder(IReadOnlyList<RazorSyntaxTree> syntaxTrees)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
index 4ed9ae75e6..cb8a10389a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
@@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         private static void AddDefaultRuntimeFeatures(RazorConfiguration configuration, ICollection<IRazorEngineFeature> features)
         {
             // Configure options
-            features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: configuration.LanguageVersion));
+            features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: configuration.LanguageVersion, fileKind: null));
             features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
 
             // Intermediate Node Passes
@@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         private static void AddDefaultDesignTimeFeatures(RazorConfiguration configuration, ICollection<IRazorEngineFeature> features)
         {
             // Configure options
-            features.Add(new DefaultRazorParserOptionsFeature(designTime: true, version: configuration.LanguageVersion));
+            features.Add(new DefaultRazorParserOptionsFeature(designTime: true, version: configuration.LanguageVersion, fileKind: null));
             features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: true));
             features.Add(new SuppressChecksumOptionsFeature());
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
index 3438cdfbe3..cb0781b666 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
@@ -14,17 +14,23 @@ namespace Microsoft.AspNetCore.Razor.Language
                 Array.Empty<DirectiveDescriptor>(),
                 designTime: false,
                 parseLeadingDirectives: false,
-                version: RazorLanguageVersion.Latest);
+                version: RazorLanguageVersion.Latest,
+                fileKind: null);
         }
 
         public static RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure)
+        {
+            return Create(configure, fileKind: null);
+        }
+
+        public static RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure, string fileKind)
         {
             if (configure == null)
             {
                 throw new ArgumentNullException(nameof(configure));
             }
 
-            var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: RazorLanguageVersion.Latest);
+            var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: RazorLanguageVersion.Latest, fileKind);
             configure(builder);
             var options = builder.Build();
 
@@ -32,13 +38,18 @@ namespace Microsoft.AspNetCore.Razor.Language
         }
 
         public static RazorParserOptions CreateDesignTime(Action<RazorParserOptionsBuilder> configure)
+        {
+            return CreateDesignTime(configure, fileKind: null);
+        }
+
+        public static RazorParserOptions CreateDesignTime(Action<RazorParserOptionsBuilder> configure, string fileKind)
         {
             if (configure == null)
             {
                 throw new ArgumentNullException(nameof(configure));
             }
 
-            var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: RazorLanguageVersion.Latest);
+            var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: RazorLanguageVersion.Latest, fileKind);
             configure(builder);
             var options = builder.Build();
 
@@ -61,6 +72,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public virtual RazorLanguageVersion Version { get; } = RazorLanguageVersion.Latest;
 
+        internal virtual string FileKind { get; }
+
         internal virtual RazorParserFeatureFlags FeatureFlags { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index 39afa6b0ae..f2269e692e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             // Legacy options features
             //
             // These features are obsolete as of 2.1. Our code will resolve this but not invoke them.
-            features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Version_2_0));
+            features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Version_2_0, fileKind: null));
             features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
 
             // Syntax Tree passes
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index e3c28d488b..cd1b335103 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -445,6 +445,11 @@ namespace Microsoft.CodeAnalysis.Razor
                         attribute.SetPropertyName(valueAttribute.GetPropertyName());
                     });
 
+                    if (tagHelper.IsComponentFullyQualifiedNameMatch())
+                    {
+                        builder.Metadata[ComponentMetadata.Component.NameMatchKey] = ComponentMetadata.Component.FullyQualifiedNameMatch;
+                    }
+
                     results.Add(builder.Build());
                 }
             }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index f6f9bca9ab..57b64c6abc 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -63,13 +63,20 @@ namespace Microsoft.CodeAnalysis.Razor
             for (var i = 0; i < types.Count; i++)
             {
                 var type = types[i];
-                var descriptor = CreateDescriptor(symbols, type);
-                context.Results.Add(descriptor);
 
-                foreach (var childContent in descriptor.GetChildContentProperties())
+                // Components have very simple matching rules.
+                // 1. The type name (short) matches the tag name.
+                // 2. The fully qualified name matches the tag name.
+                var shortNameMatchingDescriptor = CreateShortNameMatchingDescriptor(symbols, type);
+                context.Results.Add(shortNameMatchingDescriptor);
+                var fullyQualifiedNameMatchingDescriptor = CreateFullyQualifiedNameMatchingDescriptor(symbols, type);
+                context.Results.Add(fullyQualifiedNameMatchingDescriptor);
+
+                foreach (var childContent in shortNameMatchingDescriptor.GetChildContentProperties())
                 {
                     // Synthesize a separate tag helper for each child content property that's declared.
-                    context.Results.Add(CreateChildContentDescriptor(symbols, descriptor, childContent));
+                    context.Results.Add(CreateChildContentDescriptor(symbols, shortNameMatchingDescriptor, childContent));
+                    context.Results.Add(CreateChildContentDescriptor(symbols, fullyQualifiedNameMatchingDescriptor, childContent));
                 }
             }
         }
@@ -81,7 +88,26 @@ namespace Microsoft.CodeAnalysis.Razor
             return compilation.WithOptions(newCompilationOptions);
         }
 
-        private TagHelperDescriptor CreateDescriptor(ComponentSymbols symbols, INamedTypeSymbol type)
+        private TagHelperDescriptor CreateShortNameMatchingDescriptor(ComponentSymbols symbols, INamedTypeSymbol type)
+        {
+            var builder = CreateDescriptorBuilder(symbols, type);
+            builder.TagMatchingRule(r => r.TagName = type.Name);
+
+            return builder.Build();
+        }
+
+        private TagHelperDescriptor CreateFullyQualifiedNameMatchingDescriptor(ComponentSymbols symbols, INamedTypeSymbol type)
+        {
+            var builder = CreateDescriptorBuilder(symbols, type);
+            var containingNamespace = type.ContainingNamespace.ToDisplayString();
+            var fullName = $"{containingNamespace}.{type.Name}";
+            builder.TagMatchingRule(r => r.TagName = fullName);
+            builder.Metadata[ComponentMetadata.Component.NameMatchKey] = ComponentMetadata.Component.FullyQualifiedNameMatch;
+
+            return builder.Build();
+        }
+
+        private TagHelperDescriptorBuilder CreateDescriptorBuilder(ComponentSymbols symbols, INamedTypeSymbol type)
         {
             var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
             var assemblyName = type.ContainingAssembly.Identity.Name;
@@ -113,9 +139,6 @@ namespace Microsoft.CodeAnalysis.Razor
                 builder.Documentation = xml;
             }
 
-            // Components have very simple matching rules. The type name (short) matches the tag name.
-            builder.TagMatchingRule(r => r.TagName = type.Name);
-
             foreach (var property in GetProperties(symbols, type))
             {
                 if (property.kind == PropertyKind.Ignored)
@@ -135,8 +158,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 CreateContextParameter(builder, childContentName: null);
             }
 
-            var descriptor = builder.Build();
-            return descriptor;
+            return builder;
         }
 
         private void CreateProperty(TagHelperDescriptorBuilder builder, IPropertySymbol property, PropertyKind kind)
@@ -270,6 +292,11 @@ namespace Microsoft.CodeAnalysis.Razor
                 CreateContextParameter(builder, attribute.Name);
             }
 
+            if (component.IsComponentFullyQualifiedNameMatch())
+            {
+                builder.Metadata[ComponentMetadata.Component.NameMatchKey] = ComponentMetadata.Component.FullyQualifiedNameMatch;
+            }
+
             var descriptor = builder.Build();
 
             return descriptor;
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
index 5896f2d333..d8fd1bcbeb 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
@@ -1,18 +1,18 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.Extensions.DependencyModel;
+using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public abstract class BaseTagHelperDescriptorProviderTest
+    public abstract class TagHelperDescriptorProviderTestBase
     {
-        static BaseTagHelperDescriptorProviderTest()
+        static TagHelperDescriptorProviderTestBase()
         {
             BaseCompilation = TestCompilation.Create(typeof(ComponentTagHelperDescriptorProviderTest).Assembly);
             CSharpParseOptions = new CSharpParseOptions(LanguageVersion.CSharp7_3);
@@ -39,5 +39,28 @@ namespace Microsoft.CodeAnalysis.Razor
                 .ToArray();
         }
 
+        protected static TagHelperDescriptor[] AssertAndExcludeFullyQualifiedNameMatchComponents(
+            TagHelperDescriptor[] components,
+            int expectedCount)
+        {
+            var componentLookup = new Dictionary<string, List<TagHelperDescriptor>>();
+            var fullyQualifiedNameMatchComponents = components.Where(c => c.IsComponentFullyQualifiedNameMatch()).ToArray();
+            Assert.Equal(expectedCount, fullyQualifiedNameMatchComponents.Length);
+
+            var shortNameMatchComponents = components.Where(c => !c.IsComponentFullyQualifiedNameMatch()).ToArray();
+
+            // For every fully qualified name component, we want to make sure we have a corresponding short name component.
+            foreach (var fullNameComponent in fullyQualifiedNameMatchComponents)
+            {
+                Assert.Contains(shortNameMatchComponents, component =>
+                {
+                    return component.Name == fullNameComponent.Name &&
+                        component.Kind == fullNameComponent.Kind &&
+                        component.BoundAttributes.SequenceEqual(fullNameComponent.BoundAttributes, BoundAttributeDescriptorComparer.Default);
+                });
+            }
+
+            return shortNameMatchComponents;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 8864268033..bb8025c2bc 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -8,7 +8,7 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public class BindTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    public class BindTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTestBase
     {
         [Fact]
         public void Execute_FindsBindTagHelperOnComponentType_Delegate_CreatesDescriptor()
@@ -55,6 +55,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 1);
             var bind = Assert.Single(matches);
 
             // These are features Bind Tags Helpers don't use. Verifying them once here and
@@ -170,6 +171,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 1);
             var bind = Assert.Single(matches);
 
             // These are features Bind Tags Helpers don't use. Verifying them once here and
@@ -283,6 +285,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
             Assert.Empty(matches);
         }
 
@@ -314,6 +317,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
             var bind = Assert.Single(matches);
 
             // These are features Bind Tags Helpers don't use. Verifying them once here and
@@ -448,6 +452,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
             var bind = Assert.Single(matches);
 
             Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
@@ -502,6 +507,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
             var bind = Assert.Single(matches);
 
             Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
@@ -557,6 +563,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
             var bind = Assert.Single(matches);
 
             Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
@@ -624,6 +631,7 @@ namespace Test
 
             // Assert
             var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
             var bind = Assert.Single(matches);
 
             Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 8592486139..ecb2ec6939 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -8,7 +8,7 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public class ComponentTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    public class ComponentTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTestBase
     {
         [Fact]
         public void Execute_FindsIComponentType_CreatesDescriptor()
@@ -45,6 +45,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             // These are features Components don't use. Verifying them once here and
@@ -159,6 +160,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -222,6 +224,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -263,6 +266,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -315,6 +319,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -361,6 +366,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -424,6 +430,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -498,6 +505,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -547,6 +555,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -608,6 +617,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -657,6 +667,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -711,6 +722,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -773,6 +785,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -829,6 +842,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -903,6 +917,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -974,6 +989,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -1055,6 +1071,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -1136,6 +1153,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -1221,6 +1239,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 2);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -1306,6 +1325,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 4);
             var component = Assert.Single(components, c => c.IsComponentTagHelper());
 
             Assert.Equal("TestAssembly", component.AssemblyName);
@@ -1397,6 +1417,7 @@ namespace Test
 
             // Assert
             var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
             var component = Assert.Single(components);
 
             Assert.Equal("TestAssembly", component.AssemblyName);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index 86d045195b..19e2e6555d 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public class EventHandlerTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    public class EventHandlerTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTestBase
     {
         [Fact]
         public void Execute_EventHandler_CreatesDescriptor()
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index 349f0f5cee..fa091512b5 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -8,7 +8,7 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public class RefTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest
+    public class RefTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTestBase
     {
         [Fact]
         public void Execute_CreatesDescriptor()

From 1d53925b8ed0beca515c77acdbef7e33db659cf0 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 22 Mar 2019 14:22:12 -0700
Subject: [PATCH 112/337] Fixed generic components with fully qualified names
 (dotnet/aspnetcore-tooling#356)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b7392f1f844e41ea3fdce4f2bcc632b407b2200e
---
 .../src/CSharpIdentifier.cs                                  | 5 +++++
 .../src/CSharpIdentifier.cs                                  | 5 +++++
 .../src/CSharpIdentifier.cs                                  | 5 +++++
 .../src/Components/ComponentGenericTypePass.cs               | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs
index 4e34345903..a7571910d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/CSharpIdentifier.cs
@@ -53,6 +53,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 
         public static string SanitizeClassName(string inputName)
         {
+            if (string.IsNullOrEmpty(inputName))
+            {
+                return inputName;
+            }
+
             if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
             {
                 inputName = "_" + inputName;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs
index 77a5e8f54e..28e08063e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/CSharpIdentifier.cs
@@ -53,6 +53,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
         public static string SanitizeClassName(string inputName)
         {
+            if (string.IsNullOrEmpty(inputName))
+            {
+                return inputName;
+            }
+
             if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
             {
                 inputName = "_" + inputName;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs
index 1ec6188aed..b5904e6f1d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CSharpIdentifier.cs
@@ -35,6 +35,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public static string SanitizeIdentifier(string inputName)
         {
+            if (string.IsNullOrEmpty(inputName))
+            {
+                return inputName;
+            }
+
             if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
             {
                 inputName = "_" + inputName;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index 62ee1a8980..ee92d484a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -275,7 +275,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                     // Method name is generated and guaranteed not to collide, since it's unique for each
                     // component call site.
-                    MethodName = $"Create{node.TagName}_{_id++}",
+                    MethodName = $"Create{CSharpIdentifier.SanitizeIdentifier(node.TagName)}_{_id++}",
                     FullTypeName = @namespace + ".TypeInference",
                 };
 

From 31e916cdfdf066df7306fb26ebd7ef5fa0a0a517 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 23 Mar 2019 14:05:21 -0700
Subject: [PATCH 113/337] Add .razor files to UpToDateCheckInput
 (dotnet/aspnetcore-tooling#359)

Fixes https://github.com/aspnet/AspNetCore/issues/8181\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/da168188b40e104ef2f346e5069cf4620afa7fa4
---
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index d4771c2c3a..f1ac38844b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -299,6 +299,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <UpToDateCheckInput Condition="'$(RazorCompileOnBuild)'=='true'" Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
 
+    <!--
+      Add all .razor files to UpToDateCheckInput. Component compilation is not controlled by RazorCompileOnBuild,
+      which is why this itemgroup is unconditional.
+    -->
+    <UpToDateCheckInput Include="@(Content->WithMetadataValue('Extension', '.razor'))" />
+
     <!--
       Add Razor output files to UpToDateCheckBuilt - a collection of files used by FastUpToDateCheck to determine
       if any of the project's outputs have changed.

From f33e1fca532a881351c39199bdcedf4c0d17cec1 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 19 Mar 2019 11:24:56 -0700
Subject: [PATCH 114/337] Enforce nullability for user code.

- Expanded the `ProjectWorkspaceStateGenerator` to extract the C# language version when building the `ProjectWorkspaceState`. This approach enables all platforms to get nullability support without any changes (as long as they support `ProjectWorkspaceState`, which they do). Also, Roslyn suggested that we avoid dealing with LangVersion directly because there are several factors that impact its "effective" value on a project when run in tooling.
- Updated the `LinePragma` code generation to include `#nullable restore` and `#nullable disable` lines to allow for project restored nullability state for user code.
- Added a new `RazorProjectEngineBuilderExtensions` class that adds Roslyn specific project engine modifications. In this case it allows us to set the C# language version for a project engine and configure underlying features accordingly.
- Added a `SuppressNullabilityEnforcement` flag that only turns on if C# < 8 is specified.
- Updated LiveShare, VS4Mac and RazorGenerate to understand CSharpLanguageVersion.
- Added a single test output to show the change.

dotnet/aspnetcore-tooling#5092
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/1df8128b877ac9ffec5c7547e84927b0ecbe8c16
---
 .../src/InjectTargetExtension.cs              |  2 +-
 .../src/InjectTargetExtension.cs              |  2 +-
 .../src/InjectTargetExtension.cs              |  2 +-
 .../CodeGeneration/CodeWriterExtensions.cs    | 22 ++++-
 .../CodeGeneration/DesignTimeNodeWriter.cs    | 10 +--
 .../src/CodeGeneration/RuntimeNodeWriter.cs   | 10 +--
 .../ComponentDesignTimeNodeWriter.cs          | 10 +--
 .../Components/ComponentRuntimeNodeWriter.cs  |  2 +-
 .../src/DefaultRazorCodeGenerationOptions.cs  |  6 +-
 ...efaultRazorCodeGenerationOptionsBuilder.cs |  5 +-
 .../DefaultTagHelperTargetExtension.cs        |  4 +-
 .../DesignTimeDirectiveTargetExtension.cs     | 10 +--
 .../src/RazorCodeGenerationOptions.cs         | 11 ++-
 .../src/RazorCodeGenerationOptionsBuilder.cs  |  5 ++
 .../src/GenerateCommand.cs                    | 24 +++++-
 .../RazorProjectEngineBuilderExtensions.cs    | 85 +++++++++++++++++++
 .../src/RazorGenerate.cs                      | 26 ++++--
 ...osoft.NET.Sdk.Razor.CodeGeneration.targets |  1 +
 .../Microsoft.NET.Sdk.Razor.Component.targets |  1 +
 19 files changed, 195 insertions(+), 43 deletions(-)
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs
index 23effb4081..d64023ade7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectTargetExtension.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 
             if (node.Source.HasValue)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     context.CodeWriter
                         .WriteLine(RazorInjectAttribute)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs
index 1660b84d6d..d2723ba99d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectTargetExtension.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
             if (node.Source.HasValue)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     context.CodeWriter
                         .WriteLine(RazorInjectAttribute)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs
index 9569cca41f..d416d3aa0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/InjectTargetExtension.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             if (node.Source.HasValue)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     context.CodeWriter
                         .WriteLine(RazorInjectAttribute)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
index f15acdeaf6..dedecfda82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -440,7 +440,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             return new CSharpCodeWritingScope(writer);
         }
 
-        public static IDisposable BuildLinePragma(this CodeWriter writer, SourceSpan? span)
+        public static IDisposable BuildLinePragma(this CodeWriter writer, SourceSpan? span, CodeRenderingContext context)
         {
             if (string.IsNullOrEmpty(span?.FilePath))
             {
@@ -448,7 +448,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 return NullDisposable.Default;
             }
 
-            return new LinePragmaWriter(writer, span.Value);
+            return new LinePragmaWriter(writer, span.Value, context.Options);
         }
 
         private static void WriteVerbatimStringLiteral(CodeWriter writer, string literal)
@@ -596,9 +596,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
         private class LinePragmaWriter : IDisposable
         {
             private readonly CodeWriter _writer;
+            private readonly RazorCodeGenerationOptions _codeGenerationOptions;
             private readonly int _startIndent;
 
-            public LinePragmaWriter(CodeWriter writer, SourceSpan span)
+            public LinePragmaWriter(
+                CodeWriter writer, 
+                SourceSpan span,
+                RazorCodeGenerationOptions codeGenerationOptions)
             {
                 if (writer == null)
                 {
@@ -606,8 +610,15 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 }
 
                 _writer = writer;
+                _codeGenerationOptions = codeGenerationOptions;
                 _startIndent = _writer.CurrentIndent;
                 _writer.CurrentIndent = 0;
+
+                if (!_codeGenerationOptions.SuppressNullabilityEnforcement)
+                {
+                    _writer.WriteLine("#nullable restore");
+                }
+
                 WriteLineNumberDirective(writer, span);
             }
 
@@ -630,6 +641,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                     .WriteLine("#line default")
                     .WriteLine("#line hidden");
 
+                if (!_codeGenerationOptions.SuppressNullabilityEnforcement)
+                {
+                    _writer.WriteLine("#nullable disable");
+                }
+
                 _writer.CurrentIndent = _startIndent;
             }
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs
index d937c6f626..9bf56e2eec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DesignTimeNodeWriter.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
         {
             if (node.Source.HasValue)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     context.AddSourceMappingFor(node);
                     context.CodeWriter.WriteUsing(node.Content);
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
 
             if (node.Source != null)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     var offset = DesignTimeDirectivePass.DesignTimeVariable.Length + " = ".Length;
                     context.CodeWriter.WritePadding(offset, node.Source, context);
@@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             IDisposable linePragmaScope = null;
             if (node.Source != null)
             {
-                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value, context);
 
                 context.CodeWriter.WritePadding(0, node.Source.Value, context);
             }
@@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             var firstChild = node.Children[0];
             if (firstChild.Source != null)
             {
-                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value, context))
                 {
                     var offset = DesignTimeDirectivePass.DesignTimeVariable.Length + " = ".Length;
                     context.CodeWriter.WritePadding(offset, firstChild.Source, context);
@@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                     {
                         if (!isWhitespaceStatement)
                         {
-                            linePragmaScope = context.CodeWriter.BuildLinePragma(token.Source.Value);
+                            linePragmaScope = context.CodeWriter.BuildLinePragma(token.Source.Value, context);
                         }
 
                         context.CodeWriter.WritePadding(0, token.Source.Value, context);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs
index f913a53fc4..9d4561e84d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
         {
             if (node.Source.HasValue)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     context.CodeWriter.WriteUsing(node.Content);
                 }
@@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             IDisposable linePragmaScope = null;
             if (node.Source != null)
             {
-                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value, context);
                 context.CodeWriter.WritePadding(WriteCSharpExpressionMethod.Length + 1, node.Source, context);
             }
 
@@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             IDisposable linePragmaScope = null;
             if (node.Source != null)
             {
-                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value, context);
                 context.CodeWriter.WritePadding(0, node.Source.Value, context);
             }
 
@@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
 
         public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node)
         {
-            using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+            using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
             {
                 var prefixLocation = node.Source.Value.AbsoluteIndex;
                 context.CodeWriter
@@ -266,7 +266,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                         {
                             if (!isWhitespaceStatement)
                             {
-                                linePragmaScope = context.CodeWriter.BuildLinePragma(token.Source.Value);
+                                linePragmaScope = context.CodeWriter.BuildLinePragma(token.Source.Value, context);
                             }
 
                             context.CodeWriter.WritePadding(0, token.Source.Value, context);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 9a3fd27c1e..359baefc66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             if (node.Source.HasValue)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     context.AddSourceMappingFor(node);
                     context.CodeWriter.WriteUsing(node.Content);
@@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             if (node.Source != null)
             {
-                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     var offset = DesignTimeVariable.Length + " = ".Length;
                     context.CodeWriter.WritePadding(offset, node.Source, context);
@@ -162,7 +162,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 if (!isWhitespaceStatement)
                 {
-                    linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                    linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value, context);
                 }
 
                 context.CodeWriter.WritePadding(0, node.Source.Value, context);
@@ -247,7 +247,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             var firstChild = node.Children[0];
             if (firstChild.Source != null)
             {
-                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value))
+                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value, context))
                 {
                     var offset = DesignTimeVariable.Length + " = ".Length;
                     context.CodeWriter.WritePadding(offset, firstChild.Source, context);
@@ -835,7 +835,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            using (context.CodeWriter.BuildLinePragma(token.Source))
+            using (context.CodeWriter.BuildLinePragma(token.Source, context))
             {
                 context.CodeWriter.WritePadding(0, token.Source.Value, context);
                 context.AddSourceMappingFor(token);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 96aa4ceb79..33b29255f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             IDisposable linePragmaScope = null;
             if (node.Source != null)
             {
-                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value);
+                linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value, context);
                 context.CodeWriter.WritePadding(0, node.Source.Value, context);
             }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
index d97eb15af8..bb0179fc0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
@@ -12,7 +12,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             string rootNamespace,
             bool suppressChecksum,
             bool supressMetadataAttributes,
-            bool suppressPrimaryMethodBody)
+            bool suppressPrimaryMethodBody,
+            bool suppressNullabilityEnforcement)
         {
             IndentWithTabs = indentWithTabs;
             IndentSize = indentSize;
@@ -21,6 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             SuppressChecksum = suppressChecksum;
             SuppressMetadataAttributes = supressMetadataAttributes;
             SuppressPrimaryMethodBody = suppressPrimaryMethodBody;
+            SuppressNullabilityEnforcement = suppressNullabilityEnforcement;
         }
 
         public override bool DesignTime { get; }
@@ -32,5 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public override string RootNamespace { get; }
 
         public override bool SuppressChecksum { get; }
+
+        public override bool SuppressNullabilityEnforcement { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
index dbf795587f..12f2f119c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs
@@ -37,6 +37,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override bool SuppressChecksum { get; set; }
 
+        public override bool SuppressNullabilityEnforcement { get; set; }
+
         public override RazorCodeGenerationOptions Build()
         {
             return new DefaultRazorCodeGenerationOptions(
@@ -46,7 +48,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 RootNamespace,
                 SuppressChecksum,
                 SuppressMetadataAttributes,
-                SuppressPrimaryMethodBody);
+                SuppressPrimaryMethodBody,
+                SuppressNullabilityEnforcement);
         }
 
         public override void SetDesignTime(bool designTime)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
index 884ef07df5..7273868d62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
@@ -373,7 +373,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                     var firstMappedChild = node.Children.FirstOrDefault(child => child.Source != null) as IntermediateNode;
                     var valueStart = firstMappedChild?.Source;
 
-                    using (context.CodeWriter.BuildLinePragma(node.Source))
+                    using (context.CodeWriter.BuildLinePragma(node.Source, context))
                     {
                         var accessor = GetPropertyAccessor(node);
                         var assignmentPrefixLength = accessor.Length + " = ".Length;
@@ -422,7 +422,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 }
                 else
                 {
-                    using (context.CodeWriter.BuildLinePragma(node.Source))
+                    using (context.CodeWriter.BuildLinePragma(node.Source, context))
                     {
                         context.CodeWriter.WriteStartAssignment(GetPropertyAccessor(node));
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
index 61300f7efa..3823ab17e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
@@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                         }
 
                         // {node.Content} __typeHelper = default({node.Content});
-                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        using (context.CodeWriter.BuildLinePragma(node.Source, context))
                         {
                             context.AddSourceMappingFor(node);
                             context.CodeWriter
@@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                         }
 
                         // global::System.Object {node.content} = null;
-                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        using (context.CodeWriter.BuildLinePragma(node.Source, context))
                         {
                             context.CodeWriter
                             .Write("global::")
@@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                         }
 
                         // global::System.Object __typeHelper = nameof({node.Content});
-                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        using (context.CodeWriter.BuildLinePragma(node.Source, context))
                         {
                             context.CodeWriter
                             .Write("global::")
@@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                     case DirectiveTokenKind.String:
 
                         // global::System.Object __typeHelper = "{node.Content}";
-                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        using (context.CodeWriter.BuildLinePragma(node.Source, context))
                         {
                             context.CodeWriter
                             .Write("global::")
@@ -173,7 +173,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
             // for consistency so when a C# completion session starts, filling user code doesn't result in
             // a previously non-existent line pragma from being added and destroying the context in which
             // the completion session was started.
-            using (context.CodeWriter.BuildLinePragma(node.Source))
+            using (context.CodeWriter.BuildLinePragma(node.Source, context))
             {
                 context.AddSourceMappingFor(node);
                 context.CodeWriter.Write(" ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
index 4a3f479396..7eeb15388e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
@@ -16,7 +16,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 suppressChecksum: false,
                 rootNamespace: null,
                 supressMetadataAttributes: false,
-                suppressPrimaryMethodBody: false);
+                suppressPrimaryMethodBody: false,
+                suppressNullabilityEnforcement: false);
         }
 
         public static RazorCodeGenerationOptions CreateDesignTimeDefault()
@@ -28,7 +29,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 rootNamespace: null,
                 suppressChecksum: false,
                 supressMetadataAttributes: true,
-                suppressPrimaryMethodBody: false);
+                suppressPrimaryMethodBody: false,
+                suppressNullabilityEnforcement: false);
         }
 
         public static RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
@@ -107,5 +109,10 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// Gets or sets a value that determines if an empty body is generated for the primary method.
         /// </summary>
         public virtual bool SuppressPrimaryMethodBody { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if nullability type enforcement is restored to project settings for user code.
+        /// </summary>
+        public virtual bool SuppressNullabilityEnforcement { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
index e2813630c5..1493832ca9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
@@ -54,6 +54,11 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         public virtual bool SuppressPrimaryMethodBody { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value that determines if nullability type enforcement is restored to project settings for user code.
+        /// </summary>
+        public virtual bool SuppressNullabilityEnforcement { get; set; }
+
         public abstract RazorCodeGenerationOptions Build();
 
         public virtual void SetDesignTime(bool designTime)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index f2e1b76b7a..3501096bde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
@@ -30,6 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             ExtensionNames = Option("-n", "extension name", CommandOptionType.MultipleValue);
             ExtensionFilePaths = Option("-e", "extension file path", CommandOptionType.MultipleValue);
             RootNamespace = Option("--root-namespace", "root namespace for generated code", CommandOptionType.SingleValue);
+            CSharpLanguageVersion = Option("--csharp-language-version", "csharp language version generated code", CommandOptionType.SingleValue);
             GenerateDeclaration = Option("--generate-declaration", "Generate declaration", CommandOptionType.NoValue);
         }
 
@@ -55,6 +57,8 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
         public CommandOption RootNamespace { get; }
 
+        public CommandOption CSharpLanguageVersion { get; }
+
         public CommandOption GenerateDeclaration { get; }
 
         protected override Task<int> ExecuteCoreAsync()
@@ -170,6 +174,22 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 RazorProjectFileSystem.Create(projectDirectory),
             });
 
+            var success = true;
+            var csharpLanguageVersion = LanguageVersion.Default;
+            if (CSharpLanguageVersion.HasValue())
+            {
+                var rawLanguageVersion = CSharpLanguageVersion.Value();
+                if (!LanguageVersionFacts.TryParse(CSharpLanguageVersion.Value(), out var parsedLanguageVersion))
+                {
+                    success = false;
+                    Error.WriteLine($"Unknown C# language version {rawLanguageVersion}.");
+                }
+                else
+                {
+                    csharpLanguageVersion = parsedLanguageVersion;
+                }
+            }
+
             var engine = RazorProjectEngine.Create(configuration, compositeFileSystem, b =>
             {
                 b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
@@ -184,12 +204,12 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 {
                     b.SetRootNamespace(RootNamespace.Value());
                 }
+
+                b.SetCSharpLanguageVersion(csharpLanguageVersion);
             });
 
             var results = GenerateCode(engine, sourceItems);
 
-            var success = true;
-
             foreach (var result in results)
             {
                 var errorCount = result.CSharpDocument.Diagnostics.Count;
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
new file mode 100644
index 0000000000..30def1be7c
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    /// <summary>
+    /// Roslyn specific <see cref="RazorProjectEngineBuilder"/> extensions.
+    /// </summary>
+    public static class RazorProjectEngineBuilderExtensions
+    {
+        /// <summary>
+        /// Sets the C# language version to respect when generating code. 
+        /// </summary>
+        /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
+        /// <param name="csharpLanguageVersion">The C# <see cref="LanguageVersion"/>.</param>
+        /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
+        public static RazorProjectEngineBuilder SetCSharpLanguageVersion(this RazorProjectEngineBuilder builder, LanguageVersion csharpLanguageVersion)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (builder.Configuration.LanguageVersion.Major < 3)
+            {
+                // Prior to 3.0 there were no C# version specific controlled features so there's no value in setting a CSharp language version, noop.
+                return builder;
+            }
+
+            var existingFeature = builder.Features.OfType<ConfigureParserForCSharpVersionFeature>().FirstOrDefault();
+            if (existingFeature != null)
+            {
+                builder.Features.Remove(existingFeature);
+            }
+
+            builder.Features.Add(new ConfigureParserForCSharpVersionFeature(csharpLanguageVersion));
+
+            return builder;
+        }
+
+        private class ConfigureParserForCSharpVersionFeature : IConfigureRazorCodeGenerationOptionsFeature
+        {
+            public ConfigureParserForCSharpVersionFeature(LanguageVersion csharpLanguageVersion)
+            {
+                CSharpLanguageVersion = csharpLanguageVersion;
+            }
+
+            public LanguageVersion CSharpLanguageVersion { get; }
+
+            public int Order { get; set; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                if (options == null)
+                {
+                    throw new ArgumentNullException(nameof(options));
+                }
+
+                if (CSharpLanguageVersion < LanguageVersion.CSharp8)
+                {
+                    options.SuppressNullabilityEnforcement = true;
+                }
+                else
+                {
+                    // Given that nullability enforcement can be a compile error we only turn it on for C# >= 8.0. There are
+                    // cases in tooling when the project isn't fully configured yet at which point the CSharpLanguageVersion
+                    // may be Default (value 0). In those cases that C# version is equivalently "unspecified" and is up to the consumer
+                    // to act in a safe manner to not cause unneeded errors for older compilers. Therefore if the version isn't
+                    // >= 8.0 (or Latest) then nullability enforcement is suppressed.
+                    //
+                    // Once the project finishes configuration the C# language version will be updated to reflect the effective 
+                    // language version for the project.
+                    options.SuppressNullabilityEnforcement = false;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
index 6e8364eea5..bee0df6816 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/RazorGenerate.cs
@@ -26,6 +26,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
 
         public string RootNamespace { get; set; }
 
+        public string CSharpLanguageVersion { get; set; }
+
         [Required]
         public string Version { get; set; }
 
@@ -138,16 +140,24 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             builder.AppendLine(Configuration[0].GetMetadata(Identity));
 
             // Added in 3.0
-            if (parsedVersion.Major >= 3 && !string.IsNullOrEmpty(RootNamespace))
+            if (parsedVersion.Major >= 3)
             {
-                builder.AppendLine("--root-namespace");
-                builder.AppendLine(RootNamespace);
-            }
+                if (!string.IsNullOrEmpty(RootNamespace))
+                {
+                    builder.AppendLine("--root-namespace");
+                    builder.AppendLine(RootNamespace);
+                }
 
-            // Added in 3.0
-            if (parsedVersion.Major >= 3 && GenerateDeclaration)
-            {
-                builder.AppendLine("--generate-declaration");
+                if (!string.IsNullOrEmpty(CSharpLanguageVersion))
+                {
+                    builder.AppendLine("--csharp-language-version");
+                    builder.AppendLine(CSharpLanguageVersion);
+                }
+
+                if (GenerateDeclaration)
+                {
+                    builder.AppendLine("--generate-declaration");
+                }
             }
 
             for (var i = 0; i < Extensions.Length; i++)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 89b921e422..52037f43c4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -156,6 +156,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       PipeName="$(_RazorBuildServerPipeName)"
       Version="$(RazorLangVersion)"
       RootNamespace="$(RootNamespace)"
+      CSharpLanguageVersion="$(LangVersion)"
       Configuration="@(ResolvedRazorConfiguration)"
       Extensions="@(ResolvedRazorExtension)"
       Sources="@(RazorGenerateWithTargetPath)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 4d5f644760..9ac1a9cd2c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -107,6 +107,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       PipeName="$(_RazorBuildServerPipeName)"
       Version="$(RazorLangVersion)"
       RootNamespace="$(RootNamespace)"
+      CSharpLanguageVersion="$(LangVersion)"
       Configuration="@(ResolvedRazorConfiguration)"
       Extensions="@(ResolvedRazorExtension)"
       Sources="@(_RazorComponentDeclarationSources)"

From 40340e9b91f95080c41d53077d5d2a3bc5325c98 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 22 Mar 2019 10:42:28 -0700
Subject: [PATCH 115/337] Design update. \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/c9e0d2a60f7287d14c282555669b67a1000fef20

---
 .../test/InjectTargetExtensionTest.cs         |  6 ++-
 .../CodeGeneration/CodeWriterExtensions.cs    |  5 +++
 .../ComponentDesignTimeNodeWriter.cs          |  2 +-
 .../src/DefaultRazorCodeGenerationOptions.cs  |  4 +-
 .../src/RazorCodeGenerationOptions.cs         |  6 +--
 .../src/RazorCodeGenerationOptionsBuilder.cs  |  2 +-
 .../RazorProjectEngineBuilderExtensions.cs    | 21 ++++++-----
 ...icrosoft.NET.Sdk.Razor.Compilation.targets | 37 +++++++++++++------
 .../Microsoft.NET.Sdk.Razor.Component.targets | 14 +++----
 .../IntegrationTests/BuildIntegrationTest.cs  | 31 ++++++++++++++++
 .../IntegrationTests/IntegrationTestBase.cs   |  3 +-
 .../RazorIntegrationTestBase.cs               |  4 +-
 12 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs
index ec36da6564..65a632d613 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/InjectTargetExtensionTest.cs
@@ -56,12 +56,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             target.WriteInjectProperty(context, node);
 
             // Assert
-            Assert.Equal(
+            Assert.Equal(Environment.NewLine +
+                "#nullable restore" + Environment.NewLine +
                 "#line 2 \"test-path\"" + Environment.NewLine +
                 "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
                 "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
                 "#line default" + Environment.NewLine +
-                "#line hidden" + Environment.NewLine,
+                "#line hidden" + Environment.NewLine +
+                "#nullable disable" + Environment.NewLine,
                 context.CodeWriter.GenerateCode());
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
index dedecfda82..4f9c78d526 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -616,6 +616,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
 
                 if (!_codeGenerationOptions.SuppressNullabilityEnforcement)
                 {
+                    var endsWithNewline = _writer.Length > 0 && _writer[_writer.Length - 1] == '\n';
+                    if (!endsWithNewline)
+                    {
+                        _writer.WriteLine();
+                    }
                     _writer.WriteLine("#nullable restore");
                 }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 359baefc66..648c958d8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -462,7 +462,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // the "usings directive is unnecessary" message.
             // Looks like:
             // __o = typeof(SomeNamespace.SomeComponent);
-            using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+            using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
             {
                 context.CodeWriter.Write(DesignTimeVariable);
                 context.CodeWriter.Write(" = ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
index bb0179fc0b..5addb92cf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             bool designTime,
             string rootNamespace,
             bool suppressChecksum,
-            bool supressMetadataAttributes,
+            bool suppressMetadataAttributes,
             bool suppressPrimaryMethodBody,
             bool suppressNullabilityEnforcement)
         {
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             DesignTime = designTime;
             RootNamespace = rootNamespace;
             SuppressChecksum = suppressChecksum;
-            SuppressMetadataAttributes = supressMetadataAttributes;
+            SuppressMetadataAttributes = suppressMetadataAttributes;
             SuppressPrimaryMethodBody = suppressPrimaryMethodBody;
             SuppressNullabilityEnforcement = suppressNullabilityEnforcement;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
index 7eeb15388e..36a8499ba9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 designTime: false,
                 suppressChecksum: false,
                 rootNamespace: null,
-                supressMetadataAttributes: false,
+                suppressMetadataAttributes: false,
                 suppressPrimaryMethodBody: false,
                 suppressNullabilityEnforcement: false);
         }
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 designTime: true,
                 rootNamespace: null,
                 suppressChecksum: false,
-                supressMetadataAttributes: true,
+                suppressMetadataAttributes: true,
                 suppressPrimaryMethodBody: false,
                 suppressNullabilityEnforcement: false);
         }
@@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public virtual bool SuppressPrimaryMethodBody { get; protected set; }
 
         /// <summary>
-        /// Gets or sets a value that determines if nullability type enforcement is restored to project settings for user code.
+        /// Gets a value that determines if nullability type enforcement should be suppressed for user code.
         /// </summary>
         public virtual bool SuppressNullabilityEnforcement { get; }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
index 1493832ca9..ed6914aebe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public virtual bool SuppressPrimaryMethodBody { get; set; }
 
         /// <summary>
-        /// Gets or sets a value that determines if nullability type enforcement is restored to project settings for user code.
+        /// Gets or sets a value that determines if nullability type enforcement should be suppressed for user code.
         /// </summary>
         public virtual bool SuppressNullabilityEnforcement { get; set; }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
index 30def1be7c..642110102d 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
@@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.Razor
     public static class RazorProjectEngineBuilderExtensions
     {
         /// <summary>
-        /// Sets the C# language version to respect when generating code. 
+        /// Sets the C# language version to target when generating code. 
         /// </summary>
         /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
         /// <param name="csharpLanguageVersion">The C# <see cref="LanguageVersion"/>.</param>
@@ -26,12 +26,6 @@ namespace Microsoft.CodeAnalysis.Razor
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            if (builder.Configuration.LanguageVersion.Major < 3)
-            {
-                // Prior to 3.0 there were no C# version specific controlled features so there's no value in setting a CSharp language version, noop.
-                return builder;
-            }
-
             var existingFeature = builder.Features.OfType<ConfigureParserForCSharpVersionFeature>().FirstOrDefault();
             if (existingFeature != null)
             {
@@ -63,8 +57,16 @@ namespace Microsoft.CodeAnalysis.Razor
                     throw new ArgumentNullException(nameof(options));
                 }
 
+                if (options.Configuration.LanguageVersion.Major < 3)
+                {
+                    // Prior to 3.0 there were no C# version specific controlled features. Suppress nullability enforcement.
+                    options.SuppressNullabilityEnforcement = true;
+                    return;
+                }
+
                 if (CSharpLanguageVersion < LanguageVersion.CSharp8)
                 {
+                    // Having nullable flags < C# 8.0 would cause compile errors.
                     options.SuppressNullabilityEnforcement = true;
                 }
                 else
@@ -73,10 +75,11 @@ namespace Microsoft.CodeAnalysis.Razor
                     // cases in tooling when the project isn't fully configured yet at which point the CSharpLanguageVersion
                     // may be Default (value 0). In those cases that C# version is equivalently "unspecified" and is up to the consumer
                     // to act in a safe manner to not cause unneeded errors for older compilers. Therefore if the version isn't
-                    // >= 8.0 (or Latest) then nullability enforcement is suppressed.
+                    // >= 8.0 (Latest has a higher value) then nullability enforcement is suppressed.
                     //
                     // Once the project finishes configuration the C# language version will be updated to reflect the effective 
-                    // language version for the project.
+                    // language version for the project by our workspace change detectors. That mechanism extracts the correlated
+                    // Roslyn project and acquires the effective C# version at that point.
                     options.SuppressNullabilityEnforcement = false;
                 }
             }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index 102315ebc4..487ffb348a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project ToolsVersion="14.0">
   <!--
   What follows in this file is based on:
-     https://github.com/dotnet/roslyn/blob/4d92b18aee99ba8b1b4770ce65133e9ca65a94fe/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
+     https://github.com/dotnet/roslyn/blob/db4f836b97db1e7ad261e51c67cc80c6f3c28791/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
 
   We need to keep this basically up to date, as well as track the set of modifications we've made. Try to keep the formatting
   similar to the original to reduce noise. In general try to only deviate from the CoreCompile target when we need to for
@@ -25,32 +25,45 @@ Copyright (c) .NET Foundation. All rights reserved.
   Changes:
     Name="RazorCoreCompile"
 
+    Replace Name="CoreCompile" with Name="RazorCoreCompile"
     Replace @(Compile) with @(RazorCompile)
     Replace @(_DebugSymbolsIntermediatePath) with @(_RazorDebugSymbolsIntermediatePath)
     Replace @(IntermediateAssembly) with @(RazorIntermediateAssembly)
     Replace @(ReferencePathWithRefAssemblies) with @(RazorReferencePath)
-    Remove @(_CoreCompileResourceInputs) with @(_RazorCoreCompileResourceInputs)
+    Replace @(_CoreCompileResourceInputs) with @(_RazorCoreCompileResourceInputs)
+    Replace <Csc Condition="'%(_CoreCompileResourceInputs.WithCulture)' != 'true'" with <Csc
+    Remove comment above ^
 
     Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll
-
+    
+    Remove Returns="@(CscCommandLineArgs)"
+    Remove <Import Project="Microsoft.Managed.Core.targets"/>
     Remove Returns="@(CscCommandLineArgs)"
-
     Remove @(EmbeddedFiles)
     Remove $(ApplicationIcon) $(Win32Resource) $(Win32Manifest)
     Remove @(EmbeddedDocumentation) and @(EmbeddedFiles)
     Remove @(CustomAdditionalCompileInputs) and @(CustomAdditionalCompileOutputs)
     Remove @(DocFileItem)
     Remove PdbFile="$(PdbFile)"
+    Remove $(IntermediateRefAssembly)
     Remove OutputRefAssembly="@(IntermediateRefAssembly)"
     Remove MainEntryPoint="$(StartupObject)"
+    Remove winmdobj <PdbFile  ....> and comment
+    Remove RefOnly="$(ProduceOnlyReferenceAssembly)"
+    Remove Win32Icon="$(ApplicationIcon)"
+    Remove Win32Manifest="$(Win32Manifest)"
+    Remove Win32Resource="$(Win32Resource)"
+    Remove DocumentationFile="@(DocFileItem)"
 
     Remove EmbedAllSources="$(EmbedAllSources)" - not supported by our supported version of MSBuild
 
     Remove additional steps after calling CSC
 
     Add our FileWrites after the call to CSC
+    
+    Add Condition="'@(RazorCompile)'!=''" as a condition to the RazorCoreCompile target.
   -->
- <Target Name="RazorCoreCompile"
+  <Target Name="RazorCoreCompile"
           Inputs="$(MSBuildAllProjects);
                   @(RazorCompile);
                   $(AssemblyOriginatorKeyFile);
@@ -76,12 +89,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' &gt; '10.0'">$(NoWarn);2008</NoWarn>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
-      <ReferencePathWithRefAssemblies>
-        <EmbedInteropTypes />
-      </ReferencePathWithRefAssemblies>
-    </ItemGroup>
-
     <PropertyGroup>
       <!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
                  then we'll use AppConfig -->
@@ -104,6 +111,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <LangVersion Condition="'$(LangVersion)' == '' AND
+        (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
+         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">8.0</LangVersion>
+    </PropertyGroup>
+
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
@@ -120,6 +133,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          DefineConstants="$(DefineConstants)"
          DelaySign="$(DelaySign)"
          DisabledWarnings="$(NoWarn)"
+         DisableSdkPath="$(DisableSdkPath)"
          EmitDebugInformation="$(DebugSymbols)"
          EnvironmentVariables="$(CscEnvironment)"
          ErrorEndLocation="$(ErrorEndLocation)"
@@ -139,6 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          NoLogo="$(NoLogo)"
          NoStandardLib="$(NoCompilerStandardLib)"
          NoWin32Manifest="$(NoWin32Manifest)"
+         NullableContextOptions="$(NullableContextOptions)"
          Optimize="$(Optimize)"
          Deterministic="$(Deterministic)"
          PublicSign="$(PublicSign)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 9ac1a9cd2c..c8438efd37 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -153,12 +153,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' &gt; '10.0'">$(NoWarn);2008</NoWarn>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
-      <ReferencePathWithRefAssemblies>
-        <EmbedInteropTypes />
-      </ReferencePathWithRefAssemblies>
-    </ItemGroup>
-
     <PropertyGroup>
       <!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
                  then we'll use AppConfig -->
@@ -181,6 +175,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <LangVersion Condition="'$(LangVersion)' == '' AND
+        (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
+         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">8.0</LangVersion>
+    </PropertyGroup>
+
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
@@ -211,12 +211,12 @@ Copyright (c) .NET Foundation. All rights reserved.
          KeyFile="$(KeyOriginatorFile)"
          LangVersion="$(LangVersion)"
          LinkResources="@(LinkResource)"
-         MainEntryPoint="$(StartupObject)"
          ModuleAssemblyName="$(ModuleAssemblyName)"
          NoConfig="true"
          NoLogo="$(NoLogo)"
          NoStandardLib="$(NoCompilerStandardLib)"
          NoWin32Manifest="$(NoWin32Manifest)"
+         NullableContextOptions="$(NullableContextOptions)"
          Optimize="$(Optimize)"
          Deterministic="$(Deterministic)"
          PublicSign="$(PublicSign)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 04b7151649..2a6eca4094 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -647,6 +647,37 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
         }
 
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_CSharp8_NullableEnforcement_WarningsDuringBuild_BuildServer()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:LangVersion=8.0 /p:NullableContextOptions=enable");
+            var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+            Assert.BuildWarning(result, "CS8618", "Models\\ErrorViewModel.cs(5,18)");
+            Assert.FileContainsLine(result, indexFilePath, "#nullable restore");
+            Assert.FileContainsLine(result, indexFilePath, "#nullable disable");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_CSharp8_NullableEnforcement_WarningsDuringBuild_NoBuildServer()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:LangVersion=8.0 /p:NullableContextOptions=enable",
+                suppressBuildServer: true);
+            var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+            Assert.BuildWarning(result, "CS8618", "Models\\ErrorViewModel.cs(5,18)");
+            Assert.FileContainsLine(result, indexFilePath, "#nullable restore");
+            Assert.FileContainsLine(result, indexFilePath, "#nullable disable");
+        }
+
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_Mvc_WithoutAddRazorSupportForMvc()
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index 61890d8f61..7061c025ee 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         /// <summary>
         /// Gets the parse options applied when using <see cref="AddCSharpSyntaxTree(string, string)"/>.
         /// </summary>
-        protected virtual CSharpParseOptions CSharpParseOptions { get; } = new CSharpParseOptions(LanguageVersion.Latest);
+        protected virtual CSharpParseOptions CSharpParseOptions { get; } = new CSharpParseOptions(LanguageVersion.Preview);
 
         /// <summary>
         /// Gets the compilation options applied when compiling assemblies.
@@ -323,6 +323,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 }
 
                 b.Features.Add(new DefaultTypeNameFeature());
+                b.SetCSharpLanguageVersion(CSharpParseOptions.LanguageVersion);
 
                 // Decorate each import feature so we can normalize line endings.
                 foreach (var feature in b.Features.OfType<IImportProjectFeature>().ToArray())
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index 8a9c10aa8c..75440d18f4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 referenceAssemblies,
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
-            CSharpParseOptions = new CSharpParseOptions(LanguageVersion.CSharp7_3);
+            CSharpParseOptions = new CSharpParseOptions(LanguageVersion.Preview);
         }
 
         public RazorIntegrationTestBase()
@@ -129,6 +129,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                     References = references,
                 });
 
+                b.SetCSharpLanguageVersion(CSharpParseOptions.LanguageVersion);
+
                 CompilerFeatures.Register(b);
             });
         }

From f98ffcd759ed88439c76b00b6e088043c12b15db Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 22 Mar 2019 21:02:00 -0700
Subject: [PATCH 116/337] Update more test files. \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/76c1352d2c4136ab4c3515ffca823377cbc7b2d9

---
 .../test/InjectTargetExtensionTest.cs          |  6 ++++--
 .../test/InjectTargetExtensionTest.cs          |  6 ++++--
 .../BasicComponent_DesignTime.codegen.cs       |  8 ++++++++
 .../BasicComponent_DesignTime.mappings.txt     |  8 ++++----
 .../BasicComponent_Runtime.codegen.cs          |  2 ++
 .../Basic_DesignTime.codegen.cs                | 12 ++++++++++++
 .../Basic_DesignTime.mappings.txt              | 12 ++++++------
 .../Basic_Runtime.codegen.cs                   | 12 ++++++++++++
 .../IncompleteDirectives_DesignTime.codegen.cs | 16 ++++++++++++++++
 ...ncompleteDirectives_DesignTime.mappings.txt | 16 ++++++++--------
 .../InheritsViewModel_DesignTime.codegen.cs    |  4 ++++
 .../InheritsViewModel_DesignTime.mappings.txt  |  4 ++--
 ...heritsWithViewImports_DesignTime.codegen.cs |  2 ++
 ...ritsWithViewImports_DesignTime.mappings.txt |  2 +-
 .../InjectWithModel_DesignTime.codegen.cs      | 10 ++++++++++
 .../InjectWithModel_DesignTime.mappings.txt    | 10 +++++-----
 .../InjectWithSemicolon_DesignTime.codegen.cs  | 18 ++++++++++++++++++
 ...InjectWithSemicolon_DesignTime.mappings.txt | 18 +++++++++---------
 .../Inject_DesignTime.codegen.cs               |  4 ++++
 .../Inject_DesignTime.mappings.txt             |  4 ++--
 ...elExpressionTagHelper_DesignTime.codegen.cs |  8 ++++++++
 ...ExpressionTagHelper_DesignTime.mappings.txt |  8 ++++----
 ...ModelExpressionTagHelper_Runtime.codegen.cs |  4 ++++
 .../Model_DesignTime.codegen.cs                |  2 ++
 .../Model_DesignTime.mappings.txt              |  2 +-
 .../MultipleModels_DesignTime.codegen.cs       |  4 ++++
 .../MultipleModels_DesignTime.mappings.txt     |  4 ++--
 .../PageWithNamespace_DesignTime.codegen.cs    |  2 ++
 .../PageWithNamespace_DesignTime.mappings.txt  |  2 +-
 ...agesWithRouteTemplate_DesignTime.codegen.cs | 10 ++++++++++
 ...esWithRouteTemplate_DesignTime.mappings.txt | 10 +++++-----
 ...orPagesWithRouteTemplate_Runtime.codegen.cs |  6 ++++++
 ...azorPagesWithoutModel_DesignTime.codegen.cs |  8 ++++++++
 ...orPagesWithoutModel_DesignTime.mappings.txt |  8 ++++----
 .../RazorPagesWithoutModel_Runtime.codegen.cs  |  6 ++++++
 .../RazorPages_DesignTime.codegen.cs           | 10 ++++++++++
 .../RazorPages_DesignTime.mappings.txt         | 10 +++++-----
 .../RazorPages_Runtime.codegen.cs              |  6 ++++++
 .../Sections_DesignTime.codegen.cs             | 10 ++++++++++
 .../Sections_DesignTime.mappings.txt           | 10 +++++-----
 .../Sections_Runtime.codegen.cs                |  4 ++++
 .../UsingDirectives_DesignTime.codegen.cs      |  8 ++++++++
 .../UsingDirectives_DesignTime.mappings.txt    |  8 ++++----
 .../UsingDirectives_Runtime.codegen.cs         |  8 ++++++++
 ...iewComponentTagHelper_DesignTime.codegen.cs |  6 ++++++
 ...wComponentTagHelper_DesignTime.mappings.txt |  6 +++---
 .../ViewComponentTagHelper_Runtime.codegen.cs  |  4 ++++
 .../ViewWithNamespace_DesignTime.codegen.cs    |  2 ++
 .../ViewWithNamespace_DesignTime.mappings.txt  |  2 +-
 .../_ViewImports_DesignTime.codegen.cs         |  4 ++++
 .../_ViewImports_DesignTime.mappings.txt       |  4 ++--
 .../IntegrationTests/BuildIntegrationTest.cs   |  4 ++--
 52 files changed, 284 insertions(+), 80 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs
index fcc8b1123c..ec314d03f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectTargetExtensionTest.cs
@@ -56,12 +56,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             target.WriteInjectProperty(context, node);
 
             // Assert
-            Assert.Equal(
+            Assert.Equal(Environment.NewLine +
+                "#nullable restore" + Environment.NewLine +
                 "#line 2 \"test-path\"" + Environment.NewLine +
                 "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
                 "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
                 "#line default" + Environment.NewLine +
-                "#line hidden" + Environment.NewLine,
+                "#line hidden" + Environment.NewLine +
+                "#nullable disable" + Environment.NewLine,
                 context.CodeWriter.GenerateCode());
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs
index 71b2ec20ce..53e7debcf7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InjectTargetExtensionTest.cs
@@ -56,12 +56,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             target.WriteInjectProperty(context, node);
 
             // Assert
-            Assert.Equal(
+            Assert.Equal(Environment.NewLine +
+                "#nullable restore" + Environment.NewLine +
                 "#line 2 \"test-path\"" + Environment.NewLine +
                 "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
                 "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
                 "#line default" + Environment.NewLine +
-                "#line hidden" + Environment.NewLine,
+                "#line hidden" + Environment.NewLine +
+                "#nullable disable" + Environment.NewLine,
                 context.CodeWriter.GenerateCode());
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index ee8a246582..df40a48d8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -14,11 +14,13 @@ namespace __GeneratedComponent
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
 IDisposable __typeHelper = default(IDisposable);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -30,24 +32,30 @@ IDisposable __typeHelper = default(IDisposable);
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             base.BuildRenderTree(builder);
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
        __o = this.ToString();
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
 __o = string.Format("{0}", "Hello");
 
 #line default
 #line hidden
+#nullable disable
         }
         #pragma warning restore 1998
+#nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
             
     void IDisposable.Dispose(){ }
 
 #line default
 #line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 9220571512..ee0bc772d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |IDisposable|
-Generated Location: (665:17,0 [11] )
+Generated Location: (684:18,0 [11] )
 |IDisposable|
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1261:33,13 [15] )
+Generated Location: (1318:36,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1406:38,6 [29] )
+Generated Location: (1501:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1620:45,12 [37] )
+Generated Location: (1753:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 63ec0d9879..37e1ce772c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -23,12 +23,14 @@ namespace __GeneratedComponent
             builder.CloseElement();
         }
         #pragma warning restore 1998
+#nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
             
     void IDisposable.Dispose(){ }
 
 #line default
 #line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
index d39b64c26d..48a1f5fdba 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
@@ -23,37 +23,49 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
        __o = this.ToString();
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 __o = string.Format("{0}", "Hello");
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
    
     var cls = "foo";
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
            if(cls != null) { 
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                         __o = cls;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                                   }
 
 #line default
 #line hidden
+#nullable disable
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
index 372b49cb6f..5c0927db71 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
@@ -1,34 +1,34 @@
 Source Location: (13:0,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
 |this.ToString()|
-Generated Location: (1030:26,13 [15] )
+Generated Location: (1049:27,13 [15] )
 |this.ToString()|
 
 Source Location: (54:2,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1166:31,6 [29] )
+Generated Location: (1223:34,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (95:4,2 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
 | 
     var cls = "foo";
 |
-Generated Location: (1312:36,2 [25] )
+Generated Location: (1407:41,2 [25] )
 | 
     var cls = "foo";
 |
 
 Source Location: (134:7,11 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
 |if(cls != null) { |
-Generated Location: (1460:42,11 [18] )
+Generated Location: (1593:49,11 [18] )
 |if(cls != null) { |
 
 Source Location: (153:7,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
 |cls|
-Generated Location: (1622:47,30 [3] )
+Generated Location: (1793:56,30 [3] )
 |cls|
 
 Source Location: (156:7,33 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
 | }|
-Generated Location: (1773:52,33 [2] )
+Generated Location: (1982:63,33 [2] )
 | }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
index b6640c206d..1885fba68a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -20,44 +20,56 @@ namespace AspNetCore
         {
             WriteLiteral("<div");
             BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(">\r\n    Hello world\r\n    ");
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 Write(string.Format("{0}", "Hello"));
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("\r\n</div>\r\n");
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
    
     var cls = "foo";
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("<p");
             BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
             WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
                 PushWriter(__razor_attribute_value_writer);
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
            if(cls != null) { 
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                         Write(cls);
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                                   }
 
 #line default
 #line hidden
+#nullable disable
                 PopWriter();
             }
             ), 133, 25, false);
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 0e78caebf8..8f5be40d38 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -16,67 +16,83 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index f7d4a23a9b..b73427b4fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,40 +1,40 @@
 Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (767:19,0 [0] )
+Generated Location: (786:20,0 [0] )
 ||
 
 Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (957:27,0 [0] )
+Generated Location: (1014:30,0 [0] )
 ||
 
 Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1148:35,0 [0] )
+Generated Location: (1243:40,0 [0] )
 ||
 
 Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1339:43,0 [0] )
+Generated Location: (1472:50,0 [0] )
 ||
 
 Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (1530:51,0 [17] )
+Generated Location: (1701:60,0 [17] )
 |MyService<TModel>|
 
 Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1780:59,0 [0] )
+Generated Location: (1989:70,0 [0] )
 ||
 
 Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1971:67,0 [0] )
+Generated Location: (2218:80,0 [0] )
 ||
 
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (2162:75,0 [0] )
+Generated Location: (2447:90,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
index 7cdbaf3326..5df4e38e8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -16,19 +16,23 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
 MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
 MyModel __typeHelper = default(MyModel);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
index 6a313a909d..e8601673e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyBasePageForViews<TModel>|
-Generated Location: (740:19,0 [26] )
+Generated Location: (759:20,0 [26] )
 |MyBasePageForViews<TModel>|
 
 Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyModel|
-Generated Location: (1004:27,0 [7] )
+Generated Location: (1061:30,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
index f174a0fc2f..854bc5acf7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -16,11 +16,13 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
 MyModel __typeHelper = default(MyModel);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
index e7daecd874..2aefff4635 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
 |MyModel|
-Generated Location: (745:19,0 [7] )
+Generated Location: (764:20,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
index 2120622373..6eb2a04465 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -16,43 +16,53 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyModel __typeHelper = default(MyModel);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyApp __typeHelper = default(MyApp);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 global::System.Object MyPropertyName = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 global::System.Object Html = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
index c4838ff64d..2aa53d9a49 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyModel|
-Generated Location: (766:19,0 [7] )
+Generated Location: (785:20,0 [7] )
 |MyModel|
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyApp|
-Generated Location: (990:27,0 [5] )
+Generated Location: (1047:30,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyPropertyName|
-Generated Location: (1232:35,22 [14] )
+Generated Location: (1327:40,22 [14] )
 |MyPropertyName|
 
 Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyService<TModel>|
-Generated Location: (1438:43,0 [17] )
+Generated Location: (1571:50,0 [17] )
 |MyService<TModel>|
 
 Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |Html|
-Generated Location: (1704:51,22 [4] )
+Generated Location: (1875:60,22 [4] )
 |Html|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
index ea95a4e7eb..23c1be5972 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -16,75 +16,93 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyModel __typeHelper = default(MyModel);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyApp __typeHelper = default(MyApp);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object MyPropertyName = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object Html = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyApp __typeHelper = default(MyApp);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object MyPropertyName2 = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object Html2 = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
index 6a90f75f3e..fd3c9832d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -1,45 +1,45 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyModel|
-Generated Location: (774:19,0 [7] )
+Generated Location: (793:20,0 [7] )
 |MyModel|
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1002:27,0 [5] )
+Generated Location: (1059:30,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName|
-Generated Location: (1248:35,22 [14] )
+Generated Location: (1343:40,22 [14] )
 |MyPropertyName|
 
 Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (1458:43,0 [17] )
+Generated Location: (1591:50,0 [17] )
 |MyService<TModel>|
 
 Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html|
-Generated Location: (1728:51,22 [4] )
+Generated Location: (1899:60,22 [4] )
 |Html|
 
 Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1928:59,0 [5] )
+Generated Location: (2137:70,0 [5] )
 |MyApp|
 
 Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName2|
-Generated Location: (2174:67,22 [15] )
+Generated Location: (2421:80,22 [15] )
 |MyPropertyName2|
 
 Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (2385:75,0 [17] )
+Generated Location: (2670:90,0 [17] )
 |MyService<TModel>|
 
 Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html2|
-Generated Location: (2655:83,22 [5] )
+Generated Location: (2978:100,22 [5] )
 |Html2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
index 7b2f4fedc6..65d978634b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -16,19 +16,23 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
 MyApp __typeHelper = default(MyApp);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
 global::System.Object MyPropertyName = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
index 10ed356ecf..e78674c121 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyApp|
-Generated Location: (748:19,0 [5] )
+Generated Location: (767:20,0 [5] )
 |MyApp|
 
 Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyPropertyName|
-Generated Location: (981:27,22 [14] )
+Generated Location: (1038:30,22 [14] )
 |MyPropertyName|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index 82441cd663..6c0bfbaa8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -17,19 +17,23 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 DateTime __typeHelper = default(DateTime);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -41,17 +45,21 @@ global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
 
 #line default
 #line hidden
+#nullable disable
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
 
 #line default
 #line hidden
+#nullable disable
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index 63a7d6ccc1..100abb1b5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |DateTime|
-Generated Location: (851:20,0 [8] )
+Generated Location: (870:21,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1123:28,37 [29] )
+Generated Location: (1180:31,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (1802:44,102 [4] )
+Generated Location: (1897:49,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2118:50,94 [5] )
+Generated Location: (2251:57,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index 8f900536ac..0e7defef2d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -44,11 +44,13 @@ namespace AspNetCore
             );
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
             __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
 
 #line default
 #line hidden
+#nullable disable
             __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
             await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             if (!__tagHelperExecutionContext.Output.IsContentModified)
@@ -63,11 +65,13 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
             );
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
             __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
 
 #line default
 #line hidden
+#nullable disable
             __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
             await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             if (!__tagHelperExecutionContext.Output.IsContentModified)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
index 63c2a52c6f..bc7f027902 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -16,11 +16,13 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
 System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
index 7d84cf754d..5328a5fda4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (769:19,0 [30] )
+Generated Location: (788:20,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
index e8f705cef7..648d6a810f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -16,19 +16,23 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
 ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
 System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
index 79d7e257c7..9f3cb96a3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |ThisShouldBeGenerated|
-Generated Location: (778:19,0 [21] )
+Generated Location: (797:20,0 [21] )
 |ThisShouldBeGenerated|
 
 Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (1029:27,0 [30] )
+Generated Location: (1086:30,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
index 9d7181bfad..8ef243c98e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
@@ -16,11 +16,13 @@ namespace Test.Namespace
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml"
 global::System.Object __typeHelper = nameof(Test.Namespace);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
index b41240c9c5..74d9dc1432 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (18:1,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml)
 |Test.Namespace|
-Generated Location: (809:19,44 [14] )
+Generated Location: (828:20,44 [14] )
 |Test.Namespace|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
index 8f5d082e6a..e66684b63d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -11,30 +11,36 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
 global::System.Object __typeHelper = "/About";
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
 NewModel __typeHelper = default(NewModel);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -45,13 +51,16 @@ NewModel __typeHelper = default(NewModel);
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
+#nullable restore
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
             __o = Model.Name;
 
 #line default
 #line hidden
+#nullable disable
         }
         #pragma warning restore 1998
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
             
     public class NewModel : PageModel
@@ -61,6 +70,7 @@ NewModel __typeHelper = default(NewModel);
 
 #line default
 #line hidden
+#nullable disable
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
index cc5e9cad30..9485855d23 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -1,21 +1,21 @@
 Source Location: (36:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |using Microsoft.AspNetCore.Mvc.RazorPages|
-Generated Location: (492:14,0 [41] )
+Generated Location: (511:15,0 [41] )
 |using Microsoft.AspNetCore.Mvc.RazorPages|
 
 Source Location: (6:0,6 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |"/About"|
-Generated Location: (1108:25,37 [8] )
+Generated Location: (1165:28,37 [8] )
 |"/About"|
 
 Source Location: (25:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |NewModel|
-Generated Location: (1313:33,0 [8] )
+Generated Location: (1408:38,0 [8] )
 |NewModel|
 
 Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |Model.Name|
-Generated Location: (1841:48,18 [10] )
+Generated Location: (1974:55,18 [10] )
 |Model.Name|
 
 Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
@@ -25,7 +25,7 @@ Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrat
         public string Name { get; set; }
     }
 |
-Generated Location: (2049:55,12 [97] )
+Generated Location: (2220:64,12 [97] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
index d61cd1b60b..eb6860f4b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"547900310554f446d88da593a245719ee9dbb12f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
@@ -27,14 +29,17 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             WriteLiteral("\r\n");
             WriteLiteral("\r\n");
             WriteLiteral("\r\n<h1>New Customer ");
+#nullable restore
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
             Write(Model.Name);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</h1>\r\n");
         }
         #pragma warning restore 1998
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
             
     public class NewModel : PageModel
@@ -44,6 +49,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
index aeb2631c46..b0f5beb1a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -11,22 +11,26 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -38,17 +42,20 @@ global::System.Object __typeHelper = "*, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#nullable restore
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
                                          __o = Name;
 
 #line default
 #line hidden
+#nullable disable
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
         }
         #pragma warning restore 1998
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
             
     public IActionResult OnPost(Customer customer)
@@ -66,6 +73,7 @@ global::System.Object __typeHelper = "*, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
index 33f7baa377..3a67aa86ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (38:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |using Microsoft.AspNetCore.Mvc.RazorPages|
-Generated Location: (487:14,0 [41] )
+Generated Location: (506:15,0 [41] )
 |using Microsoft.AspNetCore.Mvc.RazorPages|
 
 Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |"*, AppCode"|
-Generated Location: (1035:25,37 [12] )
+Generated Location: (1092:28,37 [12] )
 |"*, AppCode"|
 
 Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |Name|
-Generated Location: (1629:41,47 [4] )
+Generated Location: (1724:46,47 [4] )
 |Name|
 
 Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
@@ -28,7 +28,7 @@ Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegra
         public string Name { get; set; }
     }
 |
-Generated Location: (2110:52,12 [283] )
+Generated Location: (2243:59,12 [283] )
 |
     public IActionResult OnPost(Customer customer)
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index c4f7c2473f..e001e0593c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8bf3954ad78688478de155359db8af32627ee2b8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
@@ -65,11 +67,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             WriteLiteral("\r\n    ");
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+#nullable restore
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
                                          Write(Name);
 
 #line default
 #line hidden
+#nullable disable
                 WriteLiteral("</label>\r\n        ");
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                     WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
@@ -131,6 +135,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             WriteLiteral("\r\n</form>\r\n");
         }
         #pragma warning restore 1998
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
             
     public IActionResult OnPost(Customer customer)
@@ -148,6 +153,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
index d7acbdf7d1..8cd1703ea8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -11,30 +11,36 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
 NewModel __typeHelper = default(NewModel);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -46,17 +52,20 @@ global::System.Object __typeHelper = "*, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#nullable restore
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
                                          __o = Model.Name;
 
 #line default
 #line hidden
+#nullable disable
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
         }
         #pragma warning restore 1998
+#nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
             
     public class NewModel : PageModel
@@ -77,6 +86,7 @@ global::System.Object __typeHelper = "*, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
index 0af8c77dfd..a01ff719cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -1,21 +1,21 @@
 Source Location: (55:4,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |using Microsoft.AspNetCore.Mvc.RazorPages|
-Generated Location: (475:14,0 [41] )
+Generated Location: (494:15,0 [41] )
 |using Microsoft.AspNetCore.Mvc.RazorPages|
 
 Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |NewModel|
-Generated Location: (962:25,0 [8] )
+Generated Location: (1019:28,0 [8] )
 |NewModel|
 
 Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |"*, AppCode"|
-Generated Location: (1220:33,37 [12] )
+Generated Location: (1315:38,37 [12] )
 |"*, AppCode"|
 
 Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |Model.Name|
-Generated Location: (1802:49,47 [10] )
+Generated Location: (1935:56,47 [10] )
 |Model.Name|
 
 Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
@@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr
         public string Name { get; set; }
     }
 |
-Generated Location: (2277:60,12 [360] )
+Generated Location: (2448:69,12 [360] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index 856f8eb8ee..3ab0b40633 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d33caff161b646a61b273d7c544111395b652557", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
@@ -65,11 +67,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             WriteLiteral("\r\n    ");
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+#nullable restore
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
                                          Write(Model.Name);
 
 #line default
 #line hidden
+#nullable disable
                 WriteLiteral("</label>\r\n        ");
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                     WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
@@ -131,6 +135,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             WriteLiteral("\r\n</form>\r\n");
         }
         #pragma warning restore 1998
+#nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
             
     public class NewModel : PageModel
@@ -151,6 +156,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 
 #line default
 #line hidden
+#nullable disable
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 3ca46af8a7..9d1e2bf58d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -17,27 +17,33 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 DateTime __typeHelper = default(DateTime);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object Section1 = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -48,19 +54,23 @@ global::System.Object Section1 = null;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
    
     Layout = "_SectionTestLayout.cshtml";
 
 #line default
 #line hidden
+#nullable disable
             DefineSection("Section1", async(__razor_section_writer) => {
                 __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#nullable restore
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
 
 #line default
 #line hidden
+#nullable disable
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index 1cc991810c..f97fc02e0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |DateTime|
-Generated Location: (819:20,0 [8] )
+Generated Location: (838:21,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1075:28,37 [29] )
+Generated Location: (1132:31,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1305:36,22 [8] )
+Generated Location: (1400:41,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (1771:51,2 [46] )
+Generated Location: (1904:58,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2196:59,102 [4] )
+Generated Location: (2367:68,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 4366057292..85c27277e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -39,12 +39,14 @@ namespace AspNetCore
         {
             WriteLiteral("\r\n");
             WriteLiteral("\r\n");
+#nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
    
     Layout = "_SectionTestLayout.cshtml";
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("\r\n<div>Some body</div>\r\n\r\n");
             DefineSection("Section1", async() => {
                 WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n    ");
@@ -53,11 +55,13 @@ namespace AspNetCore
                 );
                 __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
                 __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#nullable restore
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
 
 #line default
 #line hidden
+#nullable disable
                 __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
                 await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
                 if (!__tagHelperExecutionContext.Output.IsContentModified)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
index ad57e4a82b..11eff28154 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
@@ -10,26 +10,34 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System.ComponentModel;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System.Collections;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System;
 
 #line default
 #line hidden
+#nullable disable
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
         #pragma warning disable 219
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
index 71a6bf2b2d..4337c16790 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (1:0,1 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
 |using System.ComponentModel|
-Generated Location: (461:13,0 [27] )
+Generated Location: (480:14,0 [27] )
 |using System.ComponentModel|
 
 Source Location: (31:1,1 [24] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
 |using System.Collections|
-Generated Location: (613:18,0 [24] )
+Generated Location: (670:21,0 [24] )
 |using System.Collections|
 
 Source Location: (58:2,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
 |using System|
-Generated Location: (762:23,0 [12] )
+Generated Location: (857:28,0 [12] )
 |using System|
 
 Source Location: (73:3,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
 |using System|
-Generated Location: (899:28,0 [12] )
+Generated Location: (1032:35,0 [12] )
 |using System|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
index 4b1e4e8805..9cd56d20e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
@@ -11,26 +11,34 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System.ComponentModel;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System.Collections;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System;
 
 #line default
 #line hidden
+#nullable disable
+#nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
 using System;
 
 #line default
 #line hidden
+#nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"452979e8e4dd77a84a4c50425dd3a162e265990d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index b6196f6651..02339582f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -18,11 +18,13 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
@@ -33,19 +35,23 @@ global::System.Object __typeHelper = "*, AppCode";
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
   
     var foo = "Hello";
 
 #line default
 #line hidden
+#nullable disable
             __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
             __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
                 __o = foo;
 
 #line default
 #line hidden
+#nullable disable
             __TestViewComponentTagHelper.firstName = string.Empty;
             __AllTagHelper.Bar = " World";
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
index 9c5fd32efb..2fe93f8a9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |"*, AppCode"|
-Generated Location: (1057:21,37 [12] )
+Generated Location: (1076:22,37 [12] )
 |"*, AppCode"|
 
 Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |
     var foo = "Hello";
 |
-Generated Location: (1534:36,2 [26] )
+Generated Location: (1591:39,2 [26] )
 |
     var foo = "Hello";
 |
 
 Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |foo|
-Generated Location: (1985:44,22 [3] )
+Generated Location: (2080:49,22 [3] )
 |foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index 002512387b..e4c78739e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -39,12 +39,14 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
+#nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
   
     var foo = "Hello";
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("\r\n");
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
@@ -54,11 +56,13 @@ namespace AspNetCore
             __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
             __tagHelperExecutionContext.Add(__TestViewComponentTagHelper);
             BeginWriteTagHelperAttribute();
+#nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
          WriteLiteral(foo);
 
 #line default
 #line hidden
+#nullable disable
             __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
             __TestViewComponentTagHelper.firstName = __tagHelperStringValueBuffer;
             __tagHelperExecutionContext.AddTagHelperAttribute("first-name", __TestViewComponentTagHelper.firstName, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
index 209d3361f0..4f9c742ead 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
@@ -16,11 +16,13 @@ namespace Test.Namespace
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml"
 global::System.Object __typeHelper = nameof(Test.Namespace);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
index 2b7a295e01..927c17b475 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml)
 |Test.Namespace|
-Generated Location: (818:19,44 [14] )
+Generated Location: (837:20,44 [14] )
 |Test.Namespace|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
index 1f60d924cc..7a5e5b43f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -16,19 +16,23 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
 IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         ((System.Action)(() => {
+#nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
 global::System.Object Helper = null;
 
 #line default
 #line hidden
+#nullable disable
         }
         ))();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
index dc03ca32da..6f9eb70d0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |IHtmlHelper<TModel>|
-Generated Location: (760:19,0 [19] )
+Generated Location: (779:20,0 [19] )
 |IHtmlHelper<TModel>|
 
 Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |Helper|
-Generated Location: (1027:27,22 [6] )
+Generated Location: (1084:30,22 [6] )
 |Helper|
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 2a6eca4094..b90accfae8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -657,7 +657,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
             Assert.BuildPassed(result, allowWarnings: true);
-            Assert.BuildWarning(result, "CS8618", "Models\\ErrorViewModel.cs(5,18)");
+            Assert.BuildWarning(result, "CS8618");
             Assert.FileContainsLine(result, indexFilePath, "#nullable restore");
             Assert.FileContainsLine(result, indexFilePath, "#nullable disable");
         }
@@ -673,7 +673,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
             Assert.BuildPassed(result, allowWarnings: true);
-            Assert.BuildWarning(result, "CS8618", "Models\\ErrorViewModel.cs(5,18)");
+            Assert.BuildWarning(result, "CS8618");
             Assert.FileContainsLine(result, indexFilePath, "#nullable restore");
             Assert.FileContainsLine(result, indexFilePath, "#nullable disable");
         }

From 9c35c07a0b6f72bafdee8f37744a35c5e967d86a Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 26 Mar 2019 10:06:18 +0100
Subject: [PATCH 117/337] bind-Value on EditText often results in the wrong
 thing (dotnet/aspnetcore-tooling#364)

Updates the bindtaghelperdescriptorprovider to use the changed event property type name on the bound attribute instead of the value property type attribute.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/3009045206b969f4b5e5ffb0a34cee183a8e96a9
---
 .../src/BindTagHelperDescriptorProvider.cs           |  2 +-
 .../test/BindTagHelperDescriptorProviderTest.cs      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index cd1b335103..f055cc3bfd 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -437,7 +437,7 @@ namespace Microsoft.CodeAnalysis.Razor
                             changeAttribute.Name);
 
                         attribute.Name = "bind-" + valueAttribute.Name;
-                        attribute.TypeName = valueAttribute.TypeName;
+                        attribute.TypeName = changeAttribute.TypeName;
                         attribute.IsEnum = valueAttribute.IsEnum;
 
                         // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index bb8025c2bc..0265459112 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -122,11 +122,11 @@ namespace Test
 
             Assert.Equal("bind-MyProperty", attribute.Name);
             Assert.Equal("MyProperty", attribute.GetPropertyName());
-            Assert.Equal("string Test.MyComponent.MyProperty", attribute.DisplayName);
+            Assert.Equal("System.Action<System.String> Test.MyComponent.MyProperty", attribute.DisplayName);
 
             // Defined from the property type
-            Assert.Equal("System.String", attribute.TypeName);
-            Assert.True(attribute.IsStringProperty);
+            Assert.Equal("System.Action<System.String>", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
         }
@@ -237,11 +237,11 @@ namespace Test
 
             Assert.Equal("bind-MyProperty", attribute.Name);
             Assert.Equal("MyProperty", attribute.GetPropertyName());
-            Assert.Equal("string Test.MyComponent.MyProperty", attribute.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.String> Test.MyComponent.MyProperty", attribute.DisplayName);
 
             // Defined from the property type
-            Assert.Equal("System.String", attribute.TypeName);
-            Assert.True(attribute.IsStringProperty);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.String>", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
         }

From 6eb90446609b2e18c1e5f30171ac4620912f520c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 26 Mar 2019 08:58:38 -0700
Subject: [PATCH 118/337] Fixup invalid configuration error message
 (dotnet/aspnetcore-tooling#365)

* Fix invalid parameter used in error message
* Re-organize test code\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5a73c2abe9284a8b0bbc5bbd0b81431f1c592ee0
---
 .../Sdk.Razor.CurrentVersion.targets          |  9 +++--
 .../IntegrationTests/BuildIntegrationTest.cs  | 36 ++++++++-----------
 .../BuildIntegrationTest21.cs                 | 26 ++++++++++++++
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index f1ac38844b..065201d247 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -372,13 +372,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       ResolvedRazorConfiguration should only ever have one item in it. If misconfigured, we may resolve more than one item which
       may result in incorrect results or poorly worded build errors.
     -->
-    <Warning Text="Unable to resolve a Razor configuration for the value '$(_RazorConfiguration)'. Available configurations '@(RazorConfiguration)'.'"
-      Code="RazorSDK1000"
+    <Warning Text="Unable to resolve a Razor configuration for the value '$(RazorDefaultConfiguration)'. Available configurations '@(RazorConfiguration->'%(Identity)', ', ')'.'"
+      Code="RAZORSDK1000"
       Condition="'@(ResolvedRazorConfiguration->Count())' == '0'" />
 
-    <Warning Text="More than one Razor configuration was resolved for the value '$(_RazorConfiguration)'. Available configurations '@(RazorConfiguration)'.
-A common cause is a reference to an incompatible version of the 'Microsoft.AspNetCore.Mvc' or 'Microsoft.AspNetCore.Razor.Design' package."
-      Code="RazorSDK1001"
+    <Warning Text="More than one Razor configuration was resolved for the value '$(RazorDefaultConfiguration)'. Available configurations '@(RazorConfiguration->'%(Identity)', ', ')'."
+      Code="RAZORSDK1001"
       Condition="'@(ResolvedRazorConfiguration->Count())' &gt; '1'" />
 
     <FindInList
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index b90accfae8..06a454b7ab 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -606,28 +606,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.Equal(firstAssemblyBytes, secondAssemblyBytes);
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc21")]
-        public async Task Building_WorksWhenMultipleRazorConfigurationsArePresent()
-        {
-            TargetFramework = "netcoreapp2.1";
-            AddProjectFileContent(@"
-<ItemGroup>
-    <RazorConfiguration Include=""MVC-2.1"">
-      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
-    </RazorConfiguration>
-</ItemGroup>");
-
-            // Build
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
-        }
-
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_WithoutServer_ErrorDuringBuild_DisplaysErrorInMsBuildOutput()
@@ -690,6 +668,20 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildWarning(result, "RAZORSDK1004");
         }
 
+        [Fact]
+        [InitializeTestProject("ClassLibrary")]
+        public async Task Build_WithNoResolvedRazorConfiguration()
+        {
+AddProjectFileContent(@"
+<PropertyGroup>
+    <RazorDefaultConfiguration>Custom12.3</RazorDefaultConfiguration>
+</PropertyGroup>");
+
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildWarning(result, "RAZORSDK1000");
+        }
+
         private static DependencyContext ReadDependencyContext(string depsFilePath)
         {
             var reader = new DependencyContextJsonReader();
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
index a513f29aa7..9b317f0bd0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest21.cs
@@ -1,6 +1,9 @@
 // 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.Threading.Tasks;
+using Xunit;
+
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
     public class BuildIntegrationTest21 : BuildIntegrationTestLegacy
@@ -12,5 +15,28 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         public override string TestProjectName => "SimpleMvc21";
         public override string TargetFramework => "netcoreapp2.1";
+
+        [Fact]
+        public async Task Building_WorksWhenMultipleRazorConfigurationsArePresent()
+        {
+            using (var project = CreateTestProject())
+            {
+                AddProjectFileContent(@"
+<ItemGroup>
+    <RazorConfiguration Include=""MVC-2.1"">
+      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
+    </RazorConfiguration>
+</ItemGroup>");
+
+                // Build
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildPassed(result);
+                Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
+                Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
+                Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
+                Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+            }
+        }
     }
 }

From 784596aba67afb19060f6186edab33e86b8663a5 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 25 Mar 2019 23:43:53 -0700
Subject: [PATCH 119/337] Add support for C# 8 using variable declarations and
 add more C# 8 coverage.

- When adding additional C# 8 tests found that we didn't fully support this.
- Updated the C# 8.0 test to fully encompass everything C# 8.0.
- Added a feature flag to control using variable declaration errors when not top level.
- Added using variable declaration specific tests.

aspnet/AspNetCoredotnet/aspnetcore-tooling#5092
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ac08ad3659a14bad00eb9efffed59d99ff4eee2b
---
 .../src/Legacy/CSharpCodeParser.cs                 | 14 +++++++++++---
 .../src/RazorParserFeatureFlags.cs                 |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index 6852e76534..f86d30cd14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -2001,9 +2001,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 // using Identifier ==> Using Declaration
                 if (!topLevel)
                 {
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock(
-                            new SourceSpan(block.Start, block.Name.Length)));
+                    // using Variable Declaration
+
+                    if (!Context.FeatureFlags.AllowUsingVariableDeclarations)
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock(
+                                new SourceSpan(block.Start, block.Name.Length)));
+                    }
+
+                    // There are cases when a user will do @using var x = 123; At which point we let C# notify the user
+                    // of their error like we do any other invalid expression.
                     if (transition != null)
                     {
                         builder.Add(transition);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
index 22a1d731df..b32eee459b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -11,6 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var allowHtmlCommentsInTagHelpers = false;
             var allowComponentFileKind = false;
             var allowRazorInAllCodeBlocks = false;
+            var allowUsingVariableDeclarations = false;
             var experimental_AllowConditionalDataDashAttributes = false;
 
             if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
@@ -25,6 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 // Added in 3.0
                 allowComponentFileKind = true;
                 allowRazorInAllCodeBlocks = true;
+                allowUsingVariableDeclarations = true;
             }
 
             if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
@@ -37,6 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowHtmlCommentsInTagHelpers,
                 allowComponentFileKind,
                 allowRazorInAllCodeBlocks,
+                allowUsingVariableDeclarations,
                 experimental_AllowConditionalDataDashAttributes);
         }
 
@@ -48,6 +51,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool AllowRazorInAllCodeBlocks { get; }
 
+        public abstract bool AllowUsingVariableDeclarations { get; }
+
         public abstract bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
 
         private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
@@ -57,12 +62,14 @@ namespace Microsoft.AspNetCore.Razor.Language
                 bool allowHtmlCommentsInTagHelpers,
                 bool allowComponentFileKind,
                 bool allowRazorInAllCodeBlocks,
+                bool allowUsingVariableDeclarations,
                 bool experimental_AllowConditionalDataDashAttributes)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
                 AllowComponentFileKind = allowComponentFileKind;
                 AllowRazorInAllCodeBlocks = allowRazorInAllCodeBlocks;
+                AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
                 EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
             }
 
@@ -74,6 +81,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override bool AllowRazorInAllCodeBlocks { get; }
 
+            public override bool AllowUsingVariableDeclarations { get; }
+
             public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
         }
     }

From 730f3cdc6b31fc7a811d3d8ca7ca6777e72854fd Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 26 Mar 2019 17:58:37 -0700
Subject: [PATCH 120/337] Better support for _Imports.razor
 (dotnet/aspnetcore-tooling#357)

* Better support for _Imports.razor

* Special case component imports when generating code

* Prevent a future VS crash

* Rebased and updated

* update

* Removed unnecessary newline
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/abbfe00bdc72119c249762adb39fb36ce52842aa
---
 .../src/ComponentResources.Designer.cs        |  2 +-
 .../src/ComponentResources.resx               |  2 +-
 .../Components/ComponentDiagnosticFactory.cs  | 13 ++-
 .../ComponentDocumentClassifierPass.cs        | 80 +++++++++++--------
 .../Components/ComponentInjectDirective.cs    |  2 +-
 .../Components/ComponentLayoutDirective.cs    |  2 +-
 .../ComponentLayoutDirectivePass.cs           |  2 +-
 .../src/Components/ComponentPageDirective.cs  |  2 +-
 .../Components/ComponentPageDirectivePass.cs  |  2 +-
 .../Components/ComponentTypeParamDirective.cs |  2 +-
 .../src/DefaultRazorDirectiveFeature.cs       | 31 +++----
 ...faultRazorIntermediateNodeLoweringPhase.cs | 64 ++++++++++++++-
 .../src/DefaultRazorTagHelperBinderPhase.cs   |  4 +-
 .../src/Extensions/FunctionsDirective.cs      |  2 +-
 .../src/Extensions/ImplementsDirective.cs     |  2 +-
 .../src/Extensions/InheritsDirective.cs       |  2 +-
 .../src/Extensions/SectionDirective.cs        |  2 +-
 .../src/FileKinds.cs                          | 17 ++++
 .../RazorProjectEngineBuilderExtensions.cs    | 29 ++++---
 .../src/GenerateCommand.cs                    |  5 ++
 .../RazorIntegrationTestBase.cs               | 32 ++++++--
 21 files changed, 220 insertions(+), 79 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
index 3a7ce3183a..5d4e39e752 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
@@ -223,7 +223,7 @@ namespace Microsoft.AspNetCore.Razor.Language {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The &apos;@{0}&apos; directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        ///   Looks up a localized string similar to The &apos;@{0}&apos; directive specified in {1} file will not be imported. The directive must appear at the top of each Razor file.
         /// </summary>
         internal static string PageDirectiveCannotBeImported {
             get {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 3fe9868ecd..4a27c934ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -163,7 +163,7 @@
     <value>TypeName</value>
   </data>
   <data name="PageDirectiveCannotBeImported" xml:space="preserve">
-    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file</value>
+    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor file</value>
   </data>
   <data name="PageDirective_Description" xml:space="preserve">
     <value>Mark the page as a routable component.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index ba2f30fa2b..42a7b4bdaf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static readonly RazorDiagnosticDescriptor UnsupportedTagHelperDirective = new RazorDiagnosticDescriptor(
             $"{DiagnosticPrefix}9978",
             () => 
-                "The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document." +
+                "The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document. " +
                 "Use '@using <namespace>' directive instead.",
             RazorDiagnosticSeverity.Error);
 
@@ -321,5 +321,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             return RazorDiagnostic.Create(ChildContentHasInvalidParameterOnComponent, source ?? SourceSpan.Undefined, attribute, element);
         }
+
+        public static readonly RazorDiagnosticDescriptor UnsupportedComponentImportContent =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10003",
+                () => "Markup, code and block directives are not valid in component imports.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_UnsupportedComponentImportContent(SourceSpan? source)
+        {
+            return RazorDiagnostic.Create(UnsupportedComponentImportContent, source ?? SourceSpan.Undefined);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 1fa21843f7..37d44227df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -70,47 +70,63 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             @namespace.Content = computedNamespace;
-
-            @class.BaseType = ComponentsApi.ComponentBase.FullTypeName;
             @class.ClassName = computedClass;
             @class.Modifiers.Clear();
             @class.Modifiers.Add("public");
 
-            var documentNode = codeDocument.GetDocumentIntermediateNode();
-            var typeParamReferences = documentNode.FindDirectiveReferences(ComponentTypeParamDirective.Directive);
-            for (var i = 0; i < typeParamReferences.Count; i++)
+            if (FileKinds.IsComponentImport(codeDocument.GetFileKind()))
             {
-                var typeParamNode = (DirectiveIntermediateNode)typeParamReferences[i].Node;
-                if (typeParamNode.HasDiagnostics)
+                // We don't want component imports to be considered as real component.
+                // But we still want to generate code for it so we can get diagnostics.
+                @class.BaseType = typeof(object).FullName;
+
+                method.ReturnType = "void";
+                method.MethodName = "Execute";
+                method.Modifiers.Clear();
+                method.Modifiers.Add("protected");
+
+                method.Parameters.Clear();
+            }
+            else
+            {
+                @class.BaseType = ComponentsApi.ComponentBase.FullTypeName;
+
+                var documentNode = codeDocument.GetDocumentIntermediateNode();
+                var typeParamReferences = documentNode.FindDirectiveReferences(ComponentTypeParamDirective.Directive);
+                for (var i = 0; i < typeParamReferences.Count; i++)
                 {
-                    continue;
+                    var typeParamNode = (DirectiveIntermediateNode)typeParamReferences[i].Node;
+                    if (typeParamNode.HasDiagnostics)
+                    {
+                        continue;
+                    }
+
+                    @class.TypeParameters.Add(new TypeParameter() { ParameterName = typeParamNode.Tokens.First().Content, });
                 }
 
-                @class.TypeParameters.Add(new TypeParameter() { ParameterName = typeParamNode.Tokens.First().Content, });
+                method.ReturnType = "void";
+                method.MethodName = ComponentsApi.ComponentBase.BuildRenderTree;
+                method.Modifiers.Clear();
+                method.Modifiers.Add("protected");
+                method.Modifiers.Add("override");
+
+                method.Parameters.Clear();
+                method.Parameters.Add(new MethodParameter()
+                {
+                    ParameterName = "builder",
+                    TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName,
+                });
+
+                // We need to call the 'base' method as the first statement.
+                var callBase = new CSharpCodeIntermediateNode();
+                callBase.Annotations.Add(BuildRenderTreeBaseCallAnnotation, true);
+                callBase.Children.Add(new IntermediateToken
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = $"base.{ComponentsApi.ComponentBase.BuildRenderTree}(builder);"
+                });
+                method.Children.Insert(0, callBase);
             }
-
-            method.ReturnType = "void";
-            method.MethodName = ComponentsApi.ComponentBase.BuildRenderTree;
-            method.Modifiers.Clear();
-            method.Modifiers.Add("protected");
-            method.Modifiers.Add("override");
-
-            method.Parameters.Clear();
-            method.Parameters.Add(new MethodParameter()
-            {
-                ParameterName = "builder",
-                TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName,
-            });
-
-            // We need to call the 'base' method as the first statement.
-            var callBase = new CSharpCodeIntermediateNode();
-            callBase.Annotations.Add(BuildRenderTreeBaseCallAnnotation, true);
-            callBase.Children.Add(new IntermediateToken
-            {
-                Kind = TokenKind.CSharp,
-                Content = $"base.{ComponentsApi.ComponentBase.BuildRenderTree}(builder);"
-            });
-            method.Children.Insert(0, callBase);
         }
 
         internal static bool IsBuildRenderTreeBaseCall(CSharpCodeIntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
index 7d123442ad..1af26eb508 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentInjectDirective.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(FileKinds.Component, Directive);
+            builder.AddDirective(Directive, FileKinds.Component, FileKinds.ComponentImport);
             builder.Features.Add(new ComponentInjectDirectivePass());
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs
index c746b75d7b..394bed3b56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirective.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(FileKinds.Component, Directive);
+            builder.AddDirective(Directive, FileKinds.Component, FileKinds.ComponentImport);
             builder.Features.Add(new ComponentLayoutDirectivePass());
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs
index b1c36f3152..244c95df78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLayoutDirectivePass.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             attributeNode.Children.Add(new IntermediateToken()
             {
                 Kind = TokenKind.CSharp,
-                Content = $"[{ComponentsApi.LayoutAttribute.FullTypeName}(typeof({token.Content}))]" + Environment.NewLine,
+                Content = $"[{ComponentsApi.LayoutAttribute.FullTypeName}(typeof({token.Content}))]",
             });
             
             // Insert the new attribute on top of the class
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs
index 80ebd9ffca..8fefd172f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirective.cs
@@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(FileKinds.Component, Directive);
+            builder.AddDirective(Directive, FileKinds.Component, FileKinds.ComponentImport);
             builder.Features.Add(new ComponentPageDirectivePass());
             return builder;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs
index 0fe0ac5e26..c751dd57b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPageDirectivePass.cs
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             for (var i = 0; i < directives.Count; i++)
             {
                 var directive = directives[i];
-                if (directive.Node.IsImported())
+                if (FileKinds.IsComponentImport(codeDocument.GetFileKind()) || directive.Node.IsImported())
                 {
                     directive.Node.Diagnostics.Add(ComponentDiagnosticFactory.CreatePageDirective_CannotBeImported(directive.Node.Source.Value));
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs
index d0e3c12627..d37f84a0df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTypeParamDirective.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(FileKinds.Component, Directive);
+            builder.AddDirective(Directive, FileKinds.Component, FileKinds.ComponentImport);
             return builder;
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
index f766b4b14a..05dd57ebf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorDirectiveFeature.cs
@@ -9,7 +9,21 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRazorDirectiveFeature : RazorEngineFeatureBase, IRazorDirectiveFeature, IConfigureRazorParserOptionsFeature
     {
-        public ICollection<DirectiveDescriptor> Directives { get; } = new List<DirectiveDescriptor>();
+        // To maintain backwards compatibility, adding to this list will default to legacy file kind.
+        public ICollection<DirectiveDescriptor> Directives
+        {
+            get
+            {
+                ICollection<DirectiveDescriptor> result;
+                if (!DirectivesByFileKind.TryGetValue(FileKinds.Legacy, out result))
+                {
+                    result = new List<DirectiveDescriptor>();
+                    DirectivesByFileKind.Add(FileKinds.Legacy, result);
+                }
+
+                return result;
+            }
+        }
 
         public IDictionary<string, ICollection<DirectiveDescriptor>> DirectivesByFileKind { get; } = new Dictionary<string, ICollection<DirectiveDescriptor>>(StringComparer.OrdinalIgnoreCase);
 
@@ -24,22 +38,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             options.Directives.Clear();
 
-            foreach (var directive in Directives)
-            {
-                options.Directives.Add(directive);
-            }
-
-            if (options.FileKind != null && DirectivesByFileKind.TryGetValue(options.FileKind, out var directives))
+            var fileKind = options.FileKind ?? FileKinds.Legacy;
+            if (DirectivesByFileKind.TryGetValue(fileKind, out var directives))
             {
                 foreach (var directive in directives)
                 {
-                    // Replace any non-file-kind-specific directives
-                    var replaces = options.Directives.Where(d => string.Equals(d.Directive, directive.Directive, StringComparison.Ordinal)).ToArray();
-                    foreach (var replace in replaces)
-                    {
-                        options.Directives.Remove(replace);
-                    }
-
                     options.Directives.Add(directive);
                 }
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 38f05d593b..232ce738fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -45,7 +45,17 @@ namespace Microsoft.AspNetCore.Razor.Language
             // We need to decide up front if this document is a "component" file. This will affect how
             // lowering behaves.
             LoweringVisitor visitor;
-            if (FileKinds.IsComponent(codeDocument.GetFileKind()) &&
+            if (FileKinds.IsComponentImport(codeDocument.GetFileKind()) &&
+                syntaxTree.Options.FeatureFlags.AllowComponentFileKind)
+            {
+                visitor = new ComponentImportFileKindVisitor(document, builder, syntaxTree.Options.FeatureFlags)
+                {
+                    SourceDocument = syntaxTree.Source,
+                };
+
+                visitor.Visit(syntaxTree.Root);
+            }
+            else if (FileKinds.IsComponent(codeDocument.GetFileKind()) &&
                 syntaxTree.Options.FeatureFlags.AllowComponentFileKind)
             {
                 visitor = new ComponentFileKindVisitor(document, builder, syntaxTree.Options.FeatureFlags)
@@ -1856,6 +1866,58 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
+        private class ComponentImportFileKindVisitor : LoweringVisitor
+        {
+            public ComponentImportFileKindVisitor(
+                DocumentIntermediateNode document,
+                IntermediateNodeBuilder builder,
+                RazorParserFeatureFlags featureFlags)
+                : base(document, builder, featureFlags)
+            {
+            }
+
+            public override void DefaultVisit(SyntaxNode node)
+            {
+                base.DefaultVisit(node);
+            }
+
+            public override void VisitMarkupElement(MarkupElementSyntax node)
+            {
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+            }
+
+            public override void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+            {
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+            }
+
+            public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+            {
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+            }
+
+            public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+            {
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+            }
+
+            public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+            {
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+            }
+
+            public override void VisitCSharpStatement(CSharpStatementSyntax node)
+            {
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+            }
+        }
+
         private class ImportsVisitor : LoweringVisitor
         {
             public ImportsVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, RazorParserFeatureFlags featureFlags)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
index 34a2d77613..e4a30a841a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -37,7 +37,9 @@ namespace Microsoft.AspNetCore.Razor.Language
             // The imports come logically before the main razor file and are in the order they
             // should be processed.
             DirectiveVisitor visitor = null;
-            if (FileKinds.IsComponent(codeDocument.GetFileKind()))
+            var parserOptions = codeDocument.GetParserOptions();
+            if (FileKinds.IsComponent(codeDocument.GetFileKind()) &&
+                (parserOptions == null || parserOptions.FeatureFlags.AllowComponentFileKind))
             {
                 codeDocument.TryComputeNamespaceAndClass(out var currentNamespace, out var _);
                 visitor = new ComponentDirectiveVisitor(codeDocument.Source.FilePath, descriptors, currentNamespace);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs
index 630272cdef..8947e20134 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
+            builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component);
             builder.Features.Add(new FunctionsDirectivePass());
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs
index b160ff8773..4ee1657a27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/ImplementsDirective.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
+            builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component, FileKinds.ComponentImport);
             builder.Features.Add(new ImplementsDirectivePass());
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs
index 12cdb3708a..74fa396bcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
+            builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component, FileKinds.ComponentImport);
             builder.Features.Add(new InheritsDirectivePass());
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs
index b1f8633122..9040e18688 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.AddDirective(Directive);
+            builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component);
             builder.Features.Add(new SectionDirectivePass());
             builder.AddTargetExtension(new SectionTargetExtension());
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
index c69df04e60..605c601cc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/FileKinds.cs
@@ -27,6 +27,23 @@ namespace Microsoft.AspNetCore.Razor.Language
             return string.Equals(fileKind, FileKinds.ComponentImport, StringComparison.OrdinalIgnoreCase);
         }
 
+        public static string GetComponentFileKindFromFilePath(string filePath)
+        {
+            if (filePath == null)
+            {
+                throw new ArgumentNullException(nameof(filePath));
+            }
+
+            if (string.Equals(ComponentMetadata.ImportsFileName, Path.GetFileName(filePath), StringComparison.Ordinal))
+            {
+                return FileKinds.ComponentImport;
+            }
+            else
+            {
+                return FileKinds.Component;
+            }
+        }
+
         public static string GetFileKindFromFilePath(string filePath)
         {
             if (filePath == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
index 09fdf087f4..89e809fb09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngineBuilderExtensions.cs
@@ -166,35 +166,38 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// Adds the specified <see cref="DirectiveDescriptor"/> for the provided file kind.
         /// </summary>
         /// <param name="builder">The <see cref="RazorProjectEngineBuilder"/>.</param>
-        /// <param name="fileKind">The file kind, for which to register the directive. See <see cref="FileKinds"/>.</param>
         /// <param name="directive">The <see cref="DirectiveDescriptor"/> to add.</param>
+        /// <param name="fileKinds">The file kinds, for which to register the directive. See <see cref="FileKinds"/>.</param>
         /// <returns>The <see cref="RazorProjectEngineBuilder"/>.</returns>
-        public static RazorProjectEngineBuilder AddDirective(this RazorProjectEngineBuilder builder, string fileKind, DirectiveDescriptor directive)
+        public static RazorProjectEngineBuilder AddDirective(this RazorProjectEngineBuilder builder, DirectiveDescriptor directive, params string[] fileKinds)
         {
             if (builder == null)
             {
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            if (fileKind == null)
-            {
-                throw new ArgumentNullException(nameof(fileKind));
-            }
-
             if (directive == null)
             {
                 throw new ArgumentNullException(nameof(directive));
             }
 
-            var directiveFeature = GetDirectiveFeature(builder);
-
-            if (!directiveFeature.DirectivesByFileKind.TryGetValue(fileKind, out var directives))
+            if (fileKinds == null)
             {
-                directives = new List<DirectiveDescriptor>();
-                directiveFeature.DirectivesByFileKind.Add(fileKind, directives);
+                throw new ArgumentNullException(nameof(fileKinds));
             }
 
-            directives.Add(directive);
+            var directiveFeature = GetDirectiveFeature(builder);
+
+            foreach (var fileKind in fileKinds)
+            {
+                if (!directiveFeature.DirectivesByFileKind.TryGetValue(fileKind, out var directives))
+                {
+                    directives = new List<DirectiveDescriptor>();
+                    directiveFeature.DirectivesByFileKind.Add(fileKind, directives);
+                }
+
+                directives.Add(directive);
+            }
 
             return builder;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index 3501096bde..5715739c67 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.Extensions.CommandLineUtils;
@@ -286,6 +287,10 @@ namespace Microsoft.AspNetCore.Razor.Tools
             {
                 var outputPath = Path.Combine(projectDirectory, outputs[i]);
                 var fileKind = fileKinds.Count > 0 ? fileKinds[i] : "mvc";
+                if (Language.FileKinds.IsComponent(fileKind))
+                {
+                    fileKind = Language.FileKinds.GetComponentFileKindFromFilePath(sources[i]);
+                }
 
                 items[i] = new SourceItem(sources[i], outputs[i], relativePath[i], fileKind);
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
index 75440d18f4..5266adac10 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs
@@ -59,6 +59,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         {
             AdditionalSyntaxTrees = new List<SyntaxTree>();
             AdditionalRazorItems = new List<RazorProjectItem>();
+            ImportItems = new List<RazorProjectItem>();
 
             BaseCompilation = DefaultBaseCompilation;
             Configuration = RazorConfiguration.Default;
@@ -72,6 +73,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         internal List<RazorProjectItem> AdditionalRazorItems { get; }
 
+        internal List<RazorProjectItem> ImportItems { get; }
+
         internal List<SyntaxTree> AdditionalSyntaxTrees { get; }
 
         internal virtual CSharpCompilation BaseCompilation { get; }
@@ -118,6 +121,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 // Turn off checksums, we're testing code generation.
                 b.Features.Add(new SuppressChecksum());
 
+                b.Features.Add(new TestImportProjectFeature(ImportItems));
+
                 if (LineEnding != null)
                 {
                     b.Phases.Insert(0, new ForceLineEndingPhase(LineEnding));
@@ -135,7 +140,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             });
         }
 
-        internal RazorProjectItem CreateProjectItem(string cshtmlRelativePath, string cshtmlContent)
+        internal RazorProjectItem CreateProjectItem(string cshtmlRelativePath, string cshtmlContent, string fileKind = null)
         {
             var fullPath = WorkingDirectory + PathSeparator + cshtmlRelativePath;
 
@@ -156,7 +161,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 physicalPath: fullPath,
                 relativePhysicalPath: cshtmlRelativePath,
                 basePath: WorkingDirectory,
-                fileKind: FileKind)
+                fileKind: fileKind ?? FileKind)
             {
                 Content = cshtmlContent.TrimStart(),
             };
@@ -167,7 +172,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             return CompileToCSharp(DefaultFileName, cshtmlContent, throwOnFailure);
         }
 
-        protected CompileToCSharpResult CompileToCSharp(string cshtmlRelativePath, string cshtmlContent, bool throwOnFailure = true)
+        protected CompileToCSharpResult CompileToCSharp(string cshtmlRelativePath, string cshtmlContent, bool throwOnFailure = true, string fileKind = null)
         {
             if (DeclarationOnly && DesignTime)
             {
@@ -197,7 +202,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 }
 
                 // Result of generating declarations
-                var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent);
+                var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent, fileKind);
                 codeDocument = projectEngine.ProcessDeclarationOnly(projectItem);
                 var declaration = new CompileToCSharpResult
                 {
@@ -243,7 +248,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 // This will include the built-in components.
                 var projectEngine = CreateProjectEngine(Configuration, BaseCompilation.References.ToArray());
 
-                var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent);
+                var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent, fileKind);
 
                 RazorCodeDocument codeDocument;
                 if (DeclarationOnly)
@@ -456,5 +461,22 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 codeDocument.Items[key] = LineEnding;
             }
         }
+
+        private class TestImportProjectFeature : IImportProjectFeature
+        {
+            private List<RazorProjectItem> _imports;
+
+            public TestImportProjectFeature(List<RazorProjectItem> imports)
+            {
+                _imports = imports;
+            }
+
+            public RazorProjectEngine ProjectEngine { get; set; }
+
+            public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+            {
+                return _imports;
+            }
+        }
     }
 }

From 8eee2d5bc49c58eda03b59abdc7eaaaf353abc84 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 27 Mar 2019 09:52:34 -0700
Subject: [PATCH 121/337] Skip running ModelDirective pass for component
 documents (dotnet/aspnetcore-tooling#372)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6824620cb0220f9a05e1fdcabccf89f32779651b
---
 .../src/ModelDirective.cs                       |  7 +++++++
 .../test/ModelDirectiveTest.cs                  | 17 ++---------------
 .../BasicComponent_DesignTime.codegen.cs        |  1 -
 .../BasicComponent_DesignTime.ir.txt            |  1 -
 .../BasicComponent_DesignTime.mappings.txt      |  8 ++++----
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs
index a8c4bafbd9..4e0973f14a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ModelDirective.cs
@@ -76,6 +76,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
             {
+                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                   documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+                {
+                    // Not a MVC file. Skip.
+                    return;
+                }
+
                 var visitor = new Visitor();
                 var modelType = GetModelType(documentNode, visitor);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
index 881557aa4d..527120915b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
@@ -251,6 +251,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
                 b.AddDirective(ModelDirective.Directive);
 
+                b.Features.Add(new RazorPageDocumentClassifierPass());
+                b.Features.Add(new MvcViewDocumentClassifierPass());
                 b.Features.Add(new DesignTimeOptionsFeature(designTime));
             }).Engine;
         }
@@ -278,21 +280,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             return codeDocument.GetDocumentIntermediateNode();
         }
 
-        private string GetCSharpContent(IntermediateNode node)
-        {
-            var builder = new StringBuilder();
-            for (var i = 0; i < node.Children.Count; i++)
-            {
-                var child = node.Children[i] as IntermediateToken;
-                if (child.Kind == TokenKind.CSharp)
-                {
-                    builder.Append(child.Content);
-                }
-            }
-
-            return builder.ToString();
-        }
-
         private class ClassNodeVisitor : IntermediateNodeWalker
         {
             public ClassDeclarationIntermediateNode Node { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index df40a48d8d..27c275d0ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -3,7 +3,6 @@
 namespace __GeneratedComponent
 {
     #line hidden
-    using TModel = global::System.Object;
     using System;
     using System.Collections.Generic;
     using System.Linq;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index cc83c0d2a6..c05976fe90 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -1,6 +1,5 @@
 Document - 
     NamespaceDeclaration -  - __GeneratedComponent
-        UsingDirective -  - TModel = global::System.Object
         UsingDirective - (1:0,1 [12] ) - System
         UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
         UsingDirective - (51:2,1 [17] ) - System.Linq
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index ee0bc772d7..6547f5a986 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |IDisposable|
-Generated Location: (684:18,0 [11] )
+Generated Location: (641:17,0 [11] )
 |IDisposable|
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1318:36,13 [15] )
+Generated Location: (1275:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1501:43,6 [29] )
+Generated Location: (1458:42,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1753:52,12 [37] )
+Generated Location: (1710:51,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |

From 8a8e14465338decfc08887a36828f8f2f0848fea Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Thu, 28 Mar 2019 12:46:36 +0000
Subject: [PATCH 122/337] Remove base.BuildRenderTree calls
 (dotnet/aspnetcore-tooling#368)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/bcc77db7624cdef30023f293285d00c0a73b05bc
---
 .../BasicComponent_DesignTime.codegen.cs           |  1 -
 .../BasicComponent_DesignTime.ir.txt               |  2 --
 .../BasicComponent_DesignTime.mappings.txt         |  6 +++---
 .../BasicComponent_Runtime.codegen.cs              |  1 -
 .../BasicComponent_Runtime.ir.txt                  |  2 --
 .../Components/ComponentDocumentClassifierPass.cs  | 14 --------------
 .../src/Components/ComponentWhitespacePass.cs      |  2 +-
 7 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 27c275d0ed..054b128eb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -30,7 +30,6 @@ IDisposable __typeHelper = default(IDisposable);
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            base.BuildRenderTree(builder);
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
        __o = this.ToString();
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index c05976fe90..a08e83f549 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -15,8 +15,6 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
                 MarkupElement - (25:1,0 [91] BasicComponent.cshtml) - div
                     HtmlAttribute - (29:1,4 [25] BasicComponent.cshtml) -  class=" - "
                         CSharpExpressionAttributeValue - (37:1,12 [16] BasicComponent.cshtml) - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 6547f5a986..aff2ce3f1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (641:17,0 [11] )
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1275:35,13 [15] )
+Generated Location: (1231:34,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1458:42,6 [29] )
+Generated Location: (1414:41,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1710:51,12 [37] )
+Generated Location: (1666:50,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 37e1ce772c..b660af0498 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -14,7 +14,6 @@ namespace __GeneratedComponent
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            base.BuildRenderTree(builder);
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "class", this.ToString());
             builder.AddContent(2, "\r\n    Hello world\r\n    ");
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
index ab41d275db..885d9ddd37 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -7,8 +7,6 @@ Document -
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
                 MarkupElement - (25:1,0 [91] BasicComponent.cshtml) - div
                     HtmlAttribute - (29:1,4 [25] BasicComponent.cshtml) -  class=" - "
                         CSharpExpressionAttributeValue - (37:1,12 [16] BasicComponent.cshtml) - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 37d44227df..8b5ad5061d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     internal class ComponentDocumentClassifierPass : DocumentClassifierPassBase
     {
         public static readonly string ComponentDocumentKind = "component.1.0";
-        private static readonly object BuildRenderTreeBaseCallAnnotation = new object();
 
         /// <summary>
         /// The fallback value of the root namespace. Only used if the fallback root namespace
@@ -116,20 +115,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     ParameterName = "builder",
                     TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName,
                 });
-
-                // We need to call the 'base' method as the first statement.
-                var callBase = new CSharpCodeIntermediateNode();
-                callBase.Annotations.Add(BuildRenderTreeBaseCallAnnotation, true);
-                callBase.Children.Add(new IntermediateToken
-                {
-                    Kind = TokenKind.CSharp,
-                    Content = $"base.{ComponentsApi.ComponentBase.BuildRenderTree}(builder);"
-                });
-                method.Children.Insert(0, callBase);
             }
         }
-
-        internal static bool IsBuildRenderTreeBaseCall(CSharpCodeIntermediateNode node)
-            => node.Annotations[BuildRenderTreeBaseCallAnnotation] != null;
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
index 2713f96de8..08eec3ae80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
@@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                     case CSharpCodeIntermediateNode codeIntermediateNode:
                         shouldRemoveNode = false;
-                        shouldContinueIteration = ComponentDocumentClassifierPass.IsBuildRenderTreeBaseCall(codeIntermediateNode);
+                        shouldContinueIteration = false;
                         break;
 
                     default:

From 8bb16c28aab4affdefc04eb278dc499473cf2a71 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 29 Mar 2019 13:04:15 -0700
Subject: [PATCH 123/337] Prevent newlines from being encoded in the output
 (dotnet/aspnetcore-tooling#374)

* Prevent newlines from being encoded in the output
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5f74fae0d26c72c45329b7c63661833645d2f7fc
---
 .../BasicComponent_Runtime.codegen.cs         |  4 +-
 .../Components/ComponentMarkupEncodingPass.cs | 71 +++++++++++++++++++
 .../Components/ComponentRuntimeNodeWriter.cs  | 21 ++++--
 .../HtmlContentIntermediateNodeExtensions.cs  | 27 +++++++
 .../src/RazorProjectEngine.cs                 |  1 +
 5 files changed, 115 insertions(+), 9 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNodeExtensions.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index b660af0498..5165db1451 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -16,9 +16,9 @@ namespace __GeneratedComponent
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "class", this.ToString());
-            builder.AddContent(2, "\r\n    Hello world\r\n    ");
+            builder.AddMarkupContent(2, "\r\n    Hello world\r\n    ");
             builder.AddContent(3, string.Format("{0}", "Hello"));
-            builder.AddContent(4, "\r\n");
+            builder.AddMarkupContent(4, "\r\n");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
new file mode 100644
index 0000000000..152d0eef33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
@@ -0,0 +1,71 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentMarkupEncodingPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Runs after ComponentMarkupBlockPass
+        public override int Order => 10010;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
+            if (documentNode.Options.DesignTime)
+            {
+                // Nothing to do during design time.
+                return;
+            }
+
+            var rewriter = new Rewriter();
+            rewriter.Visit(documentNode);
+        }
+
+        private class Rewriter : IntermediateNodeWalker
+        {
+            // Markup content in components are rendered in one of the following two ways,
+            // AddContent - we encode it when used with prerendering and inserted into the DOM in a safe way (low perf impact)
+            // AddMarkupContent - renders the content directly as markup (high perf impact)
+            // Because of this, we want to use AddContent as much as possible.
+            //
+            // We want to use AddMarkupContent to avoid aggresive encoding during prerendering.
+            // Specifically, when one of the following characters are in the content,
+            // 1. New lines (\r, \n), tabs(\t) - so they get rendered as actual new lines, tabs instead of &#xA;
+            // 2. Ampersands (&) - so that HTML entities are rendered correctly without getting encoded
+            // 3. Any character outside the ASCII range
+
+            private static readonly char[] EncodedCharacters = new[] { '\r', '\n', '\t', '&' };
+
+            public override void VisitHtml(HtmlContentIntermediateNode node)
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    var child = node.Children[i];
+                    if (!(child is IntermediateToken token) || !token.IsHtml)
+                    {
+                        // We only care about Html tokens.
+                        continue;
+                    }
+
+                    for (var j = 0; j < token.Content.Length; j++)
+                    {
+                        var ch = token.Content[j];
+                        // ASCII range is 0 - 127
+                        if (ch > 127 || EncodedCharacters.Contains(ch))
+                        {
+                            node.SetEncoded();
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 33b29255f4..72e18f24cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Since we're not in the middle of writing an element, this must evaluate as some
             // text to display
             context.CodeWriter
-                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}")
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddContent}")
                 .Write((_sourceSequence++).ToString())
                 .WriteParameterSeparator();
 
@@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             context.CodeWriter
-                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddMarkupContent)}")
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMarkupContent}")
                 .Write((_sourceSequence++).ToString())
                 .WriteParameterSeparator()
                 .WriteStringLiteral(node.Content)
@@ -178,7 +178,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             context.CodeWriter
-                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.OpenElement)}")
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.OpenElement}")
                 .Write((_sourceSequence++).ToString())
                 .WriteParameterSeparator()
                 .WriteStringLiteral(node.TagName)
@@ -255,8 +255,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Text node
             var content = GetHtmlContent(node);
+            var renderApi = ComponentsApi.RenderTreeBuilder.AddContent;
+            if (node.IsEncoded())
+            {
+                // This content is already encoded.
+                renderApi = ComponentsApi.RenderTreeBuilder.AddMarkupContent;
+            }
+
             context.CodeWriter
-                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}")
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{renderApi}")
                 .Write((_sourceSequence++).ToString())
                 .WriteParameterSeparator()
                 .WriteStringLiteral(content)
@@ -644,8 +651,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             var codeWriter = context.CodeWriter;
 
             var methodName = node.IsComponentCapture
-                ? nameof(ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture)
-                : nameof(ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
+                ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture
+                : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture;
             codeWriter
                 .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{methodName}")
                 .Write((_sourceSequence++).ToString())
@@ -693,7 +700,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         protected override void BeginWriteAttribute(CodeWriter codeWriter, string key)
         {
             codeWriter
-                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}")
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddAttribute}")
                 .Write((_sourceSequence++).ToString())
                 .WriteParameterSeparator()
                 .WriteStringLiteral(key)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNodeExtensions.cs
new file mode 100644
index 0000000000..5ca25f851d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlContentIntermediateNodeExtensions.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal static class HtmlContentIntermediateNodeExtensions
+    {
+        private static readonly string HasEncodedContent = "HasEncodedContent";
+
+        public static bool IsEncoded(this HtmlContentIntermediateNode node)
+        {
+            return ReferenceEquals(node.Annotations[HasEncodedContent], HasEncodedContent);
+        }
+
+        public static void SetEncoded(this HtmlContentIntermediateNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            node.Annotations[HasEncodedContent] = HasEncodedContent;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index f2269e692e..82ca3509a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -232,6 +232,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.Features.Add(new ComponentGenericTypePass());
             builder.Features.Add(new ComponentChildContentDiagnosticPass());
             builder.Features.Add(new ComponentMarkupBlockPass());
+            builder.Features.Add(new ComponentMarkupEncodingPass());
         }
 
         private static void LoadExtensions(RazorProjectEngineBuilder builder, IReadOnlyList<RazorExtension> extensions)

From 2ff5e7301e92c4172e0c76a8546f8f1b958e6b7c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Mon, 1 Apr 2019 17:20:18 -0700
Subject: [PATCH 124/337] Fixes: dotnet/aspnetcore-tooling#5640 FormatException
 from diagnostic

This was just a badly written diagnostic format string
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ef7d82a7ff1025f754698edcbd1c074d36937ab2
---
 .../src/Components/ComponentDiagnosticFactory.cs              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 42a7b4bdaf..7d21e6493e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -29,9 +29,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static readonly RazorDiagnosticDescriptor CodeBlockInAttribute = new RazorDiagnosticDescriptor(
             $"{DiagnosticPrefix}9979",
             () =>
-                "Code blocks delimited by '@{...}' like '@{{ {0} }}' for attributes are no longer supported " +
+                "Code blocks delimited by '@{{...}}' like '@{{ {0} }}' for attributes are no longer supported " +
                 "These features have been changed to use attribute syntax. " +
-                "Use 'attr=\"@(x => {... }\"'.",
+                "Use 'attr=\"@(x => {{... }}\"'.",
             RazorDiagnosticSeverity.Error);
 
         public static RazorDiagnostic Create_CodeBlockInAttribute(SourceSpan? source, string expression)

From 8bc448e25546eb8da40c2b65985cda539768d44b Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 1 Apr 2019 22:38:09 -0700
Subject: [PATCH 125/337] Prevent build failures and warnings when building 2.x
 projects (dotnet/aspnetcore-tooling#382)

* Move targets for component design time generation to
Components.targets

* Provide a better error message when referencing a 2.x Razor.Design
package in a 3.0 project

* Do not produce a warning for unresolved configuration when building
2.x projects\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b5b1647646afc6a9d1e364d80afaca7dec7c50b5
---
 .../Microsoft.NET.Sdk.Razor.Component.targets            | 5 +++++
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.props  | 9 ---------
 .../netstandard2.0/Sdk.Razor.CurrentVersion.targets      | 9 +++++++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index c8438efd37..8e5255848c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -20,6 +20,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     </RazorComponentGenerateDependsOn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <_RazorGenerateComponentDeclarationDesignTimeDependsOn>ResolveRazorConfiguration;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths;RazorGenerateComponentDeclaration</_RazorGenerateComponentDeclarationDesignTimeDependsOn>
+    <_RazorGenerateComponentDesignTimeDependsOn>ResolveRazorComponentInputs;AssignRazorComponentTargetPaths</_RazorGenerateComponentDesignTimeDependsOn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Used for tracking inputs to component generation -->
     <_RazorComponentInputHash></_RazorComponentInputHash>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 4d60b543ae..06f93030fa 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -74,13 +74,4 @@ Copyright (c) .NET Foundation. All rights reserved.
     <None Remove="**\*.razor" />
   </ItemGroup>
 
-  <!-- 
-    Wire-ups for design-time build targets. These have to be here because the design time targetes need to exist
-    on a downlevel SDK which doesn't have components support.
-  -->
-  <PropertyGroup>
-    <_RazorGenerateComponentDeclarationDesignTimeDependsOn>ResolveRazorConfiguration;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths;RazorGenerateComponentDeclaration</_RazorGenerateComponentDeclarationDesignTimeDependsOn>
-    <_RazorGenerateComponentDesignTimeDependsOn>ResolveRazorComponentInputs;AssignRazorComponentTargetPaths</_RazorGenerateComponentDesignTimeDependsOn>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 065201d247..c983e22705 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -374,11 +374,16 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <Warning Text="Unable to resolve a Razor configuration for the value '$(RazorDefaultConfiguration)'. Available configurations '@(RazorConfiguration->'%(Identity)', ', ')'.'"
       Code="RAZORSDK1000"
-      Condition="'@(ResolvedRazorConfiguration->Count())' == '0'" />
+      Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '@(ResolvedRazorConfiguration->Count())' == '0'" />
 
     <Warning Text="More than one Razor configuration was resolved for the value '$(RazorDefaultConfiguration)'. Available configurations '@(RazorConfiguration->'%(Identity)', ', ')'."
       Code="RAZORSDK1001"
-      Condition="'@(ResolvedRazorConfiguration->Count())' &gt; '1'" />
+      Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '@(ResolvedRazorConfiguration->Count())' &gt; '1'" />
+
+    <!-- For a 3.0 project, targeting a RazorLangVersion is nearly always an error condition -->
+    <Warning Text="Detected Razor language version downgrade. This is typically caused by a reference to the Microsoft.AspNetCore.Razor.Design package. Consider removing this package reference."
+      Code="RAZORSDK1006"
+      Condition="'$(_Targeting30OrNewerRazorLangVersion)' != 'true' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'" />
 
     <FindInList
         List="@(RazorExtension)"

From d365a92ca4d06cfc2ca9c6cb9cda6ce6485c2e8c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 2 Apr 2019 13:00:22 -0700
Subject: [PATCH 126/337] Ensure _TargetingNETCoreApp30OrLater is available for
 older design time targets (dotnet/aspnetcore-tooling#386)

* Ensure _TargetingNETCoreApp30OrLater is available for design time targets

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9d7fd089a654b6c276153e7a4700562c25d786aa
---
 .../src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index c983e22705..7d8b3c22ab 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -34,6 +34,9 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
 
+    <!-- Workaround for an older build of DesignTime.targets that requires this property to be available. This can be removed after 16.1 preview 2 insertion -->
+    <_TargetingNETCoreApp30OrLater Condition="'$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
+
     <!--
       Infer the RazorLangVersion if no value was specified. When adding support for newer target frameworks, list newer language versions first.
     -->

From ea5d10509ecb55c523126120cdb1fb2d4e5e0d02 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 1 Apr 2019 20:59:11 -0700
Subject: [PATCH 127/337] Expand RazorProject.GetItem to take in FileKinds when
 getting items.

- Obsoleted old `GetItem` API.
- Updated tests to take new API.
- Added a new test to verify the broken scenario.

dotnet/aspnetcore-tooling#8972
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2dd34b8dd82a3214ba9242ee627ba13dc55e915a
---
 .../src/DefaultRazorProjectFileSystem.cs       | 10 ++++++++--
 .../src/EmptyProjectFileSystem.cs              |  9 ++++++++-
 .../src/NotFoundProjectItem.cs                 |  7 ++++++-
 .../src/RazorProject.cs                        | 18 +++++++++++++++++-
 .../src/VirtualRazorProjectFileSystem.cs       |  8 +++++++-
 .../src/CompositeRazorProjectFileSystem.cs     |  9 +++++++--
 .../src/GenerateCommand.cs                     |  2 +-
 .../CompositeRazorProjectFileSystemTest.cs     | 10 +++++-----
 .../Language/TestRazorProjectFileSystem.cs     |  8 +++++++-
 9 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
index 26b03a14ef..889c8cdb75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 });
         }
 
-        public override RazorProjectItem GetItem(string path)
+        public override RazorProjectItem GetItem(string path, string fileKind)
         {
             var absoluteBasePath = NormalizeAndEnsureValidPath("/");
             var absolutePath = NormalizeAndEnsureValidPath(path);
@@ -58,7 +58,13 @@ namespace Microsoft.AspNetCore.Razor.Language
             var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
             var filePath = "/" + relativePhysicalPath.Replace(Path.DirectorySeparatorChar, '/');
 
-            return new DefaultRazorProjectItem("/", filePath, relativePhysicalPath, fileKind: null, new FileInfo(absolutePath));
+            return new DefaultRazorProjectItem("/", filePath, relativePhysicalPath, fileKind, new FileInfo(absolutePath));
+        }
+
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
+        public override RazorProjectItem GetItem(string path)
+        {
+            return GetItem(path, fileKind: null);
         }
 
         protected override string NormalizeAndEnsureValidPath(string path)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs
index 61ced1271b..50849709af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -14,10 +15,16 @@ namespace Microsoft.AspNetCore.Razor.Language
             return Enumerable.Empty<RazorProjectItem>();
         }
 
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public override RazorProjectItem GetItem(string path)
+        {
+            return GetItem(path, fileKind: null);
+        }
+
+        public override RazorProjectItem GetItem(string path, string fileKind)
         {
             NormalizeAndEnsureValidPath(path);
-            return new NotFoundProjectItem(string.Empty, path);
+            return new NotFoundProjectItem(string.Empty, path, fileKind);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs
index 6989ce7f63..627b7b52e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/NotFoundProjectItem.cs
@@ -16,10 +16,12 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         /// <param name="basePath">The base path.</param>
         /// <param name="path">The path.</param>
-        public NotFoundProjectItem(string basePath, string path)
+        /// <param name="fileKind">The file kind</param>
+        public NotFoundProjectItem(string basePath, string path, string fileKind)
         {
             BasePath = basePath;
             FilePath = path;
+            FileKind = fileKind ?? FileKinds.GetFileKindFromFilePath(path);
         }
 
         /// <inheritdoc />
@@ -28,6 +30,9 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// <inheritdoc />
         public override string FilePath { get; }
 
+        /// <inheritdoc />
+        public override string FileKind { get; }
+
         /// <inheritdoc />
         public override bool Exists => false;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
index 931d38abc6..b75d8ee7f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProject.cs
@@ -18,6 +18,9 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         /// <param name="basePath">The base path.</param>
         /// <returns>The sequence of <see cref="RazorProjectItem"/>.</returns>
+        /// <remarks>
+        /// Project items returned by this method have inferred FileKinds from their corresponding file paths.
+        /// </remarks>
         public abstract IEnumerable<RazorProjectItem> EnumerateItems(string basePath);
 
         /// <summary>
@@ -25,8 +28,17 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="RazorProjectItem"/>.</returns>
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public abstract RazorProjectItem GetItem(string path);
 
+        /// <summary>
+        /// Gets a <see cref="RazorProjectItem"/> for the specified path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="fileKind">The file kind</param>
+        /// <returns>The <see cref="RazorProjectItem"/>.</returns>
+        public abstract RazorProjectItem GetItem(string path, string fileKind);
+
         /// <summary>
         /// Gets the sequence of files named <paramref name="fileName"/> that are applicable to the specified path.
         /// </summary>
@@ -38,6 +50,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// traverses to the project root.
         /// e.g.
         /// /Views/Home/View.cshtml -> [ /Views/Home/FileName.cshtml, /Views/FileName.cshtml, /FileName.cshtml ]
+        /// 
+        /// Project items returned by this method have inferred FileKinds from their corresponding file paths.
         /// </remarks>
         public IEnumerable<RazorProjectItem> FindHierarchicalItems(string path, string fileName)
         {
@@ -56,6 +70,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// traverses to the <paramref name="basePath"/>.
         /// e.g.
         /// (/Views, /Views/Home/View.cshtml) -> [ /Views/Home/FileName.cshtml, /Views/FileName.cshtml ]
+        /// 
+        /// Project items returned by this method have inferred FileKinds from their corresponding file paths.
         /// </remarks>
         public virtual IEnumerable<RazorProjectItem> FindHierarchicalItems(string basePath, string path, string fileName)
         {
@@ -101,7 +117,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 builder.Append(fileName);
 
                 var itemPath = builder.ToString();
-                yield return GetItem(itemPath);
+                yield return GetItem(itemPath, fileKind: null);
             }
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs
index 6b3737fb73..c6bf87efb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/VirtualRazorProjectFileSystem.cs
@@ -19,10 +19,16 @@ namespace Microsoft.AspNetCore.Razor.Language
             return directory?.EnumerateItems() ?? Enumerable.Empty<RazorProjectItem>();
         }
 
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public override RazorProjectItem GetItem(string path)
+        {
+            return GetItem(path, fileKind: null);
+        }
+
+        public override RazorProjectItem GetItem(string path, string fileKind)
         {
             path = NormalizeAndEnsureValidPath(path);
-            return _root.GetItem(path) ?? new NotFoundProjectItem(string.Empty, path);
+            return _root.GetItem(path) ?? new NotFoundProjectItem(string.Empty, path, fileKind);
         }
 
         public void Add(RazorProjectItem projectItem)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs
index 63fad347ee..092851d311 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/CompositeRazorProjectFileSystem.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
 
 namespace Microsoft.AspNetCore.Razor.Tools
@@ -28,12 +27,18 @@ namespace Microsoft.AspNetCore.Razor.Tools
             }
         }
 
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public override RazorProjectItem GetItem(string path)
+        {
+            return GetItem(path, fileKind: null);
+        }
+
+        public override RazorProjectItem GetItem(string path, string fileKind)
         {
             RazorProjectItem razorProjectItem = null;
             foreach (var fileSystem in FileSystems)
             {
-                razorProjectItem = fileSystem.GetItem(path);
+                razorProjectItem = fileSystem.GetItem(path, fileKind);
                 if (razorProjectItem != null && razorProjectItem.Exists)
                 {
                     return razorProjectItem;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index 5715739c67..637421409d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -305,7 +305,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             {
                 var inputItem = inputs[i];
 
-                var codeDocument = engine.Process(engine.FileSystem.GetItem(inputItem.FilePath));
+                var codeDocument = engine.Process(engine.FileSystem.GetItem(inputItem.FilePath, inputItem.FileKind));
                 var csharpDocument = codeDocument.GetCSharpDocument();
                 outputs[i] = new OutputItem(inputItem, csharpDocument);
             });
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs
index 68969a5c7b..01a3e1b6a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/CompositeRazorProjectFileSystemTest.cs
@@ -59,20 +59,20 @@ namespace Microsoft.AspNetCore.Razor.Tools
             // Arrange
             var basePath = "base-path";
             var filePath = "file-path";
-            var file1 = new NotFoundProjectItem(basePath, filePath);
+            var file1 = new NotFoundProjectItem(basePath, filePath, fileKind: null);
             var file2 = new TestRazorProjectItem(filePath);
             RazorProjectItem nullItem = null;
             var fileSystem1 = Mock.Of<RazorProjectFileSystem>(
-                f => f.GetItem(filePath) == file1);
+                f => f.GetItem(filePath, null) == file1);
             var fileSystem2 = Mock.Of<RazorProjectFileSystem>(
-                f => f.GetItem(filePath) == nullItem);
+                f => f.GetItem(filePath, null) == nullItem);
             var fileSystem3 = Mock.Of<RazorProjectFileSystem>(
-                f => f.GetItem(filePath) == file2);
+                f => f.GetItem(filePath, null) == file2);
 
             var compositeRazorProjectFileSystem = new CompositeRazorProjectFileSystem(new[] { fileSystem1, fileSystem2, fileSystem3 });
 
             // Act
-            var result = compositeRazorProjectFileSystem.GetItem(filePath);
+            var result = compositeRazorProjectFileSystem.GetItem(filePath, fileKind: null);
 
             // Assert
             Assert.Same(file2, result);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs
index f16fff0274..ed8383a9f5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorProjectFileSystem.cs
@@ -28,11 +28,17 @@ namespace Microsoft.AspNetCore.Razor.Language
             throw new NotImplementedException();
         }
 
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public override RazorProjectItem GetItem(string path)
+        {
+            return GetItem(path, fileKind: null);
+        }
+
+        public override RazorProjectItem GetItem(string path, string fileKind)
         {
             if (!_lookup.TryGetValue(path, out var value))
             {
-                value = new NotFoundProjectItem("", path);
+                value = new NotFoundProjectItem("", path, fileKind);
             }
 
             return value;

From 249752087ef841a6ede2a075bf17a6adaa37d1c2 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 2 Apr 2019 21:55:37 -0700
Subject: [PATCH 128/337] Fix csharp intellisense in _Imports.razor
 (dotnet/aspnetcore-tooling#387)

* Fix csharp intellisense in _Imports.razor

* Feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/229951a5c8640651f9724fda38361601ed5fa286
---
 ...faultRazorIntermediateNodeLoweringPhase.cs | 75 +++++++++++++++++--
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 232ce738fb..7056b178e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1885,36 +1885,101 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 _document.Diagnostics.Add(
                     ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+
+                base.VisitMarkupElement(node);
             }
 
             public override void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
             {
                 _document.Diagnostics.Add(
                     ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+
+                base.VisitMarkupCommentBlock(node);
             }
 
             public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
             {
                 _document.Diagnostics.Add(
                     ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
-            }
 
-            public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
-            {
-                _document.Diagnostics.Add(
-                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+                base.VisitMarkupTagHelperElement(node);
             }
 
             public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
             {
                 _document.Diagnostics.Add(
                     ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+
+                base.VisitCSharpExplicitExpression(node);
+            }
+
+            public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+            {
+                // We typically don't want C# in imports files except for directives. But since Razor directive intellisense
+                // is tied to C# intellisense during design time, we want to still generate and IR node for implicit expressions.
+                // Otherwise, there will be no source mapping when someone types an `@` leading to no intellisense.
+                if (node.FirstAncestorOrSelf<SyntaxNode>(n => n is MarkupStartTagSyntax || n is MarkupEndTagSyntax) != null)
+                {
+                    // We don't care about implicit expresssion in attributes.
+                    return;
+                }
+
+                var expressionNode = new CSharpExpressionIntermediateNode();
+
+                _builder.Push(expressionNode);
+
+                base.VisitCSharpImplicitExpression(node);
+
+                _builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
+                {
+                    var sourceRangeStart = expressionNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
+                    {
+                        var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        expressionNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+
+                _document.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(expressionNode.Source));
+
+                base.VisitCSharpImplicitExpression(node);
+            }
+
+            public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                if (node.FirstAncestorOrSelf<SyntaxNode>(n => n is CSharpImplicitExpressionSyntax) == null)
+                {
+                    // We only care about implicit expressions.
+                    return;
+                }
+
+                _builder.Add(new IntermediateToken()
+                {
+                    Content = node.GetContent(),
+                    Kind = TokenKind.CSharp,
+                    Source = BuildSourceSpanFromNode(node),
+                });
             }
 
             public override void VisitCSharpStatement(CSharpStatementSyntax node)
             {
                 _document.Diagnostics.Add(
                     ComponentDiagnosticFactory.Create_UnsupportedComponentImportContent(BuildSourceSpanFromNode(node)));
+
+                base.VisitCSharpStatement(node);
             }
         }
 

From 01e9d7020757a3c22268f802f1eb906f4f6eb277 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 3 Apr 2019 10:03:42 -0700
Subject: [PATCH 129/337] Decode HTML entities (dotnet/aspnetcore-tooling#379)

* Decode HTML entities
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6b7b9a3bc36e8903b1c267e98d34f09dabf38089
---
 .../Components/ComponentMarkupEncodingPass.cs |  153 +-
 .../src/Legacy/ParserHelpers.cs               | 3690 +++++++++++++++++
 2 files changed, 3839 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
index 152d0eef33..b35824c45d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
@@ -1,8 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
@@ -38,17 +43,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // We want to use AddMarkupContent to avoid aggresive encoding during prerendering.
             // Specifically, when one of the following characters are in the content,
             // 1. New lines (\r, \n), tabs(\t) - so they get rendered as actual new lines, tabs instead of &#xA;
-            // 2. Ampersands (&) - so that HTML entities are rendered correctly without getting encoded
-            // 3. Any character outside the ASCII range
+            // 2. Any character outside the ASCII range
 
-            private static readonly char[] EncodedCharacters = new[] { '\r', '\n', '\t', '&' };
+            private static readonly char[] EncodedCharacters = new[] { '\r', '\n', '\t' };
+
+            private readonly Dictionary<string, string> _seenEntities = new Dictionary<string, string>(StringComparer.Ordinal);
 
             public override void VisitHtml(HtmlContentIntermediateNode node)
             {
                 for (var i = 0; i < node.Children.Count; i++)
                 {
                     var child = node.Children[i];
-                    if (!(child is IntermediateToken token) || !token.IsHtml)
+                    if (!(child is IntermediateToken token) || !token.IsHtml || string.IsNullOrEmpty(token.Content))
                     {
                         // We only care about Html tokens.
                         continue;
@@ -65,6 +71,145 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         }
                     }
                 }
+
+                // If we reach here, we don't have newlines, tabs or non-ascii characters in this node.
+                // If we can successfully decode all HTML entities(if any) in this node, we can safely let it call AddContent.
+                var decodedContent = new string[node.Children.Count];
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    var child = node.Children[i];
+                    if (!(child is IntermediateToken token) || !token.IsHtml || string.IsNullOrEmpty(token.Content))
+                    {
+                        // We only care about Html tokens.
+                        continue;
+                    }
+
+                    if (TryDecodeHtmlEntities(token.Content, out var decoded))
+                    {
+                        decodedContent[i] = decoded;
+                    }
+                    else
+                    {
+                        node.SetEncoded();
+                        return;
+                    }
+                }
+
+                // If we reach here, it means we have successfully decoded all content.
+                // Replace all token content with the decoded value.
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    var child = node.Children[i];
+                    if (!(child is IntermediateToken token) || !token.IsHtml || string.IsNullOrEmpty(token.Content))
+                    {
+                        // We only care about Html tokens.
+                        continue;
+                    }
+
+                    token.Content = decodedContent[i];
+                }
+            }
+
+            private bool TryDecodeHtmlEntities(string content, out string decoded)
+            {
+                _seenEntities.Clear();
+                decoded = content;
+                var i = 0;
+                while (i < content.Length)
+                {
+                    var ch = content[i];
+                    if (ch == '&')
+                    {
+                        if (TryGetHtmlEntity(content, i, out var entity, out var replacement))
+                        {
+                            if (!_seenEntities.ContainsKey(entity))
+                            {
+                                _seenEntities.Add(entity, replacement);
+                            }
+
+                            i += entity.Length;
+                        }
+                        else
+                        {
+                            // We found a '&' that we don't know what to do with. Don't try to decode further.
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        i++;
+                    }
+                }
+
+                foreach (var entity in _seenEntities)
+                {
+                    decoded = decoded.Replace(entity.Key, entity.Value);
+                }
+
+                return true;
+            }
+
+            private bool TryGetHtmlEntity(string content, int position, out string entity, out string replacement)
+            {
+                // We're at '&'. Check if it is the start of an HTML entity.
+                entity = null;
+                replacement = null;
+                var endPosition = -1;
+                for (var i = position + 1; i < content.Length; i++)
+                {
+                    var ch = content[i];
+                    if (char.IsLetterOrDigit(ch) || ch == '#')
+                    {
+                        continue;
+                    }
+                    else if (ch == ';')
+                    {
+                        endPosition = i;
+                    }
+
+                    break;
+                }
+
+                if (endPosition != -1)
+                {
+                    entity = content.Substring(position, endPosition - position + 1);
+                    if (entity.StartsWith("&#"))
+                    {
+                        // Extract the codepoint and map it to an entity.
+
+                        // `entity` is guaranteed to be of the format &#****;
+                        var entityValue = entity.Substring(2, entity.Length - 3);
+                        var codePoint = -1;
+                        if (!int.TryParse(entityValue, out codePoint))
+                        {
+                            // If it is not an integer, check if it is hexadecimal like 0x00CD
+                            try
+                            {
+                                codePoint = Convert.ToInt32(entityValue, 16);
+                            }
+                            catch (FormatException)
+                            {
+                                // Do nothing.
+                            }
+                        }
+
+                        if (ParserHelpers.HtmlEntityCodePoints.TryGetValue(codePoint, out replacement))
+                        {
+                            // This is a known html entity unicode codepoint.
+                            return true;
+                        }
+
+                        // Unknown entity.
+                        return false;
+                    }
+                    else if (ParserHelpers.NamedHtmlEntities.TryGetValue(entity, out replacement))
+                    {
+                        return true;
+                    }
+                }
+
+                // The '&' is not part of an HTML entity.
+                return false;
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
index 659d79d400..e3af908e77 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
@@ -121,5 +121,3695 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             "track",
             "wbr"
         };
+
+        #region HtmlEntities
+
+        // From https://www.w3.org/TR/html5/syntax.html#named-character-references
+        public static readonly Dictionary<string, string> NamedHtmlEntities = new Dictionary<string, string>()
+        {
+            { "&Aacute;", "\u00C1" },
+            { "&Aacute", "\u00C1" },
+            { "&aacute;", "\u00E1" },
+            { "&aacute", "\u00E1" },
+            { "&Abreve;", "\u0102" },
+            { "&abreve;", "\u0103" },
+            { "&ac;", "\u223E" },
+            { "&acd;", "\u223F" },
+            { "&acE;", "\u223E\u0333" },
+            { "&Acirc;", "\u00C2" },
+            { "&Acirc", "\u00C2" },
+            { "&acirc;", "\u00E2" },
+            { "&acirc", "\u00E2" },
+            { "&acute;", "\u00B4" },
+            { "&acute", "\u00B4" },
+            { "&Acy;", "\u0410" },
+            { "&acy;", "\u0430" },
+            { "&AElig;", "\u00C6" },
+            { "&AElig", "\u00C6" },
+            { "&aelig;", "\u00E6" },
+            { "&aelig", "\u00E6" },
+            { "&af;", "\u2061" },
+            { "&Afr;", "\uD835\uDD04" },
+            { "&afr;", "\uD835\uDD1E" },
+            { "&Agrave;", "\u00C0" },
+            { "&Agrave", "\u00C0" },
+            { "&agrave;", "\u00E0" },
+            { "&agrave", "\u00E0" },
+            { "&alefsym;", "\u2135" },
+            { "&aleph;", "\u2135" },
+            { "&Alpha;", "\u0391" },
+            { "&alpha;", "\u03B1" },
+            { "&Amacr;", "\u0100" },
+            { "&amacr;", "\u0101" },
+            { "&amalg;", "\u2A3F" },
+            { "&amp;", "\u0026" },
+            { "&amp", "\u0026" },
+            { "&AMP;", "\u0026" },
+            { "&AMP", "\u0026" },
+            { "&andand;", "\u2A55" },
+            { "&And;", "\u2A53" },
+            { "&and;", "\u2227" },
+            { "&andd;", "\u2A5C" },
+            { "&andslope;", "\u2A58" },
+            { "&andv;", "\u2A5A" },
+            { "&ang;", "\u2220" },
+            { "&ange;", "\u29A4" },
+            { "&angle;", "\u2220" },
+            { "&angmsdaa;", "\u29A8" },
+            { "&angmsdab;", "\u29A9" },
+            { "&angmsdac;", "\u29AA" },
+            { "&angmsdad;", "\u29AB" },
+            { "&angmsdae;", "\u29AC" },
+            { "&angmsdaf;", "\u29AD" },
+            { "&angmsdag;", "\u29AE" },
+            { "&angmsdah;", "\u29AF" },
+            { "&angmsd;", "\u2221" },
+            { "&angrt;", "\u221F" },
+            { "&angrtvb;", "\u22BE" },
+            { "&angrtvbd;", "\u299D" },
+            { "&angsph;", "\u2222" },
+            { "&angst;", "\u00C5" },
+            { "&angzarr;", "\u237C" },
+            { "&Aogon;", "\u0104" },
+            { "&aogon;", "\u0105" },
+            { "&Aopf;", "\uD835\uDD38" },
+            { "&aopf;", "\uD835\uDD52" },
+            { "&apacir;", "\u2A6F" },
+            { "&ap;", "\u2248" },
+            { "&apE;", "\u2A70" },
+            { "&ape;", "\u224A" },
+            { "&apid;", "\u224B" },
+            { "&apos;", "\u0027" },
+            { "&ApplyFunction;", "\u2061" },
+            { "&approx;", "\u2248" },
+            { "&approxeq;", "\u224A" },
+            { "&Aring;", "\u00C5" },
+            { "&Aring", "\u00C5" },
+            { "&aring;", "\u00E5" },
+            { "&aring", "\u00E5" },
+            { "&Ascr;", "\uD835\uDC9C" },
+            { "&ascr;", "\uD835\uDCB6" },
+            { "&Assign;", "\u2254" },
+            { "&ast;", "\u002A" },
+            { "&asymp;", "\u2248" },
+            { "&asympeq;", "\u224D" },
+            { "&Atilde;", "\u00C3" },
+            { "&Atilde", "\u00C3" },
+            { "&atilde;", "\u00E3" },
+            { "&atilde", "\u00E3" },
+            { "&Auml;", "\u00C4" },
+            { "&Auml", "\u00C4" },
+            { "&auml;", "\u00E4" },
+            { "&auml", "\u00E4" },
+            { "&awconint;", "\u2233" },
+            { "&awint;", "\u2A11" },
+            { "&backcong;", "\u224C" },
+            { "&backepsilon;", "\u03F6" },
+            { "&backprime;", "\u2035" },
+            { "&backsim;", "\u223D" },
+            { "&backsimeq;", "\u22CD" },
+            { "&Backslash;", "\u2216" },
+            { "&Barv;", "\u2AE7" },
+            { "&barvee;", "\u22BD" },
+            { "&barwed;", "\u2305" },
+            { "&Barwed;", "\u2306" },
+            { "&barwedge;", "\u2305" },
+            { "&bbrk;", "\u23B5" },
+            { "&bbrktbrk;", "\u23B6" },
+            { "&bcong;", "\u224C" },
+            { "&Bcy;", "\u0411" },
+            { "&bcy;", "\u0431" },
+            { "&bdquo;", "\u201E" },
+            { "&becaus;", "\u2235" },
+            { "&because;", "\u2235" },
+            { "&Because;", "\u2235" },
+            { "&bemptyv;", "\u29B0" },
+            { "&bepsi;", "\u03F6" },
+            { "&bernou;", "\u212C" },
+            { "&Bernoullis;", "\u212C" },
+            { "&Beta;", "\u0392" },
+            { "&beta;", "\u03B2" },
+            { "&beth;", "\u2136" },
+            { "&between;", "\u226C" },
+            { "&Bfr;", "\uD835\uDD05" },
+            { "&bfr;", "\uD835\uDD1F" },
+            { "&bigcap;", "\u22C2" },
+            { "&bigcirc;", "\u25EF" },
+            { "&bigcup;", "\u22C3" },
+            { "&bigodot;", "\u2A00" },
+            { "&bigoplus;", "\u2A01" },
+            { "&bigotimes;", "\u2A02" },
+            { "&bigsqcup;", "\u2A06" },
+            { "&bigstar;", "\u2605" },
+            { "&bigtriangledown;", "\u25BD" },
+            { "&bigtriangleup;", "\u25B3" },
+            { "&biguplus;", "\u2A04" },
+            { "&bigvee;", "\u22C1" },
+            { "&bigwedge;", "\u22C0" },
+            { "&bkarow;", "\u290D" },
+            { "&blacklozenge;", "\u29EB" },
+            { "&blacksquare;", "\u25AA" },
+            { "&blacktriangle;", "\u25B4" },
+            { "&blacktriangledown;", "\u25BE" },
+            { "&blacktriangleleft;", "\u25C2" },
+            { "&blacktriangleright;", "\u25B8" },
+            { "&blank;", "\u2423" },
+            { "&blk12;", "\u2592" },
+            { "&blk14;", "\u2591" },
+            { "&blk34;", "\u2593" },
+            { "&block;", "\u2588" },
+            { "&bne;", "\u003D\u20E5" },
+            { "&bnequiv;", "\u2261\u20E5" },
+            { "&bNot;", "\u2AED" },
+            { "&bnot;", "\u2310" },
+            { "&Bopf;", "\uD835\uDD39" },
+            { "&bopf;", "\uD835\uDD53" },
+            { "&bot;", "\u22A5" },
+            { "&bottom;", "\u22A5" },
+            { "&bowtie;", "\u22C8" },
+            { "&boxbox;", "\u29C9" },
+            { "&boxdl;", "\u2510" },
+            { "&boxdL;", "\u2555" },
+            { "&boxDl;", "\u2556" },
+            { "&boxDL;", "\u2557" },
+            { "&boxdr;", "\u250C" },
+            { "&boxdR;", "\u2552" },
+            { "&boxDr;", "\u2553" },
+            { "&boxDR;", "\u2554" },
+            { "&boxh;", "\u2500" },
+            { "&boxH;", "\u2550" },
+            { "&boxhd;", "\u252C" },
+            { "&boxHd;", "\u2564" },
+            { "&boxhD;", "\u2565" },
+            { "&boxHD;", "\u2566" },
+            { "&boxhu;", "\u2534" },
+            { "&boxHu;", "\u2567" },
+            { "&boxhU;", "\u2568" },
+            { "&boxHU;", "\u2569" },
+            { "&boxminus;", "\u229F" },
+            { "&boxplus;", "\u229E" },
+            { "&boxtimes;", "\u22A0" },
+            { "&boxul;", "\u2518" },
+            { "&boxuL;", "\u255B" },
+            { "&boxUl;", "\u255C" },
+            { "&boxUL;", "\u255D" },
+            { "&boxur;", "\u2514" },
+            { "&boxuR;", "\u2558" },
+            { "&boxUr;", "\u2559" },
+            { "&boxUR;", "\u255A" },
+            { "&boxv;", "\u2502" },
+            { "&boxV;", "\u2551" },
+            { "&boxvh;", "\u253C" },
+            { "&boxvH;", "\u256A" },
+            { "&boxVh;", "\u256B" },
+            { "&boxVH;", "\u256C" },
+            { "&boxvl;", "\u2524" },
+            { "&boxvL;", "\u2561" },
+            { "&boxVl;", "\u2562" },
+            { "&boxVL;", "\u2563" },
+            { "&boxvr;", "\u251C" },
+            { "&boxvR;", "\u255E" },
+            { "&boxVr;", "\u255F" },
+            { "&boxVR;", "\u2560" },
+            { "&bprime;", "\u2035" },
+            { "&breve;", "\u02D8" },
+            { "&Breve;", "\u02D8" },
+            { "&brvbar;", "\u00A6" },
+            { "&brvbar", "\u00A6" },
+            { "&bscr;", "\uD835\uDCB7" },
+            { "&Bscr;", "\u212C" },
+            { "&bsemi;", "\u204F" },
+            { "&bsim;", "\u223D" },
+            { "&bsime;", "\u22CD" },
+            { "&bsolb;", "\u29C5" },
+            { "&bsol;", "\u005C" },
+            { "&bsolhsub;", "\u27C8" },
+            { "&bull;", "\u2022" },
+            { "&bullet;", "\u2022" },
+            { "&bump;", "\u224E" },
+            { "&bumpE;", "\u2AAE" },
+            { "&bumpe;", "\u224F" },
+            { "&Bumpeq;", "\u224E" },
+            { "&bumpeq;", "\u224F" },
+            { "&Cacute;", "\u0106" },
+            { "&cacute;", "\u0107" },
+            { "&capand;", "\u2A44" },
+            { "&capbrcup;", "\u2A49" },
+            { "&capcap;", "\u2A4B" },
+            { "&cap;", "\u2229" },
+            { "&Cap;", "\u22D2" },
+            { "&capcup;", "\u2A47" },
+            { "&capdot;", "\u2A40" },
+            { "&CapitalDifferentialD;", "\u2145" },
+            { "&caps;", "\u2229\uFE00" },
+            { "&caret;", "\u2041" },
+            { "&caron;", "\u02C7" },
+            { "&Cayleys;", "\u212D" },
+            { "&ccaps;", "\u2A4D" },
+            { "&Ccaron;", "\u010C" },
+            { "&ccaron;", "\u010D" },
+            { "&Ccedil;", "\u00C7" },
+            { "&Ccedil", "\u00C7" },
+            { "&ccedil;", "\u00E7" },
+            { "&ccedil", "\u00E7" },
+            { "&Ccirc;", "\u0108" },
+            { "&ccirc;", "\u0109" },
+            { "&Cconint;", "\u2230" },
+            { "&ccups;", "\u2A4C" },
+            { "&ccupssm;", "\u2A50" },
+            { "&Cdot;", "\u010A" },
+            { "&cdot;", "\u010B" },
+            { "&cedil;", "\u00B8" },
+            { "&cedil", "\u00B8" },
+            { "&Cedilla;", "\u00B8" },
+            { "&cemptyv;", "\u29B2" },
+            { "&cent;", "\u00A2" },
+            { "&cent", "\u00A2" },
+            { "&centerdot;", "\u00B7" },
+            { "&CenterDot;", "\u00B7" },
+            { "&cfr;", "\uD835\uDD20" },
+            { "&Cfr;", "\u212D" },
+            { "&CHcy;", "\u0427" },
+            { "&chcy;", "\u0447" },
+            { "&check;", "\u2713" },
+            { "&checkmark;", "\u2713" },
+            { "&Chi;", "\u03A7" },
+            { "&chi;", "\u03C7" },
+            { "&circ;", "\u02C6" },
+            { "&circeq;", "\u2257" },
+            { "&circlearrowleft;", "\u21BA" },
+            { "&circlearrowright;", "\u21BB" },
+            { "&circledast;", "\u229B" },
+            { "&circledcirc;", "\u229A" },
+            { "&circleddash;", "\u229D" },
+            { "&CircleDot;", "\u2299" },
+            { "&circledR;", "\u00AE" },
+            { "&circledS;", "\u24C8" },
+            { "&CircleMinus;", "\u2296" },
+            { "&CirclePlus;", "\u2295" },
+            { "&CircleTimes;", "\u2297" },
+            { "&cir;", "\u25CB" },
+            { "&cirE;", "\u29C3" },
+            { "&cire;", "\u2257" },
+            { "&cirfnint;", "\u2A10" },
+            { "&cirmid;", "\u2AEF" },
+            { "&cirscir;", "\u29C2" },
+            { "&ClockwiseContourIntegral;", "\u2232" },
+            { "&CloseCurlyDoubleQuote;", "\u201D" },
+            { "&CloseCurlyQuote;", "\u2019" },
+            { "&clubs;", "\u2663" },
+            { "&clubsuit;", "\u2663" },
+            { "&colon;", "\u003A" },
+            { "&Colon;", "\u2237" },
+            { "&Colone;", "\u2A74" },
+            { "&colone;", "\u2254" },
+            { "&coloneq;", "\u2254" },
+            { "&comma;", "\u002C" },
+            { "&commat;", "\u0040" },
+            { "&comp;", "\u2201" },
+            { "&compfn;", "\u2218" },
+            { "&complement;", "\u2201" },
+            { "&complexes;", "\u2102" },
+            { "&cong;", "\u2245" },
+            { "&congdot;", "\u2A6D" },
+            { "&Congruent;", "\u2261" },
+            { "&conint;", "\u222E" },
+            { "&Conint;", "\u222F" },
+            { "&ContourIntegral;", "\u222E" },
+            { "&copf;", "\uD835\uDD54" },
+            { "&Copf;", "\u2102" },
+            { "&coprod;", "\u2210" },
+            { "&Coproduct;", "\u2210" },
+            { "&copy;", "\u00A9" },
+            { "&copy", "\u00A9" },
+            { "&COPY;", "\u00A9" },
+            { "&COPY", "\u00A9" },
+            { "&copysr;", "\u2117" },
+            { "&CounterClockwiseContourIntegral;", "\u2233" },
+            { "&crarr;", "\u21B5" },
+            { "&cross;", "\u2717" },
+            { "&Cross;", "\u2A2F" },
+            { "&Cscr;", "\uD835\uDC9E" },
+            { "&cscr;", "\uD835\uDCB8" },
+            { "&csub;", "\u2ACF" },
+            { "&csube;", "\u2AD1" },
+            { "&csup;", "\u2AD0" },
+            { "&csupe;", "\u2AD2" },
+            { "&ctdot;", "\u22EF" },
+            { "&cudarrl;", "\u2938" },
+            { "&cudarrr;", "\u2935" },
+            { "&cuepr;", "\u22DE" },
+            { "&cuesc;", "\u22DF" },
+            { "&cularr;", "\u21B6" },
+            { "&cularrp;", "\u293D" },
+            { "&cupbrcap;", "\u2A48" },
+            { "&cupcap;", "\u2A46" },
+            { "&CupCap;", "\u224D" },
+            { "&cup;", "\u222A" },
+            { "&Cup;", "\u22D3" },
+            { "&cupcup;", "\u2A4A" },
+            { "&cupdot;", "\u228D" },
+            { "&cupor;", "\u2A45" },
+            { "&cups;", "\u222A\uFE00" },
+            { "&curarr;", "\u21B7" },
+            { "&curarrm;", "\u293C" },
+            { "&curlyeqprec;", "\u22DE" },
+            { "&curlyeqsucc;", "\u22DF" },
+            { "&curlyvee;", "\u22CE" },
+            { "&curlywedge;", "\u22CF" },
+            { "&curren;", "\u00A4" },
+            { "&curren", "\u00A4" },
+            { "&curvearrowleft;", "\u21B6" },
+            { "&curvearrowright;", "\u21B7" },
+            { "&cuvee;", "\u22CE" },
+            { "&cuwed;", "\u22CF" },
+            { "&cwconint;", "\u2232" },
+            { "&cwint;", "\u2231" },
+            { "&cylcty;", "\u232D" },
+            { "&dagger;", "\u2020" },
+            { "&Dagger;", "\u2021" },
+            { "&daleth;", "\u2138" },
+            { "&darr;", "\u2193" },
+            { "&Darr;", "\u21A1" },
+            { "&dArr;", "\u21D3" },
+            { "&dash;", "\u2010" },
+            { "&Dashv;", "\u2AE4" },
+            { "&dashv;", "\u22A3" },
+            { "&dbkarow;", "\u290F" },
+            { "&dblac;", "\u02DD" },
+            { "&Dcaron;", "\u010E" },
+            { "&dcaron;", "\u010F" },
+            { "&Dcy;", "\u0414" },
+            { "&dcy;", "\u0434" },
+            { "&ddagger;", "\u2021" },
+            { "&ddarr;", "\u21CA" },
+            { "&DD;", "\u2145" },
+            { "&dd;", "\u2146" },
+            { "&DDotrahd;", "\u2911" },
+            { "&ddotseq;", "\u2A77" },
+            { "&deg;", "\u00B0" },
+            { "&deg", "\u00B0" },
+            { "&Del;", "\u2207" },
+            { "&Delta;", "\u0394" },
+            { "&delta;", "\u03B4" },
+            { "&demptyv;", "\u29B1" },
+            { "&dfisht;", "\u297F" },
+            { "&Dfr;", "\uD835\uDD07" },
+            { "&dfr;", "\uD835\uDD21" },
+            { "&dHar;", "\u2965" },
+            { "&dharl;", "\u21C3" },
+            { "&dharr;", "\u21C2" },
+            { "&DiacriticalAcute;", "\u00B4" },
+            { "&DiacriticalDot;", "\u02D9" },
+            { "&DiacriticalDoubleAcute;", "\u02DD" },
+            { "&DiacriticalGrave;", "\u0060" },
+            { "&DiacriticalTilde;", "\u02DC" },
+            { "&diam;", "\u22C4" },
+            { "&diamond;", "\u22C4" },
+            { "&Diamond;", "\u22C4" },
+            { "&diamondsuit;", "\u2666" },
+            { "&diams;", "\u2666" },
+            { "&die;", "\u00A8" },
+            { "&DifferentialD;", "\u2146" },
+            { "&digamma;", "\u03DD" },
+            { "&disin;", "\u22F2" },
+            { "&div;", "\u00F7" },
+            { "&divide;", "\u00F7" },
+            { "&divide", "\u00F7" },
+            { "&divideontimes;", "\u22C7" },
+            { "&divonx;", "\u22C7" },
+            { "&DJcy;", "\u0402" },
+            { "&djcy;", "\u0452" },
+            { "&dlcorn;", "\u231E" },
+            { "&dlcrop;", "\u230D" },
+            { "&dollar;", "\u0024" },
+            { "&Dopf;", "\uD835\uDD3B" },
+            { "&dopf;", "\uD835\uDD55" },
+            { "&Dot;", "\u00A8" },
+            { "&dot;", "\u02D9" },
+            { "&DotDot;", "\u20DC" },
+            { "&doteq;", "\u2250" },
+            { "&doteqdot;", "\u2251" },
+            { "&DotEqual;", "\u2250" },
+            { "&dotminus;", "\u2238" },
+            { "&dotplus;", "\u2214" },
+            { "&dotsquare;", "\u22A1" },
+            { "&doublebarwedge;", "\u2306" },
+            { "&DoubleContourIntegral;", "\u222F" },
+            { "&DoubleDot;", "\u00A8" },
+            { "&DoubleDownArrow;", "\u21D3" },
+            { "&DoubleLeftArrow;", "\u21D0" },
+            { "&DoubleLeftRightArrow;", "\u21D4" },
+            { "&DoubleLeftTee;", "\u2AE4" },
+            { "&DoubleLongLeftArrow;", "\u27F8" },
+            { "&DoubleLongLeftRightArrow;", "\u27FA" },
+            { "&DoubleLongRightArrow;", "\u27F9" },
+            { "&DoubleRightArrow;", "\u21D2" },
+            { "&DoubleRightTee;", "\u22A8" },
+            { "&DoubleUpArrow;", "\u21D1" },
+            { "&DoubleUpDownArrow;", "\u21D5" },
+            { "&DoubleVerticalBar;", "\u2225" },
+            { "&DownArrowBar;", "\u2913" },
+            { "&downarrow;", "\u2193" },
+            { "&DownArrow;", "\u2193" },
+            { "&Downarrow;", "\u21D3" },
+            { "&DownArrowUpArrow;", "\u21F5" },
+            { "&DownBreve;", "\u0311" },
+            { "&downdownarrows;", "\u21CA" },
+            { "&downharpoonleft;", "\u21C3" },
+            { "&downharpoonright;", "\u21C2" },
+            { "&DownLeftRightVector;", "\u2950" },
+            { "&DownLeftTeeVector;", "\u295E" },
+            { "&DownLeftVectorBar;", "\u2956" },
+            { "&DownLeftVector;", "\u21BD" },
+            { "&DownRightTeeVector;", "\u295F" },
+            { "&DownRightVectorBar;", "\u2957" },
+            { "&DownRightVector;", "\u21C1" },
+            { "&DownTeeArrow;", "\u21A7" },
+            { "&DownTee;", "\u22A4" },
+            { "&drbkarow;", "\u2910" },
+            { "&drcorn;", "\u231F" },
+            { "&drcrop;", "\u230C" },
+            { "&Dscr;", "\uD835\uDC9F" },
+            { "&dscr;", "\uD835\uDCB9" },
+            { "&DScy;", "\u0405" },
+            { "&dscy;", "\u0455" },
+            { "&dsol;", "\u29F6" },
+            { "&Dstrok;", "\u0110" },
+            { "&dstrok;", "\u0111" },
+            { "&dtdot;", "\u22F1" },
+            { "&dtri;", "\u25BF" },
+            { "&dtrif;", "\u25BE" },
+            { "&duarr;", "\u21F5" },
+            { "&duhar;", "\u296F" },
+            { "&dwangle;", "\u29A6" },
+            { "&DZcy;", "\u040F" },
+            { "&dzcy;", "\u045F" },
+            { "&dzigrarr;", "\u27FF" },
+            { "&Eacute;", "\u00C9" },
+            { "&Eacute", "\u00C9" },
+            { "&eacute;", "\u00E9" },
+            { "&eacute", "\u00E9" },
+            { "&easter;", "\u2A6E" },
+            { "&Ecaron;", "\u011A" },
+            { "&ecaron;", "\u011B" },
+            { "&Ecirc;", "\u00CA" },
+            { "&Ecirc", "\u00CA" },
+            { "&ecirc;", "\u00EA" },
+            { "&ecirc", "\u00EA" },
+            { "&ecir;", "\u2256" },
+            { "&ecolon;", "\u2255" },
+            { "&Ecy;", "\u042D" },
+            { "&ecy;", "\u044D" },
+            { "&eDDot;", "\u2A77" },
+            { "&Edot;", "\u0116" },
+            { "&edot;", "\u0117" },
+            { "&eDot;", "\u2251" },
+            { "&ee;", "\u2147" },
+            { "&efDot;", "\u2252" },
+            { "&Efr;", "\uD835\uDD08" },
+            { "&efr;", "\uD835\uDD22" },
+            { "&eg;", "\u2A9A" },
+            { "&Egrave;", "\u00C8" },
+            { "&Egrave", "\u00C8" },
+            { "&egrave;", "\u00E8" },
+            { "&egrave", "\u00E8" },
+            { "&egs;", "\u2A96" },
+            { "&egsdot;", "\u2A98" },
+            { "&el;", "\u2A99" },
+            { "&Element;", "\u2208" },
+            { "&elinters;", "\u23E7" },
+            { "&ell;", "\u2113" },
+            { "&els;", "\u2A95" },
+            { "&elsdot;", "\u2A97" },
+            { "&Emacr;", "\u0112" },
+            { "&emacr;", "\u0113" },
+            { "&empty;", "\u2205" },
+            { "&emptyset;", "\u2205" },
+            { "&EmptySmallSquare;", "\u25FB" },
+            { "&emptyv;", "\u2205" },
+            { "&EmptyVerySmallSquare;", "\u25AB" },
+            { "&emsp13;", "\u2004" },
+            { "&emsp14;", "\u2005" },
+            { "&emsp;", "\u2003" },
+            { "&ENG;", "\u014A" },
+            { "&eng;", "\u014B" },
+            { "&ensp;", "\u2002" },
+            { "&Eogon;", "\u0118" },
+            { "&eogon;", "\u0119" },
+            { "&Eopf;", "\uD835\uDD3C" },
+            { "&eopf;", "\uD835\uDD56" },
+            { "&epar;", "\u22D5" },
+            { "&eparsl;", "\u29E3" },
+            { "&eplus;", "\u2A71" },
+            { "&epsi;", "\u03B5" },
+            { "&Epsilon;", "\u0395" },
+            { "&epsilon;", "\u03B5" },
+            { "&epsiv;", "\u03F5" },
+            { "&eqcirc;", "\u2256" },
+            { "&eqcolon;", "\u2255" },
+            { "&eqsim;", "\u2242" },
+            { "&eqslantgtr;", "\u2A96" },
+            { "&eqslantless;", "\u2A95" },
+            { "&Equal;", "\u2A75" },
+            { "&equals;", "\u003D" },
+            { "&EqualTilde;", "\u2242" },
+            { "&equest;", "\u225F" },
+            { "&Equilibrium;", "\u21CC" },
+            { "&equiv;", "\u2261" },
+            { "&equivDD;", "\u2A78" },
+            { "&eqvparsl;", "\u29E5" },
+            { "&erarr;", "\u2971" },
+            { "&erDot;", "\u2253" },
+            { "&escr;", "\u212F" },
+            { "&Escr;", "\u2130" },
+            { "&esdot;", "\u2250" },
+            { "&Esim;", "\u2A73" },
+            { "&esim;", "\u2242" },
+            { "&Eta;", "\u0397" },
+            { "&eta;", "\u03B7" },
+            { "&ETH;", "\u00D0" },
+            { "&ETH", "\u00D0" },
+            { "&eth;", "\u00F0" },
+            { "&eth", "\u00F0" },
+            { "&Euml;", "\u00CB" },
+            { "&Euml", "\u00CB" },
+            { "&euml;", "\u00EB" },
+            { "&euml", "\u00EB" },
+            { "&euro;", "\u20AC" },
+            { "&excl;", "\u0021" },
+            { "&exist;", "\u2203" },
+            { "&Exists;", "\u2203" },
+            { "&expectation;", "\u2130" },
+            { "&exponentiale;", "\u2147" },
+            { "&ExponentialE;", "\u2147" },
+            { "&fallingdotseq;", "\u2252" },
+            { "&Fcy;", "\u0424" },
+            { "&fcy;", "\u0444" },
+            { "&female;", "\u2640" },
+            { "&ffilig;", "\uFB03" },
+            { "&fflig;", "\uFB00" },
+            { "&ffllig;", "\uFB04" },
+            { "&Ffr;", "\uD835\uDD09" },
+            { "&ffr;", "\uD835\uDD23" },
+            { "&filig;", "\uFB01" },
+            { "&FilledSmallSquare;", "\u25FC" },
+            { "&FilledVerySmallSquare;", "\u25AA" },
+            { "&fjlig;", "\u0066\u006A" },
+            { "&flat;", "\u266D" },
+            { "&fllig;", "\uFB02" },
+            { "&fltns;", "\u25B1" },
+            { "&fnof;", "\u0192" },
+            { "&Fopf;", "\uD835\uDD3D" },
+            { "&fopf;", "\uD835\uDD57" },
+            { "&forall;", "\u2200" },
+            { "&ForAll;", "\u2200" },
+            { "&fork;", "\u22D4" },
+            { "&forkv;", "\u2AD9" },
+            { "&Fouriertrf;", "\u2131" },
+            { "&fpartint;", "\u2A0D" },
+            { "&frac12;", "\u00BD" },
+            { "&frac12", "\u00BD" },
+            { "&frac13;", "\u2153" },
+            { "&frac14;", "\u00BC" },
+            { "&frac14", "\u00BC" },
+            { "&frac15;", "\u2155" },
+            { "&frac16;", "\u2159" },
+            { "&frac18;", "\u215B" },
+            { "&frac23;", "\u2154" },
+            { "&frac25;", "\u2156" },
+            { "&frac34;", "\u00BE" },
+            { "&frac34", "\u00BE" },
+            { "&frac35;", "\u2157" },
+            { "&frac38;", "\u215C" },
+            { "&frac45;", "\u2158" },
+            { "&frac56;", "\u215A" },
+            { "&frac58;", "\u215D" },
+            { "&frac78;", "\u215E" },
+            { "&frasl;", "\u2044" },
+            { "&frown;", "\u2322" },
+            { "&fscr;", "\uD835\uDCBB" },
+            { "&Fscr;", "\u2131" },
+            { "&gacute;", "\u01F5" },
+            { "&Gamma;", "\u0393" },
+            { "&gamma;", "\u03B3" },
+            { "&Gammad;", "\u03DC" },
+            { "&gammad;", "\u03DD" },
+            { "&gap;", "\u2A86" },
+            { "&Gbreve;", "\u011E" },
+            { "&gbreve;", "\u011F" },
+            { "&Gcedil;", "\u0122" },
+            { "&Gcirc;", "\u011C" },
+            { "&gcirc;", "\u011D" },
+            { "&Gcy;", "\u0413" },
+            { "&gcy;", "\u0433" },
+            { "&Gdot;", "\u0120" },
+            { "&gdot;", "\u0121" },
+            { "&ge;", "\u2265" },
+            { "&gE;", "\u2267" },
+            { "&gEl;", "\u2A8C" },
+            { "&gel;", "\u22DB" },
+            { "&geq;", "\u2265" },
+            { "&geqq;", "\u2267" },
+            { "&geqslant;", "\u2A7E" },
+            { "&gescc;", "\u2AA9" },
+            { "&ges;", "\u2A7E" },
+            { "&gesdot;", "\u2A80" },
+            { "&gesdoto;", "\u2A82" },
+            { "&gesdotol;", "\u2A84" },
+            { "&gesl;", "\u22DB\uFE00" },
+            { "&gesles;", "\u2A94" },
+            { "&Gfr;", "\uD835\uDD0A" },
+            { "&gfr;", "\uD835\uDD24" },
+            { "&gg;", "\u226B" },
+            { "&Gg;", "\u22D9" },
+            { "&ggg;", "\u22D9" },
+            { "&gimel;", "\u2137" },
+            { "&GJcy;", "\u0403" },
+            { "&gjcy;", "\u0453" },
+            { "&gla;", "\u2AA5" },
+            { "&gl;", "\u2277" },
+            { "&glE;", "\u2A92" },
+            { "&glj;", "\u2AA4" },
+            { "&gnap;", "\u2A8A" },
+            { "&gnapprox;", "\u2A8A" },
+            { "&gne;", "\u2A88" },
+            { "&gnE;", "\u2269" },
+            { "&gneq;", "\u2A88" },
+            { "&gneqq;", "\u2269" },
+            { "&gnsim;", "\u22E7" },
+            { "&Gopf;", "\uD835\uDD3E" },
+            { "&gopf;", "\uD835\uDD58" },
+            { "&grave;", "\u0060" },
+            { "&GreaterEqual;", "\u2265" },
+            { "&GreaterEqualLess;", "\u22DB" },
+            { "&GreaterFullEqual;", "\u2267" },
+            { "&GreaterGreater;", "\u2AA2" },
+            { "&GreaterLess;", "\u2277" },
+            { "&GreaterSlantEqual;", "\u2A7E" },
+            { "&GreaterTilde;", "\u2273" },
+            { "&Gscr;", "\uD835\uDCA2" },
+            { "&gscr;", "\u210A" },
+            { "&gsim;", "\u2273" },
+            { "&gsime;", "\u2A8E" },
+            { "&gsiml;", "\u2A90" },
+            { "&gtcc;", "\u2AA7" },
+            { "&gtcir;", "\u2A7A" },
+            { "&gt;", "\u003E" },
+            { "&gt", "\u003E" },
+            { "&GT;", "\u003E" },
+            { "&GT", "\u003E" },
+            { "&Gt;", "\u226B" },
+            { "&gtdot;", "\u22D7" },
+            { "&gtlPar;", "\u2995" },
+            { "&gtquest;", "\u2A7C" },
+            { "&gtrapprox;", "\u2A86" },
+            { "&gtrarr;", "\u2978" },
+            { "&gtrdot;", "\u22D7" },
+            { "&gtreqless;", "\u22DB" },
+            { "&gtreqqless;", "\u2A8C" },
+            { "&gtrless;", "\u2277" },
+            { "&gtrsim;", "\u2273" },
+            { "&gvertneqq;", "\u2269\uFE00" },
+            { "&gvnE;", "\u2269\uFE00" },
+            { "&Hacek;", "\u02C7" },
+            { "&hairsp;", "\u200A" },
+            { "&half;", "\u00BD" },
+            { "&hamilt;", "\u210B" },
+            { "&HARDcy;", "\u042A" },
+            { "&hardcy;", "\u044A" },
+            { "&harrcir;", "\u2948" },
+            { "&harr;", "\u2194" },
+            { "&hArr;", "\u21D4" },
+            { "&harrw;", "\u21AD" },
+            { "&Hat;", "\u005E" },
+            { "&hbar;", "\u210F" },
+            { "&Hcirc;", "\u0124" },
+            { "&hcirc;", "\u0125" },
+            { "&hearts;", "\u2665" },
+            { "&heartsuit;", "\u2665" },
+            { "&hellip;", "\u2026" },
+            { "&hercon;", "\u22B9" },
+            { "&hfr;", "\uD835\uDD25" },
+            { "&Hfr;", "\u210C" },
+            { "&HilbertSpace;", "\u210B" },
+            { "&hksearow;", "\u2925" },
+            { "&hkswarow;", "\u2926" },
+            { "&hoarr;", "\u21FF" },
+            { "&homtht;", "\u223B" },
+            { "&hookleftarrow;", "\u21A9" },
+            { "&hookrightarrow;", "\u21AA" },
+            { "&hopf;", "\uD835\uDD59" },
+            { "&Hopf;", "\u210D" },
+            { "&horbar;", "\u2015" },
+            { "&HorizontalLine;", "\u2500" },
+            { "&hscr;", "\uD835\uDCBD" },
+            { "&Hscr;", "\u210B" },
+            { "&hslash;", "\u210F" },
+            { "&Hstrok;", "\u0126" },
+            { "&hstrok;", "\u0127" },
+            { "&HumpDownHump;", "\u224E" },
+            { "&HumpEqual;", "\u224F" },
+            { "&hybull;", "\u2043" },
+            { "&hyphen;", "\u2010" },
+            { "&Iacute;", "\u00CD" },
+            { "&Iacute", "\u00CD" },
+            { "&iacute;", "\u00ED" },
+            { "&iacute", "\u00ED" },
+            { "&ic;", "\u2063" },
+            { "&Icirc;", "\u00CE" },
+            { "&Icirc", "\u00CE" },
+            { "&icirc;", "\u00EE" },
+            { "&icirc", "\u00EE" },
+            { "&Icy;", "\u0418" },
+            { "&icy;", "\u0438" },
+            { "&Idot;", "\u0130" },
+            { "&IEcy;", "\u0415" },
+            { "&iecy;", "\u0435" },
+            { "&iexcl;", "\u00A1" },
+            { "&iexcl", "\u00A1" },
+            { "&iff;", "\u21D4" },
+            { "&ifr;", "\uD835\uDD26" },
+            { "&Ifr;", "\u2111" },
+            { "&Igrave;", "\u00CC" },
+            { "&Igrave", "\u00CC" },
+            { "&igrave;", "\u00EC" },
+            { "&igrave", "\u00EC" },
+            { "&ii;", "\u2148" },
+            { "&iiiint;", "\u2A0C" },
+            { "&iiint;", "\u222D" },
+            { "&iinfin;", "\u29DC" },
+            { "&iiota;", "\u2129" },
+            { "&IJlig;", "\u0132" },
+            { "&ijlig;", "\u0133" },
+            { "&Imacr;", "\u012A" },
+            { "&imacr;", "\u012B" },
+            { "&image;", "\u2111" },
+            { "&ImaginaryI;", "\u2148" },
+            { "&imagline;", "\u2110" },
+            { "&imagpart;", "\u2111" },
+            { "&imath;", "\u0131" },
+            { "&Im;", "\u2111" },
+            { "&imof;", "\u22B7" },
+            { "&imped;", "\u01B5" },
+            { "&Implies;", "\u21D2" },
+            { "&incare;", "\u2105" },
+            { "&in;", "\u2208" },
+            { "&infin;", "\u221E" },
+            { "&infintie;", "\u29DD" },
+            { "&inodot;", "\u0131" },
+            { "&intcal;", "\u22BA" },
+            { "&int;", "\u222B" },
+            { "&Int;", "\u222C" },
+            { "&integers;", "\u2124" },
+            { "&Integral;", "\u222B" },
+            { "&intercal;", "\u22BA" },
+            { "&Intersection;", "\u22C2" },
+            { "&intlarhk;", "\u2A17" },
+            { "&intprod;", "\u2A3C" },
+            { "&InvisibleComma;", "\u2063" },
+            { "&InvisibleTimes;", "\u2062" },
+            { "&IOcy;", "\u0401" },
+            { "&iocy;", "\u0451" },
+            { "&Iogon;", "\u012E" },
+            { "&iogon;", "\u012F" },
+            { "&Iopf;", "\uD835\uDD40" },
+            { "&iopf;", "\uD835\uDD5A" },
+            { "&Iota;", "\u0399" },
+            { "&iota;", "\u03B9" },
+            { "&iprod;", "\u2A3C" },
+            { "&iquest;", "\u00BF" },
+            { "&iquest", "\u00BF" },
+            { "&iscr;", "\uD835\uDCBE" },
+            { "&Iscr;", "\u2110" },
+            { "&isin;", "\u2208" },
+            { "&isindot;", "\u22F5" },
+            { "&isinE;", "\u22F9" },
+            { "&isins;", "\u22F4" },
+            { "&isinsv;", "\u22F3" },
+            { "&isinv;", "\u2208" },
+            { "&it;", "\u2062" },
+            { "&Itilde;", "\u0128" },
+            { "&itilde;", "\u0129" },
+            { "&Iukcy;", "\u0406" },
+            { "&iukcy;", "\u0456" },
+            { "&Iuml;", "\u00CF" },
+            { "&Iuml", "\u00CF" },
+            { "&iuml;", "\u00EF" },
+            { "&iuml", "\u00EF" },
+            { "&Jcirc;", "\u0134" },
+            { "&jcirc;", "\u0135" },
+            { "&Jcy;", "\u0419" },
+            { "&jcy;", "\u0439" },
+            { "&Jfr;", "\uD835\uDD0D" },
+            { "&jfr;", "\uD835\uDD27" },
+            { "&jmath;", "\u0237" },
+            { "&Jopf;", "\uD835\uDD41" },
+            { "&jopf;", "\uD835\uDD5B" },
+            { "&Jscr;", "\uD835\uDCA5" },
+            { "&jscr;", "\uD835\uDCBF" },
+            { "&Jsercy;", "\u0408" },
+            { "&jsercy;", "\u0458" },
+            { "&Jukcy;", "\u0404" },
+            { "&jukcy;", "\u0454" },
+            { "&Kappa;", "\u039A" },
+            { "&kappa;", "\u03BA" },
+            { "&kappav;", "\u03F0" },
+            { "&Kcedil;", "\u0136" },
+            { "&kcedil;", "\u0137" },
+            { "&Kcy;", "\u041A" },
+            { "&kcy;", "\u043A" },
+            { "&Kfr;", "\uD835\uDD0E" },
+            { "&kfr;", "\uD835\uDD28" },
+            { "&kgreen;", "\u0138" },
+            { "&KHcy;", "\u0425" },
+            { "&khcy;", "\u0445" },
+            { "&KJcy;", "\u040C" },
+            { "&kjcy;", "\u045C" },
+            { "&Kopf;", "\uD835\uDD42" },
+            { "&kopf;", "\uD835\uDD5C" },
+            { "&Kscr;", "\uD835\uDCA6" },
+            { "&kscr;", "\uD835\uDCC0" },
+            { "&lAarr;", "\u21DA" },
+            { "&Lacute;", "\u0139" },
+            { "&lacute;", "\u013A" },
+            { "&laemptyv;", "\u29B4" },
+            { "&lagran;", "\u2112" },
+            { "&Lambda;", "\u039B" },
+            { "&lambda;", "\u03BB" },
+            { "&lang;", "\u27E8" },
+            { "&Lang;", "\u27EA" },
+            { "&langd;", "\u2991" },
+            { "&langle;", "\u27E8" },
+            { "&lap;", "\u2A85" },
+            { "&Laplacetrf;", "\u2112" },
+            { "&laquo;", "\u00AB" },
+            { "&laquo", "\u00AB" },
+            { "&larrb;", "\u21E4" },
+            { "&larrbfs;", "\u291F" },
+            { "&larr;", "\u2190" },
+            { "&Larr;", "\u219E" },
+            { "&lArr;", "\u21D0" },
+            { "&larrfs;", "\u291D" },
+            { "&larrhk;", "\u21A9" },
+            { "&larrlp;", "\u21AB" },
+            { "&larrpl;", "\u2939" },
+            { "&larrsim;", "\u2973" },
+            { "&larrtl;", "\u21A2" },
+            { "&latail;", "\u2919" },
+            { "&lAtail;", "\u291B" },
+            { "&lat;", "\u2AAB" },
+            { "&late;", "\u2AAD" },
+            { "&lates;", "\u2AAD\uFE00" },
+            { "&lbarr;", "\u290C" },
+            { "&lBarr;", "\u290E" },
+            { "&lbbrk;", "\u2772" },
+            { "&lbrace;", "\u007B" },
+            { "&lbrack;", "\u005B" },
+            { "&lbrke;", "\u298B" },
+            { "&lbrksld;", "\u298F" },
+            { "&lbrkslu;", "\u298D" },
+            { "&Lcaron;", "\u013D" },
+            { "&lcaron;", "\u013E" },
+            { "&Lcedil;", "\u013B" },
+            { "&lcedil;", "\u013C" },
+            { "&lceil;", "\u2308" },
+            { "&lcub;", "\u007B" },
+            { "&Lcy;", "\u041B" },
+            { "&lcy;", "\u043B" },
+            { "&ldca;", "\u2936" },
+            { "&ldquo;", "\u201C" },
+            { "&ldquor;", "\u201E" },
+            { "&ldrdhar;", "\u2967" },
+            { "&ldrushar;", "\u294B" },
+            { "&ldsh;", "\u21B2" },
+            { "&le;", "\u2264" },
+            { "&lE;", "\u2266" },
+            { "&LeftAngleBracket;", "\u27E8" },
+            { "&LeftArrowBar;", "\u21E4" },
+            { "&leftarrow;", "\u2190" },
+            { "&LeftArrow;", "\u2190" },
+            { "&Leftarrow;", "\u21D0" },
+            { "&LeftArrowRightArrow;", "\u21C6" },
+            { "&leftarrowtail;", "\u21A2" },
+            { "&LeftCeiling;", "\u2308" },
+            { "&LeftDoubleBracket;", "\u27E6" },
+            { "&LeftDownTeeVector;", "\u2961" },
+            { "&LeftDownVectorBar;", "\u2959" },
+            { "&LeftDownVector;", "\u21C3" },
+            { "&LeftFloor;", "\u230A" },
+            { "&leftharpoondown;", "\u21BD" },
+            { "&leftharpoonup;", "\u21BC" },
+            { "&leftleftarrows;", "\u21C7" },
+            { "&leftrightarrow;", "\u2194" },
+            { "&LeftRightArrow;", "\u2194" },
+            { "&Leftrightarrow;", "\u21D4" },
+            { "&leftrightarrows;", "\u21C6" },
+            { "&leftrightharpoons;", "\u21CB" },
+            { "&leftrightsquigarrow;", "\u21AD" },
+            { "&LeftRightVector;", "\u294E" },
+            { "&LeftTeeArrow;", "\u21A4" },
+            { "&LeftTee;", "\u22A3" },
+            { "&LeftTeeVector;", "\u295A" },
+            { "&leftthreetimes;", "\u22CB" },
+            { "&LeftTriangleBar;", "\u29CF" },
+            { "&LeftTriangle;", "\u22B2" },
+            { "&LeftTriangleEqual;", "\u22B4" },
+            { "&LeftUpDownVector;", "\u2951" },
+            { "&LeftUpTeeVector;", "\u2960" },
+            { "&LeftUpVectorBar;", "\u2958" },
+            { "&LeftUpVector;", "\u21BF" },
+            { "&LeftVectorBar;", "\u2952" },
+            { "&LeftVector;", "\u21BC" },
+            { "&lEg;", "\u2A8B" },
+            { "&leg;", "\u22DA" },
+            { "&leq;", "\u2264" },
+            { "&leqq;", "\u2266" },
+            { "&leqslant;", "\u2A7D" },
+            { "&lescc;", "\u2AA8" },
+            { "&les;", "\u2A7D" },
+            { "&lesdot;", "\u2A7F" },
+            { "&lesdoto;", "\u2A81" },
+            { "&lesdotor;", "\u2A83" },
+            { "&lesg;", "\u22DA\uFE00" },
+            { "&lesges;", "\u2A93" },
+            { "&lessapprox;", "\u2A85" },
+            { "&lessdot;", "\u22D6" },
+            { "&lesseqgtr;", "\u22DA" },
+            { "&lesseqqgtr;", "\u2A8B" },
+            { "&LessEqualGreater;", "\u22DA" },
+            { "&LessFullEqual;", "\u2266" },
+            { "&LessGreater;", "\u2276" },
+            { "&lessgtr;", "\u2276" },
+            { "&LessLess;", "\u2AA1" },
+            { "&lesssim;", "\u2272" },
+            { "&LessSlantEqual;", "\u2A7D" },
+            { "&LessTilde;", "\u2272" },
+            { "&lfisht;", "\u297C" },
+            { "&lfloor;", "\u230A" },
+            { "&Lfr;", "\uD835\uDD0F" },
+            { "&lfr;", "\uD835\uDD29" },
+            { "&lg;", "\u2276" },
+            { "&lgE;", "\u2A91" },
+            { "&lHar;", "\u2962" },
+            { "&lhard;", "\u21BD" },
+            { "&lharu;", "\u21BC" },
+            { "&lharul;", "\u296A" },
+            { "&lhblk;", "\u2584" },
+            { "&LJcy;", "\u0409" },
+            { "&ljcy;", "\u0459" },
+            { "&llarr;", "\u21C7" },
+            { "&ll;", "\u226A" },
+            { "&Ll;", "\u22D8" },
+            { "&llcorner;", "\u231E" },
+            { "&Lleftarrow;", "\u21DA" },
+            { "&llhard;", "\u296B" },
+            { "&lltri;", "\u25FA" },
+            { "&Lmidot;", "\u013F" },
+            { "&lmidot;", "\u0140" },
+            { "&lmoustache;", "\u23B0" },
+            { "&lmoust;", "\u23B0" },
+            { "&lnap;", "\u2A89" },
+            { "&lnapprox;", "\u2A89" },
+            { "&lne;", "\u2A87" },
+            { "&lnE;", "\u2268" },
+            { "&lneq;", "\u2A87" },
+            { "&lneqq;", "\u2268" },
+            { "&lnsim;", "\u22E6" },
+            { "&loang;", "\u27EC" },
+            { "&loarr;", "\u21FD" },
+            { "&lobrk;", "\u27E6" },
+            { "&longleftarrow;", "\u27F5" },
+            { "&LongLeftArrow;", "\u27F5" },
+            { "&Longleftarrow;", "\u27F8" },
+            { "&longleftrightarrow;", "\u27F7" },
+            { "&LongLeftRightArrow;", "\u27F7" },
+            { "&Longleftrightarrow;", "\u27FA" },
+            { "&longmapsto;", "\u27FC" },
+            { "&longrightarrow;", "\u27F6" },
+            { "&LongRightArrow;", "\u27F6" },
+            { "&Longrightarrow;", "\u27F9" },
+            { "&looparrowleft;", "\u21AB" },
+            { "&looparrowright;", "\u21AC" },
+            { "&lopar;", "\u2985" },
+            { "&Lopf;", "\uD835\uDD43" },
+            { "&lopf;", "\uD835\uDD5D" },
+            { "&loplus;", "\u2A2D" },
+            { "&lotimes;", "\u2A34" },
+            { "&lowast;", "\u2217" },
+            { "&lowbar;", "\u005F" },
+            { "&LowerLeftArrow;", "\u2199" },
+            { "&LowerRightArrow;", "\u2198" },
+            { "&loz;", "\u25CA" },
+            { "&lozenge;", "\u25CA" },
+            { "&lozf;", "\u29EB" },
+            { "&lpar;", "\u0028" },
+            { "&lparlt;", "\u2993" },
+            { "&lrarr;", "\u21C6" },
+            { "&lrcorner;", "\u231F" },
+            { "&lrhar;", "\u21CB" },
+            { "&lrhard;", "\u296D" },
+            { "&lrm;", "\u200E" },
+            { "&lrtri;", "\u22BF" },
+            { "&lsaquo;", "\u2039" },
+            { "&lscr;", "\uD835\uDCC1" },
+            { "&Lscr;", "\u2112" },
+            { "&lsh;", "\u21B0" },
+            { "&Lsh;", "\u21B0" },
+            { "&lsim;", "\u2272" },
+            { "&lsime;", "\u2A8D" },
+            { "&lsimg;", "\u2A8F" },
+            { "&lsqb;", "\u005B" },
+            { "&lsquo;", "\u2018" },
+            { "&lsquor;", "\u201A" },
+            { "&Lstrok;", "\u0141" },
+            { "&lstrok;", "\u0142" },
+            { "&ltcc;", "\u2AA6" },
+            { "&ltcir;", "\u2A79" },
+            { "&lt;", "\u003C" },
+            { "&lt", "\u003C" },
+            { "&LT;", "\u003C" },
+            { "&LT", "\u003C" },
+            { "&Lt;", "\u226A" },
+            { "&ltdot;", "\u22D6" },
+            { "&lthree;", "\u22CB" },
+            { "&ltimes;", "\u22C9" },
+            { "&ltlarr;", "\u2976" },
+            { "&ltquest;", "\u2A7B" },
+            { "&ltri;", "\u25C3" },
+            { "&ltrie;", "\u22B4" },
+            { "&ltrif;", "\u25C2" },
+            { "&ltrPar;", "\u2996" },
+            { "&lurdshar;", "\u294A" },
+            { "&luruhar;", "\u2966" },
+            { "&lvertneqq;", "\u2268\uFE00" },
+            { "&lvnE;", "\u2268\uFE00" },
+            { "&macr;", "\u00AF" },
+            { "&macr", "\u00AF" },
+            { "&male;", "\u2642" },
+            { "&malt;", "\u2720" },
+            { "&maltese;", "\u2720" },
+            { "&Map;", "\u2905" },
+            { "&map;", "\u21A6" },
+            { "&mapsto;", "\u21A6" },
+            { "&mapstodown;", "\u21A7" },
+            { "&mapstoleft;", "\u21A4" },
+            { "&mapstoup;", "\u21A5" },
+            { "&marker;", "\u25AE" },
+            { "&mcomma;", "\u2A29" },
+            { "&Mcy;", "\u041C" },
+            { "&mcy;", "\u043C" },
+            { "&mdash;", "\u2014" },
+            { "&mDDot;", "\u223A" },
+            { "&measuredangle;", "\u2221" },
+            { "&MediumSpace;", "\u205F" },
+            { "&Mellintrf;", "\u2133" },
+            { "&Mfr;", "\uD835\uDD10" },
+            { "&mfr;", "\uD835\uDD2A" },
+            { "&mho;", "\u2127" },
+            { "&micro;", "\u00B5" },
+            { "&micro", "\u00B5" },
+            { "&midast;", "\u002A" },
+            { "&midcir;", "\u2AF0" },
+            { "&mid;", "\u2223" },
+            { "&middot;", "\u00B7" },
+            { "&middot", "\u00B7" },
+            { "&minusb;", "\u229F" },
+            { "&minus;", "\u2212" },
+            { "&minusd;", "\u2238" },
+            { "&minusdu;", "\u2A2A" },
+            { "&MinusPlus;", "\u2213" },
+            { "&mlcp;", "\u2ADB" },
+            { "&mldr;", "\u2026" },
+            { "&mnplus;", "\u2213" },
+            { "&models;", "\u22A7" },
+            { "&Mopf;", "\uD835\uDD44" },
+            { "&mopf;", "\uD835\uDD5E" },
+            { "&mp;", "\u2213" },
+            { "&mscr;", "\uD835\uDCC2" },
+            { "&Mscr;", "\u2133" },
+            { "&mstpos;", "\u223E" },
+            { "&Mu;", "\u039C" },
+            { "&mu;", "\u03BC" },
+            { "&multimap;", "\u22B8" },
+            { "&mumap;", "\u22B8" },
+            { "&nabla;", "\u2207" },
+            { "&Nacute;", "\u0143" },
+            { "&nacute;", "\u0144" },
+            { "&nang;", "\u2220\u20D2" },
+            { "&nap;", "\u2249" },
+            { "&napE;", "\u2A70\u0338" },
+            { "&napid;", "\u224B\u0338" },
+            { "&napos;", "\u0149" },
+            { "&napprox;", "\u2249" },
+            { "&natural;", "\u266E" },
+            { "&naturals;", "\u2115" },
+            { "&natur;", "\u266E" },
+            { "&nbsp;", "\u00A0" },
+            { "&nbsp", "\u00A0" },
+            { "&nbump;", "\u224E\u0338" },
+            { "&nbumpe;", "\u224F\u0338" },
+            { "&ncap;", "\u2A43" },
+            { "&Ncaron;", "\u0147" },
+            { "&ncaron;", "\u0148" },
+            { "&Ncedil;", "\u0145" },
+            { "&ncedil;", "\u0146" },
+            { "&ncong;", "\u2247" },
+            { "&ncongdot;", "\u2A6D\u0338" },
+            { "&ncup;", "\u2A42" },
+            { "&Ncy;", "\u041D" },
+            { "&ncy;", "\u043D" },
+            { "&ndash;", "\u2013" },
+            { "&nearhk;", "\u2924" },
+            { "&nearr;", "\u2197" },
+            { "&neArr;", "\u21D7" },
+            { "&nearrow;", "\u2197" },
+            { "&ne;", "\u2260" },
+            { "&nedot;", "\u2250\u0338" },
+            { "&NegativeMediumSpace;", "\u200B" },
+            { "&NegativeThickSpace;", "\u200B" },
+            { "&NegativeThinSpace;", "\u200B" },
+            { "&NegativeVeryThinSpace;", "\u200B" },
+            { "&nequiv;", "\u2262" },
+            { "&nesear;", "\u2928" },
+            { "&nesim;", "\u2242\u0338" },
+            { "&NestedGreaterGreater;", "\u226B" },
+            { "&NestedLessLess;", "\u226A" },
+            { "&NewLine;", "\u000A" },
+            { "&nexist;", "\u2204" },
+            { "&nexists;", "\u2204" },
+            { "&Nfr;", "\uD835\uDD11" },
+            { "&nfr;", "\uD835\uDD2B" },
+            { "&ngE;", "\u2267\u0338" },
+            { "&nge;", "\u2271" },
+            { "&ngeq;", "\u2271" },
+            { "&ngeqq;", "\u2267\u0338" },
+            { "&ngeqslant;", "\u2A7E\u0338" },
+            { "&nges;", "\u2A7E\u0338" },
+            { "&nGg;", "\u22D9\u0338" },
+            { "&ngsim;", "\u2275" },
+            { "&nGt;", "\u226B\u20D2" },
+            { "&ngt;", "\u226F" },
+            { "&ngtr;", "\u226F" },
+            { "&nGtv;", "\u226B\u0338" },
+            { "&nharr;", "\u21AE" },
+            { "&nhArr;", "\u21CE" },
+            { "&nhpar;", "\u2AF2" },
+            { "&ni;", "\u220B" },
+            { "&nis;", "\u22FC" },
+            { "&nisd;", "\u22FA" },
+            { "&niv;", "\u220B" },
+            { "&NJcy;", "\u040A" },
+            { "&njcy;", "\u045A" },
+            { "&nlarr;", "\u219A" },
+            { "&nlArr;", "\u21CD" },
+            { "&nldr;", "\u2025" },
+            { "&nlE;", "\u2266\u0338" },
+            { "&nle;", "\u2270" },
+            { "&nleftarrow;", "\u219A" },
+            { "&nLeftarrow;", "\u21CD" },
+            { "&nleftrightarrow;", "\u21AE" },
+            { "&nLeftrightarrow;", "\u21CE" },
+            { "&nleq;", "\u2270" },
+            { "&nleqq;", "\u2266\u0338" },
+            { "&nleqslant;", "\u2A7D\u0338" },
+            { "&nles;", "\u2A7D\u0338" },
+            { "&nless;", "\u226E" },
+            { "&nLl;", "\u22D8\u0338" },
+            { "&nlsim;", "\u2274" },
+            { "&nLt;", "\u226A\u20D2" },
+            { "&nlt;", "\u226E" },
+            { "&nltri;", "\u22EA" },
+            { "&nltrie;", "\u22EC" },
+            { "&nLtv;", "\u226A\u0338" },
+            { "&nmid;", "\u2224" },
+            { "&NoBreak;", "\u2060" },
+            { "&NonBreakingSpace;", "\u00A0" },
+            { "&nopf;", "\uD835\uDD5F" },
+            { "&Nopf;", "\u2115" },
+            { "&Not;", "\u2AEC" },
+            { "&not;", "\u00AC" },
+            { "&not", "\u00AC" },
+            { "&NotCongruent;", "\u2262" },
+            { "&NotCupCap;", "\u226D" },
+            { "&NotDoubleVerticalBar;", "\u2226" },
+            { "&NotElement;", "\u2209" },
+            { "&NotEqual;", "\u2260" },
+            { "&NotEqualTilde;", "\u2242\u0338" },
+            { "&NotExists;", "\u2204" },
+            { "&NotGreater;", "\u226F" },
+            { "&NotGreaterEqual;", "\u2271" },
+            { "&NotGreaterFullEqual;", "\u2267\u0338" },
+            { "&NotGreaterGreater;", "\u226B\u0338" },
+            { "&NotGreaterLess;", "\u2279" },
+            { "&NotGreaterSlantEqual;", "\u2A7E\u0338" },
+            { "&NotGreaterTilde;", "\u2275" },
+            { "&NotHumpDownHump;", "\u224E\u0338" },
+            { "&NotHumpEqual;", "\u224F\u0338" },
+            { "&notin;", "\u2209" },
+            { "&notindot;", "\u22F5\u0338" },
+            { "&notinE;", "\u22F9\u0338" },
+            { "&notinva;", "\u2209" },
+            { "&notinvb;", "\u22F7" },
+            { "&notinvc;", "\u22F6" },
+            { "&NotLeftTriangleBar;", "\u29CF\u0338" },
+            { "&NotLeftTriangle;", "\u22EA" },
+            { "&NotLeftTriangleEqual;", "\u22EC" },
+            { "&NotLess;", "\u226E" },
+            { "&NotLessEqual;", "\u2270" },
+            { "&NotLessGreater;", "\u2278" },
+            { "&NotLessLess;", "\u226A\u0338" },
+            { "&NotLessSlantEqual;", "\u2A7D\u0338" },
+            { "&NotLessTilde;", "\u2274" },
+            { "&NotNestedGreaterGreater;", "\u2AA2\u0338" },
+            { "&NotNestedLessLess;", "\u2AA1\u0338" },
+            { "&notni;", "\u220C" },
+            { "&notniva;", "\u220C" },
+            { "&notnivb;", "\u22FE" },
+            { "&notnivc;", "\u22FD" },
+            { "&NotPrecedes;", "\u2280" },
+            { "&NotPrecedesEqual;", "\u2AAF\u0338" },
+            { "&NotPrecedesSlantEqual;", "\u22E0" },
+            { "&NotReverseElement;", "\u220C" },
+            { "&NotRightTriangleBar;", "\u29D0\u0338" },
+            { "&NotRightTriangle;", "\u22EB" },
+            { "&NotRightTriangleEqual;", "\u22ED" },
+            { "&NotSquareSubset;", "\u228F\u0338" },
+            { "&NotSquareSubsetEqual;", "\u22E2" },
+            { "&NotSquareSuperset;", "\u2290\u0338" },
+            { "&NotSquareSupersetEqual;", "\u22E3" },
+            { "&NotSubset;", "\u2282\u20D2" },
+            { "&NotSubsetEqual;", "\u2288" },
+            { "&NotSucceeds;", "\u2281" },
+            { "&NotSucceedsEqual;", "\u2AB0\u0338" },
+            { "&NotSucceedsSlantEqual;", "\u22E1" },
+            { "&NotSucceedsTilde;", "\u227F\u0338" },
+            { "&NotSuperset;", "\u2283\u20D2" },
+            { "&NotSupersetEqual;", "\u2289" },
+            { "&NotTilde;", "\u2241" },
+            { "&NotTildeEqual;", "\u2244" },
+            { "&NotTildeFullEqual;", "\u2247" },
+            { "&NotTildeTilde;", "\u2249" },
+            { "&NotVerticalBar;", "\u2224" },
+            { "&nparallel;", "\u2226" },
+            { "&npar;", "\u2226" },
+            { "&nparsl;", "\u2AFD\u20E5" },
+            { "&npart;", "\u2202\u0338" },
+            { "&npolint;", "\u2A14" },
+            { "&npr;", "\u2280" },
+            { "&nprcue;", "\u22E0" },
+            { "&nprec;", "\u2280" },
+            { "&npreceq;", "\u2AAF\u0338" },
+            { "&npre;", "\u2AAF\u0338" },
+            { "&nrarrc;", "\u2933\u0338" },
+            { "&nrarr;", "\u219B" },
+            { "&nrArr;", "\u21CF" },
+            { "&nrarrw;", "\u219D\u0338" },
+            { "&nrightarrow;", "\u219B" },
+            { "&nRightarrow;", "\u21CF" },
+            { "&nrtri;", "\u22EB" },
+            { "&nrtrie;", "\u22ED" },
+            { "&nsc;", "\u2281" },
+            { "&nsccue;", "\u22E1" },
+            { "&nsce;", "\u2AB0\u0338" },
+            { "&Nscr;", "\uD835\uDCA9" },
+            { "&nscr;", "\uD835\uDCC3" },
+            { "&nshortmid;", "\u2224" },
+            { "&nshortparallel;", "\u2226" },
+            { "&nsim;", "\u2241" },
+            { "&nsime;", "\u2244" },
+            { "&nsimeq;", "\u2244" },
+            { "&nsmid;", "\u2224" },
+            { "&nspar;", "\u2226" },
+            { "&nsqsube;", "\u22E2" },
+            { "&nsqsupe;", "\u22E3" },
+            { "&nsub;", "\u2284" },
+            { "&nsubE;", "\u2AC5\u0338" },
+            { "&nsube;", "\u2288" },
+            { "&nsubset;", "\u2282\u20D2" },
+            { "&nsubseteq;", "\u2288" },
+            { "&nsubseteqq;", "\u2AC5\u0338" },
+            { "&nsucc;", "\u2281" },
+            { "&nsucceq;", "\u2AB0\u0338" },
+            { "&nsup;", "\u2285" },
+            { "&nsupE;", "\u2AC6\u0338" },
+            { "&nsupe;", "\u2289" },
+            { "&nsupset;", "\u2283\u20D2" },
+            { "&nsupseteq;", "\u2289" },
+            { "&nsupseteqq;", "\u2AC6\u0338" },
+            { "&ntgl;", "\u2279" },
+            { "&Ntilde;", "\u00D1" },
+            { "&Ntilde", "\u00D1" },
+            { "&ntilde;", "\u00F1" },
+            { "&ntilde", "\u00F1" },
+            { "&ntlg;", "\u2278" },
+            { "&ntriangleleft;", "\u22EA" },
+            { "&ntrianglelefteq;", "\u22EC" },
+            { "&ntriangleright;", "\u22EB" },
+            { "&ntrianglerighteq;", "\u22ED" },
+            { "&Nu;", "\u039D" },
+            { "&nu;", "\u03BD" },
+            { "&num;", "\u0023" },
+            { "&numero;", "\u2116" },
+            { "&numsp;", "\u2007" },
+            { "&nvap;", "\u224D\u20D2" },
+            { "&nvdash;", "\u22AC" },
+            { "&nvDash;", "\u22AD" },
+            { "&nVdash;", "\u22AE" },
+            { "&nVDash;", "\u22AF" },
+            { "&nvge;", "\u2265\u20D2" },
+            { "&nvgt;", "\u003E\u20D2" },
+            { "&nvHarr;", "\u2904" },
+            { "&nvinfin;", "\u29DE" },
+            { "&nvlArr;", "\u2902" },
+            { "&nvle;", "\u2264\u20D2" },
+            { "&nvlt;", "\u003C\u20D2" },
+            { "&nvltrie;", "\u22B4\u20D2" },
+            { "&nvrArr;", "\u2903" },
+            { "&nvrtrie;", "\u22B5\u20D2" },
+            { "&nvsim;", "\u223C\u20D2" },
+            { "&nwarhk;", "\u2923" },
+            { "&nwarr;", "\u2196" },
+            { "&nwArr;", "\u21D6" },
+            { "&nwarrow;", "\u2196" },
+            { "&nwnear;", "\u2927" },
+            { "&Oacute;", "\u00D3" },
+            { "&Oacute", "\u00D3" },
+            { "&oacute;", "\u00F3" },
+            { "&oacute", "\u00F3" },
+            { "&oast;", "\u229B" },
+            { "&Ocirc;", "\u00D4" },
+            { "&Ocirc", "\u00D4" },
+            { "&ocirc;", "\u00F4" },
+            { "&ocirc", "\u00F4" },
+            { "&ocir;", "\u229A" },
+            { "&Ocy;", "\u041E" },
+            { "&ocy;", "\u043E" },
+            { "&odash;", "\u229D" },
+            { "&Odblac;", "\u0150" },
+            { "&odblac;", "\u0151" },
+            { "&odiv;", "\u2A38" },
+            { "&odot;", "\u2299" },
+            { "&odsold;", "\u29BC" },
+            { "&OElig;", "\u0152" },
+            { "&oelig;", "\u0153" },
+            { "&ofcir;", "\u29BF" },
+            { "&Ofr;", "\uD835\uDD12" },
+            { "&ofr;", "\uD835\uDD2C" },
+            { "&ogon;", "\u02DB" },
+            { "&Ograve;", "\u00D2" },
+            { "&Ograve", "\u00D2" },
+            { "&ograve;", "\u00F2" },
+            { "&ograve", "\u00F2" },
+            { "&ogt;", "\u29C1" },
+            { "&ohbar;", "\u29B5" },
+            { "&ohm;", "\u03A9" },
+            { "&oint;", "\u222E" },
+            { "&olarr;", "\u21BA" },
+            { "&olcir;", "\u29BE" },
+            { "&olcross;", "\u29BB" },
+            { "&oline;", "\u203E" },
+            { "&olt;", "\u29C0" },
+            { "&Omacr;", "\u014C" },
+            { "&omacr;", "\u014D" },
+            { "&Omega;", "\u03A9" },
+            { "&omega;", "\u03C9" },
+            { "&Omicron;", "\u039F" },
+            { "&omicron;", "\u03BF" },
+            { "&omid;", "\u29B6" },
+            { "&ominus;", "\u2296" },
+            { "&Oopf;", "\uD835\uDD46" },
+            { "&oopf;", "\uD835\uDD60" },
+            { "&opar;", "\u29B7" },
+            { "&OpenCurlyDoubleQuote;", "\u201C" },
+            { "&OpenCurlyQuote;", "\u2018" },
+            { "&operp;", "\u29B9" },
+            { "&oplus;", "\u2295" },
+            { "&orarr;", "\u21BB" },
+            { "&Or;", "\u2A54" },
+            { "&or;", "\u2228" },
+            { "&ord;", "\u2A5D" },
+            { "&order;", "\u2134" },
+            { "&orderof;", "\u2134" },
+            { "&ordf;", "\u00AA" },
+            { "&ordf", "\u00AA" },
+            { "&ordm;", "\u00BA" },
+            { "&ordm", "\u00BA" },
+            { "&origof;", "\u22B6" },
+            { "&oror;", "\u2A56" },
+            { "&orslope;", "\u2A57" },
+            { "&orv;", "\u2A5B" },
+            { "&oS;", "\u24C8" },
+            { "&Oscr;", "\uD835\uDCAA" },
+            { "&oscr;", "\u2134" },
+            { "&Oslash;", "\u00D8" },
+            { "&Oslash", "\u00D8" },
+            { "&oslash;", "\u00F8" },
+            { "&oslash", "\u00F8" },
+            { "&osol;", "\u2298" },
+            { "&Otilde;", "\u00D5" },
+            { "&Otilde", "\u00D5" },
+            { "&otilde;", "\u00F5" },
+            { "&otilde", "\u00F5" },
+            { "&otimesas;", "\u2A36" },
+            { "&Otimes;", "\u2A37" },
+            { "&otimes;", "\u2297" },
+            { "&Ouml;", "\u00D6" },
+            { "&Ouml", "\u00D6" },
+            { "&ouml;", "\u00F6" },
+            { "&ouml", "\u00F6" },
+            { "&ovbar;", "\u233D" },
+            { "&OverBar;", "\u203E" },
+            { "&OverBrace;", "\u23DE" },
+            { "&OverBracket;", "\u23B4" },
+            { "&OverParenthesis;", "\u23DC" },
+            { "&para;", "\u00B6" },
+            { "&para", "\u00B6" },
+            { "&parallel;", "\u2225" },
+            { "&par;", "\u2225" },
+            { "&parsim;", "\u2AF3" },
+            { "&parsl;", "\u2AFD" },
+            { "&part;", "\u2202" },
+            { "&PartialD;", "\u2202" },
+            { "&Pcy;", "\u041F" },
+            { "&pcy;", "\u043F" },
+            { "&percnt;", "\u0025" },
+            { "&period;", "\u002E" },
+            { "&permil;", "\u2030" },
+            { "&perp;", "\u22A5" },
+            { "&pertenk;", "\u2031" },
+            { "&Pfr;", "\uD835\uDD13" },
+            { "&pfr;", "\uD835\uDD2D" },
+            { "&Phi;", "\u03A6" },
+            { "&phi;", "\u03C6" },
+            { "&phiv;", "\u03D5" },
+            { "&phmmat;", "\u2133" },
+            { "&phone;", "\u260E" },
+            { "&Pi;", "\u03A0" },
+            { "&pi;", "\u03C0" },
+            { "&pitchfork;", "\u22D4" },
+            { "&piv;", "\u03D6" },
+            { "&planck;", "\u210F" },
+            { "&planckh;", "\u210E" },
+            { "&plankv;", "\u210F" },
+            { "&plusacir;", "\u2A23" },
+            { "&plusb;", "\u229E" },
+            { "&pluscir;", "\u2A22" },
+            { "&plus;", "\u002B" },
+            { "&plusdo;", "\u2214" },
+            { "&plusdu;", "\u2A25" },
+            { "&pluse;", "\u2A72" },
+            { "&PlusMinus;", "\u00B1" },
+            { "&plusmn;", "\u00B1" },
+            { "&plusmn", "\u00B1" },
+            { "&plussim;", "\u2A26" },
+            { "&plustwo;", "\u2A27" },
+            { "&pm;", "\u00B1" },
+            { "&Poincareplane;", "\u210C" },
+            { "&pointint;", "\u2A15" },
+            { "&popf;", "\uD835\uDD61" },
+            { "&Popf;", "\u2119" },
+            { "&pound;", "\u00A3" },
+            { "&pound", "\u00A3" },
+            { "&prap;", "\u2AB7" },
+            { "&Pr;", "\u2ABB" },
+            { "&pr;", "\u227A" },
+            { "&prcue;", "\u227C" },
+            { "&precapprox;", "\u2AB7" },
+            { "&prec;", "\u227A" },
+            { "&preccurlyeq;", "\u227C" },
+            { "&Precedes;", "\u227A" },
+            { "&PrecedesEqual;", "\u2AAF" },
+            { "&PrecedesSlantEqual;", "\u227C" },
+            { "&PrecedesTilde;", "\u227E" },
+            { "&preceq;", "\u2AAF" },
+            { "&precnapprox;", "\u2AB9" },
+            { "&precneqq;", "\u2AB5" },
+            { "&precnsim;", "\u22E8" },
+            { "&pre;", "\u2AAF" },
+            { "&prE;", "\u2AB3" },
+            { "&precsim;", "\u227E" },
+            { "&prime;", "\u2032" },
+            { "&Prime;", "\u2033" },
+            { "&primes;", "\u2119" },
+            { "&prnap;", "\u2AB9" },
+            { "&prnE;", "\u2AB5" },
+            { "&prnsim;", "\u22E8" },
+            { "&prod;", "\u220F" },
+            { "&Product;", "\u220F" },
+            { "&profalar;", "\u232E" },
+            { "&profline;", "\u2312" },
+            { "&profsurf;", "\u2313" },
+            { "&prop;", "\u221D" },
+            { "&Proportional;", "\u221D" },
+            { "&Proportion;", "\u2237" },
+            { "&propto;", "\u221D" },
+            { "&prsim;", "\u227E" },
+            { "&prurel;", "\u22B0" },
+            { "&Pscr;", "\uD835\uDCAB" },
+            { "&pscr;", "\uD835\uDCC5" },
+            { "&Psi;", "\u03A8" },
+            { "&psi;", "\u03C8" },
+            { "&puncsp;", "\u2008" },
+            { "&Qfr;", "\uD835\uDD14" },
+            { "&qfr;", "\uD835\uDD2E" },
+            { "&qint;", "\u2A0C" },
+            { "&qopf;", "\uD835\uDD62" },
+            { "&Qopf;", "\u211A" },
+            { "&qprime;", "\u2057" },
+            { "&Qscr;", "\uD835\uDCAC" },
+            { "&qscr;", "\uD835\uDCC6" },
+            { "&quaternions;", "\u210D" },
+            { "&quatint;", "\u2A16" },
+            { "&quest;", "\u003F" },
+            { "&questeq;", "\u225F" },
+            { "&quot;", "\u0022" },
+            { "&quot", "\u0022" },
+            { "&QUOT;", "\u0022" },
+            { "&QUOT", "\u0022" },
+            { "&rAarr;", "\u21DB" },
+            { "&race;", "\u223D\u0331" },
+            { "&Racute;", "\u0154" },
+            { "&racute;", "\u0155" },
+            { "&radic;", "\u221A" },
+            { "&raemptyv;", "\u29B3" },
+            { "&rang;", "\u27E9" },
+            { "&Rang;", "\u27EB" },
+            { "&rangd;", "\u2992" },
+            { "&range;", "\u29A5" },
+            { "&rangle;", "\u27E9" },
+            { "&raquo;", "\u00BB" },
+            { "&raquo", "\u00BB" },
+            { "&rarrap;", "\u2975" },
+            { "&rarrb;", "\u21E5" },
+            { "&rarrbfs;", "\u2920" },
+            { "&rarrc;", "\u2933" },
+            { "&rarr;", "\u2192" },
+            { "&Rarr;", "\u21A0" },
+            { "&rArr;", "\u21D2" },
+            { "&rarrfs;", "\u291E" },
+            { "&rarrhk;", "\u21AA" },
+            { "&rarrlp;", "\u21AC" },
+            { "&rarrpl;", "\u2945" },
+            { "&rarrsim;", "\u2974" },
+            { "&Rarrtl;", "\u2916" },
+            { "&rarrtl;", "\u21A3" },
+            { "&rarrw;", "\u219D" },
+            { "&ratail;", "\u291A" },
+            { "&rAtail;", "\u291C" },
+            { "&ratio;", "\u2236" },
+            { "&rationals;", "\u211A" },
+            { "&rbarr;", "\u290D" },
+            { "&rBarr;", "\u290F" },
+            { "&RBarr;", "\u2910" },
+            { "&rbbrk;", "\u2773" },
+            { "&rbrace;", "\u007D" },
+            { "&rbrack;", "\u005D" },
+            { "&rbrke;", "\u298C" },
+            { "&rbrksld;", "\u298E" },
+            { "&rbrkslu;", "\u2990" },
+            { "&Rcaron;", "\u0158" },
+            { "&rcaron;", "\u0159" },
+            { "&Rcedil;", "\u0156" },
+            { "&rcedil;", "\u0157" },
+            { "&rceil;", "\u2309" },
+            { "&rcub;", "\u007D" },
+            { "&Rcy;", "\u0420" },
+            { "&rcy;", "\u0440" },
+            { "&rdca;", "\u2937" },
+            { "&rdldhar;", "\u2969" },
+            { "&rdquo;", "\u201D" },
+            { "&rdquor;", "\u201D" },
+            { "&rdsh;", "\u21B3" },
+            { "&real;", "\u211C" },
+            { "&realine;", "\u211B" },
+            { "&realpart;", "\u211C" },
+            { "&reals;", "\u211D" },
+            { "&Re;", "\u211C" },
+            { "&rect;", "\u25AD" },
+            { "&reg;", "\u00AE" },
+            { "&reg", "\u00AE" },
+            { "&REG;", "\u00AE" },
+            { "&REG", "\u00AE" },
+            { "&ReverseElement;", "\u220B" },
+            { "&ReverseEquilibrium;", "\u21CB" },
+            { "&ReverseUpEquilibrium;", "\u296F" },
+            { "&rfisht;", "\u297D" },
+            { "&rfloor;", "\u230B" },
+            { "&rfr;", "\uD835\uDD2F" },
+            { "&Rfr;", "\u211C" },
+            { "&rHar;", "\u2964" },
+            { "&rhard;", "\u21C1" },
+            { "&rharu;", "\u21C0" },
+            { "&rharul;", "\u296C" },
+            { "&Rho;", "\u03A1" },
+            { "&rho;", "\u03C1" },
+            { "&rhov;", "\u03F1" },
+            { "&RightAngleBracket;", "\u27E9" },
+            { "&RightArrowBar;", "\u21E5" },
+            { "&rightarrow;", "\u2192" },
+            { "&RightArrow;", "\u2192" },
+            { "&Rightarrow;", "\u21D2" },
+            { "&RightArrowLeftArrow;", "\u21C4" },
+            { "&rightarrowtail;", "\u21A3" },
+            { "&RightCeiling;", "\u2309" },
+            { "&RightDoubleBracket;", "\u27E7" },
+            { "&RightDownTeeVector;", "\u295D" },
+            { "&RightDownVectorBar;", "\u2955" },
+            { "&RightDownVector;", "\u21C2" },
+            { "&RightFloor;", "\u230B" },
+            { "&rightharpoondown;", "\u21C1" },
+            { "&rightharpoonup;", "\u21C0" },
+            { "&rightleftarrows;", "\u21C4" },
+            { "&rightleftharpoons;", "\u21CC" },
+            { "&rightrightarrows;", "\u21C9" },
+            { "&rightsquigarrow;", "\u219D" },
+            { "&RightTeeArrow;", "\u21A6" },
+            { "&RightTee;", "\u22A2" },
+            { "&RightTeeVector;", "\u295B" },
+            { "&rightthreetimes;", "\u22CC" },
+            { "&RightTriangleBar;", "\u29D0" },
+            { "&RightTriangle;", "\u22B3" },
+            { "&RightTriangleEqual;", "\u22B5" },
+            { "&RightUpDownVector;", "\u294F" },
+            { "&RightUpTeeVector;", "\u295C" },
+            { "&RightUpVectorBar;", "\u2954" },
+            { "&RightUpVector;", "\u21BE" },
+            { "&RightVectorBar;", "\u2953" },
+            { "&RightVector;", "\u21C0" },
+            { "&ring;", "\u02DA" },
+            { "&risingdotseq;", "\u2253" },
+            { "&rlarr;", "\u21C4" },
+            { "&rlhar;", "\u21CC" },
+            { "&rlm;", "\u200F" },
+            { "&rmoustache;", "\u23B1" },
+            { "&rmoust;", "\u23B1" },
+            { "&rnmid;", "\u2AEE" },
+            { "&roang;", "\u27ED" },
+            { "&roarr;", "\u21FE" },
+            { "&robrk;", "\u27E7" },
+            { "&ropar;", "\u2986" },
+            { "&ropf;", "\uD835\uDD63" },
+            { "&Ropf;", "\u211D" },
+            { "&roplus;", "\u2A2E" },
+            { "&rotimes;", "\u2A35" },
+            { "&RoundImplies;", "\u2970" },
+            { "&rpar;", "\u0029" },
+            { "&rpargt;", "\u2994" },
+            { "&rppolint;", "\u2A12" },
+            { "&rrarr;", "\u21C9" },
+            { "&Rrightarrow;", "\u21DB" },
+            { "&rsaquo;", "\u203A" },
+            { "&rscr;", "\uD835\uDCC7" },
+            { "&Rscr;", "\u211B" },
+            { "&rsh;", "\u21B1" },
+            { "&Rsh;", "\u21B1" },
+            { "&rsqb;", "\u005D" },
+            { "&rsquo;", "\u2019" },
+            { "&rsquor;", "\u2019" },
+            { "&rthree;", "\u22CC" },
+            { "&rtimes;", "\u22CA" },
+            { "&rtri;", "\u25B9" },
+            { "&rtrie;", "\u22B5" },
+            { "&rtrif;", "\u25B8" },
+            { "&rtriltri;", "\u29CE" },
+            { "&RuleDelayed;", "\u29F4" },
+            { "&ruluhar;", "\u2968" },
+            { "&rx;", "\u211E" },
+            { "&Sacute;", "\u015A" },
+            { "&sacute;", "\u015B" },
+            { "&sbquo;", "\u201A" },
+            { "&scap;", "\u2AB8" },
+            { "&Scaron;", "\u0160" },
+            { "&scaron;", "\u0161" },
+            { "&Sc;", "\u2ABC" },
+            { "&sc;", "\u227B" },
+            { "&sccue;", "\u227D" },
+            { "&sce;", "\u2AB0" },
+            { "&scE;", "\u2AB4" },
+            { "&Scedil;", "\u015E" },
+            { "&scedil;", "\u015F" },
+            { "&Scirc;", "\u015C" },
+            { "&scirc;", "\u015D" },
+            { "&scnap;", "\u2ABA" },
+            { "&scnE;", "\u2AB6" },
+            { "&scnsim;", "\u22E9" },
+            { "&scpolint;", "\u2A13" },
+            { "&scsim;", "\u227F" },
+            { "&Scy;", "\u0421" },
+            { "&scy;", "\u0441" },
+            { "&sdotb;", "\u22A1" },
+            { "&sdot;", "\u22C5" },
+            { "&sdote;", "\u2A66" },
+            { "&searhk;", "\u2925" },
+            { "&searr;", "\u2198" },
+            { "&seArr;", "\u21D8" },
+            { "&searrow;", "\u2198" },
+            { "&sect;", "\u00A7" },
+            { "&sect", "\u00A7" },
+            { "&semi;", "\u003B" },
+            { "&seswar;", "\u2929" },
+            { "&setminus;", "\u2216" },
+            { "&setmn;", "\u2216" },
+            { "&sext;", "\u2736" },
+            { "&Sfr;", "\uD835\uDD16" },
+            { "&sfr;", "\uD835\uDD30" },
+            { "&sfrown;", "\u2322" },
+            { "&sharp;", "\u266F" },
+            { "&SHCHcy;", "\u0429" },
+            { "&shchcy;", "\u0449" },
+            { "&SHcy;", "\u0428" },
+            { "&shcy;", "\u0448" },
+            { "&ShortDownArrow;", "\u2193" },
+            { "&ShortLeftArrow;", "\u2190" },
+            { "&shortmid;", "\u2223" },
+            { "&shortparallel;", "\u2225" },
+            { "&ShortRightArrow;", "\u2192" },
+            { "&ShortUpArrow;", "\u2191" },
+            { "&shy;", "\u00AD" },
+            { "&shy", "\u00AD" },
+            { "&Sigma;", "\u03A3" },
+            { "&sigma;", "\u03C3" },
+            { "&sigmaf;", "\u03C2" },
+            { "&sigmav;", "\u03C2" },
+            { "&sim;", "\u223C" },
+            { "&simdot;", "\u2A6A" },
+            { "&sime;", "\u2243" },
+            { "&simeq;", "\u2243" },
+            { "&simg;", "\u2A9E" },
+            { "&simgE;", "\u2AA0" },
+            { "&siml;", "\u2A9D" },
+            { "&simlE;", "\u2A9F" },
+            { "&simne;", "\u2246" },
+            { "&simplus;", "\u2A24" },
+            { "&simrarr;", "\u2972" },
+            { "&slarr;", "\u2190" },
+            { "&SmallCircle;", "\u2218" },
+            { "&smallsetminus;", "\u2216" },
+            { "&smashp;", "\u2A33" },
+            { "&smeparsl;", "\u29E4" },
+            { "&smid;", "\u2223" },
+            { "&smile;", "\u2323" },
+            { "&smt;", "\u2AAA" },
+            { "&smte;", "\u2AAC" },
+            { "&smtes;", "\u2AAC\uFE00" },
+            { "&SOFTcy;", "\u042C" },
+            { "&softcy;", "\u044C" },
+            { "&solbar;", "\u233F" },
+            { "&solb;", "\u29C4" },
+            { "&sol;", "\u002F" },
+            { "&Sopf;", "\uD835\uDD4A" },
+            { "&sopf;", "\uD835\uDD64" },
+            { "&spades;", "\u2660" },
+            { "&spadesuit;", "\u2660" },
+            { "&spar;", "\u2225" },
+            { "&sqcap;", "\u2293" },
+            { "&sqcaps;", "\u2293\uFE00" },
+            { "&sqcup;", "\u2294" },
+            { "&sqcups;", "\u2294\uFE00" },
+            { "&Sqrt;", "\u221A" },
+            { "&sqsub;", "\u228F" },
+            { "&sqsube;", "\u2291" },
+            { "&sqsubset;", "\u228F" },
+            { "&sqsubseteq;", "\u2291" },
+            { "&sqsup;", "\u2290" },
+            { "&sqsupe;", "\u2292" },
+            { "&sqsupset;", "\u2290" },
+            { "&sqsupseteq;", "\u2292" },
+            { "&square;", "\u25A1" },
+            { "&Square;", "\u25A1" },
+            { "&SquareIntersection;", "\u2293" },
+            { "&SquareSubset;", "\u228F" },
+            { "&SquareSubsetEqual;", "\u2291" },
+            { "&SquareSuperset;", "\u2290" },
+            { "&SquareSupersetEqual;", "\u2292" },
+            { "&SquareUnion;", "\u2294" },
+            { "&squarf;", "\u25AA" },
+            { "&squ;", "\u25A1" },
+            { "&squf;", "\u25AA" },
+            { "&srarr;", "\u2192" },
+            { "&Sscr;", "\uD835\uDCAE" },
+            { "&sscr;", "\uD835\uDCC8" },
+            { "&ssetmn;", "\u2216" },
+            { "&ssmile;", "\u2323" },
+            { "&sstarf;", "\u22C6" },
+            { "&Star;", "\u22C6" },
+            { "&star;", "\u2606" },
+            { "&starf;", "\u2605" },
+            { "&straightepsilon;", "\u03F5" },
+            { "&straightphi;", "\u03D5" },
+            { "&strns;", "\u00AF" },
+            { "&sub;", "\u2282" },
+            { "&Sub;", "\u22D0" },
+            { "&subdot;", "\u2ABD" },
+            { "&subE;", "\u2AC5" },
+            { "&sube;", "\u2286" },
+            { "&subedot;", "\u2AC3" },
+            { "&submult;", "\u2AC1" },
+            { "&subnE;", "\u2ACB" },
+            { "&subne;", "\u228A" },
+            { "&subplus;", "\u2ABF" },
+            { "&subrarr;", "\u2979" },
+            { "&subset;", "\u2282" },
+            { "&Subset;", "\u22D0" },
+            { "&subseteq;", "\u2286" },
+            { "&subseteqq;", "\u2AC5" },
+            { "&SubsetEqual;", "\u2286" },
+            { "&subsetneq;", "\u228A" },
+            { "&subsetneqq;", "\u2ACB" },
+            { "&subsim;", "\u2AC7" },
+            { "&subsub;", "\u2AD5" },
+            { "&subsup;", "\u2AD3" },
+            { "&succapprox;", "\u2AB8" },
+            { "&succ;", "\u227B" },
+            { "&succcurlyeq;", "\u227D" },
+            { "&Succeeds;", "\u227B" },
+            { "&SucceedsEqual;", "\u2AB0" },
+            { "&SucceedsSlantEqual;", "\u227D" },
+            { "&SucceedsTilde;", "\u227F" },
+            { "&succeq;", "\u2AB0" },
+            { "&succnapprox;", "\u2ABA" },
+            { "&succneqq;", "\u2AB6" },
+            { "&succnsim;", "\u22E9" },
+            { "&succsim;", "\u227F" },
+            { "&SuchThat;", "\u220B" },
+            { "&sum;", "\u2211" },
+            { "&Sum;", "\u2211" },
+            { "&sung;", "\u266A" },
+            { "&sup1;", "\u00B9" },
+            { "&sup1", "\u00B9" },
+            { "&sup2;", "\u00B2" },
+            { "&sup2", "\u00B2" },
+            { "&sup3;", "\u00B3" },
+            { "&sup3", "\u00B3" },
+            { "&sup;", "\u2283" },
+            { "&Sup;", "\u22D1" },
+            { "&supdot;", "\u2ABE" },
+            { "&supdsub;", "\u2AD8" },
+            { "&supE;", "\u2AC6" },
+            { "&supe;", "\u2287" },
+            { "&supedot;", "\u2AC4" },
+            { "&Superset;", "\u2283" },
+            { "&SupersetEqual;", "\u2287" },
+            { "&suphsol;", "\u27C9" },
+            { "&suphsub;", "\u2AD7" },
+            { "&suplarr;", "\u297B" },
+            { "&supmult;", "\u2AC2" },
+            { "&supnE;", "\u2ACC" },
+            { "&supne;", "\u228B" },
+            { "&supplus;", "\u2AC0" },
+            { "&supset;", "\u2283" },
+            { "&Supset;", "\u22D1" },
+            { "&supseteq;", "\u2287" },
+            { "&supseteqq;", "\u2AC6" },
+            { "&supsetneq;", "\u228B" },
+            { "&supsetneqq;", "\u2ACC" },
+            { "&supsim;", "\u2AC8" },
+            { "&supsub;", "\u2AD4" },
+            { "&supsup;", "\u2AD6" },
+            { "&swarhk;", "\u2926" },
+            { "&swarr;", "\u2199" },
+            { "&swArr;", "\u21D9" },
+            { "&swarrow;", "\u2199" },
+            { "&swnwar;", "\u292A" },
+            { "&szlig;", "\u00DF" },
+            { "&szlig", "\u00DF" },
+            { "&Tab;", "\u0009" },
+            { "&target;", "\u2316" },
+            { "&Tau;", "\u03A4" },
+            { "&tau;", "\u03C4" },
+            { "&tbrk;", "\u23B4" },
+            { "&Tcaron;", "\u0164" },
+            { "&tcaron;", "\u0165" },
+            { "&Tcedil;", "\u0162" },
+            { "&tcedil;", "\u0163" },
+            { "&Tcy;", "\u0422" },
+            { "&tcy;", "\u0442" },
+            { "&tdot;", "\u20DB" },
+            { "&telrec;", "\u2315" },
+            { "&Tfr;", "\uD835\uDD17" },
+            { "&tfr;", "\uD835\uDD31" },
+            { "&there4;", "\u2234" },
+            { "&therefore;", "\u2234" },
+            { "&Therefore;", "\u2234" },
+            { "&Theta;", "\u0398" },
+            { "&theta;", "\u03B8" },
+            { "&thetasym;", "\u03D1" },
+            { "&thetav;", "\u03D1" },
+            { "&thickapprox;", "\u2248" },
+            { "&thicksim;", "\u223C" },
+            { "&ThickSpace;", "\u205F\u200A" },
+            { "&ThinSpace;", "\u2009" },
+            { "&thinsp;", "\u2009" },
+            { "&thkap;", "\u2248" },
+            { "&thksim;", "\u223C" },
+            { "&THORN;", "\u00DE" },
+            { "&THORN", "\u00DE" },
+            { "&thorn;", "\u00FE" },
+            { "&thorn", "\u00FE" },
+            { "&tilde;", "\u02DC" },
+            { "&Tilde;", "\u223C" },
+            { "&TildeEqual;", "\u2243" },
+            { "&TildeFullEqual;", "\u2245" },
+            { "&TildeTilde;", "\u2248" },
+            { "&timesbar;", "\u2A31" },
+            { "&timesb;", "\u22A0" },
+            { "&times;", "\u00D7" },
+            { "&times", "\u00D7" },
+            { "&timesd;", "\u2A30" },
+            { "&tint;", "\u222D" },
+            { "&toea;", "\u2928" },
+            { "&topbot;", "\u2336" },
+            { "&topcir;", "\u2AF1" },
+            { "&top;", "\u22A4" },
+            { "&Topf;", "\uD835\uDD4B" },
+            { "&topf;", "\uD835\uDD65" },
+            { "&topfork;", "\u2ADA" },
+            { "&tosa;", "\u2929" },
+            { "&tprime;", "\u2034" },
+            { "&trade;", "\u2122" },
+            { "&TRADE;", "\u2122" },
+            { "&triangle;", "\u25B5" },
+            { "&triangledown;", "\u25BF" },
+            { "&triangleleft;", "\u25C3" },
+            { "&trianglelefteq;", "\u22B4" },
+            { "&triangleq;", "\u225C" },
+            { "&triangleright;", "\u25B9" },
+            { "&trianglerighteq;", "\u22B5" },
+            { "&tridot;", "\u25EC" },
+            { "&trie;", "\u225C" },
+            { "&triminus;", "\u2A3A" },
+            { "&TripleDot;", "\u20DB" },
+            { "&triplus;", "\u2A39" },
+            { "&trisb;", "\u29CD" },
+            { "&tritime;", "\u2A3B" },
+            { "&trpezium;", "\u23E2" },
+            { "&Tscr;", "\uD835\uDCAF" },
+            { "&tscr;", "\uD835\uDCC9" },
+            { "&TScy;", "\u0426" },
+            { "&tscy;", "\u0446" },
+            { "&TSHcy;", "\u040B" },
+            { "&tshcy;", "\u045B" },
+            { "&Tstrok;", "\u0166" },
+            { "&tstrok;", "\u0167" },
+            { "&twixt;", "\u226C" },
+            { "&twoheadleftarrow;", "\u219E" },
+            { "&twoheadrightarrow;", "\u21A0" },
+            { "&Uacute;", "\u00DA" },
+            { "&Uacute", "\u00DA" },
+            { "&uacute;", "\u00FA" },
+            { "&uacute", "\u00FA" },
+            { "&uarr;", "\u2191" },
+            { "&Uarr;", "\u219F" },
+            { "&uArr;", "\u21D1" },
+            { "&Uarrocir;", "\u2949" },
+            { "&Ubrcy;", "\u040E" },
+            { "&ubrcy;", "\u045E" },
+            { "&Ubreve;", "\u016C" },
+            { "&ubreve;", "\u016D" },
+            { "&Ucirc;", "\u00DB" },
+            { "&Ucirc", "\u00DB" },
+            { "&ucirc;", "\u00FB" },
+            { "&ucirc", "\u00FB" },
+            { "&Ucy;", "\u0423" },
+            { "&ucy;", "\u0443" },
+            { "&udarr;", "\u21C5" },
+            { "&Udblac;", "\u0170" },
+            { "&udblac;", "\u0171" },
+            { "&udhar;", "\u296E" },
+            { "&ufisht;", "\u297E" },
+            { "&Ufr;", "\uD835\uDD18" },
+            { "&ufr;", "\uD835\uDD32" },
+            { "&Ugrave;", "\u00D9" },
+            { "&Ugrave", "\u00D9" },
+            { "&ugrave;", "\u00F9" },
+            { "&ugrave", "\u00F9" },
+            { "&uHar;", "\u2963" },
+            { "&uharl;", "\u21BF" },
+            { "&uharr;", "\u21BE" },
+            { "&uhblk;", "\u2580" },
+            { "&ulcorn;", "\u231C" },
+            { "&ulcorner;", "\u231C" },
+            { "&ulcrop;", "\u230F" },
+            { "&ultri;", "\u25F8" },
+            { "&Umacr;", "\u016A" },
+            { "&umacr;", "\u016B" },
+            { "&uml;", "\u00A8" },
+            { "&uml", "\u00A8" },
+            { "&UnderBar;", "\u005F" },
+            { "&UnderBrace;", "\u23DF" },
+            { "&UnderBracket;", "\u23B5" },
+            { "&UnderParenthesis;", "\u23DD" },
+            { "&Union;", "\u22C3" },
+            { "&UnionPlus;", "\u228E" },
+            { "&Uogon;", "\u0172" },
+            { "&uogon;", "\u0173" },
+            { "&Uopf;", "\uD835\uDD4C" },
+            { "&uopf;", "\uD835\uDD66" },
+            { "&UpArrowBar;", "\u2912" },
+            { "&uparrow;", "\u2191" },
+            { "&UpArrow;", "\u2191" },
+            { "&Uparrow;", "\u21D1" },
+            { "&UpArrowDownArrow;", "\u21C5" },
+            { "&updownarrow;", "\u2195" },
+            { "&UpDownArrow;", "\u2195" },
+            { "&Updownarrow;", "\u21D5" },
+            { "&UpEquilibrium;", "\u296E" },
+            { "&upharpoonleft;", "\u21BF" },
+            { "&upharpoonright;", "\u21BE" },
+            { "&uplus;", "\u228E" },
+            { "&UpperLeftArrow;", "\u2196" },
+            { "&UpperRightArrow;", "\u2197" },
+            { "&upsi;", "\u03C5" },
+            { "&Upsi;", "\u03D2" },
+            { "&upsih;", "\u03D2" },
+            { "&Upsilon;", "\u03A5" },
+            { "&upsilon;", "\u03C5" },
+            { "&UpTeeArrow;", "\u21A5" },
+            { "&UpTee;", "\u22A5" },
+            { "&upuparrows;", "\u21C8" },
+            { "&urcorn;", "\u231D" },
+            { "&urcorner;", "\u231D" },
+            { "&urcrop;", "\u230E" },
+            { "&Uring;", "\u016E" },
+            { "&uring;", "\u016F" },
+            { "&urtri;", "\u25F9" },
+            { "&Uscr;", "\uD835\uDCB0" },
+            { "&uscr;", "\uD835\uDCCA" },
+            { "&utdot;", "\u22F0" },
+            { "&Utilde;", "\u0168" },
+            { "&utilde;", "\u0169" },
+            { "&utri;", "\u25B5" },
+            { "&utrif;", "\u25B4" },
+            { "&uuarr;", "\u21C8" },
+            { "&Uuml;", "\u00DC" },
+            { "&Uuml", "\u00DC" },
+            { "&uuml;", "\u00FC" },
+            { "&uuml", "\u00FC" },
+            { "&uwangle;", "\u29A7" },
+            { "&vangrt;", "\u299C" },
+            { "&varepsilon;", "\u03F5" },
+            { "&varkappa;", "\u03F0" },
+            { "&varnothing;", "\u2205" },
+            { "&varphi;", "\u03D5" },
+            { "&varpi;", "\u03D6" },
+            { "&varpropto;", "\u221D" },
+            { "&varr;", "\u2195" },
+            { "&vArr;", "\u21D5" },
+            { "&varrho;", "\u03F1" },
+            { "&varsigma;", "\u03C2" },
+            { "&varsubsetneq;", "\u228A\uFE00" },
+            { "&varsubsetneqq;", "\u2ACB\uFE00" },
+            { "&varsupsetneq;", "\u228B\uFE00" },
+            { "&varsupsetneqq;", "\u2ACC\uFE00" },
+            { "&vartheta;", "\u03D1" },
+            { "&vartriangleleft;", "\u22B2" },
+            { "&vartriangleright;", "\u22B3" },
+            { "&vBar;", "\u2AE8" },
+            { "&Vbar;", "\u2AEB" },
+            { "&vBarv;", "\u2AE9" },
+            { "&Vcy;", "\u0412" },
+            { "&vcy;", "\u0432" },
+            { "&vdash;", "\u22A2" },
+            { "&vDash;", "\u22A8" },
+            { "&Vdash;", "\u22A9" },
+            { "&VDash;", "\u22AB" },
+            { "&Vdashl;", "\u2AE6" },
+            { "&veebar;", "\u22BB" },
+            { "&vee;", "\u2228" },
+            { "&Vee;", "\u22C1" },
+            { "&veeeq;", "\u225A" },
+            { "&vellip;", "\u22EE" },
+            { "&verbar;", "\u007C" },
+            { "&Verbar;", "\u2016" },
+            { "&vert;", "\u007C" },
+            { "&Vert;", "\u2016" },
+            { "&VerticalBar;", "\u2223" },
+            { "&VerticalLine;", "\u007C" },
+            { "&VerticalSeparator;", "\u2758" },
+            { "&VerticalTilde;", "\u2240" },
+            { "&VeryThinSpace;", "\u200A" },
+            { "&Vfr;", "\uD835\uDD19" },
+            { "&vfr;", "\uD835\uDD33" },
+            { "&vltri;", "\u22B2" },
+            { "&vnsub;", "\u2282\u20D2" },
+            { "&vnsup;", "\u2283\u20D2" },
+            { "&Vopf;", "\uD835\uDD4D" },
+            { "&vopf;", "\uD835\uDD67" },
+            { "&vprop;", "\u221D" },
+            { "&vrtri;", "\u22B3" },
+            { "&Vscr;", "\uD835\uDCB1" },
+            { "&vscr;", "\uD835\uDCCB" },
+            { "&vsubnE;", "\u2ACB\uFE00" },
+            { "&vsubne;", "\u228A\uFE00" },
+            { "&vsupnE;", "\u2ACC\uFE00" },
+            { "&vsupne;", "\u228B\uFE00" },
+            { "&Vvdash;", "\u22AA" },
+            { "&vzigzag;", "\u299A" },
+            { "&Wcirc;", "\u0174" },
+            { "&wcirc;", "\u0175" },
+            { "&wedbar;", "\u2A5F" },
+            { "&wedge;", "\u2227" },
+            { "&Wedge;", "\u22C0" },
+            { "&wedgeq;", "\u2259" },
+            { "&weierp;", "\u2118" },
+            { "&Wfr;", "\uD835\uDD1A" },
+            { "&wfr;", "\uD835\uDD34" },
+            { "&Wopf;", "\uD835\uDD4E" },
+            { "&wopf;", "\uD835\uDD68" },
+            { "&wp;", "\u2118" },
+            { "&wr;", "\u2240" },
+            { "&wreath;", "\u2240" },
+            { "&Wscr;", "\uD835\uDCB2" },
+            { "&wscr;", "\uD835\uDCCC" },
+            { "&xcap;", "\u22C2" },
+            { "&xcirc;", "\u25EF" },
+            { "&xcup;", "\u22C3" },
+            { "&xdtri;", "\u25BD" },
+            { "&Xfr;", "\uD835\uDD1B" },
+            { "&xfr;", "\uD835\uDD35" },
+            { "&xharr;", "\u27F7" },
+            { "&xhArr;", "\u27FA" },
+            { "&Xi;", "\u039E" },
+            { "&xi;", "\u03BE" },
+            { "&xlarr;", "\u27F5" },
+            { "&xlArr;", "\u27F8" },
+            { "&xmap;", "\u27FC" },
+            { "&xnis;", "\u22FB" },
+            { "&xodot;", "\u2A00" },
+            { "&Xopf;", "\uD835\uDD4F" },
+            { "&xopf;", "\uD835\uDD69" },
+            { "&xoplus;", "\u2A01" },
+            { "&xotime;", "\u2A02" },
+            { "&xrarr;", "\u27F6" },
+            { "&xrArr;", "\u27F9" },
+            { "&Xscr;", "\uD835\uDCB3" },
+            { "&xscr;", "\uD835\uDCCD" },
+            { "&xsqcup;", "\u2A06" },
+            { "&xuplus;", "\u2A04" },
+            { "&xutri;", "\u25B3" },
+            { "&xvee;", "\u22C1" },
+            { "&xwedge;", "\u22C0" },
+            { "&Yacute;", "\u00DD" },
+            { "&Yacute", "\u00DD" },
+            { "&yacute;", "\u00FD" },
+            { "&yacute", "\u00FD" },
+            { "&YAcy;", "\u042F" },
+            { "&yacy;", "\u044F" },
+            { "&Ycirc;", "\u0176" },
+            { "&ycirc;", "\u0177" },
+            { "&Ycy;", "\u042B" },
+            { "&ycy;", "\u044B" },
+            { "&yen;", "\u00A5" },
+            { "&yen", "\u00A5" },
+            { "&Yfr;", "\uD835\uDD1C" },
+            { "&yfr;", "\uD835\uDD36" },
+            { "&YIcy;", "\u0407" },
+            { "&yicy;", "\u0457" },
+            { "&Yopf;", "\uD835\uDD50" },
+            { "&yopf;", "\uD835\uDD6A" },
+            { "&Yscr;", "\uD835\uDCB4" },
+            { "&yscr;", "\uD835\uDCCE" },
+            { "&YUcy;", "\u042E" },
+            { "&yucy;", "\u044E" },
+            { "&yuml;", "\u00FF" },
+            { "&yuml", "\u00FF" },
+            { "&Yuml;", "\u0178" },
+            { "&Zacute;", "\u0179" },
+            { "&zacute;", "\u017A" },
+            { "&Zcaron;", "\u017D" },
+            { "&zcaron;", "\u017E" },
+            { "&Zcy;", "\u0417" },
+            { "&zcy;", "\u0437" },
+            { "&Zdot;", "\u017B" },
+            { "&zdot;", "\u017C" },
+            { "&zeetrf;", "\u2128" },
+            { "&ZeroWidthSpace;", "\u200B" },
+            { "&Zeta;", "\u0396" },
+            { "&zeta;", "\u03B6" },
+            { "&zfr;", "\uD835\uDD37" },
+            { "&Zfr;", "\u2128" },
+            { "&ZHcy;", "\u0416" },
+            { "&zhcy;", "\u0436" },
+            { "&zigrarr;", "\u21DD" },
+            { "&zopf;", "\uD835\uDD6B" },
+            { "&Zopf;", "\u2124" },
+            { "&Zscr;", "\uD835\uDCB5" },
+            { "&zscr;", "\uD835\uDCCF" },
+            { "&zwj;", "\u200D" },
+            { "&zwnj;", "\u200C" },
+        };
+
+        public static readonly Dictionary<int, string> HtmlEntityCodePoints = new Dictionary<int, string>()
+        {
+            { 193, "\u00C1" },
+            { 225, "\u00E1" },
+            { 258, "\u0102" },
+            { 259, "\u0103" },
+            { 8766, "\u223E" },
+            { 8767, "\u223F" },
+            { 194, "\u00C2" },
+            { 226, "\u00E2" },
+            { 180, "\u00B4" },
+            { 1040, "\u0410" },
+            { 1072, "\u0430" },
+            { 198, "\u00C6" },
+            { 230, "\u00E6" },
+            { 8289, "\u2061" },
+            { 120068, "\uD835\uDD04" },
+            { 120094, "\uD835\uDD1E" },
+            { 192, "\u00C0" },
+            { 224, "\u00E0" },
+            { 8501, "\u2135" },
+            { 913, "\u0391" },
+            { 945, "\u03B1" },
+            { 256, "\u0100" },
+            { 257, "\u0101" },
+            { 10815, "\u2A3F" },
+            { 38, "\u0026" },
+            { 10837, "\u2A55" },
+            { 10835, "\u2A53" },
+            { 8743, "\u2227" },
+            { 10844, "\u2A5C" },
+            { 10840, "\u2A58" },
+            { 10842, "\u2A5A" },
+            { 8736, "\u2220" },
+            { 10660, "\u29A4" },
+            { 10664, "\u29A8" },
+            { 10665, "\u29A9" },
+            { 10666, "\u29AA" },
+            { 10667, "\u29AB" },
+            { 10668, "\u29AC" },
+            { 10669, "\u29AD" },
+            { 10670, "\u29AE" },
+            { 10671, "\u29AF" },
+            { 8737, "\u2221" },
+            { 8735, "\u221F" },
+            { 8894, "\u22BE" },
+            { 10653, "\u299D" },
+            { 8738, "\u2222" },
+            { 197, "\u00C5" },
+            { 9084, "\u237C" },
+            { 260, "\u0104" },
+            { 261, "\u0105" },
+            { 120120, "\uD835\uDD38" },
+            { 120146, "\uD835\uDD52" },
+            { 10863, "\u2A6F" },
+            { 8776, "\u2248" },
+            { 10864, "\u2A70" },
+            { 8778, "\u224A" },
+            { 8779, "\u224B" },
+            { 39, "\u0027" },
+            { 229, "\u00E5" },
+            { 119964, "\uD835\uDC9C" },
+            { 119990, "\uD835\uDCB6" },
+            { 8788, "\u2254" },
+            { 42, "\u002A" },
+            { 8781, "\u224D" },
+            { 195, "\u00C3" },
+            { 227, "\u00E3" },
+            { 196, "\u00C4" },
+            { 228, "\u00E4" },
+            { 8755, "\u2233" },
+            { 10769, "\u2A11" },
+            { 8780, "\u224C" },
+            { 1014, "\u03F6" },
+            { 8245, "\u2035" },
+            { 8765, "\u223D" },
+            { 8909, "\u22CD" },
+            { 8726, "\u2216" },
+            { 10983, "\u2AE7" },
+            { 8893, "\u22BD" },
+            { 8965, "\u2305" },
+            { 8966, "\u2306" },
+            { 9141, "\u23B5" },
+            { 9142, "\u23B6" },
+            { 1041, "\u0411" },
+            { 1073, "\u0431" },
+            { 8222, "\u201E" },
+            { 8757, "\u2235" },
+            { 10672, "\u29B0" },
+            { 8492, "\u212C" },
+            { 914, "\u0392" },
+            { 946, "\u03B2" },
+            { 8502, "\u2136" },
+            { 8812, "\u226C" },
+            { 120069, "\uD835\uDD05" },
+            { 120095, "\uD835\uDD1F" },
+            { 8898, "\u22C2" },
+            { 9711, "\u25EF" },
+            { 8899, "\u22C3" },
+            { 10752, "\u2A00" },
+            { 10753, "\u2A01" },
+            { 10754, "\u2A02" },
+            { 10758, "\u2A06" },
+            { 9733, "\u2605" },
+            { 9661, "\u25BD" },
+            { 9651, "\u25B3" },
+            { 10756, "\u2A04" },
+            { 8897, "\u22C1" },
+            { 8896, "\u22C0" },
+            { 10509, "\u290D" },
+            { 10731, "\u29EB" },
+            { 9642, "\u25AA" },
+            { 9652, "\u25B4" },
+            { 9662, "\u25BE" },
+            { 9666, "\u25C2" },
+            { 9656, "\u25B8" },
+            { 9251, "\u2423" },
+            { 9618, "\u2592" },
+            { 9617, "\u2591" },
+            { 9619, "\u2593" },
+            { 9608, "\u2588" },
+            { 10989, "\u2AED" },
+            { 8976, "\u2310" },
+            { 120121, "\uD835\uDD39" },
+            { 120147, "\uD835\uDD53" },
+            { 8869, "\u22A5" },
+            { 8904, "\u22C8" },
+            { 10697, "\u29C9" },
+            { 9488, "\u2510" },
+            { 9557, "\u2555" },
+            { 9558, "\u2556" },
+            { 9559, "\u2557" },
+            { 9484, "\u250C" },
+            { 9554, "\u2552" },
+            { 9555, "\u2553" },
+            { 9556, "\u2554" },
+            { 9472, "\u2500" },
+            { 9552, "\u2550" },
+            { 9516, "\u252C" },
+            { 9572, "\u2564" },
+            { 9573, "\u2565" },
+            { 9574, "\u2566" },
+            { 9524, "\u2534" },
+            { 9575, "\u2567" },
+            { 9576, "\u2568" },
+            { 9577, "\u2569" },
+            { 8863, "\u229F" },
+            { 8862, "\u229E" },
+            { 8864, "\u22A0" },
+            { 9496, "\u2518" },
+            { 9563, "\u255B" },
+            { 9564, "\u255C" },
+            { 9565, "\u255D" },
+            { 9492, "\u2514" },
+            { 9560, "\u2558" },
+            { 9561, "\u2559" },
+            { 9562, "\u255A" },
+            { 9474, "\u2502" },
+            { 9553, "\u2551" },
+            { 9532, "\u253C" },
+            { 9578, "\u256A" },
+            { 9579, "\u256B" },
+            { 9580, "\u256C" },
+            { 9508, "\u2524" },
+            { 9569, "\u2561" },
+            { 9570, "\u2562" },
+            { 9571, "\u2563" },
+            { 9500, "\u251C" },
+            { 9566, "\u255E" },
+            { 9567, "\u255F" },
+            { 9568, "\u2560" },
+            { 728, "\u02D8" },
+            { 166, "\u00A6" },
+            { 119991, "\uD835\uDCB7" },
+            { 8271, "\u204F" },
+            { 10693, "\u29C5" },
+            { 92, "\u005C" },
+            { 10184, "\u27C8" },
+            { 8226, "\u2022" },
+            { 8782, "\u224E" },
+            { 10926, "\u2AAE" },
+            { 8783, "\u224F" },
+            { 262, "\u0106" },
+            { 263, "\u0107" },
+            { 10820, "\u2A44" },
+            { 10825, "\u2A49" },
+            { 10827, "\u2A4B" },
+            { 8745, "\u2229" },
+            { 8914, "\u22D2" },
+            { 10823, "\u2A47" },
+            { 10816, "\u2A40" },
+            { 8517, "\u2145" },
+            { 8257, "\u2041" },
+            { 711, "\u02C7" },
+            { 8493, "\u212D" },
+            { 10829, "\u2A4D" },
+            { 268, "\u010C" },
+            { 269, "\u010D" },
+            { 199, "\u00C7" },
+            { 231, "\u00E7" },
+            { 264, "\u0108" },
+            { 265, "\u0109" },
+            { 8752, "\u2230" },
+            { 10828, "\u2A4C" },
+            { 10832, "\u2A50" },
+            { 266, "\u010A" },
+            { 267, "\u010B" },
+            { 184, "\u00B8" },
+            { 10674, "\u29B2" },
+            { 162, "\u00A2" },
+            { 183, "\u00B7" },
+            { 120096, "\uD835\uDD20" },
+            { 1063, "\u0427" },
+            { 1095, "\u0447" },
+            { 10003, "\u2713" },
+            { 935, "\u03A7" },
+            { 967, "\u03C7" },
+            { 710, "\u02C6" },
+            { 8791, "\u2257" },
+            { 8634, "\u21BA" },
+            { 8635, "\u21BB" },
+            { 8859, "\u229B" },
+            { 8858, "\u229A" },
+            { 8861, "\u229D" },
+            { 8857, "\u2299" },
+            { 174, "\u00AE" },
+            { 9416, "\u24C8" },
+            { 8854, "\u2296" },
+            { 8853, "\u2295" },
+            { 8855, "\u2297" },
+            { 9675, "\u25CB" },
+            { 10691, "\u29C3" },
+            { 10768, "\u2A10" },
+            { 10991, "\u2AEF" },
+            { 10690, "\u29C2" },
+            { 8754, "\u2232" },
+            { 8221, "\u201D" },
+            { 8217, "\u2019" },
+            { 9827, "\u2663" },
+            { 58, "\u003A" },
+            { 8759, "\u2237" },
+            { 10868, "\u2A74" },
+            { 44, "\u002C" },
+            { 64, "\u0040" },
+            { 8705, "\u2201" },
+            { 8728, "\u2218" },
+            { 8450, "\u2102" },
+            { 8773, "\u2245" },
+            { 10861, "\u2A6D" },
+            { 8801, "\u2261" },
+            { 8750, "\u222E" },
+            { 8751, "\u222F" },
+            { 120148, "\uD835\uDD54" },
+            { 8720, "\u2210" },
+            { 169, "\u00A9" },
+            { 8471, "\u2117" },
+            { 8629, "\u21B5" },
+            { 10007, "\u2717" },
+            { 10799, "\u2A2F" },
+            { 119966, "\uD835\uDC9E" },
+            { 119992, "\uD835\uDCB8" },
+            { 10959, "\u2ACF" },
+            { 10961, "\u2AD1" },
+            { 10960, "\u2AD0" },
+            { 10962, "\u2AD2" },
+            { 8943, "\u22EF" },
+            { 10552, "\u2938" },
+            { 10549, "\u2935" },
+            { 8926, "\u22DE" },
+            { 8927, "\u22DF" },
+            { 8630, "\u21B6" },
+            { 10557, "\u293D" },
+            { 10824, "\u2A48" },
+            { 10822, "\u2A46" },
+            { 8746, "\u222A" },
+            { 8915, "\u22D3" },
+            { 10826, "\u2A4A" },
+            { 8845, "\u228D" },
+            { 10821, "\u2A45" },
+            { 8631, "\u21B7" },
+            { 10556, "\u293C" },
+            { 8910, "\u22CE" },
+            { 8911, "\u22CF" },
+            { 164, "\u00A4" },
+            { 8753, "\u2231" },
+            { 9005, "\u232D" },
+            { 8224, "\u2020" },
+            { 8225, "\u2021" },
+            { 8504, "\u2138" },
+            { 8595, "\u2193" },
+            { 8609, "\u21A1" },
+            { 8659, "\u21D3" },
+            { 8208, "\u2010" },
+            { 10980, "\u2AE4" },
+            { 8867, "\u22A3" },
+            { 10511, "\u290F" },
+            { 733, "\u02DD" },
+            { 270, "\u010E" },
+            { 271, "\u010F" },
+            { 1044, "\u0414" },
+            { 1076, "\u0434" },
+            { 8650, "\u21CA" },
+            { 8518, "\u2146" },
+            { 10513, "\u2911" },
+            { 10871, "\u2A77" },
+            { 176, "\u00B0" },
+            { 8711, "\u2207" },
+            { 916, "\u0394" },
+            { 948, "\u03B4" },
+            { 10673, "\u29B1" },
+            { 10623, "\u297F" },
+            { 120071, "\uD835\uDD07" },
+            { 120097, "\uD835\uDD21" },
+            { 10597, "\u2965" },
+            { 8643, "\u21C3" },
+            { 8642, "\u21C2" },
+            { 729, "\u02D9" },
+            { 96, "\u0060" },
+            { 732, "\u02DC" },
+            { 8900, "\u22C4" },
+            { 9830, "\u2666" },
+            { 168, "\u00A8" },
+            { 989, "\u03DD" },
+            { 8946, "\u22F2" },
+            { 247, "\u00F7" },
+            { 8903, "\u22C7" },
+            { 1026, "\u0402" },
+            { 1106, "\u0452" },
+            { 8990, "\u231E" },
+            { 8973, "\u230D" },
+            { 36, "\u0024" },
+            { 120123, "\uD835\uDD3B" },
+            { 120149, "\uD835\uDD55" },
+            { 8412, "\u20DC" },
+            { 8784, "\u2250" },
+            { 8785, "\u2251" },
+            { 8760, "\u2238" },
+            { 8724, "\u2214" },
+            { 8865, "\u22A1" },
+            { 8656, "\u21D0" },
+            { 8660, "\u21D4" },
+            { 10232, "\u27F8" },
+            { 10234, "\u27FA" },
+            { 10233, "\u27F9" },
+            { 8658, "\u21D2" },
+            { 8872, "\u22A8" },
+            { 8657, "\u21D1" },
+            { 8661, "\u21D5" },
+            { 8741, "\u2225" },
+            { 10515, "\u2913" },
+            { 8693, "\u21F5" },
+            { 785, "\u0311" },
+            { 10576, "\u2950" },
+            { 10590, "\u295E" },
+            { 10582, "\u2956" },
+            { 8637, "\u21BD" },
+            { 10591, "\u295F" },
+            { 10583, "\u2957" },
+            { 8641, "\u21C1" },
+            { 8615, "\u21A7" },
+            { 8868, "\u22A4" },
+            { 10512, "\u2910" },
+            { 8991, "\u231F" },
+            { 8972, "\u230C" },
+            { 119967, "\uD835\uDC9F" },
+            { 119993, "\uD835\uDCB9" },
+            { 1029, "\u0405" },
+            { 1109, "\u0455" },
+            { 10742, "\u29F6" },
+            { 272, "\u0110" },
+            { 273, "\u0111" },
+            { 8945, "\u22F1" },
+            { 9663, "\u25BF" },
+            { 10607, "\u296F" },
+            { 10662, "\u29A6" },
+            { 1039, "\u040F" },
+            { 1119, "\u045F" },
+            { 10239, "\u27FF" },
+            { 201, "\u00C9" },
+            { 233, "\u00E9" },
+            { 10862, "\u2A6E" },
+            { 282, "\u011A" },
+            { 283, "\u011B" },
+            { 202, "\u00CA" },
+            { 234, "\u00EA" },
+            { 8790, "\u2256" },
+            { 8789, "\u2255" },
+            { 1069, "\u042D" },
+            { 1101, "\u044D" },
+            { 278, "\u0116" },
+            { 279, "\u0117" },
+            { 8519, "\u2147" },
+            { 8786, "\u2252" },
+            { 120072, "\uD835\uDD08" },
+            { 120098, "\uD835\uDD22" },
+            { 10906, "\u2A9A" },
+            { 200, "\u00C8" },
+            { 232, "\u00E8" },
+            { 10902, "\u2A96" },
+            { 10904, "\u2A98" },
+            { 10905, "\u2A99" },
+            { 8712, "\u2208" },
+            { 9191, "\u23E7" },
+            { 8467, "\u2113" },
+            { 10901, "\u2A95" },
+            { 10903, "\u2A97" },
+            { 274, "\u0112" },
+            { 275, "\u0113" },
+            { 8709, "\u2205" },
+            { 9723, "\u25FB" },
+            { 9643, "\u25AB" },
+            { 8196, "\u2004" },
+            { 8197, "\u2005" },
+            { 8195, "\u2003" },
+            { 330, "\u014A" },
+            { 331, "\u014B" },
+            { 8194, "\u2002" },
+            { 280, "\u0118" },
+            { 281, "\u0119" },
+            { 120124, "\uD835\uDD3C" },
+            { 120150, "\uD835\uDD56" },
+            { 8917, "\u22D5" },
+            { 10723, "\u29E3" },
+            { 10865, "\u2A71" },
+            { 949, "\u03B5" },
+            { 917, "\u0395" },
+            { 1013, "\u03F5" },
+            { 8770, "\u2242" },
+            { 10869, "\u2A75" },
+            { 61, "\u003D" },
+            { 8799, "\u225F" },
+            { 8652, "\u21CC" },
+            { 10872, "\u2A78" },
+            { 10725, "\u29E5" },
+            { 10609, "\u2971" },
+            { 8787, "\u2253" },
+            { 8495, "\u212F" },
+            { 8496, "\u2130" },
+            { 10867, "\u2A73" },
+            { 919, "\u0397" },
+            { 951, "\u03B7" },
+            { 208, "\u00D0" },
+            { 240, "\u00F0" },
+            { 203, "\u00CB" },
+            { 235, "\u00EB" },
+            { 8364, "\u20AC" },
+            { 33, "\u0021" },
+            { 8707, "\u2203" },
+            { 1060, "\u0424" },
+            { 1092, "\u0444" },
+            { 9792, "\u2640" },
+            { 64259, "\uFB03" },
+            { 64256, "\uFB00" },
+            { 64260, "\uFB04" },
+            { 120073, "\uD835\uDD09" },
+            { 120099, "\uD835\uDD23" },
+            { 64257, "\uFB01" },
+            { 9724, "\u25FC" },
+            { 9837, "\u266D" },
+            { 64258, "\uFB02" },
+            { 9649, "\u25B1" },
+            { 402, "\u0192" },
+            { 120125, "\uD835\uDD3D" },
+            { 120151, "\uD835\uDD57" },
+            { 8704, "\u2200" },
+            { 8916, "\u22D4" },
+            { 10969, "\u2AD9" },
+            { 8497, "\u2131" },
+            { 10765, "\u2A0D" },
+            { 189, "\u00BD" },
+            { 8531, "\u2153" },
+            { 188, "\u00BC" },
+            { 8533, "\u2155" },
+            { 8537, "\u2159" },
+            { 8539, "\u215B" },
+            { 8532, "\u2154" },
+            { 8534, "\u2156" },
+            { 190, "\u00BE" },
+            { 8535, "\u2157" },
+            { 8540, "\u215C" },
+            { 8536, "\u2158" },
+            { 8538, "\u215A" },
+            { 8541, "\u215D" },
+            { 8542, "\u215E" },
+            { 8260, "\u2044" },
+            { 8994, "\u2322" },
+            { 119995, "\uD835\uDCBB" },
+            { 501, "\u01F5" },
+            { 915, "\u0393" },
+            { 947, "\u03B3" },
+            { 988, "\u03DC" },
+            { 10886, "\u2A86" },
+            { 286, "\u011E" },
+            { 287, "\u011F" },
+            { 290, "\u0122" },
+            { 284, "\u011C" },
+            { 285, "\u011D" },
+            { 1043, "\u0413" },
+            { 1075, "\u0433" },
+            { 288, "\u0120" },
+            { 289, "\u0121" },
+            { 8805, "\u2265" },
+            { 8807, "\u2267" },
+            { 10892, "\u2A8C" },
+            { 8923, "\u22DB" },
+            { 10878, "\u2A7E" },
+            { 10921, "\u2AA9" },
+            { 10880, "\u2A80" },
+            { 10882, "\u2A82" },
+            { 10884, "\u2A84" },
+            { 10900, "\u2A94" },
+            { 120074, "\uD835\uDD0A" },
+            { 120100, "\uD835\uDD24" },
+            { 8811, "\u226B" },
+            { 8921, "\u22D9" },
+            { 8503, "\u2137" },
+            { 1027, "\u0403" },
+            { 1107, "\u0453" },
+            { 10917, "\u2AA5" },
+            { 8823, "\u2277" },
+            { 10898, "\u2A92" },
+            { 10916, "\u2AA4" },
+            { 10890, "\u2A8A" },
+            { 10888, "\u2A88" },
+            { 8809, "\u2269" },
+            { 8935, "\u22E7" },
+            { 120126, "\uD835\uDD3E" },
+            { 120152, "\uD835\uDD58" },
+            { 10914, "\u2AA2" },
+            { 8819, "\u2273" },
+            { 119970, "\uD835\uDCA2" },
+            { 8458, "\u210A" },
+            { 10894, "\u2A8E" },
+            { 10896, "\u2A90" },
+            { 10919, "\u2AA7" },
+            { 10874, "\u2A7A" },
+            { 62, "\u003E" },
+            { 8919, "\u22D7" },
+            { 10645, "\u2995" },
+            { 10876, "\u2A7C" },
+            { 10616, "\u2978" },
+            { 8202, "\u200A" },
+            { 8459, "\u210B" },
+            { 1066, "\u042A" },
+            { 1098, "\u044A" },
+            { 10568, "\u2948" },
+            { 8596, "\u2194" },
+            { 8621, "\u21AD" },
+            { 94, "\u005E" },
+            { 8463, "\u210F" },
+            { 292, "\u0124" },
+            { 293, "\u0125" },
+            { 9829, "\u2665" },
+            { 8230, "\u2026" },
+            { 8889, "\u22B9" },
+            { 120101, "\uD835\uDD25" },
+            { 8460, "\u210C" },
+            { 10533, "\u2925" },
+            { 10534, "\u2926" },
+            { 8703, "\u21FF" },
+            { 8763, "\u223B" },
+            { 8617, "\u21A9" },
+            { 8618, "\u21AA" },
+            { 120153, "\uD835\uDD59" },
+            { 8461, "\u210D" },
+            { 8213, "\u2015" },
+            { 119997, "\uD835\uDCBD" },
+            { 294, "\u0126" },
+            { 295, "\u0127" },
+            { 8259, "\u2043" },
+            { 205, "\u00CD" },
+            { 237, "\u00ED" },
+            { 8291, "\u2063" },
+            { 206, "\u00CE" },
+            { 238, "\u00EE" },
+            { 1048, "\u0418" },
+            { 1080, "\u0438" },
+            { 304, "\u0130" },
+            { 1045, "\u0415" },
+            { 1077, "\u0435" },
+            { 161, "\u00A1" },
+            { 120102, "\uD835\uDD26" },
+            { 8465, "\u2111" },
+            { 204, "\u00CC" },
+            { 236, "\u00EC" },
+            { 8520, "\u2148" },
+            { 10764, "\u2A0C" },
+            { 8749, "\u222D" },
+            { 10716, "\u29DC" },
+            { 8489, "\u2129" },
+            { 306, "\u0132" },
+            { 307, "\u0133" },
+            { 298, "\u012A" },
+            { 299, "\u012B" },
+            { 8464, "\u2110" },
+            { 305, "\u0131" },
+            { 8887, "\u22B7" },
+            { 437, "\u01B5" },
+            { 8453, "\u2105" },
+            { 8734, "\u221E" },
+            { 10717, "\u29DD" },
+            { 8890, "\u22BA" },
+            { 8747, "\u222B" },
+            { 8748, "\u222C" },
+            { 8484, "\u2124" },
+            { 10775, "\u2A17" },
+            { 10812, "\u2A3C" },
+            { 8290, "\u2062" },
+            { 1025, "\u0401" },
+            { 1105, "\u0451" },
+            { 302, "\u012E" },
+            { 303, "\u012F" },
+            { 120128, "\uD835\uDD40" },
+            { 120154, "\uD835\uDD5A" },
+            { 921, "\u0399" },
+            { 953, "\u03B9" },
+            { 191, "\u00BF" },
+            { 119998, "\uD835\uDCBE" },
+            { 8949, "\u22F5" },
+            { 8953, "\u22F9" },
+            { 8948, "\u22F4" },
+            { 8947, "\u22F3" },
+            { 296, "\u0128" },
+            { 297, "\u0129" },
+            { 1030, "\u0406" },
+            { 1110, "\u0456" },
+            { 207, "\u00CF" },
+            { 239, "\u00EF" },
+            { 308, "\u0134" },
+            { 309, "\u0135" },
+            { 1049, "\u0419" },
+            { 1081, "\u0439" },
+            { 120077, "\uD835\uDD0D" },
+            { 120103, "\uD835\uDD27" },
+            { 567, "\u0237" },
+            { 120129, "\uD835\uDD41" },
+            { 120155, "\uD835\uDD5B" },
+            { 119973, "\uD835\uDCA5" },
+            { 119999, "\uD835\uDCBF" },
+            { 1032, "\u0408" },
+            { 1112, "\u0458" },
+            { 1028, "\u0404" },
+            { 1108, "\u0454" },
+            { 922, "\u039A" },
+            { 954, "\u03BA" },
+            { 1008, "\u03F0" },
+            { 310, "\u0136" },
+            { 311, "\u0137" },
+            { 1050, "\u041A" },
+            { 1082, "\u043A" },
+            { 120078, "\uD835\uDD0E" },
+            { 120104, "\uD835\uDD28" },
+            { 312, "\u0138" },
+            { 1061, "\u0425" },
+            { 1093, "\u0445" },
+            { 1036, "\u040C" },
+            { 1116, "\u045C" },
+            { 120130, "\uD835\uDD42" },
+            { 120156, "\uD835\uDD5C" },
+            { 119974, "\uD835\uDCA6" },
+            { 120000, "\uD835\uDCC0" },
+            { 8666, "\u21DA" },
+            { 313, "\u0139" },
+            { 314, "\u013A" },
+            { 10676, "\u29B4" },
+            { 8466, "\u2112" },
+            { 923, "\u039B" },
+            { 955, "\u03BB" },
+            { 10216, "\u27E8" },
+            { 10218, "\u27EA" },
+            { 10641, "\u2991" },
+            { 10885, "\u2A85" },
+            { 171, "\u00AB" },
+            { 8676, "\u21E4" },
+            { 10527, "\u291F" },
+            { 8592, "\u2190" },
+            { 8606, "\u219E" },
+            { 10525, "\u291D" },
+            { 8619, "\u21AB" },
+            { 10553, "\u2939" },
+            { 10611, "\u2973" },
+            { 8610, "\u21A2" },
+            { 10521, "\u2919" },
+            { 10523, "\u291B" },
+            { 10923, "\u2AAB" },
+            { 10925, "\u2AAD" },
+            { 10508, "\u290C" },
+            { 10510, "\u290E" },
+            { 10098, "\u2772" },
+            { 123, "\u007B" },
+            { 91, "\u005B" },
+            { 10635, "\u298B" },
+            { 10639, "\u298F" },
+            { 10637, "\u298D" },
+            { 317, "\u013D" },
+            { 318, "\u013E" },
+            { 315, "\u013B" },
+            { 316, "\u013C" },
+            { 8968, "\u2308" },
+            { 1051, "\u041B" },
+            { 1083, "\u043B" },
+            { 10550, "\u2936" },
+            { 8220, "\u201C" },
+            { 10599, "\u2967" },
+            { 10571, "\u294B" },
+            { 8626, "\u21B2" },
+            { 8804, "\u2264" },
+            { 8806, "\u2266" },
+            { 8646, "\u21C6" },
+            { 10214, "\u27E6" },
+            { 10593, "\u2961" },
+            { 10585, "\u2959" },
+            { 8970, "\u230A" },
+            { 8636, "\u21BC" },
+            { 8647, "\u21C7" },
+            { 8651, "\u21CB" },
+            { 10574, "\u294E" },
+            { 8612, "\u21A4" },
+            { 10586, "\u295A" },
+            { 8907, "\u22CB" },
+            { 10703, "\u29CF" },
+            { 8882, "\u22B2" },
+            { 8884, "\u22B4" },
+            { 10577, "\u2951" },
+            { 10592, "\u2960" },
+            { 10584, "\u2958" },
+            { 8639, "\u21BF" },
+            { 10578, "\u2952" },
+            { 10891, "\u2A8B" },
+            { 8922, "\u22DA" },
+            { 10877, "\u2A7D" },
+            { 10920, "\u2AA8" },
+            { 10879, "\u2A7F" },
+            { 10881, "\u2A81" },
+            { 10883, "\u2A83" },
+            { 10899, "\u2A93" },
+            { 8918, "\u22D6" },
+            { 8822, "\u2276" },
+            { 10913, "\u2AA1" },
+            { 8818, "\u2272" },
+            { 10620, "\u297C" },
+            { 120079, "\uD835\uDD0F" },
+            { 120105, "\uD835\uDD29" },
+            { 10897, "\u2A91" },
+            { 10594, "\u2962" },
+            { 10602, "\u296A" },
+            { 9604, "\u2584" },
+            { 1033, "\u0409" },
+            { 1113, "\u0459" },
+            { 8810, "\u226A" },
+            { 8920, "\u22D8" },
+            { 10603, "\u296B" },
+            { 9722, "\u25FA" },
+            { 319, "\u013F" },
+            { 320, "\u0140" },
+            { 9136, "\u23B0" },
+            { 10889, "\u2A89" },
+            { 10887, "\u2A87" },
+            { 8808, "\u2268" },
+            { 8934, "\u22E6" },
+            { 10220, "\u27EC" },
+            { 8701, "\u21FD" },
+            { 10229, "\u27F5" },
+            { 10231, "\u27F7" },
+            { 10236, "\u27FC" },
+            { 10230, "\u27F6" },
+            { 8620, "\u21AC" },
+            { 10629, "\u2985" },
+            { 120131, "\uD835\uDD43" },
+            { 120157, "\uD835\uDD5D" },
+            { 10797, "\u2A2D" },
+            { 10804, "\u2A34" },
+            { 8727, "\u2217" },
+            { 95, "\u005F" },
+            { 8601, "\u2199" },
+            { 8600, "\u2198" },
+            { 9674, "\u25CA" },
+            { 40, "\u0028" },
+            { 10643, "\u2993" },
+            { 10605, "\u296D" },
+            { 8206, "\u200E" },
+            { 8895, "\u22BF" },
+            { 8249, "\u2039" },
+            { 120001, "\uD835\uDCC1" },
+            { 8624, "\u21B0" },
+            { 10893, "\u2A8D" },
+            { 10895, "\u2A8F" },
+            { 8216, "\u2018" },
+            { 8218, "\u201A" },
+            { 321, "\u0141" },
+            { 322, "\u0142" },
+            { 10918, "\u2AA6" },
+            { 10873, "\u2A79" },
+            { 60, "\u003C" },
+            { 8905, "\u22C9" },
+            { 10614, "\u2976" },
+            { 10875, "\u2A7B" },
+            { 9667, "\u25C3" },
+            { 10646, "\u2996" },
+            { 10570, "\u294A" },
+            { 10598, "\u2966" },
+            { 175, "\u00AF" },
+            { 9794, "\u2642" },
+            { 10016, "\u2720" },
+            { 10501, "\u2905" },
+            { 8614, "\u21A6" },
+            { 8613, "\u21A5" },
+            { 9646, "\u25AE" },
+            { 10793, "\u2A29" },
+            { 1052, "\u041C" },
+            { 1084, "\u043C" },
+            { 8212, "\u2014" },
+            { 8762, "\u223A" },
+            { 8287, "\u205F" },
+            { 8499, "\u2133" },
+            { 120080, "\uD835\uDD10" },
+            { 120106, "\uD835\uDD2A" },
+            { 8487, "\u2127" },
+            { 181, "\u00B5" },
+            { 10992, "\u2AF0" },
+            { 8739, "\u2223" },
+            { 8722, "\u2212" },
+            { 10794, "\u2A2A" },
+            { 8723, "\u2213" },
+            { 10971, "\u2ADB" },
+            { 8871, "\u22A7" },
+            { 120132, "\uD835\uDD44" },
+            { 120158, "\uD835\uDD5E" },
+            { 120002, "\uD835\uDCC2" },
+            { 924, "\u039C" },
+            { 956, "\u03BC" },
+            { 8888, "\u22B8" },
+            { 323, "\u0143" },
+            { 324, "\u0144" },
+            { 8777, "\u2249" },
+            { 329, "\u0149" },
+            { 9838, "\u266E" },
+            { 8469, "\u2115" },
+            { 160, "\u00A0" },
+            { 10819, "\u2A43" },
+            { 327, "\u0147" },
+            { 328, "\u0148" },
+            { 325, "\u0145" },
+            { 326, "\u0146" },
+            { 8775, "\u2247" },
+            { 10818, "\u2A42" },
+            { 1053, "\u041D" },
+            { 1085, "\u043D" },
+            { 8211, "\u2013" },
+            { 10532, "\u2924" },
+            { 8599, "\u2197" },
+            { 8663, "\u21D7" },
+            { 8800, "\u2260" },
+            { 8203, "\u200B" },
+            { 8802, "\u2262" },
+            { 10536, "\u2928" },
+            { 10, "\u000A" },
+            { 8708, "\u2204" },
+            { 120081, "\uD835\uDD11" },
+            { 120107, "\uD835\uDD2B" },
+            { 8817, "\u2271" },
+            { 8821, "\u2275" },
+            { 8815, "\u226F" },
+            { 8622, "\u21AE" },
+            { 8654, "\u21CE" },
+            { 10994, "\u2AF2" },
+            { 8715, "\u220B" },
+            { 8956, "\u22FC" },
+            { 8954, "\u22FA" },
+            { 1034, "\u040A" },
+            { 1114, "\u045A" },
+            { 8602, "\u219A" },
+            { 8653, "\u21CD" },
+            { 8229, "\u2025" },
+            { 8816, "\u2270" },
+            { 8814, "\u226E" },
+            { 8820, "\u2274" },
+            { 8938, "\u22EA" },
+            { 8940, "\u22EC" },
+            { 8740, "\u2224" },
+            { 8288, "\u2060" },
+            { 120159, "\uD835\uDD5F" },
+            { 10988, "\u2AEC" },
+            { 172, "\u00AC" },
+            { 8813, "\u226D" },
+            { 8742, "\u2226" },
+            { 8713, "\u2209" },
+            { 8825, "\u2279" },
+            { 8951, "\u22F7" },
+            { 8950, "\u22F6" },
+            { 8824, "\u2278" },
+            { 8716, "\u220C" },
+            { 8958, "\u22FE" },
+            { 8957, "\u22FD" },
+            { 8832, "\u2280" },
+            { 8928, "\u22E0" },
+            { 8939, "\u22EB" },
+            { 8941, "\u22ED" },
+            { 8930, "\u22E2" },
+            { 8931, "\u22E3" },
+            { 8840, "\u2288" },
+            { 8833, "\u2281" },
+            { 8929, "\u22E1" },
+            { 8841, "\u2289" },
+            { 8769, "\u2241" },
+            { 8772, "\u2244" },
+            { 10772, "\u2A14" },
+            { 8603, "\u219B" },
+            { 8655, "\u21CF" },
+            { 119977, "\uD835\uDCA9" },
+            { 120003, "\uD835\uDCC3" },
+            { 8836, "\u2284" },
+            { 8837, "\u2285" },
+            { 209, "\u00D1" },
+            { 241, "\u00F1" },
+            { 925, "\u039D" },
+            { 957, "\u03BD" },
+            { 35, "\u0023" },
+            { 8470, "\u2116" },
+            { 8199, "\u2007" },
+            { 8876, "\u22AC" },
+            { 8877, "\u22AD" },
+            { 8878, "\u22AE" },
+            { 8879, "\u22AF" },
+            { 10500, "\u2904" },
+            { 10718, "\u29DE" },
+            { 10498, "\u2902" },
+            { 10499, "\u2903" },
+            { 10531, "\u2923" },
+            { 8598, "\u2196" },
+            { 8662, "\u21D6" },
+            { 10535, "\u2927" },
+            { 211, "\u00D3" },
+            { 243, "\u00F3" },
+            { 212, "\u00D4" },
+            { 244, "\u00F4" },
+            { 1054, "\u041E" },
+            { 1086, "\u043E" },
+            { 336, "\u0150" },
+            { 337, "\u0151" },
+            { 10808, "\u2A38" },
+            { 10684, "\u29BC" },
+            { 338, "\u0152" },
+            { 339, "\u0153" },
+            { 10687, "\u29BF" },
+            { 120082, "\uD835\uDD12" },
+            { 120108, "\uD835\uDD2C" },
+            { 731, "\u02DB" },
+            { 210, "\u00D2" },
+            { 242, "\u00F2" },
+            { 10689, "\u29C1" },
+            { 10677, "\u29B5" },
+            { 937, "\u03A9" },
+            { 10686, "\u29BE" },
+            { 10683, "\u29BB" },
+            { 8254, "\u203E" },
+            { 10688, "\u29C0" },
+            { 332, "\u014C" },
+            { 333, "\u014D" },
+            { 969, "\u03C9" },
+            { 927, "\u039F" },
+            { 959, "\u03BF" },
+            { 10678, "\u29B6" },
+            { 120134, "\uD835\uDD46" },
+            { 120160, "\uD835\uDD60" },
+            { 10679, "\u29B7" },
+            { 10681, "\u29B9" },
+            { 10836, "\u2A54" },
+            { 8744, "\u2228" },
+            { 10845, "\u2A5D" },
+            { 8500, "\u2134" },
+            { 170, "\u00AA" },
+            { 186, "\u00BA" },
+            { 8886, "\u22B6" },
+            { 10838, "\u2A56" },
+            { 10839, "\u2A57" },
+            { 10843, "\u2A5B" },
+            { 119978, "\uD835\uDCAA" },
+            { 216, "\u00D8" },
+            { 248, "\u00F8" },
+            { 8856, "\u2298" },
+            { 213, "\u00D5" },
+            { 245, "\u00F5" },
+            { 10806, "\u2A36" },
+            { 10807, "\u2A37" },
+            { 214, "\u00D6" },
+            { 246, "\u00F6" },
+            { 9021, "\u233D" },
+            { 9182, "\u23DE" },
+            { 9140, "\u23B4" },
+            { 9180, "\u23DC" },
+            { 182, "\u00B6" },
+            { 10995, "\u2AF3" },
+            { 11005, "\u2AFD" },
+            { 8706, "\u2202" },
+            { 1055, "\u041F" },
+            { 1087, "\u043F" },
+            { 37, "\u0025" },
+            { 46, "\u002E" },
+            { 8240, "\u2030" },
+            { 8241, "\u2031" },
+            { 120083, "\uD835\uDD13" },
+            { 120109, "\uD835\uDD2D" },
+            { 934, "\u03A6" },
+            { 966, "\u03C6" },
+            { 981, "\u03D5" },
+            { 9742, "\u260E" },
+            { 928, "\u03A0" },
+            { 960, "\u03C0" },
+            { 982, "\u03D6" },
+            { 8462, "\u210E" },
+            { 10787, "\u2A23" },
+            { 10786, "\u2A22" },
+            { 43, "\u002B" },
+            { 10789, "\u2A25" },
+            { 10866, "\u2A72" },
+            { 177, "\u00B1" },
+            { 10790, "\u2A26" },
+            { 10791, "\u2A27" },
+            { 10773, "\u2A15" },
+            { 120161, "\uD835\uDD61" },
+            { 8473, "\u2119" },
+            { 163, "\u00A3" },
+            { 10935, "\u2AB7" },
+            { 10939, "\u2ABB" },
+            { 8826, "\u227A" },
+            { 8828, "\u227C" },
+            { 10927, "\u2AAF" },
+            { 8830, "\u227E" },
+            { 10937, "\u2AB9" },
+            { 10933, "\u2AB5" },
+            { 8936, "\u22E8" },
+            { 10931, "\u2AB3" },
+            { 8242, "\u2032" },
+            { 8243, "\u2033" },
+            { 8719, "\u220F" },
+            { 9006, "\u232E" },
+            { 8978, "\u2312" },
+            { 8979, "\u2313" },
+            { 8733, "\u221D" },
+            { 8880, "\u22B0" },
+            { 119979, "\uD835\uDCAB" },
+            { 120005, "\uD835\uDCC5" },
+            { 936, "\u03A8" },
+            { 968, "\u03C8" },
+            { 8200, "\u2008" },
+            { 120084, "\uD835\uDD14" },
+            { 120110, "\uD835\uDD2E" },
+            { 120162, "\uD835\uDD62" },
+            { 8474, "\u211A" },
+            { 8279, "\u2057" },
+            { 119980, "\uD835\uDCAC" },
+            { 120006, "\uD835\uDCC6" },
+            { 10774, "\u2A16" },
+            { 63, "\u003F" },
+            { 34, "\u0022" },
+            { 8667, "\u21DB" },
+            { 340, "\u0154" },
+            { 341, "\u0155" },
+            { 8730, "\u221A" },
+            { 10675, "\u29B3" },
+            { 10217, "\u27E9" },
+            { 10219, "\u27EB" },
+            { 10642, "\u2992" },
+            { 10661, "\u29A5" },
+            { 187, "\u00BB" },
+            { 10613, "\u2975" },
+            { 8677, "\u21E5" },
+            { 10528, "\u2920" },
+            { 10547, "\u2933" },
+            { 8594, "\u2192" },
+            { 8608, "\u21A0" },
+            { 10526, "\u291E" },
+            { 10565, "\u2945" },
+            { 10612, "\u2974" },
+            { 10518, "\u2916" },
+            { 8611, "\u21A3" },
+            { 8605, "\u219D" },
+            { 10522, "\u291A" },
+            { 10524, "\u291C" },
+            { 8758, "\u2236" },
+            { 10099, "\u2773" },
+            { 125, "\u007D" },
+            { 93, "\u005D" },
+            { 10636, "\u298C" },
+            { 10638, "\u298E" },
+            { 10640, "\u2990" },
+            { 344, "\u0158" },
+            { 345, "\u0159" },
+            { 342, "\u0156" },
+            { 343, "\u0157" },
+            { 8969, "\u2309" },
+            { 1056, "\u0420" },
+            { 1088, "\u0440" },
+            { 10551, "\u2937" },
+            { 10601, "\u2969" },
+            { 8627, "\u21B3" },
+            { 8476, "\u211C" },
+            { 8475, "\u211B" },
+            { 8477, "\u211D" },
+            { 9645, "\u25AD" },
+            { 10621, "\u297D" },
+            { 8971, "\u230B" },
+            { 120111, "\uD835\uDD2F" },
+            { 10596, "\u2964" },
+            { 8640, "\u21C0" },
+            { 10604, "\u296C" },
+            { 929, "\u03A1" },
+            { 961, "\u03C1" },
+            { 1009, "\u03F1" },
+            { 8644, "\u21C4" },
+            { 10215, "\u27E7" },
+            { 10589, "\u295D" },
+            { 10581, "\u2955" },
+            { 8649, "\u21C9" },
+            { 8866, "\u22A2" },
+            { 10587, "\u295B" },
+            { 8908, "\u22CC" },
+            { 10704, "\u29D0" },
+            { 8883, "\u22B3" },
+            { 8885, "\u22B5" },
+            { 10575, "\u294F" },
+            { 10588, "\u295C" },
+            { 10580, "\u2954" },
+            { 8638, "\u21BE" },
+            { 10579, "\u2953" },
+            { 730, "\u02DA" },
+            { 8207, "\u200F" },
+            { 9137, "\u23B1" },
+            { 10990, "\u2AEE" },
+            { 10221, "\u27ED" },
+            { 8702, "\u21FE" },
+            { 10630, "\u2986" },
+            { 120163, "\uD835\uDD63" },
+            { 10798, "\u2A2E" },
+            { 10805, "\u2A35" },
+            { 10608, "\u2970" },
+            { 41, "\u0029" },
+            { 10644, "\u2994" },
+            { 10770, "\u2A12" },
+            { 8250, "\u203A" },
+            { 120007, "\uD835\uDCC7" },
+            { 8625, "\u21B1" },
+            { 8906, "\u22CA" },
+            { 9657, "\u25B9" },
+            { 10702, "\u29CE" },
+            { 10740, "\u29F4" },
+            { 10600, "\u2968" },
+            { 8478, "\u211E" },
+            { 346, "\u015A" },
+            { 347, "\u015B" },
+            { 10936, "\u2AB8" },
+            { 352, "\u0160" },
+            { 353, "\u0161" },
+            { 10940, "\u2ABC" },
+            { 8827, "\u227B" },
+            { 8829, "\u227D" },
+            { 10928, "\u2AB0" },
+            { 10932, "\u2AB4" },
+            { 350, "\u015E" },
+            { 351, "\u015F" },
+            { 348, "\u015C" },
+            { 349, "\u015D" },
+            { 10938, "\u2ABA" },
+            { 10934, "\u2AB6" },
+            { 8937, "\u22E9" },
+            { 10771, "\u2A13" },
+            { 8831, "\u227F" },
+            { 1057, "\u0421" },
+            { 1089, "\u0441" },
+            { 8901, "\u22C5" },
+            { 10854, "\u2A66" },
+            { 8664, "\u21D8" },
+            { 167, "\u00A7" },
+            { 59, "\u003B" },
+            { 10537, "\u2929" },
+            { 10038, "\u2736" },
+            { 120086, "\uD835\uDD16" },
+            { 120112, "\uD835\uDD30" },
+            { 9839, "\u266F" },
+            { 1065, "\u0429" },
+            { 1097, "\u0449" },
+            { 1064, "\u0428" },
+            { 1096, "\u0448" },
+            { 8593, "\u2191" },
+            { 173, "\u00AD" },
+            { 931, "\u03A3" },
+            { 963, "\u03C3" },
+            { 962, "\u03C2" },
+            { 8764, "\u223C" },
+            { 10858, "\u2A6A" },
+            { 8771, "\u2243" },
+            { 10910, "\u2A9E" },
+            { 10912, "\u2AA0" },
+            { 10909, "\u2A9D" },
+            { 10911, "\u2A9F" },
+            { 8774, "\u2246" },
+            { 10788, "\u2A24" },
+            { 10610, "\u2972" },
+            { 10803, "\u2A33" },
+            { 10724, "\u29E4" },
+            { 8995, "\u2323" },
+            { 10922, "\u2AAA" },
+            { 10924, "\u2AAC" },
+            { 1068, "\u042C" },
+            { 1100, "\u044C" },
+            { 9023, "\u233F" },
+            { 10692, "\u29C4" },
+            { 47, "\u002F" },
+            { 120138, "\uD835\uDD4A" },
+            { 120164, "\uD835\uDD64" },
+            { 9824, "\u2660" },
+            { 8851, "\u2293" },
+            { 8852, "\u2294" },
+            { 8847, "\u228F" },
+            { 8849, "\u2291" },
+            { 8848, "\u2290" },
+            { 8850, "\u2292" },
+            { 9633, "\u25A1" },
+            { 119982, "\uD835\uDCAE" },
+            { 120008, "\uD835\uDCC8" },
+            { 8902, "\u22C6" },
+            { 9734, "\u2606" },
+            { 8834, "\u2282" },
+            { 8912, "\u22D0" },
+            { 10941, "\u2ABD" },
+            { 10949, "\u2AC5" },
+            { 8838, "\u2286" },
+            { 10947, "\u2AC3" },
+            { 10945, "\u2AC1" },
+            { 10955, "\u2ACB" },
+            { 8842, "\u228A" },
+            { 10943, "\u2ABF" },
+            { 10617, "\u2979" },
+            { 10951, "\u2AC7" },
+            { 10965, "\u2AD5" },
+            { 10963, "\u2AD3" },
+            { 8721, "\u2211" },
+            { 9834, "\u266A" },
+            { 185, "\u00B9" },
+            { 178, "\u00B2" },
+            { 179, "\u00B3" },
+            { 8835, "\u2283" },
+            { 8913, "\u22D1" },
+            { 10942, "\u2ABE" },
+            { 10968, "\u2AD8" },
+            { 10950, "\u2AC6" },
+            { 8839, "\u2287" },
+            { 10948, "\u2AC4" },
+            { 10185, "\u27C9" },
+            { 10967, "\u2AD7" },
+            { 10619, "\u297B" },
+            { 10946, "\u2AC2" },
+            { 10956, "\u2ACC" },
+            { 8843, "\u228B" },
+            { 10944, "\u2AC0" },
+            { 10952, "\u2AC8" },
+            { 10964, "\u2AD4" },
+            { 10966, "\u2AD6" },
+            { 8665, "\u21D9" },
+            { 10538, "\u292A" },
+            { 223, "\u00DF" },
+            { 9, "\u0009" },
+            { 8982, "\u2316" },
+            { 932, "\u03A4" },
+            { 964, "\u03C4" },
+            { 356, "\u0164" },
+            { 357, "\u0165" },
+            { 354, "\u0162" },
+            { 355, "\u0163" },
+            { 1058, "\u0422" },
+            { 1090, "\u0442" },
+            { 8411, "\u20DB" },
+            { 8981, "\u2315" },
+            { 120087, "\uD835\uDD17" },
+            { 120113, "\uD835\uDD31" },
+            { 8756, "\u2234" },
+            { 920, "\u0398" },
+            { 952, "\u03B8" },
+            { 977, "\u03D1" },
+            { 8201, "\u2009" },
+            { 222, "\u00DE" },
+            { 254, "\u00FE" },
+            { 10801, "\u2A31" },
+            { 215, "\u00D7" },
+            { 10800, "\u2A30" },
+            { 9014, "\u2336" },
+            { 10993, "\u2AF1" },
+            { 120139, "\uD835\uDD4B" },
+            { 120165, "\uD835\uDD65" },
+            { 10970, "\u2ADA" },
+            { 8244, "\u2034" },
+            { 8482, "\u2122" },
+            { 9653, "\u25B5" },
+            { 8796, "\u225C" },
+            { 9708, "\u25EC" },
+            { 10810, "\u2A3A" },
+            { 10809, "\u2A39" },
+            { 10701, "\u29CD" },
+            { 10811, "\u2A3B" },
+            { 9186, "\u23E2" },
+            { 119983, "\uD835\uDCAF" },
+            { 120009, "\uD835\uDCC9" },
+            { 1062, "\u0426" },
+            { 1094, "\u0446" },
+            { 1035, "\u040B" },
+            { 1115, "\u045B" },
+            { 358, "\u0166" },
+            { 359, "\u0167" },
+            { 218, "\u00DA" },
+            { 250, "\u00FA" },
+            { 8607, "\u219F" },
+            { 10569, "\u2949" },
+            { 1038, "\u040E" },
+            { 1118, "\u045E" },
+            { 364, "\u016C" },
+            { 365, "\u016D" },
+            { 219, "\u00DB" },
+            { 251, "\u00FB" },
+            { 1059, "\u0423" },
+            { 1091, "\u0443" },
+            { 8645, "\u21C5" },
+            { 368, "\u0170" },
+            { 369, "\u0171" },
+            { 10606, "\u296E" },
+            { 10622, "\u297E" },
+            { 120088, "\uD835\uDD18" },
+            { 120114, "\uD835\uDD32" },
+            { 217, "\u00D9" },
+            { 249, "\u00F9" },
+            { 10595, "\u2963" },
+            { 9600, "\u2580" },
+            { 8988, "\u231C" },
+            { 8975, "\u230F" },
+            { 9720, "\u25F8" },
+            { 362, "\u016A" },
+            { 363, "\u016B" },
+            { 9183, "\u23DF" },
+            { 9181, "\u23DD" },
+            { 8846, "\u228E" },
+            { 370, "\u0172" },
+            { 371, "\u0173" },
+            { 120140, "\uD835\uDD4C" },
+            { 120166, "\uD835\uDD66" },
+            { 10514, "\u2912" },
+            { 8597, "\u2195" },
+            { 965, "\u03C5" },
+            { 978, "\u03D2" },
+            { 933, "\u03A5" },
+            { 8648, "\u21C8" },
+            { 8989, "\u231D" },
+            { 8974, "\u230E" },
+            { 366, "\u016E" },
+            { 367, "\u016F" },
+            { 9721, "\u25F9" },
+            { 119984, "\uD835\uDCB0" },
+            { 120010, "\uD835\uDCCA" },
+            { 8944, "\u22F0" },
+            { 360, "\u0168" },
+            { 361, "\u0169" },
+            { 220, "\u00DC" },
+            { 252, "\u00FC" },
+            { 10663, "\u29A7" },
+            { 10652, "\u299C" },
+            { 10984, "\u2AE8" },
+            { 10987, "\u2AEB" },
+            { 10985, "\u2AE9" },
+            { 1042, "\u0412" },
+            { 1074, "\u0432" },
+            { 8873, "\u22A9" },
+            { 8875, "\u22AB" },
+            { 10982, "\u2AE6" },
+            { 8891, "\u22BB" },
+            { 8794, "\u225A" },
+            { 8942, "\u22EE" },
+            { 124, "\u007C" },
+            { 8214, "\u2016" },
+            { 10072, "\u2758" },
+            { 8768, "\u2240" },
+            { 120089, "\uD835\uDD19" },
+            { 120115, "\uD835\uDD33" },
+            { 120141, "\uD835\uDD4D" },
+            { 120167, "\uD835\uDD67" },
+            { 119985, "\uD835\uDCB1" },
+            { 120011, "\uD835\uDCCB" },
+            { 8874, "\u22AA" },
+            { 10650, "\u299A" },
+            { 372, "\u0174" },
+            { 373, "\u0175" },
+            { 10847, "\u2A5F" },
+            { 8793, "\u2259" },
+            { 8472, "\u2118" },
+            { 120090, "\uD835\uDD1A" },
+            { 120116, "\uD835\uDD34" },
+            { 120142, "\uD835\uDD4E" },
+            { 120168, "\uD835\uDD68" },
+            { 119986, "\uD835\uDCB2" },
+            { 120012, "\uD835\uDCCC" },
+            { 120091, "\uD835\uDD1B" },
+            { 120117, "\uD835\uDD35" },
+            { 926, "\u039E" },
+            { 958, "\u03BE" },
+            { 8955, "\u22FB" },
+            { 120143, "\uD835\uDD4F" },
+            { 120169, "\uD835\uDD69" },
+            { 119987, "\uD835\uDCB3" },
+            { 120013, "\uD835\uDCCD" },
+            { 221, "\u00DD" },
+            { 253, "\u00FD" },
+            { 1071, "\u042F" },
+            { 1103, "\u044F" },
+            { 374, "\u0176" },
+            { 375, "\u0177" },
+            { 1067, "\u042B" },
+            { 1099, "\u044B" },
+            { 165, "\u00A5" },
+            { 120092, "\uD835\uDD1C" },
+            { 120118, "\uD835\uDD36" },
+            { 1031, "\u0407" },
+            { 1111, "\u0457" },
+            { 120144, "\uD835\uDD50" },
+            { 120170, "\uD835\uDD6A" },
+            { 119988, "\uD835\uDCB4" },
+            { 120014, "\uD835\uDCCE" },
+            { 1070, "\u042E" },
+            { 1102, "\u044E" },
+            { 255, "\u00FF" },
+            { 376, "\u0178" },
+            { 377, "\u0179" },
+            { 378, "\u017A" },
+            { 381, "\u017D" },
+            { 382, "\u017E" },
+            { 1047, "\u0417" },
+            { 1079, "\u0437" },
+            { 379, "\u017B" },
+            { 380, "\u017C" },
+            { 8488, "\u2128" },
+            { 918, "\u0396" },
+            { 950, "\u03B6" },
+            { 120119, "\uD835\uDD37" },
+            { 1046, "\u0416" },
+            { 1078, "\u0436" },
+            { 8669, "\u21DD" },
+            { 120171, "\uD835\uDD6B" },
+            { 119989, "\uD835\uDCB5" },
+            { 120015, "\uD835\uDCCF" },
+            { 8205, "\u200D" },
+            { 8204, "\u200C" },
+        };
+
+        #endregion
     }
 }

From 37275e5fd58c265985df5a65a3378b2d342fcd65 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 3 Apr 2019 20:59:43 -0700
Subject: [PATCH 130/337] Do not generate MVC attributes unless necessary Fixes
 https://github.com/aspnet/AspNetCore/issues/8161 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/a976b80c7c49d97ec5bce22c7cee5e3f76d32550

---
 ...rosoft.NET.Sdk.Razor.Configuration.targets | 66 ++++++++++---------
 ...NET.Sdk.Razor.GenerateAssemblyInfo.targets | 22 +++++--
 .../Sdk.Razor.CurrentVersion.targets          |  3 -
 .../IntegrationTests/BuildIntegrationTest.cs  |  8 +--
 .../BuildWithComponentsIntegrationTest.cs     |  2 +-
 .../ConfigurationMetadataIntegrationTest.cs   | 35 +++++++++-
 .../DesignTimeBuildIntegrationTest.cs         |  2 +-
 .../ComponentApp/ComponentApp.csproj          |  2 +-
 .../{_ViewImports.cshtml => _Imports.razor}   |  0
 9 files changed, 90 insertions(+), 50 deletions(-)
 rename src/Razor/test/testassets/ComponentApp/Components/Pages/{_ViewImports.cshtml => _Imports.razor} (100%)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index 348888a839..53c961556a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -28,30 +28,44 @@ Copyright (c) .NET Foundation. All rights reserved.
   </PropertyGroup>
 
   <!--
-      Configure MVC specific configuration if the application uses a configuration that supports MVC.
+      Resolve MVC specific configuration depending on the presence of MVC specific Razor files.
   -->
-  <PropertyGroup Condition="'$(AddRazorSupportForMvc)' == 'true'">
-    <!--
-      MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
-    -->
-    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">true</GenerateProvideApplicationPartFactoryAttribute>
+  <Target Name="_ResolveMvcSpecificRazorConfiguration"
+    DependsOnTargets="ResolveRazorGenerateInputs"
+    Condition="'$(Language)' == 'C#' AND '$(AddRazorSupportForMvc)' == 'true'">
 
-    <!--
-      Determines if the Sdk is allowed to add additional attributes to the project assembly.
-      For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
-    -->
-    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
+    <Message Text="@(RazorGenerateWithTargetPath)" Importance="High" />
 
-    <!--
-      MVC will generally want to add support for runtime compilation, but only for applications.
-    -->
-    <GenerateRazorHostingAssemblyInfo Condition="'$(GenerateRazorHostingAssemblyInfo)'=='' AND '$(OutputType)'=='exe'">$(GenerateRazorAssemblyInfo)</GenerateRazorHostingAssemblyInfo>
+   <PropertyGroup Condition="'@(RazorGenerate->Count())' != '0'">
+      <!--
+        MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
+      -->
+      <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">true</GenerateProvideApplicationPartFactoryAttribute>
 
-    <!--
-      The type name of the ApplicationPartFactory applied to the generated Razor file.
-    -->
-    <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
-  </PropertyGroup>
+      <!--
+        Determines if the Sdk is allowed to add additional attributes to the project assembly.
+        For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
+      -->
+      <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
+
+      <!--
+        The type name of the ApplicationPartFactory applied to the generated Razor file.
+      -->
+      <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(GenerateProvideApplicationPartFactoryAttribute)' == 'true' AND '$(ProvideApplicationPartFactoryAttributeTypeName)'!=''">
+      <RazorTargetAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute">
+        <_Parameter1>$(ProvideApplicationPartFactoryAttributeTypeName)</_Parameter1>
+      </RazorTargetAssemblyAttribute>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">
+      <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute">
+        <_Parameter1>$(RazorTargetName)</_Parameter1>
+      </_RazorAssemblyAttribute>
+    </ItemGroup>
+  </Target>
 
   <!--
     Determine the default Razor configuration
@@ -80,16 +94,4 @@ Copyright (c) .NET Foundation. All rights reserved.
     </RazorExtension>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">
-    <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute">
-      <_Parameter1>$(RazorTargetName)</_Parameter1>
-    </_RazorAssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(GenerateProvideApplicationPartFactoryAttribute)' == 'true' AND '$(ProvideApplicationPartFactoryAttributeTypeName)'!=''">
-    <RazorTargetAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute">
-      <_Parameter1>$(ProvideApplicationPartFactoryAttributeTypeName)</_Parameter1>
-    </RazorTargetAssemblyAttribute>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
index bc46b453cf..6b241cab48 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
@@ -32,6 +32,11 @@ Copyright (c) .NET Foundation. All rights reserved.
       _CreateRazorTargetAssemblyInfoInputsCacheFile;
       CoreGenerateRazorTargetAssemblyInfo
     </GenerateRazorTargetAssemblyInfoDependsOn>
+
+    <GenerateRazorTargetAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
+      _ResolveMvcSpecificRazorConfiguration;
+      $(GenerateRazorTargetAssemblyInfoDependsOn)
+    </GenerateRazorTargetAssemblyInfoDependsOn>
   </PropertyGroup>
 
   <Target
@@ -156,9 +161,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     DependsOnTargets="_CreateRazorAssemblyInfoInputsCacheFile"
     Inputs="$(_RazorAssemblyInfoInputsCacheFile)"
     Outputs="$(_RazorAssemblyInfo)"
-    Condition="'@(_RazorAssemblyAttribute)' != ''">
+    Condition="'$(GenerateRazorAssemblyInfo)' == 'true' AND '@(_RazorAssemblyAttribute)' != ''">
 
-    <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true'">
+    <ItemGroup>
       <Compile Remove="$(_RazorAssemblyInfo)" />
       <Compile Include="$(_RazorAssemblyInfo)" />
     </ItemGroup>
@@ -173,11 +178,18 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup>
     <!-- Generate attributes in the main assembly if we're targeting a C# project and using the Razor Sdk. -->
-    <CoreCompileDependsOn Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(Language)' == 'C#' and '$(GenerateRazorAssemblyInfo)' == 'true'">
-      $(CoreCompileDependsOn);_GenerateRazorAssemblyInfo
+    <CoreCompileDependsOn Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(Language)' == 'C#'">
+      $(CoreCompileDependsOn);
+      _GenerateRazorAssemblyInfo
     </CoreCompileDependsOn>
 
-    <_GenerateRazorAssemblyInfoDependsOn>PrepareForBuild;_CoreGenerateRazorAssemblyInfo</_GenerateRazorAssemblyInfoDependsOn>
+    <_GenerateRazorAssemblyInfoDependsOn>RazorGetAssemblyAttributes;PrepareForBuild;_CoreGenerateRazorAssemblyInfo</_GenerateRazorAssemblyInfoDependsOn>
+
+    <!-- In 3.0 or later, we need to invoke a target to determine MVC specific configuration. -->
+    <_GenerateRazorAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
+      _ResolveMvcSpecificRazorConfiguration;
+      $(_GenerateRazorAssemblyInfoDependsOn);
+    </_GenerateRazorAssemblyInfoDependsOn>
   </PropertyGroup>
 
   <Target Name="_GenerateRazorAssemblyInfo" DependsOnTargets="$(_GenerateRazorAssemblyInfoDependsOn)" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 7d8b3c22ab..70701f7e1a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -407,9 +407,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     The SDK expects configurations that use runtime compilation to set $(GenerateRazorHostingAssemblyInfo) to true,
     it will be unset by default.
   -->
-  <PropertyGroup>
-    <_GenerateRazorAssemblyInfoDependsOn>RazorGetAssemblyAttributes;$(_GenerateRazorAssemblyInfoDependsOn)</_GenerateRazorAssemblyInfoDependsOn>
-  </PropertyGroup>
 
   <Target
     Name="RazorGetAssemblyAttributes"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 06a454b7ab..bb12cd662c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -379,9 +379,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            Assert.FileExists(result, razorAssemblyInfo);
-            Assert.FileDoesNotContain(result, razorAssemblyInfo, "RelatedAssemblyAttribute");
-
+            Assert.FileDoesNotExist(result, razorAssemblyInfo);
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
         }
 
@@ -454,8 +452,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             Assert.FileExists(result, razorAssemblyInfo);
-            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"2.1\")");
-            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-2-1\")");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute");
+            Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute");
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 1503141b88..678136b0ef 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("ComponentApp")]
-        public async Task Build_DoesNotProduceMvcArtifacts_IfAddRazorSupportForMvcIsFalse()
+        public async Task Build_DoesNotProduceMvcArtifacts_IfProjectDoesNotContainRazorGenerateItems()
         {
             var result = await DotnetMSBuild("Build");
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
index 183627bd2c..296db5c373 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
@@ -14,9 +14,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
-        [Fact]
+         [Fact]
         [InitializeTestProject("SimpleMvc")]
-        public async Task Build_WithMvc_AddsConfigurationMetadata()
+        public async Task Build_DoesNotAddHostingMetadata_ByDefault()
         {
             var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
             var result = await DotnetMSBuild("Build");
@@ -26,6 +26,37 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
             Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
 
+            Assert.FileExists(result, razorAssemblyInfo);
+            Assert.FileContainsLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute(\"SimpleMvc.Views\")]");
+            Assert.FileDoesNotContainLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"3.0\")]");
+            Assert.FileDoesNotContainLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-3.0\")]");
+            Assert.FileDoesNotContainLine(
+                result,
+                razorAssemblyInfo,
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-3.0\", \"Microsoft.AspNetCore.Mvc.Razor.Extensions\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithGenerateRazorHostingAssemblyInfo_AddsConfigurationMetadata()
+        {
+            var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorAssemblyInfo.cs");
+            var result = await DotnetMSBuild("Build", "/p:GenerateRazorHostingAssemblyInfo=true");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.Views.pdb");
+
             Assert.FileExists(result, razorAssemblyInfo);
             Assert.FileContainsLine(
                 result,
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index c6b33539ad..2c14663f4d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
 
             // This target should be part of the design time build.
-            Assert.Contains("RazorGetAssemblyAttributes", result.Output);
+            Assert.Contains("_GenerateRazorAssemblyInfo", result.Output);
 
             // We don't want to see the expensive Razor targets in the performance summary, since they shouldn't run
             // during a design time build.
diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
index a5a31a82f7..2e01f4b269 100644
--- a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
+++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/_ViewImports.cshtml b/src/Razor/test/testassets/ComponentApp/Components/Pages/_Imports.razor
similarity index 100%
rename from src/Razor/test/testassets/ComponentApp/Components/Pages/_ViewImports.cshtml
rename to src/Razor/test/testassets/ComponentApp/Components/Pages/_Imports.razor

From 5b71a24b4fcae223bd3fa15426e03a1a9a733936 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 4 Apr 2019 06:05:46 -0700
Subject: [PATCH 131/337] Fixup \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/f6dd26121187bd3fa9493bfb1df4d700c9999aac

---
 .../Microsoft.NET.Sdk.Razor.Configuration.targets             | 4 +---
 .../Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets      | 4 ++--
 .../test/IntegrationTests/BuildIntegrationTest.cs             | 2 +-
 .../IntegrationTests/ConfigurationMetadataIntegrationTest.cs  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index 53c961556a..9267ba8614 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -30,12 +30,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!--
       Resolve MVC specific configuration depending on the presence of MVC specific Razor files.
   -->
-  <Target Name="_ResolveMvcSpecificRazorConfiguration"
+  <Target Name="_ResolveMvcAssemblyAttributes"
     DependsOnTargets="ResolveRazorGenerateInputs"
     Condition="'$(Language)' == 'C#' AND '$(AddRazorSupportForMvc)' == 'true'">
 
-    <Message Text="@(RazorGenerateWithTargetPath)" Importance="High" />
-
    <PropertyGroup Condition="'@(RazorGenerate->Count())' != '0'">
       <!--
         MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
index 6b241cab48..a32b19a4d9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
@@ -34,7 +34,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </GenerateRazorTargetAssemblyInfoDependsOn>
 
     <GenerateRazorTargetAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
-      _ResolveMvcSpecificRazorConfiguration;
+      _ResolveMvcAssemblyAttributes;
       $(GenerateRazorTargetAssemblyInfoDependsOn)
     </GenerateRazorTargetAssemblyInfoDependsOn>
   </PropertyGroup>
@@ -187,7 +187,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- In 3.0 or later, we need to invoke a target to determine MVC specific configuration. -->
     <_GenerateRazorAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
-      _ResolveMvcSpecificRazorConfiguration;
+      _ResolveMvcAssemblyAttributes;
       $(_GenerateRazorAssemblyInfoDependsOn);
     </_GenerateRazorAssemblyInfoDependsOn>
   </PropertyGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index bb12cd662c..e0bbf50b9c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -444,7 +444,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]
-        public async Task Build_GeneratesHostingAttributesByDefault()
+        public async Task Build_GeneratesHostingAttributes_WhenGenerateRazorHostingAssemblyInfoIsSet()
         {
             var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.AssemblyInfo.cs");
             var result = await DotnetMSBuild("Build", "/p:GenerateRazorHostingAssemblyInfo=false");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
index 296db5c373..6d57b38214 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
-         [Fact]
+        [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_DoesNotAddHostingMetadata_ByDefault()
         {

From 35edb562c56f9e36785364e04d89adf449482362 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 5 Apr 2019 16:00:29 -0700
Subject: [PATCH 132/337] Match component childcontent tag helper from a
 different namespace (dotnet/aspnetcore-tooling#390)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8a815a1882351264a30372aa154fcc35e8987caa
---
 .../src/DefaultRazorTagHelperBinderPhase.cs       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
index e4a30a841a..03e8bc4314 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -334,6 +334,12 @@ namespace Microsoft.AspNetCore.Razor.Language
                             }
 
                             var typeName = tagHelper.GetTypeName();
+                            if (tagHelper.IsChildContentTagHelper())
+                            {
+                                // If this is a child content tag helper, we want to add it if it's original type is in scope of the given namespace.
+                                // E.g, if the type name is `Test.MyComponent.ChildContent`, we want to add it if `Test.MyComponent` is in this namespace.
+                                TrySplitNamespaceAndType(typeName, out typeName, out var _);
+                            }
                             if (typeName != null && IsTypeInNamespace(typeName, @namespace))
                             {
                                 // If the type is at the top-level or if the type's namespace matches the using's namespace, add it.
@@ -390,7 +396,14 @@ namespace Microsoft.AspNetCore.Razor.Language
             // open file in the editor. We mangle the class name for its generated code, so using that here to filter these out.
             internal static bool IsTagHelperFromMangledClass(TagHelperDescriptor tagHelper)
             {
-                if (!TrySplitNamespaceAndType(tagHelper.GetTypeName(), out var _, out var className))
+                var typeName = tagHelper.GetTypeName();
+                if (tagHelper.IsChildContentTagHelper())
+                {
+                    // If this is a child content tag helper, we want to look at it's original type.
+                    // E.g, if the type name is `Test.__generated__MyComponent.ChildContent`, we want to look at `Test.__generated__MyComponent`.
+                    TrySplitNamespaceAndType(typeName, out typeName, out var _);
+                }
+                if (!TrySplitNamespaceAndType(typeName, out var _, out var className))
                 {
                     return false;
                 }

From 7957c11d0279ef3f406ee5bd82c119bce4d72e02 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 7 Apr 2019 00:22:02 +0000
Subject: [PATCH 133/337] [master] Update dependencies from dotnet/arcade
 (dotnet/aspnetcore-tooling#346)

* Update dependencies from https://github.com/dotnet/arcade build 20190317.10

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19167.10

* Update dependencies from https://github.com/dotnet/arcade build 20190320.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19170.2

* Update dependencies from https://github.com/dotnet/arcade build 20190321.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.3

* Update dependencies from https://github.com/dotnet/arcade build 20190321.6

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.6

* Update dependencies from https://github.com/dotnet/arcade build 20190325.9

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19175.9

* Update dependencies from https://github.com/dotnet/arcade build 20190326.14

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19176.14

* Update dependencies from https://github.com/dotnet/arcade build 20190327.11

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19177.11

* Update dependencies from https://github.com/dotnet/arcade build 20190329.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.1

* Update dependencies from https://github.com/dotnet/arcade build 20190329.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.2

* Update dependencies from https://github.com/dotnet/arcade build 20190401.12

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19201.12

* Update dependencies from https://github.com/dotnet/arcade build 20190402.13

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19202.13

* Update dependencies from https://github.com/dotnet/arcade build 20190403.10

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19203.10

* Update dependencies from https://github.com/dotnet/arcade build 20190404.16

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19204.16

* Update dependencies from https://github.com/dotnet/arcade build 20190405.6

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19205.6

* Use updated Arcade NuSpec helpers
- provide `InitializeStandardNuspecProperties` with expected information
- use `$CommonMetadataElements$` in Microsoft.NET.Sdk.Razor.nuspec

nits:
- correct a typo or two
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c60b63e296151f2809836b833b398ec07fa4c776
---
 .../src/Microsoft.NET.Sdk.Razor.csproj        | 27 ++++++-------------
 .../src/Microsoft.NET.Sdk.Razor.nuspec        | 15 ++---------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index bf1a78efca..ca4b3e0593 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -45,10 +45,10 @@
       Targets="Publish" />
 
     <ItemGroup>
-      <MvcRazorExtenionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
+      <MvcRazorExtensionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" SkipUnchangedFiles="true">
+    <Copy SourceFiles="@(MvcRazorExtensionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" SkipUnchangedFiles="true">
       <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
     </Copy>
 
@@ -62,24 +62,13 @@
     </Copy>
   </Target>
 
-  <Target Name="PopulateNuspec" AfterTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
+  <Target Name="PopulateNuspec" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
     <PropertyGroup>
-      <NuspecProperties>
-        id=$(MSBuildProjectName);
-        version=$(PackageVersion);
-        authors=$(Authors);
-        licenseUrl=$(PackageLicenseUrl);
-        projectUrl=$(PackageProjectUrl);
-        iconUrl=$(PackageIconUrl);
-        copyright=$(Copyright);
-        description=$(Description);
-        tags=$([MSBuild]::Escape($(PackageTags)));
-        serviceable=$(Serviceable);
-        repositoryUrl=$(RepositoryUrl);
-        repositoryCommit=$(RepositoryCommit);
-        targetframework=$(TargetFramework);
-        outputpath=$(OutputPath)\sdk-output;
-      </NuspecProperties>
+      <PackageTags>$(PackageTags.Replace(';',' '))</PackageTags>
     </PropertyGroup>
+
+    <ItemGroup>
+      <NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
+    </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 8593fba340..a88be875b6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>$licenseUrl$</licenseUrl>
-    <projectUrl>$projectUrl$</projectUrl>
-    <iconUrl>$iconUrl$</iconUrl>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-    <tags>$tags$</tags>
-    <serviceable>$serviceable$</serviceable>
-    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+    $CommonMetadataElements$
   </metadata>
 
   <files>
@@ -20,6 +9,6 @@
     <file src="build\**" target="build" />
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
 
-    <file src="$outputpath$\**" target="\" />
+    <file src="$outputPath$\**" target="\" />
   </files>
 </package>

From 607f64b38687acaf87e533e3a9565ea3a6f2a853 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Sat, 6 Apr 2019 19:46:24 -0700
Subject: [PATCH 134/337] Don't render text tags for component documents
 (dotnet/aspnetcore-tooling#391)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/cb6f5d0dc7de35046ca50df2c0cadd95e3a70707
---
 .../src/DefaultRazorIntermediateNodeLoweringPhase.cs     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 7056b178e7..e573f61001 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1148,6 +1148,15 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override void VisitMarkupElement(MarkupElementSyntax node)
             {
+                if ((node.StartTag != null && node.StartTag.IsMarkupTransition) ||
+                    (node.EndTag != null && node.EndTag.IsMarkupTransition))
+                {
+                    // We don't want to create a node for Markup transitions (<text></text>). Treat their contents as regular markup.
+                    // Technically there shouldn't be an end transition without a start transition but just being defensive.
+                    base.VisitMarkupElement(node);
+                    return;
+                }
+
                 var element = new MarkupElementIntermediateNode()
                 {
                     Source = BuildSourceSpanFromNode(node),

From 90eb9e8535fd90c3a0a7144559d382a5af524492 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 12 Apr 2019 11:17:09 -0700
Subject: [PATCH 135/337] Fixup SDK workarounds (dotnet/aspnetcore-tooling#413)

* Correctly update the .NET Core SDK used in Razor
* Replace LangVersion 8.0 with LangVersion Preview
* Remove AddRazorSupportForMvc from projects that do not require it
* Cleanup how AspNetCore.App is not referenced in the project
* Remove uses of _RazorComponentInclude from tests\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/81ea07caf7e5063b5f593d2d6a14d997643152e5
---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets   |  2 +-
 .../DesignTimeBuildIntegrationTest.cs             |  2 +-
 .../AppWithP2PReference.csproj                    | 10 +++-------
 .../testassets/ClassLibrary/ClassLibrary.csproj   |  9 ---------
 .../testassets/ClassLibrary2/ClassLibrary2.csproj | 10 +---------
 .../testassets/ComponentApp/ComponentApp.csproj   |  6 ++----
 .../ComponentLibrary/ComponentLibrary.csproj      |  1 -
 .../{MyComponent.cshtml => MyComponent.razor}     |  0
 .../Components/{Counter.cshtml => Counter.razor}  |  0
 .../MvcWithComponents/MvcWithComponents.csproj    | 15 +++++----------
 .../test/testassets/SimpleMvc/SimpleMvc.csproj    | 10 +++-------
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj        |  9 +++------
 .../testassets/SimplePages/SimplePages.csproj     | 10 +++-------
 13 files changed, 22 insertions(+), 62 deletions(-)
 rename src/Razor/test/testassets/ComponentLibrary/{MyComponent.cshtml => MyComponent.razor} (100%)
 rename src/Razor/test/testassets/MvcWithComponents/Components/{Counter.cshtml => Counter.razor} (100%)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index 487ffb348a..aa36ef1d3e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -114,7 +114,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PropertyGroup>
       <LangVersion Condition="'$(LangVersion)' == '' AND
         (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
-         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">8.0</LangVersion>
+         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">preview</LangVersion>
     </PropertyGroup>
 
     <Csc
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index 2c14663f4d..f5baa8b4b9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -77,8 +77,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             var filePaths = new string[]
             {
-                Path.Combine("MyComponent.cshtml"),
                 Path.Combine("GenericComponent.razor"),
+                Path.Combine("MyComponent.razor"),
             };
 
             foreach (var filePath in filePaths)
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 45907b402f..d5034c583f 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -5,18 +5,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 4e4b461927..57ca5669a8 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -4,19 +4,10 @@
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <!--
-  The AspNetCore repo depends on AspNetCore-Tooling, and we want to avoid creating a cylical dependency between the two
-  by adding a reference to Microsoft.AspNetCore.App. We'll instead simulate the presence of the reference.
-  -->
   <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <Copyright>© Microsoft</Copyright>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index f07e194311..8ba54d6c98 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -4,17 +4,9 @@
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
index 2e01f4b269..68b1028aa0 100644
--- a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
+++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
@@ -2,17 +2,15 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index e695e52b28..06baf7f0ad 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -2,7 +2,6 @@
   
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Razor/test/testassets/ComponentLibrary/MyComponent.cshtml b/src/Razor/test/testassets/ComponentLibrary/MyComponent.razor
similarity index 100%
rename from src/Razor/test/testassets/ComponentLibrary/MyComponent.cshtml
rename to src/Razor/test/testassets/ComponentLibrary/MyComponent.razor
diff --git a/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.razor
similarity index 100%
rename from src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml
rename to src/Razor/test/testassets/MvcWithComponents/Components/Counter.razor
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index d225ac2239..31429c409f 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -2,22 +2,17 @@
 
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
-    <_RazorComponentInclude>Components\**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-  </ItemGroup>
-
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 13621d0e0c..1cde2c2ba5 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -5,18 +5,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index b4a810124c..611e331385 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -5,17 +5,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 13621d0e0c..1cde2c2ba5 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -5,18 +5,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.NETCore.App" />
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>

From ae4af3d1549c651144bd4cf827fd0f93647f7fbe Mon Sep 17 00:00:00 2001
From: Doug Bunting <drb24@cornell.edu>
Date: Mon, 15 Apr 2019 10:46:17 -0700
Subject: [PATCH 136/337] Shorten Microsoft.AspNetCore.Razor.Language.Test
 paths (dotnet/aspnetcore-tooling#425)

* Shorten Microsoft.AspNetCore.Razor.Language.Test paths
- aspnet/AspNetCoredotnet/aspnetcore-tooling#9358 and aspnet/AspNetCoredotnet/aspnetcore-tooling#7882
- do 4046 renames
- adjust solutions to renamed directory
- special-case directory of the Microsoft.AspNetCore.Razor.Language.Test project in `TestProject`\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/72b939d85573202c4406cd1ec1c39e97f870cb08
---
 .../test/AssertFrame.cs                       |  139 +
 .../BoundAttributeDescriptorExtensionsTest.cs |  279 ++
 .../CodeGeneration/CSharpCodeWriterTest.cs    |  339 ++
 .../test/CodeGeneration/CodeTargetTest.cs     |   68 +
 .../DefaultCodeTargetBuilderTest.cs           |   46 +
 .../CodeGeneration/DefaultCodeTargetTest.cs   |  174 +
 .../DefaultDocumentWriterTest.cs              |  393 ++
 .../DesignTimeNodeWriterTest.cs               |  498 +++
 .../LiteralRuntimeNodeWriterTest.cs           |   48 +
 .../CodeGeneration/RuntimeNodeWriterTest.cs   |  705 ++++
 ...elperHtmlAttributeRuntimeNodeWriterTest.cs |  131 +
 .../ComponentDocumentClassifierPassTest.cs    |  224 +
 .../ComponentMarkupBlockPassTest.cs           |  403 ++
 .../ComponentMarkupEncodingPassTest.cs        |  221 +
 .../test/Components/NodeAssert.cs             |  126 +
 ...ultAllowedChildTagDescriptorBuilderTest.cs |   24 +
 ...aultBoundAttributeDescriptorBuilderTest.cs |   47 +
 .../test/DefaultDocumentClassifierPassTest.cs |   62 +
 .../test/DefaultItemCollectionTest.cs         |   54 +
 .../DefaultRazorCSharpLoweringPhaseTest.cs    |   87 +
 .../test/DefaultRazorCodeDocumentTest.cs      |   47 +
 .../test/DefaultRazorDiagnosticTest.cs        |  217 +
 ...efaultRazorDirectiveClassifierPhaseTest.cs |  102 +
 ...DefaultRazorDocumentClassifierPhaseTest.cs |  102 +
 .../test/DefaultRazorEngineBuilderTest.cs     |   42 +
 .../test/DefaultRazorEngineTest.cs            |   72 +
 ...mediateNodeLoweringPhaseIntegrationTest.cs |  541 +++
 ...tRazorIntermediateNodeLoweringPhaseTest.cs |  298 ++
 .../test/DefaultRazorOptimizationPhaseTest.cs |  102 +
 .../test/DefaultRazorParsingPhaseTest.cs      |   93 +
 .../DefaultRazorProjectEngineBuilderTest.cs   |   65 +
 ...efaultRazorProjectEngineIntegrationTest.cs |  351 ++
 .../test/DefaultRazorProjectEngineTest.cs     |   62 +
 .../test/DefaultRazorProjectFileSystemTest.cs |  298 ++
 .../test/DefaultRazorProjectItemTest.cs       |  101 +
 .../test/DefaultRazorSyntaxTreePhaseTest.cs   |   94 +
 .../DefaultRazorTagHelperBinderPhaseTest.cs   | 1439 +++++++
 ...tRequiredAttributeDescriptorBuilderTest.cs |   44 +
 ...irectiveDescriptorBuilderExtensionsTest.cs |  122 +
 .../test/DirectiveDescriptorTest.cs           |  150 +
 .../DirectiveRemovalOptimizationPassTest.cs   |  135 +
 .../test/DirectiveTokenEditHandlerTest.cs     |   86 +
 .../test/DocumentClassifierPassBaseTest.cs    |  295 ++
 .../DefaultMetadataIdentifierFeatureTest.cs   |   74 +
 .../DefaultTagHelperOptimizationPassTest.cs   |  128 +
 .../DefaultTagHelperTargetExtensionTest.cs    | 1239 ++++++
 .../DesignTimeDirectiveTargetExtensionTest.cs |  247 ++
 .../Extensions/FunctionsDirectivePassTest.cs  |   98 +
 .../Extensions/InheritsDirectivePassTest.cs   |   91 +
 .../Extensions/MetadataAttributePassTest.cs   |  392 ++
 .../MetadataAttributeTargetExtensionTest.cs   |  123 +
 ...reallocatedAttributeTargetExtensionTest.cs |  276 ++
 .../Extensions/SectionDirectivePassTest.cs    |  106 +
 .../Extensions/SectionTargetExtensionTest.cs  |   80 +
 .../Extensions/TemplateTargetExtensionTest.cs |   51 +
 .../test/HtmlConventionsTest.cs               |   39 +
 .../test/HtmlNodeOptimizationPassTest.cs      |   35 +
 .../IntegrationTests/BasicIntegrationTest.cs  |   57 +
 .../CodeGenerationIntegrationTest.cs          | 1065 +++++
 .../ComponentBindIntegrationTest.cs           |   96 +
 .../ComponentChildContentIntegrationTest.cs   |  249 ++
 .../ComponentCodeGenerationTestBase.cs        | 3608 +++++++++++++++++
 .../ComponentDeclarationIntegrationTest.cs    |  175 +
 .../ComponentDesignTimeCodeGenerationTest.cs  |   10 +
 ...ComponentDiagnosticRazorIntegrationTest.cs |  111 +
 .../ComponentDirectiveIntegrationTest.cs      |  150 +
 .../ComponentDiscoveryIntegrationTest.cs      |  121 +
 .../ComponentFilePathIntegrationTest.cs       |   50 +
 .../ComponentGenericTypeIntegrationTest.cs    |  124 +
 .../ComponentImportsIntegrationTest.cs        |  191 +
 .../ComponentRuntimeCodeGenerationTest.cs     |    9 +
 .../ComponentTemplateIntegrationTest.cs       |  127 +
 .../IntegrationTests/ComponentTypingTest.cs   |  130 +
 .../ExtensibleDirectiveTest.cs                |   38 +
 .../HtmlAttributeIntegrationTest.cs           |   36 +
 .../TagHelpersIntegrationTest.cs              |  126 +
 .../TestTagHelperDescriptors.cs               |  637 +++
 ...DefaultRazorIntermediateNodeBuilderTest.cs |  217 +
 .../DocumentIntermediateNodeExtensionsTest.cs |  113 +
 .../ExtensionIntermediateNodeTest.cs          |   92 +
 .../IntermediateNodeReferenceTest.cs          |  510 +++
 .../IntermediateNodeWalkerTest.cs             |  140 +
 .../test/LargeTextSourceDocumentTest.cs       |  172 +
 .../test/Legacy/BaselineWriter.cs             |   46 +
 .../test/Legacy/CSharpAutoCompleteTest.cs     |   53 +
 .../test/Legacy/CSharpBlockTest.cs            |  719 ++++
 .../test/Legacy/CSharpCodeParserTest.cs       |  215 +
 .../test/Legacy/CSharpErrorTest.cs            |  345 ++
 .../Legacy/CSharpExplicitExpressionTest.cs    |   76 +
 .../test/Legacy/CSharpFunctionsTest.cs        |  136 +
 .../Legacy/CSharpImplicitExpressionTest.cs    |  374 ++
 .../CSharpLanguageCharacteristicsTest.cs      |   20 +
 .../test/Legacy/CSharpNestedStatementsTest.cs |   46 +
 .../test/Legacy/CSharpRazorCommentsTest.cs    |  134 +
 .../test/Legacy/CSharpReservedWordsTest.cs    |   22 +
 .../test/Legacy/CSharpSectionTest.cs          |  290 ++
 .../test/Legacy/CSharpSpecialBlockTest.cs     |   50 +
 .../test/Legacy/CSharpStatementTest.cs        |  247 ++
 .../test/Legacy/CSharpTemplateTest.cs         |   92 +
 .../test/Legacy/CSharpToMarkupSwitchTest.cs   |  218 +
 .../test/Legacy/CSharpTokenizerCommentTest.cs |   95 +
 .../Legacy/CSharpTokenizerIdentifierTest.cs   |  171 +
 .../test/Legacy/CSharpTokenizerLiteralTest.cs |  288 ++
 .../Legacy/CSharpTokenizerOperatorsTest.cs    |  297 ++
 .../test/Legacy/CSharpTokenizerTest.cs        |  107 +
 .../test/Legacy/CSharpTokenizerTestBase.cs    |   27 +
 .../test/Legacy/CSharpVerbatimBlockTest.cs    |   49 +
 .../Legacy/CSharpWhitespaceHandlingTest.cs    |   17 +
 .../test/Legacy/CodeBlockEditHandlerTest.cs   |  293 ++
 .../Legacy/DirectiveCSharpTokenizerTest.cs    |   48 +
 .../test/Legacy/DirectiveHtmlTokenizerTest.cs |   42 +
 .../test/Legacy/DisposableActionTest.cs       |   25 +
 .../test/Legacy/HtmlAttributeTest.cs          |  252 ++
 .../test/Legacy/HtmlBlockTest.cs              |  279 ++
 .../test/Legacy/HtmlDocumentTest.cs           |  265 ++
 .../test/Legacy/HtmlErrorTest.cs              |   52 +
 .../test/Legacy/HtmlMarkupParserTests.cs      |  230 ++
 .../test/Legacy/HtmlTagsTest.cs               |  187 +
 .../test/Legacy/HtmlToCodeSwitchTest.cs       |  165 +
 .../test/Legacy/HtmlTokenizerTest.cs          |  164 +
 .../test/Legacy/HtmlTokenizerTestBase.cs      |   27 +
 .../ImplicitExpressionEditHandlerTest.cs      |  463 +++
 .../Legacy/LineTrackingStringBufferTest.cs    |   26 +
 .../test/Legacy/MarkupElementGroupingTest.cs  |  154 +
 .../test/Legacy/RazorDirectivesTest.cs        |  910 +++++
 .../test/Legacy/RazorParserTest.cs            |   52 +
 .../test/Legacy/SourceLocationTrackerTest.cs  |  214 +
 .../test/Legacy/TagHelperBlockRewriterTest.cs | 2187 ++++++++++
 .../Legacy/TagHelperParseTreeRewriterTest.cs  | 1884 +++++++++
 .../test/Legacy/TagHelperRewritingTestBase.cs |   45 +
 .../test/Legacy/TextReaderExtensionsTest.cs   |  113 +
 .../test/Legacy/TokenizerLookaheadTest.cs     |  217 +
 .../test/Legacy/TokenizerTestBase.cs          |   71 +
 .../test/Legacy/WhiteSpaceRewriterTest.cs     |   37 +
 ...soft.AspNetCore.Razor.Language.Test.csproj |   26 +
 .../test/Properties/AssemblyInfo.cs           |    6 +
 .../test/RazorCodeDocumentExtensionsTest.cs   |  382 ++
 .../test/RazorCodeDocumentTest.cs             |   61 +
 .../test/RazorDiagnosticDescriptorTest.cs     |   78 +
 .../test/RazorDiagnosticTest.cs               |   45 +
 .../test/RazorEngineBuilderExtensionsTest.cs  |   98 +
 .../test/RazorEngineTest.cs                   |  233 ++
 .../test/RazorLanguageVersionTest.cs          |  141 +
 .../test/RazorParserFeatureFlagsTest.cs       |   33 +
 ...RazorProjectEngineBuilderExtensionsTest.cs |  103 +
 .../test/RazorProjectEngineFeatureBaseTest.cs |   34 +
 .../test/RazorProjectEngineTest.cs            |  109 +
 .../test/RazorProjectItemTest.cs              |  104 +
 .../test/RazorProjectTest.cs                  |  333 ++
 .../test/RazorSourceDocumentTest.cs           |  219 +
 .../test/RazorSyntaxTreeTest.cs               |   63 +
 .../test/SourceChangeTest.cs                  |  198 +
 .../test/SourceLocationTest.cs                |  110 +
 .../test/SourceSpanTest.cs                    |  117 +
 .../test/StreamSourceDocumentTest.cs          |  200 +
 .../test/StringSourceDocumentTest.cs          |  516 +++
 .../test/TagHelperBinderTest.cs               |  602 +++
 .../test/TagHelperDescriptorBuilderTest.cs    |   38 +
 .../test/TagHelperDescriptorExtensionsTest.cs |   64 +
 .../test/TagHelperMatchingConventionsTest.cs  |  156 +
 .../DefaultRazorProjectFileSystem/Home.cshtml |    1 +
 .../Views/About/About.cshtml                  |    1 +
 .../Views/Home/Index.cshtml                   |    1 +
 .../Views/Home/Index.txt                      |    1 +
 .../Views/Home/_ViewImports.cshtml            |    1 +
 .../Views/_ViewImports.cshtml                 |    1 +
 .../_ViewImports.cshtml                       |    1 +
 .../CustomDirective.cshtml                    |    1 +
 .../CustomDirective.ir.txt                    |    6 +
 .../BasicIntegrationTest/Empty.cshtml         |    1 +
 .../BasicIntegrationTest/Empty.ir.txt         |    6 +
 .../BasicIntegrationTest/HelloWorld.cshtml    |    1 +
 .../BasicIntegrationTest/HelloWorld.ir.txt    |    8 +
 .../AddTagHelperDirective.cshtml              |    1 +
 ...ddTagHelperDirective_DesignTime.codegen.cs |   32 +
 .../AddTagHelperDirective_DesignTime.ir.txt   |   14 +
 ...TagHelperDirective_DesignTime.mappings.txt |    5 +
 .../AttributeTargetingTagHelpers.cshtml       |    8 +
 ...eTargetingTagHelpers_DesignTime.codegen.cs |   61 +
 ...ibuteTargetingTagHelpers_DesignTime.ir.txt |   85 +
 ...argetingTagHelpers_DesignTime.mappings.txt |   15 +
 ...buteTargetingTagHelpers_Runtime.codegen.cs |  130 +
 ...ttributeTargetingTagHelpers_Runtime.ir.txt |   68 +
 .../Await.cshtml                              |   26 +
 .../Await_DesignTime.codegen.cs               |  145 +
 .../Await_DesignTime.ir.txt                   |  148 +
 .../Await_DesignTime.mappings.txt             |   95 +
 .../Await_Runtime.codegen.cs                  |  130 +
 .../Await_Runtime.ir.txt                      |  143 +
 .../BasicTagHelpers.cshtml                    |    9 +
 .../BasicTagHelpers_DesignTime.codegen.cs     |   59 +
 .../BasicTagHelpers_DesignTime.ir.txt         |   84 +
 .../BasicTagHelpers_DesignTime.mappings.txt   |   15 +
 .../BasicTagHelpers_Prefixed.cshtml           |   10 +
 ...cTagHelpers_Prefixed_DesignTime.codegen.cs |   57 +
 ...BasicTagHelpers_Prefixed_DesignTime.ir.txt |   60 +
 ...agHelpers_Prefixed_DesignTime.mappings.txt |   15 +
 ...asicTagHelpers_Prefixed_Runtime.codegen.cs |   84 +
 .../BasicTagHelpers_Prefixed_Runtime.ir.txt   |   47 +
 .../BasicTagHelpers_RemoveTagHelper.cshtml    |   10 +
 ...Helpers_RemoveTagHelper_Runtime.codegen.cs |  117 +
 ...cTagHelpers_RemoveTagHelper_Runtime.ir.txt |   55 +
 .../BasicTagHelpers_Runtime.codegen.cs        |  133 +
 .../BasicTagHelpers_Runtime.ir.txt            |   69 +
 .../Blocks.cshtml                             |   37 +
 .../Blocks_DesignTime.codegen.cs              |  176 +
 .../Blocks_DesignTime.ir.txt                  |  110 +
 .../Blocks_DesignTime.mappings.txt            |  139 +
 .../Blocks_Runtime.codegen.cs                 |  174 +
 .../Blocks_Runtime.ir.txt                     |  121 +
 .../CSharp7.cshtml                            |   43 +
 .../CSharp7_DesignTime.codegen.cs             |   93 +
 .../CSharp7_DesignTime.ir.txt                 |   50 +
 .../CSharp7_DesignTime.mappings.txt           |   88 +
 .../CSharp7_Runtime.codegen.cs                |   96 +
 .../CSharp7_Runtime.ir.txt                    |   51 +
 .../CSharp8.cshtml                            |   52 +
 .../CSharp8_DesignTime.codegen.cs             |  123 +
 .../CSharp8_DesignTime.ir.txt                 |   40 +
 .../CSharp8_DesignTime.mappings.txt           |  125 +
 .../CSharp8_Runtime.codegen.cs                |  125 +
 .../CSharp8_Runtime.ir.txt                    |   35 +
 .../CodeBlock.cshtml                          |    5 +
 .../CodeBlockAtEOF.cshtml                     |    1 +
 .../CodeBlockAtEOF_DesignTime.codegen.cs      |   29 +
 .../CodeBlockAtEOF_DesignTime.diagnostics.txt |    1 +
 .../CodeBlockAtEOF_DesignTime.ir.txt          |   13 +
 .../CodeBlockAtEOF_DesignTime.mappings.txt    |    5 +
 .../CodeBlockAtEOF_Runtime.codegen.cs         |   18 +
 .../CodeBlockAtEOF_Runtime.diagnostics.txt    |    1 +
 .../CodeBlockAtEOF_Runtime.ir.txt             |    8 +
 .../CodeBlockWithTextElement.cshtml           |    4 +
 ...BlockWithTextElement_DesignTime.codegen.cs |   52 +
 ...CodeBlockWithTextElement_DesignTime.ir.txt |   23 +
 ...ockWithTextElement_DesignTime.mappings.txt |   26 +
 ...odeBlockWithTextElement_Runtime.codegen.cs |   43 +
 .../CodeBlockWithTextElement_Runtime.ir.txt   |   18 +
 .../CodeBlock_DesignTime.codegen.cs           |   32 +
 .../CodeBlock_DesignTime.ir.txt               |   13 +
 .../CodeBlock_DesignTime.mappings.txt         |   13 +
 .../CodeBlock_Runtime.codegen.cs              |   28 +
 .../CodeBlock_Runtime.ir.txt                  |    8 +
 .../ComplexTagHelpers.cshtml                  |   38 +
 .../ComplexTagHelpers_DesignTime.codegen.cs   |  283 ++
 ...mplexTagHelpers_DesignTime.diagnostics.txt |    2 +
 .../ComplexTagHelpers_DesignTime.ir.txt       |  308 ++
 .../ComplexTagHelpers_DesignTime.mappings.txt |  293 ++
 .../ComplexTagHelpers_Runtime.codegen.cs      |  564 +++
 .../ComplexTagHelpers_Runtime.diagnostics.txt |    2 +
 .../ComplexTagHelpers_Runtime.ir.txt          |  309 ++
 .../ConditionalAttributes.cshtml              |   15 +
 ...onditionalAttributes_DesignTime.codegen.cs |  189 +
 .../ConditionalAttributes_DesignTime.ir.txt   |  128 +
 ...ditionalAttributes_DesignTime.mappings.txt |  138 +
 .../ConditionalAttributes_Runtime.codegen.cs  |  130 +
 .../ConditionalAttributes_Runtime.ir.txt      |  115 +
 .../CssSelectorTagHelperAttributes.cshtml     |   13 +
 ...ctorTagHelperAttributes_Runtime.codegen.cs |  248 ++
 ...SelectorTagHelperAttributes_Runtime.ir.txt |  137 +
 .../DesignTime.cshtml                         |   15 +
 .../DesignTime_DesignTime.codegen.cs          |   88 +
 .../DesignTime_DesignTime.ir.txt              |   68 +
 .../DesignTime_DesignTime.mappings.txt        |   49 +
 .../DuplicateAttributeTagHelpers.cshtml       |    7 +
 ...eAttributeTagHelpers_DesignTime.codegen.cs |   69 +
 ...icateAttributeTagHelpers_DesignTime.ir.txt |   96 +
 ...ttributeTagHelpers_DesignTime.mappings.txt |   20 +
 ...cateAttributeTagHelpers_Runtime.codegen.cs |  152 +
 ...uplicateAttributeTagHelpers_Runtime.ir.txt |   69 +
 .../DuplicateTargetTagHelper.cshtml           |    3 +
 ...icateTargetTagHelper_DesignTime.codegen.cs |   46 +
 ...DuplicateTargetTagHelper_DesignTime.ir.txt |   32 +
 ...ateTargetTagHelper_DesignTime.mappings.txt |   10 +
 ...uplicateTargetTagHelper_Runtime.codegen.cs |   67 +
 .../DuplicateTargetTagHelper_Runtime.ir.txt   |   23 +
 .../DynamicAttributeTagHelpers.cshtml         |   14 +
 ...cAttributeTagHelpers_DesignTime.codegen.cs |  251 ++
 ...namicAttributeTagHelpers_DesignTime.ir.txt |  133 +
 ...ttributeTagHelpers_DesignTime.mappings.txt |  155 +
 ...amicAttributeTagHelpers_Runtime.codegen.cs |  370 ++
 .../DynamicAttributeTagHelpers_Runtime.ir.txt |  127 +
 .../EmptyAttributeTagHelpers.cshtml           |    8 +
 ...yAttributeTagHelpers_DesignTime.codegen.cs |   65 +
 ...ibuteTagHelpers_DesignTime.diagnostics.txt |    3 +
 ...EmptyAttributeTagHelpers_DesignTime.ir.txt |   68 +
 ...ttributeTagHelpers_DesignTime.mappings.txt |   20 +
 ...mptyAttributeTagHelpers_Runtime.codegen.cs |  120 +
 ...ttributeTagHelpers_Runtime.diagnostics.txt |    3 +
 .../EmptyAttributeTagHelpers_Runtime.ir.txt   |   52 +
 .../EmptyCodeBlock.cshtml                     |    3 +
 .../EmptyCodeBlock_DesignTime.codegen.cs      |   29 +
 .../EmptyCodeBlock_DesignTime.ir.txt          |   15 +
 .../EmptyCodeBlock_DesignTime.mappings.txt    |    5 +
 .../EmptyCodeBlock_Runtime.codegen.cs         |   19 +
 .../EmptyCodeBlock_Runtime.ir.txt             |   10 +
 .../EmptyExplicitExpression.cshtml            |    3 +
 ...tyExplicitExpression_DesignTime.codegen.cs |   29 +
 .../EmptyExplicitExpression_DesignTime.ir.txt |   15 +
 ...ExplicitExpression_DesignTime.mappings.txt |    5 +
 ...EmptyExplicitExpression_Runtime.codegen.cs |   26 +
 .../EmptyExplicitExpression_Runtime.ir.txt    |   10 +
 .../EmptyImplicitExpression.cshtml            |    3 +
 .../EmptyImplicitExpressionInCode.cshtml      |    3 +
 ...icitExpressionInCode_DesignTime.codegen.cs |   44 +
 ...xpressionInCode_DesignTime.diagnostics.txt |    1 +
 ...ImplicitExpressionInCode_DesignTime.ir.txt |   17 +
 ...itExpressionInCode_DesignTime.mappings.txt |   19 +
 ...mplicitExpressionInCode_Runtime.codegen.cs |   25 +
 ...itExpressionInCode_Runtime.diagnostics.txt |    1 +
 ...ptyImplicitExpressionInCode_Runtime.ir.txt |   12 +
 ...tyImplicitExpression_DesignTime.codegen.cs |   29 +
 ...licitExpression_DesignTime.diagnostics.txt |    1 +
 .../EmptyImplicitExpression_DesignTime.ir.txt |   17 +
 ...ImplicitExpression_DesignTime.mappings.txt |    5 +
 ...EmptyImplicitExpression_Runtime.codegen.cs |   27 +
 ...ImplicitExpression_Runtime.diagnostics.txt |    1 +
 .../EmptyImplicitExpression_Runtime.ir.txt    |   12 +
 .../EnumTagHelpers.cshtml                     |   11 +
 .../EnumTagHelpers_DesignTime.codegen.cs      |  101 +
 .../EnumTagHelpers_DesignTime.ir.txt          |   74 +
 .../EnumTagHelpers_DesignTime.mappings.txt    |   49 +
 .../EnumTagHelpers_Runtime.codegen.cs         |  180 +
 .../EnumTagHelpers_Runtime.ir.txt             |   68 +
 .../EscapedTagHelpers.cshtml                  |    8 +
 .../EscapedTagHelpers_DesignTime.codegen.cs   |   59 +
 .../EscapedTagHelpers_DesignTime.ir.txt       |   71 +
 .../EscapedTagHelpers_DesignTime.mappings.txt |   20 +
 .../EscapedTagHelpers_Runtime.codegen.cs      |   89 +
 .../EscapedTagHelpers_Runtime.ir.txt          |   65 +
 .../ExplicitExpression.cshtml                 |    1 +
 .../ExplicitExpressionAtEOF.cshtml            |    3 +
 ...licitExpressionAtEOF_DesignTime.codegen.cs |   29 +
 ...ExpressionAtEOF_DesignTime.diagnostics.txt |    1 +
 .../ExplicitExpressionAtEOF_DesignTime.ir.txt |   15 +
 ...citExpressionAtEOF_DesignTime.mappings.txt |    5 +
 ...ExplicitExpressionAtEOF_Runtime.codegen.cs |   26 +
 ...citExpressionAtEOF_Runtime.diagnostics.txt |    1 +
 .../ExplicitExpressionAtEOF_Runtime.ir.txt    |   10 +
 .../ExplicitExpressionWithMarkup.cshtml       |    1 +
 ...ExpressionWithMarkup_DesignTime.codegen.cs |   31 +
 ...ssionWithMarkup_DesignTime.diagnostics.txt |    2 +
 ...icitExpressionWithMarkup_DesignTime.ir.txt |   19 +
 ...pressionWithMarkup_DesignTime.mappings.txt |    5 +
 ...citExpressionWithMarkup_Runtime.codegen.cs |   31 +
 ...pressionWithMarkup_Runtime.diagnostics.txt |    2 +
 ...xplicitExpressionWithMarkup_Runtime.ir.txt |   14 +
 .../ExplicitExpression_DesignTime.codegen.cs  |   29 +
 .../ExplicitExpression_DesignTime.ir.txt      |   15 +
 ...ExplicitExpression_DesignTime.mappings.txt |    5 +
 .../ExplicitExpression_Runtime.codegen.cs     |   26 +
 .../ExplicitExpression_Runtime.ir.txt         |   10 +
 .../ExpressionsInCode.cshtml                  |   16 +
 .../ExpressionsInCode_DesignTime.codegen.cs   |   86 +
 .../ExpressionsInCode_DesignTime.ir.txt       |   42 +
 .../ExpressionsInCode_DesignTime.mappings.txt |   58 +
 .../ExpressionsInCode_Runtime.codegen.cs      |   84 +
 .../ExpressionsInCode_Runtime.ir.txt          |   38 +
 .../FunctionsBlock.cshtml                     |   12 +
 .../FunctionsBlockMinimal.cshtml              |    7 +
 ...unctionsBlockMinimal_DesignTime.codegen.cs |   32 +
 .../FunctionsBlockMinimal_DesignTime.ir.txt   |   15 +
 ...ctionsBlockMinimal_DesignTime.mappings.txt |   13 +
 .../FunctionsBlockMinimal_Runtime.codegen.cs  |   29 +
 .../FunctionsBlockMinimal_Runtime.ir.txt      |   10 +
 .../FunctionsBlock_DesignTime.codegen.cs      |   48 +
 .../FunctionsBlock_DesignTime.ir.txt          |   21 +
 .../FunctionsBlock_DesignTime.mappings.txt    |   29 +
 .../FunctionsBlock_Runtime.codegen.cs         |   38 +
 .../FunctionsBlock_Runtime.ir.txt             |   16 +
 .../HiddenSpansInCode.cshtml                  |    3 +
 .../HiddenSpansInCode_DesignTime.codegen.cs   |   37 +
 .../HiddenSpansInCode_DesignTime.ir.txt       |   15 +
 .../HiddenSpansInCode_DesignTime.mappings.txt |   14 +
 .../HiddenSpansInCode_Runtime.codegen.cs      |   25 +
 .../HiddenSpansInCode_Runtime.ir.txt          |   10 +
 .../HtmlCommentWithQuote_Double.cshtml        |    2 +
 ...mentWithQuote_Double_DesignTime.codegen.cs |   22 +
 ...lCommentWithQuote_Double_DesignTime.ir.txt |   20 +
 ...ntWithQuote_Double_DesignTime.mappings.txt |    0
 ...CommentWithQuote_Double_Runtime.codegen.cs |   19 +
 ...HtmlCommentWithQuote_Double_Runtime.ir.txt |   15 +
 .../HtmlCommentWithQuote_Single.cshtml        |    2 +
 ...mentWithQuote_Single_DesignTime.codegen.cs |   22 +
 ...lCommentWithQuote_Single_DesignTime.ir.txt |   20 +
 ...ntWithQuote_Single_DesignTime.mappings.txt |    0
 ...CommentWithQuote_Single_Runtime.codegen.cs |   19 +
 ...HtmlCommentWithQuote_Single_Runtime.ir.txt |   15 +
 .../Implements.cshtml                         |    5 +
 .../Implements_DesignTime.codegen.cs          |   40 +
 .../Implements_DesignTime.ir.txt              |   16 +
 .../Implements_DesignTime.mappings.txt        |   14 +
 .../Implements_Runtime.codegen.cs             |   27 +
 .../Implements_Runtime.ir.txt                 |   10 +
 .../ImplicitExpression.cshtml                 |    3 +
 .../ImplicitExpressionAtEOF.cshtml            |    3 +
 ...licitExpressionAtEOF_DesignTime.codegen.cs |   29 +
 ...ExpressionAtEOF_DesignTime.diagnostics.txt |    1 +
 .../ImplicitExpressionAtEOF_DesignTime.ir.txt |   15 +
 ...citExpressionAtEOF_DesignTime.mappings.txt |    5 +
 ...ImplicitExpressionAtEOF_Runtime.codegen.cs |   26 +
 ...citExpressionAtEOF_Runtime.diagnostics.txt |    1 +
 .../ImplicitExpressionAtEOF_Runtime.ir.txt    |   10 +
 .../ImplicitExpression_DesignTime.codegen.cs  |   45 +
 .../ImplicitExpression_DesignTime.ir.txt      |   23 +
 ...ImplicitExpression_DesignTime.mappings.txt |   19 +
 .../ImplicitExpression_Runtime.codegen.cs     |   41 +
 .../ImplicitExpression_Runtime.ir.txt         |   20 +
 .../IncompleteDirectives.cshtml               |   25 +
 ...IncompleteDirectives_DesignTime.codegen.cs |  159 +
 ...pleteDirectives_DesignTime.diagnostics.txt |   27 +
 .../IncompleteDirectives_DesignTime.ir.txt    |   86 +
 ...completeDirectives_DesignTime.mappings.txt |   70 +
 .../IncompleteDirectives_Runtime.codegen.cs   |   27 +
 ...completeDirectives_Runtime.diagnostics.txt |   27 +
 .../IncompleteDirectives_Runtime.ir.txt       |   56 +
 .../IncompleteTagHelper.cshtml                |    3 +
 .../IncompleteTagHelper_DesignTime.codegen.cs |   34 +
 ...mpleteTagHelper_DesignTime.diagnostics.txt |    2 +
 .../IncompleteTagHelper_DesignTime.ir.txt     |   23 +
 ...ncompleteTagHelper_DesignTime.mappings.txt |    5 +
 .../IncompleteTagHelper_Runtime.codegen.cs    |   52 +
 ...ncompleteTagHelper_Runtime.diagnostics.txt |    2 +
 .../IncompleteTagHelper_Runtime.ir.txt        |   16 +
 .../Inherits.cshtml                           |    3 +
 .../Inherits_DesignTime.codegen.cs            |   39 +
 .../Inherits_DesignTime.ir.txt                |   16 +
 .../Inherits_DesignTime.mappings.txt          |   10 +
 .../Inherits_Runtime.codegen.cs               |   26 +
 .../Inherits_Runtime.ir.txt                   |   10 +
 .../InlineBlocks.cshtml                       |    3 +
 .../InlineBlocks_DesignTime.codegen.cs        |   60 +
 .../InlineBlocks_DesignTime.diagnostics.txt   |    1 +
 .../InlineBlocks_DesignTime.ir.txt            |   30 +
 .../InlineBlocks_DesignTime.mappings.txt      |   25 +
 .../InlineBlocks_Runtime.codegen.cs           |   56 +
 .../InlineBlocks_Runtime.diagnostics.txt      |    1 +
 .../InlineBlocks_Runtime.ir.txt               |   24 +
 .../Instrumented.cshtml                       |   38 +
 .../Instrumented_DesignTime.codegen.cs        |  195 +
 .../Instrumented_DesignTime.ir.txt            |  121 +
 .../Instrumented_DesignTime.mappings.txt      |  153 +
 .../Instrumented_Runtime.codegen.cs           |  182 +
 .../Instrumented_Runtime.ir.txt               |  133 +
 .../MarkupInCodeBlock.cshtml                  |    5 +
 .../MarkupInCodeBlock_DesignTime.codegen.cs   |   46 +
 .../MarkupInCodeBlock_DesignTime.ir.txt       |   23 +
 .../MarkupInCodeBlock_DesignTime.mappings.txt |   23 +
 .../MarkupInCodeBlock_Runtime.codegen.cs      |   42 +
 .../MarkupInCodeBlock_Runtime.ir.txt          |   20 +
 .../Markup_InCodeBlocks.cshtml                |   45 +
 .../Markup_InCodeBlocksWithTagHelper.cshtml   |   47 +
 ...eBlocksWithTagHelper_DesignTime.codegen.cs |  160 +
 ...nCodeBlocksWithTagHelper_DesignTime.ir.txt |   81 +
 ...locksWithTagHelper_DesignTime.mappings.txt |  142 +
 ...CodeBlocksWithTagHelper_Runtime.codegen.cs |  182 +
 ...p_InCodeBlocksWithTagHelper_Runtime.ir.txt |   89 +
 .../Markup_InCodeBlocks_DesignTime.codegen.cs |  145 +
 .../Markup_InCodeBlocks_DesignTime.ir.txt     |   78 +
 ...arkup_InCodeBlocks_DesignTime.mappings.txt |  133 +
 .../Markup_InCodeBlocks_Runtime.codegen.cs    |  136 +
 .../Markup_InCodeBlocks_Runtime.ir.txt        |   85 +
 .../MinimizedTagHelpers.cshtml                |   20 +
 .../MinimizedTagHelpers_DesignTime.codegen.cs |   51 +
 .../MinimizedTagHelpers_DesignTime.ir.txt     |  109 +
 ...inimizedTagHelpers_DesignTime.mappings.txt |    5 +
 .../MinimizedTagHelpers_Runtime.codegen.cs    |  188 +
 .../MinimizedTagHelpers_Runtime.ir.txt        |   90 +
 .../NestedCSharp.cshtml                       |    8 +
 .../NestedCSharp_DesignTime.codegen.cs        |   61 +
 .../NestedCSharp_DesignTime.ir.txt            |   28 +
 .../NestedCSharp_DesignTime.mappings.txt      |   35 +
 .../NestedCSharp_Runtime.codegen.cs           |   42 +
 .../NestedCSharp_Runtime.ir.txt               |   26 +
 .../NestedCodeBlocks.cshtml                   |    4 +
 .../NestedCodeBlocks_DesignTime.codegen.cs    |   46 +
 .../NestedCodeBlocks_DesignTime.ir.txt        |   17 +
 .../NestedCodeBlocks_DesignTime.mappings.txt  |   21 +
 .../NestedCodeBlocks_Runtime.codegen.cs       |   42 +
 .../NestedCodeBlocks_Runtime.ir.txt           |   12 +
 .../NestedScriptTagTagHelpers.cshtml          |   16 +
 ...dScriptTagTagHelpers_DesignTime.codegen.cs |   70 +
 ...estedScriptTagTagHelpers_DesignTime.ir.txt |   87 +
 ...criptTagTagHelpers_DesignTime.mappings.txt |   29 +
 ...stedScriptTagTagHelpers_Runtime.codegen.cs |  114 +
 .../NestedScriptTagTagHelpers_Runtime.ir.txt  |   80 +
 .../NestedTagHelpers.cshtml                   |    5 +
 .../NestedTagHelpers_DesignTime.codegen.cs    |   39 +
 .../NestedTagHelpers_DesignTime.ir.txt        |   48 +
 .../NestedTagHelpers_DesignTime.mappings.txt  |    5 +
 .../NestedTagHelpers_Runtime.codegen.cs       |   89 +
 .../NestedTagHelpers_Runtime.ir.txt           |   37 +
 .../NoLinePragmas.cshtml                      |   38 +
 .../NoLinePragmas_DesignTime.codegen.cs       |  184 +
 .../NoLinePragmas_DesignTime.ir.txt           |  112 +
 .../NoLinePragmas_DesignTime.mappings.txt     |  148 +
 .../NoLinePragmas_Runtime.codegen.cs          |  175 +
 .../NoLinePragmas_Runtime.ir.txt              |  122 +
 .../NullConditionalExpressions.cshtml         |   11 +
 ...nditionalExpressions_DesignTime.codegen.cs |  117 +
 ...llConditionalExpressions_DesignTime.ir.txt |   45 +
 ...itionalExpressions_DesignTime.mappings.txt |   75 +
 ...lConditionalExpressions_Runtime.codegen.cs |   78 +
 .../NullConditionalExpressions_Runtime.ir.txt |   40 +
 .../OpenedIf.cshtml                           |    5 +
 .../OpenedIf_DesignTime.codegen.cs            |   43 +
 .../OpenedIf_DesignTime.diagnostics.txt       |    3 +
 .../OpenedIf_DesignTime.ir.txt                |   28 +
 .../OpenedIf_DesignTime.mappings.txt          |   19 +
 .../OpenedIf_Runtime.codegen.cs               |   27 +
 .../OpenedIf_Runtime.diagnostics.txt          |    3 +
 .../OpenedIf_Runtime.ir.txt                   |   21 +
 .../ParserError.cshtml                        |    5 +
 .../ParserError_DesignTime.codegen.cs         |   33 +
 .../ParserError_DesignTime.diagnostics.txt    |    2 +
 .../ParserError_DesignTime.ir.txt             |   13 +
 .../ParserError_DesignTime.mappings.txt       |   13 +
 .../ParserError_Runtime.codegen.cs            |   29 +
 .../ParserError_Runtime.diagnostics.txt       |    2 +
 .../ParserError_Runtime.ir.txt                |    8 +
 .../PrefixedAttributeTagHelpers.cshtml        |   23 +
 ...dAttributeTagHelpers_DesignTime.codegen.cs |  145 +
 ...fixedAttributeTagHelpers_DesignTime.ir.txt |  136 +
 ...ttributeTagHelpers_DesignTime.mappings.txt |   80 +
 ...ixedAttributeTagHelpers_Runtime.codegen.cs |  282 ++
 ...PrefixedAttributeTagHelpers_Runtime.ir.txt |  117 +
 .../RazorComments.cshtml                      |   18 +
 .../RazorComments_DesignTime.codegen.cs       |   69 +
 .../RazorComments_DesignTime.ir.txt           |   55 +
 .../RazorComments_DesignTime.mappings.txt     |   47 +
 .../RazorComments_Runtime.codegen.cs          |   64 +
 .../RazorComments_Runtime.ir.txt              |   50 +
 .../RemoveTagHelperDirective.cshtml           |    1 +
 ...veTagHelperDirective_DesignTime.codegen.cs |   32 +
 ...RemoveTagHelperDirective_DesignTime.ir.txt |   14 +
 ...TagHelperDirective_DesignTime.mappings.txt |    5 +
 .../Sections.cshtml                           |   17 +
 .../Sections_DesignTime.codegen.cs            |  100 +
 .../Sections_DesignTime.ir.txt                |   62 +
 .../Sections_DesignTime.mappings.txt          |   44 +
 .../Sections_Runtime.codegen.cs               |   80 +
 .../Sections_Runtime.ir.txt                   |   56 +
 .../SimpleTagHelpers.cshtml                   |    5 +
 .../SimpleTagHelpers_DesignTime.codegen.cs    |   35 +
 .../SimpleTagHelpers_DesignTime.ir.txt        |   37 +
 .../SimpleTagHelpers_DesignTime.mappings.txt  |    5 +
 .../SimpleTagHelpers_Runtime.codegen.cs       |   56 +
 .../SimpleTagHelpers_Runtime.ir.txt           |   28 +
 .../SimpleUnspacedIf.cshtml                   |    4 +
 .../SimpleUnspacedIf_DesignTime.codegen.cs    |   39 +
 .../SimpleUnspacedIf_DesignTime.ir.txt        |   19 +
 .../SimpleUnspacedIf_DesignTime.mappings.txt  |   16 +
 .../SimpleUnspacedIf_Runtime.codegen.cs       |   34 +
 .../SimpleUnspacedIf_Runtime.ir.txt           |   16 +
 .../SingleTagHelper.cshtml                    |    3 +
 ...agHelperWithNewlineBeforeAttributes.cshtml |    4 +
 ...lineBeforeAttributes_DesignTime.codegen.cs |   41 +
 ...hNewlineBeforeAttributes_DesignTime.ir.txt |   27 +
 ...neBeforeAttributes_DesignTime.mappings.txt |   10 +
 ...NewlineBeforeAttributes_Runtime.codegen.cs |   61 +
 ...WithNewlineBeforeAttributes_Runtime.ir.txt |   20 +
 .../SingleTagHelper_DesignTime.codegen.cs     |   41 +
 .../SingleTagHelper_DesignTime.ir.txt         |   27 +
 .../SingleTagHelper_DesignTime.mappings.txt   |   10 +
 .../SingleTagHelper_Runtime.codegen.cs        |   61 +
 .../SingleTagHelper_Runtime.ir.txt            |   20 +
 .../StringLiterals.cshtml                     |  237 ++
 .../StringLiterals_DesignTime.codegen.cs      |   48 +
 .../StringLiterals_DesignTime.ir.txt          | 1186 ++++++
 .../StringLiterals_DesignTime.mappings.txt    |   10 +
 .../StringLiterals_Runtime.codegen.cs         |  267 ++
 .../StringLiterals_Runtime.ir.txt             | 1178 ++++++
 .../SymbolBoundAttributes.cshtml              |   19 +
 ...ymbolBoundAttributes_DesignTime.codegen.cs |   70 +
 ...BoundAttributes_DesignTime.diagnostics.txt |    5 +
 .../SymbolBoundAttributes_DesignTime.ir.txt   |  140 +
 ...bolBoundAttributes_DesignTime.mappings.txt |   25 +
 .../SymbolBoundAttributes_Runtime.codegen.cs  |  205 +
 ...bolBoundAttributes_Runtime.diagnostics.txt |    5 +
 .../SymbolBoundAttributes_Runtime.ir.txt      |  126 +
 .../TagHelpersInSection.cshtml                |   20 +
 .../TagHelpersInSection_DesignTime.codegen.cs |   90 +
 ...elpersInSection_DesignTime.diagnostics.txt |    1 +
 .../TagHelpersInSection_DesignTime.ir.txt     |   80 +
 ...agHelpersInSection_DesignTime.mappings.txt |   39 +
 .../TagHelpersInSection_Runtime.codegen.cs    |  124 +
 ...agHelpersInSection_Runtime.diagnostics.txt |    1 +
 .../TagHelpersInSection_Runtime.ir.txt        |   70 +
 .../TagHelpersWithBoundAttributes.cshtml      |    4 +
 ...sWithBoundAttributes_DesignTime.codegen.cs |   42 +
 ...lpersWithBoundAttributes_DesignTime.ir.txt |   32 +
 ...ithBoundAttributes_DesignTime.mappings.txt |   10 +
 ...persWithBoundAttributes_Runtime.codegen.cs |   64 +
 ...gHelpersWithBoundAttributes_Runtime.ir.txt |   24 +
 .../TagHelpersWithDataDashAttributes.cshtml   |    5 +
 ...thDataDashAttributes_DesignTime.codegen.cs |   58 +
 ...rsWithDataDashAttributes_DesignTime.ir.txt |   67 +
 ...DataDashAttributes_DesignTime.mappings.txt |   20 +
 ...sWithDataDashAttributes_Runtime.codegen.cs |  108 +
 ...lpersWithDataDashAttributes_Runtime.ir.txt |   54 +
 .../TagHelpersWithPrefix.cshtml               |    5 +
 ...TagHelpersWithPrefix_DesignTime.codegen.cs |   52 +
 .../TagHelpersWithPrefix_DesignTime.ir.txt    |   35 +
 ...gHelpersWithPrefix_DesignTime.mappings.txt |   15 +
 .../TagHelpersWithPrefix_Runtime.codegen.cs   |   64 +
 .../TagHelpersWithPrefix_Runtime.ir.txt       |   24 +
 .../TagHelpersWithTemplate.cshtml             |   19 +
 ...gHelpersWithTemplate_DesignTime.codegen.cs |   78 +
 .../TagHelpersWithTemplate_DesignTime.ir.txt  |   58 +
 ...elpersWithTemplate_DesignTime.mappings.txt |   47 +
 .../TagHelpersWithTemplate_Runtime.codegen.cs |  129 +
 .../TagHelpersWithTemplate_Runtime.ir.txt     |   51 +
 ...gHelpersWithWeirdlySpacedAttributes.cshtml |   15 +
 ...rdlySpacedAttributes_DesignTime.codegen.cs |   66 +
 ...hWeirdlySpacedAttributes_DesignTime.ir.txt |   75 +
 ...lySpacedAttributes_DesignTime.mappings.txt |   20 +
 ...WeirdlySpacedAttributes_Runtime.codegen.cs |  140 +
 ...WithWeirdlySpacedAttributes_Runtime.ir.txt |   59 +
 .../CodeGenerationIntegrationTest/Tags.cshtml |    5 +
 .../Tags_DesignTime.codegen.cs                |   44 +
 .../Tags_DesignTime.diagnostics.txt           |    1 +
 .../Tags_DesignTime.ir.txt                    |   30 +
 .../Tags_DesignTime.mappings.txt              |   19 +
 .../Tags_Runtime.codegen.cs                   |   21 +
 .../Tags_Runtime.diagnostics.txt              |    1 +
 .../Tags_Runtime.ir.txt                       |   27 +
 .../Templates.cshtml                          |   53 +
 .../Templates_DesignTime.codegen.cs           |  206 +
 .../Templates_DesignTime.ir.txt               |  158 +
 .../Templates_DesignTime.mappings.txt         |  169 +
 .../Templates_Runtime.codegen.cs              |  228 ++
 .../Templates_Runtime.ir.txt                  |  156 +
 .../TransitionsInTagHelperAttributes.cshtml   |   12 +
 ...nTagHelperAttributes_DesignTime.codegen.cs |  104 +
 ...elperAttributes_DesignTime.diagnostics.txt |    1 +
 ...onsInTagHelperAttributes_DesignTime.ir.txt |  105 +
 ...agHelperAttributes_DesignTime.mappings.txt |  116 +
 ...nsInTagHelperAttributes_Runtime.codegen.cs |  204 +
 ...agHelperAttributes_Runtime.diagnostics.txt |    1 +
 ...itionsInTagHelperAttributes_Runtime.ir.txt |   92 +
 .../UnfinishedExpressionInCode.cshtml         |    3 +
 ...shedExpressionInCode_DesignTime.codegen.cs |   43 +
 ...finishedExpressionInCode_DesignTime.ir.txt |   17 +
 ...edExpressionInCode_DesignTime.mappings.txt |   19 +
 ...inishedExpressionInCode_Runtime.codegen.cs |   25 +
 .../UnfinishedExpressionInCode_Runtime.ir.txt |   12 +
 .../Usings.cshtml                             |   15 +
 .../Usings_DesignTime.codegen.cs              |   87 +
 .../Usings_DesignTime.ir.txt                  |   48 +
 .../Usings_DesignTime.mappings.txt            |   51 +
 .../Usings_Runtime.codegen.cs                 |   88 +
 .../Usings_Runtime.ir.txt                     |   35 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   45 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   25 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   45 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   25 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   32 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   67 +
 .../TestComponent.ir.txt                      |   35 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   55 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   32 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   67 +
 .../TestComponent.ir.txt                      |   35 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   55 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   34 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   32 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   69 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   72 +
 .../TestComponent.ir.txt                      |   34 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   32 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   39 +
 .../TestComponent.ir.txt                      |   34 +
 .../TestComponent.mappings.txt                |   23 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   34 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   32 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   55 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   65 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |   19 +
 .../TestComponent.codegen.cs                  |   64 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |   19 +
 .../TestComponent.codegen.cs                  |   74 +
 .../TestComponent.ir.txt                      |   35 +
 .../TestComponent.mappings.txt                |   19 +
 .../TestComponent.codegen.cs                  |   66 +
 .../TestComponent.ir.txt                      |   32 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   62 +
 .../TestComponent.ir.txt                      |   30 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   66 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   64 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   65 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |  100 +
 .../TestComponent.ir.txt                      |   37 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   69 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   30 +
 .../TestComponent.codegen.cs                  |   69 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   30 +
 .../TestComponent.codegen.cs                  |   81 +
 .../TestComponent.ir.txt                      |   35 +
 .../TestComponent.mappings.txt                |   25 +
 .../TestComponent.codegen.cs                  |   85 +
 .../TestComponent.ir.txt                      |   37 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.codegen.cs                  |   38 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   44 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   46 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   45 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   45 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   45 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   47 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   59 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   65 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   54 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   88 +
 .../TestComponent.ir.txt                      |   43 +
 .../TestComponent.mappings.txt                |   15 +
 .../ComponentImports/_Imports.codegen.cs      |   59 +
 .../ComponentImports/_Imports.diagnostics.txt |    2 +
 .../ComponentImports/_Imports.ir.txt          |   24 +
 .../ComponentImports/_Imports.mappings.txt    |   20 +
 .../TestComponent.codegen.cs                  |   46 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   87 +
 .../TestComponent.ir.txt                      |   42 +
 .../TestComponent.mappings.txt                |   49 +
 .../TestComponent.codegen.cs                  |   51 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   54 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   27 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.codegen.cs                  |   51 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.codegen.cs                  |   55 +
 .../Component_WithRef/TestComponent.ir.txt    |   30 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   54 +
 .../TestComponent.ir.txt                      |   35 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   76 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   61 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |   14 +
 .../Element_WithRef/TestComponent.codegen.cs  |   43 +
 .../Element_WithRef/TestComponent.ir.txt      |   32 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   58 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   22 +
 .../TestComponent.codegen.cs                  |   58 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   22 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   57 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   55 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |   25 +
 .../TestComponent.codegen.cs                  |   58 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   22 +
 .../TestComponent.codegen.cs                  |   58 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   22 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.codegen.cs                  |   71 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   26 +
 .../TestComponent.codegen.cs                  |   75 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   21 +
 .../TestComponent.codegen.cs                  |   66 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   47 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   76 +
 .../TestComponent.ir.txt                      |   36 +
 .../TestComponent.mappings.txt                |   25 +
 .../TestComponent.codegen.cs                  |   74 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   34 +
 .../TestComponent.codegen.cs                  |   91 +
 .../TestComponent.ir.txt                      |   38 +
 .../TestComponent.mappings.txt                |   39 +
 .../TestComponent.codegen.cs                  |   69 +
 .../TestComponent.ir.txt                      |   30 +
 .../TestComponent.mappings.txt                |   20 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   34 +
 .../TestComponent.codegen.cs                  |   62 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   34 +
 .../TestComponent.codegen.cs                  |   56 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   34 +
 .../TestComponent.codegen.cs                  |   62 +
 .../TestComponent.ir.txt                      |   30 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   44 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   19 +
 .../Regression_597/TestComponent.codegen.cs   |   55 +
 .../Regression_597/TestComponent.ir.txt       |   31 +
 .../Regression_597/TestComponent.mappings.txt |   14 +
 .../Regression_609/TestComponent.codegen.cs   |   66 +
 .../Regression_609/TestComponent.ir.txt       |   39 +
 .../Regression_609/TestComponent.mappings.txt |   21 +
 .../Regression_772/TestComponent.codegen.cs   |   49 +
 .../TestComponent.diagnostics.txt             |    2 +
 .../Regression_772/TestComponent.ir.txt       |   29 +
 .../Regression_772/TestComponent.mappings.txt |    5 +
 .../Regression_773/TestComponent.codegen.cs   |   49 +
 .../Regression_773/TestComponent.ir.txt       |   31 +
 .../Regression_773/TestComponent.mappings.txt |    5 +
 .../Regression_784/TestComponent.codegen.cs   |   47 +
 .../Regression_784/TestComponent.ir.txt       |   35 +
 .../Regression_784/TestComponent.mappings.txt |   27 +
 .../TestComponent.codegen.cs                  |   27 +
 .../TestComponent.ir.txt                      |   30 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   37 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   38 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |    5 +
 .../TestComponent.codegen.cs                  |   27 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   43 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |   14 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   44 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   44 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   46 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   50 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |   13 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   25 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   44 +
 .../TestComponent.ir.txt                      |   26 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   43 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   31 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   24 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   19 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   16 +
 .../TestComponent.codegen.cs                  |   50 +
 .../TestComponent.ir.txt                      |   30 +
 .../TestComponent.codegen.cs                  |   48 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.mappings.txt                |   23 +
 .../TestComponent.codegen.cs                  |   49 +
 .../TestComponent.ir.txt                      |   23 +
 .../TestComponent.mappings.txt                |   23 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.codegen.cs                  |   47 +
 .../TestComponent.ir.txt                      |   31 +
 .../TestComponent.codegen.cs                  |   22 +
 .../TestComponent.ir.txt                      |   10 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.codegen.cs                  |   26 +
 .../TestComponent.ir.txt                      |   12 +
 .../TestComponent.codegen.cs                  |   26 +
 .../TestComponent.ir.txt                      |   13 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   26 +
 .../TestComponent.ir.txt                      |   13 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   13 +
 .../TestComponent.codegen.cs                  |   31 +
 .../TestComponent.ir.txt                      |   22 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   24 +
 .../TestComponent.ir.txt                      |   16 +
 .../TestComponent.codegen.cs                  |   24 +
 .../TestComponent.ir.txt                      |   12 +
 .../TestComponent.codegen.cs                  |   26 +
 .../TestComponent.ir.txt                      |   19 +
 .../TestComponent.codegen.cs                  |   31 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   48 +
 .../TestComponent.ir.txt                      |   32 +
 .../ComponentImports/_Imports.codegen.cs      |   24 +
 .../ComponentImports/_Imports.diagnostics.txt |    2 +
 .../ComponentImports/_Imports.ir.txt          |   16 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   13 +
 .../TestComponent.codegen.cs                  |   53 +
 .../TestComponent.ir.txt                      |   28 +
 .../TestComponent.mappings.txt                |   29 +
 .../TestComponent.codegen.cs                  |   25 +
 .../TestComponent.ir.txt                      |   13 +
 .../TestComponent.codegen.cs                  |   41 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.mappings.txt                |   18 +
 .../TestComponent.codegen.cs                  |   22 +
 .../TestComponent.ir.txt                      |   12 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   16 +
 .../TestComponent.codegen.cs                  |   24 +
 .../TestComponent.ir.txt                      |   12 +
 .../TestComponent.codegen.cs                  |   43 +
 .../Component_WithRef/TestComponent.ir.txt    |   19 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   47 +
 .../TestComponent.ir.txt                      |   20 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   28 +
 .../TestComponent.ir.txt                      |   16 +
 .../TestComponent.codegen.cs                  |   27 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.mappings.txt                |    9 +
 .../Element_WithRef/TestComponent.codegen.cs  |   44 +
 .../Element_WithRef/TestComponent.ir.txt      |   21 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   17 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   17 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   33 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   15 +
 .../TestComponent.codegen.cs                  |   34 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   17 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   17 +
 .../TestComponent.codegen.cs                  |   35 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |   17 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   11 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   11 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   11 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   11 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   17 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   53 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.mappings.txt                |   16 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   24 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   14 +
 .../TestComponent.codegen.cs                  |   24 +
 .../TestComponent.ir.txt                      |   13 +
 .../TestComponent.codegen.cs                  |   21 +
 .../TestComponent.ir.txt                      |   10 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |    9 +
 .../TestComponent.codegen.cs                  |   30 +
 .../TestComponent.ir.txt                      |   16 +
 .../TestComponent.codegen.cs                  |   45 +
 .../TestComponent.ir.txt                      |   27 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   53 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.mappings.txt                |   29 +
 .../TestComponent.codegen.cs                  |   61 +
 .../TestComponent.ir.txt                      |   29 +
 .../TestComponent.mappings.txt                |   29 +
 .../TestComponent.codegen.cs                  |   42 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   39 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.mappings.txt                |   19 +
 .../TestComponent.codegen.cs                  |   51 +
 .../TestComponent.ir.txt                      |   19 +
 .../TestComponent.mappings.txt                |   29 +
 .../TestComponent.codegen.cs                  |   39 +
 .../TestComponent.ir.txt                      |   18 +
 .../TestComponent.mappings.txt                |   19 +
 .../TestComponent.codegen.cs                  |   40 +
 .../TestComponent.ir.txt                      |   19 +
 .../TestComponent.mappings.txt                |   10 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   16 +
 .../TestComponent.mappings.txt                |    9 +
 .../Regression_597/TestComponent.codegen.cs   |   32 +
 .../Regression_597/TestComponent.ir.txt       |   20 +
 .../Regression_597/TestComponent.mappings.txt |    9 +
 .../Regression_609/TestComponent.codegen.cs   |   35 +
 .../Regression_609/TestComponent.ir.txt       |   28 +
 .../Regression_609/TestComponent.mappings.txt |   11 +
 .../Regression_772/TestComponent.codegen.cs   |   25 +
 .../TestComponent.diagnostics.txt             |    2 +
 .../Regression_772/TestComponent.ir.txt       |   15 +
 .../Regression_773/TestComponent.codegen.cs   |   25 +
 .../Regression_773/TestComponent.ir.txt       |   15 +
 .../Regression_784/TestComponent.codegen.cs   |   36 +
 .../Regression_784/TestComponent.ir.txt       |   24 +
 .../Regression_784/TestComponent.mappings.txt |   17 +
 .../TestComponent.codegen.cs                  |   29 +
 .../TestComponent.ir.txt                      |   21 +
 .../TestComponent.codegen.cs                  |   22 +
 .../TestComponent.ir.txt                      |   12 +
 .../TestComponent.codegen.cs                  |   23 +
 .../TestComponent.ir.txt                      |   11 +
 .../TestComponent.codegen.cs                  |   22 +
 .../TestComponent.ir.txt                      |   11 +
 .../TestComponent.codegen.cs                  |   21 +
 .../TestComponent.ir.txt                      |   10 +
 .../TestComponent.codegen.cs                  |   32 +
 .../TestComponent.ir.txt                      |   15 +
 .../TestComponent.mappings.txt                |    9 +
 .../NamespaceToken.codegen.cs                 |   32 +
 .../NamespaceToken.cshtml                     |    1 +
 .../NamespaceToken.ir.txt                     |   12 +
 .../NamespaceToken.mappings.txt               |    5 +
 .../HtmlWithConditionalAttribute.cshtml       |    5 +
 .../HtmlWithConditionalAttribute.ir.txt       |   25 +
 .../HtmlWithDataDashAttribute.cshtml          |    5 +
 .../HtmlWithDataDashAttribute.ir.txt          |   26 +
 .../NestedTagHelpers.cshtml                   |    5 +
 .../NestedTagHelpers.ir.txt                   |   37 +
 .../SimpleTagHelpers.cshtml                   |    5 +
 .../SimpleTagHelpers.ir.txt                   |   28 +
 .../TagHelpersWithBoundAttributes.cshtml      |    4 +
 .../TagHelpersWithBoundAttributes.ir.txt      |   24 +
 ...tionsDirectiveAutoCompleteAtEOF.cspans.txt |    5 +
 ...ctionsDirectiveAutoCompleteAtEOF.stree.txt |   19 +
 ...ectiveAutoCompleteAtStartOfFile.cspans.txt |    5 +
 ...rectiveAutoCompleteAtStartOfFile.stree.txt |   20 +
 ...ctionDirectiveAutoCompleteAtEOF.cspans.txt |    8 +
 ...ectionDirectiveAutoCompleteAtEOF.stree.txt |   25 +
 ...ectiveAutoCompleteAtStartOfFile.cspans.txt |   11 +
 ...rectiveAutoCompleteAtStartOfFile.stree.txt |   37 +
 .../VerbatimBlockAutoCompleteAtEOF.cspans.txt |    4 +
 .../VerbatimBlockAutoCompleteAtEOF.diag.txt   |    1 +
 .../VerbatimBlockAutoCompleteAtEOF.stree.txt  |   16 +
 ...mBlockAutoCompleteAtStartOfFile.cspans.txt |    7 +
 ...timBlockAutoCompleteAtStartOfFile.diag.txt |    1 +
 ...imBlockAutoCompleteAtStartOfFile.stree.txt |   29 +
 .../AcceptsElseIfWithNoCondition.cspans.txt   |    3 +
 .../AcceptsElseIfWithNoCondition.stree.txt    |   66 +
 ...citExpressionWhenEmbeddedInCode.cspans.txt |    6 +
 ...icitExpressionWhenEmbeddedInCode.stree.txt |   27 +
 .../AllowsEmptyBlockStatement.cspans.txt      |    3 +
 .../AllowsEmptyBlockStatement.stree.txt       |   16 +
 ...ingLiteralCharactersAndBrackets.cspans.txt |    3 +
 ...ringLiteralCharactersAndBrackets.stree.txt |   25 +
 ...sAndBracketsInsideBlockComments.cspans.txt |    3 +
 ...rsAndBracketsInsideBlockComments.stree.txt |   27 +
 .../CapturesNewlineAfterUsing.cspans.txt      |    4 +
 .../CapturesNewlineAfterUsing.stree.txt       |   16 +
 .../CorrectlyParsesDoWhileBlock.cspans.txt    |    4 +
 .../CorrectlyParsesDoWhileBlock.stree.txt     |   34 +
 ...sesDoWhileBlockMissingSemicolon.cspans.txt |    3 +
 ...rsesDoWhileBlockMissingSemicolon.stree.txt |   31 +
 ...BlockMissingWhileClauseEntirely.cspans.txt |    4 +
 ...eBlockMissingWhileClauseEntirely.stree.txt |   25 +
 ...WhileBlockMissingWhileCondition.cspans.txt |    3 +
 ...oWhileBlockMissingWhileCondition.stree.txt |   24 +
 ...singWhileConditionWithSemicolon.cspans.txt |    4 +
 ...ssingWhileConditionWithSemicolon.stree.txt |   27 +
 ...ectlyParsesMarkupInDoWhileBlock.cspans.txt |   10 +
 ...rectlyParsesMarkupInDoWhileBlock.stree.txt |   55 +
 ...esNotAllowMultipleFinallyBlocks.cspans.txt |    4 +
 ...oesNotAllowMultipleFinallyBlocks.stree.txt |   50 +
 ...erNotFollowedByOpenAngleOrColon.cspans.txt |    3 +
 ...terNotFollowedByOpenAngleOrColon.stree.txt |   23 +
 ...esntCaptureWhitespaceAfterUsing.cspans.txt |    4 +
 ...oesntCaptureWhitespaceAfterUsing.stree.txt |   15 +
 ...fNamespaceAliasMissingSemicolon.cspans.txt |    4 +
 ...IfNamespaceAliasMissingSemicolon.stree.txt |   23 +
 ...NamespaceImportMissingSemicolon.cspans.txt |    4 +
 ...fNamespaceImportMissingSemicolon.stree.txt |   19 +
 .../LocalFunctionsWithGenerics.cspans.txt     |   20 +
 .../LocalFunctionsWithGenerics.stree.txt      |  126 +
 .../LocalFunctionsWithRazor.cspans.txt        |   13 +
 .../LocalFunctionsWithRazor.stree.txt         |   75 +
 ...CodeBlockWithAtDoesntCauseError.cspans.txt |    6 +
 ...dCodeBlockWithAtDoesntCauseError.stree.txt |   31 +
 .../NestedCodeBlockWithCSharpAt.cspans.txt    |    6 +
 .../NestedCodeBlockWithCSharpAt.stree.txt     |   52 +
 ...eBlockWithMarkupSetsDotAsMarkup.cspans.txt |   15 +
 ...deBlockWithMarkupSetsDotAsMarkup.stree.txt |   58 +
 .../ParsersCanNestRecursively.cspans.txt      |   39 +
 .../ParsersCanNestRecursively.stree.txt       |  194 +
 ...rsesElseIfBranchesOfIfStatement.cspans.txt |    3 +
 ...arsesElseIfBranchesOfIfStatement.stree.txt |  101 +
 ...racterFollowedByIdentifierStart.cspans.txt |    6 +
 ...aracterFollowedByIdentifierStart.stree.txt |   33 +
 ...tchCharacterFollowedByOpenParen.cspans.txt |    8 +
 ...itchCharacterFollowedByOpenParen.stree.txt |   34 +
 ...ipleElseIfBranchesOfIfStatement.cspans.txt |    3 +
 ...tipleElseIfBranchesOfIfStatement.stree.txt |  245 ++
 ...tatementFollowedByOneElseBranch.cspans.txt |    4 +
 ...StatementFollowedByOneElseBranch.stree.txt |  165 +
 ...orUsingKeywordIfIsInValidFormat.cspans.txt |    4 +
 ...ForUsingKeywordIfIsInValidFormat.stree.txt |   20 +
 ...orUsingKeywordIfIsInValidFormat.cspans.txt |    4 +
 ...ForUsingKeywordIfIsInValidFormat.stree.txt |   20 +
 ...esIfFirstIdentifierIsForKeyword.cspans.txt |    4 +
 ...cesIfFirstIdentifierIsForKeyword.stree.txt |   54 +
 ...FirstIdentifierIsForeachKeyword.cspans.txt |    4 +
 ...fFirstIdentifierIsForeachKeyword.stree.txt |   54 +
 ...erIsIfKeywordWithNoElseBranches.cspans.txt |    3 +
 ...ierIsIfKeywordWithNoElseBranches.stree.txt |   52 +
 ...fFirstIdentifierIsSwitchKeyword.cspans.txt |    4 +
 ...IfFirstIdentifierIsSwitchKeyword.stree.txt |   62 +
 ...IfFirstIdentifierIsWhileKeyword.cspans.txt |    4 +
 ...sIfFirstIdentifierIsWhileKeyword.stree.txt |   54 +
 ...dentifierIsUsingFollowedByParen.cspans.txt |    4 +
 ...IdentifierIsUsingFollowedByParen.stree.txt |   54 +
 ...ngCatchClausesAfterFinallyBlock.cspans.txt |    4 +
 ...ingCatchClausesAfterFinallyBlock.stree.txt |   54 +
 ...StopsParsingCodeAfterElseBranch.cspans.txt |   18 +
 .../StopsParsingCodeAfterElseBranch.stree.txt |  207 +
 ...gIfIfStatementNotFollowedByElse.cspans.txt |    3 +
 ...ngIfIfStatementNotFollowedByElse.stree.txt |   53 +
 ...entBetweenCatchAndFinallyClause.cspans.txt |    4 +
 ...mentBetweenCatchAndFinallyClause.stree.txt |   49 +
 ...kCommentBetweenDoAndWhileClause.cspans.txt |    4 +
 ...ckCommentBetweenDoAndWhileClause.stree.txt |   34 +
 ...mmentBetweenElseIfAndElseClause.cspans.txt |    4 +
 ...ommentBetweenElseIfAndElseClause.stree.txt |   54 +
 ...ckCommentBetweenIfAndElseClause.cspans.txt |    4 +
 ...ockCommentBetweenIfAndElseClause.stree.txt |   38 +
 ...CommentBetweenIfAndElseIfClause.cspans.txt |    1 +
 ...kCommentBetweenIfAndElseIfClause.stree.txt |   36 +
 ...CommentBetweenTryAndCatchClause.cspans.txt |    3 +
 ...kCommentBetweenTryAndCatchClause.stree.txt |   36 +
 ...mmentBetweenTryAndFinallyClause.cspans.txt |    4 +
 ...ommentBetweenTryAndFinallyClause.stree.txt |   35 +
 ...pportsExceptionLessCatchClauses.cspans.txt |    3 +
 ...upportsExceptionLessCatchClauses.stree.txt |   43 +
 ...entBetweenCatchAndFinallyClause.cspans.txt |    4 +
 ...mentBetweenCatchAndFinallyClause.stree.txt |   49 +
 ...eCommentBetweenDoAndWhileClause.cspans.txt |    4 +
 ...neCommentBetweenDoAndWhileClause.stree.txt |   34 +
 ...mmentBetweenElseIfAndElseClause.cspans.txt |    4 +
 ...ommentBetweenElseIfAndElseClause.stree.txt |   54 +
 ...neCommentBetweenIfAndElseClause.cspans.txt |    4 +
 ...ineCommentBetweenIfAndElseClause.stree.txt |   38 +
 ...CommentBetweenIfAndElseIfClause.cspans.txt |    3 +
 ...eCommentBetweenIfAndElseIfClause.stree.txt |   41 +
 ...CommentBetweenTryAndCatchClause.cspans.txt |    3 +
 ...eCommentBetweenTryAndCatchClause.stree.txt |   36 +
 ...mmentBetweenTryAndFinallyClause.cspans.txt |    4 +
 ...ommentBetweenTryAndFinallyClause.stree.txt |   35 +
 ...kupWithinAdditionalCatchClauses.cspans.txt |    9 +
 ...rkupWithinAdditionalCatchClauses.stree.txt |  105 +
 ...SupportsMarkupWithinCatchClause.cspans.txt |    9 +
 .../SupportsMarkupWithinCatchClause.stree.txt |   55 +
 ...pportsMarkupWithinFinallyClause.cspans.txt |   10 +
 ...upportsMarkupWithinFinallyClause.stree.txt |   50 +
 .../SupportsMarkupWithinTryClause.cspans.txt  |    9 +
 .../SupportsMarkupWithinTryClause.stree.txt   |   30 +
 ...entBetweenCatchAndFinallyClause.cspans.txt |   16 +
 ...mentBetweenCatchAndFinallyClause.stree.txt |   61 +
 ...rCommentBetweenDoAndWhileClause.cspans.txt |   16 +
 ...orCommentBetweenDoAndWhileClause.stree.txt |   46 +
 ...mmentBetweenElseIfAndElseClause.cspans.txt |   16 +
 ...ommentBetweenElseIfAndElseClause.stree.txt |   66 +
 ...orCommentBetweenIfAndElseClause.cspans.txt |   16 +
 ...zorCommentBetweenIfAndElseClause.stree.txt |   50 +
 ...CommentBetweenIfAndElseIfClause.cspans.txt |   15 +
 ...rCommentBetweenIfAndElseIfClause.stree.txt |   53 +
 ...CommentBetweenTryAndCatchClause.cspans.txt |   15 +
 ...rCommentBetweenTryAndCatchClause.stree.txt |   47 +
 ...mmentBetweenTryAndFinallyClause.cspans.txt |   16 +
 ...ommentBetweenTryAndFinallyClause.stree.txt |   47 +
 ...tsTryStatementWithFinallyClause.cspans.txt |    4 +
 ...rtsTryStatementWithFinallyClause.stree.txt |   45 +
 ...tatementWithMultipleCatchClause.cspans.txt |    3 +
 ...StatementWithMultipleCatchClause.stree.txt |  100 +
 ...tatementWithNoAdditionalClauses.cspans.txt |    3 +
 ...StatementWithNoAdditionalClauses.stree.txt |   25 +
 ...sTryStatementWithOneCatchClause.cspans.txt |    3 +
 ...tsTryStatementWithOneCatchClause.stree.txt |   50 +
 ...tsUsingsNestedWithinOtherBlocks.cspans.txt |    3 +
 ...rtsUsingsNestedWithinOtherBlocks.stree.txt |   61 +
 ...rminatesBlockCommentAtEndOfFile.cspans.txt |    3 +
 ...TerminatesBlockCommentAtEndOfFile.diag.txt |    2 +
 ...erminatesBlockCommentAtEndOfFile.stree.txt |   22 +
 .../TerminatesParenBalancingAtEOF.cspans.txt  |    3 +
 .../TerminatesParenBalancingAtEOF.diag.txt    |    1 +
 .../TerminatesParenBalancingAtEOF.stree.txt   |   18 +
 ...tesSingleLineCommentAtEndOfFile.cspans.txt |    3 +
 ...natesSingleLineCommentAtEndOfFile.diag.txt |    1 +
 ...atesSingleLineCommentAtEndOfFile.stree.txt |   22 +
 ...erminatesSingleSlashAtEndOfFile.cspans.txt |    3 +
 .../TerminatesSingleSlashAtEndOfFile.diag.txt |    1 +
 ...TerminatesSingleSlashAtEndOfFile.stree.txt |   28 +
 ...ordAtEOFAndOutputsFileCodeBlock.cspans.txt |    3 +
 ...wordAtEOFAndOutputsFileCodeBlock.stree.txt |   10 +
 ...sIfFirstIdentifierIsLockKeyword.cspans.txt |    4 +
 ...esIfFirstIdentifierIsLockKeyword.stree.txt |   26 +
 ...irstPairAsPartOfCSharpStatement.cspans.txt |    5 +
 ...FirstPairAsPartOfCSharpStatement.stree.txt |   28 +
 ...scapeSequenceIfAtStatementStart.cspans.txt |    5 +
 ...EscapeSequenceIfAtStatementStart.stree.txt |   26 +
 ...ngOfAttributeValue_DoesNotThrow.cspans.txt |   13 +
 ...ingOfAttributeValue_DoesNotThrow.stree.txt |   47 +
 ...ndOfAttributeValue_DoesNotThrow.cspans.txt |   13 +
 ...EndOfAttributeValue_DoesNotThrow.stree.txt |   47 +
 ...weenAttributeValue_DoesNotThrow.cspans.txt |   14 +
 ...tweenAttributeValue_DoesNotThrow.stree.txt |   53 +
 ...onInAttributeValue_DoesNotThrow.cspans.txt |   12 +
 ...ionInAttributeValue_DoesNotThrow.stree.txt |   44 +
 ...eTransitionInEmail_DoesNotThrow.cspans.txt |   17 +
 ...leTransitionInEmail_DoesNotThrow.stree.txt |   61 +
 ...eTransitionInRegex_DoesNotThrow.cspans.txt |   14 +
 ...leTransitionInRegex_DoesNotThrow.stree.txt |   92 +
 ...ithExpressionBlock_DoesNotThrow.cspans.txt |   47 +
 ...WithExpressionBlock_DoesNotThrow.stree.txt |  195 +
 ...ubleTransition_EndOfFile_Throws.cspans.txt |    7 +
 ...DoubleTransition_EndOfFile_Throws.diag.txt |    2 +
 ...oubleTransition_EndOfFile_Throws.stree.txt |   34 +
 ...nsitionsInAttributeValue_Throws.cspans.txt |   15 +
 ...ransitionsInAttributeValue_Throws.diag.txt |    2 +
 ...ansitionsInAttributeValue_Throws.stree.txt |   61 +
 ...lidUsingStmtAndTreatsAsFileCode.cspans.txt |    4 +
 ...alidUsingStmtAndTreatsAsFileCode.stree.txt |   13 +
 ...mplicitExpressionParensUnclosed.cspans.txt |    9 +
 ...fImplicitExpressionParensUnclosed.diag.txt |    1 +
 ...ImplicitExpressionParensUnclosed.stree.txt |   41 +
 ...tlyParsesAtSignInDelimitedBlock.cspans.txt |    6 +
 ...ctlyParsesAtSignInDelimitedBlock.stree.txt |   28 +
 ...ectyAssumedToBeWithinAStatement.cspans.txt |   10 +
 ...rrectyAssumedToBeWithinAStatement.diag.txt |    1 +
 ...rectyAssumedToBeWithinAStatement.stree.txt |   53 +
 ...loseParenInExpressionWithinCode.cspans.txt |    9 +
 ...gCloseParenInExpressionWithinCode.diag.txt |    1 +
 ...CloseParenInExpressionWithinCode.stree.txt |   34 +
 .../HandlesQuotesAfterTransition.cspans.txt   |    4 +
 .../HandlesQuotesAfterTransition.diag.txt     |    1 +
 .../HandlesQuotesAfterTransition.stree.txt    |   14 +
 ...tementControlFlowStatementError.cspans.txt |    4 +
 ...tatementControlFlowStatementError.diag.txt |   10 +
 ...atementControlFlowStatementError.stree.txt |   26 +
 ...anIfEofFoundAfterOpenCurlyBrace.cspans.txt |    4 +
 ...SpanIfEofFoundAfterOpenCurlyBrace.diag.txt |    1 +
 ...panIfEofFoundAfterOpenCurlyBrace.stree.txt |   16 +
 ...thCodeSpanIfStatementBlockEmpty.cspans.txt |    6 +
 ...gthCodeSpanIfStatementBlockEmpty.stree.txt |   18 +
 ...otIdentifierStartOrParenOrBrace.cspans.txt |    4 +
 ...sNotIdentifierStartOrParenOrBrace.diag.txt |    1 +
 ...NotIdentifierStartOrParenOrBrace.stree.txt |   16 +
 ...rTransitionInEmbeddedExpression.cspans.txt |    7 +
 ...terTransitionInEmbeddedExpression.diag.txt |    2 +
 ...erTransitionInEmbeddedExpression.stree.txt |   27 +
 ...ErrorIfNewlineFollowsTransition.cspans.txt |    4 +
 ...esErrorIfNewlineFollowsTransition.diag.txt |    1 +
 ...sErrorIfNewlineFollowsTransition.stree.txt |   14 +
 ...tionAndBlockStartInEmbeddedExpr.cspans.txt |    9 +
 ...sitionAndBlockStartInEmbeddedExpr.diag.txt |    1 +
 ...itionAndBlockStartInEmbeddedExpr.stree.txt |   32 +
 ...dByLessThanSignAtStatementStart.cspans.txt |   10 +
 ...wedByLessThanSignAtStatementStart.diag.txt |    5 +
 ...edByLessThanSignAtStatementStart.stree.txt |   35 +
 ...orIfCatchBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...rrorIfCatchBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rorIfCatchBlockUnterminatedAtEOF.stree.txt |   53 +
 ...orIfClassBlockUnterminatedAtEOF.cspans.txt |    6 +
 ...rorIfClassBlockUnterminatedAtEOF.stree.txt |   48 +
 ...ErrorIfDoBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...tsErrorIfDoBlockUnterminatedAtEOF.diag.txt |    1 +
 ...sErrorIfDoBlockUnterminatedAtEOF.stree.txt |   39 +
 ...rorIfElseBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...ErrorIfElseBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rrorIfElseBlockUnterminatedAtEOF.stree.txt |   53 +
 ...rIfElseIfBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...rorIfElseIfBlockUnterminatedAtEOF.diag.txt |    1 +
 ...orIfElseIfBlockUnterminatedAtEOF.stree.txt |   55 +
 ...licitCodeBlockUnterminatedAtEOF.cspans.txt |    4 +
 ...xplicitCodeBlockUnterminatedAtEOF.diag.txt |    1 +
 ...plicitCodeBlockUnterminatedAtEOF.stree.txt |   43 +
 ...IfFinallyBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...orIfFinallyBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rIfFinallyBlockUnterminatedAtEOF.stree.txt |   50 +
 ...rrorIfForBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...sErrorIfForBlockUnterminatedAtEOF.diag.txt |    1 +
 ...ErrorIfForBlockUnterminatedAtEOF.stree.txt |   43 +
 ...IfForeachBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...orIfForeachBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rIfForeachBlockUnterminatedAtEOF.stree.txt |   43 +
 ...ErrorIfIfBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...tsErrorIfIfBlockUnterminatedAtEOF.diag.txt |    1 +
 ...sErrorIfIfBlockUnterminatedAtEOF.stree.txt |   43 +
 ...rorIfLockBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...ErrorIfLockBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rrorIfLockBlockUnterminatedAtEOF.stree.txt |   43 +
 ...rIfSwitchBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...rorIfSwitchBlockUnterminatedAtEOF.diag.txt |    1 +
 ...orIfSwitchBlockUnterminatedAtEOF.stree.txt |   43 +
 ...rrorIfTryBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...sErrorIfTryBlockUnterminatedAtEOF.diag.txt |    1 +
 ...ErrorIfTryBlockUnterminatedAtEOF.stree.txt |   39 +
 ...orIfUsingBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...rrorIfUsingBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rorIfUsingBlockUnterminatedAtEOF.stree.txt |   43 +
 ...orIfWhileBlockUnterminatedAtEOF.cspans.txt |    3 +
 ...rrorIfWhileBlockUnterminatedAtEOF.diag.txt |    1 +
 ...rorIfWhileBlockUnterminatedAtEOF.stree.txt |   43 +
 ...ntrolFlowStatementsToHaveBraces.cspans.txt |   17 +
 ...ControlFlowStatementsToHaveBraces.diag.txt |   30 +
 ...ontrolFlowStatementsToHaveBraces.stree.txt |   69 +
 ...esumesIfStatementAfterOpenParen.cspans.txt |   10 +
 .../ResumesIfStatementAfterOpenParen.diag.txt |    1 +
 ...ResumesIfStatementAfterOpenParen.stree.txt |   35 +
 ...ketInImplicitExpressionUnclosed.cspans.txt |    3 +
 ...acketInImplicitExpressionUnclosed.diag.txt |    1 +
 ...cketInImplicitExpressionUnclosed.stree.txt |   21 +
 ...IfIfParenInExplicitExprUnclosed.cspans.txt |    4 +
 ...OFIfIfParenInExplicitExprUnclosed.diag.txt |    1 +
 ...FIfIfParenInExplicitExprUnclosed.stree.txt |   20 +
 ...OFIfParenInImplicitExprUnclosed.cspans.txt |    3 +
 ...tEOFIfParenInImplicitExprUnclosed.diag.txt |    1 +
 ...EOFIfParenInImplicitExprUnclosed.stree.txt |   21 +
 ...IfBracketInImplicitExprUnclosed.cspans.txt |    6 +
 ...upIfBracketInImplicitExprUnclosed.diag.txt |    1 +
 ...pIfBracketInImplicitExprUnclosed.stree.txt |   34 +
 ...IfIfParenInExplicitExprUnclosed.cspans.txt |    7 +
 ...upIfIfParenInExplicitExprUnclosed.diag.txt |    1 +
 ...pIfIfParenInExplicitExprUnclosed.stree.txt |   33 +
 ...renInImplicitExpressionUnclosed.cspans.txt |    6 +
 ...ParenInImplicitExpressionUnclosed.diag.txt |    1 +
 ...arenInImplicitExpressionUnclosed.stree.txt |   34 +
 ...RecoveringFromMissingCloseParen.cspans.txt |    4 +
 ...enRecoveringFromMissingCloseParen.diag.txt |    1 +
 ...nRecoveringFromMissingCloseParen.stree.txt |   16 +
 ...RecoveringFromMissingCloseParen.cspans.txt |    4 +
 ...enRecoveringFromMissingCloseParen.diag.txt |    1 +
 ...nRecoveringFromMissingCloseParen.stree.txt |   16 +
 ...rpStringsAtEOLIfEndQuoteMissing.cspans.txt |    3 +
 ...harpStringsAtEOLIfEndQuoteMissing.diag.txt |    1 +
 ...arpStringsAtEOLIfEndQuoteMissing.stree.txt |   27 +
 ...rminatesNormalStringAtEndOfFile.cspans.txt |    3 +
 ...TerminatesNormalStringAtEndOfFile.diag.txt |    2 +
 ...erminatesNormalStringAtEndOfFile.stree.txt |   22 +
 ...RecoveringFromMissingCloseParen.cspans.txt |    4 +
 ...enRecoveringFromMissingCloseParen.diag.txt |    1 +
 ...nRecoveringFromMissingCloseParen.stree.txt |   16 +
 ...inatesVerbatimStringAtEndOfFile.cspans.txt |    3 +
 ...rminatesVerbatimStringAtEndOfFile.diag.txt |    2 +
 ...minatesVerbatimStringAtEndOfFile.stree.txt |   22 +
 ...RecoveringFromMissingCloseParen.cspans.txt |    4 +
 ...enRecoveringFromMissingCloseParen.diag.txt |    1 +
 ...nRecoveringFromMissingCloseParen.stree.txt |   22 +
 ...ithHelperDirectiveProducesError.cspans.txt |    4 +
 .../WithHelperDirectiveProducesError.diag.txt |    1 +
 ...WithHelperDirectiveProducesError.stree.txt |   19 +
 ...ithNestedCodeBlockProducesError.cspans.txt |    8 +
 .../WithNestedCodeBlockProducesError.diag.txt |    1 +
 ...WithNestedCodeBlockProducesError.stree.txt |   27 +
 ...capedQuotesInNonVerbatimStrings.cspans.txt |    6 +
 ...scapedQuotesInNonVerbatimStrings.stree.txt |   18 +
 ...eEscapedQuotesInVerbatimStrings.cspans.txt |    6 +
 ...veEscapedQuotesInVerbatimStrings.stree.txt |   18 +
 ...scapedQuoteInNonVerbatimStrings.cspans.txt |    6 +
 ...EscapedQuoteInNonVerbatimStrings.stree.txt |   18 +
 ...ptEscapedQuoteInVerbatimStrings.cspans.txt |    6 +
 ...eptEscapedQuoteInVerbatimStrings.stree.txt |   18 +
 ...dAcceptMultiLineVerbatimStrings.cspans.txt |    6 +
 ...ldAcceptMultiLineVerbatimStrings.stree.txt |   18 +
 ...capedQuotesInNonVerbatimStrings.cspans.txt |    6 +
 ...scapedQuotesInNonVerbatimStrings.stree.txt |   18 +
 ...eEscapedQuotesInVerbatimStrings.cspans.txt |    6 +
 ...leEscapedQuotesInVerbatimStrings.stree.txt |   18 +
 ...edEscapedQuoteInVerbatimStrings.cspans.txt |    6 +
 ...tedEscapedQuoteInVerbatimStrings.stree.txt |   18 +
 ...FOccursAfterStartOfExplicitExpr.cspans.txt |    4 +
 ...EOFOccursAfterStartOfExplicitExpr.diag.txt |    1 +
 ...OFOccursAfterStartOfExplicitExpr.stree.txt |   16 +
 ...SpanIfExplicitExpressionIsEmpty.cspans.txt |    6 +
 ...eSpanIfExplicitExpressionIsEmpty.stree.txt |   18 +
 ...ionsBlock_CanContainCurlyBraces.cspans.txt |   26 +
 ...tionsBlock_CanContainCurlyBraces.stree.txt |  112 +
 ...lock_DoesNotParseMarkupInString.cspans.txt |    8 +
 ...Block_DoesNotParseMarkupInString.stree.txt |   39 +
 ...sNotParseMarkupInVerbatimString.cspans.txt |    8 +
 ...esNotParseMarkupInVerbatimString.stree.txt |   39 +
 ...ck_DoesNotParseWhenNotSupported.cspans.txt |    8 +
 ...ock_DoesNotParseWhenNotSupported.stree.txt |   51 +
 ...sBlock_MarkupCanContainTemplate.cspans.txt |   25 +
 ...nsBlock_MarkupCanContainTemplate.stree.txt |  117 +
 ...sBlock_ParsesMarkupInsideMethod.cspans.txt |   16 +
 ...nsBlock_ParsesMarkupInsideMethod.stree.txt |   66 +
 ...rsesMarkupWithExpressionsMethod.cspans.txt |   15 +
 ...arsesMarkupWithExpressionsMethod.stree.txt |   61 +
 ...ordsInFunctionsBlock_WithMarkup.cspans.txt |   14 +
 ...wordsInFunctionsBlock_WithMarkup.stree.txt |   73 +
 ...aractersThatAreValidIdentifiers.cspans.txt |    4 +
 ...haractersThatAreValidIdentifiers.stree.txt |   14 +
 ...xpressionTerminatedByWhitespace.cspans.txt |    4 +
 ...ExpressionTerminatedByWhitespace.stree.txt |   15 +
 ...udeDotAtEOFInImplicitExpression.cspans.txt |    4 +
 ...ludeDotAtEOFInImplicitExpression.stree.txt |   16 +
 ...idIdentifierCharInImplicitExpr1.cspans.txt |    4 +
 ...lidIdentifierCharInImplicitExpr1.stree.txt |   16 +
 ...idIdentifierCharInImplicitExpr2.cspans.txt |    5 +
 ...lidIdentifierCharInImplicitExpr2.stree.txt |   22 +
 ...DoesNotIncludeSemicolonAfterDot.cspans.txt |    4 +
 .../DoesNotIncludeSemicolonAfterDot.stree.txt |   16 +
 ...micolonAtEndOfDottedIdentifiers.cspans.txt |    4 +
 ...emicolonAtEndOfDottedIdentifiers.stree.txt |   18 +
 ...AtEndOfSimpleImplicitExpression.cspans.txt |    4 +
 ...nAtEndOfSimpleImplicitExpression.stree.txt |   14 +
 .../NestedImplicitExpression.cspans.txt       |    4 +
 .../NestedImplicitExpression.stree.txt        |   20 +
 ...IfModuleTokenNotFollowedByBrace.cspans.txt |    4 +
 ...nIfModuleTokenNotFollowedByBrace.stree.txt |   18 +
 ...eSpanIfEOFOccursAfterTransition.cspans.txt |    4 +
 ...odeSpanIfEOFOccursAfterTransition.diag.txt |    1 +
 ...deSpanIfEOFOccursAfterTransition.stree.txt |   14 +
 ...validCharacterFollowsTransition.cspans.txt |    4 +
 ...InvalidCharacterFollowsTransition.diag.txt |    1 +
 ...nvalidCharacterFollowsTransition.stree.txt |   14 +
 ...IdentifiersAsImplicitExpression.cspans.txt |    4 +
 ...dIdentifiersAsImplicitExpression.stree.txt |   18 +
 ...atorImplicitExpression_Bracket1.cspans.txt |    4 +
 ...ratorImplicitExpression_Bracket1.stree.txt |   16 +
 ...torImplicitExpression_Bracket10.cspans.txt |    4 +
 ...atorImplicitExpression_Bracket10.stree.txt |   19 +
 ...torImplicitExpression_Bracket11.cspans.txt |    3 +
 ...ratorImplicitExpression_Bracket11.diag.txt |    1 +
 ...atorImplicitExpression_Bracket11.stree.txt |   19 +
 ...torImplicitExpression_Bracket12.cspans.txt |    4 +
 ...atorImplicitExpression_Bracket12.stree.txt |   22 +
 ...torImplicitExpression_Bracket13.cspans.txt |    4 +
 ...atorImplicitExpression_Bracket13.stree.txt |   25 +
 ...torImplicitExpression_Bracket14.cspans.txt |    4 +
 ...atorImplicitExpression_Bracket14.stree.txt |   24 +
 ...torImplicitExpression_Bracket15.cspans.txt |    4 +
 ...atorImplicitExpression_Bracket15.stree.txt |   22 +
 ...torImplicitExpression_Bracket16.cspans.txt |    4 +
 ...atorImplicitExpression_Bracket16.stree.txt |   26 +
 ...atorImplicitExpression_Bracket2.cspans.txt |    4 +
 ...ratorImplicitExpression_Bracket2.stree.txt |   17 +
 ...atorImplicitExpression_Bracket3.cspans.txt |    3 +
 ...eratorImplicitExpression_Bracket3.diag.txt |    1 +
 ...ratorImplicitExpression_Bracket3.stree.txt |   14 +
 ...atorImplicitExpression_Bracket4.cspans.txt |    4 +
 ...ratorImplicitExpression_Bracket4.stree.txt |   15 +
 ...atorImplicitExpression_Bracket5.cspans.txt |    3 +
 ...eratorImplicitExpression_Bracket5.diag.txt |    1 +
 ...ratorImplicitExpression_Bracket5.stree.txt |   15 +
 ...atorImplicitExpression_Bracket6.cspans.txt |    4 +
 ...ratorImplicitExpression_Bracket6.stree.txt |   18 +
 ...atorImplicitExpression_Bracket7.cspans.txt |    4 +
 ...eratorImplicitExpression_Bracket7.diag.txt |    1 +
 ...ratorImplicitExpression_Bracket7.stree.txt |   19 +
 ...atorImplicitExpression_Bracket8.cspans.txt |    4 +
 ...eratorImplicitExpression_Bracket8.diag.txt |    1 +
 ...ratorImplicitExpression_Bracket8.stree.txt |   21 +
 ...atorImplicitExpression_Bracket9.cspans.txt |    5 +
 ...ratorImplicitExpression_Bracket9.stree.txt |   22 +
 ...OperatorImplicitExpression_Dot1.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot1.stree.txt |   14 +
 ...peratorImplicitExpression_Dot10.cspans.txt |    4 +
 ...OperatorImplicitExpression_Dot10.stree.txt |   20 +
 ...peratorImplicitExpression_Dot11.cspans.txt |    5 +
 ...OperatorImplicitExpression_Dot11.stree.txt |   21 +
 ...peratorImplicitExpression_Dot12.cspans.txt |    4 +
 ...OperatorImplicitExpression_Dot12.stree.txt |   25 +
 ...peratorImplicitExpression_Dot13.cspans.txt |    4 +
 ...OperatorImplicitExpression_Dot13.stree.txt |   23 +
 ...peratorImplicitExpression_Dot14.cspans.txt |    4 +
 ...OperatorImplicitExpression_Dot14.stree.txt |   27 +
 ...OperatorImplicitExpression_Dot2.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot2.stree.txt |   15 +
 ...OperatorImplicitExpression_Dot3.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot3.stree.txt |   16 +
 ...OperatorImplicitExpression_Dot4.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot4.stree.txt |   15 +
 ...OperatorImplicitExpression_Dot5.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot5.stree.txt |   16 +
 ...OperatorImplicitExpression_Dot6.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot6.stree.txt |   16 +
 ...OperatorImplicitExpression_Dot7.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot7.stree.txt |   16 +
 ...OperatorImplicitExpression_Dot8.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot8.stree.txt |   19 +
 ...OperatorImplicitExpression_Dot9.cspans.txt |    4 +
 ...lOperatorImplicitExpression_Dot9.stree.txt |   17 +
 ...eIdentifierAsImplicitExpression.cspans.txt |    4 +
 ...leIdentifierAsImplicitExpression.stree.txt |   14 +
 ...alancesThemInImplicitExpression.cspans.txt |    4 +
 ...BalancesThemInImplicitExpression.stree.txt |   34 +
 ...alancesThemInImplicitExpression.cspans.txt |    4 +
 ...BalancesThemInImplicitExpression.stree.txt |   72 +
 .../StopsBalancingParenthesesAtEOF.cspans.txt |    3 +
 .../StopsBalancingParenthesesAtEOF.diag.txt   |    1 +
 .../StopsBalancingParenthesesAtEOF.stree.txt  |   15 +
 ...ithinComplexImplicitExpressions.cspans.txt |    4 +
 ...WithinComplexImplicitExpressions.stree.txt |   48 +
 ...lowedByDotOrParenInImplicitExpr.cspans.txt |    4 +
 ...llowedByDotOrParenInImplicitExpr.stree.txt |   20 +
 ...otFollowedByIdentifierStartChar.cspans.txt |    4 +
 ...NotFollowedByIdentifierStartChar.stree.txt |   20 +
 ...sImplicitExpressionAtHtmlEndTag.cspans.txt |    5 +
 ...esImplicitExpressionAtHtmlEndTag.stree.txt |   26 +
 ...mplicitExpressionAtHtmlStartTag.cspans.txt |    5 +
 ...ImplicitExpressionAtHtmlStartTag.stree.txt |   25 +
 ...dPointIfDotFollowedByWhitespace.cspans.txt |    4 +
 ...idPointIfDotFollowedByWhitespace.stree.txt |   18 +
 ...oseParenFollowedByAnyWhiteSpace.cspans.txt |    4 +
 ...loseParenFollowedByAnyWhiteSpace.stree.txt |   19 +
 ...entifierFollowedByAnyWhiteSpace.cspans.txt |    4 +
 ...dentifierFollowedByAnyWhiteSpace.stree.txt |   17 +
 .../NestedCodeBlock.cspans.txt                |    4 +
 .../NestedCodeBlock.stree.txt                 |   35 +
 .../NestedExplicitExpression.cspans.txt       |    9 +
 .../NestedExplicitExpression.stree.txt        |   32 +
 .../NestedImplicitExpression.cspans.txt       |    7 +
 .../NestedImplicitExpression.stree.txt        |   28 +
 .../NestedKeywordStatement.cspans.txt         |    4 +
 .../NestedKeywordStatement.stree.txt          |   49 +
 .../NestedMarkupBlock.cspans.txt              |   10 +
 .../NestedMarkupBlock.stree.txt               |   35 +
 .../NestedSimpleStatement.cspans.txt          |    4 +
 .../NestedSimpleStatement.stree.txt           |   23 +
 .../EmptyRazorComment.cspans.txt              |    7 +
 .../EmptyRazorComment.stree.txt               |   12 +
 .../MultipleRazorCommentInMarkup.cspans.txt   |   16 +
 .../MultipleRazorCommentInMarkup.stree.txt    |   33 +
 ...RazorCommentsInSameLineInMarkup.cspans.txt |   16 +
 ...eRazorCommentsInSameLineInMarkup.stree.txt |   32 +
 ...ommentBetweenCodeBlockAndMarkup.cspans.txt |   15 +
 ...CommentBetweenCodeBlockAndMarkup.stree.txt |   38 +
 .../RazorCommentInClosingTagBlock.cspans.txt  |    8 +
 .../RazorCommentInClosingTagBlock.stree.txt   |   23 +
 ...tInImplicitExpressionMethodCall.cspans.txt |    9 +
 ...entInImplicitExpressionMethodCall.diag.txt |    1 +
 ...ntInImplicitExpressionMethodCall.stree.txt |   22 +
 .../RazorCommentInMarkup.cspans.txt           |    9 +
 .../RazorCommentInMarkup.stree.txt            |   22 +
 .../RazorCommentInOpeningTagBlock.cspans.txt  |    8 +
 .../RazorCommentInOpeningTagBlock.stree.txt   |   21 +
 .../RazorCommentInVerbatimBlock.cspans.txt    |   14 +
 .../RazorCommentInVerbatimBlock.diag.txt      |    3 +
 .../RazorCommentInVerbatimBlock.stree.txt     |   37 +
 ...CommentWithExtraNewLineInMarkup.cspans.txt |   16 +
 ...rCommentWithExtraNewLineInMarkup.stree.txt |   33 +
 .../RazorCommentsSurroundingMarkup.cspans.txt |   15 +
 .../RazorCommentsSurroundingMarkup.stree.txt  |   32 +
 .../RazorMultilineCommentInBlock.cspans.txt   |   12 +
 .../RazorMultilineCommentInBlock.stree.txt    |   27 +
 .../UnterminatedRazorComment.cspans.txt       |    4 +
 .../UnterminatedRazorComment.diag.txt         |    1 +
 .../UnterminatedRazorComment.stree.txt        |   10 +
 ...tInImplicitExpressionMethodCall.cspans.txt |    6 +
 ...entInImplicitExpressionMethodCall.diag.txt |    2 +
 ...ntInImplicitExpressionMethodCall.stree.txt |   19 +
 ...atedRazorCommentInVerbatimBlock.cspans.txt |    7 +
 ...inatedRazorCommentInVerbatimBlock.diag.txt |    2 +
 ...natedRazorCommentInVerbatimBlock.stree.txt |   22 +
 .../ReservedWord.cspans.txt                   |    4 +
 .../ReservedWord.diag.txt                     |    1 +
 .../ReservedWord.stree.txt                    |   13 +
 .../ReservedWordIsCaseSensitive.cspans.txt    |    4 +
 .../ReservedWordIsCaseSensitive.stree.txt     |   14 +
 ...ceMultipleLinesBelowSectionName.cspans.txt |   14 +
 ...aceMultipleLinesBelowSectionName.stree.txt |   47 +
 .../AllowsBracesInCSharpExpression.cspans.txt |   15 +
 .../AllowsBracesInCSharpExpression.stree.txt  |   65 +
 .../BalancesBraces.cspans.txt                 |   14 +
 .../BalancesBraces.stree.txt                  |   51 +
 ...uresNewlineImmediatelyFollowing.cspans.txt |    5 +
 ...turesNewlineImmediatelyFollowing.stree.txt |   16 +
 ...neInSectionStatementMissingName.cspans.txt |    6 +
 ...ineInSectionStatementMissingName.stree.txt |   19 +
 ...ectionStatementMissingOpenBrace.cspans.txt |    7 +
 ...SectionStatementMissingOpenBrace.stree.txt |   22 +
 .../CommentRecoversFromUnclosedTag.cspans.txt |   15 +
 .../CommentRecoversFromUnclosedTag.stree.txt  |   52 +
 ...seBraceImmediatelyFollowsMarkup.cspans.txt |   10 +
 ...oseBraceImmediatelyFollowsMarkup.stree.txt |   27 +
 ...eBetweenSectionNameAndOpenBrace.cspans.txt |   13 +
 ...ceBetweenSectionNameAndOpenBrace.stree.txt |   39 +
 .../HandlesEOFAfterOpenBrace.cspans.txt       |    8 +
 .../HandlesEOFAfterOpenBrace.stree.txt        |   25 +
 .../HandlesEOFAfterOpenContent1.cspans.txt    |    8 +
 .../HandlesEOFAfterOpenContent1.stree.txt     |   25 +
 .../HandlesEOFAfterOpenContent2.cspans.txt    |    8 +
 .../HandlesEOFAfterOpenContent2.stree.txt     |   25 +
 .../HandlesEOFAfterOpenContent3.cspans.txt    |    8 +
 .../HandlesEOFAfterOpenContent3.stree.txt     |   25 +
 .../HandlesEOFAfterOpenContent4.cspans.txt    |    8 +
 .../HandlesEOFAfterOpenContent4.stree.txt     |   27 +
 .../HandlesUnterminatedSection.cspans.txt     |   11 +
 .../HandlesUnterminatedSection.stree.txt      |   39 +
 ...UnterminatedSectionWithNestedIf.cspans.txt |   17 +
 ...sUnterminatedSectionWithNestedIf.stree.txt |   61 +
 ...gnoresSectionUnlessAllLowerCase.cspans.txt |    4 +
 ...IgnoresSectionUnlessAllLowerCase.stree.txt |   15 +
 ...utputErrorOtherNestedDirectives.cspans.txt |   16 +
 ...OutputErrorOtherNestedDirectives.stree.txt |   43 +
 ...tsErrorOnMultipleNestedSections.cspans.txt |   32 +
 ...utsErrorOnMultipleNestedSections.stree.txt |   87 +
 ...serOutputsErrorOnNestedSections.cspans.txt |   23 +
 ...rserOutputsErrorOnNestedSections.stree.txt |   64 +
 .../ParsesComment.cspans.txt                  |   13 +
 .../CSharpSectionTest/ParsesComment.stree.txt |   37 +
 .../ParsesCommentWithDelimiters.cspans.txt    |   13 +
 .../ParsesCommentWithDelimiters.stree.txt     |   42 +
 .../ParsesNamedSectionCorrectly.cspans.txt    |   14 +
 .../ParsesNamedSectionCorrectly.stree.txt     |   41 +
 .../ParsesXmlProcessingInstruction.cspans.txt |   10 +
 .../ParsesXmlProcessingInstruction.stree.txt  |   36 +
 ...IfSectionNotFollowedByOpenBrace.cspans.txt |    7 +
 ...LIfSectionNotFollowedByOpenBrace.stree.txt |   21 +
 ...otFollowedByIdentifierStartChar.cspans.txt |    9 +
 ...NotFollowedByIdentifierStartChar.stree.txt |   34 +
 ...ockIfNameNotFollowedByOpenBrace.cspans.txt |   10 +
 ...lockIfNameNotFollowedByOpenBrace.stree.txt |   36 +
 ...aceFollowsCodeBlockNoWhitespace.cspans.txt |   12 +
 ...raceFollowsCodeBlockNoWhitespace.stree.txt |   39 +
 ...raceImmediatelyFollowsCodeBlock.cspans.txt |   12 +
 ...BraceImmediatelyFollowsCodeBlock.stree.txt |   40 +
 .../_WithDoubleTransition1.cspans.txt         |   15 +
 .../_WithDoubleTransition1.stree.txt          |   50 +
 .../_WithDoubleTransition2.cspans.txt         |   17 +
 .../_WithDoubleTransition2.stree.txt          |   63 +
 ...IsBraceAndReturnsSpanOfTypeCode.cspans.txt |    6 +
 ...rIsBraceAndReturnsSpanOfTypeCode.stree.txt |   37 +
 ...IsParenAndReturnsSpanOfTypeExpr.cspans.txt |    6 +
 ...rIsParenAndReturnsSpanOfTypeExpr.stree.txt |   37 +
 ...mportInsideCodeBlockCausesError.cspans.txt |    6 +
 ...ImportInsideCodeBlockCausesError.stree.txt |   36 +
 ...ntInCodeBlockIsHandledCorrectly.cspans.txt |    6 +
 ...entInCodeBlockIsHandledCorrectly.stree.txt |   37 +
 ...eBlockIgnoresSingleSlashAtStart.cspans.txt |    4 +
 ...rseBlockIgnoresSingleSlashAtStart.diag.txt |    1 +
 ...seBlockIgnoresSingleSlashAtStart.stree.txt |   16 +
 ...tesSingleLineCommentAtEndOfLine.cspans.txt |    9 +
 ...atesSingleLineCommentAtEndOfLine.stree.txt |   43 +
 ...eCodeBlockIsNotHandledSpecially.cspans.txt |    6 +
 ...deCodeBlockIsNotHandledSpecially.stree.txt |   38 +
 .../AwaitForEachStatement.cspans.txt          |    4 +
 .../AwaitForEachStatement.stree.txt           |   31 +
 .../CatchClause.cspans.txt                    |    3 +
 .../CSharpStatementTest/CatchClause.stree.txt |   50 +
 .../DoStatement.cspans.txt                    |    4 +
 .../CSharpStatementTest/DoStatement.stree.txt |   26 +
 .../CSharpStatementTest/ElseClause.cspans.txt |    4 +
 .../CSharpStatementTest/ElseClause.stree.txt  |   34 +
 .../ElseIfClause.cspans.txt                   |    3 +
 .../ElseIfClause.stree.txt                    |   54 +
 ...ror_TryCatchWhen_InCompleteBody.cspans.txt |    3 +
 ...Error_TryCatchWhen_InCompleteBody.diag.txt |    1 +
 ...rror_TryCatchWhen_InCompleteBody.stree.txt |   31 +
 ...ryCatchWhen_InCompleteCondition.cspans.txt |    3 +
 ..._TryCatchWhen_InCompleteCondition.diag.txt |    1 +
 ...TryCatchWhen_InCompleteCondition.stree.txt |   27 +
 ...er_IncompleteTryCatchNoBodyWhen.cspans.txt |    3 +
 ...ter_IncompleteTryCatchNoBodyWhen.stree.txt |   34 +
 ...onFilter_IncompleteTryCatchWhen.cspans.txt |    3 +
 ...ionFilter_IncompleteTryCatchWhen.stree.txt |   25 +
 ..._IncompleteTryCatchWhenNoBodies.cspans.txt |    3 +
 ...r_IncompleteTryCatchWhenNoBodies.stree.txt |   29 +
 ...ceptionFilter_IncompleteTryWhen.cspans.txt |    4 +
 ...xceptionFilter_IncompleteTryWhen.stree.txt |   21 +
 .../ExceptionFilter_MultiLine.cspans.txt      |    3 +
 .../ExceptionFilter_MultiLine.stree.txt       |   58 +
 ...eptionFilter_NestedTryCatchWhen.cspans.txt |    6 +
 ...ceptionFilter_NestedTryCatchWhen.stree.txt |   47 +
 ...henCatchWhenComplete_SingleLine.cspans.txt |    3 +
 ...WhenCatchWhenComplete_SingleLine.stree.txt |   58 +
 ...TryCatchWhenComplete_SingleLine.cspans.txt |    3 +
 ..._TryCatchWhenComplete_SingleLine.stree.txt |   38 +
 ...hWhenFinallyComplete_SingleLine.cspans.txt |    4 +
 ...chWhenFinallyComplete_SingleLine.stree.txt |   51 +
 .../FinallyClause.cspans.txt                  |    4 +
 .../FinallyClause.stree.txt                   |   31 +
 .../ForEachStatement.cspans.txt               |    4 +
 .../ForEachStatement.stree.txt                |   29 +
 .../ForStatement.cspans.txt                   |    4 +
 .../ForStatement.stree.txt                    |   40 +
 .../IfStatement.cspans.txt                    |    3 +
 .../CSharpStatementTest/IfStatement.stree.txt |   21 +
 .../LockStatement.cspans.txt                  |    4 +
 .../LockStatement.stree.txt                   |   23 +
 .../MalformedAwaitForEachStatement.cspans.txt |    3 +
 .../MalformedAwaitForEachStatement.diag.txt   |    1 +
 .../MalformedAwaitForEachStatement.stree.txt  |   27 +
 ...wordTreatedAsImplicitExpression.cspans.txt |    4 +
 ...ywordTreatedAsImplicitExpression.stree.txt |   15 +
 .../StaticUsing_Complete_Spaced.cspans.txt    |    4 +
 .../StaticUsing_Complete_Spaced.stree.txt     |   21 +
 .../StaticUsing_GlobalPrefix.cspans.txt       |    4 +
 .../StaticUsing_GlobalPrefix.stree.txt        |   21 +
 ...StaticUsing_MultipleIdentifiers.cspans.txt |    4 +
 .../StaticUsing_MultipleIdentifiers.stree.txt |   19 +
 .../StaticUsing_NoUsing.cspans.txt            |    4 +
 .../StaticUsing_NoUsing.stree.txt             |   15 +
 .../StaticUsing_SingleIdentifier.cspans.txt   |    4 +
 .../StaticUsing_SingleIdentifier.stree.txt    |   17 +
 .../SwitchStatement.cspans.txt                |    4 +
 .../SwitchStatement.stree.txt                 |   23 +
 .../TryStatement.cspans.txt                   |    3 +
 .../TryStatement.stree.txt                    |   18 +
 .../UsingNamespaceImport.cspans.txt           |    4 +
 .../UsingNamespaceImport.stree.txt            |   21 +
 .../UsingStatement.cspans.txt                 |    4 +
 .../UsingStatement.stree.txt                  |   35 +
 .../UsingTypeAlias.cspans.txt                 |    4 +
 .../UsingTypeAlias.stree.txt                  |   31 +
 ...ing_VariableDeclaration_Complex.cspans.txt |    6 +
 ...sing_VariableDeclaration_Complex.stree.txt |   61 +
 ...sing_VariableDeclaration_Simple.cspans.txt |    6 +
 ...Using_VariableDeclaration_Simple.stree.txt |   29 +
 .../WhileStatement.cspans.txt                 |    4 +
 .../WhileStatement.stree.txt                  |   23 +
 ...plateInExplicitExpressionParens.cspans.txt |   13 +
 ...mplateInExplicitExpressionParens.stree.txt |   52 +
 ...plateInImplicitExpressionParens.cspans.txt |   11 +
 ...mplateInImplicitExpressionParens.stree.txt |   48 +
 ...plateInStatementWithinCodeBlock.cspans.txt |   11 +
 ...mplateInStatementWithinCodeBlock.stree.txt |   59 +
 ...InStatementWithinStatementBlock.cspans.txt |   13 +
 ...eInStatementWithinStatementBlock.stree.txt |   64 +
 ...mediatelyFollowingStatementChar.cspans.txt |   10 +
 ...mmediatelyFollowingStatementChar.stree.txt |   30 +
 .../HandlesSingleLineTemplate.cspans.txt      |   10 +
 .../HandlesSingleLineTemplate.stree.txt       |   37 +
 ...latesInImplicitExpressionParens.cspans.txt |   18 +
 ...platesInImplicitExpressionParens.stree.txt |   77 +
 ...latesInStatementWithinCodeBlock.cspans.txt |   18 +
 ...platesInStatementWithinCodeBlock.stree.txt |   88 +
 ...InStatementWithinStatementBlock.cspans.txt |   20 +
 ...sInStatementWithinStatementBlock.stree.txt |   93 +
 ...tedTemplateInImplicitExprParens.cspans.txt |   18 +
 ...estedTemplateInImplicitExprParens.diag.txt |    1 +
 ...stedTemplateInImplicitExprParens.stree.txt |   80 +
 ...edTemplateInStmtWithinCodeBlock.cspans.txt |   18 +
 ...stedTemplateInStmtWithinCodeBlock.diag.txt |    1 +
 ...tedTemplateInStmtWithinCodeBlock.stree.txt |   91 +
 ...edTemplateInStmtWithinStmtBlock.cspans.txt |   20 +
 ...stedTemplateInStmtWithinStmtBlock.diag.txt |    1 +
 ...tedTemplateInStmtWithinStmtBlock.stree.txt |   96 +
 ...thDoubleTransition_DoesNotThrow.cspans.txt |   18 +
 ...ithDoubleTransition_DoesNotThrow.stree.txt |   80 +
 .../AllowsMarkupInIfBodyWithBraces.cspans.txt |   22 +
 .../AllowsMarkupInIfBodyWithBraces.stree.txt  |   86 +
 ...IfBodyWithBracesWithinCodeBlock.cspans.txt |   24 +
 ...nIfBodyWithBracesWithinCodeBlock.stree.txt |   95 +
 ...rnsFromMarkupBlockWithPseudoTag.cspans.txt |    7 +
 ...urnsFromMarkupBlockWithPseudoTag.stree.txt |   36 +
 ...upBlockWithPseudoTagInCodeBlock.cspans.txt |   10 +
 ...kupBlockWithPseudoTagInCodeBlock.stree.txt |   47 +
 ...neToMarkupExclPreceedingNewline.cspans.txt |   17 +
 ...ineToMarkupExclPreceedingNewline.stree.txt |   82 +
 ...plateTransitionInDesignTimeMode.cspans.txt |    8 +
 ...mplateTransitionInDesignTimeMode.stree.txt |   36 +
 ...ColonTransitionInDesignTimeMode.cspans.txt |   10 +
 ...tColonTransitionInDesignTimeMode.stree.txt |   37 +
 ...plateTransitionInDesignTimeMode.cspans.txt |    9 +
 ...mplateTransitionInDesignTimeMode.stree.txt |   35 +
 ...AtTagTransitionInDesignTimeMode.cspans.txt |   11 +
 ...idAtTagTransitionInDesignTimeMode.diag.txt |    5 +
 ...dAtTagTransitionInDesignTimeMode.stree.txt |   37 +
 ...OnTagTransitionInDesignTimeMode.cspans.txt |   10 +
 ...eOnTagTransitionInDesignTimeMode.stree.txt |   35 +
 ...rkupStatementOnOpenAngleBracket.cspans.txt |   10 +
 ...arkupStatementOnOpenAngleBracket.stree.txt |   52 +
 ...ntOnOpenAngleBracketInCodeBlock.cspans.txt |   12 +
 ...entOnOpenAngleBracketInCodeBlock.stree.txt |   61 +
 ...nSwitchCharacterFollowedByColon.cspans.txt |    9 +
 ...OnSwitchCharacterFollowedByColon.stree.txt |   29 +
 ...acterFollowedByColonInCodeBlock.cspans.txt |   11 +
 ...racterFollowedByColonInCodeBlock.stree.txt |   38 +
 ...hCharacterFollowedByDoubleColon.cspans.txt |    8 +
 ...chCharacterFollowedByDoubleColon.stree.txt |   26 +
 ...hCharacterFollowedByTripleColon.cspans.txt |    8 +
 ...chCharacterFollowedByTripleColon.stree.txt |   26 +
 ...rkupWithoutPreceedingWhitespace.cspans.txt |   17 +
 ...arkupWithoutPreceedingWhitespace.stree.txt |   66 +
 ...eMarkupContainingStatementBlock.cspans.txt |   13 +
 ...neMarkupContainingStatementBlock.stree.txt |   43 +
 ...eSwitchIfOuterBlockIsTerminated.cspans.txt |    6 +
 ...seSwitchIfOuterBlockIsTerminated.stree.txt |   21 +
 ...indsOfImplicitMarkupInCodeBlock.cspans.txt |   23 +
 ...KindsOfImplicitMarkupInCodeBlock.stree.txt |  134 +
 ...nCaseAndDefaultBranchesOfSwitch.cspans.txt |   33 +
 ...InCaseAndDefaultBranchesOfSwitch.stree.txt |  143 +
 ...aultBranchesOfSwitchInCodeBlock.cspans.txt |   35 +
 ...faultBranchesOfSwitchInCodeBlock.stree.txt |  152 +
 ...TrailingNewlineInDesignTimeMode.cspans.txt |    9 +
 ...sTrailingNewlineInDesignTimeMode.stree.txt |   29 +
 ...icitExprDoesNotAcceptDotAfterAt.cspans.txt |    9 +
 ...plicitExprDoesNotAcceptDotAfterAt.diag.txt |    1 +
 ...licitExprDoesNotAcceptDotAfterAt.stree.txt |   28 +
 ...eptTrailingNewlineInRunTimeMode.cspans.txt |    9 +
 ...ceptTrailingNewlineInRunTimeMode.stree.txt |   29 +
 ...ingleSpaceOrNewlineAtDesignTime.cspans.txt |    9 +
 ...sSingleSpaceOrNewlineAtDesignTime.diag.txt |    1 +
 ...SingleSpaceOrNewlineAtDesignTime.stree.txt |   29 +
 ...ngleAtOutputsZeroLengthCodeSpan.cspans.txt |    9 +
 ...SingleAtOutputsZeroLengthCodeSpan.diag.txt |    1 +
 ...ingleAtOutputsZeroLengthCodeSpan.stree.txt |   28 +
 .../VerbatimBlock.cspans.txt                  |    6 +
 .../VerbatimBlock.stree.txt                   |   23 +
 ...eIfTheyAreSignificantToAncestor.cspans.txt |   12 +
 ...neIfTheyAreSignificantToAncestor.stree.txt |   40 +
 ...isabledForDataAttributesInBlock.cspans.txt |   13 +
 ...DisabledForDataAttributesInBlock.stree.txt |   48 +
 ...bledForDataAttributesInDocument.cspans.txt |   13 +
 ...abledForDataAttributesInDocument.stree.txt |   48 +
 ...aAttributesWithExperimentalFlag.cspans.txt |   13 +
 ...taAttributesWithExperimentalFlag.stree.txt |   50 +
 ...isabledForDataAttributesInBlock.cspans.txt |   13 +
 ...DisabledForDataAttributesInBlock.stree.txt |   51 +
 ...bledForDataAttributesInDocument.cspans.txt |   12 +
 ...abledForDataAttributesInDocument.stree.txt |   47 +
 .../DoubleQuotedLiteralAttribute.cspans.txt   |   13 +
 .../DoubleQuotedLiteralAttribute.stree.txt    |   52 +
 ...WithWhitespaceSurroundingEquals.cspans.txt |   12 +
 ...eWithWhitespaceSurroundingEquals.stree.txt |   54 +
 .../MultiPartLiteralAttribute.cspans.txt      |   13 +
 .../MultiPartLiteralAttribute.stree.txt       |   52 +
 .../MultiValueExpressionAttribute.cspans.txt  |   16 +
 .../MultiValueExpressionAttribute.stree.txt   |   66 +
 .../NewLineBetweenAttributes.cspans.txt       |   14 +
 .../NewLineBetweenAttributes.stree.txt        |   56 +
 .../NewLinePrecedingAttribute.cspans.txt      |   11 +
 .../NewLinePrecedingAttribute.stree.txt       |   42 +
 .../SimpleExpressionAttribute.cspans.txt      |   12 +
 .../SimpleExpressionAttribute.stree.txt       |   49 +
 .../SimpleLiteralAttribute.cspans.txt         |   11 +
 .../SimpleLiteralAttribute.stree.txt          |   42 +
 ...WithWhitespaceSurroundingEquals.cspans.txt |   11 +
 ...eWithWhitespaceSurroundingEquals.stree.txt |   47 +
 .../SymbolBoundAttributes1.cspans.txt         |   11 +
 .../SymbolBoundAttributes1.stree.txt          |   44 +
 .../SymbolBoundAttributes2.cspans.txt         |   11 +
 .../SymbolBoundAttributes2.stree.txt          |   43 +
 .../SymbolBoundAttributes3.cspans.txt         |   11 +
 .../SymbolBoundAttributes3.stree.txt          |   42 +
 .../SymbolBoundAttributes4.cspans.txt         |   11 +
 .../SymbolBoundAttributes4.stree.txt          |   42 +
 .../SymbolBoundAttributes5.cspans.txt         |   11 +
 .../SymbolBoundAttributes5.stree.txt          |   42 +
 .../SymbolBoundAttributes6.cspans.txt         |   11 +
 .../SymbolBoundAttributes6.stree.txt          |   42 +
 ...tributes_BeforeEqualWhitespace1.cspans.txt |   14 +
 ...ttributes_BeforeEqualWhitespace1.stree.txt |   63 +
 ...tributes_BeforeEqualWhitespace2.cspans.txt |   14 +
 ...ttributes_BeforeEqualWhitespace2.stree.txt |   61 +
 ...tributes_BeforeEqualWhitespace3.cspans.txt |   14 +
 ...ttributes_BeforeEqualWhitespace3.stree.txt |   59 +
 ...tributes_BeforeEqualWhitespace4.cspans.txt |   14 +
 ...ttributes_BeforeEqualWhitespace4.stree.txt |   59 +
 ...tributes_BeforeEqualWhitespace5.cspans.txt |   14 +
 ...ttributes_BeforeEqualWhitespace5.stree.txt |   59 +
 ...tributes_BeforeEqualWhitespace6.cspans.txt |   14 +
 ...ttributes_BeforeEqualWhitespace6.stree.txt |   59 +
 ...mbolBoundAttributes_Whitespace1.cspans.txt |   14 +
 ...ymbolBoundAttributes_Whitespace1.stree.txt |   63 +
 ...mbolBoundAttributes_Whitespace2.cspans.txt |   14 +
 ...ymbolBoundAttributes_Whitespace2.stree.txt |   61 +
 ...mbolBoundAttributes_Whitespace3.cspans.txt |   14 +
 ...ymbolBoundAttributes_Whitespace3.stree.txt |   59 +
 ...mbolBoundAttributes_Whitespace4.cspans.txt |   14 +
 ...ymbolBoundAttributes_Whitespace4.stree.txt |   59 +
 ...mbolBoundAttributes_Whitespace5.cspans.txt |   14 +
 ...ymbolBoundAttributes_Whitespace5.stree.txt |   59 +
 ...mbolBoundAttributes_Whitespace6.cspans.txt |   14 +
 ...ymbolBoundAttributes_Whitespace6.stree.txt |   59 +
 ...ributeWithCodeWithSpacesInBlock.cspans.txt |   11 +
 ...tributeWithCodeWithSpacesInBlock.stree.txt |   45 +
 ...uteWithCodeWithSpacesInDocument.cspans.txt |    6 +
 ...buteWithCodeWithSpacesInDocument.stree.txt |   30 +
 .../UnquotedLiteralAttribute.cspans.txt       |   12 +
 .../UnquotedLiteralAttribute.stree.txt        |   48 +
 ...esWorkWithConditionalAttributes.cspans.txt |   13 +
 ...tesWorkWithConditionalAttributes.stree.txt |   58 +
 ...aceAndNewLinePrecedingAttribute.cspans.txt |   11 +
 ...paceAndNewLinePrecedingAttribute.stree.txt |   43 +
 .../AcceptsEmptyTextTag.cspans.txt            |    7 +
 .../AcceptsEmptyTextTag.stree.txt             |   25 +
 ...xtTagAsOuterTagButDoesNotRender.cspans.txt |   11 +
 ...extTagAsOuterTagButDoesNotRender.stree.txt |   43 +
 ...tInAttributeValueIfDoubleQuoted.cspans.txt |   13 +
 ...etInAttributeValueIfDoubleQuoted.stree.txt |   52 +
 ...tInAttributeValueIfSingleQuoted.cspans.txt |   13 +
 ...etInAttributeValueIfSingleQuoted.stree.txt |   52 +
 ...hInAttributeValueIfDoubleQuoted.cspans.txt |   14 +
 ...shInAttributeValueIfDoubleQuoted.stree.txt |   53 +
 ...hInAttributeValueIfSingleQuoted.cspans.txt |   14 +
 ...shInAttributeValueIfSingleQuoted.stree.txt |   53 +
 ...wsStartAndEndTagsToDifferInCase.cspans.txt |   11 +
 ...owsStartAndEndTagsToDifferInCase.stree.txt |   41 +
 ...sItCanRecoverToAnExpectedEndTag.cspans.txt |   10 +
 ...AsItCanRecoverToAnExpectedEndTag.stree.txt |   39 +
 ...andleSelfClosingTagsWithinBlock.cspans.txt |    9 +
 ...HandleSelfClosingTagsWithinBlock.stree.txt |   38 +
 ...neOfMarkupWithEmbeddedStatement.cspans.txt |   12 +
 ...ineOfMarkupWithEmbeddedStatement.stree.txt |   46 +
 ...siderPsuedoTagWithinMarkupBlock.cspans.txt |   11 +
 ...nsiderPsuedoTagWithinMarkupBlock.stree.txt |   44 +
 ...leUnlessPreceededByQuestionMark.cspans.txt |    9 +
 ...gleUnlessPreceededByQuestionMark.stree.txt |   42 +
 ...sForwardSlashInAttributeContent.cspans.txt |   10 +
 ...esForwardSlashInAttributeContent.stree.txt |   44 +
 .../HandlesOpenAngleAtEof.cspans.txt          |    5 +
 .../HandlesOpenAngleAtEof.diag.txt            |    2 +
 .../HandlesOpenAngleAtEof.stree.txt           |   22 +
 ...enAngleWithProperTagFollowingIt.cspans.txt |    7 +
 ...OpenAngleWithProperTagFollowingIt.diag.txt |    3 +
 ...penAngleWithProperTagFollowingIt.stree.txt |   34 +
 ...nbalancedTripleDashHTMLComments.cspans.txt |   12 +
 ...UnbalancedTripleDashHTMLComments.stree.txt |   56 +
 ...mlCommentSupportsMultipleDashes.cspans.txt |   24 +
 ...tmlCommentSupportsMultipleDashes.stree.txt |  130 +
 ...gnoresTagsInContentsOfScriptTag.cspans.txt |   12 +
 ...IgnoresTagsInContentsOfScriptTag.stree.txt |   48 +
 ...minatesCommentOnFullEndSequence.cspans.txt |    9 +
 ...rminatesCommentOnFullEndSequence.stree.txt |   36 +
 ...ParsesSGMLDeclarationAsEmptyTag.cspans.txt |    9 +
 .../ParsesSGMLDeclarationAsEmptyTag.stree.txt |   40 +
 ...onWhitespaceCharacterIsStartTag.cspans.txt |   12 +
 ...NonWhitespaceCharacterIsStartTag.stree.txt |   49 +
 ...ProcessingInstructionAsEmptyTag.cspans.txt |    9 +
 ...LProcessingInstructionAsEmptyTag.stree.txt |   41 +
 ...yBalancesCommentStartAndEndTags.cspans.txt |    9 +
 ...lyBalancesCommentStartAndEndTags.stree.txt |   35 +
 ...CharacterAfterTransitionIsColon.cspans.txt |    9 +
 ...tCharacterAfterTransitionIsColon.stree.txt |   33 +
 .../RendersLiteralTextTagIfDoubled.cspans.txt |   13 +
 .../RendersLiteralTextTagIfDoubled.stree.txt  |   53 +
 ...opsAtMatchingCloseTagToStartTag.cspans.txt |   12 +
 ...topsAtMatchingCloseTagToStartTag.stree.txt |   50 +
 ...sParsingMidEmptyTagIfEOFReached.cspans.txt |    6 +
 ...opsParsingMidEmptyTagIfEOFReached.diag.txt |    1 +
 ...psParsingMidEmptyTagIfEOFReached.stree.txt |   23 +
 ...gleLineBlockAtEOFIfNoEOLReached.cspans.txt |    6 +
 ...ingleLineBlockAtEOFIfNoEOLReached.diag.txt |    1 +
 ...ngleLineBlockAtEOFIfNoEOLReached.stree.txt |   23 +
 .../SupportsCommentAsBlock.cspans.txt         |    9 +
 .../SupportsCommentAsBlock.stree.txt          |   31 +
 ...ortsCommentWithExtraDashAsBlock.cspans.txt |    9 +
 ...portsCommentWithExtraDashAsBlock.stree.txt |   32 +
 .../SupportsCommentWithinBlock.cspans.txt     |   13 +
 .../SupportsCommentWithinBlock.stree.txt      |   45 +
 ...riptTagsWithLessThanSignsInThem.cspans.txt |    9 +
 ...criptTagsWithLessThanSignsInThem.stree.txt |   41 +
 ...gsWithSpacedLessThanSignsInThem.cspans.txt |    9 +
 ...agsWithSpacedLessThanSignsInThem.stree.txt |   43 +
 .../SupportsTagsWithAttributes.cspans.txt     |   18 +
 .../SupportsTagsWithAttributes.stree.txt      |   69 +
 ...CloseAngleDoesNotTerminateBlock.cspans.txt |    4 +
 ...utCloseAngleDoesNotTerminateBlock.diag.txt |    2 +
 ...tCloseAngleDoesNotTerminateBlock.stree.txt |   25 +
 .../HtmlBlockTest/TerminatesAtEOF.cspans.txt  |    5 +
 .../HtmlBlockTest/TerminatesAtEOF.diag.txt    |    2 +
 .../HtmlBlockTest/TerminatesAtEOF.stree.txt   |   22 +
 ...rminatesAtEOFWhenParsingComment.cspans.txt |    5 +
 ...TerminatesAtEOFWhenParsingComment.diag.txt |    1 +
 ...erminatesAtEOFWhenParsingComment.stree.txt |   24 +
 ...tAtFirstOccurrenceOfEndSequence.cspans.txt |   12 +
 ...ntAtFirstOccurrenceOfEndSequence.stree.txt |   47 +
 ...GMLDeclarationAtFirstCloseAngle.cspans.txt |   10 +
 ...SGMLDeclarationAtFirstCloseAngle.stree.txt |   42 +
 ...ionAtQuestionMarkCloseAnglePair.cspans.txt |   10 +
 ...tionAtQuestionMarkCloseAnglePair.stree.txt |   44 +
 .../TreatsMalformedTagsAsContent.cspans.txt   |    9 +
 .../TreatsMalformedTagsAsContent.diag.txt     |    2 +
 .../TreatsMalformedTagsAsContent.stree.txt    |   45 +
 .../WithSelfClosingTagJustEmitsTag.cspans.txt |    7 +
 .../WithSelfClosingTagJustEmitsTag.stree.txt  |   28 +
 ...ptsEndTagWithNoMatchingStartTag.cspans.txt |    3 +
 ...eptsEndTagWithNoMatchingStartTag.stree.txt |   14 +
 ...ileAndOutputsZeroLengthCodeSpan.cspans.txt |    4 +
 ...fFileAndOutputsZeroLengthCodeSpan.diag.txt |    1 +
 ...FileAndOutputsZeroLengthCodeSpan.stree.txt |   14 +
 ...yHandlesOddlySpacedHTMLElements.cspans.txt |    9 +
 ...lyHandlesOddlySpacedHTMLElements.stree.txt |   49 +
 ...neOfMarkupWithEmbeddedStatement.cspans.txt |    6 +
 ...ineOfMarkupWithEmbeddedStatement.stree.txt |   29 +
 ...oreNewLineAtTheEndOfMarkupBlock.cspans.txt |    8 +
 ...noreNewLineAtTheEndOfMarkupBlock.stree.txt |   25 +
 ...VerbatimBlockIfNoNewlinePresent.cspans.txt |    8 +
 ...fVerbatimBlockIfNoNewlinePresent.stree.txt |   25 +
 ...aNewLineAtTheEndOfVerbatimBlock.cspans.txt |    7 +
 ...raNewLineAtTheEndOfVerbatimBlock.stree.txt |   23 +
 ...dNewLineAtTheEndOfVerbatimBlock.cspans.txt |    7 +
 ...ndNewLineAtTheEndOfVerbatimBlock.stree.txt |   24 +
 ...VerbatimBlockIfFollowedByCSharp.cspans.txt |    9 +
 ...nVerbatimBlockIfFollowedByCSharp.stree.txt |   35 +
 ...sNotReturnErrorOnMismatchedTags.cspans.txt |    6 +
 ...esNotReturnErrorOnMismatchedTags.stree.txt |   29 +
 ...ToCodeOnEmailAddressInAttribute.cspans.txt |    7 +
 ...hToCodeOnEmailAddressInAttribute.stree.txt |   30 +
 ...mitsAtSignAsMarkupIfAtEndOfFile.cspans.txt |    4 +
 .../EmitsAtSignAsMarkupIfAtEndOfFile.diag.txt |    1 +
 ...EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt |   15 +
 ...IfFirstCharacterIsSwapCharacter.cspans.txt |    4 +
 ...kIfFirstCharacterIsSwapCharacter.stree.txt |   14 +
 ...ewLineBeforeMarkupInNestedBlock.cspans.txt |   12 +
 ...NewLineBeforeMarkupInNestedBlock.stree.txt |   46 +
 ...esNewLineAndMarkupInNestedBlock.cspans.txt |   12 +
 ...lesNewLineAndMarkupInNestedBlock.stree.txt |   41 +
 .../HandlesNewLineInNestedBlock.cspans.txt    |   10 +
 .../HandlesNewLineInNestedBlock.stree.txt     |   37 +
 ...AtSignEncounteredAndEmitsOutput.cspans.txt |    4 +
 ...nAtSignEncounteredAndEmitsOutput.stree.txt |   16 +
 ...gnoresTagsInContentsOfScriptTag.cspans.txt |    6 +
 ...IgnoresTagsInContentsOfScriptTag.stree.txt |   31 +
 ...eBlockWithMarkupSetsDotAsMarkup.cspans.txt |   15 +
 ...deBlockWithMarkupSetsDotAsMarkup.stree.txt |   58 +
 ...portsDollarOpenBraceCombination.cspans.txt |    3 +
 ...pportsDollarOpenBraceCombination.stree.txt |   14 +
 ...arkupSpanIfContentIsEmptyString.cspans.txt |    1 +
 ...MarkupSpanIfContentIsEmptyString.stree.txt |    4 +
 ...entAsSingleWhitespaceMarkupSpan.cspans.txt |    1 +
 ...tentAsSingleWhitespaceMarkupSpan.stree.txt |    4 +
 ...witchToCodeOnEmailAddressInText.cspans.txt |    1 +
 ...SwitchToCodeOnEmailAddressInText.stree.txt |    4 +
 ...gnoresTagsInContentsOfScriptTag.cspans.txt |   17 +
 ...IgnoresTagsInContentsOfScriptTag.stree.txt |   58 +
 ...panIfNoSwapCharacterEncountered.cspans.txt |    1 +
 ...SpanIfNoSwapCharacterEncountered.stree.txt |    6 +
 ...InVerbatimBlockIfFollowedByHtml.cspans.txt |   12 +
 ...gInVerbatimBlockIfFollowedByHtml.stree.txt |   45 +
 ...ockIfFollowedByMarkupTransition.cspans.txt |   13 +
 ...lockIfFollowedByMarkupTransition.stree.txt |   45 +
 .../RendersTextPseudoTagAsMarkup.cspans.txt   |    4 +
 .../RendersTextPseudoTagAsMarkup.stree.txt    |   17 +
 ...egmentIfNoCodeBlocksEncountered.cspans.txt |    6 +
 ...SegmentIfNoCodeBlocksEncountered.stree.txt |   26 +
 ...ngOfAttributeValue_DoesNotThrow.cspans.txt |    9 +
 ...ingOfAttributeValue_DoesNotThrow.stree.txt |   34 +
 ...ndOfAttributeValue_DoesNotThrow.cspans.txt |    9 +
 ...EndOfAttributeValue_DoesNotThrow.stree.txt |   34 +
 ...weenAttributeValue_DoesNotThrow.cspans.txt |   10 +
 ...tweenAttributeValue_DoesNotThrow.stree.txt |   40 +
 ...onInAttributeValue_DoesNotThrow.cspans.txt |    8 +
 ...ionInAttributeValue_DoesNotThrow.stree.txt |   31 +
 ...eTransitionInEmail_DoesNotThrow.cspans.txt |   13 +
 ...leTransitionInEmail_DoesNotThrow.stree.txt |   48 +
 ...eTransitionInRegex_DoesNotThrow.cspans.txt |   10 +
 ...leTransitionInRegex_DoesNotThrow.stree.txt |   79 +
 ...ithExpressionBlock_DoesNotThrow.cspans.txt |   43 +
 ...WithExpressionBlock_DoesNotThrow.stree.txt |  182 +
 ...nsitionsInAttributeValue_Throws.cspans.txt |    9 +
 ...ransitionsInAttributeValue_Throws.diag.txt |    2 +
 ...ansitionsInAttributeValue_Throws.stree.txt |   44 +
 ...nDoesNotCreateDocumentLevelSpan.cspans.txt |   13 +
 ...onDoesNotCreateDocumentLevelSpan.stree.txt |   40 +
 ...AsLongAsParserCanIdentifyEndTag.cspans.txt |    9 +
 ...sAsLongAsParserCanIdentifyEndTag.stree.txt |   31 +
 ...EndTextTagContainsTextAfterName.cspans.txt |    7 +
 ...IfEndTextTagContainsTextAfterName.diag.txt |    1 +
 ...fEndTextTagContainsTextAfterName.stree.txt |   33 +
 ...artTextTagContainsTextAfterName.cspans.txt |    8 +
 ...StartTextTagContainsTextAfterName.diag.txt |    1 +
 ...tartTextTagContainsTextAfterName.stree.txt |   35 +
 ...utputsMarkupSegmentAndEndsBlock.cspans.txt |    8 +
 ...nOutputsMarkupSegmentAndEndsBlock.diag.txt |    1 +
 ...OutputsMarkupSegmentAndEndsBlock.stree.txt |   29 +
 ...edTagAtEOFErrorsOnMissingEndTag.cspans.txt |    5 +
 ...osedTagAtEOFErrorsOnMissingEndTag.diag.txt |    2 +
 ...sedTagAtEOFErrorsOnMissingEndTag.stree.txt |   30 +
 ...TagErrorsOnOutermostUnclosedTag.cspans.txt |    9 +
 ...elTagErrorsOnOutermostUnclosedTag.diag.txt |    1 +
 ...lTagErrorsOnOutermostUnclosedTag.stree.txt |   35 +
 ...TagAtEOFErrorsWithIncompleteTag.cspans.txt |    6 +
 ...edTagAtEOFErrorsWithIncompleteTag.diag.txt |    2 +
 ...dTagAtEOFErrorsWithIncompleteTag.stree.txt |   30 +
 .../HtmlTagsTest/CDataTag.cspans.txt          |    8 +
 .../HtmlTagsTest/CDataTag.stree.txt           |   31 +
 .../HtmlTagsTest/CommentTag.cspans.txt        |   10 +
 .../HtmlTagsTest/CommentTag.stree.txt         |   31 +
 .../HtmlTagsTest/DocTypeTag.cspans.txt        |    8 +
 .../HtmlTagsTest/DocTypeTag.stree.txt         |   28 +
 .../HtmlTagsTest/ElementTags.cspans.txt       |   10 +
 .../HtmlTagsTest/ElementTags.stree.txt        |   33 +
 .../HtmlTagsTest/EmptyTag.cspans.txt          |    9 +
 .../HtmlTagsTest/EmptyTag.stree.txt           |   31 +
 .../EmptyTagNestsLikeNormalTag.cspans.txt     |    9 +
 .../EmptyTagNestsLikeNormalTag.diag.txt       |    1 +
 .../EmptyTagNestsLikeNormalTag.stree.txt      |   32 +
 .../IncompleteVoidElementEndTag.cspans.txt    |   36 +
 .../IncompleteVoidElementEndTag.diag.txt      |    1 +
 .../IncompleteVoidElementEndTag.stree.txt     |  317 ++
 .../ProcessingInstructionTag.cspans.txt       |    8 +
 .../ProcessingInstructionTag.stree.txt        |   34 +
 .../HtmlTagsTest/ScriptTag.cspans.txt         |    3 +
 .../HtmlTagsTest/ScriptTag.stree.txt          |   28 +
 .../ScriptTag_Incomplete.cspans.txt           |    2 +
 .../ScriptTag_Incomplete.stree.txt            |   13 +
 .../HtmlTagsTest/ScriptTag_Invalid.cspans.txt |   10 +
 .../HtmlTagsTest/ScriptTag_Invalid.stree.txt  |   38 +
 .../ScriptTag_WithNestedBeginTag.cspans.txt   |    3 +
 .../ScriptTag_WithNestedBeginTag.stree.txt    |   16 +
 .../ScriptTag_WithNestedEndTag.cspans.txt     |    3 +
 .../ScriptTag_WithNestedEndTag.stree.txt      |   17 +
 ...criptTag_WithNestedMalformedTag.cspans.txt |    3 +
 ...ScriptTag_WithNestedMalformedTag.stree.txt |   29 +
 .../ScriptTag_WithNestedTag.cspans.txt        |    3 +
 .../ScriptTag_WithNestedTag.stree.txt         |   20 +
 .../HtmlTagsTest/TextTags.cspans.txt          |    9 +
 .../HtmlTagsTest/TextTags.stree.txt           |   31 +
 .../VoidElementFollowedByCloseTag.cspans.txt  |  145 +
 .../VoidElementFollowedByCloseTag.stree.txt   |  596 +++
 .../VoidElementFollowedByContent.cspans.txt   |  113 +
 .../VoidElementFollowedByContent.stree.txt    |  484 +++
 .../VoidElementFollowedByOtherTag.cspans.txt  |   49 +
 .../VoidElementFollowedByOtherTag.stree.txt   |  387 ++
 ...rTrailingWhitespaceInDesignMode.cspans.txt |   19 +
 ...OrTrailingWhitespaceInDesignMode.stree.txt |   83 +
 ...ToCodeOnEmailAddressInAttribute.cspans.txt |   13 +
 ...hToCodeOnEmailAddressInAttribute.stree.txt |   47 +
 ...witchToCodeOnEmailAddressInText.cspans.txt |    9 +
 ...SwitchToCodeOnEmailAddressInText.stree.txt |   31 +
 ...CodeIfThereIsNoMarkupOnThatLine.cspans.txt |   22 +
 ...oCodeIfThereIsNoMarkupOnThatLine.stree.txt |   86 +
 ...CodeIfThereIsNoMarkupOnThatLine.cspans.txt |   16 +
 ...oCodeIfThereIsNoMarkupOnThatLine.stree.txt |   69 +
 ...sPairsOfAtSignsAsEscapeSequence.cspans.txt |    8 +
 ...tsPairsOfAtSignsAsEscapeSequence.stree.txt |   28 +
 ...reatsTwoAtSignsAsEscapeSequence.cspans.txt |    4 +
 ...TreatsTwoAtSignsAsEscapeSequence.stree.txt |   17 +
 ...arsesCodeWithinSingleLineMarkup.cspans.txt |   12 +
 ...ParsesCodeWithinSingleLineMarkup.stree.txt |   41 +
 ...sPairsOfAtSignsAsEscapeSequence.cspans.txt |   19 +
 ...tsPairsOfAtSignsAsEscapeSequence.stree.txt |   55 +
 ...reatsTwoAtSignsAsEscapeSequence.cspans.txt |   15 +
 ...TreatsTwoAtSignsAsEscapeSequence.stree.txt |   44 +
 ...CodeIfThereIsNoMarkupOnThatLine.cspans.txt |   31 +
 ...oCodeIfThereIsNoMarkupOnThatLine.stree.txt |  109 +
 ...portsCodeWithinCDataDeclaration.cspans.txt |   12 +
 ...pportsCodeWithinCDataDeclaration.stree.txt |   52 +
 .../SupportsCodeWithinComment.cspans.txt      |   14 +
 .../SupportsCodeWithinComment.stree.txt       |   49 +
 ...pportsCodeWithinSGMLDeclaration.cspans.txt |   12 +
 ...upportsCodeWithinSGMLDeclaration.stree.txt |   48 +
 ...eWithinXMLProcessingInstruction.cspans.txt |   12 +
 ...deWithinXMLProcessingInstruction.stree.txt |   49 +
 ...cterEncounteredInAttributeValue.cspans.txt |   12 +
 ...acterEncounteredInAttributeValue.stree.txt |   49 +
 ...haracterEncounteredInTagContent.cspans.txt |   16 +
 ...CharacterEncounteredInTagContent.stree.txt |   59 +
 ...nSwapCharacterEncounteredMidTag.cspans.txt |   10 +
 ...enSwapCharacterEncounteredMidTag.stree.txt |   38 +
 ...cterBeforeSwapIsNonAlphanumeric.cspans.txt |   11 +
 ...acterBeforeSwapIsNonAlphanumeric.stree.txt |   39 +
 ...sPairsOfAtSignsAsEscapeSequence.cspans.txt |   14 +
 ...tsPairsOfAtSignsAsEscapeSequence.stree.txt |   45 +
 ...reatsTwoAtSignsAsEscapeSequence.cspans.txt |   10 +
 ...TreatsTwoAtSignsAsEscapeSequence.stree.txt |   34 +
 ...les_DoesNotSpecialCase_VoidTags.cspans.txt |    5 +
 ...dles_DoesNotSpecialCase_VoidTags.stree.txt |   18 +
 ...les_EndTagsWithMissingStartTags.cspans.txt |    3 +
 ...dles_EndTagsWithMissingStartTags.stree.txt |   13 +
 .../Handles_IncompleteTags.cspans.txt         |    8 +
 .../Handles_IncompleteTags.stree.txt          |   38 +
 ...formedTags_RecoversSuccessfully.cspans.txt |    7 +
 ...lformedTags_RecoversSuccessfully.stree.txt |   26 +
 ...cedEndTags_RecoversSuccessfully.cspans.txt |    8 +
 ...acedEndTags_RecoversSuccessfully.stree.txt |   31 +
 .../Handles_SelfClosingTags.cspans.txt        |    5 +
 .../Handles_SelfClosingTags.stree.txt         |   23 +
 ...cialCasesVoidTags_WithNoEndTags.cspans.txt |    8 +
 ...ecialCasesVoidTags_WithNoEndTags.stree.txt |   27 +
 ...les_StartTagsWithMissingEndTags.cspans.txt |    7 +
 ...dles_StartTagsWithMissingEndTags.stree.txt |   34 +
 .../Handles_ValidNestedTags.cspans.txt        |    8 +
 .../Handles_ValidNestedTags.stree.txt         |   37 +
 ...es_ValidNestedTagsMixedWithCode.cspans.txt |   16 +
 ...les_ValidNestedTagsMixedWithCode.stree.txt |   67 +
 .../Handles_ValidTags.cspans.txt              |    9 +
 .../Handles_ValidTags.stree.txt               |   32 +
 ...RequiresDoubleQuotesAroundValue.cspans.txt |    6 +
 ...eRequiresDoubleQuotesAroundValue.stree.txt |   19 +
 ...ive_InvalidLookupText_AddsError.cspans.txt |    6 +
 ...tive_InvalidLookupText_AddsError.stree.txt |   18 +
 ...HelperDirective_NoValue_Invalid.cspans.txt |    6 +
 ...gHelperDirective_NoValue_Invalid.stree.txt |   18 +
 ...agHelperDirective_RequiresValue.cspans.txt |    6 +
 ...TagHelperDirective_RequiresValue.stree.txt |   18 +
 ...irective_SingleQuotes_AddsError.cspans.txt |    6 +
 ...Directive_SingleQuotes_AddsError.stree.txt |   18 +
 ...RequiresDoubleQuotesAroundValue.cspans.txt |    6 +
 ...eRequiresDoubleQuotesAroundValue.stree.txt |   18 +
 ...gHelperDirective_SupportsSpaces.cspans.txt |    6 +
 ...agHelperDirective_SupportsSpaces.stree.txt |   22 +
 ...tes_InvalidLookupText_AddsError.cspans.txt |    6 +
 ...otes_InvalidLookupText_AddsError.stree.txt |   18 +
 ...tStartOfLineBecauseOfWhitespace.cspans.txt |    7 +
 ...AtStartOfLineBecauseOfWhitespace.stree.txt |   20 +
 ...rectiveErrorsIfNotAtStartOfLine.cspans.txt |    6 +
 ...irectiveErrorsIfNotAtStartOfLine.stree.txt |   20 +
 ...eDescriptor_AllowsNullableTypes.cspans.txt |   16 +
 ...veDescriptor_AllowsNullableTypes.stree.txt |   80 +
 ...tiveDescriptor_AllowsTupleTypes.cspans.txt |   16 +
 ...ctiveDescriptor_AllowsTupleTypes.stree.txt |  164 +
 ...Types_IgnoresTrailingWhitespace.cspans.txt |    7 +
 ...eTypes_IgnoresTrailingWhitespace.stree.txt |   26 +
 ...or_AllowsWhiteSpaceAroundTokens.cspans.txt |    9 +
 ...tor_AllowsWhiteSpaceAroundTokens.stree.txt |   30 +
 ...dleEOFIncompleteNamespaceTokens.cspans.txt |    5 +
 ...ndleEOFIncompleteNamespaceTokens.stree.txt |   16 +
 ...HandleEOFInvalidNamespaceTokens.cspans.txt |    6 +
 ...nHandleEOFInvalidNamespaceTokens.stree.txt |   21 +
 ...HandleIncompleteNamespaceTokens.cspans.txt |    5 +
 ...nHandleIncompleteNamespaceTokens.stree.txt |   17 +
 ...CanHandleInvalidNamespaceTokens.cspans.txt |    6 +
 ..._CanHandleInvalidNamespaceTokens.stree.txt |   24 +
 ...rrorsExtraContentAfterDirective.cspans.txt |    7 +
 ...ErrorsExtraContentAfterDirective.stree.txt |   22 +
 ...or_ErrorsForInvalidMemberTokens.cspans.txt |    5 +
 ...tor_ErrorsForInvalidMemberTokens.stree.txt |   16 +
 ...henEOFBeforeDirectiveBlockStart.cspans.txt |    6 +
 ...WhenEOFBeforeDirectiveBlockStart.stree.txt |   18 +
 ...henExtraContentBeforeBlockStart.cspans.txt |    7 +
 ...WhenExtraContentBeforeBlockStart.stree.txt |   28 +
 ...iptor_ErrorsWhenMissingEndBrace.cspans.txt |    8 +
 ...riptor_ErrorsWhenMissingEndBrace.stree.txt |   25 +
 ...ipleOccurring_CanHaveDuplicates.cspans.txt |   12 +
 ...tipleOccurring_CanHaveDuplicates.stree.txt |   46 +
 ...nglyOccurring_ErrorsIfDuplicate.cspans.txt |   12 +
 ...inglyOccurring_ErrorsIfDuplicate.stree.txt |   46 +
 ...ped_CanBeBeneathOtherDirectives.cspans.txt |   12 +
 ...oped_CanBeBeneathOtherDirectives.stree.txt |   40 +
 ...WhiteSpaceCommentsAndDirectives.cspans.txt |   22 +
 ...rWhiteSpaceCommentsAndDirectives.stree.txt |   66 +
 ...NoErrorsSemicolonAfterDirective.cspans.txt |    9 +
 ..._NoErrorsSemicolonAfterDirective.stree.txt |   24 +
 ...en_ParserErrorForNonStringValue.cspans.txt |    5 +
 ...ken_ParserErrorForNonStringValue.stree.txt |   18 +
 ...arserErrorForPartialQuotedValue.cspans.txt |    5 +
 ...ParserErrorForPartialQuotedValue.stree.txt |   17 +
 ...ParserErrorForSingleQuotedValue.cspans.txt |    5 +
 ..._ParserErrorForSingleQuotedValue.stree.txt |   18 +
 ...ken_ParserErrorForUnquotedValue.cspans.txt |    5 +
 ...oken_ParserErrorForUnquotedValue.stree.txt |   16 +
 ...or_TokensMustBeSeparatedBySpace.cspans.txt |    6 +
 ...tor_TokensMustBeSeparatedBySpace.stree.txt |   20 +
 ...escriptor_UnderstandsCodeBlocks.cspans.txt |   10 +
 ...Descriptor_UnderstandsCodeBlocks.stree.txt |   37 +
 ...criptor_UnderstandsMemberTokens.cspans.txt |    6 +
 ...scriptor_UnderstandsMemberTokens.stree.txt |   18 +
 ...iptor_UnderstandsMultipleTokens.cspans.txt |   10 +
 ...riptor_UnderstandsMultipleTokens.stree.txt |   32 +
 ...scriptor_UnderstandsRazorBlocks.cspans.txt |   14 +
 ...escriptor_UnderstandsRazorBlocks.stree.txt |   45 +
 ...criptor_UnderstandsStringTokens.cspans.txt |    6 +
 ...scriptor_UnderstandsStringTokens.stree.txt |   18 +
 ...escriptor_UnderstandsTypeTokens.cspans.txt |    6 +
 ...Descriptor_UnderstandsTypeTokens.stree.txt |   24 +
 ...ctives_CanUseReservedWord_Class.cspans.txt |    4 +
 ...ectives_CanUseReservedWord_Class.stree.txt |   14 +
 ...es_CanUseReservedWord_Namespace.cspans.txt |    4 +
 ...ves_CanUseReservedWord_Namespace.stree.txt |   14 +
 ...ves_ReservedWordInsideCodeBlock.cspans.txt |    6 +
 ...ives_ReservedWordInsideCodeBlock.stree.txt |   20 +
 .../EmptyFunctionsDirective.cspans.txt        |    8 +
 .../EmptyFunctionsDirective.stree.txt         |   23 +
 ...tStartOfLineBecauseOfWhitespace.cspans.txt |    7 +
 ...AtStartOfLineBecauseOfWhitespace.stree.txt |   26 +
 ...rectiveErrorsIfNotAtStartOfLine.cspans.txt |    7 +
 ...irectiveErrorsIfNotAtStartOfLine.stree.txt |   27 +
 ...InheritsDirectiveSupportsArrays.cspans.txt |    6 +
 .../InheritsDirectiveSupportsArrays.stree.txt |   24 +
 ...DirectiveSupportsNestedGenerics.cspans.txt |    6 +
 ...sDirectiveSupportsNestedGenerics.stree.txt |   34 +
 ...tsDirectiveSupportsTypeKeywords.cspans.txt |    6 +
 ...itsDirectiveSupportsTypeKeywords.stree.txt |   18 +
 ...ionalDirectiveTokens_AreSkipped.cspans.txt |    5 +
 ...tionalDirectiveTokens_AreSkipped.stree.txt |   16 +
 ...tiveTokens_WithBraces_AreParsed.cspans.txt |    6 +
 ...ctiveTokens_WithBraces_AreParsed.stree.txt |   18 +
 ...ultipleOptionalTokens_AreParsed.cspans.txt |    8 +
 ...MultipleOptionalTokens_AreParsed.stree.txt |   24 +
 ...kens_WithSimpleTokens_AreParsed.cspans.txt |    6 +
 ...okens_WithSimpleTokens_AreParsed.stree.txt |   18 +
 ...ns_WithMemberSpecified_IsParsed.cspans.txt |    6 +
 ...ens_WithMemberSpecified_IsParsed.stree.txt |   18 +
 ...kens_WithMissingMember_IsParsed.cspans.txt |    6 +
 ...okens_WithMissingMember_IsParsed.stree.txt |   18 +
 .../Parse_FunctionsDirective.cspans.txt       |    8 +
 .../Parse_FunctionsDirective.stree.txt        |   33 +
 .../Parse_SectionDirective.cspans.txt         |   14 +
 .../Parse_SectionDirective.stree.txt          |   45 +
 ...ctiveToken_WithMultipleSegments.cspans.txt |    6 +
 ...ectiveToken_WithMultipleSegments.stree.txt |   22 +
 ...irectiveToken_WithSingleSegment.cspans.txt |    6 +
 ...DirectiveToken_WithSingleSegment.stree.txt |   18 +
 ...RequiresDoubleQuotesAroundValue.cspans.txt |    6 +
 ...eRequiresDoubleQuotesAroundValue.stree.txt |   19 +
 ...ive_InvalidLookupText_AddsError.cspans.txt |    6 +
 ...tive_InvalidLookupText_AddsError.stree.txt |   18 +
 ...HelperDirective_NoValue_Invalid.cspans.txt |    6 +
 ...gHelperDirective_NoValue_Invalid.stree.txt |   18 +
 ...agHelperDirective_RequiresValue.cspans.txt |    6 +
 ...TagHelperDirective_RequiresValue.stree.txt |   18 +
 ...irective_SingleQuotes_AddsError.cspans.txt |    6 +
 ...Directive_SingleQuotes_AddsError.stree.txt |   18 +
 ...RequiresDoubleQuotesAroundValue.cspans.txt |    6 +
 ...eRequiresDoubleQuotesAroundValue.stree.txt |   18 +
 ...gHelperDirective_SupportsSpaces.cspans.txt |    6 +
 ...agHelperDirective_SupportsSpaces.stree.txt |   22 +
 ...tes_InvalidLookupText_AddsError.cspans.txt |    6 +
 ...otes_InvalidLookupText_AddsError.stree.txt |   18 +
 ...RequiresDoubleQuotesAroundValue.cspans.txt |    6 +
 ...eRequiresDoubleQuotesAroundValue.stree.txt |   20 +
 ...PrefixDirective_NoValueSucceeds.cspans.txt |    6 +
 ...rPrefixDirective_NoValueSucceeds.stree.txt |   18 +
 ...erPrefixDirective_RequiresValue.cspans.txt |    6 +
 ...perPrefixDirective_RequiresValue.stree.txt |   18 +
 ...RequiresDoubleQuotesAroundValue.cspans.txt |    6 +
 ...eRequiresDoubleQuotesAroundValue.stree.txt |   18 +
 ...gHelperPrefixDirective_Succeeds.cspans.txt |    6 +
 ...agHelperPrefixDirective_Succeeds.stree.txt |   18 +
 ...ixDirective_WithQuotes_Succeeds.cspans.txt |    6 +
 ...fixDirective_WithQuotes_Succeeds.stree.txt |   18 +
 .../AllowsCompatibleTagStructures1.cspans.txt |    0
 .../AllowsCompatibleTagStructures1.stree.txt  |   12 +
 .../AllowsCompatibleTagStructures1.tspans.txt |    1 +
 .../AllowsCompatibleTagStructures2.cspans.txt |    0
 .../AllowsCompatibleTagStructures2.stree.txt  |   11 +
 .../AllowsCompatibleTagStructures2.tspans.txt |    1 +
 .../AllowsCompatibleTagStructures3.cspans.txt |    1 +
 .../AllowsCompatibleTagStructures3.stree.txt  |   21 +
 .../AllowsCompatibleTagStructures3.tspans.txt |    1 +
 .../AllowsCompatibleTagStructures4.cspans.txt |    0
 .../AllowsCompatibleTagStructures4.stree.txt  |   12 +
 .../AllowsCompatibleTagStructures4.tspans.txt |    2 +
 .../AllowsCompatibleTagStructures5.cspans.txt |    1 +
 .../AllowsCompatibleTagStructures5.stree.txt  |   26 +
 .../AllowsCompatibleTagStructures5.tspans.txt |    1 +
 .../AllowsCompatibleTagStructures6.cspans.txt |    0
 .../AllowsCompatibleTagStructures6.stree.txt  |   11 +
 .../AllowsCompatibleTagStructures6.tspans.txt |    1 +
 .../AllowsCompatibleTagStructures7.cspans.txt |    0
 .../AllowsCompatibleTagStructures7.stree.txt  |   11 +
 .../AllowsCompatibleTagStructures7.tspans.txt |    1 +
 .../AllowsCompatibleTagStructures8.cspans.txt |    1 +
 .../AllowsCompatibleTagStructures8.stree.txt  |   13 +
 .../AllowsCompatibleTagStructures8.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes1.cspans.txt |    1 +
 .../CanHandleSymbolBoundAttributes1.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes1.stree.txt |   32 +
 ...CanHandleSymbolBoundAttributes1.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes2.cspans.txt |    1 +
 .../CanHandleSymbolBoundAttributes2.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes2.stree.txt |   32 +
 ...CanHandleSymbolBoundAttributes2.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes3.cspans.txt |    2 +
 .../CanHandleSymbolBoundAttributes3.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes3.stree.txt |   34 +
 ...CanHandleSymbolBoundAttributes3.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes4.cspans.txt |    2 +
 .../CanHandleSymbolBoundAttributes4.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes4.stree.txt |   34 +
 ...CanHandleSymbolBoundAttributes4.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes5.cspans.txt |    1 +
 .../CanHandleSymbolBoundAttributes5.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes5.stree.txt |   30 +
 ...CanHandleSymbolBoundAttributes5.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes6.cspans.txt |    0
 .../CanHandleSymbolBoundAttributes6.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes6.stree.txt |   22 +
 ...CanHandleSymbolBoundAttributes6.tspans.txt |    1 +
 ...CanHandleSymbolBoundAttributes7.cspans.txt |    1 +
 .../CanHandleSymbolBoundAttributes7.diag.txt  |    5 +
 .../CanHandleSymbolBoundAttributes7.stree.txt |   30 +
 ...CanHandleSymbolBoundAttributes7.tspans.txt |    1 +
 ...andleWithoutEndTagTagStructure1.cspans.txt |    0
 ...HandleWithoutEndTagTagStructure1.stree.txt |    7 +
 ...andleWithoutEndTagTagStructure1.tspans.txt |    1 +
 ...andleWithoutEndTagTagStructure2.cspans.txt |    1 +
 ...HandleWithoutEndTagTagStructure2.stree.txt |   21 +
 ...andleWithoutEndTagTagStructure2.tspans.txt |    1 +
 ...andleWithoutEndTagTagStructure3.cspans.txt |    0
 ...HandleWithoutEndTagTagStructure3.stree.txt |   12 +
 ...andleWithoutEndTagTagStructure3.tspans.txt |    2 +
 ...andleWithoutEndTagTagStructure4.cspans.txt |    1 +
 ...HandleWithoutEndTagTagStructure4.stree.txt |   26 +
 ...andleWithoutEndTagTagStructure4.tspans.txt |    2 +
 ...andleWithoutEndTagTagStructure5.cspans.txt |    2 +
 ...HandleWithoutEndTagTagStructure5.stree.txt |   22 +
 ...andleWithoutEndTagTagStructure5.tspans.txt |    2 +
 ...rEmptyTagHelperBoundAttributes1.cspans.txt |    1 +
 ...ForEmptyTagHelperBoundAttributes1.diag.txt |    1 +
 ...orEmptyTagHelperBoundAttributes1.stree.txt |   23 +
 ...rEmptyTagHelperBoundAttributes1.tspans.txt |    1 +
 ...EmptyTagHelperBoundAttributes10.cspans.txt |    1 +
 ...orEmptyTagHelperBoundAttributes10.diag.txt |    1 +
 ...rEmptyTagHelperBoundAttributes10.stree.txt |   23 +
 ...EmptyTagHelperBoundAttributes10.tspans.txt |    1 +
 ...EmptyTagHelperBoundAttributes11.cspans.txt |    2 +
 ...orEmptyTagHelperBoundAttributes11.diag.txt |    2 +
 ...rEmptyTagHelperBoundAttributes11.stree.txt |   35 +
 ...EmptyTagHelperBoundAttributes11.tspans.txt |    1 +
 ...EmptyTagHelperBoundAttributes12.cspans.txt |    2 +
 ...orEmptyTagHelperBoundAttributes12.diag.txt |    1 +
 ...rEmptyTagHelperBoundAttributes12.stree.txt |   33 +
 ...EmptyTagHelperBoundAttributes12.tspans.txt |    1 +
 ...EmptyTagHelperBoundAttributes13.cspans.txt |    4 +
 ...rEmptyTagHelperBoundAttributes13.stree.txt |   37 +
 ...EmptyTagHelperBoundAttributes13.tspans.txt |    1 +
 ...EmptyTagHelperBoundAttributes14.cspans.txt |    6 +
 ...rEmptyTagHelperBoundAttributes14.stree.txt |   41 +
 ...EmptyTagHelperBoundAttributes14.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes2.cspans.txt |    1 +
 ...orEmptyTagHelperBoundAttributes2.stree.txt |   25 +
 ...rEmptyTagHelperBoundAttributes2.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes3.cspans.txt |    1 +
 ...ForEmptyTagHelperBoundAttributes3.diag.txt |    1 +
 ...orEmptyTagHelperBoundAttributes3.stree.txt |   24 +
 ...rEmptyTagHelperBoundAttributes3.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes4.cspans.txt |    2 +
 ...ForEmptyTagHelperBoundAttributes4.diag.txt |    2 +
 ...orEmptyTagHelperBoundAttributes4.stree.txt |   35 +
 ...rEmptyTagHelperBoundAttributes4.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes5.cspans.txt |    2 +
 ...ForEmptyTagHelperBoundAttributes5.diag.txt |    2 +
 ...orEmptyTagHelperBoundAttributes5.stree.txt |   37 +
 ...rEmptyTagHelperBoundAttributes5.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes6.cspans.txt |    2 +
 ...ForEmptyTagHelperBoundAttributes6.diag.txt |    1 +
 ...orEmptyTagHelperBoundAttributes6.stree.txt |   32 +
 ...rEmptyTagHelperBoundAttributes6.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes7.cspans.txt |    2 +
 ...ForEmptyTagHelperBoundAttributes7.diag.txt |    1 +
 ...orEmptyTagHelperBoundAttributes7.stree.txt |   31 +
 ...rEmptyTagHelperBoundAttributes7.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes8.cspans.txt |    2 +
 ...ForEmptyTagHelperBoundAttributes8.diag.txt |    1 +
 ...orEmptyTagHelperBoundAttributes8.stree.txt |   32 +
 ...rEmptyTagHelperBoundAttributes8.tspans.txt |    1 +
 ...rEmptyTagHelperBoundAttributes9.cspans.txt |    4 +
 ...ForEmptyTagHelperBoundAttributes9.diag.txt |    1 +
 ...orEmptyTagHelperBoundAttributes9.stree.txt |   53 +
 ...rEmptyTagHelperBoundAttributes9.tspans.txt |    1 +
 ...atesErrorForMalformedTagHelper1.cspans.txt |    0
 ...reatesErrorForMalformedTagHelper1.diag.txt |    2 +
 ...eatesErrorForMalformedTagHelper1.stree.txt |    7 +
 ...atesErrorForMalformedTagHelper1.tspans.txt |    1 +
 ...atesErrorForMalformedTagHelper2.cspans.txt |    0
 ...reatesErrorForMalformedTagHelper2.diag.txt |    1 +
 ...eatesErrorForMalformedTagHelper2.stree.txt |   12 +
 ...atesErrorForMalformedTagHelper2.tspans.txt |    1 +
 ...atesErrorForMalformedTagHelper3.cspans.txt |    0
 ...reatesErrorForMalformedTagHelper3.diag.txt |    3 +
 ...eatesErrorForMalformedTagHelper3.stree.txt |   12 +
 ...atesErrorForMalformedTagHelper3.tspans.txt |    2 +
 ...atesErrorForMalformedTagHelper4.cspans.txt |    0
 ...reatesErrorForMalformedTagHelper4.diag.txt |    3 +
 ...eatesErrorForMalformedTagHelper4.stree.txt |   15 +
 ...atesErrorForMalformedTagHelper4.tspans.txt |    2 +
 ...atesErrorForMalformedTagHelper5.cspans.txt |    0
 ...reatesErrorForMalformedTagHelper5.diag.txt |    2 +
 ...eatesErrorForMalformedTagHelper5.stree.txt |   15 +
 ...atesErrorForMalformedTagHelper5.tspans.txt |    1 +
 ...atesErrorForMalformedTagHelper6.cspans.txt |    5 +
 ...reatesErrorForMalformedTagHelper6.diag.txt |    2 +
 ...eatesErrorForMalformedTagHelper6.stree.txt |   30 +
 ...atesErrorForMalformedTagHelper6.tspans.txt |    1 +
 ...atesErrorForMalformedTagHelper7.cspans.txt |    6 +
 ...reatesErrorForMalformedTagHelper7.diag.txt |    1 +
 ...eatesErrorForMalformedTagHelper7.stree.txt |   32 +
 ...atesErrorForMalformedTagHelper7.tspans.txt |    1 +
 ...atesErrorForMalformedTagHelper8.cspans.txt |    2 +
 ...reatesErrorForMalformedTagHelper8.diag.txt |    1 +
 ...eatesErrorForMalformedTagHelper8.stree.txt |   23 +
 ...atesErrorForMalformedTagHelper8.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes1.cspans.txt |    1 +
 ...alformedTagHelpersWithAttributes1.diag.txt |    2 +
 ...lformedTagHelpersWithAttributes1.stree.txt |   17 +
 ...formedTagHelpersWithAttributes1.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes10.cspans.txt |    1 +
 ...lformedTagHelpersWithAttributes10.diag.txt |    3 +
 ...formedTagHelpersWithAttributes10.stree.txt |   29 +
 ...ormedTagHelpersWithAttributes10.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes11.cspans.txt |    2 +
 ...lformedTagHelpersWithAttributes11.diag.txt |    3 +
 ...formedTagHelpersWithAttributes11.stree.txt |   36 +
 ...ormedTagHelpersWithAttributes11.tspans.txt |    2 +
 ...ormedTagHelpersWithAttributes12.cspans.txt |    2 +
 ...formedTagHelpersWithAttributes12.stree.txt |   36 +
 ...ormedTagHelpersWithAttributes12.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes13.cspans.txt |    0
 ...lformedTagHelpersWithAttributes13.diag.txt |    1 +
 ...formedTagHelpersWithAttributes13.stree.txt |   32 +
 ...ormedTagHelpersWithAttributes13.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes14.cspans.txt |    0
 ...lformedTagHelpersWithAttributes14.diag.txt |    1 +
 ...formedTagHelpersWithAttributes14.stree.txt |   30 +
 ...ormedTagHelpersWithAttributes14.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes15.cspans.txt |    2 +
 ...lformedTagHelpersWithAttributes15.diag.txt |    3 +
 ...formedTagHelpersWithAttributes15.stree.txt |   34 +
 ...ormedTagHelpersWithAttributes15.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes16.cspans.txt |    2 +
 ...lformedTagHelpersWithAttributes16.diag.txt |    3 +
 ...formedTagHelpersWithAttributes16.stree.txt |   25 +
 ...ormedTagHelpersWithAttributes16.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes17.cspans.txt |    2 +
 ...lformedTagHelpersWithAttributes17.diag.txt |    4 +
 ...formedTagHelpersWithAttributes17.stree.txt |   26 +
 ...ormedTagHelpersWithAttributes17.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes18.cspans.txt |    0
 ...lformedTagHelpersWithAttributes18.diag.txt |    5 +
 ...formedTagHelpersWithAttributes18.stree.txt |   31 +
 ...ormedTagHelpersWithAttributes18.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes19.cspans.txt |    1 +
 ...lformedTagHelpersWithAttributes19.diag.txt |    1 +
 ...formedTagHelpersWithAttributes19.stree.txt |   40 +
 ...ormedTagHelpersWithAttributes19.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes2.cspans.txt |    1 +
 ...alformedTagHelpersWithAttributes2.diag.txt |    3 +
 ...lformedTagHelpersWithAttributes2.stree.txt |   28 +
 ...formedTagHelpersWithAttributes2.tspans.txt |    1 +
 ...ormedTagHelpersWithAttributes20.cspans.txt |   11 +
 ...lformedTagHelpersWithAttributes20.diag.txt |   12 +
 ...formedTagHelpersWithAttributes20.stree.txt |   67 +
 ...ormedTagHelpersWithAttributes20.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes3.cspans.txt |    2 +
 ...alformedTagHelpersWithAttributes3.diag.txt |    2 +
 ...lformedTagHelpersWithAttributes3.stree.txt |   26 +
 ...formedTagHelpersWithAttributes3.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes4.cspans.txt |    2 +
 ...alformedTagHelpersWithAttributes4.diag.txt |    2 +
 ...lformedTagHelpersWithAttributes4.stree.txt |   27 +
 ...formedTagHelpersWithAttributes4.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes5.cspans.txt |    1 +
 ...alformedTagHelpersWithAttributes5.diag.txt |    3 +
 ...lformedTagHelpersWithAttributes5.stree.txt |   20 +
 ...formedTagHelpersWithAttributes5.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes6.cspans.txt |    1 +
 ...alformedTagHelpersWithAttributes6.diag.txt |    2 +
 ...lformedTagHelpersWithAttributes6.stree.txt |   20 +
 ...formedTagHelpersWithAttributes6.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes7.cspans.txt |    2 +
 ...alformedTagHelpersWithAttributes7.diag.txt |    2 +
 ...lformedTagHelpersWithAttributes7.stree.txt |   29 +
 ...formedTagHelpersWithAttributes7.tspans.txt |    1 +
 ...formedTagHelpersWithAttributes8.cspans.txt |    0
 ...alformedTagHelpersWithAttributes8.diag.txt |    3 +
 ...lformedTagHelpersWithAttributes8.stree.txt |   22 +
 ...formedTagHelpersWithAttributes8.tspans.txt |    2 +
 ...formedTagHelpersWithAttributes9.cspans.txt |    1 +
 ...alformedTagHelpersWithAttributes9.diag.txt |    3 +
 ...lformedTagHelpersWithAttributes9.stree.txt |   25 +
 ...formedTagHelpersWithAttributes9.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes1.cspans.txt |    1 +
 ...ForNonStringTagHelperAttributes1.stree.txt |   24 +
 ...orNonStringTagHelperAttributes1.tspans.txt |    1 +
 ...rNonStringTagHelperAttributes10.cspans.txt |    5 +
 ...orNonStringTagHelperAttributes10.stree.txt |   55 +
 ...rNonStringTagHelperAttributes10.tspans.txt |    1 +
 ...rNonStringTagHelperAttributes11.cspans.txt |   12 +
 ...orNonStringTagHelperAttributes11.stree.txt |   85 +
 ...rNonStringTagHelperAttributes11.tspans.txt |    1 +
 ...rNonStringTagHelperAttributes12.cspans.txt |    4 +
 ...orNonStringTagHelperAttributes12.stree.txt |   47 +
 ...rNonStringTagHelperAttributes12.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes2.cspans.txt |    1 +
 ...ForNonStringTagHelperAttributes2.stree.txt |   24 +
 ...orNonStringTagHelperAttributes2.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes3.cspans.txt |    2 +
 ...ForNonStringTagHelperAttributes3.stree.txt |   35 +
 ...orNonStringTagHelperAttributes3.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes4.cspans.txt |    3 +
 ...ForNonStringTagHelperAttributes4.stree.txt |   39 +
 ...orNonStringTagHelperAttributes4.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes5.cspans.txt |    1 +
 ...ForNonStringTagHelperAttributes5.stree.txt |   24 +
 ...orNonStringTagHelperAttributes5.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes6.cspans.txt |    4 +
 ...ForNonStringTagHelperAttributes6.stree.txt |   37 +
 ...orNonStringTagHelperAttributes6.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes7.cspans.txt |   18 +
 ...ForNonStringTagHelperAttributes7.stree.txt |   99 +
 ...orNonStringTagHelperAttributes7.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes8.cspans.txt |    6 +
 ...ForNonStringTagHelperAttributes8.stree.txt |   63 +
 ...orNonStringTagHelperAttributes8.tspans.txt |    1 +
 ...orNonStringTagHelperAttributes9.cspans.txt |    8 +
 ...ForNonStringTagHelperAttributes9.stree.txt |   69 +
 ...orNonStringTagHelperAttributes9.tspans.txt |    1 +
 ...MinimizedBooleanBoundAttributes.cspans.txt |    0
 ...orMinimizedBooleanBoundAttributes.diag.txt |    2 +
 ...rMinimizedBooleanBoundAttributes.stree.txt |   21 +
 ...MinimizedBooleanBoundAttributes.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block1.cspans.txt |    8 +
 ...UnboundDataDashAttributes_Block1.stree.txt |   49 +
 ...nboundDataDashAttributes_Block1.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block2.cspans.txt |    7 +
 ...UnboundDataDashAttributes_Block2.stree.txt |   41 +
 ...nboundDataDashAttributes_Block2.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block3.cspans.txt |    9 +
 ...UnboundDataDashAttributes_Block3.stree.txt |   52 +
 ...nboundDataDashAttributes_Block3.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block4.cspans.txt |    9 +
 ...UnboundDataDashAttributes_Block4.stree.txt |   52 +
 ...nboundDataDashAttributes_Block4.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block5.cspans.txt |   10 +
 ...UnboundDataDashAttributes_Block5.stree.txt |   55 +
 ...nboundDataDashAttributes_Block5.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block6.cspans.txt |   10 +
 ...UnboundDataDashAttributes_Block6.stree.txt |   65 +
 ...nboundDataDashAttributes_Block6.tspans.txt |    1 +
 ...nboundDataDashAttributes_Block7.cspans.txt |   11 +
 ...UnboundDataDashAttributes_Block7.stree.txt |   63 +
 ...nboundDataDashAttributes_Block7.tspans.txt |    1 +
 ...undDataDashAttributes_Document1.cspans.txt |    2 +
 ...oundDataDashAttributes_Document1.stree.txt |   32 +
 ...undDataDashAttributes_Document1.tspans.txt |    1 +
 ...undDataDashAttributes_Document2.cspans.txt |    1 +
 ...oundDataDashAttributes_Document2.stree.txt |   24 +
 ...undDataDashAttributes_Document2.tspans.txt |    1 +
 ...undDataDashAttributes_Document3.cspans.txt |    3 +
 ...oundDataDashAttributes_Document3.stree.txt |   35 +
 ...undDataDashAttributes_Document3.tspans.txt |    1 +
 ...undDataDashAttributes_Document4.cspans.txt |    3 +
 ...oundDataDashAttributes_Document4.stree.txt |   35 +
 ...undDataDashAttributes_Document4.tspans.txt |    1 +
 ...undDataDashAttributes_Document5.cspans.txt |    4 +
 ...oundDataDashAttributes_Document5.stree.txt |   38 +
 ...undDataDashAttributes_Document5.tspans.txt |    1 +
 ...undDataDashAttributes_Document6.cspans.txt |    4 +
 ...oundDataDashAttributes_Document6.stree.txt |   48 +
 ...undDataDashAttributes_Document6.tspans.txt |    1 +
 ...undDataDashAttributes_Document7.cspans.txt |    5 +
 ...oundDataDashAttributes_Document7.stree.txt |   46 +
 ...undDataDashAttributes_Document7.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml1.cspans.txt |    3 +
 ...eTreeRewriter_AllowsInvalidHtml1.stree.txt |   25 +
 ...TreeRewriter_AllowsInvalidHtml1.tspans.txt |    1 +
 ...reeRewriter_AllowsInvalidHtml10.cspans.txt |    8 +
 ...TreeRewriter_AllowsInvalidHtml10.stree.txt |   53 +
 ...reeRewriter_AllowsInvalidHtml10.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml2.cspans.txt |    1 +
 ...eTreeRewriter_AllowsInvalidHtml2.stree.txt |   16 +
 ...TreeRewriter_AllowsInvalidHtml2.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml3.cspans.txt |    3 +
 ...eTreeRewriter_AllowsInvalidHtml3.stree.txt |   16 +
 ...TreeRewriter_AllowsInvalidHtml4.cspans.txt |    1 +
 ...eTreeRewriter_AllowsInvalidHtml4.stree.txt |   19 +
 ...TreeRewriter_AllowsInvalidHtml4.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml5.cspans.txt |    5 +
 ...eTreeRewriter_AllowsInvalidHtml5.stree.txt |   33 +
 ...TreeRewriter_AllowsInvalidHtml5.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml6.cspans.txt |    4 +
 ...eTreeRewriter_AllowsInvalidHtml6.stree.txt |   28 +
 ...TreeRewriter_AllowsInvalidHtml6.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml7.cspans.txt |    5 +
 ...eTreeRewriter_AllowsInvalidHtml7.stree.txt |   33 +
 ...TreeRewriter_AllowsInvalidHtml7.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml8.cspans.txt |    7 +
 ...eTreeRewriter_AllowsInvalidHtml8.stree.txt |   43 +
 ...TreeRewriter_AllowsInvalidHtml8.tspans.txt |    1 +
 ...TreeRewriter_AllowsInvalidHtml9.cspans.txt |    8 +
 ...eTreeRewriter_AllowsInvalidHtml9.stree.txt |   59 +
 ...TreeRewriter_AllowsInvalidHtml9.tspans.txt |    1 +
 ...tesErrorForIncompleteTagHelper1.cspans.txt |    5 +
 ...eatesErrorForIncompleteTagHelper1.diag.txt |    2 +
 ...atesErrorForIncompleteTagHelper1.stree.txt |   62 +
 ...tesErrorForIncompleteTagHelper1.tspans.txt |    2 +
 ...tesErrorForIncompleteTagHelper2.cspans.txt |    4 +
 ...eatesErrorForIncompleteTagHelper2.diag.txt |    1 +
 ...atesErrorForIncompleteTagHelper2.stree.txt |   32 +
 ...tesErrorForIncompleteTagHelper2.tspans.txt |    2 +
 ...tesErrorForIncompleteTagHelper3.cspans.txt |    4 +
 ...eatesErrorForIncompleteTagHelper3.diag.txt |    2 +
 ...atesErrorForIncompleteTagHelper3.stree.txt |   27 +
 ...tesErrorForIncompleteTagHelper3.tspans.txt |    2 +
 ...tesErrorForIncompleteTagHelper4.cspans.txt |    4 +
 ...eatesErrorForIncompleteTagHelper4.diag.txt |    1 +
 ...atesErrorForIncompleteTagHelper4.stree.txt |   50 +
 ...tesErrorForIncompleteTagHelper4.tspans.txt |    2 +
 ...lexAttributeTagHelperTagBlocks1.cspans.txt |    4 +
 ...plexAttributeTagHelperTagBlocks1.stree.txt |   58 +
 ...lexAttributeTagHelperTagBlocks1.tspans.txt |    1 +
 ...lexAttributeTagHelperTagBlocks2.cspans.txt |   12 +
 ...plexAttributeTagHelperTagBlocks2.stree.txt |  132 +
 ...lexAttributeTagHelperTagBlocks2.tspans.txt |    1 +
 ...lexAttributeTagHelperTagBlocks3.cspans.txt |    5 +
 ...plexAttributeTagHelperTagBlocks3.stree.txt |   62 +
 ...lexAttributeTagHelperTagBlocks3.tspans.txt |    1 +
 ...lexAttributeTagHelperTagBlocks4.cspans.txt |   13 +
 ...plexAttributeTagHelperTagBlocks4.stree.txt |  136 +
 ...lexAttributeTagHelperTagBlocks4.tspans.txt |    1 +
 ...lexAttributeTagHelperTagBlocks5.cspans.txt |    7 +
 ...plexAttributeTagHelperTagBlocks5.stree.txt |   74 +
 ...lexAttributeTagHelperTagBlocks5.tspans.txt |    2 +
 ...lexAttributeTagHelperTagBlocks6.cspans.txt |   15 +
 ...plexAttributeTagHelperTagBlocks6.stree.txt |  148 +
 ...lexAttributeTagHelperTagBlocks6.tspans.txt |    2 +
 ...lexAttributeTagHelperTagBlocks7.cspans.txt |   13 +
 ...plexAttributeTagHelperTagBlocks7.stree.txt |  104 +
 ...lexAttributeTagHelperTagBlocks7.tspans.txt |    1 +
 ...ritesComplexTagHelperTagBlocks1.cspans.txt |    2 +
 ...writesComplexTagHelperTagBlocks1.stree.txt |   22 +
 ...ritesComplexTagHelperTagBlocks1.tspans.txt |    1 +
 ...ritesComplexTagHelperTagBlocks2.cspans.txt |    6 +
 ...writesComplexTagHelperTagBlocks2.stree.txt |   61 +
 ...ritesComplexTagHelperTagBlocks2.tspans.txt |    2 +
 ...ritesComplexTagHelperTagBlocks3.cspans.txt |    3 +
 ...writesComplexTagHelperTagBlocks3.stree.txt |   27 +
 ...ritesComplexTagHelperTagBlocks3.tspans.txt |    1 +
 ...ritesComplexTagHelperTagBlocks4.cspans.txt |    7 +
 ...writesComplexTagHelperTagBlocks4.stree.txt |   66 +
 ...ritesComplexTagHelperTagBlocks4.tspans.txt |    2 +
 ...ritesComplexTagHelperTagBlocks5.cspans.txt |    5 +
 ...writesComplexTagHelperTagBlocks5.stree.txt |   44 +
 ...ritesComplexTagHelperTagBlocks5.tspans.txt |    2 +
 ...ritesComplexTagHelperTagBlocks6.cspans.txt |   13 +
 ...writesComplexTagHelperTagBlocks6.stree.txt |  122 +
 ...ritesComplexTagHelperTagBlocks6.tspans.txt |    4 +
 ...ritesComplexTagHelperTagBlocks7.cspans.txt |    9 +
 ...writesComplexTagHelperTagBlocks7.stree.txt |   55 +
 ...ritesComplexTagHelperTagBlocks7.tspans.txt |    1 +
 ...ritesComplexTagHelperTagBlocks8.cspans.txt |   17 +
 ...writesComplexTagHelperTagBlocks8.stree.txt |  133 +
 ...ritesComplexTagHelperTagBlocks8.tspans.txt |    3 +
 ...sOddlySpacedTagHelperTagBlocks1.cspans.txt |    6 +
 ...esOddlySpacedTagHelperTagBlocks1.stree.txt |   65 +
 ...sOddlySpacedTagHelperTagBlocks1.tspans.txt |    1 +
 ...sOddlySpacedTagHelperTagBlocks2.cspans.txt |    7 +
 ...esOddlySpacedTagHelperTagBlocks2.stree.txt |   69 +
 ...sOddlySpacedTagHelperTagBlocks2.tspans.txt |    1 +
 ...sOddlySpacedTagHelperTagBlocks3.cspans.txt |    7 +
 ...esOddlySpacedTagHelperTagBlocks3.stree.txt |   72 +
 ...sOddlySpacedTagHelperTagBlocks3.tspans.txt |    2 +
 ...ewritesPlainTagHelperTagBlocks1.cspans.txt |    0
 ...RewritesPlainTagHelperTagBlocks1.stree.txt |   12 +
 ...ewritesPlainTagHelperTagBlocks1.tspans.txt |    1 +
 ...ewritesPlainTagHelperTagBlocks2.cspans.txt |    1 +
 ...RewritesPlainTagHelperTagBlocks2.stree.txt |   16 +
 ...ewritesPlainTagHelperTagBlocks2.tspans.txt |    1 +
 ...ewritesPlainTagHelperTagBlocks3.cspans.txt |    3 +
 ...RewritesPlainTagHelperTagBlocks3.stree.txt |   28 +
 ...ewritesPlainTagHelperTagBlocks3.tspans.txt |    2 +
 ...ewritesPlainTagHelperTagBlocks4.cspans.txt |    4 +
 ...RewritesPlainTagHelperTagBlocks4.stree.txt |   35 +
 ...ewritesPlainTagHelperTagBlocks4.tspans.txt |    1 +
 ...riter_RewritesScriptTagHelpers1.cspans.txt |    1 +
 ...writer_RewritesScriptTagHelpers1.stree.txt |   20 +
 ...riter_RewritesScriptTagHelpers1.tspans.txt |    1 +
 ...riter_RewritesScriptTagHelpers2.cspans.txt |    1 +
 ...writer_RewritesScriptTagHelpers2.stree.txt |   24 +
 ...riter_RewritesScriptTagHelpers2.tspans.txt |    1 +
 ...riter_RewritesScriptTagHelpers3.cspans.txt |    3 +
 ...writer_RewritesScriptTagHelpers3.stree.txt |   46 +
 ...riter_RewritesScriptTagHelpers3.tspans.txt |    3 +
 ...riter_RewritesScriptTagHelpers4.cspans.txt |    3 +
 ...writer_RewritesScriptTagHelpers4.stree.txt |   43 +
 ...riter_RewritesScriptTagHelpers4.tspans.txt |    2 +
 ...riter_RewritesScriptTagHelpers5.cspans.txt |    2 +
 ...writer_RewritesScriptTagHelpers5.stree.txt |   39 +
 ...riter_RewritesScriptTagHelpers5.tspans.txt |    1 +
 ...riter_RewritesScriptTagHelpers6.cspans.txt |    4 +
 ...writer_RewritesScriptTagHelpers6.stree.txt |   56 +
 ...riter_RewritesScriptTagHelpers6.tspans.txt |    2 +
 ...riter_RewritesScriptTagHelpers7.cspans.txt |    6 +
 ...writer_RewritesScriptTagHelpers7.stree.txt |   61 +
 ...riter_RewritesScriptTagHelpers7.tspans.txt |    2 +
 ..._RewritesSelfClosingTagHelpers1.cspans.txt |    2 +
 ...r_RewritesSelfClosingTagHelpers1.stree.txt |   39 +
 ..._RewritesSelfClosingTagHelpers1.tspans.txt |    1 +
 ..._RewritesSelfClosingTagHelpers2.cspans.txt |    4 +
 ...r_RewritesSelfClosingTagHelpers2.stree.txt |   55 +
 ..._RewritesSelfClosingTagHelpers2.tspans.txt |    2 +
 ..._RewritesSelfClosingTagHelpers3.cspans.txt |    5 +
 ...r_RewritesSelfClosingTagHelpers3.stree.txt |   54 +
 ..._RewritesSelfClosingTagHelpers3.tspans.txt |    2 +
 ...sTagHelpersWithPlainAttributes1.cspans.txt |    2 +
 ...esTagHelpersWithPlainAttributes1.stree.txt |   40 +
 ...sTagHelpersWithPlainAttributes1.tspans.txt |    1 +
 ...sTagHelpersWithPlainAttributes2.cspans.txt |    3 +
 ...esTagHelpersWithPlainAttributes2.stree.txt |   44 +
 ...sTagHelpersWithPlainAttributes2.tspans.txt |    1 +
 ...sTagHelpersWithPlainAttributes3.cspans.txt |    5 +
 ...esTagHelpersWithPlainAttributes3.stree.txt |   56 +
 ...sTagHelpersWithPlainAttributes3.tspans.txt |    2 +
 ...sTagHelpersWithPlainAttributes4.cspans.txt |   10 +
 ...esTagHelpersWithPlainAttributes4.stree.txt |   77 +
 ...sTagHelpersWithPlainAttributes4.tspans.txt |    1 +
 ...HelpersWithQuotelessAttributes1.cspans.txt |    4 +
 ...gHelpersWithQuotelessAttributes1.stree.txt |   51 +
 ...HelpersWithQuotelessAttributes1.tspans.txt |    1 +
 ...HelpersWithQuotelessAttributes2.cspans.txt |    5 +
 ...gHelpersWithQuotelessAttributes2.stree.txt |   55 +
 ...HelpersWithQuotelessAttributes2.tspans.txt |    1 +
 ...HelpersWithQuotelessAttributes3.cspans.txt |    8 +
 ...gHelpersWithQuotelessAttributes3.stree.txt |   63 +
 ...HelpersWithQuotelessAttributes3.tspans.txt |    1 +
 ...HelpersWithQuotelessAttributes4.cspans.txt |    9 +
 ...gHelpersWithQuotelessAttributes4.stree.txt |   86 +
 ...HelpersWithQuotelessAttributes4.tspans.txt |    2 +
 ...HelpersWithQuotelessAttributes5.cspans.txt |   12 +
 ...gHelpersWithQuotelessAttributes5.stree.txt |   88 +
 ...HelpersWithQuotelessAttributes5.tspans.txt |    1 +
 ...standsEmptyAttributeTagHelpers1.cspans.txt |    1 +
 ...rstandsEmptyAttributeTagHelpers1.stree.txt |   24 +
 ...standsEmptyAttributeTagHelpers1.tspans.txt |    1 +
 ...standsEmptyAttributeTagHelpers2.cspans.txt |    1 +
 ...rstandsEmptyAttributeTagHelpers2.stree.txt |   24 +
 ...standsEmptyAttributeTagHelpers2.tspans.txt |    1 +
 ...standsEmptyAttributeTagHelpers3.cspans.txt |    1 +
 ...rstandsEmptyAttributeTagHelpers3.stree.txt |   20 +
 ...standsEmptyAttributeTagHelpers3.tspans.txt |    1 +
 ...standsEmptyAttributeTagHelpers4.cspans.txt |    3 +
 ...rstandsEmptyAttributeTagHelpers4.stree.txt |   43 +
 ...standsEmptyAttributeTagHelpers4.tspans.txt |    1 +
 ...standsEmptyAttributeTagHelpers5.cspans.txt |    3 +
 ...rstandsEmptyAttributeTagHelpers5.stree.txt |   39 +
 ...standsEmptyAttributeTagHelpers5.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block1.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block1.stree.txt |   33 +
 ...tandsMinimizedAttributes_Block1.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block10.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block10.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block10.stree.txt |   30 +
 ...andsMinimizedAttributes_Block10.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block11.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block11.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block11.stree.txt |   33 +
 ...andsMinimizedAttributes_Block11.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block12.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block12.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block12.stree.txt |   40 +
 ...andsMinimizedAttributes_Block12.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block13.cspans.txt |    7 +
 ...tandsMinimizedAttributes_Block13.stree.txt |   37 +
 ...andsMinimizedAttributes_Block13.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block14.cspans.txt |    7 +
 ...tandsMinimizedAttributes_Block14.stree.txt |   38 +
 ...andsMinimizedAttributes_Block14.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block15.cspans.txt |    8 +
 ...tandsMinimizedAttributes_Block15.stree.txt |   44 +
 ...andsMinimizedAttributes_Block15.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block16.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block16.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block16.stree.txt |   38 +
 ...andsMinimizedAttributes_Block16.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block17.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block17.diag.txt |    2 +
 ...tandsMinimizedAttributes_Block17.stree.txt |   39 +
 ...andsMinimizedAttributes_Block17.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block18.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block18.diag.txt |    2 +
 ...tandsMinimizedAttributes_Block18.stree.txt |   43 +
 ...andsMinimizedAttributes_Block18.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block19.cspans.txt |    6 +
 ...standsMinimizedAttributes_Block19.diag.txt |    3 +
 ...tandsMinimizedAttributes_Block19.stree.txt |   44 +
 ...andsMinimizedAttributes_Block19.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block2.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block2.diag.txt |    1 +
 ...standsMinimizedAttributes_Block2.stree.txt |   34 +
 ...tandsMinimizedAttributes_Block2.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block20.cspans.txt |    7 +
 ...tandsMinimizedAttributes_Block20.stree.txt |   47 +
 ...andsMinimizedAttributes_Block20.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block21.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block21.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block21.stree.txt |   48 +
 ...andsMinimizedAttributes_Block21.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block22.cspans.txt |    7 +
 ...tandsMinimizedAttributes_Block22.stree.txt |   47 +
 ...andsMinimizedAttributes_Block22.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block23.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block23.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block23.stree.txt |   48 +
 ...andsMinimizedAttributes_Block23.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block24.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block24.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block24.stree.txt |   47 +
 ...andsMinimizedAttributes_Block24.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block25.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block25.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block25.stree.txt |   47 +
 ...andsMinimizedAttributes_Block25.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block26.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block26.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block26.stree.txt |   47 +
 ...andsMinimizedAttributes_Block26.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block27.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block27.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block27.stree.txt |   48 +
 ...andsMinimizedAttributes_Block27.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block28.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block28.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block28.stree.txt |   47 +
 ...andsMinimizedAttributes_Block28.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block29.cspans.txt |    7 +
 ...standsMinimizedAttributes_Block29.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block29.stree.txt |   48 +
 ...andsMinimizedAttributes_Block29.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block3.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block3.diag.txt |    1 +
 ...standsMinimizedAttributes_Block3.stree.txt |   33 +
 ...tandsMinimizedAttributes_Block3.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block30.cspans.txt |   10 +
 ...standsMinimizedAttributes_Block30.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block30.stree.txt |   66 +
 ...andsMinimizedAttributes_Block30.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block31.cspans.txt |   10 +
 ...standsMinimizedAttributes_Block31.diag.txt |    1 +
 ...tandsMinimizedAttributes_Block31.stree.txt |   67 +
 ...andsMinimizedAttributes_Block31.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block32.cspans.txt |   14 +
 ...standsMinimizedAttributes_Block32.diag.txt |    2 +
 ...tandsMinimizedAttributes_Block32.stree.txt |  109 +
 ...andsMinimizedAttributes_Block32.tspans.txt |    1 +
 ...andsMinimizedAttributes_Block33.cspans.txt |   14 +
 ...standsMinimizedAttributes_Block33.diag.txt |    3 +
 ...tandsMinimizedAttributes_Block33.stree.txt |  110 +
 ...andsMinimizedAttributes_Block33.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block4.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block4.diag.txt |    1 +
 ...standsMinimizedAttributes_Block4.stree.txt |   33 +
 ...tandsMinimizedAttributes_Block4.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block5.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block5.diag.txt |    1 +
 ...standsMinimizedAttributes_Block5.stree.txt |   34 +
 ...tandsMinimizedAttributes_Block5.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block6.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block6.diag.txt |    1 +
 ...standsMinimizedAttributes_Block6.stree.txt |   30 +
 ...tandsMinimizedAttributes_Block6.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block7.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block7.diag.txt |    1 +
 ...standsMinimizedAttributes_Block7.stree.txt |   33 +
 ...tandsMinimizedAttributes_Block7.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block8.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block8.diag.txt |    2 +
 ...standsMinimizedAttributes_Block8.stree.txt |   33 +
 ...tandsMinimizedAttributes_Block8.tspans.txt |    1 +
 ...tandsMinimizedAttributes_Block9.cspans.txt |    6 +
 ...rstandsMinimizedAttributes_Block9.diag.txt |    2 +
 ...standsMinimizedAttributes_Block9.stree.txt |   30 +
 ...tandsMinimizedAttributes_Block9.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document1.cspans.txt |    0
 ...ndsMinimizedAttributes_Document1.stree.txt |   16 +
 ...dsMinimizedAttributes_Document1.tspans.txt |    1 +
 ...sMinimizedAttributes_Document10.cspans.txt |    0
 ...ndsMinimizedAttributes_Document10.diag.txt |    1 +
 ...dsMinimizedAttributes_Document10.stree.txt |   13 +
 ...sMinimizedAttributes_Document10.tspans.txt |    1 +
 ...sMinimizedAttributes_Document11.cspans.txt |    0
 ...ndsMinimizedAttributes_Document11.diag.txt |    1 +
 ...dsMinimizedAttributes_Document11.stree.txt |   16 +
 ...sMinimizedAttributes_Document11.tspans.txt |    1 +
 ...sMinimizedAttributes_Document12.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document12.diag.txt |    1 +
 ...dsMinimizedAttributes_Document12.stree.txt |   23 +
 ...sMinimizedAttributes_Document12.tspans.txt |    1 +
 ...sMinimizedAttributes_Document13.cspans.txt |    1 +
 ...dsMinimizedAttributes_Document13.stree.txt |   20 +
 ...sMinimizedAttributes_Document13.tspans.txt |    1 +
 ...sMinimizedAttributes_Document14.cspans.txt |    1 +
 ...dsMinimizedAttributes_Document14.stree.txt |   21 +
 ...sMinimizedAttributes_Document14.tspans.txt |    1 +
 ...sMinimizedAttributes_Document15.cspans.txt |    2 +
 ...dsMinimizedAttributes_Document15.stree.txt |   27 +
 ...sMinimizedAttributes_Document15.tspans.txt |    1 +
 ...sMinimizedAttributes_Document16.cspans.txt |    0
 ...ndsMinimizedAttributes_Document16.diag.txt |    1 +
 ...dsMinimizedAttributes_Document16.stree.txt |   21 +
 ...sMinimizedAttributes_Document16.tspans.txt |    1 +
 ...sMinimizedAttributes_Document17.cspans.txt |    0
 ...ndsMinimizedAttributes_Document17.diag.txt |    2 +
 ...dsMinimizedAttributes_Document17.stree.txt |   22 +
 ...sMinimizedAttributes_Document17.tspans.txt |    1 +
 ...sMinimizedAttributes_Document18.cspans.txt |    0
 ...ndsMinimizedAttributes_Document18.diag.txt |    2 +
 ...dsMinimizedAttributes_Document18.stree.txt |   26 +
 ...sMinimizedAttributes_Document18.tspans.txt |    1 +
 ...sMinimizedAttributes_Document19.cspans.txt |    0
 ...ndsMinimizedAttributes_Document19.diag.txt |    3 +
 ...dsMinimizedAttributes_Document19.stree.txt |   27 +
 ...sMinimizedAttributes_Document19.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document2.cspans.txt |    0
 ...andsMinimizedAttributes_Document2.diag.txt |    1 +
 ...ndsMinimizedAttributes_Document2.stree.txt |   17 +
 ...dsMinimizedAttributes_Document2.tspans.txt |    1 +
 ...sMinimizedAttributes_Document20.cspans.txt |    1 +
 ...dsMinimizedAttributes_Document20.stree.txt |   30 +
 ...sMinimizedAttributes_Document20.tspans.txt |    1 +
 ...sMinimizedAttributes_Document21.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document21.diag.txt |    1 +
 ...dsMinimizedAttributes_Document21.stree.txt |   31 +
 ...sMinimizedAttributes_Document21.tspans.txt |    1 +
 ...sMinimizedAttributes_Document22.cspans.txt |    1 +
 ...dsMinimizedAttributes_Document22.stree.txt |   30 +
 ...sMinimizedAttributes_Document22.tspans.txt |    1 +
 ...sMinimizedAttributes_Document23.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document23.diag.txt |    1 +
 ...dsMinimizedAttributes_Document23.stree.txt |   31 +
 ...sMinimizedAttributes_Document23.tspans.txt |    1 +
 ...sMinimizedAttributes_Document24.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document24.diag.txt |    1 +
 ...dsMinimizedAttributes_Document24.stree.txt |   30 +
 ...sMinimizedAttributes_Document24.tspans.txt |    1 +
 ...sMinimizedAttributes_Document25.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document25.diag.txt |    1 +
 ...dsMinimizedAttributes_Document25.stree.txt |   30 +
 ...sMinimizedAttributes_Document25.tspans.txt |    1 +
 ...sMinimizedAttributes_Document26.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document26.diag.txt |    1 +
 ...dsMinimizedAttributes_Document26.stree.txt |   30 +
 ...sMinimizedAttributes_Document26.tspans.txt |    1 +
 ...sMinimizedAttributes_Document27.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document27.diag.txt |    1 +
 ...dsMinimizedAttributes_Document27.stree.txt |   31 +
 ...sMinimizedAttributes_Document27.tspans.txt |    1 +
 ...sMinimizedAttributes_Document28.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document28.diag.txt |    1 +
 ...dsMinimizedAttributes_Document28.stree.txt |   30 +
 ...sMinimizedAttributes_Document28.tspans.txt |    1 +
 ...sMinimizedAttributes_Document29.cspans.txt |    1 +
 ...ndsMinimizedAttributes_Document29.diag.txt |    1 +
 ...dsMinimizedAttributes_Document29.stree.txt |   31 +
 ...sMinimizedAttributes_Document29.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document3.cspans.txt |    0
 ...andsMinimizedAttributes_Document3.diag.txt |    1 +
 ...ndsMinimizedAttributes_Document3.stree.txt |   16 +
 ...dsMinimizedAttributes_Document3.tspans.txt |    1 +
 ...sMinimizedAttributes_Document30.cspans.txt |    4 +
 ...ndsMinimizedAttributes_Document30.diag.txt |    1 +
 ...dsMinimizedAttributes_Document30.stree.txt |   49 +
 ...sMinimizedAttributes_Document30.tspans.txt |    1 +
 ...sMinimizedAttributes_Document31.cspans.txt |    4 +
 ...ndsMinimizedAttributes_Document31.diag.txt |    1 +
 ...dsMinimizedAttributes_Document31.stree.txt |   50 +
 ...sMinimizedAttributes_Document31.tspans.txt |    1 +
 ...sMinimizedAttributes_Document32.cspans.txt |    8 +
 ...ndsMinimizedAttributes_Document32.diag.txt |    2 +
 ...dsMinimizedAttributes_Document32.stree.txt |   92 +
 ...sMinimizedAttributes_Document32.tspans.txt |    1 +
 ...sMinimizedAttributes_Document33.cspans.txt |    8 +
 ...ndsMinimizedAttributes_Document33.diag.txt |    3 +
 ...dsMinimizedAttributes_Document33.stree.txt |   93 +
 ...sMinimizedAttributes_Document33.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document4.cspans.txt |    0
 ...andsMinimizedAttributes_Document4.diag.txt |    1 +
 ...ndsMinimizedAttributes_Document4.stree.txt |   16 +
 ...dsMinimizedAttributes_Document4.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document5.cspans.txt |    0
 ...andsMinimizedAttributes_Document5.diag.txt |    1 +
 ...ndsMinimizedAttributes_Document5.stree.txt |   17 +
 ...dsMinimizedAttributes_Document5.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document6.cspans.txt |    0
 ...andsMinimizedAttributes_Document6.diag.txt |    1 +
 ...ndsMinimizedAttributes_Document6.stree.txt |   13 +
 ...dsMinimizedAttributes_Document6.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document7.cspans.txt |    0
 ...andsMinimizedAttributes_Document7.diag.txt |    1 +
 ...ndsMinimizedAttributes_Document7.stree.txt |   16 +
 ...dsMinimizedAttributes_Document7.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document8.cspans.txt |    0
 ...andsMinimizedAttributes_Document8.diag.txt |    2 +
 ...ndsMinimizedAttributes_Document8.stree.txt |   16 +
 ...dsMinimizedAttributes_Document8.tspans.txt |    1 +
 ...dsMinimizedAttributes_Document9.cspans.txt |    0
 ...andsMinimizedAttributes_Document9.diag.txt |    2 +
 ...ndsMinimizedAttributes_Document9.stree.txt |   13 +
 ...dsMinimizedAttributes_Document9.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags1.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags1.diag.txt |    2 +
 ...MinimizedAttributes_PartialTags1.stree.txt |   12 +
 ...inimizedAttributes_PartialTags1.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags2.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags2.diag.txt |    3 +
 ...MinimizedAttributes_PartialTags2.stree.txt |   12 +
 ...inimizedAttributes_PartialTags2.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags3.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags3.diag.txt |    3 +
 ...MinimizedAttributes_PartialTags3.stree.txt |   12 +
 ...inimizedAttributes_PartialTags3.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags4.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags4.diag.txt |    4 +
 ...MinimizedAttributes_PartialTags4.stree.txt |   22 +
 ...inimizedAttributes_PartialTags4.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags5.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags5.diag.txt |    3 +
 ...MinimizedAttributes_PartialTags5.stree.txt |   12 +
 ...inimizedAttributes_PartialTags5.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags6.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags6.diag.txt |    3 +
 ...MinimizedAttributes_PartialTags6.stree.txt |   12 +
 ...inimizedAttributes_PartialTags6.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags7.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags7.diag.txt |    4 +
 ...MinimizedAttributes_PartialTags7.stree.txt |   17 +
 ...inimizedAttributes_PartialTags7.tspans.txt |    1 +
 ...inimizedAttributes_PartialTags8.cspans.txt |    0
 ...sMinimizedAttributes_PartialTags8.diag.txt |    8 +
 ...MinimizedAttributes_PartialTags8.stree.txt |   37 +
 ...inimizedAttributes_PartialTags8.tspans.txt |    2 +
 ...MinimizedBooleanBoundAttributes.cspans.txt |    0
 ...sMinimizedBooleanBoundAttributes.stree.txt |   21 +
 ...MinimizedBooleanBoundAttributes.tspans.txt |    1 +
 .../AllowsPrefixedTagHelpers1.cspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers1.stree.txt       |   11 +
 .../AllowsPrefixedTagHelpers10.cspans.txt     |    2 +
 .../AllowsPrefixedTagHelpers10.stree.txt      |   32 +
 .../AllowsPrefixedTagHelpers10.tspans.txt     |    1 +
 .../AllowsPrefixedTagHelpers11.cspans.txt     |    2 +
 .../AllowsPrefixedTagHelpers11.stree.txt      |   33 +
 .../AllowsPrefixedTagHelpers11.tspans.txt     |    1 +
 .../AllowsPrefixedTagHelpers2.cspans.txt      |    3 +
 .../AllowsPrefixedTagHelpers2.stree.txt       |   18 +
 .../AllowsPrefixedTagHelpers3.cspans.txt      |    0
 .../AllowsPrefixedTagHelpers3.stree.txt       |   11 +
 .../AllowsPrefixedTagHelpers3.tspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers4.cspans.txt      |    0
 .../AllowsPrefixedTagHelpers4.stree.txt       |   12 +
 .../AllowsPrefixedTagHelpers4.tspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers5.cspans.txt      |    2 +
 .../AllowsPrefixedTagHelpers5.stree.txt       |   22 +
 .../AllowsPrefixedTagHelpers5.tspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers6.cspans.txt      |    3 +
 .../AllowsPrefixedTagHelpers6.stree.txt       |   12 +
 .../AllowsPrefixedTagHelpers7.cspans.txt      |    6 +
 .../AllowsPrefixedTagHelpers7.stree.txt       |   14 +
 .../AllowsPrefixedTagHelpers8.cspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers8.stree.txt       |   25 +
 .../AllowsPrefixedTagHelpers8.tspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers9.cspans.txt      |    1 +
 .../AllowsPrefixedTagHelpers9.stree.txt       |   25 +
 .../AllowsPrefixedTagHelpers9.tspans.txt      |    1 +
 .../AllowsRazorCommentsAsChildren.cspans.txt  |    8 +
 .../AllowsRazorCommentsAsChildren.stree.txt   |   30 +
 .../AllowsRazorCommentsAsChildren.tspans.txt  |    1 +
 .../AllowsRazorMarkupInHtmlComment.cspans.txt |    8 +
 .../AllowsRazorMarkupInHtmlComment.stree.txt  |   43 +
 .../AllowsRazorMarkupInHtmlComment.tspans.txt |    1 +
 ...owsSimpleHtmlCommentsAsChildren.cspans.txt |    6 +
 ...lowsSimpleHtmlCommentsAsChildren.stree.txt |   36 +
 ...owsSimpleHtmlCommentsAsChildren.tspans.txt |    1 +
 ...gInCSharpBlock_WithAttrTextTag1.cspans.txt |   11 +
 ...TagInCSharpBlock_WithAttrTextTag1.diag.txt |    2 +
 ...agInCSharpBlock_WithAttrTextTag1.stree.txt |   37 +
 ...gInCSharpBlock_WithAttrTextTag2.cspans.txt |   16 +
 ...agInCSharpBlock_WithAttrTextTag2.stree.txt |   45 +
 ...gInCSharpBlock_WithAttrTextTag3.cspans.txt |   17 +
 ...agInCSharpBlock_WithAttrTextTag3.stree.txt |   51 +
 ...gInCSharpBlock_WithAttrTextTag4.cspans.txt |   19 +
 ...agInCSharpBlock_WithAttrTextTag4.stree.txt |   60 +
 ...gInCSharpBlock_WithAttrTextTag5.cspans.txt |   20 +
 ...agInCSharpBlock_WithAttrTextTag5.stree.txt |   64 +
 ...InCSharpBlock_WithBlockTextTag1.cspans.txt |    7 +
 ...agInCSharpBlock_WithBlockTextTag1.diag.txt |    2 +
 ...gInCSharpBlock_WithBlockTextTag1.stree.txt |   23 +
 ...InCSharpBlock_WithBlockTextTag2.cspans.txt |    9 +
 ...agInCSharpBlock_WithBlockTextTag2.diag.txt |    1 +
 ...gInCSharpBlock_WithBlockTextTag2.stree.txt |   26 +
 ...InCSharpBlock_WithBlockTextTag3.cspans.txt |   12 +
 ...gInCSharpBlock_WithBlockTextTag3.stree.txt |   31 +
 ...InCSharpBlock_WithBlockTextTag4.cspans.txt |   13 +
 ...gInCSharpBlock_WithBlockTextTag4.stree.txt |   37 +
 ...InCSharpBlock_WithBlockTextTag5.cspans.txt |   10 +
 ...agInCSharpBlock_WithBlockTextTag5.diag.txt |    2 +
 ...gInCSharpBlock_WithBlockTextTag5.stree.txt |   31 +
 ...InCSharpBlock_WithBlockTextTag6.cspans.txt |   10 +
 ...agInCSharpBlock_WithBlockTextTag6.diag.txt |    1 +
 ...gInCSharpBlock_WithBlockTextTag6.stree.txt |   31 +
 ...InCSharpBlock_WithBlockTextTag7.cspans.txt |   12 +
 ...gInCSharpBlock_WithBlockTextTag7.stree.txt |   41 +
 ...InCSharpBlock_WithBlockTextTag7.tspans.txt |    1 +
 ...InCSharpBlock_WithBlockTextTag8.cspans.txt |   11 +
 ...agInCSharpBlock_WithBlockTextTag8.diag.txt |    2 +
 ...gInCSharpBlock_WithBlockTextTag8.stree.txt |   34 +
 ...InCSharpBlock_WithBlockTextTag9.cspans.txt |   13 +
 ...agInCSharpBlock_WithBlockTextTag9.diag.txt |    2 +
 ...gInCSharpBlock_WithBlockTextTag9.stree.txt |   38 +
 ...perElementOptForIncompleteHTML1.cspans.txt |    1 +
 ...lperElementOptForIncompleteHTML1.stree.txt |    5 +
 ...perElementOptForIncompleteHTML2.cspans.txt |    3 +
 ...lperElementOptForIncompleteHTML2.stree.txt |    8 +
 ...perElementOptForIncompleteHTML3.cspans.txt |    3 +
 ...lperElementOptForIncompleteHTML3.stree.txt |   14 +
 ...perElementOptForIncompleteHTML4.cspans.txt |    4 +
 ...lperElementOptForIncompleteHTML4.stree.txt |   14 +
 ...perElementOptForIncompleteHTML5.cspans.txt |    5 +
 ...lperElementOptForIncompleteHTML5.stree.txt |   20 +
 ...perElementOptForIncompleteHTML6.cspans.txt |    6 +
 ...lperElementOptForIncompleteHTML6.stree.txt |   22 +
 ...perElementOptForIncompleteHTML7.cspans.txt |    7 +
 ...lperElementOptForIncompleteHTML7.stree.txt |   28 +
 ...ForIncompleteHTMLInCSharpBlock1.cspans.txt |    6 +
 ...ptForIncompleteHTMLInCSharpBlock1.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock1.stree.txt |   21 +
 ...ForIncompleteHTMLInCSharpBlock2.cspans.txt |    6 +
 ...ptForIncompleteHTMLInCSharpBlock2.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock2.stree.txt |   21 +
 ...ForIncompleteHTMLInCSharpBlock3.cspans.txt |    7 +
 ...ptForIncompleteHTMLInCSharpBlock3.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock3.stree.txt |   30 +
 ...ForIncompleteHTMLInCSharpBlock4.cspans.txt |    8 +
 ...ptForIncompleteHTMLInCSharpBlock4.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock4.stree.txt |   31 +
 ...ForIncompleteHTMLInCSharpBlock5.cspans.txt |    8 +
 ...ptForIncompleteHTMLInCSharpBlock5.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock5.stree.txt |   33 +
 ...ForIncompleteHTMLInCSharpBlock6.cspans.txt |   11 +
 ...ptForIncompleteHTMLInCSharpBlock6.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock6.stree.txt |   41 +
 ...ForIncompleteHTMLInCSharpBlock7.cspans.txt |   10 +
 ...ptForIncompleteHTMLInCSharpBlock7.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock7.stree.txt |   38 +
 ...ForIncompleteHTMLInCSharpBlock8.cspans.txt |   11 +
 ...ptForIncompleteHTMLInCSharpBlock8.diag.txt |    2 +
 ...tForIncompleteHTMLInCSharpBlock8.stree.txt |   44 +
 ...IncompleteTextTagInCSharpBlock1.cspans.txt |    6 +
 ...orIncompleteTextTagInCSharpBlock1.diag.txt |    2 +
 ...rIncompleteTextTagInCSharpBlock1.stree.txt |   21 +
 ...IncompleteTextTagInCSharpBlock2.cspans.txt |    7 +
 ...orIncompleteTextTagInCSharpBlock2.diag.txt |    2 +
 ...rIncompleteTextTagInCSharpBlock2.stree.txt |   30 +
 ...IncompleteTextTagInCSharpBlock3.cspans.txt |    8 +
 ...orIncompleteTextTagInCSharpBlock3.diag.txt |    2 +
 ...rIncompleteTextTagInCSharpBlock3.stree.txt |   31 +
 ...IncompleteTextTagInCSharpBlock4.cspans.txt |    8 +
 ...orIncompleteTextTagInCSharpBlock4.diag.txt |    2 +
 ...rIncompleteTextTagInCSharpBlock4.stree.txt |   33 +
 ...IncompleteTextTagInCSharpBlock5.cspans.txt |   10 +
 ...orIncompleteTextTagInCSharpBlock5.diag.txt |    2 +
 ...rIncompleteTextTagInCSharpBlock5.stree.txt |   38 +
 ...IncompleteTextTagInCSharpBlock6.cspans.txt |   11 +
 ...orIncompleteTextTagInCSharpBlock6.diag.txt |    2 +
 ...rIncompleteTextTagInCSharpBlock6.stree.txt |   44 +
 ...OptOutCSharp_WithAttributeData1.cspans.txt |   11 +
 ...ntOptOutCSharp_WithAttributeData1.diag.txt |    2 +
 ...tOptOutCSharp_WithAttributeData1.stree.txt |   37 +
 ...OptOutCSharp_WithAttributeData2.cspans.txt |   16 +
 ...tOptOutCSharp_WithAttributeData2.stree.txt |   45 +
 ...OptOutCSharp_WithAttributeData3.cspans.txt |   17 +
 ...tOptOutCSharp_WithAttributeData3.stree.txt |   51 +
 ...OptOutCSharp_WithAttributeData4.cspans.txt |   19 +
 ...tOptOutCSharp_WithAttributeData4.stree.txt |   60 +
 ...OptOutCSharp_WithAttributeData5.cspans.txt |   20 +
 ...tOptOutCSharp_WithAttributeData5.stree.txt |   64 +
 ...mentOptOutCSharp_WithBlockData1.cspans.txt |    7 +
 ...lementOptOutCSharp_WithBlockData1.diag.txt |    2 +
 ...ementOptOutCSharp_WithBlockData1.stree.txt |   23 +
 ...entOptOutCSharp_WithBlockData10.cspans.txt |   10 +
 ...ementOptOutCSharp_WithBlockData10.diag.txt |    4 +
 ...mentOptOutCSharp_WithBlockData10.stree.txt |   38 +
 ...entOptOutCSharp_WithBlockData10.tspans.txt |    1 +
 ...entOptOutCSharp_WithBlockData11.cspans.txt |   12 +
 ...mentOptOutCSharp_WithBlockData11.stree.txt |   42 +
 ...entOptOutCSharp_WithBlockData11.tspans.txt |    1 +
 ...entOptOutCSharp_WithBlockData12.cspans.txt |   16 +
 ...ementOptOutCSharp_WithBlockData12.diag.txt |    6 +
 ...mentOptOutCSharp_WithBlockData12.stree.txt |   57 +
 ...entOptOutCSharp_WithBlockData12.tspans.txt |    2 +
 ...mentOptOutCSharp_WithBlockData2.cspans.txt |    9 +
 ...lementOptOutCSharp_WithBlockData2.diag.txt |    1 +
 ...ementOptOutCSharp_WithBlockData2.stree.txt |   26 +
 ...mentOptOutCSharp_WithBlockData3.cspans.txt |   12 +
 ...ementOptOutCSharp_WithBlockData3.stree.txt |   31 +
 ...mentOptOutCSharp_WithBlockData4.cspans.txt |   13 +
 ...ementOptOutCSharp_WithBlockData4.stree.txt |   37 +
 ...mentOptOutCSharp_WithBlockData5.cspans.txt |   10 +
 ...lementOptOutCSharp_WithBlockData5.diag.txt |    2 +
 ...ementOptOutCSharp_WithBlockData5.stree.txt |   31 +
 ...mentOptOutCSharp_WithBlockData6.cspans.txt |    9 +
 ...lementOptOutCSharp_WithBlockData6.diag.txt |    2 +
 ...ementOptOutCSharp_WithBlockData6.stree.txt |   31 +
 ...mentOptOutCSharp_WithBlockData6.tspans.txt |    1 +
 ...mentOptOutCSharp_WithBlockData7.cspans.txt |   12 +
 ...ementOptOutCSharp_WithBlockData7.stree.txt |   41 +
 ...mentOptOutCSharp_WithBlockData7.tspans.txt |    1 +
 ...mentOptOutCSharp_WithBlockData8.cspans.txt |   10 +
 ...lementOptOutCSharp_WithBlockData8.diag.txt |    3 +
 ...ementOptOutCSharp_WithBlockData8.stree.txt |   34 +
 ...mentOptOutCSharp_WithBlockData8.tspans.txt |    1 +
 ...mentOptOutCSharp_WithBlockData9.cspans.txt |   13 +
 ...lementOptOutCSharp_WithBlockData9.diag.txt |    2 +
 ...ementOptOutCSharp_WithBlockData9.stree.txt |   38 +
 ...ntOptOutHTML_WithAttributeData1.cspans.txt |    7 +
 ...entOptOutHTML_WithAttributeData1.stree.txt |   22 +
 ...ntOptOutHTML_WithAttributeData2.cspans.txt |   10 +
 ...entOptOutHTML_WithAttributeData2.stree.txt |   28 +
 ...ntOptOutHTML_WithAttributeData3.cspans.txt |   11 +
 ...entOptOutHTML_WithAttributeData3.stree.txt |   34 +
 ...ntOptOutHTML_WithAttributeData4.cspans.txt |   13 +
 ...entOptOutHTML_WithAttributeData4.stree.txt |   43 +
 ...ntOptOutHTML_WithAttributeData5.cspans.txt |   14 +
 ...entOptOutHTML_WithAttributeData5.stree.txt |   47 +
 ...lementOptOutHTML_WithBlockData1.cspans.txt |    3 +
 ...ElementOptOutHTML_WithBlockData1.stree.txt |    8 +
 ...ementOptOutHTML_WithBlockData10.cspans.txt |    3 +
 ...lementOptOutHTML_WithBlockData10.stree.txt |   19 +
 ...ementOptOutHTML_WithBlockData10.tspans.txt |    1 +
 ...ementOptOutHTML_WithBlockData11.cspans.txt |    6 +
 ...lementOptOutHTML_WithBlockData11.stree.txt |   24 +
 ...ementOptOutHTML_WithBlockData11.tspans.txt |    1 +
 ...ementOptOutHTML_WithBlockData12.cspans.txt |    9 +
 ...ElementOptOutHTML_WithBlockData12.diag.txt |    1 +
 ...lementOptOutHTML_WithBlockData12.stree.txt |   37 +
 ...ementOptOutHTML_WithBlockData12.tspans.txt |    2 +
 ...lementOptOutHTML_WithBlockData2.cspans.txt |    3 +
 ...ElementOptOutHTML_WithBlockData2.stree.txt |    9 +
 ...lementOptOutHTML_WithBlockData3.cspans.txt |    6 +
 ...ElementOptOutHTML_WithBlockData3.stree.txt |   14 +
 ...lementOptOutHTML_WithBlockData4.cspans.txt |    7 +
 ...ElementOptOutHTML_WithBlockData4.stree.txt |   20 +
 ...lementOptOutHTML_WithBlockData5.cspans.txt |    4 +
 ...rElementOptOutHTML_WithBlockData5.diag.txt |    1 +
 ...ElementOptOutHTML_WithBlockData5.stree.txt |   14 +
 ...lementOptOutHTML_WithBlockData6.cspans.txt |    3 +
 ...rElementOptOutHTML_WithBlockData6.diag.txt |    1 +
 ...ElementOptOutHTML_WithBlockData6.stree.txt |   14 +
 ...lementOptOutHTML_WithBlockData6.tspans.txt |    1 +
 ...lementOptOutHTML_WithBlockData7.cspans.txt |    6 +
 ...ElementOptOutHTML_WithBlockData7.stree.txt |   24 +
 ...lementOptOutHTML_WithBlockData7.tspans.txt |    1 +
 ...lementOptOutHTML_WithBlockData8.cspans.txt |    6 +
 ...rElementOptOutHTML_WithBlockData8.diag.txt |    1 +
 ...ElementOptOutHTML_WithBlockData8.stree.txt |   19 +
 ...lementOptOutHTML_WithBlockData8.tspans.txt |    1 +
 ...lementOptOutHTML_WithBlockData9.cspans.txt |    7 +
 ...rElementOptOutHTML_WithBlockData9.diag.txt |    1 +
 ...ElementOptOutHTML_WithBlockData9.stree.txt |   20 +
 ...leInvalidChildrenWithWhitespace.cspans.txt |    5 +
 ...ndleInvalidChildrenWithWhitespace.diag.txt |    1 +
 ...dleInvalidChildrenWithWhitespace.stree.txt |   33 +
 ...leInvalidChildrenWithWhitespace.tspans.txt |    1 +
 ...leTagHelpersWithAllowedChildren.cspans.txt |    1 +
 ...pleTagHelpersWithAllowedChildren.stree.txt |   31 +
 ...leTagHelpersWithAllowedChildren.tspans.txt |    3 +
 ...persWithAllowedChildren_OneNull.cspans.txt |    1 +
 ...lpersWithAllowedChildren_OneNull.stree.txt |   31 +
 ...persWithAllowedChildren_OneNull.tspans.txt |    3 +
 ...CanHandleStartTagOnlyTagTagMode.cspans.txt |    0
 .../CanHandleStartTagOnlyTagTagMode.stree.txt |    7 +
 ...CanHandleStartTagOnlyTagTagMode.tspans.txt |    1 +
 ...rorForInconsistentTagStructures.cspans.txt |    0
 ...ErrorForInconsistentTagStructures.diag.txt |    1 +
 ...rrorForInconsistentTagStructures.stree.txt |    7 +
 ...rorForInconsistentTagStructures.tspans.txt |    1 +
 ...outEndTagTagStructureForEndTags.cspans.txt |    1 +
 ...thoutEndTagTagStructureForEndTags.diag.txt |    1 +
 ...houtEndTagTagStructureForEndTags.stree.txt |    8 +
 ...NotRewriteSpecialTagTagHelpers1.cspans.txt |    5 +
 ...esNotRewriteSpecialTagTagHelpers1.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers1.stree.txt |   26 +
 ...NotRewriteSpecialTagTagHelpers2.cspans.txt |    8 +
 ...esNotRewriteSpecialTagTagHelpers2.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers2.stree.txt |   32 +
 ...NotRewriteSpecialTagTagHelpers3.cspans.txt |    3 +
 ...esNotRewriteSpecialTagTagHelpers3.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers3.stree.txt |   23 +
 ...NotRewriteSpecialTagTagHelpers4.cspans.txt |    6 +
 ...esNotRewriteSpecialTagTagHelpers4.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers4.stree.txt |   29 +
 ...NotRewriteSpecialTagTagHelpers5.cspans.txt |    6 +
 ...esNotRewriteSpecialTagTagHelpers5.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers5.stree.txt |   28 +
 ...NotRewriteSpecialTagTagHelpers6.cspans.txt |    3 +
 ...esNotRewriteSpecialTagTagHelpers6.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers6.stree.txt |   24 +
 ...NotRewriteSpecialTagTagHelpers7.cspans.txt |    3 +
 ...esNotRewriteSpecialTagTagHelpers7.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers7.stree.txt |   26 +
 ...NotRewriteSpecialTagTagHelpers8.cspans.txt |    6 +
 ...esNotRewriteSpecialTagTagHelpers8.diag.txt |    5 +
 ...sNotRewriteSpecialTagTagHelpers8.stree.txt |   32 +
 ...iteTextTagTransitionTagHelpers1.cspans.txt |    1 +
 ...riteTextTagTransitionTagHelpers1.stree.txt |   16 +
 ...iteTextTagTransitionTagHelpers1.tspans.txt |    1 +
 ...iteTextTagTransitionTagHelpers2.cspans.txt |    9 +
 ...riteTextTagTransitionTagHelpers2.stree.txt |   33 +
 ...iteTextTagTransitionTagHelpers3.cspans.txt |    9 +
 ...riteTextTagTransitionTagHelpers3.stree.txt |   43 +
 ...iteTextTagTransitionTagHelpers3.tspans.txt |    1 +
 ...iteTextTagTransitionTagHelpers4.cspans.txt |    7 +
 ...riteTextTagTransitionTagHelpers4.stree.txt |   43 +
 ...iteTextTagTransitionTagHelpers4.tspans.txt |    2 +
 ...rsInInvalidHtmlTypedScriptTags1.cspans.txt |    5 +
 ...ersInInvalidHtmlTypedScriptTags1.stree.txt |   23 +
 ...rsInInvalidHtmlTypedScriptTags2.cspans.txt |    7 +
 ...ersInInvalidHtmlTypedScriptTags2.stree.txt |   34 +
 ...rsInInvalidHtmlTypedScriptTags3.cspans.txt |    8 +
 ...ersInInvalidHtmlTypedScriptTags3.stree.txt |   39 +
 ...rsInInvalidHtmlTypedScriptTags4.cspans.txt |   10 +
 ...ersInInvalidHtmlTypedScriptTags4.stree.txt |   50 +
 ...sAsChildrenWhenFeatureFlagIsOff.cspans.txt |    3 +
 ...ntsAsChildrenWhenFeatureFlagIsOff.diag.txt |    3 +
 ...tsAsChildrenWhenFeatureFlagIsOff.stree.txt |   22 +
 ...sAsChildrenWhenFeatureFlagIsOff.tspans.txt |    1 +
 ...orContentWithCommentsAsChildren.cspans.txt |    7 +
 ...sForContentWithCommentsAsChildren.diag.txt |    1 +
 ...ForContentWithCommentsAsChildren.stree.txt |   34 +
 ...orContentWithCommentsAsChildren.tspans.txt |    1 +
 ...estedNonTagHelperTags_Correctly.cspans.txt |    7 +
 ...dNestedNonTagHelperTags_Correctly.diag.txt |    1 +
 ...NestedNonTagHelperTags_Correctly.stree.txt |   28 +
 ...erStartAndEndVoidTags_Correctly.cspans.txt |    3 +
 ...perStartAndEndVoidTags_Correctly.stree.txt |   14 +
 ...AllowedChildrenAndRequireParent.cspans.txt |    1 +
 ...ndAllowedChildrenAndRequireParent.diag.txt |    1 +
 ...dAllowedChildrenAndRequireParent.stree.txt |   18 +
 ...AllowedChildrenAndRequireParent.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly1.cspans.txt |    3 +
 ...sCreateTagHelperBlocksCorrectly1.stree.txt |   36 +
 ...CreateTagHelperBlocksCorrectly1.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly10.cspans.txt |    8 +
 ...CreateTagHelperBlocksCorrectly10.stree.txt |   80 +
 ...reateTagHelperBlocksCorrectly10.tspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly2.cspans.txt |    3 +
 ...sCreateTagHelperBlocksCorrectly2.stree.txt |   36 +
 ...CreateTagHelperBlocksCorrectly2.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly3.cspans.txt |    5 +
 ...sCreateTagHelperBlocksCorrectly3.stree.txt |   46 +
 ...CreateTagHelperBlocksCorrectly3.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly4.cspans.txt |    5 +
 ...sCreateTagHelperBlocksCorrectly4.stree.txt |   46 +
 ...CreateTagHelperBlocksCorrectly4.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly5.cspans.txt |    4 +
 ...sCreateTagHelperBlocksCorrectly5.stree.txt |   60 +
 ...CreateTagHelperBlocksCorrectly5.tspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly6.cspans.txt |    4 +
 ...sCreateTagHelperBlocksCorrectly6.stree.txt |   60 +
 ...CreateTagHelperBlocksCorrectly6.tspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly7.cspans.txt |    4 +
 ...sCreateTagHelperBlocksCorrectly7.stree.txt |   60 +
 ...CreateTagHelperBlocksCorrectly7.tspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly8.cspans.txt |    4 +
 ...sCreateTagHelperBlocksCorrectly8.stree.txt |   60 +
 ...CreateTagHelperBlocksCorrectly8.tspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly9.cspans.txt |    8 +
 ...sCreateTagHelperBlocksCorrectly9.stree.txt |   80 +
 ...CreateTagHelperBlocksCorrectly9.tspans.txt |    2 +
 ...gHelperPrefixAndAllowedChildren.cspans.txt |    2 +
 ...agHelperPrefixAndAllowedChildren.stree.txt |   22 +
 ...gHelperPrefixAndAllowedChildren.tspans.txt |    1 +
 ...teMismatchAndRestrictedChildren.cspans.txt |    2 +
 ...buteMismatchAndRestrictedChildren.diag.txt |    1 +
 ...uteMismatchAndRestrictedChildren.stree.txt |   27 +
 ...teMismatchAndRestrictedChildren.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly1.cspans.txt |    1 +
 ...lformedTagHelperBlocksCorrectly1.stree.txt |    7 +
 ...ormedTagHelperBlocksCorrectly10.cspans.txt |    2 +
 ...lformedTagHelperBlocksCorrectly10.diag.txt |    2 +
 ...formedTagHelperBlocksCorrectly10.stree.txt |   43 +
 ...ormedTagHelperBlocksCorrectly10.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly2.cspans.txt |    1 +
 ...alformedTagHelperBlocksCorrectly2.diag.txt |    2 +
 ...lformedTagHelperBlocksCorrectly2.stree.txt |   21 +
 ...formedTagHelperBlocksCorrectly2.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly3.cspans.txt |    2 +
 ...alformedTagHelperBlocksCorrectly3.diag.txt |    2 +
 ...lformedTagHelperBlocksCorrectly3.stree.txt |   35 +
 ...formedTagHelperBlocksCorrectly3.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly4.cspans.txt |    2 +
 ...lformedTagHelperBlocksCorrectly4.stree.txt |   12 +
 ...formedTagHelperBlocksCorrectly5.cspans.txt |    1 +
 ...alformedTagHelperBlocksCorrectly5.diag.txt |    1 +
 ...lformedTagHelperBlocksCorrectly5.stree.txt |   26 +
 ...formedTagHelperBlocksCorrectly5.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly6.cspans.txt |    2 +
 ...alformedTagHelperBlocksCorrectly6.diag.txt |    1 +
 ...lformedTagHelperBlocksCorrectly6.stree.txt |   40 +
 ...formedTagHelperBlocksCorrectly6.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly7.cspans.txt |    2 +
 ...alformedTagHelperBlocksCorrectly7.diag.txt |    2 +
 ...lformedTagHelperBlocksCorrectly7.stree.txt |   29 +
 ...formedTagHelperBlocksCorrectly7.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly8.cspans.txt |    3 +
 ...alformedTagHelperBlocksCorrectly8.diag.txt |    2 +
 ...lformedTagHelperBlocksCorrectly8.stree.txt |   43 +
 ...formedTagHelperBlocksCorrectly8.tspans.txt |    1 +
 ...formedTagHelperBlocksCorrectly9.cspans.txt |    1 +
 ...alformedTagHelperBlocksCorrectly9.diag.txt |    2 +
 ...lformedTagHelperBlocksCorrectly9.stree.txt |   29 +
 ...formedTagHelperBlocksCorrectly9.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly1.cspans.txt |    1 +
 ...sCreateTagHelperBlocksCorrectly1.stree.txt |   11 +
 ...reateTagHelperBlocksCorrectly10.cspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly10.stree.txt |   25 +
 ...reateTagHelperBlocksCorrectly10.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly11.cspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly11.stree.txt |   34 +
 ...reateTagHelperBlocksCorrectly11.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly12.cspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly12.stree.txt |   32 +
 ...reateTagHelperBlocksCorrectly12.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly13.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly13.stree.txt |   41 +
 ...reateTagHelperBlocksCorrectly13.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly14.cspans.txt |    5 +
 ...CreateTagHelperBlocksCorrectly14.stree.txt |   25 +
 ...reateTagHelperBlocksCorrectly15.cspans.txt |    6 +
 ...CreateTagHelperBlocksCorrectly15.stree.txt |   26 +
 ...reateTagHelperBlocksCorrectly16.cspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly16.stree.txt |   39 +
 ...reateTagHelperBlocksCorrectly16.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly17.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly17.stree.txt |   48 +
 ...reateTagHelperBlocksCorrectly17.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly18.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly18.stree.txt |   46 +
 ...reateTagHelperBlocksCorrectly18.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly19.cspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly19.stree.txt |   37 +
 ...reateTagHelperBlocksCorrectly19.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly2.cspans.txt |    2 +
 ...sCreateTagHelperBlocksCorrectly2.stree.txt |   12 +
 ...reateTagHelperBlocksCorrectly20.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly20.stree.txt |   48 +
 ...reateTagHelperBlocksCorrectly20.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly21.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly21.stree.txt |   44 +
 ...reateTagHelperBlocksCorrectly21.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly22.cspans.txt |    5 +
 ...CreateTagHelperBlocksCorrectly22.stree.txt |   64 +
 ...reateTagHelperBlocksCorrectly22.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly23.cspans.txt |    7 +
 ...CreateTagHelperBlocksCorrectly23.stree.txt |   54 +
 ...reateTagHelperBlocksCorrectly23.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly24.cspans.txt |    2 +
 ...CreateTagHelperBlocksCorrectly24.stree.txt |   39 +
 ...reateTagHelperBlocksCorrectly24.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly25.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly25.stree.txt |   46 +
 ...reateTagHelperBlocksCorrectly25.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly26.cspans.txt |    3 +
 ...CreateTagHelperBlocksCorrectly26.stree.txt |   51 +
 ...reateTagHelperBlocksCorrectly26.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly27.cspans.txt |    4 +
 ...CreateTagHelperBlocksCorrectly27.stree.txt |   61 +
 ...reateTagHelperBlocksCorrectly27.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly28.cspans.txt |    6 +
 ...CreateTagHelperBlocksCorrectly28.stree.txt |   66 +
 ...reateTagHelperBlocksCorrectly28.tspans.txt |    1 +
 ...reateTagHelperBlocksCorrectly29.cspans.txt |    7 +
 ...CreateTagHelperBlocksCorrectly29.stree.txt |   90 +
 ...reateTagHelperBlocksCorrectly29.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly3.cspans.txt |    1 +
 ...sCreateTagHelperBlocksCorrectly3.stree.txt |   11 +
 ...reateTagHelperBlocksCorrectly30.cspans.txt |    8 +
 ...CreateTagHelperBlocksCorrectly30.stree.txt |   71 +
 ...reateTagHelperBlocksCorrectly30.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly4.cspans.txt |    2 +
 ...sCreateTagHelperBlocksCorrectly4.stree.txt |   12 +
 ...CreateTagHelperBlocksCorrectly5.cspans.txt |    1 +
 ...sCreateTagHelperBlocksCorrectly5.stree.txt |   25 +
 ...CreateTagHelperBlocksCorrectly5.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly6.cspans.txt |    2 +
 ...sCreateTagHelperBlocksCorrectly6.stree.txt |   34 +
 ...CreateTagHelperBlocksCorrectly6.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly7.cspans.txt |    2 +
 ...sCreateTagHelperBlocksCorrectly7.stree.txt |   32 +
 ...CreateTagHelperBlocksCorrectly7.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly8.cspans.txt |    3 +
 ...sCreateTagHelperBlocksCorrectly8.stree.txt |   41 +
 ...CreateTagHelperBlocksCorrectly8.tspans.txt |    1 +
 ...CreateTagHelperBlocksCorrectly9.cspans.txt |    6 +
 ...sCreateTagHelperBlocksCorrectly9.stree.txt |   42 +
 ...CreateTagHelperBlocksCorrectly9.tspans.txt |    1 +
 ...writesNestedTagHelperTagBlocks1.cspans.txt |    0
 ...ewritesNestedTagHelperTagBlocks1.stree.txt |   22 +
 ...writesNestedTagHelperTagBlocks1.tspans.txt |    2 +
 ...writesNestedTagHelperTagBlocks2.cspans.txt |    1 +
 ...ewritesNestedTagHelperTagBlocks2.stree.txt |   27 +
 ...writesNestedTagHelperTagBlocks2.tspans.txt |    2 +
 ...writesNestedTagHelperTagBlocks3.cspans.txt |    4 +
 ...ewritesNestedTagHelperTagBlocks3.stree.txt |   50 +
 ...writesNestedTagHelperTagBlocks3.tspans.txt |    4 +
 ...writesNestedTagHelperTagBlocks4.cspans.txt |    8 +
 ...ewritesNestedTagHelperTagBlocks4.stree.txt |   50 +
 ...writesNestedTagHelperTagBlocks4.tspans.txt |    2 +
 .../UnderstandsAllowedChildren1.cspans.txt    |    0
 .../UnderstandsAllowedChildren1.stree.txt     |   21 +
 .../UnderstandsAllowedChildren1.tspans.txt    |    2 +
 .../UnderstandsAllowedChildren10.cspans.txt   |    5 +
 .../UnderstandsAllowedChildren10.diag.txt     |    5 +
 .../UnderstandsAllowedChildren10.stree.txt    |   56 +
 .../UnderstandsAllowedChildren10.tspans.txt   |    4 +
 .../UnderstandsAllowedChildren11.cspans.txt   |    7 +
 .../UnderstandsAllowedChildren11.diag.txt     |    2 +
 .../UnderstandsAllowedChildren11.stree.txt    |   56 +
 .../UnderstandsAllowedChildren11.tspans.txt   |    3 +
 .../UnderstandsAllowedChildren12.cspans.txt   |    1 +
 .../UnderstandsAllowedChildren12.diag.txt     |    1 +
 .../UnderstandsAllowedChildren12.stree.txt    |   18 +
 .../UnderstandsAllowedChildren12.tspans.txt   |    1 +
 .../UnderstandsAllowedChildren13.cspans.txt   |    1 +
 .../UnderstandsAllowedChildren13.diag.txt     |    1 +
 .../UnderstandsAllowedChildren13.stree.txt    |   17 +
 .../UnderstandsAllowedChildren13.tspans.txt   |    1 +
 .../UnderstandsAllowedChildren14.cspans.txt   |    6 +
 .../UnderstandsAllowedChildren14.diag.txt     |    1 +
 .../UnderstandsAllowedChildren14.stree.txt    |   58 +
 .../UnderstandsAllowedChildren14.tspans.txt   |    4 +
 .../UnderstandsAllowedChildren2.cspans.txt    |    2 +
 .../UnderstandsAllowedChildren2.stree.txt     |   25 +
 .../UnderstandsAllowedChildren2.tspans.txt    |    2 +
 .../UnderstandsAllowedChildren3.cspans.txt    |    0
 .../UnderstandsAllowedChildren3.diag.txt      |    1 +
 .../UnderstandsAllowedChildren3.stree.txt     |   17 +
 .../UnderstandsAllowedChildren3.tspans.txt    |    2 +
 .../UnderstandsAllowedChildren4.cspans.txt    |    1 +
 .../UnderstandsAllowedChildren4.diag.txt      |    1 +
 .../UnderstandsAllowedChildren4.stree.txt     |   14 +
 .../UnderstandsAllowedChildren4.tspans.txt    |    1 +
 .../UnderstandsAllowedChildren5.cspans.txt    |    1 +
 .../UnderstandsAllowedChildren5.diag.txt      |    1 +
 .../UnderstandsAllowedChildren5.stree.txt     |   21 +
 .../UnderstandsAllowedChildren5.tspans.txt    |    1 +
 .../UnderstandsAllowedChildren6.cspans.txt    |    1 +
 .../UnderstandsAllowedChildren6.diag.txt      |    2 +
 .../UnderstandsAllowedChildren6.stree.txt     |   19 +
 .../UnderstandsAllowedChildren6.tspans.txt    |    2 +
 .../UnderstandsAllowedChildren7.cspans.txt    |    2 +
 .../UnderstandsAllowedChildren7.diag.txt      |    3 +
 .../UnderstandsAllowedChildren7.stree.txt     |   35 +
 .../UnderstandsAllowedChildren7.tspans.txt    |    3 +
 .../UnderstandsAllowedChildren8.cspans.txt    |    2 +
 .../UnderstandsAllowedChildren8.diag.txt      |    2 +
 .../UnderstandsAllowedChildren8.stree.txt     |   35 +
 .../UnderstandsAllowedChildren8.tspans.txt    |    3 +
 .../UnderstandsAllowedChildren9.cspans.txt    |    4 +
 .../UnderstandsAllowedChildren9.diag.txt      |    2 +
 .../UnderstandsAllowedChildren9.stree.txt     |   40 +
 .../UnderstandsAllowedChildren9.tspans.txt    |    3 +
 ...nderstandsNestedRequiredParent1.cspans.txt |    2 +
 ...UnderstandsNestedRequiredParent1.stree.txt |   12 +
 ...nderstandsNestedRequiredParent2.cspans.txt |    0
 ...UnderstandsNestedRequiredParent2.stree.txt |   22 +
 ...nderstandsNestedRequiredParent2.tspans.txt |    2 +
 ...nderstandsNestedRequiredParent3.cspans.txt |    2 +
 ...UnderstandsNestedRequiredParent3.stree.txt |   22 +
 ...nderstandsNestedRequiredParent3.tspans.txt |    1 +
 ...nderstandsNestedRequiredParent4.cspans.txt |    4 +
 ...UnderstandsNestedRequiredParent4.stree.txt |   22 +
 ...nderstandsNestedRequiredParent5.cspans.txt |    2 +
 ...UnderstandsNestedRequiredParent5.stree.txt |   32 +
 ...nderstandsNestedRequiredParent5.tspans.txt |    2 +
 ...dVoidSelfClosingRequiredParent1.cspans.txt |    2 +
 ...edVoidSelfClosingRequiredParent1.stree.txt |   17 +
 ...dVoidSelfClosingRequiredParent1.tspans.txt |    1 +
 ...dVoidSelfClosingRequiredParent2.cspans.txt |    0
 ...edVoidSelfClosingRequiredParent2.stree.txt |   27 +
 ...dVoidSelfClosingRequiredParent2.tspans.txt |    3 +
 ...dVoidSelfClosingRequiredParent3.cspans.txt |    1 +
 ...edVoidSelfClosingRequiredParent3.stree.txt |   27 +
 ...dVoidSelfClosingRequiredParent3.tspans.txt |    2 +
 ...dVoidSelfClosingRequiredParent4.cspans.txt |    1 +
 ...edVoidSelfClosingRequiredParent4.stree.txt |   37 +
 ...dVoidSelfClosingRequiredParent4.tspans.txt |    3 +
 ...dVoidSelfClosingRequiredParent5.cspans.txt |    2 +
 ...edVoidSelfClosingRequiredParent5.stree.txt |   17 +
 ...dVoidSelfClosingRequiredParent5.tspans.txt |    1 +
 ...dVoidSelfClosingRequiredParent6.cspans.txt |    0
 ...edVoidSelfClosingRequiredParent6.stree.txt |   30 +
 ...dVoidSelfClosingRequiredParent6.tspans.txt |    3 +
 ...dVoidSelfClosingRequiredParent7.cspans.txt |    1 +
 ...edVoidSelfClosingRequiredParent7.stree.txt |   30 +
 ...dVoidSelfClosingRequiredParent7.tspans.txt |    2 +
 ...dVoidSelfClosingRequiredParent8.cspans.txt |    1 +
 ...edVoidSelfClosingRequiredParent8.stree.txt |   40 +
 ...dVoidSelfClosingRequiredParent8.tspans.txt |    3 +
 ...eWithAllowedChildrenForCatchAll.cspans.txt |    1 +
 ...ameWithAllowedChildrenForCatchAll.diag.txt |    1 +
 ...meWithAllowedChildrenForCatchAll.stree.txt |   18 +
 ...eWithAllowedChildrenForCatchAll.tspans.txt |    1 +
 ...edChildrenForCatchAllWithPrefix.cspans.txt |    1 +
 ...owedChildrenForCatchAllWithPrefix.diag.txt |    1 +
 ...wedChildrenForCatchAllWithPrefix.stree.txt |   18 +
 ...edChildrenForCatchAllWithPrefix.tspans.txt |    1 +
 ...tandsPartialRequiredParentTags1.cspans.txt |    0
 ...rstandsPartialRequiredParentTags1.diag.txt |    2 +
 ...standsPartialRequiredParentTags1.stree.txt |   12 +
 ...tandsPartialRequiredParentTags1.tspans.txt |    2 +
 ...tandsPartialRequiredParentTags2.cspans.txt |    0
 ...rstandsPartialRequiredParentTags2.diag.txt |    1 +
 ...standsPartialRequiredParentTags2.stree.txt |   17 +
 ...tandsPartialRequiredParentTags2.tspans.txt |    2 +
 ...tandsPartialRequiredParentTags3.cspans.txt |    0
 ...rstandsPartialRequiredParentTags3.diag.txt |    2 +
 ...standsPartialRequiredParentTags3.stree.txt |   22 +
 ...tandsPartialRequiredParentTags3.tspans.txt |    3 +
 ...tandsPartialRequiredParentTags4.cspans.txt |    4 +
 ...rstandsPartialRequiredParentTags4.diag.txt |    2 +
 ...standsPartialRequiredParentTags4.stree.txt |   44 +
 ...tandsPartialRequiredParentTags4.tspans.txt |    2 +
 ...tandsPartialRequiredParentTags5.cspans.txt |    4 +
 ...rstandsPartialRequiredParentTags5.diag.txt |    1 +
 ...standsPartialRequiredParentTags5.stree.txt |   44 +
 ...tandsPartialRequiredParentTags5.tspans.txt |    2 +
 ...tandsPartialRequiredParentTags6.cspans.txt |    5 +
 ...rstandsPartialRequiredParentTags6.diag.txt |    1 +
 ...standsPartialRequiredParentTags6.stree.txt |   49 +
 ...tandsPartialRequiredParentTags6.tspans.txt |    2 +
 ...gHelperPrefixAndAllowedChildren.cspans.txt |    0
 ...agHelperPrefixAndAllowedChildren.stree.txt |   22 +
 ...gHelperPrefixAndAllowedChildren.tspans.txt |    2 +
 ...AllowedChildrenAndRequireParent.cspans.txt |    0
 ...dAllowedChildrenAndRequireParent.stree.txt |   22 +
 ...AllowedChildrenAndRequireParent.tspans.txt |    2 +
 ...agHelpersInHtmlTypedScriptTags1.cspans.txt |    6 +
 ...TagHelpersInHtmlTypedScriptTags1.stree.txt |   37 +
 ...agHelpersInHtmlTypedScriptTags1.tspans.txt |    1 +
 ...agHelpersInHtmlTypedScriptTags2.cspans.txt |   12 +
 ...TagHelpersInHtmlTypedScriptTags2.stree.txt |   65 +
 ...agHelpersInHtmlTypedScriptTags2.tspans.txt |    1 +
 ...agHelpersInHtmlTypedScriptTags3.cspans.txt |   12 +
 ...TagHelpersInHtmlTypedScriptTags3.stree.txt |   73 +
 ...agHelpersInHtmlTypedScriptTags3.tspans.txt |    2 +
 ...agHelpersInHtmlTypedScriptTags4.cspans.txt |   14 +
 ...TagHelpersInHtmlTypedScriptTags4.stree.txt |   74 +
 ...agHelpersInHtmlTypedScriptTags4.tspans.txt |    1 +
 ...ExpressionBlock_To_Parent_Block.cspans.txt |   18 +
 ..._ExpressionBlock_To_Parent_Block.stree.txt |   58 +
 .../test/TestFiles/Source/BasicMarkup.cshtml  |    8 +
 .../test/TestFiles/nested-1000.html           | 2002 +++++++++
 .../test/TestRazorProject.cs                  |   47 +
 .../test/VirtualRazorProjectFileSystemTest.cs |  400 ++
 .../test/xunit.runner.json                    |    4 +
 .../Language/TestProject.cs                   |    9 +-
 4047 files changed, 134377 insertions(+), 1 deletion(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/BoundAttributeDescriptorExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CodeTargetTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupEncodingPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/NodeAssert.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultAllowedChildTagDescriptorBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultDocumentClassifierPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultItemCollectionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCSharpLoweringPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCodeDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDiagnosticTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDirectiveClassifierPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDocumentClassifierPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorOptimizationPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorParsingPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectItemTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorSyntaxTreePhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorTagHelperBinderPhaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveRemovalOptimizationPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveTokenEditHandlerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/DocumentClassifierPassBaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultMetadataIdentifierFeatureTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/InheritsDirectivePassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributePassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributeTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionDirectivePassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/TemplateTargetExtensionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlConventionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlNodeOptimizationPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/BasicIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDesignTimeCodeGenerationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentFilePathIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentImportsIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentRuntimeCodeGenerationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/HtmlAttributeIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TagHelpersIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/ExtensionIntermediateNodeTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeReferenceTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeWalkerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/LargeTextSourceDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/BaselineWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpAutoCompleteTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpCodeParserTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpErrorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpExplicitExpressionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpLanguageCharacteristicsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpNestedStatementsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpRazorCommentsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpReservedWordsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSectionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSpecialBlockTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpStatementTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTemplateTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpToMarkupSwitchTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerCommentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerIdentifierTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerOperatorsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTestBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpVerbatimBlockTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpWhitespaceHandlingTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CodeBlockEditHandlerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveCSharpTokenizerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveHtmlTokenizerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DisposableActionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlBlockTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlErrorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlMarkupParserTests.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTagsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlToCodeSwitchTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTestBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/ImplicitExpressionEditHandlerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/LineTrackingStringBufferTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/MarkupElementGroupingTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorParserTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/SourceLocationTrackerTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperRewritingTestBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TextReaderExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerTestBase.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/WhiteSpaceRewriterTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Properties/AssemblyInfo.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticDescriptorTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineBuilderExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorLanguageVersionTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineFeatureBaseTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectItemTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSourceDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSyntaxTreeTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceChangeTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceLocationTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceSpanTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/StreamSourceDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/StringSourceDocumentTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorBuilderTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorExtensionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/Source/BasicMarkup.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/nested-1000.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestRazorProject.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/VirtualRazorProjectFileSystemTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/xunit.runner.json

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs
new file mode 100644
index 0000000000..a03c4db92e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs
@@ -0,0 +1,139 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Components
+{
+    internal static class AssertFrame
+    {
+        public static void Sequence(RenderTreeFrame frame, int? sequence = null)
+        {
+            if (sequence.HasValue)
+            {
+                Assert.Equal(sequence.Value, frame.Sequence);
+            }
+        }
+
+        public static void Text(RenderTreeFrame frame, string textContent, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Text, frame.FrameType);
+            Assert.Equal(textContent, frame.TextContent);
+            Assert.Equal(0, frame.ElementSubtreeLength);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        internal static void Markup(RenderTreeFrame frame, string markupContent, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Markup, frame.FrameType);
+            Assert.Equal(markupContent, frame.MarkupContent);
+            Assert.Equal(0, frame.ElementSubtreeLength);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void Element(RenderTreeFrame frame, string elementName, int subtreeLength, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Element, frame.FrameType);
+            Assert.Equal(elementName, frame.ElementName);
+            Assert.Equal(subtreeLength, frame.ElementSubtreeLength);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void Attribute(RenderTreeFrame frame, string attributeName, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Attribute, frame.FrameType);
+            Assert.Equal(attributeName, frame.AttributeName);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void Attribute(RenderTreeFrame frame, string attributeName, string attributeValue, int? sequence = null)
+        {
+            AssertFrame.Attribute(frame, attributeName, sequence);
+            Assert.Equal(attributeValue, frame.AttributeValue);
+        }
+
+        public static void Attribute(RenderTreeFrame frame, string attributeName, Action<UIEventArgs> attributeEventHandlerValue, int? sequence = null)
+        {
+            AssertFrame.Attribute(frame, attributeName, sequence);
+            Assert.Equal(attributeEventHandlerValue, frame.AttributeValue);
+        }
+
+        public static void Attribute(RenderTreeFrame frame, string attributeName, object attributeValue, int? sequence = null)
+        {
+            AssertFrame.Attribute(frame, attributeName, sequence);
+            Assert.Equal(attributeValue, frame.AttributeValue);
+        }
+
+        public static void Attribute(RenderTreeFrame frame, string attributeName, Type valueType, int? sequence = null)
+        {
+            AssertFrame.Attribute(frame, attributeName, sequence);
+            Assert.IsType(valueType, frame.AttributeValue);
+        }
+
+        public static void Attribute(RenderTreeFrame frame, string attributeName, Action<object> attributeValidator, int? sequence = null)
+        {
+            AssertFrame.Attribute(frame, attributeName, sequence);
+            attributeValidator(frame.AttributeValue);
+        }
+
+        public static void Component<T>(RenderTreeFrame frame, int? subtreeLength = null, int? sequence = null) where T : IComponent
+        {
+            Component(frame, typeof(T).FullName, subtreeLength, sequence);
+        }
+
+        public static void Component(RenderTreeFrame frame, string typeName, int? subtreeLength = null, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Component, frame.FrameType);
+            Assert.Equal(typeName, frame.ComponentType.FullName);
+            if (subtreeLength.HasValue)
+            {
+                Assert.Equal(subtreeLength.Value, frame.ComponentSubtreeLength);
+            }
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void ComponentWithInstance<T>(RenderTreeFrame frame, int componentId, int? subtreeLength = null, int? sequence = null) where T : IComponent
+        {
+            AssertFrame.Component<T>(frame, subtreeLength, sequence);
+            Assert.IsType<T>(frame.Component);
+            Assert.Equal(componentId, frame.ComponentId);
+        }
+
+        public static void Region(RenderTreeFrame frame, int subtreeLength, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Region, frame.FrameType);
+            Assert.Equal(subtreeLength, frame.RegionSubtreeLength);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void Whitespace(RenderTreeFrame frame, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.Text, frame.FrameType);
+            AssertFrame.Sequence(frame, sequence);
+            Assert.True(string.IsNullOrWhiteSpace(frame.TextContent));
+        }
+
+        public static void ElementReferenceCapture(RenderTreeFrame frame, Action<ElementRef> action, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.ElementReferenceCapture, frame.FrameType);
+            Assert.Same(action, frame.ElementReferenceCaptureAction);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void ComponentReferenceCapture(RenderTreeFrame frame, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.ComponentReferenceCapture, frame.FrameType);
+            Assert.NotNull(frame.ComponentReferenceCaptureAction);
+            AssertFrame.Sequence(frame, sequence);
+        }
+
+        public static void ComponentReferenceCapture(RenderTreeFrame frame, Action<object> action, int? sequence = null)
+        {
+            Assert.Equal(RenderTreeFrameType.ComponentReferenceCapture, frame.FrameType);
+            Assert.Same(action, frame.ComponentReferenceCaptureAction);
+            AssertFrame.Sequence(frame, sequence);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/BoundAttributeDescriptorExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/BoundAttributeDescriptorExtensionsTest.cs
new file mode 100644
index 0000000000..8b1c290d3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/BoundAttributeDescriptorExtensionsTest.cs
@@ -0,0 +1,279 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class BoundAttributeDescriptorExtensionsTest
+    {
+        [Fact]
+        public void GetPropertyName_ReturnsPropertyName()
+        {
+            // Arrange
+            var expectedPropertyName = "IntProperty";
+
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName(expectedPropertyName)
+                .TypeName(typeof(int).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var propertyName = descriptor.GetPropertyName();
+
+            // Assert
+            Assert.Equal(expectedPropertyName, propertyName);
+        }
+
+        [Fact]
+        public void GetPropertyName_ReturnsNullIfNoPropertyName()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .TypeName(typeof(int).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var propertyName = descriptor.GetPropertyName();
+
+            // Assert
+            Assert.Null(propertyName);
+        }
+
+        [Fact]
+        public void IsDefaultKind_ReturnsTrue_IfKindIsDefault()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("IntProperty")
+                .TypeName(typeof(int).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var isDefault = descriptor.IsDefaultKind();
+
+            // Assert
+            Assert.True(isDefault);
+        }
+
+        [Fact]
+        public void IsDefaultKind_ReturnsFalse_IfKindIsNotDefault()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder("other-kind", "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, "other-kind");
+            builder
+                .Name("test")
+                .PropertyName("IntProperty")
+                .TypeName(typeof(int).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var isDefault = descriptor.IsDefaultKind();
+
+            // Assert
+            Assert.False(isDefault);
+        }
+
+        [Fact]
+        public void ExpectsStringValue_ReturnsTrue_ForStringProperty()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName(typeof(string).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsStringValue("test");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ExpectsStringValue_ReturnsFalse_ForNonStringProperty()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName(typeof(bool).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsStringValue("test");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ExpectsStringValue_ReturnsTrue_StringIndexerAndNameMatch()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName("System.Collection.Generic.IDictionary<string, string>")
+                .AsDictionary("prefix-test-", typeof(string).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsStringValue("prefix-test-key");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ExpectsStringValue_ReturnsFalse_StringIndexerAndNameMismatch()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName("System.Collection.Generic.IDictionary<string, string>")
+                .AsDictionary("prefix-test-", typeof(string).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsStringValue("test");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ExpectsBooleanValue_ReturnsTrue_ForBooleanProperty()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName(typeof(bool).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsBooleanValue("test");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ExpectsBooleanValue_ReturnsFalse_ForNonBooleanProperty()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName(typeof(int).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsBooleanValue("test");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ExpectsBooleanValue_ReturnsTrue_BooleanIndexerAndNameMatch()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName("System.Collection.Generic.IDictionary<string, bool>")
+                .AsDictionary("prefix-test-", typeof(bool).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsBooleanValue("prefix-test-key");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ExpectsBooleanValue_ReturnsFalse_BooleanIndexerAndNameMismatch()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("test")
+                .PropertyName("BoundProp")
+                .TypeName("System.Collection.Generic.IDictionary<string, bool>")
+                .AsDictionary("prefix-test-", typeof(bool).FullName);
+
+            var descriptor = builder.Build();
+
+            // Act
+            var result = descriptor.ExpectsBooleanValue("test");
+
+            // Assert
+            Assert.False(result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs
new file mode 100644
index 0000000000..e0bfa57ca1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs
@@ -0,0 +1,339 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class CSharpCodeWriterTest
+    {
+        // The length of the newline string written by writer.WriteLine.
+        private static readonly int WriterNewLineLength = Environment.NewLine.Length;
+
+        public static IEnumerable<object[]> NewLines
+        {
+            get
+            {
+                return new object[][]
+                {
+                    new object[] { "\r" },
+                    new object[] { "\n" },
+                    new object[] { "\r\n" },
+                };
+            }
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithWrite()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234");
+
+            // Assert
+            var location = writer.Location;
+            var expected = new SourceLocation(absoluteIndex: 4, lineIndex: 0, characterIndex: 4);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithIndent()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteLine();
+            writer.Indent(size: 3);
+
+            // Assert
+            var location = writer.Location;
+            var expected = new SourceLocation(absoluteIndex: 3 + WriterNewLineLength, lineIndex: 1, characterIndex: 3);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithWriteLine()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteLine("1234");
+
+            // Assert
+            var location = writer.Location;
+
+            var expected = new SourceLocation(absoluteIndex: 4 + WriterNewLineLength, lineIndex: 1, characterIndex: 0);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Theory]
+        [MemberData(nameof(NewLines))]
+        public void CSharpCodeWriter_TracksPosition_WithWriteLine_WithNewLineInContent(string newLine)
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteLine("1234" + newLine + "12");
+
+            // Assert
+            var location = writer.Location;
+
+            var expected = new SourceLocation(
+                absoluteIndex: 6 + newLine.Length + WriterNewLineLength,
+                lineIndex: 2,
+                characterIndex: 0);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Theory]
+        [MemberData(nameof(NewLines))]
+        public void CSharpCodeWriter_TracksPosition_WithWrite_WithNewlineInContent(string newLine)
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234" + newLine + "123" + newLine + "12");
+
+            // Assert
+            var location = writer.Location;
+
+            var expected = new SourceLocation(
+                absoluteIndex: 9 + newLine.Length + newLine.Length,
+                lineIndex: 2,
+                characterIndex: 2);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithWrite_WithNewlineInContent_RepeatedN()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234\n\n123");
+
+            // Assert
+            var location = writer.Location;
+
+            var expected = new SourceLocation(
+                absoluteIndex: 9,
+                lineIndex: 2,
+                characterIndex: 3);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithWrite_WithMixedNewlineInContent()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234\r123\r\n12\n1");
+
+            // Assert
+            var location = writer.Location;
+
+            var expected = new SourceLocation(
+                absoluteIndex: 14,
+                lineIndex: 3,
+                characterIndex: 1);
+
+            Assert.Equal(expected, location);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithNewline_SplitAcrossWrites()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234\r");
+            var location1 = writer.Location;
+
+            writer.Write("\n");
+            var location2 = writer.Location;
+
+            // Assert
+            var expected1 = new SourceLocation(absoluteIndex: 5, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected1, location1);
+
+            var expected2 = new SourceLocation(absoluteIndex: 6, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected2, location2);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithTwoNewline_SplitAcrossWrites_R()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234\r");
+            var location1 = writer.Location;
+
+            writer.Write("\r");
+            var location2 = writer.Location;
+
+            // Assert
+            var expected1 = new SourceLocation(absoluteIndex: 5, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected1, location1);
+
+            var expected2 = new SourceLocation(absoluteIndex: 6, lineIndex: 2, characterIndex: 0);
+            Assert.Equal(expected2, location2);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithTwoNewline_SplitAcrossWrites_N()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234\n");
+            var location1 = writer.Location;
+
+            writer.Write("\n");
+            var location2 = writer.Location;
+
+            // Assert
+            var expected1 = new SourceLocation(absoluteIndex: 5, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected1, location1);
+
+            var expected2 = new SourceLocation(absoluteIndex: 6, lineIndex: 2, characterIndex: 0);
+            Assert.Equal(expected2, location2);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithTwoNewline_SplitAcrossWrites_Reversed()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("1234\n");
+            var location1 = writer.Location;
+
+            writer.Write("\r");
+            var location2 = writer.Location;
+
+            // Assert
+            var expected1 = new SourceLocation(absoluteIndex: 5, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected1, location1);
+
+            var expected2 = new SourceLocation(absoluteIndex: 6, lineIndex: 2, characterIndex: 0);
+            Assert.Equal(expected2, location2);
+        }
+
+        [Fact]
+        public void CSharpCodeWriter_TracksPosition_WithNewline_SplitAcrossWrites_AtBeginning()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.Write("\r");
+            var location1 = writer.Location;
+
+            writer.Write("\n");
+            var location2 = writer.Location;
+
+            // Assert
+            var expected1 = new SourceLocation(absoluteIndex: 1, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected1, location1);
+
+            var expected2 = new SourceLocation(absoluteIndex: 2, lineIndex: 1, characterIndex: 0);
+            Assert.Equal(expected2, location2);
+        }
+
+        [Fact]
+        public void WriteLineNumberDirective_UsesFilePath_FromSourceLocation()
+        {
+            // Arrange
+            var filePath = "some-path";
+            var mappingLocation = new SourceSpan(filePath, 10, 4, 3, 9);
+
+            var writer = new CodeWriter();
+            var expected = $"#line 5 \"{filePath}\"" + writer.NewLine;
+
+            // Act
+            writer.WriteLineNumberDirective(mappingLocation);
+            var code = writer.GenerateCode();
+
+            // Assert
+            Assert.Equal(expected, code);
+        }
+
+        [Fact]
+        public void WriteField_WritesFieldDeclaration()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteField(new[] { "private" }, "global::System.String", "_myString");
+
+            // Assert
+            var output = writer.GenerateCode();
+            Assert.Equal("private global::System.String _myString;" + Environment.NewLine, output);
+        }
+
+        [Fact]
+        public void WriteField_WithModifiers_WritesFieldDeclaration()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteField(new[] { "private", "readonly", "static" }, "global::System.String", "_myString");
+
+            // Assert
+            var output = writer.GenerateCode();
+            Assert.Equal("private readonly static global::System.String _myString;" + Environment.NewLine, output);
+        }
+
+        [Fact]
+        public void WriteAutoPropertyDeclaration_WritesPropertyDeclaration()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteAutoPropertyDeclaration(new[] { "public" }, "global::System.String", "MyString");
+
+            // Assert
+            var output = writer.GenerateCode();
+            Assert.Equal("public global::System.String MyString { get; set; }" + Environment.NewLine, output);
+        }
+
+        [Fact]
+        public void WriteAutoPropertyDeclaration_WithModifiers_WritesPropertyDeclaration()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteAutoPropertyDeclaration(new[] { "public", "static" }, "global::System.String", "MyString");
+
+            // Assert
+            var output = writer.GenerateCode();
+            Assert.Equal("public static global::System.String MyString { get; set; }" + Environment.NewLine, output);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CodeTargetTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CodeTargetTest.cs
new file mode 100644
index 0000000000..7626e3369a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CodeTargetTest.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class CodeTargetTest
+    {
+        [Fact]
+        public void CreateDefault_CreatesDefaultCodeTarget()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            // Act
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+
+            // Assert
+            Assert.IsType<DefaultCodeTarget>(target);
+        }
+
+        [Fact]
+        public void CreateDefault_CallsDelegate()
+        {
+            // Arrange
+            var wasCalled = false;
+            Action<CodeTargetBuilder> @delegate = (b) => { wasCalled = true; };
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            // Act
+            CodeTarget.CreateDefault(codeDocument, options, @delegate);
+
+            // Assert
+            Assert.True(wasCalled);
+        }
+
+        [Fact]
+        public void CreateDefault_AllowsNullDelegate()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            // Act
+            CodeTarget.CreateDefault(codeDocument, options, configure: null);
+
+            // Assert (does not throw)
+        }
+
+        [Fact]
+        public void CreateEmpty_AllowsNullDelegate()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            // Act
+            CodeTarget.CreateDefault(codeDocument, options, configure: null);
+
+            // Assert (does not throw)
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetBuilderTest.cs
new file mode 100644
index 0000000000..95f124300a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetBuilderTest.cs
@@ -0,0 +1,46 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class DefaultCodeTargetBuilderTest
+    {
+        [Fact]
+        public void Build_CreatesDefaultCodeTarget()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var builder = new DefaultCodeTargetBuilder(codeDocument, options);
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension1(),
+                new MyExtension2(),
+            };
+            
+            for (var i = 0; i < extensions.Length; i++)
+            {
+                builder.TargetExtensions.Add(extensions[i]);
+            }
+
+            // Act
+            var result = builder.Build();
+
+            // Assert
+            var target = Assert.IsType<DefaultCodeTarget>(result);
+            Assert.Equal(extensions, target.Extensions);
+        }
+
+        private class MyExtension1 : ICodeTargetExtension
+        {
+        }
+
+        private class MyExtension2 : ICodeTargetExtension
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetTest.cs
new file mode 100644
index 0000000000..05756c09bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultCodeTargetTest.cs
@@ -0,0 +1,174 @@
+// 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.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class DefaultCodeTargetTest
+    {
+        [Fact]
+        public void Constructor_CreatesDefensiveCopy()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension2(),
+                new MyExtension1(),
+            };
+
+            // Act
+            var target = new DefaultCodeTarget(options, extensions);
+
+            // Assert
+            Assert.NotSame(extensions, target);
+        }
+
+        [Fact]
+        public void CreateWriter_DesignTime_CreatesDesignTimeNodeWriter()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDesignTimeDefault();
+            var target = new DefaultCodeTarget(options, Enumerable.Empty<ICodeTargetExtension>());
+
+            // Act
+            var writer = target.CreateNodeWriter();
+
+            // Assert
+            Assert.IsType<DesignTimeNodeWriter>(writer);
+        }
+
+        [Fact]
+        public void CreateWriter_Runtime_CreatesRuntimeNodeWriter()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+            var target = new DefaultCodeTarget(options, Enumerable.Empty<ICodeTargetExtension>());
+
+            // Act
+            var writer = target.CreateNodeWriter();
+
+            // Assert
+            Assert.IsType<RuntimeNodeWriter>(writer);
+        }
+
+        [Fact]
+        public void HasExtension_ReturnsTrue_WhenExtensionFound()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension2(),
+                new MyExtension1(),
+            };
+
+            var target = new DefaultCodeTarget(options, extensions);
+
+            // Act
+            var result = target.HasExtension<MyExtension1>();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void HasExtension_ReturnsFalse_WhenExtensionNotFound()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension2(),
+                new MyExtension2(),
+            };
+
+            var target = new DefaultCodeTarget(options, extensions);
+
+            // Act
+            var result = target.HasExtension<MyExtension1>();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void GetExtension_ReturnsExtension_WhenExtensionFound()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension2(),
+                new MyExtension1(),
+            };
+
+            var target = new DefaultCodeTarget(options, extensions);
+
+            // Act
+            var result = target.GetExtension<MyExtension1>();
+
+            // Assert
+            Assert.Same(extensions[1], result);
+        }
+
+        [Fact]
+        public void GetExtension_ReturnsFirstMatch_WhenExtensionFound()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension2(),
+                new MyExtension1(),
+                new MyExtension2(),
+                new MyExtension1(),
+            };
+
+            var target = new DefaultCodeTarget(options, extensions);
+
+            // Act
+            var result = target.GetExtension<MyExtension1>();
+
+            // Assert
+            Assert.Same(extensions[1], result);
+        }
+
+
+        [Fact]
+        public void GetExtension_ReturnsNull_WhenExtensionNotFound()
+        {
+            // Arrange
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var extensions = new ICodeTargetExtension[]
+            {
+                new MyExtension2(),
+                new MyExtension2(),
+            };
+
+            var target = new DefaultCodeTarget(options, extensions);
+
+            // Act
+            var result = target.GetExtension<MyExtension1>();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        private class MyExtension1 : ICodeTargetExtension
+        {
+        }
+
+        private class MyExtension2 : ICodeTargetExtension
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs
new file mode 100644
index 0000000000..3537eea4f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs
@@ -0,0 +1,393 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class DefaultDocumentWriterTest
+    {
+        [Fact] // This test covers the whole process including actual hashing.
+        public void WriteDocument_EndToEnd_WritesChecksumAndMarksAutoGenerated()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""da39a3ee5e6b4b0d3255bfef95601890afd80709""
+// <auto-generated/>
+#pragma warning disable 1591
+#pragma warning restore 1591
+", 
+                csharp, 
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_SHA1_WritesChecksumAndMarksAutoGenerated()
+        {
+            // Arrange
+            var checksumBytes = new byte[] { (byte)'t', (byte)'e', (byte)'s', (byte)'t', };
+
+            var sourceDocument = Mock.Of<RazorSourceDocument>(d =>
+                d.FilePath == "test.cshtml" &&
+                d.GetChecksum() == checksumBytes &&
+                d.GetChecksumAlgorithm() == "SHA1");
+
+            var document = new DocumentIntermediateNode();
+
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""74657374""
+// <auto-generated/>
+#pragma warning disable 1591
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_SHA256_WritesChecksumAndMarksAutoGenerated()
+        {
+            // Arrange
+            var checksumBytes = new byte[] { (byte)'t', (byte)'e', (byte)'s', (byte)'t', };
+
+            var sourceDocument = Mock.Of<RazorSourceDocument>(d =>
+                d.FilePath == "test.cshtml" &&
+                d.GetChecksum() == checksumBytes &&
+                d.GetChecksumAlgorithm() == "SHA256");
+
+            var document = new DocumentIntermediateNode();
+
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{8829d00f-11b8-4213-878b-770e8597ac16}"" ""74657374""
+// <auto-generated/>
+#pragma warning disable 1591
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_UnsupportedChecksumAlgorithm_Throws()
+        {
+            // Arrange
+            var checksumBytes = new byte[] { (byte)'t', (byte)'e', (byte)'s', (byte)'t', };
+
+            var sourceDocument = Mock.Of<RazorSourceDocument>(d =>
+                d.FilePath == "test.cshtml" &&
+                d.GetChecksum() == checksumBytes &&
+                d.GetChecksumAlgorithm() == "SHA3");
+
+            var document = new DocumentIntermediateNode();
+
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() =>
+            {
+                var result = writer.WriteDocument(codeDocument, document);
+            });
+            Assert.Equal(
+                "The hash algorithm 'SHA3' is not supported for checksum generation. Supported algorithms are: 'SHA1 SHA256'. " +
+                "Set 'RazorCodeGenerationOptions.SuppressChecksum' to 'True' to suppress automatic checksum generation.",
+                exception.Message);
+        }
+
+
+
+        [Fact]
+        public void WriteDocument_Empty_SuppressChecksumTrue_DoesnotWriteChecksum()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var optionsBuilder = new DefaultRazorCodeGenerationOptionsBuilder(designTime: false)
+            {
+                SuppressChecksum = true
+            };
+            var options = optionsBuilder.Build();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"// <auto-generated/>
+#pragma warning disable 1591
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_WritesNamespace()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(new NamespaceDeclarationIntermediateNode()
+            {
+                Content = "TestNamespace",
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""da39a3ee5e6b4b0d3255bfef95601890afd80709""
+// <auto-generated/>
+#pragma warning disable 1591
+namespace TestNamespace
+{
+    #line hidden
+}
+#pragma warning restore 1591
+", 
+                csharp, 
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_WritesClass()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(new ClassDeclarationIntermediateNode()
+            {
+                Modifiers =
+                {
+                    "internal"
+                },
+                BaseType = "TestBase",
+                Interfaces = new List<string> { "IFoo", "IBar", },
+                TypeParameters = new List<TypeParameter>
+                {
+                    new TypeParameter() { ParameterName = "TKey", },
+                    new TypeParameter() { ParameterName = "TValue", },
+                },
+                ClassName = "TestClass",
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""da39a3ee5e6b4b0d3255bfef95601890afd80709""
+// <auto-generated/>
+#pragma warning disable 1591
+internal class TestClass<TKey, TValue> : TestBase, IFoo, IBar
+{
+}
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_WritesMethod()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(new MethodDeclarationIntermediateNode()
+            {
+                Modifiers =
+                {
+                    "internal",
+                    "virtual",
+                    "async",
+                },
+                MethodName = "TestMethod",
+                Parameters =
+                {
+                    new MethodParameter()
+                    {
+                        Modifiers =
+                        {
+                            "readonly",
+                            "ref",
+                        },
+                        ParameterName = "a",
+                        TypeName = "int",
+                    },
+                    new MethodParameter()
+                    {
+                        ParameterName = "b",
+                        TypeName = "string",
+                    }
+                },
+                ReturnType = "string",
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""da39a3ee5e6b4b0d3255bfef95601890afd80709""
+// <auto-generated/>
+#pragma warning disable 1591
+#pragma warning disable 1998
+internal virtual async string TestMethod(readonly ref int a, string b)
+{
+}
+#pragma warning restore 1998
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_WritesField()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(new FieldDeclarationIntermediateNode()
+            {
+                Modifiers =
+                {
+                    "internal",
+                    "readonly",
+                },
+                FieldName = "_foo",
+                FieldType = "string",
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""da39a3ee5e6b4b0d3255bfef95601890afd80709""
+// <auto-generated/>
+#pragma warning disable 1591
+internal readonly string _foo;
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDocument_WritesProperty()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(new PropertyDeclarationIntermediateNode()
+            {
+                Modifiers =
+                {
+                    "internal",
+                    "virtual",
+                },
+                PropertyName = "Foo",
+                PropertyType = "string",
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            var target = CodeTarget.CreateDefault(codeDocument, options);
+            var writer = new DefaultDocumentWriter(target, options);
+
+            // Act
+            var result = writer.WriteDocument(codeDocument, document);
+
+            // Assert
+            var csharp = result.GeneratedCode;
+            Assert.Equal(
+@"#pragma checksum ""test.cshtml"" ""{ff1816ec-aa5e-4d10-87f7-6f4963833460}"" ""da39a3ee5e6b4b0d3255bfef95601890afd80709""
+// <auto-generated/>
+#pragma warning disable 1591
+internal virtual string Foo { get; set; }
+#pragma warning restore 1591
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs
new file mode 100644
index 0000000000..39ab11c211
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs
@@ -0,0 +1,498 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class DesignTimeNodeWriterTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void WriteUsingDirective_NoSource_WritesContent()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new UsingDirectiveIntermediateNode()
+            {
+                Content = "System",
+            };
+
+            // Act
+            writer.WriteUsingDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"using System;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteUsingDirective_WithSource_WritesContentWithLinePragmaAndMapping()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var originalSpan = new SourceSpan("test.cshtml", 0, 0, 0, 6);
+            var generatedSpan = new SourceSpan(null, 38 + Environment.NewLine.Length * 3, 3, 0, 6);
+            var expectedSourceMapping = new SourceMapping(originalSpan, generatedSpan);
+            var node = new UsingDirectiveIntermediateNode()
+            {
+                Content = "System",
+                Source = originalSpan,
+            };
+
+            // Act
+            writer.WriteUsingDirective(context, node);
+
+            // Assert
+            var mapping = Assert.Single(((DefaultCodeRenderingContext)context).SourceMappings);
+            Assert.Equal(expectedSourceMapping, mapping);
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+using System;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_SkipsLinePragma_WithoutSource()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpExpressionIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__o = i++;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_WritesLinePragma_WithSource()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpExpressionIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
+            };
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+__o = i++;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_WithExtensionNode_WritesPadding()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpExpressionIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i",
+                Kind = TokenKind.CSharp,
+            });
+            builder.Add(new MyExtensionIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__o = iRender Children
+++;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_WithSource_WritesPadding()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpExpressionIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 8, 0, 8, 3),
+            };
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i",
+                Kind = TokenKind.CSharp,
+            });
+            builder.Add(new MyExtensionIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+  __o = iRender Children
+++;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_WhitespaceContentWithSource_WritesContent()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpCodeIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
+            };
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "    "
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+    
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_SkipsLinePragma_WithoutSource()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpCodeIntermediateNode();
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "if (true) { }"
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"if (true) { }
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_WritesLinePragma_WithSource()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpCodeIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 13),
+            };
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "if (true) { }",
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+if (true) { }
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_WritesPadding_WithSource()
+        {
+            // Arrange
+            var writer = new DesignTimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new CSharpCodeIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 17),
+            };
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "    if (true) { }",
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+    if (true) { }
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpressionAttributeValue_RendersCorrectly()
+        {
+            var writer = new DesignTimeNodeWriter();
+
+            var content = "<input checked=\"hello-world @false\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpExpressionAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateDesignTime(source: sourceDocument);
+
+            // Act
+            writer.WriteCSharpExpressionAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+                       __o = false;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCodeAttributeValue_RendersCorrectly()
+        {
+            var writer = new DesignTimeNodeWriter();
+            var content = "<input checked=\"hello-world @if(@true){ }\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpCodeAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateDesignTime(source: sourceDocument);
+
+            // Act
+            writer.WriteCSharpCodeAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+                             if(@true){ }
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCodeAttributeValue_WithExpression_RendersCorrectly()
+        {
+            var writer = new DesignTimeNodeWriter();
+            var content = "<input checked=\"hello-world @if(@true){ @false }\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpCodeAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateDesignTime(source: sourceDocument);
+
+            // Act
+            writer.WriteCSharpCodeAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+                             if(@true){ 
+
+#line default
+#line hidden
+#nullable disable
+Render Children
+#nullable restore
+#line 1 ""test.cshtml""
+                                               }
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            var projectEngine = CreateProjectEngine();
+            return Lower(codeDocument, projectEngine);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(documentNode);
+
+            return documentNode;
+        }
+
+        private class MyExtensionIntermediateNode : ExtensionIntermediateNode
+        {
+            public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+            public override void Accept(IntermediateNodeVisitor visitor)
+            {
+                visitor.VisitDefault(this);
+            }
+
+            public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+            {
+                context.CodeWriter.WriteLine("MyExtensionNode");
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs
new file mode 100644
index 0000000000..36267fb658
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs
@@ -0,0 +1,48 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class LiteralRuntimeNodeWriterTest
+    {
+        [Fact]
+        public void WriteCSharpExpression_UsesWriteLiteral_WritesLinePragma_WithSource()
+        {
+            // Arrange
+            var writer = new LiteralRuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpExpressionIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
+            };
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+WriteLiteral(i++);
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs
new file mode 100644
index 0000000000..666bdb649b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs
@@ -0,0 +1,705 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class RuntimeNodeWriterTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void WriteUsingDirective_NoSource_WritesContent()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new UsingDirectiveIntermediateNode()
+            {
+                Content = "System",
+            };
+
+            // Act
+            writer.WriteUsingDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"using System;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteUsingDirective_WithSource_WritesContentWithLinePragma()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new UsingDirectiveIntermediateNode()
+            {
+                Content = "System",
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
+            };
+
+            // Act
+            writer.WriteUsingDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+using System;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_SkipsLinePragma_WithoutSource()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter()
+            {
+                WriteCSharpExpressionMethod = "Test",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpExpressionIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"Test(i++);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_WritesLinePragma_WithSource()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter()
+            {
+                WriteCSharpExpressionMethod = "Test",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpExpressionIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 3),
+            };
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+Test(i++);
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_WithExtensionNode_WritesPadding()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter()
+            {
+                WriteCSharpExpressionMethod = "Test",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpExpressionIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i",
+                Kind = TokenKind.CSharp,
+            });
+            builder.Add(new MyExtensionIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"Test(iRender Children
+++);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpression_WithSource_WritesPadding()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter()
+            {
+                WriteCSharpExpressionMethod = "Test",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpExpressionIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 8, 0, 8, 3),
+            };
+            var builder = IntermediateNodeBuilder.Create(node);
+            builder.Add(new IntermediateToken()
+            {
+                Content = "i",
+                Kind = TokenKind.CSharp,
+            });
+            builder.Add(new MyExtensionIntermediateNode());
+            builder.Add(new IntermediateToken()
+            {
+                Content = "++",
+                Kind = TokenKind.CSharp,
+            });
+
+            // Act
+            writer.WriteCSharpExpression(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+   Test(iRender Children
+++);
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_WhitespaceContent_DoesNothing()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpCodeIntermediateNode();
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "  \t"
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Empty(csharp);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_SkipsLinePragma_WithoutSource()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpCodeIntermediateNode();
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "if (true) { }"
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"if (true) { }
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_WritesLinePragma_WithSource()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpCodeIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 13),
+            };
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "if (true) { }",
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+if (true) { }
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCode_WritesPadding_WithSource()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new CSharpCodeIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 17),
+            };
+            IntermediateNodeBuilder.Create(node)
+                .Add(new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "    if (true) { }",
+                });
+
+            // Act
+            writer.WriteCSharpCode(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+    if (true) { }
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlLiteral_WithinMaxSize_WritesSingleLiteral()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlLiteral(context, maxStringLiteralLength: 6, "Hello");
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteLiteral(""Hello"");
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlLiteral_GreaterThanMaxSize_WritesMultipleLiterals()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlLiteral(context, maxStringLiteralLength: 6, "Hello World");
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteLiteral(""Hello "");
+WriteLiteral(""World"");
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlLiteral_GreaterThanMaxSize_SingleEmojisSplit()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlLiteral(context, maxStringLiteralLength: 2, " 👦");
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteLiteral("" "");
+WriteLiteral(""👦"");
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlLiteral_GreaterThanMaxSize_SequencedZeroWithJoinedEmojisSplit()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlLiteral(context, maxStringLiteralLength: 6, "👩‍👩‍👧‍👧👩‍👩‍👧‍👧");
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteLiteral(""👩‍👩‍"");
+WriteLiteral(""👧‍👧"");
+WriteLiteral(""👩‍👩‍"");
+WriteLiteral(""👧‍👧"");
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlContent_RendersContentCorrectly()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new HtmlContentIntermediateNode();
+            node.Children.Add(new IntermediateToken()
+            {
+                Content = "SomeContent",
+                Kind = TokenKind.Html,
+            });
+
+            // Act
+            writer.WriteHtmlContent(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteLiteral(""SomeContent"");
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlContent_LargeStringLiteral_UsesMultipleWrites()
+        {
+            // Arrange
+            var codeWriter = new CodeWriter();
+            var writer = new RuntimeNodeWriter();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new HtmlContentIntermediateNode();
+            node.Children.Add(new IntermediateToken()
+            {
+                Content = new string('*', 2000),
+                Kind = TokenKind.Html,
+            });
+
+            // Act
+            writer.WriteHtmlContent(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(string.Format(
+@"WriteLiteral(@""{0}"");
+WriteLiteral(@""{1}"");
+", new string('*', 1024), new string('*', 976)),
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var writer = new RuntimeNodeWriter();
+            var content = "<input checked=\"hello-world @false\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single();
+
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"BeginWriteAttribute(""checked"", "" checked=\"""", 6, ""\"""", 34, 2);
+Render Children
+Render Children
+EndWriteAttribute();
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteHtmlAttributeValue_RendersCorrectly()
+        {
+            // Arrange
+            var writer = new RuntimeNodeWriter();
+            var content = "<input checked=\"hello-world @false\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[0] as HtmlAttributeValueIntermediateNode;
+            
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteAttributeValue("""", 16, ""hello-world"", 16, 11, true);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpressionAttributeValue_RendersCorrectly()
+        {
+            // Arrange
+            var writer = new RuntimeNodeWriter();
+            var content = "<input checked=\"hello-world @false\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpExpressionAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteCSharpExpressionAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+WriteAttributeValue("" "", 27, false, 28, 6, false);
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCodeAttributeValue_BuffersResult()
+        {
+            // Arrange
+            var writer = new RuntimeNodeWriter();
+
+            var content = "<input checked=\"hello-world @if(@true){ }\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpCodeAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateRuntime(source: sourceDocument);
+
+            // Act
+            writer.WriteCSharpCodeAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"WriteAttributeValue("" "", 27, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+    PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 1 ""test.cshtml""
+                             if(@true){ }
+
+#line default
+#line hidden
+#nullable disable
+    PopWriter();
+}
+), 28, 13, false);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void BeginWriterScope_UsesSpecifiedWriter_RendersCorrectly()
+        {
+            // Arrange
+            var writer = new RuntimeNodeWriter()
+            {
+                PushWriterMethod = "TestPushWriter"
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.BeginWriterScope(context, "MyWriter");
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"TestPushWriter(MyWriter);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void EndWriterScope_RendersCorrectly()
+        {
+            // Arrange
+            var writer = new RuntimeNodeWriter()
+            {
+                PopWriterMethod = "TestPopWriter"
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.EndWriterScope(context);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"TestPopWriter();
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            var projectEngine = CreateProjectEngine();
+            return Lower(codeDocument, projectEngine);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(irDocument);
+
+            return irDocument;
+        }
+
+        private class MyExtensionIntermediateNode : ExtensionIntermediateNode
+        {
+            public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+            public override void Accept(IntermediateNodeVisitor visitor)
+            {
+                visitor.VisitDefault(this);
+            }
+
+            public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs
new file mode 100644
index 0000000000..dc942970d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/TagHelperHtmlAttributeRuntimeNodeWriterTest.cs
@@ -0,0 +1,131 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public class TagHelperHtmlAttributeRuntimeNodeWriterTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void WriteHtmlAttributeValue_RendersCorrectly()
+        {
+            var writer = new TagHelperHtmlAttributeRuntimeNodeWriter();
+
+            var content = "<input checked=\"hello-world @false\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[0] as HtmlAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteHtmlAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"AddHtmlAttributeValue("""", 16, ""hello-world"", 16, 11, true);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpExpressionAttributeValue_RendersCorrectly()
+        {
+            var writer = new TagHelperHtmlAttributeRuntimeNodeWriter();
+            var content = "<input checked=\"hello-world @false\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpExpressionAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            writer.WriteCSharpExpressionAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 1 ""test.cshtml""
+AddHtmlAttributeValue("" "", 27, false, 28, 6, false);
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteCSharpCodeAttributeValue_BuffersResult()
+        {
+            var writer = new TagHelperHtmlAttributeRuntimeNodeWriter();
+
+            var content = "<input checked=\"hello-world @if(@true){ }\" />";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var documentNode = Lower(codeDocument);
+            var node = documentNode.Children.OfType<HtmlAttributeIntermediateNode>().Single().Children[1] as CSharpCodeAttributeValueIntermediateNode;
+
+            var context = TestCodeRenderingContext.CreateRuntime(source: sourceDocument);
+
+            // Act
+            writer.WriteCSharpCodeAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"AddHtmlAttributeValue("" "", 27, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+    PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 1 ""test.cshtml""
+                             if(@true){ }
+
+#line default
+#line hidden
+#nullable disable
+    PopWriter();
+}
+), 28, 13, false);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            var projectEngine = CreateProjectEngine();
+            return Lower(codeDocument, projectEngine);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(documentNode);
+
+            return documentNode;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..8c6df48979
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
@@ -0,0 +1,224 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public class ComponentDocumentClassifierPassTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void Execute_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.razor"));
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal(ComponentDocumentClassifierPass.ComponentDocumentKind, irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "/MyApp/Test.razor", relativePath: "Test.razor");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var projectEngine = CreateProjectEngine(b =>
+            {
+                b.SetRootNamespace("MyApp");
+            });
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("MyApp", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "/MyApp/Test.razor", relativePath: "Test.razor");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var projectEngine = CreateProjectEngine(b =>
+            {
+                b.SetRootNamespace("MyApp");
+            });
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal($"{CodeGenerationConstants.ComponentBase.FullTypeName}", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public", }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_UsesRelativePathToGenerateTypeNameAndNamespace()
+        {
+            // Arrange
+            var relativePath = "/Pages/Announcements/Banner.razor";
+            var properties = new RazorSourceDocumentProperties(filePath: $"/MyApp{relativePath}", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var projectEngine = CreateProjectEngine(b =>
+            {
+                b.SetRootNamespace("MyApp");
+            });
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("Banner", visitor.Class.ClassName);
+            Assert.Equal("MyApp.Pages.Announcements", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\My.+App\path.with+invalid-chars.razor", relativePath: "path.with+invalid-chars.razor");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var projectEngine = CreateProjectEngine(b =>
+            {
+                b.SetRootNamespace("My.+App");
+            });
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+            Assert.Equal("My._App", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SetsUpMainMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.razor"));
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(CodeGenerationConstants.ComponentBase.BuildRenderTree, visitor.Method.MethodName);
+            Assert.Equal("void", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "protected", "override" }, visitor.Method.Modifiers);
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+        }
+
+        private class TestComponentDocumentClassifierPass : ComponentDocumentClassifierPass
+        {
+            public new bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+                => base.IsMatch(codeDocument, documentNode);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
new file mode 100644
index 0000000000..b823d72ef8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
@@ -0,0 +1,403 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public class ComponentMarkupBlockPassTest
+    {
+        public ComponentMarkupBlockPassTest()
+        {
+            Pass = new ComponentMarkupBlockPass();
+            ProjectEngine = (DefaultRazorProjectEngine)RazorProjectEngine.Create(
+                RazorConfiguration.Default,
+                RazorProjectFileSystem.Create(Environment.CurrentDirectory),
+                b =>
+                {
+                    if (b.Features.OfType<ComponentMarkupBlockPass>().Any())
+                    {
+                        b.Features.Remove(b.Features.OfType<ComponentMarkupBlockPass>().Single());
+                    }
+                });
+            Engine = ProjectEngine.Engine;
+
+            Pass.Engine = Engine;
+        }
+        
+        private DefaultRazorProjectEngine ProjectEngine { get; }
+
+        private RazorEngine Engine { get; }
+
+        private ComponentMarkupBlockPass Pass { get; }
+
+        [Fact]
+        public void Execute_RewritesHtml_Basic()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"">
+    Hello, World!
+  </head>
+</html>");
+
+            var expected = NormalizeContent(@"
+<html>
+  <head cool=""beans"">
+    Hello, World!
+  </head>
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_WithComment()
+        {
+            // Arrange
+            var document = CreateDocument(@"Start<!-- -->End");
+
+            var expected = NormalizeContent(@"StartEnd");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        // See: https://github.com/aspnet/AspNetCore/issues/6480
+        [Fact]
+        public void Execute_RewritesHtml_HtmlAttributePrefix()
+        {
+            // Arrange
+            var document = CreateDocument(@"<div class=""one two"">Hi</div>");
+
+            var expected = NormalizeContent(@"<div class=""one two"">Hi</div>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_MergesSiblings()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  @(""Hi"")<div></div>
+  <div></div>
+  <div>@(""Hi"")</div>
+</html>");
+
+            var expected = NormalizeContent(@"
+<div></div>
+  <div></div>
+  ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_MergesSiblings_LeftEdge()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html><div></div>
+  <div></div>
+  <div>@(""Hi"")</div>
+</html>");
+
+            var expected = NormalizeContent(@"
+<div></div>
+  <div></div>
+  ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+
+        [Fact]
+        public void Execute_RewritesHtml_CSharpInAttributes()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"" csharp=""@yes"" mixed=""hi @there"">
+    <div>foo</div>
+  </head>
+</html>");
+
+            var expected = NormalizeContent("<div>foo</div>\n  ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_CSharpInBody()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"">
+    <div>@foo</div>
+    <div>rewriteme</div>
+    <div>@bar</div>
+  </head>
+</html>");
+
+            var expected = NormalizeContent("<div>rewriteme</div>\n    ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_EncodesHtmlEntities()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>
+    &lt;span&gt;Hi&lt;/span&gt;
+</div>");
+
+            var expected = NormalizeContent(@"
+<div>
+    &lt;span&gt;Hi&lt;/span&gt;
+</div>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_EmptyNonvoid()
+        {
+            // Arrange
+            var document = CreateDocument(@"<a href=""...""></a>");
+
+            var expected = NormalizeContent(@"<a href=""...""></a>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_Void()
+        {
+            // Arrange
+            var document = CreateDocument(@"<link rel=""..."" href=""...""/>");
+
+            var expected = NormalizeContent(@"<link rel=""..."" href=""..."">");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void Execute_CannotRewriteHtml_CSharpInCode()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  @if (some_bool)
+  {
+  <head cool=""beans"">
+    @hello
+  </head>
+  }
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
+        }
+
+        [Fact]
+        public void Execute_CannotRewriteHtml_Script()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  @if (some_bool)
+  {
+  <head cool=""beans"">
+    <script>...</script>
+  </head>
+  }
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
+        }
+
+        // The unclosed tag will have errors, so we won't rewrite it or its parent.
+        [Fact]
+        public void Execute_CannotRewriteHtml_Errors()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <a href=""..."">
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
+        }
+
+        [Fact]
+        public void Execute_RewritesHtml_MismatchedClosingTag()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <div>
+    <div>rewriteme</div>
+  </span>
+</html>");
+
+            var expected = NormalizeContent("<div>rewriteme</div>\n  ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
+        private string NormalizeContent(string content)
+        {
+            // Test inputs frequently have leading space for readability.
+            content = content.TrimStart();
+
+            // Normalize newlines since we are testing lengths of things.
+            content = content.Replace("\r", "");
+            content = content.Replace("\n", "\r\n");
+
+            return content;
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            // Normalize newlines since we are testing lengths of things.
+            content = content.Replace("\r", "");
+            content = content.Replace("\n", "\r\n");
+
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return ProjectEngine.CreateCodeDocumentCore(source, FileKinds.Component);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < Engine.Phases.Count; i++)
+            {
+                var phase = Engine.Phases[i];
+                if (phase is IRazorCSharpLoweringPhase)
+                {
+                    break;
+                }
+
+                phase.Execute(codeDocument);
+            }
+
+            var document = codeDocument.GetDocumentIntermediateNode();
+            Engine.Features.OfType<ComponentDocumentClassifierPass>().Single().Execute(codeDocument, document);
+            return document;
+        }
+
+        private class StaticTagHelperFeature : ITagHelperFeature
+        {
+            public RazorEngine Engine { get; set; }
+
+            public List<TagHelperDescriptor> TagHelpers { get; set; }
+
+            public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
+            {
+                return TagHelpers;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupEncodingPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupEncodingPassTest.cs
new file mode 100644
index 0000000000..710d3d4457
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupEncodingPassTest.cs
@@ -0,0 +1,221 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public class ComponentMarkupEncodingPassTest
+    {
+        public ComponentMarkupEncodingPassTest()
+        {
+            Pass = new ComponentMarkupEncodingPass();
+            ProjectEngine = (DefaultRazorProjectEngine)RazorProjectEngine.Create(
+                RazorConfiguration.Default,
+                RazorProjectFileSystem.Create(Environment.CurrentDirectory),
+                b =>
+                {
+                    if (b.Features.OfType<ComponentMarkupEncodingPass>().Any())
+                    {
+                        b.Features.Remove(b.Features.OfType<ComponentMarkupEncodingPass>().Single());
+                    }
+                });
+            Engine = ProjectEngine.Engine;
+
+            Pass.Engine = Engine;
+        }
+
+        private DefaultRazorProjectEngine ProjectEngine { get; }
+
+        private RazorEngine Engine { get; }
+
+        private ComponentMarkupEncodingPass Pass { get; }
+
+        [Fact]
+        public void Execute_StaticHtmlContent_RewrittenToBlock()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>
+&nbsp;
+</div>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.FindDescendantNodes<HtmlContentIntermediateNode>());
+            Assert.Single(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
+        }
+
+        [Fact]
+        public void Execute_MixedHtmlContent_NoNewLineorSpecialCharacters_DoesNotSetEncoded()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>The time is @DateTime.Now</div>");
+            var expected = NormalizeContent("The time is ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
+            Assert.Equal(expected, GetHtmlContent(node));
+            Assert.False(node.IsEncoded());
+        }
+
+        [Fact]
+        public void Execute_MixedHtmlContent_NewLine_SetsEncoded()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>
+The time is @DateTime.Now</div>");
+            var expected = NormalizeContent(@"
+The time is ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
+            Assert.Equal(expected, GetHtmlContent(node));
+            Assert.True(node.IsEncoded());
+        }
+
+        [Fact]
+        public void Execute_MixedHtmlContent_Ampersand_SetsEncoded()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>The time is &&nbsp;& @DateTime.Now</div>");
+            var expected = NormalizeContent("The time is &&nbsp;& ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
+            Assert.Equal(expected, GetHtmlContent(node));
+            Assert.True(node.IsEncoded());
+        }
+
+        [Fact]
+        public void Execute_MixedHtmlContent_NonAsciiCharacter_SetsEncoded()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>ThĖ tĨme is @DateTime.Now</div>");
+            var expected = NormalizeContent("ThĖ tĨme is ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
+            Assert.Equal(expected, GetHtmlContent(node));
+            Assert.True(node.IsEncoded());
+        }
+
+        [Fact]
+        public void Execute_MixedHtmlContent_HTMLEntity_DoesNotSetEncoded()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>The time &equals; @DateTime.Now</div>");
+            var expected = NormalizeContent("The time = ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
+            Assert.Equal(expected, GetHtmlContent(node));
+            Assert.False(node.IsEncoded());
+        }
+
+        [Fact]
+        public void Execute_MixedHtmlContent_MultipleHTMLEntities_DoesNotSetEncoded()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<div>The time &equals;&nbsp;&#61;&#0x003D; @DateTime.Now</div>");
+            var expected = NormalizeContent("The time =\u00A0== ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
+            Assert.Equal(expected, GetHtmlContent(node));
+            Assert.False(node.IsEncoded());
+        }
+
+        private string NormalizeContent(string content)
+        {
+            // Normalize newlines since we are testing lengths of things.
+            content = content.Replace("\r", "");
+            content = content.Replace("\n", "\r\n");
+
+            return content;
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            // Normalize newlines since we are testing lengths of things.
+            content = content.Replace("\r", "");
+            content = content.Replace("\n", "\r\n");
+
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return ProjectEngine.CreateCodeDocumentCore(source, FileKinds.Component);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < Engine.Phases.Count; i++)
+            {
+                var phase = Engine.Phases[i];
+                if (phase is IRazorCSharpLoweringPhase)
+                {
+                    break;
+                }
+
+                phase.Execute(codeDocument);
+            }
+
+            var document = codeDocument.GetDocumentIntermediateNode();
+            Engine.Features.OfType<ComponentDocumentClassifierPass>().Single().Execute(codeDocument, document);
+            return document;
+        }
+
+        private static string GetHtmlContent(HtmlContentIntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            var htmlTokens = node.Children.OfType<IntermediateToken>().Where(t => t.IsHtml);
+            foreach (var htmlToken in htmlTokens)
+            {
+                builder.Append(htmlToken.Content);
+            }
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/NodeAssert.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/NodeAssert.cs
new file mode 100644
index 0000000000..aae834c256
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/NodeAssert.cs
@@ -0,0 +1,126 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class NodeAssert
+    {
+        public static HtmlAttributeIntermediateNode Attribute(IntermediateNode node, string attributeName, string attributeValue)
+        {
+            Assert.NotNull(node);
+
+            var attributeNode = Assert.IsType<HtmlAttributeIntermediateNode>(node);
+            Assert.Equal(attributeName, attributeNode.AttributeName);
+
+            var attributeValueNode = Assert.IsType<HtmlAttributeValueIntermediateNode>(Assert.Single(attributeNode.Children));
+            var actual = new StringBuilder();
+            for (var i = 0; i < attributeValueNode.Children.Count; i++)
+            {
+                var token = Assert.IsType<IntermediateToken>(attributeValueNode.Children[i]);
+                Assert.Equal(TokenKind.Html, token.Kind);
+                actual.Append(token.Content);
+            }
+
+            Assert.Equal(attributeValue, actual.ToString());
+
+            return attributeNode;
+        }
+
+        public static HtmlAttributeIntermediateNode Attribute(IntermediateNodeCollection nodes, string attributeName, string attributeValue)
+        {
+            Assert.NotNull(nodes);
+            return Attribute(Assert.Single(nodes), attributeName, attributeValue);
+        }
+
+        public static HtmlContentIntermediateNode Content(IntermediateNode node, string content, bool trim = true)
+        {
+            Assert.NotNull(node);
+
+            var contentNode = Assert.IsType<HtmlContentIntermediateNode>(node);
+
+            var actual = new StringBuilder();
+            for (var i = 0; i < contentNode.Children.Count; i++)
+            {
+                var token = Assert.IsType<IntermediateToken>(contentNode.Children[i]);
+                Assert.Equal(TokenKind.Html, token.Kind);
+                actual.Append(token.Content);
+            }
+
+            Assert.Equal(content, trim ? actual.ToString().Trim() : actual.ToString());
+            return contentNode;
+        }
+
+        public static HtmlContentIntermediateNode Content(IntermediateNodeCollection nodes, string content, bool trim = true)
+        {
+            Assert.NotNull(nodes);
+            return Content(Assert.Single(nodes), content, trim);
+        }
+
+        public static HtmlAttributeIntermediateNode CSharpAttribute(IntermediateNode node, string attributeName, string attributeValue)
+        {
+            Assert.NotNull(node);
+
+            var attributeNode = Assert.IsType<HtmlAttributeIntermediateNode>(node);
+            Assert.Equal(attributeName, attributeNode.AttributeName);
+
+            var attributeValueNode = Assert.IsType<CSharpExpressionAttributeValueIntermediateNode>(Assert.Single(attributeNode.Children));
+            var actual = new StringBuilder();
+            for (var i = 0; i < attributeValueNode.Children.Count; i++)
+            {
+                var token = Assert.IsType<IntermediateToken>(attributeValueNode.Children[i]);
+                Assert.Equal(TokenKind.CSharp, token.Kind);
+                actual.Append(token.Content);
+            }
+
+            Assert.Equal(attributeValue, actual.ToString());
+
+            return attributeNode;
+        }
+
+        public static HtmlAttributeIntermediateNode CSharpAttribute(IntermediateNodeCollection nodes, string attributeName, string attributeValue)
+        {
+            Assert.NotNull(nodes);
+            return Attribute(Assert.Single(nodes), attributeName, attributeValue);
+        }
+
+        public static MarkupElementIntermediateNode Element(IntermediateNode node, string tagName)
+        {
+            Assert.NotNull(node);
+
+            var elementNode = Assert.IsType<MarkupElementIntermediateNode>(node);
+            Assert.Equal(tagName, elementNode.TagName);
+            return elementNode;
+        }
+
+        public static MarkupElementIntermediateNode Element(IntermediateNodeCollection nodes, string tagName)
+        {
+            Assert.NotNull(nodes);
+            return Element(Assert.Single(nodes), tagName);
+        }
+
+        public static HtmlContentIntermediateNode Whitespace(IntermediateNode node)
+        {
+            Assert.NotNull(node);
+
+            var contentNode = Assert.IsType<HtmlContentIntermediateNode>(node);
+            for (var i = 0; i < contentNode.Children.Count; i++)
+            {
+                var token = Assert.IsType<IntermediateToken>(contentNode.Children[i]);
+                Assert.Equal(TokenKind.Html, token.Kind);
+                Assert.True(string.IsNullOrWhiteSpace(token.Content));
+            }
+
+            return contentNode;
+        }
+
+        public static HtmlContentIntermediateNode Whitespace(IntermediateNodeCollection nodes)
+        {
+            Assert.NotNull(nodes);
+            return Whitespace(Assert.Single(nodes));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultAllowedChildTagDescriptorBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultAllowedChildTagDescriptorBuilderTest.cs
new file mode 100644
index 0000000000..2a6b2a8198
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultAllowedChildTagDescriptorBuilderTest.cs
@@ -0,0 +1,24 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultAllowedChildTagDescriptorBuilderTest
+    {
+        [Fact]
+        public void Build_DisplayNameIsName()
+        {
+            // Arrange
+            var builder = new DefaultAllowedChildTagDescriptorBuilder(null);
+            builder.Name = "foo";
+
+            // Act
+            var descriptor = builder.Build();
+
+            // Assert
+            Assert.Equal("foo", descriptor.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs
new file mode 100644
index 0000000000..52317aa157
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs
@@ -0,0 +1,47 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultBoundAttributeDescriptorBuilderTest
+    {
+        [Fact]
+        public void DisplayName_SetsDescriptorsDisplayName()
+        {
+            // Arrange
+            var expectedDisplayName = "ExpectedDisplayName";
+
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder.DisplayName(expectedDisplayName);
+
+            // Act
+            var descriptor = builder.Build();
+
+            // Assert
+            Assert.Equal(expectedDisplayName, descriptor.DisplayName);
+        }
+
+        [Fact]
+        public void DisplayName_DefaultsToPropertyLookingDisplayName()
+        {
+            // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            tagHelperBuilder.TypeName("TestTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .TypeName(typeof(int).FullName)
+                .PropertyName("SomeProperty");
+
+            // Act
+            var descriptor = builder.Build();
+
+            // Assert
+            Assert.Equal("int TestTagHelper.SomeProperty", descriptor.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..218d3da90d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultDocumentClassifierPassTest.cs
@@ -0,0 +1,62 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // We're purposely lean on tests here because the functionality is well covered by
+    // integration tests, and is mostly implemented by the base class.
+    public class DefaultDocumentClassifierPassTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void Execute_IgnoresDocumentsWithDocumentKind()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                DocumentKind = "ignore",
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new DefaultDocumentClassifierPass();
+            pass.Engine = CreateProjectEngine().Engine;
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            Assert.Equal("ignore", documentNode.DocumentKind);
+            NoChildren(documentNode);
+        }
+
+        [Fact]
+        public void Execute_CreatesClassStructure()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new DefaultDocumentClassifierPass();
+            pass.Engine = CreateProjectEngine().Engine;
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            Assert.Equal("default", documentNode.DocumentKind);
+
+            var @namespace = SingleChild<NamespaceDeclarationIntermediateNode>(documentNode);
+            var @class = SingleChild<ClassDeclarationIntermediateNode>(@namespace);
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            NoChildren(method);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultItemCollectionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultItemCollectionTest.cs
new file mode 100644
index 0000000000..aee4d07fe0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultItemCollectionTest.cs
@@ -0,0 +1,54 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class ItemCollectionTest
+    {
+        [Fact]
+        public void Get_MissingValueReturnsNull()
+        {
+            // Arrange
+            var items = new ItemCollection();
+
+            // Act
+            var value = items["foo"];
+
+            // Assert
+            Assert.Null(value);
+        }
+
+        [Fact]
+        public void GetAndSet_ReturnsValue()
+        {
+            // Arrange
+            var items = new ItemCollection();
+
+            var expected = "bar";
+            items["foo"] = expected;
+
+            // Act
+            var value = items["foo"];
+
+            // Assert
+            Assert.Same(expected, value);
+        }
+
+        [Fact]
+        public void Set_CanSetValueToNull()
+        {
+            // Arrange
+            var items = new ItemCollection();
+            
+            items["foo"] = "bar";
+
+            // Act
+            items["foo"] = null;
+
+            // Assert
+            Assert.Null(items["foo"]);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCSharpLoweringPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCSharpLoweringPhaseTest.cs
new file mode 100644
index 0000000000..e76c97557f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCSharpLoweringPhaseTest.cs
@@ -0,0 +1,87 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorCSharpLoweringPhaseTest
+    {
+        [Fact]
+        public void Execute_ThrowsForMissingDependency_IRDocument()
+        {
+            // Arrange
+            var phase = new DefaultRazorCSharpLoweringPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source));
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The '{nameof(DefaultRazorCSharpLoweringPhase)}' phase requires a '{nameof(DocumentIntermediateNode)}' " +
+                $"provided by the '{nameof(RazorCodeDocument)}'.");
+        }
+
+        [Fact]
+        public void Execute_ThrowsForMissingDependency_CodeTarget()
+        {
+            // Arrange
+            var phase = new DefaultRazorCSharpLoweringPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source));
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+            };
+            codeDocument.SetDocumentIntermediateNode(irDocument);
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The document of kind 'test' does not have a '{nameof(CodeTarget)}'. " +
+                $"The document classifier must set a value for '{nameof(DocumentIntermediateNode.Target)}'.");
+        }
+
+        [Fact]
+        public void Execute_CollatesIRDocumentDiagnosticsFromSourceDocument()
+        {
+            // Arrange
+            var phase = new DefaultRazorCSharpLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+            var codeDocument = TestRazorCodeDocument.Create("<p class=@(");
+            var options = RazorCodeGenerationOptions.CreateDefault();
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+                Target = CodeTarget.CreateDefault(codeDocument, options),
+                Options = options,
+            };
+            var expectedDiagnostic = RazorDiagnostic.Create(
+                    new RazorDiagnosticDescriptor("1234", () => "I am an error.", RazorDiagnosticSeverity.Error),
+                    new SourceSpan("SomeFile.cshtml", 11, 0, 11, 1));
+            irDocument.Diagnostics.Add(expectedDiagnostic);
+            codeDocument.SetDocumentIntermediateNode(irDocument);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var csharpDocument = codeDocument.GetCSharpDocument();
+            var diagnostic = Assert.Single(csharpDocument.Diagnostics);
+            Assert.Same(expectedDiagnostic, diagnostic);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCodeDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCodeDocumentTest.cs
new file mode 100644
index 0000000000..415dcadb3b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorCodeDocumentTest.cs
@@ -0,0 +1,47 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorCodeDocumentTest
+    {
+        [Fact]
+        public void Ctor()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+
+            var imports = new RazorSourceDocument[]
+            {
+                TestRazorSourceDocument.Create(),
+            };
+            
+            // Act
+            var code = new DefaultRazorCodeDocument(source, imports);
+
+            // Assert
+            Assert.Same(source, code.Source);
+            Assert.NotNull(code.Items);
+
+            Assert.NotSame(imports, code.Imports);
+            Assert.Collection(imports, d => Assert.Same(imports[0], d));
+        }
+
+        [Fact]
+        public void Ctor_AllowsNullForImports()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+
+            // Act
+            var code = new DefaultRazorCodeDocument(source, imports: null);
+
+            // Assert
+            Assert.Same(source, code.Source);
+            Assert.NotNull(code.Items);
+            Assert.Empty(code.Imports);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDiagnosticTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDiagnosticTest.cs
new file mode 100644
index 0000000000..bf8f3099ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDiagnosticTest.cs
@@ -0,0 +1,217 @@
+// Copyright(c) .NET Foundation.All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorDiagnosticTest
+    {
+        [Fact]
+        public void DefaultRazorDiagnostic_Ctor()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "error", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            // Act
+            var diagnostic = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+
+            // Assert
+            Assert.Equal("RZ0000", diagnostic.Id);
+            Assert.Equal(RazorDiagnosticSeverity.Error, diagnostic.Severity);
+            Assert.Equal(span, diagnostic.Span);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_GetMessage()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "error", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+
+            // Act
+            var result = diagnostic.GetMessage();
+
+            // Assert
+            Assert.Equal("error", result);
+        }
+
+
+        [Fact]
+        public void DefaultRazorDiagnostic_GetMessage_WithArgs()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic = new DefaultRazorDiagnostic(descriptor, span, new[] { "error" });
+
+            // Act
+            var result = diagnostic.GetMessage();
+
+            // Assert
+            Assert.Equal("this is an error", result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_GetMessage_WithArgs_FormatProvider()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic = new DefaultRazorDiagnostic(descriptor, span, new object[] { 1.3m });
+
+            // Act
+            var result = diagnostic.GetMessage(new CultureInfo("fr-FR"));
+
+            // Assert
+            Assert.Equal("this is an 1,3", result);
+        }
+
+
+        [Fact]
+        public void DefaultRazorDiagnostic_ToString()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an error", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+
+            // Act
+            var result = diagnostic.ToString();
+
+            // Assert
+            Assert.Equal("test.cs(2,9): Error RZ0000: this is an error", result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_ToString_FormatProvider()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic = new DefaultRazorDiagnostic(descriptor, span, new object[] { 1.3m });
+
+            // Act
+            var result = ((IFormattable)diagnostic).ToString("ignored", new CultureInfo("fr-FR"));
+
+            // Assert
+            Assert.Equal("test.cs(2,9): Error RZ0000: this is an 1,3", result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_Equals()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic1 = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+            var diagnostic2 = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+
+            // Act
+            var result = diagnostic1.Equals(diagnostic2);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_NotEquals_DifferentLocation()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span1 = new SourceSpan("test.cs", 15, 1, 8, 5);
+            var span2 = new SourceSpan("test.cs", 15, 1, 8, 3);
+
+            var diagnostic1 = new DefaultRazorDiagnostic(descriptor, span1, new object[0]);
+            var diagnostic2 = new DefaultRazorDiagnostic(descriptor, span2, new object[0]);
+
+            // Act
+            var result = diagnostic1.Equals(diagnostic2);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_NotEquals_DifferentId()
+        {
+            // Arrange
+            var descriptor1 = new RazorDiagnosticDescriptor("RZ0001", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var descriptor2 = new RazorDiagnosticDescriptor("RZ0002", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic1 = new DefaultRazorDiagnostic(descriptor1, span, new object[0]);
+            var diagnostic2 = new DefaultRazorDiagnostic(descriptor2, span, new object[0]);
+
+            // Act
+            var result = diagnostic1.Equals(diagnostic2);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_HashCodesEqual()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic1 = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+            var diagnostic2 = new DefaultRazorDiagnostic(descriptor, span, new object[0]);
+
+            // Act
+            var result = diagnostic1.GetHashCode() == diagnostic2.GetHashCode();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_HashCodesNotEqual_DifferentLocation()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0000", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span1 = new SourceSpan("test.cs", 15, 1, 8, 5);
+            var span2 = new SourceSpan("test.cs", 15, 1, 8, 3);
+
+            var diagnostic1 = new DefaultRazorDiagnostic(descriptor, span1, new object[0]);
+            var diagnostic2 = new DefaultRazorDiagnostic(descriptor, span2, new object[0]);
+
+            // Act
+            var result = diagnostic1.GetHashCode() == diagnostic2.GetHashCode();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void DefaultRazorDiagnostic_HashCodesNotEqual_DifferentId()
+        {
+            // Arrange
+            var descriptor1 = new RazorDiagnosticDescriptor("RZ0001", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var descriptor2 = new RazorDiagnosticDescriptor("RZ0002", () => "this is an {0}", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            var diagnostic1 = new DefaultRazorDiagnostic(descriptor1, span, new object[0]);
+            var diagnostic2 = new DefaultRazorDiagnostic(descriptor2, span, new object[0]);
+
+            // Act
+            var result = diagnostic1.GetHashCode() == diagnostic2.GetHashCode();
+
+            // Assert
+            Assert.False(result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDirectiveClassifierPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDirectiveClassifierPhaseTest.cs
new file mode 100644
index 0000000000..306be8c445
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDirectiveClassifierPhaseTest.cs
@@ -0,0 +1,102 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorDirectiveClassifierPhaseTest
+    {
+        [Fact]
+        public void OnInitialized_OrdersPassesInAscendingOrder()
+        {
+            // Arrange & Act
+            var phase = new DefaultRazorDirectiveClassifierPhase();
+
+            var first = Mock.Of<IRazorDirectiveClassifierPass>(p => p.Order == 15);
+            var second = Mock.Of<IRazorDirectiveClassifierPass>(p => p.Order == 17);
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(second);
+                b.Features.Add(first);
+            });
+
+            // Assert
+            Assert.Collection(
+                phase.Passes,
+                p => Assert.Same(first, p),
+                p => Assert.Same(second, p));
+        }
+
+        [Fact]
+        public void Execute_ThrowsForMissingDependency()
+        {
+            // Arrange
+            var phase = new DefaultRazorDirectiveClassifierPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The '{nameof(DefaultRazorDirectiveClassifierPhase)}' phase requires a '{nameof(DocumentIntermediateNode)}' " + 
+                $"provided by the '{nameof(RazorCodeDocument)}'.");
+        }
+
+        [Fact]
+        public void Execute_ExecutesPhasesInOrder()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // We're going to set up mocks to simulate a sequence of passes. We don't care about
+            // what's in the nodes, we're just going to look at the identity via strict mocks.
+            var originalNode = new DocumentIntermediateNode();
+            var firstPassNode = new DocumentIntermediateNode();
+            var secondPassNode = new DocumentIntermediateNode();
+            codeDocument.SetDocumentIntermediateNode(originalNode);
+
+            var firstPass = new Mock<IRazorDirectiveClassifierPass>(MockBehavior.Strict);
+            firstPass.SetupGet(m => m.Order).Returns(0);
+            firstPass.SetupProperty(m => m.Engine);
+            firstPass.Setup(m => m.Execute(codeDocument, originalNode)).Callback(() =>
+            {
+                originalNode.Children.Add(firstPassNode);
+            });
+
+            var secondPass = new Mock<IRazorDirectiveClassifierPass>(MockBehavior.Strict);
+            secondPass.SetupGet(m => m.Order).Returns(1);
+            secondPass.SetupProperty(m => m.Engine);
+            secondPass.Setup(m => m.Execute(codeDocument, originalNode)).Callback(() =>
+            {
+                // Works only when the first pass has run before this.
+                originalNode.Children[0].Children.Add(secondPassNode);
+            });
+
+            var phase = new DefaultRazorDirectiveClassifierPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(firstPass.Object);
+                b.Features.Add(secondPass.Object);
+            });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            Assert.Same(secondPassNode, codeDocument.GetDocumentIntermediateNode().Children[0].Children[0]);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDocumentClassifierPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDocumentClassifierPhaseTest.cs
new file mode 100644
index 0000000000..0f384b851e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorDocumentClassifierPhaseTest.cs
@@ -0,0 +1,102 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorDocumentClassifierPhaseTest
+    {
+        [Fact]
+        public void OnInitialized_OrdersPassesInAscendingOrder()
+        {
+            // Arrange & Act
+            var phase = new DefaultRazorDocumentClassifierPhase();
+
+            var first = Mock.Of<IRazorDocumentClassifierPass>(p => p.Order == 15);
+            var second = Mock.Of<IRazorDocumentClassifierPass>(p => p.Order == 17);
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(second);
+                b.Features.Add(first);
+            });
+
+            // Assert
+            Assert.Collection(
+                phase.Passes,
+                p => Assert.Same(first, p),
+                p => Assert.Same(second, p));
+        }
+
+        [Fact]
+        public void Execute_ThrowsForMissingDependency()
+        {
+            // Arrange
+            var phase = new DefaultRazorDocumentClassifierPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The '{nameof(DefaultRazorDocumentClassifierPhase)}' phase requires a '{nameof(DocumentIntermediateNode)}' " + 
+                $"provided by the '{nameof(RazorCodeDocument)}'.");
+        }
+
+        [Fact]
+        public void Execute_ExecutesPhasesInOrder()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // We're going to set up mocks to simulate a sequence of passes. We don't care about
+            // what's in the nodes, we're just going to look at the identity via strict mocks.
+            var originalNode = new DocumentIntermediateNode();
+            var firstPassNode = new DocumentIntermediateNode();
+            var secondPassNode = new DocumentIntermediateNode();
+            codeDocument.SetDocumentIntermediateNode(originalNode);
+
+            var firstPass = new Mock<IRazorDocumentClassifierPass>(MockBehavior.Strict);
+            firstPass.SetupGet(m => m.Order).Returns(0);
+            firstPass.SetupProperty(m => m.Engine);
+            firstPass.Setup(m => m.Execute(codeDocument, originalNode)).Callback(() =>
+            {
+                originalNode.Children.Add(firstPassNode);
+            });
+
+            var secondPass = new Mock<IRazorDocumentClassifierPass>(MockBehavior.Strict);
+            secondPass.SetupGet(m => m.Order).Returns(1);
+            secondPass.SetupProperty(m => m.Engine);
+            secondPass.Setup(m => m.Execute(codeDocument, originalNode)).Callback(() =>
+            {
+                // Works only when the first pass has run before this.
+                originalNode.Children[0].Children.Add(secondPassNode);
+            });
+
+            var phase = new DefaultRazorDocumentClassifierPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(firstPass.Object);
+                b.Features.Add(secondPass.Object);
+            });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            Assert.Same(secondPassNode, codeDocument.GetDocumentIntermediateNode().Children[0].Children[0]);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineBuilderTest.cs
new file mode 100644
index 0000000000..a1c804287a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineBuilderTest.cs
@@ -0,0 +1,42 @@
+// 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.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorEngineBuilderTest
+    {
+        [Fact]
+        public void Build_AddsFeaturesAndPhases()
+        {
+            // Arrange
+            var builder = new DefaultRazorEngineBuilder(designTime: false);
+
+            builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+            builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+
+            builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+            builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+
+            var features = builder.Features.ToArray();
+            var phases = builder.Phases.ToArray();
+
+            // Act
+            var engine = builder.Build();
+
+            // Assert
+            Assert.Collection(
+                engine.Features,
+                f => Assert.Same(features[0], f),
+                f => Assert.Same(features[1], f));
+
+            Assert.Collection(
+                engine.Phases,
+                p => Assert.Same(phases[0], p),
+                p => Assert.Same(phases[1], p));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineTest.cs
new file mode 100644
index 0000000000..15b3122969
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorEngineTest.cs
@@ -0,0 +1,72 @@
+// 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 Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorEngineTest
+    {
+        [Fact]
+        public void Ctor_InitializesPhasesAndFeatures()
+        {
+            // Arrange
+            var features = new IRazorEngineFeature[]
+            {
+                Mock.Of<IRazorEngineFeature>(),
+                Mock.Of<IRazorEngineFeature>(),
+            };
+
+            var phases = new IRazorEnginePhase[]
+            {
+                Mock.Of<IRazorEnginePhase>(),
+                Mock.Of<IRazorEnginePhase>(),
+            };
+
+            // Act
+            var engine = new DefaultRazorEngine(features, phases);
+
+            // Assert
+            for (var i = 0; i < features.Length; i++)
+            {
+                Assert.Same(engine, features[i].Engine);
+            }
+
+            for (var i = 0; i < phases.Length; i++)
+            {
+                Assert.Same(engine, phases[i].Engine);
+            }
+        }
+
+        [Fact]
+        public void Process_CallsAllPhases()
+        {
+            // Arrange
+            var features = new IRazorEngineFeature[]
+            {
+                Mock.Of<IRazorEngineFeature>(),
+                Mock.Of<IRazorEngineFeature>(),
+            };
+
+            var phases = new IRazorEnginePhase[]
+            {
+                Mock.Of<IRazorEnginePhase>(),
+                Mock.Of<IRazorEnginePhase>(),
+            };
+
+            var engine = new DefaultRazorEngine(features, phases);
+            var document = TestRazorCodeDocument.CreateEmpty();
+
+            // Act
+            engine.Process(document);
+
+            // Assert
+            for (var i = 0; i < phases.Length; i++)
+            {
+                var mock = Mock.Get(phases[i]);
+                mock.Verify(p => p.Execute(document), Times.Once());
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs
new file mode 100644
index 0000000000..4d008b89d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs
@@ -0,0 +1,541 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Moq;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest
+    {
+        [Fact]
+        public void Lower_SetsOptions_Defaults()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Assert.NotNull(documentNode.Options);
+            Assert.False(documentNode.Options.DesignTime);
+            Assert.Equal(4, documentNode.Options.IndentSize);
+            Assert.False(documentNode.Options.IndentWithTabs);
+        }
+
+        [Fact]
+        public void Lower_SetsOptions_RunsConfigureCallbacks()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var callback = new Mock<IConfigureRazorCodeGenerationOptionsFeature>();
+            callback
+                .Setup(c => c.Configure(It.IsAny<RazorCodeGenerationOptionsBuilder>()))
+                .Callback<RazorCodeGenerationOptionsBuilder>(o =>
+                {
+                    o.IndentSize = 17;
+                    o.IndentWithTabs = true;
+                    o.SuppressChecksum = true;
+                });
+
+            // Act
+            var documentNode = Lower(
+                codeDocument,
+                builder: b =>
+                {
+                    b.Features.Add(callback.Object);
+                },
+                designTime: true);
+
+            // Assert
+            Assert.NotNull(documentNode.Options);
+            Assert.True(documentNode.Options.DesignTime);
+            Assert.Equal(17, documentNode.Options.IndentSize);
+            Assert.True(documentNode.Options.IndentWithTabs);
+            Assert.True(documentNode.Options.SuppressChecksum);
+        }
+
+        [Fact]
+        public void Lower_HelloWorld()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create("Hello, World!");
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(documentNode,
+                n => Html("Hello, World!", n));
+        }
+
+        [Fact]
+        public void Lower_HtmlWithDataDashAttributes()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"
+<html>
+    <body>
+        <span data-val=""@Hello"" />
+    </body>
+</html>");
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(documentNode,
+                n => Html(
+@"
+<html>
+    <body>
+        <span data-val=""", n),
+                n => CSharpExpression("Hello", n),
+                n => Html(@""" />
+    </body>
+</html>", n));
+        }
+
+        [Fact]
+        public void Lower_HtmlWithConditionalAttributes()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"
+<html>
+    <body>
+        <span val=""@Hello World"" />
+    </body>
+</html>");
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(documentNode,
+                n => Html(
+@"
+<html>
+    <body>
+        <span", n),
+
+                n => ConditionalAttribute(
+                    prefix: " val=\"",
+                    name: "val",
+                    suffix: "\"",
+                    node: n,
+                    valueValidators: new Action<IntermediateNode>[]
+                    {
+                        value => CSharpExpressionAttributeValue(string.Empty, "Hello", value),
+                        value => LiteralAttributeValue(" ",  "World", value)
+                    }),
+                n => Html(@" />
+    </body>
+</html>", n));
+        }
+
+        [Fact]
+        public void Lower_WithFunctions()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"@functions { public int Foo { get; set; }}");
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(documentNode,
+                n => Directive(
+                    "functions",
+                    n,
+                    c => Assert.IsType<CSharpCodeIntermediateNode>(c)));
+        }
+
+        [Fact]
+        public void Lower_WithUsing()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"@using System");
+            var expectedSourceLocation = new SourceSpan(codeDocument.Source.FilePath, 1, 0, 1, 12);
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(documentNode,
+                n =>
+                {
+                    Using("System", n);
+                    Assert.Equal(expectedSourceLocation, n.Source);
+                });
+        }
+
+        [Fact]
+        public void Lower_TagHelpers()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"@addTagHelper *, TestAssembly
+<span val=""@Hello World""></span>");
+            var tagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "span",
+                    typeName: "SpanTagHelper",
+                    assemblyName: "TestAssembly")
+            };
+
+            // Act
+            var documentNode = Lower(codeDocument, tagHelpers: tagHelpers);
+
+            // Assert
+            Children(documentNode,
+                n => Directive(
+                    SyntaxConstants.CSharp.AddTagHelperKeyword,
+                    n,
+                    v => DirectiveToken(DirectiveTokenKind.String, "*, TestAssembly", v)),
+                n => TagHelper(
+                    "span",
+                    TagMode.StartTagAndEndTag,
+                    tagHelpers,
+                    n,
+                    c => Assert.IsType<TagHelperBodyIntermediateNode>(c),
+                    c => TagHelperHtmlAttribute(
+                        "val",
+                        AttributeStructure.DoubleQuotes,
+                        c,
+                        v => CSharpExpressionAttributeValue(string.Empty, "Hello", v),
+                        v => LiteralAttributeValue(" ", "World", v))));
+        }
+
+        [Fact]
+        public void Lower_TagHelpers_WithPrefix()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"@addTagHelper *, TestAssembly
+@tagHelperPrefix cool:
+<cool:span val=""@Hello World""></cool:span>");
+            var tagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "span",
+                    typeName: "SpanTagHelper",
+                    assemblyName: "TestAssembly")
+            };
+
+            // Act
+            var documentNode = Lower(codeDocument, tagHelpers: tagHelpers);
+
+            // Assert
+            Children(documentNode,
+                n => Directive(
+                    SyntaxConstants.CSharp.AddTagHelperKeyword,
+                    n,
+                    v => DirectiveToken(DirectiveTokenKind.String, "*, TestAssembly", v)),
+                n => Directive(
+                    SyntaxConstants.CSharp.TagHelperPrefixKeyword,
+                    n,
+                    v => DirectiveToken(DirectiveTokenKind.String, "cool:", v)),
+                n => TagHelper(
+                    "span",  // Note: this is span not cool:span
+                    TagMode.StartTagAndEndTag,
+                    tagHelpers,
+                    n,
+                    c => Assert.IsType<TagHelperBodyIntermediateNode>(c),
+                    c => TagHelperHtmlAttribute(
+                        "val",
+                        AttributeStructure.DoubleQuotes,
+                        c,
+                        v => CSharpExpressionAttributeValue(string.Empty, "Hello", v),
+                        v => LiteralAttributeValue(" ", "World", v))));
+        }
+
+        [Fact]
+        public void Lower_TagHelper_InSection()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"@addTagHelper *, TestAssembly
+@section test {
+<span val=""@Hello World""></span>
+}");
+            var tagHelpers = new[]
+            {
+                        CreateTagHelperDescriptor(
+                            tagName: "span",
+                            typeName: "SpanTagHelper",
+                            assemblyName: "TestAssembly")
+            };
+
+            // Act
+            var documentNode = Lower(codeDocument, tagHelpers: tagHelpers);
+
+            // Assert
+            Children(
+                documentNode,
+                n => Directive(
+                    SyntaxConstants.CSharp.AddTagHelperKeyword,
+                    n,
+                    v => DirectiveToken(DirectiveTokenKind.String, "*, TestAssembly", v)),
+                n => Directive(
+                    "section",
+                    n,
+                    c1 => DirectiveToken(DirectiveTokenKind.Member, "test", c1),
+                    c1 => Html(Environment.NewLine, c1),
+                    c1 => TagHelper(
+                        "span",
+                        TagMode.StartTagAndEndTag,
+                        tagHelpers,
+                        c1,
+                        c2 => Assert.IsType<TagHelperBodyIntermediateNode>(c2),
+                        c2 => TagHelperHtmlAttribute(
+                            "val",
+                            AttributeStructure.DoubleQuotes,
+                            c2,
+                            v => CSharpExpressionAttributeValue(string.Empty, "Hello", v),
+                            v => LiteralAttributeValue(" ", "World", v))),
+                    c1 => Html(Environment.NewLine, c1)));
+        }
+
+        [Fact]
+        public void Lower_TagHelpersWithBoundAttribute()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.Create(@"@addTagHelper *, TestAssembly
+<input bound='foo' />");
+            var tagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "InputTagHelper",
+                    assemblyName: "TestAssembly",
+                    attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("bound")
+                            .PropertyName("FooProp")
+                            .TypeName("System.String"),
+                            })
+            };
+
+            // Act
+            var documentNode = Lower(codeDocument, tagHelpers: tagHelpers);
+
+            // Assert
+            Children(
+                documentNode,
+                n => Directive(
+                    SyntaxConstants.CSharp.AddTagHelperKeyword,
+                    n,
+                    v => DirectiveToken(DirectiveTokenKind.String, "*, TestAssembly", v)),
+                n => TagHelper(
+                    "input",
+                    TagMode.SelfClosing,
+                    tagHelpers,
+                    n,
+                    c => Assert.IsType<TagHelperBodyIntermediateNode>(c),
+                    c => SetTagHelperProperty(
+                        "bound",
+                        "FooProp",
+                        AttributeStructure.SingleQuotes,
+                        c,
+                        v => Html("foo", v))));
+        }
+
+        [Fact]
+        public void Lower_WithImports_Using()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create(@"@using System.Threading.Tasks
+<p>Hi!</p>");
+            var imports = new[]
+            {
+                TestRazorSourceDocument.Create("@using System.Globalization"),
+                TestRazorSourceDocument.Create("@using System.Text"),
+            };
+
+            var codeDocument = TestRazorCodeDocument.Create(source, imports);
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(
+                documentNode,
+                n => Using("System.Globalization", n),
+                n => Using("System.Text", n),
+                n => Using("System.Threading.Tasks", n),
+                n => Html("<p>Hi!</p>", n));
+        }
+
+        [Fact]
+        public void Lower_WithImports_AllowsIdenticalNamespacesInPrimaryDocument()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create(@"@using System.Threading.Tasks
+@using System.Threading.Tasks");
+            var imports = new[]
+            {
+                TestRazorSourceDocument.Create("@using System.Threading.Tasks"),
+            };
+
+            var codeDocument = TestRazorCodeDocument.Create(source, imports);
+
+            // Act
+            var documentNode = Lower(codeDocument);
+
+            // Assert
+            Children(
+                documentNode,
+                n => Using("System.Threading.Tasks", n),
+                n => Using("System.Threading.Tasks", n));
+        }
+
+        [Fact]
+        public void Lower_WithMultipleImports_SingleLineFileScopedSinglyOccurring()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create("<p>Hi!</p>");
+            var imports = new[]
+            {
+                TestRazorSourceDocument.Create("@test value1"),
+                TestRazorSourceDocument.Create("@test value2"),
+            };
+
+            var codeDocument = TestRazorCodeDocument.Create(source, imports);
+
+            // Act
+            var documentNode = Lower(codeDocument, b =>
+            {
+                b.AddDirective(DirectiveDescriptor.CreateDirective(
+                    "test",
+                    DirectiveKind.SingleLine,
+                    builder =>
+                    {
+                        builder.AddMemberToken();
+                        builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                    }));
+            });
+
+            // Assert
+            Children(
+                documentNode,
+                n => Directive("test", n, c => DirectiveToken(DirectiveTokenKind.Member, "value2", c)),
+                n => Html("<p>Hi!</p>", n));
+        }
+
+        [Fact]
+        public void Lower_WithImports_IgnoresBlockDirective()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create("<p>Hi!</p>");
+            var imports = new[]
+            {
+                TestRazorSourceDocument.Create("@block token { }"),
+            };
+
+            var codeDocument = TestRazorCodeDocument.Create(source, imports);
+
+            // Act
+            var documentNode = Lower(codeDocument, b =>
+            {
+                b.AddDirective(DirectiveDescriptor.CreateDirective("block", DirectiveKind.RazorBlock, d => d.AddMemberToken()));
+            });
+
+            // Assert
+            Children(
+                documentNode,
+                n => Html("<p>Hi!</p>", n));
+        }
+
+        private DocumentIntermediateNode Lower(
+            RazorCodeDocument codeDocument,
+            Action<RazorProjectEngineBuilder> builder = null,
+            IEnumerable<TagHelperDescriptor> tagHelpers = null,
+            bool designTime = false)
+        {
+            tagHelpers = tagHelpers ?? new TagHelperDescriptor[0];
+
+            Action<RazorProjectEngineBuilder> configureEngine = b =>
+            {
+                builder?.Invoke(b);
+
+                SectionDirective.Register(b);
+                b.AddTagHelpers(tagHelpers);
+
+                b.Features.Add(new DesignTimeOptionsFeature(designTime));
+            };
+
+            var projectEngine = RazorProjectEngine.Create(configureEngine);
+
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(documentNode);
+
+            return documentNode;
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BoundAttributeDescriptor(attributeBuilder);
+                }
+            }
+
+            builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+
+        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private bool _designTime;
+
+            public DesignTimeOptionsFeature(bool designTime)
+            {
+                _designTime = designTime;
+            }
+
+            public int Order { get; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs
new file mode 100644
index 0000000000..908983d50a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorIntermediateNodeLoweringPhaseTest.cs
@@ -0,0 +1,298 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorIntermediateNodeLoweringPhaseTest
+    {
+        [Fact]
+        public void Execute_AutomaticallyImportsSingleLineSinglyOccurringDirective()
+        {
+            // Arrange
+            var directive = DirectiveDescriptor.CreateSingleLineDirective(
+                "custom",
+                builder =>
+                {
+                    builder.AddStringToken();
+                    builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                });
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+                b.AddDirective(directive);
+            });
+            var options = RazorParserOptions.Create(builder => builder.Directives.Add(directive));
+            var importSource = TestRazorSourceDocument.Create("@custom \"hello\"", filePath: "import.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create("<p>NonDirective</p>");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source, options));
+            codeDocument.SetImportSyntaxTrees(new[] { RazorSyntaxTree.Parse(importSource, options) });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var customDirectives = documentNode.FindDirectiveReferences(directive);
+            var customDirective = (DirectiveIntermediateNode)Assert.Single(customDirectives).Node;
+            var stringToken = Assert.Single(customDirective.Tokens);
+            Assert.Equal("\"hello\"", stringToken.Content);
+        }
+
+        [Fact]
+        public void Execute_AutomaticallyOverridesImportedSingleLineSinglyOccurringDirective_MainDocument()
+        {
+            // Arrange
+            var directive = DirectiveDescriptor.CreateSingleLineDirective(
+                "custom",
+                builder =>
+                {
+                    builder.AddStringToken();
+                    builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                });
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+                b.AddDirective(directive);
+            });
+            var options = RazorParserOptions.Create(builder => builder.Directives.Add(directive));
+            var importSource = TestRazorSourceDocument.Create("@custom \"hello\"", filePath: "import.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create("@custom \"world\"");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source, options));
+            codeDocument.SetImportSyntaxTrees(new[] { RazorSyntaxTree.Parse(importSource, options) });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var customDirectives = documentNode.FindDirectiveReferences(directive);
+            var customDirective = (DirectiveIntermediateNode)Assert.Single(customDirectives).Node;
+            var stringToken = Assert.Single(customDirective.Tokens);
+            Assert.Equal("\"world\"", stringToken.Content);
+        }
+
+        [Fact]
+        public void Execute_AutomaticallyOverridesImportedSingleLineSinglyOccurringDirective_MultipleImports()
+        {
+            // Arrange
+            var directive = DirectiveDescriptor.CreateSingleLineDirective(
+                "custom",
+                builder =>
+                {
+                    builder.AddStringToken();
+                    builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                });
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+                b.AddDirective(directive);
+            });
+            var options = RazorParserOptions.Create(builder => builder.Directives.Add(directive));
+            var importSource1 = TestRazorSourceDocument.Create("@custom \"hello\"", filePath: "import1.cshtml");
+            var importSource2 = TestRazorSourceDocument.Create("@custom \"world\"", filePath: "import2.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create("<p>NonDirective</p>");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source, options));
+            codeDocument.SetImportSyntaxTrees(new[] { RazorSyntaxTree.Parse(importSource1, options), RazorSyntaxTree.Parse(importSource2, options) });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var customDirectives = documentNode.FindDirectiveReferences(directive);
+            var customDirective = (DirectiveIntermediateNode)Assert.Single(customDirectives).Node;
+            var stringToken = Assert.Single(customDirective.Tokens);
+            Assert.Equal("\"world\"", stringToken.Content);
+        }
+
+        [Fact]
+        public void Execute_DoesNotImportNonFileScopedSinglyOccurringDirectives_Block()
+        {
+            // Arrange
+            var codeBlockDirective = DirectiveDescriptor.CreateCodeBlockDirective("code", b => b.AddStringToken());
+            var razorBlockDirective = DirectiveDescriptor.CreateRazorBlockDirective("razor", b => b.AddStringToken());
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+                b.AddDirective(codeBlockDirective);
+                b.AddDirective(razorBlockDirective);
+            });
+            var options = RazorParserOptions.Create(builder =>
+            {
+                builder.Directives.Add(codeBlockDirective);
+                builder.Directives.Add(razorBlockDirective); 
+            });
+            var importSource = TestRazorSourceDocument.Create(
+@"@code ""code block"" { }
+@razor ""razor block"" { }",
+                filePath: "testImports.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create("<p>NonDirective</p>");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source, options));
+            codeDocument.SetImportSyntaxTrees(new[] { RazorSyntaxTree.Parse(importSource, options) });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var directives = documentNode.Children.OfType<DirectiveIntermediateNode>();
+            Assert.Empty(directives);
+        }
+
+        [Fact]
+        public void Execute_ErrorsForCodeBlockFileScopedSinglyOccurringDirectives()
+        {
+            // Arrange
+            var directive = DirectiveDescriptor.CreateCodeBlockDirective("custom", b => b.Usage = DirectiveUsage.FileScopedSinglyOccurring);
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+                b.AddDirective(directive);
+            });
+            var options = RazorParserOptions.Create(builder => builder.Directives.Add(directive));
+            var importSource = TestRazorSourceDocument.Create("@custom { }", filePath: "import.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create("<p>NonDirective</p>");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source, options));
+            codeDocument.SetImportSyntaxTrees(new[] { RazorSyntaxTree.Parse(importSource, options) });
+            var expectedDiagnostic = RazorDiagnosticFactory.CreateDirective_BlockDirectiveCannotBeImported("custom");
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var directives = documentNode.Children.OfType<DirectiveIntermediateNode>();
+            Assert.Empty(directives);
+            var diagnostic = Assert.Single(documentNode.GetAllDiagnostics());
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void Execute_ErrorsForRazorBlockFileScopedSinglyOccurringDirectives()
+        {
+            // Arrange
+            var directive = DirectiveDescriptor.CreateRazorBlockDirective("custom", b => b.Usage = DirectiveUsage.FileScopedSinglyOccurring);
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+                b.AddDirective(directive);
+            });
+            var options = RazorParserOptions.Create(builder => builder.Directives.Add(directive));
+            var importSource = TestRazorSourceDocument.Create("@custom { }", filePath: "import.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create("<p>NonDirective</p>");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source, options));
+            codeDocument.SetImportSyntaxTrees(new[] { RazorSyntaxTree.Parse(importSource, options) });
+            var expectedDiagnostic = RazorDiagnosticFactory.CreateDirective_BlockDirectiveCannotBeImported("custom");
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var directives = documentNode.Children.OfType<DirectiveIntermediateNode>();
+            Assert.Empty(directives);
+            var diagnostic = Assert.Single(documentNode.GetAllDiagnostics());
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void Execute_ThrowsForMissingDependency_SyntaxTree()
+        {
+            // Arrange
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The '{nameof(DefaultRazorIntermediateNodeLoweringPhase)}' phase requires a '{nameof(RazorSyntaxTree)}' " +
+                $"provided by the '{nameof(RazorCodeDocument)}'.");
+        }
+
+        [Fact]
+        public void Execute_CollatesSyntaxDiagnosticsFromSourceDocument()
+        {
+            // Arrange
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+            });
+            var codeDocument = TestRazorCodeDocument.Create("<p class=@(");
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source));
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            var diagnostic = Assert.Single(documentNode.Diagnostics);
+            Assert.Equal(@"The explicit expression block is missing a closing "")"" character.  Make sure you have a matching "")"" character for all the ""("" characters within this block, and that none of the "")"" characters are being interpreted as markup.",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void Execute_CollatesSyntaxDiagnosticsFromImportDocuments()
+        {
+            // Arrange
+            var phase = new DefaultRazorIntermediateNodeLoweringPhase();
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+                b.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(codeDocument.Source));
+            codeDocument.SetImportSyntaxTrees(new[]
+            {
+                RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@ ")),
+                RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("<p @(")),
+            });
+            var options = RazorCodeGenerationOptions.CreateDefault();
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            Assert.Collection(documentNode.Diagnostics,
+                diagnostic =>
+                {
+                    Assert.Equal(@"A space or line break was encountered after the ""@"" character.  Only valid identifiers, keywords, comments, ""("" and ""{"" are valid at the start of a code block and they must occur immediately following ""@"" with no space in between.",
+                        diagnostic.GetMessage());
+                },
+                diagnostic =>
+                {
+                    Assert.Equal(@"The explicit expression block is missing a closing "")"" character.  Make sure you have a matching "")"" character for all the ""("" characters within this block, and that none of the "")"" characters are being interpreted as markup.",
+                        diagnostic.GetMessage());
+                });
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorOptimizationPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorOptimizationPhaseTest.cs
new file mode 100644
index 0000000000..5a1d6eb238
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorOptimizationPhaseTest.cs
@@ -0,0 +1,102 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorOptimizationPhaseTest
+    {
+        [Fact]
+        public void OnInitialized_OrdersPassesInAscendingOrder()
+        {
+            // Arrange & Act
+            var phase = new DefaultRazorOptimizationPhase();
+
+            var first = Mock.Of<IRazorOptimizationPass>(p => p.Order == 15);
+            var second = Mock.Of<IRazorOptimizationPass>(p => p.Order == 17);
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(second);
+                b.Features.Add(first);
+            });
+
+            // Assert
+            Assert.Collection(
+                phase.Passes,
+                p => Assert.Same(first, p),
+                p => Assert.Same(second, p));
+        }
+
+        [Fact]
+        public void Execute_ThrowsForMissingDependency()
+        {
+            // Arrange
+            var phase = new DefaultRazorOptimizationPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The '{nameof(DefaultRazorOptimizationPhase)}' phase requires a '{nameof(DocumentIntermediateNode)}' " + 
+                $"provided by the '{nameof(RazorCodeDocument)}'.");
+        }
+
+        [Fact]
+        public void Execute_ExecutesPhasesInOrder()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // We're going to set up mocks to simulate a sequence of passes. We don't care about
+            // what's in the nodes, we're just going to look at the identity via strict mocks.
+            var originalNode = new DocumentIntermediateNode();
+            var firstPassNode = new DocumentIntermediateNode();
+            var secondPassNode = new DocumentIntermediateNode();
+            codeDocument.SetDocumentIntermediateNode(originalNode);
+
+            var firstPass = new Mock<IRazorOptimizationPass>(MockBehavior.Strict);
+            firstPass.SetupGet(m => m.Order).Returns(0);
+            firstPass.SetupProperty(m => m.Engine);
+            firstPass.Setup(m => m.Execute(codeDocument, originalNode)).Callback(() =>
+            {
+                originalNode.Children.Add(firstPassNode);
+            });
+
+            var secondPass = new Mock<IRazorOptimizationPass>(MockBehavior.Strict);
+            secondPass.SetupGet(m => m.Order).Returns(1);
+            secondPass.SetupProperty(m => m.Engine);
+            secondPass.Setup(m => m.Execute(codeDocument, originalNode)).Callback(() =>
+            {
+                // Works only when the first pass has run before this.
+                originalNode.Children[0].Children.Add(secondPassNode);
+            });
+
+            var phase = new DefaultRazorOptimizationPhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(firstPass.Object);
+                b.Features.Add(secondPass.Object);
+            });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            Assert.Same(secondPassNode, codeDocument.GetDocumentIntermediateNode().Children[0].Children[0]);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorParsingPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorParsingPhaseTest.cs
new file mode 100644
index 0000000000..43fdf32031
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorParsingPhaseTest.cs
@@ -0,0 +1,93 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorParsingPhaseTest
+    {
+        [Fact]
+        public void Execute_AddsSyntaxTree()
+        {
+            // Arrange
+            var phase = new DefaultRazorParsingPhase();
+            var engine = RazorProjectEngine.CreateEmpty(builder =>
+            {
+                builder.Phases.Add(phase);
+                builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Latest, fileKind: null));
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            Assert.NotNull(codeDocument.GetSyntaxTree());
+        }
+
+        [Fact]
+        public void Execute_UsesConfigureParserFeatures()
+        {
+            // Arrange
+            var phase = new DefaultRazorParsingPhase();
+            var engine = RazorProjectEngine.CreateEmpty((builder) =>
+            {
+                builder.Phases.Add(phase);
+                builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Latest, fileKind: null));
+                builder.Features.Add(new MyParserOptionsFeature());
+            });
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            var directive = Assert.Single(syntaxTree.Options.Directives);
+            Assert.Equal("test", directive.Directive);
+        }
+
+        [Fact]
+        public void Execute_ParsesImports()
+        {
+            // Arrange
+            var phase = new DefaultRazorParsingPhase();
+            var engine = RazorProjectEngine.CreateEmpty((builder) =>
+            {
+                builder.Phases.Add(phase);
+                builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Latest, fileKind: null));
+                builder.Features.Add(new MyParserOptionsFeature());
+            });
+
+            var imports = new[]
+            {
+                TestRazorSourceDocument.Create(),
+                TestRazorSourceDocument.Create(),
+            };
+
+            var codeDocument = TestRazorCodeDocument.Create(TestRazorSourceDocument.Create(), imports);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            Assert.Collection(
+                codeDocument.GetImportSyntaxTrees(),
+                t => { Assert.Same(t.Source, imports[0]); Assert.Equal("test", Assert.Single(t.Options.Directives).Directive); },
+                t => { Assert.Same(t.Source, imports[1]); Assert.Equal("test", Assert.Single(t.Options.Directives).Directive); });
+        }
+
+        private class MyParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorParserOptionsFeature
+        {
+            public int Order { get; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.Directives.Add(DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine));
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineBuilderTest.cs
new file mode 100644
index 0000000000..5323ba3ffa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineBuilderTest.cs
@@ -0,0 +1,65 @@
+// 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.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorProjectEngineBuilderTest
+    {
+        [Fact]
+        public void Build_AddsFeaturesToRazorEngine()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+            builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+            builder.Features.Add(Mock.Of<IRazorProjectEngineFeature>());
+
+            var features = builder.Features.ToArray();
+
+            // Act
+            var projectEngine = builder.Build();
+
+            // Assert
+            Assert.Collection(projectEngine.Engine.Features,
+                feature => Assert.Same(features[0], feature),
+                feature => Assert.Same(features[1], feature));
+        }
+
+        [Fact]
+        public void Build_AddsPhasesToRazorEngine()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+            builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+
+            var phases = builder.Phases.ToArray();
+
+            // Act
+            var projectEngine = builder.Build();
+
+            // Assert
+            Assert.Collection(projectEngine.Engine.Phases,
+                phase => Assert.Same(phases[0], phase),
+                phase => Assert.Same(phases[1], phase));
+        }
+
+        [Fact]
+        public void Build_CreatesProjectEngineWithFileSystem()
+        {
+            // Arrange
+            var fileSystem = Mock.Of<RazorProjectFileSystem>();
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, fileSystem);
+
+            // Act
+            var projectEngine = builder.Build();
+
+            // Assert
+            Assert.Same(fileSystem, projectEngine.FileSystem);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineIntegrationTest.cs
new file mode 100644
index 0000000000..10cee4a70b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineIntegrationTest.cs
@@ -0,0 +1,351 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorProjectEngineIntegrationTest
+    {
+        [Fact]
+        public void Process_SetsOptions_Runtime()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var parserOptions = codeDocument.GetParserOptions();
+            Assert.False(parserOptions.DesignTime);
+
+            var codeGenerationOptions = codeDocument.GetCodeGenerationOptions();
+            Assert.False(codeGenerationOptions.DesignTime);
+            Assert.False(codeGenerationOptions.SuppressChecksum);
+            Assert.False(codeGenerationOptions.SuppressMetadataAttributes);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_SetsOptions_DesignTime()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(projectItem);
+
+            // Assert
+            var parserOptions = codeDocument.GetParserOptions();
+            Assert.True(parserOptions.DesignTime);
+
+            var codeGenerationOptions = codeDocument.GetCodeGenerationOptions();
+            Assert.True(codeGenerationOptions.DesignTime);
+            Assert.True(codeGenerationOptions.SuppressChecksum);
+            Assert.True(codeGenerationOptions.SuppressMetadataAttributes);
+        }
+
+        [Fact]
+        public void Process_GetsImportsFromFeature()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var testImport = Mock.Of<RazorProjectItem>(i => i.Read() == new MemoryStream() && i.FilePath == "testvalue" && i.Exists == true);
+            var importFeature = new Mock<IImportProjectFeature>();
+            importFeature
+                .Setup(feature => feature.GetImports(It.IsAny<RazorProjectItem>()))
+                .Returns(new[] { testImport });
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty, builder =>
+            {
+                builder.SetImportFeature(importFeature.Object);
+            });
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var import = Assert.Single(codeDocument.Imports);
+            Assert.Equal("testvalue", import.FilePath);
+        }
+
+        [Fact]
+        public void Process_GetsImportsFromFeature_MultipleFeatures()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var testImport1 = Mock.Of<RazorProjectItem>(i => i.Read() == new MemoryStream() && i.FilePath == "testvalue1" && i.Exists == true);
+            var importFeature1 = new Mock<IImportProjectFeature>();
+            importFeature1
+                .Setup(feature => feature.GetImports(It.IsAny<RazorProjectItem>()))
+                .Returns(new[] { testImport1 });
+
+            var testImport2 = Mock.Of<RazorProjectItem>(i => i.Read() == new MemoryStream() && i.FilePath == "testvalue2" && i.Exists == true);
+            var importFeature2 = new Mock<IImportProjectFeature>();
+            importFeature2
+                .Setup(feature => feature.GetImports(It.IsAny<RazorProjectItem>()))
+                .Returns(new[] { testImport2 });
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty, builder =>
+            {
+                builder.Features.Add(importFeature1.Object);
+                builder.Features.Add(importFeature2.Object);
+            });
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            Assert.Collection(codeDocument.Imports,
+                i => Assert.Equal("testvalue1", i.FilePath),
+                i => Assert.Equal("testvalue2", i.FilePath));
+        }
+
+        [Fact]
+        public void Process_GeneratesCodeDocumentWithValidCSharpDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var csharpDocument = codeDocument.GetCSharpDocument();
+            Assert.NotNull(csharpDocument);
+            Assert.Empty(csharpDocument.Diagnostics);
+        }
+
+        [Fact]
+        public void Process_WithImportsAndTagHelpers_SetsOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+            var importItem = new TestRazorProjectItem("_import.cshtml");
+            var expectedImports = new[] { RazorSourceDocument.ReadFrom(importItem) };
+            var expectedTagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly").Build(),
+                TagHelperDescriptorBuilder.Create("Test2TagHelper", "TestAssembly").Build(),
+            };
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(RazorSourceDocument.ReadFrom(projectItem), "test", expectedImports, expectedTagHelpers);
+
+            // Assert
+            var tagHelpers = codeDocument.GetTagHelpers();
+            Assert.Same(expectedTagHelpers, tagHelpers);
+            Assert.Equal(expectedImports, codeDocument.Imports);
+        }
+
+        [Fact]
+        public void Process_WithFileKind_SetsOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(RazorSourceDocument.ReadFrom(projectItem), "test", Array.Empty<RazorSourceDocument>(), tagHelpers: null);
+
+            // Assert
+            var actual = codeDocument.GetFileKind();
+            Assert.Equal("test", actual);
+        }
+
+        [Fact]
+        public void Process_WithNullTagHelpers_SetsOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(RazorSourceDocument.ReadFrom(projectItem), "test", Array.Empty<RazorSourceDocument>(), tagHelpers: null);
+
+            // Assert
+            var tagHelpers = codeDocument.GetTagHelpers();
+            Assert.Null(tagHelpers);
+        }
+
+        [Fact]
+        public void Process_SetsNullTagHelpersOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var tagHelpers = codeDocument.GetTagHelpers();
+            Assert.Null(tagHelpers);
+        }
+
+        [Fact]
+        public void Process_SetsInferredFileKindOnCodeDocument_MvcFile()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var actual = codeDocument.GetFileKind();
+            Assert.Same(FileKinds.Legacy, actual);
+        }
+
+        [Fact]
+        public void Process_SetsInferredFileKindOnCodeDocument_Component()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.razor");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var actual = codeDocument.GetFileKind();
+            Assert.Same(FileKinds.Component, actual);
+        }
+
+        [Fact]
+        public void Process_WithNullImports_SetsEmptyListOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.Process(RazorSourceDocument.ReadFrom(projectItem), "test", importSources: null, tagHelpers: null);
+
+            // Assert
+            Assert.Empty(codeDocument.Imports);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_WithImportsAndTagHelpers_SetsOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+            var importItem = new TestRazorProjectItem("_import.cshtml");
+            var expectedImports = new[] { RazorSourceDocument.ReadFrom(importItem) };
+            var expectedTagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly").Build(),
+                TagHelperDescriptorBuilder.Create("Test2TagHelper", "TestAssembly").Build(),
+            };
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(RazorSourceDocument.ReadFrom(projectItem), "test", expectedImports, expectedTagHelpers);
+
+            // Assert
+            var tagHelpers = codeDocument.GetTagHelpers();
+            Assert.Same(expectedTagHelpers, tagHelpers);
+            Assert.Equal(expectedImports, codeDocument.Imports);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_WithNullTagHelpers_SetsOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(RazorSourceDocument.ReadFrom(projectItem), "test", Array.Empty<RazorSourceDocument>(), tagHelpers: null);
+
+            // Assert
+            var tagHelpers = codeDocument.GetTagHelpers();
+            Assert.Null(tagHelpers);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_SetsInferredFileKindOnCodeDocument_MvcFile()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(projectItem);
+
+            // Assert
+            var actual = codeDocument.GetFileKind();
+            Assert.Same(FileKinds.Legacy, actual);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_SetsInferredFileKindOnCodeDocument_Component()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.razor");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(projectItem);
+
+            // Assert
+            var actual = codeDocument.GetFileKind();
+            Assert.Same(FileKinds.Component, actual);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_SetsNullTagHelpersOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(projectItem);
+
+            // Assert
+            var tagHelpers = codeDocument.GetTagHelpers();
+            Assert.Null(tagHelpers);
+        }
+
+        [Fact]
+        public void ProcessDesignTime_WithNullImports_SetsEmptyListOnCodeDocument()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Index.cshtml");
+
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, TestRazorProjectFileSystem.Empty);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(RazorSourceDocument.ReadFrom(projectItem), "test", importSources: null, tagHelpers: null);
+
+            // Assert
+            Assert.Empty(codeDocument.Imports);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineTest.cs
new file mode 100644
index 0000000000..c70cdab663
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectEngineTest.cs
@@ -0,0 +1,62 @@
+// 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.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorProjectEngineTest
+    {
+        [Fact]
+        public void GetImportSourceDocuments_DoesNotIncludeNonExistentItems()
+        {
+            // Arrange
+            var existingItem = new TestRazorProjectItem("Index.cshtml");
+            var nonExistentItem = Mock.Of<RazorProjectItem>(item => item.Exists == false);
+            var items = new[] { existingItem, nonExistentItem };
+
+            // Act
+            var sourceDocuments = DefaultRazorProjectEngine.GetImportSourceDocuments(items);
+
+            // Assert
+            var sourceDocument = Assert.Single(sourceDocuments);
+            Assert.Equal(existingItem.FilePath, sourceDocument.FilePath);
+        }
+
+        [Fact]
+        public void GetImportSourceDocuments_UnreadableItem_Throws()
+        {
+            // Arrange
+            var projectItem = new Mock<RazorProjectItem>(MockBehavior.Strict);
+            projectItem.SetupGet(p => p.Exists).Returns(true);
+            projectItem.SetupGet(p => p.PhysicalPath).Returns("path/to/file.cshtml");
+            projectItem.Setup(p => p.Read()).Throws(new IOException("Couldn't read file."));
+            var items = new[] { projectItem.Object };
+
+            // Act & Assert
+            var exception = Assert.Throws<IOException>(() => DefaultRazorProjectEngine.GetImportSourceDocuments(items));
+            Assert.Equal("Couldn't read file.", exception.Message);
+        }
+
+        [Fact]
+        public void GetImportSourceDocuments_WithSuppressExceptions_UnreadableItem_DoesNotThrow()
+        {
+            // Arrange
+            var projectItem = new Mock<RazorProjectItem>(MockBehavior.Strict);
+            projectItem.SetupGet(p => p.Exists).Returns(true);
+            projectItem.SetupGet(p => p.PhysicalPath).Returns("path/to/file.cshtml");
+            projectItem.SetupGet(p => p.FilePath).Returns("path/to/file.cshtml");
+            projectItem.SetupGet(p => p.RelativePhysicalPath).Returns("path/to/file.cshtml");
+            projectItem.Setup(p => p.Read()).Throws(new IOException("Couldn't read file."));
+            var items = new[] { projectItem.Object };
+
+            // Act
+            var sourceDocuments = DefaultRazorProjectEngine.GetImportSourceDocuments(items, suppressExceptions: true);
+
+            // Assert - Does not throw
+            Assert.Empty(sourceDocuments);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
new file mode 100644
index 0000000000..6c92f7ddb7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
@@ -0,0 +1,298 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorProjectFileSystemTest
+    {
+        private static string TestFolder { get; } = Path.Combine(
+            TestProject.GetProjectDirectory(typeof(DefaultRazorProjectFileSystemTest)),
+            "TestFiles",
+            "DefaultRazorProjectFileSystem");
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void NormalizeAndEnsureValidPath_ThrowsIfPathIsNullOrEmpty(string path)
+        {
+            // Arrange
+            var fileSystem = new TestRazorProjectFileSystem("C:/some/test/path/root");
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmptyString(() => fileSystem.NormalizeAndEnsureValidPath(path), "path");
+        }
+
+        [Fact]
+        public void NormalizeAndEnsureValidPath_NormalizesToAbsolutePath()
+        {
+            // Arrange
+            var fileSystem = new TestRazorProjectFileSystem("C:/some/test/path/root");
+
+            // Act
+            var absolutePath = fileSystem.NormalizeAndEnsureValidPath("file.cshtml");
+
+            // Assert
+            Assert.Equal("C:/some/test/path/root/file.cshtml", absolutePath);
+        }
+
+        [Fact]
+        public void NormalizeAndEnsureValidPath_FileFromNetworkShare__WindowsStyle_NormalizesToAbsolutePath()
+        {
+            // Arrange
+            var fileSystem = new TestRazorProjectFileSystem("//some/network/share/root");
+
+            // Act
+            var absolutePath = fileSystem.NormalizeAndEnsureValidPath("\\\\some\\network\\share\\root\\file.cshtml");
+
+            // Assert
+            Assert.Equal("//some/network/share/root/file.cshtml", absolutePath);
+        }
+
+        [Fact]
+        public void NormalizeAndEnsureValidPath_FileFromNetworkShare_UnixStyle_NormalizesToAbsolutePath()
+        {
+            // Arrange
+            var fileSystem = new TestRazorProjectFileSystem("//some/network/share/root");
+
+            // Act
+            var absolutePath = fileSystem.NormalizeAndEnsureValidPath("//some/network/share/root/file.cshtml");
+
+            // Assert
+            Assert.Equal("//some/network/share/root/file.cshtml", absolutePath);
+        }
+
+        [Fact]
+        public void NormalizeAndEnsureValidPath_NormalizesToAbsolutePathWithoutForwardSlash()
+        {
+            // Arrange
+            var fileSystem = new TestRazorProjectFileSystem("C:/some/test/path/root");
+
+            // Act
+            var absolutePath = fileSystem.NormalizeAndEnsureValidPath("/file.cshtml");
+
+            // Assert
+            Assert.Equal("C:/some/test/path/root/file.cshtml", absolutePath);
+        }
+
+        [Fact]
+        public void NormalizeAndEnsureValidPath_NormalizesToForwardSlashes()
+        {
+            // Arrange
+            var fileSystem = new TestRazorProjectFileSystem(@"C:\some\test\path\root");
+
+            // Act
+            var absolutePath = fileSystem.NormalizeAndEnsureValidPath(@"something\file.cshtml");
+
+            // Assert
+            Assert.Equal("C:/some/test/path/root/something/file.cshtml", absolutePath);
+        }
+
+        [Fact]
+        public void EnumerateItems_DiscoversAllCshtmlFiles()
+        {
+            // Arrange
+            var fileSystem = new DefaultRazorProjectFileSystem(TestFolder);
+
+            // Act
+            var items = fileSystem.EnumerateItems("/");
+
+            // Assert
+            Assert.Collection(
+                items.OrderBy(f => f.FilePath, StringComparer.Ordinal),
+                item =>
+                {
+                    Assert.Equal("/Home.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Home.cshtml"), item.PhysicalPath);
+                    Assert.Equal("Home.cshtml", item.RelativePhysicalPath);
+
+                },
+                item =>
+                {
+                    Assert.Equal("/Views/About/About.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "About", "About.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Views", "About", "About.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/Views/Home/Index.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "Home", "Index.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Views", "Home", "Index.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/Views/Home/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "Home", "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Views", "Home", "_ViewImports.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/Views/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Views", "_ViewImports.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal("_ViewImports.cshtml", item.RelativePhysicalPath);
+                });
+        }
+
+        [Fact]
+        public void EnumerateItems_DiscoversAllCshtmlFiles_UnderSpecifiedBasePath()
+        {
+            // Arrange
+            var fileSystem = new DefaultRazorProjectFileSystem(TestFolder);
+
+            // Act
+            var items = fileSystem.EnumerateItems("/Views");
+
+            // Assert
+            Assert.Collection(
+                items.OrderBy(f => f.FilePath, StringComparer.Ordinal),
+                item =>
+                {
+                    Assert.Equal("/About/About.cshtml", item.FilePath);
+                    Assert.Equal("/Views", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "About", "About.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("About", "About.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/Home/Index.cshtml", item.FilePath);
+                    Assert.Equal("/Views", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "Home", "Index.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Home", "Index.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/Home/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/Views", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "Home", "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Home", "_ViewImports.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/Views", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("_ViewImports.cshtml"), item.RelativePhysicalPath);
+                });
+        }
+
+        [Fact]
+        public void EnumerateItems_ReturnsEmptySequence_WhenBasePathDoesNotExist()
+        {
+            // Arrange
+            var fileSystem = new DefaultRazorProjectFileSystem(TestFolder);
+
+            // Act
+            var items = fileSystem.EnumerateItems("/Does-Not-Exist");
+
+            // Assert
+            Assert.Empty(items);
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_FindsItemsWithMatchingNames()
+        {
+            // Arrange
+            var fileSystem = new DefaultRazorProjectFileSystem(TestFolder);
+
+            // Act
+            var items = fileSystem.FindHierarchicalItems("/Views/Home/Index.cshtml", "_ViewImports.cshtml");
+
+            // Assert
+            Assert.Collection(
+                items,
+                item =>
+                {
+                    Assert.Equal("/Views/Home/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "Home", "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Views", "Home", "_ViewImports.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/Views/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "Views", "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal(Path.Combine("Views", "_ViewImports.cshtml"), item.RelativePhysicalPath);
+                },
+                item =>
+                {
+                    Assert.Equal("/_ViewImports.cshtml", item.FilePath);
+                    Assert.Equal("/", item.BasePath);
+                    Assert.Equal(Path.Combine(TestFolder, "_ViewImports.cshtml"), item.PhysicalPath);
+                    Assert.Equal("_ViewImports.cshtml", item.RelativePhysicalPath);
+                });
+        }
+
+        [Fact]
+        public void GetItem_ReturnsFileFromDisk()
+        {
+            // Arrange
+            var filePath = "/Views/About/About.cshtml";
+            var fileSystem = new DefaultRazorProjectFileSystem(TestFolder);
+
+            // Act
+            var item = fileSystem.GetItem(filePath, fileKind: null);
+
+            // Assert
+            Assert.True(item.Exists);
+            Assert.Equal(filePath, item.FilePath);
+            Assert.Equal("/", item.BasePath);
+            Assert.Equal(Path.Combine(TestFolder, "Views", "About", "About.cshtml"), item.PhysicalPath);
+            Assert.Equal(Path.Combine("Views", "About", "About.cshtml"), item.RelativePhysicalPath);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsNotFoundResult()
+        {
+            // Arrange
+            var path = "/NotFound.cshtml";
+            var fileSystem = new DefaultRazorProjectFileSystem(TestFolder);
+
+            // Act
+            var item = fileSystem.GetItem(path, fileKind: null);
+
+            // Assert
+            Assert.False(item.Exists);
+        }
+
+        [Fact]
+        public void GetItem_MismatchedRootPath_Throws()
+        {
+            // Arrange
+            var rootPath = "//some/network/share/root";
+            var fileSystem = new TestRazorProjectFileSystem(rootPath);
+            var path = "\\\\some\\other\\network\\share\\root\\file.cshtml";
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => fileSystem.GetItem(path, fileKind: null),
+                $"The file '{path.Replace('\\', '/')}' is not a descendent of the base path '{rootPath}'.");
+        }
+
+        private class TestRazorProjectFileSystem : DefaultRazorProjectFileSystem
+        {
+            public TestRazorProjectFileSystem(string root) : base(root)
+            {
+            }
+
+            public new string NormalizeAndEnsureValidPath(string path) => base.NormalizeAndEnsureValidPath(path);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectItemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectItemTest.cs
new file mode 100644
index 0000000000..f903b16f63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectItemTest.cs
@@ -0,0 +1,101 @@
+// 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.IO;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorProjectItemTest
+    {
+        private static string TestFolder { get; } = Path.Combine(
+            TestProject.GetProjectDirectory(typeof(DefaultRazorProjectItemTest)), 
+            "TestFiles",
+            "DefaultRazorProjectFileSystem");
+
+        [Fact]
+        public void DefaultRazorProjectItem_SetsProperties()
+        {
+            // Arrange
+            var fileInfo = new FileInfo(Path.Combine(TestFolder, "Home.cshtml"));
+
+            // Act
+            var projectItem = new DefaultRazorProjectItem("/", "/Home.cshtml", "Home.cshtml", "test", fileInfo);
+
+            // Assert
+            Assert.Equal("/Home.cshtml", projectItem.FilePath);
+            Assert.Equal("/", projectItem.BasePath);
+            Assert.True(projectItem.Exists);
+            Assert.Equal("Home.cshtml", projectItem.FileName);
+            Assert.Equal("test", projectItem.FileKind);
+            Assert.Equal(fileInfo.FullName, projectItem.PhysicalPath);
+            Assert.Equal("Home.cshtml", projectItem.RelativePhysicalPath);
+        }
+
+        [Fact]
+        public void DefaultRazorProjectItem_InfersFileKind_Component()
+        {
+            // Arrange
+            var fileInfo = new FileInfo(Path.Combine(TestFolder, "Home.cshtml"));
+
+            // Act
+            var projectItem = new DefaultRazorProjectItem("/", "/Home.razor", "Home.cshtml", fileKind: null, fileInfo);
+
+            // Assert
+            Assert.Equal(FileKinds.Component, projectItem.FileKind);
+        }
+
+        [Fact]
+        public void DefaultRazorProjectItem_InfersFileKind_Legacy()
+        {
+            // Arrange
+            var fileInfo = new FileInfo(Path.Combine(TestFolder, "Home.cshtml"));
+
+            // Act
+            var projectItem = new DefaultRazorProjectItem("/", "/Home.cshtml", "Home.cshtml", fileKind: null, fileInfo);
+
+            // Assert
+            Assert.Equal(FileKinds.Legacy, projectItem.FileKind);
+        }
+
+        [Fact]
+        public void DefaultRazorProjectItem_InfersFileKind_Null()
+        {
+            // Arrange
+            var fileInfo = new FileInfo(Path.Combine(TestFolder, "Home.cshtml"));
+
+            // Act
+            var projectItem = new DefaultRazorProjectItem("/", filePath: null, "Home.cshtml", fileKind: null, fileInfo);
+
+            // Assert
+            Assert.Null(projectItem.FileKind);
+        }
+
+        [Fact]
+        public void Exists_ReturnsFalseWhenFileDoesNotExist()
+        {
+            // Arrange
+            var fileInfo = new FileInfo(Path.Combine(TestFolder, "Views", "FileDoesNotExist.cshtml"));
+
+            // Act
+            var projectItem = new DefaultRazorProjectItem("/Views", "/FileDoesNotExist.cshtml", Path.Combine("Views", "FileDoesNotExist.cshtml"), "test", fileInfo);
+
+            // Assert
+            Assert.False(projectItem.Exists);
+        }
+
+        [Fact]
+        public void Read_ReturnsReadStream()
+        {
+            // Arrange
+            var fileInfo = new FileInfo(Path.Combine(TestFolder, "Home.cshtml"));
+            var projectItem = new DefaultRazorProjectItem("/", "/Home.cshtml", "Home.cshtml", "test", fileInfo);
+
+            // Act
+            var stream = projectItem.Read();
+
+            // Assert
+            Assert.Equal("home-content", new StreamReader(stream).ReadToEnd());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorSyntaxTreePhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorSyntaxTreePhaseTest.cs
new file mode 100644
index 0000000000..d6dc0ac75a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorSyntaxTreePhaseTest.cs
@@ -0,0 +1,94 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorSyntaxTreePhaseTest
+    {
+        [Fact]
+        public void OnInitialized_OrdersPassesInAscendingOrder()
+        {
+            // Arrange & Act
+            var phase = new DefaultRazorSyntaxTreePhase();
+
+            var first = Mock.Of<IRazorSyntaxTreePass>(p => p.Order == 15);
+            var second = Mock.Of<IRazorSyntaxTreePass>(p => p.Order == 17);
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(second);
+                b.Features.Add(first);
+            });
+
+            // Assert
+            Assert.Collection(
+                phase.Passes,
+                p => Assert.Same(first, p),
+                p => Assert.Same(second, p));
+        }
+
+        [Fact]
+        public void Execute_ThrowsForMissingDependency()
+        {
+            // Arrange
+            var phase = new DefaultRazorSyntaxTreePhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b => b.Phases.Add(phase));
+
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => phase.Execute(codeDocument),
+                $"The '{nameof(DefaultRazorSyntaxTreePhase)}' phase requires a '{nameof(RazorSyntaxTree)}' " + 
+                $"provided by the '{nameof(RazorCodeDocument)}'.");
+        }
+
+        [Fact]
+        public void Execute_ExecutesPhasesInOrder()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            // We're going to set up mocks to simulate a sequence of passes. We don't care about
+            // what's in the trees, we're just going to look at the identity via strict mocks.
+            var originalSyntaxTree = RazorSyntaxTree.Parse(codeDocument.Source);
+            var firstPassSyntaxTree = RazorSyntaxTree.Parse(codeDocument.Source);
+            var secondPassSyntaxTree = RazorSyntaxTree.Parse(codeDocument.Source);
+            codeDocument.SetSyntaxTree(originalSyntaxTree);
+
+            var firstPass = new Mock<IRazorSyntaxTreePass>(MockBehavior.Strict);
+            firstPass.SetupGet(m => m.Order).Returns(0);
+            firstPass.SetupProperty(m => m.Engine);
+            firstPass.Setup(m => m.Execute(codeDocument, originalSyntaxTree)).Returns(firstPassSyntaxTree);
+
+            var secondPass = new Mock<IRazorSyntaxTreePass>(MockBehavior.Strict);
+            secondPass.SetupGet(m => m.Order).Returns(1);
+            secondPass.SetupProperty(m => m.Engine);
+            secondPass.Setup(m => m.Execute(codeDocument, firstPassSyntaxTree)).Returns(secondPassSyntaxTree);
+
+            var phase = new DefaultRazorSyntaxTreePhase();
+
+            var engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                b.Phases.Add(phase);
+
+                b.Features.Add(firstPass.Object);
+                b.Features.Add(secondPass.Object);
+            });
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            Assert.Same(secondPassSyntaxTree, codeDocument.GetSyntaxTree());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorTagHelperBinderPhaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorTagHelperBinderPhaseTest.cs
new file mode 100644
index 0000000000..41dedf836a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorTagHelperBinderPhaseTest.cs
@@ -0,0 +1,1439 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRazorTagHelperBinderPhaseTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+#region Legacy
+        [Fact]
+        public void Execute_CanHandleSingleLengthAddTagHelperDirective()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new TagHelperDescriptor[0]);
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+            var expectedDiagnostics = new[]
+            {
+                RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral(
+                    new SourceSpan(new SourceLocation(14 + Environment.NewLine.Length, 1, 14), contentLength: 1)),
+                RazorDiagnosticFactory.CreateParsing_InvalidTagHelperLookupText(
+                    new SourceSpan(new SourceLocation(14 + Environment.NewLine.Length, 1, 14), contentLength: 1), "\"")
+            };
+
+            var content =
+            @"
+@addTagHelper """;
+            var sourceDocument = TestRazorSourceDocument.Create(content, filePath: null);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var erroredNode = rewrittenTree.Root.DescendantNodes().First(n => n.GetSpanContext()?.ChunkGenerator is AddTagHelperChunkGenerator);
+            var chunkGenerator = Assert.IsType<AddTagHelperChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
+            Assert.Equal(expectedDiagnostics, chunkGenerator.Diagnostics);
+        }
+
+        [Fact]
+        public void Execute_CanHandleSingleLengthRemoveTagHelperDirective()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new TagHelperDescriptor[0]);
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+            var expectedDiagnostics = new[]
+            {
+                RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral(
+                    new SourceSpan(new SourceLocation(17 + Environment.NewLine.Length, 1, 17), contentLength: 1)),
+                RazorDiagnosticFactory.CreateParsing_InvalidTagHelperLookupText(
+                    new SourceSpan(new SourceLocation(17 + Environment.NewLine.Length, 1, 17), contentLength: 1), "\"")
+            };
+
+            var content =
+            @"
+@removeTagHelper """;
+            var sourceDocument = TestRazorSourceDocument.Create(content, filePath: null);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var erroredNode = rewrittenTree.Root.DescendantNodes().First(n => n.GetSpanContext()?.ChunkGenerator is RemoveTagHelperChunkGenerator);
+            var chunkGenerator = Assert.IsType<RemoveTagHelperChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
+            Assert.Equal(expectedDiagnostics, chunkGenerator.Diagnostics);
+        }
+
+        [Fact]
+        public void Execute_CanHandleSingleLengthTagHelperPrefix()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new TagHelperDescriptor[0]);
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+            var expectedDiagnostics = new[]
+            {
+                RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral(
+                    new SourceSpan(new SourceLocation(17 + Environment.NewLine.Length, 1, 17), contentLength: 1)),
+                RazorDiagnosticFactory.CreateParsing_InvalidTagHelperPrefixValue(
+                    new SourceSpan(new SourceLocation(17 + Environment.NewLine.Length, 1, 17), contentLength: 1), "tagHelperPrefix", '\"', "\""),
+            };
+
+            var content =
+            @"
+@tagHelperPrefix """;
+            var sourceDocument = TestRazorSourceDocument.Create(content, filePath: null);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var erroredNode = rewrittenTree.Root.DescendantNodes().First(n => n.GetSpanContext()?.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator);
+            var chunkGenerator = Assert.IsType<TagHelperPrefixDirectiveChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
+            Assert.Equal(expectedDiagnostics, chunkGenerator.Diagnostics);
+        }
+
+        [Fact]
+        public void Execute_RewritesTagHelpers()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "form",
+                        typeName: "TestFormTagHelper",
+                        assemblyName: "TestAssembly"),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestInputTagHelper",
+                        assemblyName: "TestAssembly"),
+                });
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = CreateTestSourceDocument();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Equal("form", tagHelperNodes[0].TagHelperInfo.TagName);
+            Assert.Equal("input", tagHelperNodes[1].TagHelperInfo.TagName);
+        }
+
+        [Fact]
+        public void Execute_WithTagHelperDescriptorsFromCodeDocument_RewritesTagHelpers()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var tagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "form",
+                    typeName: "TestFormTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "TestInputTagHelper",
+                    assemblyName: "TestAssembly"),
+            };
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = CreateTestSourceDocument();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+            codeDocument.SetTagHelpers(tagHelpers);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Equal("form", tagHelperNodes[0].TagHelperInfo.TagName);
+            Assert.Equal("input", tagHelperNodes[1].TagHelperInfo.TagName);
+        }
+
+        [Fact]
+        public void Execute_NullTagHelperDescriptorsFromCodeDocument_FallsBackToTagHelperFeature()
+        {
+            // Arrange
+            var tagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "form",
+                    typeName: "TestFormTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "TestInputTagHelper",
+                    assemblyName: "TestAssembly"),
+            };
+            var projectEngine = RazorProjectEngine.Create(builder => builder.AddTagHelpers(tagHelpers));
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = CreateTestSourceDocument();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+            codeDocument.SetTagHelpers(tagHelpers: null);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Equal("form", tagHelperNodes[0].TagHelperInfo.TagName);
+            Assert.Equal("input", tagHelperNodes[1].TagHelperInfo.TagName);
+        }
+
+        [Fact]
+        public void Execute_EmptyTagHelperDescriptorsFromCodeDocument_DoesNotFallbackToTagHelperFeature()
+        {
+            // Arrange
+            var tagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "form",
+                    typeName: "TestFormTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "TestInputTagHelper",
+                    assemblyName: "TestAssembly"),
+            };
+            var projectEngine = RazorProjectEngine.Create(builder => builder.AddTagHelpers(tagHelpers));
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = CreateTestSourceDocument();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+            codeDocument.SetTagHelpers(tagHelpers: Array.Empty<TagHelperDescriptor>());
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Empty(tagHelperNodes);
+        }
+
+        [Fact]
+        public void Execute_DirectiveWithoutQuotes_RewritesTagHelpers_TagHelperMatchesElementTwice()
+        {
+            // Arrange
+            var descriptor = CreateTagHelperDescriptor(
+                tagName: "form",
+                typeName: "TestFormTagHelper",
+                assemblyName: "TestAssembly",
+                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                {
+                    ruleBuilder => ruleBuilder
+                        .RequireAttributeDescriptor(attribute => attribute
+                            .Name("a")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)),
+                    ruleBuilder => ruleBuilder
+                        .RequireAttributeDescriptor(attribute => attribute
+                            .Name("b")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)),
+                });
+
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new[] { descriptor });
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var content = @"
+@addTagHelper *, TestAssembly
+<form a=""hi"" b=""there"">
+</form>";
+
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+
+            var formTagHelper = Assert.Single(tagHelperNodes);
+            Assert.Equal("form", formTagHelper.TagHelperInfo.TagName);
+            Assert.Equal(2, formTagHelper.TagHelperInfo.BindingResult.Mappings[descriptor].Count());
+        }
+
+        [Fact]
+        public void Execute_DirectiveWithQuotes_RewritesTagHelpers_TagHelperMatchesElementTwice()
+        {
+            // Arrange
+            var descriptor = CreateTagHelperDescriptor(
+                tagName: "form",
+                typeName: "TestFormTagHelper",
+                assemblyName: "TestAssembly",
+                ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                {
+                    ruleBuilder => ruleBuilder
+                        .RequireAttributeDescriptor(attribute => attribute
+                            .Name("a")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)),
+                    ruleBuilder => ruleBuilder
+                        .RequireAttributeDescriptor(attribute => attribute
+                            .Name("b")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)),
+                });
+
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new[] { descriptor });
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var content = @"
+@addTagHelper ""*, TestAssembly""
+<form a=""hi"" b=""there"">
+</form>";
+
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+
+            var formTagHelper = Assert.Single(tagHelperNodes);
+            Assert.Equal("form", formTagHelper.TagHelperInfo.TagName);
+            Assert.Equal(2, formTagHelper.TagHelperInfo.BindingResult.Mappings[descriptor].Count());
+        }
+
+        [Fact]
+        public void Execute_TagHelpersFromCodeDocumentAndFeature_PrefersCodeDocument()
+        {
+            // Arrange
+            var featureTagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "TestInputTagHelper",
+                    assemblyName: "TestAssembly"),
+            };
+            var projectEngine = RazorProjectEngine.Create(builder => builder.AddTagHelpers(featureTagHelpers));
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = CreateTestSourceDocument();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            var codeDocumentTagHelpers = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "form",
+                    typeName: "TestFormTagHelper",
+                    assemblyName: "TestAssembly"),
+            };
+            codeDocument.SetTagHelpers(codeDocumentTagHelpers);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
+            Assert.Empty(rewrittenTree.Diagnostics);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+
+            var formTagHelper = Assert.Single(tagHelperNodes);
+            Assert.Equal("form", formTagHelper.TagHelperInfo.TagName);
+        }
+
+        [Fact]
+        public void Execute_NoopsWhenNoTagHelpersFromCodeDocumentOrFeature()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+            var sourceDocument = CreateTestSourceDocument();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var outputTree = codeDocument.GetSyntaxTree();
+            Assert.Empty(outputTree.Diagnostics);
+            Assert.Same(originalTree, outputTree);
+        }
+
+        [Fact]
+        public void Execute_NoopsWhenNoTagHelperDescriptorsAreResolved()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.Features.Add(new TestTagHelperFeature());
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            // No taghelper directives here so nothing is resolved.
+            var sourceDocument = TestRazorSourceDocument.Create("Hello, world");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var outputTree = codeDocument.GetSyntaxTree();
+            Assert.Empty(outputTree.Diagnostics);
+            Assert.Same(originalTree, outputTree);
+        }
+
+        [Fact]
+        public void Execute_SetsTagHelperDocumentContext()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.Features.Add(new TestTagHelperFeature());
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            // No taghelper directives here so nothing is resolved.
+            var sourceDocument = TestRazorSourceDocument.Create("Hello, world");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            codeDocument.SetSyntaxTree(originalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var context = codeDocument.GetTagHelperContext();
+            Assert.Null(context.Prefix);
+            Assert.Empty(context.TagHelpers);
+        }
+
+        [Fact]
+        public void Execute_CombinesErrorsOnRewritingErrors()
+        {
+            // Arrange
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.AddTagHelpers(new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "form",
+                        typeName: "TestFormTagHelper",
+                        assemblyName: "TestAssembly"),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestInputTagHelper",
+                        assemblyName: "TestAssembly"),
+                });
+            });
+
+            var phase = new DefaultRazorTagHelperBinderPhase()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var content =
+            @"
+@addTagHelper *, TestAssembly
+<form>
+    <input value='Hello' type='text' />";
+            var sourceDocument = TestRazorSourceDocument.Create(content, filePath: null);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+
+            var initialError = RazorDiagnostic.Create(
+                new RazorDiagnosticDescriptor("RZ9999", () => "Initial test error", RazorDiagnosticSeverity.Error),
+                new SourceSpan(SourceLocation.Zero, contentLength: 1));
+            var expectedRewritingError = RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
+                new SourceSpan(new SourceLocation(Environment.NewLine.Length * 2 + 30, 2, 1), contentLength: 4), "form");
+
+            var erroredOriginalTree = RazorSyntaxTree.Create(originalTree.Root, originalTree.Source, new[] { initialError }, originalTree.Options);
+            codeDocument.SetSyntaxTree(erroredOriginalTree);
+
+            // Act
+            phase.Execute(codeDocument);
+
+            // Assert
+            var outputTree = codeDocument.GetSyntaxTree();
+            Assert.Empty(originalTree.Diagnostics);
+            Assert.NotSame(erroredOriginalTree, outputTree);
+            Assert.Equal(new[] { initialError, expectedRewritingError }, outputTree.Diagnostics);
+        }
+
+        private static string AssemblyA => "TestAssembly";
+
+        private static string AssemblyB => "AnotherAssembly";
+
+        private static TagHelperDescriptor Valid_PlainTagHelperDescriptor
+        {
+            get
+            {
+                return CreateTagHelperDescriptor(
+                    tagName: "valid_plain",
+                    typeName: "Microsoft.AspNetCore.Razor.TagHelpers.ValidPlainTagHelper",
+                    assemblyName: AssemblyA);
+            }
+        }
+
+        private static TagHelperDescriptor Valid_InheritedTagHelperDescriptor
+        {
+            get
+            {
+                return CreateTagHelperDescriptor(
+                    tagName: "valid_inherited",
+                    typeName: "Microsoft.AspNetCore.Razor.TagHelpers.ValidInheritedTagHelper",
+                    assemblyName: AssemblyA);
+            }
+        }
+
+        private static TagHelperDescriptor String_TagHelperDescriptor
+        {
+            get
+            {
+                // We're treating 'string' as a TagHelper so we can test TagHelpers in multiple assemblies without
+                // building a separate assembly with a single TagHelper.
+                return CreateTagHelperDescriptor(
+                    tagName: "string",
+                    typeName: "System.String",
+                    assemblyName: AssemblyB);
+            }
+        }
+
+        public static TheoryData ProcessTagHelperPrefixData
+        {
+            get
+            {
+                // source, expected prefix
+                return new TheoryData<string, string>
+                {
+                    {
+                        $@"
+@tagHelperPrefix """"
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidPlain*, TestAssembly",
+                        null
+                    },
+                    {
+                        $@"
+@tagHelperPrefix th:
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidPlain*, {AssemblyA}",
+                        "th:"
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@tagHelperPrefix th:",
+                        "th:"
+                    },
+                    {
+                        $@"
+@tagHelperPrefix th-
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidPlain*, {AssemblyA}
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidInherited*, {AssemblyA}",
+                        "th-"
+                    },
+                    {
+                        $@"
+@tagHelperPrefix 
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidPlain*, {AssemblyA}
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidInherited*, {AssemblyA}",
+                        null
+                    },
+                    {
+                        $@"
+@tagHelperPrefix ""th""
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}",
+                        "th"
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@tagHelperPrefix th:-
+@addTagHelper *, {AssemblyB}",
+                        "th:-"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ProcessTagHelperPrefixData))]
+        public void DirectiveVisitor_ExtractsPrefixFromSyntaxTree(
+            string source,
+            string expectedPrefix)
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(source, filePath: "TestFile");
+            var parser = new RazorParser();
+            var syntaxTree = parser.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.TagHelperDirectiveVisitor(tagHelpers: new List<TagHelperDescriptor>());
+
+            // Act
+            visitor.Visit(syntaxTree.Root);
+
+            // Assert
+            Assert.Equal(expectedPrefix, visitor.TagHelperPrefix);
+        }
+
+        public static TheoryData ProcessTagHelperMatchesData
+        {
+            get
+            {
+                // source, taghelpers, expected descriptors
+                return new TheoryData<string, TagHelperDescriptor[], TagHelperDescriptor[]>
+                {
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, String_TagHelperDescriptor },
+                        new [] { Valid_PlainTagHelperDescriptor, String_TagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper *, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, String_TagHelperDescriptor },
+                        new [] { Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}
+@removeTagHelper *, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, String_TagHelperDescriptor },
+                        new [] { String_TagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper {Valid_PlainTagHelperDescriptor.Name}, {AssemblyA}
+@addTagHelper *, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper {Valid_PlainTagHelperDescriptor.Name}, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_InheritedTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_InheritedTagHelperDescriptor, Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_InheritedTagHelperDescriptor, Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidPlain*, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper Microsoft.AspNetCore.Razor.TagHelpers.*, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper Microsoft.AspNetCore.Razor.TagHelpers.ValidP*, {AssemblyA}
+@addTagHelper *, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, },
+                        new [] { Valid_InheritedTagHelperDescriptor, Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper Str*, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, String_TagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper *, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, String_TagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper System.{String_TagHelperDescriptor.Name}, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, String_TagHelperDescriptor, },
+                        new [] { Valid_PlainTagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}
+@removeTagHelper Microsoft.*, {AssemblyA}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, String_TagHelperDescriptor },
+                        new [] { String_TagHelperDescriptor }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}
+@removeTagHelper ?Microsoft*, {AssemblyA}
+@removeTagHelper System.{String_TagHelperDescriptor.Name}, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, String_TagHelperDescriptor },
+                        new []
+                        {
+                            Valid_InheritedTagHelperDescriptor,
+                            Valid_PlainTagHelperDescriptor,
+                            String_TagHelperDescriptor
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}
+@removeTagHelper TagHelper*, {AssemblyA}
+@removeTagHelper System.{String_TagHelperDescriptor.Name}, {AssemblyB}",
+                        new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor, String_TagHelperDescriptor },
+                        new []
+                        {
+                            Valid_InheritedTagHelperDescriptor,
+                            Valid_PlainTagHelperDescriptor,
+                            String_TagHelperDescriptor
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ProcessTagHelperMatchesData))]
+        public void DirectiveVisitor_FiltersTagHelpersByDirectives(
+            string source,
+            object tagHelpers,
+            object expectedDescriptors)
+        {
+            // Arrange
+            var expected = (TagHelperDescriptor[])expectedDescriptors;
+            var sourceDocument = TestRazorSourceDocument.Create(source, filePath: "TestFile");
+            var parser = new RazorParser();
+            var syntaxTree = parser.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.TagHelperDirectiveVisitor((TagHelperDescriptor[])tagHelpers);
+
+            // Act
+            visitor.Visit(syntaxTree.Root);
+
+            // Assert
+            Assert.Equal(expected.Count(), visitor.Matches.Count());
+
+            foreach (var expectedDescriptor in expected)
+            {
+                Assert.Contains(expectedDescriptor, visitor.Matches, TagHelperDescriptorComparer.Default);
+            }
+        }
+
+        public static TheoryData ProcessTagHelperMatches_EmptyResultData
+        {
+            get
+            {
+                // source, taghelpers
+                return new TheoryData<string, IEnumerable<TagHelperDescriptor>>
+                {
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper *, {AssemblyA}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper {Valid_PlainTagHelperDescriptor.Name}, {AssemblyA}
+@removeTagHelper {Valid_InheritedTagHelperDescriptor.Name}, {AssemblyA}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                            Valid_InheritedTagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}
+@removeTagHelper *, {AssemblyA}
+@removeTagHelper *, {AssemblyB}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                            Valid_InheritedTagHelperDescriptor,
+                            String_TagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@addTagHelper *, {AssemblyB}
+@removeTagHelper {Valid_PlainTagHelperDescriptor.Name}, {AssemblyA}
+@removeTagHelper {Valid_InheritedTagHelperDescriptor.Name}, {AssemblyA}
+@removeTagHelper {String_TagHelperDescriptor.Name}, {AssemblyB}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                            Valid_InheritedTagHelperDescriptor,
+                            String_TagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@removeTagHelper *, {AssemblyA}
+@removeTagHelper {Valid_PlainTagHelperDescriptor.Name}, {AssemblyA}",
+                        new TagHelperDescriptor[0]
+                    },
+                    {
+                        $@"
+@addTagHelper *, {AssemblyA}
+@removeTagHelper Mic*, {AssemblyA}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper Mic*, {AssemblyA}
+@removeTagHelper {Valid_PlainTagHelperDescriptor.Name}, {AssemblyA}
+@removeTagHelper {Valid_InheritedTagHelperDescriptor.Name}, {AssemblyA}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper Microsoft.*, {AssemblyA}
+@addTagHelper System.*, {AssemblyB}
+@removeTagHelper Microsoft.AspNetCore.Razor.TagHelpers*, {AssemblyA}
+@removeTagHelper System.*, {AssemblyB}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                            Valid_InheritedTagHelperDescriptor,
+                            String_TagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper ?icrosoft.*, {AssemblyA}
+@addTagHelper ?ystem.*, {AssemblyB}
+@removeTagHelper *?????r, {AssemblyA}
+@removeTagHelper Sy??em.*, {AssemblyB}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                            Valid_InheritedTagHelperDescriptor,
+                            String_TagHelperDescriptor,
+                        }
+                    },
+                    {
+                        $@"
+@addTagHelper ?i?crosoft.*, {AssemblyA}
+@addTagHelper ??ystem.*, {AssemblyB}",
+                        new TagHelperDescriptor[]
+                        {
+                            Valid_PlainTagHelperDescriptor,
+                            Valid_InheritedTagHelperDescriptor,
+                            String_TagHelperDescriptor,
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ProcessTagHelperMatches_EmptyResultData))]
+        public void ProcessDirectives_CanReturnEmptyDescriptorsBasedOnDirectiveDescriptors(
+            string source,
+            object tagHelpers)
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(source, filePath: "TestFile");
+            var parser = new RazorParser();
+            var syntaxTree = parser.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.TagHelperDirectiveVisitor((TagHelperDescriptor[])tagHelpers);
+
+            // Act
+            visitor.Visit(syntaxTree.Root);
+
+            // Assert
+            Assert.Empty(visitor.Matches);
+        }
+
+        [Fact]
+        public void TagHelperDirectiveVisitor_DoesNotMatch_Components()
+        {
+            // Arrange
+            var componentDescriptor = CreateComponentDescriptor("counter", "SomeProject.Counter", AssemblyA);
+            var legacyDescriptor = Valid_PlainTagHelperDescriptor;
+            var descriptors = new[]
+            {
+                legacyDescriptor,
+                componentDescriptor,
+            };
+            var visitor = new DefaultRazorTagHelperBinderPhase.TagHelperDirectiveVisitor(descriptors);
+            var sourceDocument = CreateTestSourceDocument();
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            var match = Assert.Single(visitor.Matches);
+            Assert.Same(legacyDescriptor, match);
+        }
+
+        private static TagHelperDescriptor CreatePrefixedValidPlainDescriptor(string prefix)
+        {
+            return Valid_PlainTagHelperDescriptor;
+        }
+
+        private static TagHelperDescriptor CreatePrefixedValidInheritedDescriptor(string prefix)
+        {
+            return Valid_InheritedTagHelperDescriptor;
+        }
+
+        private static TagHelperDescriptor CreatePrefixedStringDescriptor(string prefix)
+        {
+            return String_TagHelperDescriptor;
+        }
+
+        private static RazorSourceDocument CreateTestSourceDocument()
+        {
+            var content =
+            @"
+@addTagHelper *, TestAssembly
+<form>
+    <input value='Hello' type='text' />
+</form>";
+            var sourceDocument = TestRazorSourceDocument.Create(content, filePath: null);
+            return sourceDocument;
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null,
+            IEnumerable<Action<TagMatchingRuleDescriptorBuilder>> ruleBuilders = null)
+        {
+            return CreateDescriptor(TagHelperConventions.DefaultKind, tagName, typeName, assemblyName, attributes, ruleBuilders);
+        }
+#endregion
+
+#region Components
+        [Fact]
+        public void ComponentDirectiveVisitor_DoesNotMatch_LegacyTagHelpers()
+        {
+            // Arrange
+            var currentNamespace = "SomeProject";
+            var componentDescriptor = CreateComponentDescriptor("counter", "SomeProject.Counter", AssemblyA);
+            var legacyDescriptor = Valid_PlainTagHelperDescriptor;
+            var descriptors = new[]
+            {
+                legacyDescriptor,
+                componentDescriptor,
+            };
+            var sourceDocument = CreateComponentTestSourceDocument(@"<Counter />", "C:\\SomeFolder\\SomeProject\\Counter.cshtml");
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            Assert.Null(visitor.TagHelperPrefix);
+            var match = Assert.Single(visitor.Matches);
+            Assert.Same(componentDescriptor, match);
+        }
+
+        [Fact]
+        public void ComponentDirectiveVisitor_AddsErrorOnLegacyTagHelperDirectives()
+        {
+            // Arrange
+            var currentNamespace = "SomeProject";
+            var componentDescriptor = CreateComponentDescriptor("counter", "SomeProject.Counter", AssemblyA);
+            var legacyDescriptor = Valid_PlainTagHelperDescriptor;
+            var descriptors = new[]
+            {
+                legacyDescriptor,
+                componentDescriptor,
+            };
+            var filePath = "C:\\SomeFolder\\SomeProject\\Counter.cshtml";
+            var content = @"
+@tagHelperPrefix th:
+
+<Counter />
+";
+            var sourceDocument = CreateComponentTestSourceDocument(content, filePath);
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            Assert.Null(visitor.TagHelperPrefix);
+            var match = Assert.Single(visitor.Matches);
+            Assert.Same(componentDescriptor, match);
+            var directiveChunkGenerator = (TagHelperPrefixDirectiveChunkGenerator)tree.Root.DescendantNodes().First(n => n is CSharpStatementLiteralSyntax).GetSpanContext().ChunkGenerator;
+            var diagnostic = Assert.Single(directiveChunkGenerator.Diagnostics);
+            Assert.Equal("RZ9978", diagnostic.Id);
+        }
+
+        [Fact]
+        public void ComponentDirectiveVisitor_MatchesFullyQualifiedComponents()
+        {
+            // Arrange
+            var currentNamespace = "SomeProject";
+            var componentDescriptor = CreateComponentDescriptor(
+                "SomeProject.SomeOtherFolder.Counter",
+                "SomeProject.SomeOtherFolder.Counter",
+                AssemblyA,
+                fullyQualified: true);
+            var descriptors = new[]
+            {
+                componentDescriptor,
+            };
+            var filePath = "C:\\SomeFolder\\SomeProject\\Counter.cshtml";
+            var content = @"
+";
+            var sourceDocument = CreateComponentTestSourceDocument(content, filePath);
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            var match = Assert.Single(visitor.Matches);
+            Assert.Same(componentDescriptor, match);
+        }
+
+        [Fact]
+        public void ComponentDirectiveVisitor_ComponentInScope_MatchesChildContent()
+        {
+            // Arrange
+            var currentNamespace = "SomeProject";
+            var componentDescriptor = CreateComponentDescriptor(
+                "Counter",
+                "SomeProject.Counter",
+                AssemblyA);
+            var childContentDescriptor = CreateComponentDescriptor(
+                "ChildContent",
+                "SomeProject.Counter.ChildContent",
+                AssemblyA,
+                childContent: true);
+            var descriptors = new[]
+            {
+                componentDescriptor,
+                childContentDescriptor,
+            };
+            var filePath = "C:\\SomeFolder\\SomeProject\\Counter.cshtml";
+            var content = @"
+";
+            var sourceDocument = CreateComponentTestSourceDocument(content, filePath);
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            Assert.Equal(2, visitor.Matches.Count);
+        }
+
+        [Fact]
+        public void ComponentDirectiveVisitor_NullCurrentNamespace_MatchesOnlyFullyQualifiedComponents()
+        {
+            // Arrange
+            string currentNamespace = null;
+            var componentDescriptor = CreateComponentDescriptor(
+                "Counter",
+                "SomeProject.Counter",
+                AssemblyA);
+            var fullyQualifiedComponent = CreateComponentDescriptor(
+               "SomeProject.SomeOtherFolder.Counter",
+               "SomeProject.SomeOtherFolder.Counter",
+               AssemblyA,
+               fullyQualified: true);
+            var descriptors = new[]
+            {
+                componentDescriptor,
+                fullyQualifiedComponent,
+            };
+            var filePath = "C:\\SomeFolder\\SomeProject\\Counter.cshtml";
+            var content = @"
+";
+            var sourceDocument = CreateComponentTestSourceDocument(content, filePath);
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            var match = Assert.Single(visitor.Matches);
+            Assert.Same(fullyQualifiedComponent, match);
+        }
+
+        [Fact]
+        public void ComponentDirectiveVisitor_MatchesIfNamespaceInUsing()
+        {
+            // Arrange
+            var currentNamespace = "SomeProject";
+            var componentDescriptor = CreateComponentDescriptor(
+                "Counter",
+                "SomeProject.Counter",
+                AssemblyA);
+            var anotherComponentDescriptor = CreateComponentDescriptor(
+               "Foo",
+               "SomeProject.SomeOtherFolder.Foo",
+               AssemblyA);
+            var descriptors = new[]
+            {
+                componentDescriptor,
+                anotherComponentDescriptor,
+            };
+            var filePath = "C:\\SomeFolder\\SomeProject\\Counter.cshtml";
+            var content = @"
+@using SomeProject.SomeOtherFolder
+";
+            var sourceDocument = CreateComponentTestSourceDocument(content, filePath);
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            Assert.Equal(2, visitor.Matches.Count);
+        }
+
+        [Fact]
+        public void ComponentDirectiveVisitor_DoesNotMatchForUsingAliasAndStaticUsings()
+        {
+            // Arrange
+            var currentNamespace = "SomeProject";
+            var componentDescriptor = CreateComponentDescriptor(
+                "Counter",
+                "SomeProject.Counter",
+                AssemblyA);
+            var anotherComponentDescriptor = CreateComponentDescriptor(
+               "Foo",
+               "SomeProject.SomeOtherFolder.Foo",
+               AssemblyA);
+            var descriptors = new[]
+            {
+                componentDescriptor,
+                anotherComponentDescriptor,
+            };
+            var filePath = "C:\\SomeFolder\\SomeProject\\Counter.cshtml";
+            var content = @"
+@using Bar = SomeProject.SomeOtherFolder
+@using static SomeProject.SomeOtherFolder.Foo
+";
+            var sourceDocument = CreateComponentTestSourceDocument(content, filePath);
+            var tree = RazorSyntaxTree.Parse(sourceDocument);
+            var visitor = new DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor(sourceDocument.FilePath, descriptors, currentNamespace);
+
+            // Act
+            visitor.Visit(tree);
+
+            // Assert
+            var match = Assert.Single(visitor.Matches);
+            Assert.Same(componentDescriptor, match);
+        }
+
+        [Theory]
+        [InlineData("", "", true)]
+        [InlineData("Foo", "Project", true)]
+        [InlineData("Project.Foo", "Project", true)]
+        [InlineData("Project.Bar.Foo", "Project.Bar", true)]
+        [InlineData("Project.Foo", "Project.Bar", false)]
+        [InlineData("Project.Bar.Foo", "Project", false)]
+        [InlineData("Bar.Foo", "Project", false)]
+        public void IsTypeInNamespace_WorksAsExpected(string typeName, string @namespace, bool expected)
+        {
+            // Arrange & Act
+            var result = DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor.IsTypeInNamespace(typeName, @namespace);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("", "", true)]
+        [InlineData("Foo", "Project", true)]
+        [InlineData("Project.Foo", "Project", true)]
+        [InlineData("Project.Bar.Foo", "Project.Bar", true)]
+        [InlineData("Project.Foo", "Project.Bar", true)]
+        [InlineData("Project.Bar.Foo", "Project", false)]
+        [InlineData("Bar.Foo", "Project", false)]
+        public void IsTypeInScope_WorksAsExpected(string typeName, string currentNamespace, bool expected)
+        {
+            // Arrange & Act
+            var result = DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor.IsTypeInScope(typeName, currentNamespace);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void IsTagHelperFromMangledClass_WorksAsExpected()
+        {
+            // Arrange
+            var className = "Counter";
+            var typeName = $"SomeProject.SomeNamespace.{ComponentMetadata.MangleClassName(className)}";
+            var descriptor = CreateComponentDescriptor(
+                tagName: "Counter",
+                typeName: typeName,
+                assemblyName: AssemblyA);
+
+            // Act
+            var result = DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor.IsTagHelperFromMangledClass(descriptor);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("", false, "", "")]
+        [InlineData(".", true, "", "")]
+        [InlineData("Foo", true, "", "Foo")]
+        [InlineData("SomeProject.Foo", true, "SomeProject", "Foo")]
+        [InlineData("SomeProject.Foo<Bar>", true, "SomeProject", "Foo<Bar>")]
+        [InlineData("SomeProject.Foo<Bar.Baz>", true, "SomeProject", "Foo<Bar.Baz>")]
+        [InlineData("SomeProject.Foo<Bar.Baz>>", true, "", "SomeProject.Foo<Bar.Baz>>")]
+        [InlineData("SomeProject..Foo<Bar>", true, "SomeProject.", "Foo<Bar>")]
+        public void TrySplitNamespaceAndType_WorksAsExpected(string fullTypeName, bool expectedResult, string expectedNamespace, string expectedTypeName)
+        {
+            // Arrange & Act
+            var result = DefaultRazorTagHelperBinderPhase.ComponentDirectiveVisitor.TrySplitNamespaceAndType(
+                fullTypeName, out var @namespace, out var typeName);
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+            Assert.Equal(expectedNamespace, @namespace);
+            Assert.Equal(expectedTypeName, typeName);
+        }
+
+        private static RazorSourceDocument CreateComponentTestSourceDocument(string content, string filePath = null)
+        {
+            var sourceDocument = TestRazorSourceDocument.Create(content, filePath: filePath);
+            return sourceDocument;
+        }
+
+        private static TagHelperDescriptor CreateComponentDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null,
+            IEnumerable<Action<TagMatchingRuleDescriptorBuilder>> ruleBuilders = null,
+            string kind = null,
+            bool fullyQualified = false,
+            bool childContent = false)
+        {
+            kind = kind ?? ComponentMetadata.Component.TagHelperKind;
+            return CreateDescriptor(kind, tagName, typeName, assemblyName, attributes, ruleBuilders, fullyQualified, childContent);
+        }
+#endregion
+
+        private static TagHelperDescriptor CreateDescriptor(
+            string kind,
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null,
+            IEnumerable<Action<TagMatchingRuleDescriptorBuilder>> ruleBuilders = null,
+            bool componentFullyQualified = false,
+            bool componentChildContent = false)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(kind, typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BoundAttributeDescriptor(attributeBuilder);
+                }
+            }
+
+            if (ruleBuilders != null)
+            {
+                foreach (var ruleBuilder in ruleBuilders)
+                {
+                    builder.TagMatchingRuleDescriptor(innerRuleBuilder =>
+                    {
+                        innerRuleBuilder.RequireTagName(tagName);
+                        ruleBuilder(innerRuleBuilder);
+                    });
+                }
+            }
+            else
+            {
+                builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+            }
+
+            if (componentFullyQualified)
+            {
+                builder.Metadata[ComponentMetadata.Component.NameMatchKey] = ComponentMetadata.Component.FullyQualifiedNameMatch;
+            }
+
+            if (componentChildContent)
+            {
+                builder.Metadata[ComponentMetadata.SpecialKindKey] = ComponentMetadata.ChildContent.TagHelperKind;
+            }
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs
new file mode 100644
index 0000000000..f847f6ae3c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs
@@ -0,0 +1,44 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DefaultRequiredAttributeDescriptorBuilderTest
+    {
+        [Fact]
+        public void Build_DisplayNameIsName_NameComparisonFullMatch()
+        {
+            // Arrange
+            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+
+            builder
+                .Name("asp-action")
+                .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch);
+
+            // Act
+            var descriptor = builder.Build();
+
+            // Assert
+            Assert.Equal("asp-action", descriptor.DisplayName);
+        }
+
+        [Fact]
+        public void Build_DisplayNameIsNameWithDots_NameComparisonPrefixMatch()
+        {
+            // Arrange
+            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+
+            builder
+                .Name("asp-route-")
+                .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch);
+
+            // Act
+            var descriptor = builder.Build();
+
+            // Assert
+            Assert.Equal("asp-route-...", descriptor.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..ffcb4f8ba9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs
@@ -0,0 +1,122 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DirectiveDescriptorBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddMemberToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddMemberToken());
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Member, token.Kind);
+            Assert.False(token.Optional);
+            Assert.Null(token.Name);
+            Assert.Null(token.Description);
+        }
+
+        [Fact]
+        public void AddNamespaceToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddNamespaceToken("Name", "Description"));
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Namespace, token.Kind);
+            Assert.False(token.Optional);
+            Assert.Equal("Name", token.Name);
+            Assert.Equal("Description", token.Description);
+        }
+
+        [Fact]
+        public void AddStringToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddStringToken());
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.String, token.Kind);
+            Assert.False(token.Optional);
+            Assert.Null(token.Name);
+            Assert.Null(token.Description);
+        }
+
+        [Fact]
+        public void AddTypeToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddTypeToken("Name", "Description"));
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Type, token.Kind);
+            Assert.False(token.Optional);
+            Assert.Equal("Name", token.Name);
+            Assert.Equal("Description", token.Description);
+        }
+
+        [Fact]
+        public void AddOptionalTypeToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddOptionalTypeToken());
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Type, token.Kind);
+            Assert.True(token.Optional);
+            Assert.Null(token.Name);
+            Assert.Null(token.Description);
+        }
+
+        [Fact]
+        public void AddOptionalMemberToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddOptionalMemberToken("Name", "Description"));
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Member, token.Kind);
+            Assert.True(token.Optional);
+            Assert.Equal("Name", token.Name);
+            Assert.Equal("Description", token.Description);
+        }
+
+        [Fact]
+        public void AddOptionalNamespaceToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddOptionalNamespaceToken());
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Namespace, token.Kind);
+            Assert.True(token.Optional);
+            Assert.Null(token.Name);
+            Assert.Null(token.Description);
+        }
+
+        [Fact]
+        public void AddOptionalStringToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddOptionalStringToken("Name", "Description"));
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.String, token.Kind);
+            Assert.True(token.Optional);
+            Assert.Equal("Name", token.Name);
+            Assert.Equal("Description", token.Description);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorTest.cs
new file mode 100644
index 0000000000..a5bb3c8434
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorTest.cs
@@ -0,0 +1,150 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DirectiveDescriptorTest
+    {
+        [Fact]
+        public void CreateDirective_CreatesDirective_WithProvidedKind()
+        {
+            // Arrange & Act
+            var directive = DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine);
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.SingleLine, directive.Kind);
+        }
+
+        [Fact]
+        public void CreateDirective_WithConfigure_CreatesDirective_WithProvidedKind()
+        {
+            // Arrange
+            var called = false;
+            Action<IDirectiveDescriptorBuilder> configure = b => { called = true; };
+
+            // Act
+            var directive = DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine, configure);
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.SingleLine, directive.Kind);
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void CreateSingleLineDirective_CreatesSingleLineDirective()
+        {
+            // Arrange & Act
+            var directive = DirectiveDescriptor.CreateSingleLineDirective("test");
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.SingleLine, directive.Kind);
+        }
+
+        [Fact]
+        public void CreateSingleLineDirective_WithConfigure_CreatesSingleLineDirective()
+        {
+            // Arrange
+            var called = false;
+            Action<IDirectiveDescriptorBuilder> configure = b => { called = true; };
+
+            // Act
+            var directive = DirectiveDescriptor.CreateSingleLineDirective("test", configure);
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.SingleLine, directive.Kind);
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void CreateRazorBlockDirective_CreatesRazorBlockDirective()
+        {
+            // Arrange & Act
+            var directive = DirectiveDescriptor.CreateRazorBlockDirective("test");
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.RazorBlock, directive.Kind);
+        }
+
+        [Fact]
+        public void CreateRazorBlockDirective_WithConfigure_CreatesRazorBlockDirective()
+        {
+            // Arrange
+            var called = false;
+            Action<IDirectiveDescriptorBuilder> configure = b => { called = true; };
+
+            // Act
+            var directive = DirectiveDescriptor.CreateRazorBlockDirective("test", configure);
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.RazorBlock, directive.Kind);
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void CreateCodeBlockDirective_CreatesCodeBlockDirective()
+        {
+            // Arrange & Act
+            var directive = DirectiveDescriptor.CreateCodeBlockDirective("test");
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.CodeBlock, directive.Kind);
+        }
+
+        [Fact]
+        public void CreateCodeBlockDirective_WithConfigure_CreatesCodeBlockDirective()
+        {
+            // Arrange
+            var called = false;
+            Action<IDirectiveDescriptorBuilder> configure = b => { called = true; };
+
+            // Act
+            var directive = DirectiveDescriptor.CreateCodeBlockDirective("test", configure);
+
+            // Assert
+            Assert.Equal("test", directive.Directive);
+            Assert.Equal(DirectiveKind.CodeBlock, directive.Kind);
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void Build_ValidatesDirectiveKeyword_EmptyIsInvalid()
+        {
+            // Arrange & Act
+            var ex = Assert.Throws<InvalidOperationException>(() => DirectiveDescriptor.CreateSingleLineDirective(""));
+
+            // Assert
+            Assert.Equal("Invalid directive keyword ''. Directives must have a non-empty keyword that consists only of letters.", ex.Message);
+        }
+
+        [Fact]
+        public void Build_ValidatesDirectiveKeyword_InvalidCharacter()
+        {
+            // Arrange & Act
+            var ex = Assert.Throws<InvalidOperationException>(() => DirectiveDescriptor.CreateSingleLineDirective("test_directive"));
+
+            // Assert
+            Assert.Equal("Invalid directive keyword 'test_directive'. Directives must have a non-empty keyword that consists only of letters.", ex.Message);
+        }
+
+        [Fact]
+        public void Build_ValidatesDirectiveName_NonOptionalTokenFollowsOptionalToken()
+        {
+            // Arrange & Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => DirectiveDescriptor.CreateSingleLineDirective("test", b => { b.AddOptionalMemberToken(); b.AddMemberToken(); }));
+
+            // Assert
+            Assert.Equal("A non-optional directive token cannot follow an optional directive token.", ex.Message);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveRemovalOptimizationPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveRemovalOptimizationPassTest.cs
new file mode 100644
index 0000000000..3e831b7d23
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveRemovalOptimizationPassTest.cs
@@ -0,0 +1,135 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DirectiveRemovalOptimizationPassTest
+    {
+        [Fact]
+        public void Execute_Custom_RemovesDirectiveNodeFromDocument()
+        {
+            // Arrange
+            var content = "@custom \"Hello\"";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var defaultEngine = RazorProjectEngine.Create(b =>
+            {
+                b.AddDirective(DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, d => d.AddStringToken()));
+            }).Engine;
+            var documentNode = Lower(codeDocument, defaultEngine);
+            var pass = new DirectiveRemovalOptimizationPass()
+            {
+                Engine = defaultEngine,
+            };
+
+            // Act
+            pass.Execute(codeDocument, documentNode);
+
+            // Assert
+            Children(documentNode,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+            var @namespace = documentNode.Children[0];
+            Children(@namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+            var @class = @namespace.Children[0];
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            Assert.Empty(method.Children);
+        }
+
+        [Fact]
+        public void Execute_MultipleCustomDirectives_RemovesDirectiveNodesFromDocument()
+        {
+            // Arrange
+            var content = "@custom \"Hello\"" + Environment.NewLine + "@custom \"World\"";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var defaultEngine = RazorProjectEngine.Create(b =>
+            {
+                b.AddDirective(DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, d => d.AddStringToken()));
+            }).Engine;
+            var documentNode = Lower(codeDocument, defaultEngine);
+            var pass = new DirectiveRemovalOptimizationPass()
+            {
+                Engine = defaultEngine,
+            };
+
+            // Act
+            pass.Execute(codeDocument, documentNode);
+
+            // Assert
+            Children(documentNode,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+            var @namespace = documentNode.Children[0];
+            Children(@namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+            var @class = @namespace.Children[0];
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            Assert.Empty(method.Children);
+        }
+
+        [Fact]
+        public void Execute_DirectiveWithError_PreservesDiagnosticsAndRemovesDirectiveNodeFromDocument()
+        {
+            // Arrange
+            var content = "@custom \"Hello\"";
+            var expectedDiagnostic = RazorDiagnostic.Create(new RazorDiagnosticDescriptor("RZ9999", () => "Some diagnostic message.", RazorDiagnosticSeverity.Error), SourceSpan.Undefined);
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var defaultEngine = RazorProjectEngine.Create(b =>
+            {
+                b.AddDirective(DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, d => d.AddStringToken()));
+            }).Engine;
+            var documentNode = Lower(codeDocument, defaultEngine);
+
+            // Add the diagnostic to the directive node.
+            var directiveNode = documentNode.FindDescendantNodes<DirectiveIntermediateNode>().Single();
+            directiveNode.Diagnostics.Add(expectedDiagnostic);
+
+            var pass = new DirectiveRemovalOptimizationPass()
+            {
+                Engine = defaultEngine,
+            };
+
+            // Act
+            pass.Execute(codeDocument, documentNode);
+
+            // Assert
+            var diagnostic = Assert.Single(documentNode.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+
+            Children(documentNode,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+            var @namespace = documentNode.Children[0];
+            Children(@namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+            var @class = @namespace.Children[0];
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            Assert.Empty(method.Children);
+        }
+
+        private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorEngine engine)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(documentNode);
+
+            return documentNode;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveTokenEditHandlerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveTokenEditHandlerTest.cs
new file mode 100644
index 0000000000..1f0336d008
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveTokenEditHandlerTest.cs
@@ -0,0 +1,86 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test
+{
+    public class DirectiveTokenEditHandlerTest
+    {
+        [Theory]
+        [InlineData(0, 4, "")] // "Namespace"
+        [InlineData(4, 0, "Other")] // "SomeOtherNamespace"
+        [InlineData(0, 4, "Other")] // "OtherNamespace"
+        public void CanAcceptChange_ProvisionallyAcceptsNonWhitespaceChanges(int index, int length, string newText)
+        {
+            // Arrange
+            var directiveTokenHandler = new TestDirectiveTokenEditHandler();
+            directiveTokenHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+
+            var target = GetSyntaxNode(directiveTokenHandler, "SomeNamespace");
+            
+            var sourceChange = new SourceChange(index, length, newText);
+
+            // Act
+            var result = directiveTokenHandler.CanAcceptChange(target, sourceChange);
+
+            // Assert
+            Assert.Equal(PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional, result);
+        }
+
+        [Theory]
+        [InlineData(4, 1, "")] // "SomeNamespace"
+        [InlineData(9, 0, " ")] // "Some Name space"
+        [InlineData(9, 5, " Space")] // "Some Name Space"
+        public void CanAcceptChange_RejectsWhitespaceChanges(int index, int length, string newText)
+        {
+            // Arrange
+            var directiveTokenHandler = new TestDirectiveTokenEditHandler();
+            directiveTokenHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+
+            var target = GetSyntaxNode(directiveTokenHandler, "Some Namespace");
+
+            var sourceChange = new SourceChange(index, length, newText);
+
+            // Act
+            var result = directiveTokenHandler.CanAcceptChange(target, sourceChange);
+
+            // Assert
+            Assert.Equal(PartialParseResultInternal.Rejected, result);
+        }
+
+        private static CSharpStatementLiteralSyntax GetSyntaxNode(DirectiveTokenEditHandler editHandler, string content)
+        {
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            var tokens = CSharpLanguageCharacteristics.Instance.TokenizeString(content).ToArray();
+            foreach (var token in tokens)
+            {
+                builder.Add((SyntaxToken)token.CreateRed());
+            }
+            var node = SyntaxFactory.CSharpStatementLiteral(builder.ToList());
+
+            var context = new SpanContext(SpanChunkGenerator.Null, editHandler);
+
+            return node.WithSpanContext(context);
+        }
+
+        private class TestDirectiveTokenEditHandler : DirectiveTokenEditHandler
+        {
+            public TestDirectiveTokenEditHandler() : base(content => TestTokenizer(content))
+            {
+            }
+
+            public new PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
+                => base.CanAcceptChange(target, change);
+
+            internal static IEnumerable<Syntax.InternalSyntax.SyntaxToken> TestTokenizer(string str)
+            {
+                yield return Syntax.InternalSyntax.SyntaxFactory.Token(SyntaxKind.Marker, str);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DocumentClassifierPassBaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DocumentClassifierPassBaseTest.cs
new file mode 100644
index 0000000000..e63768bf54
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DocumentClassifierPassBaseTest.cs
@@ -0,0 +1,295 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class DocumentClassifierPassBaseTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        public RazorEngine Engine => CreateProjectEngine().Engine;
+
+        [Fact]
+        public void Execute_HasDocumentKind_IgnoresDocument()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                DocumentKind = "ignore",
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new TestDocumentClassifierPass();
+            pass.Engine = Engine;
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            Assert.Equal("ignore", documentNode.DocumentKind);
+            NoChildren(documentNode);
+        }
+
+        [Fact]
+        public void Execute_NoMatch_IgnoresDocument()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new TestDocumentClassifierPass()
+            {
+                Engine = Engine,
+                ShouldMatch = false,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            Assert.Null(documentNode.DocumentKind);
+            NoChildren(documentNode);
+        }
+
+        [Fact]
+        public void Execute_Match_AddsGlobalTargetExtensions()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var expected = new ICodeTargetExtension[]
+            {
+                new MyExtension1(),
+                new MyExtension2(),
+            };
+
+            var pass = new TestDocumentClassifierPass();
+            pass.Engine = RazorProjectEngine.CreateEmpty(b =>
+            {
+                for (var i = 0; i < expected.Length; i++)
+                {
+                    b.AddTargetExtension(expected[i]);
+                }
+            }).Engine;
+
+            ICodeTargetExtension[] extensions = null;
+
+            pass.CodeTargetCallback = (builder) => extensions = builder.TargetExtensions.ToArray();
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            Assert.Equal(expected, extensions);
+        }
+
+        [Fact]
+        public void Execute_Match_SetsDocumentType_AndCreatesStructure()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new TestDocumentClassifierPass();
+            pass.Engine = Engine;
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            Assert.Equal("test", documentNode.DocumentKind);
+            Assert.NotNull(documentNode.Target);
+
+            var @namespace = SingleChild<NamespaceDeclarationIntermediateNode>(documentNode);
+            var @class = SingleChild<ClassDeclarationIntermediateNode>(@namespace);
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            NoChildren(method);
+        }
+
+        [Fact]
+        public void Execute_AddsUsingsToNamespace()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(documentNode);
+            builder.Add(new UsingDirectiveIntermediateNode());
+
+            var pass = new TestDocumentClassifierPass();
+            pass.Engine = Engine;
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            var @namespace = SingleChild<NamespaceDeclarationIntermediateNode>(documentNode);
+            Children(
+                @namespace,
+                n => Assert.IsType<UsingDirectiveIntermediateNode>(n),
+                n => Assert.IsType<ClassDeclarationIntermediateNode>(n));
+        }
+
+        [Fact]
+        public void Execute_AddsTheRestToMethod()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(documentNode);
+            builder.Add(new HtmlContentIntermediateNode());
+            builder.Add(new CSharpCodeIntermediateNode());
+
+            var pass = new TestDocumentClassifierPass();
+            pass.Engine = Engine;
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            var @namespace = SingleChild<NamespaceDeclarationIntermediateNode>(documentNode);
+            var @class = SingleChild<ClassDeclarationIntermediateNode>(@namespace);
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            Children(
+                method,
+                n => Assert.IsType<HtmlContentIntermediateNode>(n),
+                n => Assert.IsType<CSharpCodeIntermediateNode>(n));
+        }
+
+        [Fact]
+        public void Execute_CanInitializeDefaults()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(documentNode);
+            builder.Add(new HtmlContentIntermediateNode());
+            builder.Add(new CSharpCodeIntermediateNode());
+
+            var pass = new TestDocumentClassifierPass()
+            {
+                Engine = Engine,
+                Namespace = "TestNamespace",
+                Class = "TestClass",
+                Method = "TestMethod",
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            var @namespace = SingleChild<NamespaceDeclarationIntermediateNode>(documentNode);
+            Assert.Equal("TestNamespace", @namespace.Content);
+
+            var @class = SingleChild<ClassDeclarationIntermediateNode>(@namespace);
+            Assert.Equal("TestClass", @class.ClassName);
+
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            Assert.Equal("TestMethod", method.MethodName);
+        }
+
+        [Fact]
+        public void Execute_AddsPrimaryAnnotations()
+        {
+            // Arrange
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(documentNode);
+            builder.Add(new HtmlContentIntermediateNode());
+            builder.Add(new CSharpCodeIntermediateNode());
+
+            var pass = new TestDocumentClassifierPass()
+            {
+                Engine = Engine,
+                Namespace = "TestNamespace",
+                Class = "TestClass",
+                Method = "TestMethod",
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), documentNode);
+
+            // Assert
+            var @namespace = SingleChild<NamespaceDeclarationIntermediateNode>(documentNode);
+            AnnotationEquals(@namespace, CommonAnnotations.PrimaryNamespace);
+
+            var @class = SingleChild<ClassDeclarationIntermediateNode>(@namespace);
+            AnnotationEquals(@class, CommonAnnotations.PrimaryClass);
+
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+            AnnotationEquals(method, CommonAnnotations.PrimaryMethod);
+        }
+
+        private class TestDocumentClassifierPass : DocumentClassifierPassBase
+        {
+            public override int Order => IntermediateNodePassBase.DefaultFeatureOrder;
+
+            public bool ShouldMatch { get; set; } = true;
+
+            public Action<CodeTargetBuilder> CodeTargetCallback { get; set; }
+
+            public string Namespace { get; set;  }
+
+            public string Class { get; set; }
+
+            public string Method { get; set; }
+
+            protected override string DocumentKind => "test";
+
+            protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                return ShouldMatch;
+            }
+
+            protected override void OnDocumentStructureCreated(
+                RazorCodeDocument codeDocument,
+                NamespaceDeclarationIntermediateNode @namespace,
+                ClassDeclarationIntermediateNode @class,
+                MethodDeclarationIntermediateNode method)
+            {
+                @namespace.Content = Namespace;
+                @class.ClassName = Class;
+                @method.MethodName = Method;
+            }
+
+            protected override void ConfigureTarget(CodeTargetBuilder builder)
+            {
+                CodeTargetCallback?.Invoke(builder);
+            }
+        }
+
+        private class MyExtension1 : ICodeTargetExtension
+        {
+        }
+
+        private class MyExtension2 : ICodeTargetExtension
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultMetadataIdentifierFeatureTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultMetadataIdentifierFeatureTest.cs
new file mode 100644
index 0000000000..fec5a77cc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultMetadataIdentifierFeatureTest.cs
@@ -0,0 +1,74 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class DefaultMetadataIdentifierFeatureTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void GetIdentifier_ReturnsNull_ForNullRelativePath()
+        {
+            // Arrange
+            var sourceDocument = RazorSourceDocument.Create("content", new RazorSourceDocumentProperties("Test.cshtml", null));
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var feature = new DefaultMetadataIdentifierFeature()
+            {
+                Engine = CreateProjectEngine().Engine,
+            };
+
+            // Act
+            var result = feature.GetIdentifier(codeDocument, sourceDocument);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetIdentifier_ReturnsNull_ForEmptyRelativePath()
+        {
+            // Arrange
+            var sourceDocument = RazorSourceDocument.Create("content", new RazorSourceDocumentProperties("Test.cshtml", string.Empty));
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var feature = new DefaultMetadataIdentifierFeature()
+            {
+                Engine = CreateProjectEngine().Engine,
+            };
+
+            // Act
+            var result = feature.GetIdentifier(codeDocument, sourceDocument);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData("Test.cshtml", "/Test.cshtml")]
+        [InlineData("/Test.cshtml", "/Test.cshtml")]
+        [InlineData("\\Test.cshtml", "/Test.cshtml")]
+        [InlineData("\\About\\Test.cshtml", "/About/Test.cshtml")]
+        [InlineData("\\About\\Test\\cshtml", "/About/Test/cshtml")]
+        public void GetIdentifier_SanitizesRelativePath(string relativePath, string expected)
+        {
+            // Arrange
+            var sourceDocument = RazorSourceDocument.Create("content", new RazorSourceDocumentProperties("Test.cshtml", relativePath));
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var feature = new DefaultMetadataIdentifierFeature()
+            {
+                Engine = CreateProjectEngine().Engine,
+            };
+
+            // Act
+            var result = feature.GetIdentifier(codeDocument, sourceDocument);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs
new file mode 100644
index 0000000000..7321c473cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs
@@ -0,0 +1,128 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class DefaultTagHelperOptimizationPassTest
+    {
+        [Fact]
+        public void DefaultTagHelperOptimizationPass_Execute_ReplacesChildren()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"" attr=""value"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .TypeName("TestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32")
+                        .PropertyName("FooProp"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new DefaultTagHelperOptimizationPass()
+            {
+                Engine = engine
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = irDocument.FindPrimaryClass();
+            Assert.IsType<DefaultTagHelperRuntimeIntermediateNode>(@class.Children[0]);
+
+            var fieldDeclaration = Assert.IsType<FieldDeclarationIntermediateNode>(@class.Children[1]);
+            Assert.Equal(bool.TrueString, fieldDeclaration.Annotations[CommonAnnotations.DefaultTagHelperExtension.TagHelperField]);
+            Assert.Equal("__TestTagHelper", fieldDeclaration.FieldName);
+            Assert.Equal("global::TestTagHelper", fieldDeclaration.FieldType);
+            Assert.Equal("private", fieldDeclaration.Modifiers.First());
+
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(5, tagHelper.Children.Count);
+
+            var body = Assert.IsType<DefaultTagHelperBodyIntermediateNode>(tagHelper.Children[0]);
+            Assert.Equal("p", body.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, body.TagMode);
+
+            var create = Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]);
+            Assert.Equal("__TestTagHelper", create.FieldName);
+            Assert.Equal("TestTagHelper", create.TypeName);
+            Assert.Equal(tagHelpers[0], create.TagHelper, TagHelperDescriptorComparer.CaseSensitive);
+
+            var property = Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]);
+            Assert.Equal("foo", property.AttributeName);
+            Assert.Equal(AttributeStructure.DoubleQuotes, property.AttributeStructure);
+            Assert.Equal(tagHelpers[0].BoundAttributes[0], property.BoundAttribute, BoundAttributeDescriptorComparer.CaseSensitive);
+            Assert.Equal("__TestTagHelper", property.FieldName);
+            Assert.False(property.IsIndexerNameMatch);
+            Assert.Equal("FooProp", property.PropertyName);
+            Assert.Equal(tagHelpers[0], property.TagHelper, TagHelperDescriptorComparer.CaseSensitive);
+
+            var htmlAttribute = Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[3]);
+            Assert.Equal("attr", htmlAttribute.AttributeName);
+            Assert.Equal(AttributeStructure.DoubleQuotes, htmlAttribute.AttributeStructure);
+
+            Assert.IsType<DefaultTagHelperExecuteIntermediateNode>(tagHelper.Children[4]);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs
new file mode 100644
index 0000000000..f8d21edfca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs
@@ -0,0 +1,1239 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class DefaultTagHelperTargetExtensionTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        private static readonly TagHelperDescriptor StringPropertyTagHelper = CreateTagHelperDescriptor(
+            tagName: "input",
+            typeName: "InputTagHelper",
+            assemblyName: "TestAssembly",
+            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+            {
+                builder => builder
+                    .Name("bound")
+                    .PropertyName("StringProp")
+                    .TypeName("System.String"),
+            });
+
+        private static readonly TagHelperDescriptor IntPropertyTagHelper = CreateTagHelperDescriptor(
+            tagName: "input",
+            typeName: "InputTagHelper",
+            assemblyName: "TestAssembly",
+            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+            {
+                builder => builder
+                    .Name("bound")
+                    .PropertyName("IntProp")
+                    .TypeName("System.Int32"),
+            });
+
+        private static readonly TagHelperDescriptor StringIndexerTagHelper = CreateTagHelperDescriptor(
+            tagName: "input",
+            typeName: "InputTagHelper",
+            assemblyName: "TestAssembly",
+            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+            {
+                builder => builder
+                    .Name("bound")
+                    .PropertyName("StringIndexer")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.String>")
+                    .AsDictionary("foo-", "System.String"),
+            });
+
+        private static readonly TagHelperDescriptor IntIndexerTagHelper = CreateTagHelperDescriptor(
+            tagName: "input",
+            typeName: "InputTagHelper",
+            assemblyName: "TestAssembly",
+            attributes: new Action<BoundAttributeDescriptorBuilder>[]
+            {
+                builder => builder
+                    .Name("bound")
+                    .PropertyName("IntIndexer")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .AsDictionary("foo-", "System.Int32"),
+            });
+
+        private static readonly SourceSpan Span = new SourceSpan("test.cshtml", 15, 2, 5, 2);
+
+        [Fact]
+        public void WriteTagHelperBody_DesignTime_WritesChildren()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperBodyIntermediateNode()
+            {
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode(),
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperBody(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"Render Children
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperBody_Runtime_RendersCorrectly_UsesTagNameAndModeFromContext()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperBodyIntermediateNode()
+            {
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode(),
+                },
+                TagMode = TagMode.SelfClosing,
+                TagName = "p",
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperBody(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__tagHelperExecutionContext = __tagHelperScopeManager.Begin(""p"", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, ""test"", async() => {
+    Render Children
+}
+);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperCreate_DesignTime_RendersCorrectly_UsesSpecifiedTagHelperType()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = "__TestNamespace_MyTagHelper",
+                TypeName = "TestNamespace.MyTagHelper",
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperCreate(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__TestNamespace_MyTagHelper = CreateTagHelper<global::TestNamespace.MyTagHelper>();
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperCreate_Runtime_RendersCorrectly_UsesSpecifiedTagHelperType()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = "__TestNamespace_MyTagHelper",
+                TypeName = "TestNamespace.MyTagHelper",
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperCreate(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__TestNamespace_MyTagHelper = CreateTagHelper<global::TestNamespace.MyTagHelper>();
+__tagHelperExecutionContext.Add(__TestNamespace_MyTagHelper);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperExecute_DesignTime_WritesNothing()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperExecuteIntermediateNode();
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperExecute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperExecute_Runtime_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperExecuteIntermediateNode();
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperExecute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+if (!__tagHelperExecutionContext.Output.IsContentModified)
+{
+    await __tagHelperExecutionContext.SetOutputContentAsync();
+}
+Write(__tagHelperExecutionContext.Output);
+__tagHelperExecutionContext = __tagHelperScopeManager.End();
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperHtmlAttribute_DesignTime_WritesNothing()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperHtmlAttributeIntermediateNode()
+            {
+                AttributeName = "name",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                Children =
+                {
+                    new HtmlAttributeValueIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "Blah-" } }
+                    },
+                    new CSharpCodeAttributeValueIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "\"Foo\"", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperHtmlAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"Render Children
+Render Children
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperHtmlAttribute_Runtime_SimpleAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperHtmlAttributeIntermediateNode()
+            {
+                AttributeName = "name",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                Children =
+                {
+                    new HtmlAttributeIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "\"value\"", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperHtmlAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"BeginWriteTagHelperAttribute();
+Render Children
+__tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+__tagHelperExecutionContext.AddHtmlAttribute(""name"", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperHtmlAttribute_Runtime_DynamicAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperHtmlAttributeIntermediateNode()
+            {
+                AttributeName = "name",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                Children =
+                {
+                    new HtmlAttributeValueIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "Blah-" } }
+                    },
+                    new CSharpCodeAttributeValueIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "\"Foo\"", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperHtmlAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"BeginAddHtmlAttributeValues(__tagHelperExecutionContext, ""name"", 2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+Render Children
+Render Children
+EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void RenderTagHelperAttributeInline_NonString_StatementInAttribute_Errors()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                IsIndexerNameMatch = false,
+            };
+            var expectedLocation = new SourceSpan(100, 10);
+            var expectedDiagnostic = RazorDiagnosticFactory.CreateTagHelper_CodeBlocksNotSupportedInAttributes(expectedLocation);
+
+            // Act
+            extension.RenderTagHelperAttributeInline(context, node, new CSharpCodeIntermediateNode(), expectedLocation);
+
+            // Assert
+            var diagnostic = Assert.Single(context.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RenderTagHelperAttributeInline_NonStringIndexerMatch_TemplateInAttribute_Errors()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                IsIndexerNameMatch = true,
+            };
+            var expectedLocation = new SourceSpan(100, 10);
+            var expectedDiagnostic = RazorDiagnosticFactory.CreateTagHelper_InlineMarkupBlocksNotSupportedInAttributes(expectedLocation, "System.Int32");
+
+            // Act
+            extension.RenderTagHelperAttributeInline(context, node, new TemplateIntermediateNode(), expectedLocation);
+
+            // Assert
+            var diagnostic = Assert.Single(context.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RenderTagHelperAttributeInline_NonString_TemplateInAttribute_Errors()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                IsIndexerNameMatch = false,
+            };
+            var expectedLocation = new SourceSpan(100, 10);
+            var expectedDiagnostic = RazorDiagnosticFactory.CreateTagHelper_InlineMarkupBlocksNotSupportedInAttributes(
+                expectedLocation,
+                "System.Collections.Generic.Dictionary<System.String, System.Int32>");
+
+            // Act
+            extension.RenderTagHelperAttributeInline(context, node, new TemplateIntermediateNode(), expectedLocation);
+
+            // Assert
+            var diagnostic = Assert.Single(context.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_DesignTime_StringProperty_HtmlContent_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "StringProp",
+                TagHelper = StringPropertyTagHelper,
+                Children =
+                {
+                    new HtmlContentIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "value", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"Render Children
+__InputTagHelper.StringProp = ""value"";
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact] // We don't actually assign the expression result at design time, we just use string.Empty as a placeholder.
+        public void WriteTagHelperProperty_DesignTime_StringProperty_NonHtmlContent_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "StringProp",
+                TagHelper = StringPropertyTagHelper,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "\"3+5\"", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"Render Children
+__InputTagHelper.StringProp = string.Empty;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_DesignTime_NonStringProperty_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "IntProp",
+                TagHelper = IntPropertyTagHelper,
+                Source = Span,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 3 ""test.cshtml""
+__InputTagHelper.IntProp = 32;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        // If a value is bound to multiple tag helpers, we want to make sure to only render the first
+        // occurrence of the expression due to side-effects.
+        [Fact]
+        public void WriteTagHelperProperty_DesignTime_NonStringProperty_SecondUseOfAttribute()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node1 = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                // We only look at the attribute name here.
+                AttributeName = "bound",
+                FieldName = "__OtherTagHelper",
+                PropertyName = "IntProp",
+            };
+            var node2 = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "IntProp",
+                TagHelper = IntPropertyTagHelper,
+                Source = Span,
+            };
+            tagHelperNode.Children.Add(node1);
+            tagHelperNode.Children.Add(node2);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node2);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__InputTagHelper.IntProp = __OtherTagHelper.IntProp;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_DesignTime_NonStringProperty_RendersCorrectly_WithoutLocation()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "IntProp",
+                TagHelper = IntPropertyTagHelper,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__InputTagHelper.IntProp = 32;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_DesignTime_NonStringIndexer_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "foo-bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = true,
+                PropertyName = "IntIndexer",
+                TagHelper = IntIndexerTagHelper,
+                Source = Span,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 3 ""test.cshtml""
+__InputTagHelper.IntIndexer[""bound""] = 32;
+
+#line default
+#line hidden
+#nullable disable
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_DesignTime_NonStringIndexer_RendersCorrectly_WithoutLocation()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "foo-bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = true,
+                PropertyName = "IntIndexer",
+                TagHelper = IntIndexerTagHelper,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__InputTagHelper.IntIndexer[""bound""] = 32;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_Runtime_StringProperty_HtmlContent_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "StringProp",
+                TagHelper = StringPropertyTagHelper,
+                Children =
+                {
+                    new HtmlContentIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "\"value\"", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+
+            // The attribute value is not rendered inline because we are not using the preallocated writer.
+            Assert.Equal(
+@"BeginWriteTagHelperAttribute();
+Render Children
+__tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+__InputTagHelper.StringProp = __tagHelperStringValueBuffer;
+__tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.StringProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_Runtime_NonStringProperty_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "IntProp",
+                TagHelper = IntPropertyTagHelper,
+                Source = Span,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                },
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 3 ""test.cshtml""
+__InputTagHelper.IntProp = 32;
+
+#line default
+#line hidden
+#nullable disable
+__tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.IntProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        // If a value is bound to multiple tag helpers, we want to make sure to only render the first
+        // occurrence of the expression due to side-effects.
+        [Fact]
+        public void WriteTagHelperProperty_Runtime_NonStringProperty_SecondUseOfAttribute()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node1 = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                // We only look at the attribute name here.
+                AttributeName = "bound",
+                FieldName = "__OtherTagHelper",
+                PropertyName = "IntProp",
+            };
+            var node2 = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "IntProp",
+                TagHelper = IntPropertyTagHelper,
+                Source = Span,
+            };
+            tagHelperNode.Children.Add(node1);
+            tagHelperNode.Children.Add(node2);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node2);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__InputTagHelper.IntProp = __OtherTagHelper.IntProp;
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_Runtime_NonStringProperty_RendersCorrectly_WithoutLocation()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = false,
+                PropertyName = "IntProp",
+                TagHelper = IntPropertyTagHelper,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__InputTagHelper.IntProp = 32;
+__tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.IntProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_Runtime_NonStringIndexer_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "foo-bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = true,
+                PropertyName = "IntIndexer",
+                TagHelper = IntIndexerTagHelper,
+                Source = Span,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"if (__InputTagHelper.IntIndexer == null)
+{
+    throw new InvalidOperationException(InvalidTagHelperIndexerAssignment(""foo-bound"", ""InputTagHelper"", ""IntIndexer""));
+}
+#nullable restore
+#line 3 ""test.cshtml""
+__InputTagHelper.IntIndexer[""bound""] = 32;
+
+#line default
+#line hidden
+#nullable disable
+__tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelper.IntIndexer[""bound""], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact] // We should only emit the validation code for the first use of an indexer property.
+        public void WriteTagHelperProperty_Runtime_NonStringIndexer_MultipleValues()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node1 = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "foo-first",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = true,
+                PropertyName = "IntIndexer",
+                TagHelper = IntIndexerTagHelper,
+                Source = Span,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "17", } },
+                    }
+                }
+            };
+            var node2 = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "foo-bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = true,
+                PropertyName = "IntIndexer",
+                TagHelper = IntIndexerTagHelper,
+                Source = Span,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node1);
+            tagHelperNode.Children.Add(node2);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node2);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"
+#nullable restore
+#line 3 ""test.cshtml""
+__InputTagHelper.IntIndexer[""bound""] = 32;
+
+#line default
+#line hidden
+#nullable disable
+__tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelper.IntIndexer[""bound""], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_Runtime_NonStringIndexer_RendersCorrectly_WithoutLocation()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new DefaultTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "foo-bound",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
+                FieldName = "__InputTagHelper",
+                IsIndexerNameMatch = true,
+                PropertyName = "IntIndexer",
+                TagHelper = IntIndexerTagHelper,
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                    {
+                        Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
+                    }
+                }
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"if (__InputTagHelper.IntIndexer == null)
+{
+    throw new InvalidOperationException(InvalidTagHelperIndexerAssignment(""foo-bound"", ""InputTagHelper"", ""IntIndexer""));
+}
+__InputTagHelper.IntIndexer[""bound""] = 32;
+__tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelper.IntIndexer[""bound""], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperRuntime_DesignTime_WritesNothing()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+            
+            var node = new DefaultTagHelperRuntimeIntermediateNode();
+
+            // Act
+            extension.WriteTagHelperRuntime(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperRuntime_Runtime_DeclaresRequiredFields()
+        {
+            // Arrange
+            var extension = new DefaultTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            
+            var node = new DefaultTagHelperRuntimeIntermediateNode();
+
+            // Act
+            extension.WriteTagHelperRuntime(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#line hidden
+#pragma warning disable 0169
+private string __tagHelperStringValueBuffer;
+#pragma warning restore 0169
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+{
+    get
+    {
+        if (__backed__tagHelperScopeManager == null)
+        {
+            __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+        }
+        return __backed__tagHelperScopeManager;
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void GetDeterministicId_IsDeterministic()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime(suppressUniqueIds: null);
+
+            // Act
+            var firstId = DefaultTagHelperTargetExtension.GetDeterministicId(context);
+            var secondId = DefaultTagHelperTargetExtension.GetDeterministicId(context);
+
+            // Assert
+            Assert.Equal(firstId, secondId);
+        }
+
+        private static void Push(CodeRenderingContext context, TagHelperIntermediateNode node)
+        {
+            ((DefaultCodeRenderingContext)context).AncestorsInternal.Push(node);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            var projectEngine = CreateProjectEngine();
+            return Lower(codeDocument, projectEngine);
+        }
+
+        private DocumentIntermediateNode LowerDesignTime(RazorCodeDocument codeDocument)
+        {
+            var projectEngine = RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new DesignTimeOptionsFeature(designTime: true));
+            });
+
+            return Lower(codeDocument, projectEngine);
+        }
+
+        private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine engine)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(irDocument);
+
+            return irDocument;
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BindAttribute(attributeBuilder);
+                }
+            }
+
+            builder.TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+
+        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private bool _designTime;
+
+            public DesignTimeOptionsFeature(bool designTime)
+            {
+                _designTime = designTime;
+            }
+
+            public int Order { get; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
new file mode 100644
index 0000000000..9dd60c6a4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
@@ -0,0 +1,247 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class DesignTimeDirectiveTargetExtensionTest
+    {
+        [Fact]
+        public void WriteDesignTimeDirective_NoChildren_WritesEmptyMethod_WithPragma()
+        {
+            // Arrange
+            var extension = new DesignTimeDirectiveTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new DesignTimeDirectiveIntermediateNode();
+
+            // Act
+            extension.WriteDesignTimeDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#pragma warning disable 219
+private void __RazorDirectiveTokenHelpers__() {
+}
+#pragma warning restore 219
+",
+                    csharp,
+                    ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDesignTimeDirective_WithTypeToken_WritesLambda()
+        {
+            // Arrange
+            var extension = new DesignTimeDirectiveTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new DesignTimeDirectiveIntermediateNode();
+            var token = new DirectiveTokenIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 5),
+                Content = "System.String",
+                DirectiveToken = DirectiveTokenDescriptor.CreateToken(DirectiveTokenKind.Type),
+            };
+            node.Children.Add(token);
+
+            // Act
+            extension.WriteDesignTimeDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#pragma warning disable 219
+private void __RazorDirectiveTokenHelpers__() {
+((System.Action)(() => {
+#nullable restore
+#line 1 ""test.cshtml""
+System.String __typeHelper = default(System.String);
+
+#line default
+#line hidden
+#nullable disable
+}
+))();
+}
+#pragma warning restore 219
+",
+                    csharp,
+                    ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDesignTimeDirective_WithNamespaceToken_WritesLambda()
+        {
+            // Arrange
+            var extension = new DesignTimeDirectiveTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new DesignTimeDirectiveIntermediateNode();
+            var token = new DirectiveTokenIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 5),
+                Content = "System.Collections.Generic",
+                DirectiveToken = DirectiveTokenDescriptor.CreateToken(DirectiveTokenKind.Namespace),
+            };
+            node.Children.Add(token);
+
+            // Act
+            extension.WriteDesignTimeDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#pragma warning disable 219
+private void __RazorDirectiveTokenHelpers__() {
+((System.Action)(() => {
+#nullable restore
+#line 1 ""test.cshtml""
+global::System.Object __typeHelper = nameof(System.Collections.Generic);
+
+#line default
+#line hidden
+#nullable disable
+}
+))();
+}
+#pragma warning restore 219
+",
+                    csharp,
+                    ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDesignTimeDirective_WithMemberToken_WritesLambda()
+        {
+            // Arrange
+            var extension = new DesignTimeDirectiveTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new DesignTimeDirectiveIntermediateNode();
+            var token = new DirectiveTokenIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 5),
+                Content = "Foo",
+                DirectiveToken = DirectiveTokenDescriptor.CreateToken(DirectiveTokenKind.Member),
+            };
+            node.Children.Add(token);
+
+            // Act
+            extension.WriteDesignTimeDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#pragma warning disable 219
+private void __RazorDirectiveTokenHelpers__() {
+((System.Action)(() => {
+#nullable restore
+#line 1 ""test.cshtml""
+global::System.Object Foo = null;
+
+#line default
+#line hidden
+#nullable disable
+}
+))();
+}
+#pragma warning restore 219
+",
+                    csharp,
+                    ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDesignTimeDirective_WithStringToken_WritesLambda()
+        {
+            // Arrange
+            var extension = new DesignTimeDirectiveTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new DesignTimeDirectiveIntermediateNode();
+            var token = new DirectiveTokenIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 5),
+                Content = "Value",
+                DirectiveToken = DirectiveTokenDescriptor.CreateToken(DirectiveTokenKind.String),
+            };
+            var tokenWithQuotedContent = new DirectiveTokenIntermediateNode()
+            {
+                Source = new SourceSpan("test.cshtml", 0, 0, 0, 5),
+                Content = "\"Value\"",
+                DirectiveToken = DirectiveTokenDescriptor.CreateToken(DirectiveTokenKind.String),
+            };
+            node.Children.Add(token);
+            node.Children.Add(tokenWithQuotedContent);
+
+            // Act
+            extension.WriteDesignTimeDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#pragma warning disable 219
+private void __RazorDirectiveTokenHelpers__() {
+((System.Action)(() => {
+#nullable restore
+#line 1 ""test.cshtml""
+global::System.Object __typeHelper = ""Value"";
+
+#line default
+#line hidden
+#nullable disable
+}
+))();
+((System.Action)(() => {
+#nullable restore
+#line 1 ""test.cshtml""
+global::System.Object __typeHelper = ""Value"";
+
+#line default
+#line hidden
+#nullable disable
+}
+))();
+}
+#pragma warning restore 219
+",
+                    csharp,
+                    ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteDesignTimeDirective_ChildrenWithNoSource_WritesEmptyMethod_WithPragma()
+        {
+            // Arrange
+            var extension = new DesignTimeDirectiveTargetExtension();
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            var node = new DesignTimeDirectiveIntermediateNode();
+            var token = new DirectiveTokenIntermediateNode()
+            {
+                Content = "Value",
+                DirectiveToken = DirectiveTokenDescriptor.CreateToken(DirectiveTokenKind.String),
+            };
+            node.Children.Add(token);
+
+            // Act
+            extension.WriteDesignTimeDirective(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"#pragma warning disable 219
+private void __RazorDirectiveTokenHelpers__() {
+}
+#pragma warning restore 219
+",
+                    csharp,
+                    ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
new file mode 100644
index 0000000000..712766a5f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
@@ -0,0 +1,98 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class FunctionsDirectivePassTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void Execute_SkipsDocumentWithNoClassNode()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var pass = new FunctionsDirectivePass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("@functions { var value = true; }");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode();
+            irDocument.Children.Add(new DirectiveIntermediateNode() { Directive = FunctionsDirective.Directive, });
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<DirectiveIntermediateNode>(node));
+        }
+
+        [Fact]
+        public void Execute_AddsStatementsToClassLevel()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var pass = new FunctionsDirectivePass()
+            {
+                Engine = projectEngine.Engine,
+            };
+            
+            var sourceDocument = TestRazorSourceDocument.Create("@functions { var value = true; }");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = Lower(codeDocument, projectEngine);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+
+            var @namespace = irDocument.Children[0];
+            Children(
+                @namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+
+            var @class = @namespace.Children[0];
+            Children(
+                @class,
+                node => Assert.IsType<MethodDeclarationIntermediateNode>(node),
+                node => CSharpCode(" var value = true; ", node));
+
+            var method = @class.Children[0];
+            Children(
+                method,
+                node => Assert.IsType<DirectiveIntermediateNode>(node));
+        }
+
+        private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(irDocument);
+
+            return irDocument;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/InheritsDirectivePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/InheritsDirectivePassTest.cs
new file mode 100644
index 0000000000..e851990b80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/InheritsDirectivePassTest.cs
@@ -0,0 +1,91 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class InheritsDirectivePassTest : RazorProjectEngineTestBase
+    {
+        protected override RazorLanguageVersion Version => RazorLanguageVersion.Latest;
+
+        [Fact]
+        public void Execute_SkipsDocumentWithNoClassNode()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new InheritsDirectivePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("@inherits Hello<World[]>");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode();
+            irDocument.Children.Add(new DirectiveIntermediateNode() { Directive = FunctionsDirective.Directive, });
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<DirectiveIntermediateNode>(node));
+        }
+
+        [Fact]
+        public void Execute_Inherits_SetsClassDeclarationBaseType()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new InheritsDirectivePass()
+            {
+                Engine = engine,
+            };
+
+            var content = "@inherits Hello<World[]>";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = Lower(codeDocument, engine);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+
+            var @namespace = irDocument.Children[0];
+            Children(
+                @namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+
+            var @class = (ClassDeclarationIntermediateNode)@namespace.Children[0];
+            Assert.Equal("Hello<World[]>", @class.BaseType);
+        }
+
+        private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorEngine engine)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(irDocument);
+
+            return irDocument;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributePassTest.cs
new file mode 100644
index 0000000000..db50c00268
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributePassTest.cs
@@ -0,0 +1,392 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class MetadataAttributePassTest
+    {
+        [Fact]
+        public void Execute_NullCodeGenerationOptions_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode();
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            NoChildren(irDocument);
+        }
+
+        [Fact]
+        public void Execute_SuppressMetadataAttributes_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(o =>
+                {
+                    o.SuppressMetadataAttributes = true;
+                }),
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            NoChildren(irDocument);
+        }
+
+        [Fact]
+        public void Execute_ComponentDocumentKind_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = ComponentDocumentClassifierPass.ComponentDocumentKind,
+                Options = RazorCodeGenerationOptions.Create(o =>
+                {
+                    o.SuppressMetadataAttributes = true;
+                }),
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            NoChildren(irDocument);
+        }
+
+        [Fact]
+        public void Execute_NoNamespaceSet_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+                Options = RazorCodeGenerationOptions.Create((o) => { }),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+                ClassName = "Test",
+            };
+            builder.Add(@class);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            SingleChild<NamespaceDeclarationIntermediateNode>(irDocument);
+        }
+
+        [Fact]
+        public void Execute_NoClassNameSet_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+                Options = RazorCodeGenerationOptions.Create((o) => { }),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+                Content = "Some.Namespace"
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            SingleChild<NamespaceDeclarationIntermediateNode>(irDocument);
+        }
+
+        [Fact]
+        public void Execute_NoDocumentKind_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+                Content = "Some.Namespace"
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+                ClassName = "Test",
+            };
+            builder.Add(@class);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            SingleChild<NamespaceDeclarationIntermediateNode>(irDocument);
+        }
+
+        [Fact]
+        public void Execute_NoIdentifier_Noops()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("", new RazorSourceDocumentProperties(null, null));
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+                Options = RazorCodeGenerationOptions.Create((o) => { }),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+                Content = "Some.Namespace"
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+                ClassName = "Test",
+            };
+            builder.Add(@class);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            SingleChild<NamespaceDeclarationIntermediateNode>(irDocument);
+        }
+
+        [Fact]
+        public void Execute_HasRequiredInfo_AddsItemAndSourceChecksum()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("", new RazorSourceDocumentProperties(null, "Foo\\Bar.cshtml"));
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+                Options = RazorCodeGenerationOptions.Create((o) => { }),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+                Content = "Some.Namespace"
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+                ClassName = "Test",
+            };
+            builder.Add(@class);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal(2, irDocument.Children.Count);
+
+            var item = Assert.IsType<RazorCompiledItemAttributeIntermediateNode>(irDocument.Children[0]);
+            Assert.Equal("/Foo/Bar.cshtml", item.Identifier);
+            Assert.Equal("test", item.Kind);
+            Assert.Equal("Some.Namespace.Test", item.TypeName);
+
+            Assert.Equal(2, @namespace.Children.Count);
+            var checksum = Assert.IsType<RazorSourceChecksumAttributeIntermediateNode>(@namespace.Children[0]);
+            Assert.NotNull(checksum.Checksum); // Not verifying the checksum here
+            Assert.Equal("SHA1", checksum.ChecksumAlgorithm);
+            Assert.Equal("/Foo/Bar.cshtml", checksum.Identifier);
+        }
+
+        [Fact]
+        public void Execute_HasRequiredInfo_AndImport_AddsItemAndSourceChecksum()
+        {
+            // Arrange
+            var engine = CreateEngine();
+            var pass = new MetadataAttributePass()
+            {
+                Engine = engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("", new RazorSourceDocumentProperties(null, "Foo\\Bar.cshtml"));
+            var import = TestRazorSourceDocument.Create("@using System", new RazorSourceDocumentProperties(null, "Foo\\Import.cshtml"));
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { import, });
+
+            var irDocument = new DocumentIntermediateNode()
+            {
+                DocumentKind = "test",
+                Options = RazorCodeGenerationOptions.Create((o) => { }),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+                Content = "Some.Namespace"
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+                ClassName = "Test",
+            };
+            builder.Add(@class);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal(2, irDocument.Children.Count);
+
+            var item = Assert.IsType<RazorCompiledItemAttributeIntermediateNode>(irDocument.Children[0]);
+            Assert.Equal("/Foo/Bar.cshtml", item.Identifier);
+            Assert.Equal("test", item.Kind);
+            Assert.Equal("Some.Namespace.Test", item.TypeName);
+
+            Assert.Equal(3, @namespace.Children.Count);
+            var checksum = Assert.IsType<RazorSourceChecksumAttributeIntermediateNode>(@namespace.Children[0]);
+            Assert.NotNull(checksum.Checksum); // Not verifying the checksum here
+            Assert.Equal("SHA1", checksum.ChecksumAlgorithm);
+            Assert.Equal("/Foo/Bar.cshtml", checksum.Identifier);
+
+            checksum = Assert.IsType<RazorSourceChecksumAttributeIntermediateNode>(@namespace.Children[1]);
+            Assert.NotNull(checksum.Checksum); // Not verifying the checksum here
+            Assert.Equal("SHA1", checksum.ChecksumAlgorithm);
+            Assert.Equal("/Foo/Import.cshtml", checksum.Identifier);
+        }
+
+        private static RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new DefaultMetadataIdentifierFeature());
+            }).Engine;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributeTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributeTargetExtensionTest.cs
new file mode 100644
index 0000000000..faeaf4d662
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/MetadataAttributeTargetExtensionTest.cs
@@ -0,0 +1,123 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class MetadataAttributeTargetExtensionTest
+    {
+        [Fact]
+        public void WriteRazorCompiledItemAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new MetadataAttributeTargetExtension()
+            {
+                CompiledItemAttributeName = "global::TestItem",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new RazorCompiledItemAttributeIntermediateNode()
+            {
+                TypeName = "Foo.Bar",
+                Kind = "test",
+                Identifier = "Foo/Bar",
+            };
+
+            // Act
+            extension.WriteRazorCompiledItemAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"[assembly: global::TestItem(typeof(Foo.Bar), @""test"", @""Foo/Bar"")]
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteRazorSourceChecksumAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new MetadataAttributeTargetExtension()
+            {
+                SourceChecksumAttributeName = "global::TestChecksum",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new RazorSourceChecksumAttributeIntermediateNode()
+            {
+                ChecksumAlgorithm = "SHA1",
+                Checksum = new byte[] { (byte)'t', (byte)'e', (byte)'s', (byte)'t', },
+                Identifier = "Foo/Bar",
+            };
+
+            // Act
+            extension.WriteRazorSourceChecksumAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"[global::TestChecksum(@""SHA1"", @""74657374"", @""Foo/Bar"")]
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteRazorCompiledItemAttributeMetadata_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new MetadataAttributeTargetExtension()
+            {
+                CompiledItemMetadataAttributeName = "global::TestItemMetadata",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new RazorCompiledItemMetadataAttributeIntermediateNode
+            {
+                Key = "key",
+                Value = "value",
+            };
+
+            // Act
+            extension.WriteRazorCompiledItemMetadataAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode().Trim();
+            Assert.Equal(
+"[global::TestItemMetadata(\"key\", \"value\")]",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteRazorCompiledItemAttributeMetadata_EscapesKeysAndValuesCorrectly()
+        {
+            // Arrange
+            var extension = new MetadataAttributeTargetExtension()
+            {
+                CompiledItemMetadataAttributeName = "global::TestItemMetadata",
+            };
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new RazorCompiledItemMetadataAttributeIntermediateNode
+            {
+                Key = "\"test\" key",
+                Value = @"""test"" value",
+            };
+
+            // Act
+            extension.WriteRazorCompiledItemMetadataAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode().Trim();
+            Assert.Equal(
+"[global::TestItemMetadata(\"\\\"test\\\" key\", \"\\\"test\\\" value\")]",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs
new file mode 100644
index 0000000000..da2f960847
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs
@@ -0,0 +1,276 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class PreallocatedAttributeTargetExtensionTest
+    {
+        [Fact]
+        public void WriteTagHelperHtmlAttributeValue_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new PreallocatedTagHelperHtmlAttributeValueIntermediateNode()
+            {
+                AttributeName = "Foo",
+                Value = "Bar",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                VariableName = "MyProp"
+            };
+
+            // Act
+            extension.WriteTagHelperHtmlAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute MyProp = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute(""Foo"", new global::Microsoft.AspNetCore.Html.HtmlString(""Bar""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperHtmlAttributeValue_Minimized_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var node = new PreallocatedTagHelperHtmlAttributeValueIntermediateNode()
+            {
+                AttributeName = "Foo",
+                Value = "Bar",
+                AttributeStructure = AttributeStructure.Minimized,
+                VariableName = "_tagHelper1"
+            };
+
+            // Act
+            extension.WriteTagHelperHtmlAttributeValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute _tagHelper1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute(""Foo"");
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperHtmlAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new PreallocatedTagHelperHtmlAttributeIntermediateNode()
+            {
+                VariableName = "_tagHelper1"
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperHtmlAttribute(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__tagHelperExecutionContext.AddHtmlAttribute(_tagHelper1);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperPropertyValue_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            
+            var node = new PreallocatedTagHelperPropertyValueIntermediateNode()
+            {
+                AttributeName = "Foo",
+                Value = "Bar",
+                AttributeStructure = AttributeStructure.DoubleQuotes,
+                VariableName = "_tagHelper1",
+            };
+
+            // Act
+            extension.WriteTagHelperPropertyValue(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute _tagHelper1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute(""Foo"", ""Bar"", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteTagHelperProperty_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "FooTagHelper", "Test");
+            tagHelperBuilder.TypeName("FooTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("Foo")
+                .TypeName("System.String")
+                .PropertyName("FooProp");
+
+            var descriptor = builder.Build();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new PreallocatedTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = descriptor.Name,
+                BoundAttribute = descriptor,
+                FieldName = "__FooTagHelper",
+                PropertyName = "FooProp",
+                VariableName = "_tagHelper1",
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__FooTagHelper.FooProp = (string)_tagHelper1.Value;
+__tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteSetPreallocatedTagHelperProperty_IndexerAttribute_RendersCorrectly()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "FooTagHelper", "Test");
+            tagHelperBuilder.TypeName("FooTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("Foo")
+                .TypeName("System.Collections.Generic.Dictionary<System.String, System.String>")
+                .AsDictionaryAttribute("pre-", "System.String")
+                .PropertyName("FooProp");
+
+            var descriptor = builder.Build();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node = new PreallocatedTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "pre-Foo",
+                FieldName = "__FooTagHelper",
+                VariableName = "_tagHelper1",
+                BoundAttribute = descriptor,
+                IsIndexerNameMatch = true,
+                PropertyName = "FooProp",
+                TagHelper = tagHelperBuilder.Build(),
+            };
+            tagHelperNode.Children.Add(node);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"if (__FooTagHelper.FooProp == null)
+{
+    throw new InvalidOperationException(InvalidTagHelperIndexerAssignment(""pre-Foo"", ""FooTagHelper"", ""FooProp""));
+}
+__FooTagHelper.FooProp[""Foo""] = (string)_tagHelper1.Value;
+__tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteSetPreallocatedTagHelperProperty_IndexerAttribute_MultipleValues()
+        {
+            // Arrange
+            var extension = new PreallocatedAttributeTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "FooTagHelper", "Test");
+            tagHelperBuilder.TypeName("FooTagHelper");
+
+            var builder = new DefaultBoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+            builder
+                .Name("Foo")
+                .TypeName("System.Collections.Generic.Dictionary<System.String, System.String>")
+                .AsDictionaryAttribute("pre-", "System.String")
+                .PropertyName("FooProp");
+
+            var boundAttribute = builder.Build();
+            var tagHelper = tagHelperBuilder.Build();
+
+            var tagHelperNode = new TagHelperIntermediateNode();
+            var node1 = new PreallocatedTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "pre-Bar",
+                FieldName = "__FooTagHelper",
+                VariableName = "_tagHelper0s",
+                BoundAttribute = boundAttribute,
+                IsIndexerNameMatch = true,
+                PropertyName = "FooProp",
+                TagHelper = tagHelper,
+            };
+            var node2 = new PreallocatedTagHelperPropertyIntermediateNode()
+            {
+                AttributeName = "pre-Foo",
+                FieldName = "__FooTagHelper",
+                VariableName = "_tagHelper1",
+                BoundAttribute = boundAttribute,
+                IsIndexerNameMatch = true,
+                PropertyName = "FooProp",
+                TagHelper = tagHelper,
+            };
+            tagHelperNode.Children.Add(node1);
+            tagHelperNode.Children.Add(node2);
+            Push(context, tagHelperNode);
+
+            // Act
+            extension.WriteTagHelperProperty(context, node2);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+@"__FooTagHelper.FooProp[""Foo""] = (string)_tagHelper1.Value;
+__tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1);
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        private static void Push(CodeRenderingContext context, TagHelperIntermediateNode node)
+        {
+            ((DefaultCodeRenderingContext)context).AncestorsInternal.Push(node);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionDirectivePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionDirectivePassTest.cs
new file mode 100644
index 0000000000..a2f747e7a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionDirectivePassTest.cs
@@ -0,0 +1,106 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class SectionDirectivePassTest
+    {
+        [Fact]
+        public void Execute_SkipsDocumentWithNoClassNode()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var pass = new SectionDirectivePass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("@section Header { <p>Hello World</p> }");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = new DocumentIntermediateNode();
+            irDocument.Children.Add(new DirectiveIntermediateNode() { Directive = SectionDirective.Directive, });
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<DirectiveIntermediateNode>(node));
+        }
+
+        [Fact]
+        public void Execute_WrapsStatementInSectionNode()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var pass = new SectionDirectivePass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var content = "@section Header { <p>Hello World</p> }";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            var irDocument = Lower(codeDocument, projectEngine);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+
+            var @namespace = irDocument.Children[0];
+            Children(
+                @namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+
+            var @class = @namespace.Children[0];
+            var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
+
+            Children(
+                method,
+                node => Assert.IsType<DirectiveIntermediateNode>(node),
+                node => Assert.IsType<SectionIntermediateNode>(node));
+
+            var section = method.Children[1] as SectionIntermediateNode;
+            Assert.Equal("Header", section.SectionName);
+            Children(section, c => Html(" <p>Hello World</p> ", c));
+        }
+
+        private static RazorProjectEngine CreateProjectEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                SectionDirective.Register(b);
+            });
+        }
+
+        private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            Assert.NotNull(irDocument);
+
+            return irDocument;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionTargetExtensionTest.cs
new file mode 100644
index 0000000000..16288b3117
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/SectionTargetExtensionTest.cs
@@ -0,0 +1,80 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class SectionTargetExtensionTest
+    {
+        [Fact]
+        public void WriteSection_WritesSectionCode()
+        {
+            // Arrange
+            var node = new SectionIntermediateNode()
+            {
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode(),
+                },
+                SectionName = "MySection"
+            };
+
+            var extension = new SectionTargetExtension()
+            {
+                SectionMethodName = "CreateSection"
+            };
+
+            var context = TestCodeRenderingContext.CreateRuntime();
+
+            // Act
+            extension.WriteSection(context, node);
+
+            // Assert
+            var expected = @"CreateSection(""MySection"", async() => {
+    Render Children
+}
+);
+";
+
+            var output = context.CodeWriter.GenerateCode();
+            Assert.Equal(expected, output);
+        }
+
+        [Fact]
+        public void WriteSection_WritesSectionCode_DesignTime()
+        {
+            // Arrange
+            var node = new SectionIntermediateNode()
+            {
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode(),
+                },
+                SectionName = "MySection"
+            };
+
+            var extension = new SectionTargetExtension()
+            {
+                SectionMethodName = "CreateSection"
+            };
+
+            var context = TestCodeRenderingContext.CreateDesignTime();
+
+            // Act
+            extension.WriteSection(context, node);
+
+            // Assert
+            var expected = @"CreateSection(""MySection"", async(__razor_section_writer) => {
+    Render Children
+}
+);
+";
+
+            var output = context.CodeWriter.GenerateCode();
+            Assert.Equal(expected, output);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/TemplateTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/TemplateTargetExtensionTest.cs
new file mode 100644
index 0000000000..b24d6f5174
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/TemplateTargetExtensionTest.cs
@@ -0,0 +1,51 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public class TemplateTargetExtensionTest
+    {
+        [Fact]
+        public void WriteTemplate_WritesTemplateCode()
+        {
+            // Arrange
+            var node = new TemplateIntermediateNode()
+            {
+                Children =
+                {
+                    new CSharpExpressionIntermediateNode()
+                }
+            };
+            var extension = new TemplateTargetExtension()
+            {
+                TemplateTypeName = "global::TestTemplate"
+            };
+            
+            var nodeWriter = new RuntimeNodeWriter()
+            {
+                PushWriterMethod = "TestPushWriter",
+                PopWriterMethod = "TestPopWriter"
+            };
+
+            var context = TestCodeRenderingContext.CreateRuntime(nodeWriter: nodeWriter);
+
+            // Act
+            extension.WriteTemplate(context, node);
+
+            // Assert
+            var expected = @"item => new global::TestTemplate(async(__razor_template_writer) => {
+    TestPushWriter(__razor_template_writer);
+    Render Children
+    TestPopWriter();
+}
+)";
+
+            var output = context.CodeWriter.GenerateCode();
+            Assert.Equal(expected, output);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlConventionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlConventionsTest.cs
new file mode 100644
index 0000000000..e1020bb81c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlConventionsTest.cs
@@ -0,0 +1,39 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class HtmlConventionsTest
+    {
+        public static TheoryData HtmlConversionData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    { "SomeThing", "some-thing" },
+                    { "someOtherThing", "some-other-thing" },
+                    { "capsONInside", "caps-on-inside" },
+                    { "CAPSOnOUTSIDE", "caps-on-outside" },
+                    { "ALLCAPS", "allcaps" },
+                    { "One1Two2Three3", "one1-two2-three3" },
+                    { "ONE1TWO2THREE3", "one1two2three3" },
+                    { "First_Second_ThirdHi", "first_second_third-hi" }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlConversionData))]
+        public void ToHtmlCase_ReturnsExpectedConversions(string input, string expectedOutput)
+        {
+            // Arrange, Act
+            var output = HtmlConventions.ToHtmlCase(input);
+
+            // Assert
+            Assert.Equal(output, expectedOutput);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlNodeOptimizationPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlNodeOptimizationPassTest.cs
new file mode 100644
index 0000000000..bf08903e5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/HtmlNodeOptimizationPassTest.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class HtmlNodeOptimizationPassTest
+    {
+        [Fact]
+        public void Execute_RewritesWhitespace()
+        {
+            // Assert
+            var content = Environment.NewLine + "    @true";
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
+            var pass = new HtmlNodeOptimizationPass();
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+            // Act
+            var outputTree = pass.Execute(codeDocument, originalTree);
+
+            // Assert
+            var document = Assert.IsType<RazorDocumentSyntax>(outputTree.Root);
+            var block = Assert.IsType<MarkupBlockSyntax>(document.Document);
+            Assert.Equal(4, block.Children.Count);
+            var whitespace = Assert.IsType<MarkupTextLiteralSyntax>(block.Children[1]);
+            Assert.True(whitespace.GetContent().All(char.IsWhiteSpace));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/BasicIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/BasicIntegrationTest.cs
new file mode 100644
index 0000000000..9ae793d5a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/BasicIntegrationTest.cs
@@ -0,0 +1,57 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class BasicIntegrationTest : IntegrationTestBase
+    {
+        [Fact]
+        public void Empty()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+        }
+
+        [Fact]
+        public void HelloWorld()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine();
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+        }
+
+        [Fact]
+        public void CustomDirective()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(b =>
+            {
+                b.AddDirective(DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine));
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
new file mode 100644
index 0000000000..5faa8cfbbc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -0,0 +1,1065 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class CodeGenerationIntegrationTest : IntegrationTestBase
+    {
+        public CodeGenerationIntegrationTest()
+            : base(generateBaselines: null)
+        {
+        }
+
+        #region Runtime
+        [Fact]
+        public void CSharp8_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void IncompleteDirectives_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void CSharp7_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void UnfinishedExpressionInCode_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Templates_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Markup_InCodeBlocks_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Markup_InCodeBlocksWithTagHelper_Runtime()
+        {
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void StringLiterals_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void SimpleUnspacedIf_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Sections_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void RazorComments_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ParserError_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void OpenedIf_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void NullConditionalExpressions_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void NoLinePragmas_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void NestedCSharp_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void NestedCodeBlocks_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void MarkupInCodeBlock_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Instrumented_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void InlineBlocks_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Inherits_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Usings_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ImplicitExpressionAtEOF_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ImplicitExpression_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void HtmlCommentWithQuote_Double_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void HtmlCommentWithQuote_Single_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void HiddenSpansInCode_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void FunctionsBlock_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void FunctionsBlockMinimal_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ExpressionsInCode_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ExplicitExpressionWithMarkup_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ExplicitExpressionAtEOF_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ExplicitExpression_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void EmptyImplicitExpressionInCode_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void EmptyImplicitExpression_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void EmptyExplicitExpression_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void EmptyCodeBlock_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void ConditionalAttributes_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void CodeBlockWithTextElement_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void CodeBlockAtEOF_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void CodeBlock_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Blocks_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Await_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void Tags_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        [Fact]
+        public void SimpleTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithBoundAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithPrefix_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void NestedTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void SingleTagHelper_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void SingleTagHelperWithNewlineBeforeAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithWeirdlySpacedAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void IncompleteTagHelper_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void BasicTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void BasicTagHelpers_Prefixed_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void BasicTagHelpers_RemoveTagHelper_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void CssSelectorTagHelperAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.CssSelectorTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void ComplexTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void EmptyAttributeTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void EscapedTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void DuplicateTargetTagHelper_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DuplicateTargetTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void AttributeTargetingTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.AttributeTargetingTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void PrefixedAttributeTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.PrefixedAttributeTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void DuplicateAttributeTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void DynamicAttributeTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DynamicAttributeTagHelpers_Descriptors);
+        }
+
+        [Fact]
+        public void TransitionsInTagHelperAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void MinimizedTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.MinimizedTagHelpers_Descriptors);
+        }
+
+        [Fact]
+        public void NestedScriptTagTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SymbolBoundTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void EnumTagHelpers_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.EnumTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersInSection_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.TagHelpersInSectionDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithTemplate_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithDataDashAttributes_Runtime()
+        {
+            // Arrange, Act & Assert
+            RunRuntimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void Implements_Runtime()
+        {
+            RunTimeTest();
+        }
+
+        #endregion
+
+        #region DesignTime
+        [Fact]
+        public void CSharp8_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void IncompleteDirectives_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void CSharp7_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void UnfinishedExpressionInCode_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Templates_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Markup_InCodeBlocks_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Markup_InCodeBlocksWithTagHelper_DesignTime()
+        {
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void StringLiterals_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void SimpleUnspacedIf_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Sections_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void RazorComments_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ParserError_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void OpenedIf_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void NullConditionalExpressions_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void NoLinePragmas_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void NestedCSharp_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void NestedCodeBlocks_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void MarkupInCodeBlock_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Instrumented_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void InlineBlocks_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Inherits_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Usings_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ImplicitExpressionAtEOF_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ImplicitExpression_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void HtmlCommentWithQuote_Double_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void HtmlCommentWithQuote_Single_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void HiddenSpansInCode_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void FunctionsBlock_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void FunctionsBlockMinimal_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ExpressionsInCode_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ExplicitExpressionWithMarkup_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ExplicitExpressionAtEOF_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ExplicitExpression_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void EmptyImplicitExpressionInCode_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void EmptyImplicitExpression_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void EmptyExplicitExpression_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void EmptyCodeBlock_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void DesignTime_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void ConditionalAttributes_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void CodeBlockWithTextElement_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void CodeBlockAtEOF_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void CodeBlock_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Blocks_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Await_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void Tags_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        [Fact]
+        public void SimpleTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithBoundAttributes_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithPrefix_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void NestedTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void SingleTagHelper_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void SingleTagHelperWithNewlineBeforeAttributes_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithWeirdlySpacedAttributes_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void IncompleteTagHelper_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void BasicTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void BasicTagHelpers_Prefixed_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void ComplexTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void EmptyAttributeTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void EscapedTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void DuplicateTargetTagHelper_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DuplicateTargetTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void AttributeTargetingTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.AttributeTargetingTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void PrefixedAttributeTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.PrefixedAttributeTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void DuplicateAttributeTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void DynamicAttributeTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DynamicAttributeTagHelpers_Descriptors);
+        }
+
+        [Fact]
+        public void TransitionsInTagHelperAttributes_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void MinimizedTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.MinimizedTagHelpers_Descriptors);
+        }
+
+        [Fact]
+        public void NestedScriptTagTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SymbolBoundTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void EnumTagHelpers_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.EnumTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersInSection_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.TagHelpersInSectionDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithTemplate_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void TagHelpersWithDataDashAttributes_DesignTime()
+        {
+            // Arrange, Act & Assert
+            RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.SimpleTagHelperDescriptors);
+        }
+
+        [Fact]
+        public void Implements_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
+        #endregion
+
+        private void DesignTimeTest()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(builder => 
+            {
+                builder.ConfigureDocumentClassifier();
+
+                // Some of these tests use templates
+                builder.AddTargetExtension(new TemplateTargetExtension());
+                
+                SectionDirective.Register(builder);
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(codeDocument);
+        }
+
+        private void RunTimeTest()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(builder =>
+            {
+                builder.ConfigureDocumentClassifier();
+
+                // Some of these tests use templates
+                builder.AddTargetExtension(new TemplateTargetExtension());
+                
+                SectionDirective.Register(builder);
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+        }
+
+        private void RunRuntimeTagHelpersTest(IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(builder =>
+            {
+                builder.ConfigureDocumentClassifier();
+
+                // Some of these tests use templates
+                builder.AddTargetExtension(new TemplateTargetExtension());
+
+                SectionDirective.Register(builder);
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+            var imports = GetImports(projectEngine, projectItem);
+
+            // Act
+            var codeDocument = projectEngine.Process(RazorSourceDocument.ReadFrom(projectItem), FileKinds.Legacy, imports, descriptors.ToList());
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+        }
+
+        private void RunDesignTimeTagHelpersTest(IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(builder =>
+            {
+                builder.ConfigureDocumentClassifier();
+
+                // Some of these tests use templates
+                builder.AddTargetExtension(new TemplateTargetExtension());
+
+                SectionDirective.Register(builder);
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+            var imports = GetImports(projectEngine, projectItem);
+
+            // Act
+            var codeDocument = projectEngine.ProcessDesignTime(RazorSourceDocument.ReadFrom(projectItem), FileKinds.Legacy, imports, descriptors.ToList());
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(codeDocument);
+        }
+
+        private static IReadOnlyList<RazorSourceDocument> GetImports(RazorProjectEngine projectEngine, RazorProjectItem projectItem)
+        {
+            var importFeatures = projectEngine.ProjectFeatures.OfType<IImportProjectFeature>();
+            var importItems = importFeatures.SelectMany(f => f.GetImports(projectItem));
+            var importSourceDocuments = importItems.Where(i => i.Exists).Select(i => RazorSourceDocument.ReadFrom(i)).ToList();
+
+            return importSourceDocuments;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
new file mode 100644
index 0000000000..bfbda33a7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
@@ -0,0 +1,96 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Components;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentBindIntegrationTest : RazorIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool UseTwoPhaseCompilation => true;
+
+        [Fact]
+        public void BindDuplicates_ReportsDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue2"", ""myevent2"")]
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+
+            // Act
+            var result = CompileToCSharp(@"
+<div bind-value=""@ParentValue"" />
+@functions {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            var diagnostic = Assert.Single(result.Diagnostics);
+            Assert.Equal("RZ9989", diagnostic.Id);
+            Assert.Equal(
+                "The attribute 'bind-value' was matched by multiple bind attributes. Duplicates:" + Environment.NewLine +
+                "Test.BindAttributes" + Environment.NewLine +
+                "Test.BindAttributes",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void BindFallback_InvalidSyntax_TooManyParts()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind-first-second-third=""Text"" />
+@functions {
+    public string Text { get; set; } = ""text"";
+}");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9991", diagnostic.Id);
+        }
+
+        [Fact]
+        public void BindFallback_InvalidSyntax_TrailingDash()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind-first-=""Text"" />
+@functions {
+    public string Text { get; set; } = ""text"";
+}");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9991", diagnostic.Id);
+        }
+
+        [Fact]
+        public void Bind_InvalidUseOfDirective_DoesNotThrow()
+        {
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind=""@page"" />
+@functions {
+    public string page { get; set; } = ""text"";
+}");
+
+            // Assert
+            Assert.Collection(
+                generated.Diagnostics,
+                d => Assert.Equal("RZ2005", d.Id),
+                d => Assert.Equal("RZ1011", d.Id));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
new file mode 100644
index 0000000000..7a3c4c098d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
@@ -0,0 +1,249 @@
+// 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 Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentChildContentIntegrationTest : RazorIntegrationTestBase
+    {
+        private readonly CSharpSyntaxTree RenderChildContentComponent = Parse(@"
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+namespace Test
+{
+    public class RenderChildContent : ComponentBase
+    {
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, ChildContent);
+        }
+
+        [Parameter]
+        RenderFragment ChildContent { get; set; }
+    }
+}
+");
+
+        private readonly CSharpSyntaxTree RenderChildContentStringComponent = Parse(@"
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+namespace Test
+{
+    public class RenderChildContentString : ComponentBase
+    {
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, ChildContent, Value);
+        }
+
+        [Parameter]
+        RenderFragment<string> ChildContent { get; set; }
+
+        [Parameter]
+        string Value { get; set; }
+    }
+}
+");
+
+        private readonly CSharpSyntaxTree RenderMultipleChildContent = Parse(@"
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+namespace Test
+{
+    public class RenderMultipleChildContent : ComponentBase
+    {
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, Header, Name);
+            builder.AddContent(1, ChildContent, Value);
+            builder.AddContent(2, Footer);
+        }
+
+        [Parameter]
+        string Name { get; set; }
+
+        [Parameter]
+        RenderFragment<string> Header { get; set; }
+
+        [Parameter]
+        RenderFragment<string> ChildContent { get; set; }
+
+        [Parameter]
+        RenderFragment Footer { get; set; }
+
+        [Parameter]
+        string Value { get; set; }
+    }
+}
+");
+
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool UseTwoPhaseCompilation => true;
+
+        [Fact]
+        public void ChildContent_AttributeAndBody_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment<string> template = @<div>@context.ToLowerInvariant()</div>; }
+<RenderChildContent ChildContent=""@template.WithValue(""HI"")"">
+Some Content
+</RenderChildContent>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentSetByAttributeAndBody.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void ChildContent_AttributeAndExplicitChildContent_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment<string> template = @<div>@context.ToLowerInvariant()</div>; }
+<RenderChildContent ChildContent=""@template.WithValue(""HI"")"">
+<ChildContent>
+Some Content
+</ChildContent>
+</RenderChildContent>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentSetByAttributeAndBody.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void ChildContent_ExplicitChildContent_UnrecogizedContent_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContent>
+<ChildContent>
+</ChildContent>
+@somethingElse
+</RenderChildContent>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentMixedWithExplicitChildContent.Id, diagnostic.Id);
+            Assert.Equal(
+                "Unrecognized child content inside component 'RenderChildContent'. The component 'RenderChildContent' accepts " +
+                "child content through the following top-level items: 'ChildContent'.",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void ChildContent_ExplicitChildContent_UnrecogizedElement_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContent>
+<ChildContent>
+</ChildContent>
+<UnrecognizedChildContent></UnrecognizedChildContent>
+</RenderChildContent>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentMixedWithExplicitChildContent.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void ChildContent_ExplicitChildContent_UnrecogizedAttribute_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContent>
+<ChildContent attr>
+</ChildContent>
+</RenderChildContent>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentHasInvalidAttribute.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void ChildContent_ExplicitChildContent_InvalidParameterName_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentStringComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContentString>
+<ChildContent Context=""@(""HI"")"">
+</ChildContent>
+</RenderChildContentString>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentHasInvalidParameter.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void ChildContent_ExplicitChildContent_RepeatedParameterName_GeneratesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentStringComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContentString>
+<ChildContent>
+<RenderChildContentString>
+<ChildContent Context=""context"">
+</ChildContent>
+</RenderChildContentString>
+</ChildContent>
+</RenderChildContentString>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentRepeatedParameterName.Id, diagnostic.Id);
+            Assert.Equal(
+                "The child content element 'ChildContent' of component 'RenderChildContentString' uses the same parameter name ('context') as enclosing child content " +
+                "element 'ChildContent' of component 'RenderChildContentString'. Specify the parameter name like: '<ChildContent Context=\"another_name\"> to resolve the ambiguity",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void ChildContent_ContextParameterNameOnComponent_Invalid_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentStringComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContentString Context=""@Foo()"">
+</RenderChildContentString>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentHasInvalidParameterOnComponent.Id, diagnostic.Id);
+            Assert.Equal(
+                "Invalid parameter name. The parameter name attribute 'Context' on component 'RenderChildContentString' can only include literal text.",
+                diagnostic.GetMessage());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
new file mode 100644
index 0000000000..41e534523a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -0,0 +1,3608 @@
+// 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.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public abstract class ComponentCodeGenerationTestBase : RazorBaselineIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool UseTwoPhaseCompilation => true;
+
+        protected ComponentCodeGenerationTestBase()
+            : base(generateBaselines: null)
+        {
+        }
+
+        #region Basics
+
+        [Fact]
+        public void ChildComponent_InFunctionsDirective()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.RenderTree;
+
+@{ RenderChildComponent(builder); }
+
+@functions {
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        <MyComponent />
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_InLocalFunction()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.RenderTree;
+@{
+    void RenderChildComponent()
+    {
+        <MyComponent />
+    }
+}
+
+@{ RenderChildComponent(); }
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_Simple()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithParameters()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class SomeType
+    {
+    }
+
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] int IntProperty { get; set; }
+        [Parameter] bool BoolProperty { get; set; }
+        [Parameter] string StringProperty { get; set; }
+        [Parameter] SomeType ObjectProperty { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent 
+    IntProperty=""123""
+    BoolProperty=""true""
+    StringProperty=""My string""
+    ObjectProperty=""new SomeType()""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ComponentWithTypeParameters()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components;
+@typeparam TItem1
+@typeparam TItem2
+
+<h1>Item1</h1>
+@foreach (var item2 in Items2)
+{
+    <p>
+    @ChildContent(item2);
+    </p>
+}
+@functions {
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithExplicitStringParameter()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        string StringProperty { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent StringProperty=""@(42.ToString())"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithNonPropertyAttributes()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent some-attribute=""foo"" another-attribute=""@(43.ToString())""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ComponentParameter_TypeMismatch_ReportsDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class CoolnessMeter : ComponentBase
+    {
+        [Parameter] private int Coolness { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<CoolnessMeter Coolness=""@(""very-cool"")"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var assembly = CompileToAssembly(generated, throwOnFailure: false);
+            // This has some errors
+            Assert.Collection(
+                assembly.Diagnostics.OrderBy(d => d.Id),
+                d => Assert.Equal("CS1503", d.Id));
+        }
+
+        [Fact]
+        public void DataDashAttribute_ImplicitExpression()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ 
+  var myValue = ""Expression value"";
+}
+<elem data-abc=""Literal value"" data-def=""@myValue"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void DataDashAttribute_ExplicitExpression()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ 
+  var myValue = ""Expression value"";
+}
+<elem data-abc=""Literal value"" data-def=""@(myValue)"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void MarkupComment_IsNotIncluded()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ 
+  var myValue = ""Expression value"";
+}
+<div>@myValue <!-- @myValue --> </div>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithFullyQualifiedTagNames()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+
+namespace Test2
+{
+    public class MyComponent2 : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent />
+<Test.MyComponent />
+<Test2.MyComponent2 />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Bind
+
+        [Fact]
+        public void BindToComponent_SpecifiesValue_WithMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        Action<int> ValueChanged { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_WithStringAttribute_DoesNotUseStringSyntax()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class InputText : ComponentBase
+    {
+        [Parameter]
+        string Value { get; set; }
+
+        [Parameter]
+        Action<string> ValueChanged { get; set; }
+    }
+}"));
+
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+
+namespace Test
+{
+    public class Person
+    {
+        public string Name { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<InputText bind-Value=""person.Name"" />
+
+@functions 
+{
+    Person person = new Person();
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_TypeChecked_WithMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        Action<int> ValueChanged { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public string ParentValue { get; set; } = ""42"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var assembly = CompileToAssembly(generated, throwOnFailure: false);
+            // This has some errors
+            Assert.Collection(
+                assembly.Diagnostics.OrderBy(d => d.Id),
+                d => Assert.Equal("CS0029", d.Id),
+                d => Assert.Equal("CS1503", d.Id));
+        }
+
+        [Fact]
+        public void BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        EventCallback<int> ValueChanged { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_EventCallback_TypeChecked_WithMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        EventCallback<int> ValueChanged { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public string ParentValue { get; set; } = ""42"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var assembly = CompileToAssembly(generated, throwOnFailure: false);
+            // This has some errors
+            Assert.Collection(
+                assembly.Diagnostics.OrderBy(d => d.Id),
+                d => Assert.Equal("CS1503", d.Id),
+                d => Assert.Equal("CS1503", d.Id));
+        }
+
+        [Fact]
+        public void BindToComponent_SpecifiesValue_WithoutMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase, IComponent
+    {
+        void IComponent.SetParameters(ParameterCollection parameters)
+        {
+        }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        Action<int> OnChanged { get; set; }
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value-OnChanged=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase, IComponent
+    {
+        void IComponent.SetParameters(ParameterCollection parameters)
+        {
+        }
+    }
+}"));
+
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value-OnChanged=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_SpecifiesValueAndExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        Action<int> ValueChanged { get; set; }
+
+        [Parameter]
+        Expression<Func<int>> ValueExpression { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_EventCallback_SpecifiesValueAndExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        EventCallback<int> ValueChanged { get; set; }
+
+        [Parameter]
+        Expression<Func<int>> ValueExpression { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_SpecifiesValueAndExpression_TypeChecked()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        int Value { get; set; }
+
+        [Parameter]
+        Action<int> ValueChanged { get; set; }
+
+        [Parameter]
+        Expression<Func<string>> ValueExpression { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Value=""ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            var assembly = CompileToAssembly(generated, throwOnFailure: false);
+            // This has some errors
+            Assert.Collection(
+                assembly.Diagnostics.OrderBy(d => d.Id),
+                d => Assert.Equal("CS0029", d.Id),
+                d => Assert.Equal("CS1662", d.Id));
+        }
+
+        [Fact]
+        public void BindToComponent_SpecifiesValueAndExpression_Generic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        T SomeParam { get; set; }
+
+        [Parameter]
+        Action<T> SomeParamChanged { get; set; }
+
+        [Parameter]
+        Expression<Func<T>> SomeParamExpression { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-SomeParam=""ParentValue"" />
+@functions {
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter]
+        T SomeParam { get; set; }
+
+        [Parameter]
+        EventCallback<T> SomeParamChanged { get; set; }
+
+        [Parameter]
+        Expression<Func<T>> SomeParamExpression { get; set; }
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-SomeParam=""ParentValue"" />
+@functions {
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElement_WritesAttributes()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", null, ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div bind=""@ParentValue"" />
+@functions {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElement_WithStringAttribute_WritesAttributes()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+<div bind-value=""ParentValue"" />
+@functions {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElementWithSuffix_WritesAttributes()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+<div bind-value=""@ParentValue"" />
+@functions {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputWithoutType_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input bind=""@ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputText_WithFormat_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind=""@CurrentDate"" format-value=""MM/dd/yyyy""/>
+@functions {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind=""@CurrentDate"" format-value=""@Format""/>
+@functions {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = ""MM/dd/yyyy"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputText_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind=""@ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputCheckbox_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""checkbox"" bind=""@Enabled"" />
+@functions {
+    public bool Enabled { get; set; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElementFallback_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind-value-onchange=""@ParentValue"" />
+@functions {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElementFallback_WithFormat_WritesAttributes()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind-value-onchange=""@CurrentDate"" format-value=""MM/dd"" />
+@functions {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Child Content
+
+        [Fact]
+        public void ChildComponent_WithChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        string MyAttr { get; set; }
+
+        [Parameter]
+        RenderFragment ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent MyAttr=""abc"">Some text<some-child a='1'>Nested text</some-child></MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithGenericChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        string MyAttr { get; set; }
+
+        [Parameter]
+        RenderFragment<string> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent MyAttr=""abc"">Some text<some-child a='1'>@context.ToLowerInvariant()</some-child></MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+
+        [Fact]
+        public void ChildComponent_WithGenericChildContent_SetsParameterName()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        string MyAttr { get; set; }
+
+        [Parameter]
+        RenderFragment<string> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent MyAttr=""abc"">
+  <ChildContent Context=""item"">
+    Some text<some-child a='1'>@item.ToLowerInvariant()</some-child>
+  </ChildContent>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        string MyAttr { get; set; }
+
+        [Parameter]
+        RenderFragment<string> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent MyAttr=""abc"" Context=""item"">
+  <ChildContent>
+    Some text<some-child a='1'>@item.ToLowerInvariant()</some-child>
+  </ChildContent>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithElementOnlyChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent><child>hello</child></MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithExplicitChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent><ChildContent>hello</ChildContent></MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithExplicitGenericChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<string> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent><ChildContent>@context</ChildContent></MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void MultipleExplictChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment Header { get; set; }
+
+        [Parameter]
+        RenderFragment Footer { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent>
+    <Header>Hi!</Header>
+    <Footer>@(""bye!"")</Footer>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BodyAndAttributeChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<string> Header { get; set; }
+
+        RenderFragment ChildContent { get; set; }
+
+        [Parameter]
+        RenderFragment Footer { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment<string> header = (context) => @<div>@context.ToLowerInvariant()</div>; }
+<MyComponent Header=@header>
+    Some Content
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BodyAndExplicitChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<string> Header { get; set; }
+
+        [Parameter]
+        RenderFragment ChildContent { get; set; }
+
+        [Parameter]
+        RenderFragment Footer { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment<string> header = (context) => @<div>@context.ToLowerInvariant()</div>; }
+<MyComponent Header=@header>
+  <ChildContent>Some Content</ChildContent>
+  <Footer>Bye!</Footer>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Directives
+
+        [Fact]
+        public void ChildComponent_WithPageDirective()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@page ""/MyPage""
+@page ""/AnotherRoute/{id}""
+<MyComponent />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithUsingDirectives()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+
+namespace Test2
+{
+    public class MyComponent2 : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@page ""/MyPage""
+@page ""/AnotherRoute/{id}""
+@using Test2
+<MyComponent />
+<MyComponent2 />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithUsingDirectives_AmbiguousImport()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+
+namespace Test2
+{
+    public class SomeComponent : ComponentBase
+    {
+    }
+}
+
+namespace Test3
+{
+    public class SomeComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test2
+@using Test3
+<MyComponent />
+<SomeComponent />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            var result = CompileToAssembly(generated, throwOnFailure: !DesignTime);
+
+            if (DesignTime)
+            {
+                Assert.Collection(result.Diagnostics, d =>
+                {
+                    Assert.Equal("CS0104", d.Id);
+                    Assert.Equal(CodeAnalysis.DiagnosticSeverity.Error, d.Severity);
+                    Assert.Equal("'SomeComponent' is an ambiguous reference between 'Test2.SomeComponent' and 'Test3.SomeComponent'", d.GetMessage());
+                });
+            }
+        }
+
+        [Fact]
+        public void Component_IgnoresStaticAndAliasUsings()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+
+namespace Test2
+{
+    public class SomeComponent : ComponentBase
+    {
+    }
+}
+
+namespace Test3
+{
+    public class SomeComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using static Test2.SomeComponent
+@using Foo = Test3
+<MyComponent />
+<SomeComponent /> <!-- Not a component -->");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            var result = CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildContent_FromAnotherNamespace()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class HeaderComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment Header { get; set; }
+    }
+}
+
+namespace AnotherTest
+{
+    public class FooterComponent : ComponentBase
+    {
+        [Parameter]
+        RenderFragment<DateTime> Footer { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using AnotherTest
+
+<HeaderComponent>
+    <Header>Hi!</Header>
+</HeaderComponent>
+<FooterComponent>
+    <Footer>@context</Footer>
+</FooterComponent>
+<Test.HeaderComponent>
+    <Header>Hi!</Header>
+</Test.HeaderComponent>
+<AnotherTest.FooterComponent>
+    <Footer>@context</Footer>
+</AnotherTest.FooterComponent>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region EventCallback
+
+        [Fact]
+        public void EventCallback_CanPassEventCallback_Explicitly()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@(EventCallback.Factory.Create(this, Increment))""/>
+
+@functions {
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallbackOfT_Explicitly()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@(EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment))""/>
+
+@functions {
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallback_Implicitly_Action()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallback_Implicitly_ActionOfObject()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallback_Implicitly_FuncOfTask()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallbackOfT_Implicitly_Action()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var result = CompileToAssembly(generated, throwOnFailure: false);
+
+            // Cannot convert from method group to Action - this isn't a great error message, but it's
+            // what the compiler gives us.
+            Assert.Collection(result.Diagnostics, d => { Assert.Equal("CS1503", d.Id); });
+        }
+
+        #endregion
+
+        #region Event Handlers
+
+        [Fact]
+        public void ChildComponent_WithLambdaEventHandler()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        Action<UIEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@(e => { Increment(); })""/>
+
+@functions {
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        // Regression test for #954 - we need to allow arbitrary event handler
+        // attributes with weak typing.
+        [Fact]
+        public void ChildComponent_WithWeaklyTypeEventHandler()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class DynamicElement : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<DynamicElement onclick=""@OnClick"" />
+
+@functions {
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_WithExplicitEventHandler()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        Action<UIEventArgs> OnClick { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent OnClick=""@Increment""/>
+
+@functions {
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithString()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""foo"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithNoArgsLambdaDelegate()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@(() => { })"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithEventArgsLambdaDelegate()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@(x => { })"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithNoArgMethodGroup()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@OnClick"" />
+@functions {
+    void OnClick() {
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithEventArgsMethodGroup()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@OnClick"" />
+@functions {
+    void OnClick(UIMouseEventArgs e) {
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@OnClick"" />
+@functions {
+    void OnClick(UIEventArgs e) {
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void AsyncEventHandler_OnElement_Action_MethodGroup()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Threading.Tasks
+<input onclick=""@OnClick"" />
+@functions {
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Threading.Tasks
+<input onclick=""@OnClick"" />
+@functions {
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void AsyncEventHandler_OnElement_Action_Lambda()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Threading.Tasks
+<input onclick=""@(async () => await Task.Delay(10))"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void AsyncEventHandler_OnElement_ActionEventArgs_Lambda()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Threading.Tasks
+<input onclick=""@(async (e) => await Task.Delay(10))"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithLambdaDelegate()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@(x => { })"" />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_OnElement_WithDelegate()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input onclick=""@OnClick"" />
+@functions {
+    void OnClick(UIMouseEventArgs e) {
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Generics
+
+        [Fact]
+        public void ChildComponent_Generic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=string Item=""@(""hi"")""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_Generic_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_Generic_TypeInference_Multiple()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")""/>
+<MyComponent Item=""@(""how are you?"")""/>
+<MyComponent Item=""@(""bye!"")""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericWeaklyTypedAttribute()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=string Item=""@(""hi"")"" Other=""@(17)""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericWeaklyTypedAttribute_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")"" Other=""@(17)""/>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericBind()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter]
+        TItem Item { get; set; }
+
+        [Parameter]
+        Action<TItem> ItemChanged { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=string bind-Item=Value/>
+@functions {
+    string Value;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericBind_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter]
+        TItem Item { get; set; }
+
+        [Parameter]
+        Action<TItem> ItemChanged { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Item=Value/>
+@functions {
+    string Value;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericBindWeaklyTyped()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=string bind-Item=Value/>
+@functions {
+    string Value;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericBindWeaklyTyped_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Value { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Item=Value Value=@(18)/>
+@functions {
+    string Value;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+
+        [Parameter] RenderFragment<TItem> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=string Item=""@(""hi"")"">
+  <div>@context.ToLower()</div>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_GenericChildContent_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+
+        [Parameter] RenderFragment<TItem> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")"">
+  <div>@context.ToLower()</div>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_WithFullyQualifiedTagName()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+
+        [Parameter] RenderFragment<TItem> ChildContent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<Test.MyComponent Item=""@(""hi"")"">
+  <div>@context.ToLower()</div>
+</Test.MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_MultipleGenerics()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem1, TItem2> : ComponentBase
+    {
+        [Parameter] TItem1 Item { get; set; }
+
+        [Parameter] RenderFragment<TItem1> ChildContent { get; set; }
+
+        [Parameter] RenderFragment<Context> AnotherChildContent { get; set; }
+
+        public class Context
+        {
+            public TItem2 Item { get; set; }
+        }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem1=string TItem2=int Item=""@(""hi"")"">
+  <ChildContent><div>@context.ToLower()</div></ChildContent>
+<AnotherChildContent Context=""item"">
+  @System.Math.Max(0, item.Item);
+</AnotherChildContent>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ChildComponent_MultipleGenerics_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem1, TItem2> : ComponentBase
+    {
+        [Parameter] TItem1 Item { get; set; }
+
+        [Parameter] List<TItem2> Items { get; set; }
+
+        [Parameter] RenderFragment<TItem1> ChildContent { get; set; }
+
+        [Parameter] RenderFragment<Context> AnotherChildContent { get; set; }
+
+        public class Context
+        {
+            public TItem2 Item { get; set; }
+        }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")"" Items=@(new List<long>())>
+  <ChildContent><div>@context.ToLower()</div></ChildContent>
+<AnotherChildContent Context=""item"">
+  @System.Math.Max(0, item.Item);
+</AnotherChildContent>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_WithComponentRef()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=int Item=""3"" ref=""_my"" />
+
+@functions {
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_WithComponentRef_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""3"" ref=""_my"" />
+
+@functions {
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Ref
+
+        [Fact]
+        public void Element_WithRef()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" ref=""myElem"" attributeafter=""after"">Hello</elem>
+
+@functions {
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithRef()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent ParamBefore=""before"" ref=""myInstance"" ParamAfter=""after"" />
+
+@functions {
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithRef_WithChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent ref=""myInstance"" SomeProp=""val"">
+    Some <el>further</el> content
+</MyComponent>
+
+@functions {
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Templates
+
+        [Fact]
+        public void RazorTemplate_InCodeBlock()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{
+    RenderFragment<Person> p = (person) => @<div>@person.Name</div>;
+}
+@functions {
+    class Person
+    {
+        public string Name { get; set; }
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_InExplicitExpression()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@(RenderPerson((person) => @<div>@person.Name</div>))
+@functions {
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_NonGeneric_InImplicitExpression()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@RenderPerson(@<div>HI</div>)
+@functions {
+    object RenderPerson(RenderFragment p) => null;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_Generic_InImplicitExpression()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@RenderPerson((person) => @<div>@person.Name</div>)
+@functions {
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_ContainsComponent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] string Name { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{
+    RenderFragment<Person> p = (person) => @<div><MyComponent Name=""@person.Name""/></div>;
+}
+@functions {
+    class Person
+    {
+        public string Name { get; set; }
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        // Targeted at the logic that assigns 'builder' names
+        [Fact]
+        public void RazorTemplate_FollowedByComponent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] string Name { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{
+    RenderFragment<Person> p = (person) => @<div><MyComponent Name=""@person.Name""/></div>;
+}
+<MyComponent>
+@(""hello, world!"")
+</MyComponent>
+
+@functions {
+    class Person
+    {
+        public string Name { get; set; }
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_NonGeneric_AsComponentParameter()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] RenderFragment Template { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment template = @<div>Joey</div>; }
+<MyComponent Person=""@template""/>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_Generic_AsComponentParameter()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] RenderFragment<Person> PersonTemplate { get; set; }
+    }
+
+    public class Person
+    {
+        public string Name { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment<Person> template = (person) => @<div>@person.Name</div>; }
+<MyComponent PersonTemplate=""@template""/>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void RazorTemplate_AsComponentParameter_MixedContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] RenderFragment<Context> Template { get; set; }
+    }
+
+    public class Context
+    {
+        public int Index { get; set; }
+        public string Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@{ RenderFragment<Test.Context> template = (context) => @<li>#@context.Index - @context.Item.ToLower()</li>; }
+<MyComponent Template=""@template""/>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Whitespace
+
+        [Fact]
+        public void LeadingWhiteSpace_WithDirective()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+
+@using System
+
+<h1>Hello</h1>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void LeadingWhiteSpace_WithCSharpExpression()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+   
+@(""My value"")
+
+<h1>Hello</h1>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void LeadingWhiteSpace_WithComponent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class SomeOtherComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<SomeOtherComponent />
+
+<h1>Hello</h1>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void TrailingWhiteSpace_WithDirective()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<h1>Hello</h1>
+
+@page ""/my/url""
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void TrailingWhiteSpace_WithCSharpExpression()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<h1>Hello</h1>
+
+@(""My value"")
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void TrailingWhiteSpace_WithComponent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class SomeOtherComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<h1>Hello</h1>
+
+<SomeOtherComponent />
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Whitespace_BetweenElementAndFunctions()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+    <elem attr=@Foo />
+    @functions {
+        int Foo = 18;
+    }
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void WhiteSpace_InsideAttribute_InMarkupBlock()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"<div class=""first second"">Hello</div>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
+        #region Imports
+        [Fact]
+        public void Component_WithImportsFile()
+        {
+            // Arrange
+            var importContent = @"
+@using System.Text
+@using System.Reflection
+";
+            var importItem = CreateProjectItem("_Imports.razor", importContent, FileKinds.ComponentImport);
+            ImportItems.Add(importItem);
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class Counter : ComponentBase
+    {
+        public int Count { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<Counter />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ComponentImports()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+namespace Test
+{
+    public class MainLayout : ComponentBase, ILayoutComponent
+    {
+        public RenderFragment Body { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp("_Imports.razor", @"
+@using System.Text
+@using System.Reflection
+
+@layout MainLayout
+@Foo
+<div>Hello</div>
+", throwOnFailure: false, fileKind: FileKinds.ComponentImport);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated, throwOnFailure: false);
+        }
+        #endregion
+
+        #region Misc
+
+        [Fact] // We don't process <!DOCTYPE ...> - we just skip them
+        public void Component_WithDocType()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<!DOCTYPE html>
+<div>
+</div>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ScriptTag_WithErrorSuppressed()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<div>
+    <script src='some/url.js' anotherattribute suppress-error='BL9992'>
+        some text
+        some more text
+    </script>
+</div>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact] // https://github.com/aspnet/Blazor/issues/597
+        public void Regression_597()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class Counter : ComponentBase
+    {
+        public int Count { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<Counter bind-v=""y"" />
+@functions {
+    string y = null;
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Regression_609()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class User : ComponentBase
+    {
+        public string Name { get; set; }
+        public Action<string> NameChanged { get; set; }
+        public bool IsActive { get; set; }
+        public Action<bool> IsActiveChanged { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<User bind-Name=""@UserName"" bind-IsActive=""@UserIsActive"" />
+
+@functions {
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact] // https://github.com/aspnet/Blazor/issues/772
+        public void Regression_772()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class SurveyPrompt : ComponentBase
+    {
+        [Parameter] private string Title { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@page ""/""
+
+<h1>Hello, world!</h1>
+
+Welcome to your new app.
+
+<SurveyPrompt Title=""
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            // This has some errors
+            Assert.Collection(
+                generated.Diagnostics.OrderBy(d => d.Id),
+                d => Assert.Equal("RZ1034", d.Id),
+                d => Assert.Equal("RZ1035", d.Id));
+        }
+
+        [Fact] // https://github.com/aspnet/Blazor/issues/773
+        public void Regression_773()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class SurveyPrompt : ComponentBase
+    {
+        [Parameter] private string Title { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@page ""/""
+
+<h1>Hello, world!</h1>
+
+Welcome to your new app.
+
+<SurveyPrompt Title=""<div>Test!</div>"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Regression_784()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<p onmouseover=""@OnComponentHover"" style=""background: @ParentBgColor;"" />
+@functions {
+    public string ParentBgColor { get; set; } = ""#FFFFFF"";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandlerTagHelper_EscapeQuotes()
+        {
+            // Act
+            var generated = CompileToCSharp(@"
+<input onfocus='alert(""Test"");' />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_TextTagsAreNotRendered()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class Counter : ComponentBase
+    {
+        public int Count { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<Counter />
+@if (true)
+{
+    <text>This text is rendered</text>
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
new file mode 100644
index 0000000000..0ac00af80f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -0,0 +1,175 @@
+// 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.Reflection;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentDeclarationRazorIntegrationTest : RazorIntegrationTestBase
+    {
+        public ComponentDeclarationRazorIntegrationTest()
+        {
+            // Include this assembly to use types defined in tests.
+            BaseCompilation = DefaultBaseCompilation.AddReferences(MetadataReference.CreateFromFile(GetType().Assembly.Location));
+        }
+
+        internal override CSharpCompilation BaseCompilation { get; }
+
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool DeclarationOnly => true;
+
+        [Fact]
+        public void DeclarationConfiguration_IncludesFunctions()
+        {
+            // Arrange & Act
+            var component = CompileToComponent(@"
+@functions {
+    public string Value { get; set; }
+}");
+
+            // Assert
+            var property = component.GetType().GetProperty("Value");
+            Assert.NotNull(property);
+            Assert.Same(typeof(string), property.PropertyType);
+        }
+
+        [Fact]
+        public void DeclarationConfiguration_IncludesInject()
+        {
+            // Arrange & Act
+            var component = CompileToComponent(@"
+@inject string Value
+");
+
+            // Assert
+            var property = component.GetType().GetProperty("Value", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assert.NotNull(property);
+            Assert.Same(typeof(string), property.PropertyType);
+        }
+
+        [Fact]
+        public void DeclarationConfiguration_IncludesUsings()
+        {
+            // Arrange & Act
+            var component = CompileToComponent(@"
+@using System.Text
+@inject StringBuilder Value
+");
+
+            // Assert
+            var property = component.GetType().GetProperty("Value", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assert.NotNull(property);
+            Assert.Same(typeof(StringBuilder), property.PropertyType);
+        }
+
+        [Fact]
+        public void DeclarationConfiguration_IncludesInherits()
+        {
+            // Arrange & Act
+            var component = CompileToComponent($@"
+@inherits {FullTypeName<BaseClass>()}
+");
+
+            // Assert
+            Assert.Same(typeof(BaseClass), component.GetType().BaseType);
+        }
+
+        [Fact]
+        public void DeclarationConfiguration_IncludesImplements()
+        {
+            // Arrange & Act
+            var component = CompileToComponent($@"
+@implements {FullTypeName<IDoCoolThings>()}
+");
+
+            // Assert
+            var type = component.GetType();
+            Assert.Contains(typeof(IDoCoolThings), component.GetType().GetInterfaces());
+        }
+
+        [Fact] // Regression test for https://github.com/aspnet/Blazor/issues/453
+        public void DeclarationConfiguration_FunctionsBlockHasLineMappings_MappingsApplyToError()
+        {
+            // Arrange & Act 1
+            var generated = CompileToCSharp(@"
+@functions {
+    public StringBuilder Builder { get; set; }
+}
+");
+
+            // Assert 1
+            AssertSourceEquals(@"
+// <auto-generated/>
+#pragma warning disable 1591
+#pragma warning disable 0414
+#pragma warning disable 0649
+#pragma warning disable 0169
+
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 1 ""x:\dir\subdir\Test\TestComponent.cshtml""
+            
+    public StringBuilder Builder { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
+", generated);
+
+            // Act 2
+            var assembly = CompileToAssembly(generated, throwOnFailure: false);
+
+            // Assert 2
+            var diagnostic = Assert.Single(assembly.Diagnostics);
+
+            // This error should map to line 2 of the generated file, the test
+            // says 1 because Roslyn's line/column data structures are 0-based.
+            var position = diagnostic.Location.GetMappedLineSpan();
+            Assert.EndsWith(".cshtml", position.Path);
+            Assert.Equal(1, position.StartLinePosition.Line);
+        }
+
+        public class BaseClass : IComponent
+        {
+            public void Init(RenderHandle renderHandle)
+            {
+            }
+
+            protected virtual void BuildRenderTree(RenderTreeBuilder builder)
+            {
+            }
+
+            public void SetParameters(ParameterCollection parameters)
+            {
+            }
+        }
+
+        public interface IDoCoolThings
+        {
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDesignTimeCodeGenerationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDesignTimeCodeGenerationTest.cs
new file mode 100644
index 0000000000..f86a7d8d23
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDesignTimeCodeGenerationTest.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentDesignTimeCodeGenerationTest : ComponentCodeGenerationTestBase
+    {
+        internal override bool DesignTime => true;
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
new file mode 100644
index 0000000000..1a193ca547
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
@@ -0,0 +1,111 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentDiagnosticRazorIntegrationTest : RazorIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.Component;
+
+        [Fact]
+        public void RejectsEndTagWithNoStartTag()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp(
+                "Line1\nLine2\nLine3</mytag>");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ9981", item.Id);
+                    Assert.Equal("Unexpected closing tag 'mytag' with no matching start tag.", item.GetMessage());
+                });
+        }
+
+        // This used to be a sugar syntax for lambdas, but we don't support that anymore
+        [Fact]
+        public void OldCodeBlockAttributeSyntax_ReportsError()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attr=@{ DidInvokeCode = true; } />
+@functions {
+    public bool DidInvokeCode { get; set; } = false;
+}");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9979", diagnostic.Id);
+            Assert.NotNull(diagnostic.GetMessage());
+
+        }
+
+        [Fact]
+        public void RejectsScriptTag()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp(@"Hello
+<div>
+    <script src='anything'>
+        something
+    </script>
+</div>
+Goodbye");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ9992", item.Id);
+                    Assert.Equal("Script tags should not be placed inside components because they cannot be updated dynamically. To fix this, move the script tag to the 'index.html' file or another static location. For more information see https://go.microsoft.com/fwlink/?linkid=872131", item.GetMessage());
+                    Assert.Equal(2, item.Span.LineIndex);
+                    Assert.Equal(4, item.Span.CharacterIndex);
+                });
+        }
+
+        [Fact]
+        public void RejectsTagHelperDirectives()
+        {
+            // Arrange/Act
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            var result = CompileToCSharp(@"
+@addTagHelper *, TestAssembly
+@tagHelperPrefix th
+
+<MyComponent />
+");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ9978", item.Id);
+                    Assert.Equal("The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document. " +
+                "Use '@using <namespace>' directive instead.", item.GetMessage());
+                    Assert.Equal(0, item.Span.LineIndex);
+                    Assert.Equal(0, item.Span.CharacterIndex);
+                },
+                item =>
+                {
+                    Assert.Equal("RZ9978", item.Id);
+                    Assert.Equal("The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document. " +
+                "Use '@using <namespace>' directive instead.", item.GetMessage());
+                    Assert.Equal(1, item.Span.LineIndex);
+                    Assert.Equal(0, item.Span.CharacterIndex);
+                });
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
new file mode 100644
index 0000000000..4e5fe27b4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
@@ -0,0 +1,150 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Layouts;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    // Integration tests for component directives
+    public class ComponentDirectiveIntegrationTest : RazorIntegrationTestBase
+    {
+        public ComponentDirectiveIntegrationTest()
+        {
+            // Include this assembly to use types defined in tests.
+            BaseCompilation = DefaultBaseCompilation.AddReferences(MetadataReference.CreateFromFile(GetType().Assembly.Location));
+        }
+
+        internal override CSharpCompilation BaseCompilation { get; }
+
+        internal override string FileKind => FileKinds.Component;
+
+        [Fact]
+        public void ComponentsDoNotHaveLayoutAttributeByDefault()
+        {
+            // Arrange/Act
+            var component = CompileToComponent($"Hello");
+
+            // Assert
+            Assert.Null(component.GetType().GetCustomAttribute<LayoutAttribute>());
+        }
+
+        [Fact]
+        public void SupportsLayoutDeclarations()
+        {
+            // Arrange/Act
+            var testComponentTypeName = FullTypeName<TestLayout>();
+            var component = CompileToComponent(
+                $"@layout {testComponentTypeName}\n" +
+                $"Hello");
+
+            // Assert
+            var layoutAttribute = component.GetType().GetCustomAttribute<LayoutAttribute>();
+            Assert.NotNull(layoutAttribute);
+            Assert.Equal(typeof(TestLayout), layoutAttribute.LayoutType);
+        }
+
+        [Fact]
+        public void SupportsImplementsDeclarations()
+        {
+            // Arrange/Act
+            var testInterfaceTypeName = FullTypeName<ITestInterface>();
+            var component = CompileToComponent(
+                $"@implements {testInterfaceTypeName}\n" +
+                $"Hello");
+
+            // Assert
+            Assert.IsAssignableFrom<ITestInterface>(component);
+        }
+
+        [Fact]
+        public void SupportsMultipleImplementsDeclarations()
+        {
+            // Arrange/Act
+            var testInterfaceTypeName = FullTypeName<ITestInterface>();
+            var testInterfaceTypeName2 = FullTypeName<ITestInterface2>();
+            var component = CompileToComponent(
+                $"@implements {testInterfaceTypeName}\n" +
+                $"@implements {testInterfaceTypeName2}\n" +
+                $"Hello");
+
+            // Assert
+            Assert.IsAssignableFrom<ITestInterface>(component);
+            Assert.IsAssignableFrom<ITestInterface2>(component);
+        }
+
+        [Fact]
+        public void SupportsInheritsDirective()
+        {
+            // Arrange/Act
+            var testBaseClassTypeName = FullTypeName<TestBaseClass>();
+            var component = CompileToComponent(
+                $"@inherits {testBaseClassTypeName}" + Environment.NewLine +
+                $"Hello");
+
+            // Assert
+            Assert.IsAssignableFrom<TestBaseClass>(component);
+        }
+
+        [Fact]
+        public void SupportsInjectDirective()
+        {
+            // Arrange/Act 1: Compilation
+            var componentType = CompileToComponent(
+                $"@inject {FullTypeName<IMyService1>()} MyService1\n" +
+                $"@inject {FullTypeName<IMyService2>()} MyService2\n" +
+                $"Hello from @MyService1 and @MyService2").GetType();
+
+            // Assert 1: Compiled type has correct properties
+            var propertyFlags = BindingFlags.Instance | BindingFlags.NonPublic;
+            var injectableProperties = componentType.GetProperties(propertyFlags)
+                .Where(p => p.GetCustomAttribute<InjectAttribute>() != null);
+            Assert.Collection(injectableProperties.OrderBy(p => p.Name),
+                property =>
+                {
+                    Assert.Equal("MyService1", property.Name);
+                    Assert.Equal(typeof(IMyService1), property.PropertyType);
+                    Assert.False(property.GetMethod.IsPublic);
+                    Assert.False(property.SetMethod.IsPublic);
+                },
+                property =>
+                {
+                    Assert.Equal("MyService2", property.Name);
+                    Assert.Equal(typeof(IMyService2), property.PropertyType);
+                    Assert.False(property.GetMethod.IsPublic);
+                    Assert.False(property.SetMethod.IsPublic);
+                });
+        }
+
+        public class TestLayout : IComponent
+        {
+            [Parameter]
+            RenderFragment Body { get; set; }
+
+            public void Init(RenderHandle renderHandle)
+            {
+            }
+
+            public void SetParameters(ParameterCollection parameters)
+            {
+            }
+        }
+
+        public interface ITestInterface { }
+
+        public interface ITestInterface2 { }
+
+        public class TestBaseClass : ComponentBase { }
+
+        public interface IMyService1 { }
+        public interface IMyService2 { }
+        public class MyService1Impl : IMyService1 { }
+        public class MyService2Impl : IMyService2 { }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs
new file mode 100644
index 0000000000..cbabebaade
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs
@@ -0,0 +1,121 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Components;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentDiscoveryIntegrationTest : RazorIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool UseTwoPhaseCompilation => true;
+        
+        [Fact]
+        public void ComponentDiscovery_CanFindComponent_DefinedinCSharp()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var result = CompileToCSharp(string.Empty);
+
+            // Assert
+            var bindings = result.CodeDocument.GetTagHelperContext();
+            Assert.Contains(bindings.TagHelpers, t => t.Name == "Test.MyComponent");
+        }
+
+        [Fact]
+        public void ComponentDiscovery_CanFindComponent_WithNamespace_DefinedinCSharp()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test.AnotherNamespace
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var result = CompileToCSharp(string.Empty);
+
+            // Assert
+            var bindings = result.CodeDocument.GetTagHelperContext();
+
+            Assert.Contains(bindings.TagHelpers, t =>
+            {
+                return t.Name == "Test.AnotherNamespace.MyComponent" &&
+                    t.IsComponentFullyQualifiedNameMatch();
+            });
+
+            Assert.DoesNotContain(bindings.TagHelpers, t =>
+            {
+                return t.Name == "Test.AnotherNamespace.MyComponent" &&
+                    !t.IsComponentFullyQualifiedNameMatch();
+            });
+        }
+
+        [Fact]
+        public void ComponentDiscovery_CanFindComponent_DefinedinCshtml()
+        {
+            // Arrange
+
+            // Act
+            var result = CompileToCSharp("UniqueName.cshtml", string.Empty);
+
+            // Assert
+            var bindings = result.CodeDocument.GetTagHelperContext();
+            Assert.Contains(bindings.TagHelpers, t => t.Name == "Test.UniqueName");
+        }
+
+        [Fact]
+        public void ComponentDiscovery_CanFindComponent_WithTypeParameter()
+        {
+            // Arrange
+
+            // Act
+            var result = CompileToCSharp("UniqueName.cshtml", @"
+@typeparam TItem
+@functions {
+    [Parameter] TItem Item { get; set; }
+}");
+
+            // Assert
+            var bindings = result.CodeDocument.GetTagHelperContext();
+            Assert.Contains(bindings.TagHelpers, t => t.Name == "Test.UniqueName<TItem>");
+        }
+
+        [Fact]
+        public void ComponentDiscovery_CanFindComponent_WithMultipleTypeParameters()
+        {
+            // Arrange
+
+            // Act
+            var result = CompileToCSharp("UniqueName.cshtml", @"
+@typeparam TItem1
+@typeparam TItem2
+@typeparam TItem3
+@functions {
+    [Parameter] TItem1 Item { get; set; }
+}");
+
+            // Assert
+            var bindings = result.CodeDocument.GetTagHelperContext();
+            Assert.Contains(bindings.TagHelpers, t => t.Name == "Test.UniqueName<TItem1, TItem2, TItem3>");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentFilePathIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentFilePathIntegrationTest.cs
new file mode 100644
index 0000000000..2b3a60c2a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentFilePathIntegrationTest.cs
@@ -0,0 +1,50 @@
+// 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.IO;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    // Integration tests focused on file path handling for class/namespace names
+    public class ComponentFilePathIntegrationTest : RazorIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.Component; 
+
+        [Fact]
+        public void FileNameIsInvalidClassName_SanitizesInvalidClassName()
+        {
+            // Arrange
+
+            // Act
+            var result = CompileToAssembly("Filename with spaces.cshtml", "");
+
+            // Assert
+            Assert.Empty(result.Diagnostics);
+
+            var type = Assert.Single(result.Assembly.GetTypes());
+            Assert.Equal(DefaultRootNamespace, type.Namespace);
+            Assert.Equal("Filename_with_spaces", type.Name);
+        }
+
+        [Theory]
+        [InlineData("ItemAtRoot.cs", "Test", "ItemAtRoot")]
+        [InlineData("Dir1\\MyFile.cs", "Test.Dir1", "MyFile")]
+        [InlineData("Dir1\\Dir2\\MyFile.cs", "Test.Dir1.Dir2", "MyFile")]
+        public void CreatesClassWithCorrectNameAndNamespace(string relativePath, string expectedNamespace, string expectedClassName)
+        {
+            // Arrange
+            relativePath = relativePath.Replace('\\', Path.DirectorySeparatorChar);
+
+            // Act
+            var result = CompileToAssembly(relativePath, "");
+
+            // Assert
+            Assert.Empty(result.Diagnostics);
+
+            var type = Assert.Single(result.Assembly.GetTypes());
+            Assert.Equal(expectedNamespace, type.Namespace);
+            Assert.Equal(expectedClassName, type.Name);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
new file mode 100644
index 0000000000..bb73fe42be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
@@ -0,0 +1,124 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentGenericTypeIntegrationTest : RazorIntegrationTestBase
+    {
+        private readonly CSharpSyntaxTree GenericContextComponent = Parse(@"
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+namespace Test
+{
+    public class GenericContext<TItem> : ComponentBase
+    {
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            var items = (IReadOnlyList<TItem>)Items ?? Array.Empty<TItem>();
+            for (var i = 0; i < items.Count; i++)
+            {
+                if (ChildContent == null)
+                {
+                    builder.AddContent(i, Items[i]);
+                }
+                else
+                {
+                    builder.AddContent(i, ChildContent, new Context() { Index = i, Item = items[i], });
+                }
+            }
+        }
+
+        [Parameter]
+        List<TItem> Items { get; set; }
+
+        [Parameter]
+        RenderFragment<Context> ChildContent { get; set; }
+
+        public class Context
+        {
+            public int Index { get; set; }
+            public TItem Item { get; set; }
+        }
+    }
+}
+");
+
+        private readonly CSharpSyntaxTree MultipleGenericParameterComponent = Parse(@"
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+namespace Test
+{
+    public class MultipleGenericParameter<TItem1, TItem2, TItem3> : ComponentBase
+    {
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, Item1);
+            builder.AddContent(1, Item2);
+            builder.AddContent(2, Item3);
+        }
+
+        [Parameter]
+        TItem1 Item1 { get; set; }
+
+        [Parameter]
+        TItem2 Item2 { get; set; }
+
+        [Parameter]
+        TItem3 Item3 { get; set; }
+    }
+}
+");
+
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool UseTwoPhaseCompilation => true;
+
+        [Fact]
+        public void GenericComponent_WithoutAnyTypeParameters_TriggersDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(GenericContextComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<GenericContext />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.GenericComponentTypeInferenceUnderspecified.Id, diagnostic.Id);
+            Assert.Equal(
+                "The type of component 'GenericContext' cannot be inferred based on the values provided. Consider " +
+                "specifying the type arguments directly using the following attributes: 'TItem'.",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void GenericComponent_WithMissingTypeParameters_TriggersDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(MultipleGenericParameterComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MultipleGenericParameter TItem1=int />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.GenericComponentMissingTypeArgument.Id, diagnostic.Id);
+            Assert.Equal(
+                "The component 'MultipleGenericParameter' is missing required type arguments. " +
+                "Specify the missing types using the attributes: 'TItem2', 'TItem3'.",
+                diagnostic.GetMessage());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentImportsIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentImportsIntegrationTest.cs
new file mode 100644
index 0000000000..a4241730fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentImportsIntegrationTest.cs
@@ -0,0 +1,191 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentImportsIntegrationTest : RazorIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.ComponentImport;
+
+        [Fact]
+        public void NoErrorsForUsingStatements()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@using System.Text
+@using System.Reflection
+@* This is allowed in imports *@
+");
+
+            // Assert
+            Assert.Empty(result.Diagnostics);
+        }
+
+        [Fact]
+        public void NoErrorsForRazorComments()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@* This is allowed in imports *@
+");
+
+            // Assert
+            Assert.Empty(result.Diagnostics);
+        }
+
+        [Fact]
+        public void NoErrorsForSupportedDirectives()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@inject FooService Foo
+@typeparam TItem
+@implements ISomeInterface
+@inherits SomeNamespace.SomeBaseType
+");
+
+            // Assert
+            Assert.Empty(result.Diagnostics);
+        }
+
+        [Fact]
+        public void ErrorsForPageDirective()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@page ""/""
+");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ9987", item.Id);
+                    Assert.Equal(@"The '@page' directive specified in _Imports.razor file will not be imported. The directive must appear at the top of each Razor file", item.GetMessage());
+                });
+        }
+
+        [Fact]
+        public void ErrorsForTagHelperDirectives()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@addTagHelper *, TestAssembly
+@removeTagHelper *, TestAssembly
+@tagHelperPrefix th:
+");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ9978", item.Id);
+                    Assert.Equal(0, item.Span.LineIndex);
+                    Assert.Equal(@"The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document. Use '@using <namespace>' directive instead.", item.GetMessage());
+                },
+                item =>
+                {
+                    Assert.Equal("RZ9978", item.Id);
+                    Assert.Equal(1, item.Span.LineIndex);
+                    Assert.Equal(@"The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document. Use '@using <namespace>' directive instead.", item.GetMessage());
+                },
+                item =>
+                {
+                    Assert.Equal("RZ9978", item.Id);
+                    Assert.Equal(2, item.Span.LineIndex);
+                    Assert.Equal(@"The directives @addTagHelper, @removeTagHelper and @tagHelperPrefix are not valid in a component document. Use '@using <namespace>' directive instead.", item.GetMessage());
+                });
+        }
+
+        [Fact]
+        public void ErrorsForFunctionsDirective()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@functions {
+    public class Test
+    {
+    }
+}
+");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ10003", item.Id);
+                    Assert.Equal(@"Markup, code and block directives are not valid in component imports.", item.GetMessage());
+                });
+        }
+
+        [Fact]
+        public void ErrorsForSectionDirective()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@section Foo {
+}
+");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ10003", item.Id);
+                    Assert.Equal(@"Markup, code and block directives are not valid in component imports.", item.GetMessage());
+                });
+        }
+
+        [Fact]
+        public void ErrorsForMarkup()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+<div>asdf</div>
+");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ10003", item.Id);
+                    Assert.Equal(@"Markup, code and block directives are not valid in component imports.", item.GetMessage());
+                });
+        }
+
+        [Fact]
+        public void ErrorsForCode()
+        {
+            // Arrange/Act
+            var result = CompileToCSharp("_Imports.razor", @"
+@Foo
+@(Bar)
+@{
+    var x = Foo;
+}");
+
+            // Assert
+            Assert.Collection(result.Diagnostics,
+                item =>
+                {
+                    Assert.Equal("RZ10003", item.Id);
+                    Assert.Equal(0, item.Span.LineIndex);
+                    Assert.Equal(@"Markup, code and block directives are not valid in component imports.", item.GetMessage());
+                },
+                item =>
+                {
+                    Assert.Equal("RZ10003", item.Id);
+                    Assert.Equal(1, item.Span.LineIndex);
+                    Assert.Equal(@"Markup, code and block directives are not valid in component imports.", item.GetMessage());
+                },
+                item =>
+                {
+                    Assert.Equal("RZ10003", item.Id);
+                    Assert.Equal(2, item.Span.LineIndex);
+                    Assert.Equal(@"Markup, code and block directives are not valid in component imports.", item.GetMessage());
+                });
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentRuntimeCodeGenerationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentRuntimeCodeGenerationTest.cs
new file mode 100644
index 0000000000..dd49348086
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentRuntimeCodeGenerationTest.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentRuntimeCodeGenerationTest : ComponentCodeGenerationTestBase
+    {
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs
new file mode 100644
index 0000000000..9a73796a2e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs
@@ -0,0 +1,127 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentTemplateIntegrationTest : RazorIntegrationTestBase
+    {
+        internal override string FileKind => FileKinds.Component;
+
+        // Razor doesn't parse this as a template, we don't need much special handling for
+        // it because it will just be invalid in general.
+        [Fact]
+        public void Template_ImplicitExpressionInMarkupAttribute_CreatesDiagnostic()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"<div attr=""@<div></div>"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ1005", diagnostic.Id);
+        }
+
+        [Fact]
+        public void Template_ExplicitExpressionInMarkupAttribute_CreatesDiagnostic()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"<div attr=""@(@<div></div>)"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9994", diagnostic.Id);
+        }
+
+        // Razor doesn't parse this as a template, we don't need much special handling for
+        // it because it will just be invalid in general.
+        [Fact]
+        public void Template_ImplicitExpressionInComponentAttribute_CreatesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"<MyComponent attr=""@<div></div>"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ1005", diagnostic.Id);
+        }
+
+        [Fact]
+        public void Template_ExplicitExpressionInComponentAttribute_CreatesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"<MyComponent attr=""@(@<div></div>)"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9994", diagnostic.Id);
+        }
+
+        [Fact]
+        public void Template_ExplicitExpressionInRef_CreatesDiagnostic()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"<div ref=""@(@<div></div>)"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9994", diagnostic.Id);
+        }
+
+
+        [Fact]
+        public void Template_ExplicitExpressionInBind_CreatesDiagnostic()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"<input type=""text"" bind=""@(@<div></div>)"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9994", diagnostic.Id);
+        }
+
+        [Fact]
+        public void Template_ExplicitExpressionInEventHandler_CreatesDiagnostic()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"<input type=""text"" onchange=""@(@<div></div>)"" />");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9994", diagnostic.Id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs
new file mode 100644
index 0000000000..092d6e7595
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs
@@ -0,0 +1,130 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    // Similar to design time code generation tests, but goes a character at a time.
+    // Don't add many of these since they are slow - instead add features to existing
+    // tests here, and use these as smoke tests, not for detailed regression testing.
+    public class ComponentTypingTest : RazorIntegrationTestBase
+    {
+        internal override bool DesignTime => true;
+
+        internal override string FileKind => FileKinds.Component;
+
+        internal override bool UseTwoPhaseCompilation => true;
+
+        [Fact]
+        public void DoSomeTyping()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] int Value { get; set; }
+        [Parameter] Action<int> ValueChanged { get; set; }
+        [Parameter] string AnotherValue { get; set; }
+    }
+
+    public class ModelState
+    {
+        public Action<string> Bind(Func<string, string> func) => throw null;
+    }
+}
+"));
+            var text = @"
+<div>
+  <MyComponent bind-Value=""myValue"" AnotherValue=""hi""/>
+  <input type=""text"" bind=""@this.ModelState.Bind(x => x)"" />
+  <button ref=""_button"" onsubmit=""@FormSubmitted"">Click me</button>
+</div>
+<MyComponent 
+    IntProperty=""123""
+    BoolProperty=""true""
+    StringProperty=""My string""
+    ObjectProperty=""new SomeType()""/>
+@functions {
+    Test.ModelState ModelState { get; set; }
+}";
+
+            for (var i = 0; i <= text.Length; i++)
+            {
+                try
+                {
+                    CompileToCSharp(text.Substring(0, i), throwOnFailure: false);
+                }
+                catch (Exception ex)
+                {
+                    throw new XunitException($@"
+Code generation failed on iteration {i} with source text:
+{text.Substring(0, i)}
+
+Exception:
+{ex}
+");
+                }
+            }
+        }
+
+        [Fact] // Regression test for #1068 
+        public void Regression_1068()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" bind="" />
+@functions {
+    Test.ModelState ModelState { get; set; }
+}
+", throwOnFailure: false);
+
+            // Assert
+        }
+
+        [Fact]
+        public void MalformedAttributeContent()
+        {
+            // Act
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] int Value { get; set; }
+        [Parameter] Action<int> ValueChanged { get; set; }
+        [Parameter] string AnotherValue { get; set; }
+    }
+
+    public class ModelState
+    {
+        public Action<string> Bind(Func<string, string> func) => throw null;
+    }
+}
+"));
+            var generated = CompileToCSharp(@"
+  <MyComponent Value=10 Something=@for
+
+  <button disabled=@form.IsSubmitting type=""submit"" class=""btn btn-primary mt-3 mr-3 has-spinner @(form.IsSubmitting ? ""active"" :"""")"" onclick=@(async () => await SaveAsync(false))>
+@functions {
+    Test.ModelState ModelState { get; set; }
+}", throwOnFailure: false);
+
+            // Assert - does not throw
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs
new file mode 100644
index 0000000000..11bfe9793e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs
@@ -0,0 +1,38 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    // Extensible directives only have codegen for design time, so we're only testing that.
+    public class ExtensibleDirectiveTest : IntegrationTestBase
+    {
+        public ExtensibleDirectiveTest()
+            : base(generateBaselines: null)
+        {
+        }
+
+        [Fact]
+        public void NamespaceToken()
+        {
+            // Arrange
+            var engine = CreateProjectEngine(builder =>
+            {
+                builder.ConfigureDocumentClassifier();
+
+                builder.AddDirective(DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddNamespaceToken()));
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = engine.ProcessDesignTime(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(codeDocument);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/HtmlAttributeIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/HtmlAttributeIntegrationTest.cs
new file mode 100644
index 0000000000..7fd26ffd80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/HtmlAttributeIntegrationTest.cs
@@ -0,0 +1,36 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class HtmlAttributeIntegrationTest : IntegrationTestBase
+    {
+        [Fact]
+        public void HtmlWithDataDashAttribute()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+        }
+
+        [Fact]
+        public void HtmlWithConditionalAttribute()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TagHelpersIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TagHelpersIntegrationTest.cs
new file mode 100644
index 0000000000..c5c9810e76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TagHelpersIntegrationTest.cs
@@ -0,0 +1,126 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class TagHelpersIntegrationTest : IntegrationTestBase
+    {
+        [Fact]
+        public void SimpleTagHelpers()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "InputTagHelper",
+                    assemblyName: "TestAssembly")
+            };
+
+            var projectEngine = CreateProjectEngine(builder => builder.AddTagHelpers(descriptors));
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+        }
+
+        [Fact]
+        public void TagHelpersWithBoundAttributes()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "InputTagHelper",
+                    assemblyName: "TestAssembly",
+                    attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("bound")
+                            .PropertyName("FooProp")
+                            .TypeName("System.String"),
+                    })
+            };
+
+            var projectEngine = CreateProjectEngine(builder => builder.AddTagHelpers(descriptors));
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+        }
+
+        [Fact]
+        public void NestedTagHelpers()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateTagHelperDescriptor(
+                    tagName: "p",
+                    typeName: "PTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "form",
+                    typeName: "FormTagHelper",
+                    assemblyName: "TestAssembly"),
+                CreateTagHelperDescriptor(
+                    tagName: "input",
+                    typeName: "InputTagHelper",
+                    assemblyName: "TestAssembly",
+                    attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                    {
+                        builder => builder
+                            .Name("value")
+                            .PropertyName("FooProp")
+                            .TypeName("System.String"),
+                    })
+            };
+
+            var projectEngine = CreateProjectEngine(builder => builder.AddTagHelpers(descriptors));
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            var irTree = codeDocument.GetDocumentIntermediateNode();
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BoundAttributeDescriptor(attributeBuilder);
+                }
+            }
+
+            builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs
new file mode 100644
index 0000000000..d2034b18e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs
@@ -0,0 +1,637 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class TestTagHelperDescriptors
+    {
+        public static IEnumerable<TagHelperDescriptor> SimpleTagHelperDescriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "span",
+                        typeName: "SpanTagHelper",
+                        assemblyName: "TestAssembly"),
+                    CreateTagHelperDescriptor(
+                        tagName: "div",
+                        typeName: "DivTagHelper",
+                        assemblyName: "TestAssembly"),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("value")
+                                .PropertyName("FooProp")
+                                .TypeName("System.String"),
+                            builder => builder
+                                .Name("bound")
+                                .PropertyName("BoundProp")
+                                .TypeName("System.String"),
+                            builder => builder
+                                .Name("age")
+                                .PropertyName("AgeProp")
+                                .TypeName("System.Int32"),
+                        })
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> MinimizedBooleanTagHelperDescriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "span",
+                        typeName: "SpanTagHelper",
+                        assemblyName: "TestAssembly"),
+                    CreateTagHelperDescriptor(
+                        tagName: "div",
+                        typeName: "DivTagHelper",
+                        assemblyName: "TestAssembly"),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("value")
+                                .PropertyName("FooProp")
+                                .TypeName("System.String"),
+                            builder => builder
+                                .Name("bound")
+                                .PropertyName("BoundProp")
+                                .TypeName("System.Boolean"),
+                            builder => builder
+                                .Name("age")
+                                .PropertyName("AgeProp")
+                                .TypeName("System.Int32"),
+                        })
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> CssSelectorTagHelperDescriptors
+        {
+            get
+            {
+                var inputTypePropertyInfo = typeof(TestType).GetRuntimeProperty("Type");
+                var inputCheckedPropertyInfo = typeof(TestType).GetRuntimeProperty("Checked");
+
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "a",
+                        typeName: "TestNamespace.ATagHelper",
+                        assemblyName: "TestAssembly",
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("href")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                                    .Value("~/")
+                                    .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch)),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "a",
+                        typeName: "TestNamespace.ATagHelperMultipleSelectors",
+                        assemblyName: "TestAssembly",
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("href")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                                    .Value("~/")
+                                    .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch))
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("href")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                                    .Value("?hello=world")
+                                    .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch)),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", inputTypePropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("type")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                                    .Value("text")
+                                    .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch)),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper2",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", inputTypePropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("ty")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper",
+                        assemblyName: "TestAssembly",
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("href")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                                    .Value("~/")
+                                    .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch)),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper2",
+                        assemblyName: "TestAssembly",
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute
+                                    .Name("type")
+                                    .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)),
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> EnumTagHelperDescriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("catch-all")
+                                .PropertyName("CatchAll")
+                                .AsEnum()
+                                .TypeName($"{typeof(TestTagHelperDescriptors).FullName}.{nameof(MyEnum)}"),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("value")
+                                .PropertyName("Value")
+                                .AsEnum()
+                                .TypeName($"{typeof(TestTagHelperDescriptors).FullName}.{nameof(MyEnum)}"),
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> SymbolBoundTagHelperDescriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("[item]")
+                                .PropertyName("ListItems")
+                                .TypeName("System.Collections.Generic.List<string>"),
+                            builder => builder
+                                .Name("[(item)]")
+                                .PropertyName("ArrayItems")
+                                .TypeName(typeof(string[]).FullName),
+                            builder => builder
+                                .Name("(click)")
+                                .PropertyName("Event1")
+                                .TypeName(typeof(Action).FullName),
+                            builder => builder
+                                .Name("(^click)")
+                                .PropertyName("Event2")
+                                .TypeName(typeof(Action).FullName),
+                            builder => builder
+                                .Name("*something")
+                                .PropertyName("StringProperty1")
+                                .TypeName(typeof(string).FullName),
+                            builder => builder
+                                .Name("#local")
+                                .PropertyName("StringProperty2")
+                                .TypeName(typeof(string).FullName),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("bound")),
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> MinimizedTagHelpers_Descriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("catchall-bound-string")
+                                .PropertyName("BoundRequiredString")
+                                .TypeName(typeof(string).FullName),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("catchall-unbound-required")),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("input-bound-required-string")
+                                .PropertyName("BoundRequiredString")
+                                .TypeName(typeof(string).FullName),
+                            builder => builder
+                                .Name("input-bound-string")
+                                .PropertyName("BoundString")
+                                .TypeName(typeof(string).FullName),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute.Name("input-bound-required-string"))
+                                .RequireAttributeDescriptor(attribute => attribute.Name("input-unbound-required")),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "div",
+                        typeName: "DivTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("boundbool")
+                                .PropertyName("BoundBoolProp")
+                                .TypeName(typeof(bool).FullName),
+                            builder => builder
+                                .Name("booldict")
+                                .PropertyName("BoolDictProp")
+                                .TypeName("System.Collections.Generic.IDictionary<string, bool>")
+                                .AsDictionaryAttribute("booldict-prefix-", typeof(bool).FullName),
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> DynamicAttributeTagHelpers_Descriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("bound")
+                                .PropertyName("Bound")
+                                .TypeName(typeof(string).FullName)
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> DuplicateTargetTagHelperDescriptors
+        {
+            get
+            {
+                var typePropertyInfo = typeof(TestType).GetRuntimeProperty("Type");
+                var checkedPropertyInfo = typeof(TestType).GetRuntimeProperty("Checked");
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", typePropertyInfo),
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "checked", checkedPropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("type")),
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("checked"))
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", typePropertyInfo),
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "checked", checkedPropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("type")),
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("checked"))
+                        })
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> AttributeTargetingTagHelperDescriptors
+        {
+            get
+            {
+                var inputTypePropertyInfo = typeof(TestType).GetRuntimeProperty("Type");
+                var inputCheckedPropertyInfo = typeof(TestType).GetRuntimeProperty("Checked");
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "p",
+                        typeName: "TestNamespace.PTagHelper",
+                        assemblyName: "TestAssembly",
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("class")),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", inputTypePropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("type")),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper2",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", inputTypePropertyInfo),
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "checked", inputCheckedPropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .RequireAttributeDescriptor(attribute => attribute.Name("type"))
+                                .RequireAttributeDescriptor(attribute => attribute.Name("checked")),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "*",
+                        typeName: "TestNamespace.CatchAllTagHelper",
+                        assemblyName: "TestAssembly",
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireAttributeDescriptor(attribute => attribute.Name("catchAll")),
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> PrefixedAttributeTagHelperDescriptors
+        {
+            get
+            {
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper1",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("int-prefix-grabber")
+                                .PropertyName("IntProperty")
+                                .TypeName(typeof(int).FullName),
+                            builder => builder
+                                .Name("int-dictionary")
+                                .PropertyName("IntDictionaryProperty")
+                                .TypeName("System.Collections.Generic.IDictionary<string, int>")
+                                .AsDictionaryAttribute("int-prefix-", typeof(int).FullName),
+                            builder => builder
+                                .Name("string-prefix-grabber")
+                                .PropertyName("StringProperty")
+                                .TypeName(typeof(string).FullName),
+                            builder => builder
+                                .Name("string-dictionary")
+                                .PropertyName("StringDictionaryProperty")
+                                .TypeName("Namespace.DictionaryWithoutParameterlessConstructor<string, string>")
+                                .AsDictionaryAttribute("string-prefix-", typeof(string).FullName),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper2",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => builder
+                                .Name("int-dictionary")
+                                .PropertyName("IntDictionaryProperty")
+                                .TypeName(typeof(int).FullName)
+                                .AsDictionaryAttribute("int-prefix-", typeof(int).FullName),
+                            builder => builder
+                                .Name("string-dictionary")
+                                .PropertyName("StringDictionaryProperty")
+                                .TypeName("Namespace.DictionaryWithoutParameterlessConstructor<string, string>")
+                                .AsDictionaryAttribute("string-prefix-", typeof(string).FullName),
+                        }),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> TagHelpersInSectionDescriptors
+        {
+            get
+            {
+                var propertyInfo = typeof(TestType).GetRuntimeProperty("BoundProperty");
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "MyTagHelper",
+                        typeName: "TestNamespace.MyTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "BoundProperty", propertyInfo),
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "NestedTagHelper",
+                        typeName: "TestNamespace.NestedTagHelper",
+                        assemblyName: "TestAssembly"),
+                };
+            }
+        }
+
+        public static IEnumerable<TagHelperDescriptor> DefaultPAndInputTagHelperDescriptors
+        {
+            get
+            {
+                var pAgePropertyInfo = typeof(TestType).GetRuntimeProperty("Age");
+                var inputTypePropertyInfo = typeof(TestType).GetRuntimeProperty("Type");
+                var checkedPropertyInfo = typeof(TestType).GetRuntimeProperty("Checked");
+
+                return new[]
+                {
+                    CreateTagHelperDescriptor(
+                        tagName: "p",
+                        typeName: "TestNamespace.PTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "age", pAgePropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireTagStructure(TagStructure.NormalOrSelfClosing)
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", inputTypePropertyInfo),
+                        },
+                        ruleBuilders: new Action<TagMatchingRuleDescriptorBuilder>[]
+                        {
+                            builder => builder.RequireTagStructure(TagStructure.WithoutEndTag)
+                        }),
+                    CreateTagHelperDescriptor(
+                        tagName: "input",
+                        typeName: "TestNamespace.InputTagHelper2",
+                        assemblyName: "TestAssembly",
+                        attributes: new Action<BoundAttributeDescriptorBuilder>[]
+                        {
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", inputTypePropertyInfo),
+                            builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "checked", checkedPropertyInfo),
+                        }),
+                };
+            }
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor(
+            string tagName,
+            string typeName,
+            string assemblyName,
+            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null,
+            IEnumerable<Action<TagMatchingRuleDescriptorBuilder>> ruleBuilders = null)
+        {
+            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
+            builder.TypeName(typeName);
+
+            if (attributes != null)
+            {
+                foreach (var attributeBuilder in attributes)
+                {
+                    builder.BoundAttributeDescriptor(attributeBuilder);
+                }
+            }
+
+            if (ruleBuilders != null)
+            {
+                foreach (var ruleBuilder in ruleBuilders)
+                {
+                    builder.TagMatchingRuleDescriptor(innerRuleBuilder =>
+                    {
+                        innerRuleBuilder.RequireTagName(tagName);
+                        ruleBuilder(innerRuleBuilder);
+                    });
+                }
+            }
+            else
+            {
+                builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
+            }
+
+            var descriptor = builder.Build();
+
+            return descriptor;
+        }
+
+        private static void BuildBoundAttributeDescriptorFromPropertyInfo(
+            BoundAttributeDescriptorBuilder builder,
+            string name,
+            PropertyInfo propertyInfo)
+        {
+            builder
+                .Name(name)
+                .PropertyName(propertyInfo.Name)
+                .TypeName(propertyInfo.PropertyType.FullName);
+
+            if (propertyInfo.PropertyType.GetTypeInfo().IsEnum)
+            {
+                builder.AsEnum();
+            }
+        }
+
+        private class TestType
+        {
+            public int Age { get; set; }
+
+            public string Type { get; set; }
+
+            public bool Checked { get; set; }
+
+            public string BoundProperty { get; set; }
+        }
+
+        public enum MyEnum
+        {
+            MyValue,
+            MySecondValue
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs
new file mode 100644
index 0000000000..f4813684e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs
@@ -0,0 +1,217 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public class DefaultRazorIntermediateNodeBuilderTest
+    {
+        [Fact]
+        public void Ctor_CreatesEmptyBuilder()
+        {
+            // Arrange & Act
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+            var current = builder.Current;
+
+            // Assert
+            Assert.Null(current);
+        }
+
+        [Fact]
+        public void Push_WhenEmpty_AddsNode()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+            var node = new BasicIntermediateNode();
+
+            // Act
+            builder.Push(node);
+
+            // Assert
+            Assert.Same(node, builder.Current);
+        }
+
+        [Fact]
+        public void Push_WhenNonEmpty_SetsUpChild()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var parent = new BasicIntermediateNode();
+            builder.Push(parent);
+
+            var node = new BasicIntermediateNode();
+
+            // Act
+            builder.Push(node);
+
+            // Assert
+            Assert.Same(node, builder.Current);
+            Assert.Collection(parent.Children, n => Assert.Same(node, n));
+        }
+
+        [Fact]
+        public void Pop_ThrowsWhenEmpty()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(
+                () => builder.Pop(),
+                "The 'Pop' operation is not valid when the builder is empty.");
+        }
+
+        [Fact]
+        public void Pop_SingleNodeDepth_RemovesAndReturnsNode()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var node = new BasicIntermediateNode();
+            builder.Push(node);
+
+            // Act
+            var result = builder.Pop();
+
+            // Assert
+            Assert.Same(node, result);
+            Assert.Null(builder.Current);
+        }
+
+        [Fact]
+        public void Pop_MultipleNodeDepth_RemovesAndReturnsNode()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var parent = new BasicIntermediateNode();
+            builder.Push(parent);
+
+            var node = new BasicIntermediateNode();
+            builder.Push(node);
+
+            // Act
+            var result = builder.Pop();
+
+            // Assert
+            Assert.Same(node, result);
+            Assert.Same(parent, builder.Current);
+        }
+
+        [Fact]
+        public void Add_AddsToChildrenAndSetsParent()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var parent = new BasicIntermediateNode();
+            builder.Push(parent);
+
+            var node = new BasicIntermediateNode();
+
+            // Act
+            builder.Add(node);
+
+            // Assert
+            Assert.Same(parent, builder.Current);
+            Assert.Collection(parent.Children, n => Assert.Same(node, n));
+        }
+
+        [Fact]
+        public void Insert_AddsToChildren_EmptyCollection()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var parent = new BasicIntermediateNode();
+            builder.Push(parent);
+
+            var node = new BasicIntermediateNode();
+
+            // Act
+            builder.Insert(0, node);
+
+            // Assert
+            Assert.Same(parent, builder.Current);
+            Assert.Collection(parent.Children, n => Assert.Same(node, n));
+        }
+
+        [Fact]
+        public void Insert_AddsToChildren_NonEmpyCollection()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var parent = new BasicIntermediateNode();
+            builder.Push(parent);
+
+            var child = new BasicIntermediateNode();
+            builder.Add(child);
+
+            var node = new BasicIntermediateNode();
+
+            // Act
+            builder.Insert(0, node);
+
+            // Assert
+            Assert.Same(parent, builder.Current);
+            Assert.Collection(parent.Children, n => Assert.Same(node, n), n => Assert.Same(child, n));
+        }
+
+        [Fact]
+        public void Insert_AddsToChildren_NonEmpyCollection_AtEnd()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var parent = new BasicIntermediateNode();
+            builder.Push(parent);
+
+            var child = new BasicIntermediateNode();
+            builder.Add(child);
+
+            var node = new BasicIntermediateNode();
+
+            // Act
+            builder.Insert(1, node);
+
+            // Assert
+            Assert.Same(parent, builder.Current);
+            Assert.Collection(parent.Children, n => Assert.Same(child, n), n => Assert.Same(node, n));
+        }
+
+        [Fact]
+        public void Build_PopsMultipleLevels()
+        {
+            // Arrange
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+
+            var document = new DocumentIntermediateNode();
+            builder.Push(document);
+
+            var node = new BasicIntermediateNode();
+            builder.Push(node);
+
+            // Act
+            var result = builder.Build();
+
+            // Assert
+            Assert.Same(document, result);
+            Assert.Null(builder.Current);
+        }
+
+        private class BasicIntermediateNode : IntermediateNode
+        {
+            public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+            public override void Accept(IntermediateNodeVisitor visitor)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs
new file mode 100644
index 0000000000..8def071acc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs
@@ -0,0 +1,113 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public class DocumentIntermediateNodeExtensionsTest
+    {
+        [Fact]
+        public void FindPrimaryClass_FindsClassWithAnnotation()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var @class = new ClassDeclarationIntermediateNode();
+            @class.Annotations[CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass;
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(@class);
+
+            // Act
+            var result = document.FindPrimaryClass();
+
+            // Assert
+            Assert.Same(@class, result);
+        }
+
+        [Fact]
+        public void FindPrimaryMethod_FindsMethodWithAnnotation()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var method = new MethodDeclarationIntermediateNode();
+            method.Annotations[CommonAnnotations.PrimaryMethod] = CommonAnnotations.PrimaryMethod;
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(method);
+
+            // Act
+            var result = document.FindPrimaryMethod();
+
+            // Assert
+            Assert.Same(method, result);
+        }
+
+        [Fact]
+        public void FindPrimaryNamespace_FindsNamespaceWithAnnotation()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var @namespace = new NamespaceDeclarationIntermediateNode();
+            @namespace.Annotations[CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace;
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Add(@namespace);
+
+            // Act
+            var result = document.FindPrimaryNamespace();
+
+            // Assert
+            Assert.Same(@namespace, result);
+        }
+
+        [Fact]
+        public void FindDirectiveReferences_FindsMatchingDirectives()
+        {
+            // Arrange
+            var directive = DirectiveDescriptor.CreateSingleLineDirective("test");
+            var directive2 = DirectiveDescriptor.CreateSingleLineDirective("test");
+
+            var document = new DocumentIntermediateNode();
+            var @namespace = new NamespaceDeclarationIntermediateNode();
+
+            var builder = IntermediateNodeBuilder.Create(document);
+            builder.Push(@namespace);
+
+            var match1 = new DirectiveIntermediateNode()
+            {
+                Directive = directive,
+            };
+            builder.Add(match1);
+
+            var nonMatch = new DirectiveIntermediateNode()
+            {
+                Directive = directive2,
+            };
+            builder.Add(nonMatch);
+
+            var match2 = new DirectiveIntermediateNode()
+            {
+                Directive = directive,
+            };
+            builder.Add(match2);
+
+            // Act
+            var results = document.FindDirectiveReferences(directive);
+
+            // Assert
+            Assert.Collection(
+                results,
+                r =>
+                {
+                    Assert.Same(@namespace, r.Parent);
+                    Assert.Same(match1, r.Node);
+                },
+                r =>
+                {
+                    Assert.Same(@namespace, r.Parent);
+                    Assert.Same(match2, r.Node);
+                });
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/ExtensionIntermediateNodeTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/ExtensionIntermediateNodeTest.cs
new file mode 100644
index 0000000000..a4bf7950ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/ExtensionIntermediateNodeTest.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    // These tests cover the methods on ExtensionIntermediateNode that are used to implement visitors
+    // that special case an extension node.
+    public class ExtensionIntermediateNodeTest
+    {
+        [Fact]
+        public void Accept_CallsStandardVisitExtension_ForStandardVisitor()
+        {
+            // Arrange
+            var node = new TestExtensionIntermediateNode();
+            var visitor = new StandardVisitor();
+
+            // Act
+            node.Accept(visitor);
+
+            // Assert
+            Assert.True(visitor.WasStandardMethodCalled);
+            Assert.False(visitor.WasSpecificMethodCalled);
+        }
+
+        [Fact]
+        public void Accept_CallsSpecialVisitExtension_ForSpecialVisitor()
+        {
+            // Arrange
+            var node = new TestExtensionIntermediateNode();
+            var visitor = new SpecialVisitor();
+
+            // Act
+            node.Accept(visitor);
+
+            // Assert
+            Assert.False(visitor.WasStandardMethodCalled);
+            Assert.True(visitor.WasSpecificMethodCalled);
+        }
+
+        private class TestExtensionIntermediateNode : ExtensionIntermediateNode
+        {
+            public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+            public override void Accept(IntermediateNodeVisitor visitor)
+            {
+                // This is the standard visitor boilerplate for an extension node.
+                AcceptExtensionNode<TestExtensionIntermediateNode>(this, visitor);
+            }
+
+            public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class StandardVisitor : IntermediateNodeVisitor
+        {
+            public bool WasStandardMethodCalled { get; private set; }
+            public bool WasSpecificMethodCalled { get; private set; }
+
+            public override void VisitExtension(ExtensionIntermediateNode node)
+            {
+                WasStandardMethodCalled = true;
+            }
+
+            public void VisitExtension(TestExtensionIntermediateNode node)
+            {
+                WasSpecificMethodCalled = true;
+            }
+        }
+
+        private class SpecialVisitor : IntermediateNodeVisitor, IExtensionIntermediateNodeVisitor<TestExtensionIntermediateNode>
+        {
+            public bool WasStandardMethodCalled { get; private set; }
+            public bool WasSpecificMethodCalled { get; private set; }
+
+            public override void VisitExtension(ExtensionIntermediateNode node)
+            {
+                WasStandardMethodCalled = true;
+            }
+
+            public void VisitExtension(TestExtensionIntermediateNode node)
+            {
+                WasSpecificMethodCalled = true;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeReferenceTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeReferenceTest.cs
new file mode 100644
index 0000000000..2adbe06a4f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeReferenceTest.cs
@@ -0,0 +1,510 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public class IntermediateNodeReferenceTest
+    {
+        [Fact]
+        public void InsertAfter_SingleNode_AddsNodeAfterNode()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node3);
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act
+            reference.InsertAfter(node2);
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertAfter_SingleNode_AddsNodeAfterNode_AtEnd()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node2);
+
+            var reference = new IntermediateNodeReference(parent, node2);
+
+            // Act
+            reference.InsertAfter(node3);
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertAfter_MultipleNodes_AddsNodesAfterNode()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+            var node4 = new BasicIntermediateNode("Node4");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node4);
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act
+            reference.InsertAfter(new[] { node2, node3 });
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, node4, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertAfter_MultipleNodes_AddsNodesAfterNode_AtEnd()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+            var node4 = new BasicIntermediateNode("Node4");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node2);
+
+            var reference = new IntermediateNodeReference(parent, node2);
+
+            // Act
+            reference.InsertAfter(new[] { node3, node4 });
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, node4, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertBefore_SingleNode_AddsNodeBeforeNode()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node3);
+
+            var reference = new IntermediateNodeReference(parent, node3);
+
+            // Act
+            reference.InsertBefore(node2);
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertBefore_SingleNode_AddsNodeBeforeNode_AtBeginning()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+
+            parent.Children.Add(node2);
+            parent.Children.Add(node3);
+
+            var reference = new IntermediateNodeReference(parent, node2);
+
+            // Act
+            reference.InsertBefore(node1);
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertBefore_MultipleNodes_AddsNodesBeforeNode()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+            var node4 = new BasicIntermediateNode("Node4");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node4);
+
+            var reference = new IntermediateNodeReference(parent, node4);
+
+            // Act
+            reference.InsertBefore(new[] { node2, node3 });
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, node4, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertAfter_MultipleNodes_AddsNodesBeforeNode_AtBeginning()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+            var node4 = new BasicIntermediateNode("Node4");
+
+            parent.Children.Add(node3);
+            parent.Children.Add(node4);
+
+            var reference = new IntermediateNodeReference(parent, node3);
+
+            // Act
+            reference.InsertBefore(new[] { node1, node2 });
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, node4, }, parent.Children);
+        }
+
+        [Fact]
+        public void Remove_RemovesNode()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node3);
+            parent.Children.Add(node2);
+
+            var reference = new IntermediateNodeReference(parent, node3);
+
+            // Act
+            reference.Remove();
+
+            // Assert
+            Assert.Equal(new[] { node1, node2,}, parent.Children);
+        }
+
+        [Fact]
+        public void Replace_ReplacesNode()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+            var node2 = new BasicIntermediateNode("Node2");
+            var node3 = new BasicIntermediateNode("Node3");
+            var node4 = new BasicIntermediateNode("Node4");
+
+            parent.Children.Add(node1);
+            parent.Children.Add(node4);
+            parent.Children.Add(node3);
+
+            var reference = new IntermediateNodeReference(parent, node4);
+
+            // Act
+            reference.Replace(node2);
+
+            // Assert
+            Assert.Equal(new[] { node1, node2, node3, }, parent.Children);
+        }
+
+        [Fact]
+        public void InsertAfter_SingleNode_ThrowsForReferenceNotInitialized()
+        {
+            // Arrange
+            var reference = new IntermediateNodeReference();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertAfter(new BasicIntermediateNode("_")));
+            Assert.Equal("The reference is invalid. References initialized with the default constructor cannot modify nodes.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertAfter_MulipleNodes_ThrowsForReferenceNotInitialized()
+        {
+            // Arrange
+            var reference = new IntermediateNodeReference();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertAfter(new[] { new BasicIntermediateNode("_") }));
+            Assert.Equal("The reference is invalid. References initialized with the default constructor cannot modify nodes.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertBefore_SingleNode_ThrowsForReferenceNotInitialized()
+        {
+            // Arrange
+            var reference = new IntermediateNodeReference();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertBefore(new BasicIntermediateNode("_")));
+            Assert.Equal("The reference is invalid. References initialized with the default constructor cannot modify nodes.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertBefore_MulipleNodes_ThrowsForReferenceNotInitialized()
+        {
+            // Arrange
+            var reference = new IntermediateNodeReference();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertBefore(new[] { new BasicIntermediateNode("_") }));
+            Assert.Equal("The reference is invalid. References initialized with the default constructor cannot modify nodes.", exception.Message);
+        }
+
+        [Fact]
+        public void Remove_ThrowsForReferenceNotInitialized()
+        {
+            // Arrange
+            var reference = new IntermediateNodeReference();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.Remove());
+            Assert.Equal("The reference is invalid. References initialized with the default constructor cannot modify nodes.", exception.Message);
+        }
+
+        [Fact]
+        public void Replace_ThrowsForReferenceNotInitialized()
+        {
+            // Arrange
+            var reference = new IntermediateNodeReference();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.Replace(new BasicIntermediateNode("_")));
+            Assert.Equal("The reference is invalid. References initialized with the default constructor cannot modify nodes.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertAfter_SingleNode_ThrowsForReadOnlyCollection()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent", IntermediateNodeCollection.ReadOnly);
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertAfter(new BasicIntermediateNode("_")));
+            Assert.Equal("The node 'Parent' has a read-only child collection and cannot be modified.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertAfter_MulipleNodes_ThrowsForReadOnlyCollection()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent", IntermediateNodeCollection.ReadOnly);
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertAfter(new[] { new BasicIntermediateNode("_") }));
+            Assert.Equal("The node 'Parent' has a read-only child collection and cannot be modified.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertBefore_SingleNode_ThrowsForReadOnlyCollection()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent", IntermediateNodeCollection.ReadOnly);
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertBefore(new BasicIntermediateNode("_")));
+            Assert.Equal("The node 'Parent' has a read-only child collection and cannot be modified.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertBefore_MulipleNodes_ThrowsForReadOnlyCollection()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent", IntermediateNodeCollection.ReadOnly);
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertBefore(new[] { new BasicIntermediateNode("_") }));
+            Assert.Equal("The node 'Parent' has a read-only child collection and cannot be modified.", exception.Message);
+        }
+
+        [Fact]
+        public void Remove_ThrowsForReadOnlyCollection()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent", IntermediateNodeCollection.ReadOnly);
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.Remove());
+            Assert.Equal("The node 'Parent' has a read-only child collection and cannot be modified.", exception.Message);
+        }
+
+        [Fact]
+        public void Replace_ThrowsForReadOnlyCollection()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent", IntermediateNodeCollection.ReadOnly);
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.Replace(new BasicIntermediateNode("_")));
+            Assert.Equal("The node 'Parent' has a read-only child collection and cannot be modified.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertAfter_SingleNode_ThrowsForNodeNotFound()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertAfter(new BasicIntermediateNode("_")));
+            Assert.Equal("The reference is invalid. The node 'Node1' could not be found as a child of 'Parent'.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertAfter_MulipleNodes_ThrowsForNodeNotFound()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertAfter(new[] { new BasicIntermediateNode("_") }));
+            Assert.Equal("The reference is invalid. The node 'Node1' could not be found as a child of 'Parent'.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertBefore_SingleNode_ThrowsForNodeNotFound()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertBefore(new BasicIntermediateNode("_")));
+            Assert.Equal("The reference is invalid. The node 'Node1' could not be found as a child of 'Parent'.", exception.Message);
+        }
+
+        [Fact]
+        public void InsertBefore_MulipleNodes_ThrowsForNodeNotFound()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.InsertBefore(new[] { new BasicIntermediateNode("_") }));
+            Assert.Equal("The reference is invalid. The node 'Node1' could not be found as a child of 'Parent'.", exception.Message);
+        }
+
+        [Fact]
+        public void Remove_ThrowsForNodeNotFound()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.Remove());
+            Assert.Equal("The reference is invalid. The node 'Node1' could not be found as a child of 'Parent'.", exception.Message);
+        }
+
+        [Fact]
+        public void Replace_ThrowsForNodeNotFound()
+        {
+            // Arrange
+            var parent = new BasicIntermediateNode("Parent");
+
+            var node1 = new BasicIntermediateNode("Node1");
+
+            var reference = new IntermediateNodeReference(parent, node1);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => reference.Replace(new BasicIntermediateNode("_")));
+            Assert.Equal("The reference is invalid. The node 'Node1' could not be found as a child of 'Parent'.", exception.Message);
+        }
+
+        private class BasicIntermediateNode : IntermediateNode
+        {
+            public BasicIntermediateNode(string name)
+                : this(name, new IntermediateNodeCollection())
+            {
+                Name = name;
+            }
+
+            public BasicIntermediateNode(string name, IntermediateNodeCollection children)
+            {
+                Name = name;
+                Children = children;
+            }
+
+            public string Name { get; }
+
+            public override IntermediateNodeCollection Children { get; }
+
+            public override void Accept(IntermediateNodeVisitor visitor)
+            {
+                throw new System.NotImplementedException();
+            }
+
+            public override string ToString() => Name;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeWalkerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeWalkerTest.cs
new file mode 100644
index 0000000000..f91735f9c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Intermediate/IntermediateNodeWalkerTest.cs
@@ -0,0 +1,140 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public class IntermediateNodeWalkerTest
+    {
+        [Fact]
+        public void IntermediateNodeWalker_Visit_TraversesEntireGraph()
+        {
+            // Arrange
+            var walker = new DerivedIntermediateNodeWalker();
+
+            var nodes = new IntermediateNode[]
+            {
+                new BasicIntermediateNode("Root"),
+                    new BasicIntermediateNode("Root->A"),
+                    new BasicIntermediateNode("Root->B"),
+                        new BasicIntermediateNode("Root->B->1"),
+                        new BasicIntermediateNode("Root->B->2"),
+                    new BasicIntermediateNode("Root->C"),
+            };
+
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+            builder.Push(nodes[0]);
+            builder.Add(nodes[1]);
+            builder.Push(nodes[2]);
+            builder.Add(nodes[3]);
+            builder.Add(nodes[4]);
+            builder.Pop();
+            builder.Add(nodes[5]);
+
+            var root = builder.Pop();
+
+            // Act
+            walker.Visit(root);
+
+            // Assert
+            Assert.Equal(nodes, walker.Visited.ToArray());
+        }
+
+        [Fact]
+        public void IntermediateNodeWalker_Visit_SetsParentAndAncestors()
+        {
+            // Arrange
+            var walker = new DerivedIntermediateNodeWalker();
+
+            var nodes = new IntermediateNode[]
+            {
+                new BasicIntermediateNode("Root"),
+                    new BasicIntermediateNode("Root->A"),
+                    new BasicIntermediateNode("Root->B"),
+                        new BasicIntermediateNode("Root->B->1"),
+                        new BasicIntermediateNode("Root->B->2"),
+                    new BasicIntermediateNode("Root->C"),
+            };
+
+            var ancestors = new Dictionary<string, string[]>()
+            {
+                { "Root", new string[]{ } },
+                { "Root->A", new string[] { "Root" } },
+                { "Root->B", new string[] { "Root" } },
+                { "Root->B->1", new string[] { "Root->B", "Root" } },
+                { "Root->B->2", new string[] { "Root->B", "Root" } },
+                { "Root->C", new string[] { "Root" } },
+            };
+
+            walker.OnVisiting = (n) =>
+            {
+                Assert.Equal(ancestors[((BasicIntermediateNode)n).Name], walker.Ancestors.Cast<BasicIntermediateNode>().Select(b => b.Name));
+                Assert.Equal(ancestors[((BasicIntermediateNode)n).Name].FirstOrDefault(), ((BasicIntermediateNode)walker.Parent)?.Name);
+            };
+
+            var builder = new DefaultRazorIntermediateNodeBuilder();
+            builder.Push(nodes[0]);
+            builder.Add(nodes[1]);
+            builder.Push(nodes[2]);
+            builder.Add(nodes[3]);
+            builder.Add(nodes[4]);
+            builder.Pop();
+            builder.Add(nodes[5]);
+
+            var root = builder.Pop();
+
+            // Act & Assert
+            walker.Visit(root);
+        }
+
+        private class DerivedIntermediateNodeWalker : IntermediateNodeWalker
+        {
+            public new IReadOnlyList<IntermediateNode> Ancestors => base.Ancestors;
+
+            public new IntermediateNode Parent => base.Parent;
+            
+            public List<IntermediateNode> Visited { get; } = new List<IntermediateNode>();
+
+            public Action<IntermediateNode> OnVisiting { get; set; }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                Visited.Add(node);
+
+                OnVisiting?.Invoke(node);
+                base.VisitDefault(node);
+            }
+
+            public virtual void VisitBasic(BasicIntermediateNode node)
+            {
+                VisitDefault(node);
+            }
+        }
+
+        private class BasicIntermediateNode : IntermediateNode
+        {
+            public BasicIntermediateNode(string name)
+            {
+                Name = name;
+            }
+
+            public string Name { get; }
+
+            public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+            public override void Accept(IntermediateNodeVisitor visitor)
+            {
+                ((DerivedIntermediateNodeWalker)visitor).VisitBasic(this);
+            }
+
+            public override string ToString()
+            {
+                return Name;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/LargeTextSourceDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/LargeTextSourceDocumentTest.cs
new file mode 100644
index 0000000000..fb47799b23
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/LargeTextSourceDocumentTest.cs
@@ -0,0 +1,172 @@
+using System.IO;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test
+{
+    public class LargeTextSourceDocumentTest
+    {
+        private const int ChunkTestLength = 10;
+
+        [Fact]
+        public void GetChecksum_ReturnsCopiedChecksum()
+        {
+            // Arrange
+            var contentString = "Hello World";
+            var stream = TestRazorSourceDocument.CreateStreamContent(contentString);
+            var reader = new StreamReader(stream, detectEncodingFromByteOrderMarks: true);
+            var document = new LargeTextSourceDocument(reader, 5, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var firstChecksum = document.GetChecksum();
+            var secondChecksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(firstChecksum, secondChecksum);
+            Assert.NotSame(firstChecksum, secondChecksum);
+        }
+
+        [Fact]
+        public void GetChecksum_ComputesCorrectChecksum_UTF8()
+        {
+            // Arrange
+            var contentString = "Hello World";
+            var stream = TestRazorSourceDocument.CreateStreamContent(contentString);
+            var reader = new StreamReader(stream, detectEncodingFromByteOrderMarks: true);
+            var document = new LargeTextSourceDocument(reader, 5, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+            var expectedChecksum = new byte[] { 10, 77, 85, 168, 215, 120, 229, 2, 47, 171, 112, 25, 119, 197, 216, 64, 187, 196, 134, 208 };
+
+            // Act
+            var checksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(expectedChecksum, checksum);
+        }
+
+        [Fact]
+        public void GetChecksum_ComputesCorrectChecksum_UTF32()
+        {
+            // Arrange
+            var contentString = "Hello World";
+            var stream = TestRazorSourceDocument.CreateStreamContent(contentString, Encoding.UTF32);
+            var reader = new StreamReader(stream, detectEncodingFromByteOrderMarks: true);
+            var document = new LargeTextSourceDocument(reader, 5, Encoding.UTF32, RazorSourceDocumentProperties.Default);
+            var expectedChecksum = new byte[] { 108, 172, 130, 171, 42, 19, 155, 176, 211, 80, 224, 121, 169, 133, 25, 134, 48, 228, 199, 141 };
+
+            // Act
+            var checksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(expectedChecksum, checksum);
+        }
+
+        [Theory]
+        [InlineData(ChunkTestLength - 1)]
+        [InlineData(ChunkTestLength)]
+        [InlineData(ChunkTestLength + 1)]
+        [InlineData(ChunkTestLength * 2 - 1)]
+        [InlineData(ChunkTestLength * 2)]
+        [InlineData(ChunkTestLength * 2 + 1)]
+        public void Indexer_ProvidesCharacterAccessToContent(int contentLength)
+        {
+            // Arrange
+            var content = new char[contentLength];
+
+            for (var i = 0; i < contentLength - 1; i++)
+            {
+                content[i] = 'a';
+            }
+            content[contentLength - 1] = 'b';
+            var contentString = new string(content);
+
+            var stream = TestRazorSourceDocument.CreateStreamContent(new string(content));
+            var reader = new StreamReader(stream, true);
+            var document = new LargeTextSourceDocument(reader, ChunkTestLength, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var output = new char[contentLength];
+            for (var i = 0; i < document.Length; i++)
+            {
+                output[i] = document[i];
+            }
+            var outputString = new string(output);
+
+            // Assert
+            Assert.Equal(contentLength, document.Length);
+            Assert.Equal(contentString, outputString);
+        }
+
+        [Theory]
+        [InlineData("test.cshtml")]
+        [InlineData(null)]
+        public void FilePath(string filePath)
+        {
+            // Arrange
+            var stream = TestRazorSourceDocument.CreateStreamContent("abc");
+            var reader = new StreamReader(stream, true);
+
+            // Act
+            var document = new LargeTextSourceDocument(reader, ChunkTestLength, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: filePath, relativePath: null));
+
+            // Assert
+            Assert.Equal(filePath, document.FilePath);
+        }
+
+        [Theory]
+        [InlineData("test.cshtml")]
+        [InlineData(null)]
+        public void RelativePath(string relativePath)
+        {
+            // Arrange
+            var stream = TestRazorSourceDocument.CreateStreamContent("abc");
+            var reader = new StreamReader(stream, true);
+
+            // Act
+            var document = new LargeTextSourceDocument(reader, ChunkTestLength, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: relativePath));
+
+            // Assert
+            Assert.Equal(relativePath, document.RelativePath);
+        }
+
+        [Fact]
+        public void Lines()
+        {
+            // Arrange
+            var stream = TestRazorSourceDocument.CreateStreamContent("abc\ndef\nghi");
+            var reader = new StreamReader(stream, true);
+
+            // Act
+            var document = new LargeTextSourceDocument(reader, ChunkTestLength, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Assert
+            Assert.Equal(3, document.Lines.Count);
+        }
+
+        [Theory]
+        [InlineData("", 0, 0, 0)]                                   // Nothing to copy
+        [InlineData("a", 0, 100, 1)]                                // Destination index different from start
+        [InlineData("j", ChunkTestLength - 1, 0, 1)]                // One char just before the chunk limit
+        [InlineData("k", ChunkTestLength, 0, 1)]                    // One char one the chunk limit
+        [InlineData("l", ChunkTestLength + 1, 0, 1)]                // One char just after the chunk limit
+        [InlineData("jk", ChunkTestLength - 1, 0, 2)]               // Two char that are on both chunk sides
+        [InlineData("abcdefghijklmnopqrstuvwxy", 0, 100, 25)]       // Everything except the last
+        [InlineData("abcdefghijklmnopqrstuvwxyz", 0, 0, 26)]        // Copy all
+        [InlineData("xyz", 23, 0, 3)]                               // The last chars
+        public void CopyTo(string expected, int sourceIndex, int destinationIndex, int count)
+        {
+            // Arrange
+            var stream = TestRazorSourceDocument.CreateStreamContent("abcdefghijklmnopqrstuvwxyz");
+
+            var reader = new StreamReader(stream, true);
+            var document = new LargeTextSourceDocument(reader, ChunkTestLength, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var destination = new char[1000];
+            document.CopyTo(sourceIndex, destination, destinationIndex, count);
+
+            // Assert
+            var copy = new string(destination, destinationIndex, count);
+            Assert.Equal(expected, copy);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/BaselineWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/BaselineWriter.cs
new file mode 100644
index 0000000000..eee1a8fd58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/BaselineWriter.cs
@@ -0,0 +1,46 @@
+// 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.Diagnostics;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public static class BaselineWriter
+    {
+        private static object baselineLock = new object();
+
+        [Conditional("GENERATE_BASELINES")]
+        public static void WriteBaseline(string baselineFile, string output)
+        {
+            var root = RecursiveFind("Razor.sln", Path.GetFullPath("."));
+            var baselinePath = Path.Combine(root, baselineFile);
+
+            // Serialize writes to minimize contention for file handles and directory access.
+            lock (baselineLock)
+            {
+                // Update baseline
+                using (var stream = File.Open(baselinePath, FileMode.Create, FileAccess.Write))
+                {
+                    using (var writer = new StreamWriter(stream))
+                    {
+                        writer.Write(output);
+                    }
+                }
+            }
+        }
+
+        private static string RecursiveFind(string path, string start)
+        {
+            var test = Path.Combine(start, path);
+            if (File.Exists(test))
+            {
+                return start;
+            }
+            else
+            {
+                return RecursiveFind(path, new DirectoryInfo(start).Parent.FullName);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpAutoCompleteTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpAutoCompleteTest.cs
new file mode 100644
index 0000000000..7e4ae9cf5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpAutoCompleteTest.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpAutoCompleteTest : ParserTestBase
+    {
+        [Fact]
+        public void FunctionsDirectiveAutoCompleteAtEOF()
+        {
+            // Arrange, Act & Assert
+            ParseDocumentTest("@functions{", new[] { FunctionsDirective.Directive });
+        }
+
+        [Fact]
+        public void SectionDirectiveAutoCompleteAtEOF()
+        {
+            // Arrange, Act & Assert
+            ParseDocumentTest("@section Header {", new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void VerbatimBlockAutoCompleteAtEOF()
+        {
+            ParseDocumentTest("@{");
+        }
+
+        [Fact]
+        public void FunctionsDirectiveAutoCompleteAtStartOfFile()
+        {
+            // Arrange, Act & Assert
+            ParseDocumentTest("@functions{" + Environment.NewLine + "foo", new[] { FunctionsDirective.Directive });
+        }
+
+        [Fact]
+        public void SectionDirectiveAutoCompleteAtStartOfFile()
+        {
+            // Arrange, Act & Assert
+            ParseDocumentTest("@section Header {" + Environment.NewLine + "<p>Foo</p>", new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void VerbatimBlockAutoCompleteAtStartOfFile()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine + "<p></p>");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
new file mode 100644
index 0000000000..7c66f7e2d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
@@ -0,0 +1,719 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpBlockTest : ParserTestBase
+    {
+        [Fact]
+        public void LocalFunctionsWithRazor()
+        {
+            ParseDocumentTest(
+@"@{
+    void Foo() 
+    {
+        var time = DateTime.Now
+        <strong>Hello the time is @time</strong>
+    }
+}");
+        }
+
+        [Fact]
+        public void LocalFunctionsWithGenerics()
+        {
+            ParseDocumentTest(
+@"@{
+    void Foo()
+    {
+        <strong>Hello the time is @{ DisplayCount(new List<string>()); }</strong>
+    }
+
+    void DisplayCount<T>(List<T> something)
+    {
+        <text>The count is something.Count</text>
+    }
+}");
+        }
+
+        [Fact]
+        public void NestedCodeBlockWithCSharpAt()
+        {
+            ParseDocumentTest("@{ if (true) { var val = @x; if (val != 3) { } } }");
+        }
+
+        [Fact]
+        public void NestedCodeBlockWithMarkupSetsDotAsMarkup()
+        {
+            ParseDocumentTest("@if (true) { @if(false) { <div>@something.</div> } }");
+        }
+
+        [Fact]
+        public void BalancingBracketsIgnoresStringLiteralCharactersAndBrackets()
+        {
+            // BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments
+            ParseDocumentTest(@"@if(foo) {
+    // bar } "" baz '
+    zoop();
+}");
+        }
+
+        [Fact]
+        public void NestedCodeBlockWithAtDoesntCauseError()
+        {
+            ParseDocumentTest("@if (true) { @if(false) { } }");
+        }
+
+        [Fact]
+        public void BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments()
+        {
+            ParseDocumentTest(
+                @"@if(foo) {
+    /* bar } "" */ ' baz } '
+    zoop();
+}");
+        }
+
+        [Fact]
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword
+            ParseDocumentTest(
+                "@for(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
+        }
+
+        [Fact]
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword
+            ParseDocumentTest(
+                "@foreach(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
+        }
+
+        [Fact]
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword
+            ParseDocumentTest(
+                "@while(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
+        }
+
+        [Fact]
+        public void SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen
+            ParseDocumentTest(
+                "@using(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
+        }
+
+        [Fact]
+        public void SupportsUsingsNestedWithinOtherBlocks()
+        {
+            ParseDocumentTest(
+                "@if(foo) { using(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); } }");
+        }
+
+        [Fact]
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches
+            ParseDocumentTest(
+                "@if(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
+        }
+
+        [Fact]
+        public void AllowsEmptyBlockStatement()
+        {
+            ParseDocumentTest("@if(false) { }");
+        }
+
+        [Fact]
+        public void TerminatesParenBalancingAtEOF()
+        {
+            ParseDocumentTest("@Html.En(code()");
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenIfAndElseClause()
+        {
+            ParseDocumentTest(
+                "@if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenIfAndElseClause()
+        {
+            RunRazorCommentBetweenClausesTest(
+                "@if(foo) { bar(); } ", " else { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenElseIfAndElseClause()
+        {
+            ParseDocumentTest(
+                "@if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenElseIfAndElseClause()
+        {
+            RunRazorCommentBetweenClausesTest(
+                "@if(foo) { bar(); } else if(bar) { baz(); } ", " else { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenIfAndElseIfClause()
+        {
+            ParseDocumentTest(
+                "if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenIfAndElseIfClause()
+        {
+            RunRazorCommentBetweenClausesTest("@if(foo) { bar(); } ", " else if(bar) { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenIfAndElseClause()
+        {
+            ParseDocumentTest(@"@if(foo) { bar(); }
+// Foo
+// Bar
+else { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenElseIfAndElseClause()
+        {
+            ParseDocumentTest(@"@if(foo) { bar(); } else if(bar) { baz(); }
+// Foo
+// Bar
+else { biz(); }");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenIfAndElseIfClause()
+        {
+            ParseDocumentTest(@"@if(foo) { bar(); }
+// Foo
+// Bar
+else if(bar) { baz(); }");
+        }
+
+        [Fact]
+        public void ParsesElseIfBranchesOfIfStatement()
+        {
+            const string ifStatement = @"@if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""foo } bar"");
+}";
+            const string elseIfBranch = @" else if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""bar } baz"");
+}";
+            const string document = ifStatement + elseIfBranch;
+
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void ParsesMultipleElseIfBranchesOfIfStatement()
+        {
+            const string ifStatement = @"@if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""foo } bar"");
+}";
+            const string elseIfBranch = @" else if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""bar } baz"");
+}";
+            const string document = ifStatement + elseIfBranch + elseIfBranch + elseIfBranch + elseIfBranch;
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch()
+        {
+            const string ifStatement = @"@if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""foo } bar"");
+}";
+            const string elseIfBranch = @" else if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""bar } baz"");
+}";
+            const string elseBranch = @" else { Debug.WriteLine(@""bar } baz""); }";
+            const string document = ifStatement + elseIfBranch + elseIfBranch + elseBranch;
+
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void StopsParsingCodeAfterElseBranch()
+        {
+            const string ifStatement = @"@if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""foo } bar"");
+}";
+            const string elseIfBranch = @" else if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""bar } baz"");
+}";
+            const string elseBranch = @" else { Debug.WriteLine(@""bar } baz""); }";
+            const string document = ifStatement + elseIfBranch + elseBranch + elseIfBranch;
+
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void StopsParsingIfIfStatementNotFollowedByElse()
+        {
+            const string document = @"@if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""foo } bar"");
+}";
+
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void AcceptsElseIfWithNoCondition()
+        {
+            // We don't want to be a full C# parser - If the else if is missing it's condition, the C# compiler
+            // can handle that, we have all the info we need to keep parsing
+            const string ifBranch = @"@if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
+    Debug.WriteLine(@""foo } bar"");
+}";
+            const string elseIfBranch = @" else if { foo(); }";
+            const string document = ifBranch + elseIfBranch;
+
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void CorrectlyParsesDoWhileBlock()
+        {
+            ParseDocumentTest(
+                "@do { var foo = bar; } while(foo != bar);");
+        }
+
+        [Fact]
+        public void CorrectlyParsesDoWhileBlockMissingSemicolon()
+        {
+            ParseDocumentTest("@do { var foo = bar; } while(foo != bar)");
+        }
+
+        [Fact]
+        public void CorrectlyParsesDoWhileBlockMissingWhileCondition()
+        {
+            ParseDocumentTest("@do { var foo = bar; } while");
+        }
+
+        [Fact]
+        public void CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon()
+        {
+            ParseDocumentTest(
+                "@do { var foo = bar; } while;");
+        }
+
+        [Fact]
+        public void CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely()
+        {
+            ParseDocumentTest("@do { var foo = bar; } narf;");
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenDoAndWhileClause()
+        {
+            ParseDocumentTest(
+                "@do { var foo = bar; } /* Foo */ /* Bar */ while(true);");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenDoAndWhileClause()
+        {
+            ParseDocumentTest(@"@do { var foo = bar; }
+// Foo
+// Bar
+while(true);");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenDoAndWhileClause()
+        {
+            RunRazorCommentBetweenClausesTest(
+                "@do { var foo = bar; } ", " while(true);");
+        }
+
+        [Fact]
+        public void CorrectlyParsesMarkupInDoWhileBlock()
+        {
+            ParseDocumentTest("@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);");
+        }
+
+        [Fact]
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword
+            ParseDocumentTest(@"@switch(foo) {
+    case 0:
+        break;
+    case 1:
+        {
+            break;
+        }
+    case 2:
+        return;
+    default:
+        return;
+}");
+        }
+
+        [Fact]
+        public void ThenBalancesBracesIfFirstIdentifierIsLockKeyword()
+        {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword
+            ParseDocumentTest(
+                "@lock(foo) { Debug.WriteLine(@\"foo } bar\"); }");
+        }
+
+        [Fact]
+        public void HasErrorsIfNamespaceImportMissingSemicolon()
+        {
+            ParseDocumentTest(
+                "@using Foo.Bar.Baz");
+        }
+
+        [Fact]
+        public void HasErrorsIfNamespaceAliasMissingSemicolon()
+        {
+            ParseDocumentTest(
+                "@using Foo.Bar.Baz = FooBarBaz");
+        }
+
+        [Fact]
+        public void ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat()
+        {
+            ParseDocumentTest(
+                "@using Foo.Bar.Baz;");
+        }
+
+        [Fact]
+        public void DoesntCaptureWhitespaceAfterUsing()
+        {
+            ParseDocumentTest("@using Foo   ");
+        }
+
+        [Fact]
+        public void CapturesNewlineAfterUsing()
+        {
+            ParseDocumentTest($"@using Foo{Environment.NewLine}");
+        }
+
+        [Fact]
+        public void ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat()
+        {
+            ParseDocumentTest(
+                "@using FooBarBaz = FooBarBaz;");
+        }
+
+        [Fact]
+        public void TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock()
+        {
+            ParseDocumentTest("@using                    ");
+        }
+
+        [Fact]
+        public void TerminatesSingleLineCommentAtEndOfFile()
+        {
+            const string document = "@foreach(var f in Foo) { // foo bar baz";
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void TerminatesBlockCommentAtEndOfFile()
+        {
+            const string document = "@foreach(var f in Foo) { /* foo bar baz";
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void TerminatesSingleSlashAtEndOfFile()
+        {
+            const string document = "@foreach(var f in Foo) { / foo bar baz";
+            ParseDocumentTest(document);
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenTryAndFinallyClause()
+        {
+            ParseDocumentTest("@try { bar(); } /* Foo */ /* Bar */ finally { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenTryAndFinallyClause()
+        {
+            RunRazorCommentBetweenClausesTest("@try { bar(); } ", " finally { biz(); }");
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenCatchAndFinallyClause()
+        {
+            ParseDocumentTest(
+                "@try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenCatchAndFinallyClause()
+        {
+            RunRazorCommentBetweenClausesTest(
+                "@try { bar(); } catch(bar) { baz(); } ", " finally { biz(); }");
+        }
+
+        [Fact]
+        public void SupportsBlockCommentBetweenTryAndCatchClause()
+        {
+            ParseDocumentTest("@try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsRazorCommentBetweenTryAndCatchClause()
+        {
+            RunRazorCommentBetweenClausesTest("@try { bar(); }", " catch(bar) { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenTryAndFinallyClause()
+        {
+            ParseDocumentTest(@"@try { bar(); }
+// Foo
+// Bar
+finally { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenCatchAndFinallyClause()
+        {
+            ParseDocumentTest(@"@try { bar(); } catch(bar) { baz(); }
+// Foo
+// Bar
+finally { biz(); }");
+        }
+
+        [Fact]
+        public void SupportsLineCommentBetweenTryAndCatchClause()
+        {
+            ParseDocumentTest(@"@try { bar(); }
+// Foo
+// Bar
+catch(bar) { baz(); }");
+        }
+
+        [Fact]
+        public void SupportsTryStatementWithNoAdditionalClauses()
+        {
+            ParseDocumentTest("@try { var foo = new { } }");
+        }
+
+        [Fact]
+        public void SupportsMarkupWithinTryClause()
+        {
+            RunSimpleWrappedMarkupTest(
+                prefix: "@try {",
+                markup: " <p>Foo</p> ",
+                suffix: "}");
+        }
+
+        [Fact]
+        public void SupportsTryStatementWithOneCatchClause()
+        {
+            ParseDocumentTest("@try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }");
+        }
+
+        [Fact]
+        public void SupportsMarkupWithinCatchClause()
+        {
+            RunSimpleWrappedMarkupTest(
+                prefix: "@try { var foo = new { } } catch(Foo Bar Baz) {",
+                markup: " <p>Foo</p> ",
+                suffix: "}");
+        }
+
+        [Fact]
+        public void SupportsTryStatementWithMultipleCatchClause()
+        {
+            ParseDocumentTest(
+                "@try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) " +
+                "{ var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }");
+        }
+
+        [Fact]
+        public void SupportsExceptionLessCatchClauses()
+        {
+            ParseDocumentTest("@try { var foo = new { } } catch { var foo = new { } }");
+        }
+
+        [Fact]
+        public void SupportsMarkupWithinAdditionalCatchClauses()
+        {
+            RunSimpleWrappedMarkupTest(
+                prefix: "@try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) " +
+                "{ var foo = new { } } catch(Foo Bar Baz) {",
+                markup: " <p>Foo</p> ",
+                suffix: "}");
+        }
+
+        [Fact]
+        public void SupportsTryStatementWithFinallyClause()
+        {
+            ParseDocumentTest("@try { var foo = new { } } finally { var foo = new { } }");
+        }
+
+        [Fact]
+        public void SupportsMarkupWithinFinallyClause()
+        {
+            RunSimpleWrappedMarkupTest(
+                prefix: "@try { var foo = new { } } finally {",
+                markup: " <p>Foo</p> ",
+                suffix: "}");
+        }
+
+        [Fact]
+        public void StopsParsingCatchClausesAfterFinallyBlock()
+        {
+            var content = "@try { var foo = new { } } finally { var foo = new { } }";
+            ParseDocumentTest(content + " catch(Foo Bar Baz) { }");
+        }
+
+        [Fact]
+        public void DoesNotAllowMultipleFinallyBlocks()
+        {
+            var content = "@try { var foo = new { } } finally { var foo = new { } }";
+            ParseDocumentTest(content + " finally { }");
+        }
+
+        [Fact]
+        public void AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @foo. }");
+        }
+
+        [Fact]
+        public void ParsesExpressionOnSwitchCharacterFollowedByOpenParen()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @(foo + bar) }");
+        }
+
+        [Fact]
+        public void ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @foo[4].bar() }");
+        }
+
+        [Fact]
+        public void TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @@class.Foo() }");
+        }
+
+        [Fact]
+        public void TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @@@@class.Foo() }");
+        }
+
+        [Fact]
+        public void DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon()
+        {
+            // ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon
+            // Arrange
+            ParseDocumentTest("@if(foo) { @\"Foo\".ToString(); }");
+        }
+
+        [Fact]
+        public void ParsersCanNestRecursively()
+        {
+            // Arrange
+            ParseDocumentTest("@foreach(var c in db.Categories) {" + Environment.NewLine
+                         + "            <div>" + Environment.NewLine
+                         + "                <h1>@c.Name</h1>" + Environment.NewLine
+                         + "                <ul>" + Environment.NewLine
+                         + "                    @foreach(var p in c.Products) {" + Environment.NewLine
+                         + "                        <li><a href=\"@Html.ActionUrl(\"Products\", \"Detail\", new { id = p.Id })\">@p.Name</a></li>" + Environment.NewLine
+                         + "                    }" + Environment.NewLine
+                         + "                </ul>" + Environment.NewLine
+                         + "            </div>" + Environment.NewLine
+                         + "        }");
+        }
+
+        [Fact]
+        public void WithDoubleTransitionInAttributeValue_DoesNotThrow()
+        {
+            var input = "@{<span foo='@@' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow()
+        {
+            var input = "@{<span foo='abc@@' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow()
+        {
+            var input = "@{<span foo='@@def' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionBetweenAttributeValue_DoesNotThrow()
+        {
+            var input = "@{<span foo='abc @@ def' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionWithExpressionBlock_DoesNotThrow()
+        {
+            var input = "@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionInEmail_DoesNotThrow()
+        {
+            var input = "@{<span foo='abc@def.com abc@@def.com @@' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionInRegex_DoesNotThrow()
+        {
+            var input = @"@{<span foo=""/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"" />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransition_EndOfFile_Throws()
+        {
+            ParseDocumentTest("@{<span foo='@@");
+        }
+
+        [Fact]
+        public void WithUnexpectedTransitionsInAttributeValue_Throws()
+        {
+            ParseDocumentTest("@{<span foo='@ @' />}");
+        }
+
+        private void RunRazorCommentBetweenClausesTest(string preComment, string postComment, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
+        {
+            ParseDocumentTest(preComment + "@* Foo *@ @* Bar *@" + postComment);
+        }
+
+        private void RunSimpleWrappedMarkupTest(string prefix, string markup, string suffix)
+        {
+            ParseDocumentTest(prefix + markup + suffix);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpCodeParserTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpCodeParserTest.cs
new file mode 100644
index 0000000000..250eff4f40
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpCodeParserTest.cs
@@ -0,0 +1,215 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
+{
+    public class CSharpCodeParserTest
+    {
+        public static TheoryData InvalidTagHelperPrefixData
+        {
+            get
+            {
+                var directiveLocation = new SourceLocation(1, 2, 3);
+
+                RazorDiagnostic InvalidPrefixError(int length, char character, string prefix)
+                {
+                    return RazorDiagnosticFactory.CreateParsing_InvalidTagHelperPrefixValue(
+                        new SourceSpan(directiveLocation, length), SyntaxConstants.CSharp.TagHelperPrefixKeyword, character, prefix);
+                }
+
+                return new TheoryData<string, SourceLocation, IEnumerable<RazorDiagnostic>>
+                {
+                    {
+                        "th ",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(3, ' ', "th "),
+                        }
+                    },
+                    {
+                        "th\t",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(3, '\t', "th\t"),
+                        }
+                    },
+                    {
+                        "th" + Environment.NewLine,
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(2 + Environment.NewLine.Length, Environment.NewLine[0], "th" + Environment.NewLine),
+                        }
+                    },
+                    {
+                        " th ",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(4, ' ', " th "),
+                        }
+                    },
+                    {
+                        "@",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(1, '@', "@"),
+                        }
+                    },
+                    {
+                        "t@h",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(3, '@', "t@h"),
+                        }
+                    },
+                    {
+                        "!",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(1, '!', "!"),
+                        }
+                    },
+                    {
+                        "!th",
+                        directiveLocation,
+                        new[]
+                        {
+                            InvalidPrefixError(3, '!', "!th"),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidTagHelperPrefixData))]
+        public void ValidateTagHelperPrefix_ValidatesPrefix(
+            string directiveText,
+            SourceLocation directiveLocation,
+            object expectedErrors)
+        {
+            // Arrange
+            var expectedDiagnostics = (IEnumerable<RazorDiagnostic>)expectedErrors;
+            var source = TestRazorSourceDocument.Create();
+            var options = RazorParserOptions.CreateDefault();
+            var context = new ParserContext(source, options);
+
+            var parser = new CSharpCodeParser(context);
+            var diagnostics = new List<RazorDiagnostic>();
+
+            // Act
+            parser.ValidateTagHelperPrefix(directiveText, directiveLocation, diagnostics);
+
+            // Assert
+            Assert.Equal(expectedDiagnostics, diagnostics);
+        }
+
+        [Theory]
+        [InlineData("foo,assemblyName", 4)]
+        [InlineData("foo, assemblyName", 5)]
+        [InlineData("   foo, assemblyName", 8)]
+        [InlineData("   foo   , assemblyName", 11)]
+        [InlineData("foo,    assemblyName", 8)]
+        [InlineData("   foo   ,    assemblyName   ", 14)]
+        public void ParseAddOrRemoveDirective_CalculatesAssemblyLocationInLookupText(string text, int assemblyLocation)
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+            var options = RazorParserOptions.CreateDefault();
+            var context = new ParserContext(source, options);
+
+            var parser = new CSharpCodeParser(context);
+
+            var directive = new CSharpCodeParser.ParsedDirective()
+            {
+                DirectiveText = text,
+            };
+
+            var diagnostics = new List<RazorDiagnostic>();
+            var expected = new SourceLocation(assemblyLocation, 0, assemblyLocation);
+
+            // Act
+            var result = parser.ParseAddOrRemoveDirective(directive, SourceLocation.Zero, diagnostics);
+
+            // Assert
+            Assert.Empty(diagnostics);
+            Assert.Equal("foo", result.TypePattern);
+            Assert.Equal("assemblyName", result.AssemblyName);
+        }
+
+        [Theory]
+        [InlineData("", 1)]
+        [InlineData("*,", 2)]
+        [InlineData("?,", 2)]
+        [InlineData(",", 1)]
+        [InlineData(",,,", 3)]
+        [InlineData("First, ", 7)]
+        [InlineData("First , ", 8)]
+        [InlineData(" ,Second", 8)]
+        [InlineData(" , Second", 9)]
+        [InlineData("SomeType,", 9)]
+        [InlineData("SomeAssembly", 12)]
+        [InlineData("First,Second,Third", 18)]
+        public void ParseAddOrRemoveDirective_CreatesErrorIfInvalidLookupText_DoesNotThrow(string directiveText, int errorLength)
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+            var options = RazorParserOptions.CreateDefault();
+            var context = new ParserContext(source, options);
+
+            var parser = new CSharpCodeParser(context);
+
+            var directive = new CSharpCodeParser.ParsedDirective()
+            {
+                DirectiveText = directiveText
+            };
+
+            var diagnostics = new List<RazorDiagnostic>();
+            var expectedError = RazorDiagnosticFactory.CreateParsing_InvalidTagHelperLookupText(
+                new SourceSpan(new SourceLocation(1, 2, 3), errorLength), directiveText);
+
+            // Act
+            var result = parser.ParseAddOrRemoveDirective(directive, new SourceLocation(1, 2, 3), diagnostics);
+
+            // Assert
+            Assert.Same(directive, result);
+
+            var error = Assert.Single(diagnostics);
+            Assert.Equal(expectedError, error);
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_DuplicatesCauseError()
+        {
+            // Arrange
+            var expectedDiagnostic = RazorDiagnosticFactory.CreateParsing_DuplicateDirective(
+                new SourceSpan(null, 22 + Environment.NewLine.Length, 1, 0, 16), "tagHelperPrefix");
+            var source = TestRazorSourceDocument.Create(
+                @"@tagHelperPrefix ""th:""
+@tagHelperPrefix ""th""",
+                filePath: null);
+
+            // Act
+            var document = RazorSyntaxTree.Parse(source);
+
+            // Assert
+            var erroredNode = document.Root.DescendantNodes().Last(n => n.GetSpanContext()?.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator);
+            var chunkGenerator = Assert.IsType<TagHelperPrefixDirectiveChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
+            var diagnostic = Assert.Single(chunkGenerator.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpErrorTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpErrorTest.cs
new file mode 100644
index 0000000000..bc3284ee23
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpErrorTest.cs
@@ -0,0 +1,345 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpErrorTest : ParserTestBase
+    {
+        [Fact]
+        public void HandlesQuotesAfterTransition()
+        {
+            ParseDocumentTest("@\"");
+        }
+
+        [Fact]
+        public void WithHelperDirectiveProducesError()
+        {
+            ParseDocumentTest("@helper fooHelper { }");
+        }
+
+        [Fact]
+        public void WithNestedCodeBlockProducesError()
+        {
+            ParseDocumentTest("@if { @{} }");
+        }
+
+        [Fact]
+        public void CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode()
+        {
+            // ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode
+            ParseDocumentTest(
+                "@using          " + Environment.NewLine + Environment.NewLine);
+        }
+
+        [Fact]
+        public void MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace()
+        {
+            ParseDocumentTest("@{");
+        }
+
+        [Fact]
+        public void MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty()
+        {
+            ParseDocumentTest("@{}");
+        }
+
+        [Fact]
+        public void MethodProducesErrorIfNewlineFollowsTransition()
+        {
+            ParseDocumentTest("@" + Environment.NewLine);
+        }
+
+        [Fact]
+        public void MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr()
+        {
+            // ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression
+            ParseDocumentTest("@{" + Environment.NewLine
+                         + "    @   {}" + Environment.NewLine
+                         + "}");
+        }
+
+        [Fact]
+        public void MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                         + "    @");
+        }
+
+        [Fact]
+        public void MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace()
+        {
+            ParseDocumentTest("@!!!");
+        }
+
+        [Fact]
+        public void ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed()
+        {
+            // ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed
+            ParseDocumentTest("@(foo bar" + Environment.NewLine
+                         + "baz");
+        }
+
+        [Fact]
+        public void ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed()
+        {
+            // ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed
+            ParseDocumentTest("@(foo bar" + Environment.NewLine
+                         + "<html>" + Environment.NewLine
+                         + "baz" + Environment.NewLine
+                         + "</html");
+        }
+
+        [Fact]
+        public void CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed()
+        {
+            ParseDocumentTest("@Href(" + Environment.NewLine
+                         + "<h1>@Html.Foo(Bar);</h1>" + Environment.NewLine);
+        }
+
+        [Fact]
+        // Test for fix to Dev10 884975 - Incorrect Error Messaging
+        public void ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed()
+        {
+            // ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed
+            ParseDocumentTest("@Foo(Bar(Baz)" + Environment.NewLine
+                            + "Biz" + Environment.NewLine
+                            + "Boz");
+        }
+
+        [Fact]
+        // Test for fix to Dev10 884975 - Incorrect Error Messaging
+        public void ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed()
+        {
+            // ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed
+            ParseDocumentTest("@Foo(Bar(Baz)" + Environment.NewLine
+                            + "Biz" + Environment.NewLine
+                            + "<html>" + Environment.NewLine
+                            + "Boz" + Environment.NewLine
+                            + "</html>");
+        }
+
+        [Fact]
+        // Test for fix to Dev10 884975 - Incorrect Error Messaging
+        public void ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed()
+        {
+            // ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed
+            ParseDocumentTest("@Foo[Bar[Baz]" + Environment.NewLine
+                         + "Biz" + Environment.NewLine
+                         + "Boz");
+        }
+
+        [Fact]
+        // Test for fix to Dev10 884975 - Incorrect Error Messaging
+        public void ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed()
+        {
+            // ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed
+            ParseDocumentTest("@Foo[Bar[Baz]" + Environment.NewLine
+                         + "Biz" + Environment.NewLine
+                         + "<b>" + Environment.NewLine
+                         + "Boz" + Environment.NewLine
+                         + "</b>");
+        }
+
+        // Simple EOF handling errors:
+        [Fact]
+        public void ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@{ var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfClassBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest(
+                "@functions { var foo = bar; if(foo != null) { bar(); } ",
+                new[] { FunctionsDirective.Directive });
+        }
+
+        [Fact]
+        public void ReportsErrorIfIfBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@if");
+        }
+
+        [Fact]
+        public void ReportsErrorIfElseBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfElseIfBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfDoBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@do { var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfTryBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@try { var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfCatchBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfFinallyBlockUnterminatedAtEOF()
+        {
+            ParseDocumentTest("@try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ");
+        }
+
+        [Fact]
+        public void ReportsErrorIfForBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@for");
+        }
+
+        [Fact]
+        public void ReportsErrorIfForeachBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@foreach");
+        }
+
+        [Fact]
+        public void ReportsErrorIfWhileBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@while");
+        }
+
+        [Fact]
+        public void ReportsErrorIfSwitchBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@switch");
+        }
+
+        [Fact]
+        public void ReportsErrorIfLockBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@lock");
+        }
+
+        [Fact]
+        public void ReportsErrorIfUsingBlockUnterminatedAtEOF()
+        {
+            RunUnterminatedSimpleKeywordBlock("@using");
+        }
+
+        [Fact]
+        public void RequiresControlFlowStatementsToHaveBraces()
+        {
+            ParseDocumentTest("@if(foo) <p>Bar</p> else if(bar) <p>Baz</p> else <p>Boz</p>");
+        }
+
+        [Fact]
+        public void IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError()
+        {
+            ParseDocumentTest("@if(foo)) { var bar = foo; }");
+        }
+
+        [Fact]
+        public void OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart()
+        {
+            ParseDocumentTest("@if(foo) { @<p>Bar</p> }");
+        }
+
+        [Fact]
+        public void TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen()
+        {
+            ParseDocumentTest("@if(foo bar" + Environment.NewLine
+                         + "baz");
+        }
+
+        [Fact]
+        public void TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen()
+        {
+            ParseDocumentTest("@foreach(foo bar" + Environment.NewLine
+                         + "baz");
+        }
+
+        [Fact]
+        public void TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen()
+        {
+            ParseDocumentTest("@do { } while(foo bar" + Environment.NewLine
+                         + "baz");
+        }
+
+        [Fact]
+        public void TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen()
+        {
+            ParseDocumentTest("@using(foo bar" + Environment.NewLine
+                         + "baz");
+        }
+
+        [Fact]
+        public void ResumesIfStatementAfterOpenParen()
+        {
+            ParseDocumentTest("@if(" + Environment.NewLine
+                         + "else { <p>Foo</p> }");
+        }
+
+        [Fact]
+        public void TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing()
+        {
+            ParseDocumentTest("@if(foo) {" + Environment.NewLine
+                              + "    var p = \"foo bar baz" + Environment.NewLine
+                              + ";" + Environment.NewLine
+                              + "}");
+        }
+
+        [Fact]
+        public void TerminatesNormalStringAtEndOfFile()
+        {
+            ParseDocumentTest("@if(foo) { var foo = \"blah blah blah blah blah");
+        }
+
+        [Fact]
+        public void TerminatesVerbatimStringAtEndOfFile()
+        {
+            ParseDocumentTest("@if(foo) { var foo = @\"blah " + Environment.NewLine
+                              + "blah; " + Environment.NewLine
+                              + "<p>Foo</p>" + Environment.NewLine
+                              + "blah " + Environment.NewLine
+                              + "blah");
+        }
+
+        [Fact]
+        public void CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement()
+        {
+            ParseDocumentTest("@if(foo) {" + Environment.NewLine
+                         + "    var foo = \"foo bar baz" + Environment.NewLine
+                         + "    <p>Foo is @foo</p>" + Environment.NewLine
+                         + "}");
+        }
+
+        [Fact]
+        public void CorrectlyParsesAtSignInDelimitedBlock()
+        {
+            ParseDocumentTest("@(Request[\"description\"] ?? @photo.Description)");
+        }
+
+        [Fact]
+        public void CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode()
+        {
+            ParseDocumentTest("@{string.Format(<html></html>}");
+        }
+
+        private void RunUnterminatedSimpleKeywordBlock(string keyword)
+        {
+            ParseDocumentTest(
+                keyword + " (foo) { var foo = bar; if(foo != null) { bar(); } ");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpExplicitExpressionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpExplicitExpressionTest.cs
new file mode 100644
index 0000000000..fdb782cf69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpExplicitExpressionTest.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpExplicitExpressionTest : ParserTestBase
+    {
+        [Fact]
+        public void ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty()
+        {
+            ParseDocumentTest("@()");
+        }
+
+        [Fact]
+        public void ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr()
+        {
+            // ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression
+            ParseDocumentTest("@(");
+        }
+
+        [Fact]
+        public void ShouldAcceptEscapedQuoteInNonVerbatimStrings()
+        {
+            ParseDocumentTest("@(\"\\\"\")");
+        }
+
+        [Fact]
+        public void ShouldAcceptEscapedQuoteInVerbatimStrings()
+        {
+            ParseDocumentTest("@(@\"\"\"\")");
+        }
+
+        [Fact]
+        public void ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings()
+        {
+            ParseDocumentTest("@(@\"\"\"\"\"\")");
+        }
+
+        [Fact]
+        public void ShouldAcceptMultiLineVerbatimStrings()
+        {
+            ParseDocumentTest(@"@(@""" + Environment.NewLine
+                         + @"Foo" + Environment.NewLine
+                         + @"Bar" + Environment.NewLine
+                         + @"Baz" + Environment.NewLine
+                         + @""")");
+        }
+
+        [Fact]
+        public void ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings()
+        {
+            ParseDocumentTest("@(\"\\\"hello, world\\\"\")");
+        }
+
+        [Fact]
+        public void ShouldAcceptMultipleEscapedQuotesInVerbatimStrings()
+        {
+            ParseDocumentTest("@(@\"\"\"hello, world\"\"\")");
+        }
+
+        [Fact]
+        public void ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings()
+        {
+            ParseDocumentTest("@(\"\\\"\\\"\")");
+        }
+
+        [Fact]
+        public void ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings()
+        {
+            ParseDocumentTest("@(@\"\"\"\"\"\")");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs
new file mode 100644
index 0000000000..34e9918f7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs
@@ -0,0 +1,136 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpFunctionsTest : ParserTestBase
+    {
+        [Fact]
+        public void MarkupInFunctionsBlock_DoesNotParseWhenNotSupported()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_2_1,
+                @"
+@functions {
+    void Announcment(string message)
+    {
+        <h3>@message</h3>
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void MarkupInFunctionsBlock_ParsesMarkupInsideMethod()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    void Announcment(string message)
+    {
+        <h3>@message</h3>
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        // This will parse correctly in Razor, but will generate invalid C#.
+        [Fact]
+        public void MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    void Announcment(string message) => <h3>@message</h3>
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void MarkupInFunctionsBlock_DoesNotParseMarkupInString()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    void Announcment(string message) => ""<h3>@message</h3>"";
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    void Announcment(string message) => @""<h3>@message</h3>"";
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void MarkupInFunctionsBlock_CanContainCurlyBraces()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    void Announcment(string message)
+    {
+        <div>
+            @if (message.Length > 0)
+            {
+                <p>@message.Length</p>
+            }
+        </div>
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void MarkupInFunctionsBlock_MarkupCanContainTemplate()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    void Announcment(string message)
+    {
+        <div>
+            @if (message.Length > 0)
+            {
+                Repeat(@<p>@message.Length</p>);
+            }
+        </div>
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void ReservedKeywordsInFunctionsBlock_WithMarkup()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    class Person
+    {
+        public void DoSomething()
+        {
+            <p>Just do it!</p>
+        }
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs
new file mode 100644
index 0000000000..594b6d2050
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs
@@ -0,0 +1,374 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpImplicitExpressionTest : ParserTestBase
+    {
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket1()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??[");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket2()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??[0");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket3()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket4()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?(");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket5()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[more");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket6()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[0]");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket7()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket8()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[more.<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket9()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??[more<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket10()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[-1]?");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket11()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[abc]?[def");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket12()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[abc]?[2]");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket13()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[abc]?.more?[def]");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket14()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[abc]?.more?.abc");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket15()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[null ?? true]");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket16()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?[abc?.gef?[-1]]");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot1()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot2()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot3()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??more");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot4()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?!");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot5()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot6()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??.");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot7()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.(abc)");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot8()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot9()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.more");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot10()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.more<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot11()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val??.more<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot12()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.more(false)?.<p>");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot13()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.more(false)?.abc");
+        }
+
+        [Fact]
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot14()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?.more(null ?? true)?.abc");
+        }
+
+        [Fact]
+        public void NestedImplicitExpression()
+        {
+            ParseDocumentTest("if (true) { @foo }");
+        }
+
+        [Fact]
+        public void AcceptsNonEnglishCharactersThatAreValidIdentifiers()
+        {
+            ParseDocumentTest("@हळूँजद॔.");
+        }
+
+        [Fact]
+        public void OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition()
+        {
+            ParseDocumentTest("@/");
+        }
+
+        [Fact]
+        public void OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition()
+        {
+            ParseDocumentTest("@");
+        }
+
+        [Fact]
+        public void SupportsSlashesWithinComplexImplicitExpressions()
+        {
+            ParseDocumentTest("@DataGridColumn.Template(\"Years of Service\", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))");
+        }
+
+        [Fact]
+        public void ParsesSingleIdentifierAsImplicitExpression()
+        {
+            ParseDocumentTest("@foo");
+        }
+
+        [Fact]
+        public void DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace()
+        {
+            ParseDocumentTest("@foo ;");
+        }
+
+        [Fact]
+        public void IgnoresSemicolonAtEndOfSimpleImplicitExpression()
+        {
+            ParseDocumentTest("@foo;");
+        }
+
+        [Fact]
+        public void ParsesDottedIdentifiersAsImplicitExpression()
+        {
+            ParseDocumentTest("@foo.bar.baz");
+        }
+
+        [Fact]
+        public void IgnoresSemicolonAtEndOfDottedIdentifiers()
+        {
+            ParseDocumentTest("@foo.bar.baz;");
+        }
+
+        [Fact]
+        public void DoesNotIncludeDotAtEOFInImplicitExpression()
+        {
+            ParseDocumentTest("@foo.bar.");
+        }
+
+        [Fact]
+        public void DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1()
+        {
+            // ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1
+            ParseDocumentTest("@foo.bar.0");
+        }
+
+        [Fact]
+        public void DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2()
+        {
+            // ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2
+            ParseDocumentTest("@foo.bar.</p>");
+        }
+
+        [Fact]
+        public void DoesNotIncludeSemicolonAfterDot()
+        {
+            ParseDocumentTest("@foo.bar.;");
+        }
+
+        [Fact]
+        public void TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr()
+        {
+            // ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression
+            ParseDocumentTest("@foo.bar</p>");
+        }
+
+        [Fact]
+        public void ProperlyParsesParenthesesAndBalancesThemInImplicitExpression()
+        {
+            ParseDocumentTest(@"@foo().bar(""bi\""z"", 4)(""chained method; call"").baz(@""bo""""z"", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))");
+        }
+
+        [Fact]
+        public void ProperlyParsesBracketsAndBalancesThemInImplicitExpression()
+        {
+            ParseDocumentTest(@"@foo.bar[4 * (8 + 7)][""fo\""o""].baz");
+        }
+
+        [Fact]
+        public void TerminatesImplicitExpressionAtHtmlEndTag()
+        {
+            ParseDocumentTest("@foo().bar.baz</p>zoop");
+        }
+
+        [Fact]
+        public void TerminatesImplicitExpressionAtHtmlStartTag()
+        {
+            ParseDocumentTest("@foo().bar.baz<p>zoop");
+        }
+
+        [Fact]
+        public void TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar()
+        {
+            // ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter
+            ParseDocumentTest("@foo().bar.baz.42");
+        }
+
+        [Fact]
+        public void StopsBalancingParenthesesAtEOF()
+        {
+            ParseDocumentTest("@foo(()");
+        }
+
+        [Fact]
+        public void TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace()
+        {
+            ParseDocumentTest("@foo.bar() (baz)");
+        }
+
+        [Fact]
+        public void TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace()
+        {
+            ParseDocumentTest("@foo .bar() (baz)");
+        }
+
+        [Fact]
+        public void TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace()
+        {
+            ParseDocumentTest("@foo. bar() (baz)");
+        }
+
+        [Fact]
+        public void OutputExpressionIfModuleTokenNotFollowedByBrace()
+        {
+            ParseDocumentTest("@module.foo()");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpLanguageCharacteristicsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpLanguageCharacteristicsTest.cs
new file mode 100644
index 0000000000..84802523b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpLanguageCharacteristicsTest.cs
@@ -0,0 +1,20 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpLanguageCharacteristicsTest
+    {
+        [Fact]
+        public void GetSample_RightShiftAssign_ReturnsCorrectToken()
+        {
+            // Arrange & Act
+            var token = CSharpLanguageCharacteristics.Instance.GetSample(SyntaxKind.RightShiftAssign);
+
+            // Assert
+            Assert.Equal(">>=", token);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpNestedStatementsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpNestedStatementsTest.cs
new file mode 100644
index 0000000000..613cdca2a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpNestedStatementsTest.cs
@@ -0,0 +1,46 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpNestedStatementsTest : ParserTestBase
+    {
+        [Fact]
+        public void NestedSimpleStatement()
+        {
+            ParseDocumentTest("@while(true) { foo(); }");
+        }
+
+        [Fact]
+        public void NestedKeywordStatement()
+        {
+            ParseDocumentTest("@while(true) { for(int i = 0; i < 10; i++) { foo(); } }");
+        }
+
+        [Fact]
+        public void NestedCodeBlock()
+        {
+            ParseDocumentTest("@while(true) { { { { foo(); } } } }");
+        }
+
+        [Fact]
+        public void NestedImplicitExpression()
+        {
+            ParseDocumentTest("@while(true) { @foo }");
+        }
+
+        [Fact]
+        public void NestedExplicitExpression()
+        {
+            ParseDocumentTest("@while(true) { @(foo) }");
+        }
+
+        [Fact]
+        public void NestedMarkupBlock()
+        {
+            ParseDocumentTest("@while(true) { <p>Hello</p> }");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpRazorCommentsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpRazorCommentsTest.cs
new file mode 100644
index 0000000000..55d3edf1e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpRazorCommentsTest.cs
@@ -0,0 +1,134 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpRazorCommentsTest : ParserTestBase
+    {
+        [Fact]
+        public void UnterminatedRazorComment()
+        {
+            ParseDocumentTest("@*");
+        }
+
+        [Fact]
+        public void EmptyRazorComment()
+        {
+            ParseDocumentTest("@**@");
+        }
+
+        [Fact]
+        public void RazorCommentInImplicitExpressionMethodCall()
+        {
+            ParseDocumentTest("@foo(" + Environment.NewLine
+                            + "@**@" + Environment.NewLine);
+        }
+
+        [Fact]
+        public void UnterminatedRazorCommentInImplicitExpressionMethodCall()
+        {
+            ParseDocumentTest("@foo(@*");
+        }
+
+        [Fact]
+        public void RazorMultilineCommentInBlock()
+        {
+            ParseDocumentTest(@"
+@{
+    @*
+This is a comment
+    *@
+}
+");
+        }
+
+        [Fact]
+        public void RazorCommentInVerbatimBlock()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                            + "    <text" + Environment.NewLine
+                            + "    @**@" + Environment.NewLine
+                            + "}");
+        }
+
+        [Fact]
+        public void RazorCommentInOpeningTagBlock()
+        {
+            ParseDocumentTest("<text @* razor comment *@></text>");
+        }
+
+        [Fact]
+        public void RazorCommentInClosingTagBlock()
+        {
+            ParseDocumentTest("<text></text @* razor comment *@>");
+        }
+
+        [Fact]
+        public void UnterminatedRazorCommentInVerbatimBlock()
+        {
+            ParseDocumentTest("@{@*");
+        }
+
+        [Fact]
+        public void RazorCommentInMarkup()
+        {
+            ParseDocumentTest(
+                "<p>" + Environment.NewLine
+                + "@**@" + Environment.NewLine
+                + "</p>");
+        }
+
+        [Fact]
+        public void MultipleRazorCommentInMarkup()
+        {
+            ParseDocumentTest(
+                "<p>" + Environment.NewLine
+                + "  @**@  " + Environment.NewLine
+                + "@**@" + Environment.NewLine
+                + "</p>");
+        }
+
+        [Fact]
+        public void MultipleRazorCommentsInSameLineInMarkup()
+        {
+            ParseDocumentTest(
+                "<p>" + Environment.NewLine
+                + "@**@  @**@" + Environment.NewLine
+                + "</p>");
+        }
+
+        [Fact]
+        public void RazorCommentsSurroundingMarkup()
+        {
+            ParseDocumentTest(
+                "<p>" + Environment.NewLine
+                + "@* hello *@ content @* world *@" + Environment.NewLine
+                + "</p>");
+        }
+
+        [Fact]
+        public void RazorCommentBetweenCodeBlockAndMarkup()
+        {
+            ParseDocumentTest(
+                "@{ }" + Environment.NewLine +
+                "@* Hello World *@" + Environment.NewLine + 
+                "<div>Foo</div>"
+            );
+        }
+
+        [Fact]
+        public void RazorCommentWithExtraNewLineInMarkup()
+        {
+            ParseDocumentTest(
+                "<p>" + Environment.NewLine + Environment.NewLine
+                + "@* content *@" + Environment.NewLine
+                + "@*" + Environment.NewLine
+                + "content" + Environment.NewLine
+                + "*@" + Environment.NewLine + Environment.NewLine
+                + "</p>");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpReservedWordsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpReservedWordsTest.cs
new file mode 100644
index 0000000000..9132524166
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpReservedWordsTest.cs
@@ -0,0 +1,22 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpReservedWordsTest : ParserTestBase
+    {
+        [Fact]
+        public void ReservedWord()
+        {
+            ParseDocumentTest("@namespace");
+        }
+
+        [Fact]
+        private void ReservedWordIsCaseSensitive()
+        {
+            ParseDocumentTest("@NameSpace");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSectionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSectionTest.cs
new file mode 100644
index 0000000000..517dd4a83d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSectionTest.cs
@@ -0,0 +1,290 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpSectionTest : ParserTestBase
+    {
+        [Fact]
+        public void CapturesNewlineImmediatelyFollowing()
+        {
+            ParseDocumentTest(
+                "@section" + Environment.NewLine,
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace()
+        {
+            ParseDocumentTest(
+                "@section Foo         " + Environment.NewLine + "    ",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void CapturesWhitespaceToEndOfLineInSectionStatementMissingName()
+        {
+            ParseDocumentTest(
+                "@section         " + Environment.NewLine + "    ",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void IgnoresSectionUnlessAllLowerCase()
+        {
+            ParseDocumentTest(
+                "@Section foo",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar()
+        {
+            // ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter
+            ParseDocumentTest(
+                "@section 9 { <p>Foo</p> }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace()
+        {
+            // ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace
+            ParseDocumentTest(
+                "@section foo-bar { <p>Foo</p> }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ParserOutputsErrorOnNestedSections()
+        {
+            ParseDocumentTest(
+                "@section foo { @section bar { <p>Foo</p> } }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ParserOutputsErrorOnMultipleNestedSections()
+        {
+            ParseDocumentTest(
+                "@section foo { @section bar { <p>Foo</p> @section baz { } } }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ParserDoesNotOutputErrorOtherNestedDirectives()
+        {
+            // This isn't a real scenario but we just want to verify we don't show misleading errors.
+            ParseDocumentTest(
+                "@section foo { @inherits Bar }",
+                new[] { SectionDirective.Directive, InheritsDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesEOFAfterOpenBrace()
+        {
+            ParseDocumentTest(
+                "@section foo {",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesEOFAfterOpenContent1()
+        {
+            
+            ParseDocumentTest(
+                "@section foo { ",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesEOFAfterOpenContent2()
+        {
+
+            ParseDocumentTest(
+                "@section foo {\n",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesEOFAfterOpenContent3()
+        {
+
+            ParseDocumentTest(
+                "@section foo {abc",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesEOFAfterOpenContent4()
+        {
+
+            ParseDocumentTest(
+                "@section foo {\n abc",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesUnterminatedSection()
+        {
+            ParseDocumentTest(
+                "@section foo { <p>Foo{}</p>",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void HandlesUnterminatedSectionWithNestedIf()
+        {
+            // Arrange
+            var newLine = Environment.NewLine;
+            var spaces = "    ";
+
+            // Act & Assert
+            ParseDocumentTest(
+                string.Format(
+                    "@section Test{0}{{{0}{1}@if(true){0}{1}{{{0}{1}{1}<p>Hello World</p>{0}{1}}}",
+                    newLine,
+                    spaces),
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace()
+        {
+            // ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace
+            ParseDocumentTest(
+                "@section foo      " + Environment.NewLine,
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void AcceptsOpenBraceMultipleLinesBelowSectionName()
+        {
+            ParseDocumentTest(
+                "@section foo      "
+                + Environment.NewLine
+                + Environment.NewLine
+                + Environment.NewLine
+                + Environment.NewLine
+                + Environment.NewLine
+                + Environment.NewLine
+                + "{" + Environment.NewLine
+                + "<p>Foo</p>" + Environment.NewLine
+                + "}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ParsesNamedSectionCorrectly()
+        {
+            ParseDocumentTest(
+                "@section foo { <p>Foo</p> }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void DoesNotRequireSpaceBetweenSectionNameAndOpenBrace()
+        {
+            ParseDocumentTest(
+                "@section foo{ <p>Foo</p> }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void BalancesBraces()
+        {
+            ParseDocumentTest(
+                "@section foo { <script>(function foo() { return 1; })();</script> }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void AllowsBracesInCSharpExpression()
+        {
+            ParseDocumentTest(
+                "@section foo { I really want to render a close brace, so here I go: @(\"}\") }",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock()
+        {
+            ParseDocumentTest(
+                "@section Foo {" + Environment.NewLine
+                + "@if(true) {" + Environment.NewLine
+                + "}" + Environment.NewLine
+                + "}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace()
+        {
+            // SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace
+            ParseDocumentTest(
+                "@section Foo {" + Environment.NewLine
+                + "@if(true) {" + Environment.NewLine
+                + "}}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup()
+        {
+            ParseDocumentTest(
+                "@section foo {something}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ParsesComment()
+        {
+            ParseDocumentTest(
+                "@section s {<!-- -->}",
+                new[] { SectionDirective.Directive });
+        }
+
+        // This was a user reported bug (codeplex #710), the section parser wasn't handling
+        // comments.
+        [Fact]
+        public void ParsesCommentWithDelimiters()
+        {
+            ParseDocumentTest(
+                "@section s {<!-- > \" '-->}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void CommentRecoversFromUnclosedTag()
+        {
+            ParseDocumentTest(
+                "@section s {" + Environment.NewLine + "<a" + Environment.NewLine + "<!--  > \" '-->}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void ParsesXmlProcessingInstruction()
+        {
+            ParseDocumentTest(
+                "@section s { <? xml bleh ?>}",
+                new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void _WithDoubleTransition1()
+        {
+            ParseDocumentTest("@section s {<span foo='@@' />}", new[] { SectionDirective.Directive });
+        }
+
+        [Fact]
+        public void _WithDoubleTransition2()
+        {
+            ParseDocumentTest("@section s {<span foo='@DateTime.Now @@' />}", new[] { SectionDirective.Directive });
+        }
+
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSpecialBlockTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSpecialBlockTest.cs
new file mode 100644
index 0000000000..d18b24759e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpSpecialBlockTest.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpSpecialBlockTest : ParserTestBase
+    {
+        [Fact]
+        public void NonKeywordStatementInCodeBlockIsHandledCorrectly()
+        {
+            ParseDocumentTest(
+@"@{
+    List<dynamic> photos = gallery.Photo.ToList();
+}");
+        }
+
+        [Fact]
+        public void BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode()
+        {
+            // ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode
+            ParseDocumentTest("@{foo\"b}ar\" if(condition) { string.Format(\"{0}\"); } }");
+        }
+
+        [Fact]
+        public void BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr()
+        {
+            // ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression
+            ParseDocumentTest("@(foo\"b)ar\" if(condition) { string.Format(\"{0}\"); } )");
+        }
+
+        [Fact]
+        public void ParseBlockIgnoresSingleSlashAtStart()
+        {
+            ParseDocumentTest("@/ foo");
+        }
+
+        [Fact]
+        public void ParseBlockTerminatesSingleLineCommentAtEndOfLine()
+        {
+            ParseDocumentTest(
+"@if(!false) {" + Environment.NewLine +
+"    // Foo" + Environment.NewLine +
+"\t<p>A real tag!</p>" + Environment.NewLine +
+"}");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpStatementTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpStatementTest.cs
new file mode 100644
index 0000000000..a8da56d6a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpStatementTest.cs
@@ -0,0 +1,247 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    // Basic Tests for C# Statements:
+    //  * Basic case for each statement
+    //  * Basic case for ALL clauses
+
+    // This class DOES NOT contain
+    //  * Error cases
+    //  * Tests for various types of nested statements
+    //  * Comment tests
+
+    public class CSharpStatementTest : ParserTestBase
+    {
+        [Fact]
+        public void ForStatement()
+        {
+            ParseDocumentTest("@for(int i = 0; i++; i < length) { foo(); }");
+        }
+
+        [Fact]
+        public void ForEachStatement()
+        {
+            ParseDocumentTest("@foreach(var foo in bar) { foo(); }");
+        }
+
+        [Fact]
+        public void AwaitForEachStatement()
+        {
+            ParseDocumentTest("@await foreach(var foo in bar) { foo(); }");
+        }
+
+        [Fact]
+        public void MalformedAwaitForEachStatement()
+        {
+            ParseDocumentTest("@await foreach(var foo in bar { foo(); ");
+        }
+
+        [Fact]
+        public void WhileStatement()
+        {
+            ParseDocumentTest("@while(true) { foo(); }");
+        }
+
+        [Fact]
+        public void SwitchStatement()
+        {
+            ParseDocumentTest("@switch(foo) { foo(); }");
+        }
+
+        [Fact]
+        public void LockStatement()
+        {
+            ParseDocumentTest("@lock(baz) { foo(); }");
+        }
+
+        [Fact]
+        public void IfStatement()
+        {
+            ParseDocumentTest("@if(true) { foo(); }");
+        }
+
+        [Fact]
+        public void ElseIfClause()
+        {
+            ParseDocumentTest("@if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }");
+        }
+
+        [Fact]
+        public void ElseClause()
+        {
+            ParseDocumentTest("@if(true) { foo(); } else { foo(); }");
+        }
+
+        [Fact]
+        public void TryStatement()
+        {
+            ParseDocumentTest("@try { foo(); }");
+        }
+
+        [Fact]
+        public void CatchClause()
+        {
+            ParseDocumentTest("@try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }");
+        }
+
+        [Fact]
+        public void ExceptionFilter_TryCatchWhenComplete_SingleLine()
+        {
+            ParseDocumentTest("@try { someMethod(); } catch(Exception) when (true) { handleIO(); }");
+        }
+
+        [Fact]
+        public void ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine()
+        {
+            ParseDocumentTest("@try { A(); } catch(Exception) when (true) { B(); } finally { C(); }");
+        }
+
+        [Fact]
+        public void ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine()
+        {
+            ParseDocumentTest("@try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }");
+        }
+
+        [Fact]
+        public void ExceptionFilter_MultiLine()
+        {
+            ParseDocumentTest(
+@"@try
+{
+A();
+}
+catch(Exception) when (true)
+{
+B();
+}
+catch(IOException) when (false)
+{
+C();
+}");
+        }
+
+        [Fact]
+        public void ExceptionFilter_NestedTryCatchWhen()
+        {
+            ParseDocumentTest("@{try { someMethod(); } catch(Exception) when (true) { handleIO(); }}");
+        }
+
+        [Fact]
+        public void ExceptionFilter_IncompleteTryCatchWhen()
+        {
+            ParseDocumentTest("@try { someMethod(); } catch(Exception) when");
+        }
+
+        [Fact]
+        public void ExceptionFilter_IncompleteTryWhen()
+        {
+            ParseDocumentTest("@try { someMethod(); } when");
+        }
+
+        [Fact]
+        public void ExceptionFilter_IncompleteTryCatchNoBodyWhen()
+        {
+            ParseDocumentTest("@try { someMethod(); } catch(Exception) when { anotherMethod(); }");
+        }
+
+        [Fact]
+        public void ExceptionFilter_IncompleteTryCatchWhenNoBodies()
+        {
+            ParseDocumentTest("@try { someMethod(); } catch(Exception) when (true)");
+        }
+
+        [Fact]
+        public void ExceptionFilterError_TryCatchWhen_InCompleteCondition()
+        {
+            ParseDocumentTest("@try { someMethod(); } catch(Exception) when (");
+        }
+
+        [Fact]
+        public void ExceptionFilterError_TryCatchWhen_InCompleteBody()
+        {
+            ParseDocumentTest("@try { someMethod(); } catch(Exception) when (true) {");
+        }
+
+        [Fact]
+        public void FinallyClause()
+        {
+            ParseDocumentTest("@try { foo(); } finally { Dispose(); }");
+        }
+
+        [Fact]
+        public void Using_VariableDeclaration_Simple()
+        {
+            ParseDocumentTest("@{ using var foo = someDisposable; }");
+        }
+
+        [Fact]
+        public void Using_VariableDeclaration_Complex()
+        {
+            ParseDocumentTest("@{ using Some.Disposable.TypeName foo = GetDisposable<Some.Disposable.TypeName>(() => { using var bar = otherDisposable; }); }");
+        }
+
+        [Fact]
+        public void StaticUsing_NoUsing()
+        {
+            ParseDocumentTest("@using static");
+        }
+
+        [Fact]
+        public void StaticUsing_SingleIdentifier()
+        {
+            ParseDocumentTest("@using static System");
+        }
+
+        [Fact]
+        public void StaticUsing_MultipleIdentifiers()
+        {
+            ParseDocumentTest("@using static System.Console");
+        }
+
+        [Fact]
+        public void StaticUsing_GlobalPrefix()
+        {
+            ParseDocumentTest("@using static global::System.Console");
+        }
+
+        [Fact]
+        public void StaticUsing_Complete_Spaced()
+        {
+            ParseDocumentTest("@using   static   global::System.Console  ");
+        }
+
+        [Fact]
+        public void UsingStatement()
+        {
+            ParseDocumentTest("@using(var foo = new Foo()) { foo.Bar(); }");
+        }
+
+        [Fact]
+        public void UsingTypeAlias()
+        {
+            ParseDocumentTest("@using StringDictionary = System.Collections.Generic.Dictionary<string, string>");
+        }
+
+        [Fact]
+        public void UsingNamespaceImport()
+        {
+            ParseDocumentTest("@using System.Text.Encoding.ASCIIEncoding");
+        }
+
+        [Fact]
+        public void DoStatement()
+        {
+            ParseDocumentTest("@do { foo(); } while(true);");
+        }
+
+        [Fact]
+        public void NonBlockKeywordTreatedAsImplicitExpression()
+        {
+            ParseDocumentTest("@is foo");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTemplateTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTemplateTest.cs
new file mode 100644
index 0000000000..55a2695afa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTemplateTest.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpTemplateTest : ParserTestBase
+    {
+        [Fact]
+        public void HandlesSingleLineTemplate()
+        {
+            ParseDocumentTest("@{ var foo = @: bar" + Environment.NewLine + "; }");
+        }
+
+        [Fact]
+        public void HandlesSingleLineImmediatelyFollowingStatementChar()
+        {
+            ParseDocumentTest("@{i@: bar" + Environment.NewLine + "}");
+        }
+
+        [Fact]
+        public void HandlesSimpleTemplateInExplicitExpressionParens()
+        {
+            ParseDocumentTest("@(Html.Repeat(10, @<p>Foo #@item</p>))");
+        }
+
+        [Fact]
+        public void HandlesSimpleTemplateInImplicitExpressionParens()
+        {
+            ParseDocumentTest("@Html.Repeat(10, @<p>Foo #@item</p>)");
+        }
+
+        [Fact]
+        public void HandlesTwoTemplatesInImplicitExpressionParens()
+        {
+            ParseDocumentTest("@Html.Repeat(10, @<p>Foo #@item</p>, @<p>Foo #@item</p>)");
+        }
+
+        [Fact]
+        public void ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens()
+        {
+            // ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInImplicitExpressionParens
+            ParseDocumentTest("@Html.Repeat(10, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>)");
+        }
+
+        [Fact]
+        public void HandlesSimpleTemplateInStatementWithinCodeBlock()
+        {
+            ParseDocumentTest("@foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }");
+        }
+
+        [Fact]
+        public void HandlesTwoTemplatesInStatementWithinCodeBlock()
+        {
+            ParseDocumentTest("@foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }");
+        }
+
+        [Fact]
+        public void ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock()
+        {
+            // ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInStatementWithinCodeBlock
+            ParseDocumentTest("@foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }");
+        }
+
+        [Fact]
+        public void HandlesSimpleTemplateInStatementWithinStatementBlock()
+        {
+            ParseDocumentTest("@{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }");
+        }
+
+        [Fact]
+        public void HandlessTwoTemplatesInStatementWithinStatementBlock()
+        {
+            ParseDocumentTest("@{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }");
+        }
+
+        [Fact]
+        public void ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock()
+        {
+            // ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInStatementWithinStatementBlock
+            ParseDocumentTest("@{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }");
+        }
+
+        [Fact]
+        public void _WithDoubleTransition_DoesNotThrow()
+        {
+            ParseDocumentTest("@{ var foo = bar; Html.ExecuteTemplate(foo, @<p foo='@@'>Foo #@item</p>); }");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpToMarkupSwitchTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpToMarkupSwitchTest.cs
new file mode 100644
index 0000000000..c427d580f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpToMarkupSwitchTest.cs
@@ -0,0 +1,218 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpToMarkupSwitchTest : ParserTestBase
+    {
+        [Fact]
+        public void SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated()
+        {
+            ParseDocumentTest("@{ List< }");
+        }
+
+        [Fact]
+        public void GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode()
+        {
+            ParseDocumentTest("@Foo(    @<p>Foo</p>    )", designTime: true);
+        }
+
+        [Fact]
+        public void GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode()
+        {
+            ParseDocumentTest("@Foo(    " + Environment.NewLine
+                         + "@:<p>Foo</p>    " + Environment.NewLine
+                         + ")", designTime: true);
+        }
+
+        [Fact]
+        public void GivesSpacesToCodeOnTagTransitionInDesignTimeMode()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                         + "    <p>Foo</p>    " + Environment.NewLine
+                         + "}", designTime: true);
+        }
+
+        [Fact]
+        public void GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                         + "    @<p>Foo</p>    " + Environment.NewLine
+                         + "}", designTime: true);
+        }
+
+        [Fact]
+        public void GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                         + "    @:<p>Foo</p>    " + Environment.NewLine
+                         + "}", designTime: true);
+        }
+
+        [Fact]
+        public void ShouldSupportSingleLineMarkupContainingStatementBlock()
+        {
+            ParseDocumentTest("@Repeat(10," + Environment.NewLine
+                         + "    @: @{}" + Environment.NewLine
+                         + ")");
+        }
+
+        [Fact]
+        public void ShouldSupportMarkupWithoutPreceedingWhitespace()
+        {
+            ParseDocumentTest("@foreach(var file in files){" + Environment.NewLine
+                         + Environment.NewLine
+                         + Environment.NewLine
+                         + "@:Baz" + Environment.NewLine
+                         + "<br/>" + Environment.NewLine
+                         + "<a>Foo</a>" + Environment.NewLine
+                         + "@:Bar" + Environment.NewLine
+                         + "}");
+        }
+
+        [Fact]
+        public void GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline()
+        {
+            // ParseBlockGivesAllWhitespaceOnSameLineExcludingPreceedingNewlineButIncludingTrailingNewLineToMarkup
+            ParseDocumentTest("@if(foo) {" + Environment.NewLine
+                         + "    var foo = \"After this statement there are 10 spaces\";          " + Environment.NewLine
+                         + "    <p>" + Environment.NewLine
+                         + "        Foo" + Environment.NewLine
+                         + "        @bar" + Environment.NewLine
+                         + "    </p>" + Environment.NewLine
+                         + "    @:Hello!" + Environment.NewLine
+                         + "    var biz = boz;" + Environment.NewLine
+                         + "}");
+        }
+
+        [Fact]
+        public void AllowsMarkupInIfBodyWithBraces()
+        {
+            ParseDocumentTest("@if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> }");
+        }
+
+        [Fact]
+        public void AllowsMarkupInIfBodyWithBracesWithinCodeBlock()
+        {
+            ParseDocumentTest("@{ if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> } }");
+        }
+
+        [Fact]
+        public void SupportsMarkupInCaseAndDefaultBranchesOfSwitch()
+        {
+            // Arrange
+            ParseDocumentTest("@switch(foo) {" + Environment.NewLine
+                         + "    case 0:" + Environment.NewLine
+                         + "        <p>Foo</p>" + Environment.NewLine
+                         + "        break;" + Environment.NewLine
+                         + "    case 1:" + Environment.NewLine
+                         + "        <p>Bar</p>" + Environment.NewLine
+                         + "        return;" + Environment.NewLine
+                         + "    case 2:" + Environment.NewLine
+                         + "        {" + Environment.NewLine
+                         + "            <p>Baz</p>" + Environment.NewLine
+                         + "            <p>Boz</p>" + Environment.NewLine
+                         + "        }" + Environment.NewLine
+                         + "    default:" + Environment.NewLine
+                         + "        <p>Biz</p>" + Environment.NewLine
+                         + "}");
+        }
+
+        [Fact]
+        public void SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock()
+        {
+            // Arrange
+            ParseDocumentTest("@{ switch(foo) {" + Environment.NewLine
+                         + "    case 0:" + Environment.NewLine
+                         + "        <p>Foo</p>" + Environment.NewLine
+                         + "        break;" + Environment.NewLine
+                         + "    case 1:" + Environment.NewLine
+                         + "        <p>Bar</p>" + Environment.NewLine
+                         + "        return;" + Environment.NewLine
+                         + "    case 2:" + Environment.NewLine
+                         + "        {" + Environment.NewLine
+                         + "            <p>Baz</p>" + Environment.NewLine
+                         + "            <p>Boz</p>" + Environment.NewLine
+                         + "        }" + Environment.NewLine
+                         + "    default:" + Environment.NewLine
+                         + "        <p>Biz</p>" + Environment.NewLine
+                         + "} }");
+        }
+
+        [Fact]
+        public void ParsesMarkupStatementOnOpenAngleBracket()
+        {
+            ParseDocumentTest("@for(int i = 0; i < 10; i++) { <p>Foo</p> }");
+        }
+
+        [Fact]
+        public void ParsesMarkupStatementOnOpenAngleBracketInCodeBlock()
+        {
+            ParseDocumentTest("@{ for(int i = 0; i < 10; i++) { <p>Foo</p> } }");
+        }
+
+        [Fact]
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByColon()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @:Bar" + Environment.NewLine
+                         + "} zoop");
+        }
+
+        [Fact]
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @::Sometext" + Environment.NewLine
+                         + "}");
+        }
+
+
+        [Fact]
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon()
+        {
+            // Arrange
+            ParseDocumentTest("@if(foo) { @:::Sometext" + Environment.NewLine
+                         + "}");
+        }
+
+        [Fact]
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock()
+        {
+            // Arrange
+            ParseDocumentTest("@{ if(foo) { @:Bar" + Environment.NewLine
+                         + "} } zoop");
+        }
+
+        [Fact]
+        public void CorrectlyReturnsFromMarkupBlockWithPseudoTag()
+        {
+            ParseDocumentTest("@if (i > 0) { <text>;</text> }");
+        }
+
+        [Fact]
+        public void CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock()
+        {
+            ParseDocumentTest("@{ if (i > 0) { <text>;</text> } }");
+        }
+
+        [Fact]
+        public void SupportsAllKindsOfImplicitMarkupInCodeBlock()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                         + "    if(true) {" + Environment.NewLine
+                         + "        @:Single Line Markup" + Environment.NewLine
+                         + "    }" + Environment.NewLine
+                         + "    foreach (var p in Enumerable.Range(1, 10)) {" + Environment.NewLine
+                         + "        <text>The number is @p</text>" + Environment.NewLine
+                         + "    }" + Environment.NewLine
+                         + "    if(!false) {" + Environment.NewLine
+                         + "        <p>A real tag!</p>" + Environment.NewLine
+                         + "    }" + Environment.NewLine
+                         + "}");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerCommentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerCommentTest.cs
new file mode 100644
index 0000000000..0a7c55cc34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerCommentTest.cs
@@ -0,0 +1,95 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpTokenizerCommentTest : CSharpTokenizerTestBase
+    {
+        private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining;
+
+        [Fact]
+        public void Next_Ignores_Star_At_EOF_In_RazorComment()
+        {
+            TestTokenizer(
+                "@* Foo * Bar * Baz *",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz *"));
+        }
+
+        [Fact]
+        public void Next_Ignores_Star_Without_Trailing_At()
+        {
+            TestTokenizer(
+                "@* Foo * Bar * Baz *@",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
+        }
+
+        [Fact]
+        public void Next_Returns_RazorComment_Token_For_Entire_Razor_Comment()
+        {
+            TestTokenizer(
+                "@* Foo Bar Baz *@",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo Bar Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
+        }
+
+        [Fact]
+        public void Next_Returns_Comment_Token_For_Entire_Single_Line_Comment()
+        {
+            TestTokenizer("// Foo Bar Baz", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo Bar Baz"));
+        }
+
+        [Fact]
+        public void Single_Line_Comment_Is_Terminated_By_Newline()
+        {
+            TestTokenizer("// Foo Bar Baz\na", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo Bar Baz"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Multi_Line_Comment_In_Single_Line_Comment_Has_No_Effect()
+        {
+            TestTokenizer("// Foo/*Bar*/ Baz\na", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo/*Bar*/ Baz"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Comment_Token_For_Entire_Multi_Line_Comment()
+        {
+            TestTokenizer("/* Foo\nBar\nBaz */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz */"));
+        }
+
+        [Fact]
+        public void Multi_Line_Comment_Is_Terminated_By_End_Sequence()
+        {
+            TestTokenizer("/* Foo\nBar\nBaz */a", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz */"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Unterminated_Multi_Line_Comment_Captures_To_EOF()
+        {
+            TestTokenizer("/* Foo\nBar\nBaz", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Nested_Multi_Line_Comments_Terminated_At_First_End_Sequence()
+        {
+            TestTokenizer("/* Foo/*\nBar\nBaz*/ */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo/*\nBar\nBaz*/"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Nested_Multi_Line_Comments_Terminated_At_Full_End_Sequence()
+        {
+            TestTokenizer("/* Foo\nBar\nBaz* */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz* */"), IgnoreRemaining);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerIdentifierTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerIdentifierTest.cs
new file mode 100644
index 0000000000..e5a3a466ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerIdentifierTest.cs
@@ -0,0 +1,171 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpTokenizerIdentifierTest : CSharpTokenizerTestBase
+    {
+        [Fact]
+        public void Simple_Identifier_Is_Recognized()
+        {
+            TestTokenizer("foo", SyntaxFactory.Token(SyntaxKind.Identifier, "foo"));
+        }
+
+        [Fact]
+        public void Identifier_Starting_With_Underscore_Is_Recognized()
+        {
+            TestTokenizer("_foo", SyntaxFactory.Token(SyntaxKind.Identifier, "_foo"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Contain_Digits()
+        {
+            TestTokenizer("foo4", SyntaxFactory.Token(SyntaxKind.Identifier, "foo4"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Start_With_Titlecase_Letter()
+        {
+            TestTokenizer("ῼfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ῼfoo"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Start_With_Letter_Modifier()
+        {
+            TestTokenizer("ᵊfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ᵊfoo"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Start_With_Other_Letter()
+        {
+            TestTokenizer("ƻfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ƻfoo"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Start_With_Number_Letter()
+        {
+            TestTokenizer("Ⅽool", SyntaxFactory.Token(SyntaxKind.Identifier, "Ⅽool"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Contain_Non_Spacing_Mark()
+        {
+            TestTokenizer("foo\u0300", SyntaxFactory.Token(SyntaxKind.Identifier, "foo\u0300"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Contain_Spacing_Combining_Mark()
+        {
+            TestTokenizer("fooः", SyntaxFactory.Token(SyntaxKind.Identifier, "fooः"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Contain_Non_English_Digit()
+        {
+            TestTokenizer("foo١", SyntaxFactory.Token(SyntaxKind.Identifier, "foo١"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Contain_Connector_Punctuation()
+        {
+            TestTokenizer("foo‿bar", SyntaxFactory.Token(SyntaxKind.Identifier, "foo‿bar"));
+        }
+
+        [Fact]
+        public void Identifier_Can_Contain_Format_Character()
+        {
+            TestTokenizer("foo؃bar", SyntaxFactory.Token(SyntaxKind.Identifier, "foo؃bar"));
+        }
+
+        [Fact]
+        public void Keywords_Are_Recognized_As_Keyword_Tokens()
+        {
+            TestKeyword("abstract", CSharpKeyword.Abstract);
+            TestKeyword("byte", CSharpKeyword.Byte);
+            TestKeyword("class", CSharpKeyword.Class);
+            TestKeyword("delegate", CSharpKeyword.Delegate);
+            TestKeyword("event", CSharpKeyword.Event);
+            TestKeyword("fixed", CSharpKeyword.Fixed);
+            TestKeyword("if", CSharpKeyword.If);
+            TestKeyword("internal", CSharpKeyword.Internal);
+            TestKeyword("new", CSharpKeyword.New);
+            TestKeyword("override", CSharpKeyword.Override);
+            TestKeyword("readonly", CSharpKeyword.Readonly);
+            TestKeyword("short", CSharpKeyword.Short);
+            TestKeyword("struct", CSharpKeyword.Struct);
+            TestKeyword("try", CSharpKeyword.Try);
+            TestKeyword("unsafe", CSharpKeyword.Unsafe);
+            TestKeyword("volatile", CSharpKeyword.Volatile);
+            TestKeyword("as", CSharpKeyword.As);
+            TestKeyword("do", CSharpKeyword.Do);
+            TestKeyword("is", CSharpKeyword.Is);
+            TestKeyword("params", CSharpKeyword.Params);
+            TestKeyword("ref", CSharpKeyword.Ref);
+            TestKeyword("switch", CSharpKeyword.Switch);
+            TestKeyword("ushort", CSharpKeyword.Ushort);
+            TestKeyword("while", CSharpKeyword.While);
+            TestKeyword("case", CSharpKeyword.Case);
+            TestKeyword("const", CSharpKeyword.Const);
+            TestKeyword("explicit", CSharpKeyword.Explicit);
+            TestKeyword("float", CSharpKeyword.Float);
+            TestKeyword("null", CSharpKeyword.Null);
+            TestKeyword("sizeof", CSharpKeyword.Sizeof);
+            TestKeyword("typeof", CSharpKeyword.Typeof);
+            TestKeyword("implicit", CSharpKeyword.Implicit);
+            TestKeyword("private", CSharpKeyword.Private);
+            TestKeyword("this", CSharpKeyword.This);
+            TestKeyword("using", CSharpKeyword.Using);
+            TestKeyword("extern", CSharpKeyword.Extern);
+            TestKeyword("return", CSharpKeyword.Return);
+            TestKeyword("stackalloc", CSharpKeyword.Stackalloc);
+            TestKeyword("uint", CSharpKeyword.Uint);
+            TestKeyword("base", CSharpKeyword.Base);
+            TestKeyword("catch", CSharpKeyword.Catch);
+            TestKeyword("continue", CSharpKeyword.Continue);
+            TestKeyword("double", CSharpKeyword.Double);
+            TestKeyword("for", CSharpKeyword.For);
+            TestKeyword("in", CSharpKeyword.In);
+            TestKeyword("lock", CSharpKeyword.Lock);
+            TestKeyword("object", CSharpKeyword.Object);
+            TestKeyword("protected", CSharpKeyword.Protected);
+            TestKeyword("static", CSharpKeyword.Static);
+            TestKeyword("false", CSharpKeyword.False);
+            TestKeyword("public", CSharpKeyword.Public);
+            TestKeyword("sbyte", CSharpKeyword.Sbyte);
+            TestKeyword("throw", CSharpKeyword.Throw);
+            TestKeyword("virtual", CSharpKeyword.Virtual);
+            TestKeyword("decimal", CSharpKeyword.Decimal);
+            TestKeyword("else", CSharpKeyword.Else);
+            TestKeyword("operator", CSharpKeyword.Operator);
+            TestKeyword("string", CSharpKeyword.String);
+            TestKeyword("ulong", CSharpKeyword.Ulong);
+            TestKeyword("bool", CSharpKeyword.Bool);
+            TestKeyword("char", CSharpKeyword.Char);
+            TestKeyword("default", CSharpKeyword.Default);
+            TestKeyword("foreach", CSharpKeyword.Foreach);
+            TestKeyword("long", CSharpKeyword.Long);
+            TestKeyword("void", CSharpKeyword.Void);
+            TestKeyword("enum", CSharpKeyword.Enum);
+            TestKeyword("finally", CSharpKeyword.Finally);
+            TestKeyword("int", CSharpKeyword.Int);
+            TestKeyword("out", CSharpKeyword.Out);
+            TestKeyword("sealed", CSharpKeyword.Sealed);
+            TestKeyword("true", CSharpKeyword.True);
+            TestKeyword("goto", CSharpKeyword.Goto);
+            TestKeyword("unchecked", CSharpKeyword.Unchecked);
+            TestKeyword("interface", CSharpKeyword.Interface);
+            TestKeyword("break", CSharpKeyword.Break);
+            TestKeyword("checked", CSharpKeyword.Checked);
+            TestKeyword("namespace", CSharpKeyword.Namespace);
+            TestKeyword("when", CSharpKeyword.When);
+        }
+
+        private void TestKeyword(string keyword, CSharpKeyword keywordType)
+        {
+            TestTokenizer(keyword, SyntaxFactory.Token(SyntaxKind.Keyword, keyword));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs
new file mode 100644
index 0000000000..c7c250cce3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs
@@ -0,0 +1,288 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpTokenizerLiteralTest : CSharpTokenizerTestBase
+    {
+        private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining;
+
+        [Fact]
+        public void Simple_Integer_Literal_Is_Recognized()
+        {
+            TestSingleToken("01189998819991197253", SyntaxKind.IntegerLiteral);
+        }
+
+        [Fact]
+        public void Integer_Type_Suffix_Is_Recognized()
+        {
+            TestSingleToken("42U", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42u", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("42L", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42l", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("42UL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42Ul", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("42uL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42ul", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("42LU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42Lu", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("42lU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42lu", SyntaxKind.IntegerLiteral);
+        }
+
+        [Fact]
+        public void Trailing_Letter_Is_Not_Part_Of_Integer_Literal_If_Not_Type_Sufix()
+        {
+            TestTokenizer("42a", SyntaxFactory.Token(SyntaxKind.IntegerLiteral, "42"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Simple_Hex_Literal_Is_Recognized()
+        {
+            TestSingleToken("0x0123456789ABCDEF", SyntaxKind.IntegerLiteral);
+        }
+
+        [Fact]
+        public void Integer_Type_Suffix_Is_Recognized_In_Hex_Literal()
+        {
+            TestSingleToken("0xDEADBEEFU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFu", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("0xDEADBEEFL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFl", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("0xDEADBEEFUL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFUl", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("0xDEADBEEFuL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFul", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("0xDEADBEEFLU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFLu", SyntaxKind.IntegerLiteral);
+
+            TestSingleToken("0xDEADBEEFlU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFlu", SyntaxKind.IntegerLiteral);
+        }
+
+        [Fact]
+        public void Trailing_Letter_Is_Not_Part_Of_Hex_Literal_If_Not_Type_Sufix()
+        {
+            TestTokenizer("0xDEADBEEFz", SyntaxFactory.Token(SyntaxKind.IntegerLiteral, "0xDEADBEEF"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Dot_Followed_By_Non_Digit_Is_Not_Part_Of_Real_Literal()
+        {
+            TestTokenizer("3.a", SyntaxFactory.Token(SyntaxKind.IntegerLiteral, "3"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Simple_Real_Literal_Is_Recognized()
+        {
+            TestTokenizer("3.14159", SyntaxFactory.Token(SyntaxKind.RealLiteral, "3.14159"));
+        }
+
+        [Fact]
+        public void Real_Literal_Between_Zero_And_One_Is_Recognized()
+        {
+            TestTokenizer(".14159", SyntaxFactory.Token(SyntaxKind.RealLiteral, ".14159"));
+        }
+
+        [Fact]
+        public void Integer_With_Real_Type_Suffix_Is_Recognized()
+        {
+            TestSingleToken("42F", SyntaxKind.RealLiteral);
+            TestSingleToken("42f", SyntaxKind.RealLiteral);
+            TestSingleToken("42D", SyntaxKind.RealLiteral);
+            TestSingleToken("42d", SyntaxKind.RealLiteral);
+            TestSingleToken("42M", SyntaxKind.RealLiteral);
+            TestSingleToken("42m", SyntaxKind.RealLiteral);
+        }
+
+        [Fact]
+        public void Integer_With_Exponent_Is_Recognized()
+        {
+            TestSingleToken("1e10", SyntaxKind.RealLiteral);
+            TestSingleToken("1E10", SyntaxKind.RealLiteral);
+            TestSingleToken("1e+10", SyntaxKind.RealLiteral);
+            TestSingleToken("1E+10", SyntaxKind.RealLiteral);
+            TestSingleToken("1e-10", SyntaxKind.RealLiteral);
+            TestSingleToken("1E-10", SyntaxKind.RealLiteral);
+        }
+
+        [Fact]
+        public void Real_Number_With_Type_Suffix_Is_Recognized()
+        {
+            TestSingleToken("3.14F", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14f", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14D", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14d", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14M", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14m", SyntaxKind.RealLiteral);
+        }
+
+        [Fact]
+        public void Real_Number_With_Exponent_Is_Recognized()
+        {
+            TestSingleToken("3.14E10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14e10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14E+10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14e+10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14E-10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14e-10", SyntaxKind.RealLiteral);
+        }
+
+        [Fact]
+        public void Real_Number_With_Exponent_And_Type_Suffix_Is_Recognized()
+        {
+            TestSingleToken("3.14E+10F", SyntaxKind.RealLiteral);
+        }
+
+        [Fact]
+        public void Single_Character_Literal_Is_Recognized()
+        {
+            TestSingleToken("'f'", SyntaxKind.CharacterLiteral);
+        }
+
+        [Fact]
+        public void Multi_Character_Literal_Is_Recognized()
+        {
+            TestSingleToken("'foo'", SyntaxKind.CharacterLiteral);
+        }
+
+        [Fact]
+        public void Character_Literal_Is_Terminated_By_EOF_If_Unterminated()
+        {
+            TestSingleToken("'foo bar", SyntaxKind.CharacterLiteral);
+        }
+
+        [Fact]
+        public void Character_Literal_Not_Terminated_By_Escaped_Quote()
+        {
+            TestSingleToken("'foo\\'bar'", SyntaxKind.CharacterLiteral);
+        }
+
+        [Fact]
+        public void Character_Literal_Is_Terminated_By_EOL_If_Unterminated()
+        {
+            TestTokenizer("'foo\n", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Character_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash()
+        {
+            TestTokenizer("'foo\\\n", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Character_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
+        {
+            TestTokenizer("'foo\\\nflarg", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Character_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash()
+        {
+            TestTokenizer("'foo\\" + Environment.NewLine, SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Character_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
+        {
+            TestTokenizer($"'foo\\{Environment.NewLine}flarg", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Character_Literal_Allows_Escaped_Escape()
+        {
+            TestTokenizer("'foo\\\\'blah", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\\\'"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void String_Literal_Is_Recognized()
+        {
+            TestSingleToken("\"foo\"", SyntaxKind.StringLiteral);
+        }
+
+        [Fact]
+        public void String_Literal_Is_Terminated_By_EOF_If_Unterminated()
+        {
+            TestSingleToken("\"foo bar", SyntaxKind.StringLiteral);
+        }
+
+        [Fact]
+        public void String_Literal_Not_Terminated_By_Escaped_Quote()
+        {
+            TestSingleToken("\"foo\\\"bar\"", SyntaxKind.StringLiteral);
+        }
+
+        [Fact]
+        public void String_Literal_Is_Terminated_By_EOL_If_Unterminated()
+        {
+            TestTokenizer("\"foo\n", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void String_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash()
+        {
+            TestTokenizer("\"foo\\\n", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void String_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
+        {
+            TestTokenizer("\"foo\\\nflarg", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void String_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash()
+        {
+            TestTokenizer("\"foo\\" + Environment.NewLine, SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void String_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
+        {
+            TestTokenizer($"\"foo\\{Environment.NewLine}flarg", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void String_Literal_Allows_Escaped_Escape()
+        {
+            TestTokenizer("\"foo\\\\\"blah", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\\\\""), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Verbatim_String_Literal_Can_Contain_Newlines()
+        {
+            TestSingleToken("@\"foo\nbar\nbaz\"", SyntaxKind.StringLiteral);
+        }
+
+        [Fact]
+        public void Verbatim_String_Literal_Not_Terminated_By_Escaped_Double_Quote()
+        {
+            TestSingleToken("@\"foo\"\"bar\"", SyntaxKind.StringLiteral);
+        }
+
+        [Fact]
+        public void Verbatim_String_Literal_Is_Terminated_By_Slash_Double_Quote()
+        {
+            TestTokenizer("@\"foo\\\"bar\"", SyntaxFactory.Token(SyntaxKind.StringLiteral, "@\"foo\\\""), IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Verbatim_String_Literal_Is_Terminated_By_EOF()
+        {
+            TestSingleToken("@\"foo", SyntaxKind.StringLiteral);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerOperatorsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerOperatorsTest.cs
new file mode 100644
index 0000000000..fdf2718387
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerOperatorsTest.cs
@@ -0,0 +1,297 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpTokenizerOperatorsTest : CSharpTokenizerTestBase
+    {
+        [Fact]
+        public void LeftBrace_Is_Recognized()
+        {
+            TestSingleToken("{", SyntaxKind.LeftBrace);
+        }
+
+        [Fact]
+        public void Plus_Is_Recognized()
+        {
+            TestSingleToken("+", SyntaxKind.Plus);
+        }
+
+        [Fact]
+        public void Assign_Is_Recognized()
+        {
+            TestSingleToken("=", SyntaxKind.Assign);
+        }
+
+        [Fact]
+        public void Arrow_Is_Recognized()
+        {
+            TestSingleToken("->", SyntaxKind.Arrow);
+        }
+
+        [Fact]
+        public void AndAssign_Is_Recognized()
+        {
+            TestSingleToken("&=", SyntaxKind.AndAssign);
+        }
+
+        [Fact]
+        public void RightBrace_Is_Recognized()
+        {
+            TestSingleToken("}", SyntaxKind.RightBrace);
+        }
+
+        [Fact]
+        public void Minus_Is_Recognized()
+        {
+            TestSingleToken("-", SyntaxKind.Minus);
+        }
+
+        [Fact]
+        public void LessThan_Is_Recognized()
+        {
+            TestSingleToken("<", SyntaxKind.LessThan);
+        }
+
+        [Fact]
+        public void Equals_Is_Recognized()
+        {
+            TestSingleToken("==", SyntaxKind.Equals);
+        }
+
+        [Fact]
+        public void OrAssign_Is_Recognized()
+        {
+            TestSingleToken("|=", SyntaxKind.OrAssign);
+        }
+
+        [Fact]
+        public void LeftBracket_Is_Recognized()
+        {
+            TestSingleToken("[", SyntaxKind.LeftBracket);
+        }
+
+        [Fact]
+        public void Star_Is_Recognized()
+        {
+            TestSingleToken("*", SyntaxKind.Star);
+        }
+
+        [Fact]
+        public void GreaterThan_Is_Recognized()
+        {
+            TestSingleToken(">", SyntaxKind.GreaterThan);
+        }
+
+        [Fact]
+        public void NotEqual_Is_Recognized()
+        {
+            TestSingleToken("!=", SyntaxKind.NotEqual);
+        }
+
+        [Fact]
+        public void XorAssign_Is_Recognized()
+        {
+            TestSingleToken("^=", SyntaxKind.XorAssign);
+        }
+
+        [Fact]
+        public void RightBracket_Is_Recognized()
+        {
+            TestSingleToken("]", SyntaxKind.RightBracket);
+        }
+
+        [Fact]
+        public void Slash_Is_Recognized()
+        {
+            TestSingleToken("/", SyntaxKind.Slash);
+        }
+
+        [Fact]
+        public void QuestionMark_Is_Recognized()
+        {
+            TestSingleToken("?", SyntaxKind.QuestionMark);
+        }
+
+        [Fact]
+        public void LessThanEqual_Is_Recognized()
+        {
+            TestSingleToken("<=", SyntaxKind.LessThanEqual);
+        }
+
+        [Fact]
+        public void LeftShift_Is_Not_Specially_Recognized()
+        {
+            TestTokenizer("<<",
+                SyntaxFactory.Token(SyntaxKind.LessThan, "<"),
+                SyntaxFactory.Token(SyntaxKind.LessThan, "<"));
+        }
+
+        [Fact]
+        public void LeftParen_Is_Recognized()
+        {
+            TestSingleToken("(", SyntaxKind.LeftParenthesis);
+        }
+
+        [Fact]
+        public void Modulo_Is_Recognized()
+        {
+            TestSingleToken("%", SyntaxKind.Modulo);
+        }
+
+        [Fact]
+        public void NullCoalesce_Is_Recognized()
+        {
+            TestSingleToken("??", SyntaxKind.NullCoalesce);
+        }
+
+        [Fact]
+        public void GreaterThanEqual_Is_Recognized()
+        {
+            TestSingleToken(">=", SyntaxKind.GreaterThanEqual);
+        }
+
+        [Fact]
+        public void EqualGreaterThan_Is_Recognized()
+        {
+            TestSingleToken("=>", SyntaxKind.GreaterThanEqual);
+        }
+
+        [Fact]
+        public void RightParen_Is_Recognized()
+        {
+            TestSingleToken(")", SyntaxKind.RightParenthesis);
+        }
+
+        [Fact]
+        public void And_Is_Recognized()
+        {
+            TestSingleToken("&", SyntaxKind.And);
+        }
+
+        [Fact]
+        public void DoubleColon_Is_Recognized()
+        {
+            TestSingleToken("::", SyntaxKind.DoubleColon);
+        }
+
+        [Fact]
+        public void PlusAssign_Is_Recognized()
+        {
+            TestSingleToken("+=", SyntaxKind.PlusAssign);
+        }
+
+        [Fact]
+        public void Semicolon_Is_Recognized()
+        {
+            TestSingleToken(";", SyntaxKind.Semicolon);
+        }
+
+        [Fact]
+        public void Tilde_Is_Recognized()
+        {
+            TestSingleToken("~", SyntaxKind.Tilde);
+        }
+
+        [Fact]
+        public void DoubleOr_Is_Recognized()
+        {
+            TestSingleToken("||", SyntaxKind.DoubleOr);
+        }
+
+        [Fact]
+        public void ModuloAssign_Is_Recognized()
+        {
+            TestSingleToken("%=", SyntaxKind.ModuloAssign);
+        }
+
+        [Fact]
+        public void Colon_Is_Recognized()
+        {
+            TestSingleToken(":", SyntaxKind.Colon);
+        }
+
+        [Fact]
+        public void Not_Is_Recognized()
+        {
+            TestSingleToken("!", SyntaxKind.Not);
+        }
+
+        [Fact]
+        public void DoubleAnd_Is_Recognized()
+        {
+            TestSingleToken("&&", SyntaxKind.DoubleAnd);
+        }
+
+        [Fact]
+        public void DivideAssign_Is_Recognized()
+        {
+            TestSingleToken("/=", SyntaxKind.DivideAssign);
+        }
+
+        [Fact]
+        public void Comma_Is_Recognized()
+        {
+            TestSingleToken(",", SyntaxKind.Comma);
+        }
+
+        [Fact]
+        public void Xor_Is_Recognized()
+        {
+            TestSingleToken("^", SyntaxKind.Xor);
+        }
+
+        [Fact]
+        public void Decrement_Is_Recognized()
+        {
+            TestSingleToken("--", SyntaxKind.Decrement);
+        }
+
+        [Fact]
+        public void MultiplyAssign_Is_Recognized()
+        {
+            TestSingleToken("*=", SyntaxKind.MultiplyAssign);
+        }
+
+        [Fact]
+        public void Dot_Is_Recognized()
+        {
+            TestSingleToken(".", SyntaxKind.Dot);
+        }
+
+        [Fact]
+        public void Or_Is_Recognized()
+        {
+            TestSingleToken("|", SyntaxKind.Or);
+        }
+
+        [Fact]
+        public void Increment_Is_Recognized()
+        {
+            TestSingleToken("++", SyntaxKind.Increment);
+        }
+
+        [Fact]
+        public void MinusAssign_Is_Recognized()
+        {
+            TestSingleToken("-=", SyntaxKind.MinusAssign);
+        }
+
+        [Fact]
+        public void RightShift_Is_Not_Specially_Recognized()
+        {
+            TestTokenizer(">>",
+                SyntaxFactory.Token(SyntaxKind.GreaterThan, ">"),
+                SyntaxFactory.Token(SyntaxKind.GreaterThan, ">"));
+        }
+
+        [Fact]
+        public void Hash_Is_Recognized()
+        {
+            TestSingleToken("#", SyntaxKind.Hash);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTest.cs
new file mode 100644
index 0000000000..5ee0715a7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTest.cs
@@ -0,0 +1,107 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpTokenizerTest : CSharpTokenizerTestBase
+    {
+        private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining;
+
+        [Fact]
+        public void Next_Returns_Null_When_EOF_Reached()
+        {
+            TestTokenizer("");
+        }
+
+        [Fact]
+        public void Next_Returns_Newline_Token_For_Single_CR()
+        {
+            TestTokenizer(
+                "\r\ra",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r"),
+                IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Newline_Token_For_Single_LF()
+        {
+            TestTokenizer(
+                "\n\na",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Newline_Token_For_Single_NEL()
+        {
+            // NEL: Unicode "Next Line" U+0085
+            TestTokenizer(
+                "\u0085\u0085a",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u0085"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u0085"),
+                IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Newline_Token_For_Single_Line_Separator()
+        {
+            // Unicode "Line Separator" U+2028
+            TestTokenizer(
+                "\u2028\u2028a",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2028"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2028"),
+                IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Newline_Token_For_Single_Paragraph_Separator()
+        {
+            // Unicode "Paragraph Separator" U+2029
+            TestTokenizer(
+                "\u2029\u2029a",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2029"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2029"),
+                IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Single_Newline_Token_For_CRLF()
+        {
+            TestTokenizer(
+                "\r\n\r\na",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                IgnoreRemaining);
+        }
+
+        [Fact]
+        public void Next_Returns_Token_For_Whitespace_Characters()
+        {
+            TestTokenizer(
+                " \f\t\u000B \n ",
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " \f\t\u000B "),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "));
+        }
+
+        [Fact]
+        public void Transition_Is_Recognized()
+        {
+            TestSingleToken("@", SyntaxKind.Transition);
+        }
+
+        [Fact]
+        public void Transition_Is_Recognized_As_SingleCharacter()
+        {
+            TestTokenizer(
+                "@(",
+                SyntaxFactory.Token(SyntaxKind.Transition, "@"),
+                SyntaxFactory.Token(SyntaxKind.LeftParenthesis, "("));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTestBase.cs
new file mode 100644
index 0000000000..83b2adc684
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerTestBase.cs
@@ -0,0 +1,27 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public abstract class CSharpTokenizerTestBase : TokenizerTestBase
+    {
+        private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+
+        internal override object IgnoreRemaining
+        {
+            get { return _ignoreRemaining; }
+        }
+
+        internal override object CreateTokenizer(ITextDocument source)
+        {
+            return new CSharpTokenizer(source);
+        }
+
+        internal void TestSingleToken(string text, SyntaxKind expectedTokenKind)
+        {
+            TestTokenizer(text, SyntaxFactory.Token(expectedTokenKind, text));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpVerbatimBlockTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpVerbatimBlockTest.cs
new file mode 100644
index 0000000000..a2f4509a6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpVerbatimBlockTest.cs
@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpVerbatimBlockTest : ParserTestBase
+    {
+        private const string TestExtraKeyword = "model";
+
+        [Fact]
+        public void VerbatimBlock()
+        {
+            ParseDocumentTest("@{ foo(); }");
+        }
+
+        [Fact]
+        public void InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan()
+        {
+            ParseDocumentTest("@{@}");
+        }
+
+        [Fact]
+        public void InnerImplicitExprDoesNotAcceptDotAfterAt()
+        {
+            ParseDocumentTest("@{@.}");
+        }
+
+        [Fact]
+        public void InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine + "    @" + Environment.NewLine + "}", designTime: true);
+        }
+
+        [Fact]
+        public void InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode()
+        {
+            ParseDocumentTest("@{@foo." + Environment.NewLine + "}");
+        }
+
+        [Fact]
+        public void InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode()
+        {
+            ParseDocumentTest("@{@foo." + Environment.NewLine + "}", designTime: true);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpWhitespaceHandlingTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpWhitespaceHandlingTest.cs
new file mode 100644
index 0000000000..67ce3318dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpWhitespaceHandlingTest.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class CSharpWhitespaceHandlingTest : ParserTestBase
+    {
+        [Fact]
+        public void StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor()
+        {
+            ParseDocumentTest("@{@: @if (true) { }" + Environment.NewLine + "}");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CodeBlockEditHandlerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CodeBlockEditHandlerTest.cs
new file mode 100644
index 0000000000..add5518809
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CodeBlockEditHandlerTest.cs
@@ -0,0 +1,293 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
+{
+    public class CodeBlockEditHandlerTest
+    {
+        [Fact]
+        public void IsAcceptableReplacement_AcceptableReplacement_ReturnsTrue()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(0, 5), "H3ll0");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsAcceptableReplacement_AcceptableReplacement_WithMarkup_ReturnsTrue()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello <div>@world</div>.");
+            var change = new SourceChange(new SourceSpan(0, 5), "H3ll0");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsAcceptableReplacement_ChangeModifiesInvalidContent_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(6, 1), "!");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableReplacement_ChangeAddsOpenAngle_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello <div></div>.");
+            var change = new SourceChange(new SourceSpan(6, 1), "<");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableReplacement_ChangeToComment_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello @");
+            var change = new SourceChange(new SourceSpan(6, 1), "@*");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableReplacement_ChangeContainsInvalidContent_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(0, 0), "{");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableReplacement_NotReplace_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(0, 5), string.Empty);
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableReplacement(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableDeletion_ValidChange_ReturnsTrue()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(0, 5), string.Empty);
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableDeletion(span, change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsAcceptableDeletion_InvalidChange_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(5, 3), string.Empty);
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableDeletion(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableDeletion_NotDelete_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "world");
+            var change = new SourceChange(new SourceSpan(0, 0), "hello");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableDeletion(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ModifiesInvalidContent_ValidContent_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(0, 5), string.Empty);
+
+            // Act
+            var result = CodeBlockEditHandler.ModifiesInvalidContent(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ModifiesInvalidContent_InvalidContent_ReturnsTrue()
+        {
+            // Arrange
+            var span = GetSpan(SourceLocation.Zero, "Hello {world}.");
+            var change = new SourceChange(new SourceSpan(5, 7), string.Empty);
+
+            // Act
+            var result = CodeBlockEditHandler.ModifiesInvalidContent(span, change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertion_ValidChange_ReturnsTrue()
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 0), "hello");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableInsertion(change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertion_InvalidChange_ReturnsFalse()
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 0), "{");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableInsertion(change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertion_InvalidChange_Transition_ReturnsFalse()
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 0), "@");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableInsertion(change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertion_InvalidChange_TemplateTransition_ReturnsFalse()
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 0), "<");
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableInsertion(change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertion_NotInsert_ReturnsFalse()
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 2), string.Empty);
+
+            // Act
+            var result = CodeBlockEditHandler.IsAcceptableInsertion(change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("{")]
+        [InlineData("}")]
+        [InlineData("if (true) { }")]
+        [InlineData("@<div></div>")]
+        [InlineData("<div></div>")]
+        [InlineData("*")]
+        public void ContainsInvalidContent_InvalidContent_ReturnsTrue(string content)
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 0), content);
+
+            // Act
+            var result = CodeBlockEditHandler.ContainsInvalidContent(change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("var x = true;")]
+        [InlineData("if (true) Console.WriteLine('!')")]
+        public void ContainsInvalidContent_ValidContent_ReturnsFalse(string content)
+        {
+            // Arrange
+            var change = new SourceChange(new SourceSpan(0, 0), content);
+
+            // Act
+            var result = CodeBlockEditHandler.ContainsInvalidContent(change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        private static SyntaxNode GetSpan(SourceLocation start, string content)
+        {
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            var tokens = CSharpLanguageCharacteristics.Instance.TokenizeString(content).ToArray();
+            foreach (var token in tokens)
+            {
+                builder.Add((SyntaxToken)token.CreateRed());
+            }
+            var node = SyntaxFactory.CSharpStatementLiteral(builder.ToList());
+
+            return node;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveCSharpTokenizerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveCSharpTokenizerTest.cs
new file mode 100644
index 0000000000..7f6e8db88a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveCSharpTokenizerTest.cs
@@ -0,0 +1,48 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class DirectiveCSharpTokenizerTest : CSharpTokenizerTestBase
+    {
+        [Fact]
+        public void Next_ReturnsNull_AfterTokenizingFirstDirective()
+        {
+            TestTokenizer(
+                "\r\n @something \r\n @this is ignored",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.Transition, "@"),
+                SyntaxFactory.Token(SyntaxKind.Identifier, "something"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"));
+        }
+
+        [Fact]
+        public void Next_IncludesComments_ReturnsNull_AfterTokenizingFirstDirective()
+        {
+            TestTokenizer(
+                "@*included*@\r\n @something   \"value\"\r\n @this is ignored",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, "included"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.Transition, "@"),
+                SyntaxFactory.Token(SyntaxKind.Identifier, "something"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, "   "),
+                SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"value\""),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"));
+        }
+
+        internal override object CreateTokenizer(ITextDocument source)
+        {
+            return new DirectiveCSharpTokenizer(source);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveHtmlTokenizerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveHtmlTokenizerTest.cs
new file mode 100644
index 0000000000..ffee2ab489
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DirectiveHtmlTokenizerTest.cs
@@ -0,0 +1,42 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class DirectiveHtmlTokenizerTest : HtmlTokenizerTestBase
+    {
+        [Fact]
+        public void Next_ReturnsNull_WhenHtmlIsSeen()
+        {
+            TestTokenizer(
+                "\r\n <div>Ignored</div>",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"));
+        }
+
+        [Fact]
+        public void Next_IncludesRazorComments_ReturnsNull_WhenHtmlIsSeen()
+        {
+            TestTokenizer(
+                "\r\n @*included*@ <div>Ignored</div>",
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, "included"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"));
+        }
+
+        internal override object CreateTokenizer(ITextDocument source)
+        {
+            return new DirectiveHtmlTokenizer(source);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DisposableActionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DisposableActionTest.cs
new file mode 100644
index 0000000000..8f14f832c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/DisposableActionTest.cs
@@ -0,0 +1,25 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class DisposableActionTest
+    {
+        [Fact]
+        public void ActionIsExecutedOnDispose()
+        {
+            // Arrange
+            var called = false;
+            var action = new DisposableAction(() => { called = true; });
+
+            // Act
+            action.Dispose();
+
+            // Assert
+            Assert.True(called, "The action was not run when the DisposableAction was disposed");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
new file mode 100644
index 0000000000..b919eef4f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
@@ -0,0 +1,252 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlAttributeTest : ParserTestBase
+    {
+        [Fact]
+        public void SymbolBoundAttributes_BeforeEqualWhitespace1()
+        {
+            var attributeName = "[item]";
+            ParseDocumentTest($"@{{<a {attributeName}{Environment.NewLine}='Foo'\t{attributeName}={Environment.NewLine}'Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_BeforeEqualWhitespace2()
+        {
+            var attributeName = "[(item,";
+            ParseDocumentTest($"@{{<a {attributeName}{Environment.NewLine}='Foo'\t{attributeName}={Environment.NewLine}'Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_BeforeEqualWhitespace3()
+        {
+            var attributeName = "(click)";
+            ParseDocumentTest($"@{{<a {attributeName}{Environment.NewLine}='Foo'\t{attributeName}={Environment.NewLine}'Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_BeforeEqualWhitespace4()
+        {
+            var attributeName = "(^click)";
+            ParseDocumentTest($"@{{<a {attributeName}{Environment.NewLine}='Foo'\t{attributeName}={Environment.NewLine}'Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_BeforeEqualWhitespace5()
+        {
+            var attributeName = "*something";
+            ParseDocumentTest($"@{{<a {attributeName}{Environment.NewLine}='Foo'\t{attributeName}={Environment.NewLine}'Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_BeforeEqualWhitespace6()
+        {
+            var attributeName = "#local";
+            ParseDocumentTest($"@{{<a {attributeName}{Environment.NewLine}='Foo'\t{attributeName}={Environment.NewLine}'Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Whitespace1()
+        {
+            var attributeName = "[item]";
+            ParseDocumentTest($"@{{<a {Environment.NewLine}  {attributeName}='Foo'\t{Environment.NewLine}{attributeName}='Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Whitespace2()
+        {
+            var attributeName = "[(item,";
+            ParseDocumentTest($"@{{<a {Environment.NewLine}  {attributeName}='Foo'\t{Environment.NewLine}{attributeName}='Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Whitespace3()
+        {
+            var attributeName = "(click)";
+            ParseDocumentTest($"@{{<a {Environment.NewLine}  {attributeName}='Foo'\t{Environment.NewLine}{attributeName}='Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Whitespace4()
+        {
+            var attributeName = "(^click)";
+            ParseDocumentTest($"@{{<a {Environment.NewLine}  {attributeName}='Foo'\t{Environment.NewLine}{attributeName}='Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Whitespace5()
+        {
+            var attributeName = "*something";
+            ParseDocumentTest($"@{{<a {Environment.NewLine}  {attributeName}='Foo'\t{Environment.NewLine}{attributeName}='Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes_Whitespace6()
+        {
+            var attributeName = "#local";
+            ParseDocumentTest($"@{{<a {Environment.NewLine}  {attributeName}='Foo'\t{Environment.NewLine}{attributeName}='Bar' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes1()
+        {
+            var attributeName = "[item]";
+            ParseDocumentTest($"@{{<a {attributeName}='Foo' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes2()
+        {
+            var attributeName = "[(item,";
+            ParseDocumentTest($"@{{<a {attributeName}='Foo' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes3()
+        {
+            var attributeName = "(click)";
+            ParseDocumentTest($"@{{<a {attributeName}='Foo' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes4()
+        {
+            var attributeName = "(^click)";
+            ParseDocumentTest($"@{{<a {attributeName}='Foo' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes5()
+        {
+            var attributeName = "*something";
+            ParseDocumentTest($"@{{<a {attributeName}='Foo' />}}");
+        }
+
+        [Fact]
+        public void SymbolBoundAttributes6()
+        {
+            var attributeName = "#local";
+            ParseDocumentTest($"@{{<a {attributeName}='Foo' />}}");
+        }
+
+        [Fact]
+        public void SimpleLiteralAttribute()
+        {
+            ParseDocumentTest("@{<a href='Foo' />}");
+        }
+
+        [Fact]
+        public void SimpleLiteralAttributeWithWhitespaceSurroundingEquals()
+        {
+            ParseDocumentTest("@{<a href \f\r\n= \t\n'Foo' />}");
+        }
+
+        [Fact]
+        public void DynamicAttributeWithWhitespaceSurroundingEquals()
+        {
+            ParseDocumentTest("@{<a href \n= \r\n'@Foo' />}");
+        }
+
+        [Fact]
+        public void MultiPartLiteralAttribute()
+        {
+            ParseDocumentTest("@{<a href='Foo Bar Baz' />}");
+        }
+
+        [Fact]
+        public void DoubleQuotedLiteralAttribute()
+        {
+            ParseDocumentTest("@{<a href=\"Foo Bar Baz\" />}");
+        }
+
+        [Fact]
+        public void NewLinePrecedingAttribute()
+        {
+            ParseDocumentTest("@{<a\r\nhref='Foo' />}");
+        }
+
+        [Fact]
+        public void NewLineBetweenAttributes()
+        {
+            ParseDocumentTest("@{<a\nhref='Foo'\r\nabcd='Bar' />}");
+        }
+
+        [Fact]
+        public void WhitespaceAndNewLinePrecedingAttribute()
+        {
+            ParseDocumentTest("@{<a \t\r\nhref='Foo' />}");
+        }
+
+        [Fact]
+        public void UnquotedLiteralAttribute()
+        {
+            ParseDocumentTest("@{<a href=Foo Bar Baz />}");
+        }
+
+        [Fact]
+        public void SimpleExpressionAttribute()
+        {
+            ParseDocumentTest("@{<a href='@foo' />}");
+        }
+
+        [Fact]
+        public void MultiValueExpressionAttribute()
+        {
+            ParseDocumentTest("@{<a href='@foo bar @baz' />}");
+        }
+
+        [Fact]
+        public void VirtualPathAttributesWorkWithConditionalAttributes()
+        {
+            ParseDocumentTest("@{<a href='@foo ~/Foo/Bar' />}");
+        }
+
+        [Fact]
+        public void UnquotedAttributeWithCodeWithSpacesInBlock()
+        {
+            ParseDocumentTest("@{<input value=@foo />}");
+        }
+
+        [Fact]
+        public void UnquotedAttributeWithCodeWithSpacesInDocument()
+        {
+            ParseDocumentTest("<input value=@foo />}");
+        }
+
+        [Fact]
+        public void ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag()
+        {
+            ParseDocumentTest(RazorLanguageVersion.Experimental, "@{<span data-foo='@foo'></span>}", directives: null, designTime: false);
+        }
+
+        [Fact]
+        public void ConditionalAttributesAreDisabledForDataAttributesInBlock()
+        {
+            ParseDocumentTest("@{<span data-foo='@foo'></span>}");
+        }
+
+        [Fact]
+        public void ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock()
+        {
+            ParseDocumentTest("@{<span data-foo  =  '@foo'></span>}");
+        }
+
+        [Fact]
+        public void ConditionalAttributesAreDisabledForDataAttributesInDocument()
+        {
+            ParseDocumentTest("@{<span data-foo='@foo'></span>}");
+        }
+
+        [Fact]
+        public void ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument()
+        {
+            ParseDocumentTest("@{<span data-foo=@foo ></span>}");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlBlockTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlBlockTest.cs
new file mode 100644
index 0000000000..f44b9d2421
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlBlockTest.cs
@@ -0,0 +1,279 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlBlockTest : ParserTestBase
+    {
+        [Fact]
+        public void HandlesUnbalancedTripleDashHTMLComments()
+        {
+            ParseDocumentTest(
+@"@{
+    <!-- Hello, I'm a comment that shouldn't break razor --->
+}");
+        }
+
+        [Fact]
+        public void HandlesOpenAngleAtEof()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                            + "<");
+        }
+
+        [Fact]
+        public void HandlesOpenAngleWithProperTagFollowingIt()
+        {
+            ParseDocumentTest("@{" + Environment.NewLine
+                            + "<" + Environment.NewLine
+                            + "</html>",
+                            designTime: true);
+        }
+
+        [Fact]
+        public void TagWithoutCloseAngleDoesNotTerminateBlock()
+        {
+            ParseDocumentTest("@{<                      " + Environment.NewLine
+                         + "   ");
+        }
+
+        [Fact]
+        public void AllowsStartAndEndTagsToDifferInCase()
+        {
+            ParseDocumentTest("@{<li><p>Foo</P></lI>}");
+        }
+
+        [Fact]
+        public void ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon()
+        {
+            ParseDocumentTest("@{@:<li>Foo Bar Baz" + Environment.NewLine
+                         + "bork}");
+        }
+
+        [Fact]
+        public void StopsParsingSingleLineBlockAtEOFIfNoEOLReached()
+        {
+            ParseDocumentTest("@{@:foo bar");
+        }
+
+        [Fact]
+        public void StopsAtMatchingCloseTagToStartTag()
+        {
+            ParseDocumentTest("@{<a><b></b></a><c></c>}");
+        }
+
+        [Fact]
+        public void ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag()
+        {
+            ParseDocumentTest("@{<baz><boz><biz></biz></boz></baz>}");
+        }
+
+        [Fact]
+        public void AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag()
+        {
+            ParseDocumentTest("@{<foo><bar><baz></foo>}");
+        }
+
+        [Fact]
+        public void WithSelfClosingTagJustEmitsTag()
+        {
+            ParseDocumentTest("@{<foo />}");
+        }
+
+        [Fact]
+        public void CanHandleSelfClosingTagsWithinBlock()
+        {
+            ParseDocumentTest("@{<foo><bar /></foo>}");
+        }
+
+        [Fact]
+        public void SupportsTagsWithAttributes()
+        {
+            ParseDocumentTest("@{<foo bar=\"baz\"><biz><boz zoop=zork/></biz></foo>}");
+        }
+
+        [Fact]
+        public void AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted()
+        {
+            ParseDocumentTest("@{<foo><bar baz=\">\" /></foo>}");
+        }
+
+        [Fact]
+        public void AllowsCloseAngleBracketInAttributeValueIfSingleQuoted()
+        {
+            ParseDocumentTest("@{<foo><bar baz=\'>\' /></foo>}");
+        }
+
+        [Fact]
+        public void AllowsSlashInAttributeValueIfDoubleQuoted()
+        {
+            ParseDocumentTest("@{<foo><bar baz=\"/\"></bar></foo>}");
+        }
+
+        [Fact]
+        public void AllowsSlashInAttributeValueIfSingleQuoted()
+        {
+            ParseDocumentTest("@{<foo><bar baz=\'/\'></bar></foo>}");
+        }
+
+        [Fact]
+        public void TerminatesAtEOF()
+        {
+            ParseDocumentTest("@{<foo>");
+        }
+
+        [Fact]
+        public void SupportsCommentAsBlock()
+        {
+            ParseDocumentTest("@{<!-- foo -->}");
+        }
+
+        [Fact]
+        public void SupportsCommentWithExtraDashAsBlock()
+        {
+            ParseDocumentTest("@{<!-- foo --->}");
+        }
+
+        [Fact]
+        public void SupportsCommentWithinBlock()
+        {
+            ParseDocumentTest("@{<foo>bar<!-- zoop -->baz</foo>}");
+        }
+
+        [Fact]
+        public void HtmlCommentSupportsMultipleDashes()
+        {
+            ParseDocumentTest(
+@"<div><!--- Hello World ---></div>
+<div><!---- Hello World ----></div>
+<div><!----- Hello World -----></div>
+<div><!----- Hello < --- > World </div> -----></div>
+");
+        }
+
+        [Fact]
+        public void ProperlyBalancesCommentStartAndEndTags()
+        {
+            ParseDocumentTest("@{<!--<foo></bar>-->}");
+        }
+
+        [Fact]
+        public void TerminatesAtEOFWhenParsingComment()
+        {
+            ParseDocumentTest("@{<!--<foo>");
+        }
+
+        [Fact]
+        public void OnlyTerminatesCommentOnFullEndSequence()
+        {
+            ParseDocumentTest("@{<!--<foo>--</bar>-->}");
+        }
+
+        [Fact]
+        public void TerminatesCommentAtFirstOccurrenceOfEndSequence()
+        {
+            ParseDocumentTest("@{<foo><!--<foo></bar-->--></foo>}");
+        }
+
+        [Fact]
+        public void TreatsMalformedTagsAsContent()
+        {
+            ParseDocumentTest("@{<foo></!-- bar --></foo>}");
+        }
+
+
+        [Fact]
+        public void ParsesSGMLDeclarationAsEmptyTag()
+        {
+            ParseDocumentTest("@{<foo><!DOCTYPE foo bar baz></foo>}");
+        }
+
+        [Fact]
+        public void TerminatesSGMLDeclarationAtFirstCloseAngle()
+        {
+            ParseDocumentTest("@{<foo><!DOCTYPE foo bar> baz></foo>}");
+        }
+
+        [Fact]
+        public void ParsesXMLProcessingInstructionAsEmptyTag()
+        {
+            ParseDocumentTest("@{<foo><?xml foo bar baz?></foo>}");
+        }
+
+        [Fact]
+        public void TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair()
+        {
+            ParseDocumentTest("@{<foo><?xml foo bar baz?> baz</foo>}");
+        }
+
+        [Fact]
+        public void DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark()
+        {
+            // ParseBlockDoesNotTerminateXMLProcessingInstructionAtCloseAngleUnlessPreceededByQuestionMark
+            ParseDocumentTest("@{<foo><?xml foo bar> baz?></foo>}");
+        }
+
+        [Fact]
+        public void SupportsScriptTagsWithLessThanSignsInThem()
+        {
+            ParseDocumentTest(@"@{<script>if(foo<bar) { alert(""baz"");)</script>}");
+        }
+
+        [Fact]
+        public void SupportsScriptTagsWithSpacedLessThanSignsInThem()
+        {
+            ParseDocumentTest(@"@{<script>if(foo < bar) { alert(""baz"");)</script>}");
+        }
+
+        [Fact]
+        public void AcceptsEmptyTextTag()
+        {
+            ParseDocumentTest("@{<text/>}");
+        }
+
+        [Fact]
+        public void AcceptsTextTagAsOuterTagButDoesNotRender()
+        {
+            ParseDocumentTest("@{<text>Foo Bar <foo> Baz</text> zoop}");
+        }
+
+        [Fact]
+        public void RendersLiteralTextTagIfDoubled()
+        {
+            ParseDocumentTest("@{<text><text>Foo Bar <foo> Baz</text></text> zoop}");
+        }
+
+        [Fact]
+        public void DoesNotConsiderPsuedoTagWithinMarkupBlock()
+        {
+            ParseDocumentTest("@{<foo><text><bar></bar></foo>}");
+        }
+
+        [Fact]
+        public void StopsParsingMidEmptyTagIfEOFReached()
+        {
+            ParseDocumentTest("@{<br/}");
+        }
+
+        [Fact]
+        public void CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement()
+        {
+            ParseDocumentTest("@{<div>Foo @if(true) {} Bar</div>}");
+        }
+
+        [Fact]
+        public void IgnoresTagsInContentsOfScriptTag()
+        {
+            ParseDocumentTest(@"@{<script>foo<bar baz='@boz'></script>}");
+        }
+
+        [Fact]
+        public void HandlesForwardSlashInAttributeContent()
+        {
+            ParseDocumentTest(@"@{<p / class=foo />}");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlDocumentTest.cs
new file mode 100644
index 0000000000..9b28275bc5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlDocumentTest.cs
@@ -0,0 +1,265 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlDocumentTest : ParserTestBase
+    {
+        private static readonly TestFile Nested1000 = TestFile.Create("TestFiles/nested-1000.html", typeof(HtmlDocumentTest));
+
+        [Fact]
+        public void NestedCodeBlockWithMarkupSetsDotAsMarkup()
+        {
+            ParseDocumentTest("@if (true) { @if(false) { <div>@something.</div> } }");
+        }
+
+        [Fact]
+        public void OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString()
+        {
+            ParseDocumentTest(string.Empty);
+        }
+
+        [Fact]
+        public void OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan()
+        {
+            ParseDocumentTest("          ");
+        }
+
+        [Fact]
+        public void AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan()
+        {
+            ParseDocumentTest("@");
+        }
+
+        [Fact]
+        public void CorrectlyHandlesOddlySpacedHTMLElements()
+        {
+            ParseDocumentTest("<div ><p class = 'bar'> Foo </p></div >");
+        }
+
+        [Fact]
+        public void CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement()
+        {
+            ParseDocumentTest("<div>Foo @if(true) {} Bar</div>");
+        }
+
+        [Fact]
+        public void WithinSectionDoesNotCreateDocumentLevelSpan()
+        {
+            ParseDocumentTest("@section Foo {" + Environment.NewLine
+                            + "    <html></html>" + Environment.NewLine
+                            + "}",
+                new[] { SectionDirective.Directive, });
+        }
+
+        [Fact]
+        public void ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered()
+        {
+            ParseDocumentTest("foo baz");
+        }
+
+        [Fact]
+        public void HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput()
+        {
+            ParseDocumentTest("foo @bar baz");
+        }
+
+        [Fact]
+        public void EmitsAtSignAsMarkupIfAtEndOfFile()
+        {
+            ParseDocumentTest("foo @");
+        }
+
+        [Fact]
+        public void EmitsCodeBlockIfFirstCharacterIsSwapCharacter()
+        {
+            ParseDocumentTest("@bar");
+        }
+
+        [Fact]
+        public void ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText()
+        {
+            ParseDocumentTest("example@microsoft.com");
+        }
+
+        [Fact]
+        public void DoesNotSwitchToCodeOnEmailAddressInAttribute()
+        {
+            ParseDocumentTest("<a href=\"mailto:example@microsoft.com\">Email me</a>");
+        }
+
+        [Fact]
+        public void DoesNotReturnErrorOnMismatchedTags()
+        {
+            ParseDocumentTest("Foo <div><p></p></p> Baz");
+        }
+
+        [Fact]
+        public void ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered()
+        {
+            ParseDocumentTest("Foo Baz<!--Foo-->Bar<!--F> Qux");
+        }
+
+        [Fact]
+        public void RendersTextPseudoTagAsMarkup()
+        {
+            ParseDocumentTest("Foo <text>Foo</text>");
+        }
+
+        [Fact]
+        public void AcceptsEndTagWithNoMatchingStartTag()
+        {
+            ParseDocumentTest("Foo </div> Bar");
+        }
+
+        [Fact]
+        public void NoLongerSupportsDollarOpenBraceCombination()
+        {
+            ParseDocumentTest("<foo>${bar}</foo>");
+        }
+
+        [Fact]
+        public void IgnoresTagsInContentsOfScriptTag()
+        {
+            ParseDocumentTest(@"<script>foo<bar baz='@boz'></script>");
+        }
+
+        [Fact]
+        public void DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock()
+        {
+            ParseDocumentTest("@{\r\n}\r\n<html>");
+        }
+
+        [Fact]
+        public void DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock()
+        {
+            ParseDocumentTest("@{\r\n} \t\r\n<html>");
+        }
+
+        [Fact]
+        public void DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp()
+        {
+            // ParseDocumentDoesNotRenderExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByCSharp
+            ParseDocumentTest("@{<text>Blah</text>\r\n\r\n}<html>");
+        }
+
+        [Fact]
+        public void RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml()
+        {
+            ParseDocumentTest("@{<text>Blah</text>\r\n<input/>\r\n}<html>");
+        }
+
+        [Fact]
+        public void RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition()
+        {
+            // ParseDocumentRendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByMarkupTransition
+            ParseDocumentTest("@{<text>Blah</text>\r\n@: Bleh\r\n}<html>");
+        }
+
+        [Fact]
+        public void DoesNotIgnoreNewLineAtTheEndOfMarkupBlock()
+        {
+            ParseDocumentTest("@{\r\n}\r\n<html>\r\n");
+        }
+
+        [Fact]
+        public void DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent()
+        {
+            ParseDocumentTest("@{\r\n}   \t<html>\r\n");
+        }
+
+        [Fact]
+        public void HandlesNewLineInNestedBlock()
+        {
+            ParseDocumentTest("@{\r\n@if(true){\r\n} \r\n}\r\n<html>");
+        }
+
+        [Fact]
+        public void HandlesNewLineAndMarkupInNestedBlock()
+        {
+            ParseDocumentTest("@{\r\n@if(true){\r\n} <input> }");
+        }
+
+        [Fact]
+        public void HandlesExtraNewLineBeforeMarkupInNestedBlock()
+        {
+            ParseDocumentTest("@{\r\n@if(true){\r\n} \r\n<input> \r\n}<html>");
+        }
+
+        [Fact]
+        public void ParseSectionIgnoresTagsInContentsOfScriptTag()
+        {
+            ParseDocumentTest(
+                @"@section Foo { <script>foo<bar baz='@boz'></script> }",
+                new[] { SectionDirective.Directive, });
+        }
+
+        [Fact]
+        public void ParseBlockCanParse1000NestedElements()
+        {
+            var content = Nested1000.ReadAllText();
+
+            // Assert - does not throw
+            ParseDocument(content);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionInAttributeValue_DoesNotThrow()
+        {
+            var input = "{<span foo='@@' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow()
+        {
+            var input = "{<span foo='abc@@' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow()
+        {
+            var input = "{<span foo='@@def' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionBetweenAttributeValue_DoesNotThrow()
+        {
+            var input = "{<span foo='abc @@ def' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionWithExpressionBlock_DoesNotThrow()
+        {
+            var input = "{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionInEmail_DoesNotThrow()
+        {
+            var input = "{<span foo='abc@def.com abc@@def.com @@' />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithDoubleTransitionInRegex_DoesNotThrow()
+        {
+            var input = @"{<span foo=""/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"" />}";
+            ParseDocumentTest(input);
+        }
+
+        [Fact]
+        public void WithUnexpectedTransitionsInAttributeValue_Throws()
+        {
+            ParseDocumentTest("<span foo='@ @' />");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlErrorTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlErrorTest.cs
new file mode 100644
index 0000000000..5c85c2d08a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlErrorTest.cs
@@ -0,0 +1,52 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlErrorTest : ParserTestBase
+    {
+        [Fact]
+        public void AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag()
+        {
+            ParseDocumentTest("@{<1-foo+bar>foo</1-foo+bar>}");
+        }
+
+        [Fact]
+        public void ErrorIfStartTextTagContainsTextAfterName()
+        {
+            ParseDocumentTest("@{<text foo bar></text>}");
+        }
+
+        [Fact]
+        public void ErrorIfEndTextTagContainsTextAfterName()
+        {
+            ParseDocumentTest("@{<text></text foo bar>}");
+        }
+
+        [Fact]
+        public void StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock()
+        {
+            ParseDocumentTest("@{</foo> bar baz}");
+        }
+
+        [Fact]
+        public void WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag()
+        {
+            ParseDocumentTest("@{<p><foo></bar>}");
+        }
+
+        [Fact]
+        public void WithUnclosedTagAtEOFErrorsOnMissingEndTag()
+        {
+            ParseDocumentTest("@{<foo>blah blah blah blah blah");
+        }
+
+        [Fact]
+        public void WithUnfinishedTagAtEOFErrorsWithIncompleteTag()
+        {
+            ParseDocumentTest("@{<foo bar=baz");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlMarkupParserTests.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlMarkupParserTests.cs
new file mode 100644
index 0000000000..d7352c9e54
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlMarkupParserTests.cs
@@ -0,0 +1,230 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
+{
+    public class HtmlMarkupParserTests
+    {
+        private static readonly SyntaxToken doubleHyphenToken = SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--");
+
+        public static IEnumerable<object[]> NonDashTokens
+        {
+            get
+            {
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.Text, "asdf") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.CloseAngle, ">") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.OpenAngle, "<") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.Bang, "!") };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NonDashTokens))]
+        public void IsHyphen_ReturnsFalseForNonDashToken(object token)
+        {
+            // Arrange
+            var convertedToken = (SyntaxToken)token;
+
+            // Act & Assert
+            Assert.False(HtmlMarkupParser.IsHyphen(convertedToken));
+        }
+
+        [Fact]
+        public void IsHyphen_ReturnsTrueForADashToken()
+        {
+            // Arrange
+            var dashToken = SyntaxFactory.Token(SyntaxKind.Text, "-");
+
+            // Act & Assert
+            Assert.True(HtmlMarkupParser.IsHyphen(dashToken));
+        }
+
+        [Fact]
+        public void AcceptAllButLastDoubleHypens_ReturnsTheOnlyDoubleHyphenToken()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("-->");
+
+            // Act
+            var token = sut.AcceptAllButLastDoubleHyphens();
+
+            // Assert
+            Assert.True(doubleHyphenToken.IsEquivalentTo(token));
+            Assert.True(sut.At(SyntaxKind.CloseAngle));
+            Assert.True(doubleHyphenToken.IsEquivalentTo(sut.PreviousToken));
+        }
+
+        [Fact]
+        public void AcceptAllButLastDoubleHypens_ReturnsTheDoubleHyphenTokenAfterAcceptingTheDash()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("--->");
+
+            // Act
+            var token = sut.AcceptAllButLastDoubleHyphens();
+
+            // Assert
+            Assert.True(doubleHyphenToken.IsEquivalentTo(token));
+            Assert.True(sut.At(SyntaxKind.CloseAngle));
+            Assert.True(HtmlMarkupParser.IsHyphen(sut.PreviousToken));
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsTrueForEmptyCommentTag()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!---->");
+
+            // Act & Assert
+            Assert.True(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsTrueForValidCommentTag()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- Some comment content in here -->");
+
+            // Act & Assert
+            Assert.True(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsTrueForValidCommentTagWithExtraDashesAtClosingTag()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- Some comment content in here ----->");
+
+            // Act & Assert
+            Assert.True(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsFalseForContentWithBadEndingAndExtraDash()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- Some comment content in here <!--->");
+
+            // Act & Assert
+            Assert.False(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsTrueForValidCommentTagWithExtraInfoAfter()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- comment --> the first part is a valid comment without the Open angle and bang tokens");
+
+            // Act & Assert
+            Assert.True(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsFalseForNotClosedComment()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- not closed comment");
+
+            // Act & Assert
+            Assert.False(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsFalseForCommentWithoutLastClosingAngle()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- not closed comment--");
+
+            // Act & Assert
+            Assert.False(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsHtmlCommentAhead_ReturnsTrueForCommentWithCodeInside()
+        {
+            // Arrange
+            var sut = CreateTestParserForContent("<!-- not closed @DateTime.Now comment-->");
+
+            // Act & Assert
+            Assert.True(sut.IsHtmlCommentAhead());
+        }
+
+        [Fact]
+        public void IsCommentContentEndingInvalid_ReturnsFalseForAllowedContent()
+        {
+            // Arrange
+            var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
+            var sequence = Enumerable.Range((int)'a', 26).Select(item => SyntaxFactory.Token(SyntaxKind.Text, ((char)item).ToString()));
+
+            // Act & Assert
+            Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
+        }
+
+        [Fact]
+        public void IsCommentContentEndingInvalid_ReturnsTrueForDisallowedContent()
+        {
+            // Arrange
+            var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
+            var sequence = new[]
+            {
+                SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
+                SyntaxFactory.Token(SyntaxKind.Bang, "!"),
+                SyntaxFactory.Token(SyntaxKind.Text, "-")
+            };
+
+            // Act & Assert
+            Assert.True(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
+        }
+
+        [Fact]
+        public void IsCommentContentEndingInvalid_ReturnsFalseForEmptyContent()
+        {
+            // Arrange
+            var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
+            var sequence = Array.Empty<SyntaxToken>();
+
+            // Act & Assert
+            Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
+        }
+
+        private class TestHtmlMarkupParser : HtmlMarkupParser
+        {
+            public new SyntaxToken PreviousToken
+            {
+                get => base.PreviousToken;
+            }
+
+            public new bool IsHtmlCommentAhead()
+            {
+                return base.IsHtmlCommentAhead();
+            }
+
+            public TestHtmlMarkupParser(ParserContext context) : base(context)
+            {
+                EnsureCurrent();
+            }
+
+            public new SyntaxToken AcceptAllButLastDoubleHyphens()
+            {
+                return base.AcceptAllButLastDoubleHyphens();
+            }
+        }
+
+        private static TestHtmlMarkupParser CreateTestParserForContent(string content)
+        {
+            var source = TestRazorSourceDocument.Create(content);
+            var options = RazorParserOptions.CreateDefault();
+            var context = new ParserContext(source, options);
+
+            return new TestHtmlMarkupParser(context);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTagsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTagsTest.cs
new file mode 100644
index 0000000000..cf4852999d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTagsTest.cs
@@ -0,0 +1,187 @@
+// 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.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlTagsTest : ParserTestBase
+    {
+        private static readonly string[] VoidElementNames = new[]
+        {
+            "area",
+            "base",
+            "br",
+            "col",
+            "command",
+            "embed",
+            "hr",
+            "img",
+            "input",
+            "keygen",
+            "link",
+            "meta",
+            "param",
+            "source",
+            "track",
+            "wbr",
+        };
+
+        [Fact]
+        public void EmptyTagNestsLikeNormalTag()
+        {
+            ParseDocumentTest("@{<p></> Bar}");
+        }
+
+        [Fact]
+        public void EmptyTag()
+        {
+            // This can happen in situations where a user is in VS' HTML editor and they're modifying
+            // the contents of an HTML tag.
+            ParseDocumentTest("@{<></> Bar}");
+        }
+
+        [Fact]
+        public void CommentTag()
+        {
+            ParseDocumentTest("@{<!--Foo--> Bar}");
+        }
+
+        [Fact]
+        public void DocTypeTag()
+        {
+            ParseDocumentTest("@{<!DOCTYPE html> foo}");
+        }
+
+        [Fact]
+        public void ProcessingInstructionTag()
+        {
+            ParseDocumentTest("@{<?xml version=\"1.0\" ?> foo}");
+        }
+
+        [Fact]
+        public void ElementTags()
+        {
+            ParseDocumentTest("@{<p>Foo</p> Bar}");
+        }
+
+        [Fact]
+        public void TextTags()
+        {
+            ParseDocumentTest("@{<text>Foo</text>}");
+        }
+
+        [Fact]
+        public void CDataTag()
+        {
+            ParseDocumentTest("@{<![CDATA[Foo]]> Bar}");
+        }
+
+        [Fact]
+        public void ScriptTag()
+        {
+            ParseDocumentTest("<script>foo < bar && quantity.toString() !== orderQty.val()</script>");
+        }
+
+        [Fact]
+        public void ScriptTag_WithNestedMalformedTag()
+        {
+            ParseDocumentTest("<script>var four = 4; /* </ */</script>");
+        }
+
+        [Fact]
+        public void ScriptTag_WithNestedEndTag()
+        {
+            ParseDocumentTest("<script></p></script>");
+        }
+
+        [Fact]
+        public void ScriptTag_WithNestedBeginTag()
+        {
+            ParseDocumentTest("<script><p></script>");
+        }
+
+        [Fact]
+        public void ScriptTag_WithNestedTag()
+        {
+            ParseDocumentTest("<script><p></p></script>");
+        }
+
+        [Fact]
+        public void ScriptTag_Incomplete()
+        {
+            ParseDocumentTest("<script type=");
+        }
+
+        [Fact]
+        public void ScriptTag_Invalid()
+        {
+            ParseDocumentTest("@{ <script></script @ > }");
+        }
+
+        [Fact]
+        public void VoidElementFollowedByContent()
+        {
+            // Arrange
+            var content = new StringBuilder();
+            foreach (var tagName in VoidElementNames)
+            {
+                content.AppendLine("@{");
+                content.AppendLine("<" + tagName + ">var x = true;");
+                content.AppendLine("}");
+            }
+
+            // Act & Assert
+            ParseDocumentTest(content.ToString());
+        }
+
+        [Fact]
+        public void VoidElementFollowedByOtherTag()
+        {
+            // Arrange
+            var content = new StringBuilder();
+            foreach (var tagName in VoidElementNames)
+            {
+                content.AppendLine(@"{");
+                content.AppendLine("<" + tagName + "><other> var x = true;");
+                content.AppendLine("}");
+            }
+
+            // Act & Assert
+            ParseDocumentTest(content.ToString());
+        }
+
+        [Fact]
+        public void VoidElementFollowedByCloseTag()
+        {
+            // Arrange
+            var content = new StringBuilder();
+            foreach (var tagName in VoidElementNames)
+            {
+                content.AppendLine("@{");
+                content.AppendLine("<" + tagName + "> </" + tagName + ">var x = true;");
+                content.AppendLine("}");
+            }
+
+            // Act & Assert
+            ParseDocumentTest(content.ToString());
+        }
+
+        [Fact]
+        public void IncompleteVoidElementEndTag()
+        {
+            // Arrange
+            var content = new StringBuilder();
+            foreach (var tagName in VoidElementNames)
+            {
+                content.AppendLine("@{");
+                content.AppendLine("<" + tagName + "></" + tagName);
+                content.AppendLine("}");
+            }
+
+            // Act & Assert
+            ParseDocumentTest(content.ToString());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlToCodeSwitchTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlToCodeSwitchTest.cs
new file mode 100644
index 0000000000..ffd4e2ebe4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlToCodeSwitchTest.cs
@@ -0,0 +1,165 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlToCodeSwitchTest : ParserTestBase
+    {
+        [Fact]
+        public void SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric()
+        {
+            ParseDocumentTest("@{<p>foo#@i</p>}");
+        }
+
+        [Fact]
+        public void SwitchesToCodeWhenSwapCharacterEncounteredMidTag()
+        {
+            ParseDocumentTest("@{<foo @bar />}");
+        }
+
+        [Fact]
+        public void SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue()
+        {
+            ParseDocumentTest("@{<foo bar=\"@baz\" />}");
+        }
+
+        [Fact]
+        public void SwitchesToCodeWhenSwapCharacterEncounteredInTagContent()
+        {
+            ParseDocumentTest("@{<foo>@bar<baz>@boz</baz></foo>}");
+        }
+
+        [Fact]
+        public void ParsesCodeWithinSingleLineMarkup()
+        {
+            // TODO: Fix at a later date, HTML should be a tag block: https://github.com/aspnet/Razor/issues/101
+            ParseDocumentTest("@{@:<li>Foo @Bar Baz" + Environment.NewLine
+                         + "bork}");
+        }
+
+        [Fact]
+        public void SupportsCodeWithinComment()
+        {
+            ParseDocumentTest("@{<foo><!-- @foo --></foo>}");
+        }
+
+        [Fact]
+        public void SupportsCodeWithinSGMLDeclaration()
+        {
+            ParseDocumentTest("@{<foo><!DOCTYPE foo @bar baz></foo>}");
+        }
+
+        [Fact]
+        public void SupportsCodeWithinCDataDeclaration()
+        {
+            ParseDocumentTest("@{<foo><![CDATA[ foo @bar baz]]></foo>}");
+        }
+
+        [Fact]
+        public void SupportsCodeWithinXMLProcessingInstruction()
+        {
+            ParseDocumentTest("@{<foo><?xml foo @bar baz?></foo>}");
+        }
+
+        [Fact]
+        public void DoesNotSwitchToCodeOnEmailAddressInText()
+        {
+            ParseDocumentTest("@{<foo>anurse@microsoft.com</foo>}");
+        }
+
+        [Fact]
+        public void DoesNotSwitchToCodeOnEmailAddressInAttribute()
+        {
+            ParseDocumentTest("@{<a href=\"mailto:anurse@microsoft.com\">Email me</a>}");
+        }
+
+        [Fact]
+        public void GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine()
+        {
+            ParseDocumentTest("@{   <ul>" + Environment.NewLine
+                         + "    @foreach(var p in Products) {" + Environment.NewLine
+                         + "        <li>Product: @p.Name</li>" + Environment.NewLine
+                         + "    }" + Environment.NewLine
+                         + "    </ul>}");
+        }
+
+        [Fact]
+        public void ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine()
+        {
+            ParseDocumentTest("   <ul>" + Environment.NewLine
+                            + "    @foreach(var p in Products) {" + Environment.NewLine
+                            + "        <li>Product: @p.Name</li>" + Environment.NewLine
+                            + "    }" + Environment.NewLine
+                            + "    </ul>");
+        }
+
+        [Fact]
+        public void SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine()
+        {
+            ParseDocumentTest("@{@section foo {" + Environment.NewLine
+                            + "    <ul>" + Environment.NewLine
+                            + "        @foreach(var p in Products) {" + Environment.NewLine
+                            + "            <li>Product: @p.Name</li>" + Environment.NewLine
+                            + "        }" + Environment.NewLine
+                            + "    </ul>" + Environment.NewLine
+                            + "}}",
+                new[] { SectionDirective.Directive, });
+        }
+
+        [Fact]
+        public void CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode()
+        {
+            ParseDocumentTest("@{   <ul>" + Environment.NewLine
+                         + "    @foreach(var p in Products) {" + Environment.NewLine
+                         + "        <li>Product: @p.Name</li>" + Environment.NewLine
+                         + "    }" + Environment.NewLine
+                         + "    </ul>}",
+                designTime: true);
+        }
+
+        // Tests for "@@" escape sequence:
+        [Fact]
+        public void TreatsTwoAtSignsAsEscapeSequence()
+        {
+            ParseDocumentTest("@{<foo>@@bar</foo>}");
+        }
+
+        [Fact]
+        public void TreatsPairsOfAtSignsAsEscapeSequence()
+        {
+            ParseDocumentTest("@{<foo>@@@@@bar</foo>}");
+        }
+
+        [Fact]
+        public void ParseDocumentTreatsTwoAtSignsAsEscapeSequence()
+        {
+            ParseDocumentTest("<foo>@@bar</foo>");
+        }
+
+        [Fact]
+        public void ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence()
+        {
+            ParseDocumentTest("<foo>@@@@@bar</foo>");
+        }
+
+        [Fact]
+        public void SectionBodyTreatsTwoAtSignsAsEscapeSequence()
+        {
+            ParseDocumentTest(
+                "@section Foo { <foo>@@bar</foo> }",
+                new[] { SectionDirective.Directive, });
+        }
+
+        [Fact]
+        public void SectionBodyTreatsPairsOfAtSignsAsEscapeSequence()
+        {
+            ParseDocumentTest(
+                "@section Foo { <foo>@@@@@bar</foo> }",
+                new[] { SectionDirective.Directive, });
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTest.cs
new file mode 100644
index 0000000000..92091fa278
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTest.cs
@@ -0,0 +1,164 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class HtmlTokenizerTest : HtmlTokenizerTestBase
+    {
+        [Fact]
+        public void Next_Returns_Null_When_EOF_Reached()
+        {
+            TestTokenizer("");
+        }
+
+        [Fact]
+        public void Text_Is_Recognized()
+        {
+            TestTokenizer("foo-9309&smlkmb;::-3029022,.sdkq92384",
+                          SyntaxFactory.Token(SyntaxKind.Text, "foo-9309&smlkmb;::-3029022,.sdkq92384"));
+        }
+
+        [Fact]
+        public void Whitespace_Is_Recognized()
+        {
+            TestTokenizer(" \t\f ",
+                          SyntaxFactory.Token(SyntaxKind.Whitespace, " \t\f "));
+        }
+
+        [Fact]
+        public void Newline_Is_Recognized()
+        {
+            TestTokenizer("\n\r\r\n",
+                          SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                          SyntaxFactory.Token(SyntaxKind.NewLine, "\r"),
+                          SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"));
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Recognized_Mid_Text_If_Surrounded_By_Alphanumeric_Characters()
+        {
+            TestSingleToken("foo@bar", SyntaxKind.Text);
+        }
+
+        [Fact]
+        public void OpenAngle_Is_Recognized()
+        {
+            TestSingleToken("<", SyntaxKind.OpenAngle);
+        }
+
+        [Fact]
+        public void Bang_Is_Recognized()
+        {
+            TestSingleToken("!", SyntaxKind.Bang);
+        }
+
+        [Fact]
+        public void Solidus_Is_Recognized()
+        {
+            TestSingleToken("/", SyntaxKind.ForwardSlash);
+        }
+
+        [Fact]
+        public void QuestionMark_Is_Recognized()
+        {
+            TestSingleToken("?", SyntaxKind.QuestionMark);
+        }
+
+        [Fact]
+        public void LeftBracket_Is_Recognized()
+        {
+            TestSingleToken("[", SyntaxKind.LeftBracket);
+        }
+
+        [Fact]
+        public void CloseAngle_Is_Recognized()
+        {
+            TestSingleToken(">", SyntaxKind.CloseAngle);
+        }
+
+        [Fact]
+        public void RightBracket_Is_Recognized()
+        {
+            TestSingleToken("]", SyntaxKind.RightBracket);
+        }
+
+        [Fact]
+        public void Equals_Is_Recognized()
+        {
+            TestSingleToken("=", SyntaxKind.Equals);
+        }
+
+        [Fact]
+        public void DoubleQuote_Is_Recognized()
+        {
+            TestSingleToken("\"", SyntaxKind.DoubleQuote);
+        }
+
+        [Fact]
+        public void SingleQuote_Is_Recognized()
+        {
+            TestSingleToken("'", SyntaxKind.SingleQuote);
+        }
+
+        [Fact]
+        public void Transition_Is_Recognized()
+        {
+            TestSingleToken("@", SyntaxKind.Transition);
+        }
+
+        [Fact]
+        public void DoubleHyphen_Is_Recognized()
+        {
+            TestSingleToken("--", SyntaxKind.DoubleHyphen);
+        }
+
+        [Fact]
+        public void SingleHyphen_Is_Not_Recognized()
+        {
+            TestSingleToken("-", SyntaxKind.Text);
+        }
+
+        [Fact]
+        public void SingleHyphen_Mid_Text_Is_Not_Recognized_As_Separate_Token()
+        {
+            TestSingleToken("foo-bar", SyntaxKind.Text);
+        }
+
+        [Fact]
+        public void Next_Ignores_Star_At_EOF_In_RazorComment()
+        {
+            TestTokenizer(
+                "@* Foo * Bar * Baz *",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz *"));
+        }
+
+        [Fact]
+        public void Next_Ignores_Star_Without_Trailing_At()
+        {
+            TestTokenizer(
+                "@* Foo * Bar * Baz *@",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
+        }
+
+        [Fact]
+        public void Next_Returns_RazorComment_Token_For_Entire_Razor_Comment()
+        {
+            TestTokenizer(
+                "@* Foo Bar Baz *@",
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo Bar Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTestBase.cs
new file mode 100644
index 0000000000..0b6250d6d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlTokenizerTestBase.cs
@@ -0,0 +1,27 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public abstract class HtmlTokenizerTestBase : TokenizerTestBase
+    {
+        private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+
+        internal override object IgnoreRemaining
+        {
+            get { return _ignoreRemaining; }
+        }
+
+        internal override object CreateTokenizer(ITextDocument source)
+        {
+            return new HtmlTokenizer(source);
+        }
+
+        internal void TestSingleToken(string text, SyntaxKind expectedTokenKind)
+        {
+            TestTokenizer(text, SyntaxFactory.Token(expectedTokenKind, text));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/ImplicitExpressionEditHandlerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/ImplicitExpressionEditHandlerTest.cs
new file mode 100644
index 0000000000..bf71526ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/ImplicitExpressionEditHandlerTest.cs
@@ -0,0 +1,463 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class ImplicitExpressionEditHandlerTest
+    {
+        [Fact]
+        public void IsAcceptableDeletionInBalancedParenthesis_DeletionStartNotInBalancedParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hell)(o)");
+            var change = new SourceChange(new SourceSpan(6, 1), string.Empty);
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableDeletionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableDeletionInBalancedParenthesis_DeletionEndNotInBalancedParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hell)(o)");
+            var change = new SourceChange(new SourceSpan(5, 1), string.Empty);
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableDeletionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableDeletionInBalancedParenthesis_DeletionOverlapsBalancedParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hell)(o)");
+            var change = new SourceChange(new SourceSpan(5, 2), string.Empty);
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableDeletionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableDeletionInBalancedParenthesis_DeletionDoesNotImpactBalancedParenthesis_ReturnsTrue()
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(H(ell)o)");
+            var change = new SourceChange(new SourceSpan(3, 3), string.Empty);
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableDeletionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("(")]
+        [InlineData(")")]
+        public void IsAcceptableInsertionInBalancedParenthesis_ReturnsFalseIfChangeIsParenthesis(string changeText)
+        {
+            // Arrange
+            var change = new SourceChange(0, 1, changeText);
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableInsertionInBalancedParenthesis(null, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void TryUpdateCountFromContent_SingleLeftParenthesis_CountsCorrectly()
+        {
+            // Arrange
+            var content = "(";
+            var count = 0;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateCountFromContent(content, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(1, count);
+        }
+
+        [Fact]
+        public void TryUpdateCountFromContent_SingleRightParenthesis_CountsCorrectly()
+        {
+            // Arrange
+            var content = ")";
+            var count = 2;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateCountFromContent(content, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(1, count);
+        }
+
+        [Fact]
+        public void TryUpdateCountFromContent_CorrectCount_ReturnsTrue()
+        {
+            // Arrange
+            var content = "\"(()(";
+            var count = 0;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateCountFromContent(content, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void TryUpdateCountFromContent_ExistingCountAndNonParenthesisContent_ReturnsTrue()
+        {
+            // Arrange
+            var content = "'(abc)de)fg";
+            var count = 1;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateCountFromContent(content, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void TryUpdateCountFromContent_InvalidParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var content = "'())))))";
+            var count = 4;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateCountFromContent(content, ref count);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(4, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_SingleLeftParenthesis_CountsCorrectly()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.LeftParenthesis, "(");
+            var count = 0;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(1, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_SingleRightParenthesis_CountsCorrectly()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.RightParenthesis, ")");
+            var count = 2;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(1, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_IncompleteStringLiteral_CountsCorrectly()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"((");
+            var count = 2;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(4, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_IncompleteCharacterLiteral_CountsCorrectly()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'((");
+            var count = 2;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(4, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_CompleteStringLiteral_CountsCorrectly()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"((\"");
+            var count = 2;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_CompleteCharacterLiteral_CountsCorrectly()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'('");
+            var count = 2;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_InvalidParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.RightParenthesis, ")");
+            var count = 0;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_InvalidParenthesisStringLiteral_ReturnsFalse()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.StringLiteral, "\")");
+            var count = 0;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void TryUpdateBalanceCount_InvalidParenthesisCharacterLiteral_ReturnsFalse()
+        {
+            // Arrange
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "')");
+            var count = 0;
+
+            // Act
+            var result = ImplicitExpressionEditHandler.TryUpdateBalanceCount(token, ref count);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void ContainsPosition_AtStartOfToken_ReturnsTrue()
+        {
+            // Arrange
+            var token = GetTokens(new SourceLocation(4, 1, 2), "hello").Single();
+
+            // Act
+            var result = ImplicitExpressionEditHandler.ContainsPosition(4, token);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ContainsPosition_InsideOfToken_ReturnsTrue()
+        {
+            // Arrange
+            var token = GetTokens(new SourceLocation(4, 1, 2), "hello").Single();
+
+            // Act
+            var result = ImplicitExpressionEditHandler.ContainsPosition(6, token);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void ContainsPosition_AtEndOfToken_ReturnsFalse()
+        {
+            // Arrange
+            var token = GetTokens(new SourceLocation(4, 1, 2), "hello").Single();
+
+            // Act
+            var result = ImplicitExpressionEditHandler.ContainsPosition(9, token);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData(10)]
+        [InlineData(2)]
+        public void ContainsPosition_OutsideOfToken_ReturnsFalse(int position)
+        {
+            // Arrange
+            var token = GetTokens(new SourceLocation(4, 1, 2), "hello").Single();
+
+            // Act
+            var result = ImplicitExpressionEditHandler.ContainsPosition(position, token);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsInsideParenthesis_SurroundedByCompleteParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var tokens = GetTokens(SourceLocation.Zero, "(hello)point(world)");
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsInsideParenthesis(9, tokens);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsInsideParenthesis_InvalidParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var tokens = GetTokens(SourceLocation.Zero, "(hello))point)");
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsInsideParenthesis(10, tokens);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsInsideParenthesis_NoParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var tokens = GetTokens(SourceLocation.Zero, "Hello World");
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsInsideParenthesis(3, tokens);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsInsideParenthesis_InBalancedParenthesis_ReturnsTrue()
+        {
+            // Arrange
+            var tokens = GetTokens(SourceLocation.Zero, "Foo(GetValue(), DoSomething(point))");
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsInsideParenthesis(30, tokens);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("(")]
+        [InlineData(")")]
+        public void IsAcceptableInsertionInBalancedParenthesis_InsertingParenthesis_ReturnsFalse(string text)
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hello World)");
+            var change = new SourceChange(new SourceSpan(3, 0), text);
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableInsertionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertionInBalancedParenthesis_UnbalancedParenthesis_ReturnsFalse()
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hello");
+            var change = new SourceChange(new SourceSpan(6, 0), " World");
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableInsertionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsAcceptableInsertionInBalancedParenthesis_BalancedParenthesis_ReturnsTrue()
+        {
+            // Arrange
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hello)");
+            var change = new SourceChange(new SourceSpan(6, 0), " World");
+
+            // Act
+            var result = ImplicitExpressionEditHandler.IsAcceptableInsertionInBalancedParenthesis(span, change);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        private static Syntax.MarkupTextLiteralSyntax GetSyntaxNode(SourceLocation start, string content)
+        {
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            var tokens = CSharpLanguageCharacteristics.Instance.TokenizeString(content).ToArray();
+            foreach (var token in tokens)
+            {
+                builder.Add(token);
+            }
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(parent: null, position: start.AbsoluteIndex);
+
+            return (Syntax.MarkupTextLiteralSyntax)node;
+        }
+
+        private static IReadOnlyList<Syntax.SyntaxToken> GetTokens(SourceLocation start, string content)
+        {
+            var parent = GetSyntaxNode(start, content);
+            return parent.LiteralTokens;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/LineTrackingStringBufferTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/LineTrackingStringBufferTest.cs
new file mode 100644
index 0000000000..27179a9f6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/LineTrackingStringBufferTest.cs
@@ -0,0 +1,26 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class LineTrackingStringBufferTest
+    {
+        [Fact]
+        public void CtorInitializesProperties()
+        {
+            var buffer = new LineTrackingStringBuffer(string.Empty, "test.cshtml");
+            Assert.Equal(0, buffer.Length);
+        }
+
+        [Fact]
+        public void CharAtCorrectlyReturnsLocation()
+        {
+            var buffer = new LineTrackingStringBuffer("foo\rbar\nbaz\r\nbiz", "test.cshtml");
+            var chr = buffer.CharAt(14);
+            Assert.Equal('i', chr.Character);
+            Assert.Equal(new SourceLocation("test.cshtml", 14, 3, 1), chr.Location);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/MarkupElementGroupingTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/MarkupElementGroupingTest.cs
new file mode 100644
index 0000000000..f1167e3eb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/MarkupElementGroupingTest.cs
@@ -0,0 +1,154 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class MarkupElementGroupingTest : ParserTestBase
+    {
+        [Fact]
+        public void Handles_ValidTags()
+        {
+            // Arrange
+            var content = @"
+<div>Foo</div>
+<p>Bar</p>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_ValidNestedTags()
+        {
+            // Arrange
+            var content = @"
+<div>
+    Foo
+    <p>Bar</p>
+    Baz
+</div>";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_ValidNestedTagsMixedWithCode()
+        {
+            // Arrange
+            var content = @"
+<div>
+    Foo
+    <p>@Bar</p>
+    @{ var x = Bar; }
+</div>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_EndTagsWithMissingStartTags()
+        {
+            // Arrange
+            var content = @"
+Foo</div>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_StartTagsWithMissingEndTags()
+        {
+            // Arrange
+            var content = @"
+<div>
+    Foo
+    <p>
+        Bar
+        </strong>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_SelfClosingTags()
+        {
+            // Arrange
+            var content = @"
+<br/>Foo<custom />
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_MalformedTags_RecoversSuccessfully()
+        {
+            // Arrange
+            var content = @"
+<div>content</span>footer</div>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_MisplacedEndTags_RecoversSuccessfully()
+        {
+            // Arrange
+            var content = @"
+<div>content<span>footer</div></span>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_DoesNotSpecialCase_VoidTags()
+        {
+            // Arrange
+            var content = @"
+<input>Foo</input>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_SpecialCasesVoidTags_WithNoEndTags()
+        {
+            // Arrange
+            var content = @"
+<head><meta><!meta></head>
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+
+        [Fact]
+        public void Handles_IncompleteTags()
+        {
+            // Arrange
+            var content = @"
+<<div>>Foo</</div><   >
+";
+
+            // Act & Assert
+            ParseDocumentTest(content);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs
new file mode 100644
index 0000000000..291331f915
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs
@@ -0,0 +1,910 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class RazorDirectivesTest : ParserTestBase
+    {
+        [Fact]
+        public void DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                builder =>
+                {
+                    builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                    builder.AddTypeToken();
+                });
+
+            // Act & Assert
+            ParseDocumentTest(
+@"@custom System.Text.Encoding.ASCIIEncoding
+@custom System.Text.Encoding.UTF8Encoding",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                builder =>
+                {
+                    builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                    builder.AddTypeToken();
+                });
+
+            // Act & Assert
+            ParseDocumentTest(
+@"@custom System.Text.Encoding.ASCIIEncoding
+@custom System.Text.Encoding.UTF8Encoding",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives()
+        {
+            // Arrange
+            var customDescriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                builder =>
+                {
+                    builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                    builder.AddTypeToken();
+                });
+            var somethingDescriptor = DirectiveDescriptor.CreateDirective(
+                "something",
+                DirectiveKind.SingleLine,
+                builder =>
+                {
+                    builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                    builder.AddMemberToken();
+                });
+
+            // Act & Assert
+            ParseDocumentTest(
+@"@custom System.Text.Encoding.ASCIIEncoding
+@something Else",
+                new[] { customDescriptor, somethingDescriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives()
+        {
+            // Arrange
+            var customDescriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                builder =>
+                {
+                    builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                    builder.AddTypeToken();
+                });
+            var somethingDescriptor = DirectiveDescriptor.CreateDirective(
+                "something",
+                DirectiveKind.SingleLine,
+                builder =>
+                {
+                    builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                    builder.AddMemberToken();
+                });
+
+            // Act & Assert
+            ParseDocumentTest(
+@"@* There are two directives beneath this *@
+@custom System.Text.Encoding.ASCIIEncoding
+
+@something Else
+
+<p>This is extra</p>",
+                new[] { customDescriptor, somethingDescriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_TokensMustBeSeparatedBySpace()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken().AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"string1\"\"string2\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddNamespaceToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom System.",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddNamespaceToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom System<",
+                new[] { descriptor });
+        }
+        [Fact]
+        public void DirectiveDescriptor_CanHandleIncompleteNamespaceTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddNamespaceToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom System." + Environment.NewLine,
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_CanHandleInvalidNamespaceTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddNamespaceToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom System<" + Environment.NewLine,
+                new[] { descriptor });
+        }
+        
+        [Fact]
+        public void ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddTypeToken());
+
+            // Act & Assert
+            ParseDocumentTest(Environment.NewLine + "  @custom System.Text.Encoding.ASCIIEncoding",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace()
+        {
+            // Act & Assert
+            ParseDocumentTest(Environment.NewLine + "  @addTagHelper \"*, Foo\"");
+        }
+
+        [Fact]
+        public void BuiltInDirectiveErrorsIfNotAtStartOfLine()
+        {
+            // Act & Assert
+            ParseDocumentTest("{  @addTagHelper \"*, Foo\"" + Environment.NewLine + "}");
+        }
+
+        [Fact]
+        public void ExtensibleDirectiveErrorsIfNotAtStartOfLine()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddTypeToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "{  @custom System.Text.Encoding.ASCIIEncoding" + Environment.NewLine + "}",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsTypeTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddTypeToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom System.Text.Encoding.ASCIIEncoding",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsMemberTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddMemberToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom Some_Member",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void Parser_ParsesNamespaceDirectiveToken_WithSingleSegment()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddNamespaceToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom BaseNamespace",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddNamespaceToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom BaseNamespace.Foo.Bar",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsStringTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"AString\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom AString",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_StringToken_ParserErrorForNonStringValue()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom {foo?}",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom 'AString'",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom AString\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsMultipleTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddTypeToken().AddMemberToken().AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom System.Text.Encoding.ASCIIEncoding Some_Member \"AString\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsRazorBlocks()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.RazorBlock,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"Header\" { <p>F{o}o</p> }",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsCodeBlocks()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.CodeBlock,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"Name\" { foo(); bar(); }",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_AllowsWhiteSpaceAroundTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddTypeToken().AddMemberToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom    System.Text.Encoding.ASCIIEncoding       Some_Member    ",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_ErrorsForInvalidMemberTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddMemberToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom -Some_Member",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_NoErrorsSemicolonAfterDirective()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"hello\" ;  ",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_AllowsNullableTypes()
+        {
+            // Arrange
+            var variants = new[]
+            {
+                "string?",
+                "string?[]",
+                "global::System.Int32?",
+                "KeyValuePair<string, string>?",
+                "KeyValuePair<string, string>?[]",
+                "global::System.Collections.Generic.KeyValuePair<string, string>?[]",
+            };
+
+            var directiveName = "custom";
+            var source = $"@{directiveName}";
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                directiveName,
+                DirectiveKind.SingleLine,
+                b =>
+                {
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                });
+
+            for (var i = 0; i < variants.Length; i++)
+            {
+                source += $" {variants[i]}";
+            }
+
+            // Act & Assert
+            ParseDocumentTest(source, new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_AllowsTupleTypes()
+        {
+            // Arrange
+            var variants = new[]
+            {
+                "(bool, int)",
+                "(int aa, string bb)?",
+                "(  int?   q   ,  bool   w   )",
+                "( int  ?  q, bool ?w ,(long ?  [])) ?",
+                "(List<(int, string)?> aa, string bb)",
+                "(string ss, (int u, List<(string, int)> k, (Char c, bool b, List<int> l)), global::System.Int32[] a)",
+            };
+
+            var directiveName = "custom";
+            var source = $"@{directiveName}";
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                directiveName,
+                DirectiveKind.SingleLine,
+                b =>
+                {
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                    b.AddTypeToken();
+                });
+
+            for (var i = 0; i < variants.Length; i++)
+            {
+                source += $" {variants[i]}";
+            }
+
+            // Act & Assert
+            ParseDocumentTest(source, new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddTypeToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                $"@custom (bool, int?)   ",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_ErrorsExtraContentAfterDirective()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"hello\" \"world\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.CodeBlock,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"Hello\" World { foo(); bar(); }",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.CodeBlock,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"Hello\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_ErrorsWhenMissingEndBrace()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.CodeBlock,
+                b => b.AddStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"Hello\" {",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_NoValueSucceeds()
+        {
+            ParseDocumentTest("@tagHelperPrefix \"\"");
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_Succeeds()
+        {
+            ParseDocumentTest("@tagHelperPrefix Foo");
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_WithQuotes_Succeeds()
+        {
+            ParseDocumentTest("@tagHelperPrefix \"Foo\"");
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_RequiresValue()
+        {
+            ParseDocumentTest("@tagHelperPrefix ");
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue()
+        {
+            ParseDocumentTest("@tagHelperPrefix \"Foo");
+        }
+
+        [Fact]
+        public void TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue()
+        {
+            ParseDocumentTest("@tagHelperPrefix Foo   \"");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_NoValue_Invalid()
+        {
+            ParseDocumentTest("@removeTagHelper \"\"");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_InvalidLookupText_AddsError()
+        {
+            ParseDocumentTest("@removeTagHelper Foo");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_SingleQuotes_AddsError()
+        {
+            ParseDocumentTest("@removeTagHelper '*, Foo'");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError()
+        {
+            ParseDocumentTest("@removeTagHelper \"Foo\"");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_SupportsSpaces()
+        {
+            ParseDocumentTest("@removeTagHelper     Foo,   Bar    ");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_RequiresValue()
+        {
+            ParseDocumentTest("@removeTagHelper ");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue()
+        {
+            // Arrange
+            ParseDocumentTest("@removeTagHelper \"Foo");
+        }
+
+        [Fact]
+        public void RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue()
+        {
+            ParseDocumentTest("@removeTagHelper Foo\"");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_NoValue_Invalid()
+        {
+            ParseDocumentTest("@addTagHelper \"\"");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_InvalidLookupText_AddsError()
+        {
+            ParseDocumentTest("@addTagHelper Foo");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError()
+        {
+            ParseDocumentTest("@addTagHelper \"Foo\"");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_SingleQuotes_AddsError()
+        {
+            ParseDocumentTest("@addTagHelper '*, Foo'");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_SupportsSpaces()
+        {
+            ParseDocumentTest("@addTagHelper     Foo,   Bar    ");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_RequiresValue()
+        {
+            ParseDocumentTest("@addTagHelper ");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue()
+        {
+            ParseDocumentTest("@addTagHelper \"Foo");
+        }
+
+        [Fact]
+        public void AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue()
+        {
+            ParseDocumentTest("@addTagHelper Foo\"");
+        }
+
+        [Fact]
+        public void InheritsDirectiveSupportsArrays()
+        {
+            ParseDocumentTest(
+                "@inherits string[[]][]",
+                new[] { InheritsDirective.Directive, });
+        }
+
+        [Fact]
+        public void InheritsDirectiveSupportsNestedGenerics()
+        {
+            ParseDocumentTest(
+                "@inherits System.Web.Mvc.WebViewPage<IEnumerable<MvcApplication2.Models.RegisterModel>>",
+                new[] { InheritsDirective.Directive, });
+        }
+
+        [Fact]
+        public void InheritsDirectiveSupportsTypeKeywords()
+        {
+            ParseDocumentTest(
+                "@inherits string",
+                new[] { InheritsDirective.Directive, });
+        }
+
+        [Fact]
+        public void Parse_FunctionsDirective()
+        {
+            ParseDocumentTest(
+                "@functions { foo(); bar(); }",
+                new[] { FunctionsDirective.Directive, });
+        }
+
+        [Fact]
+        public void EmptyFunctionsDirective()
+        {
+            ParseDocumentTest(
+                "@functions { }",
+                new[] { FunctionsDirective.Directive, });
+        }
+
+        [Fact]
+        public void Parse_SectionDirective()
+        {
+            ParseDocumentTest(
+                "@section Header { <p>F{o}o</p> }",
+                new[] { SectionDirective.Directive, });
+        }
+
+        [Fact]
+        public void OptionalDirectiveTokens_AreSkipped()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddOptionalStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom ",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void OptionalDirectiveTokens_WithSimpleTokens_AreParsed()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddOptionalStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"simple-value\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void OptionalDirectiveTokens_WithBraces_AreParsed()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddOptionalStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"{formaction}?/{id}?\"",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddOptionalStringToken().AddOptionalTypeToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@custom \"{formaction}?/{id}?\" System.String",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void OptionalMemberTokens_WithMissingMember_IsParsed()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "TestDirective",
+                DirectiveKind.SingleLine,
+                b => b.AddOptionalMemberToken().AddOptionalStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@TestDirective ",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void OptionalMemberTokens_WithMemberSpecified_IsParsed()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "TestDirective",
+                DirectiveKind.SingleLine,
+                b => b.AddOptionalMemberToken().AddOptionalStringToken());
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@TestDirective PropertyName",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void Directives_CanUseReservedWord_Class()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "class",
+                DirectiveKind.SingleLine);
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@class",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void Directives_CanUseReservedWord_Namespace()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "namespace",
+                DirectiveKind.SingleLine);
+
+            // Act & Assert
+            ParseDocumentTest(
+                "@namespace",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void Directives_ReservedWordInsideCodeBlock()
+        {
+            ParseDocumentTest("@{ class }");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorParserTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorParserTest.cs
new file mode 100644
index 0000000000..7d848c2975
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorParserTest.cs
@@ -0,0 +1,52 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class RazorParserTest
+    {
+        [Fact]
+        public void CanParseStuff()
+        {
+            var parser = new RazorParser();
+            var sourceDocument = TestRazorSourceDocument.CreateResource("TestFiles/Source/BasicMarkup.cshtml", GetType());
+            var output = parser.Parse(sourceDocument);
+
+            Assert.NotNull(output);
+        }
+
+        [Fact]
+        public void ParseMethodCallsParseDocumentOnMarkupParserAndReturnsResults()
+        {
+            // Arrange
+            var parser = new RazorParser();
+            var expected =
+@"RazorDocument - [0..12)::12 - [foo @bar baz]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..8)::4
+            CSharpImplicitExpression - [4..8)::4
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..8)::3
+                    CSharpCodeBlock - [5..8)::3
+                        CSharpExpressionLiteral - [5..8)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..12)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
+";
+
+            // Act
+            var syntaxTree = parser.Parse(TestRazorSourceDocument.Create("foo @bar baz"));
+
+            // Assert
+            var actual = SyntaxNodeSerializer.Serialize(syntaxTree.Root);
+            Assert.Equal(expected, actual);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/SourceLocationTrackerTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/SourceLocationTrackerTest.cs
new file mode 100644
index 0000000000..9671ecedda
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/SourceLocationTrackerTest.cs
@@ -0,0 +1,214 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class SourceLocationTrackerTest
+    {
+        private static readonly SourceLocation TestStartLocation = new SourceLocation(10, 42, 45);
+
+        [Fact]
+        public void ConstructorSetsCurrentLocationToZero()
+        {
+            Assert.Equal(SourceLocation.Zero, new SourceLocationTracker().CurrentLocation);
+        }
+
+        [Fact]
+        public void ConstructorWithSourceLocationSetsCurrentLocationToSpecifiedValue()
+        {
+            var loc = new SourceLocation(10, 42, 4);
+            Assert.Equal(loc, new SourceLocationTracker(loc).CurrentLocation);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("path-to-file")]
+        public void Advance_PreservesSourceLocationFilePath(string path)
+        {
+            // Arrange
+            var sourceLocation = new SourceLocation(path, 15, 2, 8);
+
+            // Act
+            var result = SourceLocationTracker.Advance(sourceLocation, "Hello world");
+
+            // Assert
+            Assert.Equal(path, result.FilePath);
+            Assert.Equal(26, result.AbsoluteIndex);
+            Assert.Equal(2, result.LineIndex);
+            Assert.Equal(19, result.CharacterIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesCorrectlyForMultiLineString()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation("foo\nbar\rbaz\r\nbox");
+
+            // Assert
+            Assert.Equal(26, tracker.CurrentLocation.AbsoluteIndex);
+            Assert.Equal(45, tracker.CurrentLocation.LineIndex);
+            Assert.Equal(3, tracker.CurrentLocation.CharacterIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesAbsoluteIndexOnNonNewlineCharacter()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('f', 'o');
+
+            // Assert
+            Assert.Equal(11, tracker.CurrentLocation.AbsoluteIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesCharacterIndexOnNonNewlineCharacter()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('f', 'o');
+
+            // Assert
+            Assert.Equal(46, tracker.CurrentLocation.CharacterIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationDoesNotAdvanceLineIndexOnNonNewlineCharacter()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('f', 'o');
+
+            // Assert
+            Assert.Equal(42, tracker.CurrentLocation.LineIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesLineIndexOnSlashN()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\n', 'o');
+
+            // Assert
+            Assert.Equal(43, tracker.CurrentLocation.LineIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesAbsoluteIndexOnSlashN()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\n', 'o');
+
+            // Assert
+            Assert.Equal(11, tracker.CurrentLocation.AbsoluteIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationResetsCharacterIndexOnSlashN()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\n', 'o');
+
+            // Assert
+            Assert.Equal(0, tracker.CurrentLocation.CharacterIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesLineIndexOnSlashRFollowedByNonNewlineCharacter()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\r', 'o');
+
+            // Assert
+            Assert.Equal(43, tracker.CurrentLocation.LineIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesAbsoluteIndexOnSlashRFollowedByNonNewlineCharacter()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\r', 'o');
+
+            // Assert
+            Assert.Equal(11, tracker.CurrentLocation.AbsoluteIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationResetsCharacterIndexOnSlashRFollowedByNonNewlineCharacter()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\r', 'o');
+
+            // Assert
+            Assert.Equal(0, tracker.CurrentLocation.CharacterIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationDoesNotAdvanceLineIndexOnSlashRFollowedBySlashN()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\r', '\n');
+
+            // Assert
+            Assert.Equal(42, tracker.CurrentLocation.LineIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesAbsoluteIndexOnSlashRFollowedBySlashN()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\r', '\n');
+
+            // Assert
+            Assert.Equal(11, tracker.CurrentLocation.AbsoluteIndex);
+        }
+
+        [Fact]
+        public void UpdateLocationAdvancesCharacterIndexOnSlashRFollowedBySlashN()
+        {
+            // Arrange
+            var tracker = new SourceLocationTracker(TestStartLocation);
+
+            // Act
+            tracker.UpdateLocation('\r', '\n');
+
+            // Assert
+            Assert.Equal(46, tracker.CurrentLocation.CharacterIndex);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
new file mode 100644
index 0000000000..c2a2e7356c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
@@ -0,0 +1,2187 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class TagHelperBlockRewriterTest : TagHelperRewritingTestBase
+    {
+        public static TagHelperDescriptor[] SymbolBoundAttributes_Descriptors = new[]
+        {
+            TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("*")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bound")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("[item]")
+                    .PropertyName("ListItems")
+                    .TypeName(typeof(List<string>).Namespace + "List<System.String>"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("[(item)]")
+                    .PropertyName("ArrayItems")
+                    .TypeName(typeof(string[]).Namespace + "System.String[]"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("(click)")
+                    .PropertyName("Event1")
+                    .TypeName(typeof(Action).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("(^click)")
+                    .PropertyName("Event2")
+                    .TypeName(typeof(Action).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("*something")
+                    .PropertyName("StringProperty1")
+                    .TypeName(typeof(string).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("#local")
+                    .PropertyName("StringProperty2")
+                    .TypeName(typeof(string).FullName))
+                .Build()
+        };
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes1()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<ul bound [item]='items'></ul>");
+        }
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes2()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<ul bound [(item)]='items'></ul>");
+        }
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes3()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<button bound (click)='doSomething()'>Click Me</button>");
+        }
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes4()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<button bound (^click)='doSomething()'>Click Me</button>");
+        }
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes5()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<template bound *something='value'></template>");
+        }
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes6()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<div bound #localminimized></div>");
+        }
+
+        [Fact]
+        public void CanHandleSymbolBoundAttributes7()
+        {
+            EvaluateData(SymbolBoundAttributes_Descriptors, "<div bound #local='value'></div>");
+        }
+
+        public static TagHelperDescriptor[] WithoutEndTag_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("input")
+                    .RequireTagStructure(TagStructure.WithoutEndTag))
+                .Build()
+        };
+
+        [Fact]
+        public void CanHandleWithoutEndTagTagStructure1()
+        {
+            EvaluateData(WithoutEndTag_Descriptors, "<input>");
+        }
+
+        [Fact]
+        public void CanHandleWithoutEndTagTagStructure2()
+        {
+            EvaluateData(WithoutEndTag_Descriptors, "<input type='text'>");
+        }
+
+        [Fact]
+        public void CanHandleWithoutEndTagTagStructure3()
+        {
+            EvaluateData(WithoutEndTag_Descriptors, "<input><input>");
+        }
+
+        [Fact]
+        public void CanHandleWithoutEndTagTagStructure4()
+        {
+            EvaluateData(WithoutEndTag_Descriptors, "<input type='text'><input>");
+        }
+
+        [Fact]
+        public void CanHandleWithoutEndTagTagStructure5()
+        {
+            EvaluateData(WithoutEndTag_Descriptors, "<div><input><input></div>");
+        }
+
+        public static TagHelperDescriptor[] GetTagStructureCompatibilityDescriptors(TagStructure structure1, TagStructure structure2)
+        {
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireTagStructure(structure1))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireTagStructure(structure2))
+                    .Build()
+            };
+
+            return descriptors;
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures1()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.Unspecified);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input></input>");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures2()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.Unspecified);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input />");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures3()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.WithoutEndTag);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input type='text'>");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures4()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.WithoutEndTag, TagStructure.WithoutEndTag);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input><input>");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures5()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.NormalOrSelfClosing);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input type='text'></input>");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures6()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.WithoutEndTag);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input />");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures7()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.NormalOrSelfClosing, TagStructure.Unspecified);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input />");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures8()
+        {
+            // Arrange
+            var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.WithoutEndTag, TagStructure.Unspecified);
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input></input>");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes1()
+        {
+            RunParseTreeRewriterTest("<p class='", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes2()
+        {
+            RunParseTreeRewriterTest("<p bar=\"false\"\" <strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes3()
+        {
+            RunParseTreeRewriterTest("<p bar='false  <strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes4()
+        {
+            RunParseTreeRewriterTest("<p bar='false  <strong'", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes5()
+        {
+            RunParseTreeRewriterTest("<p bar=false'", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes6()
+        {
+            RunParseTreeRewriterTest("<p bar=\"false'", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes7()
+        {
+            RunParseTreeRewriterTest("<p bar=\"false' ></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes8()
+        {
+            RunParseTreeRewriterTest("<p foo bar<strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes9()
+        {
+            RunParseTreeRewriterTest("<p class=btn\" bar<strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes10()
+        {
+            RunParseTreeRewriterTest("<p class=btn\" bar=\"foo\"<strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes11()
+        {
+            RunParseTreeRewriterTest("<p class=\"btn bar=\"foo\"<strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes12()
+        {
+            RunParseTreeRewriterTest("<p class=\"btn bar=\"foo\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes13()
+        {
+            RunParseTreeRewriterTest("<p @DateTime.Now class=\"btn\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes14()
+        {
+            RunParseTreeRewriterTest("<p @DateTime.Now=\"btn\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes15()
+        {
+            RunParseTreeRewriterTest("<p class=@DateTime.Now\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes16()
+        {
+            RunParseTreeRewriterTest("<p class=\"@do {", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes17()
+        {
+            RunParseTreeRewriterTest("<p class=\"@do {\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes18()
+        {
+            RunParseTreeRewriterTest("<p @do { someattribute=\"btn\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes19()
+        {
+            RunParseTreeRewriterTest("<p class=some=thing attr=\"@value\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelpersWithAttributes20()
+        {
+            RunParseTreeRewriterTest("<p attr=\"@if (true) <p attr='@foo'> }\"></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper1()
+        {
+            RunParseTreeRewriterTest("<p", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper2()
+        {
+            RunParseTreeRewriterTest("<p></p", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper3()
+        {
+            RunParseTreeRewriterTest("<p><strong", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper4()
+        {
+            RunParseTreeRewriterTest("<strong <p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper5()
+        {
+            RunParseTreeRewriterTest("<strong </strong", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper6()
+        {
+            RunParseTreeRewriterTest("<<</strong> <<p>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper7()
+        {
+            RunParseTreeRewriterTest("<<<strong>> <<>>", "strong", "p");
+        }
+
+        [Fact]
+        public void CreatesErrorForMalformedTagHelper8()
+        {
+            RunParseTreeRewriterTest("<str<strong></p></strong>", "strong", "p");
+        }
+
+        public static TagHelperDescriptor[] CodeTagHelperAttributes_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("PersonTagHelper", "personAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("person"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("age")
+                    .PropertyName("Age")
+                    .TypeName(typeof(int).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("birthday")
+                    .PropertyName("BirthDay")
+                    .TypeName(typeof(DateTime).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("name")
+                    .PropertyName("Name")
+                    .TypeName(typeof(string).FullName))
+                .Build()
+        };
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes1()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes2()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person birthday=\"DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes3()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"@DateTime.Now.Year\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes4()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\" @DateTime.Now.Year\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes5()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person name=\"John\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes6()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person name=\"Time: @DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes7()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"1 + @value + 2\" birthday='(bool)@Bag[\"val\"] ? @@DateTime : @DateTime.Now'/>");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes8()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" birthday=\"DateTime.Now\" name=\"Time: @DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes9()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" birthday=\"DateTime.Now\" name=\"Time: @@ @DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes10()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" birthday=\"DateTime.Now\" name=\"@@BoundStringAttribute\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes11()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"@@@(11+1)\" birthday=\"DateTime.Now\" name=\"Time: @DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes12()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"@{flag == 0 ? 11 : 12}\" />");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1()
+        {
+            RunParseTreeRewriterTest("<p class=foo dynamic=@DateTime.Now style=color:red;><strong></p></strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2()
+        {
+            RunParseTreeRewriterTest("<div><p>Hello <strong>World</strong></div>", "strong", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3()
+        {
+            RunParseTreeRewriterTest("<div><p>Hello <strong>World</div>", "strong", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4()
+        {
+            RunParseTreeRewriterTest("<p class=\"foo\">Hello <p style=\"color:red;\">World</p>", "strong", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1()
+        {
+            RunParseTreeRewriterTest("<p      class=\"     foo\"    style=\"   color :  red  ;   \"    ></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2()
+        {
+            RunParseTreeRewriterTest("<p      class=\"     foo\"    style=\"   color :  red  ;   \"    >Hello World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3()
+        {
+            RunParseTreeRewriterTest("<p     class=\"   foo  \" >Hello</p> <p    style=\"  color:red; \" >World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p class=\"{0}\" style='{0}'></p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p class=\"{0}\" style='{0}'></p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p class=\"{0}\" style='{0}'>Hello World</p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p class=\"{0}\" style='{0}'>Hello World</p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p class=\"{0}\">Hello</p> <p style='{0}'>World</p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p class=\"{0}\">Hello</p> <p style='{0}'>World</p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p class=\"{0}\" style='{0}'>Hello World <strong class=\"{0}\">inside of strong tag</strong></p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p>{0}</p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p>{0}</p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p>Hello World {0}</p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p>Hello World {0}</p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p>{0}</p> <p>{0}</p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p>{0}</p> <p>{0}</p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var currentFormattedString = "<p>Hello {0}<strong>inside of {0} strong tag</strong></p>";
+            var document = string.Format(currentFormattedString, dateTimeNowString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8()
+        {
+            // Arrange
+            var doWhileString = "@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);";
+            var currentFormattedString = "<p>Hello {0}<strong>inside of {0} strong tag</strong></p>";
+            var document = string.Format(currentFormattedString, doWhileString);
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml1()
+        {
+            RunParseTreeRewriterTest("<<<p>>></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml2()
+        {
+            RunParseTreeRewriterTest("<<p />", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml3()
+        {
+            RunParseTreeRewriterTest("< p />", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml4()
+        {
+            RunParseTreeRewriterTest("<input <p />", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml5()
+        {
+            RunParseTreeRewriterTest("< class=\"foo\" <p />", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml6()
+        {
+            RunParseTreeRewriterTest("</<<p>/></p>>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml7()
+        {
+            RunParseTreeRewriterTest("</<<p>/><strong></p>>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml8()
+        {
+            RunParseTreeRewriterTest("</<<p>@DateTime.Now/><strong></p>>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml9()
+        {
+            RunParseTreeRewriterTest("</  /<  ><p>@DateTime.Now / ><strong></p></        >", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_AllowsInvalidHtml10()
+        {
+            RunParseTreeRewriterTest("<p>< @DateTime.Now ></ @DateTime.Now ></p>", "p");
+        }
+
+        [Fact]
+        public void UnderstandsEmptyAttributeTagHelpers1()
+        {
+            RunParseTreeRewriterTest("<p class=\"\"></p>", "p");
+        }
+
+        [Fact]
+        public void UnderstandsEmptyAttributeTagHelpers2()
+        {
+            RunParseTreeRewriterTest("<p class=''></p>", "p");
+        }
+
+        [Fact]
+        public void UnderstandsEmptyAttributeTagHelpers3()
+        {
+            RunParseTreeRewriterTest("<p class=></p>", "p");
+        }
+
+        [Fact]
+        public void UnderstandsEmptyAttributeTagHelpers4()
+        {
+            RunParseTreeRewriterTest("<p class1='' class2= class3=\"\" />", "p");
+        }
+
+        [Fact]
+        public void UnderstandsEmptyAttributeTagHelpers5()
+        {
+            RunParseTreeRewriterTest("<p class1=''class2=\"\"class3= />", "p");
+        }
+
+        public static TagHelperDescriptor[] EmptyTagHelperBoundAttribute_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("myth"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound")
+                    .PropertyName("Bound")
+                    .TypeName(typeof(bool).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("name")
+                    .PropertyName("Name")
+                    .TypeName(typeof(string).FullName))
+                .Build()
+        };
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes1()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes2()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    true' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes3()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    ' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes4()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound=''  bound=\"\" />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes5()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound=' '  bound=\"  \" />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes6()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='true' bound=  />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes7()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound= name='' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes8()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound= name='  ' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes9()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='true' name='john' bound= name= />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes10()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth BouND='' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes11()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth BOUND=''    bOUnd=\"\" />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes12()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth BOUND= nAMe='john'></myth>");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes13()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    @true  ' />");
+        }
+
+        [Fact]
+        public void CreatesErrorForEmptyTagHelperBoundAttributes14()
+        {
+            EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    @(true)  ' />");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers1()
+        {
+            RunParseTreeRewriterTest("<script><script></foo></script>", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers2()
+        {
+            RunParseTreeRewriterTest("<script>Hello World <div></div></script>", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers3()
+        {
+            RunParseTreeRewriterTest("<script>Hel<p>lo</p></script> <p><div>World</div></p>", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers4()
+        {
+            RunParseTreeRewriterTest("<script>Hel<strong>lo</strong></script> <script><span>World</span></script>", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers5()
+        {
+            RunParseTreeRewriterTest("<script class=\"foo\" style=\"color:red;\" />", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers6()
+        {
+            RunParseTreeRewriterTest("<p>Hello <script class=\"foo\" style=\"color:red;\"></script> World</p>", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesScriptTagHelpers7()
+        {
+            RunParseTreeRewriterTest("<p>Hello <script class=\"@@foo@bar.com\" style=\"color:red;\"></script> World</p>", "p", "div", "script");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1()
+        {
+            RunParseTreeRewriterTest("<p class=\"foo\" style=\"color:red;\" />", "p");
+        }
+
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2()
+        {
+            RunParseTreeRewriterTest("<p>Hello <p class=\"foo\" style=\"color:red;\" /> World</p>", "p");
+        }
+
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3()
+        {
+            RunParseTreeRewriterTest("Hello<p class=\"foo\" /> <p style=\"color:red;\" />World", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1()
+        {
+            RunParseTreeRewriterTest("<p class=foo dynamic=@DateTime.Now style=color:red;></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2()
+        {
+            RunParseTreeRewriterTest("<p class=foo dynamic=@DateTime.Now style=color:red;>Hello World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3()
+        {
+            RunParseTreeRewriterTest("<p class=foo dynamic=@DateTime.Now style=color@@:red;>Hello World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4()
+        {
+            RunParseTreeRewriterTest("<p class=foo dynamic=@DateTime.Now>Hello</p> <p style=color:red; dynamic=@DateTime.Now>World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5()
+        {
+            RunParseTreeRewriterTest("<p class=foo dynamic=@DateTime.Now style=color:red;>Hello World <strong class=\"foo\">inside of strong tag</strong></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1()
+        {
+            RunParseTreeRewriterTest("<p class=\"foo\" style=\"color:red;\"></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2()
+        {
+            RunParseTreeRewriterTest("<p class=\"foo\" style=\"color:red;\">Hello World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3()
+        {
+            RunParseTreeRewriterTest("<p class=\"foo\">Hello</p> <p style=\"color:red;\">World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4()
+        {
+            RunParseTreeRewriterTest("<p class=\"foo\" style=\"color:red;\">Hello World <strong class=\"foo\">inside of strong tag</strong></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1()
+        {
+            RunParseTreeRewriterTest("<p></p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2()
+        {
+            RunParseTreeRewriterTest("<p>Hello World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3()
+        {
+            RunParseTreeRewriterTest("<p>Hello</p> <p>World</p>", "p");
+        }
+
+        [Fact]
+        public void TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4()
+        {
+            RunParseTreeRewriterTest("<p>Hello World <strong>inside of strong tag</strong></p>", "p");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document1()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='{dateTimeNowString}' />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document2()
+        {
+            // Arrange
+            var document = "<input data-required='value' />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document3()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='prefix {dateTimeNowString}' />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document4()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='{dateTimeNowString} suffix' />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document5()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='prefix {dateTimeNowString} suffix' />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document6()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input pre-attribute data-required='prefix {dateTimeNowString} suffix' post-attribute />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document7()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='{dateTimeNowString} middle {dateTimeNowString}' />";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block1()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='{dateTimeNowString}' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block2()
+        {
+            // Arrange
+            var document = "<input data-required='value' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block3()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='prefix {dateTimeNowString}' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block4()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='{dateTimeNowString} suffix' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block5()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='prefix {dateTimeNowString} suffix' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block6()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input pre-attribute data-required='prefix {dateTimeNowString} suffix' post-attribute />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block7()
+        {
+            // Arrange
+            var dateTimeNowString = "@DateTime.Now";
+            var document = $"<input data-required='{dateTimeNowString} middle {dateTimeNowString}' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        public static TagHelperDescriptor[] MinimizedAttribute_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("input")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("unbound-required")))
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("input")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bound-required-string")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound-required-string")
+                    .PropertyName("BoundRequiredString")
+                    .TypeName(typeof(string).FullName))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("input")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bound-required-int")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound-required-int")
+                    .PropertyName("BoundRequiredInt")
+                    .TypeName(typeof(int).FullName))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("InputTagHelper3", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("input"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("int-dictionary")
+                    .PropertyName("DictionaryOfIntProperty")
+                    .TypeName(typeof(IDictionary<string, int>).Namespace + ".IDictionary<System.String, System.Int32>")
+                    .AsDictionaryAttribute("int-prefix-", typeof(int).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("string-dictionary")
+                    .PropertyName("DictionaryOfStringProperty")
+                    .TypeName(typeof(IDictionary<string, string>).Namespace + ".IDictionary<System.String, System.String>")
+                    .AsDictionaryAttribute("string-prefix-", typeof(string).FullName))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound-string")
+                    .PropertyName("BoundRequiredString")
+                    .TypeName(typeof(string).FullName))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound-int")
+                    .PropertyName("BoundRequiredString")
+                    .TypeName(typeof(int).FullName))
+                .Build(),
+        };
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document1()
+        {
+            // Arrange
+            var document = "<input unbound-required />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document2()
+        {
+            // Arrange
+            var document = "<p bound-string></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document3()
+        {
+            // Arrange
+            var document = "<input bound-required-string />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document4()
+        {
+            // Arrange
+            var document = "<input bound-required-int />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document5()
+        {
+            // Arrange
+            var document = "<p bound-int></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document6()
+        {
+            // Arrange
+            var document = "<input int-dictionary/>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document7()
+        {
+            // Arrange
+            var document = "<input string-dictionary />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document8()
+        {
+            // Arrange
+            var document = "<input int-prefix- />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document9()
+        {
+            // Arrange
+            var document = "<input string-prefix-/>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document10()
+        {
+            // Arrange
+            var document = "<input int-prefix-value/>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document11()
+        {
+            // Arrange
+            var document = "<input string-prefix-value />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document12()
+        {
+            // Arrange
+            var document = "<input int-prefix-value='' />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document13()
+        {
+            // Arrange
+            var document = "<input string-prefix-value=''/>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document14()
+        {
+            // Arrange
+            var document = "<input int-prefix-value='3'/>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document15()
+        {
+            // Arrange
+            var document = "<input string-prefix-value='some string' />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document16()
+        {
+            // Arrange
+            var document = "<input unbound-required bound-required-string />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document17()
+        {
+            // Arrange
+            var document = "<p bound-int bound-string></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document18()
+        {
+            // Arrange
+            var document = "<input bound-required-int unbound-required bound-required-string />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document19()
+        {
+            // Arrange
+            var document = "<p bound-int bound-string bound-string></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document20()
+        {
+            // Arrange
+            var document = "<input unbound-required class='btn' />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document21()
+        {
+            // Arrange
+            var document = "<p bound-string class='btn'></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document22()
+        {
+            // Arrange
+            var document = "<input class='btn' unbound-required />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document23()
+        {
+            // Arrange
+            var document = "<p class='btn' bound-string></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document24()
+        {
+            // Arrange
+            var document = "<input bound-required-string class='btn' />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document25()
+        {
+            // Arrange
+            var document = "<input class='btn' bound-required-string />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document26()
+        {
+            // Arrange
+            var document = "<input bound-required-int class='btn' />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document27()
+        {
+            // Arrange
+            var document = "<p bound-int class='btn'></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document28()
+        {
+            // Arrange
+            var document = "<input class='btn' bound-required-int />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document29()
+        {
+            // Arrange
+            var document = "<p class='btn' bound-int></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document30()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<input class='{expressionString}' bound-required-int />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document31()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<p class='{expressionString}' bound-int></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document32()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<input    bound-required-int class='{expressionString}'   bound-required-string class='{expressionString}'  unbound-required  />";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Document33()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<p    bound-int class='{expressionString}'   bound-string class='{expressionString}'  bound-string></p>";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block1()
+        {
+            // Arrange
+            var document = "<input unbound-required />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block2()
+        {
+            // Arrange
+            var document = "<p bound-string></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block3()
+        {
+            // Arrange
+            var document = "<input bound-required-string />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block4()
+        {
+            // Arrange
+            var document = "<input bound-required-int />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block5()
+        {
+            // Arrange
+            var document = "<p bound-int></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block6()
+        {
+            // Arrange
+            var document = "<input int-dictionary/>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block7()
+        {
+            // Arrange
+            var document = "<input string-dictionary />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block8()
+        {
+            // Arrange
+            var document = "<input int-prefix- />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block9()
+        {
+            // Arrange
+            var document = "<input string-prefix-/>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block10()
+        {
+            // Arrange
+            var document = "<input int-prefix-value/>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block11()
+        {
+            // Arrange
+            var document = "<input string-prefix-value />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block12()
+        {
+            // Arrange
+            var document = "<input int-prefix-value='' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block13()
+        {
+            // Arrange
+            var document = "<input string-prefix-value=''/>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block14()
+        {
+            // Arrange
+            var document = "<input int-prefix-value='3'/>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block15()
+        {
+            // Arrange
+            var document = "<input string-prefix-value='some string' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block16()
+        {
+            // Arrange
+            var document = "<input unbound-required bound-required-string />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block17()
+        {
+            // Arrange
+            var document = "<p bound-int bound-string></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block18()
+        {
+            // Arrange
+            var document = "<input bound-required-int unbound-required bound-required-string />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block19()
+        {
+            // Arrange
+            var document = "<p bound-int bound-string bound-string></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block20()
+        {
+            // Arrange
+            var document = "<input unbound-required class='btn' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block21()
+        {
+            // Arrange
+            var document = "<p bound-string class='btn'></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block22()
+        {
+            // Arrange
+            var document = "<input class='btn' unbound-required />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block23()
+        {
+            // Arrange
+            var document = "<p class='btn' bound-string></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block24()
+        {
+            // Arrange
+            var document = "<input bound-required-string class='btn' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block25()
+        {
+            // Arrange
+            var document = "<input class='btn' bound-required-string />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block26()
+        {
+            // Arrange
+            var document = "<input bound-required-int class='btn' />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block27()
+        {
+            // Arrange
+            var document = "<p bound-int class='btn'></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block28()
+        {
+            // Arrange
+            var document = "<input class='btn' bound-required-int />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block29()
+        {
+            // Arrange
+            var document = "<p class='btn' bound-int></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block30()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<input class='{expressionString}' bound-required-int />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block31()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<p class='{expressionString}' bound-int></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block32()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<input    bound-required-int class='{expressionString}'   bound-required-string class='{expressionString}'  unbound-required  />";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_Block33()
+        {
+            // Arrange
+            var expressionString = "@DateTime.Now + 1";
+            var document = $"<p    bound-int class='{expressionString}'   bound-string class='{expressionString}'  bound-string></p>";
+
+            // Wrap in a CSharp block
+            document = $"@{{{document}}}";
+
+            // Act & Assert
+            EvaluateData(MinimizedAttribute_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags1()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<input unbound-required");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags2()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-string");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags3()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-int");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags4()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-int unbound-required bound-required-string");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags5()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<p bound-string");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags6()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<p bound-int");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags7()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<p bound-int bound-string");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedAttributes_PartialTags8()
+        {
+            EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-int unbound-required bound-required-string<p bound-int bound-string");
+        }
+
+        [Fact]
+        public void UnderstandsMinimizedBooleanBoundAttributes()
+        {
+            // Arrange
+            var document = "<input boundbool boundbooldict-key />";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input"))
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                        .Name("boundbool")
+                        .PropertyName("BoundBoolProp")
+                        .TypeName(typeof(bool).FullName))
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                        .Name("boundbooldict")
+                        .PropertyName("BoundBoolDictProp")
+                        .TypeName("System.Collections.Generic.IDictionary<string, bool>")
+                        .AsDictionary("boundbooldict-", typeof(bool).FullName))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, document);
+        }
+
+        [Fact]
+        public void FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes()
+        {
+            // Arrange
+            var document = "<input boundbool boundbooldict-key />";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input"))
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                        .Name("boundbool")
+                        .PropertyName("BoundBoolProp")
+                        .TypeName(typeof(bool).FullName))
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                        .Name("boundbooldict")
+                        .PropertyName("BoundBoolDictProp")
+                        .TypeName("System.Collections.Generic.IDictionary<string, bool>")
+                        .AsDictionary("boundbooldict-", typeof(bool).FullName))
+                    .Build(),
+            };
+
+            var featureFlags = new TestRazorParserFeatureFlags();
+
+            // Act & Assert
+            EvaluateData(descriptors, document, featureFlags: featureFlags);
+        }
+
+        private class TestRazorParserFeatureFlags : RazorParserFeatureFlags
+        {
+            public TestRazorParserFeatureFlags(
+                bool allowMinimizedBooleanTagHelperAttributes = false,
+                bool allowHtmlCommentsInTagHelper = false,
+                bool allowComponentFileKind = false,
+                bool allowRazorInCodeBlockDirectives = false,
+                bool allowUsingVariableDeclarations = false,
+                bool experimental_AllowConditionalDataDashAttributes = false)
+            {
+                AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
+                AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelper;
+                AllowComponentFileKind = allowComponentFileKind;
+                AllowRazorInAllCodeBlocks = allowRazorInCodeBlockDirectives;
+                AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
+                EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
+            }
+
+            public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
+
+            public override bool AllowHtmlCommentsInTagHelpers { get; }
+
+            public override bool AllowComponentFileKind { get; }
+
+            public override bool AllowRazorInAllCodeBlocks { get; }
+
+            public override bool AllowUsingVariableDeclarations { get; }
+
+            public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
new file mode 100644
index 0000000000..e68eed561a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -0,0 +1,1884 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class TagHelperParseTreeRewriterTest : TagHelperRewritingTestBase
+    {
+        public static TheoryData GetAttributeNameValuePairsData
+        {
+            get
+            {
+                Func<string, string, KeyValuePair<string, string>> kvp =
+                    (key, value) => new KeyValuePair<string, string>(key, value);
+                var empty = Enumerable.Empty<KeyValuePair<string, string>>();
+                var csharp = TagHelperParseTreeRewriter.Rewriter.InvalidAttributeValueMarker;
+
+                // documentContent, expectedPairs
+                return new TheoryData<string, IEnumerable<KeyValuePair<string, string>>>
+                {
+                    { "<a>", empty },
+                    { "<a @{ } href='~/home'>", empty },
+                    { "<a href=\"@true\">", new[] { kvp("href", csharp) } },
+                    { "<a href=\"prefix @true suffix\">", new[] { kvp("href", $"prefix{csharp} suffix") } },
+                    { "<a href=~/home>", new[] { kvp("href", "~/home") } },
+                    { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home") } },
+                    {
+                        "<a href=\"@DateTime.Now::0\" class='btn btn-success' random>",
+                        new[] { kvp("href", $"{csharp}::0"), kvp("class", "btn btn-success"), kvp("random", "") }
+                    },
+                    { "<a href=>", new[] { kvp("href", "") } },
+                    { "<a href='\">  ", new[] { kvp("href", "\">  ") } },
+                    { "<a href'", new[] { kvp("href'", "") } },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetAttributeNameValuePairsData))]
+        public void GetAttributeNameValuePairs_ParsesPairsCorrectly(
+            string documentContent,
+            IEnumerable<KeyValuePair<string, string>> expectedPairs)
+        {
+            // Arrange
+            var errorSink = new ErrorSink();
+            var parseResult = ParseDocument(documentContent);
+            var document = parseResult.Root;
+            var parseTreeRewriter = new TagHelperParseTreeRewriter.Rewriter(
+                parseResult.Source,
+                null,
+                Enumerable.Empty<TagHelperDescriptor>(),
+                parseResult.Options.FeatureFlags,
+                errorSink);
+
+            // Assert - Guard
+            var rootBlock = Assert.IsType<RazorDocumentSyntax>(document);
+            var rootMarkup = Assert.IsType<MarkupBlockSyntax>(rootBlock.Document);
+            var childBlock = Assert.Single(rootMarkup.Children);
+            var element = Assert.IsType<MarkupElementSyntax>(childBlock);
+            Assert.Empty(errorSink.Errors);
+
+            // Act
+            var pairs = parseTreeRewriter.GetAttributeNameValuePairs(element.StartTag);
+
+            // Assert
+            Assert.Equal(expectedPairs, pairs);
+        }
+
+        public static TagHelperDescriptor[] PartialRequiredParentTags_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("CatchALlTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                .Build(),
+        };
+
+        [Fact]
+        public void UnderstandsPartialRequiredParentTags1()
+        {
+            var document = "<p><strong>";
+            EvaluateData(PartialRequiredParentTags_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsPartialRequiredParentTags2()
+        {
+            var document = "<p><strong></strong>";
+            EvaluateData(PartialRequiredParentTags_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsPartialRequiredParentTags3()
+        {
+            var document = "<p><strong></p><strong>";
+            EvaluateData(PartialRequiredParentTags_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsPartialRequiredParentTags4()
+        {
+            var document = "<<p><<strong></</strong</strong></p>";
+            EvaluateData(PartialRequiredParentTags_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsPartialRequiredParentTags5()
+        {
+            var document = "<<p><<strong></</strong></strong></p>";
+            EvaluateData(PartialRequiredParentTags_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsPartialRequiredParentTags6()
+        {
+            var document = "<<p><<custom></<</custom></custom></p>";
+            EvaluateData(PartialRequiredParentTags_Descriptors, document);
+        }
+
+        public static TagHelperDescriptor[] NestedVoidSelfClosingRequiredParent_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("input")
+                    .RequireTagStructure(TagStructure.WithoutEndTag))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("strong")
+                    .RequireParentTag("p"))
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("strong")
+                    .RequireParentTag("input"))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                .Build(),
+        };
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent1()
+        {
+            var document = "<input><strong></strong>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent2()
+        {
+            var document = "<p><input><strong></strong></p>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent3()
+        {
+            var document = "<p><br><strong></strong></p>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent4()
+        {
+            var document = "<p><p><br></p><strong></strong></p>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent5()
+        {
+            var document = "<input><strong></strong>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent6()
+        {
+            var document = "<p><input /><strong /></p>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent7()
+        {
+            var document = "<p><br /><strong /></p>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedVoidSelfClosingRequiredParent8()
+        {
+            var document = "<p><p><br /></p><strong /></p>";
+            EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
+        }
+
+        public static TagHelperDescriptor[] NestedRequiredParent_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("strong")
+                    .RequireParentTag("p"))
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("strong")
+                    .RequireParentTag("div"))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                .Build(),
+        };
+
+        [Fact]
+        public void UnderstandsNestedRequiredParent1()
+        {
+            var document = "<strong></strong>";
+            EvaluateData(NestedRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedRequiredParent2()
+        {
+            var document = "<p><strong></strong></p>";
+            EvaluateData(NestedRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedRequiredParent3()
+        {
+            var document = "<div><strong></strong></div>";
+            EvaluateData(NestedRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedRequiredParent4()
+        {
+            var document = "<strong><strong></strong></strong>";
+            EvaluateData(NestedRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNestedRequiredParent5()
+        {
+            var document = "<p><strong><strong></strong></strong></p>";
+            EvaluateData(NestedRequiredParent_Descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsTagHelperPrefixAndAllowedChildren()
+        {
+            // Arrange
+            var documentContent = "<th:p><th:strong></th:strong></th:p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("strong")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(
+                descriptors,
+                documentContent,
+                tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent()
+        {
+            // Arrange
+            var documentContent = "<th:p><th:strong></th:strong></th:p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("strong")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong").RequireParentTag("p"))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(
+                descriptors,
+                documentContent,
+                tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent()
+        {
+            // Rewrite_InvalidStructure_UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent
+            // Arrange
+            var documentContent = "<th:p></th:strong></th:p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("strong")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong").RequireParentTag("p"))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(
+                descriptors,
+                documentContent,
+                tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren()
+        {
+            // Arrange
+            var documentContent = "<th:p><strong></strong></th:p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("strong")
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(
+                descriptors,
+                documentContent,
+                tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1()
+        {
+            var document = "<script type><input /></script>";
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2()
+        {
+            var document = "<script types='text/html'><input /></script>";
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3()
+        {
+            var document = "<script type='text/html invalid'><input /></script>";
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4()
+        {
+            var document = "<script type='text/ng-*' type='text/html'><input /></script>";
+            RunParseTreeRewriterTest(document, "input");
+        }
+
+        [Fact]
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags1()
+        {
+            var document = "<script type='text/html'><input /></script>";
+            RunParseTreeRewriterTest(document, "p", "input");
+        }
+
+        [Fact]
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags2()
+        {
+            var document = "<script id='scriptTag' type='text/html' class='something'><input /></script>";
+            RunParseTreeRewriterTest(document, "p", "input");
+        }
+
+        [Fact]
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags3()
+        {
+            var document = "<script type='text/html'><p><script type='text/html'><input /></script></p></script>";
+            RunParseTreeRewriterTest(document, "p", "input");
+        }
+
+        [Fact]
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags4()
+        {
+            var document = "<script type='text/html'><p><script type='text/ html'><input /></script></p></script>";
+            RunParseTreeRewriterTest(document, "p", "input");
+        }
+
+        [Fact]
+        public void CanHandleInvalidChildrenWithWhitespace()
+        {
+            // Arrange
+            var documentContent = $"<p>{Environment.NewLine}    <strong>{Environment.NewLine}        Hello" +
+                $"{Environment.NewLine}    </strong>{Environment.NewLine}</p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("br")
+                    .Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void RecoversWhenRequiredAttributeMismatchAndRestrictedChildren()
+        {
+            // Arrange
+            var documentContent = "<strong required><strong></strong></strong>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("strong")
+                        .RequireAttributeDescriptor(attribute => attribute.Name("required")))
+                    .AllowChildTag("br")
+                    .Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void CanHandleMultipleTagHelpersWithAllowedChildren_OneNull()
+        {
+            // Arrange
+            var documentContent = "<p><strong>Hello World</strong><br></p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("strong")
+                    .AllowChildTag("br")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("br")
+                        .RequireTagStructure(TagStructure.WithoutEndTag))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void CanHandleMultipleTagHelpersWithAllowedChildren()
+        {
+            // Arrange
+            var documentContent = "<p><strong>Hello World</strong><br></p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("strong")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("br")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("br")
+                        .RequireTagStructure(TagStructure.WithoutEndTag))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren1()
+        {
+            // Arrange
+            var documentContent = "<p><br /></p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "br" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren2()
+        {
+            // Arrange
+            var documentContent = $"<p>{Environment.NewLine}<br />{Environment.NewLine}</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "br" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren3()
+        {
+            // Arrange
+            var documentContent = "<p><br></p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren4()
+        {
+            // Arrange
+            var documentContent = "<p>Hello</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren5()
+        {
+            // Arrange
+            var documentContent = "<p><hr /></p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "br", "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren6()
+        {
+            // Arrange
+            var documentContent = "<p><br>Hello</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren7()
+        {
+            // Arrange
+            var documentContent = "<p><strong>Title:</strong><br />Something</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren8()
+        {
+            // Arrange
+            var documentContent = "<p><strong>Title:</strong><br />Something</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong", "br" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren9()
+        {
+            // Arrange
+            var documentContent = "<p>  <strong>Title:</strong>  <br />  Something</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong", "br" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren10()
+        {
+            // Arrange
+            var documentContent = "<p><strong>Title:<br><em>A Very Cool</em></strong><br />Something</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren11()
+        {
+            // Arrange
+            var documentContent = "<p><custom>Title:<br><em>A Very Cool</em></custom><br />Something</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "custom" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren12()
+        {
+            // Arrange
+            var documentContent = "<p></</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "custom" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren13()
+        {
+            // Arrange
+            var documentContent = "<p><</p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "custom" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsAllowedChildren14()
+        {
+            // Arrange
+            var documentContent = "<p><custom><br>:<strong><strong>Hello</strong></strong>:<input></custom></p>";
+            var descriptors = GetAllowedChildrenTagHelperDescriptors(new[] { "custom", "strong" });
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        private TagHelperDescriptor[] GetAllowedChildrenTagHelperDescriptors(string[] allowedChildren)
+        {
+            var pTagHelperBuilder = TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
+            var strongTagHelperBuilder = TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("strong"));
+
+            foreach (var childTag in allowedChildren)
+            {
+                pTagHelperBuilder.AllowChildTag(childTag);
+                strongTagHelperBuilder.AllowChildTag(childTag);
+            }
+            var descriptors = new TagHelperDescriptor[]
+            {
+                pTagHelperBuilder.Build(),
+                strongTagHelperBuilder.Build(),
+                TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("br")
+                        .RequireTagStructure(TagStructure.WithoutEndTag))
+                    .Build(),
+            };
+
+            return descriptors;
+        }
+
+        [Fact]
+        public void AllowsSimpleHtmlCommentsAsChildren()
+        {
+            // Arrange
+            var allowedChildren = new List<string> { "b" };
+            var literal = "asdf";
+            var commentOutput = "Hello World";
+            var document = $"<p><b>{literal}</b><!--{commentOutput}--></p>";
+
+            var pTagHelperBuilder = TagHelperDescriptorBuilder
+                .Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
+            foreach (var childTag in allowedChildren)
+            {
+                pTagHelperBuilder.AllowChildTag(childTag);
+            }
+
+            var descriptors = new TagHelperDescriptor[]
+            {
+                pTagHelperBuilder.Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, document);
+        }
+
+        [Fact]
+        public void DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff()
+        {
+            // Arrange
+            var allowedChildren = new List<string> { "b" };
+            var comment1 = "Hello";
+            var document = $"<p><!--{comment1}--></p>";
+
+            var pTagHelperBuilder = TagHelperDescriptorBuilder
+                .Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
+            foreach (var childTag in allowedChildren)
+            {
+                pTagHelperBuilder.AllowChildTag(childTag);
+            }
+
+            var descriptors = new TagHelperDescriptor[]
+            {
+                pTagHelperBuilder.Build()
+            };
+
+            // Act & Assert
+            EvaluateData(
+                descriptors,
+                document,
+                featureFlags: RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_0));
+        }
+
+        [Fact]
+        public void FailsForContentWithCommentsAsChildren()
+        {
+            // Arrange
+            var allowedChildren = new List<string> { "b" };
+            var comment1 = "Hello";
+            var literal = "asdf";
+            var comment2 = "World";
+            var document = $"<p><!--{comment1}-->{literal}<!--{comment2}--></p>";
+
+            var pTagHelperBuilder = TagHelperDescriptorBuilder
+                .Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
+            foreach (var childTag in allowedChildren)
+            {
+                pTagHelperBuilder.AllowChildTag(childTag);
+            }
+
+            var descriptors = new TagHelperDescriptor[]
+            {
+                pTagHelperBuilder.Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, document);
+        }
+
+        [Fact]
+        public void AllowsRazorCommentsAsChildren()
+        {
+            // Arrange
+            var allowedChildren = new List<string> { "b" };
+            var literal = "asdf";
+            var commentOutput = $"@*{literal}*@";
+            var document = $"<p><b>{literal}</b>{commentOutput}</p>";
+
+            var pTagHelperBuilder = TagHelperDescriptorBuilder
+                .Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
+            foreach (var childTag in allowedChildren)
+            {
+                pTagHelperBuilder.AllowChildTag(childTag);
+            }
+
+            var descriptors = new TagHelperDescriptor[]
+            {
+                pTagHelperBuilder.Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, document);
+        }
+
+        [Fact]
+        public void AllowsRazorMarkupInHtmlComment()
+        {
+            // Arrange
+            var allowedChildren = new List<string> { "b" };
+            var literal = "asdf";
+            var part1 = "Hello ";
+            var part2 = "World";
+            var commentStart = "<!--";
+            var commentEnd = "-->";
+            var document = $"<p><b>{literal}</b>{commentStart}{part1}@{part2}{commentEnd}</p>";
+
+            var pTagHelperBuilder = TagHelperDescriptorBuilder
+                .Create("PTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
+            foreach (var childTag in allowedChildren)
+            {
+                pTagHelperBuilder.AllowChildTag(childTag);
+            }
+
+            var descriptors = new TagHelperDescriptor[]
+            {
+                pTagHelperBuilder.Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, document);
+        }
+
+        [Fact]
+        public void UnderstandsNullTagNameWithAllowedChildrenForCatchAll()
+        {
+            // Arrange
+            var documentContent = "<p></</p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("custom")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix()
+        {
+            // Arrange
+            var documentContent = "<th:p></</th:p>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .AllowChildTag("custom")
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent, "th:");
+        }
+
+        [Fact]
+        public void CanHandleStartTagOnlyTagTagMode()
+        {
+            // Arrange
+            var documentContent = "<input>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireTagStructure(TagStructure.WithoutEndTag))
+                    .Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void CreatesErrorForWithoutEndTagTagStructureForEndTags()
+        {
+            // Arrange
+            var documentContent = "</input>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireTagStructure(TagStructure.WithoutEndTag))
+                    .Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        [Fact]
+        public void CreatesErrorForInconsistentTagStructures()
+        {
+            // Arrange
+            var documentContent = "<input>";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireTagStructure(TagStructure.WithoutEndTag))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireTagStructure(TagStructure.NormalOrSelfClosing))
+                    .Build()
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, documentContent);
+        }
+
+        public static TagHelperDescriptor[] RequiredAttribute_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("p")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("divTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("div")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("style")))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("*")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("catchAll")))
+                .Build()
+        };
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p></p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div></div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"@DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\">words and spaces</p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"@DateTime.Now\">words and spaces</p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\">words<strong>and</strong>spaces</p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"hi\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"@DateTime.Now\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"hi\">words and spaces</strong>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"@DateTime.Now\">words and spaces</strong>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div class=\"btn\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div class=\"btn\"></div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p notRequired=\"a\" class=\"btn\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p notRequired=\"@DateTime.Now\" class=\"btn\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p notRequired=\"a\" class=\"btn\">words and spaces</p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"@DateTime.Now\" class=\"btn\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\">words and spaces</div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"@DateTime.Now\" class=\"@DateTime.Now\">words and spaces</div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\">words<strong>and</strong>spaces</div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\" catchAll=\"hi\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\" catchAll=\"hi\">words and spaces</p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"hi\" />");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"hi\" >words and spaces</div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"@@hi\" >words and spaces</div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"@DateTime.Now\" class=\"@DateTime.Now\" catchAll=\"@DateTime.Now\" >words and spaces</div>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30()
+        {
+            EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"hi\" >words<strong>and</strong>spaces</div>");
+        }
+
+        public static TagHelperDescriptor[] NestedRequiredAttribute_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("p")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("*")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("catchAll")))
+                .Build(),
+        };
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><p></p></p>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><strong></strong></strong>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><strong><p></p></strong></p>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><p><strong></strong></p></strong>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><strong catchAll=\"hi\"><p></p></strong></p>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><p class=\"btn\"><strong></strong></p></strong>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><p class=\"btn\"><p></p></p></p>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><strong catchAll=\"hi\"><strong></strong></strong></strong>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><p><p><p class=\"btn\"><p></p></p></p></p></p>");
+        }
+
+        [Fact]
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10()
+        {
+            EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><strong><strong><strong catchAll=\"hi\"><strong></strong></strong></strong></strong></strong>");
+        }
+
+        public static TagHelperDescriptor[] MalformedRequiredAttribute_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("p")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                .Build(),
+        };
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\"");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\"");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p></p");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\"></p");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\"></p");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\" <p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\" <p>");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\" </p");
+        }
+
+        [Fact]
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10()
+        {
+            EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\" </p");
+        }
+
+        public static TagHelperDescriptor[] PrefixedTagHelperColon_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("myth"))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("mythTagHelper2", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("myth2"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound")
+                    .PropertyName("Bound")
+                    .TypeName(typeof(bool).FullName))
+                .Build()
+        };
+
+        public static TagHelperDescriptor[] PrefixedTagHelperCatchAll_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("*"))
+                .Build(),
+        };
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers1()
+        {
+            EvaluateData(PrefixedTagHelperCatchAll_Descriptors, "<th: />", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers2()
+        {
+            EvaluateData(PrefixedTagHelperCatchAll_Descriptors, "<th:>words and spaces</th:>", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers3()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth />", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers4()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth></th:myth>", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers5()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth><th:my2th></th:my2th></th:myth>", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers6()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<!th:myth />", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers7()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<!th:myth></!th:myth>", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers8()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth class=\"btn\" />", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers9()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth2 class=\"btn\" />", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers10()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth class=\"btn\">words and spaces</th:myth>", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsPrefixedTagHelpers11()
+        {
+            EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth2 bound=\"@DateTime.Now\" />", tagHelperPrefix: "th:");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1()
+        {
+            RunParseTreeRewriterTest("@{<!text class=\"btn\">}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2()
+        {
+            RunParseTreeRewriterTest("@{<!text class=\"btn\"></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3()
+        {
+            RunParseTreeRewriterTest("@{<!text class=\"btn\">words with spaces</!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4()
+        {
+            RunParseTreeRewriterTest("@{<!text class='btn1 btn2' class2=btn></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5()
+        {
+            RunParseTreeRewriterTest("@{<!text class='btn1 @DateTime.Now btn2'></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1()
+        {
+            RunParseTreeRewriterTest("@{<!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2()
+        {
+            RunParseTreeRewriterTest("@{</!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3()
+        {
+            RunParseTreeRewriterTest("@{<!text></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4()
+        {
+            RunParseTreeRewriterTest("@{<!text>words and spaces</!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5()
+        {
+            RunParseTreeRewriterTest("@{<!text></text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6()
+        {
+            RunParseTreeRewriterTest("@{<text></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7()
+        {
+            RunParseTreeRewriterTest("@{<!text><text></text></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8()
+        {
+            RunParseTreeRewriterTest("@{<text><!text></!text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9()
+        {
+            RunParseTreeRewriterTest("@{<!text></!text></text>}", "p", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1()
+        {
+            RunParseTreeRewriterTest("@{<!text}", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2()
+        {
+            RunParseTreeRewriterTest("@{<!text /}", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3()
+        {
+            RunParseTreeRewriterTest("@{<!text class=}", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4()
+        {
+            RunParseTreeRewriterTest("@{<!text class=\"btn}", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5()
+        {
+            RunParseTreeRewriterTest("@{<!text class=\"btn\"}", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6()
+        {
+            RunParseTreeRewriterTest("@{<!text class=\"btn\" /}", "text");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1()
+        {
+            RunParseTreeRewriterTest("@{<!}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2()
+        {
+            RunParseTreeRewriterTest("@{<!p}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3()
+        {
+            RunParseTreeRewriterTest("@{<!p /}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4()
+        {
+            RunParseTreeRewriterTest("@{<!p class=}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn@@}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn\"}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn\" /}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML1()
+        {
+            RunParseTreeRewriterTest("<!", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML2()
+        {
+            RunParseTreeRewriterTest("<!p", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML3()
+        {
+            RunParseTreeRewriterTest("<!p /", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML4()
+        {
+            RunParseTreeRewriterTest("<!p class=", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML5()
+        {
+            RunParseTreeRewriterTest("<!p class=\"btn", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML6()
+        {
+            RunParseTreeRewriterTest("<!p class=\"btn\"", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptForIncompleteHTML7()
+        {
+            RunParseTreeRewriterTest("<!p class=\"btn\" /", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData1()
+        {
+            RunParseTreeRewriterTest("@{<!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData2()
+        {
+            RunParseTreeRewriterTest("@{</!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData3()
+        {
+            RunParseTreeRewriterTest("@{<!p></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData4()
+        {
+            RunParseTreeRewriterTest("@{<!p>words and spaces</!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData5()
+        {
+            RunParseTreeRewriterTest("@{<!p></p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData6()
+        {
+            RunParseTreeRewriterTest("@{<p></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData7()
+        {
+            RunParseTreeRewriterTest("@{<p><!p></!p></p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData8()
+        {
+            RunParseTreeRewriterTest("@{<p><!p></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData9()
+        {
+            RunParseTreeRewriterTest("@{<!p></!p></p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData10()
+        {
+            RunParseTreeRewriterTest("@{<strong></!p></strong>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData11()
+        {
+            RunParseTreeRewriterTest("@{<strong></strong><!p></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData12()
+        {
+            RunParseTreeRewriterTest("@{<p><strong></!strong><!p></strong></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData1()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn\">}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData2()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn\"></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData3()
+        {
+            RunParseTreeRewriterTest("@{<!p class=\"btn\">words with spaces</!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData4()
+        {
+            RunParseTreeRewriterTest("@{<!p class='btn1 btn2' class2=btn></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData5()
+        {
+            RunParseTreeRewriterTest("@{<!p class='btn1 @DateTime.Now btn2'></!p>}", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData1()
+        {
+            RunParseTreeRewriterTest("<!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData2()
+        {
+            RunParseTreeRewriterTest("</!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData3()
+        {
+            RunParseTreeRewriterTest("<!p></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData4()
+        {
+            RunParseTreeRewriterTest("<!p>words and spaces</!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData5()
+        {
+            RunParseTreeRewriterTest("<!p></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData6()
+        {
+            RunParseTreeRewriterTest("<p></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData7()
+        {
+            RunParseTreeRewriterTest("<p><!p></!p></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData8()
+        {
+            RunParseTreeRewriterTest("<p><!p></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData9()
+        {
+            RunParseTreeRewriterTest("<!p></!p></p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData10()
+        {
+            RunParseTreeRewriterTest("<strong></!p></strong>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData11()
+        {
+            RunParseTreeRewriterTest("<strong></strong><!p></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData12()
+        {
+            RunParseTreeRewriterTest("<p><strong></!strong><!p></strong></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData1()
+        {
+            RunParseTreeRewriterTest("<!p class=\"btn\">", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData2()
+        {
+            RunParseTreeRewriterTest("<!p class=\"btn\"></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData3()
+        {
+            RunParseTreeRewriterTest("<!p class=\"btn\">words and spaces</!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData4()
+        {
+            RunParseTreeRewriterTest("<!p class='btn1 btn2' class2=btn></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData5()
+        {
+            RunParseTreeRewriterTest("<!p class='btn1 @DateTime.Now btn2'></!p>", "strong", "p");
+        }
+
+        [Fact]
+        public void DoesNotRewriteTextTagTransitionTagHelpers1()
+        {
+            RunParseTreeRewriterTest("<text>Hello World</text>", "p", "text");
+        }
+
+        [Fact]
+        public void DoesNotRewriteTextTagTransitionTagHelpers2()
+        {
+            RunParseTreeRewriterTest("@{<text>Hello World</text>}", "p", "text");
+        }
+
+        [Fact]
+        public void DoesNotRewriteTextTagTransitionTagHelpers3()
+        {
+            RunParseTreeRewriterTest("@{<text><p>Hello World</p></text>}", "p", "text");
+        }
+
+        [Fact]
+        public void DoesNotRewriteTextTagTransitionTagHelpers4()
+        {
+            RunParseTreeRewriterTest("@{<p><text>Hello World</text></p>}", "p", "text");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers1()
+        {
+            RunParseTreeRewriterTest("<foo><!-- Hello World --></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers2()
+        {
+            RunParseTreeRewriterTest("<foo><!-- @foo --></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers3()
+        {
+            RunParseTreeRewriterTest("<foo><?xml Hello World ?></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers4()
+        {
+            RunParseTreeRewriterTest("<foo><?xml @foo ?></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers5()
+        {
+            RunParseTreeRewriterTest("<foo><!DOCTYPE @foo ></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers6()
+        {
+            RunParseTreeRewriterTest("<foo><!DOCTYPE hello=\"world\" ></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers7()
+        {
+            RunParseTreeRewriterTest("<foo><![CDATA[ Hello World ]]></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void DoesNotRewriteSpecialTagTagHelpers8()
+        {
+            RunParseTreeRewriterTest("<foo><![CDATA[ @foo ]]></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
+        }
+
+        [Fact]
+        public void RewritesNestedTagHelperTagBlocks1()
+        {
+            RunParseTreeRewriterTest("<p><div></div></p>", "p", "div");
+        }
+
+        [Fact]
+        public void RewritesNestedTagHelperTagBlocks2()
+        {
+            RunParseTreeRewriterTest("<p>Hello World <div></div></p>", "p", "div");
+        }
+
+        [Fact]
+        public void RewritesNestedTagHelperTagBlocks3()
+        {
+            RunParseTreeRewriterTest("<p>Hel<p>lo</p></p> <p><div>World</div></p>", "p", "div");
+        }
+
+        [Fact]
+        public void RewritesNestedTagHelperTagBlocks4()
+        {
+            RunParseTreeRewriterTest("<p>Hel<strong>lo</strong></p> <p><span>World</span></p>", "p", "div");
+        }
+
+        [Fact]
+        public void HandlesMalformedNestedNonTagHelperTags_Correctly()
+        {
+            RunParseTreeRewriterTest("<div>@{</div>}");
+        }
+
+        [Fact]
+        public void HandlesNonTagHelperStartAndEndVoidTags_Correctly()
+        {
+            RunParseTreeRewriterTest("<input>Foo</input>");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperRewritingTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperRewritingTestBase.cs
new file mode 100644
index 0000000000..febc0663a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperRewritingTestBase.cs
@@ -0,0 +1,45 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class TagHelperRewritingTestBase : ParserTestBase
+    {
+        internal void RunParseTreeRewriterTest(string documentContent, params string[] tagNames)
+        {
+            var descriptors = BuildDescriptors(tagNames);
+
+            EvaluateData(descriptors, documentContent);
+        }
+
+        internal IEnumerable<TagHelperDescriptor> BuildDescriptors(params string[] tagNames)
+        {
+            var descriptors = new List<TagHelperDescriptor>();
+
+            foreach (var tagName in tagNames)
+            {
+                var descriptor = TagHelperDescriptorBuilder.Create(tagName + "taghelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName(tagName))
+                    .Build();
+                descriptors.Add(descriptor);
+            }
+
+            return descriptors;
+        }
+
+        internal void EvaluateData(
+            IEnumerable<TagHelperDescriptor> descriptors,
+            string documentContent,
+            string tagHelperPrefix = null,
+            RazorParserFeatureFlags featureFlags = null)
+        {
+            var syntaxTree = ParseDocument(documentContent, featureFlags: featureFlags);
+
+            var rewrittenTree = TagHelperParseTreeRewriter.Rewrite(syntaxTree, tagHelperPrefix, descriptors);
+
+            BaselineTest(rewrittenTree);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TextReaderExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TextReaderExtensionsTest.cs
new file mode 100644
index 0000000000..e95878c148
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TextReaderExtensionsTest.cs
@@ -0,0 +1,113 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class TextReaderExtensionsTest
+    {
+        [Fact]
+        public void ReadUntilWithCharReadsAllTextUpToSpecifiedCharacterButNotPast()
+        {
+            RunReaderTest("foo bar baz @biz", "foo bar baz ", '@', r => r.ReadUntil('@'));
+        }
+
+        [Fact]
+        public void ReadUntilWithCharWithInclusiveFlagReadsAllTextUpToSpecifiedCharacterButNotPastIfInclusiveFalse()
+        {
+            RunReaderTest("foo bar baz @biz", "foo bar baz ", '@', r => r.ReadUntil('@', inclusive: false));
+        }
+
+        [Fact]
+        public void ReadUntilWithCharWithInclusiveFlagReadsAllTextUpToAndIncludingSpecifiedCharacterIfInclusiveTrue()
+        {
+            RunReaderTest("foo bar baz @biz", "foo bar baz @", 'b', r => r.ReadUntil('@', inclusive: true));
+        }
+
+        [Fact]
+        public void ReadUntilWithCharReadsToEndIfSpecifiedCharacterNotFound()
+        {
+            RunReaderTest("foo bar baz", "foo bar baz", -1, r => r.ReadUntil('@'));
+        }
+
+        [Fact]
+        public void ReadUntilWithMultipleTerminatorsReadsUntilAnyTerminatorIsFound()
+        {
+            RunReaderTest("<bar/>", "<bar", '/', r => r.ReadUntil('/', '>'));
+        }
+
+        [Fact]
+        public void ReadUntilWithMultipleTerminatorsHonorsInclusiveFlagWhenFalse()
+        {
+            // NOTE: Using named parameters would be difficult here, hence the inline comment
+            RunReaderTest("<bar/>", "<bar", '/', r => r.ReadUntil(/* inclusive */ false, '/', '>'));
+        }
+
+        [Fact]
+        public void ReadUntilWithMultipleTerminatorsHonorsInclusiveFlagWhenTrue()
+        {
+            // NOTE: Using named parameters would be difficult here, hence the inline comment
+            RunReaderTest("<bar/>", "<bar/", '>', r => r.ReadUntil(/* inclusive */ true, '/', '>'));
+        }
+
+        [Fact]
+        public void ReadUntilWithPredicateStopsWhenPredicateIsTrue()
+        {
+            RunReaderTest("foo bar baz 0 zoop zork zoink", "foo bar baz ", '0', r => r.ReadUntil(c => Char.IsDigit(c)));
+        }
+
+        [Fact]
+        public void ReadUntilWithPredicateHonorsInclusiveFlagWhenFalse()
+        {
+            RunReaderTest("foo bar baz 0 zoop zork zoink", "foo bar baz ", '0', r => r.ReadUntil(c => Char.IsDigit(c), inclusive: false));
+        }
+
+        [Fact]
+        public void ReadUntilWithPredicateHonorsInclusiveFlagWhenTrue()
+        {
+            RunReaderTest("foo bar baz 0 zoop zork zoink", "foo bar baz 0", ' ', r => r.ReadUntil(c => Char.IsDigit(c), inclusive: true));
+        }
+
+        [Fact]
+        public void ReadWhileWithPredicateStopsWhenPredicateIsFalse()
+        {
+            RunReaderTest("012345a67890", "012345", 'a', r => r.ReadWhile(c => Char.IsDigit(c)));
+        }
+
+        [Fact]
+        public void ReadWhileWithPredicateHonorsInclusiveFlagWhenFalse()
+        {
+            RunReaderTest("012345a67890", "012345", 'a', r => r.ReadWhile(c => Char.IsDigit(c), inclusive: false));
+        }
+
+        [Fact]
+        public void ReadWhileWithPredicateHonorsInclusiveFlagWhenTrue()
+        {
+            RunReaderTest("012345a67890", "012345a", '6', r => r.ReadWhile(c => Char.IsDigit(c), inclusive: true));
+        }
+
+        private static void RunReaderTest(string testString, string expectedOutput, int expectedPeek, Func<TextReader, string> action)
+        {
+            // Arrange
+            var reader = new StringReader(testString);
+
+            // Act
+            var read = action(reader);
+
+            // Assert
+            Assert.Equal(expectedOutput, read);
+
+            if (expectedPeek == -1)
+            {
+                Assert.True(reader.Peek() == -1, "Expected that the reader would be positioned at the end of the input stream");
+            }
+            else
+            {
+                Assert.Equal((char)expectedPeek, (char)reader.Peek());
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs
new file mode 100644
index 0000000000..655a88d14a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs
@@ -0,0 +1,217 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class TokenizerLookaheadTest : HtmlTokenizerTestBase
+    {
+        [Fact]
+        public void Lookahead_MaintainsExistingBufferWhenRejected()
+        {
+            // Arrange
+            var tokenizer = new ExposedTokenizer("01234");
+            tokenizer.Buffer.Append("pre-existing values");
+
+            // Act
+            var result = tokenizer.Lookahead("0x", takeIfMatch: true, caseSensitive: true);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal("pre-existing values", tokenizer.Buffer.ToString(), StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void Lookahead_AddsToExistingBufferWhenSuccessfulAndTakeIfMatchIsTrue()
+        {
+            // Arrange
+            var tokenizer = new ExposedTokenizer("0x1234");
+            tokenizer.Buffer.Append("pre-existing values");
+
+            // Act
+            var result = tokenizer.Lookahead("0x", takeIfMatch: true, caseSensitive: true);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("pre-existing values0x", tokenizer.Buffer.ToString(), StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void Lookahead_MaintainsExistingBufferWhenSuccessfulAndTakeIfMatchIsFalse()
+        {
+            // Arrange
+            var tokenizer = new ExposedTokenizer("0x1234");
+            tokenizer.Buffer.Append("pre-existing values");
+
+            // Act
+            var result = tokenizer.Lookahead("0x", takeIfMatch: false, caseSensitive: true);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("pre-existing values", tokenizer.Buffer.ToString(), StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void LookaheadUntil_PassesThePreviousTokensInTheSameOrder()
+        {
+            // Arrange
+            var tokenizer = CreateContentTokenizer("asdf--fvd--<");
+
+            // Act
+            var i = 3;
+            IEnumerable<SyntaxToken> previousTokens = null;
+            var tokenFound = tokenizer.LookaheadUntil((s, p) =>
+            {
+                previousTokens = p;
+                return --i == 0;
+            });
+
+            // Assert
+            Assert.Equal(4, previousTokens.Count());
+
+            // For the very first element, there will be no previous items, so null is expected
+            var orderIndex = 0;
+            Assert.Null(previousTokens.ElementAt(orderIndex++));
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), previousTokens.ElementAt(orderIndex++));
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), previousTokens.ElementAt(orderIndex++));
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "fvd"), previousTokens.ElementAt(orderIndex++));
+        }
+
+        [Fact]
+        public void LookaheadUntil_ReturnsFalseAfterIteratingOverAllTokensIfConditionIsNotMet()
+        {
+            // Arrange
+            var tokenizer = CreateContentTokenizer("asdf--fvd");
+
+            // Act
+            var tokens = new Stack<SyntaxToken>();
+            var tokenFound = tokenizer.LookaheadUntil((s, p) =>
+            {
+                tokens.Push(s);
+                return false;
+            });
+
+            // Assert
+            Assert.False(tokenFound);
+            Assert.Equal(3, tokens.Count);
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "fvd"), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), tokens.Pop());
+        }
+
+        [Fact]
+        public void LookaheadUntil_ReturnsTrueAndBreaksIteration()
+        {
+            // Arrange
+            var tokenizer = CreateContentTokenizer("asdf--fvd");
+
+            // Act
+            var tokens = new Stack<SyntaxToken>();
+            var tokenFound = tokenizer.LookaheadUntil((s, p) =>
+            {
+                tokens.Push(s);
+                return s.Kind == SyntaxKind.DoubleHyphen;
+            });
+
+            // Assert
+            Assert.True(tokenFound);
+            Assert.Equal(2, tokens.Count);
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), tokens.Pop());
+        }
+
+        private static TestTokenizerBackedParser CreateContentTokenizer(string content)
+        {
+            var source = TestRazorSourceDocument.Create(content);
+            var options = RazorParserOptions.CreateDefault();
+            var context = new ParserContext(source, options);
+
+            var tokenizer = new TestTokenizerBackedParser(HtmlLanguageCharacteristics.Instance, context);
+            return tokenizer;
+        }
+
+        private static void AssertTokenEqual(SyntaxToken expected, SyntaxToken actual)
+        {
+            Assert.True(expected.IsEquivalentTo(actual), "Tokens not equal.");
+        }
+
+        private class ExposedTokenizer : Tokenizer
+        {
+            public ExposedTokenizer(string input)
+                : base(new SeekableTextReader(input, filePath: null))
+            {
+            }
+
+            public new StringBuilder Buffer
+            {
+                get
+                {
+                    return base.Buffer;
+                }
+            }
+
+            public override SyntaxKind RazorCommentStarKind
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override SyntaxKind RazorCommentTransitionKind
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override SyntaxKind RazorCommentKind
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            protected override int StartState
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            protected override SyntaxToken CreateToken(
+                string content,
+                SyntaxKind type,
+                IReadOnlyList<RazorDiagnostic> errors)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override StateResult Dispatch()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestTokenizerBackedParser : TokenizerBackedParser<HtmlTokenizer>
+        {
+            internal TestTokenizerBackedParser(LanguageCharacteristics<HtmlTokenizer> language, ParserContext context) : base(language, context)
+            {
+            }
+
+            internal new bool LookaheadUntil(Func<SyntaxToken, IEnumerable<SyntaxToken>, bool> condition)
+            {
+                return base.LookaheadUntil(condition);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerTestBase.cs
new file mode 100644
index 0000000000..21ccddba3b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerTestBase.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public abstract class TokenizerTestBase
+    {
+        internal abstract object IgnoreRemaining { get; }
+        internal abstract object CreateTokenizer(ITextDocument source);
+
+        internal void TestTokenizer(string input, params SyntaxToken[] expectedSymbols)
+        {
+            // Arrange
+            var success = true;
+            var output = new StringBuilder();
+            using (var source = new SeekableTextReader(input, filePath: null))
+            {
+                var tokenizer = (Tokenizer)CreateTokenizer(source);
+                var counter = 0;
+                SyntaxToken current = null;
+                while ((current = tokenizer.NextToken()) != null)
+                {
+                    if (counter >= expectedSymbols.Length)
+                    {
+                        output.AppendLine(string.Format("F: Expected: << Nothing >>; Actual: {0}", current));
+                        success = false;
+                    }
+                    else if (ReferenceEquals(expectedSymbols[counter], IgnoreRemaining))
+                    {
+                        output.AppendLine(string.Format("P: Ignored |{0}|", current));
+                    }
+                    else
+                    {
+                        if (!expectedSymbols[counter].IsEquivalentTo(current))
+                        {
+                            output.AppendLine(string.Format("F: Expected: {0}; Actual: {1}", expectedSymbols[counter], current));
+                            success = false;
+                        }
+                        else
+                        {
+                            output.AppendLine(string.Format("P: Expected: {0}", expectedSymbols[counter]));
+                        }
+                        counter++;
+                    }
+                }
+                if (counter < expectedSymbols.Length && !ReferenceEquals(expectedSymbols[counter], IgnoreRemaining))
+                {
+                    success = false;
+                    for (; counter < expectedSymbols.Length; counter++)
+                    {
+                        output.AppendLine(string.Format("F: Expected: {0}; Actual: << None >>", expectedSymbols[counter]));
+                    }
+                }
+            }
+            Assert.True(success, Environment.NewLine + output.ToString());
+            WriteTraceLine(output.Replace("{", "{{").Replace("}", "}}").ToString());
+        }
+
+        [Conditional("PARSER_TRACE")]
+        private static void WriteTraceLine(string format, params object[] args)
+        {
+            Trace.WriteLine(string.Format(format, args));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/WhiteSpaceRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/WhiteSpaceRewriterTest.cs
new file mode 100644
index 0000000000..4bc69b6d7c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/WhiteSpaceRewriterTest.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class WhiteSpaceRewriterTest : ParserTestBase
+    {
+        [Fact]
+        public void Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block()
+        {
+            // Arrange
+            var content = @"
+<div>
+    @result
+</div>
+<div>
+    @(result)
+</div>";
+            var parsed = ParseDocument(
+                RazorLanguageVersion.Latest,
+                content,
+                Array.Empty<DirectiveDescriptor>());
+
+            var rewriter = new WhitespaceRewriter();
+
+            // Act
+            var rewritten = rewriter.Visit(parsed.Root);
+
+            // Assert
+            var rewrittenTree = RazorSyntaxTree.Create(rewritten, parsed.Source, parsed.Diagnostics, parsed.Options);
+            BaselineTest(rewrittenTree);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
new file mode 100644
index 0000000000..4430c2e13b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
+    <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**\*" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(TEST_NewtonsoftJsonPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
new file mode 100644
index 0000000000..9cf25fbeed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
@@ -0,0 +1,382 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorCodeDocumentExtensionsTest
+    {
+        [Fact]
+        public void GetRazorSyntaxTree_ReturnsSyntaxTree()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorSyntaxTree.Parse(codeDocument.Source);
+            codeDocument.Items[typeof(RazorSyntaxTree)] = expected;
+
+            // Act
+            var actual = codeDocument.GetSyntaxTree();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void SetRazorSyntaxTree_SetsSyntaxTree()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorSyntaxTree.Parse(codeDocument.Source);
+
+            // Act
+            codeDocument.SetSyntaxTree(expected);
+
+            // Assert
+            Assert.Same(expected, codeDocument.Items[typeof(RazorSyntaxTree)]);
+        }
+
+        [Fact]
+        public void GetAndSetImportSyntaxTrees_ReturnsSyntaxTrees()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = new[] { RazorSyntaxTree.Parse(codeDocument.Source), };
+            codeDocument.SetImportSyntaxTrees(expected);
+
+            // Act
+            var actual = codeDocument.GetImportSyntaxTrees();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void GetAndSetTagHelpers_ReturnsTagHelpers()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = new[] { TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly").Build() };
+            codeDocument.SetTagHelpers(expected);
+
+            // Act
+            var actual = codeDocument.GetTagHelpers();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void GetIRDocument_ReturnsIRDocument()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = new DocumentIntermediateNode();
+            codeDocument.Items[typeof(DocumentIntermediateNode)] = expected;
+
+            // Act
+            var actual = codeDocument.GetDocumentIntermediateNode();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void SetIRDocument_SetsIRDocument()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = new DocumentIntermediateNode();
+
+            // Act
+            codeDocument.SetDocumentIntermediateNode((DocumentIntermediateNode)expected);
+
+            // Assert
+            Assert.Same(expected, codeDocument.Items[typeof(DocumentIntermediateNode)]);
+        }
+
+        [Fact]
+        public void GetCSharpDocument_ReturnsCSharpDocument()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorCSharpDocument.Create("", RazorCodeGenerationOptions.CreateDefault(), Array.Empty<RazorDiagnostic>());
+            codeDocument.Items[typeof(RazorCSharpDocument)] = expected;
+
+            // Act
+            var actual = codeDocument.GetCSharpDocument();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void SetCSharpDocument_SetsCSharpDocument()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorCSharpDocument.Create("", RazorCodeGenerationOptions.CreateDefault(), Array.Empty<RazorDiagnostic>());
+
+            // Act
+            codeDocument.SetCSharpDocument(expected);
+
+            // Assert
+            Assert.Same(expected, codeDocument.Items[typeof(RazorCSharpDocument)]);
+        }
+
+        [Fact]
+        public void GetTagHelperContext_ReturnsTagHelperContext()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = TagHelperDocumentContext.Create(null, new TagHelperDescriptor[0]);
+            codeDocument.Items[typeof(TagHelperDocumentContext)] = expected;
+
+            // Act
+            var actual = codeDocument.GetTagHelperContext();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void SetTagHelperContext_SetsTagHelperContext()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = TagHelperDocumentContext.Create(null, new TagHelperDescriptor[0]);
+
+            // Act
+            codeDocument.SetTagHelperContext(expected);
+
+            // Assert
+            Assert.Same(expected, codeDocument.Items[typeof(TagHelperDocumentContext)]);
+        }
+
+        [Fact]
+        public void GetParserOptions_ReturnsSuccessfully()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorParserOptions.CreateDefault();
+            codeDocument.Items[typeof(RazorParserOptions)] = expected;
+
+            // Act
+            var actual = codeDocument.GetParserOptions();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void SetParserOptions_SetsSuccessfully()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorParserOptions.CreateDefault();
+
+            // Act
+            codeDocument.SetParserOptions(expected);
+
+            // Assert
+            Assert.Same(expected, codeDocument.Items[typeof(RazorParserOptions)]);
+        }
+
+        [Fact]
+        public void GetCodeGenerationOptions_ReturnsSuccessfully()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorCodeGenerationOptions.CreateDefault();
+            codeDocument.Items[typeof(RazorCodeGenerationOptions)] = expected;
+
+            // Act
+            var actual = codeDocument.GetCodeGenerationOptions();
+
+            // Assert
+            Assert.Same(expected, actual);
+        }
+
+        [Fact]
+        public void SetCodeGenerationOptions_SetsSuccessfully()
+        {
+            // Arrange
+            var codeDocument = TestRazorCodeDocument.CreateEmpty();
+
+            var expected = RazorCodeGenerationOptions.CreateDefault();
+
+            // Act
+            codeDocument.SetCodeGenerationOptions(expected);
+
+            // Assert
+            Assert.Same(expected, codeDocument.Items[typeof(RazorCodeGenerationOptions)]);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_RootNamespaceNotSet_ReturnsNull()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Test.cshtml", relativePath: "Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Null(@namespace);
+            Assert.Null(@class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_RelativePathNull_ReturnsNull()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Test.cshtml", relativePath: null);
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Null(@namespace);
+            Assert.Null(@class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_FilePathNull_ReturnsNull()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: null, relativePath: "Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Null(@namespace);
+            Assert.Null(@class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_RelativePathLongerThanFilePath_ReturnsNull()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Test.cshtml", relativePath: "Some\\invalid\\relative\\path\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Null(@namespace);
+            Assert.Null(@class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_ComputesNamespaceAndClass()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetCodeGenerationOptions(RazorCodeGenerationOptions.Create(c =>
+            {
+                c.RootNamespace = "Hello";
+            }));
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Equal("Hello.Components", @namespace);
+            Assert.Equal("Test", @class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_UsesIROptions_ComputesNamespaceAndClass()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Equal("Hello.Components", @namespace);
+            Assert.Equal("Test", @class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_PrefersOptionsFromCodeDocument_ComputesNamespaceAndClass()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetCodeGenerationOptions(RazorCodeGenerationOptions.Create(c =>
+            {
+                c.RootNamespace = "World";
+            }));
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Equal("World.Components", @namespace);
+            Assert.Equal("Test", @class);
+        }
+
+        [Fact]
+        public void TryComputeNamespaceAndClass_SanitizesNamespaceAndClassName()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components with space\\Test$name.cshtml", relativePath: "\\Components with space\\Test$name.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hel?o.World";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+
+            // Assert
+            Assert.Equal("Hel_o.World.Components_with_space", @namespace);
+            Assert.Equal("Test_name", @class);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentTest.cs
new file mode 100644
index 0000000000..c0cce4b7c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentTest.cs
@@ -0,0 +1,61 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorCodeDocumentTest
+    {
+        [Fact]
+        public void Create()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+
+            // Act
+            var code = RazorCodeDocument.Create(source);
+
+            // Assert
+            Assert.Same(source, code.Source);
+            Assert.NotNull(code.Items);
+        }
+
+        [Fact]
+        public void Create_WithImports()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+
+            var imports = new RazorSourceDocument[]
+            {
+                TestRazorSourceDocument.Create(),
+            };
+
+            // Act
+            var code = RazorCodeDocument.Create(source, imports);
+
+            // Assert
+            Assert.Same(source, code.Source);
+            Assert.NotNull(code.Items);
+
+            Assert.NotSame(imports, code.Imports);
+            Assert.Collection(imports, d => Assert.Same(imports[0], d));
+        }
+
+        [Fact]
+        public void Create_WithImports_AllowsNull()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create();
+
+            // Act
+            var code = RazorCodeDocument.Create(source, imports: null);
+
+            // Assert
+            Assert.Same(source, code.Source);
+            Assert.NotNull(code.Items);
+            Assert.Empty(code.Imports);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticDescriptorTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticDescriptorTest.cs
new file mode 100644
index 0000000000..9b3af87f6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticDescriptorTest.cs
@@ -0,0 +1,78 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorDiagnosticDescriptorTest
+    {
+        [Fact]
+        public void RazorDiagnosticDescriptor_Ctor()
+        {
+            // Arrange & Act
+            var descriptor = new RazorDiagnosticDescriptor("RZ0001", () => "Hello, World!", RazorDiagnosticSeverity.Error);
+
+            // Assert
+            Assert.Equal("RZ0001", descriptor.Id);
+            Assert.Equal(RazorDiagnosticSeverity.Error, descriptor.Severity);
+            Assert.Equal("Hello, World!", descriptor.GetMessageFormat());
+        }
+
+        [Fact]
+        public void RazorDiagnosticDescriptor_Equals()
+        {
+            // Arrange
+            var descriptor1 = new RazorDiagnosticDescriptor("RZ0001", () => "a!", RazorDiagnosticSeverity.Error);
+            var descriptor2 = new RazorDiagnosticDescriptor("RZ0001", () => "b!", RazorDiagnosticSeverity.Error);
+
+            // Act
+            var result = descriptor1.Equals(descriptor2);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void RazorDiagnosticDescriptor_NotEquals()
+        {
+            // Arrange
+            var descriptor1 = new RazorDiagnosticDescriptor("RZ0001", () => "a!", RazorDiagnosticSeverity.Error);
+            var descriptor2 = new RazorDiagnosticDescriptor("RZ0002", () => "b!", RazorDiagnosticSeverity.Error);
+
+            // Act
+            var result = descriptor1.Equals(descriptor2);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void RazorDiagnosticDescriptor_HashCodesEqual()
+        {
+            // Arrange
+            var descriptor1 = new RazorDiagnosticDescriptor("RZ0001", () => "a!", RazorDiagnosticSeverity.Error);
+            var descriptor2 = new RazorDiagnosticDescriptor("RZ0001", () => "b!", RazorDiagnosticSeverity.Error);
+
+            // Act
+            var result = descriptor1.GetHashCode() == descriptor2.GetHashCode();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void RazorDiagnosticDescriptor_HashCodesNotEqual()
+        {
+            // Arrange
+            var descriptor1 = new RazorDiagnosticDescriptor("RZ0001", () => "a!", RazorDiagnosticSeverity.Error);
+            var descriptor2 = new RazorDiagnosticDescriptor("RZ0002", () => "b!", RazorDiagnosticSeverity.Error);
+
+            // Act
+            var result = descriptor1.GetHashCode() == descriptor2.GetHashCode();
+
+            // Assert
+            Assert.False(result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticTest.cs
new file mode 100644
index 0000000000..0ad45e8ed5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorDiagnosticTest.cs
@@ -0,0 +1,45 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorDiagnosticTest
+    {
+        [Fact]
+        public void Create_WithDescriptor_CreatesDefaultRazorDiagnostic()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0001", () => "a", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            // Act
+            var diagnostic = RazorDiagnostic.Create(descriptor, span);
+
+            // Assert
+            var defaultDiagnostic = Assert.IsType<DefaultRazorDiagnostic>(diagnostic);
+            Assert.Equal("RZ0001", defaultDiagnostic.Id);
+            Assert.Equal(RazorDiagnosticSeverity.Error, defaultDiagnostic.Severity);
+            Assert.Equal(span, diagnostic.Span);
+        }
+
+        [Fact]
+        public void Create_WithDescriptor_AndArgs_CreatesDefaultRazorDiagnostic()
+        {
+            // Arrange
+            var descriptor = new RazorDiagnosticDescriptor("RZ0001", () => "a", RazorDiagnosticSeverity.Error);
+            var span = new SourceSpan("test.cs", 15, 1, 8, 5);
+
+            // Act
+            var diagnostic = RazorDiagnostic.Create(descriptor, span, "Hello", "World");
+
+            // Assert
+            var defaultDiagnostic = Assert.IsType<DefaultRazorDiagnostic>(diagnostic);
+            Assert.Equal("RZ0001", defaultDiagnostic.Id);
+            Assert.Equal(RazorDiagnosticSeverity.Error, defaultDiagnostic.Severity);
+            Assert.Equal(span, diagnostic.Span);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineBuilderExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..3df637cadc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineBuilderExtensionsTest.cs
@@ -0,0 +1,98 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    public class RazorEngineBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddDirective_ExistingFeature_UsesFeature()
+        {
+            // Arrange
+            var expected = new DefaultRazorDirectiveFeature();
+            var engine = RazorEngine.CreateEmpty(b =>
+            {
+                b.Features.Add(expected);
+
+                // Act
+                b.AddDirective(DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine));
+            });
+
+            // Assert
+            var actual = Assert.Single(engine.Features.OfType<IRazorDirectiveFeature>());
+            Assert.Same(expected, actual);
+
+            var directive = Assert.Single(actual.Directives);
+            Assert.Equal("test", directive.Directive);
+        }
+
+        [Fact]
+        public void AddDirective_NoFeature_CreatesFeature()
+        {
+            // Arrange
+            var engine = RazorEngine.CreateEmpty(b =>
+            {
+                // Act
+                b.AddDirective(DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine));
+            });
+
+            // Assert
+            var actual = Assert.Single(engine.Features.OfType<IRazorDirectiveFeature>());
+            Assert.IsType<DefaultRazorDirectiveFeature>(actual);
+
+            var directive = Assert.Single(actual.Directives);
+            Assert.Equal("test", directive.Directive);
+        }
+
+        [Fact]
+        public void AddTargetExtensions_ExistingFeature_UsesFeature()
+        {
+            // Arrange
+            var extension = new MyTargetExtension();
+
+            var expected = new DefaultRazorTargetExtensionFeature();
+            var engine = RazorEngine.CreateEmpty(b =>
+            {
+                b.Features.Add(expected);
+
+                // Act
+                b.AddTargetExtension(extension);
+            });
+
+            // Assert
+            var actual = Assert.Single(engine.Features.OfType<IRazorTargetExtensionFeature>());
+            Assert.Same(expected, actual);
+
+            Assert.Same(extension, Assert.Single(actual.TargetExtensions));
+        }
+
+        [Fact]
+        public void AddTargetExtensions_NoFeature_CreatesFeature()
+        {
+            // Arrange
+            var extension = new MyTargetExtension();
+
+            var engine = RazorEngine.CreateEmpty(b =>
+            {
+                // Act
+                b.AddTargetExtension(extension);
+            });
+
+            // Assert
+            var actual = Assert.Single(engine.Features.OfType<IRazorTargetExtensionFeature>());
+            Assert.IsType<DefaultRazorTargetExtensionFeature>(actual);
+
+            Assert.Same(extension, Assert.Single(actual.TargetExtensions));
+        }
+
+        private class MyTargetExtension : ICodeTargetExtension
+        {
+        }
+    }
+#pragma warning restore CS0618 // Type or member is obsolete
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineTest.cs
new file mode 100644
index 0000000000..225f73f342
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorEngineTest.cs
@@ -0,0 +1,233 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    public class RazorEngineTest
+    {
+        [Fact]
+        public void Create_NoArg_CreatesDefaultRuntimeEngine()
+        {
+            // Arrange
+            // Act
+            var engine = RazorEngine.Create();
+
+            // Assert
+            Assert.IsType<DefaultRazorEngine>(engine);
+            AssertDefaultRuntimeFeatures(engine.Features);
+            AssertDefaultRuntimePhases(engine.Phases);
+            AssertDefaultRuntimeTargetExtensions(engine);
+        }
+
+        [Fact]
+        public void CreateDesignTime_NoArg_CreatesDefaultDesignTimeEngine()
+        {
+            // Arrange
+            // Act
+            var engine = RazorEngine.CreateDesignTime();
+
+            // Assert
+            Assert.IsType<DefaultRazorEngine>(engine);
+            AssertDefaultDesignTimeFeatures(engine.Features);
+            AssertDefaultDesignTimePhases(engine.Phases);
+            AssertDefaultDesignTimeTargetExtensions(engine);
+        }
+
+        [Fact]
+        public void Create_Null_CreatesDefaultRuntimeEngine()
+        {
+            // Arrange
+            // Act
+            var engine = RazorEngine.Create(configure: null);
+
+            // Assert
+            Assert.IsType<DefaultRazorEngine>(engine);
+            AssertDefaultRuntimeFeatures(engine.Features);
+            AssertDefaultRuntimePhases(engine.Phases);
+            AssertDefaultRuntimeTargetExtensions(engine);
+        }
+
+        [Fact]
+        public void CreateDesignTime_Null_CreatesDefaultDesignTimeEngine()
+        {
+            // Arrange
+            // Act
+            var engine = RazorEngine.CreateDesignTime(configure: null);
+
+            // Assert
+            Assert.IsType<DefaultRazorEngine>(engine);
+            AssertDefaultDesignTimeFeatures(engine.Features);
+            AssertDefaultDesignTimePhases(engine.Phases);
+            AssertDefaultDesignTimeTargetExtensions(engine);
+        }
+
+        [Fact]
+        public void Create_Lambda_AddsFeaturesAndPhases()
+        {
+            // Arrange
+            IRazorEngineFeature[] features = null;
+            IRazorEnginePhase[] phases = null;
+
+            // Act
+            var engine = RazorEngine.Create(builder =>
+            {
+                builder.Features.Clear();
+                builder.Phases.Clear();
+
+                builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+                builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+
+                builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+                builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+
+                features = builder.Features.ToArray();
+                phases = builder.Phases.ToArray();
+            });
+
+            // Assert
+            Assert.Collection(
+                engine.Features,
+                f => Assert.Same(features[0], f),
+                f => Assert.Same(features[1], f));
+
+            Assert.Collection(
+                engine.Phases,
+                p => Assert.Same(phases[0], p),
+                p => Assert.Same(phases[1], p));
+        }
+
+        [Fact]
+        public void CreateDesignTime_Lambda_AddsFeaturesAndPhases()
+        {
+            // Arrange
+            IRazorEngineFeature[] features = null;
+            IRazorEnginePhase[] phases = null;
+
+            // Act
+            var engine = RazorEngine.CreateDesignTime(builder =>
+            {
+                builder.Features.Clear();
+                builder.Phases.Clear();
+
+                builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+                builder.Features.Add(Mock.Of<IRazorEngineFeature>());
+
+                builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+                builder.Phases.Add(Mock.Of<IRazorEnginePhase>());
+
+                features = builder.Features.ToArray();
+                phases = builder.Phases.ToArray();
+            });
+
+            // Assert
+            Assert.Collection(
+                engine.Features,
+                f => Assert.Same(features[0], f),
+                f => Assert.Same(features[1], f));
+
+            Assert.Collection(
+                engine.Phases,
+                p => Assert.Same(phases[0], p),
+                p => Assert.Same(phases[1], p));
+        }
+
+        private static void AssertDefaultRuntimeTargetExtensions(RazorEngine engine)
+        {
+            var feature = engine.Features.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            Assert.NotNull(feature);
+
+            Assert.Collection(
+                feature.TargetExtensions,
+                extension => Assert.IsType<MetadataAttributeTargetExtension>(extension),
+                extension => Assert.IsType<DefaultTagHelperTargetExtension>(extension),
+                extension => Assert.IsType<PreallocatedAttributeTargetExtension>(extension));
+        }
+
+        private static void AssertDefaultRuntimeFeatures(IEnumerable<IRazorEngineFeature> features)
+        {
+            Assert.Collection(
+                features,
+                feature => Assert.IsType<DefaultRazorDirectiveFeature>(feature),
+                feature => Assert.IsType<DefaultRazorTargetExtensionFeature>(feature),
+                feature => Assert.IsType<DefaultMetadataIdentifierFeature>(feature),
+                feature => Assert.IsType<DefaultDirectiveSyntaxTreePass>(feature),
+                feature => Assert.IsType<HtmlNodeOptimizationPass>(feature),
+                feature => Assert.IsType<DefaultDocumentClassifierPass>(feature),
+                feature => Assert.IsType<MetadataAttributePass>(feature),
+                feature => Assert.IsType<DirectiveRemovalOptimizationPass>(feature),
+                feature => Assert.IsType<DefaultTagHelperOptimizationPass>(feature),
+                feature => Assert.IsType<DefaultDocumentClassifierPassFeature>(feature),
+                feature => Assert.IsType<DefaultRazorParserOptionsFeature>(feature),
+                feature => Assert.IsType<DefaultRazorCodeGenerationOptionsFeature>(feature),
+                feature => Assert.IsType<PreallocatedTagHelperAttributeOptimizationPass>(feature));
+        }
+
+        private static void AssertDefaultRuntimePhases(IReadOnlyList<IRazorEnginePhase> phases)
+        {
+            Assert.Collection(
+                phases,
+                phase => Assert.IsType<DefaultRazorParsingPhase>(phase),
+                phase => Assert.IsType<DefaultRazorSyntaxTreePhase>(phase),
+                phase => Assert.IsType<DefaultRazorTagHelperBinderPhase>(phase),
+                phase => Assert.IsType<DefaultRazorIntermediateNodeLoweringPhase>(phase),
+                phase => Assert.IsType<DefaultRazorDocumentClassifierPhase>(phase),
+                phase => Assert.IsType<DefaultRazorDirectiveClassifierPhase>(phase),
+                phase => Assert.IsType<DefaultRazorOptimizationPhase>(phase),
+                phase => Assert.IsType<DefaultRazorCSharpLoweringPhase>(phase));
+        }
+
+        private static void AssertDefaultDesignTimeTargetExtensions(RazorEngine engine)
+        {
+            var feature = engine.Features.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            Assert.NotNull(feature);
+
+            Assert.Collection(
+                feature.TargetExtensions,
+                extension => Assert.IsType<MetadataAttributeTargetExtension>(extension),
+                extension => Assert.IsType<DefaultTagHelperTargetExtension>(extension),
+                extension => Assert.IsType<DesignTimeDirectiveTargetExtension>(extension));
+        }
+
+        private static void AssertDefaultDesignTimeFeatures(IEnumerable<IRazorEngineFeature> features)
+        {
+            Assert.Collection(
+                features,
+                feature => Assert.IsType<DefaultRazorDirectiveFeature>(feature),
+                feature => Assert.IsType<DefaultRazorTargetExtensionFeature>(feature),
+                feature => Assert.IsType<DefaultMetadataIdentifierFeature>(feature),
+                feature => Assert.IsType<DefaultDirectiveSyntaxTreePass>(feature),
+                feature => Assert.IsType<HtmlNodeOptimizationPass>(feature),
+                feature => Assert.IsType<DefaultDocumentClassifierPass>(feature),
+                feature => Assert.IsType<MetadataAttributePass>(feature),
+                feature => Assert.IsType<DirectiveRemovalOptimizationPass>(feature),
+                feature => Assert.IsType<DefaultTagHelperOptimizationPass>(feature),
+                feature => Assert.IsType<DefaultDocumentClassifierPassFeature>(feature),
+                feature => Assert.IsType<DefaultRazorParserOptionsFeature>(feature),
+                feature => Assert.IsType<DefaultRazorCodeGenerationOptionsFeature>(feature),
+                feature => Assert.IsType<SuppressChecksumOptionsFeature>(feature),
+                feature => Assert.IsType<DesignTimeDirectivePass>(feature));
+        }
+
+        private static void AssertDefaultDesignTimePhases(IReadOnlyList<IRazorEnginePhase> phases)
+        {
+            Assert.Collection(
+                phases,
+                phase => Assert.IsType<DefaultRazorParsingPhase>(phase),
+                phase => Assert.IsType<DefaultRazorSyntaxTreePhase>(phase),
+                phase => Assert.IsType<DefaultRazorTagHelperBinderPhase>(phase),
+                phase => Assert.IsType<DefaultRazorIntermediateNodeLoweringPhase>(phase),
+                phase => Assert.IsType<DefaultRazorDocumentClassifierPhase>(phase),
+                phase => Assert.IsType<DefaultRazorDirectiveClassifierPhase>(phase),
+                phase => Assert.IsType<DefaultRazorOptimizationPhase>(phase),
+                phase => Assert.IsType<DefaultRazorCSharpLoweringPhase>(phase));
+        }
+    }
+#pragma warning restore CS0618 // Type or member is obsolete
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorLanguageVersionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorLanguageVersionTest.cs
new file mode 100644
index 0000000000..5b09826ebf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorLanguageVersionTest.cs
@@ -0,0 +1,141 @@
+// 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.Linq;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorLanguageVersionTest
+    {
+        [Fact]
+        public void TryParseInvalid()
+        {
+            // Arrange
+            var value = "not-version";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var _);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void TryParse10()
+        {
+            // Arrange
+            var value = "1.0";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_1_0, version);
+        }
+
+        [Fact]
+        public void TryParse11()
+        {
+            // Arrange
+            var value = "1.1";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_1_1, version);
+        }
+
+        [Fact]
+        public void TryParse20()
+        {
+            // Arrange
+            var value = "2.0";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_2_0, version);
+        }
+
+        [Fact]
+        public void TryParse21()
+        {
+            // Arrange
+            var value = "2.1";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_2_1, version);
+        }
+
+        [Fact]
+        public void TryParse30()
+        {
+            // Arrange
+            var value = "3.0";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_3_0, version);
+        }
+
+        [Fact]
+        public void TryParseLatest()
+        {
+            // Arrange
+            var value = "Latest";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_3_0, version);
+        }
+
+        [Fact]
+        public void TryParseExperimental()
+        {
+            // Arrange
+            var value = "experimental";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Experimental, version);
+        }
+
+        [Fact]
+        public void LatestPointsToNewestVersion()
+        {
+            // Arrange
+            var v = RazorLanguageVersion.Parse("latest");
+            var versions = typeof(RazorLanguageVersion).GetFields(BindingFlags.Public | BindingFlags.Static)
+                .Where(f => f.Name.StartsWith("Version_"))
+                .Select(f => f.GetValue(obj: null))
+                .Cast<RazorLanguageVersion>();
+
+            // Act & Assert
+            Assert.NotEmpty(versions);
+            foreach (var version in versions)
+            {
+                Assert.True(version.CompareTo(v) <= 0, $"RazorLanguageVersion {version} has a higher version than RazorLanguageVersion.Latest");
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
new file mode 100644
index 0000000000..cfdb9f023d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorParserFeatureFlagsTest
+    {
+        [Fact]
+        public void Create_LatestVersion_AllowsMinimizedBooleanTagHelperAttributes()
+        {
+            // Arrange & Act
+            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_1);
+
+            // Assert
+            Assert.True(context.AllowMinimizedBooleanTagHelperAttributes);
+            Assert.True(context.AllowHtmlCommentsInTagHelpers);
+        }
+
+        [Fact]
+        public void Create_OlderVersion_DoesNotAllowMinimizedBooleanTagHelperAttributes()
+        {
+            // Arrange & Act
+            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_1_1);
+
+            // Assert
+            Assert.False(context.AllowMinimizedBooleanTagHelperAttributes);
+            Assert.False(context.AllowHtmlCommentsInTagHelpers);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..f0a57128c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs
@@ -0,0 +1,103 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorProjectEngineBuilderExtensionsTest
+    {
+        [Fact]
+        public void SetImportFeature_SetsTheImportFeature()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            var testFeature1 = Mock.Of<IImportProjectFeature>();
+            var testFeature2 = Mock.Of<IImportProjectFeature>();
+            builder.Features.Add(testFeature1);
+            builder.Features.Add(testFeature2);
+            var newFeature = Mock.Of<IImportProjectFeature>();
+
+            // Act
+            builder.SetImportFeature(newFeature);
+
+            // Assert
+            var feature = Assert.Single(builder.Features);
+            Assert.Same(newFeature, feature);
+        }
+
+        [Fact]
+        public void AddTargetExtension_CreatesAndAddsToTargetExtensionFeatureIfItDoesNotExist()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            var expectedExtension = Mock.Of<ICodeTargetExtension>();
+
+            // Act
+            builder.AddTargetExtension(expectedExtension);
+
+            // Assert
+            var feature = Assert.Single(builder.Features);
+            var codeTargetExtensionFeature = Assert.IsAssignableFrom<IRazorTargetExtensionFeature>(feature);
+            var extensions = Assert.Single(codeTargetExtensionFeature.TargetExtensions);
+            Assert.Same(expectedExtension, extensions);
+        }
+
+        [Fact]
+        public void AddTargetExtension_UsesExistingFeatureIfExistsAndAddsTo()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            var codeTargetExtensionFeature = new DefaultRazorTargetExtensionFeature();
+            builder.Features.Add(codeTargetExtensionFeature);
+            var expectedExtension = Mock.Of<ICodeTargetExtension>();
+
+            // Act
+            builder.AddTargetExtension(expectedExtension);
+
+            // Assert
+            var feature = Assert.Single(builder.Features);
+            Assert.Same(codeTargetExtensionFeature, feature);
+            var extensions = Assert.Single(codeTargetExtensionFeature.TargetExtensions);
+            Assert.Same(expectedExtension, extensions);
+        }
+
+        [Fact]
+        public void AddDirective_CreatesAndAddsToDirectiveFeatureIfItDoesNotExist()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            var expectedDirective = Mock.Of<DirectiveDescriptor>();
+
+            // Act
+            builder.AddDirective(expectedDirective);
+
+            // Assert
+            var feature = Assert.Single(builder.Features);
+            var directiveFeature = Assert.IsAssignableFrom<IRazorDirectiveFeature>(feature);
+            var directive = Assert.Single(directiveFeature.Directives);
+            Assert.Same(expectedDirective, directive);
+        }
+
+        [Fact]
+        public void AddDirective_UsesExistingFeatureIfExistsAndAddsTo()
+        {
+            // Arrange
+            var builder = new DefaultRazorProjectEngineBuilder(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+            var directiveFeature = new DefaultRazorDirectiveFeature();
+            builder.Features.Add(directiveFeature);
+            var expecteDirective = Mock.Of<DirectiveDescriptor>();
+
+            // Act
+            builder.AddDirective(expecteDirective);
+
+            // Assert
+            var feature = Assert.Single(builder.Features);
+            Assert.Same(directiveFeature, feature);
+            var directive = Assert.Single(directiveFeature.Directives);
+            Assert.Same(expecteDirective, directive);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineFeatureBaseTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineFeatureBaseTest.cs
new file mode 100644
index 0000000000..8344e787c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineFeatureBaseTest.cs
@@ -0,0 +1,34 @@
+// 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 Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorProjectEngineFeatureBaseTest
+    {
+        [Fact]
+        public void ProjectEngineSetter_CallsOnInitialized()
+        {
+            // Arrange
+            var testFeature = new TestFeature();
+
+            // Act
+            testFeature.ProjectEngine = Mock.Of<RazorProjectEngine>();
+
+            // Assert
+            Assert.Equal(1, testFeature.InitializationCount);
+        }
+
+        private class TestFeature : RazorProjectEngineFeatureBase
+        {
+            public int InitializationCount { get; private set; }
+
+            protected override void OnInitialized()
+            {
+                InitializationCount++;
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
new file mode 100644
index 0000000000..65600a9b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -0,0 +1,109 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test
+{
+    public class RazorProjectEngineTest
+    {
+        [Fact]
+        public void CreateDesignTime_Lambda_AddsFeaturesAndPhases()
+        {
+            // Arrange
+
+            // Act
+            var engine = RazorProjectEngine.Create(RazorConfiguration.Default, Mock.Of<RazorProjectFileSystem>());
+
+            // Assert
+            AssertDefaultPhases(engine);
+            AssertDefaultFeatures(engine);
+            AssertDefaultDirectives(engine);
+            AssertDefaultTargetExtensions(engine);
+        }
+
+        private static void AssertDefaultPhases(RazorProjectEngine engine)
+        {
+            Assert.Collection(
+                engine.Phases,
+                phase => Assert.IsType<DefaultRazorParsingPhase>(phase),
+                phase => Assert.IsType<DefaultRazorSyntaxTreePhase>(phase),
+                phase => Assert.IsType<DefaultRazorTagHelperBinderPhase>(phase),
+                phase => Assert.IsType<DefaultRazorIntermediateNodeLoweringPhase>(phase),
+                phase => Assert.IsType<DefaultRazorDocumentClassifierPhase>(phase),
+                phase => Assert.IsType<DefaultRazorDirectiveClassifierPhase>(phase),
+                phase => Assert.IsType<DefaultRazorOptimizationPhase>(phase),
+                phase => Assert.IsType<DefaultRazorCSharpLoweringPhase>(phase));
+        }
+
+        private static void AssertDefaultFeatures(RazorProjectEngine engine)
+        {
+            var features = engine.EngineFeatures.OrderBy(f => f.GetType().Name).ToArray();
+            Assert.Collection(
+                features,
+                feature => Assert.IsType<ComponentBindLoweringPass>(feature),
+                feature => Assert.IsType<ComponentChildContentDiagnosticPass>(feature),
+                feature => Assert.IsType<ComponentComplexAttributeContentPass>(feature),
+                feature => Assert.IsType<ComponentDocumentClassifierPass>(feature),
+                feature => Assert.IsType<ComponentEventHandlerLoweringPass>(feature),
+                feature => Assert.IsType<ComponentGenericTypePass>(feature),
+                feature => Assert.IsType<ComponentInjectDirectivePass>(feature),
+                feature => Assert.IsType<ComponentLayoutDirectivePass>(feature),
+                feature => Assert.IsType<ComponentLoweringPass>(feature),
+                feature => Assert.IsType<ComponentMarkupBlockPass>(feature),
+                feature => Assert.IsType<ComponentMarkupEncodingPass>(feature),
+                feature => Assert.IsType<ComponentPageDirectivePass>(feature),
+                feature => Assert.IsType<ComponentReferenceCaptureLoweringPass>(feature),
+                feature => Assert.IsType<ComponentScriptTagPass>(feature),
+                feature => Assert.IsType<ComponentTemplateDiagnosticPass>(feature),
+                feature => Assert.IsType<ComponentWhitespacePass>(feature),
+                feature => Assert.IsType<DefaultDirectiveSyntaxTreePass>(feature),
+                feature => Assert.IsType<DefaultDocumentClassifierPass>(feature),
+                feature => Assert.IsType<DefaultDocumentClassifierPassFeature>(feature),
+                feature => Assert.IsType<DefaultMetadataIdentifierFeature>(feature),
+                feature => Assert.IsType<DefaultRazorCodeGenerationOptionsFeature>(feature),
+                feature => Assert.IsType<DefaultRazorDirectiveFeature>(feature),
+                feature => Assert.IsType<DefaultRazorParserOptionsFeature>(feature),
+                feature => Assert.IsType<DefaultRazorTargetExtensionFeature>(feature),
+                feature => Assert.IsType<DefaultTagHelperOptimizationPass>(feature),
+                feature => Assert.IsType<DesignTimeDirectivePass>(feature),
+                feature => Assert.IsType<DirectiveRemovalOptimizationPass>(feature),
+                feature => Assert.IsType<EliminateMethodBodyPass>(feature),
+                feature => Assert.IsType<FunctionsDirectivePass>(feature),
+                feature => Assert.IsType<HtmlNodeOptimizationPass>(feature),
+                feature => Assert.IsType<ImplementsDirectivePass>(feature),
+                feature => Assert.IsType<InheritsDirectivePass>(feature),
+                feature => Assert.IsType<MetadataAttributePass>(feature), 
+                feature => Assert.IsType<PreallocatedTagHelperAttributeOptimizationPass>(feature));
+        }
+
+        private static void AssertDefaultDirectives(RazorProjectEngine engine)
+        {
+            var feature = engine.EngineFeatures.OfType<IRazorDirectiveFeature>().FirstOrDefault();
+            Assert.NotNull(feature);
+            Assert.Collection(
+                feature.Directives,
+                directive => Assert.Same(FunctionsDirective.Directive, directive),
+                directive => Assert.Same(ImplementsDirective.Directive, directive),
+                directive => Assert.Same(InheritsDirective.Directive, directive));
+        }
+
+        private static void AssertDefaultTargetExtensions(RazorProjectEngine engine)
+        {
+            var feature = engine.EngineFeatures.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+            Assert.NotNull(feature);
+
+            var extensions = feature.TargetExtensions.OrderBy(f => f.GetType().Name).ToArray();
+            Assert.Collection(
+                extensions,
+                extension => Assert.IsType<DefaultTagHelperTargetExtension>(extension),
+                extension => Assert.IsType<DesignTimeDirectiveTargetExtension>(extension),
+                extension => Assert.IsType<MetadataAttributeTargetExtension>(extension),
+                extension => Assert.IsType<PreallocatedAttributeTargetExtension>(extension));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectItemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectItemTest.cs
new file mode 100644
index 0000000000..e1e95b2cc0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectItemTest.cs
@@ -0,0 +1,104 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorProjectItemTest
+    {
+        [Fact]
+        public void CombinedPath_ReturnsPathIfBasePathIsEmpty()
+        {
+            // Arrange
+            var emptyBasePath = "/";
+            var path = "/foo/bar.cshtml";
+            var projectItem = new TestRazorProjectItem(path, basePath: emptyBasePath);
+
+            // Act
+            var combinedPath = projectItem.CombinedPath;
+
+            // Assert
+            Assert.Equal(path, combinedPath);
+        }
+
+        [Theory]
+        [InlineData("/root", "/root/foo/bar.cshtml")]
+        [InlineData("root/subdir", "root/subdir/foo/bar.cshtml")]
+        public void CombinedPath_ConcatsPaths(string basePath, string expected)
+        {
+            // Arrange
+            var path = "/foo/bar.cshtml";
+            var projectItem = new TestRazorProjectItem(path, basePath: basePath);
+
+            // Act
+            var combinedPath = projectItem.CombinedPath;
+
+            // Assert
+            Assert.Equal(expected, combinedPath);
+        }
+
+        [Theory]
+        [InlineData("/Home/Index")]
+        [InlineData("EditUser")]
+        public void Extension_ReturnsNullIfFileDoesNotHaveExtension(string path)
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem(path, basePath: "/views");
+
+            // Act
+            var extension = projectItem.Extension;
+
+            // Assert
+            Assert.Null(extension);
+        }
+
+        [Theory]
+        [InlineData("/Home/Index.cshtml", ".cshtml")]
+        [InlineData("/Home/Index.en-gb.cshtml", ".cshtml")]
+        [InlineData("EditUser.razor", ".razor")]
+        public void Extension_ReturnsFileExtension(string path, string expected)
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem(path, basePath: "/views");
+
+            // Act
+            var extension = projectItem.Extension;
+
+            // Assert
+            Assert.Equal(expected, extension);
+        }
+
+        [Theory]
+        [InlineData("Home/Index.cshtml", "Index.cshtml")]
+        [InlineData("/Accounts/Customers/Manage-en-us.razor", "Manage-en-us.razor")]
+        public void FileName_ReturnsFileNameWithExtension(string path, string expected)
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem(path, basePath: "/");
+
+            // Act
+            var fileName = projectItem.FileName;
+
+            // Assert
+            Assert.Equal(expected, fileName);
+        }
+
+        [Theory]
+        [InlineData("Home/Index", "Home/Index")]
+        [InlineData("Home/Index.cshtml", "Home/Index")]
+        [InlineData("/Accounts/Customers/Manage.en-us.razor", "/Accounts/Customers/Manage.en-us")]
+        [InlineData("/Accounts/Customers/Manage-en-us.razor", "/Accounts/Customers/Manage-en-us")]
+        public void PathWithoutExtension_ExcludesExtension(string path, string expected)
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem(path, basePath: "/");
+
+            // Act
+            var fileName = projectItem.FilePathWithoutExtension;
+
+            // Assert
+            Assert.Equal(expected, fileName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectTest.cs
new file mode 100644
index 0000000000..7831db3521
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectTest.cs
@@ -0,0 +1,333 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorProjectTest
+    {
+        [Fact]
+        public void NormalizeAndEnsureValidPath_DoesNotModifyPath()
+        {
+            // Arrange
+            var project = new TestRazorProject();
+
+            // Act
+            var path = project.NormalizeAndEnsureValidPath("/Views/Home/Index.cshtml");
+
+            // Assert
+            Assert.Equal("/Views/Home/Index.cshtml", path);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void NormalizeAndEnsureValidPath_ThrowsIfPathIsNullOrEmpty(string path)
+        {
+            // Arrange
+            var project = new TestRazorProject();
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmptyString(() => project.NormalizeAndEnsureValidPath(path), "path");
+        }
+
+        [Theory]
+        [InlineData("foo")]
+        [InlineData("~/foo")]
+        [InlineData("\\foo")]
+        public void NormalizeAndEnsureValidPath_ThrowsIfPathDoesNotStartWithForwardSlash(string path)
+        {
+            // Arrange
+            var project = new TestRazorProject();
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => project.NormalizeAndEnsureValidPath(path),
+                "path",
+                "Path must begin with a forward slash '/'.");
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_ReturnsEmptySequenceIfPathIsAtRoot()
+        {
+            // Arrange
+            var project = new TestRazorProject();
+
+            // Act
+            var result = project.FindHierarchicalItems("/", "File.cshtml");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Theory]
+        [InlineData("_ViewStart.cshtml")]
+        [InlineData("_ViewImports.cshtml")]
+        public void FindHierarchicalItems_ReturnsItemsForPath(string fileName)
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem($"/{fileName}"),
+                CreateProjectItem($"/Views/{fileName}"),
+                CreateProjectItem($"/Views/Home/{fileName}")
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(path, $"{fileName}");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item => Assert.Equal($"/Views/Home/{fileName}", item.FilePath),
+                item => Assert.Equal($"/Views/{fileName}", item.FilePath),
+                item => Assert.Equal($"/{fileName}", item.FilePath));
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_ReturnsItemsForPathAtRoot()
+        {
+            // Arrange
+            var path = "/Index.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/File.cshtml")
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(path, "File.cshtml");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item => Assert.Equal("/File.cshtml", item.FilePath));
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_DoesNotIncludePassedInItem()
+        {
+            // Arrange
+            var path = "/Areas/MyArea/Views/Home/File.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/Areas/MyArea/Views/Home/File.cshtml"),
+                CreateProjectItem("/Areas/MyArea/Views/File.cshtml"),
+                CreateProjectItem("/Areas/MyArea/File.cshtml"),
+                CreateProjectItem("/Areas/File.cshtml"),
+                CreateProjectItem("/File.cshtml"),
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(path, "File.cshtml");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item => Assert.Equal("/Areas/MyArea/Views/File.cshtml", item.FilePath),
+                item => Assert.Equal("/Areas/MyArea/File.cshtml", item.FilePath),
+                item => Assert.Equal("/Areas/File.cshtml", item.FilePath),
+                item => Assert.Equal("/File.cshtml", item.FilePath));
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_ReturnsEmptySequenceIfPassedInItemWithFileNameIsAtRoot()
+        {
+            // Arrange
+            var path = "/File.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                 CreateProjectItem("/File.cshtml")
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(path, "File.cshtml");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_IncludesNonExistentFiles()
+        {
+            // Arrange
+            var path = "/Areas/MyArea/Views/Home/Test.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/Areas/MyArea/File.cshtml"),
+                CreateProjectItem("/File.cshtml")
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(path, "File.cshtml");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/Home/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/File.cshtml", item.FilePath);
+                    Assert.True(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/File.cshtml", item.FilePath);
+                    Assert.True(item.Exists);
+                });
+        }
+
+        [Theory]
+        [InlineData("/Areas")]
+        [InlineData("/Areas/")]
+        public void FindHierarchicalItems_WithBasePath(string basePath)
+        {
+            // Arrange
+            var path = "/Areas/MyArea/Views/Home/Test.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/Areas/MyArea/File.cshtml"),
+                CreateProjectItem("/File.cshtml")
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(basePath, path, "File.cshtml");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/Home/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/File.cshtml", item.FilePath);
+                    Assert.True(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                });
+        }
+
+        [Theory]
+        [InlineData("/Areas/MyArea/Views")]
+        [InlineData("/Areas/MyArea/Views/")]
+        public void FindHierarchicalItems_WithNestedBasePath(string basePath)
+        {
+            // Arrange
+            var path = "/Areas/MyArea/Views/Home/Test.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/Areas/MyArea/File.cshtml"),
+                CreateProjectItem("/File.cshtml")
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(basePath, path, "File.cshtml");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/Home/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                },
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                });
+        }
+
+        [Theory]
+        [InlineData("/Areas/MyArea/Views/Home")]
+        [InlineData("/Areas/MyArea/Views/Home/")]
+        public void FindHierarchicalItems_WithFileAtBasePath(string basePath)
+        {
+            // Arrange
+            var path = "/Areas/MyArea/Views/Home/Test.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/Areas/MyArea/File.cshtml"),
+                CreateProjectItem("/File.cshtml"),
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(basePath, path, "File.cshtml");
+
+            // Assert
+            Assert.Collection(
+                result,
+                item =>
+                {
+                    Assert.Equal("/Areas/MyArea/Views/Home/File.cshtml", item.FilePath);
+                    Assert.False(item.Exists);
+                });
+        }
+
+        [Fact]
+        public void FindHierarchicalItems_ReturnsEmptySequenceIfPathIsNotASubPathOfBasePath()
+        {
+            // Arrange
+            var basePath = "/Pages";
+            var path = "/Areas/MyArea/Views/Home/Test.cshtml";
+            var items = new List<RazorProjectItem>
+            {
+                CreateProjectItem("/Areas/MyArea/File.cshtml"),
+                CreateProjectItem("/File.cshtml"),
+            };
+            var project = new TestRazorProject(items);
+
+            // Act
+            var result = project.FindHierarchicalItems(basePath, path, "File.cshtml");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        private RazorProjectItem CreateProjectItem(string path)
+        {
+            var projectItem = new Mock<RazorProjectItem>();
+            projectItem.SetupGet(f => f.FilePath).Returns(path);
+            projectItem.SetupGet(f => f.Exists).Returns(true);
+            return projectItem.Object;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSourceDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSourceDocumentTest.cs
new file mode 100644
index 0000000000..9c05f2851c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSourceDocumentTest.cs
@@ -0,0 +1,219 @@
+// 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.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorSourceDocumentTest
+    {
+        [Fact]
+        public void ReadFrom()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent();
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(content, "file.cshtml");
+
+            // Assert
+            Assert.IsType<StreamSourceDocument>(document);
+            Assert.Equal("file.cshtml", document.FilePath);
+            Assert.Same(Encoding.UTF8, document.Encoding);
+        }
+
+        [Fact]
+        public void ReadFrom_WithEncoding()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent(encoding: Encoding.UTF32);
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(content, "file.cshtml", Encoding.UTF32);
+
+            // Assert
+            Assert.Equal("file.cshtml", document.FilePath);
+            Assert.Same(Encoding.UTF32, Assert.IsType<StreamSourceDocument>(document).Encoding);
+        }
+
+        [Fact]
+        public void ReadFrom_WithProperties()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent(encoding: Encoding.UTF32);
+            var properties = new RazorSourceDocumentProperties("c:\\myapp\\filePath.cshtml", "filePath.cshtml");
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(content, Encoding.UTF32, properties);
+
+            // Assert
+            Assert.Equal("c:\\myapp\\filePath.cshtml", document.FilePath);
+            Assert.Equal("filePath.cshtml", document.RelativePath);
+            Assert.Same(Encoding.UTF32, Assert.IsType<StreamSourceDocument>(document).Encoding);
+        }
+
+        [Fact]
+        public void ReadFrom_EmptyStream_WithEncoding()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent(content: string.Empty, encoding: Encoding.UTF32);
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(content, "file.cshtml", Encoding.UTF32);
+
+            // Assert
+            Assert.Equal("file.cshtml", document.FilePath);
+            Assert.Same(Encoding.UTF32, Assert.IsType<StreamSourceDocument>(document).Encoding);
+        }
+
+        [Fact]
+        public void ReadFrom_ProjectItem()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("filePath.cshtml", "c:\\myapp\\filePath.cshtml", "filePath.cshtml", "c:\\myapp\\");
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(projectItem);
+
+            // Assert
+            Assert.Equal("c:\\myapp\\filePath.cshtml", document.FilePath);
+            Assert.Equal("filePath.cshtml", document.RelativePath);
+            Assert.Equal(projectItem.Content, ReadContent(document));
+        }
+
+        [Fact]
+        public void ReadFrom_ProjectItem_NoRelativePath()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("filePath.cshtml", "c:\\myapp\\filePath.cshtml", basePath: "c:\\myapp\\");
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(projectItem);
+
+            // Assert
+            Assert.Equal("c:\\myapp\\filePath.cshtml", document.FilePath);
+            Assert.Equal("filePath.cshtml", document.RelativePath);
+            Assert.Equal(projectItem.Content, ReadContent(document));
+        }
+
+        [Fact]
+        public void ReadFrom_ProjectItem_FallbackToRelativePath()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("filePath.cshtml", relativePhysicalPath: "filePath.cshtml", basePath: "c:\\myapp\\");
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(projectItem);
+
+            // Assert
+            Assert.Equal("filePath.cshtml", document.FilePath);
+            Assert.Equal("filePath.cshtml", document.RelativePath);
+            Assert.Equal(projectItem.Content, ReadContent(document));
+        }
+
+        [Fact]
+        public void ReadFrom_ProjectItem_FallbackToFileName()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("filePath.cshtml", basePath: "c:\\myapp\\");
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(projectItem);
+
+            // Assert
+            Assert.Equal("filePath.cshtml", document.FilePath);
+            Assert.Equal("filePath.cshtml", document.RelativePath);
+            Assert.Equal(projectItem.Content, ReadContent(document));
+        }
+
+        [Fact]
+        public void Create_WithoutEncoding()
+        {
+            // Arrange
+            var content = "Hello world";
+            var fileName = "some-file-name";
+
+            // Act
+            var document = RazorSourceDocument.Create(content, fileName);
+
+            // Assert
+            Assert.Equal(fileName, document.FilePath);
+            Assert.Equal(content, ReadContent(document));
+            Assert.Same(Encoding.UTF8, document.Encoding);
+        }
+
+        [Fact]
+        public void Create_WithEncoding()
+        {
+            // Arrange
+            var content = "Hello world";
+            var fileName = "some-file-name";
+            var encoding = Encoding.UTF32;
+
+            // Act
+            var document = RazorSourceDocument.Create(content, fileName, encoding);
+
+            // Assert
+            Assert.Equal(fileName, document.FilePath);
+            Assert.Equal(content, ReadContent(document));
+            Assert.Same(encoding, document.Encoding);
+        }
+
+        [Fact]
+        public void Create_WithProperties()
+        {
+            // Arrange
+            var content = "Hello world";
+            var properties = new RazorSourceDocumentProperties("c:\\myapp\\filePath.cshtml", "filePath.cshtml");
+
+            // Act
+            var document = RazorSourceDocument.Create(content, Encoding.UTF32, properties);
+
+            // Assert
+            Assert.Equal("c:\\myapp\\filePath.cshtml", document.FilePath);
+            Assert.Equal("filePath.cshtml", document.RelativePath);
+            Assert.Equal(content, ReadContent(document));
+            Assert.Same(Encoding.UTF32, Assert.IsType<StringSourceDocument>(document).Encoding);
+        }
+
+        [Fact]
+        public void ReadFrom_WithProjectItem_FallbackToFilePath_WhenRelativePhysicalPathIsNull()
+        {
+            // Arrange
+            var filePath = "filePath.cshtml";
+            var projectItem = new TestRazorProjectItem(filePath, relativePhysicalPath: null);
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(projectItem);
+
+            // Assert
+            Assert.Equal(filePath, document.FilePath);
+            Assert.Equal(filePath, document.RelativePath);
+        }
+
+        [Fact]
+        public void ReadFrom_WithProjectItem_UsesRelativePhysicalPath()
+        {
+            // Arrange
+            var filePath = "filePath.cshtml";
+            var relativePhysicalPath = "relative-path.cshtml";
+            var projectItem = new TestRazorProjectItem(filePath, relativePhysicalPath: relativePhysicalPath);
+
+            // Act
+            var document = RazorSourceDocument.ReadFrom(projectItem);
+
+            // Assert
+            Assert.Equal(relativePhysicalPath, document.FilePath);
+            Assert.Equal(relativePhysicalPath, document.RelativePath);
+        }
+
+        private static string ReadContent(RazorSourceDocument razorSourceDocument)
+        {
+            var buffer = new char[razorSourceDocument.Length];
+            razorSourceDocument.CopyTo(0, buffer, 0, buffer.Length);
+
+            return new string(buffer);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSyntaxTreeTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSyntaxTreeTest.cs
new file mode 100644
index 0000000000..ed0bf3fb26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorSyntaxTreeTest.cs
@@ -0,0 +1,63 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Test
+{
+    public class RazorSyntaxTreeTest
+    {
+        [Fact]
+        public void Parse_CanParseEmptyDocument()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create(string.Empty);
+
+            // Act
+            var syntaxTree = RazorSyntaxTree.Parse(source);
+
+            // Assert
+            Assert.NotNull(syntaxTree);
+            Assert.Empty(syntaxTree.Diagnostics);
+        }
+
+        [Fact]
+        public void Parse_NodesReturnCorrectFilePath()
+        {
+            // Arrange
+            var filePath = "test.cshtml";
+            var source = TestRazorSourceDocument.Create("@if (true) { @if(false) { <div>@something.</div> } }", filePath: filePath);
+
+            // Act
+            var syntaxTree = RazorSyntaxTree.Parse(source);
+
+            // Assert
+            Assert.Empty(syntaxTree.Diagnostics);
+            Assert.NotNull(syntaxTree);
+
+            var children = syntaxTree.Root.DescendantNodes();
+            Assert.All(children, node => Assert.Equal(filePath, node.GetSourceLocation(source).FilePath));
+        }
+
+        [Fact]
+        public void Parse_UseDirectiveTokenizer_ParsesUntilFirstDirective()
+        {
+            // Arrange
+            var source = TestRazorSourceDocument.Create("\r\n  \r\n    @*SomeComment*@ \r\n  @tagHelperPrefix \"SomePrefix\"\r\n<html>\r\n@if (true) {\r\n @if(false) { <div>@something.</div> } \r\n}");
+            var options = RazorParserOptions.Create(builder => builder.ParseLeadingDirectives = true);
+
+            // Act
+            var syntaxTree = RazorSyntaxTree.Parse(source, options);
+
+            // Assert
+            var root = syntaxTree.Root;
+            Assert.NotNull(syntaxTree);
+            Assert.Equal(61, root.EndPosition);
+            Assert.Single(root.DescendantNodes().Where(n => n is RazorDirectiveBodySyntax body && body.Keyword.GetContent() == "tagHelperPrefix"));
+            Assert.Empty(root.DescendantNodes().Where(n => n is MarkupElementSyntax));
+            Assert.Empty(syntaxTree.Diagnostics);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceChangeTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceChangeTest.cs
new file mode 100644
index 0000000000..2d829be381
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceChangeTest.cs
@@ -0,0 +1,198 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class SourceChangeTest
+    {
+        [Fact]
+        public void SourceChange_ConstructorSetsDefaults_WhenNotProvided()
+        {
+            // Arrange & Act
+            var change = new SourceChange(15, 7, "Hello");
+
+            // Assert
+            Assert.Equal(15, change.Span.AbsoluteIndex);
+            Assert.Equal(-1, change.Span.CharacterIndex);
+            Assert.Null(change.Span.FilePath);
+            Assert.Equal(7, change.Span.Length);
+            Assert.Equal(-1, change.Span.LineIndex);
+            Assert.Equal("Hello", change.NewText);
+        }
+
+        [Fact]
+        public void IsDelete_IsTrue_WhenOldLengthIsPositive_AndNewLengthIsZero()
+        {
+            // Arrange & Act
+            var change = new SourceChange(3, 5, string.Empty);
+
+            // Assert
+            Assert.True(change.IsDelete);
+        }
+
+        [Fact]
+        public void IsInsert_IsTrue_WhenOldLengthIsZero_AndNewLengthIsPositive()
+        {
+            // Arrange & Act
+            var change = new SourceChange(3, 0, "Hello");
+
+            // Assert
+            Assert.True(change.IsInsert);
+        }
+
+        [Fact]
+        public void IsReplace_IsTrue_WhenOldLengthIsPositive_AndNewLengthIsPositive()
+        {
+            // Arrange & Act
+            var change = new SourceChange(3, 5, "Hello");
+
+            // Assert
+            Assert.True(change.IsReplace);
+        }
+
+        [Fact]
+        public void GetEditedContent_ForDelete_ReturnsNewContent()
+        {
+            // Arrange
+            var text = "Hello, World";
+
+            var change = new SourceChange(2, 2, string.Empty);
+
+            // Act
+            var result = change.GetEditedContent(text, 1);
+
+            // Act
+            Assert.Equal("Hlo, World", result);
+        }
+
+        [Fact]
+        public void GetEditedContent_ForInsert_ReturnsNewContent()
+        {
+            // Arrange
+            var text = "Hello, World";
+
+            var change = new SourceChange(2, 0, "heyo");
+
+            // Act
+            var result = change.GetEditedContent(text, 1);
+
+            // Act
+            Assert.Equal("Hheyoello, World", result);
+        }
+
+        [Fact]
+        public void GetEditedContent_ForReplace_ReturnsNewContent()
+        {
+            // Arrange
+            var text = "Hello, World";
+
+            var change = new SourceChange(2, 2, "heyo");
+
+            // Act
+            var result = change.GetEditedContent(text, 1);
+
+            // Act
+            Assert.Equal("Hheyolo, World", result);
+        }
+
+        [Fact]
+        public void GetEditedContent_SyntaxNode_ReturnsNewContent()
+        {
+            // Arrange
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
+
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed();
+
+            var change = new SourceChange(2, 2, "heyo");
+
+            // Act
+            var result = change.GetEditedContent(node);
+
+            // Act
+            Assert.Equal("Heheyoo, World", result);
+        }
+
+        [Fact]
+        public void GetOffSet_SpanIsOwner_ReturnsOffset()
+        {
+            // Arrange
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
+
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
+
+            var change = new SourceChange(15, 2, "heyo");
+
+            // Act
+            var result = change.GetOffset(node);
+
+            // Act
+            Assert.Equal(2, result);
+        }
+
+        [Fact]
+        public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException()
+        {
+            // Arrange
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
+
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
+
+            var change = new SourceChange(12, 2, "heyo");
+
+            var expected = $"The node '{node}' is not the owner of change '{change}'.";
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => { change.GetOffset(node); });
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public void GetOrigninalText_SpanIsOwner_ReturnsContent()
+        {
+            // Arrange
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
+
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
+
+            var change = new SourceChange(15, 2, "heyo");
+
+            // Act
+            var result = change.GetOriginalText(node);
+
+            // Act
+            Assert.Equal("ll", result);
+        }
+
+        [Fact]
+        public void GetOrigninalText_SpanIsOwner_ReturnsContent_ZeroLengthSpan()
+        {
+            // Arrange
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
+
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
+
+            var change = new SourceChange(15, 0, "heyo");
+
+            // Act
+            var result = change.GetOriginalText(node);
+
+            // Act
+            Assert.Equal(string.Empty, result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceLocationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceLocationTest.cs
new file mode 100644
index 0000000000..c2401c56b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceLocationTest.cs
@@ -0,0 +1,110 @@
+// 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 Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class SourceLocationTest
+    {
+        [Fact]
+        public void ConstructorWithLineAndCharacterIndexSetsAssociatedProperties()
+        {
+            // Act
+            var loc = new SourceLocation(0, 42, 24);
+
+            // Assert
+            Assert.Null(loc.FilePath);
+            Assert.Equal(0, loc.AbsoluteIndex);
+            Assert.Equal(42, loc.LineIndex);
+            Assert.Equal(24, loc.CharacterIndex);
+        }
+
+        [Fact]
+        public void Constructor_SetsFilePathAndIndexes()
+        {
+            // Arrange
+            var filePath = "some-file-path";
+            var absoluteIndex = 133;
+            var lineIndex = 23;
+            var characterIndex = 12;
+
+            // Act
+            var sourceLocation = new SourceLocation(filePath, absoluteIndex, lineIndex, characterIndex);
+
+            // Assert
+            Assert.Equal(filePath, sourceLocation.FilePath);
+            Assert.Equal(absoluteIndex, sourceLocation.AbsoluteIndex);
+            Assert.Equal(lineIndex, sourceLocation.LineIndex);
+            Assert.Equal(characterIndex, sourceLocation.CharacterIndex);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("some-file")]
+        public void GetHashCode_ReturnsSameValue_WhenEqual(string path)
+        {
+            // Arrange
+            var sourceLocationA = new SourceLocation(path, 10, 3, 4);
+            var sourceLocationB = new SourceLocation(path, 10, 3, 4);
+            var sourceLocationC = new SourceLocation(path, 10, 45, 8754);
+
+            // Act
+            var hashCodeA = sourceLocationA.GetHashCode();
+            var hashCodeB = sourceLocationB.GetHashCode();
+            var hashCodeC = sourceLocationC.GetHashCode();
+
+            // Assert
+            Assert.Equal(hashCodeA, hashCodeB);
+            Assert.Equal(hashCodeA, hashCodeC);
+        }
+
+        [Fact]
+        public void Equals_ReturnsFalse_FilePathsNullAndAbsoluteIndicesMatch()
+        {
+            // Arrange
+            var sourceLocationA = new SourceLocation(10, 3, 4);
+            var sourceLocationB = new SourceLocation(10, 45, 8754);
+
+            // Act
+            var result = sourceLocationA.Equals(sourceLocationB);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void Equals_ReturnsFalse_IfFilePathIsDifferent()
+        {
+            // Arrange
+            var sourceLocationA = new SourceLocation(10, 3, 4);
+            var sourceLocationB = new SourceLocation("different-file", 10, 3, 4);
+
+            // Act
+            var result = sourceLocationA.Equals(sourceLocationB);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("some-file")]
+        public void Equals_ReturnsTrue_IfFilePathAndIndexesAreSame(string path)
+        {
+            // Arrange
+            var sourceLocationA = new SourceLocation(path, 10, 3, 4);
+            var sourceLocationB = new SourceLocation(path, 10, 3, 4);
+            var sourceLocationC = new SourceLocation("different-path", 10, 3, 4);
+
+            // Act
+            var result1 = sourceLocationA.Equals(sourceLocationB);
+            var result2 = sourceLocationA.Equals(sourceLocationC);
+
+            // Assert
+            Assert.True(result1);
+            Assert.False(result2);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceSpanTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceSpanTest.cs
new file mode 100644
index 0000000000..d59253c08a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/SourceSpanTest.cs
@@ -0,0 +1,117 @@
+// 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 Xunit;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class SourceSpanTest
+    {
+        [Fact]
+        public void GeneratedCodeMappingsAreEqualIfDataIsEqual()
+        {
+            // Arrange
+            var left = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 8));
+
+            var right = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 8));
+
+            // Assert
+            Assert.True(left.Equals(right));
+            Assert.True(right.Equals(left));
+            Assert.True(Equals(left, right));
+        }
+
+        [Fact]
+        public void GeneratedCodeMappingsAreNotEqualIfCodeLengthIsNotEqual()
+        {
+            // Arrange
+            var left = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 8));
+
+            var right = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 5),
+                new SourceSpan(new SourceLocation(5, 6, 7), 9));
+
+            // Assert
+            AssertNotEqual(left, right);
+        }
+
+        [Fact]
+        public void GeneratedCodeMappingsAreNotEqualIfStartGeneratedColumnIsNotEqual()
+        {
+            // Arrange
+            var left = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 8));
+
+            var right = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 8), 8));
+
+            // Assert
+            AssertNotEqual(left, right);
+        }
+
+        [Fact]
+        public void GeneratedCodeMappingsAreNotEqualIfStartColumnIsNotEqual()
+        {
+            // Arrange
+            var left = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 8), 8));
+
+            var right = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 8));
+
+            // Assert
+            AssertNotEqual(left, right);
+        }
+
+        [Fact]
+        public void GeneratedCodeMappingsAreNotEqualIfStartLineIsNotEqual()
+        {
+            // Arrange
+            var left = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 5, 7), 8));
+
+            var right = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 1, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 8));
+
+            // Assert
+            AssertNotEqual(left, right);
+        }
+
+        [Fact]
+        public void GeneratedCodeMappingsAreNotEqualIfAbsoluteIndexIsNotEqual()
+        {
+            // Arrange
+            var left = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(4, 6, 7), 8));
+
+            var right = new SourceMapping(
+                new SourceSpan(new SourceLocation(1, 2, 3), 4),
+                new SourceSpan(new SourceLocation(5, 6, 7), 9));
+
+            // Assert
+            AssertNotEqual(left, right);
+        }
+
+        private void AssertNotEqual(SourceMapping left, SourceMapping right)
+        {
+            Assert.False(left == right);
+            Assert.False(left.Equals(right));
+            Assert.False(right.Equals(left));
+            Assert.False(Equals(left, right));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/StreamSourceDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/StreamSourceDocumentTest.cs
new file mode 100644
index 0000000000..f377450320
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/StreamSourceDocumentTest.cs
@@ -0,0 +1,200 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class StreamSourceDocumentTest
+    {
+        [Fact]
+        public void FilePath()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF8);
+
+            // Act
+            var document = new StreamSourceDocument(stream, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: "file.cshtml", relativePath: null));
+
+            // Assert
+            Assert.Equal("file.cshtml", document.FilePath);
+        }
+
+        [Fact]
+        public void FilePath_Null()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF8);
+
+            // Act
+            var document = new StreamSourceDocument(stream, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: null));
+
+            // Assert
+            Assert.Null(document.FilePath);
+        }
+
+        [Fact]
+        public void RelativePath()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF8);
+
+            // Act
+            var document = new StreamSourceDocument(stream, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: "file.cshtml"));
+
+            // Assert
+            Assert.Equal("file.cshtml", document.RelativePath);
+        }
+
+        [Fact]
+        public void RelativePath_Null()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF8);
+
+            // Act
+            var document = new StreamSourceDocument(stream, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: null));
+
+            // Assert
+            Assert.Null(document.RelativePath);
+        }
+
+        [Fact]
+        public void GetChecksum_ReturnsCopiedChecksum()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF8);
+            var document = new StreamSourceDocument(stream, null, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var firstChecksum = document.GetChecksum();
+            var secondChecksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(firstChecksum, secondChecksum);
+            Assert.NotSame(firstChecksum, secondChecksum);
+        }
+
+        [Fact]
+        public void GetChecksum_ComputesCorrectChecksum_UTF8()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF8);
+            var document = new StreamSourceDocument(stream, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+            var expectedChecksum = new byte[] { 70, 180, 84, 105, 70, 79, 152, 31, 71, 157, 46, 159, 50, 83, 1, 243, 222, 48, 90, 18 };
+
+            // Act
+            var checksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(expectedChecksum, checksum);
+        }
+
+        [Fact]
+        public void GetChecksum_ComputesCorrectChecksum_UTF32AutoDetect()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var stream = CreateBOMStream(content, Encoding.UTF32);
+            var document = new StreamSourceDocument(stream, null, RazorSourceDocumentProperties.Default);
+            var expectedChecksum = new byte[] { 159, 154, 109, 89, 250, 163, 165, 108, 2, 112, 34, 4, 247, 161, 82, 168, 77, 213, 107, 71 };
+
+            // Act
+            var checksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(expectedChecksum, checksum);
+        }
+
+        [Fact]
+        public void ConstructedWithoutEncoding_DetectsEncoding()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent(encoding: Encoding.UTF32);
+
+            // Act
+            var document = new StreamSourceDocument(content, null, RazorSourceDocumentProperties.Default);
+
+            // Assert
+            Assert.IsType<StreamSourceDocument>(document);
+            Assert.Equal(Encoding.UTF32, document.Encoding);
+        }
+
+        [Fact]
+        public void ConstructedWithoutEncoding_EmptyStream_DetectsEncoding()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent(content: string.Empty, encoding: Encoding.UTF32);
+
+            // Act
+            var document = new StreamSourceDocument(content, null, RazorSourceDocumentProperties.Default);
+
+            // Assert
+            Assert.IsType<StreamSourceDocument>(document);
+            Assert.Equal(Encoding.UTF32, document.Encoding);
+        }
+
+        [Fact]
+        public void FailsOnMismatchedEncoding()
+        {
+            // Arrange
+            var content = TestRazorSourceDocument.CreateStreamContent(encoding: Encoding.UTF32);
+            var expectedMessage = Resources.FormatMismatchedContentEncoding(Encoding.UTF8.EncodingName, Encoding.UTF32.EncodingName);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => new StreamSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default));
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Theory]
+        [InlineData(100000)]
+        [InlineData(RazorSourceDocument.LargeObjectHeapLimitInChars)]
+        [InlineData(RazorSourceDocument.LargeObjectHeapLimitInChars + 2)]
+        [InlineData(RazorSourceDocument.LargeObjectHeapLimitInChars * 2 - 1)]
+        [InlineData(RazorSourceDocument.LargeObjectHeapLimitInChars * 2)]
+        public void DetectsSizeOfStreamForLargeContent(int contentLength)
+        {
+            // Arrange
+            var content = new string('a', contentLength);
+            var stream = TestRazorSourceDocument.CreateStreamContent(content);
+
+            // Act
+            var document = new StreamSourceDocument(stream, null, RazorSourceDocumentProperties.Default);
+
+            // Assert
+            var streamDocument = Assert.IsType<StreamSourceDocument>(document);
+            Assert.IsType<LargeTextSourceDocument>(streamDocument._innerSourceDocument);
+            Assert.Same(Encoding.UTF8, document.Encoding);
+            Assert.Equal(content, ReadContent(document));
+        }
+
+        private static MemoryStream CreateBOMStream(string content, Encoding encoding)
+        {
+            var preamble = encoding.GetPreamble();
+            var contentBytes = encoding.GetBytes(content);
+            var buffer = new byte[preamble.Length + contentBytes.Length];
+            preamble.CopyTo(buffer, 0);
+            contentBytes.CopyTo(buffer, preamble.Length);
+            var stream = new MemoryStream(buffer);
+            return stream;
+        }
+
+        private static string ReadContent(RazorSourceDocument razorSourceDocument)
+        {
+            var buffer = new char[razorSourceDocument.Length];
+            razorSourceDocument.CopyTo(0, buffer, 0, buffer.Length);
+
+            return new string(buffer);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/StringSourceDocumentTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/StringSourceDocumentTest.cs
new file mode 100644
index 0000000000..8306d2bf80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/StringSourceDocumentTest.cs
@@ -0,0 +1,516 @@
+// 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.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class StringSourceDocumentTest
+    {
+        [Fact]
+        public void GetChecksum_ReturnsCopiedChecksum()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var firstChecksum = document.GetChecksum();
+            var secondChecksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(firstChecksum, secondChecksum);
+            Assert.NotSame(firstChecksum, secondChecksum);
+        }
+
+        [Fact]
+        public void GetChecksum_ComputesCorrectChecksum_UTF8()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+            var expectedChecksum = new byte[] { 46, 247, 189, 230, 8, 206, 84, 4, 233, 125, 95, 4, 47, 149, 248, 159, 28, 35, 40, 113 };
+
+            // Act
+            var checksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(expectedChecksum, checksum);
+        }
+
+        [Fact]
+        public void GetChecksum_ComputesCorrectChecksum_UTF32()
+        {
+            // Arrange
+            var content = "Hello World!";
+            var document = new StringSourceDocument(content, Encoding.UTF32, RazorSourceDocumentProperties.Default);
+            var expectedChecksum = new byte[] { 8, 149, 159, 15, 242, 255, 115, 227, 219, 78, 61, 53, 127, 239, 77, 239, 215, 140, 248, 44 };
+
+            // Act
+            var checksum = document.GetChecksum();
+
+            // Assert
+            Assert.Equal(expectedChecksum, checksum);
+        }
+
+        [Fact]
+        public void Indexer_ProvidesCharacterAccessToContent()
+        {
+            // Arrange
+            var expectedContent = "Hello, World!";
+            var indexerBuffer = new char[expectedContent.Length];
+            var document = new StringSourceDocument(expectedContent, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            for (var i = 0; i < document.Length; i++)
+            {
+                indexerBuffer[i] = document[i];
+            }
+
+            // Assert
+            var output = new string(indexerBuffer);
+            Assert.Equal(expectedContent, output);
+        }
+
+        [Fact]
+        public void Length()
+        {
+            // Arrange
+            var expectedContent = "Hello, World!";
+            var document = new StringSourceDocument(expectedContent, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act & Assert
+            Assert.Equal(expectedContent.Length, document.Length);
+        }
+
+        [Fact]
+        public void FilePath()
+        {
+            // Arrange
+            var content = "Hello, World!";
+
+            // Act
+            var document = new StringSourceDocument(content, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: "file.cshtml", relativePath: null));
+
+            // Assert
+            Assert.Equal("file.cshtml", document.FilePath);
+        }
+
+        [Fact]
+        public void FilePath_Null()
+        {
+            // Arrange
+            var content = "Hello, World!";
+
+            // Act
+            var document = new StringSourceDocument(content, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: null));
+
+            // Assert
+            Assert.Null(document.FilePath);
+        }
+
+        [Fact]
+        public void RelativePath()
+        {
+            // Arrange
+            var content = "Hello, World!";
+
+            // Act
+            var document = new StringSourceDocument(content, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: "file.cshtml"));
+
+            // Assert
+            Assert.Equal("file.cshtml", document.RelativePath);
+        }
+
+        [Fact]
+        public void RelativePath_Null()
+        {
+            // Arrange
+            var content = "Hello, World!";
+
+            // Act
+            var document = new StringSourceDocument(content, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: null, relativePath: null));
+
+            // Assert
+            Assert.Null(document.RelativePath);
+        }
+
+        [Fact]
+        public void CopyTo_PartialCopyFromStart()
+        {
+            // Arrange
+            var content = "Hello, World!";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+            var expectedContent = "Hello";
+            var charBuffer = new char[expectedContent.Length];
+
+            // Act
+            document.CopyTo(0, charBuffer, 0, expectedContent.Length);
+
+            // Assert
+            var copiedContent = new string(charBuffer);
+            Assert.Equal(expectedContent, copiedContent);
+        }
+
+        [Fact]
+        public void CopyTo_PartialCopyDestinationOffset()
+        {
+            // Arrange
+            var content = "Hello, World!";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+            var expectedContent = "$Hello";
+            var charBuffer = new char[expectedContent.Length];
+            charBuffer[0] = '$';
+
+            // Act
+            document.CopyTo(0, charBuffer, 1, "Hello".Length);
+
+            // Assert
+            var copiedContent = new string(charBuffer);
+            Assert.Equal(expectedContent, copiedContent);
+        }
+
+        [Fact]
+        public void CopyTo_PartialCopySourceOffset()
+        {
+            // Arrange
+            var content = "Hello, World!";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+            var expectedContent = "World";
+            var charBuffer = new char[expectedContent.Length];
+
+            // Act
+            document.CopyTo(7, charBuffer, 0, expectedContent.Length);
+
+            // Assert
+            var copiedContent = new string(charBuffer);
+            Assert.Equal(expectedContent, copiedContent);
+        }
+
+        [Fact]
+        public void CopyTo_CanCopyMultipleTimes()
+        {
+            // Arrange
+            var content = "Hi";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act & Assert
+            //
+            // (we should be able to do this twice to prove that the underlying data isn't disposed)
+            for (var i = 0; i < 2; i++)
+            {
+                var charBuffer = new char[2];
+                document.CopyTo(0, charBuffer, 0, 2);
+                var copiedContent = new string(charBuffer);
+                Assert.Equal("Hi", copiedContent);
+            }
+        }
+
+        [Fact]
+        public void Lines_Count_EmptyDocument()
+        {
+            // Arrange
+            var content = string.Empty;
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.Count;
+
+            // Assert
+            Assert.Equal(1, actual);
+        }
+
+        [Fact]
+        public void Lines_GetLineLength_EmptyDocument()
+        {
+            // Arrange
+            var content = string.Empty;
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLineLength(0);
+
+            // Assert
+            Assert.Equal(0, actual);
+        }
+
+        [Fact]
+        public void Lines_GetLineLength_TrailingNewlineDoesNotStartNewLine()
+        {
+            // Arrange
+            var content = "hello\n";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLineLength(0);
+
+            // Assert
+            Assert.Equal(6, actual);
+        }
+
+        [Fact]
+        public void Lines_GetLineLength_TrailingNewlineDoesNotStartNewLine_CRLF()
+        {
+            // Arrange
+            var content = "hello\r\n";
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLineLength(0);
+
+            // Assert
+            Assert.Equal(7, actual);
+        }
+
+        [Fact]
+        public void Lines_Simple_Document()
+        {
+            // Arrange
+            var content = new StringBuilder()
+                .Append("The quick brown").Append('\n')
+                .Append("fox").Append("\r\n")
+                .Append("jumps over the lazy dog.")
+                .ToString();
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 16, 5, 24 }, actual);
+        }
+
+        [Fact]
+        public void Lines_CRLF_OnlyCountsAsASingleNewLine()
+        {
+            // Arrange
+            var content = "Hello\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 7, 6 }, actual);
+        }
+
+        [Fact]
+        public void Lines_CR_IsNewLine()
+        {
+            // Arrange
+            var content = "Hello\rWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 6, 6 }, actual);
+        }
+
+        // CR handling is stateful in the parser, making sure we properly reset the state.
+        [Fact]
+        public void Lines_CR_IsNewLine_MultipleCRs()
+        {
+            // Arrange
+            var content = "Hello\rBig\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 6, 5, 6 }, actual);
+        }
+
+        [Fact]
+        public void Lines_LF_IsNewLine()
+        {
+            // Arrange
+            var content = "Hello\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 6, 6 }, actual);
+        }
+
+        [Fact]
+        public void Lines_Unicode0085_IsNewLine()
+        {
+            // Arrange
+            var content = "Hello\u0085World!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 6, 6 }, actual);
+        }
+
+        [Fact]
+        public void Lines_Unicode2028_IsNewLine()
+        {
+            // Arrange
+            var content = "Hello\u2028World!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 6, 6 }, actual);
+        }
+
+        [Fact]
+        public void Lines_Unicode2029_IsNewLine()
+        {
+            // Arrange
+            var content = "Hello\u2029World!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = GetAllSourceMappings(document);
+
+            // Assert
+            Assert.Equal(new int[] { 6, 6 }, actual);
+        }
+
+        [Fact]
+        public void Lines_GetLocation_IncludesAbsoluteIndexAndDocument()
+        {
+            // Arrange
+            var content = "Hello, World!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: "Hi.cshtml", relativePath: null));
+
+            // Act
+            var actual = document.Lines.GetLocation(1);
+
+            // Assert
+            Assert.Equal("Hi.cshtml", actual.FilePath);
+            Assert.Equal(1, actual.AbsoluteIndex);
+        }
+
+        [Fact]
+        public void Lines_GetLocation_PrefersRelativePath()
+        {
+            // Arrange
+            var content = "Hello, World!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, new RazorSourceDocumentProperties(filePath: "Hi.cshtml", relativePath: "Bye.cshtml"));
+
+            // Act
+            var actual = document.Lines.GetLocation(1);
+
+            // Assert
+            Assert.Equal("Bye.cshtml", actual.FilePath);
+            Assert.Equal(1, actual.AbsoluteIndex);
+        }
+
+        // Beginnings of lines are special because the BinarySearch in the implementation
+        // will succeed. It's a different code path.
+        [Fact]
+        public void Lines_GetLocation_FirstCharacter()
+        {
+            // Arrange
+            var content = "Hello\nBig\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLocation(0);
+
+            // Assert
+            Assert.Equal(0, actual.LineIndex);
+            Assert.Equal(0, actual.CharacterIndex);
+        }
+
+        [Fact]
+        public void Lines_GetLocation_EndOfFirstLine()
+        {
+            // Arrange
+            var content = "Hello\nBig\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLocation(5);
+
+            // Assert
+            Assert.Equal(0, actual.LineIndex);
+            Assert.Equal(5, actual.CharacterIndex);
+        }
+
+        [Fact]
+        public void Lines_GetLocation_InteriorLine()
+        {
+            // Arrange
+            var content = "Hello\nBig\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLocation(7);
+
+            // Assert
+            Assert.Equal(1, actual.LineIndex);
+            Assert.Equal(1, actual.CharacterIndex);
+        }
+
+        [Fact]
+        public void Lines_GetLocation_StartOfLastLine()
+        {
+            // Arrange
+            var content = "Hello\nBig\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLocation(11);
+
+            // Assert
+            Assert.Equal(2, actual.LineIndex);
+            Assert.Equal(0, actual.CharacterIndex);
+        }
+
+        [Fact]
+        public void Lines_GetLocation_EndOfLastLine()
+        {
+            // Arrange
+            var content = "Hello\nBig\r\nWorld!";
+
+            var document = new StringSourceDocument(content, Encoding.UTF8, RazorSourceDocumentProperties.Default);
+
+            // Act
+            var actual = document.Lines.GetLocation(16);
+
+            // Assert
+            Assert.Equal(2, actual.LineIndex);
+            Assert.Equal(5, actual.CharacterIndex);
+        }
+
+        private static int[] GetAllSourceMappings(RazorSourceDocument source)
+        {
+            var lines = new int[source.Lines.Count];
+            for (var i = 0; i < lines.Length; i++)
+            {
+                lines[i] = source.Lines.GetLineLength(i);
+            }
+
+            return lines;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs
new file mode 100644
index 0000000000..73b40802bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs
@@ -0,0 +1,602 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TagHelperBinderTest
+    {
+        [Fact]
+        public void GetBinding_ReturnsBindingWithInformation()
+        {
+            // Arrange
+            var divTagHelper = TagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build();
+            var expectedDescriptors = new[] { divTagHelper };
+            var expectedAttributes = new[]
+            {
+                new KeyValuePair<string, string>("class", "something")
+            };
+            var tagHelperBinder = new TagHelperBinder("th:", expectedDescriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "th:div",
+                attributes: expectedAttributes,
+                parentTagName: "body",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Equal(expectedDescriptors, bindingResult.Descriptors, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal("th:div", bindingResult.TagName);
+            Assert.Equal("body", bindingResult.ParentTagName);
+            Assert.Equal(expectedAttributes, bindingResult.Attributes);
+            Assert.Equal("th:", bindingResult.TagHelperPrefix);
+            Assert.Equal(divTagHelper.TagMatchingRules, bindingResult.Mappings[divTagHelper], TagMatchingRuleDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData RequiredParentData
+        {
+            get
+            {
+                var strongPDivParent = TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("strong")
+                        .RequireParentTag("p"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("strong")
+                        .RequireParentTag("div"))
+                    .Build();
+                var catchAllPParent = TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("*")
+                        .RequireParentTag("p"))
+                    .Build();
+
+                return new TheoryData<
+                    string, // tagName
+                    string, // parentTagName
+                    IEnumerable<TagHelperDescriptor>, // availableDescriptors
+                    IEnumerable<TagHelperDescriptor>> // expectedDescriptors
+                {
+                    {
+                        "strong",
+                        "p",
+                        new[] { strongPDivParent },
+                        new[] { strongPDivParent }
+                    },
+                    {
+                        "strong",
+                        "div",
+                        new[] { strongPDivParent, catchAllPParent },
+                        new[] { strongPDivParent }
+                    },
+                    {
+                        "strong",
+                        "p",
+                        new[] { strongPDivParent, catchAllPParent },
+                        new[] { strongPDivParent, catchAllPParent }
+                    },
+                    {
+                        "custom",
+                        "p",
+                        new[] { strongPDivParent, catchAllPParent },
+                        new[] { catchAllPParent }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RequiredParentData))]
+        public void GetBinding_ReturnsBindingResultWithDescriptorsParentTags(
+            string tagName,
+            string parentTagName,
+            object availableDescriptors,
+            object expectedDescriptors)
+        {
+            // Arrange
+            var tagHelperBinder = new TagHelperBinder(null, (IEnumerable<TagHelperDescriptor>)availableDescriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName,
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: parentTagName,
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Equal((IEnumerable<TagHelperDescriptor>)expectedDescriptors, bindingResult.Descriptors, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        public static TheoryData RequiredAttributeData
+        {
+            get
+            {
+                var divDescriptor = TagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("div")
+                        .RequireAttributeDescriptor(attribute => attribute.Name("style")))
+                    .Build();
+                var inputDescriptor = TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireAttributeDescriptor(attribute => attribute.Name("class"))
+                        .RequireAttributeDescriptor(attribute => attribute.Name("style")))
+                    .Build();
+                var inputWildcardPrefixDescriptor = TagHelperDescriptorBuilder.Create("InputWildCardAttribute", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName("input")
+                        .RequireAttributeDescriptor(attribute =>
+                            attribute
+                            .Name("nodashprefix")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)))
+                    .Build();
+                var catchAllDescriptor = TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
+                        .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                    .Build();
+                var catchAllDescriptor2 = TagHelperDescriptorBuilder.Create("CatchAllTagHelper2", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
+                        .RequireAttributeDescriptor(attribute => attribute.Name("custom"))
+                        .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                    .Build();
+                var catchAllWildcardPrefixDescriptor = TagHelperDescriptorBuilder.Create("CatchAllWildCardAttribute", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                        .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
+                        .RequireAttributeDescriptor(attribute =>
+                            attribute
+                            .Name("prefix-")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)))
+                    .Build();
+                var defaultAvailableDescriptors =
+                    new[] { divDescriptor, inputDescriptor, catchAllDescriptor, catchAllDescriptor2 };
+                var defaultWildcardDescriptors =
+                    new[] { inputWildcardPrefixDescriptor, catchAllWildcardPrefixDescriptor };
+                Func<string, KeyValuePair<string, string>> kvp =
+                    (name) => new KeyValuePair<string, string>(name, "test value");
+
+                return new TheoryData<
+                    string, // tagName
+                    IReadOnlyList<KeyValuePair<string, string>>, // providedAttributes
+                    IEnumerable<TagHelperDescriptor>, // availableDescriptors
+                    IEnumerable<TagHelperDescriptor>> // expectedDescriptors
+                {
+                    {
+                        "div",
+                        new[] { kvp("custom") },
+                        defaultAvailableDescriptors,
+                        null
+                    },
+                    { "div", new[] { kvp("style") }, defaultAvailableDescriptors, new[] { divDescriptor } },
+                    { "div", new[] { kvp("class") }, defaultAvailableDescriptors, new[] { catchAllDescriptor } },
+                    {
+                        "div",
+                        new[] { kvp("class"), kvp("style") },
+                        defaultAvailableDescriptors,
+                        new[] { divDescriptor, catchAllDescriptor }
+                    },
+                    {
+                        "div",
+                        new[] { kvp("class"), kvp("style"), kvp("custom") },
+                        defaultAvailableDescriptors,
+                        new[] { divDescriptor, catchAllDescriptor, catchAllDescriptor2 }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("class"), kvp("style") },
+                        defaultAvailableDescriptors,
+                        new[] { inputDescriptor, catchAllDescriptor }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("nodashprefixA") },
+                        defaultWildcardDescriptors,
+                        new[] { inputWildcardPrefixDescriptor }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("nodashprefix-ABC-DEF"), kvp("random") },
+                        defaultWildcardDescriptors,
+                        new[] { inputWildcardPrefixDescriptor }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("prefixABCnodashprefix") },
+                        defaultWildcardDescriptors,
+                        null
+                    },
+                    {
+                        "input",
+                        new[] { kvp("prefix-") },
+                        defaultWildcardDescriptors,
+                        null
+                    },
+                    {
+                        "input",
+                        new[] { kvp("nodashprefix") },
+                        defaultWildcardDescriptors,
+                        null
+                    },
+                    {
+                        "input",
+                        new[] { kvp("prefix-A") },
+                        defaultWildcardDescriptors,
+                        new[] { catchAllWildcardPrefixDescriptor }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("prefix-ABC-DEF"), kvp("random") },
+                        defaultWildcardDescriptors,
+                        new[] { catchAllWildcardPrefixDescriptor }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("prefix-abc"), kvp("nodashprefix-def") },
+                        defaultWildcardDescriptors,
+                        new[] { inputWildcardPrefixDescriptor, catchAllWildcardPrefixDescriptor }
+                    },
+                    {
+                        "input",
+                        new[] { kvp("class"), kvp("prefix-abc"), kvp("onclick"), kvp("nodashprefix-def"), kvp("style") },
+                        defaultWildcardDescriptors,
+                        new[] { inputWildcardPrefixDescriptor, catchAllWildcardPrefixDescriptor }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RequiredAttributeData))]
+        public void GetBinding_ReturnsBindingResultDescriptorsWithRequiredAttributes(
+            string tagName,
+            IReadOnlyList<KeyValuePair<string, string>> providedAttributes,
+            object availableDescriptors,
+            object expectedDescriptors)
+        {
+            // Arrange
+            var tagHelperBinder = new TagHelperBinder(null, (IReadOnlyList<TagHelperDescriptor>)availableDescriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(tagName, providedAttributes, parentTagName: "p", parentIsTagHelper: false);
+
+            // Assert
+            Assert.Equal((IEnumerable<TagHelperDescriptor>)expectedDescriptors, bindingResult?.Descriptors, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void GetBinding_ReturnsNullBindingResultPrefixAsTagName()
+        {
+            // Arrange
+            var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName))
+                .Build();
+            var descriptors = new[] { catchAllDescriptor };
+            var tagHelperBinder = new TagHelperBinder("th", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "th",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Null(bindingResult);
+        }
+
+        [Fact]
+        public void GetBinding_ReturnsBindingResultCatchAllDescriptorsForPrefixedTags()
+        {
+            // Arrange
+            var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName))
+                .Build();
+            var descriptors = new[] { catchAllDescriptor };
+            var tagHelperBinder = new TagHelperBinder("th:", descriptors);
+
+            // Act
+            var bindingResultDiv = tagHelperBinder.GetBinding(
+                tagName: "th:div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+            var bindingResultSpan = tagHelperBinder.GetBinding(
+                tagName: "th:span",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            var descriptor = Assert.Single(bindingResultDiv.Descriptors);
+            Assert.Same(catchAllDescriptor, descriptor);
+            descriptor = Assert.Single(bindingResultSpan.Descriptors);
+            Assert.Same(catchAllDescriptor, descriptor);
+        }
+
+        [Fact]
+        public void GetBinding_ReturnsBindingResultDescriptorsForPrefixedTags()
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build();
+            var descriptors = new[] { divDescriptor };
+            var tagHelperBinder = new TagHelperBinder("th:", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "th:div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            var descriptor = Assert.Single(bindingResult.Descriptors);
+            Assert.Same(divDescriptor, descriptor);
+        }
+
+        [Theory]
+        [InlineData("*")]
+        [InlineData("div")]
+        public void GetBinding_ReturnsNullForUnprefixedTags(string tagName)
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName(tagName))
+                .Build();
+            var descriptors = new[] { divDescriptor };
+            var tagHelperBinder = new TagHelperBinder("th:", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Null(bindingResult);
+        }
+
+        [Fact]
+        public void GetDescriptors_ReturnsNothingForUnregisteredTags()
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build();
+            var spanDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("span"))
+                .Build();
+            var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor };
+            var tagHelperBinder = new TagHelperBinder(null, descriptors);
+
+            // Act
+            var tagHelperBinding = tagHelperBinder.GetBinding(
+                tagName: "foo",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Null(tagHelperBinding);
+        }
+
+        [Fact]
+        public void GetDescriptors_ReturnsCatchAllsWithEveryTagName()
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build();
+            var spanDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("span"))
+                .Build();
+            var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo3", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName))
+                .Build();
+            var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor, catchAllDescriptor };
+            var tagHelperBinder = new TagHelperBinder(null, descriptors);
+
+            // Act
+            var divBinding = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+            var spanBinding = tagHelperBinder.GetBinding(
+                tagName: "span",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            // For divs
+            Assert.Equal(2, divBinding.Descriptors.Count());
+            Assert.Contains(divDescriptor, divBinding.Descriptors);
+            Assert.Contains(catchAllDescriptor, divBinding.Descriptors);
+
+            // For spans
+            Assert.Equal(2, spanBinding.Descriptors.Count());
+            Assert.Contains(spanDescriptor, spanBinding.Descriptors);
+            Assert.Contains(catchAllDescriptor, spanBinding.Descriptors);
+        }
+
+        [Fact]
+        public void GetDescriptors_DuplicateDescriptorsAreNotPartOfTagHelperDescriptorPool()
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build();
+            var descriptors = new TagHelperDescriptor[] { divDescriptor, divDescriptor };
+            var tagHelperBinder = new TagHelperBinder(null, descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            var descriptor = Assert.Single(bindingResult.Descriptors);
+            Assert.Same(divDescriptor, descriptor);
+        }
+
+        [Fact]
+        public void GetBinding_DescriptorWithMultipleRules_CorrectlySelectsMatchingRules()
+        {
+            // Arrange
+            var multiRuleDescriptor = TagHelperDescriptorBuilder.Create("foo", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule
+                    .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
+                    .RequireParentTag("body"))
+                .TagMatchingRuleDescriptor(rule => rule
+                    .RequireTagName("div"))
+                .TagMatchingRuleDescriptor(rule => rule
+                    .RequireTagName("span"))
+                .Build();
+            var descriptors = new TagHelperDescriptor[] { multiRuleDescriptor };
+            var tagHelperBinder = new TagHelperBinder(null, descriptors);
+
+            // Act
+            var binding = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            var boundDescriptor = Assert.Single(binding.Descriptors);
+            Assert.Same(multiRuleDescriptor, boundDescriptor);
+            var boundRules = binding.Mappings[boundDescriptor];
+            var boundRule = Assert.Single(boundRules);
+            Assert.Equal("div", boundRule.TagName);
+        }
+
+        [Fact]
+        public void GetBinding_PrefixedParent_ReturnsBinding()
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div").RequireParentTag("p"))
+                .Build();
+            var pDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                .Build();
+            var descriptors = new[] { divDescriptor, pDescriptor };
+            var tagHelperBinder = new TagHelperBinder("th:", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "th:div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "th:p",
+                parentIsTagHelper: true);
+
+            // Assert
+            var boundDescriptor = Assert.Single(bindingResult.Descriptors);
+            Assert.Same(divDescriptor, boundDescriptor);
+            var boundRules = bindingResult.Mappings[boundDescriptor];
+            var boundRule = Assert.Single(boundRules);
+            Assert.Equal("div", boundRule.TagName);
+            Assert.Equal("p", boundRule.ParentTag);
+        }
+
+        [Fact]
+        public void GetBinding_IsAttributeMatch_SingleAttributeMatch()
+        {
+            // Arrange
+            var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .AddMetadata(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString)
+                .Build();
+
+            var descriptors = new[] { divDescriptor, };
+            var tagHelperBinder = new TagHelperBinder("", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.True(bindingResult.IsAttributeMatch);
+        }
+
+        [Fact]
+        public void GetBinding_IsAttributeMatch_MultipleAttributeMatches()
+        {
+            // Arrange
+            var divDescriptor1 = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .AddMetadata(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString)
+                .Build();
+
+            var divDescriptor2 = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .AddMetadata(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString)
+                .Build();
+
+            var descriptors = new[] { divDescriptor1, divDescriptor2, };
+            var tagHelperBinder = new TagHelperBinder("", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.True(bindingResult.IsAttributeMatch);
+        }
+
+        [Fact]
+        public void GetBinding_IsAttributeMatch_MixedAttributeMatches()
+        {
+            // Arrange
+            var divDescriptor1 = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .AddMetadata(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString)
+                .Build();
+
+            var divDescriptor2 = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .Build();
+
+            var descriptors = new[] { divDescriptor1, divDescriptor2, };
+            var tagHelperBinder = new TagHelperBinder("", descriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: Array.Empty<KeyValuePair<string, string>>(),
+                parentTagName: "p",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.False(bindingResult.IsAttributeMatch);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorBuilderTest.cs
new file mode 100644
index 0000000000..37eef5fbfa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorBuilderTest.cs
@@ -0,0 +1,38 @@
+// 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 Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TagHelperDescriptorBuilderTest
+    {
+        [Fact]
+        public void DisplayName_SetsDescriptorsDisplayName()
+        {
+            // Arrange
+            var expectedDisplayName = "ExpectedDisplayName";
+            var builder = TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly");
+
+            // Act
+            var descriptor = builder.DisplayName(expectedDisplayName).Build();
+
+            // Assert
+            Assert.Equal(expectedDisplayName, descriptor.DisplayName);
+        }
+
+        [Fact]
+        public void DisplayName_DefaultsToTypeName()
+        {
+            // Arrange
+            var expectedDisplayName = "TestTagHelper";
+            var builder = TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly");
+
+            // Act
+            var descriptor = builder.Build();
+
+            // Assert
+            Assert.Equal(expectedDisplayName, descriptor.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorExtensionsTest.cs
new file mode 100644
index 0000000000..0940661058
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperDescriptorExtensionsTest.cs
@@ -0,0 +1,64 @@
+// 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.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TagHelperDescriptorExtensionsTest
+    {
+        [Fact]
+        public void GetTypeName_ReturnsTypeName()
+        {
+            // Arrange
+            var expectedTypeName = "TestTagHelper";
+            var descriptor = TagHelperDescriptorBuilder.Create(expectedTypeName, "TestAssembly").TypeName(expectedTypeName).Build();
+
+            // Act
+            var typeName = descriptor.GetTypeName();
+
+            // Assert
+            Assert.Equal(expectedTypeName, typeName);
+        }
+
+        [Fact]
+        public void GetTypeName_ReturnsNullIfNoTypeName()
+        {
+            // Arrange
+            var descriptor = TagHelperDescriptorBuilder.Create("Test", "TestAssembly").Build();
+
+            // Act
+            var typeName = descriptor.GetTypeName();
+
+            // Assert
+            Assert.Null(typeName);
+        }
+
+        [Fact]
+        public void IsDefaultKind_ReturnsTrue_IfKindIsDefault()
+        {
+            // Arrange
+            var descriptor = TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly").Build();
+
+            // Act
+            var isDefault = descriptor.IsDefaultKind();
+
+            // Assert
+            Assert.True(isDefault);
+        }
+
+        [Fact]
+        public void IsDefaultKind_ReturnsFalse_IfKindIsNotDefault()
+        {
+            // Arrange
+            var descriptor = TagHelperDescriptorBuilder.Create("other-kind", "TestTagHelper", "TestAssembly").Build();
+
+            // Act
+            var isDefault = descriptor.IsDefaultKind();
+
+            // Assert
+            Assert.False(isDefault);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs
new file mode 100644
index 0000000000..7a1fc6c1e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs
@@ -0,0 +1,156 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TagHelperMatchingConventionsTest
+    {
+        public static TheoryData RequiredAttributeDescriptorData
+        {
+            get
+            {
+                // requiredAttributeDescriptor, attributeName, attributeValue, expectedResult
+                return new TheoryData<Action<RequiredAttributeDescriptorBuilder>, string, string, bool>
+                {
+                    {
+                        builder => builder.Name("key"),
+                        "KeY",
+                        "value",
+                        true
+                    },
+                    {
+                        builder => builder.Name("key"),
+                        "keys",
+                        "value",
+                        false
+                    },
+                    {
+                        builder => builder
+                            .Name("route-")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                        "ROUTE-area",
+                        "manage",
+                        true
+                    },
+                    {
+                        builder => builder
+                            .Name("route-")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                        "routearea",
+                        "manage",
+                        false
+                    },
+                    {
+                        builder => builder
+                            .Name("route-")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch),
+                        "route-",
+                        "manage",
+                        false
+                    },
+                    {
+                        builder => builder
+                            .Name("key")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch),
+                        "KeY",
+                        "value",
+                        true
+                    },
+                    {
+                        builder => builder
+                            .Name("key")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch),
+                        "keys",
+                        "value",
+                        false
+                    },
+                    {
+                        builder => builder
+                            .Name("key")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                            .Value("value")
+                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch),
+                        "key",
+                        "value",
+                        true
+                    },
+                    {
+                        builder => builder
+                            .Name("key")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                            .Value("value")
+                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.FullMatch),
+                        "key",
+                        "Value",
+                        false
+                    },
+                    {
+                        builder => builder
+                            .Name("class")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                            .Value("btn")
+                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch),
+                        "class",
+                        "btn btn-success",
+                        true
+                    },
+                    {
+                        builder => builder
+                            .Name("class")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                            .Value("btn")
+                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch),
+                        "class",
+                        "BTN btn-success",
+                        false
+                    },
+                    {
+                        builder => builder
+                            .Name("href")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                            .Value("#navigate")
+                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch),
+                        "href",
+                        "/home/index#navigate",
+                        true
+                    },
+                    {
+                        builder => builder
+                            .Name("href")
+                            .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
+                            .Value("#navigate")
+                            .ValueComparisonMode(RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch),
+                        "href",
+                        "/home/index#NAVigate",
+                        false
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RequiredAttributeDescriptorData))]
+        public void Matches_ReturnsExpectedResult(
+            Action<RequiredAttributeDescriptorBuilder> configure,
+            string attributeName,
+            string attributeValue,
+            bool expectedResult)
+        {
+            // Arrange
+
+            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+            configure(builder);
+
+            var requiredAttibute = builder.Build();
+
+            // Act
+            var result = TagHelperMatchingConventions.SatisfiesRequiredAttribute(attributeName, attributeValue, requiredAttibute);
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml
new file mode 100644
index 0000000000..7c5b3ca2e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Home.cshtml
@@ -0,0 +1 @@
+home-content
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/About/About.cshtml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.cshtml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/Index.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/Home/_ViewImports.cshtml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/Views/_ViewImports.cshtml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/DefaultRazorProjectFileSystem/_ViewImports.cshtml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml
new file mode 100644
index 0000000000..f347706f3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.cshtml
@@ -0,0 +1 @@
+@test
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt
new file mode 100644
index 0000000000..6142bc2eb1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/CustomDirective.ir.txt
@@ -0,0 +1,6 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.cshtml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt
new file mode 100644
index 0000000000..6142bc2eb1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/Empty.ir.txt
@@ -0,0 +1,6 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml
new file mode 100644
index 0000000000..46953c4542
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.cshtml
@@ -0,0 +1 @@
+Hello, World!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt
new file mode 100644
index 0000000000..83409ed68c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/BasicIntegrationTest/HelloWorld.ir.txt
@@ -0,0 +1,8 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [13] HelloWorld.cshtml)
+                    IntermediateToken - (0:0,0 [13] HelloWorld.cshtml) - Html - Hello, World!
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml
new file mode 100644
index 0000000000..10b53aaeaf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml
@@ -0,0 +1 @@
+@addTagHelper "*, TestAssembly"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9f3704669f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AddTagHelperDirective_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..a3c0f0d9e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt
@@ -0,0 +1,14 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AddTagHelperDirective_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] AddTagHelperDirective.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [2] AddTagHelperDirective.cshtml)
+                    IntermediateToken - (31:0,31 [2] AddTagHelperDirective.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..782c5c9d62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml)
+|"*, TestAssembly"|
+Generated Location: (543:12,37 [17] )
+|"*, TestAssembly"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml
new file mode 100644
index 0000000000..8610fe90aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml
@@ -0,0 +1,8 @@
+@addTagHelper *, TestAssembly
+
+<p class="btn">
+    <p><strong catchAll="hi">Hello</strong><strong>World</strong></p>
+    <input checked="true" />
+    <input type="checkbox" checked="true" />
+    <input type="checkbox" checked="true" catchAll="hi" />
+</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1a6736914b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "checkbox";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_InputTagHelper.Type = "checkbox";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..db2f83bb78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,85 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] AttributeTargetingTagHelpers.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [4] AttributeTargetingTagHelpers.cshtml)
+                    IntermediateToken - (29:0,29 [4] AttributeTargetingTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (33:2,0 [228] AttributeTargetingTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (48:2,15 [9] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (48:2,15 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                            IntermediateToken - (54:3,4 [2] AttributeTargetingTagHelpers.cshtml) - Html - <p
+                            IntermediateToken - (56:3,6 [1] AttributeTargetingTagHelpers.cshtml) - Html - >
+                        TagHelper - (57:3,7 [36] AttributeTargetingTagHelpers.cshtml) - strong - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (79:3,29 [5] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (79:3,29 [5] AttributeTargetingTagHelpers.cshtml) - Html - Hello
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            DefaultTagHelperHtmlAttribute -  - catchAll - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (75:3,25 [2] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (75:3,25 [2] AttributeTargetingTagHelpers.cshtml) - Html - hi
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (93:3,43 [62] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (93:3,43 [7] AttributeTargetingTagHelpers.cshtml) - Html - <strong
+                            IntermediateToken - (100:3,50 [1] AttributeTargetingTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (101:3,51 [5] AttributeTargetingTagHelpers.cshtml) - Html - World
+                            IntermediateToken - (106:3,56 [9] AttributeTargetingTagHelpers.cshtml) - Html - </strong>
+                            IntermediateToken - (115:3,65 [4] AttributeTargetingTagHelpers.cshtml) - Html - </p>
+                            IntermediateToken - (119:3,69 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                            IntermediateToken - (125:4,4 [6] AttributeTargetingTagHelpers.cshtml) - Html - <input
+                            IntermediateToken - (131:4,10 [15] AttributeTargetingTagHelpers.cshtml) - Html -  checked="true"
+                            IntermediateToken - (146:4,25 [1] AttributeTargetingTagHelpers.cshtml) - Html -  
+                            IntermediateToken - (147:4,26 [2] AttributeTargetingTagHelpers.cshtml) - Html - />
+                            IntermediateToken - (149:4,28 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (155:5,4 [40] AttributeTargetingTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (187:5,36 [4] AttributeTargetingTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (187:5,36 [4] AttributeTargetingTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (195:5,44 [6] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (195:5,44 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (201:6,4 [54] AttributeTargetingTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            DefaultTagHelperProperty - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (233:6,36 [4] AttributeTargetingTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (233:6,36 [4] AttributeTargetingTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperHtmlAttribute -  - catchAll - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (249:6,52 [2] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (249:6,52 [2] AttributeTargetingTagHelpers.cshtml) - Html - hi
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (255:6,58 [2] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (255:6,58 [2] AttributeTargetingTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (43:2,10 [3] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (43:2,10 [3] AttributeTargetingTagHelpers.cshtml) - Html - btn
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..14f7685665
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
+|*, TestAssembly|
+Generated Location: (902:16,38 [15] )
+|*, TestAssembly|
+
+Source Location: (187:5,36 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
+|true|
+Generated Location: (1919:38,42 [4] )
+|true|
+
+Source Location: (233:6,36 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
+|true|
+Generated Location: (2610:50,42 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..e1a1e91204
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,130 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2ceb35a784a30ab44eb8b621c9e61d2361841c63"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2ceb35a784a30ab44eb8b621c9e61d2361841c63", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchAll", new global::Microsoft.AspNetCore.Html.HtmlString("hi"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("btn"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n    <p>");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("strong", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("Hello");
+                }
+                );
+                __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("<strong>World</strong></p>\r\n    <input checked=\"true\" />\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..dd411e5da2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - catchAll - hi - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_1 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - btn - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [2] AttributeTargetingTagHelpers.cshtml)
+                    IntermediateToken - (31:1,0 [2] AttributeTargetingTagHelpers.cshtml) - Html - \n
+                TagHelper - (33:2,0 [228] AttributeTargetingTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (48:2,15 [9] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (48:2,15 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                            IntermediateToken - (54:3,4 [2] AttributeTargetingTagHelpers.cshtml) - Html - <p
+                            IntermediateToken - (56:3,6 [1] AttributeTargetingTagHelpers.cshtml) - Html - >
+                        TagHelper - (57:3,7 [36] AttributeTargetingTagHelpers.cshtml) - strong - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (79:3,29 [5] AttributeTargetingTagHelpers.cshtml)
+                                    IntermediateToken - (79:3,29 [5] AttributeTargetingTagHelpers.cshtml) - Html - Hello
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (93:3,43 [62] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (93:3,43 [7] AttributeTargetingTagHelpers.cshtml) - Html - <strong
+                            IntermediateToken - (100:3,50 [1] AttributeTargetingTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (101:3,51 [5] AttributeTargetingTagHelpers.cshtml) - Html - World
+                            IntermediateToken - (106:3,56 [9] AttributeTargetingTagHelpers.cshtml) - Html - </strong>
+                            IntermediateToken - (115:3,65 [4] AttributeTargetingTagHelpers.cshtml) - Html - </p>
+                            IntermediateToken - (119:3,69 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                            IntermediateToken - (125:4,4 [6] AttributeTargetingTagHelpers.cshtml) - Html - <input
+                            IntermediateToken - (131:4,10 [15] AttributeTargetingTagHelpers.cshtml) - Html -  checked="true"
+                            IntermediateToken - (146:4,25 [1] AttributeTargetingTagHelpers.cshtml) - Html -  
+                            IntermediateToken - (147:4,26 [2] AttributeTargetingTagHelpers.cshtml) - Html - />
+                            IntermediateToken - (149:4,28 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (155:5,4 [40] AttributeTargetingTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml) - __tagHelperAttribute_1 - type - Type
+                            PreallocatedTagHelperProperty - (168:5,17 [8] AttributeTargetingTagHelpers.cshtml) - __tagHelperAttribute_1 - type - Type
+                            DefaultTagHelperProperty - (187:5,36 [4] AttributeTargetingTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (187:5,36 [4] AttributeTargetingTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (195:5,44 [6] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (195:5,44 [6] AttributeTargetingTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (201:6,4 [54] AttributeTargetingTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            PreallocatedTagHelperProperty - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - __tagHelperAttribute_1 - type - Type
+                            PreallocatedTagHelperProperty - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - __tagHelperAttribute_1 - type - Type
+                            DefaultTagHelperProperty - (233:6,36 [4] AttributeTargetingTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (233:6,36 [4] AttributeTargetingTagHelpers.cshtml) - CSharp - true
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (255:6,58 [2] AttributeTargetingTagHelpers.cshtml)
+                            IntermediateToken - (255:6,58 [2] AttributeTargetingTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml
new file mode 100644
index 0000000000..69b68e07c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml
@@ -0,0 +1,26 @@
+@functions {
+    public async Task<string> Foo()
+    {
+        return "Bar";
+    }
+}
+
+<section>
+    <h1>Basic Asynchronous Expression Test</h1>
+    <p>Basic Asynchronous Expression: @await Foo()</p>
+    <p>Basic Asynchronous Template: @(await Foo())</p>
+    <p>Basic Asynchronous Statement: @{ await Foo(); }</p>
+    <p>Basic Asynchronous Statement Nested: @{ <b>@await Foo()</b> }</p>
+    <p>Basic Incomplete Asynchronous Statement: @await</p>
+</section>
+
+<section>
+    <h1>Advanced Asynchronous Expression Test</h1>
+    <p>Advanced Asynchronous Expression: @await Foo(1, 2)</p>
+    <p>Advanced Asynchronous Expression Extended: @await Foo.Bar(1, 2)</p>
+    <p>Advanced Asynchronous Template: @(await Foo("bob", true))</p>
+    <p>Advanced Asynchronous Statement: @{ await Foo(something, hello: "world"); }</p>
+    <p>Advanced Asynchronous Statement Extended: @{ await Foo.Bar(1, 2) }</p>
+    <p>Advanced Asynchronous Statement Nested: @{ <b>@await Foo(boolValue: false)</b> }</p>
+    <p>Advanced Incomplete Asynchronous Statement: @await ("wrrronggg")</p>
+</section>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs
new file mode 100644
index 0000000000..850e7d6fae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs
@@ -0,0 +1,145 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                 __o = await Foo();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                __o = await Foo();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                        await Foo(); 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                               
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                             __o = await Foo();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                                   
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                           __o = await;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                    __o = await Foo(1, 2);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                             __o = await Foo.Bar(1, 2);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                   __o = await Foo("bob", true);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                           await Foo(something, hello: "world"); 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                    await Foo.Bar(1, 2) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                  
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                __o = await Foo(boolValue: false);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                                                      
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                              __o = await ("wrrronggg");
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+            
+    public async Task<string> Foo()
+    {
+        return "Bar";
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt
new file mode 100644
index 0000000000..0794ebc4bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt
@@ -0,0 +1,148 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (89:5,1 [102] Await.cshtml)
+                    IntermediateToken - (89:5,1 [4] Await.cshtml) - Html - \n\n
+                    IntermediateToken - (93:7,0 [8] Await.cshtml) - Html - <section
+                    IntermediateToken - (101:7,8 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (102:7,9 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (108:8,4 [3] Await.cshtml) - Html - <h1
+                    IntermediateToken - (111:8,7 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (112:8,8 [34] Await.cshtml) - Html - Basic Asynchronous Expression Test
+                    IntermediateToken - (146:8,42 [5] Await.cshtml) - Html - </h1>
+                    IntermediateToken - (151:8,47 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (157:9,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (159:9,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (160:9,7 [31] Await.cshtml) - Html - Basic Asynchronous Expression: 
+                CSharpExpression - (192:9,39 [11] Await.cshtml)
+                    IntermediateToken - (192:9,39 [11] Await.cshtml) - CSharp - await Foo()
+                HtmlContent - (203:9,50 [42] Await.cshtml)
+                    IntermediateToken - (203:9,50 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (207:9,54 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (213:10,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (215:10,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (216:10,7 [29] Await.cshtml) - Html - Basic Asynchronous Template: 
+                CSharpExpression - (247:10,38 [11] Await.cshtml)
+                    IntermediateToken - (247:10,38 [11] Await.cshtml) - CSharp - await Foo()
+                HtmlContent - (259:10,50 [43] Await.cshtml)
+                    IntermediateToken - (259:10,50 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (263:10,54 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (269:11,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (271:11,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (272:11,7 [30] Await.cshtml) - Html - Basic Asynchronous Statement: 
+                CSharpCode - (304:11,39 [14] Await.cshtml)
+                    IntermediateToken - (304:11,39 [14] Await.cshtml) - CSharp -  await Foo(); 
+                HtmlContent - (319:11,54 [50] Await.cshtml)
+                    IntermediateToken - (319:11,54 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (323:11,58 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (329:12,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (331:12,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (332:12,7 [37] Await.cshtml) - Html - Basic Asynchronous Statement Nested: 
+                CSharpCode - (371:12,46 [1] Await.cshtml)
+                    IntermediateToken - (371:12,46 [1] Await.cshtml) - CSharp -  
+                HtmlContent - (372:12,47 [3] Await.cshtml)
+                    IntermediateToken - (372:12,47 [2] Await.cshtml) - Html - <b
+                    IntermediateToken - (374:12,49 [1] Await.cshtml) - Html - >
+                CSharpExpression - (376:12,51 [11] Await.cshtml)
+                    IntermediateToken - (376:12,51 [11] Await.cshtml) - CSharp - await Foo()
+                HtmlContent - (387:12,62 [4] Await.cshtml)
+                    IntermediateToken - (387:12,62 [4] Await.cshtml) - Html - </b>
+                CSharpCode - (391:12,66 [1] Await.cshtml)
+                    IntermediateToken - (391:12,66 [1] Await.cshtml) - CSharp -  
+                HtmlContent - (393:12,68 [54] Await.cshtml)
+                    IntermediateToken - (393:12,68 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (397:12,72 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (403:13,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (405:13,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (406:13,7 [41] Await.cshtml) - Html - Basic Incomplete Asynchronous Statement: 
+                CSharpExpression - (448:13,49 [5] Await.cshtml)
+                    IntermediateToken - (448:13,49 [5] Await.cshtml) - CSharp - await
+                HtmlContent - (453:13,54 [124] Await.cshtml)
+                    IntermediateToken - (453:13,54 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (457:13,58 [2] Await.cshtml) - Html - \n
+                    IntermediateToken - (459:14,0 [10] Await.cshtml) - Html - </section>
+                    IntermediateToken - (469:14,10 [4] Await.cshtml) - Html - \n\n
+                    IntermediateToken - (473:16,0 [8] Await.cshtml) - Html - <section
+                    IntermediateToken - (481:16,8 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (482:16,9 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (488:17,4 [3] Await.cshtml) - Html - <h1
+                    IntermediateToken - (491:17,7 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (492:17,8 [37] Await.cshtml) - Html - Advanced Asynchronous Expression Test
+                    IntermediateToken - (529:17,45 [5] Await.cshtml) - Html - </h1>
+                    IntermediateToken - (534:17,50 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (540:18,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (542:18,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (543:18,7 [34] Await.cshtml) - Html - Advanced Asynchronous Expression: 
+                CSharpExpression - (578:18,42 [15] Await.cshtml)
+                    IntermediateToken - (578:18,42 [15] Await.cshtml) - CSharp - await Foo(1, 2)
+                HtmlContent - (593:18,57 [56] Await.cshtml)
+                    IntermediateToken - (593:18,57 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (597:18,61 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (603:19,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (605:19,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (606:19,7 [43] Await.cshtml) - Html - Advanced Asynchronous Expression Extended: 
+                CSharpExpression - (650:19,51 [19] Await.cshtml)
+                    IntermediateToken - (650:19,51 [19] Await.cshtml) - CSharp - await Foo.Bar(1, 2)
+                HtmlContent - (669:19,70 [45] Await.cshtml)
+                    IntermediateToken - (669:19,70 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (673:19,74 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (679:20,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (681:20,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (682:20,7 [32] Await.cshtml) - Html - Advanced Asynchronous Template: 
+                CSharpExpression - (716:20,41 [22] Await.cshtml)
+                    IntermediateToken - (716:20,41 [22] Await.cshtml) - CSharp - await Foo("bob", true)
+                HtmlContent - (739:20,64 [46] Await.cshtml)
+                    IntermediateToken - (739:20,64 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (743:20,68 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (749:21,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (751:21,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (752:21,7 [33] Await.cshtml) - Html - Advanced Asynchronous Statement: 
+                CSharpCode - (787:21,42 [39] Await.cshtml)
+                    IntermediateToken - (787:21,42 [39] Await.cshtml) - CSharp -  await Foo(something, hello: "world"); 
+                HtmlContent - (827:21,82 [55] Await.cshtml)
+                    IntermediateToken - (827:21,82 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (831:21,86 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (837:22,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (839:22,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (840:22,7 [42] Await.cshtml) - Html - Advanced Asynchronous Statement Extended: 
+                CSharpCode - (884:22,51 [21] Await.cshtml)
+                    IntermediateToken - (884:22,51 [21] Await.cshtml) - CSharp -  await Foo.Bar(1, 2) 
+                HtmlContent - (906:22,73 [53] Await.cshtml)
+                    IntermediateToken - (906:22,73 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (910:22,77 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (916:23,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (918:23,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (919:23,7 [40] Await.cshtml) - Html - Advanced Asynchronous Statement Nested: 
+                CSharpCode - (961:23,49 [1] Await.cshtml)
+                    IntermediateToken - (961:23,49 [1] Await.cshtml) - CSharp -  
+                HtmlContent - (962:23,50 [3] Await.cshtml)
+                    IntermediateToken - (962:23,50 [2] Await.cshtml) - Html - <b
+                    IntermediateToken - (964:23,52 [1] Await.cshtml) - Html - >
+                CSharpExpression - (966:23,54 [27] Await.cshtml)
+                    IntermediateToken - (966:23,54 [27] Await.cshtml) - CSharp - await Foo(boolValue: false)
+                HtmlContent - (993:23,81 [4] Await.cshtml)
+                    IntermediateToken - (993:23,81 [4] Await.cshtml) - Html - </b>
+                CSharpCode - (997:23,85 [1] Await.cshtml)
+                    IntermediateToken - (997:23,85 [1] Await.cshtml) - CSharp -  
+                HtmlContent - (999:23,87 [57] Await.cshtml)
+                    IntermediateToken - (999:23,87 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (1003:23,91 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (1009:24,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (1011:24,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (1012:24,7 [44] Await.cshtml) - Html - Advanced Incomplete Asynchronous Statement: 
+                CSharpExpression - (1057:24,52 [19] Await.cshtml)
+                    IntermediateToken - (1057:24,52 [19] Await.cshtml) - CSharp - await ("wrrronggg")
+                HtmlContent - (1076:24,71 [16] Await.cshtml)
+                    IntermediateToken - (1076:24,71 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (1080:24,75 [2] Await.cshtml) - Html - \n
+                    IntermediateToken - (1082:25,0 [10] Await.cshtml) - Html - </section>
+            CSharpCode - (12:0,12 [76] Await.cshtml)
+                IntermediateToken - (12:0,12 [76] Await.cshtml) - CSharp - \n    public async Task<string> Foo()\n    {\n        return "Bar";\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt
new file mode 100644
index 0000000000..8fd6a5044a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.mappings.txt
@@ -0,0 +1,95 @@
+Source Location: (192:9,39 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo()|
+Generated Location: (768:19,39 [11] )
+|await Foo()|
+
+Source Location: (247:10,38 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo()|
+Generated Location: (971:26,38 [11] )
+|await Foo()|
+
+Source Location: (304:11,39 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| await Foo(); |
+Generated Location: (1175:33,39 [14] )
+| await Foo(); |
+
+Source Location: (371:12,46 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| |
+Generated Location: (1388:40,46 [1] )
+| |
+
+Source Location: (376:12,51 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo()|
+Generated Location: (1593:47,51 [11] )
+|await Foo()|
+
+Source Location: (391:12,66 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| |
+Generated Location: (1824:54,66 [1] )
+| |
+
+Source Location: (448:13,49 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await|
+Generated Location: (2027:61,49 [5] )
+|await|
+
+Source Location: (578:18,42 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo(1, 2)|
+Generated Location: (2228:68,42 [15] )
+|await Foo(1, 2)|
+
+Source Location: (650:19,51 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo.Bar(1, 2)|
+Generated Location: (2448:75,51 [19] )
+|await Foo.Bar(1, 2)|
+
+Source Location: (716:20,41 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo("bob", true)|
+Generated Location: (2662:82,41 [22] )
+|await Foo("bob", true)|
+
+Source Location: (787:21,42 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| await Foo(something, hello: "world"); |
+Generated Location: (2880:89,42 [39] )
+| await Foo(something, hello: "world"); |
+
+Source Location: (884:22,51 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| await Foo.Bar(1, 2) |
+Generated Location: (3123:96,51 [21] )
+| await Foo.Bar(1, 2) |
+
+Source Location: (961:23,49 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| |
+Generated Location: (3346:103,49 [1] )
+| |
+
+Source Location: (966:23,54 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await Foo(boolValue: false)|
+Generated Location: (3554:110,54 [27] )
+|await Foo(boolValue: false)|
+
+Source Location: (997:23,85 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+| |
+Generated Location: (3820:117,85 [1] )
+| |
+
+Source Location: (1057:24,52 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|await ("wrrronggg")|
+Generated Location: (4026:124,52 [19] )
+|await ("wrrronggg")|
+
+Source Location: (12:0,12 [76] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml)
+|
+    public async Task<string> Foo()
+    {
+        return "Bar";
+    }
+|
+Generated Location: (4259:133,12 [76] )
+|
+    public async Task<string> Foo()
+    {
+        return "Bar";
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs
new file mode 100644
index 0000000000..7eb1804dc5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs
@@ -0,0 +1,130 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5a02c3ec89081f6e0a8f4810e127eed40467c358"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5a02c3ec89081f6e0a8f4810e127eed40467c358", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<section>\r\n    <h1>Basic Asynchronous Expression Test</h1>\r\n    <p>Basic Asynchronous Expression: ");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                 Write(await Foo());
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Basic Asynchronous Template: ");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                Write(await Foo());
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Basic Asynchronous Statement: ");
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                        await Foo(); 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Basic Asynchronous Statement Nested: ");
+            WriteLiteral(" <b>");
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                             Write(await Foo());
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</b> ");
+            WriteLiteral("</p>\r\n    <p>Basic Incomplete Asynchronous Statement: ");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                           Write(await);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n</section>\r\n\r\n<section>\r\n    <h1>Advanced Asynchronous Expression Test</h1>\r\n    <p>Advanced Asynchronous Expression: ");
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                    Write(await Foo(1, 2));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Advanced Asynchronous Expression Extended: ");
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                             Write(await Foo.Bar(1, 2));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Advanced Asynchronous Template: ");
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                   Write(await Foo("bob", true));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Advanced Asynchronous Statement: ");
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                           await Foo(something, hello: "world"); 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Advanced Asynchronous Statement Extended: ");
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                    await Foo.Bar(1, 2) 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n    <p>Advanced Asynchronous Statement Nested: ");
+            WriteLiteral(" <b>");
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                                Write(await Foo(boolValue: false));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</b> ");
+            WriteLiteral("</p>\r\n    <p>Advanced Incomplete Asynchronous Statement: ");
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+                                              Write(await ("wrrronggg"));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n</section>");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await.cshtml"
+            
+    public async Task<string> Foo()
+    {
+        return "Bar";
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt
new file mode 100644
index 0000000000..5b906426af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt
@@ -0,0 +1,143 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (91:6,0 [100] Await.cshtml)
+                    IntermediateToken - (91:6,0 [2] Await.cshtml) - Html - \n
+                    IntermediateToken - (93:7,0 [8] Await.cshtml) - Html - <section
+                    IntermediateToken - (101:7,8 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (102:7,9 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (108:8,4 [3] Await.cshtml) - Html - <h1
+                    IntermediateToken - (111:8,7 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (112:8,8 [34] Await.cshtml) - Html - Basic Asynchronous Expression Test
+                    IntermediateToken - (146:8,42 [5] Await.cshtml) - Html - </h1>
+                    IntermediateToken - (151:8,47 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (157:9,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (159:9,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (160:9,7 [31] Await.cshtml) - Html - Basic Asynchronous Expression: 
+                CSharpExpression - (192:9,39 [11] Await.cshtml)
+                    IntermediateToken - (192:9,39 [11] Await.cshtml) - CSharp - await Foo()
+                HtmlContent - (203:9,50 [42] Await.cshtml)
+                    IntermediateToken - (203:9,50 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (207:9,54 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (213:10,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (215:10,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (216:10,7 [29] Await.cshtml) - Html - Basic Asynchronous Template: 
+                CSharpExpression - (247:10,38 [11] Await.cshtml)
+                    IntermediateToken - (247:10,38 [11] Await.cshtml) - CSharp - await Foo()
+                HtmlContent - (259:10,50 [43] Await.cshtml)
+                    IntermediateToken - (259:10,50 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (263:10,54 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (269:11,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (271:11,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (272:11,7 [30] Await.cshtml) - Html - Basic Asynchronous Statement: 
+                CSharpCode - (304:11,39 [14] Await.cshtml)
+                    IntermediateToken - (304:11,39 [14] Await.cshtml) - CSharp -  await Foo(); 
+                HtmlContent - (319:11,54 [50] Await.cshtml)
+                    IntermediateToken - (319:11,54 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (323:11,58 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (329:12,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (331:12,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (332:12,7 [37] Await.cshtml) - Html - Basic Asynchronous Statement Nested: 
+                HtmlContent - (371:12,46 [4] Await.cshtml)
+                    IntermediateToken - (371:12,46 [1] Await.cshtml) - Html -  
+                    IntermediateToken - (372:12,47 [2] Await.cshtml) - Html - <b
+                    IntermediateToken - (374:12,49 [1] Await.cshtml) - Html - >
+                CSharpExpression - (376:12,51 [11] Await.cshtml)
+                    IntermediateToken - (376:12,51 [11] Await.cshtml) - CSharp - await Foo()
+                HtmlContent - (387:12,62 [5] Await.cshtml)
+                    IntermediateToken - (387:12,62 [4] Await.cshtml) - Html - </b>
+                    IntermediateToken - (391:12,66 [1] Await.cshtml) - Html -  
+                CSharpCode - (392:12,67 [0] Await.cshtml)
+                    IntermediateToken - (392:12,67 [0] Await.cshtml) - CSharp - 
+                HtmlContent - (393:12,68 [54] Await.cshtml)
+                    IntermediateToken - (393:12,68 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (397:12,72 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (403:13,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (405:13,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (406:13,7 [41] Await.cshtml) - Html - Basic Incomplete Asynchronous Statement: 
+                CSharpExpression - (448:13,49 [5] Await.cshtml)
+                    IntermediateToken - (448:13,49 [5] Await.cshtml) - CSharp - await
+                HtmlContent - (453:13,54 [124] Await.cshtml)
+                    IntermediateToken - (453:13,54 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (457:13,58 [2] Await.cshtml) - Html - \n
+                    IntermediateToken - (459:14,0 [10] Await.cshtml) - Html - </section>
+                    IntermediateToken - (469:14,10 [4] Await.cshtml) - Html - \n\n
+                    IntermediateToken - (473:16,0 [8] Await.cshtml) - Html - <section
+                    IntermediateToken - (481:16,8 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (482:16,9 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (488:17,4 [3] Await.cshtml) - Html - <h1
+                    IntermediateToken - (491:17,7 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (492:17,8 [37] Await.cshtml) - Html - Advanced Asynchronous Expression Test
+                    IntermediateToken - (529:17,45 [5] Await.cshtml) - Html - </h1>
+                    IntermediateToken - (534:17,50 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (540:18,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (542:18,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (543:18,7 [34] Await.cshtml) - Html - Advanced Asynchronous Expression: 
+                CSharpExpression - (578:18,42 [15] Await.cshtml)
+                    IntermediateToken - (578:18,42 [15] Await.cshtml) - CSharp - await Foo(1, 2)
+                HtmlContent - (593:18,57 [56] Await.cshtml)
+                    IntermediateToken - (593:18,57 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (597:18,61 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (603:19,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (605:19,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (606:19,7 [43] Await.cshtml) - Html - Advanced Asynchronous Expression Extended: 
+                CSharpExpression - (650:19,51 [19] Await.cshtml)
+                    IntermediateToken - (650:19,51 [19] Await.cshtml) - CSharp - await Foo.Bar(1, 2)
+                HtmlContent - (669:19,70 [45] Await.cshtml)
+                    IntermediateToken - (669:19,70 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (673:19,74 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (679:20,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (681:20,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (682:20,7 [32] Await.cshtml) - Html - Advanced Asynchronous Template: 
+                CSharpExpression - (716:20,41 [22] Await.cshtml)
+                    IntermediateToken - (716:20,41 [22] Await.cshtml) - CSharp - await Foo("bob", true)
+                HtmlContent - (739:20,64 [46] Await.cshtml)
+                    IntermediateToken - (739:20,64 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (743:20,68 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (749:21,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (751:21,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (752:21,7 [33] Await.cshtml) - Html - Advanced Asynchronous Statement: 
+                CSharpCode - (787:21,42 [39] Await.cshtml)
+                    IntermediateToken - (787:21,42 [39] Await.cshtml) - CSharp -  await Foo(something, hello: "world"); 
+                HtmlContent - (827:21,82 [55] Await.cshtml)
+                    IntermediateToken - (827:21,82 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (831:21,86 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (837:22,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (839:22,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (840:22,7 [42] Await.cshtml) - Html - Advanced Asynchronous Statement Extended: 
+                CSharpCode - (884:22,51 [21] Await.cshtml)
+                    IntermediateToken - (884:22,51 [21] Await.cshtml) - CSharp -  await Foo.Bar(1, 2) 
+                HtmlContent - (906:22,73 [53] Await.cshtml)
+                    IntermediateToken - (906:22,73 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (910:22,77 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (916:23,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (918:23,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (919:23,7 [40] Await.cshtml) - Html - Advanced Asynchronous Statement Nested: 
+                HtmlContent - (961:23,49 [4] Await.cshtml)
+                    IntermediateToken - (961:23,49 [1] Await.cshtml) - Html -  
+                    IntermediateToken - (962:23,50 [2] Await.cshtml) - Html - <b
+                    IntermediateToken - (964:23,52 [1] Await.cshtml) - Html - >
+                CSharpExpression - (966:23,54 [27] Await.cshtml)
+                    IntermediateToken - (966:23,54 [27] Await.cshtml) - CSharp - await Foo(boolValue: false)
+                HtmlContent - (993:23,81 [5] Await.cshtml)
+                    IntermediateToken - (993:23,81 [4] Await.cshtml) - Html - </b>
+                    IntermediateToken - (997:23,85 [1] Await.cshtml) - Html -  
+                CSharpCode - (998:23,86 [0] Await.cshtml)
+                    IntermediateToken - (998:23,86 [0] Await.cshtml) - CSharp - 
+                HtmlContent - (999:23,87 [57] Await.cshtml)
+                    IntermediateToken - (999:23,87 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (1003:23,91 [6] Await.cshtml) - Html - \n    
+                    IntermediateToken - (1009:24,4 [2] Await.cshtml) - Html - <p
+                    IntermediateToken - (1011:24,6 [1] Await.cshtml) - Html - >
+                    IntermediateToken - (1012:24,7 [44] Await.cshtml) - Html - Advanced Incomplete Asynchronous Statement: 
+                CSharpExpression - (1057:24,52 [19] Await.cshtml)
+                    IntermediateToken - (1057:24,52 [19] Await.cshtml) - CSharp - await ("wrrronggg")
+                HtmlContent - (1076:24,71 [16] Await.cshtml)
+                    IntermediateToken - (1076:24,71 [4] Await.cshtml) - Html - </p>
+                    IntermediateToken - (1080:24,75 [2] Await.cshtml) - Html - \n
+                    IntermediateToken - (1082:25,0 [10] Await.cshtml) - Html - </section>
+            CSharpCode - (12:0,12 [76] Await.cshtml)
+                IntermediateToken - (12:0,12 [76] Await.cshtml) - CSharp - \n    public async Task<string> Foo()\n    {\n        return "Bar";\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml
new file mode 100644
index 0000000000..b58b6b44ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml
@@ -0,0 +1,9 @@
+@addTagHelper "*, TestAssembly"
+
+<div data-animation="fade" class="randomNonTagHelperAttribute">
+    <p class="Hello World" data-delay="1000">
+        <p data="-delay1000"></p>
+        <input data-interval="2000 + @ViewBag.DefaultInterval + 1" type="text">
+        <input type="checkbox" checked="true"/>
+    </p>
+</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..a3f054b732
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
+                                __o = ViewBag.DefaultInterval;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Type = "text";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "checkbox";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..38d793eaeb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,84 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] BasicTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [73] BasicTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] BasicTagHelpers.cshtml) - Html - \n\n
+                    IntermediateToken - (35:2,0 [4] BasicTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (39:2,4 [17] BasicTagHelpers.cshtml) - Html -  data-animation="
+                    IntermediateToken - (56:2,21 [4] BasicTagHelpers.cshtml) - Html - fade
+                    IntermediateToken - (60:2,25 [1] BasicTagHelpers.cshtml) - Html - "
+                    IntermediateToken - (61:2,26 [36] BasicTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (97:2,62 [1] BasicTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (98:2,63 [6] BasicTagHelpers.cshtml) - Html - \n    
+                TagHelper - (104:3,4 [216] BasicTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (145:3,45 [10] BasicTagHelpers.cshtml)
+                            IntermediateToken - (145:3,45 [10] BasicTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (155:4,8 [25] BasicTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperHtmlAttribute -  - data - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (164:4,17 [10] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (164:4,17 [10] BasicTagHelpers.cshtml) - Html - -delay1000
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (180:4,33 [10] BasicTagHelpers.cshtml)
+                            IntermediateToken - (180:4,33 [10] BasicTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (190:5,8 [71] BasicTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperHtmlAttribute -  - data-interval - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (212:5,30 [7] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (212:5,30 [7] BasicTagHelpers.cshtml) - Html - 2000 + 
+                                CSharpExpression - (220:5,38 [23] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (220:5,38 [23] BasicTagHelpers.cshtml) - CSharp - ViewBag.DefaultInterval
+                                HtmlContent - (243:5,61 [4] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (243:5,61 [4] BasicTagHelpers.cshtml) - Html -  + 1
+                            DefaultTagHelperProperty - (255:5,73 [4] BasicTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (255:5,73 [4] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (255:5,73 [4] BasicTagHelpers.cshtml) - Html - text
+                            DefaultTagHelperProperty - (255:5,73 [4] BasicTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (255:5,73 [4] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (255:5,73 [4] BasicTagHelpers.cshtml) - Html - text
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (261:5,79 [10] BasicTagHelpers.cshtml)
+                            IntermediateToken - (261:5,79 [10] BasicTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (271:6,8 [39] BasicTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (284:6,21 [8] BasicTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (284:6,21 [8] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (284:6,21 [8] BasicTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (284:6,21 [8] BasicTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (284:6,21 [8] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (284:6,21 [8] BasicTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (303:6,40 [4] BasicTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (303:6,40 [4] BasicTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (310:6,47 [6] BasicTagHelpers.cshtml)
+                            IntermediateToken - (310:6,47 [6] BasicTagHelpers.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (114:3,14 [11] BasicTagHelpers.cshtml)
+                            IntermediateToken - (114:3,14 [11] BasicTagHelpers.cshtml) - Html - Hello World
+                    DefaultTagHelperHtmlAttribute -  - data-delay - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (139:3,39 [4] BasicTagHelpers.cshtml)
+                            IntermediateToken - (139:3,39 [4] BasicTagHelpers.cshtml) - Html - 1000
+                    DefaultTagHelperExecute - 
+                HtmlContent - (320:7,8 [8] BasicTagHelpers.cshtml)
+                    IntermediateToken - (320:7,8 [2] BasicTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (322:8,0 [6] BasicTagHelpers.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..f639597507
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (783:15,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (220:5,38 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
+|ViewBag.DefaultInterval|
+Generated Location: (1618:35,38 [23] )
+|ViewBag.DefaultInterval|
+
+Source Location: (303:6,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
+|true|
+Generated Location: (2354:48,42 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml
new file mode 100644
index 0000000000..089363600c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml
@@ -0,0 +1,10 @@
+@tagHelperPrefix "THS"
+@addTagHelper "*, TestAssembly"
+
+<THSdiv class="randomNonTagHelperAttribute">
+    <THSp class="Hello World">
+        <p></p>
+        <input type="text">
+        <THSinput type="checkbox" checked="true">
+    </THSp>
+</THSdiv>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
new file mode 100644
index 0000000000..85b8e6f1d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml"
+global::System.Object __typeHelper = "THS";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "checkbox";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml"
+ __TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt
new file mode 100644
index 0000000000..837de656c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt
@@ -0,0 +1,60 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (17:0,17 [5] BasicTagHelpers_Prefixed.cshtml) - "THS"
+                DirectiveToken - (38:1,14 [17] BasicTagHelpers_Prefixed.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (22:0,22 [2] BasicTagHelpers_Prefixed.cshtml)
+                    IntermediateToken - (22:0,22 [2] BasicTagHelpers_Prefixed.cshtml) - Html - \n
+                HtmlContent - (55:1,31 [54] BasicTagHelpers_Prefixed.cshtml)
+                    IntermediateToken - (55:1,31 [4] BasicTagHelpers_Prefixed.cshtml) - Html - \n\n
+                    IntermediateToken - (59:3,0 [7] BasicTagHelpers_Prefixed.cshtml) - Html - <THSdiv
+                    IntermediateToken - (66:3,7 [36] BasicTagHelpers_Prefixed.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (102:3,43 [1] BasicTagHelpers_Prefixed.cshtml) - Html - >
+                    IntermediateToken - (103:3,44 [6] BasicTagHelpers_Prefixed.cshtml) - Html - \n    
+                TagHelper - (109:4,4 [136] BasicTagHelpers_Prefixed.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (135:4,30 [56] BasicTagHelpers_Prefixed.cshtml)
+                            IntermediateToken - (135:4,30 [10] BasicTagHelpers_Prefixed.cshtml) - Html - \n        
+                            IntermediateToken - (145:5,8 [2] BasicTagHelpers_Prefixed.cshtml) - Html - <p
+                            IntermediateToken - (147:5,10 [1] BasicTagHelpers_Prefixed.cshtml) - Html - >
+                            IntermediateToken - (148:5,11 [4] BasicTagHelpers_Prefixed.cshtml) - Html - </p>
+                            IntermediateToken - (152:5,15 [10] BasicTagHelpers_Prefixed.cshtml) - Html - \n        
+                            IntermediateToken - (162:6,8 [6] BasicTagHelpers_Prefixed.cshtml) - Html - <input
+                            IntermediateToken - (168:6,14 [12] BasicTagHelpers_Prefixed.cshtml) - Html -  type="text"
+                            IntermediateToken - (180:6,26 [1] BasicTagHelpers_Prefixed.cshtml) - Html - >
+                            IntermediateToken - (181:6,27 [10] BasicTagHelpers_Prefixed.cshtml) - Html - \n        
+                        TagHelper - (191:7,8 [41] BasicTagHelpers_Prefixed.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml)
+                                    IntermediateToken - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml)
+                                    IntermediateToken - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml) - Html - checkbox
+                            DefaultTagHelperProperty - (226:7,43 [4] BasicTagHelpers_Prefixed.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (226:7,43 [4] BasicTagHelpers_Prefixed.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (232:7,49 [6] BasicTagHelpers_Prefixed.cshtml)
+                            IntermediateToken - (232:7,49 [6] BasicTagHelpers_Prefixed.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (122:4,17 [11] BasicTagHelpers_Prefixed.cshtml)
+                            IntermediateToken - (122:4,17 [11] BasicTagHelpers_Prefixed.cshtml) - Html - Hello World
+                    DefaultTagHelperExecute - 
+                HtmlContent - (245:8,11 [11] BasicTagHelpers_Prefixed.cshtml)
+                    IntermediateToken - (245:8,11 [2] BasicTagHelpers_Prefixed.cshtml) - Html - \n
+                    IntermediateToken - (247:9,0 [9] BasicTagHelpers_Prefixed.cshtml) - Html - </THSdiv>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
new file mode 100644
index 0000000000..3758937b4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (17:0,17 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
+|"THS"|
+Generated Location: (801:15,37 [5] )
+|"THS"|
+
+Source Location: (38:1,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
+|"*, TestAssembly"|
+Generated Location: (1075:25,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (226:7,43 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
+|true|
+Generated Location: (1981:46,43 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs
new file mode 100644
index 0000000000..4983c36dd6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs
@@ -0,0 +1,84 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b7372519d2a9b45537aba0e7d34309526d3014c3"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"b7372519d2a9b45537aba0e7d34309526d3014c3", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<THSdiv class=\"randomNonTagHelperAttribute\">\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        <p></p>\r\n        <input type=\"text\">\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</THSdiv>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt
new file mode 100644
index 0000000000..ce074408ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt
@@ -0,0 +1,47 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (57:2,0 [52] BasicTagHelpers_Prefixed.cshtml)
+                    IntermediateToken - (57:2,0 [2] BasicTagHelpers_Prefixed.cshtml) - Html - \n
+                    IntermediateToken - (59:3,0 [7] BasicTagHelpers_Prefixed.cshtml) - Html - <THSdiv
+                    IntermediateToken - (66:3,7 [36] BasicTagHelpers_Prefixed.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (102:3,43 [1] BasicTagHelpers_Prefixed.cshtml) - Html - >
+                    IntermediateToken - (103:3,44 [6] BasicTagHelpers_Prefixed.cshtml) - Html - \n    
+                TagHelper - (109:4,4 [136] BasicTagHelpers_Prefixed.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (135:4,30 [56] BasicTagHelpers_Prefixed.cshtml)
+                            IntermediateToken - (135:4,30 [10] BasicTagHelpers_Prefixed.cshtml) - Html - \n        
+                            IntermediateToken - (145:5,8 [2] BasicTagHelpers_Prefixed.cshtml) - Html - <p
+                            IntermediateToken - (147:5,10 [1] BasicTagHelpers_Prefixed.cshtml) - Html - >
+                            IntermediateToken - (148:5,11 [4] BasicTagHelpers_Prefixed.cshtml) - Html - </p>
+                            IntermediateToken - (152:5,15 [10] BasicTagHelpers_Prefixed.cshtml) - Html - \n        
+                            IntermediateToken - (162:6,8 [6] BasicTagHelpers_Prefixed.cshtml) - Html - <input
+                            IntermediateToken - (168:6,14 [12] BasicTagHelpers_Prefixed.cshtml) - Html -  type="text"
+                            IntermediateToken - (180:6,26 [1] BasicTagHelpers_Prefixed.cshtml) - Html - >
+                            IntermediateToken - (181:6,27 [10] BasicTagHelpers_Prefixed.cshtml) - Html - \n        
+                        TagHelper - (191:7,8 [41] BasicTagHelpers_Prefixed.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperProperty - (207:7,24 [8] BasicTagHelpers_Prefixed.cshtml) - __tagHelperAttribute_0 - type - Type
+                            DefaultTagHelperProperty - (226:7,43 [4] BasicTagHelpers_Prefixed.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (226:7,43 [4] BasicTagHelpers_Prefixed.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (232:7,49 [6] BasicTagHelpers_Prefixed.cshtml)
+                            IntermediateToken - (232:7,49 [6] BasicTagHelpers_Prefixed.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperExecute - 
+                HtmlContent - (245:8,11 [11] BasicTagHelpers_Prefixed.cshtml)
+                    IntermediateToken - (245:8,11 [2] BasicTagHelpers_Prefixed.cshtml) - Html - \n
+                    IntermediateToken - (247:9,0 [9] BasicTagHelpers_Prefixed.cshtml) - Html - </THSdiv>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml
new file mode 100644
index 0000000000..56ac77231a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml
@@ -0,0 +1,10 @@
+@addTagHelper "*, TestAssembly"
+@removeTagHelper "doesntmatter, nice"
+
+<div class="randomNonTagHelperAttribute">
+    <p class="Hello World">
+        <p></p>
+        <input type="text" />
+        <input type="checkbox" checked="true"/>
+    </p>
+</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..66850f8043
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs
@@ -0,0 +1,117 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2e30c5c6e01a148ccf4ed5dd4a81939641312a17"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_RemoveTagHelper_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2e30c5c6e01a148ccf4ed5dd4a81939641312a17", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_RemoveTagHelper_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "text", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                }
+                );
+                __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..ef78c52e75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt
@@ -0,0 +1,55 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_RemoveTagHelper_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_1 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (72:2,0 [49] BasicTagHelpers_RemoveTagHelper.cshtml)
+                    IntermediateToken - (72:2,0 [2] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n
+                    IntermediateToken - (74:3,0 [4] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - <div
+                    IntermediateToken - (78:3,4 [36] BasicTagHelpers_RemoveTagHelper.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (114:3,40 [1] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - >
+                    IntermediateToken - (115:3,41 [6] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n    
+                TagHelper - (121:4,4 [130] BasicTagHelpers_RemoveTagHelper.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (144:4,27 [10] BasicTagHelpers_RemoveTagHelper.cshtml)
+                            IntermediateToken - (144:4,27 [10] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n        
+                        TagHelper - (154:5,8 [7] BasicTagHelpers_RemoveTagHelper.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (161:5,15 [10] BasicTagHelpers_RemoveTagHelper.cshtml)
+                            IntermediateToken - (161:5,15 [10] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n        
+                        TagHelper - (171:6,8 [21] BasicTagHelpers_RemoveTagHelper.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (184:6,21 [4] BasicTagHelpers_RemoveTagHelper.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperProperty - (184:6,21 [4] BasicTagHelpers_RemoveTagHelper.cshtml) - __tagHelperAttribute_0 - type - Type
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (192:6,29 [10] BasicTagHelpers_RemoveTagHelper.cshtml)
+                            IntermediateToken - (192:6,29 [10] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n        
+                        TagHelper - (202:7,8 [39] BasicTagHelpers_RemoveTagHelper.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (215:7,21 [8] BasicTagHelpers_RemoveTagHelper.cshtml) - __tagHelperAttribute_1 - type - Type
+                            PreallocatedTagHelperProperty - (215:7,21 [8] BasicTagHelpers_RemoveTagHelper.cshtml) - __tagHelperAttribute_1 - type - Type
+                            DefaultTagHelperProperty - (234:7,40 [4] BasicTagHelpers_RemoveTagHelper.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (234:7,40 [4] BasicTagHelpers_RemoveTagHelper.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (241:7,47 [6] BasicTagHelpers_RemoveTagHelper.cshtml)
+                            IntermediateToken - (241:7,47 [6] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (251:8,8 [8] BasicTagHelpers_RemoveTagHelper.cshtml)
+                    IntermediateToken - (251:8,8 [2] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - \n
+                    IntermediateToken - (253:9,0 [6] BasicTagHelpers_RemoveTagHelper.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..593460da0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,133 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2775a5b97b6aa9fc7b162124fddb7400ec1e2472"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2775a5b97b6aa9fc7b162124fddb7400ec1e2472", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data", new global::Microsoft.AspNetCore.Html.HtmlString("-delay1000"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "text", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-delay", new global::Microsoft.AspNetCore.Html.HtmlString("1000"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<div data-animation=\"fade\" class=\"randomNonTagHelperAttribute\">\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                }
+                );
+                __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                BeginWriteTagHelperAttribute();
+                WriteLiteral("2000 + ");
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
+                                Write(ViewBag.DefaultInterval);
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral(" + 1");
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("data-interval", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_2.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_2);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_2.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_2);
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..ce7caef785
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt
@@ -0,0 +1,69 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - data - -delay1000 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_2 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_4 - data-delay - 1000 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [71] BasicTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] BasicTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (35:2,0 [4] BasicTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (39:2,4 [17] BasicTagHelpers.cshtml) - Html -  data-animation="
+                    IntermediateToken - (56:2,21 [4] BasicTagHelpers.cshtml) - Html - fade
+                    IntermediateToken - (60:2,25 [1] BasicTagHelpers.cshtml) - Html - "
+                    IntermediateToken - (61:2,26 [36] BasicTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (97:2,62 [1] BasicTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (98:2,63 [6] BasicTagHelpers.cshtml) - Html - \n    
+                TagHelper - (104:3,4 [216] BasicTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (145:3,45 [10] BasicTagHelpers.cshtml)
+                            IntermediateToken - (145:3,45 [10] BasicTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (155:4,8 [25] BasicTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (180:4,33 [10] BasicTagHelpers.cshtml)
+                            IntermediateToken - (180:4,33 [10] BasicTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (190:5,8 [71] BasicTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperHtmlAttribute -  - data-interval - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (212:5,30 [7] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (212:5,30 [7] BasicTagHelpers.cshtml) - Html - 2000 + 
+                                CSharpExpression - (220:5,38 [23] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (220:5,38 [23] BasicTagHelpers.cshtml) - CSharp - ViewBag.DefaultInterval
+                                HtmlContent - (243:5,61 [4] BasicTagHelpers.cshtml)
+                                    IntermediateToken - (243:5,61 [4] BasicTagHelpers.cshtml) - Html -  + 1
+                            PreallocatedTagHelperProperty - (255:5,73 [4] BasicTagHelpers.cshtml) - __tagHelperAttribute_1 - type - Type
+                            PreallocatedTagHelperProperty - (255:5,73 [4] BasicTagHelpers.cshtml) - __tagHelperAttribute_1 - type - Type
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (261:5,79 [10] BasicTagHelpers.cshtml)
+                            IntermediateToken - (261:5,79 [10] BasicTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (271:6,8 [39] BasicTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (284:6,21 [8] BasicTagHelpers.cshtml) - __tagHelperAttribute_2 - type - Type
+                            PreallocatedTagHelperProperty - (284:6,21 [8] BasicTagHelpers.cshtml) - __tagHelperAttribute_2 - type - Type
+                            DefaultTagHelperProperty - (303:6,40 [4] BasicTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (303:6,40 [4] BasicTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (310:6,47 [6] BasicTagHelpers.cshtml)
+                            IntermediateToken - (310:6,47 [6] BasicTagHelpers.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_4
+                    DefaultTagHelperExecute - 
+                HtmlContent - (320:7,8 [8] BasicTagHelpers.cshtml)
+                    IntermediateToken - (320:7,8 [2] BasicTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (322:8,0 [6] BasicTagHelpers.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml
new file mode 100644
index 0000000000..8d27de89cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml
@@ -0,0 +1,37 @@
+@{
+    int i = 1;
+}
+
+@while(i <= 10) {
+    <p>Hello from C#, #@(i)</p>
+    i += 1;
+}
+
+@if(i == 11) {
+    <p>We wrote 10 lines!</p>
+}
+
+@switch(i) {
+    case 11:
+        <p>No really, we wrote 10 lines!</p>
+        break;
+    default:
+        <p>Actually, we didn't...</p>
+        break;
+}
+
+@for(int j = 1; j <= 10; j += 2) {
+    <p>Hello again from C#, #@(j)</p>
+}
+
+@try {
+    <p>That time, we wrote 5 lines!</p>
+} catch(Exception ex) {
+    <p>Oh no! An error occurred: @(ex.Message)</p>
+}
+
+<p>i is now @i</p>
+
+@lock(new object()) {
+    <p>This block is locked, for your security!</p>
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e4fa8fb5e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.cs
@@ -0,0 +1,176 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+  
+    int i = 1;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ while(i <= 10) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                   __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                               
+    i += 1;
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ if(i == 11) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                             
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ switch(i) {
+    case 11:
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                                            
+        break;
+    default:
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                                     
+        break;
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ for(int j = 1; j <= 10; j += 2) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                         __o = j;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                                     
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ try {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                                       
+} catch(Exception ex) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                             __o = ex.Message;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                                                  
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+       __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ lock(new object()) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                                                   
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt
new file mode 100644
index 0000000000..d7ad6ccc2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt
@@ -0,0 +1,110 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [18] Blocks.cshtml)
+                    IntermediateToken - (2:0,2 [18] Blocks.cshtml) - CSharp - \n    int i = 1;\n
+                HtmlContent - (23:3,0 [2] Blocks.cshtml)
+                    IntermediateToken - (23:3,0 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (26:4,1 [22] Blocks.cshtml)
+                    IntermediateToken - (26:4,1 [22] Blocks.cshtml) - CSharp - while(i <= 10) {\n    
+                HtmlContent - (48:5,4 [19] Blocks.cshtml)
+                    IntermediateToken - (48:5,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (50:5,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (51:5,7 [16] Blocks.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (69:5,25 [1] Blocks.cshtml)
+                    IntermediateToken - (69:5,25 [1] Blocks.cshtml) - CSharp - i
+                HtmlContent - (71:5,27 [4] Blocks.cshtml)
+                    IntermediateToken - (71:5,27 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (75:5,31 [16] Blocks.cshtml)
+                    IntermediateToken - (75:5,31 [16] Blocks.cshtml) - CSharp - \n    i += 1;\n}
+                HtmlContent - (91:7,1 [4] Blocks.cshtml)
+                    IntermediateToken - (91:7,1 [4] Blocks.cshtml) - Html - \n\n
+                CSharpCode - (96:9,1 [19] Blocks.cshtml)
+                    IntermediateToken - (96:9,1 [19] Blocks.cshtml) - CSharp - if(i == 11) {\n    
+                HtmlContent - (115:10,4 [25] Blocks.cshtml)
+                    IntermediateToken - (115:10,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (117:10,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (118:10,7 [18] Blocks.cshtml) - Html - We wrote 10 lines!
+                    IntermediateToken - (136:10,25 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (140:10,29 [3] Blocks.cshtml)
+                    IntermediateToken - (140:10,29 [3] Blocks.cshtml) - CSharp - \n}
+                HtmlContent - (143:11,1 [4] Blocks.cshtml)
+                    IntermediateToken - (143:11,1 [4] Blocks.cshtml) - Html - \n\n
+                CSharpCode - (148:13,1 [35] Blocks.cshtml)
+                    IntermediateToken - (148:13,1 [35] Blocks.cshtml) - CSharp - switch(i) {\n    case 11:\n        
+                HtmlContent - (183:15,8 [36] Blocks.cshtml)
+                    IntermediateToken - (183:15,8 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (185:15,10 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (186:15,11 [29] Blocks.cshtml) - Html - No really, we wrote 10 lines!
+                    IntermediateToken - (215:15,40 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (219:15,44 [40] Blocks.cshtml)
+                    IntermediateToken - (219:15,44 [40] Blocks.cshtml) - CSharp - \n        break;\n    default:\n        
+                HtmlContent - (259:18,8 [29] Blocks.cshtml)
+                    IntermediateToken - (259:18,8 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (261:18,10 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (262:18,11 [22] Blocks.cshtml) - Html - Actually, we didn't...
+                    IntermediateToken - (284:18,33 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (288:18,37 [19] Blocks.cshtml)
+                    IntermediateToken - (288:18,37 [19] Blocks.cshtml) - CSharp - \n        break;\n}
+                HtmlContent - (307:20,1 [4] Blocks.cshtml)
+                    IntermediateToken - (307:20,1 [4] Blocks.cshtml) - Html - \n\n
+                CSharpCode - (312:22,1 [39] Blocks.cshtml)
+                    IntermediateToken - (312:22,1 [39] Blocks.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n    
+                HtmlContent - (351:23,4 [25] Blocks.cshtml)
+                    IntermediateToken - (351:23,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (353:23,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (354:23,7 [22] Blocks.cshtml) - Html - Hello again from C#, #
+                CSharpExpression - (378:23,31 [1] Blocks.cshtml)
+                    IntermediateToken - (378:23,31 [1] Blocks.cshtml) - CSharp - j
+                HtmlContent - (380:23,33 [4] Blocks.cshtml)
+                    IntermediateToken - (380:23,33 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (384:23,37 [3] Blocks.cshtml)
+                    IntermediateToken - (384:23,37 [3] Blocks.cshtml) - CSharp - \n}
+                HtmlContent - (387:24,1 [4] Blocks.cshtml)
+                    IntermediateToken - (387:24,1 [4] Blocks.cshtml) - Html - \n\n
+                CSharpCode - (392:26,1 [11] Blocks.cshtml)
+                    IntermediateToken - (392:26,1 [11] Blocks.cshtml) - CSharp - try {\n    
+                HtmlContent - (403:27,4 [35] Blocks.cshtml)
+                    IntermediateToken - (403:27,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (405:27,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (406:27,7 [28] Blocks.cshtml) - Html - That time, we wrote 5 lines!
+                    IntermediateToken - (434:27,35 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (438:27,39 [31] Blocks.cshtml)
+                    IntermediateToken - (438:27,39 [31] Blocks.cshtml) - CSharp - \n} catch(Exception ex) {\n    
+                HtmlContent - (469:29,4 [29] Blocks.cshtml)
+                    IntermediateToken - (469:29,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (471:29,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (472:29,7 [26] Blocks.cshtml) - Html - Oh no! An error occurred: 
+                CSharpExpression - (500:29,35 [10] Blocks.cshtml)
+                    IntermediateToken - (500:29,35 [10] Blocks.cshtml) - CSharp - ex.Message
+                HtmlContent - (511:29,46 [4] Blocks.cshtml)
+                    IntermediateToken - (511:29,46 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (515:29,50 [3] Blocks.cshtml)
+                    IntermediateToken - (515:29,50 [3] Blocks.cshtml) - CSharp - \n}
+                HtmlContent - (518:30,1 [16] Blocks.cshtml)
+                    IntermediateToken - (518:30,1 [4] Blocks.cshtml) - Html - \n\n
+                    IntermediateToken - (522:32,0 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (524:32,2 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (525:32,3 [9] Blocks.cshtml) - Html - i is now 
+                CSharpExpression - (535:32,13 [1] Blocks.cshtml)
+                    IntermediateToken - (535:32,13 [1] Blocks.cshtml) - CSharp - i
+                HtmlContent - (536:32,14 [8] Blocks.cshtml)
+                    IntermediateToken - (536:32,14 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (540:32,18 [4] Blocks.cshtml) - Html - \n\n
+                CSharpCode - (545:34,1 [26] Blocks.cshtml)
+                    IntermediateToken - (545:34,1 [26] Blocks.cshtml) - CSharp - lock(new object()) {\n    
+                HtmlContent - (571:35,4 [47] Blocks.cshtml)
+                    IntermediateToken - (571:35,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (573:35,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (574:35,7 [40] Blocks.cshtml) - Html - This block is locked, for your security!
+                    IntermediateToken - (614:35,47 [4] Blocks.cshtml) - Html - </p>
+                CSharpCode - (618:35,51 [3] Blocks.cshtml)
+                    IntermediateToken - (618:35,51 [3] Blocks.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt
new file mode 100644
index 0000000000..111f6a27e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.mappings.txt
@@ -0,0 +1,139 @@
+Source Location: (2:0,2 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+    int i = 1;
+|
+Generated Location: (732:19,2 [18] )
+|
+    int i = 1;
+|
+
+Source Location: (26:4,1 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|while(i <= 10) {
+    |
+Generated Location: (902:27,1 [22] )
+|while(i <= 10) {
+    |
+
+Source Location: (69:5,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|i|
+Generated Location: (1102:35,25 [1] )
+|i|
+
+Source Location: (75:5,31 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+    i += 1;
+}|
+Generated Location: (1288:42,31 [16] )
+|
+    i += 1;
+}|
+
+Source Location: (96:9,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|if(i == 11) {
+    |
+Generated Location: (1459:51,1 [19] )
+|if(i == 11) {
+    |
+
+Source Location: (140:10,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+}|
+Generated Location: (1661:59,29 [3] )
+|
+}|
+
+Source Location: (148:13,1 [35] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|switch(i) {
+    case 11:
+        |
+Generated Location: (1819:67,1 [35] )
+|switch(i) {
+    case 11:
+        |
+
+Source Location: (219:15,44 [40] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+        break;
+    default:
+        |
+Generated Location: (2052:76,44 [40] )
+|
+        break;
+    default:
+        |
+
+Source Location: (288:18,37 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+        break;
+}|
+Generated Location: (2283:86,37 [19] )
+|
+        break;
+}|
+
+Source Location: (312:22,1 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|for(int j = 1; j <= 10; j += 2) {
+    |
+Generated Location: (2457:95,1 [39] )
+|for(int j = 1; j <= 10; j += 2) {
+    |
+
+Source Location: (378:23,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|j|
+Generated Location: (2681:103,31 [1] )
+|j|
+
+Source Location: (384:23,37 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+}|
+Generated Location: (2874:110,37 [3] )
+|
+}|
+
+Source Location: (392:26,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|try {
+    |
+Generated Location: (3032:118,1 [11] )
+|try {
+    |
+
+Source Location: (438:27,39 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+} catch(Exception ex) {
+    |
+Generated Location: (3236:126,39 [31] )
+|
+} catch(Exception ex) {
+    |
+
+Source Location: (500:29,35 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|ex.Message|
+Generated Location: (3456:135,35 [10] )
+|ex.Message|
+
+Source Location: (515:29,50 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+}|
+Generated Location: (3671:142,50 [3] )
+|
+}|
+
+Source Location: (535:32,13 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|i|
+Generated Location: (3841:150,13 [1] )
+|i|
+
+Source Location: (545:34,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|lock(new object()) {
+    |
+Generated Location: (3998:157,1 [26] )
+|lock(new object()) {
+    |
+
+Source Location: (618:35,51 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml)
+|
+}|
+Generated Location: (4229:165,51 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs
new file mode 100644
index 0000000000..ce6adeb982
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs
@@ -0,0 +1,174 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ed55fda2b7b0b96b044fc45da658dc062479924f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"ed55fda2b7b0b96b044fc45da658dc062479924f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+  
+    int i = 1;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ while(i <= 10) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Hello from C#, #");
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                   Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+    i += 1;
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ if(i == 11) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>We wrote 10 lines!</p>\r\n");
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ switch(i) {
+    case 11:
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>No really, we wrote 10 lines!</p>\r\n");
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+        break;
+    default:
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>Actually, we didn\'t...</p>\r\n");
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+        break;
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ for(int j = 1; j <= 10; j += 2) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Hello again from C#, #");
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                         Write(j);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ try {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>That time, we wrote 5 lines!</p>\r\n");
+#nullable restore
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+} catch(Exception ex) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Oh no! An error occurred: ");
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+                             Write(ex.Message);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n<p>i is now ");
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+       Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n\r\n");
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+ lock(new object()) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>This block is locked, for your security!</p>\r\n");
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt
new file mode 100644
index 0000000000..36e2a8f3c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt
@@ -0,0 +1,121 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [18] Blocks.cshtml)
+                    IntermediateToken - (2:0,2 [18] Blocks.cshtml) - CSharp - \n    int i = 1;\n
+                HtmlContent - (23:3,0 [2] Blocks.cshtml)
+                    IntermediateToken - (23:3,0 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (26:4,1 [18] Blocks.cshtml)
+                    IntermediateToken - (26:4,1 [18] Blocks.cshtml) - CSharp - while(i <= 10) {\n
+                HtmlContent - (44:5,0 [23] Blocks.cshtml)
+                    IntermediateToken - (44:5,0 [4] Blocks.cshtml) - Html -     
+                    IntermediateToken - (48:5,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (50:5,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (51:5,7 [16] Blocks.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (69:5,25 [1] Blocks.cshtml)
+                    IntermediateToken - (69:5,25 [1] Blocks.cshtml) - CSharp - i
+                HtmlContent - (71:5,27 [6] Blocks.cshtml)
+                    IntermediateToken - (71:5,27 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (75:5,31 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (77:6,0 [16] Blocks.cshtml)
+                    IntermediateToken - (77:6,0 [16] Blocks.cshtml) - CSharp -     i += 1;\n}\n
+                HtmlContent - (93:8,0 [2] Blocks.cshtml)
+                    IntermediateToken - (93:8,0 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (96:9,1 [15] Blocks.cshtml)
+                    IntermediateToken - (96:9,1 [15] Blocks.cshtml) - CSharp - if(i == 11) {\n
+                HtmlContent - (111:10,0 [31] Blocks.cshtml)
+                    IntermediateToken - (111:10,0 [4] Blocks.cshtml) - Html -     
+                    IntermediateToken - (115:10,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (117:10,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (118:10,7 [18] Blocks.cshtml) - Html - We wrote 10 lines!
+                    IntermediateToken - (136:10,25 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (140:10,29 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (142:11,0 [3] Blocks.cshtml)
+                    IntermediateToken - (142:11,0 [3] Blocks.cshtml) - CSharp - }\n
+                HtmlContent - (145:12,0 [2] Blocks.cshtml)
+                    IntermediateToken - (145:12,0 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (148:13,1 [27] Blocks.cshtml)
+                    IntermediateToken - (148:13,1 [27] Blocks.cshtml) - CSharp - switch(i) {\n    case 11:\n
+                HtmlContent - (175:15,0 [46] Blocks.cshtml)
+                    IntermediateToken - (175:15,0 [8] Blocks.cshtml) - Html -         
+                    IntermediateToken - (183:15,8 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (185:15,10 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (186:15,11 [29] Blocks.cshtml) - Html - No really, we wrote 10 lines!
+                    IntermediateToken - (215:15,40 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (219:15,44 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (221:16,0 [30] Blocks.cshtml)
+                    IntermediateToken - (221:16,0 [30] Blocks.cshtml) - CSharp -         break;\n    default:\n
+                HtmlContent - (251:18,0 [39] Blocks.cshtml)
+                    IntermediateToken - (251:18,0 [8] Blocks.cshtml) - Html -         
+                    IntermediateToken - (259:18,8 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (261:18,10 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (262:18,11 [22] Blocks.cshtml) - Html - Actually, we didn't...
+                    IntermediateToken - (284:18,33 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (288:18,37 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (290:19,0 [19] Blocks.cshtml)
+                    IntermediateToken - (290:19,0 [19] Blocks.cshtml) - CSharp -         break;\n}\n
+                HtmlContent - (309:21,0 [2] Blocks.cshtml)
+                    IntermediateToken - (309:21,0 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (312:22,1 [35] Blocks.cshtml)
+                    IntermediateToken - (312:22,1 [35] Blocks.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n
+                HtmlContent - (347:23,0 [29] Blocks.cshtml)
+                    IntermediateToken - (347:23,0 [4] Blocks.cshtml) - Html -     
+                    IntermediateToken - (351:23,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (353:23,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (354:23,7 [22] Blocks.cshtml) - Html - Hello again from C#, #
+                CSharpExpression - (378:23,31 [1] Blocks.cshtml)
+                    IntermediateToken - (378:23,31 [1] Blocks.cshtml) - CSharp - j
+                HtmlContent - (380:23,33 [6] Blocks.cshtml)
+                    IntermediateToken - (380:23,33 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (384:23,37 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (386:24,0 [3] Blocks.cshtml)
+                    IntermediateToken - (386:24,0 [3] Blocks.cshtml) - CSharp - }\n
+                HtmlContent - (389:25,0 [2] Blocks.cshtml)
+                    IntermediateToken - (389:25,0 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (392:26,1 [7] Blocks.cshtml)
+                    IntermediateToken - (392:26,1 [7] Blocks.cshtml) - CSharp - try {\n
+                HtmlContent - (399:27,0 [41] Blocks.cshtml)
+                    IntermediateToken - (399:27,0 [4] Blocks.cshtml) - Html -     
+                    IntermediateToken - (403:27,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (405:27,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (406:27,7 [28] Blocks.cshtml) - Html - That time, we wrote 5 lines!
+                    IntermediateToken - (434:27,35 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (438:27,39 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (440:28,0 [25] Blocks.cshtml)
+                    IntermediateToken - (440:28,0 [25] Blocks.cshtml) - CSharp - } catch(Exception ex) {\n
+                HtmlContent - (465:29,0 [33] Blocks.cshtml)
+                    IntermediateToken - (465:29,0 [4] Blocks.cshtml) - Html -     
+                    IntermediateToken - (469:29,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (471:29,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (472:29,7 [26] Blocks.cshtml) - Html - Oh no! An error occurred: 
+                CSharpExpression - (500:29,35 [10] Blocks.cshtml)
+                    IntermediateToken - (500:29,35 [10] Blocks.cshtml) - CSharp - ex.Message
+                HtmlContent - (511:29,46 [6] Blocks.cshtml)
+                    IntermediateToken - (511:29,46 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (515:29,50 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (517:30,0 [3] Blocks.cshtml)
+                    IntermediateToken - (517:30,0 [3] Blocks.cshtml) - CSharp - }\n
+                HtmlContent - (520:31,0 [14] Blocks.cshtml)
+                    IntermediateToken - (520:31,0 [2] Blocks.cshtml) - Html - \n
+                    IntermediateToken - (522:32,0 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (524:32,2 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (525:32,3 [9] Blocks.cshtml) - Html - i is now 
+                CSharpExpression - (535:32,13 [1] Blocks.cshtml)
+                    IntermediateToken - (535:32,13 [1] Blocks.cshtml) - CSharp - i
+                HtmlContent - (536:32,14 [8] Blocks.cshtml)
+                    IntermediateToken - (536:32,14 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (540:32,18 [4] Blocks.cshtml) - Html - \n\n
+                CSharpCode - (545:34,1 [22] Blocks.cshtml)
+                    IntermediateToken - (545:34,1 [22] Blocks.cshtml) - CSharp - lock(new object()) {\n
+                HtmlContent - (567:35,0 [53] Blocks.cshtml)
+                    IntermediateToken - (567:35,0 [4] Blocks.cshtml) - Html -     
+                    IntermediateToken - (571:35,4 [2] Blocks.cshtml) - Html - <p
+                    IntermediateToken - (573:35,6 [1] Blocks.cshtml) - Html - >
+                    IntermediateToken - (574:35,7 [40] Blocks.cshtml) - Html - This block is locked, for your security!
+                    IntermediateToken - (614:35,47 [4] Blocks.cshtml) - Html - </p>
+                    IntermediateToken - (618:35,51 [2] Blocks.cshtml) - Html - \n
+                CSharpCode - (620:36,0 [1] Blocks.cshtml)
+                    IntermediateToken - (620:36,0 [1] Blocks.cshtml) - CSharp - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml
new file mode 100644
index 0000000000..e2c134767e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml
@@ -0,0 +1,43 @@
+<body>
+    @{
+        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()
+        {
+            ["John Doe"] = ("John", "Doe", true)
+        };
+
+        @* This is all C# 7 bits that should work. *@
+
+        int Sixteen = 0b0001_0000;
+        long BillionsAndBillions = 100_000_000_000;
+        double AvogadroConstant = 6.022_140_857_747_474e23;
+        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;
+    }
+
+    @if (nameLookup.TryGetValue("John Doe", out var entry))
+    {
+        if (entry.Extra is bool alive)
+        {
+            // Do Something
+        }
+    }
+    <p>
+        Here's a very unique number: @(1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M)
+    </p>
+
+    <div>
+        @((First: "John", Last: "Doe").First) @* Value Tuples *@
+    </div>
+
+    @switch (entry.Extra)
+    {
+        case int age:
+            // Do something
+            break;
+        case IEnumerable<string> childrenNames:
+            // Do more something
+            break;
+        case null:
+            // Do even more of something
+            break;
+    }
+</body>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d72f3f599f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.cs
@@ -0,0 +1,93 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp7_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+      
+        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()
+        {
+            ["John Doe"] = ("John", "Doe", true)
+        };
+
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+                                                     
+
+        int Sixteen = 0b0001_0000;
+        long BillionsAndBillions = 100_000_000_000;
+        double AvogadroConstant = 6.022_140_857_747_474e23;
+        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+     if (nameLookup.TryGetValue("John Doe", out var entry))
+    {
+        if (entry.Extra is bool alive)
+        {
+            // Do Something
+        }
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+                                 __o = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+    __o = (First: "John", Last: "Doe").First;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+     switch (entry.Extra)
+    {
+        case int age:
+            // Do something
+            break;
+        case IEnumerable<string> childrenNames:
+            // Do more something
+            break;
+        case null:
+            // Do even more of something
+            break;
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt
new file mode 100644
index 0000000000..88f3ed74c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt
@@ -0,0 +1,50 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp7_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [12] CSharp7.cshtml)
+                    IntermediateToken - (0:0,0 [5] CSharp7.cshtml) - Html - <body
+                    IntermediateToken - (5:0,5 [1] CSharp7.cshtml) - Html - >
+                    IntermediateToken - (6:0,6 [6] CSharp7.cshtml) - Html - \n    
+                CSharpCode - (14:1,6 [187] CSharp7.cshtml)
+                    IntermediateToken - (14:1,6 [187] CSharp7.cshtml) - CSharp - \n        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()\n        {\n            ["John Doe"] = ("John", "Doe", true)\n        };\n\n        
+                CSharpCode - (246:7,53 [253] CSharp7.cshtml)
+                    IntermediateToken - (246:7,53 [253] CSharp7.cshtml) - CSharp - \n\n        int Sixteen = 0b0001_0000;\n        long BillionsAndBillions = 100_000_000_000;\n        double AvogadroConstant = 6.022_140_857_747_474e23;\n        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;\n    
+                HtmlContent - (502:14,0 [6] CSharp7.cshtml)
+                    IntermediateToken - (502:14,0 [6] CSharp7.cshtml) - Html - \n    
+                CSharpCode - (509:15,5 [159] CSharp7.cshtml)
+                    IntermediateToken - (509:15,5 [159] CSharp7.cshtml) - CSharp - if (nameLookup.TryGetValue("John Doe", out var entry))\n    {\n        if (entry.Extra is bool alive)\n        {\n            // Do Something\n        }\n    }
+                HtmlContent - (668:21,5 [48] CSharp7.cshtml)
+                    IntermediateToken - (668:21,5 [6] CSharp7.cshtml) - Html - \n    
+                    IntermediateToken - (674:22,4 [2] CSharp7.cshtml) - Html - <p
+                    IntermediateToken - (676:22,6 [1] CSharp7.cshtml) - Html - >
+                    IntermediateToken - (677:22,7 [39] CSharp7.cshtml) - Html - \n        Here's a very unique number: 
+                CSharpExpression - (718:23,39 [62] CSharp7.cshtml)
+                    IntermediateToken - (718:23,39 [62] CSharp7.cshtml) - CSharp - 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M
+                HtmlContent - (781:23,102 [33] CSharp7.cshtml)
+                    IntermediateToken - (781:23,102 [6] CSharp7.cshtml) - Html - \n    
+                    IntermediateToken - (787:24,4 [4] CSharp7.cshtml) - Html - </p>
+                    IntermediateToken - (791:24,8 [8] CSharp7.cshtml) - Html - \n\n    
+                    IntermediateToken - (799:26,4 [4] CSharp7.cshtml) - Html - <div
+                    IntermediateToken - (803:26,8 [1] CSharp7.cshtml) - Html - >
+                    IntermediateToken - (804:26,9 [10] CSharp7.cshtml) - Html - \n        
+                CSharpExpression - (816:27,10 [34] CSharp7.cshtml)
+                    IntermediateToken - (816:27,10 [34] CSharp7.cshtml) - CSharp - (First: "John", Last: "Doe").First
+                HtmlContent - (851:27,45 [1] CSharp7.cshtml)
+                    IntermediateToken - (851:27,45 [1] CSharp7.cshtml) - Html -  
+                HtmlContent - (870:27,64 [20] CSharp7.cshtml)
+                    IntermediateToken - (870:27,64 [6] CSharp7.cshtml) - Html - \n    
+                    IntermediateToken - (876:28,4 [6] CSharp7.cshtml) - Html - </div>
+                    IntermediateToken - (882:28,10 [8] CSharp7.cshtml) - Html - \n\n    
+                CSharpCode - (891:30,5 [291] CSharp7.cshtml)
+                    IntermediateToken - (891:30,5 [291] CSharp7.cshtml) - CSharp - switch (entry.Extra)\n    {\n        case int age:\n            // Do something\n            break;\n        case IEnumerable<string> childrenNames:\n            // Do more something\n            break;\n        case null:\n            // Do even more of something\n            break;\n    }
+                HtmlContent - (1182:41,5 [9] CSharp7.cshtml)
+                    IntermediateToken - (1182:41,5 [2] CSharp7.cshtml) - Html - \n
+                    IntermediateToken - (1184:42,0 [7] CSharp7.cshtml) - Html - </body>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt
new file mode 100644
index 0000000000..ad00d2d80d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.mappings.txt
@@ -0,0 +1,88 @@
+Source Location: (14:1,6 [187] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml)
+|
+        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()
+        {
+            ["John Doe"] = ("John", "Doe", true)
+        };
+
+        |
+Generated Location: (738:19,6 [187] )
+|
+        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()
+        {
+            ["John Doe"] = ("John", "Doe", true)
+        };
+
+        |
+
+Source Location: (246:7,53 [253] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml)
+|
+
+        int Sixteen = 0b0001_0000;
+        long BillionsAndBillions = 100_000_000_000;
+        double AvogadroConstant = 6.022_140_857_747_474e23;
+        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;
+    |
+Generated Location: (1132:32,53 [253] )
+|
+
+        int Sixteen = 0b0001_0000;
+        long BillionsAndBillions = 100_000_000_000;
+        double AvogadroConstant = 6.022_140_857_747_474e23;
+        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;
+    |
+
+Source Location: (509:15,5 [159] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml)
+|if (nameLookup.TryGetValue("John Doe", out var entry))
+    {
+        if (entry.Extra is bool alive)
+        {
+            // Do Something
+        }
+    }|
+Generated Location: (1545:45,5 [159] )
+|if (nameLookup.TryGetValue("John Doe", out var entry))
+    {
+        if (entry.Extra is bool alive)
+        {
+            // Do Something
+        }
+    }|
+
+Source Location: (718:23,39 [62] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml)
+|1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M|
+Generated Location: (1898:58,39 [62] )
+|1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M|
+
+Source Location: (816:27,10 [34] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml)
+|(First: "John", Last: "Doe").First|
+Generated Location: (2126:65,10 [34] )
+|(First: "John", Last: "Doe").First|
+
+Source Location: (891:30,5 [291] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml)
+|switch (entry.Extra)
+    {
+        case int age:
+            // Do something
+            break;
+        case IEnumerable<string> childrenNames:
+            // Do more something
+            break;
+        case null:
+            // Do even more of something
+            break;
+    }|
+Generated Location: (2321:72,5 [291] )
+|switch (entry.Extra)
+    {
+        case int age:
+            // Do something
+            break;
+        case IEnumerable<string> childrenNames:
+            // Do more something
+            break;
+        case null:
+            // Do even more of something
+            break;
+    }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs
new file mode 100644
index 0000000000..cf2fd1a3bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.codegen.cs
@@ -0,0 +1,96 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "69466b91f73ea9f94ccef045495a0da11bb763c6"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp7_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"69466b91f73ea9f94ccef045495a0da11bb763c6", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp7_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<body>\r\n");
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+      
+        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()
+        {
+            ["John Doe"] = ("John", "Doe", true)
+        };
+
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+                                                     
+
+        int Sixteen = 0b0001_0000;
+        long BillionsAndBillions = 100_000_000_000;
+        double AvogadroConstant = 6.022_140_857_747_474e23;
+        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;
+    
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+     if (nameLookup.TryGetValue("John Doe", out var entry))
+    {
+        if (entry.Extra is bool alive)
+        {
+            // Do Something
+        }
+    }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>\r\n        Here\'s a very unique number: ");
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+                                 Write(1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n    </p>\r\n\r\n    <div>\r\n        ");
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+    Write((First: "John", Last: "Doe").First);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(" ");
+            WriteLiteral("\r\n    </div>\r\n\r\n");
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml"
+     switch (entry.Extra)
+    {
+        case int age:
+            // Do something
+            break;
+        case IEnumerable<string> childrenNames:
+            // Do more something
+            break;
+        case null:
+            // Do even more of something
+            break;
+    }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</body>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt
new file mode 100644
index 0000000000..b6cb7face8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt
@@ -0,0 +1,51 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp7_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [8] CSharp7.cshtml)
+                    IntermediateToken - (0:0,0 [5] CSharp7.cshtml) - Html - <body
+                    IntermediateToken - (5:0,5 [1] CSharp7.cshtml) - Html - >
+                    IntermediateToken - (6:0,6 [2] CSharp7.cshtml) - Html - \n
+                CSharpCode - (8:1,0 [4] CSharp7.cshtml)
+                    IntermediateToken - (8:1,0 [4] CSharp7.cshtml) - CSharp -     
+                CSharpCode - (14:1,6 [187] CSharp7.cshtml)
+                    IntermediateToken - (14:1,6 [187] CSharp7.cshtml) - CSharp - \n        var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()\n        {\n            ["John Doe"] = ("John", "Doe", true)\n        };\n\n        
+                CSharpCode - (246:7,53 [253] CSharp7.cshtml)
+                    IntermediateToken - (246:7,53 [253] CSharp7.cshtml) - CSharp - \n\n        int Sixteen = 0b0001_0000;\n        long BillionsAndBillions = 100_000_000_000;\n        double AvogadroConstant = 6.022_140_857_747_474e23;\n        decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;\n    
+                HtmlContent - (502:14,0 [2] CSharp7.cshtml)
+                    IntermediateToken - (502:14,0 [2] CSharp7.cshtml) - Html - \n
+                CSharpCode - (504:15,0 [4] CSharp7.cshtml)
+                    IntermediateToken - (504:15,0 [4] CSharp7.cshtml) - CSharp -     
+                CSharpCode - (509:15,5 [161] CSharp7.cshtml)
+                    IntermediateToken - (509:15,5 [161] CSharp7.cshtml) - CSharp - if (nameLookup.TryGetValue("John Doe", out var entry))\n    {\n        if (entry.Extra is bool alive)\n        {\n            // Do Something\n        }\n    }\n
+                HtmlContent - (670:22,0 [46] CSharp7.cshtml)
+                    IntermediateToken - (670:22,0 [4] CSharp7.cshtml) - Html -     
+                    IntermediateToken - (674:22,4 [2] CSharp7.cshtml) - Html - <p
+                    IntermediateToken - (676:22,6 [1] CSharp7.cshtml) - Html - >
+                    IntermediateToken - (677:22,7 [39] CSharp7.cshtml) - Html - \n        Here's a very unique number: 
+                CSharpExpression - (718:23,39 [62] CSharp7.cshtml)
+                    IntermediateToken - (718:23,39 [62] CSharp7.cshtml) - CSharp - 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M
+                HtmlContent - (781:23,102 [33] CSharp7.cshtml)
+                    IntermediateToken - (781:23,102 [6] CSharp7.cshtml) - Html - \n    
+                    IntermediateToken - (787:24,4 [4] CSharp7.cshtml) - Html - </p>
+                    IntermediateToken - (791:24,8 [8] CSharp7.cshtml) - Html - \n\n    
+                    IntermediateToken - (799:26,4 [4] CSharp7.cshtml) - Html - <div
+                    IntermediateToken - (803:26,8 [1] CSharp7.cshtml) - Html - >
+                    IntermediateToken - (804:26,9 [2] CSharp7.cshtml) - Html - \n
+                    IntermediateToken - (806:27,0 [8] CSharp7.cshtml) - Html -         
+                CSharpExpression - (816:27,10 [34] CSharp7.cshtml)
+                    IntermediateToken - (816:27,10 [34] CSharp7.cshtml) - CSharp - (First: "John", Last: "Doe").First
+                HtmlContent - (851:27,45 [1] CSharp7.cshtml)
+                    IntermediateToken - (851:27,45 [1] CSharp7.cshtml) - Html -  
+                HtmlContent - (870:27,64 [16] CSharp7.cshtml)
+                    IntermediateToken - (870:27,64 [6] CSharp7.cshtml) - Html - \n    
+                    IntermediateToken - (876:28,4 [6] CSharp7.cshtml) - Html - </div>
+                    IntermediateToken - (882:28,10 [4] CSharp7.cshtml) - Html - \n\n
+                CSharpCode - (886:30,0 [4] CSharp7.cshtml)
+                    IntermediateToken - (886:30,0 [4] CSharp7.cshtml) - CSharp -     
+                CSharpCode - (891:30,5 [293] CSharp7.cshtml)
+                    IntermediateToken - (891:30,5 [293] CSharp7.cshtml) - CSharp - switch (entry.Extra)\n    {\n        case int age:\n            // Do something\n            break;\n        case IEnumerable<string> childrenNames:\n            // Do more something\n            break;\n        case null:\n            // Do even more of something\n            break;\n    }\n
+                HtmlContent - (1184:42,0 [7] CSharp7.cshtml)
+                    IntermediateToken - (1184:42,0 [7] CSharp7.cshtml) - Html - </body>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml
new file mode 100644
index 0000000000..55a1f9f763
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml
@@ -0,0 +1,52 @@
+@using System.Collections.Generic
+
+@{
+    IAsyncEnumerable<bool> GetAsyncEnumerable()
+    {
+        return null;
+    }
+
+    await foreach (var val in GetAsyncEnumerable())
+    {
+
+    }
+
+    Range range = 1..5;
+    using var disposable = GetLastDisposableInRange(range);
+
+    var words = Array.Empty<string>();
+    var testEnum = GetEnum();
+    static TestEnum GetEnum()
+    {
+        return TestEnum.First;
+    }
+}
+
+@words[1..2]
+@(words[^2..^0])
+
+@(testEnum switch
+{
+    TestEnum.First => "The First!",
+    TestEnum.Second => "The Second!",
+    _ => "The others",
+})
+
+@await foreach (var val in GetAsyncEnumerable())
+{
+    @val
+}
+
+@functions {
+    enum TestEnum
+    {
+        First,
+        Second
+    }
+
+    IDisposable GetLastDisposableInRange(Range range)
+    {
+        var disposables = (IDisposable[])ViewData["disposables"];
+        return disposables[range][^1];
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs
new file mode 100644
index 0000000000..a324d77c3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs
@@ -0,0 +1,123 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+using System.Collections.Generic;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+  
+    IAsyncEnumerable<bool> GetAsyncEnumerable()
+    {
+        return null;
+    }
+
+    await foreach (var val in GetAsyncEnumerable())
+    {
+
+    }
+
+    Range range = 1..5;
+    using var disposable = GetLastDisposableInRange(range);
+
+    var words = Array.Empty<string>();
+    var testEnum = GetEnum();
+    static TestEnum GetEnum()
+    {
+        return TestEnum.First;
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = words[1..2];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = words[^2..^0];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = testEnum switch
+{
+    TestEnum.First => "The First!",
+    TestEnum.Second => "The Second!",
+    _ => "The others",
+};
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+ await foreach (var val in GetAsyncEnumerable())
+{
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = val;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+        
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+            
+    enum TestEnum
+    {
+        First,
+        Second
+    }
+
+    IDisposable GetLastDisposableInRange(Range range)
+    {
+        var disposables = (IDisposable[])ViewData["disposables"];
+        return disposables[range][^1];
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt
new file mode 100644
index 0000000000..d88c704ac3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        UsingDirective - (1:0,1 [32] CSharp8.cshtml) - System.Collections.Generic
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:0,33 [4] CSharp8.cshtml)
+                    IntermediateToken - (33:0,33 [4] CSharp8.cshtml) - Html - \n\n
+                CSharpCode - (39:2,2 [396] CSharp8.cshtml)
+                    IntermediateToken - (39:2,2 [396] CSharp8.cshtml) - CSharp - \n    IAsyncEnumerable<bool> GetAsyncEnumerable()\n    {\n        return null;\n    }\n\n    await foreach (var val in GetAsyncEnumerable())\n    {\n\n    }\n\n    Range range = 1..5;\n    using var disposable = GetLastDisposableInRange(range);\n\n    var words = Array.Empty<string>();\n    var testEnum = GetEnum();\n    static TestEnum GetEnum()\n    {\n        return TestEnum.First;\n    }\n
+                HtmlContent - (438:23,0 [2] CSharp8.cshtml)
+                    IntermediateToken - (438:23,0 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (441:24,1 [11] CSharp8.cshtml)
+                    IntermediateToken - (441:24,1 [11] CSharp8.cshtml) - CSharp - words[1..2]
+                HtmlContent - (452:24,12 [2] CSharp8.cshtml)
+                    IntermediateToken - (452:24,12 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (456:25,2 [13] CSharp8.cshtml)
+                    IntermediateToken - (456:25,2 [13] CSharp8.cshtml) - CSharp - words[^2..^0]
+                HtmlContent - (470:25,16 [4] CSharp8.cshtml)
+                    IntermediateToken - (470:25,16 [4] CSharp8.cshtml) - Html - \n\n
+                CSharpExpression - (476:27,2 [121] CSharp8.cshtml)
+                    IntermediateToken - (476:27,2 [121] CSharp8.cshtml) - CSharp - testEnum switch\n{\n    TestEnum.First => "The First!",\n    TestEnum.Second => "The Second!",\n    _ => "The others",\n}
+                HtmlContent - (598:32,2 [4] CSharp8.cshtml)
+                    IntermediateToken - (598:32,2 [4] CSharp8.cshtml) - Html - \n\n
+                CSharpCode - (603:34,1 [56] CSharp8.cshtml)
+                    IntermediateToken - (603:34,1 [56] CSharp8.cshtml) - CSharp - await foreach (var val in GetAsyncEnumerable())\n{\n    
+                CSharpExpression - (660:36,5 [3] CSharp8.cshtml)
+                    IntermediateToken - (660:36,5 [3] CSharp8.cshtml) - CSharp - val
+                CSharpCode - (663:36,8 [3] CSharp8.cshtml)
+                    IntermediateToken - (663:36,8 [3] CSharp8.cshtml) - CSharp - \n}
+                HtmlContent - (666:37,1 [4] CSharp8.cshtml)
+                    IntermediateToken - (666:37,1 [4] CSharp8.cshtml) - Html - \n\n
+            CSharpCode - (682:39,12 [245] CSharp8.cshtml)
+                IntermediateToken - (682:39,12 [245] CSharp8.cshtml) - CSharp - \n    enum TestEnum\n    {\n        First,\n        Second\n    }\n\n    IDisposable GetLastDisposableInRange(Range range)\n    {\n        var disposables = (IDisposable[])ViewData["disposables"];\n        return disposables[range][^1];\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt
new file mode 100644
index 0000000000..dda962d084
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt
@@ -0,0 +1,125 @@
+Source Location: (1:0,1 [32] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|using System.Collections.Generic|
+Generated Location: (249:7,0 [32] )
+|using System.Collections.Generic|
+
+Source Location: (39:2,2 [396] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|
+    IAsyncEnumerable<bool> GetAsyncEnumerable()
+    {
+        return null;
+    }
+
+    await foreach (var val in GetAsyncEnumerable())
+    {
+
+    }
+
+    Range range = 1..5;
+    using var disposable = GetLastDisposableInRange(range);
+
+    var words = Array.Empty<string>();
+    var testEnum = GetEnum();
+    static TestEnum GetEnum()
+    {
+        return TestEnum.First;
+    }
+|
+Generated Location: (921:26,2 [396] )
+|
+    IAsyncEnumerable<bool> GetAsyncEnumerable()
+    {
+        return null;
+    }
+
+    await foreach (var val in GetAsyncEnumerable())
+    {
+
+    }
+
+    Range range = 1..5;
+    using var disposable = GetLastDisposableInRange(range);
+
+    var words = Array.Empty<string>();
+    var testEnum = GetEnum();
+    static TestEnum GetEnum()
+    {
+        return TestEnum.First;
+    }
+|
+
+Source Location: (441:24,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|words[1..2]|
+Generated Location: (1476:52,6 [11] )
+|words[1..2]|
+
+Source Location: (456:25,2 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|words[^2..^0]|
+Generated Location: (1649:59,6 [13] )
+|words[^2..^0]|
+
+Source Location: (476:27,2 [121] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|testEnum switch
+{
+    TestEnum.First => "The First!",
+    TestEnum.Second => "The Second!",
+    _ => "The others",
+}|
+Generated Location: (1824:66,6 [121] )
+|testEnum switch
+{
+    TestEnum.First => "The First!",
+    TestEnum.Second => "The Second!",
+    _ => "The others",
+}|
+
+Source Location: (603:34,1 [56] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|await foreach (var val in GetAsyncEnumerable())
+{
+    |
+Generated Location: (2102:78,1 [56] )
+|await foreach (var val in GetAsyncEnumerable())
+{
+    |
+
+Source Location: (660:36,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|val|
+Generated Location: (2319:87,6 [3] )
+|val|
+
+Source Location: (663:36,8 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|
+}|
+Generated Location: (2486:94,8 [3] )
+|
+}|
+
+Source Location: (682:39,12 [245] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|
+    enum TestEnum
+    {
+        First,
+        Second
+    }
+
+    IDisposable GetLastDisposableInRange(Range range)
+    {
+        var disposables = (IDisposable[])ViewData["disposables"];
+        return disposables[range][^1];
+    }
+|
+Generated Location: (2705:104,12 [245] )
+|
+    enum TestEnum
+    {
+        First,
+        Second
+    }
+
+    IDisposable GetLastDisposableInRange(Range range)
+    {
+        var disposables = (IDisposable[])ViewData["disposables"];
+        return disposables[range][^1];
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs
new file mode 100644
index 0000000000..444b967afa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs
@@ -0,0 +1,125 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fee381e8889cc49d7a4b1dea29510c0fc9ac44c9"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+using System.Collections.Generic;
+
+#line default
+#line hidden
+#nullable disable
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"fee381e8889cc49d7a4b1dea29510c0fc9ac44c9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+  
+    IAsyncEnumerable<bool> GetAsyncEnumerable()
+    {
+        return null;
+    }
+
+    await foreach (var val in GetAsyncEnumerable())
+    {
+
+    }
+
+    Range range = 1..5;
+    using var disposable = GetLastDisposableInRange(range);
+
+    var words = Array.Empty<string>();
+    var testEnum = GetEnum();
+    static TestEnum GetEnum()
+    {
+        return TestEnum.First;
+    }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(words[1..2]);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(words[^2..^0]);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n\r\n");
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(testEnum switch
+{
+    TestEnum.First => "The First!",
+    TestEnum.Second => "The Second!",
+    _ => "The others",
+});
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n\r\n");
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+ await foreach (var val in GetAsyncEnumerable())
+{
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(val);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+        
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+            
+    enum TestEnum
+    {
+        First,
+        Second
+    }
+
+    IDisposable GetLastDisposableInRange(Range range)
+    {
+        var disposables = (IDisposable[])ViewData["disposables"];
+        return disposables[range][^1];
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt
new file mode 100644
index 0000000000..4c29c1f76f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        UsingDirective - (1:0,1 [34] CSharp8.cshtml) - System.Collections.Generic
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (35:1,0 [2] CSharp8.cshtml)
+                    IntermediateToken - (35:1,0 [2] CSharp8.cshtml) - Html - \n
+                CSharpCode - (39:2,2 [396] CSharp8.cshtml)
+                    IntermediateToken - (39:2,2 [396] CSharp8.cshtml) - CSharp - \n    IAsyncEnumerable<bool> GetAsyncEnumerable()\n    {\n        return null;\n    }\n\n    await foreach (var val in GetAsyncEnumerable())\n    {\n\n    }\n\n    Range range = 1..5;\n    using var disposable = GetLastDisposableInRange(range);\n\n    var words = Array.Empty<string>();\n    var testEnum = GetEnum();\n    static TestEnum GetEnum()\n    {\n        return TestEnum.First;\n    }\n
+                HtmlContent - (438:23,0 [2] CSharp8.cshtml)
+                    IntermediateToken - (438:23,0 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (441:24,1 [11] CSharp8.cshtml)
+                    IntermediateToken - (441:24,1 [11] CSharp8.cshtml) - CSharp - words[1..2]
+                HtmlContent - (452:24,12 [2] CSharp8.cshtml)
+                    IntermediateToken - (452:24,12 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (456:25,2 [13] CSharp8.cshtml)
+                    IntermediateToken - (456:25,2 [13] CSharp8.cshtml) - CSharp - words[^2..^0]
+                HtmlContent - (470:25,16 [4] CSharp8.cshtml)
+                    IntermediateToken - (470:25,16 [4] CSharp8.cshtml) - Html - \n\n
+                CSharpExpression - (476:27,2 [121] CSharp8.cshtml)
+                    IntermediateToken - (476:27,2 [121] CSharp8.cshtml) - CSharp - testEnum switch\n{\n    TestEnum.First => "The First!",\n    TestEnum.Second => "The Second!",\n    _ => "The others",\n}
+                HtmlContent - (598:32,2 [4] CSharp8.cshtml)
+                    IntermediateToken - (598:32,2 [4] CSharp8.cshtml) - Html - \n\n
+                CSharpCode - (603:34,1 [56] CSharp8.cshtml)
+                    IntermediateToken - (603:34,1 [56] CSharp8.cshtml) - CSharp - await foreach (var val in GetAsyncEnumerable())\n{\n    
+                CSharpExpression - (660:36,5 [3] CSharp8.cshtml)
+                    IntermediateToken - (660:36,5 [3] CSharp8.cshtml) - CSharp - val
+                CSharpCode - (663:36,8 [5] CSharp8.cshtml)
+                    IntermediateToken - (663:36,8 [5] CSharp8.cshtml) - CSharp - \n}\n
+                HtmlContent - (668:38,0 [2] CSharp8.cshtml)
+                    IntermediateToken - (668:38,0 [2] CSharp8.cshtml) - Html - \n
+            CSharpCode - (682:39,12 [245] CSharp8.cshtml)
+                IntermediateToken - (682:39,12 [245] CSharp8.cshtml) - CSharp - \n    enum TestEnum\n    {\n        First,\n        Second\n    }\n\n    IDisposable GetLastDisposableInRange(Range range)\n    {\n        var disposables = (IDisposable[])ViewData["disposables"];\n        return disposables[range][^1];\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml
new file mode 100644
index 0000000000..1c78883a10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml
@@ -0,0 +1,5 @@
+@{
+    for(int i = 1; i <= 10; i++) {
+        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml
new file mode 100644
index 0000000000..38417d481c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml
@@ -0,0 +1 @@
+@{
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3c1f46fb0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml"
+  
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..c3072c6248
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..764d204441
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [0] CodeBlockAtEOF.cshtml)
+                    IntermediateToken - (2:0,2 [0] CodeBlockAtEOF.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..8500fe260a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (2:0,2 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml)
+||
+Generated Location: (748:19,2 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..95ce16e337
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.codegen.cs
@@ -0,0 +1,18 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b4fbc3b07404cc5be74ae0ba920a16e9cf39a378"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"b4fbc3b07404cc5be74ae0ba920a16e9cf39a378", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..c3072c6248
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF.cshtml(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..daf2692204
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt
@@ -0,0 +1,8 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [0] CodeBlockAtEOF.cshtml)
+                    IntermediateToken - (2:0,2 [0] CodeBlockAtEOF.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml
new file mode 100644
index 0000000000..9c34a940eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml
@@ -0,0 +1,4 @@
+@{
+    var a = 1; <text>foo</text> 		
+    var b = 1;			<text>bar @(a+b)</text>
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs
new file mode 100644
index 0000000000..b887486ba1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.cs
@@ -0,0 +1,52 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+  
+    var a = 1; 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+                                		
+    var b = 1;			
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+                                __o = a+b;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+                                                 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt
new file mode 100644
index 0000000000..8a220afc95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [17] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (2:0,2 [17] CodeBlockWithTextElement.cshtml) - CSharp - \n    var a = 1; 
+                HtmlContent - (25:1,21 [3] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (25:1,21 [3] CodeBlockWithTextElement.cshtml) - Html - foo
+                CSharpCode - (35:1,31 [22] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (35:1,31 [22] CodeBlockWithTextElement.cshtml) - CSharp -  		\n    var b = 1;			
+                HtmlContent - (63:2,23 [4] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (63:2,23 [4] CodeBlockWithTextElement.cshtml) - Html - bar 
+                CSharpExpression - (69:2,29 [3] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (69:2,29 [3] CodeBlockWithTextElement.cshtml) - CSharp - a+b
+                CSharpCode - (80:2,40 [2] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt
new file mode 100644
index 0000000000..3705416169
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.mappings.txt
@@ -0,0 +1,26 @@
+Source Location: (2:0,2 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml)
+|
+    var a = 1; |
+Generated Location: (768:19,2 [17] )
+|
+    var a = 1; |
+
+Source Location: (35:1,31 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml)
+| 		
+    var b = 1;			|
+Generated Location: (987:27,31 [22] )
+| 		
+    var b = 1;			|
+
+Source Location: (69:2,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml)
+|a+b|
+Generated Location: (1218:35,38 [3] )
+|a+b|
+
+Source Location: (80:2,40 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml)
+|
+|
+Generated Location: (1442:42,49 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs
new file mode 100644
index 0000000000..59764e3772
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.codegen.cs
@@ -0,0 +1,43 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b794c71d64ba4731b2802f7d0dae1f863a9f9dd9"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"b794c71d64ba4731b2802f7d0dae1f863a9f9dd9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+  
+    var a = 1; 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("foo");
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+                                		
+    var b = 1;			
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("bar ");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement.cshtml"
+                                Write(a+b);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt
new file mode 100644
index 0000000000..0c163f3a41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [17] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (2:0,2 [17] CodeBlockWithTextElement.cshtml) - CSharp - \n    var a = 1; 
+                HtmlContent - (25:1,21 [3] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (25:1,21 [3] CodeBlockWithTextElement.cshtml) - Html - foo
+                CSharpCode - (35:1,31 [22] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (35:1,31 [22] CodeBlockWithTextElement.cshtml) - CSharp -  		\n    var b = 1;			
+                HtmlContent - (63:2,23 [4] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (63:2,23 [4] CodeBlockWithTextElement.cshtml) - Html - bar 
+                CSharpExpression - (69:2,29 [3] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (69:2,29 [3] CodeBlockWithTextElement.cshtml) - CSharp - a+b
+                CSharpCode - (80:2,40 [2] CodeBlockWithTextElement.cshtml)
+                    IntermediateToken - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs
new file mode 100644
index 0000000000..49483b617e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml"
+  
+    for(int i = 1; i <= 10; i++) {
+        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt
new file mode 100644
index 0000000000..2dadb8d1fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [115] CodeBlock.cshtml)
+                    IntermediateToken - (2:0,2 [115] CodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6d4378fb88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.mappings.txt
@@ -0,0 +1,13 @@
+Source Location: (2:0,2 [115] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml)
+|
+    for(int i = 1; i <= 10; i++) {
+        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
+    }
+|
+Generated Location: (738:19,2 [115] )
+|
+    for(int i = 1; i <= 10; i++) {
+        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs
new file mode 100644
index 0000000000..d3255c7b03
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs
@@ -0,0 +1,28 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d570564dcb19afbfb9fcd1b8a7e339d22c0d0c97"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d570564dcb19afbfb9fcd1b8a7e339d22c0d0c97", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock.cshtml"
+  
+    for(int i = 1; i <= 10; i++) {
+        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt
new file mode 100644
index 0000000000..f700c27032
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt
@@ -0,0 +1,8 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [115] CodeBlock.cshtml)
+                    IntermediateToken - (2:0,2 [115] CodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml
new file mode 100644
index 0000000000..546906282c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml
@@ -0,0 +1,38 @@
+@addTagHelper "*, TestAssembly"
+
+@if (true)
+{
+    var checkbox = "checkbox";
+
+    <div class="randomNonTagHelperAttribute">
+        <p age="@@@(1+2)" class="@@string"></p>
+        <p time="Current Time: @DateTime.Now">
+            <h1>Set Time:</h1>
+            @if (false)
+            {
+                <p>New Time: <input type="text" value="" placeholder="Enter in a new time..."/></p>
+            }
+            else
+            {
+                <p>Current Time: <input type=@checkbox checked=true /></p>
+                <input tYPe='@(true ? "checkbox" : "anything")' />
+                <input type='@if(true) { <text>checkbox</text> } else { <text>anything</text> }'>
+            }
+        </p>
+        <p unbound="first value" age="@DateTimeOffset.Now.Year - 1970" unbound="second value" >
+            @{ var @object = false;}
+            <input ChecKED="@(@object)">
+        </p>
+        <p age="-1970 + @DateTimeOffset.Now.Year">
+            <input unbound="hello" unbound="world" checked="@(DateTimeOffset.Now.Year > 2014)" />
+        </p>
+        <p age="DateTimeOffset.Now.Year - 1970">
+            <input checked="DateTimeOffset.Now.Year > 2014">
+        </p>
+        <p age="@("My age is this long.".Length)">
+            <input checked="   @(  DateTimeOffset.Now.Year  ) > 2014   " />
+        </p>
+        @someMethod(@<p age="123" class="hello"><input checked=@checked /></p>)
+        <p age="@{1 + 2}"></p>
+    </div>
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..c60c5aac81
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,283 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+ if (true)
+{
+    var checkbox = "checkbox";
+
+    
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = @@(1+2);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+             if (false)
+            {
+                
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "text";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                                                                   
+            }
+            else
+            {
+                
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                        __o = checkbox;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Type = string.Empty;
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                     __TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                                          
+                
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                         __o = true ? "checkbox" : "anything";
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Type = string.Empty;
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                                  
+                
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                              if(true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                               } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                                                              }
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Type = string.Empty;
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                                                                 
+            }
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                          __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+               var @object = false;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = (@object);
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+     __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                  __TestNamespace_InputTagHelper2.Checked = (DateTimeOffset.Now.Year > 2014);
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked =    @(  DateTimeOffset.Now.Year  ) > 2014   ;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+   __o = someMethod(item => new Template(async(__razor_template_writer) => {
+    __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+    __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                     __TestNamespace_InputTagHelper2.Checked = checked;
+
+#line default
+#line hidden
+#nullable disable
+    __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = 123;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = ;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+          
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..fe2b80c9e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml(36,17): Error RZ2006: Code blocks (e.g. @{var variable = 23;}) must not appear in non-string tag helper attribute values.
+ Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..30f540a77d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,308 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] ComplexTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] ComplexTagHelpers.cshtml) - Html - \n\n
+                CSharpCode - (36:2,1 [52] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (36:2,1 [52] ComplexTagHelpers.cshtml) - CSharp - if (true)\n{\n    var checkbox = "checkbox";\n\n    
+                HtmlContent - (88:6,4 [51] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (88:6,4 [4] ComplexTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (92:6,8 [36] ComplexTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (128:6,44 [1] ComplexTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (129:6,45 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (139:7,8 [39] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (147:7,16 [8] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (147:7,16 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                        IntermediateToken - (149:7,18 [0] ComplexTagHelpers.cshtml) - CSharp - 
+                        CSharpExpression - (149:7,18 [6] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (149:7,18 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                            IntermediateToken - (150:7,19 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                            IntermediateToken - (151:7,20 [3] ComplexTagHelpers.cshtml) - CSharp - 1+2
+                            IntermediateToken - (154:7,23 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (164:7,33 [1] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (164:7,33 [1] ComplexTagHelpers.cshtml) - Html - @
+                        HtmlContent - (166:7,35 [6] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (166:7,35 [6] ComplexTagHelpers.cshtml) - Html - string
+                    DefaultTagHelperExecute - 
+                HtmlContent - (178:7,47 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (178:7,47 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (188:8,8 [531] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (226:8,46 [46] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (226:8,46 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                            IntermediateToken - (240:9,12 [3] ComplexTagHelpers.cshtml) - Html - <h1
+                            IntermediateToken - (243:9,15 [1] ComplexTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (244:9,16 [9] ComplexTagHelpers.cshtml) - Html - Set Time:
+                            IntermediateToken - (253:9,25 [5] ComplexTagHelpers.cshtml) - Html - </h1>
+                            IntermediateToken - (258:9,30 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        CSharpCode - (273:10,13 [43] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (273:10,13 [43] ComplexTagHelpers.cshtml) - CSharp - if (false)\n            {\n                
+                        TagHelper - (316:12,16 [83] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (319:12,19 [10] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (319:12,19 [10] ComplexTagHelpers.cshtml) - Html - New Time: 
+                                TagHelper - (329:12,29 [66] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                                    DefaultTagHelperBody - 
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                                    DefaultTagHelperProperty - (342:12,42 [4] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                        HtmlContent - (342:12,42 [4] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (342:12,42 [4] ComplexTagHelpers.cshtml) - Html - text
+                                    DefaultTagHelperProperty - (342:12,42 [4] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                        HtmlContent - (342:12,42 [4] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (342:12,42 [4] ComplexTagHelpers.cshtml) - Html - text
+                                    DefaultTagHelperHtmlAttribute -  - value - HtmlAttributeValueStyle.DoubleQuotes
+                                        HtmlContent - (355:12,55 [0] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (355:12,55 [0] ComplexTagHelpers.cshtml) - Html - 
+                                    DefaultTagHelperHtmlAttribute -  - placeholder - HtmlAttributeValueStyle.DoubleQuotes
+                                        HtmlContent - (370:12,70 [22] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (370:12,70 [22] ComplexTagHelpers.cshtml) - Html - Enter in a new time...
+                                    DefaultTagHelperExecute - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperExecute - 
+                        CSharpCode - (399:12,99 [66] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (399:12,99 [66] ComplexTagHelpers.cshtml) - CSharp - \n            }\n            else\n            {\n                
+                        TagHelper - (465:16,16 [58] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (468:16,19 [14] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (468:16,19 [14] ComplexTagHelpers.cshtml) - Html - Current Time: 
+                                TagHelper - (482:16,33 [37] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                                    DefaultTagHelperBody - 
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                                    DefaultTagHelperProperty - (494:16,45 [9] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                        CSharpExpression - (495:16,46 [8] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (495:16,46 [8] ComplexTagHelpers.cshtml) - CSharp - checkbox
+                                    DefaultTagHelperProperty - (494:16,45 [9] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                        CSharpExpression - (495:16,46 [8] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (495:16,46 [8] ComplexTagHelpers.cshtml) - CSharp - checkbox
+                                    DefaultTagHelperProperty - (512:16,63 [4] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                        IntermediateToken - (512:16,63 [4] ComplexTagHelpers.cshtml) - CSharp - true
+                                    DefaultTagHelperExecute - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperExecute - 
+                        CSharpCode - (523:16,74 [18] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (523:16,74 [18] ComplexTagHelpers.cshtml) - CSharp - \n                
+                        TagHelper - (541:17,16 [50] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (554:17,29 [33] ComplexTagHelpers.cshtml) - tYPe - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpExpression - (556:17,31 [30] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (556:17,31 [30] ComplexTagHelpers.cshtml) - CSharp - true ? "checkbox" : "anything"
+                            DefaultTagHelperProperty - (554:17,29 [33] ComplexTagHelpers.cshtml) - tYPe - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpExpression - (556:17,31 [30] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (556:17,31 [30] ComplexTagHelpers.cshtml) - CSharp - true ? "checkbox" : "anything"
+                            DefaultTagHelperExecute - 
+                        CSharpCode - (591:17,66 [18] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (591:17,66 [18] ComplexTagHelpers.cshtml) - CSharp - \n                
+                        TagHelper - (609:18,16 [81] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (622:18,29 [66] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpCode - (623:18,30 [11] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (623:18,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { 
+                                HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox
+                                CSharpCode - (655:18,62 [10] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (655:18,62 [10] ComplexTagHelpers.cshtml) - CSharp -  } else { 
+                                HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything
+                                CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
+                            DefaultTagHelperProperty - (622:18,29 [66] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpCode - (623:18,30 [11] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (623:18,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { 
+                                HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox
+                                CSharpCode - (655:18,62 [10] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (655:18,62 [10] ComplexTagHelpers.cshtml) - CSharp -  } else { 
+                                HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything
+                                CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
+                            DefaultTagHelperExecute - 
+                        CSharpCode - (690:18,97 [15] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (690:18,97 [15] ComplexTagHelpers.cshtml) - CSharp - \n            }
+                        HtmlContent - (705:19,13 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (705:19,13 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - time - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (197:8,17 [7] ComplexTagHelpers.cshtml) - 
+                            IntermediateToken - (197:8,17 [7] ComplexTagHelpers.cshtml) - Html - Current
+                        HtmlAttributeValue - (204:8,24 [6] ComplexTagHelpers.cshtml) -  
+                            IntermediateToken - (205:8,25 [5] ComplexTagHelpers.cshtml) - Html - Time:
+                        CSharpExpressionAttributeValue - (210:8,30 [14] ComplexTagHelpers.cshtml) -  
+                            IntermediateToken - (212:8,32 [12] ComplexTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperExecute - 
+                HtmlContent - (719:20,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (719:20,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (729:21,8 [181] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (816:21,95 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (816:21,95 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        CSharpCode - (832:22,14 [21] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (832:22,14 [21] ComplexTagHelpers.cshtml) - CSharp -  var @object = false;
+                        HtmlContent - (856:23,0 [12] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (856:23,0 [12] ComplexTagHelpers.cshtml) - Html -             
+                        TagHelper - (868:23,12 [28] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (884:23,28 [10] ComplexTagHelpers.cshtml) - ChecKED - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                CSharpExpression - (885:23,29 [9] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (885:23,29 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                                    IntermediateToken - (886:23,30 [7] ComplexTagHelpers.cshtml) - CSharp - @object
+                                    IntermediateToken - (893:23,37 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (896:23,40 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (896:23,40 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (741:21,20 [11] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (741:21,20 [11] ComplexTagHelpers.cshtml) - Html - first value
+                    DefaultTagHelperProperty - (759:21,38 [31] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (760:21,39 [23] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (760:21,39 [23] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year
+                        IntermediateToken - (783:21,62 [2] ComplexTagHelpers.cshtml) - CSharp -  -
+                        IntermediateToken - (785:21,64 [5] ComplexTagHelpers.cshtml) - CSharp -  1970
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (801:21,80 [12] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (801:21,80 [12] ComplexTagHelpers.cshtml) - Html - second value
+                    DefaultTagHelperExecute - 
+                HtmlContent - (910:24,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (910:24,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (920:25,8 [155] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (962:25,50 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (962:25,50 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        TagHelper - (976:26,12 [85] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (992:26,28 [5] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (992:26,28 [5] ComplexTagHelpers.cshtml) - Html - hello
+                            DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (1008:26,44 [5] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (1008:26,44 [5] ComplexTagHelpers.cshtml) - Html - world
+                            DefaultTagHelperProperty - (1024:26,60 [33] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                CSharpExpression - (1025:26,61 [32] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (1025:26,61 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                                    IntermediateToken - (1026:26,62 [30] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year > 2014
+                                    IntermediateToken - (1056:26,92 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (1061:26,97 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1061:26,97 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (928:25,16 [32] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (928:25,16 [5] ComplexTagHelpers.cshtml) - CSharp - -1970
+                        IntermediateToken - (933:25,21 [2] ComplexTagHelpers.cshtml) - CSharp -  +
+                        IntermediateToken - (935:25,23 [1] ComplexTagHelpers.cshtml) - CSharp -  
+                        CSharpExpression - (936:25,24 [24] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (936:25,24 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                            IntermediateToken - (937:25,25 [23] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1075:27,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1075:27,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (1085:28,8 [116] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (1125:28,48 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1125:28,48 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        TagHelper - (1139:29,12 [48] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (1155:29,28 [30] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (1155:29,28 [30] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year > 2014
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (1187:29,60 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1187:29,60 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (1093:28,16 [30] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (1093:28,16 [30] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year\-1970
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1201:30,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1201:30,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (1211:31,8 [133] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (1253:31,50 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1253:31,50 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        TagHelper - (1267:32,12 [63] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (1283:32,28 [43] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (1283:32,28 [3] ComplexTagHelpers.cshtml) - CSharp -    
+                                CSharpExpression - (1286:32,31 [30] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (1286:32,31 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                                    IntermediateToken - (1287:32,32 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                                    IntermediateToken - (1288:32,33 [27] ComplexTagHelpers.cshtml) - CSharp -   DateTimeOffset.Now.Year  
+                                    IntermediateToken - (1315:32,60 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                                IntermediateToken - (1316:32,61 [2] ComplexTagHelpers.cshtml) - CSharp -  >
+                                IntermediateToken - (1318:32,63 [5] ComplexTagHelpers.cshtml) - CSharp -  2014
+                                IntermediateToken - (1323:32,68 [3] ComplexTagHelpers.cshtml) - CSharp -    
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (1330:32,75 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1330:32,75 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (1219:31,16 [32] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (1220:31,17 [31] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1220:31,17 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                            IntermediateToken - (1221:31,18 [29] ComplexTagHelpers.cshtml) - CSharp - "My age is this long.".Length
+                            IntermediateToken - (1250:31,47 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1344:33,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1344:33,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                CSharpExpression - (1355:34,9 [69] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1355:34,9 [11] ComplexTagHelpers.cshtml) - CSharp - someMethod(
+                    Template - (1367:34,21 [57] ComplexTagHelpers.cshtml)
+                        TagHelper - (1367:34,21 [57] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                TagHelper - (1394:34,48 [26] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                                    DefaultTagHelperBody - 
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                                    DefaultTagHelperProperty - (1409:34,63 [8] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                        CSharpExpression - (1410:34,64 [7] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (1410:34,64 [7] ComplexTagHelpers.cshtml) - CSharp - checked
+                                    DefaultTagHelperExecute - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperProperty - (1375:34,29 [3] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (1375:34,29 [3] ComplexTagHelpers.cshtml) - CSharp - 123
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (1387:34,41 [5] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (1387:34,41 [5] ComplexTagHelpers.cshtml) - Html - hello
+                            DefaultTagHelperExecute - 
+                    IntermediateToken - (1424:34,78 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                HtmlContent - (1425:34,79 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1425:34,79 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (1435:35,8 [22] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (1443:35,16 [8] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCode - (1445:35,18 [5] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1445:35,18 [5] ComplexTagHelpers.cshtml) - CSharp - 1 + 2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1457:35,30 [12] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1457:35,30 [6] ComplexTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (1463:36,4 [6] ComplexTagHelpers.cshtml) - Html - </div>
+                CSharpCode - (1469:36,10 [3] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1469:36,10 [3] ComplexTagHelpers.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..f3ec2cf8fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,293 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (787:15,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (36:2,1 [52] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|if (true)
+{
+    var checkbox = "checkbox";
+
+    |
+Generated Location: (1284:32,1 [52] )
+|if (true)
+{
+    var checkbox = "checkbox";
+
+    |
+
+Source Location: (147:7,16 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|@|
+Generated Location: (1628:44,33 [1] )
+|@|
+
+Source Location: (149:7,18 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+||
+Generated Location: (1629:44,34 [0] )
+||
+
+Source Location: (149:7,18 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|@|
+Generated Location: (1629:44,34 [1] )
+|@|
+
+Source Location: (150:7,19 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|(|
+Generated Location: (1630:44,35 [1] )
+|(|
+
+Source Location: (151:7,20 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|1+2|
+Generated Location: (1631:44,36 [3] )
+|1+2|
+
+Source Location: (154:7,23 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|)|
+Generated Location: (1634:44,39 [1] )
+|)|
+
+Source Location: (273:10,13 [43] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|if (false)
+            {
+                |
+Generated Location: (1814:51,13 [43] )
+|if (false)
+            {
+                |
+
+Source Location: (399:12,99 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|
+            }
+            else
+            {
+                |
+Generated Location: (2572:65,99 [66] )
+|
+            }
+            else
+            {
+                |
+
+Source Location: (495:16,46 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|checkbox|
+Generated Location: (3057:78,46 [8] )
+|checkbox|
+
+Source Location: (512:16,63 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|true|
+Generated Location: (3448:87,63 [4] )
+|true|
+
+Source Location: (523:16,74 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|
+                |
+Generated Location: (3787:95,74 [18] )
+|
+                |
+
+Source Location: (556:17,31 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|true ? "checkbox" : "anything"|
+Generated Location: (4209:105,31 [30] )
+|true ? "checkbox" : "anything"|
+
+Source Location: (591:17,66 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|
+                |
+Generated Location: (4625:114,66 [18] )
+|
+                |
+
+Source Location: (623:18,30 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|if(true) { |
+Generated Location: (5046:124,30 [11] )
+|if(true) { |
+
+Source Location: (655:18,62 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| } else { |
+Generated Location: (5284:131,62 [10] )
+| } else { |
+
+Source Location: (686:18,93 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| }|
+Generated Location: (5552:138,93 [2] )
+| }|
+
+Source Location: (690:18,97 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|
+            }|
+Generated Location: (5970:147,97 [15] )
+|
+            }|
+
+Source Location: (212:8,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (6276:156,32 [12] )
+|DateTime.Now|
+
+Source Location: (832:22,14 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| var @object = false;|
+Generated Location: (6468:163,14 [21] )
+| var @object = false;|
+
+Source Location: (885:23,29 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|(|
+Generated Location: (6904:172,42 [1] )
+|(|
+
+Source Location: (886:23,30 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|@object|
+Generated Location: (6905:172,43 [7] )
+|@object|
+
+Source Location: (893:23,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|)|
+Generated Location: (6912:172,50 [1] )
+|)|
+
+Source Location: (760:21,39 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|DateTimeOffset.Now.Year|
+Generated Location: (7212:180,38 [23] )
+|DateTimeOffset.Now.Year|
+
+Source Location: (783:21,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| -|
+Generated Location: (7235:180,61 [2] )
+| -|
+
+Source Location: (785:21,64 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| 1970|
+Generated Location: (7237:180,63 [5] )
+| 1970|
+
+Source Location: (1025:26,61 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|(|
+Generated Location: (7676:189,60 [1] )
+|(|
+
+Source Location: (1026:26,62 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|DateTimeOffset.Now.Year > 2014|
+Generated Location: (7677:189,61 [30] )
+|DateTimeOffset.Now.Year > 2014|
+
+Source Location: (1056:26,92 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|)|
+Generated Location: (7707:189,91 [1] )
+|)|
+
+Source Location: (928:25,16 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|-1970|
+Generated Location: (8002:197,33 [5] )
+|-1970|
+
+Source Location: (933:25,21 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| +|
+Generated Location: (8007:197,38 [2] )
+| +|
+
+Source Location: (935:25,23 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| |
+Generated Location: (8009:197,40 [1] )
+| |
+
+Source Location: (936:25,24 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|@|
+Generated Location: (8010:197,41 [1] )
+|@|
+
+Source Location: (937:25,25 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|DateTimeOffset.Now.Year|
+Generated Location: (8011:197,42 [23] )
+|DateTimeOffset.Now.Year|
+
+Source Location: (1155:29,28 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|DateTimeOffset.Now.Year > 2014|
+Generated Location: (8450:206,42 [30] )
+|DateTimeOffset.Now.Year > 2014|
+
+Source Location: (1093:28,16 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|DateTimeOffset.Now.Year - 1970|
+Generated Location: (8774:214,33 [30] )
+|DateTimeOffset.Now.Year - 1970|
+
+Source Location: (1283:32,28 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|   |
+Generated Location: (9220:223,42 [3] )
+|   |
+
+Source Location: (1286:32,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|@|
+Generated Location: (9223:223,45 [1] )
+|@|
+
+Source Location: (1287:32,32 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|(|
+Generated Location: (9224:223,46 [1] )
+|(|
+
+Source Location: (1288:32,33 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|  DateTimeOffset.Now.Year  |
+Generated Location: (9225:223,47 [27] )
+|  DateTimeOffset.Now.Year  |
+
+Source Location: (1315:32,60 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|)|
+Generated Location: (9252:223,74 [1] )
+|)|
+
+Source Location: (1316:32,61 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| >|
+Generated Location: (9253:223,75 [2] )
+| >|
+
+Source Location: (1318:32,63 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+| 2014|
+Generated Location: (9255:223,77 [5] )
+| 2014|
+
+Source Location: (1323:32,68 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|   |
+Generated Location: (9260:223,82 [3] )
+|   |
+
+Source Location: (1220:31,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|(|
+Generated Location: (9557:231,33 [1] )
+|(|
+
+Source Location: (1221:31,18 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|"My age is this long.".Length|
+Generated Location: (9558:231,34 [29] )
+|"My age is this long.".Length|
+
+Source Location: (1250:31,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|)|
+Generated Location: (9587:231,63 [1] )
+|)|
+
+Source Location: (1355:34,9 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|someMethod(|
+Generated Location: (9763:238,9 [11] )
+|someMethod(|
+
+Source Location: (1410:34,64 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|checked|
+Generated Location: (10200:243,63 [7] )
+|checked|
+
+Source Location: (1375:34,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|123|
+Generated Location: (10493:251,33 [3] )
+|123|
+
+Source Location: (1424:34,78 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|)|
+Generated Location: (10553:257,1 [1] )
+|)|
+
+Source Location: (1469:36,10 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
+|
+}|
+Generated Location: (11024:272,10 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..1ca3b103ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,564 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ab167e80e48e48d9984ecd76158a2d87f90f3460"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"ab167e80e48e48d9984ecd76158a2d87f90f3460", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "text", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("placeholder", new global::Microsoft.AspNetCore.Html.HtmlString("Enter in a new time..."), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("first value"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("second value"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("world"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+ if (true)
+{
+    var checkbox = "checkbox";
+
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <div class=\"randomNonTagHelperAttribute\">\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = @@(1+2);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            BeginWriteTagHelperAttribute();
+            WriteLiteral("@");
+            WriteLiteral("string");
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n            <h1>Set Time:</h1>\r\n");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+             if (false)
+            {
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("                ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("New Time: ");
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                    }
+                    );
+                    __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                    __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                    __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                    __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                    __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                    __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                    __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                    __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                    __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                    __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+                    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                    if (!__tagHelperExecutionContext.Output.IsContentModified)
+                    {
+                        await __tagHelperExecutionContext.SetOutputContentAsync();
+                    }
+                    Write(__tagHelperExecutionContext.Output);
+                    __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                }
+                );
+                __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+            }
+            else
+            {
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("                ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("Current Time: ");
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                    }
+                    );
+                    __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                    __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                    __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                    __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                    BeginWriteTagHelperAttribute();
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                 WriteLiteral(checkbox);
+
+#line default
+#line hidden
+#nullable disable
+                    __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                    __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer;
+                    __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                    __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                    __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                    if (!__tagHelperExecutionContext.Output.IsContentModified)
+                    {
+                        await __tagHelperExecutionContext.SetOutputContentAsync();
+                    }
+                    Write(__tagHelperExecutionContext.Output);
+                    __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                }
+                );
+                __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n                ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                BeginWriteTagHelperAttribute();
+#nullable restore
+#line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                  WriteLiteral(true ? "checkbox" : "anything");
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer;
+                __tagHelperExecutionContext.AddTagHelperAttribute("tYPe", __TestNamespace_InputTagHelper.Type, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+                __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n                ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                BeginWriteTagHelperAttribute();
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                              if(true) { 
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("checkbox");
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                               } else { 
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("anything");
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+                                                                                              }
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer;
+                __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+                __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+            }
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("        ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "time", 3, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 197, "Current", 197, 7, true);
+            AddHtmlAttributeValue(" ", 204, "Time:", 205, 6, true);
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+AddHtmlAttributeValue(" ", 210, DateTime.Now, 211, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n");
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+               var @object = false;
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("            ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = (@object);
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("ChecKED", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n            ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_6);
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = (DateTimeOffset.Now.Year > 2014);
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n            ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n            ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked =    @(  DateTimeOffset.Now.Year  ) > 2014   ;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n        ");
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+   Write(someMethod(item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+        __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+        }
+        );
+        __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+        __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+        __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+        __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = checked;
+
+#line default
+#line hidden
+#nullable disable
+        __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+        if (!__tagHelperExecutionContext.Output.IsContentModified)
+        {
+            await __tagHelperExecutionContext.SetOutputContentAsync();
+        }
+        Write(__tagHelperExecutionContext.Output);
+        __tagHelperExecutionContext = __tagHelperScopeManager.End();
+    }
+    );
+    __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+    __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = 123;
+
+#line default
+#line hidden
+#nullable disable
+    __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+    __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_7);
+    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+    if (!__tagHelperExecutionContext.Output.IsContentModified)
+    {
+        await __tagHelperExecutionContext.SetOutputContentAsync();
+    }
+    Write(__tagHelperExecutionContext.Output);
+    __tagHelperExecutionContext = __tagHelperScopeManager.End();
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = ;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    </div>\r\n");
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..fe2b80c9e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml(36,17): Error RZ2006: Code blocks (e.g. @{var variable = 23;}) must not appear in non-string tag helper attribute values.
+ Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..79168e02ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt
@@ -0,0 +1,309 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - value -  - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - placeholder - Enter in a new time... - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - unbound - first value - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_4 - unbound - second value - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - unbound - hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_6 - unbound - world - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_7 - class - hello - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] ComplexTagHelpers.cshtml) - Html - \n
+                CSharpCode - (36:2,1 [48] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (36:2,1 [48] ComplexTagHelpers.cshtml) - CSharp - if (true)\n{\n    var checkbox = "checkbox";\n\n
+                HtmlContent - (84:6,0 [55] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (84:6,0 [4] ComplexTagHelpers.cshtml) - Html -     
+                    IntermediateToken - (88:6,4 [4] ComplexTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (92:6,8 [36] ComplexTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (128:6,44 [1] ComplexTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (129:6,45 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (139:7,8 [39] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (147:7,16 [8] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (147:7,16 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                        IntermediateToken - (149:7,18 [0] ComplexTagHelpers.cshtml) - CSharp - 
+                        CSharpExpression - (149:7,18 [6] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (149:7,18 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                            IntermediateToken - (150:7,19 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                            IntermediateToken - (151:7,20 [3] ComplexTagHelpers.cshtml) - CSharp - 1+2
+                            IntermediateToken - (154:7,23 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (164:7,33 [1] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (164:7,33 [1] ComplexTagHelpers.cshtml) - Html - @
+                        HtmlContent - (166:7,35 [6] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (166:7,35 [6] ComplexTagHelpers.cshtml) - Html - string
+                    DefaultTagHelperExecute - 
+                HtmlContent - (178:7,47 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (178:7,47 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (188:8,8 [531] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (226:8,46 [34] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (226:8,46 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                            IntermediateToken - (240:9,12 [3] ComplexTagHelpers.cshtml) - Html - <h1
+                            IntermediateToken - (243:9,15 [1] ComplexTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (244:9,16 [9] ComplexTagHelpers.cshtml) - Html - Set Time:
+                            IntermediateToken - (253:9,25 [5] ComplexTagHelpers.cshtml) - Html - </h1>
+                            IntermediateToken - (258:9,30 [2] ComplexTagHelpers.cshtml) - Html - \n
+                        CSharpCode - (260:10,0 [12] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (260:10,0 [12] ComplexTagHelpers.cshtml) - CSharp -             
+                        CSharpCode - (273:10,13 [27] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (273:10,13 [27] ComplexTagHelpers.cshtml) - CSharp - if (false)\n            {\n
+                        HtmlContent - (300:12,0 [16] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (300:12,0 [16] ComplexTagHelpers.cshtml) - Html -                 
+                        TagHelper - (316:12,16 [83] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (319:12,19 [10] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (319:12,19 [10] ComplexTagHelpers.cshtml) - Html - New Time: 
+                                TagHelper - (329:12,29 [66] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                                    DefaultTagHelperBody - 
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                                    PreallocatedTagHelperProperty - (342:12,42 [4] ComplexTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                                    PreallocatedTagHelperProperty - (342:12,42 [4] ComplexTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                                    DefaultTagHelperExecute - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (399:12,99 [2] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (399:12,99 [2] ComplexTagHelpers.cshtml) - Html - \n
+                        CSharpCode - (401:13,0 [48] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (401:13,0 [48] ComplexTagHelpers.cshtml) - CSharp -             }\n            else\n            {\n
+                        HtmlContent - (449:16,0 [16] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (449:16,0 [16] ComplexTagHelpers.cshtml) - Html -                 
+                        TagHelper - (465:16,16 [58] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (468:16,19 [14] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (468:16,19 [14] ComplexTagHelpers.cshtml) - Html - Current Time: 
+                                TagHelper - (482:16,33 [37] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                                    DefaultTagHelperBody - 
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                                    DefaultTagHelperProperty - (494:16,45 [9] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                        CSharpExpression - (495:16,46 [8] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (495:16,46 [8] ComplexTagHelpers.cshtml) - CSharp - checkbox
+                                    DefaultTagHelperProperty - (494:16,45 [9] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                        CSharpExpression - (495:16,46 [8] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (495:16,46 [8] ComplexTagHelpers.cshtml) - CSharp - checkbox
+                                    DefaultTagHelperProperty - (512:16,63 [4] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                        IntermediateToken - (512:16,63 [4] ComplexTagHelpers.cshtml) - CSharp - true
+                                    DefaultTagHelperExecute - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (523:16,74 [18] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (523:16,74 [2] ComplexTagHelpers.cshtml) - Html - \n
+                            IntermediateToken - (525:17,0 [16] ComplexTagHelpers.cshtml) - Html -                 
+                        TagHelper - (541:17,16 [50] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (554:17,29 [33] ComplexTagHelpers.cshtml) - tYPe - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpExpression - (556:17,31 [30] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (556:17,31 [30] ComplexTagHelpers.cshtml) - CSharp - true ? "checkbox" : "anything"
+                            DefaultTagHelperProperty - (554:17,29 [33] ComplexTagHelpers.cshtml) - tYPe - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpExpression - (556:17,31 [30] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (556:17,31 [30] ComplexTagHelpers.cshtml) - CSharp - true ? "checkbox" : "anything"
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (591:17,66 [18] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (591:17,66 [2] ComplexTagHelpers.cshtml) - Html - \n
+                            IntermediateToken - (593:18,0 [16] ComplexTagHelpers.cshtml) - Html -                 
+                        TagHelper - (609:18,16 [81] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (622:18,29 [66] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpCode - (623:18,30 [11] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (623:18,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { 
+                                HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox
+                                CSharpCode - (655:18,62 [10] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (655:18,62 [10] ComplexTagHelpers.cshtml) - CSharp -  } else { 
+                                HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything
+                                CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
+                            DefaultTagHelperProperty - (622:18,29 [66] ComplexTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.SingleQuotes
+                                CSharpCode - (623:18,30 [11] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (623:18,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { 
+                                HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox
+                                CSharpCode - (655:18,62 [10] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (655:18,62 [10] ComplexTagHelpers.cshtml) - CSharp -  } else { 
+                                HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything
+                                CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (690:18,97 [2] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (690:18,97 [2] ComplexTagHelpers.cshtml) - Html - \n
+                        CSharpCode - (692:19,0 [15] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (692:19,0 [15] ComplexTagHelpers.cshtml) - CSharp -             }\n
+                        HtmlContent - (707:20,0 [8] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (707:20,0 [8] ComplexTagHelpers.cshtml) - Html -         
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - time - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (197:8,17 [7] ComplexTagHelpers.cshtml) - 
+                            IntermediateToken - (197:8,17 [7] ComplexTagHelpers.cshtml) - Html - Current
+                        HtmlAttributeValue - (204:8,24 [6] ComplexTagHelpers.cshtml) -  
+                            IntermediateToken - (205:8,25 [5] ComplexTagHelpers.cshtml) - Html - Time:
+                        CSharpExpressionAttributeValue - (210:8,30 [14] ComplexTagHelpers.cshtml) -  
+                            IntermediateToken - (212:8,32 [12] ComplexTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperExecute - 
+                HtmlContent - (719:20,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (719:20,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (729:21,8 [181] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (816:21,95 [2] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (816:21,95 [2] ComplexTagHelpers.cshtml) - Html - \n
+                        CSharpCode - (818:22,0 [12] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (818:22,0 [12] ComplexTagHelpers.cshtml) - CSharp -             
+                        CSharpCode - (832:22,14 [21] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (832:22,14 [21] ComplexTagHelpers.cshtml) - CSharp -  var @object = false;
+                        HtmlContent - (856:23,0 [12] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (856:23,0 [12] ComplexTagHelpers.cshtml) - Html -             
+                        TagHelper - (868:23,12 [28] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (884:23,28 [10] ComplexTagHelpers.cshtml) - ChecKED - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                CSharpExpression - (885:23,29 [9] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (885:23,29 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                                    IntermediateToken - (886:23,30 [7] ComplexTagHelpers.cshtml) - CSharp - @object
+                                    IntermediateToken - (893:23,37 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (896:23,40 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (896:23,40 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    DefaultTagHelperProperty - (759:21,38 [31] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (760:21,39 [23] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (760:21,39 [23] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year
+                        IntermediateToken - (783:21,62 [2] ComplexTagHelpers.cshtml) - CSharp -  -
+                        IntermediateToken - (785:21,64 [5] ComplexTagHelpers.cshtml) - CSharp -  1970
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_4
+                    DefaultTagHelperExecute - 
+                HtmlContent - (910:24,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (910:24,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (920:25,8 [155] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (962:25,50 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (962:25,50 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        TagHelper - (976:26,12 [85] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_6
+                            DefaultTagHelperProperty - (1024:26,60 [33] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                CSharpExpression - (1025:26,61 [32] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (1025:26,61 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                                    IntermediateToken - (1026:26,62 [30] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year > 2014
+                                    IntermediateToken - (1056:26,92 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (1061:26,97 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1061:26,97 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (928:25,16 [32] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (928:25,16 [5] ComplexTagHelpers.cshtml) - CSharp - -1970
+                        IntermediateToken - (933:25,21 [2] ComplexTagHelpers.cshtml) - CSharp -  +
+                        IntermediateToken - (935:25,23 [1] ComplexTagHelpers.cshtml) - CSharp -  
+                        CSharpExpression - (936:25,24 [24] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (936:25,24 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                            IntermediateToken - (937:25,25 [23] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1075:27,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1075:27,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (1085:28,8 [116] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (1125:28,48 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1125:28,48 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        TagHelper - (1139:29,12 [48] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (1155:29,28 [30] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (1155:29,28 [30] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year > 2014
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (1187:29,60 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1187:29,60 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (1093:28,16 [30] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (1093:28,16 [30] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year\-1970
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1201:30,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1201:30,12 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (1211:31,8 [133] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (1253:31,50 [14] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1253:31,50 [14] ComplexTagHelpers.cshtml) - Html - \n            
+                        TagHelper - (1267:32,12 [63] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (1283:32,28 [43] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (1283:32,28 [3] ComplexTagHelpers.cshtml) - CSharp -    
+                                CSharpExpression - (1286:32,31 [30] ComplexTagHelpers.cshtml)
+                                    IntermediateToken - (1286:32,31 [1] ComplexTagHelpers.cshtml) - CSharp - @
+                                    IntermediateToken - (1287:32,32 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                                    IntermediateToken - (1288:32,33 [27] ComplexTagHelpers.cshtml) - CSharp -   DateTimeOffset.Now.Year  
+                                    IntermediateToken - (1315:32,60 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                                IntermediateToken - (1316:32,61 [2] ComplexTagHelpers.cshtml) - CSharp -  >
+                                IntermediateToken - (1318:32,63 [5] ComplexTagHelpers.cshtml) - CSharp -  2014
+                                IntermediateToken - (1323:32,68 [3] ComplexTagHelpers.cshtml) - CSharp -    
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (1330:32,75 [10] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1330:32,75 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (1219:31,16 [32] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (1220:31,17 [31] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1220:31,17 [1] ComplexTagHelpers.cshtml) - CSharp - (
+                            IntermediateToken - (1221:31,18 [29] ComplexTagHelpers.cshtml) - CSharp - "My age is this long.".Length
+                            IntermediateToken - (1250:31,47 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1344:33,12 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1344:33,12 [2] ComplexTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (1346:34,0 [8] ComplexTagHelpers.cshtml) - Html -         
+                CSharpExpression - (1355:34,9 [69] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1355:34,9 [11] ComplexTagHelpers.cshtml) - CSharp - someMethod(
+                    Template - (1367:34,21 [57] ComplexTagHelpers.cshtml)
+                        TagHelper - (1367:34,21 [57] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                TagHelper - (1394:34,48 [26] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing
+                                    DefaultTagHelperBody - 
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                                    DefaultTagHelperProperty - (1409:34,63 [8] ComplexTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                        CSharpExpression - (1410:34,64 [7] ComplexTagHelpers.cshtml)
+                                            IntermediateToken - (1410:34,64 [7] ComplexTagHelpers.cshtml) - CSharp - checked
+                                    DefaultTagHelperExecute - 
+                            DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                            DefaultTagHelperProperty - (1375:34,29 [3] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (1375:34,29 [3] ComplexTagHelpers.cshtml) - CSharp - 123
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_7
+                            DefaultTagHelperExecute - 
+                    IntermediateToken - (1424:34,78 [1] ComplexTagHelpers.cshtml) - CSharp - )
+                HtmlContent - (1425:34,79 [10] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1425:34,79 [10] ComplexTagHelpers.cshtml) - Html - \n        
+                TagHelper - (1435:35,8 [22] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (1443:35,16 [8] ComplexTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCode - (1445:35,18 [5] ComplexTagHelpers.cshtml)
+                            IntermediateToken - (1445:35,18 [5] ComplexTagHelpers.cshtml) - CSharp - 1 + 2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1457:35,30 [14] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1457:35,30 [6] ComplexTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (1463:36,4 [6] ComplexTagHelpers.cshtml) - Html - </div>
+                    IntermediateToken - (1469:36,10 [2] ComplexTagHelpers.cshtml) - Html - \n
+                CSharpCode - (1471:37,0 [1] ComplexTagHelpers.cshtml)
+                    IntermediateToken - (1471:37,0 [1] ComplexTagHelpers.cshtml) - CSharp - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml
new file mode 100644
index 0000000000..be1a9c2079
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml
@@ -0,0 +1,15 @@
+@{
+    var ch = true;
+    var cls = "bar";
+    <a href="Foo" />
+    <p class="@cls" />
+    <p class="foo @cls" />
+    <p class="@cls foo" />
+    <input type="checkbox" checked="@ch" />
+    <input type="checkbox" checked="foo @ch" />
+    <p class="@if(cls != null) { @cls }" />
+    <a href="~/Foo" />
+    <script src="@Url.Content("~/Scripts/jquery-1.6.2.min.js")" type="text/javascript"></script>
+    <script src="@Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")" 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
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d34404fec1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.cs
@@ -0,0 +1,189 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+  
+    var ch = true;
+    var cls = "bar";
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                    
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+         __o = cls;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                      
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+             __o = cls;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                          
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+         __o = cls;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                          
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                               __o = ch;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                           
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                   __o = ch;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                               
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+               if(cls != null) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                            __o = cls;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                      }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                           
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                      
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+            __o = Url.Content("~/Scripts/jquery-1.6.2.min.js");
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                                                                                
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+            __o = Url.Content("~/Scripts/modernizr-2.0.6-development-only.js");
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                                                                                                
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                                                                                                   
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..64a6847890
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt
@@ -0,0 +1,128 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [48] ConditionalAttributes.cshtml)
+                    IntermediateToken - (2:0,2 [48] ConditionalAttributes.cshtml) - CSharp - \n    var ch = true;\n    var cls = "bar";\n    
+                HtmlContent - (50:3,4 [16] ConditionalAttributes.cshtml)
+                    IntermediateToken - (50:3,4 [2] ConditionalAttributes.cshtml) - Html - <a
+                    IntermediateToken - (52:3,6 [11] ConditionalAttributes.cshtml) - Html -  href="Foo"
+                    IntermediateToken - (63:3,17 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (64:3,18 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (66:3,20 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (66:3,20 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (72:4,4 [2] ConditionalAttributes.cshtml)
+                    IntermediateToken - (72:4,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (74:4,6 [13] ConditionalAttributes.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (82:4,14 [4] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (83:4,15 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                HtmlContent - (87:4,19 [3] ConditionalAttributes.cshtml)
+                    IntermediateToken - (87:4,19 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (88:4,20 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (90:4,22 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (90:4,22 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (96:5,4 [2] ConditionalAttributes.cshtml)
+                    IntermediateToken - (96:5,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (98:5,6 [17] ConditionalAttributes.cshtml) -  class=" - "
+                    HtmlAttributeValue - (106:5,14 [3] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (106:5,14 [3] ConditionalAttributes.cshtml) - Html - foo
+                    CSharpExpressionAttributeValue - (109:5,17 [5] ConditionalAttributes.cshtml) -  
+                        IntermediateToken - (111:5,19 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                HtmlContent - (115:5,23 [3] ConditionalAttributes.cshtml)
+                    IntermediateToken - (115:5,23 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (116:5,24 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (118:5,26 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (118:5,26 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (124:6,4 [2] ConditionalAttributes.cshtml)
+                    IntermediateToken - (124:6,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (126:6,6 [17] ConditionalAttributes.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (134:6,14 [4] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (135:6,15 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                    HtmlAttributeValue - (138:6,18 [4] ConditionalAttributes.cshtml) -  
+                        IntermediateToken - (139:6,19 [3] ConditionalAttributes.cshtml) - Html - foo
+                HtmlContent - (143:6,23 [3] ConditionalAttributes.cshtml)
+                    IntermediateToken - (143:6,23 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (144:6,24 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (146:6,26 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (146:6,26 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (152:7,4 [22] ConditionalAttributes.cshtml)
+                    IntermediateToken - (152:7,4 [6] ConditionalAttributes.cshtml) - Html - <input
+                    IntermediateToken - (158:7,10 [16] ConditionalAttributes.cshtml) - Html -  type="checkbox"
+                HtmlAttribute - (174:7,26 [14] ConditionalAttributes.cshtml) -  checked=" - "
+                    CSharpExpressionAttributeValue - (184:7,36 [3] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (185:7,37 [2] ConditionalAttributes.cshtml) - CSharp - ch
+                HtmlContent - (188:7,40 [3] ConditionalAttributes.cshtml)
+                    IntermediateToken - (188:7,40 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (189:7,41 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (191:7,43 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (191:7,43 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (197:8,4 [22] ConditionalAttributes.cshtml)
+                    IntermediateToken - (197:8,4 [6] ConditionalAttributes.cshtml) - Html - <input
+                    IntermediateToken - (203:8,10 [16] ConditionalAttributes.cshtml) - Html -  type="checkbox"
+                HtmlAttribute - (219:8,26 [18] ConditionalAttributes.cshtml) -  checked=" - "
+                    HtmlAttributeValue - (229:8,36 [3] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (229:8,36 [3] ConditionalAttributes.cshtml) - Html - foo
+                    CSharpExpressionAttributeValue - (232:8,39 [4] ConditionalAttributes.cshtml) -  
+                        IntermediateToken - (234:8,41 [2] ConditionalAttributes.cshtml) - CSharp - ch
+                HtmlContent - (237:8,44 [3] ConditionalAttributes.cshtml)
+                    IntermediateToken - (237:8,44 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (238:8,45 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (240:8,47 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (240:8,47 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (246:9,4 [2] ConditionalAttributes.cshtml)
+                    IntermediateToken - (246:9,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (248:9,6 [34] ConditionalAttributes.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (256:9,14 [25] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (257:9,15 [18] ConditionalAttributes.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (276:9,34 [3] ConditionalAttributes.cshtml)
+                            IntermediateToken - (276:9,34 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                        IntermediateToken - (279:9,37 [2] ConditionalAttributes.cshtml) - CSharp -  }
+                HtmlContent - (282:9,40 [3] ConditionalAttributes.cshtml)
+                    IntermediateToken - (282:9,40 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (283:9,41 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (285:9,43 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (285:9,43 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (291:10,4 [18] ConditionalAttributes.cshtml)
+                    IntermediateToken - (291:10,4 [2] ConditionalAttributes.cshtml) - Html - <a
+                    IntermediateToken - (293:10,6 [13] ConditionalAttributes.cshtml) - Html -  href="~/Foo"
+                    IntermediateToken - (306:10,19 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (307:10,20 [2] ConditionalAttributes.cshtml) - Html - />
+                CSharpCode - (309:10,22 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (309:10,22 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (315:11,4 [7] ConditionalAttributes.cshtml)
+                    IntermediateToken - (315:11,4 [7] ConditionalAttributes.cshtml) - Html - <script
+                HtmlAttribute - (322:11,11 [52] ConditionalAttributes.cshtml) -  src=" - "
+                    CSharpExpressionAttributeValue - (328:11,17 [45] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (329:11,18 [44] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/jquery-1.6.2.min.js")
+                HtmlContent - (374:11,63 [33] ConditionalAttributes.cshtml)
+                    IntermediateToken - (374:11,63 [23] ConditionalAttributes.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (397:11,86 [1] ConditionalAttributes.cshtml) - Html - >
+                    IntermediateToken - (398:11,87 [9] ConditionalAttributes.cshtml) - Html - </script>
+                CSharpCode - (407:11,96 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (407:11,96 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (413:12,4 [7] ConditionalAttributes.cshtml)
+                    IntermediateToken - (413:12,4 [7] ConditionalAttributes.cshtml) - Html - <script
+                HtmlAttribute - (420:12,11 [68] ConditionalAttributes.cshtml) -  src=" - "
+                    CSharpExpressionAttributeValue - (426:12,17 [61] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (427:12,18 [60] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")
+                HtmlContent - (488:12,79 [33] ConditionalAttributes.cshtml)
+                    IntermediateToken - (488:12,79 [23] ConditionalAttributes.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (511:12,102 [1] ConditionalAttributes.cshtml) - Html - >
+                    IntermediateToken - (512:12,103 [9] ConditionalAttributes.cshtml) - Html - </script>
+                CSharpCode - (521:12,112 [6] ConditionalAttributes.cshtml)
+                    IntermediateToken - (521:12,112 [6] ConditionalAttributes.cshtml) - CSharp - \n    
+                HtmlContent - (527:13,4 [111] ConditionalAttributes.cshtml)
+                    IntermediateToken - (527:13,4 [7] ConditionalAttributes.cshtml) - Html - <script
+                    IntermediateToken - (534:13,11 [71] ConditionalAttributes.cshtml) - Html -  src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"
+                    IntermediateToken - (605:13,82 [23] ConditionalAttributes.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (628:13,105 [1] ConditionalAttributes.cshtml) - Html - >
+                    IntermediateToken - (629:13,106 [9] ConditionalAttributes.cshtml) - Html - </script>
+                CSharpCode - (638:13,115 [2] ConditionalAttributes.cshtml)
+                    IntermediateToken - (638:13,115 [2] ConditionalAttributes.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..688c94ed16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.mappings.txt
@@ -0,0 +1,138 @@
+Source Location: (2:0,2 [48] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    var ch = true;
+    var cls = "bar";
+    |
+Generated Location: (762:19,2 [48] )
+|
+    var ch = true;
+    var cls = "bar";
+    |
+
+Source Location: (66:3,20 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (998:29,20 [6] )
+|
+    |
+
+Source Location: (83:4,15 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|cls|
+Generated Location: (1187:37,15 [3] )
+|cls|
+
+Source Location: (90:4,22 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (1381:44,22 [6] )
+|
+    |
+
+Source Location: (111:5,19 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|cls|
+Generated Location: (1574:52,19 [3] )
+|cls|
+
+Source Location: (118:5,26 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (1772:59,26 [6] )
+|
+    |
+
+Source Location: (135:6,15 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|cls|
+Generated Location: (1961:67,15 [3] )
+|cls|
+
+Source Location: (146:6,26 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (2159:74,26 [6] )
+|
+    |
+
+Source Location: (185:7,37 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|ch|
+Generated Location: (2370:82,37 [2] )
+|ch|
+
+Source Location: (191:7,43 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (2584:89,43 [6] )
+|
+    |
+
+Source Location: (234:8,41 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|ch|
+Generated Location: (2799:97,41 [2] )
+|ch|
+
+Source Location: (240:8,47 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (3017:104,47 [6] )
+|
+    |
+
+Source Location: (257:9,15 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|if(cls != null) { |
+Generated Location: (3207:112,15 [18] )
+|if(cls != null) { |
+
+Source Location: (276:9,34 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|cls|
+Generated Location: (3428:119,34 [3] )
+|cls|
+
+Source Location: (279:9,37 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+| }|
+Generated Location: (3638:126,37 [2] )
+| }|
+
+Source Location: (285:9,43 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (3852:133,43 [6] )
+|
+    |
+
+Source Location: (309:10,22 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (4049:141,22 [6] )
+|
+    |
+
+Source Location: (329:11,18 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|Url.Content("~/Scripts/jquery-1.6.2.min.js")|
+Generated Location: (4242:149,18 [44] )
+|Url.Content("~/Scripts/jquery-1.6.2.min.js")|
+
+Source Location: (407:11,96 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (4552:156,96 [6] )
+|
+    |
+
+Source Location: (427:12,18 [60] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")|
+Generated Location: (4745:164,18 [60] )
+|Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")|
+
+Source Location: (521:12,112 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+    |
+Generated Location: (5087:171,112 [6] )
+|
+    |
+
+Source Location: (638:13,115 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml)
+|
+|
+Generated Location: (5377:179,115 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..af91e920b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs
@@ -0,0 +1,130 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f0a97e23ecfbaaaa77b528650156cb123ebdbe60"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f0a97e23ecfbaaaa77b528650156cb123ebdbe60", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+  
+    var ch = true;
+    var cls = "bar";
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <a href=\"Foo\" />\r\n    <p");
+            BeginWriteAttribute("class", " class=\"", 74, "\"", 86, 1);
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue("", 82, cls, 82, 4, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n    <p");
+            BeginWriteAttribute("class", " class=\"", 98, "\"", 114, 2);
+            WriteAttributeValue("", 106, "foo", 106, 3, true);
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue(" ", 109, cls, 110, 4, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n    <p");
+            BeginWriteAttribute("class", " class=\"", 126, "\"", 142, 2);
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue("", 134, cls, 134, 4, false);
+
+#line default
+#line hidden
+#nullable disable
+            WriteAttributeValue(" ", 138, "foo", 139, 4, true);
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n    <input type=\"checkbox\"");
+            BeginWriteAttribute("checked", " checked=\"", 174, "\"", 187, 1);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue("", 184, ch, 184, 3, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n    <input type=\"checkbox\"");
+            BeginWriteAttribute("checked", " checked=\"", 219, "\"", 236, 2);
+            WriteAttributeValue("", 229, "foo", 229, 3, true);
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue(" ", 232, ch, 233, 3, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n    <p");
+            BeginWriteAttribute("class", " class=\"", 248, "\"", 281, 1);
+            WriteAttributeValue("", 256, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+               if(cls != null) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                            Write(cls);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+                                      }
+
+#line default
+#line hidden
+#nullable disable
+                PopWriter();
+            }
+            ), 256, 25, false);
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n    <a href=\"~/Foo\" />\r\n    <script");
+            BeginWriteAttribute("src", " src=\"", 322, "\"", 373, 1);
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue("", 328, Url.Content("~/Scripts/jquery-1.6.2.min.js"), 328, 45, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndWriteAttribute();
+            WriteLiteral(" type=\"text/javascript\"></script>\r\n    <script");
+            BeginWriteAttribute("src", " src=\"", 420, "\"", 487, 1);
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml"
+WriteAttributeValue("", 426, Url.Content("~/Scripts/modernizr-2.0.6-development-only.js"), 426, 61, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndWriteAttribute();
+            WriteLiteral(" type=\"text/javascript\"></script>\r\n    <script src=\"http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js\" type=\"text/javascript\"></script>\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..1663aff1e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt
@@ -0,0 +1,115 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [44] ConditionalAttributes.cshtml)
+                    IntermediateToken - (2:0,2 [44] ConditionalAttributes.cshtml) - CSharp - \n    var ch = true;\n    var cls = "bar";\n
+                HtmlContent - (46:3,0 [28] ConditionalAttributes.cshtml)
+                    IntermediateToken - (46:3,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (50:3,4 [2] ConditionalAttributes.cshtml) - Html - <a
+                    IntermediateToken - (52:3,6 [11] ConditionalAttributes.cshtml) - Html -  href="Foo"
+                    IntermediateToken - (63:3,17 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (64:3,18 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (66:3,20 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (68:4,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (72:4,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (74:4,6 [13] ConditionalAttributes.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (82:4,14 [4] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (83:4,15 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                HtmlContent - (87:4,19 [11] ConditionalAttributes.cshtml)
+                    IntermediateToken - (87:4,19 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (88:4,20 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (90:4,22 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (92:5,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (96:5,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (98:5,6 [17] ConditionalAttributes.cshtml) -  class=" - "
+                    HtmlAttributeValue - (106:5,14 [3] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (106:5,14 [3] ConditionalAttributes.cshtml) - Html - foo
+                    CSharpExpressionAttributeValue - (109:5,17 [5] ConditionalAttributes.cshtml) -  
+                        IntermediateToken - (111:5,19 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                HtmlContent - (115:5,23 [11] ConditionalAttributes.cshtml)
+                    IntermediateToken - (115:5,23 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (116:5,24 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (118:5,26 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (120:6,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (124:6,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (126:6,6 [17] ConditionalAttributes.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (134:6,14 [4] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (135:6,15 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                    HtmlAttributeValue - (138:6,18 [4] ConditionalAttributes.cshtml) -  
+                        IntermediateToken - (139:6,19 [3] ConditionalAttributes.cshtml) - Html - foo
+                HtmlContent - (143:6,23 [31] ConditionalAttributes.cshtml)
+                    IntermediateToken - (143:6,23 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (144:6,24 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (146:6,26 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (148:7,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (152:7,4 [6] ConditionalAttributes.cshtml) - Html - <input
+                    IntermediateToken - (158:7,10 [16] ConditionalAttributes.cshtml) - Html -  type="checkbox"
+                HtmlAttribute - (174:7,26 [14] ConditionalAttributes.cshtml) -  checked=" - "
+                    CSharpExpressionAttributeValue - (184:7,36 [3] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (185:7,37 [2] ConditionalAttributes.cshtml) - CSharp - ch
+                HtmlContent - (188:7,40 [31] ConditionalAttributes.cshtml)
+                    IntermediateToken - (188:7,40 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (189:7,41 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (191:7,43 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (193:8,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (197:8,4 [6] ConditionalAttributes.cshtml) - Html - <input
+                    IntermediateToken - (203:8,10 [16] ConditionalAttributes.cshtml) - Html -  type="checkbox"
+                HtmlAttribute - (219:8,26 [18] ConditionalAttributes.cshtml) -  checked=" - "
+                    HtmlAttributeValue - (229:8,36 [3] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (229:8,36 [3] ConditionalAttributes.cshtml) - Html - foo
+                    CSharpExpressionAttributeValue - (232:8,39 [4] ConditionalAttributes.cshtml) -  
+                        IntermediateToken - (234:8,41 [2] ConditionalAttributes.cshtml) - CSharp - ch
+                HtmlContent - (237:8,44 [11] ConditionalAttributes.cshtml)
+                    IntermediateToken - (237:8,44 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (238:8,45 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (240:8,47 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (242:9,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (246:9,4 [2] ConditionalAttributes.cshtml) - Html - <p
+                HtmlAttribute - (248:9,6 [34] ConditionalAttributes.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (256:9,14 [25] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (257:9,15 [18] ConditionalAttributes.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (276:9,34 [3] ConditionalAttributes.cshtml)
+                            IntermediateToken - (276:9,34 [3] ConditionalAttributes.cshtml) - CSharp - cls
+                        IntermediateToken - (279:9,37 [2] ConditionalAttributes.cshtml) - CSharp -  }
+                HtmlContent - (282:9,40 [40] ConditionalAttributes.cshtml)
+                    IntermediateToken - (282:9,40 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (283:9,41 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (285:9,43 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (287:10,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (291:10,4 [2] ConditionalAttributes.cshtml) - Html - <a
+                    IntermediateToken - (293:10,6 [13] ConditionalAttributes.cshtml) - Html -  href="~/Foo"
+                    IntermediateToken - (306:10,19 [1] ConditionalAttributes.cshtml) - Html -  
+                    IntermediateToken - (307:10,20 [2] ConditionalAttributes.cshtml) - Html - />
+                    IntermediateToken - (309:10,22 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (311:11,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (315:11,4 [7] ConditionalAttributes.cshtml) - Html - <script
+                HtmlAttribute - (322:11,11 [52] ConditionalAttributes.cshtml) -  src=" - "
+                    CSharpExpressionAttributeValue - (328:11,17 [45] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (329:11,18 [44] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/jquery-1.6.2.min.js")
+                HtmlContent - (374:11,63 [46] ConditionalAttributes.cshtml)
+                    IntermediateToken - (374:11,63 [23] ConditionalAttributes.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (397:11,86 [1] ConditionalAttributes.cshtml) - Html - >
+                    IntermediateToken - (398:11,87 [9] ConditionalAttributes.cshtml) - Html - </script>
+                    IntermediateToken - (407:11,96 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (409:12,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (413:12,4 [7] ConditionalAttributes.cshtml) - Html - <script
+                HtmlAttribute - (420:12,11 [68] ConditionalAttributes.cshtml) -  src=" - "
+                    CSharpExpressionAttributeValue - (426:12,17 [61] ConditionalAttributes.cshtml) - 
+                        IntermediateToken - (427:12,18 [60] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")
+                HtmlContent - (488:12,79 [152] ConditionalAttributes.cshtml)
+                    IntermediateToken - (488:12,79 [23] ConditionalAttributes.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (511:12,102 [1] ConditionalAttributes.cshtml) - Html - >
+                    IntermediateToken - (512:12,103 [9] ConditionalAttributes.cshtml) - Html - </script>
+                    IntermediateToken - (521:12,112 [2] ConditionalAttributes.cshtml) - Html - \n
+                    IntermediateToken - (523:13,0 [4] ConditionalAttributes.cshtml) - Html -     
+                    IntermediateToken - (527:13,4 [7] ConditionalAttributes.cshtml) - Html - <script
+                    IntermediateToken - (534:13,11 [71] ConditionalAttributes.cshtml) - Html -  src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"
+                    IntermediateToken - (605:13,82 [23] ConditionalAttributes.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (628:13,105 [1] ConditionalAttributes.cshtml) - Html - >
+                    IntermediateToken - (629:13,106 [9] ConditionalAttributes.cshtml) - Html - </script>
+                    IntermediateToken - (638:13,115 [2] ConditionalAttributes.cshtml) - Html - \n
+                CSharpCode - (640:14,0 [0] ConditionalAttributes.cshtml)
+                    IntermediateToken - (640:14,0 [0] ConditionalAttributes.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml
new file mode 100644
index 0000000000..c71c637b14
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml
@@ -0,0 +1,13 @@
+@addTagHelper "*, TestAssembly"
+
+<a href="~/">2 TagHelpers.</a>
+<a href=~/hello>1 TagHelper.</a>
+<a href="~/?hello=world">2 TagHelpers</a>
+<a href="~/@false?hello=world">2 TagHelpers</a>
+<a href=' ~/'>0 TagHelpers.</a>
+<a href=~/@false>1 TagHelper</a>
+<a href="~/?hello=world@false">1 TagHelper</a>
+<a href='~/?hello=world @false'>1 TagHelper</a>
+<input type="text" value="3 TagHelpers" />
+<input type='texty' value="3 TagHelpers" />
+<input type="checkbox" value="2 TagHelper" />
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..e2060a3b1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs
@@ -0,0 +1,248 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "385650281a1d9679c38ffc205756c3c26f6927e7"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CssSelectorTagHelperAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"385650281a1d9679c38ffc205756c3c26f6927e7", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CssSelectorTagHelperAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("href", new global::Microsoft.AspNetCore.Html.HtmlString("~/"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("href", new global::Microsoft.AspNetCore.Html.HtmlString("~/hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("href", new global::Microsoft.AspNetCore.Html.HtmlString("~/?hello=world"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("href", new global::Microsoft.AspNetCore.Html.HtmlString("~/?hello=world@false"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "text", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", new global::Microsoft.AspNetCore.Html.HtmlString("3 TagHelpers"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "texty", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_8 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", new global::Microsoft.AspNetCore.Html.HtmlString("2 TagHelper"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.ATagHelper __TestNamespace_ATagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        private global::TestNamespace.ATagHelperMultipleSelectors __TestNamespace_ATagHelperMultipleSelectors;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        private global::TestNamespace.CatchAllTagHelper2 __TestNamespace_CatchAllTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("2 TagHelpers.");
+            }
+            );
+            __TestNamespace_ATagHelper = CreateTagHelper<global::TestNamespace.ATagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_ATagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("1 TagHelper.");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("2 TagHelpers");
+            }
+            );
+            __TestNamespace_ATagHelperMultipleSelectors = CreateTagHelper<global::TestNamespace.ATagHelperMultipleSelectors>();
+            __tagHelperExecutionContext.Add(__TestNamespace_ATagHelperMultipleSelectors);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("2 TagHelpers");
+            }
+            );
+            __TestNamespace_ATagHelperMultipleSelectors = CreateTagHelper<global::TestNamespace.ATagHelperMultipleSelectors>();
+            __tagHelperExecutionContext.Add(__TestNamespace_ATagHelperMultipleSelectors);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "href", 3, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 153, "~/", 153, 2, true);
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml"
+AddHtmlAttributeValue("", 155, false, 155, 6, false);
+
+#line default
+#line hidden
+#nullable disable
+            AddHtmlAttributeValue("", 161, "?hello=world", 161, 12, true);
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n<a href=\' ~/\'>0 TagHelpers.</a>\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("1 TagHelper");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "href", 2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 234, "~/", 234, 2, true);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml"
+AddHtmlAttributeValue("", 236, false, 236, 6, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("1 TagHelper");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("a", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("1 TagHelper");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "href", 2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+            AddHtmlAttributeValue("", 317, "~/?hello=world", 317, 14, true);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes.cshtml"
+AddHtmlAttributeValue(" ", 331, false, 332, 6, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __TestNamespace_CatchAllTagHelper2 = CreateTagHelper<global::TestNamespace.CatchAllTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper2);
+            __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __TestNamespace_CatchAllTagHelper2 = CreateTagHelper<global::TestNamespace.CatchAllTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper2);
+            __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_6.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_6);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __TestNamespace_CatchAllTagHelper2 = CreateTagHelper<global::TestNamespace.CatchAllTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper2);
+            __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_7.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_7);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_8);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..ef34c24d71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt
@@ -0,0 +1,137 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CssSelectorTagHelperAttributes_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - href - ~/ - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - href - ~/hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - href - ~/?hello=world - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - href - ~/?hello=world@false - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_4 - type - text - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - value - 3 TagHelpers - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_6 - type - texty - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_7 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_8 - value - 2 TagHelper - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.ATagHelper - __TestNamespace_ATagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.ATagHelperMultipleSelectors - __TestNamespace_ATagHelperMultipleSelectors
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper2 - __TestNamespace_CatchAllTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (33:1,0 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (35:2,0 [30] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (48:2,13 [13] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (48:2,13 [13] CssSelectorTagHelperAttributes.cshtml) - Html - 2 TagHelpers.
+                    DefaultTagHelperCreate -  - TestNamespace.ATagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (65:2,30 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (65:2,30 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (67:3,0 [32] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (83:3,16 [12] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (83:3,16 [12] CssSelectorTagHelperAttributes.cshtml) - Html - 1 TagHelper.
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperExecute - 
+                HtmlContent - (99:3,32 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (99:3,32 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (101:4,0 [41] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (126:4,25 [12] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (126:4,25 [12] CssSelectorTagHelperAttributes.cshtml) - Html - 2 TagHelpers
+                    DefaultTagHelperCreate -  - TestNamespace.ATagHelperMultipleSelectors
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (142:4,41 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (142:4,41 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (144:5,0 [47] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (175:5,31 [12] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (175:5,31 [12] CssSelectorTagHelperAttributes.cshtml) - Html - 2 TagHelpers
+                    DefaultTagHelperCreate -  - TestNamespace.ATagHelperMultipleSelectors
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - href - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (153:5,9 [2] CssSelectorTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (153:5,9 [2] CssSelectorTagHelperAttributes.cshtml) - Html - ~/
+                        CSharpExpressionAttributeValue - (155:5,11 [6] CssSelectorTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (156:5,12 [5] CssSelectorTagHelperAttributes.cshtml) - CSharp - false
+                        HtmlAttributeValue - (161:5,17 [12] CssSelectorTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (161:5,17 [12] CssSelectorTagHelperAttributes.cshtml) - Html - ?hello=world
+                    DefaultTagHelperExecute - 
+                HtmlContent - (191:5,47 [35] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (191:5,47 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                    IntermediateToken - (193:6,0 [2] CssSelectorTagHelperAttributes.cshtml) - Html - <a
+                    IntermediateToken - (195:6,2 [11] CssSelectorTagHelperAttributes.cshtml) - Html -  href=' ~/'
+                    IntermediateToken - (206:6,13 [1] CssSelectorTagHelperAttributes.cshtml) - Html - >
+                    IntermediateToken - (207:6,14 [13] CssSelectorTagHelperAttributes.cshtml) - Html - 0 TagHelpers.
+                    IntermediateToken - (220:6,27 [4] CssSelectorTagHelperAttributes.cshtml) - Html - </a>
+                    IntermediateToken - (224:6,31 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (226:7,0 [32] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (243:7,17 [11] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (243:7,17 [11] CssSelectorTagHelperAttributes.cshtml) - Html - 1 TagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - href - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (234:7,8 [2] CssSelectorTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (234:7,8 [2] CssSelectorTagHelperAttributes.cshtml) - Html - ~/
+                        CSharpExpressionAttributeValue - (236:7,10 [6] CssSelectorTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (237:7,11 [5] CssSelectorTagHelperAttributes.cshtml) - CSharp - false
+                    DefaultTagHelperExecute - 
+                HtmlContent - (258:7,32 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (258:7,32 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (260:8,0 [46] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (291:8,31 [11] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (291:8,31 [11] CssSelectorTagHelperAttributes.cshtml) - Html - 1 TagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    DefaultTagHelperExecute - 
+                HtmlContent - (306:8,46 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (306:8,46 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (308:9,0 [47] CssSelectorTagHelperAttributes.cshtml) - a - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (340:9,32 [11] CssSelectorTagHelperAttributes.cshtml)
+                            IntermediateToken - (340:9,32 [11] CssSelectorTagHelperAttributes.cshtml) - Html - 1 TagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - href - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlAttributeValue - (317:9,9 [14] CssSelectorTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (317:9,9 [14] CssSelectorTagHelperAttributes.cshtml) - Html - ~/?hello=world
+                        CSharpExpressionAttributeValue - (331:9,23 [7] CssSelectorTagHelperAttributes.cshtml) -  
+                            IntermediateToken - (333:9,25 [5] CssSelectorTagHelperAttributes.cshtml) - CSharp - false
+                    DefaultTagHelperExecute - 
+                HtmlContent - (355:9,47 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (355:9,47 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (357:10,0 [42] CssSelectorTagHelperAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper2
+                    PreallocatedTagHelperProperty - (370:10,13 [4] CssSelectorTagHelperAttributes.cshtml) - __tagHelperAttribute_4 - type - Type
+                    PreallocatedTagHelperProperty - (370:10,13 [4] CssSelectorTagHelperAttributes.cshtml) - __tagHelperAttribute_4 - type - Type
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                    DefaultTagHelperExecute - 
+                HtmlContent - (399:10,42 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (399:10,42 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (401:11,0 [43] CssSelectorTagHelperAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper2
+                    PreallocatedTagHelperProperty - (414:11,13 [5] CssSelectorTagHelperAttributes.cshtml) - __tagHelperAttribute_6 - type - Type
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                    DefaultTagHelperExecute - 
+                HtmlContent - (444:11,43 [2] CssSelectorTagHelperAttributes.cshtml)
+                    IntermediateToken - (444:11,43 [2] CssSelectorTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (446:12,0 [45] CssSelectorTagHelperAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper2
+                    PreallocatedTagHelperProperty - (459:12,13 [8] CssSelectorTagHelperAttributes.cshtml) - __tagHelperAttribute_7 - type - Type
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_8
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml
new file mode 100644
index 0000000000..5dcaeebdbf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml
@@ -0,0 +1,15 @@
+<div>
+            @for(int i = 1; i <= 10; i++) {
+    <p>This is item #@i</p>
+            }
+</div>
+
+<p>
+@(Foo(Bar.Baz))
+@Foo(@<p>Bar @baz Biz</p>)
+</p>
+
+@section Footer {
+    <p>Foo</p>
+    @bar
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3f579629fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
@@ -0,0 +1,88 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DesignTime_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+global::System.Object Footer = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+             for(int i = 1; i <= 10; i++) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+                __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+                           
+            }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+__o = Foo(Bar.Baz);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+__o = Foo(item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+        __o = baz;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+            DefineSection("Footer", async(__razor_section_writer) => {
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
+__o = bar;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt
new file mode 100644
index 0000000000..0b8f1e8e9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DesignTime_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (173:11,9 [6] DesignTime.cshtml) - Footer
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [19] DesignTime.cshtml)
+                    IntermediateToken - (0:0,0 [4] DesignTime.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] DesignTime.cshtml) - Html - >
+                    IntermediateToken - (5:0,5 [14] DesignTime.cshtml) - Html - \n            
+                CSharpCode - (20:1,13 [36] DesignTime.cshtml)
+                    IntermediateToken - (20:1,13 [36] DesignTime.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n    
+                HtmlContent - (56:2,4 [17] DesignTime.cshtml)
+                    IntermediateToken - (56:2,4 [2] DesignTime.cshtml) - Html - <p
+                    IntermediateToken - (58:2,6 [1] DesignTime.cshtml) - Html - >
+                    IntermediateToken - (59:2,7 [14] DesignTime.cshtml) - Html - This is item #
+                CSharpExpression - (74:2,22 [1] DesignTime.cshtml)
+                    IntermediateToken - (74:2,22 [1] DesignTime.cshtml) - CSharp - i
+                HtmlContent - (75:2,23 [4] DesignTime.cshtml)
+                    IntermediateToken - (75:2,23 [4] DesignTime.cshtml) - Html - </p>
+                CSharpCode - (79:2,27 [15] DesignTime.cshtml)
+                    IntermediateToken - (79:2,27 [15] DesignTime.cshtml) - CSharp - \n            }
+                HtmlContent - (94:3,13 [17] DesignTime.cshtml)
+                    IntermediateToken - (94:3,13 [2] DesignTime.cshtml) - Html - \n
+                    IntermediateToken - (96:4,0 [6] DesignTime.cshtml) - Html - </div>
+                    IntermediateToken - (102:4,6 [4] DesignTime.cshtml) - Html - \n\n
+                    IntermediateToken - (106:6,0 [2] DesignTime.cshtml) - Html - <p
+                    IntermediateToken - (108:6,2 [1] DesignTime.cshtml) - Html - >
+                    IntermediateToken - (109:6,3 [2] DesignTime.cshtml) - Html - \n
+                CSharpExpression - (113:7,2 [12] DesignTime.cshtml)
+                    IntermediateToken - (113:7,2 [12] DesignTime.cshtml) - CSharp - Foo(Bar.Baz)
+                HtmlContent - (126:7,15 [2] DesignTime.cshtml)
+                    IntermediateToken - (126:7,15 [2] DesignTime.cshtml) - Html - \n
+                CSharpExpression - (129:8,1 [23] DesignTime.cshtml)
+                    IntermediateToken - (129:8,1 [4] DesignTime.cshtml) - CSharp - Foo(
+                    Template - (134:8,6 [18] DesignTime.cshtml)
+                        HtmlContent - (134:8,6 [7] DesignTime.cshtml)
+                            IntermediateToken - (134:8,6 [2] DesignTime.cshtml) - Html - <p
+                            IntermediateToken - (136:8,8 [1] DesignTime.cshtml) - Html - >
+                            IntermediateToken - (137:8,9 [4] DesignTime.cshtml) - Html - Bar 
+                        CSharpExpression - (142:8,14 [3] DesignTime.cshtml)
+                            IntermediateToken - (142:8,14 [3] DesignTime.cshtml) - CSharp - baz
+                        HtmlContent - (145:8,17 [8] DesignTime.cshtml)
+                            IntermediateToken - (145:8,17 [4] DesignTime.cshtml) - Html -  Biz
+                            IntermediateToken - (149:8,21 [4] DesignTime.cshtml) - Html - </p>
+                    IntermediateToken - (153:8,25 [1] DesignTime.cshtml) - CSharp - )
+                HtmlContent - (154:8,26 [10] DesignTime.cshtml)
+                    IntermediateToken - (154:8,26 [2] DesignTime.cshtml) - Html - \n
+                    IntermediateToken - (156:9,0 [4] DesignTime.cshtml) - Html - </p>
+                    IntermediateToken - (160:9,4 [4] DesignTime.cshtml) - Html - \n\n
+                Section -  - Footer
+                    HtmlContent - (181:11,17 [22] DesignTime.cshtml)
+                        IntermediateToken - (181:11,17 [6] DesignTime.cshtml) - Html - \n    
+                        IntermediateToken - (187:12,4 [2] DesignTime.cshtml) - Html - <p
+                        IntermediateToken - (189:12,6 [1] DesignTime.cshtml) - Html - >
+                        IntermediateToken - (190:12,7 [3] DesignTime.cshtml) - Html - Foo
+                        IntermediateToken - (193:12,10 [4] DesignTime.cshtml) - Html - </p>
+                        IntermediateToken - (197:12,14 [6] DesignTime.cshtml) - Html - \n    
+                    CSharpExpression - (204:13,5 [3] DesignTime.cshtml)
+                        IntermediateToken - (204:13,5 [3] DesignTime.cshtml) - CSharp - bar
+                    HtmlContent - (207:13,8 [2] DesignTime.cshtml)
+                        IntermediateToken - (207:13,8 [2] DesignTime.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
new file mode 100644
index 0000000000..48c7818989
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
@@ -0,0 +1,49 @@
+Source Location: (173:11,9 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|Footer|
+Generated Location: (507:12,22 [6] )
+|Footer|
+
+Source Location: (20:1,13 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|for(int i = 1; i <= 10; i++) {
+    |
+Generated Location: (1005:29,13 [36] )
+|for(int i = 1; i <= 10; i++) {
+    |
+
+Source Location: (74:2,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|i|
+Generated Location: (1220:37,22 [1] )
+|i|
+
+Source Location: (79:2,27 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|
+            }|
+Generated Location: (1406:44,27 [15] )
+|
+            }|
+
+Source Location: (113:7,2 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|Foo(Bar.Baz)|
+Generated Location: (1584:52,6 [12] )
+|Foo(Bar.Baz)|
+
+Source Location: (129:8,1 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|Foo(|
+Generated Location: (1760:59,6 [4] )
+|Foo(|
+
+Source Location: (142:8,14 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|baz|
+Generated Location: (1941:62,14 [3] )
+|baz|
+
+Source Location: (153:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|)|
+Generated Location: (2001:68,1 [1] )
+|)|
+
+Source Location: (204:13,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
+|bar|
+Generated Location: (2239:76,6 [3] )
+|bar|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml
new file mode 100644
index 0000000000..369558994e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml
@@ -0,0 +1,7 @@
+@addTagHelper "*, TestAssembly"
+
+<p age="3" AGE="40" Age="500">
+    <input type="button" TYPE="checkbox" />
+    <input type="button" checked="true" type="checkbox" checked="false" />
+    <input type='button' checked="true" type=checkbox checked='true' type="checkbox" checked=true />
+</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..786d7ea756
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "button";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "button";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "button";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = 3;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..63264fc10d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,96 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] DuplicateAttributeTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] DuplicateAttributeTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] DuplicateAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [259] DuplicateAttributeTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (65:2,30 [6] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (65:2,30 [6] DuplicateAttributeTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (71:3,4 [39] DuplicateAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button
+                            DefaultTagHelperProperty - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button
+                            DefaultTagHelperHtmlAttribute -  - TYPE - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (98:3,31 [8] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (98:3,31 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (110:3,43 [6] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (110:3,43 [6] DuplicateAttributeTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (116:4,4 [70] DuplicateAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button
+                            DefaultTagHelperProperty - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button
+                            DefaultTagHelperProperty - (146:4,34 [4] DuplicateAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (146:4,34 [4] DuplicateAttributeTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (158:4,46 [8] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (158:4,46 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperHtmlAttribute -  - checked - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (177:4,65 [5] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (177:4,65 [5] DuplicateAttributeTagHelpers.cshtml) - Html - false
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (186:4,74 [6] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (186:4,74 [6] DuplicateAttributeTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (192:5,4 [96] DuplicateAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.SingleQuotes
+                                HtmlContent - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button
+                            DefaultTagHelperProperty - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.SingleQuotes
+                                HtmlContent - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button
+                            DefaultTagHelperProperty - (222:5,34 [4] DuplicateAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (222:5,34 [4] DuplicateAttributeTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (233:5,45 [8] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (233:5,45 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperHtmlAttribute -  - checked - HtmlAttributeValueStyle.SingleQuotes
+                                HtmlContent - (251:5,63 [4] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (251:5,63 [4] DuplicateAttributeTagHelpers.cshtml) - Html - true
+                            DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (263:5,75 [8] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (263:5,75 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox
+                            DefaultTagHelperHtmlAttribute -  - checked - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (281:5,93 [4] DuplicateAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (281:5,93 [4] DuplicateAttributeTagHelpers.cshtml) - Html - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (288:5,100 [2] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (288:5,100 [2] DuplicateAttributeTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (43:2,8 [1] DuplicateAttributeTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (43:2,8 [1] DuplicateAttributeTagHelpers.cshtml) - CSharp - 3
+                    DefaultTagHelperHtmlAttribute -  - AGE - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (51:2,16 [2] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (51:2,16 [2] DuplicateAttributeTagHelpers.cshtml) - Html - 40
+                    DefaultTagHelperHtmlAttribute -  - Age - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (60:2,25 [3] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (60:2,25 [3] DuplicateAttributeTagHelpers.cshtml) - Html - 500
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..0d93eb694d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (809:15,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (146:4,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
+|true|
+Generated Location: (2074:40,42 [4] )
+|true|
+
+Source Location: (222:5,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
+|true|
+Generated Location: (2654:51,42 [4] )
+|true|
+
+Source Location: (43:2,8 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
+|3|
+Generated Location: (2962:59,33 [1] )
+|3|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..490f283767
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,152 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4dc2ea6fc4bd045c34a90867a6a72183a3d01323"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4dc2ea6fc4bd045c34a90867a6a72183a3d01323", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "button", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("TYPE", new global::Microsoft.AspNetCore.Html.HtmlString("checkbox"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("checkbox"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("checked", new global::Microsoft.AspNetCore.Html.HtmlString("false"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "button", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("checked", new global::Microsoft.AspNetCore.Html.HtmlString("true"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("checked", new global::Microsoft.AspNetCore.Html.HtmlString("true"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("AGE", new global::Microsoft.AspNetCore.Html.HtmlString("40"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_8 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("Age", new global::Microsoft.AspNetCore.Html.HtmlString("500"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_4.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_4.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_6);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = 3;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_7);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_8);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..f2e84ead91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt
@@ -0,0 +1,69 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type - button - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - TYPE - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - checked - false - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_4 - type - button - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - checked - true - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_6 - checked - true - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_7 - AGE - 40 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_8 - Age - 500 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] DuplicateAttributeTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] DuplicateAttributeTagHelpers.cshtml) - Html - \n
+                TagHelper - (35:2,0 [259] DuplicateAttributeTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (65:2,30 [6] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (65:2,30 [6] DuplicateAttributeTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (71:3,4 [39] DuplicateAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperProperty - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (110:3,43 [6] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (110:3,43 [6] DuplicateAttributeTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (116:4,4 [70] DuplicateAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperProperty - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            DefaultTagHelperProperty - (146:4,34 [4] DuplicateAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (146:4,34 [4] DuplicateAttributeTagHelpers.cshtml) - CSharp - true
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (186:4,74 [6] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (186:4,74 [6] DuplicateAttributeTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (192:5,4 [96] DuplicateAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - __tagHelperAttribute_4 - type - Type
+                            PreallocatedTagHelperProperty - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - __tagHelperAttribute_4 - type - Type
+                            DefaultTagHelperProperty - (222:5,34 [4] DuplicateAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (222:5,34 [4] DuplicateAttributeTagHelpers.cshtml) - CSharp - true
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_6
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (288:5,100 [2] DuplicateAttributeTagHelpers.cshtml)
+                            IntermediateToken - (288:5,100 [2] DuplicateAttributeTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (43:2,8 [1] DuplicateAttributeTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (43:2,8 [1] DuplicateAttributeTagHelpers.cshtml) - CSharp - 3
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_7
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_8
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml
new file mode 100644
index 0000000000..9963a14d5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml
@@ -0,0 +1,3 @@
+@addTagHelper "*, TestAssembly"
+
+<input type="checkbox" checked="true" />
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..4f58773c89
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_DesignTime
+    {
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_InputTagHelper.Type = "checkbox";
+            __TestNamespace_CatchAllTagHelper.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml"
+__TestNamespace_InputTagHelper.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_CatchAllTagHelper.Checked = __TestNamespace_InputTagHelper.Checked;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..2ea133100c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] DuplicateTargetTagHelper.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] DuplicateTargetTagHelper.cshtml)
+                    IntermediateToken - (31:0,31 [4] DuplicateTargetTagHelper.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [40] DuplicateTargetTagHelper.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (48:2,13 [8] DuplicateTargetTagHelper.cshtml)
+                            IntermediateToken - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - Html - checkbox
+                    DefaultTagHelperProperty - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - type - string TestNamespace.CatchAllTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (48:2,13 [8] DuplicateTargetTagHelper.cshtml)
+                            IntermediateToken - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - Html - checkbox
+                    DefaultTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - bool TestNamespace.InputTagHelper.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true
+                    DefaultTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - bool TestNamespace.CatchAllTagHelper.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..a73f5a033a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml)
+|"*, TestAssembly"|
+Generated Location: (727:14,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (67:2,32 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml)
+|true|
+Generated Location: (1637:35,41 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..83916da164
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs
@@ -0,0 +1,67 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "97a60a6d99646ce1d67aab46447cc8f582f6f03a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"97a60a6d99646ce1d67aab46447cc8f582f6f03a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            __TestNamespace_CatchAllTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml"
+__TestNamespace_InputTagHelper.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_CatchAllTagHelper.Checked = __TestNamespace_InputTagHelper.Checked;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..d86a4d2b8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] DuplicateTargetTagHelper.cshtml)
+                    IntermediateToken - (33:1,0 [2] DuplicateTargetTagHelper.cshtml) - Html - \n
+                TagHelper - (35:2,0 [40] DuplicateTargetTagHelper.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    PreallocatedTagHelperProperty - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - __tagHelperAttribute_0 - type - Type
+                    PreallocatedTagHelperProperty - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - __tagHelperAttribute_0 - type - Type
+                    DefaultTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - bool TestNamespace.InputTagHelper.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true
+                    DefaultTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - bool TestNamespace.CatchAllTagHelper.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml
new file mode 100644
index 0000000000..5e69ed1d81
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml
@@ -0,0 +1,14 @@
+@addTagHelper "*, TestAssembly"
+
+<input unbound="prefix @DateTime.Now" />
+
+<input unbound="@if (true) { @string.Empty } else { @false } suffix" />
+
+<input bound="prefix @DateTime.Now suffix" unbound="prefix @DateTime.Now suffix" />
+
+<input bound="@long.MinValue @if (true) { @string.Empty } else { @false } @int.MaxValue"
+       unbound="@long.MinValue @if (true) { @string.Empty } else { @false } @int.MaxValue" />
+
+<input unbound="@long.MinValue @DateTime.Now static    content @int.MaxValue" />
+
+<input unbound="@if (true) { @string.Empty } else { @false }" />
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ba9c0b7eb9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,251 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_DesignTime
+    {
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                  __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                 if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                        __o = string.Empty;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                           } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                               __o = false;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                           }
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Bound = string.Empty;
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                      __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+         __o = long.MinValue;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                              if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                     __o = string.Empty;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                        } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                            __o = false;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                                        }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                                     __o = int.MaxValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Bound = string.Empty;
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+           __o = long.MinValue;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                       __o = string.Empty;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                          } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                              __o = false;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                                          }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                                       __o = int.MaxValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+           __o = long.MinValue;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                          __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                          __o = int.MaxValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                 if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                        __o = string.Empty;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                           } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                               __o = false;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                           }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..76f7d9c916
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,133 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] DynamicAttributeTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [40] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix
+                        CSharpExpressionAttributeValue - (57:2,22 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (59:2,24 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperExecute - 
+                HtmlContent - (75:2,40 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (75:2,40 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (79:4,0 [71] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCodeAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                            CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                            IntermediateToken - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                            CSharpExpression - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                            IntermediateToken - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                        HtmlAttributeValue - (139:4,60 [7] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (140:4,61 [6] DynamicAttributeTagHelpers.cshtml) - Html - suffix
+                    DefaultTagHelperExecute - 
+                HtmlContent - (150:4,71 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (150:4,71 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (154:6,0 [83] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperProperty - (168:6,14 [27] DynamicAttributeTagHelpers.cshtml) - bound - string TestNamespace.InputTagHelper.Bound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (168:6,14 [7] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (168:6,14 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix
+                            IntermediateToken - (174:6,20 [1] DynamicAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (176:6,22 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (176:6,22 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml) - Html -  suffix
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix
+                        CSharpExpressionAttributeValue - (212:6,58 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (214:6,60 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                        HtmlAttributeValue - (226:6,72 [7] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (227:6,73 [6] DynamicAttributeTagHelpers.cshtml) - Html - suffix
+                    DefaultTagHelperExecute - 
+                HtmlContent - (237:6,83 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (237:6,83 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (241:8,0 [183] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperProperty - (255:8,14 [73] DynamicAttributeTagHelpers.cshtml) - bound - string TestNamespace.InputTagHelper.Bound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
+                        HtmlContent - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) - Html -  
+                        CSharpCode - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                        CSharpExpression - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                        CSharpCode - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                        CSharpExpression - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                        CSharpCode - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                        HtmlContent - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (347:9,16 [14] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
+                        CSharpCodeAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                            CSharpExpression - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                            IntermediateToken - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                            CSharpExpression - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                            IntermediateToken - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                        CSharpExpressionAttributeValue - (406:9,75 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (408:9,77 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (424:9,93 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (424:9,93 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (428:11,0 [80] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (444:11,16 [14] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (445:11,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
+                        CSharpExpressionAttributeValue - (458:11,30 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (460:11,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                        HtmlAttributeValue - (472:11,44 [7] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (473:11,45 [6] DynamicAttributeTagHelpers.cshtml) - Html - static
+                        HtmlAttributeValue - (479:11,51 [11] DynamicAttributeTagHelpers.cshtml) -     
+                            IntermediateToken - (483:11,55 [7] DynamicAttributeTagHelpers.cshtml) - Html - content
+                        CSharpExpressionAttributeValue - (490:11,62 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (492:11,64 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (508:11,80 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (508:11,80 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (512:13,0 [64] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCodeAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                            CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                            IntermediateToken - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                            CSharpExpression - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                            IntermediateToken - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..fb3faa5204
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,155 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (639:13,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (59:2,24 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (1271:31,24 [12] )
+|DateTime.Now|
+
+Source Location: (96:4,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|if (true) { |
+Generated Location: (1577:39,17 [12] )
+|if (true) { |
+
+Source Location: (109:4,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|string.Empty|
+Generated Location: (1792:46,30 [12] )
+|string.Empty|
+
+Source Location: (121:4,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| } else { |
+Generated Location: (2020:53,42 [10] )
+| } else { |
+
+Source Location: (132:4,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|false|
+Generated Location: (2256:60,53 [5] )
+|false|
+
+Source Location: (137:4,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| }|
+Generated Location: (2493:67,58 [2] )
+| }|
+
+Source Location: (176:6,22 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (2793:75,22 [12] )
+|DateTime.Now|
+
+Source Location: (214:6,60 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (3105:83,60 [12] )
+|DateTime.Now|
+
+Source Location: (256:8,15 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|long.MinValue|
+Generated Location: (3409:91,15 [13] )
+|long.MinValue|
+
+Source Location: (271:8,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|if (true) { |
+Generated Location: (3626:98,30 [12] )
+|if (true) { |
+
+Source Location: (284:8,43 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|string.Empty|
+Generated Location: (3854:105,43 [12] )
+|string.Empty|
+
+Source Location: (296:8,55 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| } else { |
+Generated Location: (4095:112,55 [10] )
+| } else { |
+
+Source Location: (307:8,66 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|false|
+Generated Location: (4344:119,66 [5] )
+|false|
+
+Source Location: (312:8,71 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| }|
+Generated Location: (4594:126,71 [2] )
+| }|
+
+Source Location: (316:8,75 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|int.MaxValue|
+Generated Location: (4844:133,75 [12] )
+|int.MaxValue|
+
+Source Location: (348:9,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|long.MinValue|
+Generated Location: (5114:141,17 [13] )
+|long.MinValue|
+
+Source Location: (363:9,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|if (true) { |
+Generated Location: (5334:148,32 [12] )
+|if (true) { |
+
+Source Location: (376:9,45 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|string.Empty|
+Generated Location: (5565:155,45 [12] )
+|string.Empty|
+
+Source Location: (388:9,57 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| } else { |
+Generated Location: (5809:162,57 [10] )
+| } else { |
+
+Source Location: (399:9,68 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|false|
+Generated Location: (6061:169,68 [5] )
+|false|
+
+Source Location: (404:9,73 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| }|
+Generated Location: (6314:176,73 [2] )
+| }|
+
+Source Location: (408:9,77 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|int.MaxValue|
+Generated Location: (6567:183,77 [12] )
+|int.MaxValue|
+
+Source Location: (445:11,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|long.MinValue|
+Generated Location: (6874:191,17 [13] )
+|long.MinValue|
+
+Source Location: (460:11,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (7094:198,32 [12] )
+|DateTime.Now|
+
+Source Location: (492:11,64 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|int.MaxValue|
+Generated Location: (7345:205,64 [12] )
+|int.MaxValue|
+
+Source Location: (529:13,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|if (true) { |
+Generated Location: (7652:213,17 [12] )
+|if (true) { |
+
+Source Location: (542:13,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|string.Empty|
+Generated Location: (7868:220,30 [12] )
+|string.Empty|
+
+Source Location: (554:13,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| } else { |
+Generated Location: (8097:227,42 [10] )
+| } else { |
+
+Source Location: (565:13,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+|false|
+Generated Location: (8334:234,53 [5] )
+|false|
+
+Source Location: (570:13,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
+| }|
+Generated Location: (8572:241,58 [2] )
+| }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..a1f0c76bac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,370 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "42f11f2c52ff2e658e61f6c5caace4347c07ca48"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"42f11f2c52ff2e658e61f6c5caace4347c07ca48", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_Runtime
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 51, "prefix", 51, 6, true);
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue(" ", 57, DateTime.Now, 58, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 95, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                 if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                        Write(string.Empty);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                           } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                               Write(false);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                           }
+
+#line default
+#line hidden
+#nullable disable
+                PopWriter();
+            }
+            ), 95, 44, false);
+            AddHtmlAttributeValue(" ", 139, "suffix", 140, 7, true);
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            BeginWriteTagHelperAttribute();
+            WriteLiteral("prefix ");
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+         WriteLiteral(DateTime.Now);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(" suffix");
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestNamespace_InputTagHelper.Bound = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("bound", __TestNamespace_InputTagHelper.Bound, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 3, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 206, "prefix", 206, 6, true);
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue(" ", 212, DateTime.Now, 213, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+            AddHtmlAttributeValue(" ", 226, "suffix", 227, 7, true);
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+  WriteLiteral(long.MinValue);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(" ");
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                              if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                              WriteLiteral(string.Empty);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                        } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                     WriteLiteral(false);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                                        }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(" ");
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                              WriteLiteral(int.MaxValue);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestNamespace_InputTagHelper.Bound = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("bound", __TestNamespace_InputTagHelper.Bound, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 3, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue("", 347, long.MinValue, 347, 14, false);
+
+#line default
+#line hidden
+#nullable disable
+            AddHtmlAttributeValue(" ", 361, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                       Write(string.Empty);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                          } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                              Write(false);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                                          }
+
+#line default
+#line hidden
+#nullable disable
+                PopWriter();
+            }
+            ), 362, 44, false);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue(" ", 406, int.MaxValue, 407, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 5, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue("", 444, long.MinValue, 444, 14, false);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue(" ", 458, DateTime.Now, 459, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+            AddHtmlAttributeValue(" ", 472, "static", 473, 7, true);
+            AddHtmlAttributeValue("    ", 479, "content", 483, 11, true);
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+AddHtmlAttributeValue(" ", 490, int.MaxValue, 491, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 1, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 528, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                 if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                        Write(string.Empty);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                           } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                               Write(false);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
+                                                           }
+
+#line default
+#line hidden
+#nullable disable
+                PopWriter();
+            }
+            ), 528, 44, false);
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..72a0832670
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt
@@ -0,0 +1,127 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_Runtime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] DynamicAttributeTagHelpers.cshtml) - Html - \n
+                TagHelper - (35:2,0 [40] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix
+                        CSharpExpressionAttributeValue - (57:2,22 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (59:2,24 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperExecute - 
+                HtmlContent - (75:2,40 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (75:2,40 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (79:4,0 [71] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCodeAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                            CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                            IntermediateToken - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                            CSharpExpression - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                            IntermediateToken - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                        HtmlAttributeValue - (139:4,60 [7] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (140:4,61 [6] DynamicAttributeTagHelpers.cshtml) - Html - suffix
+                    DefaultTagHelperExecute - 
+                HtmlContent - (150:4,71 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (150:4,71 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (154:6,0 [83] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperProperty - (168:6,14 [27] DynamicAttributeTagHelpers.cshtml) - bound - string TestNamespace.InputTagHelper.Bound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (168:6,14 [7] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (168:6,14 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix
+                            IntermediateToken - (174:6,20 [1] DynamicAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (176:6,22 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (176:6,22 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml) - Html -  suffix
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix
+                        CSharpExpressionAttributeValue - (212:6,58 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (214:6,60 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                        HtmlAttributeValue - (226:6,72 [7] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (227:6,73 [6] DynamicAttributeTagHelpers.cshtml) - Html - suffix
+                    DefaultTagHelperExecute - 
+                HtmlContent - (237:6,83 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (237:6,83 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (241:8,0 [183] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperProperty - (255:8,14 [73] DynamicAttributeTagHelpers.cshtml) - bound - string TestNamespace.InputTagHelper.Bound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
+                        HtmlContent - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) - Html -  
+                        CSharpCode - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                        CSharpExpression - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                        CSharpCode - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                        CSharpExpression - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                        CSharpCode - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                        HtmlContent - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml)
+                            IntermediateToken - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (347:9,16 [14] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
+                        CSharpCodeAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                            CSharpExpression - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                            IntermediateToken - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                            CSharpExpression - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                            IntermediateToken - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                        CSharpExpressionAttributeValue - (406:9,75 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (408:9,77 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (424:9,93 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (424:9,93 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (428:11,0 [80] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (444:11,16 [14] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (445:11,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
+                        CSharpExpressionAttributeValue - (458:11,30 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (460:11,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now
+                        HtmlAttributeValue - (472:11,44 [7] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (473:11,45 [6] DynamicAttributeTagHelpers.cshtml) - Html - static
+                        HtmlAttributeValue - (479:11,51 [11] DynamicAttributeTagHelpers.cshtml) -     
+                            IntermediateToken - (483:11,55 [7] DynamicAttributeTagHelpers.cshtml) - Html - content
+                        CSharpExpressionAttributeValue - (490:11,62 [14] DynamicAttributeTagHelpers.cshtml) -  
+                            IntermediateToken - (492:11,64 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (508:11,80 [4] DynamicAttributeTagHelpers.cshtml)
+                    IntermediateToken - (508:11,80 [4] DynamicAttributeTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (512:13,0 [64] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCodeAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - 
+                            IntermediateToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
+                            CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
+                            IntermediateToken - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
+                            CSharpExpression - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml)
+                                IntermediateToken - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
+                            IntermediateToken - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml
new file mode 100644
index 0000000000..d68f666f72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml
@@ -0,0 +1,8 @@
+@addTagHelper *, TestAssembly
+
+<div>
+    <input type= checked=""class="" />
+    <p age=''>
+        <input type=""checked= class="" />
+    </p>
+</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..34c56f0832
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,65 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_DesignTime
+    {
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = ;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = ;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..0b20997aff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.diagnostics.txt
@@ -0,0 +1,3 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml(4,18): Error RZ2008: Attribute 'checked' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml(5,8): Error RZ2008: Attribute 'age' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml(6,23): Error RZ2008: Attribute 'checked' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..2f02db5b87
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] EmptyAttributeTagHelpers.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [15] EmptyAttributeTagHelpers.cshtml)
+                    IntermediateToken - (29:0,29 [4] EmptyAttributeTagHelpers.cshtml) - Html - \n\n
+                    IntermediateToken - (33:2,0 [4] EmptyAttributeTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (37:2,4 [1] EmptyAttributeTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (38:2,5 [6] EmptyAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (44:3,4 [34] EmptyAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - Html - 
+                    DefaultTagHelperProperty - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - Html - 
+                    DefaultTagHelperProperty - (66:3,26 [0] EmptyAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (66:3,26 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - 
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (74:3,34 [0] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (74:3,34 [0] EmptyAttributeTagHelpers.cshtml) - Html - 
+                    DefaultTagHelperExecute - 
+                HtmlContent - (78:3,38 [6] EmptyAttributeTagHelpers.cshtml)
+                    IntermediateToken - (78:3,38 [6] EmptyAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (84:4,4 [64] EmptyAttributeTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (94:4,14 [10] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (94:4,14 [10] EmptyAttributeTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (104:5,8 [34] EmptyAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperProperty - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - Html - 
+                            DefaultTagHelperProperty - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - Html - 
+                            DefaultTagHelperProperty - (126:5,30 [0] EmptyAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (126:5,30 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - 
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (134:5,38 [0] EmptyAttributeTagHelpers.cshtml)
+                                    IntermediateToken - (134:5,38 [0] EmptyAttributeTagHelpers.cshtml) - Html - 
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (138:5,42 [6] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (138:5,42 [6] EmptyAttributeTagHelpers.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (92:4,12 [0] EmptyAttributeTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.SingleQuotes
+                        IntermediateToken - (92:4,12 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - 
+                    DefaultTagHelperExecute - 
+                HtmlContent - (148:6,8 [8] EmptyAttributeTagHelpers.cshtml)
+                    IntermediateToken - (148:6,8 [2] EmptyAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (150:7,0 [6] EmptyAttributeTagHelpers.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..d1f300d541
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
+|*, TestAssembly|
+Generated Location: (802:15,38 [15] )
+|*, TestAssembly|
+
+Source Location: (66:3,26 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
+||
+Generated Location: (1698:36,42 [0] )
+||
+
+Source Location: (126:5,30 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
+||
+Generated Location: (2264:47,42 [0] )
+||
+
+Source Location: (92:4,12 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
+||
+Generated Location: (2564:55,33 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..4c9ace1134
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,120 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9c86b0d6e2a590a85271afa26a21f39597a68e3f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"9c86b0d6e2a590a85271afa26a21f39597a68e3f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<div>\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = ;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = ;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
+__TestNamespace_PTagHelper.Age = ;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..0b20997aff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.diagnostics.txt
@@ -0,0 +1,3 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml(4,18): Error RZ2008: Attribute 'checked' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml(5,8): Error RZ2008: Attribute 'age' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml(6,23): Error RZ2008: Attribute 'checked' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..19769026c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt
@@ -0,0 +1,52 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type -  - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class -  - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [13] EmptyAttributeTagHelpers.cshtml)
+                    IntermediateToken - (31:1,0 [2] EmptyAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (33:2,0 [4] EmptyAttributeTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (37:2,4 [1] EmptyAttributeTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (38:2,5 [6] EmptyAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (44:3,4 [34] EmptyAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    PreallocatedTagHelperProperty - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                    PreallocatedTagHelperProperty - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                    DefaultTagHelperProperty - (66:3,26 [0] EmptyAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (66:3,26 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - 
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperExecute - 
+                HtmlContent - (78:3,38 [6] EmptyAttributeTagHelpers.cshtml)
+                    IntermediateToken - (78:3,38 [6] EmptyAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (84:4,4 [64] EmptyAttributeTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (94:4,14 [10] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (94:4,14 [10] EmptyAttributeTagHelpers.cshtml) - Html - \n        
+                        TagHelper - (104:5,8 [34] EmptyAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            PreallocatedTagHelperProperty - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperProperty - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            DefaultTagHelperProperty - (126:5,30 [0] EmptyAttributeTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (126:5,30 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - 
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (138:5,42 [6] EmptyAttributeTagHelpers.cshtml)
+                            IntermediateToken - (138:5,42 [6] EmptyAttributeTagHelpers.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (92:4,12 [0] EmptyAttributeTagHelpers.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.SingleQuotes
+                        IntermediateToken - (92:4,12 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - 
+                    DefaultTagHelperExecute - 
+                HtmlContent - (148:6,8 [8] EmptyAttributeTagHelpers.cshtml)
+                    IntermediateToken - (148:6,8 [2] EmptyAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (150:7,0 [6] EmptyAttributeTagHelpers.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml
new file mode 100644
index 0000000000..0366199cd5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml
@@ -0,0 +1,3 @@
+This is markup
+
+@{}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs
new file mode 100644
index 0000000000..147fb7b23a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml"
+  
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt
new file mode 100644
index 0000000000..1da8246eee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] EmptyCodeBlock.cshtml)
+                    IntermediateToken - (0:0,0 [18] EmptyCodeBlock.cshtml) - Html - This is markup\n\n
+                CSharpCode - (20:2,2 [0] EmptyCodeBlock.cshtml)
+                    IntermediateToken - (20:2,2 [0] EmptyCodeBlock.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c2efdcaf76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (20:2,2 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml)
+||
+Generated Location: (748:19,2 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs
new file mode 100644
index 0000000000..d7513d8023
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.codegen.cs
@@ -0,0 +1,19 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fdc98942fed24e572b86269f89a808b0c606cef1"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"fdc98942fed24e572b86269f89a808b0c606cef1", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("This is markup\r\n\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt
new file mode 100644
index 0000000000..75e7307e0f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] EmptyCodeBlock.cshtml)
+                    IntermediateToken - (0:0,0 [18] EmptyCodeBlock.cshtml) - Html - This is markup\n\n
+                CSharpCode - (20:2,2 [0] EmptyCodeBlock.cshtml)
+                    IntermediateToken - (20:2,2 [0] EmptyCodeBlock.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml
new file mode 100644
index 0000000000..6790c7eba2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml
@@ -0,0 +1,3 @@
+This is markup
+
+@()
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs
new file mode 100644
index 0000000000..a4e6956477
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml"
+__o = ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt
new file mode 100644
index 0000000000..cca09001e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] EmptyExplicitExpression.cshtml)
+                    IntermediateToken - (0:0,0 [18] EmptyExplicitExpression.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (20:2,2 [0] EmptyExplicitExpression.cshtml)
+                    IntermediateToken - (20:2,2 [0] EmptyExplicitExpression.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt
new file mode 100644
index 0000000000..3f7d10ade3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (20:2,2 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml)
+||
+Generated Location: (770:19,6 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs
new file mode 100644
index 0000000000..60274099a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.codegen.cs
@@ -0,0 +1,26 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "25dc9cf13110b5af9a1ca31a8f02abdc45a37244"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"25dc9cf13110b5af9a1ca31a8f02abdc45a37244", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("This is markup\r\n\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression.cshtml"
+Write();
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt
new file mode 100644
index 0000000000..c3daa8feb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] EmptyExplicitExpression.cshtml)
+                    IntermediateToken - (0:0,0 [18] EmptyExplicitExpression.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (20:2,2 [0] EmptyExplicitExpression.cshtml)
+                    IntermediateToken - (20:2,2 [0] EmptyExplicitExpression.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml
new file mode 100644
index 0000000000..021306da6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml
@@ -0,0 +1,3 @@
+This is markup
+
+@!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml
new file mode 100644
index 0000000000..a1db8cd602
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml
@@ -0,0 +1,3 @@
+@{
+    @
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs
new file mode 100644
index 0000000000..eaaeed80bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml"
+  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml"
+__o = ;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml"
+     
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..84ac278f6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml(2,6): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt
new file mode 100644
index 0000000000..d167e2f6b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml)
+                    IntermediateToken - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n    
+                CSharpExpression - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml)
+                    IntermediateToken - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml) - CSharp - 
+                CSharpCode - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml)
+                    IntermediateToken - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9ba6343fc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (2:0,2 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml)
+|
+    |
+Generated Location: (778:19,2 [6] )
+|
+    |
+
+Source Location: (9:1,5 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml)
+||
+Generated Location: (966:27,6 [0] )
+||
+
+Source Location: (9:1,5 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml)
+|
+|
+Generated Location: (1148:34,5 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs
new file mode 100644
index 0000000000..fb302c2676
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.codegen.cs
@@ -0,0 +1,25 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "bf754c5b319ea54f6c9636bd2815d4b47d11886d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"bf754c5b319ea54f6c9636bd2815d4b47d11886d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml"
+Write();
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..84ac278f6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode.cshtml(2,6): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt
new file mode 100644
index 0000000000..b910f3841c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml)
+                    IntermediateToken - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n    
+                CSharpExpression - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml)
+                    IntermediateToken - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml) - CSharp - 
+                CSharpCode - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml)
+                    IntermediateToken - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs
new file mode 100644
index 0000000000..cccfe56121
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml"
+__o = ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..5524460d0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml(3,2): Error RZ1005: "!" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt
new file mode 100644
index 0000000000..60189098dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] EmptyImplicitExpression.cshtml)
+                    IntermediateToken - (0:0,0 [18] EmptyImplicitExpression.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (19:2,1 [0] EmptyImplicitExpression.cshtml)
+                    IntermediateToken - (19:2,1 [0] EmptyImplicitExpression.cshtml) - CSharp - 
+                HtmlContent - (19:2,1 [1] EmptyImplicitExpression.cshtml)
+                    IntermediateToken - (19:2,1 [1] EmptyImplicitExpression.cshtml) - Html - !
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt
new file mode 100644
index 0000000000..d3539655ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (19:2,1 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml)
+||
+Generated Location: (770:19,6 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs
new file mode 100644
index 0000000000..9506f47a3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.codegen.cs
@@ -0,0 +1,27 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4c215c8ff3e726be334183020106682e47cf8ace"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4c215c8ff3e726be334183020106682e47cf8ace", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("This is markup\r\n\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml"
+Write();
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("!");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..5524460d0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression.cshtml(3,2): Error RZ1005: "!" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt
new file mode 100644
index 0000000000..e4187049bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_Runtime.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] EmptyImplicitExpression.cshtml)
+                    IntermediateToken - (0:0,0 [18] EmptyImplicitExpression.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (19:2,1 [0] EmptyImplicitExpression.cshtml)
+                    IntermediateToken - (19:2,1 [0] EmptyImplicitExpression.cshtml) - CSharp - 
+                HtmlContent - (19:2,1 [1] EmptyImplicitExpression.cshtml)
+                    IntermediateToken - (19:2,1 [1] EmptyImplicitExpression.cshtml) - Html - !
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml
new file mode 100644
index 0000000000..d949682156
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml
@@ -0,0 +1,11 @@
+@addTagHelper "*, TestAssembly"
+
+@{
+    var enumValue = MyEnum.MyValue;
+}
+
+<input value="@MyEnum.MyValue" />
+<input class="@MyEnum.MySecondValue" />
+<input value="MyValue" />
+<input value="MySecondValue" catch-all="MyValue"/>
+<input value="@enumValue" catch-all="@enumValue" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..44a0cfabe6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,101 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_DesignTime
+    {
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+  
+    var enumValue = MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+         __o = MyEnum.MySecondValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum.MySecondValue;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_CatchAllTagHelper.CatchAll = global::Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = enumValue;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_CatchAllTagHelper.CatchAll = enumValue;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..2418da2ba7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,74 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] EnumTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] EnumTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] EnumTagHelpers.cshtml) - Html - \n\n
+                CSharpCode - (37:2,2 [39] EnumTagHelpers.cshtml)
+                    IntermediateToken - (37:2,2 [39] EnumTagHelpers.cshtml) - CSharp - \n    var enumValue = MyEnum.MyValue;\n
+                HtmlContent - (79:5,0 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (79:5,0 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (81:6,0 [33] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (95:6,14 [15] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (96:6,15 [14] EnumTagHelpers.cshtml)
+                            IntermediateToken - (96:6,15 [14] EnumTagHelpers.cshtml) - CSharp - MyEnum.MyValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (114:6,33 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (114:6,33 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (116:7,0 [39] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (130:7,14 [21] EnumTagHelpers.cshtml) - 
+                            IntermediateToken - (131:7,15 [20] EnumTagHelpers.cshtml) - CSharp - MyEnum.MySecondValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (155:7,39 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (155:7,39 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (157:8,0 [25] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (171:8,14 [7] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (171:8,14 [7] EnumTagHelpers.cshtml) - CSharp - MyValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (182:8,25 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (182:8,25 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (184:9,0 [50] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (198:9,14 [13] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (198:9,14 [13] EnumTagHelpers.cshtml) - CSharp - MySecondValue
+                    DefaultTagHelperProperty - (224:9,40 [7] EnumTagHelpers.cshtml) - catch-all - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.CatchAllTagHelper.CatchAll - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (224:9,40 [7] EnumTagHelpers.cshtml) - CSharp - MyValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (234:9,50 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (234:9,50 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (236:10,0 [51] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (250:10,14 [10] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (251:10,15 [9] EnumTagHelpers.cshtml)
+                            IntermediateToken - (251:10,15 [9] EnumTagHelpers.cshtml) - CSharp - enumValue
+                    DefaultTagHelperProperty - (273:10,37 [10] EnumTagHelpers.cshtml) - catch-all - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.CatchAllTagHelper.CatchAll - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (274:10,38 [9] EnumTagHelpers.cshtml)
+                            IntermediateToken - (274:10,38 [9] EnumTagHelpers.cshtml) - CSharp - enumValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (287:10,51 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (287:10,51 [2] EnumTagHelpers.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..2c8365b953
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,49 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (707:14,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (37:2,2 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|
+    var enumValue = MyEnum.MyValue;
+|
+Generated Location: (1202:31,2 [39] )
+|
+    var enumValue = MyEnum.MyValue;
+|
+
+Source Location: (96:6,15 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|MyEnum.MyValue|
+Generated Location: (1651:41,39 [14] )
+|MyEnum.MyValue|
+
+Source Location: (131:7,15 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|MyEnum.MySecondValue|
+Generated Location: (2054:50,15 [20] )
+|MyEnum.MySecondValue|
+
+Source Location: (171:8,14 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|MyValue|
+Generated Location: (2580:59,132 [7] )
+|MyValue|
+
+Source Location: (198:9,14 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|MySecondValue|
+Generated Location: (3094:68,132 [13] )
+|MySecondValue|
+
+Source Location: (224:9,40 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|MyValue|
+Generated Location: (3408:75,138 [7] )
+|MyValue|
+
+Source Location: (251:10,15 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|enumValue|
+Generated Location: (3829:84,39 [9] )
+|enumValue|
+
+Source Location: (274:10,38 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
+|enumValue|
+Generated Location: (4046:91,45 [9] )
+|enumValue|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..264b4af248
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,180 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a605351a30b7fef3db7e3f61a70a62e29a6badf8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"a605351a30b7fef3db7e3f61a70a62e29a6badf8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_Runtime
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+  
+    var enumValue = MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+AddHtmlAttributeValue("", 130, MyEnum.MySecondValue, 130, 21, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum.MySecondValue;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_CatchAllTagHelper.CatchAll = global::Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum.MyValue;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_InputTagHelper.Value = enumValue;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
+__TestNamespace_CatchAllTagHelper.CatchAll = enumValue;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..e38db1bbaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_Runtime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] EnumTagHelpers.cshtml) - Html - \n
+                CSharpCode - (37:2,2 [39] EnumTagHelpers.cshtml)
+                    IntermediateToken - (37:2,2 [39] EnumTagHelpers.cshtml) - CSharp - \n    var enumValue = MyEnum.MyValue;\n
+                HtmlContent - (79:5,0 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (79:5,0 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (81:6,0 [33] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (95:6,14 [15] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (96:6,15 [14] EnumTagHelpers.cshtml)
+                            IntermediateToken - (96:6,15 [14] EnumTagHelpers.cshtml) - CSharp - MyEnum.MyValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (114:6,33 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (114:6,33 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (116:7,0 [39] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (130:7,14 [21] EnumTagHelpers.cshtml) - 
+                            IntermediateToken - (131:7,15 [20] EnumTagHelpers.cshtml) - CSharp - MyEnum.MySecondValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (155:7,39 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (155:7,39 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (157:8,0 [25] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (171:8,14 [7] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (171:8,14 [7] EnumTagHelpers.cshtml) - CSharp - MyValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (182:8,25 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (182:8,25 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (184:9,0 [50] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (198:9,14 [13] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (198:9,14 [13] EnumTagHelpers.cshtml) - CSharp - MySecondValue
+                    DefaultTagHelperProperty - (224:9,40 [7] EnumTagHelpers.cshtml) - catch-all - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.CatchAllTagHelper.CatchAll - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (224:9,40 [7] EnumTagHelpers.cshtml) - CSharp - MyValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (234:9,50 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (234:9,50 [2] EnumTagHelpers.cshtml) - Html - \n
+                TagHelper - (236:10,0 [51] EnumTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperProperty - (250:10,14 [10] EnumTagHelpers.cshtml) - value - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.InputTagHelper.Value - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (251:10,15 [9] EnumTagHelpers.cshtml)
+                            IntermediateToken - (251:10,15 [9] EnumTagHelpers.cshtml) - CSharp - enumValue
+                    DefaultTagHelperProperty - (273:10,37 [10] EnumTagHelpers.cshtml) - catch-all - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestTagHelperDescriptors.MyEnum TestNamespace.CatchAllTagHelper.CatchAll - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (274:10,38 [9] EnumTagHelpers.cshtml)
+                            IntermediateToken - (274:10,38 [9] EnumTagHelpers.cshtml) - CSharp - enumValue
+                    DefaultTagHelperExecute - 
+                HtmlContent - (287:10,51 [2] EnumTagHelpers.cshtml)
+                    IntermediateToken - (287:10,51 [2] EnumTagHelpers.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml
new file mode 100644
index 0000000000..a7bc49af11
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml
@@ -0,0 +1,8 @@
+@addTagHelper *, TestAssembly
+
+<!div class="randomNonTagHelperAttribute">
+    <!p class="Hello World" @DateTime.Now>
+        <!input type="text" />
+        <!em>Not a TagHelper: </!em> <input type="@DateTime.Now" checked="true" />
+    </!p>
+</!div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d0907fd099
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_DesignTime
+    {
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+                       __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+                                             __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Type = string.Empty;
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+                                __TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..da8f57f185
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,71 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] EscapedTagHelpers.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [5] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (29:0,29 [4] EscapedTagHelpers.cshtml) - Html - \n\n
+                    IntermediateToken - (33:2,0 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (35:2,2 [47] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (35:2,2 [3] EscapedTagHelpers.cshtml) - Html - div
+                    IntermediateToken - (38:2,5 [36] EscapedTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (74:2,41 [1] EscapedTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (75:2,42 [6] EscapedTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (81:3,4 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (83:3,6 [22] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (83:3,6 [1] EscapedTagHelpers.cshtml) - Html - p
+                    IntermediateToken - (84:3,7 [20] EscapedTagHelpers.cshtml) - Html -  class="Hello World"
+                    IntermediateToken - (104:3,27 [1] EscapedTagHelpers.cshtml) - Html -  
+                CSharpExpression - (106:3,29 [12] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (106:3,29 [12] EscapedTagHelpers.cshtml) - CSharp - DateTime.Now
+                HtmlContent - (118:3,41 [12] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (118:3,41 [1] EscapedTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (119:3,42 [10] EscapedTagHelpers.cshtml) - Html - \n        
+                    IntermediateToken - (129:4,8 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (131:4,10 [31] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (131:4,10 [5] EscapedTagHelpers.cshtml) - Html - input
+                    IntermediateToken - (136:4,15 [12] EscapedTagHelpers.cshtml) - Html -  type="text"
+                    IntermediateToken - (148:4,27 [1] EscapedTagHelpers.cshtml) - Html -  
+                    IntermediateToken - (149:4,28 [2] EscapedTagHelpers.cshtml) - Html - />
+                    IntermediateToken - (151:4,30 [10] EscapedTagHelpers.cshtml) - Html - \n        
+                    IntermediateToken - (161:5,8 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (163:5,10 [22] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (163:5,10 [2] EscapedTagHelpers.cshtml) - Html - em
+                    IntermediateToken - (165:5,12 [1] EscapedTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (166:5,13 [17] EscapedTagHelpers.cshtml) - Html - Not a TagHelper: 
+                    IntermediateToken - (183:5,30 [2] EscapedTagHelpers.cshtml) - Html - </
+                HtmlContent - (186:5,33 [4] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (186:5,33 [3] EscapedTagHelpers.cshtml) - Html - em>
+                    IntermediateToken - (189:5,36 [1] EscapedTagHelpers.cshtml) - Html -  
+                TagHelper - (190:5,37 [45] EscapedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (203:5,50 [13] EscapedTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (204:5,51 [12] EscapedTagHelpers.cshtml)
+                            IntermediateToken - (204:5,51 [12] EscapedTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperProperty - (203:5,50 [13] EscapedTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (204:5,51 [12] EscapedTagHelpers.cshtml)
+                            IntermediateToken - (204:5,51 [12] EscapedTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperProperty - (227:5,74 [4] EscapedTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (227:5,74 [4] EscapedTagHelpers.cshtml) - CSharp - true
+                    DefaultTagHelperExecute - 
+                HtmlContent - (235:5,82 [8] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (235:5,82 [6] EscapedTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (241:6,4 [2] EscapedTagHelpers.cshtml) - Html - </
+                HtmlContent - (244:6,7 [6] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (244:6,7 [2] EscapedTagHelpers.cshtml) - Html - p>
+                    IntermediateToken - (246:6,9 [2] EscapedTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (248:7,0 [2] EscapedTagHelpers.cshtml) - Html - </
+                HtmlContent - (251:7,3 [4] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (251:7,3 [4] EscapedTagHelpers.cshtml) - Html - div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..716a9799a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
+|*, TestAssembly|
+Generated Location: (710:14,38 [15] )
+|*, TestAssembly|
+
+Source Location: (106:3,29 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (1234:31,29 [12] )
+|DateTime.Now|
+
+Source Location: (204:5,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
+|DateTime.Now|
+Generated Location: (1670:40,51 [12] )
+|DateTime.Now|
+
+Source Location: (227:5,74 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
+|true|
+Generated Location: (2075:49,74 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..06a2adfcde
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,89 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "c1489e9dd98dc3e29bfbfd9a3f271ddec5134446"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"c1489e9dd98dc3e29bfbfd9a3f271ddec5134446", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_Runtime
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<");
+            WriteLiteral("div class=\"randomNonTagHelperAttribute\">\r\n    <");
+            WriteLiteral("p class=\"Hello World\" ");
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+                       Write(DateTime.Now);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(">\r\n        <");
+            WriteLiteral("input type=\"text\" />\r\n        <");
+            WriteLiteral("em>Not a TagHelper: </");
+            WriteLiteral("em> ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+                                      WriteLiteral(DateTime.Now);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    </");
+            WriteLiteral("p>\r\n</");
+            WriteLiteral("div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..10ad7acf39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.ir.txt
@@ -0,0 +1,65 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_Runtime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [3] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (31:1,0 [2] EscapedTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (33:2,0 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (35:2,2 [47] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (35:2,2 [3] EscapedTagHelpers.cshtml) - Html - div
+                    IntermediateToken - (38:2,5 [36] EscapedTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (74:2,41 [1] EscapedTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (75:2,42 [6] EscapedTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (81:3,4 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (83:3,6 [22] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (83:3,6 [1] EscapedTagHelpers.cshtml) - Html - p
+                    IntermediateToken - (84:3,7 [20] EscapedTagHelpers.cshtml) - Html -  class="Hello World"
+                    IntermediateToken - (104:3,27 [1] EscapedTagHelpers.cshtml) - Html -  
+                CSharpExpression - (106:3,29 [12] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (106:3,29 [12] EscapedTagHelpers.cshtml) - CSharp - DateTime.Now
+                HtmlContent - (118:3,41 [12] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (118:3,41 [1] EscapedTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (119:3,42 [10] EscapedTagHelpers.cshtml) - Html - \n        
+                    IntermediateToken - (129:4,8 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (131:4,10 [31] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (131:4,10 [5] EscapedTagHelpers.cshtml) - Html - input
+                    IntermediateToken - (136:4,15 [12] EscapedTagHelpers.cshtml) - Html -  type="text"
+                    IntermediateToken - (148:4,27 [1] EscapedTagHelpers.cshtml) - Html -  
+                    IntermediateToken - (149:4,28 [2] EscapedTagHelpers.cshtml) - Html - />
+                    IntermediateToken - (151:4,30 [10] EscapedTagHelpers.cshtml) - Html - \n        
+                    IntermediateToken - (161:5,8 [1] EscapedTagHelpers.cshtml) - Html - <
+                HtmlContent - (163:5,10 [22] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (163:5,10 [2] EscapedTagHelpers.cshtml) - Html - em
+                    IntermediateToken - (165:5,12 [1] EscapedTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (166:5,13 [17] EscapedTagHelpers.cshtml) - Html - Not a TagHelper: 
+                    IntermediateToken - (183:5,30 [2] EscapedTagHelpers.cshtml) - Html - </
+                HtmlContent - (186:5,33 [4] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (186:5,33 [3] EscapedTagHelpers.cshtml) - Html - em>
+                    IntermediateToken - (189:5,36 [1] EscapedTagHelpers.cshtml) - Html -  
+                TagHelper - (190:5,37 [45] EscapedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (203:5,50 [13] EscapedTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (204:5,51 [12] EscapedTagHelpers.cshtml)
+                            IntermediateToken - (204:5,51 [12] EscapedTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperProperty - (203:5,50 [13] EscapedTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (204:5,51 [12] EscapedTagHelpers.cshtml)
+                            IntermediateToken - (204:5,51 [12] EscapedTagHelpers.cshtml) - CSharp - DateTime.Now
+                    DefaultTagHelperProperty - (227:5,74 [4] EscapedTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (227:5,74 [4] EscapedTagHelpers.cshtml) - CSharp - true
+                    DefaultTagHelperExecute - 
+                HtmlContent - (235:5,82 [8] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (235:5,82 [6] EscapedTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (241:6,4 [2] EscapedTagHelpers.cshtml) - Html - </
+                HtmlContent - (244:6,7 [6] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (244:6,7 [2] EscapedTagHelpers.cshtml) - Html - p>
+                    IntermediateToken - (246:6,9 [2] EscapedTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (248:7,0 [2] EscapedTagHelpers.cshtml) - Html - </
+                HtmlContent - (251:7,3 [4] EscapedTagHelpers.cshtml)
+                    IntermediateToken - (251:7,3 [4] EscapedTagHelpers.cshtml) - Html - div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml
new file mode 100644
index 0000000000..10730f1114
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml
@@ -0,0 +1 @@
+1 + 1 = @(1+1)
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml
new file mode 100644
index 0000000000..a0fdfc9a21
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml
@@ -0,0 +1,3 @@
+This is markup
+
+@(
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..07bdbbe86b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml"
+__o = ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..4e0bfb131d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml(3,2): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..947b28d727
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] ExplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (0:0,0 [18] ExplicitExpressionAtEOF.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (20:2,2 [0] ExplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (20:2,2 [0] ExplicitExpressionAtEOF.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..a4208a7ee2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (20:2,2 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml)
+||
+Generated Location: (770:19,6 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..d3d9989be5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.codegen.cs
@@ -0,0 +1,26 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e8e095026beaca454b3a8d02b1548fa001d08214"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"e8e095026beaca454b3a8d02b1548fa001d08214", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("This is markup\r\n\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml"
+Write();
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..4e0bfb131d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF.cshtml(3,2): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..5f459014c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] ExplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (0:0,0 [18] ExplicitExpressionAtEOF.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (20:2,2 [0] ExplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (20:2,2 [0] ExplicitExpressionAtEOF.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml
new file mode 100644
index 0000000000..70d8cefd95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml
@@ -0,0 +1 @@
+<div>@(@</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2cc76e8ce5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.cs
@@ -0,0 +1,31 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml"
+  __o = item => new Template(async(__razor_template_writer) => {
+}
+);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..16ad2a09d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,11): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,7): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt
new file mode 100644
index 0000000000..b38906f249
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [5] ExplicitExpressionWithMarkup.cshtml)
+                    IntermediateToken - (0:0,0 [4] ExplicitExpressionWithMarkup.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] ExplicitExpressionWithMarkup.cshtml) - Html - >
+                CSharpExpression - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
+                    Template - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
+                        HtmlContent - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
+                            IntermediateToken - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml) - Html - </div>
+                    IntermediateToken - (14:0,14 [0] ExplicitExpressionWithMarkup.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt
new file mode 100644
index 0000000000..62cc130627
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:0,14 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml)
+||
+Generated Location: (844:21,1 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs
new file mode 100644
index 0000000000..fcdf711df5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.codegen.cs
@@ -0,0 +1,31 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "47d858755c07db489bd8824b7eaee760bb858bcb"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"47d858755c07db489bd8824b7eaee760bb858bcb", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<div>");
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml"
+  Write(item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    WriteLiteral("</div>");
+    PopWriter();
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..16ad2a09d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,11): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,7): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt
new file mode 100644
index 0000000000..8764a82186
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.ir.txt
@@ -0,0 +1,14 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [5] ExplicitExpressionWithMarkup.cshtml)
+                    IntermediateToken - (0:0,0 [4] ExplicitExpressionWithMarkup.cshtml) - Html - <div
+                    IntermediateToken - (4:0,4 [1] ExplicitExpressionWithMarkup.cshtml) - Html - >
+                CSharpExpression - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
+                    Template - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
+                        HtmlContent - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
+                            IntermediateToken - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml) - Html - </div>
+                    IntermediateToken - (14:0,14 [0] ExplicitExpressionWithMarkup.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7b344876fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml"
+    __o = 1+1;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt
new file mode 100644
index 0000000000..b2f22a261b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [8] ExplicitExpression.cshtml)
+                    IntermediateToken - (0:0,0 [8] ExplicitExpression.cshtml) - Html - 1 + 1 = 
+                CSharpExpression - (10:0,10 [3] ExplicitExpression.cshtml)
+                    IntermediateToken - (10:0,10 [3] ExplicitExpression.cshtml) - CSharp - 1+1
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e4720d0660
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (10:0,10 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml)
+|1+1|
+Generated Location: (764:19,10 [3] )
+|1+1|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs
new file mode 100644
index 0000000000..8f6c52477e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.codegen.cs
@@ -0,0 +1,26 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0fa6894c606c7426da1d8cacfbacf8be971c777f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"0fa6894c606c7426da1d8cacfbacf8be971c777f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("1 + 1 = ");
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression.cshtml"
+    Write(1+1);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt
new file mode 100644
index 0000000000..c1867efbb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [8] ExplicitExpression.cshtml)
+                    IntermediateToken - (0:0,0 [8] ExplicitExpression.cshtml) - Html - 1 + 1 = 
+                CSharpExpression - (10:0,10 [3] ExplicitExpression.cshtml)
+                    IntermediateToken - (10:0,10 [3] ExplicitExpression.cshtml) - CSharp - 1+1
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml
new file mode 100644
index 0000000000..a4d4caa007
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml
@@ -0,0 +1,16 @@
+@{
+    object foo = null;
+    string bar = "Foo";
+}
+
+@if(foo != null) {
+    @foo
+} else {
+    <p>Foo is Null!</p>
+}
+
+<p>
+@if(!String.IsNullOrEmpty(bar)) {
+    @(bar.Replace("F", "B"))
+}
+</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d0cd34cc74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.cs
@@ -0,0 +1,86 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+  
+    object foo = null;
+    string bar = "Foo";
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+ if(foo != null) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+__o = foo;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+        
+} else {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+                       
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+ if(!String.IsNullOrEmpty(bar)) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+__o = bar.Replace("F", "B");
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+                            
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt
new file mode 100644
index 0000000000..358e6bc788
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt
@@ -0,0 +1,42 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [51] ExpressionsInCode.cshtml)
+                    IntermediateToken - (2:0,2 [51] ExpressionsInCode.cshtml) - CSharp - \n    object foo = null;\n    string bar = "Foo";\n
+                HtmlContent - (56:4,0 [2] ExpressionsInCode.cshtml)
+                    IntermediateToken - (56:4,0 [2] ExpressionsInCode.cshtml) - Html - \n
+                CSharpCode - (59:5,1 [23] ExpressionsInCode.cshtml)
+                    IntermediateToken - (59:5,1 [23] ExpressionsInCode.cshtml) - CSharp - if(foo != null) {\n    
+                CSharpExpression - (83:6,5 [3] ExpressionsInCode.cshtml)
+                    IntermediateToken - (83:6,5 [3] ExpressionsInCode.cshtml) - CSharp - foo
+                CSharpCode - (86:6,8 [16] ExpressionsInCode.cshtml)
+                    IntermediateToken - (86:6,8 [16] ExpressionsInCode.cshtml) - CSharp - \n} else {\n    
+                HtmlContent - (102:8,4 [19] ExpressionsInCode.cshtml)
+                    IntermediateToken - (102:8,4 [2] ExpressionsInCode.cshtml) - Html - <p
+                    IntermediateToken - (104:8,6 [1] ExpressionsInCode.cshtml) - Html - >
+                    IntermediateToken - (105:8,7 [12] ExpressionsInCode.cshtml) - Html - Foo is Null!
+                    IntermediateToken - (117:8,19 [4] ExpressionsInCode.cshtml) - Html - </p>
+                CSharpCode - (121:8,23 [3] ExpressionsInCode.cshtml)
+                    IntermediateToken - (121:8,23 [3] ExpressionsInCode.cshtml) - CSharp - \n}
+                HtmlContent - (124:9,1 [9] ExpressionsInCode.cshtml)
+                    IntermediateToken - (124:9,1 [4] ExpressionsInCode.cshtml) - Html - \n\n
+                    IntermediateToken - (128:11,0 [2] ExpressionsInCode.cshtml) - Html - <p
+                    IntermediateToken - (130:11,2 [1] ExpressionsInCode.cshtml) - Html - >
+                    IntermediateToken - (131:11,3 [2] ExpressionsInCode.cshtml) - Html - \n
+                CSharpCode - (134:12,1 [38] ExpressionsInCode.cshtml)
+                    IntermediateToken - (134:12,1 [38] ExpressionsInCode.cshtml) - CSharp - if(!String.IsNullOrEmpty(bar)) {\n    
+                CSharpExpression - (174:13,6 [21] ExpressionsInCode.cshtml)
+                    IntermediateToken - (174:13,6 [21] ExpressionsInCode.cshtml) - CSharp - bar.Replace("F", "B")
+                CSharpCode - (196:13,28 [3] ExpressionsInCode.cshtml)
+                    IntermediateToken - (196:13,28 [3] ExpressionsInCode.cshtml) - CSharp - \n}
+                HtmlContent - (199:14,1 [6] ExpressionsInCode.cshtml)
+                    IntermediateToken - (199:14,1 [2] ExpressionsInCode.cshtml) - Html - \n
+                    IntermediateToken - (201:15,0 [4] ExpressionsInCode.cshtml) - Html - </p>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt
new file mode 100644
index 0000000000..0db3796826
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.mappings.txt
@@ -0,0 +1,58 @@
+Source Location: (2:0,2 [51] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|
+    object foo = null;
+    string bar = "Foo";
+|
+Generated Location: (754:19,2 [51] )
+|
+    object foo = null;
+    string bar = "Foo";
+|
+
+Source Location: (59:5,1 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|if(foo != null) {
+    |
+Generated Location: (968:28,1 [23] )
+|if(foo != null) {
+    |
+
+Source Location: (83:6,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|foo|
+Generated Location: (1161:36,6 [3] )
+|foo|
+
+Source Location: (86:6,8 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|
+} else {
+    |
+Generated Location: (1337:43,8 [16] )
+|
+} else {
+    |
+
+Source Location: (121:8,23 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|
+}|
+Generated Location: (1540:52,23 [3] )
+|
+}|
+
+Source Location: (134:12,1 [38] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|if(!String.IsNullOrEmpty(bar)) {
+    |
+Generated Location: (1709:60,1 [38] )
+|if(!String.IsNullOrEmpty(bar)) {
+    |
+
+Source Location: (174:13,6 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|bar.Replace("F", "B")|
+Generated Location: (1918:68,6 [21] )
+|bar.Replace("F", "B")|
+
+Source Location: (196:13,28 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml)
+|
+}|
+Generated Location: (2133:75,28 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs
new file mode 100644
index 0000000000..f5c181ecb9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs
@@ -0,0 +1,84 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3ccb5b16f61b84dd82d7402e4a17870a39d09ca9"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"3ccb5b16f61b84dd82d7402e4a17870a39d09ca9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+  
+    object foo = null;
+    string bar = "Foo";
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+ if(foo != null) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+Write(foo);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+        
+} else {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Foo is Null!</p>\r\n");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n<p>\r\n");
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+ if(!String.IsNullOrEmpty(bar)) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+Write(bar.Replace("F", "B"));
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
+                            
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt
new file mode 100644
index 0000000000..57aeaa556b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [51] ExpressionsInCode.cshtml)
+                    IntermediateToken - (2:0,2 [51] ExpressionsInCode.cshtml) - CSharp - \n    object foo = null;\n    string bar = "Foo";\n
+                HtmlContent - (56:4,0 [2] ExpressionsInCode.cshtml)
+                    IntermediateToken - (56:4,0 [2] ExpressionsInCode.cshtml) - Html - \n
+                CSharpCode - (59:5,1 [23] ExpressionsInCode.cshtml)
+                    IntermediateToken - (59:5,1 [23] ExpressionsInCode.cshtml) - CSharp - if(foo != null) {\n    
+                CSharpExpression - (83:6,5 [3] ExpressionsInCode.cshtml)
+                    IntermediateToken - (83:6,5 [3] ExpressionsInCode.cshtml) - CSharp - foo
+                CSharpCode - (86:6,8 [12] ExpressionsInCode.cshtml)
+                    IntermediateToken - (86:6,8 [12] ExpressionsInCode.cshtml) - CSharp - \n} else {\n
+                HtmlContent - (98:8,0 [25] ExpressionsInCode.cshtml)
+                    IntermediateToken - (98:8,0 [4] ExpressionsInCode.cshtml) - Html -     
+                    IntermediateToken - (102:8,4 [2] ExpressionsInCode.cshtml) - Html - <p
+                    IntermediateToken - (104:8,6 [1] ExpressionsInCode.cshtml) - Html - >
+                    IntermediateToken - (105:8,7 [12] ExpressionsInCode.cshtml) - Html - Foo is Null!
+                    IntermediateToken - (117:8,19 [4] ExpressionsInCode.cshtml) - Html - </p>
+                    IntermediateToken - (121:8,23 [2] ExpressionsInCode.cshtml) - Html - \n
+                CSharpCode - (123:9,0 [3] ExpressionsInCode.cshtml)
+                    IntermediateToken - (123:9,0 [3] ExpressionsInCode.cshtml) - CSharp - }\n
+                HtmlContent - (126:10,0 [7] ExpressionsInCode.cshtml)
+                    IntermediateToken - (126:10,0 [2] ExpressionsInCode.cshtml) - Html - \n
+                    IntermediateToken - (128:11,0 [2] ExpressionsInCode.cshtml) - Html - <p
+                    IntermediateToken - (130:11,2 [1] ExpressionsInCode.cshtml) - Html - >
+                    IntermediateToken - (131:11,3 [2] ExpressionsInCode.cshtml) - Html - \n
+                CSharpCode - (134:12,1 [38] ExpressionsInCode.cshtml)
+                    IntermediateToken - (134:12,1 [38] ExpressionsInCode.cshtml) - CSharp - if(!String.IsNullOrEmpty(bar)) {\n    
+                CSharpExpression - (174:13,6 [21] ExpressionsInCode.cshtml)
+                    IntermediateToken - (174:13,6 [21] ExpressionsInCode.cshtml) - CSharp - bar.Replace("F", "B")
+                CSharpCode - (196:13,28 [5] ExpressionsInCode.cshtml)
+                    IntermediateToken - (196:13,28 [5] ExpressionsInCode.cshtml) - CSharp - \n}\n
+                HtmlContent - (201:15,0 [4] ExpressionsInCode.cshtml)
+                    IntermediateToken - (201:15,0 [4] ExpressionsInCode.cshtml) - Html - </p>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml
new file mode 100644
index 0000000000..5d06b37224
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml
@@ -0,0 +1,12 @@
+@functions {
+
+}
+
+@functions {
+    Random _rand = new Random();
+    private int RandomInt() {
+        return _rand.Next();
+    }
+}
+
+Here's a random number: @RandomInt()
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml
new file mode 100644
index 0000000000..6b3de50b2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml
@@ -0,0 +1,7 @@
+
+
+	@functions{
+string foo(string input) {
+	return input + "!";
+}
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs
new file mode 100644
index 0000000000..6447c907bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml"
+               
+string foo(string input) {
+	return input + "!";
+}
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt
new file mode 100644
index 0000000000..f460329dab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [5] FunctionsBlockMinimal.cshtml)
+                    IntermediateToken - (0:0,0 [5] FunctionsBlockMinimal.cshtml) - Html - \n\n	
+            CSharpCode - (16:2,12 [55] FunctionsBlockMinimal.cshtml)
+                IntermediateToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n	return input + "!";\n}\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e09fcdf23f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.mappings.txt
@@ -0,0 +1,13 @@
+Source Location: (16:2,12 [55] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml)
+|
+string foo(string input) {
+	return input + "!";
+}
+|
+Generated Location: (824:21,15 [55] )
+|
+string foo(string input) {
+	return input + "!";
+}
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs
new file mode 100644
index 0000000000..9dd9ba4e53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs
@@ -0,0 +1,29 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5ba3477b8f10b5207bb9f610499189ac0d50aaa0"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5ba3477b8f10b5207bb9f610499189ac0d50aaa0", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal.cshtml"
+               
+string foo(string input) {
+	return input + "!";
+}
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
new file mode 100644
index 0000000000..5efffb2706
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [4] FunctionsBlockMinimal.cshtml)
+                    IntermediateToken - (0:0,0 [4] FunctionsBlockMinimal.cshtml) - Html - \n\n
+            CSharpCode - (16:2,12 [55] FunctionsBlockMinimal.cshtml)
+                IntermediateToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n	return input + "!";\n}\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs
new file mode 100644
index 0000000000..762e0b2a01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml"
+                   __o = RandomInt();
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml"
+            
+
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml"
+            
+    Random _rand = new Random();
+    private int RandomInt() {
+        return _rand.Next();
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt
new file mode 100644
index 0000000000..e71b8ed6a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:2,1 [4] FunctionsBlock.cshtml)
+                    IntermediateToken - (17:2,1 [4] FunctionsBlock.cshtml) - Html - \n\n
+                HtmlContent - (138:9,1 [28] FunctionsBlock.cshtml)
+                    IntermediateToken - (138:9,1 [28] FunctionsBlock.cshtml) - Html - \n\nHere's a random number: 
+                CSharpExpression - (167:11,25 [11] FunctionsBlock.cshtml)
+                    IntermediateToken - (167:11,25 [11] FunctionsBlock.cshtml) - CSharp - RandomInt()
+            CSharpCode - (12:0,12 [4] FunctionsBlock.cshtml)
+                IntermediateToken - (12:0,12 [4] FunctionsBlock.cshtml) - CSharp - \n\n
+            CSharpCode - (33:4,12 [104] FunctionsBlock.cshtml)
+                IntermediateToken - (33:4,12 [104] FunctionsBlock.cshtml) - CSharp - \n    Random _rand = new Random();\n    private int RandomInt() {\n        return _rand.Next();\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt
new file mode 100644
index 0000000000..d2d8522163
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (167:11,25 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml)
+|RandomInt()|
+Generated Location: (772:19,25 [11] )
+|RandomInt()|
+
+Source Location: (12:0,12 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml)
+|
+
+|
+Generated Location: (1006:28,12 [4] )
+|
+
+|
+
+Source Location: (33:4,12 [104] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml)
+|
+    Random _rand = new Random();
+    private int RandomInt() {
+        return _rand.Next();
+    }
+|
+Generated Location: (1181:36,12 [104] )
+|
+    Random _rand = new Random();
+    private int RandomInt() {
+        return _rand.Next();
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs
new file mode 100644
index 0000000000..f005acdd93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e6a053bfeb65ba3e17885a8ae1523f28a3483258"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"e6a053bfeb65ba3e17885a8ae1523f28a3483258", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\nHere\'s a random number: ");
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml"
+                   Write(RandomInt());
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock.cshtml"
+            
+    Random _rand = new Random();
+    private int RandomInt() {
+        return _rand.Next();
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt
new file mode 100644
index 0000000000..4b05dbcc3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (19:3,0 [2] FunctionsBlock.cshtml)
+                    IntermediateToken - (19:3,0 [2] FunctionsBlock.cshtml) - Html - \n
+                HtmlContent - (140:10,0 [26] FunctionsBlock.cshtml)
+                    IntermediateToken - (140:10,0 [26] FunctionsBlock.cshtml) - Html - \nHere's a random number: 
+                CSharpExpression - (167:11,25 [11] FunctionsBlock.cshtml)
+                    IntermediateToken - (167:11,25 [11] FunctionsBlock.cshtml) - CSharp - RandomInt()
+            CSharpCode - (12:0,12 [4] FunctionsBlock.cshtml)
+                IntermediateToken - (12:0,12 [4] FunctionsBlock.cshtml) - CSharp - \n\n
+            CSharpCode - (33:4,12 [104] FunctionsBlock.cshtml)
+                IntermediateToken - (33:4,12 [104] FunctionsBlock.cshtml) - CSharp - \n    Random _rand = new Random();\n    private int RandomInt() {\n        return _rand.Next();\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml
new file mode 100644
index 0000000000..a6addbe97c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml
@@ -0,0 +1,3 @@
+@{
+    @@Da
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7e2f26e97e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml"
+  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml"
+     @Da
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt
new file mode 100644
index 0000000000..6c3f2a9d41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] HiddenSpansInCode.cshtml)
+                    IntermediateToken - (2:0,2 [6] HiddenSpansInCode.cshtml) - CSharp - \n    
+                CSharpCode - (9:1,5 [5] HiddenSpansInCode.cshtml)
+                    IntermediateToken - (9:1,5 [5] HiddenSpansInCode.cshtml) - CSharp - @Da\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b073a2350b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (2:0,2 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml)
+|
+    |
+Generated Location: (754:19,2 [6] )
+|
+    |
+
+Source Location: (9:1,5 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml)
+|@Da
+|
+Generated Location: (929:27,5 [5] )
+|@Da
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs
new file mode 100644
index 0000000000..a39b51584d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs
@@ -0,0 +1,25 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9bc7458ab052e80d9c977bfce0f0c7e8aef0d80f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"9bc7458ab052e80d9c977bfce0f0c7e8aef0d80f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml"
+     @Da
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt
new file mode 100644
index 0000000000..92fc13fef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] HiddenSpansInCode.cshtml)
+                    IntermediateToken - (2:0,2 [6] HiddenSpansInCode.cshtml) - CSharp - \n    
+                CSharpCode - (9:1,5 [5] HiddenSpansInCode.cshtml)
+                    IntermediateToken - (9:1,5 [5] HiddenSpansInCode.cshtml) - CSharp - @Da\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml
new file mode 100644
index 0000000000..6a99437910
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml
@@ -0,0 +1,2 @@
+<!-- " -->
+<img src="~/images/submit.png" />
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs
new file mode 100644
index 0000000000..6add10d801
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt
new file mode 100644
index 0000000000..4d1b62bfcc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Double.cshtml)
+                    IntermediateToken - (0:0,0 [4] HtmlCommentWithQuote_Double.cshtml) - Html - <!--
+                    IntermediateToken - (4:0,4 [3] HtmlCommentWithQuote_Double.cshtml) - Html -  " 
+                    IntermediateToken - (7:0,7 [3] HtmlCommentWithQuote_Double.cshtml) - Html - -->
+                    IntermediateToken - (10:0,10 [2] HtmlCommentWithQuote_Double.cshtml) - Html - \n
+                    IntermediateToken - (12:1,0 [4] HtmlCommentWithQuote_Double.cshtml) - Html - <img
+                    IntermediateToken - (16:1,4 [26] HtmlCommentWithQuote_Double.cshtml) - Html -  src="~/images/submit.png"
+                    IntermediateToken - (42:1,30 [1] HtmlCommentWithQuote_Double.cshtml) - Html -  
+                    IntermediateToken - (43:1,31 [2] HtmlCommentWithQuote_Double.cshtml) - Html - />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs
new file mode 100644
index 0000000000..fb924e6327
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.codegen.cs
@@ -0,0 +1,19 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "520aebbcdbdb163b131356be8f3aef0eb0809c47"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"520aebbcdbdb163b131356be8f3aef0eb0809c47", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<!-- \" -->\r\n<img src=\"~/images/submit.png\" />");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt
new file mode 100644
index 0000000000..4408836bd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_Runtime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Double.cshtml)
+                    IntermediateToken - (0:0,0 [4] HtmlCommentWithQuote_Double.cshtml) - Html - <!--
+                    IntermediateToken - (4:0,4 [3] HtmlCommentWithQuote_Double.cshtml) - Html -  " 
+                    IntermediateToken - (7:0,7 [3] HtmlCommentWithQuote_Double.cshtml) - Html - -->
+                    IntermediateToken - (10:0,10 [2] HtmlCommentWithQuote_Double.cshtml) - Html - \n
+                    IntermediateToken - (12:1,0 [4] HtmlCommentWithQuote_Double.cshtml) - Html - <img
+                    IntermediateToken - (16:1,4 [26] HtmlCommentWithQuote_Double.cshtml) - Html -  src="~/images/submit.png"
+                    IntermediateToken - (42:1,30 [1] HtmlCommentWithQuote_Double.cshtml) - Html -  
+                    IntermediateToken - (43:1,31 [2] HtmlCommentWithQuote_Double.cshtml) - Html - />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml
new file mode 100644
index 0000000000..dc1b21a546
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml
@@ -0,0 +1,2 @@
+<!-- ' -->
+<img src="~/images/submit.png" />
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e20af5e1ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt
new file mode 100644
index 0000000000..4445841a71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Single.cshtml)
+                    IntermediateToken - (0:0,0 [4] HtmlCommentWithQuote_Single.cshtml) - Html - <!--
+                    IntermediateToken - (4:0,4 [3] HtmlCommentWithQuote_Single.cshtml) - Html -  ' 
+                    IntermediateToken - (7:0,7 [3] HtmlCommentWithQuote_Single.cshtml) - Html - -->
+                    IntermediateToken - (10:0,10 [2] HtmlCommentWithQuote_Single.cshtml) - Html - \n
+                    IntermediateToken - (12:1,0 [4] HtmlCommentWithQuote_Single.cshtml) - Html - <img
+                    IntermediateToken - (16:1,4 [26] HtmlCommentWithQuote_Single.cshtml) - Html -  src="~/images/submit.png"
+                    IntermediateToken - (42:1,30 [1] HtmlCommentWithQuote_Single.cshtml) - Html -  
+                    IntermediateToken - (43:1,31 [2] HtmlCommentWithQuote_Single.cshtml) - Html - />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs
new file mode 100644
index 0000000000..1bce0936db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.codegen.cs
@@ -0,0 +1,19 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2080c7f4c5de3e5e7f309c11a6be5c5e8d86e75a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2080c7f4c5de3e5e7f309c11a6be5c5e8d86e75a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<!-- \' -->\r\n<img src=\"~/images/submit.png\" />");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt
new file mode 100644
index 0000000000..406418bcaf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_Runtime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Single.cshtml)
+                    IntermediateToken - (0:0,0 [4] HtmlCommentWithQuote_Single.cshtml) - Html - <!--
+                    IntermediateToken - (4:0,4 [3] HtmlCommentWithQuote_Single.cshtml) - Html -  ' 
+                    IntermediateToken - (7:0,7 [3] HtmlCommentWithQuote_Single.cshtml) - Html - -->
+                    IntermediateToken - (10:0,10 [2] HtmlCommentWithQuote_Single.cshtml) - Html - \n
+                    IntermediateToken - (12:1,0 [4] HtmlCommentWithQuote_Single.cshtml) - Html - <img
+                    IntermediateToken - (16:1,4 [26] HtmlCommentWithQuote_Single.cshtml) - Html -  src="~/images/submit.png"
+                    IntermediateToken - (42:1,30 [1] HtmlCommentWithQuote_Single.cshtml) - Html -  
+                    IntermediateToken - (43:1,31 [2] HtmlCommentWithQuote_Single.cshtml) - Html - />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml
new file mode 100644
index 0000000000..cc52b3487f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml
@@ -0,0 +1,5 @@
+@implements IDisposable
+
+@functions {
+    void IDisposable.Dispose() { }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9fe4c8123d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Implements_DesignTime : IDisposable
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml"
+IDisposable __typeHelper = default(IDisposable);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml"
+            
+    void IDisposable.Dispose() { }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.ir.txt
new file mode 100644
index 0000000000..cf982456f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Implements_DesignTime -  - IDisposable
+            DesignTimeDirective - 
+                DirectiveToken - (12:0,12 [11] Implements.cshtml) - IDisposable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (25:1,0 [2] Implements.cshtml)
+                    IntermediateToken - (25:1,0 [2] Implements.cshtml) - Html - \n
+            CSharpCode - (39:2,12 [38] Implements.cshtml)
+                IntermediateToken - (39:2,12 [38] Implements.cshtml) - CSharp - \n    void IDisposable.Dispose() { }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt
new file mode 100644
index 0000000000..8b369c1249
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml)
+|IDisposable|
+Generated Location: (498:12,0 [11] )
+|IDisposable|
+
+Source Location: (39:2,12 [38] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml)
+|
+    void IDisposable.Dispose() { }
+|
+Generated Location: (1078:31,12 [38] )
+|
+    void IDisposable.Dispose() { }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.codegen.cs
new file mode 100644
index 0000000000..0cab554528
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.codegen.cs
@@ -0,0 +1,27 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "46e30222edb02ded9cda34df5c2593e760643d53"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Implements_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"46e30222edb02ded9cda34df5c2593e760643d53", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Implements_Runtime : IDisposable
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml"
+            
+    void IDisposable.Dispose() { }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.ir.txt
new file mode 100644
index 0000000000..1ee182d674
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Implements_Runtime -  - IDisposable
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (25:1,0 [2] Implements.cshtml)
+                    IntermediateToken - (25:1,0 [2] Implements.cshtml) - Html - \n
+            CSharpCode - (39:2,12 [38] Implements.cshtml)
+                IntermediateToken - (39:2,12 [38] Implements.cshtml) - CSharp - \n    void IDisposable.Dispose() { }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml
new file mode 100644
index 0000000000..dcce7fa572
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml
@@ -0,0 +1,3 @@
+@for(int i = 1; i <= 10; i++) {
+    <p>This is item #@i</p>
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml
new file mode 100644
index 0000000000..365d20e003
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml
@@ -0,0 +1,3 @@
+This is markup
+
+@
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..24e9343452
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml"
+__o = ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..e2a8c29095
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml(3,2): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..19598b5d7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] ImplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (0:0,0 [18] ImplicitExpressionAtEOF.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (19:2,1 [0] ImplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (19:2,1 [0] ImplicitExpressionAtEOF.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..2fb787f40e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (19:2,1 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml)
+||
+Generated Location: (770:19,6 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..09e806ccbc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.codegen.cs
@@ -0,0 +1,26 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94cd2b5a8281fc76002fc745485949cf3952a058"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"94cd2b5a8281fc76002fc745485949cf3952a058", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("This is markup\r\n\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml"
+Write();
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..e2a8c29095
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF.cshtml(3,2): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..b2ac3e3520
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [18] ImplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (0:0,0 [18] ImplicitExpressionAtEOF.cshtml) - Html - This is markup\n\n
+                CSharpExpression - (19:2,1 [0] ImplicitExpressionAtEOF.cshtml)
+                    IntermediateToken - (19:2,1 [0] ImplicitExpressionAtEOF.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2f981797eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
+ for(int i = 1; i <= 10; i++) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
+                __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
+                           
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt
new file mode 100644
index 0000000000..f082ae44b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (1:0,1 [36] ImplicitExpression.cshtml)
+                    IntermediateToken - (1:0,1 [36] ImplicitExpression.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n    
+                HtmlContent - (37:1,4 [17] ImplicitExpression.cshtml)
+                    IntermediateToken - (37:1,4 [2] ImplicitExpression.cshtml) - Html - <p
+                    IntermediateToken - (39:1,6 [1] ImplicitExpression.cshtml) - Html - >
+                    IntermediateToken - (40:1,7 [14] ImplicitExpression.cshtml) - Html - This is item #
+                CSharpExpression - (55:1,22 [1] ImplicitExpression.cshtml)
+                    IntermediateToken - (55:1,22 [1] ImplicitExpression.cshtml) - CSharp - i
+                HtmlContent - (56:1,23 [4] ImplicitExpression.cshtml)
+                    IntermediateToken - (56:1,23 [4] ImplicitExpression.cshtml) - Html - </p>
+                CSharpCode - (60:1,27 [3] ImplicitExpression.cshtml)
+                    IntermediateToken - (60:1,27 [3] ImplicitExpression.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b0b0d935f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (1:0,1 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml)
+|for(int i = 1; i <= 10; i++) {
+    |
+Generated Location: (755:19,1 [36] )
+|for(int i = 1; i <= 10; i++) {
+    |
+
+Source Location: (55:1,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml)
+|i|
+Generated Location: (978:27,22 [1] )
+|i|
+
+Source Location: (60:1,27 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml)
+|
+}|
+Generated Location: (1172:34,27 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs
new file mode 100644
index 0000000000..1cc29a9c8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "68460c577f1cb90794f25535a35a82ff2aa4c193"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"68460c577f1cb90794f25535a35a82ff2aa4c193", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
+ for(int i = 1; i <= 10; i++) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>This is item #");
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
+                Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt
new file mode 100644
index 0000000000..3804c925f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (1:0,1 [32] ImplicitExpression.cshtml)
+                    IntermediateToken - (1:0,1 [32] ImplicitExpression.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n
+                HtmlContent - (33:1,0 [21] ImplicitExpression.cshtml)
+                    IntermediateToken - (33:1,0 [4] ImplicitExpression.cshtml) - Html -     
+                    IntermediateToken - (37:1,4 [2] ImplicitExpression.cshtml) - Html - <p
+                    IntermediateToken - (39:1,6 [1] ImplicitExpression.cshtml) - Html - >
+                    IntermediateToken - (40:1,7 [14] ImplicitExpression.cshtml) - Html - This is item #
+                CSharpExpression - (55:1,22 [1] ImplicitExpression.cshtml)
+                    IntermediateToken - (55:1,22 [1] ImplicitExpression.cshtml) - CSharp - i
+                HtmlContent - (56:1,23 [6] ImplicitExpression.cshtml)
+                    IntermediateToken - (56:1,23 [4] ImplicitExpression.cshtml) - Html - </p>
+                    IntermediateToken - (60:1,27 [2] ImplicitExpression.cshtml) - Html - \n
+                CSharpCode - (62:2,0 [1] ImplicitExpression.cshtml)
+                    IntermediateToken - (62:2,0 [1] ImplicitExpression.cshtml) - CSharp - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
new file mode 100644
index 0000000000..3b56f0b173
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
@@ -0,0 +1,25 @@
+@* These test files validate that end-to-end, incomplete directives don't throw. *@
+
+@addTagHelper
+@addTagHelper 
+@addTagHelper "
+
+@removeTagHelper
+@removeTagHelper 
+@removeTagHelper "
+
+@tagHelperPrefix
+@tagHelperPrefix 
+@tagHelperPrefix "
+
+@inherits
+@inherits 
+
+@functions
+@functions 
+
+@section
+@section 
+
+@section {
+@functions {
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3e7ab835c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -0,0 +1,159 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = ";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = ";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+global::System.Object __typeHelper = ";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+ 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+            
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1eb0531be3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
@@ -0,0 +1,27 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(3,2): Error RZ1018: Directive 'addTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(3,14): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,2): Error RZ1018: Directive 'addTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,15): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,15): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,15): Error RZ1036: Invalid tag helper directive look up text '"'. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,2): Error RZ1018: Directive 'removeTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,17): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,2): Error RZ1018: Directive 'removeTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,18): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1036: Invalid tag helper directive look up text '"'. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1020: Invalid tag helper directive 'tagHelperPrefix' value. '"' is not allowed in prefix '"'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,10): Error RZ1013: The 'inherits' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(16,1): Error RZ2001: The 'inherits' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(16,11): Error RZ1013: The 'inherits' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(19,1): Error RZ1017: Unexpected literal following the 'functions' directive. Expected '{'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(21,1): Error RZ1017: Unexpected literal following the 'functions' directive. Expected '{'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(21,9): Error RZ1015: The 'section' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(22,10): Error RZ1015: The 'section' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(24,10): Error RZ1015: The 'section' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(25,12): Error RZ1006: The functions block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..3300ad1af0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -0,0 +1,86 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (100:2,13 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (116:3,14 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (132:4,14 [1] IncompleteDirectives.cshtml) - "
+                DirectiveToken - (153:6,16 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (172:7,17 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (191:8,17 [1] IncompleteDirectives.cshtml) - "
+                DirectiveToken - (212:10,16 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (231:11,17 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (250:12,17 [1] IncompleteDirectives.cshtml) - "
+                DirectiveToken - (264:14,9 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (276:15,10 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (315:20,8 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (326:21,9 [0] IncompleteDirectives.cshtml) - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (100:2,13 [0] IncompleteDirectives.cshtml) - addTagHelper
+                    DirectiveToken - (100:2,13 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (100:2,13 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (100:2,13 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (116:3,14 [0] IncompleteDirectives.cshtml) - addTagHelper
+                    DirectiveToken - (116:3,14 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (116:3,14 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (116:3,14 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (132:4,14 [1] IncompleteDirectives.cshtml) - addTagHelper
+                    DirectiveToken - (132:4,14 [1] IncompleteDirectives.cshtml) - "
+                HtmlContent - (133:4,15 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (133:4,15 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (153:6,16 [0] IncompleteDirectives.cshtml) - removeTagHelper
+                    DirectiveToken - (153:6,16 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (153:6,16 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (153:6,16 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (172:7,17 [0] IncompleteDirectives.cshtml) - removeTagHelper
+                    DirectiveToken - (172:7,17 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (172:7,17 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (172:7,17 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (191:8,17 [1] IncompleteDirectives.cshtml) - removeTagHelper
+                    DirectiveToken - (191:8,17 [1] IncompleteDirectives.cshtml) - "
+                HtmlContent - (192:8,18 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (192:8,18 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (212:10,16 [0] IncompleteDirectives.cshtml) - tagHelperPrefix
+                    DirectiveToken - (212:10,16 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (212:10,16 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (212:10,16 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (231:11,17 [0] IncompleteDirectives.cshtml) - tagHelperPrefix
+                    DirectiveToken - (231:11,17 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (231:11,17 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (231:11,17 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (250:12,17 [1] IncompleteDirectives.cshtml) - tagHelperPrefix
+                    DirectiveToken - (250:12,17 [1] IncompleteDirectives.cshtml) - "
+                HtmlContent - (251:12,18 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (251:12,18 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml) - inherits
+                    DirectiveToken - (264:14,9 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (264:14,9 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml) - inherits
+                    DirectiveToken - (276:15,10 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (276:15,10 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (276:15,10 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml) - section
+                    DirectiveToken - (315:20,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml) - section
+                    DirectiveToken - (326:21,9 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (326:21,9 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (326:21,9 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (330:23,0 [9] IncompleteDirectives.cshtml) - section
+                HtmlContent - (339:23,9 [3] IncompleteDirectives.cshtml)
+                    IntermediateToken - (339:23,9 [3] IncompleteDirectives.cshtml) - Html - {\n
+                MalformedDirective - (342:24,0 [12] IncompleteDirectives.cshtml) - functions
+                    CSharpCode - (354:24,12 [0] IncompleteDirectives.cshtml)
+                        IntermediateToken - (354:24,12 [0] IncompleteDirectives.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..4859dfc0ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -0,0 +1,70 @@
+Source Location: (100:2,13 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (542:12,38 [0] )
+||
+
+Source Location: (116:3,14 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (809:22,38 [0] )
+||
+
+Source Location: (132:4,14 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|"|
+Generated Location: (1075:32,37 [1] )
+|"|
+
+Source Location: (153:6,16 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1342:42,38 [0] )
+||
+
+Source Location: (172:7,17 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1609:52,38 [0] )
+||
+
+Source Location: (191:8,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|"|
+Generated Location: (1875:62,37 [1] )
+|"|
+
+Source Location: (212:10,16 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (2143:72,38 [0] )
+||
+
+Source Location: (231:11,17 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (2411:82,38 [0] )
+||
+
+Source Location: (250:12,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|"|
+Generated Location: (2678:92,37 [1] )
+|"|
+
+Source Location: (264:14,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (2908:102,0 [0] )
+||
+
+Source Location: (276:15,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (3137:112,0 [0] )
+||
+
+Source Location: (315:20,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (3366:122,0 [0] )
+||
+
+Source Location: (326:21,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (3595:132,0 [0] )
+||
+
+Source Location: (354:24,12 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (4090:149,12 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..c3973b444b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -0,0 +1,27 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "41721dbbbcb64df19057144a2095a3e1f7466401"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"41721dbbbcb64df19057144a2095a3e1f7466401", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n\r\n");
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n\r\n");
+            WriteLiteral("{\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1eb0531be3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
@@ -0,0 +1,27 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(3,2): Error RZ1018: Directive 'addTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(3,14): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,2): Error RZ1018: Directive 'addTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,15): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,15): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,15): Error RZ1036: Invalid tag helper directive look up text '"'. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,2): Error RZ1018: Directive 'removeTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,17): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,2): Error RZ1018: Directive 'removeTagHelper' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,18): Error RZ1036: Invalid tag helper directive look up text ''. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1036: Invalid tag helper directive look up text '"'. The correct look up text format is: "name, assemblyName".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1020: Invalid tag helper directive 'tagHelperPrefix' value. '"' is not allowed in prefix '"'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,10): Error RZ1013: The 'inherits' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(16,1): Error RZ2001: The 'inherits' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(16,11): Error RZ1013: The 'inherits' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(19,1): Error RZ1017: Unexpected literal following the 'functions' directive. Expected '{'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(21,1): Error RZ1017: Unexpected literal following the 'functions' directive. Expected '{'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(21,9): Error RZ1015: The 'section' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(22,10): Error RZ1015: The 'section' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(24,10): Error RZ1015: The 'section' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(25,12): Error RZ1006: The functions block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..675151be4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -0,0 +1,56 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (100:2,13 [2] IncompleteDirectives.cshtml) - addTagHelper
+                    DirectiveToken - (100:2,13 [2] IncompleteDirectives.cshtml) - 
+                MalformedDirective - (116:3,14 [2] IncompleteDirectives.cshtml) - addTagHelper
+                    DirectiveToken - (116:3,14 [2] IncompleteDirectives.cshtml) - 
+                MalformedDirective - (132:4,14 [3] IncompleteDirectives.cshtml) - addTagHelper
+                    DirectiveToken - (132:4,14 [3] IncompleteDirectives.cshtml) - "
+                HtmlContent - (135:5,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (135:5,0 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (153:6,16 [2] IncompleteDirectives.cshtml) - removeTagHelper
+                    DirectiveToken - (153:6,16 [2] IncompleteDirectives.cshtml) - 
+                MalformedDirective - (172:7,17 [2] IncompleteDirectives.cshtml) - removeTagHelper
+                    DirectiveToken - (172:7,17 [2] IncompleteDirectives.cshtml) - 
+                MalformedDirective - (191:8,17 [3] IncompleteDirectives.cshtml) - removeTagHelper
+                    DirectiveToken - (191:8,17 [3] IncompleteDirectives.cshtml) - "
+                HtmlContent - (194:9,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (194:9,0 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (212:10,16 [2] IncompleteDirectives.cshtml) - tagHelperPrefix
+                    DirectiveToken - (212:10,16 [2] IncompleteDirectives.cshtml) - 
+                MalformedDirective - (231:11,17 [2] IncompleteDirectives.cshtml) - tagHelperPrefix
+                    DirectiveToken - (231:11,17 [2] IncompleteDirectives.cshtml) - 
+                MalformedDirective - (250:12,17 [3] IncompleteDirectives.cshtml) - tagHelperPrefix
+                    DirectiveToken - (250:12,17 [3] IncompleteDirectives.cshtml) - "
+                HtmlContent - (253:13,0 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (253:13,0 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml) - inherits
+                    DirectiveToken - (264:14,9 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (264:14,9 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml) - inherits
+                    DirectiveToken - (276:15,10 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (276:15,10 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (276:15,10 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml) - section
+                    DirectiveToken - (315:20,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml) - section
+                    DirectiveToken - (326:21,9 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (326:21,9 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (326:21,9 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (330:23,0 [9] IncompleteDirectives.cshtml) - section
+                HtmlContent - (339:23,9 [3] IncompleteDirectives.cshtml)
+                    IntermediateToken - (339:23,9 [3] IncompleteDirectives.cshtml) - Html - {\n
+                MalformedDirective - (342:24,0 [12] IncompleteDirectives.cshtml) - functions
+                    CSharpCode - (354:24,12 [0] IncompleteDirectives.cshtml)
+                        IntermediateToken - (354:24,12 [0] IncompleteDirectives.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml
new file mode 100644
index 0000000000..022784f426
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml
@@ -0,0 +1,3 @@
+@addTagHelper "*, TestAssembly"
+
+<p class="
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9c30af42df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..10a2d590e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml(3,2): Error RZ1035: Missing close angle for tag helper 'p'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml(3,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..81a7de97d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] IncompleteTagHelper.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] IncompleteTagHelper.cshtml)
+                    IntermediateToken - (31:0,31 [4] IncompleteTagHelper.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [10] IncompleteTagHelper.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (45:2,10 [0] IncompleteTagHelper.cshtml)
+                            IntermediateToken - (45:2,10 [0] IncompleteTagHelper.cshtml) - Html - 
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..864eba25d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml)
+|"*, TestAssembly"|
+Generated Location: (617:13,37 [17] )
+|"*, TestAssembly"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..ed5360e018
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs
@@ -0,0 +1,52 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "976899f0b1218a2ad5755b5bee8aa5f9b27068b6"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"976899f0b1218a2ad5755b5bee8aa5f9b27068b6", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..10a2d590e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml(3,2): Error RZ1035: Missing close angle for tag helper 'p'.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml(3,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..dfc5fa13b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class -  - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] IncompleteTagHelper.cshtml)
+                    IntermediateToken - (33:1,0 [2] IncompleteTagHelper.cshtml) - Html - \n
+                TagHelper - (35:2,0 [10] IncompleteTagHelper.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml
new file mode 100644
index 0000000000..cf92e3466b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml
@@ -0,0 +1,3 @@
+@inherits foo.bar<baz<biz>>.boz
+
+@foo()
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
new file mode 100644
index 0000000000..223bbf70bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_DesignTime : foo.bar<baz<biz>>.boz
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml"
+foo.bar<baz<biz>>.boz __typeHelper = default(foo.bar<baz<biz>>.boz);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml"
+__o = foo();
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt
new file mode 100644
index 0000000000..5d070ecece
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_DesignTime - foo.bar<baz<biz>>.boz - 
+            DesignTimeDirective - 
+                DirectiveToken - (10:0,10 [21] Inherits.cshtml) - foo.bar<baz<biz>>.boz
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] Inherits.cshtml)
+                    IntermediateToken - (33:1,0 [2] Inherits.cshtml) - Html - \n
+                CSharpExpression - (36:2,1 [5] Inherits.cshtml)
+                    IntermediateToken - (36:2,1 [5] Inherits.cshtml) - CSharp - foo()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1e74b715ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (10:0,10 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml)
+|foo.bar<baz<biz>>.boz|
+Generated Location: (504:12,0 [21] )
+|foo.bar<baz<biz>>.boz|
+
+Source Location: (36:2,1 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml)
+|foo()|
+Generated Location: (1047:29,6 [5] )
+|foo()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs
new file mode 100644
index 0000000000..588146111f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.codegen.cs
@@ -0,0 +1,26 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0f131d73e4e22423fc85cc3e091dd106da637d92"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"0f131d73e4e22423fc85cc3e091dd106da637d92", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_Runtime : foo.bar<baz<biz>>.boz
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml"
+Write(foo());
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt
new file mode 100644
index 0000000000..e901fffac8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_Runtime.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_Runtime - foo.bar<baz<biz>>.boz - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] Inherits.cshtml)
+                    IntermediateToken - (33:1,0 [2] Inherits.cshtml) - Html - \n
+                CSharpExpression - (36:2,1 [5] Inherits.cshtml)
+                    IntermediateToken - (36:2,1 [5] Inherits.cshtml) - CSharp - foo()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml
new file mode 100644
index 0000000000..2a4ba7216f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml
@@ -0,0 +1,3 @@
+@section Link(string link) {
+    <a href="@if(link != null) { @link } else { <text>#</text> }" />
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
new file mode 100644
index 0000000000..a2a699b7ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
@@ -0,0 +1,60 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+global::System.Object Link = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+              if(link != null) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+                            __o = link;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+                                       } else { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+                                                               }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..66af9b7600
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml(1,14): Error RZ1017: Unexpected literal following the 'section' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt
new file mode 100644
index 0000000000..68b2f6d58f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [13] InlineBlocks.cshtml) - section
+                    DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link
+                HtmlContent - (13:0,13 [23] InlineBlocks.cshtml)
+                    IntermediateToken - (13:0,13 [21] InlineBlocks.cshtml) - Html - (string link) {\n    
+                    IntermediateToken - (34:1,4 [2] InlineBlocks.cshtml) - Html - <a
+                HtmlAttribute - (36:1,6 [59] InlineBlocks.cshtml) -  href=" - "
+                    CSharpCodeAttributeValue - (43:1,13 [51] InlineBlocks.cshtml) - 
+                        IntermediateToken - (44:1,14 [19] InlineBlocks.cshtml) - CSharp - if(link != null) { 
+                        CSharpExpression - (64:1,34 [4] InlineBlocks.cshtml)
+                            IntermediateToken - (64:1,34 [4] InlineBlocks.cshtml) - CSharp - link
+                        IntermediateToken - (68:1,38 [10] InlineBlocks.cshtml) - CSharp -  } else { 
+                        HtmlContent - (84:1,54 [1] InlineBlocks.cshtml)
+                            IntermediateToken - (84:1,54 [1] InlineBlocks.cshtml) - Html - #
+                        IntermediateToken - (92:1,62 [2] InlineBlocks.cshtml) - CSharp -  }
+                HtmlContent - (95:1,65 [6] InlineBlocks.cshtml)
+                    IntermediateToken - (95:1,65 [1] InlineBlocks.cshtml) - Html -  
+                    IntermediateToken - (96:1,66 [2] InlineBlocks.cshtml) - Html - />
+                    IntermediateToken - (98:1,68 [3] InlineBlocks.cshtml) - Html - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
new file mode 100644
index 0000000000..513fd9f639
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (9:0,9 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
+|Link|
+Generated Location: (510:12,22 [4] )
+|Link|
+
+Source Location: (44:1,14 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
+|if(link != null) { |
+Generated Location: (1009:29,14 [19] )
+|if(link != null) { |
+
+Source Location: (64:1,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
+|link|
+Generated Location: (1221:36,34 [4] )
+|link|
+
+Source Location: (68:1,38 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
+| } else { |
+Generated Location: (1423:43,38 [10] )
+| } else { |
+
+Source Location: (92:1,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
+| }|
+Generated Location: (1654:50,62 [2] )
+| }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs
new file mode 100644
index 0000000000..373edd4f9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.codegen.cs
@@ -0,0 +1,56 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e7fa74a13b1e78fed87942ccd83aa733810e8664"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"e7fa74a13b1e78fed87942ccd83aa733810e8664", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("(string link) {\r\n    <a");
+            BeginWriteAttribute("href", " href=\"", 36, "\"", 94, 1);
+            WriteAttributeValue("", 43, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+              if(link != null) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+                            Write(link);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+                                       } else { 
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("#");
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
+                                                               }
+
+#line default
+#line hidden
+#nullable disable
+                PopWriter();
+            }
+            ), 43, 51, false);
+            EndWriteAttribute();
+            WriteLiteral(" />\r\n}");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..66af9b7600
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml(1,14): Error RZ1017: Unexpected literal following the 'section' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
new file mode 100644
index 0000000000..d61edab44e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [13] InlineBlocks.cshtml) - section
+                    DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link
+                HtmlContent - (13:0,13 [23] InlineBlocks.cshtml)
+                    IntermediateToken - (13:0,13 [21] InlineBlocks.cshtml) - Html - (string link) {\n    
+                    IntermediateToken - (34:1,4 [2] InlineBlocks.cshtml) - Html - <a
+                HtmlAttribute - (36:1,6 [59] InlineBlocks.cshtml) -  href=" - "
+                    CSharpCodeAttributeValue - (43:1,13 [51] InlineBlocks.cshtml) - 
+                        IntermediateToken - (44:1,14 [19] InlineBlocks.cshtml) - CSharp - if(link != null) { 
+                        CSharpExpression - (64:1,34 [4] InlineBlocks.cshtml)
+                            IntermediateToken - (64:1,34 [4] InlineBlocks.cshtml) - CSharp - link
+                        IntermediateToken - (68:1,38 [10] InlineBlocks.cshtml) - CSharp -  } else { 
+                        HtmlContent - (84:1,54 [1] InlineBlocks.cshtml)
+                            IntermediateToken - (84:1,54 [1] InlineBlocks.cshtml) - Html - #
+                        IntermediateToken - (92:1,62 [2] InlineBlocks.cshtml) - CSharp -  }
+                HtmlContent - (95:1,65 [6] InlineBlocks.cshtml)
+                    IntermediateToken - (95:1,65 [1] InlineBlocks.cshtml) - Html -  
+                    IntermediateToken - (96:1,66 [2] InlineBlocks.cshtml) - Html - />
+                    IntermediateToken - (98:1,68 [3] InlineBlocks.cshtml) - Html - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml
new file mode 100644
index 0000000000..bd273c57e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml
@@ -0,0 +1,38 @@
+@{
+    int i = 1;
+    var foo = @<p>Bar</p>;
+    @:Hello, World
+    <p>Hello, World</p>
+}
+
+@while(i <= 10) {
+    <p>Hello from C#, #@(i)</p>
+    i += 1;
+}
+
+@if(i == 11) {
+    <p>We wrote 10 lines!</p>
+}
+
+@switch(i) {
+    case 11:
+        <p>No really, we wrote 10 lines!</p>
+        break;
+    default:
+        <p>Actually, we didn't...</p>
+        break;
+}
+
+@for(int j = 1; j <= 10; j += 2) {
+    <p>Hello again from C#, #@(j)</p>
+}
+
+@try {
+    <p>That time, we wrote 5 lines!</p>
+} catch(Exception ex) {
+    <p>Oh no! An error occurred: @(ex.Message)</p>
+}
+
+@lock(new object()) {
+    <p>This block is locked, for your security!</p>
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs
new file mode 100644
index 0000000000..554c75fbc5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.cs
@@ -0,0 +1,195 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+  
+    int i = 1;
+    var foo = 
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+            }
+            )
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                         ;
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                       
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ while(i <= 10) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                   __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                               
+    i += 1;
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ if(i == 11) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                             
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ switch(i) {
+    case 11:
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                                            
+        break;
+    default:
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                                     
+        break;
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ for(int j = 1; j <= 10; j += 2) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                         __o = j;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                                     
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ try {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                                       
+} catch(Exception ex) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                             __o = ex.Message;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                                                  
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ lock(new object()) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                                                   
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt
new file mode 100644
index 0000000000..a20621c630
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt
@@ -0,0 +1,121 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [32] Instrumented.cshtml)
+                    IntermediateToken - (2:0,2 [32] Instrumented.cshtml) - CSharp - \n    int i = 1;\n    var foo = 
+                Template - (35:2,15 [10] Instrumented.cshtml)
+                    HtmlContent - (35:2,15 [10] Instrumented.cshtml)
+                        IntermediateToken - (35:2,15 [2] Instrumented.cshtml) - Html - <p
+                        IntermediateToken - (37:2,17 [1] Instrumented.cshtml) - Html - >
+                        IntermediateToken - (38:2,18 [3] Instrumented.cshtml) - Html - Bar
+                        IntermediateToken - (41:2,21 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (45:2,25 [7] Instrumented.cshtml)
+                    IntermediateToken - (45:2,25 [7] Instrumented.cshtml) - CSharp - ;\n    
+                HtmlContent - (54:3,6 [14] Instrumented.cshtml)
+                    IntermediateToken - (54:3,6 [14] Instrumented.cshtml) - Html - Hello, World\n
+                CSharpCode - (68:4,0 [4] Instrumented.cshtml)
+                    IntermediateToken - (68:4,0 [4] Instrumented.cshtml) - CSharp -     
+                HtmlContent - (72:4,4 [19] Instrumented.cshtml)
+                    IntermediateToken - (72:4,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (74:4,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (75:4,7 [12] Instrumented.cshtml) - Html - Hello, World
+                    IntermediateToken - (87:4,19 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (91:4,23 [2] Instrumented.cshtml)
+                    IntermediateToken - (91:4,23 [2] Instrumented.cshtml) - CSharp - \n
+                HtmlContent - (96:6,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (96:6,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (99:7,1 [22] Instrumented.cshtml)
+                    IntermediateToken - (99:7,1 [22] Instrumented.cshtml) - CSharp - while(i <= 10) {\n    
+                HtmlContent - (121:8,4 [19] Instrumented.cshtml)
+                    IntermediateToken - (121:8,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (123:8,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (124:8,7 [16] Instrumented.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (142:8,25 [1] Instrumented.cshtml)
+                    IntermediateToken - (142:8,25 [1] Instrumented.cshtml) - CSharp - i
+                HtmlContent - (144:8,27 [4] Instrumented.cshtml)
+                    IntermediateToken - (144:8,27 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (148:8,31 [16] Instrumented.cshtml)
+                    IntermediateToken - (148:8,31 [16] Instrumented.cshtml) - CSharp - \n    i += 1;\n}
+                HtmlContent - (164:10,1 [4] Instrumented.cshtml)
+                    IntermediateToken - (164:10,1 [4] Instrumented.cshtml) - Html - \n\n
+                CSharpCode - (169:12,1 [19] Instrumented.cshtml)
+                    IntermediateToken - (169:12,1 [19] Instrumented.cshtml) - CSharp - if(i == 11) {\n    
+                HtmlContent - (188:13,4 [25] Instrumented.cshtml)
+                    IntermediateToken - (188:13,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (190:13,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (191:13,7 [18] Instrumented.cshtml) - Html - We wrote 10 lines!
+                    IntermediateToken - (209:13,25 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (213:13,29 [3] Instrumented.cshtml)
+                    IntermediateToken - (213:13,29 [3] Instrumented.cshtml) - CSharp - \n}
+                HtmlContent - (216:14,1 [4] Instrumented.cshtml)
+                    IntermediateToken - (216:14,1 [4] Instrumented.cshtml) - Html - \n\n
+                CSharpCode - (221:16,1 [35] Instrumented.cshtml)
+                    IntermediateToken - (221:16,1 [35] Instrumented.cshtml) - CSharp - switch(i) {\n    case 11:\n        
+                HtmlContent - (256:18,8 [36] Instrumented.cshtml)
+                    IntermediateToken - (256:18,8 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (258:18,10 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (259:18,11 [29] Instrumented.cshtml) - Html - No really, we wrote 10 lines!
+                    IntermediateToken - (288:18,40 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (292:18,44 [40] Instrumented.cshtml)
+                    IntermediateToken - (292:18,44 [40] Instrumented.cshtml) - CSharp - \n        break;\n    default:\n        
+                HtmlContent - (332:21,8 [29] Instrumented.cshtml)
+                    IntermediateToken - (332:21,8 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (334:21,10 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (335:21,11 [22] Instrumented.cshtml) - Html - Actually, we didn't...
+                    IntermediateToken - (357:21,33 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (361:21,37 [19] Instrumented.cshtml)
+                    IntermediateToken - (361:21,37 [19] Instrumented.cshtml) - CSharp - \n        break;\n}
+                HtmlContent - (380:23,1 [4] Instrumented.cshtml)
+                    IntermediateToken - (380:23,1 [4] Instrumented.cshtml) - Html - \n\n
+                CSharpCode - (385:25,1 [39] Instrumented.cshtml)
+                    IntermediateToken - (385:25,1 [39] Instrumented.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n    
+                HtmlContent - (424:26,4 [25] Instrumented.cshtml)
+                    IntermediateToken - (424:26,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (426:26,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (427:26,7 [22] Instrumented.cshtml) - Html - Hello again from C#, #
+                CSharpExpression - (451:26,31 [1] Instrumented.cshtml)
+                    IntermediateToken - (451:26,31 [1] Instrumented.cshtml) - CSharp - j
+                HtmlContent - (453:26,33 [4] Instrumented.cshtml)
+                    IntermediateToken - (453:26,33 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (457:26,37 [3] Instrumented.cshtml)
+                    IntermediateToken - (457:26,37 [3] Instrumented.cshtml) - CSharp - \n}
+                HtmlContent - (460:27,1 [4] Instrumented.cshtml)
+                    IntermediateToken - (460:27,1 [4] Instrumented.cshtml) - Html - \n\n
+                CSharpCode - (465:29,1 [11] Instrumented.cshtml)
+                    IntermediateToken - (465:29,1 [11] Instrumented.cshtml) - CSharp - try {\n    
+                HtmlContent - (476:30,4 [35] Instrumented.cshtml)
+                    IntermediateToken - (476:30,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (478:30,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (479:30,7 [28] Instrumented.cshtml) - Html - That time, we wrote 5 lines!
+                    IntermediateToken - (507:30,35 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (511:30,39 [31] Instrumented.cshtml)
+                    IntermediateToken - (511:30,39 [31] Instrumented.cshtml) - CSharp - \n} catch(Exception ex) {\n    
+                HtmlContent - (542:32,4 [29] Instrumented.cshtml)
+                    IntermediateToken - (542:32,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (544:32,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (545:32,7 [26] Instrumented.cshtml) - Html - Oh no! An error occurred: 
+                CSharpExpression - (573:32,35 [10] Instrumented.cshtml)
+                    IntermediateToken - (573:32,35 [10] Instrumented.cshtml) - CSharp - ex.Message
+                HtmlContent - (584:32,46 [4] Instrumented.cshtml)
+                    IntermediateToken - (584:32,46 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (588:32,50 [3] Instrumented.cshtml)
+                    IntermediateToken - (588:32,50 [3] Instrumented.cshtml) - CSharp - \n}
+                HtmlContent - (591:33,1 [4] Instrumented.cshtml)
+                    IntermediateToken - (591:33,1 [4] Instrumented.cshtml) - Html - \n\n
+                CSharpCode - (596:35,1 [26] Instrumented.cshtml)
+                    IntermediateToken - (596:35,1 [26] Instrumented.cshtml) - CSharp - lock(new object()) {\n    
+                HtmlContent - (622:36,4 [47] Instrumented.cshtml)
+                    IntermediateToken - (622:36,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (624:36,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (625:36,7 [40] Instrumented.cshtml) - Html - This block is locked, for your security!
+                    IntermediateToken - (665:36,47 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (669:36,51 [3] Instrumented.cshtml)
+                    IntermediateToken - (669:36,51 [3] Instrumented.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt
new file mode 100644
index 0000000000..250678a268
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.mappings.txt
@@ -0,0 +1,153 @@
+Source Location: (2:0,2 [32] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+    int i = 1;
+    var foo = |
+Generated Location: (744:19,2 [32] )
+|
+    int i = 1;
+    var foo = |
+
+Source Location: (45:2,25 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|;
+    |
+Generated Location: (1060:31,25 [7] )
+|;
+    |
+
+Source Location: (68:4,0 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|    |
+Generated Location: (1226:39,0 [4] )
+|    |
+
+Source Location: (91:4,23 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+|
+Generated Location: (1412:46,23 [2] )
+|
+|
+
+Source Location: (99:7,1 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|while(i <= 10) {
+    |
+Generated Location: (1572:53,1 [22] )
+|while(i <= 10) {
+    |
+
+Source Location: (142:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|i|
+Generated Location: (1778:61,25 [1] )
+|i|
+
+Source Location: (148:8,31 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+    i += 1;
+}|
+Generated Location: (1970:68,31 [16] )
+|
+    i += 1;
+}|
+
+Source Location: (169:12,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|if(i == 11) {
+    |
+Generated Location: (2147:77,1 [19] )
+|if(i == 11) {
+    |
+
+Source Location: (213:13,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+}|
+Generated Location: (2355:85,29 [3] )
+|
+}|
+
+Source Location: (221:16,1 [35] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|switch(i) {
+    case 11:
+        |
+Generated Location: (2519:93,1 [35] )
+|switch(i) {
+    case 11:
+        |
+
+Source Location: (292:18,44 [40] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+        break;
+    default:
+        |
+Generated Location: (2758:102,44 [40] )
+|
+        break;
+    default:
+        |
+
+Source Location: (361:21,37 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+        break;
+}|
+Generated Location: (2995:112,37 [19] )
+|
+        break;
+}|
+
+Source Location: (385:25,1 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|for(int j = 1; j <= 10; j += 2) {
+    |
+Generated Location: (3175:121,1 [39] )
+|for(int j = 1; j <= 10; j += 2) {
+    |
+
+Source Location: (451:26,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|j|
+Generated Location: (3405:129,31 [1] )
+|j|
+
+Source Location: (457:26,37 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+}|
+Generated Location: (3604:136,37 [3] )
+|
+}|
+
+Source Location: (465:29,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|try {
+    |
+Generated Location: (3768:144,1 [11] )
+|try {
+    |
+
+Source Location: (511:30,39 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+} catch(Exception ex) {
+    |
+Generated Location: (3978:152,39 [31] )
+|
+} catch(Exception ex) {
+    |
+
+Source Location: (573:32,35 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|ex.Message|
+Generated Location: (4204:161,35 [10] )
+|ex.Message|
+
+Source Location: (588:32,50 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+}|
+Generated Location: (4425:168,50 [3] )
+|
+}|
+
+Source Location: (596:35,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|lock(new object()) {
+    |
+Generated Location: (4589:176,1 [26] )
+|lock(new object()) {
+    |
+
+Source Location: (669:36,51 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml)
+|
+}|
+Generated Location: (4826:184,51 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs
new file mode 100644
index 0000000000..4ece1be3bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs
@@ -0,0 +1,182 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3d0d9c94b62eeccf0a2a106b257a1ea1e22412a9"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"3d0d9c94b62eeccf0a2a106b257a1ea1e22412a9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+  
+    int i = 1;
+    var foo = 
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+                PushWriter(__razor_template_writer);
+                WriteLiteral("<p>Bar</p>");
+                PopWriter();
+            }
+            )
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                         ;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    ");
+            WriteLiteral("Hello, World\r\n    <p>Hello, World</p>\r\n");
+            WriteLiteral("\r\n");
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ while(i <= 10) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Hello from C#, #");
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                   Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+    i += 1;
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ if(i == 11) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>We wrote 10 lines!</p>\r\n");
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ switch(i) {
+    case 11:
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>No really, we wrote 10 lines!</p>\r\n");
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+        break;
+    default:
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>Actually, we didn\'t...</p>\r\n");
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+        break;
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ for(int j = 1; j <= 10; j += 2) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Hello again from C#, #");
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                         Write(j);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ try {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>That time, we wrote 5 lines!</p>\r\n");
+#nullable restore
+#line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+} catch(Exception ex) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Oh no! An error occurred: ");
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+                             Write(ex.Message);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+ lock(new object()) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>This block is locked, for your security!</p>\r\n");
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt
new file mode 100644
index 0000000000..ac485414f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt
@@ -0,0 +1,133 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [32] Instrumented.cshtml)
+                    IntermediateToken - (2:0,2 [32] Instrumented.cshtml) - CSharp - \n    int i = 1;\n    var foo = 
+                Template - (35:2,15 [10] Instrumented.cshtml)
+                    HtmlContent - (35:2,15 [10] Instrumented.cshtml)
+                        IntermediateToken - (35:2,15 [2] Instrumented.cshtml) - Html - <p
+                        IntermediateToken - (37:2,17 [1] Instrumented.cshtml) - Html - >
+                        IntermediateToken - (38:2,18 [3] Instrumented.cshtml) - Html - Bar
+                        IntermediateToken - (41:2,21 [4] Instrumented.cshtml) - Html - </p>
+                CSharpCode - (45:2,25 [3] Instrumented.cshtml)
+                    IntermediateToken - (45:2,25 [3] Instrumented.cshtml) - CSharp - ;\n
+                HtmlContent - (48:3,0 [4] Instrumented.cshtml)
+                    IntermediateToken - (48:3,0 [4] Instrumented.cshtml) - Html -     
+                HtmlContent - (54:3,6 [39] Instrumented.cshtml)
+                    IntermediateToken - (54:3,6 [14] Instrumented.cshtml) - Html - Hello, World\n
+                    IntermediateToken - (68:4,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (72:4,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (74:4,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (75:4,7 [12] Instrumented.cshtml) - Html - Hello, World
+                    IntermediateToken - (87:4,19 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (91:4,23 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (93:5,0 [0] Instrumented.cshtml)
+                    IntermediateToken - (93:5,0 [0] Instrumented.cshtml) - CSharp - 
+                HtmlContent - (96:6,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (96:6,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (99:7,1 [18] Instrumented.cshtml)
+                    IntermediateToken - (99:7,1 [18] Instrumented.cshtml) - CSharp - while(i <= 10) {\n
+                HtmlContent - (117:8,0 [23] Instrumented.cshtml)
+                    IntermediateToken - (117:8,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (121:8,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (123:8,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (124:8,7 [16] Instrumented.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (142:8,25 [1] Instrumented.cshtml)
+                    IntermediateToken - (142:8,25 [1] Instrumented.cshtml) - CSharp - i
+                HtmlContent - (144:8,27 [6] Instrumented.cshtml)
+                    IntermediateToken - (144:8,27 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (148:8,31 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (150:9,0 [16] Instrumented.cshtml)
+                    IntermediateToken - (150:9,0 [16] Instrumented.cshtml) - CSharp -     i += 1;\n}\n
+                HtmlContent - (166:11,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (166:11,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (169:12,1 [15] Instrumented.cshtml)
+                    IntermediateToken - (169:12,1 [15] Instrumented.cshtml) - CSharp - if(i == 11) {\n
+                HtmlContent - (184:13,0 [31] Instrumented.cshtml)
+                    IntermediateToken - (184:13,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (188:13,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (190:13,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (191:13,7 [18] Instrumented.cshtml) - Html - We wrote 10 lines!
+                    IntermediateToken - (209:13,25 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (213:13,29 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (215:14,0 [3] Instrumented.cshtml)
+                    IntermediateToken - (215:14,0 [3] Instrumented.cshtml) - CSharp - }\n
+                HtmlContent - (218:15,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (218:15,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (221:16,1 [27] Instrumented.cshtml)
+                    IntermediateToken - (221:16,1 [27] Instrumented.cshtml) - CSharp - switch(i) {\n    case 11:\n
+                HtmlContent - (248:18,0 [46] Instrumented.cshtml)
+                    IntermediateToken - (248:18,0 [8] Instrumented.cshtml) - Html -         
+                    IntermediateToken - (256:18,8 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (258:18,10 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (259:18,11 [29] Instrumented.cshtml) - Html - No really, we wrote 10 lines!
+                    IntermediateToken - (288:18,40 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (292:18,44 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (294:19,0 [30] Instrumented.cshtml)
+                    IntermediateToken - (294:19,0 [30] Instrumented.cshtml) - CSharp -         break;\n    default:\n
+                HtmlContent - (324:21,0 [39] Instrumented.cshtml)
+                    IntermediateToken - (324:21,0 [8] Instrumented.cshtml) - Html -         
+                    IntermediateToken - (332:21,8 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (334:21,10 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (335:21,11 [22] Instrumented.cshtml) - Html - Actually, we didn't...
+                    IntermediateToken - (357:21,33 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (361:21,37 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (363:22,0 [19] Instrumented.cshtml)
+                    IntermediateToken - (363:22,0 [19] Instrumented.cshtml) - CSharp -         break;\n}\n
+                HtmlContent - (382:24,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (382:24,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (385:25,1 [35] Instrumented.cshtml)
+                    IntermediateToken - (385:25,1 [35] Instrumented.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n
+                HtmlContent - (420:26,0 [29] Instrumented.cshtml)
+                    IntermediateToken - (420:26,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (424:26,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (426:26,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (427:26,7 [22] Instrumented.cshtml) - Html - Hello again from C#, #
+                CSharpExpression - (451:26,31 [1] Instrumented.cshtml)
+                    IntermediateToken - (451:26,31 [1] Instrumented.cshtml) - CSharp - j
+                HtmlContent - (453:26,33 [6] Instrumented.cshtml)
+                    IntermediateToken - (453:26,33 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (457:26,37 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (459:27,0 [3] Instrumented.cshtml)
+                    IntermediateToken - (459:27,0 [3] Instrumented.cshtml) - CSharp - }\n
+                HtmlContent - (462:28,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (462:28,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (465:29,1 [7] Instrumented.cshtml)
+                    IntermediateToken - (465:29,1 [7] Instrumented.cshtml) - CSharp - try {\n
+                HtmlContent - (472:30,0 [41] Instrumented.cshtml)
+                    IntermediateToken - (472:30,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (476:30,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (478:30,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (479:30,7 [28] Instrumented.cshtml) - Html - That time, we wrote 5 lines!
+                    IntermediateToken - (507:30,35 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (511:30,39 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (513:31,0 [25] Instrumented.cshtml)
+                    IntermediateToken - (513:31,0 [25] Instrumented.cshtml) - CSharp - } catch(Exception ex) {\n
+                HtmlContent - (538:32,0 [33] Instrumented.cshtml)
+                    IntermediateToken - (538:32,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (542:32,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (544:32,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (545:32,7 [26] Instrumented.cshtml) - Html - Oh no! An error occurred: 
+                CSharpExpression - (573:32,35 [10] Instrumented.cshtml)
+                    IntermediateToken - (573:32,35 [10] Instrumented.cshtml) - CSharp - ex.Message
+                HtmlContent - (584:32,46 [6] Instrumented.cshtml)
+                    IntermediateToken - (584:32,46 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (588:32,50 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (590:33,0 [3] Instrumented.cshtml)
+                    IntermediateToken - (590:33,0 [3] Instrumented.cshtml) - CSharp - }\n
+                HtmlContent - (593:34,0 [2] Instrumented.cshtml)
+                    IntermediateToken - (593:34,0 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (596:35,1 [22] Instrumented.cshtml)
+                    IntermediateToken - (596:35,1 [22] Instrumented.cshtml) - CSharp - lock(new object()) {\n
+                HtmlContent - (618:36,0 [53] Instrumented.cshtml)
+                    IntermediateToken - (618:36,0 [4] Instrumented.cshtml) - Html -     
+                    IntermediateToken - (622:36,4 [2] Instrumented.cshtml) - Html - <p
+                    IntermediateToken - (624:36,6 [1] Instrumented.cshtml) - Html - >
+                    IntermediateToken - (625:36,7 [40] Instrumented.cshtml) - Html - This block is locked, for your security!
+                    IntermediateToken - (665:36,47 [4] Instrumented.cshtml) - Html - </p>
+                    IntermediateToken - (669:36,51 [2] Instrumented.cshtml) - Html - \n
+                CSharpCode - (671:37,0 [1] Instrumented.cshtml)
+                    IntermediateToken - (671:37,0 [1] Instrumented.cshtml) - CSharp - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml
new file mode 100644
index 0000000000..712ef42848
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml
@@ -0,0 +1,5 @@
+@{
+    for(int i = 1; i <= 10; i++) {
+        <p>Hello from C#, #@(i.ToString())</p>
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs
new file mode 100644
index 0000000000..cdf9ba3334
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
+  
+    for(int i = 1; i <= 10; i++) {
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
+                       __o = i.ToString();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
+                                              
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt
new file mode 100644
index 0000000000..1c5e460f3c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [46] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (2:0,2 [46] MarkupInCodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n        
+                HtmlContent - (48:2,8 [19] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (48:2,8 [2] MarkupInCodeBlock.cshtml) - Html - <p
+                    IntermediateToken - (50:2,10 [1] MarkupInCodeBlock.cshtml) - Html - >
+                    IntermediateToken - (51:2,11 [16] MarkupInCodeBlock.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (69:2,29 [12] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (69:2,29 [12] MarkupInCodeBlock.cshtml) - CSharp - i.ToString()
+                HtmlContent - (82:2,42 [4] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (82:2,42 [4] MarkupInCodeBlock.cshtml) - Html - </p>
+                CSharpCode - (86:2,46 [9] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (86:2,46 [9] MarkupInCodeBlock.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt
new file mode 100644
index 0000000000..f88beb53f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.mappings.txt
@@ -0,0 +1,23 @@
+Source Location: (2:0,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml)
+|
+    for(int i = 1; i <= 10; i++) {
+        |
+Generated Location: (754:19,2 [46] )
+|
+    for(int i = 1; i <= 10; i++) {
+        |
+
+Source Location: (69:2,29 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml)
+|i.ToString()|
+Generated Location: (993:28,29 [12] )
+|i.ToString()|
+
+Source Location: (86:2,46 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml)
+|
+    }
+|
+Generated Location: (1216:35,46 [9] )
+|
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs
new file mode 100644
index 0000000000..a578762a04
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs
@@ -0,0 +1,42 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "539d5763b7091d29df375085f623b9086e7f8ad6"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"539d5763b7091d29df375085f623b9086e7f8ad6", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
+  
+    for(int i = 1; i <= 10; i++) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>Hello from C#, #");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
+                       Write(i.ToString());
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt
new file mode 100644
index 0000000000..d517c6d4ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [38] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (2:0,2 [38] MarkupInCodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n
+                HtmlContent - (40:2,0 [27] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (40:2,0 [8] MarkupInCodeBlock.cshtml) - Html -         
+                    IntermediateToken - (48:2,8 [2] MarkupInCodeBlock.cshtml) - Html - <p
+                    IntermediateToken - (50:2,10 [1] MarkupInCodeBlock.cshtml) - Html - >
+                    IntermediateToken - (51:2,11 [16] MarkupInCodeBlock.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (69:2,29 [12] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (69:2,29 [12] MarkupInCodeBlock.cshtml) - CSharp - i.ToString()
+                HtmlContent - (82:2,42 [6] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (82:2,42 [4] MarkupInCodeBlock.cshtml) - Html - </p>
+                    IntermediateToken - (86:2,46 [2] MarkupInCodeBlock.cshtml) - Html - \n
+                CSharpCode - (88:3,0 [7] MarkupInCodeBlock.cshtml)
+                    IntermediateToken - (88:3,0 [7] MarkupInCodeBlock.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml
new file mode 100644
index 0000000000..efc9795e71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml
@@ -0,0 +1,45 @@
+
+@{
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, }
+    };
+
+    void PrintName(Person person)
+    {
+        <div>@person.Name</div>
+    }
+}
+
+@{ PrintName(people[0]) }
+@{ AnnounceBirthday(people[0]); }
+
+@functions {
+    void AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        <div>
+            <h3>Happy birthday @(formatted)!</h3>
+        </div>
+
+        <ul>
+        @for (var i = 0; i < person.Age / 10; i++)
+        {
+            <li>@(i) Happy birthday!</li>
+        }
+        </ul>
+
+        if (person.Age < 20)
+        {
+            return;
+        }
+
+        <h4>Secret message</h4>
+    }
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml
new file mode 100644
index 0000000000..f294f34162
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml
@@ -0,0 +1,47 @@
+@addTagHelper "*, TestAssembly"
+@{
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, },
+    };
+
+    void PrintName(Person person)
+    {
+        <div>@person.Name</div>
+    }
+}
+
+@{ PrintName(people[0]); }
+@{ await AnnounceBirthday(people[0]); }
+
+@functions {
+    Task AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        <div>
+            <h3>Happy birthday @(formatted)!</h3>
+        </div>
+
+        <ul>
+        @for (var i = 0; i < person.Age / 10; i++)
+        {
+            <li>@(i) Happy birthday!</li>
+        }
+        </ul>
+
+        if (person.Age < 20)
+        {
+            return Task.CompletedTask;
+        }
+
+        <h4>Secret message</h4>
+        return Task.CompletedTask;
+    }
+
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..fd06ee3e25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,160 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_DesignTime
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+  
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, },
+    };
+
+    void PrintName(Person person)
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+        __o = person.Name;
+
+#line default
+#line hidden
+#nullable disable
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+                               
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+   PrintName(people[0]); 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+   await AnnounceBirthday(people[0]); 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+            
+    Task AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+                           __o = formatted;
+
+#line default
+#line hidden
+#nullable disable
+        __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+              
+
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+         for (var i = 0; i < person.Age / 10; i++)
+        {
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+            __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+                                         
+        }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+             
+
+        if (person.Age < 20)
+        {
+            return Task.CompletedTask;
+        }
+
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+                               
+        return Task.CompletedTask;
+    }
+
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..37532809ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.ir.txt
@@ -0,0 +1,81 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] Markup_InCodeBlocksWithTagHelper.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (31:0,31 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+                CSharpCode - (35:1,2 [154] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (35:1,2 [154] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n    var people = new Person[]\n    {\n        new Person() { Name = "Taylor", Age = 95, },\n    };\n\n    void PrintName(Person person)\n    {\n        
+                TagHelper - (189:9,8 [23] Markup_InCodeBlocksWithTagHelper.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpExpression - (195:9,14 [11] Markup_InCodeBlocksWithTagHelper.cshtml)
+                            IntermediateToken - (195:9,14 [11] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - person.Name
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperExecute - 
+                CSharpCode - (212:9,31 [9] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (212:9,31 [9] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n    }\n
+                HtmlContent - (224:12,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (224:12,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+                CSharpCode - (228:13,2 [23] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (228:13,2 [23] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -  PrintName(people[0]); 
+                CSharpCode - (256:14,2 [36] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (256:14,2 [36] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -  await AnnounceBirthday(people[0]); 
+                HtmlContent - (295:15,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (295:15,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (309:16,12 [106] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (309:16,12 [106] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n    Task AnnounceBirthday(Person person)\n    {\n        var formatted = $"Mr. {person.Name}";\n        
+            TagHelper - (415:20,8 [72] Markup_InCodeBlocksWithTagHelper.cshtml) - div - TagMode.StartTagAndEndTag
+                DefaultTagHelperBody - 
+                    HtmlContent - (420:20,13 [33] Markup_InCodeBlocksWithTagHelper.cshtml)
+                        IntermediateToken - (420:20,13 [14] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n            
+                        IntermediateToken - (434:21,12 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <h3
+                        IntermediateToken - (437:21,15 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+                        IntermediateToken - (438:21,16 [15] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - Happy birthday 
+                    CSharpExpression - (455:21,33 [9] Markup_InCodeBlocksWithTagHelper.cshtml)
+                        IntermediateToken - (455:21,33 [9] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - formatted
+                    HtmlContent - (465:21,43 [16] Markup_InCodeBlocksWithTagHelper.cshtml)
+                        IntermediateToken - (465:21,43 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - !
+                        IntermediateToken - (466:21,44 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </h3>
+                        IntermediateToken - (471:21,49 [10] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n        
+                DefaultTagHelperCreate -  - DivTagHelper
+                DefaultTagHelperExecute - 
+            CSharpCode - (487:22,14 [12] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (487:22,14 [12] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n\n        
+            HtmlContent - (499:24,8 [14] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (499:24,8 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <ul
+                IntermediateToken - (502:24,11 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+                IntermediateToken - (503:24,12 [10] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n        
+            CSharpCode - (514:25,9 [66] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (514:25,9 [66] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - for (var i = 0; i < person.Age / 10; i++)\n        {\n            
+            HtmlContent - (580:27,12 [4] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (580:27,12 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <li
+                IntermediateToken - (583:27,15 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+            CSharpExpression - (586:27,18 [1] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (586:27,18 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - i
+            HtmlContent - (588:27,20 [21] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (588:27,20 [16] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -  Happy birthday!
+                IntermediateToken - (604:27,36 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </li>
+            CSharpCode - (609:27,41 [11] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (609:27,41 [11] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n        }
+            HtmlContent - (620:28,9 [15] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (620:28,9 [10] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n        
+                IntermediateToken - (630:29,8 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </ul>
+            CSharpCode - (635:29,13 [106] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (635:29,13 [106] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n\n        if (person.Age < 20)\n        {\n            return Task.CompletedTask;\n        }\n\n        
+            HtmlContent - (741:36,8 [23] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (741:36,8 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <h4
+                IntermediateToken - (744:36,11 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+                IntermediateToken - (745:36,12 [14] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - Secret message
+                IntermediateToken - (759:36,26 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </h4>
+            CSharpCode - (764:36,31 [161] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (764:36,31 [161] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n        return Task.CompletedTask;\n    }\n\n\n    class Person\n    {\n        public string Name { get; set; }\n        public int Age { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..19c772b504
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,142 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|"*, TestAssembly"|
+Generated Location: (619:13,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (35:1,2 [154] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, },
+    };
+
+    void PrintName(Person person)
+    {
+        |
+Generated Location: (1132:30,2 [154] )
+|
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, },
+    };
+
+    void PrintName(Person person)
+    {
+        |
+
+Source Location: (195:9,14 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|person.Name|
+Generated Location: (1480:45,14 [11] )
+|person.Name|
+
+Source Location: (212:9,31 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+    }
+|
+Generated Location: (1774:53,31 [9] )
+|
+    }
+|
+
+Source Location: (228:13,2 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+| PrintName(people[0]); |
+Generated Location: (1963:61,2 [23] )
+| PrintName(people[0]); |
+
+Source Location: (256:14,2 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+| await AnnounceBirthday(people[0]); |
+Generated Location: (2168:68,2 [36] )
+| await AnnounceBirthday(people[0]); |
+
+Source Location: (309:16,12 [106] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+    Task AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        |
+Generated Location: (2445:77,12 [106] )
+|
+    Task AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        |
+
+Source Location: (455:21,33 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|formatted|
+Generated Location: (2764:88,33 [9] )
+|formatted|
+
+Source Location: (487:22,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+
+        |
+Generated Location: (3035:96,14 [12] )
+|
+
+        |
+
+Source Location: (514:25,9 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|for (var i = 0; i < person.Age / 10; i++)
+        {
+            |
+Generated Location: (3236:105,9 [66] )
+|for (var i = 0; i < person.Age / 10; i++)
+        {
+            |
+
+Source Location: (586:27,18 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|i|
+Generated Location: (3500:114,18 [1] )
+|i|
+
+Source Location: (609:27,41 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+        }|
+Generated Location: (3723:121,41 [11] )
+|
+        }|
+
+Source Location: (635:29,13 [106] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+
+        if (person.Age < 20)
+        {
+            return Task.CompletedTask;
+        }
+
+        |
+Generated Location: (3927:129,13 [106] )
+|
+
+        if (person.Age < 20)
+        {
+            return Task.CompletedTask;
+        }
+
+        |
+
+Source Location: (764:36,31 [161] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
+|
+        return Task.CompletedTask;
+    }
+
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+|
+Generated Location: (4244:143,31 [161] )
+|
+        return Task.CompletedTask;
+    }
+
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..e47522dc58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs
@@ -0,0 +1,182 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ffae7582d6e0ce50a5fa046a92205df5abc84d6e"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"ffae7582d6e0ce50a5fa046a92205df5abc84d6e", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_Runtime
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+  
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, },
+    };
+
+    void PrintName(Person person)
+    {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+        Write(person.Name);
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+   PrintName(people[0]); 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+   await AnnounceBirthday(people[0]); 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+            
+    Task AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("        ");
+        __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            WriteLiteral("\r\n            <h3>Happy birthday ");
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+                           Write(formatted);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("!</h3>\r\n        ");
+        }
+        );
+        __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        __tagHelperExecutionContext.Add(__DivTagHelper);
+        await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+        if (!__tagHelperExecutionContext.Output.IsContentModified)
+        {
+            await __tagHelperExecutionContext.SetOutputContentAsync();
+        }
+        Write(__tagHelperExecutionContext.Output);
+        __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        WriteLiteral("\r\n");
+        WriteLiteral("        <ul>\r\n");
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+         for (var i = 0; i < person.Age / 10; i++)
+        {
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("            <li>");
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+            Write(i);
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral(" Happy birthday!</li>\r\n");
+#nullable restore
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+        }
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("        </ul>\r\n");
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+
+        if (person.Age < 20)
+        {
+            return Task.CompletedTask;
+        }
+
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("        <h4>Secret message</h4>\r\n");
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
+        return Task.CompletedTask;
+    }
+
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..4263327a2e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.ir.txt
@@ -0,0 +1,89 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_Runtime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (35:1,2 [146] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (35:1,2 [146] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n    var people = new Person[]\n    {\n        new Person() { Name = "Taylor", Age = 95, },\n    };\n\n    void PrintName(Person person)\n    {\n
+                HtmlContent - (181:9,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (181:9,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -         
+                TagHelper - (189:9,8 [23] Markup_InCodeBlocksWithTagHelper.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpExpression - (195:9,14 [11] Markup_InCodeBlocksWithTagHelper.cshtml)
+                            IntermediateToken - (195:9,14 [11] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - person.Name
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperExecute - 
+                HtmlContent - (212:9,31 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (212:9,31 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+                CSharpCode - (214:10,0 [7] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (214:10,0 [7] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -     }\n
+                HtmlContent - (224:12,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (224:12,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+                CSharpCode - (228:13,2 [23] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (228:13,2 [23] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -  PrintName(people[0]); 
+                CSharpCode - (256:14,2 [36] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (256:14,2 [36] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -  await AnnounceBirthday(people[0]); 
+                HtmlContent - (295:15,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                    IntermediateToken - (295:15,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (309:16,12 [98] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (309:16,12 [98] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n    Task AnnounceBirthday(Person person)\n    {\n        var formatted = $"Mr. {person.Name}";\n
+            HtmlContent - (407:20,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (407:20,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -         
+            TagHelper - (415:20,8 [72] Markup_InCodeBlocksWithTagHelper.cshtml) - div - TagMode.StartTagAndEndTag
+                DefaultTagHelperBody - 
+                    HtmlContent - (420:20,13 [33] Markup_InCodeBlocksWithTagHelper.cshtml)
+                        IntermediateToken - (420:20,13 [14] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n            
+                        IntermediateToken - (434:21,12 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <h3
+                        IntermediateToken - (437:21,15 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+                        IntermediateToken - (438:21,16 [15] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - Happy birthday 
+                    CSharpExpression - (455:21,33 [9] Markup_InCodeBlocksWithTagHelper.cshtml)
+                        IntermediateToken - (455:21,33 [9] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - formatted
+                    HtmlContent - (465:21,43 [16] Markup_InCodeBlocksWithTagHelper.cshtml)
+                        IntermediateToken - (465:21,43 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - !
+                        IntermediateToken - (466:21,44 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </h3>
+                        IntermediateToken - (471:21,49 [10] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n        
+                DefaultTagHelperCreate -  - DivTagHelper
+                DefaultTagHelperExecute - 
+            HtmlContent - (487:22,14 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (487:22,14 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (489:23,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (489:23,0 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n
+            HtmlContent - (491:24,0 [14] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (491:24,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -         
+                IntermediateToken - (499:24,8 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <ul
+                IntermediateToken - (502:24,11 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+                IntermediateToken - (503:24,12 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (505:25,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (505:25,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -         
+            CSharpCode - (514:25,9 [54] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (514:25,9 [54] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - for (var i = 0; i < person.Age / 10; i++)\n        {\n
+            HtmlContent - (568:27,0 [16] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (568:27,0 [12] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -             
+                IntermediateToken - (580:27,12 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <li
+                IntermediateToken - (583:27,15 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+            CSharpExpression - (586:27,18 [1] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (586:27,18 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - i
+            HtmlContent - (588:27,20 [23] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (588:27,20 [16] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -  Happy birthday!
+                IntermediateToken - (604:27,36 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </li>
+                IntermediateToken - (609:27,41 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (611:28,0 [11] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (611:28,0 [11] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -         }\n
+            HtmlContent - (622:29,0 [15] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (622:29,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -         
+                IntermediateToken - (630:29,8 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </ul>
+                IntermediateToken - (635:29,13 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (637:30,0 [96] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (637:30,0 [96] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp - \n        if (person.Age < 20)\n        {\n            return Task.CompletedTask;\n        }\n\n
+            HtmlContent - (733:36,0 [33] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (733:36,0 [8] Markup_InCodeBlocksWithTagHelper.cshtml) - Html -         
+                IntermediateToken - (741:36,8 [3] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - <h4
+                IntermediateToken - (744:36,11 [1] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - >
+                IntermediateToken - (745:36,12 [14] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - Secret message
+                IntermediateToken - (759:36,26 [5] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - </h4>
+                IntermediateToken - (764:36,31 [2] Markup_InCodeBlocksWithTagHelper.cshtml) - Html - \n
+            CSharpCode - (766:37,0 [159] Markup_InCodeBlocksWithTagHelper.cshtml)
+                IntermediateToken - (766:37,0 [159] Markup_InCodeBlocksWithTagHelper.cshtml) - CSharp -         return Task.CompletedTask;\n    }\n\n\n    class Person\n    {\n        public string Name { get; set; }\n        public int Age { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1c7c4784f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.cs
@@ -0,0 +1,145 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocks_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+  
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, }
+    };
+
+    void PrintName(Person person)
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+        __o = person.Name;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+                               
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+   PrintName(people[0]) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+   AnnounceBirthday(people[0]); 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+            
+    void AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+                           __o = formatted;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+              
+
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+         for (var i = 0; i < person.Age / 10; i++)
+        {
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+            __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+                                         
+        }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+             
+
+        if (person.Age < 20)
+        {
+            return;
+        }
+
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+                               
+    }
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.ir.txt
new file mode 100644
index 0000000000..5307e83bb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.ir.txt
@@ -0,0 +1,78 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocks_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [2] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (0:0,0 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+                CSharpCode - (4:1,2 [153] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (4:1,2 [153] Markup_InCodeBlocks.cshtml) - CSharp - \n    var people = new Person[]\n    {\n        new Person() { Name = "Taylor", Age = 95, }\n    };\n\n    void PrintName(Person person)\n    {\n        
+                HtmlContent - (157:9,8 [5] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (157:9,8 [4] Markup_InCodeBlocks.cshtml) - Html - <div
+                    IntermediateToken - (161:9,12 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                CSharpExpression - (163:9,14 [11] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (163:9,14 [11] Markup_InCodeBlocks.cshtml) - CSharp - person.Name
+                HtmlContent - (174:9,25 [6] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (174:9,25 [6] Markup_InCodeBlocks.cshtml) - Html - </div>
+                CSharpCode - (180:9,31 [9] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (180:9,31 [9] Markup_InCodeBlocks.cshtml) - CSharp - \n    }\n
+                HtmlContent - (192:12,0 [2] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (192:12,0 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+                CSharpCode - (196:13,2 [22] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (196:13,2 [22] Markup_InCodeBlocks.cshtml) - CSharp -  PrintName(people[0]) 
+                CSharpCode - (223:14,2 [30] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (223:14,2 [30] Markup_InCodeBlocks.cshtml) - CSharp -  AnnounceBirthday(people[0]); 
+                HtmlContent - (256:15,0 [2] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (256:15,0 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (270:16,12 [106] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (270:16,12 [106] Markup_InCodeBlocks.cshtml) - CSharp - \n    void AnnounceBirthday(Person person)\n    {\n        var formatted = $"Mr. {person.Name}";\n        
+            HtmlContent - (376:20,8 [38] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (376:20,8 [4] Markup_InCodeBlocks.cshtml) - Html - <div
+                IntermediateToken - (380:20,12 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (381:20,13 [14] Markup_InCodeBlocks.cshtml) - Html - \n            
+                IntermediateToken - (395:21,12 [3] Markup_InCodeBlocks.cshtml) - Html - <h3
+                IntermediateToken - (398:21,15 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (399:21,16 [15] Markup_InCodeBlocks.cshtml) - Html - Happy birthday 
+            CSharpExpression - (416:21,33 [9] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (416:21,33 [9] Markup_InCodeBlocks.cshtml) - CSharp - formatted
+            HtmlContent - (426:21,43 [22] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (426:21,43 [1] Markup_InCodeBlocks.cshtml) - Html - !
+                IntermediateToken - (427:21,44 [5] Markup_InCodeBlocks.cshtml) - Html - </h3>
+                IntermediateToken - (432:21,49 [10] Markup_InCodeBlocks.cshtml) - Html - \n        
+                IntermediateToken - (442:22,8 [6] Markup_InCodeBlocks.cshtml) - Html - </div>
+            CSharpCode - (448:22,14 [12] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (448:22,14 [12] Markup_InCodeBlocks.cshtml) - CSharp - \n\n        
+            HtmlContent - (460:24,8 [14] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (460:24,8 [3] Markup_InCodeBlocks.cshtml) - Html - <ul
+                IntermediateToken - (463:24,11 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (464:24,12 [10] Markup_InCodeBlocks.cshtml) - Html - \n        
+            CSharpCode - (475:25,9 [66] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (475:25,9 [66] Markup_InCodeBlocks.cshtml) - CSharp - for (var i = 0; i < person.Age / 10; i++)\n        {\n            
+            HtmlContent - (541:27,12 [4] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (541:27,12 [3] Markup_InCodeBlocks.cshtml) - Html - <li
+                IntermediateToken - (544:27,15 [1] Markup_InCodeBlocks.cshtml) - Html - >
+            CSharpExpression - (547:27,18 [1] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (547:27,18 [1] Markup_InCodeBlocks.cshtml) - CSharp - i
+            HtmlContent - (549:27,20 [21] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (549:27,20 [16] Markup_InCodeBlocks.cshtml) - Html -  Happy birthday!
+                IntermediateToken - (565:27,36 [5] Markup_InCodeBlocks.cshtml) - Html - </li>
+            CSharpCode - (570:27,41 [11] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (570:27,41 [11] Markup_InCodeBlocks.cshtml) - CSharp - \n        }
+            HtmlContent - (581:28,9 [15] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (581:28,9 [10] Markup_InCodeBlocks.cshtml) - Html - \n        
+                IntermediateToken - (591:29,8 [5] Markup_InCodeBlocks.cshtml) - Html - </ul>
+            CSharpCode - (596:29,13 [87] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (596:29,13 [87] Markup_InCodeBlocks.cshtml) - CSharp - \n\n        if (person.Age < 20)\n        {\n            return;\n        }\n\n        
+            HtmlContent - (683:36,8 [23] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (683:36,8 [3] Markup_InCodeBlocks.cshtml) - Html - <h4
+                IntermediateToken - (686:36,11 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (687:36,12 [14] Markup_InCodeBlocks.cshtml) - Html - Secret message
+                IntermediateToken - (701:36,26 [5] Markup_InCodeBlocks.cshtml) - Html - </h4>
+            CSharpCode - (706:36,31 [123] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (706:36,31 [123] Markup_InCodeBlocks.cshtml) - CSharp - \n    }\n\n    class Person\n    {\n        public string Name { get; set; }\n        public int Age { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.mappings.txt
new file mode 100644
index 0000000000..de5fb0e1d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.mappings.txt
@@ -0,0 +1,133 @@
+Source Location: (4:1,2 [153] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, }
+    };
+
+    void PrintName(Person person)
+    {
+        |
+Generated Location: (758:19,2 [153] )
+|
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, }
+    };
+
+    void PrintName(Person person)
+    {
+        |
+
+Source Location: (163:9,14 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|person.Name|
+Generated Location: (1092:34,14 [11] )
+|person.Name|
+
+Source Location: (180:9,31 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+    }
+|
+Generated Location: (1302:41,31 [9] )
+|
+    }
+|
+
+Source Location: (196:13,2 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+| PrintName(people[0]) |
+Generated Location: (1478:49,2 [22] )
+| PrintName(people[0]) |
+
+Source Location: (223:14,2 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+| AnnounceBirthday(people[0]); |
+Generated Location: (1669:56,2 [30] )
+| AnnounceBirthday(people[0]); |
+
+Source Location: (270:16,12 [106] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+    void AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        |
+Generated Location: (1927:65,12 [106] )
+|
+    void AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+        |
+
+Source Location: (416:21,33 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|formatted|
+Generated Location: (2233:76,33 [9] )
+|formatted|
+
+Source Location: (448:22,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+
+        |
+Generated Location: (2424:83,14 [12] )
+|
+
+        |
+
+Source Location: (475:25,9 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|for (var i = 0; i < person.Age / 10; i++)
+        {
+            |
+Generated Location: (2612:92,9 [66] )
+|for (var i = 0; i < person.Age / 10; i++)
+        {
+            |
+
+Source Location: (547:27,18 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|i|
+Generated Location: (2863:101,18 [1] )
+|i|
+
+Source Location: (570:27,41 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+        }|
+Generated Location: (3073:108,41 [11] )
+|
+        }|
+
+Source Location: (596:29,13 [87] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+
+        if (person.Age < 20)
+        {
+            return;
+        }
+
+        |
+Generated Location: (3264:116,13 [87] )
+|
+
+        if (person.Age < 20)
+        {
+            return;
+        }
+
+        |
+
+Source Location: (706:36,31 [123] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml)
+|
+    }
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+|
+Generated Location: (3549:130,31 [123] )
+|
+    }
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.codegen.cs
new file mode 100644
index 0000000000..bf58bbc6f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.codegen.cs
@@ -0,0 +1,136 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2320e63391918e8389308263bcd1e9ae3cc8cc46"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocks_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2320e63391918e8389308263bcd1e9ae3cc8cc46", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocks_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+  
+    var people = new Person[]
+    {
+        new Person() { Name = "Taylor", Age = 95, }
+    };
+
+    void PrintName(Person person)
+    {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <div>");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+        Write(person.Name);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</div>\r\n");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+   PrintName(people[0]) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+   AnnounceBirthday(people[0]); 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+            
+    void AnnounceBirthday(Person person)
+    {
+        var formatted = $"Mr. {person.Name}";
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("        <div>\r\n            <h3>Happy birthday ");
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+                           Write(formatted);
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("!</h3>\r\n        </div>\r\n");
+        WriteLiteral("        <ul>\r\n");
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+         for (var i = 0; i < person.Age / 10; i++)
+        {
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("            <li>");
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+            Write(i);
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral(" Happy birthday!</li>\r\n");
+#nullable restore
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+        }
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("        </ul>\r\n");
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+
+        if (person.Age < 20)
+        {
+            return;
+        }
+
+
+#line default
+#line hidden
+#nullable disable
+        WriteLiteral("        <h4>Secret message</h4>\r\n");
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks.cshtml"
+    }
+
+    class Person
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.ir.txt
new file mode 100644
index 0000000000..841e57a19a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.ir.txt
@@ -0,0 +1,85 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocks_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [2] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (0:0,0 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+                CSharpCode - (4:1,2 [145] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (4:1,2 [145] Markup_InCodeBlocks.cshtml) - CSharp - \n    var people = new Person[]\n    {\n        new Person() { Name = "Taylor", Age = 95, }\n    };\n\n    void PrintName(Person person)\n    {\n
+                HtmlContent - (149:9,0 [13] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (149:9,0 [8] Markup_InCodeBlocks.cshtml) - Html -         
+                    IntermediateToken - (157:9,8 [4] Markup_InCodeBlocks.cshtml) - Html - <div
+                    IntermediateToken - (161:9,12 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                CSharpExpression - (163:9,14 [11] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (163:9,14 [11] Markup_InCodeBlocks.cshtml) - CSharp - person.Name
+                HtmlContent - (174:9,25 [8] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (174:9,25 [6] Markup_InCodeBlocks.cshtml) - Html - </div>
+                    IntermediateToken - (180:9,31 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+                CSharpCode - (182:10,0 [7] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (182:10,0 [7] Markup_InCodeBlocks.cshtml) - CSharp -     }\n
+                HtmlContent - (192:12,0 [2] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (192:12,0 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+                CSharpCode - (196:13,2 [22] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (196:13,2 [22] Markup_InCodeBlocks.cshtml) - CSharp -  PrintName(people[0]) 
+                CSharpCode - (223:14,2 [30] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (223:14,2 [30] Markup_InCodeBlocks.cshtml) - CSharp -  AnnounceBirthday(people[0]); 
+                HtmlContent - (256:15,0 [2] Markup_InCodeBlocks.cshtml)
+                    IntermediateToken - (256:15,0 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (270:16,12 [98] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (270:16,12 [98] Markup_InCodeBlocks.cshtml) - CSharp - \n    void AnnounceBirthday(Person person)\n    {\n        var formatted = $"Mr. {person.Name}";\n
+            HtmlContent - (368:20,0 [46] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (368:20,0 [8] Markup_InCodeBlocks.cshtml) - Html -         
+                IntermediateToken - (376:20,8 [4] Markup_InCodeBlocks.cshtml) - Html - <div
+                IntermediateToken - (380:20,12 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (381:20,13 [14] Markup_InCodeBlocks.cshtml) - Html - \n            
+                IntermediateToken - (395:21,12 [3] Markup_InCodeBlocks.cshtml) - Html - <h3
+                IntermediateToken - (398:21,15 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (399:21,16 [15] Markup_InCodeBlocks.cshtml) - Html - Happy birthday 
+            CSharpExpression - (416:21,33 [9] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (416:21,33 [9] Markup_InCodeBlocks.cshtml) - CSharp - formatted
+            HtmlContent - (426:21,43 [24] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (426:21,43 [1] Markup_InCodeBlocks.cshtml) - Html - !
+                IntermediateToken - (427:21,44 [5] Markup_InCodeBlocks.cshtml) - Html - </h3>
+                IntermediateToken - (432:21,49 [10] Markup_InCodeBlocks.cshtml) - Html - \n        
+                IntermediateToken - (442:22,8 [6] Markup_InCodeBlocks.cshtml) - Html - </div>
+                IntermediateToken - (448:22,14 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (450:23,0 [2] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (450:23,0 [2] Markup_InCodeBlocks.cshtml) - CSharp - \n
+            HtmlContent - (452:24,0 [14] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (452:24,0 [8] Markup_InCodeBlocks.cshtml) - Html -         
+                IntermediateToken - (460:24,8 [3] Markup_InCodeBlocks.cshtml) - Html - <ul
+                IntermediateToken - (463:24,11 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (464:24,12 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (466:25,0 [8] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (466:25,0 [8] Markup_InCodeBlocks.cshtml) - CSharp -         
+            CSharpCode - (475:25,9 [54] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (475:25,9 [54] Markup_InCodeBlocks.cshtml) - CSharp - for (var i = 0; i < person.Age / 10; i++)\n        {\n
+            HtmlContent - (529:27,0 [16] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (529:27,0 [12] Markup_InCodeBlocks.cshtml) - Html -             
+                IntermediateToken - (541:27,12 [3] Markup_InCodeBlocks.cshtml) - Html - <li
+                IntermediateToken - (544:27,15 [1] Markup_InCodeBlocks.cshtml) - Html - >
+            CSharpExpression - (547:27,18 [1] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (547:27,18 [1] Markup_InCodeBlocks.cshtml) - CSharp - i
+            HtmlContent - (549:27,20 [23] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (549:27,20 [16] Markup_InCodeBlocks.cshtml) - Html -  Happy birthday!
+                IntermediateToken - (565:27,36 [5] Markup_InCodeBlocks.cshtml) - Html - </li>
+                IntermediateToken - (570:27,41 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (572:28,0 [11] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (572:28,0 [11] Markup_InCodeBlocks.cshtml) - CSharp -         }\n
+            HtmlContent - (583:29,0 [15] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (583:29,0 [8] Markup_InCodeBlocks.cshtml) - Html -         
+                IntermediateToken - (591:29,8 [5] Markup_InCodeBlocks.cshtml) - Html - </ul>
+                IntermediateToken - (596:29,13 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (598:30,0 [77] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (598:30,0 [77] Markup_InCodeBlocks.cshtml) - CSharp - \n        if (person.Age < 20)\n        {\n            return;\n        }\n\n
+            HtmlContent - (675:36,0 [33] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (675:36,0 [8] Markup_InCodeBlocks.cshtml) - Html -         
+                IntermediateToken - (683:36,8 [3] Markup_InCodeBlocks.cshtml) - Html - <h4
+                IntermediateToken - (686:36,11 [1] Markup_InCodeBlocks.cshtml) - Html - >
+                IntermediateToken - (687:36,12 [14] Markup_InCodeBlocks.cshtml) - Html - Secret message
+                IntermediateToken - (701:36,26 [5] Markup_InCodeBlocks.cshtml) - Html - </h4>
+                IntermediateToken - (706:36,31 [2] Markup_InCodeBlocks.cshtml) - Html - \n
+            CSharpCode - (708:37,0 [121] Markup_InCodeBlocks.cshtml)
+                IntermediateToken - (708:37,0 [121] Markup_InCodeBlocks.cshtml) - CSharp -     }\n\n    class Person\n    {\n        public string Name { get; set; }\n        public int Age { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml
new file mode 100644
index 0000000000..c001d4945d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml
@@ -0,0 +1,20 @@
+@addTagHelper "*, TestAssembly"
+
+<p catchall-unbound-required>
+    <input nottaghelper />
+    <input class="btn"
+           catchall-unbound-required />
+    <input 
+           class="btn" catchall-unbound-required input-unbound-required input-bound-required-string="hello" />
+    <input 
+           class="btn" 
+           catchall-unbound-required 
+           input-unbound-required catchall-bound-string="world" input-bound-required-string="hello2" />
+    <input class="btn" 
+           catchall-unbound-required="hello" 
+                input-unbound-required="hello2" 
+           catchall-unbound-required 
+           input-bound-required-string="world" />
+    <div boundbool booldict-prefix-key></div>
+    <div>Tag helper with unmatched bound boolean attributes.</div>
+</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..a7f71679e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_DesignTime
+    {
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_InputTagHelper.BoundRequiredString = "hello";
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_CatchAllTagHelper.BoundRequiredString = "world";
+            __TestNamespace_InputTagHelper.BoundRequiredString = "hello2";
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_InputTagHelper.BoundRequiredString = "world";
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper.BoundBoolProp = true;
+            __DivTagHelper.BoolDictProp["key"] = true;
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..38941da8af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,109 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] MinimizedTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] MinimizedTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] MinimizedTagHelpers.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [762] MinimizedTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (64:2,29 [34] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (64:2,29 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                            IntermediateToken - (70:3,4 [6] MinimizedTagHelpers.cshtml) - Html - <input
+                            IntermediateToken - (76:3,10 [13] MinimizedTagHelpers.cshtml) - Html -  nottaghelper
+                            IntermediateToken - (89:3,23 [1] MinimizedTagHelpers.cshtml) - Html -  
+                            IntermediateToken - (90:3,24 [2] MinimizedTagHelpers.cshtml) - Html - />
+                            IntermediateToken - (92:3,26 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (98:4,4 [59] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (112:4,18 [3] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (112:4,18 [3] MinimizedTagHelpers.cshtml) - Html - btn
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (157:5,39 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (157:5,39 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (163:6,4 [119] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (190:7,18 [3] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (190:7,18 [3] MinimizedTagHelpers.cshtml) - Html - btn
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperHtmlAttribute -  - input-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperProperty - (273:7,101 [5] MinimizedTagHelpers.cshtml) - input-bound-required-string - string TestNamespace.InputTagHelper.BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (273:7,101 [5] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (273:7,101 [5] MinimizedTagHelpers.cshtml) - Html - hello
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (282:7,110 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (282:7,110 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (288:8,4 [176] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (315:9,18 [3] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (315:9,18 [3] MinimizedTagHelpers.cshtml) - Html - btn
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperHtmlAttribute -  - input-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperProperty - (418:11,57 [5] MinimizedTagHelpers.cshtml) - catchall-bound-string - string TestNamespace.CatchAllTagHelper.BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (418:11,57 [5] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (418:11,57 [5] MinimizedTagHelpers.cshtml) - Html - world
+                            DefaultTagHelperProperty - (454:11,93 [6] MinimizedTagHelpers.cshtml) - input-bound-required-string - string TestNamespace.InputTagHelper.BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (454:11,93 [6] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (454:11,93 [6] MinimizedTagHelpers.cshtml) - Html - hello2
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (464:11,103 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (464:11,103 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (470:12,4 [206] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (484:12,18 [3] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (484:12,18 [3] MinimizedTagHelpers.cshtml) - Html - btn
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (529:13,38 [5] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (529:13,38 [5] MinimizedTagHelpers.cshtml) - Html - hello
+                            DefaultTagHelperHtmlAttribute -  - input-unbound-required - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (578:14,40 [6] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (578:14,40 [6] MinimizedTagHelpers.cshtml) - Html - hello2
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperProperty - (667:16,40 [5] MinimizedTagHelpers.cshtml) - input-bound-required-string - string TestNamespace.InputTagHelper.BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (667:16,40 [5] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (667:16,40 [5] MinimizedTagHelpers.cshtml) - Html - world
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (676:16,49 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (676:16,49 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (682:17,4 [41] MinimizedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperProperty -  - boundbool - bool DivTagHelper.BoundBoolProp - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperProperty -  - booldict-prefix-key - System.Collections.Generic.IDictionary<string, bool> DivTagHelper.BoolDictProp - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (723:17,45 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (723:17,45 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (729:18,4 [62] MinimizedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (734:18,9 [51] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (734:18,9 [51] MinimizedTagHelpers.cshtml) - Html - Tag helper with unmatched bound boolean attributes.
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (791:18,66 [2] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (791:18,66 [2] MinimizedTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e8d92fb65c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (771:15,37 [17] )
+|"*, TestAssembly"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..df5a1eb99e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,188 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "29c9ea0bc587afb2f919c7ed7192d6687b534753"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"29c9ea0bc587afb2f919c7ed7192d6687b534753", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("btn"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-bound-required-string", "hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchall-bound-string", "world", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-bound-required-string", "hello2", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchall-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlString("hello2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-bound-required-string", "world", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n    <input nottaghelper />\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                BeginWriteTagHelperAttribute();
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("catchall-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                BeginWriteTagHelperAttribute();
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("catchall-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                BeginWriteTagHelperAttribute();
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("input-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                __TestNamespace_InputTagHelper.BoundRequiredString = (string)__tagHelperAttribute_1.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                BeginWriteTagHelperAttribute();
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("catchall-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                BeginWriteTagHelperAttribute();
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("input-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                __TestNamespace_CatchAllTagHelper.BoundRequiredString = (string)__tagHelperAttribute_2.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_2);
+                __TestNamespace_InputTagHelper.BoundRequiredString = (string)__tagHelperAttribute_3.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+                BeginWriteTagHelperAttribute();
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("catchall-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                __TestNamespace_InputTagHelper.BoundRequiredString = (string)__tagHelperAttribute_6.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_6);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __DivTagHelper.BoundBoolProp = true;
+                __tagHelperExecutionContext.AddTagHelperAttribute("boundbool", __DivTagHelper.BoundBoolProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                if (__DivTagHelper.BoolDictProp == null)
+                {
+                    throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("booldict-prefix-key", "DivTagHelper", "BoolDictProp"));
+                }
+                __DivTagHelper.BoolDictProp["key"] = true;
+                __tagHelperExecutionContext.AddTagHelperAttribute("booldict-prefix-key", __DivTagHelper.BoolDictProp["key"], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("Tag helper with unmatched bound boolean attributes.");
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("catchall-unbound-required", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..0f51578f51
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt
@@ -0,0 +1,90 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - btn - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_1 - input-bound-required-string - hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_2 - catchall-bound-string - world - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_3 - input-bound-required-string - hello2 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_4 - catchall-unbound-required - hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - input-unbound-required - hello2 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_6 - input-bound-required-string - world - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] MinimizedTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] MinimizedTagHelpers.cshtml) - Html - \n
+                TagHelper - (35:2,0 [762] MinimizedTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (64:2,29 [34] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (64:2,29 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                            IntermediateToken - (70:3,4 [6] MinimizedTagHelpers.cshtml) - Html - <input
+                            IntermediateToken - (76:3,10 [13] MinimizedTagHelpers.cshtml) - Html -  nottaghelper
+                            IntermediateToken - (89:3,23 [1] MinimizedTagHelpers.cshtml) - Html -  
+                            IntermediateToken - (90:3,24 [2] MinimizedTagHelpers.cshtml) - Html - />
+                            IntermediateToken - (92:3,26 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (98:4,4 [59] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (157:5,39 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (157:5,39 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (163:6,4 [119] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperHtmlAttribute -  - input-unbound-required - HtmlAttributeValueStyle.Minimized
+                            PreallocatedTagHelperProperty - (273:7,101 [5] MinimizedTagHelpers.cshtml) - __tagHelperAttribute_1 - input-bound-required-string - BoundRequiredString
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (282:7,110 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (282:7,110 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (288:8,4 [176] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperHtmlAttribute -  - input-unbound-required - HtmlAttributeValueStyle.Minimized
+                            PreallocatedTagHelperProperty - (418:11,57 [5] MinimizedTagHelpers.cshtml) - __tagHelperAttribute_2 - catchall-bound-string - BoundRequiredString
+                            PreallocatedTagHelperProperty - (454:11,93 [6] MinimizedTagHelpers.cshtml) - __tagHelperAttribute_3 - input-bound-required-string - BoundRequiredString
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (464:11,103 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (464:11,103 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (470:12,4 [206] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_4
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                            DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                            PreallocatedTagHelperProperty - (667:16,40 [5] MinimizedTagHelpers.cshtml) - __tagHelperAttribute_6 - input-bound-required-string - BoundRequiredString
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (676:16,49 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (676:16,49 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (682:17,4 [41] MinimizedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperProperty -  - boundbool - bool DivTagHelper.BoundBoolProp - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperProperty -  - booldict-prefix-key - System.Collections.Generic.IDictionary<string, bool> DivTagHelper.BoolDictProp - HtmlAttributeValueStyle.Minimized
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (723:17,45 [6] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (723:17,45 [6] MinimizedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (729:18,4 [62] MinimizedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (734:18,9 [51] MinimizedTagHelpers.cshtml)
+                                    IntermediateToken - (734:18,9 [51] MinimizedTagHelpers.cshtml) - Html - Tag helper with unmatched bound boolean attributes.
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (791:18,66 [2] MinimizedTagHelpers.cshtml)
+                            IntermediateToken - (791:18,66 [2] MinimizedTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - catchall-unbound-required - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml
new file mode 100644
index 0000000000..8387e8a28a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml
@@ -0,0 +1,8 @@
+@{
+    @foreach (var result in (dynamic)Url)
+    {
+        <div>
+            @result.SomeValue.
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1b08e1e505
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+     foreach (var result in (dynamic)Url)
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+       __o = result.SomeValue;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+              
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+     
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt
new file mode 100644
index 0000000000..4644024352
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] NestedCSharp.cshtml)
+                    IntermediateToken - (2:0,2 [6] NestedCSharp.cshtml) - CSharp - \n    
+                CSharpCode - (9:1,5 [53] NestedCSharp.cshtml)
+                    IntermediateToken - (9:1,5 [53] NestedCSharp.cshtml) - CSharp - foreach (var result in (dynamic)Url)\n    {\n        
+                HtmlContent - (62:3,8 [19] NestedCSharp.cshtml)
+                    IntermediateToken - (62:3,8 [4] NestedCSharp.cshtml) - Html - <div
+                    IntermediateToken - (66:3,12 [1] NestedCSharp.cshtml) - Html - >
+                    IntermediateToken - (67:3,13 [14] NestedCSharp.cshtml) - Html - \n            
+                CSharpExpression - (82:4,13 [16] NestedCSharp.cshtml)
+                    IntermediateToken - (82:4,13 [16] NestedCSharp.cshtml) - CSharp - result.SomeValue
+                HtmlContent - (98:4,29 [17] NestedCSharp.cshtml)
+                    IntermediateToken - (98:4,29 [11] NestedCSharp.cshtml) - Html - .\n        
+                    IntermediateToken - (109:5,8 [6] NestedCSharp.cshtml) - Html - </div>
+                CSharpCode - (115:5,14 [7] NestedCSharp.cshtml)
+                    IntermediateToken - (115:5,14 [7] NestedCSharp.cshtml) - CSharp - \n    }
+                CSharpCode - (122:6,5 [2] NestedCSharp.cshtml)
+                    IntermediateToken - (122:6,5 [2] NestedCSharp.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b58d527b04
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.mappings.txt
@@ -0,0 +1,35 @@
+Source Location: (2:0,2 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
+|
+    |
+Generated Location: (744:19,2 [6] )
+|
+    |
+
+Source Location: (9:1,5 [53] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
+|foreach (var result in (dynamic)Url)
+    {
+        |
+Generated Location: (914:27,5 [53] )
+|foreach (var result in (dynamic)Url)
+    {
+        |
+
+Source Location: (82:4,13 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
+|result.SomeValue|
+Generated Location: (1139:36,13 [16] )
+|result.SomeValue|
+
+Source Location: (115:5,14 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
+|
+    }|
+Generated Location: (1329:43,14 [7] )
+|
+    }|
+
+Source Location: (122:6,5 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml)
+|
+|
+Generated Location: (1500:51,5 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs
new file mode 100644
index 0000000000..26ba12432c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs
@@ -0,0 +1,42 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6be69a1b80bfb35325fef427f0709232182e96a8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"6be69a1b80bfb35325fef427f0709232182e96a8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+     foreach (var result in (dynamic)Url)
+    {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <div>\r\n            ");
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+       Write(result.SomeValue);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(".\r\n        </div>\r\n");
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt
new file mode 100644
index 0000000000..79a60d3403
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] NestedCSharp.cshtml)
+                    IntermediateToken - (2:0,2 [6] NestedCSharp.cshtml) - CSharp - \n    
+                CSharpCode - (9:1,5 [45] NestedCSharp.cshtml)
+                    IntermediateToken - (9:1,5 [45] NestedCSharp.cshtml) - CSharp - foreach (var result in (dynamic)Url)\n    {\n
+                HtmlContent - (54:3,0 [27] NestedCSharp.cshtml)
+                    IntermediateToken - (54:3,0 [8] NestedCSharp.cshtml) - Html -         
+                    IntermediateToken - (62:3,8 [4] NestedCSharp.cshtml) - Html - <div
+                    IntermediateToken - (66:3,12 [1] NestedCSharp.cshtml) - Html - >
+                    IntermediateToken - (67:3,13 [2] NestedCSharp.cshtml) - Html - \n
+                    IntermediateToken - (69:4,0 [12] NestedCSharp.cshtml) - Html -             
+                CSharpExpression - (82:4,13 [16] NestedCSharp.cshtml)
+                    IntermediateToken - (82:4,13 [16] NestedCSharp.cshtml) - CSharp - result.SomeValue
+                HtmlContent - (98:4,29 [19] NestedCSharp.cshtml)
+                    IntermediateToken - (98:4,29 [11] NestedCSharp.cshtml) - Html - .\n        
+                    IntermediateToken - (109:5,8 [6] NestedCSharp.cshtml) - Html - </div>
+                    IntermediateToken - (115:5,14 [2] NestedCSharp.cshtml) - Html - \n
+                CSharpCode - (117:6,0 [5] NestedCSharp.cshtml)
+                    IntermediateToken - (117:6,0 [5] NestedCSharp.cshtml) - CSharp -     }
+                CSharpCode - (122:6,5 [2] NestedCSharp.cshtml)
+                    IntermediateToken - (122:6,5 [2] NestedCSharp.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml
new file mode 100644
index 0000000000..070875f5fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml
@@ -0,0 +1,4 @@
+@if(foo) {
+    @if(bar) {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs
new file mode 100644
index 0000000000..59b64e3682
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml"
+ if(foo) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml"
+     if(bar) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml"
+     
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt
new file mode 100644
index 0000000000..7522731b78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (1:0,1 [15] NestedCodeBlocks.cshtml)
+                    IntermediateToken - (1:0,1 [15] NestedCodeBlocks.cshtml) - CSharp - if(foo) {\n    
+                CSharpCode - (17:1,5 [16] NestedCodeBlocks.cshtml)
+                    IntermediateToken - (17:1,5 [16] NestedCodeBlocks.cshtml) - CSharp - if(bar) {\n    }
+                CSharpCode - (33:2,5 [3] NestedCodeBlocks.cshtml)
+                    IntermediateToken - (33:2,5 [3] NestedCodeBlocks.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt
new file mode 100644
index 0000000000..55d683f4e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.mappings.txt
@@ -0,0 +1,21 @@
+Source Location: (1:0,1 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml)
+|if(foo) {
+    |
+Generated Location: (751:19,1 [15] )
+|if(foo) {
+    |
+
+Source Location: (17:1,5 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml)
+|if(bar) {
+    }|
+Generated Location: (934:27,5 [16] )
+|if(bar) {
+    }|
+
+Source Location: (33:2,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml)
+|
+}|
+Generated Location: (1118:35,5 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs
new file mode 100644
index 0000000000..af6d6d502b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.codegen.cs
@@ -0,0 +1,42 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d83923f86f1c84f081916ef7308513ab80a65675"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d83923f86f1c84f081916ef7308513ab80a65675", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml"
+ if(foo) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml"
+     if(bar) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks.cshtml"
+     
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt
new file mode 100644
index 0000000000..2c0030ec65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (1:0,1 [15] NestedCodeBlocks.cshtml)
+                    IntermediateToken - (1:0,1 [15] NestedCodeBlocks.cshtml) - CSharp - if(foo) {\n    
+                CSharpCode - (17:1,5 [16] NestedCodeBlocks.cshtml)
+                    IntermediateToken - (17:1,5 [16] NestedCodeBlocks.cshtml) - CSharp - if(bar) {\n    }
+                CSharpCode - (33:2,5 [3] NestedCodeBlocks.cshtml)
+                    IntermediateToken - (33:2,5 [3] NestedCodeBlocks.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml
new file mode 100644
index 0000000000..b5fac5a502
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml
@@ -0,0 +1,16 @@
+@addTagHelper "*, TestAssembly"
+
+<script type="text/html">
+    <div data-animation="fade" class="randomNonTagHelperAttribute">
+        <p class="Hello World" data-delay="1000">
+            @for(var i = 0; i < 5; i++) {
+                <script id="nestedScriptTag" type="text/html">
+                    <input data-interval="2000 + @ViewBag.DefaultInterval + 1" type="text" checked="true">
+                </script>
+            }
+            <script type="text/javascript">
+                var tag = '<input checked="true">';
+            </script>
+        </p>
+    </div>
+</script>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d1f6fecd40
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,70 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+             for(var i = 0; i < 5; i++) {
+                
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+                                            __o = ViewBag.DefaultInterval;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper.Type = "text";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+                                                          __TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+                         
+            }
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..cf49fba267
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,87 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] NestedScriptTagTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [108] NestedScriptTagTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] NestedScriptTagTagHelpers.cshtml) - Html - \n\n
+                    IntermediateToken - (35:2,0 [7] NestedScriptTagTagHelpers.cshtml) - Html - <script
+                    IntermediateToken - (42:2,7 [17] NestedScriptTagTagHelpers.cshtml) - Html -  type="text/html"
+                    IntermediateToken - (59:2,24 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (60:2,25 [6] NestedScriptTagTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (66:3,4 [4] NestedScriptTagTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (70:3,8 [17] NestedScriptTagTagHelpers.cshtml) - Html -  data-animation="
+                    IntermediateToken - (87:3,25 [4] NestedScriptTagTagHelpers.cshtml) - Html - fade
+                    IntermediateToken - (91:3,29 [1] NestedScriptTagTagHelpers.cshtml) - Html - "
+                    IntermediateToken - (92:3,30 [36] NestedScriptTagTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (128:3,66 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (129:3,67 [10] NestedScriptTagTagHelpers.cshtml) - Html - \n        
+                TagHelper - (139:4,8 [433] NestedScriptTagTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (180:4,49 [14] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (180:4,49 [14] NestedScriptTagTagHelpers.cshtml) - Html - \n            
+                        CSharpCode - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml) - CSharp - for(var i = 0; i < 5; i++) {\n                
+                        HtmlContent - (241:6,16 [68] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (241:6,16 [7] NestedScriptTagTagHelpers.cshtml) - Html - <script
+                            IntermediateToken - (248:6,23 [21] NestedScriptTagTagHelpers.cshtml) - Html -  id="nestedScriptTag"
+                            IntermediateToken - (269:6,44 [17] NestedScriptTagTagHelpers.cshtml) - Html -  type="text/html"
+                            IntermediateToken - (286:6,61 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (287:6,62 [22] NestedScriptTagTagHelpers.cshtml) - Html - \n                    
+                        TagHelper - (309:7,20 [86] NestedScriptTagTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperHtmlAttribute -  - data-interval - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml) - Html - 2000 + 
+                                CSharpExpression - (339:7,50 [23] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (339:7,50 [23] NestedScriptTagTagHelpers.cshtml) - CSharp - ViewBag.DefaultInterval
+                                HtmlContent - (362:7,73 [4] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (362:7,73 [4] NestedScriptTagTagHelpers.cshtml) - Html -  + 1
+                            DefaultTagHelperProperty - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml) - Html - text
+                            DefaultTagHelperProperty - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml) - Html - text
+                            DefaultTagHelperProperty - (389:7,100 [4] NestedScriptTagTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (389:7,100 [4] NestedScriptTagTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (395:7,106 [27] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (395:7,106 [18] NestedScriptTagTagHelpers.cshtml) - Html - \n                
+                            IntermediateToken - (413:8,16 [9] NestedScriptTagTagHelpers.cshtml) - Html - </script>
+                        CSharpCode - (422:8,25 [15] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (422:8,25 [15] NestedScriptTagTagHelpers.cshtml) - CSharp - \n            }
+                        HtmlContent - (437:9,13 [131] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (437:9,13 [14] NestedScriptTagTagHelpers.cshtml) - Html - \n            
+                            IntermediateToken - (451:10,12 [7] NestedScriptTagTagHelpers.cshtml) - Html - <script
+                            IntermediateToken - (458:10,19 [23] NestedScriptTagTagHelpers.cshtml) - Html -  type="text/javascript"
+                            IntermediateToken - (481:10,42 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (482:10,43 [67] NestedScriptTagTagHelpers.cshtml) - Html - \n                var tag = '<input checked="true">';\n            
+                            IntermediateToken - (549:12,12 [9] NestedScriptTagTagHelpers.cshtml) - Html - </script>
+                            IntermediateToken - (558:12,21 [10] NestedScriptTagTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (149:4,18 [11] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (149:4,18 [11] NestedScriptTagTagHelpers.cshtml) - Html - Hello World
+                    DefaultTagHelperHtmlAttribute -  - data-delay - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (174:4,43 [4] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (174:4,43 [4] NestedScriptTagTagHelpers.cshtml) - Html - 1000
+                    DefaultTagHelperExecute - 
+                HtmlContent - (572:13,12 [23] NestedScriptTagTagHelpers.cshtml)
+                    IntermediateToken - (572:13,12 [6] NestedScriptTagTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (578:14,4 [6] NestedScriptTagTagHelpers.cshtml) - Html - </div>
+                    IntermediateToken - (584:14,10 [2] NestedScriptTagTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (586:15,0 [9] NestedScriptTagTagHelpers.cshtml) - Html - </script>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1c67db87bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (803:15,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (195:5,13 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
+|for(var i = 0; i < 5; i++) {
+                |
+Generated Location: (1320:32,13 [46] )
+|for(var i = 0; i < 5; i++) {
+                |
+
+Source Location: (339:7,50 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
+|ViewBag.DefaultInterval|
+Generated Location: (1796:42,50 [23] )
+|ViewBag.DefaultInterval|
+
+Source Location: (389:7,100 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
+|true|
+Generated Location: (2240:51,100 [4] )
+|true|
+
+Source Location: (422:8,25 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
+|
+            }|
+Generated Location: (2442:58,25 [15] )
+|
+            }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..0be73652e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,114 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "958c6fc042a8f49499906b46c11bf4b15446c89d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"958c6fc042a8f49499906b46c11bf4b15446c89d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "text", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-delay", new global::Microsoft.AspNetCore.Html.HtmlString("1000"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<script type=\"text/html\">\r\n    <div data-animation=\"fade\" class=\"randomNonTagHelperAttribute\">\r\n        ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n");
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+             for(var i = 0; i < 5; i++) {
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("                <script id=\"nestedScriptTag\" type=\"text/html\">\r\n                    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                }
+                );
+                __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+                __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+                __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+                BeginWriteTagHelperAttribute();
+                WriteLiteral("2000 + ");
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+                                            Write(ViewBag.DefaultInterval);
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral(" + 1");
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __tagHelperExecutionContext.AddHtmlAttribute("data-interval", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+__TestNamespace_InputTagHelper2.Checked = true;
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n                </script>\r\n");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
+            }
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("            <script type=\"text/javascript\">\r\n                var tag = \'<input checked=\"true\">\';\r\n            </script>\r\n        ");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    </div>\r\n</script>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..7041d3c6fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt
@@ -0,0 +1,80 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - data-delay - 1000 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [106] NestedScriptTagTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] NestedScriptTagTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (35:2,0 [7] NestedScriptTagTagHelpers.cshtml) - Html - <script
+                    IntermediateToken - (42:2,7 [17] NestedScriptTagTagHelpers.cshtml) - Html -  type="text/html"
+                    IntermediateToken - (59:2,24 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (60:2,25 [6] NestedScriptTagTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (66:3,4 [4] NestedScriptTagTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (70:3,8 [17] NestedScriptTagTagHelpers.cshtml) - Html -  data-animation="
+                    IntermediateToken - (87:3,25 [4] NestedScriptTagTagHelpers.cshtml) - Html - fade
+                    IntermediateToken - (91:3,29 [1] NestedScriptTagTagHelpers.cshtml) - Html - "
+                    IntermediateToken - (92:3,30 [36] NestedScriptTagTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (128:3,66 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (129:3,67 [10] NestedScriptTagTagHelpers.cshtml) - Html - \n        
+                TagHelper - (139:4,8 [433] NestedScriptTagTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (180:4,49 [2] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (180:4,49 [2] NestedScriptTagTagHelpers.cshtml) - Html - \n
+                        CSharpCode - (182:5,0 [12] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (182:5,0 [12] NestedScriptTagTagHelpers.cshtml) - CSharp -             
+                        CSharpCode - (195:5,13 [30] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (195:5,13 [30] NestedScriptTagTagHelpers.cshtml) - CSharp - for(var i = 0; i < 5; i++) {\n
+                        HtmlContent - (225:6,0 [84] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (225:6,0 [16] NestedScriptTagTagHelpers.cshtml) - Html -                 
+                            IntermediateToken - (241:6,16 [7] NestedScriptTagTagHelpers.cshtml) - Html - <script
+                            IntermediateToken - (248:6,23 [21] NestedScriptTagTagHelpers.cshtml) - Html -  id="nestedScriptTag"
+                            IntermediateToken - (269:6,44 [17] NestedScriptTagTagHelpers.cshtml) - Html -  type="text/html"
+                            IntermediateToken - (286:6,61 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (287:6,62 [22] NestedScriptTagTagHelpers.cshtml) - Html - \n                    
+                        TagHelper - (309:7,20 [86] NestedScriptTagTagHelpers.cshtml) - input - TagMode.StartTagOnly
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                            DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                            DefaultTagHelperHtmlAttribute -  - data-interval - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml) - Html - 2000 + 
+                                CSharpExpression - (339:7,50 [23] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (339:7,50 [23] NestedScriptTagTagHelpers.cshtml) - CSharp - ViewBag.DefaultInterval
+                                HtmlContent - (362:7,73 [4] NestedScriptTagTagHelpers.cshtml)
+                                    IntermediateToken - (362:7,73 [4] NestedScriptTagTagHelpers.cshtml) - Html -  + 1
+                            PreallocatedTagHelperProperty - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            PreallocatedTagHelperProperty - (374:7,85 [4] NestedScriptTagTagHelpers.cshtml) - __tagHelperAttribute_0 - type - Type
+                            DefaultTagHelperProperty - (389:7,100 [4] NestedScriptTagTagHelpers.cshtml) - checked - bool TestNamespace.InputTagHelper2.Checked - HtmlAttributeValueStyle.DoubleQuotes
+                                IntermediateToken - (389:7,100 [4] NestedScriptTagTagHelpers.cshtml) - CSharp - true
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (395:7,106 [29] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (395:7,106 [18] NestedScriptTagTagHelpers.cshtml) - Html - \n                
+                            IntermediateToken - (413:8,16 [9] NestedScriptTagTagHelpers.cshtml) - Html - </script>
+                            IntermediateToken - (422:8,25 [2] NestedScriptTagTagHelpers.cshtml) - Html - \n
+                        CSharpCode - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml) - CSharp -             }\n
+                        HtmlContent - (439:10,0 [129] NestedScriptTagTagHelpers.cshtml)
+                            IntermediateToken - (439:10,0 [12] NestedScriptTagTagHelpers.cshtml) - Html -             
+                            IntermediateToken - (451:10,12 [7] NestedScriptTagTagHelpers.cshtml) - Html - <script
+                            IntermediateToken - (458:10,19 [23] NestedScriptTagTagHelpers.cshtml) - Html -  type="text/javascript"
+                            IntermediateToken - (481:10,42 [1] NestedScriptTagTagHelpers.cshtml) - Html - >
+                            IntermediateToken - (482:10,43 [67] NestedScriptTagTagHelpers.cshtml) - Html - \n                var tag = '<input checked="true">';\n            
+                            IntermediateToken - (549:12,12 [9] NestedScriptTagTagHelpers.cshtml) - Html - </script>
+                            IntermediateToken - (558:12,21 [10] NestedScriptTagTagHelpers.cshtml) - Html - \n        
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (572:13,12 [23] NestedScriptTagTagHelpers.cshtml)
+                    IntermediateToken - (572:13,12 [6] NestedScriptTagTagHelpers.cshtml) - Html - \n    
+                    IntermediateToken - (578:14,4 [6] NestedScriptTagTagHelpers.cshtml) - Html - </div>
+                    IntermediateToken - (584:14,10 [2] NestedScriptTagTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (586:15,0 [9] NestedScriptTagTagHelpers.cshtml) - Html - </script>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml
new file mode 100644
index 0000000000..e6637b03fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml
@@ -0,0 +1,5 @@
+@addTagHelper *, TestAssembly
+<span someattr>Hola</span>
+<div unbound="foo">
+    <input value=Hello type='text' />
+</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1d15281689
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_DesignTime
+    {
+        private global::SpanTagHelper __SpanTagHelper;
+        private global::DivTagHelper __DivTagHelper;
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __SpanTagHelper = CreateTagHelper<global::SpanTagHelper>();
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __InputTagHelper.FooProp = "Hello";
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..4a4b5e257d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,48 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::SpanTagHelper - __SpanTagHelper
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] NestedTagHelpers.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [2] NestedTagHelpers.cshtml)
+                    IntermediateToken - (29:0,29 [2] NestedTagHelpers.cshtml) - Html - \n
+                TagHelper - (31:1,0 [26] NestedTagHelpers.cshtml) - span - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (46:1,15 [4] NestedTagHelpers.cshtml)
+                            IntermediateToken - (46:1,15 [4] NestedTagHelpers.cshtml) - Html - Hola
+                    DefaultTagHelperCreate -  - SpanTagHelper
+                    DefaultTagHelperHtmlAttribute -  - someattr - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
+                HtmlContent - (57:1,26 [2] NestedTagHelpers.cshtml)
+                    IntermediateToken - (57:1,26 [2] NestedTagHelpers.cshtml) - Html - \n
+                TagHelper - (59:2,0 [66] NestedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (78:2,19 [6] NestedTagHelpers.cshtml)
+                            IntermediateToken - (78:2,19 [6] NestedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (84:3,4 [33] NestedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - InputTagHelper
+                            DefaultTagHelperProperty - (97:3,17 [5] NestedTagHelpers.cshtml) - value - string InputTagHelper.FooProp - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (97:3,17 [5] NestedTagHelpers.cshtml)
+                                    IntermediateToken - (97:3,17 [5] NestedTagHelpers.cshtml) - Html - Hello
+                            DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.SingleQuotes
+                                HtmlContent - (109:3,29 [4] NestedTagHelpers.cshtml)
+                                    IntermediateToken - (109:3,29 [4] NestedTagHelpers.cshtml) - Html - text
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (117:3,37 [2] NestedTagHelpers.cshtml)
+                            IntermediateToken - (117:3,37 [2] NestedTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (73:2,14 [3] NestedTagHelpers.cshtml)
+                            IntermediateToken - (73:2,14 [3] NestedTagHelpers.cshtml) - Html - foo
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..049fa3812b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml)
+|*, TestAssembly|
+Generated Location: (702:15,38 [15] )
+|*, TestAssembly|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..d7752b8aca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,89 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5e63d5fe37100e65dfcf39dd1c542eb697b624db"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5e63d5fe37100e65dfcf39dd1c542eb697b624db", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", "Hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("foo"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::SpanTagHelper __SpanTagHelper;
+        private global::DivTagHelper __DivTagHelper;
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("span", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Hola");
+            }
+            );
+            __SpanTagHelper = CreateTagHelper<global::SpanTagHelper>();
+            __tagHelperExecutionContext.Add(__SpanTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("someattr", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n    ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+                __tagHelperExecutionContext.Add(__InputTagHelper);
+                __InputTagHelper.FooProp = (string)__tagHelperAttribute_0.Value;
+                __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n");
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..f4c6001b80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::SpanTagHelper - __SpanTagHelper
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                TagHelper - (31:1,0 [26] NestedTagHelpers.cshtml) - span - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (46:1,15 [4] NestedTagHelpers.cshtml)
+                            IntermediateToken - (46:1,15 [4] NestedTagHelpers.cshtml) - Html - Hola
+                    DefaultTagHelperCreate -  - SpanTagHelper
+                    DefaultTagHelperHtmlAttribute -  - someattr - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
+                HtmlContent - (57:1,26 [2] NestedTagHelpers.cshtml)
+                    IntermediateToken - (57:1,26 [2] NestedTagHelpers.cshtml) - Html - \n
+                TagHelper - (59:2,0 [66] NestedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (78:2,19 [6] NestedTagHelpers.cshtml)
+                            IntermediateToken - (78:2,19 [6] NestedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (84:3,4 [33] NestedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - InputTagHelper
+                            PreallocatedTagHelperProperty - (97:3,17 [5] NestedTagHelpers.cshtml) - __tagHelperAttribute_0 - value - FooProp
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (117:3,37 [2] NestedTagHelpers.cshtml)
+                            IntermediateToken - (117:3,37 [2] NestedTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml
new file mode 100644
index 0000000000..36e96c46b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml
@@ -0,0 +1,38 @@
+@{
+    int i = 1;
+}
+
+@while(i <= 10) {
+    <p>Hello from C#, #@(i)</p>
+    i += 1;
+}
+
+@if(i == 11) {
+    <p>We wrote 10 lines!</p>
+}
+
+@switch(i) {
+    case 11:
+        <p>No really, we wrote 10 lines!</p>
+        break;
+    default:
+        <p>Actually, we didn't...</p>
+        break;
+}
+
+@for(int j = 1; j <= 10; j += 2) {
+    <p>Hello again from C#, #@(j)</p>
+}
+
+@try {
+    <p>That time, we wrote 5 lines!</p>
+} catch(Exception ex) {
+    <p>Oh no! An error occurred: @(ex.Message)</p>
+}
+
+@* With has no equivalent in C# *@
+<p>i is now @i</p>
+
+@lock(new object()) {
+    <p>This block is locked, for your security!</p>
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs
new file mode 100644
index 0000000000..b1d0ce4074
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.cs
@@ -0,0 +1,184 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+  
+    int i = 1;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ while(i <= 10) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                   __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                               
+    i += 1;
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ if(i == 11) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                             
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ switch(i) {
+    case 11:
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                            
+        break;
+    default:
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                     
+        break;
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ for(int j = 1; j <= 10; j += 2) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                         __o = j;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                     
+}
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ try {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                       
+} catch(Exception ex) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                             __o = ex.Message;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                                  
+}
+
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                  
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+       __o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ lock(new object()) {
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                                                   
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt
new file mode 100644
index 0000000000..c5215cb143
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt
@@ -0,0 +1,112 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [18] NoLinePragmas.cshtml)
+                    IntermediateToken - (2:0,2 [18] NoLinePragmas.cshtml) - CSharp - \n    int i = 1;\n
+                HtmlContent - (23:3,0 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (23:3,0 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (26:4,1 [22] NoLinePragmas.cshtml)
+                    IntermediateToken - (26:4,1 [22] NoLinePragmas.cshtml) - CSharp - while(i <= 10) {\n    
+                HtmlContent - (48:5,4 [19] NoLinePragmas.cshtml)
+                    IntermediateToken - (48:5,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (50:5,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (51:5,7 [16] NoLinePragmas.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (69:5,25 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (69:5,25 [1] NoLinePragmas.cshtml) - CSharp - i
+                HtmlContent - (71:5,27 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (71:5,27 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (75:5,31 [16] NoLinePragmas.cshtml)
+                    IntermediateToken - (75:5,31 [16] NoLinePragmas.cshtml) - CSharp - \n    i += 1;\n}
+                HtmlContent - (91:7,1 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (91:7,1 [4] NoLinePragmas.cshtml) - Html - \n\n
+                CSharpCode - (96:9,1 [19] NoLinePragmas.cshtml)
+                    IntermediateToken - (96:9,1 [19] NoLinePragmas.cshtml) - CSharp - if(i == 11) {\n    
+                HtmlContent - (115:10,4 [25] NoLinePragmas.cshtml)
+                    IntermediateToken - (115:10,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (117:10,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (118:10,7 [18] NoLinePragmas.cshtml) - Html - We wrote 10 lines!
+                    IntermediateToken - (136:10,25 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (140:10,29 [3] NoLinePragmas.cshtml)
+                    IntermediateToken - (140:10,29 [3] NoLinePragmas.cshtml) - CSharp - \n}
+                HtmlContent - (143:11,1 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (143:11,1 [4] NoLinePragmas.cshtml) - Html - \n\n
+                CSharpCode - (148:13,1 [35] NoLinePragmas.cshtml)
+                    IntermediateToken - (148:13,1 [35] NoLinePragmas.cshtml) - CSharp - switch(i) {\n    case 11:\n        
+                HtmlContent - (183:15,8 [36] NoLinePragmas.cshtml)
+                    IntermediateToken - (183:15,8 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (185:15,10 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (186:15,11 [29] NoLinePragmas.cshtml) - Html - No really, we wrote 10 lines!
+                    IntermediateToken - (215:15,40 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (219:15,44 [40] NoLinePragmas.cshtml)
+                    IntermediateToken - (219:15,44 [40] NoLinePragmas.cshtml) - CSharp - \n        break;\n    default:\n        
+                HtmlContent - (259:18,8 [29] NoLinePragmas.cshtml)
+                    IntermediateToken - (259:18,8 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (261:18,10 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (262:18,11 [22] NoLinePragmas.cshtml) - Html - Actually, we didn't...
+                    IntermediateToken - (284:18,33 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (288:18,37 [19] NoLinePragmas.cshtml)
+                    IntermediateToken - (288:18,37 [19] NoLinePragmas.cshtml) - CSharp - \n        break;\n}
+                HtmlContent - (307:20,1 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (307:20,1 [4] NoLinePragmas.cshtml) - Html - \n\n
+                CSharpCode - (312:22,1 [39] NoLinePragmas.cshtml)
+                    IntermediateToken - (312:22,1 [39] NoLinePragmas.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n    
+                HtmlContent - (351:23,4 [25] NoLinePragmas.cshtml)
+                    IntermediateToken - (351:23,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (353:23,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (354:23,7 [22] NoLinePragmas.cshtml) - Html - Hello again from C#, #
+                CSharpExpression - (378:23,31 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (378:23,31 [1] NoLinePragmas.cshtml) - CSharp - j
+                HtmlContent - (380:23,33 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (380:23,33 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (384:23,37 [3] NoLinePragmas.cshtml)
+                    IntermediateToken - (384:23,37 [3] NoLinePragmas.cshtml) - CSharp - \n}
+                HtmlContent - (387:24,1 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (387:24,1 [4] NoLinePragmas.cshtml) - Html - \n\n
+                CSharpCode - (392:26,1 [11] NoLinePragmas.cshtml)
+                    IntermediateToken - (392:26,1 [11] NoLinePragmas.cshtml) - CSharp - try {\n    
+                HtmlContent - (403:27,4 [35] NoLinePragmas.cshtml)
+                    IntermediateToken - (403:27,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (405:27,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (406:27,7 [28] NoLinePragmas.cshtml) - Html - That time, we wrote 5 lines!
+                    IntermediateToken - (434:27,35 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (438:27,39 [31] NoLinePragmas.cshtml)
+                    IntermediateToken - (438:27,39 [31] NoLinePragmas.cshtml) - CSharp - \n} catch(Exception ex) {\n    
+                HtmlContent - (469:29,4 [29] NoLinePragmas.cshtml)
+                    IntermediateToken - (469:29,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (471:29,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (472:29,7 [26] NoLinePragmas.cshtml) - Html - Oh no! An error occurred: 
+                CSharpExpression - (500:29,35 [10] NoLinePragmas.cshtml)
+                    IntermediateToken - (500:29,35 [10] NoLinePragmas.cshtml) - CSharp - ex.Message
+                HtmlContent - (511:29,46 [4] NoLinePragmas.cshtml)
+                    IntermediateToken - (511:29,46 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (515:29,50 [7] NoLinePragmas.cshtml)
+                    IntermediateToken - (515:29,50 [7] NoLinePragmas.cshtml) - CSharp - \n}\n\n
+                CSharpCode - (556:32,34 [0] NoLinePragmas.cshtml)
+                    IntermediateToken - (556:32,34 [0] NoLinePragmas.cshtml) - CSharp - 
+                HtmlContent - (556:32,34 [14] NoLinePragmas.cshtml)
+                    IntermediateToken - (556:32,34 [2] NoLinePragmas.cshtml) - Html - \n
+                    IntermediateToken - (558:33,0 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (560:33,2 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (561:33,3 [9] NoLinePragmas.cshtml) - Html - i is now 
+                CSharpExpression - (571:33,13 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (571:33,13 [1] NoLinePragmas.cshtml) - CSharp - i
+                HtmlContent - (572:33,14 [8] NoLinePragmas.cshtml)
+                    IntermediateToken - (572:33,14 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (576:33,18 [4] NoLinePragmas.cshtml) - Html - \n\n
+                CSharpCode - (581:35,1 [26] NoLinePragmas.cshtml)
+                    IntermediateToken - (581:35,1 [26] NoLinePragmas.cshtml) - CSharp - lock(new object()) {\n    
+                HtmlContent - (607:36,4 [47] NoLinePragmas.cshtml)
+                    IntermediateToken - (607:36,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (609:36,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (610:36,7 [40] NoLinePragmas.cshtml) - Html - This block is locked, for your security!
+                    IntermediateToken - (650:36,47 [4] NoLinePragmas.cshtml) - Html - </p>
+                CSharpCode - (654:36,51 [3] NoLinePragmas.cshtml)
+                    IntermediateToken - (654:36,51 [3] NoLinePragmas.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1ba876db62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.mappings.txt
@@ -0,0 +1,148 @@
+Source Location: (2:0,2 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+    int i = 1;
+|
+Generated Location: (746:19,2 [18] )
+|
+    int i = 1;
+|
+
+Source Location: (26:4,1 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|while(i <= 10) {
+    |
+Generated Location: (923:27,1 [22] )
+|while(i <= 10) {
+    |
+
+Source Location: (69:5,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|i|
+Generated Location: (1130:35,25 [1] )
+|i|
+
+Source Location: (75:5,31 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+    i += 1;
+}|
+Generated Location: (1323:42,31 [16] )
+|
+    i += 1;
+}|
+
+Source Location: (96:9,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|if(i == 11) {
+    |
+Generated Location: (1501:51,1 [19] )
+|if(i == 11) {
+    |
+
+Source Location: (140:10,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+}|
+Generated Location: (1710:59,29 [3] )
+|
+}|
+
+Source Location: (148:13,1 [35] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|switch(i) {
+    case 11:
+        |
+Generated Location: (1875:67,1 [35] )
+|switch(i) {
+    case 11:
+        |
+
+Source Location: (219:15,44 [40] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+        break;
+    default:
+        |
+Generated Location: (2115:76,44 [40] )
+|
+        break;
+    default:
+        |
+
+Source Location: (288:18,37 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+        break;
+}|
+Generated Location: (2353:86,37 [19] )
+|
+        break;
+}|
+
+Source Location: (312:22,1 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|for(int j = 1; j <= 10; j += 2) {
+    |
+Generated Location: (2534:95,1 [39] )
+|for(int j = 1; j <= 10; j += 2) {
+    |
+
+Source Location: (378:23,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|j|
+Generated Location: (2765:103,31 [1] )
+|j|
+
+Source Location: (384:23,37 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+}|
+Generated Location: (2965:110,37 [3] )
+|
+}|
+
+Source Location: (392:26,1 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|try {
+    |
+Generated Location: (3130:118,1 [11] )
+|try {
+    |
+
+Source Location: (438:27,39 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+} catch(Exception ex) {
+    |
+Generated Location: (3341:126,39 [31] )
+|
+} catch(Exception ex) {
+    |
+
+Source Location: (500:29,35 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|ex.Message|
+Generated Location: (3568:135,35 [10] )
+|ex.Message|
+
+Source Location: (515:29,50 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+}
+
+|
+Generated Location: (3790:142,50 [7] )
+|
+}
+
+|
+
+Source Location: (556:32,34 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+||
+Generated Location: (3990:151,34 [0] )
+||
+
+Source Location: (571:33,13 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|i|
+Generated Location: (4164:158,13 [1] )
+|i|
+
+Source Location: (581:35,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|lock(new object()) {
+    |
+Generated Location: (4328:165,1 [26] )
+|lock(new object()) {
+    |
+
+Source Location: (654:36,51 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml)
+|
+}|
+Generated Location: (4566:173,51 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs
new file mode 100644
index 0000000000..c923c0ece8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs
@@ -0,0 +1,175 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "c6fa3992fa56644768995c97941d682d90f6d8ec"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"c6fa3992fa56644768995c97941d682d90f6d8ec", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+  
+    int i = 1;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ while(i <= 10) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Hello from C#, #");
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                   Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+    i += 1;
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ if(i == 11) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>We wrote 10 lines!</p>\r\n");
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ switch(i) {
+    case 11:
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>No really, we wrote 10 lines!</p>\r\n");
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+        break;
+    default:
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("        <p>Actually, we didn\'t...</p>\r\n");
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+        break;
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ for(int j = 1; j <= 10; j += 2) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Hello again from C#, #");
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                         Write(j);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ try {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>That time, we wrote 5 lines!</p>\r\n");
+#nullable restore
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+} catch(Exception ex) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>Oh no! An error occurred: ");
+#nullable restore
+#line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+                             Write(ex.Message);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+}
+
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("<p>i is now ");
+#nullable restore
+#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+       Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n\r\n");
+#nullable restore
+#line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+ lock(new object()) {
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("    <p>This block is locked, for your security!</p>\r\n");
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt
new file mode 100644
index 0000000000..1b8d2a8073
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt
@@ -0,0 +1,122 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [18] NoLinePragmas.cshtml)
+                    IntermediateToken - (2:0,2 [18] NoLinePragmas.cshtml) - CSharp - \n    int i = 1;\n
+                HtmlContent - (23:3,0 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (23:3,0 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (26:4,1 [18] NoLinePragmas.cshtml)
+                    IntermediateToken - (26:4,1 [18] NoLinePragmas.cshtml) - CSharp - while(i <= 10) {\n
+                HtmlContent - (44:5,0 [23] NoLinePragmas.cshtml)
+                    IntermediateToken - (44:5,0 [4] NoLinePragmas.cshtml) - Html -     
+                    IntermediateToken - (48:5,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (50:5,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (51:5,7 [16] NoLinePragmas.cshtml) - Html - Hello from C#, #
+                CSharpExpression - (69:5,25 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (69:5,25 [1] NoLinePragmas.cshtml) - CSharp - i
+                HtmlContent - (71:5,27 [6] NoLinePragmas.cshtml)
+                    IntermediateToken - (71:5,27 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (75:5,31 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (77:6,0 [16] NoLinePragmas.cshtml)
+                    IntermediateToken - (77:6,0 [16] NoLinePragmas.cshtml) - CSharp -     i += 1;\n}\n
+                HtmlContent - (93:8,0 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (93:8,0 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (96:9,1 [15] NoLinePragmas.cshtml)
+                    IntermediateToken - (96:9,1 [15] NoLinePragmas.cshtml) - CSharp - if(i == 11) {\n
+                HtmlContent - (111:10,0 [31] NoLinePragmas.cshtml)
+                    IntermediateToken - (111:10,0 [4] NoLinePragmas.cshtml) - Html -     
+                    IntermediateToken - (115:10,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (117:10,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (118:10,7 [18] NoLinePragmas.cshtml) - Html - We wrote 10 lines!
+                    IntermediateToken - (136:10,25 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (140:10,29 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (142:11,0 [3] NoLinePragmas.cshtml)
+                    IntermediateToken - (142:11,0 [3] NoLinePragmas.cshtml) - CSharp - }\n
+                HtmlContent - (145:12,0 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (145:12,0 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (148:13,1 [27] NoLinePragmas.cshtml)
+                    IntermediateToken - (148:13,1 [27] NoLinePragmas.cshtml) - CSharp - switch(i) {\n    case 11:\n
+                HtmlContent - (175:15,0 [46] NoLinePragmas.cshtml)
+                    IntermediateToken - (175:15,0 [8] NoLinePragmas.cshtml) - Html -         
+                    IntermediateToken - (183:15,8 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (185:15,10 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (186:15,11 [29] NoLinePragmas.cshtml) - Html - No really, we wrote 10 lines!
+                    IntermediateToken - (215:15,40 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (219:15,44 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (221:16,0 [30] NoLinePragmas.cshtml)
+                    IntermediateToken - (221:16,0 [30] NoLinePragmas.cshtml) - CSharp -         break;\n    default:\n
+                HtmlContent - (251:18,0 [39] NoLinePragmas.cshtml)
+                    IntermediateToken - (251:18,0 [8] NoLinePragmas.cshtml) - Html -         
+                    IntermediateToken - (259:18,8 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (261:18,10 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (262:18,11 [22] NoLinePragmas.cshtml) - Html - Actually, we didn't...
+                    IntermediateToken - (284:18,33 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (288:18,37 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (290:19,0 [19] NoLinePragmas.cshtml)
+                    IntermediateToken - (290:19,0 [19] NoLinePragmas.cshtml) - CSharp -         break;\n}\n
+                HtmlContent - (309:21,0 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (309:21,0 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (312:22,1 [35] NoLinePragmas.cshtml)
+                    IntermediateToken - (312:22,1 [35] NoLinePragmas.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n
+                HtmlContent - (347:23,0 [29] NoLinePragmas.cshtml)
+                    IntermediateToken - (347:23,0 [4] NoLinePragmas.cshtml) - Html -     
+                    IntermediateToken - (351:23,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (353:23,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (354:23,7 [22] NoLinePragmas.cshtml) - Html - Hello again from C#, #
+                CSharpExpression - (378:23,31 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (378:23,31 [1] NoLinePragmas.cshtml) - CSharp - j
+                HtmlContent - (380:23,33 [6] NoLinePragmas.cshtml)
+                    IntermediateToken - (380:23,33 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (384:23,37 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (386:24,0 [3] NoLinePragmas.cshtml)
+                    IntermediateToken - (386:24,0 [3] NoLinePragmas.cshtml) - CSharp - }\n
+                HtmlContent - (389:25,0 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (389:25,0 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (392:26,1 [7] NoLinePragmas.cshtml)
+                    IntermediateToken - (392:26,1 [7] NoLinePragmas.cshtml) - CSharp - try {\n
+                HtmlContent - (399:27,0 [41] NoLinePragmas.cshtml)
+                    IntermediateToken - (399:27,0 [4] NoLinePragmas.cshtml) - Html -     
+                    IntermediateToken - (403:27,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (405:27,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (406:27,7 [28] NoLinePragmas.cshtml) - Html - That time, we wrote 5 lines!
+                    IntermediateToken - (434:27,35 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (438:27,39 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (440:28,0 [25] NoLinePragmas.cshtml)
+                    IntermediateToken - (440:28,0 [25] NoLinePragmas.cshtml) - CSharp - } catch(Exception ex) {\n
+                HtmlContent - (465:29,0 [33] NoLinePragmas.cshtml)
+                    IntermediateToken - (465:29,0 [4] NoLinePragmas.cshtml) - Html -     
+                    IntermediateToken - (469:29,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (471:29,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (472:29,7 [26] NoLinePragmas.cshtml) - Html - Oh no! An error occurred: 
+                CSharpExpression - (500:29,35 [10] NoLinePragmas.cshtml)
+                    IntermediateToken - (500:29,35 [10] NoLinePragmas.cshtml) - CSharp - ex.Message
+                HtmlContent - (511:29,46 [6] NoLinePragmas.cshtml)
+                    IntermediateToken - (511:29,46 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (515:29,50 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (517:30,0 [5] NoLinePragmas.cshtml)
+                    IntermediateToken - (517:30,0 [5] NoLinePragmas.cshtml) - CSharp - }\n\n
+                CSharpCode - (556:32,34 [2] NoLinePragmas.cshtml)
+                    IntermediateToken - (556:32,34 [2] NoLinePragmas.cshtml) - CSharp - \n
+                HtmlContent - (558:33,0 [12] NoLinePragmas.cshtml)
+                    IntermediateToken - (558:33,0 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (560:33,2 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (561:33,3 [9] NoLinePragmas.cshtml) - Html - i is now 
+                CSharpExpression - (571:33,13 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (571:33,13 [1] NoLinePragmas.cshtml) - CSharp - i
+                HtmlContent - (572:33,14 [8] NoLinePragmas.cshtml)
+                    IntermediateToken - (572:33,14 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (576:33,18 [4] NoLinePragmas.cshtml) - Html - \n\n
+                CSharpCode - (581:35,1 [22] NoLinePragmas.cshtml)
+                    IntermediateToken - (581:35,1 [22] NoLinePragmas.cshtml) - CSharp - lock(new object()) {\n
+                HtmlContent - (603:36,0 [53] NoLinePragmas.cshtml)
+                    IntermediateToken - (603:36,0 [4] NoLinePragmas.cshtml) - Html -     
+                    IntermediateToken - (607:36,4 [2] NoLinePragmas.cshtml) - Html - <p
+                    IntermediateToken - (609:36,6 [1] NoLinePragmas.cshtml) - Html - >
+                    IntermediateToken - (610:36,7 [40] NoLinePragmas.cshtml) - Html - This block is locked, for your security!
+                    IntermediateToken - (650:36,47 [4] NoLinePragmas.cshtml) - Html - </p>
+                    IntermediateToken - (654:36,51 [2] NoLinePragmas.cshtml) - Html - \n
+                CSharpCode - (656:37,0 [1] NoLinePragmas.cshtml)
+                    IntermediateToken - (656:37,0 [1] NoLinePragmas.cshtml) - CSharp - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml
new file mode 100644
index 0000000000..fa87620317
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml
@@ -0,0 +1,11 @@
+@{
+    @ViewBag?.Data
+    @ViewBag.IntIndexer?[0]
+    @ViewBag.StrIndexer?["key"]
+    @ViewBag?.Method(Value?[23]?.More)?["key"]
+}
+
+@ViewBag?.Data
+@ViewBag.IntIndexer?[0]
+@ViewBag.StrIndexer?["key"]
+@ViewBag?.Method(Value?[23]?.More)?["key"]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d12445b465
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.cs
@@ -0,0 +1,117 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag?.Data;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+                  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag.IntIndexer?[0];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+                           
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag.StrIndexer?["key"];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+                               
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag?.Method(Value?[23]?.More)?["key"];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+                                              
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag?.Data;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag.IntIndexer?[0];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag.StrIndexer?["key"];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+__o = ViewBag?.Method(Value?[23]?.More)?["key"];
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt
new file mode 100644
index 0000000000..58e35883ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt
@@ -0,0 +1,45 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (2:0,2 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (9:1,5 [13] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (9:1,5 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
+                CSharpCode - (22:1,18 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (22:1,18 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (29:2,5 [22] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (29:2,5 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0]
+                CSharpCode - (51:2,27 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (51:2,27 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (58:3,5 [26] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (58:3,5 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"]
+                CSharpCode - (84:3,31 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (84:3,31 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (91:4,5 [41] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (91:4,5 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"]
+                CSharpCode - (132:4,46 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (132:4,46 [2] NullConditionalExpressions.cshtml) - CSharp - \n
+                HtmlContent - (137:6,0 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (137:6,0 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (140:7,1 [13] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (140:7,1 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
+                HtmlContent - (153:7,14 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (153:7,14 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (156:8,1 [22] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (156:8,1 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0]
+                HtmlContent - (178:8,23 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (178:8,23 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (181:9,1 [26] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (181:9,1 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"]
+                HtmlContent - (207:9,27 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (207:9,27 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (210:10,1 [41] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (210:10,1 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c71bc3fa1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.mappings.txt
@@ -0,0 +1,75 @@
+Source Location: (2:0,2 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|
+    |
+Generated Location: (772:19,2 [6] )
+|
+    |
+
+Source Location: (9:1,5 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag?.Data|
+Generated Location: (957:27,6 [13] )
+|ViewBag?.Data|
+
+Source Location: (22:1,18 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|
+    |
+Generated Location: (1162:34,18 [6] )
+|
+    |
+
+Source Location: (29:2,5 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag.IntIndexer?[0]|
+Generated Location: (1347:42,6 [22] )
+|ViewBag.IntIndexer?[0]|
+
+Source Location: (51:2,27 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|
+    |
+Generated Location: (1570:49,27 [6] )
+|
+    |
+
+Source Location: (58:3,5 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag.StrIndexer?["key"]|
+Generated Location: (1755:57,6 [26] )
+|ViewBag.StrIndexer?["key"]|
+
+Source Location: (84:3,31 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|
+    |
+Generated Location: (1986:64,31 [6] )
+|
+    |
+
+Source Location: (91:4,5 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag?.Method(Value?[23]?.More)?["key"]|
+Generated Location: (2171:72,6 [41] )
+|ViewBag?.Method(Value?[23]?.More)?["key"]|
+
+Source Location: (132:4,46 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|
+|
+Generated Location: (2432:79,46 [2] )
+|
+|
+
+Source Location: (140:7,1 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag?.Data|
+Generated Location: (2611:86,6 [13] )
+|ViewBag?.Data|
+
+Source Location: (156:8,1 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag.IntIndexer?[0]|
+Generated Location: (2804:93,6 [22] )
+|ViewBag.IntIndexer?[0]|
+
+Source Location: (181:9,1 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag.StrIndexer?["key"]|
+Generated Location: (3007:100,6 [26] )
+|ViewBag.StrIndexer?["key"]|
+
+Source Location: (210:10,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml)
+|ViewBag?.Method(Value?[23]?.More)?["key"]|
+Generated Location: (3214:107,6 [41] )
+|ViewBag?.Method(Value?[23]?.More)?["key"]|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs
new file mode 100644
index 0000000000..5ed8813cb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.codegen.cs
@@ -0,0 +1,78 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "c76f9ddb44b2830babd64c0afeaa96aba6a6ae27"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"c76f9ddb44b2830babd64c0afeaa96aba6a6ae27", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag?.Data);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag.IntIndexer?[0]);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag.StrIndexer?["key"]);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag?.Method(Value?[23]?.More)?["key"]);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag?.Data);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag.IntIndexer?[0]);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag.StrIndexer?["key"]);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions.cshtml"
+Write(ViewBag?.Method(Value?[23]?.More)?["key"]);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt
new file mode 100644
index 0000000000..8fd7d3dc26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (2:0,2 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (9:1,5 [13] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (9:1,5 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
+                CSharpCode - (22:1,18 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (22:1,18 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (29:2,5 [22] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (29:2,5 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0]
+                CSharpCode - (51:2,27 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (51:2,27 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (58:3,5 [26] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (58:3,5 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"]
+                CSharpCode - (84:3,31 [6] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (84:3,31 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
+                CSharpExpression - (91:4,5 [41] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (91:4,5 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"]
+                CSharpCode - (132:4,46 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (132:4,46 [2] NullConditionalExpressions.cshtml) - CSharp - \n
+                HtmlContent - (137:6,0 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (137:6,0 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (140:7,1 [13] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (140:7,1 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
+                HtmlContent - (153:7,14 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (153:7,14 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (156:8,1 [22] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (156:8,1 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0]
+                HtmlContent - (178:8,23 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (178:8,23 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (181:9,1 [26] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (181:9,1 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"]
+                HtmlContent - (207:9,27 [2] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (207:9,27 [2] NullConditionalExpressions.cshtml) - Html - \n
+                CSharpExpression - (210:10,1 [41] NullConditionalExpressions.cshtml)
+                    IntermediateToken - (210:10,1 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml
new file mode 100644
index 0000000000..33162eb90b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml
@@ -0,0 +1,5 @@
+<html>
+<body>
+@if (true) { 
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9049386386
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml"
+ if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml"
+       
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml"
+       
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..49f293ec33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt
@@ -0,0 +1,3 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(4,3): Error RZ1026: Encountered end tag "body" with no matching start tag.  Are your start/end tags properly balanced?
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(5,3): Error RZ1026: Encountered end tag "html" with no matching start tag.  Are your start/end tags properly balanced?
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(3,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt
new file mode 100644
index 0000000000..16ff60d4df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [16] OpenedIf.cshtml)
+                    IntermediateToken - (0:0,0 [5] OpenedIf.cshtml) - Html - <html
+                    IntermediateToken - (5:0,5 [1] OpenedIf.cshtml) - Html - >
+                    IntermediateToken - (6:0,6 [2] OpenedIf.cshtml) - Html - \n
+                    IntermediateToken - (8:1,0 [5] OpenedIf.cshtml) - Html - <body
+                    IntermediateToken - (13:1,5 [1] OpenedIf.cshtml) - Html - >
+                    IntermediateToken - (14:1,6 [2] OpenedIf.cshtml) - Html - \n
+                CSharpCode - (17:2,1 [14] OpenedIf.cshtml)
+                    IntermediateToken - (17:2,1 [14] OpenedIf.cshtml) - CSharp - if (true) { \n
+                HtmlContent - (31:3,0 [7] OpenedIf.cshtml)
+                    IntermediateToken - (31:3,0 [7] OpenedIf.cshtml) - Html - </body>
+                CSharpCode - (38:3,7 [2] OpenedIf.cshtml)
+                    IntermediateToken - (38:3,7 [2] OpenedIf.cshtml) - CSharp - \n
+                HtmlContent - (40:4,0 [7] OpenedIf.cshtml)
+                    IntermediateToken - (40:4,0 [7] OpenedIf.cshtml) - Html - </html>
+                CSharpCode - (47:4,7 [0] OpenedIf.cshtml)
+                    IntermediateToken - (47:4,7 [0] OpenedIf.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt
new file mode 100644
index 0000000000..bf39975d37
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (17:2,1 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml)
+|if (true) { 
+|
+Generated Location: (735:19,1 [14] )
+|if (true) { 
+|
+
+Source Location: (38:3,7 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml)
+|
+|
+Generated Location: (909:26,7 [2] )
+|
+|
+
+Source Location: (47:4,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml)
+||
+Generated Location: (1071:33,7 [0] )
+||
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs
new file mode 100644
index 0000000000..5b6c2d401d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs
@@ -0,0 +1,27 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "afefc9ccf10183402eae0b9e4175393b3797a27b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"afefc9ccf10183402eae0b9e4175393b3797a27b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<html>\r\n<body>\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml"
+ if (true) { 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</body>\r\n</html>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..49f293ec33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt
@@ -0,0 +1,3 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(4,3): Error RZ1026: Encountered end tag "body" with no matching start tag.  Are your start/end tags properly balanced?
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(5,3): Error RZ1026: Encountered end tag "html" with no matching start tag.  Are your start/end tags properly balanced?
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(3,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt
new file mode 100644
index 0000000000..4aa0558ca0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [16] OpenedIf.cshtml)
+                    IntermediateToken - (0:0,0 [5] OpenedIf.cshtml) - Html - <html
+                    IntermediateToken - (5:0,5 [1] OpenedIf.cshtml) - Html - >
+                    IntermediateToken - (6:0,6 [2] OpenedIf.cshtml) - Html - \n
+                    IntermediateToken - (8:1,0 [5] OpenedIf.cshtml) - Html - <body
+                    IntermediateToken - (13:1,5 [1] OpenedIf.cshtml) - Html - >
+                    IntermediateToken - (14:1,6 [2] OpenedIf.cshtml) - Html - \n
+                CSharpCode - (17:2,1 [14] OpenedIf.cshtml)
+                    IntermediateToken - (17:2,1 [14] OpenedIf.cshtml) - CSharp - if (true) { \n
+                HtmlContent - (31:3,0 [16] OpenedIf.cshtml)
+                    IntermediateToken - (31:3,0 [7] OpenedIf.cshtml) - Html - </body>
+                    IntermediateToken - (38:3,7 [2] OpenedIf.cshtml) - Html - \n
+                    IntermediateToken - (40:4,0 [7] OpenedIf.cshtml) - Html - </html>
+                CSharpCode - (47:4,7 [0] OpenedIf.cshtml)
+                    IntermediateToken - (47:4,7 [0] OpenedIf.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml
new file mode 100644
index 0000000000..ab30e853fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml
@@ -0,0 +1,5 @@
+@{
+/*
+int i =10;
+int j =20;
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e6b9eddd15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml"
+  
+/*
+int i =10;
+int j =20;
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1a25d90e26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(2,1): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt
new file mode 100644
index 0000000000..42fae7cec7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [31] ParserError.cshtml)
+                    IntermediateToken - (2:0,2 [31] ParserError.cshtml) - CSharp - \n/*\nint i =10;\nint j =20;\n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c3a898b88e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.mappings.txt
@@ -0,0 +1,13 @@
+Source Location: (2:0,2 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml)
+|
+/*
+int i =10;
+int j =20;
+}|
+Generated Location: (742:19,2 [31] )
+|
+/*
+int i =10;
+int j =20;
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs
new file mode 100644
index 0000000000..27528c0e76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs
@@ -0,0 +1,29 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a94df714867cbb0e2369fe24157b5d04e2e7a9cf"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"a94df714867cbb0e2369fe24157b5d04e2e7a9cf", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml"
+  
+/*
+int i =10;
+int j =20;
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1a25d90e26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(2,1): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt
new file mode 100644
index 0000000000..8f60e461b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt
@@ -0,0 +1,8 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [31] ParserError.cshtml)
+                    IntermediateToken - (2:0,2 [31] ParserError.cshtml) - CSharp - \n/*\nint i =10;\nint j =20;\n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml
new file mode 100644
index 0000000000..797a828688
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml
@@ -0,0 +1,23 @@
+@addTagHelper "*, TestAssembly"
+
+@{
+    var literate = "or illiterate";
+    var intDictionary = new Dictionary<string, int>
+    {
+        { "three", 3 },
+    };
+    var stringDictionary = new SortedDictionary<string, string>
+    {
+        { "name", "value" },
+    };
+}
+
+<div class="randomNonTagHelperAttribute">
+    <input type="checkbox" int-dictionary="intDictionary" string-dictionary="stringDictionary"/>
+    <input type="password" int-dictionary="intDictionary" int-prefix-garlic="37" int-prefix-grabber="42" />
+    <input type="radio"
+           int-prefix-grabber="42" int-prefix-salt="37" int-prefix-pepper="98" int-prefix-salt="8"
+           string-prefix-grabber="string" string-prefix-paprika="another string"
+           string-prefix-cumin="literate @literate?"/>
+    <input int-prefix-value="37" string-prefix-thyme="string" />
+</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..15438555be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,145 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_DesignTime
+    {
+        private global::TestNamespace.InputTagHelper1 __TestNamespace_InputTagHelper1;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+  
+    var literate = "or illiterate";
+    var intDictionary = new Dictionary<string, int>
+    {
+        { "three", 3 },
+    };
+    var stringDictionary = new SortedDictionary<string, string>
+    {
+        { "name", "value" },
+    };
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty = __TestNamespace_InputTagHelper1.IntDictionaryProperty;
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+                  __TestNamespace_InputTagHelper1.StringDictionaryProperty = stringDictionary;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty = __TestNamespace_InputTagHelper1.StringDictionaryProperty;
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty = __TestNamespace_InputTagHelper1.IntDictionaryProperty;
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+           __TestNamespace_InputTagHelper1.IntDictionaryProperty["garlic"] = 37;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["garlic"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["garlic"];
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+                                                       __TestNamespace_InputTagHelper1.IntProperty = 42;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty;
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntProperty = 42;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty;
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["salt"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"];
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+         __TestNamespace_InputTagHelper1.IntDictionaryProperty["pepper"] = 98;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["pepper"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["pepper"];
+            __TestNamespace_InputTagHelper1.StringProperty = "string";
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.StringProperty;
+            __TestNamespace_InputTagHelper1.StringDictionaryProperty["paprika"] = "another string";
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["paprika"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["paprika"];
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+                                    __o = literate;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"] = string.Empty;
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"];
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty["value"] = 37;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["value"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"];
+            __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"] = "string";
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"];
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..add0db7eff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,136 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper1 - __TestNamespace_InputTagHelper1
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] PrefixedAttributeTagHelpers.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (31:0,31 [4] PrefixedAttributeTagHelpers.cshtml) - Html - \n\n
+                CSharpCode - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - CSharp - \n    var literate = "or illiterate";\n    var intDictionary = new Dictionary<string, int>\n    {\n        { "three", 3 },\n    };\n    var stringDictionary = new SortedDictionary<string, string>\n    {\n        { "name", "value" },\n    };\n
+                HtmlContent - (282:13,0 [49] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (282:13,0 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (284:14,0 [4] PrefixedAttributeTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (288:14,4 [36] PrefixedAttributeTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (324:14,40 [1] PrefixedAttributeTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (325:14,41 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (331:15,4 [92] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (344:15,17 [8] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (344:15,17 [8] PrefixedAttributeTagHelpers.cshtml) - Html - checkbox
+                    DefaultTagHelperProperty - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - string-dictionary - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper1.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - CSharp - stringDictionary
+                    DefaultTagHelperProperty - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - string-dictionary - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - CSharp - stringDictionary
+                    DefaultTagHelperExecute - 
+                HtmlContent - (423:15,96 [6] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (423:15,96 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (429:16,4 [103] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (442:16,17 [8] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (442:16,17 [8] PrefixedAttributeTagHelpers.cshtml) - Html - password
+                    DefaultTagHelperProperty - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-garlic - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-garlic - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper1.IntProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperProperty - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperExecute - 
+                HtmlContent - (532:16,107 [6] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (532:16,107 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (538:17,4 [257] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (551:17,17 [5] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (551:17,17 [5] PrefixedAttributeTagHelpers.cshtml) - Html - radio
+                    DefaultTagHelperProperty - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper1.IntProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperProperty - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperProperty - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-salt - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-salt - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-pepper - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 98
+                    DefaultTagHelperProperty - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-pepper - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 98
+                    DefaultTagHelperHtmlAttribute -  - int-prefix-salt - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (655:18,96 [1] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (655:18,96 [1] PrefixedAttributeTagHelpers.cshtml) - Html - 8
+                    DefaultTagHelperProperty - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - string-prefix-grabber - string TestNamespace.InputTagHelper1.StringProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - Html - string
+                    DefaultTagHelperProperty - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - string-prefix-grabber - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - Html - string
+                    DefaultTagHelperProperty - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml) - string-prefix-paprika - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper1.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml) - Html - another string
+                    DefaultTagHelperProperty - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml) - string-prefix-paprika - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml) - Html - another string
+                    DefaultTagHelperProperty - (773:20,32 [19] PrefixedAttributeTagHelpers.cshtml) - string-prefix-cumin - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper1.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (773:20,32 [9] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (773:20,32 [8] PrefixedAttributeTagHelpers.cshtml) - Html - literate
+                            IntermediateToken - (781:20,40 [1] PrefixedAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml) - CSharp - literate
+                        HtmlContent - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml) - Html - ?
+                    DefaultTagHelperProperty - (773:20,32 [19] PrefixedAttributeTagHelpers.cshtml) - string-prefix-cumin - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (773:20,32 [9] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (773:20,32 [8] PrefixedAttributeTagHelpers.cshtml) - Html - literate
+                            IntermediateToken - (781:20,40 [1] PrefixedAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml) - CSharp - literate
+                        HtmlContent - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml) - Html - ?
+                    DefaultTagHelperExecute - 
+                HtmlContent - (795:20,54 [6] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (795:20,54 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (801:21,4 [60] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-value - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-value - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml) - string-prefix-thyme - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper1.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml) - Html - string
+                    DefaultTagHelperProperty - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml) - string-prefix-thyme - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml) - Html - string
+                    DefaultTagHelperExecute - 
+                HtmlContent - (861:21,64 [8] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (861:21,64 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (863:22,0 [6] PrefixedAttributeTagHelpers.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..240afcc5df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,80 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|"*, TestAssembly"|
+Generated Location: (731:14,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (37:2,2 [242] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|
+    var literate = "or illiterate";
+    var intDictionary = new Dictionary<string, int>
+    {
+        { "three", 3 },
+    };
+    var stringDictionary = new SortedDictionary<string, string>
+    {
+        { "name", "value" },
+    };
+|
+Generated Location: (1239:31,2 [242] )
+|
+    var literate = "or illiterate";
+    var intDictionary = new Dictionary<string, int>
+    {
+        { "three", 3 },
+    };
+    var stringDictionary = new SortedDictionary<string, string>
+    {
+        { "name", "value" },
+    };
+|
+
+Source Location: (370:15,43 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|intDictionary|
+Generated Location: (1920:49,56 [13] )
+|intDictionary|
+
+Source Location: (404:15,77 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|stringDictionary|
+Generated Location: (2310:57,77 [16] )
+|stringDictionary|
+
+Source Location: (468:16,43 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|intDictionary|
+Generated Location: (2898:67,56 [13] )
+|intDictionary|
+
+Source Location: (502:16,77 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|37|
+Generated Location: (3288:75,77 [2] )
+|37|
+
+Source Location: (526:16,101 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|42|
+Generated Location: (3711:83,101 [2] )
+|42|
+
+Source Location: (590:18,31 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|42|
+Generated Location: (4270:93,46 [2] )
+|42|
+
+Source Location: (611:18,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|37|
+Generated Location: (4637:101,64 [2] )
+|37|
+
+Source Location: (634:18,75 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|98|
+Generated Location: (5030:109,75 [2] )
+|98|
+
+Source Location: (783:20,42 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|literate|
+Generated Location: (5850:121,42 [8] )
+|literate|
+
+Source Location: (826:21,29 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
+|37|
+Generated Location: (6552:132,65 [2] )
+|37|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..08a94f8f44
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,282 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fc1a85ca24bc6ae7170b67e2d8371cede965879e"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"fc1a85ca24bc6ae7170b67e2d8371cede965879e", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("checkbox"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("password"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("radio"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("int-prefix-salt", new global::Microsoft.AspNetCore.Html.HtmlString("8"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("string-prefix-grabber", "string", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("string-prefix-paprika", "another string", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("string-prefix-thyme", "string", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.InputTagHelper1 __TestNamespace_InputTagHelper1;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+  
+    var literate = "or illiterate";
+    var intDictionary = new Dictionary<string, int>
+    {
+        { "three", 3 },
+    };
+    var stringDictionary = new SortedDictionary<string, string>
+    {
+        { "name", "value" },
+    };
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper1);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-dictionary", __TestNamespace_InputTagHelper1.IntDictionaryProperty, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty = __TestNamespace_InputTagHelper1.IntDictionaryProperty;
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.StringDictionaryProperty = stringDictionary;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("string-dictionary", __TestNamespace_InputTagHelper1.StringDictionaryProperty, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty = __TestNamespace_InputTagHelper1.StringDictionaryProperty;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper1);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-dictionary", __TestNamespace_InputTagHelper1.IntDictionaryProperty, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty = __TestNamespace_InputTagHelper1.IntDictionaryProperty;
+            if (__TestNamespace_InputTagHelper1.IntDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("int-prefix-garlic", "TestNamespace.InputTagHelper1", "IntDictionaryProperty"));
+            }
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty["garlic"] = 37;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-garlic", __TestNamespace_InputTagHelper1.IntDictionaryProperty["garlic"], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            if (__TestNamespace_InputTagHelper2.IntDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("int-prefix-garlic", "TestNamespace.InputTagHelper2", "IntDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["garlic"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["garlic"];
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntProperty = 42;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-grabber", __TestNamespace_InputTagHelper1.IntProperty, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper1);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntProperty = 42;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-grabber", __TestNamespace_InputTagHelper1.IntProperty, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            if (__TestNamespace_InputTagHelper2.IntDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("int-prefix-grabber", "TestNamespace.InputTagHelper2", "IntDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty;
+            if (__TestNamespace_InputTagHelper1.IntDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("int-prefix-salt", "TestNamespace.InputTagHelper1", "IntDictionaryProperty"));
+            }
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-salt", __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["salt"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"];
+#nullable restore
+#line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty["pepper"] = 98;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-pepper", __TestNamespace_InputTagHelper1.IntDictionaryProperty["pepper"], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["pepper"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["pepper"];
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            __TestNamespace_InputTagHelper1.StringProperty = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            if (__TestNamespace_InputTagHelper2.StringDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("string-prefix-grabber", "TestNamespace.InputTagHelper2", "StringDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["grabber"] = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            if (__TestNamespace_InputTagHelper1.StringDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("string-prefix-paprika", "TestNamespace.InputTagHelper1", "StringDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper1.StringDictionaryProperty["paprika"] = (string)__tagHelperAttribute_5.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_5);
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["paprika"] = (string)__tagHelperAttribute_5.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_5);
+            if (__TestNamespace_InputTagHelper1.StringDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("string-prefix-cumin", "TestNamespace.InputTagHelper1", "StringDictionaryProperty"));
+            }
+            BeginWriteTagHelperAttribute();
+            WriteLiteral("literate ");
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+                             WriteLiteral(literate);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("?");
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"] = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-cumin", __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            if (__TestNamespace_InputTagHelper2.StringDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("string-prefix-cumin", "TestNamespace.InputTagHelper2", "StringDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"];
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper1);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            if (__TestNamespace_InputTagHelper1.IntDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("int-prefix-value", "TestNamespace.InputTagHelper1", "IntDictionaryProperty"));
+            }
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
+__TestNamespace_InputTagHelper1.IntDictionaryProperty["value"] = 37;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-value", __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"], global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            if (__TestNamespace_InputTagHelper2.IntDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("int-prefix-value", "TestNamespace.InputTagHelper2", "IntDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper2.IntDictionaryProperty["value"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"];
+            if (__TestNamespace_InputTagHelper1.StringDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("string-prefix-thyme", "TestNamespace.InputTagHelper1", "StringDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"] = (string)__tagHelperAttribute_6.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_6);
+            if (__TestNamespace_InputTagHelper2.StringDictionaryProperty == null)
+            {
+                throw new InvalidOperationException(InvalidTagHelperIndexerAssignment("string-prefix-thyme", "TestNamespace.InputTagHelper2", "StringDictionaryProperty"));
+            }
+            __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"] = (string)__tagHelperAttribute_6.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_6);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..892245a292
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt
@@ -0,0 +1,117 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - password - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - type - radio - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - int-prefix-salt - 8 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_4 - string-prefix-grabber - string - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_5 - string-prefix-paprika - another string - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_6 - string-prefix-thyme - string - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper1 - __TestNamespace_InputTagHelper1
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (33:1,0 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n
+                CSharpCode - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - CSharp - \n    var literate = "or illiterate";\n    var intDictionary = new Dictionary<string, int>\n    {\n        { "three", 3 },\n    };\n    var stringDictionary = new SortedDictionary<string, string>\n    {\n        { "name", "value" },\n    };\n
+                HtmlContent - (282:13,0 [49] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (282:13,0 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (284:14,0 [4] PrefixedAttributeTagHelpers.cshtml) - Html - <div
+                    IntermediateToken - (288:14,4 [36] PrefixedAttributeTagHelpers.cshtml) - Html -  class="randomNonTagHelperAttribute"
+                    IntermediateToken - (324:14,40 [1] PrefixedAttributeTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (325:14,41 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (331:15,4 [92] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - string-dictionary - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper1.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - CSharp - stringDictionary
+                    DefaultTagHelperProperty - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - string-dictionary - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (404:15,77 [16] PrefixedAttributeTagHelpers.cshtml) - CSharp - stringDictionary
+                    DefaultTagHelperExecute - 
+                HtmlContent - (423:15,96 [6] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (423:15,96 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (429:16,4 [103] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperProperty - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - CSharp - intDictionary
+                    DefaultTagHelperProperty - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-garlic - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-garlic - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (502:16,77 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper1.IntProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperProperty - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (526:16,101 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperExecute - 
+                HtmlContent - (532:16,107 [6] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (532:16,107 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (538:17,4 [257] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperProperty - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper1.IntProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperProperty - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 42
+                    DefaultTagHelperProperty - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-salt - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-salt - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (611:18,52 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-pepper - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 98
+                    DefaultTagHelperProperty - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-pepper - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 98
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    PreallocatedTagHelperProperty - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - __tagHelperAttribute_4 - string-prefix-grabber - StringProperty
+                    PreallocatedTagHelperProperty - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - __tagHelperAttribute_4 - string-prefix-grabber - StringDictionaryProperty
+                    PreallocatedTagHelperProperty - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml) - __tagHelperAttribute_5 - string-prefix-paprika - StringDictionaryProperty
+                    PreallocatedTagHelperProperty - (724:19,65 [14] PrefixedAttributeTagHelpers.cshtml) - __tagHelperAttribute_5 - string-prefix-paprika - StringDictionaryProperty
+                    DefaultTagHelperProperty - (773:20,32 [19] PrefixedAttributeTagHelpers.cshtml) - string-prefix-cumin - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper1.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (773:20,32 [9] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (773:20,32 [8] PrefixedAttributeTagHelpers.cshtml) - Html - literate
+                            IntermediateToken - (781:20,40 [1] PrefixedAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml) - CSharp - literate
+                        HtmlContent - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml) - Html - ?
+                    DefaultTagHelperProperty - (773:20,32 [19] PrefixedAttributeTagHelpers.cshtml) - string-prefix-cumin - Namespace.DictionaryWithoutParameterlessConstructor<string, string> TestNamespace.InputTagHelper2.StringDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (773:20,32 [9] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (773:20,32 [8] PrefixedAttributeTagHelpers.cshtml) - Html - literate
+                            IntermediateToken - (781:20,40 [1] PrefixedAttributeTagHelpers.cshtml) - Html -  
+                        CSharpExpression - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (783:20,42 [8] PrefixedAttributeTagHelpers.cshtml) - CSharp - literate
+                        HtmlContent - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml)
+                            IntermediateToken - (791:20,50 [1] PrefixedAttributeTagHelpers.cshtml) - Html - ?
+                    DefaultTagHelperExecute - 
+                HtmlContent - (795:20,54 [6] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (795:20,54 [6] PrefixedAttributeTagHelpers.cshtml) - Html - \n    
+                TagHelper - (801:21,4 [60] PrefixedAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper1
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-value - System.Collections.Generic.IDictionary<string, int> TestNamespace.InputTagHelper1.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    DefaultTagHelperProperty - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-value - int TestNamespace.InputTagHelper2.IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (826:21,29 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 37
+                    PreallocatedTagHelperProperty - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml) - __tagHelperAttribute_6 - string-prefix-thyme - StringDictionaryProperty
+                    PreallocatedTagHelperProperty - (851:21,54 [6] PrefixedAttributeTagHelpers.cshtml) - __tagHelperAttribute_6 - string-prefix-thyme - StringDictionaryProperty
+                    DefaultTagHelperExecute - 
+                HtmlContent - (861:21,64 [8] PrefixedAttributeTagHelpers.cshtml)
+                    IntermediateToken - (861:21,64 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (863:22,0 [6] PrefixedAttributeTagHelpers.cshtml) - Html - </div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml
new file mode 100644
index 0000000000..1edd2fcc49
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml
@@ -0,0 +1,18 @@
+@*This is not going to be rendered*@
+<p>This should @* not *@ be shown</p>
+
+@{
+    @* throw new Exception("Oh no!") *@
+    Exception foo = @* new Exception("Oh no!") *@ null;
+    if(foo != null) {
+        throw foo;
+    }
+}
+
+@{ var bar = "@* bar *@"; }
+<p>But this should show the comment syntax: @bar</p>
+
+@(a@**@b)
+
+<input value="@*this razor comment is the actual value*@" type="text" />
+<input @*this razor comment will not be rendered*@ type="text" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d4fb4049ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+                                       
+    Exception foo = 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+                                                  null;
+    if(foo != null) {
+        throw foo;
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+   var bar = "@* bar *@"; 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+                                       __o = bar;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+__o = ab;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
new file mode 100644
index 0000000000..20961d3dc2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
@@ -0,0 +1,55 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (38:1,0 [15] RazorComments.cshtml)
+                    IntermediateToken - (38:1,0 [2] RazorComments.cshtml) - Html - <p
+                    IntermediateToken - (40:1,2 [1] RazorComments.cshtml) - Html - >
+                    IntermediateToken - (41:1,3 [12] RazorComments.cshtml) - Html - This should 
+                HtmlContent - (62:1,24 [17] RazorComments.cshtml)
+                    IntermediateToken - (62:1,24 [9] RazorComments.cshtml) - Html -  be shown
+                    IntermediateToken - (71:1,33 [4] RazorComments.cshtml) - Html - </p>
+                    IntermediateToken - (75:1,37 [4] RazorComments.cshtml) - Html - \n\n
+                CSharpCode - (81:3,2 [6] RazorComments.cshtml)
+                    IntermediateToken - (81:3,2 [6] RazorComments.cshtml) - CSharp - \n    
+                CSharpCode - (122:4,39 [22] RazorComments.cshtml)
+                    IntermediateToken - (122:4,39 [22] RazorComments.cshtml) - CSharp - \n    Exception foo = 
+                CSharpCode - (173:5,49 [58] RazorComments.cshtml)
+                    IntermediateToken - (173:5,49 [58] RazorComments.cshtml) - CSharp -  null;\n    if(foo != null) {\n        throw foo;\n    }\n
+                HtmlContent - (234:10,0 [2] RazorComments.cshtml)
+                    IntermediateToken - (234:10,0 [2] RazorComments.cshtml) - Html - \n
+                CSharpCode - (238:11,2 [24] RazorComments.cshtml)
+                    IntermediateToken - (238:11,2 [24] RazorComments.cshtml) - CSharp -  var bar = "@* bar *@"; 
+                HtmlContent - (265:12,0 [44] RazorComments.cshtml)
+                    IntermediateToken - (265:12,0 [2] RazorComments.cshtml) - Html - <p
+                    IntermediateToken - (267:12,2 [1] RazorComments.cshtml) - Html - >
+                    IntermediateToken - (268:12,3 [41] RazorComments.cshtml) - Html - But this should show the comment syntax: 
+                CSharpExpression - (310:12,45 [3] RazorComments.cshtml)
+                    IntermediateToken - (310:12,45 [3] RazorComments.cshtml) - CSharp - bar
+                HtmlContent - (313:12,48 [8] RazorComments.cshtml)
+                    IntermediateToken - (313:12,48 [4] RazorComments.cshtml) - Html - </p>
+                    IntermediateToken - (317:12,52 [4] RazorComments.cshtml) - Html - \n\n
+                CSharpExpression - (323:14,2 [2] RazorComments.cshtml)
+                    IntermediateToken - (323:14,2 [1] RazorComments.cshtml) - CSharp - a
+                    IntermediateToken - (328:14,7 [1] RazorComments.cshtml) - CSharp - b
+                HtmlContent - (330:14,9 [85] RazorComments.cshtml)
+                    IntermediateToken - (330:14,9 [4] RazorComments.cshtml) - Html - \n\n
+                    IntermediateToken - (334:16,0 [6] RazorComments.cshtml) - Html - <input
+                    IntermediateToken - (340:16,6 [51] RazorComments.cshtml) - Html -  value="@*this razor comment is the actual value*@"
+                    IntermediateToken - (391:16,57 [12] RazorComments.cshtml) - Html -  type="text"
+                    IntermediateToken - (403:16,69 [1] RazorComments.cshtml) - Html -  
+                    IntermediateToken - (404:16,70 [2] RazorComments.cshtml) - Html - />
+                    IntermediateToken - (406:16,72 [2] RazorComments.cshtml) - Html - \n
+                    IntermediateToken - (408:17,0 [6] RazorComments.cshtml) - Html - <input
+                    IntermediateToken - (414:17,6 [1] RazorComments.cshtml) - Html -  
+                HtmlContent - (458:17,50 [17] RazorComments.cshtml)
+                    IntermediateToken - (458:17,50 [13] RazorComments.cshtml) - Html -  type="text" 
+                    IntermediateToken - (471:17,63 [2] RazorComments.cshtml) - Html - />
+                    IntermediateToken - (473:17,65 [2] RazorComments.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt
new file mode 100644
index 0000000000..3ad7eb8bbd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.mappings.txt
@@ -0,0 +1,47 @@
+Source Location: (81:3,2 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+|
+    |
+Generated Location: (746:19,2 [6] )
+|
+    |
+
+Source Location: (122:4,39 [22] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+|
+    Exception foo = |
+Generated Location: (951:27,39 [22] )
+|
+    Exception foo = |
+
+Source Location: (173:5,49 [58] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+| null;
+    if(foo != null) {
+        throw foo;
+    }
+|
+Generated Location: (1182:35,49 [58] )
+| null;
+    if(foo != null) {
+        throw foo;
+    }
+|
+
+Source Location: (238:11,2 [24] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+| var bar = "@* bar *@"; |
+Generated Location: (1401:45,2 [24] )
+| var bar = "@* bar *@"; |
+
+Source Location: (310:12,45 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+|bar|
+Generated Location: (1631:52,45 [3] )
+|bar|
+
+Source Location: (323:14,2 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+|a|
+Generated Location: (1802:59,6 [1] )
+|a|
+
+Source Location: (328:14,7 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml)
+|b|
+Generated Location: (1803:59,7 [1] )
+|b|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
new file mode 100644
index 0000000000..b833277cf4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
@@ -0,0 +1,64 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4d553281e07fafc67ca0139b27ee95724a37f162"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4d553281e07fafc67ca0139b27ee95724a37f162", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<p>This should ");
+            WriteLiteral(" be shown</p>\r\n\r\n");
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+                                       
+    Exception foo = 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+                                                  null;
+    if(foo != null) {
+        throw foo;
+    }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+   var bar = "@* bar *@"; 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("<p>But this should show the comment syntax: ");
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+                                       Write(bar);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n\r\n");
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml"
+Write(ab);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n\r\n<input value=\"@*this razor comment is the actual value*@\" type=\"text\" />\r\n<input ");
+            WriteLiteral(" type=\"text\" />\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
new file mode 100644
index 0000000000..1229ef836f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
@@ -0,0 +1,50 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (38:1,0 [15] RazorComments.cshtml)
+                    IntermediateToken - (38:1,0 [2] RazorComments.cshtml) - Html - <p
+                    IntermediateToken - (40:1,2 [1] RazorComments.cshtml) - Html - >
+                    IntermediateToken - (41:1,3 [12] RazorComments.cshtml) - Html - This should 
+                HtmlContent - (62:1,24 [17] RazorComments.cshtml)
+                    IntermediateToken - (62:1,24 [9] RazorComments.cshtml) - Html -  be shown
+                    IntermediateToken - (71:1,33 [4] RazorComments.cshtml) - Html - </p>
+                    IntermediateToken - (75:1,37 [4] RazorComments.cshtml) - Html - \n\n
+                CSharpCode - (81:3,2 [6] RazorComments.cshtml)
+                    IntermediateToken - (81:3,2 [6] RazorComments.cshtml) - CSharp - \n    
+                CSharpCode - (122:4,39 [22] RazorComments.cshtml)
+                    IntermediateToken - (122:4,39 [22] RazorComments.cshtml) - CSharp - \n    Exception foo = 
+                CSharpCode - (173:5,49 [58] RazorComments.cshtml)
+                    IntermediateToken - (173:5,49 [58] RazorComments.cshtml) - CSharp -  null;\n    if(foo != null) {\n        throw foo;\n    }\n
+                HtmlContent - (234:10,0 [2] RazorComments.cshtml)
+                    IntermediateToken - (234:10,0 [2] RazorComments.cshtml) - Html - \n
+                CSharpCode - (238:11,2 [24] RazorComments.cshtml)
+                    IntermediateToken - (238:11,2 [24] RazorComments.cshtml) - CSharp -  var bar = "@* bar *@"; 
+                HtmlContent - (265:12,0 [44] RazorComments.cshtml)
+                    IntermediateToken - (265:12,0 [2] RazorComments.cshtml) - Html - <p
+                    IntermediateToken - (267:12,2 [1] RazorComments.cshtml) - Html - >
+                    IntermediateToken - (268:12,3 [41] RazorComments.cshtml) - Html - But this should show the comment syntax: 
+                CSharpExpression - (310:12,45 [3] RazorComments.cshtml)
+                    IntermediateToken - (310:12,45 [3] RazorComments.cshtml) - CSharp - bar
+                HtmlContent - (313:12,48 [8] RazorComments.cshtml)
+                    IntermediateToken - (313:12,48 [4] RazorComments.cshtml) - Html - </p>
+                    IntermediateToken - (317:12,52 [4] RazorComments.cshtml) - Html - \n\n
+                CSharpExpression - (323:14,2 [2] RazorComments.cshtml)
+                    IntermediateToken - (323:14,2 [1] RazorComments.cshtml) - CSharp - a
+                    IntermediateToken - (328:14,7 [1] RazorComments.cshtml) - CSharp - b
+                HtmlContent - (330:14,9 [85] RazorComments.cshtml)
+                    IntermediateToken - (330:14,9 [4] RazorComments.cshtml) - Html - \n\n
+                    IntermediateToken - (334:16,0 [6] RazorComments.cshtml) - Html - <input
+                    IntermediateToken - (340:16,6 [51] RazorComments.cshtml) - Html -  value="@*this razor comment is the actual value*@"
+                    IntermediateToken - (391:16,57 [12] RazorComments.cshtml) - Html -  type="text"
+                    IntermediateToken - (403:16,69 [1] RazorComments.cshtml) - Html -  
+                    IntermediateToken - (404:16,70 [2] RazorComments.cshtml) - Html - />
+                    IntermediateToken - (406:16,72 [2] RazorComments.cshtml) - Html - \n
+                    IntermediateToken - (408:17,0 [6] RazorComments.cshtml) - Html - <input
+                    IntermediateToken - (414:17,6 [1] RazorComments.cshtml) - Html -  
+                HtmlContent - (458:17,50 [17] RazorComments.cshtml)
+                    IntermediateToken - (458:17,50 [13] RazorComments.cshtml) - Html -  type="text" 
+                    IntermediateToken - (471:17,63 [2] RazorComments.cshtml) - Html - />
+                    IntermediateToken - (473:17,65 [2] RazorComments.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml
new file mode 100644
index 0000000000..a8cd525a3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml
@@ -0,0 +1 @@
+@removeTagHelper *, TestAssembly
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..8a96ffc840
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RemoveTagHelperDirective_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..8a37436277
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt
@@ -0,0 +1,14 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RemoveTagHelperDirective_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (17:0,17 [15] RemoveTagHelperDirective.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (32:0,32 [2] RemoveTagHelperDirective.cshtml)
+                    IntermediateToken - (32:0,32 [2] RemoveTagHelperDirective.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..a607226eb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (17:0,17 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml)
+|*, TestAssembly|
+Generated Location: (550:12,38 [15] )
+|*, TestAssembly|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
new file mode 100644
index 0000000000..952461002f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
@@ -0,0 +1,17 @@
+@{
+    Layout = "_SectionTestLayout.cshtml"
+}
+
+<div>This is in the Body>
+
+@section Section2 {
+    <div class="some @thing">This is in Section 2</div>
+}
+
+@section Section1 {
+    <div>This is in Section 1</div>
+}
+
+@section NestedDelegates {
+    @{ Func<dynamic, object> f = @<span>@item</span>; }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
new file mode 100644
index 0000000000..4a9f436896
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -0,0 +1,100 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object Section2 = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object Section1 = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object NestedDelegates = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+  
+    Layout = "_SectionTestLayout.cshtml"
+
+#line default
+#line hidden
+#nullable disable
+            DefineSection("Section2", async(__razor_section_writer) => {
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+                __o = thing;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            DefineSection("Section1", async(__razor_section_writer) => {
+            }
+            );
+            DefineSection("NestedDelegates", async(__razor_section_writer) => {
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+       Func<dynamic, object> f = 
+
+#line default
+#line hidden
+#nullable disable
+                item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+                                   __o = item;
+
+#line default
+#line hidden
+#nullable disable
+                }
+                )
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+                                                    ; 
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
new file mode 100644
index 0000000000..13ef74e9ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -0,0 +1,62 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (89:6,9 [8] Sections.cshtml) - Section2
+                DirectiveToken - (172:10,9 [8] Sections.cshtml) - Section1
+                DirectiveToken - (235:14,9 [15] Sections.cshtml) - NestedDelegates
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [44] Sections.cshtml)
+                    IntermediateToken - (2:0,2 [44] Sections.cshtml) - CSharp - \n    Layout = "_SectionTestLayout.cshtml"\n
+                HtmlContent - (49:3,0 [31] Sections.cshtml)
+                    IntermediateToken - (49:3,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (51:4,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (55:4,4 [1] Sections.cshtml) - Html - >
+                    IntermediateToken - (56:4,5 [24] Sections.cshtml) - Html - This is in the Body>\n\n
+                Section -  - Section2
+                    HtmlContent - (99:6,19 [10] Sections.cshtml)
+                        IntermediateToken - (99:6,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (105:7,4 [4] Sections.cshtml) - Html - <div
+                    HtmlAttribute - (109:7,8 [20] Sections.cshtml) -  class=" - "
+                        HtmlAttributeValue - (117:7,16 [4] Sections.cshtml) - 
+                            IntermediateToken - (117:7,16 [4] Sections.cshtml) - Html - some
+                        CSharpExpressionAttributeValue - (121:7,20 [7] Sections.cshtml) -  
+                            IntermediateToken - (123:7,22 [5] Sections.cshtml) - CSharp - thing
+                    HtmlContent - (129:7,28 [29] Sections.cshtml)
+                        IntermediateToken - (129:7,28 [1] Sections.cshtml) - Html - >
+                        IntermediateToken - (130:7,29 [20] Sections.cshtml) - Html - This is in Section 2
+                        IntermediateToken - (150:7,49 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (156:7,55 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (159:8,1 [4] Sections.cshtml)
+                    IntermediateToken - (159:8,1 [4] Sections.cshtml) - Html - \n\n
+                Section -  - Section1
+                    HtmlContent - (182:10,19 [39] Sections.cshtml)
+                        IntermediateToken - (182:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (188:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (192:11,8 [1] Sections.cshtml) - Html - >
+                        IntermediateToken - (193:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (213:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (219:11,35 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (222:12,1 [4] Sections.cshtml)
+                    IntermediateToken - (222:12,1 [4] Sections.cshtml) - Html - \n\n
+                Section -  - NestedDelegates
+                    HtmlContent - (252:14,26 [6] Sections.cshtml)
+                        IntermediateToken - (252:14,26 [6] Sections.cshtml) - Html - \n    
+                    CSharpCode - (260:15,6 [27] Sections.cshtml)
+                        IntermediateToken - (260:15,6 [27] Sections.cshtml) - CSharp -  Func<dynamic, object> f = 
+                    Template - (288:15,34 [17] Sections.cshtml)
+                        HtmlContent - (288:15,34 [6] Sections.cshtml)
+                            IntermediateToken - (288:15,34 [5] Sections.cshtml) - Html - <span
+                            IntermediateToken - (293:15,39 [1] Sections.cshtml) - Html - >
+                        CSharpExpression - (295:15,41 [4] Sections.cshtml)
+                            IntermediateToken - (295:15,41 [4] Sections.cshtml) - CSharp - item
+                        HtmlContent - (299:15,45 [7] Sections.cshtml)
+                            IntermediateToken - (299:15,45 [7] Sections.cshtml) - Html - </span>
+                    CSharpCode - (306:15,52 [2] Sections.cshtml)
+                        IntermediateToken - (306:15,52 [2] Sections.cshtml) - CSharp - ; 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
new file mode 100644
index 0000000000..fe0db2092f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -0,0 +1,44 @@
+Source Location: (89:6,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Section2|
+Generated Location: (502:12,22 [8] )
+|Section2|
+
+Source Location: (172:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Section1|
+Generated Location: (756:22,22 [8] )
+|Section1|
+
+Source Location: (235:14,9 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|NestedDelegates|
+Generated Location: (1010:32,22 [15] )
+|NestedDelegates|
+
+Source Location: (2:0,2 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|
+    Layout = "_SectionTestLayout.cshtml"
+|
+Generated Location: (1504:49,2 [44] )
+|
+    Layout = "_SectionTestLayout.cshtml"
+|
+
+Source Location: (123:7,22 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|thing|
+Generated Location: (1797:58,22 [5] )
+|thing|
+
+Source Location: (260:15,6 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+| Func<dynamic, object> f = |
+Generated Location: (2182:71,6 [27] )
+| Func<dynamic, object> f = |
+
+Source Location: (295:15,41 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|item|
+Generated Location: (2480:79,41 [4] )
+|item|
+
+Source Location: (306:15,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|; |
+Generated Location: (2731:88,52 [2] )
+|; |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
new file mode 100644
index 0000000000..f73b2141c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -0,0 +1,80 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2c1cd9bdf77c65fcccd7f5b86be5746c1381be0e"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2c1cd9bdf77c65fcccd7f5b86be5746c1381be0e", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+  
+    Layout = "_SectionTestLayout.cshtml"
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n<div>This is in the Body>\r\n\r\n");
+            DefineSection("Section2", async() => {
+                WriteLiteral("\r\n    <div");
+                BeginWriteAttribute("class", " class=\"", 109, "\"", 128, 2);
+                WriteAttributeValue("", 117, "some", 117, 4, true);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+WriteAttributeValue(" ", 121, thing, 122, 6, false);
+
+#line default
+#line hidden
+#nullable disable
+                EndWriteAttribute();
+                WriteLiteral(">This is in Section 2</div>\r\n");
+            }
+            );
+            WriteLiteral("\r\n");
+            DefineSection("Section1", async() => {
+                WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n");
+            }
+            );
+            WriteLiteral("\r\n");
+            DefineSection("NestedDelegates", async() => {
+                WriteLiteral("\r\n");
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+       Func<dynamic, object> f = 
+
+#line default
+#line hidden
+#nullable disable
+                item => new Template(async(__razor_template_writer) => {
+                    PushWriter(__razor_template_writer);
+                    WriteLiteral("<span>");
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+                                   Write(item);
+
+#line default
+#line hidden
+#nullable disable
+                    WriteLiteral("</span>");
+                    PopWriter();
+                }
+                )
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+                                                    ; 
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
new file mode 100644
index 0000000000..94f5bec0b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -0,0 +1,56 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [44] Sections.cshtml)
+                    IntermediateToken - (2:0,2 [44] Sections.cshtml) - CSharp - \n    Layout = "_SectionTestLayout.cshtml"\n
+                HtmlContent - (49:3,0 [31] Sections.cshtml)
+                    IntermediateToken - (49:3,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (51:4,0 [4] Sections.cshtml) - Html - <div
+                    IntermediateToken - (55:4,4 [1] Sections.cshtml) - Html - >
+                    IntermediateToken - (56:4,5 [24] Sections.cshtml) - Html - This is in the Body>\n\n
+                Section -  - Section2
+                    HtmlContent - (99:6,19 [10] Sections.cshtml)
+                        IntermediateToken - (99:6,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (105:7,4 [4] Sections.cshtml) - Html - <div
+                    HtmlAttribute - (109:7,8 [20] Sections.cshtml) -  class=" - "
+                        HtmlAttributeValue - (117:7,16 [4] Sections.cshtml) - 
+                            IntermediateToken - (117:7,16 [4] Sections.cshtml) - Html - some
+                        CSharpExpressionAttributeValue - (121:7,20 [7] Sections.cshtml) -  
+                            IntermediateToken - (123:7,22 [5] Sections.cshtml) - CSharp - thing
+                    HtmlContent - (129:7,28 [29] Sections.cshtml)
+                        IntermediateToken - (129:7,28 [1] Sections.cshtml) - Html - >
+                        IntermediateToken - (130:7,29 [20] Sections.cshtml) - Html - This is in Section 2
+                        IntermediateToken - (150:7,49 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (156:7,55 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (161:9,0 [2] Sections.cshtml)
+                    IntermediateToken - (161:9,0 [2] Sections.cshtml) - Html - \n
+                Section -  - Section1
+                    HtmlContent - (182:10,19 [39] Sections.cshtml)
+                        IntermediateToken - (182:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (188:11,4 [4] Sections.cshtml) - Html - <div
+                        IntermediateToken - (192:11,8 [1] Sections.cshtml) - Html - >
+                        IntermediateToken - (193:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (213:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (219:11,35 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (224:13,0 [2] Sections.cshtml)
+                    IntermediateToken - (224:13,0 [2] Sections.cshtml) - Html - \n
+                Section -  - NestedDelegates
+                    HtmlContent - (252:14,26 [2] Sections.cshtml)
+                        IntermediateToken - (252:14,26 [2] Sections.cshtml) - Html - \n
+                    CSharpCode - (254:15,0 [4] Sections.cshtml)
+                        IntermediateToken - (254:15,0 [4] Sections.cshtml) - CSharp -     
+                    CSharpCode - (260:15,6 [27] Sections.cshtml)
+                        IntermediateToken - (260:15,6 [27] Sections.cshtml) - CSharp -  Func<dynamic, object> f = 
+                    Template - (288:15,34 [17] Sections.cshtml)
+                        HtmlContent - (288:15,34 [6] Sections.cshtml)
+                            IntermediateToken - (288:15,34 [5] Sections.cshtml) - Html - <span
+                            IntermediateToken - (293:15,39 [1] Sections.cshtml) - Html - >
+                        CSharpExpression - (295:15,41 [4] Sections.cshtml)
+                            IntermediateToken - (295:15,41 [4] Sections.cshtml) - CSharp - item
+                        HtmlContent - (299:15,45 [7] Sections.cshtml)
+                            IntermediateToken - (299:15,45 [7] Sections.cshtml) - Html - </span>
+                    CSharpCode - (306:15,52 [2] Sections.cshtml)
+                        IntermediateToken - (306:15,52 [2] Sections.cshtml) - CSharp - ; 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml
new file mode 100644
index 0000000000..bd4ce8107a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml
@@ -0,0 +1,5 @@
+@addTagHelper *, TestAssembly
+<p>Hola</p>
+<form>
+    <input value='Hello' type='text' />
+</form>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1ad3a7830d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_DesignTime
+    {
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __InputTagHelper.FooProp = "Hello";
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt
new file mode 100644
index 0000000000..061f7507f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] SimpleTagHelpers.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [27] SimpleTagHelpers.cshtml)
+                    IntermediateToken - (29:0,29 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (31:1,0 [2] SimpleTagHelpers.cshtml) - Html - <p
+                    IntermediateToken - (33:1,2 [1] SimpleTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (34:1,3 [4] SimpleTagHelpers.cshtml) - Html - Hola
+                    IntermediateToken - (38:1,7 [4] SimpleTagHelpers.cshtml) - Html - </p>
+                    IntermediateToken - (42:1,11 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (44:2,0 [5] SimpleTagHelpers.cshtml) - Html - <form
+                    IntermediateToken - (49:2,5 [1] SimpleTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (50:2,6 [6] SimpleTagHelpers.cshtml) - Html - \n    
+                TagHelper - (56:3,4 [35] SimpleTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (70:3,18 [5] SimpleTagHelpers.cshtml) - value - string InputTagHelper.FooProp - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (70:3,18 [5] SimpleTagHelpers.cshtml)
+                            IntermediateToken - (70:3,18 [5] SimpleTagHelpers.cshtml) - Html - Hello
+                    DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (83:3,31 [4] SimpleTagHelpers.cshtml)
+                            IntermediateToken - (83:3,31 [4] SimpleTagHelpers.cshtml) - Html - text
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:3,39 [9] SimpleTagHelpers.cshtml)
+                    IntermediateToken - (91:3,39 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (93:4,0 [7] SimpleTagHelpers.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9593c67dea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml)
+|*, TestAssembly|
+Generated Location: (592:13,38 [15] )
+|*, TestAssembly|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs
new file mode 100644
index 0000000000..4d5cd87159
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs
@@ -0,0 +1,56 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e2cfd373c979f0844c2fd0ff78d289027202a932"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"e2cfd373c979f0844c2fd0ff78d289027202a932", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", "Hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<p>Hola</p>\r\n<form>\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTagHelper);
+            __InputTagHelper.FooProp = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</form>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt
new file mode 100644
index 0000000000..ac2e930b2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [25] SimpleTagHelpers.cshtml)
+                    IntermediateToken - (31:1,0 [2] SimpleTagHelpers.cshtml) - Html - <p
+                    IntermediateToken - (33:1,2 [1] SimpleTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (34:1,3 [4] SimpleTagHelpers.cshtml) - Html - Hola
+                    IntermediateToken - (38:1,7 [4] SimpleTagHelpers.cshtml) - Html - </p>
+                    IntermediateToken - (42:1,11 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (44:2,0 [5] SimpleTagHelpers.cshtml) - Html - <form
+                    IntermediateToken - (49:2,5 [1] SimpleTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (50:2,6 [6] SimpleTagHelpers.cshtml) - Html - \n    
+                TagHelper - (56:3,4 [35] SimpleTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    PreallocatedTagHelperProperty - (70:3,18 [5] SimpleTagHelpers.cshtml) - __tagHelperAttribute_0 - value - FooProp
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:3,39 [9] SimpleTagHelpers.cshtml)
+                    IntermediateToken - (91:3,39 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (93:4,0 [7] SimpleTagHelpers.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml
new file mode 100644
index 0000000000..27f2750eb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml
@@ -0,0 +1,4 @@
+@if (true)
+{
+	<div></div>
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs
new file mode 100644
index 0000000000..6f0947cdd6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml"
+ if (true)
+{
+	
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml"
+               
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt
new file mode 100644
index 0000000000..597e0809e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (1:0,1 [15] SimpleUnspacedIf.cshtml)
+                    IntermediateToken - (1:0,1 [15] SimpleUnspacedIf.cshtml) - CSharp - if (true)\n{\n	
+                HtmlContent - (16:2,1 [11] SimpleUnspacedIf.cshtml)
+                    IntermediateToken - (16:2,1 [4] SimpleUnspacedIf.cshtml) - Html - <div
+                    IntermediateToken - (20:2,5 [1] SimpleUnspacedIf.cshtml) - Html - >
+                    IntermediateToken - (21:2,6 [6] SimpleUnspacedIf.cshtml) - Html - </div>
+                CSharpCode - (27:2,12 [3] SimpleUnspacedIf.cshtml)
+                    IntermediateToken - (27:2,12 [3] SimpleUnspacedIf.cshtml) - CSharp - \n}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b49f243de1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (1:0,1 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml)
+|if (true)
+{
+	|
+Generated Location: (751:19,1 [15] )
+|if (true)
+{
+	|
+
+Source Location: (27:2,12 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml)
+|
+}|
+Generated Location: (944:28,15 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs
new file mode 100644
index 0000000000..d9a4109355
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs
@@ -0,0 +1,34 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57877348e222dad68a66bed082fa64c96f925772"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"57877348e222dad68a66bed082fa64c96f925772", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml"
+ if (true)
+{
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\t<div></div>\r\n");
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt
new file mode 100644
index 0000000000..ad4a325577
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (1:0,1 [14] SimpleUnspacedIf.cshtml)
+                    IntermediateToken - (1:0,1 [14] SimpleUnspacedIf.cshtml) - CSharp - if (true)\n{\n
+                HtmlContent - (15:2,0 [14] SimpleUnspacedIf.cshtml)
+                    IntermediateToken - (15:2,0 [1] SimpleUnspacedIf.cshtml) - Html - 	
+                    IntermediateToken - (16:2,1 [4] SimpleUnspacedIf.cshtml) - Html - <div
+                    IntermediateToken - (20:2,5 [1] SimpleUnspacedIf.cshtml) - Html - >
+                    IntermediateToken - (21:2,6 [6] SimpleUnspacedIf.cshtml) - Html - </div>
+                    IntermediateToken - (27:2,12 [2] SimpleUnspacedIf.cshtml) - Html - \n
+                CSharpCode - (29:3,0 [1] SimpleUnspacedIf.cshtml)
+                    IntermediateToken - (29:3,0 [1] SimpleUnspacedIf.cshtml) - CSharp - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml
new file mode 100644
index 0000000000..6e12a5f3bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml
@@ -0,0 +1,3 @@
+@addTagHelper "*, TestAssembly"
+
+<p class="Hello World" age="1337">Body of Tag</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml
new file mode 100644
index 0000000000..b5c2eddf1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml
@@ -0,0 +1,4 @@
+@addTagHelper "*, TestAssembly"
+
+<p
+   class="Hello World" age="1337">Body of Tag</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..0935d3a6e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..caa51dd43d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+                    IntermediateToken - (31:0,31 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [53] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (73:3,34 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+                            IntermediateToken - (73:3,34 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (49:3,10 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+                            IntermediateToken - (49:3,10 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - Hello World
+                    DefaultTagHelperProperty - (67:3,28 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (67:3,28 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - CSharp - 1337
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..10a7afd1c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+|"*, TestAssembly"|
+Generated Location: (663:13,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (67:3,28 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+|1337|
+Generated Location: (1312:31,33 [4] )
+|1337|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..2a91ccf643
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs
@@ -0,0 +1,61 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "00f665efb7bd154c43f2bd30d287b9ed9fa2ffdd"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"00f665efb7bd154c43f2bd30d287b9ed9fa2ffdd", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Body of Tag");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..fb67e469d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+                    IntermediateToken - (33:1,0 [2] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - \n
+                TagHelper - (35:2,0 [53] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (73:3,34 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml)
+                            IntermediateToken - (73:3,34 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (67:3,28 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (67:3,28 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - CSharp - 1337
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2217a4f90f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..4749a67bfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] SingleTagHelper.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] SingleTagHelper.cshtml)
+                    IntermediateToken - (31:0,31 [4] SingleTagHelper.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [49] SingleTagHelper.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (69:2,34 [11] SingleTagHelper.cshtml)
+                            IntermediateToken - (69:2,34 [11] SingleTagHelper.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (45:2,10 [11] SingleTagHelper.cshtml)
+                            IntermediateToken - (45:2,10 [11] SingleTagHelper.cshtml) - Html - Hello World
+                    DefaultTagHelperProperty - (63:2,28 [4] SingleTagHelper.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (63:2,28 [4] SingleTagHelper.cshtml) - CSharp - 1337
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..4fc0cd4c8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml)
+|"*, TestAssembly"|
+Generated Location: (609:13,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (63:2,28 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml)
+|1337|
+Generated Location: (1231:31,33 [4] )
+|1337|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..ac037abbb1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs
@@ -0,0 +1,61 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8cdee08b4e2681f8524ae09a405f163fd96d1ed8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8cdee08b4e2681f8524ae09a405f163fd96d1ed8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Body of Tag");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..89ef050a2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] SingleTagHelper.cshtml)
+                    IntermediateToken - (33:1,0 [2] SingleTagHelper.cshtml) - Html - \n
+                TagHelper - (35:2,0 [49] SingleTagHelper.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (69:2,34 [11] SingleTagHelper.cshtml)
+                            IntermediateToken - (69:2,34 [11] SingleTagHelper.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (63:2,28 [4] SingleTagHelper.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (63:2,28 [4] SingleTagHelper.cshtml) - CSharp - 1337
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml
new file mode 100644
index 0000000000..19d498abfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml
@@ -0,0 +1,237 @@
+<p>This is line 1</p>
+<p>This is line 2</p>
+<p>This is line 3</p>
+<p>This is line 4</p>
+<p>This is line 5</p>
+<p>This is line 6</p>
+<p>This is line 7</p>
+<p>This is line 8</p>
+<p>This is line 9</p>
+<p>This is line 10</p>
+<p>This is line 11</p>
+<p>This is line 12</p>
+<p>This is line 13</p>
+<p>This is line 14</p>
+<p>This is line 15</p>
+<p>This is line 16</p>
+<p>This is line 17</p>
+<p>This is line 18</p>
+<p>This is line 19</p>
+<p>This is line 20</p>
+<p>This is line 21</p>
+<p>This is line 22</p>
+<p>This is line 23</p>
+<p>This is line 24</p>
+<p>This is line 25</p>
+<p>This is line 26</p>
+<p>This is line 27</p>
+<p>This is line 28</p>
+<p>This is line 29</p>
+<p>This is line 30</p>
+<p>This is line 31</p>
+<p>This is line 32</p>
+<p>This is line 33</p>
+<p>This is line 34</p>
+<p>This is line 35</p>
+<p>This is line 36</p>
+<p>This is line 37</p>
+<p>This is line 38</p>
+<p>This is line 39</p>
+<p>This is line 40</p>
+<p>This is line 41</p>
+<p>This is line 42</p>
+<p>This is line 43</p>
+<p>This is line 44</p>
+<p>This is line 45</p>
+<p>This is line 46</p>
+<p>This is line 47</p>
+<p>This is line 48</p>
+<p>This is line 49</p>
+<p>This is line 50</p>
+<p>This is line 51</p>
+<p>This is line 52</p>
+<p>This is line 53</p>
+<p>This is line 54</p>
+<p>This is line 55</p>
+<p>This is line 56</p>
+<p>This is line 57</p>
+<p>This is line 58</p>
+<p>This is line 59</p>
+<p>This is line 60</p>
+<p>This is line 61</p>
+<p>This is line 62</p>
+<p>This is line 63</p>
+<p>This is line 64</p>
+<p>This is line 65</p>
+<p>This is line 66</p>
+<p>This is line 67</p>
+<p>This is line 68</p>
+<p>This is line 69</p>
+<p>This is line 70</p>
+<p>This is line 71</p>
+<p>This is line 72</p>
+<p>This is line 73</p>
+<p>This is line 74</p>
+<p>This is line 75</p>
+<p>This is line 76</p>
+<p>This is line 77</p>
+<p>This is line 78</p>
+<p>This is line 79</p>
+<p>This is line 80</p>
+<p>This is line 81</p>
+<p>This is line 82</p>
+<p>This is line 83</p>
+<p>This is line 84</p><br>
+
+@section WriteLiteralsToInHere {
+    <p>This is line 1 nested</p>
+    <p>This is line 2 nested</p>
+    <p>This is line 3 nested</p>
+    <p>This is line 4 nested</p>
+    <p>This is line 5 nested</p>
+    <p>This is line 6 nested</p>
+    <p>This is line 7 nested</p>
+    <p>This is line 8 nested</p>
+    <p>This is line 9 nested</p>
+    <p>This is line 10 nested</p>
+    <p>This is line 11 nested</p>
+    <p>This is line 12 nested</p>
+    <p>This is line 13 nested</p>
+    <p>This is line 14 nested</p>
+    <p>This is line 15 nested</p>
+    <p>This is line 16 nested</p>
+    <p>This is line 17 nested</p>
+    <p>This is line 18 nested</p>
+    <p>This is line 19 nested</p>
+    <p>This is line 20 nested</p>
+    <p>This is line 21 nested</p>
+    <p>This is line 22 nested</p>
+    <p>This is line 23 nested</p>
+    <p>This is line 24 nested</p>
+    <p>This is line 25 nested</p>
+    <p>This is line 26 nested</p>
+    <p>This is line 27 nested</p>
+    <p>This is line 28 nested</p>
+    <p>This is line 29 nested</p>
+    <p>This is line 30 nested</p>
+    <p>This is line 31 nested</p>
+    <p>This is line 32 nested</p>
+    <p>This is line 33 nested</p>
+    <p>This is line 34 nested</p>
+    <p>This is line 35 nested</p>
+    <p>This is line 36 nested</p>
+    <p>This is line 37 nested</p>
+    <p>This is line 38 nested</p>
+    <p>This is line 39 nested</p>
+    <p>This is line 40 nested</p>
+    <p>This is line 41 nested</p>
+    <p>This is line 42 nested</p>
+    <p>This is line 43 nested</p>
+    <p>This is line 44 nested</p>
+    <p>This is line 45 nested</p>
+    <p>This is line 46 nested</p>
+    <p>This is line 47 nested</p>
+    <p>This is line 48 nested</p>
+    <p>This is line 49 nested</p>
+    <p>This is line 50 nested</p>
+    <p>This is line 51 nested</p>
+    <p>This is line 52 nested</p>
+    <p>This is line 53 nested</p>
+    <p>This is line 54 nested</p>
+    <p>This is line 55 nested</p>
+    <p>This is line 56 nested</p>
+    <p>This is line 57 nested</p>
+    <p>This is line 58 nested</p>
+    <p>This is line 59 nested</p>
+    <p>This is line 60 nested</p>
+    <p>This is line 61 nested</p>
+    <p>This is line 62 nested</p>
+    <p>This is line 63 nested</p>
+    <p>This is line 64 nested</p>
+    <p>This is line 65 nested</p>
+    <p>This is line 66 nested</p>
+    <p>This is line 67 nested</p>
+    <p>This is line 68 nested</p>
+    <p>This is line 69 nested</p>
+    <p>This is line 70 nested</p>
+    <p>This is line 71 nested</p>
+    <p>This is line 72 nested</p>
+    <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>
+<p>This is line 4</p>
+<p>This is line 5</p>
+<p>This is line 6</p>
+<p>This is line 7</p>
+<p>This is line 8</p>
+<p>This is line 9</p>
+<p>This is line 10</p>
+<p>This is line 11</p>
+<p>This is line 12</p>
+<p>This is line 13</p>
+<p>This is line 14</p>
+<p>This is line 15</p>
+<p>This is line 16</p>
+<p>This is line 17</p>
+<p>This is line 18</p>
+<p>This is line 19</p>
+<p>This is line 20</p>
+<p>This is line 21</p>
+<p>This is line 22</p>
+<p>This is line 23</p>
+<p>This is line 24</p>
+<p>This is line 25</p>
+<p>This is line 26</p>
+<p>This is line 27</p>
+<p>This is line 28</p>
+<p>This is line 29</p>
+<p>This is line 30</p>
+<p>This is line 31</p>
+<p>This is line 32</p>
+<p>This is line 33</p>
+<p>This is line 34</p>
+<p>This is line 35</p>
+<p>This is line 36</p>
+<p>This is line 37</p>
+<p>This is line 38</p>
+<p>This is line 39</p>
+<p>This is line 40</p>
+<p>This is line 41</p>
+<p>This is line 42</p>
+<p>This is line 43</p>hi!
+@section WriteLiteralsToInHereAlso {
+    <p>This is line 1 nested</p>
+    <p>This is line 2 nested</p>
+    <p>This is line 3 nested</p>
+    <p>This is line 4 nested</p>
+    <p>This is line 5 nested</p>
+    <p>This is line 6 nested</p>
+    <p>This is line 7 nested</p>
+    <p>This is line 8 nested</p>
+    <p>This is line 9 nested</p>
+    <p>This is line 10 nested</p>
+    <p>This is line 11 nested</p>
+    <p>This is line 12 nested</p>
+    <p>This is line 13 nested</p>
+    <p>This is line 14 nested</p>
+    <p>This is line 15 nested</p>
+    <p>This is line 16 nested</p>
+    <p>This is line 17 nested</p>
+    <p>This is line 18 nested</p>
+    <p>This is line 19 nested</p>
+    <p>This is line 20 nested</p>
+    <p>This is line 21 nested</p>
+    <p>This is line 22 nested</p>
+    <p>This is line 23 nested</p>
+    <p>This is line 24 nested</p>
+    <p>This is line 25 nested</p>
+    <p>This is line 26 nested</p>
+    <p>This is line 27 nested</p>
+    <p>This is line 28 nested</p>
+    <p>This is line 29 nested</p>
+    <p>30</p>
+}!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
new file mode 100644
index 0000000000..27ab1b0a1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 86 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml"
+global::System.Object WriteLiteralsToInHere = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 206 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml"
+global::System.Object WriteLiteralsToInHereAlso = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            DefineSection("WriteLiteralsToInHere", async(__razor_section_writer) => {
+            }
+            );
+            DefineSection("WriteLiteralsToInHereAlso", async(__razor_section_writer) => {
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt
new file mode 100644
index 0000000000..0c6dbeca8d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt
@@ -0,0 +1,1186 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (2022:85,9 [21] StringLiterals.cshtml) - WriteLiteralsToInHere
+                DirectiveToken - (5701:205,9 [25] StringLiterals.cshtml) - WriteLiteralsToInHereAlso
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [2013] StringLiterals.cshtml)
+                    IntermediateToken - (0:0,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (2:0,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (3:0,3 [14] StringLiterals.cshtml) - Html - This is line 1
+                    IntermediateToken - (17:0,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (21:0,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (23:1,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (25:1,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (26:1,3 [14] StringLiterals.cshtml) - Html - This is line 2
+                    IntermediateToken - (40:1,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (44:1,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (46:2,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (48:2,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (49:2,3 [14] StringLiterals.cshtml) - Html - This is line 3
+                    IntermediateToken - (63:2,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (67:2,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (69:3,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (71:3,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (72:3,3 [14] StringLiterals.cshtml) - Html - This is line 4
+                    IntermediateToken - (86:3,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (90:3,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (92:4,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (94:4,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (95:4,3 [14] StringLiterals.cshtml) - Html - This is line 5
+                    IntermediateToken - (109:4,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (113:4,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (115:5,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (117:5,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (118:5,3 [14] StringLiterals.cshtml) - Html - This is line 6
+                    IntermediateToken - (132:5,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (136:5,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (138:6,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (140:6,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (141:6,3 [14] StringLiterals.cshtml) - Html - This is line 7
+                    IntermediateToken - (155:6,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (159:6,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (161:7,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (163:7,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (164:7,3 [14] StringLiterals.cshtml) - Html - This is line 8
+                    IntermediateToken - (178:7,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (182:7,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (184:8,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (186:8,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (187:8,3 [14] StringLiterals.cshtml) - Html - This is line 9
+                    IntermediateToken - (201:8,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (205:8,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (207:9,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (209:9,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (210:9,3 [15] StringLiterals.cshtml) - Html - This is line 10
+                    IntermediateToken - (225:9,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (229:9,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (231:10,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (233:10,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (234:10,3 [15] StringLiterals.cshtml) - Html - This is line 11
+                    IntermediateToken - (249:10,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (253:10,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (255:11,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (257:11,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (258:11,3 [15] StringLiterals.cshtml) - Html - This is line 12
+                    IntermediateToken - (273:11,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (277:11,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (279:12,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (281:12,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (282:12,3 [15] StringLiterals.cshtml) - Html - This is line 13
+                    IntermediateToken - (297:12,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (301:12,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (303:13,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (305:13,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (306:13,3 [15] StringLiterals.cshtml) - Html - This is line 14
+                    IntermediateToken - (321:13,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (325:13,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (327:14,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (329:14,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (330:14,3 [15] StringLiterals.cshtml) - Html - This is line 15
+                    IntermediateToken - (345:14,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (349:14,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (351:15,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (353:15,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (354:15,3 [15] StringLiterals.cshtml) - Html - This is line 16
+                    IntermediateToken - (369:15,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (373:15,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (375:16,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (377:16,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (378:16,3 [15] StringLiterals.cshtml) - Html - This is line 17
+                    IntermediateToken - (393:16,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (397:16,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (399:17,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (401:17,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (402:17,3 [15] StringLiterals.cshtml) - Html - This is line 18
+                    IntermediateToken - (417:17,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (421:17,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (423:18,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (425:18,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (426:18,3 [15] StringLiterals.cshtml) - Html - This is line 19
+                    IntermediateToken - (441:18,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (445:18,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (447:19,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (449:19,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (450:19,3 [15] StringLiterals.cshtml) - Html - This is line 20
+                    IntermediateToken - (465:19,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (469:19,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (471:20,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (473:20,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (474:20,3 [15] StringLiterals.cshtml) - Html - This is line 21
+                    IntermediateToken - (489:20,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (493:20,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (495:21,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (497:21,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (498:21,3 [15] StringLiterals.cshtml) - Html - This is line 22
+                    IntermediateToken - (513:21,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (517:21,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (519:22,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (521:22,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (522:22,3 [15] StringLiterals.cshtml) - Html - This is line 23
+                    IntermediateToken - (537:22,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (541:22,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (543:23,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (545:23,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (546:23,3 [15] StringLiterals.cshtml) - Html - This is line 24
+                    IntermediateToken - (561:23,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (565:23,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (567:24,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (569:24,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (570:24,3 [15] StringLiterals.cshtml) - Html - This is line 25
+                    IntermediateToken - (585:24,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (589:24,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (591:25,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (593:25,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (594:25,3 [15] StringLiterals.cshtml) - Html - This is line 26
+                    IntermediateToken - (609:25,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (613:25,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (615:26,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (617:26,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (618:26,3 [15] StringLiterals.cshtml) - Html - This is line 27
+                    IntermediateToken - (633:26,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (637:26,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (639:27,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (641:27,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (642:27,3 [15] StringLiterals.cshtml) - Html - This is line 28
+                    IntermediateToken - (657:27,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (661:27,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (663:28,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (665:28,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (666:28,3 [15] StringLiterals.cshtml) - Html - This is line 29
+                    IntermediateToken - (681:28,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (685:28,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (687:29,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (689:29,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (690:29,3 [15] StringLiterals.cshtml) - Html - This is line 30
+                    IntermediateToken - (705:29,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (709:29,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (711:30,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (713:30,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (714:30,3 [15] StringLiterals.cshtml) - Html - This is line 31
+                    IntermediateToken - (729:30,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (733:30,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (735:31,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (737:31,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (738:31,3 [15] StringLiterals.cshtml) - Html - This is line 32
+                    IntermediateToken - (753:31,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (757:31,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (759:32,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (761:32,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (762:32,3 [15] StringLiterals.cshtml) - Html - This is line 33
+                    IntermediateToken - (777:32,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (781:32,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (783:33,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (785:33,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (786:33,3 [15] StringLiterals.cshtml) - Html - This is line 34
+                    IntermediateToken - (801:33,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (805:33,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (807:34,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (809:34,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (810:34,3 [15] StringLiterals.cshtml) - Html - This is line 35
+                    IntermediateToken - (825:34,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (829:34,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (831:35,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (833:35,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (834:35,3 [15] StringLiterals.cshtml) - Html - This is line 36
+                    IntermediateToken - (849:35,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (853:35,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (855:36,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (857:36,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (858:36,3 [15] StringLiterals.cshtml) - Html - This is line 37
+                    IntermediateToken - (873:36,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (877:36,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (879:37,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (881:37,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (882:37,3 [15] StringLiterals.cshtml) - Html - This is line 38
+                    IntermediateToken - (897:37,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (901:37,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (903:38,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (905:38,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (906:38,3 [15] StringLiterals.cshtml) - Html - This is line 39
+                    IntermediateToken - (921:38,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (925:38,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (927:39,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (929:39,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (930:39,3 [15] StringLiterals.cshtml) - Html - This is line 40
+                    IntermediateToken - (945:39,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (949:39,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (951:40,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (953:40,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (954:40,3 [15] StringLiterals.cshtml) - Html - This is line 41
+                    IntermediateToken - (969:40,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (973:40,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (975:41,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (977:41,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (978:41,3 [15] StringLiterals.cshtml) - Html - This is line 42
+                    IntermediateToken - (993:41,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (997:41,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (999:42,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1001:42,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1002:42,3 [15] StringLiterals.cshtml) - Html - This is line 43
+                    IntermediateToken - (1017:42,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1021:42,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1023:43,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1025:43,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1026:43,3 [15] StringLiterals.cshtml) - Html - This is line 44
+                    IntermediateToken - (1041:43,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1045:43,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1047:44,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1049:44,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1050:44,3 [15] StringLiterals.cshtml) - Html - This is line 45
+                    IntermediateToken - (1065:44,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1069:44,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1071:45,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1073:45,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1074:45,3 [15] StringLiterals.cshtml) - Html - This is line 46
+                    IntermediateToken - (1089:45,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1093:45,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1095:46,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1097:46,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1098:46,3 [15] StringLiterals.cshtml) - Html - This is line 47
+                    IntermediateToken - (1113:46,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1117:46,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1119:47,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1121:47,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1122:47,3 [15] StringLiterals.cshtml) - Html - This is line 48
+                    IntermediateToken - (1137:47,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1141:47,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1143:48,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1145:48,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1146:48,3 [15] StringLiterals.cshtml) - Html - This is line 49
+                    IntermediateToken - (1161:48,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1165:48,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1167:49,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1169:49,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1170:49,3 [15] StringLiterals.cshtml) - Html - This is line 50
+                    IntermediateToken - (1185:49,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1189:49,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1191:50,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1193:50,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1194:50,3 [15] StringLiterals.cshtml) - Html - This is line 51
+                    IntermediateToken - (1209:50,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1213:50,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1215:51,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1217:51,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1218:51,3 [15] StringLiterals.cshtml) - Html - This is line 52
+                    IntermediateToken - (1233:51,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1237:51,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1239:52,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1241:52,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1242:52,3 [15] StringLiterals.cshtml) - Html - This is line 53
+                    IntermediateToken - (1257:52,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1261:52,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1263:53,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1265:53,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1266:53,3 [15] StringLiterals.cshtml) - Html - This is line 54
+                    IntermediateToken - (1281:53,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1285:53,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1287:54,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1289:54,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1290:54,3 [15] StringLiterals.cshtml) - Html - This is line 55
+                    IntermediateToken - (1305:54,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1309:54,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1311:55,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1313:55,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1314:55,3 [15] StringLiterals.cshtml) - Html - This is line 56
+                    IntermediateToken - (1329:55,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1333:55,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1335:56,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1337:56,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1338:56,3 [15] StringLiterals.cshtml) - Html - This is line 57
+                    IntermediateToken - (1353:56,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1357:56,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1359:57,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1361:57,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1362:57,3 [15] StringLiterals.cshtml) - Html - This is line 58
+                    IntermediateToken - (1377:57,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1381:57,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1383:58,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1385:58,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1386:58,3 [15] StringLiterals.cshtml) - Html - This is line 59
+                    IntermediateToken - (1401:58,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1405:58,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1407:59,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1409:59,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1410:59,3 [15] StringLiterals.cshtml) - Html - This is line 60
+                    IntermediateToken - (1425:59,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1429:59,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1431:60,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1433:60,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1434:60,3 [15] StringLiterals.cshtml) - Html - This is line 61
+                    IntermediateToken - (1449:60,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1453:60,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1455:61,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1457:61,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1458:61,3 [15] StringLiterals.cshtml) - Html - This is line 62
+                    IntermediateToken - (1473:61,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1477:61,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1479:62,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1481:62,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1482:62,3 [15] StringLiterals.cshtml) - Html - This is line 63
+                    IntermediateToken - (1497:62,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1501:62,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1503:63,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1505:63,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1506:63,3 [15] StringLiterals.cshtml) - Html - This is line 64
+                    IntermediateToken - (1521:63,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1525:63,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1527:64,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1529:64,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1530:64,3 [15] StringLiterals.cshtml) - Html - This is line 65
+                    IntermediateToken - (1545:64,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1549:64,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1551:65,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1553:65,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1554:65,3 [15] StringLiterals.cshtml) - Html - This is line 66
+                    IntermediateToken - (1569:65,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1573:65,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1575:66,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1577:66,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1578:66,3 [15] StringLiterals.cshtml) - Html - This is line 67
+                    IntermediateToken - (1593:66,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1597:66,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1599:67,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1601:67,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1602:67,3 [15] StringLiterals.cshtml) - Html - This is line 68
+                    IntermediateToken - (1617:67,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1621:67,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1623:68,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1625:68,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1626:68,3 [15] StringLiterals.cshtml) - Html - This is line 69
+                    IntermediateToken - (1641:68,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1645:68,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1647:69,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1649:69,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1650:69,3 [15] StringLiterals.cshtml) - Html - This is line 70
+                    IntermediateToken - (1665:69,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1669:69,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1671:70,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1673:70,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1674:70,3 [15] StringLiterals.cshtml) - Html - This is line 71
+                    IntermediateToken - (1689:70,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1693:70,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1695:71,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1697:71,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1698:71,3 [15] StringLiterals.cshtml) - Html - This is line 72
+                    IntermediateToken - (1713:71,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1717:71,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1719:72,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1721:72,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1722:72,3 [15] StringLiterals.cshtml) - Html - This is line 73
+                    IntermediateToken - (1737:72,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1741:72,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1743:73,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1745:73,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1746:73,3 [15] StringLiterals.cshtml) - Html - This is line 74
+                    IntermediateToken - (1761:73,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1765:73,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1767:74,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1769:74,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1770:74,3 [15] StringLiterals.cshtml) - Html - This is line 75
+                    IntermediateToken - (1785:74,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1789:74,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1791:75,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1793:75,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1794:75,3 [15] StringLiterals.cshtml) - Html - This is line 76
+                    IntermediateToken - (1809:75,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1813:75,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1815:76,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1817:76,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1818:76,3 [15] StringLiterals.cshtml) - Html - This is line 77
+                    IntermediateToken - (1833:76,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1837:76,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1839:77,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1841:77,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1842:77,3 [15] StringLiterals.cshtml) - Html - This is line 78
+                    IntermediateToken - (1857:77,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1861:77,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1863:78,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1865:78,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1866:78,3 [15] StringLiterals.cshtml) - Html - This is line 79
+                    IntermediateToken - (1881:78,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1885:78,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1887:79,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1889:79,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1890:79,3 [15] StringLiterals.cshtml) - Html - This is line 80
+                    IntermediateToken - (1905:79,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1909:79,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1911:80,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1913:80,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1914:80,3 [15] StringLiterals.cshtml) - Html - This is line 81
+                    IntermediateToken - (1929:80,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1933:80,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1935:81,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1937:81,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1938:81,3 [15] StringLiterals.cshtml) - Html - This is line 82
+                    IntermediateToken - (1953:81,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1957:81,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1959:82,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1961:82,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1962:82,3 [15] StringLiterals.cshtml) - Html - This is line 83
+                    IntermediateToken - (1977:82,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1981:82,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1983:83,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1985:83,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1986:83,3 [15] StringLiterals.cshtml) - Html - This is line 84
+                    IntermediateToken - (2001:83,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (2005:83,22 [3] StringLiterals.cshtml) - Html - <br
+                    IntermediateToken - (2008:83,25 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (2009:83,26 [4] StringLiterals.cshtml) - Html - \n\n
+                Section -  - WriteLiteralsToInHere
+                    HtmlContent - (2045:85,32 [2618] StringLiterals.cshtml)
+                        IntermediateToken - (2045:85,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2051:86,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2053:86,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2054:86,7 [21] StringLiterals.cshtml) - Html - This is line 1 nested
+                        IntermediateToken - (2075:86,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2079:86,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2085:87,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2087:87,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2088:87,7 [21] StringLiterals.cshtml) - Html - This is line 2 nested
+                        IntermediateToken - (2109:87,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2113:87,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2119:88,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2121:88,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2122:88,7 [21] StringLiterals.cshtml) - Html - This is line 3 nested
+                        IntermediateToken - (2143:88,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2147:88,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2153:89,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2155:89,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2156:89,7 [21] StringLiterals.cshtml) - Html - This is line 4 nested
+                        IntermediateToken - (2177:89,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2181:89,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2187:90,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2189:90,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2190:90,7 [21] StringLiterals.cshtml) - Html - This is line 5 nested
+                        IntermediateToken - (2211:90,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2215:90,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2221:91,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2223:91,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2224:91,7 [21] StringLiterals.cshtml) - Html - This is line 6 nested
+                        IntermediateToken - (2245:91,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2249:91,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2255:92,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2257:92,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2258:92,7 [21] StringLiterals.cshtml) - Html - This is line 7 nested
+                        IntermediateToken - (2279:92,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2283:92,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2289:93,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2291:93,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2292:93,7 [21] StringLiterals.cshtml) - Html - This is line 8 nested
+                        IntermediateToken - (2313:93,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2317:93,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2323:94,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2325:94,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2326:94,7 [21] StringLiterals.cshtml) - Html - This is line 9 nested
+                        IntermediateToken - (2347:94,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2351:94,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2357:95,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2359:95,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2360:95,7 [22] StringLiterals.cshtml) - Html - This is line 10 nested
+                        IntermediateToken - (2382:95,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2386:95,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2392:96,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2394:96,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2395:96,7 [22] StringLiterals.cshtml) - Html - This is line 11 nested
+                        IntermediateToken - (2417:96,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2421:96,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2427:97,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2429:97,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2430:97,7 [22] StringLiterals.cshtml) - Html - This is line 12 nested
+                        IntermediateToken - (2452:97,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2456:97,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2462:98,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2464:98,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2465:98,7 [22] StringLiterals.cshtml) - Html - This is line 13 nested
+                        IntermediateToken - (2487:98,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2491:98,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2497:99,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2499:99,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2500:99,7 [22] StringLiterals.cshtml) - Html - This is line 14 nested
+                        IntermediateToken - (2522:99,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2526:99,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2532:100,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2534:100,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2535:100,7 [22] StringLiterals.cshtml) - Html - This is line 15 nested
+                        IntermediateToken - (2557:100,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2561:100,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2567:101,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2569:101,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2570:101,7 [22] StringLiterals.cshtml) - Html - This is line 16 nested
+                        IntermediateToken - (2592:101,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2596:101,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2602:102,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2604:102,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2605:102,7 [22] StringLiterals.cshtml) - Html - This is line 17 nested
+                        IntermediateToken - (2627:102,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2631:102,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2637:103,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2639:103,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2640:103,7 [22] StringLiterals.cshtml) - Html - This is line 18 nested
+                        IntermediateToken - (2662:103,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2666:103,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2672:104,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2674:104,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2675:104,7 [22] StringLiterals.cshtml) - Html - This is line 19 nested
+                        IntermediateToken - (2697:104,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2701:104,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2707:105,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2709:105,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2710:105,7 [22] StringLiterals.cshtml) - Html - This is line 20 nested
+                        IntermediateToken - (2732:105,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2736:105,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2742:106,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2744:106,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2745:106,7 [22] StringLiterals.cshtml) - Html - This is line 21 nested
+                        IntermediateToken - (2767:106,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2771:106,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2777:107,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2779:107,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2780:107,7 [22] StringLiterals.cshtml) - Html - This is line 22 nested
+                        IntermediateToken - (2802:107,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2806:107,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2812:108,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2814:108,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2815:108,7 [22] StringLiterals.cshtml) - Html - This is line 23 nested
+                        IntermediateToken - (2837:108,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2841:108,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2847:109,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2849:109,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2850:109,7 [22] StringLiterals.cshtml) - Html - This is line 24 nested
+                        IntermediateToken - (2872:109,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2876:109,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2882:110,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2884:110,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2885:110,7 [22] StringLiterals.cshtml) - Html - This is line 25 nested
+                        IntermediateToken - (2907:110,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2911:110,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2917:111,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2919:111,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2920:111,7 [22] StringLiterals.cshtml) - Html - This is line 26 nested
+                        IntermediateToken - (2942:111,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2946:111,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2952:112,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2954:112,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2955:112,7 [22] StringLiterals.cshtml) - Html - This is line 27 nested
+                        IntermediateToken - (2977:112,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2981:112,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2987:113,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2989:113,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2990:113,7 [22] StringLiterals.cshtml) - Html - This is line 28 nested
+                        IntermediateToken - (3012:113,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3016:113,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3022:114,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3024:114,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3025:114,7 [22] StringLiterals.cshtml) - Html - This is line 29 nested
+                        IntermediateToken - (3047:114,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3051:114,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3057:115,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3059:115,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3060:115,7 [22] StringLiterals.cshtml) - Html - This is line 30 nested
+                        IntermediateToken - (3082:115,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3086:115,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3092:116,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3094:116,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3095:116,7 [22] StringLiterals.cshtml) - Html - This is line 31 nested
+                        IntermediateToken - (3117:116,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3121:116,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3127:117,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3129:117,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3130:117,7 [22] StringLiterals.cshtml) - Html - This is line 32 nested
+                        IntermediateToken - (3152:117,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3156:117,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3162:118,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3164:118,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3165:118,7 [22] StringLiterals.cshtml) - Html - This is line 33 nested
+                        IntermediateToken - (3187:118,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3191:118,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3197:119,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3199:119,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3200:119,7 [22] StringLiterals.cshtml) - Html - This is line 34 nested
+                        IntermediateToken - (3222:119,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3226:119,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3232:120,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3234:120,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3235:120,7 [22] StringLiterals.cshtml) - Html - This is line 35 nested
+                        IntermediateToken - (3257:120,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3261:120,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3267:121,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3269:121,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3270:121,7 [22] StringLiterals.cshtml) - Html - This is line 36 nested
+                        IntermediateToken - (3292:121,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3296:121,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3302:122,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3304:122,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3305:122,7 [22] StringLiterals.cshtml) - Html - This is line 37 nested
+                        IntermediateToken - (3327:122,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3331:122,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3337:123,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3339:123,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3340:123,7 [22] StringLiterals.cshtml) - Html - This is line 38 nested
+                        IntermediateToken - (3362:123,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3366:123,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3372:124,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3374:124,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3375:124,7 [22] StringLiterals.cshtml) - Html - This is line 39 nested
+                        IntermediateToken - (3397:124,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3401:124,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3407:125,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3409:125,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3410:125,7 [22] StringLiterals.cshtml) - Html - This is line 40 nested
+                        IntermediateToken - (3432:125,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3436:125,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3442:126,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3444:126,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3445:126,7 [22] StringLiterals.cshtml) - Html - This is line 41 nested
+                        IntermediateToken - (3467:126,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3471:126,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3477:127,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3479:127,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3480:127,7 [22] StringLiterals.cshtml) - Html - This is line 42 nested
+                        IntermediateToken - (3502:127,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3506:127,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3512:128,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3514:128,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3515:128,7 [22] StringLiterals.cshtml) - Html - This is line 43 nested
+                        IntermediateToken - (3537:128,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3541:128,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3547:129,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3549:129,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3550:129,7 [22] StringLiterals.cshtml) - Html - This is line 44 nested
+                        IntermediateToken - (3572:129,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3576:129,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3582:130,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3584:130,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3585:130,7 [22] StringLiterals.cshtml) - Html - This is line 45 nested
+                        IntermediateToken - (3607:130,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3611:130,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3617:131,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3619:131,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3620:131,7 [22] StringLiterals.cshtml) - Html - This is line 46 nested
+                        IntermediateToken - (3642:131,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3646:131,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3652:132,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3654:132,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3655:132,7 [22] StringLiterals.cshtml) - Html - This is line 47 nested
+                        IntermediateToken - (3677:132,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3681:132,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3687:133,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3689:133,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3690:133,7 [22] StringLiterals.cshtml) - Html - This is line 48 nested
+                        IntermediateToken - (3712:133,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3716:133,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3722:134,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3724:134,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3725:134,7 [22] StringLiterals.cshtml) - Html - This is line 49 nested
+                        IntermediateToken - (3747:134,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3751:134,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3757:135,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3759:135,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3760:135,7 [22] StringLiterals.cshtml) - Html - This is line 50 nested
+                        IntermediateToken - (3782:135,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3786:135,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3792:136,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3794:136,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3795:136,7 [22] StringLiterals.cshtml) - Html - This is line 51 nested
+                        IntermediateToken - (3817:136,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3821:136,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3827:137,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3829:137,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3830:137,7 [22] StringLiterals.cshtml) - Html - This is line 52 nested
+                        IntermediateToken - (3852:137,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3856:137,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3862:138,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3864:138,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3865:138,7 [22] StringLiterals.cshtml) - Html - This is line 53 nested
+                        IntermediateToken - (3887:138,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3891:138,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3897:139,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3899:139,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3900:139,7 [22] StringLiterals.cshtml) - Html - This is line 54 nested
+                        IntermediateToken - (3922:139,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3926:139,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3932:140,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3934:140,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3935:140,7 [22] StringLiterals.cshtml) - Html - This is line 55 nested
+                        IntermediateToken - (3957:140,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3961:140,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3967:141,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3969:141,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3970:141,7 [22] StringLiterals.cshtml) - Html - This is line 56 nested
+                        IntermediateToken - (3992:141,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3996:141,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4002:142,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4004:142,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4005:142,7 [22] StringLiterals.cshtml) - Html - This is line 57 nested
+                        IntermediateToken - (4027:142,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4031:142,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4037:143,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4039:143,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4040:143,7 [22] StringLiterals.cshtml) - Html - This is line 58 nested
+                        IntermediateToken - (4062:143,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4066:143,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4072:144,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4074:144,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4075:144,7 [22] StringLiterals.cshtml) - Html - This is line 59 nested
+                        IntermediateToken - (4097:144,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4101:144,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4107:145,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4109:145,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4110:145,7 [22] StringLiterals.cshtml) - Html - This is line 60 nested
+                        IntermediateToken - (4132:145,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4136:145,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4142:146,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4144:146,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4145:146,7 [22] StringLiterals.cshtml) - Html - This is line 61 nested
+                        IntermediateToken - (4167:146,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4171:146,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4177:147,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4179:147,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4180:147,7 [22] StringLiterals.cshtml) - Html - This is line 62 nested
+                        IntermediateToken - (4202:147,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4206:147,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4212:148,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4214:148,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4215:148,7 [22] StringLiterals.cshtml) - Html - This is line 63 nested
+                        IntermediateToken - (4237:148,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4241:148,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4247:149,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4249:149,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4250:149,7 [22] StringLiterals.cshtml) - Html - This is line 64 nested
+                        IntermediateToken - (4272:149,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4276:149,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4282:150,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4284:150,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4285:150,7 [22] StringLiterals.cshtml) - Html - This is line 65 nested
+                        IntermediateToken - (4307:150,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4311:150,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4317:151,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4319:151,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4320:151,7 [22] StringLiterals.cshtml) - Html - This is line 66 nested
+                        IntermediateToken - (4342:151,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4346:151,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4352:152,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4354:152,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4355:152,7 [22] StringLiterals.cshtml) - Html - This is line 67 nested
+                        IntermediateToken - (4377:152,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4381:152,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4387:153,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4389:153,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4390:153,7 [22] StringLiterals.cshtml) - Html - This is line 68 nested
+                        IntermediateToken - (4412:153,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4416:153,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4422:154,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4424:154,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4425:154,7 [22] StringLiterals.cshtml) - Html - This is line 69 nested
+                        IntermediateToken - (4447:154,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4451:154,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4457:155,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4459:155,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4460:155,7 [22] StringLiterals.cshtml) - Html - This is line 70 nested
+                        IntermediateToken - (4482:155,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4486:155,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4492:156,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4494:156,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4495:156,7 [22] StringLiterals.cshtml) - Html - This is line 71 nested
+                        IntermediateToken - (4517:156,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4521:156,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4527:157,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4529:157,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4530:157,7 [22] StringLiterals.cshtml) - Html - This is line 72 nested
+                        IntermediateToken - (4552:157,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4556:157,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4562:158,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4564:158,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4565:158,7 [22] StringLiterals.cshtml) - Html - This is line 73 nested
+                        IntermediateToken - (4587:158,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4591:158,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4597:159,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4599:159,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4600:159,7 [22] StringLiterals.cshtml) - Html - This is line 74 nested
+                        IntermediateToken - (4622:159,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4626:159,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4632:160,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4634:160,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4635:160,7 [22] StringLiterals.cshtml) - Html - This is line 75 nested
+                        IntermediateToken - (4657:160,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4661:160,33 [2] StringLiterals.cshtml) - Html - \n
+                HtmlContent - (4664:161,1 [1028] StringLiterals.cshtml)
+                    IntermediateToken - (4664:161,1 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4666:162,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4668:162,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4669:162,3 [14] StringLiterals.cshtml) - Html - This is line 1
+                    IntermediateToken - (4683:162,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4687:162,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4689:163,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4691:163,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4692:163,3 [14] StringLiterals.cshtml) - Html - This is line 2
+                    IntermediateToken - (4706:163,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4710:163,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4712:164,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4714:164,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4715:164,3 [14] StringLiterals.cshtml) - Html - This is line 3
+                    IntermediateToken - (4729:164,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4733:164,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4735:165,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4737:165,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4738:165,3 [14] StringLiterals.cshtml) - Html - This is line 4
+                    IntermediateToken - (4752:165,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4756:165,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4758:166,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4760:166,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4761:166,3 [14] StringLiterals.cshtml) - Html - This is line 5
+                    IntermediateToken - (4775:166,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4779:166,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4781:167,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4783:167,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4784:167,3 [14] StringLiterals.cshtml) - Html - This is line 6
+                    IntermediateToken - (4798:167,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4802:167,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4804:168,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4806:168,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4807:168,3 [14] StringLiterals.cshtml) - Html - This is line 7
+                    IntermediateToken - (4821:168,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4825:168,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4827:169,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4829:169,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4830:169,3 [14] StringLiterals.cshtml) - Html - This is line 8
+                    IntermediateToken - (4844:169,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4848:169,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4850:170,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4852:170,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4853:170,3 [14] StringLiterals.cshtml) - Html - This is line 9
+                    IntermediateToken - (4867:170,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4871:170,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4873:171,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4875:171,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4876:171,3 [15] StringLiterals.cshtml) - Html - This is line 10
+                    IntermediateToken - (4891:171,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4895:171,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4897:172,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4899:172,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4900:172,3 [15] StringLiterals.cshtml) - Html - This is line 11
+                    IntermediateToken - (4915:172,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4919:172,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4921:173,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4923:173,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4924:173,3 [15] StringLiterals.cshtml) - Html - This is line 12
+                    IntermediateToken - (4939:173,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4943:173,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4945:174,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4947:174,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4948:174,3 [15] StringLiterals.cshtml) - Html - This is line 13
+                    IntermediateToken - (4963:174,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4967:174,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4969:175,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4971:175,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4972:175,3 [15] StringLiterals.cshtml) - Html - This is line 14
+                    IntermediateToken - (4987:175,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4991:175,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4993:176,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4995:176,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4996:176,3 [15] StringLiterals.cshtml) - Html - This is line 15
+                    IntermediateToken - (5011:176,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5015:176,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5017:177,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5019:177,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5020:177,3 [15] StringLiterals.cshtml) - Html - This is line 16
+                    IntermediateToken - (5035:177,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5039:177,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5041:178,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5043:178,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5044:178,3 [15] StringLiterals.cshtml) - Html - This is line 17
+                    IntermediateToken - (5059:178,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5063:178,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5065:179,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5067:179,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5068:179,3 [15] StringLiterals.cshtml) - Html - This is line 18
+                    IntermediateToken - (5083:179,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5087:179,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5089:180,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5091:180,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5092:180,3 [15] StringLiterals.cshtml) - Html - This is line 19
+                    IntermediateToken - (5107:180,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5111:180,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5113:181,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5115:181,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5116:181,3 [15] StringLiterals.cshtml) - Html - This is line 20
+                    IntermediateToken - (5131:181,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5135:181,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5137:182,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5139:182,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5140:182,3 [15] StringLiterals.cshtml) - Html - This is line 21
+                    IntermediateToken - (5155:182,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5159:182,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5161:183,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5163:183,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5164:183,3 [15] StringLiterals.cshtml) - Html - This is line 22
+                    IntermediateToken - (5179:183,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5183:183,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5185:184,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5187:184,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5188:184,3 [15] StringLiterals.cshtml) - Html - This is line 23
+                    IntermediateToken - (5203:184,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5207:184,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5209:185,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5211:185,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5212:185,3 [15] StringLiterals.cshtml) - Html - This is line 24
+                    IntermediateToken - (5227:185,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5231:185,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5233:186,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5235:186,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5236:186,3 [15] StringLiterals.cshtml) - Html - This is line 25
+                    IntermediateToken - (5251:186,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5255:186,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5257:187,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5259:187,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5260:187,3 [15] StringLiterals.cshtml) - Html - This is line 26
+                    IntermediateToken - (5275:187,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5279:187,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5281:188,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5283:188,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5284:188,3 [15] StringLiterals.cshtml) - Html - This is line 27
+                    IntermediateToken - (5299:188,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5303:188,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5305:189,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5307:189,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5308:189,3 [15] StringLiterals.cshtml) - Html - This is line 28
+                    IntermediateToken - (5323:189,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5327:189,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5329:190,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5331:190,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5332:190,3 [15] StringLiterals.cshtml) - Html - This is line 29
+                    IntermediateToken - (5347:190,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5351:190,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5353:191,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5355:191,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5356:191,3 [15] StringLiterals.cshtml) - Html - This is line 30
+                    IntermediateToken - (5371:191,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5375:191,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5377:192,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5379:192,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5380:192,3 [15] StringLiterals.cshtml) - Html - This is line 31
+                    IntermediateToken - (5395:192,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5399:192,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5401:193,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5403:193,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5404:193,3 [15] StringLiterals.cshtml) - Html - This is line 32
+                    IntermediateToken - (5419:193,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5423:193,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5425:194,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5427:194,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5428:194,3 [15] StringLiterals.cshtml) - Html - This is line 33
+                    IntermediateToken - (5443:194,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5447:194,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5449:195,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5451:195,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5452:195,3 [15] StringLiterals.cshtml) - Html - This is line 34
+                    IntermediateToken - (5467:195,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5471:195,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5473:196,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5475:196,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5476:196,3 [15] StringLiterals.cshtml) - Html - This is line 35
+                    IntermediateToken - (5491:196,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5495:196,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5497:197,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5499:197,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5500:197,3 [15] StringLiterals.cshtml) - Html - This is line 36
+                    IntermediateToken - (5515:197,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5519:197,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5521:198,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5523:198,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5524:198,3 [15] StringLiterals.cshtml) - Html - This is line 37
+                    IntermediateToken - (5539:198,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5543:198,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5545:199,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5547:199,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5548:199,3 [15] StringLiterals.cshtml) - Html - This is line 38
+                    IntermediateToken - (5563:199,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5567:199,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5569:200,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5571:200,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5572:200,3 [15] StringLiterals.cshtml) - Html - This is line 39
+                    IntermediateToken - (5587:200,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5591:200,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5593:201,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5595:201,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5596:201,3 [15] StringLiterals.cshtml) - Html - This is line 40
+                    IntermediateToken - (5611:201,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5615:201,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5617:202,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5619:202,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5620:202,3 [15] StringLiterals.cshtml) - Html - This is line 41
+                    IntermediateToken - (5635:202,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5639:202,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5641:203,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5643:203,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5644:203,3 [15] StringLiterals.cshtml) - Html - This is line 42
+                    IntermediateToken - (5659:203,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5663:203,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5665:204,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5667:204,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5668:204,3 [15] StringLiterals.cshtml) - Html - This is line 43
+                    IntermediateToken - (5683:204,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5687:204,22 [5] StringLiterals.cshtml) - Html - hi!\n
+                Section -  - WriteLiteralsToInHereAlso
+                    HtmlContent - (5728:205,36 [1023] StringLiterals.cshtml)
+                        IntermediateToken - (5728:205,36 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5734:206,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5736:206,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5737:206,7 [21] StringLiterals.cshtml) - Html - This is line 1 nested
+                        IntermediateToken - (5758:206,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5762:206,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5768:207,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5770:207,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5771:207,7 [21] StringLiterals.cshtml) - Html - This is line 2 nested
+                        IntermediateToken - (5792:207,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5796:207,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5802:208,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5804:208,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5805:208,7 [21] StringLiterals.cshtml) - Html - This is line 3 nested
+                        IntermediateToken - (5826:208,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5830:208,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5836:209,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5838:209,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5839:209,7 [21] StringLiterals.cshtml) - Html - This is line 4 nested
+                        IntermediateToken - (5860:209,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5864:209,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5870:210,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5872:210,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5873:210,7 [21] StringLiterals.cshtml) - Html - This is line 5 nested
+                        IntermediateToken - (5894:210,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5898:210,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5904:211,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5906:211,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5907:211,7 [21] StringLiterals.cshtml) - Html - This is line 6 nested
+                        IntermediateToken - (5928:211,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5932:211,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5938:212,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5940:212,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5941:212,7 [21] StringLiterals.cshtml) - Html - This is line 7 nested
+                        IntermediateToken - (5962:212,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5966:212,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5972:213,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5974:213,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5975:213,7 [21] StringLiterals.cshtml) - Html - This is line 8 nested
+                        IntermediateToken - (5996:213,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6000:213,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6006:214,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6008:214,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6009:214,7 [21] StringLiterals.cshtml) - Html - This is line 9 nested
+                        IntermediateToken - (6030:214,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6034:214,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6040:215,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6042:215,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6043:215,7 [22] StringLiterals.cshtml) - Html - This is line 10 nested
+                        IntermediateToken - (6065:215,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6069:215,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6075:216,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6077:216,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6078:216,7 [22] StringLiterals.cshtml) - Html - This is line 11 nested
+                        IntermediateToken - (6100:216,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6104:216,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6110:217,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6112:217,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6113:217,7 [22] StringLiterals.cshtml) - Html - This is line 12 nested
+                        IntermediateToken - (6135:217,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6139:217,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6145:218,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6147:218,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6148:218,7 [22] StringLiterals.cshtml) - Html - This is line 13 nested
+                        IntermediateToken - (6170:218,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6174:218,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6180:219,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6182:219,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6183:219,7 [22] StringLiterals.cshtml) - Html - This is line 14 nested
+                        IntermediateToken - (6205:219,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6209:219,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6215:220,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6217:220,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6218:220,7 [22] StringLiterals.cshtml) - Html - This is line 15 nested
+                        IntermediateToken - (6240:220,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6244:220,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6250:221,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6252:221,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6253:221,7 [22] StringLiterals.cshtml) - Html - This is line 16 nested
+                        IntermediateToken - (6275:221,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6279:221,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6285:222,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6287:222,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6288:222,7 [22] StringLiterals.cshtml) - Html - This is line 17 nested
+                        IntermediateToken - (6310:222,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6314:222,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6320:223,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6322:223,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6323:223,7 [22] StringLiterals.cshtml) - Html - This is line 18 nested
+                        IntermediateToken - (6345:223,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6349:223,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6355:224,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6357:224,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6358:224,7 [22] StringLiterals.cshtml) - Html - This is line 19 nested
+                        IntermediateToken - (6380:224,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6384:224,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6390:225,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6392:225,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6393:225,7 [22] StringLiterals.cshtml) - Html - This is line 20 nested
+                        IntermediateToken - (6415:225,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6419:225,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6425:226,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6427:226,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6428:226,7 [22] StringLiterals.cshtml) - Html - This is line 21 nested
+                        IntermediateToken - (6450:226,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6454:226,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6460:227,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6462:227,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6463:227,7 [22] StringLiterals.cshtml) - Html - This is line 22 nested
+                        IntermediateToken - (6485:227,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6489:227,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6495:228,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6497:228,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6498:228,7 [22] StringLiterals.cshtml) - Html - This is line 23 nested
+                        IntermediateToken - (6520:228,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6524:228,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6530:229,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6532:229,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6533:229,7 [22] StringLiterals.cshtml) - Html - This is line 24 nested
+                        IntermediateToken - (6555:229,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6559:229,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6565:230,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6567:230,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6568:230,7 [22] StringLiterals.cshtml) - Html - This is line 25 nested
+                        IntermediateToken - (6590:230,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6594:230,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6600:231,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6602:231,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6603:231,7 [22] StringLiterals.cshtml) - Html - This is line 26 nested
+                        IntermediateToken - (6625:231,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6629:231,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6635:232,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6637:232,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6638:232,7 [22] StringLiterals.cshtml) - Html - This is line 27 nested
+                        IntermediateToken - (6660:232,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6664:232,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6670:233,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6672:233,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6673:233,7 [22] StringLiterals.cshtml) - Html - This is line 28 nested
+                        IntermediateToken - (6695:233,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6699:233,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6705:234,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6707:234,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6708:234,7 [22] StringLiterals.cshtml) - Html - This is line 29 nested
+                        IntermediateToken - (6730:234,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6734:234,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6740:235,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6742:235,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6743:235,7 [2] StringLiterals.cshtml) - Html - 30
+                        IntermediateToken - (6745:235,9 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6749:235,13 [2] StringLiterals.cshtml) - Html - \n
+                HtmlContent - (6752:236,1 [1] StringLiterals.cshtml)
+                    IntermediateToken - (6752:236,1 [1] StringLiterals.cshtml) - Html - !
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
new file mode 100644
index 0000000000..dd997dde62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (2022:85,9 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml)
+|WriteLiteralsToInHere|
+Generated Location: (515:12,22 [21] )
+|WriteLiteralsToInHere|
+
+Source Location: (5701:205,9 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml)
+|WriteLiteralsToInHereAlso|
+Generated Location: (789:22,22 [25] )
+|WriteLiteralsToInHereAlso|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs
new file mode 100644
index 0000000000..b2c587c14d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.codegen.cs
@@ -0,0 +1,267 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "711aea8060d90aea04acd3324afb4bb4a0caccde"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"711aea8060d90aea04acd3324afb4bb4a0caccde", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral(@"<p>This is line 1</p>
+<p>This is line 2</p>
+<p>This is line 3</p>
+<p>This is line 4</p>
+<p>This is line 5</p>
+<p>This is line 6</p>
+<p>This is line 7</p>
+<p>This is line 8</p>
+<p>This is line 9</p>
+<p>This is line 10</p>
+<p>This is line 11</p>
+<p>This is line 12</p>
+<p>This is line 13</p>
+<p>This is line 14</p>
+<p>This is line 15</p>
+<p>This is line 16</p>
+<p>This is line 17</p>
+<p>This is line 18</p>
+<p>This is line 19</p>
+<p>This is line 20</p>
+<p>This is line 21</p>
+<p>This is line 22</p>
+<p>This is line 23</p>
+<p>This is line 24</p>
+<p>This is line 25</p>
+<p>This is line 26</p>
+<p>This is line 27</p>
+<p>This is line 28</p>
+<p>This is line 29</p>
+<p>This is line 30</p>
+<p>This is line 31</p>
+<p>This is line 32</p>
+<p>This is line 33</p>
+<p>This is line 34</p>
+<p>This is line 35</p>
+<p>This is line 36</p>
+<p>This is line 37</p>
+<p>This is line 38</p>
+<p>This is line 39</p>
+<p>This is line 40</p>
+<p>This is line 41</p>
+<p>This is line 42</p>
+<p>This is line 43</p>
+<");
+            WriteLiteral(@"p>This is line 44</p>
+<p>This is line 45</p>
+<p>This is line 46</p>
+<p>This is line 47</p>
+<p>This is line 48</p>
+<p>This is line 49</p>
+<p>This is line 50</p>
+<p>This is line 51</p>
+<p>This is line 52</p>
+<p>This is line 53</p>
+<p>This is line 54</p>
+<p>This is line 55</p>
+<p>This is line 56</p>
+<p>This is line 57</p>
+<p>This is line 58</p>
+<p>This is line 59</p>
+<p>This is line 60</p>
+<p>This is line 61</p>
+<p>This is line 62</p>
+<p>This is line 63</p>
+<p>This is line 64</p>
+<p>This is line 65</p>
+<p>This is line 66</p>
+<p>This is line 67</p>
+<p>This is line 68</p>
+<p>This is line 69</p>
+<p>This is line 70</p>
+<p>This is line 71</p>
+<p>This is line 72</p>
+<p>This is line 73</p>
+<p>This is line 74</p>
+<p>This is line 75</p>
+<p>This is line 76</p>
+<p>This is line 77</p>
+<p>This is line 78</p>
+<p>This is line 79</p>
+<p>This is line 80</p>
+<p>This is line 81</p>
+<p>This is line 82</p>
+<p>This is line 83</p>
+<p>This is line 84</p><br>
+
+");
+            DefineSection("WriteLiteralsToInHere", async() => {
+                WriteLiteral(@"
+    <p>This is line 1 nested</p>
+    <p>This is line 2 nested</p>
+    <p>This is line 3 nested</p>
+    <p>This is line 4 nested</p>
+    <p>This is line 5 nested</p>
+    <p>This is line 6 nested</p>
+    <p>This is line 7 nested</p>
+    <p>This is line 8 nested</p>
+    <p>This is line 9 nested</p>
+    <p>This is line 10 nested</p>
+    <p>This is line 11 nested</p>
+    <p>This is line 12 nested</p>
+    <p>This is line 13 nested</p>
+    <p>This is line 14 nested</p>
+    <p>This is line 15 nested</p>
+    <p>This is line 16 nested</p>
+    <p>This is line 17 nested</p>
+    <p>This is line 18 nested</p>
+    <p>This is line 19 nested</p>
+    <p>This is line 20 nested</p>
+    <p>This is line 21 nested</p>
+    <p>This is line 22 nested</p>
+    <p>This is line 23 nested</p>
+    <p>This is line 24 nested</p>
+    <p>This is line 25 nested</p>
+    <p>This is line 26 nested</p>
+    <p>This is line 27 nested</p>
+    <p>This is line 28 nested</p>
+    <p>This is line 29 nested</p>
+    <p>This is l");
+                WriteLiteral(@"ine 30 nested</p>
+    <p>This is line 31 nested</p>
+    <p>This is line 32 nested</p>
+    <p>This is line 33 nested</p>
+    <p>This is line 34 nested</p>
+    <p>This is line 35 nested</p>
+    <p>This is line 36 nested</p>
+    <p>This is line 37 nested</p>
+    <p>This is line 38 nested</p>
+    <p>This is line 39 nested</p>
+    <p>This is line 40 nested</p>
+    <p>This is line 41 nested</p>
+    <p>This is line 42 nested</p>
+    <p>This is line 43 nested</p>
+    <p>This is line 44 nested</p>
+    <p>This is line 45 nested</p>
+    <p>This is line 46 nested</p>
+    <p>This is line 47 nested</p>
+    <p>This is line 48 nested</p>
+    <p>This is line 49 nested</p>
+    <p>This is line 50 nested</p>
+    <p>This is line 51 nested</p>
+    <p>This is line 52 nested</p>
+    <p>This is line 53 nested</p>
+    <p>This is line 54 nested</p>
+    <p>This is line 55 nested</p>
+    <p>This is line 56 nested</p>
+    <p>This is line 57 nested</p>
+    <p>This is line 58 nested</p>
+    <p>This is line 59 ne");
+                WriteLiteral(@"sted</p>
+    <p>This is line 60 nested</p>
+    <p>This is line 61 nested</p>
+    <p>This is line 62 nested</p>
+    <p>This is line 63 nested</p>
+    <p>This is line 64 nested</p>
+    <p>This is line 65 nested</p>
+    <p>This is line 66 nested</p>
+    <p>This is line 67 nested</p>
+    <p>This is line 68 nested</p>
+    <p>This is line 69 nested</p>
+    <p>This is line 70 nested</p>
+    <p>This is line 71 nested</p>
+    <p>This is line 72 nested</p>
+    <p>This is line 73 nested</p>
+    <p>This is line 74 nested</p>
+    <p>This is line 75 nested</p>
+");
+            }
+            );
+            WriteLiteral(@"<p>This is line 1</p>
+<p>This is line 2</p>
+<p>This is line 3</p>
+<p>This is line 4</p>
+<p>This is line 5</p>
+<p>This is line 6</p>
+<p>This is line 7</p>
+<p>This is line 8</p>
+<p>This is line 9</p>
+<p>This is line 10</p>
+<p>This is line 11</p>
+<p>This is line 12</p>
+<p>This is line 13</p>
+<p>This is line 14</p>
+<p>This is line 15</p>
+<p>This is line 16</p>
+<p>This is line 17</p>
+<p>This is line 18</p>
+<p>This is line 19</p>
+<p>This is line 20</p>
+<p>This is line 21</p>
+<p>This is line 22</p>
+<p>This is line 23</p>
+<p>This is line 24</p>
+<p>This is line 25</p>
+<p>This is line 26</p>
+<p>This is line 27</p>
+<p>This is line 28</p>
+<p>This is line 29</p>
+<p>This is line 30</p>
+<p>This is line 31</p>
+<p>This is line 32</p>
+<p>This is line 33</p>
+<p>This is line 34</p>
+<p>This is line 35</p>
+<p>This is line 36</p>
+<p>This is line 37</p>
+<p>This is line 38</p>
+<p>This is line 39</p>
+<p>This is line 40</p>
+<p>This is line 41</p>
+<p>This is line 42</p>
+<p>This is line 43</p>hi!");
+            WriteLiteral("\r\n");
+            DefineSection("WriteLiteralsToInHereAlso", async() => {
+                WriteLiteral(@"
+    <p>This is line 1 nested</p>
+    <p>This is line 2 nested</p>
+    <p>This is line 3 nested</p>
+    <p>This is line 4 nested</p>
+    <p>This is line 5 nested</p>
+    <p>This is line 6 nested</p>
+    <p>This is line 7 nested</p>
+    <p>This is line 8 nested</p>
+    <p>This is line 9 nested</p>
+    <p>This is line 10 nested</p>
+    <p>This is line 11 nested</p>
+    <p>This is line 12 nested</p>
+    <p>This is line 13 nested</p>
+    <p>This is line 14 nested</p>
+    <p>This is line 15 nested</p>
+    <p>This is line 16 nested</p>
+    <p>This is line 17 nested</p>
+    <p>This is line 18 nested</p>
+    <p>This is line 19 nested</p>
+    <p>This is line 20 nested</p>
+    <p>This is line 21 nested</p>
+    <p>This is line 22 nested</p>
+    <p>This is line 23 nested</p>
+    <p>This is line 24 nested</p>
+    <p>This is line 25 nested</p>
+    <p>This is line 26 nested</p>
+    <p>This is line 27 nested</p>
+    <p>This is line 28 nested</p>
+    <p>This is line 29 nested</p>
+    <p>30</p>
+");
+            }
+            );
+            WriteLiteral("!");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt
new file mode 100644
index 0000000000..0866f75837
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt
@@ -0,0 +1,1178 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [2013] StringLiterals.cshtml)
+                    IntermediateToken - (0:0,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (2:0,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (3:0,3 [14] StringLiterals.cshtml) - Html - This is line 1
+                    IntermediateToken - (17:0,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (21:0,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (23:1,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (25:1,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (26:1,3 [14] StringLiterals.cshtml) - Html - This is line 2
+                    IntermediateToken - (40:1,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (44:1,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (46:2,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (48:2,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (49:2,3 [14] StringLiterals.cshtml) - Html - This is line 3
+                    IntermediateToken - (63:2,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (67:2,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (69:3,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (71:3,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (72:3,3 [14] StringLiterals.cshtml) - Html - This is line 4
+                    IntermediateToken - (86:3,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (90:3,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (92:4,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (94:4,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (95:4,3 [14] StringLiterals.cshtml) - Html - This is line 5
+                    IntermediateToken - (109:4,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (113:4,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (115:5,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (117:5,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (118:5,3 [14] StringLiterals.cshtml) - Html - This is line 6
+                    IntermediateToken - (132:5,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (136:5,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (138:6,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (140:6,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (141:6,3 [14] StringLiterals.cshtml) - Html - This is line 7
+                    IntermediateToken - (155:6,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (159:6,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (161:7,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (163:7,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (164:7,3 [14] StringLiterals.cshtml) - Html - This is line 8
+                    IntermediateToken - (178:7,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (182:7,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (184:8,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (186:8,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (187:8,3 [14] StringLiterals.cshtml) - Html - This is line 9
+                    IntermediateToken - (201:8,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (205:8,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (207:9,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (209:9,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (210:9,3 [15] StringLiterals.cshtml) - Html - This is line 10
+                    IntermediateToken - (225:9,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (229:9,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (231:10,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (233:10,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (234:10,3 [15] StringLiterals.cshtml) - Html - This is line 11
+                    IntermediateToken - (249:10,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (253:10,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (255:11,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (257:11,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (258:11,3 [15] StringLiterals.cshtml) - Html - This is line 12
+                    IntermediateToken - (273:11,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (277:11,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (279:12,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (281:12,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (282:12,3 [15] StringLiterals.cshtml) - Html - This is line 13
+                    IntermediateToken - (297:12,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (301:12,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (303:13,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (305:13,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (306:13,3 [15] StringLiterals.cshtml) - Html - This is line 14
+                    IntermediateToken - (321:13,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (325:13,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (327:14,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (329:14,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (330:14,3 [15] StringLiterals.cshtml) - Html - This is line 15
+                    IntermediateToken - (345:14,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (349:14,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (351:15,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (353:15,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (354:15,3 [15] StringLiterals.cshtml) - Html - This is line 16
+                    IntermediateToken - (369:15,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (373:15,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (375:16,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (377:16,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (378:16,3 [15] StringLiterals.cshtml) - Html - This is line 17
+                    IntermediateToken - (393:16,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (397:16,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (399:17,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (401:17,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (402:17,3 [15] StringLiterals.cshtml) - Html - This is line 18
+                    IntermediateToken - (417:17,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (421:17,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (423:18,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (425:18,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (426:18,3 [15] StringLiterals.cshtml) - Html - This is line 19
+                    IntermediateToken - (441:18,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (445:18,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (447:19,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (449:19,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (450:19,3 [15] StringLiterals.cshtml) - Html - This is line 20
+                    IntermediateToken - (465:19,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (469:19,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (471:20,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (473:20,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (474:20,3 [15] StringLiterals.cshtml) - Html - This is line 21
+                    IntermediateToken - (489:20,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (493:20,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (495:21,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (497:21,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (498:21,3 [15] StringLiterals.cshtml) - Html - This is line 22
+                    IntermediateToken - (513:21,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (517:21,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (519:22,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (521:22,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (522:22,3 [15] StringLiterals.cshtml) - Html - This is line 23
+                    IntermediateToken - (537:22,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (541:22,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (543:23,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (545:23,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (546:23,3 [15] StringLiterals.cshtml) - Html - This is line 24
+                    IntermediateToken - (561:23,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (565:23,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (567:24,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (569:24,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (570:24,3 [15] StringLiterals.cshtml) - Html - This is line 25
+                    IntermediateToken - (585:24,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (589:24,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (591:25,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (593:25,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (594:25,3 [15] StringLiterals.cshtml) - Html - This is line 26
+                    IntermediateToken - (609:25,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (613:25,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (615:26,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (617:26,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (618:26,3 [15] StringLiterals.cshtml) - Html - This is line 27
+                    IntermediateToken - (633:26,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (637:26,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (639:27,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (641:27,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (642:27,3 [15] StringLiterals.cshtml) - Html - This is line 28
+                    IntermediateToken - (657:27,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (661:27,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (663:28,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (665:28,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (666:28,3 [15] StringLiterals.cshtml) - Html - This is line 29
+                    IntermediateToken - (681:28,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (685:28,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (687:29,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (689:29,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (690:29,3 [15] StringLiterals.cshtml) - Html - This is line 30
+                    IntermediateToken - (705:29,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (709:29,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (711:30,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (713:30,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (714:30,3 [15] StringLiterals.cshtml) - Html - This is line 31
+                    IntermediateToken - (729:30,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (733:30,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (735:31,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (737:31,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (738:31,3 [15] StringLiterals.cshtml) - Html - This is line 32
+                    IntermediateToken - (753:31,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (757:31,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (759:32,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (761:32,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (762:32,3 [15] StringLiterals.cshtml) - Html - This is line 33
+                    IntermediateToken - (777:32,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (781:32,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (783:33,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (785:33,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (786:33,3 [15] StringLiterals.cshtml) - Html - This is line 34
+                    IntermediateToken - (801:33,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (805:33,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (807:34,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (809:34,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (810:34,3 [15] StringLiterals.cshtml) - Html - This is line 35
+                    IntermediateToken - (825:34,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (829:34,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (831:35,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (833:35,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (834:35,3 [15] StringLiterals.cshtml) - Html - This is line 36
+                    IntermediateToken - (849:35,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (853:35,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (855:36,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (857:36,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (858:36,3 [15] StringLiterals.cshtml) - Html - This is line 37
+                    IntermediateToken - (873:36,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (877:36,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (879:37,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (881:37,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (882:37,3 [15] StringLiterals.cshtml) - Html - This is line 38
+                    IntermediateToken - (897:37,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (901:37,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (903:38,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (905:38,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (906:38,3 [15] StringLiterals.cshtml) - Html - This is line 39
+                    IntermediateToken - (921:38,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (925:38,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (927:39,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (929:39,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (930:39,3 [15] StringLiterals.cshtml) - Html - This is line 40
+                    IntermediateToken - (945:39,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (949:39,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (951:40,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (953:40,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (954:40,3 [15] StringLiterals.cshtml) - Html - This is line 41
+                    IntermediateToken - (969:40,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (973:40,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (975:41,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (977:41,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (978:41,3 [15] StringLiterals.cshtml) - Html - This is line 42
+                    IntermediateToken - (993:41,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (997:41,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (999:42,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1001:42,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1002:42,3 [15] StringLiterals.cshtml) - Html - This is line 43
+                    IntermediateToken - (1017:42,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1021:42,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1023:43,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1025:43,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1026:43,3 [15] StringLiterals.cshtml) - Html - This is line 44
+                    IntermediateToken - (1041:43,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1045:43,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1047:44,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1049:44,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1050:44,3 [15] StringLiterals.cshtml) - Html - This is line 45
+                    IntermediateToken - (1065:44,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1069:44,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1071:45,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1073:45,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1074:45,3 [15] StringLiterals.cshtml) - Html - This is line 46
+                    IntermediateToken - (1089:45,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1093:45,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1095:46,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1097:46,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1098:46,3 [15] StringLiterals.cshtml) - Html - This is line 47
+                    IntermediateToken - (1113:46,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1117:46,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1119:47,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1121:47,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1122:47,3 [15] StringLiterals.cshtml) - Html - This is line 48
+                    IntermediateToken - (1137:47,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1141:47,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1143:48,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1145:48,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1146:48,3 [15] StringLiterals.cshtml) - Html - This is line 49
+                    IntermediateToken - (1161:48,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1165:48,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1167:49,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1169:49,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1170:49,3 [15] StringLiterals.cshtml) - Html - This is line 50
+                    IntermediateToken - (1185:49,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1189:49,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1191:50,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1193:50,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1194:50,3 [15] StringLiterals.cshtml) - Html - This is line 51
+                    IntermediateToken - (1209:50,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1213:50,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1215:51,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1217:51,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1218:51,3 [15] StringLiterals.cshtml) - Html - This is line 52
+                    IntermediateToken - (1233:51,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1237:51,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1239:52,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1241:52,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1242:52,3 [15] StringLiterals.cshtml) - Html - This is line 53
+                    IntermediateToken - (1257:52,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1261:52,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1263:53,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1265:53,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1266:53,3 [15] StringLiterals.cshtml) - Html - This is line 54
+                    IntermediateToken - (1281:53,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1285:53,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1287:54,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1289:54,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1290:54,3 [15] StringLiterals.cshtml) - Html - This is line 55
+                    IntermediateToken - (1305:54,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1309:54,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1311:55,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1313:55,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1314:55,3 [15] StringLiterals.cshtml) - Html - This is line 56
+                    IntermediateToken - (1329:55,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1333:55,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1335:56,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1337:56,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1338:56,3 [15] StringLiterals.cshtml) - Html - This is line 57
+                    IntermediateToken - (1353:56,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1357:56,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1359:57,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1361:57,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1362:57,3 [15] StringLiterals.cshtml) - Html - This is line 58
+                    IntermediateToken - (1377:57,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1381:57,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1383:58,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1385:58,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1386:58,3 [15] StringLiterals.cshtml) - Html - This is line 59
+                    IntermediateToken - (1401:58,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1405:58,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1407:59,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1409:59,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1410:59,3 [15] StringLiterals.cshtml) - Html - This is line 60
+                    IntermediateToken - (1425:59,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1429:59,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1431:60,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1433:60,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1434:60,3 [15] StringLiterals.cshtml) - Html - This is line 61
+                    IntermediateToken - (1449:60,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1453:60,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1455:61,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1457:61,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1458:61,3 [15] StringLiterals.cshtml) - Html - This is line 62
+                    IntermediateToken - (1473:61,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1477:61,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1479:62,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1481:62,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1482:62,3 [15] StringLiterals.cshtml) - Html - This is line 63
+                    IntermediateToken - (1497:62,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1501:62,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1503:63,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1505:63,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1506:63,3 [15] StringLiterals.cshtml) - Html - This is line 64
+                    IntermediateToken - (1521:63,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1525:63,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1527:64,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1529:64,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1530:64,3 [15] StringLiterals.cshtml) - Html - This is line 65
+                    IntermediateToken - (1545:64,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1549:64,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1551:65,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1553:65,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1554:65,3 [15] StringLiterals.cshtml) - Html - This is line 66
+                    IntermediateToken - (1569:65,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1573:65,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1575:66,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1577:66,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1578:66,3 [15] StringLiterals.cshtml) - Html - This is line 67
+                    IntermediateToken - (1593:66,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1597:66,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1599:67,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1601:67,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1602:67,3 [15] StringLiterals.cshtml) - Html - This is line 68
+                    IntermediateToken - (1617:67,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1621:67,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1623:68,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1625:68,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1626:68,3 [15] StringLiterals.cshtml) - Html - This is line 69
+                    IntermediateToken - (1641:68,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1645:68,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1647:69,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1649:69,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1650:69,3 [15] StringLiterals.cshtml) - Html - This is line 70
+                    IntermediateToken - (1665:69,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1669:69,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1671:70,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1673:70,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1674:70,3 [15] StringLiterals.cshtml) - Html - This is line 71
+                    IntermediateToken - (1689:70,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1693:70,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1695:71,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1697:71,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1698:71,3 [15] StringLiterals.cshtml) - Html - This is line 72
+                    IntermediateToken - (1713:71,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1717:71,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1719:72,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1721:72,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1722:72,3 [15] StringLiterals.cshtml) - Html - This is line 73
+                    IntermediateToken - (1737:72,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1741:72,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1743:73,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1745:73,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1746:73,3 [15] StringLiterals.cshtml) - Html - This is line 74
+                    IntermediateToken - (1761:73,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1765:73,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1767:74,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1769:74,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1770:74,3 [15] StringLiterals.cshtml) - Html - This is line 75
+                    IntermediateToken - (1785:74,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1789:74,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1791:75,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1793:75,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1794:75,3 [15] StringLiterals.cshtml) - Html - This is line 76
+                    IntermediateToken - (1809:75,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1813:75,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1815:76,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1817:76,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1818:76,3 [15] StringLiterals.cshtml) - Html - This is line 77
+                    IntermediateToken - (1833:76,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1837:76,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1839:77,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1841:77,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1842:77,3 [15] StringLiterals.cshtml) - Html - This is line 78
+                    IntermediateToken - (1857:77,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1861:77,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1863:78,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1865:78,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1866:78,3 [15] StringLiterals.cshtml) - Html - This is line 79
+                    IntermediateToken - (1881:78,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1885:78,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1887:79,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1889:79,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1890:79,3 [15] StringLiterals.cshtml) - Html - This is line 80
+                    IntermediateToken - (1905:79,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1909:79,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1911:80,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1913:80,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1914:80,3 [15] StringLiterals.cshtml) - Html - This is line 81
+                    IntermediateToken - (1929:80,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1933:80,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1935:81,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1937:81,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1938:81,3 [15] StringLiterals.cshtml) - Html - This is line 82
+                    IntermediateToken - (1953:81,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1957:81,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1959:82,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1961:82,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1962:82,3 [15] StringLiterals.cshtml) - Html - This is line 83
+                    IntermediateToken - (1977:82,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (1981:82,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (1983:83,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (1985:83,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (1986:83,3 [15] StringLiterals.cshtml) - Html - This is line 84
+                    IntermediateToken - (2001:83,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (2005:83,22 [3] StringLiterals.cshtml) - Html - <br
+                    IntermediateToken - (2008:83,25 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (2009:83,26 [4] StringLiterals.cshtml) - Html - \n\n
+                Section -  - WriteLiteralsToInHere
+                    HtmlContent - (2045:85,32 [2618] StringLiterals.cshtml)
+                        IntermediateToken - (2045:85,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2051:86,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2053:86,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2054:86,7 [21] StringLiterals.cshtml) - Html - This is line 1 nested
+                        IntermediateToken - (2075:86,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2079:86,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2085:87,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2087:87,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2088:87,7 [21] StringLiterals.cshtml) - Html - This is line 2 nested
+                        IntermediateToken - (2109:87,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2113:87,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2119:88,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2121:88,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2122:88,7 [21] StringLiterals.cshtml) - Html - This is line 3 nested
+                        IntermediateToken - (2143:88,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2147:88,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2153:89,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2155:89,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2156:89,7 [21] StringLiterals.cshtml) - Html - This is line 4 nested
+                        IntermediateToken - (2177:89,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2181:89,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2187:90,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2189:90,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2190:90,7 [21] StringLiterals.cshtml) - Html - This is line 5 nested
+                        IntermediateToken - (2211:90,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2215:90,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2221:91,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2223:91,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2224:91,7 [21] StringLiterals.cshtml) - Html - This is line 6 nested
+                        IntermediateToken - (2245:91,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2249:91,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2255:92,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2257:92,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2258:92,7 [21] StringLiterals.cshtml) - Html - This is line 7 nested
+                        IntermediateToken - (2279:92,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2283:92,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2289:93,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2291:93,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2292:93,7 [21] StringLiterals.cshtml) - Html - This is line 8 nested
+                        IntermediateToken - (2313:93,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2317:93,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2323:94,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2325:94,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2326:94,7 [21] StringLiterals.cshtml) - Html - This is line 9 nested
+                        IntermediateToken - (2347:94,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2351:94,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2357:95,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2359:95,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2360:95,7 [22] StringLiterals.cshtml) - Html - This is line 10 nested
+                        IntermediateToken - (2382:95,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2386:95,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2392:96,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2394:96,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2395:96,7 [22] StringLiterals.cshtml) - Html - This is line 11 nested
+                        IntermediateToken - (2417:96,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2421:96,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2427:97,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2429:97,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2430:97,7 [22] StringLiterals.cshtml) - Html - This is line 12 nested
+                        IntermediateToken - (2452:97,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2456:97,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2462:98,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2464:98,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2465:98,7 [22] StringLiterals.cshtml) - Html - This is line 13 nested
+                        IntermediateToken - (2487:98,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2491:98,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2497:99,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2499:99,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2500:99,7 [22] StringLiterals.cshtml) - Html - This is line 14 nested
+                        IntermediateToken - (2522:99,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2526:99,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2532:100,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2534:100,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2535:100,7 [22] StringLiterals.cshtml) - Html - This is line 15 nested
+                        IntermediateToken - (2557:100,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2561:100,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2567:101,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2569:101,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2570:101,7 [22] StringLiterals.cshtml) - Html - This is line 16 nested
+                        IntermediateToken - (2592:101,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2596:101,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2602:102,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2604:102,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2605:102,7 [22] StringLiterals.cshtml) - Html - This is line 17 nested
+                        IntermediateToken - (2627:102,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2631:102,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2637:103,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2639:103,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2640:103,7 [22] StringLiterals.cshtml) - Html - This is line 18 nested
+                        IntermediateToken - (2662:103,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2666:103,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2672:104,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2674:104,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2675:104,7 [22] StringLiterals.cshtml) - Html - This is line 19 nested
+                        IntermediateToken - (2697:104,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2701:104,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2707:105,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2709:105,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2710:105,7 [22] StringLiterals.cshtml) - Html - This is line 20 nested
+                        IntermediateToken - (2732:105,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2736:105,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2742:106,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2744:106,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2745:106,7 [22] StringLiterals.cshtml) - Html - This is line 21 nested
+                        IntermediateToken - (2767:106,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2771:106,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2777:107,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2779:107,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2780:107,7 [22] StringLiterals.cshtml) - Html - This is line 22 nested
+                        IntermediateToken - (2802:107,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2806:107,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2812:108,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2814:108,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2815:108,7 [22] StringLiterals.cshtml) - Html - This is line 23 nested
+                        IntermediateToken - (2837:108,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2841:108,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2847:109,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2849:109,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2850:109,7 [22] StringLiterals.cshtml) - Html - This is line 24 nested
+                        IntermediateToken - (2872:109,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2876:109,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2882:110,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2884:110,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2885:110,7 [22] StringLiterals.cshtml) - Html - This is line 25 nested
+                        IntermediateToken - (2907:110,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2911:110,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2917:111,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2919:111,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2920:111,7 [22] StringLiterals.cshtml) - Html - This is line 26 nested
+                        IntermediateToken - (2942:111,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2946:111,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2952:112,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2954:112,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2955:112,7 [22] StringLiterals.cshtml) - Html - This is line 27 nested
+                        IntermediateToken - (2977:112,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (2981:112,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (2987:113,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (2989:113,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (2990:113,7 [22] StringLiterals.cshtml) - Html - This is line 28 nested
+                        IntermediateToken - (3012:113,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3016:113,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3022:114,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3024:114,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3025:114,7 [22] StringLiterals.cshtml) - Html - This is line 29 nested
+                        IntermediateToken - (3047:114,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3051:114,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3057:115,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3059:115,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3060:115,7 [22] StringLiterals.cshtml) - Html - This is line 30 nested
+                        IntermediateToken - (3082:115,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3086:115,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3092:116,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3094:116,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3095:116,7 [22] StringLiterals.cshtml) - Html - This is line 31 nested
+                        IntermediateToken - (3117:116,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3121:116,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3127:117,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3129:117,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3130:117,7 [22] StringLiterals.cshtml) - Html - This is line 32 nested
+                        IntermediateToken - (3152:117,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3156:117,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3162:118,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3164:118,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3165:118,7 [22] StringLiterals.cshtml) - Html - This is line 33 nested
+                        IntermediateToken - (3187:118,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3191:118,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3197:119,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3199:119,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3200:119,7 [22] StringLiterals.cshtml) - Html - This is line 34 nested
+                        IntermediateToken - (3222:119,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3226:119,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3232:120,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3234:120,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3235:120,7 [22] StringLiterals.cshtml) - Html - This is line 35 nested
+                        IntermediateToken - (3257:120,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3261:120,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3267:121,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3269:121,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3270:121,7 [22] StringLiterals.cshtml) - Html - This is line 36 nested
+                        IntermediateToken - (3292:121,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3296:121,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3302:122,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3304:122,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3305:122,7 [22] StringLiterals.cshtml) - Html - This is line 37 nested
+                        IntermediateToken - (3327:122,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3331:122,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3337:123,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3339:123,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3340:123,7 [22] StringLiterals.cshtml) - Html - This is line 38 nested
+                        IntermediateToken - (3362:123,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3366:123,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3372:124,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3374:124,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3375:124,7 [22] StringLiterals.cshtml) - Html - This is line 39 nested
+                        IntermediateToken - (3397:124,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3401:124,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3407:125,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3409:125,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3410:125,7 [22] StringLiterals.cshtml) - Html - This is line 40 nested
+                        IntermediateToken - (3432:125,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3436:125,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3442:126,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3444:126,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3445:126,7 [22] StringLiterals.cshtml) - Html - This is line 41 nested
+                        IntermediateToken - (3467:126,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3471:126,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3477:127,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3479:127,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3480:127,7 [22] StringLiterals.cshtml) - Html - This is line 42 nested
+                        IntermediateToken - (3502:127,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3506:127,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3512:128,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3514:128,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3515:128,7 [22] StringLiterals.cshtml) - Html - This is line 43 nested
+                        IntermediateToken - (3537:128,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3541:128,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3547:129,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3549:129,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3550:129,7 [22] StringLiterals.cshtml) - Html - This is line 44 nested
+                        IntermediateToken - (3572:129,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3576:129,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3582:130,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3584:130,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3585:130,7 [22] StringLiterals.cshtml) - Html - This is line 45 nested
+                        IntermediateToken - (3607:130,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3611:130,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3617:131,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3619:131,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3620:131,7 [22] StringLiterals.cshtml) - Html - This is line 46 nested
+                        IntermediateToken - (3642:131,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3646:131,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3652:132,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3654:132,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3655:132,7 [22] StringLiterals.cshtml) - Html - This is line 47 nested
+                        IntermediateToken - (3677:132,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3681:132,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3687:133,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3689:133,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3690:133,7 [22] StringLiterals.cshtml) - Html - This is line 48 nested
+                        IntermediateToken - (3712:133,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3716:133,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3722:134,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3724:134,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3725:134,7 [22] StringLiterals.cshtml) - Html - This is line 49 nested
+                        IntermediateToken - (3747:134,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3751:134,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3757:135,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3759:135,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3760:135,7 [22] StringLiterals.cshtml) - Html - This is line 50 nested
+                        IntermediateToken - (3782:135,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3786:135,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3792:136,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3794:136,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3795:136,7 [22] StringLiterals.cshtml) - Html - This is line 51 nested
+                        IntermediateToken - (3817:136,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3821:136,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3827:137,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3829:137,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3830:137,7 [22] StringLiterals.cshtml) - Html - This is line 52 nested
+                        IntermediateToken - (3852:137,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3856:137,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3862:138,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3864:138,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3865:138,7 [22] StringLiterals.cshtml) - Html - This is line 53 nested
+                        IntermediateToken - (3887:138,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3891:138,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3897:139,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3899:139,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3900:139,7 [22] StringLiterals.cshtml) - Html - This is line 54 nested
+                        IntermediateToken - (3922:139,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3926:139,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3932:140,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3934:140,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3935:140,7 [22] StringLiterals.cshtml) - Html - This is line 55 nested
+                        IntermediateToken - (3957:140,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3961:140,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (3967:141,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (3969:141,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (3970:141,7 [22] StringLiterals.cshtml) - Html - This is line 56 nested
+                        IntermediateToken - (3992:141,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (3996:141,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4002:142,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4004:142,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4005:142,7 [22] StringLiterals.cshtml) - Html - This is line 57 nested
+                        IntermediateToken - (4027:142,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4031:142,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4037:143,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4039:143,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4040:143,7 [22] StringLiterals.cshtml) - Html - This is line 58 nested
+                        IntermediateToken - (4062:143,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4066:143,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4072:144,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4074:144,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4075:144,7 [22] StringLiterals.cshtml) - Html - This is line 59 nested
+                        IntermediateToken - (4097:144,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4101:144,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4107:145,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4109:145,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4110:145,7 [22] StringLiterals.cshtml) - Html - This is line 60 nested
+                        IntermediateToken - (4132:145,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4136:145,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4142:146,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4144:146,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4145:146,7 [22] StringLiterals.cshtml) - Html - This is line 61 nested
+                        IntermediateToken - (4167:146,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4171:146,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4177:147,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4179:147,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4180:147,7 [22] StringLiterals.cshtml) - Html - This is line 62 nested
+                        IntermediateToken - (4202:147,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4206:147,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4212:148,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4214:148,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4215:148,7 [22] StringLiterals.cshtml) - Html - This is line 63 nested
+                        IntermediateToken - (4237:148,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4241:148,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4247:149,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4249:149,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4250:149,7 [22] StringLiterals.cshtml) - Html - This is line 64 nested
+                        IntermediateToken - (4272:149,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4276:149,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4282:150,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4284:150,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4285:150,7 [22] StringLiterals.cshtml) - Html - This is line 65 nested
+                        IntermediateToken - (4307:150,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4311:150,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4317:151,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4319:151,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4320:151,7 [22] StringLiterals.cshtml) - Html - This is line 66 nested
+                        IntermediateToken - (4342:151,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4346:151,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4352:152,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4354:152,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4355:152,7 [22] StringLiterals.cshtml) - Html - This is line 67 nested
+                        IntermediateToken - (4377:152,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4381:152,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4387:153,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4389:153,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4390:153,7 [22] StringLiterals.cshtml) - Html - This is line 68 nested
+                        IntermediateToken - (4412:153,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4416:153,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4422:154,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4424:154,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4425:154,7 [22] StringLiterals.cshtml) - Html - This is line 69 nested
+                        IntermediateToken - (4447:154,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4451:154,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4457:155,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4459:155,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4460:155,7 [22] StringLiterals.cshtml) - Html - This is line 70 nested
+                        IntermediateToken - (4482:155,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4486:155,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4492:156,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4494:156,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4495:156,7 [22] StringLiterals.cshtml) - Html - This is line 71 nested
+                        IntermediateToken - (4517:156,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4521:156,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4527:157,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4529:157,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4530:157,7 [22] StringLiterals.cshtml) - Html - This is line 72 nested
+                        IntermediateToken - (4552:157,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4556:157,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4562:158,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4564:158,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4565:158,7 [22] StringLiterals.cshtml) - Html - This is line 73 nested
+                        IntermediateToken - (4587:158,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4591:158,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4597:159,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4599:159,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4600:159,7 [22] StringLiterals.cshtml) - Html - This is line 74 nested
+                        IntermediateToken - (4622:159,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4626:159,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (4632:160,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (4634:160,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (4635:160,7 [22] StringLiterals.cshtml) - Html - This is line 75 nested
+                        IntermediateToken - (4657:160,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (4661:160,33 [2] StringLiterals.cshtml) - Html - \n
+                HtmlContent - (4666:162,0 [1026] StringLiterals.cshtml)
+                    IntermediateToken - (4666:162,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4668:162,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4669:162,3 [14] StringLiterals.cshtml) - Html - This is line 1
+                    IntermediateToken - (4683:162,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4687:162,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4689:163,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4691:163,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4692:163,3 [14] StringLiterals.cshtml) - Html - This is line 2
+                    IntermediateToken - (4706:163,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4710:163,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4712:164,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4714:164,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4715:164,3 [14] StringLiterals.cshtml) - Html - This is line 3
+                    IntermediateToken - (4729:164,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4733:164,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4735:165,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4737:165,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4738:165,3 [14] StringLiterals.cshtml) - Html - This is line 4
+                    IntermediateToken - (4752:165,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4756:165,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4758:166,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4760:166,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4761:166,3 [14] StringLiterals.cshtml) - Html - This is line 5
+                    IntermediateToken - (4775:166,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4779:166,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4781:167,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4783:167,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4784:167,3 [14] StringLiterals.cshtml) - Html - This is line 6
+                    IntermediateToken - (4798:167,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4802:167,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4804:168,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4806:168,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4807:168,3 [14] StringLiterals.cshtml) - Html - This is line 7
+                    IntermediateToken - (4821:168,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4825:168,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4827:169,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4829:169,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4830:169,3 [14] StringLiterals.cshtml) - Html - This is line 8
+                    IntermediateToken - (4844:169,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4848:169,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4850:170,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4852:170,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4853:170,3 [14] StringLiterals.cshtml) - Html - This is line 9
+                    IntermediateToken - (4867:170,17 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4871:170,21 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4873:171,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4875:171,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4876:171,3 [15] StringLiterals.cshtml) - Html - This is line 10
+                    IntermediateToken - (4891:171,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4895:171,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4897:172,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4899:172,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4900:172,3 [15] StringLiterals.cshtml) - Html - This is line 11
+                    IntermediateToken - (4915:172,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4919:172,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4921:173,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4923:173,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4924:173,3 [15] StringLiterals.cshtml) - Html - This is line 12
+                    IntermediateToken - (4939:173,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4943:173,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4945:174,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4947:174,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4948:174,3 [15] StringLiterals.cshtml) - Html - This is line 13
+                    IntermediateToken - (4963:174,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4967:174,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4969:175,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4971:175,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4972:175,3 [15] StringLiterals.cshtml) - Html - This is line 14
+                    IntermediateToken - (4987:175,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (4991:175,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (4993:176,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (4995:176,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (4996:176,3 [15] StringLiterals.cshtml) - Html - This is line 15
+                    IntermediateToken - (5011:176,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5015:176,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5017:177,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5019:177,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5020:177,3 [15] StringLiterals.cshtml) - Html - This is line 16
+                    IntermediateToken - (5035:177,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5039:177,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5041:178,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5043:178,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5044:178,3 [15] StringLiterals.cshtml) - Html - This is line 17
+                    IntermediateToken - (5059:178,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5063:178,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5065:179,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5067:179,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5068:179,3 [15] StringLiterals.cshtml) - Html - This is line 18
+                    IntermediateToken - (5083:179,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5087:179,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5089:180,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5091:180,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5092:180,3 [15] StringLiterals.cshtml) - Html - This is line 19
+                    IntermediateToken - (5107:180,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5111:180,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5113:181,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5115:181,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5116:181,3 [15] StringLiterals.cshtml) - Html - This is line 20
+                    IntermediateToken - (5131:181,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5135:181,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5137:182,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5139:182,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5140:182,3 [15] StringLiterals.cshtml) - Html - This is line 21
+                    IntermediateToken - (5155:182,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5159:182,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5161:183,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5163:183,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5164:183,3 [15] StringLiterals.cshtml) - Html - This is line 22
+                    IntermediateToken - (5179:183,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5183:183,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5185:184,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5187:184,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5188:184,3 [15] StringLiterals.cshtml) - Html - This is line 23
+                    IntermediateToken - (5203:184,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5207:184,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5209:185,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5211:185,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5212:185,3 [15] StringLiterals.cshtml) - Html - This is line 24
+                    IntermediateToken - (5227:185,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5231:185,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5233:186,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5235:186,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5236:186,3 [15] StringLiterals.cshtml) - Html - This is line 25
+                    IntermediateToken - (5251:186,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5255:186,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5257:187,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5259:187,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5260:187,3 [15] StringLiterals.cshtml) - Html - This is line 26
+                    IntermediateToken - (5275:187,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5279:187,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5281:188,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5283:188,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5284:188,3 [15] StringLiterals.cshtml) - Html - This is line 27
+                    IntermediateToken - (5299:188,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5303:188,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5305:189,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5307:189,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5308:189,3 [15] StringLiterals.cshtml) - Html - This is line 28
+                    IntermediateToken - (5323:189,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5327:189,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5329:190,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5331:190,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5332:190,3 [15] StringLiterals.cshtml) - Html - This is line 29
+                    IntermediateToken - (5347:190,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5351:190,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5353:191,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5355:191,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5356:191,3 [15] StringLiterals.cshtml) - Html - This is line 30
+                    IntermediateToken - (5371:191,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5375:191,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5377:192,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5379:192,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5380:192,3 [15] StringLiterals.cshtml) - Html - This is line 31
+                    IntermediateToken - (5395:192,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5399:192,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5401:193,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5403:193,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5404:193,3 [15] StringLiterals.cshtml) - Html - This is line 32
+                    IntermediateToken - (5419:193,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5423:193,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5425:194,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5427:194,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5428:194,3 [15] StringLiterals.cshtml) - Html - This is line 33
+                    IntermediateToken - (5443:194,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5447:194,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5449:195,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5451:195,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5452:195,3 [15] StringLiterals.cshtml) - Html - This is line 34
+                    IntermediateToken - (5467:195,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5471:195,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5473:196,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5475:196,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5476:196,3 [15] StringLiterals.cshtml) - Html - This is line 35
+                    IntermediateToken - (5491:196,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5495:196,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5497:197,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5499:197,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5500:197,3 [15] StringLiterals.cshtml) - Html - This is line 36
+                    IntermediateToken - (5515:197,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5519:197,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5521:198,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5523:198,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5524:198,3 [15] StringLiterals.cshtml) - Html - This is line 37
+                    IntermediateToken - (5539:198,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5543:198,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5545:199,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5547:199,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5548:199,3 [15] StringLiterals.cshtml) - Html - This is line 38
+                    IntermediateToken - (5563:199,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5567:199,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5569:200,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5571:200,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5572:200,3 [15] StringLiterals.cshtml) - Html - This is line 39
+                    IntermediateToken - (5587:200,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5591:200,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5593:201,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5595:201,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5596:201,3 [15] StringLiterals.cshtml) - Html - This is line 40
+                    IntermediateToken - (5611:201,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5615:201,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5617:202,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5619:202,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5620:202,3 [15] StringLiterals.cshtml) - Html - This is line 41
+                    IntermediateToken - (5635:202,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5639:202,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5641:203,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5643:203,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5644:203,3 [15] StringLiterals.cshtml) - Html - This is line 42
+                    IntermediateToken - (5659:203,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5663:203,22 [2] StringLiterals.cshtml) - Html - \n
+                    IntermediateToken - (5665:204,0 [2] StringLiterals.cshtml) - Html - <p
+                    IntermediateToken - (5667:204,2 [1] StringLiterals.cshtml) - Html - >
+                    IntermediateToken - (5668:204,3 [15] StringLiterals.cshtml) - Html - This is line 43
+                    IntermediateToken - (5683:204,18 [4] StringLiterals.cshtml) - Html - </p>
+                    IntermediateToken - (5687:204,22 [5] StringLiterals.cshtml) - Html - hi!\n
+                Section -  - WriteLiteralsToInHereAlso
+                    HtmlContent - (5728:205,36 [1023] StringLiterals.cshtml)
+                        IntermediateToken - (5728:205,36 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5734:206,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5736:206,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5737:206,7 [21] StringLiterals.cshtml) - Html - This is line 1 nested
+                        IntermediateToken - (5758:206,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5762:206,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5768:207,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5770:207,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5771:207,7 [21] StringLiterals.cshtml) - Html - This is line 2 nested
+                        IntermediateToken - (5792:207,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5796:207,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5802:208,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5804:208,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5805:208,7 [21] StringLiterals.cshtml) - Html - This is line 3 nested
+                        IntermediateToken - (5826:208,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5830:208,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5836:209,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5838:209,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5839:209,7 [21] StringLiterals.cshtml) - Html - This is line 4 nested
+                        IntermediateToken - (5860:209,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5864:209,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5870:210,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5872:210,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5873:210,7 [21] StringLiterals.cshtml) - Html - This is line 5 nested
+                        IntermediateToken - (5894:210,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5898:210,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5904:211,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5906:211,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5907:211,7 [21] StringLiterals.cshtml) - Html - This is line 6 nested
+                        IntermediateToken - (5928:211,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5932:211,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5938:212,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5940:212,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5941:212,7 [21] StringLiterals.cshtml) - Html - This is line 7 nested
+                        IntermediateToken - (5962:212,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (5966:212,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (5972:213,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (5974:213,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (5975:213,7 [21] StringLiterals.cshtml) - Html - This is line 8 nested
+                        IntermediateToken - (5996:213,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6000:213,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6006:214,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6008:214,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6009:214,7 [21] StringLiterals.cshtml) - Html - This is line 9 nested
+                        IntermediateToken - (6030:214,28 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6034:214,32 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6040:215,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6042:215,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6043:215,7 [22] StringLiterals.cshtml) - Html - This is line 10 nested
+                        IntermediateToken - (6065:215,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6069:215,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6075:216,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6077:216,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6078:216,7 [22] StringLiterals.cshtml) - Html - This is line 11 nested
+                        IntermediateToken - (6100:216,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6104:216,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6110:217,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6112:217,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6113:217,7 [22] StringLiterals.cshtml) - Html - This is line 12 nested
+                        IntermediateToken - (6135:217,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6139:217,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6145:218,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6147:218,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6148:218,7 [22] StringLiterals.cshtml) - Html - This is line 13 nested
+                        IntermediateToken - (6170:218,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6174:218,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6180:219,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6182:219,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6183:219,7 [22] StringLiterals.cshtml) - Html - This is line 14 nested
+                        IntermediateToken - (6205:219,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6209:219,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6215:220,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6217:220,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6218:220,7 [22] StringLiterals.cshtml) - Html - This is line 15 nested
+                        IntermediateToken - (6240:220,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6244:220,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6250:221,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6252:221,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6253:221,7 [22] StringLiterals.cshtml) - Html - This is line 16 nested
+                        IntermediateToken - (6275:221,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6279:221,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6285:222,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6287:222,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6288:222,7 [22] StringLiterals.cshtml) - Html - This is line 17 nested
+                        IntermediateToken - (6310:222,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6314:222,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6320:223,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6322:223,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6323:223,7 [22] StringLiterals.cshtml) - Html - This is line 18 nested
+                        IntermediateToken - (6345:223,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6349:223,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6355:224,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6357:224,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6358:224,7 [22] StringLiterals.cshtml) - Html - This is line 19 nested
+                        IntermediateToken - (6380:224,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6384:224,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6390:225,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6392:225,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6393:225,7 [22] StringLiterals.cshtml) - Html - This is line 20 nested
+                        IntermediateToken - (6415:225,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6419:225,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6425:226,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6427:226,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6428:226,7 [22] StringLiterals.cshtml) - Html - This is line 21 nested
+                        IntermediateToken - (6450:226,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6454:226,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6460:227,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6462:227,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6463:227,7 [22] StringLiterals.cshtml) - Html - This is line 22 nested
+                        IntermediateToken - (6485:227,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6489:227,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6495:228,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6497:228,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6498:228,7 [22] StringLiterals.cshtml) - Html - This is line 23 nested
+                        IntermediateToken - (6520:228,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6524:228,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6530:229,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6532:229,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6533:229,7 [22] StringLiterals.cshtml) - Html - This is line 24 nested
+                        IntermediateToken - (6555:229,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6559:229,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6565:230,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6567:230,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6568:230,7 [22] StringLiterals.cshtml) - Html - This is line 25 nested
+                        IntermediateToken - (6590:230,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6594:230,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6600:231,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6602:231,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6603:231,7 [22] StringLiterals.cshtml) - Html - This is line 26 nested
+                        IntermediateToken - (6625:231,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6629:231,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6635:232,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6637:232,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6638:232,7 [22] StringLiterals.cshtml) - Html - This is line 27 nested
+                        IntermediateToken - (6660:232,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6664:232,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6670:233,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6672:233,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6673:233,7 [22] StringLiterals.cshtml) - Html - This is line 28 nested
+                        IntermediateToken - (6695:233,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6699:233,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6705:234,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6707:234,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6708:234,7 [22] StringLiterals.cshtml) - Html - This is line 29 nested
+                        IntermediateToken - (6730:234,29 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6734:234,33 [6] StringLiterals.cshtml) - Html - \n    
+                        IntermediateToken - (6740:235,4 [2] StringLiterals.cshtml) - Html - <p
+                        IntermediateToken - (6742:235,6 [1] StringLiterals.cshtml) - Html - >
+                        IntermediateToken - (6743:235,7 [2] StringLiterals.cshtml) - Html - 30
+                        IntermediateToken - (6745:235,9 [4] StringLiterals.cshtml) - Html - </p>
+                        IntermediateToken - (6749:235,13 [2] StringLiterals.cshtml) - Html - \n
+                HtmlContent - (6752:236,1 [1] StringLiterals.cshtml)
+                    IntermediateToken - (6752:236,1 [1] StringLiterals.cshtml) - Html - !
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml
new file mode 100644
index 0000000000..c653cff1b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml
@@ -0,0 +1,19 @@
+@addTagHelper *, TestAssembly
+
+<ul [item]="items"></ul>
+<ul [(item)]="items"></ul>
+<button (click)="doSomething()">Click Me</button>
+<button (^click)="doSomething()">Click Me</button>
+<template *something="value">
+</template>
+<div #local></div>
+<div #local="value"></div>
+
+<ul bound [item]="items" [item]="items"></ul>
+<ul bound [(item)]="items" [(item)]="items"></ul>
+<button bound (click)="doSomething()" (click)="doSomething()">Click Me</button>
+<button bound (^click)="doSomething()" (^click)="doSomething()">Click Me</button>
+<template bound *something="value" *something="value">
+</template>
+<div bound #localminimized></div>
+<div bound #local="value" #local="value"></div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2175a523ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
@@ -0,0 +1,70 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_DesignTime
+    {
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.ListItems = items;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.ArrayItems = items;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.Event1 = doSomething();
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.Event2 = doSomething();
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_CatchAllTagHelper.StringProperty1 = "value";
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __TestNamespace_CatchAllTagHelper.StringProperty2 = "value";
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1ee160ff70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.diagnostics.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.Collections.Generic.List<string> TestNamespace.CatchAllTagHelper.ListItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.Collections.Generic.List<string> TestNamespace.CatchAllTagHelper.ListItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.String[] TestNamespace.CatchAllTagHelper.ArrayItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.String[] TestNamespace.CatchAllTagHelper.ArrayItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'string TestNamespace.CatchAllTagHelper.StringProperty1' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..5315700a1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt
@@ -0,0 +1,140 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] SymbolBoundAttributes.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [255] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (29:0,29 [4] SymbolBoundAttributes.cshtml) - Html - \n\n
+                    IntermediateToken - (33:2,0 [3] SymbolBoundAttributes.cshtml) - Html - <ul
+                    IntermediateToken - (36:2,3 [15] SymbolBoundAttributes.cshtml) - Html -  [item]="items"
+                    IntermediateToken - (51:2,18 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (52:2,19 [5] SymbolBoundAttributes.cshtml) - Html - </ul>
+                    IntermediateToken - (57:2,24 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (59:3,0 [3] SymbolBoundAttributes.cshtml) - Html - <ul
+                    IntermediateToken - (62:3,3 [17] SymbolBoundAttributes.cshtml) - Html -  [(item)]="items"
+                    IntermediateToken - (79:3,20 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (80:3,21 [5] SymbolBoundAttributes.cshtml) - Html - </ul>
+                    IntermediateToken - (85:3,26 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (87:4,0 [7] SymbolBoundAttributes.cshtml) - Html - <button
+                    IntermediateToken - (94:4,7 [24] SymbolBoundAttributes.cshtml) - Html -  (click)="doSomething()"
+                    IntermediateToken - (118:4,31 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (119:4,32 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    IntermediateToken - (127:4,40 [9] SymbolBoundAttributes.cshtml) - Html - </button>
+                    IntermediateToken - (136:4,49 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (138:5,0 [7] SymbolBoundAttributes.cshtml) - Html - <button
+                    IntermediateToken - (145:5,7 [25] SymbolBoundAttributes.cshtml) - Html -  (^click)="doSomething()"
+                    IntermediateToken - (170:5,32 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (171:5,33 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    IntermediateToken - (179:5,41 [9] SymbolBoundAttributes.cshtml) - Html - </button>
+                    IntermediateToken - (188:5,50 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (190:6,0 [9] SymbolBoundAttributes.cshtml) - Html - <template
+                    IntermediateToken - (199:6,9 [19] SymbolBoundAttributes.cshtml) - Html -  *something="value"
+                    IntermediateToken - (218:6,28 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (219:6,29 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (221:7,0 [11] SymbolBoundAttributes.cshtml) - Html - </template>
+                    IntermediateToken - (232:7,11 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (234:8,0 [4] SymbolBoundAttributes.cshtml) - Html - <div
+                    IntermediateToken - (238:8,4 [7] SymbolBoundAttributes.cshtml) - Html -  #local
+                    IntermediateToken - (245:8,11 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (246:8,12 [6] SymbolBoundAttributes.cshtml) - Html - </div>
+                    IntermediateToken - (252:8,18 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (254:9,0 [4] SymbolBoundAttributes.cshtml) - Html - <div
+                    IntermediateToken - (258:9,4 [15] SymbolBoundAttributes.cshtml) - Html -  #local="value"
+                    IntermediateToken - (273:9,19 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (274:9,20 [6] SymbolBoundAttributes.cshtml) - Html - </div>
+                    IntermediateToken - (280:9,26 [4] SymbolBoundAttributes.cshtml) - Html - \n\n
+                TagHelper - (284:11,0 [45] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (302:11,18 [5] SymbolBoundAttributes.cshtml) - [item] - System.Collections.Generic.List<string> TestNamespace.CatchAllTagHelper.ListItems - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (302:11,18 [5] SymbolBoundAttributes.cshtml) - CSharp - items
+                    DefaultTagHelperHtmlAttribute -  - [item] - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (317:11,33 [5] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (317:11,33 [5] SymbolBoundAttributes.cshtml) - Html - items
+                    DefaultTagHelperExecute - 
+                HtmlContent - (329:11,45 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (329:11,45 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (331:12,0 [49] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (351:12,20 [5] SymbolBoundAttributes.cshtml) - [(item)] - System.String[] TestNamespace.CatchAllTagHelper.ArrayItems - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (351:12,20 [5] SymbolBoundAttributes.cshtml) - CSharp - items
+                    DefaultTagHelperHtmlAttribute -  - [(item)] - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (368:12,37 [5] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (368:12,37 [5] SymbolBoundAttributes.cshtml) - Html - items
+                    DefaultTagHelperExecute - 
+                HtmlContent - (380:12,49 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (380:12,49 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (382:13,0 [79] SymbolBoundAttributes.cshtml) - button - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (444:13,62 [8] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (444:13,62 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (405:13,23 [13] SymbolBoundAttributes.cshtml) - (click) - System.Action TestNamespace.CatchAllTagHelper.Event1 - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (405:13,23 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething()
+                    DefaultTagHelperHtmlAttribute -  - (click) - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (429:13,47 [13] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (429:13,47 [13] SymbolBoundAttributes.cshtml) - Html - doSomething()
+                    DefaultTagHelperExecute - 
+                HtmlContent - (461:13,79 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (461:13,79 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (463:14,0 [81] SymbolBoundAttributes.cshtml) - button - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (527:14,64 [8] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (527:14,64 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (487:14,24 [13] SymbolBoundAttributes.cshtml) - (^click) - System.Action TestNamespace.CatchAllTagHelper.Event2 - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (487:14,24 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething()
+                    DefaultTagHelperHtmlAttribute -  - (^click) - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (512:14,49 [13] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (512:14,49 [13] SymbolBoundAttributes.cshtml) - Html - doSomething()
+                    DefaultTagHelperExecute - 
+                HtmlContent - (544:14,81 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (544:14,81 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (546:15,0 [67] SymbolBoundAttributes.cshtml) - template - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (600:15,54 [2] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (600:15,54 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (574:15,28 [5] SymbolBoundAttributes.cshtml) - *something - string TestNamespace.CatchAllTagHelper.StringProperty1 - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (574:15,28 [5] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (574:15,28 [5] SymbolBoundAttributes.cshtml) - Html - value
+                    DefaultTagHelperHtmlAttribute -  - *something - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (593:15,47 [5] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (593:15,47 [5] SymbolBoundAttributes.cshtml) - Html - value
+                    DefaultTagHelperExecute - 
+                HtmlContent - (613:16,11 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (613:16,11 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (615:17,0 [33] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperHtmlAttribute -  - #localminimized - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
+                HtmlContent - (648:17,33 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (648:17,33 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (650:18,0 [47] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (669:18,19 [5] SymbolBoundAttributes.cshtml) - #local - string TestNamespace.CatchAllTagHelper.StringProperty2 - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (669:18,19 [5] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (669:18,19 [5] SymbolBoundAttributes.cshtml) - Html - value
+                    DefaultTagHelperHtmlAttribute -  - #local - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (684:18,34 [5] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (684:18,34 [5] SymbolBoundAttributes.cshtml) - Html - value
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..37301c4302
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
+|*, TestAssembly|
+Generated Location: (636:13,38 [15] )
+|*, TestAssembly|
+
+Source Location: (302:11,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
+|items|
+Generated Location: (1291:31,46 [5] )
+|items|
+
+Source Location: (351:12,20 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
+|items|
+Generated Location: (1622:39,47 [5] )
+|items|
+
+Source Location: (405:13,23 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
+|doSomething()|
+Generated Location: (1949:47,43 [13] )
+|doSomething()|
+
+Source Location: (487:14,24 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
+|doSomething()|
+Generated Location: (2284:55,43 [13] )
+|doSomething()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..187ebaa6a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs
@@ -0,0 +1,205 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "911fabc92d64c2732fa0cff025d454076241edb8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"911fabc92d64c2732fa0cff025d454076241edb8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("[item]", new global::Microsoft.AspNetCore.Html.HtmlString("items"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("[(item)]", new global::Microsoft.AspNetCore.Html.HtmlString("items"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("(click)", new global::Microsoft.AspNetCore.Html.HtmlString("doSomething()"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("(^click)", new global::Microsoft.AspNetCore.Html.HtmlString("doSomething()"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("*something", "value", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("*something", new global::Microsoft.AspNetCore.Html.HtmlString("value"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#local", "value", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#local", new global::Microsoft.AspNetCore.Html.HtmlString("value"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n<ul [item]=\"items\"></ul>\r\n<ul [(item)]=\"items\"></ul>\r\n<button (click)=\"doSomething()\">Click Me</button>\r\n<button (^click)=\"doSomething()\">Click Me</button>\r\n<template *something=\"value\">\r\n</template>\r\n<div #local></div>\r\n<div #local=\"value\"></div>\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("ul", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.ListItems = items;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("[item]", __TestNamespace_CatchAllTagHelper.ListItems, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("ul", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.ArrayItems = items;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("[(item)]", __TestNamespace_CatchAllTagHelper.ArrayItems, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Click Me");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.Event1 = doSomething();
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("(click)", __TestNamespace_CatchAllTagHelper.Event1, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Click Me");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
+__TestNamespace_CatchAllTagHelper.Event2 = doSomething();
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("(^click)", __TestNamespace_CatchAllTagHelper.Event2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("template", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n");
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+            __TestNamespace_CatchAllTagHelper.StringProperty1 = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("#localminimized", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
+            BeginWriteTagHelperAttribute();
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("bound", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized);
+            __TestNamespace_CatchAllTagHelper.StringProperty2 = (string)__tagHelperAttribute_6.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_6);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_7);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1ee160ff70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.diagnostics.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.Collections.Generic.List<string> TestNamespace.CatchAllTagHelper.ListItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.Collections.Generic.List<string> TestNamespace.CatchAllTagHelper.ListItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.String[] TestNamespace.CatchAllTagHelper.ArrayItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'System.String[] TestNamespace.CatchAllTagHelper.ArrayItems' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property 'string TestNamespace.CatchAllTagHelper.StringProperty1' on tag helper 'TestNamespace.CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..ee4dc7af83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt
@@ -0,0 +1,126 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - [item] - items - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - [(item)] - items - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - (click) - doSomething() - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - (^click) - doSomething() - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_4 - *something - value - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - *something - value - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_6 - #local - value - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_7 - #local - value - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.CatchAllTagHelper - __TestNamespace_CatchAllTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [253] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (31:1,0 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (33:2,0 [3] SymbolBoundAttributes.cshtml) - Html - <ul
+                    IntermediateToken - (36:2,3 [15] SymbolBoundAttributes.cshtml) - Html -  [item]="items"
+                    IntermediateToken - (51:2,18 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (52:2,19 [5] SymbolBoundAttributes.cshtml) - Html - </ul>
+                    IntermediateToken - (57:2,24 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (59:3,0 [3] SymbolBoundAttributes.cshtml) - Html - <ul
+                    IntermediateToken - (62:3,3 [17] SymbolBoundAttributes.cshtml) - Html -  [(item)]="items"
+                    IntermediateToken - (79:3,20 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (80:3,21 [5] SymbolBoundAttributes.cshtml) - Html - </ul>
+                    IntermediateToken - (85:3,26 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (87:4,0 [7] SymbolBoundAttributes.cshtml) - Html - <button
+                    IntermediateToken - (94:4,7 [24] SymbolBoundAttributes.cshtml) - Html -  (click)="doSomething()"
+                    IntermediateToken - (118:4,31 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (119:4,32 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    IntermediateToken - (127:4,40 [9] SymbolBoundAttributes.cshtml) - Html - </button>
+                    IntermediateToken - (136:4,49 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (138:5,0 [7] SymbolBoundAttributes.cshtml) - Html - <button
+                    IntermediateToken - (145:5,7 [25] SymbolBoundAttributes.cshtml) - Html -  (^click)="doSomething()"
+                    IntermediateToken - (170:5,32 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (171:5,33 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    IntermediateToken - (179:5,41 [9] SymbolBoundAttributes.cshtml) - Html - </button>
+                    IntermediateToken - (188:5,50 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (190:6,0 [9] SymbolBoundAttributes.cshtml) - Html - <template
+                    IntermediateToken - (199:6,9 [19] SymbolBoundAttributes.cshtml) - Html -  *something="value"
+                    IntermediateToken - (218:6,28 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (219:6,29 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (221:7,0 [11] SymbolBoundAttributes.cshtml) - Html - </template>
+                    IntermediateToken - (232:7,11 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (234:8,0 [4] SymbolBoundAttributes.cshtml) - Html - <div
+                    IntermediateToken - (238:8,4 [7] SymbolBoundAttributes.cshtml) - Html -  #local
+                    IntermediateToken - (245:8,11 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (246:8,12 [6] SymbolBoundAttributes.cshtml) - Html - </div>
+                    IntermediateToken - (252:8,18 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (254:9,0 [4] SymbolBoundAttributes.cshtml) - Html - <div
+                    IntermediateToken - (258:9,4 [15] SymbolBoundAttributes.cshtml) - Html -  #local="value"
+                    IntermediateToken - (273:9,19 [1] SymbolBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (274:9,20 [6] SymbolBoundAttributes.cshtml) - Html - </div>
+                    IntermediateToken - (280:9,26 [4] SymbolBoundAttributes.cshtml) - Html - \n\n
+                TagHelper - (284:11,0 [45] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (302:11,18 [5] SymbolBoundAttributes.cshtml) - [item] - System.Collections.Generic.List<string> TestNamespace.CatchAllTagHelper.ListItems - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (302:11,18 [5] SymbolBoundAttributes.cshtml) - CSharp - items
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (329:11,45 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (329:11,45 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (331:12,0 [49] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (351:12,20 [5] SymbolBoundAttributes.cshtml) - [(item)] - System.String[] TestNamespace.CatchAllTagHelper.ArrayItems - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (351:12,20 [5] SymbolBoundAttributes.cshtml) - CSharp - items
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperExecute - 
+                HtmlContent - (380:12,49 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (380:12,49 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (382:13,0 [79] SymbolBoundAttributes.cshtml) - button - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (444:13,62 [8] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (444:13,62 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (405:13,23 [13] SymbolBoundAttributes.cshtml) - (click) - System.Action TestNamespace.CatchAllTagHelper.Event1 - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (405:13,23 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething()
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (461:13,79 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (461:13,79 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (463:14,0 [81] SymbolBoundAttributes.cshtml) - button - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (527:14,64 [8] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (527:14,64 [8] SymbolBoundAttributes.cshtml) - Html - Click Me
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperProperty - (487:14,24 [13] SymbolBoundAttributes.cshtml) - (^click) - System.Action TestNamespace.CatchAllTagHelper.Event2 - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (487:14,24 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething()
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    DefaultTagHelperExecute - 
+                HtmlContent - (544:14,81 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (544:14,81 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (546:15,0 [67] SymbolBoundAttributes.cshtml) - template - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (600:15,54 [2] SymbolBoundAttributes.cshtml)
+                            IntermediateToken - (600:15,54 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    PreallocatedTagHelperProperty - (574:15,28 [5] SymbolBoundAttributes.cshtml) - __tagHelperAttribute_4 - *something - StringProperty1
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                    DefaultTagHelperExecute - 
+                HtmlContent - (613:16,11 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (613:16,11 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (615:17,0 [33] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperHtmlAttribute -  - #localminimized - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
+                HtmlContent - (648:17,33 [2] SymbolBoundAttributes.cshtml)
+                    IntermediateToken - (648:17,33 [2] SymbolBoundAttributes.cshtml) - Html - \n
+                TagHelper - (650:18,0 [47] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.CatchAllTagHelper
+                    DefaultTagHelperHtmlAttribute -  - bound - HtmlAttributeValueStyle.Minimized
+                    PreallocatedTagHelperProperty - (669:18,19 [5] SymbolBoundAttributes.cshtml) - __tagHelperAttribute_6 - #local - StringProperty2
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_7
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml
new file mode 100644
index 0000000000..12d0afd197
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml
@@ -0,0 +1,20 @@
+@addTagHelper "*, TestAssembly"
+
+@{
+    var code = "some code";
+}
+
+@section MySection {
+    <div>
+        <mytaghelper boundproperty="Current Time: @DateTime.Now" unboundproperty="Current Time: @DateTime.Now">
+            In None ContentBehavior.
+            <nestedtaghelper>Some buffered values with @code</nestedtaghelper>
+        </mytaghelper>
+    </div>
+
+    @section nestedsection  {
+        <div>
+            <nestedtaghelper></nestedtaghelper>
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7c12b772e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
@@ -0,0 +1,90 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_DesignTime
+    {
+        private global::TestNamespace.MyTagHelper __TestNamespace_MyTagHelper;
+        private global::TestNamespace.NestedTagHelper __TestNamespace_NestedTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+global::System.Object MySection = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+global::System.Object nestedsection = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+  
+    var code = "some code";
+
+#line default
+#line hidden
+#nullable disable
+            DefineSection("MySection", async(__razor_section_writer) => {
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+                                                  __o = code;
+
+#line default
+#line hidden
+#nullable disable
+                __TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
+                __TestNamespace_MyTagHelper = CreateTagHelper<global::TestNamespace.MyTagHelper>();
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+                                             __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+                __TestNamespace_MyTagHelper.BoundProperty = string.Empty;
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+                                                                                           __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+                __TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..0efe33796f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml(15,5): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.ir.txt
new file mode 100644
index 0000000000..1f073cdb22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.ir.txt
@@ -0,0 +1,80 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.MyTagHelper - __TestNamespace_MyTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.NestedTagHelper - __TestNamespace_NestedTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] TagHelpersInSection.cshtml) - "*, TestAssembly"
+                DirectiveToken - (82:6,9 [9] TagHelpersInSection.cshtml) - MySection
+                DirectiveToken - (388:14,13 [13] TagHelpersInSection.cshtml) - nestedsection
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] TagHelpersInSection.cshtml)
+                    IntermediateToken - (31:0,31 [4] TagHelpersInSection.cshtml) - Html - \n\n
+                CSharpCode - (37:2,2 [31] TagHelpersInSection.cshtml)
+                    IntermediateToken - (37:2,2 [31] TagHelpersInSection.cshtml) - CSharp - \n    var code = "some code";\n
+                HtmlContent - (71:5,0 [2] TagHelpersInSection.cshtml)
+                    IntermediateToken - (71:5,0 [2] TagHelpersInSection.cshtml) - Html - \n
+                Section -  - MySection
+                    HtmlContent - (93:6,20 [21] TagHelpersInSection.cshtml)
+                        IntermediateToken - (93:6,20 [6] TagHelpersInSection.cshtml) - Html - \n    
+                        IntermediateToken - (99:7,4 [4] TagHelpersInSection.cshtml) - Html - <div
+                        IntermediateToken - (103:7,8 [1] TagHelpersInSection.cshtml) - Html - >
+                        IntermediateToken - (104:7,9 [10] TagHelpersInSection.cshtml) - Html - \n        
+                    TagHelper - (114:8,8 [245] TagHelpersInSection.cshtml) - mytaghelper - TagMode.StartTagAndEndTag
+                        DefaultTagHelperBody - 
+                            HtmlContent - (217:8,111 [52] TagHelpersInSection.cshtml)
+                                IntermediateToken - (217:8,111 [52] TagHelpersInSection.cshtml) - Html - \n            In None ContentBehavior.\n            
+                            TagHelper - (269:10,12 [66] TagHelpersInSection.cshtml) - nestedtaghelper - TagMode.StartTagAndEndTag
+                                DefaultTagHelperBody - 
+                                    HtmlContent - (286:10,29 [26] TagHelpersInSection.cshtml)
+                                        IntermediateToken - (286:10,29 [26] TagHelpersInSection.cshtml) - Html - Some buffered values with 
+                                    CSharpExpression - (313:10,56 [4] TagHelpersInSection.cshtml)
+                                        IntermediateToken - (313:10,56 [4] TagHelpersInSection.cshtml) - CSharp - code
+                                DefaultTagHelperCreate -  - TestNamespace.NestedTagHelper
+                                DefaultTagHelperExecute - 
+                            HtmlContent - (335:10,78 [10] TagHelpersInSection.cshtml)
+                                IntermediateToken - (335:10,78 [10] TagHelpersInSection.cshtml) - Html - \n        
+                        DefaultTagHelperCreate -  - TestNamespace.MyTagHelper
+                        DefaultTagHelperProperty - (142:8,36 [27] TagHelpersInSection.cshtml) - boundproperty - string TestNamespace.MyTagHelper.BoundProperty - HtmlAttributeValueStyle.DoubleQuotes
+                            HtmlContent - (142:8,36 [14] TagHelpersInSection.cshtml)
+                                IntermediateToken - (142:8,36 [7] TagHelpersInSection.cshtml) - Html - Current
+                                IntermediateToken - (149:8,43 [6] TagHelpersInSection.cshtml) - Html -  Time:
+                                IntermediateToken - (155:8,49 [1] TagHelpersInSection.cshtml) - Html -  
+                            CSharpExpression - (157:8,51 [12] TagHelpersInSection.cshtml)
+                                IntermediateToken - (157:8,51 [12] TagHelpersInSection.cshtml) - CSharp - DateTime.Now
+                        DefaultTagHelperHtmlAttribute -  - unboundproperty - HtmlAttributeValueStyle.DoubleQuotes
+                            HtmlAttributeValue - (188:8,82 [7] TagHelpersInSection.cshtml) - 
+                                IntermediateToken - (188:8,82 [7] TagHelpersInSection.cshtml) - Html - Current
+                            HtmlAttributeValue - (195:8,89 [6] TagHelpersInSection.cshtml) -  
+                                IntermediateToken - (196:8,90 [5] TagHelpersInSection.cshtml) - Html - Time:
+                            CSharpExpressionAttributeValue - (201:8,95 [14] TagHelpersInSection.cshtml) -  
+                                IntermediateToken - (203:8,97 [12] TagHelpersInSection.cshtml) - CSharp - DateTime.Now
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (359:11,22 [20] TagHelpersInSection.cshtml)
+                        IntermediateToken - (359:11,22 [6] TagHelpersInSection.cshtml) - Html - \n    
+                        IntermediateToken - (365:12,4 [6] TagHelpersInSection.cshtml) - Html - </div>
+                        IntermediateToken - (371:12,10 [8] TagHelpersInSection.cshtml) - Html - \n\n    
+                    MalformedDirective - (379:14,4 [112] TagHelpersInSection.cshtml) - section
+                        DirectiveToken - (388:14,13 [13] TagHelpersInSection.cshtml) - nestedsection
+                        HtmlContent - (404:14,29 [29] TagHelpersInSection.cshtml)
+                            IntermediateToken - (404:14,29 [10] TagHelpersInSection.cshtml) - Html - \n        
+                            IntermediateToken - (414:15,8 [4] TagHelpersInSection.cshtml) - Html - <div
+                            IntermediateToken - (418:15,12 [1] TagHelpersInSection.cshtml) - Html - >
+                            IntermediateToken - (419:15,13 [14] TagHelpersInSection.cshtml) - Html - \n            
+                        TagHelper - (433:16,12 [35] TagHelpersInSection.cshtml) - nestedtaghelper - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.NestedTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (468:16,47 [22] TagHelpersInSection.cshtml)
+                            IntermediateToken - (468:16,47 [10] TagHelpersInSection.cshtml) - Html - \n        
+                            IntermediateToken - (478:17,8 [6] TagHelpersInSection.cshtml) - Html - </div>
+                            IntermediateToken - (484:17,14 [6] TagHelpersInSection.cshtml) - Html - \n    
+                    HtmlContent - (491:18,5 [2] TagHelpersInSection.cshtml)
+                        IntermediateToken - (491:18,5 [2] TagHelpersInSection.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c22fb1f9dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
@@ -0,0 +1,39 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|"*, TestAssembly"|
+Generated Location: (707:14,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (82:6,9 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|MySection|
+Generated Location: (973:24,22 [9] )
+|MySection|
+
+Source Location: (388:14,13 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|nestedsection|
+Generated Location: (1239:34,22 [13] )
+|nestedsection|
+
+Source Location: (37:2,2 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|
+    var code = "some code";
+|
+Generated Location: (1742:51,2 [31] )
+|
+    var code = "some code";
+|
+
+Source Location: (313:10,56 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|code|
+Generated Location: (2069:60,56 [4] )
+|code|
+
+Source Location: (157:8,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|DateTime.Now|
+Generated Location: (2501:69,51 [12] )
+|DateTime.Now|
+
+Source Location: (203:8,97 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
+|DateTime.Now|
+Generated Location: (2852:77,97 [12] )
+|DateTime.Now|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
new file mode 100644
index 0000000000..4ec7e5dd25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
@@ -0,0 +1,124 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7d1f5fcf069d8b265b8300a5070e14e2312ef599"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"7d1f5fcf069d8b265b8300a5070e14e2312ef599", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_Runtime
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.MyTagHelper __TestNamespace_MyTagHelper;
+        private global::TestNamespace.NestedTagHelper __TestNamespace_NestedTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+  
+    var code = "some code";
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+            DefineSection("MySection", async() => {
+                WriteLiteral("\r\n    <div>\r\n        ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("mytaghelper", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    WriteLiteral("\r\n            In None ContentBehavior.\r\n            ");
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("nestedtaghelper", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                        WriteLiteral("Some buffered values with ");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+                                                  Write(code);
+
+#line default
+#line hidden
+#nullable disable
+                    }
+                    );
+                    __TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
+                    __tagHelperExecutionContext.Add(__TestNamespace_NestedTagHelper);
+                    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                    if (!__tagHelperExecutionContext.Output.IsContentModified)
+                    {
+                        await __tagHelperExecutionContext.SetOutputContentAsync();
+                    }
+                    Write(__tagHelperExecutionContext.Output);
+                    __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                    WriteLiteral("\r\n        ");
+                }
+                );
+                __TestNamespace_MyTagHelper = CreateTagHelper<global::TestNamespace.MyTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_MyTagHelper);
+                BeginWriteTagHelperAttribute();
+                WriteLiteral("Current Time: ");
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+                                      WriteLiteral(DateTime.Now);
+
+#line default
+#line hidden
+#nullable disable
+                __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+                __TestNamespace_MyTagHelper.BoundProperty = __tagHelperStringValueBuffer;
+                __tagHelperExecutionContext.AddTagHelperAttribute("boundproperty", __TestNamespace_MyTagHelper.BoundProperty, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unboundproperty", 3, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                AddHtmlAttributeValue("", 188, "Current", 188, 7, true);
+                AddHtmlAttributeValue(" ", 195, "Time:", 196, 6, true);
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
+AddHtmlAttributeValue(" ", 201, DateTime.Now, 202, 13, false);
+
+#line default
+#line hidden
+#nullable disable
+                EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n    </div>\r\n\r\n");
+                WriteLiteral("\r\n        <div>\r\n            ");
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("nestedtaghelper", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                }
+                );
+                __TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
+                __tagHelperExecutionContext.Add(__TestNamespace_NestedTagHelper);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                WriteLiteral("\r\n        </div>\r\n    ");
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..0efe33796f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml(15,5): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt
new file mode 100644
index 0000000000..f59eaa42bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt
@@ -0,0 +1,70 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_Runtime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.MyTagHelper - __TestNamespace_MyTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.NestedTagHelper - __TestNamespace_NestedTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] TagHelpersInSection.cshtml)
+                    IntermediateToken - (33:1,0 [2] TagHelpersInSection.cshtml) - Html - \n
+                CSharpCode - (37:2,2 [31] TagHelpersInSection.cshtml)
+                    IntermediateToken - (37:2,2 [31] TagHelpersInSection.cshtml) - CSharp - \n    var code = "some code";\n
+                HtmlContent - (71:5,0 [2] TagHelpersInSection.cshtml)
+                    IntermediateToken - (71:5,0 [2] TagHelpersInSection.cshtml) - Html - \n
+                Section -  - MySection
+                    HtmlContent - (93:6,20 [21] TagHelpersInSection.cshtml)
+                        IntermediateToken - (93:6,20 [6] TagHelpersInSection.cshtml) - Html - \n    
+                        IntermediateToken - (99:7,4 [4] TagHelpersInSection.cshtml) - Html - <div
+                        IntermediateToken - (103:7,8 [1] TagHelpersInSection.cshtml) - Html - >
+                        IntermediateToken - (104:7,9 [10] TagHelpersInSection.cshtml) - Html - \n        
+                    TagHelper - (114:8,8 [245] TagHelpersInSection.cshtml) - mytaghelper - TagMode.StartTagAndEndTag
+                        DefaultTagHelperBody - 
+                            HtmlContent - (217:8,111 [52] TagHelpersInSection.cshtml)
+                                IntermediateToken - (217:8,111 [52] TagHelpersInSection.cshtml) - Html - \n            In None ContentBehavior.\n            
+                            TagHelper - (269:10,12 [66] TagHelpersInSection.cshtml) - nestedtaghelper - TagMode.StartTagAndEndTag
+                                DefaultTagHelperBody - 
+                                    HtmlContent - (286:10,29 [26] TagHelpersInSection.cshtml)
+                                        IntermediateToken - (286:10,29 [26] TagHelpersInSection.cshtml) - Html - Some buffered values with 
+                                    CSharpExpression - (313:10,56 [4] TagHelpersInSection.cshtml)
+                                        IntermediateToken - (313:10,56 [4] TagHelpersInSection.cshtml) - CSharp - code
+                                DefaultTagHelperCreate -  - TestNamespace.NestedTagHelper
+                                DefaultTagHelperExecute - 
+                            HtmlContent - (335:10,78 [10] TagHelpersInSection.cshtml)
+                                IntermediateToken - (335:10,78 [10] TagHelpersInSection.cshtml) - Html - \n        
+                        DefaultTagHelperCreate -  - TestNamespace.MyTagHelper
+                        DefaultTagHelperProperty - (142:8,36 [27] TagHelpersInSection.cshtml) - boundproperty - string TestNamespace.MyTagHelper.BoundProperty - HtmlAttributeValueStyle.DoubleQuotes
+                            HtmlContent - (142:8,36 [14] TagHelpersInSection.cshtml)
+                                IntermediateToken - (142:8,36 [7] TagHelpersInSection.cshtml) - Html - Current
+                                IntermediateToken - (149:8,43 [6] TagHelpersInSection.cshtml) - Html -  Time:
+                                IntermediateToken - (155:8,49 [1] TagHelpersInSection.cshtml) - Html -  
+                            CSharpExpression - (157:8,51 [12] TagHelpersInSection.cshtml)
+                                IntermediateToken - (157:8,51 [12] TagHelpersInSection.cshtml) - CSharp - DateTime.Now
+                        DefaultTagHelperHtmlAttribute -  - unboundproperty - HtmlAttributeValueStyle.DoubleQuotes
+                            HtmlAttributeValue - (188:8,82 [7] TagHelpersInSection.cshtml) - 
+                                IntermediateToken - (188:8,82 [7] TagHelpersInSection.cshtml) - Html - Current
+                            HtmlAttributeValue - (195:8,89 [6] TagHelpersInSection.cshtml) -  
+                                IntermediateToken - (196:8,90 [5] TagHelpersInSection.cshtml) - Html - Time:
+                            CSharpExpressionAttributeValue - (201:8,95 [14] TagHelpersInSection.cshtml) -  
+                                IntermediateToken - (203:8,97 [12] TagHelpersInSection.cshtml) - CSharp - DateTime.Now
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (359:11,22 [16] TagHelpersInSection.cshtml)
+                        IntermediateToken - (359:11,22 [6] TagHelpersInSection.cshtml) - Html - \n    
+                        IntermediateToken - (365:12,4 [6] TagHelpersInSection.cshtml) - Html - </div>
+                        IntermediateToken - (371:12,10 [4] TagHelpersInSection.cshtml) - Html - \n\n
+                    MalformedDirective - (379:14,4 [114] TagHelpersInSection.cshtml) - section
+                        DirectiveToken - (388:14,13 [13] TagHelpersInSection.cshtml) - nestedsection
+                        HtmlContent - (404:14,29 [29] TagHelpersInSection.cshtml)
+                            IntermediateToken - (404:14,29 [10] TagHelpersInSection.cshtml) - Html - \n        
+                            IntermediateToken - (414:15,8 [4] TagHelpersInSection.cshtml) - Html - <div
+                            IntermediateToken - (418:15,12 [1] TagHelpersInSection.cshtml) - Html - >
+                            IntermediateToken - (419:15,13 [14] TagHelpersInSection.cshtml) - Html - \n            
+                        TagHelper - (433:16,12 [35] TagHelpersInSection.cshtml) - nestedtaghelper - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - TestNamespace.NestedTagHelper
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (468:16,47 [22] TagHelpersInSection.cshtml)
+                            IntermediateToken - (468:16,47 [10] TagHelpersInSection.cshtml) - Html - \n        
+                            IntermediateToken - (478:17,8 [6] TagHelpersInSection.cshtml) - Html - </div>
+                            IntermediateToken - (484:17,14 [6] TagHelpersInSection.cshtml) - Html - \n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml
new file mode 100644
index 0000000000..83023559d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml
@@ -0,0 +1,4 @@
+@addTagHelper *, TestAssembly
+<form>
+    <input bound=@Hello type='text' />
+</form>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..346627dfdf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_DesignTime
+    {
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml"
+            __o = Hello;
+
+#line default
+#line hidden
+#nullable disable
+            __InputTagHelper.BoundProp = string.Empty;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..1b4902d35d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] TagHelpersWithBoundAttributes.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [14] TagHelpersWithBoundAttributes.cshtml)
+                    IntermediateToken - (29:0,29 [2] TagHelpersWithBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (31:1,0 [5] TagHelpersWithBoundAttributes.cshtml) - Html - <form
+                    IntermediateToken - (36:1,5 [1] TagHelpersWithBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (37:1,6 [6] TagHelpersWithBoundAttributes.cshtml) - Html - \n    
+                TagHelper - (43:2,4 [34] TagHelpersWithBoundAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (56:2,17 [6] TagHelpersWithBoundAttributes.cshtml) - bound - string InputTagHelper.BoundProp - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml)
+                            IntermediateToken - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml) - CSharp - Hello
+                    DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (69:2,30 [4] TagHelpersWithBoundAttributes.cshtml)
+                            IntermediateToken - (69:2,30 [4] TagHelpersWithBoundAttributes.cshtml) - Html - text
+                    DefaultTagHelperExecute - 
+                HtmlContent - (77:2,38 [9] TagHelpersWithBoundAttributes.cshtml)
+                    IntermediateToken - (77:2,38 [2] TagHelpersWithBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (79:3,0 [7] TagHelpersWithBoundAttributes.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..d9fa738e43
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
+|*, TestAssembly|
+Generated Location: (618:13,38 [15] )
+|*, TestAssembly|
+
+Source Location: (57:2,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
+|Hello|
+Generated Location: (1218:31,18 [5] )
+|Hello|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..20611de088
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs
@@ -0,0 +1,64 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "111aa585040c2e45a0dac3f5bdb65ee0252748d2"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"111aa585040c2e45a0dac3f5bdb65ee0252748d2", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<form>\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTagHelper);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml"
+     WriteLiteral(Hello);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __InputTagHelper.BoundProp = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("bound", __InputTagHelper.BoundProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</form>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..cc8c24201a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [12] TagHelpersWithBoundAttributes.cshtml)
+                    IntermediateToken - (31:1,0 [5] TagHelpersWithBoundAttributes.cshtml) - Html - <form
+                    IntermediateToken - (36:1,5 [1] TagHelpersWithBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (37:1,6 [6] TagHelpersWithBoundAttributes.cshtml) - Html - \n    
+                TagHelper - (43:2,4 [34] TagHelpersWithBoundAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (56:2,17 [6] TagHelpersWithBoundAttributes.cshtml) - bound - string InputTagHelper.BoundProp - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml)
+                            IntermediateToken - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml) - CSharp - Hello
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (77:2,38 [9] TagHelpersWithBoundAttributes.cshtml)
+                    IntermediateToken - (77:2,38 [2] TagHelpersWithBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (79:3,0 [7] TagHelpersWithBoundAttributes.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml
new file mode 100644
index 0000000000..2a341893ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml
@@ -0,0 +1,5 @@
+@addTagHelper *, TestAssembly
+
+<input bound="hello" data-one="1" data-two=2 data-three="" />
+<div data-one=@foo data-two="@bar" data-three= data-four=""></div>
+<p attr="" data-one="" data-two= data-three=hello data-four=@foo>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2c6b661cbb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithDataDashAttributes_DesignTime
+    {
+        private global::InputTagHelper __InputTagHelper;
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __InputTagHelper.BoundProp = "hello";
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+         __o = foo;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+                        __o = bar;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+                                                       __o = foo;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..2fadae0eec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.ir.txt
@@ -0,0 +1,67 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithDataDashAttributes_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] TagHelpersWithDataDashAttributes.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [4] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (29:0,29 [4] TagHelpersWithDataDashAttributes.cshtml) - Html - \n\n
+                TagHelper - (33:2,0 [61] TagHelpersWithDataDashAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (47:2,14 [5] TagHelpersWithDataDashAttributes.cshtml) - bound - string InputTagHelper.BoundProp - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (47:2,14 [5] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (47:2,14 [5] TagHelpersWithDataDashAttributes.cshtml) - Html - hello
+                    DefaultTagHelperHtmlAttribute -  - data-one - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (64:2,31 [1] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (64:2,31 [1] TagHelpersWithDataDashAttributes.cshtml) - Html - 1
+                    DefaultTagHelperHtmlAttribute -  - data-two - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (76:2,43 [1] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (76:2,43 [1] TagHelpersWithDataDashAttributes.cshtml) - Html - 2
+                    DefaultTagHelperHtmlAttribute -  - data-three - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (90:2,57 [0] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (90:2,57 [0] TagHelpersWithDataDashAttributes.cshtml) - Html - 
+                    DefaultTagHelperExecute - 
+                HtmlContent - (94:2,61 [2] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (94:2,61 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
+                TagHelper - (96:3,0 [66] TagHelpersWithDataDashAttributes.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - data-one - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (111:3,15 [3] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (111:3,15 [3] TagHelpersWithDataDashAttributes.cshtml) - CSharp - foo
+                    DefaultTagHelperHtmlAttribute -  - data-two - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (126:3,30 [3] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (126:3,30 [3] TagHelpersWithDataDashAttributes.cshtml) - CSharp - bar
+                    DefaultTagHelperHtmlAttribute -  - data-three - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (142:3,46 [0] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (142:3,46 [0] TagHelpersWithDataDashAttributes.cshtml) - Html - 
+                    DefaultTagHelperHtmlAttribute -  - data-four - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (154:3,58 [0] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (154:3,58 [0] TagHelpersWithDataDashAttributes.cshtml) - Html - 
+                    DefaultTagHelperExecute - 
+                HtmlContent - (162:3,66 [4] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (162:3,66 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
+                    IntermediateToken - (164:4,0 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - <p
+                HtmlAttribute - (166:4,2 [8] TagHelpersWithDataDashAttributes.cshtml) -  attr=" - "
+                HtmlContent - (174:4,10 [50] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (174:4,10 [11] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-one="
+                    IntermediateToken - (185:4,21 [1] TagHelpersWithDataDashAttributes.cshtml) - Html - "
+                    IntermediateToken - (186:4,22 [10] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-two=
+                    IntermediateToken - (196:4,32 [12] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-three=
+                    IntermediateToken - (208:4,44 [5] TagHelpersWithDataDashAttributes.cshtml) - Html - hello
+                    IntermediateToken - (213:4,49 [11] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-four=
+                CSharpExpression - (225:4,61 [3] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (225:4,61 [3] TagHelpersWithDataDashAttributes.cshtml) - CSharp - foo
+                HtmlContent - (228:4,64 [3] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (228:4,64 [1] TagHelpersWithDataDashAttributes.cshtml) - Html - >
+                    IntermediateToken - (229:4,65 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..bfce560156
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
+|*, TestAssembly|
+Generated Location: (678:14,38 [15] )
+|*, TestAssembly|
+
+Source Location: (111:3,15 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
+|foo|
+Generated Location: (1400:34,15 [3] )
+|foo|
+
+Source Location: (126:3,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
+|bar|
+Generated Location: (1613:41,30 [3] )
+|bar|
+
+Source Location: (225:4,61 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
+|foo|
+Generated Location: (1857:48,61 [3] )
+|foo|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..4de77bd981
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs
@@ -0,0 +1,108 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "cf45e3f3bb37acbe0abf214d8091170eaa98ce5f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithDataDashAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"cf45e3f3bb37acbe0abf214d8091170eaa98ce5f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithDataDashAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bound", "hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-one", new global::Microsoft.AspNetCore.Html.HtmlString("1"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-two", new global::Microsoft.AspNetCore.Html.HtmlString("2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-three", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-four", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTagHelper __InputTagHelper;
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTagHelper);
+            __InputTagHelper.BoundProp = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+         Write(foo);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("data-one", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+                        Write(bar);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("data-two", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n<p");
+            BeginWriteAttribute("attr", " attr=\"", 166, "\"", 173, 0);
+            EndWriteAttribute();
+            WriteLiteral(" data-one=\"\" data-two= data-three=hello data-four=");
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
+                                                       Write(foo);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(">\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..ed2037de31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.ir.txt
@@ -0,0 +1,54 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithDataDashAttributes_Runtime -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - bound - hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - data-one - 1 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - data-two - 2 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - data-three -  - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_4 - data-four -  - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [2] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (31:1,0 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
+                TagHelper - (33:2,0 [61] TagHelpersWithDataDashAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    PreallocatedTagHelperProperty - (47:2,14 [5] TagHelpersWithDataDashAttributes.cshtml) - __tagHelperAttribute_0 - bound - BoundProp
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    DefaultTagHelperExecute - 
+                HtmlContent - (94:2,61 [2] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (94:2,61 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
+                TagHelper - (96:3,0 [66] TagHelpersWithDataDashAttributes.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - data-one - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (111:3,15 [3] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (111:3,15 [3] TagHelpersWithDataDashAttributes.cshtml) - CSharp - foo
+                    DefaultTagHelperHtmlAttribute -  - data-two - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (126:3,30 [3] TagHelpersWithDataDashAttributes.cshtml)
+                            IntermediateToken - (126:3,30 [3] TagHelpersWithDataDashAttributes.cshtml) - CSharp - bar
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_4
+                    DefaultTagHelperExecute - 
+                HtmlContent - (162:3,66 [4] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (162:3,66 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
+                    IntermediateToken - (164:4,0 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - <p
+                HtmlAttribute - (166:4,2 [8] TagHelpersWithDataDashAttributes.cshtml) -  attr=" - "
+                HtmlContent - (174:4,10 [50] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (174:4,10 [11] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-one="
+                    IntermediateToken - (185:4,21 [1] TagHelpersWithDataDashAttributes.cshtml) - Html - "
+                    IntermediateToken - (186:4,22 [10] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-two=
+                    IntermediateToken - (196:4,32 [12] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-three=
+                    IntermediateToken - (208:4,44 [5] TagHelpersWithDataDashAttributes.cshtml) - Html - hello
+                    IntermediateToken - (213:4,49 [11] TagHelpersWithDataDashAttributes.cshtml) - Html -  data-four=
+                CSharpExpression - (225:4,61 [3] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (225:4,61 [3] TagHelpersWithDataDashAttributes.cshtml) - CSharp - foo
+                HtmlContent - (228:4,64 [3] TagHelpersWithDataDashAttributes.cshtml)
+                    IntermediateToken - (228:4,64 [1] TagHelpersWithDataDashAttributes.cshtml) - Html - >
+                    IntermediateToken - (229:4,65 [2] TagHelpersWithDataDashAttributes.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml
new file mode 100644
index 0000000000..e365dd4d60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml
@@ -0,0 +1,5 @@
+@addTagHelper *, TestAssembly
+@tagHelperPrefix cool:
+<form>
+    <cool:input bound=@Hello type='text' />
+</form>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
new file mode 100644
index 0000000000..67b895feb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
@@ -0,0 +1,52 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_DesignTime
+    {
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
+global::System.Object __typeHelper = "cool:";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
+                 __o = Hello;
+
+#line default
+#line hidden
+#nullable disable
+            __InputTagHelper.BoundProp = string.Empty;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt
new file mode 100644
index 0000000000..52f53933c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [15] TagHelpersWithPrefix.cshtml) - *, TestAssembly
+                DirectiveToken - (48:1,17 [5] TagHelpersWithPrefix.cshtml) - cool:
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (29:0,29 [2] TagHelpersWithPrefix.cshtml)
+                    IntermediateToken - (29:0,29 [2] TagHelpersWithPrefix.cshtml) - Html - \n
+                HtmlContent - (53:1,22 [14] TagHelpersWithPrefix.cshtml)
+                    IntermediateToken - (53:1,22 [2] TagHelpersWithPrefix.cshtml) - Html - \n
+                    IntermediateToken - (55:2,0 [5] TagHelpersWithPrefix.cshtml) - Html - <form
+                    IntermediateToken - (60:2,5 [1] TagHelpersWithPrefix.cshtml) - Html - >
+                    IntermediateToken - (61:2,6 [6] TagHelpersWithPrefix.cshtml) - Html - \n    
+                TagHelper - (67:3,4 [39] TagHelpersWithPrefix.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (85:3,22 [6] TagHelpersWithPrefix.cshtml) - bound - string InputTagHelper.BoundProp - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (86:3,23 [5] TagHelpersWithPrefix.cshtml)
+                            IntermediateToken - (86:3,23 [5] TagHelpersWithPrefix.cshtml) - CSharp - Hello
+                    DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (98:3,35 [4] TagHelpersWithPrefix.cshtml)
+                            IntermediateToken - (98:3,35 [4] TagHelpersWithPrefix.cshtml) - Html - text
+                    DefaultTagHelperExecute - 
+                HtmlContent - (106:3,43 [9] TagHelpersWithPrefix.cshtml)
+                    IntermediateToken - (106:3,43 [2] TagHelpersWithPrefix.cshtml) - Html - \n
+                    IntermediateToken - (108:4,0 [7] TagHelpersWithPrefix.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e8d9aa5ec4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
+|*, TestAssembly|
+Generated Location: (600:13,38 [15] )
+|*, TestAssembly|
+
+Source Location: (48:1,17 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
+|cool:|
+Generated Location: (882:23,38 [5] )
+|cool:|
+
+Source Location: (86:3,23 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
+|Hello|
+Generated Location: (1468:41,23 [5] )
+|Hello|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs
new file mode 100644
index 0000000000..433ab5477b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs
@@ -0,0 +1,64 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5c97c003c8158f389b506a6dbc47e468892ec57d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5c97c003c8158f389b506a6dbc47e468892ec57d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<form>\r\n    ");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTagHelper);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
+          WriteLiteral(Hello);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __InputTagHelper.BoundProp = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("bound", __InputTagHelper.BoundProp, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n</form>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt
new file mode 100644
index 0000000000..3a88f319f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (55:2,0 [12] TagHelpersWithPrefix.cshtml)
+                    IntermediateToken - (55:2,0 [5] TagHelpersWithPrefix.cshtml) - Html - <form
+                    IntermediateToken - (60:2,5 [1] TagHelpersWithPrefix.cshtml) - Html - >
+                    IntermediateToken - (61:2,6 [6] TagHelpersWithPrefix.cshtml) - Html - \n    
+                TagHelper - (67:3,4 [39] TagHelpersWithPrefix.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (85:3,22 [6] TagHelpersWithPrefix.cshtml) - bound - string InputTagHelper.BoundProp - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (86:3,23 [5] TagHelpersWithPrefix.cshtml)
+                            IntermediateToken - (86:3,23 [5] TagHelpersWithPrefix.cshtml) - CSharp - Hello
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (106:3,43 [9] TagHelpersWithPrefix.cshtml)
+                    IntermediateToken - (106:3,43 [2] TagHelpersWithPrefix.cshtml) - Html - \n
+                    IntermediateToken - (108:4,0 [7] TagHelpersWithPrefix.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml
new file mode 100644
index 0000000000..071122c261
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml
@@ -0,0 +1,19 @@
+@addTagHelper "*, TestAssembly"
+
+@functions {
+    public void RenderTemplate(string title, Func<string, HelperResult> template)
+    {
+        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");
+        var helperResult = template(title);
+        helperResult.WriteTo(Output, HtmlEncoder);
+    }
+}
+
+<div>
+    @{
+        RenderTemplate(
+            "Template: ",
+            @<div condition="true"><h3>@item</h3><input type="checkbox" checked="true" /></div>);
+    }
+</div>
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
new file mode 100644
index 0000000000..c92d670f37
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
@@ -0,0 +1,78 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_DesignTime
+    {
+        private global::DivTagHelper __DivTagHelper;
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+      
+        RenderTemplate(
+            "Template: ",
+            
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+                                  __o = item;
+
+#line default
+#line hidden
+#nullable disable
+                __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            }
+            )
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+                                                                                               );
+    
+
+#line default
+#line hidden
+#nullable disable
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+            
+    public void RenderTemplate(string title, Func<string, HelperResult> template)
+    {
+        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");
+        var helperResult = template(title);
+        helperResult.WriteTo(Output, HtmlEncoder);
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt
new file mode 100644
index 0000000000..229134183a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt
@@ -0,0 +1,58 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] TagHelpersWithTemplate.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] TagHelpersWithTemplate.cshtml)
+                    IntermediateToken - (31:0,31 [4] TagHelpersWithTemplate.cshtml) - Html - \n\n
+                HtmlContent - (316:9,1 [4] TagHelpersWithTemplate.cshtml)
+                    IntermediateToken - (316:9,1 [4] TagHelpersWithTemplate.cshtml) - Html - \n\n
+                TagHelper - (320:11,0 [179] TagHelpersWithTemplate.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (325:11,5 [6] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (325:11,5 [6] TagHelpersWithTemplate.cshtml) - Html - \n    
+                        CSharpCode - (333:12,6 [66] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (333:12,6 [66] TagHelpersWithTemplate.cshtml) - CSharp - \n        RenderTemplate(\n            "Template: ",\n            
+                        Template - (400:15,13 [82] TagHelpersWithTemplate.cshtml)
+                            TagHelper - (400:15,13 [82] TagHelpersWithTemplate.cshtml) - div - TagMode.StartTagAndEndTag
+                                DefaultTagHelperBody - 
+                                    HtmlContent - (422:15,35 [4] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (422:15,35 [3] TagHelpersWithTemplate.cshtml) - Html - <h3
+                                        IntermediateToken - (425:15,38 [1] TagHelpersWithTemplate.cshtml) - Html - >
+                                    CSharpExpression - (427:15,40 [4] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (427:15,40 [4] TagHelpersWithTemplate.cshtml) - CSharp - item
+                                    HtmlContent - (431:15,44 [5] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (431:15,44 [5] TagHelpersWithTemplate.cshtml) - Html - </h3>
+                                    TagHelper - (436:15,49 [40] TagHelpersWithTemplate.cshtml) - input - TagMode.SelfClosing
+                                        DefaultTagHelperBody - 
+                                        DefaultTagHelperCreate -  - InputTagHelper
+                                        DefaultTagHelperHtmlAttribute -  - type - HtmlAttributeValueStyle.DoubleQuotes
+                                            HtmlContent - (449:15,62 [8] TagHelpersWithTemplate.cshtml)
+                                                IntermediateToken - (449:15,62 [8] TagHelpersWithTemplate.cshtml) - Html - checkbox
+                                        DefaultTagHelperHtmlAttribute -  - checked - HtmlAttributeValueStyle.DoubleQuotes
+                                            HtmlContent - (468:15,81 [4] TagHelpersWithTemplate.cshtml)
+                                                IntermediateToken - (468:15,81 [4] TagHelpersWithTemplate.cshtml) - Html - true
+                                        DefaultTagHelperExecute - 
+                                DefaultTagHelperCreate -  - DivTagHelper
+                                DefaultTagHelperHtmlAttribute -  - condition - HtmlAttributeValueStyle.DoubleQuotes
+                                    HtmlContent - (416:15,29 [4] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (416:15,29 [4] TagHelpersWithTemplate.cshtml) - Html - true
+                                DefaultTagHelperExecute - 
+                        CSharpCode - (482:15,95 [8] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (482:15,95 [8] TagHelpersWithTemplate.cshtml) - CSharp - );\n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperExecute - 
+                HtmlContent - (499:17,6 [4] TagHelpersWithTemplate.cshtml)
+                    IntermediateToken - (499:17,6 [4] TagHelpersWithTemplate.cshtml) - Html - \n\n
+            CSharpCode - (47:2,12 [268] TagHelpersWithTemplate.cshtml)
+                IntermediateToken - (47:2,12 [268] TagHelpersWithTemplate.cshtml) - CSharp - \n    public void RenderTemplate(string title, Func<string, HelperResult> template)\n    {\n        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");\n        var helperResult = template(title);\n        helperResult.WriteTo(Output, HtmlEncoder);\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
new file mode 100644
index 0000000000..bb29992ce2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
@@ -0,0 +1,47 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
+|"*, TestAssembly"|
+Generated Location: (657:14,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (333:12,6 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
+|
+        RenderTemplate(
+            "Template: ",
+            |
+Generated Location: (1165:31,6 [66] )
+|
+        RenderTemplate(
+            "Template: ",
+            |
+
+Source Location: (427:15,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
+|item|
+Generated Location: (1511:42,40 [4] )
+|item|
+
+Source Location: (482:15,95 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
+|);
+    |
+Generated Location: (1965:53,95 [8] )
+|);
+    |
+
+Source Location: (47:2,12 [268] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
+|
+    public void RenderTemplate(string title, Func<string, HelperResult> template)
+    {
+        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");
+        var helperResult = template(title);
+        helperResult.WriteTo(Output, HtmlEncoder);
+    }
+|
+Generated Location: (2274:64,12 [268] )
+|
+    public void RenderTemplate(string title, Func<string, HelperResult> template)
+    {
+        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");
+        var helperResult = template(title);
+        helperResult.WriteTo(Output, HtmlEncoder);
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs
new file mode 100644
index 0000000000..e27d68d83b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs
@@ -0,0 +1,129 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d02421b6972074e82cabcfd56c7ab2739d5f3d49"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d02421b6972074e82cabcfd56c7ab2739d5f3d49", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("checkbox"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("checked", new global::Microsoft.AspNetCore.Html.HtmlString("true"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("condition", new global::Microsoft.AspNetCore.Html.HtmlString("true"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        private global::InputTagHelper __InputTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("\r\n");
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+      
+        RenderTemplate(
+            "Template: ",
+            
+
+#line default
+#line hidden
+#nullable disable
+                item => new Template(async(__razor_template_writer) => {
+                    PushWriter(__razor_template_writer);
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                        WriteLiteral("<h3>");
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+                                  Write(item);
+
+#line default
+#line hidden
+#nullable disable
+                        WriteLiteral("</h3>");
+                        __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                        }
+                        );
+                        __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+                        __tagHelperExecutionContext.Add(__InputTagHelper);
+                        __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+                        __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                        await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                        if (!__tagHelperExecutionContext.Output.IsContentModified)
+                        {
+                            await __tagHelperExecutionContext.SetOutputContentAsync();
+                        }
+                        Write(__tagHelperExecutionContext.Output);
+                        __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                    }
+                    );
+                    __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                    __tagHelperExecutionContext.Add(__DivTagHelper);
+                    __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+                    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                    if (!__tagHelperExecutionContext.Output.IsContentModified)
+                    {
+                        await __tagHelperExecutionContext.SetOutputContentAsync();
+                    }
+                    Write(__tagHelperExecutionContext.Output);
+                    __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                    PopWriter();
+                }
+                )
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+                                                                                               );
+    
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
+            
+    public void RenderTemplate(string title, Func<string, HelperResult> template)
+    {
+        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");
+        var helperResult = template(title);
+        helperResult.WriteTo(Output, HtmlEncoder);
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt
new file mode 100644
index 0000000000..2c551023fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt
@@ -0,0 +1,51 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - checked - true - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - condition - true - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] TagHelpersWithTemplate.cshtml)
+                    IntermediateToken - (33:1,0 [2] TagHelpersWithTemplate.cshtml) - Html - \n
+                HtmlContent - (318:10,0 [2] TagHelpersWithTemplate.cshtml)
+                    IntermediateToken - (318:10,0 [2] TagHelpersWithTemplate.cshtml) - Html - \n
+                TagHelper - (320:11,0 [179] TagHelpersWithTemplate.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (325:11,5 [2] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (325:11,5 [2] TagHelpersWithTemplate.cshtml) - Html - \n
+                        CSharpCode - (327:12,0 [4] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (327:12,0 [4] TagHelpersWithTemplate.cshtml) - CSharp -     
+                        CSharpCode - (333:12,6 [66] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (333:12,6 [66] TagHelpersWithTemplate.cshtml) - CSharp - \n        RenderTemplate(\n            "Template: ",\n            
+                        Template - (400:15,13 [82] TagHelpersWithTemplate.cshtml)
+                            TagHelper - (400:15,13 [82] TagHelpersWithTemplate.cshtml) - div - TagMode.StartTagAndEndTag
+                                DefaultTagHelperBody - 
+                                    HtmlContent - (422:15,35 [4] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (422:15,35 [3] TagHelpersWithTemplate.cshtml) - Html - <h3
+                                        IntermediateToken - (425:15,38 [1] TagHelpersWithTemplate.cshtml) - Html - >
+                                    CSharpExpression - (427:15,40 [4] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (427:15,40 [4] TagHelpersWithTemplate.cshtml) - CSharp - item
+                                    HtmlContent - (431:15,44 [5] TagHelpersWithTemplate.cshtml)
+                                        IntermediateToken - (431:15,44 [5] TagHelpersWithTemplate.cshtml) - Html - </h3>
+                                    TagHelper - (436:15,49 [40] TagHelpersWithTemplate.cshtml) - input - TagMode.SelfClosing
+                                        DefaultTagHelperBody - 
+                                        DefaultTagHelperCreate -  - InputTagHelper
+                                        PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                                        PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                                        DefaultTagHelperExecute - 
+                                DefaultTagHelperCreate -  - DivTagHelper
+                                PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                                DefaultTagHelperExecute - 
+                        CSharpCode - (482:15,95 [8] TagHelpersWithTemplate.cshtml)
+                            IntermediateToken - (482:15,95 [8] TagHelpersWithTemplate.cshtml) - CSharp - );\n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperExecute - 
+                HtmlContent - (499:17,6 [4] TagHelpersWithTemplate.cshtml)
+                    IntermediateToken - (499:17,6 [4] TagHelpersWithTemplate.cshtml) - Html - \n\n
+            CSharpCode - (47:2,12 [268] TagHelpersWithTemplate.cshtml)
+                IntermediateToken - (47:2,12 [268] TagHelpersWithTemplate.cshtml) - CSharp - \n    public void RenderTemplate(string title, Func<string, HelperResult> template)\n    {\n        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");\n        var helperResult = template(title);\n        helperResult.WriteTo(Output, HtmlEncoder);\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml
new file mode 100644
index 0000000000..1796ed5c04
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml
@@ -0,0 +1,15 @@
+@addTagHelper "*, TestAssembly"
+
+<p
+class 
+   =
+"Hello World" age   =1337
+   data-content= "@true">Body of Tag</p>
+
+<input type 	= 'text' data-content=	 "hello" />
+
+<p age=   "1234" data-content
+= 'hello2'></p>
+
+<input type 
+       =password data-content =blah/>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..5c20aac0f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+             __o = true;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "text";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1234;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __TestNamespace_InputTagHelper.Type = "password";
+            __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..8f89ff3a4f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
@@ -0,0 +1,75 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] TagHelpersWithWeirdlySpacedAttributes.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (31:0,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (35:2,0 [85] TagHelpersWithWeirdlySpacedAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (105:6,25 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (105:6,25 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (54:5,1 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (54:5,1 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - Hello World
+                    DefaultTagHelperProperty - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1337
+                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - true
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:6,40 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (120:6,40 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (124:8,0 [47] TagHelpersWithWeirdlySpacedAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - text
+                    DefaultTagHelperProperty - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - text
+                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (162:8,38 [5] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (162:8,38 [5] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - hello
+                    DefaultTagHelperExecute - 
+                HtmlContent - (171:8,47 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (171:8,47 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (175:10,0 [46] TagHelpersWithWeirdlySpacedAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (186:10,11 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (186:10,11 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1234
+                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.SingleQuotes
+                        HtmlContent - (209:11,3 [6] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (209:11,3 [6] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - hello2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (221:11,15 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (221:11,15 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (225:13,0 [51] TagHelpersWithWeirdlySpacedAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    DefaultTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - string TestNamespace.InputTagHelper.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - password
+                    DefaultTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - password
+                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - blah
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..ecd160b96c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
+|"*, TestAssembly"|
+Generated Location: (827:15,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (74:5,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
+|1337|
+Generated Location: (1471:33,33 [4] )
+|1337|
+
+Source Location: (99:6,19 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
+|true|
+Generated Location: (1679:40,19 [4] )
+|true|
+
+Source Location: (186:10,11 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
+|1234|
+Generated Location: (2353:52,33 [4] )
+|1234|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..f0d4d3d1ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
@@ -0,0 +1,140 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a58200cdb2a70e95e4cebb5c830216be0ae4b62c"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"a58200cdb2a70e95e4cebb5c830216be0ae4b62c", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "text", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "password", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("blah"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
+        private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Body of Tag");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            BeginWriteTagHelperAttribute();
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+             Write(true);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __tagHelperExecutionContext.AddHtmlAttribute("data-content", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_1.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+            __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_1.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_1);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1234;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper);
+            __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
+            __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2);
+            __TestNamespace_InputTagHelper.Type = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            __TestNamespace_InputTagHelper2.Type = (string)__tagHelperAttribute_4.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_4);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..b89b1ddb27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
@@ -0,0 +1,59 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - data-content - hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - data-content - hello2 - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_4 - type - password - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - data-content - blah - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
+            FieldDeclaration -  - private - global::TestNamespace.InputTagHelper2 - __TestNamespace_InputTagHelper2
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (33:1,0 [2] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (33:1,0 [2] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n
+                TagHelper - (35:2,0 [85] TagHelpersWithWeirdlySpacedAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (105:6,25 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (105:6,25 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1337
+                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                            IntermediateToken - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - true
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:6,40 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (120:6,40 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (124:8,0 [47] TagHelpersWithWeirdlySpacedAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    PreallocatedTagHelperProperty - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - __tagHelperAttribute_1 - type - Type
+                    PreallocatedTagHelperProperty - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - __tagHelperAttribute_1 - type - Type
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                HtmlContent - (171:8,47 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (171:8,47 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (175:10,0 [46] TagHelpersWithWeirdlySpacedAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperProperty - (186:10,11 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (186:10,11 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1234
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                    DefaultTagHelperExecute - 
+                HtmlContent - (221:11,15 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
+                    IntermediateToken - (221:11,15 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - \n\n
+                TagHelper - (225:13,0 [51] TagHelpersWithWeirdlySpacedAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper
+                    DefaultTagHelperCreate -  - TestNamespace.InputTagHelper2
+                    PreallocatedTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - __tagHelperAttribute_4 - type - Type
+                    PreallocatedTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - __tagHelperAttribute_4 - type - Type
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_5
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml
new file mode 100644
index 0000000000..f32934b44a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml
@@ -0,0 +1,5 @@
+@{
+    <script type="text/javascript" @{} ></script @foo >
+}
+
+<script></script @
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.cs
new file mode 100644
index 0000000000..06f63d1b3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml"
+  
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml"
+                                     
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml"
+                                                       
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..b67fb8bdc0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml(5,11): Error RZ1024: End of file or an unexpected character was reached before the "script" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt
new file mode 100644
index 0000000000..c06477366a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [6] Tags.cshtml)
+                    IntermediateToken - (2:0,2 [6] Tags.cshtml) - CSharp - \n    
+                HtmlContent - (8:1,4 [31] Tags.cshtml)
+                    IntermediateToken - (8:1,4 [7] Tags.cshtml) - Html - <script
+                    IntermediateToken - (15:1,11 [23] Tags.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (38:1,34 [1] Tags.cshtml) - Html -  
+                CSharpCode - (41:1,37 [0] Tags.cshtml)
+                    IntermediateToken - (41:1,37 [0] Tags.cshtml) - CSharp - 
+                HtmlContent - (42:1,38 [17] Tags.cshtml)
+                    IntermediateToken - (42:1,38 [1] Tags.cshtml) - Html -  
+                    IntermediateToken - (43:1,39 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (44:1,40 [15] Tags.cshtml) - Html - </script @foo >
+                CSharpCode - (59:1,55 [2] Tags.cshtml)
+                    IntermediateToken - (59:1,55 [2] Tags.cshtml) - CSharp - \n
+                HtmlContent - (64:3,0 [20] Tags.cshtml)
+                    IntermediateToken - (64:3,0 [2] Tags.cshtml) - Html - \n
+                    IntermediateToken - (66:4,0 [7] Tags.cshtml) - Html - <script
+                    IntermediateToken - (73:4,7 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (74:4,8 [10] Tags.cshtml) - Html - </script @
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.mappings.txt
new file mode 100644
index 0000000000..046f3128e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (2:0,2 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml)
+|
+    |
+Generated Location: (728:19,2 [6] )
+|
+    |
+
+Source Location: (41:1,37 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml)
+||
+Generated Location: (922:27,37 [0] )
+||
+
+Source Location: (59:1,55 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml)
+|
+|
+Generated Location: (1128:34,55 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs
new file mode 100644
index 0000000000..ff6fc1a8d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs
@@ -0,0 +1,21 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "42fb758ed87c3709cfb3f3aeff7a9cf8d242b74c"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"42fb758ed87c3709cfb3f3aeff7a9cf8d242b74c", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("    <script type=\"text/javascript\" ");
+            WriteLiteral(" ></script @foo >\r\n");
+            WriteLiteral("\r\n<script></script @");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..b67fb8bdc0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml(5,11): Error RZ1024: End of file or an unexpected character was reached before the "script" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt
new file mode 100644
index 0000000000..38757651f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [2] Tags.cshtml)
+                    IntermediateToken - (2:0,2 [2] Tags.cshtml) - CSharp - \n
+                HtmlContent - (4:1,0 [35] Tags.cshtml)
+                    IntermediateToken - (4:1,0 [4] Tags.cshtml) - Html -     
+                    IntermediateToken - (8:1,4 [7] Tags.cshtml) - Html - <script
+                    IntermediateToken - (15:1,11 [23] Tags.cshtml) - Html -  type="text/javascript"
+                    IntermediateToken - (38:1,34 [1] Tags.cshtml) - Html -  
+                CSharpCode - (41:1,37 [0] Tags.cshtml)
+                    IntermediateToken - (41:1,37 [0] Tags.cshtml) - CSharp - 
+                HtmlContent - (42:1,38 [19] Tags.cshtml)
+                    IntermediateToken - (42:1,38 [1] Tags.cshtml) - Html -  
+                    IntermediateToken - (43:1,39 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (44:1,40 [15] Tags.cshtml) - Html - </script @foo >
+                    IntermediateToken - (59:1,55 [2] Tags.cshtml) - Html - \n
+                CSharpCode - (61:2,0 [0] Tags.cshtml)
+                    IntermediateToken - (61:2,0 [0] Tags.cshtml) - CSharp - 
+                HtmlContent - (64:3,0 [20] Tags.cshtml)
+                    IntermediateToken - (64:3,0 [2] Tags.cshtml) - Html - \n
+                    IntermediateToken - (66:4,0 [7] Tags.cshtml) - Html - <script
+                    IntermediateToken - (73:4,7 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (74:4,8 [10] Tags.cshtml) - Html - </script @
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml
new file mode 100644
index 0000000000..467329dc4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml
@@ -0,0 +1,53 @@
+@functions {
+    public HelperResult Repeat(int times, Func<int, object> template) {
+        return new HelperResult((writer) => {
+            for(int i = 0; i < times; i++) {
+                ((HelperResult)template(i)).WriteTo(writer);
+            }
+        });
+    }
+}
+
+@{
+    Func<dynamic, object> foo = @<text>This works @item!</text>;
+    @foo("")
+}
+
+@{ 
+    Func<dynamic, object> bar = @<p class="@item">Hello</p>;
+    @bar("myclass")
+}
+
+<ul>
+@(Repeat(10, @<li>Item #@item</li>))
+</ul>
+
+<p>
+@Repeat(10,
+    @: This is line#@item of markup<br/>
+)
+</p>
+
+<p>
+@Repeat(10,
+    @:: This is line#@item of markup<br />
+)
+</p>
+
+<p>
+@Repeat(10,
+    @::: This is line#@item of markup<br />
+)
+</p>
+
+
+<ul>
+    @Repeat(10, @<li>
+        Item #@item
+        @{var parent = item;}
+        <ul>
+            <li>Child Items... ?</li>
+            @*Repeat(10, @<li>Item #@(parent).@item</li>)*@
+        </ul>
+    </li>)
+</ul> 
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e9338fa173
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.cs
@@ -0,0 +1,206 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+  
+    Func<dynamic, object> foo = 
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                             __o = item;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            )
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                                               ;
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = foo("");
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+   
+    Func<dynamic, object> bar = 
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                      __o = item;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            )
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                                           ;
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = bar("myclass");
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                   
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = Repeat(10, item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                   __o = item;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+               __o = item;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                __o = item;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 39 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                 __o = item;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 45 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+__o = Repeat(10, item => new Template(async(__razor_template_writer) => {
+#nullable restore
+#line 46 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+         __o = item;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 47 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+          var parent = item;
+
+#line default
+#line hidden
+#nullable disable
+}
+));
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+            
+    public HelperResult Repeat(int times, Func<int, object> template) {
+        return new HelperResult((writer) => {
+            for(int i = 0; i < times; i++) {
+                ((HelperResult)template(i)).WriteTo(writer);
+            }
+        });
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt
new file mode 100644
index 0000000000..f43be6acf7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt
@@ -0,0 +1,158 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (278:8,1 [4] Templates.cshtml)
+                    IntermediateToken - (278:8,1 [4] Templates.cshtml) - Html - \n\n
+                CSharpCode - (284:10,2 [34] Templates.cshtml)
+                    IntermediateToken - (284:10,2 [34] Templates.cshtml) - CSharp - \n    Func<dynamic, object> foo = 
+                Template - (325:11,39 [16] Templates.cshtml)
+                    HtmlContent - (325:11,39 [11] Templates.cshtml)
+                        IntermediateToken - (325:11,39 [11] Templates.cshtml) - Html - This works 
+                    CSharpExpression - (337:11,51 [4] Templates.cshtml)
+                        IntermediateToken - (337:11,51 [4] Templates.cshtml) - CSharp - item
+                    HtmlContent - (341:11,55 [1] Templates.cshtml)
+                        IntermediateToken - (341:11,55 [1] Templates.cshtml) - Html - !
+                CSharpCode - (349:11,63 [7] Templates.cshtml)
+                    IntermediateToken - (349:11,63 [7] Templates.cshtml) - CSharp - ;\n    
+                CSharpExpression - (357:12,5 [7] Templates.cshtml)
+                    IntermediateToken - (357:12,5 [7] Templates.cshtml) - CSharp - foo("")
+                CSharpCode - (364:12,12 [2] Templates.cshtml)
+                    IntermediateToken - (364:12,12 [2] Templates.cshtml) - CSharp - \n
+                HtmlContent - (369:14,0 [2] Templates.cshtml)
+                    IntermediateToken - (369:14,0 [2] Templates.cshtml) - Html - \n
+                CSharpCode - (373:15,2 [35] Templates.cshtml)
+                    IntermediateToken - (373:15,2 [35] Templates.cshtml) - CSharp -  \n    Func<dynamic, object> bar = 
+                Template - (409:16,33 [26] Templates.cshtml)
+                    HtmlContent - (409:16,33 [2] Templates.cshtml)
+                        IntermediateToken - (409:16,33 [2] Templates.cshtml) - Html - <p
+                    HtmlAttribute - (411:16,35 [14] Templates.cshtml) -  class=" - "
+                        CSharpExpressionAttributeValue - (419:16,43 [5] Templates.cshtml) - 
+                            IntermediateToken - (420:16,44 [4] Templates.cshtml) - CSharp - item
+                    HtmlContent - (425:16,49 [10] Templates.cshtml)
+                        IntermediateToken - (425:16,49 [1] Templates.cshtml) - Html - >
+                        IntermediateToken - (426:16,50 [5] Templates.cshtml) - Html - Hello
+                        IntermediateToken - (431:16,55 [4] Templates.cshtml) - Html - </p>
+                CSharpCode - (435:16,59 [7] Templates.cshtml)
+                    IntermediateToken - (435:16,59 [7] Templates.cshtml) - CSharp - ;\n    
+                CSharpExpression - (443:17,5 [14] Templates.cshtml)
+                    IntermediateToken - (443:17,5 [14] Templates.cshtml) - CSharp - bar("myclass")
+                CSharpCode - (457:17,19 [2] Templates.cshtml)
+                    IntermediateToken - (457:17,19 [2] Templates.cshtml) - CSharp - \n
+                HtmlContent - (462:19,0 [8] Templates.cshtml)
+                    IntermediateToken - (462:19,0 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (464:20,0 [3] Templates.cshtml) - Html - <ul
+                    IntermediateToken - (467:20,3 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (468:20,4 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (472:21,2 [31] Templates.cshtml)
+                    IntermediateToken - (472:21,2 [11] Templates.cshtml) - CSharp - Repeat(10, 
+                    Template - (484:21,14 [19] Templates.cshtml)
+                        HtmlContent - (484:21,14 [10] Templates.cshtml)
+                            IntermediateToken - (484:21,14 [3] Templates.cshtml) - Html - <li
+                            IntermediateToken - (487:21,17 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (488:21,18 [6] Templates.cshtml) - Html - Item #
+                        CSharpExpression - (495:21,25 [4] Templates.cshtml)
+                            IntermediateToken - (495:21,25 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (499:21,29 [5] Templates.cshtml)
+                            IntermediateToken - (499:21,29 [5] Templates.cshtml) - Html - </li>
+                    IntermediateToken - (504:21,34 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (506:21,36 [16] Templates.cshtml)
+                    IntermediateToken - (506:21,36 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (508:22,0 [5] Templates.cshtml) - Html - </ul>
+                    IntermediateToken - (513:22,5 [4] Templates.cshtml) - Html - \n\n
+                    IntermediateToken - (517:24,0 [2] Templates.cshtml) - Html - <p
+                    IntermediateToken - (519:24,2 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (520:24,3 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (523:25,1 [52] Templates.cshtml)
+                    IntermediateToken - (523:25,1 [16] Templates.cshtml) - CSharp - Repeat(10,\n    
+                    Template - (541:26,6 [35] Templates.cshtml)
+                        HtmlContent - (541:26,6 [14] Templates.cshtml)
+                            IntermediateToken - (541:26,6 [14] Templates.cshtml) - Html -  This is line#
+                        CSharpExpression - (556:26,21 [4] Templates.cshtml)
+                            IntermediateToken - (556:26,21 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (560:26,25 [17] Templates.cshtml)
+                            IntermediateToken - (560:26,25 [17] Templates.cshtml) - Html -  of markup<br/>\n
+                    IntermediateToken - (577:27,0 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (578:27,1 [15] Templates.cshtml)
+                    IntermediateToken - (578:27,1 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (580:28,0 [4] Templates.cshtml) - Html - </p>
+                    IntermediateToken - (584:28,4 [4] Templates.cshtml) - Html - \n\n
+                    IntermediateToken - (588:30,0 [2] Templates.cshtml) - Html - <p
+                    IntermediateToken - (590:30,2 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (591:30,3 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (594:31,1 [54] Templates.cshtml)
+                    IntermediateToken - (594:31,1 [16] Templates.cshtml) - CSharp - Repeat(10,\n    
+                    Template - (612:32,6 [37] Templates.cshtml)
+                        HtmlContent - (612:32,6 [15] Templates.cshtml)
+                            IntermediateToken - (612:32,6 [15] Templates.cshtml) - Html - : This is line#
+                        CSharpExpression - (628:32,22 [4] Templates.cshtml)
+                            IntermediateToken - (628:32,22 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (632:32,26 [18] Templates.cshtml)
+                            IntermediateToken - (632:32,26 [18] Templates.cshtml) - Html -  of markup<br />\n
+                    IntermediateToken - (650:33,0 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (651:33,1 [15] Templates.cshtml)
+                    IntermediateToken - (651:33,1 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (653:34,0 [4] Templates.cshtml) - Html - </p>
+                    IntermediateToken - (657:34,4 [4] Templates.cshtml) - Html - \n\n
+                    IntermediateToken - (661:36,0 [2] Templates.cshtml) - Html - <p
+                    IntermediateToken - (663:36,2 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (664:36,3 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (667:37,1 [55] Templates.cshtml)
+                    IntermediateToken - (667:37,1 [16] Templates.cshtml) - CSharp - Repeat(10,\n    
+                    Template - (685:38,6 [38] Templates.cshtml)
+                        HtmlContent - (685:38,6 [16] Templates.cshtml)
+                            IntermediateToken - (685:38,6 [16] Templates.cshtml) - Html - :: This is line#
+                        CSharpExpression - (702:38,23 [4] Templates.cshtml)
+                            IntermediateToken - (702:38,23 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (706:38,27 [18] Templates.cshtml)
+                            IntermediateToken - (706:38,27 [18] Templates.cshtml) - Html -  of markup<br />\n
+                    IntermediateToken - (724:39,0 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (725:39,1 [22] Templates.cshtml)
+                    IntermediateToken - (725:39,1 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (727:40,0 [4] Templates.cshtml) - Html - </p>
+                    IntermediateToken - (731:40,4 [6] Templates.cshtml) - Html - \n\n\n
+                    IntermediateToken - (737:43,0 [3] Templates.cshtml) - Html - <ul
+                    IntermediateToken - (740:43,3 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (741:43,4 [6] Templates.cshtml) - Html - \n    
+                CSharpExpression - (748:44,5 [141] Templates.cshtml)
+                    IntermediateToken - (748:44,5 [11] Templates.cshtml) - CSharp - Repeat(10, 
+                    Template - (760:44,17 [129] Templates.cshtml)
+                        HtmlContent - (760:44,17 [20] Templates.cshtml)
+                            IntermediateToken - (760:44,17 [3] Templates.cshtml) - Html - <li
+                            IntermediateToken - (763:44,20 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (764:44,21 [16] Templates.cshtml) - Html - \n        Item #
+                        CSharpExpression - (781:45,15 [4] Templates.cshtml)
+                            IntermediateToken - (781:45,15 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (785:45,19 [10] Templates.cshtml)
+                            IntermediateToken - (785:45,19 [10] Templates.cshtml) - Html - \n        
+                        CSharpCode - (797:46,10 [18] Templates.cshtml)
+                            IntermediateToken - (797:46,10 [18] Templates.cshtml) - CSharp - var parent = item;
+                        HtmlContent - (818:47,0 [53] Templates.cshtml)
+                            IntermediateToken - (818:47,0 [8] Templates.cshtml) - Html -         
+                            IntermediateToken - (826:47,8 [3] Templates.cshtml) - Html - <ul
+                            IntermediateToken - (829:47,11 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (830:47,12 [14] Templates.cshtml) - Html - \n            
+                            IntermediateToken - (844:48,12 [3] Templates.cshtml) - Html - <li
+                            IntermediateToken - (847:48,15 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (848:48,16 [16] Templates.cshtml) - Html - Child Items... ?
+                            IntermediateToken - (864:48,32 [5] Templates.cshtml) - Html - </li>
+                            IntermediateToken - (869:48,37 [2] Templates.cshtml) - Html - \n
+                        HtmlContent - (932:50,0 [24] Templates.cshtml)
+                            IntermediateToken - (932:50,0 [8] Templates.cshtml) - Html -         
+                            IntermediateToken - (940:50,8 [5] Templates.cshtml) - Html - </ul>
+                            IntermediateToken - (945:50,13 [6] Templates.cshtml) - Html - \n    
+                            IntermediateToken - (951:51,4 [5] Templates.cshtml) - Html - </li>
+                    IntermediateToken - (956:51,9 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (957:51,10 [8] Templates.cshtml)
+                    IntermediateToken - (957:51,10 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (959:52,0 [5] Templates.cshtml) - Html - </ul>
+                    IntermediateToken - (964:52,5 [1] Templates.cshtml) - Html -  
+            CSharpCode - (12:0,12 [265] Templates.cshtml)
+                IntermediateToken - (12:0,12 [265] Templates.cshtml) - CSharp - \n    public HelperResult Repeat(int times, Func<int, object> template) {\n        return new HelperResult((writer) => {\n            for(int i = 0; i < times; i++) {\n                ((HelperResult)template(i)).WriteTo(writer);\n            }\n        });\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt
new file mode 100644
index 0000000000..4c67be5de0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.mappings.txt
@@ -0,0 +1,169 @@
+Source Location: (284:10,2 [34] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|
+    Func<dynamic, object> foo = |
+Generated Location: (739:19,2 [34] )
+|
+    Func<dynamic, object> foo = |
+
+Source Location: (337:11,51 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (1051:28,51 [4] )
+|item|
+
+Source Location: (349:11,63 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|;
+    |
+Generated Location: (1306:37,63 [7] )
+|;
+    |
+
+Source Location: (357:12,5 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|foo("")|
+Generated Location: (1476:45,6 [7] )
+|foo("")|
+
+Source Location: (364:12,12 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|
+|
+Generated Location: (1653:52,12 [2] )
+|
+|
+
+Source Location: (373:15,2 [35] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+| 
+    Func<dynamic, object> bar = |
+Generated Location: (1812:59,2 [35] )
+| 
+    Func<dynamic, object> bar = |
+
+Source Location: (420:16,44 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (2118:68,44 [4] )
+|item|
+
+Source Location: (435:16,59 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|;
+    |
+Generated Location: (2369:77,59 [7] )
+|;
+    |
+
+Source Location: (443:17,5 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|bar("myclass")|
+Generated Location: (2539:85,6 [14] )
+|bar("myclass")|
+
+Source Location: (457:17,19 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|
+|
+Generated Location: (2730:92,19 [2] )
+|
+|
+
+Source Location: (472:21,2 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|Repeat(10, |
+Generated Location: (2893:99,6 [11] )
+|Repeat(10, |
+
+Source Location: (495:21,25 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (3092:102,25 [4] )
+|item|
+
+Source Location: (504:21,34 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|)|
+Generated Location: (3153:108,1 [1] )
+|)|
+
+Source Location: (523:25,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|Repeat(10,
+    |
+Generated Location: (3318:115,6 [16] )
+|Repeat(10,
+    |
+
+Source Location: (556:26,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (3518:119,21 [4] )
+|item|
+
+Source Location: (577:27,0 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|)|
+Generated Location: (3579:125,1 [1] )
+|)|
+
+Source Location: (594:31,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|Repeat(10,
+    |
+Generated Location: (3744:132,6 [16] )
+|Repeat(10,
+    |
+
+Source Location: (628:32,22 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (3945:136,22 [4] )
+|item|
+
+Source Location: (650:33,0 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|)|
+Generated Location: (4006:142,1 [1] )
+|)|
+
+Source Location: (667:37,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|Repeat(10,
+    |
+Generated Location: (4171:149,6 [16] )
+|Repeat(10,
+    |
+
+Source Location: (702:38,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (4373:153,23 [4] )
+|item|
+
+Source Location: (724:39,0 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|)|
+Generated Location: (4434:159,1 [1] )
+|)|
+
+Source Location: (748:44,5 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|Repeat(10, |
+Generated Location: (4599:166,6 [11] )
+|Repeat(10, |
+
+Source Location: (781:45,15 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|item|
+Generated Location: (4788:169,15 [4] )
+|item|
+
+Source Location: (797:46,10 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|var parent = item;|
+Generated Location: (4960:176,10 [18] )
+|var parent = item;|
+
+Source Location: (956:51,9 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|)|
+Generated Location: (5034:182,1 [1] )
+|)|
+
+Source Location: (12:0,12 [265] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml)
+|
+    public HelperResult Repeat(int times, Func<int, object> template) {
+        return new HelperResult((writer) => {
+            for(int i = 0; i < times; i++) {
+                ((HelperResult)template(i)).WriteTo(writer);
+            }
+        });
+    }
+|
+Generated Location: (5253:191,12 [265] )
+|
+    public HelperResult Repeat(int times, Func<int, object> template) {
+        return new HelperResult((writer) => {
+            for(int i = 0; i < times; i++) {
+                ((HelperResult)template(i)).WriteTo(writer);
+            }
+        });
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs
new file mode 100644
index 0000000000..8dccc5c266
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs
@@ -0,0 +1,228 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "488aa2f21a6d3e3c761871ec0bf2f295695db71a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"488aa2f21a6d3e3c761871ec0bf2f295695db71a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+  
+    Func<dynamic, object> foo = 
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+                PushWriter(__razor_template_writer);
+                WriteLiteral("This works ");
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                             Write(item);
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("!");
+                PopWriter();
+            }
+            )
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                                               ;
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(foo(""));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+   
+    Func<dynamic, object> bar = 
+
+#line default
+#line hidden
+#nullable disable
+            item => new Template(async(__razor_template_writer) => {
+                PushWriter(__razor_template_writer);
+                WriteLiteral("<p");
+                BeginWriteAttribute("class", " class=\"", 411, "\"", 424, 1);
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+WriteAttributeValue("", 419, item, 419, 5, false);
+
+#line default
+#line hidden
+#nullable disable
+                EndWriteAttribute();
+                WriteLiteral(">Hello</p>");
+                PopWriter();
+            }
+            )
+#nullable restore
+#line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                                                           ;
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(bar("myclass"));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n<ul>\r\n");
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(Repeat(10, item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    WriteLiteral("<li>Item #");
+#nullable restore
+#line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                   Write(item);
+
+#line default
+#line hidden
+#nullable disable
+    WriteLiteral("</li>");
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n</ul>\r\n\r\n<p>\r\n");
+#nullable restore
+#line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    WriteLiteral(" This is line#");
+#nullable restore
+#line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+               Write(item);
+
+#line default
+#line hidden
+#nullable disable
+    WriteLiteral(" of markup<br/>\r\n");
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n</p>\r\n\r\n<p>\r\n");
+#nullable restore
+#line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    WriteLiteral(": This is line#");
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                Write(item);
+
+#line default
+#line hidden
+#nullable disable
+    WriteLiteral(" of markup<br />\r\n");
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n</p>\r\n\r\n<p>\r\n");
+#nullable restore
+#line 38 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    WriteLiteral(":: This is line#");
+#nullable restore
+#line 39 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+                 Write(item);
+
+#line default
+#line hidden
+#nullable disable
+    WriteLiteral(" of markup<br />\r\n");
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n</p>\r\n\r\n\r\n<ul>\r\n    ");
+#nullable restore
+#line 45 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+Write(Repeat(10, item => new Template(async(__razor_template_writer) => {
+    PushWriter(__razor_template_writer);
+    WriteLiteral("<li>\r\n        Item #");
+#nullable restore
+#line 46 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+         Write(item);
+
+#line default
+#line hidden
+#nullable disable
+    WriteLiteral("\r\n");
+#nullable restore
+#line 47 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+          var parent = item;
+
+#line default
+#line hidden
+#nullable disable
+    WriteLiteral("        <ul>\r\n            <li>Child Items... ?</li>\r\n");
+    WriteLiteral("        </ul>\r\n    </li>");
+    PopWriter();
+}
+)));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n</ul> ");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates.cshtml"
+            
+    public HelperResult Repeat(int times, Func<int, object> template) {
+        return new HelperResult((writer) => {
+            for(int i = 0; i < times; i++) {
+                ((HelperResult)template(i)).WriteTo(writer);
+            }
+        });
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt
new file mode 100644
index 0000000000..a9f30a92b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt
@@ -0,0 +1,156 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (280:9,0 [2] Templates.cshtml)
+                    IntermediateToken - (280:9,0 [2] Templates.cshtml) - Html - \n
+                CSharpCode - (284:10,2 [34] Templates.cshtml)
+                    IntermediateToken - (284:10,2 [34] Templates.cshtml) - CSharp - \n    Func<dynamic, object> foo = 
+                Template - (325:11,39 [16] Templates.cshtml)
+                    HtmlContent - (325:11,39 [11] Templates.cshtml)
+                        IntermediateToken - (325:11,39 [11] Templates.cshtml) - Html - This works 
+                    CSharpExpression - (337:11,51 [4] Templates.cshtml)
+                        IntermediateToken - (337:11,51 [4] Templates.cshtml) - CSharp - item
+                    HtmlContent - (341:11,55 [1] Templates.cshtml)
+                        IntermediateToken - (341:11,55 [1] Templates.cshtml) - Html - !
+                CSharpCode - (349:11,63 [7] Templates.cshtml)
+                    IntermediateToken - (349:11,63 [7] Templates.cshtml) - CSharp - ;\n    
+                CSharpExpression - (357:12,5 [7] Templates.cshtml)
+                    IntermediateToken - (357:12,5 [7] Templates.cshtml) - CSharp - foo("")
+                CSharpCode - (364:12,12 [2] Templates.cshtml)
+                    IntermediateToken - (364:12,12 [2] Templates.cshtml) - CSharp - \n
+                HtmlContent - (369:14,0 [2] Templates.cshtml)
+                    IntermediateToken - (369:14,0 [2] Templates.cshtml) - Html - \n
+                CSharpCode - (373:15,2 [35] Templates.cshtml)
+                    IntermediateToken - (373:15,2 [35] Templates.cshtml) - CSharp -  \n    Func<dynamic, object> bar = 
+                Template - (409:16,33 [26] Templates.cshtml)
+                    HtmlContent - (409:16,33 [2] Templates.cshtml)
+                        IntermediateToken - (409:16,33 [2] Templates.cshtml) - Html - <p
+                    HtmlAttribute - (411:16,35 [14] Templates.cshtml) -  class=" - "
+                        CSharpExpressionAttributeValue - (419:16,43 [5] Templates.cshtml) - 
+                            IntermediateToken - (420:16,44 [4] Templates.cshtml) - CSharp - item
+                    HtmlContent - (425:16,49 [10] Templates.cshtml)
+                        IntermediateToken - (425:16,49 [1] Templates.cshtml) - Html - >
+                        IntermediateToken - (426:16,50 [5] Templates.cshtml) - Html - Hello
+                        IntermediateToken - (431:16,55 [4] Templates.cshtml) - Html - </p>
+                CSharpCode - (435:16,59 [7] Templates.cshtml)
+                    IntermediateToken - (435:16,59 [7] Templates.cshtml) - CSharp - ;\n    
+                CSharpExpression - (443:17,5 [14] Templates.cshtml)
+                    IntermediateToken - (443:17,5 [14] Templates.cshtml) - CSharp - bar("myclass")
+                CSharpCode - (457:17,19 [2] Templates.cshtml)
+                    IntermediateToken - (457:17,19 [2] Templates.cshtml) - CSharp - \n
+                HtmlContent - (462:19,0 [8] Templates.cshtml)
+                    IntermediateToken - (462:19,0 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (464:20,0 [3] Templates.cshtml) - Html - <ul
+                    IntermediateToken - (467:20,3 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (468:20,4 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (472:21,2 [31] Templates.cshtml)
+                    IntermediateToken - (472:21,2 [11] Templates.cshtml) - CSharp - Repeat(10, 
+                    Template - (484:21,14 [19] Templates.cshtml)
+                        HtmlContent - (484:21,14 [10] Templates.cshtml)
+                            IntermediateToken - (484:21,14 [3] Templates.cshtml) - Html - <li
+                            IntermediateToken - (487:21,17 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (488:21,18 [6] Templates.cshtml) - Html - Item #
+                        CSharpExpression - (495:21,25 [4] Templates.cshtml)
+                            IntermediateToken - (495:21,25 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (499:21,29 [5] Templates.cshtml)
+                            IntermediateToken - (499:21,29 [5] Templates.cshtml) - Html - </li>
+                    IntermediateToken - (504:21,34 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (506:21,36 [16] Templates.cshtml)
+                    IntermediateToken - (506:21,36 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (508:22,0 [5] Templates.cshtml) - Html - </ul>
+                    IntermediateToken - (513:22,5 [4] Templates.cshtml) - Html - \n\n
+                    IntermediateToken - (517:24,0 [2] Templates.cshtml) - Html - <p
+                    IntermediateToken - (519:24,2 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (520:24,3 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (523:25,1 [52] Templates.cshtml)
+                    IntermediateToken - (523:25,1 [16] Templates.cshtml) - CSharp - Repeat(10,\n    
+                    Template - (541:26,6 [35] Templates.cshtml)
+                        HtmlContent - (541:26,6 [14] Templates.cshtml)
+                            IntermediateToken - (541:26,6 [14] Templates.cshtml) - Html -  This is line#
+                        CSharpExpression - (556:26,21 [4] Templates.cshtml)
+                            IntermediateToken - (556:26,21 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (560:26,25 [17] Templates.cshtml)
+                            IntermediateToken - (560:26,25 [17] Templates.cshtml) - Html -  of markup<br/>\n
+                    IntermediateToken - (577:27,0 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (578:27,1 [15] Templates.cshtml)
+                    IntermediateToken - (578:27,1 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (580:28,0 [4] Templates.cshtml) - Html - </p>
+                    IntermediateToken - (584:28,4 [4] Templates.cshtml) - Html - \n\n
+                    IntermediateToken - (588:30,0 [2] Templates.cshtml) - Html - <p
+                    IntermediateToken - (590:30,2 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (591:30,3 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (594:31,1 [54] Templates.cshtml)
+                    IntermediateToken - (594:31,1 [16] Templates.cshtml) - CSharp - Repeat(10,\n    
+                    Template - (612:32,6 [37] Templates.cshtml)
+                        HtmlContent - (612:32,6 [15] Templates.cshtml)
+                            IntermediateToken - (612:32,6 [15] Templates.cshtml) - Html - : This is line#
+                        CSharpExpression - (628:32,22 [4] Templates.cshtml)
+                            IntermediateToken - (628:32,22 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (632:32,26 [18] Templates.cshtml)
+                            IntermediateToken - (632:32,26 [18] Templates.cshtml) - Html -  of markup<br />\n
+                    IntermediateToken - (650:33,0 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (651:33,1 [15] Templates.cshtml)
+                    IntermediateToken - (651:33,1 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (653:34,0 [4] Templates.cshtml) - Html - </p>
+                    IntermediateToken - (657:34,4 [4] Templates.cshtml) - Html - \n\n
+                    IntermediateToken - (661:36,0 [2] Templates.cshtml) - Html - <p
+                    IntermediateToken - (663:36,2 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (664:36,3 [2] Templates.cshtml) - Html - \n
+                CSharpExpression - (667:37,1 [55] Templates.cshtml)
+                    IntermediateToken - (667:37,1 [16] Templates.cshtml) - CSharp - Repeat(10,\n    
+                    Template - (685:38,6 [38] Templates.cshtml)
+                        HtmlContent - (685:38,6 [16] Templates.cshtml)
+                            IntermediateToken - (685:38,6 [16] Templates.cshtml) - Html - :: This is line#
+                        CSharpExpression - (702:38,23 [4] Templates.cshtml)
+                            IntermediateToken - (702:38,23 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (706:38,27 [18] Templates.cshtml)
+                            IntermediateToken - (706:38,27 [18] Templates.cshtml) - Html -  of markup<br />\n
+                    IntermediateToken - (724:39,0 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (725:39,1 [22] Templates.cshtml)
+                    IntermediateToken - (725:39,1 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (727:40,0 [4] Templates.cshtml) - Html - </p>
+                    IntermediateToken - (731:40,4 [6] Templates.cshtml) - Html - \n\n\n
+                    IntermediateToken - (737:43,0 [3] Templates.cshtml) - Html - <ul
+                    IntermediateToken - (740:43,3 [1] Templates.cshtml) - Html - >
+                    IntermediateToken - (741:43,4 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (743:44,0 [4] Templates.cshtml) - Html -     
+                CSharpExpression - (748:44,5 [141] Templates.cshtml)
+                    IntermediateToken - (748:44,5 [11] Templates.cshtml) - CSharp - Repeat(10, 
+                    Template - (760:44,17 [129] Templates.cshtml)
+                        HtmlContent - (760:44,17 [20] Templates.cshtml)
+                            IntermediateToken - (760:44,17 [3] Templates.cshtml) - Html - <li
+                            IntermediateToken - (763:44,20 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (764:44,21 [16] Templates.cshtml) - Html - \n        Item #
+                        CSharpExpression - (781:45,15 [4] Templates.cshtml)
+                            IntermediateToken - (781:45,15 [4] Templates.cshtml) - CSharp - item
+                        HtmlContent - (785:45,19 [2] Templates.cshtml)
+                            IntermediateToken - (785:45,19 [2] Templates.cshtml) - Html - \n
+                        CSharpCode - (787:46,0 [8] Templates.cshtml)
+                            IntermediateToken - (787:46,0 [8] Templates.cshtml) - CSharp -         
+                        CSharpCode - (797:46,10 [18] Templates.cshtml)
+                            IntermediateToken - (797:46,10 [18] Templates.cshtml) - CSharp - var parent = item;
+                        HtmlContent - (818:47,0 [53] Templates.cshtml)
+                            IntermediateToken - (818:47,0 [8] Templates.cshtml) - Html -         
+                            IntermediateToken - (826:47,8 [3] Templates.cshtml) - Html - <ul
+                            IntermediateToken - (829:47,11 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (830:47,12 [14] Templates.cshtml) - Html - \n            
+                            IntermediateToken - (844:48,12 [3] Templates.cshtml) - Html - <li
+                            IntermediateToken - (847:48,15 [1] Templates.cshtml) - Html - >
+                            IntermediateToken - (848:48,16 [16] Templates.cshtml) - Html - Child Items... ?
+                            IntermediateToken - (864:48,32 [5] Templates.cshtml) - Html - </li>
+                            IntermediateToken - (869:48,37 [2] Templates.cshtml) - Html - \n
+                        HtmlContent - (932:50,0 [24] Templates.cshtml)
+                            IntermediateToken - (932:50,0 [8] Templates.cshtml) - Html -         
+                            IntermediateToken - (940:50,8 [5] Templates.cshtml) - Html - </ul>
+                            IntermediateToken - (945:50,13 [6] Templates.cshtml) - Html - \n    
+                            IntermediateToken - (951:51,4 [5] Templates.cshtml) - Html - </li>
+                    IntermediateToken - (956:51,9 [1] Templates.cshtml) - CSharp - )
+                HtmlContent - (957:51,10 [8] Templates.cshtml)
+                    IntermediateToken - (957:51,10 [2] Templates.cshtml) - Html - \n
+                    IntermediateToken - (959:52,0 [5] Templates.cshtml) - Html - </ul>
+                    IntermediateToken - (964:52,5 [1] Templates.cshtml) - Html -  
+            CSharpCode - (12:0,12 [265] Templates.cshtml)
+                IntermediateToken - (12:0,12 [265] Templates.cshtml) - CSharp - \n    public HelperResult Repeat(int times, Func<int, object> template) {\n        return new HelperResult((writer) => {\n            for(int i = 0; i < times; i++) {\n                ((HelperResult)template(i)).WriteTo(writer);\n            }\n        });\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml
new file mode 100644
index 0000000000..b73f2c01fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml
@@ -0,0 +1,12 @@
+@addTagHelper "*, TestAssembly"
+@{ 
+    var @class = "container-fluid";
+    var @int = 1;
+}
+
+<p class="@class" age="1337">Body of Tag</p>
+<p class="@(@class)" age="42"></p>
+<p class="test" age="42 + @int"></p>
+<p class="test" age="@int"></p>
+<p class="test" age="@(@int)"></p>
+<p class="custom-@(@class)" age="4 * @(@int + 2)"></p>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
new file mode 100644
index 0000000000..cf1f4ecedb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
@@ -0,0 +1,104 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_DesignTime
+    {
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+   
+    var @class = "container-fluid";
+    var @int = 1;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+      __o = @class;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 42;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 42 + @int;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = int;
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = (@int);
+
+#line default
+#line hidden
+#nullable disable
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+             __o = @class;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 4 * @(@int + 2);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..cc0379e358
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml(7,12): Error RZ1007: "class" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt
new file mode 100644
index 0000000000..e0dcc96a1c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt
@@ -0,0 +1,105 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_DesignTime -  - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [17] TransitionsInTagHelperAttributes.cshtml) - "*, TestAssembly"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:0,31 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (31:0,31 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                CSharpCode - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) - CSharp -  \n    var @class = "container-fluid";\n    var @int = 1;\n
+                HtmlContent - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (99:6,0 [44] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCodeAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - 
+                    DefaultTagHelperProperty - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - 1337
+                    DefaultTagHelperExecute - 
+                HtmlContent - (143:6,44 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (143:6,44 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (145:7,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (155:7,10 [9] TransitionsInTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (157:7,12 [6] TransitionsInTagHelperAttributes.cshtml) - CSharp - @class
+                    DefaultTagHelperProperty - (171:7,26 [2] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (171:7,26 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp - 42
+                    DefaultTagHelperExecute - 
+                HtmlContent - (179:7,34 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (179:7,34 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (181:8,0 [36] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (191:8,10 [4] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (191:8,10 [4] TransitionsInTagHelperAttributes.cshtml) - Html - test
+                    DefaultTagHelperProperty - (202:8,21 [9] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (202:8,21 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp - 42
+                        IntermediateToken - (204:8,23 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp -  +
+                        IntermediateToken - (206:8,25 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp -  
+                        CSharpExpression - (207:8,26 [4] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (207:8,26 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - @
+                            IntermediateToken - (208:8,27 [3] TransitionsInTagHelperAttributes.cshtml) - CSharp - int
+                    DefaultTagHelperExecute - 
+                HtmlContent - (217:8,36 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (217:8,36 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (219:9,0 [31] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (229:9,10 [4] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (229:9,10 [4] TransitionsInTagHelperAttributes.cshtml) - Html - test
+                    DefaultTagHelperProperty - (240:9,21 [4] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (241:9,22 [3] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (241:9,22 [3] TransitionsInTagHelperAttributes.cshtml) - CSharp - int
+                    DefaultTagHelperExecute - 
+                HtmlContent - (250:9,31 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (250:9,31 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (252:10,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (262:10,10 [4] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (262:10,10 [4] TransitionsInTagHelperAttributes.cshtml) - Html - test
+                    DefaultTagHelperProperty - (273:10,21 [7] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (274:10,22 [6] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (274:10,22 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - (
+                            IntermediateToken - (275:10,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - @int
+                            IntermediateToken - (279:10,27 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (286:10,34 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (286:10,34 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (288:11,0 [54] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - Html - custom-
+                        CSharpExpressionAttributeValue - (305:11,17 [9] TransitionsInTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (307:11,19 [6] TransitionsInTagHelperAttributes.cshtml) - CSharp - @class
+                    DefaultTagHelperProperty - (321:11,33 [15] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (321:11,33 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - 4
+                        IntermediateToken - (322:11,34 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp -  *
+                        IntermediateToken - (324:11,36 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp -  
+                        CSharpExpression - (325:11,37 [11] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (325:11,37 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - @
+                            IntermediateToken - (326:11,38 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - (
+                            IntermediateToken - (327:11,39 [8] TransitionsInTagHelperAttributes.cshtml) - CSharp - @int + 2
+                            IntermediateToken - (335:11,47 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (342:11,54 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (342:11,54 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9bd891b1a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
@@ -0,0 +1,116 @@
+Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|"*, TestAssembly"|
+Generated Location: (643:13,37 [17] )
+|"*, TestAssembly"|
+
+Source Location: (35:1,2 [59] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+| 
+    var @class = "container-fluid";
+    var @int = 1;
+|
+Generated Location: (1156:30,2 [59] )
+| 
+    var @class = "container-fluid";
+    var @int = 1;
+|
+
+Source Location: (122:6,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|1337|
+Generated Location: (1520:40,33 [4] )
+|1337|
+
+Source Location: (157:7,12 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|@class|
+Generated Location: (1811:48,12 [6] )
+|@class|
+
+Source Location: (171:7,26 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|42|
+Generated Location: (2030:55,33 [2] )
+|42|
+
+Source Location: (202:8,21 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|42|
+Generated Location: (2340:63,33 [2] )
+|42|
+
+Source Location: (204:8,23 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+| +|
+Generated Location: (2342:63,35 [2] )
+| +|
+
+Source Location: (206:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+| |
+Generated Location: (2344:63,37 [1] )
+| |
+
+Source Location: (207:8,26 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|@|
+Generated Location: (2345:63,38 [1] )
+|@|
+
+Source Location: (208:8,27 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|int|
+Generated Location: (2346:63,39 [3] )
+|int|
+
+Source Location: (241:9,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|int|
+Generated Location: (2658:71,33 [3] )
+|int|
+
+Source Location: (274:10,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|(|
+Generated Location: (2970:79,33 [1] )
+|(|
+
+Source Location: (275:10,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|@int|
+Generated Location: (2971:79,34 [4] )
+|@int|
+
+Source Location: (279:10,27 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|)|
+Generated Location: (2975:79,38 [1] )
+|)|
+
+Source Location: (307:11,19 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|@class|
+Generated Location: (3271:87,19 [6] )
+|@class|
+
+Source Location: (321:11,33 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|4|
+Generated Location: (3491:94,33 [1] )
+|4|
+
+Source Location: (322:11,34 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+| *|
+Generated Location: (3492:94,34 [2] )
+| *|
+
+Source Location: (324:11,36 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+| |
+Generated Location: (3494:94,36 [1] )
+| |
+
+Source Location: (325:11,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|@|
+Generated Location: (3495:94,37 [1] )
+|@|
+
+Source Location: (326:11,38 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|(|
+Generated Location: (3496:94,38 [1] )
+|(|
+
+Source Location: (327:11,39 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|@int + 2|
+Generated Location: (3497:94,39 [8] )
+|@int + 2|
+
+Source Location: (335:11,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
+|)|
+Generated Location: (3505:94,47 [1] )
+|)|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
new file mode 100644
index 0000000000..92f6922618
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
@@ -0,0 +1,204 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f9794a93d1ce05bf71080dc33a3e83b16dbce225"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f9794a93d1ce05bf71080dc33a3e83b16dbce225", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_Runtime
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("test"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+   
+    var @class = "container-fluid";
+    var @int = 1;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                WriteLiteral("Body of Tag");
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 109, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+                PopWriter();
+            }
+            ), 109, 6, false);
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 1337;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+AddHtmlAttributeValue("", 155, @class, 155, 9, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+#nullable restore
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 42;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 42 + @int;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = int;
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = (@int);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
+            BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 2, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            AddHtmlAttributeValue("", 298, "custom-", 298, 7, true);
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+AddHtmlAttributeValue("", 305, @class, 305, 9, false);
+
+#line default
+#line hidden
+#nullable disable
+            EndAddHtmlAttributeValues(__tagHelperExecutionContext);
+#nullable restore
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
+__TestNamespace_PTagHelper.Age = 4 * @(@int + 2);
+
+#line default
+#line hidden
+#nullable disable
+            __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            WriteLiteral("\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..cc0379e358
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml(7,12): Error RZ1007: "class" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt
new file mode 100644
index 0000000000..6a6678ed86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt
@@ -0,0 +1,92 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_Runtime -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - test - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) - CSharp -  \n    var @class = "container-fluid";\n    var @int = 1;\n
+                HtmlContent - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (99:6,0 [44] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) - Html - Body of Tag
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpCodeAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - 
+                    DefaultTagHelperProperty - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - 1337
+                    DefaultTagHelperExecute - 
+                HtmlContent - (143:6,44 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (143:6,44 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (145:7,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpressionAttributeValue - (155:7,10 [9] TransitionsInTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (157:7,12 [6] TransitionsInTagHelperAttributes.cshtml) - CSharp - @class
+                    DefaultTagHelperProperty - (171:7,26 [2] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (171:7,26 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp - 42
+                    DefaultTagHelperExecute - 
+                HtmlContent - (179:7,34 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (179:7,34 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (181:8,0 [36] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (202:8,21 [9] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (202:8,21 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp - 42
+                        IntermediateToken - (204:8,23 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp -  +
+                        IntermediateToken - (206:8,25 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp -  
+                        CSharpExpression - (207:8,26 [4] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (207:8,26 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - @
+                            IntermediateToken - (208:8,27 [3] TransitionsInTagHelperAttributes.cshtml) - CSharp - int
+                    DefaultTagHelperExecute - 
+                HtmlContent - (217:8,36 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (217:8,36 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (219:9,0 [31] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (240:9,21 [4] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (241:9,22 [3] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (241:9,22 [3] TransitionsInTagHelperAttributes.cshtml) - CSharp - int
+                    DefaultTagHelperExecute - 
+                HtmlContent - (250:9,31 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (250:9,31 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (252:10,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperProperty - (273:10,21 [7] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (274:10,22 [6] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (274:10,22 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - (
+                            IntermediateToken - (275:10,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - @int
+                            IntermediateToken - (279:10,27 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (286:10,34 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (286:10,34 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
+                TagHelper - (288:11,0 [54] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - TestNamespace.PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlAttributeValue - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - Html - custom-
+                        CSharpExpressionAttributeValue - (305:11,17 [9] TransitionsInTagHelperAttributes.cshtml) - 
+                            IntermediateToken - (307:11,19 [6] TransitionsInTagHelperAttributes.cshtml) - CSharp - @class
+                    DefaultTagHelperProperty - (321:11,33 [15] TransitionsInTagHelperAttributes.cshtml) - age - int TestNamespace.PTagHelper.Age - HtmlAttributeValueStyle.DoubleQuotes
+                        IntermediateToken - (321:11,33 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - 4
+                        IntermediateToken - (322:11,34 [2] TransitionsInTagHelperAttributes.cshtml) - CSharp -  *
+                        IntermediateToken - (324:11,36 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp -  
+                        CSharpExpression - (325:11,37 [11] TransitionsInTagHelperAttributes.cshtml)
+                            IntermediateToken - (325:11,37 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - @
+                            IntermediateToken - (326:11,38 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - (
+                            IntermediateToken - (327:11,39 [8] TransitionsInTagHelperAttributes.cshtml) - CSharp - @int + 2
+                            IntermediateToken - (335:11,47 [1] TransitionsInTagHelperAttributes.cshtml) - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (342:11,54 [2] TransitionsInTagHelperAttributes.cshtml)
+                    IntermediateToken - (342:11,54 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml
new file mode 100644
index 0000000000..bf1d796466
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml
@@ -0,0 +1,3 @@
+@{
+@DateTime.
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs
new file mode 100644
index 0000000000..40784c2dc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml"
+  
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml"
+__o = DateTime.;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml"
+          
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt
new file mode 100644
index 0000000000..d74744737e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [2] UnfinishedExpressionInCode.cshtml)
+                    IntermediateToken - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
+                CSharpExpression - (5:1,1 [9] UnfinishedExpressionInCode.cshtml)
+                    IntermediateToken - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) - CSharp - DateTime.
+                CSharpCode - (14:1,10 [2] UnfinishedExpressionInCode.cshtml)
+                    IntermediateToken - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt
new file mode 100644
index 0000000000..09ed0f1ab4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (2:0,2 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml)
+|
+|
+Generated Location: (772:19,2 [2] )
+|
+|
+
+Source Location: (5:1,1 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml)
+|DateTime.|
+Generated Location: (951:26,6 [9] )
+|DateTime.|
+
+Source Location: (14:1,10 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml)
+|
+|
+Generated Location: (1144:33,10 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs
new file mode 100644
index 0000000000..b93722e23a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs
@@ -0,0 +1,25 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "263a6264ce5a6790b4db8f6767ceefade6eaacba"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"263a6264ce5a6790b4db8f6767ceefade6eaacba", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode.cshtml"
+Write(DateTime.);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt
new file mode 100644
index 0000000000..a9958a1a62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (2:0,2 [2] UnfinishedExpressionInCode.cshtml)
+                    IntermediateToken - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
+                CSharpExpression - (5:1,1 [9] UnfinishedExpressionInCode.cshtml)
+                    IntermediateToken - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) - CSharp - DateTime.
+                CSharpCode - (14:1,10 [2] UnfinishedExpressionInCode.cshtml)
+                    IntermediateToken - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml
new file mode 100644
index 0000000000..f553308221
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml
@@ -0,0 +1,15 @@
+@using System.IO
+@using Foo = System.Text.Encoding
+@using System
+
+@using static System
+@using static System.Console
+@using static global::System.Text.Encoding
+
+@{ 
+    using var disposable = (IDisposable)ViewData["disposable"];
+    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];
+}
+
+<p>Path's full type name is @typeof(Path).FullName</p>
+<p>Foo's actual full type name is @typeof(Foo).FullName</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs
new file mode 100644
index 0000000000..fb070b7255
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.cs
@@ -0,0 +1,87 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using System.IO;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using Foo = System.Text.Encoding;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using System;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using static System;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using static System.Console;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using static global::System.Text.Encoding;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+   
+    using var disposable = (IDisposable)ViewData["disposable"];
+    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+                       __o = typeof(Path).FullName;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+                             __o = typeof(Foo).FullName;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt
new file mode 100644
index 0000000000..0304ac09a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt
@@ -0,0 +1,48 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        UsingDirective - (1:0,1 [15] Usings.cshtml) - System.IO
+        UsingDirective - (19:1,1 [32] Usings.cshtml) - Foo = System.Text.Encoding
+        UsingDirective - (54:2,1 [12] Usings.cshtml) - System
+        UsingDirective - (71:4,1 [19] Usings.cshtml) - static System
+        UsingDirective - (93:5,1 [27] Usings.cshtml) - static System.Console
+        UsingDirective - (123:6,1 [41] Usings.cshtml) - static global::System.Text.Encoding
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (16:0,16 [2] Usings.cshtml)
+                    IntermediateToken - (16:0,16 [2] Usings.cshtml) - Html - \n
+                HtmlContent - (51:1,33 [2] Usings.cshtml)
+                    IntermediateToken - (51:1,33 [2] Usings.cshtml) - Html - \n
+                HtmlContent - (66:2,13 [4] Usings.cshtml)
+                    IntermediateToken - (66:2,13 [4] Usings.cshtml) - Html - \n\n
+                HtmlContent - (90:4,20 [2] Usings.cshtml)
+                    IntermediateToken - (90:4,20 [2] Usings.cshtml) - Html - \n
+                HtmlContent - (120:5,28 [2] Usings.cshtml)
+                    IntermediateToken - (120:5,28 [2] Usings.cshtml) - Html - \n
+                HtmlContent - (164:6,42 [4] Usings.cshtml)
+                    IntermediateToken - (164:6,42 [4] Usings.cshtml) - Html - \n\n
+                CSharpCode - (170:8,2 [158] Usings.cshtml)
+                    IntermediateToken - (170:8,2 [158] Usings.cshtml) - CSharp -  \n    using var disposable = (IDisposable)ViewData["disposable"];\n    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];\n
+                HtmlContent - (331:12,0 [30] Usings.cshtml)
+                    IntermediateToken - (331:12,0 [2] Usings.cshtml) - Html - \n
+                    IntermediateToken - (333:13,0 [2] Usings.cshtml) - Html - <p
+                    IntermediateToken - (335:13,2 [1] Usings.cshtml) - Html - >
+                    IntermediateToken - (336:13,3 [25] Usings.cshtml) - Html - Path's full type name is 
+                CSharpExpression - (362:13,29 [21] Usings.cshtml)
+                    IntermediateToken - (362:13,29 [21] Usings.cshtml) - CSharp - typeof(Path).FullName
+                HtmlContent - (383:13,50 [40] Usings.cshtml)
+                    IntermediateToken - (383:13,50 [4] Usings.cshtml) - Html - </p>
+                    IntermediateToken - (387:13,54 [2] Usings.cshtml) - Html - \n
+                    IntermediateToken - (389:14,0 [2] Usings.cshtml) - Html - <p
+                    IntermediateToken - (391:14,2 [1] Usings.cshtml) - Html - >
+                    IntermediateToken - (392:14,3 [31] Usings.cshtml) - Html - Foo's actual full type name is 
+                CSharpExpression - (424:14,35 [20] Usings.cshtml)
+                    IntermediateToken - (424:14,35 [20] Usings.cshtml) - CSharp - typeof(Foo).FullName
+                HtmlContent - (444:14,55 [4] Usings.cshtml)
+                    IntermediateToken - (444:14,55 [4] Usings.cshtml) - Html - </p>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b8e0ff21ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.mappings.txt
@@ -0,0 +1,51 @@
+Source Location: (1:0,1 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|using System.IO|
+Generated Location: (248:7,0 [15] )
+|using System.IO|
+
+Source Location: (19:1,1 [32] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|using Foo = System.Text.Encoding|
+Generated Location: (417:14,0 [32] )
+|using Foo = System.Text.Encoding|
+
+Source Location: (54:2,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|using System|
+Generated Location: (603:21,0 [12] )
+|using System|
+
+Source Location: (71:4,1 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|using static System|
+Generated Location: (769:28,0 [19] )
+|using static System|
+
+Source Location: (93:5,1 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|using static System.Console|
+Generated Location: (942:35,0 [27] )
+|using static System.Console|
+
+Source Location: (123:6,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|using static global::System.Text.Encoding|
+Generated Location: (1123:42,0 [41] )
+|using static global::System.Text.Encoding|
+
+Source Location: (170:8,2 [158] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+| 
+    using var disposable = (IDisposable)ViewData["disposable"];
+    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];
+|
+Generated Location: (1802:61,2 [158] )
+| 
+    using var disposable = (IDisposable)ViewData["disposable"];
+    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];
+|
+
+Source Location: (362:13,29 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|typeof(Path).FullName|
+Generated Location: (2141:70,29 [21] )
+|typeof(Path).FullName|
+
+Source Location: (424:14,35 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml)
+|typeof(Foo).FullName|
+Generated Location: (2352:77,35 [20] )
+|typeof(Foo).FullName|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs
new file mode 100644
index 0000000000..9e8c883e86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs
@@ -0,0 +1,88 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "dd901a1308d91331879cabdc9f6c4666357d361c"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using System.IO;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using Foo = System.Text.Encoding;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using System;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using static System;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using static System.Console;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+using static global::System.Text.Encoding;
+
+#line default
+#line hidden
+#nullable disable
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"dd901a1308d91331879cabdc9f6c4666357d361c", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+   
+    using var disposable = (IDisposable)ViewData["disposable"];
+    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n<p>Path\'s full type name is ");
+#nullable restore
+#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+                       Write(typeof(Path).FullName);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n<p>Foo\'s actual full type name is ");
+#nullable restore
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml"
+                             Write(typeof(Foo).FullName);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt
new file mode 100644
index 0000000000..bdbb1a2b32
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        UsingDirective - (1:0,1 [17] Usings.cshtml) - System.IO
+        UsingDirective - (19:1,1 [34] Usings.cshtml) - Foo = System.Text.Encoding
+        UsingDirective - (54:2,1 [14] Usings.cshtml) - System
+        UsingDirective - (71:4,1 [21] Usings.cshtml) - static System
+        UsingDirective - (93:5,1 [29] Usings.cshtml) - static System.Console
+        UsingDirective - (123:6,1 [43] Usings.cshtml) - static global::System.Text.Encoding
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (68:3,0 [2] Usings.cshtml)
+                    IntermediateToken - (68:3,0 [2] Usings.cshtml) - Html - \n
+                HtmlContent - (166:7,0 [2] Usings.cshtml)
+                    IntermediateToken - (166:7,0 [2] Usings.cshtml) - Html - \n
+                CSharpCode - (170:8,2 [158] Usings.cshtml)
+                    IntermediateToken - (170:8,2 [158] Usings.cshtml) - CSharp -  \n    using var disposable = (IDisposable)ViewData["disposable"];\n    using System.IDisposable otherDisposable = (IDisposable)ViewData["otherdisposable"];\n
+                HtmlContent - (331:12,0 [30] Usings.cshtml)
+                    IntermediateToken - (331:12,0 [2] Usings.cshtml) - Html - \n
+                    IntermediateToken - (333:13,0 [2] Usings.cshtml) - Html - <p
+                    IntermediateToken - (335:13,2 [1] Usings.cshtml) - Html - >
+                    IntermediateToken - (336:13,3 [25] Usings.cshtml) - Html - Path's full type name is 
+                CSharpExpression - (362:13,29 [21] Usings.cshtml)
+                    IntermediateToken - (362:13,29 [21] Usings.cshtml) - CSharp - typeof(Path).FullName
+                HtmlContent - (383:13,50 [40] Usings.cshtml)
+                    IntermediateToken - (383:13,50 [4] Usings.cshtml) - Html - </p>
+                    IntermediateToken - (387:13,54 [2] Usings.cshtml) - Html - \n
+                    IntermediateToken - (389:14,0 [2] Usings.cshtml) - Html - <p
+                    IntermediateToken - (391:14,2 [1] Usings.cshtml) - Html - >
+                    IntermediateToken - (392:14,3 [31] Usings.cshtml) - Html - Foo's actual full type name is 
+                CSharpExpression - (424:14,35 [20] Usings.cshtml)
+                    IntermediateToken - (424:14,35 [20] Usings.cshtml) - CSharp - typeof(Foo).FullName
+                HtmlContent - (444:14,55 [4] Usings.cshtml)
+                    IntermediateToken - (444:14,55 [4] Usings.cshtml) - Html - </p>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7b9e5c6721
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async (e) => await Task.Delay(10));
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
new file mode 100644
index 0000000000..63fa8d1ba6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
new file mode 100644
index 0000000000..da693d568e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Threading.Tasks|
+Generated Location: (285:11,0 [28] )
+|using System.Threading.Tasks|
+
+Source Location: (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml)
+|async (e) => await Task.Delay(10)|
+Generated Location: (1024:28,135 [33] )
+|async (e) => await Task.Delay(10)|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..890869b955
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..f3563c7527
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3535131bb7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Threading.Tasks|
+Generated Location: (285:11,0 [28] )
+|using System.Threading.Tasks|
+
+Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (1024:28,135 [7] )
+|OnClick|
+
+Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1166:33,12 [91] )
+|
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4fd3f9c3fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async () => await Task.Delay(10));
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
new file mode 100644
index 0000000000..48dce9fc63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (31:1,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (86:1,55 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (86:1,55 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5e145c5d5f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Threading.Tasks|
+Generated Location: (285:11,0 [28] )
+|using System.Threading.Tasks|
+
+Source Location: (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+|async () => await Task.Delay(10)|
+Generated Location: (1024:28,135 [32] )
+|async () => await Task.Delay(10)|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..473b76e707
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..36fc31d61d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..77307d3ca3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Threading.Tasks|
+Generated Location: (285:11,0 [28] )
+|using System.Threading.Tasks|
+
+Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (1024:28,135 [7] )
+|OnClick|
+
+Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1166:33,12 [73] )
+|
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..28b9f38c38
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..07fc52d174
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..75ec1243e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1012:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (2038:48,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d9c8894512
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -0,0 +1,67 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ), -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)), -1, () => ParentValue);
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
new file mode 100644
index 0000000000..31cdafe918
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a8393bab66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1018:25,29 [11] )
+|ParentValue|
+
+Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+Generated Location: (1611:43,12 [65] )
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..90e7455448
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..2e10ee50f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7c0d91e13d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1012:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1879:47,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..cae5b1a772
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "42";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..b8a0b3ce1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..314fa2582d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1012:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "42";
+|
+Generated Location: (1879:47,12 [55] )
+|
+    public string ParentValue { get; set; } = "42";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b31f4bddb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = new System.Action<System.Int32>(
+            __value => ParentValue = __value);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..44efeecc6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3030c4f451
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1022:25,35 [11] )
+|ParentValue|
+
+Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1632:47,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1a3197469a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..5032a30534
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..09d3d3d00f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (951:25,35 [11] )
+|ParentValue|
+
+Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1600:46,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ae77121e8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = new System.Action<System.Int32>(
+            __value => ParentValue = __value);
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..c5c176d9f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6120312d7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1012:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1781:48,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..abbdb266cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -0,0 +1,67 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ), -1, 
+            __value => ParentValue = __value, -1, () => ParentValue);
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
new file mode 100644
index 0000000000..7dd845774f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a37e623514
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1018:25,29 [11] )
+|ParentValue|
+
+Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+Generated Location: (1454:43,12 [65] )
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b72fcc8147
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = new System.Action<System.Int32>(
+            __value => ParentValue = __value);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..4aefefe530
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d4e92fed42
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1012:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1622:47,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..42ac007a96
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..80bbc2c4b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e04cac446a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (941:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1590:46,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..735861778c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = new System.Action<System.Int32>(
+            __value => ParentValue = __value);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "42";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..dc73410b73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5416eade1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1012:25,25 [11] )
+|ParentValue|
+
+Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "42";
+|
+Generated Location: (1622:47,12 [55] )
+|
+    public string ParentValue { get; set; } = "42";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
new file mode 100644
index 0000000000..27f13189ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       person.Name
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = new System.Action<System.String>(
+            __value => person.Name = __value);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(InputText);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+ 
+    Person person = new Person();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
new file mode 100644
index 0000000000..524433227f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
+                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => person.Name = __value
+                HtmlContent - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d3243cd759
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (1011:25,23 [11] )
+|person.Name|
+
+Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    Person person = new Person();
+|
+Generated Location: (1609:47,1 [37] )
+|
+    Person person = new Person();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..df36edafe1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..b5846fe609
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                HtmlContent - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..eb70c72849
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (844:22,71 [11] )
+|CurrentDate|
+
+Source Location: (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1148:28,12 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..60dd84f6d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..4977a3ab4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (56:0,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:0,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..66994d5d83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (844:22,71 [11] )
+|ParentValue|
+
+Source Location: (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1130:28,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5095e79d77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..aa1c259149
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..51928f7675
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (844:22,71 [11] )
+|ParentValue|
+
+Source Location: (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1130:28,12 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5095e79d77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..25924af8c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (32:0,32 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (32:0,32 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..4f1af18790
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (844:22,71 [11] )
+|ParentValue|
+
+Source Location: (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1130:28,12 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5095e79d77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..c4d058de00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..19e08b3d2d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (844:22,71 [11] )
+|ParentValue|
+
+Source Location: (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1130:28,12 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6c19b7ef2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<string> header = (context) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                 __o = context.ToLowerInvariant();
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                       ; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     header
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..9cf34bf2c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
+                Template - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
+                CSharpCode - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (92:1,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some Content\n
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6f31803213
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<string> header = (context) => |
+Generated Location: (845:24,2 [46] )
+| RenderFragment<string> header = (context) => |
+
+Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLowerInvariant()|
+Generated Location: (1097:32,55 [26] )
+|context.ToLowerInvariant()|
+
+Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1348:40,87 [2] )
+|; |
+
+Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|header|
+Generated Location: (1579:48,21 [6] )
+|header|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..157d5a6074
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -0,0 +1,72 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<string> header = (context) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                 __o = context.ToLowerInvariant();
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                       ; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     header
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..5ec41f2891
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
+                Template - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
+                CSharpCode - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (92:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (124:2,2 [41] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        HtmlContent - (138:2,16 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (138:2,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some Content
+                    ComponentChildContent - (169:3,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        HtmlContent - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye!
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6f31803213
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<string> header = (context) => |
+Generated Location: (845:24,2 [46] )
+| RenderFragment<string> header = (context) => |
+
+Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLowerInvariant()|
+Generated Location: (1097:32,55 [26] )
+|context.ToLowerInvariant()|
+
+Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1348:40,87 [2] )
+|; |
+
+Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|header|
+Generated Location: (1579:48,21 [6] )
+|header|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f9c07d662b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public bool Enabled { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..3750a696d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
+                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..15c93e7528
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|Enabled|
+Generated Location: (844:22,71 [7] )
+|Enabled|
+
+Source Location: (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public bool Enabled { get; set; }
+|
+Generated Location: (1118:28,12 [41] )
+|
+    public bool Enabled { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f1722b8765
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = "MM/dd/yyyy";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..d89291db41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken - (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
+                HtmlContent - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..729d6d806a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,23 @@
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (844:22,71 [11] )
+|CurrentDate|
+
+Source Location: (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|Format|
+Generated Location: (857:22,84 [6] )
+|Format|
+
+Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = "MM/dd/yyyy";
+|
+Generated Location: (1146:28,12 [135] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = "MM/dd/yyyy";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2cdf9884f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..33afa67bef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+                HtmlContent - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9680d2d7a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (844:22,71 [11] )
+|CurrentDate|
+
+Source Location: (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1158:28,12 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..60dd84f6d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..5182498d51
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..cf11197010
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (844:22,71 [11] )
+|ParentValue|
+
+Source Location: (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1130:28,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..60dd84f6d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..96e38ebbc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5eb80dd1e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (844:22,71 [11] )
+|ParentValue|
+
+Source Location: (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1130:28,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b27cbb9cee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   string
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
new file mode 100644
index 0000000000..1c62ade910
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..cc284456ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|string|
+Generated Location: (889:25,19 [6] )
+|string|
+
+Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (1152:34,34 [4] )
+|"hi"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
new file mode 100644
index 0000000000..453eb73db9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -0,0 +1,65 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   string
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    Value
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = new System.Action<string>(
+            __value => Value = __value);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
new file mode 100644
index 0000000000..49639937b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => Value = __value
+                HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
new file mode 100644
index 0000000000..aaa2b68968
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|string|
+Generated Location: (889:25,19 [6] )
+|string|
+
+Source Location: (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|Value|
+Generated Location: (1207:34,36 [5] )
+|Value|
+
+Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (1801:56,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2df6020001
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -0,0 +1,64 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   string
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    Value
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
new file mode 100644
index 0000000000..f77e517c18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+                HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
new file mode 100644
index 0000000000..85ff3e8f1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|string|
+Generated Location: (889:25,19 [6] )
+|string|
+
+Source Location: (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|Value|
+Generated Location: (1142:34,36 [5] )
+|Value|
+
+Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (1775:55,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3db47366db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,74 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     18
+
+#line default
+#line hidden
+#nullable disable
+            , -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Value
+
+#line default
+#line hidden
+#nullable disable
+            ), -1, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Value", __arg0);
+        builder.AddAttribute(__seq1, "Item", __arg1);
+        builder.AddAttribute(__seq2, "ItemChanged", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..07f91d041b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..543949f892
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|18|
+Generated Location: (973:25,37 [2] )
+|18|
+
+Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|Value|
+Generated Location: (1193:33,23 [5] )
+|Value|
+
+Source Location: (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (1661:50,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f6f82e0752
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Value
+
+#line default
+#line hidden
+#nullable disable
+            ), -1, 
+            __value => Value = __value);
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..f9575ed34e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => Value = __value
+                HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a80e996e10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|Value|
+Generated Location: (1012:25,23 [5] )
+|Value|
+
+Source Location: (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (1413:43,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2ddd9828e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -0,0 +1,62 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   string
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+  __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..7f3d877c2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (41:0,41 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (41:0,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        MarkupElement - (45:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                        HtmlContent - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5bf0aeeec5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|string|
+Generated Location: (889:25,19 [6] )
+|string|
+
+Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (1152:34,34 [4] )
+|"hi"|
+
+Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1442:43,8 [17] )
+|context.ToLower()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f94dffda60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+  __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..b9592300fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        MarkupElement - (32:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                        HtmlContent - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ff661d31c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
+Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1139:33,8 [17] )
+|context.ToLower()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5d38ba5cf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -0,0 +1,64 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   string
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                  17
+
+#line default
+#line hidden
+#nullable disable
+            ;
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
new file mode 100644
index 0000000000..fa0a3d720e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (48:0,48 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ca9cc6f3de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|string|
+Generated Location: (889:25,19 [6] )
+|string|
+
+Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (1152:34,34 [4] )
+|"hi"|
+
+Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|17|
+Generated Location: (1364:43,50 [2] )
+|17|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..30c9c03637
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,65 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     17
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "Other", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..25eb275509
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..381cf0591d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
+Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|17|
+Generated Location: (1140:33,37 [2] )
+|17|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..93969e4a97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..c02da938f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3a30e58316
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9f86b123f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -0,0 +1,100 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "how are you?"
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, -1, -1, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "bye!"
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
new file mode 100644
index 0000000000..4bcc57c881
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (31:1,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (50:1,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (51:1,20 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "how are you?"
+                HtmlContent - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (72:2,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (91:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (92:2,20 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_1
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f50802d7d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
+Source Location: (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|"how are you?"|
+Generated Location: (1363:41,21 [14] )
+|"how are you?"|
+
+Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|"bye!"|
+Generated Location: (1779:57,21 [6] )
+|"bye!"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a114c0e016
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderChildComponent(builder); 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+        builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+        }
+        ));
+#nullable restore
+#line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..52b3697fa3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                CSharpCode - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
+                HtmlContent - (91:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (91:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (105:4,12 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (105:4,12 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
+            Component - (180:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            CSharpCode - (195:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (195:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..985e5c4be8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -0,0 +1,30 @@
+Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.RenderTree;|
+Generated Location: (320:12,0 [49] )
+|using Microsoft.AspNetCore.Components.RenderTree;|
+
+Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(builder); |
+Generated Location: (1016:31,2 [32] )
+| RenderChildComponent(builder); |
+
+Source Location: (105:4,12 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        |
+Generated Location: (1231:40,12 [75] )
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        |
+
+Source Location: (195:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    }
+|
+Generated Location: (1738:60,23 [9] )
+|
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2f799be64c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    void RenderChildComponent()
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       
+    }
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderChildComponent(); 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
new file mode 100644
index 0000000000..fca1e65ac8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent()\n    {\n        
+                Component - (104:4,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                CSharpCode - (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+                HtmlContent - (131:7,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (131:7,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e1ca18d611
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -0,0 +1,30 @@
+Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.RenderTree;|
+Generated Location: (320:12,0 [49] )
+|using Microsoft.AspNetCore.Components.RenderTree;|
+
+Source Location: (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void RenderChildComponent()
+    {
+        |
+Generated Location: (1016:31,2 [50] )
+|
+    void RenderChildComponent()
+    {
+        |
+
+Source Location: (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    }
+|
+Generated Location: (1510:51,23 [9] )
+|
+    }
+|
+
+Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(); |
+Generated Location: (1641:59,2 [25] )
+| RenderChildComponent(); |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
new file mode 100644
index 0000000000..eecbd1cbd1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -0,0 +1,81 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    string
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  int
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                              "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+            builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = System.Math.Max(0, item.Item);
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<,>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
new file mode 100644
index 0000000000..248bff85e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [228] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (57:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        MarkupElement - (71:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (117:2,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - item
+                        HtmlContent - (153:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (153:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        CSharpExpression - (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
+                        HtmlContent - (187:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (187:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n
+                    ComponentTypeArgument - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1
+                        IntermediateToken - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentTypeArgument - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
+                        IntermediateToken - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (44:0,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (45:0,45 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
new file mode 100644
index 0000000000..cf2ed1da6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|string|
+Generated Location: (890:25,20 [6] )
+|string|
+
+Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|int|
+Generated Location: (1095:34,34 [3] )
+|int|
+
+Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (1367:43,46 [4] )
+|"hi"|
+
+Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1671:52,22 [17] )
+|context.ToLower()|
+
+Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+|System.Math.Max(0, item.Item)|
+Generated Location: (2024:62,6 [29] )
+|System.Math.Max(0, item.Item)|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f725066cf2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,85 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    new List<long>()
+
+#line default
+#line hidden
+#nullable disable
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            , -1, (item) => (builder2) => {
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = System.Math.Max(0, item.Item);
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<,>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "Items", __arg1);
+        builder.AddAttribute(__seq2, "ChildContent", __arg2);
+        builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..9eb3be33a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [229] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (58:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        MarkupElement - (72:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (118:2,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - item
+                        HtmlContent - (154:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (154:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        CSharpExpression - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
+                        HtmlContent - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                    ComponentAttribute - (34:0,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (35:0,35 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new List<long>()
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..32dfaf89f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
+Source Location: (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+|new List<long>()|
+Generated Location: (1139:33,36 [16] )
+|new List<long>()|
+
+Source Location: (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1347:41,22 [17] )
+|context.ToLower()|
+
+Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+|System.Math.Max(0, item.Item)|
+Generated Location: (1553:50,6 [29] )
+|System.Math.Max(0, item.Item)|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
new file mode 100644
index 0000000000..95bd74f0af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
new file mode 100644
index 0000000000..042b7cb159
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..85496c3d10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..b98ae09892
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text
+                        MarkupElement - (35:0,35 [42] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (46:0,46 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            HtmlContent - (53:0,53 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (53:0,53 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Nested text
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..95bd74f0af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..18ae06bcf2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [47] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        MarkupElement - (13:0,13 [20] x:\dir\subdir\Test\TestComponent.cshtml) - child
+                            HtmlContent - (20:0,20 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (20:0,20 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..95bd74f0af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..a11869b683
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (13:0,13 [34] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        HtmlContent - (27:0,27 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (27:0,27 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a8cadf9d77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..75e06a12bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0c9f991a15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (949:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (1456:45,12 [100] )
+|
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ac8992801b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                      __o = context;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..ac003d6aa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (13:0,13 [37] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        CSharpExpression - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6116afdfe1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|context|
+Generated Location: (1018:25,28 [7] )
+|context|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
new file mode 100644
index 0000000000..09e33fcb22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               42.ToString()
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
new file mode 100644
index 0000000000..541586f717
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 42.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
new file mode 100644
index 0000000000..610dae86d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+|42.ToString()|
+Generated Location: (966:25,31 [13] )
+|42.ToString()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3ff474e774
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                __o = context.ToLowerInvariant();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..0951329005
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [107] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text
+                        MarkupElement - (35:0,35 [58] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (46:0,46 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            CSharpExpression - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9a2a2ac689
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLowerInvariant()|
+Generated Location: (1067:26,54 [26] )
+|context.ToLowerInvariant()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c4365c24d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          __o = item.ToLowerInvariant();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
new file mode 100644
index 0000000000..bf81825dc6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (30:1,2 [118] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
+                        HtmlContent - (59:1,31 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (59:1,31 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some text
+                        MarkupElement - (74:2,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (85:2,24 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            CSharpExpression - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
+                        HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c8d6aa2fcc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+|item.ToLowerInvariant()|
+Generated Location: (1042:26,32 [23] )
+|item.ToLowerInvariant()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c4365c24d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          __o = item.ToLowerInvariant();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..0d9d741f9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (45:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
+                        HtmlContent - (59:1,16 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (59:1,16 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some text
+                        MarkupElement - (74:2,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (85:2,24 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            CSharpExpression - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
+                        HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c8d6aa2fcc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+|item.ToLowerInvariant()|
+Generated Location: (1042:26,32 [23] )
+|item.ToLowerInvariant()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6f0ba1a5ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        e => { Increment(); }
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..e0c4d9677c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); }
+                HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d7e31882d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|e => { Increment(); }|
+Generated Location: (950:25,24 [21] )
+|e => { Increment(); }|
+
+Source Location: (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1469:45,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..08cad30ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                       43.ToString()
+
+#line default
+#line hidden
+#nullable disable
+            ;
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..52c31f052a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - some-attribute - AttributeStructure.DoubleQuotes
+                        HtmlContent - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
+                    ComponentAttribute -  - another-attribute - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (53:0,53 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 43.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b44c2dd05a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+|43.ToString()|
+Generated Location: (941:26,55 [13] )
+|43.ToString()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d1d7d045aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
+    [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/MyPage";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/AnotherRoute/{id}";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..ae2202df8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /MyPage
+        RouteAttributeExtensionNode -  - /AnotherRoute/{id}
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage"
+                DirectiveToken - (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (45:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8dd4c199df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/MyPage"|
+Generated Location: (713:19,37 [9] )
+|"/MyPage"|
+
+Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/AnotherRoute/{id}"|
+Generated Location: (942:29,37 [20] )
+|"/AnotherRoute/{id}"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e2b89244b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -0,0 +1,65 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 123
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  true
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = "";
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Test.SomeType>(
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    new SomeType()
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
new file mode 100644
index 0000000000..37ecb57cb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
+                    ComponentAttribute - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                        HtmlContent - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
+                    ComponentAttribute - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ee53944128
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|123|
+Generated Location: (951:25,17 [3] )
+|123|
+
+Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (1203:34,18 [4] )
+|true|
+
+Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|new SomeType()|
+Generated Location: (1480:44,20 [14] )
+|new SomeType()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4ee232844a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(DynamicElement);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..6d648537c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (25:0,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f5bc8cb495
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (1006:25,26 [7] )
+|OnClick|
+
+Source Location: (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+|
+Generated Location: (1514:45,12 [62] )
+|
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
new file mode 100644
index 0000000000..14f60ced05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -0,0 +1,88 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using AnotherTest;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(HeaderComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+       __o = context;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(FooterComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Test.HeaderComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+#nullable restore
+#line 13 "x:\dir\subdir\Test\TestComponent.cshtml"
+       __o = context;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(AnotherTest.FooterComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
new file mode 100644
index 0000000000..7e7c4b5c22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                Component - (22:2,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
+                    ComponentChildContent - (45:3,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (53:3,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (53:3,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                HtmlContent - (85:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (85:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (87:5,0 [68] x:\dir\subdir\Test\TestComponent.cshtml) - FooterComponent
+                    ComponentChildContent - (110:6,4 [25] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        CSharpExpression - (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                HtmlContent - (155:7,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (155:7,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (157:8,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - Test.HeaderComponent
+                    ComponentChildContent - (185:9,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (193:9,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (193:9,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                HtmlContent - (230:10,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (230:10,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (232:11,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest.FooterComponent
+                    ComponentChildContent - (267:12,4 [25] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        CSharpExpression - (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                HtmlContent - (324:13,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (324:13,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
new file mode 100644
index 0000000000..1b50d9eed5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|using AnotherTest|
+Generated Location: (320:12,0 [17] )
+|using AnotherTest|
+
+Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|context|
+Generated Location: (1436:42,13 [7] )
+|context|
+
+Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|context|
+Generated Location: (2209:69,13 [7] )
+|context|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
new file mode 100644
index 0000000000..7f2797390c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
+    [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+    public class _Imports : System.Object
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 4 "x:\dir\subdir\Test\_Imports.razor"
+MainLayout __typeHelper = default(MainLayout);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected void Execute()
+        {
+#nullable restore
+#line 5 "x:\dir\subdir\Test\_Imports.razor"
+__o = Foo;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt
new file mode 100644
index 0000000000..b91b579573
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\_Imports.razor(5,2): Error RZ10003: Markup, code and block directives are not valid in component imports.
+x:\dir\subdir\Test\_Imports.razor(6,1): Error RZ10003: Markup, code and block directives are not valid in component imports.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
new file mode 100644
index 0000000000..9e8b55d433
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        CSharpCode - 
+            IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+        ClassDeclaration -  - public - _Imports - System.Object - 
+            DesignTimeDirective - 
+                DirectiveToken - (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) - MainLayout
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected - void - Execute
+                CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
+                    IntermediateToken - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) - CSharp - Foo
+                IntermediateToken - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) - CSharp - Foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
new file mode 100644
index 0000000000..ccccb0421a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor)
+|using System.Text|
+Generated Location: (314:12,0 [17] )
+|using System.Text|
+
+Source Location: (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor)
+|using System.Reflection|
+Generated Location: (448:19,0 [23] )
+|using System.Reflection|
+
+Source Location: (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor)
+|MainLayout|
+Generated Location: (849:32,0 [10] )
+|MainLayout|
+
+Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
+|Foo|
+Generated Location: (1300:49,6 [3] )
+|Foo|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..766172880e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           "very-cool"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(CoolnessMeter);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
new file mode 100644
index 0000000000..9eab05c608
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter
+                    ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (26:0,26 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "very-cool"
+                HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..4b7cb2f3e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|"very-cool"|
+Generated Location: (961:25,27 [11] )
+|"very-cool"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ed8aaa4fec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -0,0 +1,87 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object TItem1 = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object TItem2 = null;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
+ foreach (var item2 in Items2)
+{
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = ChildContent(item2);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "x:\dir\subdir\Test\TestComponent.cshtml"
+        
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
new file mode 100644
index 0000000000..8d69ff1d2a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -0,0 +1,42 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
+            DesignTimeDirective - 
+                DirectiveToken - (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1
+                DirectiveToken - (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (39:0,39 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (39:0,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (79:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (79:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (81:4,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (85:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (85:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Item1
+                HtmlContent - (95:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (95:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n    
+                MarkupElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2)
+                    HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n    
+                CSharpCode - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n}
+                HtmlContent - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
new file mode 100644
index 0000000000..59e8cff237
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -0,0 +1,49 @@
+Source Location: (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components;|
+Generated Location: (276:11,0 [38] )
+|using Microsoft.AspNetCore.Components;|
+
+Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|TItem1|
+Generated Location: (689:23,22 [6] )
+|TItem1|
+
+Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|TItem2|
+Generated Location: (907:33,22 [6] )
+|TItem2|
+
+Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+|foreach (var item2 in Items2)
+{
+    |
+Generated Location: (1412:50,1 [38] )
+|foreach (var item2 in Items2)
+{
+    |
+
+Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
+|ChildContent(item2)|
+Generated Location: (1578:59,6 [19] )
+|ChildContent(item2)|
+
+Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+}|
+Generated Location: (1729:66,8 [3] )
+|
+}|
+
+Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+|
+Generated Location: (1916:76,12 [164] )
+|
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a23b0786d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using static Test2.SomeComponent;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Foo = Test3;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
new file mode 100644
index 0000000000..49b772e1d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [32] x:\dir\subdir\Test\TestComponent.cshtml) - static Test2.SomeComponent
+        UsingDirective - (36:1,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Foo = Test3
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (53:1,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (53:1,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (55:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (70:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (70:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (72:3,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - SomeComponent
+                HtmlContent - (89:3,17 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (89:3,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6f457a32b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+|using static Test2.SomeComponent|
+Generated Location: (320:12,0 [32] )
+|using static Test2.SomeComponent|
+
+Source Location: (36:1,1 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Foo = Test3|
+Generated Location: (475:19,0 [17] )
+|using Foo = Test3|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9cf8c3e91c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Counter);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+ if (true)
+{
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                      
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
new file mode 100644
index 0000000000..1bff96642b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - if (true)\n{\n    
+                HtmlContent - (38:3,10 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (38:3,10 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Html - This text is rendered
+                CSharpCode - (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n}
+                HtmlContent - (69:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3af4ccff9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+|if (true)
+{
+    |
+Generated Location: (1139:34,1 [18] )
+|if (true)
+{
+    |
+
+Source Location: (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+}|
+Generated Location: (1317:43,38 [3] )
+|
+}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
new file mode 100644
index 0000000000..f62729fa19
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <!DOCTYPE html>\n
+                MarkupElement - (17:1,0 [13] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (22:1,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (22:1,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f47973744c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Test.MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Test2.MyComponent2);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
new file mode 100644
index 0000000000..094e0f80a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (17:1,0 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
+                HtmlContent - (37:1,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (37:1,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (39:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Test2.MyComponent2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
new file mode 100644
index 0000000000..445e39cf49
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Counter);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
new file mode 100644
index 0000000000..facfd0a232
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7920f10a2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       myInstance = default(Test.MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
new file mode 100644
index 0000000000..ff79f7dc58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    ReferenceCapture - (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (72:0,72 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:0,72 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (193:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (193:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a7f00bd62c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|myInstance|
+Generated Location: (1079:29,39 [10] )
+|myInstance|
+
+Source Location: (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1449:45,12 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..00584b3e3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  myInstance = default(Test.MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..38cb6bc12a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        MarkupElement - (56:1,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el
+                            HtmlContent - (60:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (60:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further
+                        HtmlContent - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
+                    ReferenceCapture - (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                        HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+                HtmlContent - (96:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (96:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (217:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (217:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..194848e3d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|myInstance|
+Generated Location: (1035:28,18 [10] )
+|myInstance|
+
+Source Location: (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1405:44,12 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1a8faa662b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -0,0 +1,76 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test2;
+
+#line default
+#line hidden
+#nullable disable
+    [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
+    [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/MyPage";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        ((System.Action)(() => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/AnotherRoute/{id}";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent2);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
new file mode 100644
index 0000000000..2a28310682
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (46:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
+        RouteAttributeExtensionNode -  - /MyPage
+        RouteAttributeExtensionNode -  - /AnotherRoute/{id}
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage"
+                DirectiveToken - (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (57:2,12 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (57:2,12 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (59:3,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (74:3,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (74:3,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (76:4,0 [16] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d6ee48c3df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (46:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test2|
+Generated Location: (320:12,0 [11] )
+|using Test2|
+
+Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/MyPage"|
+Generated Location: (847:26,37 [9] )
+|"/MyPage"|
+
+Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/AnotherRoute/{id}"|
+Generated Location: (1076:36,37 [20] )
+|"/AnotherRoute/{id}"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3d024374f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test2;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test3;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(SomeComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
new file mode 100644
index 0000000000..37a4617d8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
+        UsingDirective - (15:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test3
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (12:0,12 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (12:0,12 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (26:1,12 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (26:1,12 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (28:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (43:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (45:3,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - SomeComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2ceb1baecc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test2|
+Generated Location: (320:12,0 [11] )
+|using Test2|
+
+Source Location: (15:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test3|
+Generated Location: (454:19,0 [11] )
+|using Test3|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..715cd2f13e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   
+  var myValue = "Expression value";
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     __o = myValue;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..b5c72064d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
+                MarkupElement - (45:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                    HtmlAttribute - (75:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (86:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ab5eba52f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+| 
+  var myValue = "Expression value";
+|
+Generated Location: (845:24,2 [40] )
+| 
+  var myValue = "Expression value";
+|
+
+Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|myValue|
+Generated Location: (1048:32,43 [7] )
+|myValue|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ca247e7bc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   
+  var myValue = "Expression value";
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    __o = myValue;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..71b7af99e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
+                MarkupElement - (45:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                    HtmlAttribute - (75:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (86:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..dada0e5529
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+| 
+  var myValue = "Expression value";
+|
+Generated Location: (845:24,2 [40] )
+| 
+  var myValue = "Expression value";
+|
+
+Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|myValue|
+Generated Location: (1047:32,42 [7] )
+|myValue|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
new file mode 100644
index 0000000000..68e8aaf2bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    myElem = default(Microsoft.AspNetCore.Components.ElementRef);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
new file mode 100644
index 0000000000..e5b8711527
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [79] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    ReferenceCapture - (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8218ca0d18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|myElem|
+Generated Location: (879:24,36 [6] )
+|myElem|
+
+Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+Generated Location: (1123:33,12 [122] )
+|
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ce54991fb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
new file mode 100644
index 0000000000..47ad195c1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [66] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
+                HtmlContent - (91:0,91 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (91:0,91 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
new file mode 100644
index 0000000000..bac2858c5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+|EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
+Generated Location: (1158:25,24 [63] )
+|EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
+
+Source Location: (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1720:45,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
new file mode 100644
index 0000000000..826cd5d87e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
new file mode 100644
index 0000000000..f68d967ea0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3479efe7a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1157:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1665:45,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
new file mode 100644
index 0000000000..94d6ca2cb0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
new file mode 100644
index 0000000000..2f4d599b7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
new file mode 100644
index 0000000000..723b1b2ac9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1157:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (1665:45,12 [105] )
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..abbe46e55b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..e6fd0d2801
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..421ff53ca1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -0,0 +1,22 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1157:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1665:45,12 [141] )
+|
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2d37e4be90
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..445dd76970
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d53287cf4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -0,0 +1,22 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1157:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1665:45,12 [123] )
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ac12bd09b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
new file mode 100644
index 0000000000..eac45d2050
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f34b51e3d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1157:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (1665:45,12 [106] )
+|
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b0c92cd8bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        EventCallback.Factory.Create(this, Increment)
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
new file mode 100644
index 0000000000..e83ebeffd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create(this, Increment)
+                HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
new file mode 100644
index 0000000000..55655c1d30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|EventCallback.Factory.Create(this, Increment)|
+Generated Location: (1058:25,24 [45] )
+|EventCallback.Factory.Create(this, Increment)|
+
+Source Location: (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1602:45,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
new file mode 100644
index 0000000000..843fab53d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
new file mode 100644
index 0000000000..f68d967ea0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
new file mode 100644
index 0000000000..673c329a44
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1057:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1565:45,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f4653e8585
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
new file mode 100644
index 0000000000..926575c76f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(object e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3011faef6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1057:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+|
+Generated Location: (1565:45,12 [95] )
+|
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3ae8b1382e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+        }
+        #pragma warning restore 1998
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt
new file mode 100644
index 0000000000..c8a6b90b98
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components"
+                DirectiveToken - (14:0,14 [9] ) - "*, Test"
+                DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (31:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (53:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (66:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (66:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (82:3,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:3,12 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9edd0104b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+|*, TestAssembly|
+Generated Location: (554:16,38 [15] )
+|*, TestAssembly|
+
+Source Location: (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1214:33,23 [9] )
+|Increment|
+
+Source Location: (82:3,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (1535:44,12 [105] )
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..042d99e6d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..445dd76970
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..fb3bf350e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -0,0 +1,22 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1057:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1565:45,12 [123] )
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..8a5b6061ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..4f1fa1372d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(object e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..87425df183
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -0,0 +1,22 @@
+Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|Increment|
+Generated Location: (1057:25,23 [9] )
+|Increment|
+
+Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1565:45,12 [131] )
+|
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7a5d1714fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, "alert(\"Test\");");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
new file mode 100644
index 0000000000..940ffea68d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, 
+                            IntermediateToken -  - CSharp - "alert(\"Test\");"
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..69dac0b202
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick(UIEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..9e59b40b2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..545980e391
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (908:22,135 [7] )
+|OnClick|
+
+Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIEventArgs e) {
+    }
+|
+Generated Location: (1050:27,12 [44] )
+|
+    void OnClick(UIEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..75c0eb6e2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick(UIMouseEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..1316965374
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
new file mode 100644
index 0000000000..019a41ad20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (908:22,135 [7] )
+|OnClick|
+
+Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+Generated Location: (1050:27,12 [49] )
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..91aec6e9db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { });
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..e3e2734c00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e65b926d36
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|x => { }|
+Generated Location: (908:22,135 [8] )
+|x => { }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..75c0eb6e2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick(UIMouseEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..1316965374
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..019a41ad20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (908:22,135 [7] )
+|OnClick|
+
+Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+Generated Location: (1050:27,12 [49] )
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..91aec6e9db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { });
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..e3e2734c00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e65b926d36
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|x => { }|
+Generated Location: (908:22,135 [8] )
+|x => { }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c01dd00171
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick() {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..cd13c7b59e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..91c03be2a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (908:22,135 [7] )
+|OnClick|
+
+Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick() {
+    }
+|
+Generated Location: (1050:27,12 [31] )
+|
+    void OnClick() {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9a8663b4bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, () => { });
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..6212008b9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9e25017259
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => { }|
+Generated Location: (908:22,135 [9] )
+|() => { }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6cac55e9bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "foo");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
new file mode 100644
index 0000000000..d8399f72d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken -  - CSharp - "foo"
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b1223bb9d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   int
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             3
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     _my = default(Test.MyComponent<int>);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
new file mode 100644
index 0000000000..f6f283aa66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ReferenceCapture - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+                HtmlContent - (44:0,44 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (44:0,44 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (151:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (151:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d437d43c76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -0,0 +1,26 @@
+Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|int|
+Generated Location: (889:25,19 [3] )
+|int|
+
+Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1141:34,29 [1] )
+|3|
+
+Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (1468:45,37 [3] )
+|_my|
+
+Source Location: (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (1838:61,12 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3dd6700184
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,75 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           _my = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..1142c69315
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ReferenceCapture - (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+                HtmlContent - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (141:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (141:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9a1d1b48e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,21 @@
+Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (955:25,19 [1] )
+|3|
+
+Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (1139:33,27 [3] )
+|_my|
+
+Source Location: (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (1517:51,12 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
new file mode 100644
index 0000000000..72f0ca2eae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+  __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Test.MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
new file mode 100644
index 0000000000..f0f2a741c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (33:0,33 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (33:0,33 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        MarkupElement - (37:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                        HtmlContent - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (25:0,25 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateTest_MyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0e36b99ea5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (967:25,26 [4] )
+|"hi"|
+
+Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1149:33,8 [17] )
+|context.ToLower()|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..91d5340a46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = "My value";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..632e80e8d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value"
+                HtmlContent - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                MarkupElement - (17:2,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..dc4c5e5a34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|"My value"|
+Generated Location: (849:24,6 [10] )
+|"My value"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e615ebc867
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(SomeOtherComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..4edb1a8a14
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
+                HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                MarkupElement - (26:2,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (30:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (30:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1ac95b1f15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..927fe7d9a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - System
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                MarkupElement - (17:2,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..22790fa130
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System|
+Generated Location: (301:11,0 [12] )
+|using System|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
new file mode 100644
index 0000000000..71419654ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   
+  var myValue = "Expression value";
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = myValue;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
new file mode 100644
index 0000000000..104b50853b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
+                MarkupElement - (45:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    CSharpExpression - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                    HtmlContent - (58:3,13 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (58:3,13 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                    HtmlContent - (76:3,31 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (76:3,31 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a63eaeb68e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+| 
+  var myValue = "Expression value";
+|
+Generated Location: (845:24,2 [40] )
+| 
+  var myValue = "Expression value";
+|
+
+Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|myValue|
+Generated Location: (1011:32,6 [7] )
+|myValue|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6bd9ddc974
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+        __o = "bye!";
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..03dfd3e21f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (19:1,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (27:1,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (27:1,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                    ComponentChildContent - (45:2,4 [26] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        CSharpExpression - (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3b252ca248
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|"bye!"|
+Generated Location: (1115:28,14 [6] )
+|"bye!"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4ce415e028
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -0,0 +1,76 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<Test.Context> template = (context) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                         __o = context.Index;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                          __o = context.Item.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                                           ; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        template
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..1fed8fe995
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -0,0 +1,36 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Test.Context> template = (context) => 
+                Template - (57:0,57 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (57:0,57 [50] x:\dir\subdir\Test\TestComponent.cshtml) - li
+                        HtmlContent - (61:0,61 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (61:0,61 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - #
+                        CSharpExpression - (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Index
+                        HtmlContent - (76:0,76 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (76:0,76 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \-
+                        CSharpExpression - (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Item.ToLower()
+                CSharpCode - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (112:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (135:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
+                HtmlContent - (147:1,35 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (147:1,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..910cfdbd4f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<Test.Context> template = (context) => |
+Generated Location: (845:24,2 [54] )
+| RenderFragment<Test.Context> template = (context) => |
+
+Source Location: (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.Index|
+Generated Location: (1113:32,63 [13] )
+|context.Index|
+
+Source Location: (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.Item.ToLower()|
+Generated Location: (1329:39,80 [22] )
+|context.Item.ToLower()|
+
+Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1596:47,107 [2] )
+|; |
+
+Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|template|
+Generated Location: (1829:55,24 [8] )
+|template|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3d1ead801b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -0,0 +1,74 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    RenderFragment<Person> p = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                     person.Name
+
+#line default
+#line hidden
+#nullable disable
+                );
+                builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => {
+                }
+                ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                         ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..6e406e4c06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
+                Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                                CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                    IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
+            CSharpCode - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5ca8299a2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    RenderFragment<Person> p = (person) => |
+Generated Location: (845:24,2 [45] )
+|
+    RenderFragment<Person> p = (person) => |
+
+Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (1206:34,69 [11] )
+|person.Name|
+
+Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|;
+|
+Generated Location: (1775:53,89 [3] )
+|;
+|
+
+Source Location: (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (1959:62,12 [76] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9dfc271226
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -0,0 +1,91 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    RenderFragment<Person> p = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                     person.Name
+
+#line default
+#line hidden
+#nullable disable
+                );
+                builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => {
+                }
+                ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                         ;
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = "hello, world!";
+
+#line default
+#line hidden
+#nullable disable
+            }
+            ));
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..f0982c456a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
+                Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                                CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                    IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
+                Component - (99:3,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (112:3,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (112:3,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                        CSharpExpression - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hello, world!"
+                        HtmlContent - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (148:5,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (148:5,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5e987e49f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -0,0 +1,39 @@
+Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    RenderFragment<Person> p = (person) => |
+Generated Location: (845:24,2 [45] )
+|
+    RenderFragment<Person> p = (person) => |
+
+Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (1206:34,69 [11] )
+|person.Name|
+
+Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|;
+|
+Generated Location: (1775:53,89 [3] )
+|;
+|
+
+Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hello, world!"|
+Generated Location: (2023:61,6 [15] )
+|"hello, world!"|
+
+Source Location: (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2402:79,12 [76] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9a8b133ba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<Person> template = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                  __o = person.Name;
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                         ; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                              template
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
new file mode 100644
index 0000000000..5cdd6a65b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Person> template = (person) => 
+                Template - (50:0,50 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (50:0,50 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (78:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (107:1,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
+                HtmlContent - (119:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (119:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
new file mode 100644
index 0000000000..da4eedb4bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<Person> template = (person) => |
+Generated Location: (845:24,2 [47] )
+| RenderFragment<Person> template = (person) => |
+
+Source Location: (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (1099:32,56 [11] )
+|person.Name|
+
+Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1321:40,73 [2] )
+|; |
+
+Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|template|
+Generated Location: (1559:48,30 [8] )
+|template|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d90bdc11f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = RenderPerson((person) => (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           __o = person.Name;
+
+#line default
+#line hidden
+#nullable disable
+}
+);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..73d7c93929
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
+                    Template - (27:0,27 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                        MarkupElement - (27:0,27 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                    IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
+                HtmlContent - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c7d0b77360
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+|RenderPerson((person) => |
+Generated Location: (849:24,6 [25] )
+|RenderPerson((person) => |
+
+Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (994:27,33 [11] )
+|person.Name|
+
+Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|)|
+Generated Location: (1061:33,0 [1] )
+|)|
+
+Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+Generated Location: (1246:42,12 [138] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0ceac8cd27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -0,0 +1,62 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    RenderFragment<Person> p = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                            __o = person.Name;
+
+#line default
+#line hidden
+#nullable disable
+            }
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                   ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
new file mode 100644
index 0000000000..f8eee8f857
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
+                Template - (48:1,44 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (48:1,44 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
+            CSharpCode - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
new file mode 100644
index 0000000000..40172c00c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    RenderFragment<Person> p = (person) => |
+Generated Location: (845:24,2 [45] )
+|
+    RenderFragment<Person> p = (person) => |
+
+Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (1091:33,50 [11] )
+|person.Name|
+
+Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|;
+|
+Generated Location: (1307:41,67 [3] )
+|;
+|
+
+Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (1491:50,12 [76] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..80dcc8fa37
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = RenderPerson((person) => (builder2) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            __o = person.Name;
+
+#line default
+#line hidden
+#nullable disable
+}
+);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..90dbab8c07
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (2:0,2 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
+                    Template - (28:0,28 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                        MarkupElement - (28:0,28 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                    IntermediateToken - (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
+                HtmlContent - (53:0,53 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (53:0,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8221f7255d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+|RenderPerson((person) => |
+Generated Location: (849:24,6 [25] )
+|RenderPerson((person) => |
+
+Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|person.Name|
+Generated Location: (995:27,34 [11] )
+|person.Name|
+
+Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|)|
+Generated Location: (1062:33,0 [1] )
+|)|
+
+Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+Generated Location: (1247:42,12 [138] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
new file mode 100644
index 0000000000..87c5192c29
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -0,0 +1,62 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment template = 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                             ; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                      template
+
+#line default
+#line hidden
+#nullable disable
+            ;
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
new file mode 100644
index 0000000000..d062ce15dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment template = 
+                Template - (30:0,30 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (30:0,30 [15] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Joey
+                CSharpCode - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (50:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - Person - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (71:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
+                HtmlContent - (83:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (83:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
new file mode 100644
index 0000000000..94a572fa6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment template = |
+Generated Location: (845:24,2 [27] )
+| RenderFragment template = |
+
+Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1083:33,45 [2] )
+|; |
+
+Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|template|
+Generated Location: (1249:41,22 [8] )
+|template|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..8006e845bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = RenderPerson((builder2) => {
+}
+);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    object RenderPerson(RenderFragment p) => null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..2a7303aa83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson(
+                    Template - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                        MarkupElement - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            HtmlContent - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - HI
+                    IntermediateToken - (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    object RenderPerson(RenderFragment p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..19dac0282c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+|RenderPerson(|
+Generated Location: (849:24,6 [13] )
+|RenderPerson(|
+
+Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|)|
+Generated Location: (882:26,0 [1] )
+|)|
+
+Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    object RenderPerson(RenderFragment p) => null;
+|
+Generated Location: (1067:35,12 [54] )
+|
+    object RenderPerson(RenderFragment p) => null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
new file mode 100644
index 0000000000..eca30bb15e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 y
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Counter);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string y = null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
new file mode 100644
index 0000000000..a4af660422
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
+                HtmlContent - (22:0,22 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (22:0,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (61:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (61:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0e0aa6fc54
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|y|
+Generated Location: (933:25,17 [1] )
+|y|
+
+Source Location: (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string y = null;
+|
+Generated Location: (1548:46,12 [24] )
+|
+    string y = null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6096e875d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  UserName
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                            UserIsActive
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(User);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
new file mode 100644
index 0000000000..b266af66ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -0,0 +1,39 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User
+                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName)
+                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
+                HtmlContent - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
new file mode 100644
index 0000000000..abc41bbb0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -0,0 +1,21 @@
+Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|UserName|
+Generated Location: (934:25,18 [8] )
+|UserName|
+
+Source Location: (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|UserIsActive|
+Generated Location: (1331:35,44 [12] )
+|UserIsActive|
+
+Source Location: (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+|
+Generated Location: (1976:56,12 [88] )
+|
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b0d6ccba88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -0,0 +1,49 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(SurveyPrompt);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..591ca7f75d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\TestComponent.cshtml(7,2): Error RZ1035: Missing close angle for tag helper 'SurveyPrompt'.
+x:\dir\subdir\Test\TestComponent.cshtml(7,2): Error RZ1034: Found a malformed 'SurveyPrompt' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
new file mode 100644
index 0000000000..622a2a9eb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (13:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (17:2,4 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (17:2,4 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello, world!
+                HtmlContent - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\nWelcome to your new app.\n\n
+                Component - (67:6,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
+                    ComponentAttribute - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                        HtmlContent - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
new file mode 100644
index 0000000000..50ca507c80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/"|
+Generated Location: (631:18,37 [3] )
+|"/"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b0d6ccba88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -0,0 +1,49 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(SurveyPrompt);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
new file mode 100644
index 0000000000..458f772f25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (13:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (17:2,4 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (17:2,4 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello, world!
+                HtmlContent - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\nWelcome to your new app.\n\n
+                Component - (67:6,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
+                    ComponentAttribute - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                        HtmlContent - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <div>Test!</div>
+                HtmlContent - (108:6,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (108:6,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
new file mode 100644
index 0000000000..50ca507c80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/"|
+Generated Location: (631:18,37 [3] )
+|"/"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0a0d9c71c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnComponentHover);
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                 __o = ParentBgColor;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentBgColor { get; set; } = "#FFFFFF";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
new file mode 100644
index 0000000000..71b27fe456
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -0,0 +1,35 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute -  - style=" - "
+                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (220:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (220:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6573f9eaef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -0,0 +1,27 @@
+Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnComponentHover|
+Generated Location: (908:22,135 [16] )
+|OnComponentHover|
+
+Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentBgColor|
+Generated Location: (1053:25,55 [13] )
+|ParentBgColor|
+
+Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentBgColor { get; set; } = "#FFFFFF";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+|
+Generated Location: (1250:34,12 [132] )
+|
+    public string ParentBgColor { get; set; } = "#FFFFFF";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
new file mode 100644
index 0000000000..bfc819e290
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    MarkupElement - (11:1,4 [125] x:\dir\subdir\Test\TestComponent.cshtml) - script
+                        HtmlAttribute - (18:1,11 [18] x:\dir\subdir\Test\TestComponent.cshtml) -  src=' - '
+                            HtmlAttributeValue - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - some/url.js
+                        HtmlAttribute - (36:1,29 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  anotherattribute - 
+                        HtmlContent - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        some text\n        some more text\n    
+                    HtmlContent - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (144:5,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (144:5,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7eb9586b8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = "My value";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..35e3f7c321
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                HtmlContent - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                CSharpExpression - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value"
+                HtmlContent - (31:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (31:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..cd5ffda867
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|"My value"|
+Generated Location: (849:24,6 [10] )
+|"My value"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..55f75cc3ba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(SomeOtherComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..35cade949f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                HtmlContent - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                Component - (18:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
+                HtmlContent - (40:2,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:2,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bbef863d74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = "/my/url";
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..5f10fd43f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /my/url
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/my/url"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                HtmlContent - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (35:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..33faf34d87
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|"/my/url"|
+Generated Location: (637:18,37 [9] )
+|"/my/url"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
new file mode 100644
index 0000000000..341855a002
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (4:0,4 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  class=" - "
+                        HtmlAttributeValue - (12:0,12 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (12:0,12 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - first
+                        HtmlAttributeValue - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (18:0,18 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - second
+                    HtmlContent - (26:0,26 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (26:0,26 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f93e9a9e3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+      __o = Foo;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                
+        int Foo = 18;
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
new file mode 100644
index 0000000000..d199959b48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [18] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
+                        CSharpExpressionAttributeValue - (11:0,11 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                HtmlContent - (18:0,18 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (18:0,18 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                HtmlContent - (66:3,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (66:3,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c225072901
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|Foo|
+Generated Location: (855:24,12 [3] )
+|Foo|
+
+Source Location: (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        int Foo = 18;
+    |
+Generated Location: (1046:33,16 [29] )
+|
+        int Foo = 18;
+    |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
new file mode 100644
index 0000000000..cdfa2835eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+    using System.Threading.Tasks;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async (e) => await Task.Delay(10)));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
new file mode 100644
index 0000000000..fe060aa5ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..65918a8a61
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+    using System.Threading.Tasks;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..399c79fbf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8e36d86b9e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (895:22,12 [91] )
+|
+    Task OnClick(UIMouseEventArgs e) 
+    {
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e4707b23ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+    using System.Threading.Tasks;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async () => await Task.Delay(10)));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
new file mode 100644
index 0000000000..759e56dd28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (31:1,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c5e24a07a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.AspNetCore.Components;
+    using System.Threading.Tasks;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..e045df0b85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b85409bbfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (895:22,12 [73] )
+|
+    Task OnClick() 
+    {
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3a7a1dcc46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..2f933eccb9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                Component - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                    ComponentAttribute - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+            CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6df7a025d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_Delegate_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1261:24,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ec5a91ec7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
+            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..cad7ef3a56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d530d2b830
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1493:24,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..64155cc718
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue), 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)), 3, () => ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
new file mode 100644
index 0000000000..156beba869
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9b00126408
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+Generated Location: (1010:20,12 [65] )
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..10a948569c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..fa4b70a5a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..4486aeba5f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1296:23,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..eec0221547
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "42";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..53a27b541a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..17de59870f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "42";
+|
+Generated Location: (1296:23,12 [55] )
+|
+    public string ParentValue { get; set; } = "42";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a820035440
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..5ec1bb5cc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5b2390551e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1036:23,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2844fb39e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..9907d63a95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..12de9c4634
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1018:23,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..827b96df66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..52809e93c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b5fc63edaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1236:24,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4e6890f2cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue), 2, __value => ParentValue = __value, 3, () => ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
new file mode 100644
index 0000000000..c483685014
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => ParentValue
+            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9c4e3a4f09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+Generated Location: (853:20,12 [65] )
+|
+    public DateTime ParentValue { get; set; } = DateTime.Now;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..71d845a01d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..9dce118599
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..558e90898f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1039:23,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f61f65bd02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..a52c98c5ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c7e08118d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1021:23,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
new file mode 100644
index 0000000000..cd28df9276
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "42";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
new file mode 100644
index 0000000000..2f934f1bd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => ParentValue = __value
+            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
new file mode 100644
index 0000000000..47e83f2182
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "42";
+|
+Generated Location: (1039:23,12 [55] )
+|
+    public string ParentValue { get; set; } = "42";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
new file mode 100644
index 0000000000..15180e9008
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.InputText>(0);
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(person.Name)));
+            builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+ 
+    Person person = new Person();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
new file mode 100644
index 0000000000..06d9f9ff8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
+                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => person.Name = __value
+            CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
new file mode 100644
index 0000000000..37f685723b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    Person person = new Person();
+|
+Generated Location: (1028:23,1 [37] )
+|
+    Person person = new Person();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5779d8737d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..d350e3759b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+            CSharpCode - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..57a535549c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1076:24,12 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ec3af93de9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..9787ee9f83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..140678b60e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1058:24,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bd2c1e4f05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..ab63bfb395
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d57ca41968
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1003:23,12 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bd2c1e4f05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..1e836cf823
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..df3f32e8c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1003:23,12 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bd2c1e4f05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..ca94912623
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b60220be5c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1003:23,12 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..62d7d45fd4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<string> header = (context) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "div");
+                builder2.AddContent(1, context.ToLowerInvariant());
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                       ; 
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenComponent<Test.MyComponent>(2);
+            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(header));
+            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddMarkupContent(5, "\r\n    Some Content\r\n");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..5cdabfec09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
+                Template - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
+                CSharpCode - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (92:1,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some Content\n
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c9a06bc9bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<string> header = (context) => |
+Generated Location: (577:17,2 [46] )
+| RenderFragment<string> header = (context) => |
+
+Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1036:29,87 [2] )
+|; |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c4c8bf5d84
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<string> header = (context) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "div");
+                builder2.AddContent(1, context.ToLowerInvariant());
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                       ; 
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenComponent<Test.MyComponent>(2);
+            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(header));
+            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(5, "Some Content");
+            }
+            ));
+            builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(7, "Bye!");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..f9e237eb0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
+                Template - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (49:0,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
+                CSharpCode - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (92:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (124:2,2 [41] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        HtmlContent - (138:2,16 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (138:2,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some Content
+                    ComponentChildContent - (169:3,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        HtmlContent - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye!
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c9a06bc9bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<string> header = (context) => |
+Generated Location: (577:17,2 [46] )
+| RenderFragment<string> header = (context) => |
+
+Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1036:29,87 [2] )
+|; |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..533a031330
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "checkbox");
+            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public bool Enabled { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..3f6abcec30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
+                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
+            CSharpCode - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..919ca5048a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public bool Enabled { get; set; }
+|
+Generated Location: (1052:24,12 [41] )
+|
+    public bool Enabled { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d0560634aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = "MM/dd/yyyy";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..535185bf7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken - (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
+            CSharpCode - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..68e5240938
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,13 @@
+Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = "MM/dd/yyyy";
+|
+Generated Location: (1074:24,12 [135] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+    public string Format { get; set; } = "MM/dd/yyyy";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..737e68cadc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..b861279676
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+            CSharpCode - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e7ea4dbde3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1086:24,12 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ec3af93de9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..e8460e0172
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..121fca4326
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1058:24,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d59a828068
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..635ae3b52f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..487c48a9a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1004:23,12 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2a5613c733
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<string>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
new file mode 100644
index 0000000000..98b5c39ad0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6a5f0f788a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<string>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(Value)));
+            builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
new file mode 100644
index 0000000000..507cb3b6ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => Value = __value
+            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
new file mode 100644
index 0000000000..12fda5c105
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (1021:23,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f75f4a9925
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<string>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(Value));
+            builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
new file mode 100644
index 0000000000..49df14ba29
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c7cc52a9c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (1009:23,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2bb60a9fd0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 18, 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 3, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Value", __arg0);
+        builder.AddAttribute(__seq1, "Item", __arg1);
+        builder.AddAttribute(__seq2, "ItemChanged", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..062a02d6b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+            CSharpCode - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c09eb8ea9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (907:20,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c51d4cea69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 2, __value => Value = __value);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string Value;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..4224105200
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => Value = __value
+            CSharpCode - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9e3a748128
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string Value;
+|
+Generated Location: (819:20,12 [21] )
+|
+    string Value;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..11ecfd2baf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -0,0 +1,31 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<string>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+                builder2.AddMarkupContent(3, "\r\n  ");
+                builder2.OpenElement(4, "div");
+                builder2.AddContent(5, context.ToLower());
+                builder2.CloseElement();
+                builder2.AddMarkupContent(6, "\r\n");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..fab3ec66bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (41:0,41 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (41:0,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        MarkupElement - (45:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                        HtmlContent - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..55bd6f6acc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, (context) => (builder2) => {
+                builder2.AddMarkupContent(3, "\r\n  ");
+                builder2.OpenElement(4, "div");
+                builder2.AddContent(5, context.ToLower());
+                builder2.CloseElement();
+                builder2.AddMarkupContent(6, "\r\n");
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..72e2c2439d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        MarkupElement - (32:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                        HtmlContent - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9063b5b71a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<string>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.AddAttribute(2, "Other", 17);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
new file mode 100644
index 0000000000..144a66535a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (48:0,48 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d6a4fa722c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, 17);
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "Other", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..5197da2fe7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..703bb94f87
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi");
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..da9aeec8fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
new file mode 100644
index 0000000000..36020c2fd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi");
+            builder.AddMarkupContent(2, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 3, 4, "how are you?");
+            builder.AddMarkupContent(5, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, 6, 7, "bye!");
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
new file mode 100644
index 0000000000..e249ff3423
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (31:1,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (50:1,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (51:1,20 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "how are you?"
+                HtmlContent - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (72:2,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (91:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (92:2,20 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_1
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..99eaf5cdbd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using Microsoft.AspNetCore.Components.RenderTree;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderChildComponent(builder); 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+
+#line default
+#line hidden
+#nullable disable
+        builder.AddContent(0, "        ");
+        builder.OpenComponent<Test.MyComponent>(1);
+        builder.CloseComponent();
+        builder.AddMarkupContent(2, "\r\n");
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..db47792966
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
+            CSharpCode - (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
+            HtmlContent - (172:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (172:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            Component - (180:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            HtmlContent - (195:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (195:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..69d3cf2e78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -0,0 +1,23 @@
+Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(builder); |
+Generated Location: (632:18,2 [32] )
+| RenderChildComponent(builder); |
+
+Source Location: (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+|
+Generated Location: (847:27,12 [67] )
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+|
+
+Source Location: (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|    }
+|
+Generated Location: (1212:40,0 [7] )
+|    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4ac820d585
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -0,0 +1,49 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using Microsoft.AspNetCore.Components.RenderTree;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    void RenderChildComponent()
+    {
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddContent(0, "        ");
+            builder.OpenComponent<Test.MyComponent>(1);
+            builder.CloseComponent();
+            builder.AddMarkupContent(2, "\r\n");
+#nullable restore
+#line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddMarkupContent(3, "\r\n");
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderChildComponent(); 
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
new file mode 100644
index 0000000000..245d496a55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent()\n    {\n
+                HtmlContent - (96:4,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (96:4,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+                Component - (104:4,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (119:4,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (119:4,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+                HtmlContent - (131:7,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (131:7,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8cf6567fd3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -0,0 +1,23 @@
+Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void RenderChildComponent()
+    {
+|
+Generated Location: (632:18,2 [42] )
+|
+    void RenderChildComponent()
+    {
+|
+
+Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|    }
+|
+Generated Location: (988:31,0 [7] )
+|    }
+|
+
+Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(); |
+Generated Location: (1167:39,2 [25] )
+| RenderChildComponent(); |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f6334ff26c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<string, int>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+                builder2.OpenElement(3, "div");
+                builder2.AddContent(4, context.ToLower());
+                builder2.CloseElement();
+            }
+            ));
+            builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
+                builder2.AddMarkupContent(6, "\r\n  ");
+                builder2.AddContent(7, System.Math.Max(0, item.Item));
+                builder2.AddMarkupContent(8, ";\r\n");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
new file mode 100644
index 0000000000..86933a0298
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [228] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (57:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        MarkupElement - (71:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (117:2,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - item
+                        HtmlContent - (153:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (153:2,36 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                            IntermediateToken - (155:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html -   
+                        CSharpExpression - (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
+                        HtmlContent - (187:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (187:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n
+                    ComponentTypeArgument - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1
+                        IntermediateToken - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
+                    ComponentTypeArgument - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
+                        IntermediateToken - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (44:0,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (45:0,45 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6821a2b54d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, new List<long>(), 3, (context) => (builder2) => {
+                builder2.OpenElement(4, "div");
+                builder2.AddContent(5, context.ToLower());
+                builder2.CloseElement();
+            }
+            , 6, (item) => (builder2) => {
+                builder2.AddMarkupContent(7, "\r\n  ");
+                builder2.AddContent(8, System.Math.Max(0, item.Item));
+                builder2.AddMarkupContent(9, ";\r\n");
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "Items", __arg1);
+        builder.AddAttribute(__seq2, "ChildContent", __arg2);
+        builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..a3b338c0a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [229] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (58:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        MarkupElement - (72:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (118:2,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - item
+                        HtmlContent - (154:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (154:2,36 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                            IntermediateToken - (156:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html -   
+                        CSharpExpression - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
+                        HtmlContent - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+                    ComponentAttribute - (34:0,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (35:0,35 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new List<long>()
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
new file mode 100644
index 0000000000..986515ef4b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
new file mode 100644
index 0000000000..66f6f1ad64
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c93023dfb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "MyAttr", "abc");
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(3, "Some text");
+                builder2.AddMarkupContent(4, "<some-child a=\"1\">Nested text</some-child>");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..c83ccedc4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text
+                        MarkupBlock -  - <some-child a="1">Nested text</some-child>
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9a273139bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -0,0 +1,26 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddMarkupContent(2, "<child>hello</child>");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..df9a630b1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [47] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        MarkupBlock -  - <child>hello</child>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6ab934793c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -0,0 +1,26 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(2, "hello");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..c2753690f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (13:0,13 [34] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        HtmlContent - (27:0,27 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (27:0,27 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..74c07bc17b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(Increment));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..85f6936f79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..336bb2058e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (856:22,12 [100] )
+|
+    private int counter;
+    private void Increment(UIEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..fcc784f5e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -0,0 +1,26 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+                builder2.AddContent(2, context);
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..d39fff22ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (13:0,13 [37] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
+                        CSharpExpression - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
new file mode 100644
index 0000000000..179d5fa6ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(42.ToString()));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
new file mode 100644
index 0000000000..5a9a8969bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 42.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1ddbf5a7dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -0,0 +1,31 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "MyAttr", "abc");
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+                builder2.AddContent(3, "Some text");
+                builder2.OpenElement(4, "some-child");
+                builder2.AddAttribute(5, "a", "1");
+                builder2.AddContent(6, context.ToLowerInvariant());
+                builder2.CloseElement();
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..b862d55beb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [107] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text
+                        MarkupElement - (35:0,35 [58] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (46:0,46 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            CSharpExpression - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c014ec7563
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "MyAttr", "abc");
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+                builder2.AddMarkupContent(3, "\r\n    Some text");
+                builder2.OpenElement(4, "some-child");
+                builder2.AddAttribute(5, "a", "1");
+                builder2.AddContent(6, item.ToLowerInvariant());
+                builder2.CloseElement();
+                builder2.AddMarkupContent(7, "\r\n  ");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
new file mode 100644
index 0000000000..b9754436cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (30:1,2 [118] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
+                        HtmlContent - (59:1,31 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (59:1,31 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some text
+                        MarkupElement - (74:2,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (85:2,24 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            CSharpExpression - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
+                        HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c014ec7563
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "MyAttr", "abc");
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+                builder2.AddMarkupContent(3, "\r\n    Some text");
+                builder2.OpenElement(4, "some-child");
+                builder2.AddAttribute(5, "a", "1");
+                builder2.AddContent(6, item.ToLowerInvariant());
+                builder2.CloseElement();
+                builder2.AddMarkupContent(7, "\r\n  ");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..a889a9e5e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (45:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
+                        HtmlContent - (59:1,16 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (59:1,16 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some text
+                        MarkupElement - (74:2,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child
+                            HtmlAttribute - (85:2,24 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  a=' - '
+                                HtmlAttributeValue - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                    IntermediateToken - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                            CSharpExpression - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
+                        HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                        HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bc2495b169
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(e => { Increment(); }));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..d4e32be0ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); }
+            CSharpCode - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..97bbec1141
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (868:22,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f603d7e0ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "some-attribute", "foo");
+            builder.AddAttribute(2, "another-attribute", 43.ToString());
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..81d9728d7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - some-attribute - AttributeStructure.DoubleQuotes
+                        HtmlContent - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
+                    ComponentAttribute -  - another-attribute - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (53:0,53 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 43.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d6275c0de8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
+    [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..2eb66a0f0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /MyPage
+        RouteAttributeExtensionNode -  - /AnotherRoute/{id}
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (45:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0f959164da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -0,0 +1,26 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(123));
+            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(true));
+            builder.AddAttribute(3, "StringProperty", "My string");
+            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Test.SomeType>(new SomeType()));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
new file mode 100644
index 0000000000..40d6b5e3c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
+                    ComponentAttribute - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                        HtmlContent - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
+                    ComponentAttribute - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9af381f80e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,31 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.DynamicElement>(0);
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..dbd03cb47b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (25:0,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5b31bc0d66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+|
+Generated Location: (911:22,12 [62] )
+|
+    private Action<UIMouseEventArgs> OnClick { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f31bf74ba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using AnotherTest;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.HeaderComponent>(0);
+            builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(2, "Hi!");
+            }
+            ));
+            builder.CloseComponent();
+            builder.AddMarkupContent(3, "\r\n");
+            builder.OpenComponent<AnotherTest.FooterComponent>(4);
+            builder.AddAttribute(5, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+                builder2.AddContent(6, context);
+            }
+            ));
+            builder.CloseComponent();
+            builder.AddMarkupContent(7, "\r\n");
+            builder.OpenComponent<Test.HeaderComponent>(8);
+            builder.AddAttribute(9, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(10, "Hi!");
+            }
+            ));
+            builder.CloseComponent();
+            builder.AddMarkupContent(11, "\r\n");
+            builder.OpenComponent<AnotherTest.FooterComponent>(12);
+            builder.AddAttribute(13, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+                builder2.AddContent(14, context);
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
new file mode 100644
index 0000000000..16d079b116
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (22:2,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
+                    ComponentChildContent - (45:3,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (53:3,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (53:3,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                HtmlContent - (85:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (85:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (87:5,0 [68] x:\dir\subdir\Test\TestComponent.cshtml) - FooterComponent
+                    ComponentChildContent - (110:6,4 [25] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        CSharpExpression - (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                HtmlContent - (155:7,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (155:7,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (157:8,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - Test.HeaderComponent
+                    ComponentChildContent - (185:9,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (193:9,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (193:9,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                HtmlContent - (230:10,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (230:10,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (232:11,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest.FooterComponent
+                    ComponentChildContent - (267:12,4 [25] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        CSharpExpression - (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
new file mode 100644
index 0000000000..16dfbdf5f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using System.Text;
+    using System.Reflection;
+    [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+    public class _Imports : System.Object
+    {
+        #pragma warning disable 1998
+        protected void Execute()
+        {
+            builder.AddContent(0, Foo);
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt
new file mode 100644
index 0000000000..b91b579573
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\_Imports.razor(5,2): Error RZ10003: Markup, code and block directives are not valid in component imports.
+x:\dir\subdir\Test\_Imports.razor(6,1): Error RZ10003: Markup, code and block directives are not valid in component imports.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
new file mode 100644
index 0000000000..d3b142e0c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        CSharpCode - 
+            IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+        ClassDeclaration -  - public - _Imports - System.Object - 
+            MethodDeclaration -  - protected - void - Execute
+                CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
+                    IntermediateToken - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) - CSharp - Foo
+                IntermediateToken - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) - CSharp - Foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..92ba24b62e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.CoolnessMeter>(0);
+            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>("very-cool"));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
new file mode 100644
index 0000000000..a740d77bf1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter
+                    ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (26:0,26 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "very-cool"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e6a9c70265
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
+#nullable restore
+#line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
+ foreach (var item2 in Items2)
+{
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddContent(1, "    ");
+            builder.OpenElement(2, "p");
+            builder.AddMarkupContent(3, "\r\n    ");
+            builder.AddContent(4, ChildContent(item2));
+            builder.AddMarkupContent(5, ";\r\n    ");
+            builder.CloseElement();
+            builder.AddMarkupContent(6, "\r\n");
+#nullable restore
+#line 11 "x:\dir\subdir\Test\TestComponent.cshtml"
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
new file mode 100644
index 0000000000..c9e8d088b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (1:0,1 [40] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Item1</h1>\n
+                CSharpCode - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n
+                HtmlContent - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
+                MarkupElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (139:7,7 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                        IntermediateToken - (141:8,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
+                    CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2)
+                    HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n    
+                HtmlContent - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n
+            CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f0bdf46f77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+|foreach (var item2 in Items2)
+{
+|
+Generated Location: (656:20,1 [34] )
+|foreach (var item2 in Items2)
+{
+|
+
+Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|}
+|
+Generated Location: (1150:37,0 [3] )
+|}
+|
+
+Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+|
+Generated Location: (1335:46,12 [164] )
+|
+    [Parameter] TItem1 Item1 { get; set; }
+    [Parameter] List<TItem2> Items2 { get; set; }
+    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
new file mode 100644
index 0000000000..61d23eb858
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -0,0 +1,25 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using static Test2.SomeComponent;
+    using Foo = Test3;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n<SomeComponent></SomeComponent>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
new file mode 100644
index 0000000000..5e6295960a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - static Test2.SomeComponent
+        UsingDirective - (36:1,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Foo = Test3
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (55:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                MarkupBlock -  - \n<SomeComponent></SomeComponent>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0d154170b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.Counter>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n");
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+ if (true)
+{
+    
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddContent(2, "This text is rendered");
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                      
+}
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
new file mode 100644
index 0000000000..580d2962cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - if (true)\n{\n    
+                HtmlContent - (38:3,10 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (38:3,10 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Html - This text is rendered
+                CSharpCode - (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n}\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d3bbf78993
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -0,0 +1,18 @@
+Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+|if (true)
+{
+    |
+Generated Location: (718:20,1 [18] )
+|if (true)
+{
+    |
+
+Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+}
+|
+Generated Location: (957:30,38 [5] )
+|
+}
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
new file mode 100644
index 0000000000..de7f0a9242
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
+            builder.AddMarkupContent(1, "<div>\r\n</div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
new file mode 100644
index 0000000000..41daeb1b8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <!DOCTYPE html>\n
+                MarkupBlock -  - <div>\n</div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a8cf1dd393
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n");
+            builder.OpenComponent<Test.MyComponent>(2);
+            builder.CloseComponent();
+            builder.AddMarkupContent(3, "\r\n");
+            builder.OpenComponent<Test2.MyComponent2>(4);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
new file mode 100644
index 0000000000..5f6457ac2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (17:1,0 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
+                HtmlContent - (37:1,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (37:1,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (39:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Test2.MyComponent2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9d57530eb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using System.Text;
+    using System.Reflection;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.Counter>(0);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
new file mode 100644
index 0000000000..53e69d3262
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c69c27e91a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "ParamBefore", "before");
+            builder.AddAttribute(2, "ParamAfter", "after");
+            builder.AddComponentReferenceCapture(3, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       myInstance = (Test.MyComponent)__value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
new file mode 100644
index 0000000000..6f5c6fd73b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    ReferenceCapture - (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
new file mode 100644
index 0000000000..78905c9189
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|myInstance|
+Generated Location: (863:21,39 [10] )
+|myInstance|
+
+Source Location: (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1155:33,12 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..140ec73509
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "SomeProp", "val");
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddMarkupContent(3, "\r\n    Some ");
+                builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
+            }
+            ));
+            builder.AddComponentReferenceCapture(5, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  myInstance = (Test.MyComponent)__value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..8429d43125
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        MarkupBlock -  - <el>further</el> content\n
+                    ReferenceCapture - (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                        HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+            CSharpCode - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c81995fb79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|myInstance|
+Generated Location: (1068:27,18 [10] )
+|myInstance|
+
+Source Location: (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1360:39,12 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
new file mode 100644
index 0000000000..78d921a7dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using Test2;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
+    [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n");
+            builder.OpenComponent<Test2.MyComponent2>(2);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
new file mode 100644
index 0000000000..8a1b089bae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (46:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
+        RouteAttributeExtensionNode -  - /MyPage
+        RouteAttributeExtensionNode -  - /AnotherRoute/{id}
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (59:3,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (74:3,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (74:3,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (76:4,0 [16] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4d70f17e7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using Test2;
+    using Test3;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n");
+            builder.OpenComponent<Test2.SomeComponent>(2);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
new file mode 100644
index 0000000000..b802e539fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
+        UsingDirective - (15:1,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test3
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (28:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (43:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (45:3,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - SomeComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6ff65a1fd4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   
+  var myValue = "Expression value";
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "data-abc", "Literal value");
+            builder.AddAttribute(2, "data-def", myValue);
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..14ed266826
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
+                MarkupElement - (45:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                    HtmlAttribute - (75:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (86:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ddace9325b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+| 
+  var myValue = "Expression value";
+|
+Generated Location: (577:17,2 [40] )
+| 
+  var myValue = "Expression value";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6ff65a1fd4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   
+  var myValue = "Expression value";
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "data-abc", "Literal value");
+            builder.AddAttribute(2, "data-def", myValue);
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..9e4677a6ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
+                MarkupElement - (45:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                    HtmlAttribute - (75:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (86:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ddace9325b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+| 
+  var myValue = "Expression value";
+|
+Generated Location: (577:17,2 [40] )
+| 
+  var myValue = "Expression value";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3742f4769a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddAttribute(2, "attributeafter", "after");
+            builder.AddElementReferenceCapture(3, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    myElem = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.AddContent(4, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
new file mode 100644
index 0000000000..980ea314bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [79] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    ReferenceCapture - (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f7fa9bfb00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|myElem|
+Generated Location: (854:21,36 [6] )
+|myElem|
+
+Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+Generated Location: (1167:34,12 [122] )
+|
+    private Microsoft.AspNetCore.Components.ElementRef myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0f724347c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment))));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
new file mode 100644
index 0000000000..a1bf9f052e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [66] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
+            CSharpCode - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b9cca84192
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1119:22,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f5beefea6c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
new file mode 100644
index 0000000000..d078e9f838
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2813586105
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1065:22,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
new file mode 100644
index 0000000000..28427a3b91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
new file mode 100644
index 0000000000..8ffcf0f2f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
new file mode 100644
index 0000000000..1efa219064
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (1065:22,12 [105] )
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ba66745821
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..971b1c50fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ce649e73e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -0,0 +1,17 @@
+Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1065:22,12 [141] )
+|
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c47ac91cf3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..7afae278f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f4b0eeaa6e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -0,0 +1,17 @@
+Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (1065:22,12 [123] )
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2448a55110
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
new file mode 100644
index 0000000000..61663d52a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2cadf32ae9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (1065:22,12 [106] )
+|
+    private int counter;
+    private void Increment(UIChangeEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b2759731b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, EventCallback.Factory.Create(this, Increment))));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
new file mode 100644
index 0000000000..671e0eaa78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create(this, Increment)
+            CSharpCode - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7f5adef081
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1001:22,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d1572e7e20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
new file mode 100644
index 0000000000..d078e9f838
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
new file mode 100644
index 0000000000..899faf534b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (965:22,12 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5ccbac8604
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
new file mode 100644
index 0000000000..9f309dd9c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(object e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
new file mode 100644
index 0000000000..fc78796673
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+|
+Generated Location: (965:22,12 [95] )
+|
+    private int counter;
+    private void Increment(object e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7f7e160b72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt
new file mode 100644
index 0000000000..0e8048aa91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                Component - (31:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (53:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (82:3,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:3,12 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a1dcbe2e97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (82:3,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+Generated Location: (990:22,12 [105] )
+|
+    private int counter;
+    private void Increment(UIMouseEventArgs e) {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1accdeeee3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..6913560e63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                Component - (31:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (53:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (82:3,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:3,12 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7f07b885f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -0,0 +1,17 @@
+Source Location: (82:3,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (990:22,12 [141] )
+|
+    private int counter;
+    private Task Increment(UIMouseEventArgs e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d9f310743d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..7afae278f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c518cab355
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -0,0 +1,17 @@
+Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (965:22,12 [123] )
+|
+    private int counter;
+    private Task Increment() {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1130e16ba4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
new file mode 100644
index 0000000000..e279fbd20c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(object e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
new file mode 100644
index 0000000000..23399a2c4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -0,0 +1,17 @@
+Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+Generated Location: (965:22,12 [131] )
+|
+    private int counter;
+    private Task Increment(object e) {
+        counter++;
+        return Task.CompletedTask;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5d0ad5ee6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onfocus", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, "alert(\"Test\");"));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
new file mode 100644
index 0000000000..604944635e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, 
+                            IntermediateToken -  - CSharp - "alert(\"Test\");"
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ebefe524b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick(UIEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..1df9aeb647
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7ff716c3ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIEventArgs e) {
+    }
+|
+Generated Location: (895:22,12 [44] )
+|
+    void OnClick(UIEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..837cf43b0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick(UIMouseEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..6beded8a09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0978efd52f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+Generated Location: (895:22,12 [49] )
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..232364506d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { }));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..b76287931a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..837cf43b0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick(UIMouseEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..6beded8a09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0978efd52f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+Generated Location: (895:22,12 [49] )
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..232364506d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { }));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..b76287931a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7efe6db82a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    void OnClick() {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
new file mode 100644
index 0000000000..7274a3cb7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7454b955cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick() {
+    }
+|
+Generated Location: (895:22,12 [31] )
+|
+    void OnClick() {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a5b091845e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, () => { }));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
new file mode 100644
index 0000000000..17894bbeab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a75cbd6deb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "foo"));
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
new file mode 100644
index 0000000000..550c6d6003
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken -  - CSharp - "foo"
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
new file mode 100644
index 0000000000..dbb8b9f1ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<int>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(3));
+            builder.AddComponentReferenceCapture(2, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     _my = (Test.MyComponent<int>)__value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
new file mode 100644
index 0000000000..d801ccd4a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ReferenceCapture - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f2c2d0b55b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (854:20,37 [3] )
+|_my|
+
+Source Location: (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (1144:32,12 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..aef3b40743
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 3, 2, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           _my = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..13f70a34b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ReferenceCapture - (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..02cbbdf0b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (713:18,27 [3] )
+|_my|
+
+Source Location: (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (941:29,12 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
new file mode 100644
index 0000000000..22ee654d48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, 0, 1, "hi", 2, (context) => (builder2) => {
+                builder2.AddMarkupContent(3, "\r\n  ");
+                builder2.OpenElement(4, "div");
+                builder2.AddContent(5, context.ToLower());
+                builder2.CloseElement();
+                builder2.AddMarkupContent(6, "\r\n");
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
new file mode 100644
index 0000000000..0b361fd41c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (33:0,33 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (33:0,33 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                        MarkupElement - (37:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                        HtmlContent - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (25:0,25 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateTest_MyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4f383fba8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, "My value");
+            builder.AddMarkupContent(1, "\r\n\r\n");
+            builder.AddMarkupContent(2, "<h1>Hello</h1>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..0b3d0fe26d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -0,0 +1,14 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value"
+                HtmlContent - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0c11733b20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.SomeOtherComponent>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n\r\n");
+            builder.AddMarkupContent(2, "<h1>Hello</h1>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..bfd9d69a0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
+                HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6a835d858e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -0,0 +1,21 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using System;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Hello</h1>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..0319c00bbc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [14] x:\dir\subdir\Test\TestComponent.cshtml) - System
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6ff424d4ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   
+  var myValue = "Expression value";
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenElement(0, "div");
+            builder.AddContent(1, myValue);
+            builder.AddMarkupContent(2, "  ");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
new file mode 100644
index 0000000000..e80069bb13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
+                MarkupElement - (45:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    CSharpExpression - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                    MarkupBlock -  -   
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ddace9325b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
+| 
+  var myValue = "Expression value";
+|
+Generated Location: (577:17,2 [40] )
+| 
+  var myValue = "Expression value";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bc435c51df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -0,0 +1,30 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(2, "Hi!");
+            }
+            ));
+            builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddContent(4, "bye!");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..80f8dce702
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (19:1,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (27:1,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (27:1,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                    ComponentChildContent - (45:2,4 [26] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        CSharpExpression - (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4d9fbbc82e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<Test.Context> template = (context) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "li");
+                builder2.AddContent(1, "#");
+                builder2.AddContent(2, context.Index);
+                builder2.AddContent(3, " - ");
+                builder2.AddContent(4, context.Item.ToLower());
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                                           ; 
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenComponent<Test.MyComponent>(5);
+            builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(template));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..4b747bb9b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Test.Context> template = (context) => 
+                Template - (57:0,57 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (57:0,57 [50] x:\dir\subdir\Test\TestComponent.cshtml) - li
+                        HtmlContent - (61:0,61 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (61:0,61 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - #
+                        CSharpExpression - (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Index
+                        HtmlContent - (76:0,76 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (76:0,76 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \-
+                        CSharpExpression - (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Item.ToLower()
+                CSharpCode - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (112:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (135:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..af0f1f53fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<Test.Context> template = (context) => |
+Generated Location: (577:17,2 [54] )
+| RenderFragment<Test.Context> template = (context) => |
+
+Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1209:32,107 [2] )
+|; |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0f0b57a474
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    RenderFragment<Person> p = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "div");
+                builder2.OpenComponent<Test.MyComponent>(1);
+                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(person.Name));
+                builder2.CloseComponent();
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                         ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..6cccee9c35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
+                Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                                CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                    IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
+            CSharpCode - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6d5ac23a94
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    RenderFragment<Person> p = (person) => |
+Generated Location: (577:17,2 [45] )
+|
+    RenderFragment<Person> p = (person) => |
+
+Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|;
+|
+Generated Location: (1211:32,89 [3] )
+|;
+|
+
+Source Location: (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (1395:41,12 [76] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..fe8b9cb84c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    RenderFragment<Person> p = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "div");
+                builder2.OpenComponent<Test.MyComponent>(1);
+                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(person.Name));
+                builder2.CloseComponent();
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                         ;
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenComponent<Test.MyComponent>(3);
+            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddMarkupContent(5, "\r\n");
+                builder2.AddContent(6, "hello, world!");
+                builder2.AddMarkupContent(7, "\r\n");
+            }
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..d908c348a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
+                Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                                CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                    IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
+                Component - (99:3,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (112:3,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (112:3,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                        CSharpExpression - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hello, world!"
+                        HtmlContent - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..74b886d3df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    RenderFragment<Person> p = (person) => |
+Generated Location: (577:17,2 [45] )
+|
+    RenderFragment<Person> p = (person) => |
+
+Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|;
+|
+Generated Location: (1211:32,89 [3] )
+|;
+|
+
+Source Location: (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (1809:49,12 [76] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
new file mode 100644
index 0000000000..26d0ddc3d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment<Person> template = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "div");
+                builder2.AddContent(1, person.Name);
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                         ; 
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenComponent<Test.MyComponent>(2);
+            builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(template));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
new file mode 100644
index 0000000000..7e65894e97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Person> template = (person) => 
+                Template - (50:0,50 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (50:0,50 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (78:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (107:1,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e331fc92cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment<Person> template = (person) => |
+Generated Location: (577:17,2 [47] )
+| RenderFragment<Person> template = (person) => |
+
+Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (1008:29,73 [2] )
+|; |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..48b234049c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, RenderPerson((person) => (builder2) => {
+                builder2.OpenElement(1, "div");
+                builder2.AddContent(2, person.Name);
+                builder2.CloseElement();
+            }
+            ));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..20f39b5f86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
+                    Template - (27:0,27 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                        MarkupElement - (27:0,27 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                    IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
+            CSharpCode - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3e0f0c4065
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+Generated Location: (889:25,12 [138] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ae4fd87296
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    RenderFragment<Person> p = (person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.OpenElement(0, "div");
+                builder2.AddContent(1, person.Name);
+                builder2.CloseElement();
+            }
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                   ;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
new file mode 100644
index 0000000000..cc6163c72f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
+                Template - (48:1,44 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupElement - (48:1,44 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                        CSharpExpression - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                CSharpCode - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
+            CSharpCode - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
new file mode 100644
index 0000000000..293049aa96
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    RenderFragment<Person> p = (person) => |
+Generated Location: (577:17,2 [45] )
+|
+    RenderFragment<Person> p = (person) => |
+
+Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|;
+|
+Generated Location: (1000:30,67 [3] )
+|;
+|
+
+Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (1184:39,12 [76] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..48b234049c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, RenderPerson((person) => (builder2) => {
+                builder2.OpenElement(1, "div");
+                builder2.AddContent(2, person.Name);
+                builder2.CloseElement();
+            }
+            ));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..40e55ef5ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (2:0,2 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
+                    Template - (28:0,28 [23] x:\dir\subdir\Test\TestComponent.cshtml)
+                        MarkupElement - (28:0,28 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                            CSharpExpression - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                    IntermediateToken - (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
+            CSharpCode - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d5061b73ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+Generated Location: (889:25,12 [138] )
+|
+    class Person
+    {
+        public string Name { get; set; }
+    }
+
+    object RenderPerson(RenderFragment<Person> p) => null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b105a94a0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   RenderFragment template = 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
+                builder2.AddMarkupContent(0, "<div>Joey</div>");
+            }
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                             ; 
+
+#line default
+#line hidden
+#nullable disable
+            builder.OpenComponent<Test.MyComponent>(1);
+            builder.AddAttribute(2, "Person", template);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
new file mode 100644
index 0000000000..7457e4752d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment template = 
+                Template - (30:0,30 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                    MarkupBlock -  - <div>Joey</div>
+                CSharpCode - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
+                Component - (50:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - Person - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (71:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
new file mode 100644
index 0000000000..cfffaf6f9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderFragment template = |
+Generated Location: (577:17,2 [27] )
+| RenderFragment template = |
+
+Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|; |
+Generated Location: (881:27,45 [2] )
+|; |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6e6aa60e41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddContent(0, RenderPerson((builder2) => {
+                builder2.AddMarkupContent(1, "<div>HI</div>");
+            }
+            ));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    object RenderPerson(RenderFragment p) => null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..38597e26f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson(
+                    Template - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+                        MarkupBlock -  - <div>HI</div>
+                    IntermediateToken - (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
+            CSharpCode - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    object RenderPerson(RenderFragment p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7d5e690806
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    object RenderPerson(RenderFragment p) => null;
+|
+Generated Location: (796:23,12 [54] )
+|
+    object RenderPerson(RenderFragment p) => null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0226f5a2cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.Counter>(0);
+            builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(y));
+            builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string y = null;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
new file mode 100644
index 0000000000..f68f4fc79e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
+            CSharpCode - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b8f5b52dd8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string y = null;
+|
+Generated Location: (979:23,12 [24] )
+|
+    string y = null;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
new file mode 100644
index 0000000000..706ac66f7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.User>(0);
+            builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserName));
+            builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName));
+            builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserIsActive));
+            builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
new file mode 100644
index 0000000000..498a5afacb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User
+                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName)
+                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
+            CSharpCode - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
new file mode 100644
index 0000000000..46fabcb52b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+|
+Generated Location: (1301:25,12 [88] )
+|
+    public string UserName { get; set; }
+    public bool UserIsActive { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
new file mode 100644
index 0000000000..978c2884a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -0,0 +1,25 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
+            builder.OpenComponent<Test.SurveyPrompt>(1);
+            builder.AddAttribute(2, "Title", "\r\n");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..591ca7f75d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\TestComponent.cshtml(7,2): Error RZ1035: Missing close angle for tag helper 'SurveyPrompt'.
+x:\dir\subdir\Test\TestComponent.cshtml(7,2): Error RZ1034: Found a malformed 'SurveyPrompt' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
new file mode 100644
index 0000000000..84bd548664
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
+                Component - (67:6,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
+                    ComponentAttribute - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                        HtmlContent - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1eefc4b10a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -0,0 +1,25 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
+            builder.OpenComponent<Test.SurveyPrompt>(1);
+            builder.AddAttribute(2, "Title", "<div>Test!</div>");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
new file mode 100644
index 0000000000..2a2f7afa73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
+                Component - (67:6,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
+                    ComponentAttribute - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                        HtmlContent - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <div>Test!</div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2f6cc7ba0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "p");
+            builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnComponentHover));
+            builder.AddAttribute(2, "style", "background:" + " " + (ParentBgColor) + ";");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    public string ParentBgColor { get; set; } = "#FFFFFF";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
new file mode 100644
index 0000000000..7f4f274f2e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute -  - style=" - "
+                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+            CSharpCode - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5cf75e5e2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -0,0 +1,17 @@
+Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentBgColor { get; set; } = "#FFFFFF";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+|
+Generated Location: (996:23,12 [132] )
+|
+    public string ParentBgColor { get; set; } = "#FFFFFF";
+
+    public void OnComponentHover(UIMouseEventArgs e)
+    {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
new file mode 100644
index 0000000000..627bc27ecb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n    ");
+            builder.OpenElement(2, "script");
+            builder.AddAttribute(3, "src", "some/url.js");
+            builder.AddAttribute(4, "anotherattribute", true);
+            builder.AddMarkupContent(5, "\r\n        some text\r\n        some more text\r\n    ");
+            builder.CloseElement();
+            builder.AddMarkupContent(6, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
new file mode 100644
index 0000000000..6c57ae497f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    MarkupElement - (11:1,4 [125] x:\dir\subdir\Test\TestComponent.cshtml) - script
+                        HtmlAttribute - (18:1,11 [18] x:\dir\subdir\Test\TestComponent.cshtml) -  src=' - '
+                            HtmlAttributeValue - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - some/url.js
+                        HtmlAttribute - (36:1,29 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  anotherattribute - 
+                        HtmlContent - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        some text\n        some more text\n    
+                    HtmlContent - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c4e95fa8ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
+            builder.AddContent(1, "My value");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..319f07784d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Hello</h1>\n\n
+                CSharpExpression - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3e50a1fbe5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
+            builder.OpenComponent<Test.SomeOtherComponent>(1);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
new file mode 100644
index 0000000000..f7adbb2050
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -0,0 +1,11 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Hello</h1>\n\n
+                Component - (18:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7fb8c60526
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")]
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<h1>Hello</h1>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..aba3ac5260
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -0,0 +1,11 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        RouteAttributeExtensionNode -  - /my/url
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c37aa71ab4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -0,0 +1,21 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<div class=\"first second\">Hello</div>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
new file mode 100644
index 0000000000..f094db2671
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <div class="first second">Hello</div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1eed20445e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attr", Foo);
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                
+        int Foo = 18;
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
new file mode 100644
index 0000000000..033a9f6fab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [18] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
+                        CSharpExpressionAttributeValue - (11:0,11 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+            CSharpCode - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
new file mode 100644
index 0000000000..72caeebb19
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        int Foo = 18;
+    |
+Generated Location: (773:22,16 [29] )
+|
+        int Foo = 18;
+    |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs
new file mode 100644
index 0000000000..f9bb870266
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_ExtensibleDirectiveTest_NamespaceToken
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml"
+global::System.Object __typeHelper = nameof(System.Globalization);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml
new file mode 100644
index 0000000000..0a8f147643
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml
@@ -0,0 +1 @@
+@custom System.Globalization
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt
new file mode 100644
index 0000000000..ff111030c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_ExtensibleDirectiveTest_NamespaceToken -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (8:0,8 [20] NamespaceToken.cshtml) - System.Globalization
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt
new file mode 100644
index 0000000000..5c999b089e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (8:0,8 [20] TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml)
+|System.Globalization|
+Generated Location: (513:12,44 [20] )
+|System.Globalization|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml
new file mode 100644
index 0000000000..3a6c940b48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.cshtml
@@ -0,0 +1,5 @@
+<html>
+<body>
+    <span val="@Hello" />
+</body>
+</html>"
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
new file mode 100644
index 0000000000..454b63ce2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithConditionalAttribute.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [25] HtmlWithConditionalAttribute.cshtml)
+                    IntermediateToken - (0:0,0 [5] HtmlWithConditionalAttribute.cshtml) - Html - <html
+                    IntermediateToken - (5:0,5 [1] HtmlWithConditionalAttribute.cshtml) - Html - >
+                    IntermediateToken - (6:0,6 [2] HtmlWithConditionalAttribute.cshtml) - Html - \n
+                    IntermediateToken - (8:1,0 [5] HtmlWithConditionalAttribute.cshtml) - Html - <body
+                    IntermediateToken - (13:1,5 [1] HtmlWithConditionalAttribute.cshtml) - Html - >
+                    IntermediateToken - (14:1,6 [6] HtmlWithConditionalAttribute.cshtml) - Html - \n    
+                    IntermediateToken - (20:2,4 [5] HtmlWithConditionalAttribute.cshtml) - Html - <span
+                HtmlAttribute - (25:2,9 [13] HtmlWithConditionalAttribute.cshtml) -  val=" - "
+                    CSharpExpressionAttributeValue - (31:2,15 [6] HtmlWithConditionalAttribute.cshtml) - 
+                        IntermediateToken - (32:2,16 [5] HtmlWithConditionalAttribute.cshtml) - CSharp - Hello
+                HtmlContent - (38:2,22 [22] HtmlWithConditionalAttribute.cshtml)
+                    IntermediateToken - (38:2,22 [1] HtmlWithConditionalAttribute.cshtml) - Html -  
+                    IntermediateToken - (39:2,23 [2] HtmlWithConditionalAttribute.cshtml) - Html - />
+                    IntermediateToken - (41:2,25 [2] HtmlWithConditionalAttribute.cshtml) - Html - \n
+                    IntermediateToken - (43:3,0 [7] HtmlWithConditionalAttribute.cshtml) - Html - </body>
+                    IntermediateToken - (50:3,7 [2] HtmlWithConditionalAttribute.cshtml) - Html - \n
+                    IntermediateToken - (52:4,0 [7] HtmlWithConditionalAttribute.cshtml) - Html - </html>
+                    IntermediateToken - (59:4,7 [1] HtmlWithConditionalAttribute.cshtml) - Html - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml
new file mode 100644
index 0000000000..ac18b96408
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.cshtml
@@ -0,0 +1,5 @@
+<html>
+<body>
+    <span data-val="@Hello" />
+</body>
+</html>"
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
new file mode 100644
index 0000000000..e140fd3089
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/HtmlAttributeIntegrationTest/HtmlWithDataDashAttribute.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [36] HtmlWithDataDashAttribute.cshtml)
+                    IntermediateToken - (0:0,0 [5] HtmlWithDataDashAttribute.cshtml) - Html - <html
+                    IntermediateToken - (5:0,5 [1] HtmlWithDataDashAttribute.cshtml) - Html - >
+                    IntermediateToken - (6:0,6 [2] HtmlWithDataDashAttribute.cshtml) - Html - \n
+                    IntermediateToken - (8:1,0 [5] HtmlWithDataDashAttribute.cshtml) - Html - <body
+                    IntermediateToken - (13:1,5 [1] HtmlWithDataDashAttribute.cshtml) - Html - >
+                    IntermediateToken - (14:1,6 [6] HtmlWithDataDashAttribute.cshtml) - Html - \n    
+                    IntermediateToken - (20:2,4 [5] HtmlWithDataDashAttribute.cshtml) - Html - <span
+                    IntermediateToken - (25:2,9 [11] HtmlWithDataDashAttribute.cshtml) - Html -  data-val="
+                CSharpExpression - (37:2,21 [5] HtmlWithDataDashAttribute.cshtml)
+                    IntermediateToken - (37:2,21 [5] HtmlWithDataDashAttribute.cshtml) - CSharp - Hello
+                HtmlContent - (42:2,26 [23] HtmlWithDataDashAttribute.cshtml)
+                    IntermediateToken - (42:2,26 [1] HtmlWithDataDashAttribute.cshtml) - Html - "
+                    IntermediateToken - (43:2,27 [1] HtmlWithDataDashAttribute.cshtml) - Html -  
+                    IntermediateToken - (44:2,28 [2] HtmlWithDataDashAttribute.cshtml) - Html - />
+                    IntermediateToken - (46:2,30 [2] HtmlWithDataDashAttribute.cshtml) - Html - \n
+                    IntermediateToken - (48:3,0 [7] HtmlWithDataDashAttribute.cshtml) - Html - </body>
+                    IntermediateToken - (55:3,7 [2] HtmlWithDataDashAttribute.cshtml) - Html - \n
+                    IntermediateToken - (57:4,0 [7] HtmlWithDataDashAttribute.cshtml) - Html - </html>
+                    IntermediateToken - (64:4,7 [1] HtmlWithDataDashAttribute.cshtml) - Html - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml
new file mode 100644
index 0000000000..e8c8937563
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.cshtml
@@ -0,0 +1,5 @@
+@addTagHelper *, TestAssembly
+<p someattr>Hola</p>
+<form unbound="foo">
+    <input value=Hello type='text' />
+</form>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt
new file mode 100644
index 0000000000..ab0e72e99a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::PTagHelper - __PTagHelper
+            FieldDeclaration -  - private - global::FormTagHelper - __FormTagHelper
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                TagHelper - (31:1,0 [20] NestedTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (43:1,12 [4] NestedTagHelpers.cshtml)
+                            IntermediateToken - (43:1,12 [4] NestedTagHelpers.cshtml) - Html - Hola
+                    DefaultTagHelperCreate -  - PTagHelper
+                    DefaultTagHelperHtmlAttribute -  - someattr - HtmlAttributeValueStyle.Minimized
+                    DefaultTagHelperExecute - 
+                HtmlContent - (51:1,20 [2] NestedTagHelpers.cshtml)
+                    IntermediateToken - (51:1,20 [2] NestedTagHelpers.cshtml) - Html - \n
+                TagHelper - (53:2,0 [68] NestedTagHelpers.cshtml) - form - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (73:2,20 [6] NestedTagHelpers.cshtml)
+                            IntermediateToken - (73:2,20 [6] NestedTagHelpers.cshtml) - Html - \n    
+                        TagHelper - (79:3,4 [33] NestedTagHelpers.cshtml) - input - TagMode.SelfClosing
+                            DefaultTagHelperBody - 
+                            DefaultTagHelperCreate -  - InputTagHelper
+                            PreallocatedTagHelperProperty - (92:3,17 [5] NestedTagHelpers.cshtml) - __tagHelperAttribute_0 - value - FooProp
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (112:3,37 [2] NestedTagHelpers.cshtml)
+                            IntermediateToken - (112:3,37 [2] NestedTagHelpers.cshtml) - Html - \n
+                    DefaultTagHelperCreate -  - FormTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml
new file mode 100644
index 0000000000..bd4ce8107a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.cshtml
@@ -0,0 +1,5 @@
+@addTagHelper *, TestAssembly
+<p>Hola</p>
+<form>
+    <input value='Hello' type='text' />
+</form>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt
new file mode 100644
index 0000000000..7ce2298eb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.SingleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [25] SimpleTagHelpers.cshtml)
+                    IntermediateToken - (31:1,0 [2] SimpleTagHelpers.cshtml) - Html - <p
+                    IntermediateToken - (33:1,2 [1] SimpleTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (34:1,3 [4] SimpleTagHelpers.cshtml) - Html - Hola
+                    IntermediateToken - (38:1,7 [4] SimpleTagHelpers.cshtml) - Html - </p>
+                    IntermediateToken - (42:1,11 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (44:2,0 [5] SimpleTagHelpers.cshtml) - Html - <form
+                    IntermediateToken - (49:2,5 [1] SimpleTagHelpers.cshtml) - Html - >
+                    IntermediateToken - (50:2,6 [6] SimpleTagHelpers.cshtml) - Html - \n    
+                TagHelper - (56:3,4 [35] SimpleTagHelpers.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:3,39 [9] SimpleTagHelpers.cshtml)
+                    IntermediateToken - (91:3,39 [2] SimpleTagHelpers.cshtml) - Html - \n
+                    IntermediateToken - (93:4,0 [7] SimpleTagHelpers.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml
new file mode 100644
index 0000000000..83023559d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.cshtml
@@ -0,0 +1,4 @@
+@addTagHelper *, TestAssembly
+<form>
+    <input bound=@Hello type='text' />
+</form>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt
new file mode 100644
index 0000000000..c6f57a8c79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Razor
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - Template -  - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.SingleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTagHelper - __InputTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (31:1,0 [12] TagHelpersWithBoundAttributes.cshtml)
+                    IntermediateToken - (31:1,0 [5] TagHelpersWithBoundAttributes.cshtml) - Html - <form
+                    IntermediateToken - (36:1,5 [1] TagHelpersWithBoundAttributes.cshtml) - Html - >
+                    IntermediateToken - (37:1,6 [6] TagHelpersWithBoundAttributes.cshtml) - Html - \n    
+                TagHelper - (43:2,4 [34] TagHelpersWithBoundAttributes.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (56:2,17 [6] TagHelpersWithBoundAttributes.cshtml) - bound - string InputTagHelper.FooProp - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml)
+                            IntermediateToken - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml) - CSharp - Hello
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                HtmlContent - (77:2,38 [9] TagHelpersWithBoundAttributes.cshtml)
+                    IntermediateToken - (77:2,38 [2] TagHelpersWithBoundAttributes.cshtml) - Html - \n
+                    IntermediateToken - (79:3,0 [7] TagHelpersWithBoundAttributes.cshtml) - Html - </form>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.cspans.txt
new file mode 100644
index 0000000000..0c3a602d5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [11] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [11] )
+Code span at (11:0,11 [0] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt
new file mode 100644
index 0000000000..b6055f8b3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..11)::11 - [@functions{]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            RazorDirective - [0..11)::11 - Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..11)::10
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..11)::1
+                        RazorMetaCode - [10..11)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [11..11)::0
+                            CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Marker;[];
+                        RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.cspans.txt
new file mode 100644
index 0000000000..cb59364cb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Code span at (11:0,11 [5] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt
new file mode 100644
index 0000000000..f31a195d74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..16)::16 - [@functions{LFfoo]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..16)::6
+                        RazorMetaCode - [10..11)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [11..16)::5
+                            CSharpStatementLiteral - [11..16)::5 - [LFfoo] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Identifier;[foo];
+                        RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt
new file mode 100644
index 0000000000..c7703db08b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (9:0,9 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+None span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [0] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt
new file mode 100644
index 0000000000..8f1dc6e7dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [@section Header {]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,16 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..17)::9
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..15)::6 - [Header] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Header];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [17..17)::0
+                            MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt
new file mode 100644
index 0000000000..40740c967d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (9:0,9 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [29] )
+None span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [29] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (17:0,17 [2] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [12] )
+Markup span at (19:1,0 [3] ) (Accepts:Any) - Parent: Tag block at (19:1,0 [3] )
+Markup span at (22:1,3 [3] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [12] )
+Markup span at (25:1,6 [4] ) (Accepts:Any) - Parent: Tag block at (25:1,6 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
new file mode 100644
index 0000000000..49903c34d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..29)::29 - [@section Header {LF<p>Foo</p>]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            RazorDirective - [0..29)::29 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,16 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..29)::28
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..29)::21
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..15)::6 - [Header] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Header];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [17..29)::12
+                            MarkupTextLiteral - [17..19)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            MarkupElement - [19..29)::10
+                                MarkupStartTag - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [22..25)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [29..29)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.cspans.txt
new file mode 100644
index 0000000000..5f99762a70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [2] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [2] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt
new file mode 100644
index 0000000000..4a57c97b59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..2)::2 - [@{]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..2)::2
+            CSharpStatement - [0..2)::2
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..2)::1
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..2)::0
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            Marker;[];
+                    RazorMetaCode - [2..2)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.cspans.txt
new file mode 100644
index 0000000000..a23aedaee0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (4:1,0 [3] ) (Accepts:None) - Parent: Tag block at (4:1,0 [3] )
+Markup span at (7:1,3 [4] ) (Accepts:None) - Parent: Tag block at (7:1,3 [4] )
+Code span at (11:1,7 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
new file mode 100644
index 0000000000..dce241c79e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..11)::11 - [@{LF<p></p>]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..11)::7
+                            MarkupElement - [4..11)::7
+                                MarkupStartTag - [4..7)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [7..11)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.cspans.txt
new file mode 100644
index 0000000000..24a9e949fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [107] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [107] )
+Code span at (1:0,1 [106] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [107] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt
new file mode 100644
index 0000000000..a7b0d6e5f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..107)::107 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if { foo(); }]
+    MarkupBlock - [0..107)::107
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..107)::107
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..107)::106 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt
new file mode 100644
index 0000000000..638fb066e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [5] )
+Code span at (12:0,12 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [5] )
+Code span at (16:0,16 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt
new file mode 100644
index 0000000000..3ccc267cb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..18)::18 - [@if(foo) { @foo. }]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..11)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [11..16)::5
+                CSharpImplicitExpression - [11..16)::5
+                    CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [12..16)::4
+                        CSharpCodeBlock - [12..16)::4
+                            CSharpExpressionLiteral - [12..16)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                Identifier;[foo];
+                                Dot;[.];
+            CSharpStatementLiteral - [16..18)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.cspans.txt
new file mode 100644
index 0000000000..99d7c11589
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt
new file mode 100644
index 0000000000..3a6cb03d45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..14)::14 - [@if(false) { }]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..14)::13 - [if(false) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[false];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.cspans.txt
new file mode 100644
index 0000000000..0e6427508a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+Code span at (1:0,1 [47] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [48] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt
new file mode 100644
index 0000000000..29ad764276
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..48)::48 - [@if(foo) {LF    // bar } " baz 'LF    zoop();LF}]
+    MarkupBlock - [0..48)::48
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..48)::48
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..48)::47 - [if(foo) {LF    // bar } " baz 'LF    zoop();LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                CSharpComment;[// bar } " baz '];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[zoop];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.cspans.txt
new file mode 100644
index 0000000000..5c2cb28925
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [54] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt
new file mode 100644
index 0000000000..84e2a5d5ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..55)::55 - [@if(foo) {LF    /* bar } " */ ' baz } 'LF    zoop();LF}]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..55)::54 - [if(foo) {LF    /* bar } " */ ' baz } 'LF    zoop();LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                CSharpComment;[/* bar } " */];
+                Whitespace;[ ];
+                CharacterLiteral;[' baz } '];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[zoop];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.cspans.txt
new file mode 100644
index 0000000000..db4a931ab4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [12] )
+Code span at (1:0,1 [11] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [12] )
+Markup span at (12:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt
new file mode 100644
index 0000000000..ee2c32a70a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..12)::12 - [@using FooLF]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            RazorDirective - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..12)::11
+                    CSharpStatementLiteral - [1..12)::11 - [using FooLF] - Gen<Import: Foo;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[Foo];
+                        NewLine;[LF];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.cspans.txt
new file mode 100644
index 0000000000..d4911d2950
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Code span at (1:0,1 [40] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt
new file mode 100644
index 0000000000..e0de5dd514
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..41)::41 - [@do { var foo = bar; } while(foo != bar);]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..41)::40 - [do { var foo = bar; } while(foo != bar);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Semicolon;[;];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.cspans.txt
new file mode 100644
index 0000000000..a7ae9af859
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Code span at (1:0,1 [39] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt
new file mode 100644
index 0000000000..8a78b77579
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..40)::40 - [@do { var foo = bar; } while(foo != bar)]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..40)::39 - [do { var foo = bar; } while(foo != bar)] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                RightParenthesis;[)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.cspans.txt
new file mode 100644
index 0000000000..d1a37b0713
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt
new file mode 100644
index 0000000000..499dc4d0e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..28)::28 - [@do { var foo = bar; } narf;]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..22)::21 - [do { var foo = bar; }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [22..28)::6 - [ narf;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[narf;];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.cspans.txt
new file mode 100644
index 0000000000..56b0bb351d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Code span at (1:0,1 [27] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt
new file mode 100644
index 0000000000..115dff2f9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..28)::28 - [@do { var foo = bar; } while]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..28)::27 - [do { var foo = bar; } while] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.cspans.txt
new file mode 100644
index 0000000000..50e4e138d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Code span at (1:0,1 [28] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt
new file mode 100644
index 0000000000..48f0763e96
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..29)::29 - [@do { var foo = bar; } while;]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..29)::28 - [do { var foo = bar; } while;] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
+                Semicolon;[;];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.cspans.txt
new file mode 100644
index 0000000000..4543d16a82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [58] )
+Code span at (1:0,1 [19] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [58] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (20:0,20 [12] )
+Markup span at (21:0,21 [3] ) (Accepts:None) - Parent: Tag block at (21:0,21 [3] )
+Markup span at (24:0,24 [3] ) (Accepts:Any) - Parent: Markup block at (20:0,20 [12] )
+Markup span at (27:0,27 [4] ) (Accepts:None) - Parent: Tag block at (27:0,27 [4] )
+Markup span at (31:0,31 [1] ) (Accepts:None) - Parent: Markup block at (20:0,20 [12] )
+Code span at (32:0,32 [26] ) (Accepts:None) - Parent: Statement block at (0:0,0 [58] )
+Markup span at (58:0,58 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
new file mode 100644
index 0000000000..d965017f0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..58)::58 - [@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);]
+    MarkupBlock - [0..58)::58
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..58)::58
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..20)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+            MarkupBlock - [20..32)::12
+                MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [21..31)::10
+                    MarkupStartTag - [21..24)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [24..27)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [32..58)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Identifier;[foo];
+                Increment;[++];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                LessThan;[<];
+                Identifier;[bar];
+                GreaterThan;[>];
+                RightParenthesis;[)];
+                Semicolon;[;];
+        MarkupTextLiteral - [58..58)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.cspans.txt
new file mode 100644
index 0000000000..0f1eac307a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Code span at (1:0,1 [55] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Markup span at (56:0,56 [12] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt
new file mode 100644
index 0000000000..8d276861a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..68)::68 - [@try { var foo = new { } } finally { var foo = new { } } finally { }]
+    MarkupBlock - [0..68)::68
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..56)::55 - [try { var foo = new { } } finally { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [56..68)::12 - [ finally { }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[finally];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.cspans.txt
new file mode 100644
index 0000000000..754132e4b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Code span at (1:0,1 [30] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt
new file mode 100644
index 0000000000..2c335a84c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..31)::31 - [@if(foo) { @"Foo".ToString(); }]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..31)::30 - [if(foo) { @"Foo".ToString(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                StringLiteral;[@"Foo"];
+                Dot;[.];
+                Identifier;[ToString];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.cspans.txt
new file mode 100644
index 0000000000..cefe5fd53c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [10] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt
new file mode 100644
index 0000000000..edfc754fd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..13)::13 - [@using Foo   ]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            RazorDirective - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..10)::9
+                    CSharpStatementLiteral - [1..10)::9 - [using Foo] - Gen<Import: Foo;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[Foo];
+        MarkupTextLiteral - [10..13)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[   ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.cspans.txt
new file mode 100644
index 0000000000..dfff56c0af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Code span at (1:0,1 [29] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt
new file mode 100644
index 0000000000..a7bec0c689
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..30)::30 - [@using Foo.Bar.Baz = FooBarBaz]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            RazorDirective - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..30)::29
+                    CSharpStatementLiteral - [1..30)::29 - [using Foo.Bar.Baz = FooBarBaz] - Gen<Import: Foo.Bar.Baz = FooBarBaz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[Foo];
+                        Dot;[.];
+                        Identifier;[Bar];
+                        Dot;[.];
+                        Identifier;[Baz];
+                        Whitespace;[ ];
+                        Assign;[=];
+                        Whitespace;[ ];
+                        Identifier;[FooBarBaz];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.cspans.txt
new file mode 100644
index 0000000000..c3dbb950a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+Code span at (1:0,1 [17] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (18:0,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt
new file mode 100644
index 0000000000..dcdbd6caba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..18)::18 - [@using Foo.Bar.Baz]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            RazorDirective - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..18)::17
+                    CSharpStatementLiteral - [1..18)::17 - [using Foo.Bar.Baz] - Gen<Import: Foo.Bar.Baz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[Foo];
+                        Dot;[.];
+                        Identifier;[Bar];
+                        Dot;[.];
+                        Identifier;[Baz];
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.cspans.txt
new file mode 100644
index 0000000000..27ff3d477c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.cspans.txt
@@ -0,0 +1,20 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [230] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [230] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [230] )
+Code span at (2:0,2 [25] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [230] )
+Markup span at (27:3,0 [8] ) (Accepts:Any) - Parent: Markup block at (27:3,0 [83] )
+Markup span at (35:3,8 [8] ) (Accepts:None) - Parent: Tag block at (35:3,8 [8] )
+Markup span at (43:3,16 [18] ) (Accepts:Any) - Parent: Markup block at (27:3,0 [83] )
+Transition span at (61:3,34 [1] ) (Accepts:None) - Parent: Statement block at (61:3,34 [38] )
+MetaCode span at (62:3,35 [1] ) (Accepts:None) - Parent: Statement block at (61:3,34 [38] )
+Code span at (63:3,36 [35] ) (Accepts:Any) - Parent: Statement block at (61:3,34 [38] )
+MetaCode span at (98:3,71 [1] ) (Accepts:None) - Parent: Statement block at (61:3,34 [38] )
+Markup span at (99:3,72 [9] ) (Accepts:None) - Parent: Tag block at (99:3,72 [9] )
+Markup span at (108:3,81 [2] ) (Accepts:None) - Parent: Markup block at (27:3,0 [83] )
+Code span at (110:4,0 [69] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [230] )
+Transition span at (179:8,8 [6] ) (Accepts:None) - Parent: Tag block at (179:8,8 [6] )
+Markup span at (185:8,14 [28] ) (Accepts:Any) - Parent: Markup block at (179:8,8 [41] )
+Transition span at (213:8,42 [7] ) (Accepts:None) - Parent: Tag block at (213:8,42 [7] )
+Code span at (220:8,49 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [230] )
+MetaCode span at (229:10,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [230] )
+Markup span at (230:10,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [230] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.stree.txt
new file mode 100644
index 0000000000..b80dc42a9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithGenerics.stree.txt
@@ -0,0 +1,126 @@
+RazorDocument - [0..230)::230 - [@{LF    void Foo()LF    {LF        <strong>Hello the time is @{ DisplayCount(new List<string>()); }</strong>LF    }LFLF    void DisplayCount<T>(List<T> something)LF    {LF        <text>The count is something.Count</text>LF    }LF}]
+    MarkupBlock - [0..230)::230
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..230)::230
+            CSharpStatement - [0..230)::230
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..230)::229
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..229)::227
+                        CSharpStatementLiteral - [2..27)::25 - [LF    void Foo()LF    {LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[void];
+                            Whitespace;[ ];
+                            Identifier;[Foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                        MarkupBlock - [27..110)::83
+                            MarkupTextLiteral - [27..35)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                            MarkupElement - [35..108)::73
+                                MarkupStartTag - [35..43)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [43..61)::18 - [Hello the time is ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Hello];
+                                    Whitespace;[ ];
+                                    Text;[the];
+                                    Whitespace;[ ];
+                                    Text;[time];
+                                    Whitespace;[ ];
+                                    Text;[is];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [61..99)::38
+                                    CSharpStatement - [61..99)::38
+                                        CSharpTransition - [61..62)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpStatementBody - [62..99)::37
+                                            RazorMetaCode - [62..63)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                LeftBrace;[{];
+                                            CSharpCodeBlock - [63..98)::35
+                                                CSharpStatementLiteral - [63..98)::35 - [ DisplayCount(new List<string>()); ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                                    Whitespace;[ ];
+                                                    Identifier;[DisplayCount];
+                                                    LeftParenthesis;[(];
+                                                    Keyword;[new];
+                                                    Whitespace;[ ];
+                                                    Identifier;[List];
+                                                    LessThan;[<];
+                                                    Keyword;[string];
+                                                    GreaterThan;[>];
+                                                    LeftParenthesis;[(];
+                                                    RightParenthesis;[)];
+                                                    RightParenthesis;[)];
+                                                    Semicolon;[;];
+                                                    Whitespace;[ ];
+                                            RazorMetaCode - [98..99)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightBrace;[}];
+                                MarkupEndTag - [99..108)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [108..110)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [110..179)::69 - [    }LFLF    void DisplayCount<T>(List<T> something)LF    {LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[void];
+                            Whitespace;[ ];
+                            Identifier;[DisplayCount];
+                            LessThan;[<];
+                            Identifier;[T];
+                            GreaterThan;[>];
+                            LeftParenthesis;[(];
+                            Identifier;[List];
+                            LessThan;[<];
+                            Identifier;[T];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[something];
+                            RightParenthesis;[)];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                        MarkupBlock - [179..220)::41
+                            MarkupElement - [179..220)::41
+                                MarkupStartTag - [179..185)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [185..213)::28 - [The count is something.Count] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[The];
+                                    Whitespace;[ ];
+                                    Text;[count];
+                                    Whitespace;[ ];
+                                    Text;[is];
+                                    Whitespace;[ ];
+                                    Text;[something.Count];
+                                MarkupEndTag - [213..220)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [220..229)::9 - [LF    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                    RazorMetaCode - [229..230)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [230..230)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.cspans.txt
new file mode 100644
index 0000000000..c847c4b7bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [119] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [119] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [119] )
+Code span at (2:0,2 [67] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [119] )
+Markup span at (69:4,8 [8] ) (Accepts:None) - Parent: Tag block at (69:4,8 [8] )
+Markup span at (77:4,16 [18] ) (Accepts:Any) - Parent: Markup block at (69:4,8 [42] )
+Transition span at (95:4,34 [1] ) (Accepts:None) - Parent: Expression block at (95:4,34 [5] )
+Code span at (96:4,35 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (95:4,34 [5] )
+Markup span at (100:4,39 [9] ) (Accepts:None) - Parent: Tag block at (100:4,39 [9] )
+Markup span at (109:4,48 [2] ) (Accepts:None) - Parent: Markup block at (69:4,8 [42] )
+Code span at (111:5,0 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [119] )
+MetaCode span at (118:6,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [119] )
+Markup span at (119:6,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [119] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.stree.txt
new file mode 100644
index 0000000000..ddcec9bfca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/LocalFunctionsWithRazor.stree.txt
@@ -0,0 +1,75 @@
+RazorDocument - [0..119)::119 - [@{LF    void Foo() LF    {LF        var time = DateTime.NowLF        <strong>Hello the time is @time</strong>LF    }LF}]
+    MarkupBlock - [0..119)::119
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..119)::119
+            CSharpStatement - [0..119)::119
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..119)::118
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..118)::116
+                        CSharpStatementLiteral - [2..69)::67 - [LF    void Foo() LF    {LF        var time = DateTime.NowLF        ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[void];
+                            Whitespace;[ ];
+                            Identifier;[Foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[time];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                        MarkupBlock - [69..111)::42
+                            MarkupElement - [69..109)::40
+                                MarkupStartTag - [69..77)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [77..95)::18 - [Hello the time is ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Hello];
+                                    Whitespace;[ ];
+                                    Text;[the];
+                                    Whitespace;[ ];
+                                    Text;[time];
+                                    Whitespace;[ ];
+                                    Text;[is];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [95..100)::5
+                                    CSharpImplicitExpression - [95..100)::5
+                                        CSharpTransition - [95..96)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [96..100)::4
+                                            CSharpCodeBlock - [96..100)::4
+                                                CSharpExpressionLiteral - [96..100)::4 - [time] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[time];
+                                MarkupEndTag - [100..109)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [109..111)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [111..118)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                    RazorMetaCode - [118..119)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [119..119)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.cspans.txt
new file mode 100644
index 0000000000..bdc5d0c46d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Code span at (1:0,1 [12] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Statement block at (13:0,13 [14] )
+Code span at (14:0,14 [13] ) (Accepts:Any) - Parent: Statement block at (13:0,13 [14] )
+Code span at (27:0,27 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt
new file mode 100644
index 0000000000..6f903b0c5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..29)::29 - [@if (true) { @if(false) { } }]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..13)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [13..27)::14
+                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [14..27)::13 - [if(false) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+            CSharpStatementLiteral - [27..29)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.cspans.txt
new file mode 100644
index 0000000000..587fa1818e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [50] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+Code span at (2:0,2 [47] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [50] )
+MetaCode span at (49:0,49 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+Markup span at (50:0,50 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [50] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt
new file mode 100644
index 0000000000..f604c80d84
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..50)::50 - [@{ if (true) { var val = @x; if (val != 3) { } } }]
+    MarkupBlock - [0..50)::50
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..50)::50
+            CSharpStatement - [0..50)::50
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..50)::49
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..49)::47
+                        CSharpStatementLiteral - [2..49)::47 - [ if (true) { var val = @x; if (val != 3) { } } ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Keyword;[true];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[val];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Transition;[@];
+                            Identifier;[x];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[val];
+                            Whitespace;[ ];
+                            NotEqual;[!=];
+                            Whitespace;[ ];
+                            IntegerLiteral;[3];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [50..50)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
new file mode 100644
index 0000000000..ae1f1aa184
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [52] )
+Code span at (1:0,1 [12] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [52] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Statement block at (13:0,13 [37] )
+Code span at (14:0,14 [11] ) (Accepts:Any) - Parent: Statement block at (13:0,13 [37] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
+Markup span at (26:0,26 [5] ) (Accepts:None) - Parent: Tag block at (26:0,26 [5] )
+Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [10] )
+Code span at (32:0,32 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [10] )
+Markup span at (41:0,41 [1] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
+Markup span at (42:0,42 [6] ) (Accepts:None) - Parent: Tag block at (42:0,42 [6] )
+Markup span at (48:0,48 [1] ) (Accepts:None) - Parent: Markup block at (25:0,25 [24] )
+Code span at (49:0,49 [1] ) (Accepts:Any) - Parent: Statement block at (13:0,13 [37] )
+Code span at (50:0,50 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [52] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
new file mode 100644
index 0000000000..3ad32ce552
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..52)::52 - [@if (true) { @if(false) { <div>@something.</div> } }]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..52)::52
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..13)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [13..50)::37
+                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [14..25)::11 - [if(false) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [25..49)::24
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupElement - [26..48)::22
+                        MarkupStartTag - [26..31)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[div];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                        CSharpCodeBlock - [31..41)::10
+                            CSharpImplicitExpression - [31..41)::10
+                                CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [32..41)::9
+                                    CSharpCodeBlock - [32..41)::9
+                                        CSharpExpressionLiteral - [32..41)::9 - [something] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[something];
+                        MarkupTextLiteral - [41..42)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[.];
+                        MarkupEndTag - [42..48)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[div];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [49..50)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+            CSharpStatementLiteral - [50..52)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt
new file mode 100644
index 0000000000..6c801fb543
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt
@@ -0,0 +1,39 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [352] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [352] )
+Code span at (1:0,1 [35] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [352] )
+Markup span at (36:1,0 [12] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Markup span at (48:1,12 [5] ) (Accepts:None) - Parent: Tag block at (48:1,12 [5] )
+Markup span at (53:1,17 [18] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Markup span at (71:2,16 [4] ) (Accepts:None) - Parent: Tag block at (71:2,16 [4] )
+Markup span at (75:2,20 [0] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Transition span at (75:2,20 [1] ) (Accepts:None) - Parent: Expression block at (75:2,20 [7] )
+Code span at (76:2,21 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (75:2,20 [7] )
+Markup span at (82:2,27 [5] ) (Accepts:None) - Parent: Tag block at (82:2,27 [5] )
+Markup span at (87:2,32 [18] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Markup span at (105:3,16 [4] ) (Accepts:None) - Parent: Tag block at (105:3,16 [4] )
+Markup span at (109:3,20 [2] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Code span at (111:4,0 [20] ) (Accepts:Any) - Parent: Statement block at (111:4,0 [189] )
+Transition span at (131:4,20 [1] ) (Accepts:None) - Parent: Statement block at (111:4,0 [189] )
+Code span at (132:4,21 [32] ) (Accepts:Any) - Parent: Statement block at (111:4,0 [189] )
+Markup span at (164:5,0 [24] ) (Accepts:Any) - Parent: Markup block at (164:5,0 [113] )
+Markup span at (188:5,24 [4] ) (Accepts:None) - Parent: Tag block at (188:5,24 [4] )
+Markup span at (192:5,28 [2] ) (Accepts:Any) - Parent: Tag block at (192:5,28 [67] )
+Markup span at (194:5,30 [7] ) (Accepts:Any) - Parent: Markup block at (194:5,30 [64] )
+Transition span at (201:5,37 [1] ) (Accepts:None) - Parent: Expression block at (201:5,37 [56] )
+Code span at (202:5,38 [55] ) (Accepts:NonWhitespace) - Parent: Expression block at (201:5,37 [56] )
+Markup span at (257:5,93 [1] ) (Accepts:Any) - Parent: Markup block at (194:5,30 [64] )
+Markup span at (258:5,94 [1] ) (Accepts:None) - Parent: Tag block at (192:5,28 [67] )
+Markup span at (259:5,95 [0] ) (Accepts:Any) - Parent: Markup block at (164:5,0 [113] )
+Transition span at (259:5,95 [1] ) (Accepts:None) - Parent: Expression block at (259:5,95 [7] )
+Code span at (260:5,96 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (259:5,95 [7] )
+Markup span at (266:5,102 [4] ) (Accepts:None) - Parent: Tag block at (266:5,102 [4] )
+Markup span at (270:5,106 [5] ) (Accepts:None) - Parent: Tag block at (270:5,106 [5] )
+Markup span at (275:5,111 [2] ) (Accepts:None) - Parent: Markup block at (164:5,0 [113] )
+Code span at (277:6,0 [23] ) (Accepts:None) - Parent: Statement block at (111:4,0 [189] )
+Markup span at (300:7,0 [16] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Markup span at (316:7,16 [5] ) (Accepts:None) - Parent: Tag block at (316:7,16 [5] )
+Markup span at (321:7,21 [14] ) (Accepts:Any) - Parent: Markup block at (36:1,0 [307] )
+Markup span at (335:8,12 [6] ) (Accepts:None) - Parent: Tag block at (335:8,12 [6] )
+Markup span at (341:8,18 [2] ) (Accepts:None) - Parent: Markup block at (36:1,0 [307] )
+Code span at (343:9,0 [9] ) (Accepts:None) - Parent: Statement block at (0:0,0 [352] )
+Markup span at (352:9,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [352] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
new file mode 100644
index 0000000000..dffaf4686c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
@@ -0,0 +1,194 @@
+RazorDocument - [0..352)::352 - [@foreach(var c in db.Categories) {LF            <div>LF                <h1>@c.Name</h1>LF                <ul>LF                    @foreach(var p in c.Products) {LF                        <li><a href="@Html.ActionUrl("Products", "Detail", new { id = p.Id })">@p.Name</a></li>LF                    }LF                </ul>LF            </div>LF        }]
+    MarkupBlock - [0..352)::352
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..352)::352
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..36)::35 - [foreach(var c in db.Categories) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[c];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[db];
+                Dot;[.];
+                Identifier;[Categories];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+            MarkupBlock - [36..343)::307
+                MarkupTextLiteral - [36..48)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[            ];
+                MarkupElement - [48..341)::293
+                    MarkupStartTag - [48..53)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[div];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [53..71)::18 - [LF                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                        Whitespace;[                ];
+                    MarkupElement - [71..87)::16
+                        MarkupStartTag - [71..75)::4 - [<h1>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[h1];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [75..75)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                        CSharpCodeBlock - [75..82)::7
+                            CSharpImplicitExpression - [75..82)::7
+                                CSharpTransition - [75..76)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [76..82)::6
+                                    CSharpCodeBlock - [76..82)::6
+                                        CSharpExpressionLiteral - [76..82)::6 - [c.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[c];
+                                            Dot;[.];
+                                            Identifier;[Name];
+                        MarkupEndTag - [82..87)::5 - [</h1>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[h1];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [87..105)::18 - [LF                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                        Whitespace;[                ];
+                    MarkupElement - [105..321)::216
+                        MarkupStartTag - [105..109)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[ul];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [109..111)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                        CSharpCodeBlock - [111..300)::189
+                            CSharpStatementLiteral - [111..131)::20 - [                    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[                    ];
+                            CSharpTransition - [131..132)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [132..164)::32 - [foreach(var p in c.Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[foreach];
+                                LeftParenthesis;[(];
+                                Identifier;[var];
+                                Whitespace;[ ];
+                                Identifier;[p];
+                                Whitespace;[ ];
+                                Keyword;[in];
+                                Whitespace;[ ];
+                                Identifier;[c];
+                                Dot;[.];
+                                Identifier;[Products];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                            MarkupBlock - [164..277)::113
+                                MarkupTextLiteral - [164..188)::24 - [                        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[                        ];
+                                MarkupElement - [188..275)::87
+                                    MarkupStartTag - [188..192)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[li];
+                                        CloseAngle;[>];
+                                    MarkupElement - [192..270)::78
+                                        MarkupStartTag - [192..259)::67 - [<a href="@Html.ActionUrl("Products", "Detail", new { id = p.Id })">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[a];
+                                            MarkupAttributeBlock - [194..258)::64 - [ href="@Html.ActionUrl("Products", "Detail", new { id = p.Id })"]
+                                                MarkupTextLiteral - [194..195)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [195..199)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[href];
+                                                Equals;[=];
+                                                MarkupTextLiteral - [200..201)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    DoubleQuote;["];
+                                                GenericBlock - [201..257)::56
+                                                    MarkupDynamicAttributeValue - [201..257)::56 - [@Html.ActionUrl("Products", "Detail", new { id = p.Id })]
+                                                        GenericBlock - [201..257)::56
+                                                            CSharpCodeBlock - [201..257)::56
+                                                                CSharpImplicitExpression - [201..257)::56
+                                                                    CSharpTransition - [201..202)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                        Transition;[@];
+                                                                    CSharpImplicitExpressionBody - [202..257)::55
+                                                                        CSharpCodeBlock - [202..257)::55
+                                                                            CSharpExpressionLiteral - [202..257)::55 - [Html.ActionUrl("Products", "Detail", new { id = p.Id })] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                                Identifier;[Html];
+                                                                                Dot;[.];
+                                                                                Identifier;[ActionUrl];
+                                                                                LeftParenthesis;[(];
+                                                                                StringLiteral;["Products"];
+                                                                                Comma;[,];
+                                                                                Whitespace;[ ];
+                                                                                StringLiteral;["Detail"];
+                                                                                Comma;[,];
+                                                                                Whitespace;[ ];
+                                                                                Keyword;[new];
+                                                                                Whitespace;[ ];
+                                                                                LeftBrace;[{];
+                                                                                Whitespace;[ ];
+                                                                                Identifier;[id];
+                                                                                Whitespace;[ ];
+                                                                                Assign;[=];
+                                                                                Whitespace;[ ];
+                                                                                Identifier;[p];
+                                                                                Dot;[.];
+                                                                                Identifier;[Id];
+                                                                                Whitespace;[ ];
+                                                                                RightBrace;[}];
+                                                                                RightParenthesis;[)];
+                                                MarkupTextLiteral - [257..258)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    DoubleQuote;["];
+                                            CloseAngle;[>];
+                                        MarkupTextLiteral - [259..259)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Marker;[];
+                                        CSharpCodeBlock - [259..266)::7
+                                            CSharpImplicitExpression - [259..266)::7
+                                                CSharpTransition - [259..260)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [260..266)::6
+                                                    CSharpCodeBlock - [260..266)::6
+                                                        CSharpExpressionLiteral - [260..266)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Identifier;[p];
+                                                            Dot;[.];
+                                                            Identifier;[Name];
+                                        MarkupEndTag - [266..270)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[a];
+                                            CloseAngle;[>];
+                                    MarkupEndTag - [270..275)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[li];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [275..277)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [277..300)::23 - [                    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                Whitespace;[                    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        MarkupTextLiteral - [300..316)::16 - [                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[                ];
+                        MarkupEndTag - [316..321)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[ul];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [321..335)::14 - [LF            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                        Whitespace;[            ];
+                    MarkupEndTag - [335..341)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[div];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [341..343)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [343..352)::9 - [        }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[        ];
+                RightBrace;[}];
+        MarkupTextLiteral - [352..352)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.cspans.txt
new file mode 100644
index 0000000000..789aee764e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [181] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [181] )
+Code span at (1:0,1 [180] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [181] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt
new file mode 100644
index 0000000000..bef141e83a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt
@@ -0,0 +1,101 @@
+RazorDocument - [0..181)::181 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}]
+    MarkupBlock - [0..181)::181
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..181)::181
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..181)::180 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt
new file mode 100644
index 0000000000..e9b4132796
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [13] )
+Code span at (12:0,12 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [13] )
+Code span at (24:0,24 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt
new file mode 100644
index 0000000000..4d0d95b0bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..26)::26 - [@if(foo) { @foo[4].bar() }]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..11)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [11..24)::13
+                CSharpImplicitExpression - [11..24)::13
+                    CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [12..24)::12
+                        CSharpCodeBlock - [12..24)::12
+                            CSharpExpressionLiteral - [12..24)::12 - [foo[4].bar()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                Identifier;[foo];
+                                LeftBracket;[[];
+                                IntegerLiteral;[4];
+                                RightBracket;[]];
+                                Dot;[.];
+                                Identifier;[bar];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+            CSharpStatementLiteral - [24..26)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.cspans.txt
new file mode 100644
index 0000000000..fa6fe6f284
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [12] )
+MetaCode span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [12] )
+Code span at (13:0,13 [9] ) (Accepts:Any) - Parent: Expression block at (11:0,11 [12] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [12] )
+Code span at (23:0,23 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt
new file mode 100644
index 0000000000..13b1192f70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..25)::25 - [@if(foo) { @(foo + bar) }]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..11)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [11..23)::12
+                CSharpExplicitExpression - [11..23)::12
+                    CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpExplicitExpressionBody - [12..23)::11
+                        RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftParenthesis;[(];
+                        CSharpCodeBlock - [13..22)::9
+                            CSharpExpressionLiteral - [13..22)::9 - [foo + bar] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                Identifier;[foo];
+                                Whitespace;[ ];
+                                Plus;[+];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                        RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightParenthesis;[)];
+            CSharpStatementLiteral - [23..25)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.cspans.txt
new file mode 100644
index 0000000000..2fe075b558
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [460] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [460] )
+Code span at (1:0,1 [459] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [460] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt
new file mode 100644
index 0000000000..c7b7c42a7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt
@@ -0,0 +1,245 @@
+RazorDocument - [0..460)::460 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}]
+    MarkupBlock - [0..460)::460
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..460)::460
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..460)::459 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.cspans.txt
new file mode 100644
index 0000000000..605d3b6d2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [314] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [314] )
+Code span at (1:0,1 [313] ) (Accepts:None) - Parent: Statement block at (0:0,0 [314] )
+Markup span at (314:6,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [314] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt
new file mode 100644
index 0000000000..aa1209b97a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt
@@ -0,0 +1,165 @@
+RazorDocument - [0..314)::314 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }]
+    MarkupBlock - [0..314)::314
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..314)::314
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..314)::313 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [314..314)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt
new file mode 100644
index 0000000000..38e57fe477
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Code span at (1:0,1 [28] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
new file mode 100644
index 0000000000..824fdc01ed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..29)::29 - [@using FooBarBaz = FooBarBaz;]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            RazorDirective - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..29)::28
+                    CSharpStatementLiteral - [1..29)::28 - [using FooBarBaz = FooBarBaz;] - Gen<Import: FooBarBaz = FooBarBaz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[FooBarBaz];
+                        Whitespace;[ ];
+                        Assign;[=];
+                        Whitespace;[ ];
+                        Identifier;[FooBarBaz];
+                        Semicolon;[;];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt
new file mode 100644
index 0000000000..0fa4fa9054
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Code span at (1:0,1 [18] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
new file mode 100644
index 0000000000..e80602c1cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..19)::19 - [@using Foo.Bar.Baz;]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    CSharpStatementLiteral - [1..19)::18 - [using Foo.Bar.Baz;] - Gen<Import: Foo.Bar.Baz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[Foo];
+                        Dot;[.];
+                        Identifier;[Bar];
+                        Dot;[.];
+                        Identifier;[Baz];
+                        Semicolon;[;];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.cspans.txt
new file mode 100644
index 0000000000..3331924bfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [83] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [83] )
+Code span at (1:0,1 [82] ) (Accepts:None) - Parent: Statement block at (0:0,0 [83] )
+Markup span at (83:0,83 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [83] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt
new file mode 100644
index 0000000000..9b56c74626
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..83)::83 - [@for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    MarkupBlock - [0..83)::83
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..83)::83
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..83)::82 - [for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[for];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [83..83)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.cspans.txt
new file mode 100644
index 0000000000..3dcf5604d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [87] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [87] )
+Code span at (1:0,1 [86] ) (Accepts:None) - Parent: Statement block at (0:0,0 [87] )
+Markup span at (87:0,87 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [87] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt
new file mode 100644
index 0000000000..57c9e1ffbc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..87)::87 - [@foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    MarkupBlock - [0..87)::87
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..87)::87
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..87)::86 - [foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [87..87)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.cspans.txt
new file mode 100644
index 0000000000..8cb778eea3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [82] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [82] )
+Code span at (1:0,1 [81] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [82] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt
new file mode 100644
index 0000000000..416c7e02e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..82)::82 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    MarkupBlock - [0..82)::82
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..82)::82
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..82)::81 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.cspans.txt
new file mode 100644
index 0000000000..1db0bcc1b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [162] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [162] )
+Code span at (1:0,1 [161] ) (Accepts:None) - Parent: Statement block at (0:0,0 [162] )
+Markup span at (162:11,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [162] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt
new file mode 100644
index 0000000000..29ee2fa878
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt
@@ -0,0 +1,62 @@
+RazorDocument - [0..162)::162 - [@switch(foo) {LF    case 0:LF        break;LF    case 1:LF        {LF            break;LF        }LF    case 2:LF        return;LF    default:LF        return;LF}]
+    MarkupBlock - [0..162)::162
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..162)::162
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..162)::161 - [switch(foo) {LF    case 0:LF        break;LF    case 1:LF        {LF            break;LF        }LF    case 2:LF        return;LF    default:LF        return;LF}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[switch];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[case];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Colon;[:];
+                NewLine;[LF];
+                Whitespace;[        ];
+                Keyword;[break];
+                Semicolon;[;];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[case];
+                Whitespace;[ ];
+                IntegerLiteral;[1];
+                Colon;[:];
+                NewLine;[LF];
+                Whitespace;[        ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[            ];
+                Keyword;[break];
+                Semicolon;[;];
+                NewLine;[LF];
+                Whitespace;[        ];
+                RightBrace;[}];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[case];
+                Whitespace;[ ];
+                IntegerLiteral;[2];
+                Colon;[:];
+                NewLine;[LF];
+                Whitespace;[        ];
+                Keyword;[return];
+                Semicolon;[;];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[default];
+                Colon;[:];
+                NewLine;[LF];
+                Whitespace;[        ];
+                Keyword;[return];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+        MarkupTextLiteral - [162..162)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.cspans.txt
new file mode 100644
index 0000000000..ca0b546f9e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+Code span at (1:0,1 [84] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+Markup span at (85:0,85 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt
new file mode 100644
index 0000000000..7c1f988f74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..85)::85 - [@while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..85)::85
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..85)::84 - [while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.cspans.txt
new file mode 100644
index 0000000000..ca0b546f9e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+Code span at (1:0,1 [84] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+Markup span at (85:0,85 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt
new file mode 100644
index 0000000000..348596ed7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..85)::85 - [@using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..85)::85
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..85)::84 - [using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[using];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.cspans.txt
new file mode 100644
index 0000000000..aa0c099c06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Code span at (1:0,1 [55] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Markup span at (56:0,56 [23] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt
new file mode 100644
index 0000000000..591939c74e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..79)::79 - [@try { var foo = new { } } finally { var foo = new { } } catch(Foo Bar Baz) { }]
+    MarkupBlock - [0..79)::79
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..56)::55 - [try { var foo = new { } } finally { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [56..79)::23 - [ catch(Foo Bar Baz) { }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[catch(Foo];
+            Whitespace;[ ];
+            Text;[Bar];
+            Whitespace;[ ];
+            Text;[Baz)];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.cspans.txt
new file mode 100644
index 0000000000..be831c60b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [314] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [221] )
+Code span at (1:0,1 [220] ) (Accepts:None) - Parent: Statement block at (0:0,0 [221] )
+Markup span at (221:4,41 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [314] )
+Markup span at (243:4,63 [1] ) (Accepts:Any) - Parent: Tag block at (243:4,63 [71] )
+Markup span at (244:4,64 [4] ) (Accepts:Any) - Parent: Markup block at (244:4,64 [4] )
+Markup span at (248:4,68 [4] ) (Accepts:Any) - Parent: Markup block at (248:4,68 [4] )
+Markup span at (252:4,72 [4] ) (Accepts:Any) - Parent: Markup block at (252:4,72 [4] )
+Markup span at (256:4,76 [2] ) (Accepts:Any) - Parent: Markup block at (256:4,76 [2] )
+Markup span at (258:4,78 [8] ) (Accepts:Any) - Parent: Markup block at (258:4,78 [12] )
+Markup span at (266:4,86 [3] ) (Accepts:Any) - Parent: Markup block at (258:4,78 [12] )
+Markup span at (269:4,89 [1] ) (Accepts:Any) - Parent: Markup block at (258:4,78 [12] )
+Markup span at (270:4,90 [3] ) (Accepts:Any) - Parent: Markup block at (270:4,90 [3] )
+Markup span at (273:4,93 [2] ) (Accepts:Any) - Parent: Markup block at (273:4,93 [2] )
+Markup span at (275:4,95 [27] ) (Accepts:Any) - Parent: Markup block at (275:4,95 [27] )
+Markup span at (302:5,25 [2] ) (Accepts:Any) - Parent: Markup block at (302:5,25 [2] )
+Markup span at (304:5,27 [7] ) (Accepts:Any) - Parent: Markup block at (304:5,27 [7] )
+Markup span at (311:5,34 [3] ) (Accepts:Any) - Parent: Markup block at (311:5,34 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
new file mode 100644
index 0000000000..6ea3f05e53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
@@ -0,0 +1,207 @@
+RazorDocument - [0..314)::314 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); } else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}]
+    MarkupBlock - [0..314)::314
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..221)::221
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..221)::220 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"bar } baz"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [221..243)::22 - [ else if(int i = 0; i ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[else];
+            Whitespace;[ ];
+            Text;[if(int];
+            Whitespace;[ ];
+            Text;[i];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[0;];
+            Whitespace;[ ];
+            Text;[i];
+            Whitespace;[ ];
+        MarkupElement - [243..314)::71
+            MarkupStartTag - [243..314)::71 - [< 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                MarkupMinimizedAttributeBlock - [244..248)::4 - [ 10;]
+                    MarkupTextLiteral - [244..245)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [245..248)::3 - [10;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[10;];
+                MarkupMinimizedAttributeBlock - [248..252)::4 - [ new]
+                    MarkupTextLiteral - [248..249)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [249..252)::3 - [new] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[new];
+                MarkupMinimizedAttributeBlock - [252..256)::4 - [ Foo]
+                    MarkupTextLiteral - [252..253)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [253..256)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                MarkupMinimizedAttributeBlock - [256..258)::2 - [ {]
+                    MarkupTextLiteral - [256..257)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [257..258)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[{];
+                MarkupAttributeBlock - [258..270)::12 - [ Bar = "baz"]
+                    MarkupTextLiteral - [258..259)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [259..262)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupTextLiteral - [262..263)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    Equals;[=];
+                    MarkupTextLiteral - [264..266)::2 - [ "] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                        DoubleQuote;["];
+                    GenericBlock - [266..269)::3
+                        MarkupLiteralAttributeValue - [266..269)::3 - [baz]
+                            MarkupTextLiteral - [266..269)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[baz];
+                    MarkupTextLiteral - [269..270)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMinimizedAttributeBlock - [270..273)::3 - [ })]
+                    MarkupTextLiteral - [270..271)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [271..273)::2 - [})] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[})];
+                MarkupMinimizedAttributeBlock - [273..275)::2 - [ {]
+                    MarkupTextLiteral - [273..274)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [274..275)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[{];
+                MarkupMinimizedAttributeBlock - [275..302)::27 - [LF    Debug.WriteLine(@"bar]
+                    MarkupTextLiteral - [275..281)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [281..302)::21 - [Debug.WriteLine(@"bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Debug.WriteLine(];
+                        Transition;[@];
+                        DoubleQuote;["];
+                        Text;[bar];
+                MarkupMinimizedAttributeBlock - [302..304)::2 - [ }]
+                    MarkupTextLiteral - [302..303)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [303..304)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[}];
+                MarkupMinimizedAttributeBlock - [304..311)::7 - [ baz");]
+                    MarkupTextLiteral - [304..305)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [305..311)::6 - [baz");] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[baz];
+                        DoubleQuote;["];
+                        Text;[);];
+                MarkupMinimizedAttributeBlock - [311..314)::3 - [LF}]
+                    MarkupTextLiteral - [311..313)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                    MarkupTextLiteral - [313..314)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[}];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.cspans.txt
new file mode 100644
index 0000000000..fe1c982289
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [88] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [88] )
+Code span at (1:0,1 [87] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [88] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt
new file mode 100644
index 0000000000..bc5f1923c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..88)::88 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF}]
+    MarkupBlock - [0..88)::88
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..88)::88
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..88)::87 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.cspans.txt
new file mode 100644
index 0000000000..6e4685336b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Code span at (1:0,1 [75] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Markup span at (76:0,76 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt
new file mode 100644
index 0000000000..96e3f6e83c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..76)::76 - [@try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }]
+    MarkupBlock - [0..76)::76
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..76)::76
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..76)::75 - [try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                CSharpComment;[/* Foo */];
+                Whitespace;[ ];
+                CSharpComment;[/* Bar */];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[biz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [76..76)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.cspans.txt
new file mode 100644
index 0000000000..ad7d618e3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [54] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Markup span at (55:0,55 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt
new file mode 100644
index 0000000000..fce6e868c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..55)::55 - [@do { var foo = bar; } /* Foo */ /* Bar */ while(true);]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..55)::54 - [do { var foo = bar; } /* Foo */ /* Bar */ while(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                CSharpComment;[/* Foo */];
+                Whitespace;[ ];
+                CSharpComment;[/* Bar */];
+                Whitespace;[ ];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Semicolon;[;];
+        MarkupTextLiteral - [55..55)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.cspans.txt
new file mode 100644
index 0000000000..ab49157b04
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [79] )
+Code span at (1:0,1 [78] ) (Accepts:None) - Parent: Statement block at (0:0,0 [79] )
+Markup span at (79:0,79 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt
new file mode 100644
index 0000000000..a3ef08830e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..79)::79 - [@if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }]
+    MarkupBlock - [0..79)::79
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..79)::79
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..79)::78 - [if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                CSharpComment;[/* Foo */];
+                Whitespace;[ ];
+                CSharpComment;[/* Bar */];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[biz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [79..79)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.cspans.txt
new file mode 100644
index 0000000000..ad7d618e3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [54] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Markup span at (55:0,55 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt
new file mode 100644
index 0000000000..caa9d72231
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..55)::55 - [@if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..55)::54 - [if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                CSharpComment;[/* Foo */];
+                Whitespace;[ ];
+                CSharpComment;[/* Bar */];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [55..55)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.cspans.txt
new file mode 100644
index 0000000000..9308e1a86a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [62] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [62] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt
new file mode 100644
index 0000000000..4d4572d8e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..62)::62 - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }]
+    MarkupBlock - [0..62)::62
+        MarkupTextLiteral - [0..62)::62 - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[if(foo)];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[bar();];
+            Whitespace;[ ];
+            Text;[}];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            Text;[*];
+            Whitespace;[ ];
+            Text;[Foo];
+            Whitespace;[ ];
+            Text;[*];
+            ForwardSlash;[/];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            Text;[*];
+            Whitespace;[ ];
+            Text;[Bar];
+            Whitespace;[ ];
+            Text;[*];
+            ForwardSlash;[/];
+            Whitespace;[ ];
+            Text;[else];
+            Whitespace;[ ];
+            Text;[if(bar)];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[baz();];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.cspans.txt
new file mode 100644
index 0000000000..160fbdc681
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Code span at (1:0,1 [56] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [57] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt
new file mode 100644
index 0000000000..2385e04a83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..57)::57 - [@try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }]
+    MarkupBlock - [0..57)::57
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..57)::57
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..57)::56 - [try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                CSharpComment;[/* Foo */];
+                Whitespace;[ ];
+                CSharpComment;[/* Bar */];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.cspans.txt
new file mode 100644
index 0000000000..d203f657ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Code span at (1:0,1 [53] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Markup span at (54:0,54 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt
new file mode 100644
index 0000000000..b260d25664
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..54)::54 - [@try { bar(); } /* Foo */ /* Bar */ finally { baz(); }]
+    MarkupBlock - [0..54)::54
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..54)::54
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..54)::53 - [try { bar(); } /* Foo */ /* Bar */ finally { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                CSharpComment;[/* Foo */];
+                Whitespace;[ ];
+                CSharpComment;[/* Bar */];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [54..54)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.cspans.txt
new file mode 100644
index 0000000000..c6237e0e8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Code span at (1:0,1 [53] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [54] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt
new file mode 100644
index 0000000000..32c77551fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..54)::54 - [@try { var foo = new { } } catch { var foo = new { } }]
+    MarkupBlock - [0..54)::54
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..54)::54
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..54)::53 - [try { var foo = new { } } catch { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.cspans.txt
new file mode 100644
index 0000000000..62b7ff3aa5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [73] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [73] )
+Code span at (1:0,1 [72] ) (Accepts:None) - Parent: Statement block at (0:0,0 [73] )
+Markup span at (73:3,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [73] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt
new file mode 100644
index 0000000000..2171dd644d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..73)::73 - [@try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }]
+    MarkupBlock - [0..73)::73
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..73)::73
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..73)::72 - [try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[biz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [73..73)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.cspans.txt
new file mode 100644
index 0000000000..9cf3e2b219
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [52] )
+Code span at (1:0,1 [51] ) (Accepts:None) - Parent: Statement block at (0:0,0 [52] )
+Markup span at (52:3,12 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt
new file mode 100644
index 0000000000..6e8cbb886a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..52)::52 - [@do { var foo = bar; }LF// FooLF// BarLFwhile(true);]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..52)::52
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..52)::51 - [do { var foo = bar; }LF// FooLF// BarLFwhile(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Semicolon;[;];
+        MarkupTextLiteral - [52..52)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.cspans.txt
new file mode 100644
index 0000000000..e5f45fe9ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Code span at (1:0,1 [75] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Markup span at (76:3,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt
new file mode 100644
index 0000000000..e7bad5b4ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..76)::76 - [@if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }]
+    MarkupBlock - [0..76)::76
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..76)::76
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..76)::75 - [if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[biz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [76..76)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.cspans.txt
new file mode 100644
index 0000000000..566e454573
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [52] )
+Code span at (1:0,1 [51] ) (Accepts:None) - Parent: Statement block at (0:0,0 [52] )
+Markup span at (52:3,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt
new file mode 100644
index 0000000000..d167b6dbe2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..52)::52 - [@if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..52)::52
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..52)::51 - [if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [52..52)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.cspans.txt
new file mode 100644
index 0000000000..8985fc4d32
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [60] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [60] )
+Code span at (1:0,1 [59] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [60] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt
new file mode 100644
index 0000000000..a0ca426d84
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..60)::60 - [@if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }]
+    MarkupBlock - [0..60)::60
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..60)::60
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..60)::59 - [if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.cspans.txt
new file mode 100644
index 0000000000..c6237e0e8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Code span at (1:0,1 [53] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [54] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt
new file mode 100644
index 0000000000..62b181f49f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..54)::54 - [@try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }]
+    MarkupBlock - [0..54)::54
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..54)::54
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..54)::53 - [try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.cspans.txt
new file mode 100644
index 0000000000..4ea9b5e4ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Code span at (1:0,1 [50] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Markup span at (51:3,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt
new file mode 100644
index 0000000000..ed023e9a58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..51)::51 - [@try { bar(); }LF// FooLF// BarLFfinally { baz(); }]
+    MarkupBlock - [0..51)::51
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..51)::51
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..51)::50 - [try { bar(); }LF// FooLF// BarLFfinally { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                NewLine;[LF];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+                CSharpComment;[// Bar];
+                NewLine;[LF];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [51..51)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.cspans.txt
new file mode 100644
index 0000000000..c85c3644c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [142] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [142] )
+Code span at (1:0,1 [128] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [142] )
+Markup span at (129:0,129 [1] ) (Accepts:Any) - Parent: Markup block at (129:0,129 [12] )
+Markup span at (130:0,130 [3] ) (Accepts:None) - Parent: Tag block at (130:0,130 [3] )
+Markup span at (133:0,133 [3] ) (Accepts:Any) - Parent: Markup block at (129:0,129 [12] )
+Markup span at (136:0,136 [4] ) (Accepts:None) - Parent: Tag block at (136:0,136 [4] )
+Markup span at (140:0,140 [1] ) (Accepts:None) - Parent: Markup block at (129:0,129 [12] )
+Code span at (141:0,141 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [142] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
new file mode 100644
index 0000000000..8c4bba87e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
@@ -0,0 +1,105 @@
+RazorDocument - [0..142)::142 - [@try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { <p>Foo</p> }]
+    MarkupBlock - [0..142)::142
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..142)::142
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..129)::128 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [129..141)::12
+                MarkupTextLiteral - [129..130)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [130..140)::10
+                    MarkupStartTag - [130..133)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [133..136)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [136..140)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [140..141)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [141..142)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.cspans.txt
new file mode 100644
index 0000000000..f5eacad8c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [60] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [60] )
+Code span at (1:0,1 [46] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [60] )
+Markup span at (47:0,47 [1] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [12] )
+Markup span at (48:0,48 [3] ) (Accepts:None) - Parent: Tag block at (48:0,48 [3] )
+Markup span at (51:0,51 [3] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [12] )
+Markup span at (54:0,54 [4] ) (Accepts:None) - Parent: Tag block at (54:0,54 [4] )
+Markup span at (58:0,58 [1] ) (Accepts:None) - Parent: Markup block at (47:0,47 [12] )
+Code span at (59:0,59 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [60] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
new file mode 100644
index 0000000000..c3f718b548
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..60)::60 - [@try { var foo = new { } } catch(Foo Bar Baz) { <p>Foo</p> }]
+    MarkupBlock - [0..60)::60
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..60)::60
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..47)::46 - [try { var foo = new { } } catch(Foo Bar Baz) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [47..59)::12
+                MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [48..58)::10
+                    MarkupStartTag - [48..51)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [51..54)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [54..58)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [58..59)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [59..60)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.cspans.txt
new file mode 100644
index 0000000000..4fd893b6ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Code span at (1:0,1 [35] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
+Markup span at (36:0,36 [1] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [12] )
+Markup span at (37:0,37 [3] ) (Accepts:None) - Parent: Tag block at (37:0,37 [3] )
+Markup span at (40:0,40 [3] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [12] )
+Markup span at (43:0,43 [4] ) (Accepts:None) - Parent: Tag block at (43:0,43 [4] )
+Markup span at (47:0,47 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [12] )
+Code span at (48:0,48 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Markup span at (49:0,49 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
new file mode 100644
index 0000000000..41cfa89c2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..49)::49 - [@try { var foo = new { } } finally { <p>Foo</p> }]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..36)::35 - [try { var foo = new { } } finally {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [36..48)::12
+                MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [37..47)::10
+                    MarkupStartTag - [37..40)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [40..43)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [43..47)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [48..49)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [49..49)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.cspans.txt
new file mode 100644
index 0000000000..93ffe7cfe8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (6:0,6 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (7:0,7 [3] ) (Accepts:None) - Parent: Tag block at (7:0,7 [3] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (13:0,13 [4] ) (Accepts:None) - Parent: Tag block at (13:0,13 [4] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (6:0,6 [12] )
+Code span at (18:0,18 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
new file mode 100644
index 0000000000..996f278e09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..19)::19 - [@try { <p>Foo</p> }]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..6)::5 - [try {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [6..18)::12
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [7..17)::10
+                    MarkupStartTag - [7..10)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [13..17)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [18..19)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.cspans.txt
new file mode 100644
index 0000000000..93426c20ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Code span at (1:0,1 [37] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [76] )
+Transition span at (38:0,38 [1] ) (Accepts:None) - Parent: Comment block at (38:0,38 [9] )
+MetaCode span at (39:0,39 [1] ) (Accepts:None) - Parent: Comment block at (38:0,38 [9] )
+Comment span at (40:0,40 [5] ) (Accepts:Any) - Parent: Comment block at (38:0,38 [9] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Comment block at (38:0,38 [9] )
+Transition span at (46:0,46 [1] ) (Accepts:None) - Parent: Comment block at (38:0,38 [9] )
+Code span at (47:0,47 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [76] )
+Transition span at (48:0,48 [1] ) (Accepts:None) - Parent: Comment block at (48:0,48 [9] )
+MetaCode span at (49:0,49 [1] ) (Accepts:None) - Parent: Comment block at (48:0,48 [9] )
+Comment span at (50:0,50 [5] ) (Accepts:Any) - Parent: Comment block at (48:0,48 [9] )
+MetaCode span at (55:0,55 [1] ) (Accepts:None) - Parent: Comment block at (48:0,48 [9] )
+Transition span at (56:0,56 [1] ) (Accepts:None) - Parent: Comment block at (48:0,48 [9] )
+Code span at (57:0,57 [19] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Markup span at (76:0,76 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt
new file mode 100644
index 0000000000..2637f539e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..76)::76 - [@try { bar(); } catch(bar) { baz(); } @* Foo *@ @* Bar *@ finally { biz(); }]
+    MarkupBlock - [0..76)::76
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..76)::76
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..38)::37 - [try { bar(); } catch(bar) { baz(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+            RazorComment - [38..47)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [47..48)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [48..57)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [57..76)::19 - [ finally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[biz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [76..76)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.cspans.txt
new file mode 100644
index 0000000000..bc25d70006
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [22] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [55] )
+Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Comment block at (23:0,23 [9] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Comment block at (23:0,23 [9] )
+Comment span at (25:0,25 [5] ) (Accepts:Any) - Parent: Comment block at (23:0,23 [9] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Comment block at (23:0,23 [9] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Comment block at (23:0,23 [9] )
+Code span at (32:0,32 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [55] )
+Transition span at (33:0,33 [1] ) (Accepts:None) - Parent: Comment block at (33:0,33 [9] )
+MetaCode span at (34:0,34 [1] ) (Accepts:None) - Parent: Comment block at (33:0,33 [9] )
+Comment span at (35:0,35 [5] ) (Accepts:Any) - Parent: Comment block at (33:0,33 [9] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Comment block at (33:0,33 [9] )
+Transition span at (41:0,41 [1] ) (Accepts:None) - Parent: Comment block at (33:0,33 [9] )
+Code span at (42:0,42 [13] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Markup span at (55:0,55 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt
new file mode 100644
index 0000000000..381862b355
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..55)::55 - [@do { var foo = bar; } @* Foo *@ @* Bar *@ while(true);]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..23)::22 - [do { var foo = bar; } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+            RazorComment - [23..32)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [32..33)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [33..42)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [42..55)::13 - [ while(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Semicolon;[;];
+        MarkupTextLiteral - [55..55)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.cspans.txt
new file mode 100644
index 0000000000..18ad30afaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [79] )
+Code span at (1:0,1 [43] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [79] )
+Transition span at (44:0,44 [1] ) (Accepts:None) - Parent: Comment block at (44:0,44 [9] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Comment block at (44:0,44 [9] )
+Comment span at (46:0,46 [5] ) (Accepts:Any) - Parent: Comment block at (44:0,44 [9] )
+MetaCode span at (51:0,51 [1] ) (Accepts:None) - Parent: Comment block at (44:0,44 [9] )
+Transition span at (52:0,52 [1] ) (Accepts:None) - Parent: Comment block at (44:0,44 [9] )
+Code span at (53:0,53 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [79] )
+Transition span at (54:0,54 [1] ) (Accepts:None) - Parent: Comment block at (54:0,54 [9] )
+MetaCode span at (55:0,55 [1] ) (Accepts:None) - Parent: Comment block at (54:0,54 [9] )
+Comment span at (56:0,56 [5] ) (Accepts:Any) - Parent: Comment block at (54:0,54 [9] )
+MetaCode span at (61:0,61 [1] ) (Accepts:None) - Parent: Comment block at (54:0,54 [9] )
+Transition span at (62:0,62 [1] ) (Accepts:None) - Parent: Comment block at (54:0,54 [9] )
+Code span at (63:0,63 [16] ) (Accepts:None) - Parent: Statement block at (0:0,0 [79] )
+Markup span at (79:0,79 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt
new file mode 100644
index 0000000000..dcf81bd443
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..79)::79 - [@if(foo) { bar(); } else if(bar) { baz(); } @* Foo *@ @* Bar *@ else { baz(); }]
+    MarkupBlock - [0..79)::79
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..79)::79
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..44)::43 - [if(foo) { bar(); } else if(bar) { baz(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+            RazorComment - [44..53)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [53..54)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [54..63)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [63..79)::16 - [ else { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [79..79)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.cspans.txt
new file mode 100644
index 0000000000..988b9312cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [19] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [55] )
+Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+Comment span at (22:0,22 [5] ) (Accepts:Any) - Parent: Comment block at (20:0,20 [9] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+Transition span at (28:0,28 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+Code span at (29:0,29 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [55] )
+Transition span at (30:0,30 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+Comment span at (32:0,32 [5] ) (Accepts:Any) - Parent: Comment block at (30:0,30 [9] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+Transition span at (38:0,38 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+Code span at (39:0,39 [16] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Markup span at (55:0,55 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt
new file mode 100644
index 0000000000..4d0ae9df0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..55)::55 - [@if(foo) { bar(); } @* Foo *@ @* Bar *@ else { baz(); }]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..20)::19 - [if(foo) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+            RazorComment - [20..29)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [29..30)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [30..39)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [39..55)::16 - [ else { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [55..55)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.cspans.txt
new file mode 100644
index 0000000000..7884e3972d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [63] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
+Code span at (1:0,1 [19] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [63] )
+Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+Comment span at (22:0,22 [5] ) (Accepts:Any) - Parent: Comment block at (20:0,20 [9] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+Transition span at (28:0,28 [1] ) (Accepts:None) - Parent: Comment block at (20:0,20 [9] )
+Code span at (29:0,29 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [63] )
+Transition span at (30:0,30 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+Comment span at (32:0,32 [5] ) (Accepts:Any) - Parent: Comment block at (30:0,30 [9] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+Transition span at (38:0,38 [1] ) (Accepts:None) - Parent: Comment block at (30:0,30 [9] )
+Code span at (39:0,39 [24] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [63] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt
new file mode 100644
index 0000000000..9e6d75fb2e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..63)::63 - [@if(foo) { bar(); } @* Foo *@ @* Bar *@ else if(bar) { baz(); }]
+    MarkupBlock - [0..63)::63
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..63)::63
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..20)::19 - [if(foo) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+            RazorComment - [20..29)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [29..30)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [30..39)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [39..63)::24 - [ else if(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.cspans.txt
new file mode 100644
index 0000000000..4c91176796
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [56] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Comment block at (15:0,15 [9] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Comment block at (15:0,15 [9] )
+Comment span at (17:0,17 [5] ) (Accepts:Any) - Parent: Comment block at (15:0,15 [9] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Comment block at (15:0,15 [9] )
+Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Comment block at (15:0,15 [9] )
+Code span at (24:0,24 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [56] )
+Transition span at (25:0,25 [1] ) (Accepts:None) - Parent: Comment block at (25:0,25 [9] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Comment block at (25:0,25 [9] )
+Comment span at (27:0,27 [5] ) (Accepts:Any) - Parent: Comment block at (25:0,25 [9] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Comment block at (25:0,25 [9] )
+Transition span at (33:0,33 [1] ) (Accepts:None) - Parent: Comment block at (25:0,25 [9] )
+Code span at (34:0,34 [22] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt
new file mode 100644
index 0000000000..16457cd82d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..56)::56 - [@try { bar(); }@* Foo *@ @* Bar *@ catch(bar) { baz(); }]
+    MarkupBlock - [0..56)::56
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..15)::14 - [try { bar(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+            RazorComment - [15..24)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [24..25)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [25..34)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [34..56)::22 - [ catch(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.cspans.txt
new file mode 100644
index 0000000000..404343ecca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Code span at (1:0,1 [15] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [54] )
+Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Comment block at (16:0,16 [9] )
+MetaCode span at (17:0,17 [1] ) (Accepts:None) - Parent: Comment block at (16:0,16 [9] )
+Comment span at (18:0,18 [5] ) (Accepts:Any) - Parent: Comment block at (16:0,16 [9] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Comment block at (16:0,16 [9] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Comment block at (16:0,16 [9] )
+Code span at (25:0,25 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [54] )
+Transition span at (26:0,26 [1] ) (Accepts:None) - Parent: Comment block at (26:0,26 [9] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Comment block at (26:0,26 [9] )
+Comment span at (28:0,28 [5] ) (Accepts:Any) - Parent: Comment block at (26:0,26 [9] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Comment block at (26:0,26 [9] )
+Transition span at (34:0,34 [1] ) (Accepts:None) - Parent: Comment block at (26:0,26 [9] )
+Code span at (35:0,35 [19] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Markup span at (54:0,54 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt
new file mode 100644
index 0000000000..0cc98a8834
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..54)::54 - [@try { bar(); } @* Foo *@ @* Bar *@ finally { biz(); }]
+    MarkupBlock - [0..54)::54
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..54)::54
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..16)::15 - [try { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+            RazorComment - [16..25)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Foo ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [25..26)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            RazorComment - [26..35)::9
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ Bar ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            CSharpStatementLiteral - [35..54)::19 - [ finally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[biz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [54..54)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.cspans.txt
new file mode 100644
index 0000000000..eef6075fd7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Code span at (1:0,1 [55] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Markup span at (56:0,56 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt
new file mode 100644
index 0000000000..0ce89b760f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..56)::56 - [@try { var foo = new { } } finally { var foo = new { } }]
+    MarkupBlock - [0..56)::56
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..56)::55 - [try { var foo = new { } } finally { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [56..56)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.cspans.txt
new file mode 100644
index 0000000000..3c1c9fd7ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [149] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [149] )
+Code span at (1:0,1 [148] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [149] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt
new file mode 100644
index 0000000000..54504a9e05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt
@@ -0,0 +1,100 @@
+RazorDocument - [0..149)::149 - [@try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }]
+    MarkupBlock - [0..149)::149
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..149)::149
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..149)::148 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.cspans.txt
new file mode 100644
index 0000000000..6f701b216f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (1:0,1 [25] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt
new file mode 100644
index 0000000000..944a321a80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..26)::26 - [@try { var foo = new { } }]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..26)::25 - [try { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.cspans.txt
new file mode 100644
index 0000000000..2d883a5590
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [67] )
+Code span at (1:0,1 [66] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [67] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt
new file mode 100644
index 0000000000..976171e701
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..67)::67 - [@try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }]
+    MarkupBlock - [0..67)::67
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..67)::67
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..67)::66 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Identifier;[Baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.cspans.txt
new file mode 100644
index 0000000000..40ccbbdea5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [97] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [97] )
+Code span at (1:0,1 [96] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [97] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt
new file mode 100644
index 0000000000..5632b74d2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..97)::97 - [@if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }]
+    MarkupBlock - [0..97)::97
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..97)::97
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..97)::96 - [if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Keyword;[using];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["baz"];
+                Whitespace;[ ];
+                RightBrace;[}];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.cspans.txt
new file mode 100644
index 0000000000..2ed26af598
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Code span at (1:0,1 [38] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [39] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt
new file mode 100644
index 0000000000..2612cdd013
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt
@@ -0,0 +1,2 @@
+(1,26): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
+(1,2): Error RZ1006: The foreach block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt
new file mode 100644
index 0000000000..6a21bad8d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..39)::39 - [@foreach(var f in Foo) { /* foo bar baz]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..39)::39
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..39)::38 - [foreach(var f in Foo) { /* foo bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[f];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                CSharpComment;[/* foo bar baz];RZ1001(25:0,25 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.cspans.txt
new file mode 100644
index 0000000000..3f873f6ea4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [15] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.diag.txt
new file mode 100644
index 0000000000..a40df1a410
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt
new file mode 100644
index 0000000000..c52a1189f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [@Html.En(code()]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpImplicitExpression - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..15)::14
+                    CSharpCodeBlock - [1..15)::14
+                        CSharpExpressionLiteral - [1..15)::14 - [Html.En(code()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[En];
+                            LeftParenthesis;[(];
+                            Identifier;[code];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.cspans.txt
new file mode 100644
index 0000000000..2ed26af598
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Code span at (1:0,1 [38] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [39] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.diag.txt
new file mode 100644
index 0000000000..06bf6f2dca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The foreach block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt
new file mode 100644
index 0000000000..256845d49c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..39)::39 - [@foreach(var f in Foo) { // foo bar baz]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..39)::39
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..39)::38 - [foreach(var f in Foo) { // foo bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[f];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                CSharpComment;[// foo bar baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.cspans.txt
new file mode 100644
index 0000000000..7326485a95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Code span at (1:0,1 [37] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.diag.txt
new file mode 100644
index 0000000000..06bf6f2dca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The foreach block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt
new file mode 100644
index 0000000000..106b2c81a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..38)::38 - [@foreach(var f in Foo) { / foo bar baz]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..38)::37 - [foreach(var f in Foo) { / foo bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[f];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Slash;[/];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Whitespace;[ ];
+                Identifier;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.cspans.txt
new file mode 100644
index 0000000000..6f701b216f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (1:0,1 [25] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt
new file mode 100644
index 0000000000..7d0351183f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt
@@ -0,0 +1,10 @@
+RazorDocument - [0..26)::26 - [@using                    ]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..26)::25 - [using                    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[using];
+                Whitespace;[                    ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.cspans.txt
new file mode 100644
index 0000000000..3b430f9f07
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+Code span at (1:0,1 [44] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+Markup span at (45:0,45 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt
new file mode 100644
index 0000000000..0f6a422fa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..45)::45 - [@lock(foo) { Debug.WriteLine(@"foo } bar"); }]
+    MarkupBlock - [0..45)::45
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..45)::45
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..45)::44 - [lock(foo) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[lock];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Debug];
+                Dot;[.];
+                Identifier;[WriteLine];
+                LeftParenthesis;[(];
+                StringLiteral;[@"foo } bar"];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [45..45)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.cspans.txt
new file mode 100644
index 0000000000..bb6bc45bc9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
+Code span at (11:0,11 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
+Code span at (12:0,12 [16] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt
new file mode 100644
index 0000000000..a47868ef01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..28)::28 - [@if(foo) { @@@@class.Foo() }]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..11)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpEphemeralTextLiteral - [11..12)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            CSharpStatementLiteral - [12..28)::16 - [@@@class.Foo() }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+                Transition;[@];
+                Transition;[@];
+                Keyword;[class];
+                Dot;[.];
+                Identifier;[Foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.cspans.txt
new file mode 100644
index 0000000000..74119a5b92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Code span at (11:0,11 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Code span at (12:0,12 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt
new file mode 100644
index 0000000000..3996000291
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..26)::26 - [@if(foo) { @@class.Foo() }]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..11)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpEphemeralTextLiteral - [11..12)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            CSharpStatementLiteral - [12..26)::14 - [@class.Foo() }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+                Keyword;[class];
+                Dot;[.];
+                Identifier;[Foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..867c9d5eae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [20] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [12] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (14:0,14 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [12] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [12] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [20] )
+Code span at (22:0,22 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..7f968fcc3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..23)::23 - [@{<span foo='@@def' />}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupElement - [2..22)::20
+                                MarkupStartTag - [2..22)::20 - [<span foo='@@def' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..19)::12 - [ foo='@@def']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..18)::5
+                                            MarkupBlock - [13..15)::2
+                                                MarkupTextLiteral - [13..14)::1 - [@] - Gen<LitAttr:@(13:0,13)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupLiteralAttributeValue - [15..18)::3 - [def]
+                                                MarkupTextLiteral - [15..18)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[def];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [19..20)::1
+                                        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..2af0b84813
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [20] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Markup block at (16:0,16 [2] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (16:0,16 [2] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [12] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [20] )
+Code span at (22:0,22 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..931cd0b1e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..23)::23 - [@{<span foo='abc@@' />}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupElement - [2..22)::20
+                                MarkupStartTag - [2..22)::20 - [<span foo='abc@@' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..19)::12 - [ foo='abc@@']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..18)::5
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [abc]
+                                                MarkupTextLiteral - [13..16)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[abc];
+                                            MarkupBlock - [16..18)::2
+                                                MarkupTextLiteral - [16..17)::1 - [@] - Gen<LitAttr:@(16:0,16)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [19..20)::1
+                                        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..7af2be2c26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [25] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (16:0,16 [2] ) (Accepts:None) - Parent: Markup block at (16:0,16 [3] )
+Markup span at (18:0,18 [1] ) (Accepts:None) - Parent: Markup block at (16:0,16 [3] )
+Markup span at (19:0,19 [4] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (24:0,24 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [25] )
+Code span at (27:0,27 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..0e56c91bea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..28)::28 - [@{<span foo='abc @@ def' />}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpStatement - [0..28)::28
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..28)::27
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..27)::25
+                        MarkupBlock - [2..27)::25
+                            MarkupElement - [2..27)::25
+                                MarkupStartTag - [2..27)::25 - [<span foo='abc @@ def' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..24)::17 - [ foo='abc @@ def']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..23)::10
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [abc]
+                                                MarkupTextLiteral - [13..16)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[abc];
+                                            MarkupBlock - [16..19)::3
+                                                MarkupTextLiteral - [16..18)::2 - [ @] - Gen<LitAttr: @(16:0,16)> - SpanEditHandler;Accepts:None
+                                                    Whitespace;[ ];
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [18..19)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupLiteralAttributeValue - [19..23)::4 - [ def]
+                                                MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [20..23)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[def];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [24..25)::1
+                                        MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [27..27)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..391706d146
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [17] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [9] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (14:0,14 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [9] )
+Markup span at (16:0,16 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [17] )
+Code span at (19:0,19 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (19:0,19 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..aea355dd25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..20)::20 - [@{<span foo='@@' />}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..19)::17 - [<span foo='@@' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..16)::9 - [ foo='@@']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..15)::2
+                                            MarkupBlock - [13..15)::2
+                                                MarkupTextLiteral - [13..14)::1 - [@] - Gen<LitAttr:@(13:0,13)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [16..17)::1
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..26e0bdca06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [42] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [34] )
+Markup span at (13:0,13 [11] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [34] )
+Markup span at (24:0,24 [4] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [34] )
+Markup span at (28:0,28 [1] ) (Accepts:None) - Parent: Markup block at (28:0,28 [2] )
+Markup span at (29:0,29 [1] ) (Accepts:None) - Parent: Markup block at (28:0,28 [2] )
+Markup span at (30:0,30 [7] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [34] )
+Markup span at (37:0,37 [2] ) (Accepts:None) - Parent: Markup block at (37:0,37 [3] )
+Markup span at (39:0,39 [1] ) (Accepts:None) - Parent: Markup block at (37:0,37 [3] )
+Markup span at (40:0,40 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [34] )
+Markup span at (41:0,41 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [42] )
+Code span at (44:0,44 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [45] )
+MetaCode span at (44:0,44 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+Markup span at (45:0,45 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..440b6e0f7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..45)::45 - [@{<span foo='abc@def.com abc@@def.com @@' />}]
+    MarkupBlock - [0..45)::45
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..45)::45
+            CSharpStatement - [0..45)::45
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..45)::44
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..44)::42
+                        MarkupBlock - [2..44)::42
+                            MarkupElement - [2..44)::42
+                                MarkupStartTag - [2..44)::42 - [<span foo='abc@def.com abc@@def.com @@' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..41)::34 - [ foo='abc@def.com abc@@def.com @@']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..40)::27
+                                            MarkupLiteralAttributeValue - [13..24)::11 - [abc@def.com]
+                                                MarkupTextLiteral - [13..24)::11 - [abc@def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[abc@def.com];
+                                            MarkupLiteralAttributeValue - [24..28)::4 - [ abc]
+                                                MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [25..28)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[abc];
+                                            MarkupBlock - [28..30)::2
+                                                MarkupTextLiteral - [28..29)::1 - [@] - Gen<LitAttr:@(28:0,28)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [29..30)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupLiteralAttributeValue - [30..37)::7 - [def.com]
+                                                MarkupTextLiteral - [30..37)::7 - [def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[def.com];
+                                            MarkupBlock - [37..40)::3
+                                                MarkupTextLiteral - [37..39)::2 - [ @] - Gen<LitAttr: @(37:0,37)> - SpanEditHandler;Accepts:None
+                                                    Whitespace;[ ];
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [39..40)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [41..42)::1
+                                        MarkupTextLiteral - [41..42)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [44..44)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [45..45)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..bc10454e41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [118] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [118] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [118] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [115] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [107] )
+Markup span at (13:0,13 [32] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [107] )
+Markup span at (45:0,45 [1] ) (Accepts:None) - Parent: Markup block at (45:0,45 [2] )
+Markup span at (46:0,46 [1] ) (Accepts:None) - Parent: Markup block at (45:0,45 [2] )
+Markup span at (47:0,47 [66] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [107] )
+Markup span at (113:0,113 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [107] )
+Markup span at (114:0,114 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [115] )
+Code span at (117:0,117 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [118] )
+MetaCode span at (117:0,117 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [118] )
+Markup span at (118:0,118 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [118] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..071e88d493
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
@@ -0,0 +1,92 @@
+RazorDocument - [0..118)::118 - [@{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />}]
+    MarkupBlock - [0..118)::118
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..118)::118
+            CSharpStatement - [0..118)::118
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..118)::117
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..117)::115
+                        MarkupBlock - [2..117)::115
+                            MarkupElement - [2..117)::115
+                                MarkupStartTag - [2..117)::115 - [<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..114)::107 - [ foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"]
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..113)::100
+                                            MarkupLiteralAttributeValue - [13..45)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+]
+                                                MarkupTextLiteral - [13..45)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    ForwardSlash;[/];
+                                                    Text;[^];
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9];
+                                                    Bang;[!];
+                                                    Text;[#$%&];
+                                                    SingleQuote;['];
+                                                    Text;[*+\];
+                                                    ForwardSlash;[/];
+                                                    Equals;[=];
+                                                    QuestionMark;[?];
+                                                    Text;[^_`{|}~.-];
+                                                    RightBracket;[]];
+                                                    Text;[+];
+                                            MarkupBlock - [45..47)::2
+                                                MarkupTextLiteral - [45..46)::1 - [@] - Gen<LitAttr:@(45:0,45)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [46..47)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupLiteralAttributeValue - [47..113)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i]
+                                                MarkupTextLiteral - [47..113)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9];
+                                                    RightBracket;[]];
+                                                    Text;[(];
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9-];
+                                                    RightBracket;[]];
+                                                    Text;[*];
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9];
+                                                    RightBracket;[]];
+                                                    Text;[)];
+                                                    QuestionMark;[?];
+                                                    Text;[\.(];
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9];
+                                                    RightBracket;[]];
+                                                    Text;[(];
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9-];
+                                                    RightBracket;[]];
+                                                    Text;[*];
+                                                    LeftBracket;[[];
+                                                    Text;[a-z0-9];
+                                                    RightBracket;[]];
+                                                    Text;[)];
+                                                    QuestionMark;[?];
+                                                    Text;[)*$];
+                                                    ForwardSlash;[/];
+                                                    Text;[i];
+                                        MarkupTextLiteral - [113..114)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMiscAttributeContent - [114..115)::1
+                                        MarkupTextLiteral - [114..115)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [117..117)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [117..118)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [118..118)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..cac77c7065
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
@@ -0,0 +1,47 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [121] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [121] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [121] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [118] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [15] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (14:0,14 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (15:0,15 [6] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [6] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [6] )
+Code span at (17:0,17 [3] ) (Accepts:Any) - Parent: Expression block at (15:0,15 [6] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [6] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [15] )
+Markup span at (22:0,22 [6] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [28] )
+Transition span at (28:0,28 [1] ) (Accepts:None) - Parent: Expression block at (28:0,28 [6] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Expression block at (28:0,28 [6] )
+Code span at (30:0,30 [3] ) (Accepts:Any) - Parent: Expression block at (28:0,28 [6] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Expression block at (28:0,28 [6] )
+Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Markup block at (34:0,34 [2] )
+Markup span at (35:0,35 [1] ) (Accepts:None) - Parent: Markup block at (34:0,34 [2] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [13] )
+Transition span at (36:0,36 [1] ) (Accepts:None) - Parent: Expression block at (36:0,36 [13] )
+Code span at (37:0,37 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (36:0,36 [13] )
+Markup span at (49:0,49 [1] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [28] )
+Markup span at (50:0,50 [6] ) (Accepts:Any) - Parent: Markup block at (50:0,50 [22] )
+Transition span at (56:0,56 [1] ) (Accepts:None) - Parent: Expression block at (56:0,56 [13] )
+Code span at (57:0,57 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (56:0,56 [13] )
+Markup span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (69:0,69 [2] )
+Markup span at (70:0,70 [1] ) (Accepts:None) - Parent: Markup block at (69:0,69 [2] )
+Markup span at (71:0,71 [1] ) (Accepts:Any) - Parent: Markup block at (50:0,50 [22] )
+Markup span at (72:0,72 [6] ) (Accepts:Any) - Parent: Markup block at (72:0,72 [23] )
+Transition span at (78:0,78 [1] ) (Accepts:None) - Parent: Expression block at (78:0,78 [13] )
+Code span at (79:0,79 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (78:0,78 [13] )
+Markup span at (91:0,91 [2] ) (Accepts:None) - Parent: Markup block at (91:0,91 [3] )
+Markup span at (93:0,93 [1] ) (Accepts:None) - Parent: Markup block at (91:0,91 [3] )
+Markup span at (94:0,94 [1] ) (Accepts:Any) - Parent: Markup block at (72:0,72 [23] )
+Markup span at (95:0,95 [6] ) (Accepts:Any) - Parent: Markup block at (95:0,95 [22] )
+Markup span at (101:0,101 [1] ) (Accepts:None) - Parent: Markup block at (101:0,101 [2] )
+Markup span at (102:0,102 [1] ) (Accepts:None) - Parent: Markup block at (101:0,101 [2] )
+Markup span at (103:0,103 [0] ) (Accepts:Any) - Parent: Markup block at (103:0,103 [13] )
+Transition span at (103:0,103 [1] ) (Accepts:None) - Parent: Expression block at (103:0,103 [13] )
+Code span at (104:0,104 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (103:0,103 [13] )
+Markup span at (116:0,116 [1] ) (Accepts:Any) - Parent: Markup block at (95:0,95 [22] )
+Markup span at (117:0,117 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [118] )
+Code span at (120:0,120 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [121] )
+MetaCode span at (120:0,120 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [121] )
+Markup span at (121:0,121 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [121] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..06b8e19b9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
@@ -0,0 +1,195 @@
+RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}]
+    MarkupBlock - [0..121)::121
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..121)::121
+            CSharpStatement - [0..121)::121
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..121)::120
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..120)::118
+                        MarkupBlock - [2..120)::118
+                            MarkupElement - [2..120)::118
+                                MarkupStartTag - [2..120)::118 - [<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..22)::15 - [ foo='@@@(2+3)']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..21)::8
+                                            MarkupBlock - [13..15)::2
+                                                MarkupTextLiteral - [13..14)::1 - [@] - Gen<LitAttr:@(13:0,13)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupDynamicAttributeValue - [15..21)::6 - [@(2+3)]
+                                                GenericBlock - [15..21)::6
+                                                    MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Marker;[];
+                                                    CSharpCodeBlock - [15..21)::6
+                                                        CSharpExplicitExpression - [15..21)::6
+                                                            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpExplicitExpressionBody - [16..21)::5
+                                                                RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                    LeftParenthesis;[(];
+                                                                CSharpCodeBlock - [17..20)::3
+                                                                    CSharpExpressionLiteral - [17..20)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                                        IntegerLiteral;[2];
+                                                                        Plus;[+];
+                                                                        IntegerLiteral;[3];
+                                                                RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                    RightParenthesis;[)];
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [22..50)::28 - [ bar='@(2+3)@@@DateTime.Now']
+                                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [23..26)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bar];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [28..49)::21
+                                            MarkupDynamicAttributeValue - [28..34)::6 - [@(2+3)]
+                                                GenericBlock - [28..34)::6
+                                                    CSharpCodeBlock - [28..34)::6
+                                                        CSharpExplicitExpression - [28..34)::6
+                                                            CSharpTransition - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpExplicitExpressionBody - [29..34)::5
+                                                                RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                    LeftParenthesis;[(];
+                                                                CSharpCodeBlock - [30..33)::3
+                                                                    CSharpExpressionLiteral - [30..33)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                                        IntegerLiteral;[2];
+                                                                        Plus;[+];
+                                                                        IntegerLiteral;[3];
+                                                                RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                    RightParenthesis;[)];
+                                            MarkupBlock - [34..36)::2
+                                                MarkupTextLiteral - [34..35)::1 - [@] - Gen<LitAttr:@(34:0,34)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [35..36)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupDynamicAttributeValue - [36..49)::13 - [@DateTime.Now]
+                                                GenericBlock - [36..49)::13
+                                                    MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Marker;[];
+                                                    CSharpCodeBlock - [36..49)::13
+                                                        CSharpImplicitExpression - [36..49)::13
+                                                            CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [37..49)::12
+                                                                CSharpCodeBlock - [37..49)::12
+                                                                    CSharpExpressionLiteral - [37..49)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                        MarkupTextLiteral - [49..50)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [50..72)::22 - [ baz='@DateTime.Now@@']
+                                        MarkupTextLiteral - [50..51)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [51..54)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[baz];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [56..71)::15
+                                            MarkupDynamicAttributeValue - [56..69)::13 - [@DateTime.Now]
+                                                GenericBlock - [56..69)::13
+                                                    CSharpCodeBlock - [56..69)::13
+                                                        CSharpImplicitExpression - [56..69)::13
+                                                            CSharpTransition - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [57..69)::12
+                                                                CSharpCodeBlock - [57..69)::12
+                                                                    CSharpExpressionLiteral - [57..69)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupBlock - [69..71)::2
+                                                MarkupTextLiteral - [69..70)::1 - [@] - Gen<LitAttr:@(69:0,69)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [70..71)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [71..72)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [72..95)::23 - [ bat='@DateTime.Now @@']
+                                        MarkupTextLiteral - [72..73)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [73..76)::3 - [bat] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bat];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [77..78)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [78..94)::16
+                                            MarkupDynamicAttributeValue - [78..91)::13 - [@DateTime.Now]
+                                                GenericBlock - [78..91)::13
+                                                    CSharpCodeBlock - [78..91)::13
+                                                        CSharpImplicitExpression - [78..91)::13
+                                                            CSharpTransition - [78..79)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [79..91)::12
+                                                                CSharpCodeBlock - [79..91)::12
+                                                                    CSharpExpressionLiteral - [79..91)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupBlock - [91..94)::3
+                                                MarkupTextLiteral - [91..93)::2 - [ @] - Gen<LitAttr: @(91:0,91)> - SpanEditHandler;Accepts:None
+                                                    Whitespace;[ ];
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [93..94)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [94..95)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [95..117)::22 - [ zoo='@@@DateTime.Now']
+                                        MarkupTextLiteral - [95..96)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [96..99)::3 - [zoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[zoo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [100..101)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [101..116)::15
+                                            MarkupBlock - [101..103)::2
+                                                MarkupTextLiteral - [101..102)::1 - [@] - Gen<LitAttr:@(101:0,101)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [102..103)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupDynamicAttributeValue - [103..116)::13 - [@DateTime.Now]
+                                                GenericBlock - [103..116)::13
+                                                    MarkupTextLiteral - [103..103)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Marker;[];
+                                                    CSharpCodeBlock - [103..116)::13
+                                                        CSharpImplicitExpression - [103..116)::13
+                                                            CSharpTransition - [103..104)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [104..116)::12
+                                                                CSharpCodeBlock - [104..116)::12
+                                                                    CSharpExpressionLiteral - [104..116)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                        MarkupTextLiteral - [116..117)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [117..118)::1
+                                        MarkupTextLiteral - [117..118)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [120..120)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [120..121)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [121..121)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.cspans.txt
new file mode 100644
index 0000000000..833ee8ad8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [13] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [8] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
+Markup span at (14:0,14 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt
new file mode 100644
index 0000000000..69a6b33a62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "span" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
new file mode 100644
index 0000000000..56adc1414b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..15)::15 - [@{<span foo='@@]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpStatement - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..15)::14
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..15)::13
+                            MarkupElement - [2..15)::13
+                                MarkupStartTag - [2..15)::13 - [<span foo='@@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..15)::8 - [ foo='@@]
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..15)::2
+                                            MarkupBlock - [13..15)::2
+                                                MarkupTextLiteral - [13..14)::1 - [@] - Gen<LitAttr:@(13:0,13)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [15..15)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
new file mode 100644
index 0000000000..00335db4a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [10] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [1] )
+Code span at (14:0,14 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:0,13 [1] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [2] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [1] )
+Code span at (16:0,16 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [1] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [10] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [18] )
+Code span at (20:0,20 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt
new file mode 100644
index 0000000000..4f60a724cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt
@@ -0,0 +1,2 @@
+(1,15): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
+(1,17): Error RZ1005: "' />}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
new file mode 100644
index 0000000000..c724b78d64
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..21)::21 - [@{<span foo='@ @' />}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..20)::18 - [<span foo='@ @' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..17)::10 - [ foo='@ @']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..16)::3
+                                            MarkupDynamicAttributeValue - [13..14)::1 - [@]
+                                                GenericBlock - [13..14)::1
+                                                    CSharpCodeBlock - [13..14)::1
+                                                        CSharpImplicitExpression - [13..14)::1
+                                                            CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [14..14)::0
+                                                                CSharpCodeBlock - [14..14)::0
+                                                                    CSharpExpressionLiteral - [14..14)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Marker;[];
+                                            MarkupDynamicAttributeValue - [14..16)::2 - [ @]
+                                                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                GenericBlock - [15..16)::1
+                                                    CSharpCodeBlock - [15..16)::1
+                                                        CSharpImplicitExpression - [15..16)::1
+                                                            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [16..16)::0
+                                                                CSharpCodeBlock - [16..16)::0
+                                                                    CSharpExpressionLiteral - [16..16)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Marker;[];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [17..18)::1
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [20..20)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.cspans.txt
new file mode 100644
index 0000000000..e0217056a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+Code span at (1:0,1 [17] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
+Markup span at (18:1,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt
new file mode 100644
index 0000000000..813ee4da1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..20)::20 - [@using          LFLF]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..18)::17 - [using          LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[using];
+                Whitespace;[          ];
+                NewLine;[LF];
+        MarkupTextLiteral - [18..20)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.cspans.txt
new file mode 100644
index 0000000000..d1b305fbf1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:1,0 [4] ) (Accepts:Any) - Parent: Tag block at (8:1,0 [4] )
+Transition span at (12:1,4 [1] ) (Accepts:None) - Parent: Expression block at (12:1,4 [14] )
+Code span at (13:1,5 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:1,4 [14] )
+Markup span at (26:1,18 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Markup span at (27:1,19 [5] ) (Accepts:Any) - Parent: Tag block at (27:1,19 [5] )
+Markup span at (32:1,24 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.diag.txt
new file mode 100644
index 0000000000..6cb7c82385
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt
new file mode 100644
index 0000000000..e576a17c44
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..34)::34 - [@Href(LF<h1>@Html.Foo(Bar);</h1>LF]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [Href(LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Href];
+                            LeftParenthesis;[(];
+                            NewLine;[LF];
+        MarkupElement - [8..32)::24
+            MarkupStartTag - [8..12)::4 - [<h1>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[h1];
+                CloseAngle;[>];
+            CSharpCodeBlock - [12..26)::14
+                CSharpImplicitExpression - [12..26)::14
+                    CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [13..26)::13
+                        CSharpCodeBlock - [13..26)::13
+                            CSharpExpressionLiteral - [13..26)::13 - [Html.Foo(Bar)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[Html];
+                                Dot;[.];
+                                Identifier;[Foo];
+                                LeftParenthesis;[(];
+                                Identifier;[Bar];
+                                RightParenthesis;[)];
+            MarkupTextLiteral - [26..27)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[;];
+            MarkupEndTag - [27..32)::5 - [</h1>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[h1];
+                CloseAngle;[>];
+        MarkupTextLiteral - [32..34)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.cspans.txt
new file mode 100644
index 0000000000..1ee270f4e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [47] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [47] )
+Code span at (2:0,2 [44] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [47] )
+MetaCode span at (46:0,46 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [47] )
+Markup span at (47:0,47 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt
new file mode 100644
index 0000000000..5825be2c7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..47)::47 - [@(Request["description"] ?? @photo.Description)]
+    MarkupBlock - [0..47)::47
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..47)::47
+            CSharpExplicitExpression - [0..47)::47
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..47)::46
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..46)::44
+                        CSharpExpressionLiteral - [2..46)::44 - [Request["description"] ?? @photo.Description] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Identifier;[Request];
+                            LeftBracket;[[];
+                            StringLiteral;["description"];
+                            RightBracket;[]];
+                            Whitespace;[ ];
+                            NullCoalesce;[??];
+                            Whitespace;[ ];
+                            Transition;[@];
+                            Identifier;[photo];
+                            Dot;[.];
+                            Identifier;[Description];
+                    RazorMetaCode - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt
new file mode 100644
index 0000000000..c8c6ac23dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [65] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [65] )
+Code span at (1:0,1 [43] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [65] )
+Markup span at (44:2,4 [3] ) (Accepts:None) - Parent: Tag block at (44:2,4 [3] )
+Markup span at (47:2,7 [7] ) (Accepts:Any) - Parent: Markup block at (44:2,4 [20] )
+Transition span at (54:2,14 [1] ) (Accepts:None) - Parent: Expression block at (54:2,14 [4] )
+Code span at (55:2,15 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (54:2,14 [4] )
+Markup span at (58:2,18 [4] ) (Accepts:None) - Parent: Tag block at (58:2,18 [4] )
+Markup span at (62:2,22 [2] ) (Accepts:None) - Parent: Markup block at (44:2,4 [20] )
+Code span at (64:3,0 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [65] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.diag.txt
new file mode 100644
index 0000000000..749c29cf56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.diag.txt
@@ -0,0 +1 @@
+(2,15): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
new file mode 100644
index 0000000000..57d38b45fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..65)::65 - [@if(foo) {LF    var foo = "foo bar bazLF    <p>Foo is @foo</p>LF}]
+    MarkupBlock - [0..65)::65
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..65)::65
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..44)::43 - [if(foo) {LF    var foo = "foo bar bazLF    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["foo bar baz];RZ1000(26:1,14 [1] )
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupBlock - [44..64)::20
+                MarkupElement - [44..62)::18
+                    MarkupStartTag - [44..47)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [47..54)::7 - [Foo is ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                        Whitespace;[ ];
+                        Text;[is];
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [54..58)::4
+                        CSharpImplicitExpression - [54..58)::4
+                            CSharpTransition - [54..55)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [55..58)::3
+                                CSharpCodeBlock - [55..58)::3
+                                    CSharpExpressionLiteral - [55..58)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[foo];
+                    MarkupEndTag - [58..62)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [62..64)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [64..65)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.cspans.txt
new file mode 100644
index 0000000000..7faf3199b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Code span at (2:0,2 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (16:0,16 [6] ) (Accepts:None) - Parent: Tag block at (16:0,16 [6] )
+Markup span at (22:0,22 [7] ) (Accepts:None) - Parent: Tag block at (22:0,22 [7] )
+Code span at (29:0,29 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.diag.txt
new file mode 100644
index 0000000000..b356fede3b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.diag.txt
@@ -0,0 +1 @@
+(1,16): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
new file mode 100644
index 0000000000..96792af995
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..30)::30 - [@{string.Format(<html></html>}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..29)::27
+                        CSharpStatementLiteral - [2..16)::14 - [string.Format(] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Keyword;[string];
+                            Dot;[.];
+                            Identifier;[Format];
+                            LeftParenthesis;[(];
+                        MarkupBlock - [16..29)::13
+                            MarkupElement - [16..29)::13
+                                MarkupStartTag - [16..22)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [22..29)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [29..29)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt
new file mode 100644
index 0000000000..d06a3a71b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.diag.txt
new file mode 100644
index 0000000000..0179da5b14
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1005: """ is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt
new file mode 100644
index 0000000000..585e50aec9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..2)::2 - [@"]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..2)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            DoubleQuote;["];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.cspans.txt
new file mode 100644
index 0000000000..4607de5bf4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:0,10 [18] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt
new file mode 100644
index 0000000000..37ec018710
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt
@@ -0,0 +1,10 @@
+(1,9): Error RZ1008: Expected a "{" but found a ")".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+
+@if(isLoggedIn)
+    <p>Hello, @user</p>
+
+Instead, wrap the contents of the block in "{}":
+
+@if(isLoggedIn) {
+    <p>Hello, @user</p>
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt
new file mode 100644
index 0000000000..ee3891e335
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..28)::28 - [@if(foo)) { var bar = foo; }]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..10)::9 - [if(foo)) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+        MarkupTextLiteral - [10..28)::18 - [{ var bar = foo; }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[bar];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[foo;];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.cspans.txt
new file mode 100644
index 0000000000..5f99762a70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [2] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [2] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt
new file mode 100644
index 0000000000..4a57c97b59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..2)::2 - [@{]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..2)::2
+            CSharpStatement - [0..2)::2
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..2)::1
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..2)::0
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            Marker;[];
+                    RazorMetaCode - [2..2)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.cspans.txt
new file mode 100644
index 0000000000..48059498d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [3] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [3] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [3] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [3] )
+MetaCode span at (2:0,2 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [3] )
+Markup span at (3:0,3 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt
new file mode 100644
index 0000000000..0c76b47c33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..3)::3 - [@{}]
+    MarkupBlock - [0..3)::3
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..3)::3
+            CSharpStatement - [0..3)::3
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..3)::2
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..2)::0
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                    RazorMetaCode - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [3..3)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt
new file mode 100644
index 0000000000..31bcda0391
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.diag.txt
new file mode 100644
index 0000000000..84fe5838bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1005: "!" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt
new file mode 100644
index 0000000000..80bf05811c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..4)::4 - [@!!!]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..4)::3 - [!!!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
+            Bang;[!];
+            Bang;[!];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt
new file mode 100644
index 0000000000..609209cd3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] )
+Transition span at (8:1,4 [1] ) (Accepts:None) - Parent: Expression block at (8:1,4 [1] )
+Code span at (9:1,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [1] )
+Code span at (9:1,5 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt
new file mode 100644
index 0000000000..5611de1939
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt
@@ -0,0 +1,2 @@
+(2,6): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt
new file mode 100644
index 0000000000..7d98cc9690
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..9)::9 - [@{LF    @]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpStatement - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..9)::8
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..9)::1
+                            CSharpImplicitExpression - [8..9)::1
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..9)::0
+                                    CSharpCodeBlock - [9..9)::0
+                                        CSharpExpressionLiteral - [9..9)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Marker;[];
+                        CSharpStatementLiteral - [9..9)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [9..9)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt
new file mode 100644
index 0000000000..ab0be729ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [3] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.diag.txt
new file mode 100644
index 0000000000..1a4e7725a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt
new file mode 100644
index 0000000000..178b2eab31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..3)::3 - [@LF]
+    MarkupBlock - [0..3)::3
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..3)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt
new file mode 100644
index 0000000000..4b4aec9b7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+Transition span at (8:1,4 [1] ) (Accepts:None) - Parent: Expression block at (8:1,4 [1] )
+Code span at (9:1,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [1] )
+Code span at (9:1,5 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.diag.txt
new file mode 100644
index 0000000000..a8f6dc0930
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.diag.txt
@@ -0,0 +1 @@
+(2,6): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt
new file mode 100644
index 0000000000..5dbe63612f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..17)::17 - [@{LF    @   {}LF}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..9)::1
+                            CSharpImplicitExpression - [8..9)::1
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..9)::0
+                                    CSharpCodeBlock - [9..9)::0
+                                        CSharpExpressionLiteral - [9..9)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Marker;[];
+                        CSharpStatementLiteral - [9..16)::7 - [   {}LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[   ];
+                            LeftBrace;[{];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.cspans.txt
new file mode 100644
index 0000000000..448f2a72aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [13] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Markup block at (10:0,10 [13] )
+Markup span at (12:0,12 [3] ) (Accepts:None) - Parent: Tag block at (12:0,12 [3] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [13] )
+Markup span at (18:0,18 [4] ) (Accepts:None) - Parent: Tag block at (18:0,18 [4] )
+Markup span at (22:0,22 [1] ) (Accepts:None) - Parent: Markup block at (10:0,10 [13] )
+Code span at (23:0,23 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.diag.txt
new file mode 100644
index 0000000000..ef1b3502c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.diag.txt
@@ -0,0 +1,5 @@
+(1,12): Error RZ1009: The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
+
+@if(isLoggedIn) {
+    <p>Hello, @user!</p>
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
new file mode 100644
index 0000000000..a60288cf5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..24)::24 - [@if(foo) { @<p>Bar</p> }]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..10)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [10..23)::13
+                MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                MarkupElement - [12..22)::10
+                    MarkupStartTag - [12..15)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [15..18)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupEndTag - [18..22)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [23..24)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..c989a85034
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [71] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [71] )
+Code span at (1:0,1 [70] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [71] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..f6ab309156
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1006: The catch block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..50d37af8cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..71)::71 - [@try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..71)::71
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..71)::71
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..71)::70 - [try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..229a40e9e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [55] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [55] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [55] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [55] )
+Code span at (12:0,12 [43] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..5cadb1566b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..55)::55 - [@functions { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            RazorDirective - [0..55)::55 - Directive:{functions;CodeBlock;Unrestricted} [RZ1006(11:0,11 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..55)::54
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..55)::45
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [12..55)::43
+                            CSharpStatementLiteral - [12..55)::43 - [ var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                                Identifier;[var];
+                                Whitespace;[ ];
+                                Identifier;[foo];
+                                Whitespace;[ ];
+                                Assign;[=];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Identifier;[foo];
+                                Whitespace;[ ];
+                                NotEqual;[!=];
+                                Whitespace;[ ];
+                                Keyword;[null];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                LeftBrace;[{];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                                RightBrace;[}];
+                                Whitespace;[ ];
+                        RazorMetaCode - [55..55)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..0e6427508a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+Code span at (1:0,1 [47] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [48] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..3edd08db12
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The do block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..f7c8702df0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..48)::48 - [@do { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..48)::48
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..48)::48
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..48)::47 - [do { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..2812db06fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [69] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [69] )
+Code span at (1:0,1 [68] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [69] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..1304e018e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,21): Error RZ1006: The else block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..4d6a99b223
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..69)::69 - [@if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..69)::69
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..69)::69
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..69)::68 - [if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..a0e62028ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [72] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [72] )
+Code span at (1:0,1 [71] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [72] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..d936a1e08f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,21): Error RZ1006: The else if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..bea3035aeb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..72)::72 - [@if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..72)::72
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..72)::72
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..72)::71 - [if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..7ce34a75dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [45] )
+Code span at (2:0,2 [43] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..9f3ebb874b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..45)::45 - [@{ var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..45)::45
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..45)::45
+            CSharpStatement - [0..45)::45
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..45)::44
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        CSharpStatementLiteral - [2..45)::43 - [ var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            NotEqual;[!=];
+                            Whitespace;[ ];
+                            Keyword;[null];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [45..45)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..efb98ce332
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Code span at (1:0,1 [67] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [68] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..c4ee5afb66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1006: The finally block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..7ce1b48905
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..68)::68 - [@try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..68)::68
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..68)::68
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..68)::67 - [try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[baz];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..5c2cb28925
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [54] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..2b762aec63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The for block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..205adf9089
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..55)::55 - [@for (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..55)::54 - [for (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[for];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..1c6ed575ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [59] )
+Code span at (1:0,1 [58] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [59] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..06bf6f2dca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The foreach block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..0572c5b99d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..59)::59 - [@foreach (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..59)::59
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..59)::58 - [foreach (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..c6237e0e8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [54] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [54] )
+Code span at (1:0,1 [53] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [54] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..2742101ffc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..aa89143967
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..54)::54 - [@if (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..54)::54
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..54)::54
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..54)::53 - [if (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..3ac1ad9b09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Code span at (1:0,1 [55] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..08db663674
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The lock block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..759e96286c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..56)::56 - [@lock (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..56)::56
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..56)::55 - [lock (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[lock];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..e601a12186
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [58] )
+Code span at (1:0,1 [57] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [58] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..65ca04a2b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The switch block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..a54583efbf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..58)::58 - [@switch (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..58)::58
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..58)::58
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..58)::57 - [switch (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[switch];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..ee11c5c511
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Code span at (1:0,1 [48] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..1b9bc8df7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The try block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..7c5b8b4d7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..49)::49 - [@try { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..49)::48 - [try { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..160fbdc681
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Code span at (1:0,1 [56] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [57] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..1a15e5d491
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The using block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..82d612293e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..57)::57 - [@using (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..57)::57
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..57)::57
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..57)::56 - [using (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[using];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.cspans.txt
new file mode 100644
index 0000000000..160fbdc681
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Code span at (1:0,1 [56] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [57] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..8eb38d8911
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The while block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt
new file mode 100644
index 0000000000..fc413e23b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..57)::57 - [@while (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    MarkupBlock - [0..57)::57
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..57)::57
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..57)::56 - [while (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[while];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                NotEqual;[!=];
+                Whitespace;[ ];
+                Keyword;[null];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.cspans.txt
new file mode 100644
index 0000000000..ab58e6a89e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [59] )
+Code span at (1:0,1 [8] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [59] )
+Markup span at (9:0,9 [3] ) (Accepts:None) - Parent: Tag block at (9:0,9 [3] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (9:0,9 [11] )
+Markup span at (15:0,15 [4] ) (Accepts:None) - Parent: Tag block at (15:0,15 [4] )
+Markup span at (19:0,19 [1] ) (Accepts:None) - Parent: Markup block at (9:0,9 [11] )
+Code span at (20:0,20 [13] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [59] )
+Markup span at (33:0,33 [3] ) (Accepts:None) - Parent: Tag block at (33:0,33 [3] )
+Markup span at (36:0,36 [3] ) (Accepts:Any) - Parent: Markup block at (33:0,33 [11] )
+Markup span at (39:0,39 [4] ) (Accepts:None) - Parent: Tag block at (39:0,39 [4] )
+Markup span at (43:0,43 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33 [11] )
+Code span at (44:0,44 [5] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [59] )
+Markup span at (49:0,49 [3] ) (Accepts:None) - Parent: Tag block at (49:0,49 [3] )
+Markup span at (52:0,52 [3] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [10] )
+Markup span at (55:0,55 [4] ) (Accepts:None) - Parent: Tag block at (55:0,55 [4] )
+Code span at (59:0,59 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [59] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt
new file mode 100644
index 0000000000..afc72ddf95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt
@@ -0,0 +1,30 @@
+(1,10): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+
+@if(isLoggedIn)
+    <p>Hello, @user</p>
+
+Instead, wrap the contents of the block in "{}":
+
+@if(isLoggedIn) {
+    <p>Hello, @user</p>
+}
+(1,34): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+
+@if(isLoggedIn)
+    <p>Hello, @user</p>
+
+Instead, wrap the contents of the block in "{}":
+
+@if(isLoggedIn) {
+    <p>Hello, @user</p>
+}
+(1,50): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+
+@if(isLoggedIn)
+    <p>Hello, @user</p>
+
+Instead, wrap the contents of the block in "{}":
+
+@if(isLoggedIn) {
+    <p>Hello, @user</p>
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
new file mode 100644
index 0000000000..8d4a69e823
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
@@ -0,0 +1,69 @@
+RazorDocument - [0..59)::59 - [@if(foo) <p>Bar</p> else if(bar) <p>Baz</p> else <p>Boz</p>]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..59)::59
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..9)::8 - [if(foo) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+            MarkupBlock - [9..20)::11
+                MarkupElement - [9..19)::10
+                    MarkupStartTag - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [12..15)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupEndTag - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [20..33)::13 - [else if(bar) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+            MarkupBlock - [33..44)::11
+                MarkupElement - [33..43)::10
+                    MarkupStartTag - [33..36)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [36..39)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+                    MarkupEndTag - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [44..49)::5 - [else ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[else];
+                Whitespace;[ ];
+            MarkupBlock - [49..59)::10
+                MarkupElement - [49..59)::10
+                    MarkupStartTag - [49..52)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [52..55)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Boz];
+                    MarkupEndTag - [55..59)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            CSharpStatementLiteral - [59..59)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.cspans.txt
new file mode 100644
index 0000000000..326a340872
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Code span at (1:0,1 [11] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (12:1,6 [1] ) (Accepts:Any) - Parent: Markup block at (12:1,6 [12] )
+Markup span at (13:1,7 [3] ) (Accepts:None) - Parent: Tag block at (13:1,7 [3] )
+Markup span at (16:1,10 [3] ) (Accepts:Any) - Parent: Markup block at (12:1,6 [12] )
+Markup span at (19:1,13 [4] ) (Accepts:None) - Parent: Tag block at (19:1,13 [4] )
+Markup span at (23:1,17 [1] ) (Accepts:None) - Parent: Markup block at (12:1,6 [12] )
+Code span at (24:1,18 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:1,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.diag.txt
new file mode 100644
index 0000000000..a08a836e65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
new file mode 100644
index 0000000000..15e925d411
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..25)::25 - [@if(LFelse { <p>Foo</p> }]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..12)::11 - [if(LFelse {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                NewLine;[LF];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [12..24)::12
+                MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [13..23)::10
+                    MarkupStartTag - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [19..23)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [24..25)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.cspans.txt
new file mode 100644
index 0000000000..ac4d17eea7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [23] )
+Code span at (1:0,1 [22] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.diag.txt
new file mode 100644
index 0000000000..5df09fd668
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt
new file mode 100644
index 0000000000..aaccbd8bc2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..23)::23 - [@Foo[Bar[Baz]LFBizLFBoz]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpImplicitExpression - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..23)::22
+                    CSharpCodeBlock - [1..23)::22
+                        CSharpExpressionLiteral - [1..23)::22 - [Foo[Bar[Baz]LFBizLFBoz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Foo];
+                            LeftBracket;[[];
+                            Identifier;[Bar];
+                            LeftBracket;[[];
+                            Identifier;[Baz];
+                            RightBracket;[]];
+                            NewLine;[LF];
+                            Identifier;[Biz];
+                            NewLine;[LF];
+                            Identifier;[Boz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.cspans.txt
new file mode 100644
index 0000000000..65434a2d4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+Code span at (2:0,2 [12] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.diag.txt
new file mode 100644
index 0000000000..0b063402e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt
new file mode 100644
index 0000000000..1780ed95e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..14)::14 - [@(foo barLFbaz]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpExplicitExpression - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..14)::13
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..14)::12
+                        CSharpExpressionLiteral - [2..14)::12 - [foo barLFbaz] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            NewLine;[LF];
+                            Identifier;[baz];
+                    RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightParenthesis;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.cspans.txt
new file mode 100644
index 0000000000..ac4d17eea7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [23] )
+Code span at (1:0,1 [22] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.diag.txt
new file mode 100644
index 0000000000..ade6c85b25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt
new file mode 100644
index 0000000000..13233f5339
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..23)::23 - [@Foo(Bar(Baz)LFBizLFBoz]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpImplicitExpression - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..23)::22
+                    CSharpCodeBlock - [1..23)::22
+                        CSharpExpressionLiteral - [1..23)::22 - [Foo(Bar(Baz)LFBizLFBoz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Foo];
+                            LeftParenthesis;[(];
+                            Identifier;[Bar];
+                            LeftParenthesis;[(];
+                            Identifier;[Baz];
+                            RightParenthesis;[)];
+                            NewLine;[LF];
+                            Identifier;[Biz];
+                            NewLine;[LF];
+                            Identifier;[Boz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.cspans.txt
new file mode 100644
index 0000000000..fb4c14a8e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [20] )
+Markup span at (20:2,0 [3] ) (Accepts:Any) - Parent: Tag block at (20:2,0 [3] )
+Markup span at (23:2,3 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Markup span at (30:4,0 [4] ) (Accepts:Any) - Parent: Tag block at (30:4,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.diag.txt
new file mode 100644
index 0000000000..5df09fd668
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt
new file mode 100644
index 0000000000..d1f2934008
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..34)::34 - [@Foo[Bar[Baz]LFBizLF<b>LFBozLF</b>]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpImplicitExpression - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..20)::19
+                    CSharpCodeBlock - [1..20)::19
+                        CSharpExpressionLiteral - [1..20)::19 - [Foo[Bar[Baz]LFBizLF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Foo];
+                            LeftBracket;[[];
+                            Identifier;[Bar];
+                            LeftBracket;[[];
+                            Identifier;[Baz];
+                            RightBracket;[]];
+                            NewLine;[LF];
+                            Identifier;[Biz];
+                            NewLine;[LF];
+        MarkupElement - [20..34)::14
+            MarkupStartTag - [20..23)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[b];
+                CloseAngle;[>];
+            MarkupTextLiteral - [23..30)::7 - [LFBozLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Text;[Boz];
+                NewLine;[LF];
+            MarkupEndTag - [30..34)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[b];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.cspans.txt
new file mode 100644
index 0000000000..e7181851fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [11] )
+Code span at (2:0,2 [9] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [11] )
+Markup span at (11:1,0 [6] ) (Accepts:Any) - Parent: Tag block at (11:1,0 [6] )
+Markup span at (17:1,6 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (24:3,0 [6] ) (Accepts:Any) - Parent: Tag block at (24:3,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.diag.txt
new file mode 100644
index 0000000000..0b063402e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt
new file mode 100644
index 0000000000..0698d6ddec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..30)::30 - [@(foo barLF<html>LFbazLF</html]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpExplicitExpression - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..11)::9
+                        CSharpExpressionLiteral - [2..11)::9 - [foo barLF] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            NewLine;[LF];
+                    RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightParenthesis;[<Missing>];
+        MarkupElement - [11..30)::19
+            MarkupStartTag - [11..17)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
+            MarkupTextLiteral - [17..24)::7 - [LFbazLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Text;[baz];
+                NewLine;[LF];
+            MarkupEndTag - [24..30)::6 - [</html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[html];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.cspans.txt
new file mode 100644
index 0000000000..0d8a457d26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [20] )
+Markup span at (20:2,0 [6] ) (Accepts:Any) - Parent: Tag block at (20:2,0 [6] )
+Markup span at (26:2,6 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Markup span at (33:4,0 [7] ) (Accepts:Any) - Parent: Tag block at (33:4,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.diag.txt
new file mode 100644
index 0000000000..ade6c85b25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt
new file mode 100644
index 0000000000..bb1196c88e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..40)::40 - [@Foo(Bar(Baz)LFBizLF<html>LFBozLF</html>]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpImplicitExpression - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..20)::19
+                    CSharpCodeBlock - [1..20)::19
+                        CSharpExpressionLiteral - [1..20)::19 - [Foo(Bar(Baz)LFBizLF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Foo];
+                            LeftParenthesis;[(];
+                            Identifier;[Bar];
+                            LeftParenthesis;[(];
+                            Identifier;[Baz];
+                            RightParenthesis;[)];
+                            NewLine;[LF];
+                            Identifier;[Biz];
+                            NewLine;[LF];
+        MarkupElement - [20..40)::20
+            MarkupStartTag - [20..26)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
+            MarkupTextLiteral - [26..33)::7 - [LFBozLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Text;[Boz];
+                NewLine;[LF];
+            MarkupEndTag - [33..40)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
new file mode 100644
index 0000000000..6e9d765553
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+Code span at (1:0,1 [17] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
+Markup span at (18:1,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
new file mode 100644
index 0000000000..a40df1a410
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
new file mode 100644
index 0000000000..6e28bbcdf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..21)::21 - [@foreach(foo barLFbaz]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..18)::17 - [foreach(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Identifier;[bar];
+                NewLine;[LF];
+        MarkupTextLiteral - [18..21)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
new file mode 100644
index 0000000000..9ca26d65c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [13] )
+Code span at (1:0,1 [12] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [13] )
+Markup span at (13:1,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
new file mode 100644
index 0000000000..a08a836e65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
new file mode 100644
index 0000000000..581e95bb66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..16)::16 - [@if(foo barLFbaz]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..13)::12 - [if(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Identifier;[bar];
+                NewLine;[LF];
+        MarkupTextLiteral - [13..16)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.cspans.txt
new file mode 100644
index 0000000000..451037e71b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Code span at (1:0,1 [41] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.diag.txt
new file mode 100644
index 0000000000..73d5e27b67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.diag.txt
@@ -0,0 +1 @@
+(2,13): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt
new file mode 100644
index 0000000000..272bf0ce6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..42)::42 - [@if(foo) {LF    var p = "foo bar bazLF;LF}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..42)::41 - [if(foo) {LF    var p = "foo bar bazLF;LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[p];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["foo bar baz];RZ1000(24:1,12 [1] )
+                NewLine;[LF];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.cspans.txt
new file mode 100644
index 0000000000..70b420119b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Code span at (1:0,1 [45] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt
new file mode 100644
index 0000000000..da5c70dd69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt
@@ -0,0 +1,2 @@
+(1,22): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+(1,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt
new file mode 100644
index 0000000000..2116937472
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..46)::46 - [@if(foo) { var foo = "blah blah blah blah blah]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..46)::45 - [if(foo) { var foo = "blah blah blah blah blah] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["blah blah blah blah blah];RZ1000(21:0,21 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
new file mode 100644
index 0000000000..baf2c5c1f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Code span at (1:0,1 [15] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (16:1,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
new file mode 100644
index 0000000000..a8733967de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
new file mode 100644
index 0000000000..2d8984304f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..19)::19 - [@using(foo barLFbaz]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..16)::15 - [using(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[using];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Identifier;[bar];
+                NewLine;[LF];
+        MarkupTextLiteral - [16..19)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.cspans.txt
new file mode 100644
index 0000000000..cd8e624ee1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [61] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [61] )
+Code span at (1:0,1 [60] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [61] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt
new file mode 100644
index 0000000000..da5c70dd69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt
@@ -0,0 +1,2 @@
+(1,22): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+(1,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt
new file mode 100644
index 0000000000..67afb3874b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..61)::61 - [@if(foo) { var foo = @"blah LFblah; LF<p>Foo</p>LFblah LFblah]
+    MarkupBlock - [0..61)::61
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..61)::61
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..61)::60 - [if(foo) { var foo = @"blah LFblah; LF<p>Foo</p>LFblah LFblah] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;[@"blah LFblah; LF<p>Foo</p>LFblah LFblah];RZ1000(21:0,21 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
new file mode 100644
index 0000000000..afd9a6256e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (1:0,1 [22] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:1,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
new file mode 100644
index 0000000000..0d2c452b13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
new file mode 100644
index 0000000000..01f031ed08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..26)::26 - [@do { } while(foo barLFbaz]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..23)::22 - [do { } while(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Identifier;[bar];
+                NewLine;[LF];
+        MarkupTextLiteral - [23..26)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt
new file mode 100644
index 0000000000..e6cc0f0ab4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+Code span at (1:0,1 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [7] )
+Markup span at (7:0,7 [14] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.diag.txt
new file mode 100644
index 0000000000..dafdc8f2e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1002: The helper directive is not supported.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt
new file mode 100644
index 0000000000..2edf3b29c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..21)::21 - [@helper fooHelper { }]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpImplicitExpression - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..7)::6
+                    CSharpCodeBlock - [1..7)::6
+                        CSharpExpressionLiteral - [1..7)::6 - [helper] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[helper];
+        MarkupTextLiteral - [7..21)::14 - [ fooHelper { }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[fooHelper];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.cspans.txt
new file mode 100644
index 0000000000..c9fe98a849
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
+Transition span at (6:0,6 [1] ) (Accepts:None) - Parent: Statement block at (6:0,6 [3] )
+MetaCode span at (7:0,7 [1] ) (Accepts:None) - Parent: Statement block at (6:0,6 [3] )
+Code span at (8:0,8 [0] ) (Accepts:Any) - Parent: Statement block at (6:0,6 [3] )
+MetaCode span at (8:0,8 [1] ) (Accepts:None) - Parent: Statement block at (6:0,6 [3] )
+Code span at (9:0,9 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.diag.txt
new file mode 100644
index 0000000000..302b641580
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ1010: Unexpected "{" after "@" character. Once inside the body of a code block (@if {}, @{}, etc.) you do not need to use "@{" to switch to code.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt
new file mode 100644
index 0000000000..7b55422dd6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..11)::11 - [@if { @{} }]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..6)::5 - [if { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [6..9)::3
+                CSharpStatement - [6..9)::3
+                    CSharpTransition - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpStatementBody - [7..9)::2
+                        RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [8..8)::0
+                            CSharpStatementLiteral - [8..8)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                Marker;[];
+                        RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+            CSharpStatementLiteral - [9..11)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..a09a5507a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [9] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [9] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [9] )
+MetaCode span at (8:0,8 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [9] )
+Markup span at (9:0,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..b32100887b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..9)::9 - [@("\"\"")]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpExplicitExpression - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..9)::8
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..8)::6
+                        CSharpExpressionLiteral - [2..8)::6 - ["\"\""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;["\"\""];
+                    RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [9..9)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..b867104f46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (2:0,2 [7] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [10] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..4e2a0d3ee8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..10)::10 - [@(@"""""")]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpExplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpExpressionLiteral - [2..9)::7 - [@""""""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;[@""""""];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..00911f1902
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+Code span at (2:0,2 [4] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [7] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+Markup span at (7:0,7 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..f6b8e38665
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..7)::7 - [@("\"")]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpExplicitExpression - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..7)::6
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..6)::4
+                        CSharpExpressionLiteral - [2..6)::4 - ["\""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;["\""];
+                    RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [7..7)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..a8175e85d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (2:0,2 [5] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [8] )
+MetaCode span at (7:0,7 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..3103f0223f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..8)::8 - [@(@"""")]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpExplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..8)::7
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..7)::5
+                        CSharpExpressionLiteral - [2..7)::5 - [@""""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;[@""""];
+                    RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..1f223ecaf0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [23] )
+Code span at (2:0,2 [20] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [23] )
+MetaCode span at (22:4,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [23] )
+Markup span at (23:4,2 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..4120fe5a0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..23)::23 - [@(@"LFFooLFBarLFBazLF")]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpExplicitExpression - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..22)::20
+                        CSharpExpressionLiteral - [2..22)::20 - [@"LFFooLFBarLFBazLF"] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;[@"LFFooLFBarLFBazLF"];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..e40d184265
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [21] )
+Code span at (2:0,2 [18] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..6444a0ba44
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@("\"hello, world\"")]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpExplicitExpression - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..20)::18
+                        CSharpExpressionLiteral - [2..20)::18 - ["\"hello, world\""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;["\"hello, world\""];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..a45c531d17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
+Code span at (2:0,2 [19] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..d68a700afc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@(@"""hello, world""")]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpExplicitExpression - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..21)::19
+                        CSharpExpressionLiteral - [2..21)::19 - [@"""hello, world"""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;[@"""hello, world"""];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.cspans.txt
new file mode 100644
index 0000000000..b867104f46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (2:0,2 [7] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [10] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt
new file mode 100644
index 0000000000..4e2a0d3ee8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..10)::10 - [@(@"""""")]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpExplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpExpressionLiteral - [2..9)::7 - [@""""""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            StringLiteral;[@""""""];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.cspans.txt
new file mode 100644
index 0000000000..db00568920
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [2] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [2] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.diag.txt
new file mode 100644
index 0000000000..0b063402e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt
new file mode 100644
index 0000000000..7aa4d7138c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..2)::2 - [@(]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..2)::2
+            CSharpExplicitExpression - [0..2)::2
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..2)::1
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..2)::0
+                        CSharpExpressionLiteral - [2..2)::0 - [] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [2..2)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightParenthesis;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.cspans.txt
new file mode 100644
index 0000000000..65a3c41a92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [3] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [3] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [3] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [3] )
+MetaCode span at (2:0,2 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [3] )
+Markup span at (3:0,3 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt
new file mode 100644
index 0000000000..07a566bf89
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..3)::3 - [@()]
+    MarkupBlock - [0..3)::3
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..3)::3
+            CSharpExplicitExpression - [0..3)::3
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..3)::2
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..2)::0
+                        CSharpExpressionLiteral - [2..2)::0 - [] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [3..3)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.cspans.txt
new file mode 100644
index 0000000000..8253b1a0b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.cspans.txt
@@ -0,0 +1,26 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [210] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [208] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [208] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [208] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [208] )
+Code span at (14:1,12 [47] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [193] )
+Markup span at (61:4,0 [8] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [139] )
+Markup span at (69:4,8 [5] ) (Accepts:None) - Parent: Tag block at (69:4,8 [5] )
+Markup span at (74:4,13 [2] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [139] )
+Code span at (76:5,0 [12] ) (Accepts:Any) - Parent: Statement block at (76:5,0 [108] )
+Transition span at (88:5,12 [1] ) (Accepts:None) - Parent: Statement block at (76:5,0 [108] )
+Code span at (89:5,13 [40] ) (Accepts:Any) - Parent: Statement block at (76:5,0 [108] )
+Markup span at (129:7,0 [16] ) (Accepts:Any) - Parent: Markup block at (129:7,0 [40] )
+Markup span at (145:7,16 [3] ) (Accepts:None) - Parent: Tag block at (145:7,16 [3] )
+Markup span at (148:7,19 [0] ) (Accepts:Any) - Parent: Markup block at (129:7,0 [40] )
+Transition span at (148:7,19 [1] ) (Accepts:None) - Parent: Expression block at (148:7,19 [15] )
+Code span at (149:7,20 [14] ) (Accepts:NonWhitespace) - Parent: Expression block at (148:7,19 [15] )
+Markup span at (163:7,34 [4] ) (Accepts:None) - Parent: Tag block at (163:7,34 [4] )
+Markup span at (167:7,38 [2] ) (Accepts:None) - Parent: Markup block at (129:7,0 [40] )
+Code span at (169:8,0 [15] ) (Accepts:Any) - Parent: Statement block at (76:5,0 [108] )
+Markup span at (184:9,0 [8] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [139] )
+Markup span at (192:9,8 [6] ) (Accepts:None) - Parent: Tag block at (192:9,8 [6] )
+Markup span at (198:9,14 [2] ) (Accepts:None) - Parent: Markup block at (61:4,0 [139] )
+Code span at (200:10,0 [7] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [193] )
+MetaCode span at (207:11,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [208] )
+Markup span at (210:12,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [210] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.stree.txt
new file mode 100644
index 0000000000..f0ad4cc26c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_CanContainCurlyBraces.stree.txt
@@ -0,0 +1,112 @@
+RazorDocument - [0..210)::210 - [LF@functions {LF    void Announcment(string message)LF    {LF        <div>LF            @if (message.Length > 0)LF            {LF                <p>@message.Length</p>LF            }LF        </div>LF    }LF}LF]
+    MarkupBlock - [0..210)::210
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..210)::208
+            RazorDirective - [2..210)::208 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..210)::207
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..210)::198
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..207)::193
+                            CSharpStatementLiteral - [14..61)::47 - [LF    void Announcment(string message)LF    {LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                            MarkupBlock - [61..200)::139
+                                MarkupTextLiteral - [61..69)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[        ];
+                                MarkupElement - [69..198)::129
+                                    MarkupStartTag - [69..74)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[div];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [74..76)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        NewLine;[LF];
+                                    CSharpCodeBlock - [76..184)::108
+                                        CSharpStatementLiteral - [76..88)::12 - [            ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[            ];
+                                        CSharpTransition - [88..89)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpStatementLiteral - [89..129)::40 - [if (message.Length > 0)LF            {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                            Keyword;[if];
+                                            Whitespace;[ ];
+                                            LeftParenthesis;[(];
+                                            Identifier;[message];
+                                            Dot;[.];
+                                            Identifier;[Length];
+                                            Whitespace;[ ];
+                                            GreaterThan;[>];
+                                            Whitespace;[ ];
+                                            IntegerLiteral;[0];
+                                            RightParenthesis;[)];
+                                            NewLine;[LF];
+                                            Whitespace;[            ];
+                                            LeftBrace;[{];
+                                            NewLine;[LF];
+                                        MarkupBlock - [129..169)::40
+                                            MarkupTextLiteral - [129..145)::16 - [                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[                ];
+                                            MarkupElement - [145..167)::22
+                                                MarkupStartTag - [145..148)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                    OpenAngle;[<];
+                                                    Text;[p];
+                                                    CloseAngle;[>];
+                                                MarkupTextLiteral - [148..148)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Marker;[];
+                                                CSharpCodeBlock - [148..163)::15
+                                                    CSharpImplicitExpression - [148..163)::15
+                                                        CSharpTransition - [148..149)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        CSharpImplicitExpressionBody - [149..163)::14
+                                                            CSharpCodeBlock - [149..163)::14
+                                                                CSharpExpressionLiteral - [149..163)::14 - [message.Length] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                                    Identifier;[message];
+                                                                    Dot;[.];
+                                                                    Identifier;[Length];
+                                                MarkupEndTag - [163..167)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                    OpenAngle;[<];
+                                                    ForwardSlash;[/];
+                                                    Text;[p];
+                                                    CloseAngle;[>];
+                                            MarkupTextLiteral - [167..169)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                NewLine;[LF];
+                                        CSharpStatementLiteral - [169..184)::15 - [            }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[            ];
+                                            RightBrace;[}];
+                                            NewLine;[LF];
+                                    MarkupTextLiteral - [184..192)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[        ];
+                                    MarkupEndTag - [192..198)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[div];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [198..200)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [200..207)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [207..210)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [210..210)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.cspans.txt
new file mode 100644
index 0000000000..e4bcfd4f62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [81] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [79] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [79] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [79] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [79] )
+Code span at (14:1,12 [64] ) (Accepts:Any) - Parent: Directive block at (2:1,0 [79] )
+MetaCode span at (78:3,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [79] )
+Markup span at (81:4,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [81] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.stree.txt
new file mode 100644
index 0000000000..ac779ab034
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInString.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..81)::81 - [LF@functions {LF    void Announcment(string message) => "<h3>@message</h3>";LF}LF]
+    MarkupBlock - [0..81)::81
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..81)::79
+            RazorDirective - [2..81)::79 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..81)::78
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..81)::69
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..78)::64
+                            CSharpStatementLiteral - [14..78)::64 - [LF    void Announcment(string message) => "<h3>@message</h3>";LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                GreaterThanEqual;[=>];
+                                Whitespace;[ ];
+                                StringLiteral;["<h3>@message</h3>"];
+                                Semicolon;[;];
+                                NewLine;[LF];
+                        RazorMetaCode - [78..81)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [81..81)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.cspans.txt
new file mode 100644
index 0000000000..c908ca70cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [82] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [80] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [80] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [80] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [80] )
+Code span at (14:1,12 [65] ) (Accepts:Any) - Parent: Directive block at (2:1,0 [80] )
+MetaCode span at (79:3,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [80] )
+Markup span at (82:4,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [82] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.stree.txt
new file mode 100644
index 0000000000..262c18d238
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseMarkupInVerbatimString.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..82)::82 - [LF@functions {LF    void Announcment(string message) => @"<h3>@message</h3>";LF}LF]
+    MarkupBlock - [0..82)::82
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..82)::80
+            RazorDirective - [2..82)::80 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..82)::79
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..82)::70
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..79)::65
+                            CSharpStatementLiteral - [14..79)::65 - [LF    void Announcment(string message) => @"<h3>@message</h3>";LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                GreaterThanEqual;[=>];
+                                Whitespace;[ ];
+                                StringLiteral;[@"<h3>@message</h3>"];
+                                Semicolon;[;];
+                                NewLine;[LF];
+                        RazorMetaCode - [79..82)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [82..82)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.cspans.txt
new file mode 100644
index 0000000000..3ff26adf1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [96] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+Code span at (14:1,12 [81] ) (Accepts:Any) - Parent: Directive block at (2:1,0 [96] )
+MetaCode span at (95:6,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+Markup span at (98:7,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.stree.txt
new file mode 100644
index 0000000000..c3d51822e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_DoesNotParseWhenNotSupported.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..98)::98 - [LF@functions {LF    void Announcment(string message)LF    {LF        <h3>@message</h3>LF    }LF}LF]
+    MarkupBlock - [0..98)::98
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..98)::96
+            RazorDirective - [2..98)::96 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..98)::95
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..98)::86
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..95)::81
+                            CSharpStatementLiteral - [14..95)::81 - [LF    void Announcment(string message)LF    {LF        <h3>@message</h3>LF    }LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                LessThan;[<];
+                                Identifier;[h3];
+                                GreaterThan;[>];
+                                Transition;[@];
+                                Identifier;[message];
+                                LessThan;[<];
+                                Slash;[/];
+                                Identifier;[h3];
+                                GreaterThan;[>];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [95..98)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [98..98)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.cspans.txt
new file mode 100644
index 0000000000..fd4fc97ed3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.cspans.txt
@@ -0,0 +1,25 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [220] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [218] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [218] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [218] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [218] )
+Code span at (14:1,12 [47] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [203] )
+Markup span at (61:4,0 [8] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [149] )
+Markup span at (69:4,8 [5] ) (Accepts:None) - Parent: Tag block at (69:4,8 [5] )
+Markup span at (74:4,13 [2] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [149] )
+Code span at (76:5,0 [12] ) (Accepts:Any) - Parent: Statement block at (76:5,0 [118] )
+Transition span at (88:5,12 [1] ) (Accepts:None) - Parent: Statement block at (76:5,0 [118] )
+Code span at (89:5,13 [63] ) (Accepts:Any) - Parent: Statement block at (76:5,0 [118] )
+Transition span at (152:7,23 [1] ) (Accepts:None) - Parent: Markup block at (152:7,23 [23] )
+Markup span at (153:7,24 [3] ) (Accepts:None) - Parent: Tag block at (153:7,24 [3] )
+Markup span at (156:7,27 [0] ) (Accepts:Any) - Parent: Markup block at (152:7,23 [23] )
+Transition span at (156:7,27 [1] ) (Accepts:None) - Parent: Expression block at (156:7,27 [15] )
+Code span at (157:7,28 [14] ) (Accepts:NonWhitespace) - Parent: Expression block at (156:7,27 [15] )
+Markup span at (171:7,42 [4] ) (Accepts:None) - Parent: Tag block at (171:7,42 [4] )
+Code span at (175:7,46 [19] ) (Accepts:Any) - Parent: Statement block at (76:5,0 [118] )
+Markup span at (194:9,0 [8] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [149] )
+Markup span at (202:9,8 [6] ) (Accepts:None) - Parent: Tag block at (202:9,8 [6] )
+Markup span at (208:9,14 [2] ) (Accepts:None) - Parent: Markup block at (61:4,0 [149] )
+Code span at (210:10,0 [7] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [203] )
+MetaCode span at (217:11,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [218] )
+Markup span at (220:12,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [220] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.stree.txt
new file mode 100644
index 0000000000..e6319cb686
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_MarkupCanContainTemplate.stree.txt
@@ -0,0 +1,117 @@
+RazorDocument - [0..220)::220 - [LF@functions {LF    void Announcment(string message)LF    {LF        <div>LF            @if (message.Length > 0)LF            {LF                Repeat(@<p>@message.Length</p>);LF            }LF        </div>LF    }LF}LF]
+    MarkupBlock - [0..220)::220
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..220)::218
+            RazorDirective - [2..220)::218 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..220)::217
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..220)::208
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..217)::203
+                            CSharpStatementLiteral - [14..61)::47 - [LF    void Announcment(string message)LF    {LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                            MarkupBlock - [61..210)::149
+                                MarkupTextLiteral - [61..69)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[        ];
+                                MarkupElement - [69..208)::139
+                                    MarkupStartTag - [69..74)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[div];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [74..76)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        NewLine;[LF];
+                                    CSharpCodeBlock - [76..194)::118
+                                        CSharpStatementLiteral - [76..88)::12 - [            ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[            ];
+                                        CSharpTransition - [88..89)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpStatementLiteral - [89..152)::63 - [if (message.Length > 0)LF            {LF                Repeat(] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                            Keyword;[if];
+                                            Whitespace;[ ];
+                                            LeftParenthesis;[(];
+                                            Identifier;[message];
+                                            Dot;[.];
+                                            Identifier;[Length];
+                                            Whitespace;[ ];
+                                            GreaterThan;[>];
+                                            Whitespace;[ ];
+                                            IntegerLiteral;[0];
+                                            RightParenthesis;[)];
+                                            NewLine;[LF];
+                                            Whitespace;[            ];
+                                            LeftBrace;[{];
+                                            NewLine;[LF];
+                                            Whitespace;[                ];
+                                            Identifier;[Repeat];
+                                            LeftParenthesis;[(];
+                                        CSharpTemplateBlock - [152..175)::23
+                                            MarkupBlock - [152..175)::23
+                                                MarkupTransition - [152..153)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupElement - [153..175)::22
+                                                    MarkupStartTag - [153..156)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                    MarkupTextLiteral - [156..156)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Marker;[];
+                                                    CSharpCodeBlock - [156..171)::15
+                                                        CSharpImplicitExpression - [156..171)::15
+                                                            CSharpTransition - [156..157)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [157..171)::14
+                                                                CSharpCodeBlock - [157..171)::14
+                                                                    CSharpExpressionLiteral - [157..171)::14 - [message.Length] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                                        Identifier;[message];
+                                                                        Dot;[.];
+                                                                        Identifier;[Length];
+                                                    MarkupEndTag - [171..175)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                        CSharpStatementLiteral - [175..194)::19 - [);LF            }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                            RightParenthesis;[)];
+                                            Semicolon;[;];
+                                            NewLine;[LF];
+                                            Whitespace;[            ];
+                                            RightBrace;[}];
+                                            NewLine;[LF];
+                                    MarkupTextLiteral - [194..202)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[        ];
+                                    MarkupEndTag - [202..208)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[div];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [208..210)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [210..217)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [217..220)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [220..220)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.cspans.txt
new file mode 100644
index 0000000000..4a14010156
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [96] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+Code span at (14:1,12 [47] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [81] )
+Markup span at (61:4,0 [8] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [27] )
+Markup span at (69:4,8 [4] ) (Accepts:None) - Parent: Tag block at (69:4,8 [4] )
+Markup span at (73:4,12 [0] ) (Accepts:Any) - Parent: Markup block at (61:4,0 [27] )
+Transition span at (73:4,12 [1] ) (Accepts:None) - Parent: Expression block at (73:4,12 [8] )
+Code span at (74:4,13 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (73:4,12 [8] )
+Markup span at (81:4,20 [5] ) (Accepts:None) - Parent: Tag block at (81:4,20 [5] )
+Markup span at (86:4,25 [2] ) (Accepts:None) - Parent: Markup block at (61:4,0 [27] )
+Code span at (88:5,0 [7] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [81] )
+MetaCode span at (95:6,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [96] )
+Markup span at (98:7,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.stree.txt
new file mode 100644
index 0000000000..45946374fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupInsideMethod.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..98)::98 - [LF@functions {LF    void Announcment(string message)LF    {LF        <h3>@message</h3>LF    }LF}LF]
+    MarkupBlock - [0..98)::98
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..98)::96
+            RazorDirective - [2..98)::96 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..98)::95
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..98)::86
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..95)::81
+                            CSharpStatementLiteral - [14..61)::47 - [LF    void Announcment(string message)LF    {LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                            MarkupBlock - [61..88)::27
+                                MarkupTextLiteral - [61..69)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[        ];
+                                MarkupElement - [69..86)::17
+                                    MarkupStartTag - [69..73)::4 - [<h3>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[h3];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [73..73)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Marker;[];
+                                    CSharpCodeBlock - [73..81)::8
+                                        CSharpImplicitExpression - [73..81)::8
+                                            CSharpTransition - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [74..81)::7
+                                                CSharpCodeBlock - [74..81)::7
+                                                    CSharpExpressionLiteral - [74..81)::7 - [message] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                        Identifier;[message];
+                                    MarkupEndTag - [81..86)::5 - [</h3>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[h3];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [86..88)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [88..95)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [95..98)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [98..98)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.cspans.txt
new file mode 100644
index 0000000000..fbc728c657
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [78] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [76] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [76] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [76] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [76] )
+Code span at (14:1,12 [42] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [61] )
+Markup span at (56:2,40 [4] ) (Accepts:None) - Parent: Tag block at (56:2,40 [4] )
+Markup span at (60:2,44 [0] ) (Accepts:Any) - Parent: Markup block at (56:2,40 [19] )
+Transition span at (60:2,44 [1] ) (Accepts:None) - Parent: Expression block at (60:2,44 [8] )
+Code span at (61:2,45 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (60:2,44 [8] )
+Markup span at (68:2,52 [5] ) (Accepts:None) - Parent: Tag block at (68:2,52 [5] )
+Markup span at (73:2,57 [2] ) (Accepts:None) - Parent: Markup block at (56:2,40 [19] )
+Code span at (75:3,0 [0] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [61] )
+MetaCode span at (75:3,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [76] )
+Markup span at (78:4,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [78] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.stree.txt
new file mode 100644
index 0000000000..e22da882cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/MarkupInFunctionsBlock_ParsesMarkupWithExpressionsMethod.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..78)::78 - [LF@functions {LF    void Announcment(string message) => <h3>@message</h3>LF}LF]
+    MarkupBlock - [0..78)::78
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..78)::76
+            RazorDirective - [2..78)::76 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..78)::75
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..78)::66
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..75)::61
+                            CSharpStatementLiteral - [14..56)::42 - [LF    void Announcment(string message) => ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Announcment];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                GreaterThanEqual;[=>];
+                                Whitespace;[ ];
+                            MarkupBlock - [56..75)::19
+                                MarkupElement - [56..73)::17
+                                    MarkupStartTag - [56..60)::4 - [<h3>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[h3];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [60..60)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Marker;[];
+                                    CSharpCodeBlock - [60..68)::8
+                                        CSharpImplicitExpression - [60..68)::8
+                                            CSharpTransition - [60..61)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [61..68)::7
+                                                CSharpCodeBlock - [61..68)::7
+                                                    CSharpExpressionLiteral - [61..68)::7 - [message] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                        Identifier;[message];
+                                    MarkupEndTag - [68..73)::5 - [</h3>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[h3];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [73..75)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [75..75)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [75..78)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [78..78)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.cspans.txt
new file mode 100644
index 0000000000..356e5dbb5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [140] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [138] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [138] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [138] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [138] )
+Code span at (14:1,12 [73] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [123] )
+Markup span at (87:6,0 [12] ) (Accepts:Any) - Parent: Markup block at (87:6,0 [32] )
+Markup span at (99:6,12 [3] ) (Accepts:None) - Parent: Tag block at (99:6,12 [3] )
+Markup span at (102:6,15 [11] ) (Accepts:Any) - Parent: Markup block at (87:6,0 [32] )
+Markup span at (113:6,26 [4] ) (Accepts:None) - Parent: Tag block at (113:6,26 [4] )
+Markup span at (117:6,30 [2] ) (Accepts:None) - Parent: Markup block at (87:6,0 [32] )
+Code span at (119:7,0 [18] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [123] )
+MetaCode span at (137:9,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [138] )
+Markup span at (140:10,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [140] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.stree.txt
new file mode 100644
index 0000000000..f994fcb86d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/ReservedKeywordsInFunctionsBlock_WithMarkup.stree.txt
@@ -0,0 +1,73 @@
+RazorDocument - [0..140)::140 - [LF@functions {LF    class PersonLF    {LF        public void DoSomething()LF        {LF            <p>Just do it!</p>LF        }LF    }LF}LF]
+    MarkupBlock - [0..140)::140
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..140)::138
+            RazorDirective - [2..140)::138 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..140)::137
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..140)::128
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..137)::123
+                            CSharpStatementLiteral - [14..87)::73 - [LF    class PersonLF    {LF        public void DoSomething()LF        {LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[class];
+                                Whitespace;[ ];
+                                Identifier;[Person];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                Keyword;[public];
+                                Whitespace;[ ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[DoSomething];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                            MarkupBlock - [87..119)::32
+                                MarkupTextLiteral - [87..99)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[            ];
+                                MarkupElement - [99..117)::18
+                                    MarkupStartTag - [99..102)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [102..113)::11 - [Just do it!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Just];
+                                        Whitespace;[ ];
+                                        Text;[do];
+                                        Whitespace;[ ];
+                                        Text;[it];
+                                        Bang;[!];
+                                    MarkupEndTag - [113..117)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [117..119)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [119..137)::18 - [        }LF    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [137..140)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [140..140)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt
new file mode 100644
index 0000000000..9811c622e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt
new file mode 100644
index 0000000000..754aaddfac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..9)::9 - [@हळूँजद॔.]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [हळूँजद॔] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[हळूँजद॔];
+        MarkupTextLiteral - [8..9)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt
new file mode 100644
index 0000000000..3af48c1d82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt
new file mode 100644
index 0000000000..4c51ced51e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..6)::6 - [@foo ;]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [4..6)::2 - [ ;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[;];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..9811c622e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt
new file mode 100644
index 0000000000..9aeb491366
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..9)::9 - [@foo.bar.]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..9)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt
new file mode 100644
index 0000000000..fcb828addc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt
new file mode 100644
index 0000000000..6c80edc56e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..10)::10 - [@foo.bar.0]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..10)::2 - [.0] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.0];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt
new file mode 100644
index 0000000000..3da06726a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Markup span at (9:0,9 [4] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt
new file mode 100644
index 0000000000..ab3a3eaa71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..13)::13 - [@foo.bar.</p>]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..9)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+        MarkupElement - [9..13)::4
+            MarkupEndTag - [9..13)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt
new file mode 100644
index 0000000000..fcb828addc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt
new file mode 100644
index 0000000000..8bcb3320d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..10)::10 - [@foo.bar.;]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..10)::2 - [.;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.;];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt
new file mode 100644
index 0000000000..26a7df601b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [12] )
+Code span at (1:0,1 [11] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [12] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt
new file mode 100644
index 0000000000..81dce166d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..13)::13 - [@foo.bar.baz;]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpImplicitExpression - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..12)::11
+                    CSharpCodeBlock - [1..12)::11
+                        CSharpExpressionLiteral - [1..12)::11 - [foo.bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+                            Dot;[.];
+                            Identifier;[baz];
+        MarkupTextLiteral - [12..13)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[;];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..2bb1fc91e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt
new file mode 100644
index 0000000000..d0b3494b53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..5)::5 - [@foo;]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [4..5)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[;];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..ec56fd948c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [12] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [4] )
+Code span at (13:0,13 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [4] )
+Markup span at (16:0,16 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt
new file mode 100644
index 0000000000..183ab53d22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..18)::18 - [if (true) { @foo }]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..12)::12 - [if (true) { ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[if];
+            Whitespace;[ ];
+            Text;[(true)];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+        CSharpCodeBlock - [12..16)::4
+            CSharpImplicitExpression - [12..16)::4
+                CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [13..16)::3
+                    CSharpCodeBlock - [13..16)::3
+                        CSharpExpressionLiteral - [13..16)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [16..18)::2 - [ }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt
new file mode 100644
index 0000000000..4b7b3ba3f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [13] )
+Code span at (1:0,1 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [13] )
+Markup span at (13:0,13 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt
new file mode 100644
index 0000000000..d3500903b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..13)::13 - [@module.foo()]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpImplicitExpression - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..13)::12
+                    CSharpCodeBlock - [1..13)::12
+                        CSharpExpressionLiteral - [1..13)::12 - [module.foo()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[module];
+                            Dot;[.];
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [13..13)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt
new file mode 100644
index 0000000000..cd03a1193c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [1] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.diag.txt
new file mode 100644
index 0000000000..c6d6925451
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt
new file mode 100644
index 0000000000..1b3a186cb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..1)::1 - [@]
+    MarkupBlock - [0..1)::1
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..1)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt
new file mode 100644
index 0000000000..d06a3a71b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.diag.txt
new file mode 100644
index 0000000000..6d8d0cd1bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1005: "/" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt
new file mode 100644
index 0000000000..b5a86255d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..2)::2 - [@/]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..2)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            ForwardSlash;[/];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..f22755e950
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [12] )
+Code span at (1:0,1 [11] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [12] )
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt
new file mode 100644
index 0000000000..705a500244
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..12)::12 - [@foo.bar.baz]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpImplicitExpression - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..12)::11
+                    CSharpCodeBlock - [1..12)::11
+                        CSharpExpressionLiteral - [1..12)::11 - [foo.bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+                            Dot;[.];
+                            Identifier;[baz];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt
new file mode 100644
index 0000000000..9449b5a267
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt
new file mode 100644
index 0000000000..2a973adbb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..7)::7 - [@val??[]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..7)::3 - [??[] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
+            LeftBracket;[[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt
new file mode 100644
index 0000000000..aaa7127537
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [9] )
+Code span at (1:0,1 [8] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [9] )
+Markup span at (9:0,9 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt
new file mode 100644
index 0000000000..f4956e6999
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..10)::10 - [@val?[-1]?]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpImplicitExpression - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..9)::8
+                    CSharpCodeBlock - [1..9)::8
+                        CSharpExpressionLiteral - [1..9)::8 - [val?[-1]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Minus;[-];
+                            IntegerLiteral;[1];
+                            RightBracket;[]];
+        MarkupTextLiteral - [9..10)::1 - [?] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.cspans.txt
new file mode 100644
index 0000000000..3f873f6ea4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [15] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.diag.txt
new file mode 100644
index 0000000000..a6129d65d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.diag.txt
@@ -0,0 +1 @@
+(1,12): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt
new file mode 100644
index 0000000000..8ccf243709
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..15)::15 - [@val?[abc]?[def]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpImplicitExpression - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..15)::14
+                    CSharpCodeBlock - [1..15)::14
+                        CSharpExpressionLiteral - [1..15)::14 - [val?[abc]?[def] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[def];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt
new file mode 100644
index 0000000000..92bb2a9863
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt
new file mode 100644
index 0000000000..bb2ddfa496
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..14)::14 - [@val?[abc]?[2]]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpImplicitExpression - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..14)::13
+                    CSharpCodeBlock - [1..14)::13
+                        CSharpExpressionLiteral - [1..14)::13 - [val?[abc]?[2]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            IntegerLiteral;[2];
+                            RightBracket;[]];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt
new file mode 100644
index 0000000000..4afe3fa1bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt
new file mode 100644
index 0000000000..483a875a7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..22)::22 - [@val?[abc]?.more?[def]]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpImplicitExpression - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..22)::21
+                    CSharpCodeBlock - [1..22)::21
+                        CSharpExpressionLiteral - [1..22)::21 - [val?[abc]?.more?[def]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[def];
+                            RightBracket;[]];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt
new file mode 100644
index 0000000000..03103a61c2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [21] )
+Code span at (1:0,1 [20] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt
new file mode 100644
index 0000000000..e484ae74f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..21)::21 - [@val?[abc]?.more?.abc]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpImplicitExpression - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..21)::20
+                    CSharpCodeBlock - [1..21)::20
+                        CSharpExpressionLiteral - [1..21)::20 - [val?[abc]?.more?.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[abc];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt
new file mode 100644
index 0000000000..bb0defcc69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [19] )
+Code span at (1:0,1 [18] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt
new file mode 100644
index 0000000000..49f0bd7d07
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..19)::19 - [@val?[null ?? true]]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpImplicitExpression - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..19)::18
+                    CSharpCodeBlock - [1..19)::18
+                        CSharpExpressionLiteral - [1..19)::18 - [val?[null ?? true]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Keyword;[null];
+                            Whitespace;[ ];
+                            NullCoalesce;[??];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            RightBracket;[]];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt
new file mode 100644
index 0000000000..0b32c2fccc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt
new file mode 100644
index 0000000000..ef28b6255c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..20)::20 - [@val?[abc?.gef?[-1]]]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpImplicitExpression - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..20)::19
+                    CSharpCodeBlock - [1..20)::19
+                        CSharpExpressionLiteral - [1..20)::19 - [val?[abc?.gef?[-1]]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[gef];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Minus;[-];
+                            IntegerLiteral;[1];
+                            RightBracket;[]];
+                            RightBracket;[]];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt
new file mode 100644
index 0000000000..b01f990159
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt
new file mode 100644
index 0000000000..a09cafb40e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..8)::8 - [@val??[0]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..8)::4 - [??[0] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
+            LeftBracket;[[];
+            Text;[0];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.cspans.txt
new file mode 100644
index 0000000000..f1cf24e281
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt
new file mode 100644
index 0000000000..c65cad563b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..6)::6 - [@val?[]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val?[] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt
new file mode 100644
index 0000000000..3af48c1d82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt
new file mode 100644
index 0000000000..8591aa3eb2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..6)::6 - [@val?(]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..6)::2 - [?(] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            Text;[(];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.cspans.txt
new file mode 100644
index 0000000000..540927e7d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt
new file mode 100644
index 0000000000..8071369d6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..10)::10 - [@val?[more]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [val?[more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[more];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt
new file mode 100644
index 0000000000..685d604d5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt
new file mode 100644
index 0000000000..dad9336067
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..8)::8 - [@val?[0]]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [val?[0]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            IntegerLiteral;[0];
+                            RightBracket;[]];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.cspans.txt
new file mode 100644
index 0000000000..8ecc8ebeba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [6] )
+Markup span at (6:0,6 [3] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt
new file mode 100644
index 0000000000..a6ce27255a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..9)::9 - [@val?[<p>]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val?[] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+        MarkupElement - [6..9)::3
+            MarkupStartTag - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.cspans.txt
new file mode 100644
index 0000000000..5890f7654d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [11] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [11] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt
new file mode 100644
index 0000000000..5e458aa0e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..14)::14 - [@val?[more.<p>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpImplicitExpression - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..11)::10
+                    CSharpCodeBlock - [1..11)::10
+                        CSharpExpressionLiteral - [1..11)::10 - [val?[more.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            Identifier;[more];
+                            Dot;[.];
+        MarkupElement - [11..14)::3
+            MarkupStartTag - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt
new file mode 100644
index 0000000000..b93ef2adc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt
new file mode 100644
index 0000000000..72be12795a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..14)::14 - [@val??[more<p>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..11)::7 - [??[more] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
+            LeftBracket;[[];
+            Text;[more];
+        MarkupElement - [11..14)::3
+            MarkupStartTag - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt
new file mode 100644
index 0000000000..2bb1fc91e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt
new file mode 100644
index 0000000000..4ccc4619af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..5)::5 - [@val?]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..5)::1 - [?] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt
new file mode 100644
index 0000000000..0013e6c6e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt
new file mode 100644
index 0000000000..3804d990ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..13)::13 - [@val?.more<p>]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [val?.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+        MarkupElement - [10..13)::3
+            MarkupStartTag - [10..13)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt
new file mode 100644
index 0000000000..b93ef2adc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt
new file mode 100644
index 0000000000..ce8be23cef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..14)::14 - [@val??.more<p>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..11)::7 - [??.more] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
+            Text;[.more];
+        MarkupElement - [11..14)::3
+            MarkupStartTag - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt
new file mode 100644
index 0000000000..41f5f8c0d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [19] )
+Code span at (1:0,1 [18] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [19] )
+Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt
new file mode 100644
index 0000000000..01eccdf9f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..22)::22 - [@val?.more(false)?.<p>]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpImplicitExpression - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..19)::18
+                    CSharpCodeBlock - [1..19)::18
+                        CSharpExpressionLiteral - [1..19)::18 - [val?.more(false)?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+                            LeftParenthesis;[(];
+                            Keyword;[false];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                            Dot;[.];
+        MarkupElement - [19..22)::3
+            MarkupStartTag - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt
new file mode 100644
index 0000000000..4afe3fa1bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt
new file mode 100644
index 0000000000..193c9dbc4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..22)::22 - [@val?.more(false)?.abc]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpImplicitExpression - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..22)::21
+                    CSharpCodeBlock - [1..22)::21
+                        CSharpExpressionLiteral - [1..22)::21 - [val?.more(false)?.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+                            LeftParenthesis;[(];
+                            Keyword;[false];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[abc];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt
new file mode 100644
index 0000000000..3df6aca276
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [29] )
+Code span at (1:0,1 [28] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt
new file mode 100644
index 0000000000..c70700ff24
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..29)::29 - [@val?.more(null ?? true)?.abc]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpImplicitExpression - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..29)::28
+                    CSharpCodeBlock - [1..29)::28
+                        CSharpExpressionLiteral - [1..29)::28 - [val?.more(null ?? true)?.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+                            LeftParenthesis;[(];
+                            Keyword;[null];
+                            Whitespace;[ ];
+                            NullCoalesce;[??];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[abc];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt
new file mode 100644
index 0000000000..3af48c1d82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt
new file mode 100644
index 0000000000..37455f2956
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..6)::6 - [@val??]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..6)::2 - [??] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt
new file mode 100644
index 0000000000..ad423cd178
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt
new file mode 100644
index 0000000000..6ea6455932
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..10)::10 - [@val??more]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..10)::6 - [??more] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
+            Text;[more];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt
new file mode 100644
index 0000000000..3af48c1d82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt
new file mode 100644
index 0000000000..e90d2caa25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..6)::6 - [@val?!]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..6)::2 - [?!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            Bang;[!];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt
new file mode 100644
index 0000000000..fb74b137cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [6] )
+Markup span at (6:0,6 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt
new file mode 100644
index 0000000000..cb4ae61a45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..6)::6 - [@val?.]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+        MarkupTextLiteral - [6..6)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt
new file mode 100644
index 0000000000..9449b5a267
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt
new file mode 100644
index 0000000000..aaa2a274fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..7)::7 - [@val??.]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..7)::3 - [??.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            QuestionMark;[?];
+            Text;[.];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt
new file mode 100644
index 0000000000..922c9aa28d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [6] )
+Markup span at (6:0,6 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt
new file mode 100644
index 0000000000..6c7496a3a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..11)::11 - [@val?.(abc)]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+        MarkupTextLiteral - [6..11)::5 - [(abc)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[(abc)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt
new file mode 100644
index 0000000000..f39a70eff8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [6] )
+Markup span at (6:0,6 [3] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt
new file mode 100644
index 0000000000..f47f2c3137
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..9)::9 - [@val?.<p>]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+        MarkupElement - [6..9)::3
+            MarkupStartTag - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt
new file mode 100644
index 0000000000..a325887027
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt
new file mode 100644
index 0000000000..3f147507dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..10)::10 - [@val?.more]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [val?.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..490eb4a82f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt
new file mode 100644
index 0000000000..5215a83230
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..4)::4 - [@foo]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [4..4)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..b0120744b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [34] )
+Code span at (1:0,1 [33] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt
new file mode 100644
index 0000000000..119de13dfa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..34)::34 - [@foo.bar[4 * (8 + 7)]["fo\"o"].baz]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpImplicitExpression - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..34)::33
+                    CSharpCodeBlock - [1..34)::33
+                        CSharpExpressionLiteral - [1..34)::33 - [foo.bar[4 * (8 + 7)]["fo\"o"].baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+                            LeftBracket;[[];
+                            IntegerLiteral;[4];
+                            Whitespace;[ ];
+                            Star;[*];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[8];
+                            Whitespace;[ ];
+                            Plus;[+];
+                            Whitespace;[ ];
+                            IntegerLiteral;[7];
+                            RightParenthesis;[)];
+                            RightBracket;[]];
+                            LeftBracket;[[];
+                            StringLiteral;["fo\"o"];
+                            RightBracket;[]];
+                            Dot;[.];
+                            Identifier;[baz];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..c32f012803
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [115] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [115] )
+Code span at (1:0,1 [114] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [115] )
+Markup span at (115:0,115 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [115] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt
new file mode 100644
index 0000000000..da9bcfb36f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt
@@ -0,0 +1,72 @@
+RazorDocument - [0..115)::115 - [@foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))]
+    MarkupBlock - [0..115)::115
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..115)::115
+            CSharpImplicitExpression - [0..115)::115
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..115)::114
+                    CSharpCodeBlock - [1..115)::114
+                        CSharpExpressionLiteral - [1..115)::114 - [foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Dot;[.];
+                            Identifier;[bar];
+                            LeftParenthesis;[(];
+                            StringLiteral;["bi\"z"];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            IntegerLiteral;[4];
+                            RightParenthesis;[)];
+                            LeftParenthesis;[(];
+                            StringLiteral;["chained method; call"];
+                            RightParenthesis;[)];
+                            Dot;[.];
+                            Identifier;[baz];
+                            LeftParenthesis;[(];
+                            StringLiteral;[@"bo""z"];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            CharacterLiteral;['\''];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            GreaterThanEqual;[=>];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Keyword;[return];
+                            Whitespace;[ ];
+                            IntegerLiteral;[4];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[4];
+                            Plus;[+];
+                            IntegerLiteral;[5];
+                            Plus;[+];
+                            Keyword;[new];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            LeftBracket;[[];
+                            IntegerLiteral;[4];
+                            RightBracket;[]];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [115..115)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.cspans.txt
new file mode 100644
index 0000000000..fae6fdec1c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+Code span at (1:0,1 [6] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.diag.txt
new file mode 100644
index 0000000000..ade6c85b25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt
new file mode 100644
index 0000000000..cecb589f6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..7)::7 - [@foo(()]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpImplicitExpression - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..7)::6
+                    CSharpCodeBlock - [1..7)::6
+                        CSharpExpressionLiteral - [1..7)::6 - [foo(()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt
new file mode 100644
index 0000000000..4b9c5f7196
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [103] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [103] )
+Code span at (1:0,1 [102] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [103] )
+Markup span at (103:0,103 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [103] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt
new file mode 100644
index 0000000000..ec25b4c750
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..103)::103 - [@DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))]
+    MarkupBlock - [0..103)::103
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..103)::103
+            CSharpImplicitExpression - [0..103)::103
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..103)::102
+                    CSharpCodeBlock - [1..103)::102
+                        CSharpExpressionLiteral - [1..103)::102 - [DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[DataGridColumn];
+                            Dot;[.];
+                            Identifier;[Template];
+                            LeftParenthesis;[(];
+                            StringLiteral;["Years of Service"];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[e];
+                            Whitespace;[ ];
+                            GreaterThanEqual;[=>];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            RightParenthesis;[)];
+                            Identifier;[Math];
+                            Dot;[.];
+                            Identifier;[Round];
+                            LeftParenthesis;[(];
+                            LeftParenthesis;[(];
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+                            Whitespace;[ ];
+                            Minus;[-];
+                            Whitespace;[ ];
+                            Identifier;[dt];
+                            RightParenthesis;[)];
+                            Dot;[.];
+                            Identifier;[TotalDays];
+                            Whitespace;[ ];
+                            Slash;[/];
+                            Whitespace;[ ];
+                            IntegerLiteral;[365];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [103..103)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt
new file mode 100644
index 0000000000..47ae3df07e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt
new file mode 100644
index 0000000000..b6f3ffd448
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..12)::12 - [@foo.bar</p>]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+        MarkupElement - [8..12)::4
+            MarkupEndTag - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt
new file mode 100644
index 0000000000..de2f605a48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt
new file mode 100644
index 0000000000..e7f6e17881
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..17)::17 - [@foo().bar.baz.42]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpImplicitExpression - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..14)::13
+                    CSharpCodeBlock - [1..14)::13
+                        CSharpExpressionLiteral - [1..14)::13 - [foo().bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Dot;[.];
+                            Identifier;[bar];
+                            Dot;[.];
+                            Identifier;[baz];
+        MarkupTextLiteral - [14..17)::3 - [.42] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.42];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt
new file mode 100644
index 0000000000..7e4212394b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
+Markup span at (14:0,14 [4] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [4] )
+Markup span at (18:0,18 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt
new file mode 100644
index 0000000000..bd0ea4ac3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..22)::22 - [@foo().bar.baz</p>zoop]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpImplicitExpression - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..14)::13
+                    CSharpCodeBlock - [1..14)::13
+                        CSharpExpressionLiteral - [1..14)::13 - [foo().bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Dot;[.];
+                            Identifier;[bar];
+                            Dot;[.];
+                            Identifier;[baz];
+        MarkupElement - [14..18)::4
+            MarkupEndTag - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [18..22)::4 - [zoop] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[zoop];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt
new file mode 100644
index 0000000000..d1cd526148
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [3] )
+Markup span at (17:0,17 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt
new file mode 100644
index 0000000000..c0cc2a6788
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..21)::21 - [@foo().bar.baz<p>zoop]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpImplicitExpression - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..14)::13
+                    CSharpCodeBlock - [1..14)::13
+                        CSharpExpressionLiteral - [1..14)::13 - [foo().bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Dot;[.];
+                            Identifier;[bar];
+                            Dot;[.];
+                            Identifier;[baz];
+        MarkupElement - [14..21)::7
+            MarkupStartTag - [14..17)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [17..21)::4 - [zoop] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[zoop];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt
new file mode 100644
index 0000000000..d5399075f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt
new file mode 100644
index 0000000000..53ca571528
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@foo. bar() (baz)]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [4..17)::13 - [. bar() (baz)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+            Whitespace;[ ];
+            Text;[bar()];
+            Whitespace;[ ];
+            Text;[(baz)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt
new file mode 100644
index 0000000000..52d6a4d612
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt
new file mode 100644
index 0000000000..dfaef5653f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..16)::16 - [@foo.bar() (baz)]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [foo.bar()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[bar];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [10..16)::6 - [ (baz)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[(baz)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt
new file mode 100644
index 0000000000..d5399075f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt
new file mode 100644
index 0000000000..baaaa2f435
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..17)::17 - [@foo .bar() (baz)]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [4..17)::13 - [ .bar() (baz)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[.bar()];
+            Whitespace;[ ];
+            Text;[(baz)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.cspans.txt
new file mode 100644
index 0000000000..dce52a5221
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Code span at (1:0,1 [34] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt
new file mode 100644
index 0000000000..08c7c801a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..35)::35 - [@while(true) { { { { foo(); } } } }]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..35)::34 - [while(true) { { { { foo(); } } } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.cspans.txt
new file mode 100644
index 0000000000..67434c2daf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [6] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [6] )
+Code span at (17:0,17 [3] ) (Accepts:Any) - Parent: Expression block at (15:0,15 [6] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [6] )
+Code span at (21:0,21 [2] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt
new file mode 100644
index 0000000000..b0ff0f1147
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..23)::23 - [@while(true) { @(foo) }]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..15)::14 - [while(true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..21)::6
+                CSharpExplicitExpression - [15..21)::6
+                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpExplicitExpressionBody - [16..21)::5
+                        RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftParenthesis;[(];
+                        CSharpCodeBlock - [17..20)::3
+                            CSharpExpressionLiteral - [17..20)::3 - [foo] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                Identifier;[foo];
+                        RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightParenthesis;[)];
+            CSharpStatementLiteral - [21..23)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..4ab605085c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
+Code span at (19:0,19 [2] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt
new file mode 100644
index 0000000000..fa46e8b529
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..21)::21 - [@while(true) { @foo }]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..15)::14 - [while(true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..19)::4
+                CSharpImplicitExpression - [15..19)::4
+                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [16..19)::3
+                        CSharpCodeBlock - [16..19)::3
+                            CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                Identifier;[foo];
+            CSharpStatementLiteral - [19..21)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.cspans.txt
new file mode 100644
index 0000000000..ad7d618e3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Code span at (1:0,1 [54] ) (Accepts:None) - Parent: Statement block at (0:0,0 [55] )
+Markup span at (55:0,55 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt
new file mode 100644
index 0000000000..be2365d2d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..55)::55 - [@while(true) { for(int i = 0; i < 10; i++) { foo(); } }]
+    MarkupBlock - [0..55)::55
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..55)::55
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..55)::54 - [while(true) { for(int i = 0; i < 10; i++) { foo(); } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Keyword;[for];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Increment;[++];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [55..55)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.cspans.txt
new file mode 100644
index 0000000000..c56d0fd0f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Code span at (1:0,1 [13] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [14] )
+Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: Tag block at (15:0,15 [3] )
+Markup span at (18:0,18 [5] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [14] )
+Markup span at (23:0,23 [4] ) (Accepts:None) - Parent: Tag block at (23:0,23 [4] )
+Markup span at (27:0,27 [1] ) (Accepts:None) - Parent: Markup block at (14:0,14 [14] )
+Code span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
new file mode 100644
index 0000000000..93f1331759
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..29)::29 - [@while(true) { <p>Hello</p> }]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..14)::13 - [while(true) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [14..28)::14
+                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [15..27)::12
+                    MarkupStartTag - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [18..23)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Hello];
+                    MarkupEndTag - [23..27)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [28..29)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.cspans.txt
new file mode 100644
index 0000000000..cdeba78164
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (1:0,1 [22] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt
new file mode 100644
index 0000000000..4174c105bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..23)::23 - [@while(true) { foo(); }]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..23)::22 - [while(true) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.cspans.txt
new file mode 100644
index 0000000000..2dcfb49765
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [4] )
+Comment span at (2:0,2 [0] ) (Accepts:Any) - Parent: Comment block at (0:0,0 [4] )
+MetaCode span at (2:0,2 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [4] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [4] )
+Markup span at (4:0,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt
new file mode 100644
index 0000000000..4ffe83985c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..4)::4 - [@**@]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        RazorComment - [0..4)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [4..4)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.cspans.txt
new file mode 100644
index 0000000000..290c517695
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Markup span at (5:1,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (7:1,2 [1] ) (Accepts:None) - Parent: Comment block at (7:1,2 [4] )
+MetaCode span at (8:1,3 [1] ) (Accepts:None) - Parent: Comment block at (7:1,2 [4] )
+Comment span at (9:1,4 [0] ) (Accepts:Any) - Parent: Comment block at (7:1,2 [4] )
+MetaCode span at (9:1,4 [1] ) (Accepts:None) - Parent: Comment block at (7:1,2 [4] )
+Transition span at (10:1,5 [1] ) (Accepts:None) - Parent: Comment block at (7:1,2 [4] )
+Markup span at (11:1,6 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (15:2,0 [1] ) (Accepts:None) - Parent: Comment block at (15:2,0 [4] )
+MetaCode span at (16:2,1 [1] ) (Accepts:None) - Parent: Comment block at (15:2,0 [4] )
+Comment span at (17:2,2 [0] ) (Accepts:Any) - Parent: Comment block at (15:2,0 [4] )
+MetaCode span at (17:2,2 [1] ) (Accepts:None) - Parent: Comment block at (15:2,0 [4] )
+Transition span at (18:2,3 [1] ) (Accepts:None) - Parent: Comment block at (15:2,0 [4] )
+Markup span at (19:2,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Markup span at (21:3,0 [4] ) (Accepts:Any) - Parent: Tag block at (21:3,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
new file mode 100644
index 0000000000..ea99cb2206
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..25)::25 - [<p>LF  @**@  LF@**@LF</p>]
+    MarkupBlock - [0..25)::25
+        MarkupElement - [0..25)::25
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEphemeralTextLiteral - [5..7)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            RazorComment - [7..11)::4
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[<Missing>];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupEphemeralTextLiteral - [11..15)::4 - [  LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+                NewLine;[LF];
+            RazorComment - [15..19)::4
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[<Missing>];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupEphemeralTextLiteral - [19..21)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [21..25)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.cspans.txt
new file mode 100644
index 0000000000..45659c7dad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (5:1,0 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+MetaCode span at (6:1,1 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+Comment span at (7:1,2 [0] ) (Accepts:Any) - Parent: Comment block at (5:1,0 [4] )
+MetaCode span at (7:1,2 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+Transition span at (8:1,3 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+Markup span at (9:1,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Markup span at (9:1,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (11:1,6 [1] ) (Accepts:None) - Parent: Comment block at (11:1,6 [4] )
+MetaCode span at (12:1,7 [1] ) (Accepts:None) - Parent: Comment block at (11:1,6 [4] )
+Comment span at (13:1,8 [0] ) (Accepts:Any) - Parent: Comment block at (11:1,6 [4] )
+MetaCode span at (13:1,8 [1] ) (Accepts:None) - Parent: Comment block at (11:1,6 [4] )
+Transition span at (14:1,9 [1] ) (Accepts:None) - Parent: Comment block at (11:1,6 [4] )
+Markup span at (15:1,10 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Markup span at (17:2,0 [4] ) (Accepts:Any) - Parent: Tag block at (17:2,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
new file mode 100644
index 0000000000..4d29f49bef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..21)::21 - [<p>LF@**@  @**@LF</p>]
+    MarkupBlock - [0..21)::21
+        MarkupElement - [0..21)::21
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            RazorComment - [5..9)::4
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[<Missing>];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupTextLiteral - [9..9)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Marker;[];
+            MarkupEphemeralTextLiteral - [9..11)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            RazorComment - [11..15)::4
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[<Missing>];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupEphemeralTextLiteral - [15..17)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [17..21)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.cspans.txt
new file mode 100644
index 0000000000..c8b487fccb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+Code span at (2:0,2 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (6:1,0 [1] ) (Accepts:None) - Parent: Comment block at (6:1,0 [17] )
+MetaCode span at (7:1,1 [1] ) (Accepts:None) - Parent: Comment block at (6:1,0 [17] )
+Comment span at (8:1,2 [13] ) (Accepts:Any) - Parent: Comment block at (6:1,0 [17] )
+MetaCode span at (21:1,15 [1] ) (Accepts:None) - Parent: Comment block at (6:1,0 [17] )
+Transition span at (22:1,16 [1] ) (Accepts:None) - Parent: Comment block at (6:1,0 [17] )
+Markup span at (23:1,17 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Markup span at (25:2,0 [5] ) (Accepts:Any) - Parent: Tag block at (25:2,0 [5] )
+Markup span at (30:2,5 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Markup span at (33:2,8 [6] ) (Accepts:Any) - Parent: Tag block at (33:2,8 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.stree.txt
new file mode 100644
index 0000000000..376b6017f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentBetweenCodeBlockAndMarkup.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..39)::39 - [@{ }LF@* Hello World *@LF<div>Foo</div>]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpStatement - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..4)::3
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..3)::1
+                        CSharpStatementLiteral - [2..3)::1 - [ ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                    RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [4..6)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        RazorComment - [6..23)::17
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ Hello World ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [23..25)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [25..39)::14
+            MarkupStartTag - [25..30)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [30..33)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [33..39)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt
new file mode 100644
index 0000000000..af3dd82d31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [6] )
+Markup span at (6:0,6 [7] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [7] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+MetaCode span at (14:0,14 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+Comment span at (15:0,15 [15] ) (Accepts:Any) - Parent: Comment block at (13:0,13 [19] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+Markup span at (32:0,32 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt
new file mode 100644
index 0000000000..32cb55d39e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..33)::33 - [<text></text @* razor comment *@>]
+    MarkupBlock - [0..33)::33
+        MarkupElement - [0..13)::13
+            MarkupStartTag - [0..6)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                CloseAngle;[>];
+            MarkupEndTag - [6..13)::7 - [</text ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                MarkupMiscAttributeContent - [12..13)::1
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+        RazorComment - [13..32)::19
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ razor comment ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [32..33)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.cspans.txt
new file mode 100644
index 0000000000..83bce06d39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [13] )
+Code span at (1:0,1 [6] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [13] )
+Transition span at (7:1,0 [1] ) (Accepts:None) - Parent: Comment block at (7:1,0 [4] )
+MetaCode span at (8:1,1 [1] ) (Accepts:None) - Parent: Comment block at (7:1,0 [4] )
+Comment span at (9:1,2 [0] ) (Accepts:Any) - Parent: Comment block at (7:1,0 [4] )
+MetaCode span at (9:1,2 [1] ) (Accepts:None) - Parent: Comment block at (7:1,0 [4] )
+Transition span at (10:1,3 [1] ) (Accepts:None) - Parent: Comment block at (7:1,0 [4] )
+Code span at (11:1,4 [2] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diag.txt
new file mode 100644
index 0000000000..ade6c85b25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt
new file mode 100644
index 0000000000..59217177a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..13)::13 - [@foo(LF@**@LF]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpImplicitExpression - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..13)::12
+                    CSharpCodeBlock - [1..13)::12
+                        CSharpExpressionLiteral - [1..7)::6 - [foo(LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            NewLine;[LF];
+                        RazorComment - [7..11)::4
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[<Missing>];
+                            RazorCommentStar;[*];
+                            RazorCommentTransition;[@];
+                        CSharpExpressionLiteral - [11..13)::2 - [LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.cspans.txt
new file mode 100644
index 0000000000..cca88e4c9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (5:1,0 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+MetaCode span at (6:1,1 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+Comment span at (7:1,2 [0] ) (Accepts:Any) - Parent: Comment block at (5:1,0 [4] )
+MetaCode span at (7:1,2 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+Transition span at (8:1,3 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [4] )
+Markup span at (9:1,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Markup span at (11:2,0 [4] ) (Accepts:Any) - Parent: Tag block at (11:2,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
new file mode 100644
index 0000000000..32cc8dface
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..15)::15 - [<p>LF@**@LF</p>]
+    MarkupBlock - [0..15)::15
+        MarkupElement - [0..15)::15
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            RazorComment - [5..9)::4
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[<Missing>];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupEphemeralTextLiteral - [9..11)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt
new file mode 100644
index 0000000000..be8102eb0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Transition span at (6:0,6 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+MetaCode span at (7:0,7 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+Comment span at (8:0,8 [15] ) (Accepts:Any) - Parent: Comment block at (6:0,6 [19] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (26:0,26 [7] ) (Accepts:Any) - Parent: Tag block at (26:0,26 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
new file mode 100644
index 0000000000..040888e640
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..33)::33 - [<text @* razor comment *@></text>]
+    MarkupBlock - [0..33)::33
+        MarkupElement - [0..33)::33
+            MarkupStartTag - [0..26)::26 - [<text @* razor comment *@>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                MarkupMiscAttributeContent - [5..25)::20
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    RazorComment - [6..25)::19
+                        RazorCommentTransition;[@];
+                        RazorCommentStar;[*];
+                        RazorCommentLiteral;[ razor comment ];
+                        RazorCommentStar;[*];
+                        RazorCommentTransition;[@];
+                CloseAngle;[>];
+            MarkupEndTag - [26..33)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.cspans.txt
new file mode 100644
index 0000000000..f9d1433413
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Transition span at (8:1,4 [5] ) (Accepts:Any) - Parent: Tag block at (8:1,4 [5] )
+Markup span at (13:1,9 [2] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [18] )
+Markup span at (15:2,0 [4] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [18] )
+Transition span at (19:2,4 [1] ) (Accepts:None) - Parent: Comment block at (19:2,4 [4] )
+MetaCode span at (20:2,5 [1] ) (Accepts:None) - Parent: Comment block at (19:2,4 [4] )
+Comment span at (21:2,6 [0] ) (Accepts:Any) - Parent: Comment block at (19:2,4 [4] )
+MetaCode span at (21:2,6 [1] ) (Accepts:None) - Parent: Comment block at (19:2,4 [4] )
+Transition span at (22:2,7 [1] ) (Accepts:None) - Parent: Comment block at (19:2,4 [4] )
+Markup span at (23:2,8 [2] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [18] )
+Markup span at (25:3,0 [1] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt
new file mode 100644
index 0000000000..1567f665b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt
@@ -0,0 +1,3 @@
+(2,6): Error RZ1023: "<text>" and "</text>" tags cannot contain attributes.
+(2,6): Error RZ1025: The "text" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
new file mode 100644
index 0000000000..74cfd937ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..26)::26 - [@{LF    <textLF    @**@LF}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        MarkupBlock - [8..26)::18
+                            MarkupElement - [8..26)::18
+                                MarkupStartTag - [8..13)::5 - MarkupTransition - [<text] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[<Missing>];
+                                MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    NewLine;[LF];
+                                MarkupEphemeralTextLiteral - [15..19)::4 - [    ] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[    ];
+                                RazorComment - [19..23)::4
+                                    RazorCommentTransition;[@];
+                                    RazorCommentStar;[*];
+                                    RazorCommentLiteral;[<Missing>];
+                                    RazorCommentStar;[*];
+                                    RazorCommentTransition;[@];
+                                MarkupEphemeralTextLiteral - [23..25)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    NewLine;[LF];
+                                MarkupTextLiteral - [25..26)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [26..26)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.cspans.txt
new file mode 100644
index 0000000000..d5a5996abb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Transition span at (7:2,0 [1] ) (Accepts:None) - Parent: Comment block at (7:2,0 [13] )
+MetaCode span at (8:2,1 [1] ) (Accepts:None) - Parent: Comment block at (7:2,0 [13] )
+Comment span at (9:2,2 [9] ) (Accepts:Any) - Parent: Comment block at (7:2,0 [13] )
+MetaCode span at (18:2,11 [1] ) (Accepts:None) - Parent: Comment block at (7:2,0 [13] )
+Transition span at (19:2,12 [1] ) (Accepts:None) - Parent: Comment block at (7:2,0 [13] )
+Markup span at (20:2,13 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Transition span at (22:3,0 [1] ) (Accepts:None) - Parent: Comment block at (22:3,0 [15] )
+MetaCode span at (23:3,1 [1] ) (Accepts:None) - Parent: Comment block at (22:3,0 [15] )
+Comment span at (24:3,2 [11] ) (Accepts:Any) - Parent: Comment block at (22:3,0 [15] )
+MetaCode span at (35:5,0 [1] ) (Accepts:None) - Parent: Comment block at (22:3,0 [15] )
+Transition span at (36:5,1 [1] ) (Accepts:None) - Parent: Comment block at (22:3,0 [15] )
+Markup span at (37:5,2 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Markup span at (39:6,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Markup span at (41:7,0 [4] ) (Accepts:Any) - Parent: Tag block at (41:7,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
new file mode 100644
index 0000000000..c671706a27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..45)::45 - [<p>LFLF@* content *@LF@*LFcontentLF*@LFLF</p>]
+    MarkupBlock - [0..45)::45
+        MarkupElement - [0..45)::45
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..7)::4 - [LFLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                NewLine;[LF];
+            RazorComment - [7..20)::13
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ content ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupEphemeralTextLiteral - [20..22)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            RazorComment - [22..37)::15
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[LFcontentLF];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupEphemeralTextLiteral - [37..39)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTextLiteral - [39..41)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.cspans.txt
new file mode 100644
index 0000000000..4c99d23962
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (5:1,0 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [11] )
+MetaCode span at (6:1,1 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [11] )
+Comment span at (7:1,2 [7] ) (Accepts:Any) - Parent: Comment block at (5:1,0 [11] )
+MetaCode span at (14:1,9 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [11] )
+Transition span at (15:1,10 [1] ) (Accepts:None) - Parent: Comment block at (5:1,0 [11] )
+Markup span at (16:1,11 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (25:1,20 [1] ) (Accepts:None) - Parent: Comment block at (25:1,20 [11] )
+MetaCode span at (26:1,21 [1] ) (Accepts:None) - Parent: Comment block at (25:1,20 [11] )
+Comment span at (27:1,22 [7] ) (Accepts:Any) - Parent: Comment block at (25:1,20 [11] )
+MetaCode span at (34:1,29 [1] ) (Accepts:None) - Parent: Comment block at (25:1,20 [11] )
+Transition span at (35:1,30 [1] ) (Accepts:None) - Parent: Comment block at (25:1,20 [11] )
+Markup span at (36:1,31 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Markup span at (38:2,0 [4] ) (Accepts:Any) - Parent: Tag block at (38:2,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
new file mode 100644
index 0000000000..54b44635ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..42)::42 - [<p>LF@* hello *@ content @* world *@LF</p>]
+    MarkupBlock - [0..42)::42
+        MarkupElement - [0..42)::42
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            RazorComment - [5..16)::11
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ hello ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupTextLiteral - [16..25)::9 - [ content ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[content];
+                Whitespace;[ ];
+            RazorComment - [25..36)::11
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ world ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupTextLiteral - [36..38)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [38..42)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt
new file mode 100644
index 0000000000..7f93c44b8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Statement block at (2:1,0 [40] )
+MetaCode span at (3:1,1 [1] ) (Accepts:None) - Parent: Statement block at (2:1,0 [40] )
+Code span at (4:1,2 [6] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [40] )
+Transition span at (10:2,4 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+MetaCode span at (11:2,5 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+Comment span at (12:2,6 [25] ) (Accepts:Any) - Parent: Comment block at (10:2,4 [29] )
+MetaCode span at (37:4,4 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+Transition span at (38:4,5 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+Code span at (39:4,6 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [40] )
+MetaCode span at (41:5,0 [1] ) (Accepts:None) - Parent: Statement block at (2:1,0 [40] )
+Markup span at (42:5,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt
new file mode 100644
index 0000000000..fa32dc202e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..44)::44 - [LF@{LF    @*LFThis is a commentLF    *@LF}LF]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..42)::40
+            CSharpStatement - [2..42)::40
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [3..42)::39
+                    RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [4..41)::37
+                        CSharpStatementLiteral - [4..10)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        RazorComment - [10..39)::29
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[LFThis is a commentLF    ];
+                            RazorCommentStar;[*];
+                            RazorCommentTransition;[@];
+                        CSharpStatementLiteral - [39..41)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.cspans.txt
new file mode 100644
index 0000000000..c75c972a0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [2] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [2] )
+Comment span at (2:0,2 [0] ) (Accepts:Any) - Parent: Comment block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diag.txt
new file mode 100644
index 0000000000..4f3108141d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diag.txt
@@ -0,0 +1 @@
+(1,1): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt
new file mode 100644
index 0000000000..60adcc438a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt
@@ -0,0 +1,10 @@
+RazorDocument - [0..2)::2 - [@*]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        RazorComment - [0..2)::2
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[<Missing>];RZ1028(0:0,0 [2] )
+            RazorCommentTransition;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.cspans.txt
new file mode 100644
index 0000000000..3b417826e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+Code span at (1:0,1 [4] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [7] )
+Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Comment block at (5:0,5 [2] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Comment block at (5:0,5 [2] )
+Comment span at (7:0,7 [0] ) (Accepts:Any) - Parent: Comment block at (5:0,5 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt
new file mode 100644
index 0000000000..b65a64c148
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt
@@ -0,0 +1,2 @@
+(1,6): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt
new file mode 100644
index 0000000000..dc61b63396
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..7)::7 - [@foo(@*]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpImplicitExpression - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..7)::6
+                    CSharpCodeBlock - [1..7)::6
+                        CSharpExpressionLiteral - [1..5)::4 - [foo(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                        RazorComment - [5..7)::2
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[<Missing>];
+                            RazorCommentStar;[<Missing>];RZ1028(5:0,5 [2] )
+                            RazorCommentTransition;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.cspans.txt
new file mode 100644
index 0000000000..3ad5a4a25d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [4] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Comment block at (2:0,2 [2] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Comment block at (2:0,2 [2] )
+Comment span at (4:0,4 [0] ) (Accepts:Any) - Parent: Comment block at (2:0,2 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt
new file mode 100644
index 0000000000..37d6bd7155
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt
@@ -0,0 +1,2 @@
+(1,3): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt
new file mode 100644
index 0000000000..6e7b2b4057
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..4)::4 - [@{@*]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpStatement - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..4)::3
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            Marker;[];
+                        RazorComment - [2..4)::2
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[<Missing>];
+                            RazorCommentStar;[<Missing>];RZ1028(2:0,2 [2] )
+                            RazorCommentTransition;[<Missing>];
+                    RazorMetaCode - [4..4)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.cspans.txt
new file mode 100644
index 0000000000..65fa84c6ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diag.txt
new file mode 100644
index 0000000000..a1c584f0d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1007: "namespace" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt
new file mode 100644
index 0000000000..76edc37a7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..10)::10 - [@namespace]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            RazorDirective - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..10)::9
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Keyword;[namespace];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt
new file mode 100644
index 0000000000..a325887027
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt
new file mode 100644
index 0000000000..8067d08e58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..10)::10 - [@NameSpace]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [NameSpace] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[NameSpace];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt
new file mode 100644
index 0000000000..81c6af3935
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [46] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [46] )
+None span at (12:0,12 [18] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [46] )
+MetaCode span at (30:6,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
+Markup span at (31:6,1 [2] ) (Accepts:Any) - Parent: Markup block at (31:6,1 [14] )
+Markup span at (33:7,0 [3] ) (Accepts:Any) - Parent: Tag block at (33:7,0 [3] )
+Markup span at (36:7,3 [3] ) (Accepts:Any) - Parent: Markup block at (31:6,1 [14] )
+Markup span at (39:7,6 [4] ) (Accepts:Any) - Parent: Tag block at (39:7,6 [4] )
+Markup span at (43:7,10 [2] ) (Accepts:Any) - Parent: Markup block at (31:6,1 [14] )
+MetaCode span at (45:8,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
+Markup span at (46:8,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
new file mode 100644
index 0000000000..bf7aa06f2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..46)::46 - [@section foo      LFLFLFLFLFLF{LF<p>Foo</p>LF}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            RazorDirective - [0..46)::46 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..46)::45
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..46)::38
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..30)::18 - [      LFLFLFLFLFLF] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[      ];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                        RazorMetaCode - [30..31)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [31..45)::14
+                            MarkupTextLiteral - [31..33)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            MarkupElement - [33..43)::10
+                                MarkupStartTag - [33..36)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [36..39)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [43..45)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt
new file mode 100644
index 0000000000..c3a621955f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [76] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [76] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [76] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
+Markup span at (14:0,14 [54] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [61] )
+Transition span at (68:0,68 [1] ) (Accepts:None) - Parent: Expression block at (68:0,68 [6] )
+MetaCode span at (69:0,69 [1] ) (Accepts:None) - Parent: Expression block at (68:0,68 [6] )
+Code span at (70:0,70 [3] ) (Accepts:Any) - Parent: Expression block at (68:0,68 [6] )
+MetaCode span at (73:0,73 [1] ) (Accepts:None) - Parent: Expression block at (68:0,68 [6] )
+Markup span at (74:0,74 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [61] )
+MetaCode span at (75:0,75 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
+Markup span at (76:0,76 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
new file mode 100644
index 0000000000..697f0d90a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
@@ -0,0 +1,65 @@
+RazorDocument - [0..76)::76 - [@section foo { I really want to render a close brace, so here I go: @("}") }]
+    MarkupBlock - [0..76)::76
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..76)::76
+            RazorDirective - [0..76)::76 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..76)::75
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..76)::68
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..75)::61
+                            MarkupTextLiteral - [14..68)::54 - [ I really want to render a close brace, so here I go: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                Text;[I];
+                                Whitespace;[ ];
+                                Text;[really];
+                                Whitespace;[ ];
+                                Text;[want];
+                                Whitespace;[ ];
+                                Text;[to];
+                                Whitespace;[ ];
+                                Text;[render];
+                                Whitespace;[ ];
+                                Text;[a];
+                                Whitespace;[ ];
+                                Text;[close];
+                                Whitespace;[ ];
+                                Text;[brace,];
+                                Whitespace;[ ];
+                                Text;[so];
+                                Whitespace;[ ];
+                                Text;[here];
+                                Whitespace;[ ];
+                                Text;[I];
+                                Whitespace;[ ];
+                                Text;[go:];
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [68..74)::6
+                                CSharpExplicitExpression - [68..74)::6
+                                    CSharpTransition - [68..69)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpExplicitExpressionBody - [69..74)::5
+                                        RazorMetaCode - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            LeftParenthesis;[(];
+                                        CSharpCodeBlock - [70..73)::3
+                                            CSharpExpressionLiteral - [70..73)::3 - ["}"] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                StringLiteral;["}"];
+                                        RazorMetaCode - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            RightParenthesis;[)];
+                            MarkupTextLiteral - [74..75)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [75..76)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [76..76)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt
new file mode 100644
index 0000000000..72e4322f98
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [67] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [67] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [52] )
+Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
+Markup span at (23:0,23 [33] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [52] )
+Markup span at (56:0,56 [9] ) (Accepts:Any) - Parent: Tag block at (56:0,56 [9] )
+Markup span at (65:0,65 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [52] )
+MetaCode span at (66:0,66 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+Markup span at (67:0,67 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
new file mode 100644
index 0000000000..e324726675
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..67)::67 - [@section foo { <script>(function foo() { return 1; })();</script> }]
+    MarkupBlock - [0..67)::67
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..67)::67
+            RazorDirective - [0..67)::67 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..67)::66
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..67)::59
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..66)::52
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [15..65)::50
+                                MarkupStartTag - [15..23)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [23..56)::33 - [(function foo() { return 1; })();] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[(function];
+                                    Whitespace;[ ];
+                                    Text;[foo()];
+                                    Whitespace;[ ];
+                                    Text;[{];
+                                    Whitespace;[ ];
+                                    Text;[return];
+                                    Whitespace;[ ];
+                                    Text;[1;];
+                                    Whitespace;[ ];
+                                    Text;[})();];
+                                MarkupEndTag - [56..65)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [65..66)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [66..67)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [67..67)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
new file mode 100644
index 0000000000..c10c843521
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (8:0,8 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
new file mode 100644
index 0000000000..d336694b97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..10)::10 - [@sectionLF]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{section;RazorBlock;Unrestricted} [RZ1015(8:0,8 [2] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..8)::0
+                        CSharpStatementLiteral - [8..8)::0 - [] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Marker;[];
+        MarkupTextLiteral - [8..10)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt
new file mode 100644
index 0000000000..74bcdf61d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [9] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (17:0,17 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt
new file mode 100644
index 0000000000..7f547e8173
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..23)::23 - [@section         LF    ]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{section;RazorBlock;Unrestricted} [RZ1015(17:0,17 [2] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..17)::9
+                        CSharpStatementLiteral - [8..17)::9 - [         ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[         ];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Marker;[];
+        MarkupTextLiteral - [17..23)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[    ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt
new file mode 100644
index 0000000000..294ddf8df0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+None span at (12:0,12 [15] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (27:1,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt
new file mode 100644
index 0000000000..8120e55a8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..27)::27 - [@section Foo         LF    ]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{section;RazorBlock;Unrestricted} [RZ1012(27:1,4 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..27)::19
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..27)::15 - [         LF    ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[         ];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt
new file mode 100644
index 0000000000..00b79335ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (12:0,12 [2] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [20] )
+Markup span at (14:1,0 [4] ) (Accepts:Any) - Parent: Tag block at (14:1,0 [4] )
+Markup span at (18:2,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (18:2,0 [14] )
+Markup span at (22:2,4 [7] ) (Accepts:Whitespace) - Parent: HtmlComment block at (18:2,0 [14] )
+Markup span at (29:2,11 [3] ) (Accepts:None) - Parent: HtmlComment block at (18:2,0 [14] )
+Markup span at (32:2,14 [0] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [20] )
+MetaCode span at (32:2,14 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (33:2,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
new file mode 100644
index 0000000000..6031164f1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..33)::33 - [@section s {LF<aLF<!--  > " '-->}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..33)::25
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..32)::20
+                            MarkupTextLiteral - [12..14)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            MarkupElement - [14..32)::18
+                                MarkupStartTag - [14..18)::4 - [<aLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupMiscAttributeContent - [16..18)::2
+                                        MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                                MarkupCommentBlock - [18..32)::14
+                                    MarkupTextLiteral - [18..22)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        DoubleHyphen;[--];
+                                    MarkupTextLiteral - [22..29)::7 - [  > " '] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                        Whitespace;[  ];
+                                        CloseAngle;[>];
+                                        Whitespace;[ ];
+                                        DoubleQuote;["];
+                                        Whitespace;[ ];
+                                        SingleQuote;['];
+                                    MarkupTextLiteral - [29..32)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        DoubleHyphen;[--];
+                                        CloseAngle;[>];
+                            MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt
new file mode 100644
index 0000000000..4373c216a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [24] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [24] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [24] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [9] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
new file mode 100644
index 0000000000..f1c5746916
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..24)::24 - [@section foo {something}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            RazorDirective - [0..24)::24 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..24)::23
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..24)::16
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..23)::9
+                            MarkupTextLiteral - [14..23)::9 - [something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[something];
+                        RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt
new file mode 100644
index 0000000000..ecf1378f32
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [26] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [26] )
+MetaCode span at (12:0,12 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [12] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [3] )
+Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [12] )
+Markup span at (20:0,20 [4] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [4] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [12] )
+MetaCode span at (25:0,25 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+Markup span at (26:0,26 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
new file mode 100644
index 0000000000..ba64cef43e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..26)::26 - [@section foo{ <p>Foo</p> }]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            RazorDirective - [0..26)::26 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..26)::25
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..26)::18
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        RazorMetaCode - [12..13)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [13..25)::12
+                            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [14..24)::10
+                                MarkupStartTag - [14..17)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [20..24)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt
new file mode 100644
index 0000000000..074b66bfa3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [14] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [14] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [14] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [0] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt
new file mode 100644
index 0000000000..8ced8d7768
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..14)::14 - [@section foo {]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            RazorDirective - [0..14)::14 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..14)::13
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..14)::6
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..14)::0
+                            MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt
new file mode 100644
index 0000000000..c6e2742957
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [15] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [15] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt
new file mode 100644
index 0000000000..bf96aef353
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..15)::15 - [@section foo { ]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            RazorDirective - [0..15)::15 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..15)::14
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..15)::7
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..15)::1
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [15..15)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt
new file mode 100644
index 0000000000..748a7fb61b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt
new file mode 100644
index 0000000000..c2addfe73d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..16)::16 - [@section foo {LF]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..16)::8
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..16)::2
+                            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt
new file mode 100644
index 0000000000..06a080b1a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
new file mode 100644
index 0000000000..291855088b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [@section foo {abc]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..17)::9
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..17)::3
+                            MarkupTextLiteral - [14..17)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[abc];
+                        RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt
new file mode 100644
index 0000000000..34f459da77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [20] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [20] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [20] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
new file mode 100644
index 0000000000..ae074a707f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..20)::20 - [@section foo {LF abc]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..20)::12
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..20)::6
+                            MarkupTextLiteral - [14..20)::6 - [LF abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[ ];
+                                Text;[abc];
+                        RazorMetaCode - [20..20)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt
new file mode 100644
index 0000000000..5d0c1dc0ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [13] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
+Markup span at (18:0,18 [5] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [13] )
+Markup span at (23:0,23 [4] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
new file mode 100644
index 0000000000..376832ecd9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..27)::27 - [@section foo { <p>Foo{}</p>]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..27)::19
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..27)::13
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [15..27)::12
+                                MarkupStartTag - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [18..23)::5 - [Foo{}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                    Text;[{];
+                                    Text;[}];
+                                MarkupEndTag - [23..27)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [27..27)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt
new file mode 100644
index 0000000000..638db09576
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [73] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [73] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [73] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [73] )
+Code span at (9:0,9 [4] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [73] )
+None span at (13:0,13 [2] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [73] )
+MetaCode span at (15:1,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [73] )
+Markup span at (16:1,1 [2] ) (Accepts:Any) - Parent: Markup block at (16:1,1 [57] )
+Code span at (18:2,0 [4] ) (Accepts:Any) - Parent: Statement block at (18:2,0 [55] )
+Transition span at (22:2,4 [1] ) (Accepts:None) - Parent: Statement block at (18:2,0 [55] )
+Code span at (23:2,5 [17] ) (Accepts:Any) - Parent: Statement block at (18:2,0 [55] )
+Markup span at (40:4,0 [8] ) (Accepts:Any) - Parent: Markup block at (40:4,0 [28] )
+Markup span at (48:4,8 [3] ) (Accepts:None) - Parent: Tag block at (48:4,8 [3] )
+Markup span at (51:4,11 [11] ) (Accepts:Any) - Parent: Markup block at (40:4,0 [28] )
+Markup span at (62:4,22 [4] ) (Accepts:None) - Parent: Tag block at (62:4,22 [4] )
+Markup span at (66:4,26 [2] ) (Accepts:None) - Parent: Markup block at (40:4,0 [28] )
+Code span at (68:5,0 [5] ) (Accepts:Any) - Parent: Statement block at (18:2,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
new file mode 100644
index 0000000000..7152eb1c54
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..73)::73 - [@section TestLF{LF    @if(true)LF    {LF        <p>Hello World</p>LF    }]
+    MarkupBlock - [0..73)::73
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..73)::73
+            RazorDirective - [0..73)::73 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(15:1,0 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..73)::72
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..73)::65
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..13)::4 - [Test] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Test];
+                        UnclassifiedTextLiteral - [13..15)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            NewLine;[LF];
+                        RazorMetaCode - [15..16)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [16..73)::57
+                            MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [18..73)::55
+                                CSharpStatementLiteral - [18..22)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[    ];
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [23..40)::17 - [if(true)LF    {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    NewLine;[LF];
+                                    Whitespace;[    ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                MarkupBlock - [40..68)::28
+                                    MarkupTextLiteral - [40..48)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[        ];
+                                    MarkupElement - [48..66)::18
+                                        MarkupStartTag - [48..51)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[p];
+                                            CloseAngle;[>];
+                                        MarkupTextLiteral - [51..62)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[Hello];
+                                            Whitespace;[ ];
+                                            Text;[World];
+                                        MarkupEndTag - [62..66)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[p];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [66..68)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        NewLine;[LF];
+                                CSharpStatementLiteral - [68..73)::5 - [    }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[    ];
+                                    RightBrace;[}];
+                        RazorMetaCode - [73..73)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt
new file mode 100644
index 0000000000..500fddb951
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
new file mode 100644
index 0000000000..8f8cb089b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..12)::12 - [@Section foo]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [Section] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                            Identifier;[Section];
+        MarkupTextLiteral - [8..12)::4 - [ foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[foo];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.cspans.txt
new file mode 100644
index 0000000000..8e87c7c6c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [30] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [30] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [30] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [15] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [14] )
+MetaCode span at (16:0,16 [8] ) (Accepts:None) - Parent: Directive block at (15:0,15 [14] )
+Code span at (24:0,24 [1] ) (Accepts:Whitespace) - Parent: Directive block at (15:0,15 [14] )
+Code span at (25:0,25 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (15:0,15 [14] )
+None span at (28:0,28 [1] ) (Accepts:Whitespace) - Parent: Directive block at (15:0,15 [14] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [15] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.stree.txt
new file mode 100644
index 0000000000..0a06cbca9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..30)::30 - [@section foo { @inherits Bar }]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            RazorDirective - [0..30)::30 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..30)::29
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..30)::22
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..29)::15
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [15..29)::14
+                                RazorDirective - [15..29)::14 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring} [RZ2005(16:0,16 [8] ), RZ1017(29:0,29 [1] )]
+                                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    RazorDirectiveBody - [16..29)::13
+                                        RazorMetaCode - [16..24)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Identifier;[inherits];
+                                        CSharpCodeBlock - [24..29)::5
+                                            CSharpStatementLiteral - [24..25)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                                Whitespace;[ ];
+                                            CSharpStatementLiteral - [25..28)::3 - [Bar] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                                                Identifier;[Bar];
+                                            UnclassifiedTextLiteral - [28..29)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                                Whitespace;[ ];
+                            MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.cspans.txt
new file mode 100644
index 0000000000..7b1ac91e41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.cspans.txt
@@ -0,0 +1,32 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [61] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [61] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [61] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [61] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [61] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [61] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [61] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [46] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [44] )
+MetaCode span at (16:0,16 [7] ) (Accepts:None) - Parent: Directive block at (15:0,15 [44] )
+Code span at (23:0,23 [1] ) (Accepts:Whitespace) - Parent: Directive block at (15:0,15 [44] )
+Code span at (24:0,24 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (15:0,15 [44] )
+None span at (27:0,27 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (15:0,15 [44] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [44] )
+Markup span at (29:0,29 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [29] )
+Markup span at (30:0,30 [3] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [3] )
+Markup span at (33:0,33 [3] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [29] )
+Markup span at (36:0,36 [4] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [4] )
+Markup span at (40:0,40 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [29] )
+Transition span at (41:0,41 [1] ) (Accepts:None) - Parent: Directive block at (41:0,41 [16] )
+MetaCode span at (42:0,42 [7] ) (Accepts:None) - Parent: Directive block at (41:0,41 [16] )
+Code span at (49:0,49 [1] ) (Accepts:Whitespace) - Parent: Directive block at (41:0,41 [16] )
+Code span at (50:0,50 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (41:0,41 [16] )
+None span at (53:0,53 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (41:0,41 [16] )
+MetaCode span at (54:0,54 [1] ) (Accepts:None) - Parent: Directive block at (41:0,41 [16] )
+Markup span at (55:0,55 [1] ) (Accepts:Any) - Parent: Markup block at (55:0,55 [1] )
+MetaCode span at (56:0,56 [1] ) (Accepts:None) - Parent: Directive block at (41:0,41 [16] )
+Markup span at (57:0,57 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [29] )
+MetaCode span at (58:0,58 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [44] )
+Markup span at (59:0,59 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [46] )
+MetaCode span at (60:0,60 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [61] )
+Markup span at (61:0,61 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [61] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.stree.txt
new file mode 100644
index 0000000000..adfbb5aa6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.stree.txt
@@ -0,0 +1,87 @@
+RazorDocument - [0..61)::61 - [@section foo { @section bar { <p>Foo</p> @section baz { } } }]
+    MarkupBlock - [0..61)::61
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..61)::61
+            RazorDirective - [0..61)::61 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..61)::60
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..61)::53
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..60)::46
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [15..59)::44
+                                RazorDirective - [15..59)::44 - Directive:{section;RazorBlock;Unrestricted} [RZ2005(16:0,16 [7] ), RZ2002(15:0,15 [8] )]
+                                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    RazorDirectiveBody - [16..59)::43
+                                        RazorMetaCode - [16..23)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Identifier;[section];
+                                        CSharpCodeBlock - [23..59)::36
+                                            CSharpStatementLiteral - [23..24)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                                Whitespace;[ ];
+                                            CSharpStatementLiteral - [24..27)::3 - [bar] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                                                Identifier;[bar];
+                                            UnclassifiedTextLiteral - [27..28)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                                                Whitespace;[ ];
+                                            RazorMetaCode - [28..29)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                                                LeftBrace;[{];
+                                            MarkupBlock - [29..58)::29
+                                                MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupElement - [30..40)::10
+                                                    MarkupStartTag - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                    MarkupTextLiteral - [33..36)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Text;[Foo];
+                                                    MarkupEndTag - [36..40)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                CSharpCodeBlock - [41..57)::16
+                                                    RazorDirective - [41..57)::16 - Directive:{section;RazorBlock;Unrestricted} [RZ2005(42:0,42 [7] ), RZ2002(41:0,41 [8] )]
+                                                        CSharpTransition - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        RazorDirectiveBody - [42..57)::15
+                                                            RazorMetaCode - [42..49)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Identifier;[section];
+                                                            CSharpCodeBlock - [49..57)::8
+                                                                CSharpStatementLiteral - [49..50)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                                                    Whitespace;[ ];
+                                                                CSharpStatementLiteral - [50..53)::3 - [baz] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                                                                    Identifier;[baz];
+                                                                UnclassifiedTextLiteral - [53..54)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                                                                    Whitespace;[ ];
+                                                                RazorMetaCode - [54..55)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                                                                    LeftBrace;[{];
+                                                                MarkupBlock - [55..56)::1
+                                                                    MarkupTextLiteral - [55..56)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                        Whitespace;[ ];
+                                                                RazorMetaCode - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                    RightBrace;[}];
+                                                MarkupTextLiteral - [57..58)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                            RazorMetaCode - [58..59)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightBrace;[}];
+                            MarkupTextLiteral - [59..60)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [60..61)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [61..61)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt
new file mode 100644
index 0000000000..f4b0f08c70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt
@@ -0,0 +1,23 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [29] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
+MetaCode span at (16:0,16 [7] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
+Code span at (23:0,23 [1] ) (Accepts:Whitespace) - Parent: Directive block at (15:0,15 [27] )
+Code span at (24:0,24 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (15:0,15 [27] )
+None span at (27:0,27 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (15:0,15 [27] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
+Markup span at (29:0,29 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [12] )
+Markup span at (30:0,30 [3] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [3] )
+Markup span at (33:0,33 [3] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [12] )
+Markup span at (36:0,36 [4] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [4] )
+Markup span at (40:0,40 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [12] )
+MetaCode span at (41:0,41 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
+Markup span at (42:0,42 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [29] )
+MetaCode span at (43:0,43 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (44:0,44 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
new file mode 100644
index 0000000000..50696e68f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
@@ -0,0 +1,64 @@
+RazorDocument - [0..44)::44 - [@section foo { @section bar { <p>Foo</p> } }]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..44)::36
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..43)::29
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [15..42)::27
+                                RazorDirective - [15..42)::27 - Directive:{section;RazorBlock;Unrestricted} [RZ2005(16:0,16 [7] ), RZ2002(15:0,15 [8] )]
+                                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    RazorDirectiveBody - [16..42)::26
+                                        RazorMetaCode - [16..23)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Identifier;[section];
+                                        CSharpCodeBlock - [23..42)::19
+                                            CSharpStatementLiteral - [23..24)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                                Whitespace;[ ];
+                                            CSharpStatementLiteral - [24..27)::3 - [bar] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                                                Identifier;[bar];
+                                            UnclassifiedTextLiteral - [27..28)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                                                Whitespace;[ ];
+                                            RazorMetaCode - [28..29)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                                                LeftBrace;[{];
+                                            MarkupBlock - [29..41)::12
+                                                MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupElement - [30..40)::10
+                                                    MarkupStartTag - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                    MarkupTextLiteral - [33..36)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Text;[Foo];
+                                                    MarkupEndTag - [36..40)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                            RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightBrace;[}];
+                            MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt
new file mode 100644
index 0000000000..3128f77ff8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [21] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [21] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (12:0,12 [4] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [8] )
+Markup span at (16:0,16 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (12:0,12 [8] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [8] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [8] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt
new file mode 100644
index 0000000000..fe774d1047
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..21)::21 - [@section s {<!-- -->}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..21)::13
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..20)::8
+                            MarkupCommentBlock - [12..20)::8
+                                MarkupTextLiteral - [12..16)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                MarkupTextLiteral - [17..20)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt
new file mode 100644
index 0000000000..6303d19bff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [26] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [26] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [26] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+Markup span at (12:0,12 [4] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [13] )
+Markup span at (16:0,16 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (12:0,12 [13] )
+Markup span at (22:0,22 [3] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [13] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [13] )
+MetaCode span at (25:0,25 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
+Markup span at (26:0,26 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt
new file mode 100644
index 0000000000..3d67883302
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..26)::26 - [@section s {<!-- > " '-->}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            RazorDirective - [0..26)::26 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..26)::25
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..26)::18
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..25)::13
+                            MarkupCommentBlock - [12..25)::13
+                                MarkupTextLiteral - [12..16)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [16..22)::6 - [ > " '] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                    CloseAngle;[>];
+                                    Whitespace;[ ];
+                                    DoubleQuote;["];
+                                    Whitespace;[ ];
+                                    SingleQuote;['];
+                                MarkupTextLiteral - [22..25)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt
new file mode 100644
index 0000000000..288a8a8447
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [12] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
+Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [12] )
+Markup span at (21:0,21 [4] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [4] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [12] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
new file mode 100644
index 0000000000..86825c5816
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..27)::27 - [@section foo { <p>Foo</p> }]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..27)::19
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..26)::12
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [15..25)::10
+                                MarkupStartTag - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [18..21)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [21..25)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt
new file mode 100644
index 0000000000..468ea2f186
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [28] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [28] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [28] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (12:0,12 [15] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [15] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
new file mode 100644
index 0000000000..a18fe82823
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..28)::28 - [@section s { <? xml bleh ?>}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            RazorDirective - [0..28)::28 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..28)::27
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..28)::20
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..27)::15
+                            MarkupTextLiteral - [12..27)::15 - [ <? xml bleh ?>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                OpenAngle;[<];
+                                QuestionMark;[?];
+                                Whitespace;[ ];
+                                Text;[xml];
+                                Whitespace;[ ];
+                                Text;[bleh];
+                                Whitespace;[ ];
+                                QuestionMark;[?];
+                                CloseAngle;[>];
+                        RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt
new file mode 100644
index 0000000000..0b57ebf59f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [20] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [20] )
+None span at (12:0,12 [8] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (20:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt
new file mode 100644
index 0000000000..4aaa12bea3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..20)::20 - [@section foo      LF]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20 - Directive:{section;RazorBlock;Unrestricted} [RZ1012(20:1,0 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..20)::12
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        UnclassifiedTextLiteral - [12..20)::8 - [      LF] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[      ];
+                            NewLine;[LF];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt
new file mode 100644
index 0000000000..1b511f83f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [9] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [9] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [9] )
+Markup span at (9:0,9 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [3] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Markup span at (19:0,19 [4] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [4] )
+Markup span at (23:0,23 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
new file mode 100644
index 0000000000..7ce390e0b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..25)::25 - [@section 9 { <p>Foo</p> }]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            RazorDirective - [0..9)::9 - Directive:{section;RazorBlock;Unrestricted} [RZ1015(9:0,9 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..9)::8
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..9)::1
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [9..13)::4 - [9 { ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[9];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+        MarkupElement - [13..23)::10
+            MarkupStartTag - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [19..23)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [23..25)::2 - [ }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt
new file mode 100644
index 0000000000..b1564f1bc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [12] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [12] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [12] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [12] )
+Markup span at (12:0,12 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [3] )
+Markup span at (22:0,22 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Markup span at (25:0,25 [4] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [4] )
+Markup span at (29:0,29 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
new file mode 100644
index 0000000000..6ba250ccaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..31)::31 - [@section foo-bar { <p>Foo</p> }]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            RazorDirective - [0..12)::12 - Directive:{section;RazorBlock;Unrestricted} [RZ1017(12:0,12 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..12)::11
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..12)::4
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+        MarkupTextLiteral - [12..19)::7 - [-bar { ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[-bar];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+        MarkupElement - [19..29)::10
+            MarkupStartTag - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [22..25)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [29..31)::2 - [ }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt
new file mode 100644
index 0000000000..713abda61d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [31] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [31] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [31] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
+Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [16] )
+Transition span at (16:1,0 [1] ) (Accepts:None) - Parent: Statement block at (16:1,0 [14] )
+Code span at (17:1,1 [13] ) (Accepts:Any) - Parent: Statement block at (16:1,0 [14] )
+MetaCode span at (30:2,1 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
+Markup span at (31:2,2 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt
new file mode 100644
index 0000000000..f6f748f944
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..31)::31 - [@section Foo {LF@if(true) {LF}}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            RazorDirective - [0..31)::31 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..31)::30
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..31)::23
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..30)::16
+                            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [16..30)::14
+                                CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [17..30)::13 - [if(true) {LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    Whitespace;[ ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                    RightBrace;[}];
+                        RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt
new file mode 100644
index 0000000000..4ef0cf352d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
+Transition span at (16:1,0 [1] ) (Accepts:None) - Parent: Statement block at (16:1,0 [16] )
+Code span at (17:1,1 [15] ) (Accepts:Any) - Parent: Statement block at (16:1,0 [16] )
+MetaCode span at (32:3,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (33:3,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt
new file mode 100644
index 0000000000..1dd0e69729
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..33)::33 - [@section Foo {LF@if(true) {LF}LF}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..33)::25
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..32)::18
+                            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [16..32)::16
+                                CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [17..32)::15 - [if(true) {LF}LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    Whitespace;[ ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                    RightBrace;[}];
+                                    NewLine;[LF];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt
new file mode 100644
index 0000000000..fd7f466680
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [30] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [30] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [30] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Markup span at (12:0,12 [5] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [17] )
+Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [9] )
+Markup span at (23:0,23 [1] ) (Accepts:None) - Parent: Markup block at (23:0,23 [2] )
+Markup span at (24:0,24 [1] ) (Accepts:None) - Parent: Markup block at (23:0,23 [2] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [9] )
+Markup span at (26:0,26 [3] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [17] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
new file mode 100644
index 0000000000..48df1c0bfc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..30)::30 - [@section s {<span foo='@@' />}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            RazorDirective - [0..30)::30 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..30)::29
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..30)::22
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..29)::17
+                            MarkupElement - [12..29)::17
+                                MarkupStartTag - [12..29)::17 - [<span foo='@@' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [17..26)::9 - [ foo='@@']
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..21)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [23..25)::2
+                                            MarkupBlock - [23..25)::2
+                                                MarkupTextLiteral - [23..24)::1 - [@] - Gen<LitAttr:@(23:0,23)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [24..25)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [26..27)::1
+                                        MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt
new file mode 100644
index 0000000000..0a4a2f665f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (12:0,12 [5] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [31] )
+Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [23] )
+Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [13] )
+Code span at (24:0,24 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [13] )
+Markup span at (36:0,36 [2] ) (Accepts:None) - Parent: Markup block at (36:0,36 [3] )
+Markup span at (38:0,38 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [3] )
+Markup span at (39:0,39 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [23] )
+Markup span at (40:0,40 [3] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [31] )
+MetaCode span at (43:0,43 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (44:0,44 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
new file mode 100644
index 0000000000..2659456d6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
@@ -0,0 +1,63 @@
+RazorDocument - [0..44)::44 - [@section s {<span foo='@DateTime.Now @@' />}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..44)::36
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..43)::31
+                            MarkupElement - [12..43)::31
+                                MarkupStartTag - [12..43)::31 - [<span foo='@DateTime.Now @@' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [17..40)::23 - [ foo='@DateTime.Now @@']
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..21)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [23..39)::16
+                                            MarkupDynamicAttributeValue - [23..36)::13 - [@DateTime.Now]
+                                                GenericBlock - [23..36)::13
+                                                    CSharpCodeBlock - [23..36)::13
+                                                        CSharpImplicitExpression - [23..36)::13
+                                                            CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [24..36)::12
+                                                                CSharpCodeBlock - [24..36)::12
+                                                                    CSharpExpressionLiteral - [24..36)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupBlock - [36..39)::3
+                                                MarkupTextLiteral - [36..38)::2 - [ @] - Gen<LitAttr: @(36:0,36)> - SpanEditHandler;Accepts:None
+                                                    Whitespace;[ ];
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [40..41)::1
+                                        MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.cspans.txt
new file mode 100644
index 0000000000..58aa7eca66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+Code span at (2:0,2 [50] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [53] )
+MetaCode span at (52:0,52 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+Markup span at (53:0,53 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt
new file mode 100644
index 0000000000..74ff9e617e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..53)::53 - [@{foo"b}ar" if(condition) { string.Format("{0}"); } }]
+    MarkupBlock - [0..53)::53
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..53)::53
+            CSharpStatement - [0..53)::53
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..53)::52
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..52)::50
+                        CSharpStatementLiteral - [2..52)::50 - [foo"b}ar" if(condition) { string.Format("{0}"); } ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Identifier;[foo];
+                            StringLiteral;["b}ar"];
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Identifier;[condition];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            Dot;[.];
+                            Identifier;[Format];
+                            LeftParenthesis;[(];
+                            StringLiteral;["{0}"];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [53..53)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.cspans.txt
new file mode 100644
index 0000000000..9941127366
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [53] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [53] )
+Code span at (2:0,2 [50] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [53] )
+MetaCode span at (52:0,52 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [53] )
+Markup span at (53:0,53 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt
new file mode 100644
index 0000000000..6304616645
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..53)::53 - [@(foo"b)ar" if(condition) { string.Format("{0}"); } )]
+    MarkupBlock - [0..53)::53
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..53)::53
+            CSharpExplicitExpression - [0..53)::53
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..53)::52
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..52)::50
+                        CSharpExpressionLiteral - [2..52)::50 - [foo"b)ar" if(condition) { string.Format("{0}"); } ] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Identifier;[foo];
+                            StringLiteral;["b)ar"];
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Identifier;[condition];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            Dot;[.];
+                            Identifier;[Format];
+                            LeftParenthesis;[(];
+                            StringLiteral;["{0}"];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [53..53)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.cspans.txt
new file mode 100644
index 0000000000..5d386ce1ba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Code span at (2:0,2 [35] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (38:0,38 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt
new file mode 100644
index 0000000000..14cc48739f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..38)::38 - [@{ using Foo.Bar.Baz; var foo = bar; }]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpStatement - [0..38)::38
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..38)::37
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..37)::35
+                        CSharpStatementLiteral - [2..37)::35 - [ using Foo.Bar.Baz; var foo = bar; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[using];
+                            Whitespace;[ ];
+                            Identifier;[Foo];
+                            Dot;[.];
+                            Identifier;[Bar];
+                            Dot;[.];
+                            Identifier;[Baz];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [38..38)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.cspans.txt
new file mode 100644
index 0000000000..6e4138ea53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Code span at (2:0,2 [54] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [57] )
+MetaCode span at (56:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Markup span at (57:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt
new file mode 100644
index 0000000000..bf39ca1547
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..57)::57 - [@{LF    List<dynamic> photos = gallery.Photo.ToList();LF}]
+    MarkupBlock - [0..57)::57
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..57)::57
+            CSharpStatement - [0..57)::57
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..57)::56
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..56)::54
+                        CSharpStatementLiteral - [2..56)::54 - [LF    List<dynamic> photos = gallery.Photo.ToList();LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Identifier;[List];
+                            LessThan;[<];
+                            Identifier;[dynamic];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[photos];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[gallery];
+                            Dot;[.];
+                            Identifier;[Photo];
+                            Dot;[.];
+                            Identifier;[ToList];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [57..57)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt
new file mode 100644
index 0000000000..320067e579
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.diag.txt
new file mode 100644
index 0000000000..6d8d0cd1bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1005: "/" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt
new file mode 100644
index 0000000000..f83ce55634
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..6)::6 - [@/ foo]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..6)::5 - [/ foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            ForwardSlash;[/];
+            Whitespace;[ ];
+            Text;[foo];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.cspans.txt
new file mode 100644
index 0000000000..12ec38b2d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Code span at (1:0,1 [26] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
+Markup span at (27:2,0 [1] ) (Accepts:Any) - Parent: Markup block at (27:2,0 [21] )
+Markup span at (28:2,1 [3] ) (Accepts:None) - Parent: Tag block at (28:2,1 [3] )
+Markup span at (31:2,4 [11] ) (Accepts:Any) - Parent: Markup block at (27:2,0 [21] )
+Markup span at (42:2,15 [4] ) (Accepts:None) - Parent: Tag block at (42:2,15 [4] )
+Markup span at (46:2,19 [2] ) (Accepts:None) - Parent: Markup block at (27:2,0 [21] )
+Code span at (48:3,0 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
new file mode 100644
index 0000000000..a97f0f5812
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..49)::49 - [@if(!false) {LF    // FooLF	<p>A real tag!</p>LF}]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..27)::26 - [if(!false) {LF    // FooLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Not;[!];
+                Keyword;[false];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                CSharpComment;[// Foo];
+                NewLine;[LF];
+            MarkupBlock - [27..48)::21
+                MarkupTextLiteral - [27..28)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[	];
+                MarkupElement - [28..46)::18
+                    MarkupStartTag - [28..31)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [31..42)::11 - [A real tag!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[A];
+                        Whitespace;[ ];
+                        Text;[real];
+                        Whitespace;[ ];
+                        Text;[tag];
+                        Bang;[!];
+                    MarkupEndTag - [42..46)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [46..48)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [48..49)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.cspans.txt
new file mode 100644
index 0000000000..15f7b3d523
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Code span at (2:0,2 [37] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (39:0,39 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (40:0,40 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt
new file mode 100644
index 0000000000..54a90a74b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..40)::40 - [@{ using Foo = Bar.Baz; var foo = bar; }]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            CSharpStatement - [0..40)::40
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..40)::39
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..39)::37
+                        CSharpStatementLiteral - [2..39)::37 - [ using Foo = Bar.Baz; var foo = bar; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[using];
+                            Whitespace;[ ];
+                            Identifier;[Foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[Bar];
+                            Dot;[.];
+                            Identifier;[Baz];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [40..40)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.cspans.txt
new file mode 100644
index 0000000000..d4911d2950
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Code span at (1:0,1 [40] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.stree.txt
new file mode 100644
index 0000000000..abd0bc235d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/AwaitForEachStatement.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..41)::41 - [@await foreach(var foo in bar) { foo(); }]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..41)::40 - [await foreach(var foo in bar) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[await];
+                Whitespace;[ ];
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.cspans.txt
new file mode 100644
index 0000000000..a01e4584d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [94] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [94] )
+Code span at (1:0,1 [93] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [94] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt
new file mode 100644
index 0000000000..d369b28d28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..94)::94 - [@try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }]
+    MarkupBlock - [0..94)::94
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..94)::94
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..94)::93 - [try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[IOException];
+                Whitespace;[ ];
+                Identifier;[ioex];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[handleIO];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                Whitespace;[ ];
+                Identifier;[ex];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[handleOther];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.cspans.txt
new file mode 100644
index 0000000000..0ef53c991b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Code span at (1:0,1 [26] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt
new file mode 100644
index 0000000000..2861b1c596
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..27)::27 - [@do { foo(); } while(true);]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..27)::26 - [do { foo(); } while(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[do];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Semicolon;[;];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.cspans.txt
new file mode 100644
index 0000000000..28d83350e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Code span at (1:0,1 [35] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt
new file mode 100644
index 0000000000..fd032ca251
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..36)::36 - [@if(true) { foo(); } else { foo(); }]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..36)::35 - [if(true) { foo(); } else { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.cspans.txt
new file mode 100644
index 0000000000..aeec5c79f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [73] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [73] )
+Code span at (1:0,1 [72] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [73] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt
new file mode 100644
index 0000000000..ba0efa1002
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..73)::73 - [@if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }]
+    MarkupBlock - [0..73)::73
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..73)::73
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..73)::72 - [if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[false];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Not;[!];
+                Keyword;[false];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.cspans.txt
new file mode 100644
index 0000000000..a4f8405520
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+Code span at (1:0,1 [52] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [53] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.diag.txt
new file mode 100644
index 0000000000..821f352b2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.diag.txt
@@ -0,0 +1 @@
+(1,24): Error RZ1006: The catch block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt
new file mode 100644
index 0000000000..4c3534f86f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..53)::53 - [@try { someMethod(); } catch(Exception) when (true) {]
+    MarkupBlock - [0..53)::53
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..53)::53
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..53)::52 - [try { someMethod(); } catch(Exception) when (true) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.cspans.txt
new file mode 100644
index 0000000000..70b420119b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Code span at (1:0,1 [45] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.diag.txt
new file mode 100644
index 0000000000..33043e2030
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.diag.txt
@@ -0,0 +1 @@
+(1,46): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt
new file mode 100644
index 0000000000..c4d32daa6c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..46)::46 - [@try { someMethod(); } catch(Exception) when (]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..46)::45 - [try { someMethod(); } catch(Exception) when (] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.cspans.txt
new file mode 100644
index 0000000000..957b72bff8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [65] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [65] )
+Code span at (1:0,1 [64] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [65] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt
new file mode 100644
index 0000000000..7ca00fefc7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..65)::65 - [@try { someMethod(); } catch(Exception) when { anotherMethod(); }]
+    MarkupBlock - [0..65)::65
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..65)::65
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..65)::64 - [try { someMethod(); } catch(Exception) when { anotherMethod(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[anotherMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.cspans.txt
new file mode 100644
index 0000000000..b12747ada5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+Code span at (1:0,1 [43] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt
new file mode 100644
index 0000000000..adbef40a1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..44)::44 - [@try { someMethod(); } catch(Exception) when]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..44)::43 - [try { someMethod(); } catch(Exception) when] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.cspans.txt
new file mode 100644
index 0000000000..4b8a2bb802
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Code span at (1:0,1 [50] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt
new file mode 100644
index 0000000000..8bd5aa4ee0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..51)::51 - [@try { someMethod(); } catch(Exception) when (true)]
+    MarkupBlock - [0..51)::51
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..51)::51
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..51)::50 - [try { someMethod(); } catch(Exception) when (true)] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.cspans.txt
new file mode 100644
index 0000000000..70af370fb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt
new file mode 100644
index 0000000000..9f1d367820
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..27)::27 - [@try { someMethod(); } when]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..22)::21 - [try { someMethod(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [22..27)::5 - [ when] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[when];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.cspans.txt
new file mode 100644
index 0000000000..1c9dd5a659
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [103] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [103] )
+Code span at (1:0,1 [102] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [103] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt
new file mode 100644
index 0000000000..adbc2b8c66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..103)::103 - [@tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}]
+    MarkupBlock - [0..103)::103
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..103)::103
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..103)::102 - [tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                NewLine;[LF];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Identifier;[A];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                NewLine;[LF];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                NewLine;[LF];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Identifier;[B];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
+                NewLine;[LF];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[IOException];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[false];
+                RightParenthesis;[)];
+                NewLine;[LF];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Identifier;[C];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.cspans.txt
new file mode 100644
index 0000000000..54e259787a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [69] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [69] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [69] )
+Code span at (2:0,2 [66] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [69] )
+MetaCode span at (68:0,68 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [69] )
+Markup span at (69:0,69 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [69] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt
new file mode 100644
index 0000000000..8afdc4bc9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..69)::69 - [@{try { someMethod(); } catch(Exception) when (true) { handleIO(); }}]
+    MarkupBlock - [0..69)::69
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..69)::69
+            CSharpStatement - [0..69)::69
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..69)::68
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..68)::66
+                        CSharpStatementLiteral - [2..68)::66 - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Keyword;[try];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Identifier;[someMethod];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                            Keyword;[catch];
+                            LeftParenthesis;[(];
+                            Identifier;[Exception];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            Keyword;[when];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Keyword;[true];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Identifier;[handleIO];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                    RazorMetaCode - [68..69)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [69..69)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.cspans.txt
new file mode 100644
index 0000000000..eaf9d4d880
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [92] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [92] )
+Code span at (1:0,1 [91] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [92] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt
new file mode 100644
index 0000000000..89d4307ace
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..92)::92 - [@try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }]
+    MarkupBlock - [0..92)::92
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..92)::92
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..92)::91 - [try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[A];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[B];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[IOException];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[false];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[C];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.cspans.txt
new file mode 100644
index 0000000000..2d883a5590
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [67] )
+Code span at (1:0,1 [66] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [67] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt
new file mode 100644
index 0000000000..8a1e974063
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..67)::67 - [@try { someMethod(); } catch(Exception) when (true) { handleIO(); }]
+    MarkupBlock - [0..67)::67
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..67)::67
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..67)::66 - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[someMethod];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[handleIO];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.cspans.txt
new file mode 100644
index 0000000000..4852e2bc04
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Code span at (1:0,1 [67] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Markup span at (68:0,68 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt
new file mode 100644
index 0000000000..0a385e2668
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..68)::68 - [@try { A(); } catch(Exception) when (true) { B(); } finally { C(); }]
+    MarkupBlock - [0..68)::68
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..68)::68
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..68)::67 - [try { A(); } catch(Exception) when (true) { B(); } finally { C(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[A];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[catch];
+                LeftParenthesis;[(];
+                Identifier;[Exception];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                Keyword;[when];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[B];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[C];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [68..68)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.cspans.txt
new file mode 100644
index 0000000000..0b4bcf4edf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Code span at (1:0,1 [37] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (38:0,38 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt
new file mode 100644
index 0000000000..a954f77c66
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..38)::38 - [@try { foo(); } finally { Dispose(); }]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..38)::37 - [try { foo(); } finally { Dispose(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[finally];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Dispose];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [38..38)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.cspans.txt
new file mode 100644
index 0000000000..dce52a5221
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Code span at (1:0,1 [34] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt
new file mode 100644
index 0000000000..5bf4fcfbaf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..35)::35 - [@foreach(var foo in bar) { foo(); }]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..35)::34 - [foreach(var foo in bar) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.cspans.txt
new file mode 100644
index 0000000000..1c487bc0c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Code span at (1:0,1 [42] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt
new file mode 100644
index 0000000000..12634efa7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..43)::43 - [@for(int i = 0; i++; i < length) { foo(); }]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..43)::42 - [for(int i = 0; i++; i < length) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[for];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Increment;[++];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                Identifier;[length];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.cspans.txt
new file mode 100644
index 0000000000..887f311722
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt
new file mode 100644
index 0000000000..70766aa364
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..20)::20 - [@if(true) { foo(); }]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..20)::19 - [if(true) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.cspans.txt
new file mode 100644
index 0000000000..33dc768c7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Code span at (1:0,1 [20] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt
new file mode 100644
index 0000000000..1bb156c26d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..21)::21 - [@lock(baz) { foo(); }]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..21)::20 - [lock(baz) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[lock];
+                LeftParenthesis;[(];
+                Identifier;[baz];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.cspans.txt
new file mode 100644
index 0000000000..2ed26af598
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Code span at (1:0,1 [38] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [39] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.diag.txt
new file mode 100644
index 0000000000..994acd46f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.diag.txt
@@ -0,0 +1 @@
+(1,15): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.stree.txt
new file mode 100644
index 0000000000..e0398c5923
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/MalformedAwaitForEachStatement.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..39)::39 - [@await foreach(var foo in bar { foo(); ]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..39)::39
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..39)::38 - [await foreach(var foo in bar { foo(); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[await];
+                Whitespace;[ ];
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[bar];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt
new file mode 100644
index 0000000000..11ff79adf0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [3] )
+Code span at (1:0,1 [2] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [3] )
+Markup span at (3:0,3 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt
new file mode 100644
index 0000000000..a55975b613
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..7)::7 - [@is foo]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..3)::3
+            CSharpImplicitExpression - [0..3)::3
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..3)::2
+                    CSharpCodeBlock - [1..3)::2
+                        CSharpExpressionLiteral - [1..3)::2 - [is] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Keyword;[is];
+        MarkupTextLiteral - [3..7)::4 - [ foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[foo];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.cspans.txt
new file mode 100644
index 0000000000..8ead4f60c2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [40] )
+Code span at (1:0,1 [39] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [40] )
+Markup span at (40:0,40 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt
new file mode 100644
index 0000000000..6769177337
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..42)::42 - [@using   static   global::System.Console  ]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            RazorDirective - [0..40)::40
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..40)::39
+                    CSharpStatementLiteral - [1..40)::39 - [using   static   global::System.Console] - Gen<Import:   static   global::System.Console;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[   ];
+                        Keyword;[static];
+                        Whitespace;[   ];
+                        Identifier;[global];
+                        DoubleColon;[::];
+                        Identifier;[System];
+                        Dot;[.];
+                        Identifier;[Console];
+        MarkupTextLiteral - [40..42)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[  ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.cspans.txt
new file mode 100644
index 0000000000..e4feb782e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Code span at (1:0,1 [35] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt
new file mode 100644
index 0000000000..2944c79da1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..36)::36 - [@using static global::System.Console]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            RazorDirective - [0..36)::36
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..36)::35
+                    CSharpStatementLiteral - [1..36)::35 - [using static global::System.Console] - Gen<Import: static global::System.Console;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Keyword;[static];
+                        Whitespace;[ ];
+                        Identifier;[global];
+                        DoubleColon;[::];
+                        Identifier;[System];
+                        Dot;[.];
+                        Identifier;[Console];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.cspans.txt
new file mode 100644
index 0000000000..8510b2c37d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Code span at (1:0,1 [27] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt
new file mode 100644
index 0000000000..553f6174f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..28)::28 - [@using static System.Console]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            RazorDirective - [0..28)::28
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..28)::27
+                    CSharpStatementLiteral - [1..28)::27 - [using static System.Console] - Gen<Import: static System.Console;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Keyword;[static];
+                        Whitespace;[ ];
+                        Identifier;[System];
+                        Dot;[.];
+                        Identifier;[Console];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.cspans.txt
new file mode 100644
index 0000000000..6baa3a6c93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [13] )
+Code span at (1:0,1 [12] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [13] )
+Markup span at (13:0,13 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt
new file mode 100644
index 0000000000..25a5facf95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..13)::13 - [@using static]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            RazorDirective - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..13)::12
+                    CSharpStatementLiteral - [1..13)::12 - [using static] - Gen<Import: static;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Keyword;[static];
+        MarkupTextLiteral - [13..13)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.cspans.txt
new file mode 100644
index 0000000000..c2b5fb0a36
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt
new file mode 100644
index 0000000000..87f25da2f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..20)::20 - [@using static System]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    CSharpStatementLiteral - [1..20)::19 - [using static System] - Gen<Import: static System;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Keyword;[static];
+                        Whitespace;[ ];
+                        Identifier;[System];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.cspans.txt
new file mode 100644
index 0000000000..cdeba78164
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (1:0,1 [22] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt
new file mode 100644
index 0000000000..5ccdbf8b7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..23)::23 - [@switch(foo) { foo(); }]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..23)::22 - [switch(foo) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[switch];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.cspans.txt
new file mode 100644
index 0000000000..11cc3bcb68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt
new file mode 100644
index 0000000000..9f95d564bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [@try { foo(); }]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..15)::14 - [try { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[try];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.cspans.txt
new file mode 100644
index 0000000000..e3ee30b682
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [41] )
+Code span at (1:0,1 [40] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt
new file mode 100644
index 0000000000..a3d95afa7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..41)::41 - [@using System.Text.Encoding.ASCIIEncoding]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            RazorDirective - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..41)::40
+                    CSharpStatementLiteral - [1..41)::40 - [using System.Text.Encoding.ASCIIEncoding] - Gen<Import: System.Text.Encoding.ASCIIEncoding;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[System];
+                        Dot;[.];
+                        Identifier;[Text];
+                        Dot;[.];
+                        Identifier;[Encoding];
+                        Dot;[.];
+                        Identifier;[ASCIIEncoding];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.cspans.txt
new file mode 100644
index 0000000000..6a5ad243c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Code span at (1:0,1 [41] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (42:0,42 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt
new file mode 100644
index 0000000000..9747414ae4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..42)::42 - [@using(var foo = new Foo()) { foo.Bar(); }]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..42)::41 - [using(var foo = new Foo()) { foo.Bar(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[using];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Keyword;[new];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Dot;[.];
+                Identifier;[Bar];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.cspans.txt
new file mode 100644
index 0000000000..cde43d9d9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [79] )
+Code span at (1:0,1 [78] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [79] )
+Markup span at (79:0,79 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [79] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt
new file mode 100644
index 0000000000..ea46ea988b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..79)::79 - [@using StringDictionary = System.Collections.Generic.Dictionary<string, string>]
+    MarkupBlock - [0..79)::79
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..79)::79
+            RazorDirective - [0..79)::79
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..79)::78
+                    CSharpStatementLiteral - [1..79)::78 - [using StringDictionary = System.Collections.Generic.Dictionary<string, string>] - Gen<Import: StringDictionary = System.Collections.Generic.Dictionary<string, string>;> - SpanEditHandler;Accepts:AnyExceptNewline
+                        Keyword;[using];
+                        Whitespace;[ ];
+                        Identifier;[StringDictionary];
+                        Whitespace;[ ];
+                        Assign;[=];
+                        Whitespace;[ ];
+                        Identifier;[System];
+                        Dot;[.];
+                        Identifier;[Collections];
+                        Dot;[.];
+                        Identifier;[Generic];
+                        Dot;[.];
+                        Identifier;[Dictionary];
+                        LessThan;[<];
+                        Keyword;[string];
+                        Comma;[,];
+                        Whitespace;[ ];
+                        Keyword;[string];
+                        GreaterThan;[>];
+        MarkupTextLiteral - [79..79)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.cspans.txt
new file mode 100644
index 0000000000..8fd6b20bde
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [126] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [126] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [126] )
+Code span at (2:0,2 [123] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [126] )
+MetaCode span at (125:0,125 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [126] )
+Markup span at (126:0,126 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [126] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.stree.txt
new file mode 100644
index 0000000000..a3eed94cbe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Complex.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..126)::126 - [@{ using Some.Disposable.TypeName foo = GetDisposable<Some.Disposable.TypeName>(() => { using var bar = otherDisposable; }); }]
+    MarkupBlock - [0..126)::126
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..126)::126
+            CSharpStatement - [0..126)::126
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..126)::125
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..125)::123
+                        CSharpStatementLiteral - [2..125)::123 - [ using Some.Disposable.TypeName foo = GetDisposable<Some.Disposable.TypeName>(() => { using var bar = otherDisposable; }); ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[using];
+                            Whitespace;[ ];
+                            Identifier;[Some];
+                            Dot;[.];
+                            Identifier;[Disposable];
+                            Dot;[.];
+                            Identifier;[TypeName];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[GetDisposable];
+                            LessThan;[<];
+                            Identifier;[Some];
+                            Dot;[.];
+                            Identifier;[Disposable];
+                            Dot;[.];
+                            Identifier;[TypeName];
+                            GreaterThan;[>];
+                            LeftParenthesis;[(];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            GreaterThanEqual;[=>];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Keyword;[using];
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[otherDisposable];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [125..126)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [126..126)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.cspans.txt
new file mode 100644
index 0000000000..3b71285c08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Code span at (2:0,2 [33] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.stree.txt
new file mode 100644
index 0000000000..3a8984ebc9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/Using_VariableDeclaration_Simple.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..36)::36 - [@{ using var foo = someDisposable; }]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            CSharpStatement - [0..36)::36
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..36)::35
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..35)::33
+                        CSharpStatementLiteral - [2..35)::33 - [ using var foo = someDisposable; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[using];
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[someDisposable];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.cspans.txt
new file mode 100644
index 0000000000..cdeba78164
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (1:0,1 [22] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt
new file mode 100644
index 0000000000..4174c105bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..23)::23 - [@while(true) { foo(); }]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..23)::22 - [while(true) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Keyword;[while];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[foo];
+                LeftParenthesis;[(];
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt
new file mode 100644
index 0000000000..91eb2c5b1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [38] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [38] )
+Code span at (2:0,2 [16] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [38] )
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Markup block at (18:0,18 [18] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (19:0,19 [3] )
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [18] )
+Transition span at (27:0,27 [1] ) (Accepts:None) - Parent: Expression block at (27:0,27 [5] )
+Code span at (28:0,28 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (27:0,27 [5] )
+Markup span at (32:0,32 [4] ) (Accepts:None) - Parent: Tag block at (32:0,32 [4] )
+Code span at (36:0,36 [1] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [38] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [38] )
+Markup span at (38:0,38 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
new file mode 100644
index 0000000000..d6482c071f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..38)::38 - [@(Html.Repeat(10, @<p>Foo #@item</p>))]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpExplicitExpression - [0..38)::38
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [1..38)::37
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [2..37)::35
+                        CSharpExpressionLiteral - [2..18)::16 - [Html.Repeat(10, ] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[Repeat];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[10];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [18..36)::18
+                            MarkupBlock - [18..36)::18
+                                MarkupTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [19..36)::17
+                                    MarkupStartTag - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [22..27)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [27..32)::5
+                                        CSharpImplicitExpression - [27..32)::5
+                                            CSharpTransition - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [28..32)::4
+                                                CSharpCodeBlock - [28..32)::4
+                                                    CSharpExpressionLiteral - [28..32)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [32..36)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpExpressionLiteral - [36..37)::1 - [)] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            RightParenthesis;[)];
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [38..38)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt
new file mode 100644
index 0000000000..90df13237d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [36] )
+Code span at (1:0,1 [16] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [36] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (17:0,17 [18] )
+Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: Tag block at (18:0,18 [3] )
+Markup span at (21:0,21 [5] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [18] )
+Transition span at (26:0,26 [1] ) (Accepts:None) - Parent: Expression block at (26:0,26 [5] )
+Code span at (27:0,27 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (26:0,26 [5] )
+Markup span at (31:0,31 [4] ) (Accepts:None) - Parent: Tag block at (31:0,31 [4] )
+Code span at (35:0,35 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
new file mode 100644
index 0000000000..c12bad27f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..36)::36 - [@Html.Repeat(10, @<p>Foo #@item</p>)]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            CSharpImplicitExpression - [0..36)::36
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..36)::35
+                    CSharpCodeBlock - [1..36)::35
+                        CSharpExpressionLiteral - [1..17)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[Repeat];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[10];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [17..35)::18
+                            MarkupBlock - [17..35)::18
+                                MarkupTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [18..35)::17
+                                    MarkupStartTag - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [21..26)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [26..31)::5
+                                        CSharpImplicitExpression - [26..31)::5
+                                            CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [27..31)::4
+                                                CSharpCodeBlock - [27..31)::4
+                                                    CSharpExpressionLiteral - [27..31)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [31..35)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpExpressionLiteral - [35..36)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt
new file mode 100644
index 0000000000..185f8e0ad1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [71] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [71] )
+Code span at (1:0,1 [48] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [71] )
+Transition span at (49:0,49 [1] ) (Accepts:None) - Parent: Markup block at (49:0,49 [18] )
+Markup span at (50:0,50 [3] ) (Accepts:None) - Parent: Tag block at (50:0,50 [3] )
+Markup span at (53:0,53 [5] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [18] )
+Transition span at (58:0,58 [1] ) (Accepts:None) - Parent: Expression block at (58:0,58 [5] )
+Code span at (59:0,59 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (58:0,58 [5] )
+Markup span at (63:0,63 [4] ) (Accepts:None) - Parent: Tag block at (63:0,63 [4] )
+Code span at (67:0,67 [4] ) (Accepts:None) - Parent: Statement block at (0:0,0 [71] )
+Markup span at (71:0,71 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [71] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
new file mode 100644
index 0000000000..c5e726c705
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..71)::71 - [@foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }]
+    MarkupBlock - [0..71)::71
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..71)::71
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..49)::48 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Html];
+                Dot;[.];
+                Identifier;[ExecuteTemplate];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Comma;[,];
+                Whitespace;[ ];
+            CSharpTemplateBlock - [49..67)::18
+                MarkupBlock - [49..67)::18
+                    MarkupTransition - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    MarkupElement - [50..67)::17
+                        MarkupStartTag - [50..53)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [53..58)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [58..63)::5
+                            CSharpImplicitExpression - [58..63)::5
+                                CSharpTransition - [58..59)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [59..63)::4
+                                    CSharpCodeBlock - [59..63)::4
+                                        CSharpExpressionLiteral - [59..63)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupEndTag - [63..67)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+            CSharpStatementLiteral - [67..71)::4 - [); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [71..71)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt
new file mode 100644
index 0000000000..f0f818c60c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [66] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [66] )
+Code span at (2:0,2 [42] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [66] )
+Transition span at (44:0,44 [1] ) (Accepts:None) - Parent: Markup block at (44:0,44 [18] )
+Markup span at (45:0,45 [3] ) (Accepts:None) - Parent: Tag block at (45:0,45 [3] )
+Markup span at (48:0,48 [5] ) (Accepts:Any) - Parent: Markup block at (44:0,44 [18] )
+Transition span at (53:0,53 [1] ) (Accepts:None) - Parent: Expression block at (53:0,53 [5] )
+Code span at (54:0,54 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (53:0,53 [5] )
+Markup span at (58:0,58 [4] ) (Accepts:None) - Parent: Tag block at (58:0,58 [4] )
+Code span at (62:0,62 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [66] )
+MetaCode span at (65:0,65 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [66] )
+Markup span at (66:0,66 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
new file mode 100644
index 0000000000..2073b33dd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
@@ -0,0 +1,64 @@
+RazorDocument - [0..66)::66 - [@{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }]
+    MarkupBlock - [0..66)::66
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..66)::66
+            CSharpStatement - [0..66)::66
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..66)::65
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..65)::63
+                        CSharpStatementLiteral - [2..44)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[ExecuteTemplate];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [44..62)::18
+                            MarkupBlock - [44..62)::18
+                                MarkupTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [45..62)::17
+                                    MarkupStartTag - [45..48)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [48..53)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [53..58)::5
+                                        CSharpImplicitExpression - [53..58)::5
+                                            CSharpTransition - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [54..58)::4
+                                                CSharpCodeBlock - [54..58)::4
+                                                    CSharpExpressionLiteral - [54..58)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [58..62)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [62..65)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [65..66)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [66..66)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.cspans.txt
new file mode 100644
index 0000000000..bd2c061107
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Code span at (2:0,2 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [12] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Markup block at (3:0,3 [8] )
+MetaCode span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [8] )
+Markup span at (5:0,5 [6] ) (Accepts:None) - Parent: Markup block at (3:0,3 [8] )
+Code span at (11:1,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (11:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Markup span at (12:1,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
new file mode 100644
index 0000000000..6f9495273c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..12)::12 - [@{i@: barLF}]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpStatement - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..12)::11
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        CSharpStatementLiteral - [2..3)::1 - [i] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Identifier;[i];
+                        CSharpTemplateBlock - [3..11)::8
+                            MarkupBlock - [3..11)::8
+                                MarkupTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Colon;[:];
+                                MarkupTextLiteral - [5..11)::6 - [ barLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    NewLine;[LF];
+                        CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.cspans.txt
new file mode 100644
index 0000000000..5c5175b1b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Code span at (2:0,2 [11] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (13:0,13 [8] )
+MetaCode span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [8] )
+Markup span at (15:0,15 [6] ) (Accepts:None) - Parent: Markup block at (13:0,13 [8] )
+Code span at (21:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:1,2 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:1,3 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
new file mode 100644
index 0000000000..986b3afba4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..24)::24 - [@{ var foo = @: barLF; }]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        CSharpStatementLiteral - [2..13)::11 - [ var foo = ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [13..21)::8
+                            MarkupBlock - [13..21)::8
+                                MarkupTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                RazorMetaCode - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Colon;[:];
+                                MarkupTextLiteral - [15..21)::6 - [ barLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    NewLine;[LF];
+                        CSharpStatementLiteral - [21..23)::2 - [; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt
new file mode 100644
index 0000000000..f16349c57b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [56] )
+Code span at (1:0,1 [16] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [56] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (17:0,17 [18] )
+Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: Tag block at (18:0,18 [3] )
+Markup span at (21:0,21 [5] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [18] )
+Transition span at (26:0,26 [1] ) (Accepts:None) - Parent: Expression block at (26:0,26 [5] )
+Code span at (27:0,27 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (26:0,26 [5] )
+Markup span at (31:0,31 [4] ) (Accepts:None) - Parent: Tag block at (31:0,31 [4] )
+Code span at (35:0,35 [2] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [56] )
+Transition span at (37:0,37 [1] ) (Accepts:None) - Parent: Markup block at (37:0,37 [18] )
+Markup span at (38:0,38 [3] ) (Accepts:None) - Parent: Tag block at (38:0,38 [3] )
+Markup span at (41:0,41 [5] ) (Accepts:Any) - Parent: Markup block at (37:0,37 [18] )
+Transition span at (46:0,46 [1] ) (Accepts:None) - Parent: Expression block at (46:0,46 [5] )
+Code span at (47:0,47 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (46:0,46 [5] )
+Markup span at (51:0,51 [4] ) (Accepts:None) - Parent: Tag block at (51:0,51 [4] )
+Code span at (55:0,55 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [56] )
+Markup span at (56:0,56 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
new file mode 100644
index 0000000000..a14beedeab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
@@ -0,0 +1,77 @@
+RazorDocument - [0..56)::56 - [@Html.Repeat(10, @<p>Foo #@item</p>, @<p>Foo #@item</p>)]
+    MarkupBlock - [0..56)::56
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpImplicitExpression - [0..56)::56
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..56)::55
+                    CSharpCodeBlock - [1..56)::55
+                        CSharpExpressionLiteral - [1..17)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[Repeat];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[10];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [17..35)::18
+                            MarkupBlock - [17..35)::18
+                                MarkupTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [18..35)::17
+                                    MarkupStartTag - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [21..26)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [26..31)::5
+                                        CSharpImplicitExpression - [26..31)::5
+                                            CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [27..31)::4
+                                                CSharpCodeBlock - [27..31)::4
+                                                    CSharpExpressionLiteral - [27..31)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [31..35)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpExpressionLiteral - [35..37)::2 - [, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [37..55)::18
+                            MarkupBlock - [37..55)::18
+                                MarkupTransition - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [38..55)::17
+                                    MarkupStartTag - [38..41)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [41..46)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [46..51)::5
+                                        CSharpImplicitExpression - [46..51)::5
+                                            CSharpTransition - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [47..51)::4
+                                                CSharpCodeBlock - [47..51)::4
+                                                    CSharpExpressionLiteral - [47..51)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [51..55)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpExpressionLiteral - [55..56)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [56..56)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt
new file mode 100644
index 0000000000..995931257d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [91] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [91] )
+Code span at (1:0,1 [48] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [91] )
+Transition span at (49:0,49 [1] ) (Accepts:None) - Parent: Markup block at (49:0,49 [18] )
+Markup span at (50:0,50 [3] ) (Accepts:None) - Parent: Tag block at (50:0,50 [3] )
+Markup span at (53:0,53 [5] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [18] )
+Transition span at (58:0,58 [1] ) (Accepts:None) - Parent: Expression block at (58:0,58 [5] )
+Code span at (59:0,59 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (58:0,58 [5] )
+Markup span at (63:0,63 [4] ) (Accepts:None) - Parent: Tag block at (63:0,63 [4] )
+Code span at (67:0,67 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [91] )
+Transition span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (69:0,69 [18] )
+Markup span at (70:0,70 [3] ) (Accepts:None) - Parent: Tag block at (70:0,70 [3] )
+Markup span at (73:0,73 [5] ) (Accepts:Any) - Parent: Markup block at (69:0,69 [18] )
+Transition span at (78:0,78 [1] ) (Accepts:None) - Parent: Expression block at (78:0,78 [5] )
+Code span at (79:0,79 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (78:0,78 [5] )
+Markup span at (83:0,83 [4] ) (Accepts:None) - Parent: Tag block at (83:0,83 [4] )
+Code span at (87:0,87 [4] ) (Accepts:None) - Parent: Statement block at (0:0,0 [91] )
+Markup span at (91:0,91 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [91] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
new file mode 100644
index 0000000000..e304e697ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
@@ -0,0 +1,88 @@
+RazorDocument - [0..91)::91 - [@foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }]
+    MarkupBlock - [0..91)::91
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..91)::91
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..49)::48 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Html];
+                Dot;[.];
+                Identifier;[ExecuteTemplate];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Comma;[,];
+                Whitespace;[ ];
+            CSharpTemplateBlock - [49..67)::18
+                MarkupBlock - [49..67)::18
+                    MarkupTransition - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    MarkupElement - [50..67)::17
+                        MarkupStartTag - [50..53)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [53..58)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [58..63)::5
+                            CSharpImplicitExpression - [58..63)::5
+                                CSharpTransition - [58..59)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [59..63)::4
+                                    CSharpCodeBlock - [59..63)::4
+                                        CSharpExpressionLiteral - [59..63)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupEndTag - [63..67)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+            CSharpStatementLiteral - [67..69)::2 - [, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Comma;[,];
+                Whitespace;[ ];
+            CSharpTemplateBlock - [69..87)::18
+                MarkupBlock - [69..87)::18
+                    MarkupTransition - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    MarkupElement - [70..87)::17
+                        MarkupStartTag - [70..73)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [73..78)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [78..83)::5
+                            CSharpImplicitExpression - [78..83)::5
+                                CSharpTransition - [78..79)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [79..83)::4
+                                    CSharpCodeBlock - [79..83)::4
+                                        CSharpExpressionLiteral - [79..83)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupEndTag - [83..87)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+            CSharpStatementLiteral - [87..91)::4 - [); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [91..91)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt
new file mode 100644
index 0000000000..217bee2ec1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt
@@ -0,0 +1,20 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [86] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [86] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [86] )
+Code span at (2:0,2 [42] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [86] )
+Transition span at (44:0,44 [1] ) (Accepts:None) - Parent: Markup block at (44:0,44 [18] )
+Markup span at (45:0,45 [3] ) (Accepts:None) - Parent: Tag block at (45:0,45 [3] )
+Markup span at (48:0,48 [5] ) (Accepts:Any) - Parent: Markup block at (44:0,44 [18] )
+Transition span at (53:0,53 [1] ) (Accepts:None) - Parent: Expression block at (53:0,53 [5] )
+Code span at (54:0,54 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (53:0,53 [5] )
+Markup span at (58:0,58 [4] ) (Accepts:None) - Parent: Tag block at (58:0,58 [4] )
+Code span at (62:0,62 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [86] )
+Transition span at (64:0,64 [1] ) (Accepts:None) - Parent: Markup block at (64:0,64 [18] )
+Markup span at (65:0,65 [3] ) (Accepts:None) - Parent: Tag block at (65:0,65 [3] )
+Markup span at (68:0,68 [5] ) (Accepts:Any) - Parent: Markup block at (64:0,64 [18] )
+Transition span at (73:0,73 [1] ) (Accepts:None) - Parent: Expression block at (73:0,73 [5] )
+Code span at (74:0,74 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (73:0,73 [5] )
+Markup span at (78:0,78 [4] ) (Accepts:None) - Parent: Tag block at (78:0,78 [4] )
+Code span at (82:0,82 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [86] )
+MetaCode span at (85:0,85 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [86] )
+Markup span at (86:0,86 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [86] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
new file mode 100644
index 0000000000..3d0ccca4b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
@@ -0,0 +1,93 @@
+RazorDocument - [0..86)::86 - [@{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }]
+    MarkupBlock - [0..86)::86
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..86)::86
+            CSharpStatement - [0..86)::86
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..86)::85
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..85)::83
+                        CSharpStatementLiteral - [2..44)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[ExecuteTemplate];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [44..62)::18
+                            MarkupBlock - [44..62)::18
+                                MarkupTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [45..62)::17
+                                    MarkupStartTag - [45..48)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [48..53)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [53..58)::5
+                                        CSharpImplicitExpression - [53..58)::5
+                                            CSharpTransition - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [54..58)::4
+                                                CSharpCodeBlock - [54..58)::4
+                                                    CSharpExpressionLiteral - [54..58)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [58..62)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [62..64)::2 - [, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [64..82)::18
+                            MarkupBlock - [64..82)::18
+                                MarkupTransition - [64..65)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [65..82)::17
+                                    MarkupStartTag - [65..68)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [68..73)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [73..78)::5
+                                        CSharpImplicitExpression - [73..78)::5
+                                            CSharpTransition - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [74..78)::4
+                                                CSharpCodeBlock - [74..78)::4
+                                                    CSharpExpressionLiteral - [74..78)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [78..82)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [82..85)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [85..86)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [86..86)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt
new file mode 100644
index 0000000000..c926c0bb0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [62] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [62] )
+Code span at (1:0,1 [16] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [62] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (17:0,17 [44] )
+Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: Tag block at (18:0,18 [3] )
+Markup span at (21:0,21 [5] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [44] )
+Transition span at (26:0,26 [1] ) (Accepts:None) - Parent: Expression block at (26:0,26 [31] )
+Code span at (27:0,27 [16] ) (Accepts:Any) - Parent: Expression block at (26:0,26 [31] )
+Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Markup block at (43:0,43 [13] )
+Markup span at (44:0,44 [3] ) (Accepts:None) - Parent: Tag block at (44:0,44 [3] )
+Markup span at (47:0,47 [0] ) (Accepts:Any) - Parent: Markup block at (43:0,43 [13] )
+Transition span at (47:0,47 [1] ) (Accepts:None) - Parent: Expression block at (47:0,47 [5] )
+Code span at (48:0,48 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (47:0,47 [5] )
+Markup span at (52:0,52 [4] ) (Accepts:None) - Parent: Tag block at (52:0,52 [4] )
+Code span at (56:0,56 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (26:0,26 [31] )
+Markup span at (57:0,57 [4] ) (Accepts:None) - Parent: Tag block at (57:0,57 [4] )
+Code span at (61:0,61 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [62] )
+Markup span at (62:0,62 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [62] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.diag.txt
new file mode 100644
index 0000000000..f634e63ad3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.diag.txt
@@ -0,0 +1 @@
+(1,44): Error RZ2003: Inline markup blocks (@<p>Content</p>) cannot be nested.  Only one level of inline markup is allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
new file mode 100644
index 0000000000..df8ed3f5c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
@@ -0,0 +1,80 @@
+RazorDocument - [0..62)::62 - [@Html.Repeat(10, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>)]
+    MarkupBlock - [0..62)::62
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..62)::62
+            CSharpImplicitExpression - [0..62)::62
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..62)::61
+                    CSharpCodeBlock - [1..62)::61
+                        CSharpExpressionLiteral - [1..17)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[Repeat];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[10];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [17..61)::44
+                            MarkupBlock - [17..61)::44
+                                MarkupTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [18..61)::43
+                                    MarkupStartTag - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [21..26)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [26..57)::31
+                                        CSharpImplicitExpression - [26..57)::31
+                                            CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [27..57)::30
+                                                CSharpCodeBlock - [27..57)::30
+                                                    CSharpExpressionLiteral - [27..43)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                                                        Identifier;[Html];
+                                                        Dot;[.];
+                                                        Identifier;[Repeat];
+                                                        LeftParenthesis;[(];
+                                                        IntegerLiteral;[10];
+                                                        Comma;[,];
+                                                        Whitespace;[ ];
+                                                    CSharpTemplateBlock - [43..56)::13
+                                                        MarkupBlock - [43..56)::13
+                                                            MarkupTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            MarkupElement - [44..56)::12
+                                                                MarkupStartTag - [44..47)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                                    OpenAngle;[<];
+                                                                    Text;[p];
+                                                                    CloseAngle;[>];
+                                                                MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                    Marker;[];
+                                                                CSharpCodeBlock - [47..52)::5
+                                                                    CSharpImplicitExpression - [47..52)::5
+                                                                        CSharpTransition - [47..48)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                            Transition;[@];
+                                                                        CSharpImplicitExpressionBody - [48..52)::4
+                                                                            CSharpCodeBlock - [48..52)::4
+                                                                                CSharpExpressionLiteral - [48..52)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                                    Identifier;[item];
+                                                                MarkupEndTag - [52..56)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                                    OpenAngle;[<];
+                                                                    ForwardSlash;[/];
+                                                                    Text;[p];
+                                                                    CloseAngle;[>];
+                                                    CSharpExpressionLiteral - [56..57)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        RightParenthesis;[)];
+                                    MarkupEndTag - [57..61)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpExpressionLiteral - [61..62)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [62..62)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt
new file mode 100644
index 0000000000..338b4bec5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [97] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [97] )
+Code span at (1:0,1 [48] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [97] )
+Transition span at (49:0,49 [1] ) (Accepts:None) - Parent: Markup block at (49:0,49 [44] )
+Markup span at (50:0,50 [3] ) (Accepts:None) - Parent: Tag block at (50:0,50 [3] )
+Markup span at (53:0,53 [5] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [44] )
+Transition span at (58:0,58 [1] ) (Accepts:None) - Parent: Expression block at (58:0,58 [31] )
+Code span at (59:0,59 [16] ) (Accepts:Any) - Parent: Expression block at (58:0,58 [31] )
+Transition span at (75:0,75 [1] ) (Accepts:None) - Parent: Markup block at (75:0,75 [13] )
+Markup span at (76:0,76 [3] ) (Accepts:None) - Parent: Tag block at (76:0,76 [3] )
+Markup span at (79:0,79 [0] ) (Accepts:Any) - Parent: Markup block at (75:0,75 [13] )
+Transition span at (79:0,79 [1] ) (Accepts:None) - Parent: Expression block at (79:0,79 [5] )
+Code span at (80:0,80 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (79:0,79 [5] )
+Markup span at (84:0,84 [4] ) (Accepts:None) - Parent: Tag block at (84:0,84 [4] )
+Code span at (88:0,88 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (58:0,58 [31] )
+Markup span at (89:0,89 [4] ) (Accepts:None) - Parent: Tag block at (89:0,89 [4] )
+Code span at (93:0,93 [4] ) (Accepts:None) - Parent: Statement block at (0:0,0 [97] )
+Markup span at (97:0,97 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [97] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.diag.txt
new file mode 100644
index 0000000000..2f60746b35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.diag.txt
@@ -0,0 +1 @@
+(1,76): Error RZ2003: Inline markup blocks (@<p>Content</p>) cannot be nested.  Only one level of inline markup is allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
new file mode 100644
index 0000000000..f55be998e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
@@ -0,0 +1,91 @@
+RazorDocument - [0..97)::97 - [@foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }]
+    MarkupBlock - [0..97)::97
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..97)::97
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..49)::48 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+                Identifier;[Html];
+                Dot;[.];
+                Identifier;[ExecuteTemplate];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                Comma;[,];
+                Whitespace;[ ];
+            CSharpTemplateBlock - [49..93)::44
+                MarkupBlock - [49..93)::44
+                    MarkupTransition - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    MarkupElement - [50..93)::43
+                        MarkupStartTag - [50..53)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [53..58)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [58..89)::31
+                            CSharpImplicitExpression - [58..89)::31
+                                CSharpTransition - [58..59)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [59..89)::30
+                                    CSharpCodeBlock - [59..89)::30
+                                        CSharpExpressionLiteral - [59..75)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                                            Identifier;[Html];
+                                            Dot;[.];
+                                            Identifier;[Repeat];
+                                            LeftParenthesis;[(];
+                                            IntegerLiteral;[10];
+                                            Comma;[,];
+                                            Whitespace;[ ];
+                                        CSharpTemplateBlock - [75..88)::13
+                                            MarkupBlock - [75..88)::13
+                                                MarkupTransition - [75..76)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupElement - [76..88)::12
+                                                    MarkupStartTag - [76..79)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                    MarkupTextLiteral - [79..79)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Marker;[];
+                                                    CSharpCodeBlock - [79..84)::5
+                                                        CSharpImplicitExpression - [79..84)::5
+                                                            CSharpTransition - [79..80)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [80..84)::4
+                                                                CSharpCodeBlock - [80..84)::4
+                                                                    CSharpExpressionLiteral - [80..84)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[item];
+                                                    MarkupEndTag - [84..88)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                        CSharpExpressionLiteral - [88..89)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            RightParenthesis;[)];
+                        MarkupEndTag - [89..93)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+            CSharpStatementLiteral - [93..97)::4 - [); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
+                Semicolon;[;];
+                Whitespace;[ ];
+                RightBrace;[}];
+        MarkupTextLiteral - [97..97)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt
new file mode 100644
index 0000000000..5ab2d1d144
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt
@@ -0,0 +1,20 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [92] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [92] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [92] )
+Code span at (2:0,2 [42] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [92] )
+Transition span at (44:0,44 [1] ) (Accepts:None) - Parent: Markup block at (44:0,44 [44] )
+Markup span at (45:0,45 [3] ) (Accepts:None) - Parent: Tag block at (45:0,45 [3] )
+Markup span at (48:0,48 [5] ) (Accepts:Any) - Parent: Markup block at (44:0,44 [44] )
+Transition span at (53:0,53 [1] ) (Accepts:None) - Parent: Expression block at (53:0,53 [31] )
+Code span at (54:0,54 [16] ) (Accepts:Any) - Parent: Expression block at (53:0,53 [31] )
+Transition span at (70:0,70 [1] ) (Accepts:None) - Parent: Markup block at (70:0,70 [13] )
+Markup span at (71:0,71 [3] ) (Accepts:None) - Parent: Tag block at (71:0,71 [3] )
+Markup span at (74:0,74 [0] ) (Accepts:Any) - Parent: Markup block at (70:0,70 [13] )
+Transition span at (74:0,74 [1] ) (Accepts:None) - Parent: Expression block at (74:0,74 [5] )
+Code span at (75:0,75 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (74:0,74 [5] )
+Markup span at (79:0,79 [4] ) (Accepts:None) - Parent: Tag block at (79:0,79 [4] )
+Code span at (83:0,83 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (53:0,53 [31] )
+Markup span at (84:0,84 [4] ) (Accepts:None) - Parent: Tag block at (84:0,84 [4] )
+Code span at (88:0,88 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [92] )
+MetaCode span at (91:0,91 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [92] )
+Markup span at (92:0,92 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [92] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.diag.txt
new file mode 100644
index 0000000000..94b69b6efc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.diag.txt
@@ -0,0 +1 @@
+(1,71): Error RZ2003: Inline markup blocks (@<p>Content</p>) cannot be nested.  Only one level of inline markup is allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
new file mode 100644
index 0000000000..23a9e76520
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
@@ -0,0 +1,96 @@
+RazorDocument - [0..92)::92 - [@{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }]
+    MarkupBlock - [0..92)::92
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..92)::92
+            CSharpStatement - [0..92)::92
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..92)::91
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..91)::89
+                        CSharpStatementLiteral - [2..44)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[ExecuteTemplate];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [44..88)::44
+                            MarkupBlock - [44..88)::44
+                                MarkupTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [45..88)::43
+                                    MarkupStartTag - [45..48)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [48..53)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [53..84)::31
+                                        CSharpImplicitExpression - [53..84)::31
+                                            CSharpTransition - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [54..84)::30
+                                                CSharpCodeBlock - [54..84)::30
+                                                    CSharpExpressionLiteral - [54..70)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                                                        Identifier;[Html];
+                                                        Dot;[.];
+                                                        Identifier;[Repeat];
+                                                        LeftParenthesis;[(];
+                                                        IntegerLiteral;[10];
+                                                        Comma;[,];
+                                                        Whitespace;[ ];
+                                                    CSharpTemplateBlock - [70..83)::13
+                                                        MarkupBlock - [70..83)::13
+                                                            MarkupTransition - [70..71)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            MarkupElement - [71..83)::12
+                                                                MarkupStartTag - [71..74)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                                    OpenAngle;[<];
+                                                                    Text;[p];
+                                                                    CloseAngle;[>];
+                                                                MarkupTextLiteral - [74..74)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                    Marker;[];
+                                                                CSharpCodeBlock - [74..79)::5
+                                                                    CSharpImplicitExpression - [74..79)::5
+                                                                        CSharpTransition - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                            Transition;[@];
+                                                                        CSharpImplicitExpressionBody - [75..79)::4
+                                                                            CSharpCodeBlock - [75..79)::4
+                                                                                CSharpExpressionLiteral - [75..79)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                                    Identifier;[item];
+                                                                MarkupEndTag - [79..83)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                                    OpenAngle;[<];
+                                                                    ForwardSlash;[/];
+                                                                    Text;[p];
+                                                                    CloseAngle;[>];
+                                                    CSharpExpressionLiteral - [83..84)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        RightParenthesis;[)];
+                                    MarkupEndTag - [84..88)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [88..91)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [91..92)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [92..92)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..ccfd591f1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [75] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [75] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [75] )
+Code span at (2:0,2 [42] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [75] )
+Transition span at (44:0,44 [1] ) (Accepts:None) - Parent: Markup block at (44:0,44 [27] )
+Markup span at (45:0,45 [2] ) (Accepts:Any) - Parent: Tag block at (45:0,45 [12] )
+Markup span at (47:0,47 [6] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [9] )
+Markup span at (53:0,53 [1] ) (Accepts:None) - Parent: Markup block at (53:0,53 [2] )
+Markup span at (54:0,54 [1] ) (Accepts:None) - Parent: Markup block at (53:0,53 [2] )
+Markup span at (55:0,55 [1] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [9] )
+Markup span at (56:0,56 [1] ) (Accepts:None) - Parent: Tag block at (45:0,45 [12] )
+Markup span at (57:0,57 [5] ) (Accepts:Any) - Parent: Markup block at (44:0,44 [27] )
+Transition span at (62:0,62 [1] ) (Accepts:None) - Parent: Expression block at (62:0,62 [5] )
+Code span at (63:0,63 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (62:0,62 [5] )
+Markup span at (67:0,67 [4] ) (Accepts:None) - Parent: Tag block at (67:0,67 [4] )
+Code span at (71:0,71 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [75] )
+MetaCode span at (74:0,74 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [75] )
+Markup span at (75:0,75 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [75] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..63dbd49360
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
@@ -0,0 +1,80 @@
+RazorDocument - [0..75)::75 - [@{ var foo = bar; Html.ExecuteTemplate(foo, @<p foo='@@'>Foo #@item</p>); }]
+    MarkupBlock - [0..75)::75
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..75)::75
+            CSharpStatement - [0..75)::75
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..75)::74
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..74)::72
+                        CSharpStatementLiteral - [2..44)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[bar];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[Html];
+                            Dot;[.];
+                            Identifier;[ExecuteTemplate];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            Comma;[,];
+                            Whitespace;[ ];
+                        CSharpTemplateBlock - [44..71)::27
+                            MarkupBlock - [44..71)::27
+                                MarkupTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [45..71)::26
+                                    MarkupStartTag - [45..57)::12 - [<p foo='@@'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        MarkupAttributeBlock - [47..56)::9 - [ foo='@@']
+                                            MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [48..51)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[foo];
+                                            Equals;[=];
+                                            MarkupTextLiteral - [52..53)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                SingleQuote;['];
+                                            GenericBlock - [53..55)::2
+                                                MarkupBlock - [53..55)::2
+                                                    MarkupTextLiteral - [53..54)::1 - [@] - Gen<LitAttr:@(53:0,53)> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    MarkupEphemeralTextLiteral - [54..55)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                            MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                SingleQuote;['];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [57..62)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[#];
+                                    CSharpCodeBlock - [62..67)::5
+                                        CSharpImplicitExpression - [62..67)::5
+                                            CSharpTransition - [62..63)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [63..67)::4
+                                                CSharpCodeBlock - [63..67)::4
+                                                    CSharpExpressionLiteral - [63..67)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupEndTag - [67..71)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [71..74)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [75..75)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.cspans.txt
new file mode 100644
index 0000000000..ba8948b5ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.cspans.txt
@@ -0,0 +1,22 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [71] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [71] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [71] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:None) - Parent: Tag block at (11:0,11 [3] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [12] )
+Markup span at (17:0,17 [4] ) (Accepts:None) - Parent: Tag block at (17:0,17 [4] )
+Markup span at (21:0,21 [1] ) (Accepts:None) - Parent: Markup block at (10:0,10 [12] )
+Code span at (22:0,22 [16] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [71] )
+Markup span at (38:0,38 [1] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [12] )
+Markup span at (39:0,39 [3] ) (Accepts:None) - Parent: Tag block at (39:0,39 [3] )
+Markup span at (42:0,42 [3] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [12] )
+Markup span at (45:0,45 [4] ) (Accepts:None) - Parent: Tag block at (45:0,45 [4] )
+Markup span at (49:0,49 [1] ) (Accepts:None) - Parent: Markup block at (38:0,38 [12] )
+Code span at (50:0,50 [8] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [71] )
+Markup span at (58:0,58 [1] ) (Accepts:Any) - Parent: Markup block at (58:0,58 [12] )
+Markup span at (59:0,59 [3] ) (Accepts:None) - Parent: Tag block at (59:0,59 [3] )
+Markup span at (62:0,62 [3] ) (Accepts:Any) - Parent: Markup block at (58:0,58 [12] )
+Markup span at (65:0,65 [4] ) (Accepts:None) - Parent: Tag block at (65:0,65 [4] )
+Markup span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (58:0,58 [12] )
+Code span at (70:0,70 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [71] )
+Markup span at (71:0,71 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [71] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
new file mode 100644
index 0000000000..c13cff2566
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
@@ -0,0 +1,86 @@
+RazorDocument - [0..71)::71 - [@if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> }]
+    MarkupBlock - [0..71)::71
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..71)::71
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..10)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [10..22)::12
+                MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [11..21)::10
+                    MarkupStartTag - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [14..17)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupEndTag - [17..21)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [22..38)::16 - [} else if(bar) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[bar];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [38..50)::12
+                MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [39..49)::10
+                    MarkupStartTag - [39..42)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [42..45)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+                    MarkupEndTag - [45..49)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [50..58)::8 - [} else {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
+                Whitespace;[ ];
+                Keyword;[else];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [58..70)::12
+                MarkupTextLiteral - [58..59)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [59..69)::10
+                    MarkupStartTag - [59..62)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [62..65)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Boz];
+                    MarkupEndTag - [65..69)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [69..70)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [70..71)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [71..71)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.cspans.txt
new file mode 100644
index 0000000000..adb029e02e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.cspans.txt
@@ -0,0 +1,24 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [75] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [75] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [75] )
+Code span at (2:0,2 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [75] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:None) - Parent: Tag block at (13:0,13 [3] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [12] )
+Markup span at (19:0,19 [4] ) (Accepts:None) - Parent: Tag block at (19:0,19 [4] )
+Markup span at (23:0,23 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [12] )
+Code span at (24:0,24 [16] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [75] )
+Markup span at (40:0,40 [1] ) (Accepts:Any) - Parent: Markup block at (40:0,40 [12] )
+Markup span at (41:0,41 [3] ) (Accepts:None) - Parent: Tag block at (41:0,41 [3] )
+Markup span at (44:0,44 [3] ) (Accepts:Any) - Parent: Markup block at (40:0,40 [12] )
+Markup span at (47:0,47 [4] ) (Accepts:None) - Parent: Tag block at (47:0,47 [4] )
+Markup span at (51:0,51 [1] ) (Accepts:None) - Parent: Markup block at (40:0,40 [12] )
+Code span at (52:0,52 [8] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [75] )
+Markup span at (60:0,60 [1] ) (Accepts:Any) - Parent: Markup block at (60:0,60 [12] )
+Markup span at (61:0,61 [3] ) (Accepts:None) - Parent: Tag block at (61:0,61 [3] )
+Markup span at (64:0,64 [3] ) (Accepts:Any) - Parent: Markup block at (60:0,60 [12] )
+Markup span at (67:0,67 [4] ) (Accepts:None) - Parent: Tag block at (67:0,67 [4] )
+Markup span at (71:0,71 [1] ) (Accepts:None) - Parent: Markup block at (60:0,60 [12] )
+Code span at (72:0,72 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [75] )
+MetaCode span at (74:0,74 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [75] )
+Markup span at (75:0,75 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [75] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
new file mode 100644
index 0000000000..8caaea2097
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
@@ -0,0 +1,95 @@
+RazorDocument - [0..75)::75 - [@{ if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> } }]
+    MarkupBlock - [0..75)::75
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..75)::75
+            CSharpStatement - [0..75)::75
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..75)::74
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..74)::72
+                        CSharpStatementLiteral - [2..12)::10 - [ if(foo) {] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                        MarkupBlock - [12..24)::12
+                            MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [13..23)::10
+                                MarkupStartTag - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [16..19)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Bar];
+                                MarkupEndTag - [19..23)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [24..40)::16 - [} else if(bar) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                            Keyword;[else];
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Identifier;[bar];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                        MarkupBlock - [40..52)::12
+                            MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [41..51)::10
+                                MarkupStartTag - [41..44)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [44..47)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Baz];
+                                MarkupEndTag - [47..51)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [52..60)::8 - [} else {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                            Keyword;[else];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                        MarkupBlock - [60..72)::12
+                            MarkupTextLiteral - [60..61)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [61..71)::10
+                                MarkupStartTag - [61..64)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [64..67)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Boz];
+                                MarkupEndTag - [67..71)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [72..74)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [75..75)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.cspans.txt
new file mode 100644
index 0000000000..b996780bfc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Code span at (1:0,1 [13] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+Transition span at (14:0,14 [6] ) (Accepts:None) - Parent: Tag block at (14:0,14 [6] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [14] )
+Transition span at (21:0,21 [7] ) (Accepts:None) - Parent: Tag block at (21:0,21 [7] )
+Code span at (28:0,28 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
new file mode 100644
index 0000000000..bf3516ae2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..30)::30 - [@if (i > 0) { <text>;</text> }]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..14)::13 - [if (i > 0) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Identifier;[i];
+                Whitespace;[ ];
+                GreaterThan;[>];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            MarkupBlock - [14..28)::14
+                MarkupElement - [14..28)::14
+                    MarkupStartTag - [14..20)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[text];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [20..21)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[;];
+                    MarkupEndTag - [21..28)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[text];
+                        CloseAngle;[>];
+            CSharpStatementLiteral - [28..30)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.cspans.txt
new file mode 100644
index 0000000000..2c37a80334
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Code span at (2:0,2 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+Transition span at (16:0,16 [6] ) (Accepts:None) - Parent: Tag block at (16:0,16 [6] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [14] )
+Transition span at (23:0,23 [7] ) (Accepts:None) - Parent: Tag block at (23:0,23 [7] )
+Code span at (30:0,30 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
new file mode 100644
index 0000000000..980017555f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..34)::34 - [@{ if (i > 0) { <text>;</text> } }]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        CSharpStatementLiteral - [2..16)::14 - [ if (i > 0) { ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[i];
+                            Whitespace;[ ];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                        MarkupBlock - [16..30)::14
+                            MarkupElement - [16..30)::14
+                                MarkupStartTag - [16..22)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [22..23)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[;];
+                                MarkupEndTag - [23..30)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..33)::3 - [ } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt
new file mode 100644
index 0000000000..8ce52132ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [162] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [162] )
+Code span at (1:0,1 [80] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [162] )
+Markup span at (81:2,0 [4] ) (Accepts:Any) - Parent: Markup block at (81:2,0 [46] )
+Markup span at (85:2,4 [3] ) (Accepts:None) - Parent: Tag block at (85:2,4 [3] )
+Markup span at (88:2,7 [15] ) (Accepts:Any) - Parent: Markup block at (81:2,0 [46] )
+Code span at (103:4,0 [8] ) (Accepts:Any) - Parent: Statement block at (103:4,0 [12] )
+Transition span at (111:4,8 [1] ) (Accepts:None) - Parent: Expression block at (111:4,8 [4] )
+Code span at (112:4,9 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (111:4,8 [4] )
+Markup span at (115:4,12 [6] ) (Accepts:Any) - Parent: Markup block at (81:2,0 [46] )
+Markup span at (121:5,4 [4] ) (Accepts:None) - Parent: Tag block at (121:5,4 [4] )
+Markup span at (125:5,8 [2] ) (Accepts:None) - Parent: Markup block at (81:2,0 [46] )
+Markup span at (127:6,0 [4] ) (Accepts:Any) - Parent: Markup block at (127:6,0 [14] )
+Transition span at (131:6,4 [1] ) (Accepts:None) - Parent: Markup block at (127:6,0 [14] )
+MetaCode span at (132:6,5 [1] ) (Accepts:Any) - Parent: Markup block at (127:6,0 [14] )
+Markup span at (133:6,6 [8] ) (Accepts:None) - Parent: Markup block at (127:6,0 [14] )
+Code span at (141:7,0 [21] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [162] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
new file mode 100644
index 0000000000..f9c1f89c55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
@@ -0,0 +1,82 @@
+RazorDocument - [0..162)::162 - [@if(foo) {LF    var foo = "After this statement there are 10 spaces";          LF    <p>LF        FooLF        @barLF    </p>LF    @:Hello!LF    var biz = boz;LF}]
+    MarkupBlock - [0..162)::162
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..162)::162
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..81)::80 - [if(foo) {LF    var foo = "After this statement there are 10 spaces";          LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[foo];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                StringLiteral;["After this statement there are 10 spaces"];
+                Semicolon;[;];
+                Whitespace;[          ];
+                NewLine;[LF];
+            MarkupBlock - [81..127)::46
+                MarkupTextLiteral - [81..85)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                MarkupElement - [85..125)::40
+                    MarkupStartTag - [85..88)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [88..103)::15 - [LF        FooLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                        Whitespace;[        ];
+                        Text;[Foo];
+                        NewLine;[LF];
+                    CSharpCodeBlock - [103..115)::12
+                        CSharpStatementLiteral - [103..111)::8 - [        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[        ];
+                        CSharpImplicitExpression - [111..115)::4
+                            CSharpTransition - [111..112)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [112..115)::3
+                                CSharpCodeBlock - [112..115)::3
+                                    CSharpExpressionLiteral - [112..115)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[bar];
+                    MarkupTextLiteral - [115..121)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                        Whitespace;[    ];
+                    MarkupEndTag - [121..125)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [125..127)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            MarkupBlock - [127..141)::14
+                MarkupTextLiteral - [127..131)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                MarkupTransition - [131..132)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorMetaCode - [132..133)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                    Colon;[:];
+                MarkupTextLiteral - [133..141)::8 - [Hello!LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Text;[Hello];
+                    Bang;[!];
+                    NewLine;[LF];
+            CSharpStatementLiteral - [141..162)::21 - [    var biz = boz;LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[    ];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[biz];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[boz];
+                Semicolon;[;];
+                NewLine;[LF];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt
new file mode 100644
index 0000000000..f1fa226b75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [30] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [30] )
+Transition span at (11:1,0 [1] ) (Accepts:None) - Parent: Markup block at (11:1,0 [18] )
+MetaCode span at (12:1,1 [1] ) (Accepts:Any) - Parent: Markup block at (11:1,0 [18] )
+Markup span at (13:1,2 [16] ) (Accepts:None) - Parent: Markup block at (11:1,0 [18] )
+Code span at (29:2,0 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [30] )
+Markup span at (30:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
new file mode 100644
index 0000000000..4e046e53ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..30)::30 - [@Foo(    LF@:<p>Foo</p>    LF)]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpImplicitExpression - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..30)::29
+                    CSharpCodeBlock - [1..30)::29
+                        CSharpExpressionLiteral - [1..11)::10 - [Foo(    LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Foo];
+                            LeftParenthesis;[(];
+                            Whitespace;[    ];
+                            NewLine;[LF];
+                        CSharpTemplateBlock - [11..29)::18
+                            MarkupBlock - [11..29)::18
+                                MarkupTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Colon;[:];
+                                MarkupTextLiteral - [13..29)::16 - [<p>Foo</p>    LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                    Text;[Foo];
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                    Whitespace;[    ];
+                                    NewLine;[LF];
+                        CSharpExpressionLiteral - [29..30)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.cspans.txt
new file mode 100644
index 0000000000..1bd9c8867a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+Transition span at (8:1,4 [1] ) (Accepts:None) - Parent: Markup block at (8:1,4 [18] )
+MetaCode span at (9:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [18] )
+Markup span at (10:1,6 [16] ) (Accepts:None) - Parent: Markup block at (8:1,4 [18] )
+Code span at (26:2,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
new file mode 100644
index 0000000000..ec8316ecf8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..27)::27 - [@{LF    @:<p>Foo</p>    LF}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        MarkupBlock - [8..26)::18
+                            MarkupTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [10..26)::16 - [<p>Foo</p>    LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                                Text;[Foo];
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                                Whitespace;[    ];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt
new file mode 100644
index 0000000000..a687eaf720
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [25] )
+Code span at (1:0,1 [8] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [25] )
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Markup block at (9:0,9 [11] )
+Markup span at (10:0,10 [3] ) (Accepts:None) - Parent: Tag block at (10:0,10 [3] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (9:0,9 [11] )
+Markup span at (16:0,16 [4] ) (Accepts:None) - Parent: Tag block at (16:0,16 [4] )
+Code span at (20:0,20 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
new file mode 100644
index 0000000000..b271586561
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..25)::25 - [@Foo(    @<p>Foo</p>    )]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpImplicitExpression - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..25)::24
+                    CSharpCodeBlock - [1..25)::24
+                        CSharpExpressionLiteral - [1..9)::8 - [Foo(    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Foo];
+                            LeftParenthesis;[(];
+                            Whitespace;[    ];
+                        CSharpTemplateBlock - [9..20)::11
+                            MarkupBlock - [9..20)::11
+                                MarkupTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupElement - [10..20)::10
+                                    MarkupStartTag - [10..13)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                    MarkupEndTag - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpExpressionLiteral - [20..25)::5 - [    )] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Whitespace;[    ];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.cspans.txt
new file mode 100644
index 0000000000..5b0b252277
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Transition span at (8:1,4 [1] ) (Accepts:None) - Parent: Markup block at (8:1,4 [11] )
+Markup span at (9:1,5 [3] ) (Accepts:None) - Parent: Tag block at (9:1,5 [3] )
+Markup span at (12:1,8 [3] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [11] )
+Markup span at (15:1,11 [4] ) (Accepts:None) - Parent: Tag block at (15:1,11 [4] )
+Code span at (19:1,15 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (25:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (26:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diag.txt
new file mode 100644
index 0000000000..fd4615efa6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diag.txt
@@ -0,0 +1,5 @@
+(2,5): Error RZ1009: The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
+
+@if(isLoggedIn) {
+    <p>Hello, @user!</p>
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
new file mode 100644
index 0000000000..630bd75bbb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..26)::26 - [@{LF    @<p>Foo</p>    LF}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        MarkupBlock - [8..19)::11
+                            MarkupTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupElement - [9..19)::10
+                                MarkupStartTag - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..25)::6 - [    LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[    ];
+                            NewLine;[LF];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.cspans.txt
new file mode 100644
index 0000000000..a8076b5e94
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (8:1,4 [3] ) (Accepts:None) - Parent: Tag block at (8:1,4 [3] )
+Markup span at (11:1,7 [3] ) (Accepts:Any) - Parent: Markup block at (8:1,4 [10] )
+Markup span at (14:1,10 [4] ) (Accepts:None) - Parent: Tag block at (14:1,10 [4] )
+Code span at (18:1,14 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
new file mode 100644
index 0000000000..736cbe9532
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..25)::25 - [@{LF    <p>Foo</p>    LF}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        MarkupBlock - [8..18)::10
+                            MarkupElement - [8..18)::10
+                                MarkupStartTag - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..24)::6 - [    LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[    ];
+                            NewLine;[LF];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.cspans.txt
new file mode 100644
index 0000000000..8d8980837d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Code span at (1:0,1 [29] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (30:0,30 [1] ) (Accepts:Any) - Parent: Markup block at (30:0,30 [12] )
+Markup span at (31:0,31 [3] ) (Accepts:None) - Parent: Tag block at (31:0,31 [3] )
+Markup span at (34:0,34 [3] ) (Accepts:Any) - Parent: Markup block at (30:0,30 [12] )
+Markup span at (37:0,37 [4] ) (Accepts:None) - Parent: Tag block at (37:0,37 [4] )
+Markup span at (41:0,41 [1] ) (Accepts:None) - Parent: Markup block at (30:0,30 [12] )
+Code span at (42:0,42 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
new file mode 100644
index 0000000000..831e37ead9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..43)::43 - [@for(int i = 0; i < 10; i++) { <p>Foo</p> }]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..30)::29 - [for(int i = 0; i < 10; i++) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[for];
+                LeftParenthesis;[(];
+                Keyword;[int];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Whitespace;[ ];
+                LessThan;[<];
+                Whitespace;[ ];
+                IntegerLiteral;[10];
+                Semicolon;[;];
+                Whitespace;[ ];
+                Identifier;[i];
+                Increment;[++];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [30..42)::12
+                MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupElement - [31..41)::10
+                    MarkupStartTag - [31..34)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [34..37)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [37..41)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [41..42)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Whitespace;[ ];
+            CSharpStatementLiteral - [42..43)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.cspans.txt
new file mode 100644
index 0000000000..308cd5d14f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+Code span at (2:0,2 [30] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [47] )
+Markup span at (32:0,32 [1] ) (Accepts:Any) - Parent: Markup block at (32:0,32 [12] )
+Markup span at (33:0,33 [3] ) (Accepts:None) - Parent: Tag block at (33:0,33 [3] )
+Markup span at (36:0,36 [3] ) (Accepts:Any) - Parent: Markup block at (32:0,32 [12] )
+Markup span at (39:0,39 [4] ) (Accepts:None) - Parent: Tag block at (39:0,39 [4] )
+Markup span at (43:0,43 [1] ) (Accepts:None) - Parent: Markup block at (32:0,32 [12] )
+Code span at (44:0,44 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [47] )
+MetaCode span at (46:0,46 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+Markup span at (47:0,47 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
new file mode 100644
index 0000000000..338f7b1022
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..47)::47 - [@{ for(int i = 0; i < 10; i++) { <p>Foo</p> } }]
+    MarkupBlock - [0..47)::47
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..47)::47
+            CSharpStatement - [0..47)::47
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..47)::46
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..46)::44
+                        CSharpStatementLiteral - [2..32)::30 - [ for(int i = 0; i < 10; i++) {] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[for];
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Whitespace;[ ];
+                            Identifier;[i];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[i];
+                            Whitespace;[ ];
+                            LessThan;[<];
+                            Whitespace;[ ];
+                            IntegerLiteral;[10];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                            Identifier;[i];
+                            Increment;[++];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                        MarkupBlock - [32..44)::12
+                            MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [33..43)::10
+                                MarkupStartTag - [33..36)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [36..39)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [44..46)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.cspans.txt
new file mode 100644
index 0000000000..e759ba2bed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [8] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Markup block at (10:0,10 [8] )
+MetaCode span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [8] )
+Markup span at (13:0,13 [5] ) (Accepts:None) - Parent: Markup block at (10:0,10 [8] )
+Code span at (18:1,0 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (19:1,1 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
new file mode 100644
index 0000000000..be98669bd5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..24)::24 - [@if(foo) { @:BarLF} zoop]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..10)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [10..18)::8
+                MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                    Colon;[:];
+                MarkupTextLiteral - [13..18)::5 - [BarLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Text;[Bar];
+                    NewLine;[LF];
+            CSharpStatementLiteral - [18..19)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
+        MarkupTextLiteral - [19..24)::5 - [ zoop] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[zoop];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.cspans.txt
new file mode 100644
index 0000000000..985b278a3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (2:0,2 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [8] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [8] )
+MetaCode span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [8] )
+Markup span at (15:0,15 [5] ) (Accepts:None) - Parent: Markup block at (12:0,12 [8] )
+Code span at (20:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:1,2 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:1,3 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
new file mode 100644
index 0000000000..6b53cd40f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..28)::28 - [@{ if(foo) { @:BarLF} } zoop]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        CSharpStatementLiteral - [2..12)::10 - [ if(foo) {] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                        MarkupBlock - [12..20)::8
+                            MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [15..20)::5 - [BarLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Text;[Bar];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [20..22)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..28)::5 - [ zoop] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[zoop];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.cspans.txt
new file mode 100644
index 0000000000..8ca4ca163f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [14] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Markup block at (10:0,10 [14] )
+MetaCode span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [14] )
+Markup span at (13:0,13 [11] ) (Accepts:None) - Parent: Markup block at (10:0,10 [14] )
+Code span at (24:1,0 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
new file mode 100644
index 0000000000..a495874e27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..25)::25 - [@if(foo) { @::SometextLF}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..10)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [10..24)::14
+                MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                    Colon;[:];
+                MarkupTextLiteral - [13..24)::11 - [:SometextLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Text;[:Sometext];
+                    NewLine;[LF];
+            CSharpStatementLiteral - [24..25)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.cspans.txt
new file mode 100644
index 0000000000..284bead87a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [15] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Markup block at (10:0,10 [15] )
+MetaCode span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [15] )
+Markup span at (13:0,13 [12] ) (Accepts:None) - Parent: Markup block at (10:0,10 [15] )
+Code span at (25:1,0 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
new file mode 100644
index 0000000000..64cf48ac22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..26)::26 - [@if(foo) { @:::SometextLF}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..10)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+            MarkupBlock - [10..25)::15
+                MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                    Colon;[:];
+                MarkupTextLiteral - [13..25)::12 - [::SometextLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Text;[::Sometext];
+                    NewLine;[LF];
+            CSharpStatementLiteral - [25..26)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.cspans.txt
new file mode 100644
index 0000000000..ba66ea2b8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Code span at (1:0,1 [33] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [68] )
+Transition span at (34:3,0 [1] ) (Accepts:None) - Parent: Markup block at (34:3,0 [7] )
+MetaCode span at (35:3,1 [1] ) (Accepts:Any) - Parent: Markup block at (34:3,0 [7] )
+Markup span at (36:3,2 [5] ) (Accepts:None) - Parent: Markup block at (34:3,0 [7] )
+Markup span at (41:4,0 [5] ) (Accepts:None) - Parent: Tag block at (41:4,0 [5] )
+Markup span at (46:4,5 [2] ) (Accepts:None) - Parent: Markup block at (41:4,0 [7] )
+Markup span at (48:5,0 [3] ) (Accepts:None) - Parent: Tag block at (48:5,0 [3] )
+Markup span at (51:5,3 [3] ) (Accepts:Any) - Parent: Markup block at (48:5,0 [12] )
+Markup span at (54:5,6 [4] ) (Accepts:None) - Parent: Tag block at (54:5,6 [4] )
+Markup span at (58:5,10 [2] ) (Accepts:None) - Parent: Markup block at (48:5,0 [12] )
+Transition span at (60:6,0 [1] ) (Accepts:None) - Parent: Markup block at (60:6,0 [7] )
+MetaCode span at (61:6,1 [1] ) (Accepts:Any) - Parent: Markup block at (60:6,0 [7] )
+Markup span at (62:6,2 [5] ) (Accepts:None) - Parent: Markup block at (60:6,0 [7] )
+Code span at (67:7,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Markup span at (68:7,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
new file mode 100644
index 0000000000..bb699f4b93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..68)::68 - [@foreach(var file in files){LFLFLF@:BazLF<br/>LF<a>Foo</a>LF@:BarLF}]
+    MarkupBlock - [0..68)::68
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..68)::68
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..34)::33 - [foreach(var file in files){LFLFLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[file];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[files];
+                RightParenthesis;[)];
+                LeftBrace;[{];
+                NewLine;[LF];
+                NewLine;[LF];
+                NewLine;[LF];
+            MarkupBlock - [34..41)::7
+                MarkupTransition - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                    Colon;[:];
+                MarkupTextLiteral - [36..41)::5 - [BazLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Text;[Baz];
+                    NewLine;[LF];
+            MarkupBlock - [41..48)::7
+                MarkupElement - [41..46)::5
+                    MarkupStartTag - [41..46)::5 - [<br/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[br];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [46..48)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            MarkupBlock - [48..60)::12
+                MarkupElement - [48..58)::10
+                    MarkupStartTag - [48..51)::3 - [<a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[a];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [51..54)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [54..58)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[a];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [58..60)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            MarkupBlock - [60..67)::7
+                MarkupTransition - [60..61)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorMetaCode - [61..62)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                    Colon;[:];
+                MarkupTextLiteral - [62..67)::5 - [BarLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    Text;[Bar];
+                    NewLine;[LF];
+            CSharpStatementLiteral - [67..68)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [68..68)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt
new file mode 100644
index 0000000000..1bc4567d7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [26] )
+Code span at (1:0,1 [16] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [26] )
+Transition span at (17:1,4 [1] ) (Accepts:None) - Parent: Markup block at (17:1,4 [8] )
+MetaCode span at (18:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (17:1,4 [8] )
+Markup span at (19:1,6 [1] ) (Accepts:Any) - Parent: Markup block at (17:1,4 [8] )
+Transition span at (20:1,7 [1] ) (Accepts:None) - Parent: Statement block at (20:1,7 [3] )
+MetaCode span at (21:1,8 [1] ) (Accepts:None) - Parent: Statement block at (20:1,7 [3] )
+Code span at (22:1,9 [0] ) (Accepts:Any) - Parent: Statement block at (20:1,7 [3] )
+MetaCode span at (22:1,9 [1] ) (Accepts:None) - Parent: Statement block at (20:1,7 [3] )
+Markup span at (23:1,10 [2] ) (Accepts:None) - Parent: Markup block at (17:1,4 [8] )
+Code span at (25:2,0 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [26] )
+Markup span at (26:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt
new file mode 100644
index 0000000000..63d7684102
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..26)::26 - [@Repeat(10,LF    @: @{}LF)]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpImplicitExpression - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..26)::25
+                    CSharpCodeBlock - [1..26)::25
+                        CSharpExpressionLiteral - [1..17)::16 - [Repeat(10,LF    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[Repeat];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[10];
+                            Comma;[,];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpTemplateBlock - [17..25)::8
+                            MarkupBlock - [17..25)::8
+                                MarkupTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Colon;[:];
+                                MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [20..23)::3
+                                    CSharpStatement - [20..23)::3
+                                        CSharpTransition - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpStatementBody - [21..23)::2
+                                            RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                LeftBrace;[{];
+                                            CSharpCodeBlock - [22..22)::0
+                                                CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                                    Marker;[];
+                                            RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightBrace;[}];
+                                MarkupTextLiteral - [23..25)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                        CSharpExpressionLiteral - [25..26)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.cspans.txt
new file mode 100644
index 0000000000..71420aa95e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Code span at (2:0,2 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt
new file mode 100644
index 0000000000..9cd8630955
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..10)::10 - [@{ List< }]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpStatementLiteral - [2..9)::7 - [ List< ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[List];
+                            LessThan;[<];
+                            Whitespace;[ ];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt
new file mode 100644
index 0000000000..df3f126852
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt
@@ -0,0 +1,23 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [207] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [207] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [207] )
+Code span at (2:0,2 [18] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [207] )
+Markup span at (20:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (20:2,0 [30] )
+Transition span at (28:2,8 [1] ) (Accepts:None) - Parent: Markup block at (20:2,0 [30] )
+MetaCode span at (29:2,9 [1] ) (Accepts:Any) - Parent: Markup block at (20:2,0 [30] )
+Markup span at (30:2,10 [20] ) (Accepts:None) - Parent: Markup block at (20:2,0 [30] )
+Code span at (50:3,0 [65] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [207] )
+Transition span at (115:5,8 [6] ) (Accepts:None) - Parent: Tag block at (115:5,8 [6] )
+Markup span at (121:5,14 [14] ) (Accepts:Any) - Parent: Markup block at (115:5,8 [29] )
+Transition span at (135:5,28 [1] ) (Accepts:None) - Parent: Expression block at (135:5,28 [2] )
+Code span at (136:5,29 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (135:5,28 [2] )
+Transition span at (137:5,30 [7] ) (Accepts:None) - Parent: Tag block at (137:5,30 [7] )
+Code span at (144:5,37 [27] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [207] )
+Markup span at (171:8,0 [8] ) (Accepts:Any) - Parent: Markup block at (171:8,0 [28] )
+Markup span at (179:8,8 [3] ) (Accepts:None) - Parent: Tag block at (179:8,8 [3] )
+Markup span at (182:8,11 [11] ) (Accepts:Any) - Parent: Markup block at (171:8,0 [28] )
+Markup span at (193:8,22 [4] ) (Accepts:None) - Parent: Tag block at (193:8,22 [4] )
+Markup span at (197:8,26 [2] ) (Accepts:None) - Parent: Markup block at (171:8,0 [28] )
+Code span at (199:9,0 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [207] )
+MetaCode span at (206:10,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [207] )
+Markup span at (207:10,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [207] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
new file mode 100644
index 0000000000..020255d2f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
@@ -0,0 +1,134 @@
+RazorDocument - [0..207)::207 - [@{LF    if(true) {LF        @:Single Line MarkupLF    }LF    foreach (var p in Enumerable.Range(1, 10)) {LF        <text>The number is @p</text>LF    }LF    if(!false) {LF        <p>A real tag!</p>LF    }LF}]
+    MarkupBlock - [0..207)::207
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..207)::207
+            CSharpStatement - [0..207)::207
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..207)::206
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..206)::204
+                        CSharpStatementLiteral - [2..20)::18 - [LF    if(true) {LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Keyword;[true];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                        MarkupBlock - [20..50)::30
+                            MarkupTextLiteral - [20..28)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                            MarkupTransition - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [30..50)::20 - [Single Line MarkupLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Text;[Single];
+                                Whitespace;[ ];
+                                Text;[Line];
+                                Whitespace;[ ];
+                                Text;[Markup];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [50..115)::65 - [    }LF    foreach (var p in Enumerable.Range(1, 10)) {LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[foreach];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[p];
+                            Whitespace;[ ];
+                            Keyword;[in];
+                            Whitespace;[ ];
+                            Identifier;[Enumerable];
+                            Dot;[.];
+                            Identifier;[Range];
+                            LeftParenthesis;[(];
+                            IntegerLiteral;[1];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            IntegerLiteral;[10];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                        MarkupBlock - [115..144)::29
+                            MarkupElement - [115..144)::29
+                                MarkupStartTag - [115..121)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [121..135)::14 - [The number is ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[The];
+                                    Whitespace;[ ];
+                                    Text;[number];
+                                    Whitespace;[ ];
+                                    Text;[is];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [135..137)::2
+                                    CSharpImplicitExpression - [135..137)::2
+                                        CSharpTransition - [135..136)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [136..137)::1
+                                            CSharpCodeBlock - [136..137)::1
+                                                CSharpExpressionLiteral - [136..137)::1 - [p] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[p];
+                                MarkupEndTag - [137..144)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [144..171)::27 - [LF    }LF    if(!false) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            LeftParenthesis;[(];
+                            Not;[!];
+                            Keyword;[false];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                        MarkupBlock - [171..199)::28
+                            MarkupTextLiteral - [171..179)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                            MarkupElement - [179..197)::18
+                                MarkupStartTag - [179..182)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [182..193)::11 - [A real tag!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[A];
+                                    Whitespace;[ ];
+                                    Text;[real];
+                                    Whitespace;[ ];
+                                    Text;[tag];
+                                    Bang;[!];
+                                MarkupEndTag - [193..197)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [197..199)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [199..206)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                    RazorMetaCode - [206..207)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [207..207)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.cspans.txt
new file mode 100644
index 0000000000..08846c99c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.cspans.txt
@@ -0,0 +1,33 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [233] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [233] )
+Code span at (1:0,1 [28] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [233] )
+Markup span at (29:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (29:2,0 [20] )
+Markup span at (37:2,8 [3] ) (Accepts:None) - Parent: Tag block at (37:2,8 [3] )
+Markup span at (40:2,11 [3] ) (Accepts:Any) - Parent: Markup block at (29:2,0 [20] )
+Markup span at (43:2,14 [4] ) (Accepts:None) - Parent: Tag block at (43:2,14 [4] )
+Markup span at (47:2,18 [2] ) (Accepts:None) - Parent: Markup block at (29:2,0 [20] )
+Code span at (49:3,0 [29] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [233] )
+Markup span at (78:5,0 [8] ) (Accepts:Any) - Parent: Markup block at (78:5,0 [20] )
+Markup span at (86:5,8 [3] ) (Accepts:None) - Parent: Tag block at (86:5,8 [3] )
+Markup span at (89:5,11 [3] ) (Accepts:Any) - Parent: Markup block at (78:5,0 [20] )
+Markup span at (92:5,14 [4] ) (Accepts:None) - Parent: Tag block at (92:5,14 [4] )
+Markup span at (96:5,18 [2] ) (Accepts:None) - Parent: Markup block at (78:5,0 [20] )
+Code span at (98:6,0 [41] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [233] )
+Markup span at (139:9,0 [12] ) (Accepts:Any) - Parent: Markup block at (139:9,0 [24] )
+Markup span at (151:9,12 [3] ) (Accepts:None) - Parent: Tag block at (151:9,12 [3] )
+Markup span at (154:9,15 [3] ) (Accepts:Any) - Parent: Markup block at (139:9,0 [24] )
+Markup span at (157:9,18 [4] ) (Accepts:None) - Parent: Tag block at (157:9,18 [4] )
+Markup span at (161:9,22 [2] ) (Accepts:None) - Parent: Markup block at (139:9,0 [24] )
+Markup span at (163:10,0 [12] ) (Accepts:Any) - Parent: Markup block at (163:10,0 [24] )
+Markup span at (175:10,12 [3] ) (Accepts:None) - Parent: Tag block at (175:10,12 [3] )
+Markup span at (178:10,15 [3] ) (Accepts:Any) - Parent: Markup block at (163:10,0 [24] )
+Markup span at (181:10,18 [4] ) (Accepts:None) - Parent: Tag block at (181:10,18 [4] )
+Markup span at (185:10,22 [2] ) (Accepts:None) - Parent: Markup block at (163:10,0 [24] )
+Code span at (187:11,0 [25] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [233] )
+Markup span at (212:13,0 [8] ) (Accepts:Any) - Parent: Markup block at (212:13,0 [20] )
+Markup span at (220:13,8 [3] ) (Accepts:None) - Parent: Tag block at (220:13,8 [3] )
+Markup span at (223:13,11 [3] ) (Accepts:Any) - Parent: Markup block at (212:13,0 [20] )
+Markup span at (226:13,14 [4] ) (Accepts:None) - Parent: Tag block at (226:13,14 [4] )
+Markup span at (230:13,18 [2] ) (Accepts:None) - Parent: Markup block at (212:13,0 [20] )
+Code span at (232:14,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [233] )
+Markup span at (233:14,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [233] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt
new file mode 100644
index 0000000000..7f17709368
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt
@@ -0,0 +1,143 @@
+RazorDocument - [0..233)::233 - [@switch(foo) {LF    case 0:LF        <p>Foo</p>LF        break;LF    case 1:LF        <p>Bar</p>LF        return;LF    case 2:LF        {LF            <p>Baz</p>LF            <p>Boz</p>LF        }LF    default:LF        <p>Biz</p>LF}]
+    MarkupBlock - [0..233)::233
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..233)::233
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..29)::28 - [switch(foo) {LF    case 0:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[switch];
+                LeftParenthesis;[(];
+                Identifier;[foo];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[case];
+                Whitespace;[ ];
+                IntegerLiteral;[0];
+                Colon;[:];
+                NewLine;[LF];
+            MarkupBlock - [29..49)::20
+                MarkupTextLiteral - [29..37)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                MarkupElement - [37..47)::10
+                    MarkupStartTag - [37..40)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [40..43)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupEndTag - [43..47)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [47..49)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [49..78)::29 - [        break;LF    case 1:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[        ];
+                Keyword;[break];
+                Semicolon;[;];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[case];
+                Whitespace;[ ];
+                IntegerLiteral;[1];
+                Colon;[:];
+                NewLine;[LF];
+            MarkupBlock - [78..98)::20
+                MarkupTextLiteral - [78..86)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                MarkupElement - [86..96)::10
+                    MarkupStartTag - [86..89)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [89..92)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupEndTag - [92..96)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [96..98)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [98..139)::41 - [        return;LF    case 2:LF        {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[        ];
+                Keyword;[return];
+                Semicolon;[;];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[case];
+                Whitespace;[ ];
+                IntegerLiteral;[2];
+                Colon;[:];
+                NewLine;[LF];
+                Whitespace;[        ];
+                LeftBrace;[{];
+                NewLine;[LF];
+            MarkupBlock - [139..163)::24
+                MarkupTextLiteral - [139..151)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[            ];
+                MarkupElement - [151..161)::10
+                    MarkupStartTag - [151..154)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [154..157)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+                    MarkupEndTag - [157..161)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [161..163)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            MarkupBlock - [163..187)::24
+                MarkupTextLiteral - [163..175)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[            ];
+                MarkupElement - [175..185)::10
+                    MarkupStartTag - [175..178)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [178..181)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Boz];
+                    MarkupEndTag - [181..185)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [185..187)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [187..212)::25 - [        }LF    default:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[        ];
+                RightBrace;[}];
+                NewLine;[LF];
+                Whitespace;[    ];
+                Keyword;[default];
+                Colon;[:];
+                NewLine;[LF];
+            MarkupBlock - [212..232)::20
+                MarkupTextLiteral - [212..220)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                MarkupElement - [220..230)::10
+                    MarkupStartTag - [220..223)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [223..226)::3 - [Biz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Biz];
+                    MarkupEndTag - [226..230)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [230..232)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [232..233)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
+        MarkupTextLiteral - [233..233)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.cspans.txt
new file mode 100644
index 0000000000..371412c07f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.cspans.txt
@@ -0,0 +1,35 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [237] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [237] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [237] )
+Code span at (2:0,2 [29] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [237] )
+Markup span at (31:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (31:2,0 [20] )
+Markup span at (39:2,8 [3] ) (Accepts:None) - Parent: Tag block at (39:2,8 [3] )
+Markup span at (42:2,11 [3] ) (Accepts:Any) - Parent: Markup block at (31:2,0 [20] )
+Markup span at (45:2,14 [4] ) (Accepts:None) - Parent: Tag block at (45:2,14 [4] )
+Markup span at (49:2,18 [2] ) (Accepts:None) - Parent: Markup block at (31:2,0 [20] )
+Code span at (51:3,0 [29] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [237] )
+Markup span at (80:5,0 [8] ) (Accepts:Any) - Parent: Markup block at (80:5,0 [20] )
+Markup span at (88:5,8 [3] ) (Accepts:None) - Parent: Tag block at (88:5,8 [3] )
+Markup span at (91:5,11 [3] ) (Accepts:Any) - Parent: Markup block at (80:5,0 [20] )
+Markup span at (94:5,14 [4] ) (Accepts:None) - Parent: Tag block at (94:5,14 [4] )
+Markup span at (98:5,18 [2] ) (Accepts:None) - Parent: Markup block at (80:5,0 [20] )
+Code span at (100:6,0 [41] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [237] )
+Markup span at (141:9,0 [12] ) (Accepts:Any) - Parent: Markup block at (141:9,0 [24] )
+Markup span at (153:9,12 [3] ) (Accepts:None) - Parent: Tag block at (153:9,12 [3] )
+Markup span at (156:9,15 [3] ) (Accepts:Any) - Parent: Markup block at (141:9,0 [24] )
+Markup span at (159:9,18 [4] ) (Accepts:None) - Parent: Tag block at (159:9,18 [4] )
+Markup span at (163:9,22 [2] ) (Accepts:None) - Parent: Markup block at (141:9,0 [24] )
+Markup span at (165:10,0 [12] ) (Accepts:Any) - Parent: Markup block at (165:10,0 [24] )
+Markup span at (177:10,12 [3] ) (Accepts:None) - Parent: Tag block at (177:10,12 [3] )
+Markup span at (180:10,15 [3] ) (Accepts:Any) - Parent: Markup block at (165:10,0 [24] )
+Markup span at (183:10,18 [4] ) (Accepts:None) - Parent: Tag block at (183:10,18 [4] )
+Markup span at (187:10,22 [2] ) (Accepts:None) - Parent: Markup block at (165:10,0 [24] )
+Code span at (189:11,0 [25] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [237] )
+Markup span at (214:13,0 [8] ) (Accepts:Any) - Parent: Markup block at (214:13,0 [20] )
+Markup span at (222:13,8 [3] ) (Accepts:None) - Parent: Tag block at (222:13,8 [3] )
+Markup span at (225:13,11 [3] ) (Accepts:Any) - Parent: Markup block at (214:13,0 [20] )
+Markup span at (228:13,14 [4] ) (Accepts:None) - Parent: Tag block at (228:13,14 [4] )
+Markup span at (232:13,18 [2] ) (Accepts:None) - Parent: Markup block at (214:13,0 [20] )
+Code span at (234:14,0 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [237] )
+MetaCode span at (236:14,2 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [237] )
+Markup span at (237:14,3 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [237] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt
new file mode 100644
index 0000000000..63e92358d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt
@@ -0,0 +1,152 @@
+RazorDocument - [0..237)::237 - [@{ switch(foo) {LF    case 0:LF        <p>Foo</p>LF        break;LF    case 1:LF        <p>Bar</p>LF        return;LF    case 2:LF        {LF            <p>Baz</p>LF            <p>Boz</p>LF        }LF    default:LF        <p>Biz</p>LF} }]
+    MarkupBlock - [0..237)::237
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..237)::237
+            CSharpStatement - [0..237)::237
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..237)::236
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..236)::234
+                        CSharpStatementLiteral - [2..31)::29 - [ switch(foo) {LF    case 0:LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[switch];
+                            LeftParenthesis;[(];
+                            Identifier;[foo];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[case];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            Colon;[:];
+                            NewLine;[LF];
+                        MarkupBlock - [31..51)::20
+                            MarkupTextLiteral - [31..39)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                            MarkupElement - [39..49)::10
+                                MarkupStartTag - [39..42)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [42..45)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [45..49)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [49..51)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [51..80)::29 - [        break;LF    case 1:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[        ];
+                            Keyword;[break];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[case];
+                            Whitespace;[ ];
+                            IntegerLiteral;[1];
+                            Colon;[:];
+                            NewLine;[LF];
+                        MarkupBlock - [80..100)::20
+                            MarkupTextLiteral - [80..88)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                            MarkupElement - [88..98)::10
+                                MarkupStartTag - [88..91)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [91..94)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Bar];
+                                MarkupEndTag - [94..98)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [98..100)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [100..141)::41 - [        return;LF    case 2:LF        {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[        ];
+                            Keyword;[return];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[case];
+                            Whitespace;[ ];
+                            IntegerLiteral;[2];
+                            Colon;[:];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                        MarkupBlock - [141..165)::24
+                            MarkupTextLiteral - [141..153)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[            ];
+                            MarkupElement - [153..163)::10
+                                MarkupStartTag - [153..156)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [156..159)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Baz];
+                                MarkupEndTag - [159..163)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [163..165)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        MarkupBlock - [165..189)::24
+                            MarkupTextLiteral - [165..177)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[            ];
+                            MarkupElement - [177..187)::10
+                                MarkupStartTag - [177..180)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [180..183)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Boz];
+                                MarkupEndTag - [183..187)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [187..189)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [189..214)::25 - [        }LF    default:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[        ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[default];
+                            Colon;[:];
+                            NewLine;[LF];
+                        MarkupBlock - [214..234)::20
+                            MarkupTextLiteral - [214..222)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[        ];
+                            MarkupElement - [222..232)::10
+                                MarkupStartTag - [222..225)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [225..228)::3 - [Biz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Biz];
+                                MarkupEndTag - [228..232)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [232..234)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [234..236)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            RightBrace;[}];
+                            Whitespace;[ ];
+                    RazorMetaCode - [236..237)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [237..237)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt
new file mode 100644
index 0000000000..73d431f67b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Expression block at (2:0,2 [5] )
+Code span at (3:0,3 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (2:0,2 [5] )
+Code span at (7:0,7 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (9:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:1,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt
new file mode 100644
index 0000000000..537ca2fd70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..10)::10 - [@{@foo.LF}]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..7)::5
+                            CSharpImplicitExpression - [2..7)::5
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [3..7)::4
+                                    CSharpCodeBlock - [3..7)::4
+                                        CSharpExpressionLiteral - [3..7)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Identifier;[foo];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [7..9)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt
new file mode 100644
index 0000000000..2caa075c0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Expression block at (2:0,2 [1] )
+Code span at (3:0,3 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (2:0,2 [1] )
+Code span at (3:0,3 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (4:0,4 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (5:0,5 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.diag.txt
new file mode 100644
index 0000000000..af4954d89e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1005: "." is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt
new file mode 100644
index 0000000000..6efc85bc18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..5)::5 - [@{@.}]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..3)::1
+                            CSharpImplicitExpression - [2..3)::1
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [3..3)::0
+                                    CSharpCodeBlock - [3..3)::0
+                                        CSharpExpressionLiteral - [3..3)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Marker;[];
+                        CSharpStatementLiteral - [3..4)::1 - [.] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Dot;[.];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [5..5)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt
new file mode 100644
index 0000000000..73d431f67b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Expression block at (2:0,2 [5] )
+Code span at (3:0,3 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (2:0,2 [5] )
+Code span at (7:0,7 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (9:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:1,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt
new file mode 100644
index 0000000000..537ca2fd70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..10)::10 - [@{@foo.LF}]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..7)::5
+                            CSharpImplicitExpression - [2..7)::5
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [3..7)::4
+                                    CSharpCodeBlock - [3..7)::4
+                                        CSharpExpressionLiteral - [3..7)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Identifier;[foo];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [7..9)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt
new file mode 100644
index 0000000000..cfb01939e7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Code span at (2:0,2 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [12] )
+Transition span at (8:1,4 [1] ) (Accepts:None) - Parent: Expression block at (8:1,4 [1] )
+Code span at (9:1,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [1] )
+Code span at (9:1,5 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (11:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Markup span at (12:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.diag.txt
new file mode 100644
index 0000000000..a8f6dc0930
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.diag.txt
@@ -0,0 +1 @@
+(2,6): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt
new file mode 100644
index 0000000000..a83496ddd1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..12)::12 - [@{LF    @LF}]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpStatement - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..12)::11
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..9)::1
+                            CSharpImplicitExpression - [8..9)::1
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..9)::0
+                                    CSharpCodeBlock - [9..9)::0
+                                        CSharpExpressionLiteral - [9..9)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Marker;[];
+                        CSharpStatementLiteral - [9..11)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt
new file mode 100644
index 0000000000..38b8899f16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [4] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Expression block at (2:0,2 [1] )
+Code span at (3:0,3 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (2:0,2 [1] )
+Code span at (3:0,3 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
+Markup span at (4:0,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.diag.txt
new file mode 100644
index 0000000000..ca1dc596ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1005: "}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt
new file mode 100644
index 0000000000..7d2bc1804c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..4)::4 - [@{@}]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpStatement - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..4)::3
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..3)::1
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..3)::1
+                            CSharpImplicitExpression - [2..3)::1
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [3..3)::0
+                                    CSharpCodeBlock - [3..3)::0
+                                        CSharpExpressionLiteral - [3..3)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Marker;[];
+                        CSharpStatementLiteral - [3..3)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [4..4)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.cspans.txt
new file mode 100644
index 0000000000..d86374cf4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Code span at (2:0,2 [8] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt
new file mode 100644
index 0000000000..fed47f7288
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..11)::11 - [@{ foo(); }]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        CSharpStatementLiteral - [2..10)::8 - [ foo(); ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Semicolon;[;];
+                            Whitespace;[ ];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.cspans.txt
new file mode 100644
index 0000000000..86b0e40245
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [19] )
+MetaCode span at (3:0,3 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Statement block at (5:0,5 [14] )
+Code span at (6:0,6 [13] ) (Accepts:Any) - Parent: Statement block at (5:0,5 [14] )
+Markup span at (19:0,19 [2] ) (Accepts:None) - Parent: Markup block at (2:0,2 [19] )
+Code span at (21:1,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:1,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt
new file mode 100644
index 0000000000..b40e6c93fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..22)::22 - [@{@: @if (true) { }LF}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [5..19)::14
+                                CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [6..19)::13 - [if (true) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    Whitespace;[ ];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    Whitespace;[ ];
+                                    LeftBrace;[{];
+                                    Whitespace;[ ];
+                                    RightBrace;[}];
+                            MarkupTextLiteral - [19..21)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt
new file mode 100644
index 0000000000..afd40eccab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (7:0,7 [11] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [16] )
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [4] )
+Code span at (19:0,19 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [4] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [16] )
+Markup span at (23:0,23 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (24:0,24 [7] ) (Accepts:None) - Parent: Tag block at (24:0,24 [7] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt
new file mode 100644
index 0000000000..4e4b3a1ee0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..32)::32 - [@{<span data-foo='@foo'></span>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupElement - [2..31)::29
+                                MarkupStartTag - [2..24)::22 - [<span data-foo='@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..23)::16 - [ data-foo='@foo']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..16)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [18..22)::4
+                                            CSharpCodeBlock - [18..22)::4
+                                                CSharpImplicitExpression - [18..22)::4
+                                                    CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [19..22)::3
+                                                        CSharpCodeBlock - [19..22)::3
+                                                            CSharpExpressionLiteral - [19..22)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[foo];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [24..31)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[span];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt
new file mode 100644
index 0000000000..afd40eccab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (7:0,7 [11] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [16] )
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [4] )
+Code span at (19:0,19 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [4] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [16] )
+Markup span at (23:0,23 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (24:0,24 [7] ) (Accepts:None) - Parent: Tag block at (24:0,24 [7] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt
new file mode 100644
index 0000000000..4e4b3a1ee0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..32)::32 - [@{<span data-foo='@foo'></span>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupElement - [2..31)::29
+                                MarkupStartTag - [2..24)::22 - [<span data-foo='@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..23)::16 - [ data-foo='@foo']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..16)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [18..22)::4
+                                            CSharpCodeBlock - [18..22)::4
+                                                CSharpImplicitExpression - [18..22)::4
+                                                    CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [19..22)::3
+                                                        CSharpCodeBlock - [19..22)::3
+                                                            CSharpExpressionLiteral - [19..22)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[foo];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [24..31)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[span];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt
new file mode 100644
index 0000000000..afd40eccab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (7:0,7 [11] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [16] )
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [4] )
+Code span at (19:0,19 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [4] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [16] )
+Markup span at (23:0,23 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (24:0,24 [7] ) (Accepts:None) - Parent: Tag block at (24:0,24 [7] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
new file mode 100644
index 0000000000..91ef6c8bd3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..32)::32 - [@{<span data-foo='@foo'></span>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupElement - [2..31)::29
+                                MarkupStartTag - [2..24)::22 - [<span data-foo='@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..23)::16 - [ data-foo='@foo']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..16)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-foo];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [18..22)::4
+                                            MarkupDynamicAttributeValue - [18..22)::4 - [@foo]
+                                                GenericBlock - [18..22)::4
+                                                    CSharpCodeBlock - [18..22)::4
+                                                        CSharpImplicitExpression - [18..22)::4
+                                                            CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [19..22)::3
+                                                                CSharpCodeBlock - [19..22)::3
+                                                                    CSharpExpressionLiteral - [19..22)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[foo];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [24..31)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[span];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt
new file mode 100644
index 0000000000..d4c9ee0a56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [26] )
+Markup span at (7:0,7 [15] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [20] )
+Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [4] )
+Code span at (23:0,23 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [4] )
+Markup span at (26:0,26 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [20] )
+Markup span at (27:0,27 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [26] )
+Markup span at (28:0,28 [7] ) (Accepts:None) - Parent: Tag block at (28:0,28 [7] )
+Code span at (35:0,35 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt
new file mode 100644
index 0000000000..f4602b1fde
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..36)::36 - [@{<span data-foo  =  '@foo'></span>}]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            CSharpStatement - [0..36)::36
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..36)::35
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..35)::33
+                        MarkupBlock - [2..35)::33
+                            MarkupElement - [2..35)::33
+                                MarkupStartTag - [2..28)::26 - [<span data-foo  =  '@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..27)::20 - [ data-foo  =  '@foo']
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..16)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-foo];
+                                        MarkupTextLiteral - [16..18)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [19..22)::3 - [  '] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                            SingleQuote;['];
+                                        GenericBlock - [22..26)::4
+                                            CSharpCodeBlock - [22..26)::4
+                                                CSharpImplicitExpression - [22..26)::4
+                                                    CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [23..26)::3
+                                                        CSharpCodeBlock - [23..26)::3
+                                                            CSharpExpressionLiteral - [23..26)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[foo];
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [28..35)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[span];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [35..35)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt
new file mode 100644
index 0000000000..b00cc5d9fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [21] )
+Markup span at (7:0,7 [10] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [14] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Expression block at (17:0,17 [4] )
+Code span at (18:0,18 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (17:0,17 [4] )
+Markup span at (21:0,21 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [21] )
+Markup span at (23:0,23 [7] ) (Accepts:None) - Parent: Tag block at (23:0,23 [7] )
+Code span at (30:0,30 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt
new file mode 100644
index 0000000000..77907906b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..31)::31 - [@{<span data-foo=@foo ></span>}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupElement - [2..30)::28
+                                MarkupStartTag - [2..23)::21 - [<span data-foo=@foo >] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                    MarkupAttributeBlock - [7..21)::14 - [ data-foo=@foo]
+                                        MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [8..16)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-foo];
+                                        Equals;[=];
+                                        GenericBlock - [17..21)::4
+                                            CSharpCodeBlock - [17..21)::4
+                                                CSharpImplicitExpression - [17..21)::4
+                                                    CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [18..21)::3
+                                                        CSharpCodeBlock - [18..21)::3
+                                                            CSharpExpressionLiteral - [18..21)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[foo];
+                                    MarkupMiscAttributeContent - [21..22)::1
+                                        MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [23..30)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[span];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.cspans.txt
new file mode 100644
index 0000000000..d2e1dc16d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [24] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (14:0,14 [4] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (18:0,18 [4] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (23:0,23 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [24] )
+Code span at (26:0,26 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
new file mode 100644
index 0000000000..eaab6eb162
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..27)::27 - [@{<a href="Foo Bar Baz" />}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..26)::24
+                            MarkupElement - [2..26)::24
+                                MarkupStartTag - [2..26)::24 - [<a href="Foo Bar Baz" />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..23)::19 - [ href="Foo Bar Baz"]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [11..22)::11
+                                            MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
+                                                MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                            MarkupLiteralAttributeValue - [14..18)::4 - [ Bar]
+                                                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [15..18)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                            MarkupLiteralAttributeValue - [18..22)::4 - [ Baz]
+                                                MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [19..22)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Baz];
+                                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMiscAttributeContent - [23..24)::1
+                                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt
new file mode 100644
index 0000000000..2b04b0aff1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [23] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Transition span at (17:2,1 [1] ) (Accepts:None) - Parent: Expression block at (17:2,1 [4] )
+Code span at (18:2,2 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (17:2,1 [4] )
+Markup span at (21:2,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (22:2,6 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [23] )
+Code span at (25:2,9 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (25:2,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (26:2,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
new file mode 100644
index 0000000000..da6e6fd85b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..26)::26 - [@{<a href LF= LF'@Foo' />}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        MarkupBlock - [2..25)::23
+                            MarkupElement - [2..25)::23
+                                MarkupStartTag - [2..25)::23 - [<a href LF= LF'@Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..22)::18 - [ href LF= LF'@Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        MarkupTextLiteral - [9..12)::3 - [ LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [13..17)::4 - [ LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [17..21)::4
+                                            MarkupDynamicAttributeValue - [17..21)::4 - [@Foo]
+                                                GenericBlock - [17..21)::4
+                                                    CSharpCodeBlock - [17..21)::4
+                                                        CSharpImplicitExpression - [17..21)::4
+                                                            CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [18..21)::3
+                                                                CSharpCodeBlock - [18..21)::3
+                                                                    CSharpExpressionLiteral - [18..21)::3 - [Foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[Foo];
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [22..23)::1
+                                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [25..25)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.cspans.txt
new file mode 100644
index 0000000000..d2e1dc16d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [24] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (14:0,14 [4] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (18:0,18 [4] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (23:0,23 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [24] )
+Code span at (26:0,26 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
new file mode 100644
index 0000000000..32849f4eed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..27)::27 - [@{<a href='Foo Bar Baz' />}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..26)::24
+                            MarkupElement - [2..26)::24
+                                MarkupStartTag - [2..26)::24 - [<a href='Foo Bar Baz' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..23)::19 - [ href='Foo Bar Baz']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [11..22)::11
+                                            MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
+                                                MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                            MarkupLiteralAttributeValue - [14..18)::4 - [ Bar]
+                                                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [15..18)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                            MarkupLiteralAttributeValue - [18..22)::4 - [ Baz]
+                                                MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [19..22)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Baz];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [23..24)::1
+                                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt
new file mode 100644
index 0000000000..a859fd716e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [26] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [21] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [4] )
+Code span at (12:0,12 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [4] )
+Markup span at (15:0,15 [4] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [21] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (19:0,19 [5] )
+Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (20:0,20 [4] )
+Code span at (21:0,21 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (20:0,20 [4] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [21] )
+Markup span at (25:0,25 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [26] )
+Code span at (28:0,28 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
new file mode 100644
index 0000000000..810f3a08c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..29)::29 - [@{<a href='@foo bar @baz' />}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..28)::26
+                            MarkupElement - [2..28)::26
+                                MarkupStartTag - [2..28)::26 - [<a href='@foo bar @baz' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..25)::21 - [ href='@foo bar @baz']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [11..24)::13
+                                            MarkupDynamicAttributeValue - [11..15)::4 - [@foo]
+                                                GenericBlock - [11..15)::4
+                                                    CSharpCodeBlock - [11..15)::4
+                                                        CSharpImplicitExpression - [11..15)::4
+                                                            CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [12..15)::3
+                                                                CSharpCodeBlock - [12..15)::3
+                                                                    CSharpExpressionLiteral - [12..15)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[foo];
+                                            MarkupLiteralAttributeValue - [15..19)::4 - [ bar]
+                                                MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [16..19)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[bar];
+                                            MarkupDynamicAttributeValue - [19..24)::5 - [ @baz]
+                                                MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                GenericBlock - [20..24)::4
+                                                    CSharpCodeBlock - [20..24)::4
+                                                        CSharpImplicitExpression - [20..24)::4
+                                                            CSharpTransition - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [21..24)::3
+                                                                CSharpCodeBlock - [21..24)::3
+                                                                    CSharpExpressionLiteral - [21..24)::3 - [baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[baz];
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [25..26)::1
+                                        MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.cspans.txt
new file mode 100644
index 0000000000..4ec6f65e2f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [29] )
+Markup span at (4:0,4 [8] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (12:1,6 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (15:1,9 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (16:1,10 [8] ) (Accepts:Any) - Parent: Markup block at (16:1,10 [12] )
+Markup span at (24:2,6 [3] ) (Accepts:Any) - Parent: Markup block at (16:1,10 [12] )
+Markup span at (27:2,9 [1] ) (Accepts:Any) - Parent: Markup block at (16:1,10 [12] )
+Markup span at (28:2,10 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [29] )
+Code span at (31:2,13 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:2,13 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:2,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
new file mode 100644
index 0000000000..91de5c77b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..32)::32 - [@{<aLFhref='Foo'LFabcd='Bar' />}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupElement - [2..31)::29
+                                MarkupStartTag - [2..31)::29 - [<aLFhref='Foo'LFabcd='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..16)::12 - [LFhref='Foo']
+                                        MarkupTextLiteral - [4..6)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [6..10)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
+                                                MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [16..28)::12 - [LFabcd='Bar']
+                                        MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [18..22)::4 - [abcd] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[abcd];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [24..27)::3
+                                            MarkupLiteralAttributeValue - [24..27)::3 - [Bar]
+                                                MarkupTextLiteral - [24..27)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [28..29)::1
+                                        MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.cspans.txt
new file mode 100644
index 0000000000..abb2545da4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [17] )
+Markup span at (4:0,4 [8] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (12:1,6 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (15:1,9 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (16:1,10 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [17] )
+Code span at (19:1,13 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (19:1,13 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (20:1,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
new file mode 100644
index 0000000000..219a8eaa05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..20)::20 - [@{<aLFhref='Foo' />}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..19)::17 - [<aLFhref='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..16)::12 - [LFhref='Foo']
+                                        MarkupTextLiteral - [4..6)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [6..10)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
+                                                MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [16..17)::1
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt
new file mode 100644
index 0000000000..d427da460b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [17] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [4] )
+Code span at (12:0,12 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [4] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [17] )
+Code span at (19:0,19 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (19:0,19 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
new file mode 100644
index 0000000000..87ce1cb744
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..20)::20 - [@{<a href='@foo' />}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..19)::17 - [<a href='@foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..16)::12 - [ href='@foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [11..15)::4
+                                            MarkupDynamicAttributeValue - [11..15)::4 - [@foo]
+                                                GenericBlock - [11..15)::4
+                                                    CSharpCodeBlock - [11..15)::4
+                                                        CSharpImplicitExpression - [11..15)::4
+                                                            CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [12..15)::3
+                                                                CSharpCodeBlock - [12..15)::3
+                                                                    CSharpExpressionLiteral - [12..15)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[foo];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [16..17)::1
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.cspans.txt
new file mode 100644
index 0000000000..ef0c16944f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [11] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [11] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [11] )
+Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Code span at (18:0,18 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (18:0,18 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
new file mode 100644
index 0000000000..243a97aba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..19)::19 - [@{<a href='Foo' />}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupElement - [2..18)::16
+                                MarkupStartTag - [2..18)::16 - [<a href='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..15)::11 - [ href='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [11..14)::3
+                                            MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
+                                                MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [15..16)::1
+                                        MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..18)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.cspans.txt
new file mode 100644
index 0000000000..1cbe6752de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [24] )
+Markup span at (4:0,4 [15] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (19:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (22:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (23:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [24] )
+Code span at (26:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
new file mode 100644
index 0000000000..4633a61d10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..27)::27 - [@{<a href LF= 	LF'Foo' />}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..26)::24
+                            MarkupElement - [2..26)::24
+                                MarkupStartTag - [2..26)::24 - [<a href LF= 	LF'Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..23)::19 - [ href LF= 	LF'Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        MarkupTextLiteral - [9..13)::4 - [ LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [14..19)::5 - [ 	LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ 	];
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [19..22)::3
+                                            MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
+                                                MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [23..24)::1
+                                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.cspans.txt
new file mode 100644
index 0000000000..10b7d1d16f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (4:0,4 [9] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [13] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [13] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [13] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [18] )
+Code span at (20:0,20 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
new file mode 100644
index 0000000000..6a0b8855a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..21)::21 - [@{<a [item]='Foo' />}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..20)::18 - [<a [item]='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..17)::13 - [ [item]='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..11)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[item];
+                                            RightBracket;[]];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
+                                                MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [17..18)::1
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [20..20)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.cspans.txt
new file mode 100644
index 0000000000..e1faf07262
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [10] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Code span at (21:0,21 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
new file mode 100644
index 0000000000..55515d7460
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..22)::22 - [@{<a [(item,='Foo' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..21)::19
+                                MarkupStartTag - [2..21)::19 - [<a [(item,='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..18)::14 - [ [(item,='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..12)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[(item,];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [14..17)::3
+                                            MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
+                                                MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [18..19)::1
+                                        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.cspans.txt
new file mode 100644
index 0000000000..e1faf07262
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [10] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Code span at (21:0,21 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
new file mode 100644
index 0000000000..7e9f79e40f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..22)::22 - [@{<a (click)='Foo' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..21)::19
+                                MarkupStartTag - [2..21)::19 - [<a (click)='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..18)::14 - [ (click)='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..12)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [14..17)::3
+                                            MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
+                                                MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [18..19)::1
+                                        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.cspans.txt
new file mode 100644
index 0000000000..13c38bf943
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [20] )
+Markup span at (4:0,4 [11] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [20] )
+Code span at (22:0,22 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
new file mode 100644
index 0000000000..cc0ee42338
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..23)::23 - [@{<a (^click)='Foo' />}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupElement - [2..22)::20
+                                MarkupStartTag - [2..22)::20 - [<a (^click)='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..19)::15 - [ (^click)='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..13)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(^click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [15..18)::3
+                                            MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                                                MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [19..20)::1
+                                        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.cspans.txt
new file mode 100644
index 0000000000..680860b7d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (21:0,21 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [22] )
+Code span at (24:0,24 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
new file mode 100644
index 0000000000..2bceb1e701
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..25)::25 - [@{<a *something='Foo' />}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..24)::22
+                            MarkupElement - [2..24)::22
+                                MarkupStartTag - [2..24)::22 - [<a *something='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..21)::17 - [ *something='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..15)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[*something];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [17..20)::3
+                                            MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                                                MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [21..22)::1
+                                        MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.cspans.txt
new file mode 100644
index 0000000000..10b7d1d16f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (4:0,4 [9] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [13] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [13] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [13] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [18] )
+Code span at (20:0,20 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
new file mode 100644
index 0000000000..42409d68bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..21)::21 - [@{<a #local='Foo' />}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..20)::18 - [<a #local='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..17)::13 - [ #local='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..11)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[#local];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
+                                                MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [17..18)::1
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [20..20)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.cspans.txt
new file mode 100644
index 0000000000..a20afccd16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [35] )
+Markup span at (4:0,4 [11] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (15:1,2 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (18:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (19:1,6 [11] ) (Accepts:Any) - Parent: Markup block at (19:1,6 [15] )
+Markup span at (30:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (19:1,6 [15] )
+Markup span at (33:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (19:1,6 [15] )
+Markup span at (34:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [35] )
+Code span at (37:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (37:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (38:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
new file mode 100644
index 0000000000..948765f401
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
@@ -0,0 +1,63 @@
+RazorDocument - [0..38)::38 - [@{<a [item]LF='Foo'	[item]=LF'Bar' />}]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpStatement - [0..38)::38
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..38)::37
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..37)::35
+                        MarkupBlock - [2..37)::35
+                            MarkupElement - [2..37)::35
+                                MarkupStartTag - [2..37)::35 - [<a [item]LF='Foo'	[item]=LF'Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..19)::15 - [ [item]LF='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..11)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[item];
+                                            RightBracket;[]];
+                                        MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [15..18)::3
+                                            MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                                                MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [19..34)::15 - [	[item]=LF'Bar']
+                                        MarkupTextLiteral - [19..20)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                        MarkupTextLiteral - [20..26)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[item];
+                                            RightBracket;[]];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [30..33)::3
+                                            MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
+                                                MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [34..35)::1
+                                        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [37..37)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [38..38)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.cspans.txt
new file mode 100644
index 0000000000..83bb3afe4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [37] )
+Markup span at (4:0,4 [12] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [16] )
+Markup span at (16:1,2 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [16] )
+Markup span at (19:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [16] )
+Markup span at (20:1,6 [12] ) (Accepts:Any) - Parent: Markup block at (20:1,6 [16] )
+Markup span at (32:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (20:1,6 [16] )
+Markup span at (35:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (20:1,6 [16] )
+Markup span at (36:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [37] )
+Code span at (39:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (39:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (40:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
new file mode 100644
index 0000000000..f4752e38b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..40)::40 - [@{<a [(item,LF='Foo'	[(item,=LF'Bar' />}]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            CSharpStatement - [0..40)::40
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..40)::39
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..39)::37
+                        MarkupBlock - [2..39)::37
+                            MarkupElement - [2..39)::37
+                                MarkupStartTag - [2..39)::37 - [<a [(item,LF='Foo'	[(item,=LF'Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..20)::16 - [ [(item,LF='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..12)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[(item,];
+                                        MarkupTextLiteral - [12..14)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [Foo]
+                                                MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [20..36)::16 - [	[(item,=LF'Bar']
+                                        MarkupTextLiteral - [20..21)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                        MarkupTextLiteral - [21..28)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[(item,];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [32..35)::3
+                                            MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                                                MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [36..37)::1
+                                        MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [39..39)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [40..40)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.cspans.txt
new file mode 100644
index 0000000000..83bb3afe4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [37] )
+Markup span at (4:0,4 [12] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [16] )
+Markup span at (16:1,2 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [16] )
+Markup span at (19:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [16] )
+Markup span at (20:1,6 [12] ) (Accepts:Any) - Parent: Markup block at (20:1,6 [16] )
+Markup span at (32:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (20:1,6 [16] )
+Markup span at (35:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (20:1,6 [16] )
+Markup span at (36:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [37] )
+Code span at (39:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (39:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (40:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
new file mode 100644
index 0000000000..adfbf037c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..40)::40 - [@{<a (click)LF='Foo'	(click)=LF'Bar' />}]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            CSharpStatement - [0..40)::40
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..40)::39
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..39)::37
+                        MarkupBlock - [2..39)::37
+                            MarkupElement - [2..39)::37
+                                MarkupStartTag - [2..39)::37 - [<a (click)LF='Foo'	(click)=LF'Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..20)::16 - [ (click)LF='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..12)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(click)];
+                                        MarkupTextLiteral - [12..14)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [Foo]
+                                                MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [20..36)::16 - [	(click)=LF'Bar']
+                                        MarkupTextLiteral - [20..21)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                        MarkupTextLiteral - [21..28)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [32..35)::3
+                                            MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                                                MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [36..37)::1
+                                        MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [39..39)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [40..40)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.cspans.txt
new file mode 100644
index 0000000000..fbac8eaab7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [39] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (17:1,2 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (20:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (21:1,6 [13] ) (Accepts:Any) - Parent: Markup block at (21:1,6 [17] )
+Markup span at (34:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (21:1,6 [17] )
+Markup span at (37:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (21:1,6 [17] )
+Markup span at (38:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [39] )
+Code span at (41:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (41:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (42:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
new file mode 100644
index 0000000000..14b11adff4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..42)::42 - [@{<a (^click)LF='Foo'	(^click)=LF'Bar' />}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..41)::39
+                            MarkupElement - [2..41)::39
+                                MarkupStartTag - [2..41)::39 - [<a (^click)LF='Foo'	(^click)=LF'Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..21)::17 - [ (^click)LF='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..13)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(^click)];
+                                        MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [17..20)::3
+                                            MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                                                MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [21..38)::17 - [	(^click)=LF'Bar']
+                                        MarkupTextLiteral - [21..22)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                        MarkupTextLiteral - [22..30)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(^click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [31..34)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [34..37)::3
+                                            MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
+                                                MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [38..39)::1
+                                        MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.cspans.txt
new file mode 100644
index 0000000000..38ddcc3004
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [43] )
+Markup span at (4:0,4 [15] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (19:1,2 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (22:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (23:1,6 [15] ) (Accepts:Any) - Parent: Markup block at (23:1,6 [19] )
+Markup span at (38:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (23:1,6 [19] )
+Markup span at (41:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (23:1,6 [19] )
+Markup span at (42:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [43] )
+Code span at (45:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (45:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (46:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
new file mode 100644
index 0000000000..400be0767b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..46)::46 - [@{<a *somethingLF='Foo'	*something=LF'Bar' />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupElement - [2..45)::43
+                                MarkupStartTag - [2..45)::43 - [<a *somethingLF='Foo'	*something=LF'Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..23)::19 - [ *somethingLF='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..15)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[*something];
+                                        MarkupTextLiteral - [15..17)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [19..22)::3
+                                            MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
+                                                MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [23..42)::19 - [	*something=LF'Bar']
+                                        MarkupTextLiteral - [23..24)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                        MarkupTextLiteral - [24..34)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[*something];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [35..38)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [38..41)::3
+                                            MarkupLiteralAttributeValue - [38..41)::3 - [Bar]
+                                                MarkupTextLiteral - [38..41)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [42..43)::1
+                                        MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.cspans.txt
new file mode 100644
index 0000000000..a20afccd16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [35] )
+Markup span at (4:0,4 [11] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (15:1,2 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (18:1,5 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [15] )
+Markup span at (19:1,6 [11] ) (Accepts:Any) - Parent: Markup block at (19:1,6 [15] )
+Markup span at (30:2,1 [3] ) (Accepts:Any) - Parent: Markup block at (19:1,6 [15] )
+Markup span at (33:2,4 [1] ) (Accepts:Any) - Parent: Markup block at (19:1,6 [15] )
+Markup span at (34:2,5 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [35] )
+Code span at (37:2,8 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (37:2,8 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (38:2,9 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
new file mode 100644
index 0000000000..789dfc7621
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..38)::38 - [@{<a #localLF='Foo'	#local=LF'Bar' />}]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpStatement - [0..38)::38
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..38)::37
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..37)::35
+                        MarkupBlock - [2..37)::35
+                            MarkupElement - [2..37)::35
+                                MarkupStartTag - [2..37)::35 - [<a #localLF='Foo'	#local=LF'Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..19)::15 - [ #localLF='Foo']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..11)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[#local];
+                                        MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [15..18)::3
+                                            MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                                                MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [19..34)::15 - [	#local=LF'Bar']
+                                        MarkupTextLiteral - [19..20)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                        MarkupTextLiteral - [20..26)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[#local];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            SingleQuote;['];
+                                        GenericBlock - [30..33)::3
+                                            MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
+                                                MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [34..35)::1
+                                        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [37..37)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [38..38)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.cspans.txt
new file mode 100644
index 0000000000..58b825a092
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [37] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (17:1,10 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (20:1,13 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (21:1,14 [11] ) (Accepts:Any) - Parent: Markup block at (21:1,14 [15] )
+Markup span at (32:2,8 [3] ) (Accepts:Any) - Parent: Markup block at (21:1,14 [15] )
+Markup span at (35:2,11 [1] ) (Accepts:Any) - Parent: Markup block at (21:1,14 [15] )
+Markup span at (36:2,12 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [37] )
+Code span at (39:2,15 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (39:2,15 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (40:2,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
new file mode 100644
index 0000000000..627579c898
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
@@ -0,0 +1,63 @@
+RazorDocument - [0..40)::40 - [@{<a LF  [item]='Foo'	LF[item]='Bar' />}]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            CSharpStatement - [0..40)::40
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..40)::39
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..39)::37
+                        MarkupBlock - [2..39)::37
+                            MarkupElement - [2..39)::37
+                                MarkupStartTag - [2..39)::37 - [<a LF  [item]='Foo'	LF[item]='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..21)::17 - [ LF  [item]='Foo']
+                                        MarkupTextLiteral - [4..9)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [9..15)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[item];
+                                            RightBracket;[]];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [17..20)::3
+                                            MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                                                MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [21..36)::15 - [	LF[item]='Bar']
+                                        MarkupTextLiteral - [21..24)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [24..30)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[item];
+                                            RightBracket;[]];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [32..35)::3
+                                            MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                                                MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [36..37)::1
+                                        MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [39..39)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [40..40)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.cspans.txt
new file mode 100644
index 0000000000..a3d8894755
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [39] )
+Markup span at (4:0,4 [14] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (18:1,11 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (21:1,14 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (22:1,15 [12] ) (Accepts:Any) - Parent: Markup block at (22:1,15 [16] )
+Markup span at (34:2,9 [3] ) (Accepts:Any) - Parent: Markup block at (22:1,15 [16] )
+Markup span at (37:2,12 [1] ) (Accepts:Any) - Parent: Markup block at (22:1,15 [16] )
+Markup span at (38:2,13 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [39] )
+Code span at (41:2,16 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (41:2,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (42:2,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
new file mode 100644
index 0000000000..49cff6166b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..42)::42 - [@{<a LF  [(item,='Foo'	LF[(item,='Bar' />}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..41)::39
+                            MarkupElement - [2..41)::39
+                                MarkupStartTag - [2..41)::39 - [<a LF  [(item,='Foo'	LF[(item,='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..22)::18 - [ LF  [(item,='Foo']
+                                        MarkupTextLiteral - [4..9)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [9..16)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[(item,];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [18..21)::3
+                                            MarkupLiteralAttributeValue - [18..21)::3 - [Foo]
+                                                MarkupTextLiteral - [18..21)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [22..38)::16 - [	LF[(item,='Bar']
+                                        MarkupTextLiteral - [22..25)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [25..32)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            LeftBracket;[[];
+                                            Text;[(item,];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [34..37)::3
+                                            MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
+                                                MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [38..39)::1
+                                        MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.cspans.txt
new file mode 100644
index 0000000000..a3d8894755
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [39] )
+Markup span at (4:0,4 [14] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (18:1,11 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (21:1,14 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [18] )
+Markup span at (22:1,15 [12] ) (Accepts:Any) - Parent: Markup block at (22:1,15 [16] )
+Markup span at (34:2,9 [3] ) (Accepts:Any) - Parent: Markup block at (22:1,15 [16] )
+Markup span at (37:2,12 [1] ) (Accepts:Any) - Parent: Markup block at (22:1,15 [16] )
+Markup span at (38:2,13 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [39] )
+Code span at (41:2,16 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (41:2,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (42:2,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
new file mode 100644
index 0000000000..bb34ae31da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..42)::42 - [@{<a LF  (click)='Foo'	LF(click)='Bar' />}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..41)::39
+                            MarkupElement - [2..41)::39
+                                MarkupStartTag - [2..41)::39 - [<a LF  (click)='Foo'	LF(click)='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..22)::18 - [ LF  (click)='Foo']
+                                        MarkupTextLiteral - [4..9)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [9..16)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [18..21)::3
+                                            MarkupLiteralAttributeValue - [18..21)::3 - [Foo]
+                                                MarkupTextLiteral - [18..21)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [22..38)::16 - [	LF(click)='Bar']
+                                        MarkupTextLiteral - [22..25)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [25..32)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [34..37)::3
+                                            MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
+                                                MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [38..39)::1
+                                        MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.cspans.txt
new file mode 100644
index 0000000000..294e7d4526
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [41] )
+Markup span at (4:0,4 [15] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (19:1,12 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (22:1,15 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [19] )
+Markup span at (23:1,16 [13] ) (Accepts:Any) - Parent: Markup block at (23:1,16 [17] )
+Markup span at (36:2,10 [3] ) (Accepts:Any) - Parent: Markup block at (23:1,16 [17] )
+Markup span at (39:2,13 [1] ) (Accepts:Any) - Parent: Markup block at (23:1,16 [17] )
+Markup span at (40:2,14 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [41] )
+Code span at (43:2,17 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [44] )
+MetaCode span at (43:2,17 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+Markup span at (44:2,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
new file mode 100644
index 0000000000..00eddb322f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..44)::44 - [@{<a LF  (^click)='Foo'	LF(^click)='Bar' />}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            CSharpStatement - [0..44)::44
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..44)::43
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..43)::41
+                        MarkupBlock - [2..43)::41
+                            MarkupElement - [2..43)::41
+                                MarkupStartTag - [2..43)::41 - [<a LF  (^click)='Foo'	LF(^click)='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..23)::19 - [ LF  (^click)='Foo']
+                                        MarkupTextLiteral - [4..9)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [9..17)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(^click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [19..22)::3
+                                            MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
+                                                MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [23..40)::17 - [	LF(^click)='Bar']
+                                        MarkupTextLiteral - [23..26)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [26..34)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[(^click)];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [36..39)::3
+                                            MarkupLiteralAttributeValue - [36..39)::3 - [Bar]
+                                                MarkupTextLiteral - [36..39)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [40..41)::1
+                                        MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [43..43)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.cspans.txt
new file mode 100644
index 0000000000..3c145a8469
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [45] )
+Markup span at (4:0,4 [17] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [21] )
+Markup span at (21:1,14 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [21] )
+Markup span at (24:1,17 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [21] )
+Markup span at (25:1,18 [15] ) (Accepts:Any) - Parent: Markup block at (25:1,18 [19] )
+Markup span at (40:2,12 [3] ) (Accepts:Any) - Parent: Markup block at (25:1,18 [19] )
+Markup span at (43:2,15 [1] ) (Accepts:Any) - Parent: Markup block at (25:1,18 [19] )
+Markup span at (44:2,16 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [45] )
+Code span at (47:2,19 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [48] )
+MetaCode span at (47:2,19 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+Markup span at (48:2,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
new file mode 100644
index 0000000000..f832c6c058
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..48)::48 - [@{<a LF  *something='Foo'	LF*something='Bar' />}]
+    MarkupBlock - [0..48)::48
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..48)::48
+            CSharpStatement - [0..48)::48
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..48)::47
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..47)::45
+                        MarkupBlock - [2..47)::45
+                            MarkupElement - [2..47)::45
+                                MarkupStartTag - [2..47)::45 - [<a LF  *something='Foo'	LF*something='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..25)::21 - [ LF  *something='Foo']
+                                        MarkupTextLiteral - [4..9)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [9..19)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[*something];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [21..24)::3
+                                            MarkupLiteralAttributeValue - [21..24)::3 - [Foo]
+                                                MarkupTextLiteral - [21..24)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [25..44)::19 - [	LF*something='Bar']
+                                        MarkupTextLiteral - [25..28)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [28..38)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[*something];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [40..43)::3
+                                            MarkupLiteralAttributeValue - [40..43)::3 - [Bar]
+                                                MarkupTextLiteral - [40..43)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [43..44)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [44..45)::1
+                                        MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [47..47)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [47..48)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [48..48)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.cspans.txt
new file mode 100644
index 0000000000..58b825a092
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [37] )
+Markup span at (4:0,4 [13] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (17:1,10 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (20:1,13 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [17] )
+Markup span at (21:1,14 [11] ) (Accepts:Any) - Parent: Markup block at (21:1,14 [15] )
+Markup span at (32:2,8 [3] ) (Accepts:Any) - Parent: Markup block at (21:1,14 [15] )
+Markup span at (35:2,11 [1] ) (Accepts:Any) - Parent: Markup block at (21:1,14 [15] )
+Markup span at (36:2,12 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [37] )
+Code span at (39:2,15 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [40] )
+MetaCode span at (39:2,15 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [40] )
+Markup span at (40:2,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
new file mode 100644
index 0000000000..5b0311ff46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..40)::40 - [@{<a LF  #local='Foo'	LF#local='Bar' />}]
+    MarkupBlock - [0..40)::40
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..40)::40
+            CSharpStatement - [0..40)::40
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..40)::39
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..39)::37
+                        MarkupBlock - [2..39)::37
+                            MarkupElement - [2..39)::37
+                                MarkupStartTag - [2..39)::37 - [<a LF  #local='Foo'	LF#local='Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..21)::17 - [ LF  #local='Foo']
+                                        MarkupTextLiteral - [4..9)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            NewLine;[LF];
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [9..15)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[#local];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [17..20)::3
+                                            MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                                                MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [21..36)::15 - [	LF#local='Bar']
+                                        MarkupTextLiteral - [21..24)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [24..30)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[#local];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [32..35)::3
+                                            MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                                                MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [36..37)::1
+                                        MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [39..39)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [40..40)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt
new file mode 100644
index 0000000000..5869ff5ca4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (2:0,2 [6] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [20] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [11] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [20] )
+Code span at (22:0,22 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt
new file mode 100644
index 0000000000..0afdde8d78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..23)::23 - [@{<input value=@foo />}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupElement - [2..22)::20
+                                MarkupStartTag - [2..22)::20 - [<input value=@foo />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupAttributeBlock - [8..19)::11 - [ value=@foo]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[value];
+                                        Equals;[=];
+                                        GenericBlock - [15..19)::4
+                                            MarkupDynamicAttributeValue - [15..19)::4 - [@foo]
+                                                GenericBlock - [15..19)::4
+                                                    CSharpCodeBlock - [15..19)::4
+                                                        CSharpImplicitExpression - [15..19)::4
+                                                            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [16..19)::3
+                                                                CSharpCodeBlock - [16..19)::3
+                                                                    CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[foo];
+                                    MarkupMiscAttributeContent - [19..20)::1
+                                        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt
new file mode 100644
index 0000000000..764f3bb0e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
+Markup span at (6:0,6 [7] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [11] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [4] )
+Code span at (14:0,14 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:0,13 [4] )
+Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt
new file mode 100644
index 0000000000..cd4499af20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..21)::21 - [<input value=@foo />}]
+    MarkupBlock - [0..21)::21
+        MarkupElement - [0..20)::20
+            MarkupStartTag - [0..20)::20 - [<input value=@foo />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupAttributeBlock - [6..17)::11 - [ value=@foo]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[value];
+                    Equals;[=];
+                    GenericBlock - [13..17)::4
+                        MarkupDynamicAttributeValue - [13..17)::4 - [@foo]
+                            GenericBlock - [13..17)::4
+                                CSharpCodeBlock - [13..17)::4
+                                    CSharpImplicitExpression - [13..17)::4
+                                        CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [14..17)::3
+                                            CSharpCodeBlock - [14..17)::3
+                                                CSharpExpressionLiteral - [14..17)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[foo];
+                MarkupMiscAttributeContent - [17..18)::1
+                    MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..21)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.cspans.txt
new file mode 100644
index 0000000000..ea9b1b25c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [22] )
+Markup span at (4:0,4 [6] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [9] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [9] )
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [4] )
+Markup span at (17:0,17 [4] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [4] )
+Markup span at (21:0,21 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [22] )
+Code span at (24:0,24 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
new file mode 100644
index 0000000000..2e77374d79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..25)::25 - [@{<a href=Foo Bar Baz />}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..24)::22
+                            MarkupElement - [2..24)::22
+                                MarkupStartTag - [2..24)::22 - [<a href=Foo Bar Baz />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..13)::9 - [ href=Foo]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        GenericBlock - [10..13)::3
+                                            MarkupLiteralAttributeValue - [10..13)::3 - [Foo]
+                                                MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                    MarkupMinimizedAttributeBlock - [13..17)::4 - [ Bar]
+                                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [14..17)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[Bar];
+                                    MarkupMinimizedAttributeBlock - [17..21)::4 - [ Baz]
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..21)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[Baz];
+                                    MarkupMiscAttributeContent - [21..22)::1
+                                        MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt
new file mode 100644
index 0000000000..0fa9f90bf0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [27] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [22] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [4] )
+Code span at (12:0,12 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [4] )
+Markup span at (15:0,15 [10] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [22] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [22] )
+Markup span at (26:0,26 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [27] )
+Code span at (29:0,29 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
new file mode 100644
index 0000000000..40509adc08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..30)::30 - [@{<a href='@foo ~/Foo/Bar' />}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..29)::27
+                        MarkupBlock - [2..29)::27
+                            MarkupElement - [2..29)::27
+                                MarkupStartTag - [2..29)::27 - [<a href='@foo ~/Foo/Bar' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..26)::22 - [ href='@foo ~/Foo/Bar']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [11..25)::14
+                                            MarkupDynamicAttributeValue - [11..15)::4 - [@foo]
+                                                GenericBlock - [11..15)::4
+                                                    CSharpCodeBlock - [11..15)::4
+                                                        CSharpImplicitExpression - [11..15)::4
+                                                            CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [12..15)::3
+                                                                CSharpCodeBlock - [12..15)::3
+                                                                    CSharpExpressionLiteral - [12..15)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[foo];
+                                            MarkupLiteralAttributeValue - [15..25)::10 - [ ~/Foo/Bar]
+                                                MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [16..25)::9 - [~/Foo/Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[~];
+                                                    ForwardSlash;[/];
+                                                    Text;[Foo];
+                                                    ForwardSlash;[/];
+                                                    Text;[Bar];
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [26..27)::1
+                                        MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [29..29)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.cspans.txt
new file mode 100644
index 0000000000..0a74de6c35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [10] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (14:1,6 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (17:1,9 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [14] )
+Markup span at (18:1,10 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Code span at (21:1,13 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:1,13 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:1,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
new file mode 100644
index 0000000000..0c757c152f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..22)::22 - [@{<a 	LFhref='Foo' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..21)::19
+                                MarkupStartTag - [2..21)::19 - [<a 	LFhref='Foo' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..18)::14 - [ 	LFhref='Foo']
+                                        MarkupTextLiteral - [4..8)::4 - [ 	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ 	];
+                                            NewLine;[LF];
+                                        MarkupTextLiteral - [8..12)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [14..17)::3
+                                            MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
+                                                MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [18..19)::1
+                                        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.cspans.txt
new file mode 100644
index 0000000000..0bd53ac932
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Transition span at (2:0,2 [7] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Code span at (9:0,9 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt
new file mode 100644
index 0000000000..1d3c357c03
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..10)::10 - [@{<text/>}]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        MarkupBlock - [2..9)::7
+                            MarkupElement - [2..9)::7
+                                MarkupStartTag - [2..9)::7 - MarkupTransition - [<text/>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [9..9)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.cspans.txt
new file mode 100644
index 0000000000..07d11db795
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [30] )
+Markup span at (16:0,16 [5] ) (Accepts:None) - Parent: Tag block at (16:0,16 [5] )
+Markup span at (21:0,21 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [30] )
+Transition span at (25:0,25 [7] ) (Accepts:None) - Parent: Tag block at (25:0,25 [7] )
+Code span at (32:0,32 [5] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [38] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [38] )
+Markup span at (38:0,38 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt
new file mode 100644
index 0000000000..59086b2f9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..38)::38 - [@{<text>Foo Bar <foo> Baz</text> zoop}]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..38)::38
+            CSharpStatement - [0..38)::38
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..38)::37
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..37)::35
+                        MarkupBlock - [2..32)::30
+                            MarkupElement - [2..32)::30
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [8..16)::8 - [Foo Bar ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                    Whitespace;[ ];
+                                    Text;[Bar];
+                                    Whitespace;[ ];
+                                MarkupElement - [16..25)::9
+                                    MarkupStartTag - [16..21)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[foo];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [21..25)::4 - [ Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                        Text;[Baz];
+                                MarkupEndTag - [25..32)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..37)::5 - [ zoop] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Identifier;[zoop];
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [38..38)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.cspans.txt
new file mode 100644
index 0000000000..2573b6dc22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [15] )
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (7:0,7 [15] )
+Markup span at (22:0,22 [6] ) (Accepts:None) - Parent: Tag block at (22:0,22 [6] )
+Code span at (28:0,28 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
new file mode 100644
index 0000000000..9e2ebb7588
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..29)::29 - [@{<foo><bar baz=">" /></foo>}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..28)::26
+                            MarkupElement - [2..28)::26
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..22)::15
+                                    MarkupStartTag - [7..22)::15 - [<bar baz=">" />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[bar];
+                                        MarkupAttributeBlock - [11..19)::8 - [ baz=">"]
+                                            MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[baz];
+                                            Equals;[=];
+                                            MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                DoubleQuote;["];
+                                            GenericBlock - [17..18)::1
+                                                MarkupLiteralAttributeValue - [17..18)::1 - [>]
+                                                    MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        CloseAngle;[>];
+                                            MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                DoubleQuote;["];
+                                        MarkupMiscAttributeContent - [19..20)::1
+                                            MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [22..28)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.cspans.txt
new file mode 100644
index 0000000000..2573b6dc22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [15] )
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: Tag block at (7:0,7 [15] )
+Markup span at (22:0,22 [6] ) (Accepts:None) - Parent: Tag block at (22:0,22 [6] )
+Code span at (28:0,28 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
new file mode 100644
index 0000000000..c99bb7f478
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..29)::29 - [@{<foo><bar baz='>' /></foo>}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..28)::26
+                            MarkupElement - [2..28)::26
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..22)::15
+                                    MarkupStartTag - [7..22)::15 - [<bar baz='>' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[bar];
+                                        MarkupAttributeBlock - [11..19)::8 - [ baz='>']
+                                            MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[baz];
+                                            Equals;[=];
+                                            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                SingleQuote;['];
+                                            GenericBlock - [17..18)::1
+                                                MarkupLiteralAttributeValue - [17..18)::1 - [>]
+                                                    MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        CloseAngle;[>];
+                                            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                SingleQuote;['];
+                                        MarkupMiscAttributeContent - [19..20)::1
+                                            MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [22..28)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.cspans.txt
new file mode 100644
index 0000000000..8fee8f2662
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [13] )
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (19:0,19 [1] ) (Accepts:None) - Parent: Tag block at (7:0,7 [13] )
+Markup span at (20:0,20 [6] ) (Accepts:None) - Parent: Tag block at (20:0,20 [6] )
+Markup span at (26:0,26 [6] ) (Accepts:None) - Parent: Tag block at (26:0,26 [6] )
+Code span at (32:0,32 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
new file mode 100644
index 0000000000..b3bf3e616d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..33)::33 - [@{<foo><bar baz="/"></bar></foo>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupElement - [2..32)::30
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..26)::19
+                                    MarkupStartTag - [7..20)::13 - [<bar baz="/">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[bar];
+                                        MarkupAttributeBlock - [11..19)::8 - [ baz="/"]
+                                            MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[baz];
+                                            Equals;[=];
+                                            MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                DoubleQuote;["];
+                                            GenericBlock - [17..18)::1
+                                                MarkupLiteralAttributeValue - [17..18)::1 - [/]
+                                                    MarkupTextLiteral - [17..18)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        ForwardSlash;[/];
+                                            MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                DoubleQuote;["];
+                                        CloseAngle;[>];
+                                    MarkupEndTag - [20..26)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[bar];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [26..32)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.cspans.txt
new file mode 100644
index 0000000000..8fee8f2662
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [13] )
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (11:0,11 [8] )
+Markup span at (19:0,19 [1] ) (Accepts:None) - Parent: Tag block at (7:0,7 [13] )
+Markup span at (20:0,20 [6] ) (Accepts:None) - Parent: Tag block at (20:0,20 [6] )
+Markup span at (26:0,26 [6] ) (Accepts:None) - Parent: Tag block at (26:0,26 [6] )
+Code span at (32:0,32 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
new file mode 100644
index 0000000000..5881782048
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..33)::33 - [@{<foo><bar baz='/'></bar></foo>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupElement - [2..32)::30
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..26)::19
+                                    MarkupStartTag - [7..20)::13 - [<bar baz='/'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[bar];
+                                        MarkupAttributeBlock - [11..19)::8 - [ baz='/']
+                                            MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[baz];
+                                            Equals;[=];
+                                            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                SingleQuote;['];
+                                            GenericBlock - [17..18)::1
+                                                MarkupLiteralAttributeValue - [17..18)::1 - [/]
+                                                    MarkupTextLiteral - [17..18)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        ForwardSlash;[/];
+                                            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                SingleQuote;['];
+                                        CloseAngle;[>];
+                                    MarkupEndTag - [20..26)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[bar];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [26..32)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.cspans.txt
new file mode 100644
index 0000000000..f7d0febda1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [4] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (6:0,6 [3] ) (Accepts:None) - Parent: Tag block at (6:0,6 [3] )
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (12:0,12 [4] ) (Accepts:None) - Parent: Tag block at (12:0,12 [4] )
+Markup span at (16:0,16 [5] ) (Accepts:None) - Parent: Tag block at (16:0,16 [5] )
+Code span at (21:0,21 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt
new file mode 100644
index 0000000000..39206aa1d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..22)::22 - [@{<li><p>Foo</P></lI>}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..21)::19
+                                MarkupStartTag - [2..6)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[li];
+                                    CloseAngle;[>];
+                                MarkupElement - [6..16)::10
+                                    MarkupStartTag - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                    MarkupEndTag - [12..16)::4 - [</P>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[P];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [16..21)::5 - [</lI>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[lI];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.cspans.txt
new file mode 100644
index 0000000000..755c699fd4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [5] ) (Accepts:None) - Parent: Tag block at (7:0,7 [5] )
+Markup span at (12:0,12 [5] ) (Accepts:None) - Parent: Tag block at (12:0,12 [5] )
+Markup span at (17:0,17 [6] ) (Accepts:None) - Parent: Tag block at (17:0,17 [6] )
+Code span at (23:0,23 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt
new file mode 100644
index 0000000000..977c4f3c70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..24)::24 - [@{<foo><bar><baz></foo>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupElement - [2..23)::21
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..17)::10
+                                    MarkupStartTag - [7..12)::5 - [<bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[bar];
+                                        CloseAngle;[>];
+                                    MarkupElement - [12..17)::5
+                                        MarkupStartTag - [12..17)::5 - [<baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[baz];
+                                            CloseAngle;[>];
+                                MarkupEndTag - [17..23)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.cspans.txt
new file mode 100644
index 0000000000..815df70ed1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [7] ) (Accepts:None) - Parent: Tag block at (7:0,7 [7] )
+Markup span at (14:0,14 [6] ) (Accepts:None) - Parent: Tag block at (14:0,14 [6] )
+Code span at (20:0,20 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt
new file mode 100644
index 0000000000..589ca4a47b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..21)::21 - [@{<foo><bar /></foo>}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..14)::7
+                                    MarkupStartTag - [7..14)::7 - [<bar />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[bar];
+                                        MarkupMiscAttributeContent - [11..12)::1
+                                            MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [14..20)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [20..20)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt
new file mode 100644
index 0000000000..8f124b66de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [31] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Statement block at (11:0,11 [12] )
+Code span at (12:0,12 [11] ) (Accepts:Any) - Parent: Statement block at (11:0,11 [12] )
+Markup span at (23:0,23 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [31] )
+Markup span at (27:0,27 [6] ) (Accepts:None) - Parent: Tag block at (27:0,27 [6] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
new file mode 100644
index 0000000000..27ac92cec8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..34)::34 - [@{<div>Foo @if(true) {} Bar</div>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[div];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..11)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [11..23)::12
+                                    CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [12..23)::11 - [if(true) {}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[if];
+                                        LeftParenthesis;[(];
+                                        Keyword;[true];
+                                        RightParenthesis;[)];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        RightBrace;[}];
+                                MarkupTextLiteral - [23..27)::4 - [ Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    Text;[Bar];
+                                MarkupEndTag - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[div];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.cspans.txt
new file mode 100644
index 0000000000..63a6914d4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [6] ) (Accepts:None) - Parent: Tag block at (7:0,7 [6] )
+Markup span at (13:0,13 [5] ) (Accepts:None) - Parent: Tag block at (13:0,13 [5] )
+Markup span at (18:0,18 [6] ) (Accepts:None) - Parent: Tag block at (18:0,18 [6] )
+Markup span at (24:0,24 [6] ) (Accepts:None) - Parent: Tag block at (24:0,24 [6] )
+Code span at (30:0,30 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt
new file mode 100644
index 0000000000..3efea968b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..31)::31 - [@{<foo><text><bar></bar></foo>}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupElement - [2..30)::28
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..24)::17
+                                    MarkupStartTag - [7..13)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                    MarkupElement - [13..24)::11
+                                        MarkupStartTag - [13..18)::5 - [<bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[bar];
+                                            CloseAngle;[>];
+                                        MarkupEndTag - [18..24)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[bar];
+                                            CloseAngle;[>];
+                                MarkupEndTag - [24..30)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.cspans.txt
new file mode 100644
index 0000000000..4cb009f651
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [20] ) (Accepts:None) - Parent: Markup block at (2:0,2 [31] )
+Markup span at (27:0,27 [6] ) (Accepts:None) - Parent: Tag block at (27:0,27 [6] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt
new file mode 100644
index 0000000000..2f2e4f4725
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..34)::34 - [@{<foo><?xml foo bar> baz?></foo>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..27)::20 - [<?xml foo bar> baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    QuestionMark;[?];
+                                    Text;[xml];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    CloseAngle;[>];
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    QuestionMark;[?];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [27..33)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.cspans.txt
new file mode 100644
index 0000000000..5f1b93ed73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (2:0,2 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [17] )
+Markup span at (6:0,6 [7] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
+Markup span at (16:0,16 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [17] )
+Code span at (19:0,19 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (19:0,19 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt
new file mode 100644
index 0000000000..4083296791
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..20)::20 - [@{<p / class=foo />}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..19)::17 - [<p / class=foo />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMiscAttributeContent - [4..5)::1
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    MarkupMiscAttributeContent - [5..6)::1
+                                        MarkupTextLiteral - [5..6)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            ForwardSlash;[/];
+                                    MarkupAttributeBlock - [6..16)::10 - [ class=foo]
+                                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [foo]
+                                                MarkupTextLiteral - [13..16)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[foo];
+                                    MarkupMiscAttributeContent - [16..17)::1
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.cspans.txt
new file mode 100644
index 0000000000..b0e0c19ca5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (4:1,0 [1] ) (Accepts:Any) - Parent: Tag block at (4:1,0 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt
new file mode 100644
index 0000000000..5183cd029a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt
@@ -0,0 +1,2 @@
+(2,1): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt
new file mode 100644
index 0000000000..93a2e245cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..5)::5 - [@{LF<]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..5)::3
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..5)::1
+                            MarkupElement - [4..5)::1
+                                MarkupStartTag - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[<Missing>];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [5..5)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.cspans.txt
new file mode 100644
index 0000000000..2a8d626589
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [14] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [14] )
+Markup span at (4:1,0 [3] ) (Accepts:Any) - Parent: Tag block at (4:1,0 [3] )
+Markup span at (7:2,0 [7] ) (Accepts:None) - Parent: Tag block at (7:2,0 [7] )
+Code span at (14:2,7 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt
new file mode 100644
index 0000000000..d1be8ea52d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt
@@ -0,0 +1,3 @@
+(2,1): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+(3,3): Error RZ1026: Encountered end tag "html" with no matching start tag.  Are your start/end tags properly balanced?
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt
new file mode 100644
index 0000000000..b539423630
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..14)::14 - [@{LF<LF</html>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpStatement - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..14)::13
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..14)::12
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..7)::3
+                            MarkupElement - [4..7)::3
+                                MarkupStartTag - [4..7)::3 - [<LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[<Missing>];
+                                    MarkupMiscAttributeContent - [5..7)::2
+                                        MarkupTextLiteral - [5..7)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [7..14)::7
+                            MarkupElement - [7..14)::7
+                                MarkupEndTag - [7..14)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [14..14)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt
new file mode 100644
index 0000000000..aaf4fd258d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [68] )
+Markup span at (4:1,0 [4] ) (Accepts:Any) - Parent: Markup block at (4:1,0 [63] )
+Markup span at (8:1,4 [4] ) (Accepts:None) - Parent: HtmlComment block at (8:1,4 [57] )
+Markup span at (12:1,8 [50] ) (Accepts:Whitespace) - Parent: HtmlComment block at (8:1,4 [57] )
+Markup span at (62:1,58 [3] ) (Accepts:None) - Parent: HtmlComment block at (8:1,4 [57] )
+Markup span at (65:1,61 [2] ) (Accepts:None) - Parent: Markup block at (4:1,0 [63] )
+Code span at (67:2,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [68] )
+MetaCode span at (67:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [68] )
+Markup span at (68:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt
new file mode 100644
index 0000000000..d6c3b6a1b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..68)::68 - [@{LF    <!-- Hello, I'm a comment that shouldn't break razor --->LF}]
+    MarkupBlock - [0..68)::68
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..68)::68
+            CSharpStatement - [0..68)::68
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..68)::67
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..67)::65
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..67)::63
+                            MarkupTextLiteral - [4..8)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                            MarkupCommentBlock - [8..65)::57
+                                MarkupTextLiteral - [8..12)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [12..62)::50 - [ Hello, I'm a comment that shouldn't break razor -] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                    Text;[Hello,];
+                                    Whitespace;[ ];
+                                    Text;[I];
+                                    SingleQuote;['];
+                                    Text;[m];
+                                    Whitespace;[ ];
+                                    Text;[a];
+                                    Whitespace;[ ];
+                                    Text;[comment];
+                                    Whitespace;[ ];
+                                    Text;[that];
+                                    Whitespace;[ ];
+                                    Text;[shouldn];
+                                    SingleQuote;['];
+                                    Text;[t];
+                                    Whitespace;[ ];
+                                    Text;[break];
+                                    Whitespace;[ ];
+                                    Text;[razor];
+                                    Whitespace;[ ];
+                                    Text;[-];
+                                MarkupTextLiteral - [62..65)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [65..67)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [67..67)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [67..68)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [68..68)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt
new file mode 100644
index 0000000000..e1fed0e5a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt
@@ -0,0 +1,24 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [22] )
+Markup span at (9:0,9 [15] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [22] )
+Markup span at (24:0,24 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [22] )
+Markup span at (27:0,27 [6] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [6] )
+Markup span at (33:0,33 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
+Markup span at (35:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (35:1,0 [5] )
+Markup span at (40:1,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (40:1,5 [24] )
+Markup span at (44:1,9 [17] ) (Accepts:Whitespace) - Parent: HtmlComment block at (40:1,5 [24] )
+Markup span at (61:1,26 [3] ) (Accepts:None) - Parent: HtmlComment block at (40:1,5 [24] )
+Markup span at (64:1,29 [6] ) (Accepts:Any) - Parent: Tag block at (64:1,29 [6] )
+Markup span at (70:1,35 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
+Markup span at (72:2,0 [5] ) (Accepts:Any) - Parent: Tag block at (72:2,0 [5] )
+Markup span at (77:2,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (77:2,5 [26] )
+Markup span at (81:2,9 [19] ) (Accepts:Whitespace) - Parent: HtmlComment block at (77:2,5 [26] )
+Markup span at (100:2,28 [3] ) (Accepts:None) - Parent: HtmlComment block at (77:2,5 [26] )
+Markup span at (103:2,31 [6] ) (Accepts:Any) - Parent: Tag block at (103:2,31 [6] )
+Markup span at (109:2,37 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
+Markup span at (111:3,0 [5] ) (Accepts:Any) - Parent: Tag block at (111:3,0 [5] )
+Markup span at (116:3,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (116:3,5 [41] )
+Markup span at (120:3,9 [34] ) (Accepts:Whitespace) - Parent: HtmlComment block at (116:3,5 [41] )
+Markup span at (154:3,43 [3] ) (Accepts:None) - Parent: HtmlComment block at (116:3,5 [41] )
+Markup span at (157:3,46 [6] ) (Accepts:Any) - Parent: Tag block at (157:3,46 [6] )
+Markup span at (163:3,52 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt
new file mode 100644
index 0000000000..84453954c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt
@@ -0,0 +1,130 @@
+RazorDocument - [0..165)::165 - [<div><!--- Hello World ---></div>LF<div><!---- Hello World ----></div>LF<div><!----- Hello World -----></div>LF<div><!----- Hello < --- > World </div> -----></div>LF]
+    MarkupBlock - [0..165)::165
+        MarkupElement - [0..33)::33
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupCommentBlock - [5..27)::22
+                MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [9..24)::15 - [- Hello World -] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[-];
+                    Whitespace;[ ];
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                    Whitespace;[ ];
+                    Text;[-];
+                MarkupTextLiteral - [24..27)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupEndTag - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [35..70)::35
+            MarkupStartTag - [35..40)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupCommentBlock - [40..64)::24
+                MarkupTextLiteral - [40..44)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [44..61)::17 - [-- Hello World --] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    DoubleHyphen;[--];
+                    Whitespace;[ ];
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                    Whitespace;[ ];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [61..64)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupEndTag - [64..70)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [70..72)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [72..109)::37
+            MarkupStartTag - [72..77)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupCommentBlock - [77..103)::26
+                MarkupTextLiteral - [77..81)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [81..100)::19 - [--- Hello World ---] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    DoubleHyphen;[--];
+                    Text;[-];
+                    Whitespace;[ ];
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                    Whitespace;[ ];
+                    DoubleHyphen;[--];
+                    Text;[-];
+                MarkupTextLiteral - [100..103)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupEndTag - [103..109)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [109..111)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [111..163)::52
+            MarkupStartTag - [111..116)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupCommentBlock - [116..157)::41
+                MarkupTextLiteral - [116..120)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [120..154)::34 - [--- Hello < --- > World </div> ---] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    DoubleHyphen;[--];
+                    Text;[-];
+                    Whitespace;[ ];
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    OpenAngle;[<];
+                    Whitespace;[ ];
+                    DoubleHyphen;[--];
+                    Text;[-];
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+                    Whitespace;[ ];
+                    Text;[World];
+                    Whitespace;[ ];
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+                    Whitespace;[ ];
+                    DoubleHyphen;[--];
+                    Text;[-];
+                MarkupTextLiteral - [154..157)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupEndTag - [157..163)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [163..165)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
new file mode 100644
index 0000000000..10075460db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Markup span at (2:0,2 [8] ) (Accepts:None) - Parent: Tag block at (2:0,2 [8] )
+Markup span at (10:0,10 [13] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [36] )
+Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [4] )
+Code span at (24:0,24 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [4] )
+Markup span at (27:0,27 [2] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [36] )
+Markup span at (29:0,29 [9] ) (Accepts:None) - Parent: Tag block at (29:0,29 [9] )
+Code span at (38:0,38 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [39] )
+MetaCode span at (38:0,38 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Markup span at (39:0,39 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt
new file mode 100644
index 0000000000..d90490cb93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..39)::39 - [@{<script>foo<bar baz='@boz'></script>}]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..39)::39
+            CSharpStatement - [0..39)::39
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..39)::38
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..38)::36
+                        MarkupBlock - [2..38)::36
+                            MarkupElement - [2..38)::36
+                                MarkupStartTag - [2..10)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [10..23)::13 - [foo<bar baz='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                                    OpenAngle;[<];
+                                    Text;[bar];
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    Equals;[=];
+                                    SingleQuote;['];
+                                CSharpCodeBlock - [23..27)::4
+                                    CSharpImplicitExpression - [23..27)::4
+                                        CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [24..27)::3
+                                            CSharpCodeBlock - [24..27)::3
+                                                CSharpExpressionLiteral - [24..27)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[boz];
+                                MarkupTextLiteral - [27..29)::2 - ['>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [29..38)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [38..38)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [39..39)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt
new file mode 100644
index 0000000000..4ca3454d27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (2:0,2 [4] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [20] )
+Markup span at (6:0,6 [13] ) (Accepts:Whitespace) - Parent: HtmlComment block at (2:0,2 [20] )
+Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [20] )
+Code span at (22:0,22 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt
new file mode 100644
index 0000000000..b1bfd1c1aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..23)::23 - [@{<!--<foo>--</bar>-->}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupCommentBlock - [2..22)::20
+                                MarkupTextLiteral - [2..6)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [6..19)::13 - [<foo>--</bar>] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                    DoubleHyphen;[--];
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[bar];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [19..22)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.cspans.txt
new file mode 100644
index 0000000000..b4f323eb1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [22] ) (Accepts:None) - Parent: Markup block at (2:0,2 [33] )
+Markup span at (29:0,29 [6] ) (Accepts:None) - Parent: Tag block at (29:0,29 [6] )
+Code span at (35:0,35 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt
new file mode 100644
index 0000000000..23ebc364be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..36)::36 - [@{<foo><!DOCTYPE foo bar baz></foo>}]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            CSharpStatement - [0..36)::36
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..36)::35
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..35)::33
+                        MarkupBlock - [2..35)::33
+                            MarkupElement - [2..35)::33
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..29)::22 - [<!DOCTYPE foo bar baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[DOCTYPE];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [29..35)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [35..35)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.cspans.txt
new file mode 100644
index 0000000000..de508231ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [5] ) (Accepts:None) - Parent: Tag block at (7:0,7 [5] )
+Markup span at (12:0,12 [5] ) (Accepts:None) - Parent: Tag block at (12:0,12 [5] )
+Markup span at (17:0,17 [6] ) (Accepts:None) - Parent: Tag block at (17:0,17 [6] )
+Markup span at (23:0,23 [6] ) (Accepts:None) - Parent: Tag block at (23:0,23 [6] )
+Markup span at (29:0,29 [6] ) (Accepts:None) - Parent: Tag block at (29:0,29 [6] )
+Code span at (35:0,35 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [36] )
+MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt
new file mode 100644
index 0000000000..a95f5309e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..36)::36 - [@{<baz><boz><biz></biz></boz></baz>}]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            CSharpStatement - [0..36)::36
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..36)::35
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..35)::33
+                        MarkupBlock - [2..35)::33
+                            MarkupElement - [2..35)::33
+                                MarkupStartTag - [2..7)::5 - [<baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[baz];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..29)::22
+                                    MarkupStartTag - [7..12)::5 - [<boz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[boz];
+                                        CloseAngle;[>];
+                                    MarkupElement - [12..23)::11
+                                        MarkupStartTag - [12..17)::5 - [<biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[biz];
+                                            CloseAngle;[>];
+                                        MarkupEndTag - [17..23)::6 - [</biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[biz];
+                                            CloseAngle;[>];
+                                    MarkupEndTag - [23..29)::6 - [</boz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[boz];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [29..35)::6 - [</baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[baz];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [35..35)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.cspans.txt
new file mode 100644
index 0000000000..852b239155
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [19] ) (Accepts:None) - Parent: Markup block at (2:0,2 [30] )
+Markup span at (26:0,26 [6] ) (Accepts:None) - Parent: Tag block at (26:0,26 [6] )
+Code span at (32:0,32 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt
new file mode 100644
index 0000000000..e9f7c9e1a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..33)::33 - [@{<foo><?xml foo bar baz?></foo>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupElement - [2..32)::30
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..26)::19 - [<?xml foo bar baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    QuestionMark;[?];
+                                    Text;[xml];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    QuestionMark;[?];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [26..32)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt
new file mode 100644
index 0000000000..5c14032f92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [4] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [18] )
+Markup span at (6:0,6 [11] ) (Accepts:Whitespace) - Parent: HtmlComment block at (2:0,2 [18] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [18] )
+Code span at (20:0,20 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt
new file mode 100644
index 0000000000..dfc7e9d631
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..21)::21 - [@{<!--<foo></bar>-->}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupCommentBlock - [2..20)::18
+                                MarkupTextLiteral - [2..6)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [6..17)::11 - [<foo></bar>] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[bar];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [17..20)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [20..20)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.cspans.txt
new file mode 100644
index 0000000000..3c96f3b336
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [19] )
+MetaCode span at (3:0,3 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (4:0,4 [17] ) (Accepts:None) - Parent: Markup block at (2:0,2 [19] )
+Code span at (21:1,0 [4] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (25:1,4 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (26:1,5 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt
new file mode 100644
index 0000000000..bf557127e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..26)::26 - [@{@:<li>Foo Bar BazLFbork}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        MarkupBlock - [2..21)::19
+                            MarkupTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [4..21)::17 - [<li>Foo Bar BazLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[li];
+                                CloseAngle;[>];
+                                Text;[Foo];
+                                Whitespace;[ ];
+                                Text;[Bar];
+                                Whitespace;[ ];
+                                Text;[Baz];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [21..25)::4 - [bork] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[bork];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.cspans.txt
new file mode 100644
index 0000000000..eec6718ce6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [6] ) (Accepts:None) - Parent: Tag block at (8:0,8 [6] )
+Markup span at (14:0,14 [8] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [43] )
+Markup span at (22:0,22 [5] ) (Accepts:None) - Parent: Tag block at (22:0,22 [5] )
+Markup span at (27:0,27 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [43] )
+Markup span at (31:0,31 [7] ) (Accepts:None) - Parent: Tag block at (31:0,31 [7] )
+Transition span at (38:0,38 [7] ) (Accepts:None) - Parent: Tag block at (38:0,38 [7] )
+Code span at (45:0,45 [5] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [51] )
+MetaCode span at (50:0,50 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Markup span at (51:0,51 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt
new file mode 100644
index 0000000000..1c91b94c21
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..51)::51 - [@{<text><text>Foo Bar <foo> Baz</text></text> zoop}]
+    MarkupBlock - [0..51)::51
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..51)::51
+            CSharpStatement - [0..51)::51
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..51)::50
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..50)::48
+                        MarkupBlock - [2..45)::43
+                            MarkupElement - [2..45)::43
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupElement - [8..38)::30
+                                    MarkupStartTag - [8..14)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [14..22)::8 - [Foo Bar ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Foo];
+                                        Whitespace;[ ];
+                                        Text;[Bar];
+                                        Whitespace;[ ];
+                                    MarkupElement - [22..31)::9
+                                        MarkupStartTag - [22..27)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[foo];
+                                            CloseAngle;[>];
+                                        MarkupTextLiteral - [27..31)::4 - [ Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            Text;[Baz];
+                                    MarkupEndTag - [31..38)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [38..45)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..50)::5 - [ zoop] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Identifier;[zoop];
+                    RazorMetaCode - [50..51)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [51..51)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.cspans.txt
new file mode 100644
index 0000000000..232818d1f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (2:0,2 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [3] )
+Markup span at (5:0,5 [3] ) (Accepts:None) - Parent: Tag block at (5:0,5 [3] )
+Markup span at (8:0,8 [4] ) (Accepts:None) - Parent: Tag block at (8:0,8 [4] )
+Markup span at (12:0,12 [4] ) (Accepts:None) - Parent: Tag block at (12:0,12 [4] )
+Markup span at (16:0,16 [3] ) (Accepts:None) - Parent: Tag block at (16:0,16 [3] )
+Markup span at (19:0,19 [4] ) (Accepts:None) - Parent: Tag block at (19:0,19 [4] )
+Code span at (23:0,23 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt
new file mode 100644
index 0000000000..8e19b5c2ac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..24)::24 - [@{<a><b></b></a><c></c>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..16)::14
+                            MarkupElement - [2..16)::14
+                                MarkupStartTag - [2..5)::3 - [<a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    CloseAngle;[>];
+                                MarkupElement - [5..12)::7
+                                    MarkupStartTag - [5..8)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[b];
+                                        CloseAngle;[>];
+                                    MarkupEndTag - [8..12)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[b];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [12..16)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[a];
+                                    CloseAngle;[>];
+                        MarkupBlock - [16..23)::7
+                            MarkupElement - [16..23)::7
+                                MarkupStartTag - [16..19)::3 - [<c>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[c];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [19..23)::4 - [</c>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[c];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.cspans.txt
new file mode 100644
index 0000000000..d91425cc17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+Markup span at (2:0,2 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+Markup span at (7:0,7 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.diag.txt
new file mode 100644
index 0000000000..cca79a1182
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "br" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt
new file mode 100644
index 0000000000..d1385dbe43
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..7)::7 - [@{<br/}]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpStatement - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..7)::6
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..6)::4
+                        MarkupBlock - [2..6)::4
+                            MarkupElement - [2..6)::4
+                                MarkupStartTag - [2..6)::4 - [<br/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [7..7)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.cspans.txt
new file mode 100644
index 0000000000..513e5e1227
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [9] )
+MetaCode span at (3:0,3 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [9] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt
new file mode 100644
index 0000000000..0dcd4b3227
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..11)::11 - [@{@:foo bar]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..11)::9
+                            MarkupTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [4..11)::7 - [foo bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                                Whitespace;[ ];
+                                Text;[bar];
+                    RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt
new file mode 100644
index 0000000000..66f5786183
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Markup span at (2:0,2 [4] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [12] )
+Markup span at (6:0,6 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (2:0,2 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [12] )
+Code span at (14:0,14 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [15] )
+MetaCode span at (14:0,14 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt
new file mode 100644
index 0000000000..c857f00bc7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..15)::15 - [@{<!-- foo -->}]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpStatement - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..15)::14
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..14)::12
+                        MarkupBlock - [2..14)::12
+                            MarkupCommentBlock - [2..14)::12
+                                MarkupTextLiteral - [2..6)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [6..11)::5 - [ foo ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                MarkupTextLiteral - [11..14)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [14..14)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt
new file mode 100644
index 0000000000..960fc76d40
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (2:0,2 [4] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [13] )
+Markup span at (6:0,6 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (2:0,2 [13] )
+Markup span at (12:0,12 [3] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [13] )
+Code span at (15:0,15 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt
new file mode 100644
index 0000000000..a9736e44df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..16)::16 - [@{<!-- foo --->}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..15)::13
+                            MarkupCommentBlock - [2..15)::13
+                                MarkupTextLiteral - [2..6)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [6..12)::6 - [ foo -] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                    Text;[-];
+                                MarkupTextLiteral - [12..15)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [15..15)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt
new file mode 100644
index 0000000000..76cea803fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [30] )
+Markup span at (10:0,10 [4] ) (Accepts:None) - Parent: HtmlComment block at (10:0,10 [13] )
+Markup span at (14:0,14 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (10:0,10 [13] )
+Markup span at (20:0,20 [3] ) (Accepts:None) - Parent: HtmlComment block at (10:0,10 [13] )
+Markup span at (23:0,23 [3] ) (Accepts:None) - Parent: Markup block at (2:0,2 [30] )
+Markup span at (26:0,26 [6] ) (Accepts:None) - Parent: Tag block at (26:0,26 [6] )
+Code span at (32:0,32 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt
new file mode 100644
index 0000000000..6bb5a51f00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..33)::33 - [@{<foo>bar<!-- zoop -->baz</foo>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupElement - [2..32)::30
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[bar];
+                                MarkupCommentBlock - [10..23)::13
+                                    MarkupTextLiteral - [10..14)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        DoubleHyphen;[--];
+                                    MarkupTextLiteral - [14..20)::6 - [ zoop ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                        Whitespace;[ ];
+                                        Text;[zoop];
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [20..23)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        DoubleHyphen;[--];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [23..26)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[baz];
+                                MarkupEndTag - [26..32)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.cspans.txt
new file mode 100644
index 0000000000..308cb7122f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+Markup span at (2:0,2 [8] ) (Accepts:None) - Parent: Tag block at (2:0,2 [8] )
+Markup span at (10:0,10 [28] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [45] )
+Markup span at (38:0,38 [9] ) (Accepts:None) - Parent: Tag block at (38:0,38 [9] )
+Code span at (47:0,47 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [48] )
+MetaCode span at (47:0,47 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
+Markup span at (48:0,48 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt
new file mode 100644
index 0000000000..76e144c7ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..48)::48 - [@{<script>if(foo<bar) { alert("baz");)</script>}]
+    MarkupBlock - [0..48)::48
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..48)::48
+            CSharpStatement - [0..48)::48
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..48)::47
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..47)::45
+                        MarkupBlock - [2..47)::45
+                            MarkupElement - [2..47)::45
+                                MarkupStartTag - [2..10)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [10..38)::28 - [if(foo<bar) { alert("baz");)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[if(foo];
+                                    OpenAngle;[<];
+                                    Text;[bar)];
+                                    Whitespace;[ ];
+                                    Text;[{];
+                                    Whitespace;[ ];
+                                    Text;[alert(];
+                                    DoubleQuote;["];
+                                    Text;[baz];
+                                    DoubleQuote;["];
+                                    Text;[);)];
+                                MarkupEndTag - [38..47)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [47..47)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [47..48)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [48..48)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.cspans.txt
new file mode 100644
index 0000000000..111203fb08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [50] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+Markup span at (2:0,2 [8] ) (Accepts:None) - Parent: Tag block at (2:0,2 [8] )
+Markup span at (10:0,10 [30] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [47] )
+Markup span at (40:0,40 [9] ) (Accepts:None) - Parent: Tag block at (40:0,40 [9] )
+Code span at (49:0,49 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [50] )
+MetaCode span at (49:0,49 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+Markup span at (50:0,50 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [50] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt
new file mode 100644
index 0000000000..bac6484d91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..50)::50 - [@{<script>if(foo < bar) { alert("baz");)</script>}]
+    MarkupBlock - [0..50)::50
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..50)::50
+            CSharpStatement - [0..50)::50
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..50)::49
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..49)::47
+                        MarkupBlock - [2..49)::47
+                            MarkupElement - [2..49)::47
+                                MarkupStartTag - [2..10)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [10..40)::30 - [if(foo < bar) { alert("baz");)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[if(foo];
+                                    Whitespace;[ ];
+                                    OpenAngle;[<];
+                                    Whitespace;[ ];
+                                    Text;[bar)];
+                                    Whitespace;[ ];
+                                    Text;[{];
+                                    Whitespace;[ ];
+                                    Text;[alert(];
+                                    DoubleQuote;["];
+                                    Text;[baz];
+                                    DoubleQuote;["];
+                                    Text;[);)];
+                                MarkupEndTag - [40..49)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [49..49)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [50..50)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.cspans.txt
new file mode 100644
index 0000000000..04325a68b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Markup span at (2:0,2 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [15] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [15] )
+Markup span at (17:0,17 [5] ) (Accepts:None) - Parent: Tag block at (17:0,17 [5] )
+Markup span at (22:0,22 [4] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [16] )
+Markup span at (26:0,26 [6] ) (Accepts:Any) - Parent: Markup block at (26:0,26 [10] )
+Markup span at (32:0,32 [4] ) (Accepts:Any) - Parent: Markup block at (26:0,26 [10] )
+Markup span at (36:0,36 [2] ) (Accepts:None) - Parent: Tag block at (22:0,22 [16] )
+Markup span at (38:0,38 [6] ) (Accepts:None) - Parent: Tag block at (38:0,38 [6] )
+Markup span at (44:0,44 [6] ) (Accepts:None) - Parent: Tag block at (44:0,44 [6] )
+Code span at (50:0,50 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [51] )
+MetaCode span at (50:0,50 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Markup span at (51:0,51 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
new file mode 100644
index 0000000000..21916ea67e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
@@ -0,0 +1,69 @@
+RazorDocument - [0..51)::51 - [@{<foo bar="baz"><biz><boz zoop=zork/></biz></foo>}]
+    MarkupBlock - [0..51)::51
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..51)::51
+            CSharpStatement - [0..51)::51
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..51)::50
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..50)::48
+                        MarkupBlock - [2..50)::48
+                            MarkupElement - [2..50)::48
+                                MarkupStartTag - [2..17)::15 - [<foo bar="baz">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    MarkupAttributeBlock - [6..16)::10 - [ bar="baz"]
+                                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bar];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [baz]
+                                                MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[baz];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupElement - [17..44)::27
+                                    MarkupStartTag - [17..22)::5 - [<biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[biz];
+                                        CloseAngle;[>];
+                                    MarkupElement - [22..38)::16
+                                        MarkupStartTag - [22..38)::16 - [<boz zoop=zork/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[boz];
+                                            MarkupAttributeBlock - [26..36)::10 - [ zoop=zork]
+                                                MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [27..31)::4 - [zoop] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[zoop];
+                                                Equals;[=];
+                                                GenericBlock - [32..36)::4
+                                                    MarkupLiteralAttributeValue - [32..36)::4 - [zork]
+                                                        MarkupTextLiteral - [32..36)::4 - [zork] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                            Text;[zork];
+                                            ForwardSlash;[/];
+                                            CloseAngle;[>];
+                                    MarkupEndTag - [38..44)::6 - [</biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[biz];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [44..50)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [50..50)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [50..51)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [51..51)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.cspans.txt
new file mode 100644
index 0000000000..33bfa139cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (2:0,2 [28] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt
new file mode 100644
index 0000000000..c2dcafc10d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt
@@ -0,0 +1,2 @@
+(1,3): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt
new file mode 100644
index 0000000000..9d0b8c5e64
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..30)::30 - [@{<                      LF   ]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupElement - [2..30)::28
+                                MarkupStartTag - [2..30)::28 - [<                      LF   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[<Missing>];
+                                    MarkupMiscAttributeContent - [3..30)::27
+                                        MarkupTextLiteral - [3..30)::27 - [                      LF   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[                      ];
+                                            NewLine;[LF];
+                                            Whitespace;[   ];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [30..30)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.cspans.txt
new file mode 100644
index 0000000000..4f1792ca17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Code span at (7:0,7 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt
new file mode 100644
index 0000000000..5ea3dc7ca1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt
new file mode 100644
index 0000000000..2bce5971f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..7)::7 - [@{<foo>]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpStatement - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..7)::6
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..7)::5
+                        MarkupBlock - [2..7)::5
+                            MarkupElement - [2..7)::5
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [7..7)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [7..7)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.cspans.txt
new file mode 100644
index 0000000000..1886686774
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (2:0,2 [9] ) (Accepts:None) - Parent: Markup block at (2:0,2 [9] )
+Code span at (11:0,11 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt
new file mode 100644
index 0000000000..41cb0f1c0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..11)::11 - [@{<!--<foo>]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..11)::9
+                            MarkupTextLiteral - [2..11)::9 - [<!--<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Bang;[!];
+                                DoubleHyphen;[--];
+                                OpenAngle;[<];
+                                Text;[foo];
+                                CloseAngle;[>];
+                        CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt
new file mode 100644
index 0000000000..9e66892caa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [17] )
+Markup span at (11:0,11 [10] ) (Accepts:Whitespace) - Parent: HtmlComment block at (7:0,7 [17] )
+Markup span at (21:0,21 [3] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [17] )
+Markup span at (24:0,24 [3] ) (Accepts:None) - Parent: Markup block at (2:0,2 [31] )
+Markup span at (27:0,27 [6] ) (Accepts:None) - Parent: Tag block at (27:0,27 [6] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt
new file mode 100644
index 0000000000..88dc2f2476
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..34)::34 - [@{<foo><!--<foo></bar-->--></foo>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupCommentBlock - [7..24)::17
+                                    MarkupTextLiteral - [7..11)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        DoubleHyphen;[--];
+                                    MarkupTextLiteral - [11..21)::10 - [<foo></bar] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                        OpenAngle;[<];
+                                        Text;[foo];
+                                        CloseAngle;[>];
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[bar];
+                                    MarkupTextLiteral - [21..24)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        DoubleHyphen;[--];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [24..27)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [27..33)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.cspans.txt
new file mode 100644
index 0000000000..88839eca6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [18] ) (Accepts:None) - Parent: Markup block at (2:0,2 [34] )
+Markup span at (25:0,25 [5] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [34] )
+Markup span at (30:0,30 [6] ) (Accepts:None) - Parent: Tag block at (30:0,30 [6] )
+Code span at (36:0,36 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [37] )
+MetaCode span at (36:0,36 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+Markup span at (37:0,37 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt
new file mode 100644
index 0000000000..628b15a7af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..37)::37 - [@{<foo><!DOCTYPE foo bar> baz></foo>}]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..37)::37
+            CSharpStatement - [0..37)::37
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..37)::36
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..36)::34
+                        MarkupBlock - [2..36)::34
+                            MarkupElement - [2..36)::34
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..25)::18 - [<!DOCTYPE foo bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[DOCTYPE];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [25..30)::5 - [ baz>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [36..36)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [37..37)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.cspans.txt
new file mode 100644
index 0000000000..5d7825701c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [19] ) (Accepts:None) - Parent: Markup block at (2:0,2 [34] )
+Markup span at (26:0,26 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [34] )
+Markup span at (30:0,30 [6] ) (Accepts:None) - Parent: Tag block at (30:0,30 [6] )
+Code span at (36:0,36 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [37] )
+MetaCode span at (36:0,36 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+Markup span at (37:0,37 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt
new file mode 100644
index 0000000000..3b00cf06f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..37)::37 - [@{<foo><?xml foo bar baz?> baz</foo>}]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..37)::37
+            CSharpStatement - [0..37)::37
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..37)::36
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..36)::34
+                        MarkupBlock - [2..36)::34
+                            MarkupElement - [2..36)::34
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..26)::19 - [<?xml foo bar baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    QuestionMark;[?];
+                                    Text;[xml];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                    Text;[bar];
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    QuestionMark;[?];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [26..30)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                MarkupEndTag - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [36..36)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [37..37)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.cspans.txt
new file mode 100644
index 0000000000..2a4e59b07d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [13] ) (Accepts:None) - Parent: Tag block at (7:0,7 [13] )
+Markup span at (20:0,20 [6] ) (Accepts:None) - Parent: Tag block at (20:0,20 [6] )
+Code span at (26:0,26 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.diag.txt
new file mode 100644
index 0000000000..628d44579e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,23): Error RZ1026: Encountered end tag "foo" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt
new file mode 100644
index 0000000000..4d2b3bc02d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..27)::27 - [@{<foo></!-- bar --></foo>}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupElement - [7..20)::13
+                                    MarkupEndTag - [7..20)::13 - [</!-- bar -->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[<Missing>];
+                                        MarkupMiscAttributeContent - [9..19)::10
+                                            MarkupTextLiteral - [9..19)::10 - [!-- bar --] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Bang;[!];
+                                                DoubleHyphen;[--];
+                                                Whitespace;[ ];
+                                                Text;[bar];
+                                                Whitespace;[ ];
+                                                DoubleHyphen;[--];
+                                        CloseAngle;[>];
+                        MarkupBlock - [20..26)::6
+                            MarkupElement - [20..26)::6
+                                MarkupEndTag - [20..26)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.cspans.txt
new file mode 100644
index 0000000000..a94530c9bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (2:0,2 [7] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Code span at (9:0,9 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt
new file mode 100644
index 0000000000..948a2dc1f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..10)::10 - [@{<foo />}]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        MarkupBlock - [2..9)::7
+                            MarkupElement - [2..9)::7
+                                MarkupStartTag - [2..9)::7 - [<foo />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    MarkupMiscAttributeContent - [6..7)::1
+                                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [9..9)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.cspans.txt
new file mode 100644
index 0000000000..aa2e0c80e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Markup span at (4:0,4 [6] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [6] )
+Markup span at (10:0,10 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt
new file mode 100644
index 0000000000..da9b272fd0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..14)::14 - [Foo </div> Bar]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupElement - [4..10)::6
+            MarkupEndTag - [4..10)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [10..14)::4 - [ Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[Bar];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt
new file mode 100644
index 0000000000..cd03a1193c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [1] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
+Markup span at (1:0,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.diag.txt
new file mode 100644
index 0000000000..c6d6925451
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt
new file mode 100644
index 0000000000..1b3a186cb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..1)::1 - [@]
+    MarkupBlock - [0..1)::1
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..1)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.cspans.txt
new file mode 100644
index 0000000000..d0a7399fbb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [6] )
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [17] )
+Markup span at (8:0,8 [10] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [14] )
+Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [14] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [14] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [17] )
+Markup span at (23:0,23 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Markup span at (28:0,28 [4] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [4] )
+Markup span at (32:0,32 [7] ) (Accepts:Any) - Parent: Tag block at (32:0,32 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
new file mode 100644
index 0000000000..d407c11ec6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..39)::39 - [<div ><p class = 'bar'> Foo </p></div >]
+    MarkupBlock - [0..39)::39
+        MarkupElement - [0..39)::39
+            MarkupStartTag - [0..6)::6 - [<div >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupMiscAttributeContent - [4..5)::1
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupElement - [6..32)::26
+                MarkupStartTag - [6..23)::17 - [<p class = 'bar'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    MarkupAttributeBlock - [8..22)::14 - [ class = 'bar']
+                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        Equals;[=];
+                        MarkupTextLiteral - [16..18)::2 - [ '] - Gen<None> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            SingleQuote;['];
+                        GenericBlock - [18..21)::3
+                            MarkupLiteralAttributeValue - [18..21)::3 - [bar]
+                                MarkupTextLiteral - [18..21)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[bar];
+                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                            SingleQuote;['];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [23..28)::5 - [ Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    Text;[Foo];
+                    Whitespace;[ ];
+                MarkupEndTag - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupEndTag - [32..39)::7 - [</div >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                MarkupMiscAttributeContent - [37..38)::1
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt
new file mode 100644
index 0000000000..5d0ddc2940
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (9:0,9 [12] )
+Code span at (10:0,10 [11] ) (Accepts:Any) - Parent: Statement block at (9:0,9 [12] )
+Markup span at (21:0,21 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Markup span at (25:0,25 [6] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
new file mode 100644
index 0000000000..259ac75bfb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..31)::31 - [<div>Foo @if(true) {} Bar</div>]
+    MarkupBlock - [0..31)::31
+        MarkupElement - [0..31)::31
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..9)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+                Whitespace;[ ];
+            CSharpCodeBlock - [9..21)::12
+                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [10..21)::11 - [if(true) {}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Keyword;[true];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    RightBrace;[}];
+            MarkupTextLiteral - [21..25)::4 - [ Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[Bar];
+            MarkupEndTag - [25..31)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.cspans.txt
new file mode 100644
index 0000000000..bc666a56c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (5:1,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Markup span at (7:2,0 [6] ) (Accepts:Any) - Parent: Tag block at (7:2,0 [6] )
+Markup span at (13:2,6 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt
new file mode 100644
index 0000000000..fabfa3c78f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..15)::15 - [@{LF}LF<html>LF]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [5..7)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [7..15)::8
+            MarkupStartTag - [7..13)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
+            MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.cspans.txt
new file mode 100644
index 0000000000..dc0d803cca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (5:1,1 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Markup span at (9:1,5 [6] ) (Accepts:Any) - Parent: Tag block at (9:1,5 [6] )
+Markup span at (15:1,11 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt
new file mode 100644
index 0000000000..2e72f13a9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [@{LF}   	<html>LF]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [5..9)::4 - [   	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[   	];
+        MarkupElement - [9..17)::8
+            MarkupStartTag - [9..15)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
+            MarkupTextLiteral - [15..17)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.cspans.txt
new file mode 100644
index 0000000000..3377e6030e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (5:1,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Markup span at (7:2,0 [6] ) (Accepts:Any) - Parent: Tag block at (7:2,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt
new file mode 100644
index 0000000000..851d431f02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..13)::13 - [@{LF}LF<html>]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [5..7)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [7..13)::6
+            MarkupStartTag - [7..13)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.cspans.txt
new file mode 100644
index 0000000000..f0a0bcd1d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (5:1,1 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Markup span at (9:2,0 [6] ) (Accepts:Any) - Parent: Tag block at (9:2,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt
new file mode 100644
index 0000000000..33396e0ba8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..15)::15 - [@{LF} 	LF<html>]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [5..9)::4 - [ 	LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            Whitespace;[ 	];
+            NewLine;[LF];
+        MarkupElement - [9..15)::6
+            MarkupStartTag - [9..15)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.cspans.txt
new file mode 100644
index 0000000000..64066d4763
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [17] )
+Transition span at (12:0,12 [7] ) (Accepts:None) - Parent: Tag block at (12:0,12 [7] )
+Code span at (19:0,19 [4] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:2,1 [6] ) (Accepts:Any) - Parent: Tag block at (24:2,1 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt
new file mode 100644
index 0000000000..b1b8a4a26f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..30)::30 - [@{<text>Blah</text>LFLF}<html>]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [8..12)::4 - [Blah] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Blah];
+                                MarkupEndTag - [12..19)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..23)::4 - [LFLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            NewLine;[LF];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupElement - [24..30)::6
+            MarkupStartTag - [24..30)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.cspans.txt
new file mode 100644
index 0000000000..171db96fab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Markup span at (4:0,4 [5] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [5] )
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [3] )
+Markup span at (12:0,12 [4] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [4] )
+Markup span at (16:0,16 [4] ) (Accepts:Any) - Parent: Tag block at (16:0,16 [4] )
+Markup span at (20:0,20 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt
new file mode 100644
index 0000000000..8943facbf6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..24)::24 - [Foo <div><p></p></p> Baz]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..4)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupElement - [4..24)::20
+            MarkupStartTag - [4..9)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupElement - [9..16)::7
+                MarkupStartTag - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupEndTag - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupElement - [16..20)::4
+                MarkupEndTag - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [20..24)::4 - [ Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[Baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt
new file mode 100644
index 0000000000..00a1a77d55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [39] )
+Markup span at (2:0,2 [7] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [36] )
+Markup span at (9:0,9 [28] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [36] )
+Markup span at (37:0,37 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [36] )
+Markup span at (38:0,38 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [39] )
+Markup span at (39:0,39 [8] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Markup span at (47:0,47 [4] ) (Accepts:Any) - Parent: Tag block at (47:0,47 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
new file mode 100644
index 0000000000..77310407c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..51)::51 - [<a href="mailto:example@microsoft.com">Email me</a>]
+    MarkupBlock - [0..51)::51
+        MarkupElement - [0..51)::51
+            MarkupStartTag - [0..39)::39 - [<a href="mailto:example@microsoft.com">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[a];
+                MarkupAttributeBlock - [2..38)::36 - [ href="mailto:example@microsoft.com"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[href];
+                    Equals;[=];
+                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [9..37)::28
+                        MarkupLiteralAttributeValue - [9..37)::28 - [mailto:example@microsoft.com]
+                            MarkupTextLiteral - [9..37)::28 - [mailto:example@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[mailto:example@microsoft.com];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [39..47)::8 - [Email me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Email];
+                Whitespace;[ ];
+                Text;[me];
+            MarkupEndTag - [47..51)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[a];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt
new file mode 100644
index 0000000000..88ff154777
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (4:0,4 [1] ) (Accepts:None) - Parent: Expression block at (4:0,4 [1] )
+Code span at (5:0,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [1] )
+Markup span at (5:0,5 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.diag.txt
new file mode 100644
index 0000000000..bc2525ce53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt
new file mode 100644
index 0000000000..5f52cafeba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..5)::5 - [foo @]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..5)::1
+            CSharpImplicitExpression - [4..5)::1
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..5)::0
+                    CSharpCodeBlock - [5..5)::0
+                        CSharpExpressionLiteral - [5..5)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [5..5)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt
new file mode 100644
index 0000000000..490eb4a82f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt
new file mode 100644
index 0000000000..14decc3757
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..4)::4 - [@bar]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [4..4)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.cspans.txt
new file mode 100644
index 0000000000..7217cc651e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+Transition span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (4:1,0 [13] )
+Code span at (5:1,1 [12] ) (Accepts:Any) - Parent: Statement block at (4:1,0 [13] )
+Code span at (17:2,1 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (20:3,0 [7] ) (Accepts:None) - Parent: Tag block at (20:3,0 [7] )
+Markup span at (27:3,7 [3] ) (Accepts:None) - Parent: Markup block at (20:3,0 [10] )
+Code span at (30:4,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (30:4,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (31:4,1 [6] ) (Accepts:Any) - Parent: Tag block at (31:4,1 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt
new file mode 100644
index 0000000000..99d6c80a8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..37)::37 - [@{LF@if(true){LF} LF<input> LF}<html>]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        CSharpCodeBlock - [4..17)::13
+                            CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [5..17)::12 - [if(true){LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Keyword;[true];
+                                RightParenthesis;[)];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                RightBrace;[}];
+                        CSharpStatementLiteral - [17..20)::3 - [ LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            NewLine;[LF];
+                        MarkupBlock - [20..30)::10
+                            MarkupElement - [20..27)::7
+                                MarkupStartTag - [20..27)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [27..30)::3 - [ LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupElement - [31..37)::6
+            MarkupStartTag - [31..37)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.cspans.txt
new file mode 100644
index 0000000000..a77a720a46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+Transition span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (4:1,0 [13] )
+Code span at (5:1,1 [12] ) (Accepts:Any) - Parent: Statement block at (4:1,0 [13] )
+Markup span at (17:2,1 [1] ) (Accepts:Any) - Parent: Markup block at (17:2,1 [9] )
+Markup span at (18:2,2 [7] ) (Accepts:None) - Parent: Tag block at (18:2,2 [7] )
+Markup span at (25:2,9 [1] ) (Accepts:None) - Parent: Markup block at (17:2,1 [9] )
+Code span at (26:2,10 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:2,10 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:2,11 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt
new file mode 100644
index 0000000000..fe8f98cf28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..27)::27 - [@{LF@if(true){LF} <input> }]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        CSharpCodeBlock - [4..17)::13
+                            CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [5..17)::12 - [if(true){LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Keyword;[true];
+                                RightParenthesis;[)];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                RightBrace;[}];
+                        MarkupBlock - [17..26)::9
+                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [18..25)::7
+                                MarkupStartTag - [18..25)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.cspans.txt
new file mode 100644
index 0000000000..bcf75ec253
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+Transition span at (4:1,0 [1] ) (Accepts:None) - Parent: Statement block at (4:1,0 [13] )
+Code span at (5:1,1 [12] ) (Accepts:Any) - Parent: Statement block at (4:1,0 [13] )
+Code span at (17:2,1 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:3,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:3,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Markup span at (23:4,0 [6] ) (Accepts:Any) - Parent: Tag block at (23:4,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt
new file mode 100644
index 0000000000..8e2d005143
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..29)::29 - [@{LF@if(true){LF} LF}LF<html>]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        CSharpCodeBlock - [4..17)::13
+                            CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [5..17)::12 - [if(true){LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Keyword;[true];
+                                RightParenthesis;[)];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                RightBrace;[}];
+                        CSharpStatementLiteral - [17..20)::3 - [ LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            NewLine;[LF];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [21..23)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [23..29)::6
+            MarkupStartTag - [23..29)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt
new file mode 100644
index 0000000000..55bb03e494
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (4:0,4 [1] ) (Accepts:None) - Parent: Expression block at (4:0,4 [4] )
+Code span at (5:0,5 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [4] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt
new file mode 100644
index 0000000000..112b5dc463
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..12)::12 - [foo @bar baz]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..8)::4
+            CSharpImplicitExpression - [4..8)::4
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..8)::3
+                    CSharpCodeBlock - [5..8)::3
+                        CSharpExpressionLiteral - [5..8)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..12)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
new file mode 100644
index 0000000000..5d433efd31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [4] )
+Code span at (22:0,22 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [4] )
+Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Markup span at (27:0,27 [9] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt
new file mode 100644
index 0000000000..1bade1e988
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..36)::36 - [<script>foo<bar baz='@boz'></script>]
+    MarkupBlock - [0..36)::36
+        MarkupElement - [0..36)::36
+            MarkupStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..21)::13 - [foo<bar baz='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[foo];
+                OpenAngle;[<];
+                Text;[bar];
+                Whitespace;[ ];
+                Text;[baz];
+                Equals;[=];
+                SingleQuote;['];
+            CSharpCodeBlock - [21..25)::4
+                CSharpImplicitExpression - [21..25)::4
+                    CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [22..25)::3
+                        CSharpCodeBlock - [22..25)::3
+                            CSharpExpressionLiteral - [22..25)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[boz];
+            MarkupTextLiteral - [25..27)::2 - ['>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+                CloseAngle;[>];
+            MarkupEndTag - [27..36)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
new file mode 100644
index 0000000000..ae1f1aa184
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [52] )
+Code span at (1:0,1 [12] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [52] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Statement block at (13:0,13 [37] )
+Code span at (14:0,14 [11] ) (Accepts:Any) - Parent: Statement block at (13:0,13 [37] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
+Markup span at (26:0,26 [5] ) (Accepts:None) - Parent: Tag block at (26:0,26 [5] )
+Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [10] )
+Code span at (32:0,32 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [10] )
+Markup span at (41:0,41 [1] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
+Markup span at (42:0,42 [6] ) (Accepts:None) - Parent: Tag block at (42:0,42 [6] )
+Markup span at (48:0,48 [1] ) (Accepts:None) - Parent: Markup block at (25:0,25 [24] )
+Code span at (49:0,49 [1] ) (Accepts:Any) - Parent: Statement block at (13:0,13 [37] )
+Code span at (50:0,50 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [52] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
new file mode 100644
index 0000000000..3ad32ce552
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..52)::52 - [@if (true) { @if(false) { <div>@something.</div> } }]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..52)::52
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..13)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [13..50)::37
+                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [14..25)::11 - [if(false) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [25..49)::24
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupElement - [26..48)::22
+                        MarkupStartTag - [26..31)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[div];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                        CSharpCodeBlock - [31..41)::10
+                            CSharpImplicitExpression - [31..41)::10
+                                CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [32..41)::9
+                                    CSharpCodeBlock - [32..41)::9
+                                        CSharpExpressionLiteral - [32..41)::9 - [something] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[something];
+                        MarkupTextLiteral - [41..42)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[.];
+                        MarkupEndTag - [42..48)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[div];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [49..50)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+            CSharpStatementLiteral - [50..52)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.cspans.txt
new file mode 100644
index 0000000000..8a3272c5b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt
new file mode 100644
index 0000000000..b636dfcedc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..17)::17 - [<foo>${bar}</foo>]
+    MarkupBlock - [0..17)::17
+        MarkupElement - [0..17)::17
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..11)::6 - [${bar}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[${bar}];
+            MarkupEndTag - [11..17)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.cspans.txt
new file mode 100644
index 0000000000..a7687acf26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [0] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt
new file mode 100644
index 0000000000..dcd6e30919
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt
@@ -0,0 +1,4 @@
+RazorDocument - [0..0)::0 - []
+    MarkupBlock - [0..0)::0
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.cspans.txt
new file mode 100644
index 0000000000..24b53ba184
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt
new file mode 100644
index 0000000000..8ba87c13e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt
@@ -0,0 +1,4 @@
+RazorDocument - [0..10)::10 - [          ]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..10)::10 - [          ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[          ];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.cspans.txt
new file mode 100644
index 0000000000..fdb12c7ba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [21] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
new file mode 100644
index 0000000000..d745d52162
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
@@ -0,0 +1,4 @@
+RazorDocument - [0..21)::21 - [example@microsoft.com]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..21)::21 - [example@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[example@microsoft.com];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt
new file mode 100644
index 0000000000..3b00db2835
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [53] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [53] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [53] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
+Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
+Markup span at (23:0,23 [13] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
+Transition span at (36:0,36 [1] ) (Accepts:None) - Parent: Expression block at (36:0,36 [4] )
+Code span at (37:0,37 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (36:0,36 [4] )
+Markup span at (40:0,40 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
+Markup span at (42:0,42 [9] ) (Accepts:Any) - Parent: Tag block at (42:0,42 [9] )
+Markup span at (51:0,51 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
+MetaCode span at (52:0,52 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
+Markup span at (53:0,53 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt
new file mode 100644
index 0000000000..6d1d25d388
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..53)::53 - [@section Foo { <script>foo<bar baz='@boz'></script> }]
+    MarkupBlock - [0..53)::53
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..53)::53
+            RazorDirective - [0..53)::53 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..53)::52
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..53)::45
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..52)::38
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [15..51)::36
+                                MarkupStartTag - [15..23)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [23..36)::13 - [foo<bar baz='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                                    OpenAngle;[<];
+                                    Text;[bar];
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    Equals;[=];
+                                    SingleQuote;['];
+                                CSharpCodeBlock - [36..40)::4
+                                    CSharpImplicitExpression - [36..40)::4
+                                        CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [37..40)::3
+                                            CSharpCodeBlock - [37..40)::3
+                                                CSharpExpressionLiteral - [37..40)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                    Identifier;[boz];
+                                MarkupTextLiteral - [40..42)::2 - ['>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [42..51)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [53..53)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.cspans.txt
new file mode 100644
index 0000000000..5b9dbcd8aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt
new file mode 100644
index 0000000000..30659bb00b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt
@@ -0,0 +1,6 @@
+RazorDocument - [0..7)::7 - [foo baz]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..7)::7 - [foo baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.cspans.txt
new file mode 100644
index 0000000000..f77279dbd9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [38] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Transition span at (12:0,12 [7] ) (Accepts:None) - Parent: Tag block at (12:0,12 [7] )
+Markup span at (19:0,19 [2] ) (Accepts:None) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (21:1,0 [8] ) (Accepts:None) - Parent: Tag block at (21:1,0 [8] )
+Markup span at (29:1,8 [2] ) (Accepts:None) - Parent: Markup block at (21:1,0 [10] )
+Code span at (31:2,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:2,1 [6] ) (Accepts:Any) - Parent: Tag block at (32:2,1 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt
new file mode 100644
index 0000000000..c9a55ee938
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..38)::38 - [@{<text>Blah</text>LF<input/>LF}<html>]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [8..12)::4 - [Blah] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Blah];
+                                MarkupEndTag - [12..19)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [19..21)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        MarkupBlock - [21..31)::10
+                            MarkupElement - [21..29)::8
+                                MarkupStartTag - [21..29)::8 - [<input/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [29..31)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupElement - [32..38)::6
+            MarkupStartTag - [32..38)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.cspans.txt
new file mode 100644
index 0000000000..74b05993f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Transition span at (12:0,12 [7] ) (Accepts:None) - Parent: Tag block at (12:0,12 [7] )
+Markup span at (19:0,19 [2] ) (Accepts:None) - Parent: Markup block at (2:0,2 [19] )
+Transition span at (21:1,0 [1] ) (Accepts:None) - Parent: Markup block at (21:1,0 [9] )
+MetaCode span at (22:1,1 [1] ) (Accepts:Any) - Parent: Markup block at (21:1,0 [9] )
+Markup span at (23:1,2 [7] ) (Accepts:None) - Parent: Markup block at (21:1,0 [9] )
+Code span at (30:2,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (30:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (31:2,1 [6] ) (Accepts:Any) - Parent: Tag block at (31:2,1 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt
new file mode 100644
index 0000000000..66dd22c8ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..37)::37 - [@{<text>Blah</text>LF@: BlehLF}<html>]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [8..12)::4 - [Blah] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Blah];
+                                MarkupEndTag - [12..19)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [19..21)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        MarkupBlock - [21..30)::9
+                            MarkupTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [23..30)::7 - [ BlehLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Text;[Bleh];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupElement - [31..37)::6
+            MarkupStartTag - [31..37)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.cspans.txt
new file mode 100644
index 0000000000..4df286098a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Markup span at (4:0,4 [6] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [6] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Markup span at (13:0,13 [7] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt
new file mode 100644
index 0000000000..668a7dba33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..20)::20 - [Foo <text>Foo</text>]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..4)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupElement - [4..20)::16
+            MarkupStartTag - [4..10)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                CloseAngle;[>];
+            MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [13..20)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt
new file mode 100644
index 0000000000..056f638ae3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (7:0,7 [4] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [10] )
+Markup span at (11:0,11 [3] ) (Accepts:Whitespace) - Parent: HtmlComment block at (7:0,7 [10] )
+Markup span at (14:0,14 [3] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [10] )
+Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (20:0,20 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt
new file mode 100644
index 0000000000..e9fd31b945
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..30)::30 - [Foo Baz<!--Foo-->Bar<!--F> Qux]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..7)::7 - [Foo Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+            Text;[Baz];
+        MarkupCommentBlock - [7..17)::10
+            MarkupTextLiteral - [7..11)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                Text;[Foo];
+            MarkupTextLiteral - [14..17)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTextLiteral - [17..20)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Bar];
+        MarkupTextLiteral - [20..30)::10 - [<!--F> Qux] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+            Text;[F];
+            CloseAngle;[>];
+            Whitespace;[ ];
+            Text;[Qux];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..b2e4945859
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [20] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (12:0,12 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [2] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [2] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [20] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..0fe538762c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..22)::22 - [{<span foo='@@def' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..21)::20
+            MarkupStartTag - [1..21)::20 - [<span foo='@@def' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..18)::12 - [ foo='@@def']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..17)::5
+                        MarkupBlock - [12..14)::2
+                            MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [14..17)::3 - [def]
+                            MarkupTextLiteral - [14..17)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[def];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [18..19)::1
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..c467119bb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [20] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (15:0,15 [1] ) (Accepts:None) - Parent: Markup block at (15:0,15 [2] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Markup block at (15:0,15 [2] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [12] )
+Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [20] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..10f6f191b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..22)::22 - [{<span foo='abc@@' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..21)::20
+            MarkupStartTag - [1..21)::20 - [<span foo='abc@@' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..18)::12 - [ foo='abc@@']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..17)::5
+                        MarkupLiteralAttributeValue - [12..15)::3 - [abc]
+                            MarkupTextLiteral - [12..15)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[abc];
+                        MarkupBlock - [15..17)::2
+                            MarkupTextLiteral - [15..16)::1 - [@] - Gen<LitAttr:@(15:0,15)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [16..17)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [18..19)::1
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..d88cf7ca8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [25] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [17] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [17] )
+Markup span at (15:0,15 [2] ) (Accepts:None) - Parent: Markup block at (15:0,15 [3] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (15:0,15 [3] )
+Markup span at (18:0,18 [4] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [17] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [17] )
+Markup span at (23:0,23 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [25] )
+Markup span at (26:0,26 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..89e33f24f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..27)::27 - [{<span foo='abc @@ def' />}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..26)::25
+            MarkupStartTag - [1..26)::25 - [<span foo='abc @@ def' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..23)::17 - [ foo='abc @@ def']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..22)::10
+                        MarkupLiteralAttributeValue - [12..15)::3 - [abc]
+                            MarkupTextLiteral - [12..15)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[abc];
+                        MarkupBlock - [15..18)::3
+                            MarkupTextLiteral - [15..17)::2 - [ @] - Gen<LitAttr: @(15:0,15)> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [18..22)::4 - [ def]
+                            MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [19..22)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[def];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [23..24)::1
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [26..27)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..54f716a8ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [17] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [9] )
+Markup span at (12:0,12 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [2] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [2] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [9] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [17] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..769eb56d25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..19)::19 - [{<span foo='@@' />}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..18)::17
+            MarkupStartTag - [1..18)::17 - [<span foo='@@' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..15)::9 - [ foo='@@']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..14)::2
+                        MarkupBlock - [12..14)::2
+                            MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [15..16)::1
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..5432840fb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [42] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [34] )
+Markup span at (12:0,12 [11] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [34] )
+Markup span at (23:0,23 [4] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [34] )
+Markup span at (27:0,27 [1] ) (Accepts:None) - Parent: Markup block at (27:0,27 [2] )
+Markup span at (28:0,28 [1] ) (Accepts:None) - Parent: Markup block at (27:0,27 [2] )
+Markup span at (29:0,29 [7] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [34] )
+Markup span at (36:0,36 [2] ) (Accepts:None) - Parent: Markup block at (36:0,36 [3] )
+Markup span at (38:0,38 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [3] )
+Markup span at (39:0,39 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [34] )
+Markup span at (40:0,40 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [42] )
+Markup span at (43:0,43 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..fef5ae37c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..44)::44 - [{<span foo='abc@def.com abc@@def.com @@' />}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..43)::42
+            MarkupStartTag - [1..43)::42 - [<span foo='abc@def.com abc@@def.com @@' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..40)::34 - [ foo='abc@def.com abc@@def.com @@']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..39)::27
+                        MarkupLiteralAttributeValue - [12..23)::11 - [abc@def.com]
+                            MarkupTextLiteral - [12..23)::11 - [abc@def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[abc@def.com];
+                        MarkupLiteralAttributeValue - [23..27)::4 - [ abc]
+                            MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [24..27)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[abc];
+                        MarkupBlock - [27..29)::2
+                            MarkupTextLiteral - [27..28)::1 - [@] - Gen<LitAttr:@(27:0,27)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [28..29)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [29..36)::7 - [def.com]
+                            MarkupTextLiteral - [29..36)::7 - [def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[def.com];
+                        MarkupBlock - [36..39)::3
+                            MarkupTextLiteral - [36..38)::2 - [ @] - Gen<LitAttr: @(36:0,36)> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [40..41)::1
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [43..44)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..5bb501bc46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [117] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [115] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [107] )
+Markup span at (12:0,12 [32] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [107] )
+Markup span at (44:0,44 [1] ) (Accepts:None) - Parent: Markup block at (44:0,44 [2] )
+Markup span at (45:0,45 [1] ) (Accepts:None) - Parent: Markup block at (44:0,44 [2] )
+Markup span at (46:0,46 [66] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [107] )
+Markup span at (112:0,112 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [107] )
+Markup span at (113:0,113 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [115] )
+Markup span at (116:0,116 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [117] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..ad65481c31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
@@ -0,0 +1,79 @@
+RazorDocument - [0..117)::117 - [{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />}]
+    MarkupBlock - [0..117)::117
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..116)::115
+            MarkupStartTag - [1..116)::115 - [<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..113)::107 - [ foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [12..112)::100
+                        MarkupLiteralAttributeValue - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+]
+                            MarkupTextLiteral - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                ForwardSlash;[/];
+                                Text;[^];
+                                LeftBracket;[[];
+                                Text;[a-z0-9];
+                                Bang;[!];
+                                Text;[#$%&];
+                                SingleQuote;['];
+                                Text;[*+\];
+                                ForwardSlash;[/];
+                                Equals;[=];
+                                QuestionMark;[?];
+                                Text;[^_`{|}~.-];
+                                RightBracket;[]];
+                                Text;[+];
+                        MarkupBlock - [44..46)::2
+                            MarkupTextLiteral - [44..45)::1 - [@] - Gen<LitAttr:@(44:0,44)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [45..46)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [46..112)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i]
+                            MarkupTextLiteral - [46..112)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                LeftBracket;[[];
+                                Text;[a-z0-9];
+                                RightBracket;[]];
+                                Text;[(];
+                                LeftBracket;[[];
+                                Text;[a-z0-9-];
+                                RightBracket;[]];
+                                Text;[*];
+                                LeftBracket;[[];
+                                Text;[a-z0-9];
+                                RightBracket;[]];
+                                Text;[)];
+                                QuestionMark;[?];
+                                Text;[\.(];
+                                LeftBracket;[[];
+                                Text;[a-z0-9];
+                                RightBracket;[]];
+                                Text;[(];
+                                LeftBracket;[[];
+                                Text;[a-z0-9-];
+                                RightBracket;[]];
+                                Text;[*];
+                                LeftBracket;[[];
+                                Text;[a-z0-9];
+                                RightBracket;[]];
+                                Text;[)];
+                                QuestionMark;[?];
+                                Text;[)*$];
+                                ForwardSlash;[/];
+                                Text;[i];
+                    MarkupTextLiteral - [112..113)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [113..114)::1
+                    MarkupTextLiteral - [113..114)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [116..117)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
new file mode 100644
index 0000000000..c9dd807814
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
@@ -0,0 +1,43 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [120] )
+Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [118] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [15] )
+Markup span at (12:0,12 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [2] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Markup block at (12:0,12 [2] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [6] )
+Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [6] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [6] )
+Code span at (16:0,16 [3] ) (Accepts:Any) - Parent: Expression block at (14:0,14 [6] )
+MetaCode span at (19:0,19 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [6] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [15] )
+Markup span at (21:0,21 [6] ) (Accepts:Any) - Parent: Markup block at (21:0,21 [28] )
+Transition span at (27:0,27 [1] ) (Accepts:None) - Parent: Expression block at (27:0,27 [6] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Expression block at (27:0,27 [6] )
+Code span at (29:0,29 [3] ) (Accepts:Any) - Parent: Expression block at (27:0,27 [6] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (27:0,27 [6] )
+Markup span at (33:0,33 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33 [2] )
+Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33 [2] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [13] )
+Transition span at (35:0,35 [1] ) (Accepts:None) - Parent: Expression block at (35:0,35 [13] )
+Code span at (36:0,36 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (35:0,35 [13] )
+Markup span at (48:0,48 [1] ) (Accepts:Any) - Parent: Markup block at (21:0,21 [28] )
+Markup span at (49:0,49 [6] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [22] )
+Transition span at (55:0,55 [1] ) (Accepts:None) - Parent: Expression block at (55:0,55 [13] )
+Code span at (56:0,56 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (55:0,55 [13] )
+Markup span at (68:0,68 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [2] )
+Markup span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [2] )
+Markup span at (70:0,70 [1] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [22] )
+Markup span at (71:0,71 [6] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [23] )
+Transition span at (77:0,77 [1] ) (Accepts:None) - Parent: Expression block at (77:0,77 [13] )
+Code span at (78:0,78 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (77:0,77 [13] )
+Markup span at (90:0,90 [2] ) (Accepts:None) - Parent: Markup block at (90:0,90 [3] )
+Markup span at (92:0,92 [1] ) (Accepts:None) - Parent: Markup block at (90:0,90 [3] )
+Markup span at (93:0,93 [1] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [23] )
+Markup span at (94:0,94 [6] ) (Accepts:Any) - Parent: Markup block at (94:0,94 [22] )
+Markup span at (100:0,100 [1] ) (Accepts:None) - Parent: Markup block at (100:0,100 [2] )
+Markup span at (101:0,101 [1] ) (Accepts:None) - Parent: Markup block at (100:0,100 [2] )
+Markup span at (102:0,102 [0] ) (Accepts:Any) - Parent: Markup block at (102:0,102 [13] )
+Transition span at (102:0,102 [1] ) (Accepts:None) - Parent: Expression block at (102:0,102 [13] )
+Code span at (103:0,103 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (102:0,102 [13] )
+Markup span at (115:0,115 [1] ) (Accepts:Any) - Parent: Markup block at (94:0,94 [22] )
+Markup span at (116:0,116 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [118] )
+Markup span at (119:0,119 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [120] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
new file mode 100644
index 0000000000..b8f69cb320
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
@@ -0,0 +1,182 @@
+RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}]
+    MarkupBlock - [0..120)::120
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupElement - [1..119)::118
+            MarkupStartTag - [1..119)::118 - [<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [6..21)::15 - [ foo='@@@(2+3)']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..20)::8
+                        MarkupBlock - [12..14)::2
+                            MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupDynamicAttributeValue - [14..20)::6 - [@(2+3)]
+                            GenericBlock - [14..20)::6
+                                MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Marker;[];
+                                CSharpCodeBlock - [14..20)::6
+                                    CSharpExplicitExpression - [14..20)::6
+                                        CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpExplicitExpressionBody - [15..20)::5
+                                            RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                LeftParenthesis;[(];
+                                            CSharpCodeBlock - [16..19)::3
+                                                CSharpExpressionLiteral - [16..19)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                    IntegerLiteral;[2];
+                                                    Plus;[+];
+                                                    IntegerLiteral;[3];
+                                            RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightParenthesis;[)];
+                    MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [21..49)::28 - [ bar='@(2+3)@@@DateTime.Now']
+                    MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [22..25)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [27..48)::21
+                        MarkupDynamicAttributeValue - [27..33)::6 - [@(2+3)]
+                            GenericBlock - [27..33)::6
+                                CSharpCodeBlock - [27..33)::6
+                                    CSharpExplicitExpression - [27..33)::6
+                                        CSharpTransition - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpExplicitExpressionBody - [28..33)::5
+                                            RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                LeftParenthesis;[(];
+                                            CSharpCodeBlock - [29..32)::3
+                                                CSharpExpressionLiteral - [29..32)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                    IntegerLiteral;[2];
+                                                    Plus;[+];
+                                                    IntegerLiteral;[3];
+                                            RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightParenthesis;[)];
+                        MarkupBlock - [33..35)::2
+                            MarkupTextLiteral - [33..34)::1 - [@] - Gen<LitAttr:@(33:0,33)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [34..35)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupDynamicAttributeValue - [35..48)::13 - [@DateTime.Now]
+                            GenericBlock - [35..48)::13
+                                MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Marker;[];
+                                CSharpCodeBlock - [35..48)::13
+                                    CSharpImplicitExpression - [35..48)::13
+                                        CSharpTransition - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [36..48)::12
+                                            CSharpCodeBlock - [36..48)::12
+                                                CSharpExpressionLiteral - [36..48)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [48..49)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [49..71)::22 - [ baz='@DateTime.Now@@']
+                    MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [50..53)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[baz];
+                    Equals;[=];
+                    MarkupTextLiteral - [54..55)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [55..70)::15
+                        MarkupDynamicAttributeValue - [55..68)::13 - [@DateTime.Now]
+                            GenericBlock - [55..68)::13
+                                CSharpCodeBlock - [55..68)::13
+                                    CSharpImplicitExpression - [55..68)::13
+                                        CSharpTransition - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [56..68)::12
+                                            CSharpCodeBlock - [56..68)::12
+                                                CSharpExpressionLiteral - [56..68)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupBlock - [68..70)::2
+                            MarkupTextLiteral - [68..69)::1 - [@] - Gen<LitAttr:@(68:0,68)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [69..70)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                    MarkupTextLiteral - [70..71)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [71..94)::23 - [ bat='@DateTime.Now @@']
+                    MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [72..75)::3 - [bat] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bat];
+                    Equals;[=];
+                    MarkupTextLiteral - [76..77)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [77..93)::16
+                        MarkupDynamicAttributeValue - [77..90)::13 - [@DateTime.Now]
+                            GenericBlock - [77..90)::13
+                                CSharpCodeBlock - [77..90)::13
+                                    CSharpImplicitExpression - [77..90)::13
+                                        CSharpTransition - [77..78)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [78..90)::12
+                                            CSharpCodeBlock - [78..90)::12
+                                                CSharpExpressionLiteral - [78..90)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupBlock - [90..93)::3
+                            MarkupTextLiteral - [90..92)::2 - [ @] - Gen<LitAttr: @(90:0,90)> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [92..93)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                    MarkupTextLiteral - [93..94)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [94..116)::22 - [ zoo='@@@DateTime.Now']
+                    MarkupTextLiteral - [94..95)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [95..98)::3 - [zoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[zoo];
+                    Equals;[=];
+                    MarkupTextLiteral - [99..100)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [100..115)::15
+                        MarkupBlock - [100..102)::2
+                            MarkupTextLiteral - [100..101)::1 - [@] - Gen<LitAttr:@(100:0,100)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [101..102)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupDynamicAttributeValue - [102..115)::13 - [@DateTime.Now]
+                            GenericBlock - [102..115)::13
+                                MarkupTextLiteral - [102..102)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Marker;[];
+                                CSharpCodeBlock - [102..115)::13
+                                    CSharpImplicitExpression - [102..115)::13
+                                        CSharpTransition - [102..103)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [103..115)::12
+                                            CSharpCodeBlock - [103..115)::12
+                                                CSharpExpressionLiteral - [103..115)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [115..116)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [116..117)::1
+                    MarkupTextLiteral - [116..117)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [119..120)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
new file mode 100644
index 0000000000..e749e6a3f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
+Markup span at (5:0,5 [6] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [10] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [1] )
+Code span at (12:0,12 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [1] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [2] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [1] )
+Code span at (14:0,14 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:0,13 [1] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [10] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt
new file mode 100644
index 0000000000..3b81805550
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.diag.txt
@@ -0,0 +1,2 @@
+(1,13): Error RZ1003: A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
+(1,15): Error RZ1005: "' />" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{" are valid.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
new file mode 100644
index 0000000000..731fbdb8e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..18)::18 - [<span foo='@ @' />]
+    MarkupBlock - [0..18)::18
+        MarkupElement - [0..18)::18
+            MarkupStartTag - [0..18)::18 - [<span foo='@ @' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [5..15)::10 - [ foo='@ @']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..9)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [11..14)::3
+                        MarkupDynamicAttributeValue - [11..12)::1 - [@]
+                            GenericBlock - [11..12)::1
+                                CSharpCodeBlock - [11..12)::1
+                                    CSharpImplicitExpression - [11..12)::1
+                                        CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [12..12)::0
+                                            CSharpCodeBlock - [12..12)::0
+                                                CSharpExpressionLiteral - [12..12)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Marker;[];
+                        MarkupDynamicAttributeValue - [12..14)::2 - [ @]
+                            MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            GenericBlock - [13..14)::1
+                                CSharpCodeBlock - [13..14)::1
+                                    CSharpImplicitExpression - [13..14)::1
+                                        CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [14..14)::0
+                                            CSharpCodeBlock - [14..14)::0
+                                                CSharpExpressionLiteral - [14..14)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Marker;[];
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [15..16)::1
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt
new file mode 100644
index 0000000000..20c0396c45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [36] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [36] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [36] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+Markup span at (20:1,4 [6] ) (Accepts:Any) - Parent: Tag block at (20:1,4 [6] )
+Markup span at (26:1,10 [7] ) (Accepts:Any) - Parent: Tag block at (26:1,10 [7] )
+Markup span at (33:1,17 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+MetaCode span at (35:2,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (36:2,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt
new file mode 100644
index 0000000000..a8c43d34db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..36)::36 - [@section Foo {LF    <html></html>LF}]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            RazorDirective - [0..36)::36 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..36)::35
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..36)::28
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..35)::21
+                            MarkupTextLiteral - [14..20)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                            MarkupElement - [20..33)::13
+                                MarkupStartTag - [20..26)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [26..33)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.cspans.txt
new file mode 100644
index 0000000000..7d918f0198
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (2:0,2 [11] ) (Accepts:None) - Parent: Tag block at (2:0,2 [11] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [26] )
+Markup span at (16:0,16 [12] ) (Accepts:None) - Parent: Tag block at (16:0,16 [12] )
+Code span at (28:0,28 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt
new file mode 100644
index 0000000000..28292f13b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..29)::29 - [@{<1-foo+bar>foo</1-foo+bar>}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..28)::26
+                            MarkupElement - [2..28)::26
+                                MarkupStartTag - [2..13)::11 - [<1-foo+bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[1-foo+bar];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [13..16)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                                MarkupEndTag - [16..28)::12 - [</1-foo+bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[1-foo+bar];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.cspans.txt
new file mode 100644
index 0000000000..a3d7aa8d05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Transition span at (8:0,8 [15] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [15] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.diag.txt
new file mode 100644
index 0000000000..435c9bc767
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.diag.txt
@@ -0,0 +1 @@
+(1,11): Error RZ1023: "<text>" and "</text>" tags cannot contain attributes.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.stree.txt
new file mode 100644
index 0000000000..545ef0f1cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfEndTextTagContainsTextAfterName.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..24)::24 - [@{<text></text foo bar>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupElement - [2..23)::21
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [8..23)::15 - MarkupTransition - [</text foo bar>] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    MarkupMiscAttributeContent - [14..22)::8
+                                        MarkupTextLiteral - [14..22)::8 - [ foo bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            Text;[foo];
+                                            Whitespace;[ ];
+                                            Text;[bar];
+                                    CloseAngle;[>];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.cspans.txt
new file mode 100644
index 0000000000..c8b6ad0423
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Transition span at (2:0,2 [14] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [14] )
+Transition span at (16:0,16 [7] ) (Accepts:None) - Parent: Tag block at (16:0,16 [7] )
+Code span at (23:0,23 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.diag.txt
new file mode 100644
index 0000000000..4d820e0b26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1023: "<text>" and "</text>" tags cannot contain attributes.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.stree.txt
new file mode 100644
index 0000000000..b2321f95f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/ErrorIfStartTextTagContainsTextAfterName.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..24)::24 - [@{<text foo bar></text>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupElement - [2..23)::21
+                                MarkupStartTag - [2..16)::14 - MarkupTransition - [<text foo bar>] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [8..15)::7 - [foo bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[foo];
+                                        Whitespace;[ ];
+                                        Text;[bar];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [16..23)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.cspans.txt
new file mode 100644
index 0000000000..9d3101a601
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [7] )
+Code span at (9:0,9 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.diag.txt
new file mode 100644
index 0000000000..3456cdf37c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1026: Encountered end tag "foo" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt
new file mode 100644
index 0000000000..5404409d15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..17)::17 - [@{</foo> bar baz}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..9)::7
+                            MarkupElement - [2..8)::6
+                                MarkupEndTag - [2..8)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [9..16)::7 - [bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[bar];
+                            Whitespace;[ ];
+                            Identifier;[baz];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.cspans.txt
new file mode 100644
index 0000000000..283051c689
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [24] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt
new file mode 100644
index 0000000000..5ea3dc7ca1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.stree.txt
new file mode 100644
index 0000000000..8c449248b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..31)::31 - [@{<foo>blah blah blah blah blah]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupElement - [2..31)::29
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..31)::24 - [blah blah blah blah blah] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[blah];
+                                    Whitespace;[ ];
+                                    Text;[blah];
+                                    Whitespace;[ ];
+                                    Text;[blah];
+                                    Whitespace;[ ];
+                                    Text;[blah];
+                                    Whitespace;[ ];
+                                    Text;[blah];
+                    RazorMetaCode - [31..31)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.cspans.txt
new file mode 100644
index 0000000000..6eab5a0fc5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (2:0,2 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [3] )
+Markup span at (5:0,5 [5] ) (Accepts:None) - Parent: Tag block at (5:0,5 [5] )
+Markup span at (10:0,10 [6] ) (Accepts:None) - Parent: Tag block at (10:0,10 [6] )
+Code span at (16:0,16 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.diag.txt
new file mode 100644
index 0000000000..6c6136553e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1025: The "p" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.stree.txt
new file mode 100644
index 0000000000..58b47e5670
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagErrorsOnOutermostUnclosedTag.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..17)::17 - [@{<p><foo></bar>}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupElement - [2..16)::14
+                                MarkupStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [5..16)::11
+                                    MarkupStartTag - [5..10)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[foo];
+                                        CloseAngle;[>];
+                                    MarkupElement - [10..16)::6
+                                        MarkupEndTag - [10..16)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[bar];
+                                            CloseAngle;[>];
+                        CSharpStatementLiteral - [16..16)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.cspans.txt
new file mode 100644
index 0000000000..bd3d9af9eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [14] )
+Markup span at (2:0,2 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [12] )
+Markup span at (6:0,6 [5] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [8] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt
new file mode 100644
index 0000000000..d896fe55e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "foo" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt
new file mode 100644
index 0000000000..d60cf69092
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..14)::14 - [@{<foo bar=baz]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpStatement - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..14)::13
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..14)::12
+                        MarkupBlock - [2..14)::12
+                            MarkupElement - [2..14)::12
+                                MarkupStartTag - [2..14)::12 - [<foo bar=baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    MarkupAttributeBlock - [6..14)::8 - [ bar=baz]
+                                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bar];
+                                        Equals;[=];
+                                        GenericBlock - [11..14)::3
+                                            MarkupLiteralAttributeValue - [11..14)::3 - [baz]
+                                                MarkupTextLiteral - [11..14)::3 - [baz] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[baz];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.cspans.txt
new file mode 100644
index 0000000000..597866b0ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [15] ) (Accepts:None) - Parent: Markup block at (2:0,2 [16] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [16] )
+Code span at (18:0,18 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt
new file mode 100644
index 0000000000..8d44b90232
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..22)::22 - [@{<![CDATA[Foo]]> Bar}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..18)::16
+                            MarkupTextLiteral - [2..17)::15 - [<![CDATA[Foo]]>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Bang;[!];
+                                LeftBracket;[[];
+                                Text;[CDATA];
+                                LeftBracket;[[];
+                                Text;[Foo];
+                                RightBracket;[]];
+                                RightBracket;[]];
+                                CloseAngle;[>];
+                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [18..21)::3 - [Bar] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[Bar];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt
new file mode 100644
index 0000000000..0783e06c02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (2:0,2 [4] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [10] )
+Markup span at (6:0,6 [3] ) (Accepts:Whitespace) - Parent: HtmlComment block at (2:0,2 [10] )
+Markup span at (9:0,9 [3] ) (Accepts:None) - Parent: HtmlComment block at (2:0,2 [10] )
+Markup span at (12:0,12 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [11] )
+Code span at (13:0,13 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt
new file mode 100644
index 0000000000..05589a42bb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..17)::17 - [@{<!--Foo--> Bar}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..13)::11
+                            MarkupCommentBlock - [2..12)::10
+                                MarkupTextLiteral - [2..6)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [6..9)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Text;[Foo];
+                                MarkupTextLiteral - [9..12)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [13..16)::3 - [Bar] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[Bar];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.cspans.txt
new file mode 100644
index 0000000000..597866b0ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [15] ) (Accepts:None) - Parent: Markup block at (2:0,2 [16] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [16] )
+Code span at (18:0,18 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt
new file mode 100644
index 0000000000..e5d4508525
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..22)::22 - [@{<!DOCTYPE html> foo}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..18)::16
+                            MarkupTextLiteral - [2..17)::15 - [<!DOCTYPE html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Bang;[!];
+                                Text;[DOCTYPE];
+                                Whitespace;[ ];
+                                Text;[html];
+                                CloseAngle;[>];
+                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [18..21)::3 - [foo] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[foo];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.cspans.txt
new file mode 100644
index 0000000000..539ba5c383
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (2:0,2 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [3] )
+Markup span at (5:0,5 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [11] )
+Markup span at (8:0,8 [4] ) (Accepts:None) - Parent: Tag block at (8:0,8 [4] )
+Markup span at (12:0,12 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [11] )
+Code span at (13:0,13 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt
new file mode 100644
index 0000000000..c864f0ee6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..17)::17 - [@{<p>Foo</p> Bar}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..13)::11
+                            MarkupElement - [2..12)::10
+                                MarkupStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [5..8)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [13..16)::3 - [Bar] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[Bar];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.cspans.txt
new file mode 100644
index 0000000000..134c16b6ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Markup span at (2:0,2 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [2] )
+Markup span at (4:0,4 [3] ) (Accepts:None) - Parent: Tag block at (4:0,4 [3] )
+Markup span at (7:0,7 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [6] )
+Code span at (8:0,8 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt
new file mode 100644
index 0000000000..8f2dd2a56c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..12)::12 - [@{<></> Bar}]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpStatement - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..12)::11
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..8)::6
+                            MarkupElement - [2..7)::5
+                                MarkupStartTag - [2..4)::2 - [<>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[<Missing>];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [4..7)::3 - [</>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[<Missing>];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [8..11)::3 - [Bar] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[Bar];
+                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.cspans.txt
new file mode 100644
index 0000000000..dc05e218a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [13] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [13] )
+Markup span at (2:0,2 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [3] )
+Markup span at (5:0,5 [3] ) (Accepts:None) - Parent: Tag block at (5:0,5 [3] )
+Markup span at (8:0,8 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [7] )
+Code span at (9:0,9 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [13] )
+MetaCode span at (12:0,12 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [13] )
+Markup span at (13:0,13 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.diag.txt
new file mode 100644
index 0000000000..6c6136553e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1025: The "p" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt
new file mode 100644
index 0000000000..52be2f619c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..13)::13 - [@{<p></> Bar}]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpStatement - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..13)::12
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..12)::10
+                        MarkupBlock - [2..9)::7
+                            MarkupElement - [2..8)::6
+                                MarkupStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [5..8)::3
+                                    MarkupEndTag - [5..8)::3 - [</>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[<Missing>];
+                                        CloseAngle;[>];
+                            MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Bar] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[Bar];
+                    RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [13..13)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.cspans.txt
new file mode 100644
index 0000000000..12cae5de6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.cspans.txt
@@ -0,0 +1,36 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [344] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [344] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [344] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [344] )
+Markup span at (4:1,0 [6] ) (Accepts:None) - Parent: Tag block at (4:1,0 [6] )
+Markup span at (10:1,6 [15] ) (Accepts:Any) - Parent: Tag block at (10:1,6 [15] )
+Markup span at (25:4,0 [6] ) (Accepts:None) - Parent: Tag block at (25:4,0 [6] )
+Markup span at (31:4,6 [15] ) (Accepts:Any) - Parent: Tag block at (31:4,6 [15] )
+Markup span at (46:7,0 [4] ) (Accepts:None) - Parent: Tag block at (46:7,0 [4] )
+Markup span at (50:7,4 [13] ) (Accepts:Any) - Parent: Tag block at (50:7,4 [13] )
+Markup span at (63:10,0 [5] ) (Accepts:None) - Parent: Tag block at (63:10,0 [5] )
+Markup span at (68:10,5 [14] ) (Accepts:Any) - Parent: Tag block at (68:10,5 [14] )
+Markup span at (82:13,0 [9] ) (Accepts:None) - Parent: Tag block at (82:13,0 [9] )
+Markup span at (91:13,9 [18] ) (Accepts:Any) - Parent: Tag block at (91:13,9 [18] )
+Markup span at (109:16,0 [7] ) (Accepts:None) - Parent: Tag block at (109:16,0 [7] )
+Markup span at (116:16,7 [16] ) (Accepts:Any) - Parent: Tag block at (116:16,7 [16] )
+Markup span at (132:19,0 [4] ) (Accepts:None) - Parent: Tag block at (132:19,0 [4] )
+Markup span at (136:19,4 [13] ) (Accepts:Any) - Parent: Tag block at (136:19,4 [13] )
+Markup span at (149:22,0 [5] ) (Accepts:None) - Parent: Tag block at (149:22,0 [5] )
+Markup span at (154:22,5 [14] ) (Accepts:Any) - Parent: Tag block at (154:22,5 [14] )
+Markup span at (168:25,0 [7] ) (Accepts:None) - Parent: Tag block at (168:25,0 [7] )
+Markup span at (175:25,7 [16] ) (Accepts:Any) - Parent: Tag block at (175:25,7 [16] )
+Markup span at (191:28,0 [8] ) (Accepts:None) - Parent: Tag block at (191:28,0 [8] )
+Markup span at (199:28,8 [17] ) (Accepts:Any) - Parent: Tag block at (199:28,8 [17] )
+Markup span at (216:31,0 [6] ) (Accepts:None) - Parent: Tag block at (216:31,0 [6] )
+Markup span at (222:31,6 [15] ) (Accepts:Any) - Parent: Tag block at (222:31,6 [15] )
+Markup span at (237:34,0 [6] ) (Accepts:None) - Parent: Tag block at (237:34,0 [6] )
+Markup span at (243:34,6 [15] ) (Accepts:Any) - Parent: Tag block at (243:34,6 [15] )
+Markup span at (258:37,0 [7] ) (Accepts:None) - Parent: Tag block at (258:37,0 [7] )
+Markup span at (265:37,7 [16] ) (Accepts:Any) - Parent: Tag block at (265:37,7 [16] )
+Markup span at (281:40,0 [8] ) (Accepts:None) - Parent: Tag block at (281:40,0 [8] )
+Markup span at (289:40,8 [17] ) (Accepts:Any) - Parent: Tag block at (289:40,8 [17] )
+Markup span at (306:43,0 [7] ) (Accepts:None) - Parent: Tag block at (306:43,0 [7] )
+Markup span at (313:43,7 [16] ) (Accepts:Any) - Parent: Tag block at (313:43,7 [16] )
+Markup span at (329:46,0 [5] ) (Accepts:None) - Parent: Tag block at (329:46,0 [5] )
+Markup span at (334:46,5 [10] ) (Accepts:Any) - Parent: Tag block at (334:46,5 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.diag.txt
new file mode 100644
index 0000000000..1ced8c1b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt
new file mode 100644
index 0000000000..c130d59e5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt
@@ -0,0 +1,317 @@
+RazorDocument - [0..344)::344 - [@{LF<area></areaLF}LF@{LF<base></baseLF}LF@{LF<br></brLF}LF@{LF<col></colLF}LF@{LF<command></commandLF}LF@{LF<embed></embedLF}LF@{LF<hr></hrLF}LF@{LF<img></imgLF}LF@{LF<input></inputLF}LF@{LF<keygen></keygenLF}LF@{LF<link></linkLF}LF@{LF<meta></metaLF}LF@{LF<param></paramLF}LF@{LF<source></sourceLF}LF@{LF<track></trackLF}LF@{LF<wbr></wbrLF}LF]
+    MarkupBlock - [0..344)::344
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..344)::344
+            CSharpStatement - [0..344)::344
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..344)::343
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..344)::342
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..25)::21
+                            MarkupElement - [4..25)::21
+                                MarkupStartTag - [4..10)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [10..25)::15 - [</areaLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[area];
+                                    MarkupMiscAttributeContent - [16..25)::9
+                                        MarkupTextLiteral - [16..25)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [25..46)::21
+                            MarkupElement - [25..46)::21
+                                MarkupStartTag - [25..31)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [31..46)::15 - [</baseLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[base];
+                                    MarkupMiscAttributeContent - [37..46)::9
+                                        MarkupTextLiteral - [37..46)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [46..63)::17
+                            MarkupElement - [46..63)::17
+                                MarkupStartTag - [46..50)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [50..63)::13 - [</brLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[br];
+                                    MarkupMiscAttributeContent - [54..63)::9
+                                        MarkupTextLiteral - [54..63)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [63..82)::19
+                            MarkupElement - [63..82)::19
+                                MarkupStartTag - [63..68)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [68..82)::14 - [</colLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[col];
+                                    MarkupMiscAttributeContent - [73..82)::9
+                                        MarkupTextLiteral - [73..82)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [82..109)::27
+                            MarkupElement - [82..109)::27
+                                MarkupStartTag - [82..91)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [91..109)::18 - [</commandLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[command];
+                                    MarkupMiscAttributeContent - [100..109)::9
+                                        MarkupTextLiteral - [100..109)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [109..132)::23
+                            MarkupElement - [109..132)::23
+                                MarkupStartTag - [109..116)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [116..132)::16 - [</embedLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[embed];
+                                    MarkupMiscAttributeContent - [123..132)::9
+                                        MarkupTextLiteral - [123..132)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [132..149)::17
+                            MarkupElement - [132..149)::17
+                                MarkupStartTag - [132..136)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [136..149)::13 - [</hrLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[hr];
+                                    MarkupMiscAttributeContent - [140..149)::9
+                                        MarkupTextLiteral - [140..149)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [149..168)::19
+                            MarkupElement - [149..168)::19
+                                MarkupStartTag - [149..154)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [154..168)::14 - [</imgLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[img];
+                                    MarkupMiscAttributeContent - [159..168)::9
+                                        MarkupTextLiteral - [159..168)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [168..191)::23
+                            MarkupElement - [168..191)::23
+                                MarkupStartTag - [168..175)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [175..191)::16 - [</inputLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[input];
+                                    MarkupMiscAttributeContent - [182..191)::9
+                                        MarkupTextLiteral - [182..191)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [191..216)::25
+                            MarkupElement - [191..216)::25
+                                MarkupStartTag - [191..199)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [199..216)::17 - [</keygenLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[keygen];
+                                    MarkupMiscAttributeContent - [207..216)::9
+                                        MarkupTextLiteral - [207..216)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [216..237)::21
+                            MarkupElement - [216..237)::21
+                                MarkupStartTag - [216..222)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [222..237)::15 - [</linkLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[link];
+                                    MarkupMiscAttributeContent - [228..237)::9
+                                        MarkupTextLiteral - [228..237)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [237..258)::21
+                            MarkupElement - [237..258)::21
+                                MarkupStartTag - [237..243)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [243..258)::15 - [</metaLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[meta];
+                                    MarkupMiscAttributeContent - [249..258)::9
+                                        MarkupTextLiteral - [249..258)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [258..281)::23
+                            MarkupElement - [258..281)::23
+                                MarkupStartTag - [258..265)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [265..281)::16 - [</paramLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[param];
+                                    MarkupMiscAttributeContent - [272..281)::9
+                                        MarkupTextLiteral - [272..281)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [281..306)::25
+                            MarkupElement - [281..306)::25
+                                MarkupStartTag - [281..289)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [289..306)::17 - [</sourceLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[source];
+                                    MarkupMiscAttributeContent - [297..306)::9
+                                        MarkupTextLiteral - [297..306)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [306..329)::23
+                            MarkupElement - [306..329)::23
+                                MarkupStartTag - [306..313)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [313..329)::16 - [</trackLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[track];
+                                    MarkupMiscAttributeContent - [320..329)::9
+                                        MarkupTextLiteral - [320..329)::9 - [LF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Transition;[@];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                        MarkupBlock - [329..344)::15
+                            MarkupElement - [329..344)::15
+                                MarkupStartTag - [329..334)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [334..344)::10 - [</wbrLF}LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[wbr];
+                                    MarkupMiscAttributeContent - [339..344)::5
+                                        MarkupTextLiteral - [339..344)::5 - [LF}LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [344..344)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.cspans.txt
new file mode 100644
index 0000000000..88fd9b67b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (2:0,2 [22] ) (Accepts:None) - Parent: Markup block at (2:0,2 [23] )
+Markup span at (24:0,24 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [23] )
+Code span at (25:0,25 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt
new file mode 100644
index 0000000000..e4bedcf75e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..29)::29 - [@{<?xml version="1.0" ?> foo}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..25)::23
+                            MarkupTextLiteral - [2..24)::22 - [<?xml version="1.0" ?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                QuestionMark;[?];
+                                Text;[xml];
+                                Whitespace;[ ];
+                                Text;[version];
+                                Equals;[=];
+                                DoubleQuote;["];
+                                Text;[1.0];
+                                DoubleQuote;["];
+                                Whitespace;[ ];
+                                QuestionMark;[?];
+                                CloseAngle;[>];
+                            MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [25..28)::3 - [foo] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[foo];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.cspans.txt
new file mode 100644
index 0000000000..aa831f9744
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [51] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [68] )
+Markup span at (59:0,59 [9] ) (Accepts:Any) - Parent: Tag block at (59:0,59 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt
new file mode 100644
index 0000000000..4db3b75673
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..68)::68 - [<script>foo < bar && quantity.toString() !== orderQty.val()</script>]
+    MarkupBlock - [0..68)::68
+        MarkupElement - [0..68)::68
+            MarkupStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..59)::51 - [foo < bar && quantity.toString() !== orderQty.val()] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[foo];
+                Whitespace;[ ];
+                OpenAngle;[<];
+                Whitespace;[ ];
+                Text;[bar];
+                Whitespace;[ ];
+                Text;[&&];
+                Whitespace;[ ];
+                Text;[quantity.toString()];
+                Whitespace;[ ];
+                Bang;[!];
+                Equals;[=];
+                Equals;[=];
+                Whitespace;[ ];
+                Text;[orderQty.val()];
+            MarkupEndTag - [59..68)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.cspans.txt
new file mode 100644
index 0000000000..e0d652c62f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [13] )
+Markup span at (7:0,7 [6] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt
new file mode 100644
index 0000000000..91b0d16085
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..13)::13 - [<script type=]
+    MarkupBlock - [0..13)::13
+        MarkupElement - [0..13)::13
+            MarkupStartTag - [0..13)::13 - [<script type=] - Gen<None> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..13)::6 - [ type=]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.cspans.txt
new file mode 100644
index 0000000000..c680506846
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [22] )
+Markup span at (3:0,3 [8] ) (Accepts:None) - Parent: Tag block at (3:0,3 [8] )
+Markup span at (11:0,11 [12] ) (Accepts:None) - Parent: Tag block at (11:0,11 [12] )
+Markup span at (23:0,23 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [22] )
+Code span at (24:0,24 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.stree.txt
new file mode 100644
index 0000000000..8c6610475b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Invalid.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..25)::25 - [@{ <script></script @ > }]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..24)::22
+                            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [3..23)::20
+                                MarkupStartTag - [3..11)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [11..23)::12 - [</script @ >] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    MarkupMiscAttributeContent - [19..22)::3
+                                        MarkupTextLiteral - [19..22)::3 - [ @ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            Transition;[@];
+                                            Whitespace;[ ];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.cspans.txt
new file mode 100644
index 0000000000..1ef22bf26d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Markup span at (11:0,11 [9] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt
new file mode 100644
index 0000000000..f083678670
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..20)::20 - [<script><p></script>]
+    MarkupBlock - [0..20)::20
+        MarkupElement - [0..20)::20
+            MarkupStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [11..20)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.cspans.txt
new file mode 100644
index 0000000000..57d975f8cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Markup span at (12:0,12 [9] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt
new file mode 100644
index 0000000000..1c46bd12be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..21)::21 - [<script></p></script>]
+    MarkupBlock - [0..21)::21
+        MarkupElement - [0..21)::21
+            MarkupStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [12..21)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.cspans.txt
new file mode 100644
index 0000000000..b041429d2d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Markup span at (30:0,30 [9] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt
new file mode 100644
index 0000000000..28f8e4f59a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..39)::39 - [<script>var four = 4; /* </ */</script>]
+    MarkupBlock - [0..39)::39
+        MarkupElement - [0..39)::39
+            MarkupStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..30)::22 - [var four = 4; /* </ */] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[var];
+                Whitespace;[ ];
+                Text;[four];
+                Whitespace;[ ];
+                Equals;[=];
+                Whitespace;[ ];
+                Text;[4;];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                Text;[*];
+                Whitespace;[ ];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Whitespace;[ ];
+                Text;[*];
+                ForwardSlash;[/];
+            MarkupEndTag - [30..39)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.cspans.txt
new file mode 100644
index 0000000000..be319647e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Markup span at (15:0,15 [9] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt
new file mode 100644
index 0000000000..b9e7bb8625
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..24)::24 - [<script><p></p></script>]
+    MarkupBlock - [0..24)::24
+        MarkupElement - [0..24)::24
+            MarkupStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..15)::7 - [<p></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [15..24)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.cspans.txt
new file mode 100644
index 0000000000..b1018a5336
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [16] )
+Transition span at (11:0,11 [7] ) (Accepts:None) - Parent: Tag block at (11:0,11 [7] )
+Code span at (18:0,18 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (18:0,18 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt
new file mode 100644
index 0000000000..1cad8510ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..19)::19 - [@{<text>Foo</text>}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupElement - [2..18)::16
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [8..11)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Foo];
+                                MarkupEndTag - [11..18)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..18)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.cspans.txt
new file mode 100644
index 0000000000..20e96c9595
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.cspans.txt
@@ -0,0 +1,145 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (4:1,0 [6] ) (Accepts:None) - Parent: Tag block at (4:1,0 [6] )
+Markup span at (10:1,6 [1] ) (Accepts:Any) - Parent: Markup block at (4:1,0 [14] )
+Markup span at (11:1,7 [7] ) (Accepts:None) - Parent: Tag block at (11:1,7 [7] )
+Code span at (18:1,14 [15] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:2,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (36:3,0 [1] ) (Accepts:None) - Parent: Statement block at (36:3,0 [34] )
+MetaCode span at (37:3,1 [1] ) (Accepts:None) - Parent: Statement block at (36:3,0 [34] )
+Code span at (38:3,2 [2] ) (Accepts:Any) - Parent: Statement block at (36:3,0 [34] )
+Markup span at (40:4,0 [6] ) (Accepts:None) - Parent: Tag block at (40:4,0 [6] )
+Markup span at (46:4,6 [1] ) (Accepts:Any) - Parent: Markup block at (40:4,0 [14] )
+Markup span at (47:4,7 [7] ) (Accepts:None) - Parent: Tag block at (47:4,7 [7] )
+Code span at (54:4,14 [15] ) (Accepts:Any) - Parent: Statement block at (36:3,0 [34] )
+MetaCode span at (69:5,0 [1] ) (Accepts:None) - Parent: Statement block at (36:3,0 [34] )
+Markup span at (70:5,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (72:6,0 [1] ) (Accepts:None) - Parent: Statement block at (72:6,0 [30] )
+MetaCode span at (73:6,1 [1] ) (Accepts:None) - Parent: Statement block at (72:6,0 [30] )
+Code span at (74:6,2 [2] ) (Accepts:Any) - Parent: Statement block at (72:6,0 [30] )
+Markup span at (76:7,0 [4] ) (Accepts:None) - Parent: Tag block at (76:7,0 [4] )
+Markup span at (80:7,4 [1] ) (Accepts:Any) - Parent: Markup block at (76:7,0 [10] )
+Markup span at (81:7,5 [5] ) (Accepts:None) - Parent: Tag block at (81:7,5 [5] )
+Code span at (86:7,10 [15] ) (Accepts:Any) - Parent: Statement block at (72:6,0 [30] )
+MetaCode span at (101:8,0 [1] ) (Accepts:None) - Parent: Statement block at (72:6,0 [30] )
+Markup span at (102:8,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (104:9,0 [1] ) (Accepts:None) - Parent: Statement block at (104:9,0 [32] )
+MetaCode span at (105:9,1 [1] ) (Accepts:None) - Parent: Statement block at (104:9,0 [32] )
+Code span at (106:9,2 [2] ) (Accepts:Any) - Parent: Statement block at (104:9,0 [32] )
+Markup span at (108:10,0 [5] ) (Accepts:None) - Parent: Tag block at (108:10,0 [5] )
+Markup span at (113:10,5 [1] ) (Accepts:Any) - Parent: Markup block at (108:10,0 [12] )
+Markup span at (114:10,6 [6] ) (Accepts:None) - Parent: Tag block at (114:10,6 [6] )
+Code span at (120:10,12 [15] ) (Accepts:Any) - Parent: Statement block at (104:9,0 [32] )
+MetaCode span at (135:11,0 [1] ) (Accepts:None) - Parent: Statement block at (104:9,0 [32] )
+Markup span at (136:11,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (138:12,0 [1] ) (Accepts:None) - Parent: Statement block at (138:12,0 [40] )
+MetaCode span at (139:12,1 [1] ) (Accepts:None) - Parent: Statement block at (138:12,0 [40] )
+Code span at (140:12,2 [2] ) (Accepts:Any) - Parent: Statement block at (138:12,0 [40] )
+Markup span at (142:13,0 [9] ) (Accepts:None) - Parent: Tag block at (142:13,0 [9] )
+Markup span at (151:13,9 [1] ) (Accepts:Any) - Parent: Markup block at (142:13,0 [20] )
+Markup span at (152:13,10 [10] ) (Accepts:None) - Parent: Tag block at (152:13,10 [10] )
+Code span at (162:13,20 [15] ) (Accepts:Any) - Parent: Statement block at (138:12,0 [40] )
+MetaCode span at (177:14,0 [1] ) (Accepts:None) - Parent: Statement block at (138:12,0 [40] )
+Markup span at (178:14,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (180:15,0 [1] ) (Accepts:None) - Parent: Statement block at (180:15,0 [36] )
+MetaCode span at (181:15,1 [1] ) (Accepts:None) - Parent: Statement block at (180:15,0 [36] )
+Code span at (182:15,2 [2] ) (Accepts:Any) - Parent: Statement block at (180:15,0 [36] )
+Markup span at (184:16,0 [7] ) (Accepts:None) - Parent: Tag block at (184:16,0 [7] )
+Markup span at (191:16,7 [1] ) (Accepts:Any) - Parent: Markup block at (184:16,0 [16] )
+Markup span at (192:16,8 [8] ) (Accepts:None) - Parent: Tag block at (192:16,8 [8] )
+Code span at (200:16,16 [15] ) (Accepts:Any) - Parent: Statement block at (180:15,0 [36] )
+MetaCode span at (215:17,0 [1] ) (Accepts:None) - Parent: Statement block at (180:15,0 [36] )
+Markup span at (216:17,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (218:18,0 [1] ) (Accepts:None) - Parent: Statement block at (218:18,0 [30] )
+MetaCode span at (219:18,1 [1] ) (Accepts:None) - Parent: Statement block at (218:18,0 [30] )
+Code span at (220:18,2 [2] ) (Accepts:Any) - Parent: Statement block at (218:18,0 [30] )
+Markup span at (222:19,0 [4] ) (Accepts:None) - Parent: Tag block at (222:19,0 [4] )
+Markup span at (226:19,4 [1] ) (Accepts:Any) - Parent: Markup block at (222:19,0 [10] )
+Markup span at (227:19,5 [5] ) (Accepts:None) - Parent: Tag block at (227:19,5 [5] )
+Code span at (232:19,10 [15] ) (Accepts:Any) - Parent: Statement block at (218:18,0 [30] )
+MetaCode span at (247:20,0 [1] ) (Accepts:None) - Parent: Statement block at (218:18,0 [30] )
+Markup span at (248:20,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (250:21,0 [1] ) (Accepts:None) - Parent: Statement block at (250:21,0 [32] )
+MetaCode span at (251:21,1 [1] ) (Accepts:None) - Parent: Statement block at (250:21,0 [32] )
+Code span at (252:21,2 [2] ) (Accepts:Any) - Parent: Statement block at (250:21,0 [32] )
+Markup span at (254:22,0 [5] ) (Accepts:None) - Parent: Tag block at (254:22,0 [5] )
+Markup span at (259:22,5 [1] ) (Accepts:Any) - Parent: Markup block at (254:22,0 [12] )
+Markup span at (260:22,6 [6] ) (Accepts:None) - Parent: Tag block at (260:22,6 [6] )
+Code span at (266:22,12 [15] ) (Accepts:Any) - Parent: Statement block at (250:21,0 [32] )
+MetaCode span at (281:23,0 [1] ) (Accepts:None) - Parent: Statement block at (250:21,0 [32] )
+Markup span at (282:23,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (284:24,0 [1] ) (Accepts:None) - Parent: Statement block at (284:24,0 [36] )
+MetaCode span at (285:24,1 [1] ) (Accepts:None) - Parent: Statement block at (284:24,0 [36] )
+Code span at (286:24,2 [2] ) (Accepts:Any) - Parent: Statement block at (284:24,0 [36] )
+Markup span at (288:25,0 [7] ) (Accepts:None) - Parent: Tag block at (288:25,0 [7] )
+Markup span at (295:25,7 [1] ) (Accepts:Any) - Parent: Markup block at (288:25,0 [16] )
+Markup span at (296:25,8 [8] ) (Accepts:None) - Parent: Tag block at (296:25,8 [8] )
+Code span at (304:25,16 [15] ) (Accepts:Any) - Parent: Statement block at (284:24,0 [36] )
+MetaCode span at (319:26,0 [1] ) (Accepts:None) - Parent: Statement block at (284:24,0 [36] )
+Markup span at (320:26,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (322:27,0 [1] ) (Accepts:None) - Parent: Statement block at (322:27,0 [38] )
+MetaCode span at (323:27,1 [1] ) (Accepts:None) - Parent: Statement block at (322:27,0 [38] )
+Code span at (324:27,2 [2] ) (Accepts:Any) - Parent: Statement block at (322:27,0 [38] )
+Markup span at (326:28,0 [8] ) (Accepts:None) - Parent: Tag block at (326:28,0 [8] )
+Markup span at (334:28,8 [1] ) (Accepts:Any) - Parent: Markup block at (326:28,0 [18] )
+Markup span at (335:28,9 [9] ) (Accepts:None) - Parent: Tag block at (335:28,9 [9] )
+Code span at (344:28,18 [15] ) (Accepts:Any) - Parent: Statement block at (322:27,0 [38] )
+MetaCode span at (359:29,0 [1] ) (Accepts:None) - Parent: Statement block at (322:27,0 [38] )
+Markup span at (360:29,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (362:30,0 [1] ) (Accepts:None) - Parent: Statement block at (362:30,0 [34] )
+MetaCode span at (363:30,1 [1] ) (Accepts:None) - Parent: Statement block at (362:30,0 [34] )
+Code span at (364:30,2 [2] ) (Accepts:Any) - Parent: Statement block at (362:30,0 [34] )
+Markup span at (366:31,0 [6] ) (Accepts:None) - Parent: Tag block at (366:31,0 [6] )
+Markup span at (372:31,6 [1] ) (Accepts:Any) - Parent: Markup block at (366:31,0 [14] )
+Markup span at (373:31,7 [7] ) (Accepts:None) - Parent: Tag block at (373:31,7 [7] )
+Code span at (380:31,14 [15] ) (Accepts:Any) - Parent: Statement block at (362:30,0 [34] )
+MetaCode span at (395:32,0 [1] ) (Accepts:None) - Parent: Statement block at (362:30,0 [34] )
+Markup span at (396:32,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (398:33,0 [1] ) (Accepts:None) - Parent: Statement block at (398:33,0 [34] )
+MetaCode span at (399:33,1 [1] ) (Accepts:None) - Parent: Statement block at (398:33,0 [34] )
+Code span at (400:33,2 [2] ) (Accepts:Any) - Parent: Statement block at (398:33,0 [34] )
+Markup span at (402:34,0 [6] ) (Accepts:None) - Parent: Tag block at (402:34,0 [6] )
+Markup span at (408:34,6 [1] ) (Accepts:Any) - Parent: Markup block at (402:34,0 [14] )
+Markup span at (409:34,7 [7] ) (Accepts:None) - Parent: Tag block at (409:34,7 [7] )
+Code span at (416:34,14 [15] ) (Accepts:Any) - Parent: Statement block at (398:33,0 [34] )
+MetaCode span at (431:35,0 [1] ) (Accepts:None) - Parent: Statement block at (398:33,0 [34] )
+Markup span at (432:35,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (434:36,0 [1] ) (Accepts:None) - Parent: Statement block at (434:36,0 [36] )
+MetaCode span at (435:36,1 [1] ) (Accepts:None) - Parent: Statement block at (434:36,0 [36] )
+Code span at (436:36,2 [2] ) (Accepts:Any) - Parent: Statement block at (434:36,0 [36] )
+Markup span at (438:37,0 [7] ) (Accepts:None) - Parent: Tag block at (438:37,0 [7] )
+Markup span at (445:37,7 [1] ) (Accepts:Any) - Parent: Markup block at (438:37,0 [16] )
+Markup span at (446:37,8 [8] ) (Accepts:None) - Parent: Tag block at (446:37,8 [8] )
+Code span at (454:37,16 [15] ) (Accepts:Any) - Parent: Statement block at (434:36,0 [36] )
+MetaCode span at (469:38,0 [1] ) (Accepts:None) - Parent: Statement block at (434:36,0 [36] )
+Markup span at (470:38,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (472:39,0 [1] ) (Accepts:None) - Parent: Statement block at (472:39,0 [38] )
+MetaCode span at (473:39,1 [1] ) (Accepts:None) - Parent: Statement block at (472:39,0 [38] )
+Code span at (474:39,2 [2] ) (Accepts:Any) - Parent: Statement block at (472:39,0 [38] )
+Markup span at (476:40,0 [8] ) (Accepts:None) - Parent: Tag block at (476:40,0 [8] )
+Markup span at (484:40,8 [1] ) (Accepts:Any) - Parent: Markup block at (476:40,0 [18] )
+Markup span at (485:40,9 [9] ) (Accepts:None) - Parent: Tag block at (485:40,9 [9] )
+Code span at (494:40,18 [15] ) (Accepts:Any) - Parent: Statement block at (472:39,0 [38] )
+MetaCode span at (509:41,0 [1] ) (Accepts:None) - Parent: Statement block at (472:39,0 [38] )
+Markup span at (510:41,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (512:42,0 [1] ) (Accepts:None) - Parent: Statement block at (512:42,0 [36] )
+MetaCode span at (513:42,1 [1] ) (Accepts:None) - Parent: Statement block at (512:42,0 [36] )
+Code span at (514:42,2 [2] ) (Accepts:Any) - Parent: Statement block at (512:42,0 [36] )
+Markup span at (516:43,0 [7] ) (Accepts:None) - Parent: Tag block at (516:43,0 [7] )
+Markup span at (523:43,7 [1] ) (Accepts:Any) - Parent: Markup block at (516:43,0 [16] )
+Markup span at (524:43,8 [8] ) (Accepts:None) - Parent: Tag block at (524:43,8 [8] )
+Code span at (532:43,16 [15] ) (Accepts:Any) - Parent: Statement block at (512:42,0 [36] )
+MetaCode span at (547:44,0 [1] ) (Accepts:None) - Parent: Statement block at (512:42,0 [36] )
+Markup span at (548:44,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
+Transition span at (550:45,0 [1] ) (Accepts:None) - Parent: Statement block at (550:45,0 [32] )
+MetaCode span at (551:45,1 [1] ) (Accepts:None) - Parent: Statement block at (550:45,0 [32] )
+Code span at (552:45,2 [2] ) (Accepts:Any) - Parent: Statement block at (550:45,0 [32] )
+Markup span at (554:46,0 [5] ) (Accepts:None) - Parent: Tag block at (554:46,0 [5] )
+Markup span at (559:46,5 [1] ) (Accepts:Any) - Parent: Markup block at (554:46,0 [12] )
+Markup span at (560:46,6 [6] ) (Accepts:None) - Parent: Tag block at (560:46,6 [6] )
+Code span at (566:46,12 [15] ) (Accepts:Any) - Parent: Statement block at (550:45,0 [32] )
+MetaCode span at (581:47,0 [1] ) (Accepts:None) - Parent: Statement block at (550:45,0 [32] )
+Markup span at (582:47,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [584] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt
new file mode 100644
index 0000000000..35aacfaf7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt
@@ -0,0 +1,596 @@
+RazorDocument - [0..584)::584 - [@{LF<area> </area>var x = true;LF}LF@{LF<base> </base>var x = true;LF}LF@{LF<br> </br>var x = true;LF}LF@{LF<col> </col>var x = true;LF}LF@{LF<command> </command>var x = true;LF}LF@{LF<embed> </embed>var x = true;LF}LF@{LF<hr> </hr>var x = true;LF}LF@{LF<img> </img>var x = true;LF}LF@{LF<input> </input>var x = true;LF}LF@{LF<keygen> </keygen>var x = true;LF}LF@{LF<link> </link>var x = true;LF}LF@{LF<meta> </meta>var x = true;LF}LF@{LF<param> </param>var x = true;LF}LF@{LF<source> </source>var x = true;LF}LF@{LF<track> </track>var x = true;LF}LF@{LF<wbr> </wbr>var x = true;LF}LF]
+    MarkupBlock - [0..584)::584
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..18)::14
+                            MarkupElement - [4..18)::14
+                                MarkupStartTag - [4..10)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [11..18)::7 - [</area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..33)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [34..36)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [36..70)::34
+            CSharpStatement - [36..70)::34
+                CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [37..70)::33
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [38..69)::31
+                        CSharpStatementLiteral - [38..40)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [40..54)::14
+                            MarkupElement - [40..54)::14
+                                MarkupStartTag - [40..46)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [47..54)::7 - [</base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [54..69)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [70..72)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [72..102)::30
+            CSharpStatement - [72..102)::30
+                CSharpTransition - [72..73)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [73..102)::29
+                    RazorMetaCode - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [74..101)::27
+                        CSharpStatementLiteral - [74..76)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [76..86)::10
+                            MarkupElement - [76..86)::10
+                                MarkupStartTag - [76..80)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [80..81)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [81..86)::5 - [</br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [86..101)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [101..102)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [102..104)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [104..136)::32
+            CSharpStatement - [104..136)::32
+                CSharpTransition - [104..105)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [105..136)::31
+                    RazorMetaCode - [105..106)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [106..135)::29
+                        CSharpStatementLiteral - [106..108)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [108..120)::12
+                            MarkupElement - [108..120)::12
+                                MarkupStartTag - [108..113)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [113..114)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [114..120)::6 - [</col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [120..135)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [135..136)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [136..138)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [138..178)::40
+            CSharpStatement - [138..178)::40
+                CSharpTransition - [138..139)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [139..178)::39
+                    RazorMetaCode - [139..140)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [140..177)::37
+                        CSharpStatementLiteral - [140..142)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [142..162)::20
+                            MarkupElement - [142..162)::20
+                                MarkupStartTag - [142..151)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [151..152)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [152..162)::10 - [</command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [162..177)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [177..178)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [178..180)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [180..216)::36
+            CSharpStatement - [180..216)::36
+                CSharpTransition - [180..181)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [181..216)::35
+                    RazorMetaCode - [181..182)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [182..215)::33
+                        CSharpStatementLiteral - [182..184)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [184..200)::16
+                            MarkupElement - [184..200)::16
+                                MarkupStartTag - [184..191)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [191..192)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [192..200)::8 - [</embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [200..215)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [215..216)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [216..218)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [218..248)::30
+            CSharpStatement - [218..248)::30
+                CSharpTransition - [218..219)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [219..248)::29
+                    RazorMetaCode - [219..220)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [220..247)::27
+                        CSharpStatementLiteral - [220..222)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [222..232)::10
+                            MarkupElement - [222..232)::10
+                                MarkupStartTag - [222..226)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [226..227)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [227..232)::5 - [</hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [232..247)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [247..248)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [248..250)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [250..282)::32
+            CSharpStatement - [250..282)::32
+                CSharpTransition - [250..251)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [251..282)::31
+                    RazorMetaCode - [251..252)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [252..281)::29
+                        CSharpStatementLiteral - [252..254)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [254..266)::12
+                            MarkupElement - [254..266)::12
+                                MarkupStartTag - [254..259)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [259..260)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [260..266)::6 - [</img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [266..281)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [281..282)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [282..284)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [284..320)::36
+            CSharpStatement - [284..320)::36
+                CSharpTransition - [284..285)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [285..320)::35
+                    RazorMetaCode - [285..286)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [286..319)::33
+                        CSharpStatementLiteral - [286..288)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [288..304)::16
+                            MarkupElement - [288..304)::16
+                                MarkupStartTag - [288..295)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [295..296)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [296..304)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [304..319)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [319..320)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [320..322)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [322..360)::38
+            CSharpStatement - [322..360)::38
+                CSharpTransition - [322..323)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [323..360)::37
+                    RazorMetaCode - [323..324)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [324..359)::35
+                        CSharpStatementLiteral - [324..326)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [326..344)::18
+                            MarkupElement - [326..344)::18
+                                MarkupStartTag - [326..334)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [334..335)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [335..344)::9 - [</keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [344..359)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [359..360)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [360..362)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [362..396)::34
+            CSharpStatement - [362..396)::34
+                CSharpTransition - [362..363)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [363..396)::33
+                    RazorMetaCode - [363..364)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [364..395)::31
+                        CSharpStatementLiteral - [364..366)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [366..380)::14
+                            MarkupElement - [366..380)::14
+                                MarkupStartTag - [366..372)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [372..373)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [373..380)::7 - [</link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [380..395)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [395..396)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [396..398)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [398..432)::34
+            CSharpStatement - [398..432)::34
+                CSharpTransition - [398..399)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [399..432)::33
+                    RazorMetaCode - [399..400)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [400..431)::31
+                        CSharpStatementLiteral - [400..402)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [402..416)::14
+                            MarkupElement - [402..416)::14
+                                MarkupStartTag - [402..408)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [408..409)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [409..416)::7 - [</meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [416..431)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [431..432)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [432..434)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [434..470)::36
+            CSharpStatement - [434..470)::36
+                CSharpTransition - [434..435)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [435..470)::35
+                    RazorMetaCode - [435..436)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [436..469)::33
+                        CSharpStatementLiteral - [436..438)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [438..454)::16
+                            MarkupElement - [438..454)::16
+                                MarkupStartTag - [438..445)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [445..446)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [446..454)::8 - [</param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [454..469)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [469..470)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [470..472)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [472..510)::38
+            CSharpStatement - [472..510)::38
+                CSharpTransition - [472..473)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [473..510)::37
+                    RazorMetaCode - [473..474)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [474..509)::35
+                        CSharpStatementLiteral - [474..476)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [476..494)::18
+                            MarkupElement - [476..494)::18
+                                MarkupStartTag - [476..484)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [484..485)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [485..494)::9 - [</source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [494..509)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [509..510)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [510..512)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [512..548)::36
+            CSharpStatement - [512..548)::36
+                CSharpTransition - [512..513)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [513..548)::35
+                    RazorMetaCode - [513..514)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [514..547)::33
+                        CSharpStatementLiteral - [514..516)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [516..532)::16
+                            MarkupElement - [516..532)::16
+                                MarkupStartTag - [516..523)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [523..524)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [524..532)::8 - [</track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [532..547)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [547..548)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [548..550)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [550..582)::32
+            CSharpStatement - [550..582)::32
+                CSharpTransition - [550..551)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [551..582)::31
+                    RazorMetaCode - [551..552)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [552..581)::29
+                        CSharpStatementLiteral - [552..554)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [554..566)::12
+                            MarkupElement - [554..566)::12
+                                MarkupStartTag - [554..559)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [559..560)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupEndTag - [560..566)::6 - [</wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [566..581)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [581..582)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [582..584)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.cspans.txt
new file mode 100644
index 0000000000..162d793f47
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.cspans.txt
@@ -0,0 +1,113 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (4:1,0 [6] ) (Accepts:None) - Parent: Tag block at (4:1,0 [6] )
+Code span at (10:1,6 [15] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (25:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (26:2,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (28:3,0 [1] ) (Accepts:None) - Parent: Statement block at (28:3,0 [26] )
+MetaCode span at (29:3,1 [1] ) (Accepts:None) - Parent: Statement block at (28:3,0 [26] )
+Code span at (30:3,2 [2] ) (Accepts:Any) - Parent: Statement block at (28:3,0 [26] )
+Markup span at (32:4,0 [6] ) (Accepts:None) - Parent: Tag block at (32:4,0 [6] )
+Code span at (38:4,6 [15] ) (Accepts:Any) - Parent: Statement block at (28:3,0 [26] )
+MetaCode span at (53:5,0 [1] ) (Accepts:None) - Parent: Statement block at (28:3,0 [26] )
+Markup span at (54:5,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (56:6,0 [1] ) (Accepts:None) - Parent: Statement block at (56:6,0 [24] )
+MetaCode span at (57:6,1 [1] ) (Accepts:None) - Parent: Statement block at (56:6,0 [24] )
+Code span at (58:6,2 [2] ) (Accepts:Any) - Parent: Statement block at (56:6,0 [24] )
+Markup span at (60:7,0 [4] ) (Accepts:None) - Parent: Tag block at (60:7,0 [4] )
+Code span at (64:7,4 [15] ) (Accepts:Any) - Parent: Statement block at (56:6,0 [24] )
+MetaCode span at (79:8,0 [1] ) (Accepts:None) - Parent: Statement block at (56:6,0 [24] )
+Markup span at (80:8,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (82:9,0 [1] ) (Accepts:None) - Parent: Statement block at (82:9,0 [25] )
+MetaCode span at (83:9,1 [1] ) (Accepts:None) - Parent: Statement block at (82:9,0 [25] )
+Code span at (84:9,2 [2] ) (Accepts:Any) - Parent: Statement block at (82:9,0 [25] )
+Markup span at (86:10,0 [5] ) (Accepts:None) - Parent: Tag block at (86:10,0 [5] )
+Code span at (91:10,5 [15] ) (Accepts:Any) - Parent: Statement block at (82:9,0 [25] )
+MetaCode span at (106:11,0 [1] ) (Accepts:None) - Parent: Statement block at (82:9,0 [25] )
+Markup span at (107:11,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (109:12,0 [1] ) (Accepts:None) - Parent: Statement block at (109:12,0 [29] )
+MetaCode span at (110:12,1 [1] ) (Accepts:None) - Parent: Statement block at (109:12,0 [29] )
+Code span at (111:12,2 [2] ) (Accepts:Any) - Parent: Statement block at (109:12,0 [29] )
+Markup span at (113:13,0 [9] ) (Accepts:None) - Parent: Tag block at (113:13,0 [9] )
+Code span at (122:13,9 [15] ) (Accepts:Any) - Parent: Statement block at (109:12,0 [29] )
+MetaCode span at (137:14,0 [1] ) (Accepts:None) - Parent: Statement block at (109:12,0 [29] )
+Markup span at (138:14,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (140:15,0 [1] ) (Accepts:None) - Parent: Statement block at (140:15,0 [27] )
+MetaCode span at (141:15,1 [1] ) (Accepts:None) - Parent: Statement block at (140:15,0 [27] )
+Code span at (142:15,2 [2] ) (Accepts:Any) - Parent: Statement block at (140:15,0 [27] )
+Markup span at (144:16,0 [7] ) (Accepts:None) - Parent: Tag block at (144:16,0 [7] )
+Code span at (151:16,7 [15] ) (Accepts:Any) - Parent: Statement block at (140:15,0 [27] )
+MetaCode span at (166:17,0 [1] ) (Accepts:None) - Parent: Statement block at (140:15,0 [27] )
+Markup span at (167:17,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (169:18,0 [1] ) (Accepts:None) - Parent: Statement block at (169:18,0 [24] )
+MetaCode span at (170:18,1 [1] ) (Accepts:None) - Parent: Statement block at (169:18,0 [24] )
+Code span at (171:18,2 [2] ) (Accepts:Any) - Parent: Statement block at (169:18,0 [24] )
+Markup span at (173:19,0 [4] ) (Accepts:None) - Parent: Tag block at (173:19,0 [4] )
+Code span at (177:19,4 [15] ) (Accepts:Any) - Parent: Statement block at (169:18,0 [24] )
+MetaCode span at (192:20,0 [1] ) (Accepts:None) - Parent: Statement block at (169:18,0 [24] )
+Markup span at (193:20,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (195:21,0 [1] ) (Accepts:None) - Parent: Statement block at (195:21,0 [25] )
+MetaCode span at (196:21,1 [1] ) (Accepts:None) - Parent: Statement block at (195:21,0 [25] )
+Code span at (197:21,2 [2] ) (Accepts:Any) - Parent: Statement block at (195:21,0 [25] )
+Markup span at (199:22,0 [5] ) (Accepts:None) - Parent: Tag block at (199:22,0 [5] )
+Code span at (204:22,5 [15] ) (Accepts:Any) - Parent: Statement block at (195:21,0 [25] )
+MetaCode span at (219:23,0 [1] ) (Accepts:None) - Parent: Statement block at (195:21,0 [25] )
+Markup span at (220:23,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (222:24,0 [1] ) (Accepts:None) - Parent: Statement block at (222:24,0 [27] )
+MetaCode span at (223:24,1 [1] ) (Accepts:None) - Parent: Statement block at (222:24,0 [27] )
+Code span at (224:24,2 [2] ) (Accepts:Any) - Parent: Statement block at (222:24,0 [27] )
+Markup span at (226:25,0 [7] ) (Accepts:None) - Parent: Tag block at (226:25,0 [7] )
+Code span at (233:25,7 [15] ) (Accepts:Any) - Parent: Statement block at (222:24,0 [27] )
+MetaCode span at (248:26,0 [1] ) (Accepts:None) - Parent: Statement block at (222:24,0 [27] )
+Markup span at (249:26,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (251:27,0 [1] ) (Accepts:None) - Parent: Statement block at (251:27,0 [28] )
+MetaCode span at (252:27,1 [1] ) (Accepts:None) - Parent: Statement block at (251:27,0 [28] )
+Code span at (253:27,2 [2] ) (Accepts:Any) - Parent: Statement block at (251:27,0 [28] )
+Markup span at (255:28,0 [8] ) (Accepts:None) - Parent: Tag block at (255:28,0 [8] )
+Code span at (263:28,8 [15] ) (Accepts:Any) - Parent: Statement block at (251:27,0 [28] )
+MetaCode span at (278:29,0 [1] ) (Accepts:None) - Parent: Statement block at (251:27,0 [28] )
+Markup span at (279:29,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (281:30,0 [1] ) (Accepts:None) - Parent: Statement block at (281:30,0 [26] )
+MetaCode span at (282:30,1 [1] ) (Accepts:None) - Parent: Statement block at (281:30,0 [26] )
+Code span at (283:30,2 [2] ) (Accepts:Any) - Parent: Statement block at (281:30,0 [26] )
+Markup span at (285:31,0 [6] ) (Accepts:None) - Parent: Tag block at (285:31,0 [6] )
+Code span at (291:31,6 [15] ) (Accepts:Any) - Parent: Statement block at (281:30,0 [26] )
+MetaCode span at (306:32,0 [1] ) (Accepts:None) - Parent: Statement block at (281:30,0 [26] )
+Markup span at (307:32,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (309:33,0 [1] ) (Accepts:None) - Parent: Statement block at (309:33,0 [26] )
+MetaCode span at (310:33,1 [1] ) (Accepts:None) - Parent: Statement block at (309:33,0 [26] )
+Code span at (311:33,2 [2] ) (Accepts:Any) - Parent: Statement block at (309:33,0 [26] )
+Markup span at (313:34,0 [6] ) (Accepts:None) - Parent: Tag block at (313:34,0 [6] )
+Code span at (319:34,6 [15] ) (Accepts:Any) - Parent: Statement block at (309:33,0 [26] )
+MetaCode span at (334:35,0 [1] ) (Accepts:None) - Parent: Statement block at (309:33,0 [26] )
+Markup span at (335:35,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (337:36,0 [1] ) (Accepts:None) - Parent: Statement block at (337:36,0 [27] )
+MetaCode span at (338:36,1 [1] ) (Accepts:None) - Parent: Statement block at (337:36,0 [27] )
+Code span at (339:36,2 [2] ) (Accepts:Any) - Parent: Statement block at (337:36,0 [27] )
+Markup span at (341:37,0 [7] ) (Accepts:None) - Parent: Tag block at (341:37,0 [7] )
+Code span at (348:37,7 [15] ) (Accepts:Any) - Parent: Statement block at (337:36,0 [27] )
+MetaCode span at (363:38,0 [1] ) (Accepts:None) - Parent: Statement block at (337:36,0 [27] )
+Markup span at (364:38,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (366:39,0 [1] ) (Accepts:None) - Parent: Statement block at (366:39,0 [28] )
+MetaCode span at (367:39,1 [1] ) (Accepts:None) - Parent: Statement block at (366:39,0 [28] )
+Code span at (368:39,2 [2] ) (Accepts:Any) - Parent: Statement block at (366:39,0 [28] )
+Markup span at (370:40,0 [8] ) (Accepts:None) - Parent: Tag block at (370:40,0 [8] )
+Code span at (378:40,8 [15] ) (Accepts:Any) - Parent: Statement block at (366:39,0 [28] )
+MetaCode span at (393:41,0 [1] ) (Accepts:None) - Parent: Statement block at (366:39,0 [28] )
+Markup span at (394:41,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (396:42,0 [1] ) (Accepts:None) - Parent: Statement block at (396:42,0 [27] )
+MetaCode span at (397:42,1 [1] ) (Accepts:None) - Parent: Statement block at (396:42,0 [27] )
+Code span at (398:42,2 [2] ) (Accepts:Any) - Parent: Statement block at (396:42,0 [27] )
+Markup span at (400:43,0 [7] ) (Accepts:None) - Parent: Tag block at (400:43,0 [7] )
+Code span at (407:43,7 [15] ) (Accepts:Any) - Parent: Statement block at (396:42,0 [27] )
+MetaCode span at (422:44,0 [1] ) (Accepts:None) - Parent: Statement block at (396:42,0 [27] )
+Markup span at (423:44,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
+Transition span at (425:45,0 [1] ) (Accepts:None) - Parent: Statement block at (425:45,0 [25] )
+MetaCode span at (426:45,1 [1] ) (Accepts:None) - Parent: Statement block at (425:45,0 [25] )
+Code span at (427:45,2 [2] ) (Accepts:Any) - Parent: Statement block at (425:45,0 [25] )
+Markup span at (429:46,0 [5] ) (Accepts:None) - Parent: Tag block at (429:46,0 [5] )
+Code span at (434:46,5 [15] ) (Accepts:Any) - Parent: Statement block at (425:45,0 [25] )
+MetaCode span at (449:47,0 [1] ) (Accepts:None) - Parent: Statement block at (425:45,0 [25] )
+Markup span at (450:47,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [452] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt
new file mode 100644
index 0000000000..3f081bc072
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt
@@ -0,0 +1,484 @@
+RazorDocument - [0..452)::452 - [@{LF<area>var x = true;LF}LF@{LF<base>var x = true;LF}LF@{LF<br>var x = true;LF}LF@{LF<col>var x = true;LF}LF@{LF<command>var x = true;LF}LF@{LF<embed>var x = true;LF}LF@{LF<hr>var x = true;LF}LF@{LF<img>var x = true;LF}LF@{LF<input>var x = true;LF}LF@{LF<keygen>var x = true;LF}LF@{LF<link>var x = true;LF}LF@{LF<meta>var x = true;LF}LF@{LF<param>var x = true;LF}LF@{LF<source>var x = true;LF}LF@{LF<track>var x = true;LF}LF@{LF<wbr>var x = true;LF}LF]
+    MarkupBlock - [0..452)::452
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..10)::6
+                            MarkupElement - [4..10)::6
+                                MarkupStartTag - [4..10)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [10..25)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [26..28)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [28..54)::26
+            CSharpStatement - [28..54)::26
+                CSharpTransition - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [29..54)::25
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [30..53)::23
+                        CSharpStatementLiteral - [30..32)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [32..38)::6
+                            MarkupElement - [32..38)::6
+                                MarkupStartTag - [32..38)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [38..53)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [54..56)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [56..80)::24
+            CSharpStatement - [56..80)::24
+                CSharpTransition - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [57..80)::23
+                    RazorMetaCode - [57..58)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [58..79)::21
+                        CSharpStatementLiteral - [58..60)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [60..64)::4
+                            MarkupElement - [60..64)::4
+                                MarkupStartTag - [60..64)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [64..79)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [79..80)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [80..82)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [82..107)::25
+            CSharpStatement - [82..107)::25
+                CSharpTransition - [82..83)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [83..107)::24
+                    RazorMetaCode - [83..84)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [84..106)::22
+                        CSharpStatementLiteral - [84..86)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [86..91)::5
+                            MarkupElement - [86..91)::5
+                                MarkupStartTag - [86..91)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [91..106)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [106..107)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [107..109)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [109..138)::29
+            CSharpStatement - [109..138)::29
+                CSharpTransition - [109..110)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [110..138)::28
+                    RazorMetaCode - [110..111)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [111..137)::26
+                        CSharpStatementLiteral - [111..113)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [113..122)::9
+                            MarkupElement - [113..122)::9
+                                MarkupStartTag - [113..122)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [122..137)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [137..138)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [138..140)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [140..167)::27
+            CSharpStatement - [140..167)::27
+                CSharpTransition - [140..141)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [141..167)::26
+                    RazorMetaCode - [141..142)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [142..166)::24
+                        CSharpStatementLiteral - [142..144)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [144..151)::7
+                            MarkupElement - [144..151)::7
+                                MarkupStartTag - [144..151)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [151..166)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [166..167)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [167..169)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [169..193)::24
+            CSharpStatement - [169..193)::24
+                CSharpTransition - [169..170)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [170..193)::23
+                    RazorMetaCode - [170..171)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [171..192)::21
+                        CSharpStatementLiteral - [171..173)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [173..177)::4
+                            MarkupElement - [173..177)::4
+                                MarkupStartTag - [173..177)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [177..192)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [192..193)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [193..195)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [195..220)::25
+            CSharpStatement - [195..220)::25
+                CSharpTransition - [195..196)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [196..220)::24
+                    RazorMetaCode - [196..197)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [197..219)::22
+                        CSharpStatementLiteral - [197..199)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [199..204)::5
+                            MarkupElement - [199..204)::5
+                                MarkupStartTag - [199..204)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [204..219)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [219..220)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [220..222)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [222..249)::27
+            CSharpStatement - [222..249)::27
+                CSharpTransition - [222..223)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [223..249)::26
+                    RazorMetaCode - [223..224)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [224..248)::24
+                        CSharpStatementLiteral - [224..226)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [226..233)::7
+                            MarkupElement - [226..233)::7
+                                MarkupStartTag - [226..233)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [233..248)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [248..249)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [249..251)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [251..279)::28
+            CSharpStatement - [251..279)::28
+                CSharpTransition - [251..252)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [252..279)::27
+                    RazorMetaCode - [252..253)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [253..278)::25
+                        CSharpStatementLiteral - [253..255)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [255..263)::8
+                            MarkupElement - [255..263)::8
+                                MarkupStartTag - [255..263)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [263..278)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [278..279)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [279..281)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [281..307)::26
+            CSharpStatement - [281..307)::26
+                CSharpTransition - [281..282)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [282..307)::25
+                    RazorMetaCode - [282..283)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [283..306)::23
+                        CSharpStatementLiteral - [283..285)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [285..291)::6
+                            MarkupElement - [285..291)::6
+                                MarkupStartTag - [285..291)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [291..306)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [306..307)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [307..309)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [309..335)::26
+            CSharpStatement - [309..335)::26
+                CSharpTransition - [309..310)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [310..335)::25
+                    RazorMetaCode - [310..311)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [311..334)::23
+                        CSharpStatementLiteral - [311..313)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [313..319)::6
+                            MarkupElement - [313..319)::6
+                                MarkupStartTag - [313..319)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [319..334)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [334..335)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [335..337)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [337..364)::27
+            CSharpStatement - [337..364)::27
+                CSharpTransition - [337..338)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [338..364)::26
+                    RazorMetaCode - [338..339)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [339..363)::24
+                        CSharpStatementLiteral - [339..341)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [341..348)::7
+                            MarkupElement - [341..348)::7
+                                MarkupStartTag - [341..348)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [348..363)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [363..364)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [364..366)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [366..394)::28
+            CSharpStatement - [366..394)::28
+                CSharpTransition - [366..367)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [367..394)::27
+                    RazorMetaCode - [367..368)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [368..393)::25
+                        CSharpStatementLiteral - [368..370)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [370..378)::8
+                            MarkupElement - [370..378)::8
+                                MarkupStartTag - [370..378)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [378..393)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [393..394)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [394..396)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [396..423)::27
+            CSharpStatement - [396..423)::27
+                CSharpTransition - [396..397)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [397..423)::26
+                    RazorMetaCode - [397..398)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [398..422)::24
+                        CSharpStatementLiteral - [398..400)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [400..407)::7
+                            MarkupElement - [400..407)::7
+                                MarkupStartTag - [400..407)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [407..422)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [422..423)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [423..425)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [425..450)::25
+            CSharpStatement - [425..450)::25
+                CSharpTransition - [425..426)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [426..450)::24
+                    RazorMetaCode - [426..427)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [427..449)::22
+                        CSharpStatementLiteral - [427..429)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [429..434)::5
+                            MarkupElement - [429..434)::5
+                                MarkupStartTag - [429..434)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [434..449)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [449..450)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [450..452)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.cspans.txt
new file mode 100644
index 0000000000..22605d5bf1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.cspans.txt
@@ -0,0 +1,49 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (3:1,0 [6] ) (Accepts:Any) - Parent: Tag block at (3:1,0 [6] )
+Markup span at (9:1,6 [7] ) (Accepts:Any) - Parent: Tag block at (9:1,6 [7] )
+Markup span at (16:1,13 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (38:4,0 [6] ) (Accepts:Any) - Parent: Tag block at (38:4,0 [6] )
+Markup span at (44:4,6 [7] ) (Accepts:Any) - Parent: Tag block at (44:4,6 [7] )
+Markup span at (51:4,13 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (73:7,0 [4] ) (Accepts:Any) - Parent: Tag block at (73:7,0 [4] )
+Markup span at (77:7,4 [7] ) (Accepts:Any) - Parent: Tag block at (77:7,4 [7] )
+Markup span at (84:7,11 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (106:10,0 [5] ) (Accepts:Any) - Parent: Tag block at (106:10,0 [5] )
+Markup span at (111:10,5 [7] ) (Accepts:Any) - Parent: Tag block at (111:10,5 [7] )
+Markup span at (118:10,12 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (140:13,0 [9] ) (Accepts:Any) - Parent: Tag block at (140:13,0 [9] )
+Markup span at (149:13,9 [7] ) (Accepts:Any) - Parent: Tag block at (149:13,9 [7] )
+Markup span at (156:13,16 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (178:16,0 [7] ) (Accepts:Any) - Parent: Tag block at (178:16,0 [7] )
+Markup span at (185:16,7 [7] ) (Accepts:Any) - Parent: Tag block at (185:16,7 [7] )
+Markup span at (192:16,14 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (214:19,0 [4] ) (Accepts:Any) - Parent: Tag block at (214:19,0 [4] )
+Markup span at (218:19,4 [7] ) (Accepts:Any) - Parent: Tag block at (218:19,4 [7] )
+Markup span at (225:19,11 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (247:22,0 [5] ) (Accepts:Any) - Parent: Tag block at (247:22,0 [5] )
+Markup span at (252:22,5 [7] ) (Accepts:Any) - Parent: Tag block at (252:22,5 [7] )
+Markup span at (259:22,12 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (281:25,0 [7] ) (Accepts:Any) - Parent: Tag block at (281:25,0 [7] )
+Markup span at (288:25,7 [7] ) (Accepts:Any) - Parent: Tag block at (288:25,7 [7] )
+Markup span at (295:25,14 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (317:28,0 [8] ) (Accepts:Any) - Parent: Tag block at (317:28,0 [8] )
+Markup span at (325:28,8 [7] ) (Accepts:Any) - Parent: Tag block at (325:28,8 [7] )
+Markup span at (332:28,15 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (354:31,0 [6] ) (Accepts:Any) - Parent: Tag block at (354:31,0 [6] )
+Markup span at (360:31,6 [7] ) (Accepts:Any) - Parent: Tag block at (360:31,6 [7] )
+Markup span at (367:31,13 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (389:34,0 [6] ) (Accepts:Any) - Parent: Tag block at (389:34,0 [6] )
+Markup span at (395:34,6 [7] ) (Accepts:Any) - Parent: Tag block at (395:34,6 [7] )
+Markup span at (402:34,13 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (424:37,0 [7] ) (Accepts:Any) - Parent: Tag block at (424:37,0 [7] )
+Markup span at (431:37,7 [7] ) (Accepts:Any) - Parent: Tag block at (431:37,7 [7] )
+Markup span at (438:37,14 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (460:40,0 [8] ) (Accepts:Any) - Parent: Tag block at (460:40,0 [8] )
+Markup span at (468:40,8 [7] ) (Accepts:Any) - Parent: Tag block at (468:40,8 [7] )
+Markup span at (475:40,15 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (497:43,0 [7] ) (Accepts:Any) - Parent: Tag block at (497:43,0 [7] )
+Markup span at (504:43,7 [7] ) (Accepts:Any) - Parent: Tag block at (504:43,7 [7] )
+Markup span at (511:43,14 [22] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
+Markup span at (533:46,0 [5] ) (Accepts:Any) - Parent: Tag block at (533:46,0 [5] )
+Markup span at (538:46,5 [7] ) (Accepts:Any) - Parent: Tag block at (538:46,5 [7] )
+Markup span at (545:46,12 [19] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [564] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt
new file mode 100644
index 0000000000..d323273f6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt
@@ -0,0 +1,387 @@
+RazorDocument - [0..564)::564 - [{LF<area><other> var x = true;LF}LF{LF<base><other> var x = true;LF}LF{LF<br><other> var x = true;LF}LF{LF<col><other> var x = true;LF}LF{LF<command><other> var x = true;LF}LF{LF<embed><other> var x = true;LF}LF{LF<hr><other> var x = true;LF}LF{LF<img><other> var x = true;LF}LF{LF<input><other> var x = true;LF}LF{LF<keygen><other> var x = true;LF}LF{LF<link><other> var x = true;LF}LF{LF<meta><other> var x = true;LF}LF{LF<param><other> var x = true;LF}LF{LF<source><other> var x = true;LF}LF{LF<track><other> var x = true;LF}LF{LF<wbr><other> var x = true;LF}LF]
+    MarkupBlock - [0..564)::564
+        MarkupTextLiteral - [0..3)::3 - [{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            NewLine;[LF];
+        MarkupElement - [3..9)::6
+            MarkupStartTag - [3..9)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[area];
+                CloseAngle;[>];
+        MarkupElement - [9..564)::555
+            MarkupStartTag - [9..16)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+            MarkupTextLiteral - [16..38)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[var];
+                Whitespace;[ ];
+                Text;[x];
+                Whitespace;[ ];
+                Equals;[=];
+                Whitespace;[ ];
+                Text;[true;];
+                NewLine;[LF];
+                Text;[}];
+                NewLine;[LF];
+                Text;[{];
+                NewLine;[LF];
+            MarkupElement - [38..44)::6
+                MarkupStartTag - [38..44)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[base];
+                    CloseAngle;[>];
+            MarkupElement - [44..564)::520
+                MarkupStartTag - [44..51)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[other];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [51..73)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    Text;[var];
+                    Whitespace;[ ];
+                    Text;[x];
+                    Whitespace;[ ];
+                    Equals;[=];
+                    Whitespace;[ ];
+                    Text;[true;];
+                    NewLine;[LF];
+                    Text;[}];
+                    NewLine;[LF];
+                    Text;[{];
+                    NewLine;[LF];
+                MarkupElement - [73..77)::4
+                    MarkupStartTag - [73..77)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+                MarkupElement - [77..564)::487
+                    MarkupStartTag - [77..84)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[other];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [84..106)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                        Text;[var];
+                        Whitespace;[ ];
+                        Text;[x];
+                        Whitespace;[ ];
+                        Equals;[=];
+                        Whitespace;[ ];
+                        Text;[true;];
+                        NewLine;[LF];
+                        Text;[}];
+                        NewLine;[LF];
+                        Text;[{];
+                        NewLine;[LF];
+                    MarkupElement - [106..111)::5
+                        MarkupStartTag - [106..111)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[col];
+                            CloseAngle;[>];
+                    MarkupElement - [111..564)::453
+                        MarkupStartTag - [111..118)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[other];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [118..140)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[var];
+                            Whitespace;[ ];
+                            Text;[x];
+                            Whitespace;[ ];
+                            Equals;[=];
+                            Whitespace;[ ];
+                            Text;[true;];
+                            NewLine;[LF];
+                            Text;[}];
+                            NewLine;[LF];
+                            Text;[{];
+                            NewLine;[LF];
+                        MarkupElement - [140..149)::9
+                            MarkupStartTag - [140..149)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[command];
+                                CloseAngle;[>];
+                        MarkupElement - [149..564)::415
+                            MarkupStartTag - [149..156)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[other];
+                                CloseAngle;[>];
+                            MarkupTextLiteral - [156..178)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                Text;[var];
+                                Whitespace;[ ];
+                                Text;[x];
+                                Whitespace;[ ];
+                                Equals;[=];
+                                Whitespace;[ ];
+                                Text;[true;];
+                                NewLine;[LF];
+                                Text;[}];
+                                NewLine;[LF];
+                                Text;[{];
+                                NewLine;[LF];
+                            MarkupElement - [178..185)::7
+                                MarkupStartTag - [178..185)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                            MarkupElement - [185..564)::379
+                                MarkupStartTag - [185..192)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[other];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [192..214)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    Text;[var];
+                                    Whitespace;[ ];
+                                    Text;[x];
+                                    Whitespace;[ ];
+                                    Equals;[=];
+                                    Whitespace;[ ];
+                                    Text;[true;];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Text;[{];
+                                    NewLine;[LF];
+                                MarkupElement - [214..218)::4
+                                    MarkupStartTag - [214..218)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[hr];
+                                        CloseAngle;[>];
+                                MarkupElement - [218..564)::346
+                                    MarkupStartTag - [218..225)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[other];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [225..247)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                        Text;[var];
+                                        Whitespace;[ ];
+                                        Text;[x];
+                                        Whitespace;[ ];
+                                        Equals;[=];
+                                        Whitespace;[ ];
+                                        Text;[true;];
+                                        NewLine;[LF];
+                                        Text;[}];
+                                        NewLine;[LF];
+                                        Text;[{];
+                                        NewLine;[LF];
+                                    MarkupElement - [247..252)::5
+                                        MarkupStartTag - [247..252)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            OpenAngle;[<];
+                                            Text;[img];
+                                            CloseAngle;[>];
+                                    MarkupElement - [252..564)::312
+                                        MarkupStartTag - [252..259)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            OpenAngle;[<];
+                                            Text;[other];
+                                            CloseAngle;[>];
+                                        MarkupTextLiteral - [259..281)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                            Text;[var];
+                                            Whitespace;[ ];
+                                            Text;[x];
+                                            Whitespace;[ ];
+                                            Equals;[=];
+                                            Whitespace;[ ];
+                                            Text;[true;];
+                                            NewLine;[LF];
+                                            Text;[}];
+                                            NewLine;[LF];
+                                            Text;[{];
+                                            NewLine;[LF];
+                                        MarkupElement - [281..288)::7
+                                            MarkupStartTag - [281..288)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                OpenAngle;[<];
+                                                Text;[input];
+                                                CloseAngle;[>];
+                                        MarkupElement - [288..564)::276
+                                            MarkupStartTag - [288..295)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                OpenAngle;[<];
+                                                Text;[other];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [295..317)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[var];
+                                                Whitespace;[ ];
+                                                Text;[x];
+                                                Whitespace;[ ];
+                                                Equals;[=];
+                                                Whitespace;[ ];
+                                                Text;[true;];
+                                                NewLine;[LF];
+                                                Text;[}];
+                                                NewLine;[LF];
+                                                Text;[{];
+                                                NewLine;[LF];
+                                            MarkupElement - [317..325)::8
+                                                MarkupStartTag - [317..325)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    OpenAngle;[<];
+                                                    Text;[keygen];
+                                                    CloseAngle;[>];
+                                            MarkupElement - [325..564)::239
+                                                MarkupStartTag - [325..332)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    OpenAngle;[<];
+                                                    Text;[other];
+                                                    CloseAngle;[>];
+                                                MarkupTextLiteral - [332..354)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                    Text;[var];
+                                                    Whitespace;[ ];
+                                                    Text;[x];
+                                                    Whitespace;[ ];
+                                                    Equals;[=];
+                                                    Whitespace;[ ];
+                                                    Text;[true;];
+                                                    NewLine;[LF];
+                                                    Text;[}];
+                                                    NewLine;[LF];
+                                                    Text;[{];
+                                                    NewLine;[LF];
+                                                MarkupElement - [354..360)::6
+                                                    MarkupStartTag - [354..360)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        Text;[link];
+                                                        CloseAngle;[>];
+                                                MarkupElement - [360..564)::204
+                                                    MarkupStartTag - [360..367)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        Text;[other];
+                                                        CloseAngle;[>];
+                                                    MarkupTextLiteral - [367..389)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Whitespace;[ ];
+                                                        Text;[var];
+                                                        Whitespace;[ ];
+                                                        Text;[x];
+                                                        Whitespace;[ ];
+                                                        Equals;[=];
+                                                        Whitespace;[ ];
+                                                        Text;[true;];
+                                                        NewLine;[LF];
+                                                        Text;[}];
+                                                        NewLine;[LF];
+                                                        Text;[{];
+                                                        NewLine;[LF];
+                                                    MarkupElement - [389..395)::6
+                                                        MarkupStartTag - [389..395)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                            OpenAngle;[<];
+                                                            Text;[meta];
+                                                            CloseAngle;[>];
+                                                    MarkupElement - [395..564)::169
+                                                        MarkupStartTag - [395..402)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                            OpenAngle;[<];
+                                                            Text;[other];
+                                                            CloseAngle;[>];
+                                                        MarkupTextLiteral - [402..424)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                            Whitespace;[ ];
+                                                            Text;[var];
+                                                            Whitespace;[ ];
+                                                            Text;[x];
+                                                            Whitespace;[ ];
+                                                            Equals;[=];
+                                                            Whitespace;[ ];
+                                                            Text;[true;];
+                                                            NewLine;[LF];
+                                                            Text;[}];
+                                                            NewLine;[LF];
+                                                            Text;[{];
+                                                            NewLine;[LF];
+                                                        MarkupElement - [424..431)::7
+                                                            MarkupStartTag - [424..431)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                OpenAngle;[<];
+                                                                Text;[param];
+                                                                CloseAngle;[>];
+                                                        MarkupElement - [431..564)::133
+                                                            MarkupStartTag - [431..438)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                OpenAngle;[<];
+                                                                Text;[other];
+                                                                CloseAngle;[>];
+                                                            MarkupTextLiteral - [438..460)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                Whitespace;[ ];
+                                                                Text;[var];
+                                                                Whitespace;[ ];
+                                                                Text;[x];
+                                                                Whitespace;[ ];
+                                                                Equals;[=];
+                                                                Whitespace;[ ];
+                                                                Text;[true;];
+                                                                NewLine;[LF];
+                                                                Text;[}];
+                                                                NewLine;[LF];
+                                                                Text;[{];
+                                                                NewLine;[LF];
+                                                            MarkupElement - [460..468)::8
+                                                                MarkupStartTag - [460..468)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                    OpenAngle;[<];
+                                                                    Text;[source];
+                                                                    CloseAngle;[>];
+                                                            MarkupElement - [468..564)::96
+                                                                MarkupStartTag - [468..475)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                    OpenAngle;[<];
+                                                                    Text;[other];
+                                                                    CloseAngle;[>];
+                                                                MarkupTextLiteral - [475..497)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                    Whitespace;[ ];
+                                                                    Text;[var];
+                                                                    Whitespace;[ ];
+                                                                    Text;[x];
+                                                                    Whitespace;[ ];
+                                                                    Equals;[=];
+                                                                    Whitespace;[ ];
+                                                                    Text;[true;];
+                                                                    NewLine;[LF];
+                                                                    Text;[}];
+                                                                    NewLine;[LF];
+                                                                    Text;[{];
+                                                                    NewLine;[LF];
+                                                                MarkupElement - [497..504)::7
+                                                                    MarkupStartTag - [497..504)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                        OpenAngle;[<];
+                                                                        Text;[track];
+                                                                        CloseAngle;[>];
+                                                                MarkupElement - [504..564)::60
+                                                                    MarkupStartTag - [504..511)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                        OpenAngle;[<];
+                                                                        Text;[other];
+                                                                        CloseAngle;[>];
+                                                                    MarkupTextLiteral - [511..533)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                        Whitespace;[ ];
+                                                                        Text;[var];
+                                                                        Whitespace;[ ];
+                                                                        Text;[x];
+                                                                        Whitespace;[ ];
+                                                                        Equals;[=];
+                                                                        Whitespace;[ ];
+                                                                        Text;[true;];
+                                                                        NewLine;[LF];
+                                                                        Text;[}];
+                                                                        NewLine;[LF];
+                                                                        Text;[{];
+                                                                        NewLine;[LF];
+                                                                    MarkupElement - [533..538)::5
+                                                                        MarkupStartTag - [533..538)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                            OpenAngle;[<];
+                                                                            Text;[wbr];
+                                                                            CloseAngle;[>];
+                                                                    MarkupElement - [538..564)::26
+                                                                        MarkupStartTag - [538..545)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                            OpenAngle;[<];
+                                                                            Text;[other];
+                                                                            CloseAngle;[>];
+                                                                        MarkupTextLiteral - [545..564)::19 - [ var x = true;LF}LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                            Whitespace;[ ];
+                                                                            Text;[var];
+                                                                            Whitespace;[ ];
+                                                                            Text;[x];
+                                                                            Whitespace;[ ];
+                                                                            Equals;[=];
+                                                                            Whitespace;[ ];
+                                                                            Text;[true;];
+                                                                            NewLine;[LF];
+                                                                            Text;[}];
+                                                                            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt
new file mode 100644
index 0000000000..8e11fb5c0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt
@@ -0,0 +1,19 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [98] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [98] )
+Code span at (2:0,2 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [98] )
+Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: Tag block at (5:0,5 [4] )
+Markup span at (9:0,9 [6] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [92] )
+Transition span at (15:1,4 [1] ) (Accepts:None) - Parent: Statement block at (15:1,4 [71] )
+Code span at (16:1,5 [38] ) (Accepts:Any) - Parent: Statement block at (15:1,4 [71] )
+Markup span at (54:2,8 [4] ) (Accepts:None) - Parent: Tag block at (54:2,8 [4] )
+Markup span at (58:2,12 [9] ) (Accepts:Any) - Parent: Markup block at (54:2,8 [25] )
+Transition span at (67:2,21 [1] ) (Accepts:None) - Parent: Expression block at (67:2,21 [7] )
+Code span at (68:2,22 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (67:2,21 [7] )
+Markup span at (74:2,28 [5] ) (Accepts:None) - Parent: Tag block at (74:2,28 [5] )
+Code span at (79:2,33 [7] ) (Accepts:None) - Parent: Statement block at (15:1,4 [71] )
+Markup span at (86:3,5 [6] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [92] )
+Markup span at (92:4,4 [5] ) (Accepts:None) - Parent: Tag block at (92:4,4 [5] )
+Code span at (97:4,9 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [98] )
+MetaCode span at (97:4,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [98] )
+Markup span at (98:4,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt
new file mode 100644
index 0000000000..a29f4be9a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt
@@ -0,0 +1,83 @@
+RazorDocument - [0..98)::98 - [@{   <ul>LF    @foreach(var p in Products) {LF        <li>Product: @p.Name</li>LF    }LF    </ul>}]
+    MarkupBlock - [0..98)::98
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..98)::98
+            CSharpStatement - [0..98)::98
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..98)::97
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..97)::95
+                        CSharpStatementLiteral - [2..5)::3 - [   ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[   ];
+                        MarkupBlock - [5..97)::92
+                            MarkupElement - [5..97)::92
+                                MarkupStartTag - [5..9)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[ul];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [9..15)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    NewLine;[LF];
+                                    Whitespace;[    ];
+                                CSharpCodeBlock - [15..86)::71
+                                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [16..54)::38 - [foreach(var p in Products) {LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[foreach];
+                                        LeftParenthesis;[(];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[p];
+                                        Whitespace;[ ];
+                                        Keyword;[in];
+                                        Whitespace;[ ];
+                                        Identifier;[Products];
+                                        RightParenthesis;[)];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        NewLine;[LF];
+                                        Whitespace;[        ];
+                                    MarkupBlock - [54..79)::25
+                                        MarkupElement - [54..79)::25
+                                            MarkupStartTag - [54..58)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[li];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [58..67)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Product:];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [67..74)::7
+                                                CSharpImplicitExpression - [67..74)::7
+                                                    CSharpTransition - [67..68)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [68..74)::6
+                                                        CSharpCodeBlock - [68..74)::6
+                                                            CSharpExpressionLiteral - [68..74)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[p];
+                                                                Dot;[.];
+                                                                Identifier;[Name];
+                                            MarkupEndTag - [74..79)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[li];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [79..86)::7 - [LF    }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        NewLine;[LF];
+                                        Whitespace;[    ];
+                                        RightBrace;[}];
+                                MarkupTextLiteral - [86..92)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    NewLine;[LF];
+                                    Whitespace;[    ];
+                                MarkupEndTag - [92..97)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[ul];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [97..97)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [97..98)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [98..98)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt
new file mode 100644
index 0000000000..cba8fd92de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [38] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [35] )
+Markup span at (11:0,11 [27] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [35] )
+Markup span at (38:0,38 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [35] )
+Markup span at (39:0,39 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [38] )
+Markup span at (40:0,40 [8] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [50] )
+Markup span at (48:0,48 [4] ) (Accepts:None) - Parent: Tag block at (48:0,48 [4] )
+Code span at (52:0,52 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [53] )
+MetaCode span at (52:0,52 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [53] )
+Markup span at (53:0,53 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
new file mode 100644
index 0000000000..8761033bc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..53)::53 - [@{<a href="mailto:anurse@microsoft.com">Email me</a>}]
+    MarkupBlock - [0..53)::53
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..53)::53
+            CSharpStatement - [0..53)::53
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..53)::52
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..52)::50
+                        MarkupBlock - [2..52)::50
+                            MarkupElement - [2..52)::50
+                                MarkupStartTag - [2..40)::38 - [<a href="mailto:anurse@microsoft.com">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    MarkupAttributeBlock - [4..39)::35 - [ href="mailto:anurse@microsoft.com"]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[href];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [11..38)::27
+                                            MarkupLiteralAttributeValue - [11..38)::27 - [mailto:anurse@microsoft.com]
+                                                MarkupTextLiteral - [11..38)::27 - [mailto:anurse@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[mailto:anurse@microsoft.com];
+                                        MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [40..48)::8 - [Email me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Email];
+                                    Whitespace;[ ];
+                                    Text;[me];
+                                MarkupEndTag - [48..52)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[a];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [52..52)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [53..53)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.cspans.txt
new file mode 100644
index 0000000000..c0bfd264c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [20] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [31] )
+Markup span at (27:0,27 [6] ) (Accepts:None) - Parent: Tag block at (27:0,27 [6] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.stree.txt
new file mode 100644
index 0000000000..41310fb85e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInText.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..34)::34 - [@{<foo>anurse@microsoft.com</foo>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..27)::20 - [anurse@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[anurse@microsoft.com];
+                                MarkupEndTag - [27..33)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
new file mode 100644
index 0000000000..769e4eeb3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
@@ -0,0 +1,22 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [98] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [98] )
+Markup span at (2:0,2 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [95] )
+Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: Tag block at (5:0,5 [4] )
+Markup span at (9:0,9 [2] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [95] )
+Code span at (11:1,0 [4] ) (Accepts:Any) - Parent: Statement block at (11:1,0 [77] )
+Transition span at (15:1,4 [1] ) (Accepts:None) - Parent: Statement block at (11:1,0 [77] )
+Code span at (16:1,5 [30] ) (Accepts:Any) - Parent: Statement block at (11:1,0 [77] )
+Markup span at (46:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (46:2,0 [35] )
+Markup span at (54:2,8 [4] ) (Accepts:None) - Parent: Tag block at (54:2,8 [4] )
+Markup span at (58:2,12 [9] ) (Accepts:Any) - Parent: Markup block at (46:2,0 [35] )
+Transition span at (67:2,21 [1] ) (Accepts:None) - Parent: Expression block at (67:2,21 [7] )
+Code span at (68:2,22 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (67:2,21 [7] )
+Markup span at (74:2,28 [5] ) (Accepts:None) - Parent: Tag block at (74:2,28 [5] )
+Markup span at (79:2,33 [2] ) (Accepts:None) - Parent: Markup block at (46:2,0 [35] )
+Code span at (81:3,0 [7] ) (Accepts:None) - Parent: Statement block at (11:1,0 [77] )
+Markup span at (88:4,0 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [95] )
+Markup span at (92:4,4 [5] ) (Accepts:None) - Parent: Tag block at (92:4,4 [5] )
+Code span at (97:4,9 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [98] )
+MetaCode span at (97:4,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [98] )
+Markup span at (98:4,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [98] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
new file mode 100644
index 0000000000..1025586c6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
@@ -0,0 +1,86 @@
+RazorDocument - [0..98)::98 - [@{   <ul>LF    @foreach(var p in Products) {LF        <li>Product: @p.Name</li>LF    }LF    </ul>}]
+    MarkupBlock - [0..98)::98
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..98)::98
+            CSharpStatement - [0..98)::98
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..98)::97
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..97)::95
+                        MarkupBlock - [2..97)::95
+                            MarkupTextLiteral - [2..5)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupElement - [5..97)::92
+                                MarkupStartTag - [5..9)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[ul];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [9..11)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    NewLine;[LF];
+                                CSharpCodeBlock - [11..88)::77
+                                    CSharpStatementLiteral - [11..15)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[    ];
+                                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [16..46)::30 - [foreach(var p in Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[foreach];
+                                        LeftParenthesis;[(];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[p];
+                                        Whitespace;[ ];
+                                        Keyword;[in];
+                                        Whitespace;[ ];
+                                        Identifier;[Products];
+                                        RightParenthesis;[)];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        NewLine;[LF];
+                                    MarkupBlock - [46..81)::35
+                                        MarkupTextLiteral - [46..54)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[        ];
+                                        MarkupElement - [54..79)::25
+                                            MarkupStartTag - [54..58)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[li];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [58..67)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Product:];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [67..74)::7
+                                                CSharpImplicitExpression - [67..74)::7
+                                                    CSharpTransition - [67..68)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [68..74)::6
+                                                        CSharpCodeBlock - [68..74)::6
+                                                            CSharpExpressionLiteral - [68..74)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[p];
+                                                                Dot;[.];
+                                                                Identifier;[Name];
+                                            MarkupEndTag - [74..79)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[li];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [79..81)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            NewLine;[LF];
+                                    CSharpStatementLiteral - [81..88)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[    ];
+                                        RightBrace;[}];
+                                        NewLine;[LF];
+                                MarkupTextLiteral - [88..92)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[    ];
+                                MarkupEndTag - [92..97)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[ul];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [97..97)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [97..98)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [98..98)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
new file mode 100644
index 0000000000..5b382487b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [95] )
+Markup span at (3:0,3 [4] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
+Markup span at (7:0,7 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [95] )
+Code span at (9:1,0 [4] ) (Accepts:Any) - Parent: Statement block at (9:1,0 [77] )
+Transition span at (13:1,4 [1] ) (Accepts:None) - Parent: Statement block at (9:1,0 [77] )
+Code span at (14:1,5 [30] ) (Accepts:Any) - Parent: Statement block at (9:1,0 [77] )
+Markup span at (44:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (44:2,0 [35] )
+Markup span at (52:2,8 [4] ) (Accepts:None) - Parent: Tag block at (52:2,8 [4] )
+Markup span at (56:2,12 [9] ) (Accepts:Any) - Parent: Markup block at (44:2,0 [35] )
+Transition span at (65:2,21 [1] ) (Accepts:None) - Parent: Expression block at (65:2,21 [7] )
+Code span at (66:2,22 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (65:2,21 [7] )
+Markup span at (72:2,28 [5] ) (Accepts:None) - Parent: Tag block at (72:2,28 [5] )
+Markup span at (77:2,33 [2] ) (Accepts:None) - Parent: Markup block at (44:2,0 [35] )
+Code span at (79:3,0 [7] ) (Accepts:None) - Parent: Statement block at (9:1,0 [77] )
+Markup span at (86:4,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [95] )
+Markup span at (90:4,4 [5] ) (Accepts:Any) - Parent: Tag block at (90:4,4 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
new file mode 100644
index 0000000000..bdb122a309
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
@@ -0,0 +1,69 @@
+RazorDocument - [0..95)::95 - [   <ul>LF    @foreach(var p in Products) {LF        <li>Product: @p.Name</li>LF    }LF    </ul>]
+    MarkupBlock - [0..95)::95
+        MarkupTextLiteral - [0..3)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[   ];
+        MarkupElement - [3..95)::92
+            MarkupStartTag - [3..7)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[ul];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..9)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            CSharpCodeBlock - [9..86)::77
+                CSharpStatementLiteral - [9..13)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [14..44)::30 - [foreach(var p in Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[foreach];
+                    LeftParenthesis;[(];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[p];
+                    Whitespace;[ ];
+                    Keyword;[in];
+                    Whitespace;[ ];
+                    Identifier;[Products];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    NewLine;[LF];
+                MarkupBlock - [44..79)::35
+                    MarkupTextLiteral - [44..52)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                    MarkupElement - [52..77)::25
+                        MarkupStartTag - [52..56)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[li];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [56..65)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Product:];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [65..72)::7
+                            CSharpImplicitExpression - [65..72)::7
+                                CSharpTransition - [65..66)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [66..72)::6
+                                    CSharpCodeBlock - [66..72)::6
+                                        CSharpExpressionLiteral - [66..72)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[p];
+                                            Dot;[.];
+                                            Identifier;[Name];
+                        MarkupEndTag - [72..77)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[li];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [77..79)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                CSharpStatementLiteral - [79..86)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Whitespace;[    ];
+                    RightBrace;[}];
+                    NewLine;[LF];
+            MarkupTextLiteral - [86..90)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[    ];
+            MarkupEndTag - [90..95)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[ul];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
new file mode 100644
index 0000000000..f524279da0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Markup span at (6:0,6 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Markup span at (7:0,7 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [4] )
+Code span at (10:0,10 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [4] )
+Markup span at (13:0,13 [6] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
new file mode 100644
index 0000000000..66e1ca4faa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..19)::19 - [<foo>@@@@@bar</foo>]
+    MarkupBlock - [0..19)::19
+        MarkupElement - [0..19)::19
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupEphemeralTextLiteral - [5..6)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            MarkupTextLiteral - [6..7)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            MarkupEphemeralTextLiteral - [7..8)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            MarkupTextLiteral - [8..9)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            CSharpCodeBlock - [9..13)::4
+                CSharpImplicitExpression - [9..13)::4
+                    CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [10..13)::3
+                        CSharpCodeBlock - [10..13)::3
+                            CSharpExpressionLiteral - [10..13)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[bar];
+            MarkupEndTag - [13..19)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.cspans.txt
new file mode 100644
index 0000000000..beb66d05e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Markup span at (10:0,10 [6] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt
new file mode 100644
index 0000000000..9408db763d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..16)::16 - [<foo>@@bar</foo>]
+    MarkupBlock - [0..16)::16
+        MarkupElement - [0..16)::16
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupEphemeralTextLiteral - [5..6)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+            MarkupTextLiteral - [6..10)::4 - [@bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Transition;[@];
+                Text;[bar];
+            MarkupEndTag - [10..16)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt
new file mode 100644
index 0000000000..a25c9be457
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Markup block at (2:0,2 [20] )
+MetaCode span at (3:0,3 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [20] )
+Markup span at (4:0,4 [8] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [20] )
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [4] )
+Code span at (13:0,13 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [4] )
+Markup span at (16:0,16 [6] ) (Accepts:None) - Parent: Markup block at (2:0,2 [20] )
+Code span at (22:1,0 [4] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:1,4 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:1,5 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt
new file mode 100644
index 0000000000..20c3e121d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..27)::27 - [@{@:<li>Foo @Bar BazLFbork}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..22)::20
+                            MarkupTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [4..12)::8 - [<li>Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[li];
+                                CloseAngle;[>];
+                                Text;[Foo];
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [12..16)::4
+                                CSharpImplicitExpression - [12..16)::4
+                                    CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [13..16)::3
+                                        CSharpCodeBlock - [13..16)::3
+                                            CSharpExpressionLiteral - [13..16)::3 - [Bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[Bar];
+                            MarkupTextLiteral - [16..22)::6 - [ BazLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Text;[Baz];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [22..26)::4 - [bork] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[bork];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
new file mode 100644
index 0000000000..27a97571b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
@@ -0,0 +1,19 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [36] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [36] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [36] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [5] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [4] )
+Code span at (25:0,25 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [4] )
+Markup span at (28:0,28 [6] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [6] )
+Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
+MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (36:0,36 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
new file mode 100644
index 0000000000..e490f7e131
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..36)::36 - [@section Foo { <foo>@@@@@bar</foo> }]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            RazorDirective - [0..36)::36 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..36)::35
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..36)::28
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..35)::21
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [15..34)::19
+                                MarkupStartTag - [15..20)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupEphemeralTextLiteral - [20..21)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupTextLiteral - [21..22)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupEphemeralTextLiteral - [22..23)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupTextLiteral - [23..24)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                CSharpCodeBlock - [24..28)::4
+                                    CSharpImplicitExpression - [24..28)::4
+                                        CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [25..28)::3
+                                            CSharpCodeBlock - [25..28)::3
+                                                CSharpExpressionLiteral - [25..28)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                    Identifier;[bar];
+                                MarkupEndTag - [28..34)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt
new file mode 100644
index 0000000000..f966801338
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt
@@ -0,0 +1,15 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+None span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
+Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [5] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
+Markup span at (21:0,21 [4] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
+Markup span at (25:0,25 [6] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [6] )
+Markup span at (31:0,31 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt
new file mode 100644
index 0000000000..eb51d6aa1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..33)::33 - [@section Foo { <foo>@@bar</foo> }]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..33)::25
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..32)::18
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [15..31)::16
+                                MarkupStartTag - [15..20)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupEphemeralTextLiteral - [20..21)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupTextLiteral - [21..25)::4 - [@bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                    Text;[bar];
+                                MarkupEndTag - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
new file mode 100644
index 0000000000..3529ce293f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
@@ -0,0 +1,31 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [130] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [130] )
+Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [130] )
+Transition span at (2:0,2 [1] ) (Accepts:None) - Parent: Directive block at (2:0,2 [127] )
+MetaCode span at (3:0,3 [7] ) (Accepts:None) - Parent: Directive block at (2:0,2 [127] )
+Code span at (10:0,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (2:0,2 [127] )
+Code span at (11:0,11 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (2:0,2 [127] )
+None span at (14:0,14 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:0,2 [127] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (2:0,2 [127] )
+Markup span at (16:0,16 [6] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [112] )
+Markup span at (22:1,4 [4] ) (Accepts:Any) - Parent: Tag block at (22:1,4 [4] )
+Markup span at (26:1,8 [2] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [112] )
+Code span at (28:2,0 [8] ) (Accepts:Any) - Parent: Statement block at (28:2,0 [89] )
+Transition span at (36:2,8 [1] ) (Accepts:None) - Parent: Statement block at (28:2,0 [89] )
+Code span at (37:2,9 [30] ) (Accepts:Any) - Parent: Statement block at (28:2,0 [89] )
+Markup span at (67:3,0 [12] ) (Accepts:Any) - Parent: Markup block at (67:3,0 [39] )
+Markup span at (79:3,12 [4] ) (Accepts:None) - Parent: Tag block at (79:3,12 [4] )
+Markup span at (83:3,16 [9] ) (Accepts:Any) - Parent: Markup block at (67:3,0 [39] )
+Transition span at (92:3,25 [1] ) (Accepts:None) - Parent: Expression block at (92:3,25 [7] )
+Code span at (93:3,26 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (92:3,25 [7] )
+Markup span at (99:3,32 [5] ) (Accepts:None) - Parent: Tag block at (99:3,32 [5] )
+Markup span at (104:3,37 [2] ) (Accepts:None) - Parent: Markup block at (67:3,0 [39] )
+Code span at (106:4,0 [11] ) (Accepts:None) - Parent: Statement block at (28:2,0 [89] )
+Markup span at (117:5,0 [4] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [112] )
+Markup span at (121:5,4 [5] ) (Accepts:Any) - Parent: Tag block at (121:5,4 [5] )
+Markup span at (126:5,9 [2] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [112] )
+MetaCode span at (128:6,0 [1] ) (Accepts:None) - Parent: Directive block at (2:0,2 [127] )
+Code span at (129:6,1 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [130] )
+MetaCode span at (129:6,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [130] )
+Markup span at (130:6,2 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
new file mode 100644
index 0000000000..3f3c933778
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.stree.txt
@@ -0,0 +1,109 @@
+RazorDocument - [0..130)::130 - [@{@section foo {LF    <ul>LF        @foreach(var p in Products) {LF            <li>Product: @p.Name</li>LF        }LF    </ul>LF}}]
+    MarkupBlock - [0..130)::130
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..130)::130
+            CSharpStatement - [0..130)::130
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..130)::129
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..129)::127
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..129)::127
+                            RazorDirective - [2..129)::127 - Directive:{section;RazorBlock;Unrestricted} [RZ2005(3:0,3 [7] )]
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                RazorDirectiveBody - [3..129)::126
+                                    RazorMetaCode - [3..10)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Identifier;[section];
+                                    CSharpCodeBlock - [10..129)::119
+                                        CSharpStatementLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                            Whitespace;[ ];
+                                        CSharpStatementLiteral - [11..14)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                                            Identifier;[foo];
+                                        UnclassifiedTextLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                                            Whitespace;[ ];
+                                        RazorMetaCode - [15..16)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                                            LeftBrace;[{];
+                                        MarkupBlock - [16..128)::112
+                                            MarkupTextLiteral - [16..22)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                NewLine;[LF];
+                                                Whitespace;[    ];
+                                            MarkupElement - [22..126)::104
+                                                MarkupStartTag - [22..26)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    OpenAngle;[<];
+                                                    Text;[ul];
+                                                    CloseAngle;[>];
+                                                MarkupTextLiteral - [26..28)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    NewLine;[LF];
+                                                CSharpCodeBlock - [28..117)::89
+                                                    CSharpStatementLiteral - [28..36)::8 - [        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                                        Whitespace;[        ];
+                                                    CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpStatementLiteral - [37..67)::30 - [foreach(var p in Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                                        Keyword;[foreach];
+                                                        LeftParenthesis;[(];
+                                                        Identifier;[var];
+                                                        Whitespace;[ ];
+                                                        Identifier;[p];
+                                                        Whitespace;[ ];
+                                                        Keyword;[in];
+                                                        Whitespace;[ ];
+                                                        Identifier;[Products];
+                                                        RightParenthesis;[)];
+                                                        Whitespace;[ ];
+                                                        LeftBrace;[{];
+                                                        NewLine;[LF];
+                                                    MarkupBlock - [67..106)::39
+                                                        MarkupTextLiteral - [67..79)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                            Whitespace;[            ];
+                                                        MarkupElement - [79..104)::25
+                                                            MarkupStartTag - [79..83)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                                OpenAngle;[<];
+                                                                Text;[li];
+                                                                CloseAngle;[>];
+                                                            MarkupTextLiteral - [83..92)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                                Text;[Product:];
+                                                                Whitespace;[ ];
+                                                            CSharpCodeBlock - [92..99)::7
+                                                                CSharpImplicitExpression - [92..99)::7
+                                                                    CSharpTransition - [92..93)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                        Transition;[@];
+                                                                    CSharpImplicitExpressionBody - [93..99)::6
+                                                                        CSharpCodeBlock - [93..99)::6
+                                                                            CSharpExpressionLiteral - [93..99)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                                                Identifier;[p];
+                                                                                Dot;[.];
+                                                                                Identifier;[Name];
+                                                            MarkupEndTag - [99..104)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                                OpenAngle;[<];
+                                                                ForwardSlash;[/];
+                                                                Text;[li];
+                                                                CloseAngle;[>];
+                                                        MarkupTextLiteral - [104..106)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                            NewLine;[LF];
+                                                    CSharpStatementLiteral - [106..117)::11 - [        }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                                        Whitespace;[        ];
+                                                        RightBrace;[}];
+                                                        NewLine;[LF];
+                                                MarkupTextLiteral - [117..121)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[    ];
+                                                MarkupEndTag - [121..126)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    OpenAngle;[<];
+                                                    ForwardSlash;[/];
+                                                    Text;[ul];
+                                                    CloseAngle;[>];
+                                            MarkupTextLiteral - [126..128)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                NewLine;[LF];
+                                        RazorMetaCode - [128..129)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            RightBrace;[}];
+                        CSharpStatementLiteral - [129..129)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [129..130)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [130..130)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt
new file mode 100644
index 0000000000..371d673f22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [14] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [36] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [4] )
+Code span at (22:0,22 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [4] )
+Markup span at (25:0,25 [7] ) (Accepts:None) - Parent: Markup block at (2:0,2 [36] )
+Markup span at (32:0,32 [6] ) (Accepts:None) - Parent: Tag block at (32:0,32 [6] )
+Code span at (38:0,38 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [39] )
+MetaCode span at (38:0,38 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [39] )
+Markup span at (39:0,39 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt
new file mode 100644
index 0000000000..4a63f88741
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..39)::39 - [@{<foo><![CDATA[ foo @bar baz]]></foo>}]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..39)::39
+            CSharpStatement - [0..39)::39
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..39)::38
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..38)::36
+                        MarkupBlock - [2..38)::36
+                            MarkupElement - [2..38)::36
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..21)::14 - [<![CDATA[ foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    LeftBracket;[[];
+                                    Text;[CDATA];
+                                    LeftBracket;[[];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [21..25)::4
+                                    CSharpImplicitExpression - [21..25)::4
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..25)::3
+                                            CSharpCodeBlock - [22..25)::3
+                                                CSharpExpressionLiteral - [22..25)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[bar];
+                                MarkupTextLiteral - [25..32)::7 - [ baz]]>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    RightBracket;[]];
+                                    RightBracket;[]];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [32..38)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [38..38)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [39..39)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt
new file mode 100644
index 0000000000..d8bbd6e465
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [4] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [13] )
+Markup span at (11:0,11 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (7:0,7 [13] )
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [4] )
+Code span at (13:0,13 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [4] )
+Markup span at (16:0,16 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (7:0,7 [13] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [13] )
+Markup span at (20:0,20 [6] ) (Accepts:None) - Parent: Tag block at (20:0,20 [6] )
+Code span at (26:0,26 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt
new file mode 100644
index 0000000000..ae10fe3b1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..27)::27 - [@{<foo><!-- @foo --></foo>}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..26)::24
+                            MarkupElement - [2..26)::24
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupCommentBlock - [7..20)::13
+                                    MarkupTextLiteral - [7..11)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        DoubleHyphen;[--];
+                                    MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                        Whitespace;[ ];
+                                    CSharpCodeBlock - [12..16)::4
+                                        CSharpImplicitExpression - [12..16)::4
+                                            CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [13..16)::3
+                                                CSharpCodeBlock - [13..16)::3
+                                                    CSharpExpressionLiteral - [13..16)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[foo];
+                                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [17..20)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        DoubleHyphen;[--];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [20..26)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt
new file mode 100644
index 0000000000..154020ea7c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [14] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [34] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [4] )
+Code span at (22:0,22 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [4] )
+Markup span at (25:0,25 [5] ) (Accepts:None) - Parent: Markup block at (2:0,2 [34] )
+Markup span at (30:0,30 [6] ) (Accepts:None) - Parent: Tag block at (30:0,30 [6] )
+Code span at (36:0,36 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [37] )
+MetaCode span at (36:0,36 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [37] )
+Markup span at (37:0,37 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt
new file mode 100644
index 0000000000..72803b9925
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..37)::37 - [@{<foo><!DOCTYPE foo @bar baz></foo>}]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..37)::37
+            CSharpStatement - [0..37)::37
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..37)::36
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..36)::34
+                        MarkupBlock - [2..36)::34
+                            MarkupElement - [2..36)::34
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..21)::14 - [<!DOCTYPE foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[DOCTYPE];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [21..25)::4
+                                    CSharpImplicitExpression - [21..25)::4
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..25)::3
+                                            CSharpCodeBlock - [22..25)::3
+                                                CSharpExpressionLiteral - [22..25)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[bar];
+                                MarkupTextLiteral - [25..30)::5 - [ baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [36..36)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [37..37)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt
new file mode 100644
index 0000000000..a1e6d33dba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [10] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [31] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Expression block at (17:0,17 [4] )
+Code span at (18:0,18 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (17:0,17 [4] )
+Markup span at (21:0,21 [6] ) (Accepts:None) - Parent: Markup block at (2:0,2 [31] )
+Markup span at (27:0,27 [6] ) (Accepts:None) - Parent: Tag block at (27:0,27 [6] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt
new file mode 100644
index 0000000000..9a734b0002
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..34)::34 - [@{<foo><?xml foo @bar baz?></foo>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..17)::10 - [<?xml foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    QuestionMark;[?];
+                                    Text;[xml];
+                                    Whitespace;[ ];
+                                    Text;[foo];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [17..21)::4
+                                    CSharpImplicitExpression - [17..21)::4
+                                        CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [18..21)::3
+                                            CSharpCodeBlock - [18..21)::3
+                                                CSharpExpressionLiteral - [18..21)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[bar];
+                                MarkupTextLiteral - [21..27)::6 - [ baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Whitespace;[ ];
+                                    Text;[baz];
+                                    QuestionMark;[?];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [27..33)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt
new file mode 100644
index 0000000000..90f540af15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [11] )
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [4] )
+Code span at (13:0,13 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [4] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [11] )
+Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [18] )
+Code span at (20:0,20 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
new file mode 100644
index 0000000000..13dac52374
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..21)::21 - [@{<foo bar="@baz" />}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..20)::18 - [<foo bar="@baz" />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    MarkupAttributeBlock - [6..17)::11 - [ bar="@baz"]
+                                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bar];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [12..16)::4
+                                            MarkupDynamicAttributeValue - [12..16)::4 - [@baz]
+                                                GenericBlock - [12..16)::4
+                                                    CSharpCodeBlock - [12..16)::4
+                                                        CSharpImplicitExpression - [12..16)::4
+                                                            CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [13..16)::3
+                                                                CSharpCodeBlock - [13..16)::3
+                                                                    CSharpExpressionLiteral - [13..16)::3 - [baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[baz];
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMiscAttributeContent - [17..18)::1
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [20..20)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt
new file mode 100644
index 0000000000..5cd3fa4a4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [0] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [30] )
+Transition span at (7:0,7 [1] ) (Accepts:None) - Parent: Expression block at (7:0,7 [4] )
+Code span at (8:0,8 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:0,7 [4] )
+Markup span at (11:0,11 [5] ) (Accepts:None) - Parent: Tag block at (11:0,11 [5] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [30] )
+Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [4] )
+Code span at (17:0,17 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [4] )
+Markup span at (20:0,20 [6] ) (Accepts:None) - Parent: Tag block at (20:0,20 [6] )
+Markup span at (26:0,26 [6] ) (Accepts:None) - Parent: Tag block at (26:0,26 [6] )
+Code span at (32:0,32 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt
new file mode 100644
index 0000000000..2b06ed1e3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..33)::33 - [@{<foo>@bar<baz>@boz</baz></foo>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupElement - [2..32)::30
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [7..7)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Marker;[];
+                                CSharpCodeBlock - [7..11)::4
+                                    CSharpImplicitExpression - [7..11)::4
+                                        CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [8..11)::3
+                                            CSharpCodeBlock - [8..11)::3
+                                                CSharpExpressionLiteral - [8..11)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[bar];
+                                MarkupElement - [11..26)::15
+                                    MarkupStartTag - [11..16)::5 - [<baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[baz];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Marker;[];
+                                    CSharpCodeBlock - [16..20)::4
+                                        CSharpImplicitExpression - [16..20)::4
+                                            CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [17..20)::3
+                                                CSharpCodeBlock - [17..20)::3
+                                                    CSharpExpressionLiteral - [17..20)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[boz];
+                                    MarkupEndTag - [20..26)::6 - [</baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[baz];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [26..32)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt
new file mode 100644
index 0000000000..d760958c1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Markup span at (2:0,2 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [12] )
+Transition span at (7:0,7 [1] ) (Accepts:None) - Parent: Expression block at (7:0,7 [4] )
+Code span at (8:0,8 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:0,7 [4] )
+Markup span at (11:0,11 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [12] )
+Code span at (14:0,14 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [15] )
+MetaCode span at (14:0,14 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
new file mode 100644
index 0000000000..96573d5697
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..15)::15 - [@{<foo @bar />}]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpStatement - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..15)::14
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..14)::12
+                        MarkupBlock - [2..14)::12
+                            MarkupElement - [2..14)::12
+                                MarkupStartTag - [2..14)::12 - [<foo @bar />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    MarkupMiscAttributeContent - [6..12)::6
+                                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        CSharpCodeBlock - [7..11)::4
+                                            CSharpImplicitExpression - [7..11)::4
+                                                CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [8..11)::3
+                                                    CSharpCodeBlock - [8..11)::3
+                                                        CSharpExpressionLiteral - [8..11)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Identifier;[bar];
+                                        MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [14..14)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt
new file mode 100644
index 0000000000..3286136c58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (2:0,2 [3] ) (Accepts:None) - Parent: Tag block at (2:0,2 [3] )
+Markup span at (5:0,5 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [13] )
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [2] )
+Code span at (10:0,10 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [2] )
+Markup span at (11:0,11 [4] ) (Accepts:None) - Parent: Tag block at (11:0,11 [4] )
+Code span at (15:0,15 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt
new file mode 100644
index 0000000000..6f286f4bb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..16)::16 - [@{<p>foo#@i</p>}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..15)::13
+                            MarkupElement - [2..15)::13
+                                MarkupStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [5..9)::4 - [foo#] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo#];
+                                CSharpCodeBlock - [9..11)::2
+                                    CSharpImplicitExpression - [9..11)::2
+                                        CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [10..11)::1
+                                            CSharpCodeBlock - [10..11)::1
+                                                CSharpExpressionLiteral - [10..11)::1 - [i] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[i];
+                                MarkupEndTag - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [15..15)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
new file mode 100644
index 0000000000..5a030d3cd8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (9:0,9 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [19] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [4] )
+Code span at (12:0,12 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [4] )
+Markup span at (15:0,15 [6] ) (Accepts:None) - Parent: Tag block at (15:0,15 [6] )
+Code span at (21:0,21 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (21:0,21 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt
new file mode 100644
index 0000000000..e90372344a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..22)::22 - [@{<foo>@@@@@bar</foo>}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..21)::19
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupEphemeralTextLiteral - [7..8)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupTextLiteral - [8..9)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupEphemeralTextLiteral - [9..10)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupTextLiteral - [10..11)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                CSharpCodeBlock - [11..15)::4
+                                    CSharpImplicitExpression - [11..15)::4
+                                        CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [12..15)::3
+                                            CSharpCodeBlock - [12..15)::3
+                                                CSharpExpressionLiteral - [12..15)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[bar];
+                                MarkupEndTag - [15..21)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.cspans.txt
new file mode 100644
index 0000000000..5f80e5cc3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (7:0,7 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [16] )
+Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [16] )
+Markup span at (12:0,12 [6] ) (Accepts:None) - Parent: Tag block at (12:0,12 [6] )
+Code span at (18:0,18 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (18:0,18 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt
new file mode 100644
index 0000000000..a71a04cfef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..19)::19 - [@{<foo>@@bar</foo>}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupElement - [2..18)::16
+                                MarkupStartTag - [2..7)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                                MarkupEphemeralTextLiteral - [7..8)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                MarkupTextLiteral - [8..12)::4 - [@bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Transition;[@];
+                                    Text;[bar];
+                                MarkupEndTag - [12..18)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..18)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.cspans.txt
new file mode 100644
index 0000000000..d9ab213c73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (2:1,0 [7] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [7] )
+Markup span at (9:1,7 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (12:1,10 [8] ) (Accepts:Any) - Parent: Tag block at (12:1,10 [8] )
+Markup span at (20:1,18 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.stree.txt
new file mode 100644
index 0000000000..62169fa2ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_DoesNotSpecialCase_VoidTags.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [LF<input>Foo</input>LF]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..20)::18
+            MarkupStartTag - [2..9)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+            MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [12..20)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..22)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.cspans.txt
new file mode 100644
index 0000000000..017a6ad437
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Markup span at (5:1,3 [6] ) (Accepts:Any) - Parent: Tag block at (5:1,3 [6] )
+Markup span at (11:1,9 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.stree.txt
new file mode 100644
index 0000000000..1f16c2f83b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_EndTagsWithMissingStartTags.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..13)::13 - [LFFoo</div>LF]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..5)::5 - [LFFoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Text;[Foo];
+        MarkupElement - [5..11)::6
+            MarkupEndTag - [5..11)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.cspans.txt
new file mode 100644
index 0000000000..245badb59b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (2:1,0 [1] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [1] )
+Markup span at (3:1,1 [5] ) (Accepts:Any) - Parent: Tag block at (3:1,1 [5] )
+Markup span at (8:1,6 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (12:1,10 [2] ) (Accepts:Any) - Parent: Tag block at (12:1,10 [2] )
+Markup span at (14:1,12 [6] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [6] )
+Markup span at (20:1,18 [5] ) (Accepts:Any) - Parent: Tag block at (20:1,18 [5] )
+Markup span at (25:1,23 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.stree.txt
new file mode 100644
index 0000000000..3d6e74006f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_IncompleteTags.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..27)::27 - [LF<<div>>Foo</</div><   >LF]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..3)::1
+            MarkupStartTag - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [3..20)::17
+            MarkupStartTag - [3..8)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..12)::4 - [>Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+                Text;[Foo];
+            MarkupElement - [12..14)::2
+                MarkupEndTag - [12..14)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupEndTag - [14..20)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupElement - [20..27)::7
+            MarkupStartTag - [20..25)::5 - [<   >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                MarkupMiscAttributeContent - [21..24)::3
+                    MarkupTextLiteral - [21..24)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[   ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [25..27)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.cspans.txt
new file mode 100644
index 0000000000..616773a7c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Markup span at (14:1,12 [7] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [7] )
+Markup span at (21:1,19 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Markup span at (27:1,25 [6] ) (Accepts:Any) - Parent: Tag block at (27:1,25 [6] )
+Markup span at (33:1,31 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.stree.txt
new file mode 100644
index 0000000000..156d6a1813
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MalformedTags_RecoversSuccessfully.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..35)::35 - [LF<div>content</span>footer</div>LF]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..33)::31
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..14)::7 - [content] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[content];
+            MarkupElement - [14..21)::7
+                MarkupEndTag - [14..21)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[span];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [21..27)::6 - [footer] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[footer];
+            MarkupEndTag - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.cspans.txt
new file mode 100644
index 0000000000..d19254baf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Markup span at (14:1,12 [6] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [6] )
+Markup span at (20:1,18 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Markup span at (26:1,24 [6] ) (Accepts:Any) - Parent: Tag block at (26:1,24 [6] )
+Markup span at (32:1,30 [7] ) (Accepts:Any) - Parent: Tag block at (32:1,30 [7] )
+Markup span at (39:1,37 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.stree.txt
new file mode 100644
index 0000000000..b85048c9f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_MisplacedEndTags_RecoversSuccessfully.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..41)::41 - [LF<div>content<span>footer</div></span>LF]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..32)::30
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..14)::7 - [content] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[content];
+            MarkupElement - [14..26)::12
+                MarkupStartTag - [14..20)::6 - [<span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[span];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [20..26)::6 - [footer] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[footer];
+            MarkupEndTag - [26..32)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupElement - [32..39)::7
+            MarkupEndTag - [32..39)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
+        MarkupTextLiteral - [39..41)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.cspans.txt
new file mode 100644
index 0000000000..68917ae59c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (10:1,8 [10] ) (Accepts:Any) - Parent: Tag block at (10:1,8 [10] )
+Markup span at (20:1,18 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.stree.txt
new file mode 100644
index 0000000000..06c963307c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SelfClosingTags.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..22)::22 - [LF<br/>Foo<custom />LF]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..7)::5
+            MarkupStartTag - [2..7)::5 - [<br/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[br];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [7..10)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupElement - [10..20)::10
+            MarkupStartTag - [10..20)::10 - [<custom />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[custom];
+                MarkupMiscAttributeContent - [17..18)::1
+                    MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..22)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.cspans.txt
new file mode 100644
index 0000000000..621dae62c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (2:1,0 [6] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [6] )
+Markup span at (8:1,6 [6] ) (Accepts:Any) - Parent: Tag block at (8:1,6 [6] )
+Markup span at (14:1,12 [1] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [7] )
+MetaCode span at (15:1,13 [1] ) (Accepts:None) - Parent: Tag block at (14:1,12 [7] )
+Markup span at (16:1,14 [5] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [7] )
+Markup span at (21:1,19 [7] ) (Accepts:Any) - Parent: Tag block at (21:1,19 [7] )
+Markup span at (28:1,26 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.stree.txt
new file mode 100644
index 0000000000..2aa331e165
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_SpecialCasesVoidTags_WithNoEndTags.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..30)::30 - [LF<head><meta><!meta></head>LF]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..28)::26
+            MarkupStartTag - [2..8)::6 - [<head>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[head];
+                CloseAngle;[>];
+            MarkupElement - [8..14)::6
+                MarkupStartTag - [8..14)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[meta];
+                    CloseAngle;[>];
+            MarkupElement - [14..21)::7
+                MarkupStartTag - [14..21)::7 - [<!meta>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Bang;[!];
+                    Text;[meta];
+                    CloseAngle;[>];
+            MarkupEndTag - [21..28)::7 - [</head>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[head];
+                CloseAngle;[>];
+        MarkupTextLiteral - [28..30)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.cspans.txt
new file mode 100644
index 0000000000..23600f15fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [15] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Markup span at (22:3,4 [3] ) (Accepts:Any) - Parent: Tag block at (22:3,4 [3] )
+Markup span at (25:3,7 [23] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Markup span at (48:5,8 [9] ) (Accepts:Any) - Parent: Tag block at (48:5,8 [9] )
+Markup span at (57:5,17 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.stree.txt
new file mode 100644
index 0000000000..e71d6cf18d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_StartTagsWithMissingEndTags.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..59)::59 - [LF<div>LF    FooLF    <p>LF        BarLF        </strong>LF]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..59)::57
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..22)::15 - [LF    FooLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Foo];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [22..59)::37
+                MarkupStartTag - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [25..48)::23 - [LF        BarLF        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                    Text;[Bar];
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                MarkupElement - [48..57)::9
+                    MarkupEndTag - [48..57)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [57..59)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.cspans.txt
new file mode 100644
index 0000000000..63be5f5b10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [15] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (22:3,4 [3] ) (Accepts:Any) - Parent: Tag block at (22:3,4 [3] )
+Markup span at (25:3,7 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (28:3,10 [4] ) (Accepts:Any) - Parent: Tag block at (28:3,10 [4] )
+Markup span at (32:3,14 [11] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (43:5,0 [6] ) (Accepts:Any) - Parent: Tag block at (43:5,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.stree.txt
new file mode 100644
index 0000000000..f25fd6b548
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTags.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..49)::49 - [LF<div>LF    FooLF    <p>Bar</p>LF    BazLF</div>]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..49)::47
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..22)::15 - [LF    FooLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Foo];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [22..32)::10
+                MarkupStartTag - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [25..28)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Bar];
+                MarkupEndTag - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [32..43)::11 - [LF    BazLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Baz];
+                NewLine;[LF];
+            MarkupEndTag - [43..49)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.cspans.txt
new file mode 100644
index 0000000000..27e228bccf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [15] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Markup span at (22:3,4 [3] ) (Accepts:Any) - Parent: Tag block at (22:3,4 [3] )
+Transition span at (25:3,7 [1] ) (Accepts:None) - Parent: Expression block at (25:3,7 [4] )
+Code span at (26:3,8 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:3,7 [4] )
+Markup span at (29:3,11 [4] ) (Accepts:Any) - Parent: Tag block at (29:3,11 [4] )
+Markup span at (33:3,15 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Code span at (35:4,0 [4] ) (Accepts:Any) - Parent: Statement block at (35:4,0 [21] )
+Transition span at (39:4,4 [1] ) (Accepts:None) - Parent: Statement block at (39:4,4 [17] )
+MetaCode span at (40:4,5 [1] ) (Accepts:None) - Parent: Statement block at (39:4,4 [17] )
+Code span at (41:4,6 [14] ) (Accepts:Any) - Parent: Statement block at (39:4,4 [17] )
+MetaCode span at (55:4,20 [1] ) (Accepts:None) - Parent: Statement block at (39:4,4 [17] )
+Markup span at (56:4,21 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Markup span at (58:5,0 [6] ) (Accepts:Any) - Parent: Tag block at (58:5,0 [6] )
+Markup span at (64:5,6 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.stree.txt
new file mode 100644
index 0000000000..94de02b7b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidNestedTagsMixedWithCode.stree.txt
@@ -0,0 +1,67 @@
+RazorDocument - [0..66)::66 - [LF<div>LF    FooLF    <p>@Bar</p>LF    @{ var x = Bar; }LF</div>LF]
+    MarkupBlock - [0..66)::66
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..64)::62
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..22)::15 - [LF    FooLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Foo];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [22..33)::11
+                MarkupStartTag - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                CSharpCodeBlock - [25..29)::4
+                    CSharpImplicitExpression - [25..29)::4
+                        CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [26..29)::3
+                            CSharpCodeBlock - [26..29)::3
+                                CSharpExpressionLiteral - [26..29)::3 - [Bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[Bar];
+                MarkupEndTag - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            CSharpCodeBlock - [35..56)::21
+                CSharpStatementLiteral - [35..39)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                CSharpStatement - [39..56)::17
+                    CSharpTransition - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpStatementBody - [40..56)::16
+                        RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [41..55)::14
+                            CSharpStatementLiteral - [41..55)::14 - [ var x = Bar; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                Whitespace;[ ];
+                                Identifier;[var];
+                                Whitespace;[ ];
+                                Identifier;[x];
+                                Whitespace;[ ];
+                                Assign;[=];
+                                Whitespace;[ ];
+                                Identifier;[Bar];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                        RazorMetaCode - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+            MarkupEphemeralTextLiteral - [56..58)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [58..64)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [64..66)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.cspans.txt
new file mode 100644
index 0000000000..cbaaaf3772
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (10:1,8 [6] ) (Accepts:Any) - Parent: Tag block at (10:1,8 [6] )
+Markup span at (16:1,14 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (18:2,0 [3] ) (Accepts:Any) - Parent: Tag block at (18:2,0 [3] )
+Markup span at (21:2,3 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (24:2,6 [4] ) (Accepts:Any) - Parent: Tag block at (24:2,6 [4] )
+Markup span at (28:2,10 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.stree.txt
new file mode 100644
index 0000000000..c38db1f3cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/MarkupElementGroupingTest/Handles_ValidTags.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..30)::30 - [LF<div>Foo</div>LF<p>Bar</p>LF]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..16)::14
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..10)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [10..16)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [18..28)::10
+            MarkupStartTag - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [21..24)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Bar];
+            MarkupEndTag - [24..28)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [28..30)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
new file mode 100644
index 0000000000..90b83a758f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+Code span at (14:0,14 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (18:0,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..415af2bb31
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..18)::18 - [@addTagHelper Foo"]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            RazorDirective - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..18)::17
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..18)::5
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..18)::4 - [Foo"] - Gen<AddTagHelper:{Foo";Foo";;} [RZ1000(17:0,17 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            StringLiteral;["];RZ1000(17:0,17 [1] )
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
new file mode 100644
index 0000000000..bb83fe7c4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (14:0,14 [3] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..32eaa73ae7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@addTagHelper Foo]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..17)::4
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..17)::3 - [Foo] - Gen<AddTagHelper:{Foo;Foo;;} [RZ1036(14:0,14 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
new file mode 100644
index 0000000000..25806343ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Code span at (14:0,14 [2] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
new file mode 100644
index 0000000000..95e2ab911c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..16)::16 - [@addTagHelper ""]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..16)::3
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..16)::2 - [""] - Gen<AddTagHelper:{"";;;} [RZ1036(15:0,15 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;[""];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
new file mode 100644
index 0000000000..61be581b1c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Code span at (14:0,14 [0] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
new file mode 100644
index 0000000000..660b83b424
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [@addTagHelper ]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            RazorDirective - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..14)::13
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..14)::1
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..14)::0 - [] - Gen<AddTagHelper:{;;;} [RZ1018(1:0,1 [13] ), RZ1036(14:0,14 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Marker;[];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
new file mode 100644
index 0000000000..4810545912
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Code span at (14:0,14 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
new file mode 100644
index 0000000000..e5a43eb13a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@addTagHelper '*, Foo']
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..22)::9
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..22)::8 - ['*, Foo'] - Gen<AddTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(14:0,14 [8] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            CharacterLiteral;['*, Foo'];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
new file mode 100644
index 0000000000..90b83a758f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
+Code span at (14:0,14 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (18:0,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..92b11e3ec3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..18)::18 - [@addTagHelper "Foo]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            RazorDirective - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..18)::17
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..18)::5
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..18)::4 - ["Foo] - Gen<AddTagHelper:{"Foo;"Foo;;} [RZ1000(14:0,14 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo];RZ1000(14:0,14 [1] )
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
new file mode 100644
index 0000000000..1a383325f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (13:0,13 [5] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Code span at (18:0,18 [14] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
new file mode 100644
index 0000000000..a1d2a4c464
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..32)::32 - [@addTagHelper     Foo,   Bar    ]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            RazorDirective - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..32)::31
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..32)::19
+                        MarkupTextLiteral - [13..18)::5 - [     ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[     ];
+                        CSharpStatementLiteral - [18..32)::14 - [Foo,   Bar    ] - Gen<AddTagHelper:{Foo,   Bar;Foo,   Bar;Foo;Bar}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            Comma;[,];
+                            Whitespace;[   ];
+                            Identifier;[Bar];
+                            Whitespace;[    ];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
new file mode 100644
index 0000000000..3b7dd42093
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Code span at (14:0,14 [5] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..45498ce535
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@addTagHelper "Foo"]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..19)::6
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..19)::5 - ["Foo"] - Gen<AddTagHelper:{"Foo";Foo;;} [RZ1036(15:0,15 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo"];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
new file mode 100644
index 0000000000..c6fee76354
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Code span at (2:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [24] )
+Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] )
+MetaCode span at (5:1,3 [12] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] )
+Markup span at (17:1,15 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] )
+Code span at (18:1,16 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (4:1,2 [22] )
+Markup span at (26:1,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
new file mode 100644
index 0000000000..8123d8117f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..26)::26 - [LF  @addTagHelper "*, Foo"]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..26)::24
+            CSharpEphemeralTextLiteral - [2..4)::2 - [  ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            RazorDirective - [4..26)::22
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [5..26)::21
+                    RazorMetaCode - [5..17)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [17..26)::9
+                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [18..26)::8 - ["*, Foo"] - Gen<AddTagHelper:{"*, Foo";*, Foo;*;Foo}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["*, Foo"];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
new file mode 100644
index 0000000000..8caeeee11d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [24] )
+MetaCode span at (4:0,4 [12] ) (Accepts:None) - Parent: Directive block at (3:0,3 [24] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [24] )
+Code span at (17:0,17 [10] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (3:0,3 [24] )
+Markup span at (27:1,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
new file mode 100644
index 0000000000..1e622480ba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..28)::28 - [{  @addTagHelper "*, Foo"LF}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..3)::3 - [{  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            Whitespace;[  ];
+        CSharpCodeBlock - [3..27)::24
+            RazorDirective - [3..27)::24
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [4..27)::23
+                    RazorMetaCode - [4..16)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [16..27)::11
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..27)::10 - ["*, Foo"LF] - Gen<AddTagHelper:{"*, Foo";*, Foo;*;Foo} [RZ2005(4:0,4 [12] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["*, Foo"];
+                            NewLine;[LF];
+        MarkupTextLiteral - [27..28)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
new file mode 100644
index 0000000000..c23d9ce5f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [176] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [176] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [176] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (15:0,15 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (16:0,16 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (25:0,25 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (26:0,26 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (47:0,47 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (48:0,48 [29] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (77:0,77 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (78:0,78 [31] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (109:0,109 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (110:0,110 [66] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Markup span at (176:0,176 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [176] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
new file mode 100644
index 0000000000..cfa73cde1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
@@ -0,0 +1,80 @@
+RazorDocument - [0..176)::176 - [@custom string? string?[] global::System.Int32? KeyValuePair<string, string>? KeyValuePair<string, string>?[] global::System.Collections.Generic.KeyValuePair<string, string>?[]]
+    MarkupBlock - [0..176)::176
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..176)::176
+            RazorDirective - [0..176)::176 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..176)::175
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..176)::169
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - [string?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [16..25)::9 - [string?[]] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                        CSharpStatementLiteral - [25..26)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [26..47)::21 - [global::System.Int32?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[global];
+                            DoubleColon;[::];
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Int32];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [47..48)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [48..77)::29 - [KeyValuePair<string, string>?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[KeyValuePair];
+                            LessThan;[<];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            GreaterThan;[>];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [77..78)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [78..109)::31 - [KeyValuePair<string, string>?[]] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[KeyValuePair];
+                            LessThan;[<];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            GreaterThan;[>];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                        CSharpStatementLiteral - [109..110)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [110..176)::66 - [global::System.Collections.Generic.KeyValuePair<string, string>?[]] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[global];
+                            DoubleColon;[::];
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Collections];
+                            Dot;[.];
+                            Identifier;[Generic];
+                            Dot;[.];
+                            Identifier;[KeyValuePair];
+                            LessThan;[<];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            GreaterThan;[>];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+        MarkupTextLiteral - [176..176)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
new file mode 100644
index 0000000000..f0a1ad489a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [246] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [246] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [246] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (8:0,8 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (19:0,19 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (20:0,20 [20] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (40:0,40 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (41:0,41 [29] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (70:0,70 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (71:0,71 [37] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (108:0,108 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (109:0,109 [36] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (145:0,145 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (146:0,146 [100] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Markup span at (246:0,246 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [246] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
new file mode 100644
index 0000000000..bd5ce0d7fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
@@ -0,0 +1,164 @@
+RazorDocument - [0..246)::246 - [@custom (bool, int) (int aa, string bb)? (  int?   q   ,  bool   w   ) ( int  ?  q, bool ?w ,(long ?  [])) ? (List<(int, string)?> aa, string bb) (string ss, (int u, List<(string, int)> k, (Char c, bool b, List<int> l)), global::System.Int32[] a)]
+    MarkupBlock - [0..246)::246
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..246)::246
+            RazorDirective - [0..246)::246 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..246)::245
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..246)::239
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..19)::11 - [(bool, int)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[bool];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            RightParenthesis;[)];
+                        CSharpStatementLiteral - [19..20)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [20..40)::20 - [(int aa, string bb)?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Whitespace;[ ];
+                            Identifier;[aa];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            Whitespace;[ ];
+                            Identifier;[bb];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [40..41)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [41..70)::29 - [(  int?   q   ,  bool   w   )] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Whitespace;[  ];
+                            Keyword;[int];
+                            QuestionMark;[?];
+                            Whitespace;[   ];
+                            Identifier;[q];
+                            Whitespace;[   ];
+                            Comma;[,];
+                            Whitespace;[  ];
+                            Keyword;[bool];
+                            Whitespace;[   ];
+                            Identifier;[w];
+                            Whitespace;[   ];
+                            RightParenthesis;[)];
+                        CSharpStatementLiteral - [70..71)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [71..108)::37 - [( int  ?  q, bool ?w ,(long ?  [])) ?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            Whitespace;[  ];
+                            QuestionMark;[?];
+                            Whitespace;[  ];
+                            Identifier;[q];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[bool];
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                            Identifier;[w];
+                            Whitespace;[ ];
+                            Comma;[,];
+                            LeftParenthesis;[(];
+                            Keyword;[long];
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                            Whitespace;[  ];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [108..109)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [109..145)::36 - [(List<(int, string)?> aa, string bb)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Identifier;[List];
+                            LessThan;[<];
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[aa];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            Whitespace;[ ];
+                            Identifier;[bb];
+                            RightParenthesis;[)];
+                        CSharpStatementLiteral - [145..146)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [146..246)::100 - [(string ss, (int u, List<(string, int)> k, (Char c, bool b, List<int> l)), global::System.Int32[] a)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[string];
+                            Whitespace;[ ];
+                            Identifier;[ss];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Whitespace;[ ];
+                            Identifier;[u];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[List];
+                            LessThan;[<];
+                            LeftParenthesis;[(];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            RightParenthesis;[)];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[k];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[Char];
+                            Whitespace;[ ];
+                            Identifier;[c];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[bool];
+                            Whitespace;[ ];
+                            Identifier;[b];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[List];
+                            LessThan;[<];
+                            Keyword;[int];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[l];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[global];
+                            DoubleColon;[::];
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Int32];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            Whitespace;[ ];
+                            Identifier;[a];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [246..246)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
new file mode 100644
index 0000000000..52a117679c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [23] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [23] )
+Code span at (8:0,8 [12] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [23] )
+None span at (20:0,20 [3] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
new file mode 100644
index 0000000000..10efce7060
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..23)::23 - [@custom (bool, int?)   ]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            RazorDirective - [0..23)::23 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..23)::22
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..23)::16
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..20)::12 - [(bool, int?)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[bool];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            QuestionMark;[?];
+                            RightParenthesis;[)];
+                        UnclassifiedTextLiteral - [20..23)::3 - [   ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[   ];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
new file mode 100644
index 0000000000..68dfa71c77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+Code span at (7:0,7 [4] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (11:0,11 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (45:0,45 [7] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (52:0,52 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [67] )
+None span at (63:0,63 [4] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Markup span at (67:0,67 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
new file mode 100644
index 0000000000..1008dcab02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..67)::67 - [@custom    System.Text.Encoding.ASCIIEncoding       Some_Member    ]
+    MarkupBlock - [0..67)::67
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..67)::67
+            RazorDirective - [0..67)::67 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..67)::66
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..67)::60
+                        CSharpStatementLiteral - [7..11)::4 - [    ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[    ];
+                        CSharpStatementLiteral - [11..45)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        CSharpStatementLiteral - [45..52)::7 - [       ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[       ];
+                        CSharpStatementLiteral - [52..63)::11 - [Some_Member] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Some_Member];
+                        UnclassifiedTextLiteral - [63..67)::4 - [    ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[    ];
+        MarkupTextLiteral - [67..67)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..a2ac1bb1a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..2e41bb2bbd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..15)::15 - [@custom System.]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..15)::7 - [System.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System.];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..0d19696aec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..246d5fc4e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..15)::15 - [@custom System<]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..14)::6 - [System] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System];
+        MarkupElement - [14..15)::1
+            MarkupStartTag - [14..15)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..1b4c670d6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..9d6f4a44f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..17)::17 - [@custom System.LF]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..17)::9 - [System.LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System.];
+            NewLine;[LF];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..7232de595e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..9b3894020f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..17)::17 - [@custom System<LF]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..14)::6 - [System] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System];
+        MarkupElement - [14..17)::3
+            MarkupStartTag - [14..17)::3 - [<LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                MarkupMiscAttributeContent - [15..17)::2
+                    MarkupTextLiteral - [15..17)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
new file mode 100644
index 0000000000..4d02aa2a12
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+None span at (15:0,15 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
new file mode 100644
index 0000000000..b06c7343c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..23)::23 - [@custom "hello" "world"]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{custom;SingleLine;Unrestricted} [RZ1017(16:0,16 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..16)::9
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["hello"];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [16..23)::7 - ["world"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            DoubleQuote;["];
+            Text;[world];
+            DoubleQuote;["];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
new file mode 100644
index 0000000000..59f2a44c20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [12] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
new file mode 100644
index 0000000000..ab35f9a32d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..20)::20 - [@custom -Some_Member]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1015(8:0,8 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..20)::12 - [-Some_Member] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[-Some_Member];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
new file mode 100644
index 0000000000..66d394bc52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
new file mode 100644
index 0000000000..5a51465112
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [@custom "Hello"]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            RazorDirective - [0..15)::15 - Directive:{custom;CodeBlock;Unrestricted} [RZ1012(15:0,15 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..15)::14
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..15)::8
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["Hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Hello"];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
new file mode 100644
index 0000000000..9e0b76b5d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+None span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [23] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
new file mode 100644
index 0000000000..344dee531b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..39)::39 - [@custom "Hello" World { foo(); bar(); }]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{custom;CodeBlock;Unrestricted} [RZ1017(16:0,16 [5] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..16)::9
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["Hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Hello"];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [16..39)::23 - [World { foo(); bar(); }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[World];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[foo();];
+            Whitespace;[ ];
+            Text;[bar();];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
new file mode 100644
index 0000000000..cf1f2e36d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+None span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (17:0,17 [0] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
new file mode 100644
index 0000000000..4938afb99f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [@custom "Hello" {]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{custom;CodeBlock;Unrestricted} [RZ1006(16:0,16 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..17)::10
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["Hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Hello"];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [17..17)::0
+                            CSharpStatementLiteral - [17..17)::0 - [] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Marker;[];
+                        RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
new file mode 100644
index 0000000000..5429ef434a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (42:0,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (44:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (44:1,0 [1] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
+MetaCode span at (45:1,1 [6] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
+Code span at (51:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (44:1,0 [41] )
+Code span at (52:1,8 [33] ) (Accepts:NonWhitespace) - Parent: Directive block at (44:1,0 [41] )
+Markup span at (85:1,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
new file mode 100644
index 0000000000..f9d3383434
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..85)::85 - [@custom System.Text.Encoding.ASCIIEncodingLF@custom System.Text.Encoding.UTF8Encoding]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{custom;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..44)::37
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [44..85)::41
+            RazorDirective - [44..85)::41 - Directive:{custom;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [45..85)::40
+                    RazorMetaCode - [45..51)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [51..85)::34
+                        CSharpStatementLiteral - [51..52)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [52..85)::33 - [System.Text.Encoding.UTF8Encoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[UTF8Encoding];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
new file mode 100644
index 0000000000..5429ef434a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (42:0,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (44:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (44:1,0 [1] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
+MetaCode span at (45:1,1 [6] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
+Code span at (51:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (44:1,0 [41] )
+Code span at (52:1,8 [33] ) (Accepts:NonWhitespace) - Parent: Directive block at (44:1,0 [41] )
+Markup span at (85:1,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
new file mode 100644
index 0000000000..551e79b27c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..85)::85 - [@custom System.Text.Encoding.ASCIIEncodingLF@custom System.Text.Encoding.UTF8Encoding]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{custom;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..44)::37
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [44..85)::41
+            RazorDirective - [44..85)::41 - Directive:{custom;SingleLine;FileScopedSinglyOccurring} [RZ2001(44:1,0 [7] )]
+                CSharpTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [45..85)::40
+                    RazorMetaCode - [45..51)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [51..85)::34
+                        CSharpStatementLiteral - [51..52)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [52..85)::33 - [System.Text.Encoding.UTF8Encoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[UTF8Encoding];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
new file mode 100644
index 0000000000..715c97f1c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (42:0,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (44:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Transition span at (44:1,0 [1] ) (Accepts:None) - Parent: Directive block at (44:1,0 [15] )
+MetaCode span at (45:1,1 [9] ) (Accepts:None) - Parent: Directive block at (44:1,0 [15] )
+Code span at (54:1,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (44:1,0 [15] )
+Code span at (55:1,11 [4] ) (Accepts:NonWhitespace) - Parent: Directive block at (44:1,0 [15] )
+Markup span at (59:1,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
new file mode 100644
index 0000000000..e0591c053d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..59)::59 - [@custom System.Text.Encoding.ASCIIEncodingLF@something Else]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{custom;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..44)::37
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [44..59)::15
+            RazorDirective - [44..59)::15 - Directive:{something;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [45..59)::14
+                    RazorMetaCode - [45..54)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[something];
+                    CSharpCodeBlock - [54..59)::5
+                        CSharpStatementLiteral - [54..55)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [55..59)::4 - [Else] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Else];
+        MarkupTextLiteral - [59..59)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
new file mode 100644
index 0000000000..b65e57e7d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
@@ -0,0 +1,22 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [43] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [43] )
+Comment span at (2:0,2 [39] ) (Accepts:Any) - Parent: Comment block at (0:0,0 [43] )
+MetaCode span at (41:0,41 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [43] )
+Transition span at (42:0,42 [1] ) (Accepts:None) - Parent: Comment block at (0:0,0 [43] )
+Markup span at (43:0,43 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
+Transition span at (45:1,0 [1] ) (Accepts:None) - Parent: Directive block at (45:1,0 [44] )
+MetaCode span at (46:1,1 [6] ) (Accepts:None) - Parent: Directive block at (45:1,0 [44] )
+Code span at (52:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (45:1,0 [44] )
+Code span at (53:1,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (45:1,0 [44] )
+Markup span at (87:1,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (45:1,0 [44] )
+Markup span at (89:2,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
+Transition span at (91:3,0 [1] ) (Accepts:None) - Parent: Directive block at (91:3,0 [17] )
+MetaCode span at (92:3,1 [9] ) (Accepts:None) - Parent: Directive block at (91:3,0 [17] )
+Code span at (101:3,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (91:3,0 [17] )
+Code span at (102:3,11 [4] ) (Accepts:NonWhitespace) - Parent: Directive block at (91:3,0 [17] )
+Markup span at (106:3,15 [2] ) (Accepts:Whitespace) - Parent: Directive block at (91:3,0 [17] )
+Markup span at (108:4,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
+Markup span at (110:5,0 [3] ) (Accepts:Any) - Parent: Tag block at (110:5,0 [3] )
+Markup span at (113:5,3 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
+Markup span at (126:5,16 [4] ) (Accepts:Any) - Parent: Tag block at (126:5,16 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
new file mode 100644
index 0000000000..22f831367b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..130)::130 - [@* There are two directives beneath this *@LF@custom System.Text.Encoding.ASCIIEncodingLFLF@something ElseLFLF<p>This is extra</p>]
+    MarkupBlock - [0..130)::130
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        RazorComment - [0..43)::43
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ There are two directives beneath this ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [43..45)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [45..89)::44
+            RazorDirective - [45..89)::44 - Directive:{custom;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [46..89)::43
+                    RazorMetaCode - [46..52)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [52..89)::37
+                        CSharpStatementLiteral - [52..53)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [53..87)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [87..89)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [89..91)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [91..108)::17
+            RazorDirective - [91..108)::17 - Directive:{something;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [91..92)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [92..108)::16
+                    RazorMetaCode - [92..101)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[something];
+                    CSharpCodeBlock - [101..108)::7
+                        CSharpStatementLiteral - [101..102)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [102..106)::4 - [Else] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Else];
+                        MarkupEphemeralTextLiteral - [106..108)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [108..110)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [110..130)::20
+            MarkupStartTag - [110..113)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [113..126)::13 - [This is extra] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[This];
+                Whitespace;[ ];
+                Text;[is];
+                Whitespace;[ ];
+                Text;[extra];
+            MarkupEndTag - [126..130)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
new file mode 100644
index 0000000000..f44c1c18b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [19] )
+None span at (15:0,15 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (16:0,16 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (17:0,17 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
new file mode 100644
index 0000000000..bd14b1f20c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..19)::19 - [@custom "hello" ;  ]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..19)::12
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["hello"];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Semicolon;[;];
+                        MarkupEphemeralTextLiteral - [17..19)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[  ];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
new file mode 100644
index 0000000000..82186c467a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
new file mode 100644
index 0000000000..ec8ed8b511
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [@custom {foo?}]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..14)::6 - [{foo?}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{foo];
+            QuestionMark;[?];
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
new file mode 100644
index 0000000000..9e73b54511
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
new file mode 100644
index 0000000000..6ad2990a4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..16)::16 - [@custom AString"]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..16)::8 - [AString"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[AString];
+            DoubleQuote;["];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
new file mode 100644
index 0000000000..d5d9f27aef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
new file mode 100644
index 0000000000..eef7233302
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@custom 'AString']
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [9] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..17)::9 - ['AString'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            SingleQuote;['];
+            Text;[AString];
+            SingleQuote;['];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
new file mode 100644
index 0000000000..5d403c8984
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
new file mode 100644
index 0000000000..651feb6e9e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..15)::15 - [@custom AString]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..15)::7 - [AString] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[AString];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
new file mode 100644
index 0000000000..263c7efaa3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
new file mode 100644
index 0000000000..f3d06f68b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..26)::26 - [@custom "string1""string2"]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{custom;SingleLine;Unrestricted} [RZ1011(17:0,17 [9] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..17)::10
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..17)::9 - ["string1"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["string1"];
+        MarkupTextLiteral - [17..26)::9 - ["string2"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            DoubleQuote;["];
+            Text;[string2];
+            DoubleQuote;["];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
new file mode 100644
index 0000000000..234653b152
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [32] )
+Code span at (8:0,8 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [32] )
+None span at (14:0,14 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [32] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Code span at (16:0,16 [15] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
new file mode 100644
index 0000000000..c960c4e92d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..32)::32 - [@custom "Name" { foo(); bar(); }]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            RazorDirective - [0..32)::32 - Directive:{custom;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..32)::31
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..32)::25
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..14)::6 - ["Name"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Name"];
+                        UnclassifiedTextLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [15..16)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [16..31)::15
+                            CSharpStatementLiteral - [16..31)::15 - [ foo(); bar(); ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                                Identifier;[foo];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                        RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
new file mode 100644
index 0000000000..69febe9867
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Code span at (8:0,8 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
new file mode 100644
index 0000000000..d2d51198cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@custom Some_Member]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..19)::12
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..19)::11 - [Some_Member] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Some_Member];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
new file mode 100644
index 0000000000..9a307ed573
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [64] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [64] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [64] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (42:0,42 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (43:0,43 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [64] )
+Markup span at (54:0,54 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (55:0,55 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [64] )
+Markup span at (64:0,64 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [64] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
new file mode 100644
index 0000000000..d2f7b39c4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..64)::64 - [@custom System.Text.Encoding.ASCIIEncoding Some_Member "AString"]
+    MarkupBlock - [0..64)::64
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..64)::64
+            RazorDirective - [0..64)::64 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..64)::63
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..64)::57
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        CSharpStatementLiteral - [42..43)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [43..54)::11 - [Some_Member] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Some_Member];
+                        MarkupEphemeralTextLiteral - [54..55)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [55..64)::9 - ["AString"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["AString"];
+        MarkupTextLiteral - [64..64)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
new file mode 100644
index 0000000000..ccb11164be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [8] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+None span at (16:0,16 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
+MetaCode span at (17:0,17 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [14] )
+Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [3] )
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [14] )
+Markup span at (27:0,27 [4] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [4] )
+Markup span at (31:0,31 [1] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [14] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
new file mode 100644
index 0000000000..b31e7e4325
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..33)::33 - [@custom "Header" { <p>F{o}o</p> }]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{custom;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..33)::26
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..16)::8 - ["Header"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Header"];
+                        UnclassifiedTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [17..18)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [18..32)::14
+                            MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [19..31)::12
+                                MarkupStartTag - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [22..27)::5 - [F{o}o] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[F];
+                                    Text;[{];
+                                    Text;[o];
+                                    Text;[}];
+                                    Text;[o];
+                                MarkupEndTag - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
new file mode 100644
index 0000000000..e3413d97ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
new file mode 100644
index 0000000000..77987a903f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@custom "AString"]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..17)::10
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..17)::9 - ["AString"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["AString"];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
new file mode 100644
index 0000000000..fd5256e31f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [42] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [42] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [42] )
+Markup span at (42:0,42 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
new file mode 100644
index 0000000000..ba28ef0a75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..42)::42 - [@custom System.Text.Encoding.ASCIIEncoding]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            RazorDirective - [0..42)::42 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..42)::41
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..42)::35
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
new file mode 100644
index 0000000000..35eaf0bb6c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [6] )
+MetaCode span at (1:0,1 [5] ) (Accepts:None) - Parent: Directive block at (0:0,0 [6] )
+Markup span at (6:0,6 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
new file mode 100644
index 0000000000..006f105357
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..6)::6 - [@class]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            RazorDirective - [0..6)::6 - Directive:{class;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..6)::5
+                    RazorMetaCode - [1..6)::5 - Gen<None> - SpanEditHandler;Accepts:None
+                        Keyword;[class];
+                    CSharpCodeBlock - [6..6)::0
+        MarkupTextLiteral - [6..6)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
new file mode 100644
index 0000000000..65fa84c6ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
new file mode 100644
index 0000000000..9b940ce6e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..10)::10 - [@namespace]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            RazorDirective - [0..10)::10 - Directive:{namespace;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..10)::9
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Keyword;[namespace];
+                    CSharpCodeBlock - [10..10)::0
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.cspans.txt
new file mode 100644
index 0000000000..71420aa95e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Code span at (2:0,2 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.stree.txt
new file mode 100644
index 0000000000..06c87e7534
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Directives_ReservedWordInsideCodeBlock.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..10)::10 - [@{ class }]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        CSharpStatementLiteral - [2..9)::7 - [ class ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                            Keyword;[class];
+                            Whitespace;[ ];
+                    RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt
new file mode 100644
index 0000000000..88828c3534
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [14] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Code span at (12:0,12 [1] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [14] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt
new file mode 100644
index 0000000000..4a732dad09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..14)::14 - [@functions { }]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            RazorDirective - [0..14)::14 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..14)::13
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..14)::4
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [12..13)::1
+                            CSharpStatementLiteral - [12..13)::1 - [ ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
new file mode 100644
index 0000000000..80b5cd9e14
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Code span at (2:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [44] )
+Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [42] )
+MetaCode span at (5:1,3 [6] ) (Accepts:None) - Parent: Directive block at (4:1,2 [42] )
+Code span at (11:1,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (4:1,2 [42] )
+Code span at (12:1,10 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (4:1,2 [42] )
+Markup span at (46:1,44 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
new file mode 100644
index 0000000000..163880ac97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..46)::46 - [LF  @custom System.Text.Encoding.ASCIIEncoding]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..46)::44
+            CSharpEphemeralTextLiteral - [2..4)::2 - [  ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            RazorDirective - [4..46)::42 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [5..46)::41
+                    RazorMetaCode - [5..11)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [11..46)::35
+                        CSharpStatementLiteral - [11..12)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [12..46)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
new file mode 100644
index 0000000000..2b00010889
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [44] )
+MetaCode span at (4:0,4 [6] ) (Accepts:None) - Parent: Directive block at (3:0,3 [44] )
+Code span at (10:0,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (3:0,3 [44] )
+Code span at (11:0,11 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (3:0,3 [44] )
+Markup span at (45:0,45 [2] ) (Accepts:Whitespace) - Parent: Directive block at (3:0,3 [44] )
+Markup span at (47:1,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
new file mode 100644
index 0000000000..de8aa13386
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..48)::48 - [{  @custom System.Text.Encoding.ASCIIEncodingLF}]
+    MarkupBlock - [0..48)::48
+        MarkupTextLiteral - [0..3)::3 - [{  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            Whitespace;[  ];
+        CSharpCodeBlock - [3..47)::44
+            RazorDirective - [3..47)::44 - Directive:{custom;SingleLine;Unrestricted} [RZ2005(4:0,4 [6] )]
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [4..47)::43
+                    RazorMetaCode - [4..10)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [10..47)::37
+                        CSharpStatementLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [11..45)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [45..47)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [47..48)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
new file mode 100644
index 0000000000..79d48099bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [8] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Code span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [22] )
+Code span at (10:0,10 [12] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
new file mode 100644
index 0000000000..84882ce25e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..22)::22 - [@inherits string[[]][]]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..9)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[inherits];
+                    CSharpCodeBlock - [9..22)::13
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..22)::12 - [string[[]][]] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+                            LeftBracket;[[];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            RightBracket;[]];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
new file mode 100644
index 0000000000..4a73c4c8ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [87] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [87] )
+MetaCode span at (1:0,1 [8] ) (Accepts:None) - Parent: Directive block at (0:0,0 [87] )
+Code span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [87] )
+Code span at (10:0,10 [77] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [87] )
+Markup span at (87:0,87 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [87] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
new file mode 100644
index 0000000000..b8cf6049cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..87)::87 - [@inherits System.Web.Mvc.WebViewPage<IEnumerable<MvcApplication2.Models.RegisterModel>>]
+    MarkupBlock - [0..87)::87
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..87)::87
+            RazorDirective - [0..87)::87 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..87)::86
+                    RazorMetaCode - [1..9)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[inherits];
+                    CSharpCodeBlock - [9..87)::78
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..87)::77 - [System.Web.Mvc.WebViewPage<IEnumerable<MvcApplication2.Models.RegisterModel>>] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Web];
+                            Dot;[.];
+                            Identifier;[Mvc];
+                            Dot;[.];
+                            Identifier;[WebViewPage];
+                            LessThan;[<];
+                            Identifier;[IEnumerable];
+                            LessThan;[<];
+                            Identifier;[MvcApplication2];
+                            Dot;[.];
+                            Identifier;[Models];
+                            Dot;[.];
+                            Identifier;[RegisterModel];
+                            GreaterThan;[>];
+                            GreaterThan;[>];
+        MarkupTextLiteral - [87..87)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
new file mode 100644
index 0000000000..0be18525ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [8] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Code span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (10:0,10 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
new file mode 100644
index 0000000000..12fe4f3b8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..16)::16 - [@inherits string]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..9)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[inherits];
+                    CSharpCodeBlock - [9..16)::7
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..16)::6 - [string] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
new file mode 100644
index 0000000000..2afc521ace
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
new file mode 100644
index 0000000000..592926662b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..8)::8 - [@custom ]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
new file mode 100644
index 0000000000..1b7631b73f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (8:0,8 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
new file mode 100644
index 0000000000..455a063f9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..29)::29 - [@custom "{formaction}?/{id}?"]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            RazorDirective - [0..29)::29 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..29)::28
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..29)::22
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..29)::21 - ["{formaction}?/{id}?"] - Gen<DirectiveToken {;String;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["{formaction}?/{id}?"];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
new file mode 100644
index 0000000000..d4a6305e23
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [43] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [43] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [43] )
+Code span at (8:0,8 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [43] )
+Code span at (29:0,29 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [43] )
+Code span at (30:0,30 [13] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [43] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
new file mode 100644
index 0000000000..de4cde9da7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..43)::43 - [@custom "{formaction}?/{id}?" System.String]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            RazorDirective - [0..43)::43 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..43)::42
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..43)::36
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..29)::21 - ["{formaction}?/{id}?"] - Gen<DirectiveToken {;String;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["{formaction}?/{id}?"];
+                        CSharpStatementLiteral - [29..30)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [30..43)::13 - [System.String] - Gen<DirectiveToken {;Type;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[String];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
new file mode 100644
index 0000000000..bd10c900ba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [22] )
+Code span at (8:0,8 [14] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
new file mode 100644
index 0000000000..ccd26b5cbe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@custom "simple-value"]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..22)::15
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..22)::14 - ["simple-value"] - Gen<DirectiveToken {;String;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["simple-value"];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
new file mode 100644
index 0000000000..0fe58ec33c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [13] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Code span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (15:0,15 [12] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
new file mode 100644
index 0000000000..adf43bdc9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..27)::27 - [@TestDirective PropertyName]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{TestDirective;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..14)::13 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[TestDirective];
+                    CSharpCodeBlock - [14..27)::13
+                        CSharpStatementLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [15..27)::12 - [PropertyName] - Gen<DirectiveToken {;Member;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[PropertyName];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
new file mode 100644
index 0000000000..de71313701
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [13] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+Code span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (15:0,15 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
new file mode 100644
index 0000000000..7a6be62a85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [@TestDirective ]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            RazorDirective - [0..15)::15 - Directive:{TestDirective;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..15)::14
+                    RazorMetaCode - [1..14)::13 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[TestDirective];
+                    CSharpCodeBlock - [14..15)::1
+                        CSharpStatementLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [15..15)::0 - [] - Gen<DirectiveToken {;Member;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Marker;[];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt
new file mode 100644
index 0000000000..556affaba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [28] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Code span at (12:0,12 [15] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [28] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt
new file mode 100644
index 0000000000..efc89067b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..28)::28 - [@functions { foo(); bar(); }]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            RazorDirective - [0..28)::28 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..28)::27
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..28)::18
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [12..27)::15
+                            CSharpStatementLiteral - [12..27)::15 - [ foo(); bar(); ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                                Identifier;[foo];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                        RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt
new file mode 100644
index 0000000000..c3fbe4e475
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [32] )
+Code span at (9:0,9 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [32] )
+None span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [32] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
+Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [3] )
+Markup span at (21:0,21 [5] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
+Markup span at (26:0,26 [4] ) (Accepts:Any) - Parent: Tag block at (26:0,26 [4] )
+Markup span at (30:0,30 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt
new file mode 100644
index 0000000000..4e1eeb325a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..32)::32 - [@section Header { <p>F{o}o</p> }]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            RazorDirective - [0..32)::32 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..32)::31
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..32)::24
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..15)::6 - [Header] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Header];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [17..31)::14
+                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupElement - [18..30)::12
+                                MarkupStartTag - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [21..26)::5 - [F{o}o] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[F];
+                                    Text;[{];
+                                    Text;[o];
+                                    Text;[}];
+                                    Text;[o];
+                                MarkupEndTag - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
new file mode 100644
index 0000000000..93ef395357
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (8:0,8 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
new file mode 100644
index 0000000000..4e03f5befe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..29)::29 - [@custom BaseNamespace.Foo.Bar]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            RazorDirective - [0..29)::29 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..29)::28
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..29)::22
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..29)::21 - [BaseNamespace.Foo.Bar] - Gen<DirectiveToken {;Namespace;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[BaseNamespace];
+                            Dot;[.];
+                            Identifier;[Foo];
+                            Dot;[.];
+                            Identifier;[Bar];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
new file mode 100644
index 0000000000..e096a23423
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [21] )
+Code span at (8:0,8 [13] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
new file mode 100644
index 0000000000..1d64e3ae92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@custom BaseNamespace]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..21)::14
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..21)::13 - [BaseNamespace] - Gen<DirectiveToken {;Namespace;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[BaseNamespace];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
new file mode 100644
index 0000000000..b0884a958a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..9ea983ad50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..21)::21 - [@removeTagHelper Foo"]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..21)::5
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..21)::4 - [Foo"] - Gen<RemoveTagHelper:{Foo";Foo";;} [RZ1000(20:0,20 [1] ), RZ1019(17:0,17 [4] ), RZ1036(17:0,17 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            StringLiteral;["];RZ1000(20:0,20 [1] )
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
new file mode 100644
index 0000000000..a3ad9a1394
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Code span at (17:0,17 [3] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..6ca3c0b460
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..20)::20 - [@removeTagHelper Foo]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..20)::4
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..20)::3 - [Foo] - Gen<RemoveTagHelper:{Foo;Foo;;} [RZ1036(17:0,17 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
new file mode 100644
index 0000000000..0dfe38be7c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Code span at (17:0,17 [2] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
new file mode 100644
index 0000000000..1fcd5587a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@removeTagHelper ""]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..19)::3
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..19)::2 - [""] - Gen<RemoveTagHelper:{"";;;} [RZ1036(18:0,18 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;[""];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
new file mode 100644
index 0000000000..a8d324c3dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (17:0,17 [0] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
new file mode 100644
index 0000000000..20a0666a00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@removeTagHelper ]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..17)::1
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<RemoveTagHelper:{;;;} [RZ1018(1:0,1 [16] ), RZ1036(17:0,17 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Marker;[];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
new file mode 100644
index 0000000000..d9553ee9ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [25] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [25] )
+Code span at (17:0,17 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
new file mode 100644
index 0000000000..7584b6d08b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..25)::25 - [@removeTagHelper '*, Foo']
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            RazorDirective - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..25)::24
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..25)::9
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..25)::8 - ['*, Foo'] - Gen<RemoveTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(17:0,17 [8] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            CharacterLiteral;['*, Foo'];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
new file mode 100644
index 0000000000..b0884a958a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..41c54a8e5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@removeTagHelper "Foo]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..21)::5
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..21)::4 - ["Foo] - Gen<RemoveTagHelper:{"Foo;"Foo;;} [RZ1000(17:0,17 [1] ), RZ1019(17:0,17 [4] ), RZ1036(17:0,17 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo];RZ1000(17:0,17 [1] )
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
new file mode 100644
index 0000000000..71bf30f73f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [35] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [35] )
+Markup span at (16:0,16 [5] ) (Accepts:None) - Parent: Directive block at (0:0,0 [35] )
+Code span at (21:0,21 [14] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [35] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
new file mode 100644
index 0000000000..e3062d1894
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..35)::35 - [@removeTagHelper     Foo,   Bar    ]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            RazorDirective - [0..35)::35
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..35)::34
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..35)::19
+                        MarkupTextLiteral - [16..21)::5 - [     ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[     ];
+                        CSharpStatementLiteral - [21..35)::14 - [Foo,   Bar    ] - Gen<RemoveTagHelper:{Foo,   Bar;Foo,   Bar;Foo;Bar}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            Comma;[,];
+                            Whitespace;[   ];
+                            Identifier;[Bar];
+                            Whitespace;[    ];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
new file mode 100644
index 0000000000..b919e2b98c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Code span at (17:0,17 [5] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..92659f0769
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@removeTagHelper "Foo"]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..22)::6
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..22)::5 - ["Foo"] - Gen<RemoveTagHelper:{"Foo";Foo;;} [RZ1036(18:0,18 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo"];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
new file mode 100644
index 0000000000..06a4f306a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
+Code span at (17:0,17 [7] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..757c8c81f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..24)::24 - [@tagHelperPrefix Foo   "]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            RazorDirective - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..24)::23
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..24)::8
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..24)::7 - [Foo   "] - Gen<TagHelperPrefix:{Foo   ";Foo   "} [RZ1000(23:0,23 [1] ), RZ1019(17:0,17 [7] ), RZ1020(17:0,17 [7] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            Whitespace;[   ];
+                            StringLiteral;["];RZ1000(23:0,23 [1] )
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
new file mode 100644
index 0000000000..0dfe38be7c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Code span at (17:0,17 [2] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
new file mode 100644
index 0000000000..ee06179c7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@tagHelperPrefix ""]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..19)::3
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..19)::2 - [""] - Gen<TagHelperPrefix:{"";}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;[""];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
new file mode 100644
index 0000000000..a8d324c3dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Code span at (17:0,17 [0] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
new file mode 100644
index 0000000000..0e86bb2dc2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@tagHelperPrefix ]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..17)::1
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<TagHelperPrefix:{;} [RZ1018(1:0,1 [16] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Marker;[];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
new file mode 100644
index 0000000000..b0884a958a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..3e26d675c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@tagHelperPrefix "Foo]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..21)::5
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..21)::4 - ["Foo] - Gen<TagHelperPrefix:{"Foo;"Foo} [RZ1000(17:0,17 [1] ), RZ1019(17:0,17 [4] ), RZ1020(17:0,17 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo];RZ1000(17:0,17 [1] )
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
new file mode 100644
index 0000000000..a3ad9a1394
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
+Code span at (17:0,17 [3] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
new file mode 100644
index 0000000000..8b875e2851
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..20)::20 - [@tagHelperPrefix Foo]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..20)::4
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..20)::3 - [Foo] - Gen<TagHelperPrefix:{Foo;Foo}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
new file mode 100644
index 0000000000..b919e2b98c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Code span at (17:0,17 [5] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
new file mode 100644
index 0000000000..1bbaa5ea09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@tagHelperPrefix "Foo"]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..22)::6
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..22)::5 - ["Foo"] - Gen<TagHelperPrefix:{"Foo";Foo}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo"];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt
new file mode 100644
index 0000000000..519c877aeb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..15)::15 - [<input></input>]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [7..15)::8 - [</input>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.tspans.txt
new file mode 100644
index 0000000000..16070edad3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [15] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt
new file mode 100644
index 0000000000..7e6e3e333d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..9)::9 - [<input />]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..9)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMiscAttributeContent - [6..7)::1
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.tspans.txt
new file mode 100644
index 0000000000..455dab9ef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [9] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.cspans.txt
new file mode 100644
index 0000000000..b60f44ce86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.cspans.txt
@@ -0,0 +1 @@
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
new file mode 100644
index 0000000000..7e8026c0f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..19)::19 - [<input type='text'>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..19)::19 - [<input type='text'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.tspans.txt
new file mode 100644
index 0000000000..1ad745ab0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [19] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt
new file mode 100644
index 0000000000..8bb6ec3a6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..14)::14 - [<input><input>]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [7..14)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [7..14)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.tspans.txt
new file mode 100644
index 0000000000..4668eab0f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper1 - InputTagHelper2
+TagHelper span at (7:0,7 [7] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.cspans.txt
new file mode 100644
index 0000000000..a258c3ec2a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
new file mode 100644
index 0000000000..13abef1f59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..27)::27 - [<input type='text'></input>]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..19)::19 - [<input type='text'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [19..27)::8 - [</input>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.tspans.txt
new file mode 100644
index 0000000000..91e8a12872
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [27] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt
new file mode 100644
index 0000000000..7e6e3e333d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..9)::9 - [<input />]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..9)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMiscAttributeContent - [6..7)::1
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.tspans.txt
new file mode 100644
index 0000000000..455dab9ef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [9] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt
new file mode 100644
index 0000000000..7e6e3e333d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..9)::9 - [<input />]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..9)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMiscAttributeContent - [6..7)::1
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.tspans.txt
new file mode 100644
index 0000000000..455dab9ef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [9] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.cspans.txt
new file mode 100644
index 0000000000..e554bcd255
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.cspans.txt
@@ -0,0 +1 @@
+Markup span at (7:0,7 [8] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.stree.txt
new file mode 100644
index 0000000000..3d9d0fd71c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..15)::15 - [<input></input>]
+    MarkupBlock - [0..15)::15
+        MarkupElement - [0..15)::15
+            MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+                MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupEndTag - [7..15)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.tspans.txt
new file mode 100644
index 0000000000..aa95134310
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.cspans.txt
new file mode 100644
index 0000000000..9b14508ec9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.cspans.txt
@@ -0,0 +1 @@
+Code span at (18:0,18 [5] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
new file mode 100644
index 0000000000..8c4fc58380
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..30)::30 - [<ul bound [item]='items'></ul>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - ul[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<ul bound [item]='items'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[ul];
+                MarkupMinimizedTagHelperAttribute - [3..9)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [9..24)::15 - [item] - SingleQuotes - Bound - [ [item]='items']
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..16)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        LeftBracket;[[];
+                        Text;[item];
+                        RightBracket;[]];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [18..23)::5
+                        CSharpExpressionLiteral - [18..23)::5 - [items] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[items];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..30)::5 - [</ul>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[ul];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.tspans.txt
new file mode 100644
index 0000000000..c4ad978332
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [30] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.cspans.txt
new file mode 100644
index 0000000000..66cc617a5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.cspans.txt
@@ -0,0 +1 @@
+Code span at (20:0,20 [5] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
new file mode 100644
index 0000000000..d42f0e947d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..32)::32 - [<ul bound [(item)]='items'></ul>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - ul[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..27)::27 - [<ul bound [(item)]='items'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[ul];
+                MarkupMinimizedTagHelperAttribute - [3..9)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [9..26)::17 - [(item)] - SingleQuotes - Bound - [ [(item)]='items']
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..18)::8 - [[(item)]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        LeftBracket;[[];
+                        Text;[(item)];
+                        RightBracket;[]];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [20..25)::5
+                        CSharpExpressionLiteral - [20..25)::5 - [items] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[items];
+                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [27..32)::5 - [</ul>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[ul];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.tspans.txt
new file mode 100644
index 0000000000..8dc73d4362
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [32] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.cspans.txt
new file mode 100644
index 0000000000..2dfc773ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (23:0,23 [13] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [55] )
+Markup span at (38:0,38 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
new file mode 100644
index 0000000000..417309a6a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..55)::55 - [<button bound (click)='doSomething()'>Click Me</button>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..55)::55 - button[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..38)::38 - [<button bound (click)='doSomething()'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[button];
+                MarkupMinimizedTagHelperAttribute - [7..13)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [13..37)::24 - (click) - SingleQuotes - Bound - [ (click)='doSomething()']
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..21)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[(click)];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [23..36)::13
+                        CSharpExpressionLiteral - [23..36)::13 - [doSomething()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[doSomething()];
+                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [38..46)::8 - [Click Me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Click];
+                Whitespace;[ ];
+                Text;[Me];
+            MarkupTagHelperEndTag - [46..55)::9 - [</button>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[button];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.tspans.txt
new file mode 100644
index 0000000000..9d626a71d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [55] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.cspans.txt
new file mode 100644
index 0000000000..668451676c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (24:0,24 [13] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [56] )
+Markup span at (39:0,39 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
new file mode 100644
index 0000000000..b8664c7daa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..56)::56 - [<button bound (^click)='doSomething()'>Click Me</button>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..56)::56 - button[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..39)::39 - [<button bound (^click)='doSomething()'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[button];
+                MarkupMinimizedTagHelperAttribute - [7..13)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [13..38)::25 - (^click) - SingleQuotes - Bound - [ (^click)='doSomething()']
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..22)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[(^click)];
+                    Equals;[=];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [24..37)::13
+                        CSharpExpressionLiteral - [24..37)::13 - [doSomething()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[doSomething()];
+                    MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [39..47)::8 - [Click Me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Click];
+                Whitespace;[ ];
+                Text;[Me];
+            MarkupTagHelperEndTag - [47..56)::9 - [</button>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[button];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.tspans.txt
new file mode 100644
index 0000000000..1e7d20eb36
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [56] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.cspans.txt
new file mode 100644
index 0000000000..4cfe9f7c9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (28:0,28 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
new file mode 100644
index 0000000000..b2c2be51a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..46)::46 - [<template bound *something='value'></template>]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - template[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..35)::35 - [<template bound *something='value'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[template];
+                MarkupMinimizedTagHelperAttribute - [9..15)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..15)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [15..34)::19 - *something - SingleQuotes - Bound - [ *something='value']
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [16..26)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[*something];
+                    Equals;[=];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [28..33)::5
+                        MarkupTextLiteral - [28..33)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[value];
+                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [35..46)::11 - [</template>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[template];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.tspans.txt
new file mode 100644
index 0000000000..9666dfd4cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [46] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt
new file mode 100644
index 0000000000..343ff5e896
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..33)::33 - [<div bound #localminimized></div>]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - div[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..27)::27 - [<div bound #localminimized>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupMinimizedTagHelperAttribute - [4..10)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupMinimizedTagHelperAttribute - [10..26)::16 - #localminimized - Minimized - Unbound - [ #localminimized]
+                    MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [11..26)::15 - [#localminimized] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[#localminimized];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [27..33)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.tspans.txt
new file mode 100644
index 0000000000..a6c7ee0196
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [33] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.cspans.txt
new file mode 100644
index 0000000000..a75e5a0d69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.cspans.txt
@@ -0,0 +1 @@
+Markup span at (19:0,19 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
new file mode 100644
index 0000000000..aa7e2fe686
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..32)::32 - [<div bound #local='value'></div>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - div[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..26)::26 - [<div bound #local='value'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupMinimizedTagHelperAttribute - [4..10)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [10..25)::15 - #local - SingleQuotes - Bound - [ #local='value']
+                    MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [11..17)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[#local];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..24)::5
+                        MarkupTextLiteral - [19..24)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[value];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..32)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.tspans.txt
new file mode 100644
index 0000000000..8dc73d4362
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [32] ) - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt
new file mode 100644
index 0000000000..5a61ddfab0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt
@@ -0,0 +1,7 @@
+RazorDocument - [0..7)::7 - [<input>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.tspans.txt
new file mode 100644
index 0000000000..507d5a1ed9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.cspans.txt
new file mode 100644
index 0000000000..b60f44ce86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
new file mode 100644
index 0000000000..06ae9e6c0d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..19)::19 - [<input type='text'>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..19)::19 - [<input type='text'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.tspans.txt
new file mode 100644
index 0000000000..0ea7cf09ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [19] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt
new file mode 100644
index 0000000000..17f6f04e9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..14)::14 - [<input><input>]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [7..14)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [7..14)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.tspans.txt
new file mode 100644
index 0000000000..533ebe3e15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper
+TagHelper span at (7:0,7 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.cspans.txt
new file mode 100644
index 0000000000..b60f44ce86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.cspans.txt
@@ -0,0 +1 @@
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
new file mode 100644
index 0000000000..14a832acc5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..26)::26 - [<input type='text'><input>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..19)::19 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..19)::19 - [<input type='text'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [19..26)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [19..26)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.tspans.txt
new file mode 100644
index 0000000000..cf1d9627ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [19] ) - InputTagHelper
+TagHelper span at (19:0,19 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.cspans.txt
new file mode 100644
index 0000000000..e757d8a3f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (19:0,19 [6] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt
new file mode 100644
index 0000000000..b1c2556772
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..25)::25 - [<div><input><input></div>]
+    MarkupBlock - [0..25)::25
+        MarkupElement - [0..25)::25
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [5..12)::7 - input[StartTagOnly] - InputTagHelper
+                MarkupTagHelperStartTag - [5..12)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [12..19)::7 - input[StartTagOnly] - InputTagHelper
+                MarkupTagHelperStartTag - [12..19)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupEndTag - [19..25)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.tspans.txt
new file mode 100644
index 0000000000..f380f7abd5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (5:0,5 [7] ) - InputTagHelper
+TagHelper span at (12:0,12 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt
new file mode 100644
index 0000000000..aa429ff6cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.diag.txt
new file mode 100644
index 0000000000..c11ff99be0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
new file mode 100644
index 0000000000..569dcbeaf8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..17)::17 - [<myth bound='' />]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..17)::17 - [<myth bound='' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - bound - SingleQuotes - Bound - [ bound='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [14..15)::1
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.tspans.txt
new file mode 100644
index 0000000000..2835be7bef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [17] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt
new file mode 100644
index 0000000000..aa429ff6cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.diag.txt
new file mode 100644
index 0000000000..d57ce479b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2008: Attribute 'BouND' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
new file mode 100644
index 0000000000..073c868ffa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..17)::17 - [<myth BouND='' />]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..17)::17 - [<myth BouND='' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - BouND - SingleQuotes - Bound - [ BouND='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [BouND] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[BouND];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [14..15)::1
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.tspans.txt
new file mode 100644
index 0000000000..2835be7bef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [17] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt
new file mode 100644
index 0000000000..92552dfb4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
+Code span at (25:0,25 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.diag.txt
new file mode 100644
index 0000000000..9739cf1558
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.diag.txt
@@ -0,0 +1,2 @@
+(1,7): Error RZ2008: Attribute 'BOUND' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
+(1,19): Error RZ2008: Attribute 'bOUnd' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
new file mode 100644
index 0000000000..4a3b4d140a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..29)::29 - [<myth BOUND=''    bOUnd="" />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..29)::29 - [<myth BOUND=''    bOUnd="" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - BOUND - SingleQuotes - Bound - [ BOUND='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [BOUND] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[BOUND];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [14..26)::12 - bOUnd - DoubleQuotes - Bound - [    bOUnd=""]
+                    MarkupTextLiteral - [14..18)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [18..23)::5 - [bOUnd] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bOUnd];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [25..25)::0
+                        CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [26..27)::1
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.tspans.txt
new file mode 100644
index 0000000000..c8af5cb7b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.cspans.txt
new file mode 100644
index 0000000000..228e1bbc94
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (12:0,12 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [32] )
+Markup span at (19:0,19 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.diag.txt
new file mode 100644
index 0000000000..52810ad2c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2008: Attribute 'BOUND' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
new file mode 100644
index 0000000000..b7e9a4d5db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..32)::32 - [<myth BOUND= nAMe='john'></myth>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<myth BOUND= nAMe='john'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..12)::7 - BOUND - DoubleQuotes - Bound - [ BOUND=]
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [BOUND] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[BOUND];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [12..24)::12 - nAMe - SingleQuotes - Bound - [ nAMe='john']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..17)::4 - [nAMe] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[nAMe];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..23)::4
+                        MarkupTextLiteral - [19..23)::4 - [john] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[john];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..32)::7 - [</myth>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[myth];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.tspans.txt
new file mode 100644
index 0000000000..f6beb36090
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [32] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.cspans.txt
new file mode 100644
index 0000000000..7fafd220d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.cspans.txt
@@ -0,0 +1,4 @@
+Code span at (13:0,13 [4] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [9] )
+Code span at (17:0,17 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [5] )
+Code span at (18:0,18 [4] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [5] )
+Code span at (22:0,22 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
new file mode 100644
index 0000000000..8a1c10c10d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..28)::28 - [<myth bound='    @true  ' />]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..28)::28 - [<myth bound='    @true  ' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..25)::20 - bound - SingleQuotes - Bound - [ bound='    @true  ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..24)::11
+                        MarkupBlock - [13..22)::9
+                            CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[    ];
+                            CSharpCodeBlock - [17..22)::5
+                                CSharpImplicitExpression - [17..22)::5
+                                    CSharpTransition - [17..17)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [17..22)::5
+                                        CSharpCodeBlock - [17..22)::5
+                                            CSharpExpressionLiteral - [17..18)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [18..22)::4 - [true] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Keyword;[true];
+                        CSharpExpressionLiteral - [22..24)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [25..26)::1
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.tspans.txt
new file mode 100644
index 0000000000..303ab8debe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.cspans.txt
new file mode 100644
index 0000000000..f70a554673
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.cspans.txt
@@ -0,0 +1,6 @@
+Code span at (13:0,13 [4] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [11] )
+Code span at (17:0,17 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [7] )
+Code span at (18:0,18 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [7] )
+Code span at (19:0,19 [4] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [7] )
+Code span at (23:0,23 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [7] )
+Code span at (24:0,24 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
new file mode 100644
index 0000000000..2a9079aef2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..30)::30 - [<myth bound='    @(true)  ' />]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..30)::30 - [<myth bound='    @(true)  ' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..27)::22 - bound - SingleQuotes - Bound - [ bound='    @(true)  ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..26)::13
+                        MarkupBlock - [13..24)::11
+                            CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[    ];
+                            CSharpCodeBlock - [17..24)::7
+                                CSharpImplicitExpression - [17..24)::7
+                                    CSharpTransition - [17..17)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [17..24)::7
+                                        CSharpCodeBlock - [17..24)::7
+                                            CSharpExpressionLiteral - [17..18)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [18..19)::1 - [(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                LeftParenthesis;[(];
+                                            CSharpExpressionLiteral - [19..23)::4 - [true] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Keyword;[true];
+                                            CSharpExpressionLiteral - [23..24)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                RightParenthesis;[)];
+                        CSharpExpressionLiteral - [24..26)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [27..28)::1
+                    MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.tspans.txt
new file mode 100644
index 0000000000..5e6577587f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [30] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.cspans.txt
new file mode 100644
index 0000000000..f8351f76e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [8] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
new file mode 100644
index 0000000000..2ee082dd17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..25)::25 - [<myth bound='    true' />]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<myth bound='    true' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..22)::17 - bound - SingleQuotes - Bound - [ bound='    true']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..21)::8
+                        CSharpExpressionLiteral - [13..21)::8 - [    true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[    ];
+                            Text;[true];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [22..23)::1
+                    MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.tspans.txt
new file mode 100644
index 0000000000..002029ae1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.cspans.txt
new file mode 100644
index 0000000000..d5ea717f81
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [4] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.diag.txt
new file mode 100644
index 0000000000..c11ff99be0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
new file mode 100644
index 0000000000..43d705d118
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..21)::21 - [<myth bound='    ' />]
+    MarkupBlock - [0..21)::21
+        MarkupTagHelperElement - [0..21)::21 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..21)::21 - [<myth bound='    ' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..18)::13 - bound - SingleQuotes - Bound - [ bound='    ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[    ];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [18..19)::1
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.tspans.txt
new file mode 100644
index 0000000000..05e209c319
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [21] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt
new file mode 100644
index 0000000000..dddc839de0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [27] )
+Code span at (23:0,23 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.diag.txt
new file mode 100644
index 0000000000..9a927a8ecb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.diag.txt
@@ -0,0 +1,2 @@
+(1,7): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
+(1,17): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
new file mode 100644
index 0000000000..710ffe6a91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..27)::27 - [<myth bound=''  bound="" />]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..27)::27 - [<myth bound=''  bound="" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - bound - SingleQuotes - Bound - [ bound='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [14..24)::10 - bound - DoubleQuotes - Bound - [  bound=""]
+                    MarkupTextLiteral - [14..16)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [16..21)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [23..23)::0
+                        CSharpExpressionLiteral - [23..23)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [24..25)::1
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.tspans.txt
new file mode 100644
index 0000000000..dc2eb23533
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [27] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.cspans.txt
new file mode 100644
index 0000000000..bd305a47b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (13:0,13 [1] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [30] )
+Code span at (24:0,24 [2] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.diag.txt
new file mode 100644
index 0000000000..f16283e328
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.diag.txt
@@ -0,0 +1,2 @@
+(1,7): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
+(1,18): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
new file mode 100644
index 0000000000..f7c9bea081
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..30)::30 - [<myth bound=' '  bound="  " />]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..30)::30 - [<myth bound=' '  bound="  " />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..15)::10 - bound - SingleQuotes - Bound - [ bound=' ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..14)::1
+                        CSharpExpressionLiteral - [13..14)::1 - [ ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [15..27)::12 - bound - DoubleQuotes - Bound - [  bound="  "]
+                    MarkupTextLiteral - [15..17)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [17..22)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [24..26)::2
+                        CSharpExpressionLiteral - [24..26)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [27..28)::1
+                    MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.tspans.txt
new file mode 100644
index 0000000000..5e6577587f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [30] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.cspans.txt
new file mode 100644
index 0000000000..ee1acf6e62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (13:0,13 [4] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
+Code span at (25:0,25 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.diag.txt
new file mode 100644
index 0000000000..7993f8fe1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.diag.txt
@@ -0,0 +1 @@
+(1,20): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
new file mode 100644
index 0000000000..5443e52234
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..29)::29 - [<myth bound='true' bound=  />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..29)::29 - [<myth bound='true' bound=  />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..18)::13 - bound - SingleQuotes - Bound - [ bound='true']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        CSharpExpressionLiteral - [13..17)::4 - [true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[true];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [18..25)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..24)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [25..25)::0
+                        CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupMiscAttributeContent - [25..27)::2
+                    MarkupTextLiteral - [25..27)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.tspans.txt
new file mode 100644
index 0000000000..c8af5cb7b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt
new file mode 100644
index 0000000000..ebd5438288
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (12:0,12 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [23] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.diag.txt
new file mode 100644
index 0000000000..c11ff99be0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
new file mode 100644
index 0000000000..6ad9c9e82a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..23)::23 - [<myth bound= name='' />]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..23)::23 - [<myth bound= name='' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..12)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [12..20)::8 - name - SingleQuotes - Bound - [ name='']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..17)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..19)::0
+                        MarkupTextLiteral - [19..19)::0 - []
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [20..21)::1
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.tspans.txt
new file mode 100644
index 0000000000..17b38715bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.cspans.txt
new file mode 100644
index 0000000000..ecee8c7015
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (12:0,12 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.diag.txt
new file mode 100644
index 0000000000..c11ff99be0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
new file mode 100644
index 0000000000..e62ea27a5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..25)::25 - [<myth bound= name='  ' />]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<myth bound= name='  ' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..12)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [12..22)::10 - name - SingleQuotes - Bound - [ name='  ']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..17)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..21)::2
+                        MarkupTextLiteral - [19..21)::2 - [  ]
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [22..23)::1
+                    MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.tspans.txt
new file mode 100644
index 0000000000..002029ae1e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.cspans.txt
new file mode 100644
index 0000000000..9e481866b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.cspans.txt
@@ -0,0 +1,4 @@
+Code span at (13:0,13 [4] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [46] )
+Markup span at (25:0,25 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [46] )
+Code span at (37:0,37 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [46] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.diag.txt
new file mode 100644
index 0000000000..356a13e234
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.diag.txt
@@ -0,0 +1 @@
+(1,32): Error RZ2008: Attribute 'bound' on tag helper element 'myth' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
new file mode 100644
index 0000000000..d326cc13d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..46)::46 - [<myth bound='true' name='john' bound= name= />]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..46)::46 - [<myth bound='true' name='john' bound= name= />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[myth];
+                MarkupTagHelperAttribute - [5..18)::13 - bound - SingleQuotes - Bound - [ bound='true']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        CSharpExpressionLiteral - [13..17)::4 - [true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[true];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [18..30)::12 - name - SingleQuotes - Bound - [ name='john']
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..23)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [25..29)::4
+                        MarkupTextLiteral - [25..29)::4 - [john] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[john];
+                    MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [30..37)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [31..36)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [37..37)::0
+                        CSharpExpressionLiteral - [37..37)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [37..43)::6 - name - DoubleQuotes - Bound - [ name=]
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [38..42)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [43..43)::0
+                        MarkupTextLiteral - [43..43)::0 - []
+                MarkupMiscAttributeContent - [43..44)::1
+                    MarkupTextLiteral - [43..44)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.tspans.txt
new file mode 100644
index 0000000000..f578bb25fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [46] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt
new file mode 100644
index 0000000000..0f370fff09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt
@@ -0,0 +1,7 @@
+RazorDocument - [0..2)::2 - [<p]
+    MarkupBlock - [0..2)::2
+        MarkupTagHelperElement - [0..2)::2 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.tspans.txt
new file mode 100644
index 0000000000..d9746775d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [2] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.diag.txt
new file mode 100644
index 0000000000..256c57cb9c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1035: Missing close angle for tag helper 'p'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt
new file mode 100644
index 0000000000..950d7f704e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..6)::6 - [<p></p]
+    MarkupBlock - [0..6)::6
+        MarkupTagHelperElement - [0..6)::6 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [3..6)::3 - [</p]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.tspans.txt
new file mode 100644
index 0000000000..aae2c81a5e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [6] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.diag.txt
new file mode 100644
index 0000000000..581b6ea348
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,5): Error RZ1035: Missing close angle for tag helper 'strong'.
+(1,5): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt
new file mode 100644
index 0000000000..f4aaf2a54f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..10)::10 - [<p><strong]
+    MarkupBlock - [0..10)::10
+        MarkupTagHelperElement - [0..10)::10 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..10)::7 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [3..10)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.tspans.txt
new file mode 100644
index 0000000000..07be06becb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [10] ) - ptaghelper
+TagHelper span at (3:0,3 [7] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.diag.txt
new file mode 100644
index 0000000000..e846c7e408
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'strong'.
+(1,2): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,10): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt
new file mode 100644
index 0000000000..ac5ad19b0f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..11)::11 - [<strong <p>]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<strong ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupMiscAttributeContent - [7..8)::1
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [8..11)::3 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.tspans.txt
new file mode 100644
index 0000000000..46d677fdef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [11] ) - strongtaghelper
+TagHelper span at (8:0,8 [3] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.diag.txt
new file mode 100644
index 0000000000..83865622a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'strong'.
+(1,11): Error RZ1035: Missing close angle for tag helper 'strong'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt
new file mode 100644
index 0000000000..cd7a0e4705
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..16)::16 - [<strong </strong]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<strong ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupMiscAttributeContent - [7..8)::1
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [8..16)::8 - [</strong]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.tspans.txt
new file mode 100644
index 0000000000..fd2821234a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [16] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.cspans.txt
new file mode 100644
index 0000000000..17f87ed7c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
+Markup span at (1:0,1 [1] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [1] )
+Markup span at (2:0,2 [9] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [9] )
+Markup span at (11:0,11 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.diag.txt
new file mode 100644
index 0000000000..7317861d0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.diag.txt
@@ -0,0 +1,2 @@
+(1,5): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,15): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt
new file mode 100644
index 0000000000..a62747a393
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..16)::16 - [<<</strong> <<p>]
+    MarkupBlock - [0..16)::16
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [1..2)::1
+            MarkupStartTag - [1..2)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [2..11)::9
+            MarkupEndTag - [2..11)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupElement - [12..13)::1
+            MarkupStartTag - [12..13)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [13..16)::3 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.tspans.txt
new file mode 100644
index 0000000000..ad070562db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (13:0,13 [3] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.cspans.txt
new file mode 100644
index 0000000000..abec4f6747
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
+Markup span at (1:0,1 [1] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [1] )
+Markup span at (10:0,10 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [14] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [1] )
+Markup span at (13:0,13 [2] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [2] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.diag.txt
new file mode 100644
index 0000000000..299623f22a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt
new file mode 100644
index 0000000000..df48745607
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..16)::16 - [<<<strong>> <<>>]
+    MarkupBlock - [0..16)::16
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [1..2)::1
+            MarkupStartTag - [1..2)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [2..16)::14 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [2..10)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupTextLiteral - [10..12)::2 - [> ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+                Whitespace;[ ];
+            MarkupElement - [12..13)::1
+                MarkupStartTag - [12..13)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupElement - [13..16)::3
+                MarkupStartTag - [13..15)::2 - [<>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.tspans.txt
new file mode 100644
index 0000000000..9bcd022232
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [14] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.cspans.txt
new file mode 100644
index 0000000000..81f3b86186
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (12:0,12 [4] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.diag.txt
new file mode 100644
index 0000000000..fbfae8923a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.diag.txt
@@ -0,0 +1 @@
+(1,15): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt
new file mode 100644
index 0000000000..99965ff2a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..25)::25 - [<str<strong></p></strong>]
+    MarkupBlock - [0..25)::25
+        MarkupElement - [0..25)::25
+            MarkupStartTag - [0..4)::4 - [<str] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[str];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [4..25)::21 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [4..12)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [12..16)::4
+                    MarkupEndTag - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [16..25)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.tspans.txt
new file mode 100644
index 0000000000..e87eb3d4c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (4:0,4 [21] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.cspans.txt
new file mode 100644
index 0000000000..480329cced
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
new file mode 100644
index 0000000000..e3339e0ff6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..10)::10 - [<p class=']
+    MarkupBlock - [0..10)::10
+        MarkupTagHelperElement - [0..10)::10 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..10)::10 - [<p class='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..10)::8 - class - SingleQuotes - Unbound - [ class=']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..10)::0
+                        MarkupTextLiteral - [10..10)::0 - []
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.tspans.txt
new file mode 100644
index 0000000000..07a0d173f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [10] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.cspans.txt
new file mode 100644
index 0000000000..952bb29824
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.cspans.txt
@@ -0,0 +1 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.diag.txt
new file mode 100644
index 0000000000..00e5e03e70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,13): Error RZ1030: TagHelper attributes must be well-formed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
new file mode 100644
index 0000000000..a4e330100d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..31)::31 - [<p class=btn" bar="foo"<strong>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..31)::31 - [<p class=btn" bar="foo"<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=btn]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [btn]
+                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                MarkupMiscAttributeContent - [12..31)::19
+                    MarkupTextLiteral - [12..31)::19 - [" bar="foo"<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                        Whitespace;[ ];
+                        Text;[bar];
+                        Equals;[=];
+                        DoubleQuote;["];
+                        Text;[foo];
+                        DoubleQuote;["];
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.tspans.txt
new file mode 100644
index 0000000000..b3437d8dea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.cspans.txt
new file mode 100644
index 0000000000..b04797cd78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [8] )
+Markup span at (13:0,13 [5] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.diag.txt
new file mode 100644
index 0000000000..c263af5dea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,25): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
new file mode 100644
index 0000000000..5f4c685132
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..31)::31 - [<p class="btn bar="foo"<strong>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23 - [<p class="btn bar="foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - class - DoubleQuotes - Unbound - [ class="btn bar="]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..18)::8
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                        MarkupLiteralAttributeValue - [13..18)::5 - [ bar=]
+                            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [14..18)::4 - [bar=] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[bar];
+                                Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMinimizedTagHelperAttribute - [19..23)::4 - foo" - Minimized - Unbound - [foo"]
+                    MarkupTextLiteral - [19..23)::4 - [foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                        DoubleQuote;["];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [23..31)::8 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [23..31)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.tspans.txt
new file mode 100644
index 0000000000..2eb4f3edd5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [31] ) - ptaghelper
+TagHelper span at (23:0,23 [8] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.cspans.txt
new file mode 100644
index 0000000000..b04797cd78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [8] )
+Markup span at (13:0,13 [5] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
new file mode 100644
index 0000000000..5e5f1bf591
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..28)::28 - [<p class="btn bar="foo"></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..24)::24 - [<p class="btn bar="foo">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - class - DoubleQuotes - Unbound - [ class="btn bar="]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..18)::8
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                        MarkupLiteralAttributeValue - [13..18)::5 - [ bar=]
+                            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [14..18)::4 - [bar=] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[bar];
+                                Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMinimizedTagHelperAttribute - [19..23)::4 - foo" - Minimized - Unbound - [foo"]
+                    MarkupTextLiteral - [19..23)::4 - [foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.tspans.txt
new file mode 100644
index 0000000000..1490ae8ef2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.diag.txt
new file mode 100644
index 0000000000..3191132e51
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1031: The tag helper 'p' must not have C# in the element's attribute declaration area.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
new file mode 100644
index 0000000000..b370e9b162
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..33)::33 - [<p @DateTime.Now class="btn"></p>]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..29)::29 - [<p @DateTime.Now class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [2..28)::26
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [3..16)::13
+                        CSharpImplicitExpression - [3..16)::13
+                            CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [4..16)::12
+                                CSharpCodeBlock - [4..16)::12
+                                    CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[DateTime];
+                                        Dot;[.];
+                                        Identifier;[Now];
+                    MarkupTextLiteral - [16..28)::12 - [ class="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                        Text;[class];
+                        Equals;[=];
+                        DoubleQuote;["];
+                        Text;[btn];
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..33)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.tspans.txt
new file mode 100644
index 0000000000..d6131fed67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [33] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.diag.txt
new file mode 100644
index 0000000000..3191132e51
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1031: The tag helper 'p' must not have C# in the element's attribute declaration area.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
new file mode 100644
index 0000000000..b568d50ba3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..27)::27 - [<p @DateTime.Now="btn"></p>]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23 - [<p @DateTime.Now="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [2..22)::20
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [3..16)::13
+                        CSharpImplicitExpression - [3..16)::13
+                            CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [4..16)::12
+                                CSharpCodeBlock - [4..16)::12
+                                    CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[DateTime];
+                                        Dot;[.];
+                                        Identifier;[Now];
+                    MarkupTextLiteral - [16..22)::6 - [="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Equals;[=];
+                        DoubleQuote;["];
+                        Text;[btn];
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [23..27)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.tspans.txt
new file mode 100644
index 0000000000..840d8db41a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [27] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt
new file mode 100644
index 0000000000..e109b92089
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [13] )
+Code span at (10:0,10 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.diag.txt
new file mode 100644
index 0000000000..4a81a68e60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,23): Error RZ1030: TagHelper attributes must be well-formed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt
new file mode 100644
index 0000000000..74f35b2278
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..28)::28 - [<p class=@DateTime.Now"></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..28)::28 - [<p class=@DateTime.Now"></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..22)::20 - class - DoubleQuotes - Unbound - [ class=@DateTime.Now]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..22)::13
+                        MarkupDynamicAttributeValue - [9..22)::13 - [@DateTime.Now]
+                            GenericBlock - [9..22)::13
+                                CSharpCodeBlock - [9..22)::13
+                                    CSharpImplicitExpression - [9..22)::13
+                                        CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [10..22)::12
+                                            CSharpCodeBlock - [10..22)::12
+                                                CSharpExpressionLiteral - [10..22)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupMiscAttributeContent - [22..28)::6
+                    MarkupTextLiteral - [22..28)::6 - ["></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                        CloseAngle;[>];
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.tspans.txt
new file mode 100644
index 0000000000..1490ae8ef2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.cspans.txt
new file mode 100644
index 0000000000..30a40eab2d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (10:0,10 [5] )
+Code span at (11:0,11 [4] ) (Accepts:Any) - Parent: Statement block at (10:0,10 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.diag.txt
new file mode 100644
index 0000000000..719d1c8841
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,12): Error RZ1006: The do block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
new file mode 100644
index 0000000000..28fa369031
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..15)::15 - [<p class="@do {]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="@do {] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..15)::13 - class - DoubleQuotes - Unbound - [ class="@do {]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..15)::5
+                        MarkupDynamicAttributeValue - [10..15)::5 - [@do {]
+                            GenericBlock - [10..15)::5
+                                CSharpCodeBlock - [10..15)::5
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..15)::4 - [do {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.tspans.txt
new file mode 100644
index 0000000000..ad9585903c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [15] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.cspans.txt
new file mode 100644
index 0000000000..cef5455740
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (10:0,10 [11] )
+Code span at (11:0,11 [10] ) (Accepts:Any) - Parent: Statement block at (10:0,10 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.diag.txt
new file mode 100644
index 0000000000..c9cee88e75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.diag.txt
@@ -0,0 +1,4 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,12): Error RZ1006: The do block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,16): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
new file mode 100644
index 0000000000..eccf711a65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..21)::21 - [<p class="@do {"></p>]
+    MarkupBlock - [0..21)::21
+        MarkupTagHelperElement - [0..21)::21 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..21)::21 - [<p class="@do {"></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..21)::19 - class - DoubleQuotes - Unbound - [ class="@do {"></p>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..21)::11
+                        MarkupDynamicAttributeValue - [10..21)::11 - [@do {"></p>]
+                            GenericBlock - [10..21)::11
+                                CSharpCodeBlock - [10..21)::11
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..21)::10 - [do {"></p>] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        StringLiteral;["></p>];RZ1000(15:0,15 [1] )
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.tspans.txt
new file mode 100644
index 0000000000..452a7da46c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [21] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.diag.txt
new file mode 100644
index 0000000000..6451ce6e4b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.diag.txt
@@ -0,0 +1,5 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,4): Error RZ1031: The tag helper 'p' must not have C# in the element's attribute declaration area.
+(1,5): Error RZ1006: The do block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,32): Error RZ1026: Encountered end tag "p" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt
new file mode 100644
index 0000000000..7f6210c500
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..33)::33 - [<p @do { someattribute="btn"></p>]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..33)::33 - [<p @do { someattribute="btn"></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [2..33)::31
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [3..33)::30
+                        CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpStatementLiteral - [4..29)::25 - [do { someattribute="btn">] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Keyword;[do];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            Identifier;[someattribute];
+                            Assign;[=];
+                            StringLiteral;["btn"];
+                            GreaterThan;[>];
+                        MarkupBlock - [29..33)::4
+                            MarkupElement - [29..33)::4
+                                MarkupEndTag - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.tspans.txt
new file mode 100644
index 0000000000..d6131fed67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [33] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.cspans.txt
new file mode 100644
index 0000000000..b992258ac2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.cspans.txt
@@ -0,0 +1 @@
+Markup span at (9:0,9 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.diag.txt
new file mode 100644
index 0000000000..f716761d50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1030: TagHelper attributes must be well-formed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
new file mode 100644
index 0000000000..88b1479078
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..38)::38 - [<p class=some=thing attr="@value"></p>]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34 - [<p class=some=thing attr="@value">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..13)::11 - class - DoubleQuotes - Unbound - [ class=some]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..13)::4
+                        MarkupLiteralAttributeValue - [9..13)::4 - [some]
+                            MarkupTextLiteral - [9..13)::4 - [some] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[some];
+                MarkupMiscAttributeContent - [13..33)::20
+                    MarkupTextLiteral - [13..26)::13 - [=thing attr="] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Equals;[=];
+                        Text;[thing];
+                        Whitespace;[ ];
+                        Text;[attr];
+                        Equals;[=];
+                        DoubleQuote;["];
+                    CSharpCodeBlock - [26..32)::6
+                        CSharpImplicitExpression - [26..32)::6
+                            CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [27..32)::5
+                                CSharpCodeBlock - [27..32)::5
+                                    CSharpExpressionLiteral - [27..32)::5 - [value] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[value];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..38)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.tspans.txt
new file mode 100644
index 0000000000..3cc3264682
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [38] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.cspans.txt
new file mode 100644
index 0000000000..14a88d65c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (8:0,8 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.diag.txt
new file mode 100644
index 0000000000..8cd66cdd6c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,15): Error RZ1030: TagHelper attributes must be well-formed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
new file mode 100644
index 0000000000..abf2c1ee61
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..24)::24 - [<p bar="false"" <strong>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..24)::24 - [<p bar="false"" <strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - bar - DoubleQuotes - Unbound - [ bar="false"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [8..13)::5
+                        MarkupLiteralAttributeValue - [8..13)::5 - [false]
+                            MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [14..24)::10
+                    MarkupTextLiteral - [14..24)::10 - [" <strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                        Whitespace;[ ];
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.tspans.txt
new file mode 100644
index 0000000000..4292815e00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [24] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.cspans.txt
new file mode 100644
index 0000000000..4934c61fc0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.cspans.txt
@@ -0,0 +1,11 @@
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (9:0,9 [34] )
+Code span at (10:0,10 [10] ) (Accepts:Any) - Parent: Statement block at (9:0,9 [34] )
+Markup span at (20:0,20 [2] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [15] )
+Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [12] )
+Transition span at (29:0,29 [1] ) (Accepts:None) - Parent: Expression block at (29:0,29 [4] )
+Code span at (30:0,30 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (29:0,29 [4] )
+Markup span at (33:0,33 [1] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [12] )
+Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Tag block at (20:0,20 [15] )
+Markup span at (35:0,35 [4] ) (Accepts:Any) - Parent: Markup block at (20:0,20 [23] )
+Markup span at (39:0,39 [4] ) (Accepts:None) - Parent: Tag block at (39:0,39 [4] )
+Code span at (43:0,43 [0] ) (Accepts:Any) - Parent: Statement block at (9:0,9 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt
new file mode 100644
index 0000000000..9dba2e6078
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt
@@ -0,0 +1,12 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,21): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
+
+@if(isLoggedIn)
+    <p>Hello, @user</p>
+
+Instead, wrap the contents of the block in "{}":
+
+@if(isLoggedIn) {
+    <p>Hello, @user</p>
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt
new file mode 100644
index 0000000000..c7ec7c7f17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt
@@ -0,0 +1,67 @@
+RazorDocument - [0..43)::43 - [<p attr="@if (true) <p attr='@foo'> }"></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..43)::43 - [<p attr="@if (true) <p attr='@foo'> }"></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..43)::41 - attr - DoubleQuotes - Unbound - [ attr="@if (true) <p attr='@foo'> }"></p>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..7)::4 - [attr] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[attr];
+                    Equals;[=];
+                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [9..43)::34
+                        MarkupDynamicAttributeValue - [9..43)::34 - [@if (true) <p attr='@foo'> }"></p>]
+                            GenericBlock - [9..43)::34
+                                CSharpCodeBlock - [9..43)::34
+                                    CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [10..20)::10 - [if (true) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[if];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Keyword;[true];
+                                        RightParenthesis;[)];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [20..43)::23
+                                        MarkupElement - [20..43)::23
+                                            MarkupStartTag - [20..35)::15 - [<p attr='@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[p];
+                                                MarkupAttributeBlock - [22..34)::12 - [ attr='@foo']
+                                                    MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Whitespace;[ ];
+                                                    MarkupTextLiteral - [23..27)::4 - [attr] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        Text;[attr];
+                                                    Equals;[=];
+                                                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                        SingleQuote;['];
+                                                    GenericBlock - [29..33)::4
+                                                        MarkupDynamicAttributeValue - [29..33)::4 - [@foo]
+                                                            GenericBlock - [29..33)::4
+                                                                CSharpCodeBlock - [29..33)::4
+                                                                    CSharpImplicitExpression - [29..33)::4
+                                                                        CSharpTransition - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                            Transition;[@];
+                                                                        CSharpImplicitExpressionBody - [30..33)::3
+                                                                            CSharpCodeBlock - [30..33)::3
+                                                                                CSharpExpressionLiteral - [30..33)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                                    Identifier;[foo];
+                                                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                        SingleQuote;['];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [35..39)::4 - [ }">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[}];
+                                                DoubleQuote;["];
+                                                CloseAngle;[>];
+                                            MarkupEndTag - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[p];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [43..43)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Marker;[];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.tspans.txt
new file mode 100644
index 0000000000..2dbca568cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.cspans.txt
new file mode 100644
index 0000000000..5c5c8a05bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (8:0,8 [5] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [15] )
+Markup span at (13:0,13 [10] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
new file mode 100644
index 0000000000..8f2705857a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..23)::23 - [<p bar='false  <strong>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23 - [<p bar='false  <strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..23)::21 - bar - SingleQuotes - Unbound - [ bar='false  <strong>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [8..23)::15
+                        MarkupLiteralAttributeValue - [8..13)::5 - [false]
+                            MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                        MarkupLiteralAttributeValue - [13..23)::10 - [  <strong>]
+                            MarkupTextLiteral - [13..15)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[strong];
+                                CloseAngle;[>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.tspans.txt
new file mode 100644
index 0000000000..72fccbbfdc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.cspans.txt
new file mode 100644
index 0000000000..9747a806f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (8:0,8 [5] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [14] )
+Markup span at (13:0,13 [9] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
new file mode 100644
index 0000000000..27f487ab85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..23)::23 - [<p bar='false  <strong']
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23 - [<p bar='false  <strong'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..23)::21 - bar - SingleQuotes - Unbound - [ bar='false  <strong']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [8..22)::14
+                        MarkupLiteralAttributeValue - [8..13)::5 - [false]
+                            MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                        MarkupLiteralAttributeValue - [13..22)::9 - [  <strong]
+                            MarkupTextLiteral - [13..15)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [15..22)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[strong];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.tspans.txt
new file mode 100644
index 0000000000..72fccbbfdc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.cspans.txt
new file mode 100644
index 0000000000..8a404a053c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (7:0,7 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.diag.txt
new file mode 100644
index 0000000000..00e5e03e70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,13): Error RZ1030: TagHelper attributes must be well-formed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
new file mode 100644
index 0000000000..2b87ff47b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..13)::13 - [<p bar=false']
+    MarkupBlock - [0..13)::13
+        MarkupTagHelperElement - [0..13)::13 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..13)::13 - [<p bar=false'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - bar - DoubleQuotes - Unbound - [ bar=false]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [7..12)::5
+                        MarkupLiteralAttributeValue - [7..12)::5 - [false]
+                            MarkupTextLiteral - [7..12)::5 - [false] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                MarkupMiscAttributeContent - [12..13)::1
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.tspans.txt
new file mode 100644
index 0000000000..17a2d8cf26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [13] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.cspans.txt
new file mode 100644
index 0000000000..948bed3775
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.cspans.txt
@@ -0,0 +1 @@
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
new file mode 100644
index 0000000000..be1e33691a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..14)::14 - [<p bar="false']
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..14)::14 - [<p bar="false'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - bar - DoubleQuotes - Unbound - [ bar="false']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [8..14)::6
+                        MarkupLiteralAttributeValue - [8..14)::6 - [false']
+                            MarkupTextLiteral - [8..14)::6 - [false'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                                SingleQuote;['];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.tspans.txt
new file mode 100644
index 0000000000..d4769a773a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [14] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.cspans.txt
new file mode 100644
index 0000000000..ea7a88a5bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
new file mode 100644
index 0000000000..75e49cc462
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..20)::20 - [<p bar="false' ></p>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..20)::20 - [<p bar="false' ></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..20)::18 - bar - DoubleQuotes - Unbound - [ bar="false' ></p>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [8..20)::12
+                        MarkupLiteralAttributeValue - [8..14)::6 - [false']
+                            MarkupTextLiteral - [8..14)::6 - [false'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                                SingleQuote;['];
+                        MarkupLiteralAttributeValue - [14..20)::6 - [ ></p>]
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [15..20)::5 - [></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                CloseAngle;[>];
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.tspans.txt
new file mode 100644
index 0000000000..66adb496db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [20] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.diag.txt
new file mode 100644
index 0000000000..2bc23b0f86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,12): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt
new file mode 100644
index 0000000000..d76bdc3899
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..18)::18 - [<p foo bar<strong>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..10)::10 - [<p foo bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..6)::4 - foo - Minimized - Unbound - [ foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                MarkupMinimizedTagHelperAttribute - [6..10)::4 - bar - Minimized - Unbound - [ bar]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [10..18)::8 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [10..18)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.tspans.txt
new file mode 100644
index 0000000000..cc7354bc19
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [18] ) - ptaghelper
+TagHelper span at (10:0,10 [8] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.cspans.txt
new file mode 100644
index 0000000000..ccaa1b3f13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.cspans.txt
@@ -0,0 +1 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.diag.txt
new file mode 100644
index 0000000000..00e5e03e70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,13): Error RZ1030: TagHelper attributes must be well-formed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
new file mode 100644
index 0000000000..19770a0945
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..25)::25 - [<p class=btn" bar<strong>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p class=btn" bar<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=btn]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [btn]
+                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                MarkupMiscAttributeContent - [12..25)::13
+                    MarkupTextLiteral - [12..25)::13 - [" bar<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                        Whitespace;[ ];
+                        Text;[bar];
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.tspans.txt
new file mode 100644
index 0000000000..b9ccfbed4b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.cspans.txt
new file mode 100644
index 0000000000..7c9bbe1aa9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [2] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
new file mode 100644
index 0000000000..e6dd180a67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..19)::19 - [<person age="12" />]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..19)::19 - [<person age="12" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [16..17)::1
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.tspans.txt
new file mode 100644
index 0000000000..096b786f52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [19] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.cspans.txt
new file mode 100644
index 0000000000..93c1eb44f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.cspans.txt
@@ -0,0 +1,5 @@
+Code span at (13:0,13 [2] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [73] )
+Code span at (27:0,27 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [73] )
+Markup span at (47:0,47 [1] ) (Accepts:None) - Parent: Markup block at (47:0,47 [2] )
+Markup span at (48:0,48 [1] ) (Accepts:None) - Parent: Markup block at (47:0,47 [2] )
+Markup span at (49:0,49 [20] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
new file mode 100644
index 0000000000..1ae7742122
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@BoundStringAttribute" />]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..73)::73 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@BoundStringAttribute" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..39)::12
+                        CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [40..70)::30 - name - DoubleQuotes - Bound - [ name="@@BoundStringAttribute"]
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [47..69)::22
+                        MarkupBlock - [47..49)::2
+                            MarkupTextLiteral - [47..48)::1 - [@] - Gen<LitAttr:@(47:0,47)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [48..49)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupTextLiteral - [49..69)::20 - [BoundStringAttribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[BoundStringAttribute];
+                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [70..71)::1
+                    MarkupTextLiteral - [70..71)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.tspans.txt
new file mode 100644
index 0000000000..66b66f6b27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [73] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt
new file mode 100644
index 0000000000..7d194474a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt
@@ -0,0 +1,12 @@
+Code span at (13:0,13 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [2] )
+Code span at (14:0,14 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [2] )
+Code span at (15:0,15 [0] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (15:0,15 [7] )
+Code span at (15:0,15 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (15:0,15 [7] )
+Code span at (16:0,16 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (15:0,15 [7] )
+Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (15:0,15 [7] )
+Code span at (21:0,21 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (15:0,15 [7] )
+Code span at (34:0,34 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [77] )
+Markup span at (54:0,54 [5] ) (Accepts:Any) - Parent: Markup block at (54:0,54 [19] )
+Markup span at (59:0,59 [1] ) (Accepts:Any) - Parent: Markup block at (59:0,59 [14] )
+Transition span at (60:0,60 [1] ) (Accepts:None) - Parent: Expression block at (60:0,60 [13] )
+Code span at (61:0,61 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (60:0,60 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
new file mode 100644
index 0000000000..cff16eb252
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
@@ -0,0 +1,85 @@
+RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" name="Time: @DateTime.Now" />]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" name="Time: @DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..23)::16 - age - DoubleQuotes - Bound - [ age="@@@(11+1)"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..22)::9
+                        MarkupBlock - [13..15)::2
+                            CSharpExpressionLiteral - [13..14)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Transition;[@];
+                            CSharpEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Transition;[@];
+                        MarkupBlock - [15..22)::7
+                            CSharpExpressionLiteral - [15..15)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Marker;[];
+                            CSharpCodeBlock - [15..22)::7
+                                CSharpImplicitExpression - [15..22)::7
+                                    CSharpTransition - [15..15)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [15..22)::7
+                                        CSharpCodeBlock - [15..22)::7
+                                            CSharpExpressionLiteral - [15..16)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [16..17)::1 - [(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                LeftParenthesis;[(];
+                                            CSharpExpressionLiteral - [17..21)::4 - [11+1] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                IntegerLiteral;[11];
+                                                Plus;[+];
+                                                IntegerLiteral;[1];
+                                            CSharpExpressionLiteral - [21..22)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                RightParenthesis;[)];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [23..47)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [24..32)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..46)::12
+                        CSharpExpressionLiteral - [34..46)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [47..74)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
+                    MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [48..52)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [53..54)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [54..73)::19
+                        MarkupTextLiteral - [54..59)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [59..73)::14
+                            MarkupTextLiteral - [59..60)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [60..73)::13
+                                CSharpImplicitExpression - [60..73)::13
+                                    CSharpTransition - [60..61)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [61..73)::12
+                                        CSharpCodeBlock - [61..73)::12
+                                            CSharpExpressionLiteral - [61..73)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [73..74)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [74..75)::1
+                    MarkupTextLiteral - [74..75)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.tspans.txt
new file mode 100644
index 0000000000..905f5d687a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [77] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.cspans.txt
new file mode 100644
index 0000000000..53bec4dfc2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.cspans.txt
@@ -0,0 +1,4 @@
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Statement block at (13:0,13 [22] )
+MetaCode span at (14:0,14 [1] ) (Accepts:None) - Parent: Statement block at (13:0,13 [22] )
+Code span at (15:0,15 [19] ) (Accepts:Any) - Parent: Statement block at (13:0,13 [22] )
+MetaCode span at (34:0,34 [1] ) (Accepts:None) - Parent: Statement block at (13:0,13 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt
new file mode 100644
index 0000000000..58fba8ce3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..39)::39 - [<person age="@{flag == 0 ? 11 : 12}" />]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..39)::39 - [<person age="@{flag == 0 ? 11 : 12}" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..36)::29 - age - DoubleQuotes - Bound - [ age="@{flag == 0 ? 11 : 12}"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..35)::22
+                        MarkupBlock - [13..35)::22
+                            CSharpCodeBlock - [13..35)::22
+                                CSharpStatement - [13..35)::22
+                                    CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementBody - [14..35)::21
+                                        RazorMetaCode - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            LeftBrace;[{];
+                                        CSharpCodeBlock - [15..34)::19
+                                            CSharpStatementLiteral - [15..34)::19 - [flag == 0 ? 11 : 12] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                                Identifier;[flag];
+                                                Whitespace;[ ];
+                                                Equals;[==];
+                                                Whitespace;[ ];
+                                                IntegerLiteral;[0];
+                                                Whitespace;[ ];
+                                                QuestionMark;[?];
+                                                Whitespace;[ ];
+                                                IntegerLiteral;[11];
+                                                Whitespace;[ ];
+                                                Colon;[:];
+                                                Whitespace;[ ];
+                                                IntegerLiteral;[12];
+                                        RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            RightBrace;[}];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [36..37)::1
+                    MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.tspans.txt
new file mode 100644
index 0000000000..14c5fecb18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [39] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.cspans.txt
new file mode 100644
index 0000000000..f743b23285
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.cspans.txt
@@ -0,0 +1 @@
+Code span at (18:0,18 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
new file mode 100644
index 0000000000..3a4eb926df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..34)::34 - [<person birthday="DateTime.Now" />]
+    MarkupBlock - [0..34)::34
+        MarkupTagHelperElement - [0..34)::34 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..34)::34 - [<person birthday="DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..31)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..30)::12
+                        CSharpExpressionLiteral - [18..30)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [31..32)::1
+                    MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.tspans.txt
new file mode 100644
index 0000000000..f873839265
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [34] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.cspans.txt
new file mode 100644
index 0000000000..47295f8488
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [18] )
+Code span at (14:0,14 [17] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (13:0,13 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
new file mode 100644
index 0000000000..36d6def7eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..35)::35 - [<person age="@DateTime.Now.Year" />]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..35)::35 - [<person age="@DateTime.Now.Year" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..32)::25 - age - DoubleQuotes - Bound - [ age="@DateTime.Now.Year"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..31)::18
+                        MarkupBlock - [13..31)::18
+                            CSharpCodeBlock - [13..31)::18
+                                CSharpImplicitExpression - [13..31)::18
+                                    CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [14..31)::17
+                                        CSharpCodeBlock - [14..31)::17
+                                            CSharpExpressionLiteral - [14..31)::17 - [DateTime.Now.Year] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                                                Dot;[.];
+                                                Identifier;[Year];
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [32..33)::1
+                    MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.tspans.txt
new file mode 100644
index 0000000000..4c67f60b6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.cspans.txt
new file mode 100644
index 0000000000..3c2486e3b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.cspans.txt
@@ -0,0 +1,3 @@
+Code span at (13:0,13 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [19] )
+Code span at (14:0,14 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (14:0,14 [18] )
+Code span at (15:0,15 [17] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (14:0,14 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
new file mode 100644
index 0000000000..2514097fc9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..36)::36 - [<person age=" @DateTime.Now.Year" />]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..36)::36 - [<person age=" @DateTime.Now.Year" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..33)::26 - age - DoubleQuotes - Bound - [ age=" @DateTime.Now.Year"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..32)::19
+                        MarkupBlock - [13..32)::19
+                            CSharpExpressionLiteral - [13..14)::1 - [ ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [14..32)::18
+                                CSharpImplicitExpression - [14..32)::18
+                                    CSharpTransition - [14..14)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [14..32)::18
+                                        CSharpCodeBlock - [14..32)::18
+                                            CSharpExpressionLiteral - [14..15)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [15..32)::17 - [DateTime.Now.Year] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                                                Dot;[.];
+                                                Identifier;[Year];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [33..34)::1
+                    MarkupTextLiteral - [33..34)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.tspans.txt
new file mode 100644
index 0000000000..232251afb7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [36] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.cspans.txt
new file mode 100644
index 0000000000..7dadb4349b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (14:0,14 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
new file mode 100644
index 0000000000..b7c33d5ee7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..22)::22 - [<person name="John" />]
+    MarkupBlock - [0..22)::22
+        MarkupTagHelperElement - [0..22)::22 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<person name="John" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..19)::12 - name - DoubleQuotes - Bound - [ name="John"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [14..18)::4
+                        MarkupTextLiteral - [14..18)::4 - [John] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[John];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [19..20)::1
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.tspans.txt
new file mode 100644
index 0000000000..936f7cc167
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [22] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt
new file mode 100644
index 0000000000..fff411360a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (14:0,14 [5] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [19] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (19:0,19 [14] )
+Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (20:0,20 [13] )
+Code span at (21:0,21 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (20:0,20 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
new file mode 100644
index 0000000000..40f512e21a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..37)::37 - [<person name="Time: @DateTime.Now" />]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..37)::37 - [<person name="Time: @DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..34)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [14..33)::19
+                        MarkupTextLiteral - [14..19)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [19..33)::14
+                            MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [20..33)::13
+                                CSharpImplicitExpression - [20..33)::13
+                                    CSharpTransition - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [21..33)::12
+                                        CSharpCodeBlock - [21..33)::12
+                                            CSharpExpressionLiteral - [21..33)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [34..35)::1
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.tspans.txt
new file mode 100644
index 0000000000..c61b8f7089
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [37] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.cspans.txt
new file mode 100644
index 0000000000..99741cf638
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.cspans.txt
@@ -0,0 +1,18 @@
+Code span at (13:0,13 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [14] )
+Code span at (14:0,14 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [14] )
+Code span at (16:0,16 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (16:0,16 [7] )
+Code span at (17:0,17 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [6] )
+Code span at (18:0,18 [5] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [6] )
+Code span at (23:0,23 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [14] )
+Code span at (25:0,25 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (13:0,13 [14] )
+Code span at (39:0,39 [6] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (39:0,39 [46] )
+Code span at (45:0,45 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (45:0,45 [11] )
+Code span at (46:0,46 [10] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (45:0,45 [11] )
+Code span at (56:0,56 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (39:0,39 [46] )
+Code span at (58:0,58 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (58:0,58 [3] )
+Code span at (60:0,60 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (58:0,58 [3] )
+Code span at (61:0,61 [8] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (39:0,39 [46] )
+Code span at (69:0,69 [2] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (39:0,39 [46] )
+Code span at (71:0,71 [1] ) (Accepts:AnyExceptNewline) - Parent: Markup block at (71:0,71 [14] )
+Code span at (72:0,72 [1] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (72:0,72 [13] )
+Code span at (73:0,73 [12] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (72:0,72 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
new file mode 100644
index 0000000000..ffb468a4a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
@@ -0,0 +1,99 @@
+RazorDocument - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now'/>]
+    MarkupBlock - [0..88)::88
+        MarkupTagHelperElement - [0..88)::88 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now'/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..28)::21 - age - DoubleQuotes - Bound - [ age="1 + @value + 2"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..27)::14
+                        CSharpExpressionLiteral - [13..14)::1 - [1] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[1];
+                        CSharpExpressionLiteral - [14..16)::2 - [ +] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[+];
+                        MarkupBlock - [16..23)::7
+                            CSharpExpressionLiteral - [16..17)::1 - [ ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [17..23)::6
+                                CSharpImplicitExpression - [17..23)::6
+                                    CSharpTransition - [17..17)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [17..23)::6
+                                        CSharpCodeBlock - [17..23)::6
+                                            CSharpExpressionLiteral - [17..18)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [18..23)::5 - [value] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[value];
+                        CSharpExpressionLiteral - [23..25)::2 - [ +] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[+];
+                        CSharpExpressionLiteral - [25..27)::2 - [ 2] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[2];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [28..86)::58 - birthday - SingleQuotes - Bound - [ birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now']
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..37)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [39..85)::46
+                        CSharpExpressionLiteral - [39..45)::6 - [(bool)] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[(bool)];
+                        MarkupBlock - [45..56)::11
+                            CSharpCodeBlock - [45..56)::11
+                                CSharpImplicitExpression - [45..56)::11
+                                    CSharpTransition - [45..45)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [45..56)::11
+                                        CSharpCodeBlock - [45..56)::11
+                                            CSharpExpressionLiteral - [45..46)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [46..56)::10 - [Bag["val"]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[Bag];
+                                                LeftBracket;[[];
+                                                StringLiteral;["val"];
+                                                RightBracket;[]];
+                        CSharpExpressionLiteral - [56..58)::2 - [ ?] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                        MarkupBlock - [58..61)::3
+                            CSharpExpressionLiteral - [58..60)::2 - [ @] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                                Transition;[@];
+                            CSharpEphemeralTextLiteral - [60..61)::1 - [@] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Transition;[@];
+                        CSharpExpressionLiteral - [61..69)::8 - [DateTime] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime];
+                        CSharpExpressionLiteral - [69..71)::2 - [ :] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[:];
+                        MarkupBlock - [71..85)::14
+                            CSharpExpressionLiteral - [71..72)::1 - [ ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [72..85)::13
+                                CSharpImplicitExpression - [72..85)::13
+                                    CSharpTransition - [72..72)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [72..85)::13
+                                        CSharpCodeBlock - [72..85)::13
+                                            CSharpExpressionLiteral - [72..73)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [73..85)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.tspans.txt
new file mode 100644
index 0000000000..9cdbc1f1f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [88] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt
new file mode 100644
index 0000000000..14eb11f1cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt
@@ -0,0 +1,6 @@
+Code span at (13:0,13 [2] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [70] )
+Code span at (27:0,27 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [70] )
+Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [19] )
+Markup span at (52:0,52 [1] ) (Accepts:Any) - Parent: Markup block at (52:0,52 [14] )
+Transition span at (53:0,53 [1] ) (Accepts:None) - Parent: Expression block at (53:0,53 [13] )
+Code span at (54:0,54 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (53:0,53 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
new file mode 100644
index 0000000000..400226b998
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
@@ -0,0 +1,63 @@
+RazorDocument - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Time: @DateTime.Now" />]
+    MarkupBlock - [0..70)::70
+        MarkupTagHelperElement - [0..70)::70 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Time: @DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..39)::12
+                        CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [40..67)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [47..66)::19
+                        MarkupTextLiteral - [47..52)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [52..66)::14
+                            MarkupTextLiteral - [52..53)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [53..66)::13
+                                CSharpImplicitExpression - [53..66)::13
+                                    CSharpTransition - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [54..66)::12
+                                        CSharpCodeBlock - [54..66)::12
+                                            CSharpExpressionLiteral - [54..66)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [66..67)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [67..68)::1
+                    MarkupTextLiteral - [67..68)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.tspans.txt
new file mode 100644
index 0000000000..ccef1ebc65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [70] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt
new file mode 100644
index 0000000000..b593b2e5bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt
@@ -0,0 +1,8 @@
+Code span at (13:0,13 [2] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [73] )
+Code span at (27:0,27 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [73] )
+Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [22] )
+Markup span at (52:0,52 [2] ) (Accepts:None) - Parent: Markup block at (52:0,52 [3] )
+Markup span at (54:0,54 [1] ) (Accepts:None) - Parent: Markup block at (52:0,52 [3] )
+Markup span at (55:0,55 [1] ) (Accepts:Any) - Parent: Markup block at (55:0,55 [14] )
+Transition span at (56:0,56 [1] ) (Accepts:None) - Parent: Expression block at (56:0,56 [13] )
+Code span at (57:0,57 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (56:0,56 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
new file mode 100644
index 0000000000..a6361b8d0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
@@ -0,0 +1,69 @@
+RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Time: @@ @DateTime.Now" />]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..73)::73 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Time: @@ @DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..39)::12
+                        CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [40..70)::30 - name - DoubleQuotes - Bound - [ name="Time: @@ @DateTime.Now"]
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [47..69)::22
+                        MarkupTextLiteral - [47..52)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [52..55)::3
+                            MarkupTextLiteral - [52..54)::2 - [ @] - Gen<LitAttr: @(52:0,52)> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [54..55)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupBlock - [55..69)::14
+                            MarkupTextLiteral - [55..56)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [56..69)::13
+                                CSharpImplicitExpression - [56..69)::13
+                                    CSharpTransition - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [57..69)::12
+                                        CSharpCodeBlock - [57..69)::12
+                                            CSharpExpressionLiteral - [57..69)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [70..71)::1
+                    MarkupTextLiteral - [70..71)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.tspans.txt
new file mode 100644
index 0000000000..66b66f6b27
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [73] ) - PersonTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.diag.txt
new file mode 100644
index 0000000000..39eecf8c70
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.diag.txt
@@ -0,0 +1,2 @@
+(1,8): Error RZ2008: Attribute 'boundbool' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
+(1,18): Error RZ2008: Attribute 'boundbooldict-key' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Boolean' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt
new file mode 100644
index 0000000000..116e8180ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..37)::37 - [<input boundbool boundbooldict-key />]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - input[SelfClosing] - InputTagHelper
+            MarkupTagHelperStartTag - [0..37)::37 - [<input boundbool boundbooldict-key />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..16)::10 - boundbool - Minimized - Bound - [ boundbool]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..16)::9 - [boundbool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbool];
+                MarkupMinimizedTagHelperAttribute - [16..34)::18 - boundbooldict-key - Minimized - Bound - [ boundbooldict-key]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..34)::17 - [boundbooldict-key] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbooldict-key];
+                MarkupMiscAttributeContent - [34..35)::1
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.tspans.txt
new file mode 100644
index 0000000000..c28ec2a704
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [37] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt
new file mode 100644
index 0000000000..0391bc3c6c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
+Code span at (41:0,41 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (41:0,41 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (42:0,42 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt
new file mode 100644
index 0000000000..f1241cf3ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..42)::42 - [@{<input data-required='@DateTime.Now' />}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..41)::39
+                            MarkupTagHelperElement - [2..41)::39 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..41)::39 - [<input data-required='@DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..38)::30 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..37)::13
+                                            CSharpCodeBlock - [24..37)::13
+                                                CSharpImplicitExpression - [24..37)::13
+                                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [25..37)::12
+                                                        CSharpCodeBlock - [25..37)::12
+                                                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [38..39)::1
+                                        MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.tspans.txt
new file mode 100644
index 0000000000..8c4810da56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [39] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.cspans.txt
new file mode 100644
index 0000000000..b97cd38cd0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (24:0,24 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [31] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt
new file mode 100644
index 0000000000..c6f66a1cf4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..34)::34 - [@{<input data-required='value' />}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..33)::31 - [<input data-required='value' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..30)::22 - data-required - SingleQuotes - Unbound - [ data-required='value']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..29)::5
+                                            MarkupTextLiteral - [24..29)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[value];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [30..31)::1
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.tspans.txt
new file mode 100644
index 0000000000..6104535694
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [31] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt
new file mode 100644
index 0000000000..b42754acf3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Markup span at (24:0,24 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [20] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [13] )
+Code span at (32:0,32 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [13] )
+Code span at (48:0,48 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
+MetaCode span at (48:0,48 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Markup span at (49:0,49 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt
new file mode 100644
index 0000000000..917a150b95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..49)::49 - [@{<input data-required='prefix @DateTime.Now' />}]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpStatement - [0..49)::49
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..49)::48
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..48)::46
+                        MarkupBlock - [2..48)::46
+                            MarkupTagHelperElement - [2..48)::46 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..48)::46 - [<input data-required='prefix @DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..45)::37 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..44)::20
+                                            MarkupTextLiteral - [24..31)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[prefix];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [31..44)::13
+                                                CSharpImplicitExpression - [31..44)::13
+                                                    CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [32..44)::12
+                                                        CSharpCodeBlock - [32..44)::12
+                                                            CSharpExpressionLiteral - [32..44)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                        MarkupTextLiteral - [44..45)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [45..46)::1
+                                        MarkupTextLiteral - [45..46)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [48..48)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [49..49)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.tspans.txt
new file mode 100644
index 0000000000..17bc990785
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [46] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt
new file mode 100644
index 0000000000..90cbfa0f75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
+Markup span at (37:0,37 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [20] )
+Code span at (48:0,48 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
+MetaCode span at (48:0,48 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
+Markup span at (49:0,49 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt
new file mode 100644
index 0000000000..cbfa94a75a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt
@@ -0,0 +1,52 @@
+RazorDocument - [0..49)::49 - [@{<input data-required='@DateTime.Now suffix' />}]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpStatement - [0..49)::49
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..49)::48
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..48)::46
+                        MarkupBlock - [2..48)::46
+                            MarkupTagHelperElement - [2..48)::46 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..48)::46 - [<input data-required='@DateTime.Now suffix' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..45)::37 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now suffix']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..44)::20
+                                            CSharpCodeBlock - [24..37)::13
+                                                CSharpImplicitExpression - [24..37)::13
+                                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [25..37)::12
+                                                        CSharpCodeBlock - [25..37)::12
+                                                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [37..44)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[suffix];
+                                        MarkupTextLiteral - [44..45)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [45..46)::1
+                                        MarkupTextLiteral - [45..46)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [48..48)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [49..49)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.tspans.txt
new file mode 100644
index 0000000000..17bc990785
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [46] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt
new file mode 100644
index 0000000000..912f6a9910
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Markup span at (24:0,24 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [27] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [13] )
+Code span at (32:0,32 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [13] )
+Markup span at (44:0,44 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [27] )
+Code span at (55:0,55 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [56] )
+MetaCode span at (55:0,55 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
+Markup span at (56:0,56 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt
new file mode 100644
index 0000000000..c511a32c13
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..56)::56 - [@{<input data-required='prefix @DateTime.Now suffix' />}]
+    MarkupBlock - [0..56)::56
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpStatement - [0..56)::56
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..56)::55
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..55)::53
+                        MarkupBlock - [2..55)::53
+                            MarkupTagHelperElement - [2..55)::53 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..55)::53 - [<input data-required='prefix @DateTime.Now suffix' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..52)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..51)::27
+                                            MarkupTextLiteral - [24..31)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[prefix];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [31..44)::13
+                                                CSharpImplicitExpression - [31..44)::13
+                                                    CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [32..44)::12
+                                                        CSharpCodeBlock - [32..44)::12
+                                                            CSharpExpressionLiteral - [32..44)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [44..51)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[suffix];
+                                        MarkupTextLiteral - [51..52)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [52..53)::1
+                                        MarkupTextLiteral - [52..53)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [55..55)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [56..56)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.tspans.txt
new file mode 100644
index 0000000000..b3c0a3f1b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [53] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt
new file mode 100644
index 0000000000..a02a857505
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+Markup span at (38:0,38 [7] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [27] )
+Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [13] )
+Code span at (46:0,46 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [13] )
+Markup span at (58:0,58 [7] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [27] )
+Code span at (84:0,84 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [85] )
+MetaCode span at (84:0,84 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
+Markup span at (85:0,85 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt
new file mode 100644
index 0000000000..3233942ef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt
@@ -0,0 +1,65 @@
+RazorDocument - [0..85)::85 - [@{<input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />}]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..85)::85
+            CSharpStatement - [0..85)::85
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..85)::84
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..84)::82
+                        MarkupBlock - [2..84)::82
+                            MarkupTagHelperElement - [2..84)::82 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..84)::82 - [<input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..22)::14 - pre-attribute - Minimized - Unbound - [ pre-attribute]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [pre-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[pre-attribute];
+                                    MarkupTagHelperAttribute - [22..66)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [23..36)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [38..65)::27
+                                            MarkupTextLiteral - [38..45)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[prefix];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [45..58)::13
+                                                CSharpImplicitExpression - [45..58)::13
+                                                    CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [46..58)::12
+                                                        CSharpCodeBlock - [46..58)::12
+                                                            CSharpExpressionLiteral - [46..58)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [58..65)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[suffix];
+                                        MarkupTextLiteral - [65..66)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [66..81)::15 - post-attribute - Minimized - Unbound - [ post-attribute]
+                                        MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [67..81)::14 - [post-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[post-attribute];
+                                    MarkupMiscAttributeContent - [81..82)::1
+                                        MarkupTextLiteral - [81..82)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [84..84)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [84..85)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.tspans.txt
new file mode 100644
index 0000000000..c5d9978610
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [82] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt
new file mode 100644
index 0000000000..636e0fa0e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [63] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
+Markup span at (37:0,37 [8] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [34] )
+Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [13] )
+Code span at (46:0,46 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [13] )
+Code span at (62:0,62 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [63] )
+MetaCode span at (62:0,62 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
+Markup span at (63:0,63 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [63] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt
new file mode 100644
index 0000000000..f9bd7098d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt
@@ -0,0 +1,63 @@
+RazorDocument - [0..63)::63 - [@{<input data-required='@DateTime.Now middle @DateTime.Now' />}]
+    MarkupBlock - [0..63)::63
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..63)::63
+            CSharpStatement - [0..63)::63
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..63)::62
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..62)::60
+                        MarkupBlock - [2..62)::60
+                            MarkupTagHelperElement - [2..62)::60 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..62)::60 - [<input data-required='@DateTime.Now middle @DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..59)::51 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now middle @DateTime.Now']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..58)::34
+                                            CSharpCodeBlock - [24..37)::13
+                                                CSharpImplicitExpression - [24..37)::13
+                                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [25..37)::12
+                                                        CSharpCodeBlock - [25..37)::12
+                                                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [37..45)::8 - [ middle ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[middle];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [45..58)::13
+                                                CSharpImplicitExpression - [45..58)::13
+                                                    CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [46..58)::12
+                                                        CSharpCodeBlock - [46..58)::12
+                                                            CSharpExpressionLiteral - [46..58)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                        MarkupTextLiteral - [58..59)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [59..60)::1
+                                        MarkupTextLiteral - [59..60)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [62..62)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [62..63)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [63..63)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.tspans.txt
new file mode 100644
index 0000000000..d2ec83b74f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [60] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt
new file mode 100644
index 0000000000..0f363fa410
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [13] )
+Code span at (23:0,23 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt
new file mode 100644
index 0000000000..005a8559dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..39)::39 - [<input data-required='@DateTime.Now' />]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..39)::39 - [<input data-required='@DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..36)::30 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..35)::13
+                        CSharpCodeBlock - [22..35)::13
+                            CSharpImplicitExpression - [22..35)::13
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [23..35)::12
+                                    CSharpCodeBlock - [23..35)::12
+                                        CSharpExpressionLiteral - [23..35)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [36..37)::1
+                    MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.tspans.txt
new file mode 100644
index 0000000000..12328928a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [39] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.cspans.txt
new file mode 100644
index 0000000000..c7e4c20b33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt
new file mode 100644
index 0000000000..6add56eab5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..31)::31 - [<input data-required='value' />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..31)::31 - [<input data-required='value' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..28)::22 - data-required - SingleQuotes - Unbound - [ data-required='value']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..27)::5
+                        MarkupTextLiteral - [22..27)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[value];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [28..29)::1
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.tspans.txt
new file mode 100644
index 0000000000..230d60af71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt
new file mode 100644
index 0000000000..1500c5924f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [20] )
+Transition span at (29:0,29 [1] ) (Accepts:None) - Parent: Expression block at (29:0,29 [13] )
+Code span at (30:0,30 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (29:0,29 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt
new file mode 100644
index 0000000000..c473d31919
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..46)::46 - [<input data-required='prefix @DateTime.Now' />]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..46)::46 - [<input data-required='prefix @DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..43)::37 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..42)::20
+                        MarkupTextLiteral - [22..29)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[prefix];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [29..42)::13
+                            CSharpImplicitExpression - [29..42)::13
+                                CSharpTransition - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [30..42)::12
+                                    CSharpCodeBlock - [30..42)::12
+                                        CSharpExpressionLiteral - [30..42)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                    MarkupTextLiteral - [42..43)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [43..44)::1
+                    MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.tspans.txt
new file mode 100644
index 0000000000..81cfc6f2a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [46] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt
new file mode 100644
index 0000000000..7a49d77d28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt
@@ -0,0 +1,3 @@
+Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [13] )
+Code span at (23:0,23 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [13] )
+Markup span at (35:0,35 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt
new file mode 100644
index 0000000000..1933f85f88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..46)::46 - [<input data-required='@DateTime.Now suffix' />]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..46)::46 - [<input data-required='@DateTime.Now suffix' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..43)::37 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now suffix']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..42)::20
+                        CSharpCodeBlock - [22..35)::13
+                            CSharpImplicitExpression - [22..35)::13
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [23..35)::12
+                                    CSharpCodeBlock - [23..35)::12
+                                        CSharpExpressionLiteral - [23..35)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [35..42)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[suffix];
+                    MarkupTextLiteral - [42..43)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [43..44)::1
+                    MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.tspans.txt
new file mode 100644
index 0000000000..81cfc6f2a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [46] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt
new file mode 100644
index 0000000000..4ffa71d61f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [27] )
+Transition span at (29:0,29 [1] ) (Accepts:None) - Parent: Expression block at (29:0,29 [13] )
+Code span at (30:0,30 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (29:0,29 [13] )
+Markup span at (42:0,42 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt
new file mode 100644
index 0000000000..1e750fbb5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..53)::53 - [<input data-required='prefix @DateTime.Now suffix' />]
+    MarkupBlock - [0..53)::53
+        MarkupTagHelperElement - [0..53)::53 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..53)::53 - [<input data-required='prefix @DateTime.Now suffix' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..50)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..49)::27
+                        MarkupTextLiteral - [22..29)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[prefix];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [29..42)::13
+                            CSharpImplicitExpression - [29..42)::13
+                                CSharpTransition - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [30..42)::12
+                                    CSharpCodeBlock - [30..42)::12
+                                        CSharpExpressionLiteral - [30..42)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [42..49)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[suffix];
+                    MarkupTextLiteral - [49..50)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [50..51)::1
+                    MarkupTextLiteral - [50..51)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.tspans.txt
new file mode 100644
index 0000000000..0a6025f261
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [53] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt
new file mode 100644
index 0000000000..72d6434606
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (36:0,36 [7] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [27] )
+Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Expression block at (43:0,43 [13] )
+Code span at (44:0,44 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (43:0,43 [13] )
+Markup span at (56:0,56 [7] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt
new file mode 100644
index 0000000000..2389a37fac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..82)::82 - [<input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />]
+    MarkupBlock - [0..82)::82
+        MarkupTagHelperElement - [0..82)::82 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..82)::82 - [<input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..20)::14 - pre-attribute - Minimized - Unbound - [ pre-attribute]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [pre-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[pre-attribute];
+                MarkupTagHelperAttribute - [20..64)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [21..34)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [36..63)::27
+                        MarkupTextLiteral - [36..43)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[prefix];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [43..56)::13
+                            CSharpImplicitExpression - [43..56)::13
+                                CSharpTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [44..56)::12
+                                    CSharpCodeBlock - [44..56)::12
+                                        CSharpExpressionLiteral - [44..56)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [56..63)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[suffix];
+                    MarkupTextLiteral - [63..64)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [64..79)::15 - post-attribute - Minimized - Unbound - [ post-attribute]
+                    MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [65..79)::14 - [post-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[post-attribute];
+                MarkupMiscAttributeContent - [79..80)::1
+                    MarkupTextLiteral - [79..80)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.tspans.txt
new file mode 100644
index 0000000000..368fd6b6d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [82] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt
new file mode 100644
index 0000000000..4cf3018f98
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt
@@ -0,0 +1,5 @@
+Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [13] )
+Code span at (23:0,23 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [13] )
+Markup span at (35:0,35 [8] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [34] )
+Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Expression block at (43:0,43 [13] )
+Code span at (44:0,44 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (43:0,43 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt
new file mode 100644
index 0000000000..f8d3ba9284
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..60)::60 - [<input data-required='@DateTime.Now middle @DateTime.Now' />]
+    MarkupBlock - [0..60)::60
+        MarkupTagHelperElement - [0..60)::60 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..60)::60 - [<input data-required='@DateTime.Now middle @DateTime.Now' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..57)::51 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now middle @DateTime.Now']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..56)::34
+                        CSharpCodeBlock - [22..35)::13
+                            CSharpImplicitExpression - [22..35)::13
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [23..35)::12
+                                    CSharpCodeBlock - [23..35)::12
+                                        CSharpExpressionLiteral - [23..35)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [35..43)::8 - [ middle ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[middle];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [43..56)::13
+                            CSharpImplicitExpression - [43..56)::13
+                                CSharpTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [44..56)::12
+                                    CSharpCodeBlock - [44..56)::12
+                                        CSharpExpressionLiteral - [44..56)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                    MarkupTextLiteral - [56..57)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [57..58)::1
+                    MarkupTextLiteral - [57..58)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.tspans.txt
new file mode 100644
index 0000000000..cd85eb4a9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [60] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.cspans.txt
new file mode 100644
index 0000000000..b036e36e17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
+Markup span at (1:0,1 [1] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [1] )
+Markup span at (5:0,5 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt
new file mode 100644
index 0000000000..d7c4029b8d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..11)::11 - [<<<p>>></p>]
+    MarkupBlock - [0..11)::11
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [1..2)::1
+            MarkupStartTag - [1..2)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [2..11)::9 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..7)::2 - [>>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [7..11)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.tspans.txt
new file mode 100644
index 0000000000..894ab5361e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [9] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt
new file mode 100644
index 0000000000..2961977bf2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [17] )
+Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Expression block at (5:0,5 [13] )
+Code span at (6:0,6 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (5:0,5 [13] )
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [17] )
+Markup span at (20:0,20 [3] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [3] )
+Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [13] )
+Code span at (24:0,24 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [13] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
new file mode 100644
index 0000000000..d7132ba6a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..42)::42 - [<p>< @DateTime.Now ></ @DateTime.Now ></p>]
+    MarkupBlock - [0..42)::42
+        MarkupTagHelperElement - [0..42)::42 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..23)::20
+                MarkupStartTag - [3..20)::17 - [< @DateTime.Now >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    MarkupMiscAttributeContent - [4..19)::15
+                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [5..18)::13
+                            CSharpImplicitExpression - [5..18)::13
+                                CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [6..18)::12
+                                    CSharpCodeBlock - [6..18)::12
+                                        CSharpExpressionLiteral - [6..18)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    CloseAngle;[>];
+                MarkupEndTag - [20..23)::3 - [</ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[<Missing>];
+                    MarkupMiscAttributeContent - [22..23)::1
+                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    CloseAngle;[<Missing>];
+            CSharpCodeBlock - [23..36)::13
+                CSharpImplicitExpression - [23..36)::13
+                    CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [24..36)::12
+                        CSharpCodeBlock - [24..36)::12
+                            CSharpExpressionLiteral - [24..36)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTextLiteral - [36..38)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [38..42)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.tspans.txt
new file mode 100644
index 0000000000..ba17544451
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [42] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.cspans.txt
new file mode 100644
index 0000000000..0e6957363a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt
new file mode 100644
index 0000000000..6287be03cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..6)::6 - [<<p />]
+    MarkupBlock - [0..6)::6
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [1..6)::5 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [1..6)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [3..4)::1
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.tspans.txt
new file mode 100644
index 0000000000..84e47f2a85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (1:0,1 [5] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.cspans.txt
new file mode 100644
index 0000000000..a81209229a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [6] )
+Markup span at (1:0,1 [2] ) (Accepts:Any) - Parent: Markup block at (1:0,1 [2] )
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt
new file mode 100644
index 0000000000..3ad4a9bcc6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..6)::6 - [< p />]
+    MarkupBlock - [0..6)::6
+        MarkupElement - [0..6)::6
+            MarkupStartTag - [0..6)::6 - [< p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                MarkupMinimizedAttributeBlock - [1..3)::2 - [ p]
+                    MarkupTextLiteral - [1..2)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[p];
+                MarkupMiscAttributeContent - [3..4)::1
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.cspans.txt
new file mode 100644
index 0000000000..4f69cb3f10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt
new file mode 100644
index 0000000000..ed83e316d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..12)::12 - [<input <p />]
+    MarkupBlock - [0..12)::12
+        MarkupElement - [0..7)::7
+            MarkupStartTag - [0..7)::7 - [<input ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMiscAttributeContent - [6..7)::1
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [7..12)::5 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [7..12)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [9..10)::1
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.tspans.txt
new file mode 100644
index 0000000000..42777cb027
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (7:0,7 [5] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.cspans.txt
new file mode 100644
index 0000000000..c6be2f1925
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
+Markup span at (1:0,1 [8] ) (Accepts:Any) - Parent: Markup block at (1:0,1 [12] )
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Markup block at (1:0,1 [12] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (1:0,1 [12] )
+Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
new file mode 100644
index 0000000000..cf46a0834f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..19)::19 - [< class="foo" <p />]
+    MarkupBlock - [0..19)::19
+        MarkupElement - [0..14)::14
+            MarkupStartTag - [0..14)::14 - [< class="foo" ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                MarkupAttributeBlock - [1..13)::12 - [ class="foo"]
+                    MarkupTextLiteral - [1..2)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [2..7)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [13..14)::1
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [14..19)::5 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [14..19)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [16..17)::1
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.tspans.txt
new file mode 100644
index 0000000000..ad370b61a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (14:0,14 [5] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.cspans.txt
new file mode 100644
index 0000000000..680a4f547c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [2] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [1] )
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [9] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt
new file mode 100644
index 0000000000..3203e9a1e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..13)::13 - [</<<p>/></p>>]
+    MarkupBlock - [0..13)::13
+        MarkupElement - [0..2)::2
+            MarkupEndTag - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [2..3)::1
+            MarkupStartTag - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [3..12)::9 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [6..8)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [8..12)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [12..13)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.tspans.txt
new file mode 100644
index 0000000000..4efdfadfb9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (3:0,3 [9] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.cspans.txt
new file mode 100644
index 0000000000..026682c72d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [2] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [1] )
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [17] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [8] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt
new file mode 100644
index 0000000000..e7a7bd8bef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..21)::21 - [</<<p>/><strong></p>>]
+    MarkupBlock - [0..21)::21
+        MarkupElement - [0..2)::2
+            MarkupEndTag - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [2..3)::1
+            MarkupStartTag - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [3..20)::17 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [6..8)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupElement - [8..16)::8
+                MarkupStartTag - [8..16)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [16..20)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..21)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.tspans.txt
new file mode 100644
index 0000000000..f66bf28d95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (3:0,3 [17] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt
new file mode 100644
index 0000000000..31aa41b4cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [2] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [1] )
+Transition span at (6:0,6 [1] ) (Accepts:None) - Parent: Expression block at (6:0,6 [13] )
+Code span at (7:0,7 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (6:0,6 [13] )
+Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [30] )
+Markup span at (21:0,21 [8] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [8] )
+Markup span at (33:0,33 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt
new file mode 100644
index 0000000000..d15f747b50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..34)::34 - [</<<p>@DateTime.Now/><strong></p>>]
+    MarkupBlock - [0..34)::34
+        MarkupElement - [0..2)::2
+            MarkupEndTag - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupElement - [2..3)::1
+            MarkupStartTag - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [3..33)::30 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [6..19)::13
+                CSharpImplicitExpression - [6..19)::13
+                    CSharpTransition - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [7..19)::12
+                        CSharpCodeBlock - [7..19)::12
+                            CSharpExpressionLiteral - [7..19)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTextLiteral - [19..21)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupElement - [21..29)::8
+                MarkupStartTag - [21..29)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..33)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [33..34)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.tspans.txt
new file mode 100644
index 0000000000..9953ea6327
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (3:0,3 [30] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt
new file mode 100644
index 0000000000..38e6112313
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Markup span at (5:0,5 [4] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [4] )
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
+Markup span at (25:0,25 [4] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [32] )
+Markup span at (29:0,29 [8] ) (Accepts:Any) - Parent: Tag block at (29:0,29 [8] )
+Markup span at (41:0,41 [11] ) (Accepts:Any) - Parent: Tag block at (41:0,41 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt
new file mode 100644
index 0000000000..d7790cca1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..52)::52 - [</  /<  ><p>@DateTime.Now / ><strong></p></        >]
+    MarkupBlock - [0..52)::52
+        MarkupElement - [0..4)::4
+            MarkupEndTag - [0..4)::4 - [</  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[<Missing>];
+                MarkupMiscAttributeContent - [2..4)::2
+                    MarkupTextLiteral - [2..4)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                CloseAngle;[<Missing>];
+        MarkupTextLiteral - [4..5)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            ForwardSlash;[/];
+        MarkupElement - [5..52)::47
+            MarkupStartTag - [5..9)::4 - [<  >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                MarkupMiscAttributeContent - [6..8)::2
+                    MarkupTextLiteral - [6..8)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [9..41)::32 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                CSharpCodeBlock - [12..25)::13
+                    CSharpImplicitExpression - [12..25)::13
+                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [13..25)::12
+                            CSharpCodeBlock - [13..25)::12
+                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[DateTime];
+                                    Dot;[.];
+                                    Identifier;[Now];
+                MarkupTextLiteral - [25..29)::4 - [ / >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+                MarkupElement - [29..37)::8
+                    MarkupStartTag - [29..37)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [37..41)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupEndTag - [41..52)::11 - [</        >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[<Missing>];
+                MarkupMiscAttributeContent - [43..51)::8
+                    MarkupTextLiteral - [43..51)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.tspans.txt
new file mode 100644
index 0000000000..4d43ab5dde
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (9:0,9 [32] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt
new file mode 100644
index 0000000000..e3af2600c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [64] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [64] )
+Markup span at (64:0,64 [9] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.diag.txt
new file mode 100644
index 0000000000..2578ab72e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.diag.txt
@@ -0,0 +1,2 @@
+(1,54): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,67): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
new file mode 100644
index 0000000000..2ed0823d1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
@@ -0,0 +1,62 @@
+RazorDocument - [0..73)::73 - [<p class=foo dynamic=@DateTime.Now style=color:red;><strong></p></strong>]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..64)::64 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52 - [<p class=foo dynamic=@DateTime.Now style=color:red;>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [52..60)::8 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [52..60)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [60..64)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupElement - [64..73)::9
+            MarkupEndTag - [64..73)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.tspans.txt
new file mode 100644
index 0000000000..13065315b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [64] ) - ptaghelper
+TagHelper span at (52:0,52 [8] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt
new file mode 100644
index 0000000000..f4e5ce935c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [31] )
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [22] )
+Markup span at (36:0,36 [6] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.diag.txt
new file mode 100644
index 0000000000..b1d7d8700f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt
new file mode 100644
index 0000000000..b14f935845
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..42)::42 - [<div><p>Hello <strong>World</strong></div>]
+    MarkupBlock - [0..42)::42
+        MarkupElement - [0..42)::42
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [5..36)::31 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [5..8)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [8..14)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Hello];
+                    Whitespace;[ ];
+                MarkupTagHelperElement - [14..36)::22 - strong[StartTagAndEndTag] - strongtaghelper
+                    MarkupTagHelperStartTag - [14..22)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [22..27)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[World];
+                    MarkupTagHelperEndTag - [27..36)::9 - [</strong>]
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupEndTag - [36..42)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt
new file mode 100644
index 0000000000..36dd08e818
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (5:0,5 [31] ) - ptaghelper
+TagHelper span at (14:0,14 [22] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt
new file mode 100644
index 0000000000..a003b54d78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [22] )
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [13] )
+Markup span at (27:0,27 [6] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.diag.txt
new file mode 100644
index 0000000000..f0fb702841
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.diag.txt
@@ -0,0 +1,2 @@
+(1,7): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,16): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt
new file mode 100644
index 0000000000..d81b716ffb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..33)::33 - [<div><p>Hello <strong>World</div>]
+    MarkupBlock - [0..33)::33
+        MarkupElement - [0..33)::33
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [5..27)::22 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [5..8)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [8..14)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Hello];
+                    Whitespace;[ ];
+                MarkupTagHelperElement - [14..27)::13 - strong[StartTagAndEndTag] - strongtaghelper
+                    MarkupTagHelperStartTag - [14..22)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [22..27)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[World];
+            MarkupEndTag - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt
new file mode 100644
index 0000000000..9fc6edf71a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (5:0,5 [22] ) - ptaghelper
+TagHelper span at (14:0,14 [13] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.cspans.txt
new file mode 100644
index 0000000000..201fd033d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [52] )
+Markup span at (15:0,15 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [52] )
+Markup span at (31:0,31 [10] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [31] )
+Markup span at (43:0,43 [5] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.diag.txt
new file mode 100644
index 0000000000..d177eb6df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
new file mode 100644
index 0000000000..acba7a8979
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..52)::52 - [<p class="foo">Hello <p style="color:red;">World</p>]
+    MarkupBlock - [0..52)::52
+        MarkupTagHelperElement - [0..52)::52 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="foo">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [15..21)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [21..52)::31 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [21..43)::22 - [<p style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    MarkupTagHelperAttribute - [23..42)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..29)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [31..41)::10
+                            MarkupLiteralAttributeValue - [31..41)::10 - [color:red;]
+                                MarkupTextLiteral - [31..41)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [43..48)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [48..52)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.tspans.txt
new file mode 100644
index 0000000000..9cc0f52b9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [52] ) - ptaghelper
+TagHelper span at (21:0,21 [31] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt
new file mode 100644
index 0000000000..646bf548d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt
@@ -0,0 +1,4 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
+Transition span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (32:0,32 [13] )
+Code span at (33:0,33 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (32:0,32 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
new file mode 100644
index 0000000000..62a46d7e1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..51)::51 - [<p class="@DateTime.Now" style='@DateTime.Now'></p>]
+    MarkupBlock - [0..51)::51
+        MarkupTagHelperElement - [0..51)::51 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..47)::47 - [<p class="@DateTime.Now" style='@DateTime.Now'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [32..45)::13
+                        MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
+                            GenericBlock - [32..45)::13
+                                CSharpCodeBlock - [32..45)::13
+                                    CSharpImplicitExpression - [32..45)::13
+                                        CSharpTransition - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [33..45)::12
+                                            CSharpCodeBlock - [33..45)::12
+                                                CSharpExpressionLiteral - [33..45)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [47..51)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.tspans.txt
new file mode 100644
index 0000000000..23e57e8f34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [51] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.cspans.txt
new file mode 100644
index 0000000000..d595d25c40
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.cspans.txt
@@ -0,0 +1,12 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (10:0,10 [64] )
+Code span at (11:0,11 [20] ) (Accepts:Any) - Parent: Statement block at (10:0,10 [64] )
+Transition span at (31:0,31 [6] ) (Accepts:None) - Parent: Tag block at (31:0,31 [6] )
+Markup span at (37:0,37 [3] ) (Accepts:Any) - Parent: Markup block at (31:0,31 [16] )
+Transition span at (40:0,40 [7] ) (Accepts:None) - Parent: Tag block at (40:0,40 [7] )
+Code span at (47:0,47 [27] ) (Accepts:None) - Parent: Statement block at (10:0,10 [64] )
+Transition span at (83:0,83 [1] ) (Accepts:None) - Parent: Statement block at (83:0,83 [64] )
+Code span at (84:0,84 [20] ) (Accepts:Any) - Parent: Statement block at (83:0,83 [64] )
+Transition span at (104:0,104 [6] ) (Accepts:None) - Parent: Tag block at (104:0,104 [6] )
+Markup span at (110:0,110 [3] ) (Accepts:Any) - Parent: Markup block at (104:0,104 [16] )
+Transition span at (113:0,113 [7] ) (Accepts:None) - Parent: Tag block at (113:0,113 [7] )
+Code span at (120:0,120 [27] ) (Accepts:None) - Parent: Statement block at (83:0,83 [64] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
new file mode 100644
index 0000000000..3ebf48a454
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
@@ -0,0 +1,132 @@
+RazorDocument - [0..153)::153 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'></p>]
+    MarkupBlock - [0..153)::153
+        MarkupTagHelperElement - [0..153)::153 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..149)::149 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..75)::73 - class - DoubleQuotes - Unbound - [ class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..74)::64
+                        MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [10..74)::64
+                                CSharpCodeBlock - [10..74)::64
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..31)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [31..47)::16
+                                        MarkupElement - [31..47)::16
+                                            MarkupStartTag - [31..37)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [37..40)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Foo];
+                                            MarkupEndTag - [40..47)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [47..74)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [75..148)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
+                    MarkupTextLiteral - [75..76)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [76..81)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [83..147)::64
+                        MarkupDynamicAttributeValue - [83..147)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [83..147)::64
+                                CSharpCodeBlock - [83..147)::64
+                                    CSharpTransition - [83..84)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [84..104)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [104..120)::16
+                                        MarkupElement - [104..120)::16
+                                            MarkupStartTag - [104..110)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [110..113)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Foo];
+                                            MarkupEndTag - [113..120)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [120..147)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [149..153)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.tspans.txt
new file mode 100644
index 0000000000..112587be7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [153] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt
new file mode 100644
index 0000000000..b49460175d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt
@@ -0,0 +1,5 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
+Transition span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (32:0,32 [13] )
+Code span at (33:0,33 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (32:0,32 [13] )
+Markup span at (47:0,47 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [62] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
new file mode 100644
index 0000000000..9ea39a5bf5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
@@ -0,0 +1,62 @@
+RazorDocument - [0..62)::62 - [<p class="@DateTime.Now" style='@DateTime.Now'>Hello World</p>]
+    MarkupBlock - [0..62)::62
+        MarkupTagHelperElement - [0..62)::62 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..47)::47 - [<p class="@DateTime.Now" style='@DateTime.Now'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [32..45)::13
+                        MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
+                            GenericBlock - [32..45)::13
+                                CSharpCodeBlock - [32..45)::13
+                                    CSharpImplicitExpression - [32..45)::13
+                                        CSharpTransition - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [33..45)::12
+                                            CSharpCodeBlock - [33..45)::12
+                                                CSharpExpressionLiteral - [33..45)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [47..58)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [58..62)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.tspans.txt
new file mode 100644
index 0000000000..d720c816de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [62] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.cspans.txt
new file mode 100644
index 0000000000..dc6757f2fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.cspans.txt
@@ -0,0 +1,13 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (10:0,10 [64] )
+Code span at (11:0,11 [20] ) (Accepts:Any) - Parent: Statement block at (10:0,10 [64] )
+Transition span at (31:0,31 [6] ) (Accepts:None) - Parent: Tag block at (31:0,31 [6] )
+Markup span at (37:0,37 [3] ) (Accepts:Any) - Parent: Markup block at (31:0,31 [16] )
+Transition span at (40:0,40 [7] ) (Accepts:None) - Parent: Tag block at (40:0,40 [7] )
+Code span at (47:0,47 [27] ) (Accepts:None) - Parent: Statement block at (10:0,10 [64] )
+Transition span at (83:0,83 [1] ) (Accepts:None) - Parent: Statement block at (83:0,83 [64] )
+Code span at (84:0,84 [20] ) (Accepts:Any) - Parent: Statement block at (83:0,83 [64] )
+Transition span at (104:0,104 [6] ) (Accepts:None) - Parent: Tag block at (104:0,104 [6] )
+Markup span at (110:0,110 [3] ) (Accepts:Any) - Parent: Markup block at (104:0,104 [16] )
+Transition span at (113:0,113 [7] ) (Accepts:None) - Parent: Tag block at (113:0,113 [7] )
+Code span at (120:0,120 [27] ) (Accepts:None) - Parent: Statement block at (83:0,83 [64] )
+Markup span at (149:0,149 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [164] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
new file mode 100644
index 0000000000..ccd70b5787
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
@@ -0,0 +1,136 @@
+RazorDocument - [0..164)::164 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>Hello World</p>]
+    MarkupBlock - [0..164)::164
+        MarkupTagHelperElement - [0..164)::164 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..149)::149 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..75)::73 - class - DoubleQuotes - Unbound - [ class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..74)::64
+                        MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [10..74)::64
+                                CSharpCodeBlock - [10..74)::64
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..31)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [31..47)::16
+                                        MarkupElement - [31..47)::16
+                                            MarkupStartTag - [31..37)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [37..40)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Foo];
+                                            MarkupEndTag - [40..47)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [47..74)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [75..148)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
+                    MarkupTextLiteral - [75..76)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [76..81)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [83..147)::64
+                        MarkupDynamicAttributeValue - [83..147)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [83..147)::64
+                                CSharpCodeBlock - [83..147)::64
+                                    CSharpTransition - [83..84)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [84..104)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [104..120)::16
+                                        MarkupElement - [104..120)::16
+                                            MarkupStartTag - [104..110)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [110..113)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Foo];
+                                            MarkupEndTag - [113..120)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [120..147)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [149..160)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [160..164)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.tspans.txt
new file mode 100644
index 0000000000..396ba4cb79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [164] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt
new file mode 100644
index 0000000000..8737eaeaf8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt
@@ -0,0 +1,7 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
+Markup span at (25:0,25 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [34] )
+Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [69] )
+Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [13] )
+Code span at (46:0,46 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [13] )
+Markup span at (60:0,60 [5] ) (Accepts:Any) - Parent: Tag block at (35:0,35 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
new file mode 100644
index 0000000000..80c82a5ec0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
@@ -0,0 +1,74 @@
+RazorDocument - [0..69)::69 - [<p class="@DateTime.Now">Hello</p> <p style='@DateTime.Now'>World</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..34)::34 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p class="@DateTime.Now">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [25..30)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [30..34)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [35..69)::34 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [35..60)::25 - [<p style='@DateTime.Now'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [37..59)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [38..43)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [44..45)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [45..58)::13
+                        MarkupDynamicAttributeValue - [45..58)::13 - [@DateTime.Now]
+                            GenericBlock - [45..58)::13
+                                CSharpCodeBlock - [45..58)::13
+                                    CSharpImplicitExpression - [45..58)::13
+                                        CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [46..58)::12
+                                            CSharpCodeBlock - [46..58)::12
+                                                CSharpExpressionLiteral - [46..58)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [58..59)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [60..65)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [65..69)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.tspans.txt
new file mode 100644
index 0000000000..0c0ec10e16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [34] ) - ptaghelper
+TagHelper span at (35:0,35 [34] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.cspans.txt
new file mode 100644
index 0000000000..a07650681c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.cspans.txt
@@ -0,0 +1,15 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (10:0,10 [64] )
+Code span at (11:0,11 [20] ) (Accepts:Any) - Parent: Statement block at (10:0,10 [64] )
+Transition span at (31:0,31 [6] ) (Accepts:None) - Parent: Tag block at (31:0,31 [6] )
+Markup span at (37:0,37 [3] ) (Accepts:Any) - Parent: Markup block at (31:0,31 [16] )
+Transition span at (40:0,40 [7] ) (Accepts:None) - Parent: Tag block at (40:0,40 [7] )
+Code span at (47:0,47 [27] ) (Accepts:None) - Parent: Statement block at (10:0,10 [64] )
+Markup span at (76:0,76 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [85] )
+Markup span at (85:0,85 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [171] )
+Transition span at (96:0,96 [1] ) (Accepts:None) - Parent: Statement block at (96:0,96 [64] )
+Code span at (97:0,97 [20] ) (Accepts:Any) - Parent: Statement block at (96:0,96 [64] )
+Transition span at (117:0,117 [6] ) (Accepts:None) - Parent: Tag block at (117:0,117 [6] )
+Markup span at (123:0,123 [3] ) (Accepts:Any) - Parent: Markup block at (117:0,117 [16] )
+Transition span at (126:0,126 [7] ) (Accepts:None) - Parent: Tag block at (126:0,126 [7] )
+Code span at (133:0,133 [27] ) (Accepts:None) - Parent: Statement block at (96:0,96 [64] )
+Markup span at (162:0,162 [5] ) (Accepts:Any) - Parent: Tag block at (86:0,86 [85] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
new file mode 100644
index 0000000000..b3c3b71e1c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
@@ -0,0 +1,148 @@
+RazorDocument - [0..171)::171 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);">Hello</p> <p style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>World</p>]
+    MarkupBlock - [0..171)::171
+        MarkupTagHelperElement - [0..85)::85 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..76)::76 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..75)::73 - class - DoubleQuotes - Unbound - [ class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..74)::64
+                        MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [10..74)::64
+                                CSharpCodeBlock - [10..74)::64
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..31)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [31..47)::16
+                                        MarkupElement - [31..47)::16
+                                            MarkupStartTag - [31..37)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [37..40)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Foo];
+                                            MarkupEndTag - [40..47)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [47..74)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [76..81)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [81..85)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [85..86)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [86..171)::85 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [86..162)::76 - [<p style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [88..161)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
+                    MarkupTextLiteral - [88..89)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [89..94)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [95..96)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [96..160)::64
+                        MarkupDynamicAttributeValue - [96..160)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [96..160)::64
+                                CSharpCodeBlock - [96..160)::64
+                                    CSharpTransition - [96..97)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [97..117)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [117..133)::16
+                                        MarkupElement - [117..133)::16
+                                            MarkupStartTag - [117..123)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                            MarkupTextLiteral - [123..126)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[Foo];
+                                            MarkupEndTag - [126..133)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [133..160)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [160..161)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [162..167)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [167..171)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.tspans.txt
new file mode 100644
index 0000000000..f8dba79588
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [85] ) - ptaghelper
+TagHelper span at (86:0,86 [85] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt
new file mode 100644
index 0000000000..c60ad109b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt
@@ -0,0 +1,13 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
+Transition span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (32:0,32 [13] )
+Code span at (33:0,33 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (32:0,32 [13] )
+Markup span at (47:0,47 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [122] )
+Markup span at (59:0,59 [7] ) (Accepts:Any) - Parent: Tag block at (59:0,59 [30] )
+Markup span at (66:0,66 [8] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [22] )
+Transition span at (74:0,74 [1] ) (Accepts:None) - Parent: Expression block at (74:0,74 [13] )
+Code span at (75:0,75 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (74:0,74 [13] )
+Markup span at (87:0,87 [1] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [22] )
+Markup span at (88:0,88 [1] ) (Accepts:Any) - Parent: Tag block at (59:0,59 [30] )
+Markup span at (89:0,89 [20] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [122] )
+Markup span at (109:0,109 [9] ) (Accepts:Any) - Parent: Tag block at (109:0,109 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
new file mode 100644
index 0000000000..a40af76de2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
@@ -0,0 +1,104 @@
+RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>Hello World <strong class="@DateTime.Now">inside of strong tag</strong></p>]
+    MarkupBlock - [0..122)::122
+        MarkupTagHelperElement - [0..122)::122 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..47)::47 - [<p class="@DateTime.Now" style='@DateTime.Now'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [32..45)::13
+                        MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
+                            GenericBlock - [32..45)::13
+                                CSharpCodeBlock - [32..45)::13
+                                    CSharpImplicitExpression - [32..45)::13
+                                        CSharpTransition - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [33..45)::12
+                                            CSharpCodeBlock - [33..45)::12
+                                                CSharpExpressionLiteral - [33..45)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [47..59)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupElement - [59..118)::59
+                MarkupStartTag - [59..89)::30 - [<strong class="@DateTime.Now">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupAttributeBlock - [66..88)::22 - [ class="@DateTime.Now"]
+                        MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [67..72)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [73..74)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        GenericBlock - [74..87)::13
+                            MarkupDynamicAttributeValue - [74..87)::13 - [@DateTime.Now]
+                                GenericBlock - [74..87)::13
+                                    CSharpCodeBlock - [74..87)::13
+                                        CSharpImplicitExpression - [74..87)::13
+                                            CSharpTransition - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [75..87)::12
+                                                CSharpCodeBlock - [75..87)::12
+                                                    CSharpExpressionLiteral - [75..87)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[DateTime];
+                                                        Dot;[.];
+                                                        Identifier;[Now];
+                        MarkupTextLiteral - [87..88)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [89..109)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[inside];
+                    Whitespace;[ ];
+                    Text;[of];
+                    Whitespace;[ ];
+                    Text;[strong];
+                    Whitespace;[ ];
+                    Text;[tag];
+                MarkupEndTag - [109..118)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [118..122)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.tspans.txt
new file mode 100644
index 0000000000..e881d9b302
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [122] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt
new file mode 100644
index 0000000000..1a81781533
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Expression block at (3:0,3 [13] )
+Code span at (4:0,4 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (3:0,3 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt
new file mode 100644
index 0000000000..eb398bbcec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..20)::20 - [<p>@DateTime.Now</p>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [3..16)::13
+                CSharpImplicitExpression - [3..16)::13
+                    CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [4..16)::12
+                        CSharpCodeBlock - [4..16)::12
+                            CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [16..20)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.tspans.txt
new file mode 100644
index 0000000000..66adb496db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [20] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.cspans.txt
new file mode 100644
index 0000000000..1f24e0d42a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.cspans.txt
@@ -0,0 +1,6 @@
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Statement block at (3:0,3 [58] )
+Code span at (4:0,4 [19] ) (Accepts:Any) - Parent: Statement block at (3:0,3 [58] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [12] )
+Markup span at (27:0,27 [3] ) (Accepts:Any) - Parent: Tag block at (24:0,24 [10] )
+Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Markup block at (23:0,23 [12] )
+Code span at (35:0,35 [26] ) (Accepts:None) - Parent: Statement block at (3:0,3 [58] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt
new file mode 100644
index 0000000000..0fa891e8bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..65)::65 - [<p>@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p>]
+    MarkupBlock - [0..65)::65
+        MarkupTagHelperElement - [0..65)::65 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [3..61)::58
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [4..23)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [23..35)::12
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [24..34)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [24..27)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [27..30)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [30..34)::4 - [</p>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [35..61)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [61..65)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.tspans.txt
new file mode 100644
index 0000000000..7799cf6bf0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [65] ) - ptaghelper
+TagHelper span at (24:0,24 [10] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt
new file mode 100644
index 0000000000..09807c89f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (3:0,3 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [32] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [13] )
+Code span at (16:0,16 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt
new file mode 100644
index 0000000000..cdb14643e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..32)::32 - [<p>Hello World @DateTime.Now</p>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..28)::13
+                CSharpImplicitExpression - [15..28)::13
+                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [16..28)::12
+                        CSharpCodeBlock - [16..28)::12
+                            CSharpExpressionLiteral - [16..28)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [28..32)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.tspans.txt
new file mode 100644
index 0000000000..5cb039743d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [32] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.cspans.txt
new file mode 100644
index 0000000000..2ad93795ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (3:0,3 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Statement block at (15:0,15 [58] )
+Code span at (16:0,16 [19] ) (Accepts:Any) - Parent: Statement block at (15:0,15 [58] )
+Markup span at (35:0,35 [1] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [12] )
+Markup span at (39:0,39 [3] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [10] )
+Markup span at (46:0,46 [1] ) (Accepts:None) - Parent: Markup block at (35:0,35 [12] )
+Code span at (47:0,47 [26] ) (Accepts:None) - Parent: Statement block at (15:0,15 [58] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt
new file mode 100644
index 0000000000..9bb210bc79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..77)::77 - [<p>Hello World @do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..73)::58
+                CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [16..35)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [35..47)::12
+                    MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [36..46)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [36..39)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [39..42)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [42..46)::4 - [</p>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [47..73)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [73..77)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.tspans.txt
new file mode 100644
index 0000000000..24d79866fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [77] ) - ptaghelper
+TagHelper span at (36:0,36 [10] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt
new file mode 100644
index 0000000000..1f1417e4fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt
@@ -0,0 +1,5 @@
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Expression block at (3:0,3 [13] )
+Code span at (4:0,4 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (3:0,3 [13] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt
new file mode 100644
index 0000000000..4939b76203
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..41)::41 - [<p>@DateTime.Now</p> <p>@DateTime.Now</p>]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [3..16)::13
+                CSharpImplicitExpression - [3..16)::13
+                    CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [4..16)::12
+                        CSharpCodeBlock - [4..16)::12
+                            CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [16..20)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [21..41)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [21..24)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [24..37)::13
+                CSharpImplicitExpression - [24..37)::13
+                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [25..37)::12
+                        CSharpCodeBlock - [25..37)::12
+                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [37..41)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.tspans.txt
new file mode 100644
index 0000000000..5c19dd2b8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [20] ) - ptaghelper
+TagHelper span at (21:0,21 [20] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.cspans.txt
new file mode 100644
index 0000000000..e79b4cf049
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.cspans.txt
@@ -0,0 +1,13 @@
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Statement block at (3:0,3 [58] )
+Code span at (4:0,4 [19] ) (Accepts:Any) - Parent: Statement block at (3:0,3 [58] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [12] )
+Markup span at (27:0,27 [3] ) (Accepts:Any) - Parent: Tag block at (24:0,24 [10] )
+Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Markup block at (23:0,23 [12] )
+Code span at (35:0,35 [26] ) (Accepts:None) - Parent: Statement block at (3:0,3 [58] )
+Markup span at (65:0,65 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [131] )
+Transition span at (69:0,69 [1] ) (Accepts:None) - Parent: Statement block at (69:0,69 [58] )
+Code span at (70:0,70 [19] ) (Accepts:Any) - Parent: Statement block at (69:0,69 [58] )
+Markup span at (89:0,89 [1] ) (Accepts:Any) - Parent: Markup block at (89:0,89 [12] )
+Markup span at (93:0,93 [3] ) (Accepts:Any) - Parent: Tag block at (90:0,90 [10] )
+Markup span at (100:0,100 [1] ) (Accepts:None) - Parent: Markup block at (89:0,89 [12] )
+Code span at (101:0,101 [26] ) (Accepts:None) - Parent: Statement block at (69:0,69 [58] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt
new file mode 100644
index 0000000000..599b101b45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt
@@ -0,0 +1,122 @@
+RazorDocument - [0..131)::131 - [<p>@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p> <p>@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p>]
+    MarkupBlock - [0..131)::131
+        MarkupTagHelperElement - [0..65)::65 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [3..61)::58
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [4..23)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [23..35)::12
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [24..34)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [24..27)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [27..30)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [30..34)::4 - [</p>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [35..61)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [61..65)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [65..66)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [66..131)::65 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [66..69)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            CSharpCodeBlock - [69..127)::58
+                CSharpTransition - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [70..89)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [89..101)::12
+                    MarkupTextLiteral - [89..90)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [90..100)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [90..93)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [93..96)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [96..100)::4 - [</p>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [100..101)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [101..127)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [127..131)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.tspans.txt
new file mode 100644
index 0000000000..eef88691cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.tspans.txt
@@ -0,0 +1,4 @@
+TagHelper span at (0:0,0 [65] ) - ptaghelper
+TagHelper span at (24:0,24 [10] ) - ptaghelper
+TagHelper span at (66:0,66 [65] ) - ptaghelper
+TagHelper span at (90:0,90 [10] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt
new file mode 100644
index 0000000000..289b98f67f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [13] )
+Code span at (10:0,10 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [13] )
+Markup span at (22:0,22 [8] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [8] )
+Markup span at (30:0,30 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
+Transition span at (40:0,40 [1] ) (Accepts:None) - Parent: Expression block at (40:0,40 [13] )
+Code span at (41:0,41 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (40:0,40 [13] )
+Markup span at (53:0,53 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
+Markup span at (64:0,64 [9] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt
new file mode 100644
index 0000000000..5aa23f352a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..77)::77 - [<p>Hello @DateTime.Now<strong>inside of @DateTime.Now strong tag</strong></p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            CSharpCodeBlock - [9..22)::13
+                CSharpImplicitExpression - [9..22)::13
+                    CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [10..22)::12
+                        CSharpCodeBlock - [10..22)::12
+                            CSharpExpressionLiteral - [10..22)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupElement - [22..73)::51
+                MarkupStartTag - [22..30)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [30..40)::10 - [inside of ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[inside];
+                    Whitespace;[ ];
+                    Text;[of];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [40..53)::13
+                    CSharpImplicitExpression - [40..53)::13
+                        CSharpTransition - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [41..53)::12
+                            CSharpCodeBlock - [41..53)::12
+                                CSharpExpressionLiteral - [41..53)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[DateTime];
+                                    Dot;[.];
+                                    Identifier;[Now];
+                MarkupTextLiteral - [53..64)::11 - [ strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    Text;[strong];
+                    Whitespace;[ ];
+                    Text;[tag];
+                MarkupEndTag - [64..73)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [73..77)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.tspans.txt
new file mode 100644
index 0000000000..fdd25b54f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [77] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.cspans.txt
new file mode 100644
index 0000000000..d03e66d5c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [167] )
+Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Statement block at (9:0,9 [58] )
+Code span at (10:0,10 [19] ) (Accepts:Any) - Parent: Statement block at (9:0,9 [58] )
+Markup span at (29:0,29 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [12] )
+Markup span at (33:0,33 [3] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [10] )
+Markup span at (40:0,40 [1] ) (Accepts:None) - Parent: Markup block at (29:0,29 [12] )
+Code span at (41:0,41 [26] ) (Accepts:None) - Parent: Statement block at (9:0,9 [58] )
+Markup span at (67:0,67 [8] ) (Accepts:Any) - Parent: Tag block at (67:0,67 [8] )
+Markup span at (75:0,75 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [167] )
+Transition span at (85:0,85 [1] ) (Accepts:None) - Parent: Statement block at (85:0,85 [58] )
+Code span at (86:0,86 [19] ) (Accepts:Any) - Parent: Statement block at (85:0,85 [58] )
+Markup span at (105:0,105 [1] ) (Accepts:Any) - Parent: Markup block at (105:0,105 [12] )
+Markup span at (109:0,109 [3] ) (Accepts:Any) - Parent: Tag block at (106:0,106 [10] )
+Markup span at (116:0,116 [1] ) (Accepts:None) - Parent: Markup block at (105:0,105 [12] )
+Code span at (117:0,117 [26] ) (Accepts:None) - Parent: Statement block at (85:0,85 [58] )
+Markup span at (143:0,143 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [167] )
+Markup span at (154:0,154 [9] ) (Accepts:Any) - Parent: Tag block at (154:0,154 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt
new file mode 100644
index 0000000000..a471bacbf0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt
@@ -0,0 +1,133 @@
+RazorDocument - [0..167)::167 - [<p>Hello @do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);<strong>inside of @do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>); strong tag</strong></p>]
+    MarkupBlock - [0..167)::167
+        MarkupTagHelperElement - [0..167)::167 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            CSharpCodeBlock - [9..67)::58
+                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [10..29)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [29..41)::12
+                    MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [30..40)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [33..36)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [36..40)::4 - [</p>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [41..67)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupElement - [67..163)::96
+                MarkupStartTag - [67..75)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [75..85)::10 - [inside of ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[inside];
+                    Whitespace;[ ];
+                    Text;[of];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [85..143)::58
+                    CSharpTransition - [85..86)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpStatementLiteral - [86..105)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                        Keyword;[do];
+                        Whitespace;[ ];
+                        LeftBrace;[{];
+                        Whitespace;[ ];
+                        Identifier;[var];
+                        Whitespace;[ ];
+                        Identifier;[foo];
+                        Whitespace;[ ];
+                        Assign;[=];
+                        Whitespace;[ ];
+                        Identifier;[bar];
+                        Semicolon;[;];
+                    MarkupBlock - [105..117)::12
+                        MarkupTextLiteral - [105..106)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTagHelperElement - [106..116)::10 - p[StartTagAndEndTag] - ptaghelper
+                            MarkupTagHelperStartTag - [106..109)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                            MarkupTextLiteral - [109..112)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[Foo];
+                            MarkupTagHelperEndTag - [112..116)::4 - [</p>]
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [116..117)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                    CSharpStatementLiteral - [117..143)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                        Identifier;[foo];
+                        Increment;[++];
+                        Semicolon;[;];
+                        Whitespace;[ ];
+                        RightBrace;[}];
+                        Whitespace;[ ];
+                        Keyword;[while];
+                        Whitespace;[ ];
+                        LeftParenthesis;[(];
+                        Identifier;[foo];
+                        LessThan;[<];
+                        Identifier;[bar];
+                        GreaterThan;[>];
+                        RightParenthesis;[)];
+                        Semicolon;[;];
+                MarkupTextLiteral - [143..154)::11 - [ strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    Text;[strong];
+                    Whitespace;[ ];
+                    Text;[tag];
+                MarkupEndTag - [154..163)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [163..167)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.tspans.txt
new file mode 100644
index 0000000000..f972911c7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [167] ) - ptaghelper
+TagHelper span at (30:0,30 [10] ) - ptaghelper
+TagHelper span at (106:0,106 [10] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.cspans.txt
new file mode 100644
index 0000000000..ddb3c37d48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [66] )
+Markup span at (35:0,35 [8] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (43:0,43 [2] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (45:0,45 [5] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (50:0,50 [3] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (53:0,53 [3] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
new file mode 100644
index 0000000000..b48530199c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
@@ -0,0 +1,65 @@
+RazorDocument - [0..66)::66 - [<p      class="     foo"    style="   color :  red  ;   "    ></p>]
+    MarkupBlock - [0..66)::66
+        MarkupTagHelperElement - [0..66)::66 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..62)::62 - [<p      class="     foo"    style="   color :  red  ;   "    >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [      class="     foo"]
+                    MarkupTextLiteral - [2..8)::6 - [      ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[      ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..23)::8
+                        MarkupLiteralAttributeValue - [15..23)::8 - [     foo]
+                            MarkupTextLiteral - [15..20)::5 - [     ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[     ];
+                            MarkupTextLiteral - [20..23)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..57)::33 - style - DoubleQuotes - Unbound - [    style="   color :  red  ;   "]
+                    MarkupTextLiteral - [24..28)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [35..56)::21
+                        MarkupLiteralAttributeValue - [35..43)::8 - [   color]
+                            MarkupTextLiteral - [35..38)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupTextLiteral - [38..43)::5 - [color] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color];
+                        MarkupLiteralAttributeValue - [43..45)::2 - [ :]
+                            MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [44..45)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[:];
+                        MarkupLiteralAttributeValue - [45..50)::5 - [  red]
+                            MarkupTextLiteral - [45..47)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [47..50)::3 - [red] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[red];
+                        MarkupLiteralAttributeValue - [50..53)::3 - [  ;]
+                            MarkupTextLiteral - [50..52)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [52..53)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[;];
+                        MarkupLiteralAttributeValue - [53..56)::3 - [   ]
+                            MarkupTextLiteral - [53..56)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [57..61)::4
+                    MarkupTextLiteral - [57..61)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [62..66)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.tspans.txt
new file mode 100644
index 0000000000..ef54ffee1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [66] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.cspans.txt
new file mode 100644
index 0000000000..9a63e4f2b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
+Markup span at (35:0,35 [8] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (43:0,43 [2] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (45:0,45 [5] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (50:0,50 [3] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (53:0,53 [3] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [21] )
+Markup span at (62:0,62 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
new file mode 100644
index 0000000000..1747206b92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
@@ -0,0 +1,69 @@
+RazorDocument - [0..77)::77 - [<p      class="     foo"    style="   color :  red  ;   "    >Hello World</p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..62)::62 - [<p      class="     foo"    style="   color :  red  ;   "    >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [      class="     foo"]
+                    MarkupTextLiteral - [2..8)::6 - [      ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[      ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..23)::8
+                        MarkupLiteralAttributeValue - [15..23)::8 - [     foo]
+                            MarkupTextLiteral - [15..20)::5 - [     ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[     ];
+                            MarkupTextLiteral - [20..23)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..57)::33 - style - DoubleQuotes - Unbound - [    style="   color :  red  ;   "]
+                    MarkupTextLiteral - [24..28)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [35..56)::21
+                        MarkupLiteralAttributeValue - [35..43)::8 - [   color]
+                            MarkupTextLiteral - [35..38)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupTextLiteral - [38..43)::5 - [color] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color];
+                        MarkupLiteralAttributeValue - [43..45)::2 - [ :]
+                            MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [44..45)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[:];
+                        MarkupLiteralAttributeValue - [45..50)::5 - [  red]
+                            MarkupTextLiteral - [45..47)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [47..50)::3 - [red] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[red];
+                        MarkupLiteralAttributeValue - [50..53)::3 - [  ;]
+                            MarkupTextLiteral - [50..52)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [52..53)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[;];
+                        MarkupLiteralAttributeValue - [53..56)::3 - [   ]
+                            MarkupTextLiteral - [53..56)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [57..61)::4
+                    MarkupTextLiteral - [57..61)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [62..73)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [73..77)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.tspans.txt
new file mode 100644
index 0000000000..fdd25b54f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [77] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.cspans.txt
new file mode 100644
index 0000000000..ac0c044abb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [8] )
+Markup span at (20:0,20 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [8] )
+Markup span at (25:0,25 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [34] )
+Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [73] )
+Markup span at (48:0,48 [12] ) (Accepts:Any) - Parent: Markup block at (48:0,48 [13] )
+Markup span at (60:0,60 [1] ) (Accepts:Any) - Parent: Markup block at (48:0,48 [13] )
+Markup span at (64:0,64 [5] ) (Accepts:Any) - Parent: Tag block at (35:0,35 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
new file mode 100644
index 0000000000..17887106ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
@@ -0,0 +1,72 @@
+RazorDocument - [0..73)::73 - [<p     class="   foo  " >Hello</p> <p    style="  color:red; " >World</p>]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..34)::34 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p     class="   foo  " >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..23)::21 - class - DoubleQuotes - Unbound - [     class="   foo  "]
+                    MarkupTextLiteral - [2..7)::5 - [     ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[     ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [14..22)::8
+                        MarkupLiteralAttributeValue - [14..20)::6 - [   foo]
+                            MarkupTextLiteral - [14..17)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupTextLiteral - [17..20)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                        MarkupLiteralAttributeValue - [20..22)::2 - [  ]
+                            MarkupTextLiteral - [20..22)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [23..24)::1
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [25..30)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [30..34)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [35..73)::38 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [35..64)::29 - [<p    style="  color:red; " >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [37..62)::25 - style - DoubleQuotes - Unbound - [    style="  color:red; "]
+                    MarkupTextLiteral - [37..41)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [41..46)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [48..61)::13
+                        MarkupLiteralAttributeValue - [48..60)::12 - [  color:red;]
+                            MarkupTextLiteral - [48..50)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [50..60)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                        MarkupLiteralAttributeValue - [60..61)::1 - [ ]
+                            MarkupTextLiteral - [60..61)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                    MarkupTextLiteral - [61..62)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [62..63)::1
+                    MarkupTextLiteral - [62..63)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [64..69)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [69..73)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.tspans.txt
new file mode 100644
index 0000000000..ac76be0a56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [34] ) - ptaghelper
+TagHelper span at (35:0,35 [38] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt
new file mode 100644
index 0000000000..3c6c5782ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..7)::7 - [<p></p>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [3..7)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.tspans.txt
new file mode 100644
index 0000000000..8c084941d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.cspans.txt
new file mode 100644
index 0000000000..f82aba421e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt
new file mode 100644
index 0000000000..1cad064338
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..18)::18 - [<p>Hello World</p>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..14)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [14..18)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.tspans.txt
new file mode 100644
index 0000000000..952b7c9df9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [18] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.cspans.txt
new file mode 100644
index 0000000000..bae5d9e829
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (3:0,3 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [12] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Markup span at (16:0,16 [5] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt
new file mode 100644
index 0000000000..a1430c006e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..25)::25 - [<p>Hello</p> <p>World</p>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..8)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [8..12)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [13..25)::12 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [16..21)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [21..25)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.tspans.txt
new file mode 100644
index 0000000000..9c65b6e8ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [12] ) - ptaghelper
+TagHelper span at (13:0,13 [12] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.cspans.txt
new file mode 100644
index 0000000000..6d458bf721
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (3:0,3 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
+Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
+Markup span at (23:0,23 [20] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
+Markup span at (43:0,43 [9] ) (Accepts:Any) - Parent: Tag block at (43:0,43 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt
new file mode 100644
index 0000000000..c49a39a260
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..56)::56 - [<p>Hello World <strong>inside of strong tag</strong></p>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..56)::56 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupElement - [15..52)::37
+                MarkupStartTag - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [23..43)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[inside];
+                    Whitespace;[ ];
+                    Text;[of];
+                    Whitespace;[ ];
+                    Text;[strong];
+                    Whitespace;[ ];
+                    Text;[tag];
+                MarkupEndTag - [43..52)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [52..56)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.tspans.txt
new file mode 100644
index 0000000000..43d407d913
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [56] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.cspans.txt
new file mode 100644
index 0000000000..d972e4a4f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (8:0,8 [14] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt
new file mode 100644
index 0000000000..f5a2d95995
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..31)::31 - [<script><script></foo></script>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..22)::14 - [<script></foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [22..31)::9 - [</script>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.tspans.txt
new file mode 100644
index 0000000000..8c61f52583
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - scripttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.cspans.txt
new file mode 100644
index 0000000000..20e0cf45b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (8:0,8 [23] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt
new file mode 100644
index 0000000000..e51cba2264
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..40)::40 - [<script>Hello World <div></div></script>]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..31)::23 - [Hello World <div></div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [31..40)::9 - [</script>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.tspans.txt
new file mode 100644
index 0000000000..ac63486204
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [40] ) - scripttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.cspans.txt
new file mode 100644
index 0000000000..8cebd4fdd9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (8:0,8 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [29] )
+Markup span at (29:0,29 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
+Markup span at (38:0,38 [5] ) (Accepts:Any) - Parent: Tag block at (33:0,33 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt
new file mode 100644
index 0000000000..2f3212ad0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..53)::53 - [<script>Hel<p>lo</p></script> <p><div>World</div></p>]
+    MarkupBlock - [0..53)::53
+        MarkupTagHelperElement - [0..29)::29 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..20)::12 - [Hel<p>lo</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+                Text;[lo];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [20..29)::9 - [</script>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [30..53)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [33..49)::16 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [33..38)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [38..43)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [43..49)::6 - [</div>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [49..53)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.tspans.txt
new file mode 100644
index 0000000000..a253e4c493
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [29] ) - scripttaghelper
+TagHelper span at (30:0,30 [23] ) - ptaghelper
+TagHelper span at (33:0,33 [16] ) - divtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.cspans.txt
new file mode 100644
index 0000000000..a94da0fb8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (8:0,8 [22] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [39] )
+Markup span at (39:0,39 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [75] )
+Markup span at (48:0,48 [18] ) (Accepts:Any) - Parent: Tag block at (40:0,40 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt
new file mode 100644
index 0000000000..ad304014f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..75)::75 - [<script>Hel<strong>lo</strong></script> <script><span>World</span></script>]
+    MarkupBlock - [0..75)::75
+        MarkupTagHelperElement - [0..39)::39 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [8..30)::22 - [Hel<strong>lo</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+                Text;[lo];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [30..39)::9 - [</script>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [40..75)::35 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [40..48)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+            MarkupTextLiteral - [48..66)::18 - [<span>World</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                CloseAngle;[>];
+                Text;[World];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [66..75)::9 - [</script>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.tspans.txt
new file mode 100644
index 0000000000..e884343e22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [39] ) - scripttaghelper
+TagHelper span at (40:0,40 [35] ) - scripttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.cspans.txt
new file mode 100644
index 0000000000..76b38b02c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [41] )
+Markup span at (27:0,27 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
new file mode 100644
index 0000000000..3e88278df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..41)::41 - [<script class="foo" style="color:red;" />]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..41)::41 - script[SelfClosing] - scripttaghelper
+            MarkupTagHelperStartTag - [0..41)::41 - [<script class="foo" style="color:red;" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupTagHelperAttribute - [7..19)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..18)::3
+                        MarkupLiteralAttributeValue - [15..18)::3 - [foo]
+                            MarkupTextLiteral - [15..18)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..38)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..37)::10
+                        MarkupLiteralAttributeValue - [27..37)::10 - [color:red;]
+                            MarkupTextLiteral - [27..37)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [38..39)::1
+                    MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.tspans.txt
new file mode 100644
index 0000000000..be10273181
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [41] ) - scripttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.cspans.txt
new file mode 100644
index 0000000000..9768e45701
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
+Markup span at (24:0,24 [3] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [48] )
+Markup span at (36:0,36 [10] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [48] )
+Markup span at (57:0,57 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
new file mode 100644
index 0000000000..ce47809446
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..67)::67 - [<p>Hello <script class="foo" style="color:red;"></script> World</p>]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [9..57)::48 - script[StartTagAndEndTag] - scripttaghelper
+                MarkupTagHelperStartTag - [9..48)::39 - [<script class="foo" style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    MarkupTagHelperAttribute - [16..28)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [24..27)::3
+                            MarkupLiteralAttributeValue - [24..27)::3 - [foo]
+                                MarkupTextLiteral - [24..27)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                        MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTagHelperAttribute - [28..47)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [29..34)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [36..46)::10
+                            MarkupLiteralAttributeValue - [36..46)::10 - [color:red;]
+                                MarkupTextLiteral - [36..46)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [48..57)::9 - [</script>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [57..63)::6 - [ World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [63..67)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.tspans.txt
new file mode 100644
index 0000000000..928d196eb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [67] ) - ptaghelper
+TagHelper span at (9:0,9 [48] ) - scripttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.cspans.txt
new file mode 100644
index 0000000000..572d8641d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
+Markup span at (24:0,24 [1] ) (Accepts:None) - Parent: Markup block at (24:0,24 [2] )
+Markup span at (25:0,25 [1] ) (Accepts:None) - Parent: Markup block at (24:0,24 [2] )
+Markup span at (26:0,26 [11] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [13] )
+Markup span at (46:0,46 [10] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [58] )
+Markup span at (67:0,67 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
new file mode 100644
index 0000000000..81f89f3081
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..77)::77 - [<p>Hello <script class="@@foo@bar.com" style="color:red;"></script> World</p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [9..67)::58 - script[StartTagAndEndTag] - scripttaghelper
+                MarkupTagHelperStartTag - [9..58)::49 - [<script class="@@foo@bar.com" style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    MarkupTagHelperAttribute - [16..38)::22 - class - DoubleQuotes - Unbound - [ class="@@foo@bar.com"]
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [24..37)::13
+                            MarkupBlock - [24..26)::2
+                                MarkupTextLiteral - [24..25)::1 - [@] - Gen<LitAttr:@(24:0,24)> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupEphemeralTextLiteral - [25..26)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                            MarkupLiteralAttributeValue - [26..37)::11 - [foo@bar.com]
+                                MarkupTextLiteral - [26..37)::11 - [foo@bar.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo@bar.com];
+                        MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTagHelperAttribute - [38..57)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [39..44)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [45..46)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [46..56)::10
+                            MarkupLiteralAttributeValue - [46..56)::10 - [color:red;]
+                                MarkupTextLiteral - [46..56)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [58..67)::9 - [</script>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [67..73)::6 - [ World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [73..77)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.tspans.txt
new file mode 100644
index 0000000000..fcf8bee101
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [77] ) - ptaghelper
+TagHelper span at (9:0,9 [58] ) - scripttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.cspans.txt
new file mode 100644
index 0000000000..e4af93f808
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
+Markup span at (22:0,22 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
new file mode 100644
index 0000000000..cdd8993f77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..36)::36 - [<p class="foo" style="color:red;" />]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [0..36)::36 - [<p class="foo" style="color:red;" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [33..34)::1
+                    MarkupTextLiteral - [33..34)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.tspans.txt
new file mode 100644
index 0000000000..c32a52d977
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [36] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.cspans.txt
new file mode 100644
index 0000000000..3b11382a00
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [55] )
+Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [36] )
+Markup span at (31:0,31 [10] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [36] )
+Markup span at (45:0,45 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [55] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
new file mode 100644
index 0000000000..1b96cc1caa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..55)::55 - [<p>Hello <p class="foo" style="color:red;" /> World</p>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..55)::55 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [9..45)::36 - p[SelfClosing] - ptaghelper
+                MarkupTagHelperStartTag - [9..45)::36 - [<p class="foo" style="color:red;" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    MarkupTagHelperAttribute - [11..23)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                        MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [12..17)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [19..22)::3
+                            MarkupLiteralAttributeValue - [19..22)::3 - [foo]
+                                MarkupTextLiteral - [19..22)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTagHelperAttribute - [23..42)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..29)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [31..41)::10
+                            MarkupLiteralAttributeValue - [31..41)::10 - [color:red;]
+                                MarkupTextLiteral - [31..41)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupMiscAttributeContent - [42..43)::1
+                        MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [45..51)::6 - [ World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [51..55)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.tspans.txt
new file mode 100644
index 0000000000..6dc6c9b953
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [55] ) - ptaghelper
+TagHelper span at (9:0,9 [36] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.cspans.txt
new file mode 100644
index 0000000000..a55ddcf08a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [17] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
+Markup span at (33:0,33 [10] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [24] )
+Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
new file mode 100644
index 0000000000..f2e68f8dfa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..52)::52 - [Hello<p class="foo" /> <p style="color:red;" />World]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..5)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Hello];
+        MarkupTagHelperElement - [5..22)::17 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [5..22)::17 - [<p class="foo" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [7..19)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..18)::3
+                        MarkupLiteralAttributeValue - [15..18)::3 - [foo]
+                            MarkupTextLiteral - [15..18)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [19..20)::1
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [23..47)::24 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [23..47)::24 - [<p style="color:red;" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [25..44)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..31)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [33..43)::10
+                        MarkupLiteralAttributeValue - [33..43)::10 - [color:red;]
+                            MarkupTextLiteral - [33..43)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [43..44)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [44..45)::1
+                    MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [47..52)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[World];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.tspans.txt
new file mode 100644
index 0000000000..9cf7822faf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (5:0,5 [17] ) - ptaghelper
+TagHelper span at (23:0,23 [24] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.cspans.txt
new file mode 100644
index 0000000000..ecfdc446c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [38] )
+Markup span at (22:0,22 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
new file mode 100644
index 0000000000..1f1c00012e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..38)::38 - [<p class="foo" style="color:red;"></p>]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34 - [<p class="foo" style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..38)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.tspans.txt
new file mode 100644
index 0000000000..3cc3264682
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [38] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.cspans.txt
new file mode 100644
index 0000000000..9f93b41526
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [49] )
+Markup span at (22:0,22 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [49] )
+Markup span at (34:0,34 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
new file mode 100644
index 0000000000..bed786ce0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..49)::49 - [<p class="foo" style="color:red;">Hello World</p>]
+    MarkupBlock - [0..49)::49
+        MarkupTagHelperElement - [0..49)::49 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34 - [<p class="foo" style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [34..45)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [45..49)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.tspans.txt
new file mode 100644
index 0000000000..f12231fbd7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [49] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.cspans.txt
new file mode 100644
index 0000000000..9663987bab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
+Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [56] )
+Markup span at (35:0,35 [10] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [31] )
+Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
new file mode 100644
index 0000000000..3366d7ed09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..56)::56 - [<p class="foo">Hello</p> <p style="color:red;">World</p>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..24)::24 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="foo">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [15..20)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [20..24)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [25..56)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [25..47)::22 - [<p style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [27..46)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [35..45)::10
+                        MarkupLiteralAttributeValue - [35..45)::10 - [color:red;]
+                            MarkupTextLiteral - [35..45)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [45..46)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [47..52)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [52..56)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.tspans.txt
new file mode 100644
index 0000000000..75b14aa3c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [24] ) - ptaghelper
+TagHelper span at (25:0,25 [31] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.cspans.txt
new file mode 100644
index 0000000000..944a88693b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [99] )
+Markup span at (22:0,22 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [99] )
+Markup span at (34:0,34 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [99] )
+Markup span at (46:0,46 [7] ) (Accepts:Any) - Parent: Tag block at (46:0,46 [20] )
+Markup span at (53:0,53 [8] ) (Accepts:Any) - Parent: Markup block at (53:0,53 [12] )
+Markup span at (61:0,61 [3] ) (Accepts:Any) - Parent: Markup block at (53:0,53 [12] )
+Markup span at (64:0,64 [1] ) (Accepts:Any) - Parent: Markup block at (53:0,53 [12] )
+Markup span at (65:0,65 [1] ) (Accepts:Any) - Parent: Tag block at (46:0,46 [20] )
+Markup span at (66:0,66 [20] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [99] )
+Markup span at (86:0,86 [9] ) (Accepts:Any) - Parent: Tag block at (86:0,86 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
new file mode 100644
index 0000000000..e3e248f40b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
@@ -0,0 +1,77 @@
+RazorDocument - [0..99)::99 - [<p class="foo" style="color:red;">Hello World <strong class="foo">inside of strong tag</strong></p>]
+    MarkupBlock - [0..99)::99
+        MarkupTagHelperElement - [0..99)::99 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34 - [<p class="foo" style="color:red;">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [34..46)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupElement - [46..95)::49
+                MarkupStartTag - [46..66)::20 - [<strong class="foo">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupAttributeBlock - [53..65)::12 - [ class="foo"]
+                        MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [54..59)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [60..61)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        GenericBlock - [61..64)::3
+                            MarkupLiteralAttributeValue - [61..64)::3 - [foo]
+                                MarkupTextLiteral - [61..64)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                        MarkupTextLiteral - [64..65)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [66..86)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[inside];
+                    Whitespace;[ ];
+                    Text;[of];
+                    Whitespace;[ ];
+                    Text;[strong];
+                    Whitespace;[ ];
+                    Text;[tag];
+                MarkupEndTag - [86..95)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [95..99)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.tspans.txt
new file mode 100644
index 0000000000..06bcd7e03e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [99] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt
new file mode 100644
index 0000000000..f08a9b491a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
new file mode 100644
index 0000000000..dc9e705e9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..56)::56 - [<p class=foo dynamic=@DateTime.Now style=color:red;></p>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..56)::56 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52 - [<p class=foo dynamic=@DateTime.Now style=color:red;>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [52..56)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.tspans.txt
new file mode 100644
index 0000000000..43d407d913
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [56] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt
new file mode 100644
index 0000000000..a52e2d29cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
+Markup span at (52:0,52 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
new file mode 100644
index 0000000000..f609519290
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
@@ -0,0 +1,55 @@
+RazorDocument - [0..67)::67 - [<p class=foo dynamic=@DateTime.Now style=color:red;>Hello World</p>]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52 - [<p class=foo dynamic=@DateTime.Now style=color:red;>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                CloseAngle;[>];
+            MarkupTextLiteral - [52..63)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [63..67)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.tspans.txt
new file mode 100644
index 0000000000..fc4df1931c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [67] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt
new file mode 100644
index 0000000000..9b90d7819d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (41:0,41 [5] ) (Accepts:Any) - Parent: Markup block at (41:0,41 [12] )
+Markup span at (46:0,46 [1] ) (Accepts:None) - Parent: Markup block at (46:0,46 [2] )
+Markup span at (47:0,47 [1] ) (Accepts:None) - Parent: Markup block at (46:0,46 [2] )
+Markup span at (48:0,48 [5] ) (Accepts:Any) - Parent: Markup block at (41:0,41 [12] )
+Markup span at (54:0,54 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
new file mode 100644
index 0000000000..725028c4d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
@@ -0,0 +1,63 @@
+RazorDocument - [0..69)::69 - [<p class=foo dynamic=@DateTime.Now style=color@@:red;>Hello World</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..69)::69 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..54)::54 - [<p class=foo dynamic=@DateTime.Now style=color@@:red;>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..53)::19 - style - DoubleQuotes - Unbound - [ style=color@@:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..53)::12
+                        MarkupLiteralAttributeValue - [41..46)::5 - [color]
+                            MarkupTextLiteral - [41..46)::5 - [color] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color];
+                        MarkupBlock - [46..48)::2
+                            MarkupTextLiteral - [46..47)::1 - [@] - Gen<LitAttr:@(46:0,46)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [47..48)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [48..53)::5 - [:red;]
+                            MarkupTextLiteral - [48..53)::5 - [:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[:red;];
+                CloseAngle;[>];
+            MarkupTextLiteral - [54..65)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [65..69)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.tspans.txt
new file mode 100644
index 0000000000..ff9e419de7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [69] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt
new file mode 100644
index 0000000000..ed2cf9ddf2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [44] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (35:0,35 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [44] )
+Markup span at (44:0,44 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [96] )
+Markup span at (54:0,54 [10] ) (Accepts:Any) - Parent: Tag block at (45:0,45 [51] )
+Transition span at (73:0,73 [1] ) (Accepts:None) - Parent: Expression block at (73:0,73 [13] )
+Code span at (74:0,74 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (73:0,73 [13] )
+Markup span at (87:0,87 [5] ) (Accepts:Any) - Parent: Tag block at (45:0,45 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
new file mode 100644
index 0000000000..8ff07ec1ed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
@@ -0,0 +1,86 @@
+RazorDocument - [0..96)::96 - [<p class=foo dynamic=@DateTime.Now>Hello</p> <p style=color:red; dynamic=@DateTime.Now>World</p>]
+    MarkupBlock - [0..96)::96
+        MarkupTagHelperElement - [0..44)::44 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..35)::35 - [<p class=foo dynamic=@DateTime.Now>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                CloseAngle;[>];
+            MarkupTextLiteral - [35..40)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [40..44)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [45..96)::51 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [45..87)::42 - [<p style=color:red; dynamic=@DateTime.Now>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [47..64)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [48..53)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [54..64)::10
+                        MarkupLiteralAttributeValue - [54..64)::10 - [color:red;]
+                            MarkupTextLiteral - [54..64)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                MarkupTagHelperAttribute - [64..86)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [65..72)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [73..86)::13
+                        MarkupDynamicAttributeValue - [73..86)::13 - [@DateTime.Now]
+                            GenericBlock - [73..86)::13
+                                CSharpCodeBlock - [73..86)::13
+                                    CSharpImplicitExpression - [73..86)::13
+                                        CSharpTransition - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [74..86)::12
+                                            CSharpCodeBlock - [74..86)::12
+                                                CSharpExpressionLiteral - [74..86)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                CloseAngle;[>];
+            MarkupTextLiteral - [87..92)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [92..96)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.tspans.txt
new file mode 100644
index 0000000000..bddced97ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [44] ) - ptaghelper
+TagHelper span at (45:0,45 [51] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt
new file mode 100644
index 0000000000..2b1a126add
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
+Markup span at (52:0,52 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
+Markup span at (64:0,64 [7] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [20] )
+Markup span at (71:0,71 [8] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [12] )
+Markup span at (79:0,79 [3] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [12] )
+Markup span at (82:0,82 [1] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [12] )
+Markup span at (83:0,83 [1] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [20] )
+Markup span at (84:0,84 [20] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
+Markup span at (104:0,104 [9] ) (Accepts:Any) - Parent: Tag block at (104:0,104 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
new file mode 100644
index 0000000000..4c8ad505c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
@@ -0,0 +1,88 @@
+RazorDocument - [0..117)::117 - [<p class=foo dynamic=@DateTime.Now style=color:red;>Hello World <strong class="foo">inside of strong tag</strong></p>]
+    MarkupBlock - [0..117)::117
+        MarkupTagHelperElement - [0..117)::117 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52 - [<p class=foo dynamic=@DateTime.Now style=color:red;>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                CloseAngle;[>];
+            MarkupTextLiteral - [52..64)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupElement - [64..113)::49
+                MarkupStartTag - [64..84)::20 - [<strong class="foo">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupAttributeBlock - [71..83)::12 - [ class="foo"]
+                        MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [72..77)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [78..79)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        GenericBlock - [79..82)::3
+                            MarkupLiteralAttributeValue - [79..82)::3 - [foo]
+                                MarkupTextLiteral - [79..82)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                        MarkupTextLiteral - [82..83)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [84..104)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[inside];
+                    Whitespace;[ ];
+                    Text;[of];
+                    Whitespace;[ ];
+                    Text;[strong];
+                    Whitespace;[ ];
+                    Text;[tag];
+                MarkupEndTag - [104..113)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [113..117)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.tspans.txt
new file mode 100644
index 0000000000..dc61572b3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [117] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt
new file mode 100644
index 0000000000..92e6c778c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
new file mode 100644
index 0000000000..8d78aa6741
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..16)::16 - [<p class=""></p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..12)::12 - [<p class="">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..11)::9 - class - DoubleQuotes - Unbound - [ class=""]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..10)::0
+                        MarkupTextLiteral - [10..10)::0 - []
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [12..16)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.tspans.txt
new file mode 100644
index 0000000000..52dba16922
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [16] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt
new file mode 100644
index 0000000000..92e6c778c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
new file mode 100644
index 0000000000..4c062cddf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..16)::16 - [<p class=''></p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..12)::12 - [<p class=''>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..11)::9 - class - SingleQuotes - Unbound - [ class='']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..10)::0
+                        MarkupTextLiteral - [10..10)::0 - []
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [12..16)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.tspans.txt
new file mode 100644
index 0000000000..52dba16922
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [16] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.cspans.txt
new file mode 100644
index 0000000000..065cf74b88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.cspans.txt
@@ -0,0 +1 @@
+Markup span at (9:0,9 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
new file mode 100644
index 0000000000..b82bd69b7d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..14)::14 - [<p class=></p>]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..10)::10 - [<p class=>] - Gen<None> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..9)::7 - class - DoubleQuotes - Unbound - [ class=]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..9)::0
+                        MarkupTextLiteral - [9..9)::0 - []
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [10..14)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.tspans.txt
new file mode 100644
index 0000000000..d4769a773a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [14] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt
new file mode 100644
index 0000000000..eeee563c5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
new file mode 100644
index 0000000000..cf02383422
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..33)::33 - [<p class1='' class2= class3="" />]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [0..33)::33 - [<p class1='' class2= class3="" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class1 - SingleQuotes - Unbound - [ class1='']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..9)::6 - [class1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class1];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [11..11)::0
+                        MarkupTextLiteral - [11..11)::0 - []
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [12..20)::8 - class2 - DoubleQuotes - Unbound - [ class2=]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..19)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class2];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [20..20)::0
+                        MarkupTextLiteral - [20..20)::0 - []
+                MarkupTagHelperAttribute - [20..30)::10 - class3 - DoubleQuotes - Unbound - [ class3=""]
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [21..27)::6 - [class3] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class3];
+                    Equals;[=];
+                    MarkupTextLiteral - [28..29)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [29..29)::0
+                        MarkupTextLiteral - [29..29)::0 - []
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [30..31)::1
+                    MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.tspans.txt
new file mode 100644
index 0000000000..d6131fed67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [33] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt
new file mode 100644
index 0000000000..7b54ebc00d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
new file mode 100644
index 0000000000..768a93f630
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..31)::31 - [<p class1=''class2=""class3= />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [0..31)::31 - [<p class1=''class2=""class3= />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class1 - SingleQuotes - Unbound - [ class1='']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..9)::6 - [class1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class1];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [11..11)::0
+                        MarkupTextLiteral - [11..11)::0 - []
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [12..21)::9 - class2 - DoubleQuotes - Unbound - [class2=""]
+                    MarkupTextLiteral - [12..18)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class2];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [20..20)::0
+                        MarkupTextLiteral - [20..20)::0 - []
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [21..28)::7 - class3 - DoubleQuotes - Unbound - [class3=]
+                    MarkupTextLiteral - [21..27)::6 - [class3] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class3];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [28..28)::0
+                        MarkupTextLiteral - [28..28)::0 - []
+                MarkupMiscAttributeContent - [28..29)::1
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.tspans.txt
new file mode 100644
index 0000000000..b3437d8dea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.cspans.txt
new file mode 100644
index 0000000000..2681dbe5c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Code span at (28:0,28 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt
new file mode 100644
index 0000000000..0bfd3f50eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..29)::29 - [@{<input unbound-required />}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..28)::26
+                            MarkupTagHelperElement - [2..28)::26 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..28)::26 - [<input unbound-required />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMiscAttributeContent - [25..26)::1
+                                        MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.tspans.txt
new file mode 100644
index 0000000000..2af3e60e20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [26] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.cspans.txt
new file mode 100644
index 0000000000..20f962b4cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Code span at (27:0,27 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.diag.txt
new file mode 100644
index 0000000000..1fba524ca7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'int-prefix-value' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt
new file mode 100644
index 0000000000..73a3bdc16a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..28)::28 - [@{<input int-prefix-value/>}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpStatement - [0..28)::28
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..28)::27
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..27)::25
+                        MarkupBlock - [2..27)::25
+                            MarkupTagHelperElement - [2..27)::25 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..27)::25 - [<input int-prefix-value/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - int-prefix-value - Minimized - Bound - [ int-prefix-value]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-value];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [27..27)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.tspans.txt
new file mode 100644
index 0000000000..0744554d85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [25] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.cspans.txt
new file mode 100644
index 0000000000..a9bbc9d9b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.diag.txt
new file mode 100644
index 0000000000..f50988eac1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'string-prefix-value' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt
new file mode 100644
index 0000000000..47c931a035
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..32)::32 - [@{<input string-prefix-value />}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..31)::29 - [<input string-prefix-value />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..28)::20 - string-prefix-value - Minimized - Bound - [ string-prefix-value]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-value];
+                                    MarkupMiscAttributeContent - [28..29)::1
+                                        MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.tspans.txt
new file mode 100644
index 0000000000..2806d5b970
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [29] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt
new file mode 100644
index 0000000000..37fd3df813
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Code span at (27:0,27 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (2:0,2 [29] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.diag.txt
new file mode 100644
index 0000000000..1fba524ca7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'int-prefix-value' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
new file mode 100644
index 0000000000..fe5d6fd5f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..32)::32 - [@{<input int-prefix-value='' />}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..31)::29 - [<input int-prefix-value='' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..28)::20 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [27..27)::0
+                                            CSharpExpressionLiteral - [27..27)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [28..29)::1
+                                        MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.tspans.txt
new file mode 100644
index 0000000000..2806d5b970
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [29] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt
new file mode 100644
index 0000000000..dfa5d6b255
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [31] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
new file mode 100644
index 0000000000..b280afb3c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..34)::34 - [@{<input string-prefix-value=''/>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..33)::31 - [<input string-prefix-value=''/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..31)::23 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [30..30)::0
+                                            MarkupTextLiteral - [30..30)::0 - []
+                                        MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.tspans.txt
new file mode 100644
index 0000000000..8182ed93b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [31] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.cspans.txt
new file mode 100644
index 0000000000..3a6e32aaf1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Code span at (27:0,27 [1] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (2:0,2 [29] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
new file mode 100644
index 0000000000..96c8c36003
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..32)::32 - [@{<input int-prefix-value='3'/>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..31)::29 - [<input int-prefix-value='3'/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..29)::21 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='3']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [27..28)::1
+                                            CSharpExpressionLiteral - [27..28)::1 - [3] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Text;[3];
+                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.tspans.txt
new file mode 100644
index 0000000000..2806d5b970
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [29] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.cspans.txt
new file mode 100644
index 0000000000..1b14171eab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (30:0,30 [4] ) (Accepts:Any) - Parent: Markup block at (30:0,30 [11] )
+Markup span at (34:0,34 [7] ) (Accepts:Any) - Parent: Markup block at (30:0,30 [11] )
+Code span at (45:0,45 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (46:0,46 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
new file mode 100644
index 0000000000..98d61ab15a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..46)::46 - [@{<input string-prefix-value='some string' />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..45)::43 - [<input string-prefix-value='some string' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..42)::34 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='some string']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [30..41)::11
+                                            MarkupTextLiteral - [30..34)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[some];
+                                            MarkupTextLiteral - [34..41)::7 - [ string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[string];
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [42..43)::1
+                                        MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.tspans.txt
new file mode 100644
index 0000000000..02d9781340
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [43] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.cspans.txt
new file mode 100644
index 0000000000..cf35066b4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Code span at (50:0,50 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [51] )
+MetaCode span at (50:0,50 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [51] )
+Markup span at (51:0,51 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.diag.txt
new file mode 100644
index 0000000000..34a097ddbd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.diag.txt
@@ -0,0 +1 @@
+(1,27): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt
new file mode 100644
index 0000000000..9f865a9054
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..51)::51 - [@{<input unbound-required bound-required-string />}]
+    MarkupBlock - [0..51)::51
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..51)::51
+            CSharpStatement - [0..51)::51
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..51)::50
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..50)::48
+                        MarkupBlock - [2..50)::48
+                            MarkupTagHelperElement - [2..50)::48 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..50)::48 - [<input unbound-required bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMinimizedTagHelperAttribute - [25..47)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [26..47)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupMiscAttributeContent - [47..48)::1
+                                        MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [50..50)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [50..51)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [51..51)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.tspans.txt
new file mode 100644
index 0000000000..720abefec9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [48] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.cspans.txt
new file mode 100644
index 0000000000..8d6822ee97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Code span at (32:0,32 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [33] )
+MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.diag.txt
new file mode 100644
index 0000000000..1f297c49c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.diag.txt
@@ -0,0 +1,2 @@
+(1,6): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,16): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt
new file mode 100644
index 0000000000..1befcaa705
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..33)::33 - [@{<p bound-int bound-string></p>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupTagHelperElement - [2..32)::30 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..28)::26 - [<p bound-int bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [15..27)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [28..32)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.tspans.txt
new file mode 100644
index 0000000000..1c716c5737
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [30] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.cspans.txt
new file mode 100644
index 0000000000..27127e839a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [70] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [70] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [70] )
+Code span at (69:0,69 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [70] )
+MetaCode span at (69:0,69 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [70] )
+Markup span at (70:0,70 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [70] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.diag.txt
new file mode 100644
index 0000000000..85acb7466e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.diag.txt
@@ -0,0 +1,2 @@
+(1,10): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,46): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt
new file mode 100644
index 0000000000..25b3448e77
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..70)::70 - [@{<input bound-required-int unbound-required bound-required-string />}]
+    MarkupBlock - [0..70)::70
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..70)::70
+            CSharpStatement - [0..70)::70
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..70)::69
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..69)::67
+                        MarkupBlock - [2..69)::67
+                            MarkupTagHelperElement - [2..69)::67 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..69)::67 - [<input bound-required-int unbound-required bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..27)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..27)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupMinimizedTagHelperAttribute - [27..44)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [28..44)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMinimizedTagHelperAttribute - [44..66)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [45..66)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupMiscAttributeContent - [66..67)::1
+                                        MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [69..69)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [70..70)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.tspans.txt
new file mode 100644
index 0000000000..d52f0760b6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [67] ) - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.cspans.txt
new file mode 100644
index 0000000000..3c04339e4d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Code span at (45:0,45 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (46:0,46 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.diag.txt
new file mode 100644
index 0000000000..40bd70e718
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.diag.txt
@@ -0,0 +1,3 @@
+(1,6): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,16): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,29): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt
new file mode 100644
index 0000000000..e8733ace63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..46)::46 - [@{<p bound-int bound-string bound-string></p>}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..41)::39 - [<p bound-int bound-string bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [15..27)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupMinimizedTagHelperAttribute - [27..40)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [28..40)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [41..45)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.tspans.txt
new file mode 100644
index 0000000000..a82989a6ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [43] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.cspans.txt
new file mode 100644
index 0000000000..db6a9525a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Code span at (22:0,22 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.diag.txt
new file mode 100644
index 0000000000..7aaa747435
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt
new file mode 100644
index 0000000000..e68706d9ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..23)::23 - [@{<p bound-string></p>}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupTagHelperElement - [2..22)::20 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..18)::16 - [<p bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..17)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..17)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [18..22)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.tspans.txt
new file mode 100644
index 0000000000..d9c1c8ba6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [20] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.cspans.txt
new file mode 100644
index 0000000000..eeed5a0f9b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (33:0,33 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [38] )
+Code span at (40:0,40 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
new file mode 100644
index 0000000000..7664ec06e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..41)::41 - [@{<input unbound-required class='btn' />}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupTagHelperElement - [2..40)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..40)::38 - [<input unbound-required class='btn' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupTagHelperAttribute - [25..37)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [26..31)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [32..33)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [33..36)::3
+                                            MarkupLiteralAttributeValue - [33..36)::3 - [btn]
+                                                MarkupTextLiteral - [33..36)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [37..38)::1
+                                        MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.tspans.txt
new file mode 100644
index 0000000000..d3b1fd3647
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [38] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.cspans.txt
new file mode 100644
index 0000000000..59bf8f8330
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Markup span at (25:0,25 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [32] )
+Code span at (34:0,34 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [35] )
+MetaCode span at (34:0,34 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.diag.txt
new file mode 100644
index 0000000000..7aaa747435
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
new file mode 100644
index 0000000000..25bcd111d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..35)::35 - [@{<p bound-string class='btn'></p>}]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            CSharpStatement - [0..35)::35
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..35)::34
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..34)::32
+                        MarkupBlock - [2..34)::32
+                            MarkupTagHelperElement - [2..34)::32 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..30)::28 - [<p bound-string class='btn'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..17)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..17)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTagHelperAttribute - [17..29)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [25..28)::3
+                                            MarkupLiteralAttributeValue - [25..28)::3 - [btn]
+                                                MarkupTextLiteral - [25..28)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [30..34)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [34..34)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.tspans.txt
new file mode 100644
index 0000000000..89ddbae3e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [32] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.cspans.txt
new file mode 100644
index 0000000000..5543e2871d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [38] )
+Code span at (40:0,40 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
new file mode 100644
index 0000000000..f57f78fc06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..41)::41 - [@{<input class='btn' unbound-required />}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupTagHelperElement - [2..40)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..40)::38 - [<input class='btn' unbound-required />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..20)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [20..37)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [21..37)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMiscAttributeContent - [37..38)::1
+                                        MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.tspans.txt
new file mode 100644
index 0000000000..d3b1fd3647
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [38] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.cspans.txt
new file mode 100644
index 0000000000..2a00c88428
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [32] )
+Code span at (34:0,34 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [35] )
+MetaCode span at (34:0,34 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [35] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.diag.txt
new file mode 100644
index 0000000000..2e64b8d326
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
new file mode 100644
index 0000000000..4e5dc02713
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..35)::35 - [@{<p class='btn' bound-string></p>}]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            CSharpStatement - [0..35)::35
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..35)::34
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..34)::32
+                        MarkupBlock - [2..34)::32
+                            MarkupTagHelperElement - [2..34)::32 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..30)::28 - [<p class='btn' bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupTagHelperAttribute - [4..16)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                                                MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [16..29)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [17..29)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [30..34)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [34..34)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.tspans.txt
new file mode 100644
index 0000000000..89ddbae3e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [32] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.cspans.txt
new file mode 100644
index 0000000000..376263f7c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (38:0,38 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [43] )
+Code span at (45:0,45 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (46:0,46 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.diag.txt
new file mode 100644
index 0000000000..17ba3c5206
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
new file mode 100644
index 0000000000..9f5ca01f01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..46)::46 - [@{<input bound-required-string class='btn' />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..45)::43 - [<input bound-required-string class='btn' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..30)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..30)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTagHelperAttribute - [30..42)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [38..41)::3
+                                            MarkupLiteralAttributeValue - [38..41)::3 - [btn]
+                                                MarkupTextLiteral - [38..41)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [42..43)::1
+                                        MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.tspans.txt
new file mode 100644
index 0000000000..1521fa98cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [43] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.cspans.txt
new file mode 100644
index 0000000000..1d5021398f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [43] )
+Code span at (45:0,45 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (46:0,46 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.diag.txt
new file mode 100644
index 0000000000..4d52547683
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.diag.txt
@@ -0,0 +1 @@
+(1,22): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
new file mode 100644
index 0000000000..5ac62870b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..46)::46 - [@{<input class='btn' bound-required-string />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..45)::43 - [<input class='btn' bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..20)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [20..42)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [21..42)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupMiscAttributeContent - [42..43)::1
+                                        MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.tspans.txt
new file mode 100644
index 0000000000..1521fa98cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [43] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.cspans.txt
new file mode 100644
index 0000000000..c5c968408f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (35:0,35 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [40] )
+Code span at (42:0,42 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [43] )
+MetaCode span at (42:0,42 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.diag.txt
new file mode 100644
index 0000000000..e49be8f23f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
new file mode 100644
index 0000000000..304bc83217
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..43)::43 - [@{<input bound-required-int class='btn' />}]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            CSharpStatement - [0..43)::43
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..43)::42
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..42)::40
+                        MarkupBlock - [2..42)::40
+                            MarkupTagHelperElement - [2..42)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..42)::40 - [<input bound-required-int class='btn' />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..27)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..27)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTagHelperAttribute - [27..39)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [28..33)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [35..38)::3
+                                            MarkupLiteralAttributeValue - [35..38)::3 - [btn]
+                                                MarkupTextLiteral - [35..38)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMiscAttributeContent - [39..40)::1
+                                        MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [42..42)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.tspans.txt
new file mode 100644
index 0000000000..e397c293b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [40] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.cspans.txt
new file mode 100644
index 0000000000..c99bc193a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (22:0,22 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [29] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.diag.txt
new file mode 100644
index 0000000000..d801de11d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
new file mode 100644
index 0000000000..21c03176d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..32)::32 - [@{<p bound-int class='btn'></p>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..27)::25 - [<p bound-int class='btn'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTagHelperAttribute - [14..26)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [15..20)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [22..25)::3
+                                            MarkupLiteralAttributeValue - [22..25)::3 - [btn]
+                                                MarkupTextLiteral - [22..25)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [27..31)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.tspans.txt
new file mode 100644
index 0000000000..59132499f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [29] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.cspans.txt
new file mode 100644
index 0000000000..44774dadad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [40] )
+Code span at (42:0,42 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [43] )
+MetaCode span at (42:0,42 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [43] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.diag.txt
new file mode 100644
index 0000000000..44cbbd120a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.diag.txt
@@ -0,0 +1 @@
+(1,22): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
new file mode 100644
index 0000000000..6927648f4b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..43)::43 - [@{<input class='btn' bound-required-int />}]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            CSharpStatement - [0..43)::43
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..43)::42
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..42)::40
+                        MarkupBlock - [2..42)::40
+                            MarkupTagHelperElement - [2..42)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..42)::40 - [<input class='btn' bound-required-int />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..20)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [20..39)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [21..39)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupMiscAttributeContent - [39..40)::1
+                                        MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [42..42)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.tspans.txt
new file mode 100644
index 0000000000..e397c293b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [40] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.cspans.txt
new file mode 100644
index 0000000000..1bfedce83b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [29] )
+Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
+MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.diag.txt
new file mode 100644
index 0000000000..b0d4ba275b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
new file mode 100644
index 0000000000..a42df8f2d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..32)::32 - [@{<p class='btn' bound-int></p>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..27)::25 - [<p class='btn' bound-int>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupTagHelperAttribute - [4..16)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                                                MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [16..26)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [17..26)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [27..31)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.tspans.txt
new file mode 100644
index 0000000000..59132499f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [29] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.cspans.txt
new file mode 100644
index 0000000000..1b7db58ccc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.diag.txt
new file mode 100644
index 0000000000..17ba3c5206
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt
new file mode 100644
index 0000000000..f86315c309
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..34)::34 - [@{<input bound-required-string />}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..33)::31 - [<input bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..30)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..30)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupMiscAttributeContent - [30..31)::1
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.tspans.txt
new file mode 100644
index 0000000000..15e0c638a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [31] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt
new file mode 100644
index 0000000000..e24fb99361
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [13] )
+Code span at (17:0,17 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [13] )
+Markup span at (29:0,29 [2] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [17] )
+Markup span at (31:0,31 [2] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [17] )
+Code span at (56:0,56 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [57] )
+MetaCode span at (56:0,56 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
+Markup span at (57:0,57 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.diag.txt
new file mode 100644
index 0000000000..f13ebc1193
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.diag.txt
@@ -0,0 +1 @@
+(1,36): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
new file mode 100644
index 0000000000..82d4899171
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..57)::57 - [@{<input class='@DateTime.Now + 1' bound-required-int />}]
+    MarkupBlock - [0..57)::57
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..57)::57
+            CSharpStatement - [0..57)::57
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..57)::56
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..56)::54
+                        MarkupBlock - [2..56)::54
+                            MarkupTagHelperElement - [2..56)::54 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..56)::54 - [<input class='@DateTime.Now + 1' bound-required-int />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupTagHelperAttribute - [8..34)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..33)::17
+                                            MarkupDynamicAttributeValue - [16..29)::13 - [@DateTime.Now]
+                                                GenericBlock - [16..29)::13
+                                                    CSharpCodeBlock - [16..29)::13
+                                                        CSharpImplicitExpression - [16..29)::13
+                                                            CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [17..29)::12
+                                                                CSharpCodeBlock - [17..29)::12
+                                                                    CSharpExpressionLiteral - [17..29)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [29..31)::2 - [ +]
+                                                MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [30..31)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [31..33)::2 - [ 1]
+                                                MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [32..33)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [34..53)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [35..53)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupMiscAttributeContent - [53..54)::1
+                                        MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [56..56)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [57..57)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.tspans.txt
new file mode 100644
index 0000000000..48c553ef88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [54] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt
new file mode 100644
index 0000000000..50cbc5077c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
+Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [17] )
+Markup span at (27:0,27 [2] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [17] )
+Code span at (45:0,45 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
+MetaCode span at (45:0,45 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
+Markup span at (46:0,46 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.diag.txt
new file mode 100644
index 0000000000..df44096ccc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.diag.txt
@@ -0,0 +1 @@
+(1,32): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
new file mode 100644
index 0000000000..d44ffc1fa8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
@@ -0,0 +1,67 @@
+RazorDocument - [0..46)::46 - [@{<p class='@DateTime.Now + 1' bound-int></p>}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..41)::39 - [<p class='@DateTime.Now + 1' bound-int>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupTagHelperAttribute - [4..30)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [12..29)::17
+                                            MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                                                GenericBlock - [12..25)::13
+                                                    CSharpCodeBlock - [12..25)::13
+                                                        CSharpImplicitExpression - [12..25)::13
+                                                            CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [13..25)::12
+                                                                CSharpCodeBlock - [13..25)::12
+                                                                    CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [25..27)::2 - [ +]
+                                                MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [26..27)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [27..29)::2 - [ 1]
+                                                MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [28..29)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [30..40)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [31..40)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [41..45)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.tspans.txt
new file mode 100644
index 0000000000..a82989a6ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [43] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt
new file mode 100644
index 0000000000..24ce3652a1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [129] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [129] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [129] )
+Transition span at (38:0,38 [1] ) (Accepts:None) - Parent: Expression block at (38:0,38 [13] )
+Code span at (39:0,39 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (38:0,38 [13] )
+Markup span at (51:0,51 [2] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [17] )
+Markup span at (53:0,53 [2] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [17] )
+Transition span at (88:0,88 [1] ) (Accepts:None) - Parent: Expression block at (88:0,88 [13] )
+Code span at (89:0,89 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (88:0,88 [13] )
+Markup span at (101:0,101 [2] ) (Accepts:Any) - Parent: Markup block at (88:0,88 [17] )
+Markup span at (103:0,103 [2] ) (Accepts:Any) - Parent: Markup block at (88:0,88 [17] )
+Code span at (128:0,128 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [129] )
+MetaCode span at (128:0,128 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [129] )
+Markup span at (129:0,129 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [129] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.diag.txt
new file mode 100644
index 0000000000..f7ecf89f20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.diag.txt
@@ -0,0 +1,2 @@
+(1,13): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,60): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
new file mode 100644
index 0000000000..3d0a162a8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
@@ -0,0 +1,109 @@
+RazorDocument - [0..129)::129 - [@{<input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />}]
+    MarkupBlock - [0..129)::129
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..129)::129
+            CSharpStatement - [0..129)::129
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..129)::128
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..128)::126
+                        MarkupBlock - [2..128)::126
+                            MarkupTagHelperElement - [2..128)::126 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..128)::126 - [<input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..30)::22 - bound-required-int - Minimized - Bound - [    bound-required-int]
+                                        MarkupTextLiteral - [8..12)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[    ];
+                                        MarkupTextLiteral - [12..30)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTagHelperAttribute - [30..56)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [38..55)::17
+                                            MarkupDynamicAttributeValue - [38..51)::13 - [@DateTime.Now]
+                                                GenericBlock - [38..51)::13
+                                                    CSharpCodeBlock - [38..51)::13
+                                                        CSharpImplicitExpression - [38..51)::13
+                                                            CSharpTransition - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [39..51)::12
+                                                                CSharpCodeBlock - [39..51)::12
+                                                                    CSharpExpressionLiteral - [39..51)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [51..53)::2 - [ +]
+                                                MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [52..53)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [53..55)::2 - [ 1]
+                                                MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [54..55)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [56..80)::24 - bound-required-string - Minimized - Bound - [   bound-required-string]
+                                        MarkupTextLiteral - [56..59)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[   ];
+                                        MarkupTextLiteral - [59..80)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTagHelperAttribute - [80..106)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [80..81)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [81..86)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [87..88)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [88..105)::17
+                                            MarkupDynamicAttributeValue - [88..101)::13 - [@DateTime.Now]
+                                                GenericBlock - [88..101)::13
+                                                    CSharpCodeBlock - [88..101)::13
+                                                        CSharpImplicitExpression - [88..101)::13
+                                                            CSharpTransition - [88..89)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [89..101)::12
+                                                                CSharpCodeBlock - [89..101)::12
+                                                                    CSharpExpressionLiteral - [89..101)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [101..103)::2 - [ +]
+                                                MarkupTextLiteral - [101..102)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [102..103)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [103..105)::2 - [ 1]
+                                                MarkupTextLiteral - [103..104)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [104..105)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [105..106)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [106..124)::18 - unbound-required - Minimized - Unbound - [  unbound-required]
+                                        MarkupTextLiteral - [106..108)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [108..124)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMiscAttributeContent - [124..126)::2
+                                        MarkupTextLiteral - [124..126)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [128..128)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [128..129)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [129..129)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.tspans.txt
new file mode 100644
index 0000000000..166c08fd21
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [126] ) - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt
new file mode 100644
index 0000000000..a67845db19
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [104] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [104] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [104] )
+Transition span at (25:0,25 [1] ) (Accepts:None) - Parent: Expression block at (25:0,25 [13] )
+Code span at (26:0,26 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:0,25 [13] )
+Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [17] )
+Markup span at (40:0,40 [2] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [17] )
+Transition span at (66:0,66 [1] ) (Accepts:None) - Parent: Expression block at (66:0,66 [13] )
+Code span at (67:0,67 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (66:0,66 [13] )
+Markup span at (79:0,79 [2] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [17] )
+Markup span at (81:0,81 [2] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [17] )
+Code span at (103:0,103 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [104] )
+MetaCode span at (103:0,103 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [104] )
+Markup span at (104:0,104 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [104] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.diag.txt
new file mode 100644
index 0000000000..02bcf3e7fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.diag.txt
@@ -0,0 +1,3 @@
+(1,9): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,47): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,87): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
new file mode 100644
index 0000000000..b29b523237
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
@@ -0,0 +1,110 @@
+RazorDocument - [0..104)::104 - [@{<p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string></p>}]
+    MarkupBlock - [0..104)::104
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..104)::104
+            CSharpStatement - [0..104)::104
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..104)::103
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..103)::101
+                        MarkupBlock - [2..103)::101
+                            MarkupTagHelperElement - [2..103)::101 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..99)::97 - [<p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..17)::13 - bound-int - Minimized - Bound - [    bound-int]
+                                        MarkupTextLiteral - [4..8)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[    ];
+                                        MarkupTextLiteral - [8..17)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTagHelperAttribute - [17..43)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [25..42)::17
+                                            MarkupDynamicAttributeValue - [25..38)::13 - [@DateTime.Now]
+                                                GenericBlock - [25..38)::13
+                                                    CSharpCodeBlock - [25..38)::13
+                                                        CSharpImplicitExpression - [25..38)::13
+                                                            CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [26..38)::12
+                                                                CSharpCodeBlock - [26..38)::12
+                                                                    CSharpExpressionLiteral - [26..38)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [38..40)::2 - [ +]
+                                                MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [39..40)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [40..42)::2 - [ 1]
+                                                MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [41..42)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [42..43)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [43..58)::15 - bound-string - Minimized - Bound - [   bound-string]
+                                        MarkupTextLiteral - [43..46)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[   ];
+                                        MarkupTextLiteral - [46..58)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTagHelperAttribute - [58..84)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [58..59)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [59..64)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [65..66)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [66..83)::17
+                                            MarkupDynamicAttributeValue - [66..79)::13 - [@DateTime.Now]
+                                                GenericBlock - [66..79)::13
+                                                    CSharpCodeBlock - [66..79)::13
+                                                        CSharpImplicitExpression - [66..79)::13
+                                                            CSharpTransition - [66..67)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [67..79)::12
+                                                                CSharpCodeBlock - [67..79)::12
+                                                                    CSharpExpressionLiteral - [67..79)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [79..81)::2 - [ +]
+                                                MarkupTextLiteral - [79..80)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [80..81)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [81..83)::2 - [ 1]
+                                                MarkupTextLiteral - [81..82)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [82..83)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [83..84)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [84..98)::14 - bound-string - Minimized - Bound - [  bound-string]
+                                        MarkupTextLiteral - [84..86)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [86..98)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [99..103)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [103..103)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [103..104)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [104..104)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.tspans.txt
new file mode 100644
index 0000000000..9fcda621d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [101] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.cspans.txt
new file mode 100644
index 0000000000..98013e5de4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Code span at (30:0,30 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.diag.txt
new file mode 100644
index 0000000000..e49be8f23f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt
new file mode 100644
index 0000000000..aec5a2ef4a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..31)::31 - [@{<input bound-required-int />}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupTagHelperElement - [2..30)::28 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..30)::28 - [<input bound-required-int />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..27)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..27)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupMiscAttributeContent - [27..28)::1
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.tspans.txt
new file mode 100644
index 0000000000..84da2d9138
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [28] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.cspans.txt
new file mode 100644
index 0000000000..2397a13ae4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Code span at (19:0,19 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (19:0,19 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.diag.txt
new file mode 100644
index 0000000000..d801de11d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt
new file mode 100644
index 0000000000..f61bc90a08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..20)::20 - [@{<p bound-int></p>}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupTagHelperElement - [2..19)::17 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..15)::13 - [<p bound-int>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [15..19)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.tspans.txt
new file mode 100644
index 0000000000..b8f49f313a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [17] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.cspans.txt
new file mode 100644
index 0000000000..24e649f2da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (25:0,25 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (25:0,25 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (26:0,26 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.diag.txt
new file mode 100644
index 0000000000..4ea65e9705
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'int-dictionary' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Collections.Generic.IDictionary<System.String, System.Int32>' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt
new file mode 100644
index 0000000000..cffd8ef998
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..26)::26 - [@{<input int-dictionary/>}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        MarkupBlock - [2..25)::23
+                            MarkupTagHelperElement - [2..25)::23 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..25)::23 - [<input int-dictionary/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..23)::15 - int-dictionary - Minimized - Bound - [ int-dictionary]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..23)::14 - [int-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-dictionary];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [25..25)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.tspans.txt
new file mode 100644
index 0000000000..15dbcaa307
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [23] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.cspans.txt
new file mode 100644
index 0000000000..3b00b2167f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Code span at (29:0,29 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.diag.txt
new file mode 100644
index 0000000000..c4f2e7af6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ2008: Attribute 'string-dictionary' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Collections.Generic.IDictionary<System.String, System.String>' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt
new file mode 100644
index 0000000000..de57398940
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..30)::30 - [@{<input string-dictionary />}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..29)::27
+                        MarkupBlock - [2..29)::27
+                            MarkupTagHelperElement - [2..29)::27 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..29)::27 - [<input string-dictionary />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..26)::18 - string-dictionary - Minimized - Bound - [ string-dictionary]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..26)::17 - [string-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-dictionary];
+                                    MarkupMiscAttributeContent - [26..27)::1
+                                        MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [29..29)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.tspans.txt
new file mode 100644
index 0000000000..e5276ea81f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [27] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.cspans.txt
new file mode 100644
index 0000000000..b4b9c0325e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Code span at (23:0,23 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.diag.txt
new file mode 100644
index 0000000000..132178a225
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.diag.txt
@@ -0,0 +1,2 @@
+(1,10): Error RZ2008: Attribute 'int-prefix-' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,10): Error RZ1029: The tag helper attribute 'int-prefix-' in element 'input' is missing a key. The syntax is '<input int-prefix-{ key }="value">'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt
new file mode 100644
index 0000000000..54f08693c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..24)::24 - [@{<input int-prefix- />}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupTagHelperElement - [2..23)::21 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..23)::21 - [<input int-prefix- />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..20)::12 - int-prefix- - Minimized - Bound - [ int-prefix-]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..20)::11 - [int-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-];
+                                    MarkupMiscAttributeContent - [20..21)::1
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.tspans.txt
new file mode 100644
index 0000000000..a323d89c7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [21] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.cspans.txt
new file mode 100644
index 0000000000..24e649f2da
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Code span at (25:0,25 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [26] )
+MetaCode span at (25:0,25 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [26] )
+Markup span at (26:0,26 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.diag.txt
new file mode 100644
index 0000000000..b9efc3a749
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.diag.txt
@@ -0,0 +1,2 @@
+(1,10): Error RZ2008: Attribute 'string-prefix-' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,10): Error RZ1029: The tag helper attribute 'string-prefix-' in element 'input' is missing a key. The syntax is '<input string-prefix-{ key }="value">'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt
new file mode 100644
index 0000000000..54a9bbcb1c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..26)::26 - [@{<input string-prefix-/>}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        MarkupBlock - [2..25)::23
+                            MarkupTagHelperElement - [2..25)::23 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..25)::23 - [<input string-prefix-/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..23)::15 - string-prefix- - Minimized - Bound - [ string-prefix-]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..23)::14 - [string-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [25..25)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.tspans.txt
new file mode 100644
index 0000000000..15dbcaa307
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [23] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt
new file mode 100644
index 0000000000..47f7be7833
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..26)::26 - [<input unbound-required />]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..26)::26 - [<input unbound-required />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMiscAttributeContent - [23..24)::1
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.tspans.txt
new file mode 100644
index 0000000000..c70b63a3a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [26] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.diag.txt
new file mode 100644
index 0000000000..f9aca6bc06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'int-prefix-value' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt
new file mode 100644
index 0000000000..b4a299b04e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..25)::25 - [<input int-prefix-value/>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..25)::25 - [<input int-prefix-value/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - int-prefix-value - Minimized - Bound - [ int-prefix-value]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-value];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.tspans.txt
new file mode 100644
index 0000000000..1cdf61374d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.diag.txt
new file mode 100644
index 0000000000..34c821c786
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'string-prefix-value' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt
new file mode 100644
index 0000000000..7e2884d597
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..29)::29 - [<input string-prefix-value />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..29)::29 - [<input string-prefix-value />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..26)::20 - string-prefix-value - Minimized - Bound - [ string-prefix-value]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-value];
+                MarkupMiscAttributeContent - [26..27)::1
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.tspans.txt
new file mode 100644
index 0000000000..0cecc8878e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt
new file mode 100644
index 0000000000..fd32ae8345
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt
@@ -0,0 +1 @@
+Code span at (25:0,25 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.diag.txt
new file mode 100644
index 0000000000..f9aca6bc06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'int-prefix-value' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
new file mode 100644
index 0000000000..f30adc9039
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..29)::29 - [<input int-prefix-value='' />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..29)::29 - [<input int-prefix-value='' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..26)::20 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [25..25)::0
+                        CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [26..27)::1
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.tspans.txt
new file mode 100644
index 0000000000..0cecc8878e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt
new file mode 100644
index 0000000000..8bfb200837
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt
@@ -0,0 +1 @@
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
new file mode 100644
index 0000000000..c8402947c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..31)::31 - [<input string-prefix-value=''/>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..31)::31 - [<input string-prefix-value=''/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..29)::23 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [28..28)::0
+                        MarkupTextLiteral - [28..28)::0 - []
+                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.tspans.txt
new file mode 100644
index 0000000000..fb3dd52d1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.cspans.txt
new file mode 100644
index 0000000000..ef4d8f2892
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.cspans.txt
@@ -0,0 +1 @@
+Code span at (25:0,25 [1] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
new file mode 100644
index 0000000000..1073b6dcce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..29)::29 - [<input int-prefix-value='3'/>]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..29)::29 - [<input int-prefix-value='3'/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..27)::21 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='3']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [25..26)::1
+                        CSharpExpressionLiteral - [25..26)::1 - [3] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[3];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.tspans.txt
new file mode 100644
index 0000000000..0cecc8878e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.cspans.txt
new file mode 100644
index 0000000000..59085ec1f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (28:0,28 [4] ) (Accepts:Any) - Parent: Markup block at (28:0,28 [11] )
+Markup span at (32:0,32 [7] ) (Accepts:Any) - Parent: Markup block at (28:0,28 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
new file mode 100644
index 0000000000..db5120a644
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..43)::43 - [<input string-prefix-value='some string' />]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..43)::43 - [<input string-prefix-value='some string' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..40)::34 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='some string']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [28..39)::11
+                        MarkupTextLiteral - [28..32)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[some];
+                        MarkupTextLiteral - [32..39)::7 - [ string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[string];
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [40..41)::1
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.tspans.txt
new file mode 100644
index 0000000000..cdcaa72be2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.diag.txt
new file mode 100644
index 0000000000..f16231c79a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.diag.txt
@@ -0,0 +1 @@
+(1,25): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt
new file mode 100644
index 0000000000..2eb0da7317
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..48)::48 - [<input unbound-required bound-required-string />]
+    MarkupBlock - [0..48)::48
+        MarkupTagHelperElement - [0..48)::48 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..48)::48 - [<input unbound-required bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [23..45)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [24..45)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupMiscAttributeContent - [45..46)::1
+                    MarkupTextLiteral - [45..46)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.tspans.txt
new file mode 100644
index 0000000000..d2f983f82e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [48] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.diag.txt
new file mode 100644
index 0000000000..a34289902a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,14): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt
new file mode 100644
index 0000000000..7e4b51696b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..30)::30 - [<p bound-int bound-string></p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..26)::26 - [<p bound-int bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [12..25)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..25)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..30)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.tspans.txt
new file mode 100644
index 0000000000..2e5914e934
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [30] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.diag.txt
new file mode 100644
index 0000000000..b62a808863
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.diag.txt
@@ -0,0 +1,2 @@
+(1,8): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,44): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt
new file mode 100644
index 0000000000..f0769355d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..67)::67 - [<input bound-required-int unbound-required bound-required-string />]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..67)::67 - [<input bound-required-int unbound-required bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMinimizedTagHelperAttribute - [25..42)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..42)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [42..64)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [43..64)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupMiscAttributeContent - [64..65)::1
+                    MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.tspans.txt
new file mode 100644
index 0000000000..bd906590f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [67] ) - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.diag.txt
new file mode 100644
index 0000000000..2d5adeffaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.diag.txt
@@ -0,0 +1,3 @@
+(1,4): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,14): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,27): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt
new file mode 100644
index 0000000000..3e7583e45f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..43)::43 - [<p bound-int bound-string bound-string></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..39)::39 - [<p bound-int bound-string bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [12..25)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..25)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupMinimizedTagHelperAttribute - [25..38)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..38)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.tspans.txt
new file mode 100644
index 0000000000..9b75c4b72a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.diag.txt
new file mode 100644
index 0000000000..73d0ec9b72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt
new file mode 100644
index 0000000000..145201b308
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..20)::20 - [<p bound-string></p>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..16)::16 - [<p bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..15)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [16..20)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.tspans.txt
new file mode 100644
index 0000000000..c5f5d51854
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [20] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.cspans.txt
new file mode 100644
index 0000000000..f887502903
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.cspans.txt
@@ -0,0 +1 @@
+Markup span at (31:0,31 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
new file mode 100644
index 0000000000..adfdb4997a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..38)::38 - [<input unbound-required class='btn' />]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..38)::38 - [<input unbound-required class='btn' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupTagHelperAttribute - [23..35)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [24..29)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [31..34)::3
+                        MarkupLiteralAttributeValue - [31..34)::3 - [btn]
+                            MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [35..36)::1
+                    MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.tspans.txt
new file mode 100644
index 0000000000..3530a0ad39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [38] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.cspans.txt
new file mode 100644
index 0000000000..f3168ff72f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.cspans.txt
@@ -0,0 +1 @@
+Markup span at (23:0,23 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.diag.txt
new file mode 100644
index 0000000000..73d0ec9b72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
new file mode 100644
index 0000000000..3619bf04fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..32)::32 - [<p bound-string class='btn'></p>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..28)::28 - [<p bound-string class='btn'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..15)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTagHelperAttribute - [15..27)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [16..21)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [23..26)::3
+                        MarkupLiteralAttributeValue - [23..26)::3 - [btn]
+                            MarkupTextLiteral - [23..26)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [28..32)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.tspans.txt
new file mode 100644
index 0000000000..96056a17cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [32] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.cspans.txt
new file mode 100644
index 0000000000..da12d8c524
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.cspans.txt
@@ -0,0 +1 @@
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [38] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
new file mode 100644
index 0000000000..bb3a09acef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..38)::38 - [<input class='btn' unbound-required />]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..38)::38 - [<input class='btn' unbound-required />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..17)::3
+                        MarkupLiteralAttributeValue - [14..17)::3 - [btn]
+                            MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [18..35)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..35)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMiscAttributeContent - [35..36)::1
+                    MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.tspans.txt
new file mode 100644
index 0000000000..3530a0ad39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [38] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.cspans.txt
new file mode 100644
index 0000000000..aaba30723e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [32] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.diag.txt
new file mode 100644
index 0000000000..1379c04890
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.diag.txt
@@ -0,0 +1 @@
+(1,16): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
new file mode 100644
index 0000000000..05e69ed46a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..32)::32 - [<p class='btn' bound-string></p>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..28)::28 - [<p class='btn' bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..27)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [28..32)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.tspans.txt
new file mode 100644
index 0000000000..96056a17cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [32] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.cspans.txt
new file mode 100644
index 0000000000..617d58dd6c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.cspans.txt
@@ -0,0 +1 @@
+Markup span at (36:0,36 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.diag.txt
new file mode 100644
index 0000000000..fa5bd9298e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
new file mode 100644
index 0000000000..b8bdaa9a32
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..43)::43 - [<input bound-required-string class='btn' />]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..43)::43 - [<input bound-required-string class='btn' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..28)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTagHelperAttribute - [28..40)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..34)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [36..39)::3
+                        MarkupLiteralAttributeValue - [36..39)::3 - [btn]
+                            MarkupTextLiteral - [36..39)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [40..41)::1
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.tspans.txt
new file mode 100644
index 0000000000..4b2bde1a22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.cspans.txt
new file mode 100644
index 0000000000..5d5e86a3ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.cspans.txt
@@ -0,0 +1 @@
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [43] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.diag.txt
new file mode 100644
index 0000000000..107ae7e349
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.diag.txt
@@ -0,0 +1 @@
+(1,20): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
new file mode 100644
index 0000000000..809d101bcb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..43)::43 - [<input class='btn' bound-required-string />]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..43)::43 - [<input class='btn' bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..17)::3
+                        MarkupLiteralAttributeValue - [14..17)::3 - [btn]
+                            MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [18..40)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..40)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupMiscAttributeContent - [40..41)::1
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.tspans.txt
new file mode 100644
index 0000000000..4b2bde1a22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.cspans.txt
new file mode 100644
index 0000000000..a407f3ff42
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.cspans.txt
@@ -0,0 +1 @@
+Markup span at (33:0,33 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.diag.txt
new file mode 100644
index 0000000000..7c6942351c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
new file mode 100644
index 0000000000..d2a0becaf5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..40)::40 - [<input bound-required-int class='btn' />]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..40)::40 - [<input bound-required-int class='btn' />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTagHelperAttribute - [25..37)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..31)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [32..33)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [33..36)::3
+                        MarkupLiteralAttributeValue - [33..36)::3 - [btn]
+                            MarkupTextLiteral - [33..36)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMiscAttributeContent - [37..38)::1
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.tspans.txt
new file mode 100644
index 0000000000..e303f87929
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [40] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.cspans.txt
new file mode 100644
index 0000000000..b760071418
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.cspans.txt
@@ -0,0 +1 @@
+Markup span at (20:0,20 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.diag.txt
new file mode 100644
index 0000000000..522de8be51
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
new file mode 100644
index 0000000000..ba99c42800
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..29)::29 - [<p bound-int class='btn'></p>]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p bound-int class='btn'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTagHelperAttribute - [12..24)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..18)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [20..23)::3
+                        MarkupLiteralAttributeValue - [20..23)::3 - [btn]
+                            MarkupTextLiteral - [20..23)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..29)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.tspans.txt
new file mode 100644
index 0000000000..4a617a9985
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.cspans.txt
new file mode 100644
index 0000000000..bbfaeade34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.cspans.txt
@@ -0,0 +1 @@
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [40] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.diag.txt
new file mode 100644
index 0000000000..b147ff3b8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.diag.txt
@@ -0,0 +1 @@
+(1,20): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
new file mode 100644
index 0000000000..9938367174
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..40)::40 - [<input class='btn' bound-required-int />]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..40)::40 - [<input class='btn' bound-required-int />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..17)::3
+                        MarkupLiteralAttributeValue - [14..17)::3 - [btn]
+                            MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [18..37)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..37)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMiscAttributeContent - [37..38)::1
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.tspans.txt
new file mode 100644
index 0000000000..e303f87929
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [40] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.cspans.txt
new file mode 100644
index 0000000000..9886c6c9e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.diag.txt
new file mode 100644
index 0000000000..070a2efcbf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.diag.txt
@@ -0,0 +1 @@
+(1,16): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
new file mode 100644
index 0000000000..56b05f2f39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..29)::29 - [<p class='btn' bound-int></p>]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p class='btn' bound-int>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..24)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..24)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..29)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.tspans.txt
new file mode 100644
index 0000000000..4a617a9985
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [29] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.diag.txt
new file mode 100644
index 0000000000..fa5bd9298e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt
new file mode 100644
index 0000000000..8e3178ad8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..31)::31 - [<input bound-required-string />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..31)::31 - [<input bound-required-string />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..28)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupMiscAttributeContent - [28..29)::1
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.tspans.txt
new file mode 100644
index 0000000000..69e54d8aad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt
new file mode 100644
index 0000000000..b7f3cfaf69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt
@@ -0,0 +1,4 @@
+Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [13] )
+Code span at (15:0,15 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (14:0,14 [13] )
+Markup span at (27:0,27 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [17] )
+Markup span at (29:0,29 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.diag.txt
new file mode 100644
index 0000000000..35bf3d2029
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.diag.txt
@@ -0,0 +1 @@
+(1,34): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
new file mode 100644
index 0000000000..dda375000b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..54)::54 - [<input class='@DateTime.Now + 1' bound-required-int />]
+    MarkupBlock - [0..54)::54
+        MarkupTagHelperElement - [0..54)::54 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..54)::54 - [<input class='@DateTime.Now + 1' bound-required-int />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperAttribute - [6..32)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..31)::17
+                        MarkupDynamicAttributeValue - [14..27)::13 - [@DateTime.Now]
+                            GenericBlock - [14..27)::13
+                                CSharpCodeBlock - [14..27)::13
+                                    CSharpImplicitExpression - [14..27)::13
+                                        CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [15..27)::12
+                                            CSharpCodeBlock - [15..27)::12
+                                                CSharpExpressionLiteral - [15..27)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [27..29)::2 - [ +]
+                            MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [28..29)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [29..31)::2 - [ 1]
+                            MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [30..31)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [32..51)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [33..51)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMiscAttributeContent - [51..52)::1
+                    MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.tspans.txt
new file mode 100644
index 0000000000..3416d837b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [54] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt
new file mode 100644
index 0000000000..5279ba8415
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt
@@ -0,0 +1,4 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
+Markup span at (23:0,23 [2] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [17] )
+Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.diag.txt
new file mode 100644
index 0000000000..49aae9f038
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.diag.txt
@@ -0,0 +1 @@
+(1,30): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
new file mode 100644
index 0000000000..a086544147
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..43)::43 - [<p class='@DateTime.Now + 1' bound-int></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..39)::39 - [<p class='@DateTime.Now + 1' bound-int>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..28)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..27)::17
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [23..25)::2 - [ +]
+                            MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [24..25)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [25..27)::2 - [ 1]
+                            MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [26..27)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [28..38)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..38)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.tspans.txt
new file mode 100644
index 0000000000..9b75c4b72a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt
new file mode 100644
index 0000000000..d4bd228d1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt
@@ -0,0 +1,8 @@
+Transition span at (36:0,36 [1] ) (Accepts:None) - Parent: Expression block at (36:0,36 [13] )
+Code span at (37:0,37 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (36:0,36 [13] )
+Markup span at (49:0,49 [2] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [17] )
+Markup span at (51:0,51 [2] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [17] )
+Transition span at (86:0,86 [1] ) (Accepts:None) - Parent: Expression block at (86:0,86 [13] )
+Code span at (87:0,87 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (86:0,86 [13] )
+Markup span at (99:0,99 [2] ) (Accepts:Any) - Parent: Markup block at (86:0,86 [17] )
+Markup span at (101:0,101 [2] ) (Accepts:Any) - Parent: Markup block at (86:0,86 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.diag.txt
new file mode 100644
index 0000000000..87c50385f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.diag.txt
@@ -0,0 +1,2 @@
+(1,11): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,58): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
new file mode 100644
index 0000000000..438ff977ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
@@ -0,0 +1,92 @@
+RazorDocument - [0..126)::126 - [<input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />]
+    MarkupBlock - [0..126)::126
+        MarkupTagHelperElement - [0..126)::126 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..126)::126 - [<input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-int - Minimized - Bound - [    bound-required-int]
+                    MarkupTextLiteral - [6..10)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [10..28)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTagHelperAttribute - [28..54)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..34)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [36..53)::17
+                        MarkupDynamicAttributeValue - [36..49)::13 - [@DateTime.Now]
+                            GenericBlock - [36..49)::13
+                                CSharpCodeBlock - [36..49)::13
+                                    CSharpImplicitExpression - [36..49)::13
+                                        CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [37..49)::12
+                                            CSharpCodeBlock - [37..49)::12
+                                                CSharpExpressionLiteral - [37..49)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [49..51)::2 - [ +]
+                            MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [50..51)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [51..53)::2 - [ 1]
+                            MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [52..53)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [53..54)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [54..78)::24 - bound-required-string - Minimized - Bound - [   bound-required-string]
+                    MarkupTextLiteral - [54..57)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[   ];
+                    MarkupTextLiteral - [57..78)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTagHelperAttribute - [78..104)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [78..79)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [79..84)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [86..103)::17
+                        MarkupDynamicAttributeValue - [86..99)::13 - [@DateTime.Now]
+                            GenericBlock - [86..99)::13
+                                CSharpCodeBlock - [86..99)::13
+                                    CSharpImplicitExpression - [86..99)::13
+                                        CSharpTransition - [86..87)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [87..99)::12
+                                            CSharpCodeBlock - [87..99)::12
+                                                CSharpExpressionLiteral - [87..99)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [99..101)::2 - [ +]
+                            MarkupTextLiteral - [99..100)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [100..101)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [101..103)::2 - [ 1]
+                            MarkupTextLiteral - [101..102)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [102..103)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [103..104)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [104..122)::18 - unbound-required - Minimized - Unbound - [  unbound-required]
+                    MarkupTextLiteral - [104..106)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [106..122)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMiscAttributeContent - [122..124)::2
+                    MarkupTextLiteral - [122..124)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.tspans.txt
new file mode 100644
index 0000000000..ed3ef89c3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [126] ) - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt
new file mode 100644
index 0000000000..0a331cbddd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt
@@ -0,0 +1,8 @@
+Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [13] )
+Code span at (24:0,24 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [13] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [17] )
+Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [17] )
+Transition span at (64:0,64 [1] ) (Accepts:None) - Parent: Expression block at (64:0,64 [13] )
+Code span at (65:0,65 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (64:0,64 [13] )
+Markup span at (77:0,77 [2] ) (Accepts:Any) - Parent: Markup block at (64:0,64 [17] )
+Markup span at (79:0,79 [2] ) (Accepts:Any) - Parent: Markup block at (64:0,64 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.diag.txt
new file mode 100644
index 0000000000..482a02baa0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.diag.txt
@@ -0,0 +1,3 @@
+(1,7): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,45): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,85): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
new file mode 100644
index 0000000000..6b70ada3ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
@@ -0,0 +1,93 @@
+RazorDocument - [0..101)::101 - [<p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string></p>]
+    MarkupBlock - [0..101)::101
+        MarkupTagHelperElement - [0..101)::101 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..97)::97 - [<p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-int - Minimized - Bound - [    bound-int]
+                    MarkupTextLiteral - [2..6)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [6..15)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTagHelperAttribute - [15..41)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [16..21)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [23..40)::17
+                        MarkupDynamicAttributeValue - [23..36)::13 - [@DateTime.Now]
+                            GenericBlock - [23..36)::13
+                                CSharpCodeBlock - [23..36)::13
+                                    CSharpImplicitExpression - [23..36)::13
+                                        CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [24..36)::12
+                                            CSharpCodeBlock - [24..36)::12
+                                                CSharpExpressionLiteral - [24..36)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [36..38)::2 - [ +]
+                            MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [37..38)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [38..40)::2 - [ 1]
+                            MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [39..40)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [41..56)::15 - bound-string - Minimized - Bound - [   bound-string]
+                    MarkupTextLiteral - [41..44)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[   ];
+                    MarkupTextLiteral - [44..56)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTagHelperAttribute - [56..82)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [56..57)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [57..62)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [63..64)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [64..81)::17
+                        MarkupDynamicAttributeValue - [64..77)::13 - [@DateTime.Now]
+                            GenericBlock - [64..77)::13
+                                CSharpCodeBlock - [64..77)::13
+                                    CSharpImplicitExpression - [64..77)::13
+                                        CSharpTransition - [64..65)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [65..77)::12
+                                            CSharpCodeBlock - [65..77)::12
+                                                CSharpExpressionLiteral - [65..77)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [77..79)::2 - [ +]
+                            MarkupTextLiteral - [77..78)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [78..79)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [79..81)::2 - [ 1]
+                            MarkupTextLiteral - [79..80)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [80..81)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [81..82)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [82..96)::14 - bound-string - Minimized - Bound - [  bound-string]
+                    MarkupTextLiteral - [82..84)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [84..96)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [97..101)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.tspans.txt
new file mode 100644
index 0000000000..2c2b6d9444
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [101] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.diag.txt
new file mode 100644
index 0000000000..7c6942351c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt
new file mode 100644
index 0000000000..a2981d26cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..28)::28 - [<input bound-required-int />]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..28)::28 - [<input bound-required-int />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMiscAttributeContent - [25..26)::1
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.tspans.txt
new file mode 100644
index 0000000000..61fc991231
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.diag.txt
new file mode 100644
index 0000000000..522de8be51
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt
new file mode 100644
index 0000000000..3fcce47716
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..17)::17 - [<p bound-int></p>]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..13)::13 - [<p bound-int>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [13..17)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.tspans.txt
new file mode 100644
index 0000000000..3e5ab2dd80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [17] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.diag.txt
new file mode 100644
index 0000000000..087db6b299
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'int-dictionary' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Collections.Generic.IDictionary<System.String, System.Int32>' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt
new file mode 100644
index 0000000000..40a3abd8ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..23)::23 - [<input int-dictionary/>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..23)::23 - [<input int-dictionary/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..21)::15 - int-dictionary - Minimized - Bound - [ int-dictionary]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..21)::14 - [int-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-dictionary];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.tspans.txt
new file mode 100644
index 0000000000..9e2dbbf7ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.diag.txt
new file mode 100644
index 0000000000..2d79facfa7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.diag.txt
@@ -0,0 +1 @@
+(1,8): Error RZ2008: Attribute 'string-dictionary' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Collections.Generic.IDictionary<System.String, System.String>' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt
new file mode 100644
index 0000000000..b4727002f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..27)::27 - [<input string-dictionary />]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..27)::27 - [<input string-dictionary />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..24)::18 - string-dictionary - Minimized - Bound - [ string-dictionary]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..24)::17 - [string-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-dictionary];
+                MarkupMiscAttributeContent - [24..25)::1
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.tspans.txt
new file mode 100644
index 0000000000..a3749faee2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [27] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.diag.txt
new file mode 100644
index 0000000000..0b5a932381
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.diag.txt
@@ -0,0 +1,2 @@
+(1,8): Error RZ2008: Attribute 'int-prefix-' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,8): Error RZ1029: The tag helper attribute 'int-prefix-' in element 'input' is missing a key. The syntax is '<input int-prefix-{ key }="value">'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt
new file mode 100644
index 0000000000..b0f4f09641
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..21)::21 - [<input int-prefix- />]
+    MarkupBlock - [0..21)::21
+        MarkupTagHelperElement - [0..21)::21 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..21)::21 - [<input int-prefix- />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..18)::12 - int-prefix- - Minimized - Bound - [ int-prefix-]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..18)::11 - [int-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-];
+                MarkupMiscAttributeContent - [18..19)::1
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.tspans.txt
new file mode 100644
index 0000000000..d140288679
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [21] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.diag.txt
new file mode 100644
index 0000000000..6b9780fc87
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.diag.txt
@@ -0,0 +1,2 @@
+(1,8): Error RZ2008: Attribute 'string-prefix-' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,8): Error RZ1029: The tag helper attribute 'string-prefix-' in element 'input' is missing a key. The syntax is '<input string-prefix-{ key }="value">'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt
new file mode 100644
index 0000000000..d352a5b08f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt
@@ -0,0 +1,13 @@
+RazorDocument - [0..23)::23 - [<input string-prefix-/>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..23)::23 - [<input string-prefix-/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..21)::15 - string-prefix- - Minimized - Bound - [ string-prefix-]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..21)::14 - [string-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.tspans.txt
new file mode 100644
index 0000000000..9e2dbbf7ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.diag.txt
new file mode 100644
index 0000000000..b90634a515
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'input'.
+(1,2): Error RZ1034: Found a malformed 'input' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt
new file mode 100644
index 0000000000..b3980dc81a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..23)::23 - [<input unbound-required]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..23)::23 - [<input unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.tspans.txt
new file mode 100644
index 0000000000..c0685318c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.diag.txt
new file mode 100644
index 0000000000..3b6c11fc6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'input'.
+(1,2): Error RZ1034: Found a malformed 'input' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,8): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt
new file mode 100644
index 0000000000..3a1bb42157
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..28)::28 - [<input bound-required-string]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..28)::28 - [<input bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..28)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.tspans.txt
new file mode 100644
index 0000000000..918bc21db0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - InputTagHelper1 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.diag.txt
new file mode 100644
index 0000000000..cb730a6dc9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'input'.
+(1,2): Error RZ1034: Found a malformed 'input' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,8): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt
new file mode 100644
index 0000000000..bb81e143f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..25)::25 - [<input bound-required-int]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - input[StartTagAndEndTag] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..25)::25 - [<input bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.tspans.txt
new file mode 100644
index 0000000000..27bc016b3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.diag.txt
new file mode 100644
index 0000000000..19ac9103b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.diag.txt
@@ -0,0 +1,4 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'input'.
+(1,2): Error RZ1034: Found a malformed 'input' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,8): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,44): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt
new file mode 100644
index 0000000000..edceae1dac
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..64)::64 - [<input bound-required-int unbound-required bound-required-string]
+    MarkupBlock - [0..64)::64
+        MarkupTagHelperElement - [0..64)::64 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..64)::64 - [<input bound-required-int unbound-required bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMinimizedTagHelperAttribute - [25..42)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..42)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [42..64)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [43..64)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.tspans.txt
new file mode 100644
index 0000000000..49cb0fe449
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [64] ) - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.diag.txt
new file mode 100644
index 0000000000..a1ee83bf6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,4): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt
new file mode 100644
index 0000000000..0b7dc80111
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..15)::15 - [<p bound-string]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..15)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.tspans.txt
new file mode 100644
index 0000000000..6a366b1c64
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [15] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.diag.txt
new file mode 100644
index 0000000000..fb20eab90d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,4): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt
new file mode 100644
index 0000000000..151355fd87
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..12)::12 - [<p bound-int]
+    MarkupBlock - [0..12)::12
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..12)::12 - [<p bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.tspans.txt
new file mode 100644
index 0000000000..5cd52523a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [12] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.diag.txt
new file mode 100644
index 0000000000..4d7e0d9d26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.diag.txt
@@ -0,0 +1,4 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,4): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,14): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt
new file mode 100644
index 0000000000..4cc7c8aebb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..25)::25 - [<p bound-int bound-string]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p bound-int bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [12..25)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..25)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.tspans.txt
new file mode 100644
index 0000000000..e3e08d013c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.diag.txt
new file mode 100644
index 0000000000..c64141f180
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.diag.txt
@@ -0,0 +1,8 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'input'.
+(1,2): Error RZ1034: Found a malformed 'input' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,8): Error RZ2008: Attribute 'bound-required-int' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,44): Error RZ2008: Attribute 'bound-required-string' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
+(1,66): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,66): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,68): Error RZ2008: Attribute 'bound-int' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.Int32' cannot be empty or contain only whitespace.
+(1,78): Error RZ2008: Attribute 'bound-string' on tag helper element 'p' requires a value. Tag helper bound attributes of type 'System.String' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt
new file mode 100644
index 0000000000..bf383c8b52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..89)::89 - [<input bound-required-int unbound-required bound-required-string<p bound-int bound-string]
+    MarkupBlock - [0..89)::89
+        MarkupTagHelperElement - [0..64)::64 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..64)::64 - [<input bound-required-int unbound-required bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMinimizedTagHelperAttribute - [25..42)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..42)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [42..64)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [43..64)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [64..89)::25 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [64..89)::25 - [<p bound-int bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMinimizedTagHelperAttribute - [66..76)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [67..76)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [76..89)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [76..77)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [77..89)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.tspans.txt
new file mode 100644
index 0000000000..846bc42dc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [64] ) - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+TagHelper span at (64:0,64 [25] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt
new file mode 100644
index 0000000000..116e8180ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..37)::37 - [<input boundbool boundbooldict-key />]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - input[SelfClosing] - InputTagHelper
+            MarkupTagHelperStartTag - [0..37)::37 - [<input boundbool boundbooldict-key />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..16)::10 - boundbool - Minimized - Bound - [ boundbool]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..16)::9 - [boundbool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbool];
+                MarkupMinimizedTagHelperAttribute - [16..34)::18 - boundbooldict-key - Minimized - Bound - [ boundbooldict-key]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..34)::17 - [boundbooldict-key] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbooldict-key];
+                MarkupMiscAttributeContent - [34..35)::1
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.tspans.txt
new file mode 100644
index 0000000000..c28ec2a704
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [37] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.cspans.txt
new file mode 100644
index 0000000000..4f69cb3f10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt
new file mode 100644
index 0000000000..c691ddf36b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..7)::7 - [<th: />]
+    MarkupBlock - [0..7)::7
+        MarkupElement - [0..7)::7
+            MarkupStartTag - [0..7)::7 - [<th: />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:];
+                MarkupMiscAttributeContent - [4..5)::1
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.cspans.txt
new file mode 100644
index 0000000000..df2aec385d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [47] )
+Markup span at (21:0,21 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [47] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
new file mode 100644
index 0000000000..6b9e1a1f12
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..47)::47 - [<th:myth class="btn">words and spaces</th:myth>]
+    MarkupBlock - [0..47)::47
+        MarkupTagHelperElement - [0..47)::47 - th:myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..21)::21 - [<th:myth class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth];
+                MarkupTagHelperAttribute - [8..20)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..19)::3
+                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [21..37)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [37..47)::10 - [</th:myth>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:myth];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.tspans.txt
new file mode 100644
index 0000000000..a1b89d4d45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [47] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.cspans.txt
new file mode 100644
index 0000000000..b824ad55f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Expression block at (17:0,17 [13] )
+Code span at (18:0,18 [12] ) (Accepts:AnyExceptNewline) - Parent: Expression block at (17:0,17 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
new file mode 100644
index 0000000000..4fe58fe635
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..34)::34 - [<th:myth2 bound="@DateTime.Now" />]
+    MarkupBlock - [0..34)::34
+        MarkupTagHelperElement - [0..34)::34 - th:myth2[SelfClosing] - mythTagHelper2
+            MarkupTagHelperStartTag - [0..34)::34 - [<th:myth2 bound="@DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth2];
+                MarkupTagHelperAttribute - [9..31)::22 - bound - DoubleQuotes - Bound - [ bound="@DateTime.Now"]
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..15)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [17..30)::13
+                        MarkupBlock - [17..30)::13
+                            CSharpCodeBlock - [17..30)::13
+                                CSharpImplicitExpression - [17..30)::13
+                                    CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [18..30)::12
+                                        CSharpCodeBlock - [18..30)::12
+                                            CSharpExpressionLiteral - [18..30)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [31..32)::1
+                    MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.tspans.txt
new file mode 100644
index 0000000000..33b53566f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [34] ) - mythTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.cspans.txt
new file mode 100644
index 0000000000..022d559da1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [16] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (21:0,21 [6] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt
new file mode 100644
index 0000000000..e031e1ac8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..27)::27 - [<th:>words and spaces</th:>]
+    MarkupBlock - [0..27)::27
+        MarkupElement - [0..27)::27
+            MarkupStartTag - [0..5)::5 - [<th:>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..21)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupEndTag - [21..27)::6 - [</th:>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt
new file mode 100644
index 0000000000..0eb6fd801a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..11)::11 - [<th:myth />]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - th:myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..11)::11 - [<th:myth />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth];
+                MarkupMiscAttributeContent - [8..9)::1
+                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.tspans.txt
new file mode 100644
index 0000000000..20562b3e6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [11] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt
new file mode 100644
index 0000000000..9f01e240d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..19)::19 - [<th:myth></th:myth>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - th:myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..9)::9 - [<th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [9..19)::10 - [</th:myth>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:myth];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.tspans.txt
new file mode 100644
index 0000000000..6dfea7ba4f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [19] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.cspans.txt
new file mode 100644
index 0000000000..e868b55b3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (9:0,9 [10] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [10] )
+Markup span at (19:0,19 [11] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt
new file mode 100644
index 0000000000..bc5c8beed8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..40)::40 - [<th:myth><th:my2th></th:my2th></th:myth>]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - th:myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..9)::9 - [<th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth];
+                CloseAngle;[>];
+            MarkupElement - [9..30)::21
+                MarkupStartTag - [9..19)::10 - [<th:my2th>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:my2th];
+                    CloseAngle;[>];
+                MarkupEndTag - [19..30)::11 - [</th:my2th>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:my2th];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [30..40)::10 - [</th:myth>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:myth];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.tspans.txt
new file mode 100644
index 0000000000..9a9154c80d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [40] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.cspans.txt
new file mode 100644
index 0000000000..d9e9a04dc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [12] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [12] )
+Markup span at (2:0,2 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt
new file mode 100644
index 0000000000..d5bc42d5e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..12)::12 - [<!th:myth />]
+    MarkupBlock - [0..12)::12
+        MarkupElement - [0..12)::12
+            MarkupStartTag - [0..12)::12 - [<!th:myth />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[th:myth];
+                MarkupMiscAttributeContent - [9..10)::1
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.cspans.txt
new file mode 100644
index 0000000000..59cd08d3b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [10] )
+Markup span at (2:0,2 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [10] )
+Markup span at (10:0,10 [2] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [11] )
+MetaCode span at (12:0,12 [1] ) (Accepts:None) - Parent: Tag block at (10:0,10 [11] )
+Markup span at (13:0,13 [8] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt
new file mode 100644
index 0000000000..6f048dd34c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..21)::21 - [<!th:myth></!th:myth>]
+    MarkupBlock - [0..21)::21
+        MarkupElement - [0..21)::21
+            MarkupStartTag - [0..10)::10 - [<!th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[th:myth];
+                CloseAngle;[>];
+            MarkupEndTag - [10..21)::11 - [</!th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[th:myth];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.cspans.txt
new file mode 100644
index 0000000000..3bc0454091
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.cspans.txt
@@ -0,0 +1 @@
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [23] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
new file mode 100644
index 0000000000..53c0c892c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..23)::23 - [<th:myth class="btn" />]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - th:myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..23)::23 - [<th:myth class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth];
+                MarkupTagHelperAttribute - [8..20)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..19)::3
+                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [20..21)::1
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.tspans.txt
new file mode 100644
index 0000000000..17b38715bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [23] ) - mythTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.cspans.txt
new file mode 100644
index 0000000000..7898d0d47e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.cspans.txt
@@ -0,0 +1 @@
+Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
new file mode 100644
index 0000000000..33ddd48291
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..24)::24 - [<th:myth2 class="btn" />]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - th:myth2[SelfClosing] - mythTagHelper2
+            MarkupTagHelperStartTag - [0..24)::24 - [<th:myth2 class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:myth2];
+                MarkupTagHelperAttribute - [9..21)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..15)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [17..20)::3
+                        MarkupLiteralAttributeValue - [17..20)::3 - [btn]
+                            MarkupTextLiteral - [17..20)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [21..22)::1
+                    MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.tspans.txt
new file mode 100644
index 0000000000..fba983601b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [24] ) - mythTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.cspans.txt
new file mode 100644
index 0000000000..72a6a954d3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [3] )
+Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (10:0,10 [4] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [4] )
+Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Comment block at (14:0,14 [8] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Comment block at (14:0,14 [8] )
+Comment span at (16:0,16 [4] ) (Accepts:Any) - Parent: Comment block at (14:0,14 [8] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Comment block at (14:0,14 [8] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Comment block at (14:0,14 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt
new file mode 100644
index 0000000000..25ecc40085
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..26)::26 - [<p><b>asdf</b>@*asdf*@</p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..14)::11
+                MarkupStartTag - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[b];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [6..10)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[asdf];
+                MarkupEndTag - [10..14)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[b];
+                    CloseAngle;[>];
+            RazorComment - [14..22)::8
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[asdf];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupTagHelperEndTag - [22..26)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.tspans.txt
new file mode 100644
index 0000000000..41a4059c21
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [26] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt
new file mode 100644
index 0000000000..841cefa3f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [3] )
+Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [37] )
+Markup span at (10:0,10 [4] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [4] )
+Markup span at (14:0,14 [4] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [19] )
+Markup span at (18:0,18 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (14:0,14 [19] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [6] )
+Code span at (25:0,25 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [6] )
+Markup span at (30:0,30 [3] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt
new file mode 100644
index 0000000000..c66d2e2fd3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..37)::37 - [<p><b>asdf</b><!--Hello @World--></p>]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..14)::11
+                MarkupStartTag - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[b];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [6..10)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[asdf];
+                MarkupEndTag - [10..14)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupCommentBlock - [14..33)::19
+                MarkupTextLiteral - [14..18)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [18..24)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [24..30)::6
+                    CSharpImplicitExpression - [24..30)::6
+                        CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [25..30)::5
+                            CSharpCodeBlock - [25..30)::5
+                                CSharpExpressionLiteral - [25..30)::5 - [World] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[World];
+                MarkupTextLiteral - [30..33)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [33..37)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.tspans.txt
new file mode 100644
index 0000000000..01ef9b42cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [37] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt
new file mode 100644
index 0000000000..df900ecba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [3] )
+Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
+Markup span at (10:0,10 [4] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [4] )
+Markup span at (14:0,14 [4] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [18] )
+Markup span at (18:0,18 [11] ) (Accepts:Whitespace) - Parent: HtmlComment block at (14:0,14 [18] )
+Markup span at (29:0,29 [3] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt
new file mode 100644
index 0000000000..d619bdc2a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..36)::36 - [<p><b>asdf</b><!--Hello World--></p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..14)::11
+                MarkupStartTag - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[b];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [6..10)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[asdf];
+                MarkupEndTag - [10..14)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupCommentBlock - [14..32)::18
+                MarkupTextLiteral - [14..18)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [18..29)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                MarkupTextLiteral - [29..32)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [32..36)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.tspans.txt
new file mode 100644
index 0000000000..af2c446e1f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [36] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.cspans.txt
new file mode 100644
index 0000000000..e473d0582c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [22] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (20:0,20 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.diag.txt
new file mode 100644
index 0000000000..6f41e61f18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "!text" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
new file mode 100644
index 0000000000..36f03692c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..22)::22 - [@{<!text class="btn">}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupElement - [2..22)::20
+                                MarkupStartTag - [2..21)::19 - [<!text class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [22..22)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.cspans.txt
new file mode 100644
index 0000000000..a20ec606c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (20:0,20 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (21:0,21 [2] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [8] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Tag block at (21:0,21 [8] )
+Markup span at (24:0,24 [5] ) (Accepts:None) - Parent: Tag block at (21:0,21 [8] )
+Code span at (29:0,29 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
new file mode 100644
index 0000000000..891c5297d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..30)::30 - [@{<!text class="btn"></!text>}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..29)::27
+                        MarkupBlock - [2..29)::27
+                            MarkupElement - [2..29)::27
+                                MarkupStartTag - [2..21)::19 - [<!text class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [21..29)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [29..29)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.cspans.txt
new file mode 100644
index 0000000000..f4c2992c67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (20:0,20 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (21:0,21 [17] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [44] )
+Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Tag block at (38:0,38 [8] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Tag block at (38:0,38 [8] )
+Markup span at (41:0,41 [5] ) (Accepts:None) - Parent: Tag block at (38:0,38 [8] )
+Code span at (46:0,46 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [47] )
+MetaCode span at (46:0,46 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+Markup span at (47:0,47 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
new file mode 100644
index 0000000000..128de38bf2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..47)::47 - [@{<!text class="btn">words with spaces</!text>}]
+    MarkupBlock - [0..47)::47
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..47)::47
+            CSharpStatement - [0..47)::47
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..47)::46
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..46)::44
+                        MarkupBlock - [2..46)::44
+                            MarkupElement - [2..46)::44
+                                MarkupStartTag - [2..21)::19 - [<!text class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [21..38)::17 - [words with spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[words];
+                                    Whitespace;[ ];
+                                    Text;[with];
+                                    Whitespace;[ ];
+                                    Text;[spaces];
+                                MarkupEndTag - [38..46)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [46..46)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.cspans.txt
new file mode 100644
index 0000000000..3c3a95f854
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.cspans.txt
@@ -0,0 +1,19 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [36] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [36] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [36] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [18] )
+Markup span at (16:0,16 [4] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [18] )
+Markup span at (20:0,20 [5] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [18] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [18] )
+Markup span at (26:0,26 [8] ) (Accepts:Any) - Parent: Markup block at (26:0,26 [11] )
+Markup span at (34:0,34 [3] ) (Accepts:Any) - Parent: Markup block at (26:0,26 [11] )
+Markup span at (37:0,37 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [36] )
+Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Tag block at (38:0,38 [8] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Tag block at (38:0,38 [8] )
+Markup span at (41:0,41 [5] ) (Accepts:None) - Parent: Tag block at (38:0,38 [8] )
+Code span at (46:0,46 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [47] )
+MetaCode span at (46:0,46 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [47] )
+Markup span at (47:0,47 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [47] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
new file mode 100644
index 0000000000..2cc6fc5b3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
@@ -0,0 +1,60 @@
+RazorDocument - [0..47)::47 - [@{<!text class='btn1 btn2' class2=btn></!text>}]
+    MarkupBlock - [0..47)::47
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..47)::47
+            CSharpStatement - [0..47)::47
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..47)::46
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..46)::44
+                        MarkupBlock - [2..46)::44
+                            MarkupElement - [2..46)::44
+                                MarkupStartTag - [2..38)::36 - [<!text class='btn1 btn2' class2=btn>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..26)::18 - [ class='btn1 btn2']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [16..25)::9
+                                            MarkupLiteralAttributeValue - [16..20)::4 - [btn1]
+                                                MarkupTextLiteral - [16..20)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn1];
+                                            MarkupLiteralAttributeValue - [20..25)::5 - [ btn2]
+                                                MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [21..25)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn2];
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [26..37)::11 - [ class2=btn]
+                                        MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [27..33)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class2];
+                                        Equals;[=];
+                                        GenericBlock - [34..37)::3
+                                            MarkupLiteralAttributeValue - [34..37)::3 - [btn]
+                                                MarkupTextLiteral - [34..37)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [38..46)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [46..46)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt
new file mode 100644
index 0000000000..8543c4eeb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt
@@ -0,0 +1,20 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [50] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [39] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [39] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [39] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
+Markup span at (16:0,16 [4] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (20:0,20 [14] )
+Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
+Markup span at (34:0,34 [5] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
+Markup span at (39:0,39 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
+Markup span at (40:0,40 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [39] )
+Markup span at (41:0,41 [2] ) (Accepts:Any) - Parent: Tag block at (41:0,41 [8] )
+MetaCode span at (43:0,43 [1] ) (Accepts:None) - Parent: Tag block at (41:0,41 [8] )
+Markup span at (44:0,44 [5] ) (Accepts:None) - Parent: Tag block at (41:0,41 [8] )
+Code span at (49:0,49 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [50] )
+MetaCode span at (49:0,49 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [50] )
+Markup span at (50:0,50 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [50] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
new file mode 100644
index 0000000000..68864e97d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
@@ -0,0 +1,64 @@
+RazorDocument - [0..50)::50 - [@{<!text class='btn1 @DateTime.Now btn2'></!text>}]
+    MarkupBlock - [0..50)::50
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..50)::50
+            CSharpStatement - [0..50)::50
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..50)::49
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..49)::47
+                        MarkupBlock - [2..49)::47
+                            MarkupElement - [2..49)::47
+                                MarkupStartTag - [2..41)::39 - [<!text class='btn1 @DateTime.Now btn2'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..40)::32 - [ class='btn1 @DateTime.Now btn2']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [16..39)::23
+                                            MarkupLiteralAttributeValue - [16..20)::4 - [btn1]
+                                                MarkupTextLiteral - [16..20)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn1];
+                                            MarkupDynamicAttributeValue - [20..34)::14 - [ @DateTime.Now]
+                                                MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                GenericBlock - [21..34)::13
+                                                    CSharpCodeBlock - [21..34)::13
+                                                        CSharpImplicitExpression - [21..34)::13
+                                                            CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [22..34)::12
+                                                                CSharpCodeBlock - [22..34)::12
+                                                                    CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [34..39)::5 - [ btn2]
+                                                MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [35..39)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn2];
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [41..49)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [49..49)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [50..50)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.cspans.txt
new file mode 100644
index 0000000000..4c82a55e34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [10] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (9:0,9 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.diag.txt
new file mode 100644
index 0000000000..6f41e61f18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "!text" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt
new file mode 100644
index 0000000000..adc9746a55
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..10)::10 - [@{<!text>}]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupElement - [2..10)::8
+                                MarkupStartTag - [2..9)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [9..10)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [10..10)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.cspans.txt
new file mode 100644
index 0000000000..d849d367fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [8] )
+MetaCode span at (4:0,4 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [8] )
+Markup span at (5:0,5 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [8] )
+Code span at (10:0,10 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.diag.txt
new file mode 100644
index 0000000000..5bcfe7b2f4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1026: Encountered end tag "!text" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt
new file mode 100644
index 0000000000..fe12c3634d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..11)::11 - [@{</!text>}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupElement - [2..10)::8
+                                MarkupEndTag - [2..10)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.cspans.txt
new file mode 100644
index 0000000000..8c4834386d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (9:0,9 [2] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [8] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Tag block at (9:0,9 [8] )
+Markup span at (12:0,12 [5] ) (Accepts:None) - Parent: Tag block at (9:0,9 [8] )
+Code span at (17:0,17 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
+MetaCode span at (17:0,17 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+Markup span at (18:0,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt
new file mode 100644
index 0000000000..58e11b84c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..18)::18 - [@{<!text></!text>}]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpStatement - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..18)::17
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..17)::15
+                        MarkupBlock - [2..17)::15
+                            MarkupElement - [2..17)::15
+                                MarkupStartTag - [2..9)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [9..17)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.cspans.txt
new file mode 100644
index 0000000000..8e4cc26c88
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (9:0,9 [16] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [31] )
+Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [8] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Tag block at (25:0,25 [8] )
+Markup span at (28:0,28 [5] ) (Accepts:None) - Parent: Tag block at (25:0,25 [8] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt
new file mode 100644
index 0000000000..b9443879a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..34)::34 - [@{<!text>words and spaces</!text>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..9)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [9..25)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[words];
+                                    Whitespace;[ ];
+                                    Text;[and];
+                                    Whitespace;[ ];
+                                    Text;[spaces];
+                                MarkupEndTag - [25..33)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.cspans.txt
new file mode 100644
index 0000000000..bceaf09553
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (9:0,9 [7] ) (Accepts:None) - Parent: Tag block at (9:0,9 [7] )
+Code span at (16:0,16 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.diag.txt
new file mode 100644
index 0000000000..9e700e22b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1025: The "!text" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,12): Error RZ1034: Found a malformed 'text' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt
new file mode 100644
index 0000000000..89bf9b2706
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..17)::17 - [@{<!text></text>}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupElement - [2..16)::14
+                                MarkupStartTag - [2..9)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupElement - [9..16)::7
+                                    MarkupEndTag - [9..16)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [16..16)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.cspans.txt
new file mode 100644
index 0000000000..35c9da1c43
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [8] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Tag block at (8:0,8 [8] )
+Markup span at (11:0,11 [5] ) (Accepts:None) - Parent: Tag block at (8:0,8 [8] )
+Code span at (16:0,16 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.diag.txt
new file mode 100644
index 0000000000..5b84341f8d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ1025: The "text" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt
new file mode 100644
index 0000000000..ae7f265b93
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..17)::17 - [@{<text></!text>}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupElement - [2..16)::14
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupElement - [8..16)::8
+                                    MarkupEndTag - [8..16)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Bang;[!];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [16..16)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.cspans.txt
new file mode 100644
index 0000000000..e4ec1ec100
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (22:0,22 [2] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [8] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Tag block at (22:0,22 [8] )
+Markup span at (25:0,25 [5] ) (Accepts:None) - Parent: Tag block at (22:0,22 [8] )
+Code span at (30:0,30 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt
new file mode 100644
index 0000000000..d6a9f5f320
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..31)::31 - [@{<!text><text></text></!text>}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupElement - [2..30)::28
+                                MarkupStartTag - [2..9)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTagHelperElement - [9..22)::13 - text[StartTagAndEndTag] - texttaghelper
+                                    MarkupTagHelperStartTag - [9..15)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                    MarkupTagHelperEndTag - [15..22)::7 - [</text>]
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [22..30)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.tspans.txt
new file mode 100644
index 0000000000..9f67aaf5a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (9:0,9 [13] ) - texttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.cspans.txt
new file mode 100644
index 0000000000..c21ff53c60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [7] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Tag block at (8:0,8 [7] )
+Markup span at (10:0,10 [5] ) (Accepts:None) - Parent: Tag block at (8:0,8 [7] )
+Markup span at (15:0,15 [2] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
+MetaCode span at (17:0,17 [1] ) (Accepts:None) - Parent: Tag block at (15:0,15 [8] )
+Markup span at (18:0,18 [5] ) (Accepts:None) - Parent: Tag block at (15:0,15 [8] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.diag.txt
new file mode 100644
index 0000000000..27a90c4a3e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "text" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt
new file mode 100644
index 0000000000..8841774978
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..24)::24 - [@{<text><!text></!text>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..24)::22
+                            MarkupElement - [2..24)::22
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupElement - [8..23)::15
+                                    MarkupStartTag - [8..15)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                    MarkupEndTag - [15..23)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Bang;[!];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [23..24)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [24..24)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.cspans.txt
new file mode 100644
index 0000000000..b311f8f748
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (9:0,9 [2] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [8] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Tag block at (9:0,9 [8] )
+Markup span at (12:0,12 [5] ) (Accepts:None) - Parent: Tag block at (9:0,9 [8] )
+Markup span at (17:0,17 [7] ) (Accepts:None) - Parent: Tag block at (17:0,17 [7] )
+Code span at (24:0,24 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.diag.txt
new file mode 100644
index 0000000000..d82bb8c1a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.diag.txt
@@ -0,0 +1,2 @@
+(1,20): Error RZ1026: Encountered end tag "text" with no matching start tag.  Are your start/end tags properly balanced?
+(1,20): Error RZ1034: Found a malformed 'text' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt
new file mode 100644
index 0000000000..dd66d9333a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..25)::25 - [@{<!text></!text></text>}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..17)::15
+                            MarkupElement - [2..17)::15
+                                MarkupStartTag - [2..9)::7 - [<!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [9..17)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        MarkupBlock - [17..24)::7
+                            MarkupElement - [17..24)::7
+                                MarkupEndTag - [17..24)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.cspans.txt
new file mode 100644
index 0000000000..68230d2f76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt
new file mode 100644
index 0000000000..61c1a03dc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt
@@ -0,0 +1,5 @@
+RazorDocument - [0..2)::2 - [<!]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..2)::2 - [<!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.cspans.txt
new file mode 100644
index 0000000000..108c031df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt
new file mode 100644
index 0000000000..10d9274ac3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt
@@ -0,0 +1,8 @@
+RazorDocument - [0..3)::3 - [<!p]
+    MarkupBlock - [0..3)::3
+        MarkupElement - [0..3)::3
+            MarkupStartTag - [0..3)::3 - [<!p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.cspans.txt
new file mode 100644
index 0000000000..9bdd5fbf73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (2:0,2 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt
new file mode 100644
index 0000000000..c9bce33c62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..5)::5 - [<!p /]
+    MarkupBlock - [0..5)::5
+        MarkupElement - [0..5)::5
+            MarkupStartTag - [0..5)::5 - [<!p /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupMiscAttributeContent - [3..4)::1
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                MarkupMiscAttributeContent - [4..5)::1
+                    MarkupTextLiteral - [4..5)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        ForwardSlash;[/];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.cspans.txt
new file mode 100644
index 0000000000..30af8ce509
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [10] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [10] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [10] )
+Markup span at (3:0,3 [7] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
new file mode 100644
index 0000000000..ee66c8047f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..10)::10 - [<!p class=]
+    MarkupBlock - [0..10)::10
+        MarkupElement - [0..10)::10
+            MarkupStartTag - [0..10)::10 - [<!p class=] - Gen<None> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..10)::7 - [ class=]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.cspans.txt
new file mode 100644
index 0000000000..9c594e7ceb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [14] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [11] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
new file mode 100644
index 0000000000..d8fc2bc069
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..14)::14 - [<!p class="btn]
+    MarkupBlock - [0..14)::14
+        MarkupElement - [0..14)::14
+            MarkupStartTag - [0..14)::14 - [<!p class="btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..14)::11 - [ class="btn]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [11..14)::3
+                        MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                            MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.cspans.txt
new file mode 100644
index 0000000000..dd532d116d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [15] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [15] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
new file mode 100644
index 0000000000..560ec950e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..15)::15 - [<!p class="btn"]
+    MarkupBlock - [0..15)::15
+        MarkupElement - [0..15)::15
+            MarkupStartTag - [0..15)::15 - [<!p class="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [11..14)::3
+                        MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                            MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.cspans.txt
new file mode 100644
index 0000000000..524195f446
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [17] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (15:0,15 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
new file mode 100644
index 0000000000..4aae4d9300
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..17)::17 - [<!p class="btn" /]
+    MarkupBlock - [0..17)::17
+        MarkupElement - [0..17)::17
+            MarkupStartTag - [0..17)::17 - [<!p class="btn" /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [11..14)::3
+                        MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                            MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [15..16)::1
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                MarkupMiscAttributeContent - [16..17)::1
+                    MarkupTextLiteral - [16..17)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        ForwardSlash;[/];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.cspans.txt
new file mode 100644
index 0000000000..e2f572686f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [5] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [3] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [3] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.diag.txt
new file mode 100644
index 0000000000..5e05d58d34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt
new file mode 100644
index 0000000000..22f2b09439
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..5)::5 - [@{<!}]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..5)::3
+                        MarkupBlock - [2..5)::3
+                            MarkupElement - [2..5)::3
+                                MarkupStartTag - [2..5)::3 - [<!}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [5..5)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.cspans.txt
new file mode 100644
index 0000000000..269e709b18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [6] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [6] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.diag.txt
new file mode 100644
index 0000000000..7fcf4c636a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt
new file mode 100644
index 0000000000..3e5244b17f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..6)::6 - [@{<!p}]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpStatement - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..6)::5
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..6)::4
+                        MarkupBlock - [2..6)::4
+                            MarkupElement - [2..6)::4
+                                MarkupStartTag - [2..6)::4 - [<!p}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [6..6)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.cspans.txt
new file mode 100644
index 0000000000..3686f93385
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [8] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [6] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (4:0,4 [3] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (7:0,7 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.diag.txt
new file mode 100644
index 0000000000..7f76f09dfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt
new file mode 100644
index 0000000000..c3079ddde3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..8)::8 - [@{<!p /}]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpStatement - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..8)::7
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..8)::6
+                        MarkupBlock - [2..8)::6
+                            MarkupElement - [2..8)::6
+                                MarkupStartTag - [2..8)::6 - [<!p /}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupMiscAttributeContent - [5..6)::1
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    MarkupMiscAttributeContent - [6..7)::1
+                                        MarkupTextLiteral - [6..7)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            ForwardSlash;[/];
+                                    MarkupMinimizedAttributeBlock - [7..8)::1 - [}]
+                                        MarkupTextLiteral - [7..8)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [8..8)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.cspans.txt
new file mode 100644
index 0000000000..ae931de581
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [13] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [13] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [11] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [11] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [11] )
+Markup span at (5:0,5 [7] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [8] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.diag.txt
new file mode 100644
index 0000000000..7f76f09dfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
new file mode 100644
index 0000000000..a4553c78cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..13)::13 - [@{<!p class=}]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpStatement - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..13)::12
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..13)::11
+                        MarkupBlock - [2..13)::11
+                            MarkupElement - [2..13)::11
+                                MarkupStartTag - [2..13)::11 - [<!p class=}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..13)::8 - [ class=}]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        GenericBlock - [12..13)::1
+                                            MarkupLiteralAttributeValue - [12..13)::1 - [}]
+                                                MarkupTextLiteral - [12..13)::1 - [}] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [13..13)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.cspans.txt
new file mode 100644
index 0000000000..497c2da8bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [17] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [15] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [15] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [15] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.diag.txt
new file mode 100644
index 0000000000..7f76f09dfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
new file mode 100644
index 0000000000..4eb9d06416
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..17)::17 - [@{<!p class="btn}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..17)::15
+                        MarkupBlock - [2..17)::15
+                            MarkupElement - [2..17)::15
+                                MarkupStartTag - [2..17)::15 - [<!p class="btn}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..17)::12 - [ class="btn}]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..17)::4
+                                            MarkupLiteralAttributeValue - [13..17)::4 - [btn}]
+                                                MarkupTextLiteral - [13..17)::4 - [btn}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.cspans.txt
new file mode 100644
index 0000000000..7280874c3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [17] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [17] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [17] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [14] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [14] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Markup block at (16:0,16 [2] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (16:0,16 [2] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.diag.txt
new file mode 100644
index 0000000000..7f76f09dfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
new file mode 100644
index 0000000000..0c7a00828d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..19)::19 - [@{<!p class="btn@@}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..19)::17 - [<!p class="btn@@}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..19)::14 - [ class="btn@@}]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..19)::6
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                                MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                            MarkupBlock - [16..18)::2
+                                                MarkupTextLiteral - [16..17)::1 - [@] - Gen<LitAttr:@(16:0,16)> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                            MarkupLiteralAttributeValue - [18..19)::1 - [}]
+                                                MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [19..19)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.cspans.txt
new file mode 100644
index 0000000000..f1e91016d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [18] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.diag.txt
new file mode 100644
index 0000000000..7f76f09dfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
new file mode 100644
index 0000000000..c2ce0b5aa3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..18)::18 - [@{<!p class="btn"}]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpStatement - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..18)::17
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupElement - [2..18)::16
+                                MarkupStartTag - [2..18)::16 - [<!p class="btn"}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                                MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMinimizedAttributeBlock - [17..18)::1 - [}]
+                                        MarkupTextLiteral - [17..18)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [18..18)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.cspans.txt
new file mode 100644
index 0000000000..a5183e69ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (17:0,17 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (19:0,19 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.diag.txt
new file mode 100644
index 0000000000..7f76f09dfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!p" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
new file mode 100644
index 0000000000..a2cbc80690
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..20)::20 - [@{<!p class="btn" /}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..20)::18 - [<!p class="btn" /}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                                MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMiscAttributeContent - [17..18)::1
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    MarkupMiscAttributeContent - [18..19)::1
+                                        MarkupTextLiteral - [18..19)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            ForwardSlash;[/];
+                                    MarkupMinimizedAttributeBlock - [19..20)::1 - [}]
+                                        MarkupTextLiteral - [19..20)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [20..20)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.cspans.txt
new file mode 100644
index 0000000000..f4f4680be7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
+Markup span at (4:0,4 [5] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.diag.txt
new file mode 100644
index 0000000000..c9edfe9426
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!text}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt
new file mode 100644
index 0000000000..35c2ab7638
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..9)::9 - [@{<!text}]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpStatement - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..9)::8
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        MarkupBlock - [2..9)::7
+                            MarkupElement - [2..9)::7
+                                MarkupStartTag - [2..9)::7 - [<!text}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [9..9)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.cspans.txt
new file mode 100644
index 0000000000..18195965b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [9] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [9] )
+Markup span at (4:0,4 [6] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [9] )
+Markup span at (10:0,10 [1] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.diag.txt
new file mode 100644
index 0000000000..2edb2cd77e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!text" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt
new file mode 100644
index 0000000000..39f47161bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..11)::11 - [@{<!text /}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..11)::9
+                            MarkupElement - [2..11)::9
+                                MarkupStartTag - [2..11)::9 - [<!text /}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupMiscAttributeContent - [8..9)::1
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    MarkupMiscAttributeContent - [9..10)::1
+                                        MarkupTextLiteral - [9..10)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            ForwardSlash;[/];
+                                    MarkupMinimizedAttributeBlock - [10..11)::1 - [}]
+                                        MarkupTextLiteral - [10..11)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.cspans.txt
new file mode 100644
index 0000000000..0e8da83799
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [14] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [14] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [14] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [8] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.diag.txt
new file mode 100644
index 0000000000..2edb2cd77e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!text" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
new file mode 100644
index 0000000000..dca3d187b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..16)::16 - [@{<!text class=}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupElement - [2..16)::14
+                                MarkupStartTag - [2..16)::14 - [<!text class=}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..16)::8 - [ class=}]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        GenericBlock - [15..16)::1
+                                            MarkupLiteralAttributeValue - [15..16)::1 - [}]
+                                                MarkupTextLiteral - [15..16)::1 - [}] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.cspans.txt
new file mode 100644
index 0000000000..c8e364dcaf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [20] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [18] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (16:0,16 [4] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.diag.txt
new file mode 100644
index 0000000000..2edb2cd77e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!text" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
new file mode 100644
index 0000000000..9b3b552c08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..20)::20 - [@{<!text class="btn}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupElement - [2..20)::18
+                                MarkupStartTag - [2..20)::18 - [<!text class="btn}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..20)::12 - [ class="btn}]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [16..20)::4
+                                            MarkupLiteralAttributeValue - [16..20)::4 - [btn}]
+                                                MarkupTextLiteral - [16..20)::4 - [btn}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [20..20)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.cspans.txt
new file mode 100644
index 0000000000..e0c99a858b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [19] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (20:0,20 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.diag.txt
new file mode 100644
index 0000000000..2edb2cd77e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!text" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
new file mode 100644
index 0000000000..d09a1c8d3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..21)::21 - [@{<!text class="btn"}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupElement - [2..21)::19
+                                MarkupStartTag - [2..21)::19 - [<!text class="btn"}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMinimizedAttributeBlock - [20..21)::1 - [}]
+                                        MarkupTextLiteral - [20..21)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [21..21)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.cspans.txt
new file mode 100644
index 0000000000..20509e6706
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [23] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [21] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [21] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [21] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [12] )
+Markup span at (20:0,20 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [21] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.diag.txt
new file mode 100644
index 0000000000..2edb2cd77e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "!text" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
new file mode 100644
index 0000000000..6ac32b74b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..23)::23 - [@{<!text class="btn" /}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupElement - [2..23)::21
+                                MarkupStartTag - [2..23)::21 - [<!text class="btn" /}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[text];
+                                    MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    MarkupMiscAttributeContent - [20..21)::1
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                    MarkupMiscAttributeContent - [21..22)::1
+                                        MarkupTextLiteral - [21..22)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            ForwardSlash;[/];
+                                    MarkupMinimizedAttributeBlock - [22..23)::1 - [}]
+                                        MarkupTextLiteral - [22..23)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[}];
+                                    CloseAngle;[<Missing>];
+                    RazorMetaCode - [23..23)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.cspans.txt
new file mode 100644
index 0000000000..e4c8d0d243
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.diag.txt
new file mode 100644
index 0000000000..d208c6a957
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "!p" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
new file mode 100644
index 0000000000..8b490e6137
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..19)::19 - [@{<!p class="btn">}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupElement - [2..19)::17
+                                MarkupStartTag - [2..18)::16 - [<!p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                                MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [19..19)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.cspans.txt
new file mode 100644
index 0000000000..cf364bf3b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [5] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Tag block at (18:0,18 [5] )
+Markup span at (21:0,21 [2] ) (Accepts:None) - Parent: Tag block at (18:0,18 [5] )
+Code span at (23:0,23 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [24] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
new file mode 100644
index 0000000000..02a7efb7f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..24)::24 - [@{<!p class="btn"></!p>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupElement - [2..23)::21
+                                MarkupStartTag - [2..18)::16 - [<!p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                                MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [18..23)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.cspans.txt
new file mode 100644
index 0000000000..60b9da83b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.cspans.txt
@@ -0,0 +1,17 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [12] )
+Markup span at (17:0,17 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [16] )
+Markup span at (18:0,18 [17] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [38] )
+Markup span at (35:0,35 [2] ) (Accepts:Any) - Parent: Tag block at (35:0,35 [5] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Tag block at (35:0,35 [5] )
+Markup span at (38:0,38 [2] ) (Accepts:None) - Parent: Tag block at (35:0,35 [5] )
+Code span at (40:0,40 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
new file mode 100644
index 0000000000..7e359df115
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..41)::41 - [@{<!p class="btn">words with spaces</!p>}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupElement - [2..40)::38
+                                MarkupStartTag - [2..18)::16 - [<!p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                        GenericBlock - [13..16)::3
+                                            MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                                MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            DoubleQuote;["];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [18..35)::17 - [words with spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[words];
+                                    Whitespace;[ ];
+                                    Text;[with];
+                                    Whitespace;[ ];
+                                    Text;[spaces];
+                                MarkupEndTag - [35..40)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.cspans.txt
new file mode 100644
index 0000000000..f3fec76103
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.cspans.txt
@@ -0,0 +1,19 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [33] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [33] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [33] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [18] )
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [18] )
+Markup span at (17:0,17 [5] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [18] )
+Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [18] )
+Markup span at (23:0,23 [8] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [11] )
+Markup span at (31:0,31 [3] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [11] )
+Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [33] )
+Markup span at (35:0,35 [2] ) (Accepts:Any) - Parent: Tag block at (35:0,35 [5] )
+MetaCode span at (37:0,37 [1] ) (Accepts:None) - Parent: Tag block at (35:0,35 [5] )
+Markup span at (38:0,38 [2] ) (Accepts:None) - Parent: Tag block at (35:0,35 [5] )
+Code span at (40:0,40 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [41] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [41] )
+Markup span at (41:0,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
new file mode 100644
index 0000000000..fdb98b1be0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
@@ -0,0 +1,60 @@
+RazorDocument - [0..41)::41 - [@{<!p class='btn1 btn2' class2=btn></!p>}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupElement - [2..40)::38
+                                MarkupStartTag - [2..35)::33 - [<!p class='btn1 btn2' class2=btn>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..23)::18 - [ class='btn1 btn2']
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..22)::9
+                                            MarkupLiteralAttributeValue - [13..17)::4 - [btn1]
+                                                MarkupTextLiteral - [13..17)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn1];
+                                            MarkupLiteralAttributeValue - [17..22)::5 - [ btn2]
+                                                MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [18..22)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn2];
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupAttributeBlock - [23..34)::11 - [ class2=btn]
+                                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [24..30)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class2];
+                                        Equals;[=];
+                                        GenericBlock - [31..34)::3
+                                            MarkupLiteralAttributeValue - [31..34)::3 - [btn]
+                                                MarkupTextLiteral - [31..34)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [35..40)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt
new file mode 100644
index 0000000000..a539659df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt
@@ -0,0 +1,20 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [36] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [36] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [36] )
+Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
+Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [13] )
+Code span at (19:0,19 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [13] )
+Markup span at (31:0,31 [5] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
+Markup span at (36:0,36 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
+Markup span at (37:0,37 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [36] )
+Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Tag block at (38:0,38 [5] )
+MetaCode span at (40:0,40 [1] ) (Accepts:None) - Parent: Tag block at (38:0,38 [5] )
+Markup span at (41:0,41 [2] ) (Accepts:None) - Parent: Tag block at (38:0,38 [5] )
+Code span at (43:0,43 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [44] )
+MetaCode span at (43:0,43 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [44] )
+Markup span at (44:0,44 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
new file mode 100644
index 0000000000..4dd069d28c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
@@ -0,0 +1,64 @@
+RazorDocument - [0..44)::44 - [@{<!p class='btn1 @DateTime.Now btn2'></!p>}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            CSharpStatement - [0..44)::44
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..44)::43
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..43)::41
+                        MarkupBlock - [2..43)::41
+                            MarkupElement - [2..43)::41
+                                MarkupStartTag - [2..38)::36 - [<!p class='btn1 @DateTime.Now btn2'>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    MarkupAttributeBlock - [5..37)::32 - [ class='btn1 @DateTime.Now btn2']
+                                        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        GenericBlock - [13..36)::23
+                                            MarkupLiteralAttributeValue - [13..17)::4 - [btn1]
+                                                MarkupTextLiteral - [13..17)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn1];
+                                            MarkupDynamicAttributeValue - [17..31)::14 - [ @DateTime.Now]
+                                                MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                GenericBlock - [18..31)::13
+                                                    CSharpCodeBlock - [18..31)::13
+                                                        CSharpImplicitExpression - [18..31)::13
+                                                            CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [19..31)::12
+                                                                CSharpCodeBlock - [19..31)::12
+                                                                    CSharpExpressionLiteral - [19..31)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [31..36)::5 - [ btn2]
+                                                MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [32..36)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn2];
+                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [38..43)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [43..43)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.cspans.txt
new file mode 100644
index 0000000000..17ced29a2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [7] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (6:0,6 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.diag.txt
new file mode 100644
index 0000000000..d208c6a957
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "!p" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt
new file mode 100644
index 0000000000..e3f97b1ee0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..7)::7 - [@{<!p>}]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpStatement - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..7)::6
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..7)::5
+                        MarkupBlock - [2..7)::5
+                            MarkupElement - [2..7)::5
+                                MarkupStartTag - [2..6)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [6..7)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [7..7)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.cspans.txt
new file mode 100644
index 0000000000..7e92920d2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (10:0,10 [2] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [5] )
+MetaCode span at (12:0,12 [1] ) (Accepts:None) - Parent: Tag block at (10:0,10 [5] )
+Markup span at (13:0,13 [2] ) (Accepts:None) - Parent: Tag block at (10:0,10 [5] )
+Markup span at (15:0,15 [9] ) (Accepts:None) - Parent: Tag block at (15:0,15 [9] )
+Code span at (24:0,24 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.diag.txt
new file mode 100644
index 0000000000..fba405aa8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.diag.txt
@@ -0,0 +1,4 @@
+(1,4): Error RZ1025: The "strong" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,4): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,18): Error RZ1026: Encountered end tag "strong" with no matching start tag.  Are your start/end tags properly balanced?
+(1,18): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt
new file mode 100644
index 0000000000..ac9f4cfbdb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..25)::25 - [@{<strong></!p></strong>}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..15)::13
+                            MarkupTagHelperElement - [2..15)::13 - strong[StartTagAndEndTag] - strongtaghelper
+                                MarkupTagHelperStartTag - [2..10)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                                MarkupElement - [10..15)::5
+                                    MarkupEndTag - [10..15)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Bang;[!];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        MarkupBlock - [15..24)::9
+                            MarkupElement - [15..24)::9
+                                MarkupEndTag - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.tspans.txt
new file mode 100644
index 0000000000..b716a36b7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [13] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.cspans.txt
new file mode 100644
index 0000000000..a52c9fcb71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [4] )
+MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Tag block at (19:0,19 [4] )
+Markup span at (21:0,21 [2] ) (Accepts:None) - Parent: Tag block at (19:0,19 [4] )
+Markup span at (23:0,23 [2] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [5] )
+MetaCode span at (25:0,25 [1] ) (Accepts:None) - Parent: Tag block at (23:0,23 [5] )
+Markup span at (26:0,26 [2] ) (Accepts:None) - Parent: Tag block at (23:0,23 [5] )
+Code span at (28:0,28 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [29] )
+MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt
new file mode 100644
index 0000000000..c671926a25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..29)::29 - [@{<strong></strong><!p></!p>}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..19)::17
+                            MarkupTagHelperElement - [2..19)::17 - strong[StartTagAndEndTag] - strongtaghelper
+                                MarkupTagHelperStartTag - [2..10)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                                MarkupTagHelperEndTag - [10..19)::9 - [</strong>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                        MarkupBlock - [19..28)::9
+                            MarkupElement - [19..28)::9
+                                MarkupStartTag - [19..23)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [23..28)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.tspans.txt
new file mode 100644
index 0000000000..92502ed333
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [17] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.cspans.txt
new file mode 100644
index 0000000000..54f4240fc7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (13:0,13 [2] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [10] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Tag block at (13:0,13 [10] )
+Markup span at (16:0,16 [7] ) (Accepts:None) - Parent: Tag block at (13:0,13 [10] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [4] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Tag block at (23:0,23 [4] )
+Markup span at (25:0,25 [2] ) (Accepts:None) - Parent: Tag block at (23:0,23 [4] )
+Markup span at (27:0,27 [9] ) (Accepts:None) - Parent: Tag block at (27:0,27 [9] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [5] )
+MetaCode span at (38:0,38 [1] ) (Accepts:None) - Parent: Tag block at (36:0,36 [5] )
+Markup span at (39:0,39 [2] ) (Accepts:None) - Parent: Tag block at (36:0,36 [5] )
+Code span at (41:0,41 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
+MetaCode span at (41:0,41 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
+Markup span at (42:0,42 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.diag.txt
new file mode 100644
index 0000000000..689fbedb41
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.diag.txt
@@ -0,0 +1,6 @@
+(1,4): Error RZ1025: The "p" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,4): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,7): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,25): Error RZ1025: The "!p" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,30): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,39): Error RZ1026: Encountered end tag "!p" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt
new file mode 100644
index 0000000000..f727a4a496
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt
@@ -0,0 +1,57 @@
+RazorDocument - [0..42)::42 - [@{<p><strong></!strong><!p></strong></!p>}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..23)::21
+                            MarkupTagHelperElement - [2..23)::21 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTagHelperElement - [5..23)::18 - strong[StartTagAndEndTag] - strongtaghelper
+                                    MarkupTagHelperStartTag - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                                    MarkupElement - [13..23)::10
+                                        MarkupEndTag - [13..23)::10 - [</!strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Bang;[!];
+                                            Text;[strong];
+                                            CloseAngle;[>];
+                        MarkupBlock - [23..36)::13
+                            MarkupElement - [23..36)::13
+                                MarkupStartTag - [23..27)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [27..36)::9
+                                    MarkupEndTag - [27..36)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                        MarkupBlock - [36..41)::5
+                            MarkupElement - [36..41)::5
+                                MarkupEndTag - [36..41)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.tspans.txt
new file mode 100644
index 0000000000..0357429d3d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (2:0,2 [21] ) - ptaghelper
+TagHelper span at (5:0,5 [18] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.cspans.txt
new file mode 100644
index 0000000000..5841f5eb8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [8] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [5] )
+MetaCode span at (4:0,4 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Markup span at (5:0,5 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
+Code span at (7:0,7 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [8] )
+MetaCode span at (7:0,7 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [8] )
+Markup span at (8:0,8 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.diag.txt
new file mode 100644
index 0000000000..16ad86d5a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1026: Encountered end tag "!p" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt
new file mode 100644
index 0000000000..5115d2c63a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..8)::8 - [@{</!p>}]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpStatement - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..8)::7
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..7)::5
+                        MarkupBlock - [2..7)::5
+                            MarkupElement - [2..7)::5
+                                MarkupEndTag - [2..7)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [7..7)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.cspans.txt
new file mode 100644
index 0000000000..87859bb82c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [5] )
+MetaCode span at (8:0,8 [1] ) (Accepts:None) - Parent: Tag block at (6:0,6 [5] )
+Markup span at (9:0,9 [2] ) (Accepts:None) - Parent: Tag block at (6:0,6 [5] )
+Code span at (11:0,11 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [12] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [12] )
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt
new file mode 100644
index 0000000000..cf036dfe25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..12)::12 - [@{<!p></!p>}]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpStatement - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..12)::11
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..11)::9
+                            MarkupElement - [2..11)::9
+                                MarkupStartTag - [2..6)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [6..11)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.cspans.txt
new file mode 100644
index 0000000000..d09cd360c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (6:0,6 [16] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [25] )
+Markup span at (22:0,22 [2] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [5] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Tag block at (22:0,22 [5] )
+Markup span at (25:0,25 [2] ) (Accepts:None) - Parent: Tag block at (22:0,22 [5] )
+Code span at (27:0,27 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
+MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt
new file mode 100644
index 0000000000..f7e5009478
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..28)::28 - [@{<!p>words and spaces</!p>}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpStatement - [0..28)::28
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..28)::27
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..27)::25
+                        MarkupBlock - [2..27)::25
+                            MarkupElement - [2..27)::25
+                                MarkupStartTag - [2..6)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [6..22)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[words];
+                                    Whitespace;[ ];
+                                    Text;[and];
+                                    Whitespace;[ ];
+                                    Text;[spaces];
+                                MarkupEndTag - [22..27)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [27..27)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.cspans.txt
new file mode 100644
index 0000000000..bde99188a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (6:0,6 [4] ) (Accepts:None) - Parent: Tag block at (6:0,6 [4] )
+Code span at (10:0,10 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.diag.txt
new file mode 100644
index 0000000000..4e9f9e044a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1025: The "!p" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,9): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt
new file mode 100644
index 0000000000..423490c99b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..11)::11 - [@{<!p></p>}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupElement - [2..10)::8
+                                MarkupStartTag - [2..6)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [6..10)::4
+                                    MarkupEndTag - [6..10)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.cspans.txt
new file mode 100644
index 0000000000..894887f157
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (5:0,5 [2] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [5] )
+MetaCode span at (7:0,7 [1] ) (Accepts:None) - Parent: Tag block at (5:0,5 [5] )
+Markup span at (8:0,8 [2] ) (Accepts:None) - Parent: Tag block at (5:0,5 [5] )
+Code span at (10:0,10 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.diag.txt
new file mode 100644
index 0000000000..9245068ef6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.diag.txt
@@ -0,0 +1,2 @@
+(1,4): Error RZ1025: The "p" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,4): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt
new file mode 100644
index 0000000000..ac047895b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..11)::11 - [@{<p></!p>}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupTagHelperElement - [2..10)::8 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [5..10)::5
+                                    MarkupEndTag - [5..10)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Bang;[!];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.tspans.txt
new file mode 100644
index 0000000000..c896ab151f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [8] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.cspans.txt
new file mode 100644
index 0000000000..6e8f3d69b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (5:0,5 [1] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [4] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Tag block at (5:0,5 [4] )
+Markup span at (7:0,7 [2] ) (Accepts:None) - Parent: Tag block at (5:0,5 [4] )
+Markup span at (9:0,9 [2] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [5] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Tag block at (9:0,9 [5] )
+Markup span at (12:0,12 [2] ) (Accepts:None) - Parent: Tag block at (9:0,9 [5] )
+Code span at (18:0,18 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [19] )
+MetaCode span at (18:0,18 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt
new file mode 100644
index 0000000000..2320bcb8db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..19)::19 - [@{<p><!p></!p></p>}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupTagHelperElement - [2..18)::16 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [5..14)::9
+                                    MarkupStartTag - [5..9)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupEndTag - [9..14)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Bang;[!];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [14..18)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..18)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.tspans.txt
new file mode 100644
index 0000000000..9ac9825e33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [16] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.cspans.txt
new file mode 100644
index 0000000000..761b9a637b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [15] )
+Markup span at (5:0,5 [1] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [4] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Tag block at (5:0,5 [4] )
+Markup span at (7:0,7 [2] ) (Accepts:None) - Parent: Tag block at (5:0,5 [4] )
+Markup span at (9:0,9 [2] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [5] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Tag block at (9:0,9 [5] )
+Markup span at (12:0,12 [2] ) (Accepts:None) - Parent: Tag block at (9:0,9 [5] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.diag.txt
new file mode 100644
index 0000000000..0ef166cfd0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.diag.txt
@@ -0,0 +1,3 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "p" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,4): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt
new file mode 100644
index 0000000000..ae602bff26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..15)::15 - [@{<p><!p></!p>}]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpStatement - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..15)::14
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..15)::13
+                            MarkupTagHelperElement - [2..15)::13 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupElement - [5..14)::9
+                                    MarkupStartTag - [5..9)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Bang;[!];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupEndTag - [9..14)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Bang;[!];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [14..15)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [15..15)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.tspans.txt
new file mode 100644
index 0000000000..c2ab529dc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (2:0,2 [13] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.cspans.txt
new file mode 100644
index 0000000000..3c85657a46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [4] )
+MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:None) - Parent: Tag block at (2:0,2 [4] )
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [5] )
+MetaCode span at (8:0,8 [1] ) (Accepts:None) - Parent: Tag block at (6:0,6 [5] )
+Markup span at (9:0,9 [2] ) (Accepts:None) - Parent: Tag block at (6:0,6 [5] )
+Markup span at (11:0,11 [4] ) (Accepts:None) - Parent: Tag block at (11:0,11 [4] )
+Code span at (15:0,15 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] )
+MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.diag.txt
new file mode 100644
index 0000000000..76963aab62
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.diag.txt
@@ -0,0 +1,2 @@
+(1,14): Error RZ1026: Encountered end tag "p" with no matching start tag.  Are your start/end tags properly balanced?
+(1,14): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt
new file mode 100644
index 0000000000..c6f74a99c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..16)::16 - [@{<!p></!p></p>}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..11)::9
+                            MarkupElement - [2..11)::9
+                                MarkupStartTag - [2..6)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupEndTag - [6..11)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Bang;[!];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        MarkupBlock - [11..15)::4
+                            MarkupElement - [11..15)::4
+                                MarkupEndTag - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [15..15)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.cspans.txt
new file mode 100644
index 0000000000..db11a2b53b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
new file mode 100644
index 0000000000..caed17da76
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..16)::16 - [<!p class="btn">]
+    MarkupBlock - [0..16)::16
+        MarkupElement - [0..16)::16
+            MarkupStartTag - [0..16)::16 - [<!p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [11..14)::3
+                        MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                            MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.cspans.txt
new file mode 100644
index 0000000000..f63db8ffa0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (16:0,16 [2] ) (Accepts:Any) - Parent: Tag block at (16:0,16 [5] )
+MetaCode span at (18:0,18 [1] ) (Accepts:None) - Parent: Tag block at (16:0,16 [5] )
+Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Tag block at (16:0,16 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
new file mode 100644
index 0000000000..77641949ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..21)::21 - [<!p class="btn"></!p>]
+    MarkupBlock - [0..21)::21
+        MarkupElement - [0..21)::21
+            MarkupStartTag - [0..16)::16 - [<!p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [11..14)::3
+                        MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                            MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupEndTag - [16..21)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.cspans.txt
new file mode 100644
index 0000000000..581430192a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [12] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
+Markup span at (16:0,16 [16] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [37] )
+Markup span at (32:0,32 [2] ) (Accepts:Any) - Parent: Tag block at (32:0,32 [5] )
+MetaCode span at (34:0,34 [1] ) (Accepts:None) - Parent: Tag block at (32:0,32 [5] )
+Markup span at (35:0,35 [2] ) (Accepts:Any) - Parent: Tag block at (32:0,32 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
new file mode 100644
index 0000000000..6128928f8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..37)::37 - [<!p class="btn">words and spaces</!p>]
+    MarkupBlock - [0..37)::37
+        MarkupElement - [0..37)::37
+            MarkupStartTag - [0..16)::16 - [<!p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [11..14)::3
+                        MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                            MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [16..32)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupEndTag - [32..37)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.cspans.txt
new file mode 100644
index 0000000000..019a92647a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [18] )
+Markup span at (11:0,11 [4] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [18] )
+Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [18] )
+Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [18] )
+Markup span at (21:0,21 [8] ) (Accepts:Any) - Parent: Markup block at (21:0,21 [11] )
+Markup span at (29:0,29 [3] ) (Accepts:Any) - Parent: Markup block at (21:0,21 [11] )
+Markup span at (32:0,32 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (33:0,33 [2] ) (Accepts:Any) - Parent: Tag block at (33:0,33 [5] )
+MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Tag block at (33:0,33 [5] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (33:0,33 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
new file mode 100644
index 0000000000..07f0f249d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..38)::38 - [<!p class='btn1 btn2' class2=btn></!p>]
+    MarkupBlock - [0..38)::38
+        MarkupElement - [0..38)::38
+            MarkupStartTag - [0..33)::33 - [<!p class='btn1 btn2' class2=btn>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..21)::18 - [ class='btn1 btn2']
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [11..20)::9
+                        MarkupLiteralAttributeValue - [11..15)::4 - [btn1]
+                            MarkupTextLiteral - [11..15)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn1];
+                        MarkupLiteralAttributeValue - [15..20)::5 - [ btn2]
+                            MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [16..20)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn2];
+                    MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [21..32)::11 - [ class2=btn]
+                    MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [22..28)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class2];
+                    Equals;[=];
+                    GenericBlock - [29..32)::3
+                        MarkupLiteralAttributeValue - [29..32)::3 - [btn]
+                            MarkupTextLiteral - [29..32)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                CloseAngle;[>];
+            MarkupEndTag - [33..38)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt
new file mode 100644
index 0000000000..08163d8b85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [36] )
+Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
+Markup span at (11:0,11 [4] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (15:0,15 [14] )
+Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [13] )
+Code span at (17:0,17 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [13] )
+Markup span at (29:0,29 [5] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
+Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
+Markup span at (35:0,35 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [5] )
+MetaCode span at (38:0,38 [1] ) (Accepts:None) - Parent: Tag block at (36:0,36 [5] )
+Markup span at (39:0,39 [2] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
new file mode 100644
index 0000000000..5a44b0a363
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
@@ -0,0 +1,47 @@
+RazorDocument - [0..41)::41 - [<!p class='btn1 @DateTime.Now btn2'></!p>]
+    MarkupBlock - [0..41)::41
+        MarkupElement - [0..41)::41
+            MarkupStartTag - [0..36)::36 - [<!p class='btn1 @DateTime.Now btn2'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                MarkupAttributeBlock - [3..35)::32 - [ class='btn1 @DateTime.Now btn2']
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [11..34)::23
+                        MarkupLiteralAttributeValue - [11..15)::4 - [btn1]
+                            MarkupTextLiteral - [11..15)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn1];
+                        MarkupDynamicAttributeValue - [15..29)::14 - [ @DateTime.Now]
+                            MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            GenericBlock - [16..29)::13
+                                CSharpCodeBlock - [16..29)::13
+                                    CSharpImplicitExpression - [16..29)::13
+                                        CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [17..29)::12
+                                            CSharpCodeBlock - [17..29)::12
+                                                CSharpExpressionLiteral - [17..29)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [29..34)::5 - [ btn2]
+                            MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [30..34)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn2];
+                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupEndTag - [36..41)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.cspans.txt
new file mode 100644
index 0000000000..a5d0c98f58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt
new file mode 100644
index 0000000000..f1200dcf89
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt
@@ -0,0 +1,8 @@
+RazorDocument - [0..4)::4 - [<!p>]
+    MarkupBlock - [0..4)::4
+        MarkupElement - [0..4)::4
+            MarkupStartTag - [0..4)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.cspans.txt
new file mode 100644
index 0000000000..7c1acf2f61
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [5] )
+MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Tag block at (8:0,8 [5] )
+Markup span at (11:0,11 [2] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt
new file mode 100644
index 0000000000..fcea222085
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..22)::22 - [<strong></!p></strong>]
+    MarkupBlock - [0..22)::22
+        MarkupTagHelperElement - [0..22)::22 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupElement - [8..13)::5
+                MarkupEndTag - [8..13)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [13..22)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.tspans.txt
new file mode 100644
index 0000000000..ba6ff19ad3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [22] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.cspans.txt
new file mode 100644
index 0000000000..6ca585931a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Tag block at (17:0,17 [4] )
+MetaCode span at (18:0,18 [1] ) (Accepts:None) - Parent: Tag block at (17:0,17 [4] )
+Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Tag block at (17:0,17 [4] )
+Markup span at (21:0,21 [2] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [5] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Tag block at (21:0,21 [5] )
+Markup span at (24:0,24 [2] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt
new file mode 100644
index 0000000000..ceb36af825
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..26)::26 - [<strong></strong><!p></!p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..17)::17 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [8..17)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupElement - [17..26)::9
+            MarkupStartTag - [17..21)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [21..26)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.tspans.txt
new file mode 100644
index 0000000000..e9b9c4563b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [17] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.cspans.txt
new file mode 100644
index 0000000000..09633f5839
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (11:0,11 [2] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [10] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Tag block at (11:0,11 [10] )
+Markup span at (14:0,14 [7] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [10] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [4] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Tag block at (21:0,21 [4] )
+Markup span at (23:0,23 [2] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [4] )
+Markup span at (34:0,34 [2] ) (Accepts:Any) - Parent: Tag block at (34:0,34 [5] )
+MetaCode span at (36:0,36 [1] ) (Accepts:None) - Parent: Tag block at (34:0,34 [5] )
+Markup span at (37:0,37 [2] ) (Accepts:Any) - Parent: Tag block at (34:0,34 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.diag.txt
new file mode 100644
index 0000000000..d177eb6df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt
new file mode 100644
index 0000000000..3d7d4984bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..39)::39 - [<p><strong></!strong><!p></strong></!p>]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..34)::31 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [11..21)::10
+                    MarkupEndTag - [11..21)::10 - [</!strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Bang;[!];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupElement - [21..25)::4
+                    MarkupStartTag - [21..25)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Bang;[!];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [25..34)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupElement - [34..39)::5
+                MarkupEndTag - [34..39)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.tspans.txt
new file mode 100644
index 0000000000..cfe3d3fa3b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [39] ) - ptaghelper
+TagHelper span at (3:0,3 [31] ) - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.cspans.txt
new file mode 100644
index 0000000000..8fa95e872f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+MetaCode span at (2:0,2 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt
new file mode 100644
index 0000000000..708ea901d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt
@@ -0,0 +1,9 @@
+RazorDocument - [0..5)::5 - [</!p>]
+    MarkupBlock - [0..5)::5
+        MarkupElement - [0..5)::5
+            MarkupEndTag - [0..5)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.cspans.txt
new file mode 100644
index 0000000000..4c275ff050
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [5] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Tag block at (4:0,4 [5] )
+Markup span at (7:0,7 [2] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt
new file mode 100644
index 0000000000..fae760c817
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..9)::9 - [<!p></!p>]
+    MarkupBlock - [0..9)::9
+        MarkupElement - [0..9)::9
+            MarkupStartTag - [0..4)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [4..9)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.cspans.txt
new file mode 100644
index 0000000000..3997b127d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (4:0,4 [16] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Markup span at (20:0,20 [2] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [5] )
+MetaCode span at (22:0,22 [1] ) (Accepts:None) - Parent: Tag block at (20:0,20 [5] )
+Markup span at (23:0,23 [2] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt
new file mode 100644
index 0000000000..1f1d9262f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..25)::25 - [<!p>words and spaces</!p>]
+    MarkupBlock - [0..25)::25
+        MarkupElement - [0..25)::25
+            MarkupStartTag - [0..4)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [4..20)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupEndTag - [20..25)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.cspans.txt
new file mode 100644
index 0000000000..ccea3d9b24
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (4:0,4 [4] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.diag.txt
new file mode 100644
index 0000000000..b1d7d8700f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt
new file mode 100644
index 0000000000..cdd918aa0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..8)::8 - [<!p></p>]
+    MarkupBlock - [0..8)::8
+        MarkupElement - [0..8)::8
+            MarkupStartTag - [0..4)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [4..8)::4
+                MarkupEndTag - [4..8)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.cspans.txt
new file mode 100644
index 0000000000..d7c40f6239
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [5] )
+MetaCode span at (5:0,5 [1] ) (Accepts:None) - Parent: Tag block at (3:0,3 [5] )
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.diag.txt
new file mode 100644
index 0000000000..d177eb6df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt
new file mode 100644
index 0000000000..62b283ee73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..8)::8 - [<p></!p>]
+    MarkupBlock - [0..8)::8
+        MarkupTagHelperElement - [0..8)::8 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..8)::5
+                MarkupEndTag - [3..8)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.tspans.txt
new file mode 100644
index 0000000000..7b15d972a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [8] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.cspans.txt
new file mode 100644
index 0000000000..5f18fc72f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (3:0,3 [1] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
+MetaCode span at (4:0,4 [1] ) (Accepts:None) - Parent: Tag block at (3:0,3 [4] )
+Markup span at (5:0,5 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
+Markup span at (7:0,7 [2] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [5] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Tag block at (7:0,7 [5] )
+Markup span at (10:0,10 [2] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt
new file mode 100644
index 0000000000..c59a98b7cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..16)::16 - [<p><!p></!p></p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..12)::9
+                MarkupStartTag - [3..7)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupEndTag - [7..12)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [12..16)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.tspans.txt
new file mode 100644
index 0000000000..52dba16922
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [16] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.cspans.txt
new file mode 100644
index 0000000000..5f18fc72f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (3:0,3 [1] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
+MetaCode span at (4:0,4 [1] ) (Accepts:None) - Parent: Tag block at (3:0,3 [4] )
+Markup span at (5:0,5 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
+Markup span at (7:0,7 [2] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [5] )
+MetaCode span at (9:0,9 [1] ) (Accepts:None) - Parent: Tag block at (7:0,7 [5] )
+Markup span at (10:0,10 [2] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.diag.txt
new file mode 100644
index 0000000000..d177eb6df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt
new file mode 100644
index 0000000000..0222b2cb17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..12)::12 - [<p><!p></!p>]
+    MarkupBlock - [0..12)::12
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..12)::9
+                MarkupStartTag - [3..7)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupEndTag - [7..12)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Bang;[!];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.tspans.txt
new file mode 100644
index 0000000000..7cc635f45e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [12] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.cspans.txt
new file mode 100644
index 0000000000..bd0517f735
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (2:0,2 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [5] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Tag block at (4:0,4 [5] )
+Markup span at (7:0,7 [2] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [5] )
+Markup span at (9:0,9 [4] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.diag.txt
new file mode 100644
index 0000000000..08a69712ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.diag.txt
@@ -0,0 +1 @@
+(1,12): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt
new file mode 100644
index 0000000000..eca9695a25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..13)::13 - [<!p></!p></p>]
+    MarkupBlock - [0..13)::13
+        MarkupElement - [0..9)::9
+            MarkupStartTag - [0..4)::4 - [<!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [4..9)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Bang;[!];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupElement - [9..13)::4
+            MarkupEndTag - [9..13)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.cspans.txt
new file mode 100644
index 0000000000..6b69df9374
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [53] )
+Markup span at (9:1,4 [8] ) (Accepts:Any) - Parent: Tag block at (9:1,4 [8] )
+Markup span at (17:1,12 [21] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [53] )
+Markup span at (38:3,4 [9] ) (Accepts:Any) - Parent: Tag block at (38:3,4 [9] )
+Markup span at (47:3,13 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [53] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.diag.txt
new file mode 100644
index 0000000000..4c1f5923fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.diag.txt
@@ -0,0 +1 @@
+(2,6): Error RZ2010: The <strong> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'br' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt
new file mode 100644
index 0000000000..3a091ff8d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..53)::53 - [<p>LF    <strong>LF        HelloLF    </strong>LF</p>]
+    MarkupBlock - [0..53)::53
+        MarkupTagHelperElement - [0..53)::53 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [9..47)::38
+                MarkupStartTag - [9..17)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [17..38)::21 - [LF        HelloLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                    Text;[Hello];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                MarkupEndTag - [38..47)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [47..49)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagHelperEndTag - [49..53)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.tspans.txt
new file mode 100644
index 0000000000..05765431e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [53] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.cspans.txt
new file mode 100644
index 0000000000..a9c65f2e8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.cspans.txt
@@ -0,0 +1 @@
+Markup span at (11:0,11 [11] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt
new file mode 100644
index 0000000000..c28e528a9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..39)::39 - [<p><strong>Hello World</strong><br></p>]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - p[StartTagAndEndTag] - PTagHelper1 - PTagHelper2
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..31)::28 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                MarkupTagHelperEndTag - [22..31)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [31..35)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [31..35)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [35..39)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.tspans.txt
new file mode 100644
index 0000000000..5b5143529f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [39] ) - PTagHelper1 - PTagHelper2
+TagHelper span at (3:0,3 [28] ) - StrongTagHelper
+TagHelper span at (31:0,31 [4] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.cspans.txt
new file mode 100644
index 0000000000..a9c65f2e8f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.cspans.txt
@@ -0,0 +1 @@
+Markup span at (11:0,11 [11] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt
new file mode 100644
index 0000000000..c28e528a9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..39)::39 - [<p><strong>Hello World</strong><br></p>]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - p[StartTagAndEndTag] - PTagHelper1 - PTagHelper2
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..31)::28 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                MarkupTagHelperEndTag - [22..31)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [31..35)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [31..35)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [35..39)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.tspans.txt
new file mode 100644
index 0000000000..5b5143529f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [39] ) - PTagHelper1 - PTagHelper2
+TagHelper span at (3:0,3 [28] ) - StrongTagHelper
+TagHelper span at (31:0,31 [4] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt
new file mode 100644
index 0000000000..5a61ddfab0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt
@@ -0,0 +1,7 @@
+RazorDocument - [0..7)::7 - [<input>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.tspans.txt
new file mode 100644
index 0000000000..507d5a1ed9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.diag.txt
new file mode 100644
index 0000000000..6668a36e1c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.diag.txt
@@ -0,0 +1 @@
+(1,1): Error RZ2011: Tag helpers 'InputTagHelper1' and 'InputTagHelper2' targeting element 'input' must not expect different TagStructure values.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt
new file mode 100644
index 0000000000..0db5f5e70a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt
@@ -0,0 +1,7 @@
+RazorDocument - [0..7)::7 - [<input>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.tspans.txt
new file mode 100644
index 0000000000..aa95134310
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper1 - InputTagHelper2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.cspans.txt
new file mode 100644
index 0000000000..da5af92309
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.diag.txt
new file mode 100644
index 0000000000..2991a49bbc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.diag.txt
@@ -0,0 +1 @@
+(1,3): Error RZ1033: Found an end tag (</input>) for tag helper 'InputTagHelper' with tag structure that disallows an end tag ('WithoutEndTag').
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt
new file mode 100644
index 0000000000..51d05bcd79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt
@@ -0,0 +1,8 @@
+RazorDocument - [0..8)::8 - [</input>]
+    MarkupBlock - [0..8)::8
+        MarkupElement - [0..8)::8
+            MarkupEndTag - [0..8)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt
new file mode 100644
index 0000000000..cc2e136b18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [20] )
+Markup span at (9:0,9 [13] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [20] )
+Markup span at (22:0,22 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [20] )
+Markup span at (25:0,25 [6] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt
new file mode 100644
index 0000000000..892a5074bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..31)::31 - [<foo><!-- Hello World --></foo>]
+    MarkupBlock - [0..31)::31
+        MarkupElement - [0..31)::31
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupCommentBlock - [5..25)::20
+                MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [9..22)::13 - [ Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Whitespace;[ ];
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                    Whitespace;[ ];
+                MarkupTextLiteral - [22..25)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupEndTag - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt
new file mode 100644
index 0000000000..60e78976ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [13] )
+Markup span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [13] )
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [4] )
+Code span at (11:0,11 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [4] )
+Markup span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [13] )
+Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [13] )
+Markup span at (18:0,18 [6] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt
new file mode 100644
index 0000000000..1efdfee552
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..24)::24 - [<foo><!-- @foo --></foo>]
+    MarkupBlock - [0..24)::24
+        MarkupElement - [0..24)::24
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupCommentBlock - [5..18)::13
+                MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Whitespace;[ ];
+                CSharpCodeBlock - [10..14)::4
+                    CSharpImplicitExpression - [10..14)::4
+                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [11..14)::3
+                            CSharpCodeBlock - [11..14)::3
+                                CSharpExpressionLiteral - [11..14)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[foo];
+                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Whitespace;[ ];
+                MarkupTextLiteral - [15..18)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupEndTag - [18..24)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.cspans.txt
new file mode 100644
index 0000000000..c4ecccfbcc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [20] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Markup span at (25:0,25 [6] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt
new file mode 100644
index 0000000000..3d12db4002
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..31)::31 - [<foo><?xml Hello World ?></foo>]
+    MarkupBlock - [0..31)::31
+        MarkupElement - [0..31)::31
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..25)::20 - [<?xml Hello World ?>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                QuestionMark;[?];
+                Text;[xml];
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                QuestionMark;[?];
+                CloseAngle;[>];
+            MarkupEndTag - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt
new file mode 100644
index 0000000000..8abca4d638
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [4] )
+Code span at (12:0,12 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [4] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
+Markup span at (18:0,18 [6] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt
new file mode 100644
index 0000000000..ac72886d06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..24)::24 - [<foo><?xml @foo ?></foo>]
+    MarkupBlock - [0..24)::24
+        MarkupElement - [0..24)::24
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..11)::6 - [<?xml ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                QuestionMark;[?];
+                Text;[xml];
+                Whitespace;[ ];
+            CSharpCodeBlock - [11..15)::4
+                CSharpImplicitExpression - [11..15)::4
+                    CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [12..15)::3
+                        CSharpCodeBlock - [12..15)::3
+                            CSharpExpressionLiteral - [12..15)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[foo];
+            MarkupTextLiteral - [15..18)::3 - [ ?>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                QuestionMark;[?];
+                CloseAngle;[>];
+            MarkupEndTag - [18..24)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt
new file mode 100644
index 0000000000..a6fb41162b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
+Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (21:0,21 [6] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt
new file mode 100644
index 0000000000..6dd9386d40
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..27)::27 - [<foo><!DOCTYPE @foo ></foo>]
+    MarkupBlock - [0..27)::27
+        MarkupElement - [0..27)::27
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..15)::10 - [<!DOCTYPE ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[DOCTYPE];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..19)::4
+                CSharpImplicitExpression - [15..19)::4
+                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [16..19)::3
+                        CSharpCodeBlock - [16..19)::3
+                            CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[foo];
+            MarkupTextLiteral - [19..21)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupEndTag - [21..27)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.cspans.txt
new file mode 100644
index 0000000000..c59f0f1953
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [25] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Markup span at (30:0,30 [6] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt
new file mode 100644
index 0000000000..b255eda476
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..36)::36 - [<foo><!DOCTYPE hello="world" ></foo>]
+    MarkupBlock - [0..36)::36
+        MarkupElement - [0..36)::36
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..30)::25 - [<!DOCTYPE hello="world" >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                Text;[DOCTYPE];
+                Whitespace;[ ];
+                Text;[hello];
+                Equals;[=];
+                DoubleQuote;["];
+                Text;[world];
+                DoubleQuote;["];
+                Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupEndTag - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.cspans.txt
new file mode 100644
index 0000000000..c59f0f1953
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [25] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
+Markup span at (30:0,30 [6] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt
new file mode 100644
index 0000000000..1b43d94ac9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..36)::36 - [<foo><![CDATA[ Hello World ]]></foo>]
+    MarkupBlock - [0..36)::36
+        MarkupElement - [0..36)::36
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..30)::25 - [<![CDATA[ Hello World ]]>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                LeftBracket;[[];
+                Text;[CDATA];
+                LeftBracket;[[];
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                RightBracket;[]];
+                RightBracket;[]];
+                CloseAngle;[>];
+            MarkupEndTag - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt
new file mode 100644
index 0000000000..4024585ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
+Markup span at (19:0,19 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Markup span at (23:0,23 [6] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt
new file mode 100644
index 0000000000..e9c3a9037e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..29)::29 - [<foo><![CDATA[ @foo ]]></foo>]
+    MarkupBlock - [0..29)::29
+        MarkupElement - [0..29)::29
+            MarkupStartTag - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTextLiteral - [5..15)::10 - [<![CDATA[ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Bang;[!];
+                LeftBracket;[[];
+                Text;[CDATA];
+                LeftBracket;[[];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..19)::4
+                CSharpImplicitExpression - [15..19)::4
+                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [16..19)::3
+                        CSharpCodeBlock - [16..19)::3
+                            CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[foo];
+            MarkupTextLiteral - [19..23)::4 - [ ]]>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBracket;[]];
+                RightBracket;[]];
+                CloseAngle;[>];
+            MarkupEndTag - [23..29)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.cspans.txt
new file mode 100644
index 0000000000..45f2b8a0d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (6:0,6 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt
new file mode 100644
index 0000000000..543bc32b48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..24)::24 - [<text>Hello World</text>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - text[StartTagAndEndTag] - texttaghelper
+            MarkupTagHelperStartTag - [0..6)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                CloseAngle;[>];
+            MarkupTextLiteral - [6..17)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [17..24)::7 - [</text>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.tspans.txt
new file mode 100644
index 0000000000..0e0421beb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [24] ) - texttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.cspans.txt
new file mode 100644
index 0000000000..120838d1aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (8:0,8 [11] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [24] )
+Transition span at (19:0,19 [7] ) (Accepts:None) - Parent: Tag block at (19:0,19 [7] )
+Code span at (26:0,26 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt
new file mode 100644
index 0000000000..30549d1f5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..27)::27 - [@{<text>Hello World</text>}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..26)::24
+                            MarkupElement - [2..26)::24
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [8..19)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Hello];
+                                    Whitespace;[ ];
+                                    Text;[World];
+                                MarkupEndTag - [19..26)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.cspans.txt
new file mode 100644
index 0000000000..5422f86fe0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Transition span at (2:0,2 [6] ) (Accepts:None) - Parent: Tag block at (2:0,2 [6] )
+Markup span at (11:0,11 [11] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [18] )
+Transition span at (26:0,26 [7] ) (Accepts:None) - Parent: Tag block at (26:0,26 [7] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt
new file mode 100644
index 0000000000..275d4367c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..34)::34 - [@{<text><p>Hello World</p></text>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupElement - [2..33)::31
+                                MarkupStartTag - [2..8)::6 - MarkupTransition - [<text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                                MarkupTagHelperElement - [8..26)::18 - p[StartTagAndEndTag] - ptaghelper
+                                    MarkupTagHelperStartTag - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Hello];
+                                        Whitespace;[ ];
+                                        Text;[World];
+                                    MarkupTagHelperEndTag - [22..26)::4 - [</p>]
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupEndTag - [26..33)::7 - MarkupTransition - [</text>] - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.tspans.txt
new file mode 100644
index 0000000000..ccb04ff0a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (8:0,8 [18] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.cspans.txt
new file mode 100644
index 0000000000..ca3438cacd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (11:0,11 [11] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [24] )
+Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
+MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt
new file mode 100644
index 0000000000..55d1bc3bc9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..34)::34 - [@{<p><text>Hello World</text></p>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTagHelperElement - [5..29)::24 - text[StartTagAndEndTag] - texttaghelper
+                                    MarkupTagHelperStartTag - [5..11)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Hello];
+                                        Whitespace;[ ];
+                                        Text;[World];
+                                    MarkupTagHelperEndTag - [22..29)::7 - [</text>]
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [29..33)::4 - [</p>]
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.tspans.txt
new file mode 100644
index 0000000000..0e58e331ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (2:0,2 [31] ) - ptaghelper
+TagHelper span at (5:0,5 [24] ) - texttaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.cspans.txt
new file mode 100644
index 0000000000..49c8ba186f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [13] )
+Markup span at (7:0,7 [5] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [5] )
+Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [13] )
+Markup span at (13:0,13 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
+Markup span at (22:0,22 [9] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt
new file mode 100644
index 0000000000..e55e0ca85c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..31)::31 - [<script type><input /></script>]
+    MarkupBlock - [0..31)::31
+        MarkupElement - [0..31)::31
+            MarkupStartTag - [0..13)::13 - [<script type>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupMinimizedAttributeBlock - [7..12)::5 - [ type]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                CloseAngle;[>];
+            MarkupTextLiteral - [13..22)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupEndTag - [22..31)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.cspans.txt
new file mode 100644
index 0000000000..2c17954aab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (7:0,7 [8] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [18] )
+Markup span at (15:0,15 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [18] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [18] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (26:0,26 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Markup span at (35:0,35 [9] ) (Accepts:Any) - Parent: Tag block at (35:0,35 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
new file mode 100644
index 0000000000..bf424f1f0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..44)::44 - [<script types='text/html'><input /></script>]
+    MarkupBlock - [0..44)::44
+        MarkupElement - [0..44)::44
+            MarkupStartTag - [0..26)::26 - [<script types='text/html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..25)::18 - [ types='text/html']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [types] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[types];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [15..24)::9
+                        MarkupLiteralAttributeValue - [15..24)::9 - [text/html]
+                            MarkupTextLiteral - [15..24)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [26..35)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupEndTag - [35..44)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.cspans.txt
new file mode 100644
index 0000000000..955ace03ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (7:0,7 [7] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [25] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [25] )
+Markup span at (23:0,23 [8] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [25] )
+Markup span at (31:0,31 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [25] )
+Markup span at (32:0,32 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (33:0,33 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [51] )
+Markup span at (42:0,42 [9] ) (Accepts:Any) - Parent: Tag block at (42:0,42 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
new file mode 100644
index 0000000000..d5505e8178
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..51)::51 - [<script type='text/html invalid'><input /></script>]
+    MarkupBlock - [0..51)::51
+        MarkupElement - [0..51)::51
+            MarkupStartTag - [0..33)::33 - [<script type='text/html invalid'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..32)::25 - [ type='text/html invalid']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [14..31)::17
+                        MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                            MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                        MarkupLiteralAttributeValue - [23..31)::8 - [ invalid]
+                            MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [24..31)::7 - [invalid] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[invalid];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [33..42)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupEndTag - [42..51)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.cspans.txt
new file mode 100644
index 0000000000..a41c0eb271
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
+Markup span at (7:0,7 [7] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (24:0,24 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [17] )
+Markup span at (31:0,31 [9] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [17] )
+Markup span at (40:0,40 [1] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [17] )
+Markup span at (41:0,41 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
+Markup span at (42:0,42 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [60] )
+Markup span at (51:0,51 [9] ) (Accepts:Any) - Parent: Tag block at (51:0,51 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
new file mode 100644
index 0000000000..5102001848
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..60)::60 - [<script type='text/ng-*' type='text/html'><input /></script>]
+    MarkupBlock - [0..60)::60
+        MarkupElement - [0..60)::60
+            MarkupStartTag - [0..42)::42 - [<script type='text/ng-*' type='text/html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..24)::17 - [ type='text/ng-*']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [14..23)::9
+                        MarkupLiteralAttributeValue - [14..23)::9 - [text/ng-*]
+                            MarkupTextLiteral - [14..23)::9 - [text/ng-*] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[ng-*];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [24..41)::17 - [ type='text/html']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..29)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [31..40)::9
+                        MarkupLiteralAttributeValue - [31..40)::9 - [text/html]
+                            MarkupTextLiteral - [31..40)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTextLiteral - [42..51)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupEndTag - [51..60)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt
new file mode 100644
index 0000000000..9c63d02543
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (3:0,3 [4] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (7:0,7 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (12:0,12 [3] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.diag.txt
new file mode 100644
index 0000000000..79250ce2c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.diag.txt
@@ -0,0 +1,3 @@
+(1,4): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'b' are allowed.
+(1,8): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'b' are allowed.
+(1,13): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'b' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt
new file mode 100644
index 0000000000..9eda1dc0cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..19)::19 - [<p><!--Hello--></p>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupCommentBlock - [3..15)::12
+                MarkupTextLiteral - [3..7)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [7..12)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                MarkupTextLiteral - [12..15)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [15..19)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.tspans.txt
new file mode 100644
index 0000000000..8cb202b9d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [19] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt
new file mode 100644
index 0000000000..fe9f0e011c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (3:0,3 [4] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (7:0,7 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (12:0,12 [3] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (15:0,15 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+Markup span at (19:0,19 [4] ) (Accepts:None) - Parent: HtmlComment block at (19:0,19 [12] )
+Markup span at (23:0,23 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (19:0,19 [12] )
+Markup span at (28:0,28 [3] ) (Accepts:None) - Parent: HtmlComment block at (19:0,19 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.diag.txt
new file mode 100644
index 0000000000..2388259b98
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.diag.txt
@@ -0,0 +1 @@
+(1,16): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'b' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt
new file mode 100644
index 0000000000..383b82ba4a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..35)::35 - [<p><!--Hello-->asdf<!--World--></p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupCommentBlock - [3..15)::12
+                MarkupTextLiteral - [3..7)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [7..12)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                MarkupTextLiteral - [12..15)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..19)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[asdf];
+            MarkupCommentBlock - [19..31)::12
+                MarkupTextLiteral - [19..23)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [23..28)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[World];
+                MarkupTextLiteral - [28..31)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [31..35)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.tspans.txt
new file mode 100644
index 0000000000..548e779815
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.cspans.txt
new file mode 100644
index 0000000000..d99115005b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Statement block at (5:0,5 [9] )
+MetaCode span at (6:0,6 [1] ) (Accepts:None) - Parent: Statement block at (5:0,5 [9] )
+Markup span at (7:0,7 [6] ) (Accepts:None) - Parent: Tag block at (7:0,7 [6] )
+Code span at (13:0,13 [0] ) (Accepts:Any) - Parent: Statement block at (5:0,5 [9] )
+MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Statement block at (5:0,5 [9] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.diag.txt
new file mode 100644
index 0000000000..2d09355f58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt
new file mode 100644
index 0000000000..798255fcf8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..14)::14 - [<div>@{</div>}]
+    MarkupBlock - [0..14)::14
+        MarkupElement - [0..14)::14
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            CSharpCodeBlock - [5..14)::9
+                CSharpStatement - [5..14)::9
+                    CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpStatementBody - [6..14)::8
+                        RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [7..13)::6
+                            MarkupBlock - [7..13)::6
+                                MarkupElement - [7..13)::6
+                                    MarkupEndTag - [7..13)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[div];
+                                        CloseAngle;[>];
+                            CSharpStatementLiteral - [13..13)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+            MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.cspans.txt
new file mode 100644
index 0000000000..d7bd4e3d71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [7] )
+Markup span at (7:0,7 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
+Markup span at (10:0,10 [8] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.stree.txt
new file mode 100644
index 0000000000..55f62a7731
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesNonTagHelperStartAndEndVoidTags_Correctly.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..18)::18 - [<input>Foo</input>]
+    MarkupBlock - [0..18)::18
+        MarkupElement - [0..18)::18
+            MarkupStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..10)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupEndTag - [10..18)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.cspans.txt
new file mode 100644
index 0000000000..67ad7c62e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.cspans.txt
@@ -0,0 +1 @@
+Markup span at (6:0,6 [12] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.diag.txt
new file mode 100644
index 0000000000..28629d2c01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1034: Found a malformed 'th:strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt
new file mode 100644
index 0000000000..2dded2ecc6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..25)::25 - [<th:p></th:strong></th:p>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:p];
+                CloseAngle;[>];
+            MarkupElement - [6..18)::12
+                MarkupEndTag - [6..18)::12 - [</th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [18..25)::7 - [</th:p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.tspans.txt
new file mode 100644
index 0000000000..e3e08d013c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [25] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt
new file mode 100644
index 0000000000..4e29c0cde5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
+Markup span at (18:0,18 [4] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
new file mode 100644
index 0000000000..ec8ccca336
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..26)::26 - [<p class="btn"><p></p></p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupElement - [15..22)::7
+                MarkupStartTag - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupEndTag - [18..22)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [22..26)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.tspans.txt
new file mode 100644
index 0000000000..b037dceaab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [26] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt
new file mode 100644
index 0000000000..e59c771002
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [113] )
+Markup span at (22:0,22 [8] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [8] )
+Markup span at (30:0,30 [8] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [8] )
+Markup span at (56:0,56 [2] ) (Accepts:Any) - Parent: Tag block at (38:0,38 [48] )
+Markup span at (60:0,60 [8] ) (Accepts:Any) - Parent: Tag block at (60:0,60 [8] )
+Markup span at (68:0,68 [9] ) (Accepts:Any) - Parent: Tag block at (68:0,68 [9] )
+Markup span at (86:0,86 [9] ) (Accepts:Any) - Parent: Tag block at (86:0,86 [9] )
+Markup span at (95:0,95 [9] ) (Accepts:Any) - Parent: Tag block at (95:0,95 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
new file mode 100644
index 0000000000..608d1e1450
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
@@ -0,0 +1,80 @@
+RazorDocument - [0..113)::113 - [<strong catchAll="hi"><strong><strong><strong catchAll="hi"><strong></strong></strong></strong></strong></strong>]
+    MarkupBlock - [0..113)::113
+        MarkupTagHelperElement - [0..113)::113 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupElement - [22..104)::82
+                MarkupStartTag - [22..30)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [30..95)::65
+                    MarkupStartTag - [30..38)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupTagHelperElement - [38..86)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
+                        MarkupTagHelperStartTag - [38..60)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[strong];
+                            MarkupTagHelperAttribute - [45..59)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                                MarkupTextLiteral - [45..46)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupTextLiteral - [46..54)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[catchAll];
+                                Equals;[=];
+                                MarkupTextLiteral - [55..56)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    DoubleQuote;["];
+                                MarkupTagHelperAttributeValue - [56..58)::2
+                                    MarkupLiteralAttributeValue - [56..58)::2 - [hi]
+                                        MarkupTextLiteral - [56..58)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[hi];
+                                MarkupTextLiteral - [58..59)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    DoubleQuote;["];
+                            CloseAngle;[>];
+                        MarkupElement - [60..77)::17
+                            MarkupStartTag - [60..68)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[strong];
+                                CloseAngle;[>];
+                            MarkupEndTag - [68..77)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[strong];
+                                CloseAngle;[>];
+                        MarkupTagHelperEndTag - [77..86)::9 - [</strong>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[strong];
+                            CloseAngle;[>];
+                    MarkupEndTag - [86..95)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupEndTag - [95..104)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [104..113)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt
new file mode 100644
index 0000000000..8ea9fb13a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [113] ) - catchAllTagHelper
+TagHelper span at (38:0,38 [48] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt
new file mode 100644
index 0000000000..f9e18638d4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
+Markup span at (22:0,22 [8] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [8] )
+Markup span at (30:0,30 [9] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
new file mode 100644
index 0000000000..3e3493b6db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..48)::48 - [<strong catchAll="hi"><strong></strong></strong>]
+    MarkupBlock - [0..48)::48
+        MarkupTagHelperElement - [0..48)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupElement - [22..39)::17
+                MarkupStartTag - [22..30)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupEndTag - [30..39)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..48)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.tspans.txt
new file mode 100644
index 0000000000..f20c5948bd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [48] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt
new file mode 100644
index 0000000000..285c8a6c09
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [43] )
+Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
+Markup span at (23:0,23 [3] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [3] )
+Markup span at (26:0,26 [4] ) (Accepts:Any) - Parent: Tag block at (26:0,26 [4] )
+Markup span at (30:0,30 [9] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
new file mode 100644
index 0000000000..29d3350aa5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..43)::43 - [<p class="btn"><strong><p></p></strong></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupElement - [15..39)::24
+                MarkupStartTag - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [23..30)::7
+                    MarkupStartTag - [23..26)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupEndTag - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupEndTag - [30..39)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.tspans.txt
new file mode 100644
index 0000000000..9980ee41c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt
new file mode 100644
index 0000000000..b1ebc6b375
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [55] )
+Markup span at (22:0,22 [3] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [3] )
+Markup span at (25:0,25 [8] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [8] )
+Markup span at (33:0,33 [9] ) (Accepts:Any) - Parent: Tag block at (33:0,33 [9] )
+Markup span at (42:0,42 [4] ) (Accepts:Any) - Parent: Tag block at (42:0,42 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
new file mode 100644
index 0000000000..6b86720e7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..55)::55 - [<strong catchAll="hi"><p><strong></strong></p></strong>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..55)::55 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupElement - [22..46)::24
+                MarkupStartTag - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupElement - [25..42)::17
+                    MarkupStartTag - [25..33)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupEndTag - [33..42)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupEndTag - [42..46)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [46..55)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.tspans.txt
new file mode 100644
index 0000000000..14ff8ee19f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [55] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt
new file mode 100644
index 0000000000..40bebc3bdc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [57] )
+Markup span at (33:0,33 [2] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [38] )
+Markup span at (37:0,37 [3] ) (Accepts:Any) - Parent: Tag block at (37:0,37 [3] )
+Markup span at (40:0,40 [4] ) (Accepts:Any) - Parent: Tag block at (40:0,40 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
new file mode 100644
index 0000000000..8405d2eef7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
@@ -0,0 +1,60 @@
+RazorDocument - [0..57)::57 - [<p class="btn"><strong catchAll="hi"><p></p></strong></p>]
+    MarkupBlock - [0..57)::57
+        MarkupTagHelperElement - [0..57)::57 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [15..53)::38 - strong[StartTagAndEndTag] - catchAllTagHelper
+                MarkupTagHelperStartTag - [15..37)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupTagHelperAttribute - [22..36)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [23..31)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[catchAll];
+                        Equals;[=];
+                        MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [33..35)::2
+                            MarkupLiteralAttributeValue - [33..35)::2 - [hi]
+                                MarkupTextLiteral - [33..35)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[hi];
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupElement - [37..44)::7
+                    MarkupStartTag - [37..40)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupEndTag - [40..44)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [44..53)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [53..57)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt
new file mode 100644
index 0000000000..2075b5b276
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [57] ) - pTagHelper
+TagHelper span at (15:0,15 [38] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
new file mode 100644
index 0000000000..0de746f4eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
+Markup span at (32:0,32 [3] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [36] )
+Markup span at (37:0,37 [8] ) (Accepts:Any) - Parent: Tag block at (37:0,37 [8] )
+Markup span at (45:0,45 [9] ) (Accepts:Any) - Parent: Tag block at (45:0,45 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
new file mode 100644
index 0000000000..23c2e444d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
@@ -0,0 +1,60 @@
+RazorDocument - [0..67)::67 - [<strong catchAll="hi"><p class="btn"><strong></strong></p></strong>]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [22..58)::36 - p[StartTagAndEndTag] - pTagHelper
+                MarkupTagHelperStartTag - [22..37)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    MarkupTagHelperAttribute - [24..36)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                        MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [25..30)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [32..35)::3
+                            MarkupLiteralAttributeValue - [32..35)::3 - [btn]
+                                MarkupTextLiteral - [32..35)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[btn];
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupElement - [37..54)::17
+                    MarkupStartTag - [37..45)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupEndTag - [45..54)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [54..58)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [58..67)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt
new file mode 100644
index 0000000000..5986b90415
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [67] ) - catchAllTagHelper
+TagHelper span at (22:0,22 [36] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt
new file mode 100644
index 0000000000..e964e23037
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
+Markup span at (25:0,25 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [26] )
+Markup span at (30:0,30 [3] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [3] )
+Markup span at (33:0,33 [4] ) (Accepts:Any) - Parent: Tag block at (33:0,33 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
new file mode 100644
index 0000000000..dd9fea20e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
@@ -0,0 +1,60 @@
+RazorDocument - [0..45)::45 - [<p class="btn"><p class="btn"><p></p></p></p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [15..41)::26 - p[StartTagAndEndTag] - pTagHelper
+                MarkupTagHelperStartTag - [15..30)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    MarkupTagHelperAttribute - [17..29)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [25..28)::3
+                            MarkupLiteralAttributeValue - [25..28)::3 - [btn]
+                                MarkupTextLiteral - [25..28)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[btn];
+                        MarkupTextLiteral - [28..29)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupElement - [30..37)::7
+                    MarkupStartTag - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupEndTag - [33..37)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [37..41)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [41..45)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt
new file mode 100644
index 0000000000..cf6b225441
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [45] ) - pTagHelper
+TagHelper span at (15:0,15 [26] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
new file mode 100644
index 0000000000..76cf67d320
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [79] )
+Markup span at (40:0,40 [2] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [48] )
+Markup span at (44:0,44 [8] ) (Accepts:Any) - Parent: Tag block at (44:0,44 [8] )
+Markup span at (52:0,52 [9] ) (Accepts:Any) - Parent: Tag block at (52:0,52 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
new file mode 100644
index 0000000000..21526f8fe0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
@@ -0,0 +1,60 @@
+RazorDocument - [0..79)::79 - [<strong catchAll="hi"><strong catchAll="hi"><strong></strong></strong></strong>]
+    MarkupBlock - [0..79)::79
+        MarkupTagHelperElement - [0..79)::79 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [22..70)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
+                MarkupTagHelperStartTag - [22..44)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupTagHelperAttribute - [29..43)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [30..38)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[catchAll];
+                        Equals;[=];
+                        MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [40..42)::2
+                            MarkupLiteralAttributeValue - [40..42)::2 - [hi]
+                                MarkupTextLiteral - [40..42)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[hi];
+                        MarkupTextLiteral - [42..43)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    CloseAngle;[>];
+                MarkupElement - [44..61)::17
+                    MarkupStartTag - [44..52)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupEndTag - [52..61)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [61..70)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [70..79)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt
new file mode 100644
index 0000000000..fbb7dffddd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [79] ) - catchAllTagHelper
+TagHelper span at (22:0,22 [48] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt
new file mode 100644
index 0000000000..0e3e22141f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [59] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
+Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [3] )
+Markup span at (31:0,31 [3] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [26] )
+Markup span at (36:0,36 [3] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [3] )
+Markup span at (39:0,39 [4] ) (Accepts:Any) - Parent: Tag block at (39:0,39 [4] )
+Markup span at (47:0,47 [4] ) (Accepts:Any) - Parent: Tag block at (47:0,47 [4] )
+Markup span at (51:0,51 [4] ) (Accepts:Any) - Parent: Tag block at (51:0,51 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
new file mode 100644
index 0000000000..f15b50d720
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
@@ -0,0 +1,80 @@
+RazorDocument - [0..59)::59 - [<p class="btn"><p><p><p class="btn"><p></p></p></p></p></p>]
+    MarkupBlock - [0..59)::59
+        MarkupTagHelperElement - [0..59)::59 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupElement - [15..55)::40
+                MarkupStartTag - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupElement - [18..51)::33
+                    MarkupStartTag - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                    MarkupTagHelperElement - [21..47)::26 - p[StartTagAndEndTag] - pTagHelper
+                        MarkupTagHelperStartTag - [21..36)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[p];
+                            MarkupTagHelperAttribute - [23..35)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                                MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupTextLiteral - [24..29)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[class];
+                                Equals;[=];
+                                MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    DoubleQuote;["];
+                                MarkupTagHelperAttributeValue - [31..34)::3
+                                    MarkupLiteralAttributeValue - [31..34)::3 - [btn]
+                                        MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[btn];
+                                MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    DoubleQuote;["];
+                            CloseAngle;[>];
+                        MarkupElement - [36..43)::7
+                            MarkupStartTag - [36..39)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                            MarkupEndTag - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTagHelperEndTag - [43..47)::4 - [</p>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupEndTag - [47..51)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupEndTag - [51..55)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [55..59)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt
new file mode 100644
index 0000000000..86c4e400c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [59] ) - pTagHelper
+TagHelper span at (21:0,21 [26] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt
new file mode 100644
index 0000000000..bdb0fcc428
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (6:0,6 [8] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [8] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
new file mode 100644
index 0000000000..55159ceffb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..30)::30 - [<th:p><strong></strong></th:p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:p];
+                CloseAngle;[>];
+            MarkupElement - [6..23)::17
+                MarkupStartTag - [6..14)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupEndTag - [14..23)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [23..30)::7 - [</th:p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt
new file mode 100644
index 0000000000..2e5914e934
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [30] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.cspans.txt
new file mode 100644
index 0000000000..29554cdec9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (17:0,17 [8] ) (Accepts:Any) - Parent: Tag block at (17:0,17 [8] )
+Markup span at (25:0,25 [9] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.diag.txt
new file mode 100644
index 0000000000..b4a862c68a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.diag.txt
@@ -0,0 +1 @@
+(1,19): Error RZ2010: The <strong> tag is not allowed by parent <strong> tag helper. Only child tags with name(s) 'br' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt
new file mode 100644
index 0000000000..b0a4522426
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..43)::43 - [<strong required><strong></strong></strong>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - strong[StartTagAndEndTag] - StrongTagHelper
+            MarkupTagHelperStartTag - [0..17)::17 - [<strong required>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupMinimizedTagHelperAttribute - [7..16)::9 - required - Minimized - Unbound - [ required]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[required];
+                CloseAngle;[>];
+            MarkupElement - [17..34)::17
+                MarkupStartTag - [17..25)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupEndTag - [25..34)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..43)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.tspans.txt
new file mode 100644
index 0000000000..43893fed53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [43] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.cspans.txt
new file mode 100644
index 0000000000..f2fa2a31e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt
new file mode 100644
index 0000000000..a530591f30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt
@@ -0,0 +1,7 @@
+RazorDocument - [0..2)::2 - [<p]
+    MarkupBlock - [0..2)::2
+        MarkupElement - [0..2)::2
+            MarkupStartTag - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.cspans.txt
new file mode 100644
index 0000000000..2a68a378d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (16:0,16 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+Markup span at (27:0,27 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.diag.txt
new file mode 100644
index 0000000000..bcf9de93f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,35): Error RZ1035: Missing close angle for tag helper 'p'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
new file mode 100644
index 0000000000..ad7c779ccd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" </p]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..32)::32 - [<p notRequired="hi" class="btn" ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [31..32)::1
+                    MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [32..35)::3 - [</p]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.tspans.txt
new file mode 100644
index 0000000000..fcef603dfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.cspans.txt
new file mode 100644
index 0000000000..864bb27b43
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
new file mode 100644
index 0000000000..090ec992d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..14)::14 - [<p class="btn"]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..14)::14 - [<p class="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.tspans.txt
new file mode 100644
index 0000000000..22abb2b118
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [14] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.cspans.txt
new file mode 100644
index 0000000000..5835fa9258
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (16:0,16 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
+Markup span at (27:0,27 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
new file mode 100644
index 0000000000..b1f9b84420
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..31)::31 - [<p notRequired="hi" class="btn"]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..31)::31 - [<p notRequired="hi" class="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.tspans.txt
new file mode 100644
index 0000000000..ea57174e6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.cspans.txt
new file mode 100644
index 0000000000..811b313443
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt
new file mode 100644
index 0000000000..f4d112be39
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..6)::6 - [<p></p]
+    MarkupBlock - [0..6)::6
+        MarkupElement - [0..6)::6
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [3..6)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.cspans.txt
new file mode 100644
index 0000000000..4fcdd1af8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.diag.txt
new file mode 100644
index 0000000000..d26f4a4078
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ1035: Missing close angle for tag helper 'p'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
new file mode 100644
index 0000000000..cac3cea9fe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..18)::18 - [<p class="btn"></p]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [15..18)::3 - [</p]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.tspans.txt
new file mode 100644
index 0000000000..26aeee868e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [18] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.cspans.txt
new file mode 100644
index 0000000000..2a68a378d2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (16:0,16 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+Markup span at (27:0,27 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.diag.txt
new file mode 100644
index 0000000000..fa993c1831
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.diag.txt
@@ -0,0 +1 @@
+(1,35): Error RZ1035: Missing close angle for tag helper 'p'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
new file mode 100644
index 0000000000..b2b9d8c34b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn"></p]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..32)::32 - [<p notRequired="hi" class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [32..35)::3 - [</p]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.tspans.txt
new file mode 100644
index 0000000000..fcef603dfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.cspans.txt
new file mode 100644
index 0000000000..96cb7028ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
+Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
new file mode 100644
index 0000000000..ffc314935b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..18)::18 - [<p class="btn" <p>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn" ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [14..15)::1
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+            MarkupElement - [15..18)::3
+                MarkupStartTag - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.tspans.txt
new file mode 100644
index 0000000000..26aeee868e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [18] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.cspans.txt
new file mode 100644
index 0000000000..3ca120d8ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (16:0,16 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+Markup span at (27:0,27 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+Markup span at (32:0,32 [3] ) (Accepts:Any) - Parent: Tag block at (32:0,32 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.diag.txt
new file mode 100644
index 0000000000..b0e5b255ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
new file mode 100644
index 0000000000..95276cdab8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
@@ -0,0 +1,43 @@
+RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" <p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..32)::32 - [<p notRequired="hi" class="btn" ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [31..32)::1
+                    MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+            MarkupElement - [32..35)::3
+                MarkupStartTag - [32..35)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.tspans.txt
new file mode 100644
index 0000000000..fcef603dfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.cspans.txt
new file mode 100644
index 0000000000..4fcdd1af8c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.diag.txt
new file mode 100644
index 0000000000..ad599e94e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1035: Missing close angle for tag helper 'p'.
+(1,18): Error RZ1035: Missing close angle for tag helper 'p'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
new file mode 100644
index 0000000000..2f0937fa9e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..18)::18 - [<p class="btn" </p]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn" ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [14..15)::1
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [15..18)::3 - [</p]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.tspans.txt
new file mode 100644
index 0000000000..26aeee868e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [18] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt
new file mode 100644
index 0000000000..c559127169
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
new file mode 100644
index 0000000000..054b8b4abb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..5)::5 - [<p />]
+    MarkupBlock - [0..5)::5
+        MarkupElement - [0..5)::5
+            MarkupStartTag - [0..5)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupMiscAttributeContent - [2..3)::1
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt
new file mode 100644
index 0000000000..ce7d4197ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.cspans.txt
@@ -0,0 +1 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
new file mode 100644
index 0000000000..fe16ad6ab9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..24)::24 - [<strong catchAll="hi" />]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - strong[SelfClosing] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..24)::24 - [<strong catchAll="hi" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [21..22)::1
+                    MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt
new file mode 100644
index 0000000000..fdc44d87e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [24] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt
new file mode 100644
index 0000000000..b5022db073
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [13] )
+Code span at (19:0,19 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
new file mode 100644
index 0000000000..d6f75f2a9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..35)::35 - [<strong catchAll="@DateTime.Now" />]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - strong[SelfClosing] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..35)::35 - [<strong catchAll="@DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..32)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..31)::13
+                        MarkupDynamicAttributeValue - [18..31)::13 - [@DateTime.Now]
+                            GenericBlock - [18..31)::13
+                                CSharpCodeBlock - [18..31)::13
+                                    CSharpImplicitExpression - [18..31)::13
+                                        CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [19..31)::12
+                                            CSharpCodeBlock - [19..31)::12
+                                                CSharpExpressionLiteral - [19..31)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [32..33)::1
+                    MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.tspans.txt
new file mode 100644
index 0000000000..c2c433f527
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.cspans.txt
new file mode 100644
index 0000000000..022c99d374
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [47] )
+Markup span at (22:0,22 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [47] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
new file mode 100644
index 0000000000..6bd5c9b475
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..47)::47 - [<strong catchAll="hi">words and spaces</strong>]
+    MarkupBlock - [0..47)::47
+        MarkupTagHelperElement - [0..47)::47 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22 - [<strong catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [22..38)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [38..47)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.tspans.txt
new file mode 100644
index 0000000000..3919132f79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [47] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt
new file mode 100644
index 0000000000..65ac8fc060
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt
@@ -0,0 +1,3 @@
+Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [13] )
+Code span at (19:0,19 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [13] )
+Markup span at (33:0,33 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [58] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
new file mode 100644
index 0000000000..a0d04d2b2c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..58)::58 - [<strong catchAll="@DateTime.Now">words and spaces</strong>]
+    MarkupBlock - [0..58)::58
+        MarkupTagHelperElement - [0..58)::58 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..33)::33 - [<strong catchAll="@DateTime.Now">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                MarkupTagHelperAttribute - [7..32)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..31)::13
+                        MarkupDynamicAttributeValue - [18..31)::13 - [@DateTime.Now]
+                            GenericBlock - [18..31)::13
+                                CSharpCodeBlock - [18..31)::13
+                                    CSharpImplicitExpression - [18..31)::13
+                                        CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [19..31)::12
+                                            CSharpCodeBlock - [19..31)::12
+                                                CSharpExpressionLiteral - [19..31)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [33..49)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [49..58)::9 - [</strong>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.tspans.txt
new file mode 100644
index 0000000000..5518b4559b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [58] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.cspans.txt
new file mode 100644
index 0000000000..b66dc822e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [19] )
+Markup span at (4:0,4 [8] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [19] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
new file mode 100644
index 0000000000..b39cc67203
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..19)::19 - [<div class="btn" />]
+    MarkupBlock - [0..19)::19
+        MarkupElement - [0..19)::19
+            MarkupStartTag - [0..19)::19 - [<div class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupAttributeBlock - [4..16)::12 - [ class="btn"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [12..15)::3
+                        MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                            MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [16..17)::1
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.cspans.txt
new file mode 100644
index 0000000000..01fd0f4301
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
+Markup span at (4:0,4 [8] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [12] )
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
+Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Tag block at (17:0,17 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
new file mode 100644
index 0000000000..a31cde472d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..23)::23 - [<div class="btn"></div>]
+    MarkupBlock - [0..23)::23
+        MarkupElement - [0..23)::23
+            MarkupStartTag - [0..17)::17 - [<div class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupAttributeBlock - [4..16)::12 - [ class="btn"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [12..15)::3
+                        MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                            MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupEndTag - [17..23)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.cspans.txt
new file mode 100644
index 0000000000..266c0f349a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (26:0,26 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
new file mode 100644
index 0000000000..56ec6f33fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..33)::33 - [<p notRequired="a" class="btn" />]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..33)::33 - [<p notRequired="a" class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..18)::16 - notRequired - DoubleQuotes - Unbound - [ notRequired="a"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..17)::1
+                        MarkupLiteralAttributeValue - [16..17)::1 - [a]
+                            MarkupTextLiteral - [16..17)::1 - [a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[a];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [18..30)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..24)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [26..29)::3
+                        MarkupLiteralAttributeValue - [26..29)::3 - [btn]
+                            MarkupTextLiteral - [26..29)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [30..31)::1
+                    MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.tspans.txt
new file mode 100644
index 0000000000..523daac96f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [33] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt
new file mode 100644
index 0000000000..494b62f7a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt
@@ -0,0 +1,3 @@
+Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [13] )
+Code span at (17:0,17 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [13] )
+Markup span at (38:0,38 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
new file mode 100644
index 0000000000..e7c49df6fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..45)::45 - [<p notRequired="@DateTime.Now" class="btn" />]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..45)::45 - [<p notRequired="@DateTime.Now" class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..30)::28 - notRequired - DoubleQuotes - Unbound - [ notRequired="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..29)::13
+                        MarkupDynamicAttributeValue - [16..29)::13 - [@DateTime.Now]
+                            GenericBlock - [16..29)::13
+                                CSharpCodeBlock - [16..29)::13
+                                    CSharpImplicitExpression - [16..29)::13
+                                        CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [17..29)::12
+                                            CSharpCodeBlock - [17..29)::12
+                                                CSharpExpressionLiteral - [17..29)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [30..42)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [38..41)::3
+                        MarkupLiteralAttributeValue - [38..41)::3 - [btn]
+                            MarkupTextLiteral - [38..41)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [42..43)::1
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.tspans.txt
new file mode 100644
index 0000000000..0209fdf6c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [45] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.cspans.txt
new file mode 100644
index 0000000000..4962ba5ad6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (16:0,16 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [51] )
+Markup span at (26:0,26 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [51] )
+Markup span at (31:0,31 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
new file mode 100644
index 0000000000..c003750ce1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..51)::51 - [<p notRequired="a" class="btn">words and spaces</p>]
+    MarkupBlock - [0..51)::51
+        MarkupTagHelperElement - [0..51)::51 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..31)::31 - [<p notRequired="a" class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..18)::16 - notRequired - DoubleQuotes - Unbound - [ notRequired="a"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..17)::1
+                        MarkupLiteralAttributeValue - [16..17)::1 - [a]
+                            MarkupTextLiteral - [16..17)::1 - [a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[a];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [18..30)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..24)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [26..29)::3
+                        MarkupLiteralAttributeValue - [26..29)::3 - [btn]
+                            MarkupTextLiteral - [26..29)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [31..47)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [47..51)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.tspans.txt
new file mode 100644
index 0000000000..5f0754439a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [51] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt
new file mode 100644
index 0000000000..2930101dc1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
new file mode 100644
index 0000000000..06355bf233
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..28)::28 - [<div style="" class="btn" />]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - div[SelfClosing] - divTagHelper
+            MarkupTagHelperStartTag - [0..28)::28 - [<div style="" class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [25..26)::1
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.tspans.txt
new file mode 100644
index 0000000000..15e7f93acc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - divTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt
new file mode 100644
index 0000000000..38768af66f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [3] )
+Markup span at (3:0,3 [4] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
new file mode 100644
index 0000000000..946629e678
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..7)::7 - [<p></p>]
+    MarkupBlock - [0..7)::7
+        MarkupElement - [0..7)::7
+            MarkupStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupEndTag - [3..7)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt
new file mode 100644
index 0000000000..1ff5028dc0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt
@@ -0,0 +1,3 @@
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
+Markup span at (34:0,34 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [41] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
new file mode 100644
index 0000000000..b23c7746c2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
@@ -0,0 +1,48 @@
+RazorDocument - [0..41)::41 - [<div style="@DateTime.Now" class="btn" />]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..41)::41 - div[SelfClosing] - divTagHelper
+            MarkupTagHelperStartTag - [0..41)::41 - [<div style="@DateTime.Now" class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..26)::22 - style - DoubleQuotes - Unbound - [ style="@DateTime.Now"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..25)::13
+                        MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                            GenericBlock - [12..25)::13
+                                CSharpCodeBlock - [12..25)::13
+                                    CSharpImplicitExpression - [12..25)::13
+                                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [13..25)::12
+                                            CSharpCodeBlock - [13..25)::12
+                                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [26..38)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..37)::3
+                        MarkupLiteralAttributeValue - [34..37)::3 - [btn]
+                            MarkupTextLiteral - [34..37)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [38..39)::1
+                    MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.tspans.txt
new file mode 100644
index 0000000000..267c9ba9b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [41] ) - divTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt
new file mode 100644
index 0000000000..17da676f68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
+Markup span at (26:0,26 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
new file mode 100644
index 0000000000..a69b0bdd08
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..48)::48 - [<div style="" class="btn">words and spaces</div>]
+    MarkupBlock - [0..48)::48
+        MarkupTagHelperElement - [0..48)::48 - div[StartTagAndEndTag] - divTagHelper
+            MarkupTagHelperStartTag - [0..26)::26 - [<div style="" class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [26..42)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [42..48)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.tspans.txt
new file mode 100644
index 0000000000..1fa759ade1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [48] ) - divTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt
new file mode 100644
index 0000000000..b5ef904e18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt
@@ -0,0 +1,5 @@
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
+Transition span at (34:0,34 [1] ) (Accepts:None) - Parent: Expression block at (34:0,34 [13] )
+Code span at (35:0,35 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (34:0,34 [13] )
+Markup span at (49:0,49 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [71] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
new file mode 100644
index 0000000000..9f939b4eea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
@@ -0,0 +1,64 @@
+RazorDocument - [0..71)::71 - [<div style="@DateTime.Now" class="@DateTime.Now">words and spaces</div>]
+    MarkupBlock - [0..71)::71
+        MarkupTagHelperElement - [0..71)::71 - div[StartTagAndEndTag] - divTagHelper
+            MarkupTagHelperStartTag - [0..49)::49 - [<div style="@DateTime.Now" class="@DateTime.Now">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..26)::22 - style - DoubleQuotes - Unbound - [ style="@DateTime.Now"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..25)::13
+                        MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                            GenericBlock - [12..25)::13
+                                CSharpCodeBlock - [12..25)::13
+                                    CSharpImplicitExpression - [12..25)::13
+                                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [13..25)::12
+                                            CSharpCodeBlock - [13..25)::12
+                                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [26..48)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..47)::13
+                        MarkupDynamicAttributeValue - [34..47)::13 - [@DateTime.Now]
+                            GenericBlock - [34..47)::13
+                                CSharpCodeBlock - [34..47)::13
+                                    CSharpImplicitExpression - [34..47)::13
+                                        CSharpTransition - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [35..47)::12
+                                            CSharpCodeBlock - [35..47)::12
+                                                CSharpExpressionLiteral - [35..47)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [49..65)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [65..71)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.tspans.txt
new file mode 100644
index 0000000000..dffecb5c26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [71] ) - divTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt
new file mode 100644
index 0000000000..a788e1773e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (26:0,26 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (31:0,31 [8] ) (Accepts:Any) - Parent: Tag block at (31:0,31 [8] )
+Markup span at (39:0,39 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (42:0,42 [9] ) (Accepts:Any) - Parent: Tag block at (42:0,42 [9] )
+Markup span at (51:0,51 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
new file mode 100644
index 0000000000..95768527cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
@@ -0,0 +1,54 @@
+RazorDocument - [0..63)::63 - [<div style="" class="btn">words<strong>and</strong>spaces</div>]
+    MarkupBlock - [0..63)::63
+        MarkupTagHelperElement - [0..63)::63 - div[StartTagAndEndTag] - divTagHelper
+            MarkupTagHelperStartTag - [0..26)::26 - [<div style="" class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [26..31)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+            MarkupElement - [31..51)::20
+                MarkupStartTag - [31..39)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [39..42)::3 - [and] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[and];
+                MarkupEndTag - [42..51)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [51..57)::6 - [spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[spaces];
+            MarkupTagHelperEndTag - [57..63)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.tspans.txt
new file mode 100644
index 0000000000..ed9fa4bce0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [63] ) - divTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.cspans.txt
new file mode 100644
index 0000000000..0d58538fb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
+Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
new file mode 100644
index 0000000000..bb831df610
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..31)::31 - [<p class="btn" catchAll="hi" />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[SelfClosing] - pTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..31)::31 - [<p class="btn" catchAll="hi" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..28)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [25..27)::2
+                        MarkupLiteralAttributeValue - [25..27)::2 - [hi]
+                            MarkupTextLiteral - [25..27)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [28..29)::1
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.tspans.txt
new file mode 100644
index 0000000000..6fb86e9357
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [31] ) - pTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.cspans.txt
new file mode 100644
index 0000000000..4e62a5fb59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [49] )
+Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [49] )
+Markup span at (29:0,29 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [49] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
new file mode 100644
index 0000000000..3f8a72bb82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..49)::49 - [<p class="btn" catchAll="hi">words and spaces</p>]
+    MarkupBlock - [0..49)::49
+        MarkupTagHelperElement - [0..49)::49 - p[StartTagAndEndTag] - pTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..29)::29 - [<p class="btn" catchAll="hi">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..28)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [25..27)::2
+                        MarkupLiteralAttributeValue - [25..27)::2 - [hi]
+                            MarkupTextLiteral - [25..27)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [29..45)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [45..49)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.tspans.txt
new file mode 100644
index 0000000000..df0f66ba2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [49] ) - pTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt
new file mode 100644
index 0000000000..4a50e7e4a8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
new file mode 100644
index 0000000000..a3036a1c45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
@@ -0,0 +1,51 @@
+RazorDocument - [0..42)::42 - [<div style="" class="btn" catchAll="hi" />]
+    MarkupBlock - [0..42)::42
+        MarkupTagHelperElement - [0..42)::42 - div[SelfClosing] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..42)::42 - [<div style="" class="btn" catchAll="hi" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..38)::2
+                        MarkupLiteralAttributeValue - [36..38)::2 - [hi]
+                            MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [39..40)::1
+                    MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.tspans.txt
new file mode 100644
index 0000000000..4820770a5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [42] ) - divTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt
new file mode 100644
index 0000000000..49b2350a05
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
+Markup span at (41:0,41 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
new file mode 100644
index 0000000000..9a603b3e4e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
@@ -0,0 +1,61 @@
+RazorDocument - [0..63)::63 - [<div style="" class="btn" catchAll="hi" >words and spaces</div>]
+    MarkupBlock - [0..63)::63
+        MarkupTagHelperElement - [0..63)::63 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..41)::41 - [<div style="" class="btn" catchAll="hi" >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..38)::2
+                        MarkupLiteralAttributeValue - [36..38)::2 - [hi]
+                            MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [39..40)::1
+                    MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [41..57)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [57..63)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.tspans.txt
new file mode 100644
index 0000000000..107a34c817
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [63] ) - divTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt
new file mode 100644
index 0000000000..b76fbd29f0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [65] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [65] )
+Markup span at (36:0,36 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [2] )
+Markup span at (37:0,37 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [2] )
+Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [4] )
+Markup span at (43:0,43 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [65] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
new file mode 100644
index 0000000000..ce933507e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
@@ -0,0 +1,66 @@
+RazorDocument - [0..65)::65 - [<div style="" class="btn" catchAll="@@hi" >words and spaces</div>]
+    MarkupBlock - [0..65)::65
+        MarkupTagHelperElement - [0..65)::65 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..43)::43 - [<div style="" class="btn" catchAll="@@hi" >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..41)::16 - catchAll - DoubleQuotes - Unbound - [ catchAll="@@hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..40)::4
+                        MarkupBlock - [36..38)::2
+                            MarkupTextLiteral - [36..37)::1 - [@] - Gen<LitAttr:@(36:0,36)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [37..38)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [38..40)::2 - [hi]
+                            MarkupTextLiteral - [38..40)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [40..41)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [41..42)::1
+                    MarkupTextLiteral - [41..42)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [43..59)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [59..65)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.tspans.txt
new file mode 100644
index 0000000000..c45dca540d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [65] ) - divTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt
new file mode 100644
index 0000000000..e1f21dcb28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt
@@ -0,0 +1,7 @@
+Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
+Transition span at (34:0,34 [1] ) (Accepts:None) - Parent: Expression block at (34:0,34 [13] )
+Code span at (35:0,35 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (34:0,34 [13] )
+Transition span at (59:0,59 [1] ) (Accepts:None) - Parent: Expression block at (59:0,59 [13] )
+Code span at (60:0,60 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (59:0,59 [13] )
+Markup span at (75:0,75 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [97] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
new file mode 100644
index 0000000000..16f40ca649
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
@@ -0,0 +1,90 @@
+RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now" catchAll="@DateTime.Now" >words and spaces</div>]
+    MarkupBlock - [0..97)::97
+        MarkupTagHelperElement - [0..97)::97 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..75)::75 - [<div style="@DateTime.Now" class="@DateTime.Now" catchAll="@DateTime.Now" >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..26)::22 - style - DoubleQuotes - Unbound - [ style="@DateTime.Now"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..25)::13
+                        MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                            GenericBlock - [12..25)::13
+                                CSharpCodeBlock - [12..25)::13
+                                    CSharpImplicitExpression - [12..25)::13
+                                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [13..25)::12
+                                            CSharpCodeBlock - [13..25)::12
+                                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [26..48)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..47)::13
+                        MarkupDynamicAttributeValue - [34..47)::13 - [@DateTime.Now]
+                            GenericBlock - [34..47)::13
+                                CSharpCodeBlock - [34..47)::13
+                                    CSharpImplicitExpression - [34..47)::13
+                                        CSharpTransition - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [35..47)::12
+                                            CSharpCodeBlock - [35..47)::12
+                                                CSharpExpressionLiteral - [35..47)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [48..73)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
+                    MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [49..57)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [58..59)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [59..72)::13
+                        MarkupDynamicAttributeValue - [59..72)::13 - [@DateTime.Now]
+                            GenericBlock - [59..72)::13
+                                CSharpCodeBlock - [59..72)::13
+                                    CSharpImplicitExpression - [59..72)::13
+                                        CSharpTransition - [59..60)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [60..72)::12
+                                            CSharpCodeBlock - [60..72)::12
+                                                CSharpExpressionLiteral - [60..72)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [72..73)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [73..74)::1
+                    MarkupTextLiteral - [73..74)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [75..91)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [91..97)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.tspans.txt
new file mode 100644
index 0000000000..5b10442647
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [97] ) - divTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt
new file mode 100644
index 0000000000..4f69cb3f10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.cspans.txt
@@ -0,0 +1 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
new file mode 100644
index 0000000000..306fe73b84
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
@@ -0,0 +1,11 @@
+RazorDocument - [0..7)::7 - [<div />]
+    MarkupBlock - [0..7)::7
+        MarkupElement - [0..7)::7
+            MarkupStartTag - [0..7)::7 - [<div />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupMiscAttributeContent - [4..5)::1
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt
new file mode 100644
index 0000000000..9fec06bb52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
+Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
+Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
+Markup span at (41:0,41 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
+Markup span at (46:0,46 [8] ) (Accepts:Any) - Parent: Tag block at (46:0,46 [8] )
+Markup span at (54:0,54 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
+Markup span at (57:0,57 [9] ) (Accepts:Any) - Parent: Tag block at (57:0,57 [9] )
+Markup span at (66:0,66 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
new file mode 100644
index 0000000000..e6389d0c59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
@@ -0,0 +1,71 @@
+RazorDocument - [0..78)::78 - [<div style="" class="btn" catchAll="hi" >words<strong>and</strong>spaces</div>]
+    MarkupBlock - [0..78)::78
+        MarkupTagHelperElement - [0..78)::78 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..41)::41 - [<div style="" class="btn" catchAll="hi" >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..38)::2
+                        MarkupLiteralAttributeValue - [36..38)::2 - [hi]
+                            MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [39..40)::1
+                    MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTextLiteral - [41..46)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+            MarkupElement - [46..66)::20
+                MarkupStartTag - [46..54)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [54..57)::3 - [and] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[and];
+                MarkupEndTag - [57..66)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [66..72)::6 - [spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[spaces];
+            MarkupTagHelperEndTag - [72..78)::6 - [</div>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.tspans.txt
new file mode 100644
index 0000000000..e10503a044
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [78] ) - divTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt
new file mode 100644
index 0000000000..b02774d867
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (5:0,5 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
new file mode 100644
index 0000000000..251a137553
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..11)::11 - [<div></div>]
+    MarkupBlock - [0..11)::11
+        MarkupElement - [0..11)::11
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupEndTag - [5..11)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt
new file mode 100644
index 0000000000..7514a2b315
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
new file mode 100644
index 0000000000..ac9ad91046
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [<p class="btn" />]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..17)::17 - [<p class="btn" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [14..15)::1
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt
new file mode 100644
index 0000000000..a46dc9658a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [17] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
new file mode 100644
index 0000000000..0dd5fb1015
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
@@ -0,0 +1,2 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
new file mode 100644
index 0000000000..405623c7ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..27)::27 - [<p class="@DateTime.Now" />]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..27)::27 - [<p class="@DateTime.Now" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [24..25)::1
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt
new file mode 100644
index 0000000000..13aba97ce9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [27] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt
new file mode 100644
index 0000000000..82a1ccb4b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+Markup span at (15:0,15 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
new file mode 100644
index 0000000000..b0032b1097
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..35)::35 - [<p class="btn">words and spaces</p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [15..31)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [31..35)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt
new file mode 100644
index 0000000000..fcef603dfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
new file mode 100644
index 0000000000..57aac25125
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
@@ -0,0 +1,3 @@
+Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
+Markup span at (25:0,25 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
new file mode 100644
index 0000000000..036d6ce433
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..45)::45 - [<p class="@DateTime.Now">words and spaces</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..25)::25 - [<p class="@DateTime.Now">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [25..41)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [41..45)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt
new file mode 100644
index 0000000000..0209fdf6c5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [45] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt
new file mode 100644
index 0000000000..aac0423123
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [50] )
+Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [50] )
+Markup span at (20:0,20 [8] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [8] )
+Markup span at (28:0,28 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [50] )
+Markup span at (31:0,31 [9] ) (Accepts:Any) - Parent: Tag block at (31:0,31 [9] )
+Markup span at (40:0,40 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [50] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
new file mode 100644
index 0000000000..44e66d59f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
@@ -0,0 +1,42 @@
+RazorDocument - [0..50)::50 - [<p class="btn">words<strong>and</strong>spaces</p>]
+    MarkupBlock - [0..50)::50
+        MarkupTagHelperElement - [0..50)::50 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15 - [<p class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];
+            MarkupTextLiteral - [15..20)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+            MarkupElement - [20..40)::20
+                MarkupStartTag - [20..28)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [28..31)::3 - [and] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[and];
+                MarkupEndTag - [31..40)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [40..46)::6 - [spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[spaces];
+            MarkupTagHelperEndTag - [46..50)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt
new file mode 100644
index 0000000000..f26abbe016
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [50] ) - pTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt
new file mode 100644
index 0000000000..80fe4a7c6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..18)::18 - [<p><div></div></p>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..14)::11 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [3..8)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [8..14)::6 - [</div>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [14..18)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.tspans.txt
new file mode 100644
index 0000000000..c6e74368cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [18] ) - ptaghelper
+TagHelper span at (3:0,3 [11] ) - divtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.cspans.txt
new file mode 100644
index 0000000000..217baf9220
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt
new file mode 100644
index 0000000000..878ac67dcb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..30)::30 - [<p>Hello World <div></div></p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [15..26)::11 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [15..20)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [20..26)::6 - [</div>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..30)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.tspans.txt
new file mode 100644
index 0000000000..a24b08ac0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [30] ) - ptaghelper
+TagHelper span at (15:0,15 [11] ) - divtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.cspans.txt
new file mode 100644
index 0000000000..5eee6a7160
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [19] )
+Markup span at (9:0,9 [2] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [9] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Markup span at (28:0,28 [5] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt
new file mode 100644
index 0000000000..1b8b0b8258
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..43)::43 - [<p>Hel<p>lo</p></p> <p><div>World</div></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..19)::19 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..6)::3 - [Hel] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+            MarkupTagHelperElement - [6..15)::9 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [9..11)::2 - [lo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[lo];
+                MarkupTagHelperEndTag - [11..15)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [15..19)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [20..43)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [20..23)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [23..39)::16 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [23..28)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [28..33)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [33..39)::6 - [</div>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.tspans.txt
new file mode 100644
index 0000000000..99e05e1570
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.tspans.txt
@@ -0,0 +1,4 @@
+TagHelper span at (0:0,0 [19] ) - ptaghelper
+TagHelper span at (6:0,6 [9] ) - ptaghelper
+TagHelper span at (20:0,20 [23] ) - ptaghelper
+TagHelper span at (23:0,23 [16] ) - divtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.cspans.txt
new file mode 100644
index 0000000000..34608d7a1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [29] )
+Markup span at (6:0,6 [8] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [8] )
+Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [29] )
+Markup span at (16:0,16 [9] ) (Accepts:Any) - Parent: Tag block at (16:0,16 [9] )
+Markup span at (29:0,29 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [55] )
+Markup span at (33:0,33 [6] ) (Accepts:Any) - Parent: Tag block at (33:0,33 [6] )
+Markup span at (39:0,39 [5] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [25] )
+Markup span at (44:0,44 [7] ) (Accepts:Any) - Parent: Tag block at (44:0,44 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt
new file mode 100644
index 0000000000..23f1042fb1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt
@@ -0,0 +1,50 @@
+RazorDocument - [0..55)::55 - [<p>Hel<strong>lo</strong></p> <p><span>World</span></p>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..29)::29 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..6)::3 - [Hel] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+            MarkupElement - [6..25)::19
+                MarkupStartTag - [6..14)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [14..16)::2 - [lo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[lo];
+                MarkupEndTag - [16..25)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..29)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [30..55)::25 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [33..51)::18
+                MarkupStartTag - [33..39)::6 - [<span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[span];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [39..44)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupEndTag - [44..51)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[span];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [51..55)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.tspans.txt
new file mode 100644
index 0000000000..9ff63342bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [29] ) - ptaghelper
+TagHelper span at (30:0,30 [25] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt
new file mode 100644
index 0000000000..8d2006107c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..13)::13 - [<p><br /></p>]
+    MarkupBlock - [0..13)::13
+        MarkupTagHelperElement - [0..13)::13 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..9)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [3..9)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [6..7)::1
+                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [9..13)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.tspans.txt
new file mode 100644
index 0000000000..f1b18b4065
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [13] ) - PTagHelper
+TagHelper span at (3:0,3 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.cspans.txt
new file mode 100644
index 0000000000..d2c5955635
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [47] )
+Markup span at (21:0,21 [4] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [4] )
+Markup span at (25:0,25 [11] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [47] )
+Markup span at (36:0,36 [5] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [5] )
+Markup span at (56:0,56 [9] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.diag.txt
new file mode 100644
index 0000000000..251fa1828e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.diag.txt
@@ -0,0 +1,5 @@
+(1,12): Error RZ2009: The parent <strong> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong' are allowed.
+(1,19): Error RZ2010: The <br> tag is not allowed by parent <strong> tag helper. Only child tags with name(s) 'strong' are allowed.
+(1,23): Error RZ2010: The <em> tag is not allowed by parent <strong> tag helper. Only child tags with name(s) 'strong' are allowed.
+(1,52): Error RZ2010: The <br> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'strong' are allowed.
+(1,57): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt
new file mode 100644
index 0000000000..3bf30508ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..69)::69 - [<p><strong>Title:<br><em>A Very Cool</em></strong><br />Something</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..69)::69 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..50)::47 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperElement - [17..21)::4 - br[StartTagOnly] - BRTagHelper
+                    MarkupTagHelperStartTag - [17..21)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+                MarkupElement - [21..41)::20
+                    MarkupStartTag - [21..25)::4 - [<em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[em];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [25..36)::11 - [A Very Cool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[A];
+                        Whitespace;[ ];
+                        Text;[Very];
+                        Whitespace;[ ];
+                        Text;[Cool];
+                    MarkupEndTag - [36..41)::5 - [</em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[em];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [41..50)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [50..56)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [50..56)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [53..54)::1
+                        MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [56..65)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [65..69)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.tspans.txt
new file mode 100644
index 0000000000..882c9f8332
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.tspans.txt
@@ -0,0 +1,4 @@
+TagHelper span at (0:0,0 [69] ) - PTagHelper
+TagHelper span at (3:0,3 [47] ) - StrongTagHelper
+TagHelper span at (17:0,17 [4] ) - BRTagHelper
+TagHelper span at (50:0,50 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.cspans.txt
new file mode 100644
index 0000000000..22b36ea704
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [8] )
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
+Markup span at (21:0,21 [4] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [4] )
+Markup span at (25:0,25 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
+Markup span at (36:0,36 [5] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [5] )
+Markup span at (41:0,41 [9] ) (Accepts:Any) - Parent: Tag block at (41:0,41 [9] )
+Markup span at (56:0,56 [9] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.diag.txt
new file mode 100644
index 0000000000..6589efa832
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.diag.txt
@@ -0,0 +1,2 @@
+(1,52): Error RZ2010: The <br> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'custom' are allowed.
+(1,57): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'custom' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt
new file mode 100644
index 0000000000..3ff1ebec20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..69)::69 - [<p><custom>Title:<br><em>A Very Cool</em></custom><br />Something</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..69)::69 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..50)::47
+                MarkupStartTag - [3..11)::8 - [<custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[custom];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperElement - [17..21)::4 - br[StartTagOnly] - BRTagHelper
+                    MarkupTagHelperStartTag - [17..21)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+                MarkupElement - [21..41)::20
+                    MarkupStartTag - [21..25)::4 - [<em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[em];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [25..36)::11 - [A Very Cool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[A];
+                        Whitespace;[ ];
+                        Text;[Very];
+                        Whitespace;[ ];
+                        Text;[Cool];
+                    MarkupEndTag - [36..41)::5 - [</em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[em];
+                        CloseAngle;[>];
+                MarkupEndTag - [41..50)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [50..56)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [50..56)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [53..54)::1
+                        MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [56..65)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [65..69)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.tspans.txt
new file mode 100644
index 0000000000..9456a2bf5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [69] ) - PTagHelper
+TagHelper span at (17:0,17 [4] ) - BRTagHelper
+TagHelper span at (50:0,50 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.cspans.txt
new file mode 100644
index 0000000000..b3958cf71b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.diag.txt
new file mode 100644
index 0000000000..063da0eb5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'custom' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt
new file mode 100644
index 0000000000..5a9413f6d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..9)::9 - [<p></</p>]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..5)::2
+                MarkupEndTag - [3..5)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [5..9)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.tspans.txt
new file mode 100644
index 0000000000..60f5356683
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [9] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.cspans.txt
new file mode 100644
index 0000000000..31c8ea8ce8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [1] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [1] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.diag.txt
new file mode 100644
index 0000000000..063da0eb5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'custom' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt
new file mode 100644
index 0000000000..4ca6ee6ef6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..8)::8 - [<p><</p>]
+    MarkupBlock - [0..8)::8
+        MarkupTagHelperElement - [0..8)::8 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..4)::1
+                MarkupStartTag - [3..4)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [4..8)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.tspans.txt
new file mode 100644
index 0000000000..b8f64937bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [8] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.cspans.txt
new file mode 100644
index 0000000000..92bc9cb1dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [8] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [76] )
+Markup span at (32:0,32 [5] ) (Accepts:Any) - Parent: Tag block at (24:0,24 [22] )
+Markup span at (55:0,55 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [76] )
+Markup span at (56:0,56 [7] ) (Accepts:Any) - Parent: Tag block at (56:0,56 [7] )
+Markup span at (63:0,63 [9] ) (Accepts:Any) - Parent: Tag block at (63:0,63 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.diag.txt
new file mode 100644
index 0000000000..dba76059c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.diag.txt
@@ -0,0 +1 @@
+(1,33): Error RZ2009: The parent <strong> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'custom, strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt
new file mode 100644
index 0000000000..854aed8c29
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..76)::76 - [<p><custom><br>:<strong><strong>Hello</strong></strong>:<input></custom></p>]
+    MarkupBlock - [0..76)::76
+        MarkupTagHelperElement - [0..76)::76 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..72)::69
+                MarkupStartTag - [3..11)::8 - [<custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[custom];
+                    CloseAngle;[>];
+                MarkupTagHelperElement - [11..15)::4 - br[StartTagOnly] - BRTagHelper
+                    MarkupTagHelperStartTag - [11..15)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [15..16)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[:];
+                MarkupTagHelperElement - [16..55)::39 - strong[StartTagAndEndTag] - StrongTagHelper
+                    MarkupTagHelperStartTag - [16..24)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupTagHelperElement - [24..46)::22 - strong[StartTagAndEndTag] - StrongTagHelper
+                        MarkupTagHelperStartTag - [24..32)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[strong];
+                            CloseAngle;[>];
+                        MarkupTextLiteral - [32..37)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Hello];
+                        MarkupTagHelperEndTag - [37..46)::9 - [</strong>]
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[strong];
+                            CloseAngle;[>];
+                    MarkupTagHelperEndTag - [46..55)::9 - [</strong>]
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [55..56)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[:];
+                MarkupElement - [56..63)::7
+                    MarkupStartTag - [56..63)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[input];
+                        CloseAngle;[>];
+                MarkupEndTag - [63..72)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [72..76)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.tspans.txt
new file mode 100644
index 0000000000..bcff6cc882
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.tspans.txt
@@ -0,0 +1,4 @@
+TagHelper span at (0:0,0 [76] ) - PTagHelper
+TagHelper span at (11:0,11 [4] ) - BRTagHelper
+TagHelper span at (16:0,16 [39] ) - StrongTagHelper
+TagHelper span at (24:0,24 [22] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.cspans.txt
new file mode 100644
index 0000000000..ed768b841c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
+Markup span at (11:1,6 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt
new file mode 100644
index 0000000000..e7698afb7f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [<p>LF<br />LF</p>]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagHelperElement - [5..11)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [5..11)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [8..9)::1
+                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagHelperEndTag - [13..17)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.tspans.txt
new file mode 100644
index 0000000000..e1f410f604
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [17] ) - PTagHelper
+TagHelper span at (5:1,0 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.diag.txt
new file mode 100644
index 0000000000..a7c54ec3cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ2010: The <br> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt
new file mode 100644
index 0000000000..d0e1b59dd7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..11)::11 - [<p><br></p>]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..7)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [3..7)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [7..11)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.tspans.txt
new file mode 100644
index 0000000000..ae1b0f8418
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [11] ) - PTagHelper
+TagHelper span at (3:0,3 [4] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.cspans.txt
new file mode 100644
index 0000000000..51162d34c3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [12] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.diag.txt
new file mode 100644
index 0000000000..e4dbe01b43
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt
new file mode 100644
index 0000000000..504b072dfb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..12)::12 - [<p>Hello</p>]
+    MarkupBlock - [0..12)::12
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..8)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [8..12)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.tspans.txt
new file mode 100644
index 0000000000..5cd52523a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [12] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.cspans.txt
new file mode 100644
index 0000000000..85c1b5ca5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.diag.txt
new file mode 100644
index 0000000000..538e0bf30f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ2010: The <hr> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'br, strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt
new file mode 100644
index 0000000000..e220712ca9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..13)::13 - [<p><hr /></p>]
+    MarkupBlock - [0..13)::13
+        MarkupTagHelperElement - [0..13)::13 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..9)::6
+                MarkupStartTag - [3..9)::6 - [<hr />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[hr];
+                    MarkupMiscAttributeContent - [6..7)::1
+                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [9..13)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.tspans.txt
new file mode 100644
index 0000000000..a947feb3b1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [13] ) - PTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.cspans.txt
new file mode 100644
index 0000000000..5e84b178d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.cspans.txt
@@ -0,0 +1 @@
+Markup span at (7:0,7 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.diag.txt
new file mode 100644
index 0000000000..4206048463
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.diag.txt
@@ -0,0 +1,2 @@
+(1,5): Error RZ2010: The <br> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'strong' are allowed.
+(1,8): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt
new file mode 100644
index 0000000000..bbbaa92ea1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..16)::16 - [<p><br>Hello</p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..7)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [3..7)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..12)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [12..16)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.tspans.txt
new file mode 100644
index 0000000000..43f281c42c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [16] ) - PTagHelper
+TagHelper span at (3:0,3 [4] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.cspans.txt
new file mode 100644
index 0000000000..7815c5f788
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [23] )
+Markup span at (32:0,32 [9] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.diag.txt
new file mode 100644
index 0000000000..5c40a3ac80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.diag.txt
@@ -0,0 +1,3 @@
+(1,12): Error RZ2009: The parent <strong> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong' are allowed.
+(1,28): Error RZ2010: The <br> tag is not allowed by parent <p> tag helper. Only child tags with name(s) 'strong' are allowed.
+(1,33): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt
new file mode 100644
index 0000000000..a26f2202b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..45)::45 - [<p><strong>Title:</strong><br />Something</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..26)::23 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperEndTag - [17..26)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [26..32)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [26..32)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [29..30)::1
+                        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [32..41)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [41..45)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.tspans.txt
new file mode 100644
index 0000000000..c28f7d8242
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [45] ) - PTagHelper
+TagHelper span at (3:0,3 [23] ) - StrongTagHelper
+TagHelper span at (26:0,26 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.cspans.txt
new file mode 100644
index 0000000000..7815c5f788
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (11:0,11 [6] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [23] )
+Markup span at (32:0,32 [9] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.diag.txt
new file mode 100644
index 0000000000..97cf99a535
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.diag.txt
@@ -0,0 +1,2 @@
+(1,12): Error RZ2009: The parent <strong> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong, br' are allowed.
+(1,33): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong, br' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt
new file mode 100644
index 0000000000..a26f2202b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..45)::45 - [<p><strong>Title:</strong><br />Something</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..26)::23 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperEndTag - [17..26)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [26..32)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [26..32)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [29..30)::1
+                        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [32..41)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [41..45)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.tspans.txt
new file mode 100644
index 0000000000..c28f7d8242
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [45] ) - PTagHelper
+TagHelper span at (3:0,3 [23] ) - StrongTagHelper
+TagHelper span at (26:0,26 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.cspans.txt
new file mode 100644
index 0000000000..5b996a5f72
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [51] )
+Markup span at (13:0,13 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [23] )
+Markup span at (28:0,28 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [51] )
+Markup span at (36:0,36 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [51] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.diag.txt
new file mode 100644
index 0000000000..8209310bcf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.diag.txt
@@ -0,0 +1,2 @@
+(1,14): Error RZ2009: The parent <strong> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong, br' are allowed.
+(1,39): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'strong, br' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt
new file mode 100644
index 0000000000..604ea8b5e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..51)::51 - [<p>  <strong>Title:</strong>  <br />  Something</p>]
+    MarkupBlock - [0..51)::51
+        MarkupTagHelperElement - [0..51)::51 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            MarkupTagHelperElement - [5..28)::23 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTextLiteral - [13..19)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperEndTag - [19..28)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [28..30)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            MarkupTagHelperElement - [30..36)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [30..36)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [33..34)::1
+                        MarkupTextLiteral - [33..34)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [36..47)::11 - [  Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+                Text;[Something];
+            MarkupTagHelperEndTag - [47..51)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.tspans.txt
new file mode 100644
index 0000000000..6b47d0c8f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [51] ) - PTagHelper
+TagHelper span at (5:0,5 [23] ) - StrongTagHelper
+TagHelper span at (30:0,30 [6] ) - BRTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.cspans.txt
new file mode 100644
index 0000000000..5b82e351ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [9] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt
new file mode 100644
index 0000000000..d0bebed030
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..17)::17 - [<strong></strong>]
+    MarkupBlock - [0..17)::17
+        MarkupElement - [0..17)::17
+            MarkupStartTag - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupEndTag - [8..17)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt
new file mode 100644
index 0000000000..585ba3a17c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..24)::24 - [<p><strong></strong></p>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..20)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [11..20)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [20..24)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.tspans.txt
new file mode 100644
index 0000000000..bc23211df6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [24] ) - PTagHelper
+TagHelper span at (3:0,3 [17] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.cspans.txt
new file mode 100644
index 0000000000..55c7fac46e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
+Markup span at (22:0,22 [6] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt
new file mode 100644
index 0000000000..540608c5a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..28)::28 - [<div><strong></strong></div>]
+    MarkupBlock - [0..28)::28
+        MarkupElement - [0..28)::28
+            MarkupStartTag - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [5..22)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [13..22)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupEndTag - [22..28)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.tspans.txt
new file mode 100644
index 0000000000..fc33dac63f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (5:0,5 [17] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.cspans.txt
new file mode 100644
index 0000000000..730a1aeeb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Tag block at (8:0,8 [8] )
+Markup span at (16:0,16 [9] ) (Accepts:Any) - Parent: Tag block at (16:0,16 [9] )
+Markup span at (25:0,25 [9] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt
new file mode 100644
index 0000000000..c4c7affb20
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..34)::34 - [<strong><strong></strong></strong>]
+    MarkupBlock - [0..34)::34
+        MarkupElement - [0..34)::34
+            MarkupStartTag - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupElement - [8..25)::17
+                MarkupStartTag - [8..16)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupEndTag - [16..25)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupEndTag - [25..34)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.cspans.txt
new file mode 100644
index 0000000000..87adb1fdcf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (11:0,11 [8] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [8] )
+Markup span at (19:0,19 [9] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt
new file mode 100644
index 0000000000..af8b35de67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..41)::41 - [<p><strong><strong></strong></strong></p>]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..41)::41 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..37)::34 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [11..28)::17
+                    MarkupStartTag - [11..19)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                    MarkupEndTag - [19..28)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [28..37)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [37..41)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.tspans.txt
new file mode 100644
index 0000000000..f75dd01918
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [41] ) - PTagHelper
+TagHelper span at (3:0,3 [34] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.cspans.txt
new file mode 100644
index 0000000000..000e3e842a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (7:0,7 [8] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [8] )
+Markup span at (15:0,15 [9] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt
new file mode 100644
index 0000000000..884fbc2bab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..24)::24 - [<input><strong></strong>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+        MarkupElement - [7..24)::17
+            MarkupStartTag - [7..15)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupEndTag - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.tspans.txt
new file mode 100644
index 0000000000..507d5a1ed9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt
new file mode 100644
index 0000000000..e72021baa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..31)::31 - [<p><input><strong></strong></p>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..10)::7 - input[StartTagOnly] - InputTagHelper
+                MarkupTagHelperStartTag - [3..10)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [10..27)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [10..18)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [18..27)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [27..31)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.tspans.txt
new file mode 100644
index 0000000000..d7fdf8d909
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [31] ) - PTagHelper
+TagHelper span at (3:0,3 [7] ) - InputTagHelper
+TagHelper span at (10:0,10 [17] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.cspans.txt
new file mode 100644
index 0000000000..fa4040f4e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [4] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt
new file mode 100644
index 0000000000..ab19150491
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..28)::28 - [<p><br><strong></strong></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..7)::4
+                MarkupStartTag - [3..7)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [7..24)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [7..15)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [15..24)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.tspans.txt
new file mode 100644
index 0000000000..73e31cf725
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [28] ) - PTagHelper
+TagHelper span at (7:0,7 [17] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.cspans.txt
new file mode 100644
index 0000000000..932e4c0847
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.cspans.txt
@@ -0,0 +1 @@
+Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt
new file mode 100644
index 0000000000..305e173046
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..35)::35 - [<p><p><br></p><strong></strong></p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..14)::11 - p[StartTagAndEndTag] - PTagHelper
+                MarkupTagHelperStartTag - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupElement - [6..10)::4
+                    MarkupStartTag - [6..10)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [10..14)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [14..31)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [14..22)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [22..31)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [31..35)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.tspans.txt
new file mode 100644
index 0000000000..0220afb1bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [35] ) - PTagHelper
+TagHelper span at (3:0,3 [11] ) - PTagHelper
+TagHelper span at (14:0,14 [17] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.cspans.txt
new file mode 100644
index 0000000000..000e3e842a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.cspans.txt
@@ -0,0 +1,2 @@
+Markup span at (7:0,7 [8] ) (Accepts:Any) - Parent: Tag block at (7:0,7 [8] )
+Markup span at (15:0,15 [9] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt
new file mode 100644
index 0000000000..884fbc2bab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..24)::24 - [<input><strong></strong>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+        MarkupElement - [7..24)::17
+            MarkupStartTag - [7..15)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupEndTag - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.tspans.txt
new file mode 100644
index 0000000000..507d5a1ed9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [7] ) - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt
new file mode 100644
index 0000000000..120d5d3b73
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..26)::26 - [<p><input /><strong /></p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..12)::9 - input[SelfClosing] - InputTagHelper
+                MarkupTagHelperStartTag - [3..12)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    MarkupMiscAttributeContent - [9..10)::1
+                        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [12..22)::10 - strong[SelfClosing] - StrongTagHelper
+                MarkupTagHelperStartTag - [12..22)::10 - [<strong />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupMiscAttributeContent - [19..20)::1
+                        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [22..26)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.tspans.txt
new file mode 100644
index 0000000000..64d44d0707
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [26] ) - PTagHelper
+TagHelper span at (3:0,3 [9] ) - InputTagHelper
+TagHelper span at (12:0,12 [10] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.cspans.txt
new file mode 100644
index 0000000000..85c1b5ca5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt
new file mode 100644
index 0000000000..ba2a0caa9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..23)::23 - [<p><br /><strong /></p>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..9)::6
+                MarkupStartTag - [3..9)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    MarkupMiscAttributeContent - [6..7)::1
+                        MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [9..19)::10 - strong[SelfClosing] - StrongTagHelper
+                MarkupTagHelperStartTag - [9..19)::10 - [<strong />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupMiscAttributeContent - [16..17)::1
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [19..23)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.tspans.txt
new file mode 100644
index 0000000000..4148089e22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [23] ) - PTagHelper
+TagHelper span at (9:0,9 [10] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.cspans.txt
new file mode 100644
index 0000000000..42ce74cdcf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.cspans.txt
@@ -0,0 +1 @@
+Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt
new file mode 100644
index 0000000000..eaf02a847a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..30)::30 - [<p><p><br /></p><strong /></p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..16)::13 - p[StartTagAndEndTag] - PTagHelper
+                MarkupTagHelperStartTag - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupElement - [6..12)::6
+                    MarkupStartTag - [6..12)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        MarkupMiscAttributeContent - [9..10)::1
+                            MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [12..16)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [16..26)::10 - strong[SelfClosing] - StrongTagHelper
+                MarkupTagHelperStartTag - [16..26)::10 - [<strong />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    MarkupMiscAttributeContent - [23..24)::1
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..30)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.tspans.txt
new file mode 100644
index 0000000000..9e2ff7f56f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [30] ) - PTagHelper
+TagHelper span at (3:0,3 [13] ) - PTagHelper
+TagHelper span at (16:0,16 [10] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.cspans.txt
new file mode 100644
index 0000000000..b3958cf71b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.cspans.txt
@@ -0,0 +1 @@
+Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.diag.txt
new file mode 100644
index 0000000000..063da0eb5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2009: The parent <p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'custom' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt
new file mode 100644
index 0000000000..c3ce3b808e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..9)::9 - [<p></</p>]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - p[StartTagAndEndTag] - PTagHelper - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [3..5)::2
+                MarkupEndTag - [3..5)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [5..9)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.tspans.txt
new file mode 100644
index 0000000000..742c49e552
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [9] ) - PTagHelper - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.cspans.txt
new file mode 100644
index 0000000000..9f25e95db6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.cspans.txt
@@ -0,0 +1 @@
+Markup span at (6:0,6 [2] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [2] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.diag.txt
new file mode 100644
index 0000000000..ea784070ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.diag.txt
@@ -0,0 +1 @@
+(1,7): Error RZ2009: The parent <th:p> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) 'custom' are allowed.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt
new file mode 100644
index 0000000000..96f4542570
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [<th:p></</th:p>]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - th:p[StartTagAndEndTag] - PTagHelper - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:p];
+                CloseAngle;[>];
+            MarkupElement - [6..8)::2
+                MarkupEndTag - [6..8)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperEndTag - [8..15)::7 - [</th:p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.tspans.txt
new file mode 100644
index 0000000000..9c88cfee63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [15] ) - PTagHelper - CatchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.diag.txt
new file mode 100644
index 0000000000..66ca144635
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.diag.txt
@@ -0,0 +1,2 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,5): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt
new file mode 100644
index 0000000000..7ceb2b793e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt
@@ -0,0 +1,12 @@
+RazorDocument - [0..11)::11 - [<p><strong>]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..11)::8 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.tspans.txt
new file mode 100644
index 0000000000..90c108ed6f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [11] ) - PTagHelper - CatchALlTagHelper
+TagHelper span at (3:0,3 [8] ) - StrongTagHelper - CatchALlTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.diag.txt
new file mode 100644
index 0000000000..d177eb6df7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.diag.txt
@@ -0,0 +1 @@
+(1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt
new file mode 100644
index 0000000000..0fd6778b92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..20)::20 - [<p><strong></strong>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..20)::17 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [11..20)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.tspans.txt
new file mode 100644
index 0000000000..c845290524
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [20] ) - PTagHelper - CatchALlTagHelper
+TagHelper span at (3:0,3 [17] ) - StrongTagHelper - CatchALlTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.diag.txt
new file mode 100644
index 0000000000..c430b77aba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.diag.txt
@@ -0,0 +1,2 @@
+(1,5): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
+(1,17): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt
new file mode 100644
index 0000000000..f398f7e621
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..23)::23 - [<p><strong></p><strong>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..15)::15 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [3..11)::8 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [11..15)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [15..23)::8 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.tspans.txt
new file mode 100644
index 0000000000..15f95fc055
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.tspans.txt
@@ -0,0 +1,3 @@
+TagHelper span at (0:0,0 [15] ) - PTagHelper - CatchALlTagHelper
+TagHelper span at (3:0,3 [8] ) - StrongTagHelper - CatchALlTagHelper
+TagHelper span at (15:0,15 [8] ) - StrongTagHelper - CatchALlTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.cspans.txt
new file mode 100644
index 0000000000..0ddda3f56c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [1] )
+Markup span at (13:0,13 [2] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [2] )
+Markup span at (23:0,23 [9] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.diag.txt
new file mode 100644
index 0000000000..23376ed537
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.diag.txt
@@ -0,0 +1,2 @@
+(1,18): Error RZ1035: Missing close angle for tag helper 'strong'.
+(1,26): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt
new file mode 100644
index 0000000000..7f1b3852f7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..36)::36 - [<<p><<strong></</strong</strong></p>]
+    MarkupBlock - [0..36)::36
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [1..36)::35 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [1..4)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [4..5)::1
+                MarkupStartTag - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [5..23)::18 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [13..15)::2
+                    MarkupEndTag - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[<Missing>];
+                        CloseAngle;[<Missing>];
+                MarkupTagHelperEndTag - [15..23)::8 - [</strong]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[<Missing>];
+            MarkupElement - [23..32)::9
+                MarkupEndTag - [23..32)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [32..36)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.tspans.txt
new file mode 100644
index 0000000000..a2439ab80f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (1:0,1 [35] ) - PTagHelper - CatchALlTagHelper
+TagHelper span at (5:0,5 [18] ) - StrongTagHelper - CatchALlTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.cspans.txt
new file mode 100644
index 0000000000..6b5900843d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [1] )
+Markup span at (13:0,13 [2] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [2] )
+Markup span at (24:0,24 [9] ) (Accepts:Any) - Parent: Tag block at (24:0,24 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.diag.txt
new file mode 100644
index 0000000000..2ec0cc5b46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.diag.txt
@@ -0,0 +1 @@
+(1,27): Error RZ1034: Found a malformed 'strong' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt
new file mode 100644
index 0000000000..de50b379ce
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt
@@ -0,0 +1,44 @@
+RazorDocument - [0..37)::37 - [<<p><<strong></</strong></strong></p>]
+    MarkupBlock - [0..37)::37
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [1..37)::36 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [1..4)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [4..5)::1
+                MarkupStartTag - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [5..24)::19 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+                MarkupElement - [13..15)::2
+                    MarkupEndTag - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[<Missing>];
+                        CloseAngle;[<Missing>];
+                MarkupTagHelperEndTag - [15..24)::9 - [</strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupElement - [24..33)::9
+                MarkupEndTag - [24..33)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [33..37)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.tspans.txt
new file mode 100644
index 0000000000..4ba2086e2d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (1:0,1 [36] ) - PTagHelper - CatchALlTagHelper
+TagHelper span at (5:0,5 [19] ) - StrongTagHelper - CatchALlTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.cspans.txt
new file mode 100644
index 0000000000..f84fc1d9eb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [1] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Tag block at (4:0,4 [1] )
+Markup span at (13:0,13 [2] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [2] )
+Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [1] )
+Markup span at (25:0,25 [9] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.diag.txt
new file mode 100644
index 0000000000..593733688c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.diag.txt
@@ -0,0 +1 @@
+(1,28): Error RZ1034: Found a malformed 'custom' tag helper. Tag helpers must have a start and end tag or be self closing.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt
new file mode 100644
index 0000000000..22b0433adb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt
@@ -0,0 +1,49 @@
+RazorDocument - [0..38)::38 - [<<p><<custom></<</custom></custom></p>]
+    MarkupBlock - [0..38)::38
+        MarkupElement - [0..1)::1
+            MarkupStartTag - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[<Missing>];
+                CloseAngle;[<Missing>];
+        MarkupTagHelperElement - [1..38)::37 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [1..4)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupElement - [4..5)::1
+                MarkupStartTag - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[<Missing>];
+                    CloseAngle;[<Missing>];
+            MarkupTagHelperElement - [5..25)::20 - custom[StartTagAndEndTag] - CatchALlTagHelper
+                MarkupTagHelperStartTag - [5..13)::8 - [<custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[custom];
+                    CloseAngle;[>];
+                MarkupElement - [13..15)::2
+                    MarkupEndTag - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[<Missing>];
+                        CloseAngle;[<Missing>];
+                MarkupElement - [15..16)::1
+                    MarkupStartTag - [15..16)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[<Missing>];
+                        CloseAngle;[<Missing>];
+                MarkupTagHelperEndTag - [16..25)::9 - [</custom>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupElement - [25..34)::9
+                MarkupEndTag - [25..34)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..38)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.tspans.txt
new file mode 100644
index 0000000000..69e6d665e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (1:0,1 [37] ) - PTagHelper - CatchALlTagHelper
+TagHelper span at (5:0,5 [20] ) - CatchALlTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
new file mode 100644
index 0000000000..d4340fbaf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..36)::36 - [<th:p><th:strong></th:strong></th:p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [6..29)::23 - th:strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [6..17)::11 - [<th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [17..29)::12 - [</th:strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..36)::7 - [</th:p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt
new file mode 100644
index 0000000000..3d7cf53630
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [36] ) - PTagHelper
+TagHelper span at (6:0,6 [23] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.cspans.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt
new file mode 100644
index 0000000000..d4340fbaf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..36)::36 - [<th:p><th:strong></th:strong></th:p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:p];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [6..29)::23 - th:strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [6..17)::11 - [<th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:strong];
+                    CloseAngle;[>];
+                MarkupTagHelperEndTag - [17..29)::12 - [</th:strong>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..36)::7 - [</th:p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.tspans.txt
new file mode 100644
index 0000000000..3d7cf53630
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (0:0,0 [36] ) - PTagHelper
+TagHelper span at (6:0,6 [23] ) - StrongTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.cspans.txt
new file mode 100644
index 0000000000..b5c72f9c7c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (7:0,7 [7] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (34:0,34 [9] ) (Accepts:Any) - Parent: Tag block at (34:0,34 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
new file mode 100644
index 0000000000..ab41052e02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..43)::43 - [<script type='text/html'><input /></script>]
+    MarkupBlock - [0..43)::43
+        MarkupElement - [0..43)::43
+            MarkupStartTag - [0..25)::25 - [<script type='text/html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..24)::17 - [ type='text/html']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [14..23)::9
+                        MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                            MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [25..34)::9 - input[SelfClosing] - inputtaghelper
+                MarkupTagHelperStartTag - [25..34)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    MarkupMiscAttributeContent - [31..32)::1
+                        MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupEndTag - [34..43)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.tspans.txt
new file mode 100644
index 0000000000..d4c27b6e7a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (25:0,25 [9] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.cspans.txt
new file mode 100644
index 0000000000..8bd8e1509f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [58] )
+Markup span at (7:0,7 [5] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [15] )
+Markup span at (12:0,12 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [15] )
+Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [15] )
+Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [17] )
+Markup span at (29:0,29 [9] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [17] )
+Markup span at (38:0,38 [1] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [17] )
+Markup span at (39:0,39 [8] ) (Accepts:Any) - Parent: Markup block at (39:0,39 [18] )
+Markup span at (47:0,47 [9] ) (Accepts:Any) - Parent: Markup block at (39:0,39 [18] )
+Markup span at (56:0,56 [1] ) (Accepts:Any) - Parent: Markup block at (39:0,39 [18] )
+Markup span at (57:0,57 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [58] )
+Markup span at (67:0,67 [9] ) (Accepts:Any) - Parent: Tag block at (67:0,67 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
new file mode 100644
index 0000000000..02f84b0a0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
@@ -0,0 +1,65 @@
+RazorDocument - [0..76)::76 - [<script id='scriptTag' type='text/html' class='something'><input /></script>]
+    MarkupBlock - [0..76)::76
+        MarkupElement - [0..76)::76
+            MarkupStartTag - [0..58)::58 - [<script id='scriptTag' type='text/html' class='something'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..22)::15 - [ id='scriptTag']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..10)::2 - [id] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[id];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [12..21)::9
+                        MarkupLiteralAttributeValue - [12..21)::9 - [scriptTag]
+                            MarkupTextLiteral - [12..21)::9 - [scriptTag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[scriptTag];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [22..39)::17 - [ type='text/html']
+                    MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [23..27)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [29..38)::9
+                        MarkupLiteralAttributeValue - [29..38)::9 - [text/html]
+                            MarkupTextLiteral - [29..38)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupAttributeBlock - [39..57)::18 - [ class='something']
+                    MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [40..45)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [47..56)::9
+                        MarkupLiteralAttributeValue - [47..56)::9 - [something]
+                            MarkupTextLiteral - [47..56)::9 - [something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[something];
+                    MarkupTextLiteral - [56..57)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [58..67)::9 - input[SelfClosing] - inputtaghelper
+                MarkupTagHelperStartTag - [58..67)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    MarkupMiscAttributeContent - [64..65)::1
+                        MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupEndTag - [67..76)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.tspans.txt
new file mode 100644
index 0000000000..3621fc53bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (58:0,58 [9] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.cspans.txt
new file mode 100644
index 0000000000..2d9ed79313
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (7:0,7 [7] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (28:0,28 [7] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [25] )
+Markup span at (35:0,35 [7] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [17] )
+Markup span at (42:0,42 [9] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [17] )
+Markup span at (51:0,51 [1] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [17] )
+Markup span at (52:0,52 [1] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [25] )
+Markup span at (62:0,62 [9] ) (Accepts:Any) - Parent: Tag block at (62:0,62 [9] )
+Markup span at (75:0,75 [9] ) (Accepts:Any) - Parent: Tag block at (75:0,75 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
new file mode 100644
index 0000000000..4c82e8fa9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
@@ -0,0 +1,73 @@
+RazorDocument - [0..84)::84 - [<script type='text/html'><p><script type='text/html'><input /></script></p></script>]
+    MarkupBlock - [0..84)::84
+        MarkupElement - [0..84)::84
+            MarkupStartTag - [0..25)::25 - [<script type='text/html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..24)::17 - [ type='text/html']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [14..23)::9
+                        MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                            MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [25..75)::50 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [25..28)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupElement - [28..71)::43
+                    MarkupStartTag - [28..53)::25 - [<script type='text/html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[script];
+                        MarkupAttributeBlock - [35..52)::17 - [ type='text/html']
+                            MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [36..40)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[type];
+                            Equals;[=];
+                            MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [42..51)::9
+                                MarkupLiteralAttributeValue - [42..51)::9 - [text/html]
+                                    MarkupTextLiteral - [42..51)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[text];
+                                        ForwardSlash;[/];
+                                        Text;[html];
+                            MarkupTextLiteral - [51..52)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        CloseAngle;[>];
+                    MarkupTagHelperElement - [53..62)::9 - input[SelfClosing] - inputtaghelper
+                        MarkupTagHelperStartTag - [53..62)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[input];
+                            MarkupMiscAttributeContent - [59..60)::1
+                                MarkupTextLiteral - [59..60)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                    MarkupEndTag - [62..71)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[script];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [71..75)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupEndTag - [75..84)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.tspans.txt
new file mode 100644
index 0000000000..5f9f687bee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.tspans.txt
@@ -0,0 +1,2 @@
+TagHelper span at (25:0,25 [50] ) - ptaghelper
+TagHelper span at (53:0,53 [9] ) - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.cspans.txt
new file mode 100644
index 0000000000..b8ce9ee314
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.cspans.txt
@@ -0,0 +1,14 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (7:0,7 [7] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (7:0,7 [17] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Markup span at (28:0,28 [7] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [26] )
+Markup span at (35:0,35 [7] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [18] )
+Markup span at (42:0,42 [5] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [18] )
+Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [18] )
+Markup span at (52:0,52 [1] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [18] )
+Markup span at (53:0,53 [1] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [26] )
+Markup span at (54:0,54 [9] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [51] )
+Markup span at (63:0,63 [9] ) (Accepts:Any) - Parent: Tag block at (63:0,63 [9] )
+Markup span at (76:0,76 [9] ) (Accepts:Any) - Parent: Tag block at (76:0,76 [9] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
new file mode 100644
index 0000000000..9abd2f61a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
@@ -0,0 +1,74 @@
+RazorDocument - [0..85)::85 - [<script type='text/html'><p><script type='text/ html'><input /></script></p></script>]
+    MarkupBlock - [0..85)::85
+        MarkupElement - [0..85)::85
+            MarkupStartTag - [0..25)::25 - [<script type='text/html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                MarkupAttributeBlock - [7..24)::17 - [ type='text/html']
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [14..23)::9
+                        MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                            MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupTagHelperElement - [25..76)::51 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [25..28)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+                MarkupElement - [28..72)::44
+                    MarkupStartTag - [28..54)::26 - [<script type='text/ html'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[script];
+                        MarkupAttributeBlock - [35..53)::18 - [ type='text/ html']
+                            MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [36..40)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[type];
+                            Equals;[=];
+                            MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [42..52)::10
+                                MarkupLiteralAttributeValue - [42..47)::5 - [text/]
+                                    MarkupTextLiteral - [42..47)::5 - [text/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[text];
+                                        ForwardSlash;[/];
+                                MarkupLiteralAttributeValue - [47..52)::5 - [ html]
+                                    MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [48..52)::4 - [html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[html];
+                            MarkupTextLiteral - [52..53)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        CloseAngle;[>];
+                    MarkupTextLiteral - [54..63)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[input];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+                    MarkupEndTag - [63..72)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[script];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [72..76)::4 - [</p>]
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupEndTag - [76..85)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.tspans.txt
new file mode 100644
index 0000000000..31ab64ca0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (25:0,25 [51] ) - ptaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt
new file mode 100644
index 0000000000..64df8a7ddd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt
@@ -0,0 +1,18 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (9:2,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Transition span at (13:2,4 [1] ) (Accepts:None) - Parent: Expression block at (13:2,4 [7] )
+Code span at (14:2,5 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:2,4 [7] )
+Markup span at (20:2,11 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (22:3,0 [6] ) (Accepts:Any) - Parent: Tag block at (22:3,0 [6] )
+Markup span at (28:3,6 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (30:4,0 [5] ) (Accepts:Any) - Parent: Tag block at (30:4,0 [5] )
+Markup span at (35:4,5 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (37:5,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Transition span at (41:5,4 [1] ) (Accepts:None) - Parent: Expression block at (41:5,4 [9] )
+MetaCode span at (42:5,5 [1] ) (Accepts:None) - Parent: Expression block at (41:5,4 [9] )
+Code span at (43:5,6 [6] ) (Accepts:Any) - Parent: Expression block at (41:5,4 [9] )
+MetaCode span at (49:5,12 [1] ) (Accepts:None) - Parent: Expression block at (41:5,4 [9] )
+Markup span at (50:5,13 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (52:6,0 [6] ) (Accepts:Any) - Parent: Tag block at (52:6,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt
new file mode 100644
index 0000000000..6fc0095f30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt
@@ -0,0 +1,58 @@
+RazorDocument - [0..58)::58 - [LF<div>LF    @resultLF</div>LF<div>LF    @(result)LF</div>]
+    MarkupBlock - [0..58)::58
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..28)::26
+            MarkupStartTag - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [7..9)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTextLiteral - [9..13)::4 - [    ]
+                Whitespace;[    ];
+            CSharpCodeBlock - [13..20)::7
+                CSharpImplicitExpression - [13..20)::7
+                    CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [14..20)::6
+                        CSharpCodeBlock - [14..20)::6
+                            CSharpExpressionLiteral - [14..20)::6 - [result] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[result];
+            MarkupTextLiteral - [20..22)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [22..28)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [28..30)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [30..58)::28
+            MarkupStartTag - [30..35)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTextLiteral - [35..37)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTextLiteral - [37..41)::4 - [    ]
+                Whitespace;[    ];
+            CSharpCodeBlock - [41..50)::9
+                CSharpExplicitExpression - [41..50)::9
+                    CSharpTransition - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpExplicitExpressionBody - [42..50)::8
+                        RazorMetaCode - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftParenthesis;[(];
+                        CSharpCodeBlock - [43..49)::6
+                            CSharpExpressionLiteral - [43..49)::6 - [result] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                Identifier;[result];
+                        RazorMetaCode - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightParenthesis;[)];
+            MarkupTextLiteral - [50..52)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupEndTag - [52..58)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/Source/BasicMarkup.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/Source/BasicMarkup.cshtml
new file mode 100644
index 0000000000..384a7a6deb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/Source/BasicMarkup.cshtml
@@ -0,0 +1,8 @@
+<html>
+<head>
+    <title>This is the title.</title>
+</head>
+<body>
+    <a href="http://contoso.com">Link to Contoso.</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/nested-1000.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/nested-1000.html
new file mode 100644
index 0000000000..3c35bdbcbe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/nested-1000.html
@@ -0,0 +1,2002 @@
+<outer>
+<elem-1>
+<elem-2>
+<elem-3>
+<elem-4>
+<elem-5>
+<elem-6>
+<elem-7>
+<elem-8>
+<elem-9>
+<elem-10>
+<elem-11>
+<elem-12>
+<elem-13>
+<elem-14>
+<elem-15>
+<elem-16>
+<elem-17>
+<elem-18>
+<elem-19>
+<elem-20>
+<elem-21>
+<elem-22>
+<elem-23>
+<elem-24>
+<elem-25>
+<elem-26>
+<elem-27>
+<elem-28>
+<elem-29>
+<elem-30>
+<elem-31>
+<elem-32>
+<elem-33>
+<elem-34>
+<elem-35>
+<elem-36>
+<elem-37>
+<elem-38>
+<elem-39>
+<elem-40>
+<elem-41>
+<elem-42>
+<elem-43>
+<elem-44>
+<elem-45>
+<elem-46>
+<elem-47>
+<elem-48>
+<elem-49>
+<elem-50>
+<elem-51>
+<elem-52>
+<elem-53>
+<elem-54>
+<elem-55>
+<elem-56>
+<elem-57>
+<elem-58>
+<elem-59>
+<elem-60>
+<elem-61>
+<elem-62>
+<elem-63>
+<elem-64>
+<elem-65>
+<elem-66>
+<elem-67>
+<elem-68>
+<elem-69>
+<elem-70>
+<elem-71>
+<elem-72>
+<elem-73>
+<elem-74>
+<elem-75>
+<elem-76>
+<elem-77>
+<elem-78>
+<elem-79>
+<elem-80>
+<elem-81>
+<elem-82>
+<elem-83>
+<elem-84>
+<elem-85>
+<elem-86>
+<elem-87>
+<elem-88>
+<elem-89>
+<elem-90>
+<elem-91>
+<elem-92>
+<elem-93>
+<elem-94>
+<elem-95>
+<elem-96>
+<elem-97>
+<elem-98>
+<elem-99>
+<elem-100>
+<elem-101>
+<elem-102>
+<elem-103>
+<elem-104>
+<elem-105>
+<elem-106>
+<elem-107>
+<elem-108>
+<elem-109>
+<elem-110>
+<elem-111>
+<elem-112>
+<elem-113>
+<elem-114>
+<elem-115>
+<elem-116>
+<elem-117>
+<elem-118>
+<elem-119>
+<elem-120>
+<elem-121>
+<elem-122>
+<elem-123>
+<elem-124>
+<elem-125>
+<elem-126>
+<elem-127>
+<elem-128>
+<elem-129>
+<elem-130>
+<elem-131>
+<elem-132>
+<elem-133>
+<elem-134>
+<elem-135>
+<elem-136>
+<elem-137>
+<elem-138>
+<elem-139>
+<elem-140>
+<elem-141>
+<elem-142>
+<elem-143>
+<elem-144>
+<elem-145>
+<elem-146>
+<elem-147>
+<elem-148>
+<elem-149>
+<elem-150>
+<elem-151>
+<elem-152>
+<elem-153>
+<elem-154>
+<elem-155>
+<elem-156>
+<elem-157>
+<elem-158>
+<elem-159>
+<elem-160>
+<elem-161>
+<elem-162>
+<elem-163>
+<elem-164>
+<elem-165>
+<elem-166>
+<elem-167>
+<elem-168>
+<elem-169>
+<elem-170>
+<elem-171>
+<elem-172>
+<elem-173>
+<elem-174>
+<elem-175>
+<elem-176>
+<elem-177>
+<elem-178>
+<elem-179>
+<elem-180>
+<elem-181>
+<elem-182>
+<elem-183>
+<elem-184>
+<elem-185>
+<elem-186>
+<elem-187>
+<elem-188>
+<elem-189>
+<elem-190>
+<elem-191>
+<elem-192>
+<elem-193>
+<elem-194>
+<elem-195>
+<elem-196>
+<elem-197>
+<elem-198>
+<elem-199>
+<elem-200>
+<elem-201>
+<elem-202>
+<elem-203>
+<elem-204>
+<elem-205>
+<elem-206>
+<elem-207>
+<elem-208>
+<elem-209>
+<elem-210>
+<elem-211>
+<elem-212>
+<elem-213>
+<elem-214>
+<elem-215>
+<elem-216>
+<elem-217>
+<elem-218>
+<elem-219>
+<elem-220>
+<elem-221>
+<elem-222>
+<elem-223>
+<elem-224>
+<elem-225>
+<elem-226>
+<elem-227>
+<elem-228>
+<elem-229>
+<elem-230>
+<elem-231>
+<elem-232>
+<elem-233>
+<elem-234>
+<elem-235>
+<elem-236>
+<elem-237>
+<elem-238>
+<elem-239>
+<elem-240>
+<elem-241>
+<elem-242>
+<elem-243>
+<elem-244>
+<elem-245>
+<elem-246>
+<elem-247>
+<elem-248>
+<elem-249>
+<elem-250>
+<elem-251>
+<elem-252>
+<elem-253>
+<elem-254>
+<elem-255>
+<elem-256>
+<elem-257>
+<elem-258>
+<elem-259>
+<elem-260>
+<elem-261>
+<elem-262>
+<elem-263>
+<elem-264>
+<elem-265>
+<elem-266>
+<elem-267>
+<elem-268>
+<elem-269>
+<elem-270>
+<elem-271>
+<elem-272>
+<elem-273>
+<elem-274>
+<elem-275>
+<elem-276>
+<elem-277>
+<elem-278>
+<elem-279>
+<elem-280>
+<elem-281>
+<elem-282>
+<elem-283>
+<elem-284>
+<elem-285>
+<elem-286>
+<elem-287>
+<elem-288>
+<elem-289>
+<elem-290>
+<elem-291>
+<elem-292>
+<elem-293>
+<elem-294>
+<elem-295>
+<elem-296>
+<elem-297>
+<elem-298>
+<elem-299>
+<elem-300>
+<elem-301>
+<elem-302>
+<elem-303>
+<elem-304>
+<elem-305>
+<elem-306>
+<elem-307>
+<elem-308>
+<elem-309>
+<elem-310>
+<elem-311>
+<elem-312>
+<elem-313>
+<elem-314>
+<elem-315>
+<elem-316>
+<elem-317>
+<elem-318>
+<elem-319>
+<elem-320>
+<elem-321>
+<elem-322>
+<elem-323>
+<elem-324>
+<elem-325>
+<elem-326>
+<elem-327>
+<elem-328>
+<elem-329>
+<elem-330>
+<elem-331>
+<elem-332>
+<elem-333>
+<elem-334>
+<elem-335>
+<elem-336>
+<elem-337>
+<elem-338>
+<elem-339>
+<elem-340>
+<elem-341>
+<elem-342>
+<elem-343>
+<elem-344>
+<elem-345>
+<elem-346>
+<elem-347>
+<elem-348>
+<elem-349>
+<elem-350>
+<elem-351>
+<elem-352>
+<elem-353>
+<elem-354>
+<elem-355>
+<elem-356>
+<elem-357>
+<elem-358>
+<elem-359>
+<elem-360>
+<elem-361>
+<elem-362>
+<elem-363>
+<elem-364>
+<elem-365>
+<elem-366>
+<elem-367>
+<elem-368>
+<elem-369>
+<elem-370>
+<elem-371>
+<elem-372>
+<elem-373>
+<elem-374>
+<elem-375>
+<elem-376>
+<elem-377>
+<elem-378>
+<elem-379>
+<elem-380>
+<elem-381>
+<elem-382>
+<elem-383>
+<elem-384>
+<elem-385>
+<elem-386>
+<elem-387>
+<elem-388>
+<elem-389>
+<elem-390>
+<elem-391>
+<elem-392>
+<elem-393>
+<elem-394>
+<elem-395>
+<elem-396>
+<elem-397>
+<elem-398>
+<elem-399>
+<elem-400>
+<elem-401>
+<elem-402>
+<elem-403>
+<elem-404>
+<elem-405>
+<elem-406>
+<elem-407>
+<elem-408>
+<elem-409>
+<elem-410>
+<elem-411>
+<elem-412>
+<elem-413>
+<elem-414>
+<elem-415>
+<elem-416>
+<elem-417>
+<elem-418>
+<elem-419>
+<elem-420>
+<elem-421>
+<elem-422>
+<elem-423>
+<elem-424>
+<elem-425>
+<elem-426>
+<elem-427>
+<elem-428>
+<elem-429>
+<elem-430>
+<elem-431>
+<elem-432>
+<elem-433>
+<elem-434>
+<elem-435>
+<elem-436>
+<elem-437>
+<elem-438>
+<elem-439>
+<elem-440>
+<elem-441>
+<elem-442>
+<elem-443>
+<elem-444>
+<elem-445>
+<elem-446>
+<elem-447>
+<elem-448>
+<elem-449>
+<elem-450>
+<elem-451>
+<elem-452>
+<elem-453>
+<elem-454>
+<elem-455>
+<elem-456>
+<elem-457>
+<elem-458>
+<elem-459>
+<elem-460>
+<elem-461>
+<elem-462>
+<elem-463>
+<elem-464>
+<elem-465>
+<elem-466>
+<elem-467>
+<elem-468>
+<elem-469>
+<elem-470>
+<elem-471>
+<elem-472>
+<elem-473>
+<elem-474>
+<elem-475>
+<elem-476>
+<elem-477>
+<elem-478>
+<elem-479>
+<elem-480>
+<elem-481>
+<elem-482>
+<elem-483>
+<elem-484>
+<elem-485>
+<elem-486>
+<elem-487>
+<elem-488>
+<elem-489>
+<elem-490>
+<elem-491>
+<elem-492>
+<elem-493>
+<elem-494>
+<elem-495>
+<elem-496>
+<elem-497>
+<elem-498>
+<elem-499>
+<elem-500>
+<elem-501>
+<elem-502>
+<elem-503>
+<elem-504>
+<elem-505>
+<elem-506>
+<elem-507>
+<elem-508>
+<elem-509>
+<elem-510>
+<elem-511>
+<elem-512>
+<elem-513>
+<elem-514>
+<elem-515>
+<elem-516>
+<elem-517>
+<elem-518>
+<elem-519>
+<elem-520>
+<elem-521>
+<elem-522>
+<elem-523>
+<elem-524>
+<elem-525>
+<elem-526>
+<elem-527>
+<elem-528>
+<elem-529>
+<elem-530>
+<elem-531>
+<elem-532>
+<elem-533>
+<elem-534>
+<elem-535>
+<elem-536>
+<elem-537>
+<elem-538>
+<elem-539>
+<elem-540>
+<elem-541>
+<elem-542>
+<elem-543>
+<elem-544>
+<elem-545>
+<elem-546>
+<elem-547>
+<elem-548>
+<elem-549>
+<elem-550>
+<elem-551>
+<elem-552>
+<elem-553>
+<elem-554>
+<elem-555>
+<elem-556>
+<elem-557>
+<elem-558>
+<elem-559>
+<elem-560>
+<elem-561>
+<elem-562>
+<elem-563>
+<elem-564>
+<elem-565>
+<elem-566>
+<elem-567>
+<elem-568>
+<elem-569>
+<elem-570>
+<elem-571>
+<elem-572>
+<elem-573>
+<elem-574>
+<elem-575>
+<elem-576>
+<elem-577>
+<elem-578>
+<elem-579>
+<elem-580>
+<elem-581>
+<elem-582>
+<elem-583>
+<elem-584>
+<elem-585>
+<elem-586>
+<elem-587>
+<elem-588>
+<elem-589>
+<elem-590>
+<elem-591>
+<elem-592>
+<elem-593>
+<elem-594>
+<elem-595>
+<elem-596>
+<elem-597>
+<elem-598>
+<elem-599>
+<elem-600>
+<elem-601>
+<elem-602>
+<elem-603>
+<elem-604>
+<elem-605>
+<elem-606>
+<elem-607>
+<elem-608>
+<elem-609>
+<elem-610>
+<elem-611>
+<elem-612>
+<elem-613>
+<elem-614>
+<elem-615>
+<elem-616>
+<elem-617>
+<elem-618>
+<elem-619>
+<elem-620>
+<elem-621>
+<elem-622>
+<elem-623>
+<elem-624>
+<elem-625>
+<elem-626>
+<elem-627>
+<elem-628>
+<elem-629>
+<elem-630>
+<elem-631>
+<elem-632>
+<elem-633>
+<elem-634>
+<elem-635>
+<elem-636>
+<elem-637>
+<elem-638>
+<elem-639>
+<elem-640>
+<elem-641>
+<elem-642>
+<elem-643>
+<elem-644>
+<elem-645>
+<elem-646>
+<elem-647>
+<elem-648>
+<elem-649>
+<elem-650>
+<elem-651>
+<elem-652>
+<elem-653>
+<elem-654>
+<elem-655>
+<elem-656>
+<elem-657>
+<elem-658>
+<elem-659>
+<elem-660>
+<elem-661>
+<elem-662>
+<elem-663>
+<elem-664>
+<elem-665>
+<elem-666>
+<elem-667>
+<elem-668>
+<elem-669>
+<elem-670>
+<elem-671>
+<elem-672>
+<elem-673>
+<elem-674>
+<elem-675>
+<elem-676>
+<elem-677>
+<elem-678>
+<elem-679>
+<elem-680>
+<elem-681>
+<elem-682>
+<elem-683>
+<elem-684>
+<elem-685>
+<elem-686>
+<elem-687>
+<elem-688>
+<elem-689>
+<elem-690>
+<elem-691>
+<elem-692>
+<elem-693>
+<elem-694>
+<elem-695>
+<elem-696>
+<elem-697>
+<elem-698>
+<elem-699>
+<elem-700>
+<elem-701>
+<elem-702>
+<elem-703>
+<elem-704>
+<elem-705>
+<elem-706>
+<elem-707>
+<elem-708>
+<elem-709>
+<elem-710>
+<elem-711>
+<elem-712>
+<elem-713>
+<elem-714>
+<elem-715>
+<elem-716>
+<elem-717>
+<elem-718>
+<elem-719>
+<elem-720>
+<elem-721>
+<elem-722>
+<elem-723>
+<elem-724>
+<elem-725>
+<elem-726>
+<elem-727>
+<elem-728>
+<elem-729>
+<elem-730>
+<elem-731>
+<elem-732>
+<elem-733>
+<elem-734>
+<elem-735>
+<elem-736>
+<elem-737>
+<elem-738>
+<elem-739>
+<elem-740>
+<elem-741>
+<elem-742>
+<elem-743>
+<elem-744>
+<elem-745>
+<elem-746>
+<elem-747>
+<elem-748>
+<elem-749>
+<elem-750>
+<elem-751>
+<elem-752>
+<elem-753>
+<elem-754>
+<elem-755>
+<elem-756>
+<elem-757>
+<elem-758>
+<elem-759>
+<elem-760>
+<elem-761>
+<elem-762>
+<elem-763>
+<elem-764>
+<elem-765>
+<elem-766>
+<elem-767>
+<elem-768>
+<elem-769>
+<elem-770>
+<elem-771>
+<elem-772>
+<elem-773>
+<elem-774>
+<elem-775>
+<elem-776>
+<elem-777>
+<elem-778>
+<elem-779>
+<elem-780>
+<elem-781>
+<elem-782>
+<elem-783>
+<elem-784>
+<elem-785>
+<elem-786>
+<elem-787>
+<elem-788>
+<elem-789>
+<elem-790>
+<elem-791>
+<elem-792>
+<elem-793>
+<elem-794>
+<elem-795>
+<elem-796>
+<elem-797>
+<elem-798>
+<elem-799>
+<elem-800>
+<elem-801>
+<elem-802>
+<elem-803>
+<elem-804>
+<elem-805>
+<elem-806>
+<elem-807>
+<elem-808>
+<elem-809>
+<elem-810>
+<elem-811>
+<elem-812>
+<elem-813>
+<elem-814>
+<elem-815>
+<elem-816>
+<elem-817>
+<elem-818>
+<elem-819>
+<elem-820>
+<elem-821>
+<elem-822>
+<elem-823>
+<elem-824>
+<elem-825>
+<elem-826>
+<elem-827>
+<elem-828>
+<elem-829>
+<elem-830>
+<elem-831>
+<elem-832>
+<elem-833>
+<elem-834>
+<elem-835>
+<elem-836>
+<elem-837>
+<elem-838>
+<elem-839>
+<elem-840>
+<elem-841>
+<elem-842>
+<elem-843>
+<elem-844>
+<elem-845>
+<elem-846>
+<elem-847>
+<elem-848>
+<elem-849>
+<elem-850>
+<elem-851>
+<elem-852>
+<elem-853>
+<elem-854>
+<elem-855>
+<elem-856>
+<elem-857>
+<elem-858>
+<elem-859>
+<elem-860>
+<elem-861>
+<elem-862>
+<elem-863>
+<elem-864>
+<elem-865>
+<elem-866>
+<elem-867>
+<elem-868>
+<elem-869>
+<elem-870>
+<elem-871>
+<elem-872>
+<elem-873>
+<elem-874>
+<elem-875>
+<elem-876>
+<elem-877>
+<elem-878>
+<elem-879>
+<elem-880>
+<elem-881>
+<elem-882>
+<elem-883>
+<elem-884>
+<elem-885>
+<elem-886>
+<elem-887>
+<elem-888>
+<elem-889>
+<elem-890>
+<elem-891>
+<elem-892>
+<elem-893>
+<elem-894>
+<elem-895>
+<elem-896>
+<elem-897>
+<elem-898>
+<elem-899>
+<elem-900>
+<elem-901>
+<elem-902>
+<elem-903>
+<elem-904>
+<elem-905>
+<elem-906>
+<elem-907>
+<elem-908>
+<elem-909>
+<elem-910>
+<elem-911>
+<elem-912>
+<elem-913>
+<elem-914>
+<elem-915>
+<elem-916>
+<elem-917>
+<elem-918>
+<elem-919>
+<elem-920>
+<elem-921>
+<elem-922>
+<elem-923>
+<elem-924>
+<elem-925>
+<elem-926>
+<elem-927>
+<elem-928>
+<elem-929>
+<elem-930>
+<elem-931>
+<elem-932>
+<elem-933>
+<elem-934>
+<elem-935>
+<elem-936>
+<elem-937>
+<elem-938>
+<elem-939>
+<elem-940>
+<elem-941>
+<elem-942>
+<elem-943>
+<elem-944>
+<elem-945>
+<elem-946>
+<elem-947>
+<elem-948>
+<elem-949>
+<elem-950>
+<elem-951>
+<elem-952>
+<elem-953>
+<elem-954>
+<elem-955>
+<elem-956>
+<elem-957>
+<elem-958>
+<elem-959>
+<elem-960>
+<elem-961>
+<elem-962>
+<elem-963>
+<elem-964>
+<elem-965>
+<elem-966>
+<elem-967>
+<elem-968>
+<elem-969>
+<elem-970>
+<elem-971>
+<elem-972>
+<elem-973>
+<elem-974>
+<elem-975>
+<elem-976>
+<elem-977>
+<elem-978>
+<elem-979>
+<elem-980>
+<elem-981>
+<elem-982>
+<elem-983>
+<elem-984>
+<elem-985>
+<elem-986>
+<elem-987>
+<elem-988>
+<elem-989>
+<elem-990>
+<elem-991>
+<elem-992>
+<elem-993>
+<elem-994>
+<elem-995>
+<elem-996>
+<elem-997>
+<elem-998>
+<elem-999>
+<elem-1000>
+</elem-1000>
+</elem-999>
+</elem-998>
+</elem-997>
+</elem-996>
+</elem-995>
+</elem-994>
+</elem-993>
+</elem-992>
+</elem-991>
+</elem-990>
+</elem-989>
+</elem-988>
+</elem-987>
+</elem-986>
+</elem-985>
+</elem-984>
+</elem-983>
+</elem-982>
+</elem-981>
+</elem-980>
+</elem-979>
+</elem-978>
+</elem-977>
+</elem-976>
+</elem-975>
+</elem-974>
+</elem-973>
+</elem-972>
+</elem-971>
+</elem-970>
+</elem-969>
+</elem-968>
+</elem-967>
+</elem-966>
+</elem-965>
+</elem-964>
+</elem-963>
+</elem-962>
+</elem-961>
+</elem-960>
+</elem-959>
+</elem-958>
+</elem-957>
+</elem-956>
+</elem-955>
+</elem-954>
+</elem-953>
+</elem-952>
+</elem-951>
+</elem-950>
+</elem-949>
+</elem-948>
+</elem-947>
+</elem-946>
+</elem-945>
+</elem-944>
+</elem-943>
+</elem-942>
+</elem-941>
+</elem-940>
+</elem-939>
+</elem-938>
+</elem-937>
+</elem-936>
+</elem-935>
+</elem-934>
+</elem-933>
+</elem-932>
+</elem-931>
+</elem-930>
+</elem-929>
+</elem-928>
+</elem-927>
+</elem-926>
+</elem-925>
+</elem-924>
+</elem-923>
+</elem-922>
+</elem-921>
+</elem-920>
+</elem-919>
+</elem-918>
+</elem-917>
+</elem-916>
+</elem-915>
+</elem-914>
+</elem-913>
+</elem-912>
+</elem-911>
+</elem-910>
+</elem-909>
+</elem-908>
+</elem-907>
+</elem-906>
+</elem-905>
+</elem-904>
+</elem-903>
+</elem-902>
+</elem-901>
+</elem-900>
+</elem-899>
+</elem-898>
+</elem-897>
+</elem-896>
+</elem-895>
+</elem-894>
+</elem-893>
+</elem-892>
+</elem-891>
+</elem-890>
+</elem-889>
+</elem-888>
+</elem-887>
+</elem-886>
+</elem-885>
+</elem-884>
+</elem-883>
+</elem-882>
+</elem-881>
+</elem-880>
+</elem-879>
+</elem-878>
+</elem-877>
+</elem-876>
+</elem-875>
+</elem-874>
+</elem-873>
+</elem-872>
+</elem-871>
+</elem-870>
+</elem-869>
+</elem-868>
+</elem-867>
+</elem-866>
+</elem-865>
+</elem-864>
+</elem-863>
+</elem-862>
+</elem-861>
+</elem-860>
+</elem-859>
+</elem-858>
+</elem-857>
+</elem-856>
+</elem-855>
+</elem-854>
+</elem-853>
+</elem-852>
+</elem-851>
+</elem-850>
+</elem-849>
+</elem-848>
+</elem-847>
+</elem-846>
+</elem-845>
+</elem-844>
+</elem-843>
+</elem-842>
+</elem-841>
+</elem-840>
+</elem-839>
+</elem-838>
+</elem-837>
+</elem-836>
+</elem-835>
+</elem-834>
+</elem-833>
+</elem-832>
+</elem-831>
+</elem-830>
+</elem-829>
+</elem-828>
+</elem-827>
+</elem-826>
+</elem-825>
+</elem-824>
+</elem-823>
+</elem-822>
+</elem-821>
+</elem-820>
+</elem-819>
+</elem-818>
+</elem-817>
+</elem-816>
+</elem-815>
+</elem-814>
+</elem-813>
+</elem-812>
+</elem-811>
+</elem-810>
+</elem-809>
+</elem-808>
+</elem-807>
+</elem-806>
+</elem-805>
+</elem-804>
+</elem-803>
+</elem-802>
+</elem-801>
+</elem-800>
+</elem-799>
+</elem-798>
+</elem-797>
+</elem-796>
+</elem-795>
+</elem-794>
+</elem-793>
+</elem-792>
+</elem-791>
+</elem-790>
+</elem-789>
+</elem-788>
+</elem-787>
+</elem-786>
+</elem-785>
+</elem-784>
+</elem-783>
+</elem-782>
+</elem-781>
+</elem-780>
+</elem-779>
+</elem-778>
+</elem-777>
+</elem-776>
+</elem-775>
+</elem-774>
+</elem-773>
+</elem-772>
+</elem-771>
+</elem-770>
+</elem-769>
+</elem-768>
+</elem-767>
+</elem-766>
+</elem-765>
+</elem-764>
+</elem-763>
+</elem-762>
+</elem-761>
+</elem-760>
+</elem-759>
+</elem-758>
+</elem-757>
+</elem-756>
+</elem-755>
+</elem-754>
+</elem-753>
+</elem-752>
+</elem-751>
+</elem-750>
+</elem-749>
+</elem-748>
+</elem-747>
+</elem-746>
+</elem-745>
+</elem-744>
+</elem-743>
+</elem-742>
+</elem-741>
+</elem-740>
+</elem-739>
+</elem-738>
+</elem-737>
+</elem-736>
+</elem-735>
+</elem-734>
+</elem-733>
+</elem-732>
+</elem-731>
+</elem-730>
+</elem-729>
+</elem-728>
+</elem-727>
+</elem-726>
+</elem-725>
+</elem-724>
+</elem-723>
+</elem-722>
+</elem-721>
+</elem-720>
+</elem-719>
+</elem-718>
+</elem-717>
+</elem-716>
+</elem-715>
+</elem-714>
+</elem-713>
+</elem-712>
+</elem-711>
+</elem-710>
+</elem-709>
+</elem-708>
+</elem-707>
+</elem-706>
+</elem-705>
+</elem-704>
+</elem-703>
+</elem-702>
+</elem-701>
+</elem-700>
+</elem-699>
+</elem-698>
+</elem-697>
+</elem-696>
+</elem-695>
+</elem-694>
+</elem-693>
+</elem-692>
+</elem-691>
+</elem-690>
+</elem-689>
+</elem-688>
+</elem-687>
+</elem-686>
+</elem-685>
+</elem-684>
+</elem-683>
+</elem-682>
+</elem-681>
+</elem-680>
+</elem-679>
+</elem-678>
+</elem-677>
+</elem-676>
+</elem-675>
+</elem-674>
+</elem-673>
+</elem-672>
+</elem-671>
+</elem-670>
+</elem-669>
+</elem-668>
+</elem-667>
+</elem-666>
+</elem-665>
+</elem-664>
+</elem-663>
+</elem-662>
+</elem-661>
+</elem-660>
+</elem-659>
+</elem-658>
+</elem-657>
+</elem-656>
+</elem-655>
+</elem-654>
+</elem-653>
+</elem-652>
+</elem-651>
+</elem-650>
+</elem-649>
+</elem-648>
+</elem-647>
+</elem-646>
+</elem-645>
+</elem-644>
+</elem-643>
+</elem-642>
+</elem-641>
+</elem-640>
+</elem-639>
+</elem-638>
+</elem-637>
+</elem-636>
+</elem-635>
+</elem-634>
+</elem-633>
+</elem-632>
+</elem-631>
+</elem-630>
+</elem-629>
+</elem-628>
+</elem-627>
+</elem-626>
+</elem-625>
+</elem-624>
+</elem-623>
+</elem-622>
+</elem-621>
+</elem-620>
+</elem-619>
+</elem-618>
+</elem-617>
+</elem-616>
+</elem-615>
+</elem-614>
+</elem-613>
+</elem-612>
+</elem-611>
+</elem-610>
+</elem-609>
+</elem-608>
+</elem-607>
+</elem-606>
+</elem-605>
+</elem-604>
+</elem-603>
+</elem-602>
+</elem-601>
+</elem-600>
+</elem-599>
+</elem-598>
+</elem-597>
+</elem-596>
+</elem-595>
+</elem-594>
+</elem-593>
+</elem-592>
+</elem-591>
+</elem-590>
+</elem-589>
+</elem-588>
+</elem-587>
+</elem-586>
+</elem-585>
+</elem-584>
+</elem-583>
+</elem-582>
+</elem-581>
+</elem-580>
+</elem-579>
+</elem-578>
+</elem-577>
+</elem-576>
+</elem-575>
+</elem-574>
+</elem-573>
+</elem-572>
+</elem-571>
+</elem-570>
+</elem-569>
+</elem-568>
+</elem-567>
+</elem-566>
+</elem-565>
+</elem-564>
+</elem-563>
+</elem-562>
+</elem-561>
+</elem-560>
+</elem-559>
+</elem-558>
+</elem-557>
+</elem-556>
+</elem-555>
+</elem-554>
+</elem-553>
+</elem-552>
+</elem-551>
+</elem-550>
+</elem-549>
+</elem-548>
+</elem-547>
+</elem-546>
+</elem-545>
+</elem-544>
+</elem-543>
+</elem-542>
+</elem-541>
+</elem-540>
+</elem-539>
+</elem-538>
+</elem-537>
+</elem-536>
+</elem-535>
+</elem-534>
+</elem-533>
+</elem-532>
+</elem-531>
+</elem-530>
+</elem-529>
+</elem-528>
+</elem-527>
+</elem-526>
+</elem-525>
+</elem-524>
+</elem-523>
+</elem-522>
+</elem-521>
+</elem-520>
+</elem-519>
+</elem-518>
+</elem-517>
+</elem-516>
+</elem-515>
+</elem-514>
+</elem-513>
+</elem-512>
+</elem-511>
+</elem-510>
+</elem-509>
+</elem-508>
+</elem-507>
+</elem-506>
+</elem-505>
+</elem-504>
+</elem-503>
+</elem-502>
+</elem-501>
+</elem-500>
+</elem-499>
+</elem-498>
+</elem-497>
+</elem-496>
+</elem-495>
+</elem-494>
+</elem-493>
+</elem-492>
+</elem-491>
+</elem-490>
+</elem-489>
+</elem-488>
+</elem-487>
+</elem-486>
+</elem-485>
+</elem-484>
+</elem-483>
+</elem-482>
+</elem-481>
+</elem-480>
+</elem-479>
+</elem-478>
+</elem-477>
+</elem-476>
+</elem-475>
+</elem-474>
+</elem-473>
+</elem-472>
+</elem-471>
+</elem-470>
+</elem-469>
+</elem-468>
+</elem-467>
+</elem-466>
+</elem-465>
+</elem-464>
+</elem-463>
+</elem-462>
+</elem-461>
+</elem-460>
+</elem-459>
+</elem-458>
+</elem-457>
+</elem-456>
+</elem-455>
+</elem-454>
+</elem-453>
+</elem-452>
+</elem-451>
+</elem-450>
+</elem-449>
+</elem-448>
+</elem-447>
+</elem-446>
+</elem-445>
+</elem-444>
+</elem-443>
+</elem-442>
+</elem-441>
+</elem-440>
+</elem-439>
+</elem-438>
+</elem-437>
+</elem-436>
+</elem-435>
+</elem-434>
+</elem-433>
+</elem-432>
+</elem-431>
+</elem-430>
+</elem-429>
+</elem-428>
+</elem-427>
+</elem-426>
+</elem-425>
+</elem-424>
+</elem-423>
+</elem-422>
+</elem-421>
+</elem-420>
+</elem-419>
+</elem-418>
+</elem-417>
+</elem-416>
+</elem-415>
+</elem-414>
+</elem-413>
+</elem-412>
+</elem-411>
+</elem-410>
+</elem-409>
+</elem-408>
+</elem-407>
+</elem-406>
+</elem-405>
+</elem-404>
+</elem-403>
+</elem-402>
+</elem-401>
+</elem-400>
+</elem-399>
+</elem-398>
+</elem-397>
+</elem-396>
+</elem-395>
+</elem-394>
+</elem-393>
+</elem-392>
+</elem-391>
+</elem-390>
+</elem-389>
+</elem-388>
+</elem-387>
+</elem-386>
+</elem-385>
+</elem-384>
+</elem-383>
+</elem-382>
+</elem-381>
+</elem-380>
+</elem-379>
+</elem-378>
+</elem-377>
+</elem-376>
+</elem-375>
+</elem-374>
+</elem-373>
+</elem-372>
+</elem-371>
+</elem-370>
+</elem-369>
+</elem-368>
+</elem-367>
+</elem-366>
+</elem-365>
+</elem-364>
+</elem-363>
+</elem-362>
+</elem-361>
+</elem-360>
+</elem-359>
+</elem-358>
+</elem-357>
+</elem-356>
+</elem-355>
+</elem-354>
+</elem-353>
+</elem-352>
+</elem-351>
+</elem-350>
+</elem-349>
+</elem-348>
+</elem-347>
+</elem-346>
+</elem-345>
+</elem-344>
+</elem-343>
+</elem-342>
+</elem-341>
+</elem-340>
+</elem-339>
+</elem-338>
+</elem-337>
+</elem-336>
+</elem-335>
+</elem-334>
+</elem-333>
+</elem-332>
+</elem-331>
+</elem-330>
+</elem-329>
+</elem-328>
+</elem-327>
+</elem-326>
+</elem-325>
+</elem-324>
+</elem-323>
+</elem-322>
+</elem-321>
+</elem-320>
+</elem-319>
+</elem-318>
+</elem-317>
+</elem-316>
+</elem-315>
+</elem-314>
+</elem-313>
+</elem-312>
+</elem-311>
+</elem-310>
+</elem-309>
+</elem-308>
+</elem-307>
+</elem-306>
+</elem-305>
+</elem-304>
+</elem-303>
+</elem-302>
+</elem-301>
+</elem-300>
+</elem-299>
+</elem-298>
+</elem-297>
+</elem-296>
+</elem-295>
+</elem-294>
+</elem-293>
+</elem-292>
+</elem-291>
+</elem-290>
+</elem-289>
+</elem-288>
+</elem-287>
+</elem-286>
+</elem-285>
+</elem-284>
+</elem-283>
+</elem-282>
+</elem-281>
+</elem-280>
+</elem-279>
+</elem-278>
+</elem-277>
+</elem-276>
+</elem-275>
+</elem-274>
+</elem-273>
+</elem-272>
+</elem-271>
+</elem-270>
+</elem-269>
+</elem-268>
+</elem-267>
+</elem-266>
+</elem-265>
+</elem-264>
+</elem-263>
+</elem-262>
+</elem-261>
+</elem-260>
+</elem-259>
+</elem-258>
+</elem-257>
+</elem-256>
+</elem-255>
+</elem-254>
+</elem-253>
+</elem-252>
+</elem-251>
+</elem-250>
+</elem-249>
+</elem-248>
+</elem-247>
+</elem-246>
+</elem-245>
+</elem-244>
+</elem-243>
+</elem-242>
+</elem-241>
+</elem-240>
+</elem-239>
+</elem-238>
+</elem-237>
+</elem-236>
+</elem-235>
+</elem-234>
+</elem-233>
+</elem-232>
+</elem-231>
+</elem-230>
+</elem-229>
+</elem-228>
+</elem-227>
+</elem-226>
+</elem-225>
+</elem-224>
+</elem-223>
+</elem-222>
+</elem-221>
+</elem-220>
+</elem-219>
+</elem-218>
+</elem-217>
+</elem-216>
+</elem-215>
+</elem-214>
+</elem-213>
+</elem-212>
+</elem-211>
+</elem-210>
+</elem-209>
+</elem-208>
+</elem-207>
+</elem-206>
+</elem-205>
+</elem-204>
+</elem-203>
+</elem-202>
+</elem-201>
+</elem-200>
+</elem-199>
+</elem-198>
+</elem-197>
+</elem-196>
+</elem-195>
+</elem-194>
+</elem-193>
+</elem-192>
+</elem-191>
+</elem-190>
+</elem-189>
+</elem-188>
+</elem-187>
+</elem-186>
+</elem-185>
+</elem-184>
+</elem-183>
+</elem-182>
+</elem-181>
+</elem-180>
+</elem-179>
+</elem-178>
+</elem-177>
+</elem-176>
+</elem-175>
+</elem-174>
+</elem-173>
+</elem-172>
+</elem-171>
+</elem-170>
+</elem-169>
+</elem-168>
+</elem-167>
+</elem-166>
+</elem-165>
+</elem-164>
+</elem-163>
+</elem-162>
+</elem-161>
+</elem-160>
+</elem-159>
+</elem-158>
+</elem-157>
+</elem-156>
+</elem-155>
+</elem-154>
+</elem-153>
+</elem-152>
+</elem-151>
+</elem-150>
+</elem-149>
+</elem-148>
+</elem-147>
+</elem-146>
+</elem-145>
+</elem-144>
+</elem-143>
+</elem-142>
+</elem-141>
+</elem-140>
+</elem-139>
+</elem-138>
+</elem-137>
+</elem-136>
+</elem-135>
+</elem-134>
+</elem-133>
+</elem-132>
+</elem-131>
+</elem-130>
+</elem-129>
+</elem-128>
+</elem-127>
+</elem-126>
+</elem-125>
+</elem-124>
+</elem-123>
+</elem-122>
+</elem-121>
+</elem-120>
+</elem-119>
+</elem-118>
+</elem-117>
+</elem-116>
+</elem-115>
+</elem-114>
+</elem-113>
+</elem-112>
+</elem-111>
+</elem-110>
+</elem-109>
+</elem-108>
+</elem-107>
+</elem-106>
+</elem-105>
+</elem-104>
+</elem-103>
+</elem-102>
+</elem-101>
+</elem-100>
+</elem-99>
+</elem-98>
+</elem-97>
+</elem-96>
+</elem-95>
+</elem-94>
+</elem-93>
+</elem-92>
+</elem-91>
+</elem-90>
+</elem-89>
+</elem-88>
+</elem-87>
+</elem-86>
+</elem-85>
+</elem-84>
+</elem-83>
+</elem-82>
+</elem-81>
+</elem-80>
+</elem-79>
+</elem-78>
+</elem-77>
+</elem-76>
+</elem-75>
+</elem-74>
+</elem-73>
+</elem-72>
+</elem-71>
+</elem-70>
+</elem-69>
+</elem-68>
+</elem-67>
+</elem-66>
+</elem-65>
+</elem-64>
+</elem-63>
+</elem-62>
+</elem-61>
+</elem-60>
+</elem-59>
+</elem-58>
+</elem-57>
+</elem-56>
+</elem-55>
+</elem-54>
+</elem-53>
+</elem-52>
+</elem-51>
+</elem-50>
+</elem-49>
+</elem-48>
+</elem-47>
+</elem-46>
+</elem-45>
+</elem-44>
+</elem-43>
+</elem-42>
+</elem-41>
+</elem-40>
+</elem-39>
+</elem-38>
+</elem-37>
+</elem-36>
+</elem-35>
+</elem-34>
+</elem-33>
+</elem-32>
+</elem-31>
+</elem-30>
+</elem-29>
+</elem-28>
+</elem-27>
+</elem-26>
+</elem-25>
+</elem-24>
+</elem-23>
+</elem-22>
+</elem-21>
+</elem-20>
+</elem-19>
+</elem-18>
+</elem-17>
+</elem-16>
+</elem-15>
+</elem-14>
+</elem-13>
+</elem-12>
+</elem-11>
+</elem-10>
+</elem-9>
+</elem-8>
+</elem-7>
+</elem-6>
+</elem-5>
+</elem-4>
+</elem-3>
+</elem-2>
+</elem-1>
+</outer>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestRazorProject.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestRazorProject.cs
new file mode 100644
index 0000000000..1c4faa7b5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestRazorProject.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TestRazorProject : RazorProject
+    {
+        private readonly Dictionary<string, RazorProjectItem> _lookup;
+
+        public TestRazorProject()
+            : this(new RazorProjectItem[0])
+        {
+        }
+
+        public TestRazorProject(IList<RazorProjectItem> items)
+        {
+            _lookup = items.ToDictionary(item => item.FilePath);
+        }
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
+        public override RazorProjectItem GetItem(string path)
+        {
+            return GetItem(path, fileKind: null);
+        }
+
+        public override RazorProjectItem GetItem(string path, string fileKind)
+        {
+            if (!_lookup.TryGetValue(path, out var value))
+            {
+                value = new NotFoundProjectItem("", path, fileKind);
+            }
+
+            return value;
+        }
+
+        public new string NormalizeAndEnsureValidPath(string path) => base.NormalizeAndEnsureValidPath(path);
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/VirtualRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/VirtualRazorProjectFileSystemTest.cs
new file mode 100644
index 0000000000..227ed02e07
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/VirtualRazorProjectFileSystemTest.cs
@@ -0,0 +1,400 @@
+// 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 Xunit;
+using DirectoryNode = Microsoft.AspNetCore.Razor.Language.VirtualRazorProjectFileSystem.DirectoryNode;
+using FileNode = Microsoft.AspNetCore.Razor.Language.VirtualRazorProjectFileSystem.FileNode;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class VirtualRazorProjectFileSystemTest
+    {
+        [Fact]
+        public void GetItem_ReturnsNotFound_IfFileDoesNotExistInRoot()
+        {
+            // Arrange
+            var path = "/root-file.cshtml";
+            var projectSystem = new VirtualRazorProjectFileSystem();
+
+            // Act
+            projectSystem.Add(new TestRazorProjectItem("/different-file.cshtml"));
+            var result = projectSystem.GetItem(path, fileKind: null);
+
+            // Assert
+            Assert.False(result.Exists);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsItemAddedToRoot()
+        {
+            // Arrange
+            var path = "/root-file.cshtml";
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var projectItem = new TestRazorProjectItem(path);
+
+            // Act
+            projectSystem.Add(projectItem);
+            var actual = projectSystem.GetItem(path, fileKind: null);
+
+            // Assert
+            Assert.Same(projectItem, actual);
+        }
+
+        [Theory]
+        [InlineData("/subDirectory/file.cshtml")]
+        [InlineData("/subDirectory/dir2/file.cshtml")]
+        [InlineData("/subDirectory/dir2/dir3/file.cshtml")]
+        public void GetItem_ReturnsItemAddedToNestedDirectory(string path)
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var projectItem = new TestRazorProjectItem(path);
+
+            // Act
+            projectSystem.Add(projectItem);
+            var actual = projectSystem.GetItem(path, fileKind: null);
+
+            // Assert
+            Assert.Same(projectItem, actual);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsNotFound_WhenNestedDirectoryDoesNotExist()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+
+            // Act
+            var actual = projectSystem.GetItem("/subDirectory/dir3/file.cshtml", fileKind: null);
+
+            // Assert
+            Assert.False(actual.Exists);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsNotFound_WhenNestedDirectoryDoesNotExist_AndPeerDirectoryExists()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var projectItem = new TestRazorProjectItem("/subDirectory/dir2/file.cshtml");
+
+            // Act
+            projectSystem.Add(projectItem);
+            var actual = projectSystem.GetItem("/subDirectory/dir3/file.cshtml", fileKind: null);
+
+            // Assert
+            Assert.False(actual.Exists);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsNotFound_WhenFileDoesNotExistInNestedDirectory()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var projectItem = new TestRazorProjectItem("/subDirectory/dir2/file.cshtml");
+
+            // Act
+            projectSystem.Add(projectItem);
+            var actual = projectSystem.GetItem("/subDirectory/dir2/file2.cshtml", fileKind: null);
+
+            // Assert
+            Assert.False(actual.Exists);
+        }
+
+        [Fact]
+        public void EnumerateItems_AtRoot_ReturnsAllFiles()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var file1 = new TestRazorProjectItem("/subDirectory/dir2/file1.cshtml");
+            var file2 = new TestRazorProjectItem("/file2.cshtml");
+            var file3 = new TestRazorProjectItem("/dir3/file3.cshtml");
+            var file4 = new TestRazorProjectItem("/subDirectory/file4.cshtml");
+            projectSystem.Add(file1);
+            projectSystem.Add(file2);
+            projectSystem.Add(file3);
+            projectSystem.Add(file4);
+
+            // Act
+            var result = projectSystem.EnumerateItems("/");
+
+            // Assert
+            Assert.Equal(new[] { file2, file4, file1, file3 }, result);
+        }
+
+        [Fact]
+        public void EnumerateItems_AtSubDirectory_ReturnsAllFilesUnderDirectoryHierarchy()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var file1 = new TestRazorProjectItem("/subDirectory/dir2/file1.cshtml");
+            var file2 = new TestRazorProjectItem("/file2.cshtml");
+            var file3 = new TestRazorProjectItem("/dir3/file3.cshtml");
+            var file4 = new TestRazorProjectItem("/subDirectory/file4.cshtml");
+            projectSystem.Add(file1);
+            projectSystem.Add(file2);
+            projectSystem.Add(file3);
+            projectSystem.Add(file4);
+
+            // Act
+            var result = projectSystem.EnumerateItems("/subDirectory");
+
+            // Assert
+            Assert.Equal(new[] { file4, file1 }, result);
+        }
+
+        [Fact]
+        public void EnumerateItems_WithNoFilesInRoot_ReturnsEmptySequence()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+
+            // Act
+            var result = projectSystem.EnumerateItems("/");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void EnumerateItems_ForNonExistentDirectory_ReturnsEmptySequence()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            projectSystem.Add(new TestRazorProjectItem("/subDirectory/dir2/file1.cshtml"));
+            projectSystem.Add(new TestRazorProjectItem("/file2.cshtml"));
+
+            // Act
+            var result = projectSystem.EnumerateItems("/dir3");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void GetHierarchicalItems_Works()
+        {
+            // Arrange
+            var projectSystem = new VirtualRazorProjectFileSystem();
+            var viewImport1 = new TestRazorProjectItem("/_ViewImports.cshtml");
+            var viewImport2 = new TestRazorProjectItem("/Views/Home/_ViewImports.cshtml");
+            projectSystem.Add(viewImport1);
+            projectSystem.Add(viewImport2);
+
+            // Act
+            var items = projectSystem.FindHierarchicalItems("/", "/Views/Home/Index.cshtml", "_ViewImports.cshtml");
+
+            // Assert
+            Assert.Collection(
+                items,
+                item => Assert.Same(viewImport2, item),
+                item => Assert.False(item.Exists),
+                item => Assert.Same(viewImport1, item));
+        }
+
+        [Fact]
+        public void DirectoryNode_GetDirectory_ReturnsRoot()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+
+            // Act
+            var result = root.GetDirectory("/");
+
+            // Assert
+            Assert.Same(root, result);
+        }
+
+        [Fact]
+        public void DirectoryNode_GetDirectory_ReturnsNull_IfDirectoryDoesNotExist()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+
+            // Act
+            var result = root.GetDirectory("/does-not/exist");
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void DirectoryNode_AddFile_CanAddToRoot()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+            var projectItem = new TestRazorProjectItem("/File.txt");
+
+            // Act
+            root.AddFile(new FileNode("/File.txt", projectItem));
+
+            // Assert
+            Assert.Empty(root.Directories);
+            Assert.Collection(
+                root.Files,
+                file => Assert.Same(projectItem, file.ProjectItem));
+        }
+
+        [Fact]
+        public void DirectoryNode_AddFile_CanAddToNestedDirectory()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+            var projectItem = new TestRazorProjectItem("/Pages/Shared/_Layout.cshtml");
+
+            // Act
+            root.AddFile(new FileNode("/Pages/Shared/_Layout.cshtml", projectItem));
+
+            // Assert
+            Assert.Collection(
+                root.Directories,
+                directory =>
+                {
+                    Assert.Equal("/Pages/", directory.Path);
+                    Assert.Empty(directory.Files);
+
+                    Assert.Collection(
+                        directory.Directories,
+                        subDirectory =>
+                        {
+                            Assert.Equal("/Pages/Shared/", subDirectory.Path);
+                            Assert.Collection(
+                                subDirectory.Files,
+                                file => Assert.Same(projectItem, file.ProjectItem));
+                        });
+                });
+        }
+
+        [Fact]
+        public void DirectoryNode_AddMultipleFiles_ToSameDirectory()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+            var projectItem1 = new TestRazorProjectItem("/Pages/Shared/_Layout.cshtml");
+            var projectItem2 = new TestRazorProjectItem("/Pages/Shared/_Partial.cshtml");
+
+            // Act
+            root.AddFile(new FileNode(projectItem1.FilePath, projectItem1));
+            root.AddFile(new FileNode(projectItem2.FilePath, projectItem2));
+
+            // Assert
+            Assert.Collection(
+                root.Directories,
+                directory =>
+                {
+                    Assert.Equal("/Pages/", directory.Path);
+                    Assert.Empty(directory.Files);
+
+                    Assert.Collection(
+                        directory.Directories,
+                        subDirectory =>
+                        {
+                            Assert.Equal("/Pages/Shared/", subDirectory.Path);
+                            Assert.Collection(
+                                subDirectory.Files,
+                                file => Assert.Same(projectItem1, file.ProjectItem),
+                                file => Assert.Same(projectItem2, file.ProjectItem));
+                        });
+                });
+        }
+
+        [Fact]
+        public void DirectoryNode_AddsFiles_ToSiblingDirectories()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+            var projectItem1 = new TestRazorProjectItem("/Pages/Products/Index.cshtml");
+            var projectItem2 = new TestRazorProjectItem("/Pages/Accounts/About.cshtml");
+
+            // Act
+            root.AddFile(new FileNode(projectItem1.FilePath, projectItem1));
+            root.AddFile(new FileNode(projectItem2.FilePath, projectItem2));
+
+            // Assert
+            Assert.Collection(
+                root.Directories,
+                directory =>
+                {
+                    Assert.Equal("/Pages/", directory.Path);
+                    Assert.Empty(directory.Files);
+
+                    Assert.Collection(
+                        directory.Directories,
+                        subDirectory =>
+                        {
+                            Assert.Equal("/Pages/Products/", subDirectory.Path);
+                            Assert.Collection(
+                                subDirectory.Files,
+                                file => Assert.Same(projectItem1, file.ProjectItem));
+                        },
+                        subDirectory =>
+                        {
+                            Assert.Equal("/Pages/Accounts/", subDirectory.Path);
+                            Assert.Collection(
+                                subDirectory.Files,
+                                file => Assert.Same(projectItem2, file.ProjectItem));
+                        });
+                });
+        }
+
+        [Fact]
+        public void DirectoryNode_GetItem_ReturnsItemAtRoot()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+            var projectItem = new TestRazorProjectItem("/_ViewStart.cshtml");
+            root.AddFile(new FileNode(projectItem.FilePath, projectItem));
+
+            // Act
+            var result = root.GetItem(projectItem.FilePath);
+
+            // Assert
+            Assert.Same(result, projectItem);
+        }
+
+        [Fact]
+        public void DirectoryNode_GetItem_WhenFilePathSharesSameNameAsSiblingDirectory()
+        {
+            // Arrange
+            var root = new DirectoryNode("/");
+            var projectItem1 = new TestRazorProjectItem("/Home.cshtml");
+            var projectItem2 = new TestRazorProjectItem("/Home/About.cshtml");
+            root.AddFile(new FileNode(projectItem1.FilePath, projectItem1));
+            root.AddFile(new FileNode(projectItem2.FilePath, projectItem2));
+
+            // Act
+            var result = root.GetItem(projectItem1.FilePath);
+
+            // Assert
+            Assert.Same(result, projectItem1);
+        }
+
+        [Fact]
+        public void DirectoryNode_GetItem_WhenFileNameIsSameAsDirectoryName()
+        {
+            // Arrange
+            var projectItem1 = new TestRazorProjectItem("/Home/Home.cshtml");
+            var projectItem2 = new TestRazorProjectItem("/Home/About.cshtml");
+            var root = new DirectoryNode("/")
+            {
+                Directories =
+                {
+                    new DirectoryNode("/Home/")
+                    {
+                        Files =
+                        {
+                            new FileNode(projectItem1.FilePath, projectItem1),
+                            new FileNode(projectItem2.FilePath, projectItem2),
+                        }
+                    }
+                },
+            };
+
+            // Act
+            var result = root.GetItem(projectItem1.FilePath);
+
+            // Assert
+            Assert.Same(result, projectItem1);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/xunit.runner.json b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/xunit.runner.json
new file mode 100644
index 0000000000..fcf172c8fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
index 1f0d079cb9..a36a57b983 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs
@@ -13,9 +13,16 @@ namespace Microsoft.AspNetCore.Razor.Language
             var repoRoot = SearchUp(AppContext.BaseDirectory, "global.json");
             var assemblyName = type.Assembly.GetName().Name;
             var projectDirectory = Path.Combine(repoRoot, "src", "Razor", "test", assemblyName);
+            if (!Directory.Exists(projectDirectory) &&
+                string.Equals(assemblyName, "Microsoft.AspNetCore.Razor.Language.Test", StringComparison.Ordinal))
+            {
+                projectDirectory = Path.Combine(repoRoot, "src", "Razor", "test", "RazorLanguage.Test");
+            }
+
             if (!Directory.Exists(projectDirectory))
             {
-                throw new InvalidOperationException($@"Could not locate project directory for type {type.FullName}. Directory probe path: {projectDirectory}.");
+                throw new InvalidOperationException(
+                    $@"Could not locate project directory for type {type.FullName}. Directory probe path: {projectDirectory}.");
             }
 
             return projectDirectory;

From 92e86f9d0231217845eae2ab73fa9f634e8d575e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 16 Apr 2019 11:13:26 -0700
Subject: [PATCH 137/337] Check for TargetFramework in addition to version
 (dotnet/aspnetcore-tooling#428)

* Check for TargetFramework in addition to version

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a4ed82f8232395c0f220b23eaf7f70e2dd3319e3
---
 .../Sdk.Razor.CurrentVersion.targets          |  10 +-
 .../BuildIntegrationTest11.cs                 |  58 ++++++++++
 .../BuildIntrospectionTest.cs                 |  11 --
 .../RestoreTestProjects.csproj                |   1 +
 .../testassets/SimpleMvc11NetFx/Program.cs    |  13 +++
 .../SimpleMvc11NetFx/SimpleMvc11NetFx.csproj  |  19 +++
 .../SimpleMvc11NetFx/Views/Home/Index.cshtml  | 108 ++++++++++++++++++
 .../Views/Shared/_Layout.cshtml               |  71 ++++++++++++
 .../Views/_ViewImports.cshtml                 |   2 +
 .../SimpleMvc11NetFx/Views/_ViewStart.cshtml  |   3 +
 10 files changed, 279 insertions(+), 17 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 70701f7e1a..b0b199856a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -33,14 +33,12 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Resolve the RazorLangVersion based on values imported or TFM. -->
   <PropertyGroup>
     <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
-
-    <!-- Workaround for an older build of DesignTime.targets that requires this property to be available. This can be removed after 16.1 preview 2 insertion -->
-    <_TargetingNETCoreApp30OrLater Condition="'$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
+    <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' >= '3.0'">true</_TargetingNETCoreApp30OrLater>
 
     <!--
       Infer the RazorLangVersion if no value was specified. When adding support for newer target frameworks, list newer language versions first.
     -->
-    <RazorLangVersion Condition="'$(RazorLangVersion)' == '' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">3.0</RazorLangVersion>
+    <RazorLangVersion Condition="'$(RazorLangVersion)' == '' AND '$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
 
     <!--
       In 3.0, we expect RazorLangVersion to either be specified in the template or inferred via TFM. In 2.x, RazorLangVersion is
@@ -53,7 +51,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_Targeting30OrNewerRazorLangVersion Condition="
         '$(RazorLangVersion)' == 'Latest' OR
         '$(RazorLangVersion)' == 'Experimental' OR
-        ('$(RazorLangVersion)' != '' AND '$(RazorLangVersion)' &gt; '2.9')">true</_Targeting30OrNewerRazorLangVersion>
+        ('$(RazorLangVersion)' != '' AND '$(RazorLangVersion)' >= '3.0')">true</_Targeting30OrNewerRazorLangVersion>
   </PropertyGroup>
 
 
@@ -386,7 +384,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- For a 3.0 project, targeting a RazorLangVersion is nearly always an error condition -->
     <Warning Text="Detected Razor language version downgrade. This is typically caused by a reference to the Microsoft.AspNetCore.Razor.Design package. Consider removing this package reference."
       Code="RAZORSDK1006"
-      Condition="'$(_Targeting30OrNewerRazorLangVersion)' != 'true' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'" />
+      Condition="'$(_Targeting30OrNewerRazorLangVersion)' != 'true' AND '$(_TargetingNETCoreApp30OrLater)' == 'true'" />
 
     <FindInList
         List="@(RazorExtension)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
new file mode 100644
index 0000000000..10feba7a43
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -0,0 +1,58 @@
+// 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.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntegrationTest11 : BuildIntegrationTest, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildIntegrationTest11(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc11")]
+        public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects()
+        {
+            var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor");
+            Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc11")]
+        public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects()
+        {
+            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1";
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc11.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.pdb");
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+
+        [InitializeTestProject("SimpleMvc11NetFx")]
+        public async Task RazorSdk_DoesNotBuildViewsForNetFx11Projects()
+        {
+            MSBuildIntegrationTestBase.TargetFramework = "net461";
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.exe");
+            Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.pdb");
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index eb7c93e3ff..9af2bb3753 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -14,17 +14,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
-        [Fact]
-        [InitializeTestProject("SimpleMvc11")]
-        public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects()
-        {
-            var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems");
-
-            Assert.BuildPassed(result);
-            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor");
-            Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
-        }
-
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task RazorSdk_AddsProjectCapabilities()
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 60f70f66ac..59d6a44c00 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -14,6 +14,7 @@
     <ProjectReference Include="..\MvcWithComponents\MvcWithComponents.csproj" />
     <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
     <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
+    <ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
     <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
     <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
     <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
new file mode 100644
index 0000000000..5fbbd9ded7
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc11
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to MVC 1.1
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
new file mode 100644
index 0000000000..b280ec0c9c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC and should not reference local builds of
+    the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.8" />
+  </ItemGroup>
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..2172e5e566
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc11</title>
+
+    <environment names="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment names="Staging,Production">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc11</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2018 - SimpleMvc11</p>
+        </footer>
+    </div>
+
+    <environment names="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment names="Staging,Production">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..6f6d009d40
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using SimpleMvc11NetFx
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

From 2309e56de827fbd9e0742a905a8c89659ac7b3d9 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 16 Apr 2019 20:44:34 -0700
Subject: [PATCH 138/337] Do not split warning message across multiple lines
 (dotnet/aspnetcore-tooling#432)

The newline in the warning messages causes the warning message to appear as two separate warnings in the build output:

Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets(805,5): warning RAZORSDK1004: One or more Razor view or page files were found, but the project is not configured to add Razor support for MVC. The MSBuild property 'AddRazorSupportForMvc' must be set to correctly
Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets(805,5): warning RAZORSDK1004:  compile Razor files that target MVC. For more information, see https://go.microsoft.com/fwlink/?linkid=868374.

This change fixes the warning message to appear as a single warning:

Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets(805,5): warning RAZORSDK1004: One or more Razor view or page files were found, but the project is not configured to add Razor support for MVC. The MSBuild property 'AddRazorSupportForMvc' must be set to correctly compile Razor files that target MVC. For more information, see https://go.microsoft.com/fwlink/?linkid=868374.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/373bf2b74fa04bd97eee940a04b391dc2b7f67ca
---
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index b0b199856a..15d1fb8165 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -802,8 +802,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       '$(_IsTargetingRazor2X)' != 'true'">
     <Warning
        Code="RAZORSDK1004"
-       Text="One or more Razor view or page files were found, but the project is not configured to add Razor support for MVC. The MSBuild property 'AddRazorSupportForMvc' must be set to correctly
- compile Razor files that target MVC. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
+       Text="One or more Razor view or page files were found, but the project is not configured to add Razor support for MVC. The MSBuild property 'AddRazorSupportForMvc' must be set to correctly compile Razor files that target MVC. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
   </Target>
 
   <Target Name="_CheckForIncorrectComponentsConfiguration"
@@ -814,8 +813,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <Warning
        Code="RAZORSDK1005"
-       Text="One or more Razor component files (.razor) were found, but the project is not configured to compile Razor Components. Configure the project by targeting RazorLangVersion 3.0 or newer.
- For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
+       Text="One or more Razor component files (.razor) were found, but the project is not configured to compile Razor Components. Configure the project by targeting RazorLangVersion 3.0 or newer. For more information, see https://go.microsoft.com/fwlink/?linkid=868374." />
   </Target>
 
   <Target Name="_ResolveRazorTargetPath">

From dd5dac97e52178a1e43bc6661547fdba12f60a33 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2019 16:16:34 +0000
Subject: [PATCH 139/337] [master] Update dependencies from aspnet/Extensions
 (dotnet/aspnetcore-tooling#409)

* Update dependencies from https://github.com/aspnet/Extensions build 20190410.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19210.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19210.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.Logging - 3.0.0-preview5.19210.2

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)

* Try a coherent SDK and Runtime

* Try again

* Fix codecheck

* Update dependencies from https://github.com/aspnet/Extensions build 20190410.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19210.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19210.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.Logging - 3.0.0-preview5.19210.2

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)

* Try again

* Update dependencies from https://github.com/aspnet/Extensions build 20190410.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19210.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19210.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19210.2
- Microsoft.Extensions.Logging - 3.0.0-preview5.19210.2

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19208.5 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190412.9

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19212.9
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19212.9
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19212.9
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19212.9
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19212.9
- Microsoft.Extensions.Logging - 3.0.0-preview5.19212.9

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19211.22 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19211.22 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19211.22 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190413.4

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19213.4
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19213.4
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19213.4
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19213.4
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19213.4
- Microsoft.Extensions.Logging - 3.0.0-preview5.19213.4

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19212.14 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190414.1

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19214.1
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19214.1
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19214.1
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19214.1
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19214.1
- Microsoft.Extensions.Logging - 3.0.0-preview5.19214.1

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19212.14 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging)

* Restore with the appropriate RuntimeFrameworkVersion before building or publishing

* Fix incremental test

* Update dependencies from https://github.com/aspnet/Extensions build 20190416.8

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19216.8
- Microsoft.AspNetCore.Testing - 3.0.0-preview5.19216.8
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19216.8
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19216.8
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19216.8
- Microsoft.Extensions.Logging - 3.0.0-preview5.19216.8

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19215.16 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging)
- System.Text.Encodings.Web - 4.6.0-preview5.19215.16 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-preview5.19215.16 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging)
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f9c222d3055cb383b682334dbf2c71ad23d713be
---
 .../BuildIncrementalismTest.cs                |  4 ++--
 .../MSBuildIntegrationTestBase.cs             | 20 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index fb0a5f0abe..31c67f5acc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var thumbprintLookup = new Dictionary<string, FileThumbPrint>();
 
             // Act 1
-            var result = await DotnetMSBuild("Build");
+            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
 
             var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
             var filesToIgnore = new[]
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // We want to make sure nothing changed between multiple incremental builds.
                 using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
                 {
-                    result = await DotnetMSBuild("Build");
+                    result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
                 }
 
                 Assert.BuildPassed(result);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index 4803f4d46d..dd6c6e71b2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -60,7 +60,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             bool suppressTimeout = false,
             bool suppressBuildServer = false,
             string buildServerPipeName = null,
-            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
+            bool runRestoreBeforeBuildOrPublish = true)
         {
             var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
             var buildArgumentList = new List<string>
@@ -82,8 +83,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             if (!string.IsNullOrEmpty(target))
             {
+                // Restore before build or publish
+                if (runRestoreBeforeBuildOrPublish &&
+                    (string.Equals("Build", target, StringComparison.OrdinalIgnoreCase)
+                        || string.Equals("Publish", target, StringComparison.OrdinalIgnoreCase)))
+                {
+                    buildArgumentList.Add($"/t:Restore");
+                }
+
                 buildArgumentList.Add($"/t:{target}");
             }
+            else
+            {
+                // By default, restore then build
+                if (runRestoreBeforeBuildOrPublish)
+                {
+                    buildArgumentList.Add($"/t:Restore");
+                }
+                buildArgumentList.Add($"/t:Build");
+            }
 
             buildArgumentList.Add($"/p:Configuration={Configuration} {args}");
             var buildArguments = string.Join(" ", buildArgumentList);

From 956606ee5d3270c364e9fbaf20e94c488c5156ce Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 19 Apr 2019 10:06:13 -0700
Subject: [PATCH 140/337] Fix TypeInference code gen for non-generic parameter
 (dotnet/aspnetcore-tooling#433)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/4233bc593c9b0685deb591f314969482159b141e
---
 .../src/Components/ComponentNodeWriter.cs     | 15 +++-
 .../ComponentCodeGenerationTestBase.cs        | 41 ++++++++++
 .../TestComponent.codegen.cs                  | 80 +++++++++++++++++++
 .../TestComponent.ir.txt                      | 34 ++++++++
 .../TestComponent.mappings.txt                | 24 ++++++
 .../TestComponent.codegen.cs                  | 44 ++++++++++
 .../TestComponent.ir.txt                      | 21 +++++
 .../TestComponent.mappings.txt                |  9 +++
 8 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index 0de9d18a89..0629f7dc69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -182,16 +182,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 var p = new List<(string seqName, string typeName, string parameterName)>();
                 foreach (var attribute in node.Component.Attributes)
                 {
-                    p.Add(($"__seq{p.Count}", attribute.TypeName, $"__arg{p.Count}"));
+                    var typeName = attribute.TypeName;
+                    if (attribute.BoundAttribute != null && !attribute.BoundAttribute.IsGenericTypedProperty())
+                    {
+                        typeName = "global::" + typeName;
+                    }
+                    p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
                 }
 
                 foreach (var childContent in node.Component.ChildContents)
                 {
-                    p.Add(($"__seq{p.Count}", childContent.TypeName, $"__arg{p.Count}"));
+                    var typeName = childContent.TypeName;
+                    if (childContent.BoundAttribute != null && !childContent.BoundAttribute.IsGenericTypedProperty())
+                    {
+                        typeName = "global::" + typeName;
+                    }
+                    p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
                 }
 
                 foreach (var capture in node.Component.Captures)
                 {
+                    // The capture type name should already contain the global:: prefix.
                     p.Add(($"__seq{p.Count}", capture.TypeName, $"__arg{p.Count}"));
                 }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 41e534523a..43381c1a29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2788,6 +2788,47 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void GenericComponent_NonGenericParameter_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+using Test.Shared;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+        [Parameter] MyClass Foo { get; set; }
+    }
+}
+
+namespace Test.Shared
+{
+    public class MyClass
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test.Shared
+<MyComponent Item=""3"" Foo=""@Hello"" />
+
+@functions {
+    MyClass Hello = new MyClass();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Ref
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..467b5e6fc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,80 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test.Shared;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            Hello
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    MyClass Hello = new MyClass();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "Foo", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..36a1b2e204
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Test.Shared
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (18:0,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (18:0,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (20:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Hello
+                HtmlContent - (57:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (57:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (112:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (112:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyClass Hello = new MyClass();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ccc603195e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test.Shared|
+Generated Location: (320:12,0 [17] )
+|using Test.Shared|
+
+Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1095:32,19 [1] )
+|3|
+
+Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|Hello|
+Generated Location: (1266:40,28 [5] )
+|Hello|
+
+Source Location: (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    MyClass Hello = new MyClass();
+|
+Generated Location: (1620:57,12 [38] )
+|
+    MyClass Hello = new MyClass();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4595839aa7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    using Test.Shared;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 3, 2, Hello);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    MyClass Hello = new MyClass();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "Foo", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..a827ee32c7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Test.Shared
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (20:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Hello
+            CSharpCode - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyClass Hello = new MyClass();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..31ad391b84
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    MyClass Hello = new MyClass();
+|
+Generated Location: (764:21,12 [38] )
+|
+    MyClass Hello = new MyClass();
+|
+

From 43824a4c1270dc24ae4dc28387e87008dbb6fef6 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 22 Apr 2019 14:43:13 -0700
Subject: [PATCH 141/337]  Verify line pragmas on generated code
 (dotnet/aspnetcore-tooling#392)

* Verify line pragmas on generated code
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ca33b2d51be1b83f34f7de3fe6d4f6793c342633
---
 .../CodeGenerationIntegrationTest.cs          | 45 +++++++++++++
 .../BasicComponent_DesignTime.codegen.cs      |  4 +-
 .../BasicComponent_DesignTime.mappings.txt    |  6 +-
 .../BasicComponent_Runtime.codegen.cs         | 20 +++++-
 .../CodeGeneration/CodeRenderingContext.cs    |  5 +-
 .../CodeGeneration/CodeWriterExtensions.cs    | 25 ++++++--
 .../DefaultCodeRenderingContext.cs            | 11 +++-
 .../CodeGeneration/DefaultDocumentWriter.cs   |  4 +-
 .../src/CodeGeneration/LinePragma.cs          | 63 ++++++++++++++++++
 .../ComponentDesignTimeNodeWriter.cs          | 54 +++-------------
 .../Components/ComponentRuntimeNodeWriter.cs  | 60 +++++++++++++----
 .../src/DefaultRazorCSharpDocument.cs         |  8 ++-
 .../src/RazorCSharpDocument.cs                | 10 ++-
 .../CodeGenerationIntegrationTest.cs          |  2 +
 .../ExtensibleDirectiveTest.cs                |  1 +
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../Regression_784/TestComponent.codegen.cs   | 14 +++-
 .../Regression_784/TestComponent.mappings.txt |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 30 ++++++++-
 .../TestComponent.codegen.cs                  |  8 ++-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  8 ++-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  | 30 ++++++++-
 .../TestComponent.codegen.cs                  | 38 ++++++++++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 30 ++++++++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 28 +++++++-
 .../ComponentImports/_Imports.codegen.cs      | 26 +++++++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 18 +++++-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  | 16 ++++-
 .../TestComponent.codegen.cs                  | 16 ++++-
 .../TestComponent.codegen.cs                  |  8 ++-
 .../TestComponent.codegen.cs                  | 16 ++++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 26 +++++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  |  8 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 30 ++++++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 20 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 29 ++++++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 29 ++++++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 19 +++++-
 .../TestComponent.mappings.txt                |  2 +-
 .../Regression_597/TestComponent.codegen.cs   | 10 ++-
 .../Regression_597/TestComponent.mappings.txt |  2 +-
 .../Regression_609/TestComponent.codegen.cs   | 20 +++++-
 .../Regression_609/TestComponent.mappings.txt |  2 +-
 .../Regression_784/TestComponent.codegen.cs   | 20 +++++-
 .../Regression_784/TestComponent.mappings.txt |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.codegen.cs                  | 10 ++-
 .../TestComponent.mappings.txt                |  2 +-
 .../IntegrationTests/IntegrationTestBase.cs   | 64 +++++++++++++++++++
 .../RazorBaselineIntegrationTestBase.cs       | 61 ++++++++++++++++++
 .../SourceMappingsSerializer.cs               |  1 -
 237 files changed, 1973 insertions(+), 368 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LinePragma.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 05d14e1184..3f22db3670 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -42,6 +42,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
 
             var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
             Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
@@ -59,6 +60,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
             Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
@@ -82,6 +84,7 @@ public class MyService<TModel>
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
 
             // We expect this test to generate a bunch of errors.
             Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
@@ -116,6 +119,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -148,6 +152,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -162,6 +167,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
             Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
@@ -179,6 +185,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -193,6 +200,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -216,6 +224,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -230,6 +239,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -251,6 +261,7 @@ public class MyApp
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -281,6 +292,7 @@ public class MyApp
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -312,6 +324,7 @@ public class MyService<TModel>
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -327,6 +340,7 @@ public class MyService<TModel>
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
 
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -350,6 +364,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -371,6 +386,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -385,6 +401,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -406,6 +423,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -420,6 +438,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -434,6 +453,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -464,6 +484,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
         [Fact]
@@ -478,6 +499,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
             Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
@@ -498,6 +520,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
 
             var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
@@ -516,6 +539,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
@@ -540,6 +564,7 @@ public class MyService<TModel>
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
 
             // We expect this test to generate a bunch of errors.
@@ -575,6 +600,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -609,6 +635,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -624,6 +651,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
@@ -642,6 +670,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -657,6 +686,7 @@ public class MyModel
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -681,6 +711,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -696,6 +727,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -718,6 +750,7 @@ public class MyApp
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -749,6 +782,7 @@ public class MyApp
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -781,6 +815,7 @@ public class MyService<TModel>
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -796,6 +831,7 @@ public class MyService<TModel>
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -817,6 +853,7 @@ public class ThisShouldBeGenerated
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
@@ -844,6 +881,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -866,6 +904,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -881,6 +920,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -903,6 +943,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -918,6 +959,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -933,6 +975,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -964,6 +1007,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
@@ -979,6 +1023,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
 
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 054b128eb5..fc6dd7e603 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -30,13 +30,15 @@ IDisposable __typeHelper = default(IDisposable);
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
+            __o = 
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
-       __o = this.ToString();
+             this.ToString()
 
 #line default
 #line hidden
 #nullable disable
+            ;
 #nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
 __o = string.Format("{0}", "Hello");
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index aff2ce3f1b..c505557cd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (641:17,0 [11] )
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1231:34,13 [15] )
+Generated Location: (1251:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1414:41,6 [29] )
+Generated Location: (1448:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1666:50,12 [37] )
+Generated Location: (1700:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 5165db1451..8408389b50 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -15,9 +15,25 @@ namespace __GeneratedComponent
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "class", this.ToString());
+            builder.AddAttribute(1, "class", 
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+             this.ToString()
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(2, "\r\n    Hello world\r\n    ");
-            builder.AddContent(3, string.Format("{0}", "Hello"));
+            builder.AddContent(3, 
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
+     string.Format("{0}", "Hello")
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(4, "\r\n");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs
index f726e2ad4b..d144558bb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeRenderingContext.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
@@ -40,5 +39,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
         public abstract void RenderChildren(IntermediateNode node);
 
         public abstract void RenderChildren(IntermediateNode node, IntermediateNodeWriter writer);
+
+        public virtual void AddLinePragma(LinePragma linePragma)
+        {
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
index 4f9c78d526..a97b2f02c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -448,7 +448,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 return NullDisposable.Default;
             }
 
-            return new LinePragmaWriter(writer, span.Value, context.Options);
+            return new LinePragmaWriter(writer, span.Value, context);
         }
 
         private static void WriteVerbatimStringLiteral(CodeWriter writer, string literal)
@@ -596,13 +596,16 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
         private class LinePragmaWriter : IDisposable
         {
             private readonly CodeWriter _writer;
-            private readonly RazorCodeGenerationOptions _codeGenerationOptions;
+            private readonly CodeRenderingContext _context;
             private readonly int _startIndent;
+            private readonly int _sourceLineIndex;
+            private readonly int _startLineIndex;
+            private readonly string _sourceFilePath;
 
             public LinePragmaWriter(
                 CodeWriter writer, 
                 SourceSpan span,
-                RazorCodeGenerationOptions codeGenerationOptions)
+                CodeRenderingContext context)
             {
                 if (writer == null)
                 {
@@ -610,11 +613,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 }
 
                 _writer = writer;
-                _codeGenerationOptions = codeGenerationOptions;
+                _context = context;
                 _startIndent = _writer.CurrentIndent;
+                _sourceFilePath = span.FilePath;
+                _sourceLineIndex = span.LineIndex;
                 _writer.CurrentIndent = 0;
 
-                if (!_codeGenerationOptions.SuppressNullabilityEnforcement)
+                if (!_context.Options.SuppressNullabilityEnforcement)
                 {
                     var endsWithNewline = _writer.Length > 0 && _writer[_writer.Length - 1] == '\n';
                     if (!endsWithNewline)
@@ -625,6 +630,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 }
 
                 WriteLineNumberDirective(writer, span);
+
+                // Capture the line index after writing the #line directive.
+                _startLineIndex = writer.Location.LineIndex;
             }
 
             public void Dispose()
@@ -642,16 +650,21 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                     _writer.WriteLine();
                 }
 
+                var lineCount = _writer.Location.LineIndex - _startLineIndex;
+                var linePragma = new LinePragma(_sourceLineIndex, lineCount, _sourceFilePath);
+                _context.AddLinePragma(linePragma);
+
                 _writer
                     .WriteLine("#line default")
                     .WriteLine("#line hidden");
 
-                if (!_codeGenerationOptions.SuppressNullabilityEnforcement)
+                if (!_context.Options.SuppressNullabilityEnforcement)
                 {
                     _writer.WriteLine("#nullable disable");
                 }
 
                 _writer.CurrentIndent = _startIndent;
+
             }
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs
index 848d344c3e..afb717391a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultCodeRenderingContext.cs
@@ -1,5 +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;
@@ -56,6 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             Diagnostics = new RazorDiagnosticCollection();
             Items = new ItemCollection();
             SourceMappings = new List<SourceMapping>();
+            LinePragmas = new List<LinePragma>();
 
             var diagnostics = _documentNode.GetAllDiagnostics();
             for (var i = 0; i < diagnostics.Count; i++)
@@ -94,6 +94,8 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
 
         public List<SourceMapping> SourceMappings { get; }
 
+        internal List<LinePragma> LinePragmas { get; }
+
         public override IntermediateNodeWriter NodeWriter => Current.Writer;
 
         public override RazorCodeGenerationOptions Options { get; }
@@ -200,6 +202,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             _scopes.RemoveAt(_scopes.Count - 1);
         }
 
+        public override void AddLinePragma(LinePragma linePragma)
+        {
+            LinePragmas.Add(linePragma);
+        }
+
         private struct ScopeInternal
         {
             public ScopeInternal(IntermediateNodeWriter writer)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
index 8a6865f7ed..d6fb6742da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
@@ -47,7 +46,8 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 cSharp,
                 _options,
                 context.Diagnostics.ToArray(),
-                context.SourceMappings.ToArray());
+                context.SourceMappings.ToArray(),
+                context.LinePragmas.ToArray());
         }
 
         private class Visitor : IntermediateNodeVisitor
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LinePragma.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LinePragma.cs
new file mode 100644
index 0000000000..70ce098758
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/LinePragma.cs
@@ -0,0 +1,63 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
+{
+    public readonly struct LinePragma : IEquatable<LinePragma>
+    {
+        public LinePragma(int startLineIndex, int lineCount, string filePath)
+        {
+            if (startLineIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(startLineIndex));
+            }
+
+            if (lineCount < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(lineCount));
+            }
+
+            StartLineIndex = startLineIndex;
+            LineCount = lineCount;
+            FilePath = filePath;
+        }
+
+        public int StartLineIndex { get; }
+
+        public int EndLineIndex => StartLineIndex + LineCount;
+
+        public int LineCount { get; }
+
+        public string FilePath { get; }
+
+        public override bool Equals(object obj)
+        {
+            return obj is LinePragma other ? Equals(other) : false;
+        }
+
+        public bool Equals(LinePragma other)
+        {
+            return StartLineIndex == other.StartLineIndex &&
+                LineCount == other.LineCount &&
+                string.Equals(FilePath, other.FilePath, StringComparison.Ordinal);
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = HashCodeCombiner.Start();
+            hash.Add(StartLineIndex);
+            hash.Add(LineCount);
+            hash.Add(FilePath);
+            return hash;
+        }
+
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.CurrentCulture, "Line index {0}, Count {1} - {2}", StartLineIndex, LineCount, FilePath);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 648c958d8f..f18235f463 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -244,54 +244,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            var firstChild = node.Children[0];
-            if (firstChild.Source != null)
+            context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
+            for (var i = 0; i < node.Children.Count; i++)
             {
-                using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value, context))
+                if (node.Children[i] is IntermediateToken token && token.IsCSharp)
                 {
-                    var offset = DesignTimeVariable.Length + " = ".Length;
-                    context.CodeWriter.WritePadding(offset, firstChild.Source, context);
-                    context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
-
-                    for (var i = 0; i < node.Children.Count; i++)
-                    {
-                        if (node.Children[i] is IntermediateToken token && token.IsCSharp)
-                        {
-                            context.AddSourceMappingFor(token);
-                            context.CodeWriter.Write(token.Content);
-                        }
-                        else
-                        {
-                            // There may be something else inside the expression like a Template or another extension node.
-                            context.RenderNode(node.Children[i]);
-                        }
-                    }
-
-                    context.CodeWriter.WriteLine(";");
+                    WriteCSharpToken(context, token);
+                }
+                else
+                {
+                    // There may be something else inside the expression like a Template or another extension node.
+                    context.RenderNode(node.Children[i]);
                 }
             }
-            else
-            {
-                context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
-                for (var i = 0; i < node.Children.Count; i++)
-                {
-                    if (node.Children[i] is IntermediateToken token && token.IsCSharp)
-                    {
-                        if (token.Source != null)
-                        {
-                            context.AddSourceMappingFor(token);
-                        }
-
-                        context.CodeWriter.Write(token.Content);
-                    }
-                    else
-                    {
-                        // There may be something else inside the expression like a Template or another extension node.
-                        context.RenderNode(node.Children[i]);
-                    }
-                }
-                context.CodeWriter.WriteLine(";");
-            }
+            context.CodeWriter.WriteLine(";");
         }
 
         public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 72e18f24cc..83d1c2941f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 if (node.Children[i] is IntermediateToken token && token.IsCSharp)
                 {
-                    context.CodeWriter.Write(token.Content);
+                    WriteCSharpToken(context, token);
                 }
                 else
                 {
@@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Debug.Assert(_currentAttributeValues.Count == 0);
             context.RenderChildren(node);
 
-            WriteAttribute(context.CodeWriter, node.AttributeName, _currentAttributeValues);
+            WriteAttribute(context, node.AttributeName, _currentAttributeValues);
             _currentAttributeValues.Clear();
         }
 
@@ -282,7 +282,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(node));
             }
 
-            context.CodeWriter.WriteUsing(node.Content, endLine: true);
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
+                {
+                    context.CodeWriter.WriteUsing(node.Content);
+                }
+            }
+            else
+            {
+                context.CodeWriter.WriteUsing(node.Content, endLine: true);
+            }
         }
 
         public override void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node)
@@ -481,7 +491,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                     for (var i = 0; i < tokens.Count; i++)
                     {
-                        context.CodeWriter.Write(tokens[i].Content);
+                        WriteCSharpToken(context, tokens[i]);
                     }
 
                     if (canTypeCheck)
@@ -520,7 +530,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                     for (var i = 0; i < tokens.Count; i++)
                     {
-                        context.CodeWriter.Write(tokens[i].Content);
+                        WriteCSharpToken(context, tokens[i]);
                     }
 
                     context.CodeWriter.Write(")");
@@ -543,7 +553,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                     for (var i = 0; i < tokens.Count; i++)
                     {
-                        context.CodeWriter.Write(tokens[i].Content);
+                        WriteCSharpToken(context, tokens[i]);
                     }
 
                     if (canTypeCheck && NeedsTypeCheck(node))
@@ -690,11 +700,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
         
-        private void WriteAttribute(CodeWriter codeWriter, string key, IList<IntermediateToken> value)
+        private void WriteAttribute(CodeRenderingContext context, string key, IList<IntermediateToken> value)
         {
-            BeginWriteAttribute(codeWriter, key);
-            WriteAttributeValue(codeWriter, value);
-            codeWriter.WriteEndMethodInvocation();
+            BeginWriteAttribute(context.CodeWriter, key);
+            WriteAttributeValue(context, value);
+            context.CodeWriter.WriteEndMethodInvocation();
         }
 
         protected override void BeginWriteAttribute(CodeWriter codeWriter, string key)
@@ -726,13 +736,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         // Only the mixed case is complicated, we want to turn it into code that will concatenate
         // the values into a string at runtime.
 
-        private static void WriteAttributeValue(CodeWriter writer, IList<IntermediateToken> tokens)
+        private static void WriteAttributeValue(CodeRenderingContext context, IList<IntermediateToken> tokens)
         {
             if (tokens == null)
             {
                 throw new ArgumentNullException(nameof(tokens));
             }
 
+            var writer = context.CodeWriter;
             var hasHtml = false;
             var hasCSharp = false;
             for (var i = 0; i < tokens.Count; i++)
@@ -770,7 +781,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                             insideCSharp = true;
                         }
 
-                        writer.Write(token.Content);
+                        WriteCSharpToken(context, token);
                     }
                     else
                     {
@@ -796,7 +807,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             else if (hasCSharp)
             {
-                writer.Write(string.Join("", tokens.Select(t => t.Content)));
+                foreach (var token in tokens)
+                {
+                    WriteCSharpToken(context, token);
+                }
             }
             else if (hasHtml)
             {
@@ -808,5 +822,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 writer.Write("true");
             }
         }
+
+        private static void WriteCSharpToken(CodeRenderingContext context, IntermediateToken token)
+        {
+            if (string.IsNullOrWhiteSpace(token.Content))
+            {
+                return;
+            }
+
+            if (token.Source?.FilePath == null)
+            {
+                context.CodeWriter.Write(token.Content);
+                return;
+            }
+
+            using (context.CodeWriter.BuildLinePragma(token.Source, context))
+            {
+                context.CodeWriter.WritePadding(0, token.Source.Value, context);
+                context.CodeWriter.Write(token.Content);
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs
index cae8cfb69d..4cc1711985 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpDocument.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -11,13 +12,15 @@ namespace Microsoft.AspNetCore.Razor.Language
         private readonly string _generatedCode;
         private readonly RazorDiagnostic[] _diagnostics;
         private readonly SourceMapping[] _sourceMappings;
+        private readonly LinePragma[] _linePragmas;
         private readonly RazorCodeGenerationOptions _options;
 
         public DefaultRazorCSharpDocument(
             string generatedCode,
             RazorCodeGenerationOptions options,
             RazorDiagnostic[] diagnostics,
-            SourceMapping[] sourceMappings)
+            SourceMapping[] sourceMappings,
+            LinePragma[] linePragmas)
         {
             if (generatedCode == null)
             {
@@ -34,6 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             _diagnostics = diagnostics ?? Array.Empty<RazorDiagnostic>();
             _sourceMappings = sourceMappings ?? Array.Empty<SourceMapping>();
+            _linePragmas = linePragmas ?? Array.Empty<LinePragma>();
         }
 
         public override IReadOnlyList<RazorDiagnostic> Diagnostics => _diagnostics;
@@ -42,6 +46,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override IReadOnlyList<SourceMapping> SourceMappings => _sourceMappings;
 
+        internal override IReadOnlyList<LinePragma> LinePragmas => _linePragmas;
+
         public override RazorCodeGenerationOptions Options => _options;
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs
index bfaa53b719..d7ff5fb66c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCSharpDocument.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -17,6 +18,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract RazorCodeGenerationOptions Options { get; }
 
+        internal virtual IReadOnlyList<LinePragma> LinePragmas { get; }
+
         public static RazorCSharpDocument Create(string generatedCode, RazorCodeGenerationOptions options, IEnumerable<RazorDiagnostic> diagnostics)
         {
             if (generatedCode == null)
@@ -34,14 +37,15 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(diagnostics));
             }
 
-            return new DefaultRazorCSharpDocument(generatedCode, options, diagnostics.ToArray(), sourceMappings: null);
+            return new DefaultRazorCSharpDocument(generatedCode, options, diagnostics.ToArray(), sourceMappings: null, linePragmas: null);
         }
 
         public static RazorCSharpDocument Create(
             string generatedCode,
             RazorCodeGenerationOptions options,
             IEnumerable<RazorDiagnostic> diagnostics,
-            IEnumerable<SourceMapping> sourceMappings)
+            IEnumerable<SourceMapping> sourceMappings,
+            IEnumerable<LinePragma> linePragmas)
         {
             if (generatedCode == null)
             {
@@ -63,7 +67,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(sourceMappings));
             }
 
-            return new DefaultRazorCSharpDocument(generatedCode, options, diagnostics.ToArray(), sourceMappings.ToArray());
+            return new DefaultRazorCSharpDocument(generatedCode, options, diagnostics.ToArray(), sourceMappings.ToArray(), linePragmas.ToArray());
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 5faa8cfbbc..578a52740f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -979,6 +979,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
             AssertSourceMappingsMatchBaseline(codeDocument);
+            AssertLinePragmas(codeDocument, designTime: true);
         }
 
         private void RunTimeTest()
@@ -1002,6 +1003,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             // Assert
             AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+            AssertLinePragmas(codeDocument, designTime: false);
         }
 
         private void RunRuntimeTagHelpersTest(IEnumerable<TagHelperDescriptor> descriptors)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs
index 11bfe9793e..924d143593 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ExtensibleDirectiveTest.cs
@@ -32,6 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             // Assert
             AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
             AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+            AssertLinePragmas(codeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(codeDocument);
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 7b9e5c6721..af8a3beb9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -26,7 +26,15 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async (e) => await Task.Delay(10));
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  async (e) => await Task.Delay(10)
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index da693d568e..c5f558697a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1024:28,135 [33] )
+Generated Location: (1114:31,18 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 890869b955..c09bfd39b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -26,7 +26,15 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 3535131bb7..17c648438c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1024:28,135 [7] )
+Generated Location: (1113:31,17 [7] )
 |OnClick|
 
 Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1166:33,12 [91] )
+Generated Location: (1319:41,12 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 4fd3f9c3fa..689daabc69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -26,7 +26,15 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async () => await Task.Delay(10));
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  async () => await Task.Delay(10)
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index 5e145c5d5f..8fb2db7b1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1024:28,135 [32] )
+Generated Location: (1114:31,18 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 473b76e707..dd3bd717fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -26,7 +26,15 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 77307d3ca3..7853aada67 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1024:28,135 [7] )
+Generated Location: (1113:31,17 [7] )
 |OnClick|
 
 Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1166:33,12 [73] )
+Generated Location: (1319:41,12 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index df36edafe1..f86a75020b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd");
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                         CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd");
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index eb70c72849..f02cd47db4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (844:22,71 [11] )
+Generated Location: (957:25,41 [11] )
 |CurrentDate|
 
 Source Location: (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1148:28,12 [77] )
+Generated Location: (1325:36,12 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 60dd84f6d5..a63340e070 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 66994d5d83..c36485f06d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (844:22,71 [11] )
+Generated Location: (957:25,41 [11] )
 |ParentValue|
 
 Source Location: (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1130:28,12 [50] )
+Generated Location: (1307:36,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 5095e79d77..e2ba6b0dd2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 51928f7675..1ffd60a4b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (844:22,71 [11] )
+Generated Location: (934:25,18 [11] )
 |ParentValue|
 
 Source Location: (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1130:28,12 [55] )
+Generated Location: (1284:36,12 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 5095e79d77..fa52a6bb97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 4f1af18790..c27f26a64c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (844:22,71 [11] )
+Generated Location: (933:25,17 [11] )
 |ParentValue|
 
 Source Location: (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1130:28,12 [55] )
+Generated Location: (1283:36,12 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 5095e79d77..487a8fa05f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 19e08b3d2d..0852258114 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (844:22,71 [11] )
+Generated Location: (928:25,12 [11] )
 |ParentValue|
 
 Source Location: (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1130:28,12 [55] )
+Generated Location: (1278:36,12 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index f9c07d662b..777e227cb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                              Enabled
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 15c93e7528..f3d6dd43fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (844:22,71 [7] )
+Generated Location: (946:25,30 [7] )
 |Enabled|
 
 Source Location: (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1118:28,12 [41] )
+Generated Location: (1284:36,12 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index f1722b8765..bd6cd48d7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,23 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                      Format
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 729d6d806a..e5a86aed7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (844:22,71 [11] )
+Generated Location: (942:25,26 [11] )
 |CurrentDate|
 
 Source Location: (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (857:22,84 [6] )
+Generated Location: (1145:33,54 [6] )
 |Format|
 
 Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1146:28,12 [135] )
+Generated Location: (1498:44,12 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 2cdf9884f5..ce862e532c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy");
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd/yyyy");
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy");
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 9680d2d7a7..43285d3976 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (844:22,71 [11] )
+Generated Location: (942:25,26 [11] )
 |CurrentDate|
 
 Source Location: (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1158:28,12 [77] )
+Generated Location: (1320:36,12 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 60dd84f6d5..189e7a5983 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index cf11197010..e76707e015 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (844:22,71 [11] )
+Generated Location: (942:25,26 [11] )
 |ParentValue|
 
 Source Location: (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1130:28,12 [50] )
+Generated Location: (1292:36,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 60dd84f6d5..aed8c9f08f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue);
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+              ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 5eb80dd1e9..8342633c6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (844:22,71 [11] )
+Generated Location: (930:25,14 [11] )
 |ParentValue|
 
 Source Location: (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1130:28,12 [50] )
+Generated Location: (1280:36,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 715cd2f13e..f8fd53f14b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -28,13 +28,15 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
+            __o = 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     __o = myValue;
+                                           myValue
 
 #line default
 #line hidden
 #nullable disable
+            ;
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index ab5eba52f4..637d4a38e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -9,6 +9,6 @@ Generated Location: (845:24,2 [40] )
 
 Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1048:32,43 [7] )
+Generated Location: (1068:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index ca247e7bc4..c95ffb4142 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -28,13 +28,15 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
+            __o = 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    __o = myValue;
+                                          myValue
 
 #line default
 #line hidden
 #nullable disable
+            ;
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index dada0e5529..cf57a5d9eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -9,6 +9,6 @@ Generated Location: (845:24,2 [40] )
 
 Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1047:32,42 [7] )
+Generated Location: (1067:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 69dac0b202..53f7322056 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 545980e391..13cf599f32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (908:22,135 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
 Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1050:27,12 [44] )
+Generated Location: (1203:35,12 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 75c0eb6e2b..0e120d6271 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 019a41ad20..ba63e4cc8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (908:22,135 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
 Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1050:27,12 [49] )
+Generated Location: (1203:35,12 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 91aec6e9db..a860a8013b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { });
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  x => { }
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index e65b926d36..191c479233 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (908:22,135 [8] )
+Generated Location: (998:25,18 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 75c0eb6e2b..0e120d6271 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 019a41ad20..ba63e4cc8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (908:22,135 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
 Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1050:27,12 [49] )
+Generated Location: (1203:35,12 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 91aec6e9db..a860a8013b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { });
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  x => { }
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
index e65b926d36..191c479233 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (908:22,135 [8] )
+Generated Location: (998:25,18 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index c01dd00171..f64be0176a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 91c03be2a7..18396d822c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (908:22,135 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
 Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1050:27,12 [31] )
+Generated Location: (1203:35,12 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 9a8663b4bb..76b2b1ee64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -20,7 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, () => { });
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  () => { }
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index 9e25017259..fe2bf2e2e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (908:22,135 [9] )
+Generated Location: (998:25,18 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 0a0d9c71c9..e669a8073c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -20,14 +20,24 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnComponentHover);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                 __o = ParentBgColor;
+                 OnComponentHover
 
 #line default
 #line hidden
 #nullable disable
+            );
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                       ParentBgColor
+
+#line default
+#line hidden
+#nullable disable
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 6573f9eaef..1eba11a4c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (908:22,135 [16] )
+Generated Location: (997:25,17 [16] )
 |OnComponentHover|
 
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1053:25,55 [13] )
+Generated Location: (1226:34,55 [13] )
 |ParentBgColor|
 
 Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -16,7 +16,7 @@ Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1250:34,12 [132] )
+Generated Location: (1437:44,12 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index f93e9a9e3f..231e828075 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -20,13 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-      __o = Foo;
+            Foo
 
 #line default
 #line hidden
 #nullable disable
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index c225072901..f1deeb8e82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (855:24,12 [3] )
+Generated Location: (875:25,12 [3] )
 |Foo|
 
 Source Location: (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1046:33,16 [29] )
+Generated Location: (1080:35,16 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index cdfa2835eb..ec7f72b1ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -7,14 +7,28 @@ namespace Test
     using System.Collections.Generic;
     using System.Linq;
     using Microsoft.AspNetCore.Components;
-    using System.Threading.Tasks;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async (e) => await Task.Delay(10)));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  async (e) => await Task.Delay(10)
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 65918a8a61..8c6a40562d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -7,14 +7,28 @@ namespace Test
     using System.Collections.Generic;
     using System.Linq;
     using Microsoft.AspNetCore.Components;
-    using System.Threading.Tasks;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 8e36d86b9e..1451b01b75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (895:22,12 [91] )
+Generated Location: (1164:36,12 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index e4707b23ff..2077ed7f73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -7,14 +7,28 @@ namespace Test
     using System.Collections.Generic;
     using System.Linq;
     using Microsoft.AspNetCore.Components;
-    using System.Threading.Tasks;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, async () => await Task.Delay(10)));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  async () => await Task.Delay(10)
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index c5e24a07a0..b2ba18a31a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -7,14 +7,28 @@ namespace Test
     using System.Collections.Generic;
     using System.Linq;
     using Microsoft.AspNetCore.Components;
-    using System.Threading.Tasks;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Threading.Tasks;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index b85409bbfd..5fb4940060 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (895:22,12 [73] )
+Generated Location: (1164:36,12 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index ec5a91ec7d..18f9be0443 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
             builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index d530d2b830..30ae174fdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1493:24,12 [50] )
+Generated Location: (1654:32,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 64155cc718..84861fbe8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -13,7 +13,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue), 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)), 3, () => ParentValue);
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ), 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)), 3, () => ParentValue);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 9b00126408..3143063409 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1010:20,12 [65] )
+Generated Location: (1175:28,12 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 10a948569c..f51aa5d4f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 4486aeba5f..9d15af3156 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1296:23,12 [50] )
+Generated Location: (1457:31,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index eec0221547..7ad0cca670 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 17de59870f..1da79407a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1296:23,12 [55] )
+Generated Location: (1457:31,12 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index a820035440..389741c9a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 5b2390551e..370a63dbef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1036:23,12 [50] )
+Generated Location: (1207:31,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 2844fb39e0..08ae8e4a88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 12de9c4634..01da3d4890 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1018:23,12 [50] )
+Generated Location: (1189:31,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 827b96df66..2701fcd7c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index b5fc63edaa..ad80c046e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1236:24,12 [50] )
+Generated Location: (1397:32,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 4e6890f2cc..f6b5c27457 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -13,7 +13,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue), 2, __value => ParentValue = __value, 3, () => ParentValue);
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ), 2, __value => ParentValue = __value, 3, () => ParentValue);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 9c4e3a4f09..5adac04da0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (853:20,12 [65] )
+Generated Location: (1018:28,12 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 71d845a01d..cd9fa22ba0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 558e90898f..07bc22cf2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1039:23,12 [50] )
+Generated Location: (1200:31,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index f61f65bd02..06da303e05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index c7e08118d6..a5857cf20c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1021:23,12 [50] )
+Generated Location: (1182:31,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index cd28df9276..338bcc9db1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 47e83f2182..de7fb15a40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1039:23,12 [55] )
+Generated Location: (1200:31,12 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 15180e9008..7389e9ca12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.InputText>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(person.Name)));
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       person.Name
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 37f685723b..efa3742449 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1028:23,1 [37] )
+Generated Location: (1187:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 5779d8737d..1b486284c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd"));
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                         CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd"));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 57a535549c..a824ae7c1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1076:24,12 [77] )
+Generated Location: (1253:32,12 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index ec3af93de9..d2b22f3487 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                         ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 140678b60e..956c6c9eac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1058:24,12 [50] )
+Generated Location: (1235:32,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index bd2c1e4f05..3c2a9602ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index d57ca41968..2f04691a99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1003:23,12 [55] )
+Generated Location: (1157:31,12 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index bd2c1e4f05..fb9e7ccf67 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index df3f32e8c6..2d6dd98cbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1003:23,12 [55] )
+Generated Location: (1156:31,12 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index bd2c1e4f05..cc1e202b96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index b60220be5c..d34235b87b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1003:23,12 [55] )
+Generated Location: (1151:31,12 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 62d7d45fd4..dd6890516e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -22,7 +22,15 @@ namespace Test
 #nullable disable
             (builder2) => {
                 builder2.OpenElement(0, "div");
-                builder2.AddContent(1, context.ToLowerInvariant());
+                builder2.AddContent(1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                       context.ToLowerInvariant()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
 #nullable restore
@@ -33,7 +41,15 @@ namespace Test
 #line hidden
 #nullable disable
             builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(header));
+            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     header
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
                 builder2.AddMarkupContent(5, "\r\n    Some Content\r\n");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index c9a06bc9bd..fb0a544c0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (577:17,2 [46] )
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1036:29,87 [2] )
+Generated Location: (1231:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index c4c8bf5d84..2604723d81 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -22,7 +22,15 @@ namespace Test
 #nullable disable
             (builder2) => {
                 builder2.OpenElement(0, "div");
-                builder2.AddContent(1, context.ToLowerInvariant());
+                builder2.AddContent(1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                       context.ToLowerInvariant()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
 #nullable restore
@@ -33,7 +41,15 @@ namespace Test
 #line hidden
 #nullable disable
             builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(header));
+            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     header
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
                 builder2.AddContent(5, "Some Content");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index c9a06bc9bd..fb0a544c0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (577:17,2 [46] )
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1036:29,87 [2] )
+Generated Location: (1231:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 533a031330..3be4b8370c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "checkbox");
-            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled));
+            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                              Enabled
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 919ca5048a..ad6a5295be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1052:24,12 [41] )
+Generated Location: (1218:32,12 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index d0560634aa..ffe3e4a0ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,23 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format));
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                      Format
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 68e5240938..d39523d951 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1074:24,12 [135] )
+Generated Location: (1426:40,12 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 737e68cadc..2fa550228a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy"));
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd/yyyy"));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index e7ea4dbde3..4a1839babb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1086:24,12 [77] )
+Generated Location: (1248:32,12 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index ec3af93de9..c1df7a309a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 121fca4326..5148fb018a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1058:24,12 [50] )
+Generated Location: (1220:32,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index d59a828068..bdc5dd0e4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue));
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+              ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 487c48a9a7..330659bde7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1004:23,12 [50] )
+Generated Location: (1154:31,12 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 2a5613c733..c803b3962c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  "hi"
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index 6a5f0f788a..e4d60257df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(Value)));
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    Value
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 12fda5c105..5ff5ebcdb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1021:23,12 [21] )
+Generated Location: (1193:31,12 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index f75f4a9925..b534c2ad36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(Value));
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    Value
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index c7cc52a9c7..0f7d1b7f63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1009:23,12 [21] )
+Generated Location: (1181:31,12 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 2bb60a9fd0..d0e09be7b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -13,7 +13,23 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 18, 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 3, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     18
+
+#line default
+#line hidden
+#nullable disable
+            , 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Value
+
+#line default
+#line hidden
+#nullable disable
+            ), 3, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index c09eb8ea9f..dd7f79e761 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (907:20,12 [21] )
+Generated Location: (1239:36,12 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index c51d4cea69..4bb0a503ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -13,7 +13,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 2, __value => Value = __value);
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Value
+
+#line default
+#line hidden
+#nullable disable
+            ), 2, __value => Value = __value);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 9e3a748128..b6abf24e37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (819:20,12 [21] )
+Generated Location: (978:28,12 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 11ecfd2baf..df898bde88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -14,11 +14,27 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  "hi"
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
                 builder2.AddMarkupContent(3, "\r\n  ");
                 builder2.OpenElement(4, "div");
-                builder2.AddContent(5, context.ToLower());
+                builder2.AddContent(5, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+        context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
                 builder2.AddMarkupContent(6, "\r\n");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index 55bd6f6acc..e11b4bd0a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -13,10 +13,26 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, (context) => (builder2) => {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , 2, (context) => (builder2) => {
                 builder2.AddMarkupContent(3, "\r\n  ");
                 builder2.OpenElement(4, "div");
-                builder2.AddContent(5, context.ToLower());
+                builder2.AddContent(5, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+        context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
                 builder2.AddMarkupContent(6, "\r\n");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 9063b5b71a..f137facb76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -14,8 +14,24 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
-            builder.AddAttribute(2, "Other", 17);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  "hi"
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "Other", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                  17
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index d6a4fa722c..46fef63e3f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -13,7 +13,23 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, 17);
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , 2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     17
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index 703bb94f87..8f0e763387 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -13,7 +13,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 36020c2fd2..6625dadf7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -13,11 +13,35 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(2, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 3, 4, "how are you?");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 3, 4, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "how are you?"
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(5, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, 6, 7, "bye!");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, 6, 7, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "bye!"
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 99eaf5cdbd..200e63d32a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -8,7 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using Microsoft.AspNetCore.Components.RenderTree;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 69d3cf2e78..95294d9331 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(builder); |
-Generated Location: (632:18,2 [32] )
+Generated Location: (748:24,2 [32] )
 | RenderChildComponent(builder); |
 
 Source Location: (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent(RenderTreeBuilder builder)
     {
 |
-Generated Location: (847:27,12 [67] )
+Generated Location: (963:33,12 [67] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
@@ -17,7 +17,7 @@ Generated Location: (847:27,12 [67] )
 Source Location: (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1212:40,0 [7] )
+Generated Location: (1328:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 4ac820d585..a501aabc85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -8,7 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using Microsoft.AspNetCore.Components.RenderTree;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 8cf6567fd3..235685d4ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
 |
-Generated Location: (632:18,2 [42] )
+Generated Location: (748:24,2 [42] )
 |
     void RenderChildComponent()
     {
@@ -12,12 +12,12 @@ Generated Location: (632:18,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (988:31,0 [7] )
+Generated Location: (1104:37,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1167:39,2 [25] )
+Generated Location: (1283:45,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index f6334ff26c..7f2919c951 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -14,16 +14,40 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string, int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>("hi"));
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                              "hi"
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
                 builder2.OpenElement(3, "div");
-                builder2.AddContent(4, context.ToLower());
+                builder2.AddContent(4, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                      context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
             ));
             builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
                 builder2.AddMarkupContent(6, "\r\n  ");
-                builder2.AddContent(7, System.Math.Max(0, item.Item));
+                builder2.AddContent(7, 
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+   System.Math.Max(0, item.Item)
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.AddMarkupContent(8, ";\r\n");
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 6821a2b54d..160feb2a42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -13,14 +13,46 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, new List<long>(), 3, (context) => (builder2) => {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , 2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    new List<long>()
+
+#line default
+#line hidden
+#nullable disable
+            , 3, (context) => (builder2) => {
                 builder2.OpenElement(4, "div");
-                builder2.AddContent(5, context.ToLower());
+                builder2.AddContent(5, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                      context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
             , 6, (item) => (builder2) => {
                 builder2.AddMarkupContent(7, "\r\n  ");
-                builder2.AddContent(8, System.Math.Max(0, item.Item));
+                builder2.AddContent(8, 
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+   System.Math.Max(0, item.Item)
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.AddMarkupContent(9, ";\r\n");
             }
             );
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 74c07bc17b..38a3d12497 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(Increment));
+            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 336bb2058e..02c2682477 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (856:22,12 [100] )
+Generated Location: (1015:30,12 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index fcc784f5e9..82d4245939 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
-                builder2.AddContent(2, context);
+                builder2.AddContent(2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            context
+
+#line default
+#line hidden
+#nullable disable
+                );
             }
             ));
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 179d5fa6ad..ba17589a07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(42.ToString()));
+            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               42.ToString()
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 1ddbf5a7dd..a0156a97af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -19,7 +19,15 @@ namespace Test
                 builder2.AddContent(3, "Some text");
                 builder2.OpenElement(4, "some-child");
                 builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, context.ToLowerInvariant());
+                builder2.AddContent(6, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                      context.ToLowerInvariant()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index c014ec7563..d53d350fd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -19,7 +19,15 @@ namespace Test
                 builder2.AddMarkupContent(3, "\r\n    Some text");
                 builder2.OpenElement(4, "some-child");
                 builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, item.ToLowerInvariant());
+                builder2.AddContent(6, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                item.ToLowerInvariant()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
                 builder2.AddMarkupContent(7, "\r\n  ");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index c014ec7563..d53d350fd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -19,7 +19,15 @@ namespace Test
                 builder2.AddMarkupContent(3, "\r\n    Some text");
                 builder2.OpenElement(4, "some-child");
                 builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, item.ToLowerInvariant());
+                builder2.AddContent(6, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                item.ToLowerInvariant()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
                 builder2.AddMarkupContent(7, "\r\n  ");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index bc2495b169..1bbcf6de84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(e => { Increment(); }));
+            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        e => { Increment(); }
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 97bbec1141..8fe1b9e5e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (868:22,12 [87] )
+Generated Location: (1028:30,12 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index f603d7e0ab..62827903dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -15,7 +15,15 @@ namespace Test
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "some-attribute", "foo");
-            builder.AddAttribute(2, "another-attribute", 43.ToString());
+            builder.AddAttribute(2, "another-attribute", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                       43.ToString()
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 0f959164da..8c62ec60ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -14,10 +14,34 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(123));
-            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(true));
+            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 123
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  true
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(3, "StringProperty", "My string");
-            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Test.SomeType>(new SomeType()));
+            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Test.SomeType>(
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    new SomeType()
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 9af381f80e..217d4e9f5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.DynamicElement>(0);
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 5b31bc0d66..97f074133c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (911:22,12 [62] )
+Generated Location: (1073:30,12 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index f31bf74ba5..8a9d9d24a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -8,7 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using AnotherTest;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using AnotherTest;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -23,7 +29,15 @@ namespace Test
             builder.AddMarkupContent(3, "\r\n");
             builder.OpenComponent<AnotherTest.FooterComponent>(4);
             builder.AddAttribute(5, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
-                builder2.AddContent(6, context);
+                builder2.AddContent(6, 
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+             context
+
+#line default
+#line hidden
+#nullable disable
+                );
             }
             ));
             builder.CloseComponent();
@@ -37,7 +51,15 @@ namespace Test
             builder.AddMarkupContent(11, "\r\n");
             builder.OpenComponent<AnotherTest.FooterComponent>(12);
             builder.AddAttribute(13, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
-                builder2.AddContent(14, context);
+                builder2.AddContent(14, 
+#nullable restore
+#line 13 "x:\dir\subdir\Test\TestComponent.cshtml"
+             context
+
+#line default
+#line hidden
+#nullable disable
+                );
             }
             ));
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index 16dfbdf5f8..ccfd6dea9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -8,15 +8,35 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using System.Text;
-    using System.Reflection;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
     [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
     public class _Imports : System.Object
     {
         #pragma warning disable 1998
         protected void Execute()
         {
-            builder.AddContent(0, Foo);
+            builder.AddContent(0, 
+#nullable restore
+#line 5 "x:\dir\subdir\Test\_Imports.razor"
+ Foo
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index 92ba24b62e..e77381c90e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.CoolnessMeter>(0);
-            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>("very-cool"));
+            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           "very-cool"
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index e6a9c70265..f30ecf9dd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -7,7 +7,13 @@ namespace Test
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -25,7 +31,15 @@ namespace Test
             builder.AddContent(1, "    ");
             builder.OpenElement(2, "p");
             builder.AddMarkupContent(3, "\r\n    ");
-            builder.AddContent(4, ChildContent(item2));
+            builder.AddContent(4, 
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+     ChildContent(item2)
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(5, ";\r\n    ");
             builder.CloseElement();
             builder.AddMarkupContent(6, "\r\n");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index f0bdf46f77..d4c26ae07f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (656:20,1 [34] )
+Generated Location: (772:26,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (656:20,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1150:37,0 [3] )
+Generated Location: (1407:51,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] List<TItem2> Items2 { get; set; }
     [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1335:46,12 [164] )
+Generated Location: (1592:60,12 [164] )
 |
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 61d23eb858..2a467f5166 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -8,8 +8,20 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using static Test2.SomeComponent;
-    using Foo = Test3;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using static Test2.SomeComponent;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Foo = Test3;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 9d57530eb2..a26d349655 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -8,8 +8,20 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using System.Text;
-    using System.Reflection;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 78d921a7dd..a9cdccaa49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -8,7 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using Test2;
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test2;
+
+#line default
+#line hidden
+#nullable disable
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 4d70f17e7d..38abc758cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -8,8 +8,20 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using Test2;
-    using Test3;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test2;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test3;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 6ff65a1fd4..57d254f3f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -23,7 +23,15 @@ namespace Test
 #nullable disable
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "data-abc", "Literal value");
-            builder.AddAttribute(2, "data-def", myValue);
+            builder.AddAttribute(2, "data-def", 
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                           myValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 6ff65a1fd4..2fa1f89e0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -23,7 +23,15 @@ namespace Test
 #nullable disable
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "data-abc", "Literal value");
-            builder.AddAttribute(2, "data-def", myValue);
+            builder.AddAttribute(2, "data-def", 
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                          myValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 0f724347c5..42c89177e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment))));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index b9cca84192..9847f94f4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1119:22,12 [87] )
+Generated Location: (1279:30,12 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index f5beefea6c..8a6dcef3a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 2813586105..ce19ff759b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1065:22,12 [87] )
+Generated Location: (1224:30,12 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 28427a3b91..fba47127eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 1efa219064..b1f0904571 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1065:22,12 [105] )
+Generated Location: (1224:30,12 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index ba66745821..46b47e62e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index ce649e73e7..4f6d62c7b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1065:22,12 [141] )
+Generated Location: (1224:30,12 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index c47ac91cf3..9b610ea347 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index f4b0eeaa6e..2947d225fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1065:22,12 [123] )
+Generated Location: (1224:30,12 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 2448a55110..e31f3279d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 2cadf32ae9..773637ed1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1065:22,12 [106] )
+Generated Location: (1224:30,12 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index b2759731b7..dd3c834e4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, EventCallback.Factory.Create(this, Increment))));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        EventCallback.Factory.Create(this, Increment)
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 7f5adef081..e8bf5fae09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1001:22,12 [87] )
+Generated Location: (1161:30,12 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index d1572e7e20..900bd8565f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 899faf534b..429db666d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (965:22,12 [87] )
+Generated Location: (1124:30,12 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 5ccbac8604..0cf2cd6e74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index fc78796673..e13323479a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (965:22,12 [95] )
+Generated Location: (1124:30,12 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index d9f310743d..2976e7b94e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index c518cab355..7227cffb9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (965:22,12 [123] )
+Generated Location: (1124:30,12 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index 1130e16ba4..f8182381e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Increment)));
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Increment
+
+#line default
+#line hidden
+#nullable disable
+            )));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 23399a2c4e..a359c2f249 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (965:22,12 [131] )
+Generated Location: (1124:30,12 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index ebefe524b9..a479508721 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 7ff716c3ae..0bebeedecd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (895:22,12 [44] )
+Generated Location: (1048:30,12 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 837cf43b0b..77134a3d36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 0978efd52f..46ce97fccb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (895:22,12 [49] )
+Generated Location: (1048:30,12 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 232364506d..1b336f0287 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { }));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  x => { }
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 837cf43b0b..77134a3d36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 0978efd52f..46ce97fccb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (895:22,12 [49] )
+Generated Location: (1048:30,12 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 232364506d..1b336f0287 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, x => { }));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  x => { }
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 7efe6db82a..89eb60c4e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnClick));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 7454b955cb..e403687687 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (895:22,12 [31] )
+Generated Location: (1048:30,12 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index a5b091845e..0812f45368 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, () => { }));
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  () => { }
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 4595839aa7..4b675e0739 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -8,13 +8,35 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using Test.Shared;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test.Shared;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 3, 2, Hello);
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            Hello
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 31ad391b84..7972ca277d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (764:21,12 [38] )
+Generated Location: (1199:43,12 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index dbb8b9f1ab..5dd5cacdcd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(3));
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             3
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddComponentReferenceCapture(2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index f2c2d0b55b..31a4229259 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (854:20,37 [3] )
+Generated Location: (1019:28,37 [3] )
 |_my|
 
 Source Location: (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1144:32,12 [90] )
+Generated Location: (1309:40,12 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index aef3b40743..29c061442f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -13,7 +13,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 3, 2, (__value) => {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            _my = __value;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index 02cbbdf0b3..f40f6dcbf9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (713:18,27 [3] )
+Generated Location: (868:26,27 [3] )
 |_my|
 
 Source Location: (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (941:29,12 [90] )
+Generated Location: (1096:37,12 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index 22ee654d48..e07d0e5b88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -13,10 +13,26 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, 0, 1, "hi", 2, (context) => (builder2) => {
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , 2, (context) => (builder2) => {
                 builder2.AddMarkupContent(3, "\r\n  ");
                 builder2.OpenElement(4, "div");
-                builder2.AddContent(5, context.ToLower());
+                builder2.AddContent(5, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+        context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
                 builder2.AddMarkupContent(6, "\r\n");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 4f383fba8a..36283eb0b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -13,7 +13,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddContent(0, "My value");
+            builder.AddContent(0, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  "My value"
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(1, "\r\n\r\n");
             builder.AddMarkupContent(2, "<h1>Hello</h1>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 6a835d858e..5a33264673 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -7,7 +7,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    using System;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 6ff424d4ae..96be7bf80c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -22,7 +22,15 @@ namespace Test
 #line hidden
 #nullable disable
             builder.OpenElement(0, "div");
-            builder.AddContent(1, myValue);
+            builder.AddContent(1, 
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+      myValue
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.AddMarkupContent(2, "  ");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index bc435c51df..64dd2ddfe1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -19,7 +19,15 @@ namespace Test
             }
             ));
             builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(4, "bye!");
+                builder2.AddContent(4, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+              "bye!"
+
+#line default
+#line hidden
+#nullable disable
+                );
             }
             ));
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index 4d9fbbc82e..de3026bce7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -23,9 +23,25 @@ namespace Test
             (builder2) => {
                 builder2.OpenElement(0, "li");
                 builder2.AddContent(1, "#");
-                builder2.AddContent(2, context.Index);
+                builder2.AddContent(2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                               context.Index
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.AddContent(3, " - ");
-                builder2.AddContent(4, context.Item.ToLower());
+                builder2.AddContent(4, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                context.Item.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
 #nullable restore
@@ -36,7 +52,15 @@ namespace Test
 #line hidden
 #nullable disable
             builder.OpenComponent<Test.MyComponent>(5);
-            builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(template));
+            builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        template
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index af0f1f53fe..351470bca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (577:17,2 [54] )
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1209:32,107 [2] )
+Generated Location: (1632:48,107 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 0f0b57a474..23df97ac34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -24,7 +24,15 @@ namespace Test
             (builder2) => {
                 builder2.OpenElement(0, "div");
                 builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(person.Name));
+                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                     person.Name
+
+#line default
+#line hidden
+#nullable disable
+                ));
                 builder2.CloseComponent();
                 builder2.CloseElement();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 6d5ac23a94..d257143ce3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Generated Location: (577:17,2 [45] )
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1211:32,89 [3] )
+Generated Location: (1420:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1395:41,12 [76] )
+Generated Location: (1604:49,12 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index fe8b9cb84c..5f264658aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -24,7 +24,15 @@ namespace Test
             (builder2) => {
                 builder2.OpenElement(0, "div");
                 builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(person.Name));
+                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                     person.Name
+
+#line default
+#line hidden
+#nullable disable
+                ));
                 builder2.CloseComponent();
                 builder2.CloseElement();
             }
@@ -38,7 +46,15 @@ namespace Test
             builder.OpenComponent<Test.MyComponent>(3);
             builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
                 builder2.AddMarkupContent(5, "\r\n");
-                builder2.AddContent(6, "hello, world!");
+                builder2.AddContent(6, 
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+  "hello, world!"
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.AddMarkupContent(7, "\r\n");
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 74b886d3df..2661679839 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Generated Location: (577:17,2 [45] )
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1211:32,89 [3] )
+Generated Location: (1420:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1809:49,12 [76] )
+Generated Location: (2160:65,12 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 26d0ddc3d4..6ce4d855b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -22,7 +22,15 @@ namespace Test
 #nullable disable
             (builder2) => {
                 builder2.OpenElement(0, "div");
-                builder2.AddContent(1, person.Name);
+                builder2.AddContent(1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                        person.Name
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
 #nullable restore
@@ -33,7 +41,15 @@ namespace Test
 #line hidden
 #nullable disable
             builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(template));
+            builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                              template
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index e331fc92cd..ed1e499e6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (577:17,2 [47] )
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1008:29,73 [2] )
+Generated Location: (1204:37,73 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 48b234049c..f364a1725a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -13,12 +13,35 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddContent(0, RenderPerson((person) => (builder2) => {
+            builder.AddContent(0, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+ RenderPerson((person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
                 builder2.OpenElement(1, "div");
-                builder2.AddContent(2, person.Name);
+                builder2.AddContent(2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                 person.Name
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
-            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                  )
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 3e0f0c4065..926cfcc93e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (889:25,12 [138] )
+Generated Location: (1371:48,12 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index ae4fd87296..0064cceef4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -23,7 +23,15 @@ namespace Test
 #nullable disable
             (builder2) => {
                 builder2.OpenElement(0, "div");
-                builder2.AddContent(1, person.Name);
+                builder2.AddContent(1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                  person.Name
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index 293049aa96..cac8e70d5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Generated Location: (577:17,2 [45] )
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1000:30,67 [3] )
+Generated Location: (1190:38,67 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1184:39,12 [76] )
+Generated Location: (1374:47,12 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 48b234049c..2d556280a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -13,12 +13,35 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddContent(0, RenderPerson((person) => (builder2) => {
+            builder.AddContent(0, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+  RenderPerson((person) => 
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
                 builder2.OpenElement(1, "div");
-                builder2.AddContent(2, person.Name);
+                builder2.AddContent(2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  person.Name
+
+#line default
+#line hidden
+#nullable disable
+                );
                 builder2.CloseElement();
             }
-            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                   )
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index d5061b73ce..70de3d46f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (889:25,12 [138] )
+Generated Location: (1374:48,12 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index b105a94a0c..7ccf82557c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -31,7 +31,15 @@ namespace Test
 #line hidden
 #nullable disable
             builder.OpenComponent<Test.MyComponent>(1);
-            builder.AddAttribute(2, "Person", template);
+            builder.AddAttribute(2, "Person", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                      template
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 6e6aa60e41..b65f8a5b70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -13,10 +13,25 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddContent(0, RenderPerson((builder2) => {
+            builder.AddContent(0, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+ RenderPerson(
+
+#line default
+#line hidden
+#nullable disable
+            (builder2) => {
                 builder2.AddMarkupContent(1, "<div>HI</div>");
             }
-            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            )
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 7d5e690806..6c03a5d7ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (796:23,12 [54] )
+Generated Location: (1083:38,12 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 0226f5a2cc..9269013723 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.Counter>(0);
-            builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(y));
+            builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 y
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index b8f5b52dd8..eef0fcb2e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (979:23,12 [24] )
+Generated Location: (1132:31,12 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 706ac66f7a..e586a44f6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -14,9 +14,25 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.User>(0);
-            builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserName));
+            builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  UserName
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName));
-            builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserIsActive));
+            builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                            UserIsActive
+
+#line default
+#line hidden
+#nullable disable
+            ));
             builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 46fabcb52b..da0cc7a5bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1301:25,12 [88] )
+Generated Location: (1635:41,12 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 2f6cc7ba0b..9091a18c52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -14,8 +14,24 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "p");
-            builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, OnComponentHover));
-            builder.AddAttribute(2, "style", "background:" + " " + (ParentBgColor) + ";");
+            builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnComponentHover
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "style", "background:" + " " + (
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                       ParentBgColor
+
+#line default
+#line hidden
+#nullable disable
+            ) + ";");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 5cf75e5e2c..5a06dbcb9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (996:23,12 [132] )
+Generated Location: (1340:39,12 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index c4e95fa8ab..47b5dea50c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            builder.AddContent(1, "My value");
+            builder.AddContent(1, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+  "My value"
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 1eed20445e..877a394631 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -14,7 +14,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attr", Foo);
+            builder.AddAttribute(1, "attr", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            Foo
+
+#line default
+#line hidden
+#nullable disable
+            );
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 72caeebb19..20e3897096 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (773:22,16 [29] )
+Generated Location: (921:30,16 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index 7061c025ee..84ed8ac87f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -519,6 +519,70 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             }
         }
 
+        protected void AssertLinePragmas(RazorCodeDocument codeDocument, bool designTime)
+        {
+            if (FileName == null)
+            {
+                var message = $"{nameof(AssertSourceMappingsMatchBaseline)} should only be called from an integration test. ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            var csharpDocument = codeDocument.GetCSharpDocument();
+            Assert.NotNull(csharpDocument);
+            var linePragmas = csharpDocument.LinePragmas;
+            designTime = false;
+            if (designTime)
+            {
+                var sourceMappings = csharpDocument.SourceMappings;
+                foreach (var sourceMapping in sourceMappings)
+                {
+                    var foundMatchingPragma = false;
+                    foreach (var linePragma in linePragmas)
+                    {
+                        if (sourceMapping.OriginalSpan.LineIndex >= linePragma.StartLineIndex &&
+                            sourceMapping.OriginalSpan.LineIndex <= linePragma.EndLineIndex)
+                        {
+                            // Found a match.
+                            foundMatchingPragma = true;
+                            break;
+                        }
+                    }
+
+                    Assert.True(foundMatchingPragma, $"No line pragma found for code at line {sourceMapping.OriginalSpan.LineIndex + 1}.");
+                }
+            }
+            else
+            {
+                var syntaxTree = codeDocument.GetSyntaxTree();
+                var sourceBuffer = new char[syntaxTree.Source.Length];
+                syntaxTree.Source.CopyTo(0, sourceBuffer, 0, syntaxTree.Source.Length);
+                var sourceContent = new string(sourceBuffer);
+                var classifiedSpans = syntaxTree.GetClassifiedSpans();
+                foreach (var classifiedSpan in classifiedSpans)
+                {
+                    var content = sourceContent.Substring(classifiedSpan.Span.AbsoluteIndex, classifiedSpan.Span.Length);
+                    if (!string.IsNullOrWhiteSpace(content) &&
+                        classifiedSpan.BlockKind != BlockKindInternal.Directive &&
+                        classifiedSpan.SpanKind == SpanKindInternal.Code)
+                    {
+                        var foundMatchingPragma = false;
+                        foreach (var linePragma in linePragmas)
+                        {
+                            if (classifiedSpan.Span.LineIndex >= linePragma.StartLineIndex &&
+                                classifiedSpan.Span.LineIndex <= linePragma.EndLineIndex)
+                            {
+                                // Found a match.
+                                foundMatchingPragma = true;
+                                break;
+                            }
+                        }
+
+                        Assert.True(foundMatchingPragma, $"No line pragma found for code '{content}' at line {classifiedSpan.Span.LineIndex + 1}.");
+                    }
+                }
+            }
+        }
+
         private class CodeSpanVisitor : SyntaxRewriter
         {
             public List<Syntax.SyntaxNode> CodeSpans { get; } = new List<Syntax.SyntaxNode>();
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs
index 60821b285e..1bfa5c033e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorBaselineIntegrationTestBase.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Xunit;
 using Xunit.Sdk;
 
@@ -154,6 +155,66 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             var actualMappings = SourceMappingsSerializer.Serialize(document, codeDocument.Source);
             actualMappings = actualMappings.Replace("\r", "").Replace("\n", "\r\n");
             Assert.Equal(baselineMappings, actualMappings);
+
+            AssertLinePragmas(codeDocument);
+        }
+
+        protected void AssertLinePragmas(RazorCodeDocument codeDocument)
+        {
+            var csharpDocument = codeDocument.GetCSharpDocument();
+            Assert.NotNull(csharpDocument);
+            var linePragmas = csharpDocument.LinePragmas;
+            if (DesignTime)
+            {
+                var sourceMappings = csharpDocument.SourceMappings;
+                foreach (var sourceMapping in sourceMappings)
+                {
+                    var foundMatchingPragma = false;
+                    foreach (var linePragma in linePragmas)
+                    {
+                        if (sourceMapping.OriginalSpan.LineIndex >= linePragma.StartLineIndex &&
+                            sourceMapping.OriginalSpan.LineIndex <= linePragma.EndLineIndex)
+                        {
+                            // Found a match.
+                            foundMatchingPragma = true;
+                            break;
+                        }
+                    }
+
+                    Assert.True(foundMatchingPragma, $"No line pragma found for code at line {sourceMapping.OriginalSpan.LineIndex + 1}.");
+                }
+            }
+            else
+            {
+
+                var syntaxTree = codeDocument.GetSyntaxTree();
+                var sourceBuffer = new char[syntaxTree.Source.Length];
+                syntaxTree.Source.CopyTo(0, sourceBuffer, 0, syntaxTree.Source.Length);
+                var sourceContent = new string(sourceBuffer);
+                var classifiedSpans = syntaxTree.GetClassifiedSpans();
+                foreach (var classifiedSpan in classifiedSpans)
+                {
+                    var content = sourceContent.Substring(classifiedSpan.Span.AbsoluteIndex, classifiedSpan.Span.Length);
+                    if (!string.IsNullOrWhiteSpace(content) &&
+                        classifiedSpan.BlockKind != BlockKindInternal.Directive &&
+                        classifiedSpan.SpanKind == SpanKindInternal.Code)
+                    {
+                        var foundMatchingPragma = false;
+                        foreach (var linePragma in linePragmas)
+                        {
+                            if (classifiedSpan.Span.LineIndex >= linePragma.StartLineIndex &&
+                                classifiedSpan.Span.LineIndex <= linePragma.EndLineIndex)
+                            {
+                                // Found a match.
+                                foundMatchingPragma = true;
+                                break;
+                            }
+                        }
+
+                        Assert.True(foundMatchingPragma, $"No line pragma found for code '{content}' at line {classifiedSpan.Span.LineIndex + 1}.");
+                    }
+                }
+            }
         }
 
         private string GetBaselineFilePath(RazorCodeDocument codeDocument, string extension)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs
index 40d95625f4..b5b44afa12 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/SourceMappingsSerializer.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Text;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 
 namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 {

From 9deb4401e45edbb98c76c04d0291d841d794cd2e Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Fri, 19 Apr 2019 17:03:07 -0700
Subject: [PATCH 142/337] Fix dotnet/aspnetcore-tooling#5709

Enables the correct processing of data- attributes for components.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7ae8a8c842476f7db1057ba0b9729027458a5c2e
---
 ...faultRazorIntermediateNodeLoweringPhase.cs |  4 +-
 .../src/DefaultRazorParserOptions.cs          |  2 +-
 .../src/DefaultRazorParserOptionsBuilder.cs   |  2 +-
 .../src/Legacy/HtmlMarkupParser.cs            | 15 +++--
 .../src/RazorParserFeatureFlags.cs            | 28 +++++++---
 .../src/RazorParserOptions.cs                 |  8 +--
 .../ComponentCodeGenerationTestBase.cs        | 21 +++++++
 .../test/Legacy/TagHelperBlockRewriterTest.cs |  6 +-
 .../Legacy/TagHelperParseTreeRewriterTest.cs  |  2 +-
 .../test/RazorParserFeatureFlagsTest.cs       |  4 +-
 .../TestComponent.ir.txt                      |  6 +-
 .../TestComponent.ir.txt                      |  6 +-
 .../TestComponent.codegen.cs                  | 55 +++++++++++++++++++
 .../TestComponent.ir.txt                      | 30 ++++++++++
 .../TestComponent.mappings.txt                | 25 +++++++++
 .../TestComponent.ir.txt                      |  6 +-
 .../TestComponent.ir.txt                      |  6 +-
 .../TestComponent.codegen.cs                  | 54 ++++++++++++++++++
 .../TestComponent.ir.txt                      | 19 +++++++
 .../TestComponent.mappings.txt                | 20 +++++++
 .../Language/Legacy/ParserTestBase.cs         |  8 ++-
 21 files changed, 291 insertions(+), 36 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index e573f61001..cfefed3b4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -473,7 +473,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 var name = node.Name.GetContent();
                 if (name.StartsWith("data-", StringComparison.OrdinalIgnoreCase) &&
-                    !_featureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes)
+                    !_featureFlags.AllowConditionalDataDashAttributes)
                 {
                     Visit(prefix);
                     Visit(node.Value);
@@ -518,7 +518,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 var name = node.Name.GetContent();
                 if (name.StartsWith("data-", StringComparison.OrdinalIgnoreCase) &&
-                    !_featureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes)
+                    !_featureFlags.AllowConditionalDataDashAttributes)
                 {
                     base.VisitMarkupMinimizedAttributeBlock(node);
                     return;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
index b6156641b5..0966f0eb74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptions.cs
@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             DesignTime = designTime;
             ParseLeadingDirectives = parseLeadingDirectives;
             Version = version;
-            FeatureFlags = RazorParserFeatureFlags.Create(Version);
+            FeatureFlags = RazorParserFeatureFlags.Create(Version, fileKind);
             FileKind = fileKind;
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
index e19a4d1660..6ba46844b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorParserOptionsBuilder.cs
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override RazorParserOptions Build()
         {
-            return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseLeadingDirectives, LanguageVersion, FileKind);
+            return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseLeadingDirectives, LanguageVersion, FileKind ?? FileKinds.Legacy);
         }
 
         public override void SetDesignTime(bool designTime)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index e66b9c531c..8e58813518 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1923,10 +1923,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private bool IsConditionalAttributeName(string name)
         {
-            var attributeCanBeConditional =
-                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
-                !name.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
-            return attributeCanBeConditional;
+            if (Context.FeatureFlags.AllowConditionalDataDashAttributes)
+            {
+                return true;
+            }
+
+            if (!name.StartsWith("data-", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            return false;
         }
 
         private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
index b32eee459b..9c8fd6276f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -1,18 +1,25 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+
 namespace Microsoft.AspNetCore.Razor.Language
 {
     internal abstract class RazorParserFeatureFlags
     {
-        public static RazorParserFeatureFlags Create(RazorLanguageVersion version)
+        public static RazorParserFeatureFlags Create(RazorLanguageVersion version, string fileKind)
         {
+            if (fileKind == null)
+            {
+                throw new ArgumentNullException(nameof(fileKind));
+            }
+
             var allowMinimizedBooleanTagHelperAttributes = false;
             var allowHtmlCommentsInTagHelpers = false;
             var allowComponentFileKind = false;
             var allowRazorInAllCodeBlocks = false;
             var allowUsingVariableDeclarations = false;
-            var experimental_AllowConditionalDataDashAttributes = false;
+            var allowConditionalDataDashAttributes = false;
 
             if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
             {
@@ -29,9 +36,14 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowUsingVariableDeclarations = true;
             }
 
+            if (FileKinds.IsComponent(fileKind))
+            {
+                allowConditionalDataDashAttributes = true;
+            }
+
             if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
             {
-                experimental_AllowConditionalDataDashAttributes = true;
+                allowConditionalDataDashAttributes = true;
             }
 
             return new DefaultRazorParserFeatureFlags(
@@ -40,7 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowComponentFileKind,
                 allowRazorInAllCodeBlocks,
                 allowUsingVariableDeclarations,
-                experimental_AllowConditionalDataDashAttributes);
+                allowConditionalDataDashAttributes);
         }
 
         public abstract bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -53,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool AllowUsingVariableDeclarations { get; }
 
-        public abstract bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
+        public abstract bool AllowConditionalDataDashAttributes { get; }
 
         private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
         {
@@ -63,14 +75,14 @@ namespace Microsoft.AspNetCore.Razor.Language
                 bool allowComponentFileKind,
                 bool allowRazorInAllCodeBlocks,
                 bool allowUsingVariableDeclarations,
-                bool experimental_AllowConditionalDataDashAttributes)
+                bool allowConditionalDataDashAttributesInComponents)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
                 AllowComponentFileKind = allowComponentFileKind;
                 AllowRazorInAllCodeBlocks = allowRazorInAllCodeBlocks;
                 AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
-                EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
+                AllowConditionalDataDashAttributes = allowConditionalDataDashAttributesInComponents;
             }
 
             public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -83,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public override bool AllowUsingVariableDeclarations { get; }
 
-            public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
+            public override bool AllowConditionalDataDashAttributes { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
index cb0781b666..f59d8fd797 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserOptions.cs
@@ -15,12 +15,12 @@ namespace Microsoft.AspNetCore.Razor.Language
                 designTime: false,
                 parseLeadingDirectives: false,
                 version: RazorLanguageVersion.Latest,
-                fileKind: null);
+                fileKind: FileKinds.Legacy);
         }
 
         public static RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure)
         {
-            return Create(configure, fileKind: null);
+            return Create(configure, fileKind: FileKinds.Legacy);
         }
 
         public static RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure, string fileKind)
@@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(configure));
             }
 
-            var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: RazorLanguageVersion.Latest, fileKind);
+            var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: RazorLanguageVersion.Latest, fileKind ?? FileKinds.Legacy);
             configure(builder);
             var options = builder.Build();
 
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(configure));
             }
 
-            var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: RazorLanguageVersion.Latest, fileKind);
+            var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: RazorLanguageVersion.Latest, fileKind ?? FileKinds.Legacy);
             configure(builder);
             var options = builder.Build();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 43381c1a29..7f76f8cdd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2852,6 +2852,27 @@ namespace Test.Shared
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Element_WithRef_AndOtherAttributes()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" data-slider-min=""@Min"" ref=""@_element"" />
+
+@functions {
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    }
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void Component_WithRef()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
index c2a2e7356c..82b69cddbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
@@ -2161,14 +2161,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 bool allowComponentFileKind = false,
                 bool allowRazorInCodeBlockDirectives = false,
                 bool allowUsingVariableDeclarations = false,
-                bool experimental_AllowConditionalDataDashAttributes = false)
+                bool allowConditionalDataDashAttributesInComponents = false)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelper;
                 AllowComponentFileKind = allowComponentFileKind;
                 AllowRazorInAllCodeBlocks = allowRazorInCodeBlockDirectives;
                 AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
-                EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
+                AllowConditionalDataDashAttributes = allowConditionalDataDashAttributesInComponents;
             }
 
             public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -2181,7 +2181,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             public override bool AllowUsingVariableDeclarations { get; }
 
-            public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
+            public override bool AllowConditionalDataDashAttributes { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
index e68eed561a..ef3603fa90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -734,7 +734,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             EvaluateData(
                 descriptors,
                 document,
-                featureFlags: RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_0));
+                featureFlags: RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_0, FileKinds.Legacy));
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
index cfdb9f023d..f693b4261a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void Create_LatestVersion_AllowsMinimizedBooleanTagHelperAttributes()
         {
             // Arrange & Act
-            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_1);
+            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_1, FileKinds.Legacy);
 
             // Assert
             Assert.True(context.AllowMinimizedBooleanTagHelperAttributes);
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void Create_OlderVersion_DoesNotAllowMinimizedBooleanTagHelperAttributes()
         {
             // Arrange & Act
-            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_1_1);
+            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_1_1, FileKinds.Legacy);
 
             // Assert
             Assert.False(context.AllowMinimizedBooleanTagHelperAttributes);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index b5c72064d4..d46e2e25e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -18,8 +18,10 @@ Document -
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
                 MarkupElement - (45:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
                     HtmlAttribute - (75:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
                         CSharpExpressionAttributeValue - (86:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index 71b7af99e9..afb6766d6a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -18,8 +18,10 @@ Document -
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
                 MarkupElement - (45:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
                     HtmlAttribute - (75:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
                         CSharpExpressionAttributeValue - (86:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c641fbe40a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     Min
+
+#line default
+#line hidden
+#nullable disable
+            ;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                _element = default(Microsoft.AspNetCore.Components.ElementRef);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..1272ebf797
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute -  - data-slider-min=" - "
+                        CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
+                    ReferenceCapture - (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
+                HtmlContent - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (238:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (238:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..4e1d9dd4ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|Min|
+Generated Location: (900:25,37 [3] )
+|Min|
+
+Source Location: (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|_element|
+Generated Location: (1088:33,48 [8] )
+|_element|
+
+Source Location: (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    |
+Generated Location: (1334:42,12 [161] )
+|
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index 14ed266826..854427f5fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -11,8 +11,10 @@ Document -
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
                 MarkupElement - (45:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
                     HtmlAttribute - (75:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
                         CSharpExpressionAttributeValue - (86:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index 9e4677a6ca..0ccf3f8fed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -11,8 +11,10 @@ Document -
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
                 MarkupElement - (45:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal value
+                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
                     HtmlAttribute - (75:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
                         CSharpExpressionAttributeValue - (86:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..cd5160e5d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "data-slider-min", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     Min
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddElementReferenceCapture(3, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                _element = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..ccb80d69fd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute -  - data-slider-min=" - "
+                        CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
+                    ReferenceCapture - (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
+            CSharpCode - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d89985d042
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|_element|
+Generated Location: (1024:29,48 [8] )
+|_element|
+
+Source Location: (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    |
+Generated Location: (1294:41,12 [161] )
+|
+        private ElementRef _element;
+
+        [Parameter] protected int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
+    |
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 15b9138276..8ed5fc2121 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -254,12 +254,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 designTime,
                 parseLeadingDirectives: false,
                 version: version,
+                fileKind: FileKinds.Legacy,
                 featureFlags: featureFlags);
         }
 
         private class TestRazorParserOptions : RazorParserOptions
         {
-            public TestRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version, RazorParserFeatureFlags featureFlags = null)
+            public TestRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version, string fileKind, RazorParserFeatureFlags featureFlags = null)
             {
                 if (directives == null)
                 {
@@ -270,11 +271,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 DesignTime = designTime;
                 ParseLeadingDirectives = parseLeadingDirectives;
                 Version = version;
-                FeatureFlags = featureFlags ?? RazorParserFeatureFlags.Create(Version);
+                FileKind = fileKind;
+                FeatureFlags = featureFlags ?? RazorParserFeatureFlags.Create(Version, fileKind);
             }
 
             public override bool DesignTime { get; }
 
+            internal override string FileKind { get; }
+
             public override IReadOnlyCollection<DirectiveDescriptor> Directives { get; }
 
             public override bool ParseLeadingDirectives { get; }

From ed04f3ebb8a43f586a4b8aa79dd2a965b0232289 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 29 Apr 2019 16:16:05 +0100
Subject: [PATCH 143/337] 'key' directive attribute for components
 (dotnet/aspnetcore-tooling#508)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0803d3bbed3e7a5b17e4e167ea953d263bbae4b9
---
 .../CodeGeneration/DefaultDocumentWriter.cs   |   5 +
 .../CodeGeneration/IntermediateNodeWriter.cs  |   5 +
 .../src/ComponentResources.Designer.cs        |   9 +
 .../src/ComponentResources.resx               |   3 +
 .../ComponentDesignTimeNodeWriter.cs          |  59 ++++++-
 .../Components/ComponentKeyLoweringPass.cs    |  76 ++++++++
 .../src/Components/ComponentMetadata.cs       |   8 +
 .../src/Components/ComponentNodeWriter.cs     |  14 ++
 .../Components/ComponentRuntimeNodeWriter.cs  |  54 +++++-
 .../src/Components/ComponentsApi.cs           |   2 +
 .../TagHelperDescriptorExtensions.cs          |  12 ++
 .../Intermediate/ComponentIntermediateNode.cs |   2 +
 .../Intermediate/IntermediateNodeVisitor.cs   |   5 +
 .../MarkupElementIntermediateNode.cs          |   3 +
 .../Intermediate/SetKeyIntermediateNode.cs    |  42 +++++
 .../src/RazorProjectEngine.cs                 |   1 +
 .../ComponentCodeGenerationTestBase.cs        | 162 ++++++++++++++++++
 .../test/RazorProjectEngineTest.cs            |   1 +
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../Component_WithKey/TestComponent.ir.txt    |  30 ++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  47 +++++
 .../TestComponent.ir.txt                      |  31 ++++
 .../TestComponent.mappings.txt                |   5 +
 .../Element_WithKey/TestComponent.codegen.cs  |  44 +++++
 .../Element_WithKey/TestComponent.ir.txt      |  32 ++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../TestComponent.ir.txt                      |  30 ++++
 .../TestComponent.mappings.txt                |  23 +++
 .../TestComponent.codegen.cs                  |  72 ++++++++
 .../TestComponent.ir.txt                      |  28 +++
 .../TestComponent.mappings.txt                |  24 +++
 .../TestComponent.codegen.cs                  |  73 ++++++++
 .../TestComponent.ir.txt                      |  29 ++++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  41 +++++
 .../Component_WithKey/TestComponent.ir.txt    |  19 ++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  37 ++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.mappings.txt                |   5 +
 .../Element_WithKey/TestComponent.codegen.cs  |  42 +++++
 .../Element_WithKey/TestComponent.ir.txt      |  21 +++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  52 ++++++
 .../TestComponent.ir.txt                      |  19 ++
 .../TestComponent.mappings.txt                |  18 ++
 .../TestComponent.codegen.cs                  |  48 ++++++
 .../TestComponent.ir.txt                      |  17 ++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  59 +++++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.mappings.txt                |  14 ++
 .../src/CompilerFeatures.cs                   |   1 +
 .../src/KeyTagHelperDescriptorProvider.cs     |  77 +++++++++
 .../KeyTagHelperDescriptorProviderTest.cs     |  88 ++++++++++
 .../IntermediateNodeWriter.cs                 |   5 +
 .../RenderTree/RenderTreeBuilder.cs           |   4 +
 59 files changed, 1733 insertions(+), 2 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SetKeyIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
index d6fb6742da..294304dd18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -297,6 +297,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 Context.NodeWriter.WriteReferenceCapture(Context, node);
             }
 
+            public override void VisitSetKey(SetKeyIntermediateNode node)
+            {
+                Context.NodeWriter.WriteSetKey(Context, node);
+            }
+
             public override void VisitDefault(IntermediateNode node)
             {
                 Context.RenderChildren(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
index c8a3c6659a..d4e49066f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
@@ -64,6 +64,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             throw new NotSupportedException("This writer does not support components.");
         }
 
+        public virtual void WriteSetKey(CodeRenderingContext context, SetKeyIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
         public abstract void BeginWriterScope(CodeRenderingContext context, string writer);
 
         public abstract void EndWriterScope(CodeRenderingContext context);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
index 5d4e39e752..10af5b8063 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
@@ -168,6 +168,15 @@ namespace Microsoft.AspNetCore.Razor.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches..
+        /// </summary>
+        internal static string KeyTagHelper_Documentation {
+            get {
+                return ResourceManager.GetString("KeyTagHelper_Documentation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Declares a layout type for the current document..
         /// </summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 4a27c934ae..48b636ec27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -153,6 +153,9 @@
   <data name="ImplementsDirective_TypeToken_Name" xml:space="preserve">
     <value>TypeName</value>
   </data>
+  <data name="KeyTagHelper_Documentation" xml:space="preserve">
+    <value>Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches.</value>
+  </data>
   <data name="LayoutDirective_Description" xml:space="preserve">
     <value>Declares a layout type for the current document.</value>
   </data>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index f18235f463..9b38d73700 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -314,6 +314,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // builder.OpenComponent<MyComponent>(0);
                 // builder.AddAttribute(1, "Foo", ...);
                 // builder.AddAttribute(2, "ChildContent", ...);
+                // builder.SetKey(someValue);
                 // builder.AddElementCapture(3, (__value) => _field = __value);
                 // builder.CloseComponent();
                 foreach (var typeArgument in node.TypeArguments)
@@ -347,6 +348,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     });
                 }
 
+                foreach (var setKey in node.SetKeys)
+                {
+                    context.RenderNode(setKey);
+                }
+
                 foreach (var capture in node.Captures)
                 {
                     context.RenderNode(capture);
@@ -362,7 +368,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 var attributes = node.Attributes.ToList();
                 var childContents = node.ChildContents.ToList();
                 var captures = node.Captures.ToList();
-                var remaining = attributes.Count + childContents.Count + captures.Count;
+                var setKeys = node.SetKeys.ToList();
+                var remaining = attributes.Count + childContents.Count + captures.Count + setKeys.Count;
 
                 context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName);
                 context.CodeWriter.Write(".");
@@ -406,6 +413,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     }
                 }
 
+                for (var i = 0; i < setKeys.Count; i++)
+                {
+                    context.CodeWriter.Write("-1");
+                    context.CodeWriter.Write(", ");
+
+                    WriteSetKeyInnards(context, setKeys[i]);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
                 for (var i = 0; i < captures.Count; i++)
                 {
                     context.CodeWriter.Write("-1");
@@ -717,6 +738,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             _scopeStack.CloseScope(context);
         }
 
+        public override void WriteSetKey(CodeRenderingContext context, SetKeyIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            //
+            // builder.SetKey(_keyValue);
+
+            var codeWriter = context.CodeWriter;
+
+            codeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.SetKey}");
+            WriteSetKeyInnards(context, node);
+            codeWriter.WriteEndMethodInvocation();
+        }
+
+        private void WriteSetKeyInnards(CodeRenderingContext context, SetKeyIntermediateNode node)
+        {
+            WriteCSharpCode(context, new CSharpCodeIntermediateNode
+            {
+                Source = node.Source,
+                Children =
+                    {
+                        node.KeyValueToken
+                    }
+            });
+        }
+
         public override void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
         {
             if (context == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
new file mode 100644
index 0000000000..7dad9740d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
@@ -0,0 +1,76 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentKeyLoweringPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after component lowering pass
+        public override int Order => 50;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+            for (var i = 0; i < references.Count; i++)
+            {
+                var reference = references[i];
+                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+
+                if (node.TagHelper.IsKeyTagHelper())
+                {
+                    reference.Replace(RewriteUsage(reference.Parent, node));
+                }
+            }
+        }
+
+        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        {
+            // If we can't get a nonempty attribute value, do nothing because there will
+            // already be a diagnostic for empty values
+            var keyValueToken = DetermineKeyValueToken(node);
+            if (keyValueToken == null)
+            {
+                return node;
+            }
+
+            return new SetKeyIntermediateNode(keyValueToken);
+        }
+
+        private IntermediateToken DetermineKeyValueToken(TagHelperPropertyIntermediateNode attributeNode)
+        {
+            IntermediateToken foundToken = null;
+
+            if (attributeNode.Children.Count == 1)
+            {
+                if (attributeNode.Children[0] is IntermediateToken token)
+                {
+                    foundToken = token;
+                }
+                else if (attributeNode.Children[0] is CSharpExpressionIntermediateNode csharpNode)
+                {
+                    if (csharpNode.Children.Count == 1)
+                    {
+                        foundToken = csharpNode.Children[0] as IntermediateToken;
+                    }
+                }
+            }
+            
+            return !string.IsNullOrWhiteSpace(foundToken?.Content) ? foundToken : null;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index 17966db799..f57daad348 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -23,6 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 tagHelperKind == ChildContent.TagHelperKind ||
                 tagHelperKind == EventHandler.TagHelperKind ||
                 tagHelperKind == Bind.TagHelperKind ||
+                tagHelperKind == Key.TagHelperKind ||
                 tagHelperKind == Ref.TagHelperKind;
         }
 
@@ -116,6 +117,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public readonly static string TagHelperKind = "Components.EventHandler";
         }
 
+        public static class Key
+        {
+            public readonly static string TagHelperKind = "Components.Key";
+
+            public static readonly string RuntimeName = "Components.None";
+        }
+
         public static class Ref
         {
             public readonly static string TagHelperKind = "Components.Ref";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index 0629f7dc69..ca8704fef0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -160,6 +160,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 index++;
             }
 
+            foreach (var setKey in node.Component.SetKeys)
+            {
+                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.SetKey);
+                context.CodeWriter.Write(parameters[index].parameterName);
+                context.CodeWriter.WriteEndMethodInvocation();
+
+                index++;
+            }
+
             foreach (var capture in node.Component.Captures)
             {
                 context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
@@ -200,6 +209,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
                 }
 
+                foreach (var capture in node.Component.SetKeys)
+                {
+                    p.Add(($"__seq{p.Count}", "object", $"__arg{p.Count}"));
+                }
+
                 foreach (var capture in node.Component.Captures)
                 {
                     // The capture type name should already contain the global:: prefix.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 83d1c2941f..a3224213a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -190,6 +190,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 context.RenderNode(attribute);
             }
 
+            foreach (var setKey in node.SetKeys)
+            {
+                context.RenderNode(setKey);
+            }
+
             foreach (var capture in node.Captures)
             {
                 context.RenderNode(capture);
@@ -317,6 +322,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // builder.OpenComponent<MyComponent>(0);
                 // builder.AddAttribute(1, "Foo", ...);
                 // builder.AddAttribute(2, "ChildContent", ...);
+                // builder.SetKey(someValue);
                 // builder.AddElementCapture(3, (__value) => _field = __value);
                 // builder.CloseComponent();
 
@@ -344,6 +350,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     context.RenderNode(childContent);
                 }
 
+                foreach (var setKey in node.SetKeys)
+                {
+                    context.RenderNode(setKey);
+                }
+
                 foreach (var capture in node.Captures)
                 {
                     context.RenderNode(capture);
@@ -366,7 +377,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 var attributes = node.Attributes.ToList();
                 var childContents = node.ChildContents.ToList();
                 var captures = node.Captures.ToList();
-                var remaining = attributes.Count + childContents.Count + captures.Count;
+                var setKeys = node.SetKeys.ToList();
+                var remaining = attributes.Count + childContents.Count + captures.Count + setKeys.Count;
 
                 context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName);
                 context.CodeWriter.Write(".");
@@ -410,6 +422,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     }
                 }
                 
+                for (var i = 0; i < setKeys.Count; i++)
+                {
+                    context.CodeWriter.Write((_sourceSequence++).ToString());
+                    context.CodeWriter.Write(", ");
+
+                    WriteSetKeyInnards(context, setKeys[i]);
+
+                    remaining--;
+                    if (remaining > 0)
+                    {
+                        context.CodeWriter.Write(", ");
+                    }
+                }
+
                 for (var i = 0; i < captures.Count; i++)
                 {
                     context.CodeWriter.Write((_sourceSequence++).ToString());
@@ -651,6 +677,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             _scopeStack.CloseScope(context);
         }
 
+        public override void WriteSetKey(CodeRenderingContext context, SetKeyIntermediateNode node)
+        {
+            // Looks like:
+            //
+            // builder.SetKey(_keyValue);
+
+            var codeWriter = context.CodeWriter;
+
+            codeWriter
+                .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.SetKey}");
+            WriteSetKeyInnards(context, node);
+            codeWriter.WriteEndMethodInvocation();
+        }
+
+        private void WriteSetKeyInnards(CodeRenderingContext context, SetKeyIntermediateNode node)
+        {
+            WriteCSharpCode(context, new CSharpCodeIntermediateNode
+            {
+                Source = node.Source,
+                Children =
+                    {
+                        node.KeyValueToken
+                    }
+            });
+        }
+
         public override void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
         {
             // Looks like:
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 59db7873dd..858dd7169b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -87,6 +87,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string GetFrames = nameof(GetFrames);
 
             public static readonly string ChildContent = nameof(ChildContent);
+
+            public static readonly string SetKey = nameof(SetKey);
         }
 
         public static class RuntimeHelpers
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index 1bbd8d8ace..8d16b94f9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -139,6 +139,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 string.Equals(ComponentMetadata.EventHandler.TagHelperKind, kind);
         }
 
+        public static bool IsKeyTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.SpecialKindKey, out var kind) &&
+                string.Equals(ComponentMetadata.Key.TagHelperKind, kind);
+        }
+
         public static bool IsRefTagHelper(this TagHelperDescriptor tagHelper)
         {
             if (tagHelper == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
index f3cb7feea0..7b623a0fe9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
@@ -16,6 +16,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public IEnumerable<ReferenceCaptureIntermediateNode> Captures => Children.OfType<ReferenceCaptureIntermediateNode>();
 
+        public IEnumerable<SetKeyIntermediateNode> SetKeys => Children.OfType<SetKeyIntermediateNode>();
+
         public IEnumerable<ComponentChildContentIntermediateNode> ChildContents => Children.OfType<ComponentChildContentIntermediateNode>();
 
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
index af4c6c41af..134294394d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -168,5 +168,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
         {
             VisitDefault(node);
         }
+
+        public virtual void VisitSetKey(SetKeyIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
index 7ea2b95882..bf70855bc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
@@ -14,10 +14,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public IEnumerable<ReferenceCaptureIntermediateNode> Captures => Children.OfType<ReferenceCaptureIntermediateNode>();
 
+        public IEnumerable<SetKeyIntermediateNode> SetKeys => Children.OfType<SetKeyIntermediateNode>();
+
         public IEnumerable<IntermediateNode> Body => Children.Where(c =>
         {
             return
                 c as HtmlAttributeIntermediateNode == null &&
+                c as SetKeyIntermediateNode == null &&
                 c as ReferenceCaptureIntermediateNode == null;
         });
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SetKeyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SetKeyIntermediateNode.cs
new file mode 100644
index 0000000000..507f89c863
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SetKeyIntermediateNode.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class SetKeyIntermediateNode : IntermediateNode
+    {
+        public SetKeyIntermediateNode(IntermediateToken keyValueToken)
+        {
+            KeyValueToken = keyValueToken ?? throw new ArgumentNullException(nameof(keyValueToken));
+            Source = KeyValueToken.Source;
+        }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public IntermediateToken KeyValueToken { get; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitSetKey(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            if (formatter == null)
+            {
+                throw new ArgumentNullException(nameof(formatter));
+            }
+            
+            formatter.WriteContent(KeyValueToken.Content);
+            
+            formatter.WriteProperty(nameof(KeyValueToken), KeyValueToken.Content);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index 82ca3509a8..cdc6b9ff4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -226,6 +226,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.Features.Add(new ComponentLoweringPass());
             builder.Features.Add(new ComponentScriptTagPass());
             builder.Features.Add(new ComponentEventHandlerLoweringPass());
+            builder.Features.Add(new ComponentKeyLoweringPass());
             builder.Features.Add(new ComponentReferenceCaptureLoweringPass());
             builder.Features.Add(new ComponentBindLoweringPass());
             builder.Features.Add(new ComponentTemplateDiagnosticPass());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 7f76f8cdd4..7cbc74266f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2724,6 +2724,68 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void GenericComponent_WithKey()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=int Item=""3"" key=""_someKey"" />
+
+@functions {
+    private object _someKey = new object();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_WithKey_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""3"" key=""_someKey"" />
+
+@functions {
+    private object _someKey = new object();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void GenericComponent_WithComponentRef()
         {
@@ -2831,6 +2893,106 @@ namespace Test.Shared
 
         #endregion
 
+        #region Key
+
+        [Fact]
+        public void Element_WithKey()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" key=""someObject"" attributeafter=""after"">Hello</elem>
+
+@functions {
+    private object someObject = new object();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Element_WithKey_AndOtherAttributes()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" data-slider-min=""@Min"" key=""@someObject"" />
+
+@functions {
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    }
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithKey()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent ParamBefore=""before"" key=""someDate.Day"" ParamAfter=""after"" />
+
+@functions {
+    private DateTime someDate = DateTime.Now;
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithKey_WithChildContent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent key=""123 + 456"" SomeProp=""val"">
+    Some <el>further</el> content
+</MyComponent>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
         #region Ref
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 65600a9b88..9a5673a70b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -52,6 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
                 feature => Assert.IsType<ComponentEventHandlerLoweringPass>(feature),
                 feature => Assert.IsType<ComponentGenericTypePass>(feature),
                 feature => Assert.IsType<ComponentInjectDirectivePass>(feature),
+                feature => Assert.IsType<ComponentKeyLoweringPass>(feature),
                 feature => Assert.IsType<ComponentLayoutDirectivePass>(feature),
                 feature => Assert.IsType<ComponentLoweringPass>(feature),
                 feature => Assert.IsType<ComponentMarkupBlockPass>(feature),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b3049fa6f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       someDate.Day
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private DateTime someDate = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
new file mode 100644
index 0000000000..6b4cf2695b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    SetKey - (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
+                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (74:0,74 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (74:0,74 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (140:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (140:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c1f44c953c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|someDate.Day|
+Generated Location: (1108:30,39 [12] )
+|someDate.Day|
+
+Source Location: (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private DateTime someDate = DateTime.Now;
+|
+Generated Location: (1467:47,12 [49] )
+|
+    private DateTime someDate = DateTime.Now;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..014af5ca83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  123 + 456
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..7540550b11
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        MarkupElement - (55:1,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el
+                            HtmlContent - (59:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (59:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further
+                        HtmlContent - (71:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (71:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
+                    SetKey - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
+                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                        HtmlContent - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+                HtmlContent - (95:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (95:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e508dba546
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|123 + 456|
+Generated Location: (1064:29,18 [9] )
+|123 + 456|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
new file mode 100644
index 0000000000..445881ed56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    someObject
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private object someObject = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
new file mode 100644
index 0000000000..5761655406
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    SetKey - (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (83:0,83 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (83:0,83 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (149:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (149:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
new file mode 100644
index 0000000000..eb409186f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|someObject|
+Generated Location: (908:25,36 [10] )
+|someObject|
+
+Source Location: (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object someObject = new object();
+|
+Generated Location: (1117:35,12 [49] )
+|
+    private object someObject = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..897386b74a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     Min
+
+#line default
+#line hidden
+#nullable disable
+            ;
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                someObject
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..55b45fa3e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute -  - data-slider-min=" - "
+                        CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
+                    SetKey - (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+                HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (191:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (191:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..aa3e3e4fdc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -0,0 +1,23 @@
+Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|Min|
+Generated Location: (900:25,37 [3] )
+|Min|
+
+Source Location: (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|someObject|
+Generated Location: (1117:34,48 [10] )
+|someObject|
+
+Source Location: (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    |
+Generated Location: (1326:44,12 [112] )
+|
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
new file mode 100644
index 0000000000..709829ce9a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -0,0 +1,72 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = typeof(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   int
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             3
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     _someKey
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private object _someKey = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
new file mode 100644
index 0000000000..4738739183
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    SetKey - (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+                HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (113:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (113:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2a8f37b34e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|int|
+Generated Location: (889:25,19 [3] )
+|int|
+
+Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1141:34,29 [1] )
+|3|
+
+Source Location: (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|_someKey|
+Generated Location: (1497:46,37 [8] )
+|_someKey|
+
+Source Location: (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object _someKey = new object();
+|
+Generated Location: (1854:63,12 [47] )
+|
+    private object _someKey = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1ee445b21c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,73 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           _someKey
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private object _someKey = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.SetKey(__arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..3b5cc52c25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    SetKey - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+                HtmlContent - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (103:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (103:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..474623cead
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (955:25,19 [1] )
+|3|
+
+Source Location: (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|_someKey|
+Generated Location: (1125:33,27 [8] )
+|_someKey|
+
+Source Location: (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object _someKey = new object();
+|
+Generated Location: (1482:50,12 [47] )
+|
+    private object _someKey = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0a8803d967
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "ParamBefore", "before");
+            builder.AddAttribute(2, "ParamAfter", "after");
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       someDate.Day
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private DateTime someDate = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
new file mode 100644
index 0000000000..021fc0aead
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    SetKey - (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
+                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
new file mode 100644
index 0000000000..bdca049e18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|someDate.Day|
+Generated Location: (824:21,39 [12] )
+|someDate.Day|
+
+Source Location: (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private DateTime someDate = DateTime.Now;
+|
+Generated Location: (1074:32,12 [49] )
+|
+    private DateTime someDate = DateTime.Now;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..17c3ae4e46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "SomeProp", "val");
+            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+                builder2.AddMarkupContent(3, "\r\n    Some ");
+                builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
+            }
+            ));
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                  123 + 456
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
new file mode 100644
index 0000000000..d5cee0071c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        MarkupBlock -  - <el>further</el> content\n
+                    SetKey - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
+                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                        HtmlContent - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d41eee6ea6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|123 + 456|
+Generated Location: (1029:27,18 [9] )
+|123 + 456|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
new file mode 100644
index 0000000000..fd9d0844f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddAttribute(2, "attributeafter", "after");
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                    someObject
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddContent(3, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private object someObject = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
new file mode 100644
index 0000000000..5c5902d95a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    SetKey - (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0a63f5d85d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|someObject|
+Generated Location: (817:21,36 [10] )
+|someObject|
+
+Source Location: (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object someObject = new object();
+|
+Generated Location: (1108:33,12 [49] )
+|
+    private object someObject = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
new file mode 100644
index 0000000000..176ad7f171
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -0,0 +1,52 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "text");
+            builder.AddAttribute(2, "data-slider-min", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     Min
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                someObject
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
new file mode 100644
index 0000000000..c4b3b00270
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                    HtmlAttribute -  - data-slider-min=" - "
+                        CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
+                    SetKey - (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+            CSharpCode - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7530b38835
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -0,0 +1,18 @@
+Source Location: (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|someObject|
+Generated Location: (987:29,48 [10] )
+|someObject|
+
+Source Location: (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    |
+Generated Location: (1233:40,12 [112] )
+|
+        private object someObject = new object();
+
+        [Parameter] protected int Min { get; set; }
+    |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7afcd337b5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<int>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             3
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.SetKey(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                     _someKey
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private object _someKey = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
new file mode 100644
index 0000000000..f3c2f8e143
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    SetKey - (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+            CSharpCode - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
new file mode 100644
index 0000000000..508332c609
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|_someKey|
+Generated Location: (980:28,37 [8] )
+|_someKey|
+
+Source Location: (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object _someKey = new object();
+|
+Generated Location: (1226:39,12 [47] )
+|
+    private object _someKey = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6e8d31af45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           _someKey
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private object _someKey = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.SetKey(__arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..35285b1a16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    SetKey - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+            CSharpCode - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0873889778
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|_someKey|
+Generated Location: (854:26,27 [8] )
+|_someKey|
+
+Source Location: (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object _someKey = new object();
+|
+Generated Location: (1061:36,12 [47] )
+|
+    private object _someKey = new object();
+|
+
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
index b42e6b5cc8..b555832cc8 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
@@ -28,6 +28,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 builder.Features.Add(new ComponentTagHelperDescriptorProvider());
                 builder.Features.Add(new EventHandlerTagHelperDescriptorProvider());
                 builder.Features.Add(new RefTagHelperDescriptorProvider());
+                builder.Features.Add(new KeyTagHelperDescriptorProvider());
 
                 builder.Features.Add(new DefaultTypeNameFeature());
             }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..7ea05126be
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
@@ -0,0 +1,77 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class KeyTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+    {
+        // Run after the component tag helper provider
+        public int Order { get; set; } = 1000;
+
+        public RazorEngine Engine { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                return;
+            }
+
+            var renderTreeBuilderType = compilation.GetTypeByMetadataName(ComponentsApi.RenderTreeBuilder.FullTypeName);
+            if (renderTreeBuilderType == null)
+            {
+                // If we can't find RenderTreeBuilder, then just bail. We won't be able to compile the
+                // generated code anyway.
+                return;
+            }
+
+            context.Results.Add(CreateKeyTagHelper());
+        }
+
+        private TagHelperDescriptor CreateKeyTagHelper()
+        {
+            var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Key.TagHelperKind, "Key", ComponentsApi.AssemblyName);
+            builder.Documentation = ComponentResources.KeyTagHelper_Documentation;
+
+            builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Key.TagHelperKind);
+            builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Key.RuntimeName;
+
+            // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
+            // a C# property will crash trying to create the tooltips.
+            builder.SetTypeName("Microsoft.AspNetCore.Components.Key");
+
+            builder.TagMatchingRule(rule =>
+            {
+                rule.TagName = "*";
+                rule.Attribute(attribute =>
+                {
+                    attribute.Name = "key";
+                });
+            });
+
+            builder.BindAttribute(attribute =>
+            {
+                attribute.Documentation = ComponentResources.KeyTagHelper_Documentation;
+                attribute.Name = "key";
+
+                // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the tooltips.
+                attribute.SetPropertyName("Key");
+                attribute.TypeName = typeof(object).FullName;
+            });
+
+            return builder.Build();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..ae9288bd19
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,88 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class KeyTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTestBase
+    {
+        [Fact]
+        public void Execute_CreatesDescriptor()
+        {
+            // Arrange
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(BaseCompilation);
+
+            var provider = new KeyTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = context.Results.Where(result => result.IsKeyTagHelper());
+            var item = Assert.Single(matches);
+
+            Assert.Empty(item.AllowedChildTags);
+            Assert.Null(item.TagOutputHint);
+            Assert.Empty(item.Diagnostics);
+            Assert.False(item.HasErrors);
+            Assert.Equal(ComponentMetadata.Key.TagHelperKind, item.Kind);
+            Assert.Equal(bool.TrueString, item.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
+            Assert.Equal(ComponentMetadata.Key.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(item.IsDefaultKind());
+            Assert.False(item.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal(
+                "Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches.",
+                item.Documentation);
+
+            Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName);
+            Assert.Equal("Key", item.Name);
+            Assert.Equal("Microsoft.AspNetCore.Components.Key", item.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.Key", item.GetTypeName());
+
+            // The tag matching rule for a key is just the attribute name "key"
+            var rule = Assert.Single(item.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("*", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("key", requiredAttribute.DisplayName);
+            Assert.Equal("key", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(item.BoundAttributes);
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(ComponentMetadata.Key.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches.",
+                attribute.Documentation);
+
+            Assert.Equal("key", attribute.Name);
+            Assert.Equal("Key", attribute.GetPropertyName());
+            Assert.Equal("object Microsoft.AspNetCore.Components.Key.Key", attribute.DisplayName);
+            Assert.Equal("System.Object", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
index 4ae07f5e8d..c83dbb7c79 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
@@ -168,6 +168,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             WriteContentNode(node, node.IdentifierToken?.Content);
         }
 
+        public override void VisitSetKey(SetKeyIntermediateNode node)
+        {
+            WriteContentNode(node, node.KeyValueToken?.Content);
+        }
+
         void IExtensionIntermediateNodeVisitor<RouteAttributeExtensionNode>.VisitExtension(RouteAttributeExtensionNode node)
         {
             WriteContentNode(node, node.Template);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
index e07c337a4d..2dfaac26cf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -103,5 +103,9 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public void AddComponentReferenceCapture(int sequence, Action<object> componentReferenceCaptureAction)
         {
         }
+
+        public void SetKey(object key)
+        {
+        }
     }
 }
\ No newline at end of file

From 5f462346c66e65c24b71d585aeb68b8a3e46ef42 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 30 Apr 2019 17:58:13 -0700
Subject: [PATCH 144/337] Added support for @namespace directive in Blazor
 (dotnet/aspnetcore-tooling#504)

* Added support for @namespace directive in Blazor
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7f6c1422ddcb3053d26d6a5437fca0e99e05a426
---
 .../src/MvcViewDocumentClassifierPass.cs      |  28 +-
 .../src/NamespaceDirective.cs                 | 204 ----------
 .../src/Properties/Resources.Designer.cs      |  42 ---
 .../src/RazorExtensions.cs                    |   1 -
 .../src/RazorPageDocumentClassifierPass.cs    |  30 +-
 .../src/Resources.resx                        |   9 -
 .../test/NamespaceDirectiveTest.cs            | 352 ------------------
 .../ComponentDocumentClassifierPass.cs        |  23 +-
 .../src/DefaultRazorTagHelperBinderPhase.cs   |   2 +-
 .../src/Extensions/NamespaceDirective.cs      |  33 ++
 .../src/Properties/Resources.Designer.cs      |  42 +++
 .../src/RazorCodeDocumentExtensions.cs        | 168 ++++++++-
 .../src/RazorProjectEngine.cs                 |   1 +
 .../src/Resources.resx                        |   9 +
 .../ComponentCodeGenerationTestBase.cs        | 113 ++++++
 .../test/RazorCodeDocumentExtensionsTest.cs   | 297 +++++++++++++--
 .../test/RazorProjectEngineTest.cs            |   3 +-
 .../TestComponent.codegen.cs                  |  51 +++
 .../TestComponent.ir.txt                      |  22 ++
 .../Counter.codegen.cs                        |  61 +++
 .../Counter.ir.txt                            |  22 ++
 .../Counter.mappings.txt                      |   5 +
 .../TestComponent.codegen.cs                  |  66 ++++
 .../TestComponent.ir.txt                      |  34 ++
 .../TestComponent.mappings.txt                |  10 +
 .../TestComponent.codegen.cs                  |  36 ++
 .../TestComponent.ir.txt                      |  12 +
 .../Counter.codegen.cs                        |  36 ++
 .../Counter.ir.txt                            |  12 +
 .../TestComponent.codegen.cs                  |  34 ++
 .../TestComponent.ir.txt                      |  20 +
 31 files changed, 1116 insertions(+), 662 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/NamespaceDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs
index 975cf90666..7ab07afc8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/MvcViewDocumentClassifierPass.cs
@@ -23,10 +23,16 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         {
             base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
 
-            @namespace.Content = "AspNetCore";
+            if (!codeDocument.TryComputeNamespace(fallbackToRootNamespace: false, out var namespaceName))
+            {
+                @namespace.Content = "AspNetCore";
+            }
+            else
+            {
+                @namespace.Content = namespaceName;
+            }
 
-            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
-            if (string.IsNullOrEmpty(filePath))
+            if (!TryComputeClassName(codeDocument, out var className))
             {
                 // It's possible for a Razor document to not have a file path.
                 // Eg. When we try to generate code for an in memory document like default imports.
@@ -35,8 +41,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             }
             else
             {
-                @class.ClassName = GetClassNameFromPath(filePath);
+                @class.ClassName = className;
             }
+            
 
             @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
             @class.Modifiers.Clear();
@@ -50,6 +57,19 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
         }
 
+        private bool TryComputeClassName(RazorCodeDocument codeDocument, out string className)
+        {
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                className = null;
+                return false;
+            }
+
+            className = GetClassNameFromPath(filePath);
+            return true;
+        }
+
         private static string GetClassNameFromPath(string path)
         {
             const string cshtmlExtension = ".cshtml";
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs
deleted file mode 100644
index 1a809c0629..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/NamespaceDirective.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public static class NamespaceDirective
-    {
-        private static readonly char[] Separators = new char[] { '\\', '/' };
-
-        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
-            "namespace",
-            DirectiveKind.SingleLine,
-            builder =>
-            {
-                builder.AddNamespaceToken(
-                    Resources.NamespaceDirective_NamespaceToken_Name,
-                    Resources.NamespaceDirective_NamespaceToken_Description);
-                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
-                builder.Description = Resources.NamespaceDirective_Description;
-            });
-
-        public static void Register(RazorProjectEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException();
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-        }
-
-        // internal for testing
-        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
-        {
-            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
-            {
-                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
-                    documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
-                {
-                    // Not a page. Skip.
-                    return;
-                }
-
-                var visitor = new Visitor();
-                visitor.Visit(documentNode);
-
-                var directive = visitor.LastNamespaceDirective;
-                if (directive == null)
-                {
-                    // No namespace set. Skip.
-                    return;
-                }
-
-                var @namespace = visitor.FirstNamespace;
-                if (@namespace == null)
-                {
-                    // No namespace node. Skip.
-                    return;
-                }
-
-                @namespace.Content = GetNamespace(codeDocument.Source.FilePath, directive);
-            }
-        }
-
-        // internal for testing.
-        //
-        // This code does a best-effort attempt to compute a namespace 'suffix' - the path difference between
-        // where the @namespace directive appears and where the current document is on disk.
-        //
-        // In the event that these two source either don't have FileNames set or don't follow a coherent hierarchy,
-        // we will just use the namespace verbatim.
-        internal static string GetNamespace(string source, DirectiveIntermediateNode directive)
-        {
-            var directiveSource = NormalizeDirectory(directive.Source?.FilePath);
-
-            var baseNamespace = directive.Tokens.FirstOrDefault()?.Content;
-            if (string.IsNullOrEmpty(baseNamespace))
-            {
-                // The namespace directive was incomplete.
-                return string.Empty;
-            }
-
-            if (string.IsNullOrEmpty(source) || directiveSource == null)
-            {
-                // No sources, can't compute a suffix.
-                return baseNamespace;
-            }
-
-            // We're specifically using OrdinalIgnoreCase here because Razor treats all paths as case-insensitive.
-            if (!source.StartsWith(directiveSource, StringComparison.OrdinalIgnoreCase) ||
-                source.Length <= directiveSource.Length)
-            {
-                // The imports are not from the directory hierarchy, can't compute a suffix.
-                return baseNamespace;
-            }
-
-            // OK so that this point we know that the 'imports' file containing this directive is in the directory
-            // hierarchy of this soure file. This is the case where we can append a suffix to the baseNamespace.
-            //
-            // Everything so far has just been defensiveness on our part.
-
-            var builder = new StringBuilder(baseNamespace);
-
-            var segments = source.Substring(directiveSource.Length).Split(Separators);
-
-            // Skip the last segment because it's the FileName.
-            for (var i = 0; i < segments.Length - 1; i++)
-            {
-                builder.Append('.');
-                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
-            }
-
-            return builder.ToString();
-        }
-
-        // We want to normalize the path of the file containing the '@namespace' directive to just the containing
-        // directory with a trailing separator.
-        //
-        // Not using Path.GetDirectoryName here because it doesn't meet these requirements, and we want to handle
-        // both 'view engine' style paths and absolute paths.
-        //
-        // We also don't normalize the separators here. We expect that all documents are using a consistent style of path.
-        // 
-        // If we can't normalize the path, we just return null so it will be ignored.
-        private static string NormalizeDirectory(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                return null;
-            }
-
-            var lastSeparator = path.LastIndexOfAny(Separators);
-            if (lastSeparator == -1)
-            {
-                return null;
-            }
-
-            // Includes the separator
-            return path.Substring(0, lastSeparator + 1);
-        }
-
-        private class Visitor : IntermediateNodeWalker
-        {
-            public ClassDeclarationIntermediateNode FirstClass { get; private set; }
-
-            public NamespaceDeclarationIntermediateNode FirstNamespace { get; private set; }
-
-            // We want the last one, so get them all and then .
-            public DirectiveIntermediateNode LastNamespaceDirective { get; private set; }
-
-            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
-            {
-                if (FirstNamespace == null)
-                {
-                    FirstNamespace = node;
-                }
-
-                base.VisitNamespaceDeclaration(node);
-            }
-
-            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
-            {
-                if (FirstClass == null)
-                {
-                    FirstClass = node;
-                }
-
-                base.VisitClassDeclaration(node);
-            }
-
-            public override void VisitDirective(DirectiveIntermediateNode node)
-            {
-                if (node.Directive == Directive)
-                {
-                    LastNamespaceDirective = node;
-                }
-
-                base.VisitDirective(node);
-            }
-        }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static void Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException();
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-        }
-        #endregion
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
index dfa9a59ca9..18566dc27e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
@@ -206,48 +206,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
             => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
 
-        /// <summary>
-        /// Specify the base namespace for the page.
-        /// </summary>
-        internal static string NamespaceDirective_Description
-        {
-            get => GetString("NamespaceDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the base namespace for the page.
-        /// </summary>
-        internal static string FormatNamespaceDirective_Description()
-            => GetString("NamespaceDirective_Description");
-
-        /// <summary>
-        /// The namespace for the page.
-        /// </summary>
-        internal static string NamespaceDirective_NamespaceToken_Description
-        {
-            get => GetString("NamespaceDirective_NamespaceToken_Description");
-        }
-
-        /// <summary>
-        /// The namespace for the page.
-        /// </summary>
-        internal static string FormatNamespaceDirective_NamespaceToken_Description()
-            => GetString("NamespaceDirective_NamespaceToken_Description");
-
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        internal static string NamespaceDirective_NamespaceToken_Name
-        {
-            get => GetString("NamespaceDirective_NamespaceToken_Name");
-        }
-
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        internal static string FormatNamespaceDirective_NamespaceToken_Name()
-            => GetString("NamespaceDirective_NamespaceToken_Name");
-
         /// <summary>
         /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
         /// </summary>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
index 26e641d7aa..867586db5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
@@ -19,7 +19,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             InjectDirective.Register(builder);
             ModelDirective.Register(builder);
-            NamespaceDirective.Register(builder);
             PageDirective.Register(builder);
             
             SectionDirective.Register(builder);
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
index 96a05cfc22..567754cd66 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorPageDocumentClassifierPass.cs
@@ -48,12 +48,16 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         {
             base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
 
-            @namespace.Content = "AspNetCore";
+            if (!codeDocument.TryComputeNamespace(fallbackToRootNamespace: false, out var namespaceName))
+            {
+                @namespace.Content = "AspNetCore";
+            }
+            else
+            {
+                @namespace.Content = namespaceName;
+            }
 
-            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.RazorPages.Page";
-
-            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
-            if (string.IsNullOrEmpty(filePath))
+            if (!TryComputeClassName(codeDocument, out var className))
             {
                 // It's possible for a Razor document to not have a file path.
                 // Eg. When we try to generate code for an in memory document like default imports.
@@ -62,9 +66,10 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             }
             else
             {
-                @class.ClassName = GetClassNameFromPath(filePath);
+                @class.ClassName = className;
             }
 
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.RazorPages.Page";
             @class.Modifiers.Clear();
             @class.Modifiers.Add("public");
 
@@ -143,6 +148,19 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             }
         }
 
+        private bool TryComputeClassName(RazorCodeDocument codeDocument, out string className)
+        {
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                className = null;
+                return false;
+            }
+
+            className = GetClassNameFromPath(filePath);
+            return true;
+        }
+
         private static string GetClassNameFromPath(string path)
         {
             const string cshtmlExtension = ".cshtml";
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx
index 474537197e..9a0b9cfdc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Resources.resx
@@ -159,15 +159,6 @@
   <data name="MvcRazorParser_InvalidPropertyType" xml:space="preserve">
     <value>Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.</value>
   </data>
-  <data name="NamespaceDirective_Description" xml:space="preserve">
-    <value>Specify the base namespace for the page.</value>
-  </data>
-  <data name="NamespaceDirective_NamespaceToken_Description" xml:space="preserve">
-    <value>The namespace for the page.</value>
-  </data>
-  <data name="NamespaceDirective_NamespaceToken_Name" xml:space="preserve">
-    <value>Namespace</value>
-  </data>
   <data name="PageDirectiveCannotBeImported" xml:space="preserve">
     <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.</value>
   </data>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs
deleted file mode 100644
index d744eec9fb..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/NamespaceDirectiveTest.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-// 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 Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Moq;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public class NamespaceDirectiveTest
-    {
-        [Fact]
-        public void GetNamespace_IncompleteDirective_UsesEmptyNamespace()
-        {
-            // Arrange
-            var source = "c:\\foo\\bar\\bleh.cshtml";
-            var imports = "c:\\foo\\baz\\bleh.cshtml";
-            var node = new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan(imports, 0, 0, 0, 0),
-            };
-
-            // Act
-            var @namespace = NamespaceDirective.GetNamespace(source, node);
-
-            // Assert
-            Assert.Equal(string.Empty, @namespace);
-        }
-
-        [Fact]
-        public void GetNamespace_EmptyDirective_UsesEmptyNamespace()
-        {
-            // Arrange
-            var source = "c:\\foo\\bar\\bleh.cshtml";
-            var imports = "c:\\foo\\baz\\bleh.cshtml";
-            var node = new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan(imports, 0, 0, 0, 0),
-            };
-            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = string.Empty });
-
-            // Act
-            var @namespace = NamespaceDirective.GetNamespace(source, node);
-
-            // Assert
-            Assert.Equal(string.Empty, @namespace);
-        }
-
-        // When we don't have a relationship between the source file and the imports file
-        // we will just use the namespace on the node directly.
-        [Theory]
-        [InlineData((string)null, (string)null)]
-        [InlineData("", "")]
-        [InlineData(null, "/foo/bar")]
-        [InlineData("/foo/baz", "/foo/bar/bleh")]
-        [InlineData("/foo.cshtml", "/foo/bar.cshtml")]
-        [InlineData("c:\\foo.cshtml", "d:\\foo\\bar.cshtml")]
-        [InlineData("c:\\foo\\bar\\bleh.cshtml", "c:\\foo\\baz\\bleh.cshtml")]
-        public void GetNamespace_ForNonRelatedFiles_UsesNamespaceVerbatim(string source, string imports)
-        {
-            // Arrange
-            var node = new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan(imports, 0, 0, 0, 0),
-            };
-
-            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
-
-            // Act
-            var @namespace = NamespaceDirective.GetNamespace(source, node);
-
-            // Assert
-            Assert.Equal("Base", @namespace);
-        }
-
-        [Theory]
-        [InlineData("/foo.cshtml", "/_ViewImports.cshtml", "Base")]
-        [InlineData("/foo/bar.cshtml", "/_ViewImports.cshtml", "Base.foo")]
-        [InlineData("/foo/bar/baz.cshtml", "/_ViewImports.cshtml", "Base.foo.bar")]
-        [InlineData("/foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
-        [InlineData("/Foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
-        [InlineData("c:\\foo.cshtml", "c:\\_ViewImports.cshtml", "Base")]
-        [InlineData("c:\\foo\\bar.cshtml", "c:\\_ViewImports.cshtml", "Base.foo")]
-        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\_ViewImports.cshtml", "Base.foo.bar")]
-        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
-        [InlineData("c:\\Foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
-        public void GetNamespace_ForRelatedFiles_ComputesNamespaceWithSuffix(string source, string imports, string expected)
-        {
-            // Arrange
-            var node = new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan(imports, 0, 0, 0, 0),
-            };
-
-            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
-
-            // Act
-            var @namespace = NamespaceDirective.GetNamespace(source, node);
-
-            // Assert
-            Assert.Equal(expected, @namespace);
-        }
-
-        // This is the case where a _ViewImports sets the namespace.
-        [Fact]
-        public void Pass_SetsNamespace_ComputedFromImports()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode();
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
-            builder.Pop();
-
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
-            builder.Push(@namespace);
-
-            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
-            builder.Add(@class);
-            
-            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
-
-            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
-
-            var pass = new NamespaceDirective.Pass();
-            pass.Engine = Mock.Of<RazorEngine>();
-
-            // Act
-            pass.Execute(codeDocument, document);
-
-            // Assert
-            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
-            Assert.Equal("default", @class.ClassName);
-        }
-
-        // This is the case where the source file sets the namespace.
-        [Fact]
-        public void Pass_SetsNamespace_ComputedFromSource()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode();
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            // This will be ignored.
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
-            builder.Pop();
-
-            // This will be used.
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
-            builder.Pop();
-
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
-            builder.Push(@namespace);
-
-            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
-            builder.Add(@class);
-            
-            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
-
-            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
-
-            var pass = new NamespaceDirective.Pass();
-            pass.Engine = Mock.Of<RazorEngine>();
-
-            // Act
-            pass.Execute(codeDocument, document);
-
-            // Assert
-            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
-            Assert.Equal("default", @class.ClassName);
-        }
-
-        // Handles cases where invalid characters appears in FileNames. Note that we don't sanitize the part of
-        // the namespace that you put in an import, just the file-based-suffix. Garbage in, garbage out.
-        [Fact]
-        public void Pass_SetsNamespace_SanitizesClassAndNamespace()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode();
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
-            builder.Pop();
-
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
-            builder.Push(@namespace);
-
-            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
-            builder.Add(@class);
-
-            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
-
-            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage-Info/Add+User.cshtml"));
-
-            var pass = new NamespaceDirective.Pass();
-            pass.Engine = Mock.Of<RazorEngine>();
-
-            // Act
-            pass.Execute(codeDocument, document);
-
-            // Assert
-            Assert.Equal("WebApplication.Account.Manage_Info", @namespace.Content);
-            Assert.Equal("default", @class.ClassName);
-        }
-
-        // This is the case where the source file sets the namespace.
-        [Fact]
-        public void Pass_SetsNamespace_ComputedFromSource_ForView()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode();
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            // This will be ignored.
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
-            builder.Pop();
-
-            // This will be used.
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
-            builder.Pop();
-
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
-            builder.Push(@namespace);
-
-            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
-            builder.Add(@class);
-            
-            document.DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind;
-
-            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
-
-            var pass = new NamespaceDirective.Pass();
-            pass.Engine = Mock.Of<RazorEngine>();
-
-            // Act
-            pass.Execute(codeDocument, document);
-
-            // Assert
-            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
-            Assert.Equal("default", @class.ClassName);
-        }
-
-        // This handles an error case where we can't determine the relationship between the
-        // imports and the source.
-        [Fact]
-        public void Pass_SetsNamespace_VerbatimFromImports()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode();
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan(null, 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
-            builder.Pop();
-
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
-            builder.Push(@namespace);
-
-            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
-            builder.Add(@class);
-            
-            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
-
-            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
-
-            var pass = new NamespaceDirective.Pass();
-            pass.Engine = Mock.Of<RazorEngine>();
-
-            // Act
-            pass.Execute(codeDocument, document);
-
-            // Assert
-            Assert.Equal("WebApplication.Account", @namespace.Content);
-            Assert.Equal("default", @class.ClassName);
-        }
-
-        [Fact]
-        public void Pass_DoesNothing_ForUnknownDocumentKind()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode();
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            builder.Push(new DirectiveIntermediateNode()
-            {
-                Directive = NamespaceDirective.Directive,
-                Source = new SourceSpan(null, 0, 0, 0, 0),
-            });
-            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
-            builder.Pop();
-
-            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
-            builder.Push(@namespace);
-
-            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
-            builder.Add(@class);
-            
-            document.DocumentKind = null;
-
-            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
-
-            var pass = new NamespaceDirective.Pass();
-            pass.Engine = Mock.Of<RazorEngine>();
-
-            // Act
-            pass.Execute(codeDocument, document);
-
-            // Assert
-            Assert.Equal("default", @namespace.Content);
-            Assert.Equal("default", @class.ClassName);
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 8b5ad5061d..8ff9196e1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -54,7 +54,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             ClassDeclarationIntermediateNode @class,
             MethodDeclarationIntermediateNode method)
         {
-            if (!codeDocument.TryComputeNamespaceAndClass(out var computedNamespace, out var computedClass))
+            if (!codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var computedNamespace) ||
+                !TryComputeClassName(codeDocument, out var computedClass))
             {
                 // If we can't compute a nice namespace (no relative path) then just generate something
                 // mangled.
@@ -117,5 +118,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 });
             }
         }
+
+        private bool TryComputeClassName(RazorCodeDocument codeDocument, out string className)
+        {
+            className = null;
+            if (codeDocument.Source.FilePath == null || codeDocument.Source.RelativePath == null)
+            {
+                return false;
+            }
+
+            var relativePath = NormalizePath(codeDocument.Source.RelativePath);
+            className = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(relativePath));
+            return true;
+        }
+
+        private static string NormalizePath(string path)
+        {
+            path = path.Replace('\\', '/');
+
+            return path;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
index 03e8bc4314..788b22c597 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             if (FileKinds.IsComponent(codeDocument.GetFileKind()) &&
                 (parserOptions == null || parserOptions.FeatureFlags.AllowComponentFileKind))
             {
-                codeDocument.TryComputeNamespaceAndClass(out var currentNamespace, out var _);
+                codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var currentNamespace);
                 visitor = new ComponentDirectiveVisitor(codeDocument.Source.FilePath, descriptors, currentNamespace);
             }
             else
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/NamespaceDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/NamespaceDirective.cs
new file mode 100644
index 0000000000..3d29f63a03
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/NamespaceDirective.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    public static class NamespaceDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "namespace",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddNamespaceToken(
+                    Resources.NamespaceDirective_NamespaceToken_Name,
+                    Resources.NamespaceDirective_NamespaceToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.NamespaceDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component, FileKinds.ComponentImport);
+            return builder;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
index be43f4d896..47cfb574a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
@@ -1898,6 +1898,48 @@ namespace Microsoft.AspNetCore.Razor.Language
         internal static string FormatRewriter_InsufficientStack()
             => GetString("Rewriter_InsufficientStack");
 
+        /// <summary>
+        /// Specify the base namespace for the document.
+        /// </summary>
+        internal static string NamespaceDirective_Description
+        {
+            get => GetString("NamespaceDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the base namespace for the document.
+        /// </summary>
+        internal static string FormatNamespaceDirective_Description()
+            => GetString("NamespaceDirective_Description");
+
+        /// <summary>
+        /// The namespace for the document.
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Description
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Description");
+        }
+
+        /// <summary>
+        /// The namespace for the document.
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Description()
+            => GetString("NamespaceDirective_NamespaceToken_Description");
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Name
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Name");
+        }
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Name()
+            => GetString("NamespaceDirective_NamespaceToken_Name");
+
         private static string GetString(string name, params string[] formatterNames)
         {
             var value = _resourceManager.GetString(name);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
index e1cd262573..704a9da482 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -3,9 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -195,11 +199,11 @@ namespace Microsoft.AspNetCore.Razor.Language
         }
 
         // In general documents will have a relative path (relative to the project root).
-        // We can only really compute a nice class/namespace when we know a relative path.
+        // We can only really compute a nice namespace when we know a relative path.
         //
         // However all kinds of thing are possible in tools. We shouldn't barf here if the document isn't 
         // set up correctly.
-        internal static bool TryComputeNamespaceAndClass(this RazorCodeDocument document, out string @namespace, out string @class)
+        public static bool TryComputeNamespace(this RazorCodeDocument document, bool fallbackToRootNamespace, out string @namespace)
         {
             if (document == null)
             {
@@ -208,28 +212,78 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             var filePath = document.Source.FilePath;
             var relativePath = document.Source.RelativePath;
-            if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
+            if (filePath == null || relativePath == null || filePath.Length < relativePath.Length)
             {
                 @namespace = null;
-                @class = null;
                 return false;
             }
 
-            filePath = NormalizePath(filePath);
             relativePath = NormalizePath(relativePath);
-            var options = document.GetCodeGenerationOptions() ?? document.GetDocumentIntermediateNode()?.Options;
-            var rootNamespace = options?.RootNamespace;
-            if (string.IsNullOrEmpty(rootNamespace))
+            // If the document or it's imports contains a @namespace directive, we want to use that over the root namespace.
+            var baseNamespace = string.Empty;
+            var appendSuffix = true;
+            var lastNamespaceContent = string.Empty;
+            var lastNamespaceLocation = SourceSpan.Undefined;
+            var importSyntaxTrees = document.GetImportSyntaxTrees();
+            if (importSyntaxTrees != null)
             {
+                // ImportSyntaxTrees is usually set. Just being defensive.
+                foreach (var importSyntaxTree in importSyntaxTrees)
+                {
+                    if (importSyntaxTree != null && NamespaceVisitor.TryGetLastNamespaceDirective(importSyntaxTree, out var importNamespaceContent, out var importNamespaceLocation))
+                    {
+                        lastNamespaceContent = importNamespaceContent;
+                        lastNamespaceLocation = importNamespaceLocation;
+                    }
+                }
+            }
+
+            var syntaxTree = document.GetSyntaxTree();
+            if (syntaxTree != null && NamespaceVisitor.TryGetLastNamespaceDirective(syntaxTree, out var namespaceContent, out var namespaceLocation))
+            {
+                lastNamespaceContent = namespaceContent;
+                lastNamespaceLocation = namespaceLocation;
+            }
+
+            // If there are multiple @namespace directives in the heirarchy,
+            // we want to pick the closest one to the current document.
+            if (!string.IsNullOrEmpty(lastNamespaceContent))
+            {
+                baseNamespace = lastNamespaceContent;
+                var directiveLocationDirectory = NormalizeDirectory(lastNamespaceLocation.FilePath);
+
+                // We're specifically using OrdinalIgnoreCase here because Razor treats all paths as case-insensitive.
+                if (!document.Source.FilePath.StartsWith(directiveLocationDirectory, StringComparison.OrdinalIgnoreCase) ||
+                    document.Source.FilePath.Length <= directiveLocationDirectory.Length)
+                {
+                    // The most relevant directive is not from the directory hierarchy, can't compute a suffix.
+                    appendSuffix = false;
+                }
+                else
+                {
+                    // We know that the document containing the namespace directive is in the current document's heirarchy.
+                    // Let's compute the actual relative path that we'll use to compute the namespace suffix.
+                    relativePath = document.Source.FilePath.Substring(directiveLocationDirectory.Length);
+                }
+            }
+            else if (fallbackToRootNamespace)
+            {
+                var options = document.GetCodeGenerationOptions() ?? document.GetDocumentIntermediateNode()?.Options;
+                baseNamespace = options?.RootNamespace;
+                appendSuffix = true;
+            }
+
+            if (string.IsNullOrEmpty(baseNamespace))
+            {
+                // There was no valid @namespace directive and we couldn't compute the RootNamespace.
                 @namespace = null;
-                @class = null;
                 return false;
             }
 
             var builder = new StringBuilder();
 
             // Sanitize the base namespace, but leave the dots.
-            var segments = rootNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+            var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
             builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[0]));
             for (var i = 1; i < segments.Length; i++)
             {
@@ -237,19 +291,49 @@ namespace Microsoft.AspNetCore.Razor.Language
                 builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
             }
 
-            segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);
-
-            // Skip the last segment because it's the FileName.
-            for (var i = 0; i < segments.Length - 1; i++)
+            if (appendSuffix)
             {
-                builder.Append('.');
-                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+                // If we get here, we already have a base namespace and the relative path that should be used as the namespace suffix.
+                segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+                // Skip the last segment because it's the FileName.
+                for (var i = 0; i < segments.Length - 1; i++)
+                {
+                    builder.Append('.');
+                    builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+                }
             }
 
             @namespace = builder.ToString();
-            @class = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(relativePath));
 
             return true;
+
+            // We want to normalize the path of the file containing the '@namespace' directive to just the containing
+            // directory with a trailing separator.
+            //
+            // Not using Path.GetDirectoryName here because it doesn't meet these requirements, and we want to handle
+            // both 'view engine' style paths and absolute paths.
+            //
+            // We also don't normalize the separators here. We expect that all documents are using a consistent style of path.
+            // 
+            // If we can't normalize the path, we just return null so it will be ignored.
+            string NormalizeDirectory(string path)
+            {
+                char[] Separators = new char[] { '\\', '/' };
+                if (string.IsNullOrEmpty(path))
+                {
+                    return null;
+                }
+
+                var lastSeparator = path.LastIndexOfAny(Separators);
+                if (lastSeparator == -1)
+                {
+                    return null;
+                }
+
+                // Includes the separator
+                return path.Substring(0, lastSeparator + 1);
+            }
         }
 
         private static string NormalizePath(string path)
@@ -288,5 +372,55 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public IReadOnlyList<TagHelperDescriptor> TagHelpers { get; }
         }
+
+        private class NamespaceVisitor : SyntaxWalker
+        {
+            private readonly RazorSourceDocument _source;
+
+            private NamespaceVisitor(RazorSourceDocument source)
+            {
+                _source = source;
+            }
+
+            public string LastNamespaceContent { get; set; }
+
+            public SourceSpan LastNamespaceLocation { get; set; }
+
+            public static bool TryGetLastNamespaceDirective(
+                RazorSyntaxTree syntaxTree,
+                out string namespaceDirectiveContent,
+                out SourceSpan namespaceDirectiveSpan)
+            {
+                var visitor = new NamespaceVisitor(syntaxTree.Source);
+                visitor.Visit(syntaxTree.Root);
+                if (string.IsNullOrEmpty(visitor.LastNamespaceContent))
+                {
+                    namespaceDirectiveContent = null;
+                    namespaceDirectiveSpan = SourceSpan.Undefined;
+                    return false;
+                }
+
+                namespaceDirectiveContent = visitor.LastNamespaceContent;
+                namespaceDirectiveSpan = visitor.LastNamespaceLocation;
+                return true;
+            }
+
+            public override void VisitRazorDirective(RazorDirectiveSyntax node)
+            {
+                if (node != null && node.DirectiveDescriptor == NamespaceDirective.Directive)
+                {
+                    var directiveContent = node.Body?.GetContent();
+
+                    // In practice, this should never be null and always start with 'namespace'. Just being defensive here.
+                    if (directiveContent != null && directiveContent.StartsWith(NamespaceDirective.Directive.Directive))
+                    {
+                        LastNamespaceContent = directiveContent.Substring(NamespaceDirective.Directive.Directive.Length).Trim();
+                        LastNamespaceLocation = node.GetSourceSpan(_source);
+                    }
+                }
+
+                base.VisitRazorDirective(node);
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index cdc6b9ff4a..7155a3c2e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -117,6 +117,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 FunctionsDirective.Register(builder);
                 ImplementsDirective.Register(builder);
                 InheritsDirective.Register(builder);
+                NamespaceDirective.Register(builder);
 
                 AddComponentFeatures(builder);
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index d7f21d9466..ef92859644 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -542,4 +542,13 @@ Instead, wrap the contents of the block in "{{}}":
   <data name="Rewriter_InsufficientStack" xml:space="preserve">
     <value>Not enough stack space to continue parsing this document. Razor doesn't support deeply nested elements.</value>
   </data>
+  <data name="NamespaceDirective_Description" xml:space="preserve">
+    <value>Specify the base namespace for the document.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Description" xml:space="preserve">
+    <value>The namespace for the document.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Name" xml:space="preserve">
+    <value>Namespace</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 7cbc74266f..923c8bcabe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -1570,6 +1570,50 @@ namespace AnotherTest
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Component_WithNamespaceDirective()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class HeaderComponent : ComponentBase
+    {
+        [Parameter]
+        string Header { get; set; }
+    }
+}
+
+namespace AnotherTest
+{
+    public class FooterComponent : ComponentBase
+    {
+        [Parameter]
+        string Footer { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test
+@namespace AnotherTest
+
+<HeaderComponent Header='head'>
+</HeaderComponent>
+<FooterComponent Footer='feet'>
+</FooterComponent>
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region EventCallback
@@ -3582,6 +3626,75 @@ namespace Test
             AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
             CompileToAssembly(generated, throwOnFailure: false);
         }
+
+        [Fact]
+        public void Component_NamespaceDirective_InImports()
+        {
+            // Arrange
+            var importContent = @"
+@using System.Text
+@using System.Reflection
+@namespace New.Test
+";
+            var importItem = CreateProjectItem("_Imports.razor", importContent, FileKinds.ComponentImport);
+            ImportItems.Add(importItem);
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace New.Test
+{
+    public class Counter : ComponentBase
+    {
+        public int Count { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<Counter />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_NamespaceDirective_OverrideImports()
+        {
+            // Arrange
+            var importContent = @"
+@using System.Text
+@using System.Reflection
+@namespace Import.Test
+";
+            var importItem = CreateProjectItem("_Imports.razor", importContent, FileKinds.ComponentImport);
+            ImportItems.Add(importItem);
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace New.Test
+{
+    public class Counter2 : ComponentBase
+    {
+        public int Count { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp("Pages/Counter.razor", @"
+@namespace New.Test
+<Counter2 />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
         #endregion
 
         #region Misc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
index 9cf25fbeed..2840823a17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.IO;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Xunit;
 
@@ -228,67 +230,63 @@ namespace Microsoft.AspNetCore.Razor.Language
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_RootNamespaceNotSet_ReturnsNull()
+        public void TryComputeNamespace_RootNamespaceNotSet_ReturnsNull()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Test.cshtml", relativePath: "Test.cshtml");
             var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Null(@namespace);
-            Assert.Null(@class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_RelativePathNull_ReturnsNull()
+        public void TryComputeNamespace_RelativePathNull_ReturnsNull()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Test.cshtml", relativePath: null);
             var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Null(@namespace);
-            Assert.Null(@class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_FilePathNull_ReturnsNull()
+        public void TryComputeNamespace_FilePathNull_ReturnsNull()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: null, relativePath: "Test.cshtml");
             var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Null(@namespace);
-            Assert.Null(@class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_RelativePathLongerThanFilePath_ReturnsNull()
+        public void TryComputeNamespace_RelativePathLongerThanFilePath_ReturnsNull()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Test.cshtml", relativePath: "Some\\invalid\\relative\\path\\Test.cshtml");
             var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Null(@namespace);
-            Assert.Null(@class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_ComputesNamespaceAndClass()
+        public void TryComputeNamespace_ComputesNamespace()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
@@ -299,15 +297,14 @@ namespace Microsoft.AspNetCore.Razor.Language
             }));
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Equal("Hello.Components", @namespace);
-            Assert.Equal("Test", @class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_UsesIROptions_ComputesNamespaceAndClass()
+        public void TryComputeNamespace_UsesIROptions_ComputesNamespace()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
@@ -322,15 +319,36 @@ namespace Microsoft.AspNetCore.Razor.Language
             codeDocument.SetDocumentIntermediateNode(documentNode);
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Equal("Hello.Components", @namespace);
-            Assert.Equal("Test", @class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_PrefersOptionsFromCodeDocument_ComputesNamespaceAndClass()
+        public void TryComputeNamespace_NoRootNamespaceFallback_ReturnsNull()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: false, out var @namespace);
+
+            // Assert
+            Assert.Null(@namespace);
+        }
+
+        [Fact]
+        public void TryComputeNamespace_PrefersOptionsFromCodeDocument_ComputesNamespace()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components\\Test.cshtml", relativePath: "\\Components\\Test.cshtml");
@@ -349,15 +367,14 @@ namespace Microsoft.AspNetCore.Razor.Language
             codeDocument.SetDocumentIntermediateNode(documentNode);
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Equal("World.Components", @namespace);
-            Assert.Equal("Test", @class);
         }
 
         [Fact]
-        public void TryComputeNamespaceAndClass_SanitizesNamespaceAndClassName()
+        public void TryComputeNamespace_SanitizesNamespaceName()
         {
             // Arrange
             var sourceDocument = TestRazorSourceDocument.Create(filePath: "C:\\Hello\\Components with space\\Test$name.cshtml", relativePath: "\\Components with space\\Test$name.cshtml");
@@ -372,11 +389,243 @@ namespace Microsoft.AspNetCore.Razor.Language
             codeDocument.SetDocumentIntermediateNode(documentNode);
 
             // Act
-            codeDocument.TryComputeNamespaceAndClass(out var @namespace, out var @class);
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
 
             // Assert
             Assert.Equal("Hel_o.World.Components_with_space", @namespace);
-            Assert.Equal("Test_name", @class);
+        }
+
+        [Fact]
+        public void TryComputeNamespace_RespectsNamespaceDirective()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace My.Custom.NS",
+                filePath: "C:\\Hello\\Components\\Test.cshtml",
+                relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetFileKind(FileKinds.Component);
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(options =>
+            {
+                options.Directives.Add(NamespaceDirective.Directive);
+            })));
+
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello.World";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
+
+            // Assert
+            Assert.Equal("My.Custom.NS", @namespace);
+        }
+
+        [Fact]
+        public void TryComputeNamespace_RespectsImportsNamespaceDirective()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(
+                filePath: "C:\\Hello\\Components\\Test.cshtml",
+                relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetFileKind(FileKinds.Component);
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(options =>
+            {
+                options.Directives.Add(NamespaceDirective.Directive);
+            })));
+
+            var importSourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace My.Custom.NS",
+                filePath: "C:\\Hello\\_Imports.razor",
+                relativePath: "\\_Imports.razor");
+            codeDocument.SetImportSyntaxTrees(new[]
+            {
+                RazorSyntaxTree.Parse(importSourceDocument, RazorParserOptions.Create(options =>
+                {
+                    options.Directives.Add(NamespaceDirective.Directive);
+                }))
+            });
+
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello.World";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
+
+            // Assert
+            Assert.Equal("My.Custom.NS.Components", @namespace);
+        }
+
+        [Fact]
+        public void TryComputeNamespace_RespectsImportsNamespaceDirective_SameFolder()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(
+                filePath: "C:\\Hello\\Components\\Test.cshtml",
+                relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetFileKind(FileKinds.Component);
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(options =>
+            {
+                options.Directives.Add(NamespaceDirective.Directive);
+            })));
+
+            var importSourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace My.Custom.NS",
+                filePath: "C:\\Hello\\Components\\_Imports.razor",
+                relativePath: "\\Components\\_Imports.razor");
+            codeDocument.SetImportSyntaxTrees(new[]
+            {
+                RazorSyntaxTree.Parse(importSourceDocument, RazorParserOptions.Create(options =>
+                {
+                    options.Directives.Add(NamespaceDirective.Directive);
+                }))
+            });
+
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello.World";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
+
+            // Assert
+            Assert.Equal("My.Custom.NS", @namespace);
+        }
+
+        [Fact]
+        public void TryComputeNamespace_OverrideImportsNamespaceDirective()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace My.Custom.OverrideNS",
+                filePath: "C:\\Hello\\Components\\Test.cshtml",
+                relativePath: "\\Components\\Test.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetFileKind(FileKinds.Component);
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(options =>
+            {
+                options.Directives.Add(NamespaceDirective.Directive);
+            })));
+
+            var importSourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace My.Custom.NS",
+                filePath: "C:\\Hello\\_Imports.razor",
+                relativePath: "\\_Imports.razor");
+            codeDocument.SetImportSyntaxTrees(new[]
+            {
+                RazorSyntaxTree.Parse(importSourceDocument, RazorParserOptions.Create(options =>
+                {
+                    options.Directives.Add(NamespaceDirective.Directive);
+                }))
+            });
+
+            var documentNode = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.Create(c =>
+                {
+                    c.RootNamespace = "Hello.World";
+                })
+            };
+            codeDocument.SetDocumentIntermediateNode(documentNode);
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
+
+            // Assert
+            Assert.Equal("My.Custom.OverrideNS", @namespace);
+        }
+
+        [Theory]
+        [InlineData("/", "foo.cshtml", "Base")]
+        [InlineData("/", "foo/bar.cshtml", "Base.foo")]
+        [InlineData("/", "foo/bar/baz.cshtml", "Base.foo.bar")]
+        [InlineData("/foo/", "bar/baz.cshtml", "Base.bar")]
+        [InlineData("/Foo/", "bar/baz.cshtml", "Base.bar")]
+        [InlineData("c:\\", "foo.cshtml", "Base")]
+        [InlineData("c:\\", "foo\\bar.cshtml", "Base.foo")]
+        [InlineData("c:\\", "foo\\bar\\baz.cshtml", "Base.foo.bar")]
+        [InlineData("c:\\foo\\", "bar\\baz.cshtml", "Base.bar")]
+        [InlineData("c:\\Foo\\", "bar\\baz.cshtml", "Base.bar")]
+        public void TryComputeNamespace_ComputesNamespaceWithSuffix(string basePath, string relativePath, string expectedNamespace)
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(
+                filePath: Path.Combine(basePath, relativePath),
+                relativePath: relativePath);
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(options =>
+            {
+                options.Directives.Add(NamespaceDirective.Directive);
+            })));
+
+            var importRelativePath = "_ViewImports.cshtml";
+            var importSourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace Base",
+                filePath: Path.Combine(basePath, importRelativePath),
+                relativePath: importRelativePath);
+            codeDocument.SetImportSyntaxTrees(new[]
+            {
+                RazorSyntaxTree.Parse(importSourceDocument, RazorParserOptions.Create(options =>
+                {
+                    options.Directives.Add(NamespaceDirective.Directive);
+                }))
+            });
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
+
+            // Assert
+            Assert.Equal(expectedNamespace, @namespace);
+        }
+
+        [Fact]
+        public void TryComputeNamespace_ForNonRelatedFiles_UsesNamespaceVerbatim()
+        {
+            // Arrange
+            var sourceDocument = TestRazorSourceDocument.Create(
+                filePath: "c:\\foo\\bar\\bleh.cshtml",
+                relativePath: "bar\\bleh.cshtml");
+            var codeDocument = TestRazorCodeDocument.Create(sourceDocument, Array.Empty<RazorSourceDocument>());
+            codeDocument.SetSyntaxTree(RazorSyntaxTree.Parse(sourceDocument, RazorParserOptions.Create(options =>
+            {
+                options.Directives.Add(NamespaceDirective.Directive);
+            })));
+
+            var importSourceDocument = TestRazorSourceDocument.Create(
+                content: "@namespace Base",
+                filePath: "c:\\foo\\baz\\bleh.cshtml",
+                relativePath: "baz\\bleh.cshtml");
+            codeDocument.SetImportSyntaxTrees(new[]
+            {
+                RazorSyntaxTree.Parse(importSourceDocument, RazorParserOptions.Create(options =>
+                {
+                    options.Directives.Add(NamespaceDirective.Directive);
+                }))
+            });
+
+            // Act
+            codeDocument.TryComputeNamespace(fallbackToRootNamespace: true, out var @namespace);
+
+            // Assert
+            Assert.Equal("Base", @namespace);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 9a5673a70b..298be4f46f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -90,7 +90,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
                 feature.Directives,
                 directive => Assert.Same(FunctionsDirective.Directive, directive),
                 directive => Assert.Same(ImplementsDirective.Directive, directive),
-                directive => Assert.Same(InheritsDirective.Directive, directive));
+                directive => Assert.Same(InheritsDirective.Directive, directive),
+                directive => Assert.Same(NamespaceDirective.Directive, directive));
         }
 
         private static void AssertDefaultTargetExtensions(RazorProjectEngine engine)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c008d053ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace New.Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Counter);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
new file mode 100644
index 0000000000..a874feb5e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - New.Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (57:2,11 [8] x:\dir\subdir\Test\_Imports.razor) - New.Test
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
new file mode 100644
index 0000000000..5b2c7bf109
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace New.Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
+    public class Counter : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\Pages/Counter.razor"
+global::System.Object __typeHelper = nameof(New.Test);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\Pages/Counter.razor"
+__o = typeof(Counter2);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
new file mode 100644
index 0000000000..510e28febf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - New.Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        ClassDeclaration -  - public - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (11:0,11 [8] Counter.razor) - New.Test
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (21:1,0 [12] Counter.razor) - Counter2
+                HtmlContent - (33:1,12 [2] Counter.razor)
+                    IntermediateToken - (33:1,12 [2] Counter.razor) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
new file mode 100644
index 0000000000..f0453f843a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (11:0,11 [8] x:\dir\subdir\Test\Pages/Counter.razor)
+|New.Test|
+Generated Location: (850:31,44 [8] )
+|New.Test|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4862d5ba18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AnotherTest
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+global::System.Object __typeHelper = nameof(AnotherTest);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(HeaderComponent);
+
+#line default
+#line hidden
+#nullable disable
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(FooterComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..156bb74137
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - AnotherTest
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (24:1,11 [11] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (37:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (37:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (39:3,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
+                    ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.SingleQuotes
+                        HtmlContent - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - head
+                HtmlContent - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (92:5,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - FooterComponent
+                    ComponentAttribute - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - AttributeStructure.SingleQuotes
+                        HtmlContent - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - feet
+                HtmlContent - (143:6,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (143:6,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..084270fa26
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test|
+Generated Location: (327:12,0 [10] )
+|using Test|
+
+Source Location: (24:1,11 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|AnotherTest|
+Generated Location: (719:24,44 [11] )
+|AnotherTest|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
new file mode 100644
index 0000000000..83ab17e704
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace New.Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<New.Test.Counter>(0);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
new file mode 100644
index 0000000000..d7e2828ab0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - New.Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
new file mode 100644
index 0000000000..ce2bfb5570
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace New.Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\_Imports.razor"
+using System.Text;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\_Imports.razor"
+using System.Reflection;
+
+#line default
+#line hidden
+#nullable disable
+    public class Counter : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<New.Test.Counter2>(0);
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
new file mode 100644
index 0000000000..8a6c4dfbd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - New.Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
+        UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        ClassDeclaration -  - public - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (21:1,0 [12] Counter.razor) - Counter2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b612a0c313
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AnotherTest
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.HeaderComponent>(0);
+            builder.AddAttribute(1, "Header", "head");
+            builder.CloseComponent();
+            builder.AddMarkupContent(2, "\r\n");
+            builder.OpenComponent<AnotherTest.FooterComponent>(3);
+            builder.AddAttribute(4, "Footer", "feet");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..1e37dae58c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - AnotherTest
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (39:3,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
+                    ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.SingleQuotes
+                        HtmlContent - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - head
+                HtmlContent - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (92:5,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - FooterComponent
+                    ComponentAttribute - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - AttributeStructure.SingleQuotes
+                        HtmlContent - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - feet

From 3c5903095aa73855067669e4998dbabd687e8125 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 30 Apr 2019 20:32:16 -0700
Subject: [PATCH 145/337] Fix invalid cast in non-generic parameterized
 ChildContent \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/5ca26a352ee044295c4d48f1f19f7a18f4294e2c

---
 .../Components/ComponentGenericTypePass.cs    |  2 +-
 .../ComponentCodeGenerationTestBase.cs        | 33 ++++++++
 .../TestComponent.codegen.cs                  | 76 +++++++++++++++++++
 .../TestComponent.ir.txt                      | 29 +++++++
 .../TestComponent.mappings.txt                | 15 ++++
 .../TestComponent.codegen.cs                  | 66 ++++++++++++++++
 .../TestComponent.ir.txt                      | 22 ++++++
 7 files changed, 242 insertions(+), 1 deletion(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index ee92d484a6..5bb6e89414 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     else if (childContent.IsParameterized)
                     {
                         // This is a weakly typed parameterized child content, treat it as RenderFragment<object>
-                        childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + "<System.Object>";
+                        //childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + "<System.Object>";
                     }
                     else
                     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 923c8bcabe..1dd1a838c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2655,6 +2655,39 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void ChildComponent_NonGenericParameterizedChildContent_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+
+        [Parameter] RenderFragment<TItem> GenericFragment { get; set; }
+
+        [Parameter] RenderFragment<int> IntFragment { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")"">
+  <GenericFragment>@context.ToLower()</GenericFragment>
+  <IntFragment>@context</IntFragment>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void GenericComponent_WithFullyQualifiedTagName()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a6b1234125
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,76 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+              __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+          __o = context;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..9fc99566f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (32:1,2 [53] x:\dir\subdir\Test\TestComponent.cshtml) - GenericFragment - context
+                        CSharpExpression - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (89:2,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntFragment - context
+                        CSharpExpression - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0566a1dd01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
+Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1151:33,20 [17] )
+|context.ToLower()|
+
+Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|context|
+Generated Location: (1370:42,16 [7] )
+|context|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3bd44ddf68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , 2, (context) => (builder2) => {
+                builder2.AddContent(3, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
+            }
+            , 4, (context) => (builder2) => {
+                builder2.AddContent(5, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                context
+
+#line default
+#line hidden
+#nullable disable
+                );
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..62a5b6d11d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (32:1,2 [53] x:\dir\subdir\Test\TestComponent.cshtml) - GenericFragment - context
+                        CSharpExpression - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (89:2,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntFragment - context
+                        CSharpExpression - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0

From 2050916767ce37b0a22f1bd5e9273af426a33512 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 30 Apr 2019 20:20:33 -0700
Subject: [PATCH 146/337] Add @code directive support for Blazor \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/7dc5887b49de6b55953bd313a2ac1bd83aa5a47d

---
 .../src/Components/ComponentCodeDirective.cs  |  29 ++++
 .../Components/ComponentCodeDirectivePass.cs  |  27 ++++
 .../src/RazorProjectEngine.cs                 |   1 +
 .../ComponentCodeGenerationTestBase.cs        | 140 +++++++++---------
 .../test/RazorProjectEngineTest.cs            |   3 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithKey/TestComponent.ir.txt    |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithRef/TestComponent.ir.txt    |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Element_WithKey/TestComponent.codegen.cs  |   2 +-
 .../Element_WithKey/TestComponent.ir.txt      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Element_WithRef/TestComponent.codegen.cs  |   2 +-
 .../Element_WithRef/TestComponent.ir.txt      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Regression_597/TestComponent.codegen.cs   |   2 +-
 .../Regression_597/TestComponent.ir.txt       |   8 +-
 .../Regression_597/TestComponent.mappings.txt |   4 +-
 .../Regression_609/TestComponent.codegen.cs   |   2 +-
 .../Regression_609/TestComponent.ir.txt       |   8 +-
 .../Regression_609/TestComponent.mappings.txt |   4 +-
 .../Regression_784/TestComponent.codegen.cs   |   2 +-
 .../Regression_784/TestComponent.ir.txt       |   8 +-
 .../Regression_784/TestComponent.mappings.txt |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  18 +--
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithKey/TestComponent.ir.txt    |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithRef/TestComponent.ir.txt    |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Element_WithKey/TestComponent.codegen.cs  |   2 +-
 .../Element_WithKey/TestComponent.ir.txt      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Element_WithRef/TestComponent.codegen.cs  |   2 +-
 .../Element_WithRef/TestComponent.ir.txt      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Regression_597/TestComponent.codegen.cs   |   2 +-
 .../Regression_597/TestComponent.ir.txt       |   4 +-
 .../Regression_597/TestComponent.mappings.txt |   4 +-
 .../Regression_609/TestComponent.codegen.cs   |   2 +-
 .../Regression_609/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.mappings.txt |   4 +-
 .../Regression_784/TestComponent.codegen.cs   |   2 +-
 .../Regression_784/TestComponent.ir.txt       |   4 +-
 .../Regression_784/TestComponent.mappings.txt |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 419 files changed, 865 insertions(+), 807 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs
new file mode 100644
index 0000000000..a7813ee4bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public static class ComponentCodeDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "code",
+            DirectiveKind.CodeBlock,
+            builder =>
+            {
+                builder.Description = Resources.FunctionsDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive, FileKinds.Component);
+            builder.Features.Add(new ComponentCodeDirectivePass());
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs
new file mode 100644
index 0000000000..c45f1205d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs
@@ -0,0 +1,27 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentCodeDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null)
+            {
+                return;
+            }
+
+            foreach (var code in documentNode.FindDirectiveReferences(ComponentCodeDirective.Directive))
+            {
+                for (var i = 0; i < code.Node.Children.Count; i++)
+                {
+                    @class.Children.Add(code.Node.Children[i]);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index 7155a3c2e7..a150dc7020 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -211,6 +211,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.Features.Add(new ComponentImportProjectFeature());
 
             // Directives (conditional on file kind)
+            ComponentCodeDirective.Register(builder);
             ComponentInjectDirective.Register(builder);
             ComponentLayoutDirective.Register(builder);
             ComponentPageDirective.Register(builder);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 923c8bcabe..14c0cc8584 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -40,7 +40,7 @@ namespace Test
 
 @{ RenderChildComponent(builder); }
 
-@functions {
+@code {
     void RenderChildComponent(RenderTreeBuilder builder)
     {
         <MyComponent />
@@ -167,7 +167,7 @@ namespace Test
     @ChildContent(item2);
     </p>
 }
-@functions {
+@code {
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
     [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
@@ -378,7 +378,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -458,7 +458,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""42"";
 }");
 
@@ -497,7 +497,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -530,7 +530,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""42"";
 }");
 
@@ -567,7 +567,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -599,7 +599,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value-OnChanged=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -629,7 +629,7 @@ namespace Test
 
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value-OnChanged=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -666,7 +666,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -703,7 +703,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -740,7 +740,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -779,7 +779,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-SomeParam=""ParentValue"" />
-@functions {
+@code {
     public DateTime ParentValue { get; set; } = DateTime.Now;
 }");
 
@@ -816,7 +816,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-SomeParam=""ParentValue"" />
-@functions {
+@code {
     public DateTime ParentValue { get; set; } = DateTime.Now;
 }");
 
@@ -845,7 +845,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <div bind=""@ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""hi"";
 }");
 
@@ -873,7 +873,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <div bind-value=""ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""hi"";
 }");
 
@@ -901,7 +901,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <div bind-value=""@ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""hi"";
 }");
 
@@ -919,7 +919,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input bind=""@ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -937,7 +937,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind=""@CurrentDate"" format-value=""MM/dd/yyyy""/>
-@functions {
+@code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
 
@@ -955,7 +955,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind=""@CurrentDate"" format-value=""@Format""/>
-@functions {
+@code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = ""MM/dd/yyyy"";
@@ -975,7 +975,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind=""@ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -993,7 +993,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input type=""checkbox"" bind=""@Enabled"" />
-@functions {
+@code {
     public bool Enabled { get; set; }
 }");
 
@@ -1011,7 +1011,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind-value-onchange=""@ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -1029,7 +1029,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind-value-onchange=""@CurrentDate"" format-value=""MM/dd"" />
-@functions {
+@code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
 
@@ -1640,7 +1640,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@(EventCallback.Factory.Create(this, Increment))""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment() {
         counter++;
@@ -1675,7 +1675,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@(EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment))""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment() {
         counter++;
@@ -1710,7 +1710,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment() {
         counter++;
@@ -1745,7 +1745,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment(object e) {
         counter++;
@@ -1780,7 +1780,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private Task Increment() {
         counter++;
@@ -1816,7 +1816,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private Task Increment(object e) {
         counter++;
@@ -1852,7 +1852,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment() {
         counter++;
@@ -1887,7 +1887,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment(UIMouseEventArgs e) {
         counter++;
@@ -1922,7 +1922,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private Task Increment() {
         counter++;
@@ -1958,7 +1958,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
         counter++;
@@ -1994,7 +1994,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment(UIChangeEventArgs e) {
         counter++;
@@ -2038,7 +2038,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@(e => { Increment(); })""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment() {
         counter++;
@@ -2073,7 +2073,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <DynamicElement onclick=""@OnClick"" />
 
-@functions {
+@code {
     private Action<UIMouseEventArgs> OnClick { get; set; }
 }");
 
@@ -2105,7 +2105,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment(UIEventArgs e) {
         counter++;
@@ -2171,7 +2171,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input onclick=""@OnClick"" />
-@functions {
+@code {
     void OnClick() {
     }
 }");
@@ -2190,7 +2190,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input onclick=""@OnClick"" />
-@functions {
+@code {
     void OnClick(UIMouseEventArgs e) {
     }
 }");
@@ -2209,7 +2209,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input onclick=""@OnClick"" />
-@functions {
+@code {
     void OnClick(UIEventArgs e) {
     }
 }");
@@ -2229,7 +2229,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
 <input onclick=""@OnClick"" />
-@functions {
+@code {
     Task OnClick() 
     {
         return Task.CompletedTask;
@@ -2251,7 +2251,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
 <input onclick=""@OnClick"" />
-@functions {
+@code {
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
@@ -2321,7 +2321,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <input onclick=""@OnClick"" />
-@functions {
+@code {
     void OnClick(UIMouseEventArgs e) {
     }
 }");
@@ -2492,7 +2492,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent TItem=string bind-Item=Value/>
-@functions {
+@code {
     string Value;
 }");
 
@@ -2526,7 +2526,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Item=Value/>
-@functions {
+@code {
     string Value;
 }");
 
@@ -2555,7 +2555,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent TItem=string bind-Item=Value/>
-@functions {
+@code {
     string Value;
 }");
 
@@ -2585,7 +2585,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Item=Value Value=@(18)/>
-@functions {
+@code {
     string Value;
 }");
 
@@ -2788,7 +2788,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent TItem=int Item=""3"" key=""_someKey"" />
 
-@functions {
+@code {
     private object _someKey = new object();
 }
 ");
@@ -2819,7 +2819,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent Item=""3"" key=""_someKey"" />
 
-@functions {
+@code {
     private object _someKey = new object();
 }
 ");
@@ -2850,7 +2850,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent TItem=int Item=""3"" ref=""_my"" />
 
-@functions {
+@code {
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 }
@@ -2882,7 +2882,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent Item=""3"" ref=""_my"" />
 
-@functions {
+@code {
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 }
@@ -2924,7 +2924,7 @@ namespace Test.Shared
 @using Test.Shared
 <MyComponent Item=""3"" Foo=""@Hello"" />
 
-@functions {
+@code {
     MyClass Hello = new MyClass();
 }
 ");
@@ -2946,7 +2946,7 @@ namespace Test.Shared
             var generated = CompileToCSharp(@"
 <elem attributebefore=""before"" key=""someObject"" attributeafter=""after"">Hello</elem>
 
-@functions {
+@code {
     private object someObject = new object();
 }
 ");
@@ -2964,7 +2964,7 @@ namespace Test.Shared
             var generated = CompileToCSharp(@"
 <input type=""text"" data-slider-min=""@Min"" key=""@someObject"" />
 
-@functions {
+@code {
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
@@ -2996,7 +2996,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent ParamBefore=""before"" key=""someDate.Day"" ParamAfter=""after"" />
 
-@functions {
+@code {
     private DateTime someDate = DateTime.Now;
 }
 ");
@@ -3046,7 +3046,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <elem attributebefore=""before"" ref=""myElem"" attributeafter=""after"">Hello</elem>
 
-@functions {
+@code {
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 }
@@ -3065,7 +3065,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <input type=""text"" data-slider-min=""@Min"" ref=""@_element"" />
 
-@functions {
+@code {
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
@@ -3098,7 +3098,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent ParamBefore=""before"" ref=""myInstance"" ParamAfter=""after"" />
 
-@functions {
+@code {
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 }
@@ -3131,7 +3131,7 @@ namespace Test
     Some <el>further</el> content
 </MyComponent>
 
-@functions {
+@code {
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 }
@@ -3157,7 +3157,7 @@ namespace Test
 @{
     RenderFragment<Person> p = (person) => @<div>@person.Name</div>;
 }
-@functions {
+@code {
     class Person
     {
         public string Name { get; set; }
@@ -3178,7 +3178,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @(RenderPerson((person) => @<div>@person.Name</div>))
-@functions {
+@code {
     class Person
     {
         public string Name { get; set; }
@@ -3201,7 +3201,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @RenderPerson(@<div>HI</div>)
-@functions {
+@code {
     object RenderPerson(RenderFragment p) => null;
 }");
 
@@ -3219,7 +3219,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @RenderPerson((person) => @<div>@person.Name</div>)
-@functions {
+@code {
     class Person
     {
         public string Name { get; set; }
@@ -3255,7 +3255,7 @@ namespace Test
 @{
     RenderFragment<Person> p = (person) => @<div><MyComponent Name=""@person.Name""/></div>;
 }
-@functions {
+@code {
     class Person
     {
         public string Name { get; set; }
@@ -3294,7 +3294,7 @@ namespace Test
 @(""hello, world!"")
 </MyComponent>
 
-@functions {
+@code {
     class Person
     {
         public string Name { get; set; }
@@ -3536,7 +3536,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
     <elem attr=@Foo />
-    @functions {
+    @code {
         int Foo = 18;
     }
 ");
@@ -3754,7 +3754,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <Counter bind-v=""y"" />
-@functions {
+@code {
     string y = null;
 }
 ");
@@ -3789,7 +3789,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <User bind-Name=""@UserName"" bind-IsActive=""@UserIsActive"" />
 
-@functions {
+@code {
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 }
@@ -3880,7 +3880,7 @@ Welcome to your new app.
             // Act
             var generated = CompileToCSharp(@"
 <p onmouseover=""@OnComponentHover"" style=""background: @ParentBgColor;"" />
-@functions {
+@code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
     public void OnComponentHover(UIMouseEventArgs e)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 298be4f46f..714eba41a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Language.Test
+namespace Microsoft.AspNetCore.Razor.Language
 {
     public class RazorProjectEngineTest
     {
@@ -47,6 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
                 features,
                 feature => Assert.IsType<ComponentBindLoweringPass>(feature),
                 feature => Assert.IsType<ComponentChildContentDiagnosticPass>(feature),
+                feature => Assert.IsType<ComponentCodeDirectivePass>(feature),
                 feature => Assert.IsType<ComponentComplexAttributeContentPass>(feature),
                 feature => Assert.IsType<ComponentDocumentClassifierPass>(feature),
                 feature => Assert.IsType<ComponentEventHandlerLoweringPass>(feature),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index c09bfd39b5..4373ee345a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -39,7 +39,7 @@ using System.Threading.Tasks;
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index f3563c7527..dc57096a4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -24,5 +24,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 17c648438c..b1c23219e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -8,14 +8,14 @@ Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1113:31,17 [7] )
 |OnClick|
 
-Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1319:41,12 [91] )
+Generated Location: (1314:41,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index dd3bd717fa..aa6e62e133 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -39,7 +39,7 @@ using System.Threading.Tasks;
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     Task OnClick() 
     {
         return Task.CompletedTask;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 36fc31d61d..5fab4ce25a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -24,5 +24,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 7853aada67..43e8394eab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -8,14 +8,14 @@ Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1113:31,17 [7] )
 |OnClick|
 
-Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1319:41,12 [73] )
+Generated Location: (1314:41,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 28b9f38c38..96ad4ffb32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -46,7 +46,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index 07fc52d174..2066065fcf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -28,5 +28,5 @@ Document -
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 75ec1243e6..0fdf000ac5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2038:48,12 [50] )
+Generated Location: (2033:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index d9c8894512..a06830b239 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -41,7 +41,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime ParentValue { get; set; } = DateTime.Now;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 31cdafe918..4e9fa74cd2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -28,8 +28,8 @@ Document -
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index a8393bab66..077b0c0680 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1018:25,29 [11] )
 |ParentValue|
 
-Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1611:43,12 [65] )
+Generated Location: (1606:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 90e7455448..a6f189ff49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 2e10ee50f2..294e192e04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 7c0d91e13d..faaaa9256e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1879:47,12 [50] )
+Generated Location: (1874:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index cae5b1a772..f3357a0b84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "42";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index b8a0b3ce1f..3d087d94cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 314fa2582d..1d7e5aa349 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1879:47,12 [55] )
+Generated Location: (1874:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index b31f4bddb4..87f27b3d18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 44efeecc6a..3b8d1525ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
                 HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 3030c4f451..81e5a357dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1022:25,35 [11] )
 |ParentValue|
 
-Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1632:47,12 [50] )
+Generated Location: (1627:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 1a3197469a..656fc8534b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 5032a30534..f3cedf3203 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 09d3d3d00f..231f240274 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (951:25,35 [11] )
 |ParentValue|
 
-Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1600:46,12 [50] )
+Generated Location: (1595:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index ae77121e8a..cdf966ed88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -46,7 +46,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index c5c176d9f9..c6fa2318d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -28,5 +28,5 @@ Document -
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 6120312d7d..f224cb9acd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1781:48,12 [50] )
+Generated Location: (1776:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index abbdb266cc..3c39f5d5be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -41,7 +41,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime ParentValue { get; set; } = DateTime.Now;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 7dd845774f..4bd24821f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -28,8 +28,8 @@ Document -
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index a37e623514..9faf66a20a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1018:25,29 [11] )
 |ParentValue|
 
-Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1454:43,12 [65] )
+Generated Location: (1449:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index b72fcc8147..3867a27f26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 4aefefe530..acfd4c8c2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index d4e92fed42..fea0b0a3ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1622:47,12 [50] )
+Generated Location: (1617:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 42ac007a96..84daca5cb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 80bbc2c4b6..342194d7a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index e04cac446a..0031d34cbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (941:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1590:46,12 [50] )
+Generated Location: (1585:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 735861778c..c99c8ffd99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "42";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index dc73410b73..cf93b36769 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
                 HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 5416eade1e..6623f23561 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1622:47,12 [55] )
+Generated Location: (1617:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index f86a75020b..95f7a273d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index b5846fe609..526e3587b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -30,5 +30,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
                 HtmlContent - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index f02cd47db4..031d39cb44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (957:25,41 [11] )
 |CurrentDate|
 
-Source Location: (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1325:36,12 [77] )
+Generated Location: (1320:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index a63340e070..1b9ea03181 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 4977a3ab4e..e094fc08ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -28,5 +28,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (56:0,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (56:0,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index c36485f06d..8b3b1de528 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (957:25,41 [11] )
 |ParentValue|
 
-Source Location: (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1307:36,12 [50] )
+Generated Location: (1302:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index e2ba6b0dd2..cc42c20393 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "hi";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index aa1c259149..6f856b28ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 1ffd60a4b9..4e98c7071a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (934:25,18 [11] )
 |ParentValue|
 
-Source Location: (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1284:36,12 [55] )
+Generated Location: (1279:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index fa52a6bb97..49dca9c636 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "hi";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 25924af8c1..0d541e1fee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (32:0,32 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (32:0,32 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index c27f26a64c..3b643e8d77 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (933:25,17 [11] )
 |ParentValue|
 
-Source Location: (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1283:36,12 [55] )
+Generated Location: (1278:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 487a8fa05f..b35b8910b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "hi";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index c4d058de00..5d7c1694b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 0852258114..0e1dfed8d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (928:25,12 [11] )
 |ParentValue|
 
-Source Location: (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1278:36,12 [55] )
+Generated Location: (1273:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 777e227cb5..97963e1069 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public bool Enabled { get; set; }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 3750a696d2..bd3f53c385 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -28,5 +28,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
+            CSharpCode - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index f3d6dd43fd..92bcd2a776 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (946:25,30 [7] )
 |Enabled|
 
-Source Location: (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1284:36,12 [41] )
+Generated Location: (1279:36,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index bd6cd48d7a..a117c06d33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -42,7 +42,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index d89291db41..c9a15a829c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -30,5 +30,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
                 HtmlContent - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
+            CSharpCode - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index e5a86aed7c..467143fcae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -8,13 +8,13 @@ Source Location: (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1145:33,54 [6] )
 |Format|
 
-Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1498:44,12 [135] )
+Generated Location: (1493:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index ce862e532c..cee9422fe4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 33afa67bef..8cdcdf879a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -30,5 +30,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
                 HtmlContent - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 43285d3976..e339f220e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (942:25,26 [11] )
 |CurrentDate|
 
-Source Location: (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:36,12 [77] )
+Generated Location: (1315:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 189e7a5983..0749e043ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index 5182498d51..66b904e0f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -28,5 +28,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index e76707e015..fbd25c513a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (942:25,26 [11] )
 |ParentValue|
 
-Source Location: (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1292:36,12 [50] )
+Generated Location: (1287:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index aed8c9f08f..8fcbe07e1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 96e38ebbc8..a9e7aa6d1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 8342633c6b..3a348e5162 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (930:25,14 [11] )
 |ParentValue|
 
-Source Location: (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1280:36,12 [50] )
+Generated Location: (1275:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index 453eb73db9..a9dc1f50a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -54,7 +54,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 49639937b0..7f13867d70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -27,5 +27,5 @@ Document -
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index aaa2b68968..5273e8b562 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -8,11 +8,11 @@ Source Location: (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1207:34,36 [5] )
 |Value|
 
-Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1801:56,12 [21] )
+Generated Location: (1796:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 2df6020001..6e03826954 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -53,7 +53,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index f77e517c18..710c3f96d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -27,5 +27,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
                 HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 85ff3e8f1d..5a8c83cecf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -8,11 +8,11 @@ Source Location: (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1142:34,36 [5] )
 |Value|
 
-Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1775:55,12 [21] )
+Generated Location: (1770:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 3db47366db..1b3f9a7f88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -48,7 +48,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 07f91d041b..54b8422f6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -28,8 +28,8 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 543949f892..1657e03dbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -8,11 +8,11 @@ Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1193:33,23 [5] )
 |Value|
 
-Source Location: (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1661:50,12 [21] )
+Generated Location: (1656:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index f6f82e0752..c41b5245ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -41,7 +41,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index f9575ed34e..bad13d8f03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -25,8 +25,8 @@ Document -
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index a80e996e10..8c9be647da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,23 [5] )
 |Value|
 
-Source Location: (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1413:43,12 [21] )
+Generated Location: (1408:43,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index a114c0e016..72033f5018 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -38,7 +38,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         #pragma warning restore 1998
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void RenderChildComponent(RenderTreeBuilder builder)
     {
         
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index 52b3697fa3..0b84449cc5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -21,8 +21,8 @@ Document -
                     IntermediateToken - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
                 HtmlContent - (91:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (91:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (105:4,12 [75] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (105:4,12 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
-            Component - (180:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            CSharpCode - (195:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (195:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+            CSharpCode - (100:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (100:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
+            Component - (175:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            CSharpCode - (190:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (190:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 985e5c4be8..575bb38de0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -8,22 +8,22 @@ Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1016:31,2 [32] )
 | RenderChildComponent(builder); |
 
-Source Location: (105:4,12 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (100:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
         |
-Generated Location: (1231:40,12 [75] )
+Generated Location: (1226:40,7 [75] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
         |
 
-Source Location: (195:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (190:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1738:60,23 [9] )
+Generated Location: (1733:60,23 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index a8cadf9d77..31e7207d19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(UIEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 75e06a12bd..6541f42012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 0c9f991a15..e46f680576 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (949:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(UIEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1456:45,12 [100] )
+Generated Location: (1451:45,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 6f0ba1a5ef..3b45f1d2e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index e0c4d9677c..74e0e162f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); }
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index d7e31882d9..65359f3fc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (950:25,24 [21] )
 |e => { Increment(); }|
 
-Source Location: (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1469:45,12 [87] )
+Generated Location: (1464:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 4ee232844a..1fd65b306f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(DynamicElement);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Action<UIMouseEventArgs> OnClick { get; set; }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 6d648537c1..d5afb9c0dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -22,5 +22,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index f5bc8cb495..df73069bc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1006:25,26 [7] )
 |OnClick|
 
-Source Location: (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1514:45,12 [62] )
+Generated Location: (1509:45,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index ed8aaa4fec..999fd09999 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -74,7 +74,7 @@ __o = ChildContent(item2);
         #pragma warning restore 1998
 #nullable restore
 #line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
     [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index 8d69ff1d2a..cca19b4e53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -38,5 +38,5 @@ Document -
                     IntermediateToken - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n}
                 HtmlContent - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
+            CSharpCode - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 59e8cff237..f88eb29669 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -34,13 +34,13 @@ Generated Location: (1729:66,8 [3] )
 |
 }|
 
-Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
     [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1916:76,12 [164] )
+Generated Location: (1911:76,7 [164] )
 |
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index b3049fa6f9..b94503cbc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private DateTime someDate = DateTime.Now;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 6b4cf2695b..f99e09eeab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                             IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (74:0,74 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (74:0,74 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (140:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (140:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
+                HtmlContent - (135:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (135:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index c1f44c953c..c1e34d8309 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1108:30,39 [12] )
 |someDate.Day|
 
-Source Location: (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1467:47,12 [49] )
+Generated Location: (1462:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 7920f10a2f..87a84ecb4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index ff79f7dc58..ee0b18b63b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                             IntermediateToken - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (72:0,72 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (72:0,72 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (193:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (193:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                HtmlContent - (188:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (188:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index a7f00bd62c..2ccd73f066 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1079:29,39 [10] )
 |myInstance|
 
-Source Location: (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1449:45,12 [104] )
+Generated Location: (1444:45,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 00584b3e3f..dd57b94294 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -42,7 +42,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 38cb6bc12a..215e15bc45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -29,7 +29,7 @@ Document -
                             IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
                 HtmlContent - (96:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (96:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (217:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (217:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                HtmlContent - (212:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (212:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 194848e3d0..3f828bcc10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1035:28,18 [10] )
 |myInstance|
 
-Source Location: (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1405:44,12 [104] )
+Generated Location: (1400:44,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 445881ed56..e63c6841a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private object someObject = new object();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 5761655406..3c509b3043 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -26,7 +26,7 @@ Document -
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (83:0,83 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (83:0,83 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (149:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (149:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
+                HtmlContent - (144:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (144:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index eb409186f8..88f0d00c1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (908:25,36 [10] )
 |someObject|
 
-Source Location: (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1117:35,12 [49] )
+Generated Location: (1112:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 897386b74a..bb720613b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -42,7 +42,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index 55b45fa3e4..dc0d9ff81b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                     SetKey - (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
                 HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (191:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (191:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
+                HtmlContent - (186:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (186:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index aa3e3e4fdc..223ec0be82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -8,13 +8,13 @@ Source Location: (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1117:34,48 [10] )
 |someObject|
 
-Source Location: (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
     |
-Generated Location: (1326:44,12 [112] )
+Generated Location: (1321:44,7 [112] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 68e8aaf2bb..59e26ae7db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index e5b8711527..ecc56cb57f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -26,7 +26,7 @@ Document -
                             IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
+                HtmlContent - (213:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (213:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 8218ca0d18..937a6ec433 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (879:24,36 [6] )
 |myElem|
 
-Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1123:33,12 [122] )
+Generated Location: (1118:33,7 [122] )
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index c641fbe40a..cef470a901 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -40,7 +40,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 1272ebf797..93674cd23a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                     ReferenceCapture - (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
                 HtmlContent - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (238:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (238:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
+                HtmlContent - (233:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (233:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 4e1d9dd4ab..c0ce653e42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -8,14 +8,14 @@ Source Location: (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1088:33,48 [8] )
 |_element|
 
-Source Location: (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1334:42,12 [161] )
+Generated Location: (1329:42,7 [161] )
 |
         private ElementRef _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index ce54991fb6..15e652f044 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index 47ad195c1d..b5c8912a82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
                 HtmlContent - (91:0,91 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (91:0,91 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index bac2858c5e..c41b34a815 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1158:25,24 [63] )
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
 
-Source Location: (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1720:45,12 [87] )
+Generated Location: (1715:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 826cd5d87e..95ff31d12a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index f68d967ea0..4af13ee8b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 3479efe7a8..66c6ba82b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1157:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1665:45,12 [87] )
+Generated Location: (1660:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 94d6ca2cb0..5458606369 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(UIMouseEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 2f4d599b7d..e53ed45aae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 723b1b2ac9..d49b4b109b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1157:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1665:45,12 [105] )
+Generated Location: (1660:45,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index abbe46e55b..d837a6e56e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index e6fd0d2801..cdbe950c2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 421ff53ca1..2d4d8d0b2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1157:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
@@ -11,7 +11,7 @@ Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1665:45,12 [141] )
+Generated Location: (1660:45,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 2d37e4be90..87b4996556 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 445dd76970..20092e795c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index d53287cf4d..9c63a90996 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1157:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment() {
@@ -11,7 +11,7 @@ Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1665:45,12 [123] )
+Generated Location: (1660:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index ac12bd09b2..fe5e75441a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(UIChangeEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index eac45d2050..e90ef0ae9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index f34b51e3d3..7458a896e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1157:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1665:45,12 [106] )
+Generated Location: (1660:45,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index b0c92cd8bc..d9451b8187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index e83ebeffd2..ef4fa09760 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create(this, Increment)
                 HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 55655c1d30..67bac6500c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1058:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
-Source Location: (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1602:45,12 [87] )
+Generated Location: (1597:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 843fab53d2..bb1977b151 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index f68d967ea0..4af13ee8b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 673c329a44..8bc4fdbc56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1057:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1565:45,12 [87] )
+Generated Location: (1560:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index f4653e8585..eb10185e7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(object e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index 926575c76f..e60135c9b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(object e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(object e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 3011faef6b..7622fc9b19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1057:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(object e) {
         counter++;
     }
 |
-Generated Location: (1565:45,12 [95] )
+Generated Location: (1560:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 042d99e6d4..d5654eca4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 445dd76970..20092e795c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index fb3bf350e3..2b9ee7f0a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1057:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment() {
@@ -11,7 +11,7 @@ Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1565:45,12 [123] )
+Generated Location: (1560:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index 8a5b6061ad..b8e065d586 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment(object e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 4f1fa1372d..0b7403d8c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(object e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(object e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 87425df183..e266bc22f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1057:25,23 [9] )
 |Increment|
 
-Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment(object e) {
@@ -11,7 +11,7 @@ Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1565:45,12 [131] )
+Generated Location: (1560:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 53f7322056..a42a603e25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick(UIEventArgs e) {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index 9e59b40b2c..81f387c69e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -22,5 +22,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 13cf599f32..7cf5ff3937 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1203:35,12 [44] )
+Generated Location: (1198:35,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 0e120d6271..12d154ab22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick(UIMouseEventArgs e) {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 1316965374..0406131459 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -22,5 +22,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index ba63e4cc8f..e1f412da5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1203:35,12 [49] )
+Generated Location: (1198:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 0e120d6271..12d154ab22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick(UIMouseEventArgs e) {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 1316965374..0406131459 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -22,5 +22,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index ba63e4cc8f..e1f412da5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1203:35,12 [49] )
+Generated Location: (1198:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index f64be0176a..1ba6d3e13b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick() {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index cd13c7b59e..f52918c227 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -22,5 +22,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 18396d822c..b914ee847f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1203:35,12 [31] )
+Generated Location: (1198:35,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 467b5e6fc4..cbb6a639d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -55,7 +55,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     MyClass Hello = new MyClass();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index 36a1b2e204..94be1bdd45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -25,10 +25,10 @@ Document -
                             IntermediateToken - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Hello
                 HtmlContent - (57:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (57:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (112:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (112:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyClass Hello = new MyClass();\n
+                HtmlContent - (107:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (107:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyClass Hello = new MyClass();\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index ccc603195e..cda9595eaa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -13,11 +13,11 @@ Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1266:40,28 [5] )
 |Hello|
 
-Source Location: (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1620:57,12 [38] )
+Generated Location: (1615:57,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index b1223bb9d1..d39f677c00 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -59,7 +59,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
index f6f283aa66..4eb10d3cc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -22,7 +22,7 @@ Document -
                     ReferenceCapture - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
                 HtmlContent - (44:0,44 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (44:0,44 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (151:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (151:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                HtmlContent - (146:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (146:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index d437d43c76..3b28a65192 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -13,12 +13,12 @@ Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1468:45,37 [3] )
 |_my|
 
-Source Location: (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1838:61,12 [90] )
+Generated Location: (1833:61,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index 3dd6700184..184ad28e8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -49,7 +49,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
index 1142c69315..5d862207c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -20,10 +20,10 @@ Document -
                     ReferenceCapture - (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
                 HtmlContent - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (141:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (141:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                HtmlContent - (136:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (136:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index 9a1d1b48e5..30593196a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -8,12 +8,12 @@ Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1139:33,27 [3] )
 |_my|
 
-Source Location: (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1517:51,12 [90] )
+Generated Location: (1512:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 709829ce9a..eec991ebf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -61,7 +61,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private object _someKey = new object();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index 4738739183..1ad79ac195 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -22,7 +22,7 @@ Document -
                     SetKey - (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (113:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (113:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+                HtmlContent - (108:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (108:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 2a8f37b34e..ebf40d8adc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -13,11 +13,11 @@ Source Location: (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1497:46,37 [8] )
 |_someKey|
 
-Source Location: (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1854:63,12 [47] )
+Generated Location: (1849:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 1ee445b21c..9a8bf595bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -48,7 +48,7 @@ __o = typeof(MyComponent<>);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private object _someKey = new object();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index 3b5cc52c25..4f392ab65d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -20,10 +20,10 @@ Document -
                     SetKey - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
                 HtmlContent - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (103:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (103:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+                HtmlContent - (98:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (98:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 474623cead..e349879ef9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -8,11 +8,11 @@ Source Location: (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1125:33,27 [8] )
 |_someKey|
 
-Source Location: (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1482:50,12 [47] )
+Generated Location: (1477:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 3d1ead801b..cb715e3038 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -60,7 +60,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 6e406e4c06..15e21249c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -24,5 +24,5 @@ Document -
                                     IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
-            CSharpCode - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
+            CSharpCode - (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 5ca8299a2c..2bd8085ef4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -17,14 +17,14 @@ Generated Location: (1775:53,89 [3] )
 |;
 |
 
-Source Location: (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
         public string Name { get; set; }
     }
 |
-Generated Location: (1959:62,12 [76] )
+Generated Location: (1954:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 9dfc271226..cbc2108a2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -77,7 +77,7 @@ __o = typeof(MyComponent);
         #pragma warning restore 1998
 #nullable restore
 #line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index f0982c456a..280e1a3345 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -34,5 +34,5 @@ Document -
                             IntermediateToken - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 HtmlContent - (148:5,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (148:5,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
+            CSharpCode - (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 5e987e49f0..a788b4b35b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -22,14 +22,14 @@ Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (2023:61,6 [15] )
 |"hello, world!"|
 
-Source Location: (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
         public string Name { get; set; }
     }
 |
-Generated Location: (2402:79,12 [76] )
+Generated Location: (2397:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index d90bdc11f7..2c505c51ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -40,7 +40,7 @@ __o = RenderPerson((person) => (builder2) => {
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
index 73d7c93929..34ab875be8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -23,5 +23,5 @@ Document -
                     IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
                 HtmlContent - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
+            CSharpCode - (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index c7d0b77360..742d6a7d5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -13,7 +13,7 @@ Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1061:33,0 [1] )
 |)|
 
-Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
@@ -22,7 +22,7 @@ Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1246:42,12 [138] )
+Generated Location: (1241:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 0ceac8cd27..be1ed28b64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -48,7 +48,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
index f8eee8f857..2640488d84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -22,5 +22,5 @@ Document -
                             IntermediateToken - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
-            CSharpCode - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
+            CSharpCode - (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index 40172c00c3..4c6398ca2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -17,14 +17,14 @@ Generated Location: (1307:41,67 [3] )
 |;
 |
 
-Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
         public string Name { get; set; }
     }
 |
-Generated Location: (1491:50,12 [76] )
+Generated Location: (1486:50,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 80dcc8fa37..68892861e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -40,7 +40,7 @@ __o = RenderPerson((person) => (builder2) => {
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
index 90dbab8c07..25517a3745 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -23,5 +23,5 @@ Document -
                     IntermediateToken - (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
                 HtmlContent - (53:0,53 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (53:0,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
+            CSharpCode - (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 8221f7255d..59b3af43f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -13,7 +13,7 @@ Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1062:33,0 [1] )
 |)|
 
-Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
@@ -22,7 +22,7 @@ Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1247:42,12 [138] )
+Generated Location: (1242:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 8006e845bc..313c8e7a96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ __o = RenderPerson((builder2) => {
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     object RenderPerson(RenderFragment p) => null;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
index 2a7303aa83..f6be33ade2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -23,5 +23,5 @@ Document -
                     IntermediateToken - (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    object RenderPerson(RenderFragment p) => null;\n
+            CSharpCode - (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    object RenderPerson(RenderFragment p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 19dac0282c..6086dc709f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -8,11 +8,11 @@ Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (882:26,0 [1] )
 |)|
 
-Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1067:35,12 [54] )
+Generated Location: (1062:35,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index eca30bb15e..68adb93595 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ __o = typeof(Counter);
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string y = null;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index a4af660422..e90a860372 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -25,7 +25,7 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
                 HtmlContent - (22:0,22 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (22:0,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (61:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (61:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
+                HtmlContent - (56:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 0e0aa6fc54..3e9a2934bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (933:25,17 [1] )
 |y|
 
-Source Location: (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1548:46,12 [24] )
+Generated Location: (1543:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 6096e875d6..088fa93c55 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -54,7 +54,7 @@ __o = typeof(User);
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index b266af66ef..25b2dadbe2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -33,7 +33,7 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
                 HtmlContent - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
+                HtmlContent - (160:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (160:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index abc41bbb0c..0c0fff94f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -8,12 +8,12 @@ Source Location: (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1331:35,44 [12] )
 |UserIsActive|
 
-Source Location: (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1976:56,12 [88] )
+Generated Location: (1971:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index e669a8073c..71d5915f96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -42,7 +42,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
     public void OnComponentHover(UIMouseEventArgs e)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 71b27fe456..2ba38a6f8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -29,7 +29,7 @@ Document -
                             IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
                 HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (220:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (220:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                HtmlContent - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 1eba11a4c9..d0728f1374 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1226:34,55 [13] )
 |ParentBgColor|
 
-Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
@@ -16,7 +16,7 @@ Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1437:44,12 [132] )
+Generated Location: (1432:44,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 231e828075..00fe07e182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -33,7 +33,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                
+           
         int Foo = 18;
     
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
index d199959b48..34f9b31b7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
                 HtmlContent - (18:0,18 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (18:0,18 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
-                HtmlContent - (66:3,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (66:3,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
+                HtmlContent - (61:3,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (61:3,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index f1deeb8e82..084be46be7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (875:25,12 [3] )
 |Foo|
 
-Source Location: (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1080:35,16 [29] )
+Generated Location: (1075:35,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 8c6a40562d..0de58c905e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ using System.Threading.Tasks;
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 399c79fbf9..69a9eeff22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 1451b01b75..8072d716d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1164:36,12 [91] )
+Generated Location: (1159:36,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index b2ba18a31a..344c8f5874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ using System.Threading.Tasks;
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     Task OnClick() 
     {
         return Task.CompletedTask;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index e045df0b85..f3ca73b95b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 5fb4940060..5b0eda19dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1164:36,12 [73] )
+Generated Location: (1159:36,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 18f9be0443..273d868ffa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index cad7ef3a56..c8c2c56a6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -19,5 +19,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 30ae174fdf..420e2d58b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1654:32,12 [50] )
+Generated Location: (1649:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 84861fbe8f..9a14ae9a6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime ParentValue { get; set; } = DateTime.Now;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 156beba869..bcdfe9a0be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -19,8 +19,8 @@ Document -
                     ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 3143063409..b5a974473d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1175:28,12 [65] )
+Generated Location: (1170:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index f51aa5d4f1..8fe1c1441d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index fa4b70a5a3..f5f15bd6da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 9d15af3156..940da5474e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1457:31,12 [50] )
+Generated Location: (1452:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 7ad0cca670..410b1222da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "42";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 53a27b541a..85465b70d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 1da79407a8..94a57340c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1457:31,12 [55] )
+Generated Location: (1452:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 389741c9a7..8b79a36fee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 5ec1bb5cc4..1a0472f8d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 370a63dbef..95edc8e771 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1207:31,12 [50] )
+Generated Location: (1202:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 08ae8e4a88..17d6de2e61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 9907d63a95..149dd07593 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 01da3d4890..3c5137f6b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (64:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1189:31,12 [50] )
+Generated Location: (1184:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 2701fcd7c5..ca2870a657 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 52809e93c7..c856556f0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -19,5 +19,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index ad80c046e4..10b3c22d11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1397:32,12 [50] )
+Generated Location: (1392:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index f6b5c27457..02085e382a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime ParentValue { get; set; } = DateTime.Now;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index c483685014..41bddb2dfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -19,8 +19,8 @@ Document -
                     ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 5adac04da0..711ee6031b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (58:1,12 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1018:28,12 [65] )
+Generated Location: (1013:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index cd9fa22ba0..0d1acba310 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 9dce118599..45d8b12864 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 07bc22cf2f..954aca0db1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1200:31,12 [50] )
+Generated Location: (1195:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 06da303e05..96dbe76fb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index a52c98c5ae..dc7728e1d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index a5857cf20c..f18c2582a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1182:31,12 [50] )
+Generated Location: (1177:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 338bcc9db1..c60bea398d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "42";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 2f934f1bd2..be4d0fa240 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index de7fb15a40..abf6fbc5eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (54:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1200:31,12 [55] )
+Generated Location: (1195:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 1b486284c0..7468db5040 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index d350e3759b..f3287fdd97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -21,5 +21,5 @@ Document -
                     HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
-            CSharpCode - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index a824ae7c1c..e6d06aeaf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (91:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1253:32,12 [77] )
+Generated Location: (1248:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index d2b22f3487..a0aa6809f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 9787ee9f83..35e51a87c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -19,5 +19,5 @@ Document -
                     HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 956c6c9eac..580244f905 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (70:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1235:32,12 [50] )
+Generated Location: (1230:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 3c2a9602ce..db9cbe1a68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "hi";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index ab63bfb395..9a361a39cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 2f04691a99..4edd804d60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (47:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1157:31,12 [55] )
+Generated Location: (1152:31,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index fb9e7ccf67..639024e1db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "hi";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 1e836cf823..7a39525651 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 2d6dd98cbb..84a627a667 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (46:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1156:31,12 [55] )
+Generated Location: (1151:31,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index cc1e202b96..a97c335691 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentValue { get; set; } = "hi";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index ca94912623..1c76bbb031 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index d34235b87b..998d07772c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (41:1,12 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1151:31,12 [55] )
+Generated Location: (1146:31,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 3be4b8370c..3d7b9908fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public bool Enabled { get; set; }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 3f6abcec30..996e143d6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -19,5 +19,5 @@ Document -
                     HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
-            CSharpCode - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
+            CSharpCode - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index ad6a5295be..350157a997 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (55:1,12 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1218:32,12 [41] )
+Generated Location: (1213:32,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index ffe3e4a0ef..c143f3dfa8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -38,7 +38,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index 535185bf7e..0456e35fab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -21,5 +21,5 @@ Document -
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
-            CSharpCode - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
+            CSharpCode - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index d39523d951..6c715d821c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
-Source Location: (77:1,12 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1426:40,12 [135] )
+Generated Location: (1421:40,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 2fa550228a..9954da9045 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index b861279676..18dea4fcb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -21,5 +21,5 @@ Document -
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
-            CSharpCode - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 4a1839babb..a1f634d6af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (80:1,12 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1248:32,12 [77] )
+Generated Location: (1243:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index c1df7a309a..1324378dd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index e8460e0172..962c2b16f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -19,5 +19,5 @@ Document -
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 5148fb018a..07745b86ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (55:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1220:32,12 [50] )
+Generated Location: (1215:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index bdc5dd0e4e..3f82eae8c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public int ParentValue { get; set; } = 42;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 635ae3b52f..73a34cc087 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 330659bde7..f3e83a6928 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (43:1,12 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1154:31,12 [50] )
+Generated Location: (1149:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index e4d60257df..dcd8b5d2f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 507cb3b6ff..5464babf8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -18,5 +18,5 @@ Document -
                     ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 5ff5ebcdb7..4f9c6e187b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1193:31,12 [21] )
+Generated Location: (1188:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index b534c2ad36..ddbeb749a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 49df14ba29..0fab1c428c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -18,5 +18,5 @@ Document -
                     ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
-            CSharpCode - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 0f7d1b7f63..ca8366015b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (57:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1181:31,12 [21] )
+Generated Location: (1176:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index d0e09be7b5..8d028ec52f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 062a02d6b9..52420833a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -19,8 +19,8 @@ Document -
                     ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
-            CSharpCode - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index dd7f79e761..b010f942d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (56:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1239:36,12 [21] )
+Generated Location: (1234:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 4bb0a503ff..9dd67956f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string Value;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 4224105200..253fd39767 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -16,8 +16,8 @@ Document -
                     ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-            CSharpCode - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index b6abf24e37..65853a0095 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (44:1,12 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (978:28,12 [21] )
+Generated Location: (973:28,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 200e63d32a..9f321806cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         #pragma warning restore 1998
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void RenderChildComponent(RenderTreeBuilder builder)
     {
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index db47792966..cd3363e1c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -10,12 +10,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-            CSharpCode - (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
-            HtmlContent - (172:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (172:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            Component - (180:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            HtmlContent - (195:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (195:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+            CSharpCode - (100:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (100:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
+            HtmlContent - (167:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (167:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            Component - (175:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            HtmlContent - (190:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (190:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (192:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (192:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 95294d9331..071ed039db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -3,21 +3,21 @@ Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (748:24,2 [32] )
 | RenderChildComponent(builder); |
 
-Source Location: (105:4,12 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (100:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
 |
-Generated Location: (963:33,12 [67] )
+Generated Location: (958:33,7 [67] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
 |
 
-Source Location: (197:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (192:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1328:46,0 [7] )
+Generated Location: (1323:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 38a3d12497..9b74c92242 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(UIEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 85f6936f79..fa48814866 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 02c2682477..4bba6c881d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (51:2,12 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(UIEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1015:30,12 [100] )
+Generated Location: (1010:30,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 1bbcf6de84..44f2ce580f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index d4e32be0ce..0a2b8aae72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [23] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); }
-            CSharpCode - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 8fe1b9e5e5..560b5d0eea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (65:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1028:30,12 [87] )
+Generated Location: (1023:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 217d4e9f5a..9557b72ba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Action<UIMouseEventArgs> OnClick { get; set; }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index dbd03cb47b..3505c7600a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 97f074133c..3af91c4f40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (53:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1073:30,12 [62] )
+Generated Location: (1068:30,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index f30ecf9dd1..3091495c95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -54,7 +54,7 @@ using Microsoft.AspNetCore.Components;
         #pragma warning restore 1998
 #nullable restore
 #line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
     [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index c9e8d088b3..e0d4be202a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -24,5 +24,5 @@ Document -
                     IntermediateToken - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n
-            CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
+            CSharpCode - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index d4c26ae07f..256b5f85a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -14,13 +14,13 @@ Generated Location: (1407:51,0 [3] )
 |}
 |
 
-Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
     [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1592:60,12 [164] )
+Generated Location: (1587:60,7 [164] )
 |
     [Parameter] TItem1 Item1 { get; set; }
     [Parameter] List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 0a8803d967..555f68fd9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -30,7 +30,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private DateTime someDate = DateTime.Now;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 021fc0aead..0fc62a7b62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -15,5 +15,5 @@ Document -
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
                         HtmlContent - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
+            CSharpCode - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index bdca049e18..2324498324 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (824:21,39 [12] )
 |someDate.Day|
 
-Source Location: (90:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1074:32,12 [49] )
+Generated Location: (1069:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index c69c27e91a..d9b85ce961 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 6f5c6fd73b..28b9ab348c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -15,5 +15,5 @@ Document -
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
                         HtmlContent - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+            CSharpCode - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 78905c9189..997fc133ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (863:21,39 [10] )
 |myInstance|
 
-Source Location: (88:2,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1155:33,12 [104] )
+Generated Location: (1150:33,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 140ec73509..0c3be4cc7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -35,7 +35,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 8429d43125..039db8551f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
                         HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-            CSharpCode - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+            CSharpCode - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index c81995fb79..48bf90426b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1068:27,18 [10] )
 |myInstance|
 
-Source Location: (112:4,12 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1360:39,12 [104] )
+Generated Location: (1355:39,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index fd9d0844f6..20d31360cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private object someObject = new object();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 5c5902d95a..9a3f8e91a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -17,5 +17,5 @@ Document -
                     HtmlAttribute -  - attributeafter=" - "
                         HtmlAttributeValue - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
+            CSharpCode - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index 0a63f5d85d..8c0e07e5a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (817:21,36 [10] )
 |someObject|
 
-Source Location: (99:2,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1108:33,12 [49] )
+Generated Location: (1103:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 176ad7f171..2b233a3819 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -38,7 +38,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index c4b3b00270..44ca421d42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -15,5 +15,5 @@ Document -
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
                     SetKey - (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
-            CSharpCode - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
+            CSharpCode - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 7530b38835..aa806f2daf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -3,13 +3,13 @@ Source Location: (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (987:29,48 [10] )
 |someObject|
 
-Source Location: (78:2,12 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
     |
-Generated Location: (1233:40,12 [112] )
+Generated Location: (1228:40,7 [112] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 3742f4769a..5e56244b2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index 980ea314bd..eb9d244a3f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -17,5 +17,5 @@ Document -
                     HtmlAttribute -  - attributeafter=" - "
                         HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
+            CSharpCode - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index f7fa9bfb00..6582ee8df1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (854:21,36 [6] )
 |myElem|
 
-Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1167:34,12 [122] )
+Generated Location: (1162:34,7 [122] )
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index cd5160e5d0..2deb04db31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -39,7 +39,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index ccb80d69fd..20bacd2168 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -15,5 +15,5 @@ Document -
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
                     ReferenceCapture - (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
-            CSharpCode - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
+            CSharpCode - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index d89985d042..9534848420 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1024:29,48 [8] )
 |_element|
 
-Source Location: (76:2,12 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1294:41,12 [161] )
+Generated Location: (1289:41,7 [161] )
 |
         private ElementRef _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 42c89177e0..43217052e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index a1bf9f052e..e1362a1622 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [66] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [65] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
-            CSharpCode - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 9847f94f4b..7f25195c96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (107:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1279:30,12 [87] )
+Generated Location: (1274:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 8a6dcef3a9..087c1bbb09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index d078e9f838..bf9f7bbe21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index ce19ff759b..f88a2a0c15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1224:30,12 [87] )
+Generated Location: (1219:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index fba47127eb..b78194b8f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(UIMouseEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 8ffcf0f2f8..16b93e72b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index b1f0904571..7947438c4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (51:2,12 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1224:30,12 [105] )
+Generated Location: (1219:30,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 46b47e62e8..5a757a9ce5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index 971b1c50fd..99c95e6564 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 4f6d62c7b1..5c5b98e08b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1224:30,12 [141] )
+Generated Location: (1219:30,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 9b610ea347..c178207da7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 7afae278f5..655b21550e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 2947d225fe..928dff3d85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment() {
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1224:30,12 [123] )
+Generated Location: (1219:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index e31f3279d2..8711835eb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(UIChangeEventArgs e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index 61663d52a8..e453150540 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 773637ed1a..70d422e683 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (51:2,12 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1224:30,12 [106] )
+Generated Location: (1219:30,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index dd3c834e4a..368c0e7874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index 671e0eaa78..59a76bd0f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [47] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create(this, Increment)
-            CSharpCode - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index e8bf5fae09..b674974a8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (89:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1161:30,12 [87] )
+Generated Location: (1156:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 900bd8565f..6c0812d2ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index d078e9f838..bf9f7bbe21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 429db666d4..735e41d00e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (51:2,12 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1124:30,12 [87] )
+Generated Location: (1119:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 0cf2cd6e74..f4befffb65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private void Increment(object e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index 9f309dd9c1..d54c458849 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(object e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(object e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index e13323479a..9e3525c5ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (51:2,12 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment(object e) {
         counter++;
     }
 |
-Generated Location: (1124:30,12 [95] )
+Generated Location: (1119:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 2976e7b94e..0cb7258c92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment() {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 7afae278f5..655b21550e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment() {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 7227cffb9d..93756a8c8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment() {
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1124:30,12 [123] )
+Generated Location: (1119:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index f8182381e5..f6261f15cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private int counter;
     private Task Increment(object e) {
         counter++;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index e279fbd20c..1302ce6e14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(object e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(object e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index a359c2f249..c222674df4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private Task Increment(object e) {
@@ -6,7 +6,7 @@ Source Location: (51:2,12 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1124:30,12 [131] )
+Generated Location: (1119:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index a479508721..899beb4979 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick(UIEventArgs e) {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index 1df9aeb647..bb5feca082 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 0bebeedecd..4e484723a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1048:30,12 [44] )
+Generated Location: (1043:30,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 77134a3d36..0352718012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick(UIMouseEventArgs e) {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 6beded8a09..297d1c1902 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 46ce97fccb..a253687898 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1048:30,12 [49] )
+Generated Location: (1043:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 77134a3d36..0352718012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick(UIMouseEventArgs e) {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 6beded8a09..297d1c1902 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 46ce97fccb..a253687898 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1048:30,12 [49] )
+Generated Location: (1043:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 89eb60c4e9..dc04883067 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     void OnClick() {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index 7274a3cb7f..131fbd9acf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index e403687687..be2c68512e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1048:30,12 [31] )
+Generated Location: (1043:30,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 4b675e0739..24de04b535 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -41,7 +41,7 @@ using Test.Shared;
         #pragma warning restore 1998
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     MyClass Hello = new MyClass();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index a827ee32c7..f92c602e93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -14,8 +14,8 @@ Document -
                     ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - AttributeStructure.DoubleQuotes
                         CSharpExpression - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Hello
-            CSharpCode - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyClass Hello = new MyClass();\n
+            CSharpCode - (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyClass Hello = new MyClass();\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 7972ca277d..c406b6d7c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (73:3,12 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1199:43,12 [38] )
+Generated Location: (1194:43,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index 5dd5cacdcd..65367f1651 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -38,7 +38,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
index d801ccd4a8..17b1a8615e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+            CSharpCode - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index 31a4229259..3387137665 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1019:28,37 [3] )
 |_my|
 
-Source Location: (60:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1309:40,12 [90] )
+Generated Location: (1304:40,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index 29c061442f..3ceda598db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -35,7 +35,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
index 13f70a34b4..4cb3b68940 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -11,8 +11,8 @@ Document -
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+            CSharpCode - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index f40f6dcbf9..92fffaf8a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (868:26,27 [3] )
 |_my|
 
-Source Location: (50:2,12 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1096:37,12 [90] )
+Generated Location: (1091:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 7afcd337b5..f2f52b6832 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -37,7 +37,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private object _someKey = new object();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index f3c2f8e143..d74e8164d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -13,5 +13,5 @@ Document -
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     SetKey - (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
-            CSharpCode - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+            CSharpCode - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 508332c609..866f4b45f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (980:28,37 [8] )
 |_someKey|
 
-Source Location: (65:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1226:39,12 [47] )
+Generated Location: (1221:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 6e8d31af45..f70b761b86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -34,7 +34,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     private object _someKey = new object();
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index 35285b1a16..c825818139 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -11,8 +11,8 @@ Document -
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     SetKey - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
-            CSharpCode - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+            CSharpCode - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 0873889778..5d51797a0d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -3,11 +3,11 @@ Source Location: (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (854:26,27 [8] )
 |_someKey|
 
-Source Location: (55:2,12 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1061:36,12 [47] )
+Generated Location: (1056:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 23df97ac34..d024be37f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -47,7 +47,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 6cccee9c35..5634baf6df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -17,5 +17,5 @@ Document -
                                     IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
-            CSharpCode - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
+            CSharpCode - (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index d257143ce3..c476bbbbcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -12,14 +12,14 @@ Generated Location: (1420:40,89 [3] )
 |;
 |
 
-Source Location: (111:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
         public string Name { get; set; }
     }
 |
-Generated Location: (1604:49,12 [76] )
+Generated Location: (1599:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 5f264658aa..67aeae6572 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -63,7 +63,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index d908c348a1..746f757a3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -25,5 +25,5 @@ Document -
                             IntermediateToken - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hello, world!"
                         HtmlContent - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
+            CSharpCode - (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 2661679839..517a9a3ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -12,14 +12,14 @@ Generated Location: (1420:40,89 [3] )
 |;
 |
 
-Source Location: (164:7,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
         public string Name { get; set; }
     }
 |
-Generated Location: (2160:65,12 [76] )
+Generated Location: (2155:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index f364a1725a..81bbda4b4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -46,7 +46,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
index 20f39b5f86..67cf9969c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -14,5 +14,5 @@ Document -
                             CSharpExpression - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                 IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                     IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
-            CSharpCode - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
+            CSharpCode - (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 926cfcc93e..9cadc6295b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
@@ -7,7 +7,7 @@ Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1371:48,12 [138] )
+Generated Location: (1366:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 0064cceef4..0b475731e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
index cc6163c72f..d6be2227fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -15,5 +15,5 @@ Document -
                             IntermediateToken - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
-            CSharpCode - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
+            CSharpCode - (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index cac8e70d5c..b9fa5a8dcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -12,14 +12,14 @@ Generated Location: (1190:38,67 [3] )
 |;
 |
 
-Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
         public string Name { get; set; }
     }
 |
-Generated Location: (1374:47,12 [76] )
+Generated Location: (1369:47,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 2d556280a3..5bbe42cc9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -46,7 +46,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     class Person
     {
         public string Name { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
index 40e55ef5ec..a7e7a36d96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -14,5 +14,5 @@ Document -
                             CSharpExpression - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                 IntermediateToken - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                     IntermediateToken - (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
-            CSharpCode - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
+            CSharpCode - (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n\n    object RenderPerson(RenderFragment<Person> p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 70de3d46f2..0c57ea93b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     class Person
     {
@@ -7,7 +7,7 @@ Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1374:48,12 [138] )
+Generated Location: (1369:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index b65f8a5b70..181b7dbe21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -36,7 +36,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     object RenderPerson(RenderFragment p) => null;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
index 38597e26f8..de25acd7a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -12,5 +12,5 @@ Document -
                     Template - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml)
                         MarkupBlock -  - <div>HI</div>
                     IntermediateToken - (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - )
-            CSharpCode - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    object RenderPerson(RenderFragment p) => null;\n
+            CSharpCode - (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    object RenderPerson(RenderFragment p) => null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 6c03a5d7ab..b83bdb1a71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1083:38,12 [54] )
+Generated Location: (1078:38,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 9269013723..a8779e78dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     string y = null;
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index f68f4fc79e..b44f73d083 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                     ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
-            CSharpCode - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
+            CSharpCode - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index eef0fcb2e7..abf3b06df4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (36:1,12 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1132:31,12 [24] )
+Generated Location: (1127:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index e586a44f6b..84b9fd0a05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -39,7 +39,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 498a5afacb..8dea19fb3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -24,5 +24,5 @@ Document -
                     ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
-            CSharpCode - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
+            CSharpCode - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index da0cc7a5bf..63f55fdef6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (76:2,12 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1635:41,12 [88] )
+Generated Location: (1630:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 9091a18c52..90748b1dbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -37,7 +37,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-            
+       
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
     public void OnComponentHover(UIMouseEventArgs e)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 7f4f274f2e..d2b70e2be3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
                         HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-            CSharpCode - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 5a06dbcb9f..8ae9e341a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
@@ -6,7 +6,7 @@ Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1340:39,12 [132] )
+Generated Location: (1335:39,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 877a394631..d0722b2317 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
         #pragma warning restore 1998
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                
+           
         int Foo = 18;
     
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
index 033a9f6fab..ed2d4ed2e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     HtmlAttribute - (5:0,5 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
                         CSharpExpressionAttributeValue - (11:0,11 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
-            CSharpCode - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
+            CSharpCode - (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 20e3897096..b6d733cce0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (36:1,16 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (921:30,16 [29] )
+Generated Location: (916:30,11 [29] )
 |
         int Foo = 18;
     |

From 67855582bb839ad6df78515740a3d4c6671a634a Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Wed, 1 May 2019 14:41:35 -0700
Subject: [PATCH 147/337] Update comment \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/f78e4c258e70a919ee14f9c400edbf85bd5c6e47

---
 .../src/Components/ComponentGenericTypePass.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index 5bb6e89414..6be200e659 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -252,8 +252,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     }
                     else if (childContent.IsParameterized)
                     {
-                        // This is a weakly typed parameterized child content, treat it as RenderFragment<object>
-                        //childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + "<System.Object>";
+                        // This is a non-generic parameterized child content like RenderFragment<int>, leave it as is.
                     }
                     else
                     {

From 9860cfc34b03b8f63cf9ba9a88aa34506f94b790 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Wed, 1 May 2019 14:29:22 -0700
Subject: [PATCH 148/337] do the needful \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/c5a7e9ecce6d15190c9251344e20a7b4b11b1096

---
 .../src/Components/ComponentCodeDirective.cs  |  1 -
 .../Components/ComponentCodeDirectivePass.cs  | 27 ------
 .../src/Extensions/FunctionsDirectivePass.cs  | 23 ++++-
 .../Extensions/FunctionsDirectivePassTest.cs  | 91 +++++++++++++++++++
 .../test/RazorProjectEngineTest.cs            |  1 -
 5 files changed, 112 insertions(+), 31 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs
index a7813ee4bf..509e8928d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirective.cs
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             builder.AddDirective(Directive, FileKinds.Component);
-            builder.Features.Add(new ComponentCodeDirectivePass());
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs
deleted file mode 100644
index c45f1205d1..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentCodeDirectivePass.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    internal class ComponentCodeDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
-    {
-        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
-        {
-            var @class = documentNode.FindPrimaryClass();
-            if (@class == null)
-            {
-                return;
-            }
-
-            foreach (var code in documentNode.FindDirectiveReferences(ComponentCodeDirective.Directive))
-            {
-                for (var i = 0; i < code.Node.Children.Count; i++)
-                {
-                    @class.Children.Add(code.Node.Children[i]);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
index 32f79570cb..c8498259b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
@@ -1,6 +1,9 @@
 // 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Extensions
@@ -15,11 +18,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 return;
             }
 
+            var directiveNodes = new List<IntermediateNode>();
             foreach (var functions in documentNode.FindDirectiveReferences(FunctionsDirective.Directive))
             {
-                for (var i = 0; i < functions.Node.Children.Count; i++)
+                directiveNodes.Add(functions.Node);
+            }
+
+            if (FileKinds.IsComponent(codeDocument.GetFileKind()))
+            {
+                foreach (var code in documentNode.FindDirectiveReferences(ComponentCodeDirective.Directive))
                 {
-                    @class.Children.Add(functions.Node.Children[i]);
+                    directiveNodes.Add(code.Node);
+                }
+            }
+
+            // Now we have all the directive nodes, we want to add them to the end of the class node in document order.
+            var orderedDirectives = directiveNodes.OrderBy(n => n.Source?.AbsoluteIndex);
+            foreach (var node in orderedDirectives)
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    @class.Children.Add(node.Children[i]);
                 }
             }
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
index 712766a5f1..97d80af404 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
@@ -76,6 +77,96 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 node => Assert.IsType<DirectiveIntermediateNode>(node));
         }
 
+        [Fact]
+        public void Execute_ComponentCodeDirective_AddsStatementsToClassLevel()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(b => b.AddDirective(ComponentCodeDirective.Directive));
+            var pass = new FunctionsDirectivePass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create("@code { var value = true; }");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var irDocument = Lower(codeDocument, projectEngine);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+
+            var @namespace = irDocument.Children[0];
+            Children(
+                @namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+
+            var @class = @namespace.Children[0];
+            Children(
+                @class,
+                node => Assert.IsType<MethodDeclarationIntermediateNode>(node),
+                node => CSharpCode(" var value = true; ", node));
+
+            var method = @class.Children[0];
+            Children(
+                method,
+                node => Assert.IsType<DirectiveIntermediateNode>(node));
+        }
+
+        [Fact]
+        public void Execute_FunctionsAndComponentCodeDirective_AddsStatementsToClassLevel()
+        {
+            // Arrange
+            var projectEngine = CreateProjectEngine(b => b.AddDirective(ComponentCodeDirective.Directive));
+            var pass = new FunctionsDirectivePass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var sourceDocument = TestRazorSourceDocument.Create(@"
+@functions { var value1 = true; }
+@code { var value2 = true; }
+@functions { var value3 = true; }");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            codeDocument.SetFileKind(FileKinds.Component);
+
+            var irDocument = Lower(codeDocument, projectEngine);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Children(
+                irDocument,
+                node => Assert.IsType<NamespaceDeclarationIntermediateNode>(node));
+
+            var @namespace = irDocument.Children[0];
+            Children(
+                @namespace,
+                node => Assert.IsType<ClassDeclarationIntermediateNode>(node));
+
+            var @class = @namespace.Children[0];
+            Children(
+                @class,
+                node => Assert.IsType<MethodDeclarationIntermediateNode>(node),
+                node => CSharpCode(" var value1 = true; ", node),
+                node => CSharpCode(" var value2 = true; ", node),
+                node => CSharpCode(" var value3 = true; ", node));
+
+            var method = @class.Children[0];
+            Children(
+                method,
+                node => Assert.IsType<HtmlContentIntermediateNode>(node),
+                node => Assert.IsType<DirectiveIntermediateNode>(node),
+                node => Assert.IsType<DirectiveIntermediateNode>(node),
+                node => Assert.IsType<DirectiveIntermediateNode>(node));
+        }
+
         private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
         {
             for (var i = 0; i < projectEngine.Phases.Count; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 714eba41a3..96072a8cf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -47,7 +47,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                 features,
                 feature => Assert.IsType<ComponentBindLoweringPass>(feature),
                 feature => Assert.IsType<ComponentChildContentDiagnosticPass>(feature),
-                feature => Assert.IsType<ComponentCodeDirectivePass>(feature),
                 feature => Assert.IsType<ComponentComplexAttributeContentPass>(feature),
                 feature => Assert.IsType<ComponentDocumentClassifierPass>(feature),
                 feature => Assert.IsType<ComponentEventHandlerLoweringPass>(feature),

From 9a456a5aeb36bb598464178b5f93e98d53741925 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 2 May 2019 13:40:25 -0700
Subject: [PATCH 149/337] Fix crash in functions block
 (dotnet/aspnetcore-tooling#550)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/3fe99e9d7fede30fd8d2b3f94d488ba63aadcb28
---
 .../src/Extensions/FunctionsDirectivePass.cs  | 21 +++++++++----------
 .../Extensions/FunctionsDirectivePassTest.cs  | 13 +++---------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
index c8498259b2..0b0758c9dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
@@ -18,28 +18,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 return;
             }
 
-            var directiveNodes = new List<IntermediateNode>();
-            foreach (var functions in documentNode.FindDirectiveReferences(FunctionsDirective.Directive))
-            {
-                directiveNodes.Add(functions.Node);
-            }
+            var directiveNodes = new List<IntermediateNodeReference>();
+            directiveNodes.AddRange(documentNode.FindDirectiveReferences(FunctionsDirective.Directive));
 
             if (FileKinds.IsComponent(codeDocument.GetFileKind()))
             {
-                foreach (var code in documentNode.FindDirectiveReferences(ComponentCodeDirective.Directive))
-                {
-                    directiveNodes.Add(code.Node);
-                }
+                directiveNodes.AddRange(documentNode.FindDirectiveReferences(ComponentCodeDirective.Directive));
             }
 
             // Now we have all the directive nodes, we want to add them to the end of the class node in document order.
-            var orderedDirectives = directiveNodes.OrderBy(n => n.Source?.AbsoluteIndex);
-            foreach (var node in orderedDirectives)
+            var orderedDirectives = directiveNodes.OrderBy(n => n.Node.Source?.AbsoluteIndex);
+            foreach (var directiveReference in orderedDirectives)
             {
+                var node = directiveReference.Node;
                 for (var i = 0; i < node.Children.Count; i++)
                 {
                     @class.Children.Add(node.Children[i]);
                 }
+
+                // We don't want to keep the original directive node around anymore.
+                // Otherwise this can cause unintended side effects in the subsequent passes.
+                directiveReference.Remove();
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
index 97d80af404..ff60131973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
@@ -72,9 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 node => CSharpCode(" var value = true; ", node));
 
             var method = @class.Children[0];
-            Children(
-                method,
-                node => Assert.IsType<DirectiveIntermediateNode>(node));
+            Assert.Empty(method.Children);
         }
 
         [Fact]
@@ -113,9 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 node => CSharpCode(" var value = true; ", node));
 
             var method = @class.Children[0];
-            Children(
-                method,
-                node => Assert.IsType<DirectiveIntermediateNode>(node));
+            Assert.Empty(method.Children);
         }
 
         [Fact]
@@ -161,10 +157,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
             var method = @class.Children[0];
             Children(
                 method,
-                node => Assert.IsType<HtmlContentIntermediateNode>(node),
-                node => Assert.IsType<DirectiveIntermediateNode>(node),
-                node => Assert.IsType<DirectiveIntermediateNode>(node),
-                node => Assert.IsType<DirectiveIntermediateNode>(node));
+                node => Assert.IsType<HtmlContentIntermediateNode>(node));
         }
 
         private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)

From 4a4b80046d018e1641b6945a116e250d81e85277 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 3 May 2019 12:04:53 -0700
Subject: [PATCH 150/337] Enable resx source generation
 (dotnet/aspnetcore-tooling#561)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/627710fcb8ce53adadbca1e6877547c48910e197
---
 .../src/Properties/Resources.Designer.cs      |  254 ---
 .../ViewComponentResources.Designer.cs        |  100 -
 .../src/Properties/Resources.Designer.cs      |  338 ---
 .../ViewComponentResources.Designer.cs        |  100 -
 .../src/Properties/Resources.Designer.cs      |  296 ---
 .../ViewComponentResources.Designer.cs        |  100 -
 .../src/ComponentResources.Designer.cs        |  279 ---
 ...NetCore.Components.Razor.Extensions.csproj |   15 -
 ...Microsoft.AspNetCore.Razor.Language.csproj |   15 -
 .../src/Properties/Resources.Designer.cs      | 1960 -----------------
 .../src/Properties/Resources.Designer.cs      |  142 --
 11 files changed, 3599 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
 delete mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs
deleted file mode 100644
index 917bbe18ce..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or empty.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpy
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpy");
-        }
-
-        /// <summary>
-        /// Value cannot be null or empty.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpy()
-            => GetString("ArgumentCannotBeNullOrEmpy");
-
-        /// <summary>
-        /// Inject a service from the application's service container into a property.
-        /// </summary>
-        internal static string InjectDirective_Description
-        {
-            get => GetString("InjectDirective_Description");
-        }
-
-        /// <summary>
-        /// Inject a service from the application's service container into a property.
-        /// </summary>
-        internal static string FormatInjectDirective_Description()
-            => GetString("InjectDirective_Description");
-
-        /// <summary>
-        /// The name of the property.
-        /// </summary>
-        internal static string InjectDirective_MemberToken_Description
-        {
-            get => GetString("InjectDirective_MemberToken_Description");
-        }
-
-        /// <summary>
-        /// The name of the property.
-        /// </summary>
-        internal static string FormatInjectDirective_MemberToken_Description()
-            => GetString("InjectDirective_MemberToken_Description");
-
-        /// <summary>
-        /// PropertyName
-        /// </summary>
-        internal static string InjectDirective_MemberToken_Name
-        {
-            get => GetString("InjectDirective_MemberToken_Name");
-        }
-
-        /// <summary>
-        /// PropertyName
-        /// </summary>
-        internal static string FormatInjectDirective_MemberToken_Name()
-            => GetString("InjectDirective_MemberToken_Name");
-
-        /// <summary>
-        /// The type of the service to inject.
-        /// </summary>
-        internal static string InjectDirective_TypeToken_Description
-        {
-            get => GetString("InjectDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The type of the service to inject.
-        /// </summary>
-        internal static string FormatInjectDirective_TypeToken_Description()
-            => GetString("InjectDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string InjectDirective_TypeToken_Name
-        {
-            get => GetString("InjectDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatInjectDirective_TypeToken_Name()
-            => GetString("InjectDirective_TypeToken_Name");
-
-        /// <summary>
-        /// Specify the view or page model for the page.
-        /// </summary>
-        internal static string ModelDirective_Description
-        {
-            get => GetString("ModelDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the view or page model for the page.
-        /// </summary>
-        internal static string FormatModelDirective_Description()
-            => GetString("ModelDirective_Description");
-
-        /// <summary>
-        /// The model type.
-        /// </summary>
-        internal static string ModelDirective_TypeToken_Description
-        {
-            get => GetString("ModelDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The model type.
-        /// </summary>
-        internal static string FormatModelDirective_TypeToken_Description()
-            => GetString("ModelDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string ModelDirective_TypeToken_Name
-        {
-            get => GetString("ModelDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatModelDirective_TypeToken_Name()
-            => GetString("ModelDirective_TypeToken_Name");
-
-        /// <summary>
-        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
-        /// </summary>
-        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
-        {
-            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
-        }
-
-        /// <summary>
-        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
-
-        /// <summary>
-        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
-        /// </summary>
-        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
-        {
-            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
-        }
-
-        /// <summary>
-        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
-
-        /// <summary>
-        /// The '{0}' keyword must be followed by a type name on the same line.
-        /// </summary>
-        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
-        {
-            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
-        }
-
-        /// <summary>
-        /// The '{0}' keyword must be followed by a type name on the same line.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
-
-        /// <summary>
-        /// Only one '{0}' statement is allowed in a file.
-        /// </summary>
-        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
-        {
-            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
-        }
-
-        /// <summary>
-        /// Only one '{0}' statement is allowed in a file.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
-
-        /// <summary>
-        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
-        /// </summary>
-        internal static string MvcRazorParser_InvalidPropertyType
-        {
-            get => GetString("MvcRazorParser_InvalidPropertyType");
-        }
-
-        /// <summary>
-        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
-        /// </summary>
-        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
-
-        /// <summary>
-        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
-        /// </summary>
-        internal static string PageDirectiveCannotBeImported
-        {
-            get => GetString("PageDirectiveCannotBeImported");
-        }
-
-        /// <summary>
-        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
-        /// </summary>
-        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
-
-        /// <summary>
-        /// Runtime code generation for Mvc 1.x is not supported.
-        /// </summary>
-        internal static string RuntimeCodeGenerationNotSupported
-        {
-            get => GetString("RuntimeCodeGenerationNotSupported");
-        }
-
-        /// <summary>
-        /// Runtime code generation for Mvc 1.x is not supported.
-        /// </summary>
-        internal static string FormatRuntimeCodeGenerationNotSupported()
-            => GetString("RuntimeCodeGenerationNotSupported");
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs
deleted file mode 100644
index 58228a720f..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Properties/ViewComponentResources.Designer.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class ViewComponentResources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
-        /// </summary>
-        internal static string ViewComponent_AmbiguousMethods
-        {
-            get => GetString("ViewComponent_AmbiguousMethods");
-        }
-
-        /// <summary>
-        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
-        /// </summary>
-        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
-        /// </summary>
-        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
-        {
-            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
-        /// </summary>
-        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
-
-        /// <summary>
-        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
-        /// </summary>
-        internal static string ViewComponent_CannotFindMethod
-        {
-            get => GetString("ViewComponent_CannotFindMethod");
-        }
-
-        /// <summary>
-        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
-        /// </summary>
-        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' cannot return a {2}.
-        /// </summary>
-        internal static string ViewComponent_SyncMethod_CannotReturnTask
-        {
-            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' cannot return a {2}.
-        /// </summary>
-        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return a value.
-        /// </summary>
-        internal static string ViewComponent_SyncMethod_ShouldReturnValue
-        {
-            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return a value.
-        /// </summary>
-        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs
deleted file mode 100644
index ec4883803c..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,338 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or empty.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or empty.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        /// <summary>
-        /// Inject a service from the application's service container into a property.
-        /// </summary>
-        internal static string InjectDirective_Description
-        {
-            get => GetString("InjectDirective_Description");
-        }
-
-        /// <summary>
-        /// Inject a service from the application's service container into a property.
-        /// </summary>
-        internal static string FormatInjectDirective_Description()
-            => GetString("InjectDirective_Description");
-
-        /// <summary>
-        /// The name of the property.
-        /// </summary>
-        internal static string InjectDirective_MemberToken_Description
-        {
-            get => GetString("InjectDirective_MemberToken_Description");
-        }
-
-        /// <summary>
-        /// The name of the property.
-        /// </summary>
-        internal static string FormatInjectDirective_MemberToken_Description()
-            => GetString("InjectDirective_MemberToken_Description");
-
-        /// <summary>
-        /// PropertyName
-        /// </summary>
-        internal static string InjectDirective_MemberToken_Name
-        {
-            get => GetString("InjectDirective_MemberToken_Name");
-        }
-
-        /// <summary>
-        /// PropertyName
-        /// </summary>
-        internal static string FormatInjectDirective_MemberToken_Name()
-            => GetString("InjectDirective_MemberToken_Name");
-
-        /// <summary>
-        /// The type of the service to inject.
-        /// </summary>
-        internal static string InjectDirective_TypeToken_Description
-        {
-            get => GetString("InjectDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The type of the service to inject.
-        /// </summary>
-        internal static string FormatInjectDirective_TypeToken_Description()
-            => GetString("InjectDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string InjectDirective_TypeToken_Name
-        {
-            get => GetString("InjectDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatInjectDirective_TypeToken_Name()
-            => GetString("InjectDirective_TypeToken_Name");
-
-        /// <summary>
-        /// Specify the view or page model for the page.
-        /// </summary>
-        internal static string ModelDirective_Description
-        {
-            get => GetString("ModelDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the view or page model for the page.
-        /// </summary>
-        internal static string FormatModelDirective_Description()
-            => GetString("ModelDirective_Description");
-
-        /// <summary>
-        /// The model type.
-        /// </summary>
-        internal static string ModelDirective_TypeToken_Description
-        {
-            get => GetString("ModelDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The model type.
-        /// </summary>
-        internal static string FormatModelDirective_TypeToken_Description()
-            => GetString("ModelDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string ModelDirective_TypeToken_Name
-        {
-            get => GetString("ModelDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatModelDirective_TypeToken_Name()
-            => GetString("ModelDirective_TypeToken_Name");
-
-        /// <summary>
-        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
-        /// </summary>
-        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
-        {
-            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
-        }
-
-        /// <summary>
-        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
-
-        /// <summary>
-        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
-        /// </summary>
-        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
-        {
-            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
-        }
-
-        /// <summary>
-        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
-
-        /// <summary>
-        /// The '{0}' keyword must be followed by a type name on the same line.
-        /// </summary>
-        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
-        {
-            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
-        }
-
-        /// <summary>
-        /// The '{0}' keyword must be followed by a type name on the same line.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
-
-        /// <summary>
-        /// Only one '{0}' statement is allowed in a file.
-        /// </summary>
-        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
-        {
-            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
-        }
-
-        /// <summary>
-        /// Only one '{0}' statement is allowed in a file.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
-
-        /// <summary>
-        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
-        /// </summary>
-        internal static string MvcRazorParser_InvalidPropertyType
-        {
-            get => GetString("MvcRazorParser_InvalidPropertyType");
-        }
-
-        /// <summary>
-        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
-        /// </summary>
-        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
-
-        /// <summary>
-        /// Specify the base namespace for the page.
-        /// </summary>
-        internal static string NamespaceDirective_Description
-        {
-            get => GetString("NamespaceDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the base namespace for the page.
-        /// </summary>
-        internal static string FormatNamespaceDirective_Description()
-            => GetString("NamespaceDirective_Description");
-
-        /// <summary>
-        /// The namespace for the page.
-        /// </summary>
-        internal static string NamespaceDirective_NamespaceToken_Description
-        {
-            get => GetString("NamespaceDirective_NamespaceToken_Description");
-        }
-
-        /// <summary>
-        /// The namespace for the page.
-        /// </summary>
-        internal static string FormatNamespaceDirective_NamespaceToken_Description()
-            => GetString("NamespaceDirective_NamespaceToken_Description");
-
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        internal static string NamespaceDirective_NamespaceToken_Name
-        {
-            get => GetString("NamespaceDirective_NamespaceToken_Name");
-        }
-
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        internal static string FormatNamespaceDirective_NamespaceToken_Name()
-            => GetString("NamespaceDirective_NamespaceToken_Name");
-
-        /// <summary>
-        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
-        /// </summary>
-        internal static string PageDirectiveCannotBeImported
-        {
-            get => GetString("PageDirectiveCannotBeImported");
-        }
-
-        /// <summary>
-        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
-        /// </summary>
-        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
-
-        /// <summary>
-        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
-        /// </summary>
-        internal static string PageDirectiveMustExistAtTheTopOfFile
-        {
-            get => GetString("PageDirectiveMustExistAtTheTopOfFile");
-        }
-
-        /// <summary>
-        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
-        /// </summary>
-        internal static string FormatPageDirectiveMustExistAtTheTopOfFile(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveMustExistAtTheTopOfFile"), p0);
-
-        /// <summary>
-        /// Mark the page as a Razor Page.
-        /// </summary>
-        internal static string PageDirective_Description
-        {
-            get => GetString("PageDirective_Description");
-        }
-
-        /// <summary>
-        /// Mark the page as a Razor Page.
-        /// </summary>
-        internal static string FormatPageDirective_Description()
-            => GetString("PageDirective_Description");
-
-        /// <summary>
-        /// An optional route template for the page.
-        /// </summary>
-        internal static string PageDirective_RouteToken_Description
-        {
-            get => GetString("PageDirective_RouteToken_Description");
-        }
-
-        /// <summary>
-        /// An optional route template for the page.
-        /// </summary>
-        internal static string FormatPageDirective_RouteToken_Description()
-            => GetString("PageDirective_RouteToken_Description");
-
-        /// <summary>
-        /// RouteTemplate
-        /// </summary>
-        internal static string PageDirective_RouteToken_Name
-        {
-            get => GetString("PageDirective_RouteToken_Name");
-        }
-
-        /// <summary>
-        /// RouteTemplate
-        /// </summary>
-        internal static string FormatPageDirective_RouteToken_Name()
-            => GetString("PageDirective_RouteToken_Name");
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs
deleted file mode 100644
index 3309adf1c7..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Properties/ViewComponentResources.Designer.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class ViewComponentResources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
-        /// </summary>
-        internal static string ViewComponent_AmbiguousMethods
-        {
-            get => GetString("ViewComponent_AmbiguousMethods");
-        }
-
-        /// <summary>
-        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
-        /// </summary>
-        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
-        /// </summary>
-        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
-        {
-            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
-        /// </summary>
-        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
-
-        /// <summary>
-        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
-        /// </summary>
-        internal static string ViewComponent_CannotFindMethod
-        {
-            get => GetString("ViewComponent_CannotFindMethod");
-        }
-
-        /// <summary>
-        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
-        /// </summary>
-        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' cannot return a {2}.
-        /// </summary>
-        internal static string ViewComponent_SyncMethod_CannotReturnTask
-        {
-            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' cannot return a {2}.
-        /// </summary>
-        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return a value.
-        /// </summary>
-        internal static string ViewComponent_SyncMethod_ShouldReturnValue
-        {
-            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return a value.
-        /// </summary>
-        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
deleted file mode 100644
index 18566dc27e..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Value cannot be null or empty.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or empty.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        /// <summary>
-        /// Inject a service from the application's service container into a property.
-        /// </summary>
-        internal static string InjectDirective_Description
-        {
-            get => GetString("InjectDirective_Description");
-        }
-
-        /// <summary>
-        /// Inject a service from the application's service container into a property.
-        /// </summary>
-        internal static string FormatInjectDirective_Description()
-            => GetString("InjectDirective_Description");
-
-        /// <summary>
-        /// The name of the property.
-        /// </summary>
-        internal static string InjectDirective_MemberToken_Description
-        {
-            get => GetString("InjectDirective_MemberToken_Description");
-        }
-
-        /// <summary>
-        /// The name of the property.
-        /// </summary>
-        internal static string FormatInjectDirective_MemberToken_Description()
-            => GetString("InjectDirective_MemberToken_Description");
-
-        /// <summary>
-        /// PropertyName
-        /// </summary>
-        internal static string InjectDirective_MemberToken_Name
-        {
-            get => GetString("InjectDirective_MemberToken_Name");
-        }
-
-        /// <summary>
-        /// PropertyName
-        /// </summary>
-        internal static string FormatInjectDirective_MemberToken_Name()
-            => GetString("InjectDirective_MemberToken_Name");
-
-        /// <summary>
-        /// The type of the service to inject.
-        /// </summary>
-        internal static string InjectDirective_TypeToken_Description
-        {
-            get => GetString("InjectDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The type of the service to inject.
-        /// </summary>
-        internal static string FormatInjectDirective_TypeToken_Description()
-            => GetString("InjectDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string InjectDirective_TypeToken_Name
-        {
-            get => GetString("InjectDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatInjectDirective_TypeToken_Name()
-            => GetString("InjectDirective_TypeToken_Name");
-
-        /// <summary>
-        /// Specify the view or page model for the page.
-        /// </summary>
-        internal static string ModelDirective_Description
-        {
-            get => GetString("ModelDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the view or page model for the page.
-        /// </summary>
-        internal static string FormatModelDirective_Description()
-            => GetString("ModelDirective_Description");
-
-        /// <summary>
-        /// The model type.
-        /// </summary>
-        internal static string ModelDirective_TypeToken_Description
-        {
-            get => GetString("ModelDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The model type.
-        /// </summary>
-        internal static string FormatModelDirective_TypeToken_Description()
-            => GetString("ModelDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string ModelDirective_TypeToken_Name
-        {
-            get => GetString("ModelDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatModelDirective_TypeToken_Name()
-            => GetString("ModelDirective_TypeToken_Name");
-
-        /// <summary>
-        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
-        /// </summary>
-        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
-        {
-            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
-        }
-
-        /// <summary>
-        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
-
-        /// <summary>
-        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
-        /// </summary>
-        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
-        {
-            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
-        }
-
-        /// <summary>
-        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
-
-        /// <summary>
-        /// The '{0}' keyword must be followed by a type name on the same line.
-        /// </summary>
-        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
-        {
-            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
-        }
-
-        /// <summary>
-        /// The '{0}' keyword must be followed by a type name on the same line.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
-
-        /// <summary>
-        /// Only one '{0}' statement is allowed in a file.
-        /// </summary>
-        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
-        {
-            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
-        }
-
-        /// <summary>
-        /// Only one '{0}' statement is allowed in a file.
-        /// </summary>
-        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
-
-        /// <summary>
-        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
-        /// </summary>
-        internal static string MvcRazorParser_InvalidPropertyType
-        {
-            get => GetString("MvcRazorParser_InvalidPropertyType");
-        }
-
-        /// <summary>
-        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
-        /// </summary>
-        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
-
-        /// <summary>
-        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
-        /// </summary>
-        internal static string PageDirectiveCannotBeImported
-        {
-            get => GetString("PageDirectiveCannotBeImported");
-        }
-
-        /// <summary>
-        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
-        /// </summary>
-        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
-
-        /// <summary>
-        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
-        /// </summary>
-        internal static string PageDirectiveMustExistAtTheTopOfFile
-        {
-            get => GetString("PageDirectiveMustExistAtTheTopOfFile");
-        }
-
-        /// <summary>
-        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
-        /// </summary>
-        internal static string FormatPageDirectiveMustExistAtTheTopOfFile(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveMustExistAtTheTopOfFile"), p0);
-
-        /// <summary>
-        /// Mark the page as a Razor Page.
-        /// </summary>
-        internal static string PageDirective_Description
-        {
-            get => GetString("PageDirective_Description");
-        }
-
-        /// <summary>
-        /// Mark the page as a Razor Page.
-        /// </summary>
-        internal static string FormatPageDirective_Description()
-            => GetString("PageDirective_Description");
-
-        /// <summary>
-        /// An optional route template for the page.
-        /// </summary>
-        internal static string PageDirective_RouteToken_Description
-        {
-            get => GetString("PageDirective_RouteToken_Description");
-        }
-
-        /// <summary>
-        /// An optional route template for the page.
-        /// </summary>
-        internal static string FormatPageDirective_RouteToken_Description()
-            => GetString("PageDirective_RouteToken_Description");
-
-        /// <summary>
-        /// RouteTemplate
-        /// </summary>
-        internal static string PageDirective_RouteToken_Name
-        {
-            get => GetString("PageDirective_RouteToken_Name");
-        }
-
-        /// <summary>
-        /// RouteTemplate
-        /// </summary>
-        internal static string FormatPageDirective_RouteToken_Name()
-            => GetString("PageDirective_RouteToken_Name");
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs
deleted file mode 100644
index 514af37554..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Properties/ViewComponentResources.Designer.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class ViewComponentResources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
-        /// </summary>
-        internal static string ViewComponent_AmbiguousMethods
-        {
-            get => GetString("ViewComponent_AmbiguousMethods");
-        }
-
-        /// <summary>
-        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
-        /// </summary>
-        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
-        /// </summary>
-        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
-        {
-            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
-        /// </summary>
-        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
-
-        /// <summary>
-        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
-        /// </summary>
-        internal static string ViewComponent_CannotFindMethod
-        {
-            get => GetString("ViewComponent_CannotFindMethod");
-        }
-
-        /// <summary>
-        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
-        /// </summary>
-        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' cannot return a {2}.
-        /// </summary>
-        internal static string ViewComponent_SyncMethod_CannotReturnTask
-        {
-            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' cannot return a {2}.
-        /// </summary>
-        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return a value.
-        /// </summary>
-        internal static string ViewComponent_SyncMethod_ShouldReturnValue
-        {
-            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
-        }
-
-        /// <summary>
-        /// Method '{0}' of view component '{1}' should be declared to return a value.
-        /// </summary>
-        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
deleted file mode 100644
index 10af5b8063..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.Designer.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.AspNetCore.Razor.Language {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class ComponentResources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal ComponentResources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Razor.Language.ComponentResources", typeof(ComponentResources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Binds the provided expression to the &apos;{0}&apos; property and a change event delegate to the &apos;{1}&apos; property of the component..
-        /// </summary>
-        internal static string BindTagHelper_Component_Documentation {
-            get {
-                return ResourceManager.GetString("BindTagHelper_Component_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Binds the provided expression to the &apos;{0}&apos; attribute and a change event delegate to the &apos;{1}&apos; attribute..
-        /// </summary>
-        internal static string BindTagHelper_Element_Documentation {
-            get {
-                return ResourceManager.GetString("BindTagHelper_Element_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies a format to convert the value specified by the &apos;{0}&apos; attribute. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;..
-        /// </summary>
-        internal static string BindTagHelper_Element_Format_Documentation {
-            get {
-                return ResourceManager.GetString("BindTagHelper_Element_Format_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;bind-value-onchange=&quot;...&quot;&lt;/code&gt; will assign the current value of the expression to the &apos;value&apos; attribute, and assign a delegate that attempts to set the value to the &apos;onchange&apos; attribute..
-        /// </summary>
-        internal static string BindTagHelper_Fallback_Documentation {
-            get {
-                return ResourceManager.GetString("BindTagHelper_Fallback_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;format-value=&quot;...&quot;&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;bind-value-...&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;..
-        /// </summary>
-        internal static string BindTagHelper_Fallback_Format_Documentation {
-            get {
-                return ResourceManager.GetString("BindTagHelper_Fallback_Format_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies the parameter name for the &apos;{0}&apos; child content expression..
-        /// </summary>
-        internal static string ChildContentParameterName_Documentation {
-            get {
-                return ResourceManager.GetString("ChildContentParameterName_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies the parameter name for all child content expressions..
-        /// </summary>
-        internal static string ChildContentParameterName_TopLevelDocumentation {
-            get {
-                return ResourceManager.GetString("ChildContentParameterName_TopLevelDocumentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies the type of the type parameter {0} for the {1} component..
-        /// </summary>
-        internal static string ComponentTypeParameter_Documentation {
-            get {
-                return ResourceManager.GetString("ComponentTypeParameter_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Sets the &apos;{0}&apos; attribute to the provided string or delegate value. A delegate value should be of type &apos;{1}&apos;..
-        /// </summary>
-        internal static string EventHandlerTagHelper_Documentation {
-            get {
-                return ResourceManager.GetString("EventHandlerTagHelper_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Declares an interface implementation for the current document..
-        /// </summary>
-        internal static string ImplementsDirective_Description {
-            get {
-                return ResourceManager.GetString("ImplementsDirective_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The interface type implemented by the current document..
-        /// </summary>
-        internal static string ImplementsDirective_TypeToken_Description {
-            get {
-                return ResourceManager.GetString("ImplementsDirective_TypeToken_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to TypeName.
-        /// </summary>
-        internal static string ImplementsDirective_TypeToken_Name {
-            get {
-                return ResourceManager.GetString("ImplementsDirective_TypeToken_Name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches..
-        /// </summary>
-        internal static string KeyTagHelper_Documentation {
-            get {
-                return ResourceManager.GetString("KeyTagHelper_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Declares a layout type for the current document..
-        /// </summary>
-        internal static string LayoutDirective_Description {
-            get {
-                return ResourceManager.GetString("LayoutDirective_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The interface type implemented by the current document..
-        /// </summary>
-        internal static string LayoutDirective_TypeToken_Description {
-            get {
-                return ResourceManager.GetString("LayoutDirective_TypeToken_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to TypeName.
-        /// </summary>
-        internal static string LayoutDirective_TypeToken_Name {
-            get {
-                return ResourceManager.GetString("LayoutDirective_TypeToken_Name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Mark the page as a routable component..
-        /// </summary>
-        internal static string PageDirective_Description {
-            get {
-                return ResourceManager.GetString("PageDirective_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An optional route template for the component..
-        /// </summary>
-        internal static string PageDirective_RouteToken_Description {
-            get {
-                return ResourceManager.GetString("PageDirective_RouteToken_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to route template.
-        /// </summary>
-        internal static string PageDirective_RouteToken_Name {
-            get {
-                return ResourceManager.GetString("PageDirective_RouteToken_Name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;@{0}&apos; directive specified in {1} file will not be imported. The directive must appear at the top of each Razor file.
-        /// </summary>
-        internal static string PageDirectiveCannotBeImported {
-            get {
-                return ResourceManager.GetString("PageDirectiveCannotBeImported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Populates the specified field or property with a reference to the element or component..
-        /// </summary>
-        internal static string RefTagHelper_Documentation {
-            get {
-                return ResourceManager.GetString("RefTagHelper_Documentation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Declares a generic type parameter for the generated component class..
-        /// </summary>
-        internal static string TypeParamDirective_Description {
-            get {
-                return ResourceManager.GetString("TypeParamDirective_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The name of the type parameter..
-        /// </summary>
-        internal static string TypeParamDirective_Token_Description {
-            get {
-                return ResourceManager.GetString("TypeParamDirective_Token_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to type parameter.
-        /// </summary>
-        internal static string TypeParamDirective_Token_Name {
-            get {
-                return ResourceManager.GetString("TypeParamDirective_Token_Name", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
index 215a562aaa..a690a69a9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
@@ -17,21 +17,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(RazorPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\shared\ComponentsApi.cs" Link="shared\%(Filename)%(Extension)" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
index d27b1d8dd6..1fd7aeebf5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj
@@ -9,19 +9,4 @@
     <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="ComponentResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ComponentResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="ComponentResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ComponentResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
deleted file mode 100644
index 47cfb574a2..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,1960 +0,0 @@
-// <auto-generated />
-namespace Microsoft.AspNetCore.Razor.Language
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNetCore.Razor.Language.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Register Tag Helpers for use in the current document.
-        /// </summary>
-        internal static string AddTagHelperDirective_Description
-        {
-            get => GetString("AddTagHelperDirective_Description");
-        }
-
-        /// <summary>
-        /// Register Tag Helpers for use in the current document.
-        /// </summary>
-        internal static string FormatAddTagHelperDirective_Description()
-            => GetString("AddTagHelperDirective_Description");
-
-        /// <summary>
-        /// Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.
-        /// </summary>
-        internal static string AddTagHelperDirective_StringToken_Description
-        {
-            get => GetString("AddTagHelperDirective_StringToken_Description");
-        }
-
-        /// <summary>
-        /// Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.
-        /// </summary>
-        internal static string FormatAddTagHelperDirective_StringToken_Description()
-            => GetString("AddTagHelperDirective_StringToken_Description");
-
-        /// <summary>
-        /// TypeName, AssemblyName
-        /// </summary>
-        internal static string AddTagHelperDirective_StringToken_Name
-        {
-            get => GetString("AddTagHelperDirective_StringToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName, AssemblyName
-        /// </summary>
-        internal static string FormatAddTagHelperDirective_StringToken_Name()
-            => GetString("AddTagHelperDirective_StringToken_Name");
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string ArgumentCannotBeNullOrEmpty
-        {
-            get => GetString("ArgumentCannotBeNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Value cannot be null or an empty string.
-        /// </summary>
-        internal static string FormatArgumentCannotBeNullOrEmpty()
-            => GetString("ArgumentCannotBeNullOrEmpty");
-
-        /// <summary>
-        /// Block cannot be built because a Type has not been specified in the BlockBuilder
-        /// </summary>
-        internal static string Block_Type_Not_Specified
-        {
-            get => GetString("Block_Type_Not_Specified");
-        }
-
-        /// <summary>
-        /// Block cannot be built because a Type has not been specified in the BlockBuilder
-        /// </summary>
-        internal static string FormatBlock_Type_Not_Specified()
-            => GetString("Block_Type_Not_Specified");
-
-        /// <summary>
-        /// Block directive '{0}' cannot be imported.
-        /// </summary>
-        internal static string BlockDirectiveCannotBeImported
-        {
-            get => GetString("BlockDirectiveCannotBeImported");
-        }
-
-        /// <summary>
-        /// Block directive '{0}' cannot be imported.
-        /// </summary>
-        internal static string FormatBlockDirectiveCannotBeImported(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("BlockDirectiveCannotBeImported"), p0);
-
-        /// <summary>
-        /// code
-        /// </summary>
-        internal static string BlockName_Code
-        {
-            get => GetString("BlockName_Code");
-        }
-
-        /// <summary>
-        /// code
-        /// </summary>
-        internal static string FormatBlockName_Code()
-            => GetString("BlockName_Code");
-
-        /// <summary>
-        /// explicit expression
-        /// </summary>
-        internal static string BlockName_ExplicitExpression
-        {
-            get => GetString("BlockName_ExplicitExpression");
-        }
-
-        /// <summary>
-        /// explicit expression
-        /// </summary>
-        internal static string FormatBlockName_ExplicitExpression()
-            => GetString("BlockName_ExplicitExpression");
-
-        /// <summary>
-        /// Invalid newline sequence '{0}'. Support newline sequences are '\r\n' and '\n'.
-        /// </summary>
-        internal static string CodeWriter_InvalidNewLine
-        {
-            get => GetString("CodeWriter_InvalidNewLine");
-        }
-
-        /// <summary>
-        /// Invalid newline sequence '{0}'. Support newline sequences are '\r\n' and '\n'.
-        /// </summary>
-        internal static string FormatCodeWriter_InvalidNewLine(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("CodeWriter_InvalidNewLine"), p0);
-
-        /// <summary>
-        /// &lt;&lt;character literal&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_CharacterLiteral
-        {
-            get => GetString("CSharpToken_CharacterLiteral");
-        }
-
-        /// <summary>
-        /// &lt;&lt;character literal&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_CharacterLiteral()
-            => GetString("CSharpToken_CharacterLiteral");
-
-        /// <summary>
-        /// &lt;&lt;comment&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_Comment
-        {
-            get => GetString("CSharpToken_Comment");
-        }
-
-        /// <summary>
-        /// &lt;&lt;comment&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_Comment()
-            => GetString("CSharpToken_Comment");
-
-        /// <summary>
-        /// &lt;&lt;identifier&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_Identifier
-        {
-            get => GetString("CSharpToken_Identifier");
-        }
-
-        /// <summary>
-        /// &lt;&lt;identifier&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_Identifier()
-            => GetString("CSharpToken_Identifier");
-
-        /// <summary>
-        /// &lt;&lt;integer literal&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_IntegerLiteral
-        {
-            get => GetString("CSharpToken_IntegerLiteral");
-        }
-
-        /// <summary>
-        /// &lt;&lt;integer literal&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_IntegerLiteral()
-            => GetString("CSharpToken_IntegerLiteral");
-
-        /// <summary>
-        /// &lt;&lt;keyword&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_Keyword
-        {
-            get => GetString("CSharpToken_Keyword");
-        }
-
-        /// <summary>
-        /// &lt;&lt;keyword&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_Keyword()
-            => GetString("CSharpToken_Keyword");
-
-        /// <summary>
-        /// &lt;&lt;newline sequence&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_Newline
-        {
-            get => GetString("CSharpToken_Newline");
-        }
-
-        /// <summary>
-        /// &lt;&lt;newline sequence&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_Newline()
-            => GetString("CSharpToken_Newline");
-
-        /// <summary>
-        /// &lt;&lt;real literal&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_RealLiteral
-        {
-            get => GetString("CSharpToken_RealLiteral");
-        }
-
-        /// <summary>
-        /// &lt;&lt;real literal&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_RealLiteral()
-            => GetString("CSharpToken_RealLiteral");
-
-        /// <summary>
-        /// &lt;&lt;string literal&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_StringLiteral
-        {
-            get => GetString("CSharpToken_StringLiteral");
-        }
-
-        /// <summary>
-        /// &lt;&lt;string literal&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_StringLiteral()
-            => GetString("CSharpToken_StringLiteral");
-
-        /// <summary>
-        /// &lt;&lt;white space&gt;&gt;
-        /// </summary>
-        internal static string CSharpToken_Whitespace
-        {
-            get => GetString("CSharpToken_Whitespace");
-        }
-
-        /// <summary>
-        /// &lt;&lt;white space&gt;&gt;
-        /// </summary>
-        internal static string FormatCSharpToken_Whitespace()
-            => GetString("CSharpToken_Whitespace");
-
-        /// <summary>
-        /// The document type '{0}' does not support the extension '{1}'.
-        /// </summary>
-        internal static string Diagnostic_CodeTarget_UnsupportedExtension
-        {
-            get => GetString("Diagnostic_CodeTarget_UnsupportedExtension");
-        }
-
-        /// <summary>
-        /// The document type '{0}' does not support the extension '{1}'.
-        /// </summary>
-        internal static string FormatDiagnostic_CodeTarget_UnsupportedExtension(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("Diagnostic_CodeTarget_UnsupportedExtension"), p0, p1);
-
-        /// <summary>
-        /// Invalid directive keyword '{0}'. Directives must have a non-empty keyword that consists only of letters.
-        /// </summary>
-        internal static string DirectiveDescriptor_InvalidDirectiveKeyword
-        {
-            get => GetString("DirectiveDescriptor_InvalidDirectiveKeyword");
-        }
-
-        /// <summary>
-        /// Invalid directive keyword '{0}'. Directives must have a non-empty keyword that consists only of letters.
-        /// </summary>
-        internal static string FormatDirectiveDescriptor_InvalidDirectiveKeyword(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveDescriptor_InvalidDirectiveKeyword"), p0);
-
-        /// <summary>
-        /// A non-optional directive token cannot follow an optional directive token.
-        /// </summary>
-        internal static string DirectiveDescriptor_InvalidNonOptionalToken
-        {
-            get => GetString("DirectiveDescriptor_InvalidNonOptionalToken");
-        }
-
-        /// <summary>
-        /// A non-optional directive token cannot follow an optional directive token.
-        /// </summary>
-        internal static string FormatDirectiveDescriptor_InvalidNonOptionalToken()
-            => GetString("DirectiveDescriptor_InvalidNonOptionalToken");
-
-        /// <summary>
-        /// The '{0}' directive expects an identifier.
-        /// </summary>
-        internal static string DirectiveExpectsIdentifier
-        {
-            get => GetString("DirectiveExpectsIdentifier");
-        }
-
-        /// <summary>
-        /// The '{0}' directive expects an identifier.
-        /// </summary>
-        internal static string FormatDirectiveExpectsIdentifier(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsIdentifier"), p0);
-
-        /// <summary>
-        /// The '{0}' directive expects a namespace name.
-        /// </summary>
-        internal static string DirectiveExpectsNamespace
-        {
-            get => GetString("DirectiveExpectsNamespace");
-        }
-
-        /// <summary>
-        /// The '{0}' directive expects a namespace name.
-        /// </summary>
-        internal static string FormatDirectiveExpectsNamespace(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsNamespace"), p0);
-
-        /// <summary>
-        /// The '{0}' directive expects a string surrounded by double quotes.
-        /// </summary>
-        internal static string DirectiveExpectsQuotedStringLiteral
-        {
-            get => GetString("DirectiveExpectsQuotedStringLiteral");
-        }
-
-        /// <summary>
-        /// The '{0}' directive expects a string surrounded by double quotes.
-        /// </summary>
-        internal static string FormatDirectiveExpectsQuotedStringLiteral(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsQuotedStringLiteral"), p0);
-
-        /// <summary>
-        /// The '{0}' directive expects a type name.
-        /// </summary>
-        internal static string DirectiveExpectsTypeName
-        {
-            get => GetString("DirectiveExpectsTypeName");
-        }
-
-        /// <summary>
-        /// The '{0}' directive expects a type name.
-        /// </summary>
-        internal static string FormatDirectiveExpectsTypeName(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveExpectsTypeName"), p0);
-
-        /// <summary>
-        /// The '{0}` directive must appear at the start of the line.
-        /// </summary>
-        internal static string DirectiveMustAppearAtStartOfLine
-        {
-            get => GetString("DirectiveMustAppearAtStartOfLine");
-        }
-
-        /// <summary>
-        /// The '{0}` directive must appear at the start of the line.
-        /// </summary>
-        internal static string FormatDirectiveMustAppearAtStartOfLine(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveMustAppearAtStartOfLine"), p0);
-
-        /// <summary>
-        /// The '{0}' directives value(s) must be separated by whitespace.
-        /// </summary>
-        internal static string DirectiveTokensMustBeSeparatedByWhitespace
-        {
-            get => GetString("DirectiveTokensMustBeSeparatedByWhitespace");
-        }
-
-        /// <summary>
-        /// The '{0}' directives value(s) must be separated by whitespace.
-        /// </summary>
-        internal static string FormatDirectiveTokensMustBeSeparatedByWhitespace(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DirectiveTokensMustBeSeparatedByWhitespace"), p0);
-
-        /// <summary>
-        /// The document of kind '{0}' does not have a '{1}'. The document classifier must set a value for '{2}'.
-        /// </summary>
-        internal static string DocumentMissingTarget
-        {
-            get => GetString("DocumentMissingTarget");
-        }
-
-        /// <summary>
-        /// The document of kind '{0}' does not have a '{1}'. The document classifier must set a value for '{2}'.
-        /// </summary>
-        internal static string FormatDocumentMissingTarget(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DocumentMissingTarget"), p0, p1, p2);
-
-        /// <summary>
-        /// The '{0}' directive may only occur once per document.
-        /// </summary>
-        internal static string DuplicateDirective
-        {
-            get => GetString("DuplicateDirective");
-        }
-
-        /// <summary>
-        /// The '{0}' directive may only occur once per document.
-        /// </summary>
-        internal static string FormatDuplicateDirective(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("DuplicateDirective"), p0);
-
-        /// <summary>
-        /// "EndBlock" was called without a matching call to "StartBlock".
-        /// </summary>
-        internal static string EndBlock_Called_Without_Matching_StartBlock
-        {
-            get => GetString("EndBlock_Called_Without_Matching_StartBlock");
-        }
-
-        /// <summary>
-        /// "EndBlock" was called without a matching call to "StartBlock".
-        /// </summary>
-        internal static string FormatEndBlock_Called_Without_Matching_StartBlock()
-            => GetString("EndBlock_Called_Without_Matching_StartBlock");
-
-        /// <summary>
-        /// line break
-        /// </summary>
-        internal static string ErrorComponent_Newline
-        {
-            get => GetString("ErrorComponent_Newline");
-        }
-
-        /// <summary>
-        /// line break
-        /// </summary>
-        internal static string FormatErrorComponent_Newline()
-            => GetString("ErrorComponent_Newline");
-
-        /// <summary>
-        /// The '{0}' feature requires a '{1}' provided by the '{2}'.
-        /// </summary>
-        internal static string FeatureDependencyMissing
-        {
-            get => GetString("FeatureDependencyMissing");
-        }
-
-        /// <summary>
-        /// The '{0}' feature requires a '{1}' provided by the '{2}'.
-        /// </summary>
-        internal static string FormatFeatureDependencyMissing(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("FeatureDependencyMissing"), p0, p1, p2);
-
-        /// <summary>
-        /// The feature must be initialized by setting the '{0}' property.
-        /// </summary>
-        internal static string FeatureMustBeInitialized
-        {
-            get => GetString("FeatureMustBeInitialized");
-        }
-
-        /// <summary>
-        /// The feature must be initialized by setting the '{0}' property.
-        /// </summary>
-        internal static string FormatFeatureMustBeInitialized(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("FeatureMustBeInitialized"), p0);
-
-        /// <summary>
-        /// Specify a C# code block.
-        /// </summary>
-        internal static string FunctionsDirective_Description
-        {
-            get => GetString("FunctionsDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify a C# code block.
-        /// </summary>
-        internal static string FormatFunctionsDirective_Description()
-            => GetString("FunctionsDirective_Description");
-
-        /// <summary>
-        /// &lt;&lt;newline sequence&gt;&gt;
-        /// </summary>
-        internal static string HtmlToken_NewLine
-        {
-            get => GetString("HtmlToken_NewLine");
-        }
-
-        /// <summary>
-        /// &lt;&lt;newline sequence&gt;&gt;
-        /// </summary>
-        internal static string FormatHtmlToken_NewLine()
-            => GetString("HtmlToken_NewLine");
-
-        /// <summary>
-        /// &lt;&lt;razor comment&gt;&gt;
-        /// </summary>
-        internal static string HtmlToken_RazorComment
-        {
-            get => GetString("HtmlToken_RazorComment");
-        }
-
-        /// <summary>
-        /// &lt;&lt;razor comment&gt;&gt;
-        /// </summary>
-        internal static string FormatHtmlToken_RazorComment()
-            => GetString("HtmlToken_RazorComment");
-
-        /// <summary>
-        /// &lt;&lt;text&gt;&gt;
-        /// </summary>
-        internal static string HtmlToken_Text
-        {
-            get => GetString("HtmlToken_Text");
-        }
-
-        /// <summary>
-        /// &lt;&lt;text&gt;&gt;
-        /// </summary>
-        internal static string FormatHtmlToken_Text()
-            => GetString("HtmlToken_Text");
-
-        /// <summary>
-        /// &lt;&lt;white space&gt;&gt;
-        /// </summary>
-        internal static string HtmlToken_WhiteSpace
-        {
-            get => GetString("HtmlToken_WhiteSpace");
-        }
-
-        /// <summary>
-        /// &lt;&lt;white space&gt;&gt;
-        /// </summary>
-        internal static string FormatHtmlToken_WhiteSpace()
-            => GetString("HtmlToken_WhiteSpace");
-
-        /// <summary>
-        /// Specify the base class for the current document.
-        /// </summary>
-        internal static string InheritsDirective_Description
-        {
-            get => GetString("InheritsDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the base class for the current document.
-        /// </summary>
-        internal static string FormatInheritsDirective_Description()
-            => GetString("InheritsDirective_Description");
-
-        /// <summary>
-        /// The base type that the current page inherits.
-        /// </summary>
-        internal static string InheritsDirective_TypeToken_Description
-        {
-            get => GetString("InheritsDirective_TypeToken_Description");
-        }
-
-        /// <summary>
-        /// The base type that the current page inherits.
-        /// </summary>
-        internal static string FormatInheritsDirective_TypeToken_Description()
-            => GetString("InheritsDirective_TypeToken_Description");
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string InheritsDirective_TypeToken_Name
-        {
-            get => GetString("InheritsDirective_TypeToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName
-        /// </summary>
-        internal static string FormatInheritsDirective_TypeToken_Name()
-            => GetString("InheritsDirective_TypeToken_Name");
-
-        /// <summary>
-        /// The '{0}' operation is not valid when the builder is empty.
-        /// </summary>
-        internal static string IntermediateNodeBuilder_PopInvalid
-        {
-            get => GetString("IntermediateNodeBuilder_PopInvalid");
-        }
-
-        /// <summary>
-        /// The '{0}' operation is not valid when the builder is empty.
-        /// </summary>
-        internal static string FormatIntermediateNodeBuilder_PopInvalid(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodeBuilder_PopInvalid"), p0);
-
-        /// <summary>
-        /// The node '{0}' has a read-only child collection and cannot be modified.
-        /// </summary>
-        internal static string IntermediateNodeReference_CollectionIsReadOnly
-        {
-            get => GetString("IntermediateNodeReference_CollectionIsReadOnly");
-        }
-
-        /// <summary>
-        /// The node '{0}' has a read-only child collection and cannot be modified.
-        /// </summary>
-        internal static string FormatIntermediateNodeReference_CollectionIsReadOnly(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodeReference_CollectionIsReadOnly"), p0);
-
-        /// <summary>
-        /// The reference is invalid. The node '{0}' could not be found as a child of '{1}'.
-        /// </summary>
-        internal static string IntermediateNodeReference_NodeNotFound
-        {
-            get => GetString("IntermediateNodeReference_NodeNotFound");
-        }
-
-        /// <summary>
-        /// The reference is invalid. The node '{0}' could not be found as a child of '{1}'.
-        /// </summary>
-        internal static string FormatIntermediateNodeReference_NodeNotFound(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodeReference_NodeNotFound"), p0, p1);
-
-        /// <summary>
-        /// The reference is invalid. References initialized with the default constructor cannot modify nodes.
-        /// </summary>
-        internal static string IntermediateNodeReference_NotInitialized
-        {
-            get => GetString("IntermediateNodeReference_NotInitialized");
-        }
-
-        /// <summary>
-        /// The reference is invalid. References initialized with the default constructor cannot modify nodes.
-        /// </summary>
-        internal static string FormatIntermediateNodeReference_NotInitialized()
-            => GetString("IntermediateNodeReference_NotInitialized");
-
-        /// <summary>
-        /// The '{0}' node type can only be used as a direct child of a '{1}' node.
-        /// </summary>
-        internal static string IntermediateNodes_InvalidParentNode
-        {
-            get => GetString("IntermediateNodes_InvalidParentNode");
-        }
-
-        /// <summary>
-        /// The '{0}' node type can only be used as a direct child of a '{1}' node.
-        /// </summary>
-        internal static string FormatIntermediateNodes_InvalidParentNode(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("IntermediateNodes_InvalidParentNode"), p0, p1);
-
-        /// <summary>
-        /// The node '{0}' is not the owner of change '{1}'.
-        /// </summary>
-        internal static string InvalidOperation_SpanIsNotChangeOwner
-        {
-            get => GetString("InvalidOperation_SpanIsNotChangeOwner");
-        }
-
-        /// <summary>
-        /// The node '{0}' is not the owner of change '{1}'.
-        /// </summary>
-        internal static string FormatInvalidOperation_SpanIsNotChangeOwner(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidOperation_SpanIsNotChangeOwner"), p0, p1);
-
-        /// <summary>
-        /// Invalid tag helper directive look up text '{0}'. The correct look up text format is: "name, assemblyName".
-        /// </summary>
-        internal static string InvalidTagHelperLookupText
-        {
-            get => GetString("InvalidTagHelperLookupText");
-        }
-
-        /// <summary>
-        /// Invalid tag helper directive look up text '{0}'. The correct look up text format is: "name, assemblyName".
-        /// </summary>
-        internal static string FormatInvalidTagHelperLookupText(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidTagHelperLookupText"), p0);
-
-        /// <summary>
-        /// Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'.
-        /// </summary>
-        internal static string InvalidTagHelperPrefixValue
-        {
-            get => GetString("InvalidTagHelperPrefixValue");
-        }
-
-        /// <summary>
-        /// Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'.
-        /// </summary>
-        internal static string FormatInvalidTagHelperPrefixValue(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidTagHelperPrefixValue"), p0, p1, p2);
-
-        /// <summary>
-        /// The key must not be null.
-        /// </summary>
-        internal static string KeyMustNotBeNull
-        {
-            get => GetString("KeyMustNotBeNull");
-        }
-
-        /// <summary>
-        /// The key must not be null.
-        /// </summary>
-        internal static string FormatKeyMustNotBeNull()
-            => GetString("KeyMustNotBeNull");
-
-        /// <summary>
-        /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment
-        /// </summary>
-        internal static string Language_Does_Not_Support_RazorComment
-        {
-            get => GetString("Language_Does_Not_Support_RazorComment");
-        }
-
-        /// <summary>
-        /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment
-        /// </summary>
-        internal static string FormatLanguage_Does_Not_Support_RazorComment()
-            => GetString("Language_Does_Not_Support_RazorComment");
-
-        /// <summary>
-        /// The specified encoding '{0}' does not match the content's encoding '{1}'.
-        /// </summary>
-        internal static string MismatchedContentEncoding
-        {
-            get => GetString("MismatchedContentEncoding");
-        }
-
-        /// <summary>
-        /// The specified encoding '{0}' does not match the content's encoding '{1}'.
-        /// </summary>
-        internal static string FormatMismatchedContentEncoding(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("MismatchedContentEncoding"), p0, p1);
-
-        /// <summary>
-        /// The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
-        /// 
-        /// @if(isLoggedIn) {{
-        ///     &lt;p&gt;Hello, @user!&lt;/p&gt;
-        /// }}
-        /// </summary>
-        internal static string ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start
-        {
-            get => GetString("ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start");
-        }
-
-        /// <summary>
-        /// The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
-        /// 
-        /// @if(isLoggedIn) {{
-        ///     &lt;p&gt;Hello, @user!&lt;/p&gt;
-        /// }}
-        /// </summary>
-        internal static string FormatParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start()
-            => GetString("ParseError_AtInCode_Must_Be_Followed_By_Colon_Paren_Or_Identifier_Start");
-
-        /// <summary>
-        /// End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
-        /// </summary>
-        internal static string ParseError_BlockComment_Not_Terminated
-        {
-            get => GetString("ParseError_BlockComment_Not_Terminated");
-        }
-
-        /// <summary>
-        /// End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
-        /// </summary>
-        internal static string FormatParseError_BlockComment_Not_Terminated()
-            => GetString("ParseError_BlockComment_Not_Terminated");
-
-        /// <summary>
-        /// Directive '{0}' must have a value.
-        /// </summary>
-        internal static string ParseError_DirectiveMustHaveValue
-        {
-            get => GetString("ParseError_DirectiveMustHaveValue");
-        }
-
-        /// <summary>
-        /// Directive '{0}' must have a value.
-        /// </summary>
-        internal static string FormatParseError_DirectiveMustHaveValue(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_DirectiveMustHaveValue"), p0);
-
-        /// <summary>
-        /// An opening "{0}" is missing the corresponding closing "{1}".
-        /// </summary>
-        internal static string ParseError_Expected_CloseBracket_Before_EOF
-        {
-            get => GetString("ParseError_Expected_CloseBracket_Before_EOF");
-        }
-
-        /// <summary>
-        /// An opening "{0}" is missing the corresponding closing "{1}".
-        /// </summary>
-        internal static string FormatParseError_Expected_CloseBracket_Before_EOF(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Expected_CloseBracket_Before_EOF"), p0, p1);
-
-        /// <summary>
-        /// The {0} block is missing a closing "{1}" character.  Make sure you have a matching "{1}" character for all the "{2}" characters within this block, and that none of the "{1}" characters are being interpreted as markup.
-        /// </summary>
-        internal static string ParseError_Expected_EndOfBlock_Before_EOF
-        {
-            get => GetString("ParseError_Expected_EndOfBlock_Before_EOF");
-        }
-
-        /// <summary>
-        /// The {0} block is missing a closing "{1}" character.  Make sure you have a matching "{1}" character for all the "{2}" characters within this block, and that none of the "{1}" characters are being interpreted as markup.
-        /// </summary>
-        internal static string FormatParseError_Expected_EndOfBlock_Before_EOF(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Expected_EndOfBlock_Before_EOF"), p0, p1, p2);
-
-        /// <summary>
-        /// The {0} directive is not supported.
-        /// </summary>
-        internal static string ParseError_HelperDirectiveNotAvailable
-        {
-            get => GetString("ParseError_HelperDirectiveNotAvailable");
-        }
-
-        /// <summary>
-        /// The {0} directive is not supported.
-        /// </summary>
-        internal static string FormatParseError_HelperDirectiveNotAvailable(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_HelperDirectiveNotAvailable"), p0);
-
-        /// <summary>
-        /// Optional quote around the directive '{0}' is missing the corresponding opening or closing quote.
-        /// </summary>
-        internal static string ParseError_IncompleteQuotesAroundDirective
-        {
-            get => GetString("ParseError_IncompleteQuotesAroundDirective");
-        }
-
-        /// <summary>
-        /// Optional quote around the directive '{0}' is missing the corresponding opening or closing quote.
-        /// </summary>
-        internal static string FormatParseError_IncompleteQuotesAroundDirective(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_IncompleteQuotesAroundDirective"), p0);
-
-        /// <summary>
-        /// Inline markup blocks (@&lt;p&gt;Content&lt;/p&gt;) cannot be nested.  Only one level of inline markup is allowed.
-        /// </summary>
-        internal static string ParseError_InlineMarkup_Blocks_Cannot_Be_Nested
-        {
-            get => GetString("ParseError_InlineMarkup_Blocks_Cannot_Be_Nested");
-        }
-
-        /// <summary>
-        /// Inline markup blocks (@&lt;p&gt;Content&lt;/p&gt;) cannot be nested.  Only one level of inline markup is allowed.
-        /// </summary>
-        internal static string FormatParseError_InlineMarkup_Blocks_Cannot_Be_Nested()
-            => GetString("ParseError_InlineMarkup_Blocks_Cannot_Be_Nested");
-
-        /// <summary>
-        /// Markup in a code block must start with a tag and all start tags must be matched with end tags.  Do not use unclosed tags like "&lt;br&gt;".  Instead use self-closing tags like "&lt;br/&gt;".
-        /// </summary>
-        internal static string ParseError_MarkupBlock_Must_Start_With_Tag
-        {
-            get => GetString("ParseError_MarkupBlock_Must_Start_With_Tag");
-        }
-
-        /// <summary>
-        /// Markup in a code block must start with a tag and all start tags must be matched with end tags.  Do not use unclosed tags like "&lt;br&gt;".  Instead use self-closing tags like "&lt;br/&gt;".
-        /// </summary>
-        internal static string FormatParseError_MarkupBlock_Must_Start_With_Tag()
-            => GetString("ParseError_MarkupBlock_Must_Start_With_Tag");
-
-        /// <summary>
-        /// The "{0}" element was not closed.  All elements must be either self-closing or have a matching end tag.
-        /// </summary>
-        internal static string ParseError_MissingEndTag
-        {
-            get => GetString("ParseError_MissingEndTag");
-        }
-
-        /// <summary>
-        /// The "{0}" element was not closed.  All elements must be either self-closing or have a matching end tag.
-        /// </summary>
-        internal static string FormatParseError_MissingEndTag(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_MissingEndTag"), p0);
-
-        /// <summary>
-        /// Namespace imports and type aliases cannot be placed within code blocks.  They must immediately follow an "@" character in markup.  It is recommended that you put them at the top of the page, as in the following example:
-        /// 
-        /// @using System.Drawing;
-        /// @{{
-        ///     // OK here to use types from System.Drawing in the page.
-        /// }}
-        /// </summary>
-        internal static string ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock
-        {
-            get => GetString("ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock");
-        }
-
-        /// <summary>
-        /// Namespace imports and type aliases cannot be placed within code blocks.  They must immediately follow an "@" character in markup.  It is recommended that you put them at the top of the page, as in the following example:
-        /// 
-        /// @using System.Drawing;
-        /// @{{
-        ///     // OK here to use types from System.Drawing in the page.
-        /// }}
-        /// </summary>
-        internal static string FormatParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock()
-            => GetString("ParseError_NamespaceImportAndTypeAlias_Cannot_Exist_Within_CodeBlock");
-
-        /// <summary>
-        /// Outer tag is missing a name. The first character of a markup block must be an HTML tag with a valid name.
-        /// </summary>
-        internal static string ParseError_OuterTagMissingName
-        {
-            get => GetString("ParseError_OuterTagMissingName");
-        }
-
-        /// <summary>
-        /// Outer tag is missing a name. The first character of a markup block must be an HTML tag with a valid name.
-        /// </summary>
-        internal static string FormatParseError_OuterTagMissingName()
-            => GetString("ParseError_OuterTagMissingName");
-
-        /// <summary>
-        /// End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
-        /// </summary>
-        internal static string ParseError_RazorComment_Not_Terminated
-        {
-            get => GetString("ParseError_RazorComment_Not_Terminated");
-        }
-
-        /// <summary>
-        /// End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
-        /// </summary>
-        internal static string FormatParseError_RazorComment_Not_Terminated()
-            => GetString("ParseError_RazorComment_Not_Terminated");
-
-        /// <summary>
-        /// "{0}" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
-        /// </summary>
-        internal static string ParseError_ReservedWord
-        {
-            get => GetString("ParseError_ReservedWord");
-        }
-
-        /// <summary>
-        /// "{0}" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
-        /// </summary>
-        internal static string FormatParseError_ReservedWord(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_ReservedWord"), p0);
-
-        /// <summary>
-        /// Section blocks ("{0}") cannot be nested.  Only one level of section blocks are allowed.
-        /// </summary>
-        internal static string ParseError_Sections_Cannot_Be_Nested
-        {
-            get => GetString("ParseError_Sections_Cannot_Be_Nested");
-        }
-
-        /// <summary>
-        /// Section blocks ("{0}") cannot be nested.  Only one level of section blocks are allowed.
-        /// </summary>
-        internal static string FormatParseError_Sections_Cannot_Be_Nested(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Sections_Cannot_Be_Nested"), p0);
-
-        /// <summary>
-        /// Expected a "{0}" but found a "{1}".  Block statements must be enclosed in "{{" and "}}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-        /// 
-        /// @if(isLoggedIn)
-        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
-        /// 
-        /// Instead, wrap the contents of the block in "{{}}":
-        /// 
-        /// @if(isLoggedIn) {{
-        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
-        /// }}
-        /// </summary>
-        internal static string ParseError_SingleLine_ControlFlowStatements_Not_Allowed
-        {
-            get => GetString("ParseError_SingleLine_ControlFlowStatements_Not_Allowed");
-        }
-
-        /// <summary>
-        /// Expected a "{0}" but found a "{1}".  Block statements must be enclosed in "{{" and "}}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-        /// 
-        /// @if(isLoggedIn)
-        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
-        /// 
-        /// Instead, wrap the contents of the block in "{{}}":
-        /// 
-        /// @if(isLoggedIn) {{
-        ///     &lt;p&gt;Hello, @user&lt;/p&gt;
-        /// }}
-        /// </summary>
-        internal static string FormatParseError_SingleLine_ControlFlowStatements_Not_Allowed(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_SingleLine_ControlFlowStatements_Not_Allowed"), p0, p1);
-
-        /// <summary>
-        /// "&lt;text&gt;" and "&lt;/text&gt;" tags cannot contain attributes.
-        /// </summary>
-        internal static string ParseError_TextTagCannotContainAttributes
-        {
-            get => GetString("ParseError_TextTagCannotContainAttributes");
-        }
-
-        /// <summary>
-        /// "&lt;text&gt;" and "&lt;/text&gt;" tags cannot contain attributes.
-        /// </summary>
-        internal static string FormatParseError_TextTagCannotContainAttributes()
-            => GetString("ParseError_TextTagCannotContainAttributes");
-
-        /// <summary>
-        /// "{0}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{{" are valid.
-        /// </summary>
-        internal static string ParseError_Unexpected_Character_At_Start_Of_CodeBlock
-        {
-            get => GetString("ParseError_Unexpected_Character_At_Start_Of_CodeBlock");
-        }
-
-        /// <summary>
-        /// "{0}" is not valid at the start of a code block.  Only identifiers, keywords, comments, "(" and "{{" are valid.
-        /// </summary>
-        internal static string FormatParseError_Unexpected_Character_At_Start_Of_CodeBlock(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_Unexpected_Character_At_Start_Of_CodeBlock"), p0);
-
-        /// <summary>
-        /// End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
-        /// </summary>
-        internal static string ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock
-        {
-            get => GetString("ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock");
-        }
-
-        /// <summary>
-        /// End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
-        /// </summary>
-        internal static string FormatParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock()
-            => GetString("ParseError_Unexpected_EndOfFile_At_Start_Of_CodeBlock");
-
-        /// <summary>
-        /// Unexpected "{{" after "@" character. Once inside the body of a code block (@if {{}}, @{{}}, etc.) you do not need to use "@{{" to switch to code.
-        /// </summary>
-        internal static string ParseError_Unexpected_Nested_CodeBlock
-        {
-            get => GetString("ParseError_Unexpected_Nested_CodeBlock");
-        }
-
-        /// <summary>
-        /// Unexpected "{{" after "@" character. Once inside the body of a code block (@if {{}}, @{{}}, etc.) you do not need to use "@{{" to switch to code.
-        /// </summary>
-        internal static string FormatParseError_Unexpected_Nested_CodeBlock()
-            => GetString("ParseError_Unexpected_Nested_CodeBlock");
-
-        /// <summary>
-        /// A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
-        /// </summary>
-        internal static string ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock
-        {
-            get => GetString("ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock");
-        }
-
-        /// <summary>
-        /// A space or line break was encountered after the "@" character.  Only valid identifiers, keywords, comments, "(" and "{{" are valid at the start of a code block and they must occur immediately following "@" with no space in between.
-        /// </summary>
-        internal static string FormatParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock()
-            => GetString("ParseError_Unexpected_WhiteSpace_At_Start_Of_CodeBlock");
-
-        /// <summary>
-        /// Encountered end tag "{0}" with no matching start tag.  Are your start/end tags properly balanced?
-        /// </summary>
-        internal static string ParseError_UnexpectedEndTag
-        {
-            get => GetString("ParseError_UnexpectedEndTag");
-        }
-
-        /// <summary>
-        /// Encountered end tag "{0}" with no matching start tag.  Are your start/end tags properly balanced?
-        /// </summary>
-        internal static string FormatParseError_UnexpectedEndTag(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_UnexpectedEndTag"), p0);
-
-        /// <summary>
-        /// End of file or an unexpected character was reached before the "{0}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("&lt;br /&gt;") or have matching end tags ("&lt;p&gt;Hello&lt;/p&gt;").  If you intended to display a "&lt;" character, use the "&amp;lt;" HTML entity.
-        /// </summary>
-        internal static string ParseError_UnfinishedTag
-        {
-            get => GetString("ParseError_UnfinishedTag");
-        }
-
-        /// <summary>
-        /// End of file or an unexpected character was reached before the "{0}" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("&lt;br /&gt;") or have matching end tags ("&lt;p&gt;Hello&lt;/p&gt;").  If you intended to display a "&lt;" character, use the "&amp;lt;" HTML entity.
-        /// </summary>
-        internal static string FormatParseError_UnfinishedTag(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("ParseError_UnfinishedTag"), p0);
-
-        /// <summary>
-        /// Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
-        /// </summary>
-        internal static string ParseError_Unterminated_String_Literal
-        {
-            get => GetString("ParseError_Unterminated_String_Literal");
-        }
-
-        /// <summary>
-        /// Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
-        /// </summary>
-        internal static string FormatParseError_Unterminated_String_Literal()
-            => GetString("ParseError_Unterminated_String_Literal");
-
-        /// <summary>
-        /// Parser was started with a null Context property.  The Context property must be set BEFORE calling any methods on the parser.
-        /// </summary>
-        internal static string Parser_Context_Not_Set
-        {
-            get => GetString("Parser_Context_Not_Set");
-        }
-
-        /// <summary>
-        /// Parser was started with a null Context property.  The Context property must be set BEFORE calling any methods on the parser.
-        /// </summary>
-        internal static string FormatParser_Context_Not_Set()
-            => GetString("Parser_Context_Not_Set");
-
-        /// <summary>
-        /// Cannot complete the tree, StartBlock must be called at least once.
-        /// </summary>
-        internal static string ParserContext_CannotCompleteTree_NoRootBlock
-        {
-            get => GetString("ParserContext_CannotCompleteTree_NoRootBlock");
-        }
-
-        /// <summary>
-        /// Cannot complete the tree, StartBlock must be called at least once.
-        /// </summary>
-        internal static string FormatParserContext_CannotCompleteTree_NoRootBlock()
-            => GetString("ParserContext_CannotCompleteTree_NoRootBlock");
-
-        /// <summary>
-        /// Cannot complete the tree, there are still open blocks.
-        /// </summary>
-        internal static string ParserContext_CannotCompleteTree_OutstandingBlocks
-        {
-            get => GetString("ParserContext_CannotCompleteTree_OutstandingBlocks");
-        }
-
-        /// <summary>
-        /// Cannot complete the tree, there are still open blocks.
-        /// </summary>
-        internal static string FormatParserContext_CannotCompleteTree_OutstandingBlocks()
-            => GetString("ParserContext_CannotCompleteTree_OutstandingBlocks");
-
-        /// <summary>
-        /// Cannot finish span, there is no current block. Call StartBlock at least once before finishing a span
-        /// </summary>
-        internal static string ParserContext_NoCurrentBlock
-        {
-            get => GetString("ParserContext_NoCurrentBlock");
-        }
-
-        /// <summary>
-        /// Cannot finish span, there is no current block. Call StartBlock at least once before finishing a span
-        /// </summary>
-        internal static string FormatParserContext_NoCurrentBlock()
-            => GetString("ParserContext_NoCurrentBlock");
-
-        /// <summary>
-        /// The '{0}' phase requires a '{1}' provided by the '{2}'.
-        /// </summary>
-        internal static string PhaseDependencyMissing
-        {
-            get => GetString("PhaseDependencyMissing");
-        }
-
-        /// <summary>
-        /// The '{0}' phase requires a '{1}' provided by the '{2}'.
-        /// </summary>
-        internal static string FormatPhaseDependencyMissing(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PhaseDependencyMissing"), p0, p1, p2);
-
-        /// <summary>
-        /// The phase must be initialized by setting the '{0}' property.
-        /// </summary>
-        internal static string PhaseMustBeInitialized
-        {
-            get => GetString("PhaseMustBeInitialized");
-        }
-
-        /// <summary>
-        /// The phase must be initialized by setting the '{0}' property.
-        /// </summary>
-        internal static string FormatPhaseMustBeInitialized(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PhaseMustBeInitialized"), p0);
-
-        /// <summary>
-        /// Path must begin with a forward slash '/'.
-        /// </summary>
-        internal static string RazorProject_PathMustStartWithForwardSlash
-        {
-            get => GetString("RazorProject_PathMustStartWithForwardSlash");
-        }
-
-        /// <summary>
-        /// Path must begin with a forward slash '/'.
-        /// </summary>
-        internal static string FormatRazorProject_PathMustStartWithForwardSlash()
-            => GetString("RazorProject_PathMustStartWithForwardSlash");
-
-        /// <summary>
-        /// Remove Tag Helpers for use in the current document.
-        /// </summary>
-        internal static string RemoveTagHelperDirective_Description
-        {
-            get => GetString("RemoveTagHelperDirective_Description");
-        }
-
-        /// <summary>
-        /// Remove Tag Helpers for use in the current document.
-        /// </summary>
-        internal static string FormatRemoveTagHelperDirective_Description()
-            => GetString("RemoveTagHelperDirective_Description");
-
-        /// <summary>
-        /// Remove tag helpers from the specified type name and assembly name. Specify '*' for the type name to remove all tag helper types from the specified assembly.
-        /// </summary>
-        internal static string RemoveTagHelperDirective_StringToken_Description
-        {
-            get => GetString("RemoveTagHelperDirective_StringToken_Description");
-        }
-
-        /// <summary>
-        /// Remove tag helpers from the specified type name and assembly name. Specify '*' for the type name to remove all tag helper types from the specified assembly.
-        /// </summary>
-        internal static string FormatRemoveTagHelperDirective_StringToken_Description()
-            => GetString("RemoveTagHelperDirective_StringToken_Description");
-
-        /// <summary>
-        /// TypeName, AssemblyName
-        /// </summary>
-        internal static string RemoveTagHelperDirective_StringToken_Name
-        {
-            get => GetString("RemoveTagHelperDirective_StringToken_Name");
-        }
-
-        /// <summary>
-        /// TypeName, AssemblyName
-        /// </summary>
-        internal static string FormatRemoveTagHelperDirective_StringToken_Name()
-            => GetString("RemoveTagHelperDirective_StringToken_Name");
-
-        /// <summary>
-        /// The '{0}' requires a '{1}' delegate to be set.
-        /// </summary>
-        internal static string RenderingContextRequiresDelegate
-        {
-            get => GetString("RenderingContextRequiresDelegate");
-        }
-
-        /// <summary>
-        /// The '{0}' requires a '{1}' delegate to be set.
-        /// </summary>
-        internal static string FormatRenderingContextRequiresDelegate(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RenderingContextRequiresDelegate"), p0, p1);
-
-        /// <summary>
-        /// Attribute '{0}' on tag helper element '{1}' requires a value. Tag helper bound attributes of type '{2}' cannot be empty or contain only whitespace.
-        /// </summary>
-        internal static string RewriterError_EmptyTagHelperBoundAttribute
-        {
-            get => GetString("RewriterError_EmptyTagHelperBoundAttribute");
-        }
-
-        /// <summary>
-        /// Attribute '{0}' on tag helper element '{1}' requires a value. Tag helper bound attributes of type '{2}' cannot be empty or contain only whitespace.
-        /// </summary>
-        internal static string FormatRewriterError_EmptyTagHelperBoundAttribute(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RewriterError_EmptyTagHelperBoundAttribute"), p0, p1, p2);
-
-        /// <summary>
-        /// Define a section to be rendered in the configured layout page.
-        /// </summary>
-        internal static string SectionDirective_Description
-        {
-            get => GetString("SectionDirective_Description");
-        }
-
-        /// <summary>
-        /// Define a section to be rendered in the configured layout page.
-        /// </summary>
-        internal static string FormatSectionDirective_Description()
-            => GetString("SectionDirective_Description");
-
-        /// <summary>
-        /// The name of the section.
-        /// </summary>
-        internal static string SectionDirective_NameToken_Description
-        {
-            get => GetString("SectionDirective_NameToken_Description");
-        }
-
-        /// <summary>
-        /// The name of the section.
-        /// </summary>
-        internal static string FormatSectionDirective_NameToken_Description()
-            => GetString("SectionDirective_NameToken_Description");
-
-        /// <summary>
-        /// SectionName
-        /// </summary>
-        internal static string SectionDirective_NameToken_Name
-        {
-            get => GetString("SectionDirective_NameToken_Name");
-        }
-
-        /// <summary>
-        /// SectionName
-        /// </summary>
-        internal static string FormatSectionDirective_NameToken_Name()
-            => GetString("SectionDirective_NameToken_Name");
-
-        /// <summary>
-        /// @section Header { ... }
-        /// </summary>
-        internal static string SectionExample
-        {
-            get => GetString("SectionExample");
-        }
-
-        /// <summary>
-        /// @section Header { ... }
-        /// </summary>
-        internal static string FormatSectionExample()
-            => GetString("SectionExample");
-
-        /// <summary>
-        /// &lt;&lt;unknown&gt;&gt;
-        /// </summary>
-        internal static string Token_Unknown
-        {
-            get => GetString("Token_Unknown");
-        }
-
-        /// <summary>
-        /// &lt;&lt;unknown&gt;&gt;
-        /// </summary>
-        internal static string FormatToken_Unknown()
-            => GetString("Token_Unknown");
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name contains a '{3}' character.
-        /// </summary>
-        internal static string TagHelper_InvalidBoundAttributeName
-        {
-            get => GetString("TagHelper_InvalidBoundAttributeName");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name contains a '{3}' character.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidBoundAttributeName(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributeName"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name starts with '{3}'.
-        /// </summary>
-        internal static string TagHelper_InvalidBoundAttributeNameStartsWith
-        {
-            get => GetString("TagHelper_InvalidBoundAttributeNameStartsWith");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name starts with '{3}'.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidBoundAttributeNameStartsWith(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributeNameStartsWith"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with a null or empty name.
-        /// </summary>
-        internal static string TagHelper_InvalidBoundAttributeNullOrWhitespace
-        {
-            get => GetString("TagHelper_InvalidBoundAttributeNullOrWhitespace");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with a null or empty name.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidBoundAttributeNullOrWhitespace(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributeNullOrWhitespace"), p0, p1);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix contains a '{3}' character.
-        /// </summary>
-        internal static string TagHelper_InvalidBoundAttributePrefix
-        {
-            get => GetString("TagHelper_InvalidBoundAttributePrefix");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix contains a '{3}' character.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidBoundAttributePrefix(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributePrefix"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix starts with '{3}'.
-        /// </summary>
-        internal static string TagHelper_InvalidBoundAttributePrefixStartsWith
-        {
-            get => GetString("TagHelper_InvalidBoundAttributePrefixStartsWith");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with prefix '{2}' because the prefix starts with '{3}'.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidBoundAttributePrefixStartsWith(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidBoundAttributePrefixStartsWith"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// Invalid restricted child '{1}' for tag helper '{0}'. Tag helpers cannot restrict child elements that contain a '{2}' character.
-        /// </summary>
-        internal static string TagHelper_InvalidRestrictedChild
-        {
-            get => GetString("TagHelper_InvalidRestrictedChild");
-        }
-
-        /// <summary>
-        /// Invalid restricted child '{1}' for tag helper '{0}'. Tag helpers cannot restrict child elements that contain a '{2}' character.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidRestrictedChild(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRestrictedChild"), p0, p1, p2);
-
-        /// <summary>
-        /// Invalid restricted child for tag helper '{0}'. Name cannot be null or whitespace.
-        /// </summary>
-        internal static string TagHelper_InvalidRestrictedChildNullOrWhitespace
-        {
-            get => GetString("TagHelper_InvalidRestrictedChildNullOrWhitespace");
-        }
-
-        /// <summary>
-        /// Invalid restricted child for tag helper '{0}'. Name cannot be null or whitespace.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidRestrictedChildNullOrWhitespace(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRestrictedChildNullOrWhitespace"), p0);
-
-        /// <summary>
-        /// Tag helpers cannot target attribute name '{0}' because it contains a '{1}' character.
-        /// </summary>
-        internal static string TagHelper_InvalidTargetedAttributeName
-        {
-            get => GetString("TagHelper_InvalidTargetedAttributeName");
-        }
-
-        /// <summary>
-        /// Tag helpers cannot target attribute name '{0}' because it contains a '{1}' character.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidTargetedAttributeName(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidTargetedAttributeName"), p0, p1);
-
-        /// <summary>
-        /// Targeted attribute name cannot be null or whitespace.
-        /// </summary>
-        internal static string TagHelper_InvalidTargetedAttributeNameNullOrWhitespace
-        {
-            get => GetString("TagHelper_InvalidTargetedAttributeNameNullOrWhitespace");
-        }
-
-        /// <summary>
-        /// Targeted attribute name cannot be null or whitespace.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidTargetedAttributeNameNullOrWhitespace()
-            => GetString("TagHelper_InvalidTargetedAttributeNameNullOrWhitespace");
-
-        /// <summary>
-        /// Tag helpers cannot target parent tag name '{0}' because it contains a '{1}' character.
-        /// </summary>
-        internal static string TagHelper_InvalidTargetedParentTagName
-        {
-            get => GetString("TagHelper_InvalidTargetedParentTagName");
-        }
-
-        /// <summary>
-        /// Tag helpers cannot target parent tag name '{0}' because it contains a '{1}' character.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidTargetedParentTagName(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidTargetedParentTagName"), p0, p1);
-
-        /// <summary>
-        /// Targeted parent tag name cannot be null or whitespace.
-        /// </summary>
-        internal static string TagHelper_InvalidTargetedParentTagNameNullOrWhitespace
-        {
-            get => GetString("TagHelper_InvalidTargetedParentTagNameNullOrWhitespace");
-        }
-
-        /// <summary>
-        /// Targeted parent tag name cannot be null or whitespace.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidTargetedParentTagNameNullOrWhitespace()
-            => GetString("TagHelper_InvalidTargetedParentTagNameNullOrWhitespace");
-
-        /// <summary>
-        /// Tag helpers cannot target tag name '{0}' because it contains a '{1}' character.
-        /// </summary>
-        internal static string TagHelper_InvalidTargetedTagName
-        {
-            get => GetString("TagHelper_InvalidTargetedTagName");
-        }
-
-        /// <summary>
-        /// Tag helpers cannot target tag name '{0}' because it contains a '{1}' character.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidTargetedTagName(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidTargetedTagName"), p0, p1);
-
-        /// <summary>
-        /// Targeted tag name cannot be null or whitespace.
-        /// </summary>
-        internal static string TagHelper_InvalidTargetedTagNameNullOrWhitespace
-        {
-            get => GetString("TagHelper_InvalidTargetedTagNameNullOrWhitespace");
-        }
-
-        /// <summary>
-        /// Targeted tag name cannot be null or whitespace.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidTargetedTagNameNullOrWhitespace()
-            => GetString("TagHelper_InvalidTargetedTagNameNullOrWhitespace");
-
-        /// <summary>
-        /// Tag helper directive assembly name cannot be null or empty.
-        /// </summary>
-        internal static string TagHelperAssemblyNameCannotBeEmptyOrNull
-        {
-            get => GetString("TagHelperAssemblyNameCannotBeEmptyOrNull");
-        }
-
-        /// <summary>
-        /// Tag helper directive assembly name cannot be null or empty.
-        /// </summary>
-        internal static string FormatTagHelperAssemblyNameCannotBeEmptyOrNull()
-            => GetString("TagHelperAssemblyNameCannotBeEmptyOrNull");
-
-        /// <summary>
-        /// The tag helper attribute '{0}' in element '{1}' is missing a key. The syntax is '&lt;{1} {0}{{ key }}="value"&gt;'.
-        /// </summary>
-        internal static string TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey
-        {
-            get => GetString("TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey");
-        }
-
-        /// <summary>
-        /// The tag helper attribute '{0}' in element '{1}' is missing a key. The syntax is '&lt;{1} {0}{{ key }}="value"&gt;'.
-        /// </summary>
-        internal static string FormatTagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperBlockRewriter_IndexerAttributeNameMustIncludeKey"), p0, p1);
-
-        /// <summary>
-        /// TagHelper attributes must be well-formed.
-        /// </summary>
-        internal static string TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed
-        {
-            get => GetString("TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed");
-        }
-
-        /// <summary>
-        /// TagHelper attributes must be well-formed.
-        /// </summary>
-        internal static string FormatTagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed()
-            => GetString("TagHelperBlockRewriter_TagHelperAttributeListMustBeWellFormed");
-
-        /// <summary>
-        /// The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed.
-        /// </summary>
-        internal static string TagHelperParseTreeRewriter_CannotHaveNonTagContent
-        {
-            get => GetString("TagHelperParseTreeRewriter_CannotHaveNonTagContent");
-        }
-
-        /// <summary>
-        /// The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed.
-        /// </summary>
-        internal static string FormatTagHelperParseTreeRewriter_CannotHaveNonTagContent(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_CannotHaveNonTagContent"), p0, p1);
-
-        /// <summary>
-        /// Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}').
-        /// </summary>
-        internal static string TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag
-        {
-            get => GetString("TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag");
-        }
-
-        /// <summary>
-        /// Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}').
-        /// </summary>
-        internal static string FormatTagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag"), p0, p1, p2);
-
-        /// <summary>
-        /// Tag helpers '{0}' and '{1}' targeting element '{2}' must not expect different {3} values.
-        /// </summary>
-        internal static string TagHelperParseTreeRewriter_InconsistentTagStructure
-        {
-            get => GetString("TagHelperParseTreeRewriter_InconsistentTagStructure");
-        }
-
-        /// <summary>
-        /// Tag helpers '{0}' and '{1}' targeting element '{2}' must not expect different {3} values.
-        /// </summary>
-        internal static string FormatTagHelperParseTreeRewriter_InconsistentTagStructure(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_InconsistentTagStructure"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tags with name(s) '{2}' are allowed.
-        /// </summary>
-        internal static string TagHelperParseTreeRewriter_InvalidNestedTag
-        {
-            get => GetString("TagHelperParseTreeRewriter_InvalidNestedTag");
-        }
-
-        /// <summary>
-        /// The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tags with name(s) '{2}' are allowed.
-        /// </summary>
-        internal static string FormatTagHelperParseTreeRewriter_InvalidNestedTag(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperParseTreeRewriter_InvalidNestedTag"), p0, p1, p2);
-
-        /// <summary>
-        /// Specify a prefix that is required in an element name for it to be included in Tag Helper processing.
-        /// </summary>
-        internal static string TagHelperPrefixDirective_Description
-        {
-            get => GetString("TagHelperPrefixDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify a prefix that is required in an element name for it to be included in Tag Helper processing.
-        /// </summary>
-        internal static string FormatTagHelperPrefixDirective_Description()
-            => GetString("TagHelperPrefixDirective_Description");
-
-        /// <summary>
-        /// The tag prefix to apply to tag helpers.
-        /// </summary>
-        internal static string TagHelperPrefixDirective_PrefixToken_Description
-        {
-            get => GetString("TagHelperPrefixDirective_PrefixToken_Description");
-        }
-
-        /// <summary>
-        /// The tag prefix to apply to tag helpers.
-        /// </summary>
-        internal static string FormatTagHelperPrefixDirective_PrefixToken_Description()
-            => GetString("TagHelperPrefixDirective_PrefixToken_Description");
-
-        /// <summary>
-        /// Prefix
-        /// </summary>
-        internal static string TagHelperPrefixDirective_PrefixToken_Name
-        {
-            get => GetString("TagHelperPrefixDirective_PrefixToken_Name");
-        }
-
-        /// <summary>
-        /// Prefix
-        /// </summary>
-        internal static string FormatTagHelperPrefixDirective_PrefixToken_Name()
-            => GetString("TagHelperPrefixDirective_PrefixToken_Name");
-
-        /// <summary>
-        /// Tag Helper '{0}'s attributes must have names.
-        /// </summary>
-        internal static string TagHelpers_AttributesMustHaveAName
-        {
-            get => GetString("TagHelpers_AttributesMustHaveAName");
-        }
-
-        /// <summary>
-        /// Tag Helper '{0}'s attributes must have names.
-        /// </summary>
-        internal static string FormatTagHelpers_AttributesMustHaveAName(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_AttributesMustHaveAName"), p0);
-
-        /// <summary>
-        /// The tag helper '{0}' must not have C# in the element's attribute declaration area.
-        /// </summary>
-        internal static string TagHelpers_CannotHaveCSharpInTagDeclaration
-        {
-            get => GetString("TagHelpers_CannotHaveCSharpInTagDeclaration");
-        }
-
-        /// <summary>
-        /// The tag helper '{0}' must not have C# in the element's attribute declaration area.
-        /// </summary>
-        internal static string FormatTagHelpers_CannotHaveCSharpInTagDeclaration(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_CannotHaveCSharpInTagDeclaration"), p0);
-
-        /// <summary>
-        /// Code blocks (e.g. @{{var variable = 23;}}) must not appear in non-string tag helper attribute values.
-        ///  Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.
-        /// </summary>
-        internal static string TagHelpers_CodeBlocks_NotSupported_InAttributes
-        {
-            get => GetString("TagHelpers_CodeBlocks_NotSupported_InAttributes");
-        }
-
-        /// <summary>
-        /// Code blocks (e.g. @{{var variable = 23;}}) must not appear in non-string tag helper attribute values.
-        ///  Already in an expression (code) context. If necessary an explicit expression (e.g. @(@readonly)) may be used.
-        /// </summary>
-        internal static string FormatTagHelpers_CodeBlocks_NotSupported_InAttributes()
-            => GetString("TagHelpers_CodeBlocks_NotSupported_InAttributes");
-
-        /// <summary>
-        /// Inline markup blocks (e.g. @&lt;p&gt;content&lt;/p&gt;) must not appear in non-string tag helper attribute values.
-        ///  Expected a '{0}' attribute value, not a string.
-        /// </summary>
-        internal static string TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes
-        {
-            get => GetString("TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes");
-        }
-
-        /// <summary>
-        /// Inline markup blocks (e.g. @&lt;p&gt;content&lt;/p&gt;) must not appear in non-string tag helper attribute values.
-        ///  Expected a '{0}' attribute value, not a string.
-        /// </summary>
-        internal static string FormatTagHelpers_InlineMarkupBlocks_NotSupported_InAttributes(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_InlineMarkupBlocks_NotSupported_InAttributes"), p0);
-
-        /// <summary>
-        /// Found a malformed '{0}' tag helper. Tag helpers must have a start and end tag or be self closing.
-        /// </summary>
-        internal static string TagHelpersParseTreeRewriter_FoundMalformedTagHelper
-        {
-            get => GetString("TagHelpersParseTreeRewriter_FoundMalformedTagHelper");
-        }
-
-        /// <summary>
-        /// Found a malformed '{0}' tag helper. Tag helpers must have a start and end tag or be self closing.
-        /// </summary>
-        internal static string FormatTagHelpersParseTreeRewriter_FoundMalformedTagHelper(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpersParseTreeRewriter_FoundMalformedTagHelper"), p0);
-
-        /// <summary>
-        /// Missing close angle for tag helper '{0}'.
-        /// </summary>
-        internal static string TagHelpersParseTreeRewriter_MissingCloseAngle
-        {
-            get => GetString("TagHelpersParseTreeRewriter_MissingCloseAngle");
-        }
-
-        /// <summary>
-        /// Missing close angle for tag helper '{0}'.
-        /// </summary>
-        internal static string FormatTagHelpersParseTreeRewriter_MissingCloseAngle(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpersParseTreeRewriter_MissingCloseAngle"), p0);
-
-        /// <summary>
-        /// Unreachable code. This can happen when a new {0} is introduced.
-        /// </summary>
-        internal static string UnexpectedDirectiveKind
-        {
-            get => GetString("UnexpectedDirectiveKind");
-        }
-
-        /// <summary>
-        /// Unreachable code. This can happen when a new {0} is introduced.
-        /// </summary>
-        internal static string FormatUnexpectedDirectiveKind(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedDirectiveKind"), p0);
-
-        /// <summary>
-        /// Unexpected literal following the '{0}' directive. Expected '{1}'.
-        /// </summary>
-        internal static string UnexpectedDirectiveLiteral
-        {
-            get => GetString("UnexpectedDirectiveLiteral");
-        }
-
-        /// <summary>
-        /// Unexpected literal following the '{0}' directive. Expected '{1}'.
-        /// </summary>
-        internal static string FormatUnexpectedDirectiveLiteral(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedDirectiveLiteral"), p0, p1);
-
-        /// <summary>
-        /// Unexpected end of file following the '{0}' directive. Expected '{1}'.
-        /// </summary>
-        internal static string UnexpectedEOFAfterDirective
-        {
-            get => GetString("UnexpectedEOFAfterDirective");
-        }
-
-        /// <summary>
-        /// Unexpected end of file following the '{0}' directive. Expected '{1}'.
-        /// </summary>
-        internal static string FormatUnexpectedEOFAfterDirective(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedEOFAfterDirective"), p0, p1);
-
-        /// <summary>
-        /// The hash algorithm '{0}' is not supported for checksum generation. Supported algorithms are: '{1}'. Set '{2}' to '{3}' to suppress automatic checksum generation.
-        /// </summary>
-        internal static string UnsupportedChecksumAlgorithm
-        {
-            get => GetString("UnsupportedChecksumAlgorithm");
-        }
-
-        /// <summary>
-        /// The hash algorithm '{0}' is not supported for checksum generation. Supported algorithms are: '{1}'. Set '{2}' to '{3}' to suppress automatic checksum generation.
-        /// </summary>
-        internal static string FormatUnsupportedChecksumAlgorithm(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedChecksumAlgorithm"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// The '{0}.{1}' property must not be null.
-        /// </summary>
-        internal static string PropertyMustNotBeNull
-        {
-            get => GetString("PropertyMustNotBeNull");
-        }
-
-        /// <summary>
-        /// The '{0}.{1}' property must not be null.
-        /// </summary>
-        internal static string FormatPropertyMustNotBeNull(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyMustNotBeNull"), p0, p1);
-
-        /// <summary>
-        /// The '{0}' is missing feature '{1}'.
-        /// </summary>
-        internal static string RazorProjectEngineMissingFeatureDependency
-        {
-            get => GetString("RazorProjectEngineMissingFeatureDependency");
-        }
-
-        /// <summary>
-        /// The '{0}' is missing feature '{1}'.
-        /// </summary>
-        internal static string FormatRazorProjectEngineMissingFeatureDependency(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RazorProjectEngineMissingFeatureDependency"), p0, p1);
-
-        /// <summary>
-        /// The Razor language version '{0}' is unrecognized or not supported by this version of Razor.
-        /// </summary>
-        internal static string RazorLanguageVersion_InvalidVersion
-        {
-            get => GetString("RazorLanguageVersion_InvalidVersion");
-        }
-
-        /// <summary>
-        /// The Razor language version '{0}' is unrecognized or not supported by this version of Razor.
-        /// </summary>
-        internal static string FormatRazorLanguageVersion_InvalidVersion(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("RazorLanguageVersion_InvalidVersion"), p0);
-
-        /// <summary>
-        /// File path '{0}' does not belong to the directory '{1}'.
-        /// </summary>
-        internal static string VirtualFileSystem_FileDoesNotBelongToDirectory
-        {
-            get => GetString("VirtualFileSystem_FileDoesNotBelongToDirectory");
-        }
-
-        /// <summary>
-        /// File path '{0}' does not belong to the directory '{1}'.
-        /// </summary>
-        internal static string FormatVirtualFileSystem_FileDoesNotBelongToDirectory(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("VirtualFileSystem_FileDoesNotBelongToDirectory"), p0, p1);
-
-        /// <summary>
-        /// The file path '{0}' is invalid. File path is the root relative path of the file starting with '/' and should not contain any '\' characters.
-        /// </summary>
-        internal static string VirtualFileSystem_InvalidRelativePath
-        {
-            get => GetString("VirtualFileSystem_InvalidRelativePath");
-        }
-
-        /// <summary>
-        /// The file path '{0}' is invalid. File path is the root relative path of the file starting with '/' and should not contain any '\' characters.
-        /// </summary>
-        internal static string FormatVirtualFileSystem_InvalidRelativePath(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("VirtualFileSystem_InvalidRelativePath"), p0);
-
-        /// <summary>
-        /// Not enough stack space to continue parsing this document. Razor doesn't support more than 500 nested elements.
-        /// </summary>
-        internal static string Rewriter_InsufficientStack
-        {
-            get => GetString("Rewriter_InsufficientStack");
-        }
-
-        /// <summary>
-        /// Not enough stack space to continue parsing this document. Razor doesn't support deeply nested elements.
-        /// </summary>
-        internal static string FormatRewriter_InsufficientStack()
-            => GetString("Rewriter_InsufficientStack");
-
-        /// <summary>
-        /// Specify the base namespace for the document.
-        /// </summary>
-        internal static string NamespaceDirective_Description
-        {
-            get => GetString("NamespaceDirective_Description");
-        }
-
-        /// <summary>
-        /// Specify the base namespace for the document.
-        /// </summary>
-        internal static string FormatNamespaceDirective_Description()
-            => GetString("NamespaceDirective_Description");
-
-        /// <summary>
-        /// The namespace for the document.
-        /// </summary>
-        internal static string NamespaceDirective_NamespaceToken_Description
-        {
-            get => GetString("NamespaceDirective_NamespaceToken_Description");
-        }
-
-        /// <summary>
-        /// The namespace for the document.
-        /// </summary>
-        internal static string FormatNamespaceDirective_NamespaceToken_Description()
-            => GetString("NamespaceDirective_NamespaceToken_Description");
-
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        internal static string NamespaceDirective_NamespaceToken_Name
-        {
-            get => GetString("NamespaceDirective_NamespaceToken_Name");
-        }
-
-        /// <summary>
-        /// Namespace
-        /// </summary>
-        internal static string FormatNamespaceDirective_NamespaceToken_Name()
-            => GetString("NamespaceDirective_NamespaceToken_Name");
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs
deleted file mode 100644
index df00f34c36..0000000000
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// <auto-generated />
-namespace Microsoft.CodeAnalysis.Razor
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resources
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.CodeAnalysis.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// Could not find matching ']' for required attribute '{0}'.
-        /// </summary>
-        internal static string TagHelper_CouldNotFindMatchingEndBrace
-        {
-            get => GetString("TagHelper_CouldNotFindMatchingEndBrace");
-        }
-
-        /// <summary>
-        /// Could not find matching ']' for required attribute '{0}'.
-        /// </summary>
-        internal static string FormatTagHelper_CouldNotFindMatchingEndBrace(object p0)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_CouldNotFindMatchingEndBrace"), p0);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null unless property type implements '{4}'.
-        /// </summary>
-        internal static string TagHelper_InvalidAttributePrefixNotNull
-        {
-            get => GetString("TagHelper_InvalidAttributePrefixNotNull");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null unless property type implements '{4}'.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidAttributePrefixNotNull(object p0, object p1, object p2, object p3, object p4)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidAttributePrefixNotNull"), p0, p1, p2, p3, p4);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null or empty if property has no public setter.
-        /// </summary>
-        internal static string TagHelper_InvalidAttributeNameNotNullOrEmpty
-        {
-            get => GetString("TagHelper_InvalidAttributeNameNotNullOrEmpty");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must be null or empty if property has no public setter.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidAttributeNameNotNullOrEmpty(object p0, object p1, object p2, object p3)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidAttributeNameNotNullOrEmpty"), p0, p1, p2, p3);
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must not be null if property has no public setter and its type implements '{4}'.
-        /// </summary>
-        internal static string TagHelper_InvalidAttributePrefixNull
-        {
-            get => GetString("TagHelper_InvalidAttributePrefixNull");
-        }
-
-        /// <summary>
-        /// Invalid tag helper bound property '{1}' on tag helper '{0}'. '{2}.{3}' must not be null if property has no public setter and its type implements '{4}'.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidAttributePrefixNull(object p0, object p1, object p2, object p3, object p4)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidAttributePrefixNull"), p0, p1, p2, p3, p4);
-
-        /// <summary>
-        /// Invalid required attribute character '{0}' in required attribute '{1}'. Separate required attributes with commas.
-        /// </summary>
-        internal static string TagHelper_InvalidRequiredAttributeCharacter
-        {
-            get => GetString("TagHelper_InvalidRequiredAttributeCharacter");
-        }
-
-        /// <summary>
-        /// Invalid required attribute character '{0}' in required attribute '{1}'. Separate required attributes with commas.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidRequiredAttributeCharacter(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRequiredAttributeCharacter"), p0, p1);
-
-        /// <summary>
-        /// Required attribute '{0}' has mismatched quotes '{1}' around value.
-        /// </summary>
-        internal static string TagHelper_InvalidRequiredAttributeMismatchedQuotes
-        {
-            get => GetString("TagHelper_InvalidRequiredAttributeMismatchedQuotes");
-        }
-
-        /// <summary>
-        /// Required attribute '{0}' has mismatched quotes '{1}' around value.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidRequiredAttributeMismatchedQuotes(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRequiredAttributeMismatchedQuotes"), p0, p1);
-
-        /// <summary>
-        /// Invalid character '{0}' in required attribute '{1}'. Expected supported CSS operator or ']'.
-        /// </summary>
-        internal static string TagHelper_InvalidRequiredAttributeOperator
-        {
-            get => GetString("TagHelper_InvalidRequiredAttributeOperator");
-        }
-
-        /// <summary>
-        /// Invalid character '{0}' in required attribute '{1}'. Expected supported CSS operator or ']'.
-        /// </summary>
-        internal static string FormatTagHelper_InvalidRequiredAttributeOperator(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_InvalidRequiredAttributeOperator"), p0, p1);
-
-        /// <summary>
-        /// Required attribute '{0}' has a partial CSS operator. '{1}' must be followed by an equals.
-        /// </summary>
-        internal static string TagHelper_PartialRequiredAttributeOperator
-        {
-            get => GetString("TagHelper_PartialRequiredAttributeOperator");
-        }
-
-        /// <summary>
-        /// Required attribute '{0}' has a partial CSS operator. '{1}' must be followed by an equals.
-        /// </summary>
-        internal static string FormatTagHelper_PartialRequiredAttributeOperator(object p0, object p1)
-            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelper_PartialRequiredAttributeOperator"), p0, p1);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}

From 997ab1951146a4854d6217c6b7ebb84c4747e56f Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 3 May 2019 12:15:27 -0700
Subject: [PATCH 151/337] Unskip
 Build_WithViews_ProducesDepsFileWithCompilationContext_ButNoReferences
 (dotnet/aspnetcore-tooling#560)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e5a23e0588d36cfa65ce88434d5c3899251991d7
---
 .../test/IntegrationTests/BuildIntegrationTest.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index e0bbf50b9c..5a144d2a9a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -233,7 +233,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputContainsLine(result, $@"CompileResource: {Path.Combine("..", "LinkedDir", "LinkedFile.cshtml")} /LinkedFileOut/LinkedFile.cshtml");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1931")]
+        [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_WithViews_ProducesDepsFileWithCompilationContext_ButNoReferences()
         {

From fede53883851a271ac1ed7a8a7520d5186d61c77 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 3 May 2019 14:02:13 -0700
Subject: [PATCH 152/337] Port fixes from master
 (dotnet/aspnetcore-tooling#562)

* Fix invalid cast in non-generic parameterized ChildContent

* Fix crash in functions block
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0acc18b236822510f77f50cea9cb5ae581c36b65
---
 .../Components/ComponentGenericTypePass.cs    |  3 +-
 .../src/Extensions/FunctionsDirectivePass.cs  |  4 +
 .../Extensions/FunctionsDirectivePassTest.cs  |  4 +-
 .../ComponentCodeGenerationTestBase.cs        | 33 ++++++++
 .../TestComponent.codegen.cs                  | 76 +++++++++++++++++++
 .../TestComponent.ir.txt                      | 29 +++++++
 .../TestComponent.mappings.txt                | 15 ++++
 .../TestComponent.codegen.cs                  | 66 ++++++++++++++++
 .../TestComponent.ir.txt                      | 22 ++++++
 9 files changed, 247 insertions(+), 5 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index ee92d484a6..6be200e659 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -252,8 +252,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     }
                     else if (childContent.IsParameterized)
                     {
-                        // This is a weakly typed parameterized child content, treat it as RenderFragment<object>
-                        childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + "<System.Object>";
+                        // This is a non-generic parameterized child content like RenderFragment<int>, leave it as is.
                     }
                     else
                     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
index 32f79570cb..a608171881 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirectivePass.cs
@@ -21,6 +21,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 {
                     @class.Children.Add(functions.Node.Children[i]);
                 }
+
+                // We don't want to keep the original directive node around anymore.
+                // Otherwise this can cause unintended side effects in the subsequent passes.
+                functions.Remove();
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
index 712766a5f1..5a0ebdba33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/FunctionsDirectivePassTest.cs
@@ -71,9 +71,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 node => CSharpCode(" var value = true; ", node));
 
             var method = @class.Children[0];
-            Children(
-                method,
-                node => Assert.IsType<DirectiveIntermediateNode>(node));
+            Assert.Empty(method.Children);
         }
 
         private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 43381c1a29..3c19003550 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2611,6 +2611,39 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void ChildComponent_NonGenericParameterizedChildContent_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] TItem Item { get; set; }
+
+        [Parameter] RenderFragment<TItem> GenericFragment { get; set; }
+
+        [Parameter] RenderFragment<int> IntFragment { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""@(""hi"")"">
+  <GenericFragment>@context.ToLower()</GenericFragment>
+  <IntFragment>@context</IntFragment>
+</MyComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void GenericComponent_WithFullyQualifiedTagName()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a6b1234125
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,76 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+              __o = context.ToLower();
+
+#line default
+#line hidden
+#nullable disable
+            }
+            , -1, (context) => (builder2) => {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+          __o = context;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..9fc99566f6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (32:1,2 [53] x:\dir\subdir\Test\TestComponent.cshtml) - GenericFragment - context
+                        CSharpExpression - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (89:2,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntFragment - context
+                        CSharpExpression - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0566a1dd01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|"hi"|
+Generated Location: (957:25,21 [4] )
+|"hi"|
+
+Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|context.ToLower()|
+Generated Location: (1151:33,20 [17] )
+|context.ToLower()|
+
+Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|context|
+Generated Location: (1370:42,16 [7] )
+|context|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3bd44ddf68
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "hi"
+
+#line default
+#line hidden
+#nullable disable
+            , 2, (context) => (builder2) => {
+                builder2.AddContent(3, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    context.ToLower()
+
+#line default
+#line hidden
+#nullable disable
+                );
+            }
+            , 4, (context) => (builder2) => {
+                builder2.AddContent(5, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                context
+
+#line default
+#line hidden
+#nullable disable
+                );
+            }
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..62a5b6d11d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (32:1,2 [53] x:\dir\subdir\Test\TestComponent.cshtml) - GenericFragment - context
+                        CSharpExpression - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
+                    ComponentChildContent - (89:2,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntFragment - context
+                        CSharpExpression - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0

From b9fde956ea9eb7259204c43ea99e9d9cbbee6435 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 1 May 2019 09:06:23 -0700
Subject: [PATCH 153/337] Fix RazorDiagnostics from being hidden and unordered.

- Diagnostics were not being raised to the `RazorSyntaxTree` and weren't being ordered on final output. This resulted in some of our tests missing the fact that certain cases were generating errors.
- Made all three phases of Razor parsing order their diagnostics.
- Added `GetAllDiagnostics` methods to `SyntaxNode`s to be more consistent with IR documents.
- Updated test files. In some cases new errors were found because we're now lifting them to the `SyntaxTree`, in most others the errors are re-ordered.

**Note: In end-to-end scenarios diagnostics were not hidden, only unordered. The IR phase would find nested/hidden documents and lift them to the IR/C# documents.**
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ef31a9683b3eadf84255e95cea061a25208ea483
---
 .../CodeGeneration/DefaultDocumentWriter.cs   |  4 +-
 .../src/DefaultRazorSyntaxTree.cs             | 33 ++++++++++++--
 .../IntermediateNodeExtensions.cs             |  4 +-
 .../src/Legacy/RazorSyntaxTreeExtensions.cs   |  1 -
 .../src/RazorSyntaxTree.cs                    |  2 +-
 .../src/Syntax/SyntaxNodeExtensions.cs        | 43 +++++++++++++++++++
 .../ComponentBindIntegrationTest.cs           |  4 +-
 ...ssionWithMarkup_DesignTime.diagnostics.txt |  2 +-
 ...pressionWithMarkup_Runtime.diagnostics.txt |  2 +-
 ...pleteDirectives_DesignTime.diagnostics.txt |  4 +-
 ...completeDirectives_Runtime.diagnostics.txt |  4 +-
 .../OpenedIf_DesignTime.diagnostics.txt       |  2 +-
 .../OpenedIf_Runtime.diagnostics.txt          |  2 +-
 .../ParserError_DesignTime.diagnostics.txt    |  2 +-
 .../ParserError_Runtime.diagnostics.txt       |  2 +-
 ...nctionsDirectiveAutoCompleteAtEOF.diag.txt |  1 +
 ...irectiveAutoCompleteAtStartOfFile.diag.txt |  1 +
 ...SectionDirectiveAutoCompleteAtEOF.diag.txt |  1 +
 ...irectiveAutoCompleteAtStartOfFile.diag.txt |  1 +
 ...TerminatesBlockCommentAtEndOfFile.diag.txt |  2 +-
 ...DoubleTransition_EndOfFile_Throws.diag.txt |  2 +-
 ...terTransitionInEmbeddedExpression.diag.txt |  2 +-
 ...rrorIfClassBlockUnterminatedAtEOF.diag.txt |  1 +
 ...TerminatesNormalStringAtEndOfFile.diag.txt |  2 +-
 ...rminatesVerbatimStringAtEndOfFile.diag.txt |  2 +-
 .../RazorCommentInVerbatimBlock.diag.txt      |  2 +-
 ...entInImplicitExpressionMethodCall.diag.txt |  2 +-
 ...inatedRazorCommentInVerbatimBlock.diag.txt |  2 +-
 ...pturesNewlineImmediatelyFollowing.diag.txt |  1 +
 ...LineInSectionStatementMissingName.diag.txt |  1 +
 ...nSectionStatementMissingOpenBrace.diag.txt |  1 +
 .../HandlesEOFAfterOpenBrace.diag.txt         |  1 +
 .../HandlesEOFAfterOpenContent1.diag.txt      |  1 +
 .../HandlesEOFAfterOpenContent2.diag.txt      |  1 +
 .../HandlesEOFAfterOpenContent3.diag.txt      |  1 +
 .../HandlesEOFAfterOpenContent4.diag.txt      |  1 +
 .../HandlesUnterminatedSection.diag.txt       |  1 +
 ...esUnterminatedSectionWithNestedIf.diag.txt |  1 +
 ...tOutputErrorOtherNestedDirectives.diag.txt |  2 +
 ...putsErrorOnMultipleNestedSections.diag.txt |  4 ++
 ...arserOutputsErrorOnNestedSections.diag.txt |  2 +
 ...OLIfSectionNotFollowedByOpenBrace.diag.txt |  1 +
 ...dNotFollowedByIdentifierStartChar.diag.txt |  1 +
 ...BlockIfNameNotFollowedByOpenBrace.diag.txt |  1 +
 .../HandlesOpenAngleAtEof.diag.txt            |  2 +-
 ...OpenAngleWithProperTagFollowingIt.diag.txt |  2 +-
 ...utCloseAngleDoesNotTerminateBlock.diag.txt |  2 +-
 .../HtmlBlockTest/TerminatesAtEOF.diag.txt    |  2 +-
 ...osedTagAtEOFErrorsOnMissingEndTag.diag.txt |  2 +-
 ...edTagAtEOFErrorsWithIncompleteTag.diag.txt |  2 +-
 ...ToCodeIfThereIsNoMarkupOnThatLine.diag.txt |  1 +
 ...teRequiresDoubleQuotesAroundValue.diag.txt |  1 +
 ...teRequiresDoubleQuotesAroundValue.diag.txt |  1 +
 ...andleEOFIncompleteNamespaceTokens.diag.txt |  1 +
 ...anHandleEOFInvalidNamespaceTokens.diag.txt |  1 +
 ...anHandleIncompleteNamespaceTokens.diag.txt |  1 +
 ...r_CanHandleInvalidNamespaceTokens.diag.txt |  1 +
 ..._ErrorsExtraContentAfterDirective.diag.txt |  1 +
 ...ptor_ErrorsForInvalidMemberTokens.diag.txt |  1 +
 ...sWhenEOFBeforeDirectiveBlockStart.diag.txt |  1 +
 ...sWhenExtraContentBeforeBlockStart.diag.txt |  1 +
 ...criptor_ErrorsWhenMissingEndBrace.diag.txt |  1 +
 ...SinglyOccurring_ErrorsIfDuplicate.diag.txt |  1 +
 ...oken_ParserErrorForNonStringValue.diag.txt |  1 +
 ..._ParserErrorForPartialQuotedValue.diag.txt |  1 +
 ...n_ParserErrorForSingleQuotedValue.diag.txt |  1 +
 ...Token_ParserErrorForUnquotedValue.diag.txt |  1 +
 ...ptor_TokensMustBeSeparatedBySpace.diag.txt |  1 +
 ...DirectiveErrorsIfNotAtStartOfLine.diag.txt |  1 +
 ...teRequiresDoubleQuotesAroundValue.diag.txt |  1 +
 ...teRequiresDoubleQuotesAroundValue.diag.txt |  1 +
 ...teRequiresDoubleQuotesAroundValue.diag.txt |  1 +
 ...teRequiresDoubleQuotesAroundValue.diag.txt |  1 +
 73 files changed, 156 insertions(+), 32 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
index 294304dd18..e665bbc024 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -42,10 +42,12 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             context.Visitor.VisitDocument(documentNode);
 
             var cSharp = context.CodeWriter.GenerateCode();
+
+            var allOrderedDiagnostics = context.Diagnostics.OrderBy(diagnostic => diagnostic.Span.AbsoluteIndex);
             return new DefaultRazorCSharpDocument(
                 cSharp,
                 _options,
-                context.Diagnostics.ToArray(),
+                allOrderedDiagnostics.ToArray(),
                 context.SourceMappings.ToArray(),
                 context.LinePragmas.ToArray());
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs
index 018dbfe5fb..06097d1289 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorSyntaxTree.cs
@@ -1,8 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 
@@ -10,6 +10,9 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRazorSyntaxTree : RazorSyntaxTree
     {
+        private readonly IReadOnlyList<RazorDiagnostic> _diagnostics;
+        private IReadOnlyList<RazorDiagnostic> _allDiagnostics;
+
         public DefaultRazorSyntaxTree(
             SyntaxNode root,
             RazorSourceDocument source,
@@ -18,11 +21,35 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             Root = root;
             Source = source;
-            Diagnostics = diagnostics;
+            _diagnostics = diagnostics;
             Options = options;
         }
 
-        public override IReadOnlyList<RazorDiagnostic> Diagnostics { get; }
+        public override IReadOnlyList<RazorDiagnostic> Diagnostics
+        {
+            get
+            {
+                if (_allDiagnostics == null)
+                {
+                    var allDiagnostics = new HashSet<RazorDiagnostic>();
+                    for (var i = 0; i <  _diagnostics.Count; i++)
+                    {
+                        allDiagnostics.Add(_diagnostics[i]);
+                    }
+
+                    var rootDiagnostics = Root.GetAllDiagnostics();
+                    for (var i = 0; i < rootDiagnostics.Count; i++)
+                    {
+                        allDiagnostics.Add(rootDiagnostics[i]);
+                    }
+
+                    var allOrderedDiagnostics = allDiagnostics.OrderBy(diagnostic => diagnostic.Span.AbsoluteIndex);
+                    _allDiagnostics = allOrderedDiagnostics.ToArray();
+                }
+
+                return _allDiagnostics;
+            }
+        }
 
         public override RazorParserOptions Options { get; }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs
index 6af13aab2c..f491158cec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeExtensions.cs
@@ -27,7 +27,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
             AddAllDiagnostics(node);
 
-            return diagnostics?.ToList() ?? EmptyDiagnostics;
+            var allOrderedDiagnostics = diagnostics?.OrderBy(diagnostic => diagnostic.Span.AbsoluteIndex);
+
+            return allOrderedDiagnostics?.ToList() ?? EmptyDiagnostics;
 
             void AddAllDiagnostics(IntermediateNode n)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
index 2a3d016224..63402f9f65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorSyntaxTreeExtensions.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs
index 340129b2aa..2574ef0e07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSyntaxTree.cs
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 throw new ArgumentNullException(nameof(source));
             }
-            
+
             var parser = new RazorParser(options ?? RazorParserOptions.CreateDefault());
             return parser.Parse(source);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index 626eac6d29..677c06d894 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -55,6 +55,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             return (TNode)node.WithDiagnostics(allDiagnostics);
         }
 
+        /// <summary>
+        /// Gets top-level and nested diagnostics from the <paramref name="node"/>.
+        /// </summary>
+        /// <typeparam name="TNode">The type of syntax node.</typeparam>
+        /// <param name="node">The syntax node.</param>
+        /// <returns>The list of <see cref="RazorDiagnostic"/>s.</returns>
+        public static IReadOnlyList<RazorDiagnostic> GetAllDiagnostics<TNode>(this TNode node) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var walker = new DiagnosticSyntaxWalker();
+            walker.Visit(node);
+
+            return walker.Diagnostics;
+        }
+
         public static SourceLocation GetSourceLocation(this SyntaxNode node, RazorSourceDocument source)
         {
             if (node == null)
@@ -220,5 +239,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             var content = string.Concat(tokens.Select(t => t.Content));
             return content;
         }
+
+        private class DiagnosticSyntaxWalker : SyntaxWalker
+        {
+            private readonly List<RazorDiagnostic> _diagnostics;
+
+            public DiagnosticSyntaxWalker()
+            {
+                _diagnostics = new List<RazorDiagnostic>();
+            }
+
+            public IReadOnlyList<RazorDiagnostic> Diagnostics => _diagnostics;
+
+            public override void Visit(SyntaxNode node)
+            {
+                if (node?.ContainsDiagnostics == true)
+                {
+                    var diagnostics = node.GetDiagnostics();
+
+                    _diagnostics.AddRange(diagnostics);
+
+                    base.Visit(node);
+                }
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
index bfbda33a7a..374d5a25c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
@@ -80,11 +80,13 @@ namespace Test
         [Fact]
         public void Bind_InvalidUseOfDirective_DoesNotThrow()
         {
+            // We're looking for VS crash issues. Meaning if the parser returns
+            // diagnostics we don't want to throw.
             var generated = CompileToCSharp(@"
 <input type=""text"" bind=""@page"" />
 @functions {
     public string page { get; set; } = ""text"";
-}");
+}", throwOnFailure: false);
 
             // Assert
             Assert.Collection(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt
index 16ad2a09d5..04d0a39526 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.diagnostics.txt
@@ -1,2 +1,2 @@
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,11): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,7): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,11): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt
index 16ad2a09d5..04d0a39526 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_Runtime.diagnostics.txt
@@ -1,2 +1,2 @@
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,11): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,7): Error RZ1006: The explicit expression block is missing a closing ")" character.  Make sure you have a matching ")" character for all the "(" characters within this block, and that none of the ")" characters are being interpreted as markup.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup.cshtml(1,11): Error RZ1026: Encountered end tag "div" with no matching start tag.  Are your start/end tags properly balanced?
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
index 1eb0531be3..c7d8d88528 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
@@ -11,10 +11,10 @@ TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cs
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1036: Invalid tag helper directive look up text '"'. The correct look up text format is: "name, assemblyName".
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1020: Invalid tag helper directive 'tagHelperPrefix' value. '"' is not allowed in prefix '"'.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,10): Error RZ1013: The 'inherits' directive expects a type name.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(16,1): Error RZ2001: The 'inherits' directive may only occur once per document.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
index 1eb0531be3..c7d8d88528 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
@@ -11,10 +11,10 @@ TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cs
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(9,18): Error RZ1036: Invalid tag helper directive look up text '"'. The correct look up text format is: "name, assemblyName".
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,2): Error RZ1018: Directive 'tagHelperPrefix' must have a value.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,1): Error RZ2001: The 'tagHelperPrefix' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(13,18): Error RZ1020: Invalid tag helper directive 'tagHelperPrefix' value. '"' is not allowed in prefix '"'.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,10): Error RZ1013: The 'inherits' directive expects a type name.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(16,1): Error RZ2001: The 'inherits' directive may only occur once per document.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt
index 49f293ec33..681454769b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.diagnostics.txt
@@ -1,3 +1,3 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(3,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(4,3): Error RZ1026: Encountered end tag "body" with no matching start tag.  Are your start/end tags properly balanced?
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(5,3): Error RZ1026: Encountered end tag "html" with no matching start tag.  Are your start/end tags properly balanced?
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(3,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt
index 49f293ec33..681454769b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.diagnostics.txt
@@ -1,3 +1,3 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(3,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(4,3): Error RZ1026: Encountered end tag "body" with no matching start tag.  Are your start/end tags properly balanced?
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(5,3): Error RZ1026: Encountered end tag "html" with no matching start tag.  Are your start/end tags properly balanced?
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml(3,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt
index 1a25d90e26..23ff3e26b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.diagnostics.txt
@@ -1,2 +1,2 @@
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(2,1): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(2,1): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt
index 1a25d90e26..23ff3e26b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.diagnostics.txt
@@ -1,2 +1,2 @@
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(2,1): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
 TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError.cshtml(2,1): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.diag.txt
new file mode 100644
index 0000000000..b03e548350
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,11): Error RZ1006: The functions block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.diag.txt
new file mode 100644
index 0000000000..b03e548350
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.diag.txt
@@ -0,0 +1 @@
+(1,11): Error RZ1006: The functions block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.diag.txt
new file mode 100644
index 0000000000..e65f8dfff3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.diag.txt
new file mode 100644
index 0000000000..e65f8dfff3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt
index 2612cdd013..98a67406d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.diag.txt
@@ -1,2 +1,2 @@
-(1,26): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
 (1,2): Error RZ1006: The foreach block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,26): Error RZ1001: End of file was reached before the end of the block comment.  All comments started with "/*" sequence must be terminated with a matching "*/" sequence.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt
index 69a6b33a62..a4e40cedd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.diag.txt
@@ -1,2 +1,2 @@
-(1,4): Error RZ1024: End of file or an unexpected character was reached before the "span" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "span" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt
index 5611de1939..5e816e75b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.diag.txt
@@ -1,2 +1,2 @@
-(2,6): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(2,6): Error RZ1004: End-of-file was found after the "@" character.  "@" must be followed by a valid code block.  If you want to output an "@", escape it using the sequence: "@@"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.diag.txt
new file mode 100644
index 0000000000..7a30f21cb3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.diag.txt
@@ -0,0 +1 @@
+(1,12): Error RZ1006: The functions block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt
index da5c70dd69..a49f840204 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.diag.txt
@@ -1,2 +1,2 @@
-(1,22): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
 (1,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,22): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt
index da5c70dd69..a49f840204 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.diag.txt
@@ -1,2 +1,2 @@
-(1,22): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
 (1,2): Error RZ1006: The if block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,22): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt
index 1567f665b6..728d71fa46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diag.txt
@@ -1,3 +1,3 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
 (2,6): Error RZ1023: "<text>" and "</text>" tags cannot contain attributes.
 (2,6): Error RZ1025: The "text" element was not closed.  All elements must be either self-closing or have a matching end tag.
-(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt
index b65a64c148..4369e7d5eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diag.txt
@@ -1,2 +1,2 @@
-(1,6): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
 (1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
+(1,6): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt
index 37d6bd7155..5ab5182308 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diag.txt
@@ -1,2 +1,2 @@
-(1,3): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,3): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.diag.txt
new file mode 100644
index 0000000000..f15ab6ffa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1015: The 'section' directive expects an identifier.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.diag.txt
new file mode 100644
index 0000000000..feec72ed8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ1015: The 'section' directive expects an identifier.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.diag.txt
new file mode 100644
index 0000000000..498cbfed10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.diag.txt
@@ -0,0 +1 @@
+(2,5): Error RZ1012: Unexpected end of file following the 'section' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.diag.txt
new file mode 100644
index 0000000000..e1bd35fcb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.diag.txt
new file mode 100644
index 0000000000..e1bd35fcb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.diag.txt
new file mode 100644
index 0000000000..e1bd35fcb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.diag.txt
new file mode 100644
index 0000000000..e1bd35fcb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.diag.txt
new file mode 100644
index 0000000000..e1bd35fcb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.diag.txt
new file mode 100644
index 0000000000..e1bd35fcb5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.diag.txt
@@ -0,0 +1 @@
+(1,14): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.diag.txt
new file mode 100644
index 0000000000..e1202f894a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.diag.txt
@@ -0,0 +1 @@
+(2,1): Error RZ1006: The section block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.diag.txt
new file mode 100644
index 0000000000..7f29e8edf5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.diag.txt
@@ -0,0 +1,2 @@
+(1,17): Error RZ2005: The 'inherits` directive must appear at the start of the line.
+(1,30): Error RZ1017: Unexpected literal following the 'inherits' directive. Expected 'line break'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.diag.txt
new file mode 100644
index 0000000000..5ba54f32e6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.diag.txt
@@ -0,0 +1,4 @@
+(1,16): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
+(1,17): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,42): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
+(1,43): Error RZ2005: The 'section` directive must appear at the start of the line.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.diag.txt
new file mode 100644
index 0000000000..756b35bd86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.diag.txt
@@ -0,0 +1,2 @@
+(1,16): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
+(1,17): Error RZ2005: The 'section` directive must appear at the start of the line.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.diag.txt
new file mode 100644
index 0000000000..079c1c2fda
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.diag.txt
@@ -0,0 +1 @@
+(2,1): Error RZ1012: Unexpected end of file following the 'section' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.diag.txt
new file mode 100644
index 0000000000..81ec8bff11
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.diag.txt
@@ -0,0 +1 @@
+(1,10): Error RZ1015: The 'section' directive expects an identifier.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.diag.txt
new file mode 100644
index 0000000000..fd83ce295e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.diag.txt
@@ -0,0 +1 @@
+(1,13): Error RZ1017: Unexpected literal following the 'section' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt
index 5183cd029a..1b72b90879 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.diag.txt
@@ -1,2 +1,2 @@
-(2,1): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(2,1): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt
index d1be8ea52d..16d45eb0ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.diag.txt
@@ -1,3 +1,3 @@
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
 (2,1): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
 (3,3): Error RZ1026: Encountered end tag "html" with no matching start tag.  Are your start/end tags properly balanced?
-(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt
index c2dcafc10d..5c6d4706b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.diag.txt
@@ -1,2 +1,2 @@
-(1,3): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,3): Error RZ1024: End of file or an unexpected character was reached before the "" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt
index 5ea3dc7ca1..f87f5f62ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.diag.txt
@@ -1,2 +1,2 @@
-(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt
index 5ea3dc7ca1..f87f5f62ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFErrorsOnMissingEndTag.diag.txt
@@ -1,2 +1,2 @@
-(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1025: The "foo" element was not closed.  All elements must be either self-closing or have a matching end tag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt
index d896fe55e8..7611cfed5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.diag.txt
@@ -1,2 +1,2 @@
-(1,4): Error RZ1024: End of file or an unexpected character was reached before the "foo" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
 (1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
+(1,4): Error RZ1024: End of file or an unexpected character was reached before the "foo" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.diag.txt
new file mode 100644
index 0000000000..82834fee1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.diag.txt
@@ -0,0 +1 @@
+(1,4): Error RZ2005: The 'section` directive must appear at the start of the line.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
new file mode 100644
index 0000000000..c1d5bcd34e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
new file mode 100644
index 0000000000..859804d1cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
@@ -0,0 +1 @@
+(1,15): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.diag.txt
new file mode 100644
index 0000000000..7e7735a128
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1014: The 'custom' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.diag.txt
new file mode 100644
index 0000000000..7e7735a128
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1014: The 'custom' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.diag.txt
new file mode 100644
index 0000000000..7e7735a128
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1014: The 'custom' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.diag.txt
new file mode 100644
index 0000000000..7e7735a128
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1014: The 'custom' directive expects a namespace name.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.diag.txt
new file mode 100644
index 0000000000..bbc8035249
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1017: Unexpected literal following the 'custom' directive. Expected 'line break'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.diag.txt
new file mode 100644
index 0000000000..c8a41322a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1015: The 'custom' directive expects an identifier.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.diag.txt
new file mode 100644
index 0000000000..6bc13c4718
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.diag.txt
@@ -0,0 +1 @@
+(1,16): Error RZ1012: Unexpected end of file following the 'custom' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.diag.txt
new file mode 100644
index 0000000000..8227b74116
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1017: Unexpected literal following the 'custom' directive. Expected '{'.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.diag.txt
new file mode 100644
index 0000000000..7d15c3c5e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.diag.txt
@@ -0,0 +1 @@
+(1,17): Error RZ1006: The custom block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.diag.txt
new file mode 100644
index 0000000000..6e707f9d16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.diag.txt
@@ -0,0 +1 @@
+(2,1): Error RZ2001: The 'custom' directive may only occur once per document.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.diag.txt
new file mode 100644
index 0000000000..b7818aa7a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1016: The 'custom' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.diag.txt
new file mode 100644
index 0000000000..b7818aa7a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1016: The 'custom' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.diag.txt
new file mode 100644
index 0000000000..b7818aa7a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1016: The 'custom' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.diag.txt
new file mode 100644
index 0000000000..b7818aa7a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1016: The 'custom' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.diag.txt
new file mode 100644
index 0000000000..653c80c1d1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ1011: The 'custom' directives value(s) must be separated by whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.diag.txt
new file mode 100644
index 0000000000..1ca018d1a5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.diag.txt
@@ -0,0 +1 @@
+(1,5): Error RZ2005: The 'custom` directive must appear at the start of the line.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
new file mode 100644
index 0000000000..8420d6c340
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
@@ -0,0 +1 @@
+(1,21): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
new file mode 100644
index 0000000000..c1d5bcd34e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
new file mode 100644
index 0000000000..7628ab1cb8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.diag.txt
@@ -0,0 +1 @@
+(1,24): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
new file mode 100644
index 0000000000..c1d5bcd34e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.diag.txt
@@ -0,0 +1 @@
+(1,18): Error RZ1000: Unterminated string literal.  Strings that start with a quotation mark (") must be terminated before the end of the line.  However, strings that start with @ and a quotation mark (@") can span multiple lines.

From ffd11eaa054db40ed6b2a697ec29b5429dd32cf1 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 6 May 2019 11:25:21 -0700
Subject: [PATCH 154/337] Add support for single line control flow statements
 in code blocks.

- This adds support for C# single line variations of: `if`, `for`, `foreach`, `do`, `while`, `lock` and `using`.
- Turns out the existing parser had 99% of the support for these scenarios already. Therefore, in this change set I went ahead and added exhaustive tests to verify things worked end-to-end.
- Added a restriction to single line markup to not allow markup in single line control flow statements. Updated resx to provide a better error message for cases when users do use markup in single line control flow statements.

dotnet/aspnetcore-tooling#9637
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/cf474c97aa560268abc2334e12799c7c767e356f
---
 .../src/Legacy/CSharpCodeParser.cs            |  27 +-
 .../src/RazorDiagnosticFactory.cs             |   6 +-
 .../src/Resources.resx                        |  14 +-
 .../CodeGenerationIntegrationTest.cs          |  12 +
 .../ComponentCodeGenerationTestBase.cs        |  46 +++
 .../test/Legacy/CSharpBlockTest.cs            |  29 ++
 .../test/Legacy/CSharpFunctionsTest.cs        |  39 ++
 .../SingleLineControlFlowStatements.cshtml    | 102 +++++
 ...ontrolFlowStatements_DesignTime.codegen.cs | 385 ++++++++++++++++++
 ...lFlowStatements_DesignTime.diagnostics.txt |   2 +
 ...ineControlFlowStatements_DesignTime.ir.txt | 131 ++++++
 ...trolFlowStatements_DesignTime.mappings.txt | 363 +++++++++++++++++
 ...neControlFlowStatements_Runtime.codegen.cs | 344 ++++++++++++++++
 ...trolFlowStatements_Runtime.diagnostics.txt |   2 +
 ...leLineControlFlowStatements_Runtime.ir.txt | 125 ++++++
 .../TestComponent.codegen.cs                  |  54 +++
 .../TestComponent.ir.txt                      |  28 ++
 .../TestComponent.mappings.txt                |  30 ++
 .../TestComponent.codegen.cs                  |  62 +++
 .../TestComponent.ir.txt                      |  28 ++
 .../TestComponent.mappings.txt                |  36 ++
 .../TestComponent.codegen.cs                  |  51 +++
 .../TestComponent.ir.txt                      |  23 ++
 .../TestComponent.mappings.txt                |  13 +
 .../TestComponent.codegen.cs                  |  60 +++
 .../TestComponent.ir.txt                      |  23 ++
 .../TestComponent.mappings.txt                |  24 ++
 ..._SingleLineControlFlowStatement.cspans.txt |   9 +
 ...k_SingleLineControlFlowStatement.stree.txt |  59 +++
 ...eLineControlFlowStatement_Error.cspans.txt |  29 ++
 ...gleLineControlFlowStatement_Error.diag.txt |   4 +
 ...leLineControlFlowStatement_Error.stree.txt | 214 ++++++++++
 ...tatementControlFlowStatementError.diag.txt |  10 -
 ...ControlFlowStatementsToHaveBraces.diag.txt |  33 +-
 ..._SingleLineControlFlowStatement.cspans.txt |   8 +
 ...s_SingleLineControlFlowStatement.stree.txt |  62 +++
 ...eLineControlFlowStatement_Error.cspans.txt |  36 ++
 ...gleLineControlFlowStatement_Error.diag.txt |   4 +
 ...leLineControlFlowStatement_Error.stree.txt | 208 ++++++++++
 ...lformedTagHelpersWithAttributes20.diag.txt |  11 +-
 40 files changed, 2675 insertions(+), 71 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.stree.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.stree.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index f86d30cd14..3390e570c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1756,14 +1756,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             if (!EndOfFile)
             {
-                // Check for "{" to make sure we're at a block
-                if (!At(SyntaxKind.LeftBrace))
+                // If it's a block control flow statement the current syntax token will be a LeftBrace {,
+                // otherwise we're acting on a single line control flow statement which cannot allow markup.
+
+                if (At(SyntaxKind.LessThan))
                 {
+                    // if (...) <p>Hello World</p>
                     Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsNotAllowed(
-                            new SourceSpan(CurrentStart, CurrentToken.Content.Length),
-                            Language.GetSample(SyntaxKind.LeftBrace),
-                            CurrentToken.Content));
+                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsCannotContainMarkup(
+                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                }
+                else if (At(SyntaxKind.Transition) && NextIs(SyntaxKind.Colon))
+                {
+                    // if (...) @: <p>The time is @DateTime.Now</p>
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsCannotContainMarkup(
+                            new SourceSpan(CurrentStart, contentLength: 2 /* @: */)));
+                }
+                else if (At(SyntaxKind.Transition) && NextIs(SyntaxKind.Transition))
+                {
+                    // if (...) @@JohnDoe <strong>Hi!</strong>
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsCannotContainMarkup(
+                            new SourceSpan(CurrentStart, contentLength: 2 /* @@ */)));
                 }
 
                 // Parse the statement and then we're done
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
index 95bda8d4b9..bd24339b2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -113,11 +113,11 @@ namespace Microsoft.AspNetCore.Razor.Language
         internal static readonly RazorDiagnosticDescriptor Parsing_SingleLineControlFlowStatementsNotAllowed =
             new RazorDiagnosticDescriptor(
                 $"{DiagnosticPrefix}1008",
-                () => Resources.ParseError_SingleLine_ControlFlowStatements_Not_Allowed,
+                () => Resources.ParseError_SingleLine_ControlFlowStatements_CannotContainMarkup,
                 RazorDiagnosticSeverity.Error);
-        public static RazorDiagnostic CreateParsing_SingleLineControlFlowStatementsNotAllowed(SourceSpan location, string expected, string actual)
+        public static RazorDiagnostic CreateParsing_SingleLineControlFlowStatementsCannotContainMarkup(SourceSpan location)
         {
-            return RazorDiagnostic.Create(Parsing_SingleLineControlFlowStatementsNotAllowed, location, expected, actual);
+            return RazorDiagnostic.Create(Parsing_SingleLineControlFlowStatementsNotAllowed, location);
         }
 
         internal static readonly RazorDiagnosticDescriptor Parsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart =
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index ef92859644..b08df3e762 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -331,18 +331,8 @@
   <data name="ParseError_Sections_Cannot_Be_Nested" xml:space="preserve">
     <value>Section blocks ("{0}") cannot be nested.  Only one level of section blocks are allowed.</value>
   </data>
-  <data name="ParseError_SingleLine_ControlFlowStatements_Not_Allowed" xml:space="preserve">
-    <value>Expected a "{0}" but found a "{1}".  Block statements must be enclosed in "{{" and "}}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-
-@if(isLoggedIn)
-    &lt;p&gt;Hello, @user&lt;/p&gt;
-
-Instead, wrap the contents of the block in "{{}}":
-
-@if(isLoggedIn) {{
-    &lt;p&gt;Hello, @user&lt;/p&gt;
-}}</value>
-    <comment>{0} is only ever a single character</comment>
+  <data name="ParseError_SingleLine_ControlFlowStatements_CannotContainMarkup" xml:space="preserve">
+    <value>Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{{" and "}}".</value>
   </data>
   <data name="ParseError_TextTagCannotContainAttributes" xml:space="preserve">
     <value>"&lt;text&gt;" and "&lt;/text&gt;" tags cannot contain attributes.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 578a52740f..924079b1d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -16,6 +16,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         }
 
         #region Runtime
+        [Fact]
+        public void SingleLineControlFlowStatements_Runtime()
+        {
+            RunTimeTest();
+        }
+
         [Fact]
         public void CSharp8_Runtime()
         {
@@ -485,6 +491,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         #endregion
 
         #region DesignTime
+        [Fact]
+        public void SingleLineControlFlowStatements_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
         [Fact]
         public void CSharp8_DesignTime()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 36aeb62624..ba2740b7ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -19,6 +19,52 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         #region Basics
 
+        [Fact]
+        public void SingleLineControlFlowStatements_InCodeDirective()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.RenderTree;
+
+@code {
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = ""Builder is null!"";
+        else output = ""Builder is not null!"";
+        <p>Output: @output</p>
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void SingleLineControlFlowStatements_InCodeBlock()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.RenderTree;
+
+@{
+    var output = string.Empty;
+    if (builder == null) output = ""Builder is null!"";
+    else output = ""Builder is not null!"";
+    <p>Output: @output</p>
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
         [Fact]
         public void ChildComponent_InFunctionsDirective()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
index 7c66f7e2d6..b6efbe507a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
@@ -8,6 +8,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpBlockTest : ParserTestBase
     {
+        [Fact]
+        public void CSharpBlock_SingleLineControlFlowStatement_Error()
+        {
+            ParseDocumentTest(
+@"@{
+    var time = DateTime.Now;
+    if (time.ToBinary() % 2 == 0) <p>The time: @time</p>
+
+    if (time.ToBinary() %3 == 0)
+        // For some reason we want to render the time now?
+        <p>The confusing time: @time</p>
+
+    if (time.ToBinary() % 4 == 0)
+        @: <p>The time: @time</p>
+
+    if (time.ToBinary() % 5 == 0) @@SomeGitHubUserName <strong>Hi!</strong>
+}");
+        }
+
+        [Fact]
+        public void CSharpBlock_SingleLineControlFlowStatement()
+        {
+            ParseDocumentTest(
+@"@{
+    var time = DateTime.Now;
+    if (time.ToBinary() % 2 == 0) @time
+}");
+        }
+
         [Fact]
         public void LocalFunctionsWithRazor()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs
index 34e9918f7d..f50d91b295 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpFunctionsTest.cs
@@ -8,6 +8,45 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpFunctionsTest : ParserTestBase
     {
+        [Fact]
+        public void Functions_SingleLineControlFlowStatement_Error()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    string GetAnnouncmentText(string message)
+    {
+        if (message.Length > 0) <p>Message: @message</p>
+
+        if (message == null)
+            // Nothing to render
+            <p>Message was null</p>
+
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            @: <p>The time: @time</p>
+
+        if (message != null) @@SomeGitHubUserName <strong>@message</strong>
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
+        [Fact]
+        public void Functions_SingleLineControlFlowStatement()
+        {
+            ParseDocumentTest(
+                RazorLanguageVersion.Version_3_0,
+                @"
+@functions {
+    string GetAnnouncmentText(string message)
+    {
+        if (message.Length > 0) return ""Anouncement: "" + message;
+    }
+}
+", new[] { FunctionsDirective.Directive, }, designTime: false);
+        }
+
         [Fact]
         public void MarkupInFunctionsBlock_DoesNotParseWhenNotSupported()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml
new file mode 100644
index 0000000000..9d6ae22f9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml
@@ -0,0 +1,102 @@
+<p>Before Text</p>
+
+@{
+    if (DateTime.Now.ToBinary() % 2 == 0) @("Current time is divisible by 2") else @DateTime.Now
+
+    object Bar()
+    {
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else if (DateTime.Now.ToBinary() % 3 == 0)
+            return "Current time is divisible by 3";
+        else
+            return DateTime.Now;
+    }
+
+    for (var i = 0; i < 10; i++)
+        // Incrementing a number
+        i--;
+
+    @foreach (var item in new[] {"hello"})
+        @item
+
+    do
+        @currentCount
+    while (--currentCount >= 0);
+
+    while (--currentCount <= 10)
+        currentCount++;
+
+    using (var reader = new System.IO.StreamReader("/something"))
+        @reader.ReadToEnd()
+
+    @lock (this)
+        currentCount++;
+}
+
+@functions {
+    public string Foo()
+    {
+        var x = "";
+
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else
+            return "It isn't divisible by two";
+        
+        for (var i = 0; i < 10; i++)
+            // Incrementing a number
+            i--;
+
+        foreach (var item in new[] {"hello"})
+            @item
+
+        do
+            @currentCount
+        while (--currentCount >= 0);
+
+        while (--currentCount <= 10)
+            currentCount++;
+
+        using (var reader = new System.IO.StreamReader("/something"))
+            @reader.ReadToEnd()
+
+        lock (this)
+            currentCount++;
+    }
+
+    int currentCount = 0;
+
+    public void IncrementCount()
+    {
+        if (true) currentCount++;
+    }
+
+}
+
+@for (var i = 0; i < 10; i++)
+    @i
+
+@foreach (var item in new[] {"hello"})
+    @item
+
+@do
+    @currentCount
+while (--currentCount >= 0);
+
+@while (--currentCount <= 10)
+    currentCount++;
+
+@using (var reader = new System.IO.StreamReader("/something"))
+    // Reading the entire file
+    @reader.ReadToEnd()
+
+@lock (this)
+    currentCount++;
+
+@if (true) @@GitHubUserName <p>Hello!</p>
+
+@if (true) 
+    @: <p>The time is @DateTime.Now</p>
+
+<p>After Text</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3ecf283882
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.cs
@@ -0,0 +1,385 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleLineControlFlowStatements_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+  
+    if (DateTime.Now.ToBinary() % 2 == 0) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                      __o = "Current time is divisible by 2";
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                                                              else 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                                                              __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                                                                                
+
+    object Bar()
+    {
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else if (DateTime.Now.ToBinary() % 3 == 0)
+            return "Current time is divisible by 3";
+        else
+            return DateTime.Now;
+    }
+
+    for (var i = 0; i < 10; i++)
+        // Incrementing a number
+        i--;
+
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+     foreach (var item in new[] {"hello"})
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+   __o = item;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+             
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+             
+
+    do
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+   __o = currentCount;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                     
+    while (--currentCount >= 0);
+
+    while (--currentCount <= 10)
+        currentCount++;
+
+    using (var reader = new System.IO.StreamReader("/something"))
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+   __o = reader.ReadToEnd();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                           
+
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+     lock (this)
+        currentCount++;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                       
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 77 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ for (var i = 0; i < 10; i++)
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 78 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+__o = i;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 78 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+      
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 80 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ foreach (var item in new[] {"hello"})
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 81 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+__o = item;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 81 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+         
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 83 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ do
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 84 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+__o = currentCount;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 84 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                 
+while (--currentCount >= 0);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 87 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ while (--currentCount <= 10)
+    currentCount++;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 90 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ using (var reader = new System.IO.StreamReader("/something"))
+    // Reading the entire file
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 92 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+__o = reader.ReadToEnd();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 92 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                       
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 94 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ lock (this)
+    currentCount++;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 97 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ if (true) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 97 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+            @GitHubUserName 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 99 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ if (true) 
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 100 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                 __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 101 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+            
+    public string Foo()
+    {
+        var x = "";
+
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else
+            return "It isn't divisible by two";
+        
+        for (var i = 0; i < 10; i++)
+            // Incrementing a number
+            i--;
+
+        foreach (var item in new[] {"hello"})
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 52 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+       __o = item;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 52 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                 
+
+        do
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 55 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+       __o = currentCount;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 55 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                         
+        while (--currentCount >= 0);
+
+        while (--currentCount <= 10)
+            currentCount++;
+
+        using (var reader = new System.IO.StreamReader("/something"))
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 62 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+       __o = reader.ReadToEnd();
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 62 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                               
+
+        lock (this)
+            currentCount++;
+    }
+
+    int currentCount = 0;
+
+    public void IncrementCount()
+    {
+        if (true) currentCount++;
+    }
+
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1078a21cf6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml(97,12): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml(100,5): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.ir.txt
new file mode 100644
index 0000000000..b277c3528a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.ir.txt
@@ -0,0 +1,131 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleLineControlFlowStatements_DesignTime -  - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [22] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (0:0,0 [2] SingleLineControlFlowStatements.cshtml) - Html - <p
+                    IntermediateToken - (2:0,2 [1] SingleLineControlFlowStatements.cshtml) - Html - >
+                    IntermediateToken - (3:0,3 [11] SingleLineControlFlowStatements.cshtml) - Html - Before Text
+                    IntermediateToken - (14:0,14 [4] SingleLineControlFlowStatements.cshtml) - Html - </p>
+                    IntermediateToken - (18:0,18 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (24:2,2 [44] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (24:2,2 [44] SingleLineControlFlowStatements.cshtml) - CSharp - \n    if (DateTime.Now.ToBinary() % 2 == 0) 
+                CSharpExpression - (70:3,44 [32] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (70:3,44 [32] SingleLineControlFlowStatements.cshtml) - CSharp - "Current time is divisible by 2"
+                CSharpCode - (103:3,77 [6] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (103:3,77 [6] SingleLineControlFlowStatements.cshtml) - CSharp -  else 
+                CSharpExpression - (110:3,84 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (110:3,84 [12] SingleLineControlFlowStatements.cshtml) - CSharp - DateTime.Now
+                CSharpCode - (122:3,96 [381] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (122:3,96 [381] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n    object Bar()\n    {\n        if (DateTime.Now.ToBinary() % 2 == 0)\n            return "Current time is divisible by 2";\n        else if (DateTime.Now.ToBinary() % 3 == 0)\n            return "Current time is divisible by 3";\n        else\n            return DateTime.Now;\n    }\n\n    for (var i = 0; i < 10; i++)\n        // Incrementing a number\n        i--;\n\n    
+                CSharpCode - (504:19,5 [47] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (504:19,5 [47] SingleLineControlFlowStatements.cshtml) - CSharp - foreach (var item in new[] {"hello"})\n        
+                CSharpExpression - (552:20,9 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (552:20,9 [4] SingleLineControlFlowStatements.cshtml) - CSharp - item
+                CSharpCode - (556:20,13 [0] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (556:20,13 [0] SingleLineControlFlowStatements.cshtml) - CSharp - 
+                CSharpCode - (556:20,13 [20] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (556:20,13 [20] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n    do\n        
+                CSharpExpression - (577:23,9 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (577:23,9 [12] SingleLineControlFlowStatements.cshtml) - CSharp - currentCount
+                CSharpCode - (589:23,21 [174] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (589:23,21 [174] SingleLineControlFlowStatements.cshtml) - CSharp - \n    while (--currentCount >= 0);\n\n    while (--currentCount <= 10)\n        currentCount++;\n\n    using (var reader = new System.IO.StreamReader("/something"))\n        
+                CSharpExpression - (764:30,9 [18] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (764:30,9 [18] SingleLineControlFlowStatements.cshtml) - CSharp - reader.ReadToEnd()
+                CSharpCode - (782:30,27 [8] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (782:30,27 [8] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n    
+                CSharpCode - (791:32,5 [36] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (791:32,5 [36] SingleLineControlFlowStatements.cshtml) - CSharp - lock (this)\n        currentCount++;
+                CSharpCode - (827:33,23 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (827:33,23 [2] SingleLineControlFlowStatements.cshtml) - CSharp - \n
+                HtmlContent - (832:35,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (832:35,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                HtmlContent - (1669:74,1 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1669:74,1 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (1674:76,1 [34] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1674:76,1 [34] SingleLineControlFlowStatements.cshtml) - CSharp - for (var i = 0; i < 10; i++)\n    
+                CSharpExpression - (1709:77,5 [1] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1709:77,5 [1] SingleLineControlFlowStatements.cshtml) - CSharp - i
+                CSharpCode - (1710:77,6 [0] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1710:77,6 [0] SingleLineControlFlowStatements.cshtml) - CSharp - 
+                HtmlContent - (1710:77,6 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1710:77,6 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (1715:79,1 [43] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1715:79,1 [43] SingleLineControlFlowStatements.cshtml) - CSharp - foreach (var item in new[] {"hello"})\n    
+                CSharpExpression - (1759:80,5 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1759:80,5 [4] SingleLineControlFlowStatements.cshtml) - CSharp - item
+                CSharpCode - (1763:80,9 [0] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1763:80,9 [0] SingleLineControlFlowStatements.cshtml) - CSharp - 
+                HtmlContent - (1763:80,9 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1763:80,9 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (1768:82,1 [8] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1768:82,1 [8] SingleLineControlFlowStatements.cshtml) - CSharp - do\n    
+                CSharpExpression - (1777:83,5 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1777:83,5 [12] SingleLineControlFlowStatements.cshtml) - CSharp - currentCount
+                CSharpCode - (1789:83,17 [30] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1789:83,17 [30] SingleLineControlFlowStatements.cshtml) - CSharp - \nwhile (--currentCount >= 0);
+                HtmlContent - (1819:84,28 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1819:84,28 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (1824:86,1 [49] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1824:86,1 [49] SingleLineControlFlowStatements.cshtml) - CSharp - while (--currentCount <= 10)\n    currentCount++;
+                HtmlContent - (1873:87,19 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1873:87,19 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (1878:89,1 [99] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1878:89,1 [99] SingleLineControlFlowStatements.cshtml) - CSharp - using (var reader = new System.IO.StreamReader("/something"))\n    // Reading the entire file\n    
+                CSharpExpression - (1978:91,5 [18] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1978:91,5 [18] SingleLineControlFlowStatements.cshtml) - CSharp - reader.ReadToEnd()
+                CSharpCode - (1996:91,23 [0] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1996:91,23 [0] SingleLineControlFlowStatements.cshtml) - CSharp - 
+                HtmlContent - (1996:91,23 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1996:91,23 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (2001:93,1 [32] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2001:93,1 [32] SingleLineControlFlowStatements.cshtml) - CSharp - lock (this)\n    currentCount++;
+                HtmlContent - (2033:94,19 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2033:94,19 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (2038:96,1 [10] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2038:96,1 [10] SingleLineControlFlowStatements.cshtml) - CSharp - if (true) 
+                CSharpCode - (2049:96,12 [16] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2049:96,12 [16] SingleLineControlFlowStatements.cshtml) - CSharp - @GitHubUserName 
+                HtmlContent - (2065:96,28 [17] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2065:96,28 [2] SingleLineControlFlowStatements.cshtml) - Html - <p
+                    IntermediateToken - (2067:96,30 [1] SingleLineControlFlowStatements.cshtml) - Html - >
+                    IntermediateToken - (2068:96,31 [6] SingleLineControlFlowStatements.cshtml) - Html - Hello!
+                    IntermediateToken - (2074:96,37 [4] SingleLineControlFlowStatements.cshtml) - Html - </p>
+                    IntermediateToken - (2078:96,41 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (2083:98,1 [16] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2083:98,1 [16] SingleLineControlFlowStatements.cshtml) - CSharp - if (true) \n    
+                HtmlContent - (2101:99,6 [16] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2101:99,6 [16] SingleLineControlFlowStatements.cshtml) - Html -  <p>The time is 
+                CSharpExpression - (2118:99,23 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2118:99,23 [12] SingleLineControlFlowStatements.cshtml) - CSharp - DateTime.Now
+                HtmlContent - (2130:99,35 [6] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2130:99,35 [6] SingleLineControlFlowStatements.cshtml) - Html - </p>\n
+                CSharpCode - (2136:100,0 [0] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2136:100,0 [0] SingleLineControlFlowStatements.cshtml) - CSharp - 
+                HtmlContent - (2136:100,0 [19] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2136:100,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                    IntermediateToken - (2138:101,0 [2] SingleLineControlFlowStatements.cshtml) - Html - <p
+                    IntermediateToken - (2140:101,2 [1] SingleLineControlFlowStatements.cshtml) - Html - >
+                    IntermediateToken - (2141:101,3 [10] SingleLineControlFlowStatements.cshtml) - Html - After Text
+                    IntermediateToken - (2151:101,13 [4] SingleLineControlFlowStatements.cshtml) - Html - </p>
+            CSharpCode - (846:36,12 [386] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (846:36,12 [386] SingleLineControlFlowStatements.cshtml) - CSharp - \n    public string Foo()\n    {\n        var x = "";\n\n        if (DateTime.Now.ToBinary() % 2 == 0)\n            return "Current time is divisible by 2";\n        else\n            return "It isn't divisible by two";\n        \n        for (var i = 0; i < 10; i++)\n            // Incrementing a number\n            i--;\n\n        foreach (var item in new[] {"hello"})\n            
+            CSharpExpression - (1233:51,13 [4] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1233:51,13 [4] SingleLineControlFlowStatements.cshtml) - CSharp - item
+            CSharpCode - (1237:51,17 [28] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1237:51,17 [28] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n        do\n            
+            CSharpExpression - (1266:54,13 [12] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1266:54,13 [12] SingleLineControlFlowStatements.cshtml) - CSharp - currentCount
+            CSharpCode - (1278:54,25 [194] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1278:54,25 [194] SingleLineControlFlowStatements.cshtml) - CSharp - \n        while (--currentCount >= 0);\n\n        while (--currentCount <= 10)\n            currentCount++;\n\n        using (var reader = new System.IO.StreamReader("/something"))\n            
+            CSharpExpression - (1473:61,13 [18] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1473:61,13 [18] SingleLineControlFlowStatements.cshtml) - CSharp - reader.ReadToEnd()
+            CSharpCode - (1491:61,31 [177] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1491:61,31 [177] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n        lock (this)\n            currentCount++;\n    }\n\n    int currentCount = 0;\n\n    public void IncrementCount()\n    {\n        if (true) currentCount++;\n    }\n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.mappings.txt
new file mode 100644
index 0000000000..046e1006f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.mappings.txt
@@ -0,0 +1,363 @@
+Source Location: (24:2,2 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+    if (DateTime.Now.ToBinary() % 2 == 0) |
+Generated Location: (782:19,2 [44] )
+|
+    if (DateTime.Now.ToBinary() % 2 == 0) |
+
+Source Location: (70:3,44 [32] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|"Current time is divisible by 2"|
+Generated Location: (1048:27,44 [32] )
+|"Current time is divisible by 2"|
+
+Source Location: (103:3,77 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+| else |
+Generated Location: (1336:34,77 [6] )
+| else |
+
+Source Location: (110:3,84 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|DateTime.Now|
+Generated Location: (1604:41,84 [12] )
+|DateTime.Now|
+
+Source Location: (122:3,96 [381] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+
+    object Bar()
+    {
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else if (DateTime.Now.ToBinary() % 3 == 0)
+            return "Current time is divisible by 3";
+        else
+            return DateTime.Now;
+    }
+
+    for (var i = 0; i < 10; i++)
+        // Incrementing a number
+        i--;
+
+    |
+Generated Location: (1891:48,96 [381] )
+|
+
+    object Bar()
+    {
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else if (DateTime.Now.ToBinary() % 3 == 0)
+            return "Current time is divisible by 3";
+        else
+            return DateTime.Now;
+    }
+
+    for (var i = 0; i < 10; i++)
+        // Incrementing a number
+        i--;
+
+    |
+
+Source Location: (504:19,5 [47] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|foreach (var item in new[] {"hello"})
+        |
+Generated Location: (2456:71,5 [47] )
+|foreach (var item in new[] {"hello"})
+        |
+
+Source Location: (552:20,9 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|item|
+Generated Location: (2691:79,9 [4] )
+|item|
+
+Source Location: (556:20,13 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+||
+Generated Location: (2888:86,13 [0] )
+||
+
+Source Location: (556:20,13 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+
+    do
+        |
+Generated Location: (3080:93,13 [20] )
+|
+
+    do
+        |
+
+Source Location: (577:23,9 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|currentCount|
+Generated Location: (3288:103,9 [12] )
+|currentCount|
+
+Source Location: (589:23,21 [174] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+    while (--currentCount >= 0);
+
+    while (--currentCount <= 10)
+        currentCount++;
+
+    using (var reader = new System.IO.StreamReader("/something"))
+        |
+Generated Location: (3501:110,21 [174] )
+|
+    while (--currentCount >= 0);
+
+    while (--currentCount <= 10)
+        currentCount++;
+
+    using (var reader = new System.IO.StreamReader("/something"))
+        |
+
+Source Location: (764:30,9 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|reader.ReadToEnd()|
+Generated Location: (3863:124,9 [18] )
+|reader.ReadToEnd()|
+
+Source Location: (782:30,27 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+
+    |
+Generated Location: (4088:131,27 [8] )
+|
+
+    |
+
+Source Location: (791:32,5 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|lock (this)
+        currentCount++;|
+Generated Location: (4280:140,5 [36] )
+|lock (this)
+        currentCount++;|
+
+Source Location: (827:33,23 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+|
+Generated Location: (4518:148,23 [2] )
+|
+|
+
+Source Location: (1674:76,1 [34] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|for (var i = 0; i < 10; i++)
+    |
+Generated Location: (4698:155,1 [34] )
+|for (var i = 0; i < 10; i++)
+    |
+
+Source Location: (1709:77,5 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|i|
+Generated Location: (4917:163,6 [1] )
+|i|
+
+Source Location: (1710:77,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+||
+Generated Location: (5104:170,6 [0] )
+||
+
+Source Location: (1715:79,1 [43] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|foreach (var item in new[] {"hello"})
+    |
+Generated Location: (5284:177,1 [43] )
+|foreach (var item in new[] {"hello"})
+    |
+
+Source Location: (1759:80,5 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|item|
+Generated Location: (5512:185,6 [4] )
+|item|
+
+Source Location: (1763:80,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+||
+Generated Location: (5705:192,9 [0] )
+||
+
+Source Location: (1768:82,1 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|do
+    |
+Generated Location: (5885:199,1 [8] )
+|do
+    |
+
+Source Location: (1777:83,5 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|currentCount|
+Generated Location: (6078:207,6 [12] )
+|currentCount|
+
+Source Location: (1789:83,17 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+while (--currentCount >= 0);|
+Generated Location: (6287:214,17 [30] )
+|
+while (--currentCount >= 0);|
+
+Source Location: (1824:86,1 [49] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|while (--currentCount <= 10)
+    currentCount++;|
+Generated Location: (6497:222,1 [49] )
+|while (--currentCount <= 10)
+    currentCount++;|
+
+Source Location: (1878:89,1 [99] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|using (var reader = new System.IO.StreamReader("/something"))
+    // Reading the entire file
+    |
+Generated Location: (6726:230,1 [99] )
+|using (var reader = new System.IO.StreamReader("/something"))
+    // Reading the entire file
+    |
+
+Source Location: (1978:91,5 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|reader.ReadToEnd()|
+Generated Location: (7010:239,6 [18] )
+|reader.ReadToEnd()|
+
+Source Location: (1996:91,23 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+||
+Generated Location: (7231:246,23 [0] )
+||
+
+Source Location: (2001:93,1 [32] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|lock (this)
+    currentCount++;|
+Generated Location: (7411:253,1 [32] )
+|lock (this)
+    currentCount++;|
+
+Source Location: (2038:96,1 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|if (true) |
+Generated Location: (7623:261,1 [10] )
+|if (true) |
+
+Source Location: (2049:96,12 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|@GitHubUserName |
+Generated Location: (7824:268,12 [16] )
+|@GitHubUserName |
+
+Source Location: (2083:98,1 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|if (true) 
+    |
+Generated Location: (8020:275,1 [16] )
+|if (true) 
+    |
+
+Source Location: (2118:99,23 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|DateTime.Now|
+Generated Location: (8239:283,23 [12] )
+|DateTime.Now|
+
+Source Location: (2136:100,0 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+||
+Generated Location: (8432:290,0 [0] )
+||
+
+Source Location: (846:36,12 [386] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+    public string Foo()
+    {
+        var x = "";
+
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else
+            return "It isn't divisible by two";
+        
+        for (var i = 0; i < 10; i++)
+            // Incrementing a number
+            i--;
+
+        foreach (var item in new[] {"hello"})
+            |
+Generated Location: (8670:298,12 [386] )
+|
+    public string Foo()
+    {
+        var x = "";
+
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else
+            return "It isn't divisible by two";
+        
+        for (var i = 0; i < 10; i++)
+            // Incrementing a number
+            i--;
+
+        foreach (var item in new[] {"hello"})
+            |
+
+Source Location: (1233:51,13 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|item|
+Generated Location: (9248:320,13 [4] )
+|item|
+
+Source Location: (1237:51,17 [28] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+
+        do
+            |
+Generated Location: (9449:327,17 [28] )
+|
+
+        do
+            |
+
+Source Location: (1266:54,13 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|currentCount|
+Generated Location: (9669:337,13 [12] )
+|currentCount|
+
+Source Location: (1278:54,25 [194] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+        while (--currentCount >= 0);
+
+        while (--currentCount <= 10)
+            currentCount++;
+
+        using (var reader = new System.IO.StreamReader("/something"))
+            |
+Generated Location: (9886:344,25 [194] )
+|
+        while (--currentCount >= 0);
+
+        while (--currentCount <= 10)
+            currentCount++;
+
+        using (var reader = new System.IO.StreamReader("/something"))
+            |
+
+Source Location: (1473:61,13 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|reader.ReadToEnd()|
+Generated Location: (10272:358,13 [18] )
+|reader.ReadToEnd()|
+
+Source Location: (1491:61,31 [177] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml)
+|
+
+        lock (this)
+            currentCount++;
+    }
+
+    int currentCount = 0;
+
+    public void IncrementCount()
+    {
+        if (true) currentCount++;
+    }
+
+|
+Generated Location: (10501:365,31 [177] )
+|
+
+        lock (this)
+            currentCount++;
+    }
+
+    int currentCount = 0;
+
+    public void IncrementCount()
+    {
+        if (true) currentCount++;
+    }
+
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.codegen.cs
new file mode 100644
index 0000000000..8f808b9826
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.codegen.cs
@@ -0,0 +1,344 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a057512a2be3416c0f48286af45a4e9855e06f55"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleLineControlFlowStatements_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"a057512a2be3416c0f48286af45a4e9855e06f55", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleLineControlFlowStatements_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("<p>Before Text</p>\r\n\r\n");
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+  
+    if (DateTime.Now.ToBinary() % 2 == 0) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                      Write("Current time is divisible by 2");
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                                                              else 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                                                              Write(DateTime.Now);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                                                                                                
+
+    object Bar()
+    {
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else if (DateTime.Now.ToBinary() % 3 == 0)
+            return "Current time is divisible by 3";
+        else
+            return DateTime.Now;
+    }
+
+    for (var i = 0; i < 10; i++)
+        // Incrementing a number
+        i--;
+
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 20 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+     foreach (var item in new[] {"hello"})
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+   Write(item);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+             
+
+    do
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+   Write(currentCount);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 24 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                     
+    while (--currentCount >= 0);
+
+    while (--currentCount <= 10)
+        currentCount++;
+
+    using (var reader = new System.IO.StreamReader("/something"))
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+   Write(reader.ReadToEnd());
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 33 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+     lock (this)
+        currentCount++;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+            WriteLiteral("\r\n");
+#nullable restore
+#line 77 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ for (var i = 0; i < 10; i++)
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 78 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+Write(i);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 80 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ foreach (var item in new[] {"hello"})
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 81 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+Write(item);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 83 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ do
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 84 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+Write(currentCount);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 84 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                 
+while (--currentCount >= 0);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 87 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ while (--currentCount <= 10)
+    currentCount++;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 90 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ using (var reader = new System.IO.StreamReader("/something"))
+    // Reading the entire file
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 92 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+Write(reader.ReadToEnd());
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 94 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ lock (this)
+    currentCount++;
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 97 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ if (true) 
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 97 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+            @GitHubUserName 
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("<p>Hello!</p>\r\n\r\n");
+#nullable restore
+#line 99 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+ if (true) 
+    
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(" <p>The time is ");
+#nullable restore
+#line 100 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                 Write(DateTime.Now);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("</p>\r\n");
+            WriteLiteral("<p>After Text</p>");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+            
+    public string Foo()
+    {
+        var x = "";
+
+        if (DateTime.Now.ToBinary() % 2 == 0)
+            return "Current time is divisible by 2";
+        else
+            return "It isn't divisible by two";
+        
+        for (var i = 0; i < 10; i++)
+            // Incrementing a number
+            i--;
+
+        foreach (var item in new[] {"hello"})
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 52 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+       Write(item);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 52 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                 
+
+        do
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 55 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+       Write(currentCount);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 55 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                         
+        while (--currentCount >= 0);
+
+        while (--currentCount <= 10)
+            currentCount++;
+
+        using (var reader = new System.IO.StreamReader("/something"))
+            
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 62 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+       Write(reader.ReadToEnd());
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 62 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml"
+                               
+
+        lock (this)
+            currentCount++;
+    }
+
+    int currentCount = 0;
+
+    public void IncrementCount()
+    {
+        if (true) currentCount++;
+    }
+
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1078a21cf6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.diagnostics.txt
@@ -0,0 +1,2 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml(97,12): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements.cshtml(100,5): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.ir.txt
new file mode 100644
index 0000000000..0447aaa746
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.ir.txt
@@ -0,0 +1,125 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleLineControlFlowStatements_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [22] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (0:0,0 [2] SingleLineControlFlowStatements.cshtml) - Html - <p
+                    IntermediateToken - (2:0,2 [1] SingleLineControlFlowStatements.cshtml) - Html - >
+                    IntermediateToken - (3:0,3 [11] SingleLineControlFlowStatements.cshtml) - Html - Before Text
+                    IntermediateToken - (14:0,14 [4] SingleLineControlFlowStatements.cshtml) - Html - </p>
+                    IntermediateToken - (18:0,18 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (24:2,2 [44] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (24:2,2 [44] SingleLineControlFlowStatements.cshtml) - CSharp - \n    if (DateTime.Now.ToBinary() % 2 == 0) 
+                CSharpExpression - (70:3,44 [32] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (70:3,44 [32] SingleLineControlFlowStatements.cshtml) - CSharp - "Current time is divisible by 2"
+                CSharpCode - (103:3,77 [6] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (103:3,77 [6] SingleLineControlFlowStatements.cshtml) - CSharp -  else 
+                CSharpExpression - (110:3,84 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (110:3,84 [12] SingleLineControlFlowStatements.cshtml) - CSharp - DateTime.Now
+                CSharpCode - (122:3,96 [381] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (122:3,96 [381] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n    object Bar()\n    {\n        if (DateTime.Now.ToBinary() % 2 == 0)\n            return "Current time is divisible by 2";\n        else if (DateTime.Now.ToBinary() % 3 == 0)\n            return "Current time is divisible by 3";\n        else\n            return DateTime.Now;\n    }\n\n    for (var i = 0; i < 10; i++)\n        // Incrementing a number\n        i--;\n\n    
+                CSharpCode - (504:19,5 [47] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (504:19,5 [47] SingleLineControlFlowStatements.cshtml) - CSharp - foreach (var item in new[] {"hello"})\n        
+                CSharpExpression - (552:20,9 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (552:20,9 [4] SingleLineControlFlowStatements.cshtml) - CSharp - item
+                CSharpCode - (556:20,13 [0] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (556:20,13 [0] SingleLineControlFlowStatements.cshtml) - CSharp - 
+                CSharpCode - (556:20,13 [20] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (556:20,13 [20] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n    do\n        
+                CSharpExpression - (577:23,9 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (577:23,9 [12] SingleLineControlFlowStatements.cshtml) - CSharp - currentCount
+                CSharpCode - (589:23,21 [174] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (589:23,21 [174] SingleLineControlFlowStatements.cshtml) - CSharp - \n    while (--currentCount >= 0);\n\n    while (--currentCount <= 10)\n        currentCount++;\n\n    using (var reader = new System.IO.StreamReader("/something"))\n        
+                CSharpExpression - (764:30,9 [18] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (764:30,9 [18] SingleLineControlFlowStatements.cshtml) - CSharp - reader.ReadToEnd()
+                CSharpCode - (782:30,27 [8] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (782:30,27 [8] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n    
+                CSharpCode - (791:32,5 [36] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (791:32,5 [36] SingleLineControlFlowStatements.cshtml) - CSharp - lock (this)\n        currentCount++;
+                CSharpCode - (827:33,23 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (827:33,23 [2] SingleLineControlFlowStatements.cshtml) - CSharp - \n
+                HtmlContent - (832:35,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (832:35,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                HtmlContent - (1671:75,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1671:75,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (1674:76,1 [34] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1674:76,1 [34] SingleLineControlFlowStatements.cshtml) - CSharp - for (var i = 0; i < 10; i++)\n    
+                CSharpExpression - (1709:77,5 [1] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1709:77,5 [1] SingleLineControlFlowStatements.cshtml) - CSharp - i
+                CSharpCode - (1710:77,6 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1710:77,6 [2] SingleLineControlFlowStatements.cshtml) - CSharp - \n
+                HtmlContent - (1712:78,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1712:78,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (1715:79,1 [43] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1715:79,1 [43] SingleLineControlFlowStatements.cshtml) - CSharp - foreach (var item in new[] {"hello"})\n    
+                CSharpExpression - (1759:80,5 [4] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1759:80,5 [4] SingleLineControlFlowStatements.cshtml) - CSharp - item
+                CSharpCode - (1763:80,9 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1763:80,9 [2] SingleLineControlFlowStatements.cshtml) - CSharp - \n
+                HtmlContent - (1765:81,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1765:81,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (1768:82,1 [8] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1768:82,1 [8] SingleLineControlFlowStatements.cshtml) - CSharp - do\n    
+                CSharpExpression - (1777:83,5 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1777:83,5 [12] SingleLineControlFlowStatements.cshtml) - CSharp - currentCount
+                CSharpCode - (1789:83,17 [32] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1789:83,17 [32] SingleLineControlFlowStatements.cshtml) - CSharp - \nwhile (--currentCount >= 0);\n
+                HtmlContent - (1821:85,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1821:85,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (1824:86,1 [51] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1824:86,1 [51] SingleLineControlFlowStatements.cshtml) - CSharp - while (--currentCount <= 10)\n    currentCount++;\n
+                HtmlContent - (1875:88,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1875:88,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (1878:89,1 [99] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1878:89,1 [99] SingleLineControlFlowStatements.cshtml) - CSharp - using (var reader = new System.IO.StreamReader("/something"))\n    // Reading the entire file\n    
+                CSharpExpression - (1978:91,5 [18] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1978:91,5 [18] SingleLineControlFlowStatements.cshtml) - CSharp - reader.ReadToEnd()
+                CSharpCode - (1996:91,23 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1996:91,23 [2] SingleLineControlFlowStatements.cshtml) - CSharp - \n
+                HtmlContent - (1998:92,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (1998:92,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (2001:93,1 [34] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2001:93,1 [34] SingleLineControlFlowStatements.cshtml) - CSharp - lock (this)\n    currentCount++;\n
+                HtmlContent - (2035:95,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2035:95,0 [2] SingleLineControlFlowStatements.cshtml) - Html - \n
+                CSharpCode - (2038:96,1 [10] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2038:96,1 [10] SingleLineControlFlowStatements.cshtml) - CSharp - if (true) 
+                CSharpCode - (2049:96,12 [16] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2049:96,12 [16] SingleLineControlFlowStatements.cshtml) - CSharp - @GitHubUserName 
+                HtmlContent - (2065:96,28 [17] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2065:96,28 [2] SingleLineControlFlowStatements.cshtml) - Html - <p
+                    IntermediateToken - (2067:96,30 [1] SingleLineControlFlowStatements.cshtml) - Html - >
+                    IntermediateToken - (2068:96,31 [6] SingleLineControlFlowStatements.cshtml) - Html - Hello!
+                    IntermediateToken - (2074:96,37 [4] SingleLineControlFlowStatements.cshtml) - Html - </p>
+                    IntermediateToken - (2078:96,41 [4] SingleLineControlFlowStatements.cshtml) - Html - \n\n
+                CSharpCode - (2083:98,1 [16] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2083:98,1 [16] SingleLineControlFlowStatements.cshtml) - CSharp - if (true) \n    
+                HtmlContent - (2101:99,6 [16] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2101:99,6 [16] SingleLineControlFlowStatements.cshtml) - Html -  <p>The time is 
+                CSharpExpression - (2118:99,23 [12] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2118:99,23 [12] SingleLineControlFlowStatements.cshtml) - CSharp - DateTime.Now
+                HtmlContent - (2130:99,35 [6] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2130:99,35 [6] SingleLineControlFlowStatements.cshtml) - Html - </p>\n
+                CSharpCode - (2136:100,0 [2] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2136:100,0 [2] SingleLineControlFlowStatements.cshtml) - CSharp - \n
+                HtmlContent - (2138:101,0 [17] SingleLineControlFlowStatements.cshtml)
+                    IntermediateToken - (2138:101,0 [2] SingleLineControlFlowStatements.cshtml) - Html - <p
+                    IntermediateToken - (2140:101,2 [1] SingleLineControlFlowStatements.cshtml) - Html - >
+                    IntermediateToken - (2141:101,3 [10] SingleLineControlFlowStatements.cshtml) - Html - After Text
+                    IntermediateToken - (2151:101,13 [4] SingleLineControlFlowStatements.cshtml) - Html - </p>
+            CSharpCode - (846:36,12 [386] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (846:36,12 [386] SingleLineControlFlowStatements.cshtml) - CSharp - \n    public string Foo()\n    {\n        var x = "";\n\n        if (DateTime.Now.ToBinary() % 2 == 0)\n            return "Current time is divisible by 2";\n        else\n            return "It isn't divisible by two";\n        \n        for (var i = 0; i < 10; i++)\n            // Incrementing a number\n            i--;\n\n        foreach (var item in new[] {"hello"})\n            
+            CSharpExpression - (1233:51,13 [4] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1233:51,13 [4] SingleLineControlFlowStatements.cshtml) - CSharp - item
+            CSharpCode - (1237:51,17 [28] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1237:51,17 [28] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n        do\n            
+            CSharpExpression - (1266:54,13 [12] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1266:54,13 [12] SingleLineControlFlowStatements.cshtml) - CSharp - currentCount
+            CSharpCode - (1278:54,25 [194] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1278:54,25 [194] SingleLineControlFlowStatements.cshtml) - CSharp - \n        while (--currentCount >= 0);\n\n        while (--currentCount <= 10)\n            currentCount++;\n\n        using (var reader = new System.IO.StreamReader("/something"))\n            
+            CSharpExpression - (1473:61,13 [18] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1473:61,13 [18] SingleLineControlFlowStatements.cshtml) - CSharp - reader.ReadToEnd()
+            CSharpCode - (1491:61,31 [177] SingleLineControlFlowStatements.cshtml)
+                IntermediateToken - (1491:61,31 [177] SingleLineControlFlowStatements.cshtml) - CSharp - \n\n        lock (this)\n            currentCount++;\n    }\n\n    int currentCount = 0;\n\n    public void IncrementCount()\n    {\n        if (true) currentCount++;\n    }\n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d8c711fa0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    var output = string.Empty;
+    if (builder == null) output = "Builder is null!";
+    else output = "Builder is not null!";
+    
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+          __o = output;
+
+#line default
+#line hidden
+#nullable disable
+                                      
+
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
new file mode 100644
index 0000000000..18ceaf1ef4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                CSharpCode - (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n    
+                MarkupElement - (192:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                    CSharpExpression - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+                CSharpCode - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b0e58ecabe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -0,0 +1,30 @@
+Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.RenderTree;|
+Generated Location: (320:12,0 [49] )
+|using Microsoft.AspNetCore.Components.RenderTree;|
+
+Source Location: (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    var output = string.Empty;
+    if (builder == null) output = "Builder is null!";
+    else output = "Builder is not null!";
+    |
+Generated Location: (1016:31,2 [136] )
+|
+    var output = string.Empty;
+    if (builder == null) output = "Builder is null!";
+    else output = "Builder is not null!";
+    |
+
+Source Location: (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|output|
+Generated Location: (1290:42,16 [6] )
+|output|
+
+Source Location: (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+|
+Generated Location: (1387:47,38 [2] )
+|
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..61eb15d81e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -0,0 +1,62 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = "Builder is null!";
+        else output = "Builder is not null!";
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+              __o = output;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+                              
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..48f398102f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
+            MarkupElement - (278:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            CSharpCode - (300:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (300:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..dfffce2a60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -0,0 +1,36 @@
+Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.RenderTree;|
+Generated Location: (320:12,0 [49] )
+|using Microsoft.AspNetCore.Components.RenderTree;|
+
+Source Location: (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = "Builder is null!";
+        else output = "Builder is not null!";
+        |
+Generated Location: (1070:33,7 [217] )
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = "Builder is null!";
+        else output = "Builder is not null!";
+        |
+
+Source Location: (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|output|
+Generated Location: (1429:46,20 [6] )
+|output|
+
+Source Location: (300:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    }
+|
+Generated Location: (1588:53,30 [9] )
+|
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
new file mode 100644
index 0000000000..344c9db113
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+  
+    var output = string.Empty;
+    if (builder == null) output = "Builder is null!";
+    else output = "Builder is not null!";
+
+#line default
+#line hidden
+#nullable disable
+            builder.AddContent(0, "    ");
+            builder.OpenElement(1, "p");
+            builder.AddContent(2, "Output: ");
+            builder.AddContent(3, 
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+                output
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.CloseElement();
+            builder.AddMarkupContent(4, "\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
new file mode 100644
index 0000000000..53749a6138
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
+                HtmlContent - (188:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (188:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
+                MarkupElement - (192:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                    CSharpExpression - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+                HtmlContent - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (216:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (216:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2abccf9774
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -0,0 +1,13 @@
+Source Location: (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    var output = string.Empty;
+    if (builder == null) output = "Builder is null!";
+    else output = "Builder is not null!";
+|
+Generated Location: (748:24,2 [132] )
+|
+    var output = string.Empty;
+    if (builder == null) output = "Builder is null!";
+    else output = "Builder is not null!";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5dd2ab1396
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -0,0 +1,60 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.RenderTree;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = "Builder is null!";
+        else output = "Builder is not null!";
+
+#line default
+#line hidden
+#nullable disable
+        builder.AddContent(0, "        ");
+        builder.OpenElement(1, "p");
+        builder.AddContent(2, "Output: ");
+        builder.AddContent(3, 
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    output
+
+#line default
+#line hidden
+#nullable disable
+        );
+        builder.CloseElement();
+        builder.AddMarkupContent(4, "\r\n");
+#nullable restore
+#line 10 "x:\dir\subdir\Test\TestComponent.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
new file mode 100644
index 0000000000..ce90835d3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+            CSharpCode - (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
+            HtmlContent - (270:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (270:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            MarkupElement - (278:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            HtmlContent - (300:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (300:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (302:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (302:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e46d850ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = "Builder is null!";
+        else output = "Builder is not null!";
+|
+Generated Location: (802:26,7 [209] )
+|
+    void RenderChildComponent(RenderTreeBuilder builder)
+    {
+        var output = string.Empty;
+        if (builder == null) output = "Builder is null!";
+        else output = "Builder is not null!";
+|
+
+Source Location: (302:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|    }
+|
+Generated Location: (1529:52,0 [7] )
+|    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.cspans.txt
new file mode 100644
index 0000000000..2b83431b67
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Code span at (2:0,2 [66] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [76] )
+Transition span at (68:2,34 [1] ) (Accepts:None) - Parent: Expression block at (68:2,34 [5] )
+Code span at (69:2,35 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (68:2,34 [5] )
+Code span at (73:2,39 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [76] )
+MetaCode span at (75:3,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [76] )
+Markup span at (76:3,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.stree.txt
new file mode 100644
index 0000000000..8ba21b984f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement.stree.txt
@@ -0,0 +1,59 @@
+RazorDocument - [0..76)::76 - [@{LF    var time = DateTime.Now;LF    if (time.ToBinary() % 2 == 0) @timeLF}]
+    MarkupBlock - [0..76)::76
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..76)::76
+            CSharpStatement - [0..76)::76
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..76)::75
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..75)::73
+                        CSharpStatementLiteral - [2..68)::66 - [LF    var time = DateTime.Now;LF    if (time.ToBinary() % 2 == 0) ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[time];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[time];
+                            Dot;[.];
+                            Identifier;[ToBinary];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            Modulo;[%];
+                            Whitespace;[ ];
+                            IntegerLiteral;[2];
+                            Whitespace;[ ];
+                            Equals;[==];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [68..73)::5
+                            CSharpImplicitExpression - [68..73)::5
+                                CSharpTransition - [68..69)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [69..73)::4
+                                    CSharpCodeBlock - [69..73)::4
+                                        CSharpExpressionLiteral - [69..73)::4 - [time] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Identifier;[time];
+                        CSharpStatementLiteral - [73..75)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [75..76)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [76..76)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.cspans.txt
new file mode 100644
index 0000000000..b4bfdb3e9d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.cspans.txt
@@ -0,0 +1,29 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [382] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [382] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [382] )
+Code span at (2:0,2 [66] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [382] )
+Markup span at (68:2,34 [3] ) (Accepts:None) - Parent: Tag block at (68:2,34 [3] )
+Markup span at (71:2,37 [10] ) (Accepts:Any) - Parent: Markup block at (68:2,34 [24] )
+Transition span at (81:2,47 [1] ) (Accepts:None) - Parent: Expression block at (81:2,47 [5] )
+Code span at (82:2,48 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (81:2,47 [5] )
+Markup span at (86:2,52 [4] ) (Accepts:None) - Parent: Tag block at (86:2,52 [4] )
+Markup span at (90:2,56 [2] ) (Accepts:None) - Parent: Markup block at (68:2,34 [24] )
+Code span at (92:3,0 [104] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [382] )
+Markup span at (196:6,8 [3] ) (Accepts:None) - Parent: Tag block at (196:6,8 [3] )
+Markup span at (199:6,11 [20] ) (Accepts:Any) - Parent: Markup block at (196:6,8 [34] )
+Transition span at (219:6,31 [1] ) (Accepts:None) - Parent: Expression block at (219:6,31 [5] )
+Code span at (220:6,32 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (219:6,31 [5] )
+Markup span at (224:6,36 [4] ) (Accepts:None) - Parent: Tag block at (224:6,36 [4] )
+Markup span at (228:6,40 [2] ) (Accepts:None) - Parent: Markup block at (196:6,8 [34] )
+Code span at (230:7,0 [45] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [382] )
+Transition span at (275:9,8 [1] ) (Accepts:None) - Parent: Markup block at (275:9,8 [27] )
+MetaCode span at (276:9,9 [1] ) (Accepts:Any) - Parent: Markup block at (275:9,8 [27] )
+Markup span at (277:9,10 [14] ) (Accepts:Any) - Parent: Markup block at (275:9,8 [27] )
+Transition span at (291:9,24 [1] ) (Accepts:None) - Parent: Expression block at (291:9,24 [5] )
+Code span at (292:9,25 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (291:9,24 [5] )
+Markup span at (296:9,29 [6] ) (Accepts:None) - Parent: Markup block at (275:9,8 [27] )
+Code span at (302:10,0 [36] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [382] )
+Code span at (338:11,34 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [382] )
+Code span at (339:11,35 [42] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [382] )
+MetaCode span at (381:12,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [382] )
+Markup span at (382:12,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [382] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.diag.txt
new file mode 100644
index 0000000000..f3d2aeec7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.diag.txt
@@ -0,0 +1,4 @@
+(3,35): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(7,9): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(10,9): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(12,35): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.stree.txt
new file mode 100644
index 0000000000..bd49b06499
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/CSharpBlock_SingleLineControlFlowStatement_Error.stree.txt
@@ -0,0 +1,214 @@
+RazorDocument - [0..382)::382 - [@{LF    var time = DateTime.Now;LF    if (time.ToBinary() % 2 == 0) <p>The time: @time</p>LFLF    if (time.ToBinary() %3 == 0)LF        // For some reason we want to render the time now?LF        <p>The confusing time: @time</p>LFLF    if (time.ToBinary() % 4 == 0)LF        @: <p>The time: @time</p>LFLF    if (time.ToBinary() % 5 == 0) @@SomeGitHubUserName <strong>Hi!</strong>LF}]
+    MarkupBlock - [0..382)::382
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..382)::382
+            CSharpStatement - [0..382)::382
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..382)::381
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..381)::379
+                        CSharpStatementLiteral - [2..68)::66 - [LF    var time = DateTime.Now;LF    if (time.ToBinary() % 2 == 0) ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[time];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[time];
+                            Dot;[.];
+                            Identifier;[ToBinary];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            Modulo;[%];
+                            Whitespace;[ ];
+                            IntegerLiteral;[2];
+                            Whitespace;[ ];
+                            Equals;[==];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                        MarkupBlock - [68..92)::24
+                            MarkupElement - [68..90)::22
+                                MarkupStartTag - [68..71)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [71..81)::10 - [The time: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[The];
+                                    Whitespace;[ ];
+                                    Text;[time:];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [81..86)::5
+                                    CSharpImplicitExpression - [81..86)::5
+                                        CSharpTransition - [81..82)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [82..86)::4
+                                            CSharpCodeBlock - [82..86)::4
+                                                CSharpExpressionLiteral - [82..86)::4 - [time] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[time];
+                                MarkupEndTag - [86..90)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [90..92)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [92..196)::104 - [LF    if (time.ToBinary() %3 == 0)LF        // For some reason we want to render the time now?LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[time];
+                            Dot;[.];
+                            Identifier;[ToBinary];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            Modulo;[%];
+                            IntegerLiteral;[3];
+                            Whitespace;[ ];
+                            Equals;[==];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            RightParenthesis;[)];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                            CSharpComment;[// For some reason we want to render the time now?];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                        MarkupBlock - [196..230)::34
+                            MarkupElement - [196..228)::32
+                                MarkupStartTag - [196..199)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                MarkupTextLiteral - [199..219)::20 - [The confusing time: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[The];
+                                    Whitespace;[ ];
+                                    Text;[confusing];
+                                    Whitespace;[ ];
+                                    Text;[time:];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [219..224)::5
+                                    CSharpImplicitExpression - [219..224)::5
+                                        CSharpTransition - [219..220)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [220..224)::4
+                                            CSharpCodeBlock - [220..224)::4
+                                                CSharpExpressionLiteral - [220..224)::4 - [time] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[time];
+                                MarkupEndTag - [224..228)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [228..230)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [230..275)::45 - [LF    if (time.ToBinary() % 4 == 0)LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[time];
+                            Dot;[.];
+                            Identifier;[ToBinary];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            Modulo;[%];
+                            Whitespace;[ ];
+                            IntegerLiteral;[4];
+                            Whitespace;[ ];
+                            Equals;[==];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            RightParenthesis;[)];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                        MarkupBlock - [275..302)::27
+                            MarkupTransition - [275..276)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [276..277)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [277..291)::14 - [ <p>The time: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                                Text;[The];
+                                Whitespace;[ ];
+                                Text;[time:];
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [291..296)::5
+                                CSharpImplicitExpression - [291..296)::5
+                                    CSharpTransition - [291..292)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [292..296)::4
+                                        CSharpCodeBlock - [292..296)::4
+                                            CSharpExpressionLiteral - [292..296)::4 - [time] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[time];
+                            MarkupTextLiteral - [296..302)::6 - [</p>LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [302..338)::36 - [LF    if (time.ToBinary() % 5 == 0) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            Keyword;[if];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[time];
+                            Dot;[.];
+                            Identifier;[ToBinary];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            Modulo;[%];
+                            Whitespace;[ ];
+                            IntegerLiteral;[5];
+                            Whitespace;[ ];
+                            Equals;[==];
+                            Whitespace;[ ];
+                            IntegerLiteral;[0];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                        CSharpEphemeralTextLiteral - [338..339)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                            Transition;[@];
+                        CSharpStatementLiteral - [339..381)::42 - [@SomeGitHubUserName <strong>Hi!</strong>LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Transition;[@];
+                            Identifier;[SomeGitHubUserName];
+                            Whitespace;[ ];
+                            LessThan;[<];
+                            Identifier;[strong];
+                            GreaterThan;[>];
+                            Identifier;[Hi];
+                            Not;[!];
+                            LessThan;[<];
+                            Slash;[/];
+                            Identifier;[strong];
+                            GreaterThan;[>];
+                            NewLine;[LF];
+                    RazorMetaCode - [381..382)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [382..382)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt
deleted file mode 100644
index 37ec018710..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.diag.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-(1,9): Error RZ1008: Expected a "{" but found a ")".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-
-@if(isLoggedIn)
-    <p>Hello, @user</p>
-
-Instead, wrap the contents of the block in "{}":
-
-@if(isLoggedIn) {
-    <p>Hello, @user</p>
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt
index afc72ddf95..c18bec89a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.diag.txt
@@ -1,30 +1,3 @@
-(1,10): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-
-@if(isLoggedIn)
-    <p>Hello, @user</p>
-
-Instead, wrap the contents of the block in "{}":
-
-@if(isLoggedIn) {
-    <p>Hello, @user</p>
-}
-(1,34): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-
-@if(isLoggedIn)
-    <p>Hello, @user</p>
-
-Instead, wrap the contents of the block in "{}":
-
-@if(isLoggedIn) {
-    <p>Hello, @user</p>
-}
-(1,50): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-
-@if(isLoggedIn)
-    <p>Hello, @user</p>
-
-Instead, wrap the contents of the block in "{}":
-
-@if(isLoggedIn) {
-    <p>Hello, @user</p>
-}
+(1,10): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(1,34): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(1,50): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.cspans.txt
new file mode 100644
index 0000000000..ad756e73a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [147] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [145] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [145] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [145] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [145] )
+Code span at (14:1,12 [130] ) (Accepts:Any) - Parent: Directive block at (2:1,0 [145] )
+MetaCode span at (144:6,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [145] )
+Markup span at (147:7,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [147] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.stree.txt
new file mode 100644
index 0000000000..96b51d354b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement.stree.txt
@@ -0,0 +1,62 @@
+RazorDocument - [0..147)::147 - [LF@functions {LF    string GetAnnouncmentText(string message)LF    {LF        if (message.Length > 0) return "Anouncement: " + message;LF    }LF}LF]
+    MarkupBlock - [0..147)::147
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..147)::145
+            RazorDirective - [2..147)::145 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..147)::144
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..147)::135
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..144)::130
+                            CSharpStatementLiteral - [14..144)::130 - [LF    string GetAnnouncmentText(string message)LF    {LF        if (message.Length > 0) return "Anouncement: " + message;LF    }LF] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[GetAnnouncmentText];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                Keyword;[if];
+                                Whitespace;[ ];
+                                LeftParenthesis;[(];
+                                Identifier;[message];
+                                Dot;[.];
+                                Identifier;[Length];
+                                Whitespace;[ ];
+                                GreaterThan;[>];
+                                Whitespace;[ ];
+                                IntegerLiteral;[0];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                Keyword;[return];
+                                Whitespace;[ ];
+                                StringLiteral;["Anouncement: "];
+                                Whitespace;[ ];
+                                Plus;[+];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                Semicolon;[;];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [144..147)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [147..147)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.cspans.txt
new file mode 100644
index 0000000000..223c39f5de
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.cspans.txt
@@ -0,0 +1,36 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [408] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [406] )
+MetaCode span at (3:1,1 [9] ) (Accepts:None) - Parent: Directive block at (2:1,0 [406] )
+None span at (12:1,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (2:1,0 [406] )
+MetaCode span at (13:1,11 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [406] )
+Code span at (14:1,12 [88] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+Markup span at (102:4,32 [3] ) (Accepts:None) - Parent: Tag block at (102:4,32 [3] )
+Markup span at (105:4,35 [9] ) (Accepts:Any) - Parent: Markup block at (102:4,32 [26] )
+Transition span at (114:4,44 [1] ) (Accepts:None) - Parent: Expression block at (114:4,44 [8] )
+Code span at (115:4,45 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (114:4,44 [8] )
+Markup span at (122:4,52 [4] ) (Accepts:None) - Parent: Tag block at (122:4,52 [4] )
+Markup span at (126:4,56 [2] ) (Accepts:None) - Parent: Markup block at (102:4,32 [26] )
+Code span at (128:5,0 [78] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+Markup span at (206:8,12 [3] ) (Accepts:None) - Parent: Tag block at (206:8,12 [3] )
+Markup span at (209:8,15 [16] ) (Accepts:Any) - Parent: Markup block at (206:8,12 [25] )
+Markup span at (225:8,31 [4] ) (Accepts:None) - Parent: Tag block at (225:8,31 [4] )
+Markup span at (229:8,35 [2] ) (Accepts:None) - Parent: Markup block at (206:8,12 [25] )
+Code span at (231:9,0 [61] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+Transition span at (292:11,12 [1] ) (Accepts:None) - Parent: Markup block at (292:11,12 [27] )
+MetaCode span at (293:11,13 [1] ) (Accepts:Any) - Parent: Markup block at (292:11,12 [27] )
+Markup span at (294:11,14 [14] ) (Accepts:Any) - Parent: Markup block at (292:11,12 [27] )
+Transition span at (308:11,28 [1] ) (Accepts:None) - Parent: Expression block at (308:11,28 [5] )
+Code span at (309:11,29 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (308:11,28 [5] )
+Markup span at (313:11,33 [6] ) (Accepts:None) - Parent: Markup block at (292:11,12 [27] )
+Code span at (319:12,0 [31] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+Code span at (350:13,29 [1] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+Code span at (351:13,30 [20] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+Markup span at (371:13,50 [8] ) (Accepts:None) - Parent: Tag block at (371:13,50 [8] )
+Markup span at (379:13,58 [0] ) (Accepts:Any) - Parent: Markup block at (371:13,50 [27] )
+Transition span at (379:13,58 [1] ) (Accepts:None) - Parent: Expression block at (379:13,58 [8] )
+Code span at (380:13,59 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (379:13,58 [8] )
+Markup span at (387:13,66 [9] ) (Accepts:None) - Parent: Tag block at (387:13,66 [9] )
+Markup span at (396:13,75 [2] ) (Accepts:None) - Parent: Markup block at (371:13,50 [27] )
+Code span at (398:14,0 [7] ) (Accepts:Any) - Parent: Statement block at (14:1,12 [391] )
+MetaCode span at (405:15,0 [3] ) (Accepts:None) - Parent: Directive block at (2:1,0 [406] )
+Markup span at (408:16,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [408] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.diag.txt
new file mode 100644
index 0000000000..f661098862
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.diag.txt
@@ -0,0 +1,4 @@
+(5,33): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(9,13): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(12,13): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
+(14,30): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.stree.txt
new file mode 100644
index 0000000000..03065213c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpFunctionsTest/Functions_SingleLineControlFlowStatement_Error.stree.txt
@@ -0,0 +1,208 @@
+RazorDocument - [0..408)::408 - [LF@functions {LF    string GetAnnouncmentText(string message)LF    {LF        if (message.Length > 0) <p>Message: @message</p>LFLF        if (message == null)LF            // Nothing to renderLF            <p>Message was null</p>LFLF        if (DateTime.Now.ToBinary() % 2 == 0)LF            @: <p>The time: @time</p>LFLF        if (message != null) @@SomeGitHubUserName <strong>@message</strong>LF    }LF}LF]
+    MarkupBlock - [0..408)::408
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..408)::406
+            RazorDirective - [2..408)::406 - Directive:{functions;CodeBlock;Unrestricted} [RZ1008(102:4,32 [1] ), RZ1008(206:8,12 [1] ), RZ1008(292:11,12 [2] ), RZ1008(350:13,29 [2] )]
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..408)::405
+                    RazorMetaCode - [3..12)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [12..408)::396
+                        UnclassifiedTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [14..405)::391
+                            CSharpStatementLiteral - [14..102)::88 - [LF    string GetAnnouncmentText(string message)LF    {LF        if (message.Length > 0) ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[GetAnnouncmentText];
+                                LeftParenthesis;[(];
+                                Keyword;[string];
+                                Whitespace;[ ];
+                                Identifier;[message];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                Keyword;[if];
+                                Whitespace;[ ];
+                                LeftParenthesis;[(];
+                                Identifier;[message];
+                                Dot;[.];
+                                Identifier;[Length];
+                                Whitespace;[ ];
+                                GreaterThan;[>];
+                                Whitespace;[ ];
+                                IntegerLiteral;[0];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                            MarkupBlock - [102..128)::26
+                                MarkupElement - [102..126)::24
+                                    MarkupStartTag - [102..105)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [105..114)::9 - [Message: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Message:];
+                                        Whitespace;[ ];
+                                    CSharpCodeBlock - [114..122)::8
+                                        CSharpImplicitExpression - [114..122)::8
+                                            CSharpTransition - [114..115)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [115..122)::7
+                                                CSharpCodeBlock - [115..122)::7
+                                                    CSharpExpressionLiteral - [115..122)::7 - [message] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                        Identifier;[message];
+                                    MarkupEndTag - [122..126)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [126..128)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [128..206)::78 - [LF        if (message == null)LF            // Nothing to renderLF            ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                Keyword;[if];
+                                Whitespace;[ ];
+                                LeftParenthesis;[(];
+                                Identifier;[message];
+                                Whitespace;[ ];
+                                Equals;[==];
+                                Whitespace;[ ];
+                                Keyword;[null];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[            ];
+                                CSharpComment;[// Nothing to render];
+                                NewLine;[LF];
+                                Whitespace;[            ];
+                            MarkupBlock - [206..231)::25
+                                MarkupElement - [206..229)::23
+                                    MarkupStartTag - [206..209)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [209..225)::16 - [Message was null] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Message];
+                                        Whitespace;[ ];
+                                        Text;[was];
+                                        Whitespace;[ ];
+                                        Text;[null];
+                                    MarkupEndTag - [225..229)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [229..231)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [231..292)::61 - [LF        if (DateTime.Now.ToBinary() % 2 == 0)LF            ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                Keyword;[if];
+                                Whitespace;[ ];
+                                LeftParenthesis;[(];
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+                                Dot;[.];
+                                Identifier;[ToBinary];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                Modulo;[%];
+                                Whitespace;[ ];
+                                IntegerLiteral;[2];
+                                Whitespace;[ ];
+                                Equals;[==];
+                                Whitespace;[ ];
+                                IntegerLiteral;[0];
+                                RightParenthesis;[)];
+                                NewLine;[LF];
+                                Whitespace;[            ];
+                            MarkupBlock - [292..319)::27
+                                MarkupTransition - [292..293)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                RazorMetaCode - [293..294)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                    Colon;[:];
+                                MarkupTextLiteral - [294..308)::14 - [ <p>The time: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                    Text;[The];
+                                    Whitespace;[ ];
+                                    Text;[time:];
+                                    Whitespace;[ ];
+                                CSharpCodeBlock - [308..313)::5
+                                    CSharpImplicitExpression - [308..313)::5
+                                        CSharpTransition - [308..309)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [309..313)::4
+                                            CSharpCodeBlock - [309..313)::4
+                                                CSharpExpressionLiteral - [309..313)::4 - [time] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                    Identifier;[time];
+                                MarkupTextLiteral - [313..319)::6 - [</p>LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [319..350)::31 - [LF        if (message != null) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[        ];
+                                Keyword;[if];
+                                Whitespace;[ ];
+                                LeftParenthesis;[(];
+                                Identifier;[message];
+                                Whitespace;[ ];
+                                NotEqual;[!=];
+                                Whitespace;[ ];
+                                Keyword;[null];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                            CSharpEphemeralTextLiteral - [350..351)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                            CSharpStatementLiteral - [351..371)::20 - [@SomeGitHubUserName ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                                Identifier;[SomeGitHubUserName];
+                                Whitespace;[ ];
+                            MarkupBlock - [371..398)::27
+                                MarkupElement - [371..396)::25
+                                    MarkupStartTag - [371..379)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                                    MarkupTextLiteral - [379..379)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Marker;[];
+                                    CSharpCodeBlock - [379..387)::8
+                                        CSharpImplicitExpression - [379..387)::8
+                                            CSharpTransition - [379..380)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [380..387)::7
+                                                CSharpCodeBlock - [380..387)::7
+                                                    CSharpExpressionLiteral - [380..387)::7 - [message] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                        Identifier;[message];
+                                    MarkupEndTag - [387..396)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [396..398)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    NewLine;[LF];
+                            CSharpStatementLiteral - [398..405)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                                RightBrace;[}];
+                                NewLine;[LF];
+                        RazorMetaCode - [405..408)::3 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [408..408)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt
index 9dba2e6078..bfae619d1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.diag.txt
@@ -1,12 +1,3 @@
 (1,2): Error RZ1035: Missing close angle for tag helper 'p'.
 (1,2): Error RZ1034: Found a malformed 'p' tag helper. Tag helpers must have a start and end tag or be self closing.
-(1,21): Error RZ1008: Expected a "{" but found a "<".  Block statements must be enclosed in "{" and "}".  You cannot use single-statement control-flow statements in CSHTML pages. For example, the following is not allowed:
-
-@if(isLoggedIn)
-    <p>Hello, @user</p>
-
-Instead, wrap the contents of the block in "{}":
-
-@if(isLoggedIn) {
-    <p>Hello, @user</p>
-}
+(1,21): Error RZ1008: Single-statement control-flow statements in Razor documents statements cannot contain markup. Markup should be enclosed in "{" and "}".

From 96475e488d9b98f888929b1a5544bea5ea02fdc7 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 15 May 2019 11:58:54 -0700
Subject: [PATCH 155/337] Render more TagHelper code at design time.

- This is a pre-requisite to properly warnings users about TagHelpers in code blocks. With this change VS indicates that there's an asynchronous operation happening in a code block but because the code is auto-generated it happens behind the scenes and therefore always gets logged as a line 1 error (unusable). Therefore, to fix this issue there will be a partner PR that will go out in AspNetCore that adds analyzer errors for cases where `__tagHelperRunner.RunAsync` exists in code blocks that do not return `Task` and are not marked with `async` properly.
- Updated test files to reflect the new TagHelper codegen at design time.
- Note: This doesn't solve the `~/` case that will be in a follow up PR.

aspnet/AspNetCoredotnet/aspnetcore-tooling#8630
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/17af3efccd4757890dcfc1913a36edfc7a379307
---
 ...lExpressionTagHelper_DesignTime.codegen.cs |   7 ++
 ...xpressionTagHelper_DesignTime.mappings.txt |   8 +-
 .../Sections_DesignTime.codegen.cs            |   6 +
 .../Sections_DesignTime.mappings.txt          |  10 +-
 ...ewComponentTagHelper_DesignTime.codegen.cs |   6 +
 ...ComponentTagHelper_DesignTime.mappings.txt |   6 +-
 ...lExpressionTagHelper_DesignTime.codegen.cs |   7 ++
 ...xpressionTagHelper_DesignTime.mappings.txt |   8 +-
 ...odelExpressionTagHelper_Runtime.codegen.cs |   6 +-
 ...zorPagesWithoutModel_DesignTime.codegen.cs |  10 ++
 ...rPagesWithoutModel_DesignTime.mappings.txt |   6 +-
 .../RazorPagesWithoutModel_Runtime.codegen.cs |   6 +-
 .../RazorPages_DesignTime.codegen.cs          |  10 ++
 .../RazorPages_DesignTime.mappings.txt        |   8 +-
 .../RazorPages_Runtime.codegen.cs             |   6 +-
 .../Sections_DesignTime.codegen.cs            |   6 +
 .../Sections_DesignTime.mappings.txt          |  10 +-
 .../Sections_Runtime.codegen.cs               |   6 +-
 ...ewComponentTagHelper_DesignTime.codegen.cs |   6 +
 ...ComponentTagHelper_DesignTime.mappings.txt |   6 +-
 .../ViewComponentTagHelper_Runtime.codegen.cs |   6 +-
 .../BasicTest.codegen.cs                      |   6 +-
 ...lExpressionTagHelper_DesignTime.codegen.cs |   7 ++
 ...xpressionTagHelper_DesignTime.mappings.txt |   8 +-
 ...odelExpressionTagHelper_Runtime.codegen.cs |   6 +-
 ...zorPagesWithoutModel_DesignTime.codegen.cs |  10 ++
 ...rPagesWithoutModel_DesignTime.mappings.txt |   6 +-
 .../RazorPagesWithoutModel_Runtime.codegen.cs |   6 +-
 .../RazorPages_DesignTime.codegen.cs          |  10 ++
 .../RazorPages_DesignTime.mappings.txt        |   8 +-
 .../RazorPages_Runtime.codegen.cs             |   6 +-
 .../Sections_DesignTime.codegen.cs            |   6 +
 .../Sections_DesignTime.mappings.txt          |  10 +-
 .../Sections_Runtime.codegen.cs               |   6 +-
 ...ewComponentTagHelper_DesignTime.codegen.cs |   6 +
 ...ComponentTagHelper_DesignTime.mappings.txt |   6 +-
 .../ViewComponentTagHelper_Runtime.codegen.cs |   6 +-
 .../DefaultTagHelperTargetExtension.cs        |  46 ++++----
 .../DefaultTagHelperTargetExtensionTest.cs    |  20 +++-
 ...eTargetingTagHelpers_DesignTime.codegen.cs |   9 ++
 ...argetingTagHelpers_DesignTime.mappings.txt |   6 +-
 ...buteTargetingTagHelpers_Runtime.codegen.cs |   6 +-
 .../BasicTagHelpers_DesignTime.codegen.cs     |   9 ++
 .../BasicTagHelpers_DesignTime.mappings.txt   |   6 +-
 ...cTagHelpers_Prefixed_DesignTime.codegen.cs |   7 ++
 ...agHelpers_Prefixed_DesignTime.mappings.txt |   6 +-
 ...asicTagHelpers_Prefixed_Runtime.codegen.cs |   6 +-
 ...Helpers_RemoveTagHelper_Runtime.codegen.cs |   6 +-
 .../BasicTagHelpers_Runtime.codegen.cs        |   6 +-
 .../ComplexTagHelpers_DesignTime.codegen.cs   |  24 ++++
 .../ComplexTagHelpers_DesignTime.mappings.txt | 106 +++++++++---------
 .../ComplexTagHelpers_Runtime.codegen.cs      |   6 +-
 ...ctorTagHelperAttributes_Runtime.codegen.cs |   6 +-
 ...eAttributeTagHelpers_DesignTime.codegen.cs |   9 ++
 ...ttributeTagHelpers_DesignTime.mappings.txt |   8 +-
 ...cateAttributeTagHelpers_Runtime.codegen.cs |   6 +-
 ...icateTargetTagHelper_DesignTime.codegen.cs |   6 +
 ...ateTargetTagHelper_DesignTime.mappings.txt |   4 +-
 ...uplicateTargetTagHelper_Runtime.codegen.cs |   6 +-
 ...cAttributeTagHelpers_DesignTime.codegen.cs |  11 ++
 ...ttributeTagHelpers_DesignTime.mappings.txt |  62 +++++-----
 ...amicAttributeTagHelpers_Runtime.codegen.cs |   6 +-
 ...yAttributeTagHelpers_DesignTime.codegen.cs |   8 ++
 ...ttributeTagHelpers_DesignTime.mappings.txt |   8 +-
 ...mptyAttributeTagHelpers_Runtime.codegen.cs |   6 +-
 .../EnumTagHelpers_DesignTime.codegen.cs      |  10 ++
 .../EnumTagHelpers_DesignTime.mappings.txt    |  18 +--
 .../EnumTagHelpers_Runtime.codegen.cs         |   6 +-
 .../EscapedTagHelpers_DesignTime.codegen.cs   |   6 +
 .../EscapedTagHelpers_DesignTime.mappings.txt |   8 +-
 .../EscapedTagHelpers_Runtime.codegen.cs      |   6 +-
 .../IncompleteTagHelper_DesignTime.codegen.cs |   6 +
 ...ncompleteTagHelper_DesignTime.mappings.txt |   2 +-
 .../IncompleteTagHelper_Runtime.codegen.cs    |   6 +-
 ...eBlocksWithTagHelper_DesignTime.codegen.cs |   7 ++
 ...locksWithTagHelper_DesignTime.mappings.txt |  28 ++---
 ...CodeBlocksWithTagHelper_Runtime.codegen.cs |   6 +-
 .../MinimizedTagHelpers_DesignTime.codegen.cs |  12 ++
 ...inimizedTagHelpers_DesignTime.mappings.txt |   2 +-
 .../MinimizedTagHelpers_Runtime.codegen.cs    |   6 +-
 ...dScriptTagTagHelpers_DesignTime.codegen.cs |   7 ++
 ...criptTagTagHelpers_DesignTime.mappings.txt |  10 +-
 ...stedScriptTagTagHelpers_Runtime.codegen.cs |   6 +-
 .../NestedTagHelpers_DesignTime.codegen.cs    |   8 ++
 .../NestedTagHelpers_DesignTime.mappings.txt  |   2 +-
 .../NestedTagHelpers_Runtime.codegen.cs       |   6 +-
 ...dAttributeTagHelpers_DesignTime.codegen.cs |   9 ++
 ...ttributeTagHelpers_DesignTime.mappings.txt |  24 ++--
 ...ixedAttributeTagHelpers_Runtime.codegen.cs |   6 +-
 .../SimpleTagHelpers_DesignTime.codegen.cs    |   6 +
 .../SimpleTagHelpers_DesignTime.mappings.txt  |   2 +-
 .../SimpleTagHelpers_Runtime.codegen.cs       |   6 +-
 ...lineBeforeAttributes_DesignTime.codegen.cs |   6 +
 ...neBeforeAttributes_DesignTime.mappings.txt |   4 +-
 ...NewlineBeforeAttributes_Runtime.codegen.cs |   6 +-
 .../SingleTagHelper_DesignTime.codegen.cs     |   6 +
 .../SingleTagHelper_DesignTime.mappings.txt   |   4 +-
 .../SingleTagHelper_Runtime.codegen.cs        |   6 +-
 ...ymbolBoundAttributes_DesignTime.codegen.cs |  12 ++
 ...bolBoundAttributes_DesignTime.mappings.txt |  10 +-
 .../SymbolBoundAttributes_Runtime.codegen.cs  |   6 +-
 .../TagHelpersInSection_DesignTime.codegen.cs |   8 ++
 ...agHelpersInSection_DesignTime.mappings.txt |  14 +--
 .../TagHelpersInSection_Runtime.codegen.cs    |   6 +-
 ...sWithBoundAttributes_DesignTime.codegen.cs |   6 +
 ...ithBoundAttributes_DesignTime.mappings.txt |   4 +-
 ...persWithBoundAttributes_Runtime.codegen.cs |   6 +-
 ...thDataDashAttributes_DesignTime.codegen.cs |   7 ++
 ...DataDashAttributes_DesignTime.mappings.txt |   8 +-
 ...sWithDataDashAttributes_Runtime.codegen.cs |   6 +-
 ...TagHelpersWithPrefix_DesignTime.codegen.cs |   6 +
 ...gHelpersWithPrefix_DesignTime.mappings.txt |   6 +-
 .../TagHelpersWithPrefix_Runtime.codegen.cs   |   6 +-
 ...gHelpersWithTemplate_DesignTime.codegen.cs |   8 ++
 ...elpersWithTemplate_DesignTime.mappings.txt |  10 +-
 .../TagHelpersWithTemplate_Runtime.codegen.cs |   6 +-
 ...rdlySpacedAttributes_DesignTime.codegen.cs |   9 ++
 ...lySpacedAttributes_DesignTime.mappings.txt |   8 +-
 ...WeirdlySpacedAttributes_Runtime.codegen.cs |   6 +-
 ...nTagHelperAttributes_DesignTime.codegen.cs |  11 ++
 ...agHelperAttributes_DesignTime.mappings.txt |  44 ++++----
 ...nsInTagHelperAttributes_Runtime.codegen.cs |   6 +-
 122 files changed, 786 insertions(+), 364 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index 82441cd663..844e9500d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTestTagHelper __InputTestTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -46,12 +51,14 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 
 #line default
 #line hidden
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
 
 #line default
 #line hidden
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index 63a7d6ccc1..c2d5cbab5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |DateTime|
-Generated Location: (851:20,0 [8] )
+Generated Location: (1259:25,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1123:28,37 [29] )
+Generated Location: (1531:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (1802:44,102 [4] )
+Generated Location: (2210:49,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2118:50,94 [5] )
+Generated Location: (2602:56,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 3ca46af8a7..6971a08a00 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTestTagHelper __InputTestTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -61,6 +66,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 
 #line default
 #line hidden
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index 1cc991810c..b2ae45c050 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |DateTime|
-Generated Location: (819:20,0 [8] )
+Generated Location: (1227:25,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1075:28,37 [29] )
+Generated Location: (1483:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1305:36,22 [8] )
+Generated Location: (1713:41,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (1771:51,2 [46] )
+Generated Location: (2179:56,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2196:59,102 [4] )
+Generated Location: (2604:64,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index b6196f6651..90293d54ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::AllTagHelper __AllTagHelper;
         private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
         #pragma warning disable 219
@@ -48,6 +53,7 @@ global::System.Object __typeHelper = "*, AppCode";
 #line hidden
             __TestViewComponentTagHelper.firstName = string.Empty;
             __AllTagHelper.Bar = " World";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
index 9c5fd32efb..1af3082e0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |"*, AppCode"|
-Generated Location: (1057:21,37 [12] )
+Generated Location: (1465:26,37 [12] )
 |"*, AppCode"|
 
 Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |
     var foo = "Hello";
 |
-Generated Location: (1534:36,2 [26] )
+Generated Location: (1942:41,2 [26] )
 |
     var foo = "Hello";
 |
 
 Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |foo|
-Generated Location: (1985:44,22 [3] )
+Generated Location: (2393:49,22 [3] )
 |foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index 82441cd663..844e9500d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTestTagHelper __InputTestTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -46,12 +51,14 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 
 #line default
 #line hidden
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
 
 #line default
 #line hidden
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index 63a7d6ccc1..c2d5cbab5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |DateTime|
-Generated Location: (851:20,0 [8] )
+Generated Location: (1259:25,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1123:28,37 [29] )
+Generated Location: (1531:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (1802:44,102 [4] )
+Generated Location: (2210:49,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2118:50,94 [5] )
+Generated Location: (2602:56,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index 799bbc1362..92388de1b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -17,11 +17,13 @@ namespace AspNetCore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
index aeb2631c46..feed2d390d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -18,6 +18,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -38,15 +43,20 @@ global::System.Object __typeHelper = "*, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
                                          __o = Name;
 
 #line default
 #line hidden
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
index 33f7baa377..57e01c4825 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -5,12 +5,12 @@ Generated Location: (487:14,0 [41] )
 
 Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |"*, AppCode"|
-Generated Location: (1035:25,37 [12] )
+Generated Location: (1443:30,37 [12] )
 |"*, AppCode"|
 
 Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |Name|
-Generated Location: (1629:41,47 [4] )
+Generated Location: (2113:47,47 [4] )
 |Name|
 
 Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
@@ -28,7 +28,7 @@ Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegra
         public string Name { get; set; }
     }
 |
-Generated Location: (2110:52,12 [283] )
+Generated Location: (2898:62,12 [283] )
 |
     public IActionResult OnPost(Customer customer)
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index f11c563667..b1b5bb16b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -26,11 +26,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
index d7acbdf7d1..0b92014eff 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -18,6 +18,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -46,15 +51,20 @@ global::System.Object __typeHelper = "*, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
                                          __o = Model.Name;
 
 #line default
 #line hidden
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
index 0af8c77dfd..64f6b1ddbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -5,17 +5,17 @@ Generated Location: (475:14,0 [41] )
 
 Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |NewModel|
-Generated Location: (962:25,0 [8] )
+Generated Location: (1370:30,0 [8] )
 |NewModel|
 
 Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |"*, AppCode"|
-Generated Location: (1220:33,37 [12] )
+Generated Location: (1628:38,37 [12] )
 |"*, AppCode"|
 
 Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |Model.Name|
-Generated Location: (1802:49,47 [10] )
+Generated Location: (2286:55,47 [10] )
 |Model.Name|
 
 Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
@@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr
         public string Name { get; set; }
     }
 |
-Generated Location: (2277:60,12 [360] )
+Generated Location: (3065:70,12 [360] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index ca08b5e268..a879a231b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -26,11 +26,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 3ca46af8a7..6971a08a00 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTestTagHelper __InputTestTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -61,6 +66,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 
 #line default
 #line hidden
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index 1cc991810c..b2ae45c050 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |DateTime|
-Generated Location: (819:20,0 [8] )
+Generated Location: (1227:25,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1075:28,37 [29] )
+Generated Location: (1483:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1305:36,22 [8] )
+Generated Location: (1713:41,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (1771:51,2 [46] )
+Generated Location: (2179:56,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2196:59,102 [4] )
+Generated Location: (2604:64,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 5d5ab480d6..6e7de7d9b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -17,11 +17,13 @@ namespace AspNetCore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index b6196f6651..90293d54ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::AllTagHelper __AllTagHelper;
         private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
         #pragma warning disable 219
@@ -48,6 +53,7 @@ global::System.Object __typeHelper = "*, AppCode";
 #line hidden
             __TestViewComponentTagHelper.firstName = string.Empty;
             __AllTagHelper.Bar = " World";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
index 9c5fd32efb..1af3082e0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |"*, AppCode"|
-Generated Location: (1057:21,37 [12] )
+Generated Location: (1465:26,37 [12] )
 |"*, AppCode"|
 
 Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |
     var foo = "Hello";
 |
-Generated Location: (1534:36,2 [26] )
+Generated Location: (1942:41,2 [26] )
 |
     var foo = "Hello";
 |
 
 Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |foo|
-Generated Location: (1985:44,22 [3] )
+Generated Location: (2393:49,22 [3] )
 |foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index 28241f9687..7f617e58bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -19,11 +19,13 @@ namespace AspNetCore
         private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
index 804cb2af89..f68443c5b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
@@ -20,11 +20,13 @@ namespace AspNetCore
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("foo"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index 6c0bfbaa8c..bafdc422ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTestTagHelper __InputTestTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -52,6 +57,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
 #nullable restore
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
@@ -60,6 +66,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index 100abb1b5c..274add4bdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |DateTime|
-Generated Location: (870:21,0 [8] )
+Generated Location: (1278:26,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1180:31,37 [29] )
+Generated Location: (1588:36,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (1897:49,102 [4] )
+Generated Location: (2305:54,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2251:57,94 [5] )
+Generated Location: (2735:63,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index 0e7defef2d..f275cc4bbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -16,11 +16,13 @@ namespace AspNetCore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
index b0f5beb1a9..08d7f97108 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -20,6 +20,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 #nullable disable
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -42,6 +47,7 @@ global::System.Object __typeHelper = "*, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
                                          __o = Name;
@@ -50,9 +56,13 @@ global::System.Object __typeHelper = "*, AppCode";
 #line hidden
 #nullable disable
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
index 3a67aa86ef..3a72396f8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -5,12 +5,12 @@ Generated Location: (506:15,0 [41] )
 
 Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |"*, AppCode"|
-Generated Location: (1092:28,37 [12] )
+Generated Location: (1500:33,37 [12] )
 |"*, AppCode"|
 
 Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |Name|
-Generated Location: (1724:46,47 [4] )
+Generated Location: (2208:52,47 [4] )
 |Name|
 
 Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
@@ -28,7 +28,7 @@ Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegra
         public string Name { get; set; }
     }
 |
-Generated Location: (2243:59,12 [283] )
+Generated Location: (3031:69,12 [283] )
 |
     public IActionResult OnPost(Customer customer)
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index e001e0593c..26274f3e74 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -27,11 +27,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
index 8cd1703ea8..72421a6e4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -20,6 +20,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 #nullable disable
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -52,6 +57,7 @@ global::System.Object __typeHelper = "*, AppCode";
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
                                          __o = Model.Name;
@@ -60,9 +66,13 @@ global::System.Object __typeHelper = "*, AppCode";
 #line hidden
 #nullable disable
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
index a01ff719cf..48e21da3e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -5,17 +5,17 @@ Generated Location: (494:15,0 [41] )
 
 Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |NewModel|
-Generated Location: (1019:28,0 [8] )
+Generated Location: (1427:33,0 [8] )
 |NewModel|
 
 Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |"*, AppCode"|
-Generated Location: (1315:38,37 [12] )
+Generated Location: (1723:43,37 [12] )
 |"*, AppCode"|
 
 Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |Model.Name|
-Generated Location: (1935:56,47 [10] )
+Generated Location: (2419:62,47 [10] )
 |Model.Name|
 
 Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
@@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr
         public string Name { get; set; }
     }
 |
-Generated Location: (2448:69,12 [360] )
+Generated Location: (3236:79,12 [360] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index 3ab0b40633..f258cbe703 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -27,11 +27,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 9d1e2bf58d..a50f2dc521 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTestTagHelper __InputTestTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -71,6 +76,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
 #line default
 #line hidden
 #nullable disable
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index f97fc02e0b..b41d70d142 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |DateTime|
-Generated Location: (838:21,0 [8] )
+Generated Location: (1246:26,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1132:31,37 [29] )
+Generated Location: (1540:36,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1400:41,22 [8] )
+Generated Location: (1808:46,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (1904:58,2 [46] )
+Generated Location: (2312:63,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2367:68,102 [4] )
+Generated Location: (2775:73,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 85c27277e5..e655481c1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -16,11 +16,13 @@ namespace AspNetCore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index 02339582f9..202dddb23e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -13,6 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::AllTagHelper __AllTagHelper;
         private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
         #pragma warning disable 219
@@ -54,6 +59,7 @@ global::System.Object __typeHelper = "*, AppCode";
 #nullable disable
             __TestViewComponentTagHelper.firstName = string.Empty;
             __AllTagHelper.Bar = " World";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
index 2fe93f8a9e..bd8d1df67f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |"*, AppCode"|
-Generated Location: (1076:22,37 [12] )
+Generated Location: (1484:27,37 [12] )
 |"*, AppCode"|
 
 Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |
     var foo = "Hello";
 |
-Generated Location: (1591:39,2 [26] )
+Generated Location: (1999:44,2 [26] )
 |
     var foo = "Hello";
 |
 
 Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |foo|
-Generated Location: (2080:49,22 [3] )
+Generated Location: (2488:54,22 [3] )
 |foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index e4c78739e2..cbc587108b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -18,11 +18,13 @@ namespace AspNetCore
         private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
index 7273868d62..c82b0e2135 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
@@ -151,16 +151,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 throw new InvalidOperationException(message);
             }
 
+            // We always render `await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);` to notify users of the requirement for a method
+            // to be asynchronous.
+
+            context.CodeWriter
+                .Write("await ")
+                .WriteStartInstanceMethodInvocation(
+                    RunnerVariableName,
+                    RunnerRunAsyncMethodName)
+                .Write(ExecutionContextVariableName)
+                .WriteEndMethodInvocation();
+
             if (!context.Options.DesignTime)
             {
-                context.CodeWriter
-                    .Write("await ")
-                    .WriteStartInstanceMethodInvocation(
-                        RunnerVariableName,
-                        RunnerRunAsyncMethodName)
-                    .Write(ExecutionContextVariableName)
-                    .WriteEndMethodInvocation();
-
                 var tagHelperOutputAccessor = $"{ExecutionContextVariableName}.{ExecutionContextOutputPropertyName}";
 
                 context.CodeWriter
@@ -472,27 +475,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 
         public void WriteTagHelperRuntime(CodeRenderingContext context, DefaultTagHelperRuntimeIntermediateNode node)
         {
+            context.CodeWriter.WriteLine("#line hidden");
+            context.CodeWriter.WriteLine("#pragma warning disable 0649");
+            context.CodeWriter.WriteField(PrivateModifiers, ExecutionContextTypeName, ExecutionContextVariableName);
+            context.CodeWriter.WriteLine("#pragma warning restore 0649");
+
+            context.CodeWriter
+                .Write("private ")
+                .Write(TagHelperRunnerTypeName)
+                .Write(" ")
+                .Write(RunnerVariableName)
+                .Write(" = new ")
+                .Write(TagHelperRunnerTypeName)
+                .WriteLine("();");
+
             if (!context.Options.DesignTime)
             {
-                context.CodeWriter.WriteLine("#line hidden");
-
                 // Need to disable the warning "X is never used." for the value buffer since
                 // whether it's used depends on how a TagHelper is used.
                 context.CodeWriter.WriteLine("#pragma warning disable 0169");
                 context.CodeWriter.WriteField(PrivateModifiers, "string", StringValueBufferVariableName);
                 context.CodeWriter.WriteLine("#pragma warning restore 0169");
 
-                context.CodeWriter.WriteField(PrivateModifiers, ExecutionContextTypeName, ExecutionContextVariableName);
-
-                context.CodeWriter
-                    .Write("private ")
-                    .Write(TagHelperRunnerTypeName)
-                    .Write(" ")
-                    .Write(RunnerVariableName)
-                    .Write(" = new ")
-                    .Write(TagHelperRunnerTypeName)
-                    .WriteLine("();");
-
                 var backedScopeManageVariableName = "__backed" + ScopeManagerVariableName;
                 context.CodeWriter
                     .Write("private ")
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs
index f8d21edfca..fba53cd721 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperTargetExtensionTest.cs
@@ -189,7 +189,7 @@ __tagHelperExecutionContext.Add(__TestNamespace_MyTagHelper);
         }
 
         [Fact]
-        public void WriteTagHelperExecute_DesignTime_WritesNothing()
+        public void WriteTagHelperExecute_DesignTime_RendersAsyncCode()
         {
             // Arrange
             var extension = new DefaultTagHelperTargetExtension();
@@ -206,7 +206,8 @@ __tagHelperExecutionContext.Add(__TestNamespace_MyTagHelper);
             // Assert
             var csharp = context.CodeWriter.GenerateCode();
             Assert.Equal(
-                @"",
+                @"await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+",
                 csharp,
                 ignoreLineEndingDifferences: true);
         }
@@ -1077,7 +1078,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
         }
 
         [Fact]
-        public void WriteTagHelperRuntime_DesignTime_WritesNothing()
+        public void WriteTagHelperRuntime_DesignTime_RendersPreRequisites()
         {
             // Arrange
             var extension = new DefaultTagHelperTargetExtension();
@@ -1091,7 +1092,12 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
             // Assert
             var csharp = context.CodeWriter.GenerateCode();
             Assert.Equal(
-                @"",
+                @"#line hidden
+#pragma warning disable 0649
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+#pragma warning restore 0649
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+",
                 csharp,
                 ignoreLineEndingDifferences: true);
         }
@@ -1112,11 +1118,13 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
             var csharp = context.CodeWriter.GenerateCode();
             Assert.Equal(
 @"#line hidden
+#pragma warning disable 0649
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+#pragma warning restore 0649
+private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
 #pragma warning disable 0169
 private string __tagHelperStringValueBuffer;
 #pragma warning restore 0169
-private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
 private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
 private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
index 1a6736914b..8548f916c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
@@ -30,6 +35,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
         public async System.Threading.Tasks.Task ExecuteAsync()
         {
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "checkbox";
@@ -41,6 +47,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
@@ -53,7 +60,9 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
index 14f7685665..daeee4d6ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (902:16,38 [15] )
+Generated Location: (1310:21,38 [15] )
 |*, TestAssembly|
 
 Source Location: (187:5,36 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
 |true|
-Generated Location: (1919:38,42 [4] )
+Generated Location: (2403:44,42 [4] )
 |true|
 
 Source Location: (233:6,36 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
 |true|
-Generated Location: (2610:50,42 [4] )
+Generated Location: (3170:57,42 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs
index e1a1e91204..0d6a110467 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("btn"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
index a3f054b732..658cf27126 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
@@ -29,6 +34,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
         public async System.Threading.Tasks.Task ExecuteAsync()
         {
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -40,6 +46,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #nullable disable
             __TestNamespace_InputTagHelper.Type = "text";
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "checkbox";
@@ -51,7 +58,9 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
index f639597507..a2450c46b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (783:15,37 [17] )
+Generated Location: (1191:20,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (220:5,38 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
 |ViewBag.DefaultInterval|
-Generated Location: (1618:35,38 [23] )
+Generated Location: (2102:41,38 [23] )
 |ViewBag.DefaultInterval|
 
 Source Location: (303:6,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
 |true|
-Generated Location: (2354:48,42 [4] )
+Generated Location: (2914:55,42 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
index 85b8e6f1d9..92e4fa5dc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
@@ -49,7 +54,9 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
index 3758937b4c..63bd2edaff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (17:0,17 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
 |"THS"|
-Generated Location: (801:15,37 [5] )
+Generated Location: (1209:20,37 [5] )
 |"THS"|
 
 Source Location: (38:1,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
 |"*, TestAssembly"|
-Generated Location: (1075:25,37 [17] )
+Generated Location: (1483:30,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (226:7,43 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
 |true|
-Generated Location: (1981:46,43 [4] )
+Generated Location: (2389:51,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs
index 4983c36dd6..6d015f413d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.codegen.cs
@@ -11,11 +11,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs
index 66850f8043..e31a729b2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs
index 593460da0e..48bed63896 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.codegen.cs
@@ -14,11 +14,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-delay", new global::Microsoft.AspNetCore.Html.HtmlString("1000"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
index c60c5aac81..8f32099009 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
@@ -47,6 +52,7 @@ __TestNamespace_PTagHelper.Age = @@(1+2);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
              if (false)
@@ -60,7 +66,9 @@ __TestNamespace_PTagHelper.Age = @@(1+2);
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "text";
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
                                                                                                    
@@ -90,7 +98,9 @@ __TestNamespace_PTagHelper.Age = @@(1+2);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 17 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
                                                                           
@@ -110,6 +120,7 @@ __TestNamespace_PTagHelper.Age = @@(1+2);
 #nullable disable
             __TestNamespace_InputTagHelper.Type = string.Empty;
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 18 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
                                                                   
@@ -143,6 +154,7 @@ __TestNamespace_PTagHelper.Age = @@(1+2);
 #nullable disable
             __TestNamespace_InputTagHelper.Type = string.Empty;
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
                                                                                                  
@@ -159,6 +171,7 @@ __TestNamespace_PTagHelper.Age = @@(1+2);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
                var @object = false;
@@ -175,6 +188,7 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 22 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
@@ -183,6 +197,7 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -192,6 +207,7 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
@@ -200,6 +216,7 @@ __TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -209,6 +226,7 @@ __TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
@@ -217,6 +235,7 @@ __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -226,6 +245,7 @@ __TestNamespace_InputTagHelper2.Checked =    @(  DateTimeOffset.Now.Year  ) > 20
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
@@ -234,6 +254,7 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
    __o = someMethod(item => new Template(async(__razor_template_writer) => {
@@ -246,6 +267,7 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
 #line default
 #line hidden
 #nullable disable
+    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
     __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
@@ -254,6 +276,7 @@ __TestNamespace_PTagHelper.Age = 123;
 #line default
 #line hidden
 #nullable disable
+    await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 }
 ));
 
@@ -268,6 +291,7 @@ __TestNamespace_PTagHelper.Age = ;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 37 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
           
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
index f3ec2cf8fc..f3b69d6fd2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (787:15,37 [17] )
+Generated Location: (1195:20,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (36:2,1 [52] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
@@ -9,7 +9,7 @@ Source Location: (36:2,1 [52] TestFiles/IntegrationTests/CodeGenerationIntegrati
     var checkbox = "checkbox";
 
     |
-Generated Location: (1284:32,1 [52] )
+Generated Location: (1692:37,1 [52] )
 |if (true)
 {
     var checkbox = "checkbox";
@@ -18,39 +18,39 @@ Generated Location: (1284:32,1 [52] )
 
 Source Location: (147:7,16 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (1628:44,33 [1] )
+Generated Location: (2036:49,33 [1] )
 |@|
 
 Source Location: (149:7,18 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 ||
-Generated Location: (1629:44,34 [0] )
+Generated Location: (2037:49,34 [0] )
 ||
 
 Source Location: (149:7,18 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (1629:44,34 [1] )
+Generated Location: (2037:49,34 [1] )
 |@|
 
 Source Location: (150:7,19 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (1630:44,35 [1] )
+Generated Location: (2038:49,35 [1] )
 |(|
 
 Source Location: (151:7,20 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |1+2|
-Generated Location: (1631:44,36 [3] )
+Generated Location: (2039:49,36 [3] )
 |1+2|
 
 Source Location: (154:7,23 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (1634:44,39 [1] )
+Generated Location: (2042:49,39 [1] )
 |)|
 
 Source Location: (273:10,13 [43] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |if (false)
             {
                 |
-Generated Location: (1814:51,13 [43] )
+Generated Location: (2298:57,13 [43] )
 |if (false)
             {
                 |
@@ -61,7 +61,7 @@ Source Location: (399:12,99 [66] TestFiles/IntegrationTests/CodeGenerationIntegr
             else
             {
                 |
-Generated Location: (2572:65,99 [66] )
+Generated Location: (3208:73,99 [66] )
 |
             }
             else
@@ -70,224 +70,224 @@ Generated Location: (2572:65,99 [66] )
 
 Source Location: (495:16,46 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |checkbox|
-Generated Location: (3057:78,46 [8] )
+Generated Location: (3693:86,46 [8] )
 |checkbox|
 
 Source Location: (512:16,63 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |true|
-Generated Location: (3448:87,63 [4] )
+Generated Location: (4084:95,63 [4] )
 |true|
 
 Source Location: (523:16,74 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
                 |
-Generated Location: (3787:95,74 [18] )
+Generated Location: (4575:105,74 [18] )
 |
                 |
 
 Source Location: (556:17,31 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |true ? "checkbox" : "anything"|
-Generated Location: (4209:105,31 [30] )
+Generated Location: (4997:115,31 [30] )
 |true ? "checkbox" : "anything"|
 
 Source Location: (591:17,66 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
                 |
-Generated Location: (4625:114,66 [18] )
+Generated Location: (5489:125,66 [18] )
 |
                 |
 
 Source Location: (623:18,30 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |if(true) { |
-Generated Location: (5046:124,30 [11] )
+Generated Location: (5910:135,30 [11] )
 |if(true) { |
 
 Source Location: (655:18,62 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | } else { |
-Generated Location: (5284:131,62 [10] )
+Generated Location: (6148:142,62 [10] )
 | } else { |
 
 Source Location: (686:18,93 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | }|
-Generated Location: (5552:138,93 [2] )
+Generated Location: (6416:149,93 [2] )
 | }|
 
 Source Location: (690:18,97 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
             }|
-Generated Location: (5970:147,97 [15] )
+Generated Location: (6910:159,97 [15] )
 |
             }|
 
 Source Location: (212:8,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (6276:156,32 [12] )
+Generated Location: (7216:168,32 [12] )
 |DateTime.Now|
 
 Source Location: (832:22,14 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | var @object = false;|
-Generated Location: (6468:163,14 [21] )
+Generated Location: (7484:176,14 [21] )
 | var @object = false;|
 
 Source Location: (885:23,29 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (6904:172,42 [1] )
+Generated Location: (7920:185,42 [1] )
 |(|
 
 Source Location: (886:23,30 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@object|
-Generated Location: (6905:172,43 [7] )
+Generated Location: (7921:185,43 [7] )
 |@object|
 
 Source Location: (893:23,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (6912:172,50 [1] )
+Generated Location: (7928:185,50 [1] )
 |)|
 
 Source Location: (760:21,39 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year|
-Generated Location: (7212:180,38 [23] )
+Generated Location: (8304:194,38 [23] )
 |DateTimeOffset.Now.Year|
 
 Source Location: (783:21,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | -|
-Generated Location: (7235:180,61 [2] )
+Generated Location: (8327:194,61 [2] )
 | -|
 
 Source Location: (785:21,64 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | 1970|
-Generated Location: (7237:180,63 [5] )
+Generated Location: (8329:194,63 [5] )
 | 1970|
 
 Source Location: (1025:26,61 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (7676:189,60 [1] )
+Generated Location: (8844:204,60 [1] )
 |(|
 
 Source Location: (1026:26,62 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year > 2014|
-Generated Location: (7677:189,61 [30] )
+Generated Location: (8845:204,61 [30] )
 |DateTimeOffset.Now.Year > 2014|
 
 Source Location: (1056:26,92 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (7707:189,91 [1] )
+Generated Location: (8875:204,91 [1] )
 |)|
 
 Source Location: (928:25,16 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |-1970|
-Generated Location: (8002:197,33 [5] )
+Generated Location: (9246:213,33 [5] )
 |-1970|
 
 Source Location: (933:25,21 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | +|
-Generated Location: (8007:197,38 [2] )
+Generated Location: (9251:213,38 [2] )
 | +|
 
 Source Location: (935:25,23 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | |
-Generated Location: (8009:197,40 [1] )
+Generated Location: (9253:213,40 [1] )
 | |
 
 Source Location: (936:25,24 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (8010:197,41 [1] )
+Generated Location: (9254:213,41 [1] )
 |@|
 
 Source Location: (937:25,25 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year|
-Generated Location: (8011:197,42 [23] )
+Generated Location: (9255:213,42 [23] )
 |DateTimeOffset.Now.Year|
 
 Source Location: (1155:29,28 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year > 2014|
-Generated Location: (8450:206,42 [30] )
+Generated Location: (9770:223,42 [30] )
 |DateTimeOffset.Now.Year > 2014|
 
 Source Location: (1093:28,16 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year - 1970|
-Generated Location: (8774:214,33 [30] )
+Generated Location: (10170:232,33 [30] )
 |DateTimeOffset.Now.Year - 1970|
 
 Source Location: (1283:32,28 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |   |
-Generated Location: (9220:223,42 [3] )
+Generated Location: (10692:242,42 [3] )
 |   |
 
 Source Location: (1286:32,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (9223:223,45 [1] )
+Generated Location: (10695:242,45 [1] )
 |@|
 
 Source Location: (1287:32,32 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (9224:223,46 [1] )
+Generated Location: (10696:242,46 [1] )
 |(|
 
 Source Location: (1288:32,33 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |  DateTimeOffset.Now.Year  |
-Generated Location: (9225:223,47 [27] )
+Generated Location: (10697:242,47 [27] )
 |  DateTimeOffset.Now.Year  |
 
 Source Location: (1315:32,60 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (9252:223,74 [1] )
+Generated Location: (10724:242,74 [1] )
 |)|
 
 Source Location: (1316:32,61 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | >|
-Generated Location: (9253:223,75 [2] )
+Generated Location: (10725:242,75 [2] )
 | >|
 
 Source Location: (1318:32,63 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | 2014|
-Generated Location: (9255:223,77 [5] )
+Generated Location: (10727:242,77 [5] )
 | 2014|
 
 Source Location: (1323:32,68 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |   |
-Generated Location: (9260:223,82 [3] )
+Generated Location: (10732:242,82 [3] )
 |   |
 
 Source Location: (1220:31,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (9557:231,33 [1] )
+Generated Location: (11105:251,33 [1] )
 |(|
 
 Source Location: (1221:31,18 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |"My age is this long.".Length|
-Generated Location: (9558:231,34 [29] )
+Generated Location: (11106:251,34 [29] )
 |"My age is this long.".Length|
 
 Source Location: (1250:31,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (9587:231,63 [1] )
+Generated Location: (11135:251,63 [1] )
 |)|
 
 Source Location: (1355:34,9 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |someMethod(|
-Generated Location: (9763:238,9 [11] )
+Generated Location: (11387:259,9 [11] )
 |someMethod(|
 
 Source Location: (1410:34,64 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |checked|
-Generated Location: (10200:243,63 [7] )
+Generated Location: (11824:264,63 [7] )
 |checked|
 
 Source Location: (1375:34,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |123|
-Generated Location: (10493:251,33 [3] )
+Generated Location: (12185:273,33 [3] )
 |123|
 
 Source Location: (1424:34,78 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (10553:257,1 [1] )
+Generated Location: (12313:280,1 [1] )
 |)|
 
 Source Location: (1469:36,10 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
 }|
-Generated Location: (11024:272,10 [3] )
+Generated Location: (12860:296,10 [3] )
 |
 }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
index 1ca3b103ee..e0c1d6acf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
@@ -17,11 +17,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("world"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs
index e2060a3b1f..9b80cf8113 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.codegen.cs
@@ -18,11 +18,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_8 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", new global::Microsoft.AspNetCore.Html.HtmlString("2 TagHelper"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
index 786d7ea756..2075afda99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
@@ -32,6 +37,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "button";
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "button";
@@ -43,6 +49,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "button";
@@ -54,6 +61,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
@@ -62,6 +70,7 @@ __TestNamespace_PTagHelper.Age = 3;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
index 0d93eb694d..f59f79018f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (809:15,37 [17] )
+Generated Location: (1217:20,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (146:4,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |true|
-Generated Location: (2074:40,42 [4] )
+Generated Location: (2558:46,42 [4] )
 |true|
 
 Source Location: (222:5,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |true|
-Generated Location: (2654:51,42 [4] )
+Generated Location: (3214:58,42 [4] )
 |true|
 
 Source Location: (43:2,8 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |3|
-Generated Location: (2962:59,33 [1] )
+Generated Location: (3598:67,33 [1] )
 |3|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs
index 490f283767..d15f5b0ca3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.codegen.cs
@@ -18,11 +18,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("AGE", new global::Microsoft.AspNetCore.Html.HtmlString("40"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_8 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("Age", new global::Microsoft.AspNetCore.Html.HtmlString("500"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
index 4f58773c89..976fa497d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
         #pragma warning disable 219
@@ -39,6 +44,7 @@ __TestNamespace_InputTagHelper.Checked = true;
 #line hidden
 #nullable disable
             __TestNamespace_CatchAllTagHelper.Checked = __TestNamespace_InputTagHelper.Checked;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
index a73f5a033a..b4d7ec361d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (727:14,37 [17] )
+Generated Location: (1135:19,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (67:2,32 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml)
 |true|
-Generated Location: (1637:35,41 [4] )
+Generated Location: (2045:40,41 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs
index 83916da164..85a97f8875 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
index ba9c0b7eb9..0d54c019c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -34,6 +39,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
 #nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
@@ -70,6 +76,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
 #nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
@@ -86,6 +93,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
 #nullable restore
 #line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
@@ -186,6 +194,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
 #nullable restore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
@@ -208,6 +217,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
 #nullable restore
 #line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
@@ -244,6 +254,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
index fb3faa5204..27ed6fbeb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,155 +1,155 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (639:13,37 [17] )
+Generated Location: (1047:18,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (59:2,24 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (1271:31,24 [12] )
+Generated Location: (1679:36,24 [12] )
 |DateTime.Now|
 
 Source Location: (96:4,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (1577:39,17 [12] )
+Generated Location: (2061:45,17 [12] )
 |if (true) { |
 
 Source Location: (109:4,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (1792:46,30 [12] )
+Generated Location: (2276:52,30 [12] )
 |string.Empty|
 
 Source Location: (121:4,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (2020:53,42 [10] )
+Generated Location: (2504:59,42 [10] )
 | } else { |
 
 Source Location: (132:4,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (2256:60,53 [5] )
+Generated Location: (2740:66,53 [5] )
 |false|
 
 Source Location: (137:4,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (2493:67,58 [2] )
+Generated Location: (2977:73,58 [2] )
 | }|
 
 Source Location: (176:6,22 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (2793:75,22 [12] )
+Generated Location: (3353:82,22 [12] )
 |DateTime.Now|
 
 Source Location: (214:6,60 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (3105:83,60 [12] )
+Generated Location: (3665:90,60 [12] )
 |DateTime.Now|
 
 Source Location: (256:8,15 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |long.MinValue|
-Generated Location: (3409:91,15 [13] )
+Generated Location: (4045:99,15 [13] )
 |long.MinValue|
 
 Source Location: (271:8,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (3626:98,30 [12] )
+Generated Location: (4262:106,30 [12] )
 |if (true) { |
 
 Source Location: (284:8,43 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (3854:105,43 [12] )
+Generated Location: (4490:113,43 [12] )
 |string.Empty|
 
 Source Location: (296:8,55 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (4095:112,55 [10] )
+Generated Location: (4731:120,55 [10] )
 | } else { |
 
 Source Location: (307:8,66 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (4344:119,66 [5] )
+Generated Location: (4980:127,66 [5] )
 |false|
 
 Source Location: (312:8,71 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (4594:126,71 [2] )
+Generated Location: (5230:134,71 [2] )
 | }|
 
 Source Location: (316:8,75 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |int.MaxValue|
-Generated Location: (4844:133,75 [12] )
+Generated Location: (5480:141,75 [12] )
 |int.MaxValue|
 
 Source Location: (348:9,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |long.MinValue|
-Generated Location: (5114:141,17 [13] )
+Generated Location: (5750:149,17 [13] )
 |long.MinValue|
 
 Source Location: (363:9,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (5334:148,32 [12] )
+Generated Location: (5970:156,32 [12] )
 |if (true) { |
 
 Source Location: (376:9,45 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (5565:155,45 [12] )
+Generated Location: (6201:163,45 [12] )
 |string.Empty|
 
 Source Location: (388:9,57 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (5809:162,57 [10] )
+Generated Location: (6445:170,57 [10] )
 | } else { |
 
 Source Location: (399:9,68 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (6061:169,68 [5] )
+Generated Location: (6697:177,68 [5] )
 |false|
 
 Source Location: (404:9,73 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (6314:176,73 [2] )
+Generated Location: (6950:184,73 [2] )
 | }|
 
 Source Location: (408:9,77 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |int.MaxValue|
-Generated Location: (6567:183,77 [12] )
+Generated Location: (7203:191,77 [12] )
 |int.MaxValue|
 
 Source Location: (445:11,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |long.MinValue|
-Generated Location: (6874:191,17 [13] )
+Generated Location: (7586:200,17 [13] )
 |long.MinValue|
 
 Source Location: (460:11,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (7094:198,32 [12] )
+Generated Location: (7806:207,32 [12] )
 |DateTime.Now|
 
 Source Location: (492:11,64 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |int.MaxValue|
-Generated Location: (7345:205,64 [12] )
+Generated Location: (8057:214,64 [12] )
 |int.MaxValue|
 
 Source Location: (529:13,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (7652:213,17 [12] )
+Generated Location: (8440:223,17 [12] )
 |if (true) { |
 
 Source Location: (542:13,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (7868:220,30 [12] )
+Generated Location: (8656:230,30 [12] )
 |string.Empty|
 
 Source Location: (554:13,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (8097:227,42 [10] )
+Generated Location: (8885:237,42 [10] )
 | } else { |
 
 Source Location: (565:13,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (8334:234,53 [5] )
+Generated Location: (9122:244,53 [5] )
 |false|
 
 Source Location: (570:13,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (8572:241,58 [2] )
+Generated Location: (9360:251,58 [2] )
 | }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs
index a1f0c76bac..ddf57bb8cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.codegen.cs
@@ -9,11 +9,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_Runtime
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
index 34c56f0832..5b039be663 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
@@ -39,6 +44,7 @@ __TestNamespace_InputTagHelper2.Checked = ;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "";
@@ -50,6 +56,7 @@ __TestNamespace_InputTagHelper2.Checked = ;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
@@ -58,6 +65,7 @@ __TestNamespace_PTagHelper.Age = ;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
index d1f300d541..cc280e4a93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (802:15,38 [15] )
+Generated Location: (1210:20,38 [15] )
 |*, TestAssembly|
 
 Source Location: (66:3,26 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 ||
-Generated Location: (1698:36,42 [0] )
+Generated Location: (2106:41,42 [0] )
 ||
 
 Source Location: (126:5,30 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 ||
-Generated Location: (2264:47,42 [0] )
+Generated Location: (2748:53,42 [0] )
 ||
 
 Source Location: (92:4,12 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 ||
-Generated Location: (2564:55,33 [0] )
+Generated Location: (3124:62,33 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs
index 4c9ace1134..96c6a32b45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs
@@ -11,11 +11,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
index 44a0cfabe6..87e16e675a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
         #pragma warning disable 219
@@ -44,6 +49,7 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
@@ -53,6 +59,7 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
@@ -62,6 +69,7 @@ __TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Langua
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
@@ -78,6 +86,7 @@ __TestNamespace_CatchAllTagHelper.CatchAll = global::Microsoft.AspNetCore.Razor.
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
@@ -94,6 +103,7 @@ __TestNamespace_CatchAllTagHelper.CatchAll = enumValue;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
index 2c8365b953..e35a09a9a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
@@ -1,49 +1,49 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (707:14,37 [17] )
+Generated Location: (1115:19,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (37:2,2 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |
     var enumValue = MyEnum.MyValue;
 |
-Generated Location: (1202:31,2 [39] )
+Generated Location: (1610:36,2 [39] )
 |
     var enumValue = MyEnum.MyValue;
 |
 
 Source Location: (96:6,15 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyEnum.MyValue|
-Generated Location: (1651:41,39 [14] )
+Generated Location: (2059:46,39 [14] )
 |MyEnum.MyValue|
 
 Source Location: (131:7,15 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyEnum.MySecondValue|
-Generated Location: (2054:50,15 [20] )
+Generated Location: (2538:56,15 [20] )
 |MyEnum.MySecondValue|
 
 Source Location: (171:8,14 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyValue|
-Generated Location: (2580:59,132 [7] )
+Generated Location: (3140:66,132 [7] )
 |MyValue|
 
 Source Location: (198:9,14 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MySecondValue|
-Generated Location: (3094:68,132 [13] )
+Generated Location: (3730:76,132 [13] )
 |MySecondValue|
 
 Source Location: (224:9,40 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyValue|
-Generated Location: (3408:75,138 [7] )
+Generated Location: (4044:83,138 [7] )
 |MyValue|
 
 Source Location: (251:10,15 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |enumValue|
-Generated Location: (3829:84,39 [9] )
+Generated Location: (4541:93,39 [9] )
 |enumValue|
 
 Source Location: (274:10,38 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |enumValue|
-Generated Location: (4046:91,45 [9] )
+Generated Location: (4758:100,45 [9] )
 |enumValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
index 264b4af248..729513c20d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
@@ -9,11 +9,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_Runtime
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
index d0907fd099..c946206dea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
         #pragma warning disable 219
@@ -52,6 +57,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
index 716a9799a4..cf674d229b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (710:14,38 [15] )
+Generated Location: (1118:19,38 [15] )
 |*, TestAssembly|
 
 Source Location: (106:3,29 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (1234:31,29 [12] )
+Generated Location: (1642:36,29 [12] )
 |DateTime.Now|
 
 Source Location: (204:5,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (1670:40,51 [12] )
+Generated Location: (2078:45,51 [12] )
 |DateTime.Now|
 
 Source Location: (227:5,74 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |true|
-Generated Location: (2075:49,74 [4] )
+Generated Location: (2483:54,74 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs
index 06a2adfcde..792e0d3fc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_Runtime.codegen.cs
@@ -9,11 +9,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_Runtime
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
index 9c30af42df..cb611393a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -27,6 +32,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
         public async System.Threading.Tasks.Task ExecuteAsync()
         {
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
index 864eba25d4..2870e7556d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (617:13,37 [17] )
+Generated Location: (1025:18,37 [17] )
 |"*, TestAssembly"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs
index ed5360e018..262c864405 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs
index fd06ee3e25..ed77c73e5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -49,6 +54,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line hidden
 #nullable disable
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
                                
@@ -92,6 +98,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line hidden
 #nullable disable
         __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml"
               
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt
index 19c772b504..d5b99f4dfa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (619:13,37 [17] )
+Generated Location: (1027:18,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (35:1,2 [154] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
@@ -13,7 +13,7 @@ Source Location: (35:1,2 [154] TestFiles/IntegrationTests/CodeGenerationIntegrat
     void PrintName(Person person)
     {
         |
-Generated Location: (1132:30,2 [154] )
+Generated Location: (1540:35,2 [154] )
 |
     var people = new Person[]
     {
@@ -26,26 +26,26 @@ Generated Location: (1132:30,2 [154] )
 
 Source Location: (195:9,14 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |person.Name|
-Generated Location: (1480:45,14 [11] )
+Generated Location: (1888:50,14 [11] )
 |person.Name|
 
 Source Location: (212:9,31 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |
     }
 |
-Generated Location: (1774:53,31 [9] )
+Generated Location: (2258:59,31 [9] )
 |
     }
 |
 
 Source Location: (228:13,2 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 | PrintName(people[0]); |
-Generated Location: (1963:61,2 [23] )
+Generated Location: (2447:67,2 [23] )
 | PrintName(people[0]); |
 
 Source Location: (256:14,2 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 | await AnnounceBirthday(people[0]); |
-Generated Location: (2168:68,2 [36] )
+Generated Location: (2652:74,2 [36] )
 | await AnnounceBirthday(people[0]); |
 
 Source Location: (309:16,12 [106] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
@@ -54,7 +54,7 @@ Source Location: (309:16,12 [106] TestFiles/IntegrationTests/CodeGenerationInteg
     {
         var formatted = $"Mr. {person.Name}";
         |
-Generated Location: (2445:77,12 [106] )
+Generated Location: (2929:83,12 [106] )
 |
     Task AnnounceBirthday(Person person)
     {
@@ -63,14 +63,14 @@ Generated Location: (2445:77,12 [106] )
 
 Source Location: (455:21,33 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |formatted|
-Generated Location: (2764:88,33 [9] )
+Generated Location: (3248:94,33 [9] )
 |formatted|
 
 Source Location: (487:22,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |
 
         |
-Generated Location: (3035:96,14 [12] )
+Generated Location: (3591:103,14 [12] )
 |
 
         |
@@ -79,20 +79,20 @@ Source Location: (514:25,9 [66] TestFiles/IntegrationTests/CodeGenerationIntegra
 |for (var i = 0; i < person.Age / 10; i++)
         {
             |
-Generated Location: (3236:105,9 [66] )
+Generated Location: (3792:112,9 [66] )
 |for (var i = 0; i < person.Age / 10; i++)
         {
             |
 
 Source Location: (586:27,18 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |i|
-Generated Location: (3500:114,18 [1] )
+Generated Location: (4056:121,18 [1] )
 |i|
 
 Source Location: (609:27,41 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper.cshtml)
 |
         }|
-Generated Location: (3723:121,41 [11] )
+Generated Location: (4279:128,41 [11] )
 |
         }|
 
@@ -105,7 +105,7 @@ Source Location: (635:29,13 [106] TestFiles/IntegrationTests/CodeGenerationInteg
         }
 
         |
-Generated Location: (3927:129,13 [106] )
+Generated Location: (4483:136,13 [106] )
 |
 
         if (person.Age < 20)
@@ -127,7 +127,7 @@ Source Location: (764:36,31 [161] TestFiles/IntegrationTests/CodeGenerationInteg
         public int Age { get; set; }
     }
 |
-Generated Location: (4244:143,31 [161] )
+Generated Location: (4800:150,31 [161] )
 |
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs
index e47522dc58..6f01cf5fcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocksWithTagHelper_Runtime.codegen.cs
@@ -9,11 +9,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Markup_InCodeBlocksWithTagHelper_Runtime
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
index a7f71679e9..c2534fd226 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::DivTagHelper __DivTagHelper;
@@ -29,21 +34,28 @@ global::System.Object __typeHelper = "*, TestAssembly";
         public async System.Threading.Tasks.Task ExecuteAsync()
         {
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __TestNamespace_InputTagHelper.BoundRequiredString = "hello";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __TestNamespace_CatchAllTagHelper.BoundRequiredString = "world";
             __TestNamespace_InputTagHelper.BoundRequiredString = "hello2";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __TestNamespace_InputTagHelper.BoundRequiredString = "world";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
             __DivTagHelper.BoundBoolProp = true;
             __DivTagHelper.BoolDictProp["key"] = true;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
index e8d92fb65c..42530b4c60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (771:15,37 [17] )
+Generated Location: (1179:20,37 [17] )
 |"*, TestAssembly"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs
index df5a1eb99e..22d33b83e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.codegen.cs
@@ -16,11 +16,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlString("hello2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-bound-required-string", "world", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
index d1f6fecd40..b59604d45f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
@@ -54,6 +59,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
                          
@@ -63,6 +69,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line hidden
 #nullable disable
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
index 1c67db87bf..aa83001579 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (803:15,37 [17] )
+Generated Location: (1211:20,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (195:5,13 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |for(var i = 0; i < 5; i++) {
                 |
-Generated Location: (1320:32,13 [46] )
+Generated Location: (1728:37,13 [46] )
 |for(var i = 0; i < 5; i++) {
                 |
 
 Source Location: (339:7,50 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |ViewBag.DefaultInterval|
-Generated Location: (1796:42,50 [23] )
+Generated Location: (2204:47,50 [23] )
 |ViewBag.DefaultInterval|
 
 Source Location: (389:7,100 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |true|
-Generated Location: (2240:51,100 [4] )
+Generated Location: (2648:56,100 [4] )
 |true|
 
 Source Location: (422:8,25 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |
             }|
-Generated Location: (2442:58,25 [15] )
+Generated Location: (2926:64,25 [15] )
 |
             }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
index 0be73652e6..6080615b18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-delay", new global::Microsoft.AspNetCore.Html.HtmlString("1000"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
index 1d15281689..bb5e833228 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::SpanTagHelper __SpanTagHelper;
         private global::DivTagHelper __DivTagHelper;
         private global::InputTagHelper __InputTagHelper;
@@ -29,9 +34,12 @@ global::System.Object __typeHelper = "*, TestAssembly";
         public async System.Threading.Tasks.Task ExecuteAsync()
         {
             __SpanTagHelper = CreateTagHelper<global::SpanTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
             __InputTagHelper.FooProp = "Hello";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
index 049fa3812b..2d0933aae5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (702:15,38 [15] )
+Generated Location: (1110:20,38 [15] )
 |*, TestAssembly|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs
index d7752b8aca..5022ab7a5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("unbound", new global::Microsoft.AspNetCore.Html.HtmlString("foo"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
index 15438555be..18c7aff3dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.InputTagHelper1 __TestNamespace_InputTagHelper1;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
         #pragma warning disable 219
@@ -61,6 +66,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
 #line hidden
 #nullable disable
             __TestNamespace_InputTagHelper2.StringDictionaryProperty = __TestNamespace_InputTagHelper1.StringDictionaryProperty;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -87,6 +93,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
 #line hidden
 #nullable disable
             __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -126,6 +133,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37;
 #nullable disable
             __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"] = string.Empty;
             __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"];
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
 #nullable restore
@@ -138,6 +146,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"] = 37;
             __TestNamespace_InputTagHelper2.IntDictionaryProperty["value"] = __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"];
             __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"] = "string";
             __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"];
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
index 240afcc5df..ca03f84581 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (731:14,37 [17] )
+Generated Location: (1139:19,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (37:2,2 [242] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
@@ -15,7 +15,7 @@ Source Location: (37:2,2 [242] TestFiles/IntegrationTests/CodeGenerationIntegrat
         { "name", "value" },
     };
 |
-Generated Location: (1239:31,2 [242] )
+Generated Location: (1647:36,2 [242] )
 |
     var literate = "or illiterate";
     var intDictionary = new Dictionary<string, int>
@@ -30,51 +30,51 @@ Generated Location: (1239:31,2 [242] )
 
 Source Location: (370:15,43 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |intDictionary|
-Generated Location: (1920:49,56 [13] )
+Generated Location: (2328:54,56 [13] )
 |intDictionary|
 
 Source Location: (404:15,77 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |stringDictionary|
-Generated Location: (2310:57,77 [16] )
+Generated Location: (2718:62,77 [16] )
 |stringDictionary|
 
 Source Location: (468:16,43 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |intDictionary|
-Generated Location: (2898:67,56 [13] )
+Generated Location: (3382:73,56 [13] )
 |intDictionary|
 
 Source Location: (502:16,77 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |37|
-Generated Location: (3288:75,77 [2] )
+Generated Location: (3772:81,77 [2] )
 |37|
 
 Source Location: (526:16,101 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |42|
-Generated Location: (3711:83,101 [2] )
+Generated Location: (4195:89,101 [2] )
 |42|
 
 Source Location: (590:18,31 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |42|
-Generated Location: (4270:93,46 [2] )
+Generated Location: (4830:100,46 [2] )
 |42|
 
 Source Location: (611:18,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |37|
-Generated Location: (4637:101,64 [2] )
+Generated Location: (5197:108,64 [2] )
 |37|
 
 Source Location: (634:18,75 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |98|
-Generated Location: (5030:109,75 [2] )
+Generated Location: (5590:116,75 [2] )
 |98|
 
 Source Location: (783:20,42 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |literate|
-Generated Location: (5850:121,42 [8] )
+Generated Location: (6410:128,42 [8] )
 |literate|
 
 Source Location: (826:21,29 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |37|
-Generated Location: (6552:132,65 [2] )
+Generated Location: (7188:140,65 [2] )
 |37|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
index 08a94f8f44..c89db0cc65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
@@ -16,11 +16,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("string-prefix-paprika", "another string", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("string-prefix-thyme", "string", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
index 1ad3a7830d..87b3afd5e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTagHelper __InputTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -28,6 +33,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
         {
             __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
             __InputTagHelper.FooProp = "Hello";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
index 9593c67dea..7e793d4e74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (592:13,38 [15] )
+Generated Location: (1000:18,38 [15] )
 |*, TestAssembly|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs
index 4d5cd87159..19acd28d61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.codegen.cs
@@ -11,11 +11,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("value", "Hello", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
index 0935d3a6e2..2262179514 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -34,6 +39,7 @@ __TestNamespace_PTagHelper.Age = 1337;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
index 10a7afd1c9..18be9514bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml)
 |"*, TestAssembly"|
-Generated Location: (663:13,37 [17] )
+Generated Location: (1071:18,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (67:3,28 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml)
 |1337|
-Generated Location: (1312:31,33 [4] )
+Generated Location: (1720:36,33 [4] )
 |1337|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs
index 2a91ccf643..90685cd489 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
index 2217a4f90f..730bac6f29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -34,6 +39,7 @@ __TestNamespace_PTagHelper.Age = 1337;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
index 4fc0cd4c8e..5d033dece6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (609:13,37 [17] )
+Generated Location: (1017:18,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (63:2,28 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml)
 |1337|
-Generated Location: (1231:31,33 [4] )
+Generated Location: (1639:36,33 [4] )
 |1337|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs
index ac037abbb1..f72f804484 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("Hello World"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
index 2175a523ab..38be520e24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -34,6 +39,7 @@ __TestNamespace_CatchAllTagHelper.ListItems = items;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
@@ -42,6 +48,7 @@ __TestNamespace_CatchAllTagHelper.ArrayItems = items;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
 #line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
@@ -50,6 +57,7 @@ __TestNamespace_CatchAllTagHelper.Event1 = doSomething();
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #nullable restore
 #line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
@@ -58,11 +66,15 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __TestNamespace_CatchAllTagHelper.StringProperty1 = "value";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __TestNamespace_CatchAllTagHelper.StringProperty2 = "value";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
index 37301c4302..d7873fb744 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |*, TestAssembly|
-Generated Location: (636:13,38 [15] )
+Generated Location: (1044:18,38 [15] )
 |*, TestAssembly|
 
 Source Location: (302:11,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |items|
-Generated Location: (1291:31,46 [5] )
+Generated Location: (1699:36,46 [5] )
 |items|
 
 Source Location: (351:12,20 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |items|
-Generated Location: (1622:39,47 [5] )
+Generated Location: (2106:45,47 [5] )
 |items|
 
 Source Location: (405:13,23 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |doSomething()|
-Generated Location: (1949:47,43 [13] )
+Generated Location: (2509:54,43 [13] )
 |doSomething()|
 
 Source Location: (487:14,24 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |doSomething()|
-Generated Location: (2284:55,43 [13] )
+Generated Location: (2920:63,43 [13] )
 |doSomething()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs
index 187ebaa6a6..697cafafff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.codegen.cs
@@ -17,11 +17,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#local", "value", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#local", new global::Microsoft.AspNetCore.Html.HtmlString("value"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
index 7c12b772e5..b350afaf40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.MyTagHelper __TestNamespace_MyTagHelper;
         private global::TestNamespace.NestedTagHelper __TestNamespace_NestedTagHelper;
         #pragma warning disable 219
@@ -64,6 +69,7 @@ global::System.Object nestedsection = null;
 #line hidden
 #nullable disable
                 __TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
                 __TestNamespace_MyTagHelper = CreateTagHelper<global::TestNamespace.MyTagHelper>();
 #nullable restore
 #line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
@@ -80,7 +86,9 @@ global::System.Object nestedsection = null;
 #line default
 #line hidden
 #nullable disable
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
                 __TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
index c22fb1f9dd..42f3b53424 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
@@ -1,39 +1,39 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |"*, TestAssembly"|
-Generated Location: (707:14,37 [17] )
+Generated Location: (1115:19,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (82:6,9 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |MySection|
-Generated Location: (973:24,22 [9] )
+Generated Location: (1381:29,22 [9] )
 |MySection|
 
 Source Location: (388:14,13 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |nestedsection|
-Generated Location: (1239:34,22 [13] )
+Generated Location: (1647:39,22 [13] )
 |nestedsection|
 
 Source Location: (37:2,2 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |
     var code = "some code";
 |
-Generated Location: (1742:51,2 [31] )
+Generated Location: (2150:56,2 [31] )
 |
     var code = "some code";
 |
 
 Source Location: (313:10,56 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |code|
-Generated Location: (2069:60,56 [4] )
+Generated Location: (2477:65,56 [4] )
 |code|
 
 Source Location: (157:8,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |DateTime.Now|
-Generated Location: (2501:69,51 [12] )
+Generated Location: (2989:75,51 [12] )
 |DateTime.Now|
 
 Source Location: (203:8,97 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |DateTime.Now|
-Generated Location: (2852:77,97 [12] )
+Generated Location: (3340:83,97 [12] )
 |DateTime.Now|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
index 4ec7e5dd25..edc37eb1e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
@@ -9,11 +9,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersInSection_Runtime
     {
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
index 346627dfdf..bb24a4e6cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTagHelper __InputTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -35,6 +40,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line hidden
 #nullable disable
             __InputTagHelper.BoundProp = string.Empty;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
index d9fa738e43..b9e407e704 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
 |*, TestAssembly|
-Generated Location: (618:13,38 [15] )
+Generated Location: (1026:18,38 [15] )
 |*, TestAssembly|
 
 Source Location: (57:2,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
 |Hello|
-Generated Location: (1218:31,18 [5] )
+Generated Location: (1626:36,18 [5] )
 |Hello|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs
index 20611de088..7965f8cdbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs
index 2c6b661cbb..e4c7c9faf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithDataDashAttributes_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTagHelper __InputTagHelper;
         private global::DivTagHelper __DivTagHelper;
         #pragma warning disable 219
@@ -29,6 +34,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
         {
             __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
             __InputTagHelper.BoundProp = "hello";
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
 #nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
@@ -44,6 +50,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
 #nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml"
                                                        __o = foo;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt
index bfce560156..d4c4b87de2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
 |*, TestAssembly|
-Generated Location: (678:14,38 [15] )
+Generated Location: (1086:19,38 [15] )
 |*, TestAssembly|
 
 Source Location: (111:3,15 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
 |foo|
-Generated Location: (1400:34,15 [3] )
+Generated Location: (1884:40,15 [3] )
 |foo|
 
 Source Location: (126:3,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
 |bar|
-Generated Location: (1613:41,30 [3] )
+Generated Location: (2097:47,30 [3] )
 |bar|
 
 Source Location: (225:4,61 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes.cshtml)
 |foo|
-Generated Location: (1857:48,61 [3] )
+Generated Location: (2417:55,61 [3] )
 |foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs
index 4de77bd981..363ecea82c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithDataDashAttributes_Runtime.codegen.cs
@@ -14,11 +14,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-three", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-four", new global::Microsoft.AspNetCore.Html.HtmlString(""), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
index 67b895feb8..62cb6098ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::InputTagHelper __InputTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -45,6 +50,7 @@ global::System.Object __typeHelper = "cool:";
 #line hidden
 #nullable disable
             __InputTagHelper.BoundProp = string.Empty;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
index e8d9aa5ec4..cebc5962cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
 |*, TestAssembly|
-Generated Location: (600:13,38 [15] )
+Generated Location: (1008:18,38 [15] )
 |*, TestAssembly|
 
 Source Location: (48:1,17 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
 |cool:|
-Generated Location: (882:23,38 [5] )
+Generated Location: (1290:28,38 [5] )
 |cool:|
 
 Source Location: (86:3,23 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
 |Hello|
-Generated Location: (1468:41,23 [5] )
+Generated Location: (1876:46,23 [5] )
 |Hello|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs
index 433ab5477b..a91161ce3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", new global::Microsoft.AspNetCore.Html.HtmlString("text"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
index c92d670f37..8d7c885bce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::DivTagHelper __DivTagHelper;
         private global::InputTagHelper __InputTagHelper;
         #pragma warning disable 219
@@ -46,7 +51,9 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line hidden
 #nullable disable
                 __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             }
             )
 #nullable restore
@@ -58,6 +65,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
 #line hidden
 #nullable disable
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
index bb29992ce2..e66ab1a080 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
 |"*, TestAssembly"|
-Generated Location: (657:14,37 [17] )
+Generated Location: (1065:19,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (333:12,6 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
@@ -8,7 +8,7 @@ Source Location: (333:12,6 [66] TestFiles/IntegrationTests/CodeGenerationIntegra
         RenderTemplate(
             "Template: ",
             |
-Generated Location: (1165:31,6 [66] )
+Generated Location: (1573:36,6 [66] )
 |
         RenderTemplate(
             "Template: ",
@@ -16,13 +16,13 @@ Generated Location: (1165:31,6 [66] )
 
 Source Location: (427:15,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
 |item|
-Generated Location: (1511:42,40 [4] )
+Generated Location: (1919:47,40 [4] )
 |item|
 
 Source Location: (482:15,95 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
 |);
     |
-Generated Location: (1965:53,95 [8] )
+Generated Location: (2533:60,95 [8] )
 |);
     |
 
@@ -35,7 +35,7 @@ Source Location: (47:2,12 [268] TestFiles/IntegrationTests/CodeGenerationIntegra
         helperResult.WriteTo(Output, HtmlEncoder);
     }
 |
-Generated Location: (2274:64,12 [268] )
+Generated Location: (2918:72,12 [268] )
 |
     public void RenderTemplate(string title, Func<string, HelperResult> template)
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs
index e27d68d83b..5d918c6a7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.codegen.cs
@@ -12,11 +12,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("checked", new global::Microsoft.AspNetCore.Html.HtmlString("true"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("condition", new global::Microsoft.AspNetCore.Html.HtmlString("true"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
index 5c20aac0f0..2940a1e2be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2;
@@ -43,10 +48,12 @@ __TestNamespace_PTagHelper.Age = 1337;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "text";
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
@@ -55,10 +62,12 @@ __TestNamespace_PTagHelper.Age = 1234;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
             __TestNamespace_InputTagHelper.Type = "password";
             __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
index ecd160b96c..f37aba9dd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |"*, TestAssembly"|
-Generated Location: (827:15,37 [17] )
+Generated Location: (1235:20,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (74:5,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |1337|
-Generated Location: (1471:33,33 [4] )
+Generated Location: (1879:38,33 [4] )
 |1337|
 
 Source Location: (99:6,19 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |true|
-Generated Location: (1679:40,19 [4] )
+Generated Location: (2087:45,19 [4] )
 |true|
 
 Source Location: (186:10,11 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |1234|
-Generated Location: (2353:52,33 [4] )
+Generated Location: (2913:59,33 [4] )
 |1234|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
index f0d4d3d1ac..2a566574c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
@@ -15,11 +15,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "password", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("blah"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
index cf1f4ecedb..60cfd883ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
@@ -5,6 +5,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     #line hidden
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_DesignTime
     {
+        #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
@@ -43,6 +48,7 @@ __TestNamespace_PTagHelper.Age = 1337;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
@@ -58,6 +64,7 @@ __TestNamespace_PTagHelper.Age = 42;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
@@ -66,6 +73,7 @@ __TestNamespace_PTagHelper.Age = 42 + @int;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
@@ -74,6 +82,7 @@ __TestNamespace_PTagHelper.Age = int;
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
@@ -82,6 +91,7 @@ __TestNamespace_PTagHelper.Age = (@int);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
 #nullable restore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
@@ -97,6 +107,7 @@ __TestNamespace_PTagHelper.Age = 4 * @(@int + 2);
 #line default
 #line hidden
 #nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
index 9bd891b1a5..3fda9ddd67 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |"*, TestAssembly"|
-Generated Location: (643:13,37 [17] )
+Generated Location: (1051:18,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (35:1,2 [59] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
@@ -8,7 +8,7 @@ Source Location: (35:1,2 [59] TestFiles/IntegrationTests/CodeGenerationIntegrati
     var @class = "container-fluid";
     var @int = 1;
 |
-Generated Location: (1156:30,2 [59] )
+Generated Location: (1564:35,2 [59] )
 | 
     var @class = "container-fluid";
     var @int = 1;
@@ -16,101 +16,101 @@ Generated Location: (1156:30,2 [59] )
 
 Source Location: (122:6,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |1337|
-Generated Location: (1520:40,33 [4] )
+Generated Location: (1928:45,33 [4] )
 |1337|
 
 Source Location: (157:7,12 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@class|
-Generated Location: (1811:48,12 [6] )
+Generated Location: (2295:54,12 [6] )
 |@class|
 
 Source Location: (171:7,26 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |42|
-Generated Location: (2030:55,33 [2] )
+Generated Location: (2514:61,33 [2] )
 |42|
 
 Source Location: (202:8,21 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |42|
-Generated Location: (2340:63,33 [2] )
+Generated Location: (2900:70,33 [2] )
 |42|
 
 Source Location: (204:8,23 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | +|
-Generated Location: (2342:63,35 [2] )
+Generated Location: (2902:70,35 [2] )
 | +|
 
 Source Location: (206:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | |
-Generated Location: (2344:63,37 [1] )
+Generated Location: (2904:70,37 [1] )
 | |
 
 Source Location: (207:8,26 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@|
-Generated Location: (2345:63,38 [1] )
+Generated Location: (2905:70,38 [1] )
 |@|
 
 Source Location: (208:8,27 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |int|
-Generated Location: (2346:63,39 [3] )
+Generated Location: (2906:70,39 [3] )
 |int|
 
 Source Location: (241:9,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |int|
-Generated Location: (2658:71,33 [3] )
+Generated Location: (3294:79,33 [3] )
 |int|
 
 Source Location: (274:10,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |(|
-Generated Location: (2970:79,33 [1] )
+Generated Location: (3682:88,33 [1] )
 |(|
 
 Source Location: (275:10,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@int|
-Generated Location: (2971:79,34 [4] )
+Generated Location: (3683:88,34 [4] )
 |@int|
 
 Source Location: (279:10,27 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |)|
-Generated Location: (2975:79,38 [1] )
+Generated Location: (3687:88,38 [1] )
 |)|
 
 Source Location: (307:11,19 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@class|
-Generated Location: (3271:87,19 [6] )
+Generated Location: (4059:97,19 [6] )
 |@class|
 
 Source Location: (321:11,33 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |4|
-Generated Location: (3491:94,33 [1] )
+Generated Location: (4279:104,33 [1] )
 |4|
 
 Source Location: (322:11,34 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | *|
-Generated Location: (3492:94,34 [2] )
+Generated Location: (4280:104,34 [2] )
 | *|
 
 Source Location: (324:11,36 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | |
-Generated Location: (3494:94,36 [1] )
+Generated Location: (4282:104,36 [1] )
 | |
 
 Source Location: (325:11,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@|
-Generated Location: (3495:94,37 [1] )
+Generated Location: (4283:104,37 [1] )
 |@|
 
 Source Location: (326:11,38 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |(|
-Generated Location: (3496:94,38 [1] )
+Generated Location: (4284:104,38 [1] )
 |(|
 
 Source Location: (327:11,39 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@int + 2|
-Generated Location: (3497:94,39 [8] )
+Generated Location: (4285:104,39 [8] )
 |@int + 2|
 
 Source Location: (335:11,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |)|
-Generated Location: (3505:94,47 [1] )
+Generated Location: (4293:104,47 [1] )
 |)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
index 92f6922618..61b22048dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
@@ -10,11 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("test"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
+        #pragma warning disable 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        #pragma warning restore 0649
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
         #pragma warning restore 0169
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
-        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
         private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
         {

From b5a7daba2b8ffbffe722765b4e2811695350a6e2 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 17 May 2019 13:14:41 -0700
Subject: [PATCH 156/337] Do build time discovery of MVC ApplicationParts
 (dotnet/aspnetcore-tooling#598)

* Do build time discovery of MVC ApplicationParts
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e79d5600f7c173198ec6974aab3729730316a7d2
---
 .../src/AssemblyItem.cs                       |  14 ++
 .../src/Microsoft.NET.Sdk.Razor.csproj        |  10 +-
 .../src/ReferenceResolver.cs                  | 169 ++++++++++++++++
 .../src/ResolveAssemblyWithReferences.cs      |  55 ++++++
 ...Razor.MvcApplicationPartsDiscovery.targets |  90 +++++++++
 .../Sdk.Razor.CurrentVersion.targets          |   4 +-
 ...ApplicationPartDiscoveryIntegrationTest.cs | 115 +++++++++++
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |   2 +-
 .../test/ReferenceResolverTest.cs             | 181 ++++++++++++++++++
 .../ApplicationPartAttribute.cs               |  13 ++
 .../test/testassets/Directory.Build.props     |   5 +
 .../LargeProject/LargeProject.csproj          |   1 -
 12 files changed, 653 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ApplicationPartAttribute.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs
new file mode 100644
index 0000000000..1f57029bf0
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class AssemblyItem
+    {
+        public string Path { get; set; }
+
+        public bool IsSystemReference { get; set; }
+
+        public string AssemblyName { get; set; }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index ca4b3e0593..436cad2245 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
-    <TargetFrameworks>netcoreapp3.0;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net46</TargetFrameworks>
 
     <TargetName>Microsoft.NET.Sdk.Razor.Tasks</TargetName>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
@@ -17,8 +17,9 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" Condition="'$(TargetFramework)'=='net46'" />
 
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netstandard2.0'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
   </ItemGroup>
 
@@ -54,7 +55,10 @@
 
     <ItemGroup>
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
-      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netstandard2.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netcoreapp3.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\System.Collections.Immutable.dll" />
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\System.Reflection.Metadata.dll" />
     </ItemGroup>
 
     <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" SkipUnchangedFiles="true">
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
new file mode 100644
index 0000000000..657e9432cf
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
@@ -0,0 +1,169 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    /// <summary>
+    /// Resolves assemblies that reference one of the specified "targetAssemblies" either directly or transitively.
+    /// </summary>
+    public class ReferenceResolver
+    {
+        private readonly HashSet<string> _mvcAssemblies;
+        private readonly Dictionary<string, ClassifiedAssemblyItem> _lookup = new Dictionary<string, ClassifiedAssemblyItem>(StringComparer.Ordinal);
+
+        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<AssemblyItem> assemblyItems)
+        {
+            _mvcAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
+
+            foreach (var item in assemblyItems)
+            {
+                var classifiedItem = new ClassifiedAssemblyItem(item);
+                _lookup[item.AssemblyName] = classifiedItem;
+            }
+        }
+
+        public IReadOnlyList<string> ResolveAssemblies()
+        {
+            var applicationParts = new List<string>();
+            foreach (var item in _lookup)
+            {
+                var classification = Resolve(item.Value);
+                if (classification == DependencyClassification.ReferencesMvc)
+                {
+                    applicationParts.Add(item.Key);
+                }
+
+                // It's not interesting for us to know if a dependency has a classification of MvcReference.
+                // All applications targeting the Microsoft.AspNetCore.App will have have a reference to Mvc.
+            }
+
+            return applicationParts;
+        }
+
+        private DependencyClassification Resolve(ClassifiedAssemblyItem classifiedItem)
+        {
+            if (classifiedItem.DependencyClassification != DependencyClassification.Unknown)
+            {
+                return classifiedItem.DependencyClassification;
+            }
+
+            if (classifiedItem.AssemblyItem == null)
+            {
+                // We encountered a dependency that isn't part of this assembly's dependency set. We'll see if it happens to be an MVC assembly.
+                // This might be useful in scenarios where the app does not have a framework reference at the entry point,
+                // but the transitive dependency does.
+                classifiedItem.DependencyClassification = _mvcAssemblies.Contains(classifiedItem.Name) ?
+                    DependencyClassification.MvcReference :
+                    DependencyClassification.DoesNotReferenceMvc;
+
+                return classifiedItem.DependencyClassification;
+            }
+
+            if (classifiedItem.AssemblyItem.IsSystemReference)
+            {
+                // We do not allow transitive references to MVC via a framework reference to count.
+                // e.g. depending on Microsoft.AspNetCore.SomeThingNewThatDependsOnMvc would not result in an assembly being treated as
+                // referencing MVC.
+                classifiedItem.DependencyClassification = _mvcAssemblies.Contains(classifiedItem.Name) ?
+                    DependencyClassification.MvcReference :
+                    DependencyClassification.DoesNotReferenceMvc;
+
+                return classifiedItem.DependencyClassification;
+            }
+
+            if (_mvcAssemblies.Contains(classifiedItem.Name))
+            {
+                classifiedItem.DependencyClassification = DependencyClassification.MvcReference;
+                return classifiedItem.DependencyClassification;
+            }
+
+            var dependencyClassification = DependencyClassification.DoesNotReferenceMvc;
+            foreach (var assemblyItem in GetReferences(classifiedItem.AssemblyItem.Path))
+            {
+                var classification = Resolve(assemblyItem);
+                if (classification == DependencyClassification.MvcReference || classification == DependencyClassification.ReferencesMvc)
+                {
+                    dependencyClassification = DependencyClassification.ReferencesMvc;
+                    break;
+                }
+            }
+
+            classifiedItem.DependencyClassification = dependencyClassification;
+            return dependencyClassification;
+        }
+
+        protected virtual IReadOnlyList<ClassifiedAssemblyItem> GetReferences(string file)
+        {
+            try
+            {
+                using var peReader = new PEReader(File.OpenRead(file));
+                if (!peReader.HasMetadata)
+                {
+                    return Array.Empty<ClassifiedAssemblyItem>(); // not a managed assembly
+                }
+
+                var metadataReader = peReader.GetMetadataReader();
+
+                var assemblyItems = new List<ClassifiedAssemblyItem>();
+                foreach (var handle in metadataReader.AssemblyReferences)
+                {
+                    var reference = metadataReader.GetAssemblyReference(handle);
+                    var referenceName = metadataReader.GetString(reference.Name);
+
+                    if (_lookup.TryGetValue(referenceName, out var classifiedItem))
+                    {
+                        assemblyItems.Add(classifiedItem);
+                    }
+                    else
+                    {
+                        // A dependency references an item that isn't referenced by this project.
+                        // We'll construct an item for so that we can calculate the classification based on it's name.
+                        assemblyItems.Add(new ClassifiedAssemblyItem(referenceName));
+                    }
+                }
+
+                return assemblyItems;
+            }
+            catch (BadImageFormatException)
+            {
+                // not a PE file, or invalid metadata
+            }
+
+            return Array.Empty<ClassifiedAssemblyItem>(); // not a managed assembly
+        }
+
+        protected enum DependencyClassification
+        {
+            Unknown,
+            DoesNotReferenceMvc,
+            ReferencesMvc,
+            MvcReference,
+        }
+
+        protected class ClassifiedAssemblyItem
+        {
+            public ClassifiedAssemblyItem(AssemblyItem classifiedItem)
+                : this(classifiedItem.AssemblyName)
+            {
+                AssemblyItem = classifiedItem;
+            }
+
+            public ClassifiedAssemblyItem(string name)
+            {
+                Name = name;
+            }
+
+            public string Name { get; }
+
+            public AssemblyItem AssemblyItem { get; }
+
+            public DependencyClassification DependencyClassification { get; set; }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs
new file mode 100644
index 0000000000..3727e01088
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs
@@ -0,0 +1,55 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class FindAssembliesWithReferencesTo : Task
+    {
+        [Required]
+        public ITaskItem[] TargetAssemblyNames { get; set; }
+
+        [Required]
+        public ITaskItem[] Assemblies { get; set; }
+
+        [Output]
+        public string[] ResolvedAssemblies { get; set; }
+
+        public override bool Execute()
+        {
+            var referenceItems = new List<AssemblyItem>();
+            foreach (var item in Assemblies)
+            {
+                const string FusionNameKey = "FusionName";
+                var fusionName = item.GetMetadata(FusionNameKey);
+                if (string.IsNullOrEmpty(fusionName))
+                {
+                    Log.LogError($"Missing required metadata '{FusionNameKey}' for '{item.ItemSpec}.");
+                    return false;
+                }
+
+                var assemblyName = new AssemblyName(fusionName).Name;
+                referenceItems.Add(new AssemblyItem
+                {
+                    AssemblyName = assemblyName,
+                    IsSystemReference = item.GetMetadata("IsSystemReference") == "true",
+                    Path = item.ItemSpec,
+                });
+            }
+
+            var targetAssemblyNames = TargetAssemblyNames.Select(s => s.ItemSpec).ToList();
+
+            var provider = new ReferenceResolver(targetAssemblyNames, referenceItems);
+            var assemblyNames = provider.ResolveAssemblies();
+
+            ResolvedAssemblies = assemblyNames.ToArray();
+
+            return !Log.HasLoggedErrors;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
new file mode 100644
index 0000000000..43a1fbc8db
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
@@ -0,0 +1,90 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.ApplicationPartsDiscovery
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.FindAssembliesWithReferencesTo"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
+  <PropertyGroup>
+    <GenerateMvcApplicationPartsAttribute Condition="'$(GenerateMvcApplicationPartsAssemblyAttributes)' == '' AND '$(OutputType)' == 'Exe'">true</GenerateMvcApplicationPartsAttribute>
+
+    <CoreCompileDependsOn Condition="'$(GenerateMvcApplicationPartsAttribute)' == 'true' AND '$(DesignTimeBuild)' != 'true'">
+      _DiscoverMvcApplicationParts;
+      $(CoreCompileDependsOn);
+    </CoreCompileDependsOn>
+
+    <_MvcApplicationPartAttributeGeneratedFile>$(IntermediateOutputPath)$(TargetName).MvcApplicationPartsAssemblyInfo$(DefaultLanguageSourceExtension)</_MvcApplicationPartAttributeGeneratedFile>
+  </PropertyGroup>
+
+  <Target
+    Name="_DiscoverMvcApplicationParts"
+    Inputs="$(ProjectAssetsFile);$(MSBuildAllProjects)"
+    Outputs="$(_MvcApplicationPartAttributeGeneratedFile)"
+    DependsOnTargets="ResolveAssemblyReferences">
+
+    <ItemGroup>
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Abstractions" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.ApiExplorer" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Core" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Cors" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.DataAnnotations" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Formatters.Json" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Localization" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.Razor" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.RazorPages" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.TagHelpers" />
+      <_MvcAssemblyName Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
+    </ItemGroup>
+
+    <FindAssembliesWithReferencesTo Assemblies="@(ReferencePath)" TargetAssemblyNames="@(_MvcAssemblyName)">
+      <Output TaskParameter="ResolvedAssemblies" ItemName="_ApplicationPartAssemblyNames"/>
+    </FindAssembliesWithReferencesTo>
+
+    <ItemGroup>
+       <_MvcApplicationPartAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute">
+        <_Parameter1>%(_ApplicationPartAssemblyNames.Identity)</_Parameter1>
+      </_MvcApplicationPartAttribute>
+    </ItemGroup>
+
+    <!-- If we found application part assemblies, generate attributes for it and add it to compilation list -->
+    <WriteCodeFragment
+      AssemblyAttributes="@(_MvcApplicationPartAttribute)"
+      Language="$(Language)"
+      OutputFile="$(_MvcApplicationPartAttributeGeneratedFile)"
+      Condition="'@(_ApplicationPartAssemblyNames->Count())' != '0'" />
+
+    <ItemGroup Condition="'@(_ApplicationPartAssemblyNames->Count())' != '0'">
+      <Compile Remove="$(_MvcApplicationPartAttributeGeneratedFile)" Condition="'$(Language)'!='F#'" />
+      <Compile Include="$(_MvcApplicationPartAttributeGeneratedFile)"  Condition="'$(Language)'!='F#'" />
+
+      <CompileBefore Remove="$(_MvcApplicationPartAttributeGeneratedFile)" Condition="'$(Language)'=='F#'" />
+      <CompileBefore Include="$(_MvcApplicationPartAttributeGeneratedFile)"  Condition="'$(Language)'=='F#'" />
+    </ItemGroup>
+
+    <!--
+      If we did not find any application parts, produce an empty file which is not added to compilation.
+      This is required to play nicely with incremental builds.
+    -->
+    <Touch
+      Files="$(_MvcApplicationPartAttributeGeneratedFile)"
+      AlwaysCreate="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_MvcApplicationPartAttributeGeneratedFile)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 15d1fb8165..0a4d6a4a62 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -25,7 +25,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
     <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
     <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
-    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_RazorSdkTasksTFM>
+    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.0</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
   </PropertyGroup>
@@ -335,6 +335,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets" />
 
+  <Import Project="Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets" Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'" />
+
   <!-- 
     These are the targets that actually do compilation using CSC, separated from the main file for ease of maintenance.
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
new file mode 100644
index 0000000000..a3e9e59160
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -0,0 +1,115 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class ApplicationPartDiscoveryIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public ApplicationPartDiscoveryIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute_WhenBuildingUsingDotnetMsbuild()
+            => Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute(MSBuildProcessKind.Dotnet);
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute_WhenBuildingUsingDesktopMsbuild()
+            => Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute(MSBuildProcessKind.Desktop);
+
+        private async Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute(MSBuildProcessKind msBuildProcessKind)
+        {
+            var result = await DotnetMSBuild("Build", msBuildProcessKind: msBuildProcessKind);
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs");
+            Assert.FileContains(result, Path.Combine(IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs"), "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")]");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ProjectWithoutMvcReferencingDependencies_DoesNotGenerateAttribute()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs");
+            // We should produced an empty file for build incrementalism
+            Assert.Empty(File.ReadAllText(Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs")));
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task BuildIncrementalism_WhenApplicationPartAttributeIsGenerated()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            var generatedAttributeFile = Path.Combine(IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs");
+            Assert.FileExists(result, generatedAttributeFile);
+            Assert.FileContains(result, generatedAttributeFile, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")]");
+
+            var thumbPrint = GetThumbPrint(generatedAttributeFile);
+
+            result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, generatedAttributeFile);
+            Assert.Equal(thumbPrint, GetThumbPrint(generatedAttributeFile));
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvcFSharp", language: "F#", additionalProjects: "ClassLibrary")]
+        public async Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttributeToNonCSharpProjects()
+        {
+            AddProjectFileContent(
+@"
+    <ItemGroup>
+        <ProjectReference Include=""..\ClassLibrary\ClassLibrary.csproj"" />
+    </ItemGroup>
+");
+
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvcFSharp.MvcApplicationPartsAssemblyInfo.fs");
+            Assert.FileContains(result, Path.Combine(IntermediateOutputPath, "SimpleMvcFSharp.MvcApplicationPartsAssemblyInfo.fs"), "<assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")>");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task BuildIncrementalism_WhenApplicationPartAttributeIsNotGenerated()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            var generatedAttributeFile = Path.Combine(IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs");
+            Assert.FileExists(result, generatedAttributeFile);
+            Assert.Empty(File.ReadAllText(Path.Combine(result.Project.DirectoryPath, generatedAttributeFile)));
+
+            var thumbPrint = GetThumbPrint(generatedAttributeFile);
+
+            result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, generatedAttributeFile);
+            Assert.Equal(thumbPrint, GetThumbPrint(generatedAttributeFile));
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index b1d8222aa7..3cc014e3e2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -34,9 +34,9 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj" />
 
     <!-- We don't need anything in this assembly, we just want to make sure it's built -->
-    <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
new file mode 100644
index 0000000000..7a24101947
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
@@ -0,0 +1,181 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class ReferenceResolverTest
+    {
+        internal static readonly string[] MvcAssemblies = new[]
+        {
+            "Microsoft.AspNetCore.Mvc",
+            "Microsoft.AspNetCore.Mvc.Abstractions",
+            "Microsoft.AspNetCore.Mvc.ApiExplorer",
+            "Microsoft.AspNetCore.Mvc.Core",
+            "Microsoft.AspNetCore.Mvc.Cors",
+            "Microsoft.AspNetCore.Mvc.DataAnnotations",
+            "Microsoft.AspNetCore.Mvc.Formatters.Json",
+            "Microsoft.AspNetCore.Mvc.Formatters.Xml",
+            "Microsoft.AspNetCore.Mvc.Localization",
+            "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
+            "Microsoft.AspNetCore.Mvc.Razor",
+            "Microsoft.AspNetCore.Mvc.RazorPages",
+            "Microsoft.AspNetCore.Mvc.TagHelpers",
+            "Microsoft.AspNetCore.Mvc.ViewFeatures",
+        };
+
+        [Fact]
+        public void Resolve_ReturnsEmptySequence_IfNoAssemblyReferencesMvc()
+        {
+            // Arrange
+            var resolver = new TestReferencesToMvcResolver(new[]
+            {
+                CreateAssemblyItem("Microsoft.AspNetCore.Blazor"),
+                CreateAssemblyItem("Microsoft.AspNetCore.Components"),
+                CreateAssemblyItem("Microsoft.JSInterop"),
+                CreateAssemblyItem("System.Net.Http"),
+                CreateAssemblyItem("System.Runtime"),
+            });
+
+            resolver.Add("Microsoft.AspNetCore.Blazor", "Microsoft.AspNetCore.Components", "Microsoft.JSInterop");
+            resolver.Add("Microsoft.AspNetCore.Components", "Microsoft.JSInterop", "System.Net.Http", "System.Runtime");
+            resolver.Add("System.Net.Http", "System.Runtime");
+
+            // Act
+            var assemblies = resolver.ResolveAssemblies();
+
+            // Assert
+            Assert.Empty(assemblies);
+        }
+
+        [Fact]
+        public void Resolve_ReturnsEmptySequence_IfNoDependencyReferencesMvc()
+        {
+            // Arrange
+            var resolver = new TestReferencesToMvcResolver(new[]
+            {
+                CreateAssemblyItem("MyApp.Models"),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Hosting", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.HttpAbstractions", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.KestrelHttpServer", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.StaticFiles", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.Extensions.Primitives", isSystemReference: true),
+                CreateAssemblyItem("System.Net.Http", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.EntityFrameworkCore"),
+            });
+
+            resolver.Add("MyApp.Models", "Microsoft.EntityFrameworkCore");
+            resolver.Add("Microsoft.AspNetCore.Mvc", "Microsoft.AspNetCore.HttpAbstractions");
+            resolver.Add("Microsoft.AspNetCore.KestrelHttpServer", "Microsoft.AspNetCore.Hosting", "Microsoft.AspNetCore.HttpAbstractions");
+            resolver.Add("Microsoft.AspNetCore.StaticFiles", "Microsoft.AspNetCore.HttpAbstractions", "Microsoft.Extensions.Primitives");
+            resolver.Add("Microsoft.AspNetCore.Hosting", "Microsoft.AspNetCore.HttpAbstractions");
+            resolver.Add("Microsoft.AspNetCore.HttpAbstractions", "Microsoft.Extensions.Primitives");
+
+            // Act
+            var assemblies = resolver.ResolveAssemblies();
+
+            // Assert
+            Assert.Empty(assemblies);
+        }
+
+        [Fact]
+        public void Resolve_ReturnsReferences_ThatReferenceMvc()
+        {
+            // Arrange
+            var resolver = new TestReferencesToMvcResolver(new[]
+            {
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.TagHelpers", isSystemReference: true),
+                CreateAssemblyItem("MyTagHelpers"),
+                CreateAssemblyItem("MyControllers"),
+                CreateAssemblyItem("MyApp.Models"),
+                CreateAssemblyItem("Microsoft.AspNetCore.Hosting", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.HttpAbstractions", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.KestrelHttpServer", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.StaticFiles", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.Extensions.Primitives", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.EntityFrameworkCore"),
+            });
+
+            resolver.Add("MyTagHelpers", "Microsoft.AspNetCore.Mvc.TagHelpers");
+            resolver.Add("MyControllers", "Microsoft.AspNetCore.Mvc");
+            resolver.Add("MyApp.Models", "Microsoft.EntityFrameworkCore");
+            resolver.Add("Microsoft.AspNetCore.Mvc", "Microsoft.AspNetCore.HttpAbstractions", "Microsoft.AspNetCore.Mvc.TagHelpers");
+            resolver.Add("Microsoft.AspNetCore.KestrelHttpServer", "Microsoft.AspNetCore.Hosting", "Microsoft.AspNetCore.HttpAbstractions");
+            resolver.Add("Microsoft.AspNetCore.StaticFiles", "Microsoft.AspNetCore.HttpAbstractions", "Microsoft.Extensions.Primitives");
+            resolver.Add("Microsoft.AspNetCore.Hosting", "Microsoft.AspNetCore.HttpAbstractions");
+            resolver.Add("Microsoft.AspNetCore.HttpAbstractions", "Microsoft.Extensions.Primitives");
+
+            // Act
+            var assemblies = resolver.ResolveAssemblies();
+
+            // Assert
+            Assert.Equal(new[] { "MyControllers", "MyTagHelpers" }, assemblies.OrderBy(a => a));
+        }
+
+        [Fact]
+        public void Resolve_ReturnsItemsThatTransitivelyReferenceMvc()
+        {
+            // Arrange
+            var resolver = new TestReferencesToMvcResolver(new[]
+            {
+                CreateAssemblyItem("MyCMS"),
+                CreateAssemblyItem("MyCMS.Core"),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.ViewFeatures", isSystemReference: true),
+            });
+
+            resolver.Add("MyCMS", "MyCMS.Core");
+            resolver.Add("MyCMS.Core", "Microsoft.AspNetCore.Mvc.ViewFeatures");
+
+
+            // Act
+            var assemblies = resolver.ResolveAssemblies();
+
+            // Assert
+            Assert.Equal(new[] { "MyCMS", "MyCMS.Core" }, assemblies.OrderBy(a => a));
+        }
+
+        public AssemblyItem CreateAssemblyItem(string name, bool isSystemReference = false)
+        {
+            return new AssemblyItem
+            {
+                AssemblyName = name,
+                IsSystemReference = isSystemReference,
+                Path = name,
+            };
+        }
+
+        private class TestReferencesToMvcResolver : ReferenceResolver
+        {
+            private readonly Dictionary<string, List<ClassifiedAssemblyItem>> _references = new Dictionary<string, List<ClassifiedAssemblyItem>>();
+            private readonly Dictionary<string, ClassifiedAssemblyItem> _lookup;
+
+            public TestReferencesToMvcResolver(AssemblyItem[] referenceItems)
+                : base(MvcAssemblies, referenceItems)
+            {
+                _lookup = referenceItems.ToDictionary(r => r.AssemblyName, r => new ClassifiedAssemblyItem(r));
+            }
+
+            public void Add(string assembly, params string[] references)
+            {
+                var assemblyItems = references.Select(r => _lookup[r]).ToList();
+                _references[assembly] = assemblyItems;
+            }
+
+            protected override IReadOnlyList<ClassifiedAssemblyItem> GetReferences(string file)
+            {
+                if (_references.TryGetValue(file, out var result))
+                {
+                    return result;
+                }
+
+                return Array.Empty<ClassifiedAssemblyItem>();
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ApplicationPartAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ApplicationPartAttribute.cs
new file mode 100644
index 0000000000..136cb7cba6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Mvc.ApplicationParts/ApplicationPartAttribute.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public class ApplicationPartAttribute : Attribute
+    {
+        public ApplicationPartAttribute(string assemblyName) {}
+    }
+}
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 3f73654c48..4250269a09 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -23,6 +23,11 @@
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Have the SDK treat the MvcShim as an MVC assembly -->
+    <_MvcAssemblyName Include="Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib" />
+  </ItemGroup>
+
   <Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" />
 
 </Project>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 364466f735..b2b6b1019a 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -10,7 +10,6 @@
   -->
   <PropertyGroup>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <_ReferencesAspNetCoreApp>true</_ReferencesAspNetCoreApp>
   </PropertyGroup>
 
   <ItemGroup>

From 98a2a4348b79ea094402f3e2a9fbef308c26fedc Mon Sep 17 00:00:00 2001
From: Alex Lorimer <alexanderlorimer@hotmail.com>
Date: Mon, 20 May 2019 14:39:51 +0100
Subject: [PATCH 157/337] fixed destructive property assignment (reference self
 correctly using `$(GetCopyToOutputDirectoryItemsDependsOn)` instead of
 `$(GetCopyToOutputDirectoryItems)`) (dotnet/aspnetcore-tooling#603)

The intention here would have been to add to the existing GetCopyToOutputDirectoryItemsDependsOn property, defined in Microsoft.Common.Targets. Instead what was happening is that it was being completely overwitten with the _RazorGetCopyToOutputDirectoryItems entry, given that $(GetCopyToOutputDirectoryItems) doesn't exist as a property and must have been a typo (it exists as a task, not a property).

An effect of this bug was that the `AssignTargetPaths` target is not always executed before the `GetCopyToOutputDirectoryItems` target, which should explicitly depend on it. `AssignTargetPaths` is responsible for populating the `ContentWithTargetPath` itemgroup. Left empty, it appears to `GetCopyToOutputDirectoryItems` task that there are no Content files to copy to the final output directory, when in fact there are.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/4597bc3d55e3f88329dd9e55caa774db7fd9de57
---
 .../src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 0a4d6a4a62..9d84607322 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -151,7 +151,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <GetCopyToOutputDirectoryItemsDependsOn>
       _RazorGetCopyToOutputDirectoryItems;
-      $(GetCopyToOutputDirectoryItems)
+      $(GetCopyToOutputDirectoryItemsDependsOn)
     </GetCopyToOutputDirectoryItemsDependsOn>
 
   </PropertyGroup>

From 111e26dd038f83f02adf816c28ee28c3dc350d93 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Mon, 20 May 2019 21:06:38 +0200
Subject: [PATCH 158/337] Conditionally enable content items in the razor SDK
 (dotnet/aspnetcore-tooling#589)

* Move the globs from the project system into the Razor SDK on a separate file that can be imported by itself.
* Import the file conditionally based on the EnableRazorContent property\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/62e33dac1d5ec88ab15d7af694c1adf29ffc4c59
---
 ...Sdk.Razor.StaticAssets.ProjectSystem.props | 48 +++++++++++++++++++
 .../Sdk.Razor.CurrentVersion.props            |  4 ++
 .../Sdk.Razor.CurrentVersion.targets          |  5 ++
 3 files changed, 57 insertions(+)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
new file mode 100644
index 0000000000..4197d7dd74
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
@@ -0,0 +1,48 @@
+<!--
+***********************************************************************************************
+Sdk.Razor.StaticAssets.ProjectSystem.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+
+  <!-- Properties for supporting static content -->
+  <PropertyGroup>
+
+    <!-- This is a contract we have with the Web SDK to allow them in the future to import this file
+         instead of the whole SDK if needed.
+     -->
+    <_WebProjectSystemGlobsPropsDefined>true</_WebProjectSystemGlobsPropsDefined>
+
+    <DefaultItemExcludes>$(DefaultItemExcludes);**\node_modules\**;node_modules\**</DefaultItemExcludes>
+    <DefaultItemExcludes>$(DefaultItemExcludes);**\jspm_packages\**;jspm_packages\**</DefaultItemExcludes>
+    <DefaultItemExcludes>$(DefaultItemExcludes);**\bower_components\**;bower_components\**</DefaultItemExcludes>
+    <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);wwwroot\**</DefaultWebContentItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' ">
+    <!-- Publish everything under wwwroot, all JSON files, all config files and all Razor files -->
+    <Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <Content Include="**\*.config" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="**\*.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+
+    <!-- Set CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid publishing launchSettings.json -->
+    <Content Update="$(AppDesignerFolder)\**" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>   
+
+    <!-- Remove Content items from other item types (in a way that CPS understands) -->
+    <None Remove="wwwroot\**;**\*.json;**\*.config" />
+    <Compile Remove="wwwroot\**" />
+    <EmbeddedResource Remove="wwwroot\**" />
+    
+    <!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
+    <!-- It's important to keep this here so that it works well with the Web SDK -->
+    <_ContentIncludedByDefault Include="@(Content)" />
+
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 06f93030fa..5125968f83 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -74,4 +74,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <None Remove="**\*.razor" />
   </ItemGroup>
 
+  <Import 
+    Project="$(MSBuildThisFileDirectory)..\..\Sdk\Sdk.Razor.StaticAssets.ProjectSystem.props"
+    Condition=" '$(EnableRazorSdkContent)' == 'true' " />
+
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 9d84607322..f0982a8737 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -10,6 +10,11 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project ToolsVersion="14.0" TreatAsLocalProperty="_RazorSdkTasksTFM;_Targeting30OrNewerRazorLangVersion">
+
+  <PropertyGroup>
+    <EnableDefaultContentItems Condition=" '$(EnableDefaultContentItems)' == '' ">true</EnableDefaultContentItems>
+  </PropertyGroup>
+
   <!-- 
     Targets supporting Razor MSBuild integration. Contain support for generating C# code using Razor
     and including the generated code in the project lifecycle, including compiling, publishing and producing

From 13397dd4d6d81b10eb062384903de5216844b4ef Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 21 May 2019 15:03:00 +0200
Subject: [PATCH 159/337] Initial support for static assets in Razor Class
 Libraries (dotnet/aspnetcore-tooling#580)

* Imports static assets from packages containing custom msbuild
  targets defining a StaticWebAsset item group.
* Generates an embeds a manifest into the application assembly
  that contains a list of paths to the content roots of the
  assets defined in the packages custom msbuild targets.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8e70013b70a5392519aebfcf417c95e7c6bb8dfd
---
 .../src/GenerateStaticWebAssetsManifest.cs    | 184 +++++++++++
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 172 ++++++++++
 .../Sdk.Razor.CurrentVersion.props            |   4 +
 .../Sdk.Razor.CurrentVersion.targets          |   3 +
 ...erateAspNetCoreStaticAssetsManifestTest.cs | 296 ++++++++++++++++++
 .../test/IntegrationTests/Assert.cs           |  53 ++++
 .../MSBuildIntegrationTestBase.cs             |  36 ++-
 .../IntegrationTests/MSBuildProcessManager.cs |  11 +-
 .../StaticWebAssetsIntegrationTest.cs         | 261 +++++++++++++++
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  25 +-
 .../AppWithPackageAndP2PReference.csproj      |  43 +++
 .../AppWithPackageAndP2PReference/Program.cs  |  13 +
 ...Microsoft.AspNetCore.StaticWebAssets.cache |   0
 .../PackageLibraryDirectDependency.csproj     |  46 +++
 .../PackageLibraryDirectDependency.props      |  11 +
 .../wwwroot/css/site.css                      |   1 +
 .../wwwroot/js/pkg-direct-dep.js              |   3 +
 .../PackageLibraryTransitiveDependency.csproj |  44 +++
 .../PackageLibraryTransitiveDependency.props  |  11 +
 .../wwwroot/js/pkg-transitive-dep.js          |   3 +
 .../RestoreTestProjects.csproj                |  17 +-
 21 files changed, 1226 insertions(+), 11 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
 create mode 100644 src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
 create mode 100644 src/Razor/test/testassets/AppWithPackageAndP2PReference/Program.cs
 create mode 100644 src/Razor/test/testassets/PackageLibraryDirectDependency/Microsoft.AspNetCore.StaticWebAssets.cache
 create mode 100644 src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
 create mode 100644 src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props
 create mode 100644 src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/css/site.css
 create mode 100644 src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/js/pkg-direct-dep.js
 create mode 100644 src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
 create mode 100644 src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props
 create mode 100644 src/Razor/test/testassets/PackageLibraryTransitiveDependency/wwwroot/js/pkg-transitive-dep.js

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
new file mode 100644
index 0000000000..7c6205d327
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
@@ -0,0 +1,184 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class GenerateStaticWebAssetsManifest : Task
+    {
+        private const string ContentRoot = "ContentRoot";
+        private const string BasePath = "BasePath";
+
+        [Required]
+        public string TargetManifestPath { get; set; }
+
+        [Required]
+        public ITaskItem[] ContentRootDefinitions { get; set; }
+
+        public override bool Execute()
+        {
+            if (!ValidateArguments())
+            {
+                return false;
+            }
+
+            return ExecuteCore();
+        }
+
+        private bool ExecuteCore()
+        {
+            var document = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
+            var root = new XElement(
+                "StaticWebAssets",
+                new XAttribute("Version", "1.0"),
+                CreateNodes());
+
+            document.Add(root);
+
+            var settings = new XmlWriterSettings
+            {
+                Encoding = Encoding.UTF8,
+                CloseOutput = true,
+                OmitXmlDeclaration = true,
+                Indent = true,
+                NewLineOnAttributes = false,
+                Async = true
+            };
+
+            using (var xmlWriter = GetXmlWriter(settings))
+            {
+                document.WriteTo(xmlWriter);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        private IEnumerable<XElement> CreateNodes()
+        {
+            var nodes = new List<XElement>();
+            for (var i = 0; i < ContentRootDefinitions.Length; i++)
+            {
+                var contentRootDefinition = ContentRootDefinitions[i];
+                var basePath = contentRootDefinition.GetMetadata(BasePath);
+                var contentRoot = contentRootDefinition.GetMetadata(ContentRoot);
+
+                // basePath is meant to be a prefix for the files under contentRoot. MSbuild
+                // normalizes '\' according to the OS, but this is going to be part of the url
+                // so it needs to always be '/'.
+                var normalizedBasePath = basePath.Replace("\\", "/");
+
+                // At this point we already know that there are no elements with different base paths and same content roots
+                // or viceversa. Here we simply skip additional items that have the same base path and same content root.
+                if (!nodes.Exists(e => e.Attribute(BasePath).Value.Equals(normalizedBasePath, StringComparison.OrdinalIgnoreCase)))
+                {
+                    nodes.Add(new XElement("ContentRoot",
+                        new XAttribute("BasePath", normalizedBasePath),
+                        new XAttribute("Path", contentRoot)));
+                }
+            }
+
+            return nodes;
+        }
+
+        private XmlWriter GetXmlWriter(XmlWriterSettings settings)
+        {
+            var fileStream = new FileStream(TargetManifestPath, FileMode.Create);
+            return XmlWriter.Create(fileStream, settings);
+        }
+
+        private bool ValidateArguments()
+        {
+            for (var i = 0; i < ContentRootDefinitions.Length; i++)
+            {
+                var contentRootDefinition = ContentRootDefinitions[i];
+                if (!EnsureRequiredMetadata(contentRootDefinition, BasePath) ||
+                    !EnsureRequiredMetadata(contentRootDefinition, ContentRoot))
+                {
+                    return false;
+                }
+            }
+
+            // We want to validate that there are no different item groups that share either the same base path
+            // but different content roots or that share the same content root but different base paths.
+            // We pass in all the static web assets that we discovered to this task without making any distinction for
+            // duplicates, so here we skip elements for which we are already tracking an element with the same
+            // content root path and same base path.
+
+            // Case-sensitivity depends on the underlying OS so we are not going to do anything to enforce it here.
+            // Any two items that match base path and content root in a case-insensitive way won't produce an error.
+            // Any other two items will produce an error even if there is only a casing difference between either the
+            // base paths or the content roots.
+            var basePaths = new Dictionary<string, ITaskItem>(StringComparer.OrdinalIgnoreCase);
+            var contentRootPaths = new Dictionary<string, ITaskItem>(StringComparer.OrdinalIgnoreCase);
+
+            for (var i = 0; i < ContentRootDefinitions.Length; i++)
+            {
+                var contentRootDefinition = ContentRootDefinitions[i];
+                var basePath = contentRootDefinition.GetMetadata(BasePath);
+                var contentRoot = contentRootDefinition.GetMetadata(ContentRoot);
+
+                if (basePaths.TryGetValue(basePath, out var existingBasePath))
+                {
+                    var existingBasePathContentRoot = existingBasePath.GetMetadata(ContentRoot);
+                    if (!string.Equals(contentRoot, existingBasePathContentRoot, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Case:
+                        // Item1: /_content/Library, /package/aspnetContent1
+                        // Item2: /_content/Library, /package/aspnetContent2
+                        Log.LogError($"Duplicate base paths '{basePath}' for content root paths '{contentRoot}' and '{existingBasePathContentRoot}'. " +
+                            $"('{contentRootDefinition.ItemSpec}', '{existingBasePath.ItemSpec}')");
+                        return false;
+                    }
+                    // It was a duplicate, so we skip it.
+                    // Case:
+                    // Item1: /_content/Library, /package/aspnetContent
+                    // Item2: /_content/Library, /package/aspnetContent
+                }
+                else
+                {
+                    if (contentRootPaths.TryGetValue(contentRoot, out var existingContentRoot))
+                    {
+                        // Case:
+                        // Item1: /_content/Library1, /package/aspnetContent
+                        // Item2: /_content/Library2, /package/aspnetContent
+                        Log.LogError($"Duplicate content root paths '{contentRoot}' for base paths '{basePath}' and '{existingContentRoot.GetMetadata(BasePath)}' " +
+                            $"('{contentRootDefinition.ItemSpec}', '{existingContentRoot.ItemSpec}')");
+                        return false;
+                    }
+                }
+
+                if (!basePaths.ContainsKey(basePath))
+                {
+                    basePaths.Add(basePath, contentRootDefinition);
+                }
+
+                if (!contentRootPaths.ContainsKey(contentRoot))
+                {
+                    contentRootPaths.Add(contentRoot, contentRootDefinition);
+                }
+            }
+
+            return true;
+        }
+
+        private bool EnsureRequiredMetadata(ITaskItem item, string metadataName)
+        {
+            var value = item.GetMetadata(metadataName);
+            if (string.IsNullOrEmpty(value))
+            {
+                Log.LogError($"Missing required metadata '{metadataName}' for '{item.ItemSpec}'.");
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
new file mode 100644
index 0000000000..0c273df77b
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -0,0 +1,172 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+
+  <!-- Targets that support static content scenarios in ASP.NET Core.
+       The main targets are:
+       * GenerateStaticWebAssetsManifest: Creates a manifest file to use in development with
+         the paths to all the references packages and projects content roots.
+       * ResolveStaticWebAssetsInputs: Collects all the static assets from different sources
+         * Current project.
+         * Referenced project.
+         * Referenced packages.
+  -->
+
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.GenerateStaticWebAssetsManifest"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
+  <PropertyGroup>
+    <GenerateStaticWebAssetsManifestDependsOn>
+      ResolveStaticWebAssetsInputs;
+      _CreateStaticWebAssetsInputsCacheFile
+    </GenerateStaticWebAssetsManifestDependsOn>
+
+    <AssignTargetPathsDependsOn>
+      GenerateStaticWebAssetsManifest;
+      $(AssignTargetPathsDependsOn)
+    </AssignTargetPathsDependsOn>
+
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_GeneratedStaticWebAssetsInputsCacheFile>$(IntermediateOutputPath)$(TargetName).StaticWebAssets.cache</_GeneratedStaticWebAssetsInputsCacheFile>
+    <_GeneratedStaticWebAssetsDevelopmentManifest>$(IntermediateOutputPath)$(TargetName).StaticWebAssets.xml</_GeneratedStaticWebAssetsDevelopmentManifest>
+  </PropertyGroup>
+
+  <Target 
+    Name="_CreateStaticWebAssetsInputsCacheFile"
+    DependsOnTargets="ResolveStaticWebAssetsInputs">
+    
+    <ItemGroup>
+      <!-- 
+      This is the list of inputs that will be used for generating the manifest used during development. 
+      -->
+      <_ExternalStaticWebAsset
+        Include="%(StaticWebAsset.Identity)"
+        Condition="'%(SourceType)' != ''">
+          <BasePath>%(StaticWebAsset.BasePath)</BasePath>
+          <ContentRoot>%(StaticWebAsset.ContentRoot)</ContentRoot>
+      </_ExternalStaticWebAsset>
+    </ItemGroup>
+
+    <!-- We need a transform here to make sure we hash the metadata -->
+    <Hash ItemsToHash="@(_ExternalStaticWebAsset->'%(Identity)%(BasePath)%(ContentRoot)')">
+      <Output TaskParameter="HashResult" PropertyName="_StaticWebAssetsCacheHash" />
+    </Hash>
+
+    <WriteLinesToFile 
+      Lines="$(_StaticWebAssetsCacheHash)" 
+      File="$(_GeneratedStaticWebAssetsInputsCacheFile)" 
+      Overwrite="True" 
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_GeneratedStaticWebAssetsInputsCacheFile)" />
+    </ItemGroup>
+
+  </Target>
+
+  <!-- 
+    This target generates a manifest for development time that includes information
+    about the base path for the referenced package and project static web assets. The
+    manifest includes the content root and the base path for each of the referenced
+    packages and projects.
+
+    Ideally, each package/project contains a unique base path and a given content
+    root, but we don't check for duplicates on either of them.
+     -->
+
+  <Target 
+    Name="GenerateStaticWebAssetsManifest"
+    Inputs="$(_GeneratedStaticWebAssetsInputsCacheFile)"
+    Outputs="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
+    DependsOnTargets="$(GenerateStaticWebAssetsManifestDependsOn)">
+  
+    <GenerateStaticWebAssetsManifest 
+      ContentRootDefinitions="@(_ExternalStaticWebAsset)"
+      TargetManifestPath="$(_GeneratedStaticWebAssetsDevelopmentManifest)" />
+  
+      <!-- This is the list of inputs that will be used for generating the manifest used during development. -->
+    <ItemGroup>
+      <EmbeddedResource Condition="'@(_ExternalStaticWebAsset->Count())' != '0'"
+        Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
+        LogicalName="Microsoft.AspNetCore.StaticWebAssets.xml" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <FileWrites Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)" />
+    </ItemGroup>
+
+  </Target>
+
+  <!-- This target collects all the StaticWebAssets from different sources:
+       * The current project StaticWebAssets that come from wwwroot\** by default.
+       * Assets from referenced projects that get retrieved invoking an MSBuild target on
+         the referenced projects.
+       * Assets from the referenced packages. These will be implicitly included when nuget
+         restores the package and includes the package props file for the package.
+  -->
+  <Target 
+    Name="ResolveStaticWebAssetsInputs">
+    <PropertyGroup>
+      <!-- The _SafeBasePath is used as a path segment in the urls that we will
+           be exposing content from when the library is referenced as a package
+           or as a project by a web application. Our convention will be to expose
+           content directly on _content/<<_SafeBasePath>>
+           
+           We simply remove the dots from the package id so that a package
+           like Microsoft.AspNetCore.Identity becomes MicrosoftAspNetCoreIdentity 
+           
+           TODO: Investigate if we need to do something more sophisticated here.
+      -->
+      <_SafeBasePath>$(PackageId.Replace('.',''))</_SafeBasePath>
+    </PropertyGroup>
+
+    <!-- StaticWebAssets from the current project -->
+
+    <ItemGroup>
+      <!-- 
+        Should we promote 'wwwroot\**'' to a property?
+        We don't want to capture any content outside the content root, that's why we don't do
+        @(Content) here.
+      -->
+      <StaticWebAsset Include="wwwroot\**" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)">
+        <!-- (PackageReference,ProjectReference,'' (CurrentProject)) -->
+        <SourceType></SourceType>
+        <!-- Identifier describing the source, the package id, the project name, empty for the current project.  -->
+        <SourceId></SourceId>
+        <!-- 
+          Full path to the content root for the item:
+          * For packages it corresponds to %userprofile%/.nuget/packages/<<PackageId>>/<<PackageVersion>>/razorContent
+          * For referenced projects it corresponds to <<FullProjectRefPath>>/wwwroot
+          * For the current projects it corresponds to $(MSBuildThisProjectFileDirectory)wwwroot\
+        -->
+        <ContentRoot>$(MSBuildProjectDirectory)\wwwroot\</ContentRoot>
+        <!-- Subsection (folder) from the url space where content for this library will be served. -->
+        <BasePath>_content\$(_SafeBasePath)\</BasePath>
+        <!-- Relative path from the content root for the file. At publish time, we combine the BasePath + Relative
+  path to determine the final path for the file. -->
+        <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
+
+      </StaticWebAsset>
+    </ItemGroup>
+
+    <!-- StaticWebAssets from referenced projects. -->
+    <!-- TODO: Include implementation -->
+
+    <!-- StaticWebAssets from packages are already available, so we don't do anything. -->
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 5125968f83..c1a728ae5b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -74,6 +74,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     <None Remove="**\*.razor" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <EnableRazorSdkContent Condition=" '$(UsingMicrosoftNETSdkWeb)' == '' ">true</EnableRazorSdkContent>
+  </PropertyGroup>
+
   <Import 
     Project="$(MSBuildThisFileDirectory)..\..\Sdk\Sdk.Razor.StaticAssets.ProjectSystem.props"
     Condition=" '$(EnableRazorSdkContent)' == 'true' " />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index f0982a8737..98920017b4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -338,6 +338,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="Microsoft.NET.Sdk.Razor.Component.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
 
+  <Import Project="Microsoft.NET.Sdk.Razor.StaticWebAssets.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
+
   <Import Project="Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets" />
 
   <Import Project="Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets" Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'" />
@@ -480,6 +482,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       '$(EnableDefaultRazorGenerateItems)'=='true'">
 
       <Content Condition="'%(Content.Extension)'=='.cshtml'" Pack="$(IncludeRazorContentInPack)" />
+      <Content Condition="'%(Content.Extension)'=='.razor'" Pack="$(IncludeRazorContentInPack)" />
     </ItemGroup>
   </Target>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs
new file mode 100644
index 0000000000..8bb80e5c2c
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs
@@ -0,0 +1,296 @@
+// 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.Collections.Generic;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class GenerateStaticWebAssetsManifestTest
+    {
+        [Fact]
+        public void ReturnsError_WhenBasePathIsMissing()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAssetsManifest
+            {
+                BuildEngine = buildEngine.Object,
+                ContentRootDefinitions = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["ContentRoot"] = "/"
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'BasePath' for '{Path.Combine("wwwroot", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void ReturnsError_WhenContentRootIsMissing()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAssetsManifest
+            {
+                BuildEngine = buildEngine.Object,
+                ContentRootDefinitions = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "MyLibrary"
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'ContentRoot' for '{Path.Combine("wwwroot", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void ReturnsError_ForDuplicateBasePaths()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAssetsManifest
+            {
+                BuildEngine = buildEngine.Object,
+                ContentRootDefinitions = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "MyLibrary",
+                        ["ContentRoot"] = Path.Combine("nuget","MyLibrary")
+                    }),
+                    CreateItem(Path.Combine("wwwroot", "otherLib.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "MyLibrary",
+                        ["ContentRoot"] = Path.Combine("nuget", "MyOtherLibrary")
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(
+                $"Duplicate base paths 'MyLibrary' for content root paths '{Path.Combine("nuget", "MyOtherLibrary")}' and '{Path.Combine("nuget", "MyLibrary")}'. " +
+                $"('{Path.Combine("wwwroot", "otherLib.js")}', '{Path.Combine("wwwroot", "sample.js")}')",
+                message);
+        }
+
+        [Fact]
+        public void ReturnsError_ForDuplicateContentRoots()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAssetsManifest
+            {
+                BuildEngine = buildEngine.Object,
+                ContentRootDefinitions = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "MyLibrary",
+                        ["ContentRoot"] = Path.Combine(".", "MyLibrary")
+                    }),
+                    CreateItem(Path.Combine("wwwroot", "otherLib.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "MyOtherLibrary",
+                        ["ContentRoot"] = Path.Combine(".", "MyLibrary")
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(
+                $"Duplicate content root paths '{Path.Combine(".", "MyLibrary")}' for base paths 'MyOtherLibrary' and 'MyLibrary' " +
+                $"('{Path.Combine("wwwroot", "otherLib.js")}', '{Path.Combine("wwwroot", "sample.js")}')",
+                message);
+        }
+
+        [Fact]
+        public void Generates_EmptyManifest_WhenNoItems_Passed()
+        {
+            // Arrange
+            var file = Path.GetTempFileName();
+            var expectedDocument = @"<StaticWebAssets Version=""1.0"" />";
+
+            try
+            {
+                var buildEngine = new Mock<IBuildEngine>();
+
+                var task = new GenerateStaticWebAssetsManifest
+                {
+                    BuildEngine = buildEngine.Object,
+                    ContentRootDefinitions = new TaskItem[] { },
+                    TargetManifestPath = file
+                };
+
+                // Act
+                var result = task.Execute();
+
+                // Assert
+                Assert.True(result);
+                var document = File.ReadAllText(file);
+                Assert.Equal(expectedDocument, document);
+            }
+            finally
+            {
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+            }
+        }
+
+        [Fact]
+        public void Generates_Manifest_WhenContentRootsAvailable()
+        {
+            // Arrange
+            var file = Path.GetTempFileName();
+            var expectedDocument = $@"<StaticWebAssets Version=""1.0"">
+  <ContentRoot BasePath=""MyLibrary"" Path=""{Path.Combine(".", "nuget", "MyLibrary", "razorContent")}"" />
+</StaticWebAssets>";
+
+            try
+            {
+                var buildEngine = new Mock<IBuildEngine>();
+
+                var task = new GenerateStaticWebAssetsManifest
+                {
+                    BuildEngine = buildEngine.Object,
+                    ContentRootDefinitions = new TaskItem[]
+                    {
+                        CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
+                        {
+                            ["BasePath"] = "MyLibrary",
+                            ["ContentRoot"] = Path.Combine(".", "nuget", "MyLibrary", "razorContent")
+                        }),
+                    },
+                    TargetManifestPath = file
+                };
+
+                // Act
+                var result = task.Execute();
+
+                // Assert
+                Assert.True(result);
+                var document = File.ReadAllText(file);
+                Assert.Equal(expectedDocument, document);
+            }
+            finally
+            {
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+            }
+        }
+
+        [Fact]
+        public void SkipsAdditionalElements_WithSameBasePathAndSameContentRoot()
+        {
+            // Arrange
+            var file = Path.GetTempFileName();
+            var expectedDocument = $@"<StaticWebAssets Version=""1.0"">
+  <ContentRoot BasePath=""Base/MyLibrary"" Path=""{Path.Combine(".", "nuget", "MyLibrary", "razorContent")}"" />
+</StaticWebAssets>";
+
+            try
+            {
+                var buildEngine = new Mock<IBuildEngine>();
+
+                var task = new GenerateStaticWebAssetsManifest
+                {
+                    BuildEngine = buildEngine.Object,
+                    ContentRootDefinitions = new TaskItem[]
+                    {
+                        CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
+                        {
+                            // Base path needs to be normalized to '/' as it goes in the url
+                            ["BasePath"] = "Base\\MyLibrary",
+                            ["ContentRoot"] = Path.Combine(".", "nuget", "MyLibrary", "razorContent")
+                        }),
+                        // Comparisons are case insensitive
+                        CreateItem(Path.Combine("wwwroot, site.css"), new Dictionary<string,string>
+                        {
+                            ["BasePath"] = "Base\\MyLIBRARY",
+                            ["ContentRoot"] = Path.Combine(".", "nuget", "MyLIBRARY", "razorContent")
+                        }),
+                    },
+                    TargetManifestPath = file
+                };
+
+                // Act
+                var result = task.Execute();
+
+                // Assert
+                Assert.True(result);
+                var document = File.ReadAllText(file);
+                Assert.Equal(expectedDocument, document);
+            }
+            finally
+            {
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+            }
+        }
+
+        private static TaskItem CreateItem(
+            string spec,
+            IDictionary<string, string> metadata)
+        {
+            var result = new TaskItem(spec);
+            foreach (var (key, value) in metadata)
+            {
+                result.SetMetadata(key, value);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index d43d0e6d2c..bdbfa9c25d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -344,6 +345,58 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        public static Stream ContainsEmbeddedResource(string assemblyPath, string resourceName)
+        {
+            var stream = ExtractEmbeddedResource(assemblyPath, resourceName);
+            Assert.NotNull(stream);
+
+            return stream;
+        }
+
+        public static void DoesNotContainEmbeddedResource(string assemblyPath, string resourceName)
+        {
+            var stream = ExtractEmbeddedResource(assemblyPath, resourceName);
+            Assert.Null(stream);
+        }
+
+        private static Stream ExtractEmbeddedResource(string path, string expectedResourceName)
+        {
+            using (var peStream = File.OpenRead(path))
+            {
+                using (var peReader = new PEReader(peStream))
+                {
+                    var mdReader = peReader.GetMetadataReader();
+
+                    foreach (var resourceHandle in mdReader.ManifestResources)
+                    {
+                        var resource = mdReader.GetManifestResource(resourceHandle);
+
+                        if (!resource.Implementation.IsNil)
+                        {
+                            continue; // resource is not embedded.
+                        }
+
+                        var resourceName = mdReader.GetString(resource.Name);
+                        if (!string.Equals(expectedResourceName, resourceName))
+                        {
+                            continue;
+                        }
+
+                        // We are not taking resource.Offset into account here.
+                        // We currently only have the casuistic that we are embedding a single resource.
+                        // If that changes we'll have to change this test code, but as its hard we won't do it for now.
+                        var resourcesSection = peReader.GetSectionData(peReader.PEHeaders.CorHeader.ResourcesDirectory.RelativeVirtualAddress);
+                        var resourcesReader = resourcesSection.GetReader();
+                        var resourceSizeInBytes = resourcesReader.ReadInt32();
+                        var resourceBytes = resourcesReader.ReadBytes(resourceSizeInBytes);
+                        return new MemoryStream(resourceBytes, writable: false);
+                    }
+                }
+            }
+
+            return null;
+        }
+
         public static void NuspecContains(MSBuildResult result, string nuspecPath, string expected)
         {
             if (result == null)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index dd6c6e71b2..b17592bb80 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,6 +15,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
     public abstract class MSBuildIntegrationTestBase
     {
+        internal static readonly string LocalNugetPackagesCacheTempPath =
+            Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()) + Path.DirectorySeparatorChar;
+
         private static readonly AsyncLocal<ProjectDirectory> _project = new AsyncLocal<ProjectDirectory>();
         private static readonly AsyncLocal<string> _projectTfm = new AsyncLocal<string>();
 
@@ -42,6 +47,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             set { _project.Value = value; }
         }
 
+        // Whether to use a local cache or not to prevent polluting the global cache
+        // with test packages.
+        public bool UseLocalPackageCache { get; set; }
+
         protected string RazorIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "Razor");
 
         protected string RazorComponentIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "RazorDeclaration");
@@ -64,18 +73,42 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             bool runRestoreBeforeBuildOrPublish = true)
         {
             var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
+
+            // Additional restore sources for packages used in testing
+            var additionalRestoreSources = string.Join(
+                ',',
+                typeof(PackageTestProjectsFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                    .Where(a => a.Key == "Testing.AdditionalRestoreSources")
+                    .Select(a => a.Value)
+                    .ToArray());
+
             var buildArgumentList = new List<string>
             {
                 // Disable node-reuse. We don't want msbuild processes to stick around
                 // once the test is completed.
                 "/nr:false",
 
+                // Always generate a bin log for debugging purposes
+                "/bl",
+
                 // Let the test app know it is running as part of a test.
                 "/p:RunningAsTest=true",
 
                 $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
+
+                // Additional restore sources for projects that require built packages
+                $"/p:RuntimeAdditionalRestoreSources={additionalRestoreSources}",
             };
 
+            if (UseLocalPackageCache)
+            {
+                if (!Directory.Exists(LocalNugetPackagesCacheTempPath))
+                {
+                    // The local cache folder needs to exist so that nuget 
+                    Directory.CreateDirectory(LocalNugetPackagesCacheTempPath);
+                }
+            }
+
             if (!suppressBuildServer)
             {
                 buildArgumentList.Add($@"/p:_RazorBuildServerPipeName=""{buildServerPipeName ?? BuildServer.PipeName}""");
@@ -110,7 +143,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Project,
                 buildArguments,
                 timeout,
-                msBuildProcessKind);
+                msBuildProcessKind,
+                UseLocalPackageCache ? LocalNugetPackagesCacheTempPath : null);
         }
 
         internal void AddProjectFileContent(string content)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index 0d598ce741..de81c1f049 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -3,6 +3,9 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,7 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             ProjectDirectory project,
             string arguments,
             TimeSpan? timeout = null,
-            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
+            string localPackageCache = null)
         {
             var processStartInfo = new ProcessStartInfo()
             {
@@ -26,6 +30,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 RedirectStandardOutput = true,
             };
 
+            if (localPackageCache != null)
+            {
+                processStartInfo.Environment.Add("NUGET_PACKAGES", localPackageCache);
+            }
+
             if (msBuildProcessKind == MSBuildProcessKind.Desktop)
             {
                 if (string.IsNullOrEmpty(BuildVariables.MSBuildPath))
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
new file mode 100644
index 0000000000..bb0d250f97
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -0,0 +1,261 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class StaticWebAssetsIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>, IClassFixture<PackageTestProjectsFixture>, IAsyncLifetime
+    {
+        public StaticWebAssetsIntegrationTest(
+            BuildServerTestFixture buildServer,
+            PackageTestProjectsFixture packageTestProjects,
+            ITestOutputHelper output)
+            : base(buildServer)
+        {
+            UseLocalPackageCache = true;
+            PackageTestProjects = packageTestProjects;
+            Output = output;
+        }
+
+        public PackageTestProjectsFixture PackageTestProjects { get; private set; }
+
+        public ITestOutputHelper Output { get; private set; }
+
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest()
+        {
+            var result = await DotnetMSBuild("Build", "/restore");
+
+            var expectedManifest = GetExpectedManifest();
+
+            Assert.BuildPassed(result);
+
+            // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+
+            var path = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.dll");
+            var assembly = Assert.ContainsEmbeddedResource(path, "Microsoft.AspNetCore.StaticWebAssets.xml");
+            using (var reader = new StreamReader(assembly))
+            {
+                var data = await reader.ReadToEndAsync();
+                Assert.Equal(expectedManifest, data);
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_DoesNotEmbedManifestWhen_NoStaticResourcesAvailable()
+        {
+            var result = await DotnetMSBuild("Build", "/restore");
+
+            Assert.BuildPassed(result);
+
+            // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.StaticWebAssets.cache");
+
+            var path = Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
+            Assert.DoesNotContainEmbeddedResource(path, "SimpleMvc.StaticWebAssets.xml");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        public async Task Clean_Success_RemovesManifestAndCache()
+        {
+            var result = await DotnetMSBuild("Build", "/restore");
+
+            Assert.BuildPassed(result);
+
+            // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+
+            var cleanResult = await DotnetMSBuild("Clean");
+
+            Assert.BuildPassed(cleanResult);
+
+            // Clean should delete the manifest and the cache.
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        public async Task Rebuild_Success_RecreatesManifestAndCache()
+        {
+            // Arrange
+            var result = await DotnetMSBuild("Build", "/restore");
+
+            var expectedManifest = GetExpectedManifest();
+
+            Assert.BuildPassed(result);
+
+            // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+
+            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
+            var thumbPrints = new Dictionary<string, FileThumbPrint>();
+            var thumbPrintFiles = new[]
+            {
+                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml"),
+                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache"),
+            };
+
+            foreach (var file in thumbPrintFiles)
+            {
+                var thumbprint = GetThumbPrint(file);
+                thumbPrints[file] = thumbprint;
+            }
+
+            // Act
+            var rebuild = await DotnetMSBuild("Rebuild");
+
+            // Assert
+            Assert.BuildPassed(rebuild);
+
+            foreach (var file in thumbPrintFiles)
+            {
+                var thumbprint = GetThumbPrint(file);
+                Assert.NotEqual(thumbPrints[file], thumbprint);
+            }
+
+            var path = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.dll");
+            var assembly = Assert.ContainsEmbeddedResource(path, "Microsoft.AspNetCore.StaticWebAssets.xml");
+            using (var reader = new StreamReader(assembly))
+            {
+                var data = reader.ReadToEnd();
+                Assert.Equal(expectedManifest, data);
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        public async Task GenerateStaticWebAssetsManifest_IncrementalBuild_ReusesManifest()
+        {
+            var result = await DotnetMSBuild("GenerateStaticWebAssetsManifest", "/restore");
+
+            Assert.BuildPassed(result);
+
+            // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+
+            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
+            var thumbPrints = new Dictionary<string, FileThumbPrint>();
+            var thumbPrintFiles = new[]
+            {
+                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml"),
+                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache"),
+            };
+
+            foreach (var file in thumbPrintFiles)
+            {
+                var thumbprint = GetThumbPrint(file);
+                thumbPrints[file] = thumbprint;
+            }
+
+            // Act
+            var incremental = await DotnetMSBuild("GenerateStaticWebAssetsManifest");
+
+            // Assert
+            Assert.BuildPassed(incremental);
+
+            foreach (var file in thumbPrintFiles)
+            {
+                var thumbprint = GetThumbPrint(file);
+                Assert.Equal(thumbPrints[file], thumbprint);
+            }
+        }
+
+        public Task InitializeAsync()
+        {
+            return PackageTestProjects.PackAsync(Output);
+        }
+
+        public Task DisposeAsync()
+        {
+            return Task.CompletedTask;
+        }
+
+        private string GetExpectedManifest()
+        {
+            var restorePath = LocalNugetPackagesCacheTempPath;
+            var projects = new[]
+            {
+                Path.Combine(restorePath, "packagelibrarytransitivedependency", "1.0.0", "buildTransitive", "..", "razorContent") + Path.DirectorySeparatorChar,
+                Path.Combine(restorePath, "packagelibrarydirectdependency", "1.0.0", "build", "..", "razorContent") + Path.DirectorySeparatorChar
+            };
+
+            return $@"<StaticWebAssets Version=""1.0"">
+  <ContentRoot BasePath=""_content/PackageLibraryTransitiveDependency"" Path=""{projects[0]}"" />
+  <ContentRoot BasePath=""_content/PackageLibraryDirectDependency"" Path=""{projects[1]}"" />
+</StaticWebAssets>";
+        }
+    }
+
+    public class PackageTestProjectsFixture
+    {
+        private bool _packed;
+
+        internal async Task PackAsync(ITestOutputHelper output)
+        {
+            if (_packed)
+            {
+                return;
+            }
+
+            var projectsToPack = GetProjectsToPack();
+
+            foreach (var project in projectsToPack)
+            {
+                output.WriteLine(project);
+            }
+
+            foreach (var project in projectsToPack)
+            {
+                var psi = new ProcessStartInfo
+                {
+                    FileName = DotNetMuxer.MuxerPathOrDefault(),
+#if DEBUG
+                    Arguments = "msbuild /t:Restore;Pack /p:Configuration=Debug",
+#else
+                    Arguments = "msbuild /t:Restore;Pack /p:Configuration=Release",
+#endif
+                    WorkingDirectory = project,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true
+                };
+
+                var result = await MSBuildProcessManager.RunProcessCoreAsync(
+                    psi,
+                    TimeSpan.FromMinutes(2));
+
+                output.WriteLine(result.Output);
+                Assert.Equal(0, result.ExitCode);
+            }
+
+            _packed = true;
+        }
+
+        public static string[] GetProjectsToPack()
+        {
+            return typeof(PackageTestProjectsFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                .Where(a => a.Key == "Testing.ProjectToPack")
+                .Select(a => a.Value)
+                .ToArray();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 3cc014e3e2..b3097334e7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -21,11 +21,30 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>Testing.ProjectToPack</_Parameter1>
+      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\PackageLibraryDirectDependency</_Parameter2>
+    </AssemblyAttribute>
+
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>Testing.ProjectToPack</_Parameter1>
+      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\PackageLibraryTransitiveDependency</_Parameter2>
+    </AssemblyAttribute>
+
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>Testing.AdditionalRestoreSources</_Parameter1>
+      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\TestPackageRestoreSource</_Parameter2>
+    </AssemblyAttribute>
+
+  </ItemGroup>
+
   <!-- The test projects rely on these binaries being available -->
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
@@ -51,11 +70,7 @@
     Inputs="$(MSBuildAllProjects)"
     Outputs="$(MSBuildLocationFileOutput)">
 
-    <Exec
-      Condition="'$(OS)' == 'Windows_NT'"
-      Command='"$(NuGetPackageRoot)vswhere\$(VSWhereVersion)\tools\vswhere.exe" -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild'
-      ConsoleToMsBuild="true"
-      StandardErrorImportance="high">
+    <Exec Condition="'$(OS)' == 'Windows_NT'" Command="&quot;$(NuGetPackageRoot)vswhere\$(VSWhereVersion)\tools\vswhere.exe&quot; -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild" ConsoleToMsBuild="true" StandardErrorImportance="high">
       <Output TaskParameter="ConsoleOutput" PropertyName="_VSInstallDir" />
     </Exec>
     <Error Condition="'$(OS)' == 'Windows_NT' and '$(_VSInstallDir)'==''" Text="Visual Studio not found on Windows." />
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
new file mode 100644
index 0000000000..4eb52fbfa3
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)' == ''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RestoreSources>
+      $(RestoreSources);
+      $(RuntimeAdditionalRestoreSources)
+    </RestoreSources>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="PackageLibraryDirectDependency" Version="1.0.0" />
+  </ItemGroup>
+
+    <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll" />
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/Program.cs b/src/Razor/test/testassets/AppWithPackageAndP2PReference/Program.cs
new file mode 100644
index 0000000000..dc3ac4e250
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/Program.cs
@@ -0,0 +1,13 @@
+
+namespace AppWithP2PReference
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/Microsoft.AspNetCore.StaticWebAssets.cache b/src/Razor/test/testassets/PackageLibraryDirectDependency/Microsoft.AspNetCore.StaticWebAssets.cache
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
new file mode 100644
index 0000000000..075a8e6852
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Copyright>© Microsoft</Copyright>
+    <Product>Razor Test</Product>
+    <Company>Microsoft</Company>
+    <Description>PackageLibraryDirectDependency Description</Description>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)..\TestPackageRestoreSource</PackageOutputPath>
+    <DeterministicSourcePaths>false</DeterministicSourcePaths>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <Content Include="build\**" Pack="true" PackagePath="build" />
+    <!-- We will remove the line below when we do the item to support packing -->
+    <Content Update="wwwroot\**" Pack="true" PackagePath="razorContent" />
+    <ProjectReference Include="..\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props b/src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props
new file mode 100644
index 0000000000..eaa14f2c3a
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props
@@ -0,0 +1,11 @@
+<Project>
+  <ItemGroup>
+    <StaticWebAsset Include="$(MSBuildThisFileDirectory)..\razorContent\**">
+      <SourceType>Package</SourceType>
+      <SourceId>PackageLibraryDirectDependency</SourceId>
+      <ContentRoot>$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)..\razorContent'))</ContentRoot>
+      <BasePath>_content\PackageLibraryDirectDependency</BasePath>
+      <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
+    </StaticWebAsset>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/css/site.css b/src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/css/site.css
new file mode 100644
index 0000000000..c9d72143d2
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/css/site.css
@@ -0,0 +1 @@
+div.fluent { display: inline-block  }
\ No newline at end of file
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/js/pkg-direct-dep.js b/src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/js/pkg-direct-dep.js
new file mode 100644
index 0000000000..0e3ece9c93
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/wwwroot/js/pkg-direct-dep.js
@@ -0,0 +1,3 @@
+(function () {
+  document.getElementById('pkg-direct-dep').innerHTML = 'pkg-direct-dep';
+})()
\ No newline at end of file
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
new file mode 100644
index 0000000000..e4ac49a002
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Copyright>© Microsoft</Copyright>
+    <Product>Razor Test</Product>
+    <Company>Microsoft</Company>
+    <Description>PackageLibraryTransitiveDependency Description</Description>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)..\TestPackageRestoreSource</PackageOutputPath>
+    <DeterministicSourcePaths>false</DeterministicSourcePaths>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <Content Include="build\**" Pack="true" PackagePath="buildTransitive" />
+    <!-- We will remove the line below when we do the item to support packing -->
+    <Content Update="wwwroot\**" Pack="true" PackagePath="razorContent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props
new file mode 100644
index 0000000000..64cdf1337b
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props
@@ -0,0 +1,11 @@
+<Project>
+  <ItemGroup>
+    <StaticWebAsset Include="$(MSBuildThisFileDirectory)..\razorContent\**">
+      <SourceType>Package</SourceType>
+      <SourceId>PackageLibraryTransitiveDependency</SourceId>
+      <ContentRoot>$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)..\razorContent'))</ContentRoot>
+      <BasePath>_content\PackageLibraryTransitiveDependency</BasePath>
+      <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
+    </StaticWebAsset>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/wwwroot/js/pkg-transitive-dep.js b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/wwwroot/js/pkg-transitive-dep.js
new file mode 100644
index 0000000000..93e15b6ce1
--- /dev/null
+++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/wwwroot/js/pkg-transitive-dep.js
@@ -0,0 +1,3 @@
+(function () {
+  document.getElementById('pkg-transitive-dep').innerHTML = 'pkg-transitive-dep';
+})()
\ No newline at end of file
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 59d6a44c00..c5aa7665e8 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -4,6 +4,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
+    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
+    <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
+    <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
+    <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />
+
     <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" />
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
     <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
@@ -14,12 +20,15 @@
     <ProjectReference Include="..\MvcWithComponents\MvcWithComponents.csproj" />
     <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
     <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
-    <ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
-    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
-    <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
-    <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
     <ProjectReference Include="..\SimplePages\SimplePages.csproj" />
 
+    <!--
+      We don't add AppWithPackageAndP2PReference, PackageLibraryDirectDependency or PackageLibraryTransitiveDependency here
+      as PackageLibraryDirectDependency and PackageLibraryTransitiveDependency are test packages that
+      need to be produced on the fly and AppWithPackageAndP2PReference depends on them so adding them here
+      will make restore fail.
+    -->
+
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
   </ItemGroup>

From 5bad5de7ee95848f3a39334649d3d68a2cca13b9 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 21 May 2019 13:07:23 -0700
Subject: [PATCH 160/337] Directive attributes part 1: Support parameters in
 bound attributes (dotnet/aspnetcore-tooling#597)

* Directive attributes part 1: Support parameters in bound attributes

* update

* Fix test

* feedback

* Updated design

* Do case sensitive comparison

* more

* Bug fix
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9bbf2409483856b9949d11212eae62729a3a9005
---
 .../src/BoundAttributeDescriptor.cs           |   2 +
 .../src/BoundAttributeDescriptorBuilder.cs    |   7 +
 ...undAttributeDescriptorBuilderExtensions.cs |  34 +++-
 .../src/BoundAttributeDescriptorExtensions.cs |  22 +++
 .../src/BoundAttributeParameterDescriptor.cs  |  67 +++++++
 ...oundAttributeParameterDescriptorBuilder.cs |  24 +++
 ...undAttributeParameterDescriptorComparer.cs |  79 ++++++++
 .../src/ComponentResources.resx               |  10 +-
 .../Components/ComponentBindLoweringPass.cs   | 178 +++++++++++++++---
 .../Components/ComponentDiagnosticFactory.cs  |  45 ++++-
 .../src/DefaultBoundAttributeDescriptor.cs    |   2 +
 .../DefaultBoundAttributeDescriptorBuilder.cs |  37 ++++
 ...efaultBoundAttributeParameterDescriptor.cs |  34 ++++
 ...oundAttributeParameterDescriptorBuilder.cs | 106 +++++++++++
 ...faultRazorIntermediateNodeLoweringPhase.cs |  56 ++++--
 .../Intermediate/IntermediateNodeVisitor.cs   |   5 +
 ...elperAttributeParameterIntermediateNode.cs |  47 +++++
 .../src/Legacy/TagHelperBlockRewriter.cs      |  77 +++++---
 .../src/RazorDiagnosticFactory.cs             |  35 ++++
 .../src/RazorDiagnosticSeverity.cs            |   1 +
 .../src/Resources.resx                        |   6 +
 .../src/TagHelperMatchingConventions.cs       |  82 +++++++-
 .../ComponentCodeGenerationTestBase.cs        |  12 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../src/BindTagHelperDescriptorProvider.cs    |  50 ++++-
 .../BindTagHelperDescriptorProviderTest.cs    |  96 +++++-----
 .../IntermediateNodeWriter.cs                 |   5 +
 60 files changed, 1089 insertions(+), 262 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
index b416fddd61..96a0119ad8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
@@ -47,6 +47,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
 
+        public virtual IReadOnlyList<BoundAttributeParameterDescriptor> BoundAttributeParameters { get; protected set; }
+
         public bool HasErrors
         {
             get
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs
index b2cbfba675..b6fb01d7ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilder.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -26,5 +27,11 @@ namespace Microsoft.AspNetCore.Razor.Language
         public abstract IDictionary<string, string> Metadata { get; }
 
         public abstract RazorDiagnosticCollection Diagnostics { get; }
+
+        public virtual IReadOnlyList<BoundAttributeParameterDescriptorBuilder> BoundAttributeParameters { get; }
+
+        public virtual void BindAttributeParameter(Action<BoundAttributeParameterDescriptorBuilder> configure)
+        {
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
index 8d1ab038ab..d253429102 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
@@ -29,9 +29,9 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            if (builder.Metadata.ContainsKey(TagHelperMetadata.Common.PropertyName))
+            if (builder.Metadata.TryGetValue(TagHelperMetadata.Common.PropertyName, out var value))
             {
-                return builder.Metadata[TagHelperMetadata.Common.PropertyName];
+                return value;
             }
 
             return null;
@@ -51,5 +51,35 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.IndexerAttributeNamePrefix = attributeNamePrefix;
             builder.IndexerValueTypeName = valueTypeName;
         }
+
+        public static void SetPropertyName(this BoundAttributeParameterDescriptorBuilder builder, string propertyName)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (propertyName == null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            builder.Metadata[TagHelperMetadata.Common.PropertyName] = propertyName;
+        }
+
+        public static string GetPropertyName(this BoundAttributeParameterDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (builder.Metadata.TryGetValue(TagHelperMetadata.Common.PropertyName, out var value))
+            {
+                return value;
+            }
+
+            return null;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
index 62b713a8fe..5b5fbbf1ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -49,5 +50,26 @@ namespace Microsoft.AspNetCore.Razor.Language
             var isIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(name, attribute);
             return isIndexerNameMatch && attribute.IsIndexerBooleanProperty;
         }
+
+        public static bool IsDefaultKind(this BoundAttributeParameterDescriptor parameter)
+        {
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            return string.Equals(parameter.Kind, TagHelperConventions.DefaultKind, StringComparison.Ordinal);
+        }
+
+        public static string GetPropertyName(this BoundAttributeParameterDescriptor parameter)
+        {
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            parameter.Metadata.TryGetValue(TagHelperMetadata.Common.PropertyName, out var propertyName);
+            return propertyName;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs
new file mode 100644
index 0000000000..b0c98d8400
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs
@@ -0,0 +1,67 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class BoundAttributeParameterDescriptor : IEquatable<BoundAttributeParameterDescriptor>
+    {
+        protected BoundAttributeParameterDescriptor(string kind)
+        {
+            Kind = kind;
+        }
+
+        public string Kind { get; }
+
+        public bool IsEnum { get; protected set; }
+
+        public bool IsStringProperty { get; protected set; }
+
+        public bool IsBooleanProperty { get; protected set; }
+
+        public string Name { get; protected set; }
+
+        public string TypeName { get; protected set; }
+
+        public string Documentation { get; protected set; }
+
+        public string DisplayName { get; protected set; }
+
+        public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
+
+        public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                var errors = Diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+
+                return errors;
+            }
+        }
+
+        public override string ToString()
+        {
+            return DisplayName ?? base.ToString();
+        }
+
+        public bool Equals(BoundAttributeParameterDescriptor other)
+        {
+            return BoundAttributeParameterDescriptorComparer.Default.Equals(this, other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as BoundAttributeParameterDescriptor);
+        }
+
+        public override int GetHashCode()
+        {
+            return BoundAttributeParameterDescriptorComparer.Default.GetHashCode(this);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorBuilder.cs
new file mode 100644
index 0000000000..64ab98a6ed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorBuilder.cs
@@ -0,0 +1,24 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public abstract class BoundAttributeParameterDescriptorBuilder
+    {
+        public abstract string Name { get; set; }
+
+        public abstract string TypeName { get; set; }
+
+        public abstract bool IsEnum { get; set; }
+
+        public abstract string Documentation { get; set; }
+
+        public abstract string DisplayName { get; set; }
+
+        public abstract IDictionary<string, string> Metadata { get; }
+
+        public abstract RazorDiagnosticCollection Diagnostics { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs
new file mode 100644
index 0000000000..4f183bee01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs
@@ -0,0 +1,79 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class BoundAttributeParameterDescriptorComparer : IEqualityComparer<BoundAttributeParameterDescriptor>
+    {
+        /// <summary>
+        /// A default instance of the <see cref="BoundAttributeParameterDescriptorComparer"/>.
+        /// </summary>
+        public static readonly BoundAttributeParameterDescriptorComparer Default = new BoundAttributeParameterDescriptorComparer();
+
+        /// <summary>
+        /// A default instance of the <see cref="BoundAttributeParameterDescriptorComparer"/> that does case-sensitive comparison.
+        /// </summary>
+        internal static readonly BoundAttributeParameterDescriptorComparer CaseSensitive =
+            new BoundAttributeParameterDescriptorComparer(caseSensitive: true);
+
+        private readonly StringComparer _stringComparer;
+        private readonly StringComparison _stringComparison;
+
+        private BoundAttributeParameterDescriptorComparer(bool caseSensitive = false)
+        {
+            if (caseSensitive)
+            {
+                _stringComparer = StringComparer.Ordinal;
+                _stringComparison = StringComparison.Ordinal;
+            }
+            else
+            {
+                _stringComparer = StringComparer.OrdinalIgnoreCase;
+                _stringComparison = StringComparison.OrdinalIgnoreCase;
+            }
+        }
+
+        public virtual bool Equals(BoundAttributeParameterDescriptor descriptorX, BoundAttributeParameterDescriptor descriptorY)
+        {
+            if (object.ReferenceEquals(descriptorX, descriptorY))
+            {
+                return true;
+            }
+
+            if (descriptorX == null ^ descriptorY == null)
+            {
+                return false;
+            }
+
+            return
+                string.Equals(descriptorX.Kind, descriptorY.Kind, StringComparison.Ordinal) &&
+                descriptorX.IsEnum == descriptorY.IsEnum &&
+                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.Documentation, descriptorY.Documentation, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal) &&
+                Enumerable.SequenceEqual(
+                    descriptorX.Metadata.OrderBy(propertyX => propertyX.Key, StringComparer.Ordinal),
+                    descriptorY.Metadata.OrderBy(propertyY => propertyY.Key, StringComparer.Ordinal));
+        }
+
+        public virtual int GetHashCode(BoundAttributeParameterDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var hash = HashCodeCombiner.Start();
+            hash.Add(descriptor.Kind);
+            hash.Add(descriptor.Name, _stringComparer);
+
+            return hash.CombinedHash;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 48b636ec27..7a28e7bc11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -123,14 +123,20 @@
   <data name="BindTagHelper_Element_Documentation" xml:space="preserve">
     <value>Binds the provided expression to the '{0}' attribute and a change event delegate to the '{1}' attribute.</value>
   </data>
+  <data name="BindTagHelper_Element_Event_Documentation" xml:space="preserve">
+    <value>Specifies the event handler name to attach for change notifications for the value provided by the '{0}' attribute.</value>
+  </data>
   <data name="BindTagHelper_Element_Format_Documentation" xml:space="preserve">
     <value>Specifies a format to convert the value specified by the '{0}' attribute. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
   </data>
   <data name="BindTagHelper_Fallback_Documentation" xml:space="preserve">
-    <value>Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;bind-value-onchange="..."&lt;/code&gt; will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute.</value>
+    <value>Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;bind-value="..."&lt;/code&gt; and &lt;code&gt;bind-value:event="onchange"&lt;/code&gt; will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute.</value>
+  </data>
+  <data name="BindTagHelper_Fallback_Event_Documentation" xml:space="preserve">
+    <value>Specifies the event handler name to attach for change notifications for the value provided by the '{0}' attribute.</value>
   </data>
   <data name="BindTagHelper_Fallback_Format_Documentation" xml:space="preserve">
-    <value>Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;format-value="..."&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;bind-value-...&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
+    <value>Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;bind-value:format="..."&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;bind-value="..."&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
   </data>
   <data name="ChildContentParameterName_Documentation" xml:space="preserve">
     <value>Specifies the parameter name for the '{0}' child content expression.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index a02fd59235..6873560b1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -30,18 +30,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // For each bind *usage* we need to rewrite the tag helper node to map to basic constructs.
             var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+            var parameterReferences = documentNode.FindDescendantReferences<TagHelperAttributeParameterIntermediateNode>();
 
             var parents = new HashSet<IntermediateNode>();
             for (var i = 0; i < references.Count; i++)
             {
                 parents.Add(references[i].Parent);
             }
+            for (var i = 0; i < parameterReferences.Count; i++)
+            {
+                parents.Add(parameterReferences[i].Parent);
+            }
 
             foreach (var parent in parents)
             {
                 ProcessDuplicates(parent);
             }
 
+            // First, collect all the non-parameterized bind or bind-* attributes.
+            var bindEntries = new Dictionary<string, BindEntry>();
             for (var i = 0; i < references.Count; i++)
             {
                 var reference = references[i];
@@ -55,14 +62,60 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
                 {
-                    // Workaround for https://github.com/aspnet/Blazor/issues/703
-                    var rewritten = RewriteUsage(reference.Parent, node);
-                    reference.Remove();
+                    bindEntries[node.AttributeName] = new BindEntry(reference);
+                }
+            }
 
-                    for (var j = 0; j < rewritten.Length; j++)
+            // Now collect all the parameterized attributes and store them along with their corresponding bind or bind-* attributes.
+            for (var i = 0; i < parameterReferences.Count; i++)
+            {
+                var parameterReference = parameterReferences[i];
+                var node = (TagHelperAttributeParameterIntermediateNode)parameterReference.Node;
+
+                if (!parameterReference.Parent.Children.Contains(node))
+                {
+                    // This node was removed as a duplicate, skip it.
+                    continue;
+                }
+
+                if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
+                {
+                    if (!bindEntries.TryGetValue(node.AttributeNameWithoutParameter, out var entry))
                     {
-                        reference.Parent.Children.Add(rewritten[j]);
+                        // There is no corresponding bind node. Add a diagnostic and move on.
+                        parameterReference.Parent.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttributeParameter_MissingBind(
+                            node.Source,
+                            node.AttributeName));
                     }
+                    else if (node.BoundAttributeParameter.Name == "event")
+                    {
+                        entry.BindEventNode = node;
+                    }
+                    else if (node.BoundAttributeParameter.Name == "format")
+                    {
+                        entry.BindFormatNode = node;
+                    }
+                    else
+                    {
+                        // Unsupported bind attribute parameter. This can only happen if bound attribute descriptor
+                        // is configured to expect a parameter other than 'event' and 'format'.
+                    }
+
+                    // We've extracted what we need from the parameterized bind node. Remove it.
+                    parameterReference.Remove();
+                }
+            }
+
+            // We now have all the info we need to rewrite the tag helper.
+            foreach (var entry in bindEntries)
+            {
+                var reference = entry.Value.BindNodeReference;
+                var rewritten = RewriteUsage(reference.Parent, entry.Value);
+                reference.Remove();
+
+                for (var j = 0; j < rewritten.Length; j++)
+                {
+                    reference.Parent.Children.Add(rewritten[j]);
                 }
             }
         }
@@ -78,18 +131,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 // For each usage of the general 'fallback' bind tag helper, it could duplicate
                 // the usage of a more specific one. Look for duplicates and remove the fallback.
-                var attribute = node.Children[i] as TagHelperPropertyIntermediateNode;
+                TagHelperDescriptor tagHelper = null;
+                string attributeName = null;
+                var attribute = node.Children[i];
+                if (attribute is TagHelperPropertyIntermediateNode propertyAttribute)
+                {
+                    attributeName = propertyAttribute.AttributeName;
+                    tagHelper = propertyAttribute.TagHelper;
+                }
+                else if (attribute is TagHelperAttributeParameterIntermediateNode parameterAttribute)
+                {
+                    attributeName = parameterAttribute.AttributeName;
+                    tagHelper = parameterAttribute.TagHelper;
+                }
                 if (attribute != null &&
-                    attribute.TagHelper != null &&
-                    attribute.TagHelper.IsFallbackBindTagHelper())
+                    tagHelper != null &&
+                    tagHelper.IsFallbackBindTagHelper())
                 {
                     for (var j = 0; j < node.Children.Count; j++)
                     {
-                        var duplicate = node.Children[j] as TagHelperPropertyIntermediateNode;
+                        TagHelperDescriptor duplicateTagHelper = null;
+                        string duplicateAttributeName = null;
+                        var duplicate = node.Children[j];
+                        if (duplicate is TagHelperPropertyIntermediateNode duplicatePropertyAttribute)
+                        {
+                            duplicateAttributeName = duplicatePropertyAttribute.AttributeName;
+                            duplicateTagHelper = duplicatePropertyAttribute.TagHelper;
+                        }
+                        else if (duplicate is TagHelperAttributeParameterIntermediateNode duplicateParameterAttribute)
+                        {
+                            duplicateAttributeName = duplicateParameterAttribute.AttributeName;
+                            duplicateTagHelper = duplicateParameterAttribute.TagHelper;
+                        }
                         if (duplicate != null &&
-                            duplicate.TagHelper != null &&
-                            duplicate.TagHelper.IsBindTagHelper() &&
-                            duplicate.AttributeName == attribute.AttributeName &&
+                            duplicateTagHelper != null &&
+                            duplicateTagHelper.IsBindTagHelper() &&
+                            duplicateAttributeName == attributeName &&
                             !object.ReferenceEquals(attribute, duplicate))
                         {
                             // Found a duplicate - remove the 'fallback' in favor of the
@@ -104,16 +181,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // This is a workaround for a limitation where you can't write a tag helper that binds only
                 // when a specific attribute is **not** present.
                 if (attribute != null &&
-                    attribute.TagHelper != null &&
-                    attribute.TagHelper.IsInputElementFallbackBindTagHelper())
+                    tagHelper != null &&
+                    tagHelper.IsInputElementFallbackBindTagHelper())
                 {
                     for (var j = 0; j < node.Children.Count; j++)
                     {
-                        var duplicate = node.Children[j] as TagHelperPropertyIntermediateNode;
+                        TagHelperDescriptor duplicateTagHelper = null;
+                        string duplicateAttributeName = null;
+                        var duplicate = node.Children[j];
+                        if (duplicate is TagHelperPropertyIntermediateNode duplicatePropertyAttribute)
+                        {
+                            duplicateAttributeName = duplicatePropertyAttribute.AttributeName;
+                            duplicateTagHelper = duplicatePropertyAttribute.TagHelper;
+                        }
+                        else if (duplicate is TagHelperAttributeParameterIntermediateNode duplicateParameterAttribute)
+                        {
+                            duplicateAttributeName = duplicateParameterAttribute.AttributeName;
+                            duplicateTagHelper = duplicateParameterAttribute.TagHelper;
+                        }
                         if (duplicate != null &&
-                            duplicate.TagHelper != null &&
-                            duplicate.TagHelper.IsInputElementBindTagHelper() &&
-                            duplicate.AttributeName == attribute.AttributeName &&
+                            duplicateTagHelper != null &&
+                            duplicateTagHelper.IsInputElementBindTagHelper() &&
+                            duplicateAttributeName == attributeName &&
                             !object.ReferenceEquals(attribute, duplicate))
                         {
                             // Found a duplicate - remove the 'fallback' input tag helper in favor of the
@@ -144,7 +233,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private IntermediateNode[] RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        private IntermediateNode[] RewriteUsage(IntermediateNode parent, BindEntry bindEntry)
         {
             // Bind works similarly to a macro, it always expands to code that the user could have written.
             //
@@ -168,10 +257,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // We also assume that the element will be treated as a component for now because
             // multiple passes handle 'special' tag helpers. We have another pass that translates
             // a tag helper node back into 'regular' element when it doesn't have an associated component
+            var node = bindEntry.BindNode;
             if (!TryComputeAttributeNames(
                 parent,
-                node,
-                node.AttributeName,
+                bindEntry,
                 out var valueAttributeName,
                 out var changeAttributeName,
                 out var expressionAttributeName,
@@ -198,16 +287,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Look for a matching format node. If we find one then we need to pass the format into the
             // two nodes we generate.
             IntermediateToken format = null;
+            if (bindEntry.BindFormatNode != null)
+            {
+                format = GetAttributeContent(bindEntry.BindFormatNode);
+            }
+
             if (TryGetFormatNode(
                 parent,
                 node,
                 valueAttributeName,
                 out var formatNode))
             {
-                // Don't write the format out as its own attribute, just capture it as a string
-                // or expression.
+                // If there is a format- attribute present, add a warning to say that it's unsupported.
                 parent.Children.Remove(formatNode);
-                format = GetAttributeContent(formatNode);
+                parent.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_FormatNode_Unsupported(formatNode.Source));
             }
 
             var valueExpressionTokens = new List<IntermediateToken>();
@@ -336,10 +429,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         }
 
         private bool TryParseBindAttribute(
-            string attributeName,
+            BindEntry bindEntry,
             out string valueAttributeName,
             out string changeAttributeName)
         {
+            var attributeName = bindEntry.BindNode.AttributeName;
             valueAttributeName = null;
             changeAttributeName = null;
 
@@ -348,6 +442,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return false;
             }
 
+            if (bindEntry.BindEventNode != null)
+            {
+                changeAttributeName = GetAttributeContent(bindEntry.BindEventNode)?.Content?.Trim('"');
+            }
+
             if (attributeName == "bind")
             {
                 return true;
@@ -369,8 +468,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     return true;
 
                 case 3:
-                    changeAttributeName = segments[2];
                     valueAttributeName = segments[1];
+                    changeAttributeName = segments[2];
+                    bindEntry.BindNode.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_UnsupportedFormat(bindEntry.BindNode.Source));
                     return true;
 
                 default:
@@ -381,8 +481,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         // Attempts to compute the attribute names that should be used for an instance of 'bind'.
         private bool TryComputeAttributeNames(
             IntermediateNode parent,
-            TagHelperPropertyIntermediateNode node,
-            string attributeName,
+            BindEntry bindEntry,
             out string valueAttributeName,
             out string changeAttributeName,
             out string expressionAttributeName,
@@ -397,7 +496,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Even though some of our 'bind' tag helpers specify the attribute names, they
             // should still satisfy one of the valid syntaxes.
-            if (!TryParseBindAttribute(attributeName, out valueAttributeName, out changeAttributeName))
+            if (!TryParseBindAttribute(bindEntry, out valueAttributeName, out changeAttributeName))
             {
                 return false;
             }
@@ -408,6 +507,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // generated to match a specific tag and has metadata that identify the attributes.
             //
             // We expect 1 bind tag helper per-node.
+            var node = bindEntry.BindNode;
+            var attributeName = node.AttributeName;
             valueAttributeName = node.TagHelper.GetValueAttributeName() ?? valueAttributeName;
             changeAttributeName = node.TagHelper.GetChangeAttributeName() ?? changeAttributeName;
             expressionAttributeName = node.TagHelper.GetExpressionAttributeName() ?? expressionAttributeName;
@@ -630,7 +731,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             });
         }
 
-        private static IntermediateToken GetAttributeContent(TagHelperPropertyIntermediateNode node)
+        private static IntermediateToken GetAttributeContent(IntermediateNode node)
         {
             var template = node.FindDescendantNodes<TemplateIntermediateNode>().FirstOrDefault();
             if (template != null)
@@ -674,5 +775,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 };
             }
         }
+
+        private class BindEntry
+        {
+            public BindEntry(IntermediateNodeReference bindNodeReference)
+            {
+                BindNodeReference = bindNodeReference;
+                BindNode = (TagHelperPropertyIntermediateNode)bindNodeReference.Node;
+            }
+
+            public IntermediateNodeReference BindNodeReference { get; }
+
+            public TagHelperPropertyIntermediateNode BindNode { get; }
+
+            public TagHelperAttributeParameterIntermediateNode BindEventNode { get; set; }
+
+            public TagHelperAttributeParameterIntermediateNode BindFormatNode { get; set; }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 7d21e6493e..b5eb7395c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -166,7 +166,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             new RazorDiagnosticDescriptor(
             $"{DiagnosticPrefix}9991",
             () => "The attribute names could not be inferred from bind attribute '{0}'. Bind attributes should be of the form" +
-                "'bind', 'bind-value' or 'bind-value-change'",
+                "'bind' or 'bind-value' along with their corresponding optional parameters like 'bind-value:event', 'bind:format' etc.",
             RazorDiagnosticSeverity.Error);
 
         public static RazorDiagnostic CreateBindAttribute_InvalidSyntax(SourceSpan? source, string attribute)
@@ -332,5 +332,48 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             return RazorDiagnostic.Create(UnsupportedComponentImportContent, source ?? SourceSpan.Undefined);
         }
+
+        public static readonly RazorDiagnosticDescriptor BindAttributeParameter_MissingBind =
+            new RazorDiagnosticDescriptor(
+            $"{DiagnosticPrefix}10004",
+            () => "Could not find the non-parameterized bind attribute that corresponds to the attribute '{0}'.",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateBindAttributeParameter_MissingBind(SourceSpan? source, string attribute)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                BindAttributeParameter_MissingBind,
+                source ?? SourceSpan.Undefined,
+                attribute);
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor BindAttribute_UnsupportedFormat =
+            new RazorDiagnosticDescriptor(
+            $"{DiagnosticPrefix}10005",
+            () => "Specifying event handlers in bind attributes are no longer supported. Specify it using the bind:event=... attribute instead.",
+            RazorDiagnosticSeverity.Warning);
+
+        public static RazorDiagnostic CreateBindAttribute_UnsupportedFormat(SourceSpan? source)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                BindAttribute_UnsupportedFormat,
+                source ?? SourceSpan.Undefined);
+            return diagnostic;
+        }
+
+        public static readonly RazorDiagnosticDescriptor BindAttribute_FormatNode_Unsupported =
+            new RazorDiagnosticDescriptor(
+            $"{DiagnosticPrefix}10005",
+            () => "Specifying format using 'format-...' attributes are no longer supported. Specify it using the 'bind-...:format=...' attribute instead.",
+            RazorDiagnosticSeverity.Warning);
+
+        public static RazorDiagnostic CreateBindAttribute_FormatNode_Unsupported(SourceSpan? source)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                BindAttribute_FormatNode_Unsupported,
+                source ?? SourceSpan.Undefined);
+            return diagnostic;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
index 597d721a96..bff46f4549 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
@@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             string indexerTypeName,
             string documentation,
             string displayName,
+            BoundAttributeParameterDescriptor[] parameterDescriptors,
             Dictionary<string, string> metadata,
             RazorDiagnostic[] diagnostics) 
             : base(kind)
@@ -29,6 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             IndexerTypeName = indexerTypeName;
             Documentation = documentation;
             DisplayName = displayName;
+            BoundAttributeParameters = parameterDescriptors;
 
             Metadata = metadata;
             Diagnostics = diagnostics;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
index 0652686dd2..8bf57e156a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
@@ -31,6 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         private readonly DefaultTagHelperDescriptorBuilder _parent;
         private readonly string _kind;
         private readonly Dictionary<string, string> _metadata;
+        private List<DefaultBoundAttributeParameterDescriptorBuilder> _attributeParameterBuilders;
 
         private RazorDiagnosticCollection _diagnostics;
 
@@ -73,6 +74,20 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
+        public override void BindAttributeParameter(Action<BoundAttributeParameterDescriptorBuilder> configure)
+        {
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            EnsureAttributeParameterBuilders();
+
+            var builder = new DefaultBoundAttributeParameterDescriptorBuilder(this, _kind);
+            configure(builder);
+            _attributeParameterBuilders.Add(builder);
+        }
+
         public BoundAttributeDescriptor Build()
         {
             var validationDiagnostics = Validate();
@@ -82,6 +97,19 @@ namespace Microsoft.AspNetCore.Razor.Language
                 diagnostics.UnionWith(_diagnostics);
             }
 
+            var parameters = Array.Empty<BoundAttributeParameterDescriptor>();
+            if (_attributeParameterBuilders != null)
+            {
+                // Attribute parameters are case-sensitive.
+                var parameterset = new HashSet<BoundAttributeParameterDescriptor>(BoundAttributeParameterDescriptorComparer.CaseSensitive);
+                for (var i = 0; i < _attributeParameterBuilders.Count; i++)
+                {
+                    parameterset.Add(_attributeParameterBuilders[i].Build());
+                }
+
+                parameters = parameterset.ToArray();
+            }
+
             var descriptor = new DefaultBoundAttributeDescriptor(
                 _kind,
                 Name,
@@ -92,6 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 IndexerValueTypeName,
                 Documentation,
                 GetDisplayName(),
+                parameters,
                 new Dictionary<string, string>(Metadata),
                 diagnostics.ToArray());
 
@@ -205,5 +234,13 @@ namespace Microsoft.AspNetCore.Razor.Language
                 }
             }
         }
+
+        private void EnsureAttributeParameterBuilders()
+        {
+            if (_attributeParameterBuilders == null)
+            {
+                _attributeParameterBuilders = new List<DefaultBoundAttributeParameterDescriptorBuilder>();
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs
new file mode 100644
index 0000000000..349ffb68f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs
@@ -0,0 +1,34 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultBoundAttributeParameterDescriptor : BoundAttributeParameterDescriptor
+    {
+        public DefaultBoundAttributeParameterDescriptor(
+            string kind,
+            string name,
+            string typeName,
+            bool isEnum,
+            string documentation,
+            string displayName,
+            Dictionary<string, string> metadata,
+            RazorDiagnostic[] diagnostics)
+            : base(kind)
+        {
+            Name = name;
+            TypeName = typeName;
+            IsEnum = isEnum;
+            Documentation = documentation;
+            DisplayName = displayName;
+
+            Metadata = metadata;
+            Diagnostics = diagnostics;
+
+            IsStringProperty = typeName == typeof(string).FullName || typeName == "string";
+            IsBooleanProperty = typeName == typeof(bool).FullName || typeName == "bool";
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs
new file mode 100644
index 0000000000..d7c62286bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs
@@ -0,0 +1,106 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultBoundAttributeParameterDescriptorBuilder : BoundAttributeParameterDescriptorBuilder
+    {
+        private readonly DefaultBoundAttributeDescriptorBuilder _parent;
+        private readonly string _kind;
+        private readonly Dictionary<string, string> _metadata;
+
+        private RazorDiagnosticCollection _diagnostics;
+
+        public DefaultBoundAttributeParameterDescriptorBuilder(DefaultBoundAttributeDescriptorBuilder parent, string kind)
+        {
+            _parent = parent;
+            _kind = kind;
+
+            _metadata = new Dictionary<string, string>();
+        }
+
+        public override string Name { get; set; }
+
+        public override string TypeName { get; set; }
+
+        public override bool IsEnum { get; set; }
+
+        public override string Documentation { get; set; }
+
+        public override string DisplayName { get; set; }
+
+        public override IDictionary<string, string> Metadata => _metadata;
+
+        public override RazorDiagnosticCollection Diagnostics
+        {
+            get
+            {
+                if (_diagnostics == null)
+                {
+                    _diagnostics = new RazorDiagnosticCollection();
+                }
+
+                return _diagnostics;
+            }
+        }
+
+        public BoundAttributeParameterDescriptor Build()
+        {
+            var validationDiagnostics = Validate();
+            var diagnostics = new HashSet<RazorDiagnostic>(validationDiagnostics);
+            if (_diagnostics != null)
+            {
+                diagnostics.UnionWith(_diagnostics);
+            }
+            var descriptor = new DefaultBoundAttributeParameterDescriptor(
+                _kind,
+                Name,
+                TypeName,
+                IsEnum,
+                Documentation,
+                GetDisplayName(),
+                new Dictionary<string, string>(Metadata),
+                diagnostics.ToArray());
+
+            return descriptor;
+        }
+
+        private string GetDisplayName()
+        {
+            if (DisplayName != null)
+            {
+                return DisplayName;
+            }
+
+            return $":{Name}";
+        }
+
+        private IEnumerable<RazorDiagnostic> Validate()
+        {
+            if (string.IsNullOrWhiteSpace(Name))
+            {
+                var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeParameterNullOrWhitespace(_parent.Name);
+                yield return diagnostic;
+            }
+            else
+            {
+                foreach (var character in Name)
+                {
+                    if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeParameterName(
+                            _parent.Name,
+                            Name,
+                            character);
+
+                        yield return diagnostic;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index cfefed3b4a..ebbc8b9148 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1716,6 +1716,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
                 var attributeName = node.Name.GetContent();
                 var attributeValueNode = node.Value;
+
                 var associatedDescriptors = descriptors.Where(descriptor =>
                     descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
 
@@ -1723,24 +1724,47 @@ namespace Microsoft.AspNetCore.Razor.Language
                 {
                     foreach (var associatedDescriptor in associatedDescriptors)
                     {
-                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        if (TagHelperMatchingConventions.TryGetFirstBoundAttributeMatch(
+                            attributeName,
+                            associatedDescriptor,
+                            out var associatedAttributeDescriptor,
+                            out var indexerMatch,
+                            out var parameterMatch,
+                            out var associatedAttributeParameterDescriptor))
                         {
-                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
-                        });
+                            IntermediateNode attributeNode;
+                            if (parameterMatch &&
+                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(attributeName, out var attributeNameWithoutParameter, out var _))
+                            {
+                                attributeNode = new TagHelperAttributeParameterIntermediateNode()
+                                {
+                                    AttributeName = attributeName,
+                                    AttributeNameWithoutParameter = attributeNameWithoutParameter,
+                                    BoundAttributeParameter = associatedAttributeParameterDescriptor,
+                                    BoundAttribute = associatedAttributeDescriptor,
+                                    TagHelper = associatedDescriptor,
+                                    IsIndexerNameMatch = indexerMatch,
+                                    AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                                    Source = BuildSourceSpanFromNode(attributeValueNode),
+                                };
+                            }
+                            else
+                            {
+                                attributeNode = new TagHelperPropertyIntermediateNode()
+                                {
+                                    AttributeName = attributeName,
+                                    BoundAttribute = associatedAttributeDescriptor,
+                                    TagHelper = associatedDescriptor,
+                                    AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                                    Source = BuildSourceSpanFromNode(attributeValueNode),
+                                    IsIndexerNameMatch = indexerMatch,
+                                };
+                            }
 
-                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
-                        {
-                            AttributeName = attributeName,
-                            BoundAttribute = associatedAttributeDescriptor,
-                            TagHelper = associatedDescriptor,
-                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
-                            Source = BuildSourceSpanFromNode(attributeValueNode),
-                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
-                        };
-
-                        _builder.Push(setTagHelperProperty);
-                        VisitAttributeValue(attributeValueNode);
-                        _builder.Pop();
+                            _builder.Push(attributeNode);
+                            VisitAttributeValue(attributeValueNode);
+                            _builder.Pop();
+                        }
                     }
                 }
                 else
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
index 134294394d..e2e249ad2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -129,6 +129,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             VisitDefault(node);
         }
 
+        public virtual void VisitTagHelperAttributeParameter(TagHelperAttributeParameterIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
         public virtual void VisitComponent(ComponentIntermediateNode node)
         {
             VisitDefault(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
new file mode 100644
index 0000000000..91466e44b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TagHelperAttributeParameterIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public string AttributeNameWithoutParameter { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public BoundAttributeParameterDescriptor BoundAttributeParameter { get; set; }
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public bool IsIndexerNameMatch { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitTagHelperAttributeParameter(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(BoundAttributeParameter), BoundAttributeParameter?.DisplayName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index a585b8781b..1516bfc4c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -273,17 +273,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         // Determines the full name of the Type of the property corresponding to an attribute with the given name.
         private static string GetPropertyType(string name, IEnumerable<TagHelperDescriptor> descriptors)
         {
-            var firstBoundAttribute = FindFirstBoundAttribute(name, descriptors);
-            var isBoundToIndexer = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(name, firstBoundAttribute);
+            foreach (var descriptor in descriptors)
+            {
+                if (TagHelperMatchingConventions.TryGetFirstBoundAttributeMatch(name, descriptor, out var firstBoundAttribute, out var indexerMatch, out var _, out var _))
+                {
+                    if (indexerMatch)
+                    {
+                        return firstBoundAttribute.IndexerTypeName;
+                    }
+                    else
+                    {
+                        return firstBoundAttribute.TypeName;
+                    }
+                }
+            }
 
-            if (isBoundToIndexer)
-            {
-                return firstBoundAttribute?.IndexerTypeName;
-            }
-            else
-            {
-                return firstBoundAttribute?.TypeName;
-            }
+            return null;
         }
 
         // Create a TryParseResult for given name, filling in binding details.
@@ -292,13 +297,39 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             IEnumerable<TagHelperDescriptor> descriptors,
             HashSet<string> processedBoundAttributeNames)
         {
-            var firstBoundAttribute = FindFirstBoundAttribute(name, descriptors);
-            var isBoundAttribute = firstBoundAttribute != null;
-            var isBoundNonStringAttribute = isBoundAttribute && !firstBoundAttribute.ExpectsStringValue(name);
-            var isBoundBooleanAttribute = isBoundAttribute && firstBoundAttribute.ExpectsBooleanValue(name);
-            var isMissingDictionaryKey = isBoundAttribute &&
-                firstBoundAttribute.IndexerNamePrefix != null &&
-                name.Length == firstBoundAttribute.IndexerNamePrefix.Length;
+            var isBoundAttribute = false;
+            var isBoundNonStringAttribute = false;
+            var isBoundBooleanAttribute = false;
+            var isMissingDictionaryKey = false;
+
+            foreach (var descriptor in descriptors)
+            {
+                if (TagHelperMatchingConventions.TryGetFirstBoundAttributeMatch(
+                    name,
+                    descriptor,
+                    out var firstBoundAttribute,
+                    out var indexerMatch,
+                    out var parameterMatch,
+                    out var boundAttributeParameter))
+                {
+                    isBoundAttribute = true;
+                    if (parameterMatch)
+                    {
+                        isBoundNonStringAttribute = !boundAttributeParameter.IsStringProperty;
+                        isBoundBooleanAttribute = boundAttributeParameter.IsBooleanProperty;
+                        isMissingDictionaryKey = false;
+                    }
+                    else
+                    {
+                        isBoundNonStringAttribute = !firstBoundAttribute.ExpectsStringValue(name);
+                        isBoundBooleanAttribute = firstBoundAttribute.ExpectsBooleanValue(name);
+                        isMissingDictionaryKey = firstBoundAttribute.IndexerNamePrefix != null &&
+                            name.Length == firstBoundAttribute.IndexerNamePrefix.Length;
+                    }
+
+                    break;
+                }
+            }
 
             var isDuplicateAttribute = false;
             if (isBoundAttribute && !processedBoundAttributeNames.Add(name))
@@ -318,18 +349,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             };
         }
 
-        // Finds first TagHelperAttributeDescriptor matching given name.
-        private static BoundAttributeDescriptor FindFirstBoundAttribute(
-            string name,
-            IEnumerable<TagHelperDescriptor> descriptors)
-        {
-            var firstBoundAttribute = descriptors
-                .SelectMany(descriptor => descriptor.BoundAttributes)
-                .FirstOrDefault(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(name, attributeDescriptor));
-
-            return firstBoundAttribute;
-        }
-
         private static string GetAttributeValueContent(RazorSyntaxNode attributeBlock)
         {
             if (attributeBlock is MarkupTagHelperAttributeSyntax tagHelperAttribute)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
index bd24339b2f..e174c45c23 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -779,6 +779,41 @@ namespace Microsoft.AspNetCore.Razor.Language
             return diagnostic;
         }
 
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributeParameterNullOrWhitespace =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3013",
+                () => Resources.TagHelper_InvalidBoundAttributeParameterNullOrWhitespace,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributeParameterNullOrWhitespace(string attributeName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributeParameterNullOrWhitespace,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                attributeName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundAttributeParameterName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3014",
+                () => Resources.TagHelper_InvalidBoundAttributeParameterName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundAttributeParameterName(
+            string attributeName,
+            string invalidName,
+            char invalidCharacter)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundAttributeParameterName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                attributeName,
+                invalidName,
+                invalidCharacter);
+
+            return diagnostic;
+        }
+
         #endregion
 
         #region Rewriter Errors
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs
index 025449f384..2f53ae99cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticSeverity.cs
@@ -6,6 +6,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     public enum RazorDiagnosticSeverity
     {
         // Purposely using the same value as Roslyn here.
+        Warning = 2,
         Error = 3,
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index b08df3e762..d2eb94338e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -541,4 +541,10 @@
   <data name="NamespaceDirective_NamespaceToken_Name" xml:space="preserve">
     <value>Namespace</value>
   </data>
+  <data name="TagHelper_InvalidBoundAttributeParameterName" xml:space="preserve">
+    <value>Invalid tag helper bound attribute parameter '{1}' on bound attribute '{0}'. Tag helpers cannot bind to HTML attribute parameters with name '{1}' because the name contains a '{3}' character.</value>
+  </data>
+  <data name="TagHelper_InvalidBoundAttributeParameterNullOrWhitespace" xml:space="preserve">
+    <value>Invalid tag helper bound attribute parameter '{0}'. Tag helpers cannot bind to HTML attribute parameters with a null or empty name.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
index 1fb483c7ea..514acad767 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
@@ -128,7 +128,9 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public static bool CanSatisfyBoundAttribute(string name, BoundAttributeDescriptor descriptor)
         {
-            return SatisfiesBoundAttributeName(name, descriptor) || SatisfiesBoundAttributeIndexer(name, descriptor);
+            return SatisfiesBoundAttributeName(name, descriptor) ||
+                SatisfiesBoundAttributeIndexer(name, descriptor) ||
+                descriptor.BoundAttributeParameters.Any(p => SatisfiesBoundAttributeWithParameter(name, descriptor, p));
         }
 
         public static bool SatisfiesBoundAttributeIndexer(string name, BoundAttributeDescriptor descriptor)
@@ -138,6 +140,84 @@ namespace Microsoft.AspNetCore.Razor.Language
                 name.StartsWith(descriptor.IndexerNamePrefix, StringComparison.OrdinalIgnoreCase);
         }
 
+        public static bool SatisfiesBoundAttributeWithParameter(string name, BoundAttributeDescriptor parent, BoundAttributeParameterDescriptor descriptor)
+        {
+            if (TryGetBoundAttributeParameter(name, out var attributeName, out var parameterName))
+            {
+                var satisfiesBoundAttributeName = SatisfiesBoundAttributeName(attributeName, parent);
+                var satisfiesBoundAttributeIndexer = SatisfiesBoundAttributeIndexer(attributeName, parent);
+                var matchesParameter = string.Equals(descriptor.Name, parameterName, StringComparison.Ordinal);
+                return (satisfiesBoundAttributeName || satisfiesBoundAttributeIndexer) && matchesParameter;
+            }
+
+            return false;
+        }
+
+        public static bool TryGetBoundAttributeParameter(string fullAttributeName, out string boundAttributeName, out string parameterName)
+        {
+            boundAttributeName = null;
+            parameterName = null;
+
+            if (!string.IsNullOrEmpty(fullAttributeName) && fullAttributeName.IndexOf(':') != -1)
+            {
+                var segments = fullAttributeName.Split(new[] { ':' }, 2);
+                boundAttributeName = segments[0];
+                parameterName = segments[1];
+                return true;
+            }
+
+            return false;
+        }
+
+        public static bool TryGetFirstBoundAttributeMatch(
+            string name,
+            TagHelperDescriptor descriptor,
+            out BoundAttributeDescriptor boundAttribute,
+            out bool indexerMatch,
+            out bool parameterMatch,
+            out BoundAttributeParameterDescriptor boundAttributeParameter)
+        {
+            indexerMatch = false;
+            parameterMatch = false;
+            boundAttribute = null;
+            boundAttributeParameter = null;
+
+            if (string.IsNullOrEmpty(name) || descriptor == null)
+            {
+                return false;
+            }
+
+            // First, check if we have a bound attribute descriptor that matches the parameter if it exists.
+            foreach (var attribute in descriptor.BoundAttributes)
+            {
+                boundAttributeParameter = attribute.BoundAttributeParameters.FirstOrDefault(
+                    p => SatisfiesBoundAttributeWithParameter(name, attribute, p));
+
+                if (boundAttributeParameter != null)
+                {
+                    boundAttribute = attribute;
+                    indexerMatch = SatisfiesBoundAttributeIndexer(name, attribute);
+                    parameterMatch = true;
+                    return true;
+                }
+            }
+
+            // If we reach here, either the attribute name doesn't contain a parameter portion or
+            // the specified parameter isn't supported by any of the BoundAttributeDescriptors.
+            foreach (var attribute in descriptor.BoundAttributes)
+            {
+                if (CanSatisfyBoundAttribute(name, attribute))
+                {
+                    boundAttribute = attribute;
+                    indexerMatch = SatisfiesBoundAttributeIndexer(name, attribute);
+                    return true;
+                }
+            }
+
+            // No matches found.
+            return false;
+        }
+
         private static bool SatisfiesBoundAttributeName(string name, BoundAttributeDescriptor descriptor)
         {
             return string.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index ba2740b7ae..9be0e8e632 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -644,7 +644,7 @@ namespace Test
 }"));
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value-OnChanged=""ParentValue"" />
+<MyComponent bind-Value=""ParentValue"" bind-Value:event=""OnChanged"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -674,7 +674,7 @@ namespace Test
 }"));
 
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value-OnChanged=""ParentValue"" />
+<MyComponent bind-Value=""ParentValue"" bind-Value:event=""OnChanged"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -982,7 +982,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind=""@CurrentDate"" format-value=""MM/dd/yyyy""/>
+<input type=""text"" bind=""@CurrentDate"" bind:format=""MM/dd/yyyy""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
@@ -1000,7 +1000,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind=""@CurrentDate"" format-value=""@Format""/>
+<input type=""text"" bind=""@CurrentDate"" bind:format=""@Format""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
@@ -1056,7 +1056,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind-value-onchange=""@ParentValue"" />
+<input type=""text"" bind-value=""@ParentValue"" bind-value:event=""onchange"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -1074,7 +1074,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind-value-onchange=""@CurrentDate"" format-value=""MM/dd"" />
+<input type=""text"" bind-value=""@CurrentDate"" bind-value:event=""onchange"" bind-value:format=""MM/dd"" />
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 87f27b3d18..3867a27f26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                   ParentValue
+                         ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 3b8d1525ae..eff3bf473e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 81e5a357dd..1fad0343a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1022:25,35 [11] )
+Generated Location: (1012:25,25 [11] )
 |ParentValue|
 
-Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1627:47,7 [50] )
+Generated Location: (1617:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 656fc8534b..84daca5cb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                   ParentValue
+                         ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index f3cedf3203..226ba4ea8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 231f240274..0f77b3a689 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (951:25,35 [11] )
+Generated Location: (941:25,25 [11] )
 |ParentValue|
 
-Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1595:46,7 [50] )
+Generated Location: (1585:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 95f7a273d0..eaf0a8aae8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                         CurrentDate
+                                CurrentDate
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index 526e3587b1..92b02ddb5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -14,21 +14,21 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [101] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
-                HtmlContent - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+                HtmlContent - (101:0,101 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (101:0,101 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 031d39cb44..f70077ef5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (957:25,41 [11] )
+Generated Location: (948:25,32 [11] )
 |CurrentDate|
 
-Source Location: (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:36,7 [77] )
+Generated Location: (1311:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 1b9ea03181..4b3ecf0e64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                         ParentValue
+                                ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index e094fc08ec..9b37bd5daf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (56:0,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:0,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (75:0,75 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (75:0,75 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 8b3b1de528..daf85f2ae3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (957:25,41 [11] )
+Generated Location: (948:25,32 [11] )
 |ParentValue|
 
-Source Location: (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1302:36,7 [50] )
+Generated Location: (1293:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index a117c06d33..819736dad7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
             , 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                      Format
+                                                     Format
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index c9a15a829c..84d1fc6bb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -14,7 +14,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
@@ -23,12 +23,12 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
-                            IntermediateToken - (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
+                            IntermediateToken - (53:0,53 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
-                HtmlContent - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
+                HtmlContent - (62:0,62 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (62:0,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 467143fcae..8fa58f7f1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -3,18 +3,18 @@ Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (942:25,26 [11] )
 |CurrentDate|
 
-Source Location: (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:0,53 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1145:33,54 [6] )
+Generated Location: (1144:33,53 [6] )
 |Format|
 
-Source Location: (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1493:44,7 [135] )
+Generated Location: (1492:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 8cdcdf879a..d4468c828e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -14,7 +14,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [65] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
@@ -28,7 +28,7 @@ Document -
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
-                HtmlContent - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+                HtmlContent - (65:0,65 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (65:0,65 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index e339f220e7..4956ac6159 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (942:25,26 [11] )
 |CurrentDate|
 
-Source Location: (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 8b79a36fee..4c89e98c42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                   ParentValue
+                         ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 1a0472f8d3..fa220494f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 95edc8e771..6e6cebdcdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1202:31,7 [50] )
+Generated Location: (1192:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 17d6de2e61..64a178882f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                   ParentValue
+                         ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 149dd07593..f307ef9cba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (35:0,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 3c5137f6b5..2eab550e84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (59:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1184:31,7 [50] )
+Generated Location: (1174:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 7468db5040..fd94ca9573 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                         CurrentDate
+                                CurrentDate
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index f3287fdd97..ca7067e84f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -7,19 +7,19 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [101] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
-            CSharpCode - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index e6d06aeaf1..6b18dfcea7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (86:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1248:32,7 [77] )
+Generated Location: (1239:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index a0aa6809f4..5a71a7aba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                         ParentValue
+                                ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 35e51a87c6..45b1323b7d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (41:0,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 580244f905..f88931b97f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (65:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1230:32,7 [50] )
+Generated Location: (1221:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index c143f3dfa8..1708507077 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
             , 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                      Format
+                                                     Format
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index 0456e35fab..f17f9d6d5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
@@ -16,10 +16,10 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
-                            IntermediateToken - (54:0,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
+                            IntermediateToken - (53:0,53 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
-            CSharpCode - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
+            CSharpCode - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 6c715d821c..2bae793571 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
-Source Location: (72:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1421:40,7 [135] )
+Generated Location: (1420:40,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 18dea4fcb3..06547b365a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [65] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
@@ -21,5 +21,5 @@ Document -
                     HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
-            CSharpCode - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index a1f634d6af..da960879b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (75:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index f055cc3bfd..33113ec30f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -46,7 +46,7 @@ namespace Microsoft.CodeAnalysis.Razor
             //
             // We handle a few different cases here:
             //
-            //  1.  When given an attribute like **anywhere**'bind-value-onchange="@FirstName"' we will
+            //  1.  When given an attribute like **anywhere**'bind-value="@FirstName"' and 'bind-value:event="onchange"' we will
             //      generate the 'value' attribute and 'onchange' attribute. 
             //
             //      We don't do any transformation or inference for this case, because the developer has
@@ -143,15 +143,35 @@ namespace Microsoft.CodeAnalysis.Razor
             {
                 attribute.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
 
-                attribute.Name = "bind-...";
+                var attributeName = "bind-...";
+                attribute.Name = attributeName;
                 attribute.AsDictionary("bind-", typeof(object).FullName);
 
                 // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the toolips.
                 attribute.SetPropertyName("Bind");
                 attribute.TypeName = "System.Collections.Generic.Dictionary<string, object>";
+
+                attribute.BindAttributeParameter(parameter =>
+                {
+                    parameter.Name = "format";
+                    parameter.TypeName = typeof(string).FullName;
+                    parameter.Documentation = ComponentResources.BindTagHelper_Fallback_Format_Documentation;
+
+                    parameter.SetPropertyName("Format");
+                });
+
+                attribute.BindAttributeParameter(parameter =>
+                {
+                    parameter.Name = "event";
+                    parameter.TypeName = typeof(string).FullName;
+                    parameter.Documentation = string.Format(ComponentResources.BindTagHelper_Fallback_Event_Documentation, attributeName);
+
+                    parameter.SetPropertyName("Event");
+                });
             });
 
+            // This is no longer supported. This is just here so we can add a diagnostic later on when this matches.
             builder.BindAttribute(attribute =>
             {
                 attribute.Documentation = ComponentResources.BindTagHelper_Fallback_Format_Documentation;
@@ -237,6 +257,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
             return results;
         }
+
         private List<TagHelperDescriptor> CreateElementBindTagHelpers(List<ElementBindData> data)
         {
             var results = new List<TagHelperDescriptor>();
@@ -251,6 +272,8 @@ namespace Microsoft.CodeAnalysis.Razor
                 var formatName = entry.Suffix == null ? "Format_" + entry.ValueAttribute : "Format_" + entry.Suffix;
                 var formatAttributeName = entry.Suffix == null ? "format-" + entry.ValueAttribute : "format-" + entry.Suffix;
 
+                var eventName = entry.Suffix == null ? "Event_" + entry.ValueAttribute : "Event_" + entry.Suffix;
+
                 var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, name, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.BindTagHelper_Element_Documentation,
@@ -315,14 +338,32 @@ namespace Microsoft.CodeAnalysis.Razor
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                     // a C# property will crash trying to create the toolips.
                     a.SetPropertyName(name);
+
+                    a.BindAttributeParameter(parameter =>
+                    {
+                        parameter.Name = "format";
+                        parameter.TypeName = typeof(string).FullName;
+                        parameter.Documentation = string.Format(ComponentResources.BindTagHelper_Element_Format_Documentation, attributeName);
+
+                        parameter.SetPropertyName(formatName);
+                    });
+
+                    a.BindAttributeParameter(parameter =>
+                    {
+                        parameter.Name = "event";
+                        parameter.TypeName = typeof(string).FullName;
+                        parameter.Documentation = string.Format(ComponentResources.BindTagHelper_Element_Event_Documentation, attributeName);
+
+                        parameter.SetPropertyName(eventName);
+                    });
                 });
 
+                // This is no longer supported. This is just here so we can add a diagnostic later on when this matches.
                 builder.BindAttribute(attribute =>
                 {
-                    attribute.Documentation = string.Format(ComponentResources.BindTagHelper_Element_Format_Documentation, attributeName);
-
                     attribute.Name = formatAttributeName;
                     attribute.TypeName = "System.String";
+                    attribute.Documentation = string.Format(ComponentResources.BindTagHelper_Element_Format_Documentation, attributeName);
 
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                     // a C# property will crash trying to create the toolips.
@@ -376,7 +417,6 @@ namespace Microsoft.CodeAnalysis.Razor
                         if (tagHelper.BoundAttributes[j].Name == valueAttributeName)
                         {
                             valueAttribute = tagHelper.BoundAttributes[j];
-                            
                         }
 
                         if (tagHelper.BoundAttributes[j].Name == expressionAttributeName)
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 0265459112..f44969d253 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -395,33 +395,28 @@ namespace Test
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
 
-            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+            var parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("format"));
 
             // Invariants
-            Assert.Empty(attribute.Diagnostics);
-            Assert.False(attribute.HasErrors);
-            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
-            Assert.False(attribute.IsDefaultKind());
-            Assert.False(attribute.HasIndexer);
-            Assert.Null(attribute.IndexerNamePrefix);
-            Assert.Null(attribute.IndexerTypeName);
-            Assert.False(attribute.IsIndexerBooleanProperty);
-            Assert.False(attribute.IsIndexerStringProperty);
+            Assert.Empty(parameter.Diagnostics);
+            Assert.False(parameter.HasErrors);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, parameter.Kind);
+            Assert.False(parameter.IsDefaultKind());
 
             Assert.Equal(
                 "Specifies a format to convert the value specified by the 'bind' attribute. " + 
                 "The format string can currently only be used with expressions of type <code>DateTime</code>.",
-                attribute.Documentation);
+                parameter.Documentation);
 
-            Assert.Equal("format-myprop", attribute.Name);
-            Assert.Equal("Format_myprop", attribute.GetPropertyName());
-            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+            Assert.Equal("format", parameter.Name);
+            Assert.Equal("Format_myprop", parameter.GetPropertyName());
+            Assert.Equal(":format", parameter.DisplayName);
 
             // Defined from the property type
-            Assert.Equal("System.String", attribute.TypeName);
-            Assert.True(attribute.IsStringProperty);
-            Assert.False(attribute.IsBooleanProperty);
-            Assert.False(attribute.IsEnum);
+            Assert.Equal("System.String", parameter.TypeName);
+            Assert.True(parameter.IsStringProperty);
+            Assert.False(parameter.IsBooleanProperty);
+            Assert.False(parameter.IsEnum);
         }
 
         [Fact]
@@ -529,10 +524,10 @@ namespace Test
             Assert.Equal("Bind", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
 
-            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
-            Assert.Equal("format-myprop", attribute.Name);
-            Assert.Equal("Format_myprop", attribute.GetPropertyName());
-            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+            var parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("format"));
+            Assert.Equal("format", parameter.Name);
+            Assert.Equal("Format_myprop", parameter.GetPropertyName());
+            Assert.Equal(":format", parameter.DisplayName);
         }
 
         [Fact]
@@ -597,10 +592,10 @@ namespace Test
             Assert.Equal("Bind", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
 
-            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
-            Assert.Equal("format-myprop", attribute.Name);
-            Assert.Equal("Format_myprop", attribute.GetPropertyName());
-            Assert.Equal("string Test.BindAttributes.Format_myprop", attribute.DisplayName);
+            var parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("format"));
+            Assert.Equal("format", parameter.Name);
+            Assert.Equal("Format_myprop", parameter.GetPropertyName());
+            Assert.Equal(":format", parameter.DisplayName);
         }
 
         [Fact]
@@ -665,10 +660,10 @@ namespace Test
             Assert.Equal("Bind_somevalue", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind_somevalue", attribute.DisplayName);
 
-            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
-            Assert.Equal("format-somevalue", attribute.Name);
-            Assert.Equal("Format_somevalue", attribute.GetPropertyName());
-            Assert.Equal("string Test.BindAttributes.Format_somevalue", attribute.DisplayName);
+            var parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("format"));
+            Assert.Equal("format", parameter.Name);
+            Assert.Equal("Format_somevalue", parameter.GetPropertyName());
+            Assert.Equal(":format", parameter.DisplayName);
         }
 
         [Fact]
@@ -710,7 +705,7 @@ namespace Test
 
             Assert.Equal(
                 "Binds the provided expression to an attribute and a change event, based on the naming of " +
-                    "the bind attribute. For example: <code>bind-value-onchange=\"...\"</code> will assign the " +
+                    "the bind attribute. For example: <code>bind-value=\"...\"</code> and <code>bind-value:event=\"onchange\"</code> will assign the " +
                     "current value of the expression to the 'value' attribute, and assign a delegate that attempts " +
                     "to set the value to the 'onchange' attribute.",
                 bind.Documentation);
@@ -753,7 +748,7 @@ namespace Test
 
             Assert.Equal(
                 "Binds the provided expression to an attribute and a change event, based on the naming of " +
-                    "the bind attribute. For example: <code>bind-value-onchange=\"...\"</code> will assign the " +
+                    "the bind attribute. For example: <code>bind-value=\"...\"</code> and <code>bind-value:event=\"onchange\"</code> will assign the " +
                     "current value of the expression to the 'value' attribute, and assign a delegate that attempts " +
                     "to set the value to the 'onchange' attribute.",
                 attribute.Documentation);
@@ -770,37 +765,30 @@ namespace Test
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
 
-            attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("format"));
+            var parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("format"));
 
             // Invariants
-            Assert.Empty(attribute.Diagnostics);
-            Assert.False(attribute.HasErrors);
-            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, attribute.Kind);
-            Assert.False(attribute.IsDefaultKind());
-            Assert.True(attribute.HasIndexer);
-            Assert.Equal("format-", attribute.IndexerNamePrefix);
-            Assert.Equal("System.String", attribute.IndexerTypeName);
-            Assert.False(attribute.IsIndexerBooleanProperty);
-            Assert.True(attribute.IsIndexerStringProperty);
+            Assert.Empty(parameter.Diagnostics);
+            Assert.False(parameter.HasErrors);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, parameter.Kind);
+            Assert.False(parameter.IsDefaultKind());
 
             Assert.Equal(
                 "Specifies a format to convert the value specified by the corresponding bind attribute. " +
-                    "For example: <code>format-value=\"...\"</code> will apply a format string to the value " +
-                    "specified in <code>bind-value-...</code>. The format string can currently only be used with " +
+                    "For example: <code>bind-value:format=\"...\"</code> will apply a format string to the value " +
+                    "specified in <code>bind-value=\"...\"</code>. The format string can currently only be used with " +
                     "expressions of type <code>DateTime</code>.",
-                attribute.Documentation);
+                parameter.Documentation);
 
-            Assert.Equal("format-...", attribute.Name);
-            Assert.Equal("Format", attribute.GetPropertyName());
-            Assert.Equal(
-                "System.Collections.Generic.Dictionary<string, string> Microsoft.AspNetCore.Components.Bind.Format",
-                attribute.DisplayName);
+            Assert.Equal("format", parameter.Name);
+            Assert.Equal("Format", parameter.GetPropertyName());
+            Assert.Equal(":format", parameter.DisplayName);
 
             // Defined from the property type
-            Assert.Equal("System.Collections.Generic.Dictionary<string, string>", attribute.TypeName);
-            Assert.False(attribute.IsStringProperty);
-            Assert.False(attribute.IsBooleanProperty);
-            Assert.False(attribute.IsEnum);
+            Assert.Equal("System.String", parameter.TypeName);
+            Assert.True(parameter.IsStringProperty);
+            Assert.False(parameter.IsBooleanProperty);
+            Assert.False(parameter.IsEnum);
         }
 
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
index c83dbb7c79..38f3e0e31f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
@@ -128,6 +128,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
         }
 
+        public override void VisitTagHelperAttributeParameter(TagHelperAttributeParameterIntermediateNode node)
+        {
+            WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
+        }
+
         public override void VisitComponent(ComponentIntermediateNode node)
         {
             WriteContentNode(node, node.TagName);

From 72d017cc1b8e7fd3bf3d8ff9e9eb3722294c6e37 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 21 May 2019 15:42:56 -0700
Subject: [PATCH 161/337] Added support for @attribute directive
 (dotnet/aspnetcore-tooling#607)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/67b8a838dac513a40e0fe47d0d0ad128d6df386d
---
 .../src/ComponentResources.resx               | 13 +++-
 .../DirectiveDescriptorBuilderExtensions.cs   | 44 ++++++++++++
 .../src/DirectiveTokenKind.cs                 |  1 +
 .../src/Extensions/AttributeDirective.cs      | 31 +++++++++
 .../src/Extensions/AttributeDirectivePass.cs  | 43 ++++++++++++
 .../DesignTimeDirectiveTargetExtension.cs     |  7 ++
 .../src/Legacy/BalancingModes.cs              |  3 +-
 .../src/Legacy/CSharpCodeParser.cs            | 27 +++++++-
 .../src/RazorDiagnosticFactory.cs             | 10 +++
 .../src/RazorProjectEngine.cs                 |  1 +
 .../src/Resources.resx                        |  3 +
 ...irectiveDescriptorBuilderExtensionsTest.cs | 28 ++++++++
 .../CodeGenerationIntegrationTest.cs          | 12 ++++
 .../test/Legacy/RazorDirectivesTest.cs        | 68 +++++++++++++++++++
 .../test/RazorProjectEngineTest.cs            |  4 +-
 .../AttributeDirective.cshtml                 |  6 ++
 .../AttributeDirective_DesignTime.codegen.cs  | 50 ++++++++++++++
 .../AttributeDirective_DesignTime.ir.txt      | 25 +++++++
 ...AttributeDirective_DesignTime.mappings.txt | 20 ++++++
 .../AttributeDirective_Runtime.codegen.cs     | 47 +++++++++++++
 .../AttributeDirective_Runtime.ir.txt         | 16 +++++
 ...AttributeToken_BalancesBrackets.cspans.txt |  6 ++
 ..._AttributeToken_BalancesBrackets.stree.txt | 38 +++++++++++
 ...rsIfDoesNotStartWithOpenBracket.cspans.txt |  5 ++
 ...rorsIfDoesNotStartWithOpenBracket.diag.txt |  1 +
 ...orsIfDoesNotStartWithOpenBracket.stree.txt | 17 +++++
 ...AttributeToken_BalancesBrackets.cspans.txt |  7 ++
 ...eAttributeToken_BalancesBrackets.stree.txt | 45 ++++++++++++
 ...ptor_UnderstandsAttributeTokens.cspans.txt | 13 ++++
 ...iptor_UnderstandsAttributeTokens.stree.txt | 53 +++++++++++++++
 30 files changed, 637 insertions(+), 7 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirective.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirectivePass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.stree.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 7a28e7bc11..016d32c0c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -117,6 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="AttributeDirective_AttributeToken_Description" xml:space="preserve">
+    <value>The C# attribute that will be applied to the current class.</value>
+  </data>
+  <data name="AttributeDirective_AttributeToken_Name" xml:space="preserve">
+    <value>Attribute</value>
+  </data>
+  <data name="AttributeDirective_Description" xml:space="preserve">
+    <value>Specifies the C# attribute that will be applied to the current class.</value>
+  </data>
   <data name="BindTagHelper_Component_Documentation" xml:space="preserve">
     <value>Binds the provided expression to the '{0}' property and a change event delegate to the '{1}' property of the component.</value>
   </data>
@@ -151,10 +160,10 @@
     <value>Sets the '{0}' attribute to the provided string or delegate value. A delegate value should be of type '{1}'.</value>
   </data>
   <data name="ImplementsDirective_Description" xml:space="preserve">
-    <value>Declares an interface implementation for the current document.</value>
+    <value>Declares an interface implementation for the current class.</value>
   </data>
   <data name="ImplementsDirective_TypeToken_Description" xml:space="preserve">
-    <value>The interface type implemented by the current document.</value>
+    <value>The interface type implemented by the current class.</value>
   </data>
   <data name="ImplementsDirective_TypeToken_Name" xml:space="preserve">
     <value>TypeName</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
index 1744475609..e8257bba7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
@@ -95,6 +95,28 @@ namespace Microsoft.AspNetCore.Razor.Language
             return builder;
         }
 
+        public static IDirectiveDescriptorBuilder AddAttributeToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddAttributeToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddAttributeToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Attribute,
+                    optional: false,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
         public static IDirectiveDescriptorBuilder AddOptionalMemberToken(this IDirectiveDescriptorBuilder builder)
         {
             return AddOptionalMemberToken(builder, name: null, description: null);
@@ -182,5 +204,27 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             return builder;
         }
+
+        public static IDirectiveDescriptorBuilder AddOptionalAttributeToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddOptionalAttributeToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddOptionalAttributeToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Attribute,
+                    optional: true,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
index 4ee292c083..916a57c3ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
@@ -9,5 +9,6 @@ namespace Microsoft.AspNetCore.Razor.Language
         Namespace,
         Member,
         String,
+        Attribute,
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirective.cs
new file mode 100644
index 0000000000..6a2347f38e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirective.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal static class AttributeDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "attribute",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddAttributeToken(ComponentResources.AttributeDirective_AttributeToken_Name, ComponentResources.AttributeDirective_AttributeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = ComponentResources.AttributeDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component, FileKinds.ComponentImport);
+            builder.Features.Add(new AttributeDirectivePass());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirectivePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirectivePass.cs
new file mode 100644
index 0000000000..0a442cce42
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/AttributeDirectivePass.cs
@@ -0,0 +1,43 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal class AttributeDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                return;
+            }
+
+            var classIndex = @namespace.Children.IndexOf(@class);
+            foreach (var attribute in documentNode.FindDirectiveReferences(AttributeDirective.Directive))
+            {
+                var token = ((DirectiveIntermediateNode)attribute.Node).Tokens.FirstOrDefault();
+                if (token != null)
+                {
+                    var node = new CSharpCodeIntermediateNode
+                    {
+                        Source = token.Source
+                    };
+
+                    node.Children.Add(new IntermediateToken()
+                    {
+                        Content = token.Content,
+                        Source = token.Source,
+                        Kind = TokenKind.CSharp,
+                    });
+
+                    @namespace.Children.Insert(classIndex++, node);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
index 3823ab17e7..fb2594b138 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
@@ -44,6 +44,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                 return;
             }
 
+            if (tokenKind == DirectiveTokenKind.Attribute)
+            {
+                // We don't need to do anything special here.
+                // We let the Roslyn take care of providing syntax errors for C# attributes.
+                return;
+            }
+
             // Wrap the directive token in a lambda to isolate variable names.
             context.CodeWriter
                 .Write("((")
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs
index a5adf88a2a..898eb9133a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/BalancingModes.cs
@@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         BacktrackOnFailure = 1,
         NoErrorOnFailure = 2,
         AllowCommentsAndTemplates = 4,
-        AllowEmbeddedTransitions = 8
+        AllowEmbeddedTransitions = 8,
+        StopAtEndOfLine = 16,
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index 3390e570c4..b6fb7bfe6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1259,7 +1259,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                         if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
                             tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
-                            tokenDescriptor.Kind == DirectiveTokenKind.Type)
+                            tokenDescriptor.Kind == DirectiveTokenKind.Type ||
+                            tokenDescriptor.Kind == DirectiveTokenKind.Attribute)
                         {
                             SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
                             SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
@@ -1351,6 +1352,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                                     builder.Add(BuildDirective());
                                     return;
                                 }
+                                break;
+                            case DirectiveTokenKind.Attribute:
+                                if (At(SyntaxKind.LeftBracket))
+                                {
+                                    if (Balance(directiveBuilder, BalancingModes.NoErrorOnFailure))
+                                    {
+                                        TryAccept(SyntaxKind.RightBracket);
+                                    }
+                                }
+                                else
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsCSharpAttribute(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                
                                 break;
                         }
 
@@ -2426,7 +2445,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             var startPosition = CurrentStart.AbsoluteIndex;
             var nesting = 1;
-            if (!EndOfFile)
+            var stopAtEndOfLine = (mode & BalancingModes.StopAtEndOfLine) == BalancingModes.StopAtEndOfLine;
+            if (!EndOfFile &&
+                !(stopAtEndOfLine && At(SyntaxKind.NewLine)))
             {
                 var tokens = new List<SyntaxToken>();
                 do
@@ -2455,7 +2476,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         tokens.Add(CurrentToken);
                     }
                 }
-                while (nesting > 0 && NextToken());
+                while (nesting > 0 && NextToken() && !(stopAtEndOfLine && At(SyntaxKind.NewLine)));
 
                 if (nesting > 0)
                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
index e174c45c23..e1e1c9d621 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -416,6 +416,16 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             return RazorDiagnostic.Create(Parsing_InvalidTagHelperLookupText, location, lookupText);
         }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveExpectsCSharpAttribute =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1037",
+                () => Resources.DirectiveExpectsCSharpAttribute,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveExpectsCSharpAttribute(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveExpectsCSharpAttribute, location, directiveName);
+        }
         #endregion
 
         #region Semantic Errors
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index a150dc7020..32d2b68874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -118,6 +118,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 ImplementsDirective.Register(builder);
                 InheritsDirective.Register(builder);
                 NamespaceDirective.Register(builder);
+                AttributeDirective.Register(builder);
 
                 AddComponentFeatures(builder);
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index d2eb94338e..b50fe38e29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -547,4 +547,7 @@
   <data name="TagHelper_InvalidBoundAttributeParameterNullOrWhitespace" xml:space="preserve">
     <value>Invalid tag helper bound attribute parameter '{0}'. Tag helpers cannot bind to HTML attribute parameters with a null or empty name.</value>
   </data>
+  <data name="DirectiveExpectsCSharpAttribute" xml:space="preserve">
+    <value>The '{0}' directive expects a C# attribute.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs
index ffcb4f8ba9..6e78ea1eec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DirectiveDescriptorBuilderExtensionsTest.cs
@@ -118,5 +118,33 @@ namespace Microsoft.AspNetCore.Razor.Language
             Assert.Equal("Name", token.Name);
             Assert.Equal("Description", token.Description);
         }
+
+        [Fact]
+        public void AddAttributeToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddAttributeToken("Name", "Description"));
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Attribute, token.Kind);
+            Assert.False(token.Optional);
+            Assert.Equal("Name", token.Name);
+            Assert.Equal("Description", token.Description);
+        }
+
+        [Fact]
+        public void AddOptionalAttributeToken_AddsToken()
+        {
+            // Arrange & Act
+            var descriptor = DirectiveDescriptor.CreateDirective("custom", DirectiveKind.SingleLine, b => b.AddOptionalAttributeToken());
+
+            // Assert
+            var token = Assert.Single(descriptor.Tokens);
+            Assert.Equal(DirectiveTokenKind.Attribute, token.Kind);
+            Assert.True(token.Optional);
+            Assert.Null(token.Name);
+            Assert.Null(token.Description);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 924079b1d9..22133be03f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -488,6 +488,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             RunTimeTest();
         }
 
+        [Fact]
+        public void AttributeDirective_Runtime()
+        {
+            RunTimeTest();
+        }
+
         #endregion
 
         #region DesignTime
@@ -967,6 +973,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             DesignTimeTest();
         }
 
+        [Fact]
+        public void AttributeDirective_DesignTime()
+        {
+            DesignTimeTest();
+        }
+
         #endregion
 
         private void DesignTimeTest()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs
index 291331f915..946fea9b51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/RazorDirectivesTest.cs
@@ -906,5 +906,73 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseDocumentTest("@{ class }");
         }
+
+        [Fact]
+        public void DirectiveDescriptor_UnderstandsAttributeTokens()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddAttributeToken());
+
+            // Act & Assert
+            ParseDocumentTest(@"
+@custom [Serializable]
+@custom [DllImport(""user32.dll"", SetLastError=false, ExactSpelling=false)]
+",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_AttributeToken_BalancesBrackets()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddAttributeToken());
+
+            // Act & Assert
+            ParseDocumentTest(@"
+@custom [SomeCustom(new int[] { 1, 2, 3 }
+",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddAttributeToken());
+
+            // Act & Assert
+            ParseDocumentTest(@"
+@custom [SomeCustom(new int[]
+    {
+        1,
+        2,
+        3
+    }]
+",
+                new[] { descriptor });
+        }
+
+        [Fact]
+        public void DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket()
+        {
+            // Arrange
+            var descriptor = DirectiveDescriptor.CreateDirective(
+                "custom",
+                DirectiveKind.SingleLine,
+                b => b.AddAttributeToken());
+
+            // Act & Assert
+            ParseDocumentTest("@custom Serializable]",
+                new[] { descriptor });
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 96072a8cf1..76e7686fa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -45,6 +45,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var features = engine.EngineFeatures.OrderBy(f => f.GetType().Name).ToArray();
             Assert.Collection(
                 features,
+                feature => Assert.IsType<AttributeDirectivePass>(feature),
                 feature => Assert.IsType<ComponentBindLoweringPass>(feature),
                 feature => Assert.IsType<ComponentChildContentDiagnosticPass>(feature),
                 feature => Assert.IsType<ComponentComplexAttributeContentPass>(feature),
@@ -91,7 +92,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 directive => Assert.Same(FunctionsDirective.Directive, directive),
                 directive => Assert.Same(ImplementsDirective.Directive, directive),
                 directive => Assert.Same(InheritsDirective.Directive, directive),
-                directive => Assert.Same(NamespaceDirective.Directive, directive));
+                directive => Assert.Same(NamespaceDirective.Directive, directive),
+                directive => Assert.Same(AttributeDirective.Directive, directive));
         }
 
         private static void AssertDefaultTargetExtensions(RazorProjectEngine engine)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml
new file mode 100644
index 0000000000..638e221534
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml
@@ -0,0 +1,6 @@
+@attribute [System.Runtime.InteropServices.DllImport("user32.dll")]
+@attribute [assembly: AssemblyTitleAttribute("Some assembly")]
+@attribute [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]
+@attribute [Conditional("DEBUG"), Conditional("TEST1")]
+
+Hello World
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..a9a63af516
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [System.Runtime.InteropServices.DllImport("user32.dll")]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [assembly: AssemblyTitleAttribute("Some assembly")]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [Conditional("DEBUG"), Conditional("TEST1")]
+
+#line default
+#line hidden
+#nullable disable
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirective_DesignTime
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..143b299051
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        CSharpCode - (11:0,11 [56] AttributeDirective.cshtml)
+            IntermediateToken - (11:0,11 [56] AttributeDirective.cshtml) - CSharp - [System.Runtime.InteropServices.DllImport("user32.dll")]
+        CSharpCode - (80:1,11 [51] AttributeDirective.cshtml)
+            IntermediateToken - (80:1,11 [51] AttributeDirective.cshtml) - CSharp - [assembly: AssemblyTitleAttribute("Some assembly")]
+        CSharpCode - (144:2,11 [66] AttributeDirective.cshtml)
+            IntermediateToken - (144:2,11 [66] AttributeDirective.cshtml) - CSharp - [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]
+        CSharpCode - (223:3,11 [44] AttributeDirective.cshtml)
+            IntermediateToken - (223:3,11 [44] AttributeDirective.cshtml) - CSharp - [Conditional("DEBUG"), Conditional("TEST1")]
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirective_DesignTime -  - 
+            DesignTimeDirective - 
+                DirectiveToken - (11:0,11 [56] AttributeDirective.cshtml) - [System.Runtime.InteropServices.DllImport("user32.dll")]
+                DirectiveToken - (80:1,11 [51] AttributeDirective.cshtml) - [assembly: AssemblyTitleAttribute("Some assembly")]
+                DirectiveToken - (144:2,11 [66] AttributeDirective.cshtml) - [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]
+                DirectiveToken - (223:3,11 [44] AttributeDirective.cshtml) - [Conditional("DEBUG"), Conditional("TEST1")]
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (269:4,0 [13] AttributeDirective.cshtml)
+                    IntermediateToken - (269:4,0 [13] AttributeDirective.cshtml) - Html - \nHello World
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c76e0fc08c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (11:0,11 [56] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml)
+|[System.Runtime.InteropServices.DllImport("user32.dll")]|
+Generated Location: (271:7,11 [56] )
+|[System.Runtime.InteropServices.DllImport("user32.dll")]|
+
+Source Location: (80:1,11 [51] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml)
+|[assembly: AssemblyTitleAttribute("Some assembly")]|
+Generated Location: (503:14,11 [51] )
+|[assembly: AssemblyTitleAttribute("Some assembly")]|
+
+Source Location: (144:2,11 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml)
+|[DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]|
+Generated Location: (730:21,11 [66] )
+|[DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]|
+
+Source Location: (223:3,11 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml)
+|[Conditional("DEBUG"), Conditional("TEST1")]|
+Generated Location: (972:28,11 [44] )
+|[Conditional("DEBUG"), Conditional("TEST1")]|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..ec883320dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.codegen.cs
@@ -0,0 +1,47 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "796e795e99f31ccb6c596e30f8540f5de179132a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirective_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml")]
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+{
+    #line hidden
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [System.Runtime.InteropServices.DllImport("user32.dll")]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [assembly: AssemblyTitleAttribute("Some assembly")]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml"
+           [Conditional("DEBUG"), Conditional("TEST1")]
+
+#line default
+#line hidden
+#nullable disable
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"796e795e99f31ccb6c596e30f8540f5de179132a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirective_Runtime
+    {
+        #pragma warning disable 1998
+        public async System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\nHello World");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..98f79e9671
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_Runtime.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
+        CSharpCode - (11:0,11 [56] AttributeDirective.cshtml)
+            IntermediateToken - (11:0,11 [56] AttributeDirective.cshtml) - CSharp - [System.Runtime.InteropServices.DllImport("user32.dll")]
+        CSharpCode - (80:1,11 [51] AttributeDirective.cshtml)
+            IntermediateToken - (80:1,11 [51] AttributeDirective.cshtml) - CSharp - [assembly: AssemblyTitleAttribute("Some assembly")]
+        CSharpCode - (144:2,11 [66] AttributeDirective.cshtml)
+            IntermediateToken - (144:2,11 [66] AttributeDirective.cshtml) - CSharp - [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]
+        CSharpCode - (223:3,11 [44] AttributeDirective.cshtml)
+            IntermediateToken - (223:3,11 [44] AttributeDirective.cshtml) - CSharp - [Conditional("DEBUG"), Conditional("TEST1")]
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirective_Runtime -  - 
+            MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (269:4,0 [13] AttributeDirective.cshtml)
+                    IntermediateToken - (269:4,0 [13] AttributeDirective.cshtml) - Html - \nHello World
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.cspans.txt
new file mode 100644
index 0000000000..a9da33c82f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [43] )
+MetaCode span at (3:1,1 [6] ) (Accepts:None) - Parent: Directive block at (2:1,0 [43] )
+Code span at (9:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (2:1,0 [43] )
+Code span at (10:1,8 [35] ) (Accepts:NonWhitespace) - Parent: Directive block at (2:1,0 [43] )
+Markup span at (45:2,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [45] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.stree.txt
new file mode 100644
index 0000000000..1bd3280f63
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_BalancesBrackets.stree.txt
@@ -0,0 +1,38 @@
+RazorDocument - [0..45)::45 - [LF@custom [SomeCustom(new int[] { 1, 2, 3 }LF]
+    MarkupBlock - [0..45)::45
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..45)::43
+            RazorDirective - [2..45)::43 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..45)::42
+                    RazorMetaCode - [3..9)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [9..45)::36
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..45)::35 - [[SomeCustom(new int[] { 1, 2, 3 }LF] - Gen<DirectiveToken {;Attribute;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftBracket;[[];
+                            Identifier;[SomeCustom];
+                            LeftParenthesis;[(];
+                            Keyword;[new];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            Whitespace;[ ];
+                            LeftBrace;[{];
+                            Whitespace;[ ];
+                            IntegerLiteral;[1];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            IntegerLiteral;[2];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            IntegerLiteral;[3];
+                            Whitespace;[ ];
+                            RightBrace;[}];
+                            NewLine;[LF];
+        MarkupTextLiteral - [45..45)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.cspans.txt
new file mode 100644
index 0000000000..96e5261815
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.diag.txt
new file mode 100644
index 0000000000..46532eb8d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.diag.txt
@@ -0,0 +1 @@
+(1,9): Error RZ1037: The 'custom' directive expects a C# attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.stree.txt
new file mode 100644
index 0000000000..381265396e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AttributeToken_ErrorsIfDoesNotStartWithOpenBracket.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..21)::21 - [@custom Serializable]]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1037(8:0,8 [12] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..21)::13 - [Serializable]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Serializable];
+            RightBracket;[]];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.cspans.txt
new file mode 100644
index 0000000000..af411e2d6a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [83] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [81] )
+MetaCode span at (3:1,1 [6] ) (Accepts:None) - Parent: Directive block at (2:1,0 [81] )
+Code span at (9:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (2:1,0 [81] )
+Code span at (10:1,8 [71] ) (Accepts:NonWhitespace) - Parent: Directive block at (2:1,0 [81] )
+Markup span at (81:6,6 [2] ) (Accepts:Whitespace) - Parent: Directive block at (2:1,0 [81] )
+Markup span at (83:7,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [83] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.stree.txt
new file mode 100644
index 0000000000..e2b43fc967
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_MultilineAttributeToken_BalancesBrackets.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..83)::83 - [LF@custom [SomeCustom(new int[]LF    {LF        1,LF        2,LF        3LF    }]LF]
+    MarkupBlock - [0..83)::83
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..83)::81
+            RazorDirective - [2..83)::81 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..83)::80
+                    RazorMetaCode - [3..9)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [9..83)::74
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..81)::71 - [[SomeCustom(new int[]LF    {LF        1,LF        2,LF        3LF    }]] - Gen<DirectiveToken {;Attribute;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftBracket;[[];
+                            Identifier;[SomeCustom];
+                            LeftParenthesis;[(];
+                            Keyword;[new];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            LeftBrace;[{];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                            IntegerLiteral;[1];
+                            Comma;[,];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                            IntegerLiteral;[2];
+                            Comma;[,];
+                            NewLine;[LF];
+                            Whitespace;[        ];
+                            IntegerLiteral;[3];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                            RightBrace;[}];
+                            RightBracket;[]];
+                        MarkupEphemeralTextLiteral - [81..83)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [83..83)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.cspans.txt
new file mode 100644
index 0000000000..7911e989b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.cspans.txt
@@ -0,0 +1,13 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [102] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Directive block at (2:1,0 [24] )
+MetaCode span at (3:1,1 [6] ) (Accepts:None) - Parent: Directive block at (2:1,0 [24] )
+Code span at (9:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (2:1,0 [24] )
+Code span at (10:1,8 [14] ) (Accepts:NonWhitespace) - Parent: Directive block at (2:1,0 [24] )
+Markup span at (24:1,22 [2] ) (Accepts:Whitespace) - Parent: Directive block at (2:1,0 [24] )
+Markup span at (26:2,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [102] )
+Transition span at (26:2,0 [1] ) (Accepts:None) - Parent: Directive block at (26:2,0 [76] )
+MetaCode span at (27:2,1 [6] ) (Accepts:None) - Parent: Directive block at (26:2,0 [76] )
+Code span at (33:2,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (26:2,0 [76] )
+Code span at (34:2,8 [66] ) (Accepts:NonWhitespace) - Parent: Directive block at (26:2,0 [76] )
+Markup span at (100:2,74 [2] ) (Accepts:Whitespace) - Parent: Directive block at (26:2,0 [76] )
+Markup span at (102:3,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [102] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.stree.txt
new file mode 100644
index 0000000000..8ae8662dd6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsAttributeTokens.stree.txt
@@ -0,0 +1,53 @@
+RazorDocument - [0..102)::102 - [LF@custom [Serializable]LF@custom [DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]LF]
+    MarkupBlock - [0..102)::102
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..26)::24
+            RazorDirective - [2..26)::24 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [3..26)::23
+                    RazorMetaCode - [3..9)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [9..26)::17
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..24)::14 - [[Serializable]] - Gen<DirectiveToken {;Attribute;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftBracket;[[];
+                            Identifier;[Serializable];
+                            RightBracket;[]];
+                        MarkupEphemeralTextLiteral - [24..26)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [26..102)::76
+            RazorDirective - [26..102)::76 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [27..102)::75
+                    RazorMetaCode - [27..33)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [33..102)::69
+                        CSharpStatementLiteral - [33..34)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [34..100)::66 - [[DllImport("user32.dll", SetLastError=false, ExactSpelling=false)]] - Gen<DirectiveToken {;Attribute;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftBracket;[[];
+                            Identifier;[DllImport];
+                            LeftParenthesis;[(];
+                            StringLiteral;["user32.dll"];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[SetLastError];
+                            Assign;[=];
+                            Keyword;[false];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[ExactSpelling];
+                            Assign;[=];
+                            Keyword;[false];
+                            RightParenthesis;[)];
+                            RightBracket;[]];
+                        MarkupEphemeralTextLiteral - [100..102)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [102..102)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];

From 95bb698c5a5de0444a0e849dbd20e8f815b164e7 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 21 May 2019 16:37:08 -0700
Subject: [PATCH 162/337] Make duplicate attribute names an error
 (dotnet/aspnetcore-tooling#604)

This came up in the context of discussion around aspnet/AspNetCoredotnet/aspnetcore-tooling#5071.

Browsers use a 'first attribute wins' rule for evaluating attributes and
building the DOM - though duplicate attributes are considered to be a
spec violation.

Blazor wants to use 'last attribute wins' rules because that's most
sensible when you consider evaluation order and splatting.

This means that we have to have the markup block pass do the same thing
as the Blazor runtime when duplicates appear. However, since this is a
spec violation I'm proposing that we just make it an error (like we do
for malformed tags). There's no useful purpose for duplicate attributes
since browsers ignore it.

Since we're not going to allow this for elements. Let's go all of the
way and block it for components as well. And while we're here, lets
block some of the invalid cases where users try to mix onchange and
bind. These don't work today, so we should make them an error. If we
decide to add support for this case to the runtime that would require
compiler work anyway.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0c59ca5f74699efe8e1e046edb316af933eb469a
---
 .../Components/ComponentBindLoweringPass.cs   |  20 ++
 .../Components/ComponentDiagnosticFactory.cs  |  50 ++-
 ...mponentDuplicateAttributeDiagnosticPass.cs | 113 +++++++
 .../ComponentEventHandlerLoweringPass.cs      |  12 +-
 .../Components/ComponentMarkupBlockPass.cs    |   5 +-
 .../Components/ComponentMarkupEncodingPass.cs |   4 +-
 .../src/Components/ComponentMetadata.cs       |   5 +
 .../src/RazorProjectEngine.cs                 |   1 +
 ...entDuplicateAttributeDiagnosticPassTest.cs | 196 +++++++++++
 .../ComponentMarkupBlockPassTest.cs           |  27 ++
 .../ComponentCodeGenerationTestBase.cs        | 303 ++++++++++++++++++
 .../test/RazorProjectEngineTest.cs            |   1 +
 .../TestComponent.codegen.cs                  |  39 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  25 ++
 .../TestComponent.codegen.cs                  |  66 ++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  37 +++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  66 ++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  37 +++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  66 ++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  37 +++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  40 +++
 .../TestComponent.diagnostics.txt             |   2 +
 .../TestComponent.ir.txt                      |  28 ++
 .../TestComponent.codegen.cs                  |  39 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  25 ++
 .../TestComponent.codegen.cs                  |  27 ++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  32 ++
 .../TestComponent.codegen.cs                  |  54 ++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  44 +++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  45 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  42 +++
 .../TestComponent.mappings.txt                |  14 +
 .../TestComponent.codegen.cs                  |  35 ++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  32 ++
 .../TestComponent.mappings.txt                |   5 +
 .../TestComponent.codegen.cs                  |  27 ++
 .../TestComponent.diagnostics.txt             |   2 +
 .../TestComponent.ir.txt                      |  33 ++
 .../TestComponent.codegen.cs                  |  24 ++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  16 +
 .../TestComponent.codegen.cs                  |  50 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  26 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  50 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  26 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  50 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  26 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  25 ++
 .../TestComponent.diagnostics.txt             |   2 +
 .../TestComponent.ir.txt                      |  19 ++
 .../TestComponent.codegen.cs                  |  24 ++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  16 +
 .../TestComponent.codegen.cs                  |  31 ++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  25 ++
 .../TestComponent.codegen.cs                  |  54 ++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  33 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  46 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  31 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  38 +++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  25 ++
 .../TestComponent.codegen.cs                  |  32 ++
 .../TestComponent.diagnostics.txt             |   2 +
 .../TestComponent.ir.txt                      |  26 ++
 89 files changed, 2466 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDuplicateAttributeDiagnosticPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDuplicateAttributeDiagnosticPassTest.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 6873560b1f..a28fac0543 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -330,6 +330,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 var valueNode = new HtmlAttributeIntermediateNode()
                 {
+                    Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                    },
                     AttributeName = valueAttributeName,
                     Source = node.Source,
 
@@ -350,6 +354,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 var changeNode = new HtmlAttributeIntermediateNode()
                 {
+                    Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                    },
                     AttributeName = changeAttributeName,
                     Source = node.Source,
 
@@ -369,6 +377,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 var valueNode = new ComponentAttributeIntermediateNode(node)
                 {
+                    Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                    },
                     AttributeName = valueAttributeName,
                     BoundAttribute = valueAttribute, // Might be null if it doesn't match a component attribute
                     PropertyName = valueAttribute?.GetPropertyName(),
@@ -385,6 +397,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 var changeNode = new ComponentAttributeIntermediateNode(node)
                 {
+                    Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                    },
                     AttributeName = changeAttributeName,
                     BoundAttribute = changeAttribute, // Might be null if it doesn't match a component attribute
                     PropertyName = changeAttribute?.GetPropertyName(),
@@ -406,6 +422,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     expressionNode = new ComponentAttributeIntermediateNode(node)
                     {
+                        Annotations =
+                        {
+                            [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        },
                         AttributeName = expressionAttributeName,
                         BoundAttribute = expressionAttribute,
                         PropertyName = expressionAttribute.GetPropertyName(),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index b5eb7395c9..aa416b3da4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -364,7 +364,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor BindAttribute_FormatNode_Unsupported =
             new RazorDiagnosticDescriptor(
-            $"{DiagnosticPrefix}10005",
+            $"{DiagnosticPrefix}10006",
             () => "Specifying format using 'format-...' attributes are no longer supported. Specify it using the 'bind-...:format=...' attribute instead.",
             RazorDiagnosticSeverity.Warning);
 
@@ -375,5 +375,53 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 source ?? SourceSpan.Undefined);
             return diagnostic;
         }
+
+        public static readonly RazorDiagnosticDescriptor DuplicateMarkupAttribute =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10007",
+                () => "The attribute '{0}' is used two or more times for this element. Attributes must be unique (case-insensitive).",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_DuplicateMarkupAttribute(string attributeName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(DuplicateMarkupAttribute, source ?? SourceSpan.Undefined, attributeName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor DuplicateMarkupAttributeDirective =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10008",
+                () =>
+                    "The attribute '{0}' is used two or more times for this element. Attributes must be unique (case-insensitive). " +
+                    "The attribute '{0}' is used by the '{1}' directive attribute.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_DuplicateMarkupAttributeDirective(string attributeName, string directiveAttributeName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(DuplicateMarkupAttributeDirective, source ?? SourceSpan.Undefined, attributeName, directiveAttributeName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor DuplicateComponentParameter =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10009",
+                () => "The component parameter '{0}' is used two or more times for this component. Parameters must be unique (case-insensitive).",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_DuplicateComponentParameter(string attributeName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(DuplicateComponentParameter, source ?? SourceSpan.Undefined, attributeName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor DuplicateComponentParameterDirective =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10010",
+                () =>
+                    "The component parameter '{0}' is used two or more times for this component. Parameters must be unique (case-insensitive). " +
+                    "The component parameter '{0}' is generated by the '{1}' directive attribute.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_DuplicateComponentParameterDirective(string attributeName, string directiveAttributeName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(DuplicateComponentParameterDirective, source ?? SourceSpan.Undefined, attributeName, directiveAttributeName);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDuplicateAttributeDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDuplicateAttributeDiagnosticPass.cs
new file mode 100644
index 0000000000..83936bf28d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDuplicateAttributeDiagnosticPass.cs
@@ -0,0 +1,113 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal sealed class ComponentMarkupDiagnosticPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
+    {
+        public static readonly int DefaultOrder = 10000;
+
+        public override int Order => DefaultOrder;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            private Dictionary<string, (string name, IntermediateNode node)> _attributes = new Dictionary<string, (string, IntermediateNode)>(StringComparer.OrdinalIgnoreCase);
+
+            public override void VisitMarkupElement(MarkupElementIntermediateNode node)
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i] is HtmlAttributeIntermediateNode attribute && attribute.AttributeName != null)
+                    {
+                        if (_attributes.TryGetValue(attribute.AttributeName, out var other))
+                        {
+                            // As a special case we want to point it out explicitly where a directive or other construct
+                            // has emitted an attribute that causes a conflict. We're already looking at the lowered version
+                            // of this construct, so it's easy to detect. We just need the original name to report the issue.
+                            //
+                            // Example: `bind-value` will set `value` and `onchange`.
+
+                            var originalAttributeName =
+                                attribute.Annotations[ComponentMetadata.Common.OriginalAttributeName] as string ??
+                                other.node.Annotations[ComponentMetadata.Common.OriginalAttributeName] as string;
+                            if (originalAttributeName != null)
+                            {
+                                other.node.Diagnostics.Add(ComponentDiagnosticFactory.Create_DuplicateMarkupAttributeDirective(
+                                    other.name,
+                                    originalAttributeName,
+                                    other.node.Source ?? node.Source));
+                            }
+                            else
+                            {
+                                // This is a conflict in the code the user wrote. 
+                                other.node.Diagnostics.Add(ComponentDiagnosticFactory.Create_DuplicateMarkupAttribute(
+                                    other.name,
+                                    other.node.Source ?? node.Source));
+                            }
+                        }
+
+                        // Replace the attribute we were previously tracking. Then if you have three, the two on the left will have
+                        // diagnostics.
+                        _attributes[attribute.AttributeName] = (attribute.AttributeName, attribute);
+                    }
+                }
+
+                _attributes.Clear();
+                base.VisitMarkupElement(node);
+            }
+
+            public override void VisitComponent(ComponentIntermediateNode node)
+            {
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    // Note that we don't handle ChildContent cases here. Those have their own pass for diagnostics.
+                    if (node.Children[i] is ComponentAttributeIntermediateNode attribute && attribute.AttributeName != null)
+                    {
+                        if (_attributes.TryGetValue(attribute.AttributeName, out var other))
+                        {
+                            // As a special case we want to point it out explicitly where a directive or other construct
+                            // has emitted an attribute that causes a conflict. We're already looking at the lowered version
+                            // of this construct, so it's easy to detect. We just need the original name to report the issue.
+                            //
+                            // Example: `bind-Value` will set `Value` and `ValueChanged`.
+                            var originalAttributeName =
+                                attribute.Annotations[ComponentMetadata.Common.OriginalAttributeName] as string ??
+                                other.node.Annotations[ComponentMetadata.Common.OriginalAttributeName] as string;
+                            if (originalAttributeName != null)
+                            {
+                                other.node.Diagnostics.Add(ComponentDiagnosticFactory.Create_DuplicateComponentParameterDirective(
+                                    other.name,
+                                    originalAttributeName,
+                                    other.node.Source ?? node.Source));
+                            }
+                            else
+                            {
+                                // This is a conflict in the code the user wrote. 
+                                other.node.Diagnostics.Add(ComponentDiagnosticFactory.Create_DuplicateComponentParameter(
+                                    other.name,
+                                    other.node.Source ?? node.Source));
+                            }
+                        }
+
+                        // Replace the attribute we were previously tracking. Then if you have three, the two on the left will have
+                        // diagnostics.
+                        _attributes[attribute.AttributeName] = (attribute.AttributeName, attribute);
+                    }
+                }
+
+                _attributes.Clear();
+                base.VisitComponent(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index aeefbab150..74ceb8c236 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -151,6 +151,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 var result = new HtmlAttributeIntermediateNode()
                 {
+                    Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                    },
                     AttributeName = node.AttributeName,
                     Source = node.Source,
 
@@ -173,7 +177,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
             else
             {
-                var result = new ComponentAttributeIntermediateNode(node);
+                var result = new ComponentAttributeIntermediateNode(node)
+                {
+                    Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                    },
+                };
 
                 result.Children.Clear();
                 result.Children.Add(new CSharpExpressionIntermediateNode());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
index 4d467d6203..8578b6993e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
@@ -17,7 +17,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     internal class ComponentMarkupBlockPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Runs LATE because we want to destroy structure.
-        public override int Order => 10000;
+        //
+        // We also need to run after ComponentMarkupDiagnosticPass to avoid destroying diagnostics
+        // added in that pass.
+        public override int Order => ComponentMarkupDiagnosticPass.DefaultOrder + 10;
 
         protected override void ExecuteCore(
             RazorCodeDocument codeDocument,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
index b35824c45d..186743e5b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupEncodingPass.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 
@@ -14,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     internal class ComponentMarkupEncodingPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
     {
         // Runs after ComponentMarkupBlockPass
-        public override int Order => 10010;
+        public override int Order => ComponentMarkupDiagnosticPass.DefaultOrder + 20;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index f57daad348..dc620c8f4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -47,6 +47,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return className.StartsWith(MangledClassNamePrefix, StringComparison.Ordinal);
         }
 
+        public static class Common
+        {
+            public static readonly string OriginalAttributeName = "Common.OriginalAttributeName";
+        }
+
         public static class Bind
         {
             public static readonly string RuntimeName = "Components.None";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index 32d2b68874..9ae6652fe7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -235,6 +235,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.Features.Add(new ComponentTemplateDiagnosticPass());
             builder.Features.Add(new ComponentGenericTypePass());
             builder.Features.Add(new ComponentChildContentDiagnosticPass());
+            builder.Features.Add(new ComponentMarkupDiagnosticPass());
             builder.Features.Add(new ComponentMarkupBlockPass());
             builder.Features.Add(new ComponentMarkupEncodingPass());
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDuplicateAttributeDiagnosticPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDuplicateAttributeDiagnosticPassTest.cs
new file mode 100644
index 0000000000..fa6132337b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDuplicateAttributeDiagnosticPassTest.cs
@@ -0,0 +1,196 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // These tests are really basic and cover a few different structures. The components part of this
+    // pass is hard to unit test, so component cases are covered by integration tests.
+    public class ComponentDuplicateAttributeDiagnosticPassTest
+    {
+        public ComponentDuplicateAttributeDiagnosticPassTest()
+        {
+            Pass = new ComponentMarkupDiagnosticPass();
+            ProjectEngine = (DefaultRazorProjectEngine)RazorProjectEngine.Create(
+                RazorConfiguration.Default,
+                RazorProjectFileSystem.Create(Environment.CurrentDirectory),
+                b =>
+                {
+                    // Don't run the markup mutating passes.
+                    b.Features.Remove(b.Features.OfType<ComponentMarkupDiagnosticPass>().Single());
+                    b.Features.Remove(b.Features.OfType<ComponentMarkupBlockPass>().Single());
+                    b.Features.Remove(b.Features.OfType<ComponentMarkupEncodingPass>().Single());
+                });
+            Engine = ProjectEngine.Engine;
+
+            Pass.Engine = Engine;
+        }
+        
+        private DefaultRazorProjectEngine ProjectEngine { get; }
+
+        private RazorEngine Engine { get; }
+
+        private ComponentMarkupDiagnosticPass Pass { get; }
+
+        [Fact]
+        public void Execute_NoDuplicates()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"">
+    <div></div>
+    <ul a=""d"" b="""" c>
+      <li id=""15""></li>
+    </ul>
+  </head>
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void Execute_FindDuplicate()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"">
+    <div></div>
+    <ul a=""d"" b="""" c a=""another"">
+      <li id=""15""></li>
+    </ul>
+  </head>
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var diagnostic = Assert.Single(documentNode.GetAllDiagnostics());
+            Assert.Equal(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, diagnostic.Id);
+
+            var node = documentNode.FindDescendantNodes<HtmlAttributeIntermediateNode>().Where(n => n.HasDiagnostics).Single();
+            Assert.Equal("a", node.AttributeName);
+            Assert.Equal(node.Source, diagnostic.Span);
+        }
+
+        [Fact]
+        public void Execute_FindDuplicate_CaseInsensitive()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"">
+    <div></div>
+    <ul attr=""d"" b="""" c ATTR=""another"">
+      <li id=""15""></li>
+    </ul>
+  </head>
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var diagnostic = Assert.Single(documentNode.GetAllDiagnostics());
+            Assert.Equal(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, diagnostic.Id);
+
+            var node = documentNode.FindDescendantNodes<HtmlAttributeIntermediateNode>().Where(n => n.HasDiagnostics).Single();
+            Assert.Equal("attr", node.AttributeName);
+            Assert.Equal(node.Source, diagnostic.Span);
+        }
+
+        [Fact]
+        public void Execute_FindDuplicate_Multiple()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <head cool=""beans"">
+    <div></div>
+    <ul attr=""d"" b="""" c attr=""another"" attr>
+      <li id=""15""></li>
+    </ul>
+  </head>
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var diagnostics = documentNode.GetAllDiagnostics();
+            var nodes = documentNode.FindDescendantNodes<HtmlAttributeIntermediateNode>().Where(n => n.HasDiagnostics).ToArray();
+
+            Assert.Equal(2, diagnostics.Count);
+            Assert.Equal(2, nodes.Length);
+
+            for (var i = 0; i < 2; i++)
+            {
+                var diagnostic = diagnostics[i];
+                var node = nodes[i];
+
+                Assert.Equal(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, diagnostic.Id);
+                Assert.Equal("attr", node.AttributeName);
+                Assert.Equal(node.Source, diagnostic.Span);
+            }
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            // Normalize newlines since we are testing lengths of things.
+            content = content.Replace("\r", "");
+            content = content.Replace("\n", "\r\n");
+
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return ProjectEngine.CreateCodeDocumentCore(source, FileKinds.Component);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < Engine.Phases.Count; i++)
+            {
+                var phase = Engine.Phases[i];
+                if (phase is IRazorCSharpLoweringPhase)
+                {
+                    break;
+                }
+
+                phase.Execute(codeDocument);
+            }
+
+            var document = codeDocument.GetDocumentIntermediateNode();
+            Engine.Features.OfType<ComponentDocumentClassifierPass>().Single().Execute(codeDocument, document);
+            return document;
+        }
+
+        private class StaticTagHelperFeature : ITagHelperFeature
+        {
+            public RazorEngine Engine { get; set; }
+
+            public List<TagHelperDescriptor> TagHelpers { get; set; }
+
+            public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
+            {
+                return TagHelpers;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
index b823d72ef8..75c32a7878 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
@@ -325,6 +325,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
         }
 
+        // We want duplicate attributes to result in an error and prevent rewriting.
+        //
+        // This is because Blazor de-duplicates attributes differently from browsers, so we don't
+        // want to allow any markup blocks to exist with duplicate attributes or else they will have
+        // the browser's behavior.
+        [Fact]
+        public void Execute_CannotRewriteHtml_DuplicateAttribute()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  <a href=""test1"" href=""test2""></a>
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
+
+            var diagnostic = Assert.Single(documentNode.GetAllDiagnostics());
+            Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, diagnostic.Id);
+        }
+
         [Fact]
         public void Execute_RewritesHtml_MismatchedClosingTag()
         {
@@ -385,6 +411,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             var document = codeDocument.GetDocumentIntermediateNode();
             Engine.Features.OfType<ComponentDocumentClassifierPass>().Single().Execute(codeDocument, document);
+            Engine.Features.OfType<ComponentMarkupDiagnosticPass>().Single().Execute(codeDocument, document);
             return document;
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 9be0e8e632..d9fcc74ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
@@ -3795,6 +3796,308 @@ namespace New.Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void DuplicateMarkupAttributes_IsAnError()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <a href=""/cool-url"" style="""" disabled href=""/even-cooler-url"">Learn the ten cool tricks your compiler author will hate!</a>
+</div>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, diagnostic.Id);
+        }
+
+        // Right now this is almost indistinguishable from the previous case, but when we add the @ for directive attributes
+        // it won't be. This is a placeholder to be updated when that change goes in.
+        [Fact]
+        public void DuplicateMarkupAttributes_IsAnError_EventHandler()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <a onclick=""test()"" onclick=""@(() => {})"">Learn the ten cool tricks your compiler author will hate!</a>
+</div>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttributeDirective.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateMarkupAttributes_Multiple_IsAnError()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <a href=""/cool-url"" style="""" disabled href=""/even-cooler-url"" href>Learn the ten cool tricks your compiler author will hate!</a>
+</div>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            Assert.All(generated.Diagnostics, d =>
+            {
+                Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, d.Id);
+            });
+        }
+
+        [Fact]
+        public void DuplicateMarkupAttributes_IsAnError_BindValue()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <input type=""text"" value=""17"" bind=""@text""></input>
+</div>
+@functions {
+    private string text = ""hi"";
+}
+");
+
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttributeDirective.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateMarkupAttributes_IsAnError_BindOnInput()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <input type=""text"" bind-value=""@text"" bind-value:event=""oninput"" oninput=""@(() => {})""></input>
+</div>
+@functions {
+    private string text = ""hi"";
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttributeDirective.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateComponentParameters_IsAnError()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Message { get; private set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Message=""test"" mESSAGE=""test"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateComponentParameter.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateComponentParameters_IsAnError_Multiple()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Message { get; private set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Message=""test"" mESSAGE=""test"" Message=""anotherone"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            Assert.All(generated.Diagnostics, d =>
+            {
+                Assert.Same(ComponentDiagnosticFactory.DuplicateComponentParameter.Id, d.Id);
+            });
+        }
+
+        [Fact]
+        public void DuplicateComponentParameters_IsAnError_WeaklyTyped()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Message { get; private set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Foo=""test"" foo=""test"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateComponentParameter.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateComponentParameters_IsAnError_BindMessage()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Message { get; private set; }
+        [Parameter] public EventCallback<string> MessageChanged { get; private set; }
+        [Parameter] public Expression<Action<string>> MessageExpression { get; private set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Message=""@message"" bind-Message=""@message"" />
+@functions {
+    string message = ""hi"";
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateComponentParameterDirective.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateComponentParameters_IsAnError_BindMessageChanged()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Message { get; private set; }
+        [Parameter] public EventCallback<string> MessageChanged { get; private set; }
+        [Parameter] public Expression<Action<string>> MessageExpression { get; private set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent MessageChanged=""@((s) => {})"" bind-Message=""@message"" />
+@functions {
+    string message = ""hi"";
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateComponentParameterDirective.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void DuplicateComponentParameters_IsAnError_BindMessageExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Message { get; private set; }
+        [Parameter] public EventCallback<string> MessageChanged { get; private set; }
+        [Parameter] public Expression<Action<string>> MessageExpression { get; private set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent bind-Message=""@message"" MessageExpression=""@((s) => {})"" />
+@functions {
+    string message = ""hi"";
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateComponentParameterDirective.Id, diagnostic.Id);
+        }
+
         [Fact]
         public void ScriptTag_WithErrorSuppressed()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 76e7686fa1..8a7ac84c04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -57,6 +57,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 feature => Assert.IsType<ComponentLayoutDirectivePass>(feature),
                 feature => Assert.IsType<ComponentLoweringPass>(feature),
                 feature => Assert.IsType<ComponentMarkupBlockPass>(feature),
+                feature => Assert.IsType<ComponentMarkupDiagnosticPass>(feature),
                 feature => Assert.IsType<ComponentMarkupEncodingPass>(feature),
                 feature => Assert.IsType<ComponentPageDirectivePass>(feature),
                 feature => Assert.IsType<ComponentReferenceCaptureLoweringPass>(feature),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f0a2c9b5a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..90b182e690
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10009: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
new file mode 100644
index 0000000000..6e788003a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                        HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                HtmlContent - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
new file mode 100644
index 0000000000..906412e12e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       message
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                               message
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string message = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..4b0c476087
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10010: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'Message' is generated by the 'bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
new file mode 100644
index 0000000000..6f3fd83e49
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (47:0,47 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => message
+                HtmlContent - (58:0,58 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (58:0,58 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (103:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (103:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e8219984c8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|message|
+Generated Location: (958:25,23 [7] )
+|message|
+
+Source Location: (47:0,47 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|message|
+Generated Location: (1295:34,47 [7] )
+|message|
+
+Source Location: (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string message = "hi";
+|
+Generated Location: (2310:57,12 [30] )
+|
+    string message = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3880f38fad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               (s) => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                          message
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string message = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..823665c916
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,30): Error RZ10010: The component parameter 'MessageChanged' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageChanged' is generated by the 'bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
new file mode 100644
index 0000000000..6022fdbfaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
+                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (58:0,58 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => message
+                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (114:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (114:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
new file mode 100644
index 0000000000..87119a46ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|(s) => {}|
+Generated Location: (1095:25,31 [9] )
+|(s) => {}|
+
+Source Location: (58:0,58 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|message|
+Generated Location: (1446:34,58 [7] )
+|message|
+
+Source Location: (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string message = "hi";
+|
+Generated Location: (2461:57,12 [30] )
+|
+    string message = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5410554f92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -0,0 +1,66 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                          (s) => {}
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            message
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)));
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string message = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..1586878f86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,57): Error RZ10010: The component parameter 'MessageExpression' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageExpression' is generated by the 'bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..13d7481d85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (56:0,56 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (57:0,57 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (58:0,58 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
+                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => message
+                HtmlContent - (72:0,72 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:0,72 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (117:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (117:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..aa37e5ed58
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (58:0,58 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|(s) => {}|
+Generated Location: (1044:25,58 [9] )
+|(s) => {}|
+
+Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|message|
+Generated Location: (1364:34,28 [7] )
+|message|
+
+Source Location: (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string message = "hi";
+|
+Generated Location: (2379:57,12 [30] )
+|
+    string message = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
new file mode 100644
index 0000000000..590af79a44
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = "";
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..a7c8a30322
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,1): Error RZ10009: The component parameter 'mESSAGE' is used two or more times for this component. Parameters must be unique (case-insensitive).
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10009: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
new file mode 100644
index 0000000000..55906fb718
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                        HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - Message - AttributeStructure.DoubleQuotes
+                        HtmlContent - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - anotherone
+                HtmlContent - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f0a2c9b5a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..572de363b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,1): Error RZ10009: The component parameter 'Foo' is used two or more times for this component. Parameters must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
new file mode 100644
index 0000000000..4a74314e02
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - Foo - AttributeStructure.DoubleQuotes
+                        HtmlContent - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - foo - AttributeStructure.DoubleQuotes
+                        HtmlContent - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                HtmlContent - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..99896ebbff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,5): Error RZ10007: The attribute 'href' is used two or more times for this element. Attributes must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
new file mode 100644
index 0000000000..c57b44be65
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [123] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlAttribute - (11:1,4 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /cool-url
+                        HtmlAttribute - (28:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  style=" - "
+                        HtmlAttribute - (37:1,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  disabled - 
+                        HtmlAttribute - (46:1,39 [24] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /even-cooler-url
+                        HtmlContent - (71:1,64 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (71:1,64 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                    HtmlContent - (132:1,125 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (132:1,125 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0345b2ac34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                              () => {}
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  text
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private string text = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..27f6955b38
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,77): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the 'bind-value' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
new file mode 100644
index 0000000000..8f716b1294
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -0,0 +1,44 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute -  - type=" - "
+                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute - (83:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+                                IntermediateToken - (85:1,78 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken - (41:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
new file mode 100644
index 0000000000..631248be06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (85:1,78 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => {}|
+Generated Location: (1059:25,78 [8] )
+|() => {}|
+
+Source Location: (41:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|text|
+Generated Location: (1312:34,34 [4] )
+|text|
+
+Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private string text = "hi";
+|
+Generated Location: (1641:45,12 [35] )
+|
+    private string text = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ff40e87e8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       text
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private string text = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..3277ed84c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the 'bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
new file mode 100644
index 0000000000..e78c1493a7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -0,0 +1,42 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [68] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [51] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute -  - type=" - "
+                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute -  - value=" - "
+                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken - (46:1,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                    HtmlContent - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (68:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (68:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (118:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (118:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d0fd00e6ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (46:1,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|text|
+Generated Location: (955:25,39 [4] )
+|text|
+
+Source Location: (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private string text = "hi";
+|
+Generated Location: (1284:36,12 [35] )
+|
+    private string text = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..92dd6b9fa8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "test()");
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                           __o = () => {};
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..e1149b3381
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,15): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the 'onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..ebf1b99d33
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [120] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                        HtmlAttribute - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                                IntermediateToken -  - CSharp - "test()"
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute -  - onclick=" - "
+                            CSharpExpression - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                    HtmlContent - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e169bb2a5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => {}|
+Generated Location: (1023:25,33 [8] )
+|() => {}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..4261b59805
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,5): Error RZ10007: The attribute 'href' is used two or more times for this element. Attributes must be unique (case-insensitive).
+x:\dir\subdir\Test\TestComponent.cshtml(2,40): Error RZ10007: The attribute 'href' is used two or more times for this element. Attributes must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
new file mode 100644
index 0000000000..f5084c8f15
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [145] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [128] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlAttribute - (11:1,4 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /cool-url
+                        HtmlAttribute - (28:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  style=" - "
+                        HtmlAttribute - (37:1,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  disabled - 
+                        HtmlAttribute - (46:1,39 [24] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /even-cooler-url
+                        HtmlAttribute - (70:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) -  href - 
+                        HtmlContent - (76:1,69 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (76:1,69 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                    HtmlContent - (137:1,130 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (137:1,130 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e2c489ad50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Message", "test");
+            builder.AddAttribute(2, "mESSAGE", "test");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..90b182e690
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10009: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
new file mode 100644
index 0000000000..5b3a5785b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                        HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2e7578f435
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       message
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                               message
+
+#line default
+#line hidden
+#nullable disable
+            )));
+            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message))));
+            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string message = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..4b0c476087
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10010: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'Message' is generated by the 'bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
new file mode 100644
index 0000000000..3eef2491d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (47:0,47 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => message
+            CSharpCode - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
new file mode 100644
index 0000000000..17a28168d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string message = "hi";
+|
+Generated Location: (1962:41,12 [30] )
+|
+    string message = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d003d6c272
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               (s) => {}
+
+#line default
+#line hidden
+#nullable disable
+            )));
+            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                          message
+
+#line default
+#line hidden
+#nullable disable
+            )));
+            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message))));
+            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string message = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..823665c916
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,30): Error RZ10010: The component parameter 'MessageChanged' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageChanged' is generated by the 'bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
new file mode 100644
index 0000000000..6263cb0767
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
+                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (58:0,58 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => message
+            CSharpCode - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0a4efd9127
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string message = "hi";
+|
+Generated Location: (2120:41,12 [30] )
+|
+    string message = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0e59d9b397
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                          (s) => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            message
+
+#line default
+#line hidden
+#nullable disable
+            )));
+            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message))));
+            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    string message = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..1586878f86
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,57): Error RZ10010: The component parameter 'MessageExpression' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageExpression' is generated by the 'bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..f8be13be38
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (56:0,56 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (57:0,57 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (58:0,58 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
+                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - () => message
+            CSharpCode - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2ad7965435
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    string message = "hi";
+|
+Generated Location: (2041:41,12 [30] )
+|
+    string message = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
new file mode 100644
index 0000000000..679ce1999a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -0,0 +1,25 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Message", "test");
+            builder.AddAttribute(2, "mESSAGE", "test");
+            builder.AddAttribute(3, "Message", "anotherone");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..a7c8a30322
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,1): Error RZ10009: The component parameter 'mESSAGE' is used two or more times for this component. Parameters must be unique (case-insensitive).
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10009: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
new file mode 100644
index 0000000000..cf083f5ca4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                        HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                        HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - Message - AttributeStructure.DoubleQuotes
+                        HtmlContent - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - anotherone
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7732ae8afc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Foo", "test");
+            builder.AddAttribute(2, "foo", "test");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..572de363b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,1): Error RZ10009: The component parameter 'Foo' is used two or more times for this component. Parameters must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
new file mode 100644
index 0000000000..e434a9fce7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -0,0 +1,16 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - Foo - AttributeStructure.DoubleQuotes
+                        HtmlContent - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
+                    ComponentAttribute -  - foo - AttributeStructure.DoubleQuotes
+                        HtmlContent - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0d4a171ca1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -0,0 +1,31 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n  ");
+            builder.OpenElement(2, "a");
+            builder.AddAttribute(3, "href", "/cool-url");
+            builder.AddAttribute(4, "style", true);
+            builder.AddAttribute(5, "disabled", true);
+            builder.AddAttribute(6, "href", "/even-cooler-url");
+            builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
+            builder.CloseElement();
+            builder.AddMarkupContent(8, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..99896ebbff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,5): Error RZ10007: The attribute 'href' is used two or more times for this element. Attributes must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
new file mode 100644
index 0000000000..1620f5850d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [123] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlAttribute - (11:1,4 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /cool-url
+                        HtmlAttribute - (28:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  style=" - "
+                        HtmlAttribute - (37:1,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  disabled - 
+                        HtmlAttribute - (46:1,39 [24] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /even-cooler-url
+                        HtmlContent - (71:1,64 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (71:1,64 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                    HtmlContent - (132:1,125 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (132:1,125 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3e4fd96a12
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n  ");
+            builder.OpenElement(2, "input");
+            builder.AddAttribute(3, "type", "text");
+            builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                              () => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                  text
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            builder.CloseElement();
+            builder.AddMarkupContent(7, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private string text = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..27f6955b38
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,77): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the 'bind-value' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
new file mode 100644
index 0000000000..843e83ea74
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute -  - type=" - "
+                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute - (83:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+                                IntermediateToken - (85:1,78 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken - (41:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2bcebb8c5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private string text = "hi";
+|
+Generated Location: (1781:45,12 [35] )
+|
+    private string text = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7b128cc38b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n  ");
+            builder.OpenElement(2, "input");
+            builder.AddAttribute(3, "type", "text");
+            builder.AddAttribute(4, "value", "17");
+            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       text
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            builder.CloseElement();
+            builder.AddMarkupContent(7, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private string text = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..3277ed84c6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the 'bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
new file mode 100644
index 0000000000..5c99860360
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [68] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [51] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute -  - type=" - "
+                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute -  - value=" - "
+                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken - (46:1,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                    HtmlContent - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2429a1c991
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private string text = "hi";
+|
+Generated Location: (1448:37,12 [35] )
+|
+    private string text = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0e55646fd2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n  ");
+            builder.OpenElement(2, "a");
+            builder.AddAttribute(3, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "test()"));
+            builder.AddContent(4, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                 () => {}
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(5, "onclick", true);
+            builder.AddContent(6, "Learn the ten cool tricks your compiler author will hate!");
+            builder.CloseElement();
+            builder.AddMarkupContent(7, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..e1149b3381
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,15): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the 'onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..9b44eab2dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [120] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                        HtmlAttribute - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                                IntermediateToken -  - CSharp - "test()"
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute -  - onclick=" - "
+                            CSharpExpression - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                    HtmlContent - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
new file mode 100644
index 0000000000..525d7ca849
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n  ");
+            builder.OpenElement(2, "a");
+            builder.AddAttribute(3, "href", "/cool-url");
+            builder.AddAttribute(4, "style", true);
+            builder.AddAttribute(5, "disabled", true);
+            builder.AddAttribute(6, "href", "/even-cooler-url");
+            builder.AddAttribute(7, "href", true);
+            builder.AddContent(8, "Learn the ten cool tricks your compiler author will hate!");
+            builder.CloseElement();
+            builder.AddMarkupContent(9, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..4261b59805
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.diagnostics.txt
@@ -0,0 +1,2 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,5): Error RZ10007: The attribute 'href' is used two or more times for this element. Attributes must be unique (case-insensitive).
+x:\dir\subdir\Test\TestComponent.cshtml(2,40): Error RZ10007: The attribute 'href' is used two or more times for this element. Attributes must be unique (case-insensitive).
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
new file mode 100644
index 0000000000..bc80339ed7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [145] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [128] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlAttribute - (11:1,4 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /cool-url
+                        HtmlAttribute - (28:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  style=" - "
+                        HtmlAttribute - (37:1,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) -  disabled - 
+                        HtmlAttribute - (46:1,39 [24] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
+                            HtmlAttributeValue - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /even-cooler-url
+                        HtmlAttribute - (70:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) -  href - 
+                        HtmlContent - (76:1,69 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (76:1,69 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                    HtmlContent - (137:1,130 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (137:1,130 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n

From db66452bbdde41f76a3a0c28038708409e6d52f7 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Wed, 22 May 2019 12:35:05 -0700
Subject: [PATCH 163/337] Fix bug in bind lowering logic \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/5bcd00877984c63293665f75bad20f522132638a

---
 .../Components/ComponentBindLoweringPass.cs   | 16 ++++++++----
 .../ComponentCodeGenerationTestBase.cs        |  1 +
 .../TestComponent.codegen.cs                  | 26 ++++++++++++++++++-
 .../TestComponent.ir.txt                      | 16 ++++++++++--
 .../TestComponent.mappings.txt                |  9 +++++--
 .../TestComponent.codegen.cs                  | 19 +++++++++++++-
 .../TestComponent.ir.txt                      | 16 ++++++++++--
 .../TestComponent.mappings.txt                |  4 +--
 8 files changed, 92 insertions(+), 15 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index a28fac0543..990c3d35f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -48,13 +48,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             // First, collect all the non-parameterized bind or bind-* attributes.
-            var bindEntries = new Dictionary<string, BindEntry>();
+            // The dict key is a tuple of (parent, attributeName) to differentiate attributes with the same name in two different elements.
+            // We don't have to worry about duplicate bound attributes in the same element
+            // like, <Foo bind="bar" bind="bar" />, because IR lowering takes care of that.
+            var bindEntries = new Dictionary<(IntermediateNode, string), BindEntry>();
             for (var i = 0; i < references.Count; i++)
             {
                 var reference = references[i];
+                var parent = reference.Parent;
                 var node = (TagHelperPropertyIntermediateNode)reference.Node;
 
-                if (!reference.Parent.Children.Contains(node))
+                if (!parent.Children.Contains(node))
                 {
                     // This node was removed as a duplicate, skip it.
                     continue;
@@ -62,7 +66,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
                 {
-                    bindEntries[node.AttributeName] = new BindEntry(reference);
+                    bindEntries[(parent, node.AttributeName)] = new BindEntry(reference);
                 }
             }
 
@@ -70,9 +74,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             for (var i = 0; i < parameterReferences.Count; i++)
             {
                 var parameterReference = parameterReferences[i];
+                var parent = parameterReference.Parent;
                 var node = (TagHelperAttributeParameterIntermediateNode)parameterReference.Node;
 
-                if (!parameterReference.Parent.Children.Contains(node))
+                if (!parent.Children.Contains(node))
                 {
                     // This node was removed as a duplicate, skip it.
                     continue;
@@ -80,7 +85,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
                 {
-                    if (!bindEntries.TryGetValue(node.AttributeNameWithoutParameter, out var entry))
+                    // Check if this tag contains a corresponding non-parameterized bind node.
+                    if (!bindEntries.TryGetValue((parent, node.AttributeNameWithoutParameter), out var entry))
                     {
                         // There is no corresponding bind node. Add a diagnostic and move on.
                         parameterReference.Parent.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttributeParameter_MissingBind(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index d9fcc74ccc..09ba658797 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2573,6 +2573,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent bind-Item=Value/>
+<MyComponent bind-Item=Value/>
 @code {
     string Value;
 }");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index c41b5245ec..d852967c80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -34,13 +34,30 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent<>);
 
+#line default
+#line hidden
+#nullable disable
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Value
+
+#line default
+#line hidden
+#nullable disable
+            ), -1, 
+            __value => Value = __value);
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
 #line default
 #line hidden
 #nullable disable
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     string Value;
 
@@ -61,6 +78,13 @@ namespace __Blazor.Test.TestComponent
         builder.AddAttribute(__seq1, "ItemChanged", __arg1);
         builder.CloseComponent();
         }
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        builder.CloseComponent();
+        }
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index bad13d8f03..43136b9b58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -25,8 +25,20 @@ Document -
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+                Component - (32:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => Value = __value
+                HtmlContent - (62:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (62:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_1
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 8c9be647da..6619288315 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -3,11 +3,16 @@ Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:25,23 [5] )
 |Value|
 
-Source Location: (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|Value|
+Generated Location: (1521:42,23 [5] )
+|Value|
+
+Source Location: (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1408:43,7 [21] )
+Generated Location: (1917:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 9dd67956f1..9ff80d8a2d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -22,10 +22,20 @@ namespace Test
 #line hidden
 #nullable disable
             ), 2, __value => Value = __value);
+            builder.AddMarkupContent(3, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 4, 5, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       Value
+
+#line default
+#line hidden
+#nullable disable
+            ), 6, __value => Value = __value);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     string Value;
 
@@ -46,6 +56,13 @@ namespace __Blazor.Test.TestComponent
         builder.AddAttribute(__seq1, "ItemChanged", __arg1);
         builder.CloseComponent();
         }
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        builder.CloseComponent();
+        }
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 253fd39767..0d3dc296f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -16,8 +16,20 @@ Document -
                     ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-            CSharpCode - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+                HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (32:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - __value => Value = __value
+            CSharpCode - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_1
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 65853a0095..5f2383089e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (39:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (973:28,7 [21] )
+Generated Location: (1365:38,7 [21] )
 |
     string Value;
 |

From 66dd6b35d34cd63f354185f7a10e0e02531dfe6a Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 22 May 2019 16:43:02 -0700
Subject: [PATCH 164/337] Specify UpToDateReloadFileTypes
 (dotnet/aspnetcore-tooling#611)

* Specify UpToDateReloadFileTypes

Specify a list of file extensions that VS will monitor for file changes to reload the app.
Includes .razor and .cshtml files.

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9a964127bf0a97ecdcac4f6b951c2f1aa319cbf5
---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 330a192ea3..a9a000aad3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -12,6 +12,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
 <Project ToolsVersion="14.0">
 
+  <PropertyGroup>
+    <!--
+      Defines the list of file extensions that VS will monitor to reload the application.
+      We'll only define these for C# projects targeting RazorLangVersion 3.0 or later, and let VS use defaults in other cases.
+    -->
+    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true'">$(UpToDateReloadFileTypes);.cs;.razor;.resx;.cshtml</UpToDateReloadFileTypes>
+  </PropertyGroup>
+
   <ItemGroup>
     <!--
       Defines the generic .NET Core 'Razor' capability.

From 68f5fec0b073b61f26d2bd23ead30980ca272e58 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 24 May 2019 10:42:38 +0200
Subject: [PATCH 165/337] Suports discovery of static web assets from
 referenced projects (dotnet/aspnetcore-tooling#605)

* Define static web assets in the current project
  * These are assets under the wwwroot folder.
  * By convention, the base path for these assets is `_content/<<PackageId>>`
    with spaces and dots removed and all characters lower-cased.
* Retrieve static web assets from referenced projects\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/50646aae64da0ef1f3e8fbadb7427a9b70f3bfaf
---
 .../src/GetDefaultStaticWebAssetsBasePath.cs  |  40 ++++++
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 115 +++++++++++++++---
 .../GetDefaultStaticWebAssetsBasePathTest.cs  |  95 +++++++++++++++
 .../StaticWebAssetsIntegrationTest.cs         |  20 ++-
 .../AppWithPackageAndP2PReference.csproj      |   7 +-
 .../wwwroot/js/project-transitive-dep.js      |   3 +
 .../wwwroot/js/project-transitive-dep.v4.js   |   0
 .../ClassLibrary2/wwwroot/css/site.css        |   1 +
 .../wwwroot/js/project-direct-dep.js          |   3 +
 9 files changed, 257 insertions(+), 27 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs
 create mode 100644 src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.js
 create mode 100644 src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.v4.js
 create mode 100644 src/Razor/test/testassets/ClassLibrary2/wwwroot/css/site.css
 create mode 100644 src/Razor/test/testassets/ClassLibrary2/wwwroot/js/project-direct-dep.js

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs
new file mode 100644
index 0000000000..f39f1a789e
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs
@@ -0,0 +1,40 @@
+// 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 Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class GetDefaultStaticWebAssetsBasePath : Task
+    {
+        [Required]
+        public string BasePath { get; set; }
+
+        [Output]
+        public string SafeBasePath { get; set; }
+
+        public override bool Execute()
+        {
+            if (string.IsNullOrWhiteSpace(BasePath))
+            {
+                Log.LogError($"Base path '{BasePath ?? "(null)"}' must contain non-whitespace characters.");
+                return !Log.HasLoggedErrors;
+            }
+
+            var safeBasePath = BasePath
+                .Replace(" ", "")
+                .Replace(".", "")
+                .ToLowerInvariant();
+
+            if (safeBasePath == "")
+            {
+                Log.LogError($"Base path '{BasePath}' must contain non '.' characters.");
+                return !Log.HasLoggedErrors;
+            }
+            SafeBasePath = safeBasePath;
+
+            return !Log.HasLoggedErrors;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index 0c273df77b..3d403100a6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -27,17 +27,33 @@ Copyright (c) .NET Foundation. All rights reserved.
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
     Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
 
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.GetDefaultStaticWebAssetsBasePath"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
   <PropertyGroup>
     <GenerateStaticWebAssetsManifestDependsOn>
       ResolveStaticWebAssetsInputs;
-      _CreateStaticWebAssetsInputsCacheFile
+      _CreateStaticWebAssetsInputsCacheFile;
+      $(GenerateStaticWebAssetsManifestDependsOn)
     </GenerateStaticWebAssetsManifestDependsOn>
 
+    <GetCurrentProjectStaticWebAssetsDependsOn>
+      ResolveStaticWebAssetsInputs;
+      $(GetCurrentProjectStaticWebAssetsDependsOn)
+    </GetCurrentProjectStaticWebAssetsDependsOn>
+
     <AssignTargetPathsDependsOn>
       GenerateStaticWebAssetsManifest;
       $(AssignTargetPathsDependsOn)
     </AssignTargetPathsDependsOn>
 
+    <ResolveStaticWebAssetsInputsDependsOn>
+      _ResolveStaticWebAssetsProjectReferences;
+      $(ResolveStaticWebAssetsInputsDependsOn)
+    </ResolveStaticWebAssetsInputsDependsOn>
+
   </PropertyGroup>
 
   <PropertyGroup>
@@ -119,34 +135,45 @@ Copyright (c) .NET Foundation. All rights reserved.
          restores the package and includes the package props file for the package.
   -->
   <Target 
-    Name="ResolveStaticWebAssetsInputs">
-    <PropertyGroup>
-      <!-- The _SafeBasePath is used as a path segment in the urls that we will
-           be exposing content from when the library is referenced as a package
-           or as a project by a web application. Our convention will be to expose
-           content directly on _content/<<_SafeBasePath>>
-           
-           We simply remove the dots from the package id so that a package
-           like Microsoft.AspNetCore.Identity becomes MicrosoftAspNetCoreIdentity 
-           
-           TODO: Investigate if we need to do something more sophisticated here.
-      -->
-      <_SafeBasePath>$(PackageId.Replace('.',''))</_SafeBasePath>
-    </PropertyGroup>
+    Name="ResolveStaticWebAssetsInputs"
+    DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)">
 
     <!-- StaticWebAssets from the current project -->
 
+    <!-- Computes a default safe base path from the $(PackageId) that will be a prefix
+         to all the resources being exported from this library by default. The convention
+         consists of removing intermediate whitespaces, dots and lower casing all letters
+         in the package id using an invariant culture.
+
+         We don't aim to handle all possible cases for this prefix, as it can get really
+         complicated (non-unicode characters for example), so for that case,
+         StaticWebAssetBasePath can be set explicitly and we won't interfere.
+    -->
+    <GetDefaultStaticWebAssetsBasePath
+      BasePath="$(PackageId)"
+      Condition="'$(StaticWebAssetBasePath)' == ''">
+      <Output TaskParameter="SafeBasePath" PropertyName="_StaticWebAssetSafeBasePath" />
+    </GetDefaultStaticWebAssetsBasePath>
+
+    <PropertyGroup>
+      <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(_StaticWebAssetSafeBasePath)</StaticWebAssetBasePath>
+    </PropertyGroup>
+
     <ItemGroup>
+
+      <_ThisProjectStaticWebAsset
+        Include="$(MSBuildProjectDirectory)\wwwroot\**"
+        Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
       <!-- 
         Should we promote 'wwwroot\**'' to a property?
         We don't want to capture any content outside the content root, that's why we don't do
         @(Content) here.
       -->
-      <StaticWebAsset Include="wwwroot\**" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)">
-        <!-- (PackageReference,ProjectReference,'' (CurrentProject)) -->
+      <StaticWebAsset Include="@(_ThisProjectStaticWebAsset)">
+        <!-- (Package, Project, '' (CurrentProject)) -->
         <SourceType></SourceType>
         <!-- Identifier describing the source, the package id, the project name, empty for the current project.  -->
-        <SourceId></SourceId>
+        <SourceId>$(PackageId)</SourceId>
         <!-- 
           Full path to the content root for the item:
           * For packages it corresponds to %userprofile%/.nuget/packages/<<PackageId>>/<<PackageVersion>>/razorContent
@@ -155,7 +182,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         -->
         <ContentRoot>$(MSBuildProjectDirectory)\wwwroot\</ContentRoot>
         <!-- Subsection (folder) from the url space where content for this library will be served. -->
-        <BasePath>_content\$(_SafeBasePath)\</BasePath>
+        <BasePath>$(StaticWebAssetBasePath)</BasePath>
         <!-- Relative path from the content root for the file. At publish time, we combine the BasePath + Relative
   path to determine the final path for the file. -->
         <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
@@ -164,9 +191,57 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
 
     <!-- StaticWebAssets from referenced projects. -->
-    <!-- TODO: Include implementation -->
+
+    <MSBuild
+      Condition="'@(_StaticWebAssetsProjectReference->Count())' != '0'"
+      Projects="@(_StaticWebAssetsProjectReference)"
+      BuildInParallel="$(BuildInParallel)"
+      ContinueOnError="!$(BuildingProject)"
+      Targets="GetCurrentProjectStaticWebAssets"
+      Properties="_StaticWebAssetsSkipDependencies=true"
+      SkipNonexistentTargets="true">
+      <Output TaskParameter="TargetOutputs" ItemName="_ReferencedProjectStaticWebAssets" />
+    </MSBuild>
+
+    <ItemGroup>
+      <StaticWebAsset Include="@(_ReferencedProjectStaticWebAssets)" />
+    </ItemGroup>
 
     <!-- StaticWebAssets from packages are already available, so we don't do anything. -->
   </Target>
 
+  <!-- This is a helper task to compute the project references we need to invoke to retrieve
+       the static assets for a given application. We do it this way so that we can
+       pass additional build properties to compute the assets from the package when referenced
+       as a project. For example, Identity uses this hook to extend the project reference and
+       pass in the bootstrap version to use. 
+  -->
+  <Target Name="_ResolveStaticWebAssetsProjectReferences"
+    DependsOnTargets="ResolveReferences"
+    Condition="'$(_StaticWebAssetsSkipDependencies)' == ''">
+
+    <ItemGroup>
+      <_StaticWebAssetsProjectReference Include="%(ReferencePath.MSBuildSourceProjectFile)" />
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    Child target to retrieve content from referenced projects
+   -->
+
+  <Target Name="GetCurrentProjectStaticWebAssets"
+    DependsOnTargets="$(GetCurrentProjectStaticWebAssetsDependsOn)"
+    Returns="@(_ThisProjectStaticWebAssets)">
+
+    <ItemGroup>
+      <_ThisProjectStaticWebAssets
+        Include="@(StaticWebAsset)"
+        Condition="'%(StaticWebAsset.SourceType)' == ''">
+        <SourceType>Project</SourceType>
+      </_ThisProjectStaticWebAssets>
+    </ItemGroup>
+
+  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs
new file mode 100644
index 0000000000..9a927fc155
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs
@@ -0,0 +1,95 @@
+// 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.Collections.Generic;
+using Microsoft.Build.Framework;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class GetDefaultStaticWebAssetsBasePathTest
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData(" ")]
+        [InlineData("   ")]
+        public void ReturnsError_WhenBasePath_DoesNotContainNonWhitespaceCharacters(string basePath)
+        {
+            // Arrange
+            var expectedError = $"Base path '{basePath ?? "(null)"}' must contain non-whitespace characters.";
+
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GetDefaultStaticWebAssetsBasePath
+            {
+                BuildEngine = buildEngine.Object,
+                BasePath = basePath
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(expectedError, message);
+        }
+
+        [Theory]
+        [InlineData(".")]
+        [InlineData("..")]
+        [InlineData(". ")]
+        [InlineData(" .")]
+        [InlineData(" . ")]
+        [InlineData(". .")]
+        public void ReturnsError_WhenSafeBasePath_MapsToTheEmptyString(string basePath)
+        {
+            // Arrange
+            var expectedError = $"Base path '{basePath}' must contain non '.' characters.";
+
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GetDefaultStaticWebAssetsBasePath
+            {
+                BuildEngine = buildEngine.Object,
+                BasePath = basePath
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(expectedError, message);
+        }
+
+        [Theory]
+        [InlineData("Identity", "identity")]
+        [InlineData("Microsoft.AspNetCore.Identity", "microsoftaspnetcoreidentity")]
+        public void ReturnsSafeBasePath_WhenBasePath_ContainsUnsafeCharacters(string basePath, string expectedSafeBasePath)
+        {
+            // Arrange
+            var task = new GetDefaultStaticWebAssetsBasePath
+            {
+                BuildEngine = Mock.Of<IBuildEngine>(),
+                BasePath = basePath
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(expectedSafeBasePath, task.SafeBasePath);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index bb0d250f97..653231d328 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
 using Xunit;
@@ -32,7 +33,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         public ITestOutputHelper Output { get; private set; }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest()
         {
             var result = await DotnetMSBuild("Build", "/restore");
@@ -71,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Clean_Success_RemovesManifestAndCache()
         {
             var result = await DotnetMSBuild("Build", "/restore");
@@ -92,7 +93,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Rebuild_Success_RecreatesManifestAndCache()
         {
             // Arrange
@@ -142,7 +143,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference")]
+        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task GenerateStaticWebAssetsManifest_IncrementalBuild_ReusesManifest()
         {
             var result = await DotnetMSBuild("GenerateStaticWebAssetsManifest", "/restore");
@@ -192,16 +193,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         private string GetExpectedManifest()
         {
+            // We need to do this for Mac as apparently the temp folder in mac is prepended by /private by the os, even though the current user
+            // can refer to it without the /private prefix. We don't care a lot about the specific path in this test as we will have tests that
+            // validate the behavior at runtime.
+            var source = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? $"/private{Project.SolutionPath}" : Project.SolutionPath;
+
             var restorePath = LocalNugetPackagesCacheTempPath;
             var projects = new[]
             {
                 Path.Combine(restorePath, "packagelibrarytransitivedependency", "1.0.0", "buildTransitive", "..", "razorContent") + Path.DirectorySeparatorChar,
-                Path.Combine(restorePath, "packagelibrarydirectdependency", "1.0.0", "build", "..", "razorContent") + Path.DirectorySeparatorChar
+                Path.Combine(restorePath, "packagelibrarydirectdependency", "1.0.0", "build", "..", "razorContent") + Path.DirectorySeparatorChar,
+                Path.GetFullPath(Path.Combine(source, "ClassLibrary", "wwwroot")) + Path.DirectorySeparatorChar,
+                Path.GetFullPath(Path.Combine(source, "ClassLibrary2", "wwwroot")) + Path.DirectorySeparatorChar
             };
 
             return $@"<StaticWebAssets Version=""1.0"">
   <ContentRoot BasePath=""_content/PackageLibraryTransitiveDependency"" Path=""{projects[0]}"" />
   <ContentRoot BasePath=""_content/PackageLibraryDirectDependency"" Path=""{projects[1]}"" />
+  <ContentRoot BasePath=""_content/classlibrary"" Path=""{projects[2]}"" />
+  <ContentRoot BasePath=""_content/classlibrary2"" Path=""{projects[3]}"" />
 </StaticWebAssets>";
         }
     }
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
index 4eb52fbfa3..076d9b77b0 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -11,7 +11,6 @@
       $(RestoreSources);
       $(RuntimeAdditionalRestoreSources)
     </RestoreSources>
-
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,7 +29,11 @@
     <PackageReference Include="PackageLibraryDirectDependency" Version="1.0.0" />
   </ItemGroup>
 
-    <PropertyGroup Condition="'$(BinariesRoot)'==''">
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
   </PropertyGroup>
diff --git a/src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.js b/src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.js
new file mode 100644
index 0000000000..c8ee8c4b87
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.js
@@ -0,0 +1,3 @@
+(function () {
+  document.getElementById('project-transitive-dep').innerHTML = 'project-transitive-dep';
+})()
\ No newline at end of file
diff --git a/src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.v4.js b/src/Razor/test/testassets/ClassLibrary/wwwroot/js/project-transitive-dep.v4.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/test/testassets/ClassLibrary2/wwwroot/css/site.css b/src/Razor/test/testassets/ClassLibrary2/wwwroot/css/site.css
new file mode 100644
index 0000000000..c9d72143d2
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary2/wwwroot/css/site.css
@@ -0,0 +1 @@
+div.fluent { display: inline-block  }
\ No newline at end of file
diff --git a/src/Razor/test/testassets/ClassLibrary2/wwwroot/js/project-direct-dep.js b/src/Razor/test/testassets/ClassLibrary2/wwwroot/js/project-direct-dep.js
new file mode 100644
index 0000000000..f6d99d4251
--- /dev/null
+++ b/src/Razor/test/testassets/ClassLibrary2/wwwroot/js/project-direct-dep.js
@@ -0,0 +1,3 @@
+(function () {
+  document.getElementById('project-direct-dep').innerHTML = 'project-direct-dep';
+})()
\ No newline at end of file

From f25734acf4123e400a29ce474fe9c753e702514b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Sun, 26 May 2019 12:43:13 -0700
Subject: [PATCH 166/337] Support parsing directive attributes - Part 2/2
 (dotnet/aspnetcore-tooling#619)

* Support parsing directive attributes
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5eb8ef43eb7785509b594e8f01ac7e70d996b3b7
---
 ...undAttributeDescriptorBuilderExtensions.cs |  13 +
 .../src/BoundAttributeDescriptorExtensions.cs |  14 +-
 .../src/ClassifiedSpanVisitor.cs              |  19 +-
 .../src/ComponentResources.resx               |   4 +-
 .../Components/ComponentBindLoweringPass.cs   |  22 +-
 .../ComponentEventHandlerLoweringPass.cs      |  13 +-
 .../Components/ComponentKeyLoweringPass.cs    |   2 +-
 .../src/Components/ComponentMetadata.cs       |   2 +
 .../ComponentReferenceCaptureLoweringPass.cs  |   2 +-
 .../DefaultBoundAttributeDescriptorBuilder.cs |  39 +-
 ...faultRazorIntermediateNodeLoweringPhase.cs | 176 +++++++-
 .../src/DefaultRequiredAttributeDescriptor.cs |   6 +-
 ...faultRequiredAttributeDescriptorBuilder.cs |  28 +-
 .../ComponentAttributeIntermediateNode.cs     |  11 +-
 ...elperAttributeParameterIntermediateNode.cs |   3 +
 .../TagHelperPropertyIntermediateNode.cs      |   3 +
 .../src/Legacy/HtmlMarkupParser.cs            |   9 +-
 .../src/Legacy/TagHelperBlockRewriter.cs      | 176 +++++++-
 .../src/RazorDiagnosticFactory.cs             |  58 +++
 .../src/RazorParserFeatureFlags.cs            |  13 +-
 .../src/RequiredAttributeDescriptor.cs        |   2 +
 .../src/RequiredAttributeDescriptorBuilder.cs |   4 +
 ...redAttributeDescriptorBuilderExtensions.cs |  23 +
 .../RequiredAttributeDescriptorExtensions.cs  |  23 +
 .../src/Resources.resx                        |   9 +
 .../Syntax.xml.Internal.Generated.cs          | 373 ++++++++++++++++
 .../Generated/Syntax.xml.Main.Generated.cs    |  96 ++++
 .../Generated/Syntax.xml.Syntax.Generated.cs  | 421 ++++++++++++++++++
 ...imizedTagHelperDirectiveAttributeSyntax.cs |  46 ++
 ...MarkupTagHelperDirectiveAttributeSyntax.cs |  46 ++
 .../src/Syntax/Syntax.xml                     |  23 +
 .../src/Syntax/SyntaxKind.cs                  |   2 +
 .../src/TagHelperAttributeInfo.cs             |  10 +-
 .../ComponentBindIntegrationTest.cs           |  10 +-
 .../ComponentCodeGenerationTestBase.cs        | 128 +++---
 .../test/Legacy/HtmlAttributeTest.cs          |  12 +
 .../test/Legacy/TagHelperBlockRewriterTest.cs |  95 +++-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  22 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  28 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithKey/TestComponent.ir.txt    |  20 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  26 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithRef/TestComponent.ir.txt    |  20 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  34 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  22 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  22 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  28 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  30 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  26 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Element_WithKey/TestComponent.codegen.cs  |   2 +-
 .../Element_WithKey/TestComponent.ir.txt      |  24 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../Element_WithRef/TestComponent.codegen.cs  |   2 +-
 .../Element_WithRef/TestComponent.ir.txt      |  24 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../Regression_597/TestComponent.codegen.cs   |   2 +-
 .../Regression_597/TestComponent.ir.txt       |  20 +-
 .../Regression_597/TestComponent.mappings.txt |   8 +-
 .../Regression_609/TestComponent.codegen.cs   |   4 +-
 .../Regression_609/TestComponent.ir.txt       |  26 +-
 .../Regression_609/TestComponent.mappings.txt |  12 +-
 .../Regression_784/TestComponent.codegen.cs   |   4 +-
 .../Regression_784/TestComponent.ir.txt       |  30 +-
 .../Regression_784/TestComponent.mappings.txt |  12 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  24 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithKey/TestComponent.ir.txt    |  12 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Component_WithRef/TestComponent.ir.txt    |  12 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  20 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  22 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   9 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  18 +-
 .../Element_WithKey/TestComponent.codegen.cs  |   2 +-
 .../Element_WithKey/TestComponent.ir.txt      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../Element_WithRef/TestComponent.codegen.cs  |   2 +-
 .../Element_WithRef/TestComponent.ir.txt      |  16 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../Regression_597/TestComponent.codegen.cs   |   2 +-
 .../Regression_597/TestComponent.ir.txt       |  12 +-
 .../Regression_597/TestComponent.mappings.txt |   4 +-
 .../Regression_609/TestComponent.codegen.cs   |   4 +-
 .../Regression_609/TestComponent.ir.txt       |  18 +-
 .../Regression_609/TestComponent.mappings.txt |   4 +-
 .../Regression_784/TestComponent.codegen.cs   |   4 +-
 .../Regression_784/TestComponent.ir.txt       |  22 +-
 .../Regression_784/TestComponent.mappings.txt |   4 +-
 ...rsesDirectiveAttributesAsMarkup.cspans.txt |   7 +
 ...arsesDirectiveAttributesAsMarkup.stree.txt |  34 ++
 ...AttributesWithParameterAsMarkup.cspans.txt |   7 +
 ...eAttributesWithParameterAsMarkup.stree.txt |  34 ++
 ...es_ComponentDirectiveAttributes.cspans.txt |   5 +
 ...tes_ComponentDirectiveAttributes.stree.txt |  45 ++
 ...es_ComponentDirectiveAttributes.tspans.txt |   1 +
 ...zedComponentDirectiveAttributes.cspans.txt |   3 +
 ...mizedComponentDirectiveAttributes.diag.txt |   2 +
 ...izedComponentDirectiveAttributes.stree.txt |  29 ++
 ...zedComponentDirectiveAttributes.tspans.txt |   1 +
 .../src/BindTagHelperDescriptorProvider.cs    |  32 +-
 ...EventHandlerTagHelperDescriptorProvider.cs |  12 +-
 .../src/KeyTagHelperDescriptorProvider.cs     |   6 +-
 .../src/RefTagHelperDescriptorProvider.cs     |   6 +-
 .../BindTagHelperDescriptorProviderTest.cs    |  72 +--
 ...tHandlerTagHelperDescriptorProviderTest.cs |  11 +-
 .../KeyTagHelperDescriptorProviderTest.cs     |   6 +-
 .../RefTagHelperDescriptorProviderTest.cs     |   6 +-
 .../Language/Legacy/ParserTestBase.cs         |  26 +-
 421 files changed, 3476 insertions(+), 1626 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilderExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorExtensions.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperDirectiveAttributeSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperDirectiveAttributeSyntax.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.tspans.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
index d253429102..ac01e48aa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorBuilderExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -52,6 +53,18 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.IndexerValueTypeName = valueTypeName;
         }
 
+        public static bool IsDirectiveAttribute(this BoundAttributeDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return
+                builder.Metadata.TryGetValue(ComponentMetadata.Common.DirectiveAttribute, out var value) &&
+                string.Equals(bool.TrueString, value);
+        }
+
         public static void SetPropertyName(this BoundAttributeParameterDescriptorBuilder builder, string propertyName)
         {
             if (builder == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
index 5b5fbbf1ea..42a83b368c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -51,6 +51,18 @@ namespace Microsoft.AspNetCore.Razor.Language
             return isIndexerNameMatch && attribute.IsIndexerBooleanProperty;
         }
 
+        internal static bool IsDirectiveAttribute(this BoundAttributeDescriptor attribute)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            return
+                attribute.Metadata.TryGetValue(ComponentMetadata.Common.DirectiveAttribute, out var value) &&
+                string.Equals(bool.TrueString, value);
+        }
+
         public static bool IsDefaultKind(this BoundAttributeParameterDescriptor parameter)
         {
             if (parameter == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
index 73f5d1fa11..81edb96152 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -140,9 +140,11 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             foreach (var child in node.Attributes)
             {
-                if (child is MarkupTagHelperAttributeSyntax attribute)
+                if (child is MarkupTagHelperAttributeSyntax ||
+                    child is MarkupTagHelperDirectiveAttributeSyntax ||
+                    child is MarkupMinimizedTagHelperDirectiveAttributeSyntax)
                 {
-                    Visit(attribute);
+                    Visit(child);
                 }
             }
         }
@@ -169,6 +171,19 @@ namespace Microsoft.AspNetCore.Razor.Language
             Visit(node.Value);
         }
 
+        public override void VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+        {
+            Visit(node.Transition);
+            Visit(node.Colon);
+            Visit(node.Value);
+        }
+
+        public override void VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+        {
+            Visit(node.Transition);
+            Visit(node.Colon);
+        }
+
         public override void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
         {
             WriteBlock(node, BlockKindInternal.Markup, n =>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 016d32c0c5..8b9c27a0de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -139,13 +139,13 @@
     <value>Specifies a format to convert the value specified by the '{0}' attribute. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
   </data>
   <data name="BindTagHelper_Fallback_Documentation" xml:space="preserve">
-    <value>Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;bind-value="..."&lt;/code&gt; and &lt;code&gt;bind-value:event="onchange"&lt;/code&gt; will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute.</value>
+    <value>Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: &lt;code&gt;@bind-value="..."&lt;/code&gt; and &lt;code&gt;@bind-value:event="onchange"&lt;/code&gt; will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute.</value>
   </data>
   <data name="BindTagHelper_Fallback_Event_Documentation" xml:space="preserve">
     <value>Specifies the event handler name to attach for change notifications for the value provided by the '{0}' attribute.</value>
   </data>
   <data name="BindTagHelper_Fallback_Format_Documentation" xml:space="preserve">
-    <value>Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;bind-value:format="..."&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;bind-value="..."&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
+    <value>Specifies a format to convert the value specified by the corresponding bind attribute. For example: &lt;code&gt;@bind-value:format="..."&lt;/code&gt; will apply a format string to the value specified in &lt;code&gt;@bind-value="..."&lt;/code&gt;. The format string can currently only be used with expressions of type &lt;code&gt;DateTime&lt;/code&gt;.</value>
   </data>
   <data name="ChildContentParameterName_Documentation" xml:space="preserve">
     <value>Specifies the parameter name for the '{0}' child content expression.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 990c3d35f5..c2d601dfc5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            // For each bind *usage* we need to rewrite the tag helper node to map to basic constructs.
+            // For each @bind *usage* we need to rewrite the tag helper node to map to basic constructs.
             var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
             var parameterReferences = documentNode.FindDescendantReferences<TagHelperAttributeParameterIntermediateNode>();
 
@@ -47,10 +47,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 ProcessDuplicates(parent);
             }
 
-            // First, collect all the non-parameterized bind or bind-* attributes.
+            // First, collect all the non-parameterized @bind or @bind-* attributes.
             // The dict key is a tuple of (parent, attributeName) to differentiate attributes with the same name in two different elements.
             // We don't have to worry about duplicate bound attributes in the same element
-            // like, <Foo bind="bar" bind="bar" />, because IR lowering takes care of that.
+            // like, <Foo @bind="bar" @bind="bar" />, because IR lowering takes care of that.
             var bindEntries = new Dictionary<(IntermediateNode, string), BindEntry>();
             for (var i = 0; i < references.Count; i++)
             {
@@ -64,13 +64,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     continue;
                 }
 
-                if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
+                if (node.TagHelper.IsBindTagHelper() && node.IsDirectiveAttribute)
                 {
                     bindEntries[(parent, node.AttributeName)] = new BindEntry(reference);
                 }
             }
 
-            // Now collect all the parameterized attributes and store them along with their corresponding bind or bind-* attributes.
+            // Now collect all the parameterized attributes and store them along with their corresponding @bind or @bind-* attributes.
             for (var i = 0; i < parameterReferences.Count; i++)
             {
                 var parameterReference = parameterReferences[i];
@@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     continue;
                 }
 
-                if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind"))
+                if (node.TagHelper.IsBindTagHelper() && node.IsDirectiveAttribute)
                 {
                     // Check if this tag contains a corresponding non-parameterized bind node.
                     if (!bindEntries.TryGetValue((parent, node.AttributeNameWithoutParameter), out var entry))
@@ -183,7 +183,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     }
                 }
 
-                // Also treat the general <input bind="..." /> as a 'fallback' for that case and remove it.
+                // Also treat the general <input @bind="..." /> as a 'fallback' for that case and remove it.
                 // This is a workaround for a limitation where you can't write a tag helper that binds only
                 // when a specific attribute is **not** present.
                 if (attribute != null &&
@@ -246,10 +246,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // For the nodes that are related to the bind-attribute rewrite them to look like a set of
             // 'normal' HTML attributes similar to the following transformation.
             //
-            // Input:   <MyComponent bind-Value="@currentCount" />
+            // Input:   <MyComponent @bind-Value="@currentCount" />
             // Output:  <MyComponent Value ="...<get the value>..." ValueChanged ="... <set the value>..." ValueExpression ="() => ...<get the value>..." />
             //
-            // This means that the expression that appears inside of 'bind' must be an LValue or else
+            // This means that the expression that appears inside of '@bind' must be an LValue or else
             // there will be errors. In general the errors that come from C# in this case are good enough
             // to understand the problem.
             //
@@ -463,7 +463,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             valueAttributeName = null;
             changeAttributeName = null;
 
-            if (!attributeName.StartsWith("bind"))
+            if (!attributeName.StartsWith("@bind"))
             {
                 return false;
             }
@@ -473,7 +473,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 changeAttributeName = GetAttributeContent(bindEntry.BindEventNode)?.Content?.Trim('"');
             }
 
-            if (attributeName == "bind")
+            if (attributeName == "@bind")
             {
                 return true;
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index 74ceb8c236..3e7666a021 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     continue;
                 }
 
-                if (node.TagHelper.IsEventHandlerTagHelper())
+                if (node.TagHelper.IsEventHandlerTagHelper() && node.IsDirectiveAttribute)
                 {
                     reference.Replace(RewriteUsage(reference.Parent, node));
                 }
@@ -147,6 +147,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 tokens.Insert(i + 1, original[i]);
             }
 
+            var attributeName = node.AttributeName;
+            if (node.IsDirectiveAttribute && attributeName.StartsWith("@"))
+            {
+                // Directive attributes start with a "@" but we don't want that to be included in the output attribute name.
+                // E.g, <input @onclick="..." /> should result in the creation of 'onclick' attribute.
+                attributeName = attributeName.Substring(1);
+            }
             if (parent is MarkupElementIntermediateNode)
             {
                 var result = new HtmlAttributeIntermediateNode()
@@ -155,10 +162,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     {
                         [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
                     },
-                    AttributeName = node.AttributeName,
+                    AttributeName = attributeName,
                     Source = node.Source,
 
-                    Prefix = node.AttributeName + "=\"",
+                    Prefix = attributeName + "=\"",
                     Suffix = "\"",
                 };
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
index 7dad9740d5..d4394a04f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 var reference = references[i];
                 var node = (TagHelperPropertyIntermediateNode)reference.Node;
 
-                if (node.TagHelper.IsKeyTagHelper())
+                if (node.TagHelper.IsKeyTagHelper() && node.IsDirectiveAttribute)
                 {
                     reference.Replace(RewriteUsage(reference.Parent, node));
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index dc620c8f4f..217ae776e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -50,6 +50,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static class Common
         {
             public static readonly string OriginalAttributeName = "Common.OriginalAttributeName";
+
+            public static readonly string DirectiveAttribute = "Common.DirectiveAttribute";
         }
 
         public static class Bind
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
index aa66e07c8d..a962b96f72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 var reference = references[i];
                 var node = (TagHelperPropertyIntermediateNode)reference.Node;
 
-                if (node.TagHelper.IsRefTagHelper())
+                if (node.TagHelper.IsRefTagHelper() && node.IsDirectiveAttribute)
                 {
                     reference.Replace(RewriteUsage(@class, reference.Parent, node));
                 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
index 8bf57e156a..a44c2570db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
@@ -158,6 +158,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             // data-* attributes are explicitly not implemented by user agents and are not intended for use on
             // the server; therefore it's invalid for TagHelpers to bind to them.
             const string DataDashPrefix = "data-";
+            var isDirectiveAttribute = this.IsDirectiveAttribute();
 
             if (string.IsNullOrWhiteSpace(Name))
             {
@@ -182,14 +183,29 @@ namespace Microsoft.AspNetCore.Razor.Language
                     yield return diagnostic;
                 }
 
-                foreach (var character in Name)
+                var name = Name;
+                if (isDirectiveAttribute && name.StartsWith("@"))
+                {
+                    name = name.Substring(1);
+                }
+                else if (isDirectiveAttribute)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundDirectiveAttributeName(
+                            _parent.GetDisplayName(),
+                            GetDisplayName(),
+                            Name);
+
+                    yield return diagnostic;
+                }
+
+                foreach (var character in name)
                 {
                     if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
                     {
                         var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributeName(
                             _parent.GetDisplayName(),
                             GetDisplayName(),
-                            Name,
+                            name,
                             character);
 
                         yield return diagnostic;
@@ -218,14 +234,29 @@ namespace Microsoft.AspNetCore.Razor.Language
                 }
                 else
                 {
-                    foreach (var character in IndexerAttributeNamePrefix)
+                    var indexerPrefix = IndexerAttributeNamePrefix;
+                    if (isDirectiveAttribute && indexerPrefix.StartsWith("@"))
+                    {
+                        indexerPrefix = indexerPrefix.Substring(1);
+                    }
+                    else if (isDirectiveAttribute)
+                    {
+                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundDirectiveAttributePrefix(
+                            _parent.GetDisplayName(),
+                            GetDisplayName(),
+                            indexerPrefix);
+
+                        yield return diagnostic;
+                    }
+
+                    foreach (var character in indexerPrefix)
                     {
                         if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
                         {
                             var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidBoundAttributePrefix(
                                 _parent.GetDisplayName(),
                                 GetDisplayName(),
-                                IndexerAttributeNamePrefix,
+                                indexerPrefix,
                                 character);
 
                             yield return diagnostic;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index ebbc8b9148..05fd4b54e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1646,7 +1646,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 foreach (var child in node.Attributes)
                 {
-                    if (child is MarkupTagHelperAttributeSyntax || child is MarkupMinimizedTagHelperAttributeSyntax)
+                    if (child is MarkupTagHelperAttributeSyntax ||
+                        child is MarkupMinimizedTagHelperAttributeSyntax ||
+                        child is MarkupTagHelperDirectiveAttributeSyntax ||
+                        child is MarkupMinimizedTagHelperDirectiveAttributeSyntax)
                     {
                         Visit(child);
                     }
@@ -1672,30 +1675,114 @@ namespace Microsoft.AspNetCore.Razor.Language
                 {
                     foreach (var associatedDescriptor in associatedDescriptors)
                     {
-                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        if (TagHelperMatchingConventions.TryGetFirstBoundAttributeMatch(
+                            attributeName,
+                            associatedDescriptor,
+                            out var associatedAttributeDescriptor,
+                            out var indexerMatch,
+                            out _,
+                            out _))
                         {
-                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
-                        });
+                            var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
 
-                        var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
+                            if (!expectsBooleanValue)
+                            {
+                                // We do not allow minimized non-boolean bound attributes.
+                                return;
+                            }
 
-                        if (!expectsBooleanValue)
-                        {
-                            // We do not allow minimized non-boolean bound attributes.
-                            return;
+                            var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                            {
+                                AttributeName = attributeName,
+                                BoundAttribute = associatedAttributeDescriptor,
+                                TagHelper = associatedDescriptor,
+                                AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                                Source = null,
+                                IsIndexerNameMatch = indexerMatch,
+                            };
+
+                            _builder.Add(setTagHelperProperty);
                         }
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
 
-                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                    _builder.Add(addHtmlAttribute);
+                }
+            }
+
+            public override void VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+            {
+                if (!_featureFlags.AllowMinimizedBooleanTagHelperAttributes)
+                {
+                    // Minimized attributes are not valid for non-boolean bound attributes. TagHelperBlockRewriter
+                    // has already logged an error if it was a non-boolean bound attribute; so we can skip.
+                    return;
+                }
+
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.FullName;
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        if (TagHelperMatchingConventions.TryGetFirstBoundAttributeMatch(
+                            attributeName,
+                            associatedDescriptor,
+                            out var associatedAttributeDescriptor,
+                            out var indexerMatch,
+                            out var parameterMatch,
+                            out var associatedAttributeParameterDescriptor))
                         {
-                            AttributeName = attributeName,
-                            BoundAttribute = associatedAttributeDescriptor,
-                            TagHelper = associatedDescriptor,
-                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
-                            Source = null,
-                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
-                        };
+                            var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
 
-                        _builder.Add(setTagHelperProperty);
+                            if (!expectsBooleanValue)
+                            {
+                                // We do not allow minimized non-boolean bound attributes.
+                                return;
+                            }
+
+                            IntermediateNode attributeNode;
+                            if (parameterMatch &&
+                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(attributeName, out var attributeNameWithoutParameter, out _))
+                            {
+                                attributeNode = new TagHelperAttributeParameterIntermediateNode()
+                                {
+                                    AttributeName = attributeName,
+                                    AttributeNameWithoutParameter = attributeNameWithoutParameter,
+                                    BoundAttributeParameter = associatedAttributeParameterDescriptor,
+                                    BoundAttribute = associatedAttributeDescriptor,
+                                    TagHelper = associatedDescriptor,
+                                    IsIndexerNameMatch = indexerMatch,
+                                    AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                                    Source = null,
+                                };
+                            }
+                            else
+                            {
+                                attributeNode = new TagHelperPropertyIntermediateNode()
+                                {
+                                    AttributeName = attributeName,
+                                    BoundAttribute = associatedAttributeDescriptor,
+                                    TagHelper = associatedDescriptor,
+                                    AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                                    Source = null,
+                                    IsIndexerNameMatch = indexerMatch,
+                                };
+                            }
+
+                            _builder.Add(attributeNode);
+                        }
                     }
                 }
                 else
@@ -1716,6 +1803,57 @@ namespace Microsoft.AspNetCore.Razor.Language
                 var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
                 var attributeName = node.Name.GetContent();
                 var attributeValueNode = node.Value;
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        if (TagHelperMatchingConventions.TryGetFirstBoundAttributeMatch(
+                            attributeName,
+                            associatedDescriptor,
+                            out var associatedAttributeDescriptor,
+                            out var indexerMatch,
+                            out _,
+                            out _))
+                        {
+                            var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                            {
+                                AttributeName = attributeName,
+                                BoundAttribute = associatedAttributeDescriptor,
+                                TagHelper = associatedDescriptor,
+                                AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                                Source = BuildSourceSpanFromNode(attributeValueNode),
+                                IsIndexerNameMatch = indexerMatch,
+                            };
+
+                            _builder.Push(setTagHelperProperty);
+                            VisitAttributeValue(attributeValueNode);
+                            _builder.Pop();
+                        }
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Push(addHtmlAttribute);
+                    VisitAttributeValue(attributeValueNode);
+                    _builder.Pop();
+                }
+            }
+
+            public override void VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+            {
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.FullName;
+                var attributeValueNode = node.Value;
 
                 var associatedDescriptors = descriptors.Where(descriptor =>
                     descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
@@ -1734,7 +1872,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                         {
                             IntermediateNode attributeNode;
                             if (parameterMatch &&
-                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(attributeName, out var attributeNameWithoutParameter, out var _))
+                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(attributeName, out var attributeNameWithoutParameter, out _))
                             {
                                 attributeNode = new TagHelperAttributeParameterIntermediateNode()
                                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
index 8802abcf7a..13228d130b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
@@ -1,6 +1,8 @@
 // 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.Collections.Generic;
+
 namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRequiredAttributeDescriptor : RequiredAttributeDescriptor
@@ -11,7 +13,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             string value,
             ValueComparisonMode valueComparison,
             string displayName,
-            RazorDiagnostic[] diagnostics)
+            RazorDiagnostic[] diagnostics,
+            Dictionary<string, string> metadata)
         {
             Name = name;
             NameComparison = nameComparison;
@@ -19,6 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             ValueComparison = valueComparison;
             DisplayName = displayName;
             Diagnostics = diagnostics;
+            Metadata = metadata;
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
index 5b611b7b20..a3e7472598 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     internal class DefaultRequiredAttributeDescriptorBuilder : RequiredAttributeDescriptorBuilder
     {
         private RazorDiagnosticCollection _diagnostics;
+        private readonly Dictionary<string, string> _metadata = new Dictionary<string, string>();
 
         public override string Name { get; set; }
 
@@ -32,6 +33,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
+        public override IDictionary<string, string> Metadata => _metadata;
+
         public RequiredAttributeDescriptor Build()
         {
             var validationDiagnostics = Validate();
@@ -41,18 +44,24 @@ namespace Microsoft.AspNetCore.Razor.Language
                 diagnostics.UnionWith(_diagnostics);
             }
 
-            var displayName = NameComparisonMode == RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch ? string.Concat(Name, "...") : Name;
+            var displayName = GetDisplayName();
             var rule = new DefaultRequiredAttributeDescriptor(
                 Name,
                 NameComparisonMode,
                 Value,
                 ValueComparisonMode,
                 displayName,
-                diagnostics?.ToArray() ?? Array.Empty<RazorDiagnostic>());
+                diagnostics?.ToArray() ?? Array.Empty<RazorDiagnostic>(),
+                new Dictionary<string, string>(Metadata));
 
             return rule;
         }
 
+        private string GetDisplayName()
+        {
+            return NameComparisonMode == RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch ? string.Concat(Name, "...") : Name;
+        }
+
         private IEnumerable<RazorDiagnostic> Validate()
         {
             if (string.IsNullOrWhiteSpace(Name))
@@ -63,7 +72,20 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
             else
             {
-                foreach (var character in Name)
+                var name = Name;
+                var isDirectiveAttribute = this.IsDirectiveAttribute();
+                if (isDirectiveAttribute && name.StartsWith("@"))
+                {
+                    name = name.Substring(1);
+                }
+                else if (isDirectiveAttribute)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredDirectiveAttributeName(GetDisplayName(), Name);
+
+                    yield return diagnostic;
+                }
+
+                foreach (var character in name)
                 {
                     if (char.IsWhiteSpace(character) || HtmlConventions.InvalidNonWhitespaceHtmlCharacters.Contains(character))
                     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
index d5b94bde14..2d2766b7b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
@@ -42,7 +41,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
                 throw new ArgumentNullException(nameof(propertyNode));
             }
 
-            AttributeName = propertyNode.AttributeName;
+            var attributeName = propertyNode.AttributeName;
+            if (propertyNode.IsDirectiveAttribute && attributeName.StartsWith("@"))
+            {
+                // Directive attributes start with a "@" but we don't want that to be included in the output attribute name.
+                // E.g, <input @onclick="..." /> should result in the creation of 'onclick' attribute.
+                attributeName = attributeName.Substring(1);
+            }
+
+            AttributeName = attributeName;
             AttributeStructure = propertyNode.AttributeStructure;
             BoundAttribute = propertyNode.BoundAttribute;
             PropertyName = propertyNode.BoundAttribute.GetPropertyName();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
index 91466e44b0..06d03f5c3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
@@ -23,6 +23,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public bool IsIndexerNameMatch { get; set; }
 
+        public bool IsDirectiveAttribute => BoundAttribute?.IsDirectiveAttribute() ?? false;
+
         public override void Accept(IntermediateNodeVisitor visitor)
         {
             if (visitor == null)
@@ -41,6 +43,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
             formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
             formatter.WriteProperty(nameof(BoundAttributeParameter), BoundAttributeParameter?.DisplayName);
+            formatter.WriteProperty(nameof(IsDirectiveAttribute), IsDirectiveAttribute.ToString());
             formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
index 1a755fe6f9..409c86014f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
@@ -19,6 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public bool IsIndexerNameMatch { get; set; }
 
+        public bool IsDirectiveAttribute => BoundAttribute?.IsDirectiveAttribute() ?? false;
+
         public override void Accept(IntermediateNodeVisitor visitor)
         {
             if (visitor == null)
@@ -36,6 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteProperty(nameof(AttributeName), AttributeName);
             formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
             formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(IsDirectiveAttribute), IsDirectiveAttribute.ToString());
             formatter.WriteProperty(nameof(IsIndexerNameMatch), IsIndexerNameMatch.ToString());
             formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 8e58813518..ed3e705216 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1088,8 +1088,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private bool TryParseAttributeName(out IEnumerable<SyntaxToken> nameTokens)
         {
             nameTokens = Enumerable.Empty<SyntaxToken>();
-            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
+            //
+            // We are currently here <input |name="..." />
+            // If we encounter a transition (@) here, it can be parsed as CSharp or Markup depending on the feature flag.
+            // For example, in Components, we want to parse it as Markup so we can support directive attributes.
+            //
+            if (Context.FeatureFlags.AllowCSharpInMarkupAttributeArea &&
+                (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition)))
             {
+                // If we get here, there is CSharp in the attribute area. Don't try to parse the name.
                 return false;
             }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index 1516bfc4c3..d2dc97749d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -176,16 +176,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var result = CreateTryParseResult(attributeBlock.Name.GetContent(), descriptors, processedBoundAttributeNames);
 
             result.AttributeStructure = AttributeStructure.Minimized;
-            var rewritten = SyntaxFactory.MarkupMinimizedTagHelperAttribute(
-                attributeBlock.NamePrefix,
-                attributeBlock.Name);
 
-            rewritten = rewritten.WithTagHelperAttributeInfo(
-                new TagHelperAttributeInfo(result.AttributeName, result.AttributeStructure, result.IsBoundAttribute));
+            if (result.IsDirectiveAttribute)
+            {
+                // Directive attributes have a different syntax.
+                result.RewrittenAttribute = RewriteToMinimizedDirectiveAttribute(attributeBlock, result);
 
-            result.RewrittenAttribute = rewritten;
+                return result;
+            }
+            else
+            {
+                var rewritten = SyntaxFactory.MarkupMinimizedTagHelperAttribute(
+                    attributeBlock.NamePrefix,
+                    attributeBlock.Name);
 
-            return result;
+                rewritten = rewritten.WithTagHelperAttributeInfo(
+                        new TagHelperAttributeInfo(result.AttributeName, parameterName: null, result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: false));
+
+                result.RewrittenAttribute = rewritten;
+
+                return result;
+            }
         }
 
         private static TryParseResult TryParseAttribute(
@@ -238,9 +249,84 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             var rewrittenValue = RewriteAttributeValue(result, attributeValue);
 
-            var rewritten = SyntaxFactory.MarkupTagHelperAttribute(
+            if (result.IsDirectiveAttribute)
+            {
+                // Directive attributes have a different syntax.
+                result.RewrittenAttribute = RewriteToDirectiveAttribute(attributeBlock, result, rewrittenValue);
+
+                return result;
+            }
+            else
+            {
+                var rewritten = SyntaxFactory.MarkupTagHelperAttribute(
+                    attributeBlock.NamePrefix,
+                    attributeBlock.Name,
+                    attributeBlock.NameSuffix,
+                    attributeBlock.EqualsToken,
+                    attributeBlock.ValuePrefix,
+                    rewrittenValue,
+                    attributeBlock.ValueSuffix);
+
+                rewritten = rewritten.WithTagHelperAttributeInfo(
+                    new TagHelperAttributeInfo(result.AttributeName, parameterName: null, result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: false));
+
+
+                result.RewrittenAttribute = rewritten;
+
+                return result;
+            }
+        }
+
+        private static MarkupTagHelperDirectiveAttributeSyntax RewriteToDirectiveAttribute(
+            MarkupAttributeBlockSyntax attributeBlock,
+            TryParseResult result,
+            MarkupTagHelperAttributeValueSyntax rewrittenValue)
+        {
+            // 
+            // Consider, <Foo @bind:param="..." />
+            // We're now going to rewrite @bind:param from a regular MarkupAttributeBlock to a MarkupTagHelperDirectiveAttribute.
+            // We need to split the name "@bind:param" into four parts,
+            // @ - Transition (MetaCode)
+            // bind - Name (Text)
+            // : - Colon (MetaCode)
+            // param - ParameterName (Text)
+            //
+            var attributeName = result.AttributeName;
+            var attributeNameSyntax = attributeBlock.Name;
+            var transition = SyntaxFactory.RazorMetaCode(
+                new SyntaxList<SyntaxToken>(SyntaxFactory.MissingToken(SyntaxKind.Transition)));
+            RazorMetaCodeSyntax colon = null;
+            MarkupTextLiteralSyntax parameterName = null;
+            if (attributeName.StartsWith("@"))
+            {
+                attributeName = attributeName.Substring(1);
+                var attributeNameToken = SyntaxFactory.Token(SyntaxKind.Text, attributeName);
+                attributeNameSyntax = SyntaxFactory.MarkupTextLiteral().AddLiteralTokens(attributeNameToken);
+
+                var transitionToken = SyntaxFactory.Token(SyntaxKind.Transition, "@");
+                transition = SyntaxFactory.RazorMetaCode(new SyntaxList<SyntaxToken>(transitionToken));
+            }
+
+            if (attributeName.IndexOf(':') != -1)
+            {
+                var segments = attributeName.Split(new[] { ':' }, 2);
+
+                var attributeNameToken = SyntaxFactory.Token(SyntaxKind.Text, segments[0]);
+                attributeNameSyntax = SyntaxFactory.MarkupTextLiteral().AddLiteralTokens(attributeNameToken);
+
+                var colonToken = SyntaxFactory.Token(SyntaxKind.Colon, ":");
+                colon = SyntaxFactory.RazorMetaCode(new SyntaxList<SyntaxToken>(colonToken));
+
+                var parameterNameToken = SyntaxFactory.Token(SyntaxKind.Text, segments[1]);
+                parameterName = SyntaxFactory.MarkupTextLiteral().AddLiteralTokens(parameterNameToken);
+            }
+
+            var rewritten = SyntaxFactory.MarkupTagHelperDirectiveAttribute(
                 attributeBlock.NamePrefix,
-                attributeBlock.Name,
+                transition,
+                attributeNameSyntax,
+                colon,
+                parameterName,
                 attributeBlock.NameSuffix,
                 attributeBlock.EqualsToken,
                 attributeBlock.ValuePrefix,
@@ -248,11 +334,65 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 attributeBlock.ValueSuffix);
 
             rewritten = rewritten.WithTagHelperAttributeInfo(
-                new TagHelperAttributeInfo(result.AttributeName, result.AttributeStructure, result.IsBoundAttribute));
+                new TagHelperAttributeInfo(result.AttributeName, parameterName?.GetContent(), result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: true));
 
-            result.RewrittenAttribute = rewritten;
+            return rewritten;
+        }
 
-            return result;
+        private static MarkupMinimizedTagHelperDirectiveAttributeSyntax RewriteToMinimizedDirectiveAttribute(
+            MarkupMinimizedAttributeBlockSyntax attributeBlock,
+            TryParseResult result)
+        {
+            // 
+            // Consider, <Foo @bind:param />
+            // We're now going to rewrite @bind:param from a regular MarkupAttributeBlock to a MarkupTagHelperDirectiveAttribute.
+            // We need to split the name "@bind:param" into four parts,
+            // @ - Transition (MetaCode)
+            // bind - Name (Text)
+            // : - Colon (MetaCode)
+            // param - ParameterName (Text)
+            //
+            var attributeName = result.AttributeName;
+            var attributeNameSyntax = attributeBlock.Name;
+            var transition = SyntaxFactory.RazorMetaCode(
+                new SyntaxList<SyntaxToken>(SyntaxFactory.MissingToken(SyntaxKind.Transition)));
+            RazorMetaCodeSyntax colon = null;
+            MarkupTextLiteralSyntax parameterName = null;
+            if (attributeName.StartsWith("@"))
+            {
+                attributeName = attributeName.Substring(1);
+                var attributeNameToken = SyntaxFactory.Token(SyntaxKind.Text, attributeName);
+                attributeNameSyntax = SyntaxFactory.MarkupTextLiteral().AddLiteralTokens(attributeNameToken);
+
+                var transitionToken = SyntaxFactory.Token(SyntaxKind.Transition, "@");
+                transition = SyntaxFactory.RazorMetaCode(new SyntaxList<SyntaxToken>(transitionToken));
+            }
+
+            if (attributeName.IndexOf(':') != -1)
+            {
+                var segments = attributeName.Split(new[] { ':' }, 2);
+
+                var attributeNameToken = SyntaxFactory.Token(SyntaxKind.Text, segments[0]);
+                attributeNameSyntax = SyntaxFactory.MarkupTextLiteral().AddLiteralTokens(attributeNameToken);
+
+                var colonToken = SyntaxFactory.Token(SyntaxKind.Colon, ":");
+                colon = SyntaxFactory.RazorMetaCode(new SyntaxList<SyntaxToken>(colonToken));
+
+                var parameterNameToken = SyntaxFactory.Token(SyntaxKind.Text, segments[1]);
+                parameterName = SyntaxFactory.MarkupTextLiteral().AddLiteralTokens(parameterNameToken);
+            }
+
+            var rewritten = SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(
+                attributeBlock.NamePrefix,
+                transition,
+                attributeNameSyntax,
+                colon,
+                parameterName);
+
+            rewritten = rewritten.WithTagHelperAttributeInfo(
+                new TagHelperAttributeInfo(result.AttributeName, parameterName?.GetContent(), result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: true));
+
+            return rewritten;
         }
 
         private static MarkupTagHelperAttributeValueSyntax RewriteAttributeValue(TryParseResult result, RazorBlockSyntax attributeValue)
@@ -301,6 +441,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var isBoundNonStringAttribute = false;
             var isBoundBooleanAttribute = false;
             var isMissingDictionaryKey = false;
+            var isDirectiveAttribute = false;
 
             foreach (var descriptor in descriptors)
             {
@@ -327,6 +468,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             name.Length == firstBoundAttribute.IndexerNamePrefix.Length;
                     }
 
+                    isDirectiveAttribute = firstBoundAttribute.IsDirectiveAttribute();
+
                     break;
                 }
             }
@@ -345,7 +488,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 IsBoundNonStringAttribute = isBoundNonStringAttribute,
                 IsBoundBooleanAttribute = isBoundBooleanAttribute,
                 IsMissingDictionaryKey = isMissingDictionaryKey,
-                IsDuplicateAttribute = isDuplicateAttribute
+                IsDuplicateAttribute = isDuplicateAttribute,
+                IsDirectiveAttribute = isDirectiveAttribute
             };
         }
 
@@ -355,6 +499,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 return tagHelperAttribute.Value?.GetContent();
             }
+            else if (attributeBlock is MarkupTagHelperDirectiveAttributeSyntax directiveAttribute)
+            {
+                return directiveAttribute.Value?.GetContent();
+            }
             else if (attributeBlock is MarkupAttributeBlockSyntax attribute)
             {
                 return attribute.Value?.GetContent();
@@ -666,6 +814,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             public bool IsMissingDictionaryKey { get; set; }
 
             public bool IsDuplicateAttribute { get; set; }
+
+            public bool IsDirectiveAttribute { get; set; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
index e1e1c9d621..1617fc417c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -824,6 +824,64 @@ namespace Microsoft.AspNetCore.Razor.Language
             return diagnostic;
         }
 
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundDirectiveAttributeName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3015",
+                () => Resources.TagHelper_InvalidBoundDirectiveAttributeName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundDirectiveAttributeName(
+            string tagHelperDisplayName,
+            string propertyDisplayName,
+            string invalidName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundDirectiveAttributeName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                invalidName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidBoundDirectiveAttributePrefix =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3015",
+                () => Resources.TagHelper_InvalidBoundDirectiveAttributePrefix,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidBoundDirectiveAttributePrefix(
+            string tagHelperDisplayName,
+            string propertyDisplayName,
+            string invalidName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidBoundDirectiveAttributePrefix,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperDisplayName,
+                propertyDisplayName,
+                invalidName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidRequiredDirectiveAttributeName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3016",
+                () => Resources.TagHelper_InvalidRequiredDirectiveAttributeName,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateTagHelper_InvalidRequiredDirectiveAttributeName(
+            string propertyDisplayName,
+            string invalidName)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                TagHelper_InvalidRequiredDirectiveAttributeName,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                propertyDisplayName,
+                invalidName);
+
+            return diagnostic;
+        }
+
         #endregion
 
         #region Rewriter Errors
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
index 9c8fd6276f..6bc236aada 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var allowRazorInAllCodeBlocks = false;
             var allowUsingVariableDeclarations = false;
             var allowConditionalDataDashAttributes = false;
+            var allowCSharpInMarkupAttributeArea = true;
 
             if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
             {
@@ -39,6 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             if (FileKinds.IsComponent(fileKind))
             {
                 allowConditionalDataDashAttributes = true;
+                allowCSharpInMarkupAttributeArea = false;
             }
 
             if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
@@ -52,7 +54,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowComponentFileKind,
                 allowRazorInAllCodeBlocks,
                 allowUsingVariableDeclarations,
-                allowConditionalDataDashAttributes);
+                allowConditionalDataDashAttributes,
+                allowCSharpInMarkupAttributeArea);
         }
 
         public abstract bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -67,6 +70,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool AllowConditionalDataDashAttributes { get; }
 
+        public abstract bool AllowCSharpInMarkupAttributeArea { get; }
+
         private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
         {
             public DefaultRazorParserFeatureFlags(
@@ -75,7 +80,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 bool allowComponentFileKind,
                 bool allowRazorInAllCodeBlocks,
                 bool allowUsingVariableDeclarations,
-                bool allowConditionalDataDashAttributesInComponents)
+                bool allowConditionalDataDashAttributesInComponents,
+                bool allowCSharpInMarkupAttributeArea)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
@@ -83,6 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 AllowRazorInAllCodeBlocks = allowRazorInAllCodeBlocks;
                 AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
                 AllowConditionalDataDashAttributes = allowConditionalDataDashAttributesInComponents;
+                AllowCSharpInMarkupAttributeArea = allowCSharpInMarkupAttributeArea;
             }
 
             public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -96,6 +103,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             public override bool AllowUsingVariableDeclarations { get; }
 
             public override bool AllowConditionalDataDashAttributes { get; }
+
+            public override bool AllowCSharpInMarkupAttributeArea { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
index ce8bdca365..5f68eea115 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
@@ -21,6 +21,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
 
+        public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
+
         public bool HasErrors
         {
             get
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs
index 5cf368422f..11973c25f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilder.cs
@@ -1,6 +1,8 @@
 // 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.Collections.Generic;
+
 namespace Microsoft.AspNetCore.Razor.Language
 {
     public abstract class RequiredAttributeDescriptorBuilder
@@ -14,5 +16,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public abstract RequiredAttributeDescriptor.ValueComparisonMode ValueComparisonMode { get; set; }
 
         public abstract RazorDiagnosticCollection Diagnostics { get; }
+
+        public virtual IDictionary<string, string> Metadata { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilderExtensions.cs
new file mode 100644
index 0000000000..0251b5b38b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorBuilderExtensions.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class RequiredAttributeDescriptorBuilderExtensions
+    {
+        internal static bool IsDirectiveAttribute(this RequiredAttributeDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return
+                builder.Metadata.TryGetValue(ComponentMetadata.Common.DirectiveAttribute, out var value) &&
+                string.Equals(bool.TrueString, value);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorExtensions.cs
new file mode 100644
index 0000000000..f9845b0d7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorExtensions.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public static class RequiredAttributeDescriptorExtensions
+    {
+        public static bool IsDirectiveAttribute(this RequiredAttributeDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            return
+                descriptor.Metadata.TryGetValue(ComponentMetadata.Common.DirectiveAttribute, out var value) &&
+                string.Equals(bool.TrueString, value);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index b50fe38e29..33c63d93c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -550,4 +550,13 @@
   <data name="DirectiveExpectsCSharpAttribute" xml:space="preserve">
     <value>The '{0}' directive expects a C# attribute.</value>
   </data>
+  <data name="TagHelper_InvalidBoundDirectiveAttributeName" xml:space="preserve">
+    <value>Invalid tag helper bound directive attribute '{1}' on tag helper '{0}'. The directive attribute '{2}' should start with a '@' character.</value>
+  </data>
+  <data name="TagHelper_InvalidBoundDirectiveAttributePrefix" xml:space="preserve">
+    <value>Invalid tag helper bound directive attribute '{1}' on tag helper '{0}'. Tag helpers cannot bind to directive attributes with prefix '{2}' because the prefix doesn't start with a '@' character.</value>
+  </data>
+  <data name="TagHelper_InvalidRequiredDirectiveAttributeName" xml:space="preserve">
+    <value>Invalid tag helper required directive attribute '{0}'. The directive attribute '{1}' should start with a '@' character.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
index 4fe3309e14..d6ce1393ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -2376,6 +2376,301 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
     }
   }
 
+  internal sealed partial class MarkupTagHelperDirectiveAttributeSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly RazorMetaCodeSyntax _transition;
+    private readonly MarkupTextLiteralSyntax _name;
+    private readonly RazorMetaCodeSyntax _colon;
+    private readonly MarkupTextLiteralSyntax _parameterName;
+    private readonly MarkupTextLiteralSyntax _nameSuffix;
+    private readonly SyntaxToken _equalsToken;
+    private readonly MarkupTextLiteralSyntax _valuePrefix;
+    private readonly MarkupTagHelperAttributeValueSyntax _value;
+    private readonly MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupTagHelperDirectiveAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 10;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (colon != null)
+        {
+            AdjustFlagsAndWidth(colon);
+            _colon = colon;
+        }
+        if (parameterName != null)
+        {
+            AdjustFlagsAndWidth(parameterName);
+            _parameterName = parameterName;
+        }
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+
+    internal MarkupTagHelperDirectiveAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+        : base(kind)
+    {
+        SlotCount = 10;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (colon != null)
+        {
+            AdjustFlagsAndWidth(colon);
+            _colon = colon;
+        }
+        if (parameterName != null)
+        {
+            AdjustFlagsAndWidth(parameterName);
+            _parameterName = parameterName;
+        }
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public RazorMetaCodeSyntax Transition { get { return _transition; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+    public RazorMetaCodeSyntax Colon { get { return _colon; } }
+    public MarkupTextLiteralSyntax ParameterName { get { return _parameterName; } }
+    public MarkupTextLiteralSyntax NameSuffix { get { return _nameSuffix; } }
+    public SyntaxToken EqualsToken { get { return _equalsToken; } }
+    public MarkupTextLiteralSyntax ValuePrefix { get { return _valuePrefix; } }
+    public MarkupTagHelperAttributeValueSyntax Value { get { return _value; } }
+    public MarkupTextLiteralSyntax ValueSuffix { get { return _valueSuffix; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _transition;
+            case 2: return _name;
+            case 3: return _colon;
+            case 4: return _parameterName;
+            case 5: return _nameSuffix;
+            case 6: return _equalsToken;
+            case 7: return _valuePrefix;
+            case 8: return _value;
+            case 9: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperDirectiveAttributeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperDirectiveAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperDirectiveAttribute(this);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || transition != Transition || name != Name || colon != Colon || parameterName != ParameterName || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperDirectiveAttribute(namePrefix, transition, name, colon, parameterName, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperDirectiveAttributeSyntax(Kind, _namePrefix, _transition, _name, _colon, _parameterName, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperDirectiveAttributeSyntax(Kind, _namePrefix, _transition, _name, _colon, _parameterName, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedTagHelperDirectiveAttributeSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly RazorMetaCodeSyntax _transition;
+    private readonly MarkupTextLiteralSyntax _name;
+    private readonly RazorMetaCodeSyntax _colon;
+    private readonly MarkupTextLiteralSyntax _parameterName;
+
+    internal MarkupMinimizedTagHelperDirectiveAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 5;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (colon != null)
+        {
+            AdjustFlagsAndWidth(colon);
+            _colon = colon;
+        }
+        if (parameterName != null)
+        {
+            AdjustFlagsAndWidth(parameterName);
+            _parameterName = parameterName;
+        }
+    }
+
+
+    internal MarkupMinimizedTagHelperDirectiveAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName)
+        : base(kind)
+    {
+        SlotCount = 5;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (colon != null)
+        {
+            AdjustFlagsAndWidth(colon);
+            _colon = colon;
+        }
+        if (parameterName != null)
+        {
+            AdjustFlagsAndWidth(parameterName);
+            _parameterName = parameterName;
+        }
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public RazorMetaCodeSyntax Transition { get { return _transition; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+    public RazorMetaCodeSyntax Colon { get { return _colon; } }
+    public MarkupTextLiteralSyntax ParameterName { get { return _parameterName; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _transition;
+            case 2: return _name;
+            case 3: return _colon;
+            case 4: return _parameterName;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupMinimizedTagHelperDirectiveAttributeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedTagHelperDirectiveAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedTagHelperDirectiveAttribute(this);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName)
+    {
+        if (namePrefix != NamePrefix || transition != Transition || name != Name || colon != Colon || parameterName != ParameterName)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(namePrefix, transition, name, colon, parameterName);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupMinimizedTagHelperDirectiveAttributeSyntax(Kind, _namePrefix, _transition, _name, _colon, _parameterName, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupMinimizedTagHelperDirectiveAttributeSyntax(Kind, _namePrefix, _transition, _name, _colon, _parameterName, GetDiagnostics(), annotations);
+    }
+  }
+
   internal abstract partial class CSharpSyntaxNode : RazorSyntaxNode
   {
     internal CSharpSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
@@ -3675,6 +3970,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return DefaultVisit(node);
     }
 
+    public virtual TResult VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
     public virtual TResult VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
     {
       return DefaultVisit(node);
@@ -3869,6 +4174,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       DefaultVisit(node);
     }
 
+    public virtual void VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
     public virtual void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
     {
       DefaultVisit(node);
@@ -4130,6 +4445,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return node.Update(children);
     }
 
+    public override GreenNode VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var transition = (RazorMetaCodeSyntax)Visit(node.Transition);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var colon = (RazorMetaCodeSyntax)Visit(node.Colon);
+      var parameterName = (MarkupTextLiteralSyntax)Visit(node.ParameterName);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)Visit(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (MarkupTagHelperAttributeValueSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, transition, name, colon, parameterName, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override GreenNode VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var transition = (RazorMetaCodeSyntax)Visit(node.Transition);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var colon = (RazorMetaCodeSyntax)Visit(node.Colon);
+      var parameterName = (MarkupTextLiteralSyntax)Visit(node.ParameterName);
+      return node.Update(namePrefix, transition, name, colon, parameterName);
+    }
+
     public override GreenNode VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
     {
       var children = VisitList(node.Children);
@@ -4663,6 +5003,37 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
       return result;
     }
 
+    public static MarkupTagHelperDirectiveAttributeSyntax MarkupTagHelperDirectiveAttribute(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      if (equalsToken == null)
+        throw new ArgumentNullException(nameof(equalsToken));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+
+      return new MarkupTagHelperDirectiveAttributeSyntax(SyntaxKind.MarkupTagHelperDirectiveAttribute, namePrefix, transition, name, colon, parameterName, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public static MarkupMinimizedTagHelperDirectiveAttributeSyntax MarkupMinimizedTagHelperDirectiveAttribute(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+
+      return new MarkupMinimizedTagHelperDirectiveAttributeSyntax(SyntaxKind.MarkupMinimizedTagHelperDirectiveAttribute, namePrefix, transition, name, colon, parameterName);
+    }
+
     public static CSharpCodeBlockSyntax CSharpCodeBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
     {
       var result = new CSharpCodeBlockSyntax(SyntaxKind.CSharpCodeBlock, children.Node);
@@ -4838,6 +5209,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
            typeof(MarkupTagHelperAttributeSyntax),
            typeof(MarkupMinimizedTagHelperAttributeSyntax),
            typeof(MarkupTagHelperAttributeValueSyntax),
+           typeof(MarkupTagHelperDirectiveAttributeSyntax),
+           typeof(MarkupMinimizedTagHelperDirectiveAttributeSyntax),
            typeof(CSharpCodeBlockSyntax),
            typeof(CSharpTransitionSyntax),
            typeof(CSharpStatementLiteralSyntax),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
index cf1c0aa0a8..a53e0de3bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -155,6 +155,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return DefaultVisit(node);
     }
 
+    /// <summary>Called when the visitor visits a MarkupTagHelperDirectiveAttributeSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedTagHelperDirectiveAttributeSyntax node.</summary>
+    public virtual TResult VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
     /// <summary>Called when the visitor visits a CSharpCodeBlockSyntax node.</summary>
     public virtual TResult VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
     {
@@ -386,6 +398,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       DefaultVisit(node);
     }
 
+    /// <summary>Called when the visitor visits a MarkupTagHelperDirectiveAttributeSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedTagHelperDirectiveAttributeSyntax node.</summary>
+    public virtual void VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
     /// <summary>Called when the visitor visits a CSharpCodeBlockSyntax node.</summary>
     public virtual void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
     {
@@ -661,6 +685,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return node.Update(children);
     }
 
+    public override SyntaxNode VisitMarkupTagHelperDirectiveAttribute(MarkupTagHelperDirectiveAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var transition = (RazorMetaCodeSyntax)Visit(node.Transition);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var colon = (RazorMetaCodeSyntax)Visit(node.Colon);
+      var parameterName = (MarkupTextLiteralSyntax)Visit(node.ParameterName);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)VisitToken(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (MarkupTagHelperAttributeValueSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, transition, name, colon, parameterName, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override SyntaxNode VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinimizedTagHelperDirectiveAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var transition = (RazorMetaCodeSyntax)Visit(node.Transition);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var colon = (RazorMetaCodeSyntax)Visit(node.Colon);
+      var parameterName = (MarkupTextLiteralSyntax)Visit(node.ParameterName);
+      return node.Update(namePrefix, transition, name, colon, parameterName);
+    }
+
     public override SyntaxNode VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
     {
       var children = VisitList(node.Children);
@@ -1280,6 +1329,53 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
       return SyntaxFactory.MarkupTagHelperAttributeValue(default(SyntaxList<RazorSyntaxNode>));
     }
 
+    /// <summary>Creates a new MarkupTagHelperDirectiveAttributeSyntax instance.</summary>
+    public static MarkupTagHelperDirectiveAttributeSyntax MarkupTagHelperDirectiveAttribute(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+      return (MarkupTagHelperDirectiveAttributeSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperDirectiveAttribute(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, transition == null ? null : (InternalSyntax.RazorMetaCodeSyntax)transition.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green, colon == null ? null : (InternalSyntax.RazorMetaCodeSyntax)colon.Green, parameterName == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)parameterName.Green, nameSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)nameSuffix.Green, (Syntax.InternalSyntax.SyntaxToken)equalsToken.Green, valuePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valuePrefix.Green, value == null ? null : (InternalSyntax.MarkupTagHelperAttributeValueSyntax)value.Green, valueSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valueSuffix.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperDirectiveAttributeSyntax instance.</summary>
+    public static MarkupTagHelperDirectiveAttributeSyntax MarkupTagHelperDirectiveAttribute(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      return SyntaxFactory.MarkupTagHelperDirectiveAttribute(namePrefix, transition, name, colon, parameterName, nameSuffix, SyntaxFactory.Token(SyntaxKind.Equals), valuePrefix, value, valueSuffix);
+    }
+
+    /// <summary>Creates a new MarkupTagHelperDirectiveAttributeSyntax instance.</summary>
+    public static MarkupTagHelperDirectiveAttributeSyntax MarkupTagHelperDirectiveAttribute()
+    {
+      return SyntaxFactory.MarkupTagHelperDirectiveAttribute(default(MarkupTextLiteralSyntax), SyntaxFactory.RazorMetaCode(), SyntaxFactory.MarkupTextLiteral(), default(RazorMetaCodeSyntax), default(MarkupTextLiteralSyntax), default(MarkupTextLiteralSyntax), SyntaxFactory.Token(SyntaxKind.Equals), default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTagHelperAttributeValue(), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupMinimizedTagHelperDirectiveAttributeSyntax instance.</summary>
+    public static MarkupMinimizedTagHelperDirectiveAttributeSyntax MarkupMinimizedTagHelperDirectiveAttribute(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      return (MarkupMinimizedTagHelperDirectiveAttributeSyntax)InternalSyntax.SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, transition == null ? null : (InternalSyntax.RazorMetaCodeSyntax)transition.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green, colon == null ? null : (InternalSyntax.RazorMetaCodeSyntax)colon.Green, parameterName == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)parameterName.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupMinimizedTagHelperDirectiveAttributeSyntax instance.</summary>
+    public static MarkupMinimizedTagHelperDirectiveAttributeSyntax MarkupMinimizedTagHelperDirectiveAttribute()
+    {
+      return SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(default(MarkupTextLiteralSyntax), SyntaxFactory.RazorMetaCode(), SyntaxFactory.MarkupTextLiteral(), default(RazorMetaCodeSyntax), default(MarkupTextLiteralSyntax));
+    }
+
     /// <summary>Creates a new CSharpCodeBlockSyntax instance.</summary>
     public static CSharpCodeBlockSyntax CSharpCodeBlock(SyntaxList<RazorSyntaxNode> children)
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
index e18d495f3d..6928b14710 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -2548,6 +2548,427 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
     }
   }
 
+  internal sealed partial class MarkupTagHelperDirectiveAttributeSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private RazorMetaCodeSyntax _transition;
+    private MarkupTextLiteralSyntax _name;
+    private RazorMetaCodeSyntax _colon;
+    private MarkupTextLiteralSyntax _parameterName;
+    private MarkupTextLiteralSyntax _nameSuffix;
+    private SyntaxToken _equalsToken;
+    private MarkupTextLiteralSyntax _valuePrefix;
+    private MarkupTagHelperAttributeValueSyntax _value;
+    private MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupTagHelperDirectiveAttributeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public RazorMetaCodeSyntax Transition 
+    {
+        get
+        {
+            return GetRed(ref _transition, 1);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 2);
+        }
+    }
+
+    public RazorMetaCodeSyntax Colon 
+    {
+        get
+        {
+            return GetRed(ref _colon, 3);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ParameterName 
+    {
+        get
+        {
+            return GetRed(ref _parameterName, 4);
+        }
+    }
+
+    public MarkupTextLiteralSyntax NameSuffix 
+    {
+        get
+        {
+            return GetRed(ref _nameSuffix, 5);
+        }
+    }
+
+    public SyntaxToken EqualsToken 
+    {
+        get
+        {
+            return GetRed(ref _equalsToken, 6);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValuePrefix 
+    {
+        get
+        {
+            return GetRed(ref _valuePrefix, 7);
+        }
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 8);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValueSuffix 
+    {
+        get
+        {
+            return GetRed(ref _valueSuffix, 9);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _transition, 1);
+            case 2: return GetRed(ref _name, 2);
+            case 3: return GetRed(ref _colon, 3);
+            case 4: return GetRed(ref _parameterName, 4);
+            case 5: return GetRed(ref _nameSuffix, 5);
+            case 6: return GetRed(ref _equalsToken, 6);
+            case 7: return GetRed(ref _valuePrefix, 7);
+            case 8: return GetRed(ref _value, 8);
+            case 9: return GetRed(ref _valueSuffix, 9);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _transition;
+            case 2: return _name;
+            case 3: return _colon;
+            case 4: return _parameterName;
+            case 5: return _nameSuffix;
+            case 6: return _equalsToken;
+            case 7: return _valuePrefix;
+            case 8: return _value;
+            case 9: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperDirectiveAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperDirectiveAttribute(this);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || transition != Transition || name != Name || colon != Colon || parameterName != ParameterName || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperDirectiveAttribute(namePrefix, transition, name, colon, parameterName, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Transition, Name, Colon, ParameterName, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithTransition(RazorMetaCodeSyntax transition)
+    {
+        return Update(NamePrefix, transition, Name, Colon, ParameterName, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, Transition, name, Colon, ParameterName, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithColon(RazorMetaCodeSyntax colon)
+    {
+        return Update(NamePrefix, Transition, Name, colon, ParameterName, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithParameterName(MarkupTextLiteralSyntax parameterName)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, parameterName, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithNameSuffix(MarkupTextLiteralSyntax nameSuffix)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, ParameterName, nameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithEqualsToken(SyntaxToken equalsToken)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, ParameterName, NameSuffix, equalsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithValuePrefix(MarkupTextLiteralSyntax valuePrefix)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, ParameterName, NameSuffix, EqualsToken, valuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithValue(MarkupTagHelperAttributeValueSyntax value)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, ParameterName, NameSuffix, EqualsToken, ValuePrefix, value, ValueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax WithValueSuffix(MarkupTextLiteralSyntax valueSuffix)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, ParameterName, NameSuffix, EqualsToken, ValuePrefix, Value, valueSuffix);
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddTransitionMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithTransition(this.Transition.WithMetaCode(this.Transition.MetaCode.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddColonMetaCode(params SyntaxToken[] items)
+    {
+        var _colon = this.Colon ?? SyntaxFactory.RazorMetaCode();
+        return this.WithColon(_colon.WithMetaCode(_colon.MetaCode.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddParameterNameLiteralTokens(params SyntaxToken[] items)
+    {
+        var _parameterName = this.ParameterName ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithParameterName(_parameterName.WithLiteralTokens(_parameterName.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddNameSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _nameSuffix = this.NameSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNameSuffix(_nameSuffix.WithLiteralTokens(_nameSuffix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddValuePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valuePrefix = this.ValuePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValuePrefix(_valuePrefix.WithLiteralTokens(_valuePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddValueChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithValue(this.Value.WithChildren(this.Value.Children.AddRange(items)));
+    }
+
+    public MarkupTagHelperDirectiveAttributeSyntax AddValueSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valueSuffix = this.ValueSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValueSuffix(_valueSuffix.WithLiteralTokens(_valueSuffix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedTagHelperDirectiveAttributeSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private RazorMetaCodeSyntax _transition;
+    private MarkupTextLiteralSyntax _name;
+    private RazorMetaCodeSyntax _colon;
+    private MarkupTextLiteralSyntax _parameterName;
+
+    internal MarkupMinimizedTagHelperDirectiveAttributeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public RazorMetaCodeSyntax Transition 
+    {
+        get
+        {
+            return GetRed(ref _transition, 1);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 2);
+        }
+    }
+
+    public RazorMetaCodeSyntax Colon 
+    {
+        get
+        {
+            return GetRed(ref _colon, 3);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ParameterName 
+    {
+        get
+        {
+            return GetRed(ref _parameterName, 4);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _transition, 1);
+            case 2: return GetRed(ref _name, 2);
+            case 3: return GetRed(ref _colon, 3);
+            case 4: return GetRed(ref _parameterName, 4);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _transition;
+            case 2: return _name;
+            case 3: return _colon;
+            case 4: return _parameterName;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedTagHelperDirectiveAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedTagHelperDirectiveAttribute(this);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, RazorMetaCodeSyntax transition, MarkupTextLiteralSyntax name, RazorMetaCodeSyntax colon, MarkupTextLiteralSyntax parameterName)
+    {
+        if (namePrefix != NamePrefix || transition != Transition || name != Name || colon != Colon || parameterName != ParameterName)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(namePrefix, transition, name, colon, parameterName);
+            var diagnostics = GetDiagnostics();
+            if (diagnostics != null && diagnostics.Length > 0)
+               newNode = newNode.WithDiagnostics(diagnostics);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Transition, Name, Colon, ParameterName);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax WithTransition(RazorMetaCodeSyntax transition)
+    {
+        return Update(NamePrefix, transition, Name, Colon, ParameterName);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, Transition, name, Colon, ParameterName);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax WithColon(RazorMetaCodeSyntax colon)
+    {
+        return Update(NamePrefix, Transition, Name, colon, ParameterName);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax WithParameterName(MarkupTextLiteralSyntax parameterName)
+    {
+        return Update(NamePrefix, Transition, Name, Colon, parameterName);
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax AddTransitionMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithTransition(this.Transition.WithMetaCode(this.Transition.MetaCode.AddRange(items)));
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax AddColonMetaCode(params SyntaxToken[] items)
+    {
+        var _colon = this.Colon ?? SyntaxFactory.RazorMetaCode();
+        return this.WithColon(_colon.WithMetaCode(_colon.MetaCode.AddRange(items)));
+    }
+
+    public MarkupMinimizedTagHelperDirectiveAttributeSyntax AddParameterNameLiteralTokens(params SyntaxToken[] items)
+    {
+        var _parameterName = this.ParameterName ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithParameterName(_parameterName.WithLiteralTokens(_parameterName.LiteralTokens.AddRange(items)));
+    }
+  }
+
   internal abstract partial class CSharpSyntaxNode : RazorSyntaxNode
   {
     internal CSharpSyntaxNode(GreenNode green, SyntaxNode parent, int position)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperDirectiveAttributeSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperDirectiveAttributeSyntax.cs
new file mode 100644
index 0000000000..d903fda933
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupMinimizedTagHelperDirectiveAttributeSyntax.cs
@@ -0,0 +1,46 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupMinimizedTagHelperDirectiveAttributeSyntax
+    {
+        private static readonly string TagHelperAttributeInfoKey = typeof(TagHelperAttributeInfo).Name;
+
+        public TagHelperAttributeInfo TagHelperAttributeInfo
+        {
+            get
+            {
+                var tagHelperAttributeInfo = this.GetAnnotationValue(TagHelperAttributeInfoKey) as TagHelperAttributeInfo;
+                return tagHelperAttributeInfo;
+            }
+        }
+
+        public string FullName
+        {
+            get
+            {
+                var fullName = string.Concat(
+                    Transition.GetContent(),
+                    Name.GetContent(),
+                    Colon?.GetContent() ?? string.Empty,
+                    ParameterName?.GetContent() ?? string.Empty);
+                return fullName;
+            }
+        }
+
+        public MarkupMinimizedTagHelperDirectiveAttributeSyntax WithTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperAttributeInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupMinimizedTagHelperDirectiveAttributeSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperDirectiveAttributeSyntax.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperDirectiveAttributeSyntax.cs
new file mode 100644
index 0000000000..8356b77b4c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/MarkupTagHelperDirectiveAttributeSyntax.cs
@@ -0,0 +1,46 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupTagHelperDirectiveAttributeSyntax
+    {
+        private static readonly string TagHelperAttributeInfoKey = typeof(TagHelperAttributeInfo).Name;
+
+        public TagHelperAttributeInfo TagHelperAttributeInfo
+        {
+            get
+            {
+                var tagHelperAttributeInfo = this.GetAnnotationValue(TagHelperAttributeInfoKey) as TagHelperAttributeInfo;
+                return tagHelperAttributeInfo;
+            }
+        }
+
+        public string FullName
+        {
+            get
+            {
+                var fullName = string.Concat(
+                    Transition.GetContent(),
+                    Name.GetContent(),
+                    Colon?.GetContent() ?? string.Empty,
+                    ParameterName?.GetContent() ?? string.Empty);
+                return fullName;
+            }
+        }
+
+        public MarkupTagHelperDirectiveAttributeSyntax WithTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperAttributeInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupTagHelperDirectiveAttributeSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
index bca21d77db..8c4b01c5e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/Syntax.xml
@@ -205,6 +205,29 @@
     <Kind Name="MarkupTagHelperAttributeValue" />
     <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
   </Node>
+  <Node Name="MarkupTagHelperDirectiveAttributeSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTagHelperDirectiveAttribute" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Transition" Type="RazorMetaCodeSyntax" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+    <Field Name="Colon" Type="RazorMetaCodeSyntax" Optional="true" />
+    <Field Name="ParameterName" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="NameSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="EqualsToken" Type="SyntaxToken">
+      <Kind Name="Equals" />
+    </Field>
+    <Field Name="ValuePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="MarkupTagHelperAttributeValueSyntax" />
+    <Field Name="ValueSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupMinimizedTagHelperDirectiveAttributeSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupMinimizedTagHelperDirectiveAttribute" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Transition" Type="RazorMetaCodeSyntax" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+    <Field Name="Colon" Type="RazorMetaCodeSyntax" Optional="true" />
+    <Field Name="ParameterName" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
   
   <!-- CSharp -->
   <AbstractNode Name="CSharpSyntaxNode" Base="RazorSyntaxNode" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
index 66be02fdfa..ad30718d5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxKind.cs
@@ -35,6 +35,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         MarkupTagHelperEndTag,
         MarkupTagHelperAttribute,
         MarkupMinimizedTagHelperAttribute,
+        MarkupTagHelperDirectiveAttribute,
+        MarkupMinimizedTagHelperDirectiveAttribute,
         MarkupTagHelperAttributeValue,
 
         // CSharp
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs
index a3f15f1708..10da7536b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperAttributeInfo.cs
@@ -7,18 +7,26 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         public TagHelperAttributeInfo(
             string name,
+            string parameterName,
             AttributeStructure attributeStructure,
-            bool bound)
+            bool bound,
+            bool isDirectiveAttribute)
         {
             Name = name;
+            ParameterName = parameterName;
             AttributeStructure = attributeStructure;
             Bound = bound;
+            IsDirectiveAttribute = isDirectiveAttribute;
         }
 
         public string Name { get; }
 
+        public string ParameterName { get; }
+
         public AttributeStructure AttributeStructure { get; }
 
         public bool Bound { get; }
+
+        public bool IsDirectiveAttribute { get; }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
index 374d5a25c5..486f821dbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
@@ -32,7 +32,7 @@ namespace Test
 
             // Act
             var result = CompileToCSharp(@"
-<div bind-value=""@ParentValue"" />
+<div @bind-value=""@ParentValue"" />
 @functions {
     public string ParentValue { get; set; } = ""hi"";
 }");
@@ -41,7 +41,7 @@ namespace Test
             var diagnostic = Assert.Single(result.Diagnostics);
             Assert.Equal("RZ9989", diagnostic.Id);
             Assert.Equal(
-                "The attribute 'bind-value' was matched by multiple bind attributes. Duplicates:" + Environment.NewLine +
+                "The attribute '@bind-value' was matched by multiple bind attributes. Duplicates:" + Environment.NewLine +
                 "Test.BindAttributes" + Environment.NewLine +
                 "Test.BindAttributes",
                 diagnostic.GetMessage());
@@ -52,7 +52,7 @@ namespace Test
         {
             // Arrange & Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind-first-second-third=""Text"" />
+<input type=""text"" @bind-first-second-third=""Text"" />
 @functions {
     public string Text { get; set; } = ""text"";
 }");
@@ -67,7 +67,7 @@ namespace Test
         {
             // Arrange & Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind-first-=""Text"" />
+<input type=""text"" @bind-first-=""Text"" />
 @functions {
     public string Text { get; set; } = ""text"";
 }");
@@ -83,7 +83,7 @@ namespace Test
             // We're looking for VS crash issues. Meaning if the parser returns
             // diagnostics we don't want to throw.
             var generated = CompileToCSharp(@"
-<input type=""text"" bind=""@page"" />
+<input type=""text"" @bind=""@page"" />
 @functions {
     public string page { get; set; } = ""text"";
 }", throwOnFailure: false);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 09ba658797..32fa3ccaf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -424,7 +424,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -469,7 +469,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<InputText bind-Value=""person.Name"" />
+<InputText @bind-Value=""person.Name"" />
 
 @functions 
 {
@@ -504,7 +504,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public string ParentValue { get; set; } = ""42"";
 }");
@@ -543,7 +543,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -576,7 +576,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public string ParentValue { get; set; } = ""42"";
 }");
@@ -613,7 +613,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -645,7 +645,7 @@ namespace Test
 }"));
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" bind-Value:event=""OnChanged"" />
+<MyComponent @bind-Value=""ParentValue"" @bind-Value:event=""OnChanged"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -675,7 +675,7 @@ namespace Test
 }"));
 
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" bind-Value:event=""OnChanged"" />
+<MyComponent @bind-Value=""ParentValue"" @bind-Value:event=""OnChanged"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -712,7 +712,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -749,7 +749,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -786,7 +786,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Value=""ParentValue"" />
+<MyComponent @bind-Value=""ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -825,7 +825,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-SomeParam=""ParentValue"" />
+<MyComponent @bind-SomeParam=""ParentValue"" />
 @code {
     public DateTime ParentValue { get; set; } = DateTime.Now;
 }");
@@ -862,7 +862,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-SomeParam=""ParentValue"" />
+<MyComponent @bind-SomeParam=""ParentValue"" />
 @code {
     public DateTime ParentValue { get; set; } = DateTime.Now;
 }");
@@ -891,7 +891,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<div bind=""@ParentValue"" />
+<div @bind=""@ParentValue"" />
 @code {
     public string ParentValue { get; set; } = ""hi"";
 }");
@@ -919,7 +919,7 @@ namespace Test
 }"));
             // Act
             var generated = CompileToCSharp(@"
-<div bind-value=""ParentValue"" />
+<div @bind-value=""ParentValue"" />
 @code {
     public string ParentValue { get; set; } = ""hi"";
 }");
@@ -947,7 +947,7 @@ namespace Test
 }"));
             // Act
             var generated = CompileToCSharp(@"
-<div bind-value=""@ParentValue"" />
+<div @bind-value=""@ParentValue"" />
 @code {
     public string ParentValue { get; set; } = ""hi"";
 }");
@@ -965,7 +965,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input bind=""@ParentValue"" />
+<input @bind=""@ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -983,7 +983,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind=""@CurrentDate"" bind:format=""MM/dd/yyyy""/>
+<input type=""text"" @bind=""@CurrentDate"" @bind:format=""MM/dd/yyyy""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
@@ -1001,7 +1001,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind=""@CurrentDate"" bind:format=""@Format""/>
+<input type=""text"" @bind=""@CurrentDate"" @bind:format=""@Format""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
@@ -1021,7 +1021,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind=""@ParentValue"" />
+<input type=""text"" @bind=""@ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -1039,7 +1039,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""checkbox"" bind=""@Enabled"" />
+<input type=""checkbox"" @bind=""@Enabled"" />
 @code {
     public bool Enabled { get; set; }
 }");
@@ -1057,7 +1057,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind-value=""@ParentValue"" bind-value:event=""onchange"" />
+<input type=""text"" @bind-value=""@ParentValue"" @bind-value:event=""onchange"" />
 @code {
     public int ParentValue { get; set; } = 42;
 }");
@@ -1075,7 +1075,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input type=""text"" bind-value=""@CurrentDate"" bind-value:event=""onchange"" bind-value:format=""MM/dd"" />
+<input type=""text"" @bind-value=""@CurrentDate"" @bind-value:event=""onchange"" @bind-value:format=""MM/dd"" />
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
@@ -2118,7 +2118,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<DynamicElement onclick=""@OnClick"" />
+<DynamicElement @onclick=""@OnClick"" />
 
 @code {
     private Action<UIMouseEventArgs> OnClick { get; set; }
@@ -2172,7 +2172,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""foo"" />");
+<input @onclick=""foo"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2187,7 +2187,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@(() => { })"" />");
+<input @onclick=""@(() => { })"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2202,7 +2202,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@(x => { })"" />");
+<input @onclick=""@(x => { })"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2217,7 +2217,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@OnClick"" />
+<input @onclick=""@OnClick"" />
 @code {
     void OnClick() {
     }
@@ -2236,7 +2236,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@OnClick"" />
+<input @onclick=""@OnClick"" />
 @code {
     void OnClick(UIMouseEventArgs e) {
     }
@@ -2255,7 +2255,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@OnClick"" />
+<input @onclick=""@OnClick"" />
 @code {
     void OnClick(UIEventArgs e) {
     }
@@ -2275,7 +2275,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
-<input onclick=""@OnClick"" />
+<input @onclick=""@OnClick"" />
 @code {
     Task OnClick() 
     {
@@ -2297,7 +2297,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
-<input onclick=""@OnClick"" />
+<input @onclick=""@OnClick"" />
 @code {
     Task OnClick(UIMouseEventArgs e) 
     {
@@ -2319,7 +2319,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
-<input onclick=""@(async () => await Task.Delay(10))"" />
+<input @onclick=""@(async () => await Task.Delay(10))"" />
 ");
 
             // Assert
@@ -2336,7 +2336,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
-<input onclick=""@(async (e) => await Task.Delay(10))"" />
+<input @onclick=""@(async (e) => await Task.Delay(10))"" />
 ");
 
             // Assert
@@ -2352,7 +2352,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@(x => { })"" />");
+<input @onclick=""@(x => { })"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2367,7 +2367,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input onclick=""@OnClick"" />
+<input @onclick=""@OnClick"" />
 @code {
     void OnClick(UIMouseEventArgs e) {
     }
@@ -2538,7 +2538,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent TItem=string bind-Item=Value/>
+<MyComponent TItem=string @bind-Item=Value/>
 @code {
     string Value;
 }");
@@ -2572,8 +2572,8 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Item=Value/>
-<MyComponent bind-Item=Value/>
+<MyComponent @bind-Item=Value/>
+<MyComponent @bind-Item=Value/>
 @code {
     string Value;
 }");
@@ -2602,7 +2602,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent TItem=string bind-Item=Value/>
+<MyComponent TItem=string @bind-Item=Value/>
 @code {
     string Value;
 }");
@@ -2632,7 +2632,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Item=Value Value=@(18)/>
+<MyComponent @bind-Item=Value Value=@(18)/>
 @code {
     string Value;
 }");
@@ -2867,7 +2867,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent TItem=int Item=""3"" key=""_someKey"" />
+<MyComponent TItem=int Item=""3"" @key=""_someKey"" />
 
 @code {
     private object _someKey = new object();
@@ -2898,7 +2898,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent Item=""3"" key=""_someKey"" />
+<MyComponent Item=""3"" @key=""_someKey"" />
 
 @code {
     private object _someKey = new object();
@@ -2929,7 +2929,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent TItem=int Item=""3"" ref=""_my"" />
+<MyComponent TItem=int Item=""3"" @ref=""_my"" />
 
 @code {
     private MyComponent<int> _my;
@@ -2961,7 +2961,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent Item=""3"" ref=""_my"" />
+<MyComponent Item=""3"" @ref=""_my"" />
 
 @code {
     private MyComponent<int> _my;
@@ -3025,7 +3025,7 @@ namespace Test.Shared
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<elem attributebefore=""before"" key=""someObject"" attributeafter=""after"">Hello</elem>
+<elem attributebefore=""before"" @key=""someObject"" attributeafter=""after"">Hello</elem>
 
 @code {
     private object someObject = new object();
@@ -3043,7 +3043,7 @@ namespace Test.Shared
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<input type=""text"" data-slider-min=""@Min"" key=""@someObject"" />
+<input type=""text"" data-slider-min=""@Min"" @key=""@someObject"" />
 
 @code {
         private object someObject = new object();
@@ -3075,7 +3075,7 @@ namespace Test
 
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<MyComponent ParamBefore=""before"" key=""someDate.Day"" ParamAfter=""after"" />
+<MyComponent ParamBefore=""before"" @key=""someDate.Day"" ParamAfter=""after"" />
 
 @code {
     private DateTime someDate = DateTime.Now;
@@ -3105,7 +3105,7 @@ namespace Test
 
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<MyComponent key=""123 + 456"" SomeProp=""val"">
+<MyComponent @key=""123 + 456"" SomeProp=""val"">
     Some <el>further</el> content
 </MyComponent>
 ");
@@ -3125,7 +3125,7 @@ namespace Test
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<elem attributebefore=""before"" ref=""myElem"" attributeafter=""after"">Hello</elem>
+<elem attributebefore=""before"" @ref=""myElem"" attributeafter=""after"">Hello</elem>
 
 @code {
     private Microsoft.AspNetCore.Components.ElementRef myElem;
@@ -3144,7 +3144,7 @@ namespace Test
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<input type=""text"" data-slider-min=""@Min"" ref=""@_element"" />
+<input type=""text"" data-slider-min=""@Min"" @ref=""@_element"" />
 
 @code {
         private ElementRef _element;
@@ -3177,7 +3177,7 @@ namespace Test
 
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<MyComponent ParamBefore=""before"" ref=""myInstance"" ParamAfter=""after"" />
+<MyComponent ParamBefore=""before"" @ref=""myInstance"" ParamAfter=""after"" />
 
 @code {
     private Test.MyComponent myInstance;
@@ -3208,7 +3208,7 @@ namespace Test
 
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<MyComponent ref=""myInstance"" SomeProp=""val"">
+<MyComponent @ref=""myInstance"" SomeProp=""val"">
     Some <el>further</el> content
 </MyComponent>
 
@@ -3816,8 +3816,6 @@ namespace New.Test
             Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttribute.Id, diagnostic.Id);
         }
 
-        // Right now this is almost indistinguishable from the previous case, but when we add the @ for directive attributes
-        // it won't be. This is a placeholder to be updated when that change goes in.
         [Fact]
         public void DuplicateMarkupAttributes_IsAnError_EventHandler()
         {
@@ -3826,7 +3824,7 @@ namespace New.Test
             // Act
             var generated = CompileToCSharp(@"
 <div>
-  <a onclick=""test()"" onclick=""@(() => {})"">Learn the ten cool tricks your compiler author will hate!</a>
+  <a @onclick=""test()"" onclick=""@(() => {})"">Learn the ten cool tricks your compiler author will hate!</a>
 </div>");
 
             // Assert
@@ -3866,7 +3864,7 @@ namespace New.Test
             // Act
             var generated = CompileToCSharp(@"
 <div>
-  <input type=""text"" value=""17"" bind=""@text""></input>
+  <input type=""text"" value=""17"" @bind=""@text""></input>
 </div>
 @functions {
     private string text = ""hi"";
@@ -3890,7 +3888,7 @@ namespace New.Test
             // Act
             var generated = CompileToCSharp(@"
 <div>
-  <input type=""text"" bind-value=""@text"" bind-value:event=""oninput"" oninput=""@(() => {})""></input>
+  <input type=""text"" @bind-value=""@text"" @bind-value:event=""oninput"" @oninput=""@(() => {})""></input>
 </div>
 @functions {
     private string text = ""hi"";
@@ -4015,7 +4013,7 @@ namespace Test
 "));
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent Message=""@message"" bind-Message=""@message"" />
+<MyComponent Message=""@message"" @bind-Message=""@message"" />
 @functions {
     string message = ""hi"";
 }
@@ -4050,7 +4048,7 @@ namespace Test
 "));
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent MessageChanged=""@((s) => {})"" bind-Message=""@message"" />
+<MyComponent MessageChanged=""@((s) => {})"" @bind-Message=""@message"" />
 @functions {
     string message = ""hi"";
 }
@@ -4085,7 +4083,7 @@ namespace Test
 "));
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent bind-Message=""@message"" MessageExpression=""@((s) => {})"" />
+<MyComponent @bind-Message=""@message"" MessageExpression=""@((s) => {})"" />
 @functions {
     string message = ""hi"";
 }
@@ -4136,7 +4134,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<Counter bind-v=""y"" />
+<Counter @bind-v=""y"" />
 @code {
     string y = null;
 }
@@ -4170,7 +4168,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<User bind-Name=""@UserName"" bind-IsActive=""@UserIsActive"" />
+<User @bind-Name=""@UserName"" @bind-IsActive=""@UserIsActive"" />
 
 @code {
     public string UserName { get; set; }
@@ -4262,7 +4260,7 @@ Welcome to your new app.
 
             // Act
             var generated = CompileToCSharp(@"
-<p onmouseover=""@OnComponentHover"" style=""background: @ParentBgColor;"" />
+<p @onmouseover=""@OnComponentHover"" style=""background: @ParentBgColor;"" />
 @code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
@@ -4283,7 +4281,7 @@ Welcome to your new app.
         {
             // Act
             var generated = CompileToCSharp(@"
-<input onfocus='alert(""Test"");' />
+<input @onfocus='alert(""Test"");' />
 ");
 
             // Assert
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
index b919eef4f7..5706173abc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
@@ -248,5 +248,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseDocumentTest("@{<span data-foo=@foo ></span>}");
         }
+
+        [Fact]
+        public void ComponentFileKind_ParsesDirectiveAttributesAsMarkup()
+        {
+            ParseDocumentTest("<span @class='@foo'></span>", fileKind: FileKinds.Component);
+        }
+
+        [Fact]
+        public void ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup()
+        {
+            ParseDocumentTest("<span @class:param='@foo'></span>", fileKind: FileKinds.Component);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
index 82b69cddbc..25ad072bc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -2153,6 +2154,94 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             EvaluateData(descriptors, document, featureFlags: featureFlags);
         }
 
+        [Fact]
+        public void Rewrites_ComponentDirectiveAttributes()
+        {
+            // Arrange
+            var document = @"<input @bind-value=""Message"" @bind-value:event=""onchange"" />";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName)
+                    .AddMetadata(ComponentMetadata.SpecialKindKey, ComponentMetadata.Bind.TagHelperKind)
+                    .AddMetadata(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString)
+                    .AddMetadata(TagHelperMetadata.Runtime.Name, ComponentMetadata.Bind.RuntimeName)
+                    .TypeName("Microsoft.AspNetCore.Components.Bind")
+                    .AddMetadata(ComponentMetadata.Bind.FallbackKey, bool.TrueString)
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                            .RequireTagName("*")
+                            .RequireAttributeDescriptor(r =>
+                            {
+                                r.Name = "@bind-";
+                                r.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+                                r.Metadata.Add(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString);
+                            }))
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                        .Name("@bind-...")
+                        .PropertyName("Bind")
+                        .AsDictionaryAttribute("@bind-", typeof(object).FullName)
+                        .TypeName("System.Collections.Generic.Dictionary<string, object>")
+                        .AddMetadata(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString)
+                        .BindAttributeParameter(p =>
+                        {
+                            p.Name = "event";
+                            p.TypeName = typeof(string).FullName;
+                            p.SetPropertyName("Event");
+                        }))
+                    .Build(),
+            };
+
+            var featureFlags = new TestRazorParserFeatureFlags(allowCSharpInMarkupAttributeArea: false);
+
+            // Act & Assert
+            EvaluateData(descriptors, document, featureFlags: featureFlags);
+        }
+
+        [Fact]
+        public void Rewrites_MinimizedComponentDirectiveAttributes()
+        {
+            // Arrange
+            var document = @"<input @bind-foo @bind-foo:param />";
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName)
+                    .AddMetadata(ComponentMetadata.SpecialKindKey, ComponentMetadata.Bind.TagHelperKind)
+                    .AddMetadata(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString)
+                    .AddMetadata(TagHelperMetadata.Runtime.Name, ComponentMetadata.Bind.RuntimeName)
+                    .TypeName("Microsoft.AspNetCore.Components.Bind")
+                    .AddMetadata(ComponentMetadata.Bind.FallbackKey, bool.TrueString)
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule
+                            .RequireTagName("*")
+                            .RequireAttributeDescriptor(r =>
+                            {
+                                r.Name = "@bind-";
+                                r.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+                                r.Metadata.Add(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString);
+                            }))
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                        .Name("@bind-...")
+                        .PropertyName("Bind")
+                        .AsDictionaryAttribute("@bind-", typeof(object).FullName)
+                        .TypeName("System.Collections.Generic.Dictionary<string, object>")
+                        .AddMetadata(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString)
+                        .BindAttributeParameter(p =>
+                        {
+                            p.Name = "param";
+                            p.TypeName = typeof(string).FullName;
+                            p.SetPropertyName("Param");
+                        }))
+                    .Build(),
+            };
+
+            var featureFlags = new TestRazorParserFeatureFlags(allowCSharpInMarkupAttributeArea: false);
+
+            // Act & Assert
+            EvaluateData(descriptors, document, featureFlags: featureFlags);
+        }
+
         private class TestRazorParserFeatureFlags : RazorParserFeatureFlags
         {
             public TestRazorParserFeatureFlags(
@@ -2161,7 +2250,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 bool allowComponentFileKind = false,
                 bool allowRazorInCodeBlockDirectives = false,
                 bool allowUsingVariableDeclarations = false,
-                bool allowConditionalDataDashAttributesInComponents = false)
+                bool allowConditionalDataDashAttributesInComponents = false,
+                bool allowCSharpInMarkupAttributeArea = true)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelper;
@@ -2169,6 +2259,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 AllowRazorInAllCodeBlocks = allowRazorInCodeBlockDirectives;
                 AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
                 AllowConditionalDataDashAttributes = allowConditionalDataDashAttributesInComponents;
+                AllowCSharpInMarkupAttributeArea = allowCSharpInMarkupAttributeArea;
             }
 
             public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -2182,6 +2273,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             public override bool AllowUsingVariableDeclarations { get; }
 
             public override bool AllowConditionalDataDashAttributes { get; }
+
+            public override bool AllowCSharpInMarkupAttributeArea { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index af8a3beb9d..59f1c81b71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  async (e) => await Task.Delay(10)
+                   async (e) => await Task.Delay(10)
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 63fa8d1ba6..544e34faff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -16,11 +16,11 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
+                            IntermediateToken - (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (88:1,57 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (88:1,57 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index c5f558697a..966d8c5d27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -3,8 +3,8 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1114:31,18 [33] )
+Generated Location: (1115:31,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 4373ee345a..aa32ffa3b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index dc57096a4d..04ca37df2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -16,13 +16,13 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index b1c23219e4..e4365527cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -3,19 +3,19 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1113:31,17 [7] )
+Generated Location: (1114:31,18 [7] )
 |OnClick|
 
-Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1314:41,7 [91] )
+Generated Location: (1315:41,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 689daabc69..58d49aabc2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  async () => await Task.Delay(10)
+                   async () => await Task.Delay(10)
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index 48dce9fc63..f5666d5321 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -16,11 +16,11 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
+                            IntermediateToken - (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (86:1,55 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (86:1,55 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index 8fb2db7b1e..c24ddc28e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -3,8 +3,8 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1114:31,18 [32] )
+Generated Location: (1115:31,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index aa6e62e133..1785060288 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 5fab4ce25a..2d0729fedc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -16,13 +16,13 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 43e8394eab..5bcd56774a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -3,19 +3,19 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1113:31,17 [7] )
+Generated Location: (1114:31,18 [7] )
 |OnClick|
 
-Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1314:41,7 [73] )
+Generated Location: (1315:41,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 96ad4ffb32..48a9aac0be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index 2066065fcf..f1c3277f4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 0fdf000ac5..0466456ce0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2033:48,7 [50] )
+Generated Location: (2034:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index a06830b239..14c0e532b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                             ParentValue
+                              ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 4e9fa74cd2..b6804a480f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -14,22 +14,22 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+                HtmlContent - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 077b0c0680..ba675b0d4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1018:25,29 [11] )
+Generated Location: (1019:25,30 [11] )
 |ParentValue|
 
-Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1606:43,7 [65] )
+Generated Location: (1607:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index a6f189ff49..932e5947f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 294e192e04..b5714b59f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index faaaa9256e..08a93bce54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1874:47,7 [50] )
+Generated Location: (1875:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index f3357a0b84..310193d77e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 3d087d94cc..09ffa521c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 1d7e5aa349..873fe767a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1874:47,7 [55] )
+Generated Location: (1875:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 3867a27f26..56b9859e1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index eff3bf473e..ffc3061c93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 1fad0343a1..9bdaa2dd2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1617:47,7 [50] )
+Generated Location: (1618:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 84daca5cb7..a566b81ae8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 226ba4ea8e..89b2535b24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 0f77b3a689..4a2a67a893 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (941:25,25 [11] )
+Generated Location: (942:25,26 [11] )
 |ParentValue|
 
-Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1585:46,7 [50] )
+Generated Location: (1586:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index cdf966ed88..e311953374 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index c6fa2318d0..c0f022b144 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index f224cb9acd..924842fe6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1776:48,7 [50] )
+Generated Location: (1777:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 3c39f5d5be..d61796bfb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                             ParentValue
+                              ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 4bd24821f7..07954f6de8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -14,22 +14,22 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+                HtmlContent - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 9faf66a20a..3908cd852f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1018:25,29 [11] )
+Generated Location: (1019:25,30 [11] )
 |ParentValue|
 
-Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1449:43,7 [65] )
+Generated Location: (1450:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 3867a27f26..56b9859e1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index acfd4c8c2a..2d0ae0e2af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index fea0b0a3ca..66df946089 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1617:47,7 [50] )
+Generated Location: (1618:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 84daca5cb7..a566b81ae8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 342194d7a1..66adb1ebe8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 0031d34cbd..e6648b14bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (941:25,25 [11] )
+Generated Location: (942:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1585:46,7 [50] )
+Generated Location: (1586:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index c99c8ffd99..5f4ccb8193 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index cf93b36769..af8a73c6a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 6623f23561..da594880db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1012:25,25 [11] )
+Generated Location: (1013:25,26 [11] )
 |ParentValue|
 
-Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1617:47,7 [55] )
+Generated Location: (1618:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 27f13189ec..49852e1c94 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       person.Name
+                        person.Name
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 524433227f..2b142f55e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
-                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                            IntermediateToken - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
-                HtmlContent - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
+                HtmlContent - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index d3243cd759..d4ad38aafb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1011:25,23 [11] )
+Generated Location: (1012:25,24 [11] )
 |person.Name|
 
-Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1609:47,1 [37] )
+Generated Location: (1610:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index eaf0a8aae8..b68c854b33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                CurrentDate
+                                 CurrentDate
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index 92b02ddb5a..cc9aa84e98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -14,21 +14,21 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [101] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
-                HtmlContent - (101:0,101 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (101:0,101 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+                HtmlContent - (104:0,104 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (104:0,104 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index f70077ef5c..5592e65875 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (948:25,32 [11] )
+Generated Location: (949:25,33 [11] )
 |CurrentDate|
 
-Source Location: (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1311:36,7 [77] )
+Generated Location: (1312:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 4b3ecf0e64..2737e15abb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                ParentValue
+                                 ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 9b37bd5daf..0b08cb59a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (75:0,75 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (75:0,75 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index daf85f2ae3..d92bef9aad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (948:25,32 [11] )
+Generated Location: (949:25,33 [11] )
 |ParentValue|
 
-Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1293:36,7 [50] )
+Generated Location: (1294:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index cc42c20393..5d14fcab61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  ParentValue
+                   ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index 6f856b28ef..b60a70bf5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+                HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 4e98c7071a..c0af8cf16d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (934:25,18 [11] )
+Generated Location: (935:25,19 [11] )
 |ParentValue|
 
-Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1279:36,7 [55] )
+Generated Location: (1280:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 49dca9c636..cc42c20393 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 ParentValue
+                  ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 0d541e1fee..c19a2c62d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                    HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (32:0,32 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (32:0,32 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+                HtmlContent - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 3b643e8d77..4e98c7071a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (933:25,17 [11] )
+Generated Location: (934:25,18 [11] )
 |ParentValue|
 
-Source Location: (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1278:36,7 [55] )
+Generated Location: (1279:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index b35b8910b9..b46dbe810a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            ParentValue
+             ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index 5d7c1694b1..862f55c1d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                    HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 0e1dfed8d9..56d4bb435c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (928:25,12 [11] )
+Generated Location: (929:25,13 [11] )
 |ParentValue|
 
-Source Location: (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1273:36,7 [55] )
+Generated Location: (1274:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 97963e1069..cb7b7debdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                              Enabled
+                               Enabled
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index bd3f53c385..c5177aa505 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
-                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
+                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
+                            IntermediateToken - (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
-                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 92bcd2a776..e24c153627 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (946:25,30 [7] )
+Generated Location: (947:25,31 [7] )
 |Enabled|
 
-Source Location: (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1279:36,7 [41] )
+Generated Location: (1280:36,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 819736dad7..bbc94f3b68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          CurrentDate
+                           CurrentDate
 
 #line default
 #line hidden
@@ -31,7 +31,7 @@ namespace Test
             , 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                     Format
+                                                       Format
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index 84d1fc6bb0..a6b4261bce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -14,21 +14,21 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
-                            IntermediateToken - (53:0,53 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
+                            IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
-                HtmlContent - (62:0,62 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (62:0,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
+                HtmlContent - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 8fa58f7f1f..37bec86a5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
-Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (942:25,26 [11] )
+Generated Location: (943:25,27 [11] )
 |CurrentDate|
 
-Source Location: (53:0,53 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1144:33,53 [6] )
+Generated Location: (1147:33,55 [6] )
 |Format|
 
-Source Location: (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1492:44,7 [135] )
+Generated Location: (1495:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index cee9422fe4..67dfa5f842 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          CurrentDate
+                           CurrentDate
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index d4468c828e..fa21098b04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -14,21 +14,21 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [65] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
-                HtmlContent - (65:0,65 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (65:0,65 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+                HtmlContent - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 4956ac6159..e6b84d4e1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (942:25,26 [11] )
+Generated Location: (943:25,27 [11] )
 |CurrentDate|
 
-Source Location: (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1315:36,7 [77] )
+Generated Location: (1316:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 0749e043ff..0279733c99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          ParentValue
+                           ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index 66b904e0f6..f36a74248a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index fbd25c513a..adbb250ced 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (942:25,26 [11] )
+Generated Location: (943:25,27 [11] )
 |ParentValue|
 
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1287:36,7 [50] )
+Generated Location: (1288:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 8fcbe07e1c..8fa1fcd4fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-              ParentValue
+               ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index a9e7aa6d1a..39250f4abb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+                HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 3a348e5162..dd1de53b35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (930:25,14 [11] )
+Generated Location: (931:25,15 [11] )
 |ParentValue|
 
-Source Location: (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1275:36,7 [50] )
+Generated Location: (1276:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index a9dc1f50a7..8cc3c4a891 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    Value
+                                     Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 7f13867d70..9117695d7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -14,18 +14,18 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-                HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 5273e8b562..442c3deeb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -3,16 +3,16 @@ Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (889:25,19 [6] )
 |string|
 
-Source Location: (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1207:34,36 [5] )
+Generated Location: (1208:34,37 [5] )
 |Value|
 
-Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1796:56,7 [21] )
+Generated Location: (1797:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 6e03826954..71ba78116a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    Value
+                                     Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 710c3f96d4..9025f2bb74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -14,18 +14,18 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
-                HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 5a8c83cecf..edd0c76b17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -3,16 +3,16 @@ Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (889:25,19 [6] )
 |string|
 
-Source Location: (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1142:34,36 [5] )
+Generated Location: (1143:34,37 [5] )
 |Value|
 
-Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1770:55,7 [21] )
+Generated Location: (1771:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 1b3f9a7f88..f20ff8b076 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     18
+                                      18
 
 #line default
 #line hidden
@@ -31,7 +31,7 @@ namespace Test
             , -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       Value
+                        Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 54b8422f6d..82a0c60c40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -14,22 +14,22 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
-                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+                HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 1657e03dbb..7631f9bc1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (973:25,37 [2] )
+Generated Location: (974:25,38 [2] )
 |18|
 
-Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1193:33,23 [5] )
+Generated Location: (1195:33,24 [5] )
 |Value|
 
-Source Location: (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1656:50,7 [21] )
+Generated Location: (1658:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index d852967c80..d60000b73d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       Value
+                        Value
 
 #line default
 #line hidden
@@ -40,7 +40,7 @@ __o = typeof(MyComponent<>);
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       Value
+                        Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 43136b9b58..eb98580da1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -14,30 +14,30 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-                HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                Component - (32:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-                HtmlContent - (62:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (62:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+                HtmlContent - (64:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (64:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 6619288315..eb3bdbdaff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1012:25,23 [5] )
+Generated Location: (1013:25,24 [5] )
 |Value|
 
-Source Location: (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1521:42,23 [5] )
+Generated Location: (1523:42,24 [5] )
 |Value|
 
-Source Location: (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1917:60,7 [21] )
+Generated Location: (1919:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 1fd65b306f..a6a44224c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          OnClick
+                           OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index d5afb9c0dd..942be4edad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (25:0,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (26:0,26 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (27:0,27 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+                HtmlContent - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index df73069bc0..1024f46464 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (27:0,27 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1006:25,26 [7] )
+Generated Location: (1007:25,27 [7] )
 |OnClick|
 
-Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1509:45,7 [62] )
+Generated Location: (1510:45,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index b94503cbc1..593a4e2311 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                       someDate.Day
+                                        someDate.Day
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index f99e09eeab..8061dce1d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -14,17 +14,17 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    SetKey - (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
+                    SetKey - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
-                        HtmlContent - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-                HtmlContent - (74:0,74 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (74:0,74 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (135:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (135:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
+                        HtmlContent - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (75:0,75 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (75:0,75 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (136:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (136:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index c1e34d8309..3fb619e82b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1108:30,39 [12] )
+Generated Location: (1109:30,40 [12] )
 |someDate.Day|
 
-Source Location: (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1462:47,7 [49] )
+Generated Location: (1463:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 014af5ca83..c0567c3ce5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  123 + 456
+                   123 + 456
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index 7540550b11..13312be860 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -14,18 +14,18 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
-                        MarkupElement - (55:1,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el
-                            HtmlContent - (59:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                                IntermediateToken - (59:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further
-                        HtmlContent - (71:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (71:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
-                    SetKey - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
+                        HtmlContent - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        MarkupElement - (56:1,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el
+                            HtmlContent - (60:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (60:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further
+                        HtmlContent - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
+                    SetKey - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
-                        HtmlContent - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-                HtmlContent - (95:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (95:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                        HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+                HtmlContent - (96:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (96:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index e508dba546..642daabd5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1064:29,18 [9] )
+Generated Location: (1065:29,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 87a84ecb4d..598827ce99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ namespace Test
             ));
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                       myInstance = default(Test.MyComponent);
+                                        myInstance = default(Test.MyComponent);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index ee0b18b63b..2e4013600f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -14,17 +14,17 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    ReferenceCapture - (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ReferenceCapture - (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
-                        HtmlContent - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-                HtmlContent - (72:0,72 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (72:0,72 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (188:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (188:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                        HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (189:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (189:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 2ccd73f066..a0e550be07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1079:29,39 [10] )
+Generated Location: (1080:29,40 [10] )
 |myInstance|
 
-Source Location: (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1444:45,7 [104] )
+Generated Location: (1445:45,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index dd57b94294..6befd8f44c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
             ));
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  myInstance = default(Test.MyComponent);
+                   myInstance = default(Test.MyComponent);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 215e15bc45..a2aae2c90d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -14,22 +14,22 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [97] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
-                        MarkupElement - (56:1,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el
-                            HtmlContent - (60:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                                IntermediateToken - (60:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further
-                        HtmlContent - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
-                    ReferenceCapture - (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                        HtmlContent - (46:0,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (46:0,46 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        MarkupElement - (57:1,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el
+                            HtmlContent - (61:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                                IntermediateToken - (61:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further
+                        HtmlContent - (73:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (73:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
+                    ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
-                        HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-                HtmlContent - (96:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (96:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (212:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (212:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                        HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+                HtmlContent - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (213:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (213:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 3f828bcc10..f2715276d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1035:28,18 [10] )
+Generated Location: (1036:28,19 [10] )
 |myInstance|
 
-Source Location: (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1400:44,7 [104] )
+Generated Location: (1401:44,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 906412e12e..cc8558c98c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                               message
+                                                message
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
index 4b0c476087..7013e6d4a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10010: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'Message' is generated by the 'bind-Message' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10010: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'Message' is generated by the '@bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 6f3fd83e49..7b51a53f1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -14,24 +14,24 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (47:0,47 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken - (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
-                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
-                HtmlContent - (58:0,58 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (58:0,58 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (103:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (103:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
+                HtmlContent - (59:0,59 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (59:0,59 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (104:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (104:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index e8219984c8..d4cba761d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -3,16 +3,16 @@ Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (958:25,23 [7] )
 |message|
 
-Source Location: (47:0,47 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1295:34,47 [7] )
+Generated Location: (1296:34,48 [7] )
 |message|
 
-Source Location: (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2310:57,12 [30] )
+Generated Location: (2311:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 3880f38fad..e34f2ea5ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                          message
+                                                           message
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
index 823665c916..59df71b41d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,30): Error RZ10010: The component parameter 'MessageChanged' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageChanged' is generated by the 'bind-Message' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(1,30): Error RZ10010: The component parameter 'MessageChanged' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageChanged' is generated by the '@bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 6022fdbfaa..a73923595e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -14,24 +14,24 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (58:0,58 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken - (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
-                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
-                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (114:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (114:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
+                HtmlContent - (70:0,70 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (70:0,70 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (115:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (115:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 87119a46ef..bb72545bd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -3,16 +3,16 @@ Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1095:25,31 [9] )
 |(s) => {}|
 
-Source Location: (58:0,58 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1446:34,58 [7] )
+Generated Location: (1447:34,59 [7] )
 |message|
 
-Source Location: (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2461:57,12 [30] )
+Generated Location: (2462:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 5410554f92..d4bea213d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                          (s) => {}
+                                                           (s) => {}
 
 #line default
 #line hidden
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                            message
+                             message
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
index 1586878f86..85a260a956 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,57): Error RZ10010: The component parameter 'MessageExpression' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageExpression' is generated by the 'bind-Message' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(1,58): Error RZ10010: The component parameter 'MessageExpression' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageExpression' is generated by the '@bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 13d7481d85..1cefc1292f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -14,24 +14,24 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (56:0,56 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (57:0,57 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (58:0,58 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (58:0,58 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
-                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
-                HtmlContent - (72:0,72 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (72:0,72 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (117:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (117:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
+                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (118:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (118:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index aa37e5ed58..6c92b35afa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (58:0,58 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1044:25,58 [9] )
+Generated Location: (1045:25,59 [9] )
 |(s) => {}|
 
-Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1364:34,28 [7] )
+Generated Location: (1366:34,29 [7] )
 |message|
 
-Source Location: (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2379:57,12 [30] )
+Generated Location: (2381:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 0345b2ac34..b4872cefdb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                              () => {}
+                                                                                 () => {}
 
 #line default
 #line hidden
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                  text
+                                   text
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
index 27f6955b38..ed7f0b9a9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,77): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the 'bind-value' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,80): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the '@bind-value' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 8f716b1294..856c6d91d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -14,31 +14,31 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [115] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    MarkupElement - (9:1,2 [98] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                        HtmlAttribute - (83:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (86:1,79 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
-                                IntermediateToken - (85:1,78 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken - (88:1,81 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                                IntermediateToken - (41:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
-                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (115:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (115:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 631248be06..9b7da4966a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (85:1,78 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (88:1,81 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1059:25,78 [8] )
+Generated Location: (1062:25,81 [8] )
 |() => {}|
 
-Source Location: (41:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1312:34,34 [4] )
+Generated Location: (1316:34,35 [4] )
 |text|
 
-Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1641:45,12 [35] )
+Generated Location: (1645:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index ff40e87e8e..6446930de5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                       text
+                                        text
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
index 3277ed84c6..87b660b463 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the 'bind' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index e78c1493a7..68f39e92e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -14,29 +14,29 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [68] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [51] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                         HtmlAttribute -  - value=" - "
                             HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
-                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                                IntermediateToken - (46:1,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
-                    HtmlContent - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (68:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (68:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (118:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (118:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index d0fd00e6ee..2b13abd3aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (46:1,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (955:25,39 [4] )
+Generated Location: (956:25,40 [4] )
 |text|
 
-Source Location: (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1284:36,12 [35] )
+Generated Location: (1285:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 92dd6b9fa8..617f101873 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -21,13 +21,15 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "test()");
+            __o = 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           __o = () => {};
+                                  () => {}
 
 #line default
 #line hidden
 #nullable disable
+            ;
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
index e1149b3381..aa1716633e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,15): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the 'onclick' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,16): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index ebf1b99d33..dfb2450cac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [120] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [121] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - a
-                        HtmlContent - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
-                        HtmlAttribute - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                    MarkupElement - (9:1,2 [104] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                        HtmlAttribute - (22:1,15 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                                 IntermediateToken -  - CSharp - "test()"
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute -  - onclick=" - "
-                            CSharpExpression - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                                IntermediateToken - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
-                    HtmlContent - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                            CSharpExpressionAttributeValue - (39:1,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (41:1,34 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                    HtmlContent - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index e169bb2a5b..813ddccd4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (41:1,34 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1023:25,33 [8] )
+Generated Location: (1044:26,34 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index e63c6841a1..be1bfc1e2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    someObject
+                                     someObject
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 3c509b3043..6ef5325c98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                MarkupElement - (0:0,0 [84] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
                     HtmlAttribute -  - attributebefore=" - "
                         HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    SetKey - (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+                    SetKey - (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
                     HtmlAttribute -  - attributeafter=" - "
-                        HtmlAttributeValue - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-                HtmlContent - (83:0,83 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (83:0,83 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (144:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (144:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
+                        HtmlAttributeValue - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (84:0,84 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (84:0,84 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (145:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (145:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index 88f0d00c1a..aec8dcc55e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (908:25,36 [10] )
+Generated Location: (909:25,37 [10] )
 |someObject|
 
-Source Location: (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1112:35,7 [49] )
+Generated Location: (1113:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index bb720613b3..63abf53307 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                someObject
+                                                 someObject
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index dc0d9ff81b..8191223541 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -14,17 +14,17 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute -  - data-slider-min=" - "
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
-                    SetKey - (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
-                HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (186:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (186:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
+                    SetKey - (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+                HtmlContent - (63:0,63 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (63:0,63 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (187:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (187:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 223ec0be82..6018e35989 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -3,18 +3,18 @@ Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (900:25,37 [3] )
 |Min|
 
-Source Location: (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (1117:34,48 [10] )
+Generated Location: (1118:34,49 [10] )
 |someObject|
 
-Source Location: (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
     |
-Generated Location: (1321:44,7 [112] )
+Generated Location: (1322:44,7 [112] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 59e26ae7db..c4ecda875b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    myElem = default(Microsoft.AspNetCore.Components.ElementRef);
+                                     myElem = default(Microsoft.AspNetCore.Components.ElementRef);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index ecc56cb57f..d92f17dce9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [79] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
                     HtmlAttribute -  - attributebefore=" - "
                         HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    ReferenceCapture - (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
+                    ReferenceCapture - (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
                     HtmlAttribute -  - attributeafter=" - "
-                        HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-                HtmlContent - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (213:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (213:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
+                        HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (80:0,80 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (80:0,80 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (214:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (214:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 937a6ec433..75a139f95e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (879:24,36 [6] )
+Generated Location: (880:24,37 [6] )
 |myElem|
 
-Source Location: (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1118:33,7 [122] )
+Generated Location: (1119:33,7 [122] )
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index cef470a901..dfe7b20a37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
             ;
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                _element = default(Microsoft.AspNetCore.Components.ElementRef);
+                                                 _element = default(Microsoft.AspNetCore.Components.ElementRef);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 93674cd23a..2f79627e70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -14,17 +14,17 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute -  - data-slider-min=" - "
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
-                    ReferenceCapture - (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
-                HtmlContent - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (233:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (233:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
+                    ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
+                HtmlContent - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (234:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (234:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index c0ce653e42..b9dcf79899 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -3,19 +3,19 @@ Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (900:25,37 [3] )
 |Min|
 
-Source Location: (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1088:33,48 [8] )
+Generated Location: (1089:33,49 [8] )
 |_element|
 
-Source Location: (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1329:42,7 [161] )
+Generated Location: (1330:42,7 [161] )
 |
         private ElementRef _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 940ffea68d..fc7c278400 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -14,11 +14,11 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
+                MarkupElement - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, 
                             IntermediateToken -  - CSharp - "alert(\"Test\");"
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (35:0,35 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index a42a603e25..e1702b78a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index 81f387c69e..cdb4d52a62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 7cf5ff3937..588fca2943 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (998:25,18 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1198:35,7 [44] )
+Generated Location: (1199:35,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 12d154ab22..29f88f5016 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 0406131459..bdba39bc17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index e1f412da5c..2ba283cea5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (998:25,18 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1198:35,7 [49] )
+Generated Location: (1199:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index a860a8013b..6dd2b3847f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  x => { }
+                   x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index e3e2734c00..d2f1bcc92f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -14,9 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 191c479233..7924871b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (998:25,18 [8] )
+Generated Location: (999:25,19 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 12d154ab22..29f88f5016 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 0406131459..bdba39bc17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index e1f412da5c..2ba283cea5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (998:25,18 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1198:35,7 [49] )
+Generated Location: (1199:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index a860a8013b..6dd2b3847f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  x => { }
+                   x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index e3e2734c00..d2f1bcc92f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -14,9 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
index 191c479233..7924871b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (998:25,18 [8] )
+Generated Location: (999:25,19 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 1ba6d3e13b..95eb1c9d08 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index f52918c227..08fe7bb5ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index b914ee847f..82e82d15bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (998:25,18 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1198:35,7 [31] )
+Generated Location: (1199:35,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 76b2b1ee64..3a8ea027c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  () => { }
+                   () => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index 6212008b9a..49b9ddde90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -14,9 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index fe2bf2e2e6..da1c213c30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (998:25,18 [9] )
+Generated Location: (999:25,19 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index d8399f72d7..d66e33fdd2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -14,8 +14,8 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [24] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken -  - CSharp - "foo"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index d39f677c00..dbf2201c83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -43,7 +43,7 @@ namespace Test
             ));
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     _my = default(Test.MyComponent<int>);
+                                      _my = default(Test.MyComponent<int>);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
index 4eb10d3cc8..f634b69431 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -14,15 +14,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ReferenceCapture - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-                HtmlContent - (44:0,44 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (44:0,44 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (146:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (146:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                    ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+                HtmlContent - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (147:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (147:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index 3b28a65192..42acbfee06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -8,17 +8,17 @@ Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1141:34,29 [1] )
 |3|
 
-Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1468:45,37 [3] )
+Generated Location: (1469:45,38 [3] )
 |_my|
 
-Source Location: (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1833:61,7 [90] )
+Generated Location: (1834:61,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index 184ad28e8a..57a7412182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
             , -1, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           _my = __value;
+                            _my = __value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
index 5d862207c9..2d876f125f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ReferenceCapture - (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-                HtmlContent - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (136:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (136:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                    ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (137:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (137:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index 30593196a7..13e34b6bce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -3,17 +3,17 @@ Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (955:25,19 [1] )
 |3|
 
-Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1139:33,27 [3] )
+Generated Location: (1140:33,28 [3] )
 |_my|
 
-Source Location: (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1512:51,7 [90] )
+Generated Location: (1513:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index eec991ebf1..d46aeaee75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     _someKey
+                                      _someKey
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index 1ad79ac195..509efd2240 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -14,15 +14,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    SetKey - (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
-                HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (108:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (108:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+                    SetKey - (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+                HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (109:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (109:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index ebf40d8adc..4857c6f360 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -8,16 +8,16 @@ Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1141:34,29 [1] )
 |3|
 
-Source Location: (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1497:46,37 [8] )
+Generated Location: (1498:46,38 [8] )
 |_someKey|
 
-Source Location: (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1849:63,7 [47] )
+Generated Location: (1850:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 9a8bf595bc..985e2af1d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
             , -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           _someKey
+                            _someKey
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index 4f392ab65d..a834c28a2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    SetKey - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
-                HtmlContent - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (98:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (98:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+                    SetKey - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+                HtmlContent - (40:0,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (40:0,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (99:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (99:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index e349879ef9..c31c87878b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -3,16 +3,16 @@ Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (955:25,19 [1] )
 |3|
 
-Source Location: (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1125:33,27 [8] )
+Generated Location: (1126:33,28 [8] )
 |_someKey|
 
-Source Location: (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1477:50,7 [47] )
+Generated Location: (1478:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 68adb93595..5c310b5786 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 y
+                  y
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index e90a860372..2ee4b6ecdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -14,18 +14,18 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
-                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
+                            IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
-                HtmlContent - (22:0,22 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (22:0,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (56:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
+                HtmlContent - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (57:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (57:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 3e9a2934bc..b3a9e934e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (933:25,17 [1] )
+Generated Location: (934:25,18 [1] )
 |y|
 
-Source Location: (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1543:46,7 [24] )
+Generated Location: (1544:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 088fa93c55..d64ca1fb18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  UserName
+                   UserName
 
 #line default
 #line hidden
@@ -33,7 +33,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                            UserIsActive
+                                              UserIsActive
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 25b2dadbe2..ebeaad5efe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -14,26 +14,26 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User
-                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
+                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName)
-                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
+                            IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
-                HtmlContent - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (60:0,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (160:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (160:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
+                HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 0c0fff94f8..7df83c3172 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
-Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (934:25,18 [8] )
+Generated Location: (935:25,19 [8] )
 |UserName|
 
-Source Location: (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1331:35,44 [12] )
+Generated Location: (1334:35,46 [12] )
 |UserIsActive|
 
-Source Location: (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1971:56,7 [88] )
+Generated Location: (1974:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 71d5915f96..11e53fb4ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnComponentHover
+                  OnComponentHover
 
 #line default
 #line hidden
@@ -32,7 +32,7 @@ namespace Test
             __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                       ParentBgColor
+                                                        ParentBgColor
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 2ba38a6f8e..d28d68fe22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -14,22 +14,22 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                MarkupElement - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (17:0,17 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken - (18:0,18 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute -  - style=" - "
-                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
-                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
-                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                        HtmlAttributeValue - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (54:0,54 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (56:0,56 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+                HtmlContent - (74:0,74 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (74:0,74 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (216:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (216:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index d0728f1374..775a12f2e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (997:25,17 [16] )
+Generated Location: (998:25,18 [16] )
 |OnComponentHover|
 
-Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:0,56 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1226:34,55 [13] )
+Generated Location: (1228:34,56 [13] )
 |ParentBgColor|
 
-Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
@@ -16,7 +16,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1432:44,7 [132] )
+Generated Location: (1434:44,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index ec7f72b1ba..1f5cb7a3ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  async (e) => await Task.Delay(10)
+                   async (e) => await Task.Delay(10)
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index fe060aa5ae..4e09b37aa8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
+                            IntermediateToken - (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 0de58c905e..097486bf7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 69a9eeff22..c040f1222f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 8072d716d9..8c87d4c1b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1159:36,7 [91] )
+Generated Location: (1160:36,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 2077ed7f73..4b4b4ac178 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  async () => await Task.Delay(10)
+                   async () => await Task.Delay(10)
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index 759e56dd28..6bd28357c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
+                            IntermediateToken - (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 344c8f5874..90aec847ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index f3ca73b95b..052679d9f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 5b0eda19dc..936b86db90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1159:36,7 [73] )
+Generated Location: (1160:36,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 273d868ffa..144a855427 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index c8c2c56a6d..c8e69bdb3f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 420e2d58b5..0a65321b47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1649:32,7 [50] )
+Generated Location: (1650:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 9a14ae9a6d..20b7089700 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                             ParentValue
+                              ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index bcdfe9a0be..1178f40ae1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -7,20 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+            CSharpCode - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index b5a974473d..e5d3fe30f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1170:28,7 [65] )
+Generated Location: (1171:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 8fe1c1441d..f9bed79ba5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index f5f15bd6da..566973aec1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 940da5474e..5601a367b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1452:31,7 [50] )
+Generated Location: (1453:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 410b1222da..c7ae787add 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 85465b70d1..177de17395 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+            CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 94a57340c6..df0de2ac9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1452:31,7 [55] )
+Generated Location: (1453:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 4c89e98c42..fbc7d4eaf3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index fa220494f8..1f214ae4f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 6e6cebdcdd..4e03c38083 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1192:31,7 [50] )
+Generated Location: (1193:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 64a178882f..9adf6443df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index f307ef9cba..3373408818 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 2eab550e84..8d4f1883d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (78:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1174:31,7 [50] )
+Generated Location: (1175:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index ca2870a657..d212f1764b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index c856556f0a..fcc4756ef9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 10b3c22d11..74fc387a35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1392:32,7 [50] )
+Generated Location: (1393:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 02085e382a..687b30ac88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                             ParentValue
+                              ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 41bddb2dfe..48c9d6bcb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -7,20 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
-            CSharpCode - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
+            CSharpCode - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime ParentValue { get; set; } = DateTime.Now;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 711ee6031b..51f516e08f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (53:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1013:28,7 [65] )
+Generated Location: (1014:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 0d1acba310..8fd0b6298c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 45d8b12864..ef1bcc6496 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 954aca0db1..0247442246 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1195:31,7 [50] )
+Generated Location: (1196:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 96dbe76fb4..d95032824a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index dc7728e1d4..d660ba4e4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index f18c2582a2..ffcd97a083 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1177:31,7 [50] )
+Generated Location: (1178:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index c60bea398d..fbf18acfac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                         ParentValue
+                          ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index be4d0fa240..53c2a15c2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (25:0,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-            CSharpCode - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
+            CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index abf6fbc5eb..085411eb5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1195:31,7 [55] )
+Generated Location: (1196:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 7389e9ca12..64c79acea3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       person.Name
+                        person.Name
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 06d9f9ff8b..8dd836efbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
-                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
+                            IntermediateToken - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (23:0,23 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
-            CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
+            CSharpCode - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index efa3742449..7a2f766573 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1187:31,1 [37] )
+Generated Location: (1188:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index fd94ca9573..fa3a760b46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                CurrentDate
+                                 CurrentDate
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index ca7067e84f..44c82c4abb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -7,19 +7,19 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [101] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
-            CSharpCode - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 6b18dfcea7..7d30124567 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (110:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1239:32,7 [77] )
+Generated Location: (1240:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 5a71a7aba1..1ba31a95e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                ParentValue
+                                 ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 45b1323b7d..0684c12255 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (31:0,31 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index f88931b97f..60bbaca2c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1221:32,7 [50] )
+Generated Location: (1222:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index db9cbe1a68..2fcfc8f9fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  ParentValue
+                   ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index 9a361a39cf..cce597103c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 4edd804d60..d71852d955 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1152:31,7 [55] )
+Generated Location: (1153:31,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 639024e1db..db9cbe1a68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 ParentValue
+                  ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 7a39525651..0329846680 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                    HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 84a627a667..4edd804d60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (41:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1151:31,7 [55] )
+Generated Location: (1152:31,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index a97c335691..1fe6dd630e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            ParentValue
+             ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index 1c76bbb031..f463197cde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (12:0,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (11:0,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
+                    HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
+            CSharpCode - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 998d07772c..3e5a9e6235 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (36:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1146:31,7 [55] )
+Generated Location: (1147:31,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 3d7b9908fb..c3defa9de2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                              Enabled
+                               Enabled
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 996e143d6e..883260bfcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
-                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
+                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (30:0,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
+                            IntermediateToken - (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (29:0,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
-            CSharpCode - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
+            CSharpCode - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 350157a997..ea2b6c2137 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (50:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1213:32,7 [41] )
+Generated Location: (1214:32,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 1708507077..5fb727d819 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          CurrentDate
+                           CurrentDate
 
 #line default
 #line hidden
@@ -26,7 +26,7 @@ namespace Test
             , 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                     Format
+                                                       Format
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index f17f9d6d5d..d1c2df3858 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -7,19 +7,19 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
-                            IntermediateToken - (53:0,53 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
+                            IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
-            CSharpCode - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
+            CSharpCode - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 2bae793571..849a5ea933 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
-Source Location: (71:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1420:40,7 [135] )
+Generated Location: (1423:40,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 9954da9045..917783f7b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          CurrentDate
+                           CurrentDate
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 06547b365a..c0937539fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -7,19 +7,19 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [65] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
-            CSharpCode - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index da960879b4..7623ccd996 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (74:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1243:32,7 [77] )
+Generated Location: (1244:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 1324378dd3..00f1c1ce5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          ParentValue
+                           ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index 962c2b16f0..9437d0a2ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (25:0,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 07745b86ba..e1177eb18d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1215:32,7 [50] )
+Generated Location: (1216:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 3f82eae8c0..edddc5770f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-              ParentValue
+               ParentValue
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 73a34cc087..2404d027ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (14:0,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (13:0,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
-            CSharpCode - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
+            CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index f3e83a6928..492d9aee72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (38:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1149:31,7 [50] )
+Generated Location: (1150:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index dcd8b5d2f9..bb32b5ee0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    Value
+                                     Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 5464babf8f..4494a51f03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -7,16 +7,16 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 4f9c6e187b..12dc14d8bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1188:31,7 [21] )
+Generated Location: (1189:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index ddbeb749a1..9dfd5475bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    Value
+                                     Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 0fab1c428c..2e46b6b40a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -7,16 +7,16 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
-            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index ca8366015b..970f440df8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1176:31,7 [21] )
+Generated Location: (1177:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 8d028ec52f..7888fa144a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     18
+                                      18
 
 #line default
 #line hidden
@@ -24,7 +24,7 @@ namespace Test
             , 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       Value
+                        Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 52420833a5..ca107c0809 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -7,20 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
-            CSharpCode - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index b010f942d7..eb8aac9840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (51:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1234:36,7 [21] )
+Generated Location: (1236:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 9ff80d8a2d..e69b0dc4ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       Value
+                        Value
 
 #line default
 #line hidden
@@ -26,7 +26,7 @@ namespace Test
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 4, 5, Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       Value
+                        Value
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 0d3dc296f3..be3b802110 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -7,28 +7,28 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-                HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                Component - (32:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
+                            IntermediateToken - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (55:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
-            CSharpCode - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
+            CSharpCode - (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 5f2383089e..935542dba2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (71:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1365:38,7 [21] )
+Generated Location: (1367:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 9557b72ba1..93adc09d68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                          OnClick
+                           OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 3505c7600a..50a6aff9cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (25:0,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (26:0,26 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (27:0,27 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+            CSharpCode - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 3af91c4f40..6da786c37d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1068:30,7 [62] )
+Generated Location: (1069:30,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 555f68fd9f..2837ce7538 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -19,7 +19,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                       someDate.Day
+                                        someDate.Day
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 0fc62a7b62..1d4696f21c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -7,13 +7,13 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    SetKey - (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
+                    SetKey - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
-                        HtmlContent - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
+                        HtmlContent - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private DateTime someDate = DateTime.Now;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 2324498324..3e3319f444 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (39:0,39 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (824:21,39 [12] )
+Generated Location: (825:21,40 [12] )
 |someDate.Day|
 
-Source Location: (85:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1069:32,7 [49] )
+Generated Location: (1070:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 17c3ae4e46..0acf64696b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  123 + 456
+                   123 + 456
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index d5cee0071c..c80ab6a5ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -7,12 +7,12 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (44:0,44 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        HtmlContent - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
                         MarkupBlock -  - <el>further</el> content\n
-                    SetKey - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
+                    SetKey - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
-                        HtmlContent - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (39:0,39 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+                        HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index d41eee6ea6..a3a43cf52d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1029:27,18 [9] )
+Generated Location: (1030:27,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index d9b85ce961..16a293d155 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -19,7 +19,7 @@ namespace Test
             builder.AddComponentReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                       myInstance = (Test.MyComponent)__value;
+                                        myInstance = (Test.MyComponent)__value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 28b9ab348c..c724647179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -7,13 +7,13 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    ReferenceCapture - (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ReferenceCapture - (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
-                        HtmlContent - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                        HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 997fc133ce..cbf295b3fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (39:0,39 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (863:21,39 [10] )
+Generated Location: (864:21,40 [10] )
 |myInstance|
 
-Source Location: (83:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1150:33,7 [104] )
+Generated Location: (1151:33,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 0c3be4cc7e..dadcb2273d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             builder.AddComponentReferenceCapture(5, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  myInstance = (Test.MyComponent)__value;
+                   myInstance = (Test.MyComponent)__value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 039db8551f..1bc1814490 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [97] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
+                        HtmlContent - (46:0,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (46:0,46 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
                         MarkupBlock -  - <el>further</el> content\n
-                    ReferenceCapture - (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                    ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
-                        HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-            CSharpCode - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                        HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+            CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 48bf90426b..a77e00670e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1068:27,18 [10] )
+Generated Location: (1069:27,19 [10] )
 |myInstance|
 
-Source Location: (107:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1355:39,7 [104] )
+Generated Location: (1356:39,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 2e7578f435..e9febc02e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
             builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                               message
+                                                message
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
index 4b0c476087..7013e6d4a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10010: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'Message' is generated by the 'bind-Message' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(1,23): Error RZ10010: The component parameter 'Message' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'Message' is generated by the '@bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 3eef2491d8..eeec8d2d43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -7,20 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (47:0,47 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken - (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
-                    ComponentAttribute - (46:0,46 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
-            CSharpCode - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
+            CSharpCode - (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 17a28168d6..bd39729386 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (72:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (1962:41,12 [30] )
+Generated Location: (1963:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index d003d6c272..4336048f8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
             builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                          message
+                                                           message
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
index 823665c916..59df71b41d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,30): Error RZ10010: The component parameter 'MessageChanged' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageChanged' is generated by the 'bind-Message' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(1,30): Error RZ10010: The component parameter 'MessageChanged' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageChanged' is generated by the '@bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 6263cb0767..633c59dfbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -7,20 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (58:0,58 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken - (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
-                    ComponentAttribute - (57:0,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
-            CSharpCode - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
+            CSharpCode - (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 0a4efd9127..842e4c91bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (83:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2120:41,12 [30] )
+Generated Location: (2121:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 0e59d9b397..3ae222590d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                          (s) => {}
+                                                           (s) => {}
 
 #line default
 #line hidden
@@ -26,7 +26,7 @@ namespace Test
             builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                            message
+                             message
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
index 1586878f86..85a260a956 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,57): Error RZ10010: The component parameter 'MessageExpression' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageExpression' is generated by the 'bind-Message' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(1,58): Error RZ10010: The component parameter 'MessageExpression' is used two or more times for this component. Parameters must be unique (case-insensitive). The component parameter 'MessageExpression' is generated by the '@bind-Message' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index f8be13be38..2854157d93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -7,20 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (56:0,56 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (57:0,57 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (58:0,58 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (58:0,58 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
+                            IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
-                    ComponentAttribute - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
-            CSharpCode - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
+            CSharpCode - (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string message = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 2ad7965435..47ffb7e9f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (86:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2041:41,12 [30] )
+Generated Location: (2043:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 3e4fd96a12..1936632b30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
             builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                              () => {}
+                                                                                 () => {}
 
 #line default
 #line hidden
@@ -29,7 +29,7 @@ namespace Test
             builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                  text
+                                   text
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
index 27f6955b38..ed7f0b9a9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,77): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the 'bind-value' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,80): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the '@bind-value' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 843e83ea74..bc501039a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -7,27 +7,27 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [115] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    MarkupElement - (9:1,2 [98] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                        HtmlAttribute - (83:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (86:1,79 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
-                                IntermediateToken - (85:1,78 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken - (88:1,81 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                                IntermediateToken - (41:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (40:1,33 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
-                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 2bcebb8c5b..14cd30157b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1781:45,12 [35] )
+Generated Location: (1785:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 7b128cc38b..9b30ff16cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ namespace Test
             builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                       text
+                                        text
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
index 3277ed84c6..87b660b463 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the 'bind' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 5c99860360..8c26680d2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -7,25 +7,25 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [68] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [51] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                         HtmlAttribute -  - value=" - "
                             HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
-                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                                IntermediateToken - (46:1,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (45:1,38 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
-                    HtmlContent - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (60:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 2429a1c991..c93f3fad78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (82:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1448:37,12 [35] )
+Generated Location: (1449:37,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 0e55646fd2..ae1a95bc74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -17,19 +17,18 @@ namespace Test
             builder.AddMarkupContent(1, "\r\n  ");
             builder.OpenElement(2, "a");
             builder.AddAttribute(3, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "test()"));
-            builder.AddContent(4, 
+            builder.AddAttribute(4, "onclick", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                 () => {}
+                                  () => {}
 
 #line default
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(5, "onclick", true);
-            builder.AddContent(6, "Learn the ten cool tricks your compiler author will hate!");
+            builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
             builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
+            builder.AddMarkupContent(6, "\r\n");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
index e1149b3381..aa1716633e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,15): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the 'onclick' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,16): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index 9b44eab2dd..dfdcbb5b62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -7,19 +7,19 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [120] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [121] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - a
-                        HtmlContent - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (51:1,44 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
-                        HtmlAttribute - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                    MarkupElement - (9:1,2 [104] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                        HtmlAttribute - (22:1,15 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                                 IntermediateToken -  - CSharp - "test()"
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute -  - onclick=" - "
-                            CSharpExpression - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                                IntermediateToken - (40:1,33 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
-                    HtmlContent - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (112:1,105 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                            CSharpExpressionAttributeValue - (39:1,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (41:1,34 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                    HtmlContent - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 20d31360cb..59d8e89f38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -19,7 +19,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    someObject
+                                     someObject
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 9a3f8e91a9..9272a58d70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -7,15 +7,15 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (71:0,71 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                MarkupElement - (0:0,0 [84] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
                     HtmlAttribute -  - attributebefore=" - "
                         HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    SetKey - (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+                    SetKey - (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
                     HtmlAttribute -  - attributeafter=" - "
-                        HtmlAttributeValue - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
+                        HtmlAttributeValue - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index 8c0e07e5a8..756d4e1960 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (36:0,36 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (817:21,36 [10] )
+Generated Location: (818:21,37 [10] )
 |someObject|
 
-Source Location: (94:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1103:33,7 [49] )
+Generated Location: (1104:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 2b233a3819..c8a58ea342 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                someObject
+                                                 someObject
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index 44ca421d42..cbe4192969 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -7,13 +7,13 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute -  - data-slider-min=" - "
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
-                    SetKey - (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
-            CSharpCode - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
+                    SetKey - (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
+            CSharpCode - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index aa806f2daf..8bc97b2749 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
-Source Location: (48:0,48 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (987:29,48 [10] )
+Generated Location: (988:29,49 [10] )
 |someObject|
 
-Source Location: (73:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private object someObject = new object();
 
         [Parameter] protected int Min { get; set; }
     |
-Generated Location: (1228:40,7 [112] )
+Generated Location: (1229:40,7 [112] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 5e56244b2c..9ff437c85b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -19,7 +19,7 @@ namespace Test
             builder.AddElementReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                    myElem = __value;
+                                     myElem = __value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index eb9d244a3f..d9abf6f8b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -7,15 +7,15 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [79] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
                     HtmlAttribute -  - attributebefore=" - "
                         HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
-                    ReferenceCapture - (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
+                    ReferenceCapture - (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
                     HtmlAttribute -  - attributeafter=" - "
-                        HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
+                        HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 6582ee8df1..6daf0a696b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (854:21,36 [6] )
+Generated Location: (855:21,37 [6] )
 |myElem|
 
-Source Location: (90:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1162:34,7 [122] )
+Generated Location: (1163:34,7 [122] )
 |
     private Microsoft.AspNetCore.Components.ElementRef myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 2deb04db31..20fcb8a55f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ namespace Test
             builder.AddElementReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                _element = __value;
+                                                 _element = __value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 20bacd2168..61dbd3d7d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -7,13 +7,13 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute -  - data-slider-min=" - "
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
-                    ReferenceCapture - (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
-            CSharpCode - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
+                    ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
+            CSharpCode - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 9534848420..c135b4409c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
-Source Location: (48:0,48 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1024:29,48 [8] )
+Generated Location: (1025:29,49 [8] )
 |_element|
 
-Source Location: (71:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private ElementRef _element;
 
         [Parameter] protected int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1289:41,7 [161] )
+Generated Location: (1290:41,7 [161] )
 |
         private ElementRef _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 604944635e..0716b1247f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -7,8 +7,8 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
+                MarkupElement - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, 
                             IntermediateToken -  - CSharp - "alert(\"Test\");"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 899beb4979..930e6e8d3f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index bb5feca082..b342721c6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+            CSharpCode - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 4e484723a0..16c66ff865 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1043:30,7 [44] )
+Generated Location: (1044:30,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 0352718012..3456fae0ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 297d1c1902..b65bcfeeff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index a253687898..7b71e90d6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1043:30,7 [49] )
+Generated Location: (1044:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 1b336f0287..2d569c7112 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  x => { }
+                   x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index b76287931a..124224c0b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 0352718012..3456fae0ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 297d1c1902..b65bcfeeff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index a253687898..7b71e90d6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1043:30,7 [49] )
+Generated Location: (1044:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 1b336f0287..2d569c7112 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  x => { }
+                   x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index b76287931a..124224c0b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index dc04883067..1b5554e598 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnClick
+                  OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index 131fbd9acf..fa8aa00e3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+            CSharpCode - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index be2c68512e..9b9d151b3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1043:30,7 [31] )
+Generated Location: (1044:30,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 0812f45368..514cb5f9dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  () => { }
+                   () => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index 17894bbeab..07dccb7c4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 550c6d6003..74ba68bb2d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -7,8 +7,8 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [24] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
                             IntermediateToken -  - CSharp - "foo"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index 65367f1651..c6e0ae260c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
             builder.AddComponentReferenceCapture(2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     _my = (Test.MyComponent<int>)__value;
+                                      _my = (Test.MyComponent<int>)__value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
index 17b1a8615e..5dbefda847 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ReferenceCapture - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                    ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index 3387137665..a830a6ef44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1019:28,37 [3] )
+Generated Location: (1020:28,38 [3] )
 |_my|
 
-Source Location: (55:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1304:40,7 [90] )
+Generated Location: (1305:40,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index 3ceda598db..96d74f3a1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ namespace Test
             , 2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           _my = __value;
+                            _my = __value;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
index 4cb3b68940..cde256a50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -7,12 +7,12 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ReferenceCapture - (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                    ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index 92fffaf8a4..636a07a580 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (27:0,27 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (868:26,27 [3] )
+Generated Location: (869:26,28 [3] )
 |_my|
 
-Source Location: (45:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1091:37,7 [90] )
+Generated Location: (1092:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index f2f52b6832..2555d4cf11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
             builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     _someKey
+                                      _someKey
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index d74e8164d4..f910f85b44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    SetKey - (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
-            CSharpCode - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+                    SetKey - (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+            CSharpCode - (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 866f4b45f4..b412cd6048 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (37:0,37 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (980:28,37 [8] )
+Generated Location: (981:28,38 [8] )
 |_someKey|
 
-Source Location: (60:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1221:39,7 [47] )
+Generated Location: (1222:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index f70b761b86..a0e32863ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ namespace Test
             , 2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           _someKey
+                            _someKey
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index c825818139..bfaf4a6def 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -7,12 +7,12 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    SetKey - (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
-            CSharpCode - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
+                    SetKey - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
+            CSharpCode - (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object _someKey = new object();\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 5d51797a0d..7252938b26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (27:0,27 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (854:26,27 [8] )
+Generated Location: (855:26,28 [8] )
 |_someKey|
 
-Source Location: (50:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1056:36,7 [47] )
+Generated Location: (1057:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index a8779e78dc..a06888102e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 y
+                  y
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index b44f73d083..a007647a77 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
-                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
+                            IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
-            CSharpCode - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
+            CSharpCode - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index abf3b06df4..7a50539e46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (31:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1127:31,7 [24] )
+Generated Location: (1128:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 84b9fd0a05..dfbf7e4d96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  UserName
+                   UserName
 
 #line default
 #line hidden
@@ -27,7 +27,7 @@ namespace Test
             builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                            UserIsActive
+                                              UserIsActive
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 8dea19fb3e..8f512281a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -7,22 +7,22 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User
-                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
+                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName)
-                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
-                            IntermediateToken - (44:0,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
+                            IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
                             IntermediateToken -  - CSharp - )
-                    ComponentAttribute - (43:0,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
-            CSharpCode - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
+            CSharpCode - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 63f55fdef6..cce1b7362e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (71:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1630:41,7 [88] )
+Generated Location: (1633:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 90748b1dbc..e57aea470f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 OnComponentHover
+                  OnComponentHover
 
 #line default
 #line hidden
@@ -26,7 +26,7 @@ namespace Test
             builder.AddAttribute(2, "style", "background:" + " " + (
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                       ParentBgColor
+                                                        ParentBgColor
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index d2b70e2be3..904399a25b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -7,18 +7,18 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                MarkupElement - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (17:0,17 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken - (18:0,18 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute -  - style=" - "
-                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
-                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
-                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                        HtmlAttributeValue - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (54:0,54 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (56:0,56 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+            CSharpCode - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 8ae9e341a1..84f51ae7e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
@@ -6,7 +6,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1335:39,7 [132] )
+Generated Location: (1337:39,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.cspans.txt
new file mode 100644
index 0000000000..9832cbfec6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
+Markup span at (5:0,5 [9] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [14] )
+Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [4] )
+Code span at (15:0,15 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (14:0,14 [4] )
+Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [14] )
+Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
+Markup span at (20:0,20 [7] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt
new file mode 100644
index 0000000000..4cbebe5321
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..27)::27 - [<span @class='@foo'></span>]
+    MarkupBlock - [0..27)::27
+        MarkupElement - [0..27)::27
+            MarkupStartTag - [0..20)::20 - [<span @class='@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [5..19)::14 - [ @class='@foo']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..12)::6 - [@class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Transition;[@];
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [14..18)::4
+                        MarkupDynamicAttributeValue - [14..18)::4 - [@foo]
+                            GenericBlock - [14..18)::4
+                                CSharpCodeBlock - [14..18)::4
+                                    CSharpImplicitExpression - [14..18)::4
+                                        CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [15..18)::3
+                                            CSharpCodeBlock - [15..18)::3
+                                                CSharpExpressionLiteral - [15..18)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[foo];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupEndTag - [20..27)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.cspans.txt
new file mode 100644
index 0000000000..94b56eaa83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (5:0,5 [15] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [20] )
+Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (20:0,20 [4] )
+Code span at (21:0,21 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (20:0,20 [4] )
+Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [20] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (26:0,26 [7] ) (Accepts:Any) - Parent: Tag block at (26:0,26 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt
new file mode 100644
index 0000000000..cc833ddb21
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..33)::33 - [<span @class:param='@foo'></span>]
+    MarkupBlock - [0..33)::33
+        MarkupElement - [0..33)::33
+            MarkupStartTag - [0..26)::26 - [<span @class:param='@foo'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                MarkupAttributeBlock - [5..25)::20 - [ @class:param='@foo']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..18)::12 - [@class:param] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Transition;[@];
+                        Text;[class:param];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [20..24)::4
+                        MarkupDynamicAttributeValue - [20..24)::4 - [@foo]
+                            GenericBlock - [20..24)::4
+                                CSharpCodeBlock - [20..24)::4
+                                    CSharpImplicitExpression - [20..24)::4
+                                        CSharpTransition - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [21..24)::3
+                                            CSharpCodeBlock - [21..24)::3
+                                                CSharpExpressionLiteral - [21..24)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[foo];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupEndTag - [26..33)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.cspans.txt
new file mode 100644
index 0000000000..c768c47175
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.cspans.txt
@@ -0,0 +1,5 @@
+MetaCode span at (7:0,7 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [60] )
+Code span at (20:0,20 [7] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [60] )
+MetaCode span at (29:0,29 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [60] )
+MetaCode span at (40:0,40 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [60] )
+Markup span at (48:0,48 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [60] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt
new file mode 100644
index 0000000000..65d96f9566
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt
@@ -0,0 +1,45 @@
+RazorDocument - [0..60)::60 - [<input @bind-value="Message" @bind-value:event="onchange" />]
+    MarkupBlock - [0..60)::60
+        MarkupTagHelperElement - [0..60)::60 - input[SelfClosing] - Bind
+            MarkupTagHelperStartTag - [0..60)::60 - [<input @bind-value="Message" @bind-value:event="onchange" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupTagHelperDirectiveAttribute - [6..28)::22
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    RazorMetaCode - [7..8)::1
+                        Transition;[@];
+                    MarkupTextLiteral - [8..18)::10 - [bind-value]
+                        Text;[bind-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [20..27)::7
+                        CSharpExpressionLiteral - [20..27)::7 - [Message] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[Message];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperDirectiveAttribute - [28..57)::29
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    RazorMetaCode - [29..30)::1
+                        Transition;[@];
+                    MarkupTextLiteral - [30..40)::10 - [bind-value]
+                        Text;[bind-value];
+                    RazorMetaCode - [40..41)::1
+                        Colon;[:];
+                    MarkupTextLiteral - [41..46)::5 - [event]
+                        Text;[event];
+                    Equals;[=];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [48..56)::8
+                        MarkupTextLiteral - [48..56)::8 - [onchange] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[onchange];
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [57..58)::1
+                    MarkupTextLiteral - [57..58)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.tspans.txt
new file mode 100644
index 0000000000..31cb82bc12
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [60] ) - Bind
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.cspans.txt
new file mode 100644
index 0000000000..0d481010a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.cspans.txt
@@ -0,0 +1,3 @@
+MetaCode span at (7:0,7 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+MetaCode span at (17:0,17 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
+MetaCode span at (26:0,26 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.diag.txt
new file mode 100644
index 0000000000..79b4724fca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.diag.txt
@@ -0,0 +1,2 @@
+(1,8): Error RZ2008: Attribute '@bind-foo' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Object' cannot be empty or contain only whitespace.
+(1,18): Error RZ2008: Attribute '@bind-foo:param' on tag helper element 'input' requires a value. Tag helper bound attributes of type 'System.Object' cannot be empty or contain only whitespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.stree.txt
new file mode 100644
index 0000000000..ba103eb489
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..35)::35 - [<input @bind-foo @bind-foo:param />]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - input[SelfClosing] - Bind
+            MarkupTagHelperStartTag - [0..35)::35 - [<input @bind-foo @bind-foo:param />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMinimizedTagHelperDirectiveAttribute - [6..16)::10
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    RazorMetaCode - [7..8)::1
+                        Transition;[@];
+                    MarkupTextLiteral - [8..16)::8 - [bind-foo]
+                        Text;[bind-foo];
+                MarkupMinimizedTagHelperDirectiveAttribute - [16..32)::16
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    RazorMetaCode - [17..18)::1
+                        Transition;[@];
+                    MarkupTextLiteral - [18..26)::8 - [bind-foo]
+                        Text;[bind-foo];
+                    RazorMetaCode - [26..27)::1
+                        Colon;[:];
+                    MarkupTextLiteral - [27..32)::5 - [param]
+                        Text;[param];
+                MarkupMiscAttributeContent - [32..33)::1
+                    MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.tspans.txt
new file mode 100644
index 0000000000..51f2cc1454
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_MinimizedComponentDirectiveAttributes.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [35] ) - Bind
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 33113ec30f..6a9d72377b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -28,7 +28,7 @@ namespace Microsoft.CodeAnalysis.Razor
             // both a 'value' attribute and a 'value changed' attribute.
             //
             // User types: 
-            //      <input type="text" bind="@FirstName"/>
+            //      <input type="text" @bind="@FirstName"/>
             //
             // We generate:
             //      <input type="text" 
@@ -36,7 +36,7 @@ namespace Microsoft.CodeAnalysis.Razor
             //          onchange="@EventCallbackFactory.CreateBinder(this, __value => FirstName = __value, FirstName)"/>
             //
             // This isn't very different from code the user could write themselves - thus the pronouncement
-            // that bind is very much like a macro.
+            // that @bind is very much like a macro.
             //
             // A lot of the value that provide in this case is that the associations between the
             // elements, and the attributes aren't straightforward.
@@ -46,23 +46,23 @@ namespace Microsoft.CodeAnalysis.Razor
             //
             // We handle a few different cases here:
             //
-            //  1.  When given an attribute like **anywhere**'bind-value="@FirstName"' and 'bind-value:event="onchange"' we will
+            //  1.  When given an attribute like **anywhere**'@bind-value="@FirstName"' and '@bind-value:event="onchange"' we will
             //      generate the 'value' attribute and 'onchange' attribute. 
             //
             //      We don't do any transformation or inference for this case, because the developer has
-            //      told us exactly what to do. This is the *full* form of bind, and should support any
+            //      told us exactly what to do. This is the *full* form of @bind, and should support any
             //      combination of element, component, and attributes.
             //
             //      This is the most general case, and is implemented with a built-in tag helper that applies
-            //      to everything, and binds to a dictionary of attributes that start with bind-.
+            //      to everything, and binds to a dictionary of attributes that start with @bind-.
             //
-            //  2.  We also support cases like 'bind-value="@FirstName"' where we will generate the 'value'
+            //  2.  We also support cases like '@bind-value="@FirstName"' where we will generate the 'value'
             //      attribute and another attribute based for a changed handler based on the metadata.
             //
             //     These mappings are provided by attributes that tell us what attributes, suffixes, and
             //      elements to map.
             //
-            //  3.  When given an attribute like 'bind="@FirstName"' we will generate a value and change
+            //  3.  When given an attribute like '@bind="@FirstName"' we will generate a value and change
             //      attribute solely based on the context. We need the context of an HTML tag to know
             //      what attributes to generate.
             //
@@ -134,18 +134,20 @@ namespace Microsoft.CodeAnalysis.Razor
                 rule.TagName = "*";
                 rule.Attribute(attribute =>
                 {
-                    attribute.Name = "bind-";
+                    attribute.Name = "@bind-";
                     attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+                    attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                 });
             });
 
             builder.BindAttribute(attribute =>
             {
+                attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                 attribute.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
 
-                var attributeName = "bind-...";
+                var attributeName = "@bind-...";
                 attribute.Name = attributeName;
-                attribute.AsDictionary("bind-", typeof(object).FullName);
+                attribute.AsDictionary("@bind-", typeof(object).FullName);
 
                 // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the toolips.
@@ -267,7 +269,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 var entry = data[i];
 
                 var name = entry.Suffix == null ? "Bind" : "Bind_" + entry.Suffix;
-                var attributeName = entry.Suffix == null ? "bind" : "bind-" + entry.Suffix;
+                var attributeName = entry.Suffix == null ? "@bind" : "@bind-" + entry.Suffix;
 
                 var formatName = entry.Suffix == null ? "Format_" + entry.ValueAttribute : "Format_" + entry.Suffix;
                 var formatAttributeName = entry.Suffix == null ? "format-" + entry.ValueAttribute : "format-" + entry.Suffix;
@@ -322,11 +324,13 @@ namespace Microsoft.CodeAnalysis.Razor
                     {
                         a.Name = attributeName;
                         a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                        a.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                     });
                 });
 
                 builder.BindAttribute(a =>
                 {
+                    a.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                     a.Documentation = string.Format(
                         ComponentResources.BindTagHelper_Element_Documentation,
                         entry.ValueAttribute,
@@ -464,19 +468,21 @@ namespace Microsoft.CodeAnalysis.Razor
                         rule.TagName = tagHelper.TagMatchingRules.Single().TagName;
                         rule.Attribute(attribute =>
                         {
-                            attribute.Name = "bind-" + valueAttribute.Name;
+                            attribute.Name = "@bind-" + valueAttribute.Name;
                             attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                            attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                         });
                     });
 
                     builder.BindAttribute(attribute =>
                     {
+                        attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                         attribute.Documentation = string.Format(
                             ComponentResources.BindTagHelper_Component_Documentation,
                             valueAttribute.Name,
                             changeAttribute.Name);
 
-                        attribute.Name = "bind-" + valueAttribute.Name;
+                        attribute.Name = "@bind-" + valueAttribute.Name;
                         attribute.TypeName = changeAttribute.TypeName;
                         attribute.IsEnum = valueAttribute.IsEnum;
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 9698aac5ea..142881c134 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -102,11 +102,12 @@ namespace Microsoft.CodeAnalysis.Razor
             for (var i = 0; i < data.Count; i++)
             {
                 var entry = data[i];
+                var attributeName = "@" + entry.Attribute;
 
                 var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.EventHandler.TagHelperKind, entry.Attribute, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.EventHandlerTagHelper_Documentation,
-                    entry.Attribute,
+                    attributeName,
                     entry.EventArgsType.ToDisplayString());
 
                 builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.EventHandler.TagHelperKind);
@@ -124,8 +125,9 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     rule.Attribute(a =>
                     {
-                        a.Name = entry.Attribute;
+                        a.Name = attributeName;
                         a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                        a.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                     });
                 });
 
@@ -133,10 +135,10 @@ namespace Microsoft.CodeAnalysis.Razor
                 {
                     a.Documentation = string.Format(
                         ComponentResources.EventHandlerTagHelper_Documentation,
-                        entry.Attribute,
+                        attributeName,
                         entry.EventArgsType.ToDisplayString());
 
-                    a.Name = entry.Attribute;
+                    a.Name = attributeName;
 
                     // Use a string here so that we get HTML context by default.
                     a.TypeName = typeof(string).FullName;
@@ -145,6 +147,8 @@ namespace Microsoft.CodeAnalysis.Razor
                     // logic that we don't want to interfere with.
                     a.Metadata.Add(ComponentMetadata.Component.WeaklyTypedKey, bool.TrueString);
 
+                    a.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                     // a C# property will crash trying to create the tooltips.
                     a.SetPropertyName(entry.Attribute);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
index 7ea05126be..ea2830b91b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
@@ -56,19 +56,21 @@ namespace Microsoft.CodeAnalysis.Razor
                 rule.TagName = "*";
                 rule.Attribute(attribute =>
                 {
-                    attribute.Name = "key";
+                    attribute.Name = "@key";
+                    attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                 });
             });
 
             builder.BindAttribute(attribute =>
             {
                 attribute.Documentation = ComponentResources.KeyTagHelper_Documentation;
-                attribute.Name = "key";
+                attribute.Name = "@key";
 
                 // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the tooltips.
                 attribute.SetPropertyName("Key");
                 attribute.TypeName = typeof(object).FullName;
+                attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
             });
 
             return builder.Build();
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index 3ff471acdc..ed1efdf453 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -56,19 +56,21 @@ namespace Microsoft.CodeAnalysis.Razor
                 rule.TagName = "*";
                 rule.Attribute(attribute =>
                 {
-                    attribute.Name = "ref";
+                    attribute.Name = "@ref";
+                    attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
                 });
             });
 
             builder.BindAttribute(attribute =>
             {
                 attribute.Documentation = ComponentResources.RefTagHelper_Documentation;
-                attribute.Name = "ref";
+                attribute.Name = "@ref";
 
                 // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the tooltips.
                 attribute.SetPropertyName("Ref");
                 attribute.TypeName = typeof(object).FullName;
+                attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
             });
 
             return builder.Build();
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index f44969d253..3d48fb7666 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -96,8 +96,8 @@ namespace Test
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("bind-MyProperty", requiredAttribute.DisplayName);
-            Assert.Equal("bind-MyProperty", requiredAttribute.Name);
+            Assert.Equal("@bind-MyProperty", requiredAttribute.DisplayName);
+            Assert.Equal("@bind-MyProperty", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
@@ -120,7 +120,7 @@ namespace Test
                     "delegate to the 'MyPropertyChanged' property of the component.",
                 attribute.Documentation);
 
-            Assert.Equal("bind-MyProperty", attribute.Name);
+            Assert.Equal("@bind-MyProperty", attribute.Name);
             Assert.Equal("MyProperty", attribute.GetPropertyName());
             Assert.Equal("System.Action<System.String> Test.MyComponent.MyProperty", attribute.DisplayName);
 
@@ -211,8 +211,8 @@ namespace Test
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("bind-MyProperty", requiredAttribute.DisplayName);
-            Assert.Equal("bind-MyProperty", requiredAttribute.Name);
+            Assert.Equal("@bind-MyProperty", requiredAttribute.DisplayName);
+            Assert.Equal("@bind-MyProperty", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
@@ -235,7 +235,7 @@ namespace Test
                     "delegate to the 'MyPropertyChanged' property of the component.",
                 attribute.Documentation);
 
-            Assert.Equal("bind-MyProperty", attribute.Name);
+            Assert.Equal("@bind-MyProperty", attribute.Name);
             Assert.Equal("MyProperty", attribute.GetPropertyName());
             Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.String> Test.MyComponent.MyProperty", attribute.DisplayName);
 
@@ -361,13 +361,13 @@ namespace Test
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("bind", requiredAttribute.DisplayName);
-            Assert.Equal("bind", requiredAttribute.Name);
+            Assert.Equal("@bind", requiredAttribute.DisplayName);
+            Assert.Equal("@bind", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
 
-            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("@bind"));
 
             // Invariants
             Assert.Empty(attribute.Diagnostics);
@@ -385,7 +385,7 @@ namespace Test
                     "delegate to the 'myevent' attribute.",
                 attribute.Documentation);
 
-            Assert.Equal("bind", attribute.Name);
+            Assert.Equal("@bind", attribute.Name);
             Assert.Equal("Bind", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
 
@@ -404,7 +404,7 @@ namespace Test
             Assert.False(parameter.IsDefaultKind());
 
             Assert.Equal(
-                "Specifies a format to convert the value specified by the 'bind' attribute. " + 
+                "Specifies a format to convert the value specified by the '@bind' attribute. " + 
                 "The format string can currently only be used with expressions of type <code>DateTime</code>.",
                 parameter.Documentation);
 
@@ -460,11 +460,11 @@ namespace Test
             Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
 
             var requiredAttribute = Assert.Single(rule.Attributes);
-            Assert.Equal("bind-myprop", requiredAttribute.DisplayName);
-            Assert.Equal("bind-myprop", requiredAttribute.Name);
+            Assert.Equal("@bind-myprop", requiredAttribute.DisplayName);
+            Assert.Equal("@bind-myprop", requiredAttribute.Name);
 
-            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
-            Assert.Equal("bind-myprop", attribute.Name);
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("@bind"));
+            Assert.Equal("@bind-myprop", attribute.Name);
             Assert.Equal("Bind_myprop", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind_myprop", attribute.DisplayName);
 
@@ -516,11 +516,11 @@ namespace Test
             Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
 
             var requiredAttribute = Assert.Single(rule.Attributes);
-            Assert.Equal("bind", requiredAttribute.DisplayName);
-            Assert.Equal("bind", requiredAttribute.Name);
+            Assert.Equal("@bind", requiredAttribute.DisplayName);
+            Assert.Equal("@bind", requiredAttribute.Name);
 
-            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
-            Assert.Equal("bind", attribute.Name);
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("@bind"));
+            Assert.Equal("@bind", attribute.Name);
             Assert.Equal("Bind", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
 
@@ -583,12 +583,12 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal("bind", a.DisplayName);
-                    Assert.Equal("bind", a.Name);
+                    Assert.Equal("@bind", a.DisplayName);
+                    Assert.Equal("@bind", a.Name);
                 });
 
-            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
-            Assert.Equal("bind", attribute.Name);
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("@bind"));
+            Assert.Equal("@bind", attribute.Name);
             Assert.Equal("Bind", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind", attribute.DisplayName);
 
@@ -651,12 +651,12 @@ namespace Test
                 },
                 a =>
                 {
-                    Assert.Equal("bind-somevalue", a.DisplayName);
-                    Assert.Equal("bind-somevalue", a.Name);
+                    Assert.Equal("@bind-somevalue", a.DisplayName);
+                    Assert.Equal("@bind-somevalue", a.Name);
                 });
 
-            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
-            Assert.Equal("bind-somevalue", attribute.Name);
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("@bind"));
+            Assert.Equal("@bind-somevalue", attribute.Name);
             Assert.Equal("Bind_somevalue", attribute.GetPropertyName());
             Assert.Equal("object Test.BindAttributes.Bind_somevalue", attribute.DisplayName);
 
@@ -705,7 +705,7 @@ namespace Test
 
             Assert.Equal(
                 "Binds the provided expression to an attribute and a change event, based on the naming of " +
-                    "the bind attribute. For example: <code>bind-value=\"...\"</code> and <code>bind-value:event=\"onchange\"</code> will assign the " +
+                    "the bind attribute. For example: <code>@bind-value=\"...\"</code> and <code>@bind-value:event=\"onchange\"</code> will assign the " +
                     "current value of the expression to the 'value' attribute, and assign a delegate that attempts " +
                     "to set the value to the 'onchange' attribute.",
                 bind.Documentation);
@@ -726,13 +726,13 @@ namespace Test
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("bind-...", requiredAttribute.DisplayName);
-            Assert.Equal("bind-", requiredAttribute.Name);
+            Assert.Equal("@bind-...", requiredAttribute.DisplayName);
+            Assert.Equal("@bind-", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
 
-            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("bind"));
+            var attribute = Assert.Single(bind.BoundAttributes, a => a.Name.StartsWith("@bind"));
 
             // Invariants
             Assert.Empty(attribute.Diagnostics);
@@ -743,17 +743,17 @@ namespace Test
             Assert.False(attribute.IsIndexerStringProperty);
 
             Assert.True(attribute.HasIndexer);
-            Assert.Equal("bind-", attribute.IndexerNamePrefix);
+            Assert.Equal("@bind-", attribute.IndexerNamePrefix);
             Assert.Equal("System.Object", attribute.IndexerTypeName);
 
             Assert.Equal(
                 "Binds the provided expression to an attribute and a change event, based on the naming of " +
-                    "the bind attribute. For example: <code>bind-value=\"...\"</code> and <code>bind-value:event=\"onchange\"</code> will assign the " +
+                    "the bind attribute. For example: <code>@bind-value=\"...\"</code> and <code>@bind-value:event=\"onchange\"</code> will assign the " +
                     "current value of the expression to the 'value' attribute, and assign a delegate that attempts " +
                     "to set the value to the 'onchange' attribute.",
                 attribute.Documentation);
 
-            Assert.Equal("bind-...", attribute.Name);
+            Assert.Equal("@bind-...", attribute.Name);
             Assert.Equal("Bind", attribute.GetPropertyName());
             Assert.Equal(
                 "System.Collections.Generic.Dictionary<string, object> Microsoft.AspNetCore.Components.Bind.Bind",
@@ -775,8 +775,8 @@ namespace Test
 
             Assert.Equal(
                 "Specifies a format to convert the value specified by the corresponding bind attribute. " +
-                    "For example: <code>bind-value:format=\"...\"</code> will apply a format string to the value " +
-                    "specified in <code>bind-value=\"...\"</code>. The format string can currently only be used with " +
+                    "For example: <code>@bind-value:format=\"...\"</code> will apply a format string to the value " +
+                    "specified in <code>@bind-value=\"...\"</code>. The format string can currently only be used with " +
                     "expressions of type <code>DateTime</code>.",
                 parameter.Documentation);
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index 19e2e6555d..86f26e97f3 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -58,7 +58,7 @@ namespace Test
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
 
             Assert.Equal(
-                "Sets the 'onclick' attribute to the provided string or delegate value. " +
+                "Sets the '@onclick' attribute to the provided string or delegate value. " +
                 "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>'.",
                 item.Documentation);
 
@@ -78,8 +78,8 @@ namespace Test
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("onclick", requiredAttribute.DisplayName);
-            Assert.Equal("onclick", requiredAttribute.Name);
+            Assert.Equal("@onclick", requiredAttribute.DisplayName);
+            Assert.Equal("@onclick", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
@@ -99,15 +99,16 @@ namespace Test
 
             Assert.Collection(
                 attribute.Metadata.OrderBy(kvp => kvp.Key),
+                kvp => Assert.Equal(kvp, new KeyValuePair<string, string>(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString)),
                 kvp => Assert.Equal(kvp, new KeyValuePair<string, string>("Common.PropertyName", "onclick")),
                 kvp => Assert.Equal(kvp, new KeyValuePair<string, string>(ComponentMetadata.Component.WeaklyTypedKey, bool.TrueString)));
 
             Assert.Equal(
-                "Sets the 'onclick' attribute to the provided string or delegate value. " +
+                "Sets the '@onclick' attribute to the provided string or delegate value. " +
                 "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>'.",
                 attribute.Documentation);
 
-            Assert.Equal("onclick", attribute.Name);
+            Assert.Equal("@onclick", attribute.Name);
             Assert.Equal("onclick", attribute.GetPropertyName());
             Assert.Equal("string Test.EventHandlers.onclick", attribute.DisplayName);
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
index ae9288bd19..17965726d6 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
@@ -55,8 +55,8 @@ namespace Microsoft.CodeAnalysis.Razor
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("key", requiredAttribute.DisplayName);
-            Assert.Equal("key", requiredAttribute.Name);
+            Assert.Equal("@key", requiredAttribute.DisplayName);
+            Assert.Equal("@key", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
@@ -76,7 +76,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 "Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches.",
                 attribute.Documentation);
 
-            Assert.Equal("key", attribute.Name);
+            Assert.Equal("@key", attribute.Name);
             Assert.Equal("Key", attribute.GetPropertyName());
             Assert.Equal("object Microsoft.AspNetCore.Components.Key.Key", attribute.DisplayName);
             Assert.Equal("System.Object", attribute.TypeName);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index fa091512b5..bd39018ab4 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -55,8 +55,8 @@ namespace Microsoft.CodeAnalysis.Razor
 
             var requiredAttribute = Assert.Single(rule.Attributes);
             Assert.Empty(requiredAttribute.Diagnostics);
-            Assert.Equal("ref", requiredAttribute.DisplayName);
-            Assert.Equal("ref", requiredAttribute.Name);
+            Assert.Equal("@ref", requiredAttribute.DisplayName);
+            Assert.Equal("@ref", requiredAttribute.Name);
             Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
             Assert.Null(requiredAttribute.Value);
             Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
@@ -76,7 +76,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 "Populates the specified field or property with a reference to the element or component.",
                 attribute.Documentation);
 
-            Assert.Equal("ref", attribute.Name);
+            Assert.Equal("@ref", attribute.Name);
             Assert.Equal("Ref", attribute.GetPropertyName());
             Assert.Equal("object Microsoft.AspNetCore.Components.Ref.Ref", attribute.DisplayName);
             Assert.Equal("System.Object", attribute.TypeName);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index 8ed5fc2121..2ea8205b15 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -181,18 +181,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             AssertSyntaxTreeNodeMatchesBaseline(syntaxTree);
         }
 
-        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, IEnumerable<DirectiveDescriptor> directives = null, RazorParserFeatureFlags featureFlags = null)
+        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, IEnumerable<DirectiveDescriptor> directives = null, RazorParserFeatureFlags featureFlags = null, string fileKind = null)
         {
-            return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime, featureFlags);
+            return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime, featureFlags, fileKind);
         }
 
-        internal virtual RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
+        internal virtual RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null, string fileKind = null)
         {
             directives = directives ?? Array.Empty<DirectiveDescriptor>();
 
             var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
 
-            var options = CreateParserOptions(version, directives, designTime, featureFlags);
+            var options = CreateParserOptions(version, directives, designTime, featureFlags, fileKind);
             var context = new ParserContext(source, options);
 
             var codeParser = new CSharpCodeParser(directives, context);
@@ -221,6 +221,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(document, null, false);
         }
 
+        internal virtual void ParseDocumentTest(string document, string fileKind)
+        {
+            ParseDocumentTest(document, null, false, fileKind);
+        }
+
         internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives)
         {
             ParseDocumentTest(document, directives, false);
@@ -231,14 +236,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(document, null, designTime);
         }
 
-        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, string fileKind = null)
         {
-            ParseDocumentTest(RazorLanguageVersion.Latest, document, directives, designTime);
+            ParseDocumentTest(RazorLanguageVersion.Latest, document, directives, designTime, fileKind);
         }
 
-        internal virtual void ParseDocumentTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
+        internal virtual void ParseDocumentTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, string fileKind = null)
         {
-            var result = ParseDocument(version, document, directives, designTime);
+            var result = ParseDocument(version, document, directives, designTime, fileKind: fileKind);
 
             BaselineTest(result);
         }
@@ -247,14 +252,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             RazorLanguageVersion version, 
             IEnumerable<DirectiveDescriptor> directives, 
             bool designTime,
-            RazorParserFeatureFlags featureFlags = null)
+            RazorParserFeatureFlags featureFlags = null,
+            string fileKind = null)
         {
             return new TestRazorParserOptions(
                 directives.ToArray(),
                 designTime,
                 parseLeadingDirectives: false,
                 version: version,
-                fileKind: FileKinds.Legacy,
+                fileKind: fileKind ?? FileKinds.Legacy,
                 featureFlags: featureFlags);
         }
 

From b45c32fa5b3c18577a32cd4366ad7b013c9c2f28 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 29 May 2019 13:06:38 -0700
Subject: [PATCH 167/337] Add support for source-build
 (dotnet/aspnetcore-tooling#620)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/986c224acf1d8a5c351a88259904e381ef1e296b
---
 .../Microsoft.AspNetCore.Components.Razor.Extensions.csproj   | 2 ++
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj                  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
index a690a69a9d..88ee6cf430 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
@@ -6,6 +6,8 @@
     <RootNamespace>Microsoft.AspNetCore.Components.Razor</RootNamespace>
     <Description>Extensions to the Razor compiler to support building Razor Components.</Description>
     <IsProductPackage>true</IsProductPackage>
+    <!-- Excluded because this assembly has a 3rd party dependency. -->
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
 
     <!-- Copy package references to output, needed so the build project can find them -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index b3097334e7..ac9c318068 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -63,7 +63,7 @@
     <MSBuildLocationFileOutput>$(IntermediateOutputPath)BuildVariables.generated.cs</MSBuildLocationFileOutput>
   </PropertyGroup>
 
-  <Target 
+  <Target
     Name="GenerateMSBuildLocationFile"
     Condition="'$(TargetFramework)'!=''"
     AfterTargets="BeforeBuild"
@@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
   </Target>
 
-  <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build">
+  <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
     <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" />
   </Target>
 

From 33e8098b4f72c01ca3389a9eda02cbdb0a6dc72e Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Wed, 29 May 2019 18:46:49 -0700
Subject: [PATCH 168/337] Remove obsolete project file \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/a7d137370711efe1e9536a1f53948ec4821d20be

---
 ...NetCore.Components.Razor.Extensions.csproj | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
deleted file mode 100644
index 88ee6cf430..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
-    <RootNamespace>Microsoft.AspNetCore.Components.Razor</RootNamespace>
-    <Description>Extensions to the Razor compiler to support building Razor Components.</Description>
-    <IsProductPackage>true</IsProductPackage>
-    <!-- Excluded because this assembly has a 3rd party dependency. -->
-    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
-
-    <!-- Copy package references to output, needed so the build project can find them -->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.9.9.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(RazorPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(RazorPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\shared\ComponentsApi.cs" Link="shared\%(Filename)%(Extension)" />
-  </ItemGroup>
-</Project>

From 1c27d78420ad3ead27138dff9d916a7f6a77e839 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 30 May 2019 21:51:44 +0200
Subject: [PATCH 169/337] Adds support for packing and publishing static web
 assets

* Adds support for publishing static web assets
* At publish time, it copies all the referenced assets from referenced
  projects and packages into their final locations.
* Automatically pack static web assets for consumption
* Generate Microsoft.AspNetCore.StaticWebAssets.props and pack it into
  build\Microsoft.AspNetCore.StaticWebAssets.props
* Generate `<<PackageId>>.props` and pack it into `build\<<PackageId>>.props`
  importing Microsoft.AspNetCore.StaticWebAssets.props
* Generate `<<PackageId>>.props` and pack it into buildMultiTargeting\`<<PackageId>>.props`
  importing `build\<<PackageId>>.props`
* Generate `<<PackageId>>.props` and pack it into buildTransitive\`<<PackageId>>.props`
  importing buildMultiTargeting\`<<PackageId>>.props`
* Pack all the static web assets from the current project into `staticwebassets\**`\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/87817bed3ec2d86afbce6b1e796cad567129cf05
---
 .../src/GenerateStaticWebAssetsManifest.cs    |   4 +-
 .../src/GenerateStaticWebAsssetsPropsFile.cs  | 159 +++++++
 ...StaticWebAssetsGeneratePackagePropsFile.cs |  54 +++
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 321 ++++++++++++-
 .../Sdk.Razor.CurrentVersion.props            |   2 +-
 .../Sdk.Razor.CurrentVersion.targets          |   6 +-
 .../GenerateStaticWebAssetsPropsFileTest.cs   | 433 ++++++++++++++++++
 .../test/IntegrationTests/Assert.cs           |  50 ++
 .../IntegrationTests/PackIntegrationTest.cs   | 146 ++++++
 .../StaticWebAssetsIntegrationTest.cs         |  96 +++-
 ...icWebAssetsGeneratePackagePropsFileTest.cs |  54 +++
 .../PackageLibraryDirectDependency.csproj     |   4 +-
 .../PackageLibraryDirectDependency.props      |  11 -
 .../PackageLibraryTransitiveDependency.csproj |   7 +-
 .../PackageLibraryTransitiveDependency.props  |  11 -
 15 files changed, 1284 insertions(+), 74 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAsssetsPropsFile.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/StaticWebAssetsGeneratePackagePropsFile.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateStaticWebAssetsPropsFileTest.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/StaticWebAssetsGeneratePackagePropsFileTest.cs
 delete mode 100644 src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props
 delete mode 100644 src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
index 7c6205d327..3ab75b0452 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
@@ -85,7 +86,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 }
             }
 
-            return nodes;
+            // Its important that we order the nodes here to produce a manifest deterministically.
+            return nodes.OrderBy(e=>e.Attribute(BasePath).Value);
         }
 
         private XmlWriter GetXmlWriter(XmlWriterSettings settings)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAsssetsPropsFile.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAsssetsPropsFile.cs
new file mode 100644
index 0000000000..4146eed9fa
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAsssetsPropsFile.cs
@@ -0,0 +1,159 @@
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class GenerateStaticWebAsssetsPropsFile : Task
+    {
+        private const string SourceType = "SourceType";
+        private const string SourceId = "SourceId";
+        private const string ContentRoot = "ContentRoot";
+        private const string BasePath = "BasePath";
+        private const string RelativePath = "RelativePath";
+
+        [Required]
+        public string TargetPropsFilePath { get; set; }
+
+        [Required]
+        public ITaskItem[] StaticWebAssets { get; set; }
+
+        public override bool Execute()
+        {
+            if (!ValidateArguments())
+            {
+                return false;
+            }
+
+            return ExecuteCore();
+        }
+
+        private bool ExecuteCore()
+        {
+            if (StaticWebAssets.Length == 0)
+            {
+                return !Log.HasLoggedErrors;
+            }
+
+            var template = StaticWebAssets[0];
+
+            var document = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
+            var root = new XElement(
+                "Project",
+                new XElement("ItemGroup",
+                    new XElement("StaticWebAsset",
+                        new XAttribute("Include", @"$(MSBuildThisFileDirectory)..\staticwebassets\**"),
+                        new XElement(SourceType, "Package"),
+                        new XElement(SourceId, template.GetMetadata(SourceId)),
+                        new XElement(ContentRoot, @"$(MSBuildThisFileDirectory)..\staticwebassets\"),
+                        new XElement(BasePath, template.GetMetadata(BasePath)),
+                        new XElement(RelativePath, "%(RecursiveDir)%(FileName)%(Extension)"))));
+
+            document.Add(root);
+
+            var settings = new XmlWriterSettings
+            {
+                Encoding = Encoding.UTF8,
+                CloseOutput = true,
+                OmitXmlDeclaration = true,
+                Indent = true,
+                NewLineOnAttributes = false,
+                Async = true
+            };
+
+            using (var xmlWriter = GetXmlWriter(settings))
+            {
+                document.WriteTo(xmlWriter);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        private XmlWriter GetXmlWriter(XmlWriterSettings settings)
+        {
+            var fileStream = new FileStream(TargetPropsFilePath, FileMode.Create);
+            return XmlWriter.Create(fileStream, settings);
+        }
+
+        private bool ValidateArguments()
+        {
+            ITaskItem firstAsset = null;
+
+            for (var i = 0; i < StaticWebAssets.Length; i++)
+            {
+                var webAsset = StaticWebAssets[i];
+                if (!EnsureRequiredMetadata(webAsset, SourceId) ||
+                    !EnsureRequiredMetadata(webAsset, SourceType, allowEmpty: true) ||
+                    !EnsureRequiredMetadata(webAsset, ContentRoot) ||
+                    !EnsureRequiredMetadata(webAsset, BasePath) ||
+                    !EnsureRequiredMetadata(webAsset, RelativePath))
+                {
+                    return false;
+                }
+
+                if (firstAsset == null)
+                {
+                    firstAsset = webAsset;
+                    continue;
+                }
+
+                if (!ValidateMetadataMatches(firstAsset, webAsset, SourceId) ||
+                    !ValidateMetadataMatches(firstAsset, webAsset, SourceType) ||
+                    !ValidateMetadataMatches(firstAsset, webAsset, ContentRoot) ||
+                    !ValidateMetadataMatches(firstAsset, webAsset, BasePath))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool ValidateMetadataMatches(ITaskItem reference, ITaskItem candidate, string metadata)
+        {
+            var referenceMetadata = reference.GetMetadata(metadata);
+            var candidateMetadata = candidate.GetMetadata(metadata);
+            if (!string.Equals(referenceMetadata, candidateMetadata, System.StringComparison.Ordinal))
+            {
+                Log.LogError($"Static web assets have different '{metadata}' metadata values '{referenceMetadata}' and '{candidateMetadata}' for '{reference.ItemSpec}' and '{candidate.ItemSpec}'.");
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool EnsureRequiredMetadata(ITaskItem item, string metadataName, bool allowEmpty = false)
+        {
+            var value = item.GetMetadata(metadataName);
+            var isInvalidValue = allowEmpty ? !HasMetadata(item, metadataName) : string.IsNullOrEmpty(value);
+
+            if (isInvalidValue)
+            {
+                Log.LogError($"Missing required metadata '{metadataName}' for '{item.ItemSpec}'.");
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool HasMetadata(ITaskItem item, string metadataName)
+        {
+            foreach (var name in item.MetadataNames)
+            {
+                if (string.Equals(metadataName, (string)name, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/StaticWebAssetsGeneratePackagePropsFile.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/StaticWebAssetsGeneratePackagePropsFile.cs
new file mode 100644
index 0000000000..bf7c78ab35
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/StaticWebAssetsGeneratePackagePropsFile.cs
@@ -0,0 +1,54 @@
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class StaticWebAssetsGeneratePackagePropsFile : Task
+    {
+        [Required]
+        public string PropsFileImport { get; set; }
+
+        [Required]
+        public string BuildTargetPath { get; set; }
+
+        public override bool Execute()
+        {
+            var document = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
+            var root = new XElement(
+                "Project",
+                new XElement("Import",
+                    new XAttribute("Project", PropsFileImport)));
+
+            document.Add(root);
+
+            var settings = new XmlWriterSettings
+            {
+                Encoding = Encoding.UTF8,
+                CloseOutput = true,
+                OmitXmlDeclaration = true,
+                Indent = true,
+                NewLineOnAttributes = false,
+                Async = true
+            };
+
+            using (var xmlWriter = GetXmlWriter(settings))
+            {
+                document.WriteTo(xmlWriter);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        private XmlWriter GetXmlWriter(XmlWriterSettings settings)
+        {
+            var fileStream = new FileStream(BuildTargetPath, FileMode.Create);
+            return XmlWriter.Create(fileStream, settings);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index 3d403100a6..e83d89a7f2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -20,6 +20,11 @@ Copyright (c) .NET Foundation. All rights reserved.
          * Current project.
          * Referenced project.
          * Referenced packages.
+       * GenerateStaticWebAssetsPackTargets: Includes the static web assets in the current project
+         under the 'staticwebassets' folder in the nuget package and generates and includes in the
+         package the appropriate .props files to support discovering the packaged static web assets.
+       * GetCurrentProjectStaticWebAssets: Called on each referenced project to retrieve the list of
+         static web assets in the project.
   -->
 
   <UsingTask
@@ -32,6 +37,16 @@ Copyright (c) .NET Foundation. All rights reserved.
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
     Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
 
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.GenerateStaticWebAsssetsPropsFile"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.StaticWebAssetsGeneratePackagePropsFile"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
   <PropertyGroup>
     <GenerateStaticWebAssetsManifestDependsOn>
       ResolveStaticWebAssetsInputs;
@@ -49,25 +64,76 @@ Copyright (c) .NET Foundation. All rights reserved.
       $(AssignTargetPathsDependsOn)
     </AssignTargetPathsDependsOn>
 
-    <ResolveStaticWebAssetsInputsDependsOn>
+    <ResolveStaticWebAssetsInputsDependsOn Condition="$(NoBuild) != 'true'">
       _ResolveStaticWebAssetsProjectReferences;
       $(ResolveStaticWebAssetsInputsDependsOn)
     </ResolveStaticWebAssetsInputsDependsOn>
 
+    <GenerateStaticWebAssetsPackTargetsDependsOn>
+      _CreateStaticWebAssetsCustomPropsCacheFile;
+      $(GenerateStaticWebAssetsPackTargetsDependsOn)
+    </GenerateStaticWebAssetsPackTargetsDependsOn>
+
+    <TargetsForTfmSpecificContentInPackage>
+      GenerateStaticWebAssetsPackTargets;
+      $(TargetsForTfmSpecificContentInPackage)
+    </TargetsForTfmSpecificContentInPackage>
+
+    <PackDependsOn>
+      _RemoveWebRootContentFromPackaging;
+      $(PackDependsOn)
+    </PackDependsOn>
+
   </PropertyGroup>
 
   <PropertyGroup>
-    <_GeneratedStaticWebAssetsInputsCacheFile>$(IntermediateOutputPath)$(TargetName).StaticWebAssets.cache</_GeneratedStaticWebAssetsInputsCacheFile>
-    <_GeneratedStaticWebAssetsDevelopmentManifest>$(IntermediateOutputPath)$(TargetName).StaticWebAssets.xml</_GeneratedStaticWebAssetsDevelopmentManifest>
+    <_StaticWebAssetsIntermediateOutputPath>$(IntermediateOutputPath)staticwebassets\</_StaticWebAssetsIntermediateOutputPath>
+
+    <!-- Development manifest generation -->
+    <_GeneratedStaticWebAssetsInputsCacheFile>$(_StaticWebAssetsIntermediateOutputPath)$(TargetName).StaticWebAssets.Manifest.cache</_GeneratedStaticWebAssetsInputsCacheFile>
+    <_GeneratedStaticWebAssetsDevelopmentManifest>$(_StaticWebAssetsIntermediateOutputPath)$(TargetName).StaticWebAssets.xml</_GeneratedStaticWebAssetsDevelopmentManifest>
+
+    <!-- Project packing generation -->
+    <_GeneratedStaticWebAssetsCustomPropsCacheFile>$(_StaticWebAssetsIntermediateOutputPath)$(TargetName).StaticWebAssets.Pack.cache</_GeneratedStaticWebAssetsCustomPropsCacheFile>
+
+    <!-- Temporary files -->
+    <_GeneratedStaticWebAssetsPropsFile>$(_StaticWebAssetsIntermediateOutputPath)msbuild.$(PackageId).Microsoft.AspNetCore.StaticWebAssets.props</_GeneratedStaticWebAssetsPropsFile>
+    <_GeneratedBuildPropsFile>$(_StaticWebAssetsIntermediateOutputPath)msbuild.build.$(PackageId).props</_GeneratedBuildPropsFile>
+    <_GeneratedBuildMultitargetingPropsFile>$(_StaticWebAssetsIntermediateOutputPath)msbuild.buildMultiTargeting.$(PackageId).props</_GeneratedBuildMultitargetingPropsFile>
+    <_GeneratedBuildTransitivePropsFile>$(_StaticWebAssetsIntermediateOutputPath)msbuild.buildTransitive.$(PackageId).props</_GeneratedBuildTransitivePropsFile>
+
+    <!-- Package relative import paths -->
+    <_StaticWebAssetsPropsFileImportPath>Microsoft.AspNetCore.StaticWebAssets.props</_StaticWebAssetsPropsFileImportPath>
+    <_StaticWebAssetsGeneratedBuildPropsFileImportPath>..\build\$(PackageId).props</_StaticWebAssetsGeneratedBuildPropsFileImportPath>
+    <_StaticWebAssetsGeneratedBuildMultiTargetingPropsFileImportPath>..\buildMultiTargeting\$(PackageId).props</_StaticWebAssetsGeneratedBuildMultiTargetingPropsFileImportPath>
+
   </PropertyGroup>
 
-  <Target 
+  <!-- Helper target invoked by other tasks below to ensure that the intermediate output path has the correct
+       shape for the intermediate output files that might be generated.
+  -->
+  <Target Name="_PrepareForStaticWebAssets">
+    <MakeDir
+      Directories="$(_StaticWebAssetsIntermediateOutputPath)"
+      Condition="!Exists('$(_StaticWebAssetsIntermediateOutputPath)')" />
+  </Target>
+
+  <!--
+    ============================================================
+                                        Static web assets development manifest generation targets
+
+    The main targets for generating a development manifest with information about the static web
+    assets found in referenced packages and projects.
+    ============================================================
+    -->
+
+  <Target
     Name="_CreateStaticWebAssetsInputsCacheFile"
-    DependsOnTargets="ResolveStaticWebAssetsInputs">
-    
+    DependsOnTargets="ResolveStaticWebAssetsInputs;_PrepareForStaticWebAssets">
+
     <ItemGroup>
-      <!-- 
-      This is the list of inputs that will be used for generating the manifest used during development. 
+      <!--
+      This is the list of inputs that will be used for generating the manifest used during development.
       -->
       <_ExternalStaticWebAsset
         Include="%(StaticWebAsset.Identity)"
@@ -82,10 +148,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="HashResult" PropertyName="_StaticWebAssetsCacheHash" />
     </Hash>
 
-    <WriteLinesToFile 
-      Lines="$(_StaticWebAssetsCacheHash)" 
-      File="$(_GeneratedStaticWebAssetsInputsCacheFile)" 
-      Overwrite="True" 
+    <WriteLinesToFile
+      Lines="$(_StaticWebAssetsCacheHash)"
+      File="$(_GeneratedStaticWebAssetsInputsCacheFile)"
+      Overwrite="True"
       WriteOnlyWhenDifferent="True" />
 
     <ItemGroup>
@@ -94,7 +160,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
-  <!-- 
+  <!--
     This target generates a manifest for development time that includes information
     about the base path for the referenced package and project static web assets. The
     manifest includes the content root and the base path for each of the referenced
@@ -104,21 +170,31 @@ Copyright (c) .NET Foundation. All rights reserved.
     root, but we don't check for duplicates on either of them.
      -->
 
-  <Target 
+  <Target
     Name="GenerateStaticWebAssetsManifest"
     Inputs="$(_GeneratedStaticWebAssetsInputsCacheFile)"
     Outputs="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
     DependsOnTargets="$(GenerateStaticWebAssetsManifestDependsOn)">
-  
-    <GenerateStaticWebAssetsManifest 
+
+    <GenerateStaticWebAssetsManifest
       ContentRootDefinitions="@(_ExternalStaticWebAsset)"
       TargetManifestPath="$(_GeneratedStaticWebAssetsDevelopmentManifest)" />
-  
+
       <!-- This is the list of inputs that will be used for generating the manifest used during development. -->
     <ItemGroup>
       <EmbeddedResource Condition="'@(_ExternalStaticWebAsset->Count())' != '0'"
         Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
         LogicalName="Microsoft.AspNetCore.StaticWebAssets.xml" />
+
+      <!-- Include it as content as we plan to avoid using an embedded file for the manifest -->
+      <Content
+        Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
+        Condition="'@(_ExternalStaticWebAsset->Count())' != '0'"
+        Link="$(TargetName).StaticWebAssets.xml">
+
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+      </Content>
     </ItemGroup>
 
     <ItemGroup>
@@ -127,6 +203,15 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
+  <!--
+    ============================================================
+                                        Static web assets discovery related targets
+
+    The main targets for discovering static web assets inside referenced packages, projects and
+    the current project.
+    ============================================================
+    -->
+
   <!-- This target collects all the StaticWebAssets from different sources:
        * The current project StaticWebAssets that come from wwwroot\** by default.
        * Assets from referenced projects that get retrieved invoking an MSBuild target on
@@ -134,7 +219,7 @@ Copyright (c) .NET Foundation. All rights reserved.
        * Assets from the referenced packages. These will be implicitly included when nuget
          restores the package and includes the package props file for the package.
   -->
-  <Target 
+  <Target
     Name="ResolveStaticWebAssetsInputs"
     DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)">
 
@@ -164,7 +249,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <_ThisProjectStaticWebAsset
         Include="$(MSBuildProjectDirectory)\wwwroot\**"
         Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-      <!-- 
+      <!--
         Should we promote 'wwwroot\**'' to a property?
         We don't want to capture any content outside the content root, that's why we don't do
         @(Content) here.
@@ -174,7 +259,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         <SourceType></SourceType>
         <!-- Identifier describing the source, the package id, the project name, empty for the current project.  -->
         <SourceId>$(PackageId)</SourceId>
-        <!-- 
+        <!--
           Full path to the content root for the item:
           * For packages it corresponds to %userprofile%/.nuget/packages/<<PackageId>>/<<PackageVersion>>/razorContent
           * For referenced projects it corresponds to <<FullProjectRefPath>>/wwwroot
@@ -214,7 +299,7 @@ Copyright (c) .NET Foundation. All rights reserved.
        the static assets for a given application. We do it this way so that we can
        pass additional build properties to compute the assets from the package when referenced
        as a project. For example, Identity uses this hook to extend the project reference and
-       pass in the bootstrap version to use. 
+       pass in the bootstrap version to use.
   -->
   <Target Name="_ResolveStaticWebAssetsProjectReferences"
     DependsOnTargets="ResolveReferences"
@@ -244,4 +329,198 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
+  <!--
+    ============================================================
+                                        Static web assets packing related targets
+
+    The main targets to enable auto-packing of static web assets.
+    ============================================================
+    -->
+
+  <!-- We need to remove any content item under wwwroot right before packing to prevent it from getting included
+       in the package as content or contentFiles. Unfortunately marking it with pack=false doesn't work as it also
+       prevents the content from being packed even though we are including it explictily in
+       GenerateStaticWebAssetsPackTargets
+   -->
+  <Target Name="_RemoveWebRootContentFromPackaging" DependsOnTargets="_CreateStaticWebAssetsCustomPropsCacheFile" >
+    <ItemGroup>
+      <Content Remove="@(_CurrentProjectStaticWebAsset->'wwwroot\%(RelativePath)')"  />
+    </ItemGroup>
+  </Target>
+
+  <Target
+    Name="_CreateStaticWebAssetsCustomPropsCacheFile"
+    DependsOnTargets="ResolveStaticWebAssetsInputs;_PrepareForStaticWebAssets">
+
+    <ItemGroup>
+      <!-- This is the list of inputs that will be used for generating the props file that will be packed with
+      the package.  -->
+      <_CurrentProjectStaticWebAsset
+        Include="@(StaticWebAsset)"
+        Condition="'%(SourceType)' == ''" />
+    </ItemGroup>
+
+    <Hash ItemsToHash="@(_CurrentProjectStaticWebAsset->'%(BasePath)%(SourceId)')">
+      <Output TaskParameter="HashResult" PropertyName="_StaticWebAssetsPropsFileHash" />
+    </Hash>
+
+    <WriteLinesToFile
+      Lines="$(_StaticWebAssetsPropsFileHash)"
+      File="$(_GeneratedStaticWebAssetsCustomPropsCacheFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_GeneratedStaticWebAssetsCustomPropsCacheFile)" />
+    </ItemGroup>
+
+  </Target>
+
+  <!-- This target makes sure that all static web assets for the current project get included
+       in the package under the folder staticwebassets and generates MSBuild props files to
+       ensure that consuming packages can discover and use the static web assets.
+       This target generates and includes a Microsoft.AspNetCore.StaticWebAssets.props file that
+       goes inside the build directory and describes the static web assets in the package as an
+       item group.
+       This target also generates and includes a $(PackageId).props file under the build, buildMultiTargeting
+       and buildTransitive folders that are setup so that:
+       * buildTransitive\$(PackageId).props simply imports buildMultitargeting\$(PackageId).props
+       * buildMultitargeting\$(PackageId).props simply imports build\$(PackageId).props
+       * build\$(PackageId).props simply imports Microsoft.AspNetCore.StaticWebAssets.props
+
+       We do it this way to preserve the ability of package authors to customize the package in any way
+       they see fit and to make sure the package works in all scenarios. Authors including custom MSBuild
+       targets into their packages are expected to disable the generation of $(PackageId).props files and
+       to manually import build\Microsoft.AspNetCore.StaticWebAssets.props in their custom props files.
+   -->
+  <Target
+    Name="GenerateStaticWebAssetsPackTargets"
+    DependsOnTargets="$(GenerateStaticWebAssetsPackTargetsDependsOn)"
+    Inputs="$(_GeneratedStaticWebAssetsCustomPropsCacheFile)"
+    Outputs="$(_GeneratedStaticWebAssetsPropsFile)">
+
+    <PropertyGroup>
+      <_CurrentProjectHasStaticWebAssets Condition="'@(_CurrentProjectStaticWebAsset->Count())' != '0'">true</_CurrentProjectHasStaticWebAssets>
+    </PropertyGroup>
+
+    <!-- Generates a props file that goes in build\Microsoft.AspNetCore.StaticWebAssets.props
+         and that describes the static web assets for the package.
+     -->
+    <GenerateStaticWebAsssetsPropsFile
+      Condition="'$(_CurrentProjectHasStaticWebAssets)' == 'true'"
+      StaticWebAssets="@(_CurrentProjectStaticWebAsset)"
+      TargetPropsFilePath="$(_GeneratedStaticWebAssetsPropsFile)" />
+
+    <!-- Generates a props file the goes in build\$(PackageId).props and that simply imports
+         build\Microsoft.AspNetCore.StaticWebAssets.props
+     -->
+    <StaticWebAssetsGeneratePackagePropsFile
+      Condition="'$(_CurrentProjectHasStaticWebAssets)' == 'true'"
+      PropsFileImport="$(_StaticWebAssetsPropsFileImportPath)"
+      BuildTargetPath="$(_GeneratedBuildPropsFile)" />
+
+    <!-- Generates a props file the goes in buildMultiTargeting\$(PackageId).props and that simply imports
+         build\$(PackageId).props
+     -->
+    <StaticWebAssetsGeneratePackagePropsFile
+      Condition="'$(_CurrentProjectHasStaticWebAssets)' == 'true'"
+      PropsFileImport="$(_StaticWebAssetsGeneratedBuildPropsFileImportPath)"
+      BuildTargetPath="$(_GeneratedBuildMultitargetingPropsFile)" />
+
+    <!-- Generates a props file the goes in buildTransitive\$(PackageId).props and that simply imports
+         buildMultiTargeting\$(PackageId)
+     -->
+    <StaticWebAssetsGeneratePackagePropsFile
+      Condition="'$(_CurrentProjectHasStaticWebAssets)' == 'true'"
+      PropsFileImport="$(_StaticWebAssetsGeneratedBuildMultiTargetingPropsFileImportPath)"
+      BuildTargetPath="$(_GeneratedBuildTransitivePropsFile)" />
+
+    <!-- All files potentially created within this target -->
+    <ItemGroup>
+      <FileWrites Include="$(_GeneratedStaticWebAssetsPropsFile)" />
+      <FileWrites Include="$(_GeneratedBuildPropsFile)" />
+      <FileWrites Include="$(_GeneratedBuildMultitargetingPropsFile)" />
+      <FileWrites Include="$(_GeneratedBuildTransitivePropsFile)" />
+    </ItemGroup>
+
+    <!-- All files that go into the nuget package -->
+    <ItemGroup Condition="'$(_CurrentProjectHasStaticWebAssets)' == 'true'">
+
+      <!-- MSBuild prop files -->
+
+      <TfmSpecificPackageFile Include="$(_GeneratedStaticWebAssetsPropsFile)"
+        Condition="'$(DisableStaticWebAssetsBuildPropsFileGeneration)' == ''">
+
+        <PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.props</PackagePath>
+      </TfmSpecificPackageFile>
+
+      <TfmSpecificPackageFile Include="$(_GeneratedBuildPropsFile)"
+        Condition="'$(StaticWebAssetsDisableProjectBuildPropsFileGeneration)' == ''">
+
+        <PackagePath>build\$(PackageId).props</PackagePath>
+      </TfmSpecificPackageFile>
+
+      <TfmSpecificPackageFile Include="$(_GeneratedBuildMultitargetingPropsFile)"
+        Condition="'$(StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration)' == ''">
+
+        <PackagePath>buildMultiTargeting\$(PackageId).props</PackagePath>
+      </TfmSpecificPackageFile>
+
+      <TfmSpecificPackageFile Include="$(_GeneratedBuildTransitivePropsFile)"
+        Condition="'$(StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration)' == ''">
+
+        <PackagePath>buildTransitive\$(PackageId).props</PackagePath>
+      </TfmSpecificPackageFile>
+
+      <!-- Project file contents -->
+
+      <TfmSpecificPackageFile Include="%(_CurrentProjectStaticWebAsset.Identity)">
+        <PackagePath>staticwebassets\%(_CurrentProjectStaticWebAsset.RelativePath)</PackagePath>
+      </TfmSpecificPackageFile>
+    </ItemGroup>
+
+  </Target>
+
+
+  <!--
+    ============================================================
+                                        Static web assets publish related targets
+
+    The main targets for publishing static web assets coming from referenced projects
+    and packages.
+    ============================================================
+    -->
+
+    <!--
+    Called after ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when
+    publishing the project to get a list of files to the output directory.
+  -->
+  <Target
+    Name="_StaticWebAssetsComputeFilesToPublish"
+    AfterTargets="ComputeRefAssembliesToPublish"
+    DependsOnTargets="ResolveStaticWebAssetsInputs">
+
+    <ItemGroup>
+
+      <!-- Filter the static web assets foreign to the project and then add them to the list of resolved
+           files to publish.
+       -->
+      <_ExternalPublishStaticWebAsset
+        Include="%(StaticWebAsset.FullPath)"
+        Condition="'%(SourceType)' != ''">
+
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        <RelativePath>$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)','$([MSBuild]::NormalizePath('wwwroot\%(BasePath)\%(RelativePath)'))'))</RelativePath>
+
+      </_ExternalPublishStaticWebAsset>
+
+      <!-- Remove any existing external static web asset that might have been added as part of the
+           regular publish pipeline. -->
+      <ResolvedFileToPublish Remove="@(_ExternalPublishStaticWebAsset)" />
+
+      <ResolvedFileToPublish Include="@(_ExternalPublishStaticWebAsset)" />
+    </ItemGroup>
+
+  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index c1a728ae5b..91dd8fc557 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -75,7 +75,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </ItemGroup>
 
   <PropertyGroup>
-    <EnableRazorSdkContent Condition=" '$(UsingMicrosoftNETSdkWeb)' == '' ">true</EnableRazorSdkContent>
+    <EnableRazorSdkContent Condition="'$(EnableRazorSdkContent)' =='' and '$(UsingMicrosoftNETSdkWeb)' == '' ">true</EnableRazorSdkContent>
   </PropertyGroup>
 
   <Import 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 98920017b4..2a39eddb7a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -57,6 +57,10 @@ Copyright (c) .NET Foundation. All rights reserved.
         '$(RazorLangVersion)' == 'Latest' OR
         '$(RazorLangVersion)' == 'Experimental' OR
         ('$(RazorLangVersion)' != '' AND '$(RazorLangVersion)' >= '3.0')">true</_Targeting30OrNewerRazorLangVersion>
+
+    <!-- Controls whether or not the static web assets feature is enabled. By default is enabled for netcoreapp3.0
+         applications and RazorLangVersion 3 or above. -->
+    <StaticWebAssetsEnabled Condition="'$(StaticWebAssetsEnabled)' == ''">$(_Targeting30OrNewerRazorLangVersion)</StaticWebAssetsEnabled>
   </PropertyGroup>
 
 
@@ -338,7 +342,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="Microsoft.NET.Sdk.Razor.Component.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
 
-  <Import Project="Microsoft.NET.Sdk.Razor.StaticWebAssets.targets" Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'" />
+  <Import Project="Microsoft.NET.Sdk.Razor.StaticWebAssets.targets" Condition="'$(StaticWebAssetsEnabled)' == 'true'" />
 
   <Import Project="Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets" />
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateStaticWebAssetsPropsFileTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateStaticWebAssetsPropsFileTest.cs
new file mode 100644
index 0000000000..af181b23dc
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateStaticWebAssetsPropsFileTest.cs
@@ -0,0 +1,433 @@
+// 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.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Razor.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class GenerateStaticWebAssetsPropsFileTest
+    {
+        [Fact]
+        public void Fails_WhenStaticWebAsset_DoesNotContainSourceType()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'SourceType' for '{Path.Combine("wwwroot", "js", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_DoesNotContainSourceId()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'SourceId' for '{Path.Combine("wwwroot", "js", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_DoesNotContainContentRoot()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'ContentRoot' for '{Path.Combine("wwwroot", "js", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_DoesNotContainBasePath()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'BasePath' for '{Path.Combine("wwwroot", "js", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_DoesNotContainRelativePath()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Missing required metadata 'RelativePath' for '{Path.Combine("wwwroot", "js", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_HaveDifferentSourceType()
+        {
+            // Arrange
+            var expectedError = "Static web assets have different 'SourceType' metadata values " +
+                "'' and 'Package' " +
+                $"for '{Path.Combine("wwwroot", "js", "sample.js")}' and '{Path.Combine("wwwroot", "css", "site.css")}'.";
+
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    }),
+                    CreateItem(Path.Combine("wwwroot","css","site.css"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "Package",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("css", "site.css"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(expectedError, message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_HaveDifferentSourceId()
+        {
+            // Arrange
+            var expectedError = "Static web assets have different 'SourceId' metadata values " +
+                "'MyLibrary' and 'MyLibrary2' " +
+                $"for '{Path.Combine("wwwroot", "js", "sample.js")}' and '{Path.Combine("wwwroot", "css", "site.css")}'.";
+
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    }),
+                    CreateItem(Path.Combine("wwwroot","css","site.css"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary2",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("css", "site.css"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(expectedError, message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_HaveDifferentContentRoot()
+        {
+            // Arrange
+            var expectedError = "Static web assets have different 'ContentRoot' metadata values " +
+                @"'$(MSBuildThisFileDirectory)..\staticwebassets' and '..\staticwebassets' " +
+                $"for '{Path.Combine("wwwroot", "js", "sample.js")}' and '{Path.Combine("wwwroot", "css", "site.css")}'.";
+
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    }),
+                    CreateItem(Path.Combine("wwwroot","css","site.css"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("css", "site.css"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(expectedError, message);
+        }
+
+        [Fact]
+        public void Fails_WhenStaticWebAsset_HaveDifferentBasePath()
+        {
+            // Arrange
+            var expectedError = "Static web assets have different 'BasePath' metadata values " +
+                "'_content/mylibrary' and '_content/mylibrary2' " +
+                $"for '{Path.Combine("wwwroot", "js", "sample.js")}' and '{Path.Combine("wwwroot", "css", "site.css")}'.";
+
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new GenerateStaticWebAsssetsPropsFile
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    }),
+                    CreateItem(Path.Combine("wwwroot","css","site.css"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary2",
+                        ["RelativePath"] = Path.Combine("css", "site.css"),
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal(expectedError, message);
+        }
+
+        [Fact]
+        public void WritesPropsFile_WhenThereIsAtLeastOneStaticAsset()
+        {
+            // Arrange
+            var file = Path.GetTempFileName();
+            var expectedDocument = @"<Project>
+  <ItemGroup>
+    <StaticWebAsset Include=""$(MSBuildThisFileDirectory)..\staticwebassets\**"">
+      <SourceType>Package</SourceType>
+      <SourceId>MyLibrary</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/mylibrary</BasePath>
+      <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
+    </StaticWebAsset>
+  </ItemGroup>
+</Project>";
+
+            try
+            {
+                var buildEngine = new Mock<IBuildEngine>();
+
+                var task = new GenerateStaticWebAsssetsPropsFile
+                {
+                    BuildEngine = buildEngine.Object,
+                    TargetPropsFilePath = file,
+                    StaticWebAssets = new TaskItem[]
+                    {
+                    CreateItem(Path.Combine("wwwroot","js","sample.js"), new Dictionary<string,string>
+                    {
+                        ["SourceType"] = "",
+                        ["SourceId"] = "MyLibrary",
+                        ["ContentRoot"] = @"$(MSBuildThisFileDirectory)..\staticwebassets",
+                        ["BasePath"] = "_content/mylibrary",
+                        ["RelativePath"] = Path.Combine("js", "sample.js"),
+                    }),
+                    }
+                };
+
+                // Act
+                var result = task.Execute();
+
+                // Assert
+                Assert.True(result);
+                var document = File.ReadAllText(file);
+                Assert.Equal(expectedDocument, document);
+            }
+            finally
+            {
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+            }
+        }
+
+        private static TaskItem CreateItem(
+            string spec,
+            IDictionary<string, string> metadata)
+        {
+            var result = new TaskItem(spec);
+            foreach (var (key, value) in metadata)
+            {
+                result.SetMetadata(key, value);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index bdbfa9c25d..3676f093e6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -485,6 +485,40 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        // This method extracts the nupkg to a fixed directory path. To avoid the extra work of
+        // cleaning up after each invocation, this method accepts multiple files.
+        public static void NupkgDoesNotContain(MSBuildResult result, string nupkgPath, params string[] filePaths)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (nupkgPath == null)
+            {
+                throw new ArgumentNullException(nameof(nupkgPath));
+            }
+
+            if (filePaths == null)
+            {
+                throw new ArgumentNullException(nameof(filePaths));
+            }
+
+            nupkgPath = Path.Combine(result.Project.DirectoryPath, nupkgPath);
+            FileExists(result, nupkgPath);
+
+            var unzipped = Path.Combine(result.Project.DirectoryPath, Path.GetFileNameWithoutExtension(nupkgPath));
+            ZipFile.ExtractToDirectory(nupkgPath, unzipped);
+
+            foreach (var filePath in filePaths)
+            {
+                if (File.Exists(Path.Combine(unzipped, filePath)))
+                {
+                    throw new NupkgFileFoundException(result, nupkgPath, filePath);
+                }
+            }
+        }
+
         public static void AssemblyContainsType(MSBuildResult result, string assemblyPath, string fullTypeName)
         {
             if (result == null)
@@ -872,5 +906,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             protected override string Heading => $"File: '{FilePath}' was not found was not found in {NupkgPath}.";
         }
+
+        private class NupkgFileFoundException : MSBuildXunitException
+        {
+            public NupkgFileFoundException(MSBuildResult result, string nupkgPath, string filePath)
+                : base(result)
+            {
+                NupkgPath = nupkgPath;
+                FilePath = filePath;
+            }
+
+            public string FilePath { get; }
+
+            public string NupkgPath { get; }
+
+            protected override string Heading => $"File: '{FilePath}' was found in {NupkgPath}.";
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index be0a44c78b..f1502e0a37 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -1,6 +1,7 @@
 // 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.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
@@ -176,5 +177,150 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
                 Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
         }
+
+        [Fact]
+        [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
+        public async Task Pack_IncludesStaticWebAssets()
+        {
+            var result = await DotnetMSBuild("Pack");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            Assert.FileExists(result, OutputPath, "PackageLibraryDirectDependency.dll");
+
+            Assert.NupkgContains(
+                result,
+                Path.Combine("..", "TestPackageRestoreSource", "PackageLibraryDirectDependency.1.0.0.nupkg"),
+                filePaths: new[]
+                {
+                    Path.Combine("staticwebassets", "js", "pkg-direct-dep.js"),
+                    Path.Combine("staticwebassets", "css", "site.css"),
+                    Path.Combine("build", "Microsoft.AspNetCore.StaticWebAssets.props"),
+                    Path.Combine("build", "PackageLibraryDirectDependency.props"),
+                    Path.Combine("buildMultiTargeting", "PackageLibraryDirectDependency.props"),
+                    Path.Combine("buildTransitive", "PackageLibraryDirectDependency.props")
+                });
+        }
+
+        [Fact]
+        [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
+        public async Task Pack_StaticWebAssetsEnabledFalse_DoesNotPackAnyStaticWebAssets()
+        {
+            var result = await DotnetMSBuild("Pack", "/p:StaticWebAssetsEnabled=false");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            Assert.FileExists(result, OutputPath, "PackageLibraryDirectDependency.dll");
+
+            Assert.NupkgDoesNotContain(
+                result,
+                Path.Combine("..", "TestPackageRestoreSource", "PackageLibraryDirectDependency.1.0.0.nupkg"),
+                filePaths: new[]
+                {
+                    Path.Combine("staticwebassets", "js", "pkg-direct-dep.js"),
+                    Path.Combine("staticwebassets", "css", "site.css"),
+                    Path.Combine("build", "Microsoft.AspNetCore.StaticWebAssets.props"),
+                    Path.Combine("build", "PackageLibraryDirectDependency.props"),
+                    Path.Combine("buildMultiTargeting", "PackageLibraryDirectDependency.props"),
+                    Path.Combine("buildTransitive", "PackageLibraryDirectDependency.props")
+                });
+        }
+
+        [Fact]
+        [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
+        public async Task Pack_NoBuild_IncludesStaticWebAssets()
+        {
+            var result = await DotnetMSBuild("Build");
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true");
+            Assert.BuildPassed(pack, allowWarnings: true);
+
+            Assert.FileExists(pack, OutputPath, "PackageLibraryDirectDependency.dll");
+
+            Assert.NupkgContains(
+                pack,
+                Path.Combine("..", "TestPackageRestoreSource", "PackageLibraryDirectDependency.1.0.0.nupkg"),
+                filePaths: new[]
+                {
+                    Path.Combine("staticwebassets", "js", "pkg-direct-dep.js"),
+                    Path.Combine("staticwebassets", "css", "site.css"),
+                    Path.Combine("build", "Microsoft.AspNetCore.StaticWebAssets.props"),
+                    Path.Combine("build", "PackageLibraryDirectDependency.props"),
+                    Path.Combine("buildMultiTargeting", "PackageLibraryDirectDependency.props"),
+                    Path.Combine("buildTransitive", "PackageLibraryDirectDependency.props")
+                });
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task Pack_DoesNotIncludeAnyCustomPropsFiles_WhenNoStaticAssetsAreAvailable()
+        {
+            MSBuildIntegrationTestBase.TargetFramework = "netstandard2.0";
+
+            var result = await DotnetMSBuild("Pack");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            Assert.FileExists(result, OutputPath, "ComponentLibrary.dll");
+
+            Assert.NupkgDoesNotContain(
+                result,
+                Path.Combine("bin", Configuration, "ComponentLibrary.1.0.0.nupkg"),
+                filePaths: new[]
+                {
+                    Path.Combine("build", "Microsoft.AspNetCore.StaticWebAssets.props"),
+                    Path.Combine("build", "ComponentLibrary.props"),
+                    Path.Combine("buildMultiTargeting", "ComponentLibrary.props"),
+                    Path.Combine("buildTransitive", "ComponentLibrary.props")
+                });
+        }
+
+        [Fact]
+        [InitializeTestProject("PackageLibraryTransitiveDependency")]
+        public async Task Pack_Incremental_DoesNotRegenerateCacheAndPropsFiles()
+        {
+            TargetFramework = "netstandard2.0";
+            var result = await DotnetMSBuild("Pack");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            Assert.FileExists(result, OutputPath, "PackageLibraryTransitiveDependency.dll");
+
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "msbuild.PackageLibraryTransitiveDependency.Microsoft.AspNetCore.StaticWebAssets.props");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "msbuild.build.PackageLibraryTransitiveDependency.props");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "msbuild.buildMultiTargeting.PackageLibraryTransitiveDependency.props");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "msbuild.buildTransitive.PackageLibraryTransitiveDependency.props");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "PackageLibraryTransitiveDependency.StaticWebAssets.Pack.cache");
+
+            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath, "staticwebassets");
+            var thumbPrints = new Dictionary<string, FileThumbPrint>();
+            var thumbPrintFiles = new[]
+            {
+                Path.Combine(directoryPath, "msbuild.PackageLibraryTransitiveDependency.Microsoft.AspNetCore.StaticWebAssets.props"),
+                Path.Combine(directoryPath, "msbuild.build.PackageLibraryTransitiveDependency.props"),
+                Path.Combine(directoryPath, "msbuild.buildMultiTargeting.PackageLibraryTransitiveDependency.props"),
+                Path.Combine(directoryPath, "msbuild.buildTransitive.PackageLibraryTransitiveDependency.props"),
+                Path.Combine(directoryPath, "PackageLibraryTransitiveDependency.StaticWebAssets.Pack.cache"),
+            };
+
+            foreach (var file in thumbPrintFiles)
+            {
+                var thumbprint = GetThumbPrint(file);
+                thumbPrints[file] = thumbprint;
+            }
+
+            // Act
+            var incremental = await DotnetMSBuild("Pack");
+
+            // Assert
+            Assert.BuildPassed(incremental, allowWarnings: true);
+
+            foreach (var file in thumbPrintFiles)
+            {
+                var thumbprint = GetThumbPrint(file);
+                Assert.Equal(thumbPrints[file], thumbprint);
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 653231d328..f8afa92f24 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -43,18 +43,73 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache");
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // Skip this check on mac as the CI seems to use a somewhat different path on OSX.
+                // This check works just fine on a local OSX instance, but the CI path seems to require prepending /private.
+                // There is nothing OS specific about publishing this file, so the chances of this breaking are infinitesimal.
+                Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            }
 
             var path = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.dll");
             var assembly = Assert.ContainsEmbeddedResource(path, "Microsoft.AspNetCore.StaticWebAssets.xml");
             using (var reader = new StreamReader(assembly))
             {
                 var data = await reader.ReadToEndAsync();
+                Output.WriteLine("Manifest:");
+                Output.WriteLine(data);
                 Assert.Equal(expectedManifest, data);
             }
         }
 
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        public async Task Publish_CopiesStaticWebAssetsToDestinationFolder()
+        {
+            var result = await DotnetMSBuild("Publish", "/restore");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.v4.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "css", "site.css"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "js", "project-direct-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "css", "site.css"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "js", "pkg-direct-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarytransitivedependency", "js", "pkg-transitive-dep.js"));
+
+            // Validate that static web assets don't get published as content too on their regular path
+            Assert.FileDoesNotExist(result, PublishOutputPath, Path.Combine("wwwroot", "js", "project-transitive-dep.js"));
+            Assert.FileDoesNotExist(result, PublishOutputPath, Path.Combine("wwwroot", "js", "project-transitive-dep.v4.js"));
+
+            // Validate that the manifest never gets copied
+            Assert.FileDoesNotExist(result, PublishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+        }
+
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        public async Task Publish_WithBuildReferencesDisabled_CopiesStaticWebAssetsToDestinationFolder()
+        {
+            var build = await DotnetMSBuild("Build", "/restore");
+
+            Assert.BuildPassed(build);
+
+            var publish = await DotnetMSBuild("Publish", "/p:BuildProjectReferences=false");
+
+            Assert.BuildPassed(publish);
+
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.v4.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "css", "site.css"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "js", "project-direct-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "css", "site.css"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "js", "pkg-direct-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarytransitivedependency", "js", "pkg-transitive-dep.js"));
+        }
+
+
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_DoesNotEmbedManifestWhen_NoStaticResourcesAvailable()
@@ -64,8 +119,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.StaticWebAssets.xml");
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.StaticWebAssets.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "SimpleMvc.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "SimpleMvc.StaticWebAssets.Manifest.cache");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.StaticWebAssets.xml");
 
             var path = Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
             Assert.DoesNotContainEmbeddedResource(path, "SimpleMvc.StaticWebAssets.xml");
@@ -80,16 +136,16 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache");
 
             var cleanResult = await DotnetMSBuild("Clean");
 
             Assert.BuildPassed(cleanResult);
 
             // Clean should delete the manifest and the cache.
-            Assert.FileDoesNotExist(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
-            Assert.FileDoesNotExist(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
         [Fact]
@@ -104,15 +160,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache");
 
-            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
+            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath, "staticwebassets");
             var thumbPrints = new Dictionary<string, FileThumbPrint>();
             var thumbPrintFiles = new[]
             {
                 Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml"),
-                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache"),
+                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache"),
             };
 
             foreach (var file in thumbPrintFiles)
@@ -151,15 +207,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             // GenerateStaticWebAssetsManifest should generate the manifest and the cache.
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
-            Assert.FileExists(result, IntermediateOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            Assert.FileExists(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache");
 
-            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
+            var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath, "staticwebassets");
             var thumbPrints = new Dictionary<string, FileThumbPrint>();
             var thumbPrintFiles = new[]
             {
                 Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml"),
-                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.cache"),
+                Path.Combine(directoryPath, "AppWithPackageAndP2PReference.StaticWebAssets.Manifest.cache"),
             };
 
             foreach (var file in thumbPrintFiles)
@@ -201,17 +257,17 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var restorePath = LocalNugetPackagesCacheTempPath;
             var projects = new[]
             {
-                Path.Combine(restorePath, "packagelibrarytransitivedependency", "1.0.0", "buildTransitive", "..", "razorContent") + Path.DirectorySeparatorChar,
-                Path.Combine(restorePath, "packagelibrarydirectdependency", "1.0.0", "build", "..", "razorContent") + Path.DirectorySeparatorChar,
+                Path.Combine(restorePath, "packagelibrarytransitivedependency", "1.0.0", "build", "..", "staticwebassets") + Path.DirectorySeparatorChar,
+                Path.Combine(restorePath, "packagelibrarydirectdependency", "1.0.0", "build", "..", "staticwebassets") + Path.DirectorySeparatorChar,
                 Path.GetFullPath(Path.Combine(source, "ClassLibrary", "wwwroot")) + Path.DirectorySeparatorChar,
                 Path.GetFullPath(Path.Combine(source, "ClassLibrary2", "wwwroot")) + Path.DirectorySeparatorChar
             };
 
             return $@"<StaticWebAssets Version=""1.0"">
-  <ContentRoot BasePath=""_content/PackageLibraryTransitiveDependency"" Path=""{projects[0]}"" />
-  <ContentRoot BasePath=""_content/PackageLibraryDirectDependency"" Path=""{projects[1]}"" />
   <ContentRoot BasePath=""_content/classlibrary"" Path=""{projects[2]}"" />
   <ContentRoot BasePath=""_content/classlibrary2"" Path=""{projects[3]}"" />
+  <ContentRoot BasePath=""_content/packagelibrarydirectdependency"" Path=""{projects[1]}"" />
+  <ContentRoot BasePath=""_content/packagelibrarytransitivedependency"" Path=""{projects[0]}"" />
 </StaticWebAssets>";
         }
     }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/StaticWebAssetsGeneratePackagePropsFileTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/StaticWebAssetsGeneratePackagePropsFileTest.cs
new file mode 100644
index 0000000000..192462fb9b
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/StaticWebAssetsGeneratePackagePropsFileTest.cs
@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Tasks;
+using Microsoft.Build.Framework;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class StaticWebAssetsGeneratePackagePropsFileTest
+    {
+        [Fact]
+        public void WritesPropsFile_WithProvidedImportPath()
+        {
+            // Arrange
+            var file = Path.GetTempFileName();
+            var expectedDocument = @"<Project>
+  <Import Project=""Microsoft.AspNetCore.StaticWebAssets.props"" />
+</Project>";
+
+            try
+            {
+                var buildEngine = new Mock<IBuildEngine>();
+
+                var task = new StaticWebAssetsGeneratePackagePropsFile
+                {
+                    BuildEngine = buildEngine.Object,
+                    PropsFileImport="Microsoft.AspNetCore.StaticWebAssets.props",
+                    BuildTargetPath=file
+                };
+
+                // Act
+                var result = task.Execute();
+
+                // Assert
+                Assert.True(result);
+                var document = File.ReadAllText(file);
+                Assert.Equal(expectedDocument, document);
+            }
+            finally
+            {
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
index 075a8e6852..eacc72651e 100644
--- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
@@ -36,9 +36,9 @@
   <!-- Test Placeholder -->
 
   <ItemGroup>
-    <Content Include="build\**" Pack="true" PackagePath="build" />
+    <!-- <Content Include="build\**" Pack="true" PackagePath="build" /> -->
     <!-- We will remove the line below when we do the item to support packing -->
-    <Content Update="wwwroot\**" Pack="true" PackagePath="razorContent" />
+    <!-- <Content Update="wwwroot\**" Pack="true" PackagePath="razorContent" /> -->
     <ProjectReference Include="..\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" />
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props b/src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props
deleted file mode 100644
index eaa14f2c3a..0000000000
--- a/src/Razor/test/testassets/PackageLibraryDirectDependency/build/PackageLibraryDirectDependency.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <ItemGroup>
-    <StaticWebAsset Include="$(MSBuildThisFileDirectory)..\razorContent\**">
-      <SourceType>Package</SourceType>
-      <SourceId>PackageLibraryDirectDependency</SourceId>
-      <ContentRoot>$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)..\razorContent'))</ContentRoot>
-      <BasePath>_content\PackageLibraryDirectDependency</BasePath>
-      <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
-    </StaticWebAsset>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
index e4ac49a002..a83ad7086e 100644
--- a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
@@ -6,6 +6,7 @@
 
   <PropertyGroup>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -35,10 +36,4 @@
 
   <!-- Test Placeholder -->
 
-  <ItemGroup>
-    <Content Include="build\**" Pack="true" PackagePath="buildTransitive" />
-    <!-- We will remove the line below when we do the item to support packing -->
-    <Content Update="wwwroot\**" Pack="true" PackagePath="razorContent" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props
deleted file mode 100644
index 64cdf1337b..0000000000
--- a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/build/PackageLibraryTransitiveDependency.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <ItemGroup>
-    <StaticWebAsset Include="$(MSBuildThisFileDirectory)..\razorContent\**">
-      <SourceType>Package</SourceType>
-      <SourceId>PackageLibraryTransitiveDependency</SourceId>
-      <ContentRoot>$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)..\razorContent'))</ContentRoot>
-      <BasePath>_content\PackageLibraryTransitiveDependency</BasePath>
-      <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
-    </StaticWebAsset>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From 5c59b7841584abdd5ad0c49fa7fd0bd849ae2486 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 31 May 2019 15:13:57 -0700
Subject: [PATCH 170/337] Allow UpToDateReloadFileTypes to be modified by
 packages \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/81c2e03bc35bad5c2d8f33fc367106cc817e0cbc

---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets         |  2 +-
 .../netstandard2.0/Sdk.Razor.CurrentVersion.props      |  6 ++++++
 .../netstandard2.0/Sdk.Razor.CurrentVersion.targets    | 10 ++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index a9a000aad3..f50984d5f1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -17,7 +17,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Defines the list of file extensions that VS will monitor to reload the application.
       We'll only define these for C# projects targeting RazorLangVersion 3.0 or later, and let VS use defaults in other cases.
     -->
-    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true'">$(UpToDateReloadFileTypes);.cs;.razor;.resx;.cshtml</UpToDateReloadFileTypes>
+    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(RazorUpToDateReloadFileTypes)' == ''">$(UpToDateReloadFileTypes);$(RazorUpToDateReloadFileTypes)</UpToDateReloadFileTypes>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 91dd8fc557..60cc8fecc1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -65,6 +65,12 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- Determines if the refs folder is produced as part of build \ publish -->
     <PreserveCompilationReferences>false</PreserveCompilationReferences>
+
+    <!--
+    List of file extensions that will cause VS to restart the application when RazorSDK is effective.
+    This property affects C# projects targeting 3.0 or later.
+    -->
+    <RazorUpToDateReloadFileTypes>.cs;.razor;.resx;.cshtml</RazorUpToDateReloadFileTypes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true'">
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 2a39eddb7a..12fce1cbdf 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -846,6 +846,16 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="$(RazorDesignTimeTargets)" />
 
+  <PropertyGroup>
+    <!--
+      Defines the list of file extensions that VS will monitor to reload the application.
+      We'll only define these for C# projects targeting RazorLangVersion 3.0 or later, and let VS use defaults in other cases.
+
+      This property can be removed after the next insertion in to VS.
+    -->
+    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(RazorUpToDateReloadFileTypes)' == ''">$(RazorUpToDateReloadFileTypes)</UpToDateReloadFileTypes>
+  </PropertyGroup>
+
   <!--
     This is a hook to import a set of targets after the Razor targets. By default this is unused.
   -->

From 9d8e9fb3a7c2fac5e5b7904e93f1a4601e6aa368 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 1 Jun 2019 08:10:10 -0700
Subject: [PATCH 171/337] Allow file watching with dotnet-watch \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/42d3a88fed29364a261750a99b03cae7a22ded70

---
 .../Sdk.Razor.CurrentVersion.targets          | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 12fce1cbdf..880e079e61 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -15,7 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <EnableDefaultContentItems Condition=" '$(EnableDefaultContentItems)' == '' ">true</EnableDefaultContentItems>
   </PropertyGroup>
 
-  <!-- 
+  <!--
     Targets supporting Razor MSBuild integration. Contain support for generating C# code using Razor
     and including the generated code in the project lifecycle, including compiling, publishing and producing
     nuget packages.
@@ -165,7 +165,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </PropertyGroup>
 
-  <!-- 
+  <!--
     Default values for properties that affect Razor targets to the standard build lifecycle.
   -->
   <PropertyGroup Condition="'$(RazorCompileOnBuild)'=='' AND '$(Language)'=='C#'">
@@ -223,9 +223,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PreserveCompilationReferences Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</PreserveCompilationReferences>
     <PreserveCompilationReferences Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</PreserveCompilationReferences>
 
-    <!-- 
+    <!--
       We can't set the actual default value here due to evaluation order (depends on $(OutDir)).
-      
+
       This handles a compatibility case with MVC Precompilation.
     -->
     <RazorOutputPath Condition="'$(MvcRazorOutputPath)'!=''">$([MSBuild]::EnsureTrailingSlash('$(MvcRazorOutputPath)'))</RazorOutputPath>
@@ -233,7 +233,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!--
       Configures whether all of the @(RazorGenerate) items will be added as embedded files to the produced assembly.
 
-      When true, everything in @(RazorGenerate) will be added to @(RazorEmbeddedFiles) and passed to CSC.  
+      When true, everything in @(RazorGenerate) will be added to @(RazorEmbeddedFiles) and passed to CSC.
     -->
     <EmbedRazorGenerateSources Condition="'$(MvcRazorEmbedViewSources)'!=''">$(MvcRazorEmbedViewSources)</EmbedRazorGenerateSources>
     <EmbedRazorGenerateSources Condition="'$(EmbedRazorGenerateSources)'==''">false</EmbedRazorGenerateSources>
@@ -321,6 +321,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <UpToDateCheckBuilt Include="@(RazorIntermediateAssembly)"
       Condition="'$(RazorCompileOnBuild)'=='true' AND '@(Content->WithMetadataValue('Extension', '.cshtml'))' != ''" />
+
+    <!-- Set up watchers for dotnet-watch -->
+    <Watch Include="@(Content->WithMetadataValue('Extension', '.razor'))" />
+
+    <Watch Include="@(Content->WithMetadataValue('Extension', '.cshtml'))"
+      Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(AddCshtmlFilesToDotNetWatchList)' != 'false'" />
   </ItemGroup>
 
   <!--
@@ -348,7 +354,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets" Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'" />
 
-  <!-- 
+  <!--
     These are the targets that actually do compilation using CSC, separated from the main file for ease of maintenance.
 
     RazorCoreCompile should be defined there.
@@ -373,9 +379,9 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target Name="RazorCompile" DependsOnTargets="$(RazorCompileDependsOn)">
   </Target>
 
-  <!-- 
+  <!--
     Computes the applicable @(ResolvedRazorConfiguration) and @(ResolvedRazorExtension) items that match the project's
-    configuration. 
+    configuration.
   -->
   <Target Name="ResolveRazorConfiguration">
     <ItemGroup Condition="'$(RazorDefaultConfiguration)'!=''">
@@ -411,8 +417,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     Gets assembly attributes in support for Razor runtime code generation. This is a set of standard
     metadata attributes (defined in Microsoft.AspNetCore.Razor.Runtime) that capture the build-time
     Razor configuration of an application to be used at runtime.
-    
-    This allows the project file to act as the source of truth for the applicable Razor configuration regardless 
+
+    This allows the project file to act as the source of truth for the applicable Razor configuration regardless
     of how Razor is used.
 
     The SDK expects configurations that use runtime compilation to set $(GenerateRazorHostingAssemblyInfo) to true,
@@ -469,13 +475,13 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!--
       Ideally we want to able to update all Content items that also appear in RazorGenerate to have
-      CopyToPublishDirectory=Never. However, there isn't a simple way to do this (https://github.com/Microsoft/msbuild/issues/1618). 
+      CopyToPublishDirectory=Never. However, there isn't a simple way to do this (https://github.com/Microsoft/msbuild/issues/1618).
       Instead, we'll update all cshtml Content items when EnableDefaultRazorGenerateItems=true and Razor Sdk is used for publishing.
     -->
     <ItemGroup Condition="
-      '$(EnableDefaultRazorGenerateItems)'=='true' and 
-      '$(CopyRazorGenerateFilesToPublishDirectory)'=='false' and 
-      '$(ResolvedRazorCompileToolset)'=='RazorSdk' and 
+      '$(EnableDefaultRazorGenerateItems)'=='true' and
+      '$(CopyRazorGenerateFilesToPublishDirectory)'=='false' and
+      '$(ResolvedRazorCompileToolset)'=='RazorSdk' and
       '$(RazorCompileOnPublish)'=='true'">
 
       <Content Condition="'%(Content.Extension)'=='.cshtml'" CopyToPublishDirectory="Never" />
@@ -555,7 +561,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
-  <!-- 
+  <!--
     Gathers input assemblies for Tag Helper discovery and compilation. Add items to @(ReferencePath)
   -->
   <Target
@@ -616,7 +622,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!--
     This target is called after PrepareForPublish when RazorCompileOnPublish=true so that we can hook into publish.
     This target just hooks up other targets since Publish and PrepareForPublish don't have a DependsOnTargets
-    property we can use. 
+    property we can use.
   -->
   <Target
     Name="_RazorPrepareForPublish"
@@ -668,7 +674,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     DependsOnTargets="ResolveRazorGenerateInputs"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
 
-    <!-- 
+    <!--
       This condition needs to be inside the target because it the itemgroup will be populated after the target's
       condition is evaluated.
     -->
@@ -698,7 +704,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     DependsOnTargets="ResolveRazorGenerateInputs"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true'">
 
-    <!-- 
+    <!--
       This condition needs to be inside the target because it the itemgroup will be populated after the target's
       condition is evaluated.
     -->
@@ -773,7 +779,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!--
-    Called after ComputeFilesToPublish and ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when 
+    Called after ComputeFilesToPublish and ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when
     publishing the project to get a list of files to the output directory.
   -->
   <Target
@@ -793,7 +799,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!--
       RazorGenerate items are usually populated from the '.cshtml' files in @(Content). These are published by default
-      so all we need to do is exclude them. 
+      so all we need to do is exclude them.
     -->
     <ItemGroup Condition="'$(CopyRazorGenerateFilesToPublishDirectory)'=='false'">
       <ResolvedFileToPublish Remove="%(RazorGenerate.FullPath)"/>

From c588d53a428ed8f4b2d1b381970d3a19cb4854bc Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 3 Jun 2019 13:54:28 -0700
Subject: [PATCH 172/337] Use an explicit intermediate node for directive
 attributes (dotnet/aspnetcore-tooling#638)

* Use an explicit intermediate node for directive attributes

* More cleanup
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f8d7f4cc3bb40b0f17dbb7ff07a0d69fe44161ea
---
 .../src/BoundAttributeDescriptorExtensions.cs |  2 +-
 .../Components/ComponentBindLoweringPass.cs   | 64 +++++++++----------
 .../ComponentComplexAttributeContentPass.cs   | 29 ++++++---
 .../Components/ComponentDiagnosticFactory.cs  |  6 +-
 .../ComponentEventHandlerLoweringPass.cs      | 23 +++----
 .../Components/ComponentKeyLoweringPass.cs    | 10 +--
 .../src/Components/ComponentLoweringPass.cs   | 21 +++++-
 .../ComponentReferenceCaptureLoweringPass.cs  | 10 +--
 .../ComponentTemplateDiagnosticPass.cs        |  5 +-
 ...faultRazorIntermediateNodeLoweringPhase.cs | 32 +++++++---
 .../ComponentAttributeIntermediateNode.cs     | 32 ++++++++--
 .../Intermediate/IntermediateNodeVisitor.cs   |  7 +-
 ...elperDirectiveAttributeIntermediateNode.cs | 46 +++++++++++++
 ...tiveAttributeParameterIntermediateNode.cs} | 10 +--
 .../TagHelperPropertyIntermediateNode.cs      |  3 -
 .../ComponentChildContentIntegrationTest.cs   | 21 ++++++
 ...ComponentDiagnosticRazorIntegrationTest.cs | 18 ++++++
 .../IntermediateNodeWriter.cs                 |  7 +-
 18 files changed, 249 insertions(+), 97 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeIntermediateNode.cs
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/{TagHelperAttributeParameterIntermediateNode.cs => TagHelperDirectiveAttributeParameterIntermediateNode.cs} (82%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
index 42a83b368c..9ea08e8537 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorExtensions.cs
@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             return isIndexerNameMatch && attribute.IsIndexerBooleanProperty;
         }
 
-        internal static bool IsDirectiveAttribute(this BoundAttributeDescriptor attribute)
+        public static bool IsDirectiveAttribute(this BoundAttributeDescriptor attribute)
         {
             if (attribute == null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index c2d601dfc5..52162c62f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -29,8 +29,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             // For each @bind *usage* we need to rewrite the tag helper node to map to basic constructs.
-            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
-            var parameterReferences = documentNode.FindDescendantReferences<TagHelperAttributeParameterIntermediateNode>();
+            var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
+            var parameterReferences = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeParameterIntermediateNode>();
 
             var parents = new HashSet<IntermediateNode>();
             for (var i = 0; i < references.Count; i++)
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 var reference = references[i];
                 var parent = reference.Parent;
-                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+                var node = (TagHelperDirectiveAttributeIntermediateNode)reference.Node;
 
                 if (!parent.Children.Contains(node))
                 {
@@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     continue;
                 }
 
-                if (node.TagHelper.IsBindTagHelper() && node.IsDirectiveAttribute)
+                if (node.TagHelper.IsBindTagHelper())
                 {
                     bindEntries[(parent, node.AttributeName)] = new BindEntry(reference);
                 }
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 var parameterReference = parameterReferences[i];
                 var parent = parameterReference.Parent;
-                var node = (TagHelperAttributeParameterIntermediateNode)parameterReference.Node;
+                var node = (TagHelperDirectiveAttributeParameterIntermediateNode)parameterReference.Node;
 
                 if (!parent.Children.Contains(node))
                 {
@@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     continue;
                 }
 
-                if (node.TagHelper.IsBindTagHelper() && node.IsDirectiveAttribute)
+                if (node.TagHelper.IsBindTagHelper())
                 {
                     // Check if this tag contains a corresponding non-parameterized bind node.
                     if (!bindEntries.TryGetValue((parent, node.AttributeNameWithoutParameter), out var entry))
@@ -140,12 +140,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 TagHelperDescriptor tagHelper = null;
                 string attributeName = null;
                 var attribute = node.Children[i];
-                if (attribute is TagHelperPropertyIntermediateNode propertyAttribute)
+                if (attribute is TagHelperDirectiveAttributeIntermediateNode directiveAttribute)
                 {
-                    attributeName = propertyAttribute.AttributeName;
-                    tagHelper = propertyAttribute.TagHelper;
+                    attributeName = directiveAttribute.AttributeName;
+                    tagHelper = directiveAttribute.TagHelper;
                 }
-                else if (attribute is TagHelperAttributeParameterIntermediateNode parameterAttribute)
+                else if (attribute is TagHelperDirectiveAttributeParameterIntermediateNode parameterAttribute)
                 {
                     attributeName = parameterAttribute.AttributeName;
                     tagHelper = parameterAttribute.TagHelper;
@@ -159,12 +159,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         TagHelperDescriptor duplicateTagHelper = null;
                         string duplicateAttributeName = null;
                         var duplicate = node.Children[j];
-                        if (duplicate is TagHelperPropertyIntermediateNode duplicatePropertyAttribute)
+                        if (duplicate is TagHelperDirectiveAttributeIntermediateNode duplicateDirectiveAttribute)
                         {
-                            duplicateAttributeName = duplicatePropertyAttribute.AttributeName;
-                            duplicateTagHelper = duplicatePropertyAttribute.TagHelper;
+                            duplicateAttributeName = duplicateDirectiveAttribute.AttributeName;
+                            duplicateTagHelper = duplicateDirectiveAttribute.TagHelper;
                         }
-                        else if (duplicate is TagHelperAttributeParameterIntermediateNode duplicateParameterAttribute)
+                        else if (duplicate is TagHelperDirectiveAttributeParameterIntermediateNode duplicateParameterAttribute)
                         {
                             duplicateAttributeName = duplicateParameterAttribute.AttributeName;
                             duplicateTagHelper = duplicateParameterAttribute.TagHelper;
@@ -195,12 +195,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         TagHelperDescriptor duplicateTagHelper = null;
                         string duplicateAttributeName = null;
                         var duplicate = node.Children[j];
-                        if (duplicate is TagHelperPropertyIntermediateNode duplicatePropertyAttribute)
+                        if (duplicate is TagHelperDirectiveAttributeIntermediateNode duplicateDirectiveAttribute)
                         {
-                            duplicateAttributeName = duplicatePropertyAttribute.AttributeName;
-                            duplicateTagHelper = duplicatePropertyAttribute.TagHelper;
+                            duplicateAttributeName = duplicateDirectiveAttribute.AttributeName;
+                            duplicateTagHelper = duplicateDirectiveAttribute.TagHelper;
                         }
-                        else if (duplicate is TagHelperAttributeParameterIntermediateNode duplicateParameterAttribute)
+                        else if (duplicate is TagHelperDirectiveAttributeParameterIntermediateNode duplicateParameterAttribute)
                         {
                             duplicateAttributeName = duplicateParameterAttribute.AttributeName;
                             duplicateTagHelper = duplicateParameterAttribute.TagHelper;
@@ -222,7 +222,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // If we still have duplicates at this point then they are genuine conflicts.
             var duplicates = node.Children
-                .OfType<TagHelperPropertyIntermediateNode>()
+                .OfType<TagHelperDirectiveAttributeIntermediateNode>()
                 .GroupBy(p => p.AttributeName)
                 .Where(g => g.Count() > 1);
 
@@ -230,7 +230,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 node.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_Duplicates(
                     node.Source,
-                    duplicate.Key,
+                    duplicate.First().OriginalAttributeName,
                     duplicate.ToArray()));
                 foreach (var property in duplicate)
                 {
@@ -338,7 +338,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     Annotations =
                     {
-                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                     AttributeName = valueAttributeName,
                     Source = node.Source,
@@ -362,7 +362,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     Annotations =
                     {
-                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                     AttributeName = changeAttributeName,
                     Source = node.Source,
@@ -385,7 +385,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     Annotations =
                     {
-                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                     AttributeName = valueAttributeName,
                     BoundAttribute = valueAttribute, // Might be null if it doesn't match a component attribute
@@ -405,7 +405,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     Annotations =
                     {
-                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                     AttributeName = changeAttributeName,
                     BoundAttribute = changeAttribute, // Might be null if it doesn't match a component attribute
@@ -430,7 +430,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     {
                         Annotations =
                         {
-                            [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                            [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                         },
                         AttributeName = expressionAttributeName,
                         BoundAttribute = expressionAttribute,
@@ -463,7 +463,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             valueAttributeName = null;
             changeAttributeName = null;
 
-            if (!attributeName.StartsWith("@bind"))
+            if (!attributeName.StartsWith("bind"))
             {
                 return false;
             }
@@ -473,7 +473,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 changeAttributeName = GetAttributeContent(bindEntry.BindEventNode)?.Content?.Trim('"');
             }
 
-            if (attributeName == "@bind")
+            if (attributeName == "bind")
             {
                 return true;
             }
@@ -591,7 +591,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         private bool TryGetFormatNode(
             IntermediateNode node,
-            TagHelperPropertyIntermediateNode attributeNode,
+            TagHelperDirectiveAttributeIntermediateNode attributeNode,
             string valueAttributeName,
             out TagHelperPropertyIntermediateNode formatNode)
         {
@@ -807,16 +807,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public BindEntry(IntermediateNodeReference bindNodeReference)
             {
                 BindNodeReference = bindNodeReference;
-                BindNode = (TagHelperPropertyIntermediateNode)bindNodeReference.Node;
+                BindNode = (TagHelperDirectiveAttributeIntermediateNode)bindNodeReference.Node;
             }
 
             public IntermediateNodeReference BindNodeReference { get; }
 
-            public TagHelperPropertyIntermediateNode BindNode { get; }
+            public TagHelperDirectiveAttributeIntermediateNode BindNode { get; }
 
-            public TagHelperAttributeParameterIntermediateNode BindEventNode { get; set; }
+            public TagHelperDirectiveAttributeParameterIntermediateNode BindEventNode { get; set; }
 
-            public TagHelperAttributeParameterIntermediateNode BindFormatNode { get; set; }
+            public TagHelperDirectiveAttributeParameterIntermediateNode BindFormatNode { get; set; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
index 3a6984f397..37d3d4ca2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentComplexAttributeContentPass.cs
@@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode)
                 {
-                    if (TrySimplifyContent(propertyNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper()))
+                    if (!TrySimplifyContent(propertyNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper()))
                     {
                         node.Diagnostics.Add(ComponentDiagnosticFactory.Create_UnsupportedComplexContent(
                             propertyNode,
@@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
                 else if (node.Children[i] is TagHelperHtmlAttributeIntermediateNode htmlNode)
                 {
-                    if (TrySimplifyContent(htmlNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper()))
+                    if (!TrySimplifyContent(htmlNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper()))
                     {
                         node.Diagnostics.Add(ComponentDiagnosticFactory.Create_UnsupportedComplexContent(
                             htmlNode,
@@ -56,6 +56,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         continue;
                     }
                 }
+                else if (node.Children[i] is TagHelperDirectiveAttributeIntermediateNode directiveAttributeNode)
+                {
+                    if (!TrySimplifyContent(directiveAttributeNode))
+                    {
+                        node.Diagnostics.Add(ComponentDiagnosticFactory.Create_UnsupportedComplexContent(
+                            directiveAttributeNode,
+                            directiveAttributeNode.OriginalAttributeName));
+                        node.Children.RemoveAt(i);
+                        continue;
+                    }
+                }
             }
         }
 
@@ -66,7 +77,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 htmlNode.Children.Count > 1)
             {
                 // This case can be hit for a 'string' attribute
-                return true;
+                return false;
             }
             else if (node.Children.Count == 1 &&
                 node.Children[0] is CSharpExpressionIntermediateNode cSharpNode &&
@@ -87,25 +98,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     cSharpNode.Children.RemoveAt(0);
 
                     // We were able to simplify it, all good.
-                    return false;
+                    return true;
                 }
 
-                return true;
+                return false;
             }
             else if (node.Children.Count == 1 &&
-                node.Children[0] is CSharpCodeIntermediateNode cSharpCodeNode)
+                node.Children[0] is CSharpCodeIntermediateNode)
             {
                 // This is the case when an attribute contains a code block @{ ... }
                 // We don't support this.
-                return true;
+                return false;
             }
             else if (node.Children.Count > 1)
             {
                 // This is the common case for 'mixed' content
-                return true;
+                return false;
             }
 
-            return false;
+            return true;
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index aa416b3da4..9303b730bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor UnsupportedComplexContent = new RazorDiagnosticDescriptor(
             $"{DiagnosticPrefix}9986",
-            () => "Component attributes do not support complex content (mixed C# and markup). Attribute: '{0}', text '{1}'",
+            () => "Component attributes do not support complex content (mixed C# and markup). Attribute: '{0}', text: '{1}'",
             RazorDiagnosticSeverity.Error);
 
         public static RazorDiagnostic Create_UnsupportedComplexContent(IntermediateNode node, string attributeName)
@@ -136,7 +136,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             () => "The attribute '{0}' was matched by multiple bind attributes. Duplicates:{1}",
             RazorDiagnosticSeverity.Error);
 
-        public static RazorDiagnostic CreateBindAttribute_Duplicates(SourceSpan? source, string attribute, TagHelperPropertyIntermediateNode[] attributes)
+        public static RazorDiagnostic CreateBindAttribute_Duplicates(SourceSpan? source, string attribute, TagHelperDirectiveAttributeIntermediateNode[] attributes)
         {
             var diagnostic = RazorDiagnostic.Create(
                 BindAttribute_Duplicates,
@@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             () => "The attribute '{0}' was matched by multiple event handlers attributes. Duplicates:{1}",
             RazorDiagnosticSeverity.Error);
 
-        public static RazorDiagnostic CreateEventHandler_Duplicates(SourceSpan? source, string attribute, TagHelperPropertyIntermediateNode[] attributes)
+        public static RazorDiagnostic CreateEventHandler_Duplicates(SourceSpan? source, string attribute, TagHelperDirectiveAttributeIntermediateNode[] attributes)
         {
             var diagnostic = RazorDiagnostic.Create(
                 EventHandler_Duplicates,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index 3e7666a021..5e33dd1ad2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // For each event handler *usage* we need to rewrite the tag helper node to map to basic constructs.
             // Each usage will be represented by a tag helper property that is a descendant of either
             // a component or element.
-            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+            var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
 
             var parents = new HashSet<IntermediateNode>();
             for (var i = 0; i < references.Count; i++)
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             for (var i = 0; i < references.Count; i++)
             {
                 var reference = references[i];
-                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+                var node = (TagHelperDirectiveAttributeIntermediateNode)reference.Node;
 
                 if (!reference.Parent.Children.Contains(node))
                 {
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     continue;
                 }
 
-                if (node.TagHelper.IsEventHandlerTagHelper() && node.IsDirectiveAttribute)
+                if (node.TagHelper.IsEventHandlerTagHelper())
                 {
                     reference.Replace(RewriteUsage(reference.Parent, node));
                 }
@@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // If we still have duplicates at this point then they are genuine conflicts.
             var duplicates = parent.Children
-                .OfType<TagHelperPropertyIntermediateNode>()
+                .OfType<TagHelperDirectiveAttributeIntermediateNode>()
                 .Where(p => p.TagHelper?.IsEventHandlerTagHelper() ?? false)
                 .GroupBy(p => p.AttributeName)
                 .Where(g => g.Count() > 1);
@@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
         {
             var original = GetAttributeContent(node);
             if (original.Count == 0)
@@ -148,19 +148,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             var attributeName = node.AttributeName;
-            if (node.IsDirectiveAttribute && attributeName.StartsWith("@"))
-            {
-                // Directive attributes start with a "@" but we don't want that to be included in the output attribute name.
-                // E.g, <input @onclick="..." /> should result in the creation of 'onclick' attribute.
-                attributeName = attributeName.Substring(1);
-            }
+
             if (parent is MarkupElementIntermediateNode)
             {
                 var result = new HtmlAttributeIntermediateNode()
                 {
                     Annotations =
                     {
-                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                     AttributeName = attributeName,
                     Source = node.Source,
@@ -188,7 +183,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     Annotations =
                     {
-                        [ComponentMetadata.Common.OriginalAttributeName] = node.AttributeName,
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                 };
 
@@ -203,7 +198,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private static IReadOnlyList<IntermediateToken> GetAttributeContent(TagHelperPropertyIntermediateNode node)
+        private static IReadOnlyList<IntermediateToken> GetAttributeContent(TagHelperDirectiveAttributeIntermediateNode node)
         {
             var template = node.FindDescendantNodes<TemplateIntermediateNode>().FirstOrDefault();
             if (template != null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
index d4394a04f5..1787003101 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentKeyLoweringPass.cs
@@ -25,20 +25,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+            var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
             for (var i = 0; i < references.Count; i++)
             {
                 var reference = references[i];
-                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+                var node = (TagHelperDirectiveAttributeIntermediateNode)reference.Node;
 
-                if (node.TagHelper.IsKeyTagHelper() && node.IsDirectiveAttribute)
+                if (node.TagHelper.IsKeyTagHelper())
                 {
                     reference.Replace(RewriteUsage(reference.Parent, node));
                 }
             }
         }
 
-        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
         {
             // If we can't get a nonempty attribute value, do nothing because there will
             // already be a diagnostic for empty values
@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return new SetKeyIntermediateNode(keyValueToken);
         }
 
-        private IntermediateToken DetermineKeyValueToken(TagHelperPropertyIntermediateNode attributeNode)
+        private IntermediateToken DetermineKeyValueToken(TagHelperDirectiveAttributeIntermediateNode attributeNode)
         {
             IntermediateToken foundToken = null;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
index 4b8da7a490..2954c6361c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -261,7 +261,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                             continue;
                         }
 
-                        // This is an unrecognized attribute, this is possible if you try to do something like put 'ref' on a child content.
+                        // This is an unrecognized tag helper bound attribute. This will practically never happen unless the child content descriptor was misconfigured.
                         childContent.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidAttribute(property.Source, property.AttributeName, attribute.Name));
                     }
                     else if (child is TagHelperHtmlAttributeIntermediateNode a)
@@ -269,6 +269,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         // This is an HTML attribute on a child content.
                         childContent.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidAttribute(a.Source, a.AttributeName, attribute.Name));
                     }
+                    else if (child is TagHelperDirectiveAttributeIntermediateNode directiveAttribute)
+                    {
+                        // We don't support directive attributes inside child content, this is possible if you try to do something like put '@ref' on a child content.
+                        childContent.Diagnostics.Add(ComponentDiagnosticFactory.Create_ChildContentHasInvalidAttribute(directiveAttribute.Source, directiveAttribute.OriginalAttributeName, attribute.Name));
+                    }
                     else
                     {
                         // This is some other kind of node (likely an implicit child content)
@@ -385,6 +390,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 _children.Add(new ComponentAttributeIntermediateNode(node));
             }
 
+            public override void VisitTagHelperDirectiveAttribute(TagHelperDirectiveAttributeIntermediateNode node)
+            {
+                // We don't want to do anything special with directive attributes here.
+                // Let their corresponding lowering pass take care of processing them.
+                _children.Add(node);
+            }
+
             public override void VisitDefault(IntermediateNode node)
             {
                 _children.Add(node);
@@ -490,6 +502,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 _children.Add(node.TagHelper.IsComponentTagHelper() ? (IntermediateNode)new ComponentAttributeIntermediateNode(node) : node);
             }
 
+            public override void VisitTagHelperDirectiveAttribute(TagHelperDirectiveAttributeIntermediateNode node)
+            {
+                // We don't want to do anything special with directive attributes here.
+                // Let their corresponding lowering pass take care of processing them.
+                _children.Add(node);
+            }
+
             public override void VisitDefault(IntermediateNode node)
             {
                 _children.Add(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
index a962b96f72..b4d776aacf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
@@ -25,20 +25,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
-            var references = documentNode.FindDescendantReferences<TagHelperPropertyIntermediateNode>();
+            var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
             for (var i = 0; i < references.Count; i++)
             {
                 var reference = references[i];
-                var node = (TagHelperPropertyIntermediateNode)reference.Node;
+                var node = (TagHelperDirectiveAttributeIntermediateNode)reference.Node;
 
-                if (node.TagHelper.IsRefTagHelper() && node.IsDirectiveAttribute)
+                if (node.TagHelper.IsRefTagHelper())
                 {
                     reference.Replace(RewriteUsage(@class, reference.Parent, node));
                 }
             }
         }
 
-        private IntermediateNode RewriteUsage(ClassDeclarationIntermediateNode classNode, IntermediateNode parent, TagHelperPropertyIntermediateNode node)
+        private IntermediateNode RewriteUsage(ClassDeclarationIntermediateNode classNode, IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
         {
             // If we can't get a nonempty attribute name, do nothing because there will
             // already be a diagnostic for empty values
@@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private IntermediateToken DetermineIdentifierToken(TagHelperPropertyIntermediateNode attributeNode)
+        private IntermediateToken DetermineIdentifierToken(TagHelperDirectiveAttributeIntermediateNode attributeNode)
         {
             IntermediateToken foundToken = null;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs
index b545237f4b..c6ae4e3aaf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentTemplateDiagnosticPass.cs
@@ -53,7 +53,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         ancestor is ComponentAttributeIntermediateNode ||
 
                         // Inside malformed ref attribute
-                        ancestor is TagHelperPropertyIntermediateNode)
+                        ancestor is TagHelperPropertyIntermediateNode ||
+
+                        // Inside a directive attribute
+                        ancestor is TagHelperDirectiveAttributeIntermediateNode)
                     {
                         Candidates.Add(new IntermediateNodeReference(Parent, node));
                     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 05fd4b54e7..2e619dfb52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1752,14 +1752,19 @@ namespace Microsoft.AspNetCore.Razor.Language
                                 return;
                             }
 
+                            // Directive attributes should start with '@' unless the descriptors are misconfigured.
+                            // In that case, we would have already logged an error.
+                            var actualAttributeName = attributeName.StartsWith("@") ? attributeName.Substring(1) : attributeName;
+
                             IntermediateNode attributeNode;
                             if (parameterMatch &&
-                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(attributeName, out var attributeNameWithoutParameter, out _))
+                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(actualAttributeName, out var attributeNameWithoutParameter, out _))
                             {
-                                attributeNode = new TagHelperAttributeParameterIntermediateNode()
+                                attributeNode = new TagHelperDirectiveAttributeParameterIntermediateNode()
                                 {
-                                    AttributeName = attributeName,
+                                    AttributeName = actualAttributeName,
                                     AttributeNameWithoutParameter = attributeNameWithoutParameter,
+                                    OriginalAttributeName = attributeName,
                                     BoundAttributeParameter = associatedAttributeParameterDescriptor,
                                     BoundAttribute = associatedAttributeDescriptor,
                                     TagHelper = associatedDescriptor,
@@ -1770,9 +1775,10 @@ namespace Microsoft.AspNetCore.Razor.Language
                             }
                             else
                             {
-                                attributeNode = new TagHelperPropertyIntermediateNode()
+                                attributeNode = new TagHelperDirectiveAttributeIntermediateNode()
                                 {
-                                    AttributeName = attributeName,
+                                    AttributeName = actualAttributeName,
+                                    OriginalAttributeName = attributeName,
                                     BoundAttribute = associatedAttributeDescriptor,
                                     TagHelper = associatedDescriptor,
                                     AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
@@ -1870,14 +1876,19 @@ namespace Microsoft.AspNetCore.Razor.Language
                             out var parameterMatch,
                             out var associatedAttributeParameterDescriptor))
                         {
+                            // Directive attributes should start with '@' unless the descriptors are misconfigured.
+                            // In that case, we would have already logged an error.
+                            var actualAttributeName = attributeName.StartsWith("@") ? attributeName.Substring(1) : attributeName;
+
                             IntermediateNode attributeNode;
                             if (parameterMatch &&
-                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(attributeName, out var attributeNameWithoutParameter, out _))
+                                TagHelperMatchingConventions.TryGetBoundAttributeParameter(actualAttributeName, out var attributeNameWithoutParameter, out _))
                             {
-                                attributeNode = new TagHelperAttributeParameterIntermediateNode()
+                                attributeNode = new TagHelperDirectiveAttributeParameterIntermediateNode()
                                 {
-                                    AttributeName = attributeName,
+                                    AttributeName = actualAttributeName,
                                     AttributeNameWithoutParameter = attributeNameWithoutParameter,
+                                    OriginalAttributeName = attributeName,
                                     BoundAttributeParameter = associatedAttributeParameterDescriptor,
                                     BoundAttribute = associatedAttributeDescriptor,
                                     TagHelper = associatedDescriptor,
@@ -1888,9 +1899,10 @@ namespace Microsoft.AspNetCore.Razor.Language
                             }
                             else
                             {
-                                attributeNode = new TagHelperPropertyIntermediateNode()
+                                attributeNode = new TagHelperDirectiveAttributeIntermediateNode()
                                 {
-                                    AttributeName = attributeName,
+                                    AttributeName = actualAttributeName,
+                                    OriginalAttributeName = attributeName,
                                     BoundAttribute = associatedAttributeDescriptor,
                                     TagHelper = associatedDescriptor,
                                     AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
index 2d2766b7b3..98404ef88e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
@@ -42,12 +42,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             }
 
             var attributeName = propertyNode.AttributeName;
-            if (propertyNode.IsDirectiveAttribute && attributeName.StartsWith("@"))
-            {
-                // Directive attributes start with a "@" but we don't want that to be included in the output attribute name.
-                // E.g, <input @onclick="..." /> should result in the creation of 'onclick' attribute.
-                attributeName = attributeName.Substring(1);
-            }
 
             AttributeName = attributeName;
             AttributeStructure = propertyNode.AttributeStructure;
@@ -68,6 +62,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             }
         }
 
+        public ComponentAttributeIntermediateNode(TagHelperDirectiveAttributeIntermediateNode directiveAttributeNode)
+        {
+            if (directiveAttributeNode == null)
+            {
+                throw new ArgumentNullException(nameof(directiveAttributeNode));
+            }
+
+            AttributeName = directiveAttributeNode.AttributeName;
+            AttributeStructure = directiveAttributeNode.AttributeStructure;
+            BoundAttribute = directiveAttributeNode.BoundAttribute;
+            PropertyName = directiveAttributeNode.BoundAttribute.GetPropertyName();
+            Source = directiveAttributeNode.Source;
+            TagHelper = directiveAttributeNode.TagHelper;
+            TypeName = directiveAttributeNode.BoundAttribute.IsWeaklyTyped() ? null : directiveAttributeNode.BoundAttribute.TypeName;
+
+            for (var i = 0; i < directiveAttributeNode.Children.Count; i++)
+            {
+                Children.Add(directiveAttributeNode.Children[i]);
+            }
+
+            for (var i = 0; i < directiveAttributeNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(directiveAttributeNode.Diagnostics[i]);
+            }
+        }
+
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
         public string AttributeName { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
index e2e249ad2c..1489e23002 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -124,12 +124,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             VisitDefault(node);
         }
 
+        public virtual void VisitTagHelperDirectiveAttribute(TagHelperDirectiveAttributeIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
+
         public virtual void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node)
         {
             VisitDefault(node);
         }
 
-        public virtual void VisitTagHelperAttributeParameter(TagHelperAttributeParameterIntermediateNode node)
+        public virtual void VisitTagHelperDirectiveAttributeParameter(TagHelperDirectiveAttributeParameterIntermediateNode node)
         {
             VisitDefault(node);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeIntermediateNode.cs
new file mode 100644
index 0000000000..29ab32badd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeIntermediateNode.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class TagHelperDirectiveAttributeIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public string AttributeName { get; set; }
+
+        public string OriginalAttributeName { get; set; }
+
+        public AttributeStructure AttributeStructure { get; set; }
+
+        public BoundAttributeDescriptor BoundAttribute { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public bool IsIndexerNameMatch { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitTagHelperDirectiveAttribute(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(AttributeName);
+
+            formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(OriginalAttributeName), OriginalAttributeName);
+            formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
+            formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
+            formatter.WriteProperty(nameof(IsIndexerNameMatch), IsIndexerNameMatch.ToString());
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeParameterIntermediateNode.cs
similarity index 82%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeParameterIntermediateNode.cs
index 06d03f5c3b..bb3c660085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperAttributeParameterIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperDirectiveAttributeParameterIntermediateNode.cs
@@ -5,7 +5,7 @@ using System;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    public sealed class TagHelperAttributeParameterIntermediateNode : IntermediateNode
+    public sealed class TagHelperDirectiveAttributeParameterIntermediateNode : IntermediateNode
     {
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
@@ -13,6 +13,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public string AttributeNameWithoutParameter { get; set; }
 
+        public string OriginalAttributeName { get; set; }
+
         public AttributeStructure AttributeStructure { get; set; }
 
         public BoundAttributeParameterDescriptor BoundAttributeParameter { get; set; }
@@ -23,8 +25,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public bool IsIndexerNameMatch { get; set; }
 
-        public bool IsDirectiveAttribute => BoundAttribute?.IsDirectiveAttribute() ?? false;
-
         public override void Accept(IntermediateNodeVisitor visitor)
         {
             if (visitor == null)
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
                 throw new ArgumentNullException(nameof(visitor));
             }
 
-            visitor.VisitTagHelperAttributeParameter(this);
+            visitor.VisitTagHelperDirectiveAttributeParameter(this);
         }
 
         public override void FormatNode(IntermediateNodeFormatter formatter)
@@ -40,10 +40,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteContent(AttributeName);
 
             formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(OriginalAttributeName), OriginalAttributeName);
             formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
             formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
             formatter.WriteProperty(nameof(BoundAttributeParameter), BoundAttributeParameter?.DisplayName);
-            formatter.WriteProperty(nameof(IsDirectiveAttribute), IsDirectiveAttribute.ToString());
             formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
index 409c86014f..1a755fe6f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/TagHelperPropertyIntermediateNode.cs
@@ -19,8 +19,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public bool IsIndexerNameMatch { get; set; }
 
-        public bool IsDirectiveAttribute => BoundAttribute?.IsDirectiveAttribute() ?? false;
-
         public override void Accept(IntermediateNodeVisitor visitor)
         {
             if (visitor == null)
@@ -38,7 +36,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteProperty(nameof(AttributeName), AttributeName);
             formatter.WriteProperty(nameof(AttributeStructure), AttributeStructure.ToString());
             formatter.WriteProperty(nameof(BoundAttribute), BoundAttribute?.DisplayName);
-            formatter.WriteProperty(nameof(IsDirectiveAttribute), IsDirectiveAttribute.ToString());
             formatter.WriteProperty(nameof(IsIndexerNameMatch), IsIndexerNameMatch.ToString());
             formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
index 7a3c4c098d..ee4c92fcb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
@@ -245,5 +245,26 @@ Some Content
                 "Invalid parameter name. The parameter name attribute 'Context' on component 'RenderChildContentString' can only include literal text.",
                 diagnostic.GetMessage());
         }
+
+        [Fact]
+        public void ChildContent_ExplicitChildContent_ContainsDirectiveAttribute_ProducesDiagnostic()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(RenderChildContentStringComponent);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<RenderChildContentString>
+<ChildContent Context=""items"" @key=""Hello"">
+</ChildContent>
+</RenderChildContentString>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.ChildContentHasInvalidAttribute.Id, diagnostic.Id);
+            Assert.Equal(
+                "Unrecognized attribute '@key' on child content element 'ChildContent'.",
+                diagnostic.GetMessage());
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
index 1a193ca547..5caa98fb92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
@@ -107,5 +107,23 @@ namespace Test
                     Assert.Equal(0, item.Span.CharacterIndex);
                 });
         }
+
+        [Fact]
+        public void DirectiveAttribute_ComplexContent_ReportsError()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp(@"
+<input type=""text"" @key=""Foo @Text"" />
+@functions {
+    public string Text { get; set; } = ""text"";
+}");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ9986", diagnostic.Id);
+            Assert.Equal(
+                "Component attributes do not support complex content (mixed C# and markup). Attribute: '@key', text: 'Foo @Text'",
+                diagnostic.GetMessage());
+        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
index 38f3e0e31f..6784ea7ab2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
@@ -128,7 +128,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
         }
 
-        public override void VisitTagHelperAttributeParameter(TagHelperAttributeParameterIntermediateNode node)
+        public override void VisitTagHelperDirectiveAttribute(TagHelperDirectiveAttributeIntermediateNode node)
+        {
+            WriteContentNode(node, node.AttributeName, node.BoundAttribute.DisplayName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
+        }
+
+        public override void VisitTagHelperDirectiveAttributeParameter(TagHelperDirectiveAttributeParameterIntermediateNode node)
         {
             WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure));
         }

From 48eeaefc1e0fde1abc023619c929ec0f4f0e7917 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 3 Jun 2019 15:48:46 -0700
Subject: [PATCH 173/337] Add Razor component TagHelper detection.

- WTE needs a way to detect if a `TagHelperDescriptor` is a component based `TagHelper` in order to turn features like validation, completion etc. on/off.
- Updated tests to add verification points for the new `IsRazorComponentTagHelper` method.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6fcd12e60b3d828988cabdebb55d30397c21d0db
---
 .../TagHelperDescriptorExtensions.cs          |  4 +++-
 .../src/TagHelperDescriptorExtensions.cs      | 21 +++++++++++++++++++
 .../BindTagHelperDescriptorProviderTest.cs    |  4 ++++
 ...omponentTagHelperDescriptorProviderTest.cs |  1 +
 ...tHandlerTagHelperDescriptorProviderTest.cs |  1 +
 .../KeyTagHelperDescriptorProviderTest.cs     |  1 +
 .../RefTagHelperDescriptorProviderTest.cs     |  1 +
 7 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index 8d16b94f9d..6cb9f26bc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -124,7 +124,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(tagHelper));
             }
 
-            return !tagHelper.Metadata.ContainsKey(ComponentMetadata.SpecialKindKey);
+            return
+                string.Equals(tagHelper.Kind, ComponentMetadata.Component.TagHelperKind) &&
+                !tagHelper.Metadata.ContainsKey(ComponentMetadata.SpecialKindKey);
         }
 
         public static bool IsEventHandlerTagHelper(this TagHelperDescriptor tagHelper)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs
index f1f812d512..db14262d16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -38,5 +39,25 @@ namespace Microsoft.AspNetCore.Razor.Language
             tagHelper.Metadata.TryGetValue(TagHelperMetadata.Runtime.Name, out var value);
             return string.Equals(TagHelperConventions.DefaultKind, value, StringComparison.Ordinal);
         }
+
+        public static bool IsComponentOrChildContentTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            if (tagHelper.IsComponentTagHelper())
+            {
+                return true;
+            }
+
+            if (tagHelper.IsChildContentTagHelper())
+            {
+                return true;
+            }
+
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 3d48fb7666..eb868d3e4a 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -71,6 +71,7 @@ namespace Test
             Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+            Assert.False(bind.IsComponentOrChildContentTagHelper());
 
             Assert.Equal("MyProperty", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
             Assert.Equal("MyPropertyChanged", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
@@ -187,6 +188,7 @@ namespace Test
             Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+            Assert.False(bind.IsComponentOrChildContentTagHelper());
 
             Assert.Equal("MyProperty", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
             Assert.Equal("MyPropertyChanged", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
@@ -334,6 +336,7 @@ namespace Test
             Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+            Assert.False(bind.IsComponentOrChildContentTagHelper());
 
             Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
             Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
@@ -698,6 +701,7 @@ namespace Test
             Assert.Equal(ComponentMetadata.Bind.RuntimeName, bind.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
+            Assert.False(bind.IsComponentOrChildContentTagHelper());
 
             Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.ValueAttribute));
             Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.ChangeAttribute));
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index ecb2ec6939..c4df5ed23f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -60,6 +60,7 @@ namespace Test
             Assert.Equal(ComponentMetadata.Component.TagHelperKind, component.Kind);
             Assert.False(component.IsDefaultKind());
             Assert.False(component.KindUsesDefaultTagHelperRuntime());
+            Assert.True(component.IsComponentOrChildContentTagHelper());
 
             // No documentation in this test
             Assert.Null(component.Documentation);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index 86f26e97f3..e1772d04ac 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -56,6 +56,7 @@ namespace Test
             Assert.Equal(ComponentMetadata.EventHandler.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
+            Assert.False(item.IsComponentOrChildContentTagHelper());
 
             Assert.Equal(
                 "Sets the '@onclick' attribute to the provided string or delegate value. " +
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
index 17965726d6..b937b62685 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
@@ -35,6 +35,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.Equal(ComponentMetadata.Key.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
+            Assert.False(item.IsComponentOrChildContentTagHelper());
 
             Assert.Equal(
                 "Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches.",
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index bd39018ab4..0948102d3f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -35,6 +35,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.Equal(ComponentMetadata.Ref.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
+            Assert.False(item.IsComponentOrChildContentTagHelper());
 
             Assert.Equal(
                 "Populates the specified field or property with a reference to the element or component.",

From 22f593b7961784683068c17259b7439f93b0909c Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Wed, 5 Jun 2019 13:40:11 -0700
Subject: [PATCH 174/337] [Static Web Assets] Removes support for embedding the
 development manifest

* Stops embedding the manifest in favor of using a file copied to the output folder.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/4c65b1947f8f1fa64724ace6ac525af6e6430c91
---
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets |  5 --
 .../test/IntegrationTests/Assert.cs           | 52 -------------------
 .../StaticWebAssetsIntegrationTest.cs         | 45 +++++++++-------
 3 files changed, 25 insertions(+), 77 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index e83d89a7f2..d30d7946ec 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -182,11 +182,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
       <!-- This is the list of inputs that will be used for generating the manifest used during development. -->
     <ItemGroup>
-      <EmbeddedResource Condition="'@(_ExternalStaticWebAsset->Count())' != '0'"
-        Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
-        LogicalName="Microsoft.AspNetCore.StaticWebAssets.xml" />
-
-      <!-- Include it as content as we plan to avoid using an embedded file for the manifest -->
       <Content
         Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
         Condition="'@(_ExternalStaticWebAsset->Count())' != '0'"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index 3676f093e6..9f4b6bfe30 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -345,58 +345,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        public static Stream ContainsEmbeddedResource(string assemblyPath, string resourceName)
-        {
-            var stream = ExtractEmbeddedResource(assemblyPath, resourceName);
-            Assert.NotNull(stream);
-
-            return stream;
-        }
-
-        public static void DoesNotContainEmbeddedResource(string assemblyPath, string resourceName)
-        {
-            var stream = ExtractEmbeddedResource(assemblyPath, resourceName);
-            Assert.Null(stream);
-        }
-
-        private static Stream ExtractEmbeddedResource(string path, string expectedResourceName)
-        {
-            using (var peStream = File.OpenRead(path))
-            {
-                using (var peReader = new PEReader(peStream))
-                {
-                    var mdReader = peReader.GetMetadataReader();
-
-                    foreach (var resourceHandle in mdReader.ManifestResources)
-                    {
-                        var resource = mdReader.GetManifestResource(resourceHandle);
-
-                        if (!resource.Implementation.IsNil)
-                        {
-                            continue; // resource is not embedded.
-                        }
-
-                        var resourceName = mdReader.GetString(resource.Name);
-                        if (!string.Equals(expectedResourceName, resourceName))
-                        {
-                            continue;
-                        }
-
-                        // We are not taking resource.Offset into account here.
-                        // We currently only have the casuistic that we are embedding a single resource.
-                        // If that changes we'll have to change this test code, but as its hard we won't do it for now.
-                        var resourcesSection = peReader.GetSectionData(peReader.PEHeaders.CorHeader.ResourcesDirectory.RelativeVirtualAddress);
-                        var resourcesReader = resourcesSection.GetReader();
-                        var resourceSizeInBytes = resourcesReader.ReadInt32();
-                        var resourceBytes = resourcesReader.ReadBytes(resourceSizeInBytes);
-                        return new MemoryStream(resourceBytes, writable: false);
-                    }
-                }
-            }
-
-            return null;
-        }
-
         public static void NuspecContains(MSBuildResult result, string nuspecPath, string expected)
         {
             if (result == null)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index f8afa92f24..4d96d43b55 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -54,14 +54,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             var path = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.dll");
-            var assembly = Assert.ContainsEmbeddedResource(path, "Microsoft.AspNetCore.StaticWebAssets.xml");
-            using (var reader = new StreamReader(assembly))
-            {
-                var data = await reader.ReadToEndAsync();
-                Output.WriteLine("Manifest:");
-                Output.WriteLine(data);
-                Assert.Equal(expectedManifest, data);
-            }
+            var manifest = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            var data = File.ReadAllText(manifest);
+            Assert.Equal(expectedManifest, data);
         }
 
         [Fact]
@@ -124,7 +119,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.StaticWebAssets.xml");
 
             var path = Assert.FileExists(result, OutputPath, "SimpleMvc.dll");
-            Assert.DoesNotContainEmbeddedResource(path, "SimpleMvc.StaticWebAssets.xml");
         }
 
         [Fact]
@@ -190,12 +184,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             var path = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.dll");
-            var assembly = Assert.ContainsEmbeddedResource(path, "Microsoft.AspNetCore.StaticWebAssets.xml");
-            using (var reader = new StreamReader(assembly))
-            {
-                var data = reader.ReadToEnd();
-                Assert.Equal(expectedManifest, data);
-            }
+            var manifest = Assert.FileExists(result, OutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+            var data = File.ReadAllText(manifest);
+            Assert.Equal(expectedManifest, data);
         }
 
         [Fact]
@@ -274,6 +265,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
     public class PackageTestProjectsFixture
     {
+        private const int MaxPackRetries = 3;
+        private const int MaxPackTimeoutInMinutes = 5;
+
         private bool _packed;
 
         internal async Task PackAsync(ITestOutputHelper output)
@@ -305,12 +299,23 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     RedirectStandardError = true
                 };
 
-                var result = await MSBuildProcessManager.RunProcessCoreAsync(
-                    psi,
-                    TimeSpan.FromMinutes(2));
+                for (int i = 0; i < MaxPackRetries; i++)
+                {
+                    try
+                    {
+                        var result = await MSBuildProcessManager.RunProcessCoreAsync(
+                            psi,
+                            TimeSpan.FromMinutes(MaxPackTimeoutInMinutes));
 
-                output.WriteLine(result.Output);
-                Assert.Equal(0, result.ExitCode);
+                        output.WriteLine(result.Output);
+                        Assert.Equal(0, result.ExitCode);
+                        break;
+                    }
+                    catch
+                    {
+                        await Task.Delay(1000);
+                    }
+                }
             }
 
             _packed = true;

From 2c01615cadddf01b4d48582e5d89c576d6c0cc75 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Wed, 5 Jun 2019 15:47:52 -0700
Subject: [PATCH 175/337] [Flaky tests] Restore package projects at build time

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8ee0e6d5b471f49ec4908ac445f62adaef3df04e
---
 .../testassets/RestoreTestProjects/RestoreTestProjects.csproj   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index c5aa7665e8..4111cbd4dc 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -21,6 +21,8 @@
     <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
     <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
     <ProjectReference Include="..\SimplePages\SimplePages.csproj" />
+    <ProjectReference Include="..\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" />
+    <ProjectReference Include="..\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" />
 
     <!--
       We don't add AppWithPackageAndP2PReference, PackageLibraryDirectDependency or PackageLibraryTransitiveDependency here

From 30668fb1964f7f797501245e9838754d36e4ea13 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 6 Jun 2019 11:19:50 -0700
Subject: [PATCH 176/337] Ignore extensible directive nodes coming from Imports
 when generating padding (dotnet/aspnetcore-tooling#655)
 (dotnet/aspnetcore-tooling#661)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6d1dea714118d29b520b3a56eac553e5debd8310
---
 .../CodeGenerationIntegrationTest.cs          | 43 +++++++++++++
 .../AttributeDirectiveWithViewImports.cshtml  |  1 +
 ...ctiveWithViewImports_DesignTime.codegen.cs | 60 +++++++++++++++++++
 ...DirectiveWithViewImports_DesignTime.ir.txt | 43 +++++++++++++
 ...iveWithViewImports_DesignTime.mappings.txt |  5 ++
 ...irectiveWithViewImports_Runtime.codegen.cs | 56 +++++++++++++++++
 ...uteDirectiveWithViewImports_Runtime.ir.txt | 23 +++++++
 .../CodeGeneration/CodeWriterExtensions.cs    |  7 +++
 .../ComponentCodeGenerationTestBase.cs        |  1 +
 .../TestComponent.codegen.cs                  |  7 +++
 .../TestComponent.ir.txt                      |  3 +
 .../TestComponent.codegen.cs                  |  7 +++
 .../TestComponent.ir.txt                      |  2 +
 13 files changed, 258 insertions(+)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.ir.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 3f22db3670..7b1ff9a8bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -155,6 +155,27 @@ public class MyModel
             AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
+        [Fact]
+        public void AttributeDirectiveWithViewImports_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+            AddProjectItemFromText(@"
+@using System
+@attribute [Serializable]");
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: false);
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("Duplicate 'Serializable' attribute", Assert.Single(diagnostics).GetMessage());
+        }
+
         [Fact]
         public void MalformedPageDirective_Runtime()
         {
@@ -639,6 +660,28 @@ public class MyModel
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
         }
 
+        [Fact]
+        public void AttributeDirectiveWithViewImports_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+            AddProjectItemFromText(@"
+@using System
+@attribute [Serializable]");
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertLinePragmas(compiled.CodeDocument, designTime: true);
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("Duplicate 'Serializable' attribute", Assert.Single(diagnostics).GetMessage());
+        }
+
         [Fact]
         public void MalformedPageDirective_DesignTime()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml
new file mode 100644
index 0000000000..8bd338cc83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml
@@ -0,0 +1 @@
+@attribute [Serializable]
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..efddc5b3f3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.cs
@@ -0,0 +1,60 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
+#line 1 "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml"
+using System;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml"
+[Serializable]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml"
+           [Serializable]
+
+#line default
+#line hidden
+#nullable disable
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..bb927053f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [12] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - System
+        CSharpCode - (26:1,11 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml)
+            IntermediateToken - (26:1,11 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - CSharp - [Serializable]
+        CSharpCode - (11:0,11 [14] AttributeDirectiveWithViewImports.cshtml)
+            IntermediateToken - (11:0,11 [14] AttributeDirectiveWithViewImports.cshtml) - CSharp - [Serializable]
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (26:1,11 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - [Serializable]
+                DirectiveToken - (11:0,11 [14] AttributeDirectiveWithViewImports.cshtml) - [Serializable]
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..f9bb95cbea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml)
+|[Serializable]|
+Generated Location: (854:28,11 [14] )
+|[Serializable]|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..bd318ff573
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs
@@ -0,0 +1,56 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5104989e6480d1ba77366a985b9e04e65a055725"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml")]
+namespace AspNetCore
+{
+    #line hidden
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
+#line 1 "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml"
+using System;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml"
+[Serializable]
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml"
+           [Serializable]
+
+#line default
+#line hidden
+#nullable disable
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5104989e6480d1ba77366a985b9e04e65a055725", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"a7ca527618810d649c818bfc7baa259b22980b2a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..42edc1c806
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - System
+        CSharpCode - (26:1,11 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml)
+            IntermediateToken - (26:1,11 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - CSharp - [Serializable]
+        CSharpCode - (11:0,11 [14] AttributeDirectiveWithViewImports.cshtml)
+            IntermediateToken - (11:0,11 [14] AttributeDirectiveWithViewImports.cshtml) - CSharp - [Serializable]
+        RazorSourceChecksumAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
index a97b2f02c7..9023e4d369 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -38,6 +38,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 return writer;
             }
 
+            if (context.SourceDocument.FilePath != null &&
+                !string.Equals(context.SourceDocument.FilePath, span.Value.FilePath, StringComparison.OrdinalIgnoreCase))
+            {
+                // We don't want to generate padding for nodes from imports.
+                return writer;
+            }
+
             var basePadding = CalculatePadding();
             var resolvedPadding = Math.Max(basePadding - offset, 0);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 32fa3ccaf6..161309edc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -3652,6 +3652,7 @@ namespace Test
             var importContent = @"
 @using System.Text
 @using System.Reflection
+@attribute [Serializable]
 ";
             var importItem = CreateProjectItem("_Imports.razor", importContent, FileKinds.ComponentImport);
             ImportItems.Add(importItem);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 445e39cf49..dd44b8ded4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -19,6 +19,13 @@ using System.Text;
 #line 2 "x:\dir\subdir\Test\_Imports.razor"
 using System.Reflection;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "x:\dir\subdir\Test\_Imports.razor"
+[Serializable]
+
 #line default
 #line hidden
 #nullable disable
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
index facfd0a232..e23e80d14e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -7,8 +7,11 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        CSharpCode - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor)
+            IntermediateToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - CSharp - [Serializable]
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
+                DirectiveToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - [Serializable]
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index a26d349655..c1234e0c14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -19,6 +19,13 @@ using System.Text;
 #line 2 "x:\dir\subdir\Test\_Imports.razor"
 using System.Reflection;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "x:\dir\subdir\Test\_Imports.razor"
+[Serializable]
+
 #line default
 #line hidden
 #nullable disable
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
index 53e69d3262..fa1ae256a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -7,6 +7,8 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
+        CSharpCode - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor)
+            IntermediateToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - CSharp - [Serializable]
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter

From 261b256cf881baa90af7df28ebdb056c2005535d Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 6 Jun 2019 11:46:23 -0700
Subject: [PATCH 177/337] Fix error spacing. \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/1fdb3f3fdb218bd7ad8425dda513c709219e0c2e

---
 .../src/Components/ComponentDiagnosticFactory.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 9303b730bd..8eba2b1efb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -165,7 +165,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static readonly RazorDiagnosticDescriptor BindAttribute_InvalidSyntax =
             new RazorDiagnosticDescriptor(
             $"{DiagnosticPrefix}9991",
-            () => "The attribute names could not be inferred from bind attribute '{0}'. Bind attributes should be of the form" +
+            () => "The attribute names could not be inferred from bind attribute '{0}'. Bind attributes should be of the form " +
                 "'bind' or 'bind-value' along with their corresponding optional parameters like 'bind-value:event', 'bind:format' etc.",
             RazorDiagnosticSeverity.Error);
 

From c16d55c63fc17a003d9b8202c8cb187c4ad049ce Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 18 Jun 2019 14:59:34 -0700
Subject: [PATCH 178/337] Allow `content`, `output` and `context` as keywords
 to VC params.

- It looks that when we first did VCTH we never put in the effort to reduce our footprint on available parameters for `ViewComponentTagHelper`s. I went ahead and added several underscores to the generated fields/parameters to reduce collisions.
- Updated tests to reflect the new codegen.

aspnet/AspNetCoredotnet/aspnetcore-tooling#8645
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b545a4de751102156309e8417cf3fd3747dd65c2
---
 .../ViewComponentTagHelperTargetExtension.cs  |  8 +++---
 ...ewComponentTagHelper_DesignTime.codegen.cs | 14 +++++-----
 .../ViewComponentTagHelper_Runtime.codegen.cs | 14 +++++-----
 ...ewComponentTagHelperTargetExtensionTest.cs | 28 +++++++++----------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
index 89aba13222..1e2e7c89c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         public string ViewComponentHelperTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.IViewComponentHelper";
 
-        public string ViewComponentHelperVariableName { get; set; } = "_helper";
+        public string ViewComponentHelperVariableName { get; set; } = "__helper";
 
         public string ViewComponentInvokeMethodName { get; set; } = "InvokeAsync";
 
@@ -36,11 +36,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         public string TagHelperContextTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext";
 
-        public string TagHelperContextVariableName { get; set; } = "context";
+        public string TagHelperContextVariableName { get; set; } = "__context";
 
         public string TagHelperOutputTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput";
 
-        public string TagHelperOutputVariableName { get; set; } = "output";
+        public string TagHelperOutputVariableName { get; set; } = "__output";
 
         public string TagHelperOutputTagNamePropertyName { get; set; } = "TagName";
 
@@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         public string TagHelperContentSetMethodName { get; set; } = "SetHtmlContent";
 
-        public string TagHelperContentVariableName { get; set; } = "content";
+        public string TagHelperContentVariableName { get; set; } = "__helperContent";
 
         public string IViewContextAwareTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index 202dddb23e..949d5a2480 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -75,20 +75,20 @@ global::System.Object __typeHelper = "*, AppCode";
         [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
         public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
         {
-            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
             public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
             {
-                _helper = helper;
+                __helper = helper;
             }
             [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
             public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
             public System.String firstName { get; set; }
-            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
             {
-                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-                var content = await _helper.InvokeAsync("Test", new { firstName });
-                output.TagName = null;
-                output.Content.SetHtmlContent(content);
+                (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var __helperContent = await __helper.InvokeAsync("Test", new { firstName });
+                __output.TagName = null;
+                __output.Content.SetHtmlContent(__helperContent);
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index cbc587108b..64d0b0ebb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -92,20 +92,20 @@ namespace AspNetCore
         [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
         public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
         {
-            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
             public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
             {
-                _helper = helper;
+                __helper = helper;
             }
             [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
             public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
             public System.String firstName { get; set; }
-            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
             {
-                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-                var content = await _helper.InvokeAsync("Test", new { firstName });
-                output.TagName = null;
-                output.Content.SetHtmlContent(content);
+                (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var __helperContent = await __helper.InvokeAsync("Test", new { firstName });
+                __output.TagName = null;
+                __output.Content.SetHtmlContent(__helperContent);
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
index b841a93583..5ea55d011a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
@@ -41,20 +41,20 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
-    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
     public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
     {
-        _helper = helper;
+        __helper = helper;
     }
     [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
     public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
     public System.Int32 Foo { get; set; }
-    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
     {
-        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-        var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });
-        output.TagName = null;
-        output.Content.SetHtmlContent(content);
+        (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var __helperContent = await __helper.InvokeAsync(""TagCloud"", new { Foo });
+        __output.TagName = null;
+        __output.Content.SetHtmlContent(__helperContent);
     }
 }
 ",
@@ -95,21 +95,21 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
-    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
     public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
     {
-        _helper = helper;
+        __helper = helper;
     }
     [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
     public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
     public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }
      = new System.Collections.Generic.Dictionary<System.String, System.Int32>();
-    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
     {
-        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-        var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });
-        output.TagName = null;
-        output.Content.SetHtmlContent(content);
+        (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var __helperContent = await __helper.InvokeAsync(""TagCloud"", new { Tags });
+        __output.TagName = null;
+        __output.Content.SetHtmlContent(__helperContent);
     }
 }
 ",

From 060ff0d87818ab7ee622f7d48027038e9e860bf1 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 19 Jun 2019 11:43:07 -0700
Subject: [PATCH 179/337] Ensure ApplicationPart attributes are added during
 incremental builds (dotnet/aspnetcore-tooling#686)

Fixes https://github.com/aspnet/AspNetCore/issues/11315\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/1a7a74bce84aa7bb5b98964b714c0c2c5c7fff04
---
 ...Razor.MvcApplicationPartsDiscovery.targets | 11 ++++++-
 ...ApplicationPartDiscoveryIntegrationTest.cs | 29 ++++++++++++++++++
 .../test/IntegrationTests/Assert.cs           | 30 +++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
index 43a1fbc8db..5f1182be43 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
@@ -67,7 +67,16 @@ Copyright (c) .NET Foundation. All rights reserved.
       OutputFile="$(_MvcApplicationPartAttributeGeneratedFile)"
       Condition="'@(_ApplicationPartAssemblyNames->Count())' != '0'" />
 
-    <ItemGroup Condition="'@(_ApplicationPartAssemblyNames->Count())' != '0'">
+    <!--
+      If the generated attribute file exists, but no assembly names were discovered,
+      it suggests that the assembly references were changed to no longer point to MVC.
+      In this case, delete the file so that future incremental builds can no longer pick it up.
+    -->
+    <Delete
+      File="$(_MvcApplicationPartAttributeGeneratedFile)"
+      Condition="'@(_ApplicationPartAssemblyNames->Count())' == '0' AND Exists('$(_MvcApplicationPartAttributeGeneratedFile)')" />
+
+    <ItemGroup Condition="Exists('$(_MvcApplicationPartAttributeGeneratedFile)')">
       <Compile Remove="$(_MvcApplicationPartAttributeGeneratedFile)" Condition="'$(Language)'!='F#'" />
       <Compile Include="$(_MvcApplicationPartAttributeGeneratedFile)"  Condition="'$(Language)'!='F#'" />
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index a3e9e59160..d0eb4978c6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -34,6 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.FileExists(result, IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs");
             Assert.FileContains(result, Path.Combine(IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs"), "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")]");
+            Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
         }
 
         [Fact]
@@ -69,6 +70,33 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.FileExists(result, generatedAttributeFile);
             Assert.Equal(thumbPrint, GetThumbPrint(generatedAttributeFile));
+            Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
+        }
+
+        // Regression test for https://github.com/aspnet/AspNetCore/issues/11315
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task BuildIncrementalism_CausingRecompilation_WhenApplicationPartAttributeIsGenerated()
+        {
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            var generatedAttributeFile = Path.Combine(IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs");
+            Assert.FileExists(result, generatedAttributeFile);
+            Assert.FileContains(result, generatedAttributeFile, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")]");
+
+            var thumbPrint = GetThumbPrint(generatedAttributeFile);
+
+            // Touch a file in the main app which should call recompilation, but not the Mvc discovery tasks to re-run.
+            File.AppendAllText(Path.Combine(Project.DirectoryPath, "Program.cs"), " ");
+            result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, generatedAttributeFile);
+            Assert.Equal(thumbPrint, GetThumbPrint(generatedAttributeFile));
+            Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
         }
 
         [Fact]
@@ -88,6 +116,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.FileExists(result, IntermediateOutputPath, "SimpleMvcFSharp.MvcApplicationPartsAssemblyInfo.fs");
             Assert.FileContains(result, Path.Combine(IntermediateOutputPath, "SimpleMvcFSharp.MvcApplicationPartsAssemblyInfo.fs"), "<assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")>");
+            Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "SimpleMvcFSharp.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index 9f4b6bfe30..23ab8172e8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -507,6 +507,36 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        public static void AssemblyHasAttribute(MSBuildResult result, string assemblyPath, string fullTypeName)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            assemblyPath = Path.Combine(result.Project.DirectoryPath, Path.Combine(assemblyPath));
+
+            var typeNames = GetAssemblyAttributes(assemblyPath);
+            Assert.Contains(fullTypeName, typeNames);
+        }
+
+        private static IEnumerable<string> GetAssemblyAttributes(string assemblyPath)
+        {
+            using (var file = File.OpenRead(assemblyPath))
+            {
+                var peReader = new PEReader(file);
+                var metadataReader = peReader.GetMetadataReader();
+                return metadataReader.CustomAttributes.Where(t => !t.IsNil).Select(t =>
+                {
+                    var attribute = metadataReader.GetCustomAttribute(t);
+                    var constructor = metadataReader.GetMemberReference((MemberReferenceHandle)attribute.Constructor);
+                    var type = metadataReader.GetTypeReference((TypeReferenceHandle)constructor.Parent);
+
+                    return metadataReader.GetString(type.Namespace) + "." + metadataReader.GetString(type.Name);
+                }).ToArray();
+            }
+        }
+
         private abstract class MSBuildXunitException : Xunit.Sdk.XunitException
         {
             protected MSBuildXunitException(MSBuildResult result)

From 64f56b7607dcaf2a5be508c46905983354fdb0c3 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Thu, 20 Jun 2019 09:54:06 +0200
Subject: [PATCH 180/337] For bind on element, also write the updated attribute
 name to the render tree builder (dotnet/aspnetcore-tooling#689)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6e5490049d01ecd393aca7ebcae817a88da2f0a1
---
 .../src/Components/ComponentBindLoweringPass.cs           | 2 ++
 .../src/Components/ComponentRuntimeNodeWriter.cs          | 8 ++++++++
 .../src/Components/ComponentsApi.cs                       | 2 ++
 .../src/Intermediate/HtmlAttributeIntermediateNode.cs     | 3 +++
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../TestComponent.codegen.cs                              | 1 +
 .../TestComponent.mappings.txt                            | 2 +-
 .../RenderTree/RenderTreeBuilder.cs                       | 4 ++++
 29 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 52162c62f8..824a067938 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -369,6 +369,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                     Prefix = changeAttributeName + "=\"",
                     Suffix = "\"",
+
+                    EventUpdatesAttributeName = valueNode.AttributeName,
                 };
 
                 changeNode.Children.Add(new CSharpExpressionAttributeValueIntermediateNode());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index a3224213a9..2330b1adfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -228,6 +228,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             WriteAttribute(context, node.AttributeName, _currentAttributeValues);
             _currentAttributeValues.Clear();
+
+            if (!string.IsNullOrEmpty(node.EventUpdatesAttributeName))
+            {
+                context.CodeWriter
+                    .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.SetUpdatesAttributeName}")
+                    .WriteStringLiteral(node.EventUpdatesAttributeName)
+                    .WriteEndMethodInvocation();
+            }
         }
 
         public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 858dd7169b..45f99abb3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -89,6 +89,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string ChildContent = nameof(ChildContent);
 
             public static readonly string SetKey = nameof(SetKey);
+
+            public static readonly string SetUpdatesAttributeName = nameof(SetUpdatesAttributeName);
         }
 
         public static class RuntimeHelpers
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
index 861b14b227..8acbfcc90a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
@@ -15,6 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public string Suffix { get; set; }
 
+        public string EventUpdatesAttributeName { get; set; }
+
         public override void Accept(IntermediateNodeVisitor visitor)
         {
             if (visitor == null)
@@ -32,6 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteProperty(nameof(AttributeName), AttributeName);
             formatter.WriteProperty(nameof(Prefix), Prefix);
             formatter.WriteProperty(nameof(Suffix), Suffix);
+            formatter.WriteProperty(nameof(EventUpdatesAttributeName), EventUpdatesAttributeName);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index fa3a760b46..62611b0229 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -25,6 +25,7 @@ namespace Test
 #nullable disable
             , "MM/dd"));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 7d30124567..dce11bd751 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1240:32,7 [77] )
+Generated Location: (1295:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 1ba31a95e7..324e345459 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -25,6 +25,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 60bbaca2c4..ef9479584a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1222:32,7 [50] )
+Generated Location: (1277:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 2fcfc8f9fb..e2c2a85098 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -24,6 +24,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("myvalue");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index d71852d955..0b654cd454 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1153:31,7 [55] )
+Generated Location: (1210:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index db9cbe1a68..babb24c078 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -24,6 +24,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("myvalue");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 4edd804d60..20084858e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1152:31,7 [55] )
+Generated Location: (1209:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 1fe6dd630e..eb17f60ecd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -24,6 +24,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("myvalue");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 3e5a9e6235..e61c6afe7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1147:31,7 [55] )
+Generated Location: (1204:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index c3defa9de2..374f6dede3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -25,6 +25,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
+            builder.SetUpdatesAttributeName("checked");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index ea2b6c2137..17c4e63a2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1214:32,7 [41] )
+Generated Location: (1271:33,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 5fb727d819..d070922720 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -33,6 +33,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 849a5ea933..e6960dd247 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1423:40,7 [135] )
+Generated Location: (1478:41,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 917783f7b7..1645750a92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -25,6 +25,7 @@ namespace Test
 #nullable disable
             , "MM/dd/yyyy"));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 7623ccd996..a38673961b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1244:32,7 [77] )
+Generated Location: (1299:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 00f1c1ce5b..d0a4336fe1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -25,6 +25,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index e1177eb18d..b68b80de45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1216:32,7 [50] )
+Generated Location: (1271:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index edddc5770f..31789285d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -24,6 +24,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 492d9aee72..8a4f8ccd01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1150:31,7 [50] )
+Generated Location: (1205:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 1936632b30..86c6a21de8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -36,6 +36,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
             builder.AddMarkupContent(7, "\r\n");
             builder.CloseElement();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 14cd30157b..9204fca3a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1785:45,12 [35] )
+Generated Location: (1840:46,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 9b30ff16cb..6387755df0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -28,6 +28,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
             builder.AddMarkupContent(7, "\r\n");
             builder.CloseElement();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index c93f3fad78..ee9e5de003 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1449:37,12 [35] )
+Generated Location: (1504:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
index 2dfaac26cf..2dace410eb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -107,5 +107,9 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public void SetKey(object key)
         {
         }
+
+        public void SetUpdatesAttributeName(string updatesAttributeName)
+        {
+        }
     }
 }
\ No newline at end of file

From 7a510b311d03cfe96ee5cd505321f342a8505bb4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 20 Jun 2019 13:53:35 -0700
Subject: [PATCH 181/337] Fixup incremental builds with
 ApplicationPartsDiscovery (dotnet/aspnetcore-tooling#693)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/df3c4d533ab31c6fbef5ac9178d4ae309eb85159
---
 ...Razor.MvcApplicationPartsDiscovery.targets | 11 ++--
 ...ApplicationPartDiscoveryIntegrationTest.cs | 58 ++++++++++++++-----
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
index 5f1182be43..669cfd40c9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
@@ -25,12 +25,13 @@ Copyright (c) .NET Foundation. All rights reserved.
     </CoreCompileDependsOn>
 
     <_MvcApplicationPartAttributeGeneratedFile>$(IntermediateOutputPath)$(TargetName).MvcApplicationPartsAssemblyInfo$(DefaultLanguageSourceExtension)</_MvcApplicationPartAttributeGeneratedFile>
+    <_MvcApplicationPartCacheFile>$(IntermediateOutputPath)$(TargetName).MvcApplicationPartsAssemblyInfo.cache</_MvcApplicationPartCacheFile>
   </PropertyGroup>
 
   <Target
     Name="_DiscoverMvcApplicationParts"
     Inputs="$(ProjectAssetsFile);$(MSBuildAllProjects)"
-    Outputs="$(_MvcApplicationPartAttributeGeneratedFile)"
+    Outputs="$(_MvcApplicationPartCacheFile)"
     DependsOnTargets="ResolveAssemblyReferences">
 
     <ItemGroup>
@@ -73,7 +74,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       In this case, delete the file so that future incremental builds can no longer pick it up.
     -->
     <Delete
-      File="$(_MvcApplicationPartAttributeGeneratedFile)"
+      Files="$(_MvcApplicationPartAttributeGeneratedFile)"
       Condition="'@(_ApplicationPartAssemblyNames->Count())' == '0' AND Exists('$(_MvcApplicationPartAttributeGeneratedFile)')" />
 
     <ItemGroup Condition="Exists('$(_MvcApplicationPartAttributeGeneratedFile)')">
@@ -82,6 +83,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
       <CompileBefore Remove="$(_MvcApplicationPartAttributeGeneratedFile)" Condition="'$(Language)'=='F#'" />
       <CompileBefore Include="$(_MvcApplicationPartAttributeGeneratedFile)"  Condition="'$(Language)'=='F#'" />
+
+      <FileWrites Include="$(_MvcApplicationPartAttributeGeneratedFile)"/>
     </ItemGroup>
 
     <!--
@@ -89,11 +92,11 @@ Copyright (c) .NET Foundation. All rights reserved.
       This is required to play nicely with incremental builds.
     -->
     <Touch
-      Files="$(_MvcApplicationPartAttributeGeneratedFile)"
+      Files="$(_MvcApplicationPartCacheFile)"
       AlwaysCreate="true" />
 
     <ItemGroup>
-      <FileWrites Include="$(_MvcApplicationPartAttributeGeneratedFile)" />
+      <FileWrites Include="$(_MvcApplicationPartCacheFile)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index d0eb4978c6..1f07c59299 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -45,9 +45,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs");
-            // We should produced an empty file for build incrementalism
-            Assert.Empty(File.ReadAllText(Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs")));
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs");
+
+            // We should produced a cache file for build incrementalism
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cache");
         }
 
         [Fact]
@@ -59,18 +60,30 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             var generatedAttributeFile = Path.Combine(IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs");
+            var cacheFile = Path.Combine(IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cache");
+            var outputFile = Path.Combine(IntermediateOutputPath, "AppWithP2PReference.dll");
             Assert.FileExists(result, generatedAttributeFile);
             Assert.FileContains(result, generatedAttributeFile, "[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute(\"ClassLibrary\")]");
 
-            var thumbPrint = GetThumbPrint(generatedAttributeFile);
+            var generatedFilethumbPrint = GetThumbPrint(generatedAttributeFile);
+            var cacheFileThumbPrint = GetThumbPrint(cacheFile);
+            var outputFileThumbPrint = GetThumbPrint(outputFile);
 
-            result = await DotnetMSBuild("Build");
+            await AssertIncrementalBuild();
+            await AssertIncrementalBuild();
 
-            Assert.BuildPassed(result);
+            async Task AssertIncrementalBuild()
+            {
+                result = await DotnetMSBuild("Build");
 
-            Assert.FileExists(result, generatedAttributeFile);
-            Assert.Equal(thumbPrint, GetThumbPrint(generatedAttributeFile));
-            Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
+                Assert.BuildPassed(result);
+
+                Assert.FileExists(result, generatedAttributeFile);
+                Assert.Equal(generatedFilethumbPrint, GetThumbPrint(generatedAttributeFile));
+                Assert.Equal(cacheFileThumbPrint, GetThumbPrint(cacheFile));
+                Assert.Equal(outputFileThumbPrint, GetThumbPrint(outputFile));
+                Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
+            }
         }
 
         // Regression test for https://github.com/aspnet/AspNetCore/issues/11315
@@ -128,17 +141,30 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
 
             var generatedAttributeFile = Path.Combine(IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cs");
-            Assert.FileExists(result, generatedAttributeFile);
-            Assert.Empty(File.ReadAllText(Path.Combine(result.Project.DirectoryPath, generatedAttributeFile)));
+            var cacheFile = Path.Combine(IntermediateOutputPath, "SimpleMvc.MvcApplicationPartsAssemblyInfo.cache");
+            var outputFile = Path.Combine(IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, generatedAttributeFile);
+            Assert.FileExists(result, cacheFile);
 
-            var thumbPrint = GetThumbPrint(generatedAttributeFile);
+            var cacheFilethumbPrint = GetThumbPrint(cacheFile);
+            var outputFilethumbPrint = GetThumbPrint(outputFile);
 
-            result = await DotnetMSBuild("Build");
+            // Couple rounds of incremental builds.
+            await AssertIncrementalBuild();
+            await AssertIncrementalBuild();
+            await AssertIncrementalBuild();
 
-            Assert.BuildPassed(result);
+            async Task AssertIncrementalBuild()
+            {
+                result = await DotnetMSBuild("Build");
 
-            Assert.FileExists(result, generatedAttributeFile);
-            Assert.Equal(thumbPrint, GetThumbPrint(generatedAttributeFile));
+                Assert.BuildPassed(result);
+
+                Assert.FileDoesNotExist(result, generatedAttributeFile);
+                Assert.FileExists(result, cacheFile);
+                Assert.Equal(cacheFilethumbPrint, GetThumbPrint(cacheFile));
+                Assert.Equal(outputFilethumbPrint, GetThumbPrint(outputFile));
+            }
         }
     }
 }

From ab867ec5e2b6454b5c67e5ea1f511dfcb29b5864 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 20 Jun 2019 16:01:29 -0700
Subject: [PATCH 182/337] Allow @bind:event override when used with @bind
 (dotnet/aspnetcore-tooling#687)

* Allow @bind:event override when used with @bind

* Added more tests to cover standalone @bind-value=... case

* fix
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a399bd072e04f394de843ac100bd16fdd926a993
---
 .../Components/ComponentBindLoweringPass.cs   |  8 +-
 .../ComponentCodeGenerationTestBase.cs        | 82 +++++++++++++++++++
 .../TestComponent.codegen.cs                  | 45 ++++++++++
 .../TestComponent.ir.txt                      | 29 +++++++
 .../TestComponent.mappings.txt                | 14 ++++
 .../TestComponent.codegen.cs                  | 45 ++++++++++
 .../TestComponent.ir.txt                      | 31 +++++++
 .../TestComponent.mappings.txt                | 14 ++++
 .../TestComponent.codegen.cs                  | 45 ++++++++++
 .../TestComponent.ir.txt                      | 31 +++++++
 .../TestComponent.mappings.txt                | 14 ++++
 .../TestComponent.codegen.cs                  | 45 ++++++++++
 .../TestComponent.ir.txt                      | 31 +++++++
 .../TestComponent.mappings.txt                | 14 ++++
 .../TestComponent.codegen.cs                  | 41 ++++++++++
 .../TestComponent.ir.txt                      | 20 +++++
 .../TestComponent.mappings.txt                |  9 ++
 .../TestComponent.codegen.cs                  | 41 ++++++++++
 .../TestComponent.ir.txt                      | 22 +++++
 .../TestComponent.mappings.txt                |  9 ++
 .../TestComponent.codegen.cs                  | 41 ++++++++++
 .../TestComponent.ir.txt                      | 22 +++++
 .../TestComponent.mappings.txt                |  9 ++
 .../TestComponent.codegen.cs                  | 41 ++++++++++
 .../TestComponent.ir.txt                      | 22 +++++
 .../TestComponent.mappings.txt                |  9 ++
 .../BindAttributes.cs                         |  4 +
 27 files changed, 736 insertions(+), 2 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 824a067938..f7b56c84b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -538,8 +538,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             var node = bindEntry.BindNode;
             var attributeName = node.AttributeName;
             valueAttributeName = node.TagHelper.GetValueAttributeName() ?? valueAttributeName;
-            changeAttributeName = node.TagHelper.GetChangeAttributeName() ?? changeAttributeName;
-            expressionAttributeName = node.TagHelper.GetExpressionAttributeName() ?? expressionAttributeName;
+
+            // If there an attribute that specifies the event like @bind:event="oninput",
+            // that should be preferred. Otherwise, use the one from the tag helper.
+            changeAttributeName ??= node.TagHelper.GetChangeAttributeName();
+
+            expressionAttributeName = node.TagHelper.GetExpressionAttributeName();
 
             // We expect 0-1 components per-node.
             var componentTagHelper = (parent as ComponentIntermediateNode)?.Component;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 161309edc6..079cc1e4eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -958,6 +958,34 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BindToElementWithSuffix_OverridesEvent()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+<div @bind-value=""@ParentValue"" @bind-value:event=""anotherevent"" />
+@code {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void BuiltIn_BindToInputWithoutType_WritesAttributes()
         {
@@ -1086,6 +1114,60 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BuiltIn_BindToInputText_CanOverrideEvent()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input @bind=""@CurrentDate"" @bind:event=""oninput"" @bind:format=""MM/dd"" />
+@code {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputWithSuffix()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input @bind-value=""@CurrentDate"" @bind-value:format=""MM/dd"" />
+@code {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputWithSuffix_CanOverrideEvent()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input @bind-value=""@CurrentDate"" @bind-value:event=""oninput"" @bind-value:format=""MM/dd"" />
+@code {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Child Content
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5d14fcab61
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
new file mode 100644
index 0000000000..8c31a82e4a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                HtmlContent - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8a91076d22
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (935:25,19 [11] )
+|ParentValue|
+
+Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1280:36,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1bd25aaf98
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+               CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
new file mode 100644
index 0000000000..aa643a3045
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6fae1a9b42
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (931:25,15 [11] )
+|CurrentDate|
+
+Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1294:36,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2a415eee3c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
new file mode 100644
index 0000000000..975db3e873
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                HtmlContent - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9791dac860
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (937:25,21 [11] )
+|CurrentDate|
+
+Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1300:36,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2a415eee3c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
new file mode 100644
index 0000000000..3319fd77cc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                HtmlContent - (91:0,91 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (91:0,91 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..0a5e0b32b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (937:25,21 [11] )
+|CurrentDate|
+
+Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1300:36,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..17eafde372
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("myvalue");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
new file mode 100644
index 0000000000..c8dac0abfd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+            CSharpCode - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..805cf5a81d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1215:32,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..78f6bb9271
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+               CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd"));
+            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
new file mode 100644
index 0000000000..8a1331fde5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+            CSharpCode - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..1b2350f9fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1222:32,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bf71543f1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd"));
+            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
new file mode 100644
index 0000000000..524adcd57d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+            CSharpCode - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6ae2a3495e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1229:32,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ef0bc29c0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd"));
+            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
new file mode 100644
index 0000000000..198f840b71
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+            CSharpCode - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2aaa3147ad
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1228:32,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
index bb87b6efe5..6d319c0b60 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
@@ -15,6 +15,10 @@ namespace Microsoft.AspNetCore.Components
     // when a specific type attribute is applied.
     [BindInputElement(null, null, "value", "onchange")]
 
+    // Handles cases like <input @bind-value="..." /> - this is a fallback and will be ignored
+    // when a specific type attribute is applied.
+    [BindInputElement(null, "value", "value", "onchange")]
+
     [BindInputElement("checkbox", null, "checked", "onchange")]
     [BindInputElement("text", null, "value", "onchange")]
 

From fa65b30dce92034aadcd93615b87e484aea15b2f Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 20 Jun 2019 17:05:59 -0700
Subject: [PATCH 183/337] Don't require preceding @ for event handler directive
 attributes (dotnet/aspnetcore-tooling#658)

* Don't require preceding @ for event handler directive attributes

* updated event handler th attribute type
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6dce1532be15c289fb56a64fe25faa1a3be43763
---
 .../ComponentCodeGenerationTestBase.cs        | 30 +++++++++----------
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 24 +++++++--------
 .../TestComponent.mappings.txt                | 10 +++----
 .../TestComponent.codegen.cs                  |  7 ++---
 .../TestComponent.diagnostics.txt             |  2 +-
 .../TestComponent.ir.txt                      | 22 +++++++-------
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  1 -
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  6 ++--
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  6 ++--
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 14 ++++-----
 .../TestComponent.mappings.txt                |  8 ++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  6 ++--
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  1 -
 .../TestComponent.ir.txt                      | 10 +++----
 .../Regression_784/TestComponent.codegen.cs   |  4 +--
 .../Regression_784/TestComponent.ir.txt       | 30 +++++++++----------
 .../Regression_784/TestComponent.mappings.txt | 12 ++++----
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 16 +++++-----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  8 ++---
 .../TestComponent.diagnostics.txt             |  2 +-
 .../TestComponent.ir.txt                      | 22 +++++++-------
 .../TestComponent.codegen.cs                  |  4 +--
 .../TestComponent.ir.txt                      |  7 +----
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  6 ++--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  6 ++--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +++----
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  6 ++--
 .../TestComponent.codegen.cs                  |  4 +--
 .../TestComponent.ir.txt                      |  7 +----
 .../Regression_784/TestComponent.codegen.cs   |  4 +--
 .../Regression_784/TestComponent.ir.txt       | 22 +++++++-------
 .../Regression_784/TestComponent.mappings.txt |  4 +--
 ...EventHandlerTagHelperDescriptorProvider.cs | 11 +++----
 ...tHandlerTagHelperDescriptorProviderTest.cs |  6 ++--
 87 files changed, 308 insertions(+), 328 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 079cc1e4eb..e46a5808d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2200,7 +2200,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<DynamicElement @onclick=""@OnClick"" />
+<DynamicElement @onclick=""OnClick"" />
 
 @code {
     private Action<UIMouseEventArgs> OnClick { get; set; }
@@ -2254,7 +2254,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""foo"" />");
+<input onclick=""foo"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2269,7 +2269,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@(() => { })"" />");
+<input @onclick=""() => { }"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2284,7 +2284,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@(x => { })"" />");
+<input @onclick=""x => { }"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2299,7 +2299,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@OnClick"" />
+<input @onclick=""OnClick"" />
 @code {
     void OnClick() {
     }
@@ -2318,7 +2318,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@OnClick"" />
+<input @onclick=""OnClick"" />
 @code {
     void OnClick(UIMouseEventArgs e) {
     }
@@ -2337,7 +2337,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@OnClick"" />
+<input @onclick=""OnClick"" />
 @code {
     void OnClick(UIEventArgs e) {
     }
@@ -2357,7 +2357,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
-<input @onclick=""@OnClick"" />
+<input @onclick=""OnClick"" />
 @code {
     Task OnClick() 
     {
@@ -2379,7 +2379,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
-<input @onclick=""@OnClick"" />
+<input @onclick=""OnClick"" />
 @code {
     Task OnClick(UIMouseEventArgs e) 
     {
@@ -2434,7 +2434,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@(x => { })"" />");
+<input @onclick=""x => { }"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2449,7 +2449,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<input @onclick=""@OnClick"" />
+<input @onclick=""OnClick"" />
 @code {
     void OnClick(UIMouseEventArgs e) {
     }
@@ -3907,7 +3907,7 @@ namespace New.Test
             // Act
             var generated = CompileToCSharp(@"
 <div>
-  <a @onclick=""test()"" onclick=""@(() => {})"">Learn the ten cool tricks your compiler author will hate!</a>
+  <a onclick=""test()"" @onclick=""() => {}"">Learn the ten cool tricks your compiler author will hate!</a>
 </div>");
 
             // Assert
@@ -3971,7 +3971,7 @@ namespace New.Test
             // Act
             var generated = CompileToCSharp(@"
 <div>
-  <input type=""text"" @bind-value=""@text"" @bind-value:event=""oninput"" @oninput=""@(() => {})""></input>
+  <input type=""text"" @bind-value=""@text"" @bind-value:event=""oninput"" @oninput=""() => {}""></input>
 </div>
 @functions {
     private string text = ""hi"";
@@ -4343,7 +4343,7 @@ Welcome to your new app.
 
             // Act
             var generated = CompileToCSharp(@"
-<p @onmouseover=""@OnComponentHover"" style=""background: @ParentBgColor;"" />
+<p @onmouseover=""OnComponentHover"" style=""background: @ParentBgColor;"" />
 @code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
@@ -4364,7 +4364,7 @@ Welcome to your new app.
         {
             // Act
             var generated = CompileToCSharp(@"
-<input @onfocus='alert(""Test"");' />
+<input onfocus='alert(""Test"");' />
 ");
 
             // Assert
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index aa32ffa3b1..4373ee345a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 04ca37df2e..d104d57b31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -16,13 +16,13 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index e4365527cb..b1c23219e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -3,19 +3,19 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1114:31,18 [7] )
+Generated Location: (1113:31,17 [7] )
 |OnClick|
 
-Source Location: (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1315:41,7 [91] )
+Generated Location: (1314:41,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 1785060288..aa6e62e133 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 2d0729fedc..531cbcd767 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -16,13 +16,13 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 5bcd56774a..43e8394eab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -3,19 +3,19 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1114:31,18 [7] )
+Generated Location: (1113:31,17 [7] )
 |OnClick|
 
-Source Location: (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1315:41,7 [73] )
+Generated Location: (1314:41,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index a6a44224c7..1fd65b306f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           OnClick
+                          OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 942be4edad..d7a54982db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (26:0,26 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (27:0,27 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+                HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 1024f46464..df73069bc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (27:0,27 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1007:25,27 [7] )
+Generated Location: (1006:25,26 [7] )
 |OnClick|
 
-Source Location: (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1510:45,7 [62] )
+Generated Location: (1509:45,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index b4872cefdb..cab428a587 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                                 () => {}
+                                                                               () => {}
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 856c6d91d8..66ab4589f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -14,17 +14,17 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [115] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [98] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                        HtmlAttribute - (86:1,79 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
-                                IntermediateToken - (88:1,81 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
@@ -34,11 +34,11 @@ Document -
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
-                    HtmlContent - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (115:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (115:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (165:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 9b7da4966a..4e0821e071 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (88:1,81 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1062:25,81 [8] )
+Generated Location: (1060:25,79 [8] )
 |() => {}|
 
 Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1316:34,35 [4] )
+Generated Location: (1314:34,35 [4] )
 |text|
 
-Source Location: (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1645:45,12 [35] )
+Generated Location: (1643:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 617f101873..5e34b28ba8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -20,16 +20,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "test()");
-            __o = 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                  () => {}
+                                () => {}
 
 #line default
 #line hidden
 #nullable disable
-            ;
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
index aa1716633e..adbe7b6d1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,16): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index dfb2450cac..657771dad7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -14,19 +14,19 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [121] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [104] x:\dir\subdir\Test\TestComponent.cshtml) - a
-                        HtmlContent - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
-                        HtmlAttribute - (22:1,15 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                    MarkupElement - (9:1,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                        HtmlAttribute -  - onclick=" - "
+                            HtmlAttributeValue - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test()
+                        HtmlAttribute - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                                IntermediateToken -  - CSharp - "test()"
+                                IntermediateToken - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute -  - onclick=" - "
-                            CSharpExpressionAttributeValue - (39:1,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (41:1,34 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
-                    HtmlContent - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    HtmlContent - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index 813ddccd4d..b9ca5dff5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (41:1,34 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1044:26,34 [8] )
+Generated Location: (1012:25,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 7a5d1714fe..3efad2f87c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -20,7 +20,6 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, "alert(\"Test\");");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index fc7c278400..7bc79b2b01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -14,11 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, 
-                            IntermediateToken -  - CSharp - "alert(\"Test\");"
-                            IntermediateToken -  - CSharp - )
-                HtmlContent - (35:0,35 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (35:0,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (6:0,6 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  onfocus=' - '
+                        HtmlAttributeValue - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - alert("Test");
+                HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index e1702b78a5..a42a603e25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index cdb4d52a62..5e4c6c8261 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 588fca2943..7cf5ff3937 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,18 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1199:35,7 [44] )
+Generated Location: (1198:35,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 29f88f5016..12d154ab22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index bdba39bc17..e7f312ba86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 2ba283cea5..e1f412da5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,18 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1199:35,7 [49] )
+Generated Location: (1198:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 6dd2b3847f..5b6f9c5dc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   x => { }
+                 x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index d2f1bcc92f..e1a6a47c3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -14,9 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 7924871b0c..2163c8d618 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (999:25,19 [8] )
+Generated Location: (997:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 29f88f5016..12d154ab22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index bdba39bc17..e7f312ba86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 2ba283cea5..e1f412da5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,18 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1199:35,7 [49] )
+Generated Location: (1198:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 6dd2b3847f..5b6f9c5dc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   x => { }
+                 x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index d2f1bcc92f..e1a6a47c3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -14,9 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
index 7924871b0c..2163c8d618 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (999:25,19 [8] )
+Generated Location: (997:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 95eb1c9d08..1ba6d3e13b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index 08fe7bb5ae..9fff4a39b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 82e82d15bc..b914ee847f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,18 [7] )
+Generated Location: (997:25,17 [7] )
 |OnClick|
 
-Source Location: (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1199:35,7 [31] )
+Generated Location: (1198:35,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 3a8ea027c8..f221cfb12b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   () => { }
+                 () => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index 49b9ddde90..234a1523df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -14,9 +14,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index da1c213c30..13719679ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
-Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (999:25,19 [9] )
+Generated Location: (997:25,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 6cac55e9bf..3efad2f87c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -20,7 +20,6 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "foo");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index d66e33fdd2..f32c4c6f73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -14,9 +14,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [24] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken -  - CSharp - "foo"
-                            IntermediateToken -  - CSharp - )
+                MarkupElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (6:0,6 [14] x:\dir\subdir\Test\TestComponent.cshtml) -  onclick=" - "
+                        HtmlAttributeValue - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 11e53fb4ca..71d5915f96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnComponentHover
+                 OnComponentHover
 
 #line default
 #line hidden
@@ -32,7 +32,7 @@ namespace Test
             __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                        ParentBgColor
+                                                       ParentBgColor
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index d28d68fe22..041a016b22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -14,22 +14,22 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlAttribute - (17:0,17 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute -  - style=" - "
-                        HtmlAttributeValue - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
-                        CSharpExpressionAttributeValue - (54:0,54 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (56:0,56 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
-                        HtmlAttributeValue - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-                HtmlContent - (74:0,74 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (74:0,74 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (216:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (216:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 775a12f2e0..d0728f1374 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (18:0,18 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (998:25,18 [16] )
+Generated Location: (997:25,17 [16] )
 |OnComponentHover|
 
-Source Location: (56:0,56 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1228:34,56 [13] )
+Generated Location: (1226:34,55 [13] )
 |ParentBgColor|
 
-Source Location: (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
@@ -16,7 +16,7 @@ Source Location: (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1434:44,7 [132] )
+Generated Location: (1432:44,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 097486bf7a..0de58c905e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index c040f1222f..9506593db1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 8c87d4c1b2..8072d716d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (69:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(UIMouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1160:36,7 [91] )
+Generated Location: (1159:36,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 90aec847ea..344c8f5874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 052679d9f3..ffc83adba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (49:1,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 936b86db90..5b0eda19dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (69:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1160:36,7 [73] )
+Generated Location: (1159:36,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 93adc09d68..9557b72ba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                           OnClick
+                          OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 50a6aff9cc..e432d4d02c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (26:0,26 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (27:0,27 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 6da786c37d..3af91c4f40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (49:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1069:30,7 [62] )
+Generated Location: (1068:30,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 86c6a21de8..a5d86e2843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
             builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                                 () => {}
+                                                                               () => {}
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index bc501039a0..3aba10d439 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -7,17 +7,17 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [115] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [98] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                        HtmlAttribute - (86:1,79 [11] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
-                                IntermediateToken - (88:1,81 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
@@ -27,7 +27,7 @@ Document -
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
-                    HtmlContent - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (107:1,100 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 9204fca3a4..7a22e2b1dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (129:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1840:46,12 [35] )
+Generated Location: (1838:46,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index ae1a95bc74..ac36be0c36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -16,16 +16,16 @@ namespace Test
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
             builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "test()"));
-            builder.AddAttribute(4, "onclick", 
+            builder.AddAttribute(3, "onclick", "test()");
+            builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                  () => {}
+                                () => {}
 
 #line default
 #line hidden
 #nullable disable
-            );
+            ));
             builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
             builder.CloseElement();
             builder.AddMarkupContent(6, "\r\n");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
index aa1716633e..adbe7b6d1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,16): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index dfdcbb5b62..45ace5fb3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -7,19 +7,19 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [121] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                MarkupElement - (0:0,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [104] x:\dir\subdir\Test\TestComponent.cshtml) - a
-                        HtmlContent - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (52:1,45 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
-                        HtmlAttribute - (22:1,15 [6] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                    MarkupElement - (9:1,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                        HtmlAttribute -  - onclick=" - "
+                            HtmlAttributeValue - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test()
+                        HtmlAttribute - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                                IntermediateToken -  - CSharp - "test()"
+                                IntermediateToken - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute -  - onclick=" - "
-                            CSharpExpressionAttributeValue - (39:1,32 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (41:1,34 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
-                    HtmlContent - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (113:1,106 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    HtmlContent - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 5d0ad5ee6a..cdc2a3c824 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -13,9 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onfocus", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, "alert(\"Test\");"));
-            builder.CloseElement();
+            builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 0716b1247f..399a50f0ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -7,9 +7,4 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIFocusEventArgs>(this, 
-                            IntermediateToken -  - CSharp - "alert(\"Test\");"
-                            IntermediateToken -  - CSharp - )
+                MarkupBlock -  - <input onfocus="alert("Test");">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 930e6e8d3f..899beb4979 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index b342721c6c..aed450fd43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 16c66ff865..4e484723a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (38:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1044:30,7 [44] )
+Generated Location: (1043:30,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 3456fae0ba..0352718012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index b65bcfeeff..9211a9e5a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 7b71e90d6c..a253687898 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1044:30,7 [49] )
+Generated Location: (1043:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 2d569c7112..b488b76b7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   x => { }
+                 x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index 124224c0b3..ee30388162 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 3456fae0ba..0352718012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index b65bcfeeff..9211a9e5a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 7b71e90d6c..a253687898 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (38:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1044:30,7 [49] )
+Generated Location: (1043:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 2d569c7112..b488b76b7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   x => { }
+                 x => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index 124224c0b3..ee30388162 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 1b5554e598..dc04883067 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnClick
+                 OnClick
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index fa8aa00e3b..9cd8015de0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 9b9d151b3e..be2c68512e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (38:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1044:30,7 [31] )
+Generated Location: (1043:30,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 514cb5f9dc..0a29382e20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   () => { }
+                 () => { }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index 07dccb7c4a..857b8fbca4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index a75cbd6deb..9264e6e15f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -13,9 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, "foo"));
-            builder.CloseElement();
+            builder.AddMarkupContent(0, "<input onclick=\"foo\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 74ba68bb2d..4b4f7fc2f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -7,9 +7,4 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [24] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken -  - CSharp - "foo"
-                            IntermediateToken -  - CSharp - )
+                MarkupBlock -  - <input onclick="foo">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index e57aea470f..90748b1dbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ namespace Test
             builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                  OnComponentHover
+                 OnComponentHover
 
 #line default
 #line hidden
@@ -26,7 +26,7 @@ namespace Test
             builder.AddAttribute(2, "style", "background:" + " " + (
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                        ParentBgColor
+                                                       ParentBgColor
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 904399a25b..e7ce186d9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -7,18 +7,18 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlAttribute - (17:0,17 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (18:0,18 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute -  - style=" - "
-                        HtmlAttributeValue - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
-                        CSharpExpressionAttributeValue - (54:0,54 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (56:0,56 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
-                        HtmlAttributeValue - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (69:0,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-            CSharpCode - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 84f51ae7e4..8ae9e341a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
@@ -6,7 +6,7 @@ Source Location: (83:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1337:39,7 [132] )
+Generated Location: (1335:39,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 142881c134..d8683796a9 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -103,15 +103,16 @@ namespace Microsoft.CodeAnalysis.Razor
             {
                 var entry = data[i];
                 var attributeName = "@" + entry.Attribute;
+                var eventArgType = entry.EventArgsType.ToDisplayString();
 
                 var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.EventHandler.TagHelperKind, entry.Attribute, ComponentsApi.AssemblyName);
                 builder.Documentation = string.Format(
                     ComponentResources.EventHandlerTagHelper_Documentation,
                     attributeName,
-                    entry.EventArgsType.ToDisplayString());
+                    eventArgType);
 
                 builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.EventHandler.TagHelperKind);
-                builder.Metadata.Add(ComponentMetadata.EventHandler.EventArgsType, entry.EventArgsType.ToDisplayString());
+                builder.Metadata.Add(ComponentMetadata.EventHandler.EventArgsType, eventArgType);
                 builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
                 builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.EventHandler.RuntimeName;
 
@@ -136,12 +137,12 @@ namespace Microsoft.CodeAnalysis.Razor
                     a.Documentation = string.Format(
                         ComponentResources.EventHandlerTagHelper_Documentation,
                         attributeName,
-                        entry.EventArgsType.ToDisplayString());
+                        eventArgType);
 
                     a.Name = attributeName;
 
-                    // Use a string here so that we get HTML context by default.
-                    a.TypeName = typeof(string).FullName;
+                    // We want event handler directive attributes to default to C# context.
+                    a.TypeName = $"Microsoft.AspNetCore.Components.EventCallback<{eventArgType}>";
 
                     // But make this weakly typed (don't type check) - delegates have their own type-checking
                     // logic that we don't want to interfere with.
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index e1772d04ac..e2d372f1fe 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -111,11 +111,11 @@ namespace Test
 
             Assert.Equal("@onclick", attribute.Name);
             Assert.Equal("onclick", attribute.GetPropertyName());
-            Assert.Equal("string Test.EventHandlers.onclick", attribute.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>> Test.EventHandlers.onclick", attribute.DisplayName);
 
             // Defined from the property type
-            Assert.Equal("System.String", attribute.TypeName);
-            Assert.True(attribute.IsStringProperty);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>>", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
         }

From ef4773a2d5e8e3b24c881169614ab113f0e56ac2 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 21 Jun 2019 14:48:09 -0700
Subject: [PATCH 184/337] Add attribute splatting compiler support
 (dotnet/aspnetcore-tooling#640)

* Add TagHelperDescriptorProvider

* Remove bad life-choice

* Add some AddRange love

* Add splatting lowering and codegen

* PR feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9c8dd1cae7c018bcd4ed025722085daa41342114
---
 .../CodeGeneration/DefaultDocumentWriter.cs   |   5 +
 .../CodeGeneration/IntermediateNodeWriter.cs  |   5 +
 .../src/ComponentResources.resx               |   3 +
 .../ComponentDesignTimeNodeWriter.cs          |  91 ++++++++-
 .../src/Components/ComponentMetadata.cs       |  17 +-
 .../src/Components/ComponentNodeWriter.cs     |  52 +++--
 .../Components/ComponentRuntimeNodeWriter.cs  | 105 ++++++++--
 .../Components/ComponentSplatLoweringPass.cs  |  52 +++++
 .../src/Components/ComponentsApi.cs           |   4 +
 .../TagHelperDescriptorExtensions.cs          |  22 +++
 .../src/DefaultRazorTagHelperBinderPhase.cs   |   4 +-
 .../Intermediate/ComponentIntermediateNode.cs |   5 +-
 ...nentTypeInferenceMethodIntermediateNode.cs |   2 -
 .../IntermediateNodeCollection.cs             |  27 +++
 .../Intermediate/IntermediateNodeVisitor.cs   |   5 +
 .../MarkupElementIntermediateNode.cs          |   1 +
 .../src/Intermediate/SplatIntermediateNode.cs |  32 ++++
 .../src/RazorDiagnosticCollection.cs          |  10 +
 .../src/RazorProjectEngine.cs                 |   1 +
 .../ComponentCodeGenerationTestBase.cs        | 179 ++++++++++++++++++
 .../test/RazorProjectEngineTest.cs            |   1 +
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../Component_WithSplat/TestComponent.ir.txt  |  31 +++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../TestComponent.ir.txt                      |  31 +++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  73 +++++++
 .../TestComponent.ir.txt                      |  30 +++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../TestComponent.ir.txt                      |  31 +++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  44 +++++
 .../Element_WithSplat/TestComponent.ir.txt    |  33 ++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  53 ++++++
 .../TestComponent.ir.txt                      |  34 ++++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  53 ++++++
 .../TestComponent.ir.txt                      |  34 ++++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  44 +++++
 .../TestComponent.ir.txt                      |  33 ++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  44 +++++
 .../TestComponent.ir.txt                      |  33 ++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  41 ++++
 .../Component_WithSplat/TestComponent.ir.txt  |  20 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  41 ++++
 .../TestComponent.ir.txt                      |  20 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  59 ++++++
 .../TestComponent.ir.txt                      |  19 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  59 ++++++
 .../TestComponent.ir.txt                      |  20 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  41 ++++
 .../TestComponent.ir.txt                      |  20 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  42 ++++
 .../Element_WithSplat/TestComponent.ir.txt    |  22 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  50 +++++
 .../TestComponent.ir.txt                      |  23 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  50 +++++
 .../TestComponent.ir.txt                      |  23 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  42 ++++
 .../TestComponent.ir.txt                      |  22 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  42 ++++
 .../TestComponent.ir.txt                      |  22 +++
 .../TestComponent.mappings.txt                |   9 +
 .../src/CompilerFeatures.cs                   |   1 +
 .../src/SplatTagHelperDescriptorProvider.cs   |  79 ++++++++
 .../SplatTagHelperDescriptorProviderTest.cs   |  87 +++++++++
 .../RenderTree/RenderTreeBuilder.cs           |   4 +
 82 files changed, 2416 insertions(+), 56 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentSplatLoweringPass.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SplatIntermediateNode.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
index e665bbc024..fcae6150cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -304,6 +304,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 Context.NodeWriter.WriteSetKey(Context, node);
             }
 
+            public override void VisitSplat(SplatIntermediateNode node)
+            {
+                Context.NodeWriter.WriteSplat(Context, node);
+            }
+
             public override void VisitDefault(IntermediateNode node)
             {
                 Context.RenderChildren(node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
index d4e49066f9..5d6d116fc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/IntermediateNodeWriter.cs
@@ -69,6 +69,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             throw new NotSupportedException("This writer does not support components.");
         }
 
+        public virtual void WriteSplat(CodeRenderingContext context, SplatIntermediateNode node)
+        {
+            throw new NotSupportedException("This writer does not support components.");
+        }
+
         public abstract void BeginWriterScope(CodeRenderingContext context, string writer);
 
         public abstract void EndWriterScope(CodeRenderingContext context);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 8b9c27a0de..178f1bb59b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -195,6 +195,9 @@
   <data name="RefTagHelper_Documentation" xml:space="preserve">
     <value>Populates the specified field or property with a reference to the element or component.</value>
   </data>
+  <data name="SplatTagHelper_Documentation" xml:space="preserve">
+    <value>Merges a collection of attributes into the current element or component.</value>
+  </data>
   <data name="TypeParamDirective_Description" xml:space="preserve">
     <value>Declares a generic type parameter for the generated component class.</value>
   </data>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 9b38d73700..7885d47f8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -317,14 +317,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // builder.SetKey(someValue);
                 // builder.AddElementCapture(3, (__value) => _field = __value);
                 // builder.CloseComponent();
+
                 foreach (var typeArgument in node.TypeArguments)
                 {
                     context.RenderNode(typeArgument);
                 }
 
-                foreach (var attribute in node.Attributes)
+                // We need to preserve order for attibutes and attribute splats since the ordering
+                // has a semantic effect.
+
+                foreach (var child in node.Children)
                 {
-                    context.RenderNode(attribute);
+                    if (child is ComponentAttributeIntermediateNode attribute)
+                    {
+                        context.RenderNode(attribute);
+                    }
+                    else if (child is SplatIntermediateNode splat)
+                    {
+                        context.RenderNode(splat);
+                    }
                 }
 
                 if (node.ChildContents.Any())
@@ -365,7 +376,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // to that method. We pass in all of the attribute values + the sequence numbers.
                 //
                 // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ....);
-                var attributes = node.Attributes.ToList();
+
+                // Preserve order of attributes + splats
+                var attributes = node.Children.Where(s =>
+                {
+                    return s is ComponentAttributeIntermediateNode || s is SplatIntermediateNode;
+                }).ToList();
                 var childContents = node.ChildContents.ToList();
                 var captures = node.Captures.ToList();
                 var setKeys = node.SetKeys.ToList();
@@ -390,7 +406,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     // Don't type check generics, since we can't actually write the type name.
                     // The type checking with happen anyway since we defined a method and we're generating
                     // a call to it.
-                    WriteComponentAttributeInnards(context, attributes[i], canTypeCheck: false);
+                    if (attributes[i] is ComponentAttributeIntermediateNode attribute)
+                    {
+                        WriteComponentAttributeInnards(context, attribute, canTypeCheck: false);
+                    }
+                    else if (attributes[i] is SplatIntermediateNode splat)
+                    {
+                        WriteSplatInnards(context, splat, canTypeCheck: false);
+                    }
 
                     remaining--;
                     if (remaining > 0)
@@ -630,13 +653,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             bool NeedsTypeCheck(ComponentAttributeIntermediateNode n)
             {
                 return n.BoundAttribute != null && !n.BoundAttribute.IsWeaklyTyped();
-            }
+            }   
+        }
 
-            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeIntermediateNode attribute)
-            {
-                // We generally expect all children to be CSharp, this is here just in case.
-                return attribute.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
-            }
+        private IReadOnlyList<IntermediateToken> GetCSharpTokens(IntermediateNode node)
+        {
+            // We generally expect all children to be CSharp, this is here just in case.
+            return node.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
         }
 
         public override void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
@@ -774,6 +797,54 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             });
         }
 
+        public override void WriteSplat(CodeRenderingContext context, SplatIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            //
+            // builder.AddMultipleAttributes(2, ...);
+            context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMultipleAttributes}");
+            context.CodeWriter.Write("-1");
+            context.CodeWriter.WriteParameterSeparator();
+
+            WriteSplatInnards(context, node, canTypeCheck: true);
+
+            context.CodeWriter.WriteEndMethodInvocation();
+        }
+
+        private void WriteSplatInnards(CodeRenderingContext context, SplatIntermediateNode node, bool canTypeCheck)
+        {
+            var tokens = GetCSharpTokens(node);
+
+            if (canTypeCheck)
+            {
+                context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck);
+                context.CodeWriter.Write("<");
+                context.CodeWriter.Write(ComponentsApi.AddMultipleAttributesTypeFullName);
+                context.CodeWriter.Write(">");
+                context.CodeWriter.Write("(");
+            }
+
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                WriteCSharpToken(context, tokens[i]);
+            }
+
+            if (canTypeCheck)
+            {
+                context.CodeWriter.Write(")");
+            }
+        }
+
         public override void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
         {
             if (context == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index 217ae776e6..4c6db3048e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -17,16 +17,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly string ImportsFileName = "_Imports.razor";
 
-        public static bool IsComponentTagHelperKind(string tagHelperKind)
-        {
-            return tagHelperKind == Component.TagHelperKind ||
-                tagHelperKind == ChildContent.TagHelperKind ||
-                tagHelperKind == EventHandler.TagHelperKind ||
-                tagHelperKind == Bind.TagHelperKind ||
-                tagHelperKind == Key.TagHelperKind ||
-                tagHelperKind == Ref.TagHelperKind;
-        }
-
         public static string MangleClassName(string className)
         {
             if (string.IsNullOrEmpty(className))
@@ -131,6 +121,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string RuntimeName = "Components.None";
         }
 
+        public static class Splat
+        {
+            public readonly static string TagHelperKind = "Components.Splat";
+
+            public static readonly string RuntimeName = "Components.None";
+        }
+
         public static class Ref
         {
             public readonly static string TagHelperKind = "Components.Ref";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index ca8704fef0..a10cdba86d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -130,19 +130,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             context.CodeWriter.WriteLine();
 
             var index = 0;
-            foreach (var attribute in node.Component.Attributes)
+
+            // Preserve order of attributes and splat.
+            foreach (var child in node.Component.Children)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
-                context.CodeWriter.Write(parameters[index].seqName);
-                context.CodeWriter.Write(", ");
+                if (child is ComponentAttributeIntermediateNode attribute)
+                {
+                    context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                    context.CodeWriter.Write(parameters[index].seqName);
+                    context.CodeWriter.Write(", ");
 
-                context.CodeWriter.Write($"\"{attribute.AttributeName}\"");
-                context.CodeWriter.Write(", ");
+                    context.CodeWriter.Write($"\"{attribute.AttributeName}\"");
+                    context.CodeWriter.Write(", ");
 
-                context.CodeWriter.Write(parameters[index].parameterName);
-                context.CodeWriter.WriteEndMethodInvocation();
+                    context.CodeWriter.Write(parameters[index].parameterName);
+                    context.CodeWriter.WriteEndMethodInvocation();
+                    index++;
+                }
+                else if (child is SplatIntermediateNode)
+                {
+                    context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddMultipleAttributes);
+                    context.CodeWriter.Write(parameters[index].seqName);
+                    context.CodeWriter.Write(", ");
 
-                index++;
+                    context.CodeWriter.Write(parameters[index].parameterName);
+                    context.CodeWriter.WriteEndMethodInvocation();
+                    index++;
+                }
             }
 
             foreach (var childContent in node.Component.ChildContents)
@@ -189,14 +203,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             List<(string seqName, string typeName, string parameterName)> GetParameterDeclarations()
             {
                 var p = new List<(string seqName, string typeName, string parameterName)>();
-                foreach (var attribute in node.Component.Attributes)
+
+                // Preserve order between attributes and splats
+                foreach (var child in node.Component.Children)
                 {
-                    var typeName = attribute.TypeName;
-                    if (attribute.BoundAttribute != null && !attribute.BoundAttribute.IsGenericTypedProperty())
+                    if (child is ComponentAttributeIntermediateNode attribute)
                     {
-                        typeName = "global::" + typeName;
+                        var typeName = attribute.TypeName;
+                        if (attribute.BoundAttribute != null && !attribute.BoundAttribute.IsGenericTypedProperty())
+                        {
+                            typeName = "global::" + typeName;
+                        }
+                        p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
+                    }
+                    else if (child is SplatIntermediateNode splat)
+                    {
+                        var typeName = ComponentsApi.AddMultipleAttributesTypeFullName;
+                        p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
                     }
-                    p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
                 }
 
                 foreach (var childContent in node.Component.ChildContents)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 2330b1adfe..418aa160f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -184,10 +184,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 .WriteStringLiteral(node.TagName)
                 .WriteEndMethodInvocation();
 
-            // Render Attributes before creating the scope.
-            foreach (var attribute in node.Attributes)
+            // Render attributes and splats (in order) before creating the scope.
+            foreach (var child in node.Children)
             {
-                context.RenderNode(attribute);
+                if (child is HtmlAttributeIntermediateNode attribute)
+                {
+                    context.RenderNode(attribute);
+                }
+                else if (child is SplatIntermediateNode splat)
+                {
+                    context.RenderNode(splat);
+                }
             }
 
             foreach (var setKey in node.SetKeys)
@@ -348,9 +355,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // We can skip type arguments during runtime codegen, they are handled in the
                 // type/parameter declarations.
 
-                foreach (var attribute in node.Attributes)
+                // Preserve order of attributes and splats
+                foreach (var child in node.Children)
                 {
-                    context.RenderNode(attribute);
+                    if (child is ComponentAttributeIntermediateNode attribute)
+                    {
+                        context.RenderNode(attribute);
+                    }
+                    else if (child is SplatIntermediateNode splat)
+                    {
+                        context.RenderNode(splat);
+                    }
                 }
 
                 foreach (var childContent in node.ChildContents)
@@ -382,7 +397,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // to that method. We pass in all of the attribute values + the sequence numbers.
                 //
                 // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ...);
-                var attributes = node.Attributes.ToList();
+
+                // Preserve order of attributes and splats
+                var attributes = node.Children.Where(n =>
+                {
+                    return n is ComponentAttributeIntermediateNode || n is SplatIntermediateNode;
+                }).ToList();
                 var childContents = node.ChildContents.ToList();
                 var captures = node.Captures.ToList();
                 var setKeys = node.SetKeys.ToList();
@@ -407,7 +427,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     // Don't type check generics, since we can't actually write the type name.
                     // The type checking with happen anyway since we defined a method and we're generating
                     // a call to it.
-                    WriteComponentAttributeInnards(context, attributes[i], canTypeCheck: false);
+                    if (attributes[i] is ComponentAttributeIntermediateNode attribute)
+                    {
+                        WriteComponentAttributeInnards(context, attribute, canTypeCheck: false);
+                    }
+                    else if (attributes[i] is SplatIntermediateNode splat)
+                    {
+                        WriteSplatInnards(context, splat, canTypeCheck: false);
+                    }
 
                     remaining--;
                     if (remaining > 0)
@@ -429,7 +456,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         context.CodeWriter.Write(", ");
                     }
                 }
-                
+
                 for (var i = 0; i < setKeys.Count; i++)
                 {
                     context.CodeWriter.Write((_sourceSequence++).ToString());
@@ -597,12 +624,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
             }
 
-            IReadOnlyList<IntermediateToken> GetCSharpTokens(ComponentAttributeIntermediateNode attribute)
-            {
-                // We generally expect all children to be CSharp, this is here just in case.
-                return attribute.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
-            }
-
             IReadOnlyList<IntermediateToken> GetHtmlTokens(HtmlContentIntermediateNode html)
             {
                 // We generally expect all children to be HTML, this is here just in case.
@@ -615,6 +636,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
+        private IReadOnlyList<IntermediateToken> GetCSharpTokens(IntermediateNode node)
+        {
+            // We generally expect all children to be CSharp, this is here just in case.
+            return node.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp).ToArray();
+        }
+
         public override void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node)
         {
             if (context == null)
@@ -711,6 +738,54 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             });
         }
 
+        public override void WriteSplat(CodeRenderingContext context, SplatIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            // Looks like:
+            //
+            // builder.AddMultipleAttributes(2, ...);
+            context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMultipleAttributes}");
+            context.CodeWriter.Write((_sourceSequence++).ToString());
+            context.CodeWriter.WriteParameterSeparator();
+
+            WriteSplatInnards(context, node, canTypeCheck: true);
+
+            context.CodeWriter.WriteEndMethodInvocation();
+        }
+
+        private void WriteSplatInnards(CodeRenderingContext context, SplatIntermediateNode node, bool canTypeCheck)
+        {
+            var tokens = GetCSharpTokens(node);
+
+            if (canTypeCheck)
+            {
+                context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck);
+                context.CodeWriter.Write("<");
+                context.CodeWriter.Write(ComponentsApi.AddMultipleAttributesTypeFullName);
+                context.CodeWriter.Write(">");
+                context.CodeWriter.Write("(");
+            }
+
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                WriteCSharpToken(context, tokens[i]);
+            }
+
+            if (canTypeCheck)
+            {
+                context.CodeWriter.Write(")");
+            }
+        }
+
         public override void WriteReferenceCapture(CodeRenderingContext context, ReferenceCaptureIntermediateNode node)
         {
             // Looks like:
@@ -759,7 +834,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 });
             }
         }
-        
+
         private void WriteAttribute(CodeRenderingContext context, string key, IList<IntermediateToken> value)
         {
             BeginWriteAttribute(context.CodeWriter, key);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentSplatLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentSplatLoweringPass.cs
new file mode 100644
index 0000000000..a1d7ed5cf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentSplatLoweringPass.cs
@@ -0,0 +1,52 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentSplatLoweringPass : ComponentIntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after component lowering pass
+        public override int Order => 50;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (!IsComponentDocument(documentNode))
+            {
+                return;
+            }
+
+            var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
+            var parents = new HashSet<IntermediateNode>();
+            for (var i = 0; i < references.Count; i++)
+            {
+                parents.Add(references[i].Parent);
+            }
+
+            for (var i = 0; i < references.Count; i++)
+            {
+                var reference = references[i];
+                var node = (TagHelperDirectiveAttributeIntermediateNode)reference.Node;
+                if (node.TagHelper.IsSplatTagHelper())
+                {
+                    reference.Replace(RewriteUsage(reference.Parent, node));
+                }
+            }
+        }
+
+        private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
+        {
+            var result = new SplatIntermediateNode()
+            {
+                Source = node.Source,
+            };
+
+            result.Children.AddRange(node.FindDescendantNodes<IntermediateToken>().Where(t => t.IsCSharp));
+            result.Diagnostics.AddRange(node.Diagnostics);
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 45f99abb3b..94d7895fe6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -9,6 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
     {
         public static readonly string AssemblyName = "Microsoft.AspNetCore.Components";
 
+        public static readonly string AddMultipleAttributesTypeFullName = "global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>";
+
         public static class ComponentBase
         {
             public static readonly string Namespace = "Microsoft.AspNetCore.Components";
@@ -78,6 +80,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             public static readonly string AddAttribute = nameof(AddAttribute);
 
+            public static readonly string AddMultipleAttributes = nameof(AddMultipleAttributes);
+
             public static readonly string AddElementReferenceCapture = nameof(AddElementReferenceCapture);
 
             public static readonly string AddComponentReferenceCapture = nameof(AddComponentReferenceCapture);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index 6cb9f26bc6..6ea32c7171 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -9,6 +9,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     internal static class TagHelperDescriptorExtensions
     {
+        public static bool IsAnyComponentDocumentTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return tagHelper.IsComponentTagHelper() || tagHelper.Metadata.ContainsKey(ComponentMetadata.SpecialKindKey);
+        }
+
         public static bool IsBindTagHelper(this TagHelperDescriptor tagHelper)
         {
             if (tagHelper == null)
@@ -153,6 +163,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 string.Equals(ComponentMetadata.Key.TagHelperKind, kind);
         }
 
+        public static bool IsSplatTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.SpecialKindKey, out var kind) &&
+                string.Equals(ComponentMetadata.Splat.TagHelperKind, kind);
+        }
+
         public static bool IsRefTagHelper(this TagHelperDescriptor tagHelper)
         {
             if (tagHelper == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
index 788b22c597..e9982aa2c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             public TagHelperDirectiveVisitor(IReadOnlyList<TagHelperDescriptor> tagHelpers)
             {
                 // We don't want to consider components in a view document.
-                _tagHelpers = tagHelpers.Where(t => !ComponentMetadata.IsComponentTagHelperKind(t.Kind)).ToList();
+                _tagHelpers = tagHelpers.Where(t => !t.IsAnyComponentDocumentTagHelper()).ToList();
             }
 
             public override string TagHelperPrefix => _tagHelperPrefix;
@@ -232,7 +232,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 _filePath = filePath;
 
                 // We don't want to consider non-component tag helpers in a component document.
-                _tagHelpers = tagHelpers.Where(t => ComponentMetadata.IsComponentTagHelperKind(t.Kind) && !IsTagHelperFromMangledClass(t)).ToList();
+                _tagHelpers = tagHelpers.Where(t => t.IsAnyComponentDocumentTagHelper() && !IsTagHelperFromMangledClass(t)).ToList();
 
                 for (var i = 0; i < _tagHelpers.Count; i++)
                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
index 7b623a0fe9..cfe7c3a276 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentIntermediateNode.cs
@@ -4,9 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
@@ -18,6 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public IEnumerable<SetKeyIntermediateNode> SetKeys => Children.OfType<SetKeyIntermediateNode>();
 
+        public IEnumerable<SplatIntermediateNode> Splats => Children.OfType<SplatIntermediateNode>();
+
         public IEnumerable<ComponentChildContentIntermediateNode> ChildContents => Children.OfType<ComponentChildContentIntermediateNode>();
 
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs
index 97829bbcbc..35340f0172 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentTypeInferenceMethodIntermediateNode.cs
@@ -2,8 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
-using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs
index 4c50fa1240..409dddad30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeCollection.cs
@@ -59,6 +59,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             _inner.Add(item);
         }
 
+        public void AddRange(IEnumerable<IntermediateNode> items)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            foreach (var item in items)
+            {
+                _inner.Add(item);
+            }
+        }
+
+        public void AddRange(IntermediateNodeCollection items)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            var count = items.Count;
+            for (var i = 0; i < count; i++)
+            {
+                _inner.Add(items[i]);
+            }
+        }
+
         public void Clear()
         {
             _inner.Clear();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
index 1489e23002..6aa7ba085c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/IntermediateNodeVisitor.cs
@@ -183,5 +183,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
         {
             VisitDefault(node);
         }
+
+        public virtual void VisitSplat(SplatIntermediateNode node)
+        {
+            VisitDefault(node);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
index bf70855bc3..db29186789 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
         {
             return
                 c as HtmlAttributeIntermediateNode == null &&
+                c as SplatIntermediateNode == null &&
                 c as SetKeyIntermediateNode == null &&
                 c as ReferenceCaptureIntermediateNode == null;
         });
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SplatIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SplatIntermediateNode.cs
new file mode 100644
index 0000000000..1a64be2d5a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/SplatIntermediateNode.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    public sealed class SplatIntermediateNode : IntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            visitor.VisitSplat(this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            if (formatter == null)
+            {
+                throw new ArgumentNullException(nameof(formatter));
+            }
+
+            // No properties => do nothing
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
index 46f35ac3e0..71464ad304 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
@@ -52,6 +52,16 @@ namespace Microsoft.AspNetCore.Razor.Language
             _inner.Add(item);
         }
 
+        public void AddRange(RazorDiagnosticCollection items)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            _inner.AddRange(items);
+        }
+
         public void Clear()
         {
             _inner.Clear();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index 9ae6652fe7..07729dcd25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -231,6 +231,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             builder.Features.Add(new ComponentEventHandlerLoweringPass());
             builder.Features.Add(new ComponentKeyLoweringPass());
             builder.Features.Add(new ComponentReferenceCaptureLoweringPass());
+            builder.Features.Add(new ComponentSplatLoweringPass());
             builder.Features.Add(new ComponentBindLoweringPass());
             builder.Features.Add(new ComponentTemplateDiagnosticPass());
             builder.Features.Add(new ComponentGenericTypePass());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index e46a5808d6..5b17860cd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -3200,6 +3200,185 @@ namespace Test
 
         #endregion
 
+        #region Splat
+
+        [Fact]
+        public void Element_WithSplat()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" @attributes=""someAttributes"" attributeafter=""after"">Hello</elem>
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Element_WithSplat_ImplicitExpression()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" @attributes=""@someAttributes"" attributeafter=""after"">Hello</elem>
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Element_WithSplat_ExplicitExpression()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" @attributes=""@(someAttributes)"" attributeafter=""after"">Hello</elem>
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithSplat()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent AttributeBefore=""before"" @attributes=""someAttributes"" AttributeAfter=""after"" />
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithSplat_ImplicitExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent AttributeBefore=""before"" @attributes=""@someAttributes"" AttributeAfter=""after"" />
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithSplat_ExplicitExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent AttributeBefore=""before"" @attributes=""@(someAttributes)"" AttributeAfter=""after"" />
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithSplat_GenericTypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<T> : ComponentBase
+    {
+        [Parameter] T Value { get; set;}
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent Value=""18"" @attributes=""@(someAttributes)"" />
+
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        #endregion
+
         #region Ref
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 8a7ac84c04..576c3cc448 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -62,6 +62,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 feature => Assert.IsType<ComponentPageDirectivePass>(feature),
                 feature => Assert.IsType<ComponentReferenceCaptureLoweringPass>(feature),
                 feature => Assert.IsType<ComponentScriptTagPass>(feature),
+                feature => Assert.IsType<ComponentSplatLoweringPass>(feature),
                 feature => Assert.IsType<ComponentTemplateDiagnosticPass>(feature),
                 feature => Assert.IsType<ComponentWhitespacePass>(feature),
                 feature => Assert.IsType<DefaultDirectiveSyntaxTreePass>(feature),
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0d4169fba6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                   someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
new file mode 100644
index 0000000000..75b0855ba8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (92:0,92 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (92:0,92 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (197:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (197:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f41e1dd4b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1135:26,51 [14] )
+|someAttributes|
+
+Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1666:47,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..043027af8e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                     someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..2c052ccece
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (51:0,51 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (200:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (200:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d001b6cf92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1137:26,53 [14] )
+|someAttributes|
+
+Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1668:47,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9e861da4c2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -0,0 +1,73 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    18
+
+#line default
+#line hidden
+#nullable disable
+            , -1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "Value", __arg0);
+        builder.AddMultipleAttributes(__seq1, __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..dcd6ec48af
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -0,0 +1,30 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    Splat - (37:0,37 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                HtmlContent - (58:0,58 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (58:0,58 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (163:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (163:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..bb471b72f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+|18|
+Generated Location: (956:25,20 [2] )
+|18|
+
+Source Location: (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1139:33,39 [14] )
+|someAttributes|
+
+Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1497:50,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..72eef6602a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = "";
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                    someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..5413c22919
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [93] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (51:0,51 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (93:0,93 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (93:0,93 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (198:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (198:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..37bc7bc713
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1136:26,52 [14] )
+|someAttributes|
+
+Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1667:47,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
new file mode 100644
index 0000000000..425b0783a4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                            someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
new file mode 100644
index 0000000000..4a7fee9ede
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (76:0,76 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (76:0,76 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (200:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (200:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7aa265e6be
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1105:25,44 [14] )
+|someAttributes|
+
+Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1314:35,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..76a517831b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                              someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ;
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                 "after"
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..a75a687119
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [103] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (91:0,91 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (91:0,91 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (44:0,44 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  - 
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken - (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        CSharpExpressionAttributeValue - (79:0,79 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (81:0,81 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "after"
+                HtmlContent - (103:0,103 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (103:0,103 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (208:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (208:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (114:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (114:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..945fbb3ba8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (909:25,46 [14] )
+|someAttributes|
+
+Source Location: (81:0,81 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|"after"|
+Generated Location: (1161:34,81 [7] )
+|"after"|
+
+Source Location: (114:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+Generated Location: (1361:44,7 [93] )
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..412b7925a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                             someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ;
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                               "after"
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..9102ec0b57
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [101] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (89:0,89 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (89:0,89 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (44:0,44 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  - 
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken - (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        CSharpExpressionAttributeValue - (77:0,77 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (79:0,79 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "after"
+                HtmlContent - (101:0,101 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (101:0,101 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (206:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (206:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (112:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..50bff77584
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (908:25,45 [14] )
+|someAttributes|
+
+Source Location: (79:0,79 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|"after"|
+Generated Location: (1158:34,79 [7] )
+|"after"|
+
+Source Location: (112:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+Generated Location: (1358:44,7 [93] )
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..834d985403
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                              someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..26b987b602
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [98] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (44:0,44 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (79:0,79 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (79:0,79 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (98:0,98 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (98:0,98 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (203:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (203:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..fe05732372
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1107:25,46 [14] )
+|someAttributes|
+
+Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1316:35,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5e89ad26c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                             someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..c0246900dd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (44:0,44 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (77:0,77 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (77:0,77 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (96:0,96 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (96:0,96 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (201:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (201:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..93a63203a3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+|someAttributes|
+Generated Location: (1106:25,45 [14] )
+|someAttributes|
+
+Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1315:35,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
new file mode 100644
index 0000000000..afcd1b2eaa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "AttributeBefore", "before");
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                   someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "AttributeAfter", "after");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
new file mode 100644
index 0000000000..30826c2804
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
new file mode 100644
index 0000000000..98281f7763
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1280:32,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..22260c859d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "AttributeBefore", "before");
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                     someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "AttributeAfter", "after");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..a26f802577
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (51:0,51 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5086704541
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1282:32,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f9fa516a04
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    18
+
+#line default
+#line hidden
+#nullable disable
+            , 2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "Value", __arg0);
+        builder.AddMultipleAttributes(__seq1, __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..286bcc16d5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    Splat - (37:0,37 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+            CSharpCode - (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d5113c101d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1076:36,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.codegen.cs
new file mode 100644
index 0000000000..65e14caddc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    18
+
+#line default
+#line hidden
+#nullable disable
+            , 2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private IReadOnlyDictionary<string, string> someAttributes = new Dictionary<string, string>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        builder.AddAttribute(__seq0, "Value", __arg0);
+        builder.AddMultipleAttributes(__seq1, __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.ir.txt
new file mode 100644
index 0000000000..02f4391879
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
+                    ComponentAttribute - (37:0,37 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (38:0,38 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+            CSharpCode - (69:2,7 [102] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (69:2,7 [102] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private IReadOnlyDictionary<string, string> someAttributes = new Dictionary<string, string>();\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.mappings.txt
new file mode 100644
index 0000000000..20a61bad48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_Generic_TypeInferenceBug/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (69:2,7 [102] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private IReadOnlyDictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+Generated Location: (1076:36,7 [102] )
+|
+    private IReadOnlyDictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..231cd3080e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "AttributeBefore", "before");
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                    someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "AttributeAfter", "after");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..328956d3b4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [93] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                        HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (51:0,51 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                        HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5bf6f2a952
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1281:32,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
new file mode 100644
index 0000000000..dc1c1a70c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                            someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "attributeafter", "after");
+            builder.AddContent(4, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
new file mode 100644
index 0000000000..3d2bb8827d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (76:0,76 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (76:0,76 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e8700cac0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1304:33,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..45d0f576fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddMultipleAttributes(2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                              someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(3, "attributeafter", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                 "after"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddContent(4, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..bc5492667f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [103] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (91:0,91 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (91:0,91 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (44:0,44 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  - 
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken - (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        CSharpExpressionAttributeValue - (79:0,79 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (81:0,81 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "after"
+            CSharpCode - (114:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (114:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..34c0a6c91b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatExplictExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (114:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+Generated Location: (1352:41,7 [93] )
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4f0ffe54ea
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddMultipleAttributes(2, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                             someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(3, "attributeafter", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                               "after"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddContent(4, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..7337ac5168
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [101] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (89:0,89 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (89:0,89 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (44:0,44 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  - 
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken - (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        CSharpExpressionAttributeValue - (77:0,77 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (79:0,79 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "after"
+            CSharpCode - (112:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7c434c273a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplatImplictExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (112:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+Generated Location: (1349:41,7 [93] )
+|
+    private Dictionary<string, string> someAttributes = new Dictionary<string, string>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..93ef6b1df5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                              someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "attributeafter", "after");
+            builder.AddContent(4, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..9b36e0b4c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [98] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (44:0,44 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (79:0,79 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (79:0,79 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6159a4bd7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1306:33,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5ea9a1cef2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "attributebefore", "before");
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                             someAttributes
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "attributeafter", "after");
+            builder.AddContent(4, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..e028cc8181
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    HtmlAttribute -  - attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    Splat - (44:0,44 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
+                    HtmlAttribute -  - attributeafter=" - "
+                        HtmlAttributeValue - (77:0,77 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (77:0,77 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9dc859d5fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (1305:33,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
index b555832cc8..a9ea37b7ec 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/CompilerFeatures.cs
@@ -29,6 +29,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 builder.Features.Add(new EventHandlerTagHelperDescriptorProvider());
                 builder.Features.Add(new RefTagHelperDescriptorProvider());
                 builder.Features.Add(new KeyTagHelperDescriptorProvider());
+                builder.Features.Add(new SplatTagHelperDescriptorProvider());
 
                 builder.Features.Add(new DefaultTypeNameFeature());
             }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..86aa7a78e3
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
@@ -0,0 +1,79 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class SplatTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+    {
+        // Order doesn't matter
+        public int Order { get; set; }
+
+        public RazorEngine Engine { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                return;
+            }
+
+            var renderTreeBuilder = compilation.GetTypeByMetadataName(ComponentsApi.RenderTreeBuilder.FullTypeName);
+            if (renderTreeBuilder == null)
+            {
+                // If we can't find RenderTreeBuilder, then just bail. We won't be able to compile the
+                // generated code anyway.
+                return;
+            }
+
+            context.Results.Add(CreateSplatTagHelper());
+        }
+
+        private TagHelperDescriptor CreateSplatTagHelper()
+        {
+            var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Splat.TagHelperKind, "Attributes", ComponentsApi.AssemblyName);
+            builder.Documentation = ComponentResources.SplatTagHelper_Documentation;
+
+            builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Splat.TagHelperKind);
+            builder.Metadata.Add(TagHelperMetadata.Common.ClassifyAttributesOnly, bool.TrueString);
+            builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Splat.RuntimeName;
+
+            // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like
+            // a C# property will crash trying to create the tooltips.
+            builder.SetTypeName("Microsoft.AspNetCore.Components.Attributes");
+
+            builder.TagMatchingRule(rule =>
+            {
+                rule.TagName = "*";
+                rule.Attribute(attribute =>
+                {
+                    attribute.Name = "@attributes";
+                    attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+                });
+            });
+
+            builder.BindAttribute(attribute =>
+            {
+                attribute.Documentation = ComponentResources.SplatTagHelper_Documentation;
+                attribute.Name = "@attributes";
+
+                // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
+                // a C# property will crash trying to create the tooltips.
+                attribute.SetPropertyName("Attributes");
+                attribute.TypeName = typeof(object).FullName;
+                attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+            });
+
+            return builder.Build();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..c07c95a2aa
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,87 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class SplatTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTestBase
+    {
+        [Fact]
+        public void Execute_CreatesDescriptor()
+        {
+            // Arrange
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(BaseCompilation);
+
+            var provider = new SplatTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = context.Results.Where(result => result.IsSplatTagHelper());
+            var item = Assert.Single(matches);
+
+            Assert.Empty(item.AllowedChildTags);
+            Assert.Null(item.TagOutputHint);
+            Assert.Empty(item.Diagnostics);
+            Assert.False(item.HasErrors);
+            Assert.Equal(ComponentMetadata.Splat.TagHelperKind, item.Kind);
+            Assert.Equal(bool.TrueString, item.Metadata[TagHelperMetadata.Common.ClassifyAttributesOnly]);
+            Assert.Equal(ComponentMetadata.Splat.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
+            Assert.False(item.IsDefaultKind());
+            Assert.False(item.KindUsesDefaultTagHelperRuntime());
+
+            Assert.Equal(
+                "Merges a collection of attributes into the current element or component.",
+                item.Documentation);
+
+            Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName);
+            Assert.Equal("Attributes", item.Name);
+            Assert.Equal("Microsoft.AspNetCore.Components.Attributes", item.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.Attributes", item.GetTypeName());
+
+            var rule = Assert.Single(item.TagMatchingRules);
+            Assert.Empty(rule.Diagnostics);
+            Assert.False(rule.HasErrors);
+            Assert.Null(rule.ParentTag);
+            Assert.Equal("*", rule.TagName);
+            Assert.Equal(TagStructure.Unspecified, rule.TagStructure);
+
+            var requiredAttribute = Assert.Single(rule.Attributes);
+            Assert.Empty(requiredAttribute.Diagnostics);
+            Assert.Equal("@attributes", requiredAttribute.DisplayName);
+            Assert.Equal("@attributes", requiredAttribute.Name);
+            Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison);
+            Assert.Null(requiredAttribute.Value);
+            Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison);
+
+            var attribute = Assert.Single(item.BoundAttributes);
+            Assert.Empty(attribute.Diagnostics);
+            Assert.False(attribute.HasErrors);
+            Assert.Equal(ComponentMetadata.Splat.TagHelperKind, attribute.Kind);
+            Assert.False(attribute.IsDefaultKind());
+            Assert.False(attribute.HasIndexer);
+            Assert.Null(attribute.IndexerNamePrefix);
+            Assert.Null(attribute.IndexerTypeName);
+            Assert.False(attribute.IsIndexerBooleanProperty);
+            Assert.False(attribute.IsIndexerStringProperty);
+
+            Assert.Equal(
+                "Merges a collection of attributes into the current element or component.",
+                attribute.Documentation);
+
+            Assert.Equal("@attributes", attribute.Name);
+            Assert.Equal("Attributes", attribute.GetPropertyName());
+            Assert.Equal("object Microsoft.AspNetCore.Components.Attributes.Attributes", attribute.DisplayName);
+            Assert.Equal("System.Object", attribute.TypeName);
+            Assert.False(attribute.IsStringProperty);
+            Assert.False(attribute.IsBooleanProperty);
+            Assert.False(attribute.IsEnum);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
index 2dace410eb..98d8a0bdb4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -84,6 +84,10 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         {
         }
 
+        public void AddMultipleAttributes(int sequence, IEnumerable<KeyValuePair<string, object>> attributes)
+        {
+        }
+
         public void OpenComponent<TComponent>(int sequence) where TComponent : IComponent
         {
         }

From adfe6f09e49b9b70a72d4ad230b9030c4827eb9d Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Mon, 24 Jun 2019 10:51:23 -0700
Subject: [PATCH 185/337] Move to 3.0 Preview 6 SDK and 2.1.11 runtime
 (dotnet/aspnetcore-tooling#695)

- add feeds that SDK no longer provides automatically when building test apps
- add another allowed build warning in some integration tests\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/cfd46983817f091c259928d1c0549e26ef034834
---
 .../test/IntegrationTests/Assert.cs                       | 1 +
 src/Razor/test/testassets/Directory.Build.props           | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index 23ab8172e8..72e8d79e49 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -23,6 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         private static readonly string[] AllowedBuildWarnings = new[]
         {
             "MSB3491" , // The process cannot access the file. As long as the build succeeds, we're ok.
+            "NETSDK1071", // "A PackageReference to 'Microsoft.NETCore.App' specified a Version ..."
         };
 
         public static void BuildPassed(MSBuildResult result, bool allowWarnings = false)
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 4250269a09..8cc9caef29 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -11,6 +11,14 @@
 
     <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
     <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
+  
+    <!-- Necessary while testing with unreleased packages. -->
+    <RestoreSources>
+      $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
+      https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
 
   <PropertyGroup>

From 19d9dbcd43d4f3c1138aa1a509e9be609faecb2d Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 25 Jun 2019 18:35:38 +0200
Subject: [PATCH 186/337] Removes the logic for sanitizing the base path for
 static web assets (dotnet/aspnetcore-tooling#700)

Removes the logic for sanitizing the base path for static web assets\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/98b168c8947d8c7f7b3f2beb3a0561fb89cadfb5
---
 .../src/GetDefaultStaticWebAssetsBasePath.cs  | 40 --------
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 22 +----
 .../GetDefaultStaticWebAssetsBasePathTest.cs  | 95 -------------------
 .../StaticWebAssetsIntegrationTest.cs         | 36 +++----
 4 files changed, 19 insertions(+), 174 deletions(-)
 delete mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs
 delete mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs
deleted file mode 100644
index f39f1a789e..0000000000
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/GetDefaultStaticWebAssetsBasePath.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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 Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.Razor.Tasks
-{
-    public class GetDefaultStaticWebAssetsBasePath : Task
-    {
-        [Required]
-        public string BasePath { get; set; }
-
-        [Output]
-        public string SafeBasePath { get; set; }
-
-        public override bool Execute()
-        {
-            if (string.IsNullOrWhiteSpace(BasePath))
-            {
-                Log.LogError($"Base path '{BasePath ?? "(null)"}' must contain non-whitespace characters.");
-                return !Log.HasLoggedErrors;
-            }
-
-            var safeBasePath = BasePath
-                .Replace(" ", "")
-                .Replace(".", "")
-                .ToLowerInvariant();
-
-            if (safeBasePath == "")
-            {
-                Log.LogError($"Base path '{BasePath}' must contain non '.' characters.");
-                return !Log.HasLoggedErrors;
-            }
-            SafeBasePath = safeBasePath;
-
-            return !Log.HasLoggedErrors;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index d30d7946ec..e6b23f2802 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -32,11 +32,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
     Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
 
-  <UsingTask
-    TaskName="Microsoft.AspNetCore.Razor.Tasks.GetDefaultStaticWebAssetsBasePath"
-    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
-    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
-
   <UsingTask
     TaskName="Microsoft.AspNetCore.Razor.Tasks.GenerateStaticWebAsssetsPropsFile"
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
@@ -220,23 +215,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- StaticWebAssets from the current project -->
 
-    <!-- Computes a default safe base path from the $(PackageId) that will be a prefix
-         to all the resources being exported from this library by default. The convention
-         consists of removing intermediate whitespaces, dots and lower casing all letters
-         in the package id using an invariant culture.
-
-         We don't aim to handle all possible cases for this prefix, as it can get really
-         complicated (non-unicode characters for example), so for that case,
-         StaticWebAssetBasePath can be set explicitly and we won't interfere.
-    -->
-    <GetDefaultStaticWebAssetsBasePath
-      BasePath="$(PackageId)"
-      Condition="'$(StaticWebAssetBasePath)' == ''">
-      <Output TaskParameter="SafeBasePath" PropertyName="_StaticWebAssetSafeBasePath" />
-    </GetDefaultStaticWebAssetsBasePath>
-
     <PropertyGroup>
-      <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(_StaticWebAssetSafeBasePath)</StaticWebAssetBasePath>
+      <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(PackageId)</StaticWebAssetBasePath>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs
deleted file mode 100644
index 9a927fc155..0000000000
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/GetDefaultStaticWebAssetsBasePathTest.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 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.Collections.Generic;
-using Microsoft.Build.Framework;
-using Moq;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Razor.Tasks
-{
-    public class GetDefaultStaticWebAssetsBasePathTest
-    {
-        [Theory]
-        [InlineData(null)]
-        [InlineData("")]
-        [InlineData(" ")]
-        [InlineData("   ")]
-        public void ReturnsError_WhenBasePath_DoesNotContainNonWhitespaceCharacters(string basePath)
-        {
-            // Arrange
-            var expectedError = $"Base path '{basePath ?? "(null)"}' must contain non-whitespace characters.";
-
-            var errorMessages = new List<string>();
-            var buildEngine = new Mock<IBuildEngine>();
-            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
-                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
-
-            var task = new GetDefaultStaticWebAssetsBasePath
-            {
-                BuildEngine = buildEngine.Object,
-                BasePath = basePath
-            };
-
-            // Act
-            var result = task.Execute();
-
-            // Assert
-            Assert.False(result);
-            var message = Assert.Single(errorMessages);
-            Assert.Equal(expectedError, message);
-        }
-
-        [Theory]
-        [InlineData(".")]
-        [InlineData("..")]
-        [InlineData(". ")]
-        [InlineData(" .")]
-        [InlineData(" . ")]
-        [InlineData(". .")]
-        public void ReturnsError_WhenSafeBasePath_MapsToTheEmptyString(string basePath)
-        {
-            // Arrange
-            var expectedError = $"Base path '{basePath}' must contain non '.' characters.";
-
-            var errorMessages = new List<string>();
-            var buildEngine = new Mock<IBuildEngine>();
-            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
-                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
-
-            var task = new GetDefaultStaticWebAssetsBasePath
-            {
-                BuildEngine = buildEngine.Object,
-                BasePath = basePath
-            };
-
-            // Act
-            var result = task.Execute();
-
-            // Assert
-            Assert.False(result);
-            var message = Assert.Single(errorMessages);
-            Assert.Equal(expectedError, message);
-        }
-
-        [Theory]
-        [InlineData("Identity", "identity")]
-        [InlineData("Microsoft.AspNetCore.Identity", "microsoftaspnetcoreidentity")]
-        public void ReturnsSafeBasePath_WhenBasePath_ContainsUnsafeCharacters(string basePath, string expectedSafeBasePath)
-        {
-            // Arrange
-            var task = new GetDefaultStaticWebAssetsBasePath
-            {
-                BuildEngine = Mock.Of<IBuildEngine>(),
-                BasePath = basePath
-            };
-
-            // Act
-            var result = task.Execute();
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal(expectedSafeBasePath, task.SafeBasePath);
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 4d96d43b55..0e3497a483 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -67,13 +67,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.js"));
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.v4.js"));
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "css", "site.css"));
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "js", "project-direct-dep.js"));
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "css", "site.css"));
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "js", "pkg-direct-dep.js"));
-            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarytransitivedependency", "js", "pkg-transitive-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.v4.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "css", "site.css"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "js", "project-direct-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "css", "site.css"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "js", "pkg-direct-dep.js"));
+            Assert.FileExists(result, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
 
             // Validate that static web assets don't get published as content too on their regular path
             Assert.FileDoesNotExist(result, PublishOutputPath, Path.Combine("wwwroot", "js", "project-transitive-dep.js"));
@@ -95,13 +95,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(publish);
 
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.js"));
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary", "js", "project-transitive-dep.v4.js"));
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "css", "site.css"));
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "classlibrary2", "js", "project-direct-dep.js"));
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "css", "site.css"));
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarydirectdependency", "js", "pkg-direct-dep.js"));
-            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "packagelibrarytransitivedependency", "js", "pkg-transitive-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.v4.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "css", "site.css"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "js", "project-direct-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "css", "site.css"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "js", "pkg-direct-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
         }
 
 
@@ -255,10 +255,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             };
 
             return $@"<StaticWebAssets Version=""1.0"">
-  <ContentRoot BasePath=""_content/classlibrary"" Path=""{projects[2]}"" />
-  <ContentRoot BasePath=""_content/classlibrary2"" Path=""{projects[3]}"" />
-  <ContentRoot BasePath=""_content/packagelibrarydirectdependency"" Path=""{projects[1]}"" />
-  <ContentRoot BasePath=""_content/packagelibrarytransitivedependency"" Path=""{projects[0]}"" />
+  <ContentRoot BasePath=""_content/ClassLibrary"" Path=""{projects[2]}"" />
+  <ContentRoot BasePath=""_content/ClassLibrary2"" Path=""{projects[3]}"" />
+  <ContentRoot BasePath=""_content/PackageLibraryDirectDependency"" Path=""{projects[1]}"" />
+  <ContentRoot BasePath=""_content/PackageLibraryTransitiveDependency"" Path=""{projects[0]}"" />
 </StaticWebAssets>";
         }
     }

From 4e16cfd4daf0158e52f6293b0fbfa37091e09eff Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 26 Jun 2019 11:18:54 -0700
Subject: [PATCH 187/337] Use LogErrorFromException when
 FindAssembliesWithReferencesTo throws (dotnet/aspnetcore-tooling#702)

Currently FindAssembliesWithReferencesTo produces a stacktrace when P2P builds fail - for instance
if the referenced project has a compiler error. This changes it to use LogErrorFromException.

In addition, there was a typo in the property that disabled the feature.

Fixes https://github.com/aspnet/AspNetCore/issues/11226\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/87c12a116c724696783b62e5552d1ea4862e5715
---
 ...erences.cs => FindAssembliesWithReferencesTo.cs} | 13 ++++++++++---
 ...T.Sdk.Razor.MvcApplicationPartsDiscovery.targets |  4 ++--
 .../ApplicationPartDiscoveryIntegrationTest.cs      | 11 +++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 rename src/Razor/Microsoft.NET.Sdk.Razor/src/{ResolveAssemblyWithReferences.cs => FindAssembliesWithReferencesTo.cs} (85%)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
similarity index 85%
rename from src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs
rename to src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
index 3727e01088..c936eb4c9b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/ResolveAssemblyWithReferences.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -45,9 +46,15 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             var targetAssemblyNames = TargetAssemblyNames.Select(s => s.ItemSpec).ToList();
 
             var provider = new ReferenceResolver(targetAssemblyNames, referenceItems);
-            var assemblyNames = provider.ResolveAssemblies();
-
-            ResolvedAssemblies = assemblyNames.ToArray();
+            try
+            {
+                var assemblyNames = provider.ResolveAssemblies();
+                ResolvedAssemblies = assemblyNames.ToArray();
+            }
+            catch (Exception ex)
+            {
+                Log.LogErrorFromException(ex);
+            }
 
             return !Log.HasLoggedErrors;
         }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
index 669cfd40c9..bcd4e91e22 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets
@@ -17,9 +17,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
 
   <PropertyGroup>
-    <GenerateMvcApplicationPartsAttribute Condition="'$(GenerateMvcApplicationPartsAssemblyAttributes)' == '' AND '$(OutputType)' == 'Exe'">true</GenerateMvcApplicationPartsAttribute>
+    <GenerateMvcApplicationPartsAssemblyAttributes Condition="'$(GenerateMvcApplicationPartsAssemblyAttributes)' == '' AND '$(OutputType)' == 'Exe'">true</GenerateMvcApplicationPartsAssemblyAttributes>
 
-    <CoreCompileDependsOn Condition="'$(GenerateMvcApplicationPartsAttribute)' == 'true' AND '$(DesignTimeBuild)' != 'true'">
+    <CoreCompileDependsOn Condition="'$(GenerateMvcApplicationPartsAssemblyAttributes)' == 'true' AND '$(DesignTimeBuild)' != 'true'">
       _DiscoverMvcApplicationParts;
       $(CoreCompileDependsOn);
     </CoreCompileDependsOn>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index 1f07c59299..45a70364ee 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -37,6 +37,17 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
         }
 
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task Build_ProjectWithDependencyThatReferencesMvc_DoesNotGenerateAttributeIfFlagIsReset()
+        {
+            var result = await DotnetMSBuild("Build /p:GenerateMvcApplicationPartsAssemblyAttributes=false");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "AppWithP2PReference.MvcApplicationPartsAssemblyInfo.cs");
+        }
+
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_ProjectWithoutMvcReferencingDependencies_DoesNotGenerateAttribute()

From 06591801193c0647d0a86cae1c5ff44db368bbaa Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 28 Jun 2019 11:02:55 -0700
Subject: [PATCH 188/337] Do case insensitive comparison in
 DefaultRazorProjectFileSystem.GetItem (dotnet/aspnetcore-tooling#709)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ff305c700f72e199c9a41ee43fdc21e7dfa7020c
---
 .../src/DefaultRazorProjectFileSystem.cs      |  2 +-
 .../test/DefaultRazorProjectFileSystemTest.cs | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
index 889c8cdb75..c80f43307b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs
@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var absolutePath = NormalizeAndEnsureValidPath(path);
 
             var file = new FileInfo(absolutePath);
-            if (!absolutePath.StartsWith(absoluteBasePath))
+            if (!absolutePath.StartsWith(absoluteBasePath, StringComparison.OrdinalIgnoreCase))
             {
                 throw new InvalidOperationException($"The file '{absolutePath}' is not a descendent of the base path '{absoluteBasePath}'.");
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
index 6c92f7ddb7..a22bb737fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -258,6 +259,26 @@ namespace Microsoft.AspNetCore.Razor.Language
             Assert.Equal(Path.Combine("Views", "About", "About.cshtml"), item.RelativePhysicalPath);
         }
 
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux, SkipReason = "This test does not makes sense for case sensitive Operating Systems.")]
+        public void GetItem_MismatchedCase_ReturnsFileFromDisk()
+        {
+            // Arrange
+            var filePath = "/Views/About/About.cshtml";
+            var lowerCaseTestFolder = TestFolder.ToLower();
+            var fileSystem = new DefaultRazorProjectFileSystem(lowerCaseTestFolder);
+
+            // Act
+            var item = fileSystem.GetItem(filePath, fileKind: null);
+
+            // Assert
+            Assert.True(item.Exists);
+            Assert.Equal(filePath, item.FilePath);
+            Assert.Equal("/", item.BasePath);
+            Assert.Equal(Path.Combine(lowerCaseTestFolder, "Views", "About", "About.cshtml"), item.PhysicalPath);
+            Assert.Equal(Path.Combine("Views", "About", "About.cshtml"), item.RelativePhysicalPath);
+        }
+
         [Fact]
         public void GetItem_ReturnsNotFoundResult()
         {

From 895ad896c72b933eff54dca994ae13de62b2fe2f Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 1 Jul 2019 13:58:25 -0700
Subject: [PATCH 189/337] Fix: dotnet/aspnetcore-tooling#11197 automatic
 backing-field for @ref (dotnet/aspnetcore-tooling#707)

This change makes @ref define a field for you by default. We didn't do
this originally because we weren't sure if the compiler generating a
field would always be what you want, and more importantly,
we didn't have the expressiveness to add an opt-out.

Now that we have directive attributes, it's easy to create an opt-out
for the field generation. The special thing about it is that where
you opt-out has to be static. For this reason the @bind:suppressField
attribute cannot be used with a value, you either have the flag or not.

Additionally, we don't support automatic field generation for
generics, because usually we can't write the field name. If we
want to in the future could make this work when the generic
type arguments are specified. So in the case of generics,
you have to opt-out, and you will get a diagnostic
that tells you so.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/dadf9faf22e53912b79ecf8ac6d5d871b188d9fb
---
 .../CodeGeneration/CodeWriterExtensions.cs    |  19 ++-
 .../CodeGeneration/DefaultDocumentWriter.cs   |   2 +-
 .../src/ComponentResources.resx               |   5 +-
 .../Components/ComponentDiagnosticFactory.cs  |  26 +++
 .../ComponentReferenceCaptureLoweringPass.cs  | 101 ++++++++++--
 ...faultRazorIntermediateNodeLoweringPhase.cs |  22 ++-
 .../DefaultTagHelperTargetExtension.cs        |  17 +-
 .../FieldDeclarationIntermediateNode.cs       |   2 +
 .../ReferenceCaptureIntermediateNode.cs       |   5 +-
 .../src/RazorDiagnosticCollection.cs          |  10 ++
 .../CodeGeneration/CSharpCodeWriterTest.cs    |  28 +++-
 .../ComponentCodeGenerationTestBase.cs        | 153 ++++++++++++++----
 .../TestComponent.codegen.cs                  |  14 +-
 .../Component_WithRef/TestComponent.ir.txt    |   7 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  53 ++++++
 .../TestComponent.ir.txt                      |  22 +++
 .../TestComponent.mappings.txt                |  16 ++
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  14 +-
 .../Element_WithRef/TestComponent.ir.txt      |   7 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.mappings.txt                |  14 +-
 .../TestComponent.codegen.cs                  |  43 +++++
 .../TestComponent.ir.txt                      |  24 +++
 .../TestComponent.mappings.txt                |  16 ++
 .../TestComponent.codegen.cs                  |  39 +++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  21 +++
 .../TestComponent.mappings.txt                |   5 +
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   0
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../Component_WithRef/TestComponent.ir.txt    |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  41 +++++
 .../TestComponent.ir.txt                      |  13 ++
 .../TestComponent.mappings.txt                |  16 ++
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.ir.txt                      |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  14 +-
 .../Element_WithRef/TestComponent.ir.txt      |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   5 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |  42 +++++
 .../TestComponent.ir.txt                      |  15 ++
 .../TestComponent.mappings.txt                |  16 ++
 .../TestComponent.codegen.cs                  |  38 +++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  14 ++
 .../TestComponent.mappings.txt                |   5 +
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.ir.txt                      |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  50 ++++++
 .../TestComponent.ir.txt                      |  17 ++
 .../TestComponent.mappings.txt                |  16 ++
 .../TestComponent.codegen.cs                  |   5 +
 .../TestComponent.ir.txt                      |   1 +
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  61 +++++++
 .../TestComponent.ir.txt                      |  18 +++
 .../TestComponent.mappings.txt                |  16 ++
 .../src/RefTagHelperDescriptorProvider.cs     |  20 ++-
 .../RefTagHelperDescriptorProviderTest.cs     |  11 +-
 76 files changed, 1076 insertions(+), 302 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef => GenericComponent_WithComponentRef_SuppressField}/TestComponent.codegen.cs (93%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef => GenericComponent_WithComponentRef_SuppressField}/TestComponent.ir.txt (71%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef => GenericComponent_WithComponentRef_SuppressField}/TestComponent.mappings.txt (57%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference => GenericComponent_WithComponentRef_TypeInference_SuppressField}/TestComponent.codegen.cs (100%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference => GenericComponent_WithComponentRef_TypeInference_SuppressField}/TestComponent.ir.txt (79%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference => GenericComponent_WithComponentRef_TypeInference_SuppressField}/TestComponent.mappings.txt (87%)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
index 9023e4d369..eee9f37927 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -263,8 +263,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName));
         }
 
-        public static CodeWriter WriteField(this CodeWriter writer, IList<string> modifiers, string typeName, string fieldName)
+        public static CodeWriter WriteField(this CodeWriter writer, IList<string> suppressWarnings, IList<string> modifiers, string typeName, string fieldName)
         {
+            if (suppressWarnings == null)
+            {
+                throw new ArgumentNullException(nameof(suppressWarnings));
+            }
+
             if (modifiers == null)
             {
                 throw new ArgumentNullException(nameof(modifiers));
@@ -280,6 +285,12 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
                 throw new ArgumentNullException(nameof(fieldName));
             }
 
+            for (var i = 0; i < suppressWarnings.Count; i++)
+            {
+                writer.Write("#pragma warning disable ");
+                writer.WriteLine(suppressWarnings[i]);
+            }
+
             for (var i = 0; i < modifiers.Count; i++)
             {
                 writer.Write(modifiers[i]);
@@ -292,6 +303,12 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             writer.Write(";");
             writer.WriteLine();
 
+            for (var i = suppressWarnings.Count - 1; i >= 0; i--)
+            {
+                writer.Write("#pragma warning restore ");
+                writer.WriteLine(suppressWarnings[i]);
+            }
+
             return writer;
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
index fcae6150cb..c5fb4de90e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/DefaultDocumentWriter.cs
@@ -206,7 +206,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
 
             public override void VisitFieldDeclaration(FieldDeclarationIntermediateNode node)
             {
-                Context.CodeWriter.WriteField(node.Modifiers, node.FieldType, node.FieldName);
+                Context.CodeWriter.WriteField(node.SuppressWarnings, node.Modifiers, node.FieldType, node.FieldName);
             }
 
             public override void VisitPropertyDeclaration(PropertyDeclarationIntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 178f1bb59b..f932064455 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -193,7 +193,10 @@
     <value>route template</value>
   </data>
   <data name="RefTagHelper_Documentation" xml:space="preserve">
-    <value>Populates the specified field or property with a reference to the element or component.</value>
+    <value>Generates the specified field, and populates it during rendering with a reference to the element or component.</value>
+  </data>
+  <data name="RefTagHelper_SuppressField_Documentation" xml:space="preserve">
+    <value>Suppresses the generation of a field by '@ref'. Specify '@ref:suppressField' to define your own property or field.</value>
   </data>
   <data name="SplatTagHelper_Documentation" xml:space="preserve">
     <value>Merges a collection of attributes into the current element or component.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 8eba2b1efb..07a2657a6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -423,5 +423,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             return RazorDiagnostic.Create(DuplicateComponentParameterDirective, source ?? SourceSpan.Undefined, attributeName, directiveAttributeName);
         }
+
+        public static readonly RazorDiagnosticDescriptor RefSuppressFieldNotMinimized =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10011",
+                () =>
+                    "The directive attribute '@ref:suppressField' must be used as a minimized attribute. Providing an attribute value like '@ref:suppressField=\"false\"' " +
+                    "is not supported.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_RefSuppressFieldNotMinimized(SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(RefSuppressFieldNotMinimized, source ?? SourceSpan.Undefined);
+        }
+
+        public static readonly RazorDiagnosticDescriptor RefSuppressFieldRequiredForGeneric =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10012",
+                () =>
+                    "Using '@ref' on a generic-typed component requires manually defining a field to hold the component reference. Use '@ref:suppressField' to " +
+                    "suppress field generation, and manually define a field inside '@code {{ }}' to contain the reference.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_RefSuppressFieldRequiredForGeneric(SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(RefSuppressFieldRequiredForGeneric, source ?? SourceSpan.Undefined);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
index b4d776aacf..6a24a46f80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
@@ -33,34 +35,109 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 if (node.TagHelper.IsRefTagHelper())
                 {
-                    reference.Replace(RewriteUsage(@class, reference.Parent, node));
+                    // We've found an @ref directive attribute.
+                    //
+                    // If we can't get a nonempty identifier, do nothing because there will
+                    // already be a diagnostic for empty values
+                    var identifier = DetermineIdentifierToken(node);
+                    if (identifier == null)
+                    {
+                        continue;
+                    }
+
+                    var rewritten = RewriteUsage(reference.Parent, identifier);
+                    reference.Replace(rewritten);
+
+                    // Now we need to check if the field generation has been suppressed.
+                    //
+                    // You have to suppress field generation for generic types because we don't know the
+                    // type name to create the field.
+                    var generateField = ShouldGenerateField(reference.Parent);
+
+                    // Insert the field with other fields, near the top of the class.
+                    if (generateField)
+                    {
+                        var position = 0;
+                        while (position < @class.Children.Count && @class.Children[i] is FieldDeclarationIntermediateNode)
+                        {
+                            position++;
+                        }
+
+                        @class.Children.Insert(position, CreateField(rewritten.FieldTypeName, identifier));
+                    }
                 }
             }
         }
 
-        private IntermediateNode RewriteUsage(ClassDeclarationIntermediateNode classNode, IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
+        private ReferenceCaptureIntermediateNode RewriteUsage(IntermediateNode parent, IntermediateToken identifier)
         {
-            // If we can't get a nonempty attribute name, do nothing because there will
-            // already be a diagnostic for empty values
-            var identifierToken = DetermineIdentifierToken(node);
-            if (identifierToken == null)
-            {
-                return node;
-            }
-
             // Determine whether this is an element capture or a component capture, and
             // if applicable the type name that will appear in the resulting capture code
             var componentTagHelper = (parent as ComponentIntermediateNode)?.Component;
             if (componentTagHelper != null)
             {
-                return new ReferenceCaptureIntermediateNode(identifierToken, componentTagHelper.GetTypeName());
+                return new ReferenceCaptureIntermediateNode(identifier, componentTagHelper.GetTypeName());
             }
             else
             {
-                return new ReferenceCaptureIntermediateNode(identifierToken);
+                return new ReferenceCaptureIntermediateNode(identifier);
             }
         }
 
+        private bool ShouldGenerateField(IntermediateNode parent)
+        {
+            var parameters = parent.FindDescendantNodes<TagHelperDirectiveAttributeParameterIntermediateNode>();
+            for (var i = 0; i < parameters.Count; i++)
+            {
+                var parameter = parameters[i];
+                if (parameter.TagHelper.IsRefTagHelper() && parameter.BoundAttributeParameter.Name == "suppressField")
+                {
+                    if (parameter.HasDiagnostics)
+                    {
+                        parent.Diagnostics.AddRange(parameter.GetAllDiagnostics());
+                    }
+
+                    parent.Children.Remove(parameter);
+
+                    if (parameter.AttributeStructure == AttributeStructure.Minimized)
+                    {
+                        return false;
+                    }
+
+                    // We do not support non-minimized attributes here because we can't allow the value to be dynamic.
+                    // As a design/experience decision, we don't let you write @ref:suppressField="false" even though
+                    // we could parse it. The rationale is that it's misleading, you type something that looks like code,
+                    // but it's not really.
+                    parent.Diagnostics.Add(ComponentDiagnosticFactory.Create_RefSuppressFieldNotMinimized(parameter.Source));
+                }
+            }
+
+            if (parent is ComponentIntermediateNode component && component.Component.IsGenericTypedComponent())
+            {
+                // We cannot automatically generate a 'ref' field for generic components because we don't know
+                // how to write the type.
+                parent.Diagnostics.Add(ComponentDiagnosticFactory.Create_RefSuppressFieldRequiredForGeneric(parent.Source));
+                return false;
+            }
+
+            return true;
+        }
+
+        private IntermediateNode CreateField(string fieldType, IntermediateToken identifier)
+        {
+            return new FieldDeclarationIntermediateNode()
+            {
+                FieldName = identifier.Content,
+                FieldType = fieldType,
+                Modifiers = { "private" },
+                SuppressWarnings =
+                {
+                    "0414", // Field is assigned by never used
+                    "0169", // Field is never used
+                }, 
+            };
+        }
+
         private IntermediateToken DetermineIdentifierToken(TagHelperDirectiveAttributeIntermediateNode attributeNode)
         {
             IntermediateToken foundToken = null;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 2e619dfb52..166a2912a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1744,14 +1744,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                             out var parameterMatch,
                             out var associatedAttributeParameterDescriptor))
                         {
-                            var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
-
-                            if (!expectsBooleanValue)
-                            {
-                                // We do not allow minimized non-boolean bound attributes.
-                                return;
-                            }
-
                             // Directive attributes should start with '@' unless the descriptors are misconfigured.
                             // In that case, we would have already logged an error.
                             var actualAttributeName = attributeName.StartsWith("@") ? attributeName.Substring(1) : attributeName;
@@ -1760,6 +1752,13 @@ namespace Microsoft.AspNetCore.Razor.Language
                             if (parameterMatch &&
                                 TagHelperMatchingConventions.TryGetBoundAttributeParameter(actualAttributeName, out var attributeNameWithoutParameter, out _))
                             {
+                                var expectsBooleanValue = associatedAttributeParameterDescriptor.IsBooleanProperty;
+                                if (!expectsBooleanValue)
+                                {
+                                    // We do not allow minimized non-boolean bound attributes.
+                                    return;
+                                }
+
                                 attributeNode = new TagHelperDirectiveAttributeParameterIntermediateNode()
                                 {
                                     AttributeName = actualAttributeName,
@@ -1775,6 +1774,13 @@ namespace Microsoft.AspNetCore.Razor.Language
                             }
                             else
                             {
+                                var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
+                                if (!expectsBooleanValue)
+                                {
+                                    // We do not allow minimized non-boolean bound attributes.
+                                    return;
+                                }
+
                                 attributeNode = new TagHelperDirectiveAttributeIntermediateNode()
                                 {
                                     AttributeName = actualAttributeName,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
index c82b0e2135..959fb6c059 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs
@@ -8,12 +8,15 @@ using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 
 namespace Microsoft.AspNetCore.Razor.Language.Extensions
 {
     internal sealed class DefaultTagHelperTargetExtension : IDefaultTagHelperTargetExtension
     {
+        private static readonly string[] FieldUnintializedModifiers = { "0649", };
+
+        private static readonly string[] FieldUnusedModifiers = { "0169", };
+
         private static readonly string[] PrivateModifiers = new string[] { "private" };
 
         public string RunnerVariableName { get; set; } = "__tagHelperRunner";
@@ -476,9 +479,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
         public void WriteTagHelperRuntime(CodeRenderingContext context, DefaultTagHelperRuntimeIntermediateNode node)
         {
             context.CodeWriter.WriteLine("#line hidden");
-            context.CodeWriter.WriteLine("#pragma warning disable 0649");
-            context.CodeWriter.WriteField(PrivateModifiers, ExecutionContextTypeName, ExecutionContextVariableName);
-            context.CodeWriter.WriteLine("#pragma warning restore 0649");
+            context.CodeWriter.WriteField(FieldUnintializedModifiers, PrivateModifiers, ExecutionContextTypeName, ExecutionContextVariableName);
 
             context.CodeWriter
                 .Write("private ")
@@ -491,12 +492,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 
             if (!context.Options.DesignTime)
             {
-                // Need to disable the warning "X is never used." for the value buffer since
-                // whether it's used depends on how a TagHelper is used.
-                context.CodeWriter.WriteLine("#pragma warning disable 0169");
-                context.CodeWriter.WriteField(PrivateModifiers, "string", StringValueBufferVariableName);
-                context.CodeWriter.WriteLine("#pragma warning restore 0169");
-
+                context.CodeWriter.WriteField(FieldUnusedModifiers, PrivateModifiers, "string", StringValueBufferVariableName);
+             
                 var backedScopeManageVariableName = "__backed" + ScopeManagerVariableName;
                 context.CodeWriter
                     .Write("private ")
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs
index 0d6b731390..50cc1d10c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/FieldDeclarationIntermediateNode.cs
@@ -12,6 +12,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public IList<string> Modifiers { get; } = new List<string>();
 
+        public IList<string> SuppressWarnings { get; } = new List<string>();
+
         public string FieldName { get; set; }
 
         public string FieldType { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
index f70c7525a8..077bd0c1fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
@@ -35,7 +34,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public string ComponentCaptureTypeName { get; set; }
 
-        public string TypeName => $"global::System.Action<{(IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementRef.FullTypeName)}>";
+        public string FieldTypeName => IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementRef.FullTypeName;
+
+        public string TypeName => $"global::System.Action<{FieldTypeName}>";
 
         public override void Accept(IntermediateNodeVisitor visitor)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
index 71464ad304..3417ee59e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticCollection.cs
@@ -62,6 +62,16 @@ namespace Microsoft.AspNetCore.Razor.Language
             _inner.AddRange(items);
         }
 
+        public void AddRange(IEnumerable<RazorDiagnostic> items)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            _inner.AddRange(items);
+        }
+
         public void Clear()
         {
             _inner.Clear();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs
index e0bfa57ca1..cb7973df37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/CSharpCodeWriterTest.cs
@@ -287,7 +287,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             var writer = new CodeWriter();
 
             // Act
-            writer.WriteField(new[] { "private" }, "global::System.String", "_myString");
+            writer.WriteField(Array.Empty<string>(), new[] { "private" }, "global::System.String", "_myString");
 
             // Assert
             var output = writer.GenerateCode();
@@ -301,13 +301,37 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
             var writer = new CodeWriter();
 
             // Act
-            writer.WriteField(new[] { "private", "readonly", "static" }, "global::System.String", "_myString");
+            writer.WriteField(Array.Empty<string>(), new[] { "private", "readonly", "static" }, "global::System.String", "_myString");
 
             // Assert
             var output = writer.GenerateCode();
             Assert.Equal("private readonly static global::System.String _myString;" + Environment.NewLine, output);
         }
 
+        [Fact]
+        public void WriteField_WithModifiersAndSupressions_WritesFieldDeclaration()
+        {
+            // Arrange
+            var writer = new CodeWriter();
+
+            // Act
+            writer.WriteField(
+                new[] { "0001", "0002", },
+                new[] { "private", "readonly", "static" },
+                "global::System.String",
+                "_myString");
+
+            // Assert
+            var output = writer.GenerateCode();
+            Assert.Equal(
+                "#pragma warning disable 0001" + Environment.NewLine +
+                "#pragma warning disable 0002" + Environment.NewLine +
+                "private readonly static global::System.String _myString;" + Environment.NewLine +
+                "#pragma warning restore 0002" + Environment.NewLine +
+                "#pragma warning restore 0001" + Environment.NewLine,
+                output);
+        }
+
         [Fact]
         public void WriteAutoPropertyDeclaration_WritesPropertyDeclaration()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 5b17860cd3..a0f7aea1c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2994,7 +2994,7 @@ namespace Test
         }
 
         [Fact]
-        public void GenericComponent_WithComponentRef()
+        public void GenericComponent_WithComponentRef_CreatesDiagnostic()
         {
             // Arrange
             AdditionalSyntaxTrees.Add(Parse(@"
@@ -3012,10 +3012,39 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent TItem=int Item=""3"" @ref=""_my"" />
-
 @code {
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+}
+", throwOnFailure: false);
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(diagnostic.Id, ComponentDiagnosticFactory.RefSuppressFieldRequiredForGeneric.Id);
+        }
+
+        [Fact]
+        public void GenericComponent_WithComponentRef_SuppressField()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] public TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent TItem=int Item=""3"" @ref=""_my"" @ref:suppressField />
+@code {
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
 }
 ");
 
@@ -3026,7 +3055,7 @@ namespace Test
         }
 
         [Fact]
-        public void GenericComponent_WithComponentRef_TypeInference()
+        public void GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic()
         {
             // Arrange
             AdditionalSyntaxTrees.Add(Parse(@"
@@ -3045,6 +3074,38 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent Item=""3"" @ref=""_my"" />
 
+@code {
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+}
+", throwOnFailure: true);
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(diagnostic.Id, ComponentDiagnosticFactory.RefSuppressFieldRequiredForGeneric.Id);
+
+        }
+
+        [Fact]
+        public void GenericComponent_WithComponentRef_TypeInference_SuppressField()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] public TItem Item { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""3"" @ref=""_my"" @ref:suppressField />
+
 @code {
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
@@ -3386,13 +3447,7 @@ namespace Test
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<elem attributebefore=""before"" @ref=""myElem"" attributeafter=""after"">Hello</elem>
-
-@code {
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-}
-");
+<elem attributebefore=""before"" @ref=""myElem"" attributeafter=""after"">Hello</elem>");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -3408,10 +3463,7 @@ namespace Test
 <input type=""text"" data-slider-min=""@Min"" @ref=""@_element"" />
 
 @code {
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     }
 ");
 
@@ -3421,6 +3473,35 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Element_WithRef_SuppressField()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem @ref=""myElem"" @ref:suppressField>Hello</elem>
+@code {
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem @ref=""myElem"" @ref:suppressField=""false"">Hello</elem>", throwOnFailure: false);
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(diagnostic.Id, ComponentDiagnosticFactory.RefSuppressFieldNotMinimized.Id);
+        }
+
         [Fact]
         public void Component_WithRef()
         {
@@ -3438,13 +3519,7 @@ namespace Test
 
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<MyComponent ParamBefore=""before"" @ref=""myInstance"" ParamAfter=""after"" />
-
-@code {
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-}
-");
+<MyComponent ParamBefore=""before"" @ref=""myInstance"" ParamAfter=""after"" />");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -3472,11 +3547,6 @@ namespace Test
 <MyComponent @ref=""myInstance"" SomeProp=""val"">
     Some <el>further</el> content
 </MyComponent>
-
-@code {
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-}
 ");
 
             // Assert
@@ -3485,6 +3555,35 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Component_WithRef_SuppressField()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<MyComponent @ref=""myInstance"" @ref:suppressField />
+@code {
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Templates
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 598827ce99..0430bdb3a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private Test.MyComponent myInstance;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -41,15 +46,6 @@ __o = typeof(MyComponent);
 #nullable disable
         }
         #pragma warning restore 1998
-#nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 2e4013600f..25a4ad4d99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - Test.MyComponent - myInstance
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -22,9 +23,3 @@ Document -
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
                         HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-                HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (189:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (189:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index a0e550be07..8e2f5de343 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1080:29,40 [10] )
+Generated Location: (1278:34,40 [10] )
 |myInstance|
 
-Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-Generated Location: (1445:45,7 [104] )
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
new file mode 100644
index 0000000000..afee5137ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -0,0 +1,53 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   myInstance = default(Test.MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
new file mode 100644
index 0000000000..25bc61b8d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [52] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+                HtmlContent - (52:0,52 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (52:0,52 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent myInstance;\n    void DoStuff() { GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c97795f34e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|myInstance|
+Generated Location: (1013:27,19 [10] )
+|myInstance|
+
+Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+|
+Generated Location: (1378:43,7 [81] )
+|
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 6befd8f44c..672c95d6cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private Test.MyComponent myInstance;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -40,15 +45,6 @@ __o = typeof(MyComponent);
 #nullable disable
         }
         #pragma warning restore 1998
-#nullable restore
-#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index a2aae2c90d..514feb7edb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - Test.MyComponent - myInstance
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -27,9 +28,5 @@ Document -
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
                         HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-                HtmlContent - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (213:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (213:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
+                HtmlContent - (97:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (97:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index f2715276d6..39cc0a17d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1036:28,19 [10] )
+Generated Location: (1234:33,19 [10] )
 |myInstance|
 
-Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-Generated Location: (1401:44,7 [104] )
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index c4ecda875b..c74b523370 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -29,15 +34,6 @@ namespace Test
 #nullable disable
         }
         #pragma warning restore 1998
-#nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index d92f17dce9..d88a3bbec3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -24,9 +25,3 @@ Document -
                     HtmlAttribute -  - attributeafter=" - "
                         HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-                HtmlContent - (80:0,80 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (80:0,80 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (214:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (214:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 75a139f95e..64a2a111d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (880:24,37 [6] )
+Generated Location: (1108:29,37 [6] )
 |myElem|
 
-Source Location: (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-|
-Generated Location: (1119:33,7 [122] )
-|
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index dfe7b20a37..a65ff0c394 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private global::Microsoft.AspNetCore.Components.ElementRef _element;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -41,10 +46,7 @@ namespace Test
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 2f79627e70..59d4ed931f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - _element
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -24,7 +25,7 @@ Document -
                     ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
                 HtmlContent - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (234:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (234:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
+                HtmlContent - (132:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (132:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index b9dcf79899..13699c88b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,25 +1,19 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (900:25,37 [3] )
+Generated Location: (1130:30,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1089:33,49 [8] )
+Generated Location: (1319:38,49 [8] )
 |_element|
 
-Source Location: (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1330:42,7 [161] )
+Generated Location: (1560:47,7 [59] )
 |
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
new file mode 100644
index 0000000000..c1596ddf4a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            myElem = default(Microsoft.AspNetCore.Components.ElementRef);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
new file mode 100644
index 0000000000..5cb785f84e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
+                HtmlContent - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementRef myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a4beb28484
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|myElem|
+Generated Location: (855:24,12 [6] )
+|myElem|
+
+Source Location: (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+|
+Generated Location: (1094:33,7 [72] )
+|
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f98dd68089
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            myElem = default(Microsoft.AspNetCore.Components.ElementRef);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..bd82282e59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,41): Error RZ10011: The directive attribute '@ref:suppressField' must be used as a minimized attribute. Providing an attribute value like '@ref:suppressField="false" is not supported.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
new file mode 100644
index 0000000000..69ddf6a8cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b77841ef4b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|myElem|
+Generated Location: (1083:29,12 [6] )
+|myElem|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
similarity index 93%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index dbf2201c83..56d704b4b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -58,10 +58,10 @@ __o = typeof(MyComponent<>);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
similarity index 71%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
index f634b69431..f5a1218aee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
@@ -14,15 +14,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-                HtmlContent - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (147:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (147:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                HtmlContent - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (146:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (146:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent<int> _my;\n    void DoStuff() { GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
similarity index 57%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index 42acbfee06..a07e89c131 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -13,14 +13,14 @@ Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1469:45,38 [3] )
 |_my|
 
-Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1834:61,7 [90] )
+Generated Location: (1834:61,7 [72] )
 |
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
similarity index 100%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
similarity index 79%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
index 2d876f125f..3f12dd56b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [54] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (137:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (137:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                HtmlContent - (54:0,54 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (54:0,54 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (156:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (156:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
similarity index 87%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 13e34b6bce..32c59dadb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1140:33,28 [3] )
 |_my|
 
-Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 16a293d155..cd1d0ccc6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private Test.MyComponent myInstance;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
@@ -29,15 +34,6 @@ namespace Test
             builder.CloseComponent();
         }
         #pragma warning restore 1998
-#nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index c724647179..be89b1cae3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - Test.MyComponent - myInstance
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
@@ -15,5 +16,3 @@ Document -
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
                         HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index cbf295b3fa..2eeb174cef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (864:21,40 [10] )
+Generated Location: (1062:26,40 [10] )
 |myInstance|
 
-Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-Generated Location: (1151:33,7 [104] )
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4eeabde6c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddComponentReferenceCapture(1, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   myInstance = (Test.MyComponent)__value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
new file mode 100644
index 0000000000..a39ce1d3c4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [52] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
+            CSharpCode - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent myInstance;\n    void DoStuff() { GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b52149451f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|myInstance|
+Generated Location: (719:19,19 [10] )
+|myInstance|
+
+Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+|
+Generated Location: (1006:31,7 [81] )
+|
+    MyComponent myInstance;
+    void DoStuff() { GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index dadcb2273d..80988599b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private Test.MyComponent myInstance;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
@@ -33,15 +38,6 @@ namespace Test
             builder.CloseComponent();
         }
         #pragma warning restore 1998
-#nullable restore
-#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 1bc1814490..e99793984f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - Test.MyComponent - myInstance
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [97] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
@@ -16,5 +17,3 @@ Document -
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
                         HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-            CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index a77e00670e..06ea90766e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1069:27,19 [10] )
+Generated Location: (1267:32,19 [10] )
 |myInstance|
 
-Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-Generated Location: (1356:39,7 [104] )
-|
-    private Test.MyComponent myInstance;
-    public void Foo() { System.GC.KeepAlive(myInstance); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 9ff437c85b..1dacb96fe0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
@@ -30,15 +35,6 @@ namespace Test
             builder.CloseElement();
         }
         #pragma warning restore 1998
-#nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index d9abf6f8b5..7acd3547a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -17,5 +18,3 @@ Document -
                     HtmlAttribute -  - attributeafter=" - "
                         HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
-            CSharpCode - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementRef myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 6daf0a696b..7f14ab1c93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (855:21,37 [6] )
+Generated Location: (1083:26,37 [6] )
 |myElem|
 
-Source Location: (91:2,7 [122] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-|
-Generated Location: (1163:34,7 [122] )
-|
-    private Microsoft.AspNetCore.Components.ElementRef myElem;
-    public void Foo() { System.GC.KeepAlive(myElem); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 20fcb8a55f..d039bfcdce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private global::Microsoft.AspNetCore.Components.ElementRef _element;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
@@ -40,10 +45,7 @@ namespace Test
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 61dbd3d7d5..8006fc59eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - _element
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
@@ -15,5 +16,5 @@ Document -
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
                     ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
-            CSharpCode - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementRef _element;\n\n        [Parameter] protected int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
+            CSharpCode - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] protected int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index c135b4409c..01521d24fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,20 +1,14 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1025:29,49 [8] )
+Generated Location: (1255:34,49 [8] )
 |_element|
 
-Source Location: (72:2,7 [161] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1290:41,7 [161] )
+Generated Location: (1520:46,7 [59] )
 |
-        private ElementRef _element;
-
         [Parameter] protected int Min { get; set; }
-        public void Foo() { System.GC.KeepAlive(_element); }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
new file mode 100644
index 0000000000..548594ab24
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddElementReferenceCapture(1, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            myElem = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.AddContent(2, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
new file mode 100644
index 0000000000..a92d1e0d9c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
+            CSharpCode - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementRef myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
new file mode 100644
index 0000000000..4b1c0546cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|myElem|
+Generated Location: (698:19,12 [6] )
+|myElem|
+
+Source Location: (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+|
+Generated Location: (1006:32,7 [72] )
+|
+    ElementRef myElem;
+    void DoStuff() { GC.KeepAlive(myElem); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
new file mode 100644
index 0000000000..65d6d0d152
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "elem");
+            builder.AddElementReferenceCapture(1, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+            myElem = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.AddContent(2, "Hello");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..bd82282e59
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(1,41): Error RZ10011: The directive attribute '@ref:suppressField' must be used as a minimized attribute. Providing an attribute value like '@ref:suppressField="false" is not supported.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
new file mode 100644
index 0000000000..b482efeff5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
@@ -0,0 +1,14 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlContent - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7fbcfcd168
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|myElem|
+Generated Location: (926:24,12 [6] )
+|myElem|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index c6e0ae260c..b33b86132c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private Test.MyComponent<TItem> _my;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
@@ -36,15 +41,6 @@ namespace Test
             builder.CloseComponent();
         }
         #pragma warning restore 1998
-#nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
-
-#line default
-#line hidden
-#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
index 5dbefda847..22c8243ee5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - Test.MyComponent<TItem> - _my
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
@@ -13,5 +14,3 @@ Document -
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index a830a6ef44..a259494405 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -1,16 +1,5 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1020:28,38 [3] )
+Generated Location: (1218:33,38 [3] )
 |_my|
 
-Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
-|
-Generated Location: (1305:40,7 [90] )
-|
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
new file mode 100644
index 0000000000..91dc1326f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent<int>>(0);
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             3
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddComponentReferenceCapture(2, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                      _my = (Test.MyComponent<int>)__value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
new file mode 100644
index 0000000000..3ed36f4932
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
+                        IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent<int> _my;\n    void DoStuff() { GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
new file mode 100644
index 0000000000..38b1b74663
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (1020:28,38 [3] )
+|_my|
+
+Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
+|
+Generated Location: (1305:40,7 [72] )
+|
+    MyComponent<int> _my;
+    void DoStuff() { GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index 96d74f3a1b..523fdcd46c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -10,6 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
+        #pragma warning disable 0414
+        #pragma warning disable 0169
+        private Test.MyComponent<TItem> _my;
+        #pragma warning restore 0169
+        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
index cde256a50b..ee14362fb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -6,6 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            FieldDeclaration -  - private - Test.MyComponent<TItem> - _my
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index 636a07a580..7c936d6582 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (869:26,28 [3] )
+Generated Location: (1067:31,28 [3] )
 |_my|
 
 Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1092:37,7 [90] )
+Generated Location: (1290:42,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
new file mode 100644
index 0000000000..96d74f3a1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, (__value) => {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                            _my = __value;
+
+#line default
+#line hidden
+#nullable disable
+            }
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
new file mode 100644
index 0000000000..30bbe933db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [54] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3a40923263
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (869:26,28 [3] )
+|_my|
+
+Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (1092:37,7 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index ed1efdf453..ccc3ee7ad0 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -61,16 +61,24 @@ namespace Microsoft.CodeAnalysis.Razor
                 });
             });
 
-            builder.BindAttribute(attribute =>
+            builder.BindAttribute(@ref =>
             {
-                attribute.Documentation = ComponentResources.RefTagHelper_Documentation;
-                attribute.Name = "@ref";
+                @ref.Documentation = ComponentResources.RefTagHelper_Documentation;
+                @ref.Name = "@ref";
 
                 // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the tooltips.
-                attribute.SetPropertyName("Ref");
-                attribute.TypeName = typeof(object).FullName;
-                attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+                @ref.SetPropertyName("Ref");
+                @ref.TypeName = typeof(object).FullName;
+                @ref.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+
+                @ref.BindAttributeParameter(suppressField =>
+                {
+                    suppressField.Name = "suppressField";
+                    suppressField.Documentation = ComponentResources.RefTagHelper_SuppressField_Documentation;
+                    suppressField.TypeName = typeof(bool).FullName;
+                    suppressField.SetPropertyName("SuppressField");
+                });
             });
 
             return builder.Build();
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index 0948102d3f..ef4a3ed558 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -38,7 +38,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(item.IsComponentOrChildContentTagHelper());
 
             Assert.Equal(
-                "Populates the specified field or property with a reference to the element or component.",
+                "Generates the specified field, and populates it during rendering with a reference to the element or component.",
                 item.Documentation);
 
             Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName);
@@ -74,7 +74,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(attribute.IsIndexerStringProperty);
 
             Assert.Equal(
-                "Populates the specified field or property with a reference to the element or component.",
+                "Generates the specified field, and populates it during rendering with a reference to the element or component.",
                 attribute.Documentation);
 
             Assert.Equal("@ref", attribute.Name);
@@ -84,6 +84,13 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(attribute.IsStringProperty);
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
+
+            var parameter = Assert.Single(attribute.BoundAttributeParameters);
+            Assert.Empty(parameter.Diagnostics);
+            Assert.Equal(":suppressField", parameter.DisplayName);
+            Assert.Equal("Suppresses the generation of a field by '@ref'. Specify '@ref:suppressField' to define your own property or field.", parameter.Documentation);
+            Assert.True(parameter.IsBooleanProperty);
+            Assert.Equal("suppressField", parameter.Name);
         }
     }
 }

From 2c6e1dacacc56da9c76806debc188fccfe5bbfbd Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sat, 29 Jun 2019 17:48:30 -0700
Subject: [PATCH 190/337] Use ref-assembly code in shim

Updates our Components shim to use the ref assembly code. This is just
cleanup and will help us keep up-to-date with API review changes since
we can just copy-past the files.

I made two modifications to make this simple.
- Removed our built-in components
- Removed the HTTP stuff

This makes it easier for us to maintain the shim. You can see cases
where I had to update tests because they diverged from what the real
APIs look like (no product bugs).

I'd still like to improve this workflow so suggestions wanted xD
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8517be2bacafb8b06f8ba4d53a08c145f038ad27
---
 .../test/AssertFrame.cs                       | 139 ---
 .../ComponentCodeGenerationTestBase.cs        |  10 +-
 .../ComponentDeclarationIntegrationTest.cs    |   6 +-
 .../ComponentDirectiveIntegrationTest.cs      |   8 +-
 .../BindTagHelperDescriptorProviderTest.cs    |  24 +-
 ...omponentTagHelperDescriptorProviderTest.cs |  16 +-
 .../Components/RenderTreeFrame.cs             | 344 -------
 .../Components/RenderTreeFrameType.cs         |  54 --
 ...etCore.Components.netstandard2.0.Manual.cs |  47 +
 ...ft.AspNetCore.Components.netstandard2.0.cs | 841 ++++++++++++++++++
 .../BindAttributes.cs                         |  30 -
 .../BindElementAttribute.cs                   |  64 --
 .../BindInputElementAttribute.cs              |  59 --
 .../BindMethods.cs                            | 247 -----
 .../ComponentBase.cs                          |  27 -
 .../ElementRef.cs                             |  12 -
 .../EventCallback.cs                          |  33 -
 .../EventCallbackFactory.cs                   |  43 -
 .../EventCallbackFactoryBinderExtensions.cs   | 107 ---
 ...entCallbackFactoryUIEventArgsExtensions.cs |  59 --
 .../EventHandlerAttribute.cs                  |  45 -
 .../EventHandlers.cs                          | 128 ---
 .../IComponent.cs                             |  13 -
 .../IHandleEvent.cs                           |   9 -
 .../InjectAttribute.cs                        |  16 -
 .../Layouts/LayoutAttribute.cs                |  21 -
 .../MarkupString.cs                           |  36 -
 .../ParameterAttribute.cs                     |  15 -
 .../ParameterCollection.cs                    |  13 -
 .../RenderFrame.cs                            |  22 -
 .../RenderHandle.cs                           |  12 -
 .../RenderTree/RenderTreeBuilder.cs           | 119 ---
 .../RouteAttribute.cs                         |  33 -
 .../RuntimeHelpers.cs                         |  20 -
 .../UIEventArgs.cs                            | 518 -----------
 .../UIEventArgsRenderTreeBuilderExtensions.cs | 547 ------------
 36 files changed, 929 insertions(+), 2808 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderFrame.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs
 delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs
deleted file mode 100644
index a03c4db92e..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/AssertFrame.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.Components.RenderTree;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Components
-{
-    internal static class AssertFrame
-    {
-        public static void Sequence(RenderTreeFrame frame, int? sequence = null)
-        {
-            if (sequence.HasValue)
-            {
-                Assert.Equal(sequence.Value, frame.Sequence);
-            }
-        }
-
-        public static void Text(RenderTreeFrame frame, string textContent, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Text, frame.FrameType);
-            Assert.Equal(textContent, frame.TextContent);
-            Assert.Equal(0, frame.ElementSubtreeLength);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        internal static void Markup(RenderTreeFrame frame, string markupContent, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Markup, frame.FrameType);
-            Assert.Equal(markupContent, frame.MarkupContent);
-            Assert.Equal(0, frame.ElementSubtreeLength);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void Element(RenderTreeFrame frame, string elementName, int subtreeLength, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Element, frame.FrameType);
-            Assert.Equal(elementName, frame.ElementName);
-            Assert.Equal(subtreeLength, frame.ElementSubtreeLength);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void Attribute(RenderTreeFrame frame, string attributeName, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Attribute, frame.FrameType);
-            Assert.Equal(attributeName, frame.AttributeName);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void Attribute(RenderTreeFrame frame, string attributeName, string attributeValue, int? sequence = null)
-        {
-            AssertFrame.Attribute(frame, attributeName, sequence);
-            Assert.Equal(attributeValue, frame.AttributeValue);
-        }
-
-        public static void Attribute(RenderTreeFrame frame, string attributeName, Action<UIEventArgs> attributeEventHandlerValue, int? sequence = null)
-        {
-            AssertFrame.Attribute(frame, attributeName, sequence);
-            Assert.Equal(attributeEventHandlerValue, frame.AttributeValue);
-        }
-
-        public static void Attribute(RenderTreeFrame frame, string attributeName, object attributeValue, int? sequence = null)
-        {
-            AssertFrame.Attribute(frame, attributeName, sequence);
-            Assert.Equal(attributeValue, frame.AttributeValue);
-        }
-
-        public static void Attribute(RenderTreeFrame frame, string attributeName, Type valueType, int? sequence = null)
-        {
-            AssertFrame.Attribute(frame, attributeName, sequence);
-            Assert.IsType(valueType, frame.AttributeValue);
-        }
-
-        public static void Attribute(RenderTreeFrame frame, string attributeName, Action<object> attributeValidator, int? sequence = null)
-        {
-            AssertFrame.Attribute(frame, attributeName, sequence);
-            attributeValidator(frame.AttributeValue);
-        }
-
-        public static void Component<T>(RenderTreeFrame frame, int? subtreeLength = null, int? sequence = null) where T : IComponent
-        {
-            Component(frame, typeof(T).FullName, subtreeLength, sequence);
-        }
-
-        public static void Component(RenderTreeFrame frame, string typeName, int? subtreeLength = null, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Component, frame.FrameType);
-            Assert.Equal(typeName, frame.ComponentType.FullName);
-            if (subtreeLength.HasValue)
-            {
-                Assert.Equal(subtreeLength.Value, frame.ComponentSubtreeLength);
-            }
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void ComponentWithInstance<T>(RenderTreeFrame frame, int componentId, int? subtreeLength = null, int? sequence = null) where T : IComponent
-        {
-            AssertFrame.Component<T>(frame, subtreeLength, sequence);
-            Assert.IsType<T>(frame.Component);
-            Assert.Equal(componentId, frame.ComponentId);
-        }
-
-        public static void Region(RenderTreeFrame frame, int subtreeLength, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Region, frame.FrameType);
-            Assert.Equal(subtreeLength, frame.RegionSubtreeLength);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void Whitespace(RenderTreeFrame frame, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.Text, frame.FrameType);
-            AssertFrame.Sequence(frame, sequence);
-            Assert.True(string.IsNullOrWhiteSpace(frame.TextContent));
-        }
-
-        public static void ElementReferenceCapture(RenderTreeFrame frame, Action<ElementRef> action, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.ElementReferenceCapture, frame.FrameType);
-            Assert.Same(action, frame.ElementReferenceCaptureAction);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void ComponentReferenceCapture(RenderTreeFrame frame, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.ComponentReferenceCapture, frame.FrameType);
-            Assert.NotNull(frame.ComponentReferenceCaptureAction);
-            AssertFrame.Sequence(frame, sequence);
-        }
-
-        public static void ComponentReferenceCapture(RenderTreeFrame frame, Action<object> action, int? sequence = null)
-        {
-            Assert.Equal(RenderTreeFrameType.ComponentReferenceCapture, frame.FrameType);
-            Assert.Same(action, frame.ComponentReferenceCaptureAction);
-            AssertFrame.Sequence(frame, sequence);
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index a0f7aea1c4..69874ce9c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -603,11 +603,8 @@ using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
-    public class MyComponent : ComponentBase, IComponent
+    public class MyComponent : ComponentBase
     {
-        void IComponent.SetParameters(ParameterCollection parameters)
-        {
-        }
     }
 }"));
 
@@ -666,11 +663,8 @@ using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
-    public class MyComponent : ComponentBase, IComponent
+    public class MyComponent : ComponentBase
     {
-        void IComponent.SetParameters(ParameterCollection parameters)
-        {
-        }
     }
 }"));
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 0ac00af80f..25ec85093b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -3,6 +3,7 @@
 
 using System.Reflection;
 using System.Text;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.CodeAnalysis;
@@ -155,7 +156,7 @@ namespace Test
 
         public class BaseClass : IComponent
         {
-            public void Init(RenderHandle renderHandle)
+            public void Configure(RenderHandle renderHandle)
             {
             }
 
@@ -163,8 +164,9 @@ namespace Test
             {
             }
 
-            public void SetParameters(ParameterCollection parameters)
+            public Task SetParametersAsync(ParameterCollection parameters)
             {
+                throw new System.NotImplementedException();
             }
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
index 4e5fe27b4c..6c6ab30a52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Layouts;
 using Microsoft.CodeAnalysis;
@@ -47,7 +48,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             // Assert
             var layoutAttribute = component.GetType().GetCustomAttribute<LayoutAttribute>();
             Assert.NotNull(layoutAttribute);
-            Assert.Equal(typeof(TestLayout), layoutAttribute.LayoutType);
         }
 
         [Fact]
@@ -127,12 +127,14 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             [Parameter]
             RenderFragment Body { get; set; }
 
-            public void Init(RenderHandle renderHandle)
+            public void Configure(RenderHandle renderHandle)
             {
+                throw new NotImplementedException();
             }
 
-            public void SetParameters(ParameterCollection parameters)
+            public Task SetParametersAsync(ParameterCollection parameters)
             {
+                throw new NotImplementedException();
             }
         }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index eb868d3e4a..328808dd40 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -17,15 +17,19 @@ namespace Microsoft.CodeAnalysis.Razor
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
 using System;
 using System.Linq.Expressions;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Init(RenderHandle renderHandle) { }
+        public void Configure(RenderHandle renderHandle) { }
 
-        public void SetParameters(ParameterCollection parameters) { }
+        public Task SetParametersAsync(ParameterCollection parameters)
+        {
+            return Task.CompletedTask;
+        }
 
         [Parameter]
         string MyProperty { get; set; }
@@ -137,15 +141,19 @@ namespace Test
         {
             // Arrange
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Init(RenderHandle renderHandle) { }
+        public void Configure(RenderHandle renderHandle) { }
 
-        public void SetParameters(ParameterCollection parameters) { }
+        public Task SetParametersAsync(ParameterCollection parameters)
+        {
+            return Task.CompletedTask;
+        }
 
         [Parameter]
         string MyProperty { get; set; }
@@ -254,15 +262,19 @@ namespace Test
             // Arrange
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Init(RenderHandle renderHandle) { }
+        public void Configure(RenderHandle renderHandle) { }
 
-        public void SetParameters(ParameterCollection parameters) { }
+        public Task SetParametersAsync(ParameterCollection parameters)
+        {
+            return Task.CompletedTask;
+        }
 
         public string MyProperty { get; set; }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index c4df5ed23f..9c29483766 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -16,15 +16,19 @@ namespace Microsoft.CodeAnalysis.Razor
             // Arrange
 
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Init(RenderHandle renderHandle) { }
+        public void Configure(RenderHandle renderHandle) { }
 
-        public void SetParameters(ParameterCollection parameters) { }
+        public Task SetParametersAsync(ParameterCollection parameters)
+        {
+            return Task.CompletedTask;
+        }
 
         [Parameter]
         private string MyProperty { get; set; }
@@ -132,15 +136,19 @@ namespace Test
             // Arrange
 
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
     public class MyComponent<T> : IComponent
     {
-        public void Init(RenderHandle renderHandle) { }
+        public void Configure(RenderHandle renderHandle) { }
 
-        public void SetParameters(ParameterCollection parameters) { }
+        public Task SetParametersAsync(ParameterCollection parameters)
+        {
+            return Task.CompletedTask;
+        }
 
         [Parameter]
         private string MyProperty { get; set; }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs
deleted file mode 100644
index 4441c06c9b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrame.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.AspNetCore.Components.RenderTree
-{
-    /// <summary>
-    /// Represents an entry in a tree of user interface (UI) items.
-    /// </summary>
-    [StructLayout(LayoutKind.Explicit)]
-    public readonly struct RenderTreeFrame
-    {
-        // Note that the struct layout has to be valid in both 32-bit and 64-bit runtime platforms,
-        // which means that all reference-type fields need to take up 8 bytes (except for the last
-        // one, which will be sized as either 4 or 8 bytes depending on the runtime platform).
-        // This is not optimal for the Mono-WebAssembly case because that's always 32-bit so the
-        // reference-type fields could be reduced to 4 bytes each. We could use ifdefs to have
-        // different fields offsets for the 32 and 64 bit compile targets, but then we'd have the
-        // complexity of needing different binaries when loaded into Mono-WASM vs desktop.
-        // Eventually we might stop using this shared memory interop altogether (and would have to
-        // if running as a web worker) so for now to keep things simple, treat reference types as
-        // 8 bytes here.
-
-        // --------------------------------------------------------------------------------
-        // Common
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// Gets the sequence number of the frame. Sequence numbers indicate the relative source
-        /// positions of the instructions that inserted the frames. Sequence numbers are only
-        /// comparable within the same sequence (typically, the same source method).
-        /// </summary>
-        [FieldOffset(0)] public readonly int Sequence;
-
-        /// <summary>
-        /// Describes the type of this frame.
-        /// </summary>
-        [FieldOffset(4)] public readonly RenderTreeFrameType FrameType;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.Element
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Element"/>
-        /// gets the number of frames in the subtree for which this frame is the root.
-        /// The value is zero if the frame has not yet been closed.
-        /// </summary>
-        [FieldOffset(8)] public readonly int ElementSubtreeLength;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Element"/>,
-        /// gets a name representing the type of the element. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(16)] public readonly string ElementName;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.Text
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Text"/>,
-        /// gets the content of the text frame. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(16)] public readonly string TextContent;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.Attribute
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Attribute"/>
-        /// gets the ID of the corresponding event handler, if any.
-        /// </summary>
-        [FieldOffset(8)] public readonly int AttributeEventHandlerId;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Attribute"/>,
-        /// gets the attribute name. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(16)] public readonly string AttributeName;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Attribute"/>,
-        /// gets the attribute value. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(24)] public readonly object AttributeValue;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.Component
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>
-        /// gets the number of frames in the subtree for which this frame is the root.
-        /// The value is zero if the frame has not yet been closed.
-        /// </summary>
-        [FieldOffset(8)] public readonly int ComponentSubtreeLength;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>,
-        /// gets the child component instance identifier.
-        /// </summary>
-        [FieldOffset(12)] public readonly int ComponentId;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>,
-        /// gets the type of the child component.
-        /// </summary>
-        [FieldOffset(16)] public readonly Type ComponentType;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Component"/>,
-        /// gets the child component instance. Otherwise, the value is undefined.
-        /// </summary>
-        public IComponent Component => null;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.Region
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Region"/>
-        /// gets the number of frames in the subtree for which this frame is the root.
-        /// The value is zero if the frame has not yet been closed.
-        /// </summary>
-        [FieldOffset(8)] public readonly int RegionSubtreeLength;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.ElementReferenceCapture
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ElementReferenceCapture"/>,
-        /// gets the ID of the reference capture. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(16)] public readonly string ElementReferenceCaptureId;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ElementReferenceCapture"/>,
-        /// gets the action that writes the reference to its target. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(24)] public readonly Action<ElementRef> ElementReferenceCaptureAction;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.ComponentReferenceCapture
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ComponentReferenceCapture"/>,
-        /// gets the index of the parent frame representing the component being captured. Otherwise, the value is undefined.
-        /// WARNING: This index can only be used in the context of the frame's original render tree. If the frame is
-        ///          copied elsewhere, such as to the ReferenceFrames buffer of a RenderTreeDiff, then the index will
-        ///          not relate to entries in that other buffer.
-        ///          Currently there's no scenario where this matters, but if there was, we could change all of the subtree
-        ///          initialization logic in RenderTreeDiffBuilder to walk the frames hierarchically, then it would know
-        ///          the parent index at the point where it wants to initialize the ComponentReferenceCapture frame.
-        /// </summary>
-        [FieldOffset(8)] public readonly int ComponentReferenceCaptureParentFrameIndex;
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.ComponentReferenceCapture"/>,
-        /// gets the action that writes the reference to its target. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(16)] public readonly Action<object> ComponentReferenceCaptureAction;
-
-        // --------------------------------------------------------------------------------
-        // RenderTreeFrameType.Markup
-        // --------------------------------------------------------------------------------
-
-        /// <summary>
-        /// If the <see cref="FrameType"/> property equals <see cref="RenderTreeFrameType.Markup"/>,
-        /// gets the content of the markup frame. Otherwise, the value is undefined.
-        /// </summary>
-        [FieldOffset(16)] public readonly string MarkupContent;
-
-        private RenderTreeFrame(int sequence, string elementName, int elementSubtreeLength)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.Element;
-            Sequence = sequence;
-            ElementName = elementName;
-            ElementSubtreeLength = elementSubtreeLength;
-        }
-
-        private RenderTreeFrame(int sequence, Type componentType, int componentSubtreeLength)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.Component;
-            Sequence = sequence;
-            ComponentType = componentType;
-            ComponentSubtreeLength = componentSubtreeLength;
-        }
-
-        private RenderTreeFrame(int sequence, string textContent)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.Text;
-            Sequence = sequence;
-            TextContent = textContent;
-        }
-
-        private RenderTreeFrame(int sequence, string attributeName, object attributeValue)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.Attribute;
-            Sequence = sequence;
-            AttributeName = attributeName;
-            AttributeValue = attributeValue;
-        }
-
-        private RenderTreeFrame(int sequence, string attributeName, object attributeValue, int eventHandlerId)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.Attribute;
-            Sequence = sequence;
-            AttributeName = attributeName;
-            AttributeValue = attributeValue;
-            AttributeEventHandlerId = eventHandlerId;
-        }
-
-        private RenderTreeFrame(int sequence, int regionSubtreeLength)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.Region;
-            Sequence = sequence;
-            RegionSubtreeLength = regionSubtreeLength;
-        }
-
-        private RenderTreeFrame(int sequence, Action<ElementRef> elementReferenceCaptureAction, string elementReferenceCaptureId)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.ElementReferenceCapture;
-            Sequence = sequence;
-            ElementReferenceCaptureAction = elementReferenceCaptureAction;
-            ElementReferenceCaptureId = elementReferenceCaptureId;
-        }
-
-        private RenderTreeFrame(int sequence, Action<object> componentReferenceCaptureAction, int parentFrameIndex)
-            : this()
-        {
-            FrameType = RenderTreeFrameType.ComponentReferenceCapture;
-            Sequence = sequence;
-            ComponentReferenceCaptureAction = componentReferenceCaptureAction;
-            ComponentReferenceCaptureParentFrameIndex = parentFrameIndex;
-        }
-
-        // If we need further constructors whose signatures clash with the patterns above,
-        // we can add extra args to this general-purpose one.
-        private RenderTreeFrame(int sequence, RenderTreeFrameType frameType, string markupContent)
-            : this()
-        {
-            FrameType = frameType;
-            Sequence = sequence;
-            MarkupContent = markupContent;
-        }
-
-        internal static RenderTreeFrame Element(int sequence, string elementName)
-            => new RenderTreeFrame(sequence, elementName: elementName, elementSubtreeLength: 0);
-
-        internal static RenderTreeFrame Text(int sequence, string textContent)
-            => new RenderTreeFrame(sequence, textContent: textContent);
-
-        internal static RenderTreeFrame Markup(int sequence, string markupContent)
-            => new RenderTreeFrame(sequence, RenderTreeFrameType.Markup, markupContent);
-
-        internal static RenderTreeFrame Attribute(int sequence, string name, MulticastDelegate value)
-             => new RenderTreeFrame(sequence, attributeName: name, attributeValue: value);
-
-        internal static RenderTreeFrame Attribute(int sequence, string name, object value)
-            => new RenderTreeFrame(sequence, attributeName: name, attributeValue: value);
-
-        internal static RenderTreeFrame ChildComponent(int sequence, Type componentType)
-            => new RenderTreeFrame(sequence, componentType, 0);
-
-        internal static RenderTreeFrame PlaceholderChildComponentWithSubtreeLength(int subtreeLength)
-            => new RenderTreeFrame(0, typeof(IComponent), subtreeLength);
-
-        internal static RenderTreeFrame Region(int sequence)
-            => new RenderTreeFrame(sequence, regionSubtreeLength: 0);
-
-        internal static RenderTreeFrame ElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)
-            => new RenderTreeFrame(sequence, elementReferenceCaptureAction: elementReferenceCaptureAction, elementReferenceCaptureId: null);
-
-        internal static RenderTreeFrame ComponentReferenceCapture(int sequence, Action<object> componentReferenceCaptureAction, int parentFrameIndex)
-            => new RenderTreeFrame(sequence, componentReferenceCaptureAction: componentReferenceCaptureAction, parentFrameIndex: parentFrameIndex);
-
-        internal RenderTreeFrame WithElementSubtreeLength(int elementSubtreeLength)
-            => new RenderTreeFrame(Sequence, elementName: ElementName, elementSubtreeLength: elementSubtreeLength);
-
-        internal RenderTreeFrame WithComponentSubtreeLength(int componentSubtreeLength)
-            => new RenderTreeFrame(Sequence, componentType: ComponentType, componentSubtreeLength: componentSubtreeLength);
-
-        internal RenderTreeFrame WithAttributeSequence(int sequence)
-            => new RenderTreeFrame(sequence, attributeName: AttributeName, attributeValue: AttributeValue);
-
-        internal RenderTreeFrame WithAttributeEventHandlerId(int eventHandlerId)
-            => new RenderTreeFrame(Sequence, AttributeName, AttributeValue, eventHandlerId);
-
-        internal RenderTreeFrame WithRegionSubtreeLength(int regionSubtreeLength)
-            => new RenderTreeFrame(Sequence, regionSubtreeLength: regionSubtreeLength);
-
-        internal RenderTreeFrame WithElementReferenceCaptureId(string elementReferenceCaptureId)
-            => new RenderTreeFrame(Sequence, ElementReferenceCaptureAction, elementReferenceCaptureId);
-
-        /// <inheritdoc />
-        // Just to be nice for debugging and unit tests.
-        public override string ToString()
-        {
-            switch (FrameType)
-            {
-                case RenderTreeFrameType.Attribute:
-                    return $"Attribute: (seq={Sequence}, id={AttributeEventHandlerId}) '{AttributeName}'='{AttributeValue}'";
-
-                case RenderTreeFrameType.Component:
-                    return $"Component: (seq={Sequence}, len={ComponentSubtreeLength}) {ComponentType}";
-
-                case RenderTreeFrameType.Element:
-                    return $"Element: (seq={Sequence}, len={ElementSubtreeLength}) {ElementName}";
-
-                case RenderTreeFrameType.Region:
-                    return $"Region: (seq={Sequence}, len={RegionSubtreeLength})";
-
-                case RenderTreeFrameType.Text:
-                    return $"Text: (seq={Sequence}, len=n/a) {EscapeNewlines(TextContent)}";
-
-                case RenderTreeFrameType.Markup:
-                    return $"Markup: (seq={Sequence}, len=n/a) {EscapeNewlines(TextContent)}";
-
-                case RenderTreeFrameType.ElementReferenceCapture:
-                    return $"ElementReferenceCapture: (seq={Sequence}, len=n/a) {ElementReferenceCaptureAction}";
-            }
-
-            return base.ToString();
-        }
-
-        private static string EscapeNewlines(string text)
-        {
-            return text.Replace("\n", "\\n").Replace("\r\n", "\\r\\n");
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs
deleted file mode 100644
index 5a64846ae9..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Components/RenderTreeFrameType.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components.RenderTree
-{
-    /// <summary>
-    /// Describes the type of a <see cref="RenderTreeFrame"/>.
-    /// </summary>
-    public enum RenderTreeFrameType : int
-    {
-        /// <summary>
-        /// Represents a container for other frames.
-        /// </summary>
-        Element = 1,
-
-        /// <summary>
-        /// Represents text content.
-        /// </summary>
-        Text = 2,
-
-        /// <summary>
-        /// Represents a key-value pair associated with another <see cref="RenderTreeFrame"/>.
-        /// </summary>
-        Attribute = 3,
-
-        /// <summary>
-        /// Represents a child component.
-        /// </summary>
-        Component = 4,
-
-        /// <summary>
-        /// Defines the boundary around range of sibling frames that should be treated as an
-        /// unsplittable group for the purposes of diffing. This is typically used when appending
-        /// a tree fragment generated by external code, because the sequence numbers in that tree
-        /// fragment are not comparable to sequence numbers outside it.
-        /// </summary>
-        Region = 5,
-
-        /// <summary>
-        /// Represents an instruction to capture or update a reference to the parent element.
-        /// </summary>
-        ElementReferenceCapture = 6,
-
-        /// <summary>
-        /// Represents an instruction to capture or update a reference to the parent component.
-        /// </summary>
-        ComponentReferenceCapture = 7,
-
-        /// <summary>
-        /// Represents a block of markup content.
-        /// </summary>
-        Markup = 8,
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
new file mode 100644
index 0000000000..b83fc48298
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
@@ -0,0 +1,47 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    // https://github.com/dotnet/arcade/pull/2033
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Explicit)]
+    public readonly partial struct RenderTreeFrame
+    {
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int AttributeEventHandlerId;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly string AttributeName;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(24)]
+        public readonly object AttributeValue;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(12)]
+        public readonly int ComponentId;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly System.Action<object> ComponentReferenceCaptureAction;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int ComponentReferenceCaptureParentFrameIndex;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int ComponentSubtreeLength;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly System.Type ComponentType;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly string ElementName;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(24)]
+        public readonly System.Action<Microsoft.AspNetCore.Components.ElementRef> ElementReferenceCaptureAction;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly string ElementReferenceCaptureId;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int ElementSubtreeLength;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(4)]
+        public readonly Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType FrameType;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly string MarkupContent;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int RegionSubtreeLength;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(0)]
+        public readonly int Sequence;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly string TextContent;
+        public Microsoft.AspNetCore.Components.IComponent Component { get { throw null; } }
+        public override string ToString() { throw null; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
new file mode 100644
index 0000000000..92b9f1f55d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -0,0 +1,841 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    public partial class AuthenticationState
+    {
+        public AuthenticationState(System.Security.Claims.ClaimsPrincipal user) { }
+        public System.Security.Claims.ClaimsPrincipal User { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public delegate void AuthenticationStateChangedHandler(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.AuthenticationState> task);
+    public abstract partial class AuthenticationStateProvider
+    {
+        protected AuthenticationStateProvider() { }
+        public event Microsoft.AspNetCore.Components.AuthenticationStateChangedHandler AuthenticationStateChanged { add { } remove { } }
+        public abstract System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.AuthenticationState> GetAuthenticationStateAsync();
+        protected void NotifyAuthenticationStateChanged(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.AuthenticationState> task) { }
+    }
+    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange")]
+    public static partial class BindAttributes
+    {
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class BindElementAttribute : System.Attribute
+    {
+        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute) { }
+        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Element { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class BindInputElementAttribute : System.Attribute
+    {
+        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute) { }
+        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public static partial class BindMethods
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback GetEventHandlerValue<T>(Microsoft.AspNetCore.Components.EventCallback value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<T> GetEventHandlerValue<T>(Microsoft.AspNetCore.Components.EventCallback<T> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Action value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Action<T> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Func<System.Threading.Tasks.Task> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Func<T, System.Threading.Tasks.Task> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static string GetEventHandlerValue<T>(string value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
+        public static string GetValue(System.DateTime value, string format) { throw null; }
+        public static T GetValue<T>(T value) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<bool> setter, bool existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<System.DateTime> setter, System.DateTime existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<System.DateTime> setter, System.DateTime existingValue, string format) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<decimal> setter, decimal existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<double> setter, double existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<int> setter, int existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<long> setter, long existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<bool?> setter, bool? existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<decimal?> setter, decimal? existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<double?> setter, double? existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<int?> setter, int? existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<long?> setter, long? existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<float?> setter, float? existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<float> setter, float existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<string> setter, string existingValue) { throw null; }
+        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler<T>(System.Action<T> setter, T existingValue) { throw null; }
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=false)]
+    public sealed partial class CascadingParameterAttribute : System.Attribute
+    {
+        public CascadingParameterAttribute() { }
+        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public abstract partial class ComponentBase : Microsoft.AspNetCore.Components.IComponent, Microsoft.AspNetCore.Components.IHandleAfterRender, Microsoft.AspNetCore.Components.IHandleEvent
+    {
+        public ComponentBase() { }
+        protected virtual void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected System.Threading.Tasks.Task Invoke(System.Action workItem) { throw null; }
+        protected System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
+        void Microsoft.AspNetCore.Components.IComponent.Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleAfterRender.OnAfterRenderAsync() { throw null; }
+        System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleEvent.HandleEventAsync(Microsoft.AspNetCore.Components.EventCallbackWorkItem callback, object arg) { throw null; }
+        protected virtual void OnAfterRender() { }
+        protected virtual System.Threading.Tasks.Task OnAfterRenderAsync() { throw null; }
+        protected virtual void OnInit() { }
+        protected virtual System.Threading.Tasks.Task OnInitAsync() { throw null; }
+        protected virtual void OnParametersSet() { }
+        protected virtual System.Threading.Tasks.Task OnParametersSetAsync() { throw null; }
+        public virtual System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
+        protected virtual bool ShouldRender() { throw null; }
+        protected void StateHasChanged() { }
+    }
+    public partial class DataTransfer
+    {
+        public DataTransfer() { }
+        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.UIDataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ElementRef
+    {
+        private readonly object _dummy;
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public string __internalId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct EventCallback
+    {
+        private readonly object _dummy;
+        public static readonly Microsoft.AspNetCore.Components.EventCallback Empty;
+        public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory;
+        public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; }
+        public bool HasDelegate { get { throw null; } }
+        public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; }
+    }
+    public sealed partial class EventCallbackFactory
+    {
+        public EventCallbackFactory() { }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, Microsoft.AspNetCore.Components.EventCallback callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Action callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Action<object> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Func<object, System.Threading.Tasks.Task> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public Microsoft.AspNetCore.Components.EventCallback<T> CreateInferred<T>(object receiver, System.Action<T> callback, T value) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public Microsoft.AspNetCore.Components.EventCallback<T> CreateInferred<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback, T value) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, Microsoft.AspNetCore.Components.EventCallback callback) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, Microsoft.AspNetCore.Components.EventCallback<T> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action<T> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public string Create<T>(object receiver, string callback) { throw null; }
+    }
+    public static partial class EventCallbackFactoryBinderExtensions
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue) { throw null; }
+    }
+    public static partial class EventCallbackFactoryUIEventArgsExtensions
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIChangeEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIClipboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIDragEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIErrorEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIFocusEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIPointerEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIProgressEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UITouchEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIWheelEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIChangeEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIDragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIFocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIKeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIMouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIPointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UITouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public partial struct EventCallbackWorkItem
+    {
+        private object _dummy;
+        public static readonly Microsoft.AspNetCore.Components.EventCallbackWorkItem Empty;
+        public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; }
+        public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct EventCallback<T>
+    {
+        private readonly object _dummy;
+        public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; }
+        public bool HasDelegate { get { throw null; } }
+        public System.Threading.Tasks.Task InvokeAsync(T arg) { throw null; }
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class EventHandlerAttribute : System.Attribute
+    {
+        public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
+        public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.UIChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.UIErrorEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.UIChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
+    public static partial class EventHandlers
+    {
+    }
+    public partial interface IComponent
+    {
+        void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
+        System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters);
+    }
+    public partial interface IComponentContext
+    {
+        bool IsConnected { get; }
+    }
+    public partial interface IHandleAfterRender
+    {
+        System.Threading.Tasks.Task OnAfterRenderAsync();
+    }
+    public partial interface IHandleEvent
+    {
+        System.Threading.Tasks.Task HandleEventAsync(Microsoft.AspNetCore.Components.EventCallbackWorkItem item, object arg);
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false)]
+    public partial class InjectAttribute : System.Attribute
+    {
+        public InjectAttribute() { }
+    }
+    public partial interface IUriHelper
+    {
+        event System.EventHandler<Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs> OnLocationChanged;
+        string GetAbsoluteUri();
+        string GetBaseUri();
+        void NavigateTo(string uri);
+        void NavigateTo(string uri, bool forceLoad);
+        System.Uri ToAbsoluteUri(string href);
+        string ToBaseRelativePath(string baseUri, string locationAbsolute);
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct MarkupString
+    {
+        private readonly object _dummy;
+        public MarkupString(string value) { throw null; }
+        public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public static explicit operator Microsoft.AspNetCore.Components.MarkupString (string value) { throw null; }
+        public override string ToString() { throw null; }
+    }
+    public partial class NavigationException : System.Exception
+    {
+        public NavigationException(string uri) { }
+        public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct Parameter
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public bool Cascading { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=false)]
+    public sealed partial class ParameterAttribute : System.Attribute
+    {
+        public ParameterAttribute() { }
+        public bool CaptureUnmatchedValues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ParameterCollection
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public static Microsoft.AspNetCore.Components.ParameterCollection Empty { get { throw null; } }
+        public static Microsoft.AspNetCore.Components.ParameterCollection FromDictionary(System.Collections.Generic.IDictionary<string, object> parameters) { throw null; }
+        public Microsoft.AspNetCore.Components.ParameterEnumerator GetEnumerator() { throw null; }
+        public T GetValueOrDefault<T>(string parameterName) { throw null; }
+        public T GetValueOrDefault<T>(string parameterName, T defaultValue) { throw null; }
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> ToDictionary() { throw null; }
+        public bool TryGetValue<T>(string parameterName, out T result) { throw null; }
+    }
+    public static partial class ParameterCollectionExtensions
+    {
+        public static void SetParameterProperties(this in Microsoft.AspNetCore.Components.ParameterCollection parameterCollection, object target) { }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public partial struct ParameterEnumerator
+    {
+        private object _dummy;
+        private int _dummyPrimitive;
+        public Microsoft.AspNetCore.Components.Parameter Current { get { throw null; } }
+        public bool MoveNext() { throw null; }
+    }
+    public delegate void RenderFragment(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder);
+    public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment<T>(T value);
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RenderHandle
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public bool IsInitialized { get { throw null; } }
+        public System.Threading.Tasks.Task Invoke(System.Action workItem) { throw null; }
+        public System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
+        public void Render(Microsoft.AspNetCore.Components.RenderFragment renderFragment) { }
+    }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=false)]
+    public partial class RouteAttribute : System.Attribute
+    {
+        public RouteAttribute(string template) { }
+        public string Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public static partial class RuntimeHelpers
+    {
+        public static T TypeCheck<T>(T value) { throw null; }
+    }
+    public partial class UIChangeEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIChangeEventArgs() { }
+        public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIClipboardEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIClipboardEventArgs() { }
+    }
+    public partial class UIDataTransferItem
+    {
+        public UIDataTransferItem() { }
+        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIDragEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
+    {
+        public UIDragEventArgs() { }
+        public Microsoft.AspNetCore.Components.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIErrorEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIErrorEventArgs() { }
+        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIEventArgs
+    {
+        public static readonly Microsoft.AspNetCore.Components.UIEventArgs Empty;
+        public UIEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public static partial class UIEventArgsRenderTreeBuilderExtensions
+    {
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIChangeEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIClipboardEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIDragEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIErrorEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIFocusEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIPointerEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIProgressEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UITouchEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIWheelEventArgs> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIChangeEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIClipboardEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIDragEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIErrorEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIFocusEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIKeyboardEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIMouseEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIPointerEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIProgressEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UITouchEventArgs, System.Threading.Tasks.Task> value) { }
+        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> value) { }
+    }
+    public partial class UIFocusEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIFocusEventArgs() { }
+    }
+    public partial class UIKeyboardEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIKeyboardEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIMouseEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIMouseEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIPointerEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
+    {
+        public UIPointerEventArgs() { }
+        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIProgressEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UIProgressEventArgs() { }
+        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UITouchEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    {
+        public UITouchEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.UITouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.UITouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.UITouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UITouchPoint
+    {
+        public UITouchPoint() { }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class UIWheelEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
+    {
+        public UIWheelEventArgs() { }
+        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public abstract partial class UriHelperBase : Microsoft.AspNetCore.Components.IUriHelper
+    {
+        protected UriHelperBase() { }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs> OnLocationChanged { add { } remove { } }
+        protected virtual void EnsureInitialized() { }
+        public string GetAbsoluteUri() { throw null; }
+        public virtual string GetBaseUri() { throw null; }
+        public virtual void InitializeState(string uriAbsolute, string baseUriAbsolute) { }
+        public void NavigateTo(string uri) { }
+        public void NavigateTo(string uri, bool forceLoad) { }
+        protected abstract void NavigateToCore(string uri, bool forceLoad);
+        protected void SetAbsoluteBaseUri(string baseUri) { }
+        protected void SetAbsoluteUri(string uri) { }
+        public System.Uri ToAbsoluteUri(string href) { throw null; }
+        public string ToBaseRelativePath(string baseUri, string locationAbsolute) { throw null; }
+        protected void TriggerOnLocationChanged(bool isinterceptedLink) { }
+    }
+}
+namespace Microsoft.AspNetCore.Components.Forms
+{
+    public sealed partial class EditContext
+    {
+        public EditContext(object model) { }
+        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.FieldChangedEventArgs> OnFieldChanged { add { } remove { } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.ValidationRequestedEventArgs> OnValidationRequested { add { } remove { } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.ValidationStateChangedEventArgs> OnValidationStateChanged { add { } remove { } }
+        public Microsoft.AspNetCore.Components.Forms.FieldIdentifier Field(string fieldName) { throw null; }
+        public System.Collections.Generic.IEnumerable<string> GetValidationMessages() { throw null; }
+        public System.Collections.Generic.IEnumerable<string> GetValidationMessages(Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
+        public bool IsModified() { throw null; }
+        public bool IsModified(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
+        public void MarkAsUnmodified() { }
+        public void MarkAsUnmodified(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+        public void NotifyFieldChanged(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+        public void NotifyValidationStateChanged() { }
+        public bool Validate() { throw null; }
+    }
+    public static partial class EditContextDataAnnotationsExtensions
+    {
+        public static Microsoft.AspNetCore.Components.Forms.EditContext AddDataAnnotationsValidation(this Microsoft.AspNetCore.Components.Forms.EditContext editContext) { throw null; }
+    }
+    public static partial class EditContextExpressionExtensions
+    {
+        public static System.Collections.Generic.IEnumerable<string> GetValidationMessages(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<object>> accessor) { throw null; }
+        public static bool IsModified(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<object>> accessor) { throw null; }
+    }
+    public static partial class EditContextFieldClassExtensions
+    {
+        public static string FieldClass(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
+        public static string FieldClass<TField>(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<TField>> accessor) { throw null; }
+    }
+    public sealed partial class FieldChangedEventArgs
+    {
+        internal FieldChangedEventArgs() { }
+        public Microsoft.AspNetCore.Components.Forms.FieldIdentifier FieldIdentifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct FieldIdentifier
+    {
+        private readonly object _dummy;
+        public FieldIdentifier(object model, string fieldName) { throw null; }
+        public string FieldName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public static Microsoft.AspNetCore.Components.Forms.FieldIdentifier Create<T>(System.Linq.Expressions.Expression<System.Func<T>> accessor) { throw null; }
+        public override bool Equals(object obj) { throw null; }
+        public override int GetHashCode() { throw null; }
+    }
+    public sealed partial class ValidationMessageStore
+    {
+        public ValidationMessageStore(Microsoft.AspNetCore.Components.Forms.EditContext editContext) { }
+        public System.Collections.Generic.IEnumerable<string> this[Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier] { get { throw null; } }
+        public System.Collections.Generic.IEnumerable<string> this[System.Linq.Expressions.Expression<System.Func<object>> accessor] { get { throw null; } }
+        public void Add(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier, string message) { }
+        public void AddRange(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier, System.Collections.Generic.IEnumerable<string> messages) { }
+        public void Clear() { }
+        public void Clear(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+    }
+    public static partial class ValidationMessageStoreExpressionExtensions
+    {
+        public static void Add(this Microsoft.AspNetCore.Components.Forms.ValidationMessageStore store, System.Linq.Expressions.Expression<System.Func<object>> accessor, string message) { }
+        public static void AddRange(this Microsoft.AspNetCore.Components.Forms.ValidationMessageStore store, System.Linq.Expressions.Expression<System.Func<object>> accessor, System.Collections.Generic.IEnumerable<string> messages) { }
+        public static void Clear(this Microsoft.AspNetCore.Components.Forms.ValidationMessageStore store, System.Linq.Expressions.Expression<System.Func<object>> accessor) { }
+    }
+    public sealed partial class ValidationRequestedEventArgs
+    {
+        internal ValidationRequestedEventArgs() { }
+    }
+    public sealed partial class ValidationStateChangedEventArgs
+    {
+        internal ValidationStateChangedEventArgs() { }
+    }
+}
+namespace Microsoft.AspNetCore.Components.Layouts
+{
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
+    public partial class LayoutAttribute : System.Attribute
+    {
+        public LayoutAttribute(System.Type layoutType) { }
+        public System.Type LayoutType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public abstract partial class LayoutComponentBase : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        protected LayoutComponentBase() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        protected Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+}
+namespace Microsoft.AspNetCore.Components.Rendering
+{
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ComponentRenderedText
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public System.Collections.Generic.IEnumerable<string> Tokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public partial class EventFieldInfo
+    {
+        public EventFieldInfo() { }
+        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class HtmlRenderer : Microsoft.AspNetCore.Components.Rendering.Renderer
+    {
+        public HtmlRenderer(System.IServiceProvider serviceProvider, System.Func<string, string> htmlEncoder, Microsoft.AspNetCore.Components.Rendering.IDispatcher dispatcher) : base (default(System.IServiceProvider)) { }
+        protected override void HandleException(System.Exception exception) { }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Rendering.ComponentRenderedText> RenderComponentAsync(System.Type componentType, Microsoft.AspNetCore.Components.ParameterCollection initialParameters) { throw null; }
+        public System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Rendering.ComponentRenderedText> RenderComponentAsync<TComponent>(Microsoft.AspNetCore.Components.ParameterCollection initialParameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
+        protected override System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch renderBatch) { throw null; }
+    }
+    public partial interface IDispatcher
+    {
+        System.Threading.Tasks.Task Invoke(System.Action action);
+        System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> asyncAction);
+        System.Threading.Tasks.Task<TResult> InvokeAsync<TResult>(System.Func<System.Threading.Tasks.Task<TResult>> asyncFunction);
+        System.Threading.Tasks.Task<TResult> Invoke<TResult>(System.Func<TResult> function);
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RenderBatch
+    {
+        private readonly object _dummy;
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public abstract partial class Renderer : System.IDisposable
+    {
+        public Renderer(System.IServiceProvider serviceProvider) { }
+        public Renderer(System.IServiceProvider serviceProvider, Microsoft.AspNetCore.Components.Rendering.IDispatcher dispatcher) { }
+        public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
+        protected internal virtual void AddToRenderQueue(int componentId, Microsoft.AspNetCore.Components.RenderFragment renderFragment) { }
+        protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
+        public static Microsoft.AspNetCore.Components.Rendering.IDispatcher CreateDefaultDispatcher() { throw null; }
+        public virtual System.Threading.Tasks.Task DispatchEventAsync(int eventHandlerId, Microsoft.AspNetCore.Components.Rendering.EventFieldInfo fieldInfo, Microsoft.AspNetCore.Components.UIEventArgs eventArgs) { throw null; }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected abstract void HandleException(System.Exception exception);
+        protected Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.Type componentType) { throw null; }
+        public virtual System.Threading.Tasks.Task Invoke(System.Action workItem) { throw null; }
+        public virtual System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
+        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId, Microsoft.AspNetCore.Components.ParameterCollection initialParameters) { throw null; }
+        protected abstract System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch renderBatch);
+    }
+}
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ArrayRange<T>
+    {
+        public readonly T[] Array;
+        public readonly int Count;
+        public ArrayRange(T[] array, int count) { throw null; }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<T> Clone() { throw null; }
+    }
+    public partial class RenderTreeBuilder
+    {
+        public const string ChildContent = "ChildContent";
+        public RenderTreeBuilder(Microsoft.AspNetCore.Components.Rendering.Renderer renderer) { }
+        public void AddAttribute(int sequence, in Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) { }
+        public void AddAttribute(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback value) { }
+        public void AddAttribute(int sequence, string name, System.Action value) { }
+        public void AddAttribute(int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIEventArgs> value) { }
+        public void AddAttribute(int sequence, string name, bool value) { }
+        public void AddAttribute(int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIEventArgs, System.Threading.Tasks.Task> value) { }
+        public void AddAttribute(int sequence, string name, System.Func<System.Threading.Tasks.Task> value) { }
+        public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
+        public void AddAttribute(int sequence, string name, object value) { }
+        public void AddAttribute(int sequence, string name, string value) { }
+        public void AddAttribute<T>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<T> value) { }
+        public void AddComponentReferenceCapture(int sequence, System.Action<object> componentReferenceCaptureAction) { }
+        public void AddContent(int sequence, Microsoft.AspNetCore.Components.MarkupString markupContent) { }
+        public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment) { }
+        public void AddContent(int sequence, object textContent) { }
+        public void AddContent(int sequence, string textContent) { }
+        public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
+        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementRef> elementReferenceCaptureAction) { }
+        public void AddMarkupContent(int sequence, string markupContent) { }
+        public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
+        public void Clear() { }
+        public void CloseComponent() { }
+        public void CloseElement() { }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetFrames() { throw null; }
+        public void OpenComponent(int sequence, System.Type componentType) { }
+        public void OpenComponent<TComponent>(int sequence) where TComponent : Microsoft.AspNetCore.Components.IComponent { }
+        public void OpenElement(int sequence, string elementName) { }
+        public void SetKey(object value) { }
+        public void SetUpdatesAttributeName(string updatesAttributeName) { }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RenderTreeDiff
+    {
+        public readonly int ComponentId;
+        public readonly System.ArraySegment<Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit> Edits;
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Explicit)]
+    public readonly partial struct RenderTreeEdit
+    {
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int MoveToSiblingIndex;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
+        public readonly int ReferenceFrameIndex;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
+        public readonly string RemovedAttributeName;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(4)]
+        public readonly int SiblingIndex;
+        [System.Runtime.InteropServices.FieldOffsetAttribute(0)]
+        public readonly Microsoft.AspNetCore.Components.RenderTree.RenderTreeEditType Type;
+    }
+    public enum RenderTreeEditType
+    {
+        PrependFrame = 1,
+        RemoveFrame = 2,
+        SetAttribute = 3,
+        RemoveAttribute = 4,
+        UpdateText = 5,
+        StepIn = 6,
+        StepOut = 7,
+        UpdateMarkup = 8,
+        PermutationListEntry = 9,
+        PermutationListEnd = 10,
+    }
+    public enum RenderTreeFrameType
+    {
+        None = 0,
+        Element = 1,
+        Text = 2,
+        Attribute = 3,
+        Component = 4,
+        Region = 5,
+        ElementReferenceCapture = 6,
+        ComponentReferenceCapture = 7,
+        Markup = 8,
+    }
+}
+namespace Microsoft.AspNetCore.Components.Routing
+{
+    public partial interface INavigationInterception
+    {
+        System.Threading.Tasks.Task EnableNavigationInterceptionAsync();
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct LocationChangedEventArgs
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public LocationChangedEventArgs(string location, bool isNavigationIntercepted) { throw null; }
+        public bool IsNavigationIntercepted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public enum NavLinkMatch
+    {
+        Prefix = 0,
+        All = 1,
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
deleted file mode 100644
index 6d319c0b60..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindAttributes.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Infrastructure for the discovery of <c>bind</c> attributes for markup elements.
-    /// </summary>
-    /// <remarks>
-    /// To extend the set of <c>bind</c> attributes, define a public class named 
-    /// <c>BindAttributes</c> and annotate it with the appropriate attributes.
-    /// </remarks>
-
-    // Handles cases like <input bind="..." /> - this is a fallback and will be ignored
-    // when a specific type attribute is applied.
-    [BindInputElement(null, null, "value", "onchange")]
-
-    // Handles cases like <input @bind-value="..." /> - this is a fallback and will be ignored
-    // when a specific type attribute is applied.
-    [BindInputElement(null, "value", "value", "onchange")]
-
-    [BindInputElement("checkbox", null, "checked", "onchange")]
-    [BindInputElement("text", null, "value", "onchange")]
-
-    [BindElement("select", null, "value", "onchange")]
-    [BindElement("textarea", null, "value", "onchange")]
-    public static class BindAttributes
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs
deleted file mode 100644
index 710ab6c9f9..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindElementAttribute.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Configures options for binding specific element types.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-    public sealed class BindElementAttribute : Attribute
-    {
-        /// <summary>
-        /// Constructs an instance of <see cref="BindElementAttribute"/>.
-        /// </summary>
-        /// <param name="element">The tag name of the element.</param>
-        /// <param name="suffix">The suffix value. For example, set this to <code>value</code> for <code>bind-value</code>, or set this to <code>null</code> for <code>bind</code>.</param>
-        /// <param name="valueAttribute">The name of the value attribute to be bound.</param>
-        /// <param name="changeAttribute">The name of an attribute that will register an associated change event.</param>
-        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute)
-        {
-            if (element == null)
-            {
-                throw new ArgumentNullException(nameof(element));
-            }
-
-            if (valueAttribute == null)
-            {
-                throw new ArgumentNullException(nameof(valueAttribute));
-            }
-
-            if (changeAttribute == null)
-            {
-                throw new ArgumentNullException(nameof(changeAttribute));
-            }
-
-            Element = element;
-            ValueAttribute = valueAttribute;
-            ChangeAttribute = changeAttribute;
-        }
-
-        /// <summary>
-        /// Gets the tag name of the element.
-        /// </summary>
-        public string Element { get; }
-
-        /// <summary>
-        /// Gets the suffix value.
-        /// For example, this will be <code>value</code> to mean <code>bind-value</code>, or <code>null</code> to mean <code>bind</code>.
-        /// </summary>
-        public string Suffix { get; }
-
-        /// <summary>
-        /// Gets the name of the value attribute to be bound.
-        /// </summary>
-        public string ValueAttribute { get; }
-
-        /// <summary>
-        /// Gets the name of an attribute that will register an associated change event.
-        /// </summary>
-        public string ChangeAttribute { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs
deleted file mode 100644
index 16c65cf536..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Configures options for binding subtypes of an HTML <code>input</code> element.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-    public sealed class BindInputElementAttribute : Attribute
-    {
-        /// <summary>
-        /// Constructs an instance of <see cref="BindInputElementAttribute"/>.
-        /// </summary>
-        /// <param name="type">The value of the element's <code>type</code> attribute.</param>
-        /// <param name="suffix">The suffix value.</param>
-        /// <param name="valueAttribute">The name of the value attribute to be bound.</param>
-        /// <param name="changeAttribute">The name of an attribute that will register an associated change event.</param>
-        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute)
-        {
-            if (valueAttribute == null)
-            {
-                throw new ArgumentNullException(nameof(valueAttribute));
-            }
-
-            if (changeAttribute == null)
-            {
-                throw new ArgumentNullException(nameof(changeAttribute));
-            }
-
-            Type = type;
-            Suffix = suffix;
-            ValueAttribute = valueAttribute;
-            ChangeAttribute = changeAttribute;
-        }
-
-        /// <summary>
-        /// Gets the value of the element's <code>type</code> attribute.
-        /// </summary>
-        public string Type { get; }
-
-        /// <summary>
-        /// Gets the suffix value.
-        /// </summary>
-        public string Suffix { get; }
-
-        /// <summary>
-        /// Gets the name of the value attribute to be bound.
-        /// </summary>
-        public string ValueAttribute { get; }
-
-        /// <summary>
-        /// Gets the name of an attribute that will register an associated change event.
-        /// </summary>
-        public string ChangeAttribute { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
deleted file mode 100644
index 3e4b51b60e..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/BindMethods.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Globalization;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Methods used internally by @bind syntax. Not intended to be used directly.
-    /// </summary>
-    public static class BindMethods
-    {
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static T GetValue<T>(T value) => value;
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static string GetValue(DateTime value, string format) =>
-            value == default ? null
-            : (format == null ? value.ToString() : value.ToString(format));
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static string GetEventHandlerValue<T>(string value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static MulticastDelegate GetEventHandlerValue<T>(Action value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static MulticastDelegate GetEventHandlerValue<T>(Func<Task> value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static MulticastDelegate GetEventHandlerValue<T>(Action<T> value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static MulticastDelegate GetEventHandlerValue<T>(Func<T, Task> value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static EventCallback GetEventHandlerValue<T>(EventCallback value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static EventCallback<T> GetEventHandlerValue<T>(EventCallback<T> value)
-            where T : UIEventArgs
-        {
-            return value;
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<string> setter, string existingValue)
-        {
-            return _ => setter((string)((UIChangeEventArgs)_).Value);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<bool> setter, bool existingValue)
-        {
-            return _ => setter((bool)((UIChangeEventArgs)_).Value);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<bool?> setter, bool? existingValue)
-        {
-            return _ => setter((bool?)((UIChangeEventArgs)_).Value);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<int> setter, int existingValue)
-        {
-            return _ => setter(int.Parse((string)((UIChangeEventArgs)_).Value));
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<int?> setter, int? existingValue)
-        {
-            return _ => setter(int.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
-                ? tmpvalue
-                : (int?)null);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<long> setter, long existingValue)
-        {
-            return _ => setter(long.Parse((string)((UIChangeEventArgs)_).Value));
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<long?> setter, long? existingValue)
-        {
-            return _ => setter(long.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
-                ? tmpvalue
-                : (long?)null);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<float> setter, float existingValue)
-        {
-            return _ => setter(float.Parse((string)((UIChangeEventArgs)_).Value));
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<float?> setter, float? existingValue)
-        {
-            return _ => setter(float.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
-                ? tmpvalue
-                : (float?)null);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<double> setter, double existingValue)
-        {
-            return _ => setter(double.Parse((string)((UIChangeEventArgs)_).Value));
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<double?> setter, double? existingValue)
-        {
-            return _ => setter(double.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
-                ? tmpvalue
-                : (double?)null);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<decimal> setter, decimal existingValue)
-        {
-            return _ => setter(decimal.Parse((string)((UIChangeEventArgs)_).Value));
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<decimal?> setter, decimal? existingValue)
-        {
-            return _ => setter(decimal.TryParse((string)((UIChangeEventArgs)_).Value, out var tmpvalue)
-                ? tmpvalue
-                : (decimal?)null);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<DateTime> setter, DateTime existingValue)
-        {
-            return _ => SetDateTimeValue(setter, ((UIChangeEventArgs)_).Value, null);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler(Action<DateTime> setter, DateTime existingValue, string format)
-        {
-            return _ => SetDateTimeValue(setter, ((UIChangeEventArgs)_).Value, format);
-        }
-
-        /// <summary>
-        /// Not intended to be used directly.
-        /// </summary>
-        public static Action<UIEventArgs> SetValueHandler<T>(Action<T> setter, T existingValue)
-        {
-            if (!typeof(T).IsEnum)
-            {
-                throw new ArgumentException($"'bind' does not accept values of type {typeof(T).FullName}. To read and write this value type, wrap it in a property of type string with suitable getters and setters.");
-            }
-
-            return _ =>
-            {
-                var value = (string)((UIChangeEventArgs)_).Value;
-                var parsed = (T)Enum.Parse(typeof(T), value);
-                setter(parsed);
-            };
-        }
-
-        private static void SetDateTimeValue(Action<DateTime> setter, object objValue, string format)
-        {
-            var stringValue = (string)objValue;
-            var parsedValue = string.IsNullOrEmpty(stringValue) ? default
-                : format != null && DateTime.TryParseExact(stringValue, format, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var parsedExact) ? parsedExact
-                : DateTime.Parse(stringValue);
-            setter(parsedValue);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
deleted file mode 100644
index 4ec8e784fe..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ComponentBase.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.Threading.Tasks;
-using Microsoft.AspNetCore.Components.RenderTree;
-
-namespace Microsoft.AspNetCore.Components
-{
-    public abstract class ComponentBase : IComponent
-    {
-        protected virtual void BuildRenderTree(RenderTreeBuilder builder)
-        {
-        }
-
-        public virtual void SetParameters(ParameterCollection parameters)
-        {
-        }
-
-        void IComponent.Init(RenderHandle renderHandle)
-        {
-        }
-
-        protected virtual Task OnInitAsync() => Task.CompletedTask;
-
-        protected void WriteLiteral(string literal) { }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs
deleted file mode 100644
index 06d6c9d370..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ElementRef.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Represents a reference to a rendered element.
-    /// </summary>
-    public struct ElementRef
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs
deleted file mode 100644
index 52c4fe1aab..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallback.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    public readonly struct EventCallback
-    {
-        public static readonly EventCallbackFactory Factory = new EventCallbackFactory();
-
-        internal readonly MulticastDelegate Delegate;
-        internal readonly IHandleEvent Receiver;
-
-        public EventCallback(IHandleEvent receiver, MulticastDelegate @delegate)
-        {
-            Receiver = receiver;
-            Delegate = @delegate;
-        }
-    }
-
-    public readonly struct EventCallback<T>
-    {
-        internal readonly MulticastDelegate Delegate;
-        internal readonly IHandleEvent Receiver;
-
-        public EventCallback(IHandleEvent receiver, MulticastDelegate @delegate)
-        {
-            Receiver = receiver;
-            Delegate = @delegate;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
deleted file mode 100644
index 882490199c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactory.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Components
-{
-    public sealed class EventCallbackFactory
-    {
-        public EventCallback Create(object receiver, EventCallback callback) => default;
-
-        public EventCallback Create(object receiver, Action callback) => default;
-
-        public EventCallback Create(object receiver, Action<object> callback) => default;
-
-        public EventCallback Create(object receiver, Func<Task> callback) => default;
-
-        public EventCallback Create(object receiver, Func<object, Task> callback) => default;
-
-        public string Create<T>(object receiver, string callback) => default;
-
-        public EventCallback<T> Create<T>(object receiver, EventCallback<T> callback) => default;
-
-        public EventCallback<T> Create<T>(object receiver, Action callback) => default;
-
-        public EventCallback<T> Create<T>(object receiver, Action<T> callback) => default;
-
-        public EventCallback<T> Create<T>(object receiver, Func<Task> callback) => default;
-
-        public EventCallback<T> Create<T>(object receiver, Func<T, Task> callback) => default;
-
-        public EventCallback<T> CreateInferred<T>(object receiver, Action<T> callback, T value)
-        {
-            return Create(receiver, callback);
-        }
-
-        public EventCallback<T> CreateInferred<T>(object receiver, Func<T, Task> callback, T value)
-        {
-            return Create(receiver, callback);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs
deleted file mode 100644
index 8a920ff53c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryBinderExtensions.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    public static class EventCallbackFactoryBinderExtensions
-    {
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<string> setter,
-            string existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<bool> setter,
-            bool existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<bool?> setter,
-            bool? existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<int> setter,
-            int existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<int?> setter,
-            int? existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<long> setter,
-            long existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<long?> setter,
-            long? existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<float> setter,
-            float existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<float?> setter,
-            float? existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<double> setter,
-            double existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<double?> setter,
-            double? existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<decimal> setter,
-            decimal existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<decimal?> setter,
-            decimal? existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<DateTime> setter,
-            DateTime existingValue) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<DateTime> setter,
-            DateTime existingValue,
-            string format) => default;
-
-        public static EventCallback<UIChangeEventArgs> CreateBinder<T>(
-            this EventCallbackFactory factory,
-            object receiver,
-            Action<T> setter,
-            T existingValue) where T : Enum => default;
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs
deleted file mode 100644
index c81d09fd07..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventCallbackFactoryUIEventArgsExtensions.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Components
-{
-    public static class EventCallbackFactoryUIEventArgsExtensions
-    {
-        public static EventCallback<UIEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIEventArgs> callback) => default;
-
-        public static EventCallback<UIEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIChangeEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIChangeEventArgs> callback) => default;
-
-        public static EventCallback<UIChangeEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIChangeEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIClipboardEventArgs> callback) => default;
-
-        public static EventCallback<UIClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIClipboardEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIDragEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIDragEventArgs> callback) => default;
-
-        public static EventCallback<UIDragEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIDragEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIErrorEventArgs> callback) => default;
-
-        public static EventCallback<UIErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIErrorEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIFocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIFocusEventArgs> callback) => default;
-
-        public static EventCallback<UIFocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIFocusEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIKeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIKeyboardEventArgs> callback) => default;
-
-        public static EventCallback<UIKeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIKeyboardEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIMouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIMouseEventArgs> callback) => default;
-
-        public static EventCallback<UIMouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIMouseEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIPointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIPointerEventArgs> callback) => default;
-
-        public static EventCallback<UIPointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIPointerEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIProgressEventArgs> callback) => default;
-
-        public static EventCallback<UIProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIProgressEventArgs, Task> callback) => default;
-
-        public static EventCallback<UITouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UITouchEventArgs> callback) => default;
-
-        public static EventCallback<UITouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UITouchEventArgs, Task> callback) => default;
-
-        public static EventCallback<UIWheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIWheelEventArgs> callback) => default;
-
-        public static EventCallback<UIWheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIWheelEventArgs, Task> callback) => default;
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs
deleted file mode 100644
index 8397d4ac12..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Associates an event argument type with an event attribute name.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-    public sealed class EventHandlerAttribute : Attribute
-    {
-        /// <summary>
-        /// Constructs an instance of <see cref="EventHandlerAttribute"/>.
-        /// </summary>
-        /// <param name="attributeName"></param>
-        /// <param name="eventArgsType"></param>
-        public EventHandlerAttribute(string attributeName, Type eventArgsType)
-        {
-            if (attributeName == null)
-            {
-                throw new ArgumentNullException(nameof(attributeName));
-            }
-
-            if (eventArgsType == null)
-            {
-                throw new ArgumentNullException(nameof(eventArgsType));
-            }
-
-            AttributeName = attributeName;
-            EventArgsType = eventArgsType;
-        }
-
-        /// <summary>
-        /// Gets the attribute name.
-        /// </summary>
-        public string AttributeName { get; }
-
-        /// <summary>
-        /// Gets the event argument type.
-        /// </summary>
-        public Type EventArgsType { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs
deleted file mode 100644
index 6ae6031d9b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/EventHandlers.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Holds <see cref="EventHandler"/> attributes to configure the mappings between event names and
-    /// event argument types.
-    /// </summary>
-
-    // Focus events
-    [EventHandler("onfocus", typeof(UIFocusEventArgs))]
-    [EventHandler("onblur", typeof(UIFocusEventArgs))]
-    [EventHandler("onfocusin", typeof(UIFocusEventArgs))]
-    [EventHandler("onfocusout", typeof(UIFocusEventArgs))]
-
-    // Mouse events
-    [EventHandler("onmouseover", typeof(UIMouseEventArgs))]
-    [EventHandler("onmouseout", typeof(UIMouseEventArgs))]
-    [EventHandler("onmousemove", typeof(UIMouseEventArgs))]
-    [EventHandler("onmousedown", typeof(UIMouseEventArgs))]
-    [EventHandler("onmouseup", typeof(UIMouseEventArgs))]
-    [EventHandler("onclick", typeof(UIMouseEventArgs))]
-    [EventHandler("ondblclick", typeof(UIMouseEventArgs))]
-    [EventHandler("onwheel", typeof(UIWheelEventArgs))]
-    [EventHandler("onmousewheel", typeof(UIWheelEventArgs))]
-    [EventHandler("oncontextmenu", typeof(UIMouseEventArgs))]
-
-    // Drag events
-    [EventHandler("ondrag", typeof(UIDragEventArgs))]
-    [EventHandler("ondragend", typeof(UIDragEventArgs))]
-    [EventHandler("ondragenter", typeof(UIDragEventArgs))]
-    [EventHandler("ondragleave", typeof(UIDragEventArgs))]
-    [EventHandler("ondragover", typeof(UIDragEventArgs))]
-    [EventHandler("ondragstart", typeof(UIDragEventArgs))]
-    [EventHandler("ondrop", typeof(UIDragEventArgs))]
-
-    // Keyboard events
-    [EventHandler("onkeydown", typeof(UIKeyboardEventArgs))]
-    [EventHandler("onkeyup", typeof(UIKeyboardEventArgs))]
-    [EventHandler("onkeypress", typeof(UIKeyboardEventArgs))]
-
-    // Input events
-    [EventHandler("onchange", typeof(UIChangeEventArgs))]
-    [EventHandler("oninput", typeof(UIChangeEventArgs))]
-    [EventHandler("oninvalid", typeof(UIEventArgs))]
-    [EventHandler("onreset", typeof(UIEventArgs))]
-    [EventHandler("onselect", typeof(UIEventArgs))]
-    [EventHandler("onselectstart", typeof(UIEventArgs))]
-    [EventHandler("onselectionchange", typeof(UIEventArgs))]
-    [EventHandler("onsubmit", typeof(UIEventArgs))]
-
-    // Clipboard events
-    [EventHandler("onbeforecopy", typeof(UIEventArgs))]
-    [EventHandler("onbeforecut", typeof(UIEventArgs))]
-    [EventHandler("onbeforepaste", typeof(UIEventArgs))]
-    [EventHandler("oncopy", typeof(UIClipboardEventArgs))]
-    [EventHandler("oncut", typeof(UIClipboardEventArgs))]
-    [EventHandler("onpaste", typeof(UIClipboardEventArgs))]
-
-    // Touch events 
-    [EventHandler("ontouchcancel", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchend", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchmove", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchstart", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchenter", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchleave", typeof(UITouchEventArgs))]
-
-    // Pointer events
-    [EventHandler("gotpointercapture", typeof(UIPointerEventArgs))]
-    [EventHandler("lostpointercapture", typeof(UIPointerEventArgs))]
-    [EventHandler("pointercancel", typeof(UIPointerEventArgs))]
-    [EventHandler("pointerdown", typeof(UIPointerEventArgs))]
-    [EventHandler("pointerenter", typeof(UIPointerEventArgs))]
-    [EventHandler("pointerleave", typeof(UIPointerEventArgs))]
-    [EventHandler("pointermove", typeof(UIPointerEventArgs))]
-    [EventHandler("pointerout", typeof(UIPointerEventArgs))]
-    [EventHandler("pointerover", typeof(UIPointerEventArgs))]
-    [EventHandler("pointerup", typeof(UIPointerEventArgs))]
-
-    // Media events
-    [EventHandler("oncanplay", typeof(UIEventArgs))]
-    [EventHandler("oncanplaythrough", typeof(UIEventArgs))]
-    [EventHandler("oncuechange", typeof(UIEventArgs))]
-    [EventHandler("ondurationchange", typeof(UIEventArgs))]
-    [EventHandler("onemptied", typeof(UIEventArgs))]
-    [EventHandler("onpause", typeof(UIEventArgs))]
-    [EventHandler("onplay", typeof(UIEventArgs))]
-    [EventHandler("onplaying", typeof(UIEventArgs))]
-    [EventHandler("onratechange", typeof(UIEventArgs))]
-    [EventHandler("onseeked", typeof(UIEventArgs))]
-    [EventHandler("onseeking", typeof(UIEventArgs))]
-    [EventHandler("onstalled", typeof(UIEventArgs))]
-    [EventHandler("onstop", typeof(UIEventArgs))]
-    [EventHandler("onsuspend", typeof(UIEventArgs))]
-    [EventHandler("ontimeupdate", typeof(UIEventArgs))]
-    [EventHandler("onvolumechange", typeof(UIEventArgs))]
-    [EventHandler("onwaiting", typeof(UIEventArgs))]
-
-    // Progress events
-    [EventHandler("onloadstart", typeof(UIProgressEventArgs))]
-    [EventHandler("ontimeout", typeof(UIProgressEventArgs))]
-    [EventHandler("onabort", typeof(UIProgressEventArgs))]
-    [EventHandler("onload", typeof(UIProgressEventArgs))]
-    [EventHandler("onloadend", typeof(UIProgressEventArgs))]
-    [EventHandler("onprogress", typeof(UIProgressEventArgs))]
-    [EventHandler("onerror", typeof(UIErrorEventArgs))]
-
-    // General events
-    [EventHandler("onactivate", typeof(UIEventArgs))]
-    [EventHandler("onbeforeactivate", typeof(UIEventArgs))]
-    [EventHandler("onbeforedeactivate", typeof(UIEventArgs))]
-    [EventHandler("ondeactivate", typeof(UIEventArgs))]
-    [EventHandler("onended", typeof(UIEventArgs))]
-    [EventHandler("onfullscreenchange", typeof(UIEventArgs))]
-    [EventHandler("onfullscreenerror", typeof(UIEventArgs))]
-    [EventHandler("onloadeddata", typeof(UIEventArgs))]
-    [EventHandler("onloadedmetadata", typeof(UIEventArgs))]
-    [EventHandler("onpointerlockchange", typeof(UIEventArgs))]
-    [EventHandler("onpointerlockerror", typeof(UIEventArgs))]
-    [EventHandler("onreadystatechange", typeof(UIEventArgs))]
-    [EventHandler("onscroll", typeof(UIEventArgs))]
-    public static class EventHandlers
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs
deleted file mode 100644
index 0f909c5d71..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    public interface IComponent
-    {
-        void Init(RenderHandle renderHandle);
-
-
-        void SetParameters(ParameterCollection parameters);
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs
deleted file mode 100644
index b5ba9a87c8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/IHandleEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    public interface IHandleEvent
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs
deleted file mode 100644
index 3490c456ce..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/InjectAttribute.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Indicates that the associated property should have a value injected from the
-    /// service provider during initialization.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
-    public class InjectAttribute : Attribute
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs
deleted file mode 100644
index 63f6d64e4a..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components.Layouts
-{
-    /// <summary>
-    /// Indicates that the associated component type uses a specified layout.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-    public class LayoutAttribute : Attribute
-    {
-        public LayoutAttribute(Type layoutType)
-        {
-            LayoutType = layoutType ?? throw new ArgumentNullException(nameof(layoutType));
-        }
-
-        public Type LayoutType { get; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs
deleted file mode 100644
index 16ec54fd3b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/MarkupString.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// A string value that can be rendered as markup such as HTML.
-    /// </summary>
-    public struct MarkupString
-    {
-        /// <summary>
-        /// Constructs an instance of <see cref="MarkupString"/>.
-        /// </summary>
-        /// <param name="value">The value for the new instance.</param>
-        public MarkupString(string value)
-        {
-            Value = value;
-        }
-
-        /// <summary>
-        /// Gets the value of the <see cref="MarkupString"/>.
-        /// </summary>
-        public string Value { get; }
-
-        /// <summary>
-        /// Casts a <see cref="string"/> to a <see cref="MarkupString"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="string"/> value.</param>
-        public static explicit operator MarkupString(string value)
-            => new MarkupString(value);
-
-        /// <inheritdoc />
-        public override string ToString()
-            => Value ?? string.Empty;
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs
deleted file mode 100644
index 5351c619fb..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterAttribute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Denotes the target member as a component parameter.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-    public sealed class ParameterAttribute : Attribute
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs
deleted file mode 100644
index f055fa6e9b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/ParameterCollection.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Represents a collection of parameters supplied to an <see cref="IComponent"/>
-    /// by its parent in the render tree.
-    /// </summary>
-    public struct ParameterCollection
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderFrame.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderFrame.cs
deleted file mode 100644
index 01c9e70b1a..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderFrame.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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 Microsoft.AspNetCore.Components.RenderTree;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Represents a segment of UI content, implemented as a delegate that
-    /// writes the content to a <see cref="RenderTreeBuilder"/>.
-    /// </summary>
-    /// <param name="builder">The <see cref="RenderTreeBuilder"/> to which the content should be written.</param>
-    public delegate void RenderFragment(RenderTreeBuilder builder);
-
-    /// <summary>
-    /// Represents a segment of UI content for an object of type <typeparamref name="T"/>, implemented as
-    /// a function that returns a <see cref="RenderFragment"/>.
-    /// </summary>
-    /// <typeparam name="T">The type of object.</typeparam>
-    /// <param name="value">The value used to build the content.</param>
-    public delegate RenderFragment RenderFragment<T>(T value);
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs
deleted file mode 100644
index b0034b801f..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderHandle.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Allows a component to notify the renderer that it should be rendered.
-    /// </summary>
-    public struct RenderHandle
-    {
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
deleted file mode 100644
index 98d8a0bdb4..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Components.RenderTree
-{
-    /// <summary>
-    /// Provides methods for building a collection of <see cref="RenderTreeFrame"/> entries.
-    /// </summary>
-    public class RenderTreeBuilder
-    {
-        public void OpenElement(int sequence, string elementName)
-        {
-        }
-
-        public void CloseElement()
-        {
-        }
-
-        public void AddMarkupContent(int sequence, string markupContent)
-        {
-        }
-
-        public void AddContent(int sequence, string textContent)
-        {
-        }
-
-        public void AddContent(int sequence, RenderFragment fragment)
-        {
-        }
-
-        public void AddContent<T>(int sequence, RenderFragment<T> fragment, T value)
-        {
-        }
-
-        public void AddContent(int sequence, MarkupString markupContent)
-        {
-        }
-
-        public void AddContent(int sequence, object textContent)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, bool value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, string value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, Action value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, Action<UIEventArgs> value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, Func<Task> value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, Func<UIEventArgs, Task> value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, MulticastDelegate value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, EventCallback value)
-        {
-        }
-
-        public void AddAttribute<T>(int sequence, string name, EventCallback<T> value)
-        {
-        }
-
-        public void AddAttribute(int sequence, string name, object value)
-        {
-        }
-
-        public void AddMultipleAttributes(int sequence, IEnumerable<KeyValuePair<string, object>> attributes)
-        {
-        }
-
-        public void OpenComponent<TComponent>(int sequence) where TComponent : IComponent
-        {
-        }
-
-        public void OpenComponent(int sequence, Type componentType)
-        {
-        }
-
-        public void CloseComponent()
-        {
-        }
-        
-        public void AddElementReferenceCapture(int sequence, Action<ElementRef> elementReferenceCaptureAction)
-        {
-        }
-
-        public void AddComponentReferenceCapture(int sequence, Action<object> componentReferenceCaptureAction)
-        {
-        }
-
-        public void SetKey(object key)
-        {
-        }
-
-        public void SetUpdatesAttributeName(string updatesAttributeName)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs
deleted file mode 100644
index e8c4880072..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RouteAttribute.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Indicates that the associated component should match the specified route template pattern.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-    public class RouteAttribute : Attribute
-    {
-        /// <summary>
-        /// Constructs an instance of <see cref="RouteAttribute"/>.
-        /// </summary>
-        /// <param name="template">The route template.</param>
-        public RouteAttribute(string template)
-        {
-            if (template == null)
-            {
-                throw new ArgumentNullException(nameof(template));
-            }
-
-            Template = template;
-        }
-
-        /// <summary>
-        /// Gets the route template.
-        /// </summary>
-        public string Template { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs
deleted file mode 100644
index 84ab120f01..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/RuntimeHelpers.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Used by generated code produced by the code generator. Not intended or supported
-    /// for use in application code.
-    /// </summary>
-    public static class RuntimeHelpers
-    {
-        /// <summary>
-        /// Not intended for use by application code.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static T TypeCheck<T>(T value) => value;
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs
deleted file mode 100644
index 953300d8a9..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgs.cs
+++ /dev/null
@@ -1,518 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Supplies information about an event that is being raised.
-    /// </summary>
-    public class UIEventArgs
-    {
-        /// <summary>
-        /// Gets or sets the type of the event.
-        /// </summary>
-        public string Type { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about an input change event that is being raised.
-    /// </summary>
-    public class UIChangeEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// Gets or sets the new value of the input. This may be a <see cref="string"/>
-        /// or a <see cref="bool"/>.
-        /// </summary>
-        public object Value { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about an clipboard event that is being raised.
-    /// </summary>
-    public class UIClipboardEventArgs : UIEventArgs
-    {
-    }
-
-    /// <summary>
-    /// Supplies information about an drag event that is being raised.
-    /// </summary>
-    public class UIDragEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
-        /// </summary>
-        public long Detail { get; set; }
-
-        /// <summary>
-        /// The data that underlies a drag-and-drop operation, known as the drag data store.
-        /// See <see cref="DataTransfer"/>.
-        /// </summary>
-        public DataTransfer DataTransfer { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the mouse pointer in global (screen) coordinates.
-        /// </summary>
-        public long ScreenX { get; set; }
-
-        /// <summary>
-        /// The Y coordinate of the mouse pointer in global (screen) coordinates.
-        /// </summary>
-        public long ScreenY { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the mouse pointer in local (DOM content) coordinates.
-        /// </summary>
-        public long ClientX { get; set; }
-
-        /// <summary>
-        /// 	The Y coordinate of the mouse pointer in local (DOM content) coordinates.
-        /// </summary>
-        public long ClientY { get; set; }
-
-        /// <summary>
-        /// The button number that was pressed when the mouse event was fired:
-        /// Left button=0,
-        /// middle button=1 (if present),
-        /// right button=2.
-        /// For mice configured for left handed use in which the button actions are reversed the values are instead read from right to left.
-        /// </summary>
-        public long Button { get; set; }
-
-        /// <summary>
-        /// The buttons being pressed when the mouse event was fired:
-        /// Left button=1,
-        /// Right button=2,
-        /// Middle (wheel) button=4,
-        /// 4th button (typically, "Browser Back" button)=8,
-        /// 5th button (typically, "Browser Forward" button)=16.
-        /// If two or more buttons are pressed, returns the logical sum of the values.
-        /// E.g., if Left button and Right button are pressed, returns 3 (=1 | 2).
-        /// </summary>
-        public long Buttons { get; set; }
-
-        /// <summary>
-        /// true if the control key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool CtrlKey { get; set; }
-
-        /// <summary>
-        /// true if the shift key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool ShiftKey { get; set; }
-
-        /// <summary>
-        /// true if the alt key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool AltKey { get; set; }
-
-        /// <summary>
-        /// true if the meta key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool MetaKey { get; set; }
-    }
-
-    /// <summary>
-    /// The <see cref="DataTransfer"/> object is used to hold the data that is being dragged during a drag and drop operation.
-    /// It may hold one or more <see cref="UIDataTransferItem"/>, each of one or more data types.
-    /// For more information about drag and drop, see HTML Drag and Drop API.
-    /// </summary>
-    public class DataTransfer
-    {
-        /// <summary>
-        /// Gets the type of drag-and-drop operation currently selected or sets the operation to a new type.
-        /// The value must be none, copy, link or move.
-        /// </summary>
-        public string DropEffect { get; set; }
-
-        /// <summary>
-        /// Provides all of the types of operations that are possible.
-        /// Must be one of none, copy, copyLink, copyMove, link, linkMove, move, all or uninitialized.
-        /// </summary>
-        public string EffectAllowed { get; set; }
-
-        /// <summary>
-        /// Contains a list of all the local files available on the data transfer.
-        /// If the drag operation doesn't involve dragging files, this property is an empty list.
-        /// </summary>
-        public string[] Files { get; set; }
-
-        /// <summary>
-        /// Gives a <see cref="UIDataTransferItem"/> array which is a list of all of the drag data.
-        /// </summary>
-        public UIDataTransferItem[] Items { get; set; }
-
-        /// <summary>
-        /// An array of <see cref="string"/> giving the formats that were set in the dragstart event.
-        /// </summary>
-        public string[] Types { get; set; }
-    }
-
-    /// <summary>
-    /// The <see cref="UIDataTransferItem"/> object represents one drag data item.
-    /// During a drag operation, each drag event has a dataTransfer property which contains a list of drag data items.
-    /// Each item in the list is a <see cref="UIDataTransferItem"/> object.
-    /// </summary>
-    public class UIDataTransferItem
-    {
-        /// <summary>
-        /// The kind of drag data item, string or file
-        /// </summary>
-        public string Kind { get; set; }
-
-        /// <summary>
-        /// The drag data item's type, typically a MIME type
-        /// </summary>
-        public string Type { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about an error event that is being raised.
-    /// </summary>
-    public class UIErrorEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// Gets a a human-readable error message describing the problem.
-        /// </summary>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets the name of the script file in which the error occurred.
-        /// </summary>
-        public string Filename { get; set; }
-
-        /// <summary>
-        /// Gets the line number of the script file on which the error occurred.
-        /// </summary>
-        public int Lineno { get; set; }
-
-        /// <summary>
-        /// Gets the column number of the script file on which the error occurred.
-        /// </summary>
-        public int Colno { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about a focus event that is being raised.
-    /// </summary>
-    public class UIFocusEventArgs : UIEventArgs
-    {
-        // Not including support for 'relatedTarget' since we don't have a good way to represent it.
-        // see: https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent
-    }
-
-    /// <summary>
-    /// Supplies information about a keyboard event that is being raised.
-    /// </summary>
-    public class UIKeyboardEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// The key value of the key represented by the event. 
-        /// If the value has a printed representation, this attribute's value is the same as the char attribute. 
-        /// Otherwise, it's one of the key value strings specified in 'Key values'. 
-        /// If the key can't be identified, this is the string "Unidentified"
-        /// </summary>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// Holds a string that identifies the physical key being pressed. 
-        /// The value is not affected by the current keyboard layout or modifier state, so a particular key will always return the same value.
-        /// </summary>
-        public string Code { get; set; }
-
-        /// <summary>
-        /// The location of the key on the device.
-        /// </summary>
-        public float Location { get; set; }
-
-        /// <summary>
-        /// true if a key has been depressed long enough to trigger key repetition, otherwise false.
-        /// </summary>
-        public bool Repeat { get; set; }
-
-        /// <summary>
-        /// true if the control key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool CtrlKey { get; set; }
-
-        /// <summary>
-        /// true if the shift key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool ShiftKey { get; set; }
-
-        /// <summary>
-        /// true if the alt key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool AltKey { get; set; }
-
-        /// <summary>
-        /// true if the meta key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool MetaKey { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about a mouse event that is being raised.
-    /// </summary>
-    public class UIMouseEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
-        /// </summary>
-        public long Detail { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the mouse pointer in global (screen) coordinates.
-        /// </summary>
-        public long ScreenX { get; set; }
-
-        /// <summary>
-        /// The Y coordinate of the mouse pointer in global (screen) coordinates.
-        /// </summary>
-        public long ScreenY { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the mouse pointer in local (DOM content) coordinates.
-        /// </summary>
-        public long ClientX { get; set; }
-
-        /// <summary>
-        /// 	The Y coordinate of the mouse pointer in local (DOM content) coordinates.
-        /// </summary>
-        public long ClientY { get; set; }
-
-        /// <summary>
-        /// The button number that was pressed when the mouse event was fired:
-        /// Left button=0,
-        /// middle button=1 (if present),
-        /// right button=2.
-        /// For mice configured for left handed use in which the button actions are reversed the values are instead read from right to left.
-        /// </summary>
-        public long Button { get; set; }
-
-        /// <summary>
-        /// The buttons being pressed when the mouse event was fired:
-        /// Left button=1,
-        /// Right button=2,
-        /// Middle (wheel) button=4,
-        /// 4th button (typically, "Browser Back" button)=8,
-        /// 5th button (typically, "Browser Forward" button)=16.
-        /// If two or more buttons are pressed, returns the logical sum of the values.
-        /// E.g., if Left button and Right button are pressed, returns 3 (=1 | 2).
-        /// </summary>
-        public long Buttons { get; set; }
-
-        /// <summary>
-        /// true if the control key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool CtrlKey { get; set; }
-
-        /// <summary>
-        /// true if the shift key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool ShiftKey { get; set; }
-
-        /// <summary>
-        /// true if the alt key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool AltKey { get; set; }
-
-        /// <summary>
-        /// true if the meta key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool MetaKey { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about a mouse event that is being raised.
-    /// </summary>
-    public class UIPointerEventArgs : UIMouseEventArgs
-    {
-        /// <summary>
-        /// A unique identifier for the pointer causing the event.
-        /// </summary>
-        public string PointerId { get; set; }
-
-        /// <summary>
-        /// The width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer.
-        /// </summary>
-        public float Width { get; set; }
-
-        /// <summary>
-        /// The height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
-        /// </summary>
-        public float Height { get; set; }
-
-        /// <summary>
-        /// The normalized pressure of the pointer input in the range of 0 to 1,
-        /// where 0 and 1 represent the minimum and maximum pressure the hardware is capable of detecting, respectively.
-        /// </summary>
-        public float Pressure { get; set; }
-
-        /// <summary>
-        /// The plane angle (in degrees, in the range of -90 to 90) between the Y-Z plane
-        /// and the plane containing both the transducer (e.g. pen stylus) axis and the Y axis.
-        /// </summary>
-        public float TiltX { get; set; }
-
-        /// <summary>
-        /// The plane angle (in degrees, in the range of -90 to 90) between the X-Z plane
-        /// and the plane containing both the transducer (e.g. pen stylus) axis and the X axis.
-        /// </summary>
-        public float TiltY { get; set; }
-
-        /// <summary>
-        /// Indicates the device type that caused the event.
-        /// Must be one of the strings mouse, pen or touch, or an empty string.
-        /// </summary>
-        public string PointerType { get; set; }
-
-        /// <summary>
-        /// Indicates if the pointer represents the primary pointer of this pointer type.
-        /// </summary>
-        public bool IsPrimary { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about a progress event that is being raised.
-    /// </summary>
-    public class UIProgressEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// Whether or not the total size of the transfer is known.
-        /// </summary>
-        public bool LengthComputable { get; set; }
-
-        /// <summary>
-        /// The number of bytes transferred since the beginning of the operation.
-        /// This doesn't include headers and other overhead, but only the content itself.
-        /// </summary>
-        public long Loaded { get; set; }
-
-        /// <summary>
-        /// The total number of bytes of content that will be transferred during the operation.
-        /// If the total size is unknown, this value is zero. 
-        /// </summary>
-        public long Total { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about a touch event that is being raised.
-    /// </summary>
-    public class UITouchEventArgs : UIEventArgs
-    {
-        /// <summary>
-        /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
-        /// </summary>
-        public long Detail { get; set; }
-
-        /// <summary>
-        /// A list of <see cref="UITouchPoint"/> for every point of contact currently touching the surface.
-        /// </summary>
-        public UITouchPoint[] Touches { get; set; }
-
-        /// <summary>
-        /// A list of <see cref="UITouchPoint"/> for every point of contact that is touching the surface and started on the element that is the target of the current event.
-        /// </summary>
-        public UITouchPoint[] TargetTouches { get; set; }
-
-        /// <summary>
-        /// A list of Touches for every point of contact which contributed to the event.
-        /// For the touchstart event this must be a list of the touch points that just became active with the current event.
-        /// For the touchmove event this must be a list of the touch points that have moved since the last event.
-        /// For the touchend and touchcancel events this must be a list of the touch points that have just been removed from the surface.
-        /// </summary>
-        public UITouchPoint[] ChangedTouches { get; set; }
-
-        /// <summary>
-        /// true if the control key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool CtrlKey { get; set; }
-
-        /// <summary>
-        /// true if the shift key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool ShiftKey { get; set; }
-
-        /// <summary>
-        /// true if the alt key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool AltKey { get; set; }
-
-        /// <summary>
-        /// true if the meta key was down when the event was fired. false otherwise.
-        /// </summary>
-        public bool MetaKey { get; set; }
-    }
-
-    /// <summary>
-    /// Represents a single contact point on a touch-sensitive device.
-    /// The contact point is commonly a finger or stylus and the device may be a touchscreen or trackpad.
-    /// </summary>
-    public class UITouchPoint
-    {
-        /// <summary>
-        /// A unique identifier for this Touch object.
-        /// A given touch point (say, by a finger) will have the same identifier for the duration of its movement around the surface.
-        /// This lets you ensure that you're tracking the same touch all the time.
-        /// </summary>
-        public long Identifier { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the touch point relative to the left edge of the screen.
-        /// </summary>
-        public long ScreenX { get; set; }
-
-        /// <summary>
-        /// The Y coordinate of the touch point relative to the top edge of the screen.
-        /// </summary>
-        public long ScreenY { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the touch point relative to the left edge of the browser viewport, not including any scroll offset.
-        /// </summary>
-        public long ClientX { get; set; }
-
-        /// <summary>
-        /// The Y coordinate of the touch point relative to the top edge of the browser viewport, not including any scroll offset.
-        /// </summary>
-        public long ClientY { get; set; }
-
-        /// <summary>
-        /// The X coordinate of the touch point relative to the left edge of the document.
-        /// Unlike <see cref="ClientX"/>, this value includes the horizontal scroll offset, if any.
-        /// </summary>
-        public long PageX { get; set; }
-
-        /// <summary>
-        /// The Y coordinate of the touch point relative to the top of the document.
-        /// Unlike <see cref="ClientY"/>, this value includes the vertical scroll offset, if any.
-        /// </summary>
-        public long PageY { get; set; }
-    }
-
-    /// <summary>
-    /// Supplies information about a mouse wheel event that is being raised.
-    /// </summary>
-    public class UIWheelEventArgs : UIMouseEventArgs
-    {
-        /// <summary>
-        /// The horizontal scroll amount.
-        /// </summary>
-        public double DeltaX { get; set; }
-
-        /// <summary>
-        /// The vertical scroll amount.
-        /// </summary>
-        public double DeltaY { get; set; }
-
-        /// <summary>
-        /// The scroll amount for the z-axis.
-        /// </summary>
-        public double DeltaZ { get; set; }
-
-        /// <summary>
-        /// The unit of the delta values scroll amount. 
-        /// </summary>
-        public long DeltaMode { get; set; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs
deleted file mode 100644
index bc32af071d..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs
+++ /dev/null
@@ -1,547 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.RenderTree;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Extensions methods on <see cref="RenderTreeBuilder"/> for event handlers.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// These methods enable method-group to delegate conversion for delegates and methods that accept
-    /// types derived from <see cref="UIEventArgs"/>.
-    /// </para>
-    /// <para>
-    /// This enhances the programming experience for using event handlers with the render tree builder
-    /// in components written in pure C#. These extension methods make it possible to write code like:
-    /// <code>
-    /// builder.AddAttribute(0, "onkeypress", MyKeyPressHandler);
-    /// </code>
-    /// Where <c>void MyKeyPressHandler(UIKeyboardEventArgs e)</c> is a method defined in the same class.
-    /// In this example, the author knows that the <c>onclick</c> event is associated with the
-    /// <see cref="UIKeyboardEventArgs"/> event args type. The component author is responsible for 
-    /// providing a delegate that matches the expected event args type, an error will result in a failure
-    /// at runtime.
-    /// </para>
-    /// <para>
-    /// When a component is authored in Razor (.cshtml), the Razor code generator will maintain a mapping
-    /// between event names and event arg types that can be used to generate more strongly typed code.
-    /// Generated code for the same case will look like:
-    /// <code>
-    /// builder.AddAttribute(0, "onkeypress", BindMethods.GetEventHandlerValue&lt;UIKeyboardEventArgs&gt;(MyKeyPressHandler));
-    /// </code>
-    /// </para>
-    /// </remarks>
-    public static class UIEventArgsRenderTreeBuilderExtensions
-    {
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIChangeEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIChangeEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIChangeEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIChangeEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIDragEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIDragEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIDragEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIDragEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIClipboardEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIClipboardEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIClipboardEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIClipboardEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIErrorEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIErrorEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIErrorEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIErrorEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIFocusEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIFocusEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIFocusEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIFocusEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIKeyboardEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIKeyboardEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIKeyboardEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIKeyboardEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIMouseEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIMouseEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIMouseEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIMouseEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIPointerEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIPointerEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIPointerEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIPointerEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIProgressEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIProgressEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIProgressEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIProgressEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UITouchEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UITouchEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UITouchEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UITouchEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Action{UIWheelEventArgs}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Action<UIWheelEventArgs> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-
-        /// <summary>
-        /// <para>
-        /// Appends a frame representing an <see cref="Func{UIWheelEventArgs, Task}"/>-valued attribute.
-        /// </para>
-        /// <para>
-        /// The attribute is associated with the most recently added element. If the value is <c>null</c> and the
-        /// current element is not a component, the frame will be omitted.
-        /// </para>
-        /// </summary>
-        /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
-        /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        public static void AddAttribute(this RenderTreeBuilder builder, int sequence, string name, Func<UIWheelEventArgs, Task> value)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddAttribute(sequence, name, (MulticastDelegate)value);
-        }
-    }
-}
\ No newline at end of file

From 3c84c57c61f46a527a526c7a118fbc2f44cd3ab8 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 30 Jun 2019 14:15:47 -0700
Subject: [PATCH 191/337] Add the ability to specify invariant and format

Adds the ability to specify that an `<input type="..." />` for some
specific value of `type` maps to the invariant culture and/or provides
a default format.

The primary examples of usage would be the number field which wants to
use invariant culture, or datetime which wants to use invariant culture
and a format string.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/60f2d563a681beb70eb0ffb9dae8c3bfc247c002
---
 .../src/Components/ComponentMetadata.cs       |  4 ++
 .../TagHelperDescriptorExtensions.cs          | 38 +++++++++++++++++
 .../src/BindTagHelperDescriptorProvider.cs    | 29 ++++++++++++-
 .../BindTagHelperDescriptorProviderTest.cs    | 42 +++++++++++++++++++
 ...ft.AspNetCore.Components.netstandard2.0.cs |  3 ++
 5 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index 4c6db3048e..fdf26952a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -59,6 +59,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public readonly static string ChangeAttribute = "Components.Bind.ChangeAttribute";
 
             public readonly static string ExpressionAttribute = "Components.Bind.ExpressionAttribute";
+
+            public readonly static string IsInvariantCulture = "Components.Bind.IsInvariantCulture";
+
+            public readonly static string Format = "Components.Bind.Format";
         }
 
         public static class ChildContent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
index 6ea32c7171..2a732e612c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/TagHelperDescriptorExtensions.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
 {
@@ -115,6 +116,43 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return result;
         }
 
+        /// <summary>
+        /// Gets a value that indicates where the tag helper is a bind tag helper with a default
+        /// culture value of <see cref="CultureInfo.InvariantCulture"/>.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/>.</param>
+        /// <returns>
+        /// <c>true</c> if this tag helper is a bind tag helper and defaults in <see cref="CultureInfo.InvariantCulture"/>
+        /// </returns>
+        public static bool IsInvariantCultureBindTagHelper(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return
+                tagHelper.Metadata.TryGetValue(ComponentMetadata.Bind.IsInvariantCulture, out var text) &&
+                bool.TryParse(text, out var result) &&
+                result;
+        }
+
+        /// <summary>
+        /// Gets the default format value for a bind tag helper.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/>.</param>
+        /// <returns>The format, or <c>null</c>.</returns>
+        public static string GetFormat(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(ComponentMetadata.Bind.Format, out var result);
+            return result;
+        }
+
         public static bool IsChildContentTagHelper(this TagHelperDescriptor tagHelper)
         {
             if (tagHelper == null)
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 6a9d72377b..8ad405c6b5 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -72,6 +72,12 @@ namespace Microsoft.CodeAnalysis.Razor
             //      These mappings are also provided by attributes. Primarily these are used by <input />
             //      and so we have a special case for input elements and their type attributes.
             //
+            //      Additionally, our mappings tell us about cases like <input type="number" ... /> where
+            //      we need to treat the value as an invariant culture value. In general the HTML5 field
+            //      types use invariant culture values when interacting with the DOM, in contrast to
+            //      <input type="text" ... /> which is free-form text and is most likely to be
+            //      culture-sensitive.
+            //
             //  4.  For components, we have a bit of a special case. We can infer a syntax that matches
             //      case #2 based on property names. So if a component provides both 'Value' and 'ValueChanged'
             //      we will turn that into an instance of bind.
@@ -254,6 +260,19 @@ namespace Microsoft.CodeAnalysis.Razor
                             (string)attribute.ConstructorArguments[2].Value,
                             (string)attribute.ConstructorArguments[3].Value));
                     }
+                    else if (attribute.AttributeClass == bindInputElement && attribute.ConstructorArguments.Length == 6)
+                    {
+                        results.Add(new ElementBindData(
+                            type.ContainingAssembly.Name,
+                            type.ToDisplayString(),
+                            "input",
+                            (string)attribute.ConstructorArguments[0].Value,
+                            (string)attribute.ConstructorArguments[1].Value,
+                            (string)attribute.ConstructorArguments[2].Value,
+                            (string)attribute.ConstructorArguments[3].Value,
+                            (bool)attribute.ConstructorArguments[4].Value,
+                            (string)attribute.ConstructorArguments[5].Value));
+                    }
                 }
             }
 
@@ -287,6 +306,8 @@ namespace Microsoft.CodeAnalysis.Razor
                 builder.Metadata[TagHelperMetadata.Runtime.Name] = ComponentMetadata.Bind.RuntimeName;
                 builder.Metadata[ComponentMetadata.Bind.ValueAttribute] = entry.ValueAttribute;
                 builder.Metadata[ComponentMetadata.Bind.ChangeAttribute] = entry.ChangeAttribute;
+                builder.Metadata[ComponentMetadata.Bind.IsInvariantCulture] = entry.IsInvariantCulture ? bool.TrueString : bool.FalseString;
+                builder.Metadata[ComponentMetadata.Bind.Format] = entry.Format;
 
                 if (entry.TypeAttribute != null)
                 {
@@ -512,7 +533,9 @@ namespace Microsoft.CodeAnalysis.Razor
                 string typeAttribute,
                 string suffix,
                 string valueAttribute,
-                string changeAttribute)
+                string changeAttribute,
+                bool isInvariantCulture = false,
+                string format = null)
             {
                 Assembly = assembly;
                 TypeName = typeName;
@@ -521,6 +544,8 @@ namespace Microsoft.CodeAnalysis.Razor
                 Suffix = suffix;
                 ValueAttribute = valueAttribute;
                 ChangeAttribute = changeAttribute;
+                IsInvariantCulture = isInvariantCulture;
+                Format = format;
             }
 
             public string Assembly { get; }
@@ -530,6 +555,8 @@ namespace Microsoft.CodeAnalysis.Razor
             public string Suffix { get; }
             public string ValueAttribute { get; }
             public string ChangeAttribute { get; }
+            public bool IsInvariantCulture { get; }
+            public string Format { get; }
         }
 
         private class BindElementDataVisitor : SymbolVisitor
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 328808dd40..e037ab2fd1 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -649,6 +649,8 @@ namespace Test
             Assert.Equal("checkbox", bind.Metadata[ComponentMetadata.Bind.TypeAttribute]);
             Assert.True(bind.IsInputElementBindTagHelper());
             Assert.False(bind.IsInputElementFallbackBindTagHelper());
+            Assert.False(bind.IsInvariantCultureBindTagHelper());
+            Assert.Null(bind.GetFormat());
 
             var rule = Assert.Single(bind.TagMatchingRules);
             Assert.Equal("input", rule.TagName);
@@ -681,6 +683,46 @@ namespace Test
             Assert.Equal(":format", parameter.DisplayName);
         }
 
+        [Fact]
+        public void Execute_BindOnInputElementWithTypeAttributeAndSuffixAndInvariantCultureAndFormat_CreatesDescriptor()
+        {
+            // Arrange
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""number"", null, ""value"", ""onchange"", isInvariantCulture: true, format: ""0.00"")]
+    public class BindAttributes
+    {
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new BindTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var matches = GetBindTagHelpers(context);
+            matches = AssertAndExcludeFullyQualifiedNameMatchComponents(matches, expectedCount: 0);
+            var bind = Assert.Single(matches);
+
+            Assert.Equal("value", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
+            Assert.Equal("onchange", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
+            Assert.Equal("number", bind.Metadata[ComponentMetadata.Bind.TypeAttribute]);
+            Assert.True(bind.IsInputElementBindTagHelper());
+            Assert.False(bind.IsInputElementFallbackBindTagHelper());
+            Assert.True(bind.IsInvariantCultureBindTagHelper());
+            Assert.Equal("0.00", bind.GetFormat());
+        }
+
         [Fact]
         public void Execute_BindFallback_CreatesDescriptor()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 92b9f1f55d..caa5697b2b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -38,10 +38,13 @@ namespace Microsoft.AspNetCore.Components
     public sealed partial class BindInputElementAttribute : System.Attribute
     {
         public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute) { }
+        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute, bool isInvariantCulture, string format) { }
         public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public bool IsInvariantCulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Format { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     public static partial class BindMethods
     {

From 66cb243807014c4bd77a68c8402b55a3e3ae5600 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 30 Jun 2019 15:14:17 -0700
Subject: [PATCH 192/337] Add codegen for default format \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/e5be8d46732adc6f3059d123912b3d1955b377a8

---
 .../Components/ComponentBindLoweringPass.cs   | 11 +++-
 .../ComponentCodeGenerationTestBase.cs        | 60 ++++++++++++++++++-
 .../TestComponent.codegen.cs                  | 45 ++++++++++++++
 .../TestComponent.ir.txt                      | 34 +++++++++++
 .../TestComponent.mappings.txt                | 14 +++++
 .../TestComponent.codegen.cs                  | 45 ++++++++++++++
 .../TestComponent.ir.txt                      | 34 +++++++++++
 .../TestComponent.mappings.txt                | 14 +++++
 .../TestComponent.codegen.cs                  | 42 +++++++++++++
 .../TestComponent.ir.txt                      | 25 ++++++++
 .../TestComponent.mappings.txt                |  9 +++
 .../TestComponent.codegen.cs                  | 42 +++++++++++++
 .../TestComponent.ir.txt                      | 25 ++++++++
 .../TestComponent.mappings.txt                |  9 +++
 14 files changed, 407 insertions(+), 2 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index f7b56c84b6..d56d87209e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -290,13 +290,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return new[] { node };
             }
 
-            // Look for a matching format node. If we find one then we need to pass the format into the
+            // Look for a format. If we find one then we need to pass the format into the
             // two nodes we generate.
             IntermediateToken format = null;
             if (bindEntry.BindFormatNode != null)
             {
                 format = GetAttributeContent(bindEntry.BindFormatNode);
             }
+            else if (node.TagHelper?.GetFormat() != null)
+            {
+                // We may have a default format if one is associated with the field type.
+                format = new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = "\"" + node.TagHelper.GetFormat() + "\"",
+                };
+            }
 
             if (TryGetFormatNode(
                 parent,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 69874ce9c5..8365be7a63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         internal override bool UseTwoPhaseCompilation => true;
 
         protected ComponentCodeGenerationTestBase()
-            : base(generateBaselines: null)
+            : base(generateBaselines: false)
         {
         }
 
@@ -1162,6 +1162,64 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BuiltIn_BindToInputWithDefaultFormat()
+        { 
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""custom"", null, ""value"", ""onchange"", isInvariantCulture: false, format: ""MM/dd"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""custom"" @bind=""@CurrentDate"" />
+@code {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BuiltIn_BindToInputWithDefaultFormat_Override()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""custom"", null, ""value"", ""onchange"", isInvariantCulture: false, format: ""MM/dd"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""custom"" @bind=""@CurrentDate"" @bind:format=""MM/dd/yyyy""/>
+@code {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Child Content
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
new file mode 100644
index 0000000000..8690bcc8a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
new file mode 100644
index 0000000000..1085bec8ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
new file mode 100644
index 0000000000..861fb34670
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (945:25,29 [11] )
+|CurrentDate|
+
+Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1308:36,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
new file mode 100644
index 0000000000..18d2c291e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd/yyyy");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
new file mode 100644
index 0000000000..5c29e17fe7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
new file mode 100644
index 0000000000..356abede57
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (945:25,29 [11] )
+|CurrentDate|
+
+Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1318:36,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
new file mode 100644
index 0000000000..723601591b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "custom");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
new file mode 100644
index 0000000000..199522aa35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+            CSharpCode - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
new file mode 100644
index 0000000000..1d58848f84
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1293:33,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a1f0888016
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "custom");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , "MM/dd/yyyy"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
new file mode 100644
index 0000000000..202cfe56df
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+            CSharpCode - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
new file mode 100644
index 0000000000..dd10b89979
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1303:33,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+

From 04d7e63b79e9e75aa175547e8d3c5441f4a98a3c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 30 Jun 2019 15:28:46 -0700
Subject: [PATCH 193/337] Add culture parameter to element-bind tag helpers
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/7515e2ce49c3c629b38c4393f3f6fb7e5992add3

---
 .../src/ComponentResources.resx               |  3 ++
 .../src/BindTagHelperDescriptorProvider.cs    | 19 ++++++++
 .../BindTagHelperDescriptorProviderTest.cs    | 45 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index f932064455..610c13afcf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -129,6 +129,9 @@
   <data name="BindTagHelper_Component_Documentation" xml:space="preserve">
     <value>Binds the provided expression to the '{0}' property and a change event delegate to the '{1}' property of the component.</value>
   </data>
+  <data name="BindTagHelper_Element_Culture_Documentation" xml:space="preserve">
+    <value>Specifies the culture to use for conversions.</value>
+  </data>
   <data name="BindTagHelper_Element_Documentation" xml:space="preserve">
     <value>Binds the provided expression to the '{0}' attribute and a change event delegate to the '{1}' attribute.</value>
   </data>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 8ad405c6b5..8b1ba0a7a9 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
@@ -177,6 +178,15 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     parameter.SetPropertyName("Event");
                 });
+
+                attribute.BindAttributeParameter(parameter =>
+                {
+                    parameter.Name = "culture";
+                    parameter.TypeName = typeof(CultureInfo).FullName;
+                    parameter.Documentation = ComponentResources.BindTagHelper_Element_Culture_Documentation;
+
+                    parameter.SetPropertyName("Culture");
+                });
             });
 
             // This is no longer supported. This is just here so we can add a diagnostic later on when this matches.
@@ -381,6 +391,15 @@ namespace Microsoft.CodeAnalysis.Razor
 
                         parameter.SetPropertyName(eventName);
                     });
+
+                    a.BindAttributeParameter(parameter =>
+                    {
+                        parameter.Name = "culture";
+                        parameter.TypeName = typeof(CultureInfo).FullName;
+                        parameter.Documentation = ComponentResources.BindTagHelper_Element_Culture_Documentation;
+
+                        parameter.SetPropertyName("Culture");
+                    });
                 });
 
                 // This is no longer supported. This is just here so we can add a diagnostic later on when this matches.
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index e037ab2fd1..dc8b6605ba 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -432,6 +432,28 @@ namespace Test
             Assert.True(parameter.IsStringProperty);
             Assert.False(parameter.IsBooleanProperty);
             Assert.False(parameter.IsEnum);
+
+            parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("culture"));
+
+            // Invariants
+            Assert.Empty(parameter.Diagnostics);
+            Assert.False(parameter.HasErrors);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, parameter.Kind);
+            Assert.False(parameter.IsDefaultKind());
+
+            Assert.Equal(
+                "Specifies the culture to use for conversions.",
+                parameter.Documentation);
+
+            Assert.Equal("culture", parameter.Name);
+            Assert.Equal("Culture", parameter.GetPropertyName());
+            Assert.Equal(":culture", parameter.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.Globalization.CultureInfo", parameter.TypeName);
+            Assert.False(parameter.IsStringProperty);
+            Assert.False(parameter.IsBooleanProperty);
+            Assert.False(parameter.IsEnum);
         }
 
         [Fact]
@@ -847,8 +869,29 @@ namespace Test
             Assert.True(parameter.IsStringProperty);
             Assert.False(parameter.IsBooleanProperty);
             Assert.False(parameter.IsEnum);
-        }
 
+            parameter = Assert.Single(attribute.BoundAttributeParameters, a => a.Name.Equals("culture"));
+
+            // Invariants
+            Assert.Empty(parameter.Diagnostics);
+            Assert.False(parameter.HasErrors);
+            Assert.Equal(ComponentMetadata.Bind.TagHelperKind, parameter.Kind);
+            Assert.False(parameter.IsDefaultKind());
+
+            Assert.Equal(
+                "Specifies the culture to use for conversions.",
+                parameter.Documentation);
+
+            Assert.Equal("culture", parameter.Name);
+            Assert.Equal("Culture", parameter.GetPropertyName());
+            Assert.Equal(":culture", parameter.DisplayName);
+
+            // Defined from the property type
+            Assert.Equal("System.Globalization.CultureInfo", parameter.TypeName);
+            Assert.False(parameter.IsStringProperty);
+            Assert.False(parameter.IsBooleanProperty);
+            Assert.False(parameter.IsEnum);
+        }
 
         private static TagHelperDescriptor[] GetBindTagHelpers(TagHelperDescriptorProviderContext context)
         {

From e1f53b4bd6e5545d3e62460520ed2788677b3a6d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 30 Jun 2019 16:28:05 -0700
Subject: [PATCH 194/337] Add code generation support for culture

Adds the code generation support for culture + bind.

Some additonal changes are needed for the compiler support for bind, we
need to pass the culture into the code that unwraps the value as well.

There's no need to eagerly push these changes into the runtime (can wait
for the compiler change to go in) because nothing in our runtime tests
use the new feature.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6aad9748e85a8b0b896def2eaf3d0f28ed28d68d
---
 .../Components/ComponentBindLoweringPass.cs   | 169 ++++++++++++++----
 .../ComponentCodeGenerationTestBase.cs        | 138 +++++++++++++-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  60 +++++++
 .../TestComponent.ir.txt                      |  37 ++++
 .../TestComponent.mappings.txt                |  24 +++
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  60 +++++++
 .../TestComponent.ir.txt                      |  37 ++++
 .../TestComponent.mappings.txt                |  24 +++
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  52 ++++++
 .../TestComponent.ir.txt                      |  37 ++++
 .../TestComponent.mappings.txt                |  19 ++
 .../TestComponent.codegen.cs                  |  60 +++++++
 .../TestComponent.ir.txt                      |  40 +++++
 .../TestComponent.mappings.txt                |  24 +++
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  45 +++++
 .../TestComponent.ir.txt                      |  40 +++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../Regression_597/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.ir.txt       |   8 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../TestComponent.ir.txt                      |  26 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  56 ++++++
 .../TestComponent.ir.txt                      |  26 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  49 +++++
 .../TestComponent.ir.txt                      |  26 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  57 ++++++
 .../TestComponent.ir.txt                      |  29 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  42 +++++
 .../TestComponent.ir.txt                      |  31 ++++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../Regression_597/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.ir.txt       |   8 +-
 ...ft.AspNetCore.Components.netstandard2.0.cs |  40 +++--
 113 files changed, 1540 insertions(+), 169 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index d56d87209e..9644399958 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -101,6 +102,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     {
                         entry.BindFormatNode = node;
                     }
+                    else if (node.BoundAttributeParameter.Name == "culture")
+                    {
+                        entry.BindCultureNode = node;
+                    }
                     else
                     {
                         // Unsupported bind attribute parameter. This can only happen if bound attribute descriptor
@@ -307,6 +312,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 };
             }
 
+            // Look for a culture. If we find one then we need to pass the culture into the
+            // two nodes we generate.
+            IntermediateToken culture = null;
+            if (bindEntry.BindCultureNode != null)
+            {
+                culture = GetAttributeContent(bindEntry.BindCultureNode);
+            }
+            else if (node.TagHelper?.IsInvariantCultureBindTagHelper() == true)
+            {
+                // We may have a default invariant culture if one is associated with the field type.
+                culture = new IntermediateToken()
+                {
+                    Kind = TokenKind.CSharp,
+                    Content = $"global::{typeof(CultureInfo).FullName}.{nameof(CultureInfo.InvariantCulture)}",
+                };
+            }
+
             if (TryGetFormatNode(
                 parent,
                 node,
@@ -325,6 +347,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 RewriteNodesForDelegateBind(
                     original,
                     format,
+                    culture,
                     valueAttribute,
                     changeAttribute,
                     valueExpressionTokens, 
@@ -335,6 +358,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 RewriteNodesForEventCallbackBind(
                     original,
                     format,
+                    culture,
                     valueAttribute,
                     changeAttribute,
                     valueExpressionTokens,
@@ -630,6 +654,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         private void RewriteNodesForDelegateBind(
             IntermediateToken original,
             IntermediateToken format,
+            IntermediateToken culture,
             BoundAttributeDescriptor valueAttribute,
             BoundAttributeDescriptor changeAttribute,
             List<IntermediateToken> valueExpressionTokens, 
@@ -645,15 +670,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 Kind = TokenKind.CSharp
             });
             valueExpressionTokens.Add(original);
+
             if (!string.IsNullOrEmpty(format?.Content))
             {
                 valueExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = ", ",
+                    Content = ", format: ",
                     Kind = TokenKind.CSharp,
                 });
                 valueExpressionTokens.Add(format);
             }
+
+            if (!string.IsNullOrEmpty(culture?.Content))
+            {
+                valueExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ", culture: ",
+                    Kind = TokenKind.CSharp,
+                });
+                valueExpressionTokens.Add(culture);
+            }
+
             valueExpressionTokens.Add(new IntermediateToken()
             {
                 Content = ")",
@@ -673,33 +710,58 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // BindMethods.SetValueHandler(__value => <code> = __value, <code>, <format>)
             //
             // Note that the linemappings here are applied to the value attribute, not the change attribute.
+            if (changeAttribute == null)
+            {
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value",
+                    Kind = TokenKind.CSharp
+                });
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = original.Content,
+                    Kind = TokenKind.CSharp
+                });
 
-            string changeExpressionContent;
-            if (changeAttribute == null && format == null)
-            {
-                // DOM
-                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})";
-            }
-            else if (changeAttribute == null && format != null)
-            {
-                // DOM + format
-                changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})";
+                if (format != null)
+                {
+                    changeExpressionTokens.Add(new IntermediateToken()
+                    {
+                        Content = $", format: {format.Content}",
+                        Kind = TokenKind.CSharp
+                    });
+                }
+
+                if (culture != null)
+                {
+                    changeExpressionTokens.Add(new IntermediateToken()
+                    {
+                        Content = $", culture: {culture.Content}",
+                        Kind = TokenKind.CSharp
+                    });
+                }
+
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ")",
+                    Kind = TokenKind.CSharp
+                });
             }
             else
             {
                 // Component
-                changeExpressionContent = $"__value => {original.Content} = __value";
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = $"__value => {original.Content} = __value",
+                    Kind = TokenKind.CSharp
+                });
             }
-            changeExpressionTokens.Add(new IntermediateToken()
-            {
-                Content = changeExpressionContent,
-                Kind = TokenKind.CSharp
-            });              
         }
 
         private void RewriteNodesForEventCallbackBind(
             IntermediateToken original,
             IntermediateToken format,
+            IntermediateToken culture,
             BoundAttributeDescriptor valueAttribute,
             BoundAttributeDescriptor changeAttribute,
             List<IntermediateToken> valueExpressionTokens,
@@ -715,15 +777,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 Kind = TokenKind.CSharp
             });
             valueExpressionTokens.Add(original);
+
             if (!string.IsNullOrEmpty(format?.Content))
             {
                 valueExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = ", ",
+                    Content = ", format: ",
                     Kind = TokenKind.CSharp,
                 });
                 valueExpressionTokens.Add(format);
             }
+
+            if (!string.IsNullOrEmpty(culture?.Content))
+            {
+                valueExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ", culture: ",
+                    Kind = TokenKind.CSharp,
+                });
+                valueExpressionTokens.Add(culture);
+            }
+
             valueExpressionTokens.Add(new IntermediateToken()
             {
                 Content = ")",
@@ -748,28 +822,53 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>, <format>)
             //
             // Note that the linemappings here are applied to the value attribute, not the change attribute.
+            if (changeAttribute == null)
+            {
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, ",
+                    Kind = TokenKind.CSharp
+                });
 
-            string changeExpressionContent;
-            if (changeAttribute == null && format == null)
-            {
-                // DOM
-                changeExpressionContent = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, {original.Content})";
-            }
-            else if (changeAttribute == null && format != null)
-            {
-                // DOM + format
-                changeExpressionContent = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, {original.Content}, {format.Content})";
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = original.Content,
+                    Kind = TokenKind.CSharp
+                });
+
+                if (format != null)
+                {
+                    changeExpressionTokens.Add(new IntermediateToken()
+                    {
+                        Content = $", format: {format.Content}",
+                        Kind = TokenKind.CSharp
+                    });
+                }
+
+                if (culture != null)
+                {
+                    changeExpressionTokens.Add(new IntermediateToken()
+                    {
+                        Content = $", culture: {culture.Content}",
+                        Kind = TokenKind.CSharp
+                    });
+                }
+
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ")",
+                    Kind = TokenKind.CSharp,
+                });
             }
             else
             {
                 // Component
-                changeExpressionContent = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateInferredMethod}(this, __value => {original.Content} = __value, {original.Content})";
+                changeExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateInferredMethod}(this, __value => {original.Content} = __value, {original.Content})",
+                    Kind = TokenKind.CSharp
+                });
             }
-            changeExpressionTokens.Add(new IntermediateToken()
-            {
-                Content = changeExpressionContent,
-                Kind = TokenKind.CSharp
-            });
         }
 
         private static IntermediateToken GetAttributeContent(IntermediateNode node)
@@ -832,6 +931,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public TagHelperDirectiveAttributeParameterIntermediateNode BindEventNode { get; set; }
 
             public TagHelperDirectiveAttributeParameterIntermediateNode BindFormatNode { get; set; }
+
+            public TagHelperDirectiveAttributeParameterIntermediateNode BindCultureNode { get; set; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 8365be7a63..471322b2d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         internal override bool UseTwoPhaseCompilation => true;
 
         protected ComponentCodeGenerationTestBase()
-            : base(generateBaselines: false)
+            : base(generateBaselines: null)
         {
         }
 
@@ -1108,6 +1108,113 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BindToElementFallback_WithCulture()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Globalization
+<div @bind-value=""@ParentValue"" @bind-value:event=""onchange"" @bind-value:culture=""CultureInfo.InvariantCulture"" />
+@code {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElementWithCulture()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Globalization
+<div @bind-value=""@ParentValue"" @bind-value:event=""anotherevent"" @bind-value:culture=""CultureInfo.InvariantCulture"" />
+@code {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToInputElementWithDefaultCulture()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""custom"", null, ""value"", ""onchange"", isInvariantCulture: true, format: null)]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Globalization
+<input type=""custom"" @bind-value=""@ParentValue"" @bind-value:event=""anotherevent"" />
+@code {
+    public int ParentValue { get; set; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToInputElementWithDefaultCulture_Override()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""custom"", null, ""value"", ""onchange"", isInvariantCulture: true, format: null)]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+@using System.Globalization
+<input type=""custom"" @bind-value=""@ParentValue"" @bind-value:event=""anotherevent"" @bind-value:culture=""CultureInfo.CurrentCulture"" />
+@code {
+    public int ParentValue { get; set; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+
         [Fact]
         public void BuiltIn_BindToInputText_CanOverrideEvent()
         {
@@ -1220,6 +1327,35 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindInputElement(""custom"", null, ""value"", ""onchange"", isInvariantCulture: true, format: ""MM/dd"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input type=""custom"" @bind=""@CurrentDate"" @bind:format=""MM/dd/yyyy""/>
+@code {
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Child Content
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 89b2535b24..d2694f5c56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 66adb1ebe8..904bfff201 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f2a1a02408
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -0,0 +1,60 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            , culture: 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                  CultureInfo.InvariantCulture
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
new file mode 100644
index 0000000000..78ff1a478d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (29:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken - (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (143:1,114 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (143:1,114 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
new file mode 100644
index 0000000000..25752a14fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Globalization|
+Generated Location: (320:12,0 [26] )
+|using System.Globalization|
+
+Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1084:32,19 [11] )
+|ParentValue|
+
+Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
+|CultureInfo.InvariantCulture|
+Generated Location: (1324:40,82 [28] )
+|CultureInfo.InvariantCulture|
+
+Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1725:51,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index b68c854b33..e83a80ecb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+            , format: "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index cc9aa84e98..9efe74f1a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -22,12 +22,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (104:0,104 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (104:0,104 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 5592e65875..f9ae36bb02 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1312:36,7 [77] )
+Generated Location: (1328:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 0b08cb59a6..9db9835275 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -25,7 +25,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (77:0,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
new file mode 100644
index 0000000000..252e818029
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -0,0 +1,60 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            , culture: 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                      CultureInfo.InvariantCulture
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
new file mode 100644
index 0000000000..007192ed29
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (29:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken - (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (147:1,118 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (147:1,118 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6e739209a6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Globalization|
+Generated Location: (320:12,0 [26] )
+|using System.Globalization|
+
+Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1084:32,19 [11] )
+|ParentValue|
+
+Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
+|CultureInfo.InvariantCulture|
+Generated Location: (1328:40,86 [28] )
+|CultureInfo.InvariantCulture|
+
+Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1729:51,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 8c31a82e4a..69e345525f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index b60a70bf5b..c171f66544 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index c19a2c62d8..96a50d7bda 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (33:0,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index 862f55c1d2..ad911fb0e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f36625f879
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -0,0 +1,52 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public int ParentValue { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
new file mode 100644
index 0000000000..ccb9cf5cd5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (29:1,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (112:1,83 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (112:1,83 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
new file mode 100644
index 0000000000..665ed3939a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Globalization|
+Generated Location: (320:12,0 [26] )
+|using System.Globalization|
+
+Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1100:32,35 [11] )
+|ParentValue|
+
+Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; }
+|
+Generated Location: (1445:43,7 [44] )
+|
+    public int ParentValue { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bb11acafc7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -0,0 +1,60 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            , culture: 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                                      CultureInfo.CurrentCulture
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.CurrentCulture);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public int ParentValue { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
new file mode 100644
index 0000000000..4ca37a146e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (29:1,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken - (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.CurrentCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: CultureInfo.CurrentCulture
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (161:1,132 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (161:1,132 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
new file mode 100644
index 0000000000..473afca9ec
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|using System.Globalization|
+Generated Location: (320:12,0 [26] )
+|using System.Globalization|
+
+Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1100:32,35 [11] )
+|ParentValue|
+
+Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
+|CultureInfo.CurrentCulture|
+Generated Location: (1360:40,102 [26] )
+|CultureInfo.CurrentCulture|
+
+Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; }
+|
+Generated Location: (1757:51,7 [44] )
+|
+    public int ParentValue { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index c5177aa505..2648deba46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -25,7 +25,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, 
+                            IntermediateToken -  - CSharp - Enabled
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 1bd25aaf98..2be8d03bc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+            , format: "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index aa643a3045..f2d6f24fea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -19,12 +19,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 6fae1a9b42..6822b2eb97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1294:36,7 [77] )
+Generated Location: (1310:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index bbc94f3b68..377625918b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 
+            , format: 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        Format
@@ -37,7 +37,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index a6b4261bce..42f3b81187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -22,12 +22,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: Format
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 37bec86a5a..55bf9664ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (943:25,27 [11] )
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1147:33,55 [6] )
+Generated Location: (1155:33,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1495:44,7 [135] )
+Generated Location: (1511:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 67dfa5f842..af0c835269 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd/yyyy");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy");
+            , format: "MM/dd/yyyy");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index fa21098b04..d5387e6c5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -22,12 +22,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index e6b84d4e1e..84bf4089f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1316:36,7 [77] )
+Generated Location: (1332:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index f36a74248a..d4a98c99b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -25,7 +25,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
new file mode 100644
index 0000000000..002e30ab48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture);
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
new file mode 100644
index 0000000000..4c33c993ae
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: 
+                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken -  - CSharp - global::System.Globalization.CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - , culture: global::System.Globalization.CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
new file mode 100644
index 0000000000..549b7e76ed
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|CurrentDate|
+Generated Location: (945:25,29 [11] )
+|CurrentDate|
+
+Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1470:36,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 8690bcc8a0..974b00dd97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+            , format: "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index 1085bec8ec..80c2dfafb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -22,12 +22,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 861fb34670..c58e34b7e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1308:36,7 [77] )
+Generated Location: (1324:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 18d2c291e1..f1bff0c17a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd/yyyy");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy");
+            , format: "MM/dd/yyyy");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index 5c29e17fe7..ad47c7682c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -22,12 +22,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (69:0,69 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 356abede57..d72e7ff4af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1318:36,7 [77] )
+Generated Location: (1334:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 2a415eee3c..126d2d6d4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+            , format: "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 975db3e873..621f00ef97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -19,12 +19,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 9791dac860..a138567246 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1300:36,7 [77] )
+Generated Location: (1316:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 2a415eee3c..126d2d6d4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd");
+            , format: "MM/dd");
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index 3319fd77cc..134a4ad741 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -19,12 +19,15 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (91:0,91 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (91:0,91 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 0a5e0b32b4..3bdb56d390 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1300:36,7 [77] )
+Generated Location: (1316:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 39250f4abb..aa3036f0b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 9025f2bb74..a7769a7c21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -24,7 +24,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
+                            IntermediateToken -  - CSharp - Value
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 82a0c60c40..361aae1b27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -25,7 +25,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
+                            IntermediateToken -  - CSharp - Value
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 66ab4589f4..957bb8a901 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -33,7 +33,9 @@ Document -
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
+                                IntermediateToken -  - CSharp - text
+                                IntermediateToken -  - CSharp - )
                     HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 HtmlContent - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 68f39e92e6..efe595e922 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -31,7 +31,9 @@ Document -
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
+                                IntermediateToken -  - CSharp - text
+                                IntermediateToken -  - CSharp - )
                     HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 HtmlContent - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 2ee4b6ecdd..0e63407eea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, 
+                            IntermediateToken -  - CSharp - y
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 HtmlContent - (57:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index ebeaad5efe..bb5418dc19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -22,7 +22,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, 
+                            IntermediateToken -  - CSharp - UserName
+                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
@@ -30,7 +32,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, 
+                            IntermediateToken -  - CSharp - UserIsActive
+                            IntermediateToken -  - CSharp - )
                 HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
                 HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 3373408818..f980d6c7fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index d660ba4e4b..a52e287f61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f4ad239a30
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            , culture: 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                  CultureInfo.InvariantCulture
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
new file mode 100644
index 0000000000..c12ab4eed5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (29:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken - (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ffb1302bd3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1652:47,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 62611b0229..b17a7cf19c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -23,8 +23,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            , format: "MM/dd"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index 44c82c4abb..ec58099446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -15,11 +15,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index dce11bd751..7dce3867b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1295:33,7 [77] )
+Generated Location: (1311:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 0684c12255..958d5c196c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -18,6 +18,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2cad7d0c19
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            , culture: 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                      CultureInfo.InvariantCulture
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
+            builder.SetUpdatesAttributeName("myvalue");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
new file mode 100644
index 0000000000..9e2c83c290
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (29:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken - (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
new file mode 100644
index 0000000000..46d0a112ee
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1664:47,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index c8dac0abfd..84ed34633a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index cce597103c..f2b544f10a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 0329846680..821f69bd7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index f463197cde..ee664aa867 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b2a272a6f8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -0,0 +1,49 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "custom");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public int ParentValue { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
new file mode 100644
index 0000000000..223442beba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (29:1,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
new file mode 100644
index 0000000000..51ab84e722
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; }
+|
+Generated Location: (1434:40,7 [44] )
+|
+    public int ParentValue { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
new file mode 100644
index 0000000000..050fc765f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "custom");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            , culture: 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                                      CultureInfo.CurrentCulture
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.CurrentCulture));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public int ParentValue { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
new file mode 100644
index 0000000000..ca47062cb6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (29:1,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken - (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.CurrentCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - , culture: CultureInfo.CurrentCulture
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d5bd3ddf17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; }
+|
+Generated Location: (1746:48,7 [44] )
+|
+    public int ParentValue { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 883260bfcb..17245e7816 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -18,6 +18,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, 
+                            IntermediateToken -  - CSharp - Enabled
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 78f6bb9271..8dbdcfb908 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd"));
-            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            , format: "MM/dd"));
+            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index 8a1331fde5..6ceb3cd14a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -12,11 +12,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 1b2350f9fa..8e81cdd7a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1222:32,7 [77] )
+Generated Location: (1238:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index d070922720..3c15c6d6dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 
+            , format: 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        Format
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index d1c2df3858..c0a31ed33d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -15,11 +15,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, Format)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: Format
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index e6960dd247..420e0ffcfc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1478:41,7 [135] )
+Generated Location: (1494:41,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 1645750a92..40d821585c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -23,8 +23,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd/yyyy"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"));
+            , format: "MM/dd/yyyy"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index c0937539fb..211d095a4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -15,11 +15,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index a38673961b..ace6d5968b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1299:33,7 [77] )
+Generated Location: (1315:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index 9437d0a2ec..6d34937c3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -18,6 +18,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
new file mode 100644
index 0000000000..febeefda1d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "type", "custom");
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                             CurrentDate
+
+#line default
+#line hidden
+#nullable disable
+            , format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
new file mode 100644
index 0000000000..8ee54746b8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute -  - type=" - "
+                        HtmlAttributeValue - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: 
+                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - , culture: 
+                            IntermediateToken -  - CSharp - global::System.Globalization.CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - , culture: global::System.Globalization.CultureInfo.InvariantCulture
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3f8eb968dc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+Generated Location: (1455:33,7 [77] )
+|
+    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 723601591b..a48fd3b706 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -23,8 +23,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            , format: "MM/dd"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index 199522aa35..e16bf2ab49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -15,11 +15,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 1d58848f84..f8b0abdaa6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1293:33,7 [77] )
+Generated Location: (1309:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index a1f0888016..b5ba0497e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -23,8 +23,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd/yyyy"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"));
+            , format: "MM/dd/yyyy"));
+            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index 202cfe56df..cd9bcb08ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -15,11 +15,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index dd10b89979..6d8bf82e52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1303:33,7 [77] )
+Generated Location: (1319:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index bf71543f1b..440d10feb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd"));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            , format: "MM/dd"));
+            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 524adcd57d..5b3eca5a75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -12,11 +12,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 6ae2a3495e..63b2060551 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1229:32,7 [77] )
+Generated Location: (1245:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index ef0bc29c0a..4283c6f3ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , "MM/dd"));
-            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd"));
+            , format: "MM/dd"));
+            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
             builder.SetUpdatesAttributeName("value");
             builder.CloseElement();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index 198f840b71..5b8668e7c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -12,11 +12,14 @@ Document -
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , 
+                            IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, "MM/dd")
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
+                            IntermediateToken -  - CSharp - CurrentDate
+                            IntermediateToken -  - CSharp - , format: "MM/dd"
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 2aaa3147ad..8ebfcd7b3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1228:32,7 [77] )
+Generated Location: (1244:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 2404d027ee..0f4de178b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 2e46b6b40a..6a82896489 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -17,6 +17,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
+                            IntermediateToken -  - CSharp - Value
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index ca107c0809..e8da897c52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -18,7 +18,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
+                            IntermediateToken -  - CSharp - Value
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 3aba10d439..e39787eeb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -26,7 +26,9 @@ Document -
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
+                                IntermediateToken -  - CSharp - text
+                                IntermediateToken -  - CSharp - )
                     HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 8c26680d2b..918a623ffb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -24,7 +24,9 @@ Document -
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text)
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
+                                IntermediateToken -  - CSharp - text
+                                IntermediateToken -  - CSharp - )
                     HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index a007647a77..6557ddf07e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -15,6 +15,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, 
+                            IntermediateToken -  - CSharp - y
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 8f512281a3..e9b524a310 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -15,7 +15,9 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, 
+                            IntermediateToken -  - CSharp - UserName
+                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
@@ -23,6 +25,8 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, 
+                            IntermediateToken -  - CSharp - UserIsActive
+                            IntermediateToken -  - CSharp - )
             CSharpCode - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index caa5697b2b..7f5ede06ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -1,6 +1,8 @@
 // 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.Globalization;
+
 namespace Microsoft.AspNetCore.Components
 {
     public partial class AuthenticationState
@@ -55,8 +57,8 @@ namespace Microsoft.AspNetCore.Components
         public static System.MulticastDelegate GetEventHandlerValue<T>(System.Func<System.Threading.Tasks.Task> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
         public static System.MulticastDelegate GetEventHandlerValue<T>(System.Func<T, System.Threading.Tasks.Task> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
         public static string GetEventHandlerValue<T>(string value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static string GetValue(System.DateTime value, string format) { throw null; }
-        public static T GetValue<T>(T value) { throw null; }
+        public static string GetValue(System.DateTime value, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static T GetValue<T>(T value, System.Globalization.CultureInfo culture = null) { throw null; }
         public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<bool> setter, bool existingValue) { throw null; }
         public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<System.DateTime> setter, System.DateTime existingValue) { throw null; }
         public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<System.DateTime> setter, System.DateTime existingValue, string format) { throw null; }
@@ -151,23 +153,23 @@ namespace Microsoft.AspNetCore.Components
     }
     public static partial class EventCallbackFactoryBinderExtensions
     {
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format = null, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
     }
     public static partial class EventCallbackFactoryUIEventArgsExtensions
     {

From 8d6e13082d47b61c0bfb5ee986be52933a5cdfb7 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 30 Jun 2019 16:39:11 -0700
Subject: [PATCH 195/337] Remove handling of pre-directive-attribute cases
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/2e34a6ace6af53d404f70c6fb24cbfa621d89655

---
 .../Components/ComponentBindLoweringPass.cs   | 86 +++----------------
 .../Components/ComponentDiagnosticFactory.cs  | 28 ------
 2 files changed, 14 insertions(+), 100 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 9644399958..1cd58ab5c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -329,17 +329,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 };
             }
 
-            if (TryGetFormatNode(
-                parent,
-                node,
-                valueAttributeName,
-                out var formatNode))
-            {
-                // If there is a format- attribute present, add a warning to say that it's unsupported.
-                parent.Children.Remove(formatNode);
-                parent.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_FormatNode_Unsupported(formatNode.Source));
-            }
-
             var valueExpressionTokens = new List<IntermediateToken>();
             var changeExpressionTokens = new List<IntermediateToken>();
             if (changeAttribute != null && changeAttribute.IsDelegateProperty())
@@ -489,54 +478,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private bool TryParseBindAttribute(
-            BindEntry bindEntry,
-            out string valueAttributeName,
-            out string changeAttributeName)
+        private bool TryParseBindAttribute(BindEntry bindEntry, out string valueAttributeName)
         {
             var attributeName = bindEntry.BindNode.AttributeName;
             valueAttributeName = null;
-            changeAttributeName = null;
-
-            if (!attributeName.StartsWith("bind"))
-            {
-                return false;
-            }
-
-            if (bindEntry.BindEventNode != null)
-            {
-                changeAttributeName = GetAttributeContent(bindEntry.BindEventNode)?.Content?.Trim('"');
-            }
 
             if (attributeName == "bind")
             {
                 return true;
             }
 
-            var segments = attributeName.Split('-');
-            for (var i = 0; i < segments.Length; i++)
+            if (!attributeName.StartsWith("bind-"))
             {
-                if (string.IsNullOrEmpty(segments[i]))
-                {
-                    return false;
-                }
+                return false;
             }
 
-            switch (segments.Length)
-            {
-                case 2:
-                    valueAttributeName = segments[1];
-                    return true;
-
-                case 3:
-                    valueAttributeName = segments[1];
-                    changeAttributeName = segments[2];
-                    bindEntry.BindNode.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_UnsupportedFormat(bindEntry.BindNode.Source));
-                    return true;
-
-                default:
-                    return false;
-            }
+            valueAttributeName = attributeName.Substring("bind-".Length);
+            return true;
         }
 
         // Attempts to compute the attribute names that should be used for an instance of 'bind'.
@@ -550,18 +508,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             out BoundAttributeDescriptor changeAttribute,
             out BoundAttributeDescriptor expressionAttribute)
         {
+            valueAttributeName = null;
+            changeAttributeName = null;
+            expressionAttributeName = null;
             valueAttribute = null;
             changeAttribute = null;
             expressionAttribute = null;
-            expressionAttributeName = null;
 
             // Even though some of our 'bind' tag helpers specify the attribute names, they
             // should still satisfy one of the valid syntaxes.
-            if (!TryParseBindAttribute(bindEntry, out valueAttributeName, out changeAttributeName))
+            if (!TryParseBindAttribute(bindEntry, out valueAttributeName))
             {
                 return false;
             }
 
+            if (bindEntry.BindEventNode != null)
+            {
+                changeAttributeName = GetAttributeContent(bindEntry.BindEventNode)?.Content?.Trim('"');
+            }
+
             // The tag helper specifies attribute names, they should win.
             //
             // This handles cases like <input type="text" bind="@Foo" /> where the tag helper is 
@@ -628,29 +593,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return true;
         }
 
-        private bool TryGetFormatNode(
-            IntermediateNode node,
-            TagHelperDirectiveAttributeIntermediateNode attributeNode,
-            string valueAttributeName,
-            out TagHelperPropertyIntermediateNode formatNode)
-        {
-            for (var i = 0; i < node.Children.Count; i++)
-            {
-                var child = node.Children[i] as TagHelperPropertyIntermediateNode;
-                if (child != null &&
-                    child.TagHelper != null &&
-                    child.TagHelper == attributeNode.TagHelper &&
-                    child.AttributeName == "format-" + valueAttributeName)
-                {
-                    formatNode = child;
-                    return true;
-                }
-            }
-
-            formatNode = null;
-            return false;
-        }
-
         private void RewriteNodesForDelegateBind(
             IntermediateToken original,
             IntermediateToken format,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 07a2657a6c..e095499508 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -348,34 +348,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return diagnostic;
         }
 
-        public static readonly RazorDiagnosticDescriptor BindAttribute_UnsupportedFormat =
-            new RazorDiagnosticDescriptor(
-            $"{DiagnosticPrefix}10005",
-            () => "Specifying event handlers in bind attributes are no longer supported. Specify it using the bind:event=... attribute instead.",
-            RazorDiagnosticSeverity.Warning);
-
-        public static RazorDiagnostic CreateBindAttribute_UnsupportedFormat(SourceSpan? source)
-        {
-            var diagnostic = RazorDiagnostic.Create(
-                BindAttribute_UnsupportedFormat,
-                source ?? SourceSpan.Undefined);
-            return diagnostic;
-        }
-
-        public static readonly RazorDiagnosticDescriptor BindAttribute_FormatNode_Unsupported =
-            new RazorDiagnosticDescriptor(
-            $"{DiagnosticPrefix}10006",
-            () => "Specifying format using 'format-...' attributes are no longer supported. Specify it using the 'bind-...:format=...' attribute instead.",
-            RazorDiagnosticSeverity.Warning);
-
-        public static RazorDiagnostic CreateBindAttribute_FormatNode_Unsupported(SourceSpan? source)
-        {
-            var diagnostic = RazorDiagnostic.Create(
-                BindAttribute_FormatNode_Unsupported,
-                source ?? SourceSpan.Undefined);
-            return diagnostic;
-        }
-
         public static readonly RazorDiagnosticDescriptor DuplicateMarkupAttribute =
             new RazorDiagnosticDescriptor(
                 $"{DiagnosticPrefix}10007",

From e9ac37185462f0cd41d747d36f89e583b031c678 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Sun, 30 Jun 2019 16:47:48 -0700
Subject: [PATCH 196/337] General cleanup of bind code

Removed support for more obsolete cases and cleaned up some out-of-date
comments.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/19c6a6fa4bf1a744132371803042db7ffcc0b1c5
---
 .../Components/ComponentBindLoweringPass.cs   | 114 +++---------------
 1 file changed, 17 insertions(+), 97 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 1cd58ab5c8..c782a3709c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // Skip anything we can't understand. It's important that we don't crash, that will bring down
                 // the build.
                 node.Diagnostics.Add(ComponentDiagnosticFactory.CreateBindAttribute_InvalidSyntax(
-                    node.Source, 
+                    node.Source,
                     node.AttributeName));
                 return new[] { node };
             }
@@ -331,15 +331,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             var valueExpressionTokens = new List<IntermediateToken>();
             var changeExpressionTokens = new List<IntermediateToken>();
+
+            // DOM-based event handlers use EventCallback, so if we see a delegate here it's a component.
             if (changeAttribute != null && changeAttribute.IsDelegateProperty())
             {
-                RewriteNodesForDelegateBind(
+                RewriteNodesForComponentDelegateBind(
                     original,
-                    format,
-                    culture,
-                    valueAttribute,
-                    changeAttribute,
-                    valueExpressionTokens, 
+                    valueExpressionTokens,
                     changeExpressionTokens);
             }
             else
@@ -401,7 +399,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     changeNode.Children[0].Children.Add(changeExpressionTokens[i]);
                 }
 
-                return  new[] { valueNode, changeNode };
+                return new[] { valueNode, changeNode };
             }
             else
             {
@@ -593,111 +591,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return true;
         }
 
-        private void RewriteNodesForDelegateBind(
+        private void RewriteNodesForComponentDelegateBind(
             IntermediateToken original,
-            IntermediateToken format,
-            IntermediateToken culture,
-            BoundAttributeDescriptor valueAttribute,
-            BoundAttributeDescriptor changeAttribute,
-            List<IntermediateToken> valueExpressionTokens, 
+            List<IntermediateToken> valueExpressionTokens,
             List<IntermediateToken> changeExpressionTokens)
         {
             // Now rewrite the content of the value node to look like:
             //
-            // BindMethods.GetValue(<code>) OR
-            // BindMethods.GetValue(<code>, <format>)
+            // BindMethods.GetValue(<code>)
             valueExpressionTokens.Add(new IntermediateToken()
             {
                 Content = $"{ComponentsApi.BindMethods.GetValue}(",
                 Kind = TokenKind.CSharp
             });
             valueExpressionTokens.Add(original);
-
-            if (!string.IsNullOrEmpty(format?.Content))
-            {
-                valueExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = ", format: ",
-                    Kind = TokenKind.CSharp,
-                });
-                valueExpressionTokens.Add(format);
-            }
-
-            if (!string.IsNullOrEmpty(culture?.Content))
-            {
-                valueExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = ", culture: ",
-                    Kind = TokenKind.CSharp,
-                });
-                valueExpressionTokens.Add(culture);
-            }
-
             valueExpressionTokens.Add(new IntermediateToken()
             {
                 Content = ")",
                 Kind = TokenKind.CSharp,
             });
 
-            // Now rewrite the content of the change-handler node. There are two cases we care about
-            // here. If it's a component attribute, then don't use the 'BindMethods' wrapper. We expect
-            // component attributes to always 'match' on type.
+            // Now rewrite the content of the change-handler node. Since it's a component attribute,
+            // we don't use the 'BindMethods' wrapper. We expect component attributes to always 'match' on type.
             //
             // __value => <code> = __value
-            //
-            // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
-            // so we use BindMethods.SetValueHandler
-            //
-            // BindMethods.SetValueHandler(__value => <code> = __value, <code>) OR
-            // BindMethods.SetValueHandler(__value => <code> = __value, <code>, <format>)
-            //
-            // Note that the linemappings here are applied to the value attribute, not the change attribute.
-            if (changeAttribute == null)
+            changeExpressionTokens.Add(new IntermediateToken()
             {
-                changeExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value",
-                    Kind = TokenKind.CSharp
-                });
-                changeExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = original.Content,
-                    Kind = TokenKind.CSharp
-                });
-
-                if (format != null)
-                {
-                    changeExpressionTokens.Add(new IntermediateToken()
-                    {
-                        Content = $", format: {format.Content}",
-                        Kind = TokenKind.CSharp
-                    });
-                }
-
-                if (culture != null)
-                {
-                    changeExpressionTokens.Add(new IntermediateToken()
-                    {
-                        Content = $", culture: {culture.Content}",
-                        Kind = TokenKind.CSharp
-                    });
-                }
-
-                changeExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = ")",
-                    Kind = TokenKind.CSharp
-                });
-            }
-            else
-            {
-                // Component
-                changeExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = $"__value => {original.Content} = __value",
-                    Kind = TokenKind.CSharp
-                });
-            }
+                Content = $"__value => {original.Content} = __value",
+                Kind = TokenKind.CSharp,
+            });
         }
 
         private void RewriteNodesForEventCallbackBind(
@@ -711,8 +633,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             // Now rewrite the content of the value node to look like:
             //
-            // BindMethods.GetValue(<code>) OR
-            // BindMethods.GetValue(<code>, <format>)
+            // BindMethods.GetValue(<code>, format: <format>, culture: <culture>)
             valueExpressionTokens.Add(new IntermediateToken()
             {
                 Content = $"{ComponentsApi.BindMethods.GetValue}(",
@@ -760,8 +681,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
             // so we use 'CreateBinder'
             //
-            // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>) OR
-            // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>, <format>)
+            // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>, format: <format>, culture: <culture>)
             //
             // Note that the linemappings here are applied to the value attribute, not the change attribute.
             if (changeAttribute == null)

From dbf5b80f97b9469a4b71c40745756a4c6c950295 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 1 Jul 2019 15:06:29 -0700
Subject: [PATCH 197/337] PR feedback \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/bfc2485b67a4f77666976e198c59bbe37f32a4fb

---
 .../src/BindTagHelperDescriptorProvider.cs         | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 8b1ba0a7a9..34d70280a2 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -189,20 +189,6 @@ namespace Microsoft.CodeAnalysis.Razor
                 });
             });
 
-            // This is no longer supported. This is just here so we can add a diagnostic later on when this matches.
-            builder.BindAttribute(attribute =>
-            {
-                attribute.Documentation = ComponentResources.BindTagHelper_Fallback_Format_Documentation;
-
-                attribute.Name = "format-...";
-                attribute.AsDictionary("format-", typeof(string).FullName);
-
-                // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
-                // a C# property will crash trying to create the toolips.
-                attribute.SetPropertyName("Format");
-                attribute.TypeName = "System.Collections.Generic.Dictionary<string, string>";
-            });
-
             return builder.Build();
         }
 

From bfbb9a78a2e3a1b5983959ac69410156598bf306 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 1 Jul 2019 16:39:20 -0700
Subject: [PATCH 198/337] Fix a bug with ref and declaration phase

This fixes a regression in the new `@ref` support, where the build will
fail during the declaration pass.

The problem is that the EliminateMethodBodyPass runs really early and
wipes out the usage of `@ref` before we have a chance to see it. The
solution is to make it run really late. This makes sense because we
basically just use this pass to do cleanup.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/09b50151ef3f15ed05f5e8efc68e540a6781704e
---
 .../src/Extensions/EliminateMethodBodyPass.cs     |  4 ++--
 .../ComponentDeclarationIntegrationTest.cs        | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
index 96d336ca72..c14950aae5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
@@ -8,8 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 {
     internal sealed class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass
     {
-        // Run early in the optimization phase
-        public override int Order => int.MinValue;
+        // Run late in the optimization phase
+        public override int Order => int.MaxValue;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 25ec85093b..b3e35fd973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -70,6 +70,21 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             Assert.Same(typeof(StringBuilder), property.PropertyType);
         }
 
+        [Fact]
+        public void DeclarationConfiguration_IncludesRef()
+        {
+            // Arrange & Act
+            var component = CompileToComponent(@"
+@using System.Text
+<div @ref=""myDiv"" />
+");
+
+            // Assert
+            var field = component.GetType().GetField("myDiv", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assert.NotNull(field);
+            Assert.Same(typeof(ElementRef), field.FieldType);
+        }
+
         [Fact]
         public void DeclarationConfiguration_IncludesInherits()
         {

From 9ac7cb8f00ac535b65b60b59d8cbed1c0936455c Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 2 Jul 2019 18:35:03 +0200
Subject: [PATCH 199/337] Unconditionally enable content in RCLs
 (dotnet/aspnetcore-tooling#723)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/50f6b2d4d65dd37e8d32426189d2b2d1f775c4c1
---
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.props   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 60cc8fecc1..ca4dc883af 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -80,12 +80,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <None Remove="**\*.razor" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <EnableRazorSdkContent Condition="'$(EnableRazorSdkContent)' =='' and '$(UsingMicrosoftNETSdkWeb)' == '' ">true</EnableRazorSdkContent>
-  </PropertyGroup>
-
-  <Import 
-    Project="$(MSBuildThisFileDirectory)..\..\Sdk\Sdk.Razor.StaticAssets.ProjectSystem.props"
-    Condition=" '$(EnableRazorSdkContent)' == 'true' " />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Sdk\Sdk.Razor.StaticAssets.ProjectSystem.props" />
 
 </Project>

From d9f35d4482656997ef1c11ada4363919fcba35c2 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 25 Jun 2019 14:29:12 -0700
Subject: [PATCH 200/337] Add support for C# 8 nullable forgiveness operator.

- Added a feature flag to ensure this functionality does not impact pre-3.0 applications. This change is in fact a breaking change because some less-common scenarios will no longer be valid. For instance, `@Name!.Hello`used to treat the `!.Hello` as markup, now it will be treated as part of the expression.ExpressionChunkGenerator
- Updated parser flags tests
- Updated parser tests
- Updated the C# 8.0 integration tests to include the new nullable forgiveness scenarios.

aspnet/AspNetCoredotnet/aspnetcore-tooling#11188
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/625c605607bc79b6b236b0234602dcd987aab2b6
---
 .../src/Legacy/CSharpCodeParser.cs            |  61 +++++-
 .../src/RazorParserFeatureFlags.cs            |  13 +-
 .../Legacy/CSharpImplicitExpressionTest.cs    | 190 ++++++++++++++++++
 .../test/Legacy/TagHelperBlockRewriterTest.cs |   6 +-
 .../test/RazorParserFeatureFlagsTest.cs       |  24 ++-
 .../CSharp8.cshtml                            |  15 ++
 .../CSharp8_DesignTime.codegen.cs             |  34 +++-
 .../CSharp8_DesignTime.ir.txt                 |  16 +-
 .../CSharp8_DesignTime.mappings.txt           |  41 +++-
 .../CSharp8_Runtime.codegen.cs                |  41 +++-
 .../CSharp8_Runtime.ir.txt                    |  16 +-
 ...torImplicitExpression_Bracket15.cspans.txt |   4 +
 ...atorImplicitExpression_Bracket15.stree.txt |  23 +++
 ...atorImplicitExpression_Brackets.cspans.txt |   4 +
 ...ratorImplicitExpression_Brackets.stree.txt |  18 ++
 ...atorImplicitExpression_Combined.cspans.txt |   4 +
 ...ratorImplicitExpression_Combined.stree.txt |  18 ++
 ...plicitExpression_CombinedEnding.cspans.txt |   4 +
 ...mplicitExpression_CombinedEnding.stree.txt |  17 ++
 ...ion_CombinedWithNullConditional.cspans.txt |   4 +
 ...sion_CombinedWithNullConditional.stree.txt |  15 ++
 ...ratorImplicitExpression_Complex.cspans.txt |   5 +
 ...eratorImplicitExpression_Complex.stree.txt |  26 +++
 ...itExpression_DirectiveCodeBlock.cspans.txt |  11 +
 ...citExpression_DirectiveCodeBlock.stree.txt |  56 ++++++
 ...on_DoubleBang_IncompleteBracket.cspans.txt |   4 +
 ...ion_DoubleBang_IncompleteBracket.stree.txt |  16 ++
 ...eratorImplicitExpression_Ending.cspans.txt |   4 +
 ...peratorImplicitExpression_Ending.stree.txt |  14 ++
 ...tExpression_EndingDotedOperator.cspans.txt |   4 +
 ...itExpression_EndingDotedOperator.stree.txt |  15 ++
 ...plicitExpression_FullExpression.cspans.txt |   4 +
 ...mplicitExpression_FullExpression.stree.txt |  17 ++
 ...pression_FullExpressionWithHtml.cspans.txt |   4 +
 ...xpression_FullExpressionWithHtml.stree.txt |  20 ++
 ...citExpression_IncompleteBracket.cspans.txt |   3 +
 ...licitExpression_IncompleteBracket.diag.txt |   1 +
 ...icitExpression_IncompleteBracket.stree.txt |  14 ++
 ...ssion_IncompleteBracketWithHtml.cspans.txt |   4 +
 ...ression_IncompleteBracketWithHtml.diag.txt |   1 +
 ...ession_IncompleteBracketWithHtml.stree.txt |  19 ++
 ...IncompleteBracketWithIdentifier.cspans.txt |   3 +
 ...n_IncompleteBracketWithIdentifier.diag.txt |   1 +
 ..._IncompleteBracketWithIdentifier.stree.txt |  15 ++
 ...xpression_IncompleteParenthesis.cspans.txt |   3 +
 ...tExpression_IncompleteParenthesis.diag.txt |   1 +
 ...Expression_IncompleteParenthesis.stree.txt |  14 ++
 ...ession_Incomplete_ContinuedHtml.cspans.txt |   5 +
 ...ression_Incomplete_ContinuedHtml.stree.txt |  20 ++
 ...tExpression_InvalidMethodEnding.cspans.txt |   4 +
 ...itExpression_InvalidMethodEnding.stree.txt |  15 ++
 ...pression_MixedIncompleteBracket.cspans.txt |   4 +
 ...Expression_MixedIncompleteBracket.diag.txt |   1 +
 ...xpression_MixedIncompleteBracket.stree.txt |  21 ++
 ...Expression_MixedNullConditional.cspans.txt |   5 +
 ...tExpression_MixedNullConditional.stree.txt |  22 ++
 ...atorImplicitExpression_Multiple.cspans.txt |   4 +
 ...ratorImplicitExpression_Multiple.stree.txt |  22 ++
 ...mplicitExpression_MultipleMixed.cspans.txt |   4 +
 ...ImplicitExpression_MultipleMixed.stree.txt |  25 +++
 ...plicitExpression_MultipleMixed2.cspans.txt |   4 +
 ...mplicitExpression_MultipleMixed2.stree.txt |  24 +++
 ...tExpression_Multiple_Incomplete.cspans.txt |   3 +
 ...citExpression_Multiple_Incomplete.diag.txt |   1 +
 ...itExpression_Multiple_Incomplete.stree.txt |  19 ++
 ...eratorImplicitExpression_Nested.cspans.txt |   4 +
 ...peratorImplicitExpression_Nested.stree.txt |  26 +++
 ...licitExpression_NestedCodeBlock.cspans.txt |   9 +
 ...plicitExpression_NestedCodeBlock.stree.txt |  39 ++++
 ...plicitExpression_SingleOperator.cspans.txt |   4 +
 ...mplicitExpression_SingleOperator.stree.txt |  19 ++
 71 files changed, 1133 insertions(+), 18 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.diag.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.stree.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index b6fb7bfe6b..c5fbbdb586 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -433,6 +433,65 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         }
                     }
                 }
+                else if (At(SyntaxKind.Not) && Context.FeatureFlags.AllowNullableForgivenessOperator)
+                {
+                    // C# 8.0 Null forgiveness Operator
+
+                    var next = Lookahead(count: 1);
+                    if (next == null)
+                    {
+                        // Null forgiveness operator at the end of the file, don't include it in the expression.
+                        // We don't allow trailing null forgiveness operators to avoid breaking scenarios such as:
+                        //
+                        // <p>Hello @Person! Good day!</p>
+                        return false;
+                    }
+
+                    if (next.Kind == SyntaxKind.Dot)
+                    {
+                        var nextNext = Lookahead(count: 2);
+                        if (nextNext == null)
+                        {
+                            // End of file after the dot (!.EOF)
+                            return false;
+                        }
+
+                        if (nextNext.Kind == SyntaxKind.Identifier || nextNext.Kind == SyntaxKind.Keyword)
+                        {
+                            // Accept null forgiveness operator followed by a dot (!.)
+                            AcceptAndMoveNext();
+
+                            // Accept the dot
+                            AcceptAndMoveNext();
+                            return true;
+                        }
+
+                        // We're in an odd situation where the user is attempting to use a null-forgiven implicit expression at the
+                        // end of a sentence, i.e.
+                        //
+                        // <p>@Person!.</p>
+                        //
+                        // We don't allow trailing null forgiveness operators so don't include it in the implicit expression.
+                        return false;
+                    }
+                    else if (next.Kind == SyntaxKind.QuestionMark)
+                    {
+                        // We're at the ! for a null forgiveness + null conditional operator (!?).
+                        AcceptAndMoveNext();
+
+                        return true;
+                    }
+                    else if (next.Kind == SyntaxKind.LeftBracket || next.Kind == SyntaxKind.LeftParenthesis)
+                    {
+                        // We're at the ! for a null forgiveness bracket or parenthesis operator (![).
+                        AcceptAndMoveNext();
+
+                        // Accept the [ or ( and any content inside (it will attempt to balance).
+                        return ParseMethodCallOrArrayIndex(builder, acceptedCharacters);
+                    }
+
+                    return false;
+                }
                 else if (At(SyntaxKind.Dot))
                 {
                     var dot = CurrentToken;
@@ -1369,7 +1428,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                                     builder.Add(BuildDirective());
                                     return;
                                 }
-                                
+
                                 break;
                         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
index 6bc236aada..bce8d685b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
@@ -21,6 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var allowUsingVariableDeclarations = false;
             var allowConditionalDataDashAttributes = false;
             var allowCSharpInMarkupAttributeArea = true;
+            var allowNullableForgivenessOperator = false;
 
             if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
             {
@@ -35,6 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowComponentFileKind = true;
                 allowRazorInAllCodeBlocks = true;
                 allowUsingVariableDeclarations = true;
+                allowNullableForgivenessOperator = true;
             }
 
             if (FileKinds.IsComponent(fileKind))
@@ -55,7 +57,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 allowRazorInAllCodeBlocks,
                 allowUsingVariableDeclarations,
                 allowConditionalDataDashAttributes,
-                allowCSharpInMarkupAttributeArea);
+                allowCSharpInMarkupAttributeArea,
+                allowNullableForgivenessOperator);
         }
 
         public abstract bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -72,6 +75,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract bool AllowCSharpInMarkupAttributeArea { get; }
 
+        public abstract bool AllowNullableForgivenessOperator { get; }
+
         private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
         {
             public DefaultRazorParserFeatureFlags(
@@ -81,7 +86,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 bool allowRazorInAllCodeBlocks,
                 bool allowUsingVariableDeclarations,
                 bool allowConditionalDataDashAttributesInComponents,
-                bool allowCSharpInMarkupAttributeArea)
+                bool allowCSharpInMarkupAttributeArea,
+                bool allowNullableForgivenessOperator)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
@@ -90,6 +96,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
                 AllowConditionalDataDashAttributes = allowConditionalDataDashAttributesInComponents;
                 AllowCSharpInMarkupAttributeArea = allowCSharpInMarkupAttributeArea;
+                AllowNullableForgivenessOperator = allowNullableForgivenessOperator;
             }
 
             public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -105,6 +112,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             public override bool AllowConditionalDataDashAttributes { get; }
 
             public override bool AllowCSharpInMarkupAttributeArea { get; }
+
+            public override bool AllowNullableForgivenessOperator { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs
index 594b6d2050..4fdcc42df0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpImplicitExpressionTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Extensions;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -217,6 +218,195 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest("@val?.more(null ?? true)?.abc");
         }
 
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock()
+        {
+            // Act & Assert
+            ParseDocumentTest("@{ @val!.Name![0]!?.Bar }");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock()
+        {
+            // Act & Assert
+            ParseDocumentTest("@functions { public void Foo() { @Model!.Name![0]!?.Bar } }", new[] { FunctionsDirective.Directive });
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!![");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!(");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![more");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Brackets()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![0]");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![<p>");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![more.<p>");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val?![more<p>");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_SingleOperator()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![-1]!");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![abc]![def");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Multiple()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![abc]![2]");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![abc]!.more![def]");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![abc]!.more!.abc");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Bracket15()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![null! ?? true]");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Nested()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val![abc!.gef![-1]]");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Ending()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!?");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Combined()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!?.more");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!.");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!?.");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!.(abc)");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!.<p>");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_FullExpression()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!.more");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!.more<p>");
+        }
+
+        [Fact]
+        public void ParsesNullForgivenessOperatorImplicitExpression_Complex()
+        {
+            // Act & Assert
+            ParseDocumentTest("@val!.more(false)!.<p>");
+        }
+
         [Fact]
         public void NestedImplicitExpression()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
index 25ad072bc1..7460142c23 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
@@ -2251,7 +2251,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 bool allowRazorInCodeBlockDirectives = false,
                 bool allowUsingVariableDeclarations = false,
                 bool allowConditionalDataDashAttributesInComponents = false,
-                bool allowCSharpInMarkupAttributeArea = true)
+                bool allowCSharpInMarkupAttributeArea = true,
+                bool allowNullableForgivenessOperator = false)
             {
                 AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
                 AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelper;
@@ -2260,6 +2261,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 AllowUsingVariableDeclarations = allowUsingVariableDeclarations;
                 AllowConditionalDataDashAttributes = allowConditionalDataDashAttributesInComponents;
                 AllowCSharpInMarkupAttributeArea = allowCSharpInMarkupAttributeArea;
+                AllowNullableForgivenessOperator = allowNullableForgivenessOperator;
             }
 
             public override bool AllowMinimizedBooleanTagHelperAttributes { get; }
@@ -2275,6 +2277,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             public override bool AllowConditionalDataDashAttributes { get; }
 
             public override bool AllowCSharpInMarkupAttributeArea { get; }
+
+            public override bool AllowNullableForgivenessOperator { get; }
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
index f693b4261a..d645d45ced 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorParserFeatureFlagsTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -9,7 +8,20 @@ namespace Microsoft.AspNetCore.Razor.Language
     public class RazorParserFeatureFlagsTest
     {
         [Fact]
-        public void Create_LatestVersion_AllowsMinimizedBooleanTagHelperAttributes()
+        public void Create_LatestVersion_AllowsLatestFeatures()
+        {
+            // Arrange & Act
+            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Latest, FileKinds.Legacy);
+
+            // Assert
+            Assert.True(context.AllowComponentFileKind);
+            Assert.True(context.AllowRazorInAllCodeBlocks);
+            Assert.True(context.AllowUsingVariableDeclarations);
+            Assert.True(context.AllowNullableForgivenessOperator);
+        }
+
+        [Fact]
+        public void Create_21Version_Allows21Features()
         {
             // Arrange & Act
             var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_1, FileKinds.Legacy);
@@ -20,14 +32,18 @@ namespace Microsoft.AspNetCore.Razor.Language
         }
 
         [Fact]
-        public void Create_OlderVersion_DoesNotAllowMinimizedBooleanTagHelperAttributes()
+        public void Create_OldestVersion_DoesNotAllowLatestFeatures()
         {
             // Arrange & Act
-            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_1_1, FileKinds.Legacy);
+            var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_1_0, FileKinds.Legacy);
 
             // Assert
             Assert.False(context.AllowMinimizedBooleanTagHelperAttributes);
             Assert.False(context.AllowHtmlCommentsInTagHelpers);
+            Assert.False(context.AllowComponentFileKind);
+            Assert.False(context.AllowRazorInAllCodeBlocks);
+            Assert.False(context.AllowUsingVariableDeclarations);
+            Assert.False(context.AllowNullableForgivenessOperator);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml
index 55a1f9f763..83b95d4458 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml
@@ -37,6 +37,10 @@
     @val
 }
 
+@Person!.Name
+@People![0]!.Name![1]
+@DoSomething!(Person!)
+
 @functions {
     enum TestEnum
     {
@@ -49,4 +53,15 @@
         var disposables = (IDisposable[])ViewData["disposables"];
         return disposables[range][^1];
     }
+
+    private Human? Person { get; set; }
+
+    private Human?[]? People { get; set; }
+
+    private Func<Human, string>? DoSomething { get; set; }
+
+    private class Human
+    {
+        public string? Name { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs
index a324d77c3d..1059516778 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.cs
@@ -95,13 +95,34 @@ __o = val;
         
 }
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = Person!.Name;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 41 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = People![0]!.Name![1];
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 42 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+__o = DoSomething!(Person!);
+
 #line default
 #line hidden
 #nullable disable
         }
         #pragma warning restore 1998
 #nullable restore
-#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+#line 44 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
             
     enum TestEnum
     {
@@ -115,6 +136,17 @@ __o = val;
         return disposables[range][^1];
     }
 
+    private Human? Person { get; set; }
+
+    private Human?[]? People { get; set; }
+
+    private Func<Human, string>? DoSomething { get; set; }
+
+    private class Human
+    {
+        public string? Name { get; set; }
+    }
+
 #line default
 #line hidden
 #nullable disable
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt
index d88c704ac3..e91175b961 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.ir.txt
@@ -36,5 +36,17 @@ Document -
                     IntermediateToken - (663:36,8 [3] CSharp8.cshtml) - CSharp - \n}
                 HtmlContent - (666:37,1 [4] CSharp8.cshtml)
                     IntermediateToken - (666:37,1 [4] CSharp8.cshtml) - Html - \n\n
-            CSharpCode - (682:39,12 [245] CSharp8.cshtml)
-                IntermediateToken - (682:39,12 [245] CSharp8.cshtml) - CSharp - \n    enum TestEnum\n    {\n        First,\n        Second\n    }\n\n    IDisposable GetLastDisposableInRange(Range range)\n    {\n        var disposables = (IDisposable[])ViewData["disposables"];\n        return disposables[range][^1];\n    }\n
+                CSharpExpression - (671:39,1 [12] CSharp8.cshtml)
+                    IntermediateToken - (671:39,1 [12] CSharp8.cshtml) - CSharp - Person!.Name
+                HtmlContent - (683:39,13 [2] CSharp8.cshtml)
+                    IntermediateToken - (683:39,13 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (686:40,1 [20] CSharp8.cshtml)
+                    IntermediateToken - (686:40,1 [20] CSharp8.cshtml) - CSharp - People![0]!.Name![1]
+                HtmlContent - (706:40,21 [2] CSharp8.cshtml)
+                    IntermediateToken - (706:40,21 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (709:41,1 [21] CSharp8.cshtml)
+                    IntermediateToken - (709:41,1 [21] CSharp8.cshtml) - CSharp - DoSomething!(Person!)
+                HtmlContent - (730:41,22 [4] CSharp8.cshtml)
+                    IntermediateToken - (730:41,22 [4] CSharp8.cshtml) - Html - \n\n
+            CSharpCode - (746:43,12 [480] CSharp8.cshtml)
+                IntermediateToken - (746:43,12 [480] CSharp8.cshtml) - CSharp - \n    enum TestEnum\n    {\n        First,\n        Second\n    }\n\n    IDisposable GetLastDisposableInRange(Range range)\n    {\n        var disposables = (IDisposable[])ViewData["disposables"];\n        return disposables[range][^1];\n    }\n\n    private Human? Person { get; set; }\n\n    private Human?[]? People { get; set; }\n\n    private Func<Human, string>? DoSomething { get; set; }\n\n    private class Human\n    {\n        public string? Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt
index dda962d084..a573b6fdbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.mappings.txt
@@ -94,7 +94,22 @@ Generated Location: (2486:94,8 [3] )
 |
 }|
 
-Source Location: (682:39,12 [245] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+Source Location: (671:39,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|Person!.Name|
+Generated Location: (2650:102,6 [12] )
+|Person!.Name|
+
+Source Location: (686:40,1 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|People![0]!.Name![1]|
+Generated Location: (2824:109,6 [20] )
+|People![0]!.Name![1]|
+
+Source Location: (709:41,1 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
+|DoSomething!(Person!)|
+Generated Location: (3006:116,6 [21] )
+|DoSomething!(Person!)|
+
+Source Location: (746:43,12 [480] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml)
 |
     enum TestEnum
     {
@@ -107,8 +122,19 @@ Source Location: (682:39,12 [245] TestFiles/IntegrationTests/CodeGenerationInteg
         var disposables = (IDisposable[])ViewData["disposables"];
         return disposables[range][^1];
     }
+
+    private Human? Person { get; set; }
+
+    private Human?[]? People { get; set; }
+
+    private Func<Human, string>? DoSomething { get; set; }
+
+    private class Human
+    {
+        public string? Name { get; set; }
+    }
 |
-Generated Location: (2705:104,12 [245] )
+Generated Location: (3244:125,12 [480] )
 |
     enum TestEnum
     {
@@ -121,5 +147,16 @@ Generated Location: (2705:104,12 [245] )
         var disposables = (IDisposable[])ViewData["disposables"];
         return disposables[range][^1];
     }
+
+    private Human? Person { get; set; }
+
+    private Human?[]? People { get; set; }
+
+    private Func<Human, string>? DoSomething { get; set; }
+
+    private class Human
+    {
+        public string? Name { get; set; }
+    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs
index 444b967afa..d535be6fbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs
@@ -1,4 +1,4 @@
-#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fee381e8889cc49d7a4b1dea29510c0fc9ac44c9"
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f830678e508a850354b4240a5821a1d75347fa64"
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")]
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 #line default
 #line hidden
 #nullable disable
-    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"fee381e8889cc49d7a4b1dea29510c0fc9ac44c9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f830678e508a850354b4240a5821a1d75347fa64", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp8_Runtime
     {
         #pragma warning disable 1998
@@ -100,10 +100,34 @@ Write(val);
 #line hidden
 #nullable disable
             WriteLiteral("\r\n");
+#nullable restore
+#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(Person!.Name);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 41 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(People![0]!.Name![1]);
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n");
+#nullable restore
+#line 42 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+Write(DoSomething!(Person!));
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("\r\n\r\n");
         }
         #pragma warning restore 1998
 #nullable restore
-#line 40 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
+#line 44 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml"
             
     enum TestEnum
     {
@@ -117,6 +141,17 @@ Write(val);
         return disposables[range][^1];
     }
 
+    private Human? Person { get; set; }
+
+    private Human?[]? People { get; set; }
+
+    private Func<Human, string>? DoSomething { get; set; }
+
+    private class Human
+    {
+        public string? Name { get; set; }
+    }
+
 #line default
 #line hidden
 #nullable disable
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt
index 4c29c1f76f..db92e0b6bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.ir.txt
@@ -31,5 +31,17 @@ Document -
                     IntermediateToken - (663:36,8 [5] CSharp8.cshtml) - CSharp - \n}\n
                 HtmlContent - (668:38,0 [2] CSharp8.cshtml)
                     IntermediateToken - (668:38,0 [2] CSharp8.cshtml) - Html - \n
-            CSharpCode - (682:39,12 [245] CSharp8.cshtml)
-                IntermediateToken - (682:39,12 [245] CSharp8.cshtml) - CSharp - \n    enum TestEnum\n    {\n        First,\n        Second\n    }\n\n    IDisposable GetLastDisposableInRange(Range range)\n    {\n        var disposables = (IDisposable[])ViewData["disposables"];\n        return disposables[range][^1];\n    }\n
+                CSharpExpression - (671:39,1 [12] CSharp8.cshtml)
+                    IntermediateToken - (671:39,1 [12] CSharp8.cshtml) - CSharp - Person!.Name
+                HtmlContent - (683:39,13 [2] CSharp8.cshtml)
+                    IntermediateToken - (683:39,13 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (686:40,1 [20] CSharp8.cshtml)
+                    IntermediateToken - (686:40,1 [20] CSharp8.cshtml) - CSharp - People![0]!.Name![1]
+                HtmlContent - (706:40,21 [2] CSharp8.cshtml)
+                    IntermediateToken - (706:40,21 [2] CSharp8.cshtml) - Html - \n
+                CSharpExpression - (709:41,1 [21] CSharp8.cshtml)
+                    IntermediateToken - (709:41,1 [21] CSharp8.cshtml) - CSharp - DoSomething!(Person!)
+                HtmlContent - (730:41,22 [4] CSharp8.cshtml)
+                    IntermediateToken - (730:41,22 [4] CSharp8.cshtml) - Html - \n\n
+            CSharpCode - (746:43,12 [480] CSharp8.cshtml)
+                IntermediateToken - (746:43,12 [480] CSharp8.cshtml) - CSharp - \n    enum TestEnum\n    {\n        First,\n        Second\n    }\n\n    IDisposable GetLastDisposableInRange(Range range)\n    {\n        var disposables = (IDisposable[])ViewData["disposables"];\n        return disposables[range][^1];\n    }\n\n    private Human? Person { get; set; }\n\n    private Human?[]? People { get; set; }\n\n    private Func<Human, string>? DoSomething { get; set; }\n\n    private class Human\n    {\n        public string? Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.cspans.txt
new file mode 100644
index 0000000000..0b32c2fccc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.stree.txt
new file mode 100644
index 0000000000..ad5651fb87
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Bracket15.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..20)::20 - [@val![null! ?? true]]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpImplicitExpression - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..20)::19
+                    CSharpCodeBlock - [1..20)::19
+                        CSharpExpressionLiteral - [1..20)::19 - [val![null! ?? true]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Keyword;[null];
+                            Not;[!];
+                            Whitespace;[ ];
+                            NullCoalesce;[??];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            RightBracket;[]];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.cspans.txt
new file mode 100644
index 0000000000..685d604d5b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
+Markup span at (8:0,8 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.stree.txt
new file mode 100644
index 0000000000..4921828163
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Brackets.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..8)::8 - [@val![0]]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [val![0]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            IntegerLiteral;[0];
+                            RightBracket;[]];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.cspans.txt
new file mode 100644
index 0000000000..d438935c6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [11] )
+Code span at (1:0,1 [10] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [11] )
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.stree.txt
new file mode 100644
index 0000000000..5b1b99423f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Combined.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..11)::11 - [@val!?.more]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpImplicitExpression - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..11)::10
+                    CSharpCodeBlock - [1..11)::10
+                        CSharpExpressionLiteral - [1..11)::10 - [val!?.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            QuestionMark;[?];
+                            Dot;[.];
+                            Identifier;[more];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.cspans.txt
new file mode 100644
index 0000000000..34db8ba1e2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
+Code span at (1:0,1 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [7] )
+Markup span at (7:0,7 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.stree.txt
new file mode 100644
index 0000000000..0851177da5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedEnding.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..7)::7 - [@val!?.]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpImplicitExpression - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..7)::6
+                    CSharpCodeBlock - [1..7)::6
+                        CSharpExpressionLiteral - [1..7)::6 - [val!?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            QuestionMark;[?];
+                            Dot;[.];
+        MarkupTextLiteral - [7..7)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.cspans.txt
new file mode 100644
index 0000000000..980b0da319
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [5] )
+Code span at (1:0,1 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [5] )
+Markup span at (5:0,5 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.stree.txt
new file mode 100644
index 0000000000..3a965aba80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_CombinedWithNullConditional.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..6)::6 - [@val!?]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpImplicitExpression - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..5)::4
+                    CSharpCodeBlock - [1..5)::4
+                        CSharpExpressionLiteral - [1..5)::4 - [val!] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+        MarkupTextLiteral - [5..6)::1 - [?] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.cspans.txt
new file mode 100644
index 0000000000..47ad9f2cb0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [17] )
+Code span at (1:0,1 [16] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [17] )
+Markup span at (17:0,17 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.stree.txt
new file mode 100644
index 0000000000..4a747ee7d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Complex.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..22)::22 - [@val!.more(false)!.<p>]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpImplicitExpression - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..17)::16
+                    CSharpCodeBlock - [1..17)::16
+                        CSharpExpressionLiteral - [1..17)::16 - [val!.more(false)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[more];
+                            LeftParenthesis;[(];
+                            Keyword;[false];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [17..19)::2 - [!.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
+            Text;[.];
+        MarkupElement - [19..22)::3
+            MarkupStartTag - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.cspans.txt
new file mode 100644
index 0000000000..6a164b65bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.cspans.txt
@@ -0,0 +1,11 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [59] )
+MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [59] )
+None span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [59] )
+MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [59] )
+Code span at (12:0,12 [21] ) (Accepts:Any) - Parent: Statement block at (12:0,12 [46] )
+Transition span at (33:0,33 [1] ) (Accepts:None) - Parent: Expression block at (33:0,33 [22] )
+Code span at (34:0,34 [21] ) (Accepts:NonWhitespace) - Parent: Expression block at (33:0,33 [22] )
+Code span at (55:0,55 [3] ) (Accepts:Any) - Parent: Statement block at (12:0,12 [46] )
+MetaCode span at (58:0,58 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [59] )
+Markup span at (59:0,59 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.stree.txt
new file mode 100644
index 0000000000..7aaf996a80
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DirectiveCodeBlock.stree.txt
@@ -0,0 +1,56 @@
+RazorDocument - [0..59)::59 - [@functions { public void Foo() { @Model!.Name![0]!?.Bar } }]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..59)::59
+            RazorDirective - [0..59)::59 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..59)::58
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..59)::49
+                        UnclassifiedTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [12..58)::46
+                            CSharpStatementLiteral - [12..33)::21 - [ public void Foo() { ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                                Keyword;[public];
+                                Whitespace;[ ];
+                                Keyword;[void];
+                                Whitespace;[ ];
+                                Identifier;[Foo];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Whitespace;[ ];
+                                LeftBrace;[{];
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [33..55)::22
+                                CSharpImplicitExpression - [33..55)::22
+                                    CSharpTransition - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [34..55)::21
+                                        CSharpCodeBlock - [34..55)::21
+                                            CSharpExpressionLiteral - [34..55)::21 - [Model!.Name![0]!?.Bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K15
+                                                Identifier;[Model];
+                                                Not;[!];
+                                                Dot;[.];
+                                                Identifier;[Name];
+                                                Not;[!];
+                                                LeftBracket;[[];
+                                                IntegerLiteral;[0];
+                                                RightBracket;[]];
+                                                Not;[!];
+                                                QuestionMark;[?];
+                                                Dot;[.];
+                                                Identifier;[Bar];
+                            CSharpStatementLiteral - [55..58)::3 - [ } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                RightBrace;[}];
+                                Whitespace;[ ];
+                        RazorMetaCode - [58..59)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [59..59)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.cspans.txt
new file mode 100644
index 0000000000..9449b5a267
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [7] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.stree.txt
new file mode 100644
index 0000000000..e68796a910
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_DoubleBang_IncompleteBracket.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..7)::7 - [@val!![]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..7)::3 - [!![] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
+            Bang;[!];
+            LeftBracket;[[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.cspans.txt
new file mode 100644
index 0000000000..2bb1fc91e0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.stree.txt
new file mode 100644
index 0000000000..3812fb1a91
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Ending.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..5)::5 - [@val!]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..5)::1 - [!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.cspans.txt
new file mode 100644
index 0000000000..3af48c1d82
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.stree.txt
new file mode 100644
index 0000000000..38fa5297aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_EndingDotedOperator.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..6)::6 - [@val!.]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..6)::2 - [!.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
+            Text;[.];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.cspans.txt
new file mode 100644
index 0000000000..a325887027
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.stree.txt
new file mode 100644
index 0000000000..823306d9ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpression.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..10)::10 - [@val!.more]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [val!.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[more];
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.cspans.txt
new file mode 100644
index 0000000000..0013e6c6e5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.stree.txt
new file mode 100644
index 0000000000..1ce31325bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_FullExpressionWithHtml.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..13)::13 - [@val!.more<p>]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [val!.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[more];
+        MarkupElement - [10..13)::3
+            MarkupStartTag - [10..13)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.cspans.txt
new file mode 100644
index 0000000000..f1cf24e281
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.stree.txt
new file mode 100644
index 0000000000..98b7a5ba3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracket.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..6)::6 - [@val![]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val![] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.cspans.txt
new file mode 100644
index 0000000000..8ecc8ebeba
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [6] )
+Markup span at (6:0,6 [3] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.stree.txt
new file mode 100644
index 0000000000..3d7d9987fc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithHtml.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..9)::9 - [@val![<p>]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val![] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+        MarkupElement - [6..9)::3
+            MarkupStartTag - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.cspans.txt
new file mode 100644
index 0000000000..540927e7d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.stree.txt
new file mode 100644
index 0000000000..05644f8d35
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteBracketWithIdentifier.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..10)::10 - [@val![more]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpImplicitExpression - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..10)::9
+                    CSharpCodeBlock - [1..10)::9
+                        CSharpExpressionLiteral - [1..10)::9 - [val![more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[more];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.cspans.txt
new file mode 100644
index 0000000000..f1cf24e281
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [6] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.diag.txt
new file mode 100644
index 0000000000..6cb7c82385
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.stree.txt
new file mode 100644
index 0000000000..d619447c8d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_IncompleteParenthesis.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..6)::6 - [@val!(]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpImplicitExpression - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..6)::5
+                    CSharpCodeBlock - [1..6)::5
+                        CSharpExpressionLiteral - [1..6)::5 - [val!(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftParenthesis;[(];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.cspans.txt
new file mode 100644
index 0000000000..0611081c69
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] )
+Markup span at (6:0,6 [3] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.stree.txt
new file mode 100644
index 0000000000..e894acb135
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Incomplete_ContinuedHtml.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..9)::9 - [@val!.<p>]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..6)::2 - [!.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
+            Text;[.];
+        MarkupElement - [6..9)::3
+            MarkupStartTag - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.cspans.txt
new file mode 100644
index 0000000000..03ee93c780
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.stree.txt
new file mode 100644
index 0000000000..53cac366d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_InvalidMethodEnding.stree.txt
@@ -0,0 +1,15 @@
+RazorDocument - [0..11)::11 - [@val!.(abc)]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..11)::7 - [!.(abc)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];
+            Text;[.(abc)];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.cspans.txt
new file mode 100644
index 0000000000..5890f7654d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [11] )
+Code span at (1:0,1 [10] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [11] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.diag.txt
new file mode 100644
index 0000000000..34f020b41b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.diag.txt
@@ -0,0 +1 @@
+(1,6): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.stree.txt
new file mode 100644
index 0000000000..c09500e785
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedIncompleteBracket.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..14)::14 - [@val![more.<p>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpImplicitExpression - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..11)::10
+                    CSharpCodeBlock - [1..11)::10
+                        CSharpExpressionLiteral - [1..11)::10 - [val![more.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[more];
+                            Dot;[.];
+        MarkupElement - [11..14)::3
+            MarkupStartTag - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.cspans.txt
new file mode 100644
index 0000000000..b93ef2adc4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
+Markup span at (4:0,4 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Markup span at (11:0,11 [3] ) (Accepts:Any) - Parent: Tag block at (11:0,11 [3] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.stree.txt
new file mode 100644
index 0000000000..fb74f4160d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MixedNullConditional.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..14)::14 - [@val?![more<p>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+        MarkupTextLiteral - [4..11)::7 - [?![more] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            QuestionMark;[?];
+            Bang;[!];
+            LeftBracket;[[];
+            Text;[more];
+        MarkupElement - [11..14)::3
+            MarkupStartTag - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.cspans.txt
new file mode 100644
index 0000000000..92bb2a9863
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.stree.txt
new file mode 100644
index 0000000000..ecec20e374
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..14)::14 - [@val![abc]![2]]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpImplicitExpression - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..14)::13
+                    CSharpCodeBlock - [1..14)::13
+                        CSharpExpressionLiteral - [1..14)::13 - [val![abc]![2]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            Not;[!];
+                            LeftBracket;[[];
+                            IntegerLiteral;[2];
+                            RightBracket;[]];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.cspans.txt
new file mode 100644
index 0000000000..4afe3fa1bc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.stree.txt
new file mode 100644
index 0000000000..17a068adda
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..22)::22 - [@val![abc]!.more![def]]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpImplicitExpression - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..22)::21
+                    CSharpCodeBlock - [1..22)::21
+                        CSharpExpressionLiteral - [1..22)::21 - [val![abc]!.more![def]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[more];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[def];
+                            RightBracket;[]];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.cspans.txt
new file mode 100644
index 0000000000..03103a61c2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [21] )
+Code span at (1:0,1 [20] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.stree.txt
new file mode 100644
index 0000000000..d730107178
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_MultipleMixed2.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..21)::21 - [@val![abc]!.more!.abc]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpImplicitExpression - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..21)::20
+                    CSharpCodeBlock - [1..21)::20
+                        CSharpExpressionLiteral - [1..21)::20 - [val![abc]!.more!.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[more];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[abc];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.cspans.txt
new file mode 100644
index 0000000000..3f873f6ea4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [15] )
+Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [15] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.diag.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.diag.txt
new file mode 100644
index 0000000000..a6129d65d7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.diag.txt
@@ -0,0 +1 @@
+(1,12): Error RZ1027: An opening "[" is missing the corresponding closing "]".
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.stree.txt
new file mode 100644
index 0000000000..0444d87d3f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Multiple_Incomplete.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..15)::15 - [@val![abc]![def]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpImplicitExpression - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..15)::14
+                    CSharpCodeBlock - [1..15)::14
+                        CSharpExpressionLiteral - [1..15)::14 - [val![abc]![def] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            RightBracket;[]];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[def];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.cspans.txt
new file mode 100644
index 0000000000..0b32c2fccc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.stree.txt
new file mode 100644
index 0000000000..cc73e58118
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_Nested.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..20)::20 - [@val![abc!.gef![-1]]]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpImplicitExpression - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..20)::19
+                    CSharpCodeBlock - [1..20)::19
+                        CSharpExpressionLiteral - [1..20)::19 - [val![abc!.gef![-1]]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Identifier;[abc];
+                            Not;[!];
+                            Dot;[.];
+                            Identifier;[gef];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Minus;[-];
+                            IntegerLiteral;[1];
+                            RightBracket;[]];
+                            RightBracket;[]];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.cspans.txt
new file mode 100644
index 0000000000..f78a70b341
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Code span at (2:0,2 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Expression block at (3:0,3 [20] )
+Code span at (4:0,4 [19] ) (Accepts:NonWhitespace) - Parent: Expression block at (3:0,3 [20] )
+Code span at (23:0,23 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
+MetaCode span at (24:0,24 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.stree.txt
new file mode 100644
index 0000000000..691b32aa9f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_NestedCodeBlock.stree.txt
@@ -0,0 +1,39 @@
+RazorDocument - [0..25)::25 - [@{ @val!.Name![0]!?.Bar }]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        CSharpStatementLiteral - [2..3)::1 - [ ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [3..23)::20
+                            CSharpImplicitExpression - [3..23)::20
+                                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [4..23)::19
+                                    CSharpCodeBlock - [4..23)::19
+                                        CSharpExpressionLiteral - [4..23)::19 - [val!.Name![0]!?.Bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                            Identifier;[val];
+                                            Not;[!];
+                                            Dot;[.];
+                                            Identifier;[Name];
+                                            Not;[!];
+                                            LeftBracket;[[];
+                                            IntegerLiteral;[0];
+                                            RightBracket;[]];
+                                            Not;[!];
+                                            QuestionMark;[?];
+                                            Dot;[.];
+                                            Identifier;[Bar];
+                        CSharpStatementLiteral - [23..24)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.cspans.txt
new file mode 100644
index 0000000000..aaa7127537
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [9] )
+Code span at (1:0,1 [8] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [9] )
+Markup span at (9:0,9 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.stree.txt
new file mode 100644
index 0000000000..96a0b18ef2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullForgivenessOperatorImplicitExpression_SingleOperator.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..10)::10 - [@val![-1]!]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpImplicitExpression - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..9)::8
+                    CSharpCodeBlock - [1..9)::8
+                        CSharpExpressionLiteral - [1..9)::8 - [val![-1]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[val];
+                            Not;[!];
+                            LeftBracket;[[];
+                            Minus;[-];
+                            IntegerLiteral;[1];
+                            RightBracket;[]];
+        MarkupTextLiteral - [9..10)::1 - [!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Bang;[!];

From cd8ec7ae660d4f6344769f3f25d329db4cfb478d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 3 Jul 2019 12:49:02 -0700
Subject: [PATCH 201/337] Move [Layout]

This will be coordinated with the equivalent change in the runtime repo.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c82d53eaaa4972ca69d30a364934f1d9c8edb221
---
 .../src/Components/ComponentsApi.cs                           | 2 +-
 .../IntegrationTests/ComponentDirectiveIntegrationTest.cs     | 1 -
 .../ComponentImports/_Imports.codegen.cs                      | 2 +-
 .../ComponentImports/_Imports.ir.txt                          | 2 +-
 .../ComponentImports/_Imports.mappings.txt                    | 4 ++--
 .../ComponentImports/_Imports.codegen.cs                      | 2 +-
 .../ComponentImports/_Imports.ir.txt                          | 2 +-
 .../Microsoft.AspNetCore.Components.netstandard2.0.cs         | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 94d7895fe6..231e09c389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static class LayoutAttribute
         {
-            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Layouts.LayoutAttribute";
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.LayoutAttribute";
         }
 
         public static class InjectAttribute
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
index 6c6ab30a52..8f2bede012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Layouts;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index 7f2797390c..207b21aac7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+    [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
     public class _Imports : System.Object
     {
         #pragma warning disable 219
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
index 9e8b55d433..ee3d779d11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -8,7 +8,7 @@ Document -
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - 
-            IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+            IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
         ClassDeclaration -  - public - _Imports - System.Object - 
             DesignTimeDirective - 
                 DirectiveToken - (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) - MainLayout
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
index ccccb0421a..63e40afa0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
@@ -10,11 +10,11 @@ Generated Location: (448:19,0 [23] )
 
 Source Location: (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor)
 |MainLayout|
-Generated Location: (849:32,0 [10] )
+Generated Location: (841:32,0 [10] )
 |MainLayout|
 
 Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
 |Foo|
-Generated Location: (1300:49,6 [3] )
+Generated Location: (1292:49,6 [3] )
 |Foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index ccfd6dea9f..eacdc0c2e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+    [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
     public class _Imports : System.Object
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
index d3b142e0c3..e2abbca8dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -8,7 +8,7 @@ Document -
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - 
-            IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))]
+            IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
         ClassDeclaration -  - public - _Imports - System.Object - 
             MethodDeclaration -  - protected - void - Execute
                 CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 7f5ede06ff..8bc7eb40a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -656,7 +656,7 @@ namespace Microsoft.AspNetCore.Components.Forms
         internal ValidationStateChangedEventArgs() { }
     }
 }
-namespace Microsoft.AspNetCore.Components.Layouts
+namespace Microsoft.AspNetCore.Components
 {
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
     public partial class LayoutAttribute : System.Attribute

From c76ac7e7b0484e6db90f9ceec62fbc085547bd91 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 10 Jul 2019 13:16:08 -0700
Subject: [PATCH 202/337] Don't pass Analyzers to Razor declaration compilation
 Csc task invocation.

- Without this any diagnostics from Analyzers will be doubly reported. One for the declaration compilation and one for the view compilation.

aspnet/AspNetCoredotnet/aspnetcore-tooling#8825
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6d115d460b9a45c1c75f46d49693acb2a73947c5
---
 .../netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 8e5255848c..18a81a5046 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -191,7 +191,6 @@ Copyright (c) .NET Foundation. All rights reserved.
          AddModules="@(AddModules)"
          AdditionalFiles="@(AdditionalFiles)"
          AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
-         Analyzers="@(Analyzer)"
          ApplicationConfiguration="$(AppConfigForCompiler)"
          BaseAddress="$(BaseAddress)"
          CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"

From 810e32ffc4a12b3f41de145585583cf8edcad548 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 26 Jun 2019 17:08:54 -0700
Subject: [PATCH 203/337] Update tests to specify public [Parameter]

- Updated existing tests to use `public` accessibility for parameters. As part of this also updated baselines.
- We now recommend that `[Parameter]`'s should be `public`. In the future this will be a requirement.

aspnet/AspNetCoredotnet/aspnetcore-tooling#8825
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2ceb597f82395e02e93a73073a6d74c6155fc7a8
---
 .../ComponentChildContentIntegrationTest.cs   |  16 +-
 .../ComponentCodeGenerationTestBase.cs        | 231 +++++++++---------
 .../ComponentDirectiveIntegrationTest.cs      |   2 +-
 .../ComponentDiscoveryIntegrationTest.cs      |   4 +-
 .../ComponentGenericTypeIntegrationTest.cs    |  10 +-
 .../IntegrationTests/ComponentTypingTest.cs   |  12 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |  16 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |  16 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../BindTagHelperDescriptorProviderTest.cs    |  10 +-
 ...omponentTagHelperDescriptorProviderTest.cs |  58 ++---
 .../ComponentLibrary/GenericComponent.razor   |   4 +-
 27 files changed, 232 insertions(+), 231 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
index ee4c92fcb7..15c2d4de9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
@@ -23,7 +23,7 @@ namespace Test
         }
 
         [Parameter]
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment ChildContent { get; set; }
     }
 }
 ");
@@ -41,10 +41,10 @@ namespace Test
         }
 
         [Parameter]
-        RenderFragment<string> ChildContent { get; set; }
+        public RenderFragment<string> ChildContent { get; set; }
 
         [Parameter]
-        string Value { get; set; }
+        public string Value { get; set; }
     }
 }
 ");
@@ -64,19 +64,19 @@ namespace Test
         }
 
         [Parameter]
-        string Name { get; set; }
+        public string Name { get; set; }
 
         [Parameter]
-        RenderFragment<string> Header { get; set; }
+        public RenderFragment<string> Header { get; set; }
 
         [Parameter]
-        RenderFragment<string> ChildContent { get; set; }
+        public RenderFragment<string> ChildContent { get; set; }
 
         [Parameter]
-        RenderFragment Footer { get; set; }
+        public RenderFragment Footer { get; set; }
 
         [Parameter]
-        string Value { get; set; }
+        public string Value { get; set; }
     }
 }
 ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 471322b2d3..cd2a441163 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -174,10 +174,10 @@ namespace Test
 
     public class MyComponent : ComponentBase
     {
-        [Parameter] int IntProperty { get; set; }
-        [Parameter] bool BoolProperty { get; set; }
-        [Parameter] string StringProperty { get; set; }
-        [Parameter] SomeType ObjectProperty { get; set; }
+        [Parameter] public int IntProperty { get; set; }
+        [Parameter] public bool BoolProperty { get; set; }
+        [Parameter] public string StringProperty { get; set; }
+        [Parameter] public SomeType ObjectProperty { get; set; }
     }
 }
 "));
@@ -215,9 +215,9 @@ namespace Test
     </p>
 }
 @code {
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 }");
 
             // Assert
@@ -238,7 +238,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        string StringProperty { get; set; }
+        public string StringProperty { get; set; }
     }
 }
 "));
@@ -289,7 +289,7 @@ namespace Test
 {
     public class CoolnessMeter : ComponentBase
     {
-        [Parameter] private int Coolness { get; set; }
+        [Parameter] public int Coolness { get; set; }
     }
 }
 "));
@@ -415,10 +415,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        Action<int> ValueChanged { get; set; }
+        public Action<int> ValueChanged { get; set; }
     }
 }"));
 
@@ -448,10 +448,10 @@ namespace Test
     public class InputText : ComponentBase
     {
         [Parameter]
-        string Value { get; set; }
+        public string Value { get; set; }
 
         [Parameter]
-        Action<string> ValueChanged { get; set; }
+        public Action<string> ValueChanged { get; set; }
     }
 }"));
 
@@ -495,10 +495,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        Action<int> ValueChanged { get; set; }
+        public Action<int> ValueChanged { get; set; }
     }
 }"));
 
@@ -534,10 +534,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        EventCallback<int> ValueChanged { get; set; }
+        public EventCallback<int> ValueChanged { get; set; }
     }
 }"));
 
@@ -567,10 +567,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        EventCallback<int> ValueChanged { get; set; }
+        public EventCallback<int> ValueChanged { get; set; }
     }
 }"));
 
@@ -634,10 +634,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        Action<int> OnChanged { get; set; }
+        public Action<int> OnChanged { get; set; }
     }
 }"));
             // Act
@@ -694,13 +694,13 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        Action<int> ValueChanged { get; set; }
+        public Action<int> ValueChanged { get; set; }
 
         [Parameter]
-        Expression<Func<int>> ValueExpression { get; set; }
+        public Expression<Func<int>> ValueExpression { get; set; }
     }
 }"));
 
@@ -731,13 +731,13 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        EventCallback<int> ValueChanged { get; set; }
+        public EventCallback<int> ValueChanged { get; set; }
 
         [Parameter]
-        Expression<Func<int>> ValueExpression { get; set; }
+        public Expression<Func<int>> ValueExpression { get; set; }
     }
 }"));
 
@@ -768,13 +768,13 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        int Value { get; set; }
+        public int Value { get; set; }
 
         [Parameter]
-        Action<int> ValueChanged { get; set; }
+        public Action<int> ValueChanged { get; set; }
 
         [Parameter]
-        Expression<Func<string>> ValueExpression { get; set; }
+        public Expression<Func<string>> ValueExpression { get; set; }
     }
 }"));
 
@@ -807,13 +807,13 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        T SomeParam { get; set; }
+        public T SomeParam { get; set; }
 
         [Parameter]
-        Action<T> SomeParamChanged { get; set; }
+        public Action<T> SomeParamChanged { get; set; }
 
         [Parameter]
-        Expression<Func<T>> SomeParamExpression { get; set; }
+        public Expression<Func<T>> SomeParamExpression { get; set; }
     }
 }"));
 
@@ -844,13 +844,13 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        T SomeParam { get; set; }
+        public T SomeParam { get; set; }
 
         [Parameter]
-        EventCallback<T> SomeParamChanged { get; set; }
+        public EventCallback<T> SomeParamChanged { get; set; }
 
         [Parameter]
-        Expression<Func<T>> SomeParamExpression { get; set; }
+        public Expression<Func<T>> SomeParamExpression { get; set; }
     }
 }"));
 
@@ -1372,10 +1372,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        string MyAttr { get; set; }
+        public string MyAttr { get; set; }
 
         [Parameter]
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment ChildContent { get; set; }
     }
 }
 "));
@@ -1402,10 +1402,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        string MyAttr { get; set; }
+        public string MyAttr { get; set; }
 
         [Parameter]
-        RenderFragment<string> ChildContent { get; set; }
+        public RenderFragment<string> ChildContent { get; set; }
     }
 }
 "));
@@ -1433,10 +1433,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        string MyAttr { get; set; }
+        public string MyAttr { get; set; }
 
         [Parameter]
-        RenderFragment<string> ChildContent { get; set; }
+        public RenderFragment<string> ChildContent { get; set; }
     }
 }
 "));
@@ -1467,10 +1467,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        string MyAttr { get; set; }
+        public string MyAttr { get; set; }
 
         [Parameter]
-        RenderFragment<string> ChildContent { get; set; }
+        public RenderFragment<string> ChildContent { get; set; }
     }
 }
 "));
@@ -1501,7 +1501,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment ChildContent { get; set; }
     }
 }
 "));
@@ -1528,7 +1528,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment ChildContent { get; set; }
     }
 }
 "));
@@ -1555,7 +1555,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment<string> ChildContent { get; set; }
+        public RenderFragment<string> ChildContent { get; set; }
     }
 }
 "));
@@ -1582,10 +1582,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment Header { get; set; }
+        public RenderFragment Header { get; set; }
 
         [Parameter]
-        RenderFragment Footer { get; set; }
+        public RenderFragment Footer { get; set; }
     }
 }
 "));
@@ -1615,12 +1615,13 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment<string> Header { get; set; }
-
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment<string> Header { get; set; }
 
         [Parameter]
-        RenderFragment Footer { get; set; }
+        public RenderFragment ChildContent { get; set; }
+
+        [Parameter]
+        public RenderFragment Footer { get; set; }
     }
 }
 "));
@@ -1650,13 +1651,13 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment<string> Header { get; set; }
+        public RenderFragment<string> Header { get; set; }
 
         [Parameter]
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment ChildContent { get; set; }
 
         [Parameter]
-        RenderFragment Footer { get; set; }
+        public RenderFragment Footer { get; set; }
     }
 }
 "));
@@ -1849,7 +1850,7 @@ namespace Test
     public class HeaderComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment Header { get; set; }
+        public RenderFragment Header { get; set; }
     }
 }
 
@@ -1858,7 +1859,7 @@ namespace AnotherTest
     public class FooterComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment<DateTime> Footer { get; set; }
+        public RenderFragment<DateTime> Footer { get; set; }
     }
 }
 "));
@@ -1900,7 +1901,7 @@ namespace Test
     public class HeaderComponent : ComponentBase
     {
         [Parameter]
-        string Header { get; set; }
+        public string Header { get; set; }
     }
 }
 
@@ -1909,7 +1910,7 @@ namespace AnotherTest
     public class FooterComponent : ComponentBase
     {
         [Parameter]
-        string Footer { get; set; }
+        public string Footer { get; set; }
     }
 }
 "));
@@ -1948,7 +1949,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback OnClick { get; set; }
+        public EventCallback OnClick { get; set; }
     }
 }
 "));
@@ -1983,7 +1984,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2018,7 +2019,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback OnClick { get; set; }
+        public EventCallback OnClick { get; set; }
     }
 }
 "));
@@ -2053,7 +2054,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback OnClick { get; set; }
+        public EventCallback OnClick { get; set; }
     }
 }
 "));
@@ -2088,7 +2089,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback OnClick { get; set; }
+        public EventCallback OnClick { get; set; }
     }
 }
 "));
@@ -2124,7 +2125,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback OnClick { get; set; }
+        public EventCallback OnClick { get; set; }
     }
 }
 "));
@@ -2160,7 +2161,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2195,7 +2196,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2230,7 +2231,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2266,7 +2267,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2302,7 +2303,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2346,7 +2347,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        Action<UIEventArgs> OnClick { get; set; }
+        public Action<UIEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2413,7 +2414,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        Action<UIEventArgs> OnClick { get; set; }
+        public Action<UIEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2664,7 +2665,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -2690,7 +2691,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -2716,7 +2717,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -2744,7 +2745,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -2770,7 +2771,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -2798,10 +2799,10 @@ namespace Test
     public class MyComponent<TItem> : ComponentBase
     {
         [Parameter]
-        TItem Item { get; set; }
+        public TItem Item { get; set; }
 
         [Parameter]
-        Action<TItem> ItemChanged { get; set; }
+        public Action<TItem> ItemChanged { get; set; }
     }
 }
 "));
@@ -2832,10 +2833,10 @@ namespace Test
     public class MyComponent<TItem> : ComponentBase
     {
         [Parameter]
-        TItem Item { get; set; }
+        public TItem Item { get; set; }
 
         [Parameter]
-        Action<TItem> ItemChanged { get; set; }
+        public Action<TItem> ItemChanged { get; set; }
     }
 }
 "));
@@ -2895,7 +2896,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Value { get; set; }
+        [Parameter] public TItem Value { get; set; }
     }
 }
 "));
@@ -2924,9 +2925,9 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
 
-        [Parameter] RenderFragment<TItem> ChildContent { get; set; }
+        [Parameter] public RenderFragment<TItem> ChildContent { get; set; }
     }
 }
 "));
@@ -2954,9 +2955,9 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
 
-        [Parameter] RenderFragment<TItem> ChildContent { get; set; }
+        [Parameter] public RenderFragment<TItem> ChildContent { get; set; }
     }
 }
 "));
@@ -2984,11 +2985,11 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
 
-        [Parameter] RenderFragment<TItem> GenericFragment { get; set; }
+        [Parameter] public RenderFragment<TItem> GenericFragment { get; set; }
 
-        [Parameter] RenderFragment<int> IntFragment { get; set; }
+        [Parameter] public RenderFragment<int> IntFragment { get; set; }
     }
 }
 "));
@@ -3017,9 +3018,9 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
 
-        [Parameter] RenderFragment<TItem> ChildContent { get; set; }
+        [Parameter] public RenderFragment<TItem> ChildContent { get; set; }
     }
 }
 "));
@@ -3047,11 +3048,11 @@ namespace Test
 {
     public class MyComponent<TItem1, TItem2> : ComponentBase
     {
-        [Parameter] TItem1 Item { get; set; }
+        [Parameter] public TItem1 Item { get; set; }
 
-        [Parameter] RenderFragment<TItem1> ChildContent { get; set; }
+        [Parameter] public RenderFragment<TItem1> ChildContent { get; set; }
 
-        [Parameter] RenderFragment<Context> AnotherChildContent { get; set; }
+        [Parameter] public RenderFragment<Context> AnotherChildContent { get; set; }
 
         public class Context
         {
@@ -3088,13 +3089,13 @@ namespace Test
 {
     public class MyComponent<TItem1, TItem2> : ComponentBase
     {
-        [Parameter] TItem1 Item { get; set; }
+        [Parameter] public TItem1 Item { get; set; }
 
-        [Parameter] List<TItem2> Items { get; set; }
+        [Parameter] public List<TItem2> Items { get; set; }
 
-        [Parameter] RenderFragment<TItem1> ChildContent { get; set; }
+        [Parameter] public RenderFragment<TItem1> ChildContent { get; set; }
 
-        [Parameter] RenderFragment<Context> AnotherChildContent { get; set; }
+        [Parameter] public RenderFragment<Context> AnotherChildContent { get; set; }
 
         public class Context
         {
@@ -3130,7 +3131,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -3161,7 +3162,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -3192,7 +3193,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -3253,7 +3254,7 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
+        [Parameter] public TItem Item { get; set; }
     }
 }
 "));
@@ -3318,8 +3319,8 @@ namespace Test
 {
     public class MyComponent<TItem> : ComponentBase
     {
-        [Parameter] TItem Item { get; set; }
-        [Parameter] MyClass Foo { get; set; }
+        [Parameter] public TItem Item { get; set; }
+        [Parameter] public MyClass Foo { get; set; }
     }
 }
 
@@ -3379,7 +3380,7 @@ namespace Test.Shared
 @code {
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     }
 ");
 
@@ -3606,7 +3607,7 @@ namespace Test
 {
     public class MyComponent<T> : ComponentBase
     {
-        [Parameter] T Value { get; set;}
+        [Parameter] public T Value { get; set;}
     }
 }
 "));
@@ -3651,7 +3652,7 @@ namespace Test
 <input type=""text"" data-slider-min=""@Min"" @ref=""@_element"" />
 
 @code {
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     }
 ");
 
@@ -3874,7 +3875,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] string Name { get; set; }
+        [Parameter] public string Name { get; set; }
     }
 }
 "));
@@ -3909,7 +3910,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] string Name { get; set; }
+        [Parameter] public string Name { get; set; }
     }
 }
 "));
@@ -3947,7 +3948,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] RenderFragment Template { get; set; }
+        [Parameter] public RenderFragment Template { get; set; }
     }
 }
 "));
@@ -3975,7 +3976,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] RenderFragment<Person> PersonTemplate { get; set; }
+        [Parameter] public RenderFragment<Person> PersonTemplate { get; set; }
     }
 
     public class Person
@@ -4008,7 +4009,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] RenderFragment<Context> Template { get; set; }
+        [Parameter] public RenderFragment<Context> Template { get; set; }
     }
 
     public class Context
@@ -4742,7 +4743,7 @@ namespace Test
 {
     public class SurveyPrompt : ComponentBase
     {
-        [Parameter] private string Title { get; set; }
+        [Parameter] public string Title { get; set; }
     }
 }
 "));
@@ -4780,7 +4781,7 @@ namespace Test
 {
     public class SurveyPrompt : ComponentBase
     {
-        [Parameter] private string Title { get; set; }
+        [Parameter] public string Title { get; set; }
     }
 }
 "));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
index 8f2bede012..111cd7978e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
@@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         public class TestLayout : IComponent
         {
             [Parameter]
-            RenderFragment Body { get; set; }
+            public RenderFragment Body { get; set; }
 
             public void Configure(RenderHandle renderHandle)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs
index cbabebaade..3743979a0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs
@@ -91,7 +91,7 @@ namespace Test.AnotherNamespace
             var result = CompileToCSharp("UniqueName.cshtml", @"
 @typeparam TItem
 @functions {
-    [Parameter] TItem Item { get; set; }
+    [Parameter] public TItem Item { get; set; }
 }");
 
             // Assert
@@ -110,7 +110,7 @@ namespace Test.AnotherNamespace
 @typeparam TItem2
 @typeparam TItem3
 @functions {
-    [Parameter] TItem1 Item { get; set; }
+    [Parameter] public TItem1 Item { get; set; }
 }");
 
             // Assert
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
index bb73fe42be..c81c766cfc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
@@ -39,10 +39,10 @@ namespace Test
         }
 
         [Parameter]
-        List<TItem> Items { get; set; }
+        public List<TItem> Items { get; set; }
 
         [Parameter]
-        RenderFragment<Context> ChildContent { get; set; }
+        public RenderFragment<Context> ChildContent { get; set; }
 
         public class Context
         {
@@ -68,13 +68,13 @@ namespace Test
         }
 
         [Parameter]
-        TItem1 Item1 { get; set; }
+        public TItem1 Item1 { get; set; }
 
         [Parameter]
-        TItem2 Item2 { get; set; }
+        public TItem2 Item2 { get; set; }
 
         [Parameter]
-        TItem3 Item3 { get; set; }
+        public TItem3 Item3 { get; set; }
     }
 }
 ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs
index 092d6e7595..b3b8fc19e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTypingTest.cs
@@ -31,9 +31,9 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] int Value { get; set; }
-        [Parameter] Action<int> ValueChanged { get; set; }
-        [Parameter] string AnotherValue { get; set; }
+        [Parameter] public int Value { get; set; }
+        [Parameter] public Action<int> ValueChanged { get; set; }
+        [Parameter] public string AnotherValue { get; set; }
     }
 
     public class ModelState
@@ -105,9 +105,9 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] int Value { get; set; }
-        [Parameter] Action<int> ValueChanged { get; set; }
-        [Parameter] string AnotherValue { get; set; }
+        [Parameter] public int Value { get; set; }
+        [Parameter] public Action<int> ValueChanged { get; set; }
+        [Parameter] public string AnotherValue { get; set; }
     }
 
     public class ModelState
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 999fd09999..c65f250449 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -75,9 +75,9 @@ __o = ChildContent(item2);
 #nullable restore
 #line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index cca19b4e53..493a563308 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -38,5 +38,5 @@ Document -
                     IntermediateToken - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n}
                 HtmlContent - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
+            CSharpCode - (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] public TItem1 Item1 { get; set; }\n    [Parameter] public List<TItem2> Items2 { get; set; }\n    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index f88eb29669..913d618ec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -34,16 +34,16 @@ Generated Location: (1729:66,8 [3] )
 |
 }|
 
-Source Location: (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1911:76,7 [164] )
+Generated Location: (1911:76,7 [185] )
 |
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 63abf53307..778c8ab8c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ namespace Test
        
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index 8191223541..d3d4ec8299 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                     SetKey - (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
                 HtmlContent - (63:0,63 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (63:0,63 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (187:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (187:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
+                HtmlContent - (184:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (184:6,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] public int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 6018e35989..4849808db0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -8,16 +8,16 @@ Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1118:34,49 [10] )
 |someObject|
 
-Source Location: (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
-Generated Location: (1322:44,7 [112] )
+Generated Location: (1322:44,7 [109] )
 |
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index a65ff0c394..e535ca1ae9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -46,7 +46,7 @@ namespace Test
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 59d4ed931f..5ebf20fbf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -25,7 +25,7 @@ Document -
                     ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
                 HtmlContent - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (132:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (132:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] protected int Min { get; set; }\n    
+                HtmlContent - (129:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (129:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] public int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 13699c88b3..e5bbc4a62f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -8,12 +8,12 @@ Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1319:38,49 [8] )
 |_element|
 
-Source Location: (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
-Generated Location: (1560:47,7 [59] )
+Generated Location: (1560:47,7 [56] )
 |
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 3091495c95..37ca60c4a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -55,9 +55,9 @@ using Microsoft.AspNetCore.Components;
 #nullable restore
 #line 12 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index e0d4be202a..d596262eab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -24,5 +24,5 @@ Document -
                     IntermediateToken - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n
-            CSharpCode - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] TItem1 Item1 { get; set; }\n    [Parameter] List<TItem2> Items2 { get; set; }\n    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }\n
+            CSharpCode - (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    [Parameter] public TItem1 Item1 { get; set; }\n    [Parameter] public List<TItem2> Items2 { get; set; }\n    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 256b5f85a7..0bba3fcf95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -14,16 +14,16 @@ Generated Location: (1407:51,0 [3] )
 |}
 |
 
-Source Location: (188:11,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1587:60,7 [164] )
+Generated Location: (1587:60,7 [185] )
 |
-    [Parameter] TItem1 Item1 { get; set; }
-    [Parameter] List<TItem2> Items2 { get; set; }
-    [Parameter] RenderFragment<TItem2> ChildContent { get; set; }
+    [Parameter] public TItem1 Item1 { get; set; }
+    [Parameter] public List<TItem2> Items2 { get; set; }
+    [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index c8a58ea342..74604f7ab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -41,7 +41,7 @@ namespace Test
        
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index cbe4192969..c84161056a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -15,5 +15,5 @@ Document -
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
                     SetKey - (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml) - someObject
-            CSharpCode - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] protected int Min { get; set; }\n    
+            CSharpCode - (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private object someObject = new object();\n\n        [Parameter] public int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 8bc97b2749..0a09d51e61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -3,16 +3,16 @@ Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (988:29,49 [10] )
 |someObject|
 
-Source Location: (74:2,7 [112] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
-Generated Location: (1229:40,7 [112] )
+Generated Location: (1229:40,7 [109] )
 |
         private object someObject = new object();
 
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index d039bfcdce..85402811d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -45,7 +45,7 @@ namespace Test
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 8006fc59eb..cc1e4700ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -16,5 +16,5 @@ Document -
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
                     ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
-            CSharpCode - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] protected int Min { get; set; }\n    
+            CSharpCode - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] public int Min { get; set; }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 01521d24fe..e119fa8929 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -3,12 +3,12 @@ Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1255:34,49 [8] )
 |_element|
 
-Source Location: (72:2,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
-Generated Location: (1520:46,7 [59] )
+Generated Location: (1520:46,7 [56] )
 |
-        [Parameter] protected int Min { get; set; }
+        [Parameter] public int Min { get; set; }
     |
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index dc8b6605ba..825326d6f8 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -32,13 +32,13 @@ namespace Test
         }
 
         [Parameter]
-        string MyProperty { get; set; }
+        public string MyProperty { get; set; }
 
         [Parameter]
-        Action<string> MyPropertyChanged { get; set; }
+        public Action<string> MyPropertyChanged { get; set; }
 
         [Parameter]
-        Expression<Func<string>> MyPropertyExpression { get; set; }
+        public Expression<Func<string>> MyPropertyExpression { get; set; }
     }
 }
 "));
@@ -156,10 +156,10 @@ namespace Test
         }
 
         [Parameter]
-        string MyProperty { get; set; }
+        public string MyProperty { get; set; }
 
         [Parameter]
-        EventCallback<string> MyPropertyChanged { get; set; }
+        public EventCallback<string> MyPropertyChanged { get; set; }
     }
 }
 "));
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 9c29483766..f5325fdb05 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -31,7 +31,7 @@ namespace Test
         }
 
         [Parameter]
-        private string MyProperty { get; set; }
+        public string MyProperty { get; set; }
     }
 }
 
@@ -151,7 +151,7 @@ namespace Test
         }
 
         [Parameter]
-        private string MyProperty { get; set; }
+        public string MyProperty { get; set; }
     }
 }
 
@@ -215,7 +215,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        string MyProperty { get; set; }
+        public string MyProperty { get; set; }
     }
 }
 
@@ -257,7 +257,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        bool MyProperty { get; set; }
+        public bool MyProperty { get; set; }
     }
 }
 
@@ -310,7 +310,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        MyEnum MyProperty { get; set; }
+        public MyEnum MyProperty { get; set; }
     }
 }
 
@@ -357,7 +357,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        T MyProperty { get; set; }
+        public T MyProperty { get; set; }
     }
 }
 
@@ -415,13 +415,13 @@ namespace Test
     public class MyComponent<T, U, V> : ComponentBase
     {
         [Parameter]
-        T MyProperty1 { get; set; }
+        public T MyProperty1 { get; set; }
 
         [Parameter]
-        U MyProperty2 { get; set; }
+        public U MyProperty2 { get; set; }
 
         [Parameter]
-        V MyProperty3 { get; set; }
+        public V MyProperty3 { get; set; }
     }
 }
 
@@ -496,7 +496,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        Action<UIMouseEventArgs> OnClick { get; set; }
+        public Action<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 
@@ -546,7 +546,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        Action<T> OnClick { get; set; }
+        public Action<T> OnClick { get; set; }
     }
 }
 
@@ -608,7 +608,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback OnClick { get; set; }
+        public EventCallback OnClick { get; set; }
     }
 }
 
@@ -658,7 +658,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
     }
 }
 
@@ -713,7 +713,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        EventCallback<T> OnClick { get; set; }
+        public EventCallback<T> OnClick { get; set; }
     }
 }
 
@@ -776,7 +776,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment ChildContent2 { get; set; }
+        public RenderFragment ChildContent2 { get; set; }
     }
 }
 
@@ -833,7 +833,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment<string> ChildContent2 { get; set; }
+        public RenderFragment<string> ChildContent2 { get; set; }
     }
 }
 
@@ -905,10 +905,10 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment<string> ChildContent2 { get; set; }
+        public RenderFragment<string> ChildContent2 { get; set; }
 
         [Parameter]
-        string Context { get; set; }
+        public string Context { get; set; }
     }
 }
 
@@ -980,7 +980,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        RenderFragment<T> ChildContent2 { get; set; }
+        public RenderFragment<T> ChildContent2 { get; set; }
     }
 }
 
@@ -1062,7 +1062,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        RenderFragment<List<string>> ChildContent2 { get; set; }
+        public RenderFragment<List<string>> ChildContent2 { get; set; }
     }
 }
 
@@ -1144,7 +1144,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        RenderFragment<List<T>> ChildContent2 { get; set; }
+        public RenderFragment<List<T>> ChildContent2 { get; set; }
     }
 }
 
@@ -1225,7 +1225,7 @@ namespace Test
     public class MyComponent<T> : ComponentBase
     {
         [Parameter]
-        RenderFragment<Context> ChildContent2 { get; set; }
+        public RenderFragment<Context> ChildContent2 { get; set; }
 
         public class Context
         {
@@ -1310,13 +1310,13 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        RenderFragment ChildContent { get; set; }
+        public RenderFragment ChildContent { get; set; }
 
         [Parameter]
-        RenderFragment<string> Header { get; set; }
+        public RenderFragment<string> Header { get; set; }
 
         [Parameter]
-        RenderFragment<string> Footer { get; set; }
+        public RenderFragment<string> Footer { get; set; }
     }
 }
 
@@ -1388,21 +1388,21 @@ namespace Test
     public abstract class MyBase : ComponentBase
     {
         [Parameter]
-        protected string Hidden { get; set; }
+        public string Hidden { get; set; }
     }
 
     public class MyComponent : MyBase
     {
         [Parameter]
-        string NoSetter { get; }
+        public string NoSetter { get; }
 
         [Parameter]
-        static string StaticProperty { get; set; }
+        public static string StaticProperty { get; set; }
 
         public string NoParameterAttribute { get; set; }
 
         // No attribute here, hides base-class property of the same name.
-        protected new int Hidden { get; set; }
+        public new int Hidden { get; set; }
 
         public string this[int i]
         {
diff --git a/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor b/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
index 5037fef5c0..cccb68d017 100644
--- a/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
+++ b/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
@@ -3,6 +3,6 @@
 <h1>@Title - @Item</h1>
 
 @functions {
-    [Parameter] TItem Item { get; set; }
-    [Parameter] string Title { get; set; }
+    [Parameter] public TItem Item { get; set; }
+    [Parameter] public string Title { get; set; }
 }
\ No newline at end of file

From 7aeaa72f258d65d1d96a562dd8422da9a52d11fe Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 15 Jul 2019 17:07:27 -0700
Subject: [PATCH 204/337] Modify tag helper infrastructure to configure case
 sensitivity (dotnet/aspnetcore-tooling#793)

* Modify tag helper infrastructure to configure case sensitivity

* Cleanup and added more tests

* More cleanup and added necessary diagnostics

* More feedback

* Added more tests
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/20b828675153a578f206ec462669f11f4222b9e1
---
 ...ComponentTagHelperDescriptorFactoryTest.cs |   6 +-
 ...omponentTagHelperDescriptorProviderTest.cs |   2 +-
 ...ComponentTagHelperDescriptorFactoryTest.cs |  10 +-
 ...omponentTagHelperDescriptorProviderTest.cs |   2 +-
 ...ComponentTagHelperDescriptorFactoryTest.cs |  10 +-
 ...omponentTagHelperDescriptorProviderTest.cs |   5 +-
 .../src/AllowedChildTagDescriptorComparer.cs  |  26 +--
 .../src/BoundAttributeDescriptor.cs           |   2 +
 .../src/BoundAttributeDescriptorComparer.cs   |  28 +--
 .../src/BoundAttributeParameterDescriptor.cs  |   2 +
 ...undAttributeParameterDescriptorComparer.cs |  25 +--
 .../Components/ComponentDiagnosticFactory.cs  |  43 ++++
 .../ComponentDocumentClassifierPass.cs        |   9 +-
 .../src/DefaultBoundAttributeDescriptor.cs    |   2 +
 .../DefaultBoundAttributeDescriptorBuilder.cs |   5 +-
 ...efaultBoundAttributeParameterDescriptor.cs |   2 +
 ...oundAttributeParameterDescriptorBuilder.cs |   4 +-
 ...faultRazorIntermediateNodeLoweringPhase.cs |  28 ++-
 .../src/DefaultRequiredAttributeDescriptor.cs |   2 +
 ...faultRequiredAttributeDescriptorBuilder.cs |   9 +
 .../src/DefaultTagHelperDescriptor.cs         |   2 +
 .../src/DefaultTagHelperDescriptorBuilder.cs  |   5 +-
 .../src/DefaultTagMatchingRuleDescriptor.cs   |   2 +
 ...DefaultTagMatchingRuleDescriptorBuilder.cs |  10 +-
 .../src/RequiredAttributeDescriptor.cs        |   2 +
 .../RequiredAttributeDescriptorComparer.cs    |  31 +--
 .../src/TagHelperDescriptor.cs                |   2 +
 .../src/TagHelperDescriptorBuilder.cs         |   2 +
 .../src/TagHelperDescriptorComparer.cs        |  60 ++----
 .../src/TagHelperMatchingConventions.cs       |  15 +-
 .../src/TagMatchingRuleDescriptor.cs          |   2 +
 .../src/TagMatchingRuleDescriptorComparer.cs  |  34 +---
 ...tRequiredAttributeDescriptorBuilderTest.cs |   8 +-
 .../DefaultTagHelperOptimizationPassTest.cs   |   6 +-
 .../ComponentChildContentIntegrationTest.cs   |   6 +-
 .../ComponentCodeGenerationTestBase.cs        | 188 +++++++++++++++++-
 ...ComponentDiagnosticRazorIntegrationTest.cs |  76 +++++++
 .../ComponentTemplateIntegrationTest.cs       |  12 +-
 .../Legacy/TagHelperParseTreeRewriterTest.cs  |  52 +++++
 .../test/TagHelperBinderTest.cs               |  62 +++++-
 .../test/TagHelperMatchingConventionsTest.cs  |   4 +-
 .../TestComponent.codegen.cs                  |  44 ++++
 .../TestComponent.ir.txt                      |  24 +++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.codegen.cs                  |  57 ++++++
 .../TestComponent.ir.txt                      |  28 +++
 .../TestComponent.mappings.txt                |   5 +
 .../TestComponent.codegen.cs                  |  65 ++++++
 .../TestComponent.ir.txt                      |  24 +++
 .../TestComponent.mappings.txt                |  10 +
 .../TestComponent.codegen.cs                  |  45 +++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  44 ++++
 .../TestComponent.mappings.txt                |  14 ++
 .../TestComponent.codegen.cs                  |  27 +++
 .../TestComponent.ir.txt                      |  20 ++
 .../TestComponent.codegen.cs                  |  35 ++++
 .../TestComponent.ir.txt                      |  34 ++++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  27 +++
 .../TestComponent.ir.txt                      |  28 +++
 .../TestComponent.codegen.cs                  |  35 ++++
 .../TestComponent.ir.txt                      |  34 ++++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  36 ++++
 .../TestComponent.ir.txt                      |  24 +++
 .../TestComponent.mappings.txt                |  11 +
 .../TestComponent.codegen.cs                  |  39 ++++
 .../TestComponent.ir.txt                      |  15 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.codegen.cs                  |  35 ++++
 .../TestComponent.ir.txt                      |  17 ++
 .../TestComponent.codegen.cs                  |  43 ++++
 .../TestComponent.ir.txt                      |  17 ++
 .../TestComponent.codegen.cs                  |  47 +++++
 .../TestComponent.diagnostics.txt             |   1 +
 .../TestComponent.ir.txt                      |  33 +++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  21 ++
 .../TestComponent.ir.txt                      |  10 +
 .../TestComponent.codegen.cs                  |  29 +++
 .../TestComponent.ir.txt                      |  12 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  21 ++
 .../TestComponent.ir.txt                      |  10 +
 .../TestComponent.codegen.cs                  |  29 +++
 .../TestComponent.ir.txt                      |  12 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  30 +++
 .../TestComponent.ir.txt                      |  12 ++
 .../TestComponent.mappings.txt                |  11 +
 ...seSensitiveTagHelpersCorrectly1.cspans.txt |   1 +
 ...aseSensitiveTagHelpersCorrectly1.stree.txt |  31 +++
 ...seSensitiveTagHelpersCorrectly1.tspans.txt |   1 +
 ...seSensitiveTagHelpersCorrectly2.cspans.txt |   1 +
 ...aseSensitiveTagHelpersCorrectly2.stree.txt |  31 +++
 ...seSensitiveTagHelpersCorrectly2.tspans.txt |   1 +
 ...seSensitiveTagHelpersCorrectly3.cspans.txt |   1 +
 ...aseSensitiveTagHelpersCorrectly3.stree.txt |  31 +++
 ...seSensitiveTagHelpersCorrectly3.tspans.txt |   1 +
 ...seSensitiveTagHelpersCorrectly4.cspans.txt |   6 +
 ...aseSensitiveTagHelpersCorrectly4.stree.txt |  26 +++
 ...seSensitiveTagHelpersCorrectly5.cspans.txt |   6 +
 ...aseSensitiveTagHelpersCorrectly5.stree.txt |  26 +++
 .../src/BindTagHelperDescriptorProvider.cs    |   3 +
 .../ComponentTagHelperDescriptorProvider.cs   |  12 +-
 ...EventHandlerTagHelperDescriptorProvider.cs |   1 +
 .../src/KeyTagHelperDescriptorProvider.cs     |   1 +
 .../src/RefTagHelperDescriptorProvider.cs     |   1 +
 .../src/SplatTagHelperDescriptorProvider.cs   |   1 +
 .../BaseTagHelperDescriptorProviderTest.cs    |   1 +
 .../BindTagHelperDescriptorProviderTest.cs    |   4 +
 ...omponentTagHelperDescriptorProviderTest.cs |   2 +
 .../DefaultTagHelperDescriptorFactoryTest.cs  |  56 +++---
 ...tHandlerTagHelperDescriptorProviderTest.cs |   1 +
 .../KeyTagHelperDescriptorProviderTest.cs     |   1 +
 .../RefTagHelperDescriptorProviderTest.cs     |   1 +
 .../SplatTagHelperDescriptorProviderTest.cs   |   1 +
 .../Intermediate/IntermediateNodeAssert.cs    |   2 +-
 ...estTagHelperDescriptorBuilderExtensions.cs |  12 ++
 ...etCore.Components.netstandard2.0.Manual.cs |  36 ++++
 .../ComponentApp/Components/App.razor         |   2 +-
 .../ComponentApp/Components/_Imports.razor    |   1 +
 127 files changed, 2052 insertions(+), 247 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.tspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
index d88f379542..491a2faaab 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
index 7ddd76d9fc..862b97d715 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             provider.Execute(context);
 
             // Assert
-            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.Default.Equals(d, expectedDescriptor));
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
index d27fdb3129..bf56cb729f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
index 6c15d62a1f..d78e7b0a82 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             provider.Execute(context);
 
             // Assert
-            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.Default.Equals(d, expectedDescriptor));
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs
index d44f0169a1..8e874ac608 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var descriptor = factory.CreateDescriptor(viewComponent);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
index 16fb3096dc..10faadb243 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -1,9 +1,6 @@
 // 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.IO;
-using System.Linq;
-using System.Reflection;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -66,7 +63,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             provider.Execute(context);
 
             // Assert
-            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.Default.Equals(d, expectedDescriptor));
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs
index 37f0a55417..f6b4ea5776 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/AllowedChildTagDescriptorComparer.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -16,27 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         public static readonly AllowedChildTagDescriptorComparer Default =
             new AllowedChildTagDescriptorComparer();
 
-        /// <summary>
-        /// A default instance of the <see cref="AllowedChildTagDescriptorComparer"/> that does case-sensitive comparison.
-        /// </summary>
-        internal static readonly AllowedChildTagDescriptorComparer CaseSensitive =
-            new AllowedChildTagDescriptorComparer(caseSensitive: true);
-
-        private readonly StringComparer _stringComparer;
-        private readonly StringComparison _stringComparison;
-
-        private AllowedChildTagDescriptorComparer(bool caseSensitive = false)
+        private AllowedChildTagDescriptorComparer()
         {
-            if (caseSensitive)
-            {
-                _stringComparer = StringComparer.Ordinal;
-                _stringComparison = StringComparison.Ordinal;
-            }
-            else
-            {
-                _stringComparer = StringComparer.OrdinalIgnoreCase;
-                _stringComparison = StringComparison.OrdinalIgnoreCase;
-            }
         }
 
         /// <inheritdoc />
@@ -55,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             return
-                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.Name, descriptorY.Name, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal);
         }
 
@@ -63,7 +43,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public virtual int GetHashCode(AllowedChildTagDescriptor descriptor)
         {
             var hash = HashCodeCombiner.Start();
-            hash.Add(descriptor.Name, _stringComparer);
+            hash.Add(descriptor.Name, StringComparer.Ordinal);
 
             return hash.CombinedHash;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
index 96a0119ad8..ecfd96105f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptor.cs
@@ -43,6 +43,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public string DisplayName { get; protected set; }
 
+        public bool CaseSensitive { get; protected set; }
+
         public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
 
         public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs
index fbf68929eb..54154a7aaa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs
@@ -15,27 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         public static readonly BoundAttributeDescriptorComparer Default = new BoundAttributeDescriptorComparer();
 
-        /// <summary>
-        /// A default instance of the <see cref="BoundAttributeDescriptorComparer"/> that does case-sensitive comparison.
-        /// </summary>
-        internal static readonly BoundAttributeDescriptorComparer CaseSensitive =
-            new BoundAttributeDescriptorComparer(caseSensitive: true);
-
-        private readonly StringComparer _stringComparer;
-        private readonly StringComparison _stringComparison;
-
-        private BoundAttributeDescriptorComparer(bool caseSensitive = false)
+        private BoundAttributeDescriptorComparer()
         {
-            if (caseSensitive)
-            {
-                _stringComparer = StringComparer.Ordinal;
-                _stringComparison = StringComparison.Ordinal;
-            }
-            else
-            {
-                _stringComparer = StringComparer.OrdinalIgnoreCase;
-                _stringComparison = StringComparison.OrdinalIgnoreCase;
-            }
         }
 
         public virtual bool Equals(BoundAttributeDescriptor descriptorX, BoundAttributeDescriptor descriptorY)
@@ -55,8 +36,9 @@ namespace Microsoft.AspNetCore.Razor.Language
                 descriptorX.IsIndexerStringProperty == descriptorY.IsIndexerStringProperty &&
                 descriptorX.IsEnum == descriptorY.IsEnum &&
                 descriptorX.HasIndexer == descriptorY.HasIndexer &&
-                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
-                string.Equals(descriptorX.IndexerNamePrefix, descriptorY.IndexerNamePrefix, _stringComparison) &&
+                descriptorX.CaseSensitive == descriptorY.CaseSensitive &&
+                string.Equals(descriptorX.Name, descriptorY.Name, StringComparison.Ordinal) &&
+                string.Equals(descriptorX.IndexerNamePrefix, descriptorY.IndexerNamePrefix, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.IndexerTypeName, descriptorY.IndexerTypeName, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.Documentation, descriptorY.Documentation, StringComparison.Ordinal) &&
@@ -75,7 +57,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             var hash = HashCodeCombiner.Start();
             hash.Add(descriptor.Kind);
-            hash.Add(descriptor.Name, _stringComparer);
+            hash.Add(descriptor.Name, StringComparer.Ordinal);
 
             return hash.CombinedHash;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs
index b0c98d8400..904718d730 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptor.cs
@@ -30,6 +30,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public string DisplayName { get; protected set; }
 
+        public bool CaseSensitive { get; protected set; }
+
         public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
 
         public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs
index 4f183bee01..6cbc01017c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeParameterDescriptorComparer.cs
@@ -15,27 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         public static readonly BoundAttributeParameterDescriptorComparer Default = new BoundAttributeParameterDescriptorComparer();
 
-        /// <summary>
-        /// A default instance of the <see cref="BoundAttributeParameterDescriptorComparer"/> that does case-sensitive comparison.
-        /// </summary>
-        internal static readonly BoundAttributeParameterDescriptorComparer CaseSensitive =
-            new BoundAttributeParameterDescriptorComparer(caseSensitive: true);
-
-        private readonly StringComparer _stringComparer;
-        private readonly StringComparison _stringComparison;
-
-        private BoundAttributeParameterDescriptorComparer(bool caseSensitive = false)
+        private BoundAttributeParameterDescriptorComparer()
         {
-            if (caseSensitive)
-            {
-                _stringComparer = StringComparer.Ordinal;
-                _stringComparison = StringComparison.Ordinal;
-            }
-            else
-            {
-                _stringComparer = StringComparer.OrdinalIgnoreCase;
-                _stringComparison = StringComparison.OrdinalIgnoreCase;
-            }
         }
 
         public virtual bool Equals(BoundAttributeParameterDescriptor descriptorX, BoundAttributeParameterDescriptor descriptorY)
@@ -53,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             return
                 string.Equals(descriptorX.Kind, descriptorY.Kind, StringComparison.Ordinal) &&
                 descriptorX.IsEnum == descriptorY.IsEnum &&
-                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.Name, descriptorY.Name, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.Documentation, descriptorY.Documentation, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal) &&
@@ -71,7 +52,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             var hash = HashCodeCombiner.Start();
             hash.Add(descriptor.Kind);
-            hash.Add(descriptor.Name, _stringComparer);
+            hash.Add(descriptor.Name, StringComparer.Ordinal);
 
             return hash.CombinedHash;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index e095499508..0b37c16233 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -421,5 +421,48 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             return RazorDiagnostic.Create(RefSuppressFieldRequiredForGeneric, source ?? SourceSpan.Undefined);
         }
+
+        public static readonly RazorDiagnosticDescriptor ComponentNamesCannotStartWithLowerCase =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10013",
+                () => "Component '{0}' starts with a lowercase character. Component names cannot start with a lowercase character.",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_ComponentNamesCannotStartWithLowerCase(string componentName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(
+                ComponentNamesCannotStartWithLowerCase,
+                source ?? SourceSpan.Undefined,
+                componentName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor UnexpectedMarkupElement =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10014",
+                () => "Found markup element with unexpected name '{0}'. If this is intended to be a component, add a @using directive for its namespace.",
+                RazorDiagnosticSeverity.Warning);
+
+        public static RazorDiagnostic Create_UnexpectedMarkupElement(string elementName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(
+                UnexpectedMarkupElement,
+                source ?? SourceSpan.Undefined,
+                elementName);
+        }
+
+        public static readonly RazorDiagnosticDescriptor InconsistentStartAndEndTagName =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}10015",
+                () => "The start tag name '{0}' does not match the end tag name '{1}'. Components must have matching start and end tag names (case-sensitive).",
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic Create_InconsistentStartAndEndTagName(string startTagName, string endTagName, SourceSpan? source = null)
+        {
+            return RazorDiagnostic.Create(
+                InconsistentStartAndEndTagName,
+                source ?? SourceSpan.Undefined,
+                startTagName,
+                endTagName);
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 8ff9196e1e..8e2b1970e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -64,6 +64,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 computedClass = $"AspNetCore_{checksum}";
             }
 
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+            if (char.IsLower(computedClass, 0))
+            {
+                // We don't allow component names to start with a lowercase character.
+                documentNode.Diagnostics.Add(
+                    ComponentDiagnosticFactory.Create_ComponentNamesCannotStartWithLowerCase(computedClass, documentNode.Source));
+            }
+
             if (MangleClassNames)
             {
                 computedClass = ComponentMetadata.MangleClassName(computedClass);
@@ -91,7 +99,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 @class.BaseType = ComponentsApi.ComponentBase.FullTypeName;
 
-                var documentNode = codeDocument.GetDocumentIntermediateNode();
                 var typeParamReferences = documentNode.FindDirectiveReferences(ComponentTypeParamDirective.Directive);
                 for (var i = 0; i < typeParamReferences.Count; i++)
                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
index bff46f4549..af297496c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptor.cs
@@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             string indexerTypeName,
             string documentation,
             string displayName,
+            bool caseSensitive,
             BoundAttributeParameterDescriptor[] parameterDescriptors,
             Dictionary<string, string> metadata,
             RazorDiagnostic[] diagnostics) 
@@ -30,6 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             IndexerTypeName = indexerTypeName;
             Documentation = documentation;
             DisplayName = displayName;
+            CaseSensitive = caseSensitive;
             BoundAttributeParameters = parameterDescriptors;
 
             Metadata = metadata;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
index a44c2570db..5c9b8cf90b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeDescriptorBuilder.cs
@@ -74,6 +74,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
+        internal bool CaseSensitive => _parent.CaseSensitive;
+
         public override void BindAttributeParameter(Action<BoundAttributeParameterDescriptorBuilder> configure)
         {
             if (configure == null)
@@ -101,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             if (_attributeParameterBuilders != null)
             {
                 // Attribute parameters are case-sensitive.
-                var parameterset = new HashSet<BoundAttributeParameterDescriptor>(BoundAttributeParameterDescriptorComparer.CaseSensitive);
+                var parameterset = new HashSet<BoundAttributeParameterDescriptor>(BoundAttributeParameterDescriptorComparer.Default);
                 for (var i = 0; i < _attributeParameterBuilders.Count; i++)
                 {
                     parameterset.Add(_attributeParameterBuilders[i].Build());
@@ -120,6 +122,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 IndexerValueTypeName,
                 Documentation,
                 GetDisplayName(),
+                CaseSensitive,
                 parameters,
                 new Dictionary<string, string>(Metadata),
                 diagnostics.ToArray());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs
index 349ffb68f8..bbac666f48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptor.cs
@@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             bool isEnum,
             string documentation,
             string displayName,
+            bool caseSensitive,
             Dictionary<string, string> metadata,
             RazorDiagnostic[] diagnostics)
             : base(kind)
@@ -23,6 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             IsEnum = isEnum;
             Documentation = documentation;
             DisplayName = displayName;
+            CaseSensitive = caseSensitive;
 
             Metadata = metadata;
             Diagnostics = diagnostics;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs
index d7c62286bc..0b2c30000f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultBoundAttributeParameterDescriptorBuilder.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -48,6 +47,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
+        internal bool CaseSensitive => _parent.CaseSensitive;
+
         public BoundAttributeParameterDescriptor Build()
         {
             var validationDiagnostics = Validate();
@@ -63,6 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 IsEnum,
                 Documentation,
                 GetDisplayName(),
+                CaseSensitive,
                 new Dictionary<string, string>(Metadata),
                 diagnostics.ToArray());
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index 166a2912a4..f3180eb618 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1162,7 +1162,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                     Source = BuildSourceSpanFromNode(node),
 
                     // Could be empty while the tag is being typed in.
-                    TagName = node.StartTag?.GetTagNameWithOptionalBang() ?? node.EndTag?.GetTagNameWithOptionalBang() ?? string.Empty,
+                    TagName = node.StartTag?.Name?.Content ?? node.EndTag?.Name?.Content ?? string.Empty,
                 };
 
                 if (node.StartTag != null && node.EndTag != null && node.StartTag.IsVoidElement())
@@ -1184,6 +1184,19 @@ namespace Microsoft.AspNetCore.Razor.Language
                             BuildSourceSpanFromNode(node.EndTag), node.EndTag.GetTagNameWithOptionalBang()));
                 }
 
+                if (node.StartTag != null && !_document.Options.SuppressPrimaryMethodBody)
+                {
+                    // We only want this error during the second phase of the two phase compilation.
+                    var startTagName = node.StartTag.GetTagNameWithOptionalBang();
+                    if (startTagName != null && startTagName.Length > 0 && char.IsUpper(startTagName, 0))
+                    {
+                        // A markup element that starts with an uppercase character.
+                        // It is most likely intended to be a component. Add a warning.
+                        element.Diagnostics.Add(
+                            ComponentDiagnosticFactory.Create_UnexpectedMarkupElement(startTagName, BuildSourceSpanFromNode(node.StartTag)));
+                    }
+                }
+
                 _builder.Push(element);
 
                 base.VisitMarkupElement(node);
@@ -1640,6 +1653,19 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 // We don't want to track attributes from a previous tag helper element.
                 _renderedBoundAttributeNames.Clear();
+
+                if (node.StartTag != null && node.EndTag != null)
+                {
+                    var startTagName = node.StartTag.Name?.Content;
+                    var endTagName = node.EndTag.Name?.Content;
+                    if (!string.Equals(startTagName, endTagName, StringComparison.Ordinal))
+                    {
+                        // This is most likely a case mismatch in start and end tags. Otherwise the parser wouldn't have grouped them together.
+                        // But we can't have case mismatch in start and end tags in components. Add a diagnostic.
+                        tagHelperNode.Diagnostics.Add(
+                            ComponentDiagnosticFactory.Create_InconsistentStartAndEndTagName(startTagName, endTagName, BuildSourceSpanFromNode(node.EndTag)));
+                    }
+                }
             }
 
             public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
index 13228d130b..29d29881bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptor.cs
@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         public DefaultRequiredAttributeDescriptor(
             string name,
             NameComparisonMode nameComparison,
+            bool caseSensitive,
             string value,
             ValueComparisonMode valueComparison,
             string displayName,
@@ -18,6 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             Name = name;
             NameComparison = nameComparison;
+            CaseSensitive = caseSensitive;
             Value = value;
             ValueComparison = valueComparison;
             DisplayName = displayName;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
index a3e7472598..f663da4c3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRequiredAttributeDescriptorBuilder.cs
@@ -9,9 +9,15 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRequiredAttributeDescriptorBuilder : RequiredAttributeDescriptorBuilder
     {
+        private DefaultTagMatchingRuleDescriptorBuilder _parent;
         private RazorDiagnosticCollection _diagnostics;
         private readonly Dictionary<string, string> _metadata = new Dictionary<string, string>();
 
+        public DefaultRequiredAttributeDescriptorBuilder(DefaultTagMatchingRuleDescriptorBuilder parent)
+        {
+            _parent = parent;
+        }
+
         public override string Name { get; set; }
 
         public override RequiredAttributeDescriptor.NameComparisonMode NameComparisonMode { get; set; }
@@ -35,6 +41,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override IDictionary<string, string> Metadata => _metadata;
 
+        internal bool CaseSensitive => _parent.CaseSensitive;
+
         public RequiredAttributeDescriptor Build()
         {
             var validationDiagnostics = Validate();
@@ -48,6 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var rule = new DefaultRequiredAttributeDescriptor(
                 Name,
                 NameComparisonMode,
+                CaseSensitive,
                 Value,
                 ValueComparisonMode,
                 displayName,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs
index f9da39f401..9ebd3eb90b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptor.cs
@@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             string displayName,
             string documentation,
             string tagOutputHint,
+            bool caseSensitive,
             TagMatchingRuleDescriptor[] tagMatchingRules,
             BoundAttributeDescriptor[] attributeDescriptors,
             AllowedChildTagDescriptor[] allowedChildTags,
@@ -26,6 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             DisplayName = displayName;
             Documentation = documentation;
             TagOutputHint = tagOutputHint;
+            CaseSensitive = caseSensitive;
             TagMatchingRules = tagMatchingRules;
             BoundAttributes = attributeDescriptors;
             AllowedChildTags = allowedChildTags;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs
index 3dcd280a11..e4635d141c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagHelperDescriptorBuilder.cs
@@ -40,6 +40,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override string TagOutputHint { get; set; }
 
+        public override bool CaseSensitive { get; set; }
+
         public override string Documentation { get; set; }
 
         public override IDictionary<string, string> Metadata => _metadata;
@@ -124,7 +126,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             EnsureTagMatchingRuleBuilders();
 
-            var builder = new DefaultTagMatchingRuleDescriptorBuilder();
+            var builder = new DefaultTagMatchingRuleDescriptorBuilder(this);
             configure(builder);
             _tagMatchingRuleBuilders.Add(builder);
         }
@@ -180,6 +182,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 GetDisplayName(),
                 Documentation,
                 TagOutputHint,
+                CaseSensitive,
                 tagMatchingRules,
                 attributes,
                 allowedChildTags,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs
index 78595a9165..dae8151b65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptor.cs
@@ -9,12 +9,14 @@ namespace Microsoft.AspNetCore.Razor.Language
             string tagName,
             string parentTag,
             TagStructure tagStructure,
+            bool caseSensitive,
             RequiredAttributeDescriptor[] attributes,
             RazorDiagnostic[] diagnostics)
         {
             TagName = tagName;
             ParentTag = parentTag;
             TagStructure = tagStructure;
+            CaseSensitive = caseSensitive;
             Attributes = attributes;
             Diagnostics = diagnostics;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs
index 7cfb80eebc..4c8524ccb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultTagMatchingRuleDescriptorBuilder.cs
@@ -4,17 +4,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultTagMatchingRuleDescriptorBuilder : TagMatchingRuleDescriptorBuilder
     {
+        private DefaultTagHelperDescriptorBuilder _parent;
         private List<DefaultRequiredAttributeDescriptorBuilder> _requiredAttributeBuilders;
         private RazorDiagnosticCollection _diagnostics;
 
-        internal DefaultTagMatchingRuleDescriptorBuilder()
+        internal DefaultTagMatchingRuleDescriptorBuilder(DefaultTagHelperDescriptorBuilder parent)
         {
+            _parent = parent;
         }
 
         public override string TagName { get; set; }
@@ -23,6 +24,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override TagStructure TagStructure { get; set; }
 
+        internal bool CaseSensitive => _parent.CaseSensitive;
+
         public override RazorDiagnosticCollection Diagnostics
         {
             get
@@ -55,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             EnsureRequiredAttributeBuilders();
 
-            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+            var builder = new DefaultRequiredAttributeDescriptorBuilder(this);
             configure(builder);
             _requiredAttributeBuilders.Add(builder);
         }
@@ -85,6 +88,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 TagName,
                 ParentTag,
                 TagStructure,
+                CaseSensitive,
                 requiredAttributes,
                 diagnostics.ToArray());
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
index 5f68eea115..ccae80a91e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptor.cs
@@ -13,6 +13,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public NameComparisonMode NameComparison { get; protected set; }
 
+        public bool CaseSensitive { get; protected set; }
+
         public string Value { get; protected set; }
 
         public ValueComparisonMode ValueComparison { get; protected set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs
index 149f6a0c3d..2883797e4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RequiredAttributeDescriptorComparer.cs
@@ -19,27 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         public static readonly RequiredAttributeDescriptorComparer Default =
             new RequiredAttributeDescriptorComparer();
 
-        /// <summary>
-        /// A default instance of the <see cref="RequiredAttributeDescriptorComparer"/> that does case-sensitive comparison.
-        /// </summary>
-        internal static readonly RequiredAttributeDescriptorComparer CaseSensitive =
-            new RequiredAttributeDescriptorComparer(caseSensitive: true);
-
-        private readonly StringComparer _stringComparer;
-        private readonly StringComparison _stringComparison;
-
-        private RequiredAttributeDescriptorComparer(bool caseSensitive = false)
+        private RequiredAttributeDescriptorComparer()
         {
-            if (caseSensitive)
-            {
-                _stringComparer = StringComparer.Ordinal;
-                _stringComparison = StringComparison.Ordinal;
-            }
-            else
-            {
-                _stringComparer = StringComparer.OrdinalIgnoreCase;
-                _stringComparison = StringComparison.OrdinalIgnoreCase;
-            }
         }
 
         /// <inheritdoc />
@@ -58,9 +39,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             return
+                descriptorX.CaseSensitive == descriptorY.CaseSensitive &&
                 descriptorX.NameComparison == descriptorY.NameComparison &&
                 descriptorX.ValueComparison == descriptorY.ValueComparison &&
-                string.Equals(descriptorX.Name, descriptorY.Name, _stringComparison) &&
+                string.Equals(descriptorX.Name, descriptorY.Name, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.Value, descriptorY.Value, StringComparison.Ordinal) &&
                 string.Equals(descriptorX.DisplayName, descriptorY.DisplayName, StringComparison.Ordinal);
         }
@@ -68,8 +50,13 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// <inheritdoc />
         public virtual int GetHashCode(RequiredAttributeDescriptor descriptor)
         {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
             var hash = HashCodeCombiner.Start();
-            hash.Add(descriptor.Name, _stringComparer);
+            hash.Add(descriptor.Name, StringComparer.Ordinal);
 
             return hash.CombinedHash;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs
index 7c81d5e94f..3b55e486c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptor.cs
@@ -34,6 +34,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public string TagOutputHint { get; protected set; }
 
+        public bool CaseSensitive { get; protected set; }
+
         public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
 
         public IReadOnlyDictionary<string, string> Metadata { get; protected set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs
index 57a75bf50a..1d60d7e023 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorBuilder.cs
@@ -52,6 +52,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract string TagOutputHint { get; set; }
 
+        public virtual bool CaseSensitive { get; set; }
+
         public abstract string Documentation { get; set; }
 
         public abstract IDictionary<string, string> Metadata { get; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs
index 5ca9c0fe91..a078fc0630 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs
@@ -15,36 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         public static readonly TagHelperDescriptorComparer Default = new TagHelperDescriptorComparer();
 
-        /// <summary>
-        /// A default instance of the <see cref="TagHelperDescriptorComparer"/> that does case-sensitive comparison.
-        /// </summary>
-        internal static readonly TagHelperDescriptorComparer CaseSensitive =
-            new TagHelperDescriptorComparer(caseSensitive: true);
-
-        private readonly StringComparer _stringComparer;
-        private readonly StringComparison _stringComparison;
-        private readonly AllowedChildTagDescriptorComparer _AllowedChildTagDescriptorComparer;
-        private readonly BoundAttributeDescriptorComparer _boundAttributeComparer;
-        private readonly TagMatchingRuleDescriptorComparer _tagMatchingRuleComparer;
-
-        private TagHelperDescriptorComparer(bool caseSensitive = false)
+        private TagHelperDescriptorComparer()
         {
-            if (caseSensitive)
-            {
-                _stringComparer = StringComparer.Ordinal;
-                _stringComparison = StringComparison.Ordinal;
-                _AllowedChildTagDescriptorComparer = AllowedChildTagDescriptorComparer.CaseSensitive;
-                _boundAttributeComparer = BoundAttributeDescriptorComparer.CaseSensitive;
-                _tagMatchingRuleComparer = TagMatchingRuleDescriptorComparer.CaseSensitive;
-            }
-            else
-            {
-                _stringComparer = StringComparer.OrdinalIgnoreCase;
-                _stringComparison = StringComparison.OrdinalIgnoreCase;
-                _AllowedChildTagDescriptorComparer = AllowedChildTagDescriptorComparer.Default;
-                _boundAttributeComparer = BoundAttributeDescriptorComparer.Default;
-                _tagMatchingRuleComparer = TagMatchingRuleDescriptorComparer.Default;
-            }
         }
 
         public virtual bool Equals(TagHelperDescriptor descriptorX, TagHelperDescriptor descriptorY)
@@ -59,11 +31,6 @@ namespace Microsoft.AspNetCore.Razor.Language
                 return false;
             }
 
-            if (descriptorX == null)
-            {
-                return false;
-            }
-
             if (!string.Equals(descriptorX.Kind, descriptorY.Kind, StringComparison.Ordinal))
             {
                 return false;
@@ -80,17 +47,17 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             if (!Enumerable.SequenceEqual(
-                descriptorX.BoundAttributes.OrderBy(attribute => attribute.Name, _stringComparer),
-                descriptorY.BoundAttributes.OrderBy(attribute => attribute.Name, _stringComparer),
-                _boundAttributeComparer))
+                descriptorX.BoundAttributes.OrderBy(attribute => attribute.Name, StringComparer.Ordinal),
+                descriptorY.BoundAttributes.OrderBy(attribute => attribute.Name, StringComparer.Ordinal),
+                BoundAttributeDescriptorComparer.Default))
             {
                 return false;
             }
 
             if (!Enumerable.SequenceEqual(
-                descriptorX.TagMatchingRules.OrderBy(rule => rule.TagName, _stringComparer),
-                descriptorY.TagMatchingRules.OrderBy(rule => rule.TagName, _stringComparer),
-                _tagMatchingRuleComparer))
+                descriptorX.TagMatchingRules.OrderBy(rule => rule.TagName, StringComparer.Ordinal),
+                descriptorY.TagMatchingRules.OrderBy(rule => rule.TagName, StringComparer.Ordinal),
+                TagMatchingRuleDescriptorComparer.Default))
             {
                 return false;
             }
@@ -99,9 +66,14 @@ namespace Microsoft.AspNetCore.Razor.Language
                 (descriptorX.AllowedChildTags != null &&
                 descriptorY.AllowedChildTags != null &&
                 Enumerable.SequenceEqual(
-                    descriptorX.AllowedChildTags.OrderBy(childTag => childTag.Name, _stringComparer),
-                    descriptorY.AllowedChildTags.OrderBy(childTag => childTag.Name, _stringComparer),
-                    _AllowedChildTagDescriptorComparer))))
+                    descriptorX.AllowedChildTags.OrderBy(childTag => childTag.Name, StringComparer.Ordinal),
+                    descriptorY.AllowedChildTags.OrderBy(childTag => childTag.Name, StringComparer.Ordinal),
+                    AllowedChildTagDescriptorComparer.Default))))
+            {
+                return false;
+            }
+
+            if (descriptorX.CaseSensitive != descriptorY.CaseSensitive)
             {
                 return false;
             }
@@ -116,7 +88,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 return false;
             }
 
-            if (!string.Equals(descriptorX.TagOutputHint, descriptorY.TagOutputHint, _stringComparison))
+            if (!string.Equals(descriptorX.TagOutputHint, descriptorY.TagOutputHint, StringComparison.Ordinal))
             {
                 return false;
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
index 514acad767..68184d91ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperMatchingConventions.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Security.Cryptography;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -81,7 +82,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             if (rule.TagName != ElementCatchAllName &&
                 rule.TagName != null &&
-                !string.Equals(tagNameWithoutPrefix, rule.TagName, StringComparison.OrdinalIgnoreCase))
+                !string.Equals(tagNameWithoutPrefix, rule.TagName, rule.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
@@ -96,7 +97,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(rule));
             }
 
-            if (rule.ParentTag != null && !string.Equals(parentTagNameWithoutPrefix, rule.ParentTag, StringComparison.OrdinalIgnoreCase))
+            if (rule.ParentTag != null && !string.Equals(parentTagNameWithoutPrefix, rule.ParentTag, rule.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
@@ -137,7 +138,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             return descriptor.IndexerNamePrefix != null &&
                 !SatisfiesBoundAttributeName(name, descriptor) &&
-                name.StartsWith(descriptor.IndexerNamePrefix, StringComparison.OrdinalIgnoreCase);
+                name.StartsWith(descriptor.IndexerNamePrefix, descriptor.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
         }
 
         public static bool SatisfiesBoundAttributeWithParameter(string name, BoundAttributeDescriptor parent, BoundAttributeParameterDescriptor descriptor)
@@ -146,7 +147,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 var satisfiesBoundAttributeName = SatisfiesBoundAttributeName(attributeName, parent);
                 var satisfiesBoundAttributeIndexer = SatisfiesBoundAttributeIndexer(attributeName, parent);
-                var matchesParameter = string.Equals(descriptor.Name, parameterName, StringComparison.Ordinal);
+                var matchesParameter = string.Equals(descriptor.Name, parameterName, descriptor.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
                 return (satisfiesBoundAttributeName || satisfiesBoundAttributeIndexer) && matchesParameter;
             }
 
@@ -220,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         private static bool SatisfiesBoundAttributeName(string name, BoundAttributeDescriptor descriptor)
         {
-            return string.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase);
+            return string.Equals(descriptor.Name, name, descriptor.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
         }
 
         // Internal for testing
@@ -229,13 +230,13 @@ namespace Microsoft.AspNetCore.Razor.Language
             var nameMatches = false;
             if (descriptor.NameComparison == RequiredAttributeDescriptor.NameComparisonMode.FullMatch)
             {
-                nameMatches = string.Equals(descriptor.Name, attributeName, StringComparison.OrdinalIgnoreCase);
+                nameMatches = string.Equals(descriptor.Name, attributeName, descriptor.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
             }
             else if (descriptor.NameComparison == RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)
             {
                 // attributeName cannot equal the Name if comparing as a PrefixMatch.
                 nameMatches = attributeName.Length != descriptor.Name.Length &&
-                    attributeName.StartsWith(descriptor.Name, StringComparison.OrdinalIgnoreCase);
+                    attributeName.StartsWith(descriptor.Name, descriptor.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
             }
             else
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs
index d4564b88e7..c907f71134 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptor.cs
@@ -19,6 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public TagStructure TagStructure { get; protected set; }
 
+        public bool CaseSensitive { get; protected set; }
+
         public IReadOnlyList<RazorDiagnostic> Diagnostics { get; protected set; }
 
         public bool HasErrors
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs
index 734485b3c3..4ed8805e92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagMatchingRuleDescriptorComparer.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -16,30 +15,8 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </summary>
         public static readonly TagMatchingRuleDescriptorComparer Default = new TagMatchingRuleDescriptorComparer();
 
-        /// <summary>
-        /// A default instance of the <see cref="TagMatchingRuleDescriptorComparer"/> that does case-sensitive comparison.
-        /// </summary>
-        internal static readonly TagMatchingRuleDescriptorComparer CaseSensitive =
-            new TagMatchingRuleDescriptorComparer(caseSensitive: true);
-
-        private readonly StringComparer _stringComparer;
-        private readonly StringComparison _stringComparison;
-        private readonly RequiredAttributeDescriptorComparer _requiredAttributeComparer;
-
-        private TagMatchingRuleDescriptorComparer(bool caseSensitive = false)
+        private TagMatchingRuleDescriptorComparer()
         {
-            if (caseSensitive)
-            {
-                _stringComparer = StringComparer.Ordinal;
-                _stringComparison = StringComparison.Ordinal;
-                _requiredAttributeComparer = RequiredAttributeDescriptorComparer.CaseSensitive;
-            }
-            else
-            {
-                _stringComparer = StringComparer.OrdinalIgnoreCase;
-                _stringComparison = StringComparison.OrdinalIgnoreCase;
-                _requiredAttributeComparer = RequiredAttributeDescriptorComparer.Default;
-            }
         }
 
         public virtual bool Equals(TagMatchingRuleDescriptor ruleX, TagMatchingRuleDescriptor ruleY)
@@ -55,10 +32,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             return
-                string.Equals(ruleX.TagName, ruleY.TagName, _stringComparison) &&
-                string.Equals(ruleX.ParentTag, ruleY.ParentTag, _stringComparison) &&
+                string.Equals(ruleX.TagName, ruleY.TagName, StringComparison.Ordinal) &&
+                string.Equals(ruleX.ParentTag, ruleY.ParentTag, StringComparison.Ordinal) &&
+                ruleX.CaseSensitive == ruleY.CaseSensitive &&
                 ruleX.TagStructure == ruleY.TagStructure &&
-                Enumerable.SequenceEqual(ruleX.Attributes, ruleY.Attributes, _requiredAttributeComparer);
+                Enumerable.SequenceEqual(ruleX.Attributes, ruleY.Attributes, RequiredAttributeDescriptorComparer.Default);
         }
 
         public virtual int GetHashCode(TagMatchingRuleDescriptor rule)
@@ -69,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             var hash = HashCodeCombiner.Start();
-            hash.Add(rule.TagName, _stringComparer);
+            hash.Add(rule.TagName, StringComparer.Ordinal);
 
             return hash.CombinedHash;
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs
index f847f6ae3c..7f81d74e66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRequiredAttributeDescriptorBuilderTest.cs
@@ -11,7 +11,9 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void Build_DisplayNameIsName_NameComparisonFullMatch()
         {
             // Arrange
-            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            var tagMatchingRuleBuilder = new DefaultTagMatchingRuleDescriptorBuilder(tagHelperBuilder);
+            var builder = new DefaultRequiredAttributeDescriptorBuilder(tagMatchingRuleBuilder);
 
             builder
                 .Name("asp-action")
@@ -28,7 +30,9 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void Build_DisplayNameIsNameWithDots_NameComparisonPrefixMatch()
         {
             // Arrange
-            var builder = new DefaultRequiredAttributeDescriptorBuilder();
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            var tagMatchingRuleBuilder = new DefaultTagMatchingRuleDescriptorBuilder(tagHelperBuilder);
+            var builder = new DefaultRequiredAttributeDescriptorBuilder(tagMatchingRuleBuilder);
 
             builder
                 .Name("asp-route-")
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs
index 7321c473cb..104c63c752 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DefaultTagHelperOptimizationPassTest.cs
@@ -60,16 +60,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
             var create = Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]);
             Assert.Equal("__TestTagHelper", create.FieldName);
             Assert.Equal("TestTagHelper", create.TypeName);
-            Assert.Equal(tagHelpers[0], create.TagHelper, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(tagHelpers[0], create.TagHelper, TagHelperDescriptorComparer.Default);
 
             var property = Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]);
             Assert.Equal("foo", property.AttributeName);
             Assert.Equal(AttributeStructure.DoubleQuotes, property.AttributeStructure);
-            Assert.Equal(tagHelpers[0].BoundAttributes[0], property.BoundAttribute, BoundAttributeDescriptorComparer.CaseSensitive);
+            Assert.Equal(tagHelpers[0].BoundAttributes[0], property.BoundAttribute, BoundAttributeDescriptorComparer.Default);
             Assert.Equal("__TestTagHelper", property.FieldName);
             Assert.False(property.IsIndexerNameMatch);
             Assert.Equal("FooProp", property.PropertyName);
-            Assert.Equal(tagHelpers[0], property.TagHelper, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(tagHelpers[0], property.TagHelper, TagHelperDescriptorComparer.Default);
 
             var htmlAttribute = Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[3]);
             Assert.Equal("attr", htmlAttribute.AttributeName);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
index 15c2d4de9b..3a84f91501 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
@@ -161,8 +161,10 @@ Some Content
 </RenderChildContent>");
 
             // Assert
-            var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Same(ComponentDiagnosticFactory.ChildContentMixedWithExplicitChildContent.Id, diagnostic.Id);
+            Assert.Collection(
+                generated.Diagnostics,
+                d => Assert.Equal("RZ10014", d.Id),
+                d => Assert.Equal("RZ9996", d.Id));
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index cd2a441163..b65d268ac1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -998,6 +998,24 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BuiltIn_BindToInputWithoutType_IsCaseSensitive()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input @BIND=""@ParentValue"" />
+@code {
+    public int ParentValue { get; set; } = 42;
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void BuiltIn_BindToInputText_WithFormat_WritesAttributes()
         {
@@ -1829,12 +1847,12 @@ namespace Test3
 @using static Test2.SomeComponent
 @using Foo = Test3
 <MyComponent />
-<SomeComponent /> <!-- Not a component -->");
+<SomeComponent /> <!-- Not a component -->", throwOnFailure: false);
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
             AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
-            var result = CompileToAssembly(generated);
+            CompileToAssembly(generated, throwOnFailure: false);
         }
 
         [Fact]
@@ -2650,6 +2668,25 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void EventHandler_AttributeNameIsCaseSensitive()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<input @onCLICK=""OnClick"" />
+@code {
+    void OnClick(UIMouseEventArgs e) {
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Generics
@@ -3448,6 +3485,24 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Element_WithKey_AttributeNameIsCaseSensitive()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" @KEY=""someObject"" attributeafter=""after"">Hello</elem>
+
+@code {
+    private object someObject = new object();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Splat
@@ -3616,6 +3671,24 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent Value=""18"" @attributes=""@(someAttributes)"" />
 
+@code {
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Element_WithSplat_AttributeNameIsCaseSensitive()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" @ATTributes=""someAttributes"" attributeafter=""after"">Hello</elem>
+
 @code {
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 }
@@ -3773,6 +3846,19 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Element_WithRef_AttributeNameIsCaseSensitive()
+        {
+            // Arrange/Act
+            var generated = CompileToCSharp(@"
+<elem attributebefore=""before"" @rEF=""myElem"" attributeafter=""after"">Hello</elem>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Templates
@@ -4430,6 +4516,29 @@ namespace New.Test
             Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttributeDirective.Id, diagnostic.Id);
         }
 
+        [Fact]
+        public void DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <input type=""text"" Value=""17"" @bind=""@text""></input>
+</div>
+@functions {
+    private string text = ""hi"";
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Same(ComponentDiagnosticFactory.DuplicateMarkupAttributeDirective.Id, diagnostic.Id);
+        }
+
         [Fact]
         public void DuplicateMarkupAttributes_IsAnError_BindOnInput()
         {
@@ -4871,6 +4980,81 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Component_MatchingIsCaseSensitive()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public int IntProperty { get; set; }
+        [Parameter] public bool BoolProperty { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent />
+<mycomponent />
+<MyComponent intproperty='1' BoolProperty='true' />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_MultipleComponentsDifferByCase()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public int IntProperty { get; set; }
+    }
+
+    public class Mycomponent : ComponentBase
+    {
+        [Parameter] public int IntProperty { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent IntProperty='1' />
+<Mycomponent IntProperty='2' />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void ElementWithUppercaseTagName_CanHideWarningWithBang()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp(@"
+<!NotAComponent />
+<!DefinitelyNotAComponent></!DefinitelyNotAComponent>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
index 5caa98fb92..dc0b1b4cf9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
@@ -9,6 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
     {
         internal override string FileKind => FileKinds.Component;
 
+        internal override bool UseTwoPhaseCompilation => true;
+
         [Fact]
         public void RejectsEndTagWithNoStartTag()
         {
@@ -125,5 +127,79 @@ namespace Test
                 "Component attributes do not support complex content (mixed C# and markup). Attribute: '@key', text: 'Foo @Text'",
                 diagnostic.GetMessage());
         }
+
+        [Fact]
+        public void Component_StartsWithLowerCase_ReportsError()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp("lowerCase.razor", @"
+<input type=""text"" @bind=""Text"" />
+@functions {
+    public string Text { get; set; } = ""text"";
+}", throwOnFailure: false);
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ10013", diagnostic.Id);
+            Assert.Equal(
+                "Component 'lowerCase' starts with a lowercase character. Component names cannot start with a lowercase character.",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void Element_DoesNotStartWithLowerCase_ReportsWarning()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp(@"
+<PossibleComponent></PossibleComponent>
+
+@functions {
+    public string Text { get; set; } = ""text"";
+}");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ10014", diagnostic.Id);
+            Assert.Equal(RazorDiagnosticSeverity.Warning, diagnostic.Severity);
+            Assert.Equal(
+                "Found markup element with unexpected name 'PossibleComponent'. If this is intended to be a component, add a @using directive for its namespace.",
+                diagnostic.GetMessage());
+        }
+
+        [Fact]
+        public void Element_DoesNotStartWithLowerCase_OverrideWithBang_NoWarning()
+        {
+            // Arrange & Act
+            var generated = CompileToCSharp(@"
+<!PossibleComponent></!PossibleComponent>");
+
+            // Assert
+            Assert.Empty(generated.Diagnostics);
+        }
+
+        [Fact]
+        public void Component_StartAndEndTagCaseMismatch_ReportsError()
+        {
+            // Arrange & Act
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+            var generated = CompileToCSharp(@"
+<MyComponent></mycomponent>");
+
+            // Assert
+            var diagnostic = Assert.Single(generated.Diagnostics);
+            Assert.Equal("RZ10015", diagnostic.Id);
+            Assert.Equal(
+                "The start tag name 'MyComponent' does not match the end tag name 'mycomponent'. Components must have matching start and end tag names (case-sensitive).",
+                diagnostic.GetMessage());
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs
index 9a73796a2e..93d206b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentTemplateIntegrationTest.cs
@@ -9,6 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
     {
         internal override string FileKind => FileKinds.Component;
 
+        internal override bool UseTwoPhaseCompilation => true;
+
         // Razor doesn't parse this as a template, we don't need much special handling for
         // it because it will just be invalid in general.
         [Fact]
@@ -17,7 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             // Arrange
 
             // Act
-            var generated = CompileToCSharp(@"<div attr=""@<div></div>"" />");
+            var generated = CompileToCSharp(@"<div attr=""@<div></div>"" />", throwOnFailure: false);
 
             // Assert
             var diagnostic = Assert.Single(generated.Diagnostics);
@@ -55,11 +57,13 @@ namespace Test
 "));
 
             // Act
-            var generated = CompileToCSharp(@"<MyComponent attr=""@<div></div>"" />");
+            var generated = CompileToCSharp(@"<MyComponent attr=""@<div></div>"" />", throwOnFailure: false);
 
             // Assert
-            var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Equal("RZ1005", diagnostic.Id);
+            Assert.Collection(
+                generated.Diagnostics,
+                d => Assert.Equal("RZ9986", d.Id),
+                d => Assert.Equal("RZ1005", d.Id));
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
index ef3603fa90..044f59124d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -1880,5 +1880,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             RunParseTreeRewriterTest("<input>Foo</input>");
         }
+
+        public static TagHelperDescriptor[] CaseSensitive_Descriptors = new TagHelperDescriptor[]
+        {
+            TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
+                .SetCaseSensitive()
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bound")
+                    .PropertyName("Bound")
+                    .TypeName(typeof(bool).FullName))
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("p")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                .Build(),
+            TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("*")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("catchAll")))
+                .Build(),
+        };
+
+        [Fact]
+        public void HandlesCaseSensitiveTagHelpersCorrectly1()
+        {
+            EvaluateData(CaseSensitive_Descriptors, "<p class='foo' catchAll></p>");
+        }
+
+        [Fact]
+        public void HandlesCaseSensitiveTagHelpersCorrectly2()
+        {
+            EvaluateData(CaseSensitive_Descriptors, "<p CLASS='foo' CATCHAll></p>");
+        }
+
+        [Fact]
+        public void HandlesCaseSensitiveTagHelpersCorrectly3()
+        {
+            EvaluateData(CaseSensitive_Descriptors, "<P class='foo' CATCHAll></P>");
+        }
+
+        [Fact]
+        public void HandlesCaseSensitiveTagHelpersCorrectly4()
+        {
+            EvaluateData(CaseSensitive_Descriptors, "<P class='foo'></P>");
+        }
+
+        [Fact]
+        public void HandlesCaseSensitiveTagHelpersCorrectly5()
+        {
+            EvaluateData(CaseSensitive_Descriptors, "<p Class='foo'></p>");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs
index 73b40802bb..ab3439b2e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperBinderTest.cs
@@ -32,12 +32,12 @@ namespace Microsoft.AspNetCore.Razor.Language
                 parentIsTagHelper: false);
 
             // Assert
-            Assert.Equal(expectedDescriptors, bindingResult.Descriptors, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptors, bindingResult.Descriptors, TagHelperDescriptorComparer.Default);
             Assert.Equal("th:div", bindingResult.TagName);
             Assert.Equal("body", bindingResult.ParentTagName);
             Assert.Equal(expectedAttributes, bindingResult.Attributes);
             Assert.Equal("th:", bindingResult.TagHelperPrefix);
-            Assert.Equal(divTagHelper.TagMatchingRules, bindingResult.Mappings[divTagHelper], TagMatchingRuleDescriptorComparer.CaseSensitive);
+            Assert.Equal(divTagHelper.TagMatchingRules, bindingResult.Mappings[divTagHelper], TagMatchingRuleDescriptorComparer.Default);
         }
 
         public static TheoryData RequiredParentData
@@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 parentIsTagHelper: false);
 
             // Assert
-            Assert.Equal((IEnumerable<TagHelperDescriptor>)expectedDescriptors, bindingResult.Descriptors, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal((IEnumerable<TagHelperDescriptor>)expectedDescriptors, bindingResult.Descriptors, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData RequiredAttributeData
@@ -277,7 +277,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var bindingResult = tagHelperBinder.GetBinding(tagName, providedAttributes, parentTagName: "p", parentIsTagHelper: false);
 
             // Assert
-            Assert.Equal((IEnumerable<TagHelperDescriptor>)expectedDescriptors, bindingResult?.Descriptors, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal((IEnumerable<TagHelperDescriptor>)expectedDescriptors, bindingResult?.Descriptors, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -598,5 +598,59 @@ namespace Microsoft.AspNetCore.Razor.Language
             // Assert
             Assert.False(bindingResult.IsAttributeMatch);
         }
+
+        [Fact]
+        public void GetBinding_CaseSensitiveRule_CaseMismatch_ReturnsNull()
+        {
+            // Arrange
+            var divTagHelper = TagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("div"))
+                .SetCaseSensitive()
+                .Build();
+            var expectedDescriptors = new[] { divTagHelper };
+            var expectedAttributes = new[]
+            {
+                new KeyValuePair<string, string>("class", "something")
+            };
+            var tagHelperBinder = new TagHelperBinder("th:", expectedDescriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "th:Div",
+                attributes: expectedAttributes,
+                parentTagName: "body",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Null(bindingResult);
+        }
+
+        [Fact]
+        public void GetBinding_CaseSensitiveRequiredAttribute_CaseMismatch_ReturnsNull()
+        {
+            // Arrange
+            var divTagHelper = TagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule
+                    .RequireTagName("div")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("class")))
+                .SetCaseSensitive()
+                .Build();
+            var expectedDescriptors = new[] { divTagHelper };
+            var expectedAttributes = new[]
+            {
+                new KeyValuePair<string, string>("CLASS", "something")
+            };
+            var tagHelperBinder = new TagHelperBinder(null, expectedDescriptors);
+
+            // Act
+            var bindingResult = tagHelperBinder.GetBinding(
+                tagName: "div",
+                attributes: expectedAttributes,
+                parentTagName: "body",
+                parentIsTagHelper: false);
+
+            // Assert
+            Assert.Null(bindingResult);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs
index 7a1fc6c1e3..afda769414 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs
@@ -140,8 +140,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             bool expectedResult)
         {
             // Arrange
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            var tagMatchingRuleBuilder = new DefaultTagMatchingRuleDescriptorBuilder(tagHelperBuilder);
+            var builder = new DefaultRequiredAttributeDescriptorBuilder(tagMatchingRuleBuilder);
 
-            var builder = new DefaultRequiredAttributeDescriptorBuilder();
             configure(builder);
 
             var requiredAttibute = builder.Build();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..da80e7da99
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+               ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..9a5add6521
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @BIND=" - "
+                        CSharpExpressionAttributeValue - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..895df80e01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (878:25,15 [11] )
+|ParentValue|
+
+Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (1082:35,7 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..0dcd6ea2b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(4,1): Warning RZ10014: Found markup element with unexpected name 'SomeComponent'. If this is intended to be a component, add a @using directive for its namespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0e75622023
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            __o = "";
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                           true
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..d7543ebcf9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                HtmlContent - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (17:1,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - mycomponent
+                HtmlContent - (32:1,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (32:1,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (34:2,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - intproperty - AttributeStructure.SingleQuotes
+                        HtmlContent - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                    ComponentAttribute - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.SingleQuotes
+                        IntermediateToken - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e01a00ec83
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (1301:36,43 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
new file mode 100644
index 0000000000..447d620529
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -0,0 +1,65 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          1
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          2
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Mycomponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
new file mode 100644
index 0000000000..b91de37da2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                        IntermediateToken - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 1
+                HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - Mycomponent
+                    ComponentAttribute - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                        IntermediateToken - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
new file mode 100644
index 0000000000..f3773885e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|1|
+Generated Location: (960:25,26 [1] )
+|1|
+
+Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|2|
+Generated Location: (1515:44,26 [1] )
+|2|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6446930de5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                        text
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private string text = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..02b5d2763b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'Value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'Value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
new file mode 100644
index 0000000000..99c52ebd52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -0,0 +1,44 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute -  - type=" - "
+                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute -  - Value=" - "
+                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
+                                IntermediateToken -  - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2b13abd3aa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|text|
+Generated Location: (956:25,40 [4] )
+|text|
+
+Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private string text = "hi";
+|
+Generated Location: (1285:36,12 [35] )
+|
+    private string text = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
new file mode 100644
index 0000000000..571cb8412f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [18] x:\dir\subdir\Test\TestComponent.cshtml) - NotAComponent
+                HtmlContent - (18:0,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (18:0,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (20:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - DefinitelyNotAComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ca056d5b10
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private object someObject = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..c644e00e2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [84] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (30:0,30 [18] x:\dir\subdir\Test\TestComponent.cshtml) -  @KEY=" - "
+                        HtmlAttributeValue - (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - someObject
+                    HtmlAttribute - (48:0,48 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  attributeafter=" - "
+                        HtmlAttributeValue - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (65:0,65 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                    HtmlContent - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                HtmlContent - (84:0,84 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (84:0,84 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (145:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (145:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a8551246fb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object someObject = new object();
+|
+Generated Location: (899:26,7 [49] )
+|
+    private object someObject = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3efad2f87c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..965abd8a50
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,28 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (30:0,30 [14] x:\dir\subdir\Test\TestComponent.cshtml) -  @rEF=" - "
+                        HtmlAttributeValue - (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - myElem
+                    HtmlAttribute - (44:0,44 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  attributeafter=" - "
+                        HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                    HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..79057687db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..6e83da6e4a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  attributebefore=" - "
+                        HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
+                    HtmlAttribute - (30:0,30 [29] x:\dir\subdir\Test\TestComponent.cshtml) -  @ATTributes=" - "
+                        HtmlAttributeValue - (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - someAttributes
+                    HtmlAttribute - (59:0,59 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  attributeafter=" - "
+                        HtmlAttributeValue - (76:0,76 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (76:0,76 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                    HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                HtmlContent - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (200:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (200:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2715ebcd75
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (899:26,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..356f4e9ce0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void OnClick(UIMouseEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..94d094aba5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (6:0,6 [19] x:\dir\subdir\Test\TestComponent.cshtml) -  @onCLICK=" - "
+                        HtmlAttributeValue - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - OnClick
+                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..090024800d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+Generated Location: (899:26,7 [49] )
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..af29d947d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "input");
+            builder.AddAttribute(1, "@BIND", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+               ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public int ParentValue { get; set; } = 42;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..b411813ed9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @BIND=" - "
+                        CSharpExpressionAttributeValue - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+            CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..60cf603474
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public int ParentValue { get; set; } = 42;
+|
+Generated Location: (925:30,7 [50] )
+|
+    public int ParentValue { get; set; } = 42;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 2a467f5166..3f020b8298 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -29,7 +29,9 @@ using Foo = Test3;
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n<SomeComponent></SomeComponent>");
+            builder.AddMarkupContent(1, "\r\n");
+            builder.OpenElement(2, "SomeComponent");
+            builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..0dcd6ea2b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(4,1): Warning RZ10014: Found markup element with unexpected name 'SomeComponent'. If this is intended to be a component, add a @using directive for its namespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
index 5e6295960a..0588c17fee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -10,4 +10,6 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (55:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                MarkupBlock -  - \n<SomeComponent></SomeComponent>
+                HtmlContent - (70:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (70:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (72:3,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - SomeComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..84a07e8f37
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.CloseComponent();
+            builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
+            builder.OpenComponent<Test.MyComponent>(2);
+            builder.AddAttribute(3, "intproperty", "1");
+            builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                           true
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..bf70025a0b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                MarkupBlock -  - \n<mycomponent></mycomponent>\n
+                Component - (34:2,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute -  - intproperty - AttributeStructure.SingleQuotes
+                        HtmlContent - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
+                    ComponentAttribute - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.SingleQuotes
+                        IntermediateToken - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bfc17917d8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          1
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.CloseComponent();
+            builder.AddMarkupContent(2, "\r\n");
+            builder.OpenComponent<Test.Mycomponent>(3);
+            builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          2
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
new file mode 100644
index 0000000000..a58911a312
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                        IntermediateToken - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 1
+                HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - Mycomponent
+                    ComponentAttribute - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                        IntermediateToken - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
new file mode 100644
index 0000000000..0b002da471
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddMarkupContent(1, "\r\n  ");
+            builder.OpenElement(2, "input");
+            builder.AddAttribute(3, "type", "text");
+            builder.AddAttribute(4, "Value", "17");
+            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                        text
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            builder.SetUpdatesAttributeName("value");
+            builder.CloseElement();
+            builder.AddMarkupContent(7, "\r\n");
+            builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+            
+    private string text = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..02b5d2763b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'Value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'Value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
new file mode 100644
index 0000000000..01d33ffb1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute -  - type=" - "
+                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute -  - Value=" - "
+                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
+                                IntermediateToken -  - CSharp - text
+                                IntermediateToken -  - CSharp - )
+                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ee9e5de003
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private string text = "hi";
+|
+Generated Location: (1504:38,12 [35] )
+|
+    private string text = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5a0a955b96
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -0,0 +1,21 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<NotAComponent></NotAComponent>\r\n<DefinitelyNotAComponent></DefinitelyNotAComponent>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
new file mode 100644
index 0000000000..f3e523b7a0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <NotAComponent></NotAComponent>\n<DefinitelyNotAComponent></DefinitelyNotAComponent>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..3d8a29f719
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @KEY=\"someObject\" attributeafter=\"after\">Hello</elem>");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private object someObject = new object();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..554b419774
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <elem attributebefore="before" @KEY="someObject" attributeafter="after">Hello</elem>
+            CSharpCode - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private object someObject = new object();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8bdee6f4b2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private object someObject = new object();
+|
+Generated Location: (767:20,7 [49] )
+|
+    private object someObject = new object();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..13c4866185
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,21 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @rEF=\"myElem\" attributeafter=\"after\">Hello</elem>");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..ee469bdbbc
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,10 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <elem attributebefore="before" @rEF="myElem" attributeafter="after">Hello</elem>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d44918f210
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,29 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @ATTributes=\"someAttributes\" attributeafter=\"after\">Hello</elem>");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..a92e72da17
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <elem attributebefore="before" @ATTributes="someAttributes" attributeafter="after">Hello</elem>
+            CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..520861be0a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+Generated Location: (778:20,7 [93] )
+|
+    private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
new file mode 100644
index 0000000000..575595427d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -0,0 +1,30 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            builder.AddMarkupContent(0, "<input @onCLICK=\"OnClick\">");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void OnClick(UIMouseEventArgs e) {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
new file mode 100644
index 0000000000..33c36944db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupBlock -  - <input @onCLICK="OnClick">
+            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
new file mode 100644
index 0000000000..1ab598aff8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+Generated Location: (705:20,7 [49] )
+|
+    void OnClick(UIMouseEventArgs e) {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.cspans.txt
new file mode 100644
index 0000000000..9244132d92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt
new file mode 100644
index 0000000000..efa4cd5f46
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..28)::28 - [<p class='foo' catchAll></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - pTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..24)::24 - [<p class='foo' catchAll>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - SingleQuotes - Unbound - [ class='foo']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..23)::9 - catchAll - Minimized - Unbound - [ catchAll]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.tspans.txt
new file mode 100644
index 0000000000..f9a1aca732
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - pTagHelper - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.cspans.txt
new file mode 100644
index 0000000000..9244132d92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt
new file mode 100644
index 0000000000..b3397e054d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..28)::28 - [<p CLASS='foo' CATCHAll></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..24)::24 - [<p CLASS='foo' CATCHAll>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - CLASS - SingleQuotes - Unbound - [ CLASS='foo']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [CLASS] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[CLASS];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..23)::9 - CATCHAll - Minimized - Unbound - [ CATCHAll]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [CATCHAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[CATCHAll];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4 - [</p>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.tspans.txt
new file mode 100644
index 0000000000..2a9461471f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.cspans.txt
new file mode 100644
index 0000000000..9244132d92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt
new file mode 100644
index 0000000000..abf07adaa8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..28)::28 - [<P class='foo' CATCHAll></P>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - P[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..24)::24 - [<P class='foo' CATCHAll>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[P];
+                MarkupTagHelperAttribute - [2..14)::12 - class - SingleQuotes - Unbound - [ class='foo']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..23)::9 - CATCHAll - Minimized - Unbound - [ CATCHAll]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [CATCHAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[CATCHAll];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4 - [</P>]
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[P];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.tspans.txt
new file mode 100644
index 0000000000..2a9461471f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [28] ) - catchAllTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.cspans.txt
new file mode 100644
index 0000000000..34f63d813d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [15] )
+Markup span at (2:0,2 [8] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
+Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [15] )
+Markup span at (15:0,15 [4] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt
new file mode 100644
index 0000000000..67601f532c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..19)::19 - [<P class='foo'></P>]
+    MarkupBlock - [0..19)::19
+        MarkupElement - [0..19)::19
+            MarkupStartTag - [0..15)::15 - [<P class='foo'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[P];
+                MarkupAttributeBlock - [2..14)::12 - [ class='foo']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupEndTag - [15..19)::4 - [</P>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[P];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.cspans.txt
new file mode 100644
index 0000000000..34f63d813d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [15] )
+Markup span at (2:0,2 [8] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
+Markup span at (10:0,10 [3] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
+Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [15] )
+Markup span at (15:0,15 [4] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [4] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt
new file mode 100644
index 0000000000..94fc32106e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..19)::19 - [<p Class='foo'></p>]
+    MarkupBlock - [0..19)::19
+        MarkupElement - [0..19)::19
+            MarkupStartTag - [0..15)::15 - [<p Class='foo'>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                MarkupAttributeBlock - [2..14)::12 - [ Class='foo']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [Class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                CloseAngle;[>];
+            MarkupEndTag - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 34d70280a2..04512ecb69 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -125,6 +125,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private TagHelperDescriptor CreateFallbackBindTagHelper()
         {
             var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName);
+            builder.CaseSensitive = true;
             builder.Documentation = ComponentResources.BindTagHelper_Fallback_Documentation;
 
             builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Bind.TagHelperKind);
@@ -292,6 +293,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 var eventName = entry.Suffix == null ? "Event_" + entry.ValueAttribute : "Event_" + entry.Suffix;
 
                 var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, name, ComponentsApi.AssemblyName);
+                builder.CaseSensitive = true;
                 builder.Documentation = string.Format(
                     ComponentResources.BindTagHelper_Element_Documentation,
                     entry.ValueAttribute,
@@ -469,6 +471,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Bind.TagHelperKind, tagHelper.Name, tagHelper.AssemblyName);
                     builder.DisplayName = tagHelper.DisplayName;
+                    builder.CaseSensitive = true;
                     builder.Documentation = string.Format(
                         ComponentResources.BindTagHelper_Component_Documentation,
                         valueAttribute.Name,
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 57b64c6abc..17eb8b3918 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -91,7 +91,10 @@ namespace Microsoft.CodeAnalysis.Razor
         private TagHelperDescriptor CreateShortNameMatchingDescriptor(ComponentSymbols symbols, INamedTypeSymbol type)
         {
             var builder = CreateDescriptorBuilder(symbols, type);
-            builder.TagMatchingRule(r => r.TagName = type.Name);
+            builder.TagMatchingRule(r =>
+            {
+                r.TagName = type.Name;
+            });
 
             return builder.Build();
         }
@@ -101,7 +104,10 @@ namespace Microsoft.CodeAnalysis.Razor
             var builder = CreateDescriptorBuilder(symbols, type);
             var containingNamespace = type.ContainingNamespace.ToDisplayString();
             var fullName = $"{containingNamespace}.{type.Name}";
-            builder.TagMatchingRule(r => r.TagName = fullName);
+            builder.TagMatchingRule(r =>
+            {
+                r.TagName = fullName;
+            });
             builder.Metadata[ComponentMetadata.Component.NameMatchKey] = ComponentMetadata.Component.FullyQualifiedNameMatch;
 
             return builder.Build();
@@ -114,6 +120,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
             var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Component.TagHelperKind, typeName, assemblyName);
             builder.SetTypeName(typeName);
+            builder.CaseSensitive = true;
 
             // This opts out this 'component' tag helper for any processing that's specific to the default
             // Razor ITagHelper runtime.
@@ -264,6 +271,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
             var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.ChildContent.TagHelperKind, typeName, assemblyName);
             builder.SetTypeName(typeName);
+            builder.CaseSensitive = true;
 
             // This opts out this 'component' tag helper for any processing that's specific to the default
             // Razor ITagHelper runtime.
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index d8683796a9..9eead66e2e 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -106,6 +106,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 var eventArgType = entry.EventArgsType.ToDisplayString();
 
                 var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.EventHandler.TagHelperKind, entry.Attribute, ComponentsApi.AssemblyName);
+                builder.CaseSensitive = true;
                 builder.Documentation = string.Format(
                     ComponentResources.EventHandlerTagHelper_Documentation,
                     attributeName,
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
index ea2830b91b..789abca318 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
@@ -41,6 +41,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private TagHelperDescriptor CreateKeyTagHelper()
         {
             var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Key.TagHelperKind, "Key", ComponentsApi.AssemblyName);
+            builder.CaseSensitive = true;
             builder.Documentation = ComponentResources.KeyTagHelper_Documentation;
 
             builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Key.TagHelperKind);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index ccc3ee7ad0..7cce7808e6 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -41,6 +41,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private TagHelperDescriptor CreateRefTagHelper()
         {
             var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName);
+            builder.CaseSensitive = true;
             builder.Documentation = ComponentResources.RefTagHelper_Documentation;
 
             builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Ref.TagHelperKind);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
index 86aa7a78e3..3d64214427 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
@@ -41,6 +41,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private TagHelperDescriptor CreateSplatTagHelper()
         {
             var builder = TagHelperDescriptorBuilder.Create(ComponentMetadata.Splat.TagHelperKind, "Attributes", ComponentsApi.AssemblyName);
+            builder.CaseSensitive = true;
             builder.Documentation = ComponentResources.SplatTagHelper_Documentation;
 
             builder.Metadata.Add(ComponentMetadata.SpecialKindKey, ComponentMetadata.Splat.TagHelperKind);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
index d8fd1bcbeb..117d9c0c34 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
@@ -35,6 +35,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.Bind")
                 .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.BindAttributes")
                 .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.EventHandlers")
+                .Where(c => !c.GetTypeName().StartsWith("Microsoft.AspNetCore.Components.Routing"))
                 .OrderBy(c => c.Name)
                 .ToArray();
         }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 825326d6f8..89b42a0ae3 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -76,6 +76,7 @@ namespace Test
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
             Assert.False(bind.IsComponentOrChildContentTagHelper());
+            Assert.True(bind.CaseSensitive);
 
             Assert.Equal("MyProperty", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
             Assert.Equal("MyPropertyChanged", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
@@ -197,6 +198,7 @@ namespace Test
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
             Assert.False(bind.IsComponentOrChildContentTagHelper());
+            Assert.True(bind.CaseSensitive);
 
             Assert.Equal("MyProperty", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
             Assert.Equal("MyPropertyChanged", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
@@ -349,6 +351,7 @@ namespace Test
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
             Assert.False(bind.IsComponentOrChildContentTagHelper());
+            Assert.True(bind.CaseSensitive);
 
             Assert.Equal("myprop", bind.Metadata[ComponentMetadata.Bind.ValueAttribute]);
             Assert.Equal("myevent", bind.Metadata[ComponentMetadata.Bind.ChangeAttribute]);
@@ -778,6 +781,7 @@ namespace Test
             Assert.False(bind.IsDefaultKind());
             Assert.False(bind.KindUsesDefaultTagHelperRuntime());
             Assert.False(bind.IsComponentOrChildContentTagHelper());
+            Assert.True(bind.CaseSensitive);
 
             Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.ValueAttribute));
             Assert.False(bind.Metadata.ContainsKey(ComponentMetadata.Bind.ChangeAttribute));
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index f5325fdb05..84e92ba30f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -65,6 +65,7 @@ namespace Test
             Assert.False(component.IsDefaultKind());
             Assert.False(component.KindUsesDefaultTagHelperRuntime());
             Assert.True(component.IsComponentOrChildContentTagHelper());
+            Assert.True(component.CaseSensitive);
 
             // No documentation in this test
             Assert.Null(component.Documentation);
@@ -108,6 +109,7 @@ namespace Test
             Assert.Null(attribute.IndexerTypeName);
             Assert.False(attribute.IsIndexerBooleanProperty);
             Assert.False(attribute.IsIndexerStringProperty);
+            Assert.True(component.CaseSensitive);
 
             // No documentation in this test
             Assert.Null(attribute.Documentation);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs
index 64f092cdb3..7465c6e903 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorFactoryTest.cs
@@ -200,12 +200,13 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             IEnumerable<Action<RequiredAttributeDescriptorBuilder>> configureBuilders)
         {
             // Arrange
-            var ruleBuilder = new DefaultTagMatchingRuleDescriptorBuilder();
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            var ruleBuilder = new DefaultTagMatchingRuleDescriptorBuilder(tagHelperBuilder);
 
             var expectedRules = new List<RequiredAttributeDescriptor>();
             foreach (var configureBuilder in configureBuilders)
             {
-                var builder = new DefaultRequiredAttributeDescriptorBuilder();
+                var builder = new DefaultRequiredAttributeDescriptorBuilder(ruleBuilder);
                 configureBuilder(builder);
 
                 expectedRules.Add(builder.Build());
@@ -216,7 +217,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
 
             // Assert
             var descriptors = ruleBuilder.Build().Attributes;
-            Assert.Equal(expectedRules, descriptors, RequiredAttributeDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedRules, descriptors, RequiredAttributeDescriptorComparer.Default);
         }
 
         public static TheoryData RequiredAttributeParserData
@@ -294,12 +295,13 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             IEnumerable<Action<RequiredAttributeDescriptorBuilder>> configureBuilders)
         {
             // Arrange
-            var ruleBuilder = new DefaultTagMatchingRuleDescriptorBuilder();
+            var tagHelperBuilder = new DefaultTagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
+            var ruleBuilder = new DefaultTagMatchingRuleDescriptorBuilder(tagHelperBuilder);
 
             var expectedRules = new List<RequiredAttributeDescriptor>();
             foreach (var configureBuilder in configureBuilders)
             {
-                var builder = new DefaultRequiredAttributeDescriptorBuilder();
+                var builder = new DefaultRequiredAttributeDescriptorBuilder(ruleBuilder);
                 configureBuilder(builder);
 
                 expectedRules.Add(builder.Build());
@@ -310,7 +312,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
 
             // Assert
             var descriptors = ruleBuilder.Build().Attributes;
-            Assert.Equal(expectedRules, descriptors, RequiredAttributeDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedRules, descriptors, RequiredAttributeDescriptorComparer.Default);
         }
 
         public static TheoryData IsEnumData
@@ -399,7 +401,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData RequiredParentData
@@ -450,7 +452,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData RestrictChildrenData
@@ -506,7 +508,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData TagStructureData
@@ -566,7 +568,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData EditorBrowsableData
@@ -741,7 +743,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData AttributeTargetData
@@ -938,7 +940,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData HtmlCaseData
@@ -1012,7 +1014,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1046,7 +1048,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1080,7 +1082,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1105,7 +1107,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1131,7 +1133,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1158,7 +1160,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1185,7 +1187,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1210,7 +1212,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1241,7 +1243,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1267,7 +1269,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1291,7 +1293,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
@@ -1310,7 +1312,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         // name, expectedErrorMessages
@@ -1763,7 +1765,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         public static TheoryData TagHelperWithPrefixData
@@ -2020,7 +2022,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             Assert.Equal(
                 expectedAttributeDescriptors,
                 descriptor.BoundAttributes,
-                BoundAttributeDescriptorComparer.CaseSensitive);
+                BoundAttributeDescriptorComparer.Default);
             Assert.Equal(expectedDiagnostics, descriptor.GetAllDiagnostics());
         }
 
@@ -2081,7 +2083,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var descriptor = factory.CreateDescriptor(typeSymbol);
 
             // Assert
-            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.Default);
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index e2d372f1fe..673ad67050 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -57,6 +57,7 @@ namespace Test
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
             Assert.False(item.IsComponentOrChildContentTagHelper());
+            Assert.True(item.CaseSensitive);
 
             Assert.Equal(
                 "Sets the '@onclick' attribute to the provided string or delegate value. " +
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
index b937b62685..3018afea55 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
@@ -36,6 +36,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
             Assert.False(item.IsComponentOrChildContentTagHelper());
+            Assert.True(item.CaseSensitive);
 
             Assert.Equal(
                 "Ensures that the component or element will be preserved across renders if (and only if) the supplied key value matches.",
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index ef4a3ed558..5740418f77 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -36,6 +36,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
             Assert.False(item.IsComponentOrChildContentTagHelper());
+            Assert.True(item.CaseSensitive);
 
             Assert.Equal(
                 "Generates the specified field, and populates it during rendering with a reference to the element or component.",
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
index c07c95a2aa..7832da05ac 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
@@ -35,6 +35,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.Equal(ComponentMetadata.Splat.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]);
             Assert.False(item.IsDefaultKind());
             Assert.False(item.KindUsesDefaultTagHelperRuntime());
+            Assert.True(item.CaseSensitive);
 
             Assert.Equal(
                 "Merges a collection of attributes into the current element or component.",
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
index b4fc6f105e..36f7a55414 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
@@ -351,7 +351,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
                 Assert.Equal(tagName, tagHelperNode.TagName);
                 Assert.Equal(tagMode, tagHelperNode.TagMode);
 
-                Assert.Equal(tagHelpers, tagHelperNode.TagHelpers, TagHelperDescriptorComparer.CaseSensitive);
+                Assert.Equal(tagHelpers, tagHelperNode.TagHelpers, TagHelperDescriptorComparer.Default);
             }
             catch (XunitException e)
             {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs
index 5bc81a7792..6590dd3065 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestTagHelperDescriptorBuilderExtensions.cs
@@ -55,6 +55,18 @@ namespace Microsoft.AspNetCore.Razor.Language
             return builder;
         }
 
+        public static TagHelperDescriptorBuilder SetCaseSensitive(this TagHelperDescriptorBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.CaseSensitive = true;
+
+            return builder;
+        }
+
         public static TagHelperDescriptorBuilder Documentation(this TagHelperDescriptorBuilder builder, string documentation)
         {
             if (builder == null)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
index b83fc48298..42a0d20589 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
@@ -45,3 +45,39 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public override string ToString() { throw null; }
     }
 }
+
+namespace Microsoft.AspNetCore.Components.Routing
+{
+    public partial class NavLink : Microsoft.AspNetCore.Components.IComponent, System.IDisposable
+    {
+        public NavLink() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ActiveClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues = true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { get; private set; }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public RenderFragment ChildContent { get; set; }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.Routing.NavLinkMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
+        public void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        public void Dispose() { }
+        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
+    }
+
+    public partial class Router : Microsoft.AspNetCore.Components.IComponent, System.IDisposable
+    {
+        public Router() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Reflection.Assembly AppAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment NotFoundContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment<AuthenticationState> NotAuthorizedContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment AuthorizingContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
+        public void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        public void Dispose() { }
+        protected virtual void Render(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, System.Type handler, System.Collections.Generic.IDictionary<string, object> parameters) { }
+        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
+    }
+}
diff --git a/src/Razor/test/testassets/ComponentApp/Components/App.razor b/src/Razor/test/testassets/ComponentApp/Components/App.razor
index 03eee81cef..72618a93bd 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/App.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/App.razor
@@ -2,4 +2,4 @@
     The Router component displays whichever component has a @page
     directive matching the current URI.
 *@
-<Router AppAssembly="typeof(Startup).Assembly" />
+<Router AppAssembly="typeof(Program).Assembly" />
diff --git a/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
index 08636e04e8..287317eba6 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
@@ -1 +1,2 @@
 @using ComponentApp.Components.Shared
+@using Microsoft.AspNetCore.Components.Routing

From 53841f90f9c9bd7146457cc767e67bb38c2c23f0 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Tue, 16 Jul 2019 00:24:38 -0700
Subject: [PATCH 205/337] Make some tweaks to the default content globs
 (dotnet/aspnetcore-tooling#820)

* Make some tweaks to the default content globs
- Don't publish/copy launchSettings.json
- Make sure static content and configuration work with single file turned on
- Added test

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/63e8681fffcad8d577438af39af008068d2e7c37
---
 ...Sdk.Razor.StaticAssets.ProjectSystem.props |  7 ++---
 .../Sdk.Razor.CurrentVersion.props            |  4 +--
 .../PublishIntegrationTest.cs                 |  8 +++++-
 .../SimpleMvc/Properties/launchSettings.json  | 27 +++++++++++++++++++
 .../SimpleMvc/appsettings.Development.json    |  9 +++++++
 .../testassets/SimpleMvc/appsettings.json     | 10 +++++++
 6 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/test/testassets/SimpleMvc/Properties/launchSettings.json
 create mode 100644 src/Razor/test/testassets/SimpleMvc/appsettings.Development.json
 create mode 100644 src/Razor/test/testassets/SimpleMvc/appsettings.json

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
index 4197d7dd74..f468e9caa7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
@@ -23,13 +23,14 @@ Copyright (c) .NET Foundation. All rights reserved.
     <DefaultItemExcludes>$(DefaultItemExcludes);**\jspm_packages\**;jspm_packages\**</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\bower_components\**;bower_components\**</DefaultItemExcludes>
     <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);wwwroot\**</DefaultWebContentItemExcludes>
+    <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);**\launchSettings.json</DefaultWebContentItemExcludes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' ">
     <!-- Publish everything under wwwroot, all JSON files, all config files and all Razor files -->
-    <Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    <Content Include="**\*.config" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
-    <Content Include="**\*.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="wwwroot\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
 
     <!-- Set CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid publishing launchSettings.json -->
     <Content Update="$(AppDesignerFolder)\**" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>   
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index ca4dc883af..b7d17b206b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -74,8 +74,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true'">
-    <Content Include="**\*.cshtml" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
-    <Content Include="**\*.razor" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="**\*.cshtml" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="**\*.razor" ExcludeFromSingleFile="true" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
     <None Remove="**\*.cshtml" />
     <None Remove="**\*.razor" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index ef50fffce3..b33a6b0c71 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]
-        public async Task Publish_PublishesAssembly()
+        public async Task Publish_PublishesAssemblyAndContent()
         {
             var result = await DotnetMSBuild("Publish");
 
@@ -49,11 +49,17 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "SimpleMvc.pdb");
             Assert.FileExists(result, OutputPath, "SimpleMvc.Views.dll");
             Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
+            Assert.FileExists(result, OutputPath, "appsettings.json");
+            Assert.FileExists(result, OutputPath, "appsettings.Development.json");
+            Assert.FileDoesNotExist(result, OutputPath, Path.Combine("Properties", "launchSettings.json"));
 
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+            Assert.FileExists(result, PublishOutputPath, "appsettings.json");
+            Assert.FileExists(result, PublishOutputPath, "appsettings.Development.json");
+            Assert.FileDoesNotExist(result, PublishOutputPath, Path.Combine("Properties", "launchSettings.json"));
 
             // By default refs and .cshtml files will not be copied on publish
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
diff --git a/src/Razor/test/testassets/SimpleMvc/Properties/launchSettings.json b/src/Razor/test/testassets/SimpleMvc/Properties/launchSettings.json
new file mode 100644
index 0000000000..386e239170
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false, 
+    "anonymousAuthentication": true, 
+    "iisExpress": {
+      "applicationUrl": "http://localhost:55451",
+      "sslPort": 44333
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "SimpleMvc": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc/appsettings.Development.json b/src/Razor/test/testassets/SimpleMvc/appsettings.Development.json
new file mode 100644
index 0000000000..e203e9407e
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc/appsettings.json b/src/Razor/test/testassets/SimpleMvc/appsettings.json
new file mode 100644
index 0000000000..d9d9a9bff6
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}

From f2f0bed885334740da04ffb4906583329f0a5a1a Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 16 Jul 2019 13:11:15 -0700
Subject: [PATCH 206/337] Support [Parameter] attribute on base class of
 overridden properties (dotnet/aspnetcore-tooling#835)

* Support [Parameter] attribute on base class of overridden properties

* Fix test
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c228339bb38de8508e391a7c14577f0d5ae43c9c
---
 .../ComponentTagHelperDescriptorProvider.cs   |  7 ++
 ...omponentTagHelperDescriptorProviderTest.cs | 67 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 17eb8b3918..30b8983983 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -386,6 +386,13 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     if (!property.GetAttributes().Any(a => a.AttributeClass == symbols.ParameterAttribute))
                     {
+                        if (property.IsOverride)
+                        {
+                            // This property does not contain [Parameter] attribute but it was overridden. Don't ignore it for now.
+                            // We can ignore it if the base class does not contains a [Parameter] as well.
+                            continue;
+                        }
+
                         // Does not have [Parameter]
                         kind = PropertyKind.Ignored;
                     }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 84e92ba30f..329a8606b5 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -1436,5 +1436,72 @@ namespace Test
 
             Assert.Empty(component.BoundAttributes);
         }
+
+        [Fact] // Testing multilevel overrides with the [Parameter] attribute on different levels.
+        public void Execute_MultiLevelOverriddenProperties_CreatesDescriptorCorrectly()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public abstract class MyBaseComponent : ComponentBase
+    {
+        [Parameter]
+        public virtual string Header { get; set; }
+
+        public virtual string Footer { get; set; }
+    }
+
+    public abstract class MyDerivedComponent1 : MyBaseComponent
+    {
+        public override string Header { get; set; }
+
+        [Parameter]
+        public override string Footer { get; set; }
+    }
+
+    public class MyDerivedComponent2 : MyDerivedComponent1
+    {
+        public override string Header { get; set; }
+
+        public override string Footer { get; set; }
+    }
+}
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
+            var component = Assert.Single(components, c => c.IsComponentTagHelper());
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyDerivedComponent2", component.Name);
+
+            Assert.Collection(
+                component.BoundAttributes.OrderBy(a => a.Name),
+                a =>
+                {
+                    Assert.Equal("Footer", a.Name);
+                    Assert.Equal("System.String", a.TypeName);
+                },
+                a =>
+                {
+                    Assert.Equal("Header", a.Name);
+                    Assert.Equal("System.String", a.TypeName);
+                });
+        }
     }
 }

From fde8f98d7e244684c0c07196dcb13491d857caa7 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 16 Jul 2019 14:55:06 -0700
Subject: [PATCH 207/337] Reactions to API review changes + Globalisation
 support (dotnet/aspnetcore-tooling#829)

* Update ref assembly APIs

There are some impactful changes here for the compiler that are part of the API review.

The next few commits will implement all of the required changes.

* React to API review + globalization changes

* Updates to generated baselines

* Add missed file

* Update src/Razor/src/Microsoft.CodeAnalysis.Razor/EventHandlerTagHelperDescriptorProvider.cs

Co-Authored-By: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>

* more baseline updates
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d955be50133b90455028fa84e6c439dd2cab1af2
---
 .../Components/ComponentBindLoweringPass.cs   |  77 +++---
 .../src/Components/ComponentsApi.cs           |  21 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   4 -
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../Regression_597/TestComponent.codegen.cs   |   2 +-
 .../Regression_597/TestComponent.ir.txt       |   2 +-
 .../Regression_597/TestComponent.mappings.txt |   4 +-
 .../Regression_609/TestComponent.codegen.cs   |   4 +-
 .../Regression_609/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.mappings.txt |   6 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   2 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   4 -
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Regression_597/TestComponent.codegen.cs   |   2 +-
 .../Regression_597/TestComponent.ir.txt       |   2 +-
 .../Regression_597/TestComponent.mappings.txt |   2 +-
 .../Regression_609/TestComponent.codegen.cs   |   4 +-
 .../Regression_609/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.mappings.txt |   2 +-
 .../src/BindTagHelperDescriptorProvider.cs    |   4 +-
 ...EventHandlerTagHelperDescriptorProvider.cs |   4 +-
 ...ft.AspNetCore.Components.netstandard2.0.cs | 257 ++++++++----------
 .../Components/Pages/FetchData.razor          |   2 +-
 387 files changed, 692 insertions(+), 807 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index c782a3709c..44967b9077 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -596,20 +596,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             List<IntermediateToken> valueExpressionTokens,
             List<IntermediateToken> changeExpressionTokens)
         {
-            // Now rewrite the content of the value node to look like:
-            //
-            // BindMethods.GetValue(<code>)
-            valueExpressionTokens.Add(new IntermediateToken()
-            {
-                Content = $"{ComponentsApi.BindMethods.GetValue}(",
-                Kind = TokenKind.CSharp
-            });
             valueExpressionTokens.Add(original);
-            valueExpressionTokens.Add(new IntermediateToken()
-            {
-                Content = ")",
-                Kind = TokenKind.CSharp,
-            });
 
             // Now rewrite the content of the change-handler node. Since it's a component attribute,
             // we don't use the 'BindMethods' wrapper. We expect component attributes to always 'match' on type.
@@ -631,41 +618,53 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             List<IntermediateToken> valueExpressionTokens,
             List<IntermediateToken> changeExpressionTokens)
         {
-            // Now rewrite the content of the value node to look like:
-            //
-            // BindMethods.GetValue(<code>, format: <format>, culture: <culture>)
-            valueExpressionTokens.Add(new IntermediateToken()
-            {
-                Content = $"{ComponentsApi.BindMethods.GetValue}(",
-                Kind = TokenKind.CSharp
-            });
-            valueExpressionTokens.Add(original);
-
-            if (!string.IsNullOrEmpty(format?.Content))
+            if (changeAttribute == null)
             {
+                // This is bind on a markup element. We use FormatValue to transform the value in the correct way
+                // according to format and culture.
+                //
+                // Now rewrite the content of the value node to look like:
+                //
+                // BindConverter.FormatValue(<code>, format: <format>, culture: <culture>)
                 valueExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = ", format: ",
-                    Kind = TokenKind.CSharp,
+                    Content = $"{ComponentsApi.BindConverter.FormatValue}(",
+                    Kind = TokenKind.CSharp
                 });
-                valueExpressionTokens.Add(format);
-            }
+                valueExpressionTokens.Add(original);
+
+                if (!string.IsNullOrEmpty(format?.Content))
+                {
+                    valueExpressionTokens.Add(new IntermediateToken()
+                    {
+                        Content = ", format: ",
+                        Kind = TokenKind.CSharp,
+                    });
+                    valueExpressionTokens.Add(format);
+                }
+
+                if (!string.IsNullOrEmpty(culture?.Content))
+                {
+                    valueExpressionTokens.Add(new IntermediateToken()
+                    {
+                        Content = ", culture: ",
+                        Kind = TokenKind.CSharp,
+                    });
+                    valueExpressionTokens.Add(culture);
+                }
 
-            if (!string.IsNullOrEmpty(culture?.Content))
-            {
                 valueExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = ", culture: ",
+                    Content = ")",
                     Kind = TokenKind.CSharp,
                 });
-                valueExpressionTokens.Add(culture);
             }
-
-            valueExpressionTokens.Add(new IntermediateToken()
+            else
             {
-                Content = ")",
-                Kind = TokenKind.CSharp,
-            });
+                // This is a component. We can just use the value as-is, since we know its type
+                // we can type-check it.
+                valueExpressionTokens.Add(original);
+            }
 
             // Now rewrite the content of the change-handler node. There are two cases we care about
             // here. If it's a component attribute, then don't use the 'CreateBinder' wrapper. We expect
@@ -676,7 +675,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // since the generic type lowering pass runs after this. To keep this simple we're relying on
             // the compiler to resolve overloads for us.
             //
-            // EventCallbackFactory.CreateInferred(this, __value => <code> = __value, <code>)
+            // RuntimeHelpers.CreateInferredEventCallback(this, __value => <code> = __value, <code>)
             //
             // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs
             // so we use 'CreateBinder'
@@ -727,7 +726,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // Component
                 changeExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateInferredMethod}(this, __value => {original.Content} = __value, {original.Content})",
+                    Content = $"{ComponentsApi.RuntimeHelpers.CreateInferredEventCallback}(this, __value => {original.Content} = __value, {original.Content})",
                     Kind = TokenKind.CSharp
                 });
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 231e09c389..9ca5c2795c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -99,7 +99,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static class RuntimeHelpers
         {
-            public static readonly string TypeCheck = "Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck";
+            public static readonly string TypeCheck = "Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck";
+            public static readonly string CreateInferredEventCallback = "Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback";
         }
 
         public static class RouteAttribute
@@ -117,17 +118,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindInputElementAttribute";
         }
 
-        public static class BindMethods
-        {
-            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindMethods";
-
-            public static readonly string GetValue = "Microsoft.AspNetCore.Components.BindMethods.GetValue";
-
-            public static readonly string GetEventHandlerValue = "Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue";
-
-            public static readonly string SetValueHandler = "Microsoft.AspNetCore.Components.BindMethods.SetValueHandler";
-        }
-
         public static class EventHandlerAttribute
         {
             public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.EventHandlerAttribute";
@@ -154,8 +144,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static class EventCallbackFactory
         {
             public static readonly string CreateMethod = "Create";
-            public static readonly string CreateInferredMethod = "CreateInferred";
             public static readonly string CreateBinderMethod = "CreateBinder";
         }
+
+        public static class BindConverter
+        {
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindConverter";
+            public static readonly string FormatValue = "Microsoft.AspNetCore.Components.BindConverter.FormatValue";
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 48a9aac0be..7be8d7f4e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,10 +28,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index f1c3277f4c..ec89ce657d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -17,12 +17,10 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 0466456ce0..c9ee86a90f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2034:48,7 [50] )
+Generated Location: (2054:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 14c0e532b7..26ddc3e136 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)), -1, () => ParentValue);
+            , -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)), -1, () => ParentValue);
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent<>);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index b6804a480f..40c7a8ac25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -17,12 +17,10 @@ Document -
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index ba675b0d4b..4cfc1f7bc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1019:25,30 [11] )
+Generated Location: (966:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1607:43,7 [65] )
+Generated Location: (1576:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 932e5947f2..3fc3e0cd79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,9 +28,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)));
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index b5714b59f0..a212e7bae1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -17,12 +17,10 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 08a93bce54..c50a7bdf76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1875:47,7 [50] )
+Generated Location: (1878:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 310193d77e..0f40d83861 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,9 +28,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)));
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 09ffa521c2..30cebd1865 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -17,12 +17,10 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 873fe767a1..0ea94e535a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1875:47,7 [55] )
+Generated Location: (1878:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 56b9859e1c..42508c36b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
+            );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index ffc3061c93..0268f19e3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 9bdaa2dd2c..c0725292a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1618:47,7 [50] )
+Generated Location: (1581:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index a566b81ae8..86034d23fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index d2694f5c56..9f7149a4dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 4a2a67a893..3ef391e308 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (942:25,26 [11] )
+Generated Location: (947:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1586:46,7 [50] )
+Generated Location: (1591:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index e311953374..ec2368c916 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,10 +28,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
+            );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index c0f022b144..9d7522111f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 924842fe6f..bd70fd3db4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1777:48,7 [50] )
+Generated Location: (1757:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index d61796bfb3..b15d1c4ec2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), -1, 
+            , -1, 
             __value => ParentValue = __value, -1, () => ParentValue);
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 07954f6de8..c669dfee2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 3908cd852f..7fe3bf6930 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1019:25,30 [11] )
+Generated Location: (966:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1450:43,7 [65] )
+Generated Location: (1396:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 56b9859e1c..42508c36b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
+            );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 2d0ae0e2af..3c83d639da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 66df946089..be3b89e307 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1618:47,7 [50] )
+Generated Location: (1581:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index a566b81ae8..86034d23fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 904bfff201..40bb41ba35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index e6648b14bf..4667924f8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (942:25,26 [11] )
+Generated Location: (947:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1586:46,7 [50] )
+Generated Location: (1591:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 5f4ccb8193..02a15cd5c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
+            );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index af8a73c6a8..50706736a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index da594880db..02121735c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1013:25,26 [11] )
+Generated Location: (977:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1618:47,7 [55] )
+Generated Location: (1581:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 49852e1c94..6975f2681e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         person.Name
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
+            );
             __o = new System.Action<System.String>(
             __value => person.Name = __value);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 2b142f55e5..6f9c65d90c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index d4ad38aafb..2c994addb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1012:25,24 [11] )
+Generated Location: (976:25,24 [11] )
 |person.Name|
 
 Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1610:47,1 [37] )
+Generated Location: (1573:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index f2a1a02408..7b701d4222 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ using System.Globalization;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
index 78ff1a478d..657741b08e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                 MarkupElement - (29:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - , culture: 
                             IntermediateToken - (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index 25752a14fb..d576c2a37f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1084:32,19 [11] )
+Generated Location: (1089:32,19 [11] )
 |ParentValue|
 
 Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1324:40,82 [28] )
+Generated Location: (1329:40,82 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1725:51,7 [55] )
+Generated Location: (1730:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index e83a80ecb2..0fabed7c49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index 9efe74f1a5..8af89adba4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index f9ae36bb02..ba792cb574 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,33 [11] )
+Generated Location: (954:25,33 [11] )
 |CurrentDate|
 
 Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1328:36,7 [77] )
+Generated Location: (1333:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 2737e15abb..efdf4713d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 9db9835275..c2bffe88ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index d92bef9aad..2035beb92f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (949:25,33 [11] )
+Generated Location: (954:25,33 [11] )
 |ParentValue|
 
 Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1294:36,7 [50] )
+Generated Location: (1299:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 252e818029..5da9024d59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ using System.Globalization;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
index 007192ed29..d55cce1b12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                 MarkupElement - (29:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - , culture: 
                             IntermediateToken - (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index 6e739209a6..0d0eeb7185 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1084:32,19 [11] )
+Generated Location: (1089:32,19 [11] )
 |ParentValue|
 
 Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1328:40,86 [28] )
+Generated Location: (1333:40,86 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1729:51,7 [55] )
+Generated Location: (1734:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index 5d14fcab61..7a545a3bc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 69e345525f..0d17a3b15d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index 8a91076d22..e33f95dbe0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (935:25,19 [11] )
+Generated Location: (940:25,19 [11] )
 |ParentValue|
 
 Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1280:36,7 [55] )
+Generated Location: (1285:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 5d14fcab61..7a545a3bc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index c171f66544..13e4603f0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index c0af8cf16d..8567978058 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (935:25,19 [11] )
+Generated Location: (940:25,19 [11] )
 |ParentValue|
 
 Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1280:36,7 [55] )
+Generated Location: (1285:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index cc42c20393..e6f68d671e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 96a50d7bda..3d5a20a277 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 4e98c7071a..b5823cdfeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (934:25,18 [11] )
+Generated Location: (939:25,18 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1279:36,7 [55] )
+Generated Location: (1284:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index b46dbe810a..901c74a6ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
              ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index ad911fb0e3..4e0a9b45d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 56d4bb435c..d40455e21b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (929:25,13 [11] )
+Generated Location: (934:25,13 [11] )
 |ParentValue|
 
 Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1274:36,7 [55] )
+Generated Location: (1279:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index f36625f879..7a3608cc35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ using System.Globalization;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
index ccb9cf5cd5..bd3a07f1da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -23,7 +23,7 @@ Document -
                             IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 665ed3939a..c85a2945c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1100:32,35 [11] )
+Generated Location: (1105:32,35 [11] )
 |ParentValue|
 
 Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1445:43,7 [44] )
+Generated Location: (1450:43,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index bb11acafc7..8a72200ebf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -27,7 +27,7 @@ using System.Globalization;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
index 4ca37a146e..87417806aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -23,7 +23,7 @@ Document -
                             IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - , culture: 
                             IntermediateToken - (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.CurrentCulture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 473afca9ec..a5a2105035 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1100:32,35 [11] )
+Generated Location: (1105:32,35 [11] )
 |ParentValue|
 
 Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.CurrentCulture|
-Generated Location: (1360:40,102 [26] )
+Generated Location: (1365:40,102 [26] )
 |CultureInfo.CurrentCulture|
 
 Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1757:51,7 [44] )
+Generated Location: (1762:51,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index cb7b7debdd..560d39bb4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                Enabled
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 2648deba46..05148553b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
                     HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index e24c153627..a21573ec5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (947:25,31 [7] )
+Generated Location: (952:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1280:36,7 [41] )
+Generated Location: (1285:36,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 2be8d03bc4..367c2f9daa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index f2d6f24fea..9b157d9f6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 6822b2eb97..9d63f874e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (931:25,15 [11] )
+Generated Location: (936:25,15 [11] )
 |CurrentDate|
 
 Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1310:36,7 [77] )
+Generated Location: (1315:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 377625918b..6c47ebef71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index 42f3b81187..0b39357e3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 55bf9664ff..03c9594634 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (943:25,27 [11] )
+Generated Location: (948:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1155:33,55 [6] )
+Generated Location: (1160:33,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1511:44,7 [135] )
+Generated Location: (1516:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index af0c835269..fb376ad8e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index d5387e6c5b..e00832392c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 84bf4089f8..105600bcfc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (943:25,27 [11] )
+Generated Location: (948:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1332:36,7 [77] )
+Generated Location: (1337:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 0279733c99..30ba41e5fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index d4a98c99b0..c957b3db86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index adbb250ced..380b028dea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (943:25,27 [11] )
+Generated Location: (948:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1288:36,7 [50] )
+Generated Location: (1293:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 002e30ab48..7d58befd6a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
index 4c33c993ae..ae0fc3cd64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 549b7e76ed..99c40d964b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (945:25,29 [11] )
+Generated Location: (950:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1470:36,7 [77] )
+Generated Location: (1475:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 974b00dd97..868907adc5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index 80c2dfafb6..4f650a79fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index c58e34b7e2..27e6ee17ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (945:25,29 [11] )
+Generated Location: (950:25,29 [11] )
 |CurrentDate|
 
 Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1324:36,7 [77] )
+Generated Location: (1329:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index f1bff0c17a..0750ea007d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index ad47c7682c..6723842455 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index d72e7ff4af..9ddc92381f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (945:25,29 [11] )
+Generated Location: (950:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1334:36,7 [77] )
+Generated Location: (1339:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 126d2d6d4e..abc363492d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 621f00ef97..7093da7936 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index a138567246..25eda5c5b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (937:25,21 [11] )
+Generated Location: (942:25,21 [11] )
 |CurrentDate|
 
 Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1316:36,7 [77] )
+Generated Location: (1321:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 126d2d6d4e..abc363492d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index 134a4ad741..ef8d403731 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 3bdb56d390..558adf3a5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (937:25,21 [11] )
+Generated Location: (942:25,21 [11] )
 |CurrentDate|
 
 Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1316:36,7 [77] )
+Generated Location: (1321:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 8fa1fcd4fb..c49adc5c40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index aa3036f0b6..93c9467f1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index dd1de53b35..4f322bbe51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (931:25,15 [11] )
+Generated Location: (936:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1276:36,7 [50] )
+Generated Location: (1281:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index b27cbb9cee..63d05a0547 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index cc284456ad..763a0bf5a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (889:25,19 [6] )
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1152:34,34 [4] )
+Generated Location: (1169:34,34 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index 8cc3c4a891..c522eac80a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -37,7 +37,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
+            );
             __o = new System.Action<string>(
             __value => Value = __value);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 9117695d7f..153e88860b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -19,9 +19,7 @@ Document -
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 442c3deeb2..8465dd3c61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (889:25,19 [6] )
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1208:34,37 [5] )
+Generated Location: (1172:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1797:56,7 [21] )
+Generated Location: (1760:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 71ba78116a..e988d14f86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index a7769a7c21..bf90946e51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -19,7 +19,7 @@ Document -
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index edd0c76b17..ae029ecce0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (889:25,19 [6] )
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1143:34,37 [5] )
+Generated Location: (1148:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1771:55,7 [21] )
+Generated Location: (1776:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index f20ff8b076..f7a93c0716 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            , -1, Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 361aae1b27..5fe76a0a34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 7631f9bc1a..169a8784c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (974:25,38 [2] )
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1195:33,24 [5] )
+Generated Location: (1200:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1658:50,7 [21] )
+Generated Location: (1663:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index d60000b73d..2a203d9d56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), -1, 
+            , -1, 
             __value => Value = __value);
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -37,7 +37,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -45,7 +45,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            ), -1, 
+            , -1, 
             __value => Value = __value);
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index eb98580da1..8f8e5cf377 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -17,9 +17,7 @@ Document -
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
@@ -28,9 +26,7 @@ Document -
                 Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index eb3bdbdaff..36ebb9a0c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1013:25,24 [5] )
+Generated Location: (960:25,24 [5] )
 |Value|
 
 Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1523:42,24 [5] )
+Generated Location: (1416:42,24 [5] )
 |Value|
 
 Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1919:60,7 [21] )
+Generated Location: (1811:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 2ddd9828e7..cf13151b38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index 5bf0aeeec5..a2ec092221 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (889:25,19 [6] )
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1152:34,34 [4] )
+Generated Location: (1169:34,34 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1442:43,8 [17] )
+Generated Location: (1459:43,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 5d38ba5cf9..3205ac3ee3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index ca9cc6f3de..5c094cfc39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (889:25,19 [6] )
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1152:34,34 [4] )
+Generated Location: (1169:34,34 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1364:43,50 [2] )
+Generated Location: (1381:43,50 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index eecbd1cbd1..530e779a3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index cf2ed1da6f..9884c9a586 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -10,16 +10,16 @@ Generated Location: (1095:34,34 [3] )
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1367:43,46 [4] )
+Generated Location: (1384:43,46 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1671:52,22 [17] )
+Generated Location: (1688:52,22 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2024:62,6 [29] )
+Generated Location: (2041:62,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 09e33fcb22..cd66c6e6f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                42.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index 610dae86d3..ae40146e0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (966:25,31 [13] )
+Generated Location: (983:25,31 [13] )
 |42.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index e2b89244b0..70f1e56a74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  123
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                   true
@@ -39,7 +39,7 @@ namespace Test
 #nullable disable
             );
             __o = "";
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Test.SomeType>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Test.SomeType>(
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
                     new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index ee53944128..b9d100debf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (951:25,17 [3] )
+Generated Location: (968:25,17 [3] )
 |123|
 
 Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1203:34,18 [4] )
+Generated Location: (1237:34,18 [4] )
 |true|
 
 Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (1480:44,20 [14] )
+Generated Location: (1531:44,20 [14] )
 |new SomeType()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index 766172880e..4b91b6aeec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            "very-cool"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index 4b7cb2f3e5..186f27b5d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (961:25,27 [11] )
+Generated Location: (978:25,27 [11] )
 |"very-cool"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 0e75622023..ea87b28a2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ __o = typeof(MyComponent);
 #line hidden
 #nullable disable
             __o = "";
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                            true
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index e01a00ec83..8955bb780d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1301:36,43 [4] )
+Generated Location: (1318:36,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 447d620529..dbeeb61af4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           1
@@ -39,7 +39,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                           2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index f3773885e4..a6c68eaee7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (960:25,26 [1] )
+Generated Location: (977:25,26 [1] )
 |1|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1515:44,26 [1] )
+Generated Location: (1549:44,26 [1] )
 |2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index 0d4169fba6..fee8846024 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                    someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index f41e1dd4b4..e4d1f8e74e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1135:26,51 [14] )
+Generated Location: (1152:26,51 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1666:47,7 [93] )
+Generated Location: (1683:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 043027af8e..bb121866dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                      someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index d001b6cf92..247d7e49bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1137:26,53 [14] )
+Generated Location: (1154:26,53 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1668:47,7 [93] )
+Generated Location: (1685:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 72eef6602a..051bc60e00 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                     someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 37bc7bc713..37668646bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1136:26,52 [14] )
+Generated Location: (1153:26,52 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1667:47,7 [93] )
+Generated Location: (1684:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index cc8558c98c..229f1becc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        message
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                 message
@@ -37,10 +37,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 7b51a53f1f..1caa937f75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -20,12 +20,10 @@ Document -
                             IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                     ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
                     ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index d4cba761d7..49571edb25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (958:25,23 [7] )
+Generated Location: (975:25,23 [7] )
 |message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1296:34,48 [7] )
+Generated Location: (1277:34,48 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2311:57,12 [30] )
+Generated Location: (2348:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index e34f2ea5ff..fb61adda19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                (s) => {}
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            message
@@ -37,10 +37,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index a73923595e..81db5db1e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -20,12 +20,10 @@ Document -
                             IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
                     ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
                     ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index bb72545bd8..74e40ca462 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1095:25,31 [9] )
+Generated Location: (1112:25,31 [9] )
 |(s) => {}|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1447:34,59 [7] )
+Generated Location: (1428:34,59 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2462:57,12 [30] )
+Generated Location: (2499:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index d4bea213d0..3ce8d3cd7d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            (s) => {}
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              message
@@ -37,10 +37,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
-            Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)));
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 1cefc1292f..2c92b68993 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -20,12 +20,10 @@ Document -
                             IntermediateToken - (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
                     ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
                     ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 6c92b35afa..32a4443a34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1045:25,59 [9] )
+Generated Location: (1062:25,59 [9] )
 |(s) => {}|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1366:34,29 [7] )
+Generated Location: (1347:34,29 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2381:57,12 [30] )
+Generated Location: (2418:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 6446930de5..6c94df8c33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 99c52ebd52..e6acb85f74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -26,7 +26,7 @@ Document -
                                 IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                                 IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 2b13abd3aa..f46f6aa7a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (956:25,40 [4] )
+Generated Location: (961:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1285:36,12 [35] )
+Generated Location: (1290:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index cab428a587..886b37eeec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 957bb8a901..c8b2872737 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -28,7 +28,7 @@ Document -
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                                 IntermediateToken - (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 4e0821e071..8dc8abe4e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (1060:25,79 [8] )
 
 Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1314:34,35 [4] )
+Generated Location: (1319:34,35 [4] )
 |text|
 
 Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1643:45,12 [35] )
+Generated Location: (1648:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 6446930de5..6c94df8c33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index efe595e922..723920a879 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -26,7 +26,7 @@ Document -
                                 IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                                 IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 2b13abd3aa..f46f6aa7a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (956:25,40 [4] )
+Generated Location: (961:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1285:36,12 [35] )
+Generated Location: (1290:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 425b0783a4..0fadab0d3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 7aa265e6be..916ca31485 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1105:25,44 [14] )
+Generated Location: (1122:25,44 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1314:35,7 [93] )
+Generated Location: (1331:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 834d985403..33632e8561 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index fe05732372..0e312eb28d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1107:25,46 [14] )
+Generated Location: (1124:25,46 [14] )
 |someAttributes|
 
 Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1316:35,7 [93] )
+Generated Location: (1333:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 5e89ad26c1..7f7a3b82be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                              someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 93a63203a3..caa3b425c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1106:25,45 [14] )
+Generated Location: (1123:25,45 [14] )
 |someAttributes|
 
 Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1315:35,7 [93] )
+Generated Location: (1332:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 15e652f044..84cb4af19a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index c41b34a815..2f702990f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
-Generated Location: (1158:25,24 [63] )
+Generated Location: (1175:25,24 [63] )
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
 
 Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1715:45,7 [87] )
+Generated Location: (1732:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 95ff31d12a..ccc0a77635 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 66c6ba82b5..dbcd4f4d73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1157:25,23 [9] )
+Generated Location: (1174:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1660:45,7 [87] )
+Generated Location: (1677:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 5458606369..0bc8b52d90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index d49b4b109b..b0be975756 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1157:25,23 [9] )
+Generated Location: (1174:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1660:45,7 [105] )
+Generated Location: (1677:45,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index d837a6e56e..50185a60ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 2d4d8d0b2a..e8804b37c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1157:25,23 [9] )
+Generated Location: (1174:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1660:45,7 [141] )
+Generated Location: (1677:45,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 87b4996556..ce6a05af80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 9c63a90996..f12883b5f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1157:25,23 [9] )
+Generated Location: (1174:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1660:45,7 [123] )
+Generated Location: (1677:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index fe5e75441a..dd7544d84c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 7458a896e3..78bdc265be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1157:25,23 [9] )
+Generated Location: (1174:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1660:45,7 [106] )
+Generated Location: (1677:45,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index d9451b8187..ea43a1106e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create(this, Increment)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 67bac6500c..6c4d5e5049 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1058:25,24 [45] )
+Generated Location: (1075:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1597:45,7 [87] )
+Generated Location: (1614:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index bb1977b151..b4540238f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 8bc4fdbc56..d604b3f575 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1057:25,23 [9] )
+Generated Location: (1074:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1560:45,7 [87] )
+Generated Location: (1577:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index eb10185e7a..5284b005d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 7622fc9b19..a98a8fb81d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1057:25,23 [9] )
+Generated Location: (1074:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1560:45,7 [95] )
+Generated Location: (1577:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index d5654eca4c..aefefab09d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 2b9ee7f0a7..7dbd683cbf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1057:25,23 [9] )
+Generated Location: (1074:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1560:45,7 [123] )
+Generated Location: (1577:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index b8e065d586..60aa6bcc30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index e266bc22f0..9d66274740 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1057:25,23 [9] )
+Generated Location: (1074:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1560:45,7 [131] )
+Generated Location: (1577:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 56d704b4b6..9642f23e5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index a07e89c131..f28dedb313 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -5,12 +5,12 @@ Generated Location: (889:25,19 [3] )
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1141:34,29 [1] )
+Generated Location: (1158:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1469:45,38 [3] )
+Generated Location: (1486:45,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +18,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1834:61,7 [72] )
+Generated Location: (1851:61,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index d46aeaee75..a3fec8cb12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 4857c6f360..1caa18ce0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (889:25,19 [3] )
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1141:34,29 [1] )
+Generated Location: (1158:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1498:46,38 [8] )
+Generated Location: (1515:46,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1850:63,7 [47] )
+Generated Location: (1867:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index cb715e3038..247e970014 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             (builder2) => {
-                __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+                __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 2bd8085ef4..fc3995173f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -7,13 +7,13 @@ Generated Location: (845:24,2 [45] )
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1206:34,69 [11] )
+Generated Location: (1223:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1775:53,89 [3] )
+Generated Location: (1792:53,89 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1954:62,7 [76] )
+Generated Location: (1971:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index cbc2108a2a..a0d37e8491 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             (builder2) => {
-                __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+                __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index a788b4b35b..337ee8fc34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -7,19 +7,19 @@ Generated Location: (845:24,2 [45] )
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1206:34,69 [11] )
+Generated Location: (1223:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1775:53,89 [3] )
+Generated Location: (1792:53,89 [3] )
 |;
 |
 
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2023:61,6 [15] )
+Generated Location: (2040:61,6 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +29,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2397:79,7 [76] )
+Generated Location: (2414:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 5c310b5786..2e6824def5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   y
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 0e63407eea..5774e0937c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index b3a9e934e4..edbe22c916 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (934:25,18 [1] )
+Generated Location: (939:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1544:46,7 [24] )
+Generated Location: (1549:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index d64ca1fb18..cf186ba2f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    UserName
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             );
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName);
-            __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               UserIsActive
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index bb5418dc19..1f1500b2e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
@@ -27,7 +27,7 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 7df83c3172..75803fb231 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (935:25,19 [8] )
+Generated Location: (940:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1334:35,46 [12] )
+Generated Location: (1344:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1974:56,7 [88] )
+Generated Location: (1984:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 144a855427..81f4d69b4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,9 +22,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
-            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            ));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index c8e69bdb3f..0e5d245109 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -10,12 +10,10 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 0a65321b47..fc5e357718 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1650:32,7 [50] )
+Generated Location: (1670:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 20b7089700..61dc14c2b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -13,7 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -21,7 +21,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)), 3, () => ParentValue);
+            , 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)), 3, () => ParentValue);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 1178f40ae1..b3e91d9b99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -10,12 +10,10 @@ Document -
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index e5d3fe30f6..79181205e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1171:28,7 [65] )
+Generated Location: (1140:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index f9bed79ba5..10cded108c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
+            ));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 566973aec1..ff2e3f4654 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -10,11 +10,9 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 5601a367b0..f90e041fcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1453:31,7 [50] )
+Generated Location: (1456:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index c7ae787add..7e9335216d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue))));
+            ));
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 177de17395..743e22d318 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -10,11 +10,9 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => ParentValue = __value, ParentValue)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "42";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index df0de2ac9c..6815fdc1b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1453:31,7 [55] )
+Generated Location: (1456:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index fbc7d4eaf3..00ed1db372 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,7 +22,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
+            ));
             builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 1f214ae4f1..9e326bc91b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 4e03c38083..c378941533 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1193:31,7 [50] )
+Generated Location: (1156:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 9adf6443df..4afa761ce4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index f980d6c7fb..53eee9a48f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 8d4f1883d0..f4e2a0aee6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1175:31,7 [50] )
+Generated Location: (1180:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index d212f1764b..4c29fc5fa5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,9 +22,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
+            ));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index fcc4756ef9..3550f88eb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 74fc387a35..6e7e51adb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1393:32,7 [50] )
+Generated Location: (1373:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 687b30ac88..61eae6dcb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -13,7 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -21,7 +21,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), 2, __value => ParentValue = __value, 3, () => ParentValue);
+            , 2, __value => ParentValue = __value, 3, () => ParentValue);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 48c9d6bcb1..1c009d6652 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 51f516e08f..cec364512e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1014:28,7 [65] )
+Generated Location: (960:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 8fd0b6298c..9d4e98bdff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,7 +22,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
+            ));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index ef1bcc6496..7c554e3b6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 0247442246..e1f3a17681 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1196:31,7 [50] )
+Generated Location: (1159:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index d95032824a..4c928b0a49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index a52e287f61..069e8744e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index ffcd97a083..2d02f7fe69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1178:31,7 [50] )
+Generated Location: (1183:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index fbf18acfac..863b125370 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,7 +22,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
+            ));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 53c2a15c2c..c17544f755 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 085411eb5f..99c800565f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1196:31,7 [55] )
+Generated Location: (1159:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 64c79acea3..a721b599bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.InputText>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         person.Name
@@ -22,7 +22,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
+            ));
             builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 8dd836efbe..e92bb8d38c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 7a2f766573..30a0d92d87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1188:31,1 [37] )
+Generated Location: (1151:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index f4ad239a30..5c0f7b5dbf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using System.Globalization;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
index c12ab4eed5..3a18e39b03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -11,7 +11,7 @@ Document -
                 MarkupElement - (29:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - , culture: 
                             IntermediateToken - (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index ffb1302bd3..0ae6d682de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1652:47,7 [55] )
+Generated Location: (1657:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index b17a7cf19c..314f55c979 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index ec58099446..ae698d2ed9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 7dce3867b2..ee965939db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1311:33,7 [77] )
+Generated Location: (1316:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 324e345459..b7f05827ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 958d5c196c..0e78bca4d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (32:0,32 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index ef9479584a..3cee188eb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1277:33,7 [50] )
+Generated Location: (1282:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 2cad7d0c19..48798a9288 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using System.Globalization;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
index 9e2c83c290..899deaf92c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -11,7 +11,7 @@ Document -
                 MarkupElement - (29:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - , culture: 
                             IntermediateToken - (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.InvariantCulture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index 46d0a112ee..ce1c5f8cec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1664:47,7 [55] )
+Generated Location: (1669:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index 17eafde372..a6de7a709f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 84ed34633a..739850cfda 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index 805cf5a81d..debebff11c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1215:32,7 [55] )
+Generated Location: (1220:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index e2c2a85098..874f08d2ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index f2b544f10a..7195476b1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 0b654cd454..5b741c6426 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1210:32,7 [55] )
+Generated Location: (1215:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index babb24c078..8e7a78eb29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 821f69bd7c..729e293437 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 20084858e1..1eb0a4f991 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1209:32,7 [55] )
+Generated Location: (1214:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index eb17f60ecd..390b574043 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
              ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index ee664aa867..b7087b24f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index e61c6afe7e..0f5493b2a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1204:32,7 [55] )
+Generated Location: (1209:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index b2a272a6f8..41c4f2e520 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using System.Globalization;
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
index 223442beba..ed2e9412fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -14,7 +14,7 @@ Document -
                             IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - anotherevent=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 51ab84e722..8d19e052ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1434:40,7 [44] )
+Generated Location: (1439:40,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index 050fc765f1..b4745f7211 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using System.Globalization;
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
index ca47062cb6..f8b1ccf42c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -14,7 +14,7 @@ Document -
                             IntermediateToken - (42:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (63:1,34 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - , culture: 
                             IntermediateToken - (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CultureInfo.CurrentCulture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index d5bd3ddf17..3094c773cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1746:48,7 [44] )
+Generated Location: (1751:48,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 374f6dede3..ee4231f50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "checkbox");
-            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                Enabled
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 17245e7816..89234d1345 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
                     HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 17c4e63a2b..397e6750f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1271:33,7 [41] )
+Generated Location: (1276:33,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 8dbdcfb908..aaeb135357 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index 6ceb3cd14a..1074182376 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 8e81cdd7a2..16b74f27d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1238:32,7 [77] )
+Generated Location: (1243:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 3c15c6d6dd..05fc434814 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index c0a31ed33d..2a4c0c7d9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 420e0ffcfc..6d2a90b9c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1494:41,7 [135] )
+Generated Location: (1499:41,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 40d821585c..0d4e1fd6d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 211d095a4a..10d2a58ffe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index ace6d5968b..728b8180f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1315:33,7 [77] )
+Generated Location: (1320:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index d0a4336fe1..9952d73bb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index 6d34937c3e..28c6e60c01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index b68b80de45..5216986795 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1271:33,7 [50] )
+Generated Location: (1276:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index febeefda1d..1bcb3a808a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
index 8ee54746b8..b71f1d9158 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 3f8eb968dc..3fe7e697fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1455:33,7 [77] )
+Generated Location: (1460:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index a48fd3b706..08f7c99e5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index e16bf2ab49..c8f1da04df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index f8b0abdaa6..e656525567 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1309:33,7 [77] )
+Generated Location: (1314:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index b5ba0497e5..de5b8b51d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index cd9bcb08ba..c7e00f2e95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - custom
                     HtmlAttribute - (28:0,28 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd/yyyy"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 6d8bf82e52..3b8f293663 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1319:33,7 [77] )
+Generated Location: (1324:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 440d10feb6..7a8d4322bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 5b3eca5a75..f38b81a9ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 63b2060551..b08a7f99cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1245:32,7 [77] )
+Generated Location: (1250:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 4283c6f3ba..9742e374d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index 5b8668e7c3..a0cfa23ccd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 8ebfcd7b3a..6797df6025 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1244:32,7 [77] )
+Generated Location: (1249:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 31789285d9..96c6ab0900 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 0f4de178b1..06c4759182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 8a4f8ccd01..3032b1eb1d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1205:32,7 [50] )
+Generated Location: (1210:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index c803b3962c..0ff927149d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index bb32b5ee0f..40d2272b0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -22,7 +22,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
+            ));
             builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
             builder.CloseComponent();
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 4494a51f03..4a78015578 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -12,9 +12,7 @@ Document -
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 12dc14d8bc..2e1333db3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1189:31,7 [21] )
+Generated Location: (1152:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 9dfd5475bb..1ea9e24a46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 6a82896489..798a406e93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -12,7 +12,7 @@ Document -
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 970f440df8..00080fb6e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1177:31,7 [21] )
+Generated Location: (1182:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 7888fa144a..43507c0948 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            , 2, Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index e8da897c52..8d55e997c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index eb8aac9840..a9e57e12be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1236:36,7 [21] )
+Generated Location: (1241:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index e69b0dc4ea..4d7cd36cb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -13,7 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), 2, __value => Value = __value);
+            , 2, __value => Value = __value);
             builder.AddMarkupContent(3, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 4, 5, Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 4, 5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -31,7 +31,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), 6, __value => Value = __value);
+            , 6, __value => Value = __value);
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index be3b802110..54e6d6c0cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -10,9 +10,7 @@ Document -
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
@@ -21,9 +19,7 @@ Document -
                 Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 935542dba2..6720849716 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1367:38,7 [21] )
+Generated Location: (1259:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index df898bde88..b048b23c8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index f137facb76..3a997e8c8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 7f2919c951..ddec9dae70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string, int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<string>(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index ba17589a07..1074b92bc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                42.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 8c62ec60ba..fd243d32ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  123
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                   true
@@ -33,7 +33,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(3, "StringProperty", "My string");
-            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Test.SomeType>(
+            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Test.SomeType>(
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
                     new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index e77381c90e..dd0d9ecbd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.CoolnessMeter>(0);
-            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            "very-cool"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 84a07e8f37..c62818846e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
             builder.OpenComponent<Test.MyComponent>(2);
             builder.AddAttribute(3, "intproperty", "1");
-            builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Boolean>(
+            builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                            true
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index bfc17917d8..93d897510e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           1
@@ -26,7 +26,7 @@ namespace Test
             builder.CloseComponent();
             builder.AddMarkupContent(2, "\r\n");
             builder.OpenComponent<Test.Mycomponent>(3);
-            builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Int32>(
+            builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                           2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index afcd1b2eaa..c55b63ba2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                    someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index 98281f7763..fb8db170df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1280:32,7 [93] )
+Generated Location: (1297:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 22260c859d..a3c987ca7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                      someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 5086704541..c3a83b2c3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1282:32,7 [93] )
+Generated Location: (1299:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 231cd3080e..a5a267f492 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                     someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 5bf6f2a952..f8b23da222 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1281:32,7 [93] )
+Generated Location: (1298:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index e9febc02e4..042fb34a3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+            builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        message
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                 message
@@ -31,9 +31,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            ));
+            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index eeec8d2d43..105f53f39a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -13,12 +13,10 @@ Document -
                             IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
                     ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
                     ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index bd39729386..01ad926b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (1963:41,12 [30] )
+Generated Location: (2000:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 4336048f8e..991bc067e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                (s) => {}
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            message
@@ -31,9 +31,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            ));
+            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 633c59dfbb..f30e0af346 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -13,12 +13,10 @@ Document -
                             IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
                     ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
                     ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 842e4c91bd..c7b1ab8f77 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2121:41,12 [30] )
+Generated Location: (2158:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 3ae222590d..27373b967a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
+            builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            (s) => {}
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              message
@@ -31,9 +31,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            )));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            ));
+            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 2854157d93..4c1d2f3e36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -13,12 +13,10 @@ Document -
                             IntermediateToken - (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
                     ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
                             IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateInferred(this, __value => message = __value, message)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
                     ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 47ffb7e9f8..6a762f2d6a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2043:41,12 [30] )
+Generated Location: (2080:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 0b002da471..d64a264601 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.OpenElement(2, "input");
             builder.AddAttribute(3, "type", "text");
             builder.AddAttribute(4, "Value", "17");
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 01d33ffb1a..e576ff6450 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -19,7 +19,7 @@ Document -
                                 IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                                 IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index ee9e5de003..bbf1259975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1504:38,12 [35] )
+Generated Location: (1509:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index a5d86e2843..b62a457640 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -26,7 +26,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index e39787eeb9..5fabd9fb16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -21,7 +21,7 @@ Document -
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                                 IntermediateToken - (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 7a22e2b1dd..732e0ad437 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1838:46,12 [35] )
+Generated Location: (1843:46,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 6387755df0..08d91d2f47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
             builder.OpenElement(2, "input");
             builder.AddAttribute(3, "type", "text");
             builder.AddAttribute(4, "value", "17");
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 918a623ffb..aecb5d607d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -19,7 +19,7 @@ Document -
                                 IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                                 IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
                         HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index ee9e5de003..bbf1259975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1504:38,12 [35] )
+Generated Location: (1509:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index dc1c1a70c9..795bd7d509 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index e8700cac0c..3416f74053 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1304:33,7 [93] )
+Generated Location: (1321:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 93ef6b1df5..1630ebcd9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 6159a4bd7e..1a9a53af39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1306:33,7 [93] )
+Generated Location: (1323:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 5ea9a1cef2..776d5e8050 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                              someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 9dc859d5fb..a99edbdb3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1305:33,7 [93] )
+Generated Location: (1322:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 43217052e9..f0c05b876c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 7f25195c96..247ee31978 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1274:30,7 [87] )
+Generated Location: (1291:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 087c1bbb09..4e1374dfec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index f88a2a0c15..4f8b5f8af1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1219:30,7 [87] )
+Generated Location: (1236:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index b78194b8f2..b416945200 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 7947438c4e..eb06169081 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1219:30,7 [105] )
+Generated Location: (1236:30,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 5a757a9ce5..3b03700ef3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 5c5b98e08b..9ef74f9756 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1219:30,7 [141] )
+Generated Location: (1236:30,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index c178207da7..d680a28d55 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 928dff3d85..871fb014d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1219:30,7 [123] )
+Generated Location: (1236:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 8711835eb1..7a971fda4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 70d422e683..eed5eb1e2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1219:30,7 [106] )
+Generated Location: (1236:30,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 368c0e7874..867d60ce8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create(this, Increment)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index b674974a8b..0796bdf12f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1156:30,7 [87] )
+Generated Location: (1173:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 6c0812d2ea..9daf801975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 735e41d00e..f182d75310 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1119:30,7 [87] )
+Generated Location: (1136:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index f4befffb65..2ad9a6dbc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 9e3525c5ba..30ce0624c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1119:30,7 [95] )
+Generated Location: (1136:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 0cb7258c92..513f1208e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 93756a8c8e..a25dc4e9cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1119:30,7 [123] )
+Generated Location: (1136:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index f6261f15cc..e920524f4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index c222674df4..ccc84db513 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1119:30,7 [131] )
+Generated Location: (1136:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 91dc1326f1..4e4ae44ddb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index 38b1b74663..5544273975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1020:28,38 [3] )
+Generated Location: (1037:28,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1305:40,7 [72] )
+Generated Location: (1322:40,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 2555d4cf11..697af3cb0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index b412cd6048..42d12f8811 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (981:28,38 [8] )
+Generated Location: (998:28,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1222:39,7 [47] )
+Generated Location: (1239:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index d024be37f0..0438907df5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ namespace Test
             (builder2) => {
                 builder2.OpenElement(0, "div");
                 builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index c476bbbbcc..753eff64af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Generated Location: (577:17,2 [45] )
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1420:40,89 [3] )
+Generated Location: (1437:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1599:49,7 [76] )
+Generated Location: (1616:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 67aeae6572..ebe8744064 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ namespace Test
             (builder2) => {
                 builder2.OpenElement(0, "div");
                 builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<System.String>(
+                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 517a9a3ccc..46fbaa0b9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Generated Location: (577:17,2 [45] )
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1420:40,89 [3] )
+Generated Location: (1437:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2155:65,7 [76] )
+Generated Location: (2172:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index a06888102e..f2c3ac6454 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.Counter>(0);
-            builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   y
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 6557ddf07e..a9391feda5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 7a50539e46..0c93d42c7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1128:31,7 [24] )
+Generated Location: (1133:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index dfbf7e4d96..29ff34835b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.User>(0);
-            builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    UserName
@@ -24,7 +24,7 @@ namespace Test
 #nullable disable
             ));
             builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName));
-            builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(
+            builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               UserIsActive
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index e9b524a310..fed478e3d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
@@ -20,7 +20,7 @@ Document -
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue(
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
                             IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index cce1b7362e..616e32b911 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1633:41,7 [88] )
+Generated Location: (1643:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index 04512ecb69..d8b0ff8086 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -93,10 +93,10 @@ namespace Microsoft.CodeAnalysis.Razor
                 return;
             }
 
-            var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName);
+            var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindConverter.FullTypeName);
             if (bindMethods == null)
             {
-                // If we can't find BindMethods, then just bail. We won't be able to compile the
+                // If we can't find BindConverter, then just bail. We won't be able to compile the
                 // generated code anyway.
                 return;
             }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 9eead66e2e..e2c5836a53 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -27,10 +27,10 @@ namespace Microsoft.CodeAnalysis.Razor
                 return;
             }
 
-            var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName);
+            var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.IComponent.FullTypeName);
             if (bindMethods == null)
             {
-                // If we can't find BindMethods, then just bail. We won't be able to compile the
+                // If we can't find IComponent, then just bail. We won't be able to compile the
                 // generated code anyway.
                 return;
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 8bc7eb40a7..1af987e156 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -1,8 +1,6 @@
 // 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.Globalization;
-
 namespace Microsoft.AspNetCore.Components
 {
     public partial class AuthenticationState
@@ -27,6 +25,53 @@ namespace Microsoft.AspNetCore.Components
     public static partial class BindAttributes
     {
     }
+    public static partial class BindConverter
+    {
+        public static bool FormatValue(bool value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTime value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTime value, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTimeOffset value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTimeOffset value, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(decimal value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(double value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(int value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(long value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static bool? FormatValue(bool? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTimeOffset? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTimeOffset? value, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTime? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(System.DateTime? value, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(decimal? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(double? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(int? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(long? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(float? value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(float value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static string FormatValue(string value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static object FormatValue<T>(T value, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static bool TryConvertToBool(object obj, System.Globalization.CultureInfo culture, out bool value) { throw null; }
+        public static bool TryConvertToDateTime(object obj, System.Globalization.CultureInfo culture, out System.DateTime value) { throw null; }
+        public static bool TryConvertToDateTime(object obj, System.Globalization.CultureInfo culture, string format, out System.DateTime value) { throw null; }
+        public static bool TryConvertToDateTimeOffset(object obj, System.Globalization.CultureInfo culture, out System.DateTimeOffset value) { throw null; }
+        public static bool TryConvertToDateTimeOffset(object obj, System.Globalization.CultureInfo culture, string format, out System.DateTimeOffset value) { throw null; }
+        public static bool TryConvertToDecimal(object obj, System.Globalization.CultureInfo culture, out decimal value) { throw null; }
+        public static bool TryConvertToDouble(object obj, System.Globalization.CultureInfo culture, out double value) { throw null; }
+        public static bool TryConvertToFloat(object obj, System.Globalization.CultureInfo culture, out float value) { throw null; }
+        public static bool TryConvertToInt(object obj, System.Globalization.CultureInfo culture, out int value) { throw null; }
+        public static bool TryConvertToLong(object obj, System.Globalization.CultureInfo culture, out long value) { throw null; }
+        public static bool TryConvertToNullableBool(object obj, System.Globalization.CultureInfo culture, out bool? value) { throw null; }
+        public static bool TryConvertToNullableDateTime(object obj, System.Globalization.CultureInfo culture, out System.DateTime? value) { throw null; }
+        public static bool TryConvertToNullableDateTime(object obj, System.Globalization.CultureInfo culture, string format, out System.DateTime? value) { throw null; }
+        public static bool TryConvertToNullableDateTimeOffset(object obj, System.Globalization.CultureInfo culture, out System.DateTimeOffset? value) { throw null; }
+        public static bool TryConvertToNullableDateTimeOffset(object obj, System.Globalization.CultureInfo culture, string format, out System.DateTimeOffset? value) { throw null; }
+        public static bool TryConvertToNullableDecimal(object obj, System.Globalization.CultureInfo culture, out decimal? value) { throw null; }
+        public static bool TryConvertToNullableDouble(object obj, System.Globalization.CultureInfo culture, out double? value) { throw null; }
+        public static bool TryConvertToNullableFloat(object obj, System.Globalization.CultureInfo culture, out float? value) { throw null; }
+        public static bool TryConvertToNullableInt(object obj, System.Globalization.CultureInfo culture, out int? value) { throw null; }
+        public static bool TryConvertToNullableLong(object obj, System.Globalization.CultureInfo culture, out long? value) { throw null; }
+        public static bool TryConvertToString(object obj, System.Globalization.CultureInfo culture, out string value) { throw null; }
+        public static bool TryConvertTo<T>(object obj, System.Globalization.CultureInfo culture, out T value) { throw null; }
+    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
     public sealed partial class BindElementAttribute : System.Attribute
     {
@@ -48,35 +93,7 @@ namespace Microsoft.AspNetCore.Components
         public bool IsInvariantCulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string Format { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public static partial class BindMethods
-    {
-        public static Microsoft.AspNetCore.Components.EventCallback GetEventHandlerValue<T>(Microsoft.AspNetCore.Components.EventCallback value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<T> GetEventHandlerValue<T>(Microsoft.AspNetCore.Components.EventCallback<T> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Action value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Action<T> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Func<System.Threading.Tasks.Task> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static System.MulticastDelegate GetEventHandlerValue<T>(System.Func<T, System.Threading.Tasks.Task> value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static string GetEventHandlerValue<T>(string value) where T : Microsoft.AspNetCore.Components.UIEventArgs { throw null; }
-        public static string GetValue(System.DateTime value, string format, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static T GetValue<T>(T value, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<bool> setter, bool existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<System.DateTime> setter, System.DateTime existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<System.DateTime> setter, System.DateTime existingValue, string format) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<decimal> setter, decimal existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<double> setter, double existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<int> setter, int existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<long> setter, long existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<bool?> setter, bool? existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<decimal?> setter, decimal? existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<double?> setter, double? existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<int?> setter, int? existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<long?> setter, long? existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<float?> setter, float? existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<float> setter, float existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler(System.Action<string> setter, string existingValue) { throw null; }
-        public static System.Action<Microsoft.AspNetCore.Components.UIEventArgs> SetValueHandler<T>(System.Action<T> setter, T existingValue) { throw null; }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=false)]
+    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class CascadingParameterAttribute : System.Attribute
     {
         public CascadingParameterAttribute() { }
@@ -86,15 +103,15 @@ namespace Microsoft.AspNetCore.Components
     {
         public ComponentBase() { }
         protected virtual void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
-        protected System.Threading.Tasks.Task Invoke(System.Action workItem) { throw null; }
+        protected System.Threading.Tasks.Task InvokeAsync(System.Action workItem) { throw null; }
         protected System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
         void Microsoft.AspNetCore.Components.IComponent.Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
         System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleAfterRender.OnAfterRenderAsync() { throw null; }
         System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleEvent.HandleEventAsync(Microsoft.AspNetCore.Components.EventCallbackWorkItem callback, object arg) { throw null; }
         protected virtual void OnAfterRender() { }
         protected virtual System.Threading.Tasks.Task OnAfterRenderAsync() { throw null; }
-        protected virtual void OnInit() { }
-        protected virtual System.Threading.Tasks.Task OnInitAsync() { throw null; }
+        protected virtual void OnInitialized() { }
+        protected virtual System.Threading.Tasks.Task OnInitializedAsync() { throw null; }
         protected virtual void OnParametersSet() { }
         protected virtual System.Threading.Tasks.Task OnParametersSetAsync() { throw null; }
         public virtual System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
@@ -110,6 +127,17 @@ namespace Microsoft.AspNetCore.Components
         public Microsoft.AspNetCore.Components.UIDataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
+    public abstract partial class Dispatcher
+    {
+        protected Dispatcher() { }
+        public abstract bool CheckAccess();
+        public static Microsoft.AspNetCore.Components.Dispatcher CreateDefault() { throw null; }
+        public abstract System.Threading.Tasks.Task InvokeAsync(System.Action workItem);
+        public abstract System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem);
+        public abstract System.Threading.Tasks.Task<TResult> InvokeAsync<TResult>(System.Func<System.Threading.Tasks.Task<TResult>> workItem);
+        public abstract System.Threading.Tasks.Task<TResult> InvokeAsync<TResult>(System.Func<TResult> workItem);
+        protected void OnUnhandledException(System.UnhandledExceptionEventArgs e) { }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct ElementRef
     {
@@ -148,20 +176,23 @@ namespace Microsoft.AspNetCore.Components
         public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action<T> callback) { throw null; }
         public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
         public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback) { throw null; }
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public string Create<T>(object receiver, string callback) { throw null; }
     }
     public static partial class EventCallbackFactoryBinderExtensions
     {
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset> setter, System.DateTimeOffset existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset> setter, System.DateTimeOffset existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format = null, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset?> setter, System.DateTimeOffset? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset?> setter, System.DateTimeOffset? existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
@@ -199,9 +230,9 @@ namespace Microsoft.AspNetCore.Components
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public partial struct EventCallbackWorkItem
+    public readonly partial struct EventCallbackWorkItem
     {
-        private object _dummy;
+        private readonly object _dummy;
         public static readonly Microsoft.AspNetCore.Components.EventCallbackWorkItem Empty;
         public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; }
         public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; }
@@ -210,6 +241,7 @@ namespace Microsoft.AspNetCore.Components
     public readonly partial struct EventCallback<T>
     {
         private readonly object _dummy;
+        public static readonly Microsoft.AspNetCore.Components.EventCallback<T> Empty;
         public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; }
         public bool HasDelegate { get { throw null; } }
         public System.Threading.Tasks.Task InvokeAsync(T arg) { throw null; }
@@ -332,8 +364,8 @@ namespace Microsoft.AspNetCore.Components
     {
         System.Threading.Tasks.Task HandleEventAsync(Microsoft.AspNetCore.Components.EventCallbackWorkItem item, object arg);
     }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false)]
-    public partial class InjectAttribute : System.Attribute
+    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
+    public sealed partial class InjectAttribute : System.Attribute
     {
         public InjectAttribute() { }
     }
@@ -347,6 +379,18 @@ namespace Microsoft.AspNetCore.Components
         System.Uri ToAbsoluteUri(string href);
         string ToBaseRelativePath(string baseUri, string locationAbsolute);
     }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
+    public sealed partial class LayoutAttribute : System.Attribute
+    {
+        public LayoutAttribute(System.Type layoutType) { }
+        public System.Type LayoutType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public abstract partial class LayoutComponentBase : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        protected LayoutComponentBase() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        protected Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct MarkupString
     {
@@ -370,7 +414,7 @@ namespace Microsoft.AspNetCore.Components
         public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=false)]
+    [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class ParameterAttribute : System.Attribute
     {
         public ParameterAttribute() { }
@@ -408,21 +452,16 @@ namespace Microsoft.AspNetCore.Components
     {
         private readonly object _dummy;
         private readonly int _dummyPrimitive;
+        public Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get { throw null; } }
         public bool IsInitialized { get { throw null; } }
-        public System.Threading.Tasks.Task Invoke(System.Action workItem) { throw null; }
-        public System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
         public void Render(Microsoft.AspNetCore.Components.RenderFragment renderFragment) { }
     }
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=false)]
-    public partial class RouteAttribute : System.Attribute
+    public sealed partial class RouteAttribute : System.Attribute
     {
         public RouteAttribute(string template) { }
         public string Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public static partial class RuntimeHelpers
-    {
-        public static T TypeCheck<T>(T value) { throw null; }
-    }
     public partial class UIChangeEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
     {
         public UIChangeEventArgs() { }
@@ -457,31 +496,6 @@ namespace Microsoft.AspNetCore.Components
         public UIEventArgs() { }
         public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
-    public static partial class UIEventArgsRenderTreeBuilderExtensions
-    {
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIChangeEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIClipboardEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIDragEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIErrorEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIFocusEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIPointerEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIProgressEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UITouchEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIWheelEventArgs> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIChangeEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIClipboardEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIDragEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIErrorEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIFocusEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIKeyboardEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIMouseEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIPointerEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIProgressEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UITouchEventArgs, System.Threading.Tasks.Task> value) { }
-        public static void AddAttribute(this Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> value) { }
-    }
     public partial class UIFocusEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
     {
         public UIFocusEventArgs() { }
@@ -581,6 +595,15 @@ namespace Microsoft.AspNetCore.Components
         protected void TriggerOnLocationChanged(bool isinterceptedLink) { }
     }
 }
+namespace Microsoft.AspNetCore.Components.CompilerServices
+{
+    public static partial class RuntimeHelpers
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback<T> CreateInferredEventCallback<T>(object receiver, System.Action<T> callback, T value) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<T> CreateInferredEventCallback<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback, T value) { throw null; }
+        public static T TypeCheck<T>(T value) { throw null; }
+    }
+}
 namespace Microsoft.AspNetCore.Components.Forms
 {
     public sealed partial class EditContext
@@ -656,85 +679,20 @@ namespace Microsoft.AspNetCore.Components.Forms
         internal ValidationStateChangedEventArgs() { }
     }
 }
-namespace Microsoft.AspNetCore.Components
-{
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
-    public partial class LayoutAttribute : System.Attribute
-    {
-        public LayoutAttribute(System.Type layoutType) { }
-        public System.Type LayoutType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public abstract partial class LayoutComponentBase : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        protected LayoutComponentBase() { }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        protected Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-}
-namespace Microsoft.AspNetCore.Components.Rendering
+namespace Microsoft.AspNetCore.Components.RenderTree
 {
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct ComponentRenderedText
+    public readonly partial struct ArrayBuilderSegment<T> : System.Collections.Generic.IEnumerable<T>, System.Collections.IEnumerable
     {
         private readonly object _dummy;
         private readonly int _dummyPrimitive;
-        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public System.Collections.Generic.IEnumerable<string> Tokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public T[] Array { get { throw null; } }
+        public int Count { get { throw null; } }
+        public T this[int index] { get { throw null; } }
+        public int Offset { get { throw null; } }
+        System.Collections.Generic.IEnumerator<T> System.Collections.Generic.IEnumerable<T>.GetEnumerator() { throw null; }
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
     }
-    public partial class EventFieldInfo
-    {
-        public EventFieldInfo() { }
-        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class HtmlRenderer : Microsoft.AspNetCore.Components.Rendering.Renderer
-    {
-        public HtmlRenderer(System.IServiceProvider serviceProvider, System.Func<string, string> htmlEncoder, Microsoft.AspNetCore.Components.Rendering.IDispatcher dispatcher) : base (default(System.IServiceProvider)) { }
-        protected override void HandleException(System.Exception exception) { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Rendering.ComponentRenderedText> RenderComponentAsync(System.Type componentType, Microsoft.AspNetCore.Components.ParameterCollection initialParameters) { throw null; }
-        public System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Rendering.ComponentRenderedText> RenderComponentAsync<TComponent>(Microsoft.AspNetCore.Components.ParameterCollection initialParameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
-        protected override System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch renderBatch) { throw null; }
-    }
-    public partial interface IDispatcher
-    {
-        System.Threading.Tasks.Task Invoke(System.Action action);
-        System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> asyncAction);
-        System.Threading.Tasks.Task<TResult> InvokeAsync<TResult>(System.Func<System.Threading.Tasks.Task<TResult>> asyncFunction);
-        System.Threading.Tasks.Task<TResult> Invoke<TResult>(System.Func<TResult> function);
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct RenderBatch
-    {
-        private readonly object _dummy;
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public abstract partial class Renderer : System.IDisposable
-    {
-        public Renderer(System.IServiceProvider serviceProvider) { }
-        public Renderer(System.IServiceProvider serviceProvider, Microsoft.AspNetCore.Components.Rendering.IDispatcher dispatcher) { }
-        public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
-        protected internal virtual void AddToRenderQueue(int componentId, Microsoft.AspNetCore.Components.RenderFragment renderFragment) { }
-        protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
-        public static Microsoft.AspNetCore.Components.Rendering.IDispatcher CreateDefaultDispatcher() { throw null; }
-        public virtual System.Threading.Tasks.Task DispatchEventAsync(int eventHandlerId, Microsoft.AspNetCore.Components.Rendering.EventFieldInfo fieldInfo, Microsoft.AspNetCore.Components.UIEventArgs eventArgs) { throw null; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected abstract void HandleException(System.Exception exception);
-        protected Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.Type componentType) { throw null; }
-        public virtual System.Threading.Tasks.Task Invoke(System.Action workItem) { throw null; }
-        public virtual System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
-        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId) { throw null; }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId, Microsoft.AspNetCore.Components.ParameterCollection initialParameters) { throw null; }
-        protected abstract System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch renderBatch);
-    }
-}
-namespace Microsoft.AspNetCore.Components.RenderTree
-{
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct ArrayRange<T>
     {
@@ -746,13 +704,10 @@ namespace Microsoft.AspNetCore.Components.RenderTree
     public partial class RenderTreeBuilder
     {
         public const string ChildContent = "ChildContent";
-        public RenderTreeBuilder(Microsoft.AspNetCore.Components.Rendering.Renderer renderer) { }
         public void AddAttribute(int sequence, in Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) { }
         public void AddAttribute(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback value) { }
         public void AddAttribute(int sequence, string name, System.Action value) { }
-        public void AddAttribute(int sequence, string name, System.Action<Microsoft.AspNetCore.Components.UIEventArgs> value) { }
         public void AddAttribute(int sequence, string name, bool value) { }
-        public void AddAttribute(int sequence, string name, System.Func<Microsoft.AspNetCore.Components.UIEventArgs, System.Threading.Tasks.Task> value) { }
         public void AddAttribute(int sequence, string name, System.Func<System.Threading.Tasks.Task> value) { }
         public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
         public void AddAttribute(int sequence, string name, object value) { }
@@ -781,7 +736,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
     public readonly partial struct RenderTreeDiff
     {
         public readonly int ComponentId;
-        public readonly System.ArraySegment<Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit> Edits;
+        public readonly Microsoft.AspNetCore.Components.RenderTree.ArrayBuilderSegment<Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit> Edits;
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Explicit)]
     public readonly partial struct RenderTreeEdit
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
index f06b62f911..be2bbde336 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
@@ -38,7 +38,7 @@ else
 @functions {
     WeatherForecast[] forecasts;
 
-    protected override async Task OnInitAsync()
+    protected override async Task OnInitializedAsync()
     {
         forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
     }

From b724885f3898850620890751a29c881c2f92db5d Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 13 May 2019 21:23:50 -0700
Subject: [PATCH 208/337] React to Roslyn rename of `NullableContextOptions` to
 `Nullable`.

- Verified the fix with VS16.2-preview2 + latest CLI with modified `Nullable` entry on disk
- Updated tests.
- Note: This change will not pass the build until we have a new CLI that has an updated Roslyn that understands `Nullable`.

aspnet/AspNetCoredotnet/aspnetcore-tooling#10218
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/fee9c35bee9bafc55448f15363e569a17e5f6323
---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets               | 2 +-
 .../netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets  | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest.cs             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index aa36ef1d3e..bba60c4553 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -153,7 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          NoLogo="$(NoLogo)"
          NoStandardLib="$(NoCompilerStandardLib)"
          NoWin32Manifest="$(NoWin32Manifest)"
-         NullableContextOptions="$(NullableContextOptions)"
+         Nullable="$(Nullable)"
          Optimize="$(Optimize)"
          Deterministic="$(Deterministic)"
          PublicSign="$(PublicSign)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 18a81a5046..73fb23e194 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -220,7 +220,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          NoLogo="$(NoLogo)"
          NoStandardLib="$(NoCompilerStandardLib)"
          NoWin32Manifest="$(NoWin32Manifest)"
-         NullableContextOptions="$(NullableContextOptions)"
+         Nullable="$(Nullable)"
          Optimize="$(Optimize)"
          Deterministic="$(Deterministic)"
          PublicSign="$(PublicSign)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 5a144d2a9a..ae6eb18969 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -629,7 +629,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             var result = await DotnetMSBuild(
                 "Build",
-                "/p:LangVersion=8.0 /p:NullableContextOptions=enable");
+                "/p:LangVersion=8.0 /p:Nullable=enable");
             var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
             Assert.BuildPassed(result, allowWarnings: true);
@@ -644,7 +644,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             var result = await DotnetMSBuild(
                 "Build",
-                "/p:LangVersion=8.0 /p:NullableContextOptions=enable",
+                "/p:LangVersion=8.0 /p:Nullable=enable",
                 suppressBuildServer: true);
             var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 

From d62381d659e069560c044157006890e550209b11 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 16 Jul 2019 17:25:57 -0700
Subject: [PATCH 209/337] Update test projects to use latest Roslyn.

- This is a temporary workaround until we're able to get on the latest SDK which includes the latest Roslyn bits. Without them we can't properly publish testapps in a standalone fashion without investing in temporary infrastructure.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/21fcd9c2f59296a7e38e1f5ff056281a16166d52
---
 .../BuildServerIntegrationTest.cs             |  6 +++++
 .../test/testassets/Directory.Build.props     | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 6121bc9646..7cab7ac3ee 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -77,6 +77,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject(originalProjectName: "SimpleMvc", targetProjectName: "Whitespace in name", baseDirectory: "")]
         public async Task Build_AppWithWhitespaceInName_CanBuildSuccessfully()
         {
+            // We need to separately restore the project in order to ensure this project uses the latest Roslyn. Without this
+            // the Csc task from Roslyn would have already been loaded and any update to it from nuget packages would not have
+            // an effect. This allows us to create our obj/Whitespace in name.csproj.nuget.g.props file (we renamed the project)
+            // and then properly build the project with an appropriate Csc.
+            await DotnetMSBuild("Restore");
+
             var result = await DotnetMSBuild(
                 "Build",
                 "/p:_RazorForceBuildServer=true");
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 8cc9caef29..d9d2ac66f5 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -38,4 +38,26 @@
 
   <Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" />
 
+  <!--
+    NOTE, BELOW
+
+    These bits are a temporary workaround until we're able to get on the latest SDK which includes the latest Roslyn bits.
+    Without them we can't properly publish testapps in a standalone fashion without investing in temporary infrastructure.
+  -->
+  <PropertyGroup>
+    <MicrosoftNetCompilersToolsetPackageVersion>3.3.0-beta2-19365-06</MicrosoftNetCompilersToolsetPackageVersion>
+    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' ">
+      $(RestoreSources);
+      https://dotnet.myget.org/F/roslyn/api/v3/index.json;
+    </RestoreSources>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset"
+        Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
+        PrivateAssets="all"
+        IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+
 </Project>

From 8dcf4b37f565814f66b1205fa5ce71e41074bdf5 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 12 Jul 2019 09:16:21 -0700
Subject: [PATCH 210/337] Ensure compilation references are copied during build
 for netcoreapp2.x targeting projects

Fixes https://github.com/aspnet/AspNetCore/issues/12048
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f17a62c04434f29e74da3f4b5fcbfc1453977b0d
---
 .../Sdk.Razor.CurrentVersion.props            |   8 ++
 .../Sdk.Razor.CurrentVersion.targets          |  29 +++--
 .../BuildIntegrationTest11.cs                 |   2 +-
 .../BuildIntegrationTest22NetFx.cs            |  38 ++++++
 .../BuildIntegrationTestLegacy.cs             |  41 ++++++-
 .../SimpleMvc22NetFx/Models/ErrorViewModel.cs |  11 ++
 .../testassets/SimpleMvc22NetFx/Program.cs    |  13 +++
 .../SimpleMvc22NetFx/SimpleMvc22NetFx.csproj  |  28 +++++
 .../SimpleMvc22NetFx/SimpleTagHelper.cs       |   8 ++
 .../SimpleMvc22NetFx/Views/Home/Index.cshtml  | 108 ++++++++++++++++++
 .../Views/Shared/_Layout.cshtml               |  71 ++++++++++++
 .../Views/_ViewImports.cshtml                 |   4 +
 .../SimpleMvc22NetFx/Views/_ViewStart.cshtml  |   3 +
 13 files changed, 346 insertions(+), 18 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/Models/ErrorViewModel.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/SimpleTagHelper.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewStart.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index b7d17b206b..b1394c1fbe 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -42,6 +42,14 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(CopyRazorGenerateFilesToPublishDirectory)'==''">false</CopyRazorGenerateFilesToPublishDirectory>
 
+    <!--
+      Set to true to copy reference assembly items to the publish directory.
+
+      Typically reference assemblies are not needed for a published application if Razor compilation occurs at build-time
+      or publish-time. By default, the Razor SDK will suppress the copying of reference assemblies to the publish directory.
+    -->
+    <CopyRefAssembliesToPublishDirectory Condition="'$(CopyRefAssembliesToPublishDirectory)'==''">false</CopyRefAssembliesToPublishDirectory>
+
     <!--
     Determines the toolset to use to compile Razor (.cshtml) files. Defaults to 'Implicit' to let the Razor Sdk determine the toolset to use.
     Valid values include 'Implicit', 'RazorSdk', and 'PrecompilationTool'.
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 880e079e61..f0f23b636f 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -214,14 +214,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(MvcRazorExcludeViewFilesFromPublish)'=='true'">false</CopyRazorGenerateFilesToPublishDirectory>
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(MvcRazorExcludeViewFilesFromPublish)'=='false'">true</CopyRazorGenerateFilesToPublishDirectory>
 
-    <!--
-    In 2.x, setting CopyRefAssembliesToPublishDirectory controlled copying of the refs directory to the publish directory.
-    If explicitly specified, use it to override PreserveCompilationReferences.
-    -->
-    <PreserveCompilationReferences Condition="'$(CopyRefAssembliesToPublishDirectory)'!=''">$(CopyRefAssembliesToPublishDirectory)</PreserveCompilationReferences>
-
-    <PreserveCompilationReferences Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</PreserveCompilationReferences>
-    <PreserveCompilationReferences Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</PreserveCompilationReferences>
+    <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</CopyRefAssembliesToPublishDirectory>
+    <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</CopyRefAssembliesToPublishDirectory>
 
     <!--
       We can't set the actual default value here due to evaluation order (depends on $(OutDir)).
@@ -285,11 +279,9 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Back-compat for PrecompilationTool -->
   <PropertyGroup>
     <!--
-      For 2.x desktop targeting projects using MvcPrecompilation, ref assemblies are required to compile the PrecompiledViews.dll,
-      but are removed by the tool once done. Set PreserveCompilationReferences = true, ignoring any value configured in the project,
-      if the project is using the precompilation tool.
+      Always enable PreserveCompilationReferences for non 3.0 projects. This preserves parity with the 2.x SDK's behavior.
     -->
-    <PreserveCompilationReferences Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'">true</PreserveCompilationReferences>
+    <PreserveCompilationReferences Condition="'$(_TargetingNETCoreApp30OrLater)' != 'true'">true</PreserveCompilationReferences>
   </PropertyGroup>
 
   <!--
@@ -806,6 +798,19 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
+  <Target
+    Name="_RazorRemoveRefAssembliesFromPublish"
+    BeforeTargets="PrepareForPublish"
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' AND '$(CopyRefAssembliesToPublishDirectory)'!=''">
+    <!--
+      Setting PreserveCompilationReferences affects both Build and Publish, but we want CopyRefAssembliesToPublishDirectory to only affect publishing.
+      If CopyRefAssembliesToPublishDirectory is disabled, clear PreserveCompilationReferences to stop publishing ref assemblies.
+    -->
+    <PropertyGroup>
+      <PreserveCompilationReferences>$(CopyRefAssembliesToPublishDirectory)</PreserveCompilationReferences>
+    </PropertyGroup>
+  </Target>
+
   <Target Name="_CheckForMissingRazorCompiler" Condition="'$(IsRazorCompilerReferenced)' != 'true'">
     <Error
       Code="RAZORSDK1003"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
index 10feba7a43..84b6b77ea0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
-    public class BuildIntegrationTest11 : BuildIntegrationTest, IClassFixture<BuildServerTestFixture>
+    public class BuildIntegrationTest11 : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
     {
         public BuildIntegrationTest11(BuildServerTestFixture buildServer)
             : base(buildServer)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
new file mode 100644
index 0000000000..b4b5e993c2
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -0,0 +1,38 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntegrationTest22NetFx : BuildIntegrationTestLegacy
+    {
+        public BuildIntegrationTest22NetFx(LegacyBuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        public override string TestProjectName => "SimpleMvc22NetFx";
+        public override string TargetFramework => "net461";
+        public override string OutputFileName => $"{TestProjectName}.exe";
+
+        [Fact]
+        public override async Task BuildingProject_CopyToOutputDirectoryFiles()
+        {
+            using (CreateTestProject())
+            {
+                // Build
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildPassed(result);
+                // No cshtml files should be in the build output directory
+                Assert.FileCountEquals(result, 0, Path.Combine(OutputPath, "Views"), "*.cshtml");
+
+                // refs are required for runtime compilation in desktop targeting projects.
+                Assert.FileCountEquals(result, 97, Path.Combine(OutputPath, "refs"), "*.dll");
+            }
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
index 460cd6e117..f3f7e38a6e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
@@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     {
         public abstract string TestProjectName { get; }
         public abstract new string TargetFramework { get; }
+        public virtual string OutputFileName => $"{TestProjectName}.dll";
 
         public BuildIntegrationTestLegacy(LegacyBuildServerTestFixture buildServer)
             : base(buildServer)
@@ -37,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 var result = await DotnetMSBuild("Build");
 
                 Assert.BuildPassed(result);
-                Assert.FileExists(result, OutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, OutputPath, OutputFileName);
                 Assert.FileExists(result, OutputPath, $"{TestProjectName}.pdb");
                 Assert.FileExists(result, OutputPath, $"{TestProjectName}.Views.dll");
                 Assert.FileExists(result, OutputPath, $"{TestProjectName}.Views.pdb");
@@ -49,6 +50,24 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     result,
                     Path.Combine(IntermediateOutputPath, $"{TestProjectName}.TagHelpers.output.cache"),
                     @"""Name"":""SimpleMvc.SimpleTagHelper""");
+
+            }
+        }
+
+        [Fact]
+        public virtual async Task BuildingProject_CopyToOutputDirectoryFiles()
+        {
+            using (CreateTestProject())
+            {
+                // Build
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildPassed(result);
+                // No cshtml files should be in the build output directory
+                Assert.FileCountEquals(result, 0, Path.Combine(OutputPath, "Views"), "*.cshtml");
+
+                // For .NET Core projects, no ref assemblies should be present in the output directory.
+                Assert.FileCountEquals(result, 0, Path.Combine(OutputPath, "refs"), "*.dll");
             }
         }
 
@@ -61,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 Assert.BuildPassed(result);
 
-                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, PublishOutputPath, OutputFileName);
                 Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.pdb");
                 Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.Views.dll");
                 Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.Views.pdb");
@@ -82,7 +101,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.BuildPassed(result);
 
                 // Everything we do should noop - including building the app.
-                Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, PublishOutputPath, OutputFileName);
                 Assert.FileExists(result, PublishOutputPath, $"{TestProjectName}.pdb");
                 Assert.FileDoesNotExist(result, PublishOutputPath, $"{TestProjectName}.Views.dll");
                 Assert.FileDoesNotExist(result, PublishOutputPath, $"{TestProjectName}.Views.pdb");
@@ -98,8 +117,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 Assert.BuildPassed(result);
 
-                Assert.FileExists(result, IntermediateOutputPath, $"{TestProjectName}.dll");
-                Assert.FileExists(result, IntermediateOutputPath, $"{TestProjectName}.dll");
+                Assert.FileExists(result, IntermediateOutputPath, OutputFileName);
+                Assert.FileExists(result, IntermediateOutputPath, OutputFileName);
                 Assert.FileDoesNotExist(result, IntermediateOutputPath, $"{TestProjectName}.Views.dll");
                 Assert.FileDoesNotExist(result, IntermediateOutputPath, $"{TestProjectName}.Views.pdb");
             }
@@ -133,6 +152,18 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        [Fact]
+        public async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
+        {
+            using (CreateTestProject())
+            {
+                var result = await DotnetMSBuild("Publish", "/p:CopyRefAssembliesToPublishDirectory=true");
+
+                Assert.BuildPassed(result);
+                Assert.FileExists(result, PublishOutputPath, "refs", "System.Threading.Tasks.Extensions.dll");
+            }
+        }
+
         private class Disposable : IDisposable
         {
             public void Dispose()
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/Models/ErrorViewModel.cs b/src/Razor/test/testassets/SimpleMvc22NetFx/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..b4aa044914
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SimpleMvc.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/Program.cs b/src/Razor/test/testassets/SimpleMvc22NetFx/Program.cs
new file mode 100644
index 0000000000..25883d6b8b
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MVC 2.2
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj
new file mode 100644
index 0000000000..ab338c85c3
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC. It will reference the local build of Tasks but not the compiler or any test shims.
+  -->
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleTagHelper.cs b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleTagHelper.cs
new file mode 100644
index 0000000000..7cc52922d9
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleTagHelper.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace SimpleMvc
+{
+    public class SimpleTagHelper : TagHelper
+    {
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..1a9473e464
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..477d4ba603
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@using SimpleMvc
+@using SimpleMvc.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@namespace SimpleMvc21
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

From 4eb4cef18c94bbec0455889c252e3cda75b5d284 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 15 Jul 2019 14:48:01 -0700
Subject: [PATCH 211/337] Limit PreserveCompilationReferences to netcoreapp
 (<2.x)and net4x projects \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/b9c695c2d50c229ea3c2aa583af969992531d428

---
 .../Sdk.Razor.CurrentVersion.props            |  8 -----
 .../Sdk.Razor.CurrentVersion.targets          | 16 +++++++---
 .../BuildWithComponentsIntegrationTest.cs     | 30 +++++++++++++++++++
 .../PublishIntegrationTest.cs                 |  2 --
 4 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index b1394c1fbe..b7d17b206b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -42,14 +42,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <CopyRazorGenerateFilesToPublishDirectory Condition="'$(CopyRazorGenerateFilesToPublishDirectory)'==''">false</CopyRazorGenerateFilesToPublishDirectory>
 
-    <!--
-      Set to true to copy reference assembly items to the publish directory.
-
-      Typically reference assemblies are not needed for a published application if Razor compilation occurs at build-time
-      or publish-time. By default, the Razor SDK will suppress the copying of reference assemblies to the publish directory.
-    -->
-    <CopyRefAssembliesToPublishDirectory Condition="'$(CopyRefAssembliesToPublishDirectory)'==''">false</CopyRefAssembliesToPublishDirectory>
-
     <!--
     Determines the toolset to use to compile Razor (.cshtml) files. Defaults to 'Implicit' to let the Razor Sdk determine the toolset to use.
     Valid values include 'Implicit', 'RazorSdk', and 'PrecompilationTool'.
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index f0f23b636f..14be3fdf58 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -217,6 +217,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='true'">false</CopyRefAssembliesToPublishDirectory>
     <CopyRefAssembliesToPublishDirectory Condition="'$(MvcRazorExcludeRefAssembliesFromPublish)'=='false'">true</CopyRefAssembliesToPublishDirectory>
 
+    <!-- Use PreserveCompilationReferences to determine the behavior of CopyRefAssembliesToPublishDirectory if not explicitly specified by the project. -->
+    <CopyRefAssembliesToPublishDirectory Condition="'$(CopyRefAssembliesToPublishDirectory)'==''">$(PreserveCompilationReferences)</CopyRefAssembliesToPublishDirectory>
+
+    <!-- For 2.x projects desktop and .NET Core projects, if they're opting in to runtime compilation (indicated by PreserveCompilationContext=true), set PreserveCompilationReferences = true -->
+    <PreserveCompilationReferences Condition="'$(PreserveCompilationContext)' == 'true' AND (('$(TargetFrameworkIdentifier)' == '.NETFramework') OR ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &lt; '3.0'))">true</PreserveCompilationReferences>
+
     <!--
       We can't set the actual default value here due to evaluation order (depends on $(OutDir)).
 
@@ -279,9 +285,11 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Back-compat for PrecompilationTool -->
   <PropertyGroup>
     <!--
-      Always enable PreserveCompilationReferences for non 3.0 projects. This preserves parity with the 2.x SDK's behavior.
+      For 2.x desktop targeting projects using MvcPrecompilation, ref assemblies are required to compile the PrecompiledViews.dll,
+      but are removed by the tool once done. Set PreserveCompilationReferences = true, ignoring any value configured in the project,
+      if the project is using the precompilation tool.
     -->
-    <PreserveCompilationReferences Condition="'$(_TargetingNETCoreApp30OrLater)' != 'true'">true</PreserveCompilationReferences>
+    <PreserveCompilationReferences Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'">true</PreserveCompilationReferences>
   </PropertyGroup>
 
   <!--
@@ -801,10 +809,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target
     Name="_RazorRemoveRefAssembliesFromPublish"
     BeforeTargets="PrepareForPublish"
-    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' AND '$(CopyRefAssembliesToPublishDirectory)'!=''">
+    Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' AND '$(CopyRefAssembliesToPublishDirectory)' != ''">
     <!--
       Setting PreserveCompilationReferences affects both Build and Publish, but we want CopyRefAssembliesToPublishDirectory to only affect publishing.
-      If CopyRefAssembliesToPublishDirectory is disabled, clear PreserveCompilationReferences to stop publishing ref assemblies.
+      Use the value of CopyRefAssembliesToPublishDirectory to determine PreserveCompilationReferences during publish.
     -->
     <PropertyGroup>
       <PreserveCompilationReferences>$(CopyRefAssembliesToPublishDirectory)</PreserveCompilationReferences>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 678136b0ef..8a5d449cc7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -74,6 +74,36 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, OutputPath, "ComponentLibrary.Views.pdb");
         }
 
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task Build_DoesNotProduceRefsDirectory()
+        {
+            TargetFramework = "netstandard2.0";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, OutputPath, "ComponentLibrary.dll");
+           Assert.FileCountEquals(result, 0, Path.Combine(OutputPath, "refs"), "*.dll");
+        }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task Publish_DoesNotProduceRefsDirectory()
+        {
+            TargetFramework = "netstandard2.0";
+
+            // Build
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "ComponentLibrary.dll");
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+        }
+
         private async Task Build_ComponentsWorks(MSBuildProcessKind msBuildProcessKind)
         {
             var result = await DotnetMSBuild("Build", msBuildProcessKind: msBuildProcessKind);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index b33a6b0c71..7befbf9f6c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -144,8 +144,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
         }
 
-
-
         [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Publish_NoopsWith_RazorCompileOnPublishFalse()

From de8aa5bffa759ccf2511875895db648e316ea86e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 15 Jul 2019 18:18:29 -0700
Subject: [PATCH 212/337] Desktop tests \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/6f5da448efa6a4aa756cb182bbd30d0cc3c137d6

---
 .../BuildIntegrationTest22NetFx.cs            |  2 ++
 .../BuildIntegrationTestLegacy.cs             | 31 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
index b4b5e993c2..1afad21f83 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -3,10 +3,12 @@
 
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
+    [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
     public class BuildIntegrationTest22NetFx : BuildIntegrationTestLegacy
     {
         public BuildIntegrationTest22NetFx(LegacyBuildServerTestFixture buildServer)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
index f3f7e38a6e..51b65c384e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@@ -29,8 +30,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             return new Disposable();
         }
 
-        [Fact]
-        public async Task Building_Project()
+        [ConditionalFact]
+        public virtual async Task Building_Project()
         {
             using (CreateTestProject())
             {
@@ -54,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
+        [ConditionalFact]
         public virtual async Task BuildingProject_CopyToOutputDirectoryFiles()
         {
             using (CreateTestProject())
@@ -71,8 +72,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Publish_Project()
+        [ConditionalFact]
+        public virtual async Task Publish_Project()
         {
             using (CreateTestProject())
             {
@@ -91,8 +92,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
+        [ConditionalFact]
+        public virtual async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
         {
             using (CreateTestProject())
             {
@@ -108,8 +109,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
-        public async Task Build_WithMvcRazorCompileOnPublish_Noops()
+        [ConditionalFact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
+        public virtual async Task Build_WithMvcRazorCompileOnPublish_Noops()
         {
             using (CreateTestProject())
             {
@@ -124,8 +125,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
+        [ConditionalFact]
+        public virtual async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
         {
             using (CreateTestProject())
             {
@@ -139,8 +140,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Build_DoesNotPrintsWarnings_IfProjectFileContainsRazorFiles()
+        [ConditionalFact]
+        public virtual async Task Build_DoesNotPrintsWarnings_IfProjectFileContainsRazorFiles()
         {
             using (CreateTestProject())
             {
@@ -152,8 +153,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
+        [ConditionalFact]
+        public virtual async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
         {
             using (CreateTestProject())
             {

From 9b05f240aed28b92a8e49366d4cc1ae174e30704 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 15 Jul 2019 19:38:11 -0700
Subject: [PATCH 213/337] Fixup desktop tests again \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/bd5a57c0e81532658210c9f1ff2fb07759dd1f99

---
 .../IntegrationTests/BuildIntegrationTest.cs  | 16 +++++
 .../BuildIntegrationTest22NetFx.cs            | 71 ++++++++++++++-----
 .../BuildIntegrationTestLegacy.cs             | 17 +++--
 .../PublishIntegrationTest.cs                 | 23 ++++++
 4 files changed, 101 insertions(+), 26 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index ae6eb18969..839f7da92b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -259,6 +259,22 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
         }
 
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithPreserveCompilationReferencesEnabled_ProducesRefsDirectory()
+        {
+            // This simulates the behavior of 3.0 with RuntimeCompilation enabled
+            AddProjectFileContent(@"
+            <PropertyGroup>
+                <PreserveCompilationReferences>true</PreserveCompilationReferences>
+            </PropertyGroup>");
+
+            var result = await DotnetMSBuild("Build");
+
+            // Verify no refs folder is produced
+            Assert.FileExists(result, OutputPath, "refs", "mscorlib.dll");
+        }
+
         [Fact]
         [InitializeTestProject("ClassLibrary")]
         public async Task Build_CodeGensAssemblyInfoUsingValuesFromProject()
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
index 1afad21f83..0e95335b42 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing.xunit;
@@ -8,33 +9,69 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
-    [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
-    public class BuildIntegrationTest22NetFx : BuildIntegrationTestLegacy
+    public class BuildIntegrationTest22NetFx :
+        MSBuildIntegrationTestBase,
+        IClassFixture<LegacyBuildServerTestFixture>
     {
+        private const string TestProjectName = "SimpleMvc22NetFx";
+
         public BuildIntegrationTest22NetFx(LegacyBuildServerTestFixture buildServer)
             : base(buildServer)
         {
         }
 
-        public override string TestProjectName => "SimpleMvc22NetFx";
-        public override string TargetFramework => "net461";
-        public override string OutputFileName => $"{TestProjectName}.exe";
+        public string OutputFileName => $"{TestProjectName}.exe";
 
-        [Fact]
-        public override async Task BuildingProject_CopyToOutputDirectoryFiles()
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject(TestProjectName)]
+        public async Task BuildingProject_CopyToOutputDirectoryFiles()
         {
-            using (CreateTestProject())
-            {
-                // Build
-                var result = await DotnetMSBuild("Build");
+            TargetFramework = "net461";
 
-                Assert.BuildPassed(result);
-                // No cshtml files should be in the build output directory
-                Assert.FileCountEquals(result, 0, Path.Combine(OutputPath, "Views"), "*.cshtml");
+            // Build
+            var result = await DotnetMSBuild("Build");
 
-                // refs are required for runtime compilation in desktop targeting projects.
-                Assert.FileCountEquals(result, 97, Path.Combine(OutputPath, "refs"), "*.dll");
-            }
+            Assert.BuildPassed(result);
+            // No cshtml files should be in the build output directory
+            Assert.FileCountEquals(result, 0, Path.Combine(OutputPath, "Views"), "*.cshtml");
+
+            // refs are required for runtime compilation in desktop targeting projects.
+            Assert.FileCountEquals(result, 97, Path.Combine(OutputPath, "refs"), "*.dll");
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject(TestProjectName)]
+        public async Task PublishingProject_CopyToOutputDirectoryFiles()
+        {
+            TargetFramework = "net461";
+
+            // Build
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+            // No cshtml files should be in the build output directory
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+
+            // refs shouldn't be produced by default
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject(TestProjectName)]
+        public async Task PublishingProject_CopyToOutputDirectoryFiles_WithCopyRefAssembliesToPublishDirectory()
+        {
+            TargetFramework = "net461";
+
+            // Build
+            var result = await DotnetMSBuild("Publish", "/p:CopyRefAssembliesToPublishDirectory=true");
+
+            Assert.BuildPassed(result);
+
+            // refs should be present if CopyRefAssembliesToPublishDirectory is set. 
+            Assert.FileExists(result, PublishOutputPath, "refs", "System.Threading.Tasks.Extensions.dll");
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
index 51b65c384e..2c8cf9e865 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@@ -30,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             return new Disposable();
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task Building_Project()
         {
             using (CreateTestProject())
@@ -55,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task BuildingProject_CopyToOutputDirectoryFiles()
         {
             using (CreateTestProject())
@@ -72,7 +71,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task Publish_Project()
         {
             using (CreateTestProject())
@@ -92,7 +91,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
         {
             using (CreateTestProject())
@@ -109,7 +108,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
+        [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
         public virtual async Task Build_WithMvcRazorCompileOnPublish_Noops()
         {
             using (CreateTestProject())
@@ -125,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
         {
             using (CreateTestProject())
@@ -140,7 +139,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task Build_DoesNotPrintsWarnings_IfProjectFileContainsRazorFiles()
         {
             using (CreateTestProject())
@@ -153,7 +152,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [ConditionalFact]
+        [Fact]
         public virtual async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
         {
             using (CreateTestProject())
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index 7befbf9f6c..cf5387538e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -248,6 +248,29 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 8, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
         }
 
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Publish_WithPreserveCompilationReferencesSetInProjectFile_CopiesRefs()
+        {
+            // This simulates the behavior of 3.0 with RuntimeCompilation enabled
+            AddProjectFileContent(@"
+            <PropertyGroup>
+                <PreserveCompilationReferences>true</PreserveCompilationReferences>
+            </PropertyGroup>");
+
+            var result = await DotnetMSBuild("Publish");
+
+            Assert.BuildPassed(result);
+
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.dll");
+            Assert.FileExists(result, PublishOutputPath, "SimpleMvc.Views.pdb");
+
+            // By default refs and .cshtml files will not be copied on publish
+            Assert.FileExists(result, PublishOutputPath, "refs", "mscorlib.dll");
+        }
+
         [Fact] // Tests old MvcPrecompilation behavior that we support for compat.
         [InitializeTestProject("SimpleMvc")]
         public async Task Publish_MvcRazorExcludeFilesFromPublish_False_CopiesFiles()

From 8757c7da1676c370ecdbfb1aff05e32b83dd024a Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 17 Jul 2019 09:20:32 -0700
Subject: [PATCH 214/337] More test \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/0e750a676411ca68f0b8cfd92011f5f37ec872e6

---
 .../BuildIntegrationTest22NetFx.cs             |  9 +++++----
 .../BuildIntegrationTestLegacy.cs              | 18 ++++++++++++++++++
 .../RestoreTestProjects.csproj                 |  1 +
 .../SimpleMvc22NetFx/SimpleMvc22NetFx.csproj   |  1 -
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
index 0e95335b42..263e20747c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [ConditionalFact]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject(TestProjectName)]
-        public async Task PublishingProject_CopyToOutputDirectoryFiles()
+        public async Task PublishingProject_CopyToPublishDirectoryItems()
         {
             TargetFramework = "net461";
 
@@ -51,17 +51,18 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Publish");
 
             Assert.BuildPassed(result);
-            // No cshtml files should be in the build output directory
-            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
 
             // refs shouldn't be produced by default
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+
+            // Views shouldn't be produced by default
+            Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
         }
 
         [ConditionalFact]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject(TestProjectName)]
-        public async Task PublishingProject_CopyToOutputDirectoryFiles_WithCopyRefAssembliesToPublishDirectory()
+        public async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
         {
             TargetFramework = "net461";
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
index 2c8cf9e865..f72de92966 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
@@ -152,6 +152,24 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        [Fact]
+        public async Task PublishingProject_CopyToPublishDirectoryItems()
+        {
+            using (CreateTestProject())
+            {
+                // Build
+                var result = await DotnetMSBuild("Publish");
+
+                Assert.BuildPassed(result);
+
+                // refs shouldn't be produced by default
+                Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "refs"), "*.dll");
+
+                // Views shouldn't be produced by default
+                Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
+            }
+        }
+
         [Fact]
         public virtual async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
         {
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 4111cbd4dc..b7ae27c5e0 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -8,6 +8,7 @@
     <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
     <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
     <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
+    <ProjectReference Include="..\SimpleMvc22NetFx\SimpleMvc22NetFx.csproj" />
     <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />
 
     <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" />
diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj
index ab338c85c3..ba2f97732b 100644
--- a/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj
+++ b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj
@@ -12,7 +12,6 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
 
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />

From 35daeda2bf6c1d2d209d613b41beb2396e6a3679 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 17 Jul 2019 11:29:12 -0700
Subject: [PATCH 215/337] React to ElementReference change \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/2f35d24cb807e9c2d027cd8ee37e1eb862b92c35

---
 .../src/Components/ComponentDesignTimeNodeWriter.cs       | 2 +-
 .../src/Components/ComponentRuntimeNodeWriter.cs          | 2 +-
 .../src/Components/ComponentsApi.cs                       | 4 ++--
 .../src/Intermediate/ReferenceCaptureIntermediateNode.cs  | 2 +-
 .../IntegrationTests/ComponentCodeGenerationTestBase.cs   | 2 +-
 .../ComponentDeclarationIntegrationTest.cs                | 2 +-
 .../Element_WithRef/TestComponent.codegen.cs              | 4 ++--
 .../Element_WithRef/TestComponent.ir.txt                  | 2 +-
 .../Element_WithRef/TestComponent.mappings.txt            | 2 +-
 .../TestComponent.codegen.cs                              | 4 ++--
 .../TestComponent.ir.txt                                  | 2 +-
 .../TestComponent.mappings.txt                            | 6 +++---
 .../TestComponent.codegen.cs                              | 4 ++--
 .../Element_WithRef_SuppressField/TestComponent.ir.txt    | 4 ++--
 .../TestComponent.mappings.txt                            | 8 ++++----
 .../Element_WithRef/TestComponent.codegen.cs              | 2 +-
 .../Element_WithRef/TestComponent.ir.txt                  | 2 +-
 .../Element_WithRef/TestComponent.mappings.txt            | 2 +-
 .../TestComponent.codegen.cs                              | 2 +-
 .../TestComponent.ir.txt                                  | 2 +-
 .../TestComponent.mappings.txt                            | 4 ++--
 .../TestComponent.codegen.cs                              | 2 +-
 .../Element_WithRef_SuppressField/TestComponent.ir.txt    | 4 ++--
 .../TestComponent.mappings.txt                            | 8 ++++----
 .../src/RefTagHelperDescriptorProvider.cs                 | 4 ++--
 ...crosoft.AspNetCore.Components.netstandard2.0.Manual.cs | 2 +-
 .../Microsoft.AspNetCore.Components.netstandard2.0.cs     | 4 ++--
 27 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 7885d47f8e..ae81506bc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -874,7 +874,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // errors will be equivalent
                 var captureTypeName = node.IsComponentCapture
                     ? node.ComponentCaptureTypeName
-                    : ComponentsApi.ElementRef.FullTypeName;
+                    : ComponentsApi.ElementReference.FullTypeName;
                 WriteCSharpCode(context, new CSharpCodeIntermediateNode
                 {
                     Source = node.Source,
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 418aa160f5..3e41b668a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -792,7 +792,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             //
             // builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; });
             // OR
-            // builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementRef)__value; });
+            // builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementReference)__value; });
             var codeWriter = context.CodeWriter;
 
             var methodName = node.IsComponentCapture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 9ca5c2795c..9a6aad2cf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -123,9 +123,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.EventHandlerAttribute";
         }
 
-        public static class ElementRef
+        public static class ElementReference
         {
-            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ElementRef";
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ElementReference";
         }
 
         public static class EventCallback
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
index 077bd0c1fa..48e6bc7d03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public string ComponentCaptureTypeName { get; set; }
 
-        public string FieldTypeName => IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementRef.FullTypeName;
+        public string FieldTypeName => IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementReference.FullTypeName;
 
         public string TypeName => $"global::System.Action<{FieldTypeName}>";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index b65d268ac1..365b4f2624 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -3742,7 +3742,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <elem @ref=""myElem"" @ref:suppressField>Hello</elem>
 @code {
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 }");
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index b3e35fd973..2748afdd0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             // Assert
             var field = component.GetType().GetField("myDiv", BindingFlags.NonPublic | BindingFlags.Instance);
             Assert.NotNull(field);
-            Assert.Same(typeof(ElementRef), field.FieldType);
+            Assert.Same(typeof(ElementReference), field.FieldType);
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index c74b523370..fae58f00ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     {
         #pragma warning disable 0414
         #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
+        private global::Microsoft.AspNetCore.Components.ElementReference myElem;
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 219
@@ -27,7 +27,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                     myElem = default(Microsoft.AspNetCore.Components.ElementRef);
+                                     myElem = default(Microsoft.AspNetCore.Components.ElementReference);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index d88a3bbec3..c321049510 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - myElem
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 64a2a111d5..2eb6a03840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1108:29,37 [6] )
+Generated Location: (1114:29,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index e535ca1ae9..9d01631d68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     {
         #pragma warning disable 0414
         #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementRef _element;
+        private global::Microsoft.AspNetCore.Components.ElementReference _element;
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 219
@@ -36,7 +36,7 @@ namespace Test
             ;
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                 _element = default(Microsoft.AspNetCore.Components.ElementRef);
+                                                 _element = default(Microsoft.AspNetCore.Components.ElementReference);
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 5ebf20fbf2..647bf2d50e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - _element
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - _element
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index e5bbc4a62f..89ac6be30d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (1130:30,37 [3] )
+Generated Location: (1136:30,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1319:38,49 [8] )
+Generated Location: (1325:38,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1560:47,7 [56] )
+Generated Location: (1572:47,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index c1596ddf4a..4d2be5537a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            myElem = default(Microsoft.AspNetCore.Components.ElementRef);
+            myElem = default(Microsoft.AspNetCore.Components.ElementReference);
 
 #line default
 #line hidden
@@ -32,7 +32,7 @@ namespace Test
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
index 5cb785f84e..e505e82004 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                     ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
                 HtmlContent - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementRef myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
+            CSharpCode - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementReference myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index a4beb28484..a4e15f2c64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (855:24,12 [6] )
 |myElem|
 
-Source Location: (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1094:33,7 [72] )
+Generated Location: (1100:33,7 [78] )
 |
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 1dacb96fe0..ff782ad029 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     {
         #pragma warning disable 0414
         #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
+        private global::Microsoft.AspNetCore.Components.ElementReference myElem;
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index 7acd3547a4..c51872c53f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - myElem
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 7f14ab1c93..826dab548b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1083:26,37 [6] )
+Generated Location: (1089:26,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 85402811d2..f4407667db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     {
         #pragma warning disable 0414
         #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementRef _element;
+        private global::Microsoft.AspNetCore.Components.ElementReference _element;
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index cc1e4700ae..c0fd524c30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - _element
+            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - _element
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index e119fa8929..42d48ed927 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1255:34,49 [8] )
+Generated Location: (1261:34,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1520:46,7 [56] )
+Generated Location: (1526:46,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 548594ab24..5144ce4e61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -31,7 +31,7 @@ namespace Test
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
index a92d1e0d9c..89666189e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     HtmlContent - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
                     ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
-            CSharpCode - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementRef myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
+            CSharpCode - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementReference myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index 4b1c0546cf..41e1311f24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -3,14 +3,14 @@ Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (698:19,12 [6] )
 |myElem|
 
-Source Location: (60:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1006:32,7 [72] )
+Generated Location: (1006:32,7 [78] )
 |
-    ElementRef myElem;
+    ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index 7cce7808e6..3dc20da67f 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -27,8 +27,8 @@ namespace Microsoft.CodeAnalysis.Razor
                 return;
             }
 
-            var elementRef = compilation.GetTypeByMetadataName(ComponentsApi.ElementRef.FullTypeName);
-            if (elementRef == null)
+            var elementReference = compilation.GetTypeByMetadataName(ComponentsApi.ElementReference.FullTypeName);
+            if (elementReference == null)
             {
                 // If we can't find ElementRef, then just bail. We won't be able to compile the
                 // generated code anyway.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
index 42a0d20589..a2c69a5b9f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
         public readonly string ElementName;
         [System.Runtime.InteropServices.FieldOffsetAttribute(24)]
-        public readonly System.Action<Microsoft.AspNetCore.Components.ElementRef> ElementReferenceCaptureAction;
+        public readonly System.Action<Microsoft.AspNetCore.Components.ElementReference> ElementReferenceCaptureAction;
         [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
         public readonly string ElementReferenceCaptureId;
         [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 1af987e156..08b46f7e55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Components
         protected void OnUnhandledException(System.UnhandledExceptionEventArgs e) { }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct ElementRef
+    public readonly partial struct ElementReference
     {
         private readonly object _dummy;
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -719,7 +719,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public void AddContent(int sequence, object textContent) { }
         public void AddContent(int sequence, string textContent) { }
         public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
-        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementRef> elementReferenceCaptureAction) { }
+        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
         public void AddMarkupContent(int sequence, string markupContent) { }
         public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
         public void Clear() { }

From 09b2c7d81a8e7a440d10a7be7413eb16da72ce58 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 18 Jul 2019 16:48:53 -0700
Subject: [PATCH 216/337] Fix weakly-typed component bind
 (dotnet/aspnetcore-tooling#853)

* Fix weakly-typed component bind

The globalization change regressed this. For weakly typed component bind
we don't want to do any conversions, we need the values to match
exactly.

Note that there's no compiler-generated type checks because its
weakly-typed.

* pr feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2d74721815a84eca0e909ef8fa4b2bf5220bd2e3
---
 .../Components/ComponentBindLoweringPass.cs   | 173 +++++++++---------
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../Regression_597/TestComponent.codegen.cs   |   6 +-
 .../Regression_597/TestComponent.ir.txt       |   6 +-
 .../Regression_597/TestComponent.mappings.txt |   4 +-
 .../Regression_609/TestComponent.codegen.cs   |  12 +-
 .../Regression_609/TestComponent.ir.txt       |  12 +-
 .../Regression_609/TestComponent.mappings.txt |   6 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../Regression_597/TestComponent.codegen.cs   |   6 +-
 .../Regression_597/TestComponent.ir.txt       |   6 +-
 .../Regression_597/TestComponent.mappings.txt |   2 +-
 .../Regression_609/TestComponent.codegen.cs   |  12 +-
 .../Regression_609/TestComponent.ir.txt       |  12 +-
 .../Regression_609/TestComponent.mappings.txt |   2 +-
 37 files changed, 162 insertions(+), 213 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 44967b9077..7de5cb4582 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -332,22 +332,30 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             var valueExpressionTokens = new List<IntermediateToken>();
             var changeExpressionTokens = new List<IntermediateToken>();
 
-            // DOM-based event handlers use EventCallback, so if we see a delegate here it's a component.
-            if (changeAttribute != null && changeAttribute.IsDelegateProperty())
+            // There are a few cases to handle for @bind:
+            // 1. This is a component using a delegate (int Value & Action<int> Value)
+            // 2. This is a component using EventCallback (int value & EventCallback<int>)
+            // 3. This is an element
+            if (parent is ComponentIntermediateNode && changeAttribute != null && changeAttribute.IsDelegateProperty())
             {
                 RewriteNodesForComponentDelegateBind(
                     original,
                     valueExpressionTokens,
                     changeExpressionTokens);
             }
+            else if (parent is ComponentIntermediateNode)
+            {
+                RewriteNodesForComponentEventCallbackBind(
+                    original,
+                    valueExpressionTokens,
+                    changeExpressionTokens);
+            }
             else
             {
-                RewriteNodesForEventCallbackBind(
+                RewriteNodesForElementEventCallbackBind(
                     original,
                     format,
                     culture,
-                    valueAttribute,
-                    changeAttribute,
                     valueExpressionTokens,
                     changeExpressionTokens);
             }
@@ -596,6 +604,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             List<IntermediateToken> valueExpressionTokens,
             List<IntermediateToken> changeExpressionTokens)
         {
+            // For a component using @bind we want to:
+            //  - use the value as-is
+            //  - create a delegate to handle changes
             valueExpressionTokens.Add(original);
 
             // Now rewrite the content of the change-handler node. Since it's a component attribute,
@@ -609,63 +620,69 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             });
         }
 
-        private void RewriteNodesForEventCallbackBind(
+        private void RewriteNodesForComponentEventCallbackBind(
             IntermediateToken original,
-            IntermediateToken format,
-            IntermediateToken culture,
-            BoundAttributeDescriptor valueAttribute,
-            BoundAttributeDescriptor changeAttribute,
             List<IntermediateToken> valueExpressionTokens,
             List<IntermediateToken> changeExpressionTokens)
         {
-            if (changeAttribute == null)
+            // For a component using @bind we want to:
+            //  - use the value as-is
+            //  - create a delegate to handle changes
+            valueExpressionTokens.Add(original);
+
+            changeExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = $"{ComponentsApi.RuntimeHelpers.CreateInferredEventCallback}(this, __value => {original.Content} = __value, {original.Content})",
+                Kind = TokenKind.CSharp
+            });
+        }
+
+        private void RewriteNodesForElementEventCallbackBind(
+            IntermediateToken original,
+            IntermediateToken format,
+            IntermediateToken culture,
+            List<IntermediateToken> valueExpressionTokens,
+            List<IntermediateToken> changeExpressionTokens)
+        {
+            // This is bind on a markup element. We use FormatValue to transform the value in the correct way
+            // according to format and culture.
+            //
+            // Now rewrite the content of the value node to look like:
+            //
+            // BindConverter.FormatValue(<code>, format: <format>, culture: <culture>)
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = $"{ComponentsApi.BindConverter.FormatValue}(",
+                Kind = TokenKind.CSharp
+            });
+            valueExpressionTokens.Add(original);
+
+            if (!string.IsNullOrEmpty(format?.Content))
             {
-                // This is bind on a markup element. We use FormatValue to transform the value in the correct way
-                // according to format and culture.
-                //
-                // Now rewrite the content of the value node to look like:
-                //
-                // BindConverter.FormatValue(<code>, format: <format>, culture: <culture>)
                 valueExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = $"{ComponentsApi.BindConverter.FormatValue}(",
-                    Kind = TokenKind.CSharp
-                });
-                valueExpressionTokens.Add(original);
-
-                if (!string.IsNullOrEmpty(format?.Content))
-                {
-                    valueExpressionTokens.Add(new IntermediateToken()
-                    {
-                        Content = ", format: ",
-                        Kind = TokenKind.CSharp,
-                    });
-                    valueExpressionTokens.Add(format);
-                }
-
-                if (!string.IsNullOrEmpty(culture?.Content))
-                {
-                    valueExpressionTokens.Add(new IntermediateToken()
-                    {
-                        Content = ", culture: ",
-                        Kind = TokenKind.CSharp,
-                    });
-                    valueExpressionTokens.Add(culture);
-                }
-
-                valueExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = ")",
+                    Content = ", format: ",
                     Kind = TokenKind.CSharp,
                 });
+                valueExpressionTokens.Add(format);
             }
-            else
+
+            if (!string.IsNullOrEmpty(culture?.Content))
             {
-                // This is a component. We can just use the value as-is, since we know its type
-                // we can type-check it.
-                valueExpressionTokens.Add(original);
+                valueExpressionTokens.Add(new IntermediateToken()
+                {
+                    Content = ", culture: ",
+                    Kind = TokenKind.CSharp,
+                });
+                valueExpressionTokens.Add(culture);
             }
 
+            valueExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = ")",
+                Kind = TokenKind.CSharp,
+            });
+
             // Now rewrite the content of the change-handler node. There are two cases we care about
             // here. If it's a component attribute, then don't use the 'CreateBinder' wrapper. We expect
             // component attributes to always 'match' on type.
@@ -683,53 +700,41 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // EventCallbackFactory.CreateBinder(this, __value => <code> = __value, <code>, format: <format>, culture: <culture>)
             //
             // Note that the linemappings here are applied to the value attribute, not the change attribute.
-            if (changeAttribute == null)
+            changeExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, ",
+                Kind = TokenKind.CSharp
+            });
+
+            changeExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = original.Content,
+                Kind = TokenKind.CSharp
+            });
+
+            if (format != null)
             {
                 changeExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = $"{ComponentsApi.EventCallback.FactoryAccessor}.{ComponentsApi.EventCallbackFactory.CreateBinderMethod}(this, __value => {original.Content} = __value, ",
+                    Content = $", format: {format.Content}",
                     Kind = TokenKind.CSharp
                 });
-
-                changeExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = original.Content,
-                    Kind = TokenKind.CSharp
-                });
-
-                if (format != null)
-                {
-                    changeExpressionTokens.Add(new IntermediateToken()
-                    {
-                        Content = $", format: {format.Content}",
-                        Kind = TokenKind.CSharp
-                    });
-                }
-
-                if (culture != null)
-                {
-                    changeExpressionTokens.Add(new IntermediateToken()
-                    {
-                        Content = $", culture: {culture.Content}",
-                        Kind = TokenKind.CSharp
-                    });
-                }
-
-                changeExpressionTokens.Add(new IntermediateToken()
-                {
-                    Content = ")",
-                    Kind = TokenKind.CSharp,
-                });
             }
-            else
+
+            if (culture != null)
             {
-                // Component
                 changeExpressionTokens.Add(new IntermediateToken()
                 {
-                    Content = $"{ComponentsApi.RuntimeHelpers.CreateInferredEventCallback}(this, __value => {original.Content} = __value, {original.Content})",
+                    Content = $", culture: {culture.Content}",
                     Kind = TokenKind.CSharp
                 });
             }
+
+            changeExpressionTokens.Add(new IntermediateToken()
+            {
+                Content = ")",
+                Kind = TokenKind.CSharp,
+            });
         }
 
         private static IntermediateToken GetAttributeContent(IntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 86034d23fc..2965e1fb3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+            ;
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 9f7149a4dd..8bd5424b6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -17,14 +17,10 @@ Document -
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 3ef391e308..5767f43ad2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (947:25,26 [11] )
+Generated Location: (889:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1591:46,7 [50] )
+Generated Location: (1557:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 86034d23fc..2965e1fb3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+            ;
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 40bb41ba35..a212e7bae1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -17,14 +17,10 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 4667924f8f..ed07994694 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (947:25,26 [11] )
+Generated Location: (889:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1591:46,7 [50] )
+Generated Location: (1557:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index e988d14f86..0cca1fedfa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -37,8 +37,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value);
+            ;
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index bf90946e51..7c63eb10ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -19,14 +19,10 @@ Document -
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
-                            IntermediateToken -  - CSharp - Value
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index ae029ecce0..feb4fb825d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (889:25,19 [6] )
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1148:34,37 [5] )
+Generated Location: (1090:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1776:55,7 [21] )
+Generated Location: (1742:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index f7a93c0716..fe20fde684 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            , -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -36,7 +36,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), -1, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+            , -1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent<>);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 5fe76a0a34..0dbf027145 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -20,14 +20,10 @@ Document -
                             IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
-                            IntermediateToken -  - CSharp - Value
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
                 HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 169a8784c9..9c4adf3e72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (974:25,38 [2] )
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1200:33,24 [5] )
+Generated Location: (1142:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1663:50,7 [21] )
+Generated Location: (1629:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 2e6824def5..0a7f8d0d66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   y
@@ -28,8 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y);
+            ;
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 5774e0937c..e0aafb2816 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -17,14 +17,10 @@ Document -
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, 
-                            IntermediateToken -  - CSharp - y
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y)
                 HtmlContent - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 HtmlContent - (57:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index edbe22c916..cb5a1e93b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (939:25,18 [1] )
+Generated Location: (881:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1549:46,7 [24] )
+Generated Location: (1515:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index cf186ba2f4..757cd16153 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    UserName
@@ -28,9 +28,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName);
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            ;
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName);
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               UserIsActive
@@ -38,8 +38,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive);
+            ;
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive);
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 1f1500b2e7..842e1a2894 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -17,24 +17,16 @@ Document -
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, 
-                            IntermediateToken -  - CSharp - UserName
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName)
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, 
-                            IntermediateToken -  - CSharp - UserIsActive
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive)
                 HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
                 HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 75803fb231..0ad4e0ae79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (940:25,19 [8] )
+Generated Location: (882:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1344:35,46 [12] )
+Generated Location: (1252:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1984:56,7 [88] )
+Generated Location: (1916:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 4afa761ce4..12ec533645 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            builder.AddAttribute(1, "Value", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            );
+            builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 53eee9a48f..b486ac5e19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -10,13 +10,9 @@ Document -
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index f4e2a0aee6..3ed64249a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1180:31,7 [50] )
+Generated Location: (1146:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 4c928b0a49..bffae94555 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            builder.AddAttribute(1, "Value", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            );
+            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 069e8744e4..ff2e3f4654 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -10,13 +10,9 @@ Document -
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 2d02f7fe69..3a47f75e95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1183:31,7 [50] )
+Generated Location: (1149:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 1ea9e24a46..0d4e5692b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            builder.AddAttribute(1, "Item", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+            );
+            builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 798a406e93..195a0fa760 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -12,13 +12,9 @@ Document -
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
-                            IntermediateToken -  - CSharp - Value
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
             CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 00080fb6e0..d81b4dbb48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1182:31,7 [21] )
+Generated Location: (1148:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 43507c0948..d15cfa279d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            , 2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -29,7 +29,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ), 3, Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, Value));
+            , 3, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 8d55e997c7..93ba4b1e33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -13,14 +13,10 @@ Document -
                             IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Value = __value, 
-                            IntermediateToken -  - CSharp - Value
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
             CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string Value;\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index a9e57e12be..0b9a55a01b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1241:36,7 [21] )
+Generated Location: (1207:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index f2c3ac6454..65acc680fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.Counter>(0);
-            builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            builder.AddAttribute(1, "v", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   y
@@ -22,8 +22,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, y));
+            );
+            builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index a9391feda5..629774d50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -10,13 +10,9 @@ Document -
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => y = __value, 
-                            IntermediateToken -  - CSharp - y
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y)
             CSharpCode - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    string y = null;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 0c93d42c7c..529317be43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1133:31,7 [24] )
+Generated Location: (1099:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 29ff34835b..0faaef0677 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.User>(0);
-            builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            builder.AddAttribute(1, "Name", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    UserName
@@ -22,9 +22,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, UserName));
-            builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            );
+            builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName));
+            builder.AddAttribute(3, "IsActive", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               UserIsActive
@@ -32,8 +32,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, UserIsActive));
+            );
+            builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive));
             builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index fed478e3d8..d376d038a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -10,23 +10,15 @@ Document -
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserName = __value, 
-                            IntermediateToken -  - CSharp - UserName
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName)
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
                             IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
-                            IntermediateToken -  - CSharp - )
                     ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => UserIsActive = __value, 
-                            IntermediateToken -  - CSharp - UserIsActive
-                            IntermediateToken -  - CSharp - )
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive)
             CSharpCode - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string UserName { get; set; }\n    public bool UserIsActive { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 616e32b911..dc418c4a40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1643:41,7 [88] )
+Generated Location: (1575:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }

From d30eb2f58e0e7ddaee643dfb061b098dc5464863 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Fri, 19 Jul 2019 10:09:07 -0700
Subject: [PATCH 217/337] Fix serialization of SourceSpan

I noticed this while debugging something else in VS. It looks like the
service hub is using camelCase, which wasn't covered with a diagnostic
in our tests. As a result we would fail to read the data from the OOP
host, and fall back to in-process tag helper discovery.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/63b25dbd2d4e0f18f3a8f48adf8812339b715ee6
---
 .../RazorShared/RazorDiagnosticJsonConverter.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs b/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
index 8f67591eb2..4bfba23eed 100644
--- a/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
+++ b/src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
@@ -27,15 +27,16 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
             }
 
             var diagnostic = JObject.Load(reader);
+            var id = diagnostic[nameof(RazorDiagnostic.Id)].Value<string>();
+            var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value<int>();
+            var message = diagnostic[RazorDiagnosticMessageKey].Value<string>();
+
             var span = diagnostic[nameof(RazorDiagnostic.Span)].Value<JObject>();
+            var filePath = span[nameof(SourceSpan.FilePath)].Value<string>();
             var absoluteIndex = span[nameof(SourceSpan.AbsoluteIndex)].Value<int>();
             var lineIndex = span[nameof(SourceSpan.LineIndex)].Value<int>();
             var characterIndex = span[nameof(SourceSpan.CharacterIndex)].Value<int>();
             var length = span[nameof(SourceSpan.Length)].Value<int>();
-            var filePath = span[nameof(SourceSpan.FilePath)].Value<string>();
-            var message = diagnostic[RazorDiagnosticMessageKey].Value<string>();
-            var id = diagnostic[nameof(RazorDiagnostic.Id)].Value<string>();
-            var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value<int>();
 
             var descriptor = new RazorDiagnosticDescriptor(id, () => message, (RazorDiagnosticSeverity)severity);
             var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length);
@@ -53,7 +54,13 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
             WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage(CultureInfo.CurrentCulture));
 
             writer.WritePropertyName(nameof(RazorDiagnostic.Span));
-            serializer.Serialize(writer, diagnostic.Span);
+            writer.WriteStartObject();
+            WriteProperty(writer, nameof(SourceSpan.FilePath), diagnostic.Span.FilePath);
+            WriteProperty(writer, nameof(SourceSpan.AbsoluteIndex), diagnostic.Span.AbsoluteIndex);
+            WriteProperty(writer, nameof(SourceSpan.LineIndex), diagnostic.Span.LineIndex);
+            WriteProperty(writer, nameof(SourceSpan.CharacterIndex), diagnostic.Span.CharacterIndex);
+            WriteProperty(writer, nameof(SourceSpan.Length), diagnostic.Span.Length);
+            writer.WriteEndObject();
 
             writer.WriteEndObject();
         }

From c9ed74d84ae69dd376a0c61852abf980308b356f Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 22 Jul 2019 09:16:09 -0700
Subject: [PATCH 218/337] Correctly set UpToDateReloadFileTypes
 (dotnet/aspnetcore-tooling#858)

* Correctly set UpToDateReloadFileTypes

UpToDateReloadFileTypes was incorrectly set in the preview6 DesignTime targets and this was worked
around in the SDK's targets. Unfortunately the updated copy of DesignTime targets (current as of 7/13)
also has a bug.

This fixes the issue and adds some tests to verify we're correct with the past, present & future.

Fixes https://github.com/aspnet/AspNetCore/issues/11873

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/525d0c1ad360434a833356facb8687e80cd4351f
---
 ...Microsoft.NET.Sdk.Razor.DesignTime.targets | 20 +++----
 .../Sdk.Razor.CurrentVersion.targets          |  4 +-
 .../BuildIntrospectionTest.cs                 | 52 +++++++++++++++++++
 .../RazorTest.Introspection.targets           |  4 ++
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index f50984d5f1..2bf7ada2df 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -17,7 +17,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Defines the list of file extensions that VS will monitor to reload the application.
       We'll only define these for C# projects targeting RazorLangVersion 3.0 or later, and let VS use defaults in other cases.
     -->
-    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(RazorUpToDateReloadFileTypes)' == ''">$(UpToDateReloadFileTypes);$(RazorUpToDateReloadFileTypes)</UpToDateReloadFileTypes>
+    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(RazorUpToDateReloadFileTypes)' != ''">$(UpToDateReloadFileTypes);$(RazorUpToDateReloadFileTypes)</UpToDateReloadFileTypes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,7 +42,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectCapability Include="WebNestingDefaults" />
   </ItemGroup>
 
-  <!-- 
+  <!--
     For now we need to treat component files as if they have a single file generator. This will allow us
     to trigger a workspace update for the declaration files when they change.
   -->
@@ -84,9 +84,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyPageSchema>
   </ItemGroup>
 
-  <Target 
-    Name="RazorGenerateDesignTime" 
-    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" 
+  <Target
+    Name="RazorGenerateDesignTime"
+    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths"
     Returns="@(RazorGenerateWithTargetPath)">
   </Target>
 
@@ -94,9 +94,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     Using DependsOnTargets here because real dependencies of this target aren't defined in
     a downlevel (pre-3.0) SDK.
   -->
-  <Target 
-    Name="RazorGenerateComponentDesignTime" 
-    DependsOnTargets="$(_RazorGenerateComponentDesignTimeDependsOn)" 
+  <Target
+    Name="RazorGenerateComponentDesignTime"
+    DependsOnTargets="$(_RazorGenerateComponentDesignTimeDependsOn)"
     Returns="@(RazorComponentWithTargetPath)">
   </Target>
 
@@ -107,8 +107,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     Called by the project system to update generated declaration files
   -->
-  <Target 
-    Name="RazorGenerateComponentDeclarationDesignTime" 
+  <Target
+    Name="RazorGenerateComponentDeclarationDesignTime"
     DependsOnTargets="$(_RazorGenerateComponentDeclarationDesignTimeDependsOn)">
   </Target>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 14be3fdf58..e001d5f5da 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -865,14 +865,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="$(RazorDesignTimeTargets)" />
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(_RazorUpToDateReloadFileTypesAllowWorkaround)' != 'false'">
     <!--
       Defines the list of file extensions that VS will monitor to reload the application.
       We'll only define these for C# projects targeting RazorLangVersion 3.0 or later, and let VS use defaults in other cases.
 
       This property can be removed after the next insertion in to VS.
     -->
-    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(RazorUpToDateReloadFileTypes)' == ''">$(RazorUpToDateReloadFileTypes)</UpToDateReloadFileTypes>
+    <UpToDateReloadFileTypes Condition="'$(Language)'=='C#' AND '$(_Targeting30OrNewerRazorLangVersion)' == 'true' AND '$(UpToDateReloadFileTypes)' == ''">$(RazorUpToDateReloadFileTypes)</UpToDateReloadFileTypes>
   </PropertyGroup>
 
   <!--
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 9af2bb3753..bdc08000c1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -142,5 +142,57 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputContainsLine(result, "RazorLangVersion: 3.0");
             Assert.BuildOutputContainsLine(result, "ResolvedRazorConfiguration: MVC-3.0");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task UpToDateReloadFileTypes_Default()
+        {
+            var result = await DotnetMSBuild("_IntrospectUpToDateReloadFileTypes");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "UpToDateReloadFileTypes: ;.cs;.razor;.resx;.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task UpToDateReloadFileTypes_WithRuntimeCompilation()
+        {
+            AddProjectFileContent(
+@"
+<PropertyGroup>
+    <RazorUpToDateReloadFileTypes>$(RazorUpToDateReloadFileTypes.Replace('.cshtml', ''))</RazorUpToDateReloadFileTypes>
+</PropertyGroup>");
+
+            var result = await DotnetMSBuild("_IntrospectUpToDateReloadFileTypes");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "UpToDateReloadFileTypes: ;.cs;.razor;.resx;");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task UpToDateReloadFileTypes_WithwWorkAroundRemoved()
+        {
+            var result = await DotnetMSBuild("_IntrospectUpToDateReloadFileTypes", "/p:_RazorUpToDateReloadFileTypesAllowWorkaround=false");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "UpToDateReloadFileTypes: ;.cs;.razor;.resx;.cshtml");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task UpToDateReloadFileTypes_WithRuntimeCompilationAndWorkaroundRemoved()
+        {
+            AddProjectFileContent(
+@"
+<PropertyGroup>
+    <RazorUpToDateReloadFileTypes>$(RazorUpToDateReloadFileTypes.Replace('.cshtml', ''))</RazorUpToDateReloadFileTypes>
+</PropertyGroup>");
+
+            var result = await DotnetMSBuild("_IntrospectUpToDateReloadFileTypes", "/p:_RazorUpToDateReloadFileTypesAllowWorkaround=false");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "UpToDateReloadFileTypes: ;.cs;.razor;.resx;");
+        }
     }
 }
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index ea4f3d100e..516abc8388 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -38,4 +38,8 @@
     <Message Text="RazorLangVersion: $(RazorLangVersion)" Importance="High" />
     <Message Text="ResolvedRazorConfiguration: @(ResolvedRazorConfiguration)" Importance="High" />
   </Target>
+
+  <Target Name="_IntrospectUpToDateReloadFileTypes">
+    <Message Text="UpToDateReloadFileTypes: $(UpToDateReloadFileTypes)" Importance="High" />
+  </Target>
 </Project>

From e189edcd27604978f693b3f63ddc43ed01283ee3 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 23 Jul 2019 15:01:38 -0700
Subject: [PATCH 219/337] Increase timeout in attempt to fix test flakiness
 (dotnet/aspnetcore-tooling#867)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6383999d6a09d292b3108a58126cf31f1fc404c2
---
 .../test/IntegrationTests/BuildServerTestFixtureBase.cs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs
index 5275d96e89..69440c6bee 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerTestFixtureBase.cs
@@ -14,8 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
     public abstract class BuildServerTestFixtureBase : IDisposable
     {
-        private static readonly TimeSpan _defaultShutdownTimeout = TimeSpan.FromSeconds(60);
-
+        private static readonly TimeSpan _defaultShutdownTimeout = TimeSpan.FromSeconds(120);
 
         protected BuildServerTestFixtureBase(string pipeName)
         {

From 4b6a5b26f63105fe351768be4428730e69077715 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 25 Jul 2019 16:21:25 -0700
Subject: [PATCH 220/337] Revert "Update test projects to use latest Roslyn."

This reverts commit dotnet/aspnetcore-tooling@cff58c01ae8151385df156e6eb421d8e613965f9.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7388cde7ea9964861dfe0debf366436c754ffd1c
---
 .../BuildServerIntegrationTest.cs             |  6 -----
 .../test/testassets/Directory.Build.props     | 22 -------------------
 2 files changed, 28 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 7cab7ac3ee..6121bc9646 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -77,12 +77,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject(originalProjectName: "SimpleMvc", targetProjectName: "Whitespace in name", baseDirectory: "")]
         public async Task Build_AppWithWhitespaceInName_CanBuildSuccessfully()
         {
-            // We need to separately restore the project in order to ensure this project uses the latest Roslyn. Without this
-            // the Csc task from Roslyn would have already been loaded and any update to it from nuget packages would not have
-            // an effect. This allows us to create our obj/Whitespace in name.csproj.nuget.g.props file (we renamed the project)
-            // and then properly build the project with an appropriate Csc.
-            await DotnetMSBuild("Restore");
-
             var result = await DotnetMSBuild(
                 "Build",
                 "/p:_RazorForceBuildServer=true");
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index d9d2ac66f5..8cc9caef29 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -38,26 +38,4 @@
 
   <Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" />
 
-  <!--
-    NOTE, BELOW
-
-    These bits are a temporary workaround until we're able to get on the latest SDK which includes the latest Roslyn bits.
-    Without them we can't properly publish testapps in a standalone fashion without investing in temporary infrastructure.
-  -->
-  <PropertyGroup>
-    <MicrosoftNetCompilersToolsetPackageVersion>3.3.0-beta2-19365-06</MicrosoftNetCompilersToolsetPackageVersion>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/roslyn/api/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset"
-        Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
-        PrivateAssets="all"
-        IsImplicitlyDefined="true" />
-  </ItemGroup>
-
-
 </Project>

From 13453582669b4bae45689ae2f773e624cd92ebe5 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 26 Jul 2019 14:38:16 -0700
Subject: [PATCH 221/337] Enable Razor integration tests to use repos Roslyn
 version.

- Updated `BuildVariables` to lift the `Microsoft.Net.Compilers.Toolset` package version into C# so we can pass it as a parameter to our testapps when building them.
- Flowed the `MicrosoftNetCompilersToolsetPackageVersion` to transitive testapp projects on restore. This enables `build.cmd` to properly pre-build our `testapp` projects with the latest version of Roslyn.
- Added several conditions to detect if a user is attempting to independently build a `testapp` at which point we fallback to using the SDKs Roslyn compiler toolset version.

aspnet/AspNetCoredotnet/aspnetcore-tooling#12268
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/57a72ecc46c50d4d722fa89019b07d7baf085977
---
 .../test/BuildVariables.cs                    | 10 ++++++++++
 .../BuildServerIntegrationTest.cs             |  6 ++++++
 .../MSBuildIntegrationTestBase.cs             |  1 +
 .../IntegrationTests/PackIntegrationTest.cs   |  4 ++--
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  3 ++-
 .../test/testassets/Directory.Build.props     | 19 +++++++++++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
index f6379ae723..2fc7b8eae6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
@@ -7,6 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     {
         private static string _msBuildPath = string.Empty;
         private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
+        private static string _microsoftNetCompilersToolsetPackageVersion = string.Empty;
 
         static partial void InitializeVariables();
 
@@ -27,5 +28,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 return _microsoftNETCoreApp30PackageVersion;
             }
         }
+
+        public static string MicrosoftNetCompilersToolsetPackageVersion
+        {
+            get
+            {
+                InitializeVariables();
+                return _microsoftNetCompilersToolsetPackageVersion;
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 6121bc9646..7cab7ac3ee 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -77,6 +77,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject(originalProjectName: "SimpleMvc", targetProjectName: "Whitespace in name", baseDirectory: "")]
         public async Task Build_AppWithWhitespaceInName_CanBuildSuccessfully()
         {
+            // We need to separately restore the project in order to ensure this project uses the latest Roslyn. Without this
+            // the Csc task from Roslyn would have already been loaded and any update to it from nuget packages would not have
+            // an effect. This allows us to create our obj/Whitespace in name.csproj.nuget.g.props file (we renamed the project)
+            // and then properly build the project with an appropriate Csc.
+            await DotnetMSBuild("Restore");
+
             var result = await DotnetMSBuild(
                 "Build",
                 "/p:_RazorForceBuildServer=true");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index b17592bb80..e8a001c49d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -95,6 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 "/p:RunningAsTest=true",
 
                 $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
+                $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}",
 
                 // Additional restore sources for projects that require built packages
                 $"/p:RuntimeAdditionalRestoreSources={additionalRestoreSources}",
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index f1502e0a37..80e404a083 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -230,10 +230,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
         public async Task Pack_NoBuild_IncludesStaticWebAssets()
         {
-            var result = await DotnetMSBuild("Build");
+            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
             Assert.BuildPassed(result, allowWarnings: true);
 
-            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true");
+            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true", runRestoreBeforeBuildOrPublish: false);
             Assert.BuildPassed(pack, allowWarnings: true);
 
             Assert.FileExists(pack, OutputPath, "PackageLibraryDirectDependency.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index ac9c318068..9f0dab1860 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -87,6 +87,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             _msBuildPath = @"$(_DesktopMSBuildPath)";
             _microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
+            _microsoftNetCompilersToolsetPackageVersion = "$(MicrosoftNetCompilersToolsetPackageVersion)";
         }
     }
 }
@@ -108,7 +109,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
   </Target>
 
   <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" />
+    <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
   </Target>
 
 </Project>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 8cc9caef29..1bdf3f0025 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -6,6 +6,13 @@
     <SolutionRoot>$([MSBuild]::EnsureTrailingSlash('$(SolutionRoot)'))</SolutionRoot>
     <RepositoryRoot>$(SolutionRoot)..\..\</RepositoryRoot>
 
+    <!--
+      In the case that a user is building a sample directly the MicrosoftNetCompilersToolsetPackagerVersion will not be provided.
+      We'll fall back to whatever the current SDK provides in regards to Roslyn's Microsoft.Net.Compilers.Toolset.
+    -->
+    <BuildingTestAppsIndependently>false</BuildingTestAppsIndependently>
+    <BuildingTestAppsIndependently Condition="'$(MicrosoftNetCompilersToolsetPackageVersion)' == ''">true</BuildingTestAppsIndependently>
+
     <!-- Retarget tests to use the copy of the Sdk from source -->
     <RazorSdkArtifactsDirectory>$(SolutionRoot)..\..\artifacts\bin\Microsoft.NET.Sdk.Razor\</RazorSdkArtifactsDirectory>
 
@@ -19,6 +26,11 @@
       https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
       https://api.nuget.org/v3/index.json;
     </RestoreSources>
+
+    <RestoreSources Condition="$(BuildingTestAppsIndependently) == false">
+      $(RestoreSources);
+      https://dotnet.myget.org/F/roslyn/api/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -36,6 +48,13 @@
     <_MvcAssemblyName Include="Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(BuildingTestAppsIndependently) == false">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset"
+        Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
+        PrivateAssets="all"
+        IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" />
 
 </Project>

From 36420ad55f81e4f0c194788d50e7cdf068ed44a2 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 29 Jul 2019 14:24:25 -0700
Subject: [PATCH 222/337] Forgive nullability violation in directive syntax
 helpers.

- Directives utilize helpers to add to colorization errors, etc. in Razor files. These helpers typically look like `MyType __something = default(MyType)`. The issue with this approach is that `default(MyType)` can be `null` yet `MyType` is a non-nullable type. To workaround this restriction I added nulllability forgiveness operators to the type and member directive tokens (the only two that could possibly generate `null` based output).
- Updated baselines to reflect new forgiveness operator.

aspnet/AspNetCoredotnet/aspnetcore-tooling#10919
aspnet/AspNetCoredotnet/aspnetcore-tooling#11478
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d0617ed578db4dd8630befcae953d0e2999fd476
---
 ...IncompleteDirectives_DesignTime.codegen.cs |  2 +-
 ...completeDirectives_DesignTime.mappings.txt |  2 +-
 .../InheritsViewModel_DesignTime.codegen.cs   |  4 ++--
 .../InheritsViewModel_DesignTime.mappings.txt |  2 +-
 ...eritsWithViewImports_DesignTime.codegen.cs |  2 +-
 .../InjectWithModel_DesignTime.codegen.cs     |  6 +++---
 .../InjectWithModel_DesignTime.mappings.txt   |  8 ++++----
 .../InjectWithSemicolon_DesignTime.codegen.cs | 10 +++++-----
 ...njectWithSemicolon_DesignTime.mappings.txt | 16 +++++++--------
 .../Inject_DesignTime.codegen.cs              |  2 +-
 .../Inject_DesignTime.mappings.txt            |  2 +-
 ...lExpressionTagHelper_DesignTime.codegen.cs |  2 +-
 ...xpressionTagHelper_DesignTime.mappings.txt |  6 +++---
 .../Model_DesignTime.codegen.cs               |  2 +-
 .../MultipleModels_DesignTime.codegen.cs      |  4 ++--
 .../MultipleModels_DesignTime.mappings.txt    |  2 +-
 .../Sections_DesignTime.codegen.cs            |  2 +-
 .../Sections_DesignTime.mappings.txt          |  8 ++++----
 .../_ViewImports_DesignTime.codegen.cs        |  2 +-
 .../_ViewImports_DesignTime.mappings.txt      |  2 +-
 ...IncompleteDirectives_DesignTime.codegen.cs |  2 +-
 ...completeDirectives_DesignTime.mappings.txt |  6 +++---
 .../InheritsViewModel_DesignTime.codegen.cs   |  4 ++--
 .../InheritsViewModel_DesignTime.mappings.txt |  2 +-
 ...eritsWithViewImports_DesignTime.codegen.cs |  2 +-
 .../InjectWithModel_DesignTime.codegen.cs     |  6 +++---
 .../InjectWithModel_DesignTime.mappings.txt   |  8 ++++----
 .../InjectWithSemicolon_DesignTime.codegen.cs | 10 +++++-----
 ...njectWithSemicolon_DesignTime.mappings.txt | 16 +++++++--------
 .../Inject_DesignTime.codegen.cs              |  2 +-
 .../Inject_DesignTime.mappings.txt            |  2 +-
 ...lExpressionTagHelper_DesignTime.codegen.cs |  2 +-
 ...xpressionTagHelper_DesignTime.mappings.txt |  6 +++---
 .../Model_DesignTime.codegen.cs               |  2 +-
 .../MultipleModels_DesignTime.codegen.cs      |  4 ++--
 .../MultipleModels_DesignTime.mappings.txt    |  2 +-
 ...gesWithRouteTemplate_DesignTime.codegen.cs |  2 +-
 ...sWithRouteTemplate_DesignTime.mappings.txt |  4 ++--
 .../RazorPages_DesignTime.codegen.cs          |  2 +-
 .../RazorPages_DesignTime.mappings.txt        |  6 +++---
 .../Sections_DesignTime.codegen.cs            |  2 +-
 .../Sections_DesignTime.mappings.txt          |  8 ++++----
 .../_ViewImports_DesignTime.codegen.cs        |  2 +-
 .../_ViewImports_DesignTime.mappings.txt      |  2 +-
 .../BasicComponent_DesignTime.codegen.cs      |  2 +-
 .../BasicComponent_DesignTime.mappings.txt    |  6 +++---
 ...IncompleteDirectives_DesignTime.codegen.cs |  2 +-
 ...completeDirectives_DesignTime.mappings.txt |  6 +++---
 .../InheritsViewModel_DesignTime.codegen.cs   |  4 ++--
 .../InheritsViewModel_DesignTime.mappings.txt |  2 +-
 ...eritsWithViewImports_DesignTime.codegen.cs |  2 +-
 .../InjectWithModel_DesignTime.codegen.cs     | 10 +++++-----
 .../InjectWithModel_DesignTime.mappings.txt   |  8 ++++----
 .../InjectWithSemicolon_DesignTime.codegen.cs | 18 ++++++++---------
 ...njectWithSemicolon_DesignTime.mappings.txt | 16 +++++++--------
 .../Inject_DesignTime.codegen.cs              |  4 ++--
 .../Inject_DesignTime.mappings.txt            |  2 +-
 ...lExpressionTagHelper_DesignTime.codegen.cs |  2 +-
 ...xpressionTagHelper_DesignTime.mappings.txt |  6 +++---
 .../Model_DesignTime.codegen.cs               |  2 +-
 .../MultipleModels_DesignTime.codegen.cs      |  4 ++--
 .../MultipleModels_DesignTime.mappings.txt    |  2 +-
 ...gesWithRouteTemplate_DesignTime.codegen.cs |  2 +-
 ...sWithRouteTemplate_DesignTime.mappings.txt |  4 ++--
 .../RazorPages_DesignTime.codegen.cs          |  2 +-
 .../RazorPages_DesignTime.mappings.txt        |  6 +++---
 .../Sections_DesignTime.codegen.cs            |  4 ++--
 .../Sections_DesignTime.mappings.txt          |  8 ++++----
 .../_ViewImports_DesignTime.codegen.cs        |  4 ++--
 .../_ViewImports_DesignTime.mappings.txt      |  2 +-
 .../DesignTimeDirectiveTargetExtension.cs     | 20 +++++++++++++++----
 .../DesignTimeDirectiveTargetExtensionTest.cs |  4 ++--
 .../DesignTime_DesignTime.codegen.cs          |  2 +-
 .../DesignTime_DesignTime.mappings.txt        | 16 +++++++--------
 .../Implements_DesignTime.codegen.cs          |  2 +-
 .../Implements_DesignTime.mappings.txt        |  2 +-
 .../Inherits_DesignTime.codegen.cs            |  2 +-
 .../Inherits_DesignTime.mappings.txt          |  2 +-
 .../InlineBlocks_DesignTime.codegen.cs        |  2 +-
 .../InlineBlocks_DesignTime.mappings.txt      |  8 ++++----
 .../Sections_DesignTime.codegen.cs            |  6 +++---
 .../Sections_DesignTime.mappings.txt          | 14 ++++++-------
 .../StringLiterals_DesignTime.codegen.cs      |  4 ++--
 .../StringLiterals_DesignTime.mappings.txt    |  2 +-
 .../TagHelpersInSection_DesignTime.codegen.cs |  4 ++--
 ...agHelpersInSection_DesignTime.mappings.txt | 10 +++++-----
 .../ComponentImports/_Imports.codegen.cs      |  2 +-
 .../ComponentImports/_Imports.mappings.txt    |  2 +-
 .../TestComponent.codegen.cs                  |  4 ++--
 .../TestComponent.mappings.txt                | 10 +++++-----
 90 files changed, 225 insertions(+), 213 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index c5fa34abec..174cfee86e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -49,7 +49,7 @@ namespace AspNetCore
         ))();
         ((System.Action)(() => {
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 929d8f49e4..45be2df3ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -25,6 +25,6 @@ Generated Location: (1536:51,0 [17] )
 
 Source Location: (150:7,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1785:59,0 [0] )
+Generated Location: (1766:59,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
index 7cdbaf3326..c5e699c2cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
-MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+MyBasePageForViews<TModel> __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
index 6a313a909d..b5fd5c933d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (740:19,0 [26] )
 
 Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyModel|
-Generated Location: (1004:27,0 [7] )
+Generated Location: (976:27,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
index 0ca023f56a..c8e66ffaaf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
index 2120622373..4d4d684cda 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ MyModel __typeHelper = default(MyModel);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
@@ -41,7 +41,7 @@ global::System.Object MyPropertyName = null;
         ))();
         ((System.Action)(() => {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
index c4838ff64d..dd6970fdb8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -5,21 +5,21 @@ Generated Location: (766:19,0 [7] )
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyApp|
-Generated Location: (990:27,0 [5] )
+Generated Location: (981:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyPropertyName|
-Generated Location: (1232:35,22 [14] )
+Generated Location: (1216:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyService<TModel>|
-Generated Location: (1438:43,0 [17] )
+Generated Location: (1422:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |Html|
-Generated Location: (1704:51,22 [4] )
+Generated Location: (1669:51,22 [4] )
 |Html|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
index ea95a4e7eb..15e13c4def 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ MyModel __typeHelper = default(MyModel);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
@@ -41,7 +41,7 @@ global::System.Object MyPropertyName = null;
         ))();
         ((System.Action)(() => {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
@@ -57,7 +57,7 @@ global::System.Object Html = null;
         ))();
         ((System.Action)(() => {
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
@@ -73,7 +73,7 @@ global::System.Object MyPropertyName2 = null;
         ))();
         ((System.Action)(() => {
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
index 6a90f75f3e..8c1b0b9336 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -5,41 +5,41 @@ Generated Location: (774:19,0 [7] )
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1002:27,0 [5] )
+Generated Location: (993:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName|
-Generated Location: (1248:35,22 [14] )
+Generated Location: (1232:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (1458:43,0 [17] )
+Generated Location: (1442:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html|
-Generated Location: (1728:51,22 [4] )
+Generated Location: (1693:51,22 [4] )
 |Html|
 
 Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1928:59,0 [5] )
+Generated Location: (1893:59,0 [5] )
 |MyApp|
 
 Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName2|
-Generated Location: (2174:67,22 [15] )
+Generated Location: (2132:67,22 [15] )
 |MyPropertyName2|
 
 Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (2385:75,0 [17] )
+Generated Location: (2343:75,0 [17] )
 |MyService<TModel>|
 
 Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html2|
-Generated Location: (2655:83,22 [5] )
+Generated Location: (2594:83,22 [5] )
 |Html2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
index 7b2f4fedc6..ec04e2bf8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
index 10ed356ecf..27b118c2ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (748:19,0 [5] )
 
 Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyPropertyName|
-Generated Location: (981:27,22 [14] )
+Generated Location: (974:27,22 [14] )
 |MyPropertyName|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index 844e9500d0..f0fe1ad8e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -23,7 +23,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
-DateTime __typeHelper = default(DateTime);
+DateTime __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index c2d5cbab5a..d4fc8a447a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -5,16 +5,16 @@ Generated Location: (1259:25,0 [8] )
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1531:33,37 [29] )
+Generated Location: (1521:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (2210:49,102 [4] )
+Generated Location: (2200:49,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2602:56,94 [5] )
+Generated Location: (2592:56,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
index 63c2a52c6f..c01f69d243 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
-System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+System.Collections.IEnumerable __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
index e8f705cef7..2ff817c2ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
-ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+ThisShouldBeGenerated __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
-System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+System.Collections.IEnumerable __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
index 79d7e257c7..8853f2b5d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (778:19,0 [21] )
 
 Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (1029:27,0 [30] )
+Generated Location: (1006:27,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 6971a08a00..a720d28d50 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -23,7 +23,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-DateTime __typeHelper = default(DateTime);
+DateTime __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index b2ae45c050..ba25b7bb6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -5,25 +5,25 @@ Generated Location: (1227:25,0 [8] )
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1483:33,37 [29] )
+Generated Location: (1473:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1713:41,22 [8] )
+Generated Location: (1703:41,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (2179:56,2 [46] )
+Generated Location: (2169:56,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2604:64,102 [4] )
+Generated Location: (2594:64,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
index 1f60d924cc..363ff66ca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
-IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+IHtmlHelper<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
index dc03ca32da..6b845596b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (760:19,0 [19] )
 
 Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |Helper|
-Generated Location: (1027:27,22 [6] )
+Generated Location: (1006:27,22 [6] )
 |Helper|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 0e78caebf8..5d795057a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -49,7 +49,7 @@ namespace AspNetCore
         ))();
         ((System.Action)(() => {
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index f7d4a23a9b..f6a870a0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -25,16 +25,16 @@ Generated Location: (1530:51,0 [17] )
 
 Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1780:59,0 [0] )
+Generated Location: (1761:59,0 [0] )
 ||
 
 Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1971:67,0 [0] )
+Generated Location: (1952:67,0 [0] )
 ||
 
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (2162:75,0 [0] )
+Generated Location: (2143:75,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
index 7cdbaf3326..c5e699c2cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
-MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+MyBasePageForViews<TModel> __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
index 6a313a909d..b5fd5c933d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (740:19,0 [26] )
 
 Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyModel|
-Generated Location: (1004:27,0 [7] )
+Generated Location: (976:27,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
index f174a0fc2f..25cf7044fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
index 2120622373..4d4d684cda 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ MyModel __typeHelper = default(MyModel);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
@@ -41,7 +41,7 @@ global::System.Object MyPropertyName = null;
         ))();
         ((System.Action)(() => {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
index c4838ff64d..dd6970fdb8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -5,21 +5,21 @@ Generated Location: (766:19,0 [7] )
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyApp|
-Generated Location: (990:27,0 [5] )
+Generated Location: (981:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyPropertyName|
-Generated Location: (1232:35,22 [14] )
+Generated Location: (1216:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyService<TModel>|
-Generated Location: (1438:43,0 [17] )
+Generated Location: (1422:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |Html|
-Generated Location: (1704:51,22 [4] )
+Generated Location: (1669:51,22 [4] )
 |Html|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
index ea95a4e7eb..15e13c4def 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ MyModel __typeHelper = default(MyModel);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
@@ -41,7 +41,7 @@ global::System.Object MyPropertyName = null;
         ))();
         ((System.Action)(() => {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
@@ -57,7 +57,7 @@ global::System.Object Html = null;
         ))();
         ((System.Action)(() => {
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
@@ -73,7 +73,7 @@ global::System.Object MyPropertyName2 = null;
         ))();
         ((System.Action)(() => {
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
index 6a90f75f3e..8c1b0b9336 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -5,41 +5,41 @@ Generated Location: (774:19,0 [7] )
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1002:27,0 [5] )
+Generated Location: (993:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName|
-Generated Location: (1248:35,22 [14] )
+Generated Location: (1232:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (1458:43,0 [17] )
+Generated Location: (1442:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html|
-Generated Location: (1728:51,22 [4] )
+Generated Location: (1693:51,22 [4] )
 |Html|
 
 Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1928:59,0 [5] )
+Generated Location: (1893:59,0 [5] )
 |MyApp|
 
 Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName2|
-Generated Location: (2174:67,22 [15] )
+Generated Location: (2132:67,22 [15] )
 |MyPropertyName2|
 
 Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (2385:75,0 [17] )
+Generated Location: (2343:75,0 [17] )
 |MyService<TModel>|
 
 Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html2|
-Generated Location: (2655:83,22 [5] )
+Generated Location: (2594:83,22 [5] )
 |Html2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
index 7b2f4fedc6..ec04e2bf8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
index 10ed356ecf..27b118c2ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (748:19,0 [5] )
 
 Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyPropertyName|
-Generated Location: (981:27,22 [14] )
+Generated Location: (974:27,22 [14] )
 |MyPropertyName|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index 844e9500d0..f0fe1ad8e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -23,7 +23,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
-DateTime __typeHelper = default(DateTime);
+DateTime __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index c2d5cbab5a..d4fc8a447a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -5,16 +5,16 @@ Generated Location: (1259:25,0 [8] )
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1531:33,37 [29] )
+Generated Location: (1521:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (2210:49,102 [4] )
+Generated Location: (2200:49,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2602:56,94 [5] )
+Generated Location: (2592:56,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
index 63c2a52c6f..c01f69d243 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
-System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+System.Collections.IEnumerable __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
index e8f705cef7..2ff817c2ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
-ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+ThisShouldBeGenerated __typeHelper = default;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
         ))();
         ((System.Action)(() => {
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
-System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+System.Collections.IEnumerable __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
index 79d7e257c7..8853f2b5d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (778:19,0 [21] )
 
 Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (1029:27,0 [30] )
+Generated Location: (1006:27,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
index 8f5d082e6a..0301af92d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -31,7 +31,7 @@ global::System.Object __typeHelper = "/About";
         ))();
         ((System.Action)(() => {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
-NewModel __typeHelper = default(NewModel);
+NewModel __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
index cc5e9cad30..d9fa4ef590 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -15,7 +15,7 @@ Generated Location: (1313:33,0 [8] )
 
 Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |Model.Name|
-Generated Location: (1841:48,18 [10] )
+Generated Location: (1831:48,18 [10] )
 |Model.Name|
 
 Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
@@ -25,7 +25,7 @@ Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrat
         public string Name { get; set; }
     }
 |
-Generated Location: (2049:55,12 [97] )
+Generated Location: (2039:55,12 [97] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
index 0b92014eff..d792bf0160 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
-NewModel __typeHelper = default(NewModel);
+NewModel __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
index 64f6b1ddbb..4bfb581ff3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -10,12 +10,12 @@ Generated Location: (1370:30,0 [8] )
 
 Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |"*, AppCode"|
-Generated Location: (1628:38,37 [12] )
+Generated Location: (1618:38,37 [12] )
 |"*, AppCode"|
 
 Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |Model.Name|
-Generated Location: (2286:55,47 [10] )
+Generated Location: (2276:55,47 [10] )
 |Model.Name|
 
 Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
@@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr
         public string Name { get; set; }
     }
 |
-Generated Location: (3065:70,12 [360] )
+Generated Location: (3055:70,12 [360] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 6971a08a00..a720d28d50 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -23,7 +23,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-DateTime __typeHelper = default(DateTime);
+DateTime __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index b2ae45c050..ba25b7bb6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -5,25 +5,25 @@ Generated Location: (1227:25,0 [8] )
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1483:33,37 [29] )
+Generated Location: (1473:33,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1713:41,22 [8] )
+Generated Location: (1703:41,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (2179:56,2 [46] )
+Generated Location: (2169:56,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2604:64,102 [4] )
+Generated Location: (2594:64,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
index 1f60d924cc..363ff66ca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -17,7 +17,7 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
-IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+IHtmlHelper<TModel> __typeHelper = default;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
index dc03ca32da..6b845596b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (760:19,0 [19] )
 
 Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |Helper|
-Generated Location: (1027:27,22 [6] )
+Generated Location: (1006:27,22 [6] )
 |Helper|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index fc6dd7e603..787cae57d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -15,7 +15,7 @@ namespace __GeneratedComponent
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
-IDisposable __typeHelper = default(IDisposable);
+IDisposable __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index c505557cd3..1531845869 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (641:17,0 [11] )
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1251:35,13 [15] )
+Generated Location: (1239:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1448:43,6 [29] )
+Generated Location: (1436:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1700:52,12 [37] )
+Generated Location: (1688:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 8f5be40d38..ce31fa3aa6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -58,7 +58,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index b73427b4fc..d722992d66 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -25,16 +25,16 @@ Generated Location: (1701:60,0 [17] )
 
 Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1989:70,0 [0] )
+Generated Location: (1971:70,0 [0] )
 ||
 
 Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (2218:80,0 [0] )
+Generated Location: (2200:80,0 [0] )
 ||
 
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (2447:90,0 [0] )
+Generated Location: (2429:90,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
index 5df4e38e8c..92bb26ff8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
-MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+MyBasePageForViews<TModel> __typeHelper = default!;
 
 #line default
 #line hidden
@@ -28,7 +28,7 @@ MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
index e8601673e4..84a0fc0bc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (759:20,0 [26] )
 
 Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyModel|
-Generated Location: (1061:30,0 [7] )
+Generated Location: (1034:30,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
index 854bc5acf7..70e733c3aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
index 6eb2a04465..dcd2bee26f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default!;
 
 #line default
 #line hidden
@@ -28,7 +28,7 @@ MyModel __typeHelper = default(MyModel);
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default!;
 
 #line default
 #line hidden
@@ -38,7 +38,7 @@ MyApp __typeHelper = default(MyApp);
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-global::System.Object MyPropertyName = null;
+global::System.Object MyPropertyName = null!;
 
 #line default
 #line hidden
@@ -48,7 +48,7 @@ global::System.Object MyPropertyName = null;
         ((System.Action)(() => {
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default!;
 
 #line default
 #line hidden
@@ -58,7 +58,7 @@ MyService<TModel> __typeHelper = default(MyService<TModel>);
         ((System.Action)(() => {
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
-global::System.Object Html = null;
+global::System.Object Html = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
index 2aa53d9a49..eb2a7eb7bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -5,21 +5,21 @@ Generated Location: (785:20,0 [7] )
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyApp|
-Generated Location: (1047:30,0 [5] )
+Generated Location: (1039:30,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyPropertyName|
-Generated Location: (1327:40,22 [14] )
+Generated Location: (1313:40,22 [14] )
 |MyPropertyName|
 
 Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyService<TModel>|
-Generated Location: (1571:50,0 [17] )
+Generated Location: (1558:50,0 [17] )
 |MyService<TModel>|
 
 Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |Html|
-Generated Location: (1875:60,22 [4] )
+Generated Location: (1844:60,22 [4] )
 |Html|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
index 23c1be5972..3f7ff5b26d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyModel __typeHelper = default(MyModel);
+MyModel __typeHelper = default!;
 
 #line default
 #line hidden
@@ -28,7 +28,7 @@ MyModel __typeHelper = default(MyModel);
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default!;
 
 #line default
 #line hidden
@@ -38,7 +38,7 @@ MyApp __typeHelper = default(MyApp);
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-global::System.Object MyPropertyName = null;
+global::System.Object MyPropertyName = null!;
 
 #line default
 #line hidden
@@ -48,7 +48,7 @@ global::System.Object MyPropertyName = null;
         ((System.Action)(() => {
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default!;
 
 #line default
 #line hidden
@@ -58,7 +58,7 @@ MyService<TModel> __typeHelper = default(MyService<TModel>);
         ((System.Action)(() => {
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-global::System.Object Html = null;
+global::System.Object Html = null!;
 
 #line default
 #line hidden
@@ -68,7 +68,7 @@ global::System.Object Html = null;
         ((System.Action)(() => {
 #nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default!;
 
 #line default
 #line hidden
@@ -78,7 +78,7 @@ MyApp __typeHelper = default(MyApp);
         ((System.Action)(() => {
 #nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-global::System.Object MyPropertyName2 = null;
+global::System.Object MyPropertyName2 = null!;
 
 #line default
 #line hidden
@@ -88,7 +88,7 @@ global::System.Object MyPropertyName2 = null;
         ((System.Action)(() => {
 #nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-MyService<TModel> __typeHelper = default(MyService<TModel>);
+MyService<TModel> __typeHelper = default!;
 
 #line default
 #line hidden
@@ -98,7 +98,7 @@ MyService<TModel> __typeHelper = default(MyService<TModel>);
         ((System.Action)(() => {
 #nullable restore
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
-global::System.Object Html2 = null;
+global::System.Object Html2 = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
index fd3c9832d8..fda44e6571 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -5,41 +5,41 @@ Generated Location: (793:20,0 [7] )
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1059:30,0 [5] )
+Generated Location: (1051:30,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName|
-Generated Location: (1343:40,22 [14] )
+Generated Location: (1329:40,22 [14] )
 |MyPropertyName|
 
 Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (1591:50,0 [17] )
+Generated Location: (1578:50,0 [17] )
 |MyService<TModel>|
 
 Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html|
-Generated Location: (1899:60,22 [4] )
+Generated Location: (1868:60,22 [4] )
 |Html|
 
 Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (2137:70,0 [5] )
+Generated Location: (2107:70,0 [5] )
 |MyApp|
 
 Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName2|
-Generated Location: (2421:80,22 [15] )
+Generated Location: (2385:80,22 [15] )
 |MyPropertyName2|
 
 Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (2670:90,0 [17] )
+Generated Location: (2635:90,0 [17] )
 |MyService<TModel>|
 
 Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html2|
-Generated Location: (2978:100,22 [5] )
+Generated Location: (2925:100,22 [5] )
 |Html2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
index 65d978634b..32f6e7deee 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
-MyApp __typeHelper = default(MyApp);
+MyApp __typeHelper = default!;
 
 #line default
 #line hidden
@@ -28,7 +28,7 @@ MyApp __typeHelper = default(MyApp);
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
-global::System.Object MyPropertyName = null;
+global::System.Object MyPropertyName = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
index e78674c121..460ccddc4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (767:20,0 [5] )
 
 Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyPropertyName|
-Generated Location: (1038:30,22 [14] )
+Generated Location: (1032:30,22 [14] )
 |MyPropertyName|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index bafdc422ae..2dc89dfe21 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -24,7 +24,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
-DateTime __typeHelper = default(DateTime);
+DateTime __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index 274add4bdd..e1bbbe7295 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -5,16 +5,16 @@ Generated Location: (1278:26,0 [8] )
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1588:36,37 [29] )
+Generated Location: (1579:36,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (2305:54,102 [4] )
+Generated Location: (2296:54,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (2735:63,94 [5] )
+Generated Location: (2726:63,94 [5] )
 |Model|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
index bc7f027902..62b7f11ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
-System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+System.Collections.IEnumerable __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
index 648d6a810f..d44e698a48 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
-ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+ThisShouldBeGenerated __typeHelper = default!;
 
 #line default
 #line hidden
@@ -28,7 +28,7 @@ ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
         ((System.Action)(() => {
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
-System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+System.Collections.IEnumerable __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
index 9f3cb96a3e..170b1068b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (797:20,0 [21] )
 
 Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (1086:30,0 [30] )
+Generated Location: (1064:30,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
index e66684b63d..566c5b5b38 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -36,7 +36,7 @@ global::System.Object __typeHelper = "/About";
         ((System.Action)(() => {
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
-NewModel __typeHelper = default(NewModel);
+NewModel __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
index 9485855d23..36cf7cd79b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -15,7 +15,7 @@ Generated Location: (1408:38,0 [8] )
 
 Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |Model.Name|
-Generated Location: (1974:55,18 [10] )
+Generated Location: (1965:55,18 [10] )
 |Model.Name|
 
 Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
@@ -25,7 +25,7 @@ Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrat
         public string Name { get; set; }
     }
 |
-Generated Location: (2220:64,12 [97] )
+Generated Location: (2211:64,12 [97] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
index 72421a6e4e..bce76cb7e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -31,7 +31,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         ((System.Action)(() => {
 #nullable restore
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
-NewModel __typeHelper = default(NewModel);
+NewModel __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
index 48e21da3e9..57342529a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -10,12 +10,12 @@ Generated Location: (1427:33,0 [8] )
 
 Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |"*, AppCode"|
-Generated Location: (1723:43,37 [12] )
+Generated Location: (1714:43,37 [12] )
 |"*, AppCode"|
 
 Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |Model.Name|
-Generated Location: (2419:62,47 [10] )
+Generated Location: (2410:62,47 [10] )
 |Model.Name|
 
 Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
@@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr
         public string Name { get; set; }
     }
 |
-Generated Location: (3236:79,12 [360] )
+Generated Location: (3227:79,12 [360] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index a50f2dc521..81e8732052 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -24,7 +24,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-DateTime __typeHelper = default(DateTime);
+DateTime __typeHelper = default!;
 
 #line default
 #line hidden
@@ -44,7 +44,7 @@ global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
         ((System.Action)(() => {
 #nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-global::System.Object Section1 = null;
+global::System.Object Section1 = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index b41d70d142..0b447c4139 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -5,25 +5,25 @@ Generated Location: (1246:26,0 [8] )
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (1540:36,37 [29] )
+Generated Location: (1531:36,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (1808:46,22 [8] )
+Generated Location: (1799:46,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (2312:63,2 [46] )
+Generated Location: (2304:63,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (2775:73,102 [4] )
+Generated Location: (2767:73,102 [4] )
 |Date|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
index 7a5e5b43f0..8d14c6501d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCore
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
-IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+IHtmlHelper<TModel> __typeHelper = default!;
 
 #line default
 #line hidden
@@ -28,7 +28,7 @@ IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
-global::System.Object Helper = null;
+global::System.Object Helper = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
index 6f9eb70d0e..d95f0ecc0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (779:20,0 [19] )
 
 Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |Helper|
-Generated Location: (1084:30,22 [6] )
+Generated Location: (1064:30,22 [6] )
 |Helper|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
index fb2594b138..ff4f131630 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/DesignTimeDirectiveTargetExtension.cs
@@ -79,9 +79,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                                 .Write(node.Content)
                                 .Write(" ")
                                 .WriteStartAssignment(TypeHelper)
-                                .Write("default(")
-                                .Write(node.Content)
-                                .WriteLine(");");
+                                .Write("default");
+
+                            if (!context.Options.SuppressNullabilityEnforcement)
+                            {
+                                context.CodeWriter.Write("!");
+                            }
+
+                            context.CodeWriter.WriteLine(";");
                         }
                         break;
 
@@ -105,7 +110,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                             context.AddSourceMappingFor(node);
                             context.CodeWriter
                                 .Write(node.Content)
-                                .WriteLine(" = null;");
+                                .Write(" = null");
+
+                            if (!context.Options.SuppressNullabilityEnforcement)
+                            {
+                                context.CodeWriter.Write("!");
+                            }
+
+                            context.CodeWriter.WriteLine(";");
                         }
                         break;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
index 9dd60c6a4d..4d61b0ef6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
@@ -60,7 +60,7 @@ private void __RazorDirectiveTokenHelpers__() {
 ((System.Action)(() => {
 #nullable restore
 #line 1 ""test.cshtml""
-System.String __typeHelper = default(System.String);
+System.String __typeHelper = default!;
 
 #line default
 #line hidden
@@ -142,7 +142,7 @@ private void __RazorDirectiveTokenHelpers__() {
 ((System.Action)(() => {
 #nullable restore
 #line 1 ""test.cshtml""
-global::System.Object Foo = null;
+global::System.Object Foo = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
index 3f579629fc..a3ebc4a8ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ((System.Action)(() => {
 #nullable restore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
-global::System.Object Footer = null;
+global::System.Object Footer = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
index 48c7818989..eab4e829b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
@@ -6,44 +6,44 @@ Generated Location: (507:12,22 [6] )
 Source Location: (20:1,13 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |for(int i = 1; i <= 10; i++) {
     |
-Generated Location: (1005:29,13 [36] )
+Generated Location: (1006:29,13 [36] )
 |for(int i = 1; i <= 10; i++) {
     |
 
 Source Location: (74:2,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |i|
-Generated Location: (1220:37,22 [1] )
+Generated Location: (1221:37,22 [1] )
 |i|
 
 Source Location: (79:2,27 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |
             }|
-Generated Location: (1406:44,27 [15] )
+Generated Location: (1407:44,27 [15] )
 |
             }|
 
 Source Location: (113:7,2 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |Foo(Bar.Baz)|
-Generated Location: (1584:52,6 [12] )
+Generated Location: (1585:52,6 [12] )
 |Foo(Bar.Baz)|
 
 Source Location: (129:8,1 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |Foo(|
-Generated Location: (1760:59,6 [4] )
+Generated Location: (1761:59,6 [4] )
 |Foo(|
 
 Source Location: (142:8,14 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |baz|
-Generated Location: (1941:62,14 [3] )
+Generated Location: (1942:62,14 [3] )
 |baz|
 
 Source Location: (153:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |)|
-Generated Location: (2001:68,1 [1] )
+Generated Location: (2002:68,1 [1] )
 |)|
 
 Source Location: (204:13,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |bar|
-Generated Location: (2239:76,6 [3] )
+Generated Location: (2240:76,6 [3] )
 |bar|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs
index 9fe4c8123d..94eba1f89d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml"
-IDisposable __typeHelper = default(IDisposable);
+IDisposable __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt
index 8b369c1249..f9010a682e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (39:2,12 [38] TestFiles/IntegrationTests/CodeGenerationIntegrat
 |
     void IDisposable.Dispose() { }
 |
-Generated Location: (1078:31,12 [38] )
+Generated Location: (1066:31,12 [38] )
 |
     void IDisposable.Dispose() { }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
index 223bbf70bd..3bc3695754 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml"
-foo.bar<baz<biz>>.boz __typeHelper = default(foo.bar<baz<biz>>.boz);
+foo.bar<baz<biz>>.boz __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
index 1e74b715ca..9fbfc712b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (504:12,0 [21] )
 
 Source Location: (36:2,1 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml)
 |foo()|
-Generated Location: (1047:29,6 [5] )
+Generated Location: (1025:29,6 [5] )
 |foo()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
index a2a699b7ca..39e2110768 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ((System.Action)(() => {
 #nullable restore
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
-global::System.Object Link = null;
+global::System.Object Link = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
index 513fd9f639..8c6f1e04c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
@@ -5,21 +5,21 @@ Generated Location: (510:12,22 [4] )
 
 Source Location: (44:1,14 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 |if(link != null) { |
-Generated Location: (1009:29,14 [19] )
+Generated Location: (1010:29,14 [19] )
 |if(link != null) { |
 
 Source Location: (64:1,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 |link|
-Generated Location: (1221:36,34 [4] )
+Generated Location: (1222:36,34 [4] )
 |link|
 
 Source Location: (68:1,38 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 | } else { |
-Generated Location: (1423:43,38 [10] )
+Generated Location: (1424:43,38 [10] )
 | } else { |
 
 Source Location: (92:1,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 | }|
-Generated Location: (1654:50,62 [2] )
+Generated Location: (1655:50,62 [2] )
 | }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 4a9f436896..2817001c87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ((System.Action)(() => {
 #nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-global::System.Object Section2 = null;
+global::System.Object Section2 = null!;
 
 #line default
 #line hidden
@@ -20,7 +20,7 @@ global::System.Object Section2 = null;
         ((System.Action)(() => {
 #nullable restore
 #line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-global::System.Object Section1 = null;
+global::System.Object Section1 = null!;
 
 #line default
 #line hidden
@@ -30,7 +30,7 @@ global::System.Object Section1 = null;
         ((System.Action)(() => {
 #nullable restore
 #line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
-global::System.Object NestedDelegates = null;
+global::System.Object NestedDelegates = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index fe0db2092f..863fba22d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -5,40 +5,40 @@ Generated Location: (502:12,22 [8] )
 
 Source Location: (172:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (756:22,22 [8] )
+Generated Location: (757:22,22 [8] )
 |Section1|
 
 Source Location: (235:14,9 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |NestedDelegates|
-Generated Location: (1010:32,22 [15] )
+Generated Location: (1012:32,22 [15] )
 |NestedDelegates|
 
 Source Location: (2:0,2 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |
     Layout = "_SectionTestLayout.cshtml"
 |
-Generated Location: (1504:49,2 [44] )
+Generated Location: (1507:49,2 [44] )
 |
     Layout = "_SectionTestLayout.cshtml"
 |
 
 Source Location: (123:7,22 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |thing|
-Generated Location: (1797:58,22 [5] )
+Generated Location: (1800:58,22 [5] )
 |thing|
 
 Source Location: (260:15,6 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | Func<dynamic, object> f = |
-Generated Location: (2182:71,6 [27] )
+Generated Location: (2185:71,6 [27] )
 | Func<dynamic, object> f = |
 
 Source Location: (295:15,41 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |item|
-Generated Location: (2480:79,41 [4] )
+Generated Location: (2483:79,41 [4] )
 |item|
 
 Source Location: (306:15,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |; |
-Generated Location: (2731:88,52 [2] )
+Generated Location: (2734:88,52 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
index 27ab1b0a1b..d3da7cc7e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ((System.Action)(() => {
 #nullable restore
 #line 86 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml"
-global::System.Object WriteLiteralsToInHere = null;
+global::System.Object WriteLiteralsToInHere = null!;
 
 #line default
 #line hidden
@@ -20,7 +20,7 @@ global::System.Object WriteLiteralsToInHere = null;
         ((System.Action)(() => {
 #nullable restore
 #line 206 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml"
-global::System.Object WriteLiteralsToInHereAlso = null;
+global::System.Object WriteLiteralsToInHereAlso = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
index dd997dde62..3338234435 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (515:12,22 [21] )
 
 Source Location: (5701:205,9 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml)
 |WriteLiteralsToInHereAlso|
-Generated Location: (789:22,22 [25] )
+Generated Location: (790:22,22 [25] )
 |WriteLiteralsToInHereAlso|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
index b350afaf40..eeb070f4e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.codegen.cs
@@ -27,7 +27,7 @@ global::System.Object __typeHelper = "*, TestAssembly";
         ((System.Action)(() => {
 #nullable restore
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
-global::System.Object MySection = null;
+global::System.Object MySection = null!;
 
 #line default
 #line hidden
@@ -37,7 +37,7 @@ global::System.Object MySection = null;
         ((System.Action)(() => {
 #nullable restore
 #line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml"
-global::System.Object nestedsection = null;
+global::System.Object nestedsection = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
index 42f3b53424..cc25475c21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_DesignTime.mappings.txt
@@ -10,30 +10,30 @@ Generated Location: (1381:29,22 [9] )
 
 Source Location: (388:14,13 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |nestedsection|
-Generated Location: (1647:39,22 [13] )
+Generated Location: (1648:39,22 [13] )
 |nestedsection|
 
 Source Location: (37:2,2 [31] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |
     var code = "some code";
 |
-Generated Location: (2150:56,2 [31] )
+Generated Location: (2152:56,2 [31] )
 |
     var code = "some code";
 |
 
 Source Location: (313:10,56 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |code|
-Generated Location: (2477:65,56 [4] )
+Generated Location: (2479:65,56 [4] )
 |code|
 
 Source Location: (157:8,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |DateTime.Now|
-Generated Location: (2989:75,51 [12] )
+Generated Location: (2991:75,51 [12] )
 |DateTime.Now|
 
 Source Location: (203:8,97 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection.cshtml)
 |DateTime.Now|
-Generated Location: (3340:83,97 [12] )
+Generated Location: (3342:83,97 [12] )
 |DateTime.Now|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index 207b21aac7..dba8b3e6a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -30,7 +30,7 @@ using System.Reflection;
         ((System.Action)(() => {
 #nullable restore
 #line 4 "x:\dir\subdir\Test\_Imports.razor"
-MainLayout __typeHelper = default(MainLayout);
+MainLayout __typeHelper = default!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
index 63e40afa0f..47a3c52604 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
@@ -15,6 +15,6 @@ Generated Location: (841:32,0 [10] )
 
 Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
 |Foo|
-Generated Location: (1292:49,6 [3] )
+Generated Location: (1281:49,6 [3] )
 |Foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index c65f250449..acfc5386cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components;
         ((System.Action)(() => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-global::System.Object TItem1 = null;
+global::System.Object TItem1 = null!;
 
 #line default
 #line hidden
@@ -31,7 +31,7 @@ global::System.Object TItem1 = null;
         ((System.Action)(() => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-global::System.Object TItem2 = null;
+global::System.Object TItem2 = null!;
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 913d618ec6..3e08c07a3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -10,27 +10,27 @@ Generated Location: (689:23,22 [6] )
 
 Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TItem2|
-Generated Location: (907:33,22 [6] )
+Generated Location: (908:33,22 [6] )
 |TItem2|
 
 Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
     |
-Generated Location: (1412:50,1 [38] )
+Generated Location: (1414:50,1 [38] )
 |foreach (var item2 in Items2)
 {
     |
 
 Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildContent(item2)|
-Generated Location: (1578:59,6 [19] )
+Generated Location: (1580:59,6 [19] )
 |ChildContent(item2)|
 
 Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1729:66,8 [3] )
+Generated Location: (1731:66,8 [3] )
 |
 }|
 
@@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1911:76,7 [185] )
+Generated Location: (1913:76,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }

From c1d291439810514895bce35332ee1a4aa6097b9f Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 26 Jun 2019 17:10:36 -0700
Subject: [PATCH 223/337] Require public component parameters and remove
 private metadata workaround

- Prior to this a user could have private, protected or public parameters. We now require public and plan to update analyzers to enforce good usage of public component parameters.
- Removed private `ComponentTagHelperDescriptorProvider` workaround. meta data workaround since we no longer operate on private parameters.
- Updated existing tests to not have private parameter setters. I missed these in my last pass.
- Added two new tests to validate parameters which are private or have private setters are ignored.

aspnet/AspNetCoredotnet/aspnetcore-tooling#12291
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/bb543aa1663745779a4b56e515315f0edb4e3ce8
---
 .../ComponentCodeGenerationTestBase.cs        | 24 +++---
 .../ComponentTagHelperDescriptorProvider.cs   | 32 ++++----
 ...omponentTagHelperDescriptorProviderTest.cs | 80 +++++++++++++++++++
 3 files changed, 106 insertions(+), 30 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 365b4f2624..516b4d7a8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -4574,7 +4574,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] public string Message { get; private set; }
+        [Parameter] public string Message { get; set; }
     }
 }
 "));
@@ -4603,7 +4603,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] public string Message { get; private set; }
+        [Parameter] public string Message { get; set; }
     }
 }
 "));
@@ -4634,7 +4634,7 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] public string Message { get; private set; }
+        [Parameter] public string Message { get; set; }
     }
 }
 "));
@@ -4664,9 +4664,9 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] public string Message { get; private set; }
-        [Parameter] public EventCallback<string> MessageChanged { get; private set; }
-        [Parameter] public Expression<Action<string>> MessageExpression { get; private set; }
+        [Parameter] public string Message { get; set; }
+        [Parameter] public EventCallback<string> MessageChanged { get; set; }
+        [Parameter] public Expression<Action<string>> MessageExpression { get; set; }
     }
 }
 "));
@@ -4699,9 +4699,9 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] public string Message { get; private set; }
-        [Parameter] public EventCallback<string> MessageChanged { get; private set; }
-        [Parameter] public Expression<Action<string>> MessageExpression { get; private set; }
+        [Parameter] public string Message { get; set; }
+        [Parameter] public EventCallback<string> MessageChanged { get; set; }
+        [Parameter] public Expression<Action<string>> MessageExpression { get; set; }
     }
 }
 "));
@@ -4734,9 +4734,9 @@ namespace Test
 {
     public class MyComponent : ComponentBase
     {
-        [Parameter] public string Message { get; private set; }
-        [Parameter] public EventCallback<string> MessageChanged { get; private set; }
-        [Parameter] public Expression<Action<string>> MessageExpression { get; private set; }
+        [Parameter] public string Message { get; set; }
+        [Parameter] public EventCallback<string> MessageChanged { get; set; }
+        [Parameter] public Expression<Action<string>> MessageExpression { get; set; }
     }
 }
 "));
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 30b8983983..29aa54ced0 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -4,10 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
-using Microsoft.CodeAnalysis.CSharp;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
@@ -18,10 +16,6 @@ namespace Microsoft.CodeAnalysis.Razor
                 .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
                 .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
 
-        private static MethodInfo WithMetadataImportOptionsMethodInfo =
-            typeof(CSharpCompilationOptions)
-                .GetMethod("WithMetadataImportOptions", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-
         public bool IncludeDocumentation { get; set; }
 
         public int Order { get; set; }
@@ -40,9 +34,6 @@ namespace Microsoft.CodeAnalysis.Razor
                 return;
             }
 
-            // We need to see private members too
-            compilation = WithMetadataImportOptionsAll(compilation);
-
             var symbols = ComponentSymbols.Create(compilation);
 
             var types = new List<INamedTypeSymbol>();
@@ -81,13 +72,6 @@ namespace Microsoft.CodeAnalysis.Razor
             }
         }
 
-        private Compilation WithMetadataImportOptionsAll(Compilation compilation)
-        {
-            var newCompilationOptions = (CSharpCompilationOptions)WithMetadataImportOptionsMethodInfo
-                .Invoke(compilation.Options, new object[] { /* All */ (byte)2 });
-            return compilation.WithOptions(newCompilationOptions);
-        }
-
         private TagHelperDescriptor CreateShortNameMatchingDescriptor(ComponentSymbols symbols, INamedTypeSymbol type)
         {
             var builder = CreateDescriptorBuilder(symbols, type);
@@ -216,9 +200,9 @@ namespace Microsoft.CodeAnalysis.Razor
                 }
 
                 // We need to check for cases like:
-                // [Parameter] List<T> MyProperty { get; set; }
+                // [Parameter] public List<T> MyProperty { get; set; }
                 // AND
-                // [Parameter] List<string> MyProperty { get; set; }
+                // [Parameter] public List<string> MyProperty { get; set; }
                 //
                 // We need to inspect the type arguments to tell the difference between a property that
                 // uses the containing class' type parameter(s) and a vanilla usage of generic types like
@@ -333,6 +317,7 @@ namespace Microsoft.CodeAnalysis.Razor
         // a dictionary keyed on property name.
         //
         // We consider parameters to be defined by properties satisfying all of the following:
+        // - are public
         // - are visible (not shadowed)
         // - have the [Parameter] attribute
         // - have a setter, even if private
@@ -367,6 +352,12 @@ namespace Microsoft.CodeAnalysis.Razor
                     }
 
                     var kind = PropertyKind.Default;
+                    if (property.DeclaredAccessibility != Accessibility.Public)
+                    {
+                        // Not public
+                        kind = PropertyKind.Ignored;
+                    }
+
                     if (property.Parameters.Length != 0)
                     {
                         // Indexer
@@ -378,6 +369,11 @@ namespace Microsoft.CodeAnalysis.Razor
                         // No setter
                         kind = PropertyKind.Ignored;
                     }
+                    else if (property.SetMethod.DeclaredAccessibility != Accessibility.Public)
+                    {
+                        // No public setter
+                        kind = PropertyKind.Ignored;
+                    }
 
                     if (property.IsStatic)
                     {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 329a8606b5..42461de24c 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -246,6 +246,86 @@ namespace Test
             Assert.Equal("System.String", attribute.TypeName);
         }
 
+        [Fact]
+        public void Execute_IgnoresPrivateParameters_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        private string MyProperty { get; set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Empty(component.BoundAttributes);
+        }
+
+        [Fact]
+        public void Execute_IgnoresParametersWithPrivateSetters_CreatesDescriptor()
+        {
+            // Arrange
+
+            var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        public string MyProperty { get; private set; }
+    }
+}
+
+"));
+
+            Assert.Empty(compilation.GetDiagnostics());
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ComponentTagHelperDescriptorProvider();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            var components = ExcludeBuiltInComponents(context);
+            components = AssertAndExcludeFullyQualifiedNameMatchComponents(components, expectedCount: 1);
+            var component = Assert.Single(components);
+
+            Assert.Equal("TestAssembly", component.AssemblyName);
+            Assert.Equal("Test.MyComponent", component.Name);
+
+            Assert.Empty(component.BoundAttributes);
+        }
+
         [Fact] // bool properties support minimized attributes
         public void Execute_BoolProperty_CreatesDescriptor()
         {

From 5ea6ba40cdbf5ffee11fb241d18ec666924a4a9b Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 30 Jul 2019 15:15:00 -0700
Subject: [PATCH 224/337] Update Roslyn dependencies to align with SDK and VS.

- Updated instances of our code to no longer use reference type checks on `ISymbol`s. This was a new restriction added by Roslyn [here](https://github.com/dotnet/roslyn-analyzers/issues/2084). We also have a follow up AspNetCore issue [here](https://github.com/aspnet/AspNetCore/issues/12747) to bring these level of changes to AspNetCore.
- Had to pin `Microsoft.CodeAnalysis.Analyzers` in our VSIX projects in order to workaround version conflicts of `Microsoft.CodeAnalysis.Analyzers`. The version conflict is introduced from our dependency on `Microsoft.VisualStudio.ProjectSystem.Managed.VS`. It transitively depends on `Microsoft.CodeAnalysis.Analyzers` `2.6.3` where as our latest Roslyn bits transitively depend on `Microsoft.CodeAnlalysis.Analyzers` `2.9.4`. Tried updating to the latest, private, `Microsoft.VisualStudio.ProjectSystem.Managed.VS` but it also had the version conflict.
- Pinned our runtime bits to the latest public Roslyn NuGet package and pinned our tooling bits to the latest private NuGet package (both are compatible flavors of 3.3.0).
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/83d5e2c36f5c0b4d697da238ef4cfd6bdaee6c59
---
 ...ViewComponentTagHelperDescriptorFactory.cs | 16 +++++++-------
 .../src/ViewComponentTypeVisitor.cs           |  2 +-
 ...ViewComponentTagHelperDescriptorFactory.cs | 16 +++++++-------
 .../src/ViewComponentTypeVisitor.cs           |  2 +-
 ...ViewComponentTagHelperDescriptorFactory.cs | 16 +++++++-------
 .../src/ViewComponentTypeVisitor.cs           |  2 +-
 .../src/BindTagHelperDescriptorProvider.cs    |  6 ++---
 .../ComponentTagHelperDescriptorProvider.cs   | 12 +++++-----
 .../src/DefaultTagHelperDescriptorFactory.cs  | 22 +++++++++----------
 ...EventHandlerTagHelperDescriptorProvider.cs |  2 +-
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
index 68966e734c..06b5bed18f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -110,11 +110,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
             {
                 // Will invoke asynchronously. Method must not return Task or Task<T>.
-                if (returnType == _taskSymbol)
+                if (Equals(returnType, _taskSymbol))
                 {
                     // This is ok.
                 }
-                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     // This is ok.
                 }
@@ -134,13 +134,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                     method = null;
                     return false;
                 }
-                else if (returnType == _taskSymbol)
+                else if (Equals(returnType, _taskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
                     return false;
                 }
-                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
@@ -208,13 +208,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
         private string GetIndexerValueTypeName(IParameterSymbol parameter)
         {
             INamedTypeSymbol dictionaryType;
-            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)parameter.Type;
             }
-            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+                dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -234,7 +234,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 
         private string GetShortName(INamedTypeSymbol componentType)
         {
-            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
             var name = viewComponentAttribute
                 ?.NamedArguments
                 .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
index db0912087a..916bc60653 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                 return false;
             }
 
-            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+            var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
 
             if (attribute != null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
index 0b1221af72..75b4cd62be 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -104,11 +104,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
             {
                 // Will invoke asynchronously. Method must not return Task or Task<T>.
-                if (returnType == _taskSymbol)
+                if (Equals(returnType, _taskSymbol))
                 {
                     // This is ok.
                 }
-                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     // This is ok.
                 }
@@ -128,13 +128,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
                     method = null;
                     return false;
                 }
-                else if (returnType == _taskSymbol)
+                else if (Equals(returnType, _taskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
                     return false;
                 }
-                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
@@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
         private string GetIndexerValueTypeName(IParameterSymbol parameter)
         {
             INamedTypeSymbol dictionaryType;
-            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)parameter.Type;
             }
-            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+                dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
         private string GetShortName(INamedTypeSymbol componentType)
         {
-            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
             var name = viewComponentAttribute
                 ?.NamedArguments
                 .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
index 01eb3fffaa..0281880866 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
                 return false;
             }
 
-            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+            var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
 
             if (attribute != null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
index a5181fd789..aaa765fb63 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -104,11 +104,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
             {
                 // Will invoke asynchronously. Method must not return Task or Task<T>.
-                if (returnType == _taskSymbol)
+                if (Equals(returnType, _taskSymbol))
                 {
                     // This is ok.
                 }
-                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     // This is ok.
                 }
@@ -128,13 +128,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                     method = null;
                     return false;
                 }
-                else if (returnType == _taskSymbol)
+                else if (Equals(returnType, _taskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
                     return false;
                 }
-                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
@@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         private string GetIndexerValueTypeName(IParameterSymbol parameter)
         {
             INamedTypeSymbol dictionaryType;
-            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)parameter.Type;
             }
-            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+                dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         private string GetShortName(INamedTypeSymbol componentType)
         {
-            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
             var name = viewComponentAttribute
                 ?.NamedArguments
                 .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
index 9e1f936060..498b28fdc2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 return false;
             }
 
-            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+            var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
 
             if (attribute != null)
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index d8b0ff8086..e21332c150 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -235,7 +235,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     // We need to check the constructor argument length here, because this can show up as 0
                     // if the language service fails to initialize. This is an invalid case, so skip it.
-                    if (attribute.AttributeClass == bindElement && attribute.ConstructorArguments.Length == 4)
+                    if (Equals(attribute.AttributeClass, bindElement) && attribute.ConstructorArguments.Length == 4)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
@@ -246,7 +246,7 @@ namespace Microsoft.CodeAnalysis.Razor
                             (string)attribute.ConstructorArguments[2].Value,
                             (string)attribute.ConstructorArguments[3].Value));
                     }
-                    else if (attribute.AttributeClass == bindInputElement && attribute.ConstructorArguments.Length == 4)
+                    else if (Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 4)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
@@ -257,7 +257,7 @@ namespace Microsoft.CodeAnalysis.Razor
                             (string)attribute.ConstructorArguments[2].Value,
                             (string)attribute.ConstructorArguments[3].Value));
                     }
-                    else if (attribute.AttributeClass == bindInputElement && attribute.ConstructorArguments.Length == 6)
+                    else if (Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 6)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 29aa54ced0..f160b53a90 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -327,7 +327,7 @@ namespace Microsoft.CodeAnalysis.Razor
             var properties = new Dictionary<string, (IPropertySymbol, PropertyKind)>(StringComparer.Ordinal);
             do
             {
-                if (type == symbols.ComponentBase)
+                if (Equals(type, symbols.ComponentBase))
                 {
                     // The ComponentBase base class doesn't have any [Parameter].
                     // Bail out now to avoid walking through its many members, plus the members
@@ -380,7 +380,7 @@ namespace Microsoft.CodeAnalysis.Razor
                         kind = PropertyKind.Ignored;
                     }
 
-                    if (!property.GetAttributes().Any(a => a.AttributeClass == symbols.ParameterAttribute))
+                    if (!property.GetAttributes().Any(a => Equals(a.AttributeClass, symbols.ParameterAttribute)))
                     {
                         if (property.IsOverride)
                         {
@@ -398,7 +398,7 @@ namespace Microsoft.CodeAnalysis.Razor
                         kind = PropertyKind.Enum;
                     }
 
-                    if (kind == PropertyKind.Default && property.Type == symbols.RenderFragment)
+                    if (kind == PropertyKind.Default && Equals(property.Type, symbols.RenderFragment))
                     {
                         kind = PropertyKind.ChildContent;
                     }
@@ -406,12 +406,12 @@ namespace Microsoft.CodeAnalysis.Razor
                     if (kind == PropertyKind.Default &&
                         property.Type is INamedTypeSymbol namedType &&
                         namedType.IsGenericType &&
-                        namedType.ConstructedFrom == symbols.RenderFragmentOfT)
+                        Equals(namedType.ConstructedFrom, symbols.RenderFragmentOfT))
                     {
                         kind = PropertyKind.ChildContent;
                     }
 
-                    if (kind == PropertyKind.Default && property.Type == symbols.EventCallback)
+                    if (kind == PropertyKind.Default && Equals(property.Type, symbols.EventCallback))
                     {
                         kind = PropertyKind.EventCallback;
                     }
@@ -419,7 +419,7 @@ namespace Microsoft.CodeAnalysis.Razor
                     if (kind == PropertyKind.Default &&
                         property.Type is INamedTypeSymbol namedType2 &&
                         namedType2.IsGenericType &&
-                        namedType2.ConstructedFrom == symbols.EventCallbackOfT)
+                        Equals(namedType2.ConstructedFrom, symbols.EventCallbackOfT))
                     {
                         kind = PropertyKind.EventCallback;
                     }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
index 333003f5b2..17924a0018 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
@@ -80,7 +80,7 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             var targetElementAttributes = type
                 .GetAttributes()
-                .Where(attribute => attribute.AttributeClass == _htmlTargetElementAttributeSymbol);
+                .Where(attribute => Equals(attribute.AttributeClass, _htmlTargetElementAttributeSymbol));
 
             // If there isn't an attribute specifying the tag name derive it from the name
             if (!targetElementAttributes.Any())
@@ -139,7 +139,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
         private void AddAllowedChildren(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
         {
-            var restrictChildrenAttribute = type.GetAttributes().Where(a => a.AttributeClass == _restrictChildrenAttributeSymbol).FirstOrDefault();
+            var restrictChildrenAttribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, _restrictChildrenAttributeSymbol)).FirstOrDefault();
             if (restrictChildrenAttribute == null)
             {
                 return;
@@ -174,7 +174,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private void AddTagOutputHint(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
         {
             string outputElementHint = null;
-            var outputElementHintAttribute = type.GetAttributes().Where(a => a.AttributeClass == _outputElementHintAttributeSymbol).FirstOrDefault();
+            var outputElementHintAttribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, _outputElementHintAttributeSymbol)).FirstOrDefault();
             if (outputElementHintAttribute != null)
             {
                 outputElementHint = (string)(outputElementHintAttribute.ConstructorArguments[0]).Value;
@@ -189,7 +189,7 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             var attributeNameAttribute = property
                 .GetAttributes()
-                .Where(a => a.AttributeClass == _htmlAttributeNameAttributeSymbol)
+                .Where(a => Equals(a.AttributeClass, _htmlAttributeNameAttributeSymbol))
                 .FirstOrDefault();
 
             bool hasExplicitName;
@@ -310,13 +310,13 @@ namespace Microsoft.CodeAnalysis.Razor
         private IReadOnlyList<ITypeSymbol> GetDictionaryArgumentTypes(IPropertySymbol property)
         {
             INamedTypeSymbol dictionaryType;
-            if ((property.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            if (Equals((property.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)property.Type;
             }
-            else if (property.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            else if (property.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = property.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+                dictionaryType = property.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -380,7 +380,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private bool IsPotentialDictionaryProperty(IPropertySymbol property)
         {
             return
-                ((property.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol || property.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol)) &&
+                (Equals((property.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol) || property.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol))) &&
                 GetDictionaryArgumentTypes(property)?[0].SpecialType == SpecialType.System_String;
         }
 
@@ -397,8 +397,8 @@ namespace Microsoft.CodeAnalysis.Razor
                         property.Parameters.Length == 0 &&
                         property.GetMethod != null &&
                         property.GetMethod.DeclaredAccessibility == Accessibility.Public &&
-                        property.GetAttributes().Where(a => a.AttributeClass == _htmlAttributeNotBoundAttributeSymbol).FirstOrDefault() == null &&
-                        (property.GetAttributes().Any(a => a.AttributeClass == _htmlAttributeNameAttributeSymbol) ||
+                        property.GetAttributes().Where(a => Equals(a.AttributeClass, _htmlAttributeNotBoundAttributeSymbol)).FirstOrDefault() == null &&
+                        (property.GetAttributes().Any(a => Equals(a.AttributeClass, _htmlAttributeNameAttributeSymbol)) ||
                         property.SetMethod != null && property.SetMethod.DeclaredAccessibility == Accessibility.Public ||
                         IsPotentialDictionaryProperty(property)) &&
                         !accessibleProperties.ContainsKey(property.Name))
@@ -418,7 +418,7 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             if (ExcludeHidden)
             {
-                var editorBrowsableAttribute = symbol.GetAttributes().Where(a => a.AttributeClass == _editorBrowsableAttributeSymbol).FirstOrDefault();
+                var editorBrowsableAttribute = symbol.GetAttributes().Where(a => Equals(a.AttributeClass, _editorBrowsableAttributeSymbol)).FirstOrDefault();
 
                 if (editorBrowsableAttribute == null)
                 {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index e2c5836a53..52710e8fd7 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -81,7 +81,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 {
                     var attribute = attributes[j];
 
-                    if (attribute.AttributeClass == eventHandlerAttribute)
+                    if (Equals(attribute.AttributeClass, eventHandlerAttribute))
                     {
                         results.Add(new EventHandlerData(
                             type.ContainingAssembly.Name,

From ccf56256d928ed20358f1bd36928a5f5bde76163 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 30 Jul 2019 12:10:13 -0700
Subject: [PATCH 225/337] Add support for non-numeric CSharpLanguageVersions.

- We would default to improper C# language versions when given non-numeric `LangVersion`s. For instance when given `CSharpLanguageVersion.Latest` we'd default to 7.3 which was inconsistent with how the rest of the C# world functioned.
- Added a test.

aspnet/AspNetCoredotnet/aspnetcore-tooling#11139
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a08d0b067336f5c03fe226cdd7d119d5970535a7
---
 .../RazorProjectEngineBuilderExtensions.cs    |  7 +++--
 ...RazorProjectEngineBuilderExtensionsTest.cs | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/test/RazorProjectEngineBuilderExtensionsTest.cs

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
index 642110102d..6e57ab1016 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
@@ -32,12 +32,15 @@ namespace Microsoft.CodeAnalysis.Razor
                 builder.Features.Remove(existingFeature);
             }
 
-            builder.Features.Add(new ConfigureParserForCSharpVersionFeature(csharpLanguageVersion));
+            // This will convert any "latest", "default" or "LatestMajor" LanguageVersions into their numerical equivalent.
+            var effectiveCSharpLanguageVersion = LanguageVersionFacts.MapSpecifiedToEffectiveVersion(csharpLanguageVersion);
+            builder.Features.Add(new ConfigureParserForCSharpVersionFeature(effectiveCSharpLanguageVersion));
 
             return builder;
         }
 
-        private class ConfigureParserForCSharpVersionFeature : IConfigureRazorCodeGenerationOptionsFeature
+        // Internal for testing
+        internal class ConfigureParserForCSharpVersionFeature : IConfigureRazorCodeGenerationOptionsFeature
         {
             public ConfigureParserForCSharpVersionFeature(LanguageVersion csharpLanguageVersion)
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RazorProjectEngineBuilderExtensionsTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RazorProjectEngineBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..fd31ccc33d
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RazorProjectEngineBuilderExtensionsTest.cs
@@ -0,0 +1,31 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+using static Microsoft.CodeAnalysis.Razor.RazorProjectEngineBuilderExtensions;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class RazorProjectEngineBuilderExtensionsTest
+    {
+        [Fact]
+        public void SetCSharpLanguageVersion_ResolvesNonNumericCSharpLangVersions()
+        {
+            // Arrange
+            var csharpLanguageVersion = CSharp.LanguageVersion.Latest;
+
+            // Act
+            var projectEngine = RazorProjectEngine.Create(builder =>
+            {
+                builder.SetCSharpLanguageVersion(csharpLanguageVersion);
+            });
+
+            // Assert
+            var feature = projectEngine.EngineFeatures.OfType<ConfigureParserForCSharpVersionFeature>().FirstOrDefault();
+            Assert.NotNull(feature);
+            Assert.NotEqual(csharpLanguageVersion, feature.CSharpLanguageVersion);
+        }
+    }
+}

From 6ad8b96f3e7cfaae244cc73d72082fdf33a01395 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 1 Aug 2019 13:16:33 -0700
Subject: [PATCH 226/337] Don't fail the build on warnings
 (dotnet/aspnetcore-tooling#922)

* Don't fail the build on warnings

* update

* update
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/450a780f4066cdab76dd22e2410dc10288feecda
---
 .../src/GenerateCommand.cs                    | 19 +++++++++++--------
 .../src/DotnetToolTask.cs                     | 11 +++++++++++
 .../BuildWithComponentsIntegrationTest.cs     | 18 ++++++++++++++++++
 .../RazorGenerateIntegrationTest.cs           |  2 +-
 .../ComponentApp/Components/Pages/Index.razor |  2 +-
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index 637421409d..ba38782ceb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -214,24 +214,27 @@ namespace Microsoft.AspNetCore.Razor.Tools
             foreach (var result in results)
             {
                 var errorCount = result.CSharpDocument.Diagnostics.Count;
-                if (errorCount > 0)
+                for (var i = 0; i < errorCount; i++)
                 {
-                    success = false;
-
-                    for (var i = 0; i < errorCount; i++)
+                    var error = result.CSharpDocument.Diagnostics[i];
+                    if (error.Severity == RazorDiagnosticSeverity.Error)
+                    {
+                        success = false;
+                    }
+
+                    if (i < 100)
                     {
-                        var error = result.CSharpDocument.Diagnostics[i];
                         Error.WriteLine(error.ToString());
 
                         // Only show the first 100 errors to prevent massive string allocations.
                         if (i == 99)
                         {
-                            Error.WriteLine($"And {errorCount - i + 1} more errors.");
-                            break;
+                            Error.WriteLine($"And {errorCount - i + 1} more warnings/errors.");
                         }
                     }
                 }
-                else
+
+                if (success)
                 {
                     // Only output the file if we generated it without errors.
                     var outputFilePath = result.InputItem.OutputPath;
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs
index 79694479a4..9a660fb1bf 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/DotnetToolTask.cs
@@ -165,6 +165,17 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                     {
                         // Server execution succeeded.
                         Log.LogMessage(StandardOutputLoggingImportance, $"Server execution completed with return code {result}.");
+
+                        // There might still be warnings in the error output.
+                        if (LogStandardErrorAsError)
+                        {
+                            LogErrors(completedResponse.ErrorOutput);
+                        }
+                        else
+                        {
+                            LogMessages(completedResponse.ErrorOutput, StandardErrorLoggingImportance);
+                        }
+
                         return true;
                     }
                     else if (result == 2)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 8a5d449cc7..2138f539ac 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -45,6 +45,24 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs");
         }
 
+        [Fact]
+        [InitializeTestProject("ComponentApp")]
+        public async Task Build_Successful_WhenThereAreWarnings()
+        {
+            ReplaceContent("<UnrecognizedComponent />", "Components", "Pages", "Index.razor");
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+
+            Assert.FileExists(result, OutputPath, "ComponentApp.dll");
+            Assert.FileExists(result, OutputPath, "ComponentApp.pdb");
+
+            // Verify component compilation succeeded
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "ComponentApp.dll"), "ComponentApp.Components.Pages.Counter");
+
+            Assert.BuildWarning(result, "RZ10014");
+        }
+
         [Fact]
         [InitializeTestProject("ComponentLibrary")]
         public async Task Build_WithoutRazorLangVersion_ProducesWarning()
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs
index 646c21cc77..e9d436b354 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/RazorGenerateIntegrationTest.cs
@@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildFailed(result);
 
-            Assert.BuildOutputContainsLine(result, "And 101 more errors.");
+            Assert.BuildOutputContainsLine(result, "And 101 more warnings/errors.");
 
             // RazorGenerate should compile the assembly, but not the views.
             Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor
index 16dac31925..73d0d8b8f7 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/Index.razor
@@ -2,4 +2,4 @@
 
 <h1>Hello, world!</h1>
 
-Welcome to your new app.
+Welcome to your new app.
\ No newline at end of file

From 9d594e41c53365358e898ee3574fd81a9fa23dfb Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 2 Aug 2019 11:26:00 -0700
Subject: [PATCH 227/337] Make launchSettings.json a content item that does not
 get copied to build or publish directory

Fixes https://github.com/aspnet/AspNetCore/issues/12841
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/34628d30663dacd90c09f15017f173061cbd1d3e
---
 .../Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props   |  7 +++----
 .../test/IntegrationTests/BuildIntrospectionTest.cs  | 12 ++++++++++++
 .../test/testassets/RazorTest.Introspection.targets  |  4 ++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
index f468e9caa7..0a9aed20e5 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
@@ -23,7 +23,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <DefaultItemExcludes>$(DefaultItemExcludes);**\jspm_packages\**;jspm_packages\**</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\bower_components\**;bower_components\**</DefaultItemExcludes>
     <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);wwwroot\**</DefaultWebContentItemExcludes>
-    <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);**\launchSettings.json</DefaultWebContentItemExcludes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' ">
@@ -32,14 +31,14 @@ Copyright (c) .NET Foundation. All rights reserved.
     <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
     <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
 
-    <!-- Set CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid publishing launchSettings.json -->
-    <Content Update="$(AppDesignerFolder)\**" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>   
+    <!-- Set CopyToOutputDirectory & CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid copying launchSettings.json to the build or publish directory -->
+    <Content Update="$(AppDesignerFolder)\**" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>
 
     <!-- Remove Content items from other item types (in a way that CPS understands) -->
     <None Remove="wwwroot\**;**\*.json;**\*.config" />
     <Compile Remove="wwwroot\**" />
     <EmbeddedResource Remove="wwwroot\**" />
-    
+
     <!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
     <!-- It's important to keep this here so that it works well with the Web SDK -->
     <_ContentIncludedByDefault Include="@(Content)" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index bdc08000c1..87e4fb3d2a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -194,5 +194,17 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildPassed(result);
             Assert.BuildOutputContainsLine(result, "UpToDateReloadFileTypes: ;.cs;.razor;.resx;");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task IntrospectJsonContentFiles()
+        {
+            var result = await DotnetMSBuild("_IntrospectContentItems");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "Content: Properties\\launchSettings.json CopyToOutputDirectory=Never CopyToPublishDirectory=Never ExcludeFromSingleFile=true");
+            Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
+            Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
+        }
     }
 }
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index 516abc8388..c3fca78317 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -42,4 +42,8 @@
   <Target Name="_IntrospectUpToDateReloadFileTypes">
     <Message Text="UpToDateReloadFileTypes: $(UpToDateReloadFileTypes)" Importance="High" />
   </Target>
+
+  <Target Name="_IntrospectContentItems">
+    <Message Text="Content: %(Content.Identity) CopyToOutputDirectory=%(Content.CopyToOutputDirectory) CopyToPublishDirectory=%(Content.CopyToPublishDirectory) ExcludeFromSingleFile=%(Content.ExcludeFromSingleFile)" Importance="High" />
+  </Target>
 </Project>

From e2d476cc6f3cf62dca5523b9a85a049b50aa91f8 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 2 Aug 2019 09:35:57 -0700
Subject: [PATCH 228/337] Associate C# version with each Razor extension
 version.

- Roslyn now default to 8.0 C# so it's no longer specified in a users project file. Because of this restriction we can no longer see the projects `LangVersion` when generating Razor files. Meaning, we can't conditionally generate C# 8.0 aware code because our Razor default is not C# 8.0. Therefore, when we detect that the C# lang version hasn't been provided we don't set a C# version and instead rely on what the default configuration for the Razor project is. In practice this looks like:
  - MVC1.X = C# 7.3
  - MVC2.X = C# 7.3
  - MVC Latest = C# 8.0
- I thought about adding a feature flags variant for `RazorCodeGenerationOptions` but decided not to since C# features are all configurable options that are based on more than just the `RazorLangVersion`.
- Added integration tests to ensure that command line builds with implicit `LangVersion`s result in proper C# nullability handling.

aspnet/AspNetCoredotnet/aspnetcore-tooling#12594
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f039aa935462163dead64ca2d6f9c6d27f4e290b
---
 .../src/RazorExtensions.cs                    |  4 +++
 .../src/RazorExtensions.cs                    |  4 +++
 .../src/RazorExtensions.cs                    |  4 +++
 .../src/GenerateCommand.cs                    | 31 ++++++++---------
 .../RazorProjectEngineBuilderExtensions.cs    |  2 +-
 .../IntegrationTests/BuildIntegrationTest.cs  | 33 ++++++++++++++++++-
 6 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
index f8cf7f5cb4..6fe73b57ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
@@ -38,6 +39,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             builder.Features.Add(new MvcViewDocumentClassifierPass());
 
             builder.Features.Add(new MvcImportProjectFeature());
+
+            // The default C# language version for what this Razor configuration supports.
+            builder.SetCSharpLanguageVersion(LanguageVersion.CSharp7_3);
         }
 
         public static void RegisterViewComponentTagHelpers(RazorProjectEngineBuilder builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
index 0e52eb00d1..afb0e896e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/RazorExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
@@ -44,6 +45,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             builder.Features.Add(new InstrumentationPass());
 
             builder.Features.Add(new MvcImportProjectFeature());
+
+            // The default C# language version for what this Razor configuration supports.
+            builder.SetCSharpLanguageVersion(LanguageVersion.CSharp7_3);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
index 867586db5c..dfaebba007 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/RazorExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
@@ -39,6 +40,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             builder.Features.Add(new MvcViewDocumentClassifierPass());
 
             builder.Features.Add(new MvcImportProjectFeature());
+
+            // The default C# language version for what this Razor configuration supports.
+            builder.SetCSharpLanguageVersion(LanguageVersion.CSharp8);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index ba38782ceb..7ebc74cb73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -176,20 +176,6 @@ namespace Microsoft.AspNetCore.Razor.Tools
             });
 
             var success = true;
-            var csharpLanguageVersion = LanguageVersion.Default;
-            if (CSharpLanguageVersion.HasValue())
-            {
-                var rawLanguageVersion = CSharpLanguageVersion.Value();
-                if (!LanguageVersionFacts.TryParse(CSharpLanguageVersion.Value(), out var parsedLanguageVersion))
-                {
-                    success = false;
-                    Error.WriteLine($"Unknown C# language version {rawLanguageVersion}.");
-                }
-                else
-                {
-                    csharpLanguageVersion = parsedLanguageVersion;
-                }
-            }
 
             var engine = RazorProjectEngine.Create(configuration, compositeFileSystem, b =>
             {
@@ -206,7 +192,22 @@ namespace Microsoft.AspNetCore.Razor.Tools
                     b.SetRootNamespace(RootNamespace.Value());
                 }
 
-                b.SetCSharpLanguageVersion(csharpLanguageVersion);
+                if (CSharpLanguageVersion.HasValue())
+                {
+                    // Only set the C# language version if one was specified, otherwise it defaults to whatever
+                    // value was set in the corresponding RazorConfiguration's extensions.
+
+                    var rawLanguageVersion = CSharpLanguageVersion.Value();
+                    if (LanguageVersionFacts.TryParse(rawLanguageVersion, out var csharpLanguageVersion))
+                    {
+                        b.SetCSharpLanguageVersion(csharpLanguageVersion);
+                    }
+                    else
+                    {
+                        success = false;
+                        Error.WriteLine($"Unknown C# language version {rawLanguageVersion}.");
+                    }
+                }
             });
 
             var results = GenerateCode(engine, sourceItems);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
index 6e57ab1016..e492643723 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RazorProjectEngineBuilderExtensions.cs
@@ -60,7 +60,7 @@ namespace Microsoft.CodeAnalysis.Razor
                     throw new ArgumentNullException(nameof(options));
                 }
 
-                if (options.Configuration.LanguageVersion.Major < 3)
+                if (options.Configuration != null && options.Configuration.LanguageVersion.Major < 3)
                 {
                     // Prior to 3.0 there were no C# version specific controlled features. Suppress nullability enforcement.
                     options.SuppressNullabilityEnforcement = true;
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 839f7da92b..9c9bce24d5 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -641,7 +641,38 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]
-        public async Task Build_CSharp8_NullableEnforcement_WarningsDuringBuild_BuildServer()
+        public async Task Build_ImplicitCSharp8_NullableEnforcement_WarningsDuringBuild_NoBuildServer()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:Nullable=enable",
+                suppressBuildServer: true);
+            var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            Assert.BuildPassed(result, allowWarnings: true);
+            Assert.BuildWarning(result, "CS8618");
+            Assert.FileContainsLine(result, indexFilePath, "#nullable restore");
+            Assert.FileContainsLine(result, indexFilePath, "#nullable disable");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ExplicitCSharp73_NullableEnforcement_Disabled_NoNullableFeature_NoBuildServer()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:LangVersion=7.3",
+                suppressBuildServer: true);
+            var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+
+            Assert.BuildPassed(result, allowWarnings: false);
+            Assert.FileDoesNotContainLine(result, indexFilePath, "#nullable restore");
+            Assert.FileDoesNotContainLine(result, indexFilePath, "#nullable disable");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_ExplicitCSharp8_NullableEnforcement_WarningsDuringBuild_BuildServer()
         {
             var result = await DotnetMSBuild(
                 "Build",

From a202e6cfa61c5b1720b12e63426f78f5e27d2e89 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 3 Aug 2019 16:55:31 -0700
Subject: [PATCH 229/337] Update \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/98d9bda3a2a65f4944be1ef5f202cee6c26e413f

---
 .../src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props        | 4 ++--
 .../test/IntegrationTests/BuildIntrospectionTest.cs           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
index 0a9aed20e5..f54b74ebf4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
@@ -31,8 +31,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
     <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
 
-    <!-- Set CopyToOutputDirectory & CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid copying launchSettings.json to the build or publish directory -->
-    <Content Update="$(AppDesignerFolder)\**" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>
+    <!-- Set CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid publishing launchSettings.json -->
+    <Content Update="$(AppDesignerFolder)\**" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>
 
     <!-- Remove Content items from other item types (in a way that CPS understands) -->
     <None Remove="wwwroot\**;**\*.json;**\*.config" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 87e4fb3d2a..2c86bf957c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -202,7 +202,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("_IntrospectContentItems");
 
             Assert.BuildPassed(result);
-            Assert.BuildOutputContainsLine(result, "Content: Properties\\launchSettings.json CopyToOutputDirectory=Never CopyToPublishDirectory=Never ExcludeFromSingleFile=true");
+            var launchSettingsPath = Path.Combine("Properties", "launchSettings.json");
+            Assert.BuildOutputContainsLine(result, $"Content: {launchSettingsPath} CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=Never ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
         }

From f31e951f5dc493f72f7d2c88019b94393591c564 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 3 Aug 2019 17:29:13 -0700
Subject: [PATCH 230/337] Fixup test \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/5eb86992f4d0d545c8965cf9305ae5231a99605e

---
 .../test/IntegrationTests/PublishIntegrationTest.cs              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index cf5387538e..cebd5de38c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -51,7 +51,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, OutputPath, "SimpleMvc.Views.pdb");
             Assert.FileExists(result, OutputPath, "appsettings.json");
             Assert.FileExists(result, OutputPath, "appsettings.Development.json");
-            Assert.FileDoesNotExist(result, OutputPath, Path.Combine("Properties", "launchSettings.json"));
 
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");

From 7312e7cc3802c198121b553682031e7be23ca28a Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 24 Jul 2019 10:39:49 -0700
Subject: [PATCH 231/337] Move RenderTreeBuilder to another castle

Don't even try to review this xD

This change moves RenderTreeBuilder to the .Rendering namespace and then
updates literally every component baseline.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/aa8624f46ec84a6618752a3f2b29d0912028ab09
---
 .../BasicComponent_DesignTime.codegen.cs      |  2 +-
 .../BasicComponent_DesignTime.mappings.txt    |  6 +-
 .../BasicComponent_Runtime.codegen.cs         |  2 +-
 .../src/Components/CodeGenerationConstants.cs | 27 -------
 .../src/Components/ComponentsApi.cs           |  2 +-
 .../ComponentDocumentClassifierPassTest.cs    |  4 +-
 .../ComponentChildContentIntegrationTest.cs   |  6 +-
 .../ComponentCodeGenerationTestBase.cs        |  4 +-
 .../ComponentDeclarationIntegrationTest.cs    |  4 +-
 .../ComponentGenericTypeIntegrationTest.cs    |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  6 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 +--
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.ir.txt                      | 24 +++----
 .../TestComponent.mappings.txt                | 20 +++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                | 10 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../Counter.codegen.cs                        |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                | 10 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                | 10 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../Regression_597/TestComponent.codegen.cs   |  2 +-
 .../Regression_597/TestComponent.mappings.txt |  4 +-
 .../Regression_609/TestComponent.codegen.cs   |  2 +-
 .../Regression_609/TestComponent.mappings.txt |  6 +-
 .../Regression_772/TestComponent.codegen.cs   |  2 +-
 .../Regression_773/TestComponent.codegen.cs   |  2 +-
 .../Regression_784/TestComponent.codegen.cs   |  2 +-
 .../Regression_784/TestComponent.mappings.txt |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.ir.txt                      | 24 +++----
 .../TestComponent.mappings.txt                | 20 +++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  6 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  8 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.ir.txt                      | 24 +++----
 .../TestComponent.mappings.txt                | 12 ++--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../Counter.codegen.cs                        |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../Regression_597/TestComponent.codegen.cs   |  2 +-
 .../Regression_597/TestComponent.mappings.txt |  2 +-
 .../Regression_609/TestComponent.codegen.cs   |  2 +-
 .../Regression_609/TestComponent.mappings.txt |  2 +-
 .../Regression_772/TestComponent.codegen.cs   |  2 +-
 .../Regression_773/TestComponent.codegen.cs   |  2 +-
 .../Regression_784/TestComponent.codegen.cs   |  2 +-
 .../Regression_784/TestComponent.mappings.txt |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.ir.txt                      | 28 ++++----
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 ...etCore.Components.netstandard2.0.Manual.cs |  2 +-
 ...ft.AspNetCore.Components.netstandard2.0.cs | 70 ++++++++++---------
 623 files changed, 981 insertions(+), 1008 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 787cae57d7..91ff0b78fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -28,7 +28,7 @@ IDisposable __typeHelper = default!;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 1531845869..57bd7e92e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (641:17,0 [11] )
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1239:35,13 [15] )
+Generated Location: (1238:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1436:43,6 [29] )
+Generated Location: (1435:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1688:52,12 [37] )
+Generated Location: (1687:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 8408389b50..6850616bb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -12,7 +12,7 @@ namespace __GeneratedComponent
     public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "class", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
deleted file mode 100644
index 43f0cb1909..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/CodeGenerationConstants.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Components
-{
-    // Constants for method names used in code-generation
-    // Keep these in sync with the actual definitions
-    internal static class CodeGenerationConstants
-    {
-        public static class ComponentBase
-        {
-            public const string FullTypeName = "Microsoft.AspNetCore.Components.ComponentBase";
-            public const string BuildRenderTree = "BuildRenderTree";
-            public const string BuildRenderTreeParameter = "builder";
-        }
-
-        public static class RenderTreeBuilder
-        {
-            public const string FullTypeName = "Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder";
-        }
-
-        public static class InjectDirective
-        {
-            public const string FullTypeName = "Microsoft.AspNetCore.Razor.Components.InjectAttribute";
-        }
-    }
-}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 9a6aad2cf2..01f7584094 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static class RenderTreeBuilder
         {
-            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder";
+            public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder";
 
             public static readonly string OpenElement = nameof(OpenElement);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
index 8c6df48979..25415097f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
@@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             visitor.Visit(irDocument);
 
             // Assert
-            Assert.Equal($"{CodeGenerationConstants.ComponentBase.FullTypeName}", visitor.Class.BaseType);
+            Assert.Equal($"{ComponentsApi.ComponentBase.FullTypeName}", visitor.Class.BaseType);
             Assert.Equal(new[] { "public", }, visitor.Class.Modifiers);
             Assert.Equal("Test", visitor.Class.ClassName);
         }
@@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             visitor.Visit(irDocument);
 
             // Assert
-            Assert.Equal(CodeGenerationConstants.ComponentBase.BuildRenderTree, visitor.Method.MethodName);
+            Assert.Equal(ComponentsApi.ComponentBase.BuildRenderTree, visitor.Method.MethodName);
             Assert.Equal("void", visitor.Method.ReturnType);
             Assert.Equal(new[] { "protected", "override" }, visitor.Method.Modifiers);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
index 3a84f91501..13d5fa9e82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
     {
         private readonly CSharpSyntaxTree RenderChildContentComponent = Parse(@"
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 namespace Test
 {
     public class RenderChildContent : ComponentBase
@@ -30,7 +30,7 @@ namespace Test
 
         private readonly CSharpSyntaxTree RenderChildContentStringComponent = Parse(@"
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 namespace Test
 {
     public class RenderChildContentString : ComponentBase
@@ -51,7 +51,7 @@ namespace Test
 
         private readonly CSharpSyntaxTree RenderMultipleChildContent = Parse(@"
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering
 namespace Test
 {
     public class RenderMultipleChildContent : ComponentBase
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 516b4d7a8b..cbd8737c16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
             // Act
             var generated = CompileToCSharp(@"
-@using Microsoft.AspNetCore.Components.RenderTree;
+@using Microsoft.AspNetCore.Components.Rendering;
 
 @code {
     void RenderChildComponent(RenderTreeBuilder builder)
@@ -83,7 +83,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-@using Microsoft.AspNetCore.Components.RenderTree;
+@using Microsoft.AspNetCore.Components.Rendering;
 
 @{ RenderChildComponent(builder); }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 2748afdd0f..547c5e805f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
@@ -139,7 +139,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
index c81c766cfc..70c936d13f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentGenericTypeIntegrationTest.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
@@ -17,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 namespace Test
 {
     public class GenericContext<TItem> : ComponentBase
@@ -55,7 +51,7 @@ namespace Test
 
         private readonly CSharpSyntaxTree MultipleGenericParameterComponent = Parse(@"
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 namespace Test
 {
     public class MultipleGenericParameter<TItem1, TItem2, TItem3> : ComponentBase
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 59f1c81b71..48460b327e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index 966d8c5d27..1533d19b6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1115:31,19 [33] )
+Generated Location: (1114:31,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 4373ee345a..45baed42fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index b1c23219e4..949d9fdfe9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1113:31,17 [7] )
+Generated Location: (1112:31,17 [7] )
 |OnClick|
 
 Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1314:41,7 [91] )
+Generated Location: (1313:41,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 58d49aabc2..20491997e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index c24ddc28e3..586e4bd5fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1115:31,19 [32] )
+Generated Location: (1114:31,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index aa6e62e133..0b34cc25ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 43e8394eab..3c601ce984 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1113:31,17 [7] )
+Generated Location: (1112:31,17 [7] )
 |OnClick|
 
 Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1314:41,7 [73] )
+Generated Location: (1313:41,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 7be8d7f4e7..cd516198d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index c9ee86a90f..78f4ffa290 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2054:48,7 [50] )
+Generated Location: (2053:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 26ddc3e136..2f1cda84cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -54,7 +54,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         builder.AddAttribute(__seq0, "SomeParam", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 4cfc1f7bc4..966cfbe2d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (966:25,30 [11] )
+Generated Location: (965:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1576:43,7 [65] )
+Generated Location: (1575:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 3fc3e0cd79..caa6b620e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index c50a7bdf76..bcd31ff54f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1878:47,7 [50] )
+Generated Location: (1877:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 0f40d83861..5f16942123 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 0ea94e535a..0d8e6ff314 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1878:47,7 [55] )
+Generated Location: (1877:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 42508c36b2..e43e400e9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index c0725292a5..7e14cd456e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1581:47,7 [50] )
+Generated Location: (1580:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 2965e1fb3e..f829ac0bd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 5767f43ad2..bf8f508161 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (889:25,26 [11] )
+Generated Location: (888:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1557:46,7 [50] )
+Generated Location: (1556:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index ec2368c916..9d39070c60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index bd70fd3db4..4030967002 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1757:48,7 [50] )
+Generated Location: (1756:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index b15d1c4ec2..0ff19e92b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -54,7 +54,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         builder.AddAttribute(__seq0, "SomeParam", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 7fe3bf6930..8e68869760 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (966:25,30 [11] )
+Generated Location: (965:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1396:43,7 [65] )
+Generated Location: (1395:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 42508c36b2..e43e400e9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index be3b89e307..72641274a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1581:47,7 [50] )
+Generated Location: (1580:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 2965e1fb3e..f829ac0bd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index ed07994694..d081d552df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (889:25,26 [11] )
+Generated Location: (888:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1557:46,7 [50] )
+Generated Location: (1556:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 02a15cd5c3..3a2018558e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 02121735c4..e691e6219d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (977:25,26 [11] )
+Generated Location: (976:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1581:47,7 [55] )
+Generated Location: (1580:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 6975f2681e..810ed6f99f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 2c994addb1..a904dd1513 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (976:25,24 [11] )
+Generated Location: (975:25,24 [11] )
 |person.Name|
 
 Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1573:47,1 [37] )
+Generated Location: (1572:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 7b701d4222..38d956a4ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index d576c2a37f..5897b8735f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1089:32,19 [11] )
+Generated Location: (1088:32,19 [11] )
 |ParentValue|
 
 Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1329:40,82 [28] )
+Generated Location: (1328:40,82 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1730:51,7 [55] )
+Generated Location: (1729:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 0fabed7c49..78951333e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index ba792cb574..91589b5010 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (954:25,33 [11] )
+Generated Location: (953:25,33 [11] )
 |CurrentDate|
 
 Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1333:36,7 [77] )
+Generated Location: (1332:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index efdf4713d8..7dd6d0446a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 2035beb92f..dae0b62824 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (954:25,33 [11] )
+Generated Location: (953:25,33 [11] )
 |ParentValue|
 
 Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1299:36,7 [50] )
+Generated Location: (1298:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 5da9024d59..db56c244e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index 0d0eeb7185..c171e52546 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1089:32,19 [11] )
+Generated Location: (1088:32,19 [11] )
 |ParentValue|
 
 Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1333:40,86 [28] )
+Generated Location: (1332:40,86 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1734:51,7 [55] )
+Generated Location: (1733:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index 7a545a3bc3..f4d8db4b4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index e33f95dbe0..0a7d23cc50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (940:25,19 [11] )
+Generated Location: (939:25,19 [11] )
 |ParentValue|
 
 Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1285:36,7 [55] )
+Generated Location: (1284:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 7a545a3bc3..f4d8db4b4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 8567978058..2ac8acfa18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (940:25,19 [11] )
+Generated Location: (939:25,19 [11] )
 |ParentValue|
 
 Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1285:36,7 [55] )
+Generated Location: (1284:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index e6f68d671e..d28f610696 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index b5823cdfeb..448c878b48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (939:25,18 [11] )
+Generated Location: (938:25,18 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1284:36,7 [55] )
+Generated Location: (1283:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 901c74a6ab..c616fe8d74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index d40455e21b..489435051a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (934:25,13 [11] )
+Generated Location: (933:25,13 [11] )
 |ParentValue|
 
 Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1279:36,7 [55] )
+Generated Location: (1278:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 7a3608cc35..0b86f548dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index c85a2945c0..6de25a149d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1105:32,35 [11] )
+Generated Location: (1104:32,35 [11] )
 |ParentValue|
 
 Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1450:43,7 [44] )
+Generated Location: (1449:43,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index 8a72200ebf..148b662999 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index a5a2105035..874ba65d57 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1105:32,35 [11] )
+Generated Location: (1104:32,35 [11] )
 |ParentValue|
 
 Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.CurrentCulture|
-Generated Location: (1365:40,102 [26] )
+Generated Location: (1364:40,102 [26] )
 |CultureInfo.CurrentCulture|
 
 Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1762:51,7 [44] )
+Generated Location: (1761:51,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 6c19b7ef2b..e801a7b243 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index 6f31803213..fd7ee89fb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (845:24,2 [46] )
+Generated Location: (844:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1097:32,55 [26] )
+Generated Location: (1096:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1348:40,87 [2] )
+Generated Location: (1347:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1579:48,21 [6] )
+Generated Location: (1578:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index 157d5a6074..b8cc7871e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index 6f31803213..fd7ee89fb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (845:24,2 [46] )
+Generated Location: (844:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1097:32,55 [26] )
+Generated Location: (1096:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1348:40,87 [2] )
+Generated Location: (1347:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1579:48,21 [6] )
+Generated Location: (1578:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 560d39bb4e..dc2dac17bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index a21573ec5f..e997565427 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (952:25,31 [7] )
+Generated Location: (951:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1285:36,7 [41] )
+Generated Location: (1284:36,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 367c2f9daa..00f5a97b52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 9d63f874e5..8f1f1c6619 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (936:25,15 [11] )
+Generated Location: (935:25,15 [11] )
 |CurrentDate|
 
 Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1315:36,7 [77] )
+Generated Location: (1314:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 6c47ebef71..5fb0a7cd4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 03c9594634..835b635c0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (948:25,27 [11] )
+Generated Location: (947:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1160:33,55 [6] )
+Generated Location: (1159:33,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1516:44,7 [135] )
+Generated Location: (1515:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index fb376ad8e0..7e352b7b7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 105600bcfc..a4b37c2bc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (948:25,27 [11] )
+Generated Location: (947:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1337:36,7 [77] )
+Generated Location: (1336:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 30ba41e5fe..e46b8f8a75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 380b028dea..2fe7d40c8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (948:25,27 [11] )
+Generated Location: (947:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1293:36,7 [50] )
+Generated Location: (1292:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 7d58befd6a..8f8f38a493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 99c40d964b..6dadc5b907 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (950:25,29 [11] )
+Generated Location: (949:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1475:36,7 [77] )
+Generated Location: (1474:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 868907adc5..bbc5650b3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 27e6ee17ea..692901b204 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (950:25,29 [11] )
+Generated Location: (949:25,29 [11] )
 |CurrentDate|
 
 Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1329:36,7 [77] )
+Generated Location: (1328:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 0750ea007d..22dd0004d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 9ddc92381f..719bedbe88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (950:25,29 [11] )
+Generated Location: (949:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1339:36,7 [77] )
+Generated Location: (1338:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index abc363492d..8e70500f8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 25eda5c5b7..8a5130396b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (942:25,21 [11] )
+Generated Location: (941:25,21 [11] )
 |CurrentDate|
 
 Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1321:36,7 [77] )
+Generated Location: (1320:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index abc363492d..8e70500f8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 558adf3a5a..70dbb75c76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (942:25,21 [11] )
+Generated Location: (941:25,21 [11] )
 |CurrentDate|
 
 Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1321:36,7 [77] )
+Generated Location: (1320:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index da80e7da99..c248a459f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index 895df80e01..bab09f9912 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (878:25,15 [11] )
+Generated Location: (877:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1082:35,7 [50] )
+Generated Location: (1081:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index c49adc5c40..5d49497d9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 4f322bbe51..b51bf566b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (936:25,15 [11] )
+Generated Location: (935:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1281:36,7 [50] )
+Generated Location: (1280:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 63d05a0547..3da83553d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index 763a0bf5a1..9d5b691569 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,19 [6] )
+Generated Location: (888:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1169:34,34 [4] )
+Generated Location: (1168:34,34 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index c522eac80a..a098d9e32c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 8465dd3c61..e976cfb03a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,19 [6] )
+Generated Location: (888:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1172:34,37 [5] )
+Generated Location: (1171:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1760:56,7 [21] )
+Generated Location: (1759:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 0cca1fedfa..4f2abfab38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index feb4fb825d..9bbe256d34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,19 [6] )
+Generated Location: (888:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1090:34,37 [5] )
+Generated Location: (1089:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1742:55,7 [21] )
+Generated Location: (1741:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index fe20fde684..454b7d2a9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -61,7 +61,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Value", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 9c4adf3e72..95440a4ee9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (974:25,38 [2] )
+Generated Location: (973:25,38 [2] )
 |18|
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1142:33,24 [5] )
+Generated Location: (1141:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1629:50,7 [21] )
+Generated Location: (1628:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 2a203d9d56..0e6ba77c0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -71,14 +71,14 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
         builder.AddAttribute(__seq1, "ItemChanged", __arg1);
         builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 36ebb9a0c8..8afcca9abf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (960:25,24 [5] )
+Generated Location: (959:25,24 [5] )
 |Value|
 
 Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1416:42,24 [5] )
+Generated Location: (1415:42,24 [5] )
 |Value|
 
 Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1811:60,7 [21] )
+Generated Location: (1810:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index cf13151b38..417b88619b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index a2ec092221..3b1d7bc164 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,19 [6] )
+Generated Location: (888:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1169:34,34 [4] )
+Generated Location: (1168:34,34 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1459:43,8 [17] )
+Generated Location: (1458:43,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index f94dffda60..c8891e6e3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -54,7 +54,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
index ff661d31c0..66b1b155f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (957:25,21 [4] )
+Generated Location: (956:25,21 [4] )
 |"hi"|
 
 Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1139:33,8 [17] )
+Generated Location: (1138:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 3205ac3ee3..bbe3d42ee7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index 5c094cfc39..091fffaf62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,19 [6] )
+Generated Location: (888:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1169:34,34 [4] )
+Generated Location: (1168:34,34 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1381:43,50 [2] )
+Generated Location: (1380:43,50 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 30c9c03637..79cb17807a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -53,7 +53,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
index 381cf0591d..a0f15c9c14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (957:25,21 [4] )
+Generated Location: (956:25,21 [4] )
 |"hi"|
 
 Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1140:33,37 [2] )
+Generated Location: (1139:33,37 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index 93969e4a97..c22f8cbecc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -45,7 +45,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
index 3a30e58316..852bb94b3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (957:25,21 [4] )
+Generated Location: (956:25,21 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 9f86b123f2..021408fb65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -77,19 +77,19 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
         builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
         builder.CloseComponent();
         }
-        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
index f50802d7d1..0a0bec7b18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (957:25,21 [4] )
+Generated Location: (956:25,21 [4] )
 |"hi"|
 
 Source Location: (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |"how are you?"|
-Generated Location: (1363:41,21 [14] )
+Generated Location: (1362:41,21 [14] )
 |"how are you?"|
 
 Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1779:57,21 [6] )
+Generated Location: (1778:57,21 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 72033f5018..9ed07ea5b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index 0b84449cc5..a132a6a8c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        UsingDirective - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -15,14 +15,14 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                CSharpCode - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-                HtmlContent - (91:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (91:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (100:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (100:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
-            Component - (175:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            CSharpCode - (190:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (190:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+                HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                CSharpCode - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
+                HtmlContent - (90:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (90:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
+            Component - (174:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            CSharpCode - (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 575bb38de0..841ddac01f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,29 +1,29 @@
-Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-|using Microsoft.AspNetCore.Components.RenderTree;|
-Generated Location: (320:12,0 [49] )
-|using Microsoft.AspNetCore.Components.RenderTree;|
+Source Location: (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Rendering;|
+Generated Location: (320:12,0 [48] )
+|using Microsoft.AspNetCore.Components.Rendering;|
 
-Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(builder); |
-Generated Location: (1016:31,2 [32] )
+Generated Location: (1014:31,2 [32] )
 | RenderChildComponent(builder); |
 
-Source Location: (100:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
         |
-Generated Location: (1226:40,7 [75] )
+Generated Location: (1224:40,7 [75] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
         |
 
-Source Location: (190:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1733:60,23 [9] )
+Generated Location: (1731:60,23 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 2f799be64c..f5df579563 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index e1ca18d611..8ae3049e0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
         |
-Generated Location: (1016:31,2 [50] )
+Generated Location: (1015:31,2 [50] )
 |
     void RenderChildComponent()
     {
@@ -18,13 +18,13 @@ Source Location: (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1510:51,23 [9] )
+Generated Location: (1509:51,23 [9] )
 |
     }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1641:59,2 [25] )
+Generated Location: (1640:59,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 530e779a3c..1d749a96e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index 9884c9a586..d9a5f6e72d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,20 [6] )
+Generated Location: (889:25,20 [6] )
 |string|
 
 Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1095:34,34 [3] )
+Generated Location: (1094:34,34 [3] )
 |int|
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1384:43,46 [4] )
+Generated Location: (1383:43,46 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1688:52,22 [17] )
+Generated Location: (1687:52,22 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2041:62,6 [29] )
+Generated Location: (2040:62,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index f725066cf2..0c2fade130 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -71,7 +71,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
index 32dfaf89f8..f4478eabf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (957:25,21 [4] )
+Generated Location: (956:25,21 [4] )
 |"hi"|
 
 Source Location: (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |new List<long>()|
-Generated Location: (1139:33,36 [16] )
+Generated Location: (1138:33,36 [16] )
 |new List<long>()|
 
 Source Location: (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1347:41,22 [17] )
+Generated Location: (1346:41,22 [17] )
 |context.ToLower()|
 
 Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (1553:50,6 [29] )
+Generated Location: (1552:50,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index a6b1234125..8494b36875 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -63,7 +63,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
index 0566a1dd01..4f31e4fe0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (957:25,21 [4] )
+Generated Location: (956:25,21 [4] )
 |"hi"|
 
 Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1151:33,20 [17] )
+Generated Location: (1150:33,20 [17] )
 |context.ToLower()|
 
 Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1370:42,16 [7] )
+Generated Location: (1369:42,16 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 95bd74f0af..dde890cc2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 85496c3d10..2f15506ae8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 95bd74f0af..dde890cc2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 95bd74f0af..dde890cc2e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 31e7207d19..36c7b0de76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index e46f680576..4e1f8a4138 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (949:25,23 [9] )
+Generated Location: (948:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1451:45,7 [100] )
+Generated Location: (1450:45,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index ac8992801b..0d0b314ef1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
index 6116afdfe1..744da74245 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1018:25,28 [7] )
+Generated Location: (1017:25,28 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index cd66c6e6f4..0b7949f0b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index ae40146e0b..816bbc1ae0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (983:25,31 [13] )
+Generated Location: (982:25,31 [13] )
 |42.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 3ff474e774..4644861321 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
index 9a2a2ac689..ab0cf79bc6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1067:26,54 [26] )
+Generated Location: (1066:26,54 [26] )
 |context.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index c4365c24d4..50ac169c11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
index c8d6aa2fcc..30fe7a2267 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1042:26,32 [23] )
+Generated Location: (1041:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index c4365c24d4..50ac169c11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
index c8d6aa2fcc..30fe7a2267 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1042:26,32 [23] )
+Generated Location: (1041:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 3b45f1d2e8..83bacb072a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 65359f3fc6..fc4d01e139 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (950:25,24 [21] )
+Generated Location: (949:25,24 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1464:45,7 [87] )
+Generated Location: (1463:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 08cad30ede..19e66f1a19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             __o = 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
index b44c2dd05a..788029e013 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |43.ToString()|
-Generated Location: (941:26,55 [13] )
+Generated Location: (940:26,55 [13] )
 |43.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index d1d7d045aa..560268f131 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -40,7 +40,7 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 70f1e56a74..74fc1e1b5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index b9d100debf..da26341ee3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (968:25,17 [3] )
+Generated Location: (967:25,17 [3] )
 |123|
 
 Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1237:34,18 [4] )
+Generated Location: (1236:34,18 [4] )
 |true|
 
 Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (1531:44,20 [14] )
+Generated Location: (1530:44,20 [14] )
 |new SomeType()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 1fd65b306f..c8e33d4d32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index df73069bc0..ea1039bf53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1006:25,26 [7] )
+Generated Location: (1005:25,26 [7] )
 |OnClick|
 
 Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1509:45,7 [62] )
+Generated Location: (1508:45,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index 14f60ced05..d488f71680 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using AnotherTest;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
index 1b50d9eed5..16c41bfe9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1436:42,13 [7] )
+Generated Location: (1435:42,13 [7] )
 |context|
 
 Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (2209:69,13 [7] )
+Generated Location: (2208:69,13 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index 4b91b6aeec..7e4c43943f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index 186f27b5d2..0ad10bed01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (978:25,27 [11] )
+Generated Location: (977:25,27 [11] )
 |"very-cool"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index acfc5386cf..e49dbc9754 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ global::System.Object TItem2 = null!;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 3e08c07a3c..ca78b976c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -17,20 +17,20 @@ Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
     |
-Generated Location: (1414:50,1 [38] )
+Generated Location: (1413:50,1 [38] )
 |foreach (var item2 in Items2)
 {
     |
 
 Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildContent(item2)|
-Generated Location: (1580:59,6 [19] )
+Generated Location: (1579:59,6 [19] )
 |ChildContent(item2)|
 
 Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1731:66,8 [3] )
+Generated Location: (1730:66,8 [3] )
 |
 }|
 
@@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1913:76,7 [185] )
+Generated Location: (1912:76,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index a23b0786d3..a2e10ffeb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ using Foo = Test3;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index ea87b28a2a..9aca88538e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index 8955bb780d..80f6ce0e68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1318:36,43 [4] )
+Generated Location: (1317:36,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index dbeeb61af4..3446885aa2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index a6c68eaee7..00ee2bedd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (977:25,26 [1] )
+Generated Location: (976:25,26 [1] )
 |1|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1549:44,26 [1] )
+Generated Location: (1548:44,26 [1] )
 |2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index c008d053ab..03daf5c7c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ using System.Reflection;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 5b2c7bf109..999f0c3bd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -42,7 +42,7 @@ global::System.Object __typeHelper = nameof(New.Test);
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 9cf8c3e91c..ec17594d73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 3af4ccff9d..45475919ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (1139:34,1 [18] )
+Generated Location: (1138:34,1 [18] )
 |if (true)
 {
     |
@@ -10,7 +10,7 @@ Generated Location: (1139:34,1 [18] )
 Source Location: (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1317:43,38 [3] )
+Generated Location: (1316:43,38 [3] )
 |
 }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index f47973744c..c313ad5852 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index dd44b8ded4..30cba555f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -39,7 +39,7 @@ using System.Reflection;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 593a4e2311..b9d46dab0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             __o = "";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 3fb619e82b..8d917739f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1109:30,40 [12] )
+Generated Location: (1108:30,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1463:47,7 [49] )
+Generated Location: (1462:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index c0567c3ce5..874c3271e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index 642daabd5a..9666aeab91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1065:29,19 [9] )
+Generated Location: (1064:29,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 4862d5ba18..3dc7bb502f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -35,7 +35,7 @@ global::System.Object __typeHelper = nameof(AnotherTest);
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 0430bdb3a5..02b5be91d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             __o = "";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 8e2f5de343..f38cfcc491 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1278:34,40 [10] )
+Generated Location: (1277:34,40 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
index afee5137ab..59fc9bfd74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
index c97795f34e..97edd3de66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1013:27,19 [10] )
+Generated Location: (1012:27,19 [10] )
 |myInstance|
 
 Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
 |
-Generated Location: (1378:43,7 [81] )
+Generated Location: (1377:43,7 [81] )
 |
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 672c95d6cc..2b89b0e462 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 39cc0a17d0..5aaca7dcaf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1234:33,19 [10] )
+Generated Location: (1233:33,19 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index fee8846024..5f76446c9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index e4d1f8e74e..56e7ead145 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1152:26,51 [14] )
+Generated Location: (1151:26,51 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1683:47,7 [93] )
+Generated Location: (1682:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index bb121866dc..9a20e372f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 247d7e49bf..d7fcdaefc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1154:26,53 [14] )
+Generated Location: (1153:26,53 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1685:47,7 [93] )
+Generated Location: (1684:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 9e861da4c2..3e4fe0bef0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -61,7 +61,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         builder.AddAttribute(__seq0, "Value", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index bb471b72f2..65ebdf23f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (956:25,20 [2] )
+Generated Location: (955:25,20 [2] )
 |18|
 
 Source Location: (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1139:33,39 [14] )
+Generated Location: (1138:33,39 [14] )
 |someAttributes|
 
 Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1497:50,7 [93] )
+Generated Location: (1496:50,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 051bc60e00..734d086f28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 37668646bd..b10d0114a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1153:26,52 [14] )
+Generated Location: (1152:26,52 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1684:47,7 [93] )
+Generated Location: (1683:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 1a8faa662b..9822867259 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -47,7 +47,7 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 3d024374f6..9b337e5ab2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ using Test3;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index f8fd53f14b..cc55ac39bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 637d4a38e4..2fa9526204 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (845:24,2 [40] )
+Generated Location: (844:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1068:33,43 [7] )
+Generated Location: (1067:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index c95ffb4142..cc20229deb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index cf57a5d9eb..0c1de99d68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (845:24,2 [40] )
+Generated Location: (844:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1067:33,42 [7] )
+Generated Location: (1066:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index f0a2c9b5a7..64aea3bdf8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             __o = "";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 229f1becc8..3dc0845f68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 49571edb25..82ce79657e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (975:25,23 [7] )
+Generated Location: (974:25,23 [7] )
 |message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1277:34,48 [7] )
+Generated Location: (1276:34,48 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2348:57,12 [30] )
+Generated Location: (2347:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index fb61adda19..5b75176677 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 74e40ca462..ca012e2038 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1112:25,31 [9] )
+Generated Location: (1111:25,31 [9] )
 |(s) => {}|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1428:34,59 [7] )
+Generated Location: (1427:34,59 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2499:57,12 [30] )
+Generated Location: (2498:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 3ce8d3cd7d..b95c4615ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 32a4443a34..75294b0867 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1062:25,59 [9] )
+Generated Location: (1061:25,59 [9] )
 |(s) => {}|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1347:34,29 [7] )
+Generated Location: (1346:34,29 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2418:57,12 [30] )
+Generated Location: (2417:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 590af79a44..9aadc7cd87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             __o = "";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index f0a2c9b5a7..64aea3bdf8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             __o = "";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 6c94df8c33..ba2d7a710e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index f46f6aa7a5..73ec689245 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (961:25,40 [4] )
+Generated Location: (960:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1290:36,12 [35] )
+Generated Location: (1289:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 886b37eeec..e86a875a57 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 8dc8abe4e0..08b8891cf5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1060:25,79 [8] )
+Generated Location: (1059:25,79 [8] )
 |() => {}|
 
 Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1319:34,35 [4] )
+Generated Location: (1318:34,35 [4] )
 |text|
 
 Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1648:45,12 [35] )
+Generated Location: (1647:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 6c94df8c33..ba2d7a710e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index f46f6aa7a5..73ec689245 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (961:25,40 [4] )
+Generated Location: (960:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1290:36,12 [35] )
+Generated Location: (1289:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 5e34b28ba8..2e83debf77 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index b9ca5dff5e..9bcf8f3bac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1012:25,32 [8] )
+Generated Location: (1011:25,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index be1bfc1e2a..6575ae18b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.SetKey(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index aec8dcc55e..dfe8518ea3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (909:25,37 [10] )
+Generated Location: (908:25,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1113:35,7 [49] )
+Generated Location: (1112:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 778c8ab8c9..e586d5dc74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 4849808db0..eba4da55cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (900:25,37 [3] )
+Generated Location: (899:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (1118:34,49 [10] )
+Generated Location: (1117:34,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1322:44,7 [109] )
+Generated Location: (1321:44,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index ca056d5b10..b5ef29cad8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index a8551246fb..b979f4bec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (899:26,7 [49] )
+Generated Location: (898:26,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index fae58f00ac..d6984c4cca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 2eb6a03840..40762af3ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1114:29,37 [6] )
+Generated Location: (1113:29,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 9d01631d68..898891eba6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 89ac6be30d..30ffe3483c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (1136:30,37 [3] )
+Generated Location: (1135:30,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1325:38,49 [8] )
+Generated Location: (1324:38,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1572:47,7 [56] )
+Generated Location: (1571:47,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 4d2be5537a..4a47e227b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index a4e15f2c64..61d9afb4aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (855:24,12 [6] )
+Generated Location: (854:24,12 [6] )
 |myElem|
 
 Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1100:33,7 [78] )
+Generated Location: (1099:33,7 [78] )
 |
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 0fadab0d3d..92801f90c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 916ca31485..699da77b3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1122:25,44 [14] )
+Generated Location: (1121:25,44 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1331:35,7 [93] )
+Generated Location: (1330:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 79057687db..29ecb11ac4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 2715ebcd75..b52c63a35a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (899:26,7 [93] )
+Generated Location: (898:26,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 33632e8561..e62c265c8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 0e312eb28d..ef011d8d30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1124:25,46 [14] )
+Generated Location: (1123:25,46 [14] )
 |someAttributes|
 
 Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1333:35,7 [93] )
+Generated Location: (1332:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 7f7a3b82be..0fe2ec1669 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index caa3b425c7..1ffb2d7a1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1123:25,45 [14] )
+Generated Location: (1122:25,45 [14] )
 |someAttributes|
 
 Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1332:35,7 [93] )
+Generated Location: (1331:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 84cb4af19a..6d3df11ae0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 2f702990f3..edf202f444 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
-Generated Location: (1175:25,24 [63] )
+Generated Location: (1174:25,24 [63] )
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
 
 Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1732:45,7 [87] )
+Generated Location: (1731:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index ccc0a77635..ba3c0df771 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index dbcd4f4d73..664023c96d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1174:25,23 [9] )
+Generated Location: (1173:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1677:45,7 [87] )
+Generated Location: (1676:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 0bc8b52d90..3f30798d58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index b0be975756..3f47a85041 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1174:25,23 [9] )
+Generated Location: (1173:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1677:45,7 [105] )
+Generated Location: (1676:45,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 50185a60ac..c2260f5a91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index e8804b37c9..f60cc20e9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1174:25,23 [9] )
+Generated Location: (1173:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1677:45,7 [141] )
+Generated Location: (1676:45,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index ce6a05af80..80c94c1a7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index f12883b5f2..3b5e7dfb65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1174:25,23 [9] )
+Generated Location: (1173:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1677:45,7 [123] )
+Generated Location: (1676:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index dd7544d84c..668cf7aacd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 78bdc265be..d7a5086f12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1174:25,23 [9] )
+Generated Location: (1173:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1677:45,7 [106] )
+Generated Location: (1676:45,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index ea43a1106e..15a6dd7dd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 6c4d5e5049..9efcd4e8a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1075:25,24 [45] )
+Generated Location: (1074:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1614:45,7 [87] )
+Generated Location: (1613:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index b4540238f9..76d5e4cdb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index d604b3f575..452bdef052 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1074:25,23 [9] )
+Generated Location: (1073:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1577:45,7 [87] )
+Generated Location: (1576:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 5284b005d2..86a1be0e8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index a98a8fb81d..e0a8638ef0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1074:25,23 [9] )
+Generated Location: (1073:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1577:45,7 [95] )
+Generated Location: (1576:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index aefefab09d..945da89171 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 7dbd683cbf..a6ba5e325c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1074:25,23 [9] )
+Generated Location: (1073:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1577:45,7 [123] )
+Generated Location: (1576:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index 60aa6bcc30..debc6e6d9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 9d66274740..9cd43d6257 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1074:25,23 [9] )
+Generated Location: (1073:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1577:45,7 [131] )
+Generated Location: (1576:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 356f4e9ce0..c8554c06ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 090024800d..92b4a9dea0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (899:26,7 [49] )
+Generated Location: (898:26,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index a42a603e25..7cbacfd354 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 7cf5ff3937..2da3e9977e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (996:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1198:35,7 [44] )
+Generated Location: (1197:35,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 12d154ab22..f47157320b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index e1f412da5c..f9f1878532 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (996:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1198:35,7 [49] )
+Generated Location: (1197:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 5b6f9c5dc4..0e89232916 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 2163c8d618..76f1046de7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (997:25,17 [8] )
+Generated Location: (996:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 12d154ab22..f47157320b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index e1f412da5c..f9f1878532 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (996:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1198:35,7 [49] )
+Generated Location: (1197:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 5b6f9c5dc4..0e89232916 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
index 2163c8d618..76f1046de7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (997:25,17 [8] )
+Generated Location: (996:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 1ba6d3e13b..74f406d1d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index b914ee847f..be2fc21ceb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (997:25,17 [7] )
+Generated Location: (996:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1198:35,7 [31] )
+Generated Location: (1197:35,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index f221cfb12b..0694f9ab45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index 13719679ea..cf404ce9f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (997:25,17 [9] )
+Generated Location: (996:25,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index cbb6a639d0..35b55407f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Test.Shared;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -68,7 +68,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index cda9595eaa..3267e1f7a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1095:32,19 [1] )
+Generated Location: (1094:32,19 [1] )
 |3|
 
 Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Hello|
-Generated Location: (1266:40,28 [5] )
+Generated Location: (1265:40,28 [5] )
 |Hello|
 
 Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1615:57,7 [38] )
+Generated Location: (1614:57,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 9642f23e5a..2e6fc46cd6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index f28dedb313..0ad84ada11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (889:25,19 [3] )
+Generated Location: (888:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1158:34,29 [1] )
+Generated Location: (1157:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1486:45,38 [3] )
+Generated Location: (1485:45,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +18,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1851:61,7 [72] )
+Generated Location: (1850:61,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
index 57a7412182..e875e1ec85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -63,7 +63,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 32c59dadb5..967253cab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (955:25,19 [1] )
+Generated Location: (954:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1140:33,28 [3] )
+Generated Location: (1139:33,28 [3] )
 |_my|
 
 Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1513:51,7 [90] )
+Generated Location: (1512:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index 72f0ca2eae..0b2318995b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -54,7 +54,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
index 0e36b99ea5..4e35880801 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (967:25,26 [4] )
+Generated Location: (966:25,26 [4] )
 |"hi"|
 
 Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1149:33,8 [17] )
+Generated Location: (1148:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index a3fec8cb12..8fb8b4ff6a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = typeof(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 1caa18ce0f..05288725a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (889:25,19 [3] )
+Generated Location: (888:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1158:34,29 [1] )
+Generated Location: (1157:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1515:46,38 [8] )
+Generated Location: (1514:46,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1867:63,7 [47] )
+Generated Location: (1866:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 985e2af1d1..025cd7b4e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
 #nullable restore
@@ -61,7 +61,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index c31c87878b..4f78550549 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (955:25,19 [1] )
+Generated Location: (954:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1126:33,28 [8] )
+Generated Location: (1125:33,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1478:50,7 [47] )
+Generated Location: (1477:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 91d5340a46..7257a0f006 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index dc4c5e5a34..0189feb978 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (849:24,6 [10] )
+Generated Location: (848:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index e615ebc867..4a0472cf98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 1ac95b1f15..d9d6bfb99a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 71419654ac..60cc65d78b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index a63eaeb68e..4ca7a1cdcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (845:24,2 [40] )
+Generated Location: (844:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1011:32,6 [7] )
+Generated Location: (1010:32,6 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 6bd9ddc974..19cc40abc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
index 3b252ca248..1af0850412 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1115:28,14 [6] )
+Generated Location: (1114:28,14 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index 4ce415e028..dd2b63f012 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 910cfdbd4f..f06cba0e8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (845:24,2 [54] )
+Generated Location: (844:24,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Index|
-Generated Location: (1113:32,63 [13] )
+Generated Location: (1112:32,63 [13] )
 |context.Index|
 
 Source Location: (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Item.ToLower()|
-Generated Location: (1329:39,80 [22] )
+Generated Location: (1328:39,80 [22] )
 |context.Item.ToLower()|
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1596:47,107 [2] )
+Generated Location: (1595:47,107 [2] )
 |; |
 
 Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1829:55,24 [8] )
+Generated Location: (1828:55,24 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 247e970014..7933128082 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index fc3995173f..eb34a7ef37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (845:24,2 [45] )
+Generated Location: (844:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1223:34,69 [11] )
+Generated Location: (1222:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1792:53,89 [3] )
+Generated Location: (1791:53,89 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1971:62,7 [76] )
+Generated Location: (1970:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index a0d37e8491..1654ca840f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 337ee8fc34..40d02b867f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (845:24,2 [45] )
+Generated Location: (844:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1223:34,69 [11] )
+Generated Location: (1222:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1792:53,89 [3] )
+Generated Location: (1791:53,89 [3] )
 |;
 |
 
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2040:61,6 [15] )
+Generated Location: (2039:61,6 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +29,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2414:79,7 [76] )
+Generated Location: (2413:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 9a8b133ba5..99b59b0bc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index da4eedb4bf..bd5969c2c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (845:24,2 [47] )
+Generated Location: (844:24,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1099:32,56 [11] )
+Generated Location: (1098:32,56 [11] )
 |person.Name|
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1321:40,73 [2] )
+Generated Location: (1320:40,73 [2] )
 |; |
 
 Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1559:48,30 [8] )
+Generated Location: (1558:48,30 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 2c505c51ef..04251fe231 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 742d6a7d5f..ecb23ac7da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (849:24,6 [25] )
+Generated Location: (848:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (994:27,33 [11] )
+Generated Location: (993:27,33 [11] )
 |person.Name|
 
 Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1061:33,0 [1] )
+Generated Location: (1060:33,0 [1] )
 |)|
 
 Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1241:42,7 [138] )
+Generated Location: (1240:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index be1ed28b64..f7cccb3817 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index 4c6398ca2c..7d281e987e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (845:24,2 [45] )
+Generated Location: (844:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1091:33,50 [11] )
+Generated Location: (1090:33,50 [11] )
 |person.Name|
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1307:41,67 [3] )
+Generated Location: (1306:41,67 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1486:50,7 [76] )
+Generated Location: (1485:50,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 68892861e8..0839dfd109 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 59b3af43f3..d112e12c33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (849:24,6 [25] )
+Generated Location: (848:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (995:27,34 [11] )
+Generated Location: (994:27,34 [11] )
 |person.Name|
 
 Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1062:33,0 [1] )
+Generated Location: (1061:33,0 [1] )
 |)|
 
 Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1242:42,7 [138] )
+Generated Location: (1241:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 87c5192c29..7918f9a68a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 94a572fa6d..8f166291bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (845:24,2 [27] )
+Generated Location: (844:24,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1083:33,45 [2] )
+Generated Location: (1082:33,45 [2] )
 |; |
 
 Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1249:41,22 [8] )
+Generated Location: (1248:41,22 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 313c8e7a96..548bffc3e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 6086dc709f..a6ae1646f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson(|
-Generated Location: (849:24,6 [13] )
+Generated Location: (848:24,6 [13] )
 |RenderPerson(|
 
 Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (882:26,0 [1] )
+Generated Location: (881:26,0 [1] )
 |)|
 
 Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1062:35,7 [54] )
+Generated Location: (1061:35,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 0a7f8d0d66..fe5a170c8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index cb5a1e93b0..1c1fbfb856 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (881:25,18 [1] )
+Generated Location: (880:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1515:46,7 [24] )
+Generated Location: (1514:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 757cd16153..922fb53d73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 0ad4e0ae79..b12bc957cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (882:25,19 [8] )
+Generated Location: (881:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1252:35,46 [12] )
+Generated Location: (1251:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1916:56,7 [88] )
+Generated Location: (1915:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index b0d6ccba88..bab0c1c0ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ global::System.Object __typeHelper = "/";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index b0d6ccba88..bab0c1c0ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ global::System.Object __typeHelper = "/";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = "";
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 71d5915f96..42bef13ef3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index d0728f1374..e362010a8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (997:25,17 [16] )
+Generated Location: (996:25,17 [16] )
 |OnComponentHover|
 
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1226:34,55 [13] )
+Generated Location: (1225:34,55 [13] )
 |ParentBgColor|
 
 Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -16,7 +16,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1432:44,7 [132] )
+Generated Location: (1431:44,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index d8c711fa0e..ea9914ac6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index b0e58ecabe..f6ed19837c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -9,7 +9,7 @@ Source Location: (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
     if (builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
-Generated Location: (1016:31,2 [136] )
+Generated Location: (1015:31,2 [136] )
 |
     var output = string.Empty;
     if (builder == null) output = "Builder is null!";
@@ -18,13 +18,13 @@ Generated Location: (1016:31,2 [136] )
 
 Source Location: (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1290:42,16 [6] )
+Generated Location: (1289:42,16 [6] )
 |output|
 
 Source Location: (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1387:47,38 [2] )
+Generated Location: (1386:47,38 [2] )
 |
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index 61eb15d81e..ed37182928 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 
 #line default
 #line hidden
@@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index 48f398102f..d45e66c9e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        UsingDirective - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -15,14 +15,14 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
-            MarkupElement - (278:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                HtmlContent - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                CSharpExpression - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-            CSharpCode - (300:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (300:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+                HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
+            MarkupElement - (277:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            CSharpCode - (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index dfffce2a60..c5b6635948 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-|using Microsoft.AspNetCore.Components.RenderTree;|
-Generated Location: (320:12,0 [49] )
-|using Microsoft.AspNetCore.Components.RenderTree;|
+Source Location: (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Rendering;|
+Generated Location: (320:12,0 [48] )
+|using Microsoft.AspNetCore.Components.Rendering;|
 
-Source Location: (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
@@ -11,7 +11,7 @@ Source Location: (61:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
         if (builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
-Generated Location: (1070:33,7 [217] )
+Generated Location: (1068:33,7 [217] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
@@ -20,16 +20,16 @@ Generated Location: (1070:33,7 [217] )
         else output = "Builder is not null!";
         |
 
-Source Location: (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1429:46,20 [6] )
+Generated Location: (1427:46,20 [6] )
 |output|
 
-Source Location: (300:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1588:53,30 [9] )
+Generated Location: (1586:53,30 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 7eb9586b8c..1e00f4d61b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index cd5ffda867..02bfc33179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (849:24,6 [10] )
+Generated Location: (848:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 55f75cc3ba..25d0d98bde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index bbef863d74..e5449ebf15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ global::System.Object __typeHelper = "/my/url";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index 3efad2f87c..557b105ff2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 00fe07e182..0fd95f0805 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 084be46be7..e43d3b2722 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (875:25,12 [3] )
+Generated Location: (874:25,12 [3] )
 |Foo|
 
 Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1075:35,11 [29] )
+Generated Location: (1074:35,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 1f5cb7a3ea..63a7e59529 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 0de58c905e..2c796d844e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 8072d716d9..81e01c5c95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1159:36,7 [91] )
+Generated Location: (1158:36,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 4b4b4ac178..714d26a99b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 344c8f5874..fbca736edf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 5b0eda19dc..1abd6d601a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1159:36,7 [73] )
+Generated Location: (1158:36,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 81f4d69b4c..624d744229 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index fc5e357718..0b701bd0b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1670:32,7 [50] )
+Generated Location: (1669:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 61dc14c2b6..3e69e7d838 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -39,7 +39,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         builder.AddAttribute(__seq0, "SomeParam", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 79181205e9..9eff84309e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1140:28,7 [65] )
+Generated Location: (1139:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 10cded108c..3337fd6840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index f90e041fcc..87947287ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1456:31,7 [50] )
+Generated Location: (1455:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 7e9335216d..12173260d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 6815fdc1b0..623b666988 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1456:31,7 [55] )
+Generated Location: (1455:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 00ed1db372..a3f4c64b04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index c378941533..370629cb01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1156:31,7 [50] )
+Generated Location: (1155:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 12ec533645..182f96b4cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 3ed64249a6..827621ac59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1146:31,7 [50] )
+Generated Location: (1145:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 4c29fc5fa5..ead838916c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 6e7e51adb5..a51b590bb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1373:32,7 [50] )
+Generated Location: (1372:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 61eae6dcb7..34f737a25e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -39,7 +39,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         builder.AddAttribute(__seq0, "SomeParam", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index cec364512e..f46cf01c7d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (960:28,7 [65] )
+Generated Location: (959:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 9d4e98bdff..7ad7ca5ea4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index e1f3a17681..15b74739f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1159:31,7 [50] )
+Generated Location: (1158:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index bffae94555..2cc5379d95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 3a47f75e95..c46a1967f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1149:31,7 [50] )
+Generated Location: (1148:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 863b125370..c1011b1ec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 99c800565f..c26eb42c93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1159:31,7 [55] )
+Generated Location: (1158:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index a721b599bc..575cb3ee40 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.InputText>(0);
             builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 30a0d92d87..45ac186461 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1151:31,1 [37] )
+Generated Location: (1150:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 5c0f7b5dbf..f89ca228a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index 0ae6d682de..dca670f691 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1657:47,7 [55] )
+Generated Location: (1656:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 314f55c979..cde27e3d16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index ee965939db..ea1bdca38c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1316:33,7 [77] )
+Generated Location: (1315:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index b7f05827ff..faad5a8244 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index 3cee188eb5..af8be57d50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1282:33,7 [50] )
+Generated Location: (1281:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 48798a9288..9c9f43ca31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index ce1c5f8cec..ee5480943c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1669:47,7 [55] )
+Generated Location: (1668:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index a6de7a709f..b547318fcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index debebff11c..998a4c4e29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1220:32,7 [55] )
+Generated Location: (1219:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 874f08d2ee..824990c458 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 5b741c6426..e0417b909d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1215:32,7 [55] )
+Generated Location: (1214:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 8e7a78eb29..1aa6d6d017 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 1eb0a4f991..d4cec7e3a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1214:32,7 [55] )
+Generated Location: (1213:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 390b574043..b68575bac6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 0f5493b2a7..2823213ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1209:32,7 [55] )
+Generated Location: (1208:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 41c4f2e520..cd3f173022 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 8d19e052ca..17a3e9f287 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1439:40,7 [44] )
+Generated Location: (1438:40,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index b4745f7211..fff8f8569c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 3094c773cc..867bc3dfa7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1751:48,7 [44] )
+Generated Location: (1750:48,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index dd6890516e..b938657cc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index fb0a544c0a..fc78d36290 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (577:17,2 [46] )
+Generated Location: (576:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1231:37,87 [2] )
+Generated Location: (1230:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index 2604723d81..580facf895 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index fb0a544c0a..fc78d36290 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (577:17,2 [46] )
+Generated Location: (576:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1231:37,87 [2] )
+Generated Location: (1230:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index ee4231f50b..4416e8486f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "checkbox");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 397e6750f1..c919777781 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1276:33,7 [41] )
+Generated Location: (1275:33,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index aaeb135357..3ea8d35b89 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 16b74f27d1..4ae8ae0f75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1243:32,7 [77] )
+Generated Location: (1242:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 05fc434814..2ad8aa2b6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 6d2a90b9c7..425e9c0639 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1499:41,7 [135] )
+Generated Location: (1498:41,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 0d4e1fd6d6..4eba9b6a98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 728b8180f5..7f7bde0125 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:33,7 [77] )
+Generated Location: (1319:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 9952d73bb9..3e5fb084c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 5216986795..b493665583 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1276:33,7 [50] )
+Generated Location: (1275:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 1bcb3a808a..13811c1c52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 3fe7e697fd..5fb5c6410a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1460:33,7 [77] )
+Generated Location: (1459:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 08f7c99e5d..b126862f4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index e656525567..3f8a031b86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1314:33,7 [77] )
+Generated Location: (1313:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index de5b8b51d7..0b682bbc99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "custom");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 3b8f293663..3f45805a95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1324:33,7 [77] )
+Generated Location: (1323:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 7a8d4322bf..11b43e8b7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index b08a7f99cd..8262dada44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1250:32,7 [77] )
+Generated Location: (1249:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 9742e374d9..36489921a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 6797df6025..ed5224913c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1249:32,7 [77] )
+Generated Location: (1248:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index af29d947d6..3cd1b8fa5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "@BIND", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index 60cf603474..cdca10e0aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (925:30,7 [50] )
+Generated Location: (924:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 96c6ab0900..57cf38a0ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 3032b1eb1d..d491a90fa6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1210:32,7 [50] )
+Generated Location: (1209:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 0ff927149d..d6e4b6d047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index 40d2272b0e..cacdfe4602 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 2e1333db3e..c3a236edfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1152:31,7 [21] )
+Generated Location: (1151:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 0d4e5692b3..b885fc7aa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
             builder.AddAttribute(1, "Item", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index d81b4dbb48..c020306847 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1148:31,7 [21] )
+Generated Location: (1147:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index d15cfa279d..55408ce9b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -47,7 +47,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Value", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 0b9a55a01b..a2d0a471c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1207:36,7 [21] )
+Generated Location: (1206:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 4d7cd36cb0..173c75be66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -49,14 +49,14 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
         builder.AddAttribute(__seq1, "ItemChanged", __arg1);
         builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 6720849716..11795ad1ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1259:38,7 [21] )
+Generated Location: (1258:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index b048b23c8f..3a9c523b78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index e11b4bd0a6..ab1a2755ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -46,7 +46,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 3a997e8c8e..668743949f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 46fef63e3f..3421feb160 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -39,7 +39,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index 8f0e763387..33b8c8a461 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -31,7 +31,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 6625dadf7e..5d4b914038 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -51,19 +51,19 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
         builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
         builder.CloseComponent();
         }
-        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 9f321806cb..05f9000036 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 
 #line default
 #line hidden
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index cd3363e1c3..730322b12c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -5,17 +5,17 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-            CSharpCode - (100:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (100:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
-            HtmlContent - (167:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (167:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            Component - (175:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            HtmlContent - (190:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (190:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (192:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (192:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+                CSharpCode - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
+            CSharpCode - (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
+            HtmlContent - (166:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (166:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            Component - (174:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            HtmlContent - (189:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (189:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 071ed039db..c457b39dd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
-Source Location: (56:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(builder); |
-Generated Location: (748:24,2 [32] )
+Generated Location: (746:24,2 [32] )
 | RenderChildComponent(builder); |
 
-Source Location: (100:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
 |
-Generated Location: (958:33,7 [67] )
+Generated Location: (956:33,7 [67] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
 |
 
-Source Location: (192:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1323:46,0 [7] )
+Generated Location: (1321:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index a501aabc85..a23256cd9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 235685d4ca..673b59efca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
 |
-Generated Location: (748:24,2 [42] )
+Generated Location: (747:24,2 [42] )
 |
     void RenderChildComponent()
     {
@@ -12,12 +12,12 @@ Generated Location: (748:24,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1104:37,0 [7] )
+Generated Location: (1103:37,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1283:45,2 [25] )
+Generated Location: (1282:45,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index ddec9dae70..534f3ca22e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<string, int>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 160feb2a42..2057f60c7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -65,7 +65,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 3bd44ddf68..1ba5e8d36d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -53,7 +53,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 986515ef4b..619d8419d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index c93023dfb5..9ca0e0a2d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "MyAttr", "abc");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 9a273139bf..c6ace8a522 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 6ab934793c..1d97321d8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 9b74c92242..0bbf494f9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 4bba6c881d..76ec234ef7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1010:30,7 [100] )
+Generated Location: (1009:30,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 82d4245939..45fe822b8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 1074b92bc1..aff3398c54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index a0156a97af..4b9d03f82a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "MyAttr", "abc");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index d53d350fd5..be99b5c73b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "MyAttr", "abc");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index d53d350fd5..be99b5c73b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "MyAttr", "abc");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 44f2ce580f..8889759292 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 560b5d0eea..1083409124 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1023:30,7 [87] )
+Generated Location: (1022:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 62827903dc..4d4582314e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "some-attribute", "foo");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index d6275c0de8..c4faf061b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -13,7 +13,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index fd243d32ac..c06eaf9354 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 9557b72ba1..4305c77939 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.DynamicElement>(0);
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 3af91c4f40..62f56d1db0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1068:30,7 [62] )
+Generated Location: (1067:30,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index 8a9d9d24a7..ed2ed88428 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using AnotherTest;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.HeaderComponent>(0);
             builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index dd0d9ecbd4..ea472db615 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.CoolnessMeter>(0);
             builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 37ca60c4a5..717599cb8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Components;
     public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 0bba3fcf95..1cf07d4355 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (772:26,1 [34] )
+Generated Location: (771:26,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (772:26,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1407:51,0 [3] )
+Generated Location: (1406:51,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1587:60,7 [185] )
+Generated Location: (1586:60,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 3f020b8298..7792e3efb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Foo = Test3;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index c62818846e..013902b5fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 93d897510e..080d7ea58f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index 83ab17e704..b52b53d76e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Reflection;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<New.Test.Counter>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index ce2bfb5570..096dce2752 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -25,7 +25,7 @@ using System.Reflection;
     public class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<New.Test.Counter2>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 0d154170b3..9bb71dfb16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.Counter>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index d3bbf78993..2bf3768cef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (718:20,1 [18] )
+Generated Location: (717:20,1 [18] )
 |if (true)
 {
     |
@@ -11,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (957:30,38 [5] )
+Generated Location: (956:30,38 [5] )
 |
 }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index de7f0a9242..a55f7dd592 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
             builder.AddMarkupContent(1, "<div>\r\n</div>");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index a8cf1dd393..311e2030c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index c1234e0c14..610c09ee43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -32,7 +32,7 @@ using System.Reflection;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.Counter>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 2837ce7538..e95ee6a633 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "ParamBefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 3e3319f444..a2099b51d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (825:21,40 [12] )
+Generated Location: (824:21,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1070:32,7 [49] )
+Generated Location: (1069:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 0acf64696b..78fcef6b4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "SomeProp", "val");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index a3a43cf52d..b9e79c7f49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1030:27,19 [9] )
+Generated Location: (1029:27,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index b612a0c313..9c32aa7891 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.HeaderComponent>(0);
             builder.AddAttribute(1, "Header", "head");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index cd1d0ccc6f..5ed8b29d75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "ParamBefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 2eeb174cef..186756062e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1062:26,40 [10] )
+Generated Location: (1061:26,40 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
index 4eeabde6c1..51d1f14741 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddComponentReferenceCapture(1, (__value) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
index b52149451f..81b0c534d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (719:19,19 [10] )
+Generated Location: (718:19,19 [10] )
 |myInstance|
 
 Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
 |
-Generated Location: (1006:31,7 [81] )
+Generated Location: (1005:31,7 [81] )
 |
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 80988599b0..c5df38f7de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "SomeProp", "val");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 06ea90766e..11b7ff5548 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1267:32,19 [10] )
+Generated Location: (1266:32,19 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index c55b63ba2c..3368139879 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "AttributeBefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index fb8db170df..96cea029fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1297:32,7 [93] )
+Generated Location: (1296:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index a3c987ca7a..298062f40f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "AttributeBefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index c3a83b2c3c..9f732d3398 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1299:32,7 [93] )
+Generated Location: (1298:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index f9fa516a04..a5deeb3169 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -47,7 +47,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         builder.AddAttribute(__seq0, "Value", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index d5113c101d..9dfce2d24d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1076:36,7 [93] )
+Generated Location: (1075:36,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index a5a267f492..85c244ab8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "AttributeBefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index f8b23da222..f6521a1da0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1298:32,7 [93] )
+Generated Location: (1297:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index a9cdccaa49..c573f18e2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ using Test2;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 38abc758cf..040f50d490 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Test3;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 57d254f3f5..606664d038 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index ddace9325b..78a26d69b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (577:17,2 [40] )
+Generated Location: (576:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 2fa1f89e0c..933db52181 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index ddace9325b..78a26d69b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (577:17,2 [40] )
+Generated Location: (576:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index e2c489ad50..cb6518086c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Message", "test");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 042fb34a3b..232e8ea6ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 01ad926b0c..85b891035d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2000:41,12 [30] )
+Generated Location: (1999:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 991bc067e4..27e6c53bdb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index c7b1ab8f77..56535e50e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2158:41,12 [30] )
+Generated Location: (2157:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 27373b967a..0409adfe5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 6a762f2d6a..5720b61120 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2080:41,12 [30] )
+Generated Location: (2079:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 679ce1999a..12f265e9f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Message", "test");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 7732ae8afc..98e1efe495 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Foo", "test");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index d64a264601..46eb6824b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index bbf1259975..43e5f75aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1509:38,12 [35] )
+Generated Location: (1508:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 0d4a171ca1..71a5356b8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index b62a457640..f3a649aab4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 732e0ad437..2fa52d0969 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1843:46,12 [35] )
+Generated Location: (1842:46,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 08d91d2f47..73cdac120d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index bbf1259975..43e5f75aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1509:38,12 [35] )
+Generated Location: (1508:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index ac36be0c36..93ea6ca3c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 525d7ca849..0f8124b91c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n  ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 5a0a955b96..25469b5236 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<NotAComponent></NotAComponent>\r\n<DefinitelyNotAComponent></DefinitelyNotAComponent>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 59d8e89f38..e891b44230 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index 756d4e1960..a14f2215f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (818:21,37 [10] )
+Generated Location: (817:21,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1104:33,7 [49] )
+Generated Location: (1103:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 74604f7ab8..fc8f090857 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 0a09d51e61..1a6054d07f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (988:29,49 [10] )
+Generated Location: (987:29,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -9,7 +9,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1229:40,7 [109] )
+Generated Location: (1228:40,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 3d8a29f719..f2ece3f4a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @KEY=\"someObject\" attributeafter=\"after\">Hello</elem>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 8bdee6f4b2..5b1fb6b01c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (767:20,7 [49] )
+Generated Location: (766:20,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index ff782ad029..d8598d0bde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 826dab548b..2928fdff8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1089:26,37 [6] )
+Generated Location: (1088:26,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index f4407667db..253327bc4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -16,7 +16,7 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "type", "text");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 42d48ed927..9c3fd8e610 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1261:34,49 [8] )
+Generated Location: (1260:34,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1526:46,7 [56] )
+Generated Location: (1525:46,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 13c4866185..90b396b95b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @rEF=\"myElem\" attributeafter=\"after\">Hello</elem>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 5144ce4e61..48c27464dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddElementReferenceCapture(1, (__value) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index 41e1311f24..fad6f59013 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (698:19,12 [6] )
+Generated Location: (697:19,12 [6] )
 |myElem|
 
 Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1006:32,7 [78] )
+Generated Location: (1005:32,7 [78] )
 |
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 795bd7d509..6c3bcb0b12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 3416f74053..408d3e7f39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1321:33,7 [93] )
+Generated Location: (1320:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index d44918f210..825f2bfebb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @ATTributes=\"someAttributes\" attributeafter=\"after\">Hello</elem>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 520861be0a..a2ea5ae837 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (778:20,7 [93] )
+Generated Location: (777:20,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 1630ebcd9a..fe225f1b0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 1a9a53af39..c1e979a475 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1323:33,7 [93] )
+Generated Location: (1322:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 776d5e8050..f26cb231d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attributebefore", "before");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index a99edbdb3d..8648f2ac30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1322:33,7 [93] )
+Generated Location: (1321:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index f0c05b876c..e38e513ef8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 247ee31978..169c928ba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1291:30,7 [87] )
+Generated Location: (1290:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 4e1374dfec..65218e85e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 4f8b5f8af1..ca02602fe9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1236:30,7 [87] )
+Generated Location: (1235:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index b416945200..625a829f09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index eb06169081..e54bde9dba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1236:30,7 [105] )
+Generated Location: (1235:30,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 3b03700ef3..22f737baca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 9ef74f9756..d7ef33c134 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1236:30,7 [141] )
+Generated Location: (1235:30,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index d680a28d55..5213f7450a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 871fb014d8..68ba511dd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1236:30,7 [123] )
+Generated Location: (1235:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 7a971fda4b..fadfeadfcd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index eed5eb1e2f..8ccf81d829 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1236:30,7 [106] )
+Generated Location: (1235:30,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 867d60ce8b..7ab2887299 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 0796bdf12f..1442a9d81c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1173:30,7 [87] )
+Generated Location: (1172:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 9daf801975..affc4e321c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index f182d75310..8d42326f5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1136:30,7 [87] )
+Generated Location: (1135:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 2ad9a6dbc4..8b7a809f7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 30ce0624c1..b03e262de6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1136:30,7 [95] )
+Generated Location: (1135:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 513f1208e2..1b3b0f1cd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index a25dc4e9cf..8d2327ae8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1136:30,7 [123] )
+Generated Location: (1135:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index e920524f4d..c20a11f566 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index ccc84db513..11fa6a5327 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1136:30,7 [131] )
+Generated Location: (1135:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index cdc2a3c824..1d5d156139 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 575595427d..5e878ccf2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<input @onCLICK=\"OnClick\">");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 1ab598aff8..54283ab676 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (705:20,7 [49] )
+Generated Location: (704:20,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 899beb4979..9f00ae5035 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 4e484723a0..e29449cd92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1043:30,7 [44] )
+Generated Location: (1042:30,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 0352718012..da94940dce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index a253687898..4857f742c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1043:30,7 [49] )
+Generated Location: (1042:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index b488b76b7f..2712e85839 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 0352718012..da94940dce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index a253687898..4857f742c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1043:30,7 [49] )
+Generated Location: (1042:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index b488b76b7f..2712e85839 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index dc04883067..d507642ef4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index be2c68512e..f88c0b9fa3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1043:30,7 [31] )
+Generated Location: (1042:30,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 0a29382e20..81eac56708 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "input");
             builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 9264e6e15f..6177aa2275 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<input onclick=\"foo\">");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 24de04b535..b3875ce643 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using Test.Shared;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -54,7 +54,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index c406b6d7c9..04e2e871a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1194:43,7 [38] )
+Generated Location: (1193:43,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 4e4ae44ddb..6d84ef5d37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<int>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index 5544273975..a998fd45fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1037:28,38 [3] )
+Generated Location: (1036:28,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1322:40,7 [72] )
+Generated Location: (1321:40,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
index 96d74f3a1b..482bb78b4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -49,7 +49,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 3a40923263..5b2f2a7e50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (869:26,28 [3] )
+Generated Location: (868:26,28 [3] )
 |_my|
 
 Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1092:37,7 [90] )
+Generated Location: (1091:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index e07d0e5b88..d063fb39a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -46,7 +46,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 697af3cb0f..0d5ad55166 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent<int>>(0);
             builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 42d12f8811..43b4974734 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (998:28,38 [8] )
+Generated Location: (997:28,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1239:39,7 [47] )
+Generated Location: (1238:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index a0e32863ab..b4f149381b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
 #nullable restore
@@ -47,7 +47,7 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
         builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         builder.AddAttribute(__seq0, "Item", __arg0);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 7252938b26..3cdea8b1fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (855:26,28 [8] )
+Generated Location: (854:26,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1057:36,7 [47] )
+Generated Location: (1056:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 36283eb0b4..14a877347f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddContent(0, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 0c11733b20..d09f73e085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.SomeOtherComponent>(0);
             builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 5a33264673..143da42ed4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using System;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello</h1>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 96be7bf80c..dedaf0b24f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index ddace9325b..78a26d69b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (577:17,2 [40] )
+Generated Location: (576:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 64dd2ddfe1..81b1c955a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.MyComponent>(0);
             builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index de3026bce7..c44d0e1b6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 351470bca5..9ac860c6ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (577:17,2 [54] )
+Generated Location: (576:17,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1632:48,107 [2] )
+Generated Location: (1631:48,107 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 0438907df5..106b0e3cb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 753eff64af..d600e1b868 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (577:17,2 [45] )
+Generated Location: (576:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1437:40,89 [3] )
+Generated Location: (1436:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1616:49,7 [76] )
+Generated Location: (1615:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index ebe8744064..be4d738229 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 46fbaa0b9f..1623292d3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (577:17,2 [45] )
+Generated Location: (576:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1437:40,89 [3] )
+Generated Location: (1436:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2172:65,7 [76] )
+Generated Location: (2171:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 6ce4d855b3..a8b3f2986a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index ed1e499e6c..217bf53d43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (577:17,2 [47] )
+Generated Location: (576:17,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1204:37,73 [2] )
+Generated Location: (1203:37,73 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 81bbda4b4b..77202fcb17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddContent(0, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 9cadc6295b..315aff9a3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1366:48,7 [138] )
+Generated Location: (1365:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 0b475731e9..9a35bff8bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index b9fa5a8dcb..f95a024385 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (577:17,2 [45] )
+Generated Location: (576:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1190:38,67 [3] )
+Generated Location: (1189:38,67 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1369:47,7 [76] )
+Generated Location: (1368:47,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 5bbe42cc9d..0f6f57973d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddContent(0, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 0c57ea93b6..fb191596ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1369:48,7 [138] )
+Generated Location: (1368:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 7ccf82557c..b61b330d68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index cfffaf6f9a..12530595ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (577:17,2 [27] )
+Generated Location: (576:17,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (881:27,45 [2] )
+Generated Location: (880:27,45 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 181b7dbe21..125f7e0926 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddContent(0, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index b83bdb1a71..454048faae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1078:38,7 [54] )
+Generated Location: (1077:38,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 65acc680fe..1f39ff61b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.Counter>(0);
             builder.AddAttribute(1, "v", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 529317be43..c5c29b77eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1099:31,7 [24] )
+Generated Location: (1098:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 0faaef0677..8171a8f1e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenComponent<Test.User>(0);
             builder.AddAttribute(1, "Name", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index dc418c4a40..da76161cce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1575:41,7 [88] )
+Generated Location: (1574:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index 978c2884a3..4b66c56e87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
             builder.OpenComponent<Test.SurveyPrompt>(1);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index 1eefc4b10a..b5d11da0a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
             builder.OpenComponent<Test.SurveyPrompt>(1);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 90748b1dbc..d2b2173405 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "p");
             builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 8ae9e341a1..6d61644640 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1335:39,7 [132] )
+Generated Location: (1334:39,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 627bc27ecb..a7c3e6447e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "div");
             builder.AddMarkupContent(1, "\r\n    ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index 344c9db113..0d11282409 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 2abccf9774..01adfec434 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     if (builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
-Generated Location: (748:24,2 [132] )
+Generated Location: (747:24,2 [132] )
 |
     var output = string.Empty;
     if (builder == null) output = "Builder is null!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index 5dd2ab1396..c9ca9cb828 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 
 #line default
 #line hidden
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index ce90835d3a..b6fa718da7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -5,19 +5,19 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
+        UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-            CSharpCode - (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
-            HtmlContent - (270:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (270:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            MarkupElement - (278:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                HtmlContent - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (281:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                CSharpExpression - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (290:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-            HtmlContent - (300:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (300:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (302:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (302:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+            CSharpCode - (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
+            HtmlContent - (269:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (269:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            MarkupElement - (277:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            HtmlContent - (299:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (299:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index e46d850ede..5638b26888 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
@@ -6,7 +6,7 @@ Source Location: (61:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
         if (builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
-Generated Location: (802:26,7 [209] )
+Generated Location: (800:26,7 [209] )
 |
     void RenderChildComponent(RenderTreeBuilder builder)
     {
@@ -15,10 +15,10 @@ Generated Location: (802:26,7 [209] )
         else output = "Builder is not null!";
 |
 
-Source Location: (302:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1529:52,0 [7] )
+Generated Location: (1527:52,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 47b5dea50c..7c3ab26b0d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
             builder.AddContent(1, 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 3e50a1fbe5..80cc186a87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
             builder.OpenComponent<Test.SomeOtherComponent>(1);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 7fb8c60526..694aaaae26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -12,7 +12,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<h1>Hello</h1>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index c37aa71ab4..e13102d420 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.AddMarkupContent(0, "<div class=\"first second\">Hello</div>");
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index d0722b2317..0580f5da63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
         {
             builder.OpenElement(0, "elem");
             builder.AddAttribute(1, "attr", 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index b6d733cce0..bf784c5015 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (916:30,11 [29] )
+Generated Location: (915:30,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
index a2c69a5b9f..a2763ad286 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Components.Routing
         public Microsoft.AspNetCore.Components.RenderFragment AuthorizingContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
         public void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
         public void Dispose() { }
-        protected virtual void Render(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, System.Type handler, System.Collections.Generic.IDictionary<string, object> parameters) { }
+        protected virtual void Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, System.Type handler, System.Collections.Generic.IDictionary<string, object> parameters) { }
         public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 08b46f7e55..d772cf7e2d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Components
     public abstract partial class ComponentBase : Microsoft.AspNetCore.Components.IComponent, Microsoft.AspNetCore.Components.IHandleAfterRender, Microsoft.AspNetCore.Components.IHandleEvent
     {
         public ComponentBase() { }
-        protected virtual void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected virtual void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
         protected System.Threading.Tasks.Task InvokeAsync(System.Action workItem) { throw null; }
         protected System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
         void Microsoft.AspNetCore.Components.IComponent.Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
@@ -445,7 +445,7 @@ namespace Microsoft.AspNetCore.Components
         public Microsoft.AspNetCore.Components.Parameter Current { get { throw null; } }
         public bool MoveNext() { throw null; }
     }
-    public delegate void RenderFragment(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder);
+    public delegate void RenderFragment(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder);
     public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment<T>(T value);
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderHandle
@@ -701,37 +701,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public ArrayRange(T[] array, int count) { throw null; }
         public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<T> Clone() { throw null; }
     }
-    public partial class RenderTreeBuilder
-    {
-        public const string ChildContent = "ChildContent";
-        public void AddAttribute(int sequence, in Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) { }
-        public void AddAttribute(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback value) { }
-        public void AddAttribute(int sequence, string name, System.Action value) { }
-        public void AddAttribute(int sequence, string name, bool value) { }
-        public void AddAttribute(int sequence, string name, System.Func<System.Threading.Tasks.Task> value) { }
-        public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
-        public void AddAttribute(int sequence, string name, object value) { }
-        public void AddAttribute(int sequence, string name, string value) { }
-        public void AddAttribute<T>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<T> value) { }
-        public void AddComponentReferenceCapture(int sequence, System.Action<object> componentReferenceCaptureAction) { }
-        public void AddContent(int sequence, Microsoft.AspNetCore.Components.MarkupString markupContent) { }
-        public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment) { }
-        public void AddContent(int sequence, object textContent) { }
-        public void AddContent(int sequence, string textContent) { }
-        public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
-        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
-        public void AddMarkupContent(int sequence, string markupContent) { }
-        public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
-        public void Clear() { }
-        public void CloseComponent() { }
-        public void CloseElement() { }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetFrames() { throw null; }
-        public void OpenComponent(int sequence, System.Type componentType) { }
-        public void OpenComponent<TComponent>(int sequence) where TComponent : Microsoft.AspNetCore.Components.IComponent { }
-        public void OpenElement(int sequence, string elementName) { }
-        public void SetKey(object value) { }
-        public void SetUpdatesAttributeName(string updatesAttributeName) { }
-    }
+    
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderTreeDiff
     {
@@ -778,6 +748,40 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         Markup = 8,
     }
 }
+namespace Microsoft.AspNetCore.Components.Rendering
+{
+    public partial class RenderTreeBuilder
+    {
+        public const string ChildContent = "ChildContent";
+        public void AddAttribute(int sequence, in Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) { }
+        public void AddAttribute(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback value) { }
+        public void AddAttribute(int sequence, string name, System.Action value) { }
+        public void AddAttribute(int sequence, string name, bool value) { }
+        public void AddAttribute(int sequence, string name, System.Func<System.Threading.Tasks.Task> value) { }
+        public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
+        public void AddAttribute(int sequence, string name, object value) { }
+        public void AddAttribute(int sequence, string name, string value) { }
+        public void AddAttribute<T>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<T> value) { }
+        public void AddComponentReferenceCapture(int sequence, System.Action<object> componentReferenceCaptureAction) { }
+        public void AddContent(int sequence, Microsoft.AspNetCore.Components.MarkupString markupContent) { }
+        public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment) { }
+        public void AddContent(int sequence, object textContent) { }
+        public void AddContent(int sequence, string textContent) { }
+        public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
+        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
+        public void AddMarkupContent(int sequence, string markupContent) { }
+        public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
+        public void Clear() { }
+        public void CloseComponent() { }
+        public void CloseElement() { }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetFrames() { throw null; }
+        public void OpenComponent(int sequence, System.Type componentType) { }
+        public void OpenComponent<TComponent>(int sequence) where TComponent : Microsoft.AspNetCore.Components.IComponent { }
+        public void OpenElement(int sequence, string elementName) { }
+        public void SetKey(object value) { }
+        public void SetUpdatesAttributeName(string updatesAttributeName) { }
+    }
+}
 namespace Microsoft.AspNetCore.Components.Routing
 {
     public partial interface INavigationInterception

From 2699268bc3d052413808ec5613207880e85adc56 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 5 Aug 2019 09:19:26 -0700
Subject: [PATCH 232/337] Prevent StackOverflows when assemblies have recursive
 references (dotnet/aspnetcore-tooling#901)

* Prevent StackOverflows when assemblies have recursive references

https://github.com/aspnet/AspNetCore/issues/12693

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/43776c1864780c87435a8ae85cf2877658238079
---
 .../src/AssemblyItem.cs                       |   2 +-
 .../src/FindAssembliesWithReferencesTo.cs     |   2 +-
 .../src/ReferenceResolver.cs                  | 142 ++++++++----------
 .../test/ReferenceResolverTest.cs             | 103 +++++++++----
 4 files changed, 144 insertions(+), 105 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs
index 1f57029bf0..74b3f43d77 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/AssemblyItem.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
     {
         public string Path { get; set; }
 
-        public bool IsSystemReference { get; set; }
+        public bool IsFrameworkReference { get; set; }
 
         public string AssemblyName { get; set; }
     }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
index c936eb4c9b..00ab6845dc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 referenceItems.Add(new AssemblyItem
                 {
                     AssemblyName = assemblyName,
-                    IsSystemReference = item.GetMetadata("IsSystemReference") == "true",
+                    IsFrameworkReference = item.GetMetadata("IsFrameworkReference") == "true",
                     Path = item.ItemSpec,
                 });
             }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
index 657e9432cf..8a44c9b7d1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 
@@ -15,155 +17,141 @@ namespace Microsoft.AspNetCore.Razor.Tasks
     public class ReferenceResolver
     {
         private readonly HashSet<string> _mvcAssemblies;
-        private readonly Dictionary<string, ClassifiedAssemblyItem> _lookup = new Dictionary<string, ClassifiedAssemblyItem>(StringComparer.Ordinal);
+        private readonly IReadOnlyList<AssemblyItem> _assemblyItems;
+        private readonly Dictionary<AssemblyItem, Classification> _classifications;
 
         public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<AssemblyItem> assemblyItems)
         {
             _mvcAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
+            _assemblyItems = assemblyItems;
+            _classifications = new Dictionary<AssemblyItem, Classification>();
 
+            Lookup = new Dictionary<string, AssemblyItem>(StringComparer.Ordinal);
             foreach (var item in assemblyItems)
             {
-                var classifiedItem = new ClassifiedAssemblyItem(item);
-                _lookup[item.AssemblyName] = classifiedItem;
+                Lookup[item.AssemblyName] = item;
             }
         }
 
+        protected Dictionary<string, AssemblyItem> Lookup { get; }
+
         public IReadOnlyList<string> ResolveAssemblies()
         {
             var applicationParts = new List<string>();
-            foreach (var item in _lookup)
-            {
-                var classification = Resolve(item.Value);
-                if (classification == DependencyClassification.ReferencesMvc)
-                {
-                    applicationParts.Add(item.Key);
-                }
 
-                // It's not interesting for us to know if a dependency has a classification of MvcReference.
-                // All applications targeting the Microsoft.AspNetCore.App will have have a reference to Mvc.
+            foreach (var item in _assemblyItems)
+            {
+                var classification = Resolve(item);
+                if (classification == Classification.ReferencesMvc)
+                {
+                    applicationParts.Add(item.AssemblyName);
+                }
             }
 
             return applicationParts;
         }
 
-        private DependencyClassification Resolve(ClassifiedAssemblyItem classifiedItem)
+        private Classification Resolve(AssemblyItem assemblyItem)
         {
-            if (classifiedItem.DependencyClassification != DependencyClassification.Unknown)
+            if (_classifications.TryGetValue(assemblyItem, out var classification))
             {
-                return classifiedItem.DependencyClassification;
+                return classification;
             }
 
-            if (classifiedItem.AssemblyItem == null)
+            // Initialize the dictionary with a value to short-circuit recursive references.
+            classification = Classification.Unknown;
+            _classifications[assemblyItem] = classification;
+
+            if (assemblyItem.Path == null)
             {
-                // We encountered a dependency that isn't part of this assembly's dependency set. We'll see if it happens to be an MVC assembly.
-                // This might be useful in scenarios where the app does not have a framework reference at the entry point,
-                // but the transitive dependency does.
-                classifiedItem.DependencyClassification = _mvcAssemblies.Contains(classifiedItem.Name) ?
-                    DependencyClassification.MvcReference :
-                    DependencyClassification.DoesNotReferenceMvc;
-
-                return classifiedItem.DependencyClassification;
+                // We encountered a dependency that isn't part of this assembly's dependency set. We'll see if it happens to be an MVC assembly
+                // since that's the only useful determination we can make given the assembly name.
+                classification = _mvcAssemblies.Contains(assemblyItem.AssemblyName) ?
+                    Classification.IsMvc :
+                    Classification.DoesNotReferenceMvc;
             }
-
-            if (classifiedItem.AssemblyItem.IsSystemReference)
+            else if (assemblyItem.IsFrameworkReference)
             {
                 // We do not allow transitive references to MVC via a framework reference to count.
                 // e.g. depending on Microsoft.AspNetCore.SomeThingNewThatDependsOnMvc would not result in an assembly being treated as
                 // referencing MVC.
-                classifiedItem.DependencyClassification = _mvcAssemblies.Contains(classifiedItem.Name) ?
-                    DependencyClassification.MvcReference :
-                    DependencyClassification.DoesNotReferenceMvc;
-
-                return classifiedItem.DependencyClassification;
+                classification = _mvcAssemblies.Contains(assemblyItem.AssemblyName) ?
+                    Classification.IsMvc :
+                    Classification.DoesNotReferenceMvc;
             }
-
-            if (_mvcAssemblies.Contains(classifiedItem.Name))
+            else if (_mvcAssemblies.Contains(assemblyItem.AssemblyName))
             {
-                classifiedItem.DependencyClassification = DependencyClassification.MvcReference;
-                return classifiedItem.DependencyClassification;
+                classification = Classification.IsMvc;
             }
-
-            var dependencyClassification = DependencyClassification.DoesNotReferenceMvc;
-            foreach (var assemblyItem in GetReferences(classifiedItem.AssemblyItem.Path))
+            else
             {
-                var classification = Resolve(assemblyItem);
-                if (classification == DependencyClassification.MvcReference || classification == DependencyClassification.ReferencesMvc)
+                classification = Classification.DoesNotReferenceMvc;
+                foreach (var reference in GetReferences(assemblyItem.Path))
                 {
-                    dependencyClassification = DependencyClassification.ReferencesMvc;
-                    break;
+                    var referenceClassification = Resolve(reference);
+
+                    if (referenceClassification == Classification.IsMvc || referenceClassification == Classification.ReferencesMvc)
+                    {
+                        classification = Classification.ReferencesMvc;
+                        break;
+                    }
                 }
             }
 
-            classifiedItem.DependencyClassification = dependencyClassification;
-            return dependencyClassification;
+            Debug.Assert(classification != Classification.Unknown);
+            _classifications[assemblyItem] = classification;
+            return classification;
         }
 
-        protected virtual IReadOnlyList<ClassifiedAssemblyItem> GetReferences(string file)
+        protected virtual IReadOnlyList<AssemblyItem> GetReferences(string file)
         {
             try
             {
                 using var peReader = new PEReader(File.OpenRead(file));
                 if (!peReader.HasMetadata)
                 {
-                    return Array.Empty<ClassifiedAssemblyItem>(); // not a managed assembly
+                    return Array.Empty<AssemblyItem>(); // not a managed assembly
                 }
 
                 var metadataReader = peReader.GetMetadataReader();
 
-                var assemblyItems = new List<ClassifiedAssemblyItem>();
+                var references = new List<AssemblyItem>();
                 foreach (var handle in metadataReader.AssemblyReferences)
                 {
                     var reference = metadataReader.GetAssemblyReference(handle);
                     var referenceName = metadataReader.GetString(reference.Name);
 
-                    if (_lookup.TryGetValue(referenceName, out var classifiedItem))
-                    {
-                        assemblyItems.Add(classifiedItem);
-                    }
-                    else
+                    if (!Lookup.TryGetValue(referenceName, out var assemblyItem))
                     {
                         // A dependency references an item that isn't referenced by this project.
                         // We'll construct an item for so that we can calculate the classification based on it's name.
-                        assemblyItems.Add(new ClassifiedAssemblyItem(referenceName));
+                        assemblyItem = new AssemblyItem
+                        {
+                            AssemblyName = referenceName,
+                        };
+
+                        Lookup[referenceName] = assemblyItem;
                     }
+
+                    references.Add(assemblyItem);
                 }
 
-                return assemblyItems;
+                return references;
             }
             catch (BadImageFormatException)
             {
                 // not a PE file, or invalid metadata
             }
 
-            return Array.Empty<ClassifiedAssemblyItem>(); // not a managed assembly
+            return Array.Empty<AssemblyItem>(); // not a managed assembly
         }
 
-        protected enum DependencyClassification
+        protected enum Classification
         {
             Unknown,
             DoesNotReferenceMvc,
             ReferencesMvc,
-            MvcReference,
-        }
-
-        protected class ClassifiedAssemblyItem
-        {
-            public ClassifiedAssemblyItem(AssemblyItem classifiedItem)
-                : this(classifiedItem.AssemblyName)
-            {
-                AssemblyItem = classifiedItem;
-            }
-
-            public ClassifiedAssemblyItem(string name)
-            {
-                Name = name;
-            }
-
-            public string Name { get; }
-
-            public AssemblyItem AssemblyItem { get; }
-
-            public DependencyClassification DependencyClassification { get; set; }
+            IsMvc,
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
index 7a24101947..05dd86b430 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
@@ -59,13 +59,13 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             var resolver = new TestReferencesToMvcResolver(new[]
             {
                 CreateAssemblyItem("MyApp.Models"),
-                CreateAssemblyItem("Microsoft.AspNetCore.Mvc", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.Hosting", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.HttpAbstractions", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.KestrelHttpServer", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.StaticFiles", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.Extensions.Primitives", isSystemReference: true),
-                CreateAssemblyItem("System.Net.Http", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Hosting", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.HttpAbstractions", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.KestrelHttpServer", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.StaticFiles", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.Extensions.Primitives", isFrameworkReference: true),
+                CreateAssemblyItem("System.Net.Http", isFrameworkReference: true),
                 CreateAssemblyItem("Microsoft.EntityFrameworkCore"),
             });
 
@@ -89,16 +89,16 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             // Arrange
             var resolver = new TestReferencesToMvcResolver(new[]
             {
-                CreateAssemblyItem("Microsoft.AspNetCore.Mvc", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.TagHelpers", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.TagHelpers", isFrameworkReference: true),
                 CreateAssemblyItem("MyTagHelpers"),
                 CreateAssemblyItem("MyControllers"),
                 CreateAssemblyItem("MyApp.Models"),
-                CreateAssemblyItem("Microsoft.AspNetCore.Hosting", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.HttpAbstractions", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.KestrelHttpServer", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.AspNetCore.StaticFiles", isSystemReference: true),
-                CreateAssemblyItem("Microsoft.Extensions.Primitives", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Hosting", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.HttpAbstractions", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.KestrelHttpServer", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.StaticFiles", isFrameworkReference: true),
+                CreateAssemblyItem("Microsoft.Extensions.Primitives", isFrameworkReference: true),
                 CreateAssemblyItem("Microsoft.EntityFrameworkCore"),
             });
 
@@ -126,13 +126,12 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             {
                 CreateAssemblyItem("MyCMS"),
                 CreateAssemblyItem("MyCMS.Core"),
-                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.ViewFeatures", isSystemReference: true),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.ViewFeatures", isFrameworkReference: true),
             });
 
             resolver.Add("MyCMS", "MyCMS.Core");
             resolver.Add("MyCMS.Core", "Microsoft.AspNetCore.Mvc.ViewFeatures");
 
-
             // Act
             var assemblies = resolver.ResolveAssemblies();
 
@@ -140,41 +139,93 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             Assert.Equal(new[] { "MyCMS", "MyCMS.Core" }, assemblies.OrderBy(a => a));
         }
 
-        public AssemblyItem CreateAssemblyItem(string name, bool isSystemReference = false)
+        [Fact]
+        public void Resolve_Works_WhenAssemblyReferencesAreRecursive()
+        {
+            // Test for https://github.com/aspnet/AspNetCore/issues/12693
+            // Arrange
+            var resolver = new TestReferencesToMvcResolver(new[]
+            {
+                CreateAssemblyItem("PresentationFramework"),
+                CreateAssemblyItem("ReachFramework"),
+                CreateAssemblyItem("MyCMS"),
+                CreateAssemblyItem("MyCMS.Core"),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.ViewFeatures", isFrameworkReference: true),
+            });
+
+            resolver.Add("PresentationFramework", "ReachFramework");
+            resolver.Add("ReachFramework", "PresentationFramework");
+
+            resolver.Add("MyCMS", "MyCMS.Core");
+            resolver.Add("MyCMS.Core", "Microsoft.AspNetCore.Mvc.ViewFeatures");
+
+            // Act
+            var assemblies = resolver.ResolveAssemblies();
+
+            // Assert
+            Assert.Equal(new[] { "MyCMS", "MyCMS.Core" }, assemblies.OrderBy(a => a));
+        }
+
+        [Fact]
+        public void Resolve_Works_WhenAssemblyReferencesAreRecursive_ButAlsoReferencesMvc()
+        {
+            // Arrange
+            var resolver = new TestReferencesToMvcResolver(new[]
+            {
+                CreateAssemblyItem("MyCoolLibrary"),
+                CreateAssemblyItem("PresentationFramework"),
+                CreateAssemblyItem("ReachFramework"),
+                CreateAssemblyItem("MyCMS"),
+                CreateAssemblyItem("MyCMS.Core"),
+                CreateAssemblyItem("Microsoft.AspNetCore.Mvc.ViewFeatures", isFrameworkReference: true),
+            });
+
+            resolver.Add("MyCoolLibrary", "PresentationFramework");
+            resolver.Add("PresentationFramework", "ReachFramework");
+            resolver.Add("ReachFramework", "PresentationFramework", "MyCMS");
+
+            resolver.Add("MyCMS", "MyCMS.Core");
+            resolver.Add("MyCMS.Core", "Microsoft.AspNetCore.Mvc.ViewFeatures");
+
+            // Act
+            var assemblies = resolver.ResolveAssemblies();
+
+            // Assert
+            Assert.Equal(new[] { "MyCMS", "MyCMS.Core", "MyCoolLibrary", "PresentationFramework", "ReachFramework" }, assemblies.OrderBy(a => a));
+        }
+
+        public AssemblyItem CreateAssemblyItem(string name, bool isFrameworkReference = false)
         {
             return new AssemblyItem
             {
                 AssemblyName = name,
-                IsSystemReference = isSystemReference,
+                IsFrameworkReference = isFrameworkReference,
                 Path = name,
             };
         }
 
         private class TestReferencesToMvcResolver : ReferenceResolver
         {
-            private readonly Dictionary<string, List<ClassifiedAssemblyItem>> _references = new Dictionary<string, List<ClassifiedAssemblyItem>>();
-            private readonly Dictionary<string, ClassifiedAssemblyItem> _lookup;
+            private readonly Dictionary<string, string[]> _references = new Dictionary<string, string[]>();
 
             public TestReferencesToMvcResolver(AssemblyItem[] referenceItems)
                 : base(MvcAssemblies, referenceItems)
             {
-                _lookup = referenceItems.ToDictionary(r => r.AssemblyName, r => new ClassifiedAssemblyItem(r));
             }
 
             public void Add(string assembly, params string[] references)
             {
-                var assemblyItems = references.Select(r => _lookup[r]).ToList();
-                _references[assembly] = assemblyItems;
+                _references.Add(assembly, references);
             }
 
-            protected override IReadOnlyList<ClassifiedAssemblyItem> GetReferences(string file)
+            protected override IReadOnlyList<AssemblyItem> GetReferences(string file)
             {
                 if (_references.TryGetValue(file, out var result))
                 {
-                    return result;
+                    return result.Select(r => Lookup[r]).ToArray();
                 }
 
-                return Array.Empty<ClassifiedAssemblyItem>();
+                return Array.Empty<AssemblyItem>();
             }
         }
     }

From 88a002a9186a01f1318b25434673128114094835 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 6 Aug 2019 14:39:00 -0700
Subject: [PATCH 233/337] Enable Component parameter delegates to not require
 @() at design time.

- The core issue is that the Razor parser splits attribute values based on whitespace. Therefore, when it encounters `@onclick="() => Foo()"` it breaks it into three different tokens based on the spaces involved. This separation results in multiple adjacent classified spans for C# which is currently unsupported by WTE due to multiple seams overlapping. All that being said we have the opportunity to be smarter when generating attribute values that we feel can be simplified or collapsed; because of this in this PR I changed the `TagHelperBlockRewriter` phase to understand "simple" collapsible blocks and to then collapse them. In the future a goal would be to take a collapsing approach to all potential attributes and then to re-inspect each token individually at higher layers in order to decouple our TagHelper phases from what the parser initially parses.
- Added an integration and parser test to validate the new functionality. Most of the testing is from the fact that no other tests had to change because of this (it doesn't break anything).
- Added a new SyntaxNode method `GetTokens` that flattens a node into only its token representation.

aspnet/AspNetCoredotnet/aspnetcore-tooling#11826
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/80f1bc76a448288670371ac294682afa601a421b
---
 .../src/Legacy/TagHelperBlockRewriter.cs      | 42 ++++++++++++++
 .../src/Syntax/SyntaxNode.cs                  | 29 ++++++++++
 .../ComponentCodeGenerationTestBase.cs        | 33 +++++++++++
 .../test/Legacy/TagHelperBlockRewriterTest.cs |  6 ++
 .../TestComponent.codegen.cs                  | 57 +++++++++++++++++++
 .../TestComponent.ir.txt                      | 26 +++++++++
 .../TestComponent.mappings.txt                | 20 +++++++
 .../TestComponent.codegen.cs                  | 42 ++++++++++++++
 .../TestComponent.ir.txt                      | 17 ++++++
 .../TestComponent.mappings.txt                | 15 +++++
 ...artNonStringTagHelperAttributes.cspans.txt |  1 +
 ...partNonStringTagHelperAttributes.stree.txt | 29 ++++++++++
 ...artNonStringTagHelperAttributes.tspans.txt |  1 +
 13 files changed, 318 insertions(+)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.tspans.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index d2dc97749d..9d47a0b97f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -521,6 +521,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 _tryParseResult = result;
             }
 
+            public override SyntaxNode VisitGenericBlock(GenericBlockSyntax node)
+            {
+                if (_tryParseResult.IsBoundNonStringAttribute && CanBeCollapsed(node))
+                {
+                    var tokens = node.GetTokens();
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(tokens);
+                    var rewrittenExpression = (CSharpExpressionLiteralSyntax)VisitCSharpExpressionLiteral(expression);
+                    var newChildren = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                    newChildren.Add(rewrittenExpression);
+
+                    return node.Update(newChildren);
+                }
+
+                return base.VisitGenericBlock(node);
+            }
+
             public override SyntaxNode VisitCSharpTransition(CSharpTransitionSyntax node)
             {
                 if (!_tryParseResult.IsBoundNonStringAttribute)
@@ -769,6 +785,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return value.WithSpanContext(node.GetSpanContext());
             }
 
+            // Being collapsed represents that a block contains several identical looking markup literal attribute values. This can be the case
+            // when a user has written something like: @onclick="() => SomeMethod()"
+            // In that case there would be 3 children:
+            //   - ()
+            //   -  =>
+            //   -  SomeMethod()
+            // There are 3 children because the Razor parser separates attribute values based on whitespace.
+            private static bool CanBeCollapsed(GenericBlockSyntax node)
+            {
+                if (node.Children.Count <= 1)
+                {
+                    // The node is either already collapsed or has no children.
+                    return false;
+                }
+
+                for (var i = 0; i < node.Children.Count; i++)
+                {
+                    if (node.Children[i].Kind != SyntaxKind.MarkupLiteralAttributeValue)
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
             private SyntaxNode ConfigureNonStringAttribute(SyntaxNode node)
             {
                 var context = node.GetSpanContext();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs
index 2f58f13fe3..aacc0eb91e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNode.cs
@@ -224,6 +224,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
             return ((SyntaxToken)GetFirstTerminal());
         }
 
+        internal SyntaxList<SyntaxToken> GetTokens()
+        {
+            var tokens = SyntaxListBuilder<SyntaxToken>.Create();
+
+            AddTokens(this, tokens);
+
+            return tokens;
+
+            static void AddTokens(SyntaxNode current, SyntaxListBuilder<SyntaxToken> tokens)
+            {
+                if (current.SlotCount == 0 && current is SyntaxToken token)
+                {
+                    // Token
+                    tokens.Add(token);
+                    return;
+                }
+
+                for (var i = 0; i < current.SlotCount; i++)
+                {
+                    var child = current.GetNodeSlot(i);
+
+                    if (child != null)
+                    {
+                        AddTokens(child, tokens);
+                    }
+                }
+            }
+        }
+
         internal SyntaxToken GetLastToken()
         {
             return ((SyntaxToken)GetLastTerminal());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index cbd8737c16..b331afa4ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2352,6 +2352,39 @@ namespace Test
 
         #region Event Handlers
 
+        [Fact]
+        public void Component_WithImplicitLambdaEventHandler()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent @onclick=""() => Increment()""/>
+
+@code {
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void ChildComponent_WithLambdaEventHandler()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
index 7460142c23..c581a53c3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
@@ -423,6 +423,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 .Build()
         };
 
+        [Fact]
+        public void UnderstandsMultipartNonStringTagHelperAttributes()
+        {
+            EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"(() => 123)()\" />");
+        }
+
         [Fact]
         public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes1()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5e7e2fe184
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       () => Increment()
+
+#line default
+#line hidden
+#nullable disable
+            );
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..651d67138d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -0,0 +1,26 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => Increment()
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (43:0,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (43:0,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6487d39922
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => Increment()|
+Generated Location: (1002:25,23 [17] )
+|() => Increment()|
+
+Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1512:45,7 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ddcbeca415
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                       () => Increment()
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..b92548c14d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+                            IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => Increment()
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e4a8581302
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+Generated Location: (1071:30,7 [87] )
+|
+    private int counter;
+    private void Increment() {
+        counter++;
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.cspans.txt
new file mode 100644
index 0000000000..017c88aff0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [13] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [30] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt
new file mode 100644
index 0000000000..51348bf9d0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..30)::30 - [<person age="(() => 123)()" />]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..30)::30 - [<person age="(() => 123)()" />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[person];
+                MarkupTagHelperAttribute - [7..27)::20 - age - DoubleQuotes - Bound - [ age="(() => 123)()"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..26)::13
+                        CSharpExpressionLiteral - [13..26)::13 - [(() => 123)()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[(()];
+                            Whitespace;[ ];
+                            Equals;[=];
+                            CloseAngle;[>];
+                            Whitespace;[ ];
+                            Text;[123)()];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMiscAttributeContent - [27..28)::1
+                    MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.tspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.tspans.txt
new file mode 100644
index 0000000000..6c93624813
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.tspans.txt
@@ -0,0 +1 @@
+TagHelper span at (0:0,0 [30] ) - PersonTagHelper

From 7fc59726135a8a65309b797f804d292273da013f Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 9 Aug 2019 13:13:18 -0700
Subject: [PATCH 234/337] Fix @inject intellisense
 (dotnet/aspnetcore-tooling#949)

* Fix @inject intellisense

* update
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d953ec40c30e3dbe876bd11ad03dc72350bcf03c
---
 ...IncompleteDirectives_DesignTime.codegen.cs | 24 ----------
 .../IncompleteDirectives_DesignTime.ir.txt    |  6 ---
 ...completeDirectives_DesignTime.mappings.txt | 21 ++-------
 ...IncompleteDirectives_DesignTime.codegen.cs | 32 -------------
 .../IncompleteDirectives_DesignTime.ir.txt    |  8 ----
 ...completeDirectives_DesignTime.mappings.txt | 28 ++----------
 .../IncompleteDirectives_Runtime.ir.txt       |  4 --
 ...IncompleteDirectives_DesignTime.codegen.cs | 40 -----------------
 .../IncompleteDirectives_DesignTime.ir.txt    |  8 ----
 ...completeDirectives_DesignTime.mappings.txt | 28 ++----------
 .../IncompleteDirectives_Runtime.ir.txt       |  4 --
 .../src/Legacy/CSharpCodeParser.cs            | 45 ++++++++++---------
 ...IncompleteDirectives_DesignTime.codegen.cs | 20 ---------
 .../IncompleteDirectives_DesignTime.ir.txt    |  4 --
 ...completeDirectives_DesignTime.mappings.txt | 16 ++-----
 .../IncompleteDirectives_Runtime.ir.txt       |  2 -
 ...uresNewlineImmediatelyFollowing.cspans.txt |  1 -
 ...turesNewlineImmediatelyFollowing.stree.txt |  2 -
 18 files changed, 39 insertions(+), 254 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 174cfee86e..de980049d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -16,25 +16,9 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
-#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
-#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
         }
@@ -51,14 +35,6 @@ namespace AspNetCore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 MyService<TModel> __typeHelper = default;
 
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
-#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index b39482f802..304921a812 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -21,12 +21,9 @@ Document -
                 DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
                 DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
                 DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
-                DirectiveToken - (93:2,6 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (102:3,7 [0] IncompleteDirectives.cshtml) - 
-                DirectiveToken - (113:5,7 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (123:6,8 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                DirectiveToken - (150:7,25 [0] IncompleteDirectives.cshtml) - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
             CSharpCode - 
@@ -37,7 +34,6 @@ Document -
                 HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
-                    DirectiveToken - (93:2,6 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (95:3,0 [7] IncompleteDirectives.cshtml) - model
@@ -45,7 +41,6 @@ Document -
                 HtmlContent - (102:3,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (106:5,0 [7] IncompleteDirectives.cshtml) - inject
-                    DirectiveToken - (113:5,7 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (113:5,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (115:6,0 [8] IncompleteDirectives.cshtml) - inject
@@ -54,7 +49,6 @@ Document -
                     IntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (125:7,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                    DirectiveToken - (150:7,25 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (150:7,25 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
             Inject - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 45be2df3ac..a978e8d898 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,30 +1,15 @@
-Source Location: (93:2,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+Source Location: (102:3,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
 Generated Location: (776:19,0 [0] )
 ||
 
-Source Location: (102:3,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+Source Location: (123:6,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
 Generated Location: (966:27,0 [0] )
 ||
 
-Source Location: (113:5,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1156:35,0 [0] )
-||
-
-Source Location: (123:6,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1346:43,0 [0] )
-||
-
 Source Location: (133:7,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (1536:51,0 [17] )
+Generated Location: (1156:35,0 [17] )
 |MyService<TModel>|
 
-Source Location: (150:7,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1766:59,0 [0] )
-||
-
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 5d795057a2..40224e4d06 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -16,25 +16,9 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
-#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
-#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
         }
@@ -51,22 +35,6 @@ namespace AspNetCore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 MyService<TModel> __typeHelper = default;
 
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
-#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
-#line default
-#line hidden
-        }
-        ))();
-        ((System.Action)(() => {
-#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index bafb3e68a3..bd1de30747 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -23,13 +23,9 @@ Document -
                 DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
                 DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
                 DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
-                DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
-                DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
-                DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -45,7 +41,6 @@ Document -
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
                 MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
-                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
@@ -53,7 +48,6 @@ Document -
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
-                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
@@ -62,11 +56,9 @@ Document -
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
-                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index f6a870a0cf..cc79426cf0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,40 +1,20 @@
-Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
 Generated Location: (767:19,0 [0] )
 ||
 
-Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (957:27,0 [0] )
-||
-
-Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1148:35,0 [0] )
-||
-
 Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1339:43,0 [0] )
+Generated Location: (958:27,0 [0] )
 ||
 
 Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (1530:51,0 [17] )
+Generated Location: (1149:35,0 [17] )
 |MyService<TModel>|
 
-Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1761:59,0 [0] )
-||
-
-Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1952:67,0 [0] )
-||
-
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (2143:75,0 [0] )
+Generated Location: (1380:43,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index 1b5f45c4bf..9a14616752 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -28,7 +28,6 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
-                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(119, 2, true);
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
@@ -44,7 +43,6 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
-                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(139, 2, true);
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
@@ -61,7 +59,6 @@ Document -
                     IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(176, 4, true);
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
@@ -69,7 +66,6 @@ Document -
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
-                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(190, 2, true);
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index ce31fa3aa6..f8f7622360 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -17,29 +17,9 @@ namespace AspNetCore
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
 #nullable restore
-#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
-#line default
-#line hidden
-#nullable disable
-        }
-        ))();
-        ((System.Action)(() => {
-#nullable restore
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
-#line default
-#line hidden
-#nullable disable
-        }
-        ))();
-        ((System.Action)(() => {
-#nullable restore
-#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
 #nullable disable
@@ -60,26 +40,6 @@ namespace AspNetCore
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 MyService<TModel> __typeHelper = default!;
 
-#line default
-#line hidden
-#nullable disable
-        }
-        ))();
-        ((System.Action)(() => {
-#nullable restore
-#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
-#line default
-#line hidden
-#nullable disable
-        }
-        ))();
-        ((System.Action)(() => {
-#nullable restore
-#line 14 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
 #nullable disable
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index bafb3e68a3..bd1de30747 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -23,13 +23,9 @@ Document -
                 DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
                 DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
                 DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
-                DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
-                DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
-                DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -45,7 +41,6 @@ Document -
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
                 MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
-                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
@@ -53,7 +48,6 @@ Document -
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
-                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
@@ -62,11 +56,9 @@ Document -
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
-                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index d722992d66..b99213a7cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,40 +1,20 @@
-Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
 Generated Location: (786:20,0 [0] )
 ||
 
-Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1014:30,0 [0] )
-||
-
-Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1243:40,0 [0] )
-||
-
 Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1472:50,0 [0] )
+Generated Location: (1015:30,0 [0] )
 ||
 
 Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (1701:60,0 [17] )
+Generated Location: (1244:40,0 [17] )
 |MyService<TModel>|
 
-Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (1971:70,0 [0] )
-||
-
-Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (2200:80,0 [0] )
-||
-
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (2429:90,0 [0] )
+Generated Location: (1514:50,0 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index 54ba239858..c874623d1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -18,7 +18,6 @@ Document -
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
                 MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
-                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
@@ -26,7 +25,6 @@ Document -
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
-                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
@@ -35,11 +33,9 @@ Document -
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
-                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
-                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index c5fbbdb586..ac0b03e3c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1314,32 +1314,37 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         }
 
                         var tokenDescriptor = descriptor.Tokens[i];
-                        AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
 
-                        if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
-                            tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
-                            tokenDescriptor.Kind == DirectiveTokenKind.Type ||
-                            tokenDescriptor.Kind == DirectiveTokenKind.Attribute)
+                        if (At(SyntaxKind.Whitespace))
                         {
-                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
-                            directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
 
-                            if (EndOfFile || At(SyntaxKind.NewLine))
+                            if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
+                                tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
+                                tokenDescriptor.Kind == DirectiveTokenKind.Type ||
+                                tokenDescriptor.Kind == DirectiveTokenKind.Attribute)
                             {
-                                // Add a marker token to provide CSharp intellisense when we start typing the directive token.
-                                AcceptMarkerTokenIfNecessary();
-                                SpanContext.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
-                                SpanContext.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
-                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+                                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
                                 directiveBuilder.Add(OutputTokensAsStatementLiteral());
+
+                                if (EndOfFile || At(SyntaxKind.NewLine))
+                                {
+                                    // Add a marker token to provide CSharp intellisense when we start typing the directive token.
+                                    // We want CSharp intellisense only if there is whitespace after the directive keyword.
+                                    AcceptMarkerTokenIfNecessary();
+                                    SpanContext.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
+                                    SpanContext.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
+                                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+                                    directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                                }
+                            }
+                            else
+                            {
+                                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                                directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
                             }
-                        }
-                        else
-                        {
-                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
-                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
-                            directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
                         }
 
                         if (tokenDescriptor.Optional && (EndOfFile || At(SyntaxKind.NewLine)))
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 3e7ab835c7..3b83a11a6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -92,16 +92,6 @@ global::System.Object __typeHelper = "";
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = ";
 
-#line default
-#line hidden
-#nullable disable
-        }
-        ))();
-        ((System.Action)(() => {
-#nullable restore
-#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
 #nullable disable
@@ -112,16 +102,6 @@ global::System.Object __typeHelper = ";
 #line 16 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
  
 
-#line default
-#line hidden
-#nullable disable
-        }
-        ))();
-        ((System.Action)(() => {
-#nullable restore
-#line 21 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
- 
-
 #line default
 #line hidden
 #nullable disable
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
index 3300ad1af0..f31a5b77ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -11,9 +11,7 @@ Document -
                 DirectiveToken - (212:10,16 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (231:11,17 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (250:12,17 [1] IncompleteDirectives.cshtml) - "
-                DirectiveToken - (264:14,9 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (276:15,10 [0] IncompleteDirectives.cshtml) - 
-                DirectiveToken - (315:20,8 [0] IncompleteDirectives.cshtml) - 
                 DirectiveToken - (326:21,9 [0] IncompleteDirectives.cshtml) - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -61,7 +59,6 @@ Document -
                 HtmlContent - (251:12,18 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (251:12,18 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml) - inherits
-                    DirectiveToken - (264:14,9 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (264:14,9 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml) - inherits
@@ -71,7 +68,6 @@ Document -
                 MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml) - functions
                 MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml) - functions
                 MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml) - section
-                    DirectiveToken - (315:20,8 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml) - section
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 4859dfc0ea..bc88dd7adf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -43,28 +43,18 @@ Source Location: (250:12,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegra
 Generated Location: (2678:92,37 [1] )
 |"|
 
-Source Location: (264:14,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+Source Location: (276:15,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
 Generated Location: (2908:102,0 [0] )
 ||
 
-Source Location: (276:15,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+Source Location: (326:21,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
 Generated Location: (3137:112,0 [0] )
 ||
 
-Source Location: (315:20,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (3366:122,0 [0] )
-||
-
-Source Location: (326:21,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
-||
-Generated Location: (3595:132,0 [0] )
-||
-
 Source Location: (354:24,12 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (4090:149,12 [0] )
+Generated Location: (3632:129,12 [0] )
 ||
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index 675151be4e..a9b01efba5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -31,7 +31,6 @@ Document -
                 HtmlContent - (253:13,0 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (253:13,0 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml) - inherits
-                    DirectiveToken - (264:14,9 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (264:14,9 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml) - inherits
@@ -41,7 +40,6 @@ Document -
                 MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml) - functions
                 MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml) - functions
                 MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml) - section
-                    DirectiveToken - (315:20,8 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml) - section
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
index c10c843521..ebd2ef1994 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
@@ -1,5 +1,4 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (8:0,8 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [8] )
 Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
index d336694b97..b6a10e2a5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
@@ -10,7 +10,5 @@ RazorDocument - [0..10)::10 - [@sectionLF]
                     RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
                         Identifier;[section];
                     CSharpCodeBlock - [8..8)::0
-                        CSharpStatementLiteral - [8..8)::0 - [] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
-                            Marker;[];
         MarkupTextLiteral - [8..10)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
             NewLine;[LF];

From 2abbff5b3b8bea159fcb26ffc2e4efd0931faa66 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 9 Aug 2019 13:50:13 -0700
Subject: [PATCH 235/337] Don't coalesce <option> tag in
 ComponentMarkupBlockPass \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/728a7230b01b1882fdc8ba6eabc80ed305b69d4b

---
 .../Components/ComponentMarkupBlockPass.cs    | 14 +++++
 .../ComponentMarkupBlockPassTest.cs           | 59 +++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
index 8578b6993e..dc26b140b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
@@ -156,6 +156,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     // later.
                     _foundNonHtml = true;
                 }
+                else if (string.Equals("option", node.TagName, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Also, treat <option>...</option> as non-HTML - we don't want it to be coalesced so that we can support setting "selected" attribute on it.
+                    // We only care about option tags that are nested under a select tag.
+                    foreach (var ancestor in Ancestors)
+                    {
+                        if (ancestor is MarkupElementIntermediateNode element &&
+                            string.Equals("select", element.TagName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            _foundNonHtml = true;
+                            break;
+                        }
+                    }
+                }
 
                 base.VisitDefault(node);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
index 75c32a7878..ca9885009a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
@@ -306,6 +306,65 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
         }
 
+        [Fact]
+        public void Execute_CannotRewriteHtml_SelectOption()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  @if (some_bool)
+  {
+  <head cool=""beans"">
+    <select>
+        <option value='1'>One</option>
+        <option selected value='2'>Two</option>
+        <option value='3'>Three</option>
+    </select>
+  </head>
+  }
+</html>");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Empty(documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>());
+        }
+
+        [Fact]
+        public void Execute_CanRewriteHtml_OptionWithNoSelectAncestor()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<html>
+  @if (some_bool)
+  {
+  <head cool=""beans"">
+    <option value='1'>One</option>
+    <option selected value='2'>Two</option>
+  </head>
+  }
+</html>");
+
+            var expected = NormalizeContent(@"
+<head cool=""beans"">
+    <option value=""1"">One</option>
+    <option selected value=""2"">Two</option>
+  </head>
+");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var block = documentNode.FindDescendantNodes<MarkupBlockIntermediateNode>().Single();
+            Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
+        }
+
         // The unclosed tag will have errors, so we won't rewrite it or its parent.
         [Fact]
         public void Execute_CannotRewriteHtml_Errors()

From 7e8807ae64967a2c27cfd7dc45985da7777876e8 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 12 Aug 2019 21:30:22 -0700
Subject: [PATCH 236/337] Print warning when reference assembly is not found
 (dotnet/aspnetcore-tooling#953)

* Print warning when reference assembly is not found

* Added test
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d8a5e3973964dbed88da751056741271f7d884d2
---
 .../src/FindAssembliesWithReferencesTo.cs       |  7 +++++++
 .../src/ReferenceAssemblyNotFoundException.cs   | 17 +++++++++++++++++
 .../src/ReferenceResolver.cs                    |  5 +++++
 .../ApplicationPartDiscoveryIntegrationTest.cs  | 12 ++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceAssemblyNotFoundException.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
index 00ab6845dc..cb1d2359e8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/FindAssembliesWithReferencesTo.cs
@@ -51,6 +51,13 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 var assemblyNames = provider.ResolveAssemblies();
                 ResolvedAssemblies = assemblyNames.ToArray();
             }
+            catch (ReferenceAssemblyNotFoundException ex)
+            {
+                // Print a warning and return. We cannot produce a correct document at this point.
+                var warning = "Reference assembly {0} could not be found. This is typically caused by build errors in referenced projects.";
+                Log.LogWarning(null, "RAZORSDK1007", null, null, 0, 0, 0, 0, warning, ex.FileName);
+                return true;
+            }
             catch (Exception ex)
             {
                 Log.LogErrorFromException(ex);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceAssemblyNotFoundException.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceAssemblyNotFoundException.cs
new file mode 100644
index 0000000000..8ff573eef3
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceAssemblyNotFoundException.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    internal class ReferenceAssemblyNotFoundException : Exception
+    {
+        public ReferenceAssemblyNotFoundException(string fileName)
+        {
+            FileName = fileName;
+        }
+
+        public string FileName { get; }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
index 8a44c9b7d1..6b1489cab0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/ReferenceResolver.cs
@@ -107,6 +107,11 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         {
             try
             {
+                if (!File.Exists(file))
+                {
+                    throw new ReferenceAssemblyNotFoundException(file);
+                }
+
                 using var peReader = new PEReader(File.OpenRead(file));
                 if (!peReader.HasMetadata)
                 {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index 45a70364ee..d1fd24c9c8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -177,5 +177,17 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.Equal(outputFilethumbPrint, GetThumbPrint(outputFile));
             }
         }
+
+        [Fact]
+        [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
+        public async Task Build_ProjectWithMissingAssemblyReference_PrintsWarning()
+        {
+            var result = await DotnetMSBuild("Build /p:BuildProjectReferences=false");
+
+            Assert.BuildFailed(result);
+
+            Assert.BuildWarning(result, "RAZORSDK1007");
+            Assert.BuildError(result, "CS0006");
+        }
     }
 }

From 32196f8023a1d6dfba7439e3e90249db1a97a879 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 13 Aug 2019 12:35:37 -0700
Subject: [PATCH 237/337] Use globally qualified type name when generating
 TypeInference (dotnet/aspnetcore-tooling#946)

The code-generated TypeInference type resides in a custom namespace.
Any types that it refers to in user code must be qualified using the "global::" prefix
to avoid type \ namespace conflicts.

Fixes https://github.com/aspnet/AspNetCore/issues/12116\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f0e09e4a97824313321421d74911615f90d12c6d
---
 .../Components/ComponentGenericTypePass.cs    |  10 +-
 .../src/Components/ComponentNodeWriter.cs     |  15 +-
 .../ComponentAttributeIntermediateNode.cs     |   3 +
 .../ComponentCodeGenerationTestBase.cs        | 160 +++++++++++++++++-
 .../TestComponent.codegen.cs                  |  72 ++++++++
 .../TestComponent.ir.txt                      |  29 ++++
 .../TestComponent.mappings.txt                |  15 ++
 .../TestComponent.codegen.cs                  |  72 ++++++++
 .../TestComponent.ir.txt                      |  29 ++++
 .../TestComponent.mappings.txt                |  15 ++
 .../TestComponent.codegen.cs                  |  72 ++++++++
 .../TestComponent.ir.txt                      |  29 ++++
 .../TestComponent.mappings.txt                |  15 ++
 .../TestComponent.codegen.cs                  |  72 ++++++++
 .../TestComponent.ir.txt                      |  29 ++++
 .../TestComponent.mappings.txt                |  15 ++
 .../TestComponent.codegen.cs                  |  47 +++++
 .../TestComponent.ir.txt                      |  29 ++++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  58 +++++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.codegen.cs                  |  58 +++++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.codegen.cs                  |  58 +++++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.codegen.cs                  |  58 +++++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.codegen.cs                  |  32 ++++
 .../TestComponent.ir.txt                      |  18 ++
 .../TestComponent.mappings.txt                |   9 +
 30 files changed, 1095 insertions(+), 5 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
index 6be200e659..09ba98516f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentGenericTypePass.cs
@@ -207,11 +207,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 foreach (var attribute in node.Attributes)
                 {
+                    string globallyQualifiedTypeName = null;
+
+                    if (attribute.TypeName != null)
+                    {
+                        globallyQualifiedTypeName = rewriter.Rewrite(attribute.TypeName);
+                        attribute.GloballyQualifiedTypeName = globallyQualifiedTypeName;
+                    }
+
                     if (attribute.BoundAttribute?.IsGenericTypedProperty() ?? false && attribute.TypeName != null)
                     {
                         // If we know the type name, then replace any generic type parameter inside it with
                         // the known types.
-                        attribute.TypeName = rewriter.Rewrite(attribute.TypeName);
+                        attribute.TypeName = globallyQualifiedTypeName;
                     }
                     else if (attribute.TypeName == null && (attribute.BoundAttribute?.IsDelegateProperty() ?? false))
                     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index a10cdba86d..6ab28d04ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -209,11 +209,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     if (child is ComponentAttributeIntermediateNode attribute)
                     {
-                        var typeName = attribute.TypeName;
-                        if (attribute.BoundAttribute != null && !attribute.BoundAttribute.IsGenericTypedProperty())
+                        string typeName;
+                        if (attribute.GloballyQualifiedTypeName != null)
                         {
-                            typeName = "global::" + typeName;
+                            typeName = attribute.GloballyQualifiedTypeName;
                         }
+                        else
+                        {
+                            typeName = attribute.TypeName;
+                            if (attribute.BoundAttribute != null && !attribute.BoundAttribute.IsGenericTypedProperty())
+                            {
+                                typeName = "global::" + typeName;
+                            }
+                        }
+
                         p.Add(($"__seq{p.Count}", typeName, $"__arg{p.Count}"));
                     }
                     else if (child is SplatIntermediateNode splat)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
index 98404ef88e..6690b64d17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
@@ -102,6 +102,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 
         public string TypeName { get; set; }
 
+        public string GloballyQualifiedTypeName { get; set; }
+
         public override void Accept(IntermediateNodeVisitor visitor)
         {
             if (visitor == null)
@@ -127,6 +129,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteProperty(nameof(PropertyName), PropertyName);
             formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
             formatter.WriteProperty(nameof(TypeName), TypeName);
+            formatter.WriteProperty(nameof(GloballyQualifiedTypeName), GloballyQualifiedTypeName);
         }
 
         public bool TryParseEventCallbackTypeArgument(out string argument)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index b331afa4ca..727f3ccca4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -1289,7 +1289,7 @@ namespace Test
 
         [Fact]
         public void BuiltIn_BindToInputWithDefaultFormat()
-        { 
+        {
             // Arrange
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
@@ -3190,6 +3190,40 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void NonGenericComponent_WithGenericEventHandler()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyEventArgs { }
+
+    public class MyComponent : ComponentBase
+    {
+        [Parameter] public string Item { get; set; }
+        [Parameter] public EventCallback<MyEventArgs> Event { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent Item=""Hello"" MyEvent=""MyEventHandler"" />
+
+@code {
+    public void MyEventHandler() {}
+}
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void GenericComponent_WithKey()
         {
@@ -3418,6 +3452,130 @@ namespace Test.Shared
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void GenericComponent_NonGenericEventCallback_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyEventArgs { }
+
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] public TItem Item { get; set; }
+        [Parameter] public EventCallback MyEvent { get; set; }
+    }
+}
+"));
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test
+<MyComponent Item=""3"" MyEvent=""x => {}"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_GenericEventCallback_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyEventArgs { }
+
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] public TItem Item { get; set; }
+        [Parameter] public EventCallback<MyEventArgs> MyEvent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test
+<MyComponent Item=""3"" MyEvent=""x => {}"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_NestedGenericEventCallback_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyEventArgs { }
+
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] public TItem Item { get; set; }
+        [Parameter] public EventCallback<List<Dictionary<string, MyEventArgs[]>>> MyEvent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test
+<MyComponent Item=""3"" MyEvent=""x => {}"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyEventArgs { }
+
+    public class MyComponent<TItem> : ComponentBase
+    {
+        [Parameter] public TItem Item { get; set; }
+        [Parameter] public EventCallback<TItem> MyEvent { get; set; }
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Test
+<MyComponent Item=""3"" MyEvent=""(int x) => {}"" />
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Key
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6d96332596
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,72 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               (int x) => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..93f6af217c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (13:1,0 [48] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (int x) => {}
+                HtmlContent - (61:1,48 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (61:1,48 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d4e36b5bbf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test|
+Generated Location: (320:12,0 [10] )
+|using Test|
+
+Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1087:32,19 [1] )
+|3|
+
+Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+|(int x) => {}|
+Generated Location: (1328:40,31 [13] )
+|(int x) => {}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..fcd22ff1cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,72 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Test.MyEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               x => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..2b4c766c99
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
+                HtmlContent - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ff8f8bdd6b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test|
+Generated Location: (320:12,0 [10] )
+|using Test|
+
+Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1087:32,19 [1] )
+|3|
+
+Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|x => {}|
+Generated Location: (1346:40,31 [7] )
+|x => {}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..ec34ae46b9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,72 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Collections.Generic.List<System.Collections.Generic.Dictionary<System.String, Test.MyEventArgs[]>>>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               x => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..2b4c766c99
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
+                HtmlContent - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c1e1122d16
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test|
+Generated Location: (320:12,0 [10] )
+|using Test|
+
+Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1087:32,19 [1] )
+|3|
+
+Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|x => {}|
+Generated Location: (1435:40,31 [7] )
+|x => {}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b4b5ccbb6d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,72 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , -1, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               x => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent<>);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..2b4c766c99
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
+                HtmlContent - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
new file mode 100644
index 0000000000..97cd8d797e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -0,0 +1,15 @@
+Source Location: (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Test|
+Generated Location: (320:12,0 [10] )
+|using Test|
+
+Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|3|
+Generated Location: (1087:32,19 [1] )
+|3|
+
+Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|x => {}|
+Generated Location: (1328:40,31 [7] )
+|x => {}|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4d182075ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,47 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __o = "";
+            __o = "";
+            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public void MyEventHandler() {}
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..7a231f2e1a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        HtmlContent - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    ComponentAttribute -  - MyEvent - AttributeStructure.DoubleQuotes
+                        HtmlContent - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - MyEventHandler
+                HtmlContent - (53:0,53 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (53:0,53 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (104:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (104:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public void MyEventHandler() {}\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..b206d1f78f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public void MyEventHandler() {}
+|
+Generated Location: (1243:38,7 [39] )
+|
+    public void MyEventHandler() {}
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..84e9d3db48
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               (int x) => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..2214655b97
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (13:1,0 [48] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (int x) => {}
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f3f9065268
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Test.MyEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               x => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..033d43f1e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..99bcfbb9ff
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Collections.Generic.List<System.Collections.Generic.Dictionary<System.String, Test.MyEventArgs[]>>>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               x => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..033d43f1e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f7a895d896
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Test;
+
+#line default
+#line hidden
+#nullable disable
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   3
+
+#line default
+#line hidden
+#nullable disable
+            , 2, Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                               x => {}
+
+#line default
+#line hidden
+#nullable disable
+            ));
+        }
+        #pragma warning restore 1998
+    }
+}
+namespace __Blazor.Test.TestComponent
+{
+    #line hidden
+    internal static class TypeInference
+    {
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
+        {
+        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        builder.AddAttribute(__seq0, "Item", __arg0);
+        builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        builder.CloseComponent();
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
new file mode 100644
index 0000000000..033d43f1e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
+    NamespaceDeclaration -  - __Blazor.Test.TestComponent
+        ClassDeclaration -  - internal static - TypeInference -  - 
+            ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5cddba9bfe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            builder.OpenComponent<Test.MyComponent>(0);
+            builder.AddAttribute(1, "Item", "Hello");
+            builder.AddAttribute(2, "MyEvent", "MyEventHandler");
+            builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public void MyEventHandler() {}
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
new file mode 100644
index 0000000000..72984229f1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -0,0 +1,18 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                        HtmlContent - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                    ComponentAttribute -  - MyEvent - AttributeStructure.DoubleQuotes
+                        HtmlContent - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - MyEventHandler
+            CSharpCode - (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public void MyEventHandler() {}\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
new file mode 100644
index 0000000000..ef96ec79b3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public void MyEventHandler() {}
+|
+Generated Location: (848:23,7 [39] )
+|
+    public void MyEventHandler() {}
+|
+

From 80d6dfea89b066edff4d389e3a3bb8c124d580be Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 12 Aug 2019 17:44:31 -0700
Subject: [PATCH 238/337] Give "builder" a less discoverable name

Fixes https://github.com/aspnet/AspNetCore/issues/12991
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7e974693b6760619c552a8d06db497fa2a2d97b3
---
 .../ComponentDesignTimeNodeWriter.cs          | 22 +++++-----
 .../ComponentDocumentClassifierPass.cs        |  2 +-
 .../src/Components/ComponentNodeWriter.cs     | 21 +++++-----
 .../Components/ComponentRuntimeNodeWriter.cs  | 30 +++++++-------
 .../src/Components/ComponentsApi.cs           |  2 +
 .../src/Components/ScopeStack.cs              |  6 +--
 .../ComponentCodeGenerationTestBase.cs        | 10 ++---
 .../ComponentDeclarationIntegrationTest.cs    |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 26 ++++++------
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 32 +++++++--------
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.ir.txt                      | 18 ++++-----
 .../TestComponent.mappings.txt                | 20 +++++-----
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                | 10 ++---
 .../TestComponent.codegen.cs                  | 22 +++++-----
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  | 20 +++++-----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../Counter.codegen.cs                        |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                | 10 ++---
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                | 10 ++---
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  6 +--
 .../Regression_597/TestComponent.codegen.cs   |  4 +-
 .../Regression_597/TestComponent.mappings.txt |  4 +-
 .../Regression_609/TestComponent.codegen.cs   |  4 +-
 .../Regression_609/TestComponent.mappings.txt |  6 +--
 .../Regression_772/TestComponent.codegen.cs   |  4 +-
 .../Regression_773/TestComponent.codegen.cs   |  4 +-
 .../Regression_784/TestComponent.codegen.cs   |  2 +-
 .../Regression_784/TestComponent.mappings.txt |  6 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.ir.txt                      | 18 ++++-----
 .../TestComponent.mappings.txt                | 16 ++++----
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.ir.txt                      | 18 ++++-----
 .../TestComponent.mappings.txt                | 20 +++++-----
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 28 ++++++-------
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-----
 .../TestComponent.codegen.cs                  | 26 ++++++------
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.codegen.cs                  | 36 ++++++++---------
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.ir.txt                      | 22 +++++-----
 .../TestComponent.mappings.txt                | 20 +++++-----
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.codegen.cs                  | 34 ++++++++--------
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  | 20 +++++-----
 .../TestComponent.codegen.cs                  | 22 +++++-----
 .../TestComponent.codegen.cs                  | 22 +++++-----
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 40 +++++++++----------
 .../ComponentImports/_Imports.codegen.cs      |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  | 18 ++++-----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.codegen.cs                  |  6 +--
 .../Counter.codegen.cs                        |  6 +--
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  | 18 ++++-----
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 24 +++++------
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-----
 .../TestComponent.codegen.cs                  | 26 ++++++------
 .../TestComponent.codegen.cs                  |  4 +-
 .../Element_WithKey/TestComponent.codegen.cs  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 26 ++++++------
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 22 +++++-----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 14 +++----
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 26 ++++++------
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 10 ++---
 .../TestComponent.mappings.txt                |  6 +--
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 12 +++---
 .../TestComponent.mappings.txt                |  4 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 .../Regression_597/TestComponent.codegen.cs   | 10 ++---
 .../Regression_597/TestComponent.mappings.txt |  2 +-
 .../Regression_609/TestComponent.codegen.cs   | 14 +++----
 .../Regression_609/TestComponent.mappings.txt |  2 +-
 .../Regression_772/TestComponent.codegen.cs   | 10 ++---
 .../Regression_773/TestComponent.codegen.cs   | 10 ++---
 .../Regression_784/TestComponent.codegen.cs   | 10 ++---
 .../Regression_784/TestComponent.mappings.txt |  2 +-
 .../TestComponent.codegen.cs                  | 20 +++++-----
 .../TestComponent.codegen.cs                  | 16 ++++----
 .../TestComponent.ir.txt                      | 26 ++++++------
 .../TestComponent.mappings.txt                |  8 ++--
 .../TestComponent.codegen.cs                  | 18 ++++-----
 .../TestComponent.ir.txt                      | 26 ++++++------
 .../TestComponent.mappings.txt                | 16 ++++----
 .../TestComponent.codegen.cs                  |  6 +--
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  4 +-
 .../TestComponent.codegen.cs                  |  8 ++--
 .../TestComponent.mappings.txt                |  2 +-
 642 files changed, 2217 insertions(+), 2214 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index ae81506bc6..78cdcc5496 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -311,12 +311,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 // Writes something like:
                 //
-                // builder.OpenComponent<MyComponent>(0);
-                // builder.AddAttribute(1, "Foo", ...);
-                // builder.AddAttribute(2, "ChildContent", ...);
-                // builder.SetKey(someValue);
-                // builder.AddElementCapture(3, (__value) => _field = __value);
-                // builder.CloseComponent();
+                // __builder.OpenComponent<MyComponent>(0);
+                // __builder.AddAttribute(1, "Foo", ...);
+                // __builder.AddAttribute(2, "ChildContent", ...);
+                // __builder.SetKey(someValue);
+                // __builder.AddElementCapture(3, (__value) => _field = __value);
+                // __builder.CloseComponent();
 
                 foreach (var typeArgument in node.TypeArguments)
                 {
@@ -375,7 +375,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // the component on the builder. We generate a method elsewhere, and then pass all of the information
                 // to that method. We pass in all of the attribute values + the sequence numbers.
                 //
-                // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ....);
+                // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, ..., 2, ..., 3, ....);
 
                 // Preserve order of attributes + splats
                 var attributes = node.Children.Where(s =>
@@ -676,9 +676,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Writes something like:
             //
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
+            // __builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
             // OR
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
+            // __builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
             BeginWriteAttribute(context.CodeWriter, node.AttributeName);
             context.CodeWriter.Write($"({node.TypeName})(");
 
@@ -775,7 +775,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Looks like:
             //
-            // builder.SetKey(_keyValue);
+            // __builder.SetKey(_keyValue);
 
             var codeWriter = context.CodeWriter;
 
@@ -811,7 +811,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Looks like:
             //
-            // builder.AddMultipleAttributes(2, ...);
+            // __builder.AddMultipleAttributes(2, ...);
             context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMultipleAttributes}");
             context.CodeWriter.Write("-1");
             context.CodeWriter.WriteParameterSeparator();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 8e2b1970e0..ea13bcb6c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 method.Parameters.Clear();
                 method.Parameters.Add(new MethodParameter()
                 {
-                    ParameterName = "builder",
+                    ParameterName = ComponentsApi.RenderTreeBuilder.BuilderParameter,
                     TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName,
                 });
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index 6ab28d04ff..e2b224db7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             //
             // Looks like:
             //
-            //  public static void CreateFoo_0<T1, T2>(RenderTreeBuilder builder, int seq, int __seq0, T1 __arg0, int __seq1, global::System.Collections.Generic.List<T2> __arg1, int __seq2, string __arg2)
+            //  public static void CreateFoo_0<T1, T2>(RenderTreeBuilder __builder, int seq, int __seq0, T1 __arg0, int __seq1, global::System.Collections.Generic.List<T2> __arg1, int __seq2, string __arg2)
             //  {
             //      builder.OpenComponent<Foo<T1, T2>>();
             //      builder.AddAttribute(__seq0, "Attr0", __arg0);
@@ -88,7 +88,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             writer.Write("(");
             writer.Write("global::");
             writer.Write(ComponentsApi.RenderTreeBuilder.FullTypeName);
-            writer.Write(" builder");
+            writer.Write(" ");
+            writer.Write(ComponentsApi.RenderTreeBuilder.BuilderParameter);
             writer.Write(", ");
             writer.Write("int seq");
 
@@ -118,8 +119,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             writer.WriteLine("{");
 
-            // builder.OpenComponent<TComponent>(42);
-            context.CodeWriter.Write("builder");
+            // _builder.OpenComponent<TComponent>(42);
+            context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.BuilderParameter);
             context.CodeWriter.Write(".");
             context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
             context.CodeWriter.Write("<");
@@ -136,7 +137,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 if (child is ComponentAttributeIntermediateNode attribute)
                 {
-                    context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                    context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.AddAttribute);
                     context.CodeWriter.Write(parameters[index].seqName);
                     context.CodeWriter.Write(", ");
 
@@ -149,7 +150,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
                 else if (child is SplatIntermediateNode)
                 {
-                    context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddMultipleAttributes);
+                    context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.AddMultipleAttributes);
                     context.CodeWriter.Write(parameters[index].seqName);
                     context.CodeWriter.Write(", ");
 
@@ -161,7 +162,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             foreach (var childContent in node.Component.ChildContents)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.AddAttribute);
                 context.CodeWriter.Write(parameters[index].seqName);
                 context.CodeWriter.Write(", ");
 
@@ -176,7 +177,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             foreach (var setKey in node.Component.SetKeys)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.SetKey);
+                context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.SetKey);
                 context.CodeWriter.Write(parameters[index].parameterName);
                 context.CodeWriter.WriteEndMethodInvocation();
 
@@ -185,7 +186,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             foreach (var capture in node.Component.Captures)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
+                context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
                 context.CodeWriter.Write(parameters[index].seqName);
                 context.CodeWriter.Write(", ");
 
@@ -196,7 +197,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 index++;
             }
 
-            context.CodeWriter.WriteInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.CloseComponent);
+            context.CodeWriter.WriteInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.CloseComponent);
 
             writer.WriteLine("}");
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 3e41b668a2..c2ae3e539b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -334,14 +334,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 //
                 // Writes something like:
                 //
-                // builder.OpenComponent<MyComponent>(0);
-                // builder.AddAttribute(1, "Foo", ...);
-                // builder.AddAttribute(2, "ChildContent", ...);
-                // builder.SetKey(someValue);
-                // builder.AddElementCapture(3, (__value) => _field = __value);
-                // builder.CloseComponent();
+                // _builder.OpenComponent<MyComponent>(0);
+                // _builder.AddAttribute(1, "Foo", ...);
+                // _builder.AddAttribute(2, "ChildContent", ...);
+                // _builder.SetKey(someValue);
+                // _builder.AddElementCapture(3, (__value) => _field = __value);
+                // _builder.CloseComponent();
 
-                // builder.OpenComponent<TComponent>(42);
+                // _builder.OpenComponent<TComponent>(42);
                 context.CodeWriter.Write(_scopeStack.BuilderVarName);
                 context.CodeWriter.Write(".");
                 context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
@@ -383,7 +383,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     context.RenderNode(capture);
                 }
 
-                // builder.CloseComponent();
+                // _builder.CloseComponent();
                 context.CodeWriter.Write(_scopeStack.BuilderVarName);
                 context.CodeWriter.Write(".");
                 context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.CloseComponent);
@@ -502,7 +502,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(node));
             }
 
-            // builder.AddAttribute(1, "Foo", 42);
+            // _builder.AddAttribute(1, "Foo", 42);
             context.CodeWriter.Write(_scopeStack.BuilderVarName);
             context.CodeWriter.Write(".");
             context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.AddAttribute);
@@ -656,9 +656,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Writes something like:
             //
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
+            // _builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
             // OR
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
+            // _builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
             BeginWriteAttribute(context.CodeWriter, node.AttributeName);
             context.CodeWriter.Write($"({node.TypeName})(");
 
@@ -716,7 +716,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             // Looks like:
             //
-            // builder.SetKey(_keyValue);
+            // _builder.SetKey(_keyValue);
 
             var codeWriter = context.CodeWriter;
 
@@ -752,7 +752,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Looks like:
             //
-            // builder.AddMultipleAttributes(2, ...);
+            // _builder.AddMultipleAttributes(2, ...);
             context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMultipleAttributes}");
             context.CodeWriter.Write((_sourceSequence++).ToString());
             context.CodeWriter.WriteParameterSeparator();
@@ -790,9 +790,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             // Looks like:
             //
-            // builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; });
+            // _builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; });
             // OR
-            // builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementReference)__value; });
+            // _builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementReference)__value; });
             var codeWriter = context.CodeWriter;
 
             var methodName = node.IsComponentCapture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 01f7584094..d8a0e1f23a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -66,6 +66,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder";
 
+            public static readonly string BuilderParameter = "__builder";
+
             public static readonly string OpenElement = nameof(OpenElement);
 
             public static readonly string CloseElement = nameof(CloseElement);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
index 5349310415..f1d72f8763 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         private readonly Stack<ScopeEntry> _stack = new Stack<ScopeEntry>();
         private int _builderVarNumber = 1;
 
-        public string BuilderVarName { get; private set; } = "builder";
+        public string BuilderVarName { get; private set; } = ComponentsApi.RenderTreeBuilder.BuilderParameter;
 
         public void OpenComponentScope(CodeRenderingContext context, string name, string parameterName)
         {
@@ -61,8 +61,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             _builderVarNumber += delta;
             BuilderVarName = _builderVarNumber == 1
-                ? "builder"
-                : $"builder{_builderVarNumber}";
+                ? ComponentsApi.RenderTreeBuilder.BuilderParameter
+                : $"{ComponentsApi.RenderTreeBuilder.BuilderParameter}{_builderVarNumber}";
         }
 
         private class ScopeEntry
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 727f3ccca4..df812b8432 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -30,10 +30,10 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 @using Microsoft.AspNetCore.Components.Rendering;
 
 @code {
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = ""Builder is null!"";
+        if (__builder == null) output = ""Builder is null!"";
         else output = ""Builder is not null!"";
         <p>Output: @output</p>
     }
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
 @{
     var output = string.Empty;
-    if (builder == null) output = ""Builder is null!"";
+    if (__builder == null) output = ""Builder is null!"";
     else output = ""Builder is not null!"";
     <p>Output: @output</p>
 }");
@@ -85,10 +85,10 @@ namespace Test
             var generated = CompileToCSharp(@"
 @using Microsoft.AspNetCore.Components.Rendering;
 
-@{ RenderChildComponent(builder); }
+@{ RenderChildComponent(__builder); }
 
 @code {
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         <MyComponent />
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 547c5e805f..2e2d33795b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -139,7 +139,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 48460b327e..923f53aa34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index 1533d19b6e..b9c3ad0c68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1114:31,19 [33] )
+Generated Location: (1116:31,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 45baed42fd..7cb838c658 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 949d9fdfe9..019d1a5033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1112:31,17 [7] )
+Generated Location: (1114:31,17 [7] )
 |OnClick|
 
 Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1313:41,7 [91] )
+Generated Location: (1315:41,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 20491997e4..4f94884c3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index 586e4bd5fc..85bcb66ba4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1114:31,19 [32] )
+Generated Location: (1116:31,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 0b34cc25ac..0497f44ac4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 3c601ce984..a5deb24ba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1112:31,17 [7] )
+Generated Location: (1114:31,17 [7] )
 |OnClick|
 
 Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1313:41,7 [73] )
+Generated Location: (1315:41,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index cd516198d8..84cac0e8e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 78f4ffa290..1916b07cd6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2053:48,7 [50] )
+Generated Location: (2059:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 2f1cda84cc..5a00dd85eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -54,13 +54,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 966cfbe2d8..b494dcb312 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (965:25,30 [11] )
+Generated Location: (969:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1575:43,7 [65] )
+Generated Location: (1579:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index caa6b620e5..57e2130887 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index bcd31ff54f..9ecd211b8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1877:47,7 [50] )
+Generated Location: (1883:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 5f16942123..4484f1a45f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 0d8e6ff314..25c6988086 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1877:47,7 [55] )
+Generated Location: (1883:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index e43e400e9e..c8bfc0fe1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 7e14cd456e..2ef0335db5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1580:47,7 [50] )
+Generated Location: (1586:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index f829ac0bd7..e1f835a623 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index bf8f508161..febf366dee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (888:25,26 [11] )
+Generated Location: (890:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1556:46,7 [50] )
+Generated Location: (1562:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 9d39070c60..60071ceb0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -32,7 +32,7 @@ namespace Test
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 4030967002..d4819b00d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1756:48,7 [50] )
+Generated Location: (1762:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 0ff19e92b0..35ac8c9678 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -54,13 +54,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 8e68869760..28c62af7a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (965:25,30 [11] )
+Generated Location: (969:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1395:43,7 [65] )
+Generated Location: (1399:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index e43e400e9e..c8bfc0fe1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 72641274a8..94cb7ac41c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1580:47,7 [50] )
+Generated Location: (1586:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index f829ac0bd7..e1f835a623 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index d081d552df..1cc33f50d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (888:25,26 [11] )
+Generated Location: (890:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1556:46,7 [50] )
+Generated Location: (1562:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 3a2018558e..49a81abc8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index e691e6219d..bc42633054 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1580:47,7 [55] )
+Generated Location: (1586:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 810ed6f99f..555897d252 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.String>(
             __value => person.Name = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index a904dd1513..8354f5d085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (975:25,24 [11] )
+Generated Location: (977:25,24 [11] )
 |person.Name|
 
 Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1572:47,1 [37] )
+Generated Location: (1578:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 38d956a4ac..3cf27c8dbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index 5897b8735f..eb604f4eb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1088:32,19 [11] )
+Generated Location: (1090:32,19 [11] )
 |ParentValue|
 
 Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1328:40,82 [28] )
+Generated Location: (1330:40,82 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1729:51,7 [55] )
+Generated Location: (1731:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 78951333e8..2ad7e8ca39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 91589b5010..80054575f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (953:25,33 [11] )
+Generated Location: (955:25,33 [11] )
 |CurrentDate|
 
 Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1332:36,7 [77] )
+Generated Location: (1334:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 7dd6d0446a..2f9f73f9f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index dae0b62824..d491685d6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (953:25,33 [11] )
+Generated Location: (955:25,33 [11] )
 |ParentValue|
 
 Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1298:36,7 [50] )
+Generated Location: (1300:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index db56c244e7..6c72cf50ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index c171e52546..d647010517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1088:32,19 [11] )
+Generated Location: (1090:32,19 [11] )
 |ParentValue|
 
 Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1332:40,86 [28] )
+Generated Location: (1334:40,86 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1733:51,7 [55] )
+Generated Location: (1735:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index f4d8db4b4a..d132d64692 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index 0a7d23cc50..b90f2ba46c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (939:25,19 [11] )
+Generated Location: (941:25,19 [11] )
 |ParentValue|
 
 Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1284:36,7 [55] )
+Generated Location: (1286:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index f4d8db4b4a..d132d64692 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 2ac8acfa18..b9f8a07075 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (939:25,19 [11] )
+Generated Location: (941:25,19 [11] )
 |ParentValue|
 
 Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1284:36,7 [55] )
+Generated Location: (1286:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index d28f610696..58e2c3ead9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 448c878b48..10c2355493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (938:25,18 [11] )
+Generated Location: (940:25,18 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1283:36,7 [55] )
+Generated Location: (1285:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index c616fe8d74..1f93482650 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 489435051a..714d158f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (933:25,13 [11] )
+Generated Location: (935:25,13 [11] )
 |ParentValue|
 
 Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1278:36,7 [55] )
+Generated Location: (1280:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 0b86f548dc..6d964a9648 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 6de25a149d..38458c0f94 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1104:32,35 [11] )
+Generated Location: (1106:32,35 [11] )
 |ParentValue|
 
 Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1449:43,7 [44] )
+Generated Location: (1451:43,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index 148b662999..cb84e6838b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 874ba65d57..72f36493d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1104:32,35 [11] )
+Generated Location: (1106:32,35 [11] )
 |ParentValue|
 
 Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.CurrentCulture|
-Generated Location: (1364:40,102 [26] )
+Generated Location: (1366:40,102 [26] )
 |CultureInfo.CurrentCulture|
 
 Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1761:51,7 [44] )
+Generated Location: (1763:51,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index e801a7b243..752a6e8a4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  __o = context.ToLowerInvariant();
@@ -52,7 +52,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index fd7ee89fb7..880cdf737d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (844:24,2 [46] )
+Generated Location: (846:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1096:32,55 [26] )
+Generated Location: (1100:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1347:40,87 [2] )
+Generated Location: (1351:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1578:48,21 [6] )
+Generated Location: (1582:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index b8cc7871e7..ae565ac6c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  __o = context.ToLowerInvariant();
@@ -52,10 +52,10 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index fd7ee89fb7..880cdf737d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (844:24,2 [46] )
+Generated Location: (846:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1096:32,55 [26] )
+Generated Location: (1100:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1347:40,87 [2] )
+Generated Location: (1351:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1578:48,21 [6] )
+Generated Location: (1582:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index dc2dac17bb..afb7769b91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index e997565427..ca548a7cfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (951:25,31 [7] )
+Generated Location: (953:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1284:36,7 [41] )
+Generated Location: (1286:36,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 00f5a97b52..ebaa5698f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 8f1f1c6619..34b78741d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (935:25,15 [11] )
+Generated Location: (937:25,15 [11] )
 |CurrentDate|
 
 Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1314:36,7 [77] )
+Generated Location: (1316:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 5fb0a7cd4a..88df4b2931 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 835b635c0a..a90f46fda1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (947:25,27 [11] )
+Generated Location: (949:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1159:33,55 [6] )
+Generated Location: (1161:33,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1515:44,7 [135] )
+Generated Location: (1517:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 7e352b7b7b..f71815f894 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index a4b37c2bc1..6e175bf68d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (947:25,27 [11] )
+Generated Location: (949:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1336:36,7 [77] )
+Generated Location: (1338:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index e46b8f8a75..8bb172e78b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 2fe7d40c8b..4eb477f456 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (947:25,27 [11] )
+Generated Location: (949:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1292:36,7 [50] )
+Generated Location: (1294:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 8f8f38a493..703bc0e0ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 6dadc5b907..5d2ae4e43d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,29 [11] )
+Generated Location: (951:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1474:36,7 [77] )
+Generated Location: (1476:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index bbc5650b3e..b15ddfef53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 692901b204..341e1eea38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,29 [11] )
+Generated Location: (951:25,29 [11] )
 |CurrentDate|
 
 Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1328:36,7 [77] )
+Generated Location: (1330:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 22dd0004d0..63f4552487 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 719bedbe88..b443bef47e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,29 [11] )
+Generated Location: (951:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1338:36,7 [77] )
+Generated Location: (1340:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 8e70500f8d..f883f7afd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 8a5130396b..3bcfc76cdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (941:25,21 [11] )
+Generated Location: (943:25,21 [11] )
 |CurrentDate|
 
 Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:36,7 [77] )
+Generated Location: (1322:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 8e70500f8d..f883f7afd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 70dbb75c76..073152fdb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (941:25,21 [11] )
+Generated Location: (943:25,21 [11] )
 |CurrentDate|
 
 Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:36,7 [77] )
+Generated Location: (1322:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index c248a459f6..29c1053e5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index bab09f9912..876a9ff033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (877:25,15 [11] )
+Generated Location: (879:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1081:35,7 [50] )
+Generated Location: (1083:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 5d49497d9e..a0f1f280f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index b51bf566b7..f6c8f0bf36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (935:25,15 [11] )
+Generated Location: (937:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1280:36,7 [50] )
+Generated Location: (1282:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 3da83553d0..68a2080324 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index 9d5b691569..7ec03d3ee7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1168:34,34 [4] )
+Generated Location: (1170:34,34 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index a098d9e32c..bc51fcd9ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -40,7 +40,7 @@ namespace Test
             );
             __o = new System.Action<string>(
             __value => Value = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index e976cfb03a..9f0f4fc7de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1171:34,37 [5] )
+Generated Location: (1173:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1759:56,7 [21] )
+Generated Location: (1765:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 4f2abfab38..a5df564c24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -39,7 +39,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 9bbe256d34..a3dae2375d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1089:34,37 [5] )
+Generated Location: (1091:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1741:55,7 [21] )
+Generated Location: (1747:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 454b7d2a9c..4f7323a5d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       18
@@ -61,13 +61,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddAttribute(__seq1, "Item", __arg1);
-        builder.AddAttribute(__seq2, "ItemChanged", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddAttribute(__seq1, "Item", __arg1);
+        __builder.AddAttribute(__seq2, "ItemChanged", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 95440a4ee9..61ebc61d7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (973:25,38 [2] )
+Generated Location: (977:25,38 [2] )
 |18|
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1141:33,24 [5] )
+Generated Location: (1145:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1628:50,7 [21] )
+Generated Location: (1632:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 0e6ba77c0f..b64f5abb07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -37,7 +37,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -71,19 +71,19 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 8afcca9abf..674ff91c47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (959:25,24 [5] )
+Generated Location: (963:25,24 [5] )
 |Value|
 
 Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1415:42,24 [5] )
+Generated Location: (1421:42,24 [5] )
 |Value|
 
 Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1810:60,7 [21] )
+Generated Location: (1816:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 417b88619b..749e03142d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
   __o = context.ToLower();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index 3b1d7bc164..8a754a980e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1168:34,34 [4] )
+Generated Location: (1170:34,34 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1458:43,8 [17] )
+Generated Location: (1464:43,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index c8891e6e3d..d13dc319a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
   __o = context.ToLower();
@@ -54,12 +54,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
index 66b1b155f8..1f4ebd3b11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1138:33,8 [17] )
+Generated Location: (1144:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index bbe3d42ee7..dcdd42885f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -47,7 +47,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index 091fffaf62..7d02d0f497 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1168:34,34 [4] )
+Generated Location: (1170:34,34 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1380:43,50 [2] )
+Generated Location: (1382:43,50 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 79cb17807a..12f3793bd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -53,12 +53,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Other", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Other", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
index a0f15c9c14..4b634587b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1139:33,37 [2] )
+Generated Location: (1143:33,37 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index c22f8cbecc..a4f1ef9faf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -45,11 +45,11 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
index 852bb94b3e..91992ce60b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 021408fb65..e3c32b785d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -36,7 +36,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "how are you?"
@@ -52,7 +52,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(__builder, -1, -1, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "bye!"
@@ -77,23 +77,23 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
index 0a0bec7b18..a1d9146951 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |"how are you?"|
-Generated Location: (1362:41,21 [14] )
+Generated Location: (1368:41,21 [14] )
 |"how are you?"|
 
 Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1778:57,21 [6] )
+Generated Location: (1786:57,21 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 9ed07ea5b0..763208227c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -25,11 +25,11 @@ using Microsoft.AspNetCore.Components.Rendering;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-   RenderChildComponent(builder); 
+   RenderChildComponent(__builder); 
 
 #line default
 #line hidden
@@ -39,14 +39,14 @@ using Microsoft.AspNetCore.Components.Rendering;
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         
 
 #line default
 #line hidden
 #nullable disable
-        builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+        __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
         }
         ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index a132a6a8c3..898fc12d48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -17,12 +17,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                CSharpCode - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-                HtmlContent - (90:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (90:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
-            Component - (174:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            CSharpCode - (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+                CSharpCode - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(__builder); 
+                HtmlContent - (92:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (92:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        
+            Component - (178:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            CSharpCode - (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 841ddac01f..29fd9cd544 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -3,27 +3,27 @@ Source Location: (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [48] )
 |using Microsoft.AspNetCore.Components.Rendering;|
 
-Source Location: (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-| RenderChildComponent(builder); |
-Generated Location: (1014:31,2 [32] )
-| RenderChildComponent(builder); |
+Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(__builder); |
+Generated Location: (1016:31,2 [34] )
+| RenderChildComponent(__builder); |
 
-Source Location: (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         |
-Generated Location: (1224:40,7 [75] )
+Generated Location: (1228:40,7 [77] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         |
 
-Source Location: (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1731:60,23 [9] )
+Generated Location: (1741:60,23 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index f5df579563..3bb8afce2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -37,7 +37,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 8ae3049e0e..109a769b74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
         |
-Generated Location: (1015:31,2 [50] )
+Generated Location: (1017:31,2 [50] )
 |
     void RenderChildComponent()
     {
@@ -18,13 +18,13 @@ Source Location: (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1509:51,23 [9] )
+Generated Location: (1515:51,23 [9] )
 |
     }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1640:59,2 [25] )
+Generated Location: (1646:59,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 1d749a96e7..7af1cd161e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -47,7 +47,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                 __o = context.ToLower();
@@ -57,7 +57,7 @@ namespace Test
 #nullable disable
             }
             ));
-            builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
+            __builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (__builder2) => {
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = System.Math.Max(0, item.Item);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index d9a5f6e72d..a013914c8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,20 [6] )
+Generated Location: (891:25,20 [6] )
 |string|
 
 Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1094:34,34 [3] )
+Generated Location: (1096:34,34 [3] )
 |int|
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1383:43,46 [4] )
+Generated Location: (1385:43,46 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1687:52,22 [17] )
+Generated Location: (1693:52,22 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2040:62,6 [29] )
+Generated Location: (2050:62,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 0c2fade130..208c80726f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -36,7 +36,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                 __o = context.ToLower();
@@ -45,7 +45,7 @@ namespace Test
 #line hidden
 #nullable disable
             }
-            , -1, (item) => (builder2) => {
+            , -1, (item) => (__builder2) => {
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = System.Math.Max(0, item.Item);
@@ -71,14 +71,14 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Items", __arg1);
-        builder.AddAttribute(__seq2, "ChildContent", __arg2);
-        builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Items", __arg1);
+        __builder.AddAttribute(__seq2, "ChildContent", __arg2);
+        __builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
index f4478eabf1..f426774039 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |new List<long>()|
-Generated Location: (1138:33,36 [16] )
+Generated Location: (1142:33,36 [16] )
 |new List<long>()|
 
 Source Location: (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1346:41,22 [17] )
+Generated Location: (1352:41,22 [17] )
 |context.ToLower()|
 
 Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (1552:50,6 [29] )
+Generated Location: (1560:50,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 8494b36875..4837552cab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
               __o = context.ToLower();
@@ -37,7 +37,7 @@ namespace Test
 #line hidden
 #nullable disable
             }
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
           __o = context;
@@ -63,13 +63,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
-        builder.AddAttribute(__seq2, "IntFragment", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        __builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
index 4f31e4fe0f..d71bd72c42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1150:33,20 [17] )
+Generated Location: (1156:33,20 [17] )
 |context.ToLower()|
 
 Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1369:42,16 [7] )
+Generated Location: (1377:42,16 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index dde890cc2e..0ac21533e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 2f15506ae8..79da952af0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index dde890cc2e..0ac21533e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index dde890cc2e..0ac21533e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 36c7b0de76..b1dfdbee8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 4e1f8a4138..12601265bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (948:25,23 [9] )
+Generated Location: (950:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1450:45,7 [100] )
+Generated Location: (1456:45,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 0d0b314ef1..24df5d5d96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                       __o = context;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
index 744da74245..886078a3e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1017:25,28 [7] )
+Generated Location: (1023:25,28 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 0b7949f0b7..8a92d8e5be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index 816bbc1ae0..bfc910e3cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (982:25,31 [13] )
+Generated Location: (984:25,31 [13] )
 |42.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 4644861321..820652633e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                 __o = context.ToLowerInvariant();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
index ab0cf79bc6..2ffb89de20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1066:26,54 [26] )
+Generated Location: (1072:26,54 [26] )
 |context.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index 50ac169c11..a3634216a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                           __o = item.ToLowerInvariant();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
index 30fe7a2267..d146087517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1041:26,32 [23] )
+Generated Location: (1047:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index 50ac169c11..a3634216a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                           __o = item.ToLowerInvariant();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
index 30fe7a2267..d146087517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1041:26,32 [23] )
+Generated Location: (1047:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 83bacb072a..30c2e33e4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index fc4d01e139..1af432007d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (949:25,24 [21] )
+Generated Location: (951:25,24 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1463:45,7 [87] )
+Generated Location: (1469:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 19e66f1a19..47210e050e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = 
@@ -30,7 +30,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
index 788029e013..e34837f351 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |43.ToString()|
-Generated Location: (940:26,55 [13] )
+Generated Location: (942:26,55 [13] )
 |43.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index 560268f131..b5992d9e8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -40,9 +40,9 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 74fc1e1b5b..15f0710ed8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -48,7 +48,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index da26341ee3..13c6f4aba3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (967:25,17 [3] )
+Generated Location: (969:25,17 [3] )
 |123|
 
 Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1236:34,18 [4] )
+Generated Location: (1238:34,18 [4] )
 |true|
 
 Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (1530:44,20 [14] )
+Generated Location: (1532:44,20 [14] )
 |new SomeType()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index c8e33d4d32..f6933a3843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index ea1039bf53..72848bac9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1005:25,26 [7] )
+Generated Location: (1007:25,26 [7] )
 |OnClick|
 
 Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1508:45,7 [62] )
+Generated Location: (1514:45,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index d488f71680..4d90da0a66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using AnotherTest;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -37,7 +37,7 @@ __o = typeof(HeaderComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
        __o = context;
@@ -54,7 +54,7 @@ __o = typeof(FooterComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -64,7 +64,7 @@ __o = typeof(Test.HeaderComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
 #nullable restore
 #line 13 "x:\dir\subdir\Test\TestComponent.cshtml"
        __o = context;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
index 16c41bfe9f..2facaeab6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1435:42,13 [7] )
+Generated Location: (1445:42,13 [7] )
 |context|
 
 Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (2208:69,13 [7] )
+Generated Location: (2226:69,13 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index 7e4c43943f..fcccf73b5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index 0ad10bed01..6e8856f24e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (977:25,27 [11] )
+Generated Location: (979:25,27 [11] )
 |"very-cool"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index e49dbc9754..fd817fd0b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ global::System.Object TItem2 = null!;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index ca78b976c0..626321cc28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -17,20 +17,20 @@ Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
     |
-Generated Location: (1413:50,1 [38] )
+Generated Location: (1415:50,1 [38] )
 |foreach (var item2 in Items2)
 {
     |
 
 Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildContent(item2)|
-Generated Location: (1579:59,6 [19] )
+Generated Location: (1581:59,6 [19] )
 |ChildContent(item2)|
 
 Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1730:66,8 [3] )
+Generated Location: (1732:66,8 [3] )
 |
 }|
 
@@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1912:76,7 [185] )
+Generated Location: (1914:76,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index a2e10ffeb3..de8fb88166 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -32,9 +32,9 @@ using Foo = Test3;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 9aca88538e..b18ce55394 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -40,7 +40,7 @@ __o = typeof(MyComponent);
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index 80f6ce0e68..5f5c3fccdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1317:36,43 [4] )
+Generated Location: (1323:36,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 3446885aa2..090642d184 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -48,7 +48,7 @@ __o = typeof(MyComponent);
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index 00ee2bedd8..23e9abd843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (976:25,26 [1] )
+Generated Location: (978:25,26 [1] )
 |1|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1548:44,26 [1] )
+Generated Location: (1554:44,26 [1] )
 |2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index 03daf5c7c0..ac01a589cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -32,9 +32,9 @@ using System.Reflection;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 999f0c3bd3..022aa82fcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -42,9 +42,9 @@ global::System.Object __typeHelper = nameof(New.Test);
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index ec17594d73..871aff83f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 45475919ac..2ccb2c7033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (1138:34,1 [18] )
+Generated Location: (1144:34,1 [18] )
 |if (true)
 {
     |
@@ -10,7 +10,7 @@ Generated Location: (1138:34,1 [18] )
 Source Location: (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1316:43,38 [3] )
+Generated Location: (1322:43,38 [3] )
 |
 }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index c313ad5852..fe5bbc7cc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -30,7 +30,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -40,7 +40,7 @@ __o = typeof(Test.MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 5e7e2fe184..bcdaaceb08 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 6487d39922..4a28e67157 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => Increment()|
-Generated Location: (1002:25,23 [17] )
+Generated Location: (1004:25,23 [17] )
 |() => Increment()|
 
 Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1512:45,7 [87] )
+Generated Location: (1518:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 30cba555f0..6b2c4db765 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -39,9 +39,9 @@ using System.Reflection;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index b9d46dab0f..1ffc621022 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -18,14 +18,14 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         someDate.Day
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 8d917739f6..1f2a201d47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1108:30,40 [12] )
+Generated Location: (1116:30,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1462:47,7 [49] )
+Generated Location: (1470:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 874c3271e3..b26e07ae5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -18,13 +18,13 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    123 + 456
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index 9666aeab91..be1d874768 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1064:29,19 [9] )
+Generated Location: (1072:29,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 3dc7bb502f..ba2bab42ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -35,10 +35,10 @@ global::System.Object __typeHelper = nameof(AnotherTest);
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -49,7 +49,7 @@ __o = typeof(HeaderComponent);
 #line hidden
 #nullable disable
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 02b5be91d3..ee79e51bc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -23,11 +23,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index f38cfcc491..58fd008a0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1277:34,40 [10] )
+Generated Location: (1283:34,40 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
index 59fc9bfd74..ba331d501d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
index 97edd3de66..9b23b9d6be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1012:27,19 [10] )
+Generated Location: (1018:27,19 [10] )
 |myInstance|
 
 Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
 |
-Generated Location: (1377:43,7 [81] )
+Generated Location: (1383:43,7 [81] )
 |
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 2b89b0e462..94157bb880 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -23,10 +23,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 5aaca7dcaf..e79503fbd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1233:33,19 [10] )
+Generated Location: (1239:33,19 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index 5f76446c9b..e63835fdbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                    someAttributes
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             ));
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index 56e7ead145..e350d50bba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1151:26,51 [14] )
+Generated Location: (1155:26,51 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1682:47,7 [93] )
+Generated Location: (1690:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 9a20e372f0..437aa936f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                      someAttributes
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             ));
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index d7fcdaefc3..1071f34353 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1153:26,53 [14] )
+Generated Location: (1157:26,53 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1684:47,7 [93] )
+Generated Location: (1692:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 3e4fe0bef0..2b30a0fc0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                     18
@@ -61,12 +61,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddMultipleAttributes(__seq1, __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddMultipleAttributes(__seq1, __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 65ebdf23f8..a4d068708f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (955:25,20 [2] )
+Generated Location: (959:25,20 [2] )
 |18|
 
 Source Location: (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1138:33,39 [14] )
+Generated Location: (1142:33,39 [14] )
 |someAttributes|
 
 Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1496:50,7 [93] )
+Generated Location: (1500:50,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 734d086f28..d31201916b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                     someAttributes
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             ));
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index b10d0114a5..e6f880d0aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1152:26,52 [14] )
+Generated Location: (1156:26,52 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1683:47,7 [93] )
+Generated Location: (1691:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 9822867259..3243bc0179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -47,9 +47,9 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -59,7 +59,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 9b337e5ab2..d60d215ff3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -32,9 +32,9 @@ using Test3;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -44,7 +44,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index cc55ac39bd..6c8eb2ea9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 2fa9526204..5c3c63a812 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (844:24,2 [40] )
+Generated Location: (846:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1067:33,43 [7] )
+Generated Location: (1069:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index cc20229deb..02c86e143a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 0c1de99d68..7ec86b882d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (844:24,2 [40] )
+Generated Location: (846:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1066:33,42 [7] )
+Generated Location: (1068:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index 64aea3bdf8..1a7c0465eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 3dc0845f68..8d0f8e9df3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
@@ -41,7 +41,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 82ce79657e..ecd295ad1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (974:25,23 [7] )
+Generated Location: (976:25,23 [7] )
 |message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1276:34,48 [7] )
+Generated Location: (1278:34,48 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2347:57,12 [30] )
+Generated Location: (2353:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 5b75176677..7652aed053 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
@@ -41,7 +41,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index ca012e2038..626a5a0bb8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1111:25,31 [9] )
+Generated Location: (1113:25,31 [9] )
 |(s) => {}|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1427:34,59 [7] )
+Generated Location: (1429:34,59 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2498:57,12 [30] )
+Generated Location: (2504:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index b95c4615ca..8ebc97e75f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
@@ -41,7 +41,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 75294b0867..2784a10f15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1061:25,59 [9] )
+Generated Location: (1063:25,59 [9] )
 |(s) => {}|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1346:34,29 [7] )
+Generated Location: (1348:34,29 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2417:57,12 [30] )
+Generated Location: (2423:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 9aadc7cd87..a5a20e720c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -18,12 +18,12 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 64aea3bdf8..1a7c0465eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index ba2d7a710e..cc9599e104 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 73ec689245..7262a51e39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (960:25,40 [4] )
+Generated Location: (962:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1289:36,12 [35] )
+Generated Location: (1291:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index e86a875a57..e8d5d697b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 08b8891cf5..7e3beb221b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1059:25,79 [8] )
+Generated Location: (1061:25,79 [8] )
 |() => {}|
 
 Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1318:34,35 [4] )
+Generated Location: (1320:34,35 [4] )
 |text|
 
 Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1647:45,12 [35] )
+Generated Location: (1649:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index ba2d7a710e..cc9599e104 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 73ec689245..7262a51e39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (960:25,40 [4] )
+Generated Location: (962:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1289:36,12 [35] )
+Generated Location: (1291:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 2e83debf77..5959396c75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index 9bcf8f3bac..6c41f0d357 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1011:25,32 [8] )
+Generated Location: (1013:25,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 6575ae18b9..90ef6d42f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      someObject
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index dfe8518ea3..151176cd4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (908:25,37 [10] )
+Generated Location: (912:25,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1112:35,7 [49] )
+Generated Location: (1116:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index e586d5dc74..b8c949ec27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  someObject
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index eba4da55cb..25deb5f4b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (899:25,37 [3] )
+Generated Location: (901:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (1117:34,49 [10] )
+Generated Location: (1121:34,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1321:44,7 [109] )
+Generated Location: (1325:44,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index b5ef29cad8..4d3ac61da7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index b979f4bec6..5fcd706664 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (898:26,7 [49] )
+Generated Location: (900:26,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index d6984c4cca..5d2a1913e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 40762af3ef..a5390e3ed9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1113:29,37 [6] )
+Generated Location: (1115:29,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 898891eba6..51761425a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 30ffe3483c..809182470a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (1135:30,37 [3] )
+Generated Location: (1137:30,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1324:38,49 [8] )
+Generated Location: (1326:38,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1571:47,7 [56] )
+Generated Location: (1573:47,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 4a47e227b5..e806b81275 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index 61d9afb4aa..c3556e4657 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (854:24,12 [6] )
+Generated Location: (856:24,12 [6] )
 |myElem|
 
 Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1099:33,7 [78] )
+Generated Location: (1101:33,7 [78] )
 |
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 92801f90c7..27d46dcac7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 699da77b3c..745f25995e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1121:25,44 [14] )
+Generated Location: (1125:25,44 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1330:35,7 [93] )
+Generated Location: (1334:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 29ecb11ac4..21eb746abd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index b52c63a35a..3d403febff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (898:26,7 [93] )
+Generated Location: (900:26,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index e62c265c8c..c46b76cf90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index ef011d8d30..8089ffd525 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1123:25,46 [14] )
+Generated Location: (1127:25,46 [14] )
 |someAttributes|
 
 Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1332:35,7 [93] )
+Generated Location: (1336:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 0fe2ec1669..b246c7fd8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                              someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 1ffb2d7a1e..bb7f972a65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1122:25,45 [14] )
+Generated Location: (1126:25,45 [14] )
 |someAttributes|
 
 Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1331:35,7 [93] )
+Generated Location: (1335:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 6d3df11ae0..613b9c90be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index edf202f444..f1bbda428f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
-Generated Location: (1174:25,24 [63] )
+Generated Location: (1176:25,24 [63] )
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
 
 Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1731:45,7 [87] )
+Generated Location: (1737:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index ba3c0df771..cb5bbaf9e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 664023c96d..6785ec354b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1676:45,7 [87] )
+Generated Location: (1682:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 3f30798d58..1993bb3081 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 3f47a85041..eeb8da148b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1676:45,7 [105] )
+Generated Location: (1682:45,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index c2260f5a91..a8937ccdd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index f60cc20e9b..293a85f387 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1676:45,7 [141] )
+Generated Location: (1682:45,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 80c94c1a7f..e146803ca1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 3b5e7dfb65..1cf26fd915 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1676:45,7 [123] )
+Generated Location: (1682:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 668cf7aacd..402b5e2577 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index d7a5086f12..6be3c367a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1676:45,7 [106] )
+Generated Location: (1682:45,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 15a6dd7dd8..954e9007b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 9efcd4e8a0..9bdd713f1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1074:25,24 [45] )
+Generated Location: (1076:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1613:45,7 [87] )
+Generated Location: (1619:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 76d5e4cdb3..5003d15f3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 452bdef052..8a1f8344d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1576:45,7 [87] )
+Generated Location: (1582:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 86a1be0e8a..fa5a6c4e59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index e0a8638ef0..d04825c09f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1576:45,7 [95] )
+Generated Location: (1582:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 945da89171..3afaaad32b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index a6ba5e325c..61213c43c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1576:45,7 [123] )
+Generated Location: (1582:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index debc6e6d9e..f070a61d20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 9cd43d6257..84a885f977 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1576:45,7 [131] )
+Generated Location: (1582:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index c8554c06ce..42cde47e64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 92b4a9dea0..42198cd134 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (898:26,7 [49] )
+Generated Location: (900:26,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 7cbacfd354..5a369347e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 2da3e9977e..004a4b3064 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1197:35,7 [44] )
+Generated Location: (1199:35,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index f47157320b..df2ee06b5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index f9f1878532..12c73d9850 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1197:35,7 [49] )
+Generated Location: (1199:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 0e89232916..cacf184f71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 76f1046de7..0b0c2d59a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (996:25,17 [8] )
+Generated Location: (998:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index f47157320b..df2ee06b5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index f9f1878532..12c73d9850 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1197:35,7 [49] )
+Generated Location: (1199:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 0e89232916..cacf184f71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
index 76f1046de7..0b0c2d59a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (996:25,17 [8] )
+Generated Location: (998:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 74f406d1d9..09c791040d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index be2fc21ceb..6277f4b8b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1197:35,7 [31] )
+Generated Location: (1199:35,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 0694f9ab45..0470de96c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index cf404ce9f4..e847cd4baf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (996:25,17 [9] )
+Generated Location: (998:25,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 6d96332596..7090ffb026 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
index d4e36b5bbf..8584530928 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |(int x) => {}|
-Generated Location: (1328:40,31 [13] )
+Generated Location: (1332:40,31 [13] )
 |(int x) => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index fcd22ff1cf..32a5e149aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
index ff8f8bdd6b..458b346f18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1346:40,31 [7] )
+Generated Location: (1350:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index ec34ae46b9..36d80f3477 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
index c1e1122d16..6db713282c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1435:40,31 [7] )
+Generated Location: (1439:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index b4b5ccbb6d..abeb020cc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 97cd8d797e..5da6791c80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1328:40,31 [7] )
+Generated Location: (1332:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 35b55407f4..b3788a98f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test.Shared;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -68,12 +68,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Foo", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Foo", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 3267e1f7a0..37ca1aa1d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1094:32,19 [1] )
+Generated Location: (1098:32,19 [1] )
 |3|
 
 Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Hello|
-Generated Location: (1265:40,28 [5] )
+Generated Location: (1269:40,28 [5] )
 |Hello|
 
 Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1614:57,7 [38] )
+Generated Location: (1618:57,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 2e6fc46cd6..c7d9b20432 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index 0ad84ada11..d0bf71a61d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (888:25,19 [3] )
+Generated Location: (890:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1157:34,29 [1] )
+Generated Location: (1159:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1485:45,38 [3] )
+Generated Location: (1491:45,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +18,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1850:61,7 [72] )
+Generated Location: (1856:61,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
index e875e1ec85..80c6779224 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -63,12 +63,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 967253cab8..868efd46b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (954:25,19 [1] )
+Generated Location: (958:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1139:33,28 [3] )
+Generated Location: (1143:33,28 [3] )
 |_my|
 
 Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1512:51,7 [90] )
+Generated Location: (1516:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index 0b2318995b..d3d98b440d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           "hi"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
   __o = context.ToLower();
@@ -54,12 +54,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
index 4e35880801..eed197611e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (966:25,26 [4] )
+Generated Location: (970:25,26 [4] )
 |"hi"|
 
 Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1148:33,8 [17] )
+Generated Location: (1154:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 8fb8b4ff6a..6033862880 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,10 +38,10 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _someKey
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 05288725a2..9f7368292f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (888:25,19 [3] )
+Generated Location: (890:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1157:34,29 [1] )
+Generated Location: (1159:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1514:46,38 [8] )
+Generated Location: (1522:46,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1866:63,7 [47] )
+Generated Location: (1874:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 025cd7b4e2..7f84ecedc2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -61,12 +61,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.SetKey(__arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.SetKey(__arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 4f78550549..9093430ce1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (954:25,19 [1] )
+Generated Location: (958:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1125:33,28 [8] )
+Generated Location: (1129:33,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1477:50,7 [47] )
+Generated Location: (1481:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 7257a0f006..83a65c13b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 0189feb978..95c444b36c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (848:24,6 [10] )
+Generated Location: (850:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 4a0472cf98..5cbcb559fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index d9d6bfb99a..6676cb0502 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 60cc65d78b..8bdbb60f09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 4ca7a1cdcb..cc263bb7da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (844:24,2 [40] )
+Generated Location: (846:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1010:32,6 [7] )
+Generated Location: (1012:32,6 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 19cc40abc0..9295208389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -18,12 +18,12 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
         __o = "bye!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
index 1af0850412..3a33c2a08a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1114:28,14 [6] )
+Generated Location: (1124:28,14 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 4d182075ef..a38b595d69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index b206d1f78f..db6e74ad1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (1243:38,7 [39] )
+Generated Location: (1249:38,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index dd2b63f012..af1c571a8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                          __o = context.Index;
@@ -59,7 +59,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index f06cba0e8f..7cef5a2c1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (844:24,2 [54] )
+Generated Location: (846:24,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Index|
-Generated Location: (1112:32,63 [13] )
+Generated Location: (1116:32,63 [13] )
 |context.Index|
 
 Source Location: (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Item.ToLower()|
-Generated Location: (1328:39,80 [22] )
+Generated Location: (1332:39,80 [22] )
 |context.Item.ToLower()|
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1595:47,107 [2] )
+Generated Location: (1599:47,107 [2] )
 |; |
 
 Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1828:55,24 [8] )
+Generated Location: (1832:55,24 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 7933128082..7bbc4fe7a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
                 __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => {
+                __builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                 }
                 ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index eb34a7ef37..3661589ffb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (844:24,2 [45] )
+Generated Location: (846:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1222:34,69 [11] )
+Generated Location: (1226:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1791:53,89 [3] )
+Generated Location: (1799:53,89 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1970:62,7 [76] )
+Generated Location: (1978:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 1654ca840f..b2d64c6017 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
                 __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => {
+                __builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                 }
                 ));
 #nullable restore
@@ -56,7 +56,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = "hello, world!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 40d02b867f..96e3449c79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (844:24,2 [45] )
+Generated Location: (846:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1222:34,69 [11] )
+Generated Location: (1226:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1791:53,89 [3] )
+Generated Location: (1799:53,89 [3] )
 |;
 |
 
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2039:61,6 [15] )
+Generated Location: (2051:61,6 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +29,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2413:79,7 [76] )
+Generated Location: (2425:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 99b59b0bc4..a6a1643d45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                   __o = person.Name;
@@ -52,7 +52,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index bd5969c2c9..8f8fa4f40f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (844:24,2 [47] )
+Generated Location: (846:24,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1098:32,56 [11] )
+Generated Location: (1102:32,56 [11] )
 |person.Name|
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1320:40,73 [2] )
+Generated Location: (1324:40,73 [2] )
 |; |
 
 Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1558:48,30 [8] )
+Generated Location: (1562:48,30 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 04251fe231..ba72315905 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = RenderPerson((person) => (builder2) => {
+__o = RenderPerson((person) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            __o = person.Name;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index ecb23ac7da..2f65973e87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (848:24,6 [25] )
+Generated Location: (850:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (993:27,33 [11] )
+Generated Location: (997:27,33 [11] )
 |person.Name|
 
 Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1060:33,0 [1] )
+Generated Location: (1064:33,0 [1] )
 |)|
 
 Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1240:42,7 [138] )
+Generated Location: (1244:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index f7cccb3817..0f5c223833 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             __o = person.Name;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index 7d281e987e..f839f8e262 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (844:24,2 [45] )
+Generated Location: (846:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1090:33,50 [11] )
+Generated Location: (1094:33,50 [11] )
 |person.Name|
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1306:41,67 [3] )
+Generated Location: (1310:41,67 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1485:50,7 [76] )
+Generated Location: (1489:50,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 0839dfd109..3093889906 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = RenderPerson((person) => (builder2) => {
+__o = RenderPerson((person) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                             __o = person.Name;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index d112e12c33..6dc660afd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (848:24,6 [25] )
+Generated Location: (850:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (994:27,34 [11] )
+Generated Location: (998:27,34 [11] )
 |person.Name|
 
 Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1061:33,0 [1] )
+Generated Location: (1065:33,0 [1] )
 |)|
 
 Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1241:42,7 [138] )
+Generated Location: (1245:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 7918f9a68a..605c196eca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -45,7 +45,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 8f166291bd..e68b9e7c4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (844:24,2 [27] )
+Generated Location: (846:24,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1082:33,45 [2] )
+Generated Location: (1086:33,45 [2] )
 |; |
 
 Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1248:41,22 [8] )
+Generated Location: (1252:41,22 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 548bffc3e0..6495fb500f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = RenderPerson((builder2) => {
+__o = RenderPerson((__builder2) => {
 }
 );
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index a6ae1646f9..d7620053b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson(|
-Generated Location: (848:24,6 [13] )
+Generated Location: (850:24,6 [13] )
 |RenderPerson(|
 
 Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (881:26,0 [1] )
+Generated Location: (885:26,0 [1] )
 |)|
 
 Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1061:35,7 [54] )
+Generated Location: (1065:35,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index fe5a170c8d..afa761f1ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 1c1fbfb856..62902491e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (880:25,18 [1] )
+Generated Location: (882:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1514:46,7 [24] )
+Generated Location: (1520:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 922fb53d73..d181ad3baa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -40,7 +40,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index b12bc957cd..6f6d5c5392 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (881:25,19 [8] )
+Generated Location: (883:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1251:35,46 [12] )
+Generated Location: (1253:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1915:56,7 [88] )
+Generated Location: (1921:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index bab0c1c0ca..020c4b2ffd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -29,10 +29,10 @@ global::System.Object __typeHelper = "/";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index bab0c1c0ca..020c4b2ffd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -29,10 +29,10 @@ global::System.Object __typeHelper = "/";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 42bef13ef3..6d0d7b4270 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index e362010a8c..a8eca1cffb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (996:25,17 [16] )
+Generated Location: (998:25,17 [16] )
 |OnComponentHover|
 
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1225:34,55 [13] )
+Generated Location: (1227:34,55 [13] )
 |ParentBgColor|
 
 Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -16,7 +16,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1431:44,7 [132] )
+Generated Location: (1433:44,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index ea9914ac6c..076898ac35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -25,13 +25,13 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
   
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 18ceaf1ef4..b79bd17799 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -17,12 +17,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                CSharpCode - (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n    
-                MarkupElement - (192:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlContent - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                    CSharpExpression - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-                CSharpCode - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n
+                CSharpCode - (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n    
+                MarkupElement - (194:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                    CSharpExpression - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+                CSharpCode - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index f6ed19837c..894c267cc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -3,28 +3,28 @@ Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [49] )
 |using Microsoft.AspNetCore.Components.RenderTree;|
 
-Source Location: (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
-Generated Location: (1015:31,2 [136] )
+Generated Location: (1017:31,2 [138] )
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
 
-Source Location: (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1289:42,16 [6] )
+Generated Location: (1293:42,16 [6] )
 |output|
 
-Source Location: (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1386:47,38 [2] )
+Generated Location: (1390:47,38 [2] )
 |
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index ed37182928..f06361ba0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -25,17 +25,17 @@ using Microsoft.AspNetCore.Components.Rendering;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index d45e66c9e5..42c3660ca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -17,12 +17,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
-            MarkupElement - (277:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                HtmlContent - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                CSharpExpression - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-            CSharpCode - (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+            CSharpCode - (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        var output = string.Empty;\n        if (__builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
+            MarkupElement - (281:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            CSharpCode - (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index c5b6635948..0e616a2a32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -3,33 +3,33 @@ Source Location: (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [48] )
 |using Microsoft.AspNetCore.Components.Rendering;|
 
-Source Location: (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
-Generated Location: (1068:33,7 [217] )
+Generated Location: (1070:33,7 [221] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
 
-Source Location: (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1427:46,20 [6] )
+Generated Location: (1433:46,20 [6] )
 |output|
 
-Source Location: (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1586:53,30 [9] )
+Generated Location: (1592:53,30 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 1e00f4d61b..ad8aa14710 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 02bfc33179..8eacd0f0e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (848:24,6 [10] )
+Generated Location: (850:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 25d0d98bde..28fe1e3b44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index e5449ebf15..b2571c3cd6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ global::System.Object __typeHelper = "/my/url";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 0fd95f0805..92ff4bb6b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index e43d3b2722..9a0ef8f6c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (874:25,12 [3] )
+Generated Location: (876:25,12 [3] )
 |Foo|
 
 Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1074:35,11 [29] )
+Generated Location: (1076:35,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 63a7e59529..ef6da3215c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async (e) => await Task.Delay(10)
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 2c796d844e..cbedf87f52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 81e01c5c95..7e21507a0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1158:36,7 [91] )
+Generated Location: (1166:36,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 714d26a99b..78afedb132 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async () => await Task.Delay(10)
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index fbca736edf..6ae61c727e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 1abd6d601a..a41ae9f1a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1158:36,7 [73] )
+Generated Location: (1166:36,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 624d744229..5cd6084037 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
-            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            __builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 0b701bd0b7..d6bdff1db6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1669:32,7 [50] )
+Generated Location: (1681:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 3e69e7d838..814786e547 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -39,13 +39,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 9eff84309e..dc0537f1c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1139:28,7 [65] )
+Generated Location: (1143:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 3337fd6840..4446948e63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 87947287ce..be126a558b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1455:31,7 [50] )
+Generated Location: (1465:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 12173260d3..e538b50f99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 623b666988..8436b299b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1455:31,7 [55] )
+Generated Location: (1465:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index a3f4c64b04..30a38342d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 370629cb01..aa6d34cc88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1155:31,7 [50] )
+Generated Location: (1165:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 182f96b4cd..f335bf5a5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 827621ac59..370629cb01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1145:31,7 [50] )
+Generated Location: (1155:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index ead838916c..032d60eb93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index a51b590bb9..7c171fc52e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1372:32,7 [50] )
+Generated Location: (1384:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 34f737a25e..37549da1d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -39,13 +39,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index f46cf01c7d..7edbda14cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (959:28,7 [65] )
+Generated Location: (963:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 7ad7ca5ea4..7fb0afa274 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 15b74739f3..56e7bb69bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1158:31,7 [50] )
+Generated Location: (1168:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 2cc5379d95..fdd9b14c6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index c46a1967f5..15b74739f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1148:31,7 [50] )
+Generated Location: (1158:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index c1011b1ec6..08d517b75d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index c26eb42c93..5fbe3fefa3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1158:31,7 [55] )
+Generated Location: (1168:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 575cb3ee40..6d07521a8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.InputText>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.OpenComponent<Test.InputText>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         person.Name
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 45ac186461..6df29f3a49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1150:31,1 [37] )
+Generated Location: (1160:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index f89ca228a7..613222c7f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -38,9 +38,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index dca670f691..5121cb2545 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1656:47,7 [55] )
+Generated Location: (1668:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index cde27e3d16..31bcd414be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index ea1bdca38c..36a3a6787f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1315:33,7 [77] )
+Generated Location: (1329:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index faad5a8244..9b7a94d904 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  ParentValue
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index af8be57d50..d55e8ff852 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1281:33,7 [50] )
+Generated Location: (1295:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 9c9f43ca31..18a0238b4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -38,9 +38,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index ee5480943c..c5b19b594e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1668:47,7 [55] )
+Generated Location: (1680:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index b547318fcb..185622af05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index 998a4c4e29..ecc5662337 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1219:32,7 [55] )
+Generated Location: (1231:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 824990c458..e362885db8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index e0417b909d..7d00ca8c1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1214:32,7 [55] )
+Generated Location: (1226:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 1aa6d6d017..619b0b8e13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index d4cec7e3a0..6bebfc4fe7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1213:32,7 [55] )
+Generated Location: (1225:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index b68575bac6..d6a2abadc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
              ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 2823213ccc..56389a7f3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1208:32,7 [55] )
+Generated Location: (1220:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index cd3f173022..40d4fd3f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
@@ -31,9 +31,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 17a3e9f287..cf9ddc8421 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1438:40,7 [44] )
+Generated Location: (1452:40,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index fff8f8569c..21b6da91dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
@@ -39,9 +39,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.CurrentCulture));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.CurrentCulture));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 867bc3dfa7..7185c67db9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1750:48,7 [44] )
+Generated Location: (1764:48,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index b938657cc4..4bf4bb55ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,9 +20,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        context.ToLowerInvariant()
@@ -31,7 +31,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,8 +40,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      header
@@ -50,11 +50,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(5, "\r\n    Some Content\r\n");
+            __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(5, "\r\n    Some Content\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index fc78d36290..4d58618c50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (576:17,2 [46] )
+Generated Location: (578:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1230:37,87 [2] )
+Generated Location: (1240:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index 580facf895..bbcf6f148a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,9 +20,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        context.ToLowerInvariant()
@@ -31,7 +31,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,8 +40,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      header
@@ -50,15 +50,15 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(5, "Some Content");
+            __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(5, "Some Content");
             }
             ));
-            builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(7, "Bye!");
+            __builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(7, "Bye!");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index fc78d36290..4d58618c50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (576:17,2 [46] )
+Generated Location: (578:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1230:37,87 [2] )
+Generated Location: (1240:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 4416e8486f..2541094ca1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "checkbox");
-            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "checkbox");
+            __builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                Enabled
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
-            builder.SetUpdatesAttributeName("checked");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
+            __builder.SetUpdatesAttributeName("checked");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index c919777781..1222e91fab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1275:33,7 [41] )
+Generated Location: (1289:33,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 3ea8d35b89..f1a508dfba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                CurrentDate
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 4ae8ae0f75..45630affba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1242:32,7 [77] )
+Generated Location: (1254:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 2ad8aa2b6b..e5001a53a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 425e9c0639..7c238de261 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1498:41,7 [135] )
+Generated Location: (1512:41,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 4eba9b6a98..f5ca651db2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd/yyyy"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 7f7bde0125..c9ee946efc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1319:33,7 [77] )
+Generated Location: (1333:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 3e5fb084c3..6a8df83973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            ParentValue
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index b493665583..df9ef70cde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1275:33,7 [50] )
+Generated Location: (1289:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 13811c1c52..b9c32b05ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 5fb5c6410a..f0745afcf9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1459:33,7 [77] )
+Generated Location: (1473:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index b126862f4d..59f408200b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 3f8a031b86..93c761ce73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1313:33,7 [77] )
+Generated Location: (1327:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 0b682bbc99..72cdde4320 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd/yyyy"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 3f45805a95..b025fa5efd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1323:33,7 [77] )
+Generated Location: (1337:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 11b43e8b7a..834b00f6c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 8262dada44..e621c140a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1249:32,7 [77] )
+Generated Location: (1261:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 36489921a0..d0e1c44a28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index ed5224913c..d4ce7a14da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1248:32,7 [77] )
+Generated Location: (1260:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index 3cd1b8fa5d..efd411045d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "@BIND", 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "@BIND", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index cdca10e0aa..1e47ca487c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (924:30,7 [50] )
+Generated Location: (932:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 57cf38a0ab..f33c8ef27c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index d491a90fa6..63481733de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1209:32,7 [50] )
+Generated Location: (1221:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index d6e4b6d047..fb263e71f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index cacdfe4602..2599613705 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index c3a236edfe..4b355ceb8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1151:31,7 [21] )
+Generated Location: (1161:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index b885fc7aa1..b9ab2dd10a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", 
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index c020306847..e2a20c072e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1147:31,7 [21] )
+Generated Location: (1157:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 55408ce9b0..6ea930455a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       18
@@ -47,13 +47,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddAttribute(__seq1, "Item", __arg1);
-        builder.AddAttribute(__seq2, "ItemChanged", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddAttribute(__seq1, "Item", __arg1);
+        __builder.AddAttribute(__seq2, "ItemChanged", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index a2d0a471c1..07a70b8d49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1206:36,7 [21] )
+Generated Location: (1210:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 173c75be66..ac6d954783 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -22,8 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             , 2, __value => Value = __value);
-            builder.AddMarkupContent(3, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 4, 5, 
+            __builder.AddMarkupContent(3, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, 4, 5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -49,19 +49,19 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 11795ad1ca..7f44977f7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1258:38,7 [21] )
+Generated Location: (1266:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 3a9c523b78..0bb36c7382 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
@@ -23,10 +23,10 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n  ");
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n  ");
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -35,11 +35,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(6, "\r\n");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(6, "\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index ab1a2755ba..7f604a1f31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, (context) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n  ");
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            , 2, (context) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n  ");
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(6, "\r\n");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(6, "\r\n");
             }
             );
         }
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 668743949f..63bfb017d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Other", 
+            __builder.AddAttribute(2, "Other", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                   17
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 3421feb160..95bc507285 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -39,12 +39,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Other", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Other", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index 33b8c8a461..aa8664b283 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -31,11 +31,11 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 5d4b914038..d647245581 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -22,8 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(2, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 3, 4, 
+            __builder.AddMarkupContent(2, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, 3, 4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "how are you?"
@@ -32,8 +32,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(5, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, 6, 7, 
+            __builder.AddMarkupContent(5, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(__builder, 6, 7, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "bye!"
@@ -51,23 +51,23 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 05f9000036..aa66c33fae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ using Microsoft.AspNetCore.Components.Rendering;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-   RenderChildComponent(builder); 
+   RenderChildComponent(__builder); 
 
 #line default
 #line hidden
@@ -32,16 +32,16 @@ using Microsoft.AspNetCore.Components.Rendering;
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
 
 #line default
 #line hidden
 #nullable disable
-        builder.AddContent(0, "        ");
-        builder.OpenComponent<Test.MyComponent>(1);
-        builder.CloseComponent();
-        builder.AddMarkupContent(2, "\r\n");
+        __builder.AddContent(0, "        ");
+        __builder.OpenComponent<Test.MyComponent>(1);
+        __builder.CloseComponent();
+        __builder.AddMarkupContent(2, "\r\n");
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index 730322b12c..e1ce33423f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -8,14 +8,14 @@ Document -
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-            CSharpCode - (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
-            HtmlContent - (166:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (166:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            Component - (174:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            HtmlContent - (189:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (189:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+                CSharpCode - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(__builder); 
+            CSharpCode - (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n
+            HtmlContent - (170:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (170:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            Component - (178:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            HtmlContent - (193:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (193:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index c457b39dd8..dde6339cd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
-Source Location: (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-| RenderChildComponent(builder); |
-Generated Location: (746:24,2 [32] )
-| RenderChildComponent(builder); |
+Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(__builder); |
+Generated Location: (748:24,2 [34] )
+| RenderChildComponent(__builder); |
 
-Source Location: (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
 |
-Generated Location: (956:33,7 [67] )
+Generated Location: (960:33,7 [69] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
 |
 
-Source Location: (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1321:46,0 [7] )
+Generated Location: (1335:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index a23256cd9f..6d56a97182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -29,10 +29,10 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(0, "        ");
-            builder.OpenComponent<Test.MyComponent>(1);
-            builder.CloseComponent();
-            builder.AddMarkupContent(2, "\r\n");
+            __builder.AddContent(0, "        ");
+            __builder.OpenComponent<Test.MyComponent>(1);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(2, "\r\n");
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
@@ -40,7 +40,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            builder.AddMarkupContent(3, "\r\n");
+            __builder.AddMarkupContent(3, "\r\n");
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
    RenderChildComponent(); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 673b59efca..c0fb7475bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
 |
-Generated Location: (747:24,2 [42] )
+Generated Location: (749:24,2 [42] )
 |
     void RenderChildComponent()
     {
@@ -12,12 +12,12 @@ Generated Location: (747:24,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1103:37,0 [7] )
+Generated Location: (1113:37,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1282:45,2 [25] )
+Generated Location: (1294:45,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 534f3ca22e..43bdd76f0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string, int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string, int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               "hi"
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
-                builder2.OpenElement(3, "div");
-                builder2.AddContent(4, 
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
+                __builder2.OpenElement(3, "div");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                       context.ToLower()
@@ -34,12 +34,12 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
             ));
-            builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
-                builder2.AddMarkupContent(6, "\r\n  ");
-                builder2.AddContent(7, 
+            __builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (__builder2) => {
+                __builder2.AddMarkupContent(6, "\r\n  ");
+                __builder2.AddContent(7, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
    System.Math.Max(0, item.Item)
@@ -48,10 +48,10 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddMarkupContent(8, ";\r\n");
+                __builder2.AddMarkupContent(8, ";\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 2057f60c7f..e500bc5ec2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -29,9 +29,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 3, (context) => (builder2) => {
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            , 3, (context) => (__builder2) => {
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                       context.ToLower()
@@ -40,11 +40,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
-            , 6, (item) => (builder2) => {
-                builder2.AddMarkupContent(7, "\r\n  ");
-                builder2.AddContent(8, 
+            , 6, (item) => (__builder2) => {
+                __builder2.AddMarkupContent(7, "\r\n  ");
+                __builder2.AddContent(8, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
    System.Math.Max(0, item.Item)
@@ -53,7 +53,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddMarkupContent(9, ";\r\n");
+                __builder2.AddMarkupContent(9, ";\r\n");
             }
             );
         }
@@ -65,14 +65,14 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Items", __arg1);
-        builder.AddAttribute(__seq2, "ChildContent", __arg2);
-        builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Items", __arg1);
+        __builder.AddAttribute(__seq2, "ChildContent", __arg2);
+        __builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 1ba5e8d36d..b266ad2524 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -21,8 +21,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, (context) => (builder2) => {
-                builder2.AddContent(3, 
+            , 2, (context) => (__builder2) => {
+                __builder2.AddContent(3, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                     context.ToLower()
@@ -32,8 +32,8 @@ namespace Test
 #nullable disable
                 );
             }
-            , 4, (context) => (builder2) => {
-                builder2.AddContent(5, 
+            , 4, (context) => (__builder2) => {
+                __builder2.AddContent(5, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                 context
@@ -53,13 +53,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
-        builder.AddAttribute(__seq2, "IntFragment", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        __builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 619d8419d4..87a8aa17ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 9ca0e0a2d6..9607da8f82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -11,16 +11,16 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(3, "Some text");
-                builder2.AddMarkupContent(4, "<some-child a=\"1\">Nested text</some-child>");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(3, "Some text");
+                __builder2.AddMarkupContent(4, "<some-child a=\"1\">Nested text</some-child>");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index c6ace8a522..6780492298 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(2, "<child>hello</child>");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(2, "<child>hello</child>");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 1d97321d8e..3fc75879c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(2, "hello");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "hello");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 0bbf494f9e..60e82434d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 76ec234ef7..347d2fd0a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1009:30,7 [100] )
+Generated Location: (1017:30,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 45fe822b8d..0d90dfec5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
-                builder2.AddContent(2, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                             context
@@ -26,7 +26,7 @@ namespace Test
                 );
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index aff3398c54..18120398fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                42.ToString()
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 4b9d03f82a..be87aac4d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
-                builder2.AddContent(3, "Some text");
-                builder2.OpenElement(4, "some-child");
-                builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
+                __builder2.AddContent(3, "Some text");
+                __builder2.OpenElement(4, "some-child");
+                __builder2.AddAttribute(5, "a", "1");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                       context.ToLowerInvariant()
@@ -28,10 +28,10 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index be99b5c73b..38c700ecbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some text");
-                builder2.OpenElement(4, "some-child");
-                builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some text");
+                __builder2.OpenElement(4, "some-child");
+                __builder2.AddAttribute(5, "a", "1");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 item.ToLowerInvariant()
@@ -28,11 +28,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(7, "\r\n  ");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(7, "\r\n  ");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index be99b5c73b..38c700ecbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some text");
-                builder2.OpenElement(4, "some-child");
-                builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some text");
+                __builder2.OpenElement(4, "some-child");
+                __builder2.AddAttribute(5, "a", "1");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 item.ToLowerInvariant()
@@ -28,11 +28,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(7, "\r\n  ");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(7, "\r\n  ");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 8889759292..949fa9edd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         e => { Increment(); }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 1083409124..745b870673 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1022:30,7 [87] )
+Generated Location: (1030:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 4d4582314e..f37bbf3287 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "some-attribute", "foo");
-            builder.AddAttribute(2, "another-attribute", 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "some-attribute", "foo");
+            __builder.AddAttribute(2, "another-attribute", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        43.ToString()
@@ -24,7 +24,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index c4faf061b7..0426607b43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -13,10 +13,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index c06eaf9354..3a6ab74a42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  123
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                   true
@@ -32,8 +32,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "StringProperty", "My string");
-            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Test.SomeType>(
+            __builder.AddAttribute(3, "StringProperty", "My string");
+            __builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Test.SomeType>(
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
                     new SomeType()
@@ -42,7 +42,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 4305c77939..1cc2197614 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.DynamicElement>(0);
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.DynamicElement>(0);
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 62f56d1db0..5cd296bcf7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1067:30,7 [62] )
+Generated Location: (1075:30,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index ed2ed88428..50d7066fe5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -18,18 +18,18 @@ using AnotherTest;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.HeaderComponent>(0);
-            builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(2, "Hi!");
+            __builder.OpenComponent<Test.HeaderComponent>(0);
+            __builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "Hi!");
             }
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(3, "\r\n");
-            builder.OpenComponent<AnotherTest.FooterComponent>(4);
-            builder.AddAttribute(5, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
-                builder2.AddContent(6, 
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(3, "\r\n");
+            __builder.OpenComponent<AnotherTest.FooterComponent>(4);
+            __builder.AddAttribute(5, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
+                __builder2.AddContent(6, 
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
              context
@@ -40,18 +40,18 @@ using AnotherTest;
                 );
             }
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.OpenComponent<Test.HeaderComponent>(8);
-            builder.AddAttribute(9, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(10, "Hi!");
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.OpenComponent<Test.HeaderComponent>(8);
+            __builder.AddAttribute(9, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(10, "Hi!");
             }
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(11, "\r\n");
-            builder.OpenComponent<AnotherTest.FooterComponent>(12);
-            builder.AddAttribute(13, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
-                builder2.AddContent(14, 
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(11, "\r\n");
+            __builder.OpenComponent<AnotherTest.FooterComponent>(12);
+            __builder.AddAttribute(13, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
+                __builder2.AddContent(14, 
 #nullable restore
 #line 13 "x:\dir\subdir\Test\TestComponent.cshtml"
              context
@@ -62,7 +62,7 @@ using AnotherTest;
                 );
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index eacdc0c2e8..29effcf6e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -28,7 +28,7 @@ using System.Reflection;
         #pragma warning disable 1998
         protected void Execute()
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 5 "x:\dir\subdir\Test\_Imports.razor"
  Foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index ea472db615..cc03ae9e8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.CoolnessMeter>(0);
-            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.CoolnessMeter>(0);
+            __builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            "very-cool"
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 717599cb8e..5a4a7f4e97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -17,9 +17,9 @@ using Microsoft.AspNetCore.Components;
     public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
+            __builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
  foreach (var item2 in Items2)
@@ -28,10 +28,10 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(1, "    ");
-            builder.OpenElement(2, "p");
-            builder.AddMarkupContent(3, "\r\n    ");
-            builder.AddContent(4, 
+            __builder.AddContent(1, "    ");
+            __builder.OpenElement(2, "p");
+            __builder.AddMarkupContent(3, "\r\n    ");
+            __builder.AddContent(4, 
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
      ChildContent(item2)
@@ -40,9 +40,9 @@ using Microsoft.AspNetCore.Components;
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(5, ";\r\n    ");
-            builder.CloseElement();
-            builder.AddMarkupContent(6, "\r\n");
+            __builder.AddMarkupContent(5, ";\r\n    ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
 #nullable restore
 #line 11 "x:\dir\subdir\Test\TestComponent.cshtml"
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 1cf07d4355..d266ed96bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (771:26,1 [34] )
+Generated Location: (775:26,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (771:26,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1406:51,0 [3] )
+Generated Location: (1424:51,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1586:60,7 [185] )
+Generated Location: (1604:60,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 7792e3efb4..1a6bfd994b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -25,13 +25,13 @@ using Foo = Test3;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenElement(2, "SomeComponent");
-            builder.CloseElement();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenElement(2, "SomeComponent");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 013902b5fc..453434e63d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "intproperty", "1");
-            builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "intproperty", "1");
+            __builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                            true
@@ -27,7 +27,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 080d7ea58f..01dc21cdee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           1
@@ -23,10 +23,10 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(2, "\r\n");
-            builder.OpenComponent<Test.Mycomponent>(3);
-            builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(2, "\r\n");
+            __builder.OpenComponent<Test.Mycomponent>(3);
+            __builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                           2
@@ -35,7 +35,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index b52b53d76e..03822cedcd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -25,10 +25,10 @@ using System.Reflection;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<New.Test.Counter>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<New.Test.Counter>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 096dce2752..e9a5ae3f06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -25,10 +25,10 @@ using System.Reflection;
     public class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<New.Test.Counter2>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<New.Test.Counter2>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 9bb71dfb16..8c15a1cea5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.Counter>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test.Counter>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
  if (true)
@@ -25,7 +25,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(2, "This text is rendered");
+            __builder.AddContent(2, "This text is rendered");
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 2bf3768cef..257c9a4d9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (717:20,1 [18] )
+Generated Location: (725:20,1 [18] )
 |if (true)
 {
     |
@@ -11,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (956:30,38 [5] )
+Generated Location: (966:30,38 [5] )
 |
 }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index a55f7dd592..88c97a9e79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
-            builder.AddMarkupContent(1, "<div>\r\n</div>");
+            __builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
+            __builder.AddMarkupContent(1, "<div>\r\n</div>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index 311e2030c2..1202b7c81d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -11,16 +11,16 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.CloseComponent();
-            builder.AddMarkupContent(3, "\r\n");
-            builder.OpenComponent<Test2.MyComponent2>(4);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(3, "\r\n");
+            __builder.OpenComponent<Test2.MyComponent2>(4);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index ddcbeca415..8bc122e22e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        () => Increment()
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index e4a8581302..15d2cfcd80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1071:30,7 [87] )
+Generated Location: (1079:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 610c09ee43..6bc2168491 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -32,10 +32,10 @@ using System.Reflection;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.Counter>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.Counter>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index e95ee6a633..5e5218e2e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ParamBefore", "before");
-            builder.AddAttribute(2, "ParamAfter", "after");
-            builder.SetKey(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ParamBefore", "before");
+            __builder.AddAttribute(2, "ParamAfter", "after");
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         someDate.Day
@@ -25,7 +25,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index a2099b51d0..9a0a659ea6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (824:21,40 [12] )
+Generated Location: (834:21,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1069:32,7 [49] )
+Generated Location: (1081:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 78fcef6b4d..8bc7566313 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -11,16 +11,16 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "SomeProp", "val");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some ");
-                builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "SomeProp", "val");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some ");
+                __builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    123 + 456
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index b9e79c7f49..d55a54212a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1029:27,19 [9] )
+Generated Location: (1045:27,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 9c32aa7891..6b44f2b991 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -18,15 +18,15 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.HeaderComponent>(0);
-            builder.AddAttribute(1, "Header", "head");
-            builder.CloseComponent();
-            builder.AddMarkupContent(2, "\r\n");
-            builder.OpenComponent<AnotherTest.FooterComponent>(3);
-            builder.AddAttribute(4, "Footer", "feet");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.HeaderComponent>(0);
+            __builder.AddAttribute(1, "Header", "head");
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(2, "\r\n");
+            __builder.OpenComponent<AnotherTest.FooterComponent>(3);
+            __builder.AddAttribute(4, "Footer", "feet");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 5ed8b29d75..45f0b5c057 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -16,12 +16,12 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ParamBefore", "before");
-            builder.AddAttribute(2, "ParamAfter", "after");
-            builder.AddComponentReferenceCapture(3, (__value) => {
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ParamBefore", "before");
+            __builder.AddAttribute(2, "ParamAfter", "after");
+            __builder.AddComponentReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         myInstance = (Test.MyComponent)__value;
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 186756062e..3ad55818a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1061:26,40 [10] )
+Generated Location: (1071:26,40 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
index 51d1f14741..c4fc11129d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddComponentReferenceCapture(1, (__value) => {
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddComponentReferenceCapture(1, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    myInstance = (Test.MyComponent)__value;
@@ -24,7 +24,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
index 81b0c534d1..dad9e5fd6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (718:19,19 [10] )
+Generated Location: (724:19,19 [10] )
 |myInstance|
 
 Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
 |
-Generated Location: (1005:31,7 [81] )
+Generated Location: (1013:31,7 [81] )
 |
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index c5df38f7de..251726dde2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -16,16 +16,16 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "SomeProp", "val");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some ");
-                builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "SomeProp", "val");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some ");
+                __builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
             }
             ));
-            builder.AddComponentReferenceCapture(5, (__value) => {
+            __builder.AddComponentReferenceCapture(5, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    myInstance = (Test.MyComponent)__value;
@@ -35,7 +35,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 11b7ff5548..6a8210af48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1266:32,19 [10] )
+Generated Location: (1282:32,19 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index 3368139879..bd2bf2016c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "AttributeBefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                    someAttributes
@@ -24,8 +24,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "AttributeAfter", "after");
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "AttributeAfter", "after");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index 96cea029fe..f34385a2d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1296:32,7 [93] )
+Generated Location: (1308:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 298062f40f..a60d0a704e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "AttributeBefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                      someAttributes
@@ -24,8 +24,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "AttributeAfter", "after");
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "AttributeAfter", "after");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 9f732d3398..55b27f4e33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1298:32,7 [93] )
+Generated Location: (1310:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index a5deeb3169..16332db5ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                     18
@@ -47,12 +47,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddMultipleAttributes(__seq1, __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddMultipleAttributes(__seq1, __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 9dfce2d24d..06f9c88ebe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1075:36,7 [93] )
+Generated Location: (1079:36,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 85c244ab8b..104536cb0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "AttributeBefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                     someAttributes
@@ -24,8 +24,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "AttributeAfter", "after");
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "AttributeAfter", "after");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index f6521a1da0..8ce8b2b18b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1297:32,7 [93] )
+Generated Location: (1309:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index c573f18e2b..90128a13fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -20,13 +20,13 @@ using Test2;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenComponent<Test2.MyComponent2>(2);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test2.MyComponent2>(2);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 040f50d490..1cfe84eccd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -25,13 +25,13 @@ using Test3;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenComponent<Test2.SomeComponent>(2);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test2.SomeComponent>(2);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 606664d038..d50deab626 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "data-abc", "Literal value");
-            builder.AddAttribute(2, "data-def", 
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "data-abc", "Literal value");
+            __builder.AddAttribute(2, "data-def", 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                            myValue
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 78a26d69b6..1c7d63b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (576:17,2 [40] )
+Generated Location: (578:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 933db52181..71c3425ad5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "data-abc", "Literal value");
-            builder.AddAttribute(2, "data-def", 
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "data-abc", "Literal value");
+            __builder.AddAttribute(2, "data-def", 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                           myValue
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 78a26d69b6..1c7d63b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (576:17,2 [40] )
+Generated Location: (578:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index cb6518086c..b4857ae33a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", "test");
-            builder.AddAttribute(2, "mESSAGE", "test");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Message", "test");
+            __builder.AddAttribute(2, "mESSAGE", "test");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 232e8ea6ba..38b43f29a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        message
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                 message
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            __builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 85b891035d..80f868260e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (1999:41,12 [30] )
+Generated Location: (2013:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 27e6c53bdb..fb1c3023f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                (s) => {}
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            message
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            __builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 56535e50e1..44794b9c49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2157:41,12 [30] )
+Generated Location: (2171:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 0409adfe5a..81081bdf5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            (s) => {}
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              message
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            __builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 5720b61120..3dd3bd719e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2079:41,12 [30] )
+Generated Location: (2093:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 12f265e9f5..46ef7ee9ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -11,13 +11,13 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", "test");
-            builder.AddAttribute(2, "mESSAGE", "test");
-            builder.AddAttribute(3, "Message", "anotherone");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Message", "test");
+            __builder.AddAttribute(2, "mESSAGE", "test");
+            __builder.AddAttribute(3, "Message", "anotherone");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 98e1efe495..3511a5d9b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Foo", "test");
-            builder.AddAttribute(2, "foo", "test");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Foo", "test");
+            __builder.AddAttribute(2, "foo", "test");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 46eb6824b1..84e4c4e33a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "input");
-            builder.AddAttribute(3, "type", "text");
-            builder.AddAttribute(4, "Value", "17");
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "type", "text");
+            __builder.AddAttribute(4, "Value", "17");
+            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
@@ -27,11 +27,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.CloseElement();
+            __builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 43e5f75aba..1131d4aec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1508:38,12 [35] )
+Generated Location: (1532:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 71a5356b8f..3a62a163aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -11,19 +11,19 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "href", "/cool-url");
-            builder.AddAttribute(4, "style", true);
-            builder.AddAttribute(5, "disabled", true);
-            builder.AddAttribute(6, "href", "/even-cooler-url");
-            builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
-            builder.CloseElement();
-            builder.AddMarkupContent(8, "\r\n");
-            builder.CloseElement();
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "a");
+            __builder.AddAttribute(3, "href", "/cool-url");
+            __builder.AddAttribute(4, "style", true);
+            __builder.AddAttribute(5, "disabled", true);
+            __builder.AddAttribute(6, "href", "/even-cooler-url");
+            __builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(8, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index f3a649aab4..0a08de4245 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -11,13 +11,13 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "input");
-            builder.AddAttribute(3, "type", "text");
-            builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "type", "text");
+            __builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                () => {}
@@ -26,7 +26,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
@@ -35,11 +35,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.CloseElement();
+            __builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 2fa52d0969..0da513786a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1842:46,12 [35] )
+Generated Location: (1866:46,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 73cdac120d..b8c9293933 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "input");
-            builder.AddAttribute(3, "type", "text");
-            builder.AddAttribute(4, "value", "17");
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "type", "text");
+            __builder.AddAttribute(4, "value", "17");
+            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
@@ -27,11 +27,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.CloseElement();
+            __builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 43e5f75aba..1131d4aec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1508:38,12 [35] )
+Generated Location: (1532:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 93ea6ca3c6..736e64d96a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -11,13 +11,13 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "onclick", "test()");
-            builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "a");
+            __builder.AddAttribute(3, "onclick", "test()");
+            __builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 () => {}
@@ -26,10 +26,10 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
-            builder.CloseElement();
-            builder.AddMarkupContent(6, "\r\n");
-            builder.CloseElement();
+            __builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 0f8124b91c..ac15f56cc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -11,20 +11,20 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "href", "/cool-url");
-            builder.AddAttribute(4, "style", true);
-            builder.AddAttribute(5, "disabled", true);
-            builder.AddAttribute(6, "href", "/even-cooler-url");
-            builder.AddAttribute(7, "href", true);
-            builder.AddContent(8, "Learn the ten cool tricks your compiler author will hate!");
-            builder.CloseElement();
-            builder.AddMarkupContent(9, "\r\n");
-            builder.CloseElement();
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "a");
+            __builder.AddAttribute(3, "href", "/cool-url");
+            __builder.AddAttribute(4, "style", true);
+            __builder.AddAttribute(5, "disabled", true);
+            __builder.AddAttribute(6, "href", "/even-cooler-url");
+            __builder.AddAttribute(7, "href", true);
+            __builder.AddContent(8, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(9, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 25469b5236..338fb49b28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<NotAComponent></NotAComponent>\r\n<DefinitelyNotAComponent></DefinitelyNotAComponent>");
+            __builder.AddMarkupContent(0, "<NotAComponent></NotAComponent>\r\n<DefinitelyNotAComponent></DefinitelyNotAComponent>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index e891b44230..57e5d27840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddAttribute(2, "attributeafter", "after");
-            builder.SetKey(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddAttribute(2, "attributeafter", "after");
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      someObject
@@ -25,8 +25,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddContent(3, "Hello");
-            builder.CloseElement();
+            __builder.AddContent(3, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index a14f2215f5..c46f7100b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (817:21,37 [10] )
+Generated Location: (827:21,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1103:33,7 [49] )
+Generated Location: (1117:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index fc8f090857..49027ac9d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "data-slider-min", 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "data-slider-min", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Min
@@ -24,7 +24,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  someObject
@@ -33,7 +33,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 1a6054d07f..d5a06aa130 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (987:29,49 [10] )
+Generated Location: (997:29,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -9,7 +9,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1228:40,7 [109] )
+Generated Location: (1240:40,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index f2ece3f4a5..669aa6b472 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @KEY=\"someObject\" attributeafter=\"after\">Hello</elem>");
+            __builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @KEY=\"someObject\" attributeafter=\"after\">Hello</elem>");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 5b1fb6b01c..81fe48cac3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (766:20,7 [49] )
+Generated Location: (770:20,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index d8598d0bde..4ab0319ccd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -16,12 +16,12 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddAttribute(2, "attributeafter", "after");
-            builder.AddElementReferenceCapture(3, (__value) => {
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddAttribute(2, "attributeafter", "after");
+            __builder.AddElementReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      myElem = __value;
@@ -31,8 +31,8 @@ namespace Test
 #nullable disable
             }
             );
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 2928fdff8c..ac62465376 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1088:26,37 [6] )
+Generated Location: (1098:26,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 253327bc4d..7cec406182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -16,11 +16,11 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "data-slider-min", 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "data-slider-min", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Min
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddElementReferenceCapture(3, (__value) => {
+            __builder.AddElementReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  _element = __value;
@@ -39,7 +39,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 9c3fd8e610..670974cf7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1260:34,49 [8] )
+Generated Location: (1270:34,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1525:46,7 [56] )
+Generated Location: (1537:46,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 90b396b95b..2ebd414c51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @rEF=\"myElem\" attributeafter=\"after\">Hello</elem>");
+            __builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @rEF=\"myElem\" attributeafter=\"after\">Hello</elem>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 48c27464dd..0c480f76a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddElementReferenceCapture(1, (__value) => {
+            __builder.OpenElement(0, "elem");
+            __builder.AddElementReferenceCapture(1, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
             myElem = __value;
@@ -24,8 +24,8 @@ namespace Test
 #nullable disable
             }
             );
-            builder.AddContent(2, "Hello");
-            builder.CloseElement();
+            __builder.AddContent(2, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index fad6f59013..ac7adc105d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (697:19,12 [6] )
+Generated Location: (703:19,12 [6] )
 |myElem|
 
 Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1005:32,7 [78] )
+Generated Location: (1015:32,7 [78] )
 |
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 6c3bcb0b12..f051832363 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             someAttributes
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "attributeafter", "after");
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "attributeafter", "after");
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 408d3e7f39..5f97cfc9c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1320:33,7 [93] )
+Generated Location: (1334:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 825f2bfebb..52beeca87d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @ATTributes=\"someAttributes\" attributeafter=\"after\">Hello</elem>");
+            __builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @ATTributes=\"someAttributes\" attributeafter=\"after\">Hello</elem>");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index a2ea5ae837..9e83a67391 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (777:20,7 [93] )
+Generated Location: (781:20,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index fe225f1b0f..a023ad48df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               someAttributes
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "attributeafter", "after");
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "attributeafter", "after");
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index c1e979a475..8ec5df3e2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1322:33,7 [93] )
+Generated Location: (1336:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index f26cb231d1..fad15e7ed8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                              someAttributes
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "attributeafter", "after");
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "attributeafter", "after");
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 8648f2ac30..82d3039280 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1321:33,7 [93] )
+Generated Location: (1335:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index e38e513ef8..aea4039807 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 169c928ba1..6a700f10c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1290:30,7 [87] )
+Generated Location: (1298:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 65218e85e9..a423dfa1b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index ca02602fe9..eaf562b672 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1235:30,7 [87] )
+Generated Location: (1243:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 625a829f09..3540fb6d95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index e54bde9dba..2a62756e27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1235:30,7 [105] )
+Generated Location: (1243:30,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 22f737baca..8d79605427 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index d7ef33c134..790b9be8a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1235:30,7 [141] )
+Generated Location: (1243:30,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 5213f7450a..4aeef8e446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 68ba511dd7..e1fb9986e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1235:30,7 [123] )
+Generated Location: (1243:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index fadfeadfcd..ef79810505 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 8ccf81d829..a8f670e7fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1235:30,7 [106] )
+Generated Location: (1243:30,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 7ab2887299..50f18a1b27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create(this, Increment)
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 1442a9d81c..c565ef85e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1172:30,7 [87] )
+Generated Location: (1180:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index affc4e321c..19339d0b13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 8d42326f5f..0f30f98457 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1135:30,7 [87] )
+Generated Location: (1143:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 8b7a809f7c..4ef3fc99ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index b03e262de6..5e48d447b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1135:30,7 [95] )
+Generated Location: (1143:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 1b3b0f1cd8..1d3203fee7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 8d2327ae8f..75957fa3cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1135:30,7 [123] )
+Generated Location: (1143:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index c20a11f566..3bc7d08c7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 11fa6a5327..1d827bbc3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1135:30,7 [131] )
+Generated Location: (1143:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 1d5d156139..4611e1077d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
+            __builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 5e878ccf2c..5467376a30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<input @onCLICK=\"OnClick\">");
+            __builder.AddMarkupContent(0, "<input @onCLICK=\"OnClick\">");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 54283ab676..b7884360e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (704:20,7 [49] )
+Generated Location: (708:20,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 9f00ae5035..cdf780c44a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index e29449cd92..0596bca6c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1042:30,7 [44] )
+Generated Location: (1050:30,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index da94940dce..90e9186fb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 4857f742c6..704483c5c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1042:30,7 [49] )
+Generated Location: (1050:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 2712e85839..2c665782af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  x => { }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index da94940dce..90e9186fb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 4857f742c6..704483c5c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1042:30,7 [49] )
+Generated Location: (1050:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 2712e85839..2c665782af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  x => { }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index d507642ef4..a339aab373 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index f88c0b9fa3..bae27b996d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1042:30,7 [31] )
+Generated Location: (1050:30,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 81eac56708..9d3dc19487 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  () => { }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 6177aa2275..93e723cf92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<input onclick=\"foo\">");
+            __builder.AddMarkupContent(0, "<input onclick=\"foo\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 84e9d3db48..e9a3b5ca54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index f3f9065268..7793531abe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 99bcfbb9ff..7395ef5af5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index f7a895d896..7869cdebe7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index b3875ce643..9931408550 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test.Shared;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -54,12 +54,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Foo", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Foo", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 04e2e871a1..5f284d1210 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1193:43,7 [38] )
+Generated Location: (1197:43,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 6d84ef5d37..2551625019 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
+            __builder.OpenComponent<Test.MyComponent<int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddComponentReferenceCapture(2, (__value) => {
+            __builder.AddComponentReferenceCapture(2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _my = (Test.MyComponent<int>)__value;
@@ -33,7 +33,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index a998fd45fd..8869512906 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1036:28,38 [3] )
+Generated Location: (1044:28,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1321:40,7 [72] )
+Generated Location: (1331:40,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
index 482bb78b4a..bbcfa74722 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -49,12 +49,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 5b2f2a7e50..b85825c088 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (868:26,28 [3] )
+Generated Location: (872:26,28 [3] )
 |_my|
 
 Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1091:37,7 [90] )
+Generated Location: (1095:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index d063fb39a3..383c6e3de5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           "hi"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, (context) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n  ");
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            , 2, (context) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n  ");
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(6, "\r\n");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(6, "\r\n");
             }
             );
         }
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 0d5ad55166..e2052de080 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
+            __builder.OpenComponent<Test.MyComponent<int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _someKey
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 43b4974734..c2c2966874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (997:28,38 [8] )
+Generated Location: (1005:28,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1238:39,7 [47] )
+Generated Location: (1248:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index b4f149381b..fcf9a78f16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -47,12 +47,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.SetKey(__arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.SetKey(__arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 3cdea8b1fe..df8e691bed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (854:26,28 [8] )
+Generated Location: (858:26,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1056:36,7 [47] )
+Generated Location: (1060:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 14a877347f..1e617b6b4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
   "My value"
@@ -22,8 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(1, "\r\n\r\n");
-            builder.AddMarkupContent(2, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(1, "\r\n\r\n");
+            __builder.AddMarkupContent(2, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index d09f73e085..6d3f553d68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.SomeOtherComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n\r\n");
-            builder.AddMarkupContent(2, "<h1>Hello</h1>");
+            __builder.OpenComponent<Test.SomeOtherComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n\r\n");
+            __builder.AddMarkupContent(2, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 143da42ed4..641d0cb298 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -17,9 +17,9 @@ using System;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index dedaf0b24f..2992055209 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,8 +21,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenElement(0, "div");
-            builder.AddContent(1, 
+            __builder.OpenElement(0, "div");
+            __builder.AddContent(1, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
       myValue
@@ -31,8 +31,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(2, "  ");
-            builder.CloseElement();
+            __builder.AddMarkupContent(2, "  ");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 78a26d69b6..1c7d63b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (576:17,2 [40] )
+Generated Location: (578:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 81b1c955a4..a8340499a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(2, "Hi!");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "Hi!");
             }
             ));
-            builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(4, 
+            __builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(4, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
               "bye!"
@@ -30,7 +30,7 @@ namespace Test
                 );
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 5cddba9bfe..9d353958e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Item", "Hello");
-            builder.AddAttribute(2, "MyEvent", "MyEventHandler");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Item", "Hello");
+            __builder.AddAttribute(2, "MyEvent", "MyEventHandler");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index ef96ec79b3..f2ceb6361a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (848:23,7 [39] )
+Generated Location: (858:23,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index c44d0e1b6d..60f201c50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,10 +20,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "li");
-                builder2.AddContent(1, "#");
-                builder2.AddContent(2, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "li");
+                __builder2.AddContent(1, "#");
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                context.Index
@@ -32,8 +32,8 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddContent(3, " - ");
-                builder2.AddContent(4, 
+                __builder2.AddContent(3, " - ");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                 context.Item.ToLower()
@@ -42,7 +42,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -51,8 +51,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(5);
-            builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(
+            __builder.OpenComponent<Test.MyComponent>(5);
+            __builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         template
@@ -61,7 +61,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 9ac860c6ab..5896bf1144 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (576:17,2 [54] )
+Generated Location: (578:17,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1631:48,107 [2] )
+Generated Location: (1647:48,107 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 106b0e3cb3..4245d11504 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.OpenComponent<Test.MyComponent>(1);
+                __builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 ));
-                builder2.CloseComponent();
-                builder2.CloseElement();
+                __builder2.CloseComponent();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index d600e1b868..da87e2cd45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (576:17,2 [45] )
+Generated Location: (578:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1436:40,89 [3] )
+Generated Location: (1450:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1615:49,7 [76] )
+Generated Location: (1629:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index be4d738229..0fc9c79187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.OpenComponent<Test.MyComponent>(1);
+                __builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 ));
-                builder2.CloseComponent();
-                builder2.CloseElement();
+                __builder2.CloseComponent();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -43,10 +43,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(3);
-            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(5, "\r\n");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(3);
+            __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(5, "\r\n");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
   "hello, world!"
@@ -55,10 +55,10 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddMarkupContent(7, "\r\n");
+                __builder2.AddMarkupContent(7, "\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 1623292d3d..601ddb21de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (576:17,2 [45] )
+Generated Location: (578:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1436:40,89 [3] )
+Generated Location: (1450:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2171:65,7 [76] )
+Generated Location: (2199:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index a8b3f2986a..3cce17476b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,9 +20,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                         person.Name
@@ -31,7 +31,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,8 +40,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                               template
@@ -50,7 +50,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index 217bf53d43..bbd7ec5a32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (576:17,2 [47] )
+Generated Location: (578:17,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1203:37,73 [2] )
+Generated Location: (1213:37,73 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 77202fcb17..260bf8d149 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
  RenderPerson((person) => 
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(1, "div");
-                builder2.AddContent(2, 
+            (__builder2) => {
+                __builder2.OpenElement(1, "div");
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  person.Name
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 315aff9a3b..4eedb74b90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1365:48,7 [138] )
+Generated Location: (1377:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 9a35bff8bc..7e46a81fc2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                   person.Name
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index f95a024385..a3b0e50906 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (576:17,2 [45] )
+Generated Location: (578:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1189:38,67 [3] )
+Generated Location: (1199:38,67 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1368:47,7 [76] )
+Generated Location: (1378:47,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 0f6f57973d..f21c38cce0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
   RenderPerson((person) => 
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(1, "div");
-                builder2.AddContent(2, 
+            (__builder2) => {
+                __builder2.OpenElement(1, "div");
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   person.Name
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index fb191596ac..8d853cc485 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1368:48,7 [138] )
+Generated Location: (1380:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index b61b330d68..514248aa56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,8 +20,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.AddMarkupContent(0, "<div>Joey</div>");
+            (__builder2) => {
+                __builder2.AddMarkupContent(0, "<div>Joey</div>");
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -30,8 +30,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(1);
-            builder.AddAttribute(2, "Person", 
+            __builder.OpenComponent<Test.MyComponent>(1);
+            __builder.AddAttribute(2, "Person", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                       template
@@ -40,7 +40,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 12530595ce..7d46380c18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (576:17,2 [27] )
+Generated Location: (578:17,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (880:27,45 [2] )
+Generated Location: (886:27,45 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 125f7e0926..2b59e51e85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
  RenderPerson(
@@ -21,8 +21,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.AddMarkupContent(1, "<div>HI</div>");
+            (__builder2) => {
+                __builder2.AddMarkupContent(1, "<div>HI</div>");
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 454048faae..01f474539b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1077:38,7 [54] )
+Generated Location: (1085:38,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 1f39ff61b1..7a8947af80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.Counter>(0);
-            builder.AddAttribute(1, "v", 
+            __builder.OpenComponent<Test.Counter>(0);
+            __builder.AddAttribute(1, "v", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   y
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index c5c29b77eb..c9f47a4851 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1098:31,7 [24] )
+Generated Location: (1108:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 8171a8f1e2..29a77a9f76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.User>(0);
-            builder.AddAttribute(1, "Name", 
+            __builder.OpenComponent<Test.User>(0);
+            __builder.AddAttribute(1, "Name", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    UserName
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName));
-            builder.AddAttribute(3, "IsActive", 
+            __builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName));
+            __builder.AddAttribute(3, "IsActive", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               UserIsActive
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive));
-            builder.CloseComponent();
+            __builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index da76161cce..ac3ce2f184 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1574:41,7 [88] )
+Generated Location: (1588:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index 4b66c56e87..b69675629b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -12,12 +12,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
-            builder.OpenComponent<Test.SurveyPrompt>(1);
-            builder.AddAttribute(2, "Title", "\r\n");
-            builder.CloseComponent();
+            __builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
+            __builder.OpenComponent<Test.SurveyPrompt>(1);
+            __builder.AddAttribute(2, "Title", "\r\n");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index b5d11da0a8..e73f1774c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -12,12 +12,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
-            builder.OpenComponent<Test.SurveyPrompt>(1);
-            builder.AddAttribute(2, "Title", "<div>Test!</div>");
-            builder.CloseComponent();
+            __builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
+            __builder.OpenComponent<Test.SurveyPrompt>(1);
+            __builder.AddAttribute(2, "Title", "<div>Test!</div>");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index d2b2173405..07f1e78773 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "p");
-            builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "p");
+            __builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnComponentHover
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "style", "background:" + " " + (
+            __builder.AddAttribute(2, "style", "background:" + " " + (
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        ParentBgColor
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             ) + ";");
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 6d61644640..955dc1f6a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1334:39,7 [132] )
+Generated Location: (1344:39,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index a7c3e6447e..92ca67bae4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -11,17 +11,17 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n    ");
-            builder.OpenElement(2, "script");
-            builder.AddAttribute(3, "src", "some/url.js");
-            builder.AddAttribute(4, "anotherattribute", true);
-            builder.AddMarkupContent(5, "\r\n        some text\r\n        some more text\r\n    ");
-            builder.CloseElement();
-            builder.AddMarkupContent(6, "\r\n");
-            builder.CloseElement();
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n    ");
+            __builder.OpenElement(2, "script");
+            __builder.AddAttribute(3, "src", "some/url.js");
+            __builder.AddAttribute(4, "anotherattribute", true);
+            __builder.AddMarkupContent(5, "\r\n        some text\r\n        some more text\r\n    ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index 0d11282409..eeb80a1f60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -18,22 +18,22 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
   
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(0, "    ");
-            builder.OpenElement(1, "p");
-            builder.AddContent(2, "Output: ");
-            builder.AddContent(3, 
+            __builder.AddContent(0, "    ");
+            __builder.OpenElement(1, "p");
+            __builder.AddContent(2, "Output: ");
+            __builder.AddContent(3, 
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
                 output
@@ -42,8 +42,8 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
-            builder.AddMarkupContent(4, "\r\n");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 53749a6138..902be776e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
-                HtmlContent - (188:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (188:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
-                MarkupElement - (192:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlContent - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                    CSharpExpression - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-                HtmlContent - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                CSharpCode - (216:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (216:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 
+                CSharpCode - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
+                HtmlContent - (190:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (190:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
+                MarkupElement - (194:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                    CSharpExpression - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+                HtmlContent - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 01adfec434..5086da6818 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
-Generated Location: (747:24,2 [132] )
+Generated Location: (749:24,2 [134] )
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index c9ca9cb828..e38b0e9e0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -18,26 +18,26 @@ using Microsoft.AspNetCore.Components.Rendering;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 
 #line default
 #line hidden
 #nullable disable
-        builder.AddContent(0, "        ");
-        builder.OpenElement(1, "p");
-        builder.AddContent(2, "Output: ");
-        builder.AddContent(3, 
+        __builder.AddContent(0, "        ");
+        __builder.OpenElement(1, "p");
+        __builder.AddContent(2, "Output: ");
+        __builder.AddContent(3, 
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
                     output
@@ -46,8 +46,8 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line hidden
 #nullable disable
         );
-        builder.CloseElement();
-        builder.AddMarkupContent(4, "\r\n");
+        __builder.CloseElement();
+        __builder.AddMarkupContent(4, "\r\n");
 #nullable restore
 #line 10 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index b6fa718da7..03c3279b6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-            CSharpCode - (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
-            HtmlContent - (269:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (269:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            MarkupElement - (277:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                HtmlContent - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                CSharpExpression - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-            HtmlContent - (299:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (299:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+            CSharpCode - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        var output = string.Empty;\n        if (__builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
+            HtmlContent - (273:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (273:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            MarkupElement - (281:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            HtmlContent - (303:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (303:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index 5638b26888..33931628e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -1,24 +1,24 @@
-Source Location: (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
-Generated Location: (800:26,7 [209] )
+Generated Location: (802:26,7 [213] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
 
-Source Location: (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1527:52,0 [7] )
+Generated Location: (1545:52,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 7c3ab26b0d..a731c9cd0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            builder.AddContent(1, 
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
+            __builder.AddContent(1, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
   "My value"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 80cc186a87..6c615d6065 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            builder.OpenComponent<Test.SomeOtherComponent>(1);
-            builder.CloseComponent();
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
+            __builder.OpenComponent<Test.SomeOtherComponent>(1);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 694aaaae26..4bbe2ae0ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -12,9 +12,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index e13102d420..5213196255 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<div class=\"first second\">Hello</div>");
+            __builder.AddMarkupContent(0, "<div class=\"first second\">Hello</div>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 0580f5da63..d83a551701 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attr", 
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attr", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
             Foo
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index bf784c5015..9edc33678f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (915:30,11 [29] )
+Generated Location: (923:30,11 [29] )
 |
         int Foo = 18;
     |

From 2317fc9687066906e51bbcfdb0ae9bde79912982 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 12 Aug 2019 20:51:22 -0700
Subject: [PATCH 239/337] Fixup tests \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/5707808e9f3f32da50d989047fefc7eceb7f2a76

---
 .../BasicComponent_DesignTime.codegen.cs           |  2 +-
 .../BasicComponent_DesignTime.mappings.txt         |  6 +++---
 .../BasicComponent_Runtime.codegen.cs              | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 91ff0b78fb..92d78d57b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -28,7 +28,7 @@ IDisposable __typeHelper = default!;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 57bd7e92e9..4e620df0e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (641:17,0 [11] )
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1238:35,13 [15] )
+Generated Location: (1240:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1435:43,6 [29] )
+Generated Location: (1437:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1687:52,12 [37] )
+Generated Location: (1689:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 6850616bb0..2059dba321 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -12,10 +12,10 @@ namespace __GeneratedComponent
     public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "class", 
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "class", 
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
              this.ToString()
@@ -24,8 +24,8 @@ namespace __GeneratedComponent
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(2, "\r\n    Hello world\r\n    ");
-            builder.AddContent(3, 
+            __builder.AddMarkupContent(2, "\r\n    Hello world\r\n    ");
+            __builder.AddContent(3, 
 #nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
      string.Format("{0}", "Hello")
@@ -34,8 +34,8 @@ namespace __GeneratedComponent
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(4, "\r\n");
-            builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore

From 70268e7c82edbe1933f74d1a2f2f71df9ff1a153 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Wed, 14 Aug 2019 15:59:44 +0200
Subject: [PATCH 240/337] [Blazor][Fixes dotnet/aspnetcore-tooling#12933]
 Remove the need for a custom property when resolving static web assets from
 referenced projects

* Removes the need for a custom property when resolving static web assets from referenced projects
* Rolls in several improvements suggested by the MSBuild folks to improve performance.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5335245b080acf52c262fb7964d3411d49143f29
---
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 134 ++++++++++--------
 1 file changed, 77 insertions(+), 57 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index e6b23f2802..e90aac13f8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -50,7 +50,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </GenerateStaticWebAssetsManifestDependsOn>
 
     <GetCurrentProjectStaticWebAssetsDependsOn>
-      ResolveStaticWebAssetsInputs;
+      ResolveCurrentProjectStaticWebAssetsInputs;
       $(GetCurrentProjectStaticWebAssetsDependsOn)
     </GetCurrentProjectStaticWebAssetsDependsOn>
 
@@ -59,11 +59,21 @@ Copyright (c) .NET Foundation. All rights reserved.
       $(AssignTargetPathsDependsOn)
     </AssignTargetPathsDependsOn>
 
-    <ResolveStaticWebAssetsInputsDependsOn Condition="$(NoBuild) != 'true'">
-      _ResolveStaticWebAssetsProjectReferences;
+    <ResolveStaticWebAssetsInputsDependsOn>
+      ResolveCurrentProjectStaticWebAssetsInputs;
       $(ResolveStaticWebAssetsInputsDependsOn)
     </ResolveStaticWebAssetsInputsDependsOn>
 
+    <ResolveStaticWebAssetsInputsDependsOn Condition="$(NoBuild) != 'true'">
+      ResolveReferencedProjectsStaticWebAssets;
+      $(ResolveStaticWebAssetsInputsDependsOn)
+    </ResolveStaticWebAssetsInputsDependsOn>
+
+    <ResolveReferencedProjectsStaticWebAssetsDependsOn>
+      ResolveReferences;
+      $(ResolveReferencedProjectsStaticWebAssetsDependsOn)
+    </ResolveReferencedProjectsStaticWebAssetsDependsOn>
+
     <GenerateStaticWebAssetsPackTargetsDependsOn>
       _CreateStaticWebAssetsCustomPropsCacheFile;
       $(GenerateStaticWebAssetsPackTargetsDependsOn)
@@ -209,27 +219,68 @@ Copyright (c) .NET Foundation. All rights reserved.
        * Assets from the referenced packages. These will be implicitly included when nuget
          restores the package and includes the package props file for the package.
   -->
+
+    <!-- StaticWebAssets from the current project come from ResolveCurrentProjectStaticWebAssetsInputs which is a dependency of this target. -->
+    <!-- StaticWebAssets from referenced projects come from ResolveReferencedProjectsStaticWebAssets which is a dependency of this target. -->
+    <!-- StaticWebAssets from packages are already available, so we don't do anything. -->
   <Target
     Name="ResolveStaticWebAssetsInputs"
-    DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)">
+    DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)" />
 
-    <!-- StaticWebAssets from the current project -->
+  <!-- This is a helper task to compute the project references we need to invoke to retrieve
+       the static assets for a given application. We do it this way so that we can
+       pass additional build properties to compute the assets from the package when referenced
+       as a project. For example, Identity uses this hook to extend the project reference and
+       pass in the bootstrap version to use.
+  -->
 
-    <PropertyGroup>
-      <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(PackageId)</StaticWebAssetBasePath>
-    </PropertyGroup>
+  <Target Name="ResolveReferencedProjectsStaticWebAssets" DependsOnTargets="$(ResolveReferencedProjectsStaticWebAssetsDependsOn)">
 
     <ItemGroup>
+      <!-- It is explicitly ok to take a dependency on _MSBuildProjectReferenceExistent as it is
+        something many other products already take a dependency on. -->
+      <_StaticWebAssetsProjectReference Include="@(_MSBuildProjectReferenceExistent)" />
+    </ItemGroup>
+
+    <MSBuild
+      Condition="'@(_StaticWebAssetsProjectReference)' != '' and '%(_StaticWebAssetsProjectReference.BuildReference)' == 'true' and '@(ProjectReferenceWithConfiguration)' != ''"
+      Targets="GetCurrentProjectStaticWebAssets"
+      Properties="%(_StaticWebAssetsProjectReference.SetConfiguration); %(_StaticWebAssetsProjectReference.SetPlatform);  %(_StaticWebAssetsProjectReference.SetTargetFramework)"
+      RemoveProperties="%(_StaticWebAssetsProjectReference.GlobalPropertiesToRemove)"
+      Projects="@(_StaticWebAssetsProjectReference)"
+      BuildInParallel="$(BuildInParallel)"
+      ContinueOnError="!$(BuildingProject)"
+      SkipNonexistentTargets="true">
+
+      <Output TaskParameter="TargetOutputs" ItemName="_ReferencedProjectStaticWebAssets" />
+    </MSBuild>
+
+    <ItemGroup>
+      <StaticWebAsset
+        Include="@(_ReferencedProjectStaticWebAssets)"
+        KeepMetadata="ContentRoot;BasePath;RelativePath;SourceId;SourceType" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="ResolveCurrentProjectStaticWebAssetsInputs" DependsOnTargets="$(ResolveCurrentProjectStaticWebAssetsInputsDependsOn)">
+
+      <PropertyGroup>
+        <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(PackageId)</StaticWebAssetBasePath>
+      </PropertyGroup>
+
+      <ItemGroup>
 
       <_ThisProjectStaticWebAsset
-        Include="$(MSBuildProjectDirectory)\wwwroot\**"
-        Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-      <!--
-        Should we promote 'wwwroot\**'' to a property?
-        We don't want to capture any content outside the content root, that's why we don't do
-        @(Content) here.
-      -->
-      <StaticWebAsset Include="@(_ThisProjectStaticWebAsset)">
+        Include="@(Content)"
+        Condition="$([System.String]::Copy('%(Identity)').StartsWith('wwwroot'))">
+
+        <!-- Remove the wwwroot\ prefix -->
+        <RelativePath>$([System.String]::Copy('%(Identity)').Substring(8))</RelativePath>
+
+      </_ThisProjectStaticWebAsset>
+
+      <StaticWebAsset Include="@(_ThisProjectStaticWebAsset->'%(FullPath)')" RemoveMetadata="CopyToPublishDirectory;ExcludeFromSingleFile">
         <!-- (Package, Project, '' (CurrentProject)) -->
         <SourceType></SourceType>
         <!-- Identifier describing the source, the package id, the project name, empty for the current project.  -->
@@ -238,52 +289,19 @@ Copyright (c) .NET Foundation. All rights reserved.
           Full path to the content root for the item:
           * For packages it corresponds to %userprofile%/.nuget/packages/<<PackageId>>/<<PackageVersion>>/razorContent
           * For referenced projects it corresponds to <<FullProjectRefPath>>/wwwroot
-          * For the current projects it corresponds to $(MSBuildThisProjectFileDirectory)wwwroot\
+          * For the current projects it corresponds to $(MSBuildProjectDirectory)wwwroot\
         -->
-        <ContentRoot>$(MSBuildProjectDirectory)\wwwroot\</ContentRoot>
+        <ContentRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)\wwwroot\'))</ContentRoot>
         <!-- Subsection (folder) from the url space where content for this library will be served. -->
         <BasePath>$(StaticWebAssetBasePath)</BasePath>
         <!-- Relative path from the content root for the file. At publish time, we combine the BasePath + Relative
-  path to determine the final path for the file. -->
-        <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
+             path to determine the final path for the file.
+        -->
+        <RelativePath>%(RelativePath)</RelativePath>
 
       </StaticWebAsset>
     </ItemGroup>
 
-    <!-- StaticWebAssets from referenced projects. -->
-
-    <MSBuild
-      Condition="'@(_StaticWebAssetsProjectReference->Count())' != '0'"
-      Projects="@(_StaticWebAssetsProjectReference)"
-      BuildInParallel="$(BuildInParallel)"
-      ContinueOnError="!$(BuildingProject)"
-      Targets="GetCurrentProjectStaticWebAssets"
-      Properties="_StaticWebAssetsSkipDependencies=true"
-      SkipNonexistentTargets="true">
-      <Output TaskParameter="TargetOutputs" ItemName="_ReferencedProjectStaticWebAssets" />
-    </MSBuild>
-
-    <ItemGroup>
-      <StaticWebAsset Include="@(_ReferencedProjectStaticWebAssets)" />
-    </ItemGroup>
-
-    <!-- StaticWebAssets from packages are already available, so we don't do anything. -->
-  </Target>
-
-  <!-- This is a helper task to compute the project references we need to invoke to retrieve
-       the static assets for a given application. We do it this way so that we can
-       pass additional build properties to compute the assets from the package when referenced
-       as a project. For example, Identity uses this hook to extend the project reference and
-       pass in the bootstrap version to use.
-  -->
-  <Target Name="_ResolveStaticWebAssetsProjectReferences"
-    DependsOnTargets="ResolveReferences"
-    Condition="'$(_StaticWebAssetsSkipDependencies)' == ''">
-
-    <ItemGroup>
-      <_StaticWebAssetsProjectReference Include="%(ReferencePath.MSBuildSourceProjectFile)" />
-    </ItemGroup>
-
   </Target>
 
   <!--
@@ -317,9 +335,11 @@ Copyright (c) .NET Foundation. All rights reserved.
        prevents the content from being packed even though we are including it explictily in
        GenerateStaticWebAssetsPackTargets
    -->
-  <Target Name="_RemoveWebRootContentFromPackaging" DependsOnTargets="_CreateStaticWebAssetsCustomPropsCacheFile" >
+  <Target Name="_RemoveWebRootContentFromPackaging" DependsOnTargets="ResolveStaticWebAssetsInputs">
     <ItemGroup>
-      <Content Remove="@(_CurrentProjectStaticWebAsset->'wwwroot\%(RelativePath)')"  />
+      <Content
+        Condition="'%(StaticWebAsset.SourceType)' == ''"
+        Remove="@(StaticWebAsset->'wwwroot\%(RelativePath)')"  />
     </ItemGroup>
   </Target>
 
@@ -498,4 +518,4 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>

From 8d23c27cb39aac1a00d318913b1e640693aff212 Mon Sep 17 00:00:00 2001
From: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>
Date: Wed, 14 Aug 2019 07:27:16 -0700
Subject: [PATCH 241/337] [automated] Merge branch 'release/3.0' => 'master'
 (dotnet/aspnetcore-tooling#968)

* Give "builder" a less discoverable name

Fixes https://github.com/aspnet/AspNetCore/issues/12991

* Fixup tests

* [Blazor][Fixes dotnet/aspnetcore-tooling#12933] Remove the need for a custom property when resolving static web assets from referenced projects

* Removes the need for a custom property when resolving static web assets from referenced projects
* Rolls in several improvements suggested by the MSBuild folks to improve performance.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/112f72da6b7ee2e555094a471a5f999f5b41bb19
---
 .../BasicComponent_DesignTime.codegen.cs      |   2 +-
 .../BasicComponent_DesignTime.mappings.txt    |   6 +-
 .../BasicComponent_Runtime.codegen.cs         |  14 +-
 .../ComponentDesignTimeNodeWriter.cs          |  22 +--
 .../ComponentDocumentClassifierPass.cs        |   2 +-
 .../src/Components/ComponentNodeWriter.cs     |  21 +--
 .../Components/ComponentRuntimeNodeWriter.cs  |  30 ++--
 .../src/Components/ComponentsApi.cs           |   2 +
 .../src/Components/ScopeStack.cs              |   6 +-
 .../ComponentCodeGenerationTestBase.cs        |  10 +-
 .../ComponentDeclarationIntegrationTest.cs    |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  26 ++--
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  32 ++---
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |  18 +--
 .../TestComponent.mappings.txt                |  20 +--
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |  10 +-
 .../TestComponent.codegen.cs                  |  22 +--
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  20 +--
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../Counter.codegen.cs                        |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../Element_WithKey/TestComponent.codegen.cs  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../Element_WithRef/TestComponent.codegen.cs  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |  10 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |  10 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../Regression_597/TestComponent.codegen.cs   |   4 +-
 .../Regression_597/TestComponent.mappings.txt |   4 +-
 .../Regression_609/TestComponent.codegen.cs   |   4 +-
 .../Regression_609/TestComponent.mappings.txt |   6 +-
 .../Regression_772/TestComponent.codegen.cs   |   4 +-
 .../Regression_773/TestComponent.codegen.cs   |   4 +-
 .../Regression_784/TestComponent.codegen.cs   |   2 +-
 .../Regression_784/TestComponent.mappings.txt |   6 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |  18 +--
 .../TestComponent.mappings.txt                |  16 +--
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |  18 +--
 .../TestComponent.mappings.txt                |  20 +--
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  20 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  28 ++--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  20 +--
 .../TestComponent.codegen.cs                  |  26 ++--
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.codegen.cs                  |  36 ++---
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.ir.txt                      |  22 +--
 .../TestComponent.mappings.txt                |  20 +--
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.codegen.cs                  |  34 ++---
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |  20 +--
 .../TestComponent.codegen.cs                  |  22 +--
 .../TestComponent.codegen.cs                  |  22 +--
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  40 +++---
 .../ComponentImports/_Imports.codegen.cs      |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |  18 +--
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.codegen.cs                  |   6 +-
 .../Counter.codegen.cs                        |   6 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |  18 +--
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  24 ++--
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  20 +--
 .../TestComponent.codegen.cs                  |  26 ++--
 .../TestComponent.codegen.cs                  |   4 +-
 .../Element_WithKey/TestComponent.codegen.cs  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  26 ++--
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  22 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  26 ++--
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../Regression_597/TestComponent.codegen.cs   |  10 +-
 .../Regression_597/TestComponent.mappings.txt |   2 +-
 .../Regression_609/TestComponent.codegen.cs   |  14 +-
 .../Regression_609/TestComponent.mappings.txt |   2 +-
 .../Regression_772/TestComponent.codegen.cs   |  10 +-
 .../Regression_773/TestComponent.codegen.cs   |  10 +-
 .../Regression_784/TestComponent.codegen.cs   |  10 +-
 .../Regression_784/TestComponent.mappings.txt |   2 +-
 .../TestComponent.codegen.cs                  |  20 +--
 .../TestComponent.codegen.cs                  |  16 +--
 .../TestComponent.ir.txt                      |  26 ++--
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  18 +--
 .../TestComponent.ir.txt                      |  26 ++--
 .../TestComponent.mappings.txt                |  16 +--
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 134 ++++++++++--------
 646 files changed, 2305 insertions(+), 2282 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 91ff0b78fb..92d78d57b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -28,7 +28,7 @@ IDisposable __typeHelper = default!;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 57bd7e92e9..4e620df0e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (641:17,0 [11] )
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1238:35,13 [15] )
+Generated Location: (1240:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1435:43,6 [29] )
+Generated Location: (1437:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1687:52,12 [37] )
+Generated Location: (1689:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 6850616bb0..2059dba321 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -12,10 +12,10 @@ namespace __GeneratedComponent
     public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "class", 
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "class", 
 #nullable restore
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
              this.ToString()
@@ -24,8 +24,8 @@ namespace __GeneratedComponent
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(2, "\r\n    Hello world\r\n    ");
-            builder.AddContent(3, 
+            __builder.AddMarkupContent(2, "\r\n    Hello world\r\n    ");
+            __builder.AddContent(3, 
 #nullable restore
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml"
      string.Format("{0}", "Hello")
@@ -34,8 +34,8 @@ namespace __GeneratedComponent
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(4, "\r\n");
-            builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index ae81506bc6..78cdcc5496 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -311,12 +311,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 // Writes something like:
                 //
-                // builder.OpenComponent<MyComponent>(0);
-                // builder.AddAttribute(1, "Foo", ...);
-                // builder.AddAttribute(2, "ChildContent", ...);
-                // builder.SetKey(someValue);
-                // builder.AddElementCapture(3, (__value) => _field = __value);
-                // builder.CloseComponent();
+                // __builder.OpenComponent<MyComponent>(0);
+                // __builder.AddAttribute(1, "Foo", ...);
+                // __builder.AddAttribute(2, "ChildContent", ...);
+                // __builder.SetKey(someValue);
+                // __builder.AddElementCapture(3, (__value) => _field = __value);
+                // __builder.CloseComponent();
 
                 foreach (var typeArgument in node.TypeArguments)
                 {
@@ -375,7 +375,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 // the component on the builder. We generate a method elsewhere, and then pass all of the information
                 // to that method. We pass in all of the attribute values + the sequence numbers.
                 //
-                // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ....);
+                // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, ..., 2, ..., 3, ....);
 
                 // Preserve order of attributes + splats
                 var attributes = node.Children.Where(s =>
@@ -676,9 +676,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Writes something like:
             //
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
+            // __builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
             // OR
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
+            // __builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
             BeginWriteAttribute(context.CodeWriter, node.AttributeName);
             context.CodeWriter.Write($"({node.TypeName})(");
 
@@ -775,7 +775,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Looks like:
             //
-            // builder.SetKey(_keyValue);
+            // __builder.SetKey(_keyValue);
 
             var codeWriter = context.CodeWriter;
 
@@ -811,7 +811,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Looks like:
             //
-            // builder.AddMultipleAttributes(2, ...);
+            // __builder.AddMultipleAttributes(2, ...);
             context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMultipleAttributes}");
             context.CodeWriter.Write("-1");
             context.CodeWriter.WriteParameterSeparator();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index 8e2b1970e0..ea13bcb6c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 method.Parameters.Clear();
                 method.Parameters.Add(new MethodParameter()
                 {
-                    ParameterName = "builder",
+                    ParameterName = ComponentsApi.RenderTreeBuilder.BuilderParameter,
                     TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName,
                 });
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index 6ab28d04ff..e2b224db7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             //
             // Looks like:
             //
-            //  public static void CreateFoo_0<T1, T2>(RenderTreeBuilder builder, int seq, int __seq0, T1 __arg0, int __seq1, global::System.Collections.Generic.List<T2> __arg1, int __seq2, string __arg2)
+            //  public static void CreateFoo_0<T1, T2>(RenderTreeBuilder __builder, int seq, int __seq0, T1 __arg0, int __seq1, global::System.Collections.Generic.List<T2> __arg1, int __seq2, string __arg2)
             //  {
             //      builder.OpenComponent<Foo<T1, T2>>();
             //      builder.AddAttribute(__seq0, "Attr0", __arg0);
@@ -88,7 +88,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             writer.Write("(");
             writer.Write("global::");
             writer.Write(ComponentsApi.RenderTreeBuilder.FullTypeName);
-            writer.Write(" builder");
+            writer.Write(" ");
+            writer.Write(ComponentsApi.RenderTreeBuilder.BuilderParameter);
             writer.Write(", ");
             writer.Write("int seq");
 
@@ -118,8 +119,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             writer.WriteLine("{");
 
-            // builder.OpenComponent<TComponent>(42);
-            context.CodeWriter.Write("builder");
+            // _builder.OpenComponent<TComponent>(42);
+            context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.BuilderParameter);
             context.CodeWriter.Write(".");
             context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
             context.CodeWriter.Write("<");
@@ -136,7 +137,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 if (child is ComponentAttributeIntermediateNode attribute)
                 {
-                    context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                    context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.AddAttribute);
                     context.CodeWriter.Write(parameters[index].seqName);
                     context.CodeWriter.Write(", ");
 
@@ -149,7 +150,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
                 else if (child is SplatIntermediateNode)
                 {
-                    context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddMultipleAttributes);
+                    context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.AddMultipleAttributes);
                     context.CodeWriter.Write(parameters[index].seqName);
                     context.CodeWriter.Write(", ");
 
@@ -161,7 +162,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             foreach (var childContent in node.Component.ChildContents)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute);
+                context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.AddAttribute);
                 context.CodeWriter.Write(parameters[index].seqName);
                 context.CodeWriter.Write(", ");
 
@@ -176,7 +177,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             foreach (var setKey in node.Component.SetKeys)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.SetKey);
+                context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.SetKey);
                 context.CodeWriter.Write(parameters[index].parameterName);
                 context.CodeWriter.WriteEndMethodInvocation();
 
@@ -185,7 +186,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             foreach (var capture in node.Component.Captures)
             {
-                context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
+                context.CodeWriter.WriteStartInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture);
                 context.CodeWriter.Write(parameters[index].seqName);
                 context.CodeWriter.Write(", ");
 
@@ -196,7 +197,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 index++;
             }
 
-            context.CodeWriter.WriteInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.CloseComponent);
+            context.CodeWriter.WriteInstanceMethodInvocation(ComponentsApi.RenderTreeBuilder.BuilderParameter, ComponentsApi.RenderTreeBuilder.CloseComponent);
 
             writer.WriteLine("}");
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 3e41b668a2..c2ae3e539b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -334,14 +334,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 //
                 // Writes something like:
                 //
-                // builder.OpenComponent<MyComponent>(0);
-                // builder.AddAttribute(1, "Foo", ...);
-                // builder.AddAttribute(2, "ChildContent", ...);
-                // builder.SetKey(someValue);
-                // builder.AddElementCapture(3, (__value) => _field = __value);
-                // builder.CloseComponent();
+                // _builder.OpenComponent<MyComponent>(0);
+                // _builder.AddAttribute(1, "Foo", ...);
+                // _builder.AddAttribute(2, "ChildContent", ...);
+                // _builder.SetKey(someValue);
+                // _builder.AddElementCapture(3, (__value) => _field = __value);
+                // _builder.CloseComponent();
 
-                // builder.OpenComponent<TComponent>(42);
+                // _builder.OpenComponent<TComponent>(42);
                 context.CodeWriter.Write(_scopeStack.BuilderVarName);
                 context.CodeWriter.Write(".");
                 context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
@@ -383,7 +383,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     context.RenderNode(capture);
                 }
 
-                // builder.CloseComponent();
+                // _builder.CloseComponent();
                 context.CodeWriter.Write(_scopeStack.BuilderVarName);
                 context.CodeWriter.Write(".");
                 context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.CloseComponent);
@@ -502,7 +502,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(node));
             }
 
-            // builder.AddAttribute(1, "Foo", 42);
+            // _builder.AddAttribute(1, "Foo", 42);
             context.CodeWriter.Write(_scopeStack.BuilderVarName);
             context.CodeWriter.Write(".");
             context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.AddAttribute);
@@ -656,9 +656,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Writes something like:
             //
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
+            // _builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
             // OR
-            // builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
+            // _builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
             BeginWriteAttribute(context.CodeWriter, node.AttributeName);
             context.CodeWriter.Write($"({node.TypeName})(");
 
@@ -716,7 +716,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             // Looks like:
             //
-            // builder.SetKey(_keyValue);
+            // _builder.SetKey(_keyValue);
 
             var codeWriter = context.CodeWriter;
 
@@ -752,7 +752,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Looks like:
             //
-            // builder.AddMultipleAttributes(2, ...);
+            // _builder.AddMultipleAttributes(2, ...);
             context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddMultipleAttributes}");
             context.CodeWriter.Write((_sourceSequence++).ToString());
             context.CodeWriter.WriteParameterSeparator();
@@ -790,9 +790,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             // Looks like:
             //
-            // builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; });
+            // _builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; });
             // OR
-            // builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementReference)__value; });
+            // _builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementReference)__value; });
             var codeWriter = context.CodeWriter;
 
             var methodName = node.IsComponentCapture
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index 01f7584094..d8a0e1f23a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -66,6 +66,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder";
 
+            public static readonly string BuilderParameter = "__builder";
+
             public static readonly string OpenElement = nameof(OpenElement);
 
             public static readonly string CloseElement = nameof(CloseElement);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
index 5349310415..f1d72f8763 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ScopeStack.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         private readonly Stack<ScopeEntry> _stack = new Stack<ScopeEntry>();
         private int _builderVarNumber = 1;
 
-        public string BuilderVarName { get; private set; } = "builder";
+        public string BuilderVarName { get; private set; } = ComponentsApi.RenderTreeBuilder.BuilderParameter;
 
         public void OpenComponentScope(CodeRenderingContext context, string name, string parameterName)
         {
@@ -61,8 +61,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         {
             _builderVarNumber += delta;
             BuilderVarName = _builderVarNumber == 1
-                ? "builder"
-                : $"builder{_builderVarNumber}";
+                ? ComponentsApi.RenderTreeBuilder.BuilderParameter
+                : $"{ComponentsApi.RenderTreeBuilder.BuilderParameter}{_builderVarNumber}";
         }
 
         private class ScopeEntry
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 727f3ccca4..df812b8432 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -30,10 +30,10 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 @using Microsoft.AspNetCore.Components.Rendering;
 
 @code {
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = ""Builder is null!"";
+        if (__builder == null) output = ""Builder is null!"";
         else output = ""Builder is not null!"";
         <p>Output: @output</p>
     }
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
 @{
     var output = string.Empty;
-    if (builder == null) output = ""Builder is null!"";
+    if (__builder == null) output = ""Builder is null!"";
     else output = ""Builder is not null!"";
     <p>Output: @output</p>
 }");
@@ -85,10 +85,10 @@ namespace Test
             var generated = CompileToCSharp(@"
 @using Microsoft.AspNetCore.Components.Rendering;
 
-@{ RenderChildComponent(builder); }
+@{ RenderChildComponent(__builder); }
 
 @code {
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         <MyComponent />
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 547c5e805f..2e2d33795b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -139,7 +139,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 48460b327e..923f53aa34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index 1533d19b6e..b9c3ad0c68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1114:31,19 [33] )
+Generated Location: (1116:31,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 45baed42fd..7cb838c658 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 949d9fdfe9..019d1a5033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1112:31,17 [7] )
+Generated Location: (1114:31,17 [7] )
 |OnClick|
 
 Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1313:41,7 [91] )
+Generated Location: (1315:41,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 20491997e4..4f94884c3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index 586e4bd5fc..85bcb66ba4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1114:31,19 [32] )
+Generated Location: (1116:31,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 0b34cc25ac..0497f44ac4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System.Threading.Tasks;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 3c601ce984..a5deb24ba1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (285:11,0 [28] )
 
 Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1112:31,17 [7] )
+Generated Location: (1114:31,17 [7] )
 |OnClick|
 
 Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1313:41,7 [73] )
+Generated Location: (1315:41,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index cd516198d8..84cac0e8e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -32,7 +32,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 78f4ffa290..1916b07cd6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2053:48,7 [50] )
+Generated Location: (2059:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 2f1cda84cc..5a00dd85eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -54,13 +54,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 966cfbe2d8..b494dcb312 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (965:25,30 [11] )
+Generated Location: (969:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1575:43,7 [65] )
+Generated Location: (1579:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index caa6b620e5..57e2130887 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index bcd31ff54f..9ecd211b8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1877:47,7 [50] )
+Generated Location: (1883:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 5f16942123..4484f1a45f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 0d8e6ff314..25c6988086 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1877:47,7 [55] )
+Generated Location: (1883:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index e43e400e9e..c8bfc0fe1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 7e14cd456e..2ef0335db5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1580:47,7 [50] )
+Generated Location: (1586:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index f829ac0bd7..e1f835a623 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index bf8f508161..febf366dee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (888:25,26 [11] )
+Generated Location: (890:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1556:46,7 [50] )
+Generated Location: (1562:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 9d39070c60..60071ceb0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -32,7 +32,7 @@ namespace Test
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 4030967002..d4819b00d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1756:48,7 [50] )
+Generated Location: (1762:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 0ff19e92b0..35ac8c9678 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -54,13 +54,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 8e68869760..28c62af7a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (965:25,30 [11] )
+Generated Location: (969:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1395:43,7 [65] )
+Generated Location: (1399:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index e43e400e9e..c8bfc0fe1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 72641274a8..94cb7ac41c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1580:47,7 [50] )
+Generated Location: (1586:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index f829ac0bd7..e1f835a623 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index d081d552df..1cc33f50d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (888:25,26 [11] )
+Generated Location: (890:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1556:46,7 [50] )
+Generated Location: (1562:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 3a2018558e..49a81abc8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.Int32>(
             __value => ParentValue = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index e691e6219d..bc42633054 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (976:25,26 [11] )
+Generated Location: (978:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1580:47,7 [55] )
+Generated Location: (1586:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 810ed6f99f..555897d252 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
@@ -31,7 +31,7 @@ namespace Test
             );
             __o = new System.Action<System.String>(
             __value => person.Name = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index a904dd1513..8354f5d085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (975:25,24 [11] )
+Generated Location: (977:25,24 [11] )
 |person.Name|
 
 Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1572:47,1 [37] )
+Generated Location: (1578:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 38d956a4ac..3cf27c8dbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index 5897b8735f..eb604f4eb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1088:32,19 [11] )
+Generated Location: (1090:32,19 [11] )
 |ParentValue|
 
 Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1328:40,82 [28] )
+Generated Location: (1330:40,82 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1729:51,7 [55] )
+Generated Location: (1731:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 78951333e8..2ad7e8ca39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 91589b5010..80054575f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (953:25,33 [11] )
+Generated Location: (955:25,33 [11] )
 |CurrentDate|
 
 Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1332:36,7 [77] )
+Generated Location: (1334:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 7dd6d0446a..2f9f73f9f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index dae0b62824..d491685d6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (953:25,33 [11] )
+Generated Location: (955:25,33 [11] )
 |ParentValue|
 
 Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1298:36,7 [50] )
+Generated Location: (1300:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index db56c244e7..6c72cf50ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index c171e52546..d647010517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1088:32,19 [11] )
+Generated Location: (1090:32,19 [11] )
 |ParentValue|
 
 Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1332:40,86 [28] )
+Generated Location: (1334:40,86 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1733:51,7 [55] )
+Generated Location: (1735:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index f4d8db4b4a..d132d64692 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index 0a7d23cc50..b90f2ba46c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (939:25,19 [11] )
+Generated Location: (941:25,19 [11] )
 |ParentValue|
 
 Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1284:36,7 [55] )
+Generated Location: (1286:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index f4d8db4b4a..d132d64692 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 2ac8acfa18..b9f8a07075 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (939:25,19 [11] )
+Generated Location: (941:25,19 [11] )
 |ParentValue|
 
 Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1284:36,7 [55] )
+Generated Location: (1286:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index d28f610696..58e2c3ead9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 448c878b48..10c2355493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (938:25,18 [11] )
+Generated Location: (940:25,18 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1283:36,7 [55] )
+Generated Location: (1285:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index c616fe8d74..1f93482650 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 489435051a..714d158f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (933:25,13 [11] )
+Generated Location: (935:25,13 [11] )
 |ParentValue|
 
 Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1278:36,7 [55] )
+Generated Location: (1280:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 0b86f548dc..6d964a9648 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 6de25a149d..38458c0f94 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1104:32,35 [11] )
+Generated Location: (1106:32,35 [11] )
 |ParentValue|
 
 Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1449:43,7 [44] )
+Generated Location: (1451:43,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index 148b662999..cb84e6838b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using System.Globalization;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 874ba65d57..72f36493d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1104:32,35 [11] )
+Generated Location: (1106:32,35 [11] )
 |ParentValue|
 
 Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.CurrentCulture|
-Generated Location: (1364:40,102 [26] )
+Generated Location: (1366:40,102 [26] )
 |CultureInfo.CurrentCulture|
 
 Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1761:51,7 [44] )
+Generated Location: (1763:51,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index e801a7b243..752a6e8a4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  __o = context.ToLowerInvariant();
@@ -52,7 +52,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index fd7ee89fb7..880cdf737d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (844:24,2 [46] )
+Generated Location: (846:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1096:32,55 [26] )
+Generated Location: (1100:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1347:40,87 [2] )
+Generated Location: (1351:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1578:48,21 [6] )
+Generated Location: (1582:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index b8cc7871e7..ae565ac6c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  __o = context.ToLowerInvariant();
@@ -52,10 +52,10 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index fd7ee89fb7..880cdf737d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (844:24,2 [46] )
+Generated Location: (846:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1096:32,55 [26] )
+Generated Location: (1100:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1347:40,87 [2] )
+Generated Location: (1351:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1578:48,21 [6] )
+Generated Location: (1582:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index dc2dac17bb..afb7769b91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index e997565427..ca548a7cfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (951:25,31 [7] )
+Generated Location: (953:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1284:36,7 [41] )
+Generated Location: (1286:36,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 00f5a97b52..ebaa5698f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 8f1f1c6619..34b78741d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (935:25,15 [11] )
+Generated Location: (937:25,15 [11] )
 |CurrentDate|
 
 Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1314:36,7 [77] )
+Generated Location: (1316:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 5fb0a7cd4a..88df4b2931 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 835b635c0a..a90f46fda1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (947:25,27 [11] )
+Generated Location: (949:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1159:33,55 [6] )
+Generated Location: (1161:33,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1515:44,7 [135] )
+Generated Location: (1517:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 7e352b7b7b..f71815f894 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index a4b37c2bc1..6e175bf68d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (947:25,27 [11] )
+Generated Location: (949:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1336:36,7 [77] )
+Generated Location: (1338:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index e46b8f8a75..8bb172e78b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 2fe7d40c8b..4eb477f456 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (947:25,27 [11] )
+Generated Location: (949:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1292:36,7 [50] )
+Generated Location: (1294:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 8f8f38a493..703bc0e0ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 6dadc5b907..5d2ae4e43d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,29 [11] )
+Generated Location: (951:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1474:36,7 [77] )
+Generated Location: (1476:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index bbc5650b3e..b15ddfef53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 692901b204..341e1eea38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,29 [11] )
+Generated Location: (951:25,29 [11] )
 |CurrentDate|
 
 Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1328:36,7 [77] )
+Generated Location: (1330:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 22dd0004d0..63f4552487 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 719bedbe88..b443bef47e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,29 [11] )
+Generated Location: (951:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1338:36,7 [77] )
+Generated Location: (1340:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 8e70500f8d..f883f7afd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 8a5130396b..3bcfc76cdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (941:25,21 [11] )
+Generated Location: (943:25,21 [11] )
 |CurrentDate|
 
 Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:36,7 [77] )
+Generated Location: (1322:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 8e70500f8d..f883f7afd9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 70dbb75c76..073152fdb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (941:25,21 [11] )
+Generated Location: (943:25,21 [11] )
 |CurrentDate|
 
 Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1320:36,7 [77] )
+Generated Location: (1322:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index c248a459f6..29c1053e5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index bab09f9912..876a9ff033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (877:25,15 [11] )
+Generated Location: (879:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1081:35,7 [50] )
+Generated Location: (1083:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 5d49497d9e..a0f1f280f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index b51bf566b7..f6c8f0bf36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (935:25,15 [11] )
+Generated Location: (937:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1280:36,7 [50] )
+Generated Location: (1282:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 3da83553d0..68a2080324 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index 9d5b691569..7ec03d3ee7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1168:34,34 [4] )
+Generated Location: (1170:34,34 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index a098d9e32c..bc51fcd9ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -40,7 +40,7 @@ namespace Test
             );
             __o = new System.Action<string>(
             __value => Value = __value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index e976cfb03a..9f0f4fc7de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1171:34,37 [5] )
+Generated Location: (1173:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1759:56,7 [21] )
+Generated Location: (1765:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index 4f2abfab38..a5df564c24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -39,7 +39,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 9bbe256d34..a3dae2375d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1089:34,37 [5] )
+Generated Location: (1091:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1741:55,7 [21] )
+Generated Location: (1747:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 454b7d2a9c..4f7323a5d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       18
@@ -61,13 +61,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddAttribute(__seq1, "Item", __arg1);
-        builder.AddAttribute(__seq2, "ItemChanged", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddAttribute(__seq1, "Item", __arg1);
+        __builder.AddAttribute(__seq2, "ItemChanged", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 95440a4ee9..61ebc61d7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (973:25,38 [2] )
+Generated Location: (977:25,38 [2] )
 |18|
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1141:33,24 [5] )
+Generated Location: (1145:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1628:50,7 [21] )
+Generated Location: (1632:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 0e6ba77c0f..b64f5abb07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -37,7 +37,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -71,19 +71,19 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 8afcca9abf..674ff91c47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (959:25,24 [5] )
+Generated Location: (963:25,24 [5] )
 |Value|
 
 Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1415:42,24 [5] )
+Generated Location: (1421:42,24 [5] )
 |Value|
 
 Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1810:60,7 [21] )
+Generated Location: (1816:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 417b88619b..749e03142d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
   __o = context.ToLower();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index 3b1d7bc164..8a754a980e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1168:34,34 [4] )
+Generated Location: (1170:34,34 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1458:43,8 [17] )
+Generated Location: (1464:43,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index c8891e6e3d..d13dc319a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
   __o = context.ToLower();
@@ -54,12 +54,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
index 66b1b155f8..1f4ebd3b11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1138:33,8 [17] )
+Generated Location: (1144:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index bbe3d42ee7..dcdd42885f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -47,7 +47,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index 091fffaf62..7d02d0f497 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (888:25,19 [6] )
+Generated Location: (890:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1168:34,34 [4] )
+Generated Location: (1170:34,34 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1380:43,50 [2] )
+Generated Location: (1382:43,50 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 79cb17807a..12f3793bd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -53,12 +53,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Other", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Other", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
index a0f15c9c14..4b634587b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1139:33,37 [2] )
+Generated Location: (1143:33,37 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index c22f8cbecc..a4f1ef9faf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -45,11 +45,11 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
index 852bb94b3e..91992ce60b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 021408fb65..e3c32b785d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -36,7 +36,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "how are you?"
@@ -52,7 +52,7 @@ __o = typeof(MyComponent<>);
 #line default
 #line hidden
 #nullable disable
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(__builder, -1, -1, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "bye!"
@@ -77,23 +77,23 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
index 0a0bec7b18..a1d9146951 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |"how are you?"|
-Generated Location: (1362:41,21 [14] )
+Generated Location: (1368:41,21 [14] )
 |"how are you?"|
 
 Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1778:57,21 [6] )
+Generated Location: (1786:57,21 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 9ed07ea5b0..763208227c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -25,11 +25,11 @@ using Microsoft.AspNetCore.Components.Rendering;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-   RenderChildComponent(builder); 
+   RenderChildComponent(__builder); 
 
 #line default
 #line hidden
@@ -39,14 +39,14 @@ using Microsoft.AspNetCore.Components.Rendering;
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         
 
 #line default
 #line hidden
 #nullable disable
-        builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+        __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
         }
         ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index a132a6a8c3..898fc12d48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -17,12 +17,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                CSharpCode - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-                HtmlContent - (90:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (90:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        
-            Component - (174:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            CSharpCode - (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+                CSharpCode - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(__builder); 
+                HtmlContent - (92:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (92:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        
+            Component - (178:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            CSharpCode - (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 841ddac01f..29fd9cd544 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -3,27 +3,27 @@ Source Location: (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [48] )
 |using Microsoft.AspNetCore.Components.Rendering;|
 
-Source Location: (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-| RenderChildComponent(builder); |
-Generated Location: (1014:31,2 [32] )
-| RenderChildComponent(builder); |
+Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(__builder); |
+Generated Location: (1016:31,2 [34] )
+| RenderChildComponent(__builder); |
 
-Source Location: (99:4,7 [75] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         |
-Generated Location: (1224:40,7 [75] )
+Generated Location: (1228:40,7 [77] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         |
 
-Source Location: (189:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1731:60,23 [9] )
+Generated Location: (1741:60,23 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index f5df579563..3bb8afce2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -37,7 +37,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 8ae3049e0e..109a769b74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
         |
-Generated Location: (1015:31,2 [50] )
+Generated Location: (1017:31,2 [50] )
 |
     void RenderChildComponent()
     {
@@ -18,13 +18,13 @@ Source Location: (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1509:51,23 [9] )
+Generated Location: (1515:51,23 [9] )
 |
     }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1640:59,2 [25] )
+Generated Location: (1646:59,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 1d749a96e7..7af1cd161e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -47,7 +47,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                 __o = context.ToLower();
@@ -57,7 +57,7 @@ namespace Test
 #nullable disable
             }
             ));
-            builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
+            __builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (__builder2) => {
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = System.Math.Max(0, item.Item);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index d9a5f6e72d..a013914c8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (889:25,20 [6] )
+Generated Location: (891:25,20 [6] )
 |string|
 
 Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1094:34,34 [3] )
+Generated Location: (1096:34,34 [3] )
 |int|
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1383:43,46 [4] )
+Generated Location: (1385:43,46 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1687:52,22 [17] )
+Generated Location: (1693:52,22 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2040:62,6 [29] )
+Generated Location: (2050:62,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 0c2fade130..208c80726f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -36,7 +36,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                 __o = context.ToLower();
@@ -45,7 +45,7 @@ namespace Test
 #line hidden
 #nullable disable
             }
-            , -1, (item) => (builder2) => {
+            , -1, (item) => (__builder2) => {
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = System.Math.Max(0, item.Item);
@@ -71,14 +71,14 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Items", __arg1);
-        builder.AddAttribute(__seq2, "ChildContent", __arg2);
-        builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Items", __arg1);
+        __builder.AddAttribute(__seq2, "ChildContent", __arg2);
+        __builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
index f4478eabf1..f426774039 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |new List<long>()|
-Generated Location: (1138:33,36 [16] )
+Generated Location: (1142:33,36 [16] )
 |new List<long>()|
 
 Source Location: (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1346:41,22 [17] )
+Generated Location: (1352:41,22 [17] )
 |context.ToLower()|
 
 Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (1552:50,6 [29] )
+Generated Location: (1560:50,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 8494b36875..4837552cab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
               __o = context.ToLower();
@@ -37,7 +37,7 @@ namespace Test
 #line hidden
 #nullable disable
             }
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
           __o = context;
@@ -63,13 +63,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
-        builder.AddAttribute(__seq2, "IntFragment", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        __builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
index 4f31e4fe0f..d71bd72c42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (956:25,21 [4] )
+Generated Location: (960:25,21 [4] )
 |"hi"|
 
 Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1150:33,20 [17] )
+Generated Location: (1156:33,20 [17] )
 |context.ToLower()|
 
 Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1369:42,16 [7] )
+Generated Location: (1377:42,16 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index dde890cc2e..0ac21533e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 2f15506ae8..79da952af0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index dde890cc2e..0ac21533e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index dde890cc2e..0ac21533e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 36c7b0de76..b1dfdbee8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 4e1f8a4138..12601265bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (948:25,23 [9] )
+Generated Location: (950:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1450:45,7 [100] )
+Generated Location: (1456:45,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 0d0b314ef1..24df5d5d96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                       __o = context;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
index 744da74245..886078a3e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1017:25,28 [7] )
+Generated Location: (1023:25,28 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 0b7949f0b7..8a92d8e5be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index 816bbc1ae0..bfc910e3cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (982:25,31 [13] )
+Generated Location: (984:25,31 [13] )
 |42.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 4644861321..820652633e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                 __o = context.ToLowerInvariant();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
index ab0cf79bc6..2ffb89de20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1066:26,54 [26] )
+Generated Location: (1072:26,54 [26] )
 |context.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index 50ac169c11..a3634216a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                           __o = item.ToLowerInvariant();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
index 30fe7a2267..d146087517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1041:26,32 [23] )
+Generated Location: (1047:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index 50ac169c11..a3634216a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                           __o = item.ToLowerInvariant();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
index 30fe7a2267..d146087517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1041:26,32 [23] )
+Generated Location: (1047:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 83bacb072a..30c2e33e4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index fc4d01e139..1af432007d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (949:25,24 [21] )
+Generated Location: (951:25,24 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1463:45,7 [87] )
+Generated Location: (1469:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 19e66f1a19..47210e050e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = 
@@ -30,7 +30,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
index 788029e013..e34837f351 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |43.ToString()|
-Generated Location: (940:26,55 [13] )
+Generated Location: (942:26,55 [13] )
 |43.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index 560268f131..b5992d9e8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -40,9 +40,9 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 74fc1e1b5b..15f0710ed8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -48,7 +48,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index da26341ee3..13c6f4aba3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (967:25,17 [3] )
+Generated Location: (969:25,17 [3] )
 |123|
 
 Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1236:34,18 [4] )
+Generated Location: (1238:34,18 [4] )
 |true|
 
 Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (1530:44,20 [14] )
+Generated Location: (1532:44,20 [14] )
 |new SomeType()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index c8e33d4d32..f6933a3843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index ea1039bf53..72848bac9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1005:25,26 [7] )
+Generated Location: (1007:25,26 [7] )
 |OnClick|
 
 Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1508:45,7 [62] )
+Generated Location: (1514:45,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index d488f71680..4d90da0a66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using AnotherTest;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -37,7 +37,7 @@ __o = typeof(HeaderComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
        __o = context;
@@ -54,7 +54,7 @@ __o = typeof(FooterComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -64,7 +64,7 @@ __o = typeof(Test.HeaderComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
 #nullable restore
 #line 13 "x:\dir\subdir\Test\TestComponent.cshtml"
        __o = context;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
index 16c41bfe9f..2facaeab6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1435:42,13 [7] )
+Generated Location: (1445:42,13 [7] )
 |context|
 
 Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (2208:69,13 [7] )
+Generated Location: (2226:69,13 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index 7e4c43943f..fcccf73b5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index 0ad10bed01..6e8856f24e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (977:25,27 [11] )
+Generated Location: (979:25,27 [11] )
 |"very-cool"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index e49dbc9754..fd817fd0b7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -44,7 +44,7 @@ global::System.Object TItem2 = null!;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index ca78b976c0..626321cc28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -17,20 +17,20 @@ Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
     |
-Generated Location: (1413:50,1 [38] )
+Generated Location: (1415:50,1 [38] )
 |foreach (var item2 in Items2)
 {
     |
 
 Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildContent(item2)|
-Generated Location: (1579:59,6 [19] )
+Generated Location: (1581:59,6 [19] )
 |ChildContent(item2)|
 
 Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1730:66,8 [3] )
+Generated Location: (1732:66,8 [3] )
 |
 }|
 
@@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1912:76,7 [185] )
+Generated Location: (1914:76,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index a2e10ffeb3..de8fb88166 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -32,9 +32,9 @@ using Foo = Test3;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 9aca88538e..b18ce55394 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -40,7 +40,7 @@ __o = typeof(MyComponent);
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index 80f6ce0e68..5f5c3fccdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1317:36,43 [4] )
+Generated Location: (1323:36,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 3446885aa2..090642d184 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -48,7 +48,7 @@ __o = typeof(MyComponent);
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index 00ee2bedd8..23e9abd843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (976:25,26 [1] )
+Generated Location: (978:25,26 [1] )
 |1|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1548:44,26 [1] )
+Generated Location: (1554:44,26 [1] )
 |2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index 03daf5c7c0..ac01a589cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -32,9 +32,9 @@ using System.Reflection;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 999f0c3bd3..022aa82fcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -42,9 +42,9 @@ global::System.Object __typeHelper = nameof(New.Test);
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index ec17594d73..871aff83f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 45475919ac..2ccb2c7033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (1138:34,1 [18] )
+Generated Location: (1144:34,1 [18] )
 |if (true)
 {
     |
@@ -10,7 +10,7 @@ Generated Location: (1138:34,1 [18] )
 Source Location: (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1316:43,38 [3] )
+Generated Location: (1322:43,38 [3] )
 |
 }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index c313ad5852..fe5bbc7cc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -30,7 +30,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -40,7 +40,7 @@ __o = typeof(Test.MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 5e7e2fe184..bcdaaceb08 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 6487d39922..4a28e67157 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => Increment()|
-Generated Location: (1002:25,23 [17] )
+Generated Location: (1004:25,23 [17] )
 |() => Increment()|
 
 Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1512:45,7 [87] )
+Generated Location: (1518:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 30cba555f0..6b2c4db765 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -39,9 +39,9 @@ using System.Reflection;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index b9d46dab0f..1ffc621022 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -18,14 +18,14 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         someDate.Day
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 8d917739f6..1f2a201d47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1108:30,40 [12] )
+Generated Location: (1116:30,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1462:47,7 [49] )
+Generated Location: (1470:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 874c3271e3..b26e07ae5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -18,13 +18,13 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    123 + 456
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index 9666aeab91..be1d874768 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1064:29,19 [9] )
+Generated Location: (1072:29,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 3dc7bb502f..ba2bab42ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -35,10 +35,10 @@ global::System.Object __typeHelper = nameof(AnotherTest);
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -49,7 +49,7 @@ __o = typeof(HeaderComponent);
 #line hidden
 #nullable disable
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 02b5be91d3..ee79e51bc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -23,11 +23,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index f38cfcc491..58fd008a0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1277:34,40 [10] )
+Generated Location: (1283:34,40 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
index 59fc9bfd74..ba331d501d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
index 97edd3de66..9b23b9d6be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1012:27,19 [10] )
+Generated Location: (1018:27,19 [10] )
 |myInstance|
 
 Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
 |
-Generated Location: (1377:43,7 [81] )
+Generated Location: (1383:43,7 [81] )
 |
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 2b89b0e462..94157bb880 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -23,10 +23,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 5aaca7dcaf..e79503fbd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1233:33,19 [10] )
+Generated Location: (1239:33,19 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index 5f76446c9b..e63835fdbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                    someAttributes
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             ));
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index 56e7ead145..e350d50bba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1151:26,51 [14] )
+Generated Location: (1155:26,51 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1682:47,7 [93] )
+Generated Location: (1690:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 9a20e372f0..437aa936f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                      someAttributes
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             ));
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index d7fcdaefc3..1071f34353 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1153:26,53 [14] )
+Generated Location: (1157:26,53 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1684:47,7 [93] )
+Generated Location: (1692:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 3e4fe0bef0..2b30a0fc0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                     18
@@ -61,12 +61,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddMultipleAttributes(__seq1, __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddMultipleAttributes(__seq1, __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 65ebdf23f8..a4d068708f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (955:25,20 [2] )
+Generated Location: (959:25,20 [2] )
 |18|
 
 Source Location: (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1138:33,39 [14] )
+Generated Location: (1142:33,39 [14] )
 |someAttributes|
 
 Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1496:50,7 [93] )
+Generated Location: (1500:50,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 734d086f28..d31201916b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                     someAttributes
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             ));
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index b10d0114a5..e6f880d0aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1152:26,52 [14] )
+Generated Location: (1156:26,52 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1683:47,7 [93] )
+Generated Location: (1691:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 9822867259..3243bc0179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -47,9 +47,9 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -59,7 +59,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 9b337e5ab2..d60d215ff3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -32,9 +32,9 @@ using Test3;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
@@ -44,7 +44,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index cc55ac39bd..6c8eb2ea9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 2fa9526204..5c3c63a812 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (844:24,2 [40] )
+Generated Location: (846:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1067:33,43 [7] )
+Generated Location: (1069:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index cc20229deb..02c86e143a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 0c1de99d68..7ec86b882d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (844:24,2 [40] )
+Generated Location: (846:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1066:33,42 [7] )
+Generated Location: (1068:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index 64aea3bdf8..1a7c0465eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 3dc0845f68..8d0f8e9df3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
@@ -41,7 +41,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 82ce79657e..ecd295ad1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (974:25,23 [7] )
+Generated Location: (976:25,23 [7] )
 |message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1276:34,48 [7] )
+Generated Location: (1278:34,48 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2347:57,12 [30] )
+Generated Location: (2353:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 5b75176677..7652aed053 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
@@ -41,7 +41,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index ca012e2038..626a5a0bb8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1111:25,31 [9] )
+Generated Location: (1113:25,31 [9] )
 |(s) => {}|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1427:34,59 [7] )
+Generated Location: (1429:34,59 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2498:57,12 [30] )
+Generated Location: (2504:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index b95c4615ca..8ebc97e75f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
@@ -41,7 +41,7 @@ namespace Test
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
             Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)));
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 75294b0867..2784a10f15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1061:25,59 [9] )
+Generated Location: (1063:25,59 [9] )
 |(s) => {}|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1346:34,29 [7] )
+Generated Location: (1348:34,29 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2417:57,12 [30] )
+Generated Location: (2423:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 9aadc7cd87..a5a20e720c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -18,12 +18,12 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 64aea3bdf8..1a7c0465eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index ba2d7a710e..cc9599e104 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 73ec689245..7262a51e39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (960:25,40 [4] )
+Generated Location: (962:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1289:36,12 [35] )
+Generated Location: (1291:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index e86a875a57..e8d5d697b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 08b8891cf5..7e3beb221b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1059:25,79 [8] )
+Generated Location: (1061:25,79 [8] )
 |() => {}|
 
 Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1318:34,35 [4] )
+Generated Location: (1320:34,35 [4] )
 |text|
 
 Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1647:45,12 [35] )
+Generated Location: (1649:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index ba2d7a710e..cc9599e104 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 73ec689245..7262a51e39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (960:25,40 [4] )
+Generated Location: (962:25,40 [4] )
 |text|
 
 Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1289:36,12 [35] )
+Generated Location: (1291:36,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 2e83debf77..5959396c75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index 9bcf8f3bac..6c41f0d357 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1011:25,32 [8] )
+Generated Location: (1013:25,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 6575ae18b9..90ef6d42f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      someObject
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index dfe8518ea3..151176cd4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (908:25,37 [10] )
+Generated Location: (912:25,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1112:35,7 [49] )
+Generated Location: (1116:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index e586d5dc74..b8c949ec27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  someObject
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index eba4da55cb..25deb5f4b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (899:25,37 [3] )
+Generated Location: (901:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (1117:34,49 [10] )
+Generated Location: (1121:34,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1321:44,7 [109] )
+Generated Location: (1325:44,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index b5ef29cad8..4d3ac61da7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index b979f4bec6..5fcd706664 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (898:26,7 [49] )
+Generated Location: (900:26,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index d6984c4cca..5d2a1913e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 40762af3ef..a5390e3ed9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1113:29,37 [6] )
+Generated Location: (1115:29,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 898891eba6..51761425a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -23,7 +23,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 30ffe3483c..809182470a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (1135:30,37 [3] )
+Generated Location: (1137:30,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1324:38,49 [8] )
+Generated Location: (1326:38,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1571:47,7 [56] )
+Generated Location: (1573:47,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 4a47e227b5..e806b81275 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index 61d9afb4aa..c3556e4657 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (854:24,12 [6] )
+Generated Location: (856:24,12 [6] )
 |myElem|
 
 Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1099:33,7 [78] )
+Generated Location: (1101:33,7 [78] )
 |
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 92801f90c7..27d46dcac7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 699da77b3c..745f25995e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1121:25,44 [14] )
+Generated Location: (1125:25,44 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1330:35,7 [93] )
+Generated Location: (1334:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 29ecb11ac4..21eb746abd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index b52c63a35a..3d403febff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (898:26,7 [93] )
+Generated Location: (900:26,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index e62c265c8c..c46b76cf90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index ef011d8d30..8089ffd525 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1123:25,46 [14] )
+Generated Location: (1127:25,46 [14] )
 |someAttributes|
 
 Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1332:35,7 [93] )
+Generated Location: (1336:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 0fe2ec1669..b246c7fd8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.AddMultipleAttributes(-1, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                              someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 1ffb2d7a1e..bb7f972a65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1122:25,45 [14] )
+Generated Location: (1126:25,45 [14] )
 |someAttributes|
 
 Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1331:35,7 [93] )
+Generated Location: (1335:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 6d3df11ae0..613b9c90be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index edf202f444..f1bbda428f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
-Generated Location: (1174:25,24 [63] )
+Generated Location: (1176:25,24 [63] )
 |EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
 
 Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1731:45,7 [87] )
+Generated Location: (1737:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index ba3c0df771..cb5bbaf9e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 664023c96d..6785ec354b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1676:45,7 [87] )
+Generated Location: (1682:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 3f30798d58..1993bb3081 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 3f47a85041..eeb8da148b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1676:45,7 [105] )
+Generated Location: (1682:45,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index c2260f5a91..a8937ccdd8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index f60cc20e9b..293a85f387 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1676:45,7 [141] )
+Generated Location: (1682:45,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 80c94c1a7f..e146803ca1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 3b5e7dfb65..1cf26fd915 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1676:45,7 [123] )
+Generated Location: (1682:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 668cf7aacd..402b5e2577 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index d7a5086f12..6be3c367a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1173:25,23 [9] )
+Generated Location: (1175:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1676:45,7 [106] )
+Generated Location: (1682:45,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 15a6dd7dd8..954e9007b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 9efcd4e8a0..9bdd713f1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1074:25,24 [45] )
+Generated Location: (1076:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1613:45,7 [87] )
+Generated Location: (1619:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 76d5e4cdb3..5003d15f3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 452bdef052..8a1f8344d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1576:45,7 [87] )
+Generated Location: (1582:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 86a1be0e8a..fa5a6c4e59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index e0a8638ef0..d04825c09f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1576:45,7 [95] )
+Generated Location: (1582:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 945da89171..3afaaad32b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index a6ba5e325c..61213c43c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1576:45,7 [123] )
+Generated Location: (1582:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index debc6e6d9e..f070a61d20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 9cd43d6257..84a885f977 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1073:25,23 [9] )
+Generated Location: (1075:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1576:45,7 [131] )
+Generated Location: (1582:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index c8554c06ce..42cde47e64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 92b4a9dea0..42198cd134 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (898:26,7 [49] )
+Generated Location: (900:26,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 7cbacfd354..5a369347e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 2da3e9977e..004a4b3064 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1197:35,7 [44] )
+Generated Location: (1199:35,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index f47157320b..df2ee06b5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index f9f1878532..12c73d9850 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1197:35,7 [49] )
+Generated Location: (1199:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 0e89232916..cacf184f71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 76f1046de7..0b0c2d59a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (996:25,17 [8] )
+Generated Location: (998:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index f47157320b..df2ee06b5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index f9f1878532..12c73d9850 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1197:35,7 [49] )
+Generated Location: (1199:35,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 0e89232916..cacf184f71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
index 76f1046de7..0b0c2d59a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (996:25,17 [8] )
+Generated Location: (998:25,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 74f406d1d9..09c791040d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index be2fc21ceb..6277f4b8b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (996:25,17 [7] )
+Generated Location: (998:25,17 [7] )
 |OnClick|
 
 Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1197:35,7 [31] )
+Generated Location: (1199:35,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 0694f9ab45..0470de96c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index cf404ce9f4..e847cd4baf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (996:25,17 [9] )
+Generated Location: (998:25,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 6d96332596..7090ffb026 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
index d4e36b5bbf..8584530928 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |(int x) => {}|
-Generated Location: (1328:40,31 [13] )
+Generated Location: (1332:40,31 [13] )
 |(int x) => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index fcd22ff1cf..32a5e149aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
index ff8f8bdd6b..458b346f18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1346:40,31 [7] )
+Generated Location: (1350:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index ec34ae46b9..36d80f3477 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
index c1e1122d16..6db713282c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1435:40,31 [7] )
+Generated Location: (1439:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index b4b5ccbb6d..abeb020cc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -60,12 +60,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 97cd8d797e..5da6791c80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1087:32,19 [1] )
+Generated Location: (1091:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1328:40,31 [7] )
+Generated Location: (1332:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 35b55407f4..b3788a98f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -25,9 +25,9 @@ using Test.Shared;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -68,12 +68,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Foo", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Foo", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 3267e1f7a0..37ca1aa1d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1094:32,19 [1] )
+Generated Location: (1098:32,19 [1] )
 |3|
 
 Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Hello|
-Generated Location: (1265:40,28 [5] )
+Generated Location: (1269:40,28 [5] )
 |Hello|
 
 Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1614:57,7 [38] )
+Generated Location: (1618:57,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 2e6fc46cd6..c7d9b20432 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index 0ad84ada11..d0bf71a61d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (888:25,19 [3] )
+Generated Location: (890:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1157:34,29 [1] )
+Generated Location: (1159:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1485:45,38 [3] )
+Generated Location: (1491:45,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +18,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1850:61,7 [72] )
+Generated Location: (1856:61,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
index e875e1ec85..80c6779224 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -63,12 +63,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 967253cab8..868efd46b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (954:25,19 [1] )
+Generated Location: (958:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1139:33,28 [3] )
+Generated Location: (1143:33,28 [3] )
 |_my|
 
 Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1512:51,7 [90] )
+Generated Location: (1516:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index 0b2318995b..d3d98b440d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           "hi"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , -1, (context) => (builder2) => {
+            , -1, (context) => (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
   __o = context.ToLower();
@@ -54,12 +54,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
index 4e35880801..eed197611e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (966:25,26 [4] )
+Generated Location: (970:25,26 [4] )
 |"hi"|
 
 Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1148:33,8 [17] )
+Generated Location: (1154:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 8fb8b4ff6a..6033862880 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = typeof(
 #nullable restore
@@ -38,10 +38,10 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _someKey
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 05288725a2..9f7368292f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (888:25,19 [3] )
+Generated Location: (890:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1157:34,29 [1] )
+Generated Location: (1159:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1514:46,38 [8] )
+Generated Location: (1522:46,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1866:63,7 [47] )
+Generated Location: (1874:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 025cd7b4e2..7f84ecedc2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, -1, -1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -61,12 +61,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.SetKey(__arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.SetKey(__arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 4f78550549..9093430ce1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (954:25,19 [1] )
+Generated Location: (958:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1125:33,28 [8] )
+Generated Location: (1129:33,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1477:50,7 [47] )
+Generated Location: (1481:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 7257a0f006..83a65c13b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 0189feb978..95c444b36c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (848:24,6 [10] )
+Generated Location: (850:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 4a0472cf98..5cbcb559fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index d9d6bfb99a..6676cb0502 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -24,7 +24,7 @@ using System;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 60cc65d78b..8bdbb60f09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 4ca7a1cdcb..cc263bb7da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (844:24,2 [40] )
+Generated Location: (846:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1010:32,6 [7] )
+Generated Location: (1012:32,6 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 19cc40abc0..9295208389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -18,12 +18,12 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
-            builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
         __o = "bye!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
index 1af0850412..3a33c2a08a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1114:28,14 [6] )
+Generated Location: (1124:28,14 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 4d182075ef..a38b595d69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index b206d1f78f..db6e74ad1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (1243:38,7 [39] )
+Generated Location: (1249:38,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index dd2b63f012..af1c571a8c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                          __o = context.Index;
@@ -59,7 +59,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index f06cba0e8f..7cef5a2c1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (844:24,2 [54] )
+Generated Location: (846:24,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Index|
-Generated Location: (1112:32,63 [13] )
+Generated Location: (1116:32,63 [13] )
 |context.Index|
 
 Source Location: (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Item.ToLower()|
-Generated Location: (1328:39,80 [22] )
+Generated Location: (1332:39,80 [22] )
 |context.Item.ToLower()|
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1595:47,107 [2] )
+Generated Location: (1599:47,107 [2] )
 |; |
 
 Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1828:55,24 [8] )
+Generated Location: (1832:55,24 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 7933128082..7bbc4fe7a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
                 __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => {
+                __builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                 }
                 ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index eb34a7ef37..3661589ffb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (844:24,2 [45] )
+Generated Location: (846:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1222:34,69 [11] )
+Generated Location: (1226:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1791:53,89 [3] )
+Generated Location: (1799:53,89 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1970:62,7 [76] )
+Generated Location: (1978:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 1654ca840f..b2d64c6017 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
                 __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -38,7 +38,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => {
+                __builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                 }
                 ));
 #nullable restore
@@ -56,7 +56,7 @@ __o = typeof(MyComponent);
 #line default
 #line hidden
 #nullable disable
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = "hello, world!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 40d02b867f..96e3449c79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (844:24,2 [45] )
+Generated Location: (846:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1222:34,69 [11] )
+Generated Location: (1226:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1791:53,89 [3] )
+Generated Location: (1799:53,89 [3] )
 |;
 |
 
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2039:61,6 [15] )
+Generated Location: (2051:61,6 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +29,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2413:79,7 [76] )
+Generated Location: (2425:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 99b59b0bc4..a6a1643d45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                   __o = person.Name;
@@ -52,7 +52,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index bd5969c2c9..8f8fa4f40f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (844:24,2 [47] )
+Generated Location: (846:24,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1098:32,56 [11] )
+Generated Location: (1102:32,56 [11] )
 |person.Name|
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1320:40,73 [2] )
+Generated Location: (1324:40,73 [2] )
 |; |
 
 Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1558:48,30 [8] )
+Generated Location: (1562:48,30 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 04251fe231..ba72315905 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = RenderPerson((person) => (builder2) => {
+__o = RenderPerson((person) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            __o = person.Name;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index ecb23ac7da..2f65973e87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (848:24,6 [25] )
+Generated Location: (850:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (993:27,33 [11] )
+Generated Location: (997:27,33 [11] )
 |person.Name|
 
 Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1060:33,0 [1] )
+Generated Location: (1064:33,0 [1] )
 |)|
 
 Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1240:42,7 [138] )
+Generated Location: (1244:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index f7cccb3817..0f5c223833 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -28,7 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             __o = person.Name;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index 7d281e987e..f839f8e262 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (844:24,2 [45] )
+Generated Location: (846:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1090:33,50 [11] )
+Generated Location: (1094:33,50 [11] )
 |person.Name|
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1306:41,67 [3] )
+Generated Location: (1310:41,67 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1485:50,7 [76] )
+Generated Location: (1489:50,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 0839dfd109..3093889906 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = RenderPerson((person) => (builder2) => {
+__o = RenderPerson((person) => (__builder2) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                             __o = person.Name;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index d112e12c33..6dc660afd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (848:24,6 [25] )
+Generated Location: (850:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (994:27,34 [11] )
+Generated Location: (998:27,34 [11] )
 |person.Name|
 
 Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1061:33,0 [1] )
+Generated Location: (1065:33,0 [1] )
 |)|
 
 Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1241:42,7 [138] )
+Generated Location: (1245:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 7918f9a68a..605c196eca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -27,7 +27,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
+            (__builder2) => {
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -45,7 +45,7 @@ namespace Test
 #line hidden
 #nullable disable
             ;
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 8f166291bd..e68b9e7c4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (844:24,2 [27] )
+Generated Location: (846:24,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1082:33,45 [2] )
+Generated Location: (1086:33,45 [2] )
 |; |
 
 Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1248:41,22 [8] )
+Generated Location: (1252:41,22 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 548bffc3e0..6495fb500f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = RenderPerson((builder2) => {
+__o = RenderPerson((__builder2) => {
 }
 );
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index a6ae1646f9..d7620053b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson(|
-Generated Location: (848:24,6 [13] )
+Generated Location: (850:24,6 [13] )
 |RenderPerson(|
 
 Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (881:26,0 [1] )
+Generated Location: (885:26,0 [1] )
 |)|
 
 Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1061:35,7 [54] )
+Generated Location: (1065:35,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index fe5a170c8d..afa761f1ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -30,7 +30,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 1c1fbfb856..62902491e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (880:25,18 [1] )
+Generated Location: (882:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1514:46,7 [24] )
+Generated Location: (1520:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 922fb53d73..d181ad3baa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
@@ -40,7 +40,7 @@ namespace Test
 #nullable disable
             ;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive);
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index b12bc957cd..6f6d5c5392 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (881:25,19 [8] )
+Generated Location: (883:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1251:35,46 [12] )
+Generated Location: (1253:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1915:56,7 [88] )
+Generated Location: (1921:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index bab0c1c0ca..020c4b2ffd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -29,10 +29,10 @@ global::System.Object __typeHelper = "/";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index bab0c1c0ca..020c4b2ffd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -29,10 +29,10 @@ global::System.Object __typeHelper = "/";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = "";
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 42bef13ef3..6d0d7b4270 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index e362010a8c..a8eca1cffb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (996:25,17 [16] )
+Generated Location: (998:25,17 [16] )
 |OnComponentHover|
 
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1225:34,55 [13] )
+Generated Location: (1227:34,55 [13] )
 |ParentBgColor|
 
 Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -16,7 +16,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1431:44,7 [132] )
+Generated Location: (1433:44,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index ea9914ac6c..076898ac35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -25,13 +25,13 @@ using Microsoft.AspNetCore.Components.RenderTree;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
   
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 18ceaf1ef4..b79bd17799 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -17,12 +17,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                CSharpCode - (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n    
-                MarkupElement - (192:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlContent - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                    CSharpExpression - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-                CSharpCode - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n
+                CSharpCode - (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n    
+                MarkupElement - (194:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                    CSharpExpression - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+                CSharpCode - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index f6ed19837c..894c267cc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -3,28 +3,28 @@ Source Location: (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [49] )
 |using Microsoft.AspNetCore.Components.RenderTree;|
 
-Source Location: (56:2,2 [136] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
-Generated Location: (1015:31,2 [136] )
+Generated Location: (1017:31,2 [138] )
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
 
-Source Location: (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1289:42,16 [6] )
+Generated Location: (1293:42,16 [6] )
 |output|
 
-Source Location: (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1386:47,38 [2] )
+Generated Location: (1390:47,38 [2] )
 |
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index ed37182928..f06361ba0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -25,17 +25,17 @@ using Microsoft.AspNetCore.Components.Rendering;
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index d45e66c9e5..42c3660ca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -17,12 +17,12 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
-            MarkupElement - (277:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                HtmlContent - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                CSharpExpression - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-            CSharpCode - (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
+            CSharpCode - (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        var output = string.Empty;\n        if (__builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n        
+            MarkupElement - (281:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            CSharpCode - (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index c5b6635948..0e616a2a32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -3,33 +3,33 @@ Source Location: (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [48] )
 |using Microsoft.AspNetCore.Components.Rendering;|
 
-Source Location: (60:2,7 [217] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
-Generated Location: (1068:33,7 [217] )
+Generated Location: (1070:33,7 [221] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
 
-Source Location: (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1427:46,20 [6] )
+Generated Location: (1433:46,20 [6] )
 |output|
 
-Source Location: (299:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1586:53,30 [9] )
+Generated Location: (1592:53,30 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 1e00f4d61b..ad8aa14710 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 02bfc33179..8eacd0f0e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (848:24,6 [10] )
+Generated Location: (850:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 25d0d98bde..28fe1e3b44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index e5449ebf15..b2571c3cd6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ global::System.Object __typeHelper = "/my/url";
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index 557b105ff2..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 0fd95f0805..92ff4bb6b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ namespace Test
         private static System.Object __o = null;
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __o = 
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index e43d3b2722..9a0ef8f6c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (874:25,12 [3] )
+Generated Location: (876:25,12 [3] )
 |Foo|
 
 Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1074:35,11 [29] )
+Generated Location: (1076:35,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 63a7e59529..ef6da3215c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async (e) => await Task.Delay(10)
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 2c796d844e..cbedf87f52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 81e01c5c95..7e21507a0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1158:36,7 [91] )
+Generated Location: (1166:36,7 [91] )
 |
     Task OnClick(UIMouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 714d26a99b..78afedb132 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async () => await Task.Delay(10)
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index fbca736edf..6ae61c727e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 1abd6d601a..a41ae9f1a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1158:36,7 [73] )
+Generated Location: (1166:36,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 624d744229..5cd6084037 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
-            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            __builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 0b701bd0b7..d6bdff1db6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1669:32,7 [50] )
+Generated Location: (1681:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 3e69e7d838..814786e547 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -39,13 +39,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 9eff84309e..dc0537f1c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1139:28,7 [65] )
+Generated Location: (1143:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 3337fd6840..4446948e63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 87947287ce..be126a558b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1455:31,7 [50] )
+Generated Location: (1465:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 12173260d3..e538b50f99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.Int32>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.Int32>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue))));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 623b666988..8436b299b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1455:31,7 [55] )
+Generated Location: (1465:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index a3f4c64b04..30a38342d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "OnChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 370629cb01..aa6d34cc88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1155:31,7 [50] )
+Generated Location: (1165:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 182f96b4cd..f335bf5a5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 827621ac59..370629cb01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1145:31,7 [50] )
+Generated Location: (1155:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index ead838916c..032d60eb93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.AddAttribute(3, "ValueExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Func<System.Int32>>>(() => ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index a51b590bb9..7c171fc52e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1372:32,7 [50] )
+Generated Location: (1384:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 34f737a25e..37549da1d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                               ParentValue
@@ -39,13 +39,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "SomeParam", __arg0);
-        builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
-        builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "SomeParam", __arg0);
+        __builder.AddAttribute(__seq1, "SomeParamChanged", __arg1);
+        __builder.AddAttribute(__seq2, "SomeParamExpression", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index f46cf01c7d..7edbda14cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (959:28,7 [65] )
+Generated Location: (963:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 7ad7ca5ea4..7fb0afa274 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 15b74739f3..56e7bb69bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1158:31,7 [50] )
+Generated Location: (1168:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 2cc5379d95..fdd9b14c6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index c46a1967f5..15b74739f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1148:31,7 [50] )
+Generated Location: (1158:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index c1011b1ec6..08d517b75d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           ParentValue
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.Int32>(__value => ParentValue = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index c26eb42c93..5fbe3fefa3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1158:31,7 [55] )
+Generated Location: (1168:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 575cb3ee40..6d07521a8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.InputText>(0);
-            builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.OpenComponent<Test.InputText>(0);
+            __builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         person.Name
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ValueChanged", new System.Action<System.String>(__value => person.Name = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 45ac186461..6df29f3a49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1150:31,1 [37] )
+Generated Location: (1160:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index f89ca228a7..613222c7f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -38,9 +38,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index dca670f691..5121cb2545 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1656:47,7 [55] )
+Generated Location: (1668:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index cde27e3d16..31bcd414be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index ea1bdca38c..36a3a6787f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1315:33,7 [77] )
+Generated Location: (1329:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index faad5a8244..9b7a94d904 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  ParentValue
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index af8be57d50..d55e8ff852 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1281:33,7 [50] )
+Generated Location: (1295:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 9c9f43ca31..18a0238b4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -18,10 +18,10 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -38,9 +38,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.InvariantCulture));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index ee5480943c..c5b19b594e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1668:47,7 [55] )
+Generated Location: (1680:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index b547318fcb..185622af05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index 998a4c4e29..ecc5662337 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1219:32,7 [55] )
+Generated Location: (1231:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index 824990c458..e362885db8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index e0417b909d..7d00ca8c1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1214:32,7 [55] )
+Generated Location: (1226:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 1aa6d6d017..619b0b8e13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index d4cec7e3a0..6bebfc4fe7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1213:32,7 [55] )
+Generated Location: (1225:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index b68575bac6..d6a2abadc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
              ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("myvalue");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 2823213ccc..56389a7f3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1208:32,7 [55] )
+Generated Location: (1220:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index cd3f173022..40d4fd3f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
@@ -31,9 +31,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 17a3e9f287..cf9ddc8421 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1438:40,7 [44] )
+Generated Location: (1452:40,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index fff8f8569c..21b6da91dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ using System.Globalization;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    ParentValue
@@ -39,9 +39,9 @@ using System.Globalization;
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.CurrentCulture));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "anotherevent", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue, culture: CultureInfo.CurrentCulture));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 867bc3dfa7..7185c67db9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1750:48,7 [44] )
+Generated Location: (1764:48,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index b938657cc4..4bf4bb55ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,9 +20,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        context.ToLowerInvariant()
@@ -31,7 +31,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,8 +40,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      header
@@ -50,11 +50,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(5, "\r\n    Some Content\r\n");
+            __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(5, "\r\n    Some Content\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index fc78d36290..4d58618c50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (576:17,2 [46] )
+Generated Location: (578:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1230:37,87 [2] )
+Generated Location: (1240:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index 580facf895..bbcf6f148a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,9 +20,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        context.ToLowerInvariant()
@@ -31,7 +31,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,8 +40,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      header
@@ -50,15 +50,15 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(5, "Some Content");
+            __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(5, "Some Content");
             }
             ));
-            builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(7, "Bye!");
+            __builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(7, "Bye!");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index fc78d36290..4d58618c50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (576:17,2 [46] )
+Generated Location: (578:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1230:37,87 [2] )
+Generated Location: (1240:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 4416e8486f..2541094ca1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "checkbox");
-            builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "checkbox");
+            __builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                Enabled
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
-            builder.SetUpdatesAttributeName("checked");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
+            __builder.SetUpdatesAttributeName("checked");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index c919777781..1222e91fab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1275:33,7 [41] )
+Generated Location: (1289:33,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 3ea8d35b89..f1a508dfba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                CurrentDate
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 4ae8ae0f75..45630affba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1242:32,7 [77] )
+Generated Location: (1254:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 2ad8aa2b6b..e5001a53a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 425e9c0639..7c238de261 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1498:41,7 [135] )
+Generated Location: (1512:41,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 4eba9b6a98..f5ca651db2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd/yyyy"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 7f7bde0125..c9ee946efc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1319:33,7 [77] )
+Generated Location: (1333:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 3e5fb084c3..6a8df83973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            ParentValue
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index b493665583..df9ef70cde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1275:33,7 [50] )
+Generated Location: (1289:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 13811c1c52..b9c32b05ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy", culture: global::System.Globalization.CultureInfo.InvariantCulture));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 5fb5c6410a..f0745afcf9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1459:33,7 [77] )
+Generated Location: (1473:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index b126862f4d..59f408200b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 3f8a031b86..93c761ce73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1313:33,7 [77] )
+Generated Location: (1327:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 0b682bbc99..72cdde4320 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "custom");
-            builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "custom");
+            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              CurrentDate
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd/yyyy"));
-            builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index 3f45805a95..b025fa5efd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1323:33,7 [77] )
+Generated Location: (1337:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 11b43e8b7a..834b00f6c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 8262dada44..e621c140a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1249:32,7 [77] )
+Generated Location: (1261:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index 36489921a0..d0e1c44a28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             , format: "MM/dd"));
-            builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd"));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index ed5224913c..d4ce7a14da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1248:32,7 [77] )
+Generated Location: (1260:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index 3cd1b8fa5d..efd411045d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "@BIND", 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "@BIND", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index cdca10e0aa..1e47ca487c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (924:30,7 [50] )
+Generated Location: (932:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 57cf38a0ab..f33c8ef27c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
+            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index d491a90fa6..63481733de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1209:32,7 [50] )
+Generated Location: (1221:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index d6e4b6d047..fb263e71f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index cacdfe4602..2599613705 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ItemChanged", new System.Action<string>(__value => Value = __value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index c3a236edfe..4b355ceb8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1151:31,7 [21] )
+Generated Location: (1161:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index b885fc7aa1..b9ab2dd10a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", 
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Value
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index c020306847..e2a20c072e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1147:31,7 [21] )
+Generated Location: (1157:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 55408ce9b0..6ea930455a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       18
@@ -47,13 +47,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddAttribute(__seq1, "Item", __arg1);
-        builder.AddAttribute(__seq2, "ItemChanged", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddAttribute(__seq1, "Item", __arg1);
+        __builder.AddAttribute(__seq2, "ItemChanged", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index a2d0a471c1..07a70b8d49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1206:36,7 [21] )
+Generated Location: (1210:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 173c75be66..ac6d954783 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -22,8 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             , 2, __value => Value = __value);
-            builder.AddMarkupContent(3, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 4, 5, 
+            __builder.AddMarkupContent(3, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, 4, 5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         Value
@@ -49,19 +49,19 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ItemChanged", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ItemChanged", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 11795ad1ca..7f44977f7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1258:38,7 [21] )
+Generated Location: (1266:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 3a9c523b78..0bb36c7382 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
@@ -23,10 +23,10 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n  ");
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n  ");
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -35,11 +35,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(6, "\r\n");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(6, "\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index ab1a2755ba..7f604a1f31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, (context) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n  ");
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            , 2, (context) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n  ");
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(6, "\r\n");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(6, "\r\n");
             }
             );
         }
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 668743949f..63bfb017d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   "hi"
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Other", 
+            __builder.AddAttribute(2, "Other", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                   17
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 3421feb160..95bc507285 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -39,12 +39,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Other", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Other", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index 33b8c8a461..aa8664b283 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -31,11 +31,11 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index 5d4b914038..d647245581 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -22,8 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(2, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 3, 4, 
+            __builder.AddMarkupContent(2, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(__builder, 3, 4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "how are you?"
@@ -32,8 +32,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(5, "\r\n");
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, 6, 7, 
+            __builder.AddMarkupContent(5, "\r\n");
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(__builder, 6, 7, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "bye!"
@@ -51,23 +51,23 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
-        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0)
+        public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 05f9000036..aa66c33fae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -18,11 +18,11 @@ using Microsoft.AspNetCore.Components.Rendering;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
-   RenderChildComponent(builder); 
+   RenderChildComponent(__builder); 
 
 #line default
 #line hidden
@@ -32,16 +32,16 @@ using Microsoft.AspNetCore.Components.Rendering;
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
 
 #line default
 #line hidden
 #nullable disable
-        builder.AddContent(0, "        ");
-        builder.OpenComponent<Test.MyComponent>(1);
-        builder.CloseComponent();
-        builder.AddMarkupContent(2, "\r\n");
+        __builder.AddContent(0, "        ");
+        __builder.OpenComponent<Test.MyComponent>(1);
+        __builder.CloseComponent();
+        __builder.AddMarkupContent(2, "\r\n");
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index 730322b12c..e1ce33423f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -8,14 +8,14 @@ Document -
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(builder); 
-            CSharpCode - (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n
-            HtmlContent - (166:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (166:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            Component - (174:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-            HtmlContent - (189:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (189:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+                CSharpCode - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(__builder); 
+            CSharpCode - (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n
+            HtmlContent - (170:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (170:7,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            Component - (178:7,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+            HtmlContent - (193:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (193:7,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index c457b39dd8..dde6339cd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
-Source Location: (55:2,2 [32] x:\dir\subdir\Test\TestComponent.cshtml)
-| RenderChildComponent(builder); |
-Generated Location: (746:24,2 [32] )
-| RenderChildComponent(builder); |
+Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+| RenderChildComponent(__builder); |
+Generated Location: (748:24,2 [34] )
+| RenderChildComponent(__builder); |
 
-Source Location: (99:4,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
 |
-Generated Location: (956:33,7 [67] )
+Generated Location: (960:33,7 [69] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
 |
 
-Source Location: (191:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1321:46,0 [7] )
+Generated Location: (1335:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index a23256cd9f..6d56a97182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -29,10 +29,10 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(0, "        ");
-            builder.OpenComponent<Test.MyComponent>(1);
-            builder.CloseComponent();
-            builder.AddMarkupContent(2, "\r\n");
+            __builder.AddContent(0, "        ");
+            __builder.OpenComponent<Test.MyComponent>(1);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(2, "\r\n");
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
@@ -40,7 +40,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            builder.AddMarkupContent(3, "\r\n");
+            __builder.AddMarkupContent(3, "\r\n");
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
    RenderChildComponent(); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 673b59efca..c0fb7475bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
 |
-Generated Location: (747:24,2 [42] )
+Generated Location: (749:24,2 [42] )
 |
     void RenderChildComponent()
     {
@@ -12,12 +12,12 @@ Generated Location: (747:24,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1103:37,0 [7] )
+Generated Location: (1113:37,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1282:45,2 [25] )
+Generated Location: (1294:45,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 534f3ca22e..43bdd76f0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<string, int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
+            __builder.OpenComponent<Test.MyComponent<string, int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<string>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               "hi"
@@ -23,9 +23,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (builder2) => {
-                builder2.OpenElement(3, "div");
-                builder2.AddContent(4, 
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
+                __builder2.OpenElement(3, "div");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                       context.ToLower()
@@ -34,12 +34,12 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
             ));
-            builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (builder2) => {
-                builder2.AddMarkupContent(6, "\r\n  ");
-                builder2.AddContent(7, 
+            __builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (__builder2) => {
+                __builder2.AddMarkupContent(6, "\r\n  ");
+                __builder2.AddContent(7, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
    System.Math.Max(0, item.Item)
@@ -48,10 +48,10 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddMarkupContent(8, ";\r\n");
+                __builder2.AddMarkupContent(8, ";\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 2057f60c7f..e500bc5ec2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -29,9 +29,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 3, (context) => (builder2) => {
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            , 3, (context) => (__builder2) => {
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                       context.ToLower()
@@ -40,11 +40,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
-            , 6, (item) => (builder2) => {
-                builder2.AddMarkupContent(7, "\r\n  ");
-                builder2.AddContent(8, 
+            , 6, (item) => (__builder2) => {
+                __builder2.AddMarkupContent(7, "\r\n  ");
+                __builder2.AddContent(8, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
    System.Math.Max(0, item.Item)
@@ -53,7 +53,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddMarkupContent(9, ";\r\n");
+                __builder2.AddMarkupContent(9, ";\r\n");
             }
             );
         }
@@ -65,14 +65,14 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
+        public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Items", __arg1);
-        builder.AddAttribute(__seq2, "ChildContent", __arg2);
-        builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Items", __arg1);
+        __builder.AddAttribute(__seq2, "ChildContent", __arg2);
+        __builder.AddAttribute(__seq3, "AnotherChildContent", __arg3);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 1ba5e8d36d..b266ad2524 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                      "hi"
@@ -21,8 +21,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, (context) => (builder2) => {
-                builder2.AddContent(3, 
+            , 2, (context) => (__builder2) => {
+                __builder2.AddContent(3, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                     context.ToLower()
@@ -32,8 +32,8 @@ namespace Test
 #nullable disable
                 );
             }
-            , 4, (context) => (builder2) => {
-                builder2.AddContent(5, 
+            , 4, (context) => (__builder2) => {
+                __builder2.AddContent(5, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                 context
@@ -53,13 +53,13 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<System.Int32> __arg2)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "GenericFragment", __arg1);
-        builder.AddAttribute(__seq2, "IntFragment", __arg2);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "GenericFragment", __arg1);
+        __builder.AddAttribute(__seq2, "IntFragment", __arg2);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 619d8419d4..87a8aa17ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 9ca0e0a2d6..9607da8f82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -11,16 +11,16 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(3, "Some text");
-                builder2.AddMarkupContent(4, "<some-child a=\"1\">Nested text</some-child>");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(3, "Some text");
+                __builder2.AddMarkupContent(4, "<some-child a=\"1\">Nested text</some-child>");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index c6ace8a522..6780492298 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(2, "<child>hello</child>");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(2, "<child>hello</child>");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 1d97321d8e..3fc75879c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(2, "hello");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "hello");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 0bbf494f9e..60e82434d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 76ec234ef7..347d2fd0a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1009:30,7 [100] )
+Generated Location: (1017:30,7 [100] )
 |
     private int counter;
     private void Increment(UIEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 45fe822b8d..0d90dfec5d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
-                builder2.AddContent(2, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                             context
@@ -26,7 +26,7 @@ namespace Test
                 );
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index aff3398c54..18120398fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                42.ToString()
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 4b9d03f82a..be87aac4d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (builder2) => {
-                builder2.AddContent(3, "Some text");
-                builder2.OpenElement(4, "some-child");
-                builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((context) => (__builder2) => {
+                __builder2.AddContent(3, "Some text");
+                __builder2.OpenElement(4, "some-child");
+                __builder2.AddAttribute(5, "a", "1");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                       context.ToLowerInvariant()
@@ -28,10 +28,10 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index be99b5c73b..38c700ecbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some text");
-                builder2.OpenElement(4, "some-child");
-                builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some text");
+                __builder2.OpenElement(4, "some-child");
+                __builder2.AddAttribute(5, "a", "1");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 item.ToLowerInvariant()
@@ -28,11 +28,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(7, "\r\n  ");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(7, "\r\n  ");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index be99b5c73b..38c700ecbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MyAttr", "abc");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some text");
-                builder2.OpenElement(4, "some-child");
-                builder2.AddAttribute(5, "a", "1");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MyAttr", "abc");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<System.String>)((item) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some text");
+                __builder2.OpenElement(4, "some-child");
+                __builder2.AddAttribute(5, "a", "1");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 item.ToLowerInvariant()
@@ -28,11 +28,11 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(7, "\r\n  ");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(7, "\r\n  ");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 8889759292..949fa9edd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         e => { Increment(); }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 1083409124..745b870673 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1022:30,7 [87] )
+Generated Location: (1030:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 4d4582314e..f37bbf3287 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "some-attribute", "foo");
-            builder.AddAttribute(2, "another-attribute", 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "some-attribute", "foo");
+            __builder.AddAttribute(2, "another-attribute", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        43.ToString()
@@ -24,7 +24,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index c4faf061b7..0426607b43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -13,10 +13,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index c06eaf9354..3a6ab74a42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  123
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                   true
@@ -32,8 +32,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "StringProperty", "My string");
-            builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Test.SomeType>(
+            __builder.AddAttribute(3, "StringProperty", "My string");
+            __builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Test.SomeType>(
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
                     new SomeType()
@@ -42,7 +42,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 4305c77939..1cc2197614 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.DynamicElement>(0);
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.DynamicElement>(0);
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 62f56d1db0..5cd296bcf7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1067:30,7 [62] )
+Generated Location: (1075:30,7 [62] )
 |
     private Action<UIMouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index ed2ed88428..50d7066fe5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -18,18 +18,18 @@ using AnotherTest;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.HeaderComponent>(0);
-            builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(2, "Hi!");
+            __builder.OpenComponent<Test.HeaderComponent>(0);
+            __builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "Hi!");
             }
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(3, "\r\n");
-            builder.OpenComponent<AnotherTest.FooterComponent>(4);
-            builder.AddAttribute(5, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
-                builder2.AddContent(6, 
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(3, "\r\n");
+            __builder.OpenComponent<AnotherTest.FooterComponent>(4);
+            __builder.AddAttribute(5, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
+                __builder2.AddContent(6, 
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
              context
@@ -40,18 +40,18 @@ using AnotherTest;
                 );
             }
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.OpenComponent<Test.HeaderComponent>(8);
-            builder.AddAttribute(9, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(10, "Hi!");
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.OpenComponent<Test.HeaderComponent>(8);
+            __builder.AddAttribute(9, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(10, "Hi!");
             }
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(11, "\r\n");
-            builder.OpenComponent<AnotherTest.FooterComponent>(12);
-            builder.AddAttribute(13, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (builder2) => {
-                builder2.AddContent(14, 
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(11, "\r\n");
+            __builder.OpenComponent<AnotherTest.FooterComponent>(12);
+            __builder.AddAttribute(13, "Footer", (Microsoft.AspNetCore.Components.RenderFragment<System.DateTime>)((context) => (__builder2) => {
+                __builder2.AddContent(14, 
 #nullable restore
 #line 13 "x:\dir\subdir\Test\TestComponent.cshtml"
              context
@@ -62,7 +62,7 @@ using AnotherTest;
                 );
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index eacdc0c2e8..29effcf6e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -28,7 +28,7 @@ using System.Reflection;
         #pragma warning disable 1998
         protected void Execute()
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 5 "x:\dir\subdir\Test\_Imports.razor"
  Foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index ea472db615..cc03ae9e8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.CoolnessMeter>(0);
-            builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.CoolnessMeter>(0);
+            __builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            "very-cool"
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 717599cb8e..5a4a7f4e97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -17,9 +17,9 @@ using Microsoft.AspNetCore.Components;
     public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
+            __builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
  foreach (var item2 in Items2)
@@ -28,10 +28,10 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(1, "    ");
-            builder.OpenElement(2, "p");
-            builder.AddMarkupContent(3, "\r\n    ");
-            builder.AddContent(4, 
+            __builder.AddContent(1, "    ");
+            __builder.OpenElement(2, "p");
+            __builder.AddMarkupContent(3, "\r\n    ");
+            __builder.AddContent(4, 
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
      ChildContent(item2)
@@ -40,9 +40,9 @@ using Microsoft.AspNetCore.Components;
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(5, ";\r\n    ");
-            builder.CloseElement();
-            builder.AddMarkupContent(6, "\r\n");
+            __builder.AddMarkupContent(5, ";\r\n    ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
 #nullable restore
 #line 11 "x:\dir\subdir\Test\TestComponent.cshtml"
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 1cf07d4355..d266ed96bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (771:26,1 [34] )
+Generated Location: (775:26,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (771:26,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1406:51,0 [3] )
+Generated Location: (1424:51,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1586:60,7 [185] )
+Generated Location: (1604:60,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 7792e3efb4..1a6bfd994b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -25,13 +25,13 @@ using Foo = Test3;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenElement(2, "SomeComponent");
-            builder.CloseElement();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenElement(2, "SomeComponent");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 013902b5fc..453434e63d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "intproperty", "1");
-            builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "intproperty", "1");
+            __builder.AddAttribute(4, "BoolProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                            true
@@ -27,7 +27,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 080d7ea58f..01dc21cdee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           1
@@ -23,10 +23,10 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
-            builder.AddMarkupContent(2, "\r\n");
-            builder.OpenComponent<Test.Mycomponent>(3);
-            builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(2, "\r\n");
+            __builder.OpenComponent<Test.Mycomponent>(3);
+            __builder.AddAttribute(4, "IntProperty", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Int32>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                           2
@@ -35,7 +35,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index b52b53d76e..03822cedcd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -25,10 +25,10 @@ using System.Reflection;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<New.Test.Counter>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<New.Test.Counter>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 096dce2752..e9a5ae3f06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -25,10 +25,10 @@ using System.Reflection;
     public class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<New.Test.Counter2>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<New.Test.Counter2>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 9bb71dfb16..8c15a1cea5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.Counter>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test.Counter>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
  if (true)
@@ -25,7 +25,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(2, "This text is rendered");
+            __builder.AddContent(2, "This text is rendered");
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 2bf3768cef..257c9a4d9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (717:20,1 [18] )
+Generated Location: (725:20,1 [18] )
 |if (true)
 {
     |
@@ -11,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (956:30,38 [5] )
+Generated Location: (966:30,38 [5] )
 |
 }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index a55f7dd592..88c97a9e79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
-            builder.AddMarkupContent(1, "<div>\r\n</div>");
+            __builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
+            __builder.AddMarkupContent(1, "<div>\r\n</div>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index 311e2030c2..1202b7c81d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -11,16 +11,16 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.CloseComponent();
-            builder.AddMarkupContent(3, "\r\n");
-            builder.OpenComponent<Test2.MyComponent2>(4);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(3, "\r\n");
+            __builder.OpenComponent<Test2.MyComponent2>(4);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index ddcbeca415..8bc122e22e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        () => Increment()
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index e4a8581302..15d2cfcd80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1071:30,7 [87] )
+Generated Location: (1079:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 610c09ee43..6bc2168491 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -32,10 +32,10 @@ using System.Reflection;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.Counter>(0);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.Counter>(0);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index e95ee6a633..5e5218e2e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ParamBefore", "before");
-            builder.AddAttribute(2, "ParamAfter", "after");
-            builder.SetKey(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ParamBefore", "before");
+            __builder.AddAttribute(2, "ParamAfter", "after");
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         someDate.Day
@@ -25,7 +25,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index a2099b51d0..9a0a659ea6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (824:21,40 [12] )
+Generated Location: (834:21,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1069:32,7 [49] )
+Generated Location: (1081:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 78fcef6b4d..8bc7566313 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -11,16 +11,16 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "SomeProp", "val");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some ");
-                builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "SomeProp", "val");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some ");
+                __builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
             }
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    123 + 456
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index b9e79c7f49..d55a54212a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1029:27,19 [9] )
+Generated Location: (1045:27,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 9c32aa7891..6b44f2b991 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -18,15 +18,15 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.HeaderComponent>(0);
-            builder.AddAttribute(1, "Header", "head");
-            builder.CloseComponent();
-            builder.AddMarkupContent(2, "\r\n");
-            builder.OpenComponent<AnotherTest.FooterComponent>(3);
-            builder.AddAttribute(4, "Footer", "feet");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.HeaderComponent>(0);
+            __builder.AddAttribute(1, "Header", "head");
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(2, "\r\n");
+            __builder.OpenComponent<AnotherTest.FooterComponent>(3);
+            __builder.AddAttribute(4, "Footer", "feet");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 5ed8b29d75..45f0b5c057 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -16,12 +16,12 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "ParamBefore", "before");
-            builder.AddAttribute(2, "ParamAfter", "after");
-            builder.AddComponentReferenceCapture(3, (__value) => {
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "ParamBefore", "before");
+            __builder.AddAttribute(2, "ParamAfter", "after");
+            __builder.AddComponentReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         myInstance = (Test.MyComponent)__value;
@@ -31,7 +31,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 186756062e..3ad55818a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1061:26,40 [10] )
+Generated Location: (1071:26,40 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
index 51d1f14741..c4fc11129d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddComponentReferenceCapture(1, (__value) => {
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddComponentReferenceCapture(1, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    myInstance = (Test.MyComponent)__value;
@@ -24,7 +24,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
index 81b0c534d1..dad9e5fd6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (718:19,19 [10] )
+Generated Location: (724:19,19 [10] )
 |myInstance|
 
 Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
 |
-Generated Location: (1005:31,7 [81] )
+Generated Location: (1013:31,7 [81] )
 |
     MyComponent myInstance;
     void DoStuff() { GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index c5df38f7de..251726dde2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -16,16 +16,16 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "SomeProp", "val");
-            builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(3, "\r\n    Some ");
-                builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "SomeProp", "val");
+            __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n    Some ");
+                __builder2.AddMarkupContent(4, "<el>further</el> content\r\n");
             }
             ));
-            builder.AddComponentReferenceCapture(5, (__value) => {
+            __builder.AddComponentReferenceCapture(5, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    myInstance = (Test.MyComponent)__value;
@@ -35,7 +35,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 11b7ff5548..6a8210af48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1266:32,19 [10] )
+Generated Location: (1282:32,19 [10] )
 |myInstance|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index 3368139879..bd2bf2016c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "AttributeBefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                    someAttributes
@@ -24,8 +24,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "AttributeAfter", "after");
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "AttributeAfter", "after");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index 96cea029fe..f34385a2d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1296:32,7 [93] )
+Generated Location: (1308:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 298062f40f..a60d0a704e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "AttributeBefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                      someAttributes
@@ -24,8 +24,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "AttributeAfter", "after");
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "AttributeAfter", "after");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 9f732d3398..55b27f4e33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1298:32,7 [93] )
+Generated Location: (1310:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index a5deeb3169..16332db5ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                     18
@@ -47,12 +47,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
+        public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<T>>(seq);
-        builder.AddAttribute(__seq0, "Value", __arg0);
-        builder.AddMultipleAttributes(__seq1, __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
+        __builder.AddAttribute(__seq0, "Value", __arg0);
+        __builder.AddMultipleAttributes(__seq1, __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 9dfce2d24d..06f9c88ebe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1075:36,7 [93] )
+Generated Location: (1079:36,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 85c244ab8b..104536cb0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "AttributeBefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "AttributeBefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                     someAttributes
@@ -24,8 +24,8 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "AttributeAfter", "after");
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "AttributeAfter", "after");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index f6521a1da0..8ce8b2b18b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1297:32,7 [93] )
+Generated Location: (1309:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index c573f18e2b..90128a13fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -20,13 +20,13 @@ using Test2;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenComponent<Test2.MyComponent2>(2);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test2.MyComponent2>(2);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 040f50d490..1cfe84eccd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -25,13 +25,13 @@ using Test3;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n");
-            builder.OpenComponent<Test2.SomeComponent>(2);
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n");
+            __builder.OpenComponent<Test2.SomeComponent>(2);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 606664d038..d50deab626 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "data-abc", "Literal value");
-            builder.AddAttribute(2, "data-def", 
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "data-abc", "Literal value");
+            __builder.AddAttribute(2, "data-def", 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                            myValue
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 78a26d69b6..1c7d63b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (576:17,2 [40] )
+Generated Location: (578:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 933db52181..71c3425ad5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "data-abc", "Literal value");
-            builder.AddAttribute(2, "data-def", 
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "data-abc", "Literal value");
+            __builder.AddAttribute(2, "data-def", 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                           myValue
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 78a26d69b6..1c7d63b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (576:17,2 [40] )
+Generated Location: (578:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index cb6518086c..b4857ae33a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", "test");
-            builder.AddAttribute(2, "mESSAGE", "test");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Message", "test");
+            __builder.AddAttribute(2, "mESSAGE", "test");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 232e8ea6ba..38b43f29a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        message
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                 message
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            __builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 85b891035d..80f868260e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (1999:41,12 [30] )
+Generated Location: (2013:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 27e6c53bdb..fb1c3023f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                (s) => {}
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            message
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            __builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 56535e50e1..44794b9c49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2157:41,12 [30] )
+Generated Location: (2171:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 0409adfe5a..81081bdf5c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                            (s) => {}
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            __builder.AddAttribute(2, "Message", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              message
@@ -32,9 +32,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
-            builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
-            builder.CloseComponent();
+            __builder.AddAttribute(3, "MessageChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<System.String>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<System.String>(this, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message))));
+            __builder.AddAttribute(4, "MessageExpression", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Linq.Expressions.Expression<System.Action<System.String>>>(() => message));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 5720b61120..3dd3bd719e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2079:41,12 [30] )
+Generated Location: (2093:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 12f265e9f5..46ef7ee9ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -11,13 +11,13 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Message", "test");
-            builder.AddAttribute(2, "mESSAGE", "test");
-            builder.AddAttribute(3, "Message", "anotherone");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Message", "test");
+            __builder.AddAttribute(2, "mESSAGE", "test");
+            __builder.AddAttribute(3, "Message", "anotherone");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 98e1efe495..3511a5d9b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Foo", "test");
-            builder.AddAttribute(2, "foo", "test");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Foo", "test");
+            __builder.AddAttribute(2, "foo", "test");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 46eb6824b1..84e4c4e33a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "input");
-            builder.AddAttribute(3, "type", "text");
-            builder.AddAttribute(4, "Value", "17");
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "type", "text");
+            __builder.AddAttribute(4, "Value", "17");
+            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
@@ -27,11 +27,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.CloseElement();
+            __builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 43e5f75aba..1131d4aec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1508:38,12 [35] )
+Generated Location: (1532:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 71a5356b8f..3a62a163aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -11,19 +11,19 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "href", "/cool-url");
-            builder.AddAttribute(4, "style", true);
-            builder.AddAttribute(5, "disabled", true);
-            builder.AddAttribute(6, "href", "/even-cooler-url");
-            builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
-            builder.CloseElement();
-            builder.AddMarkupContent(8, "\r\n");
-            builder.CloseElement();
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "a");
+            __builder.AddAttribute(3, "href", "/cool-url");
+            __builder.AddAttribute(4, "style", true);
+            __builder.AddAttribute(5, "disabled", true);
+            __builder.AddAttribute(6, "href", "/even-cooler-url");
+            __builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(8, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index f3a649aab4..0a08de4245 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -11,13 +11,13 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "input");
-            builder.AddAttribute(3, "type", "text");
-            builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "type", "text");
+            __builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                () => {}
@@ -26,7 +26,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
@@ -35,11 +35,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.CloseElement();
+            __builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 2fa52d0969..0da513786a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1842:46,12 [35] )
+Generated Location: (1866:46,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 73cdac120d..b8c9293933 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -11,14 +11,14 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "input");
-            builder.AddAttribute(3, "type", "text");
-            builder.AddAttribute(4, "value", "17");
-            builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "type", "text");
+            __builder.AddAttribute(4, "value", "17");
+            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
@@ -27,11 +27,11 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
-            builder.SetUpdatesAttributeName("value");
-            builder.CloseElement();
-            builder.AddMarkupContent(7, "\r\n");
-            builder.CloseElement();
+            __builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.SetUpdatesAttributeName("value");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 43e5f75aba..1131d4aec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1508:38,12 [35] )
+Generated Location: (1532:38,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 93ea6ca3c6..736e64d96a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -11,13 +11,13 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "onclick", "test()");
-            builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "a");
+            __builder.AddAttribute(3, "onclick", "test()");
+            __builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 () => {}
@@ -26,10 +26,10 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
-            builder.CloseElement();
-            builder.AddMarkupContent(6, "\r\n");
-            builder.CloseElement();
+            __builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 0f8124b91c..ac15f56cc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -11,20 +11,20 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n  ");
-            builder.OpenElement(2, "a");
-            builder.AddAttribute(3, "href", "/cool-url");
-            builder.AddAttribute(4, "style", true);
-            builder.AddAttribute(5, "disabled", true);
-            builder.AddAttribute(6, "href", "/even-cooler-url");
-            builder.AddAttribute(7, "href", true);
-            builder.AddContent(8, "Learn the ten cool tricks your compiler author will hate!");
-            builder.CloseElement();
-            builder.AddMarkupContent(9, "\r\n");
-            builder.CloseElement();
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "a");
+            __builder.AddAttribute(3, "href", "/cool-url");
+            __builder.AddAttribute(4, "style", true);
+            __builder.AddAttribute(5, "disabled", true);
+            __builder.AddAttribute(6, "href", "/even-cooler-url");
+            __builder.AddAttribute(7, "href", true);
+            __builder.AddContent(8, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(9, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 25469b5236..338fb49b28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<NotAComponent></NotAComponent>\r\n<DefinitelyNotAComponent></DefinitelyNotAComponent>");
+            __builder.AddMarkupContent(0, "<NotAComponent></NotAComponent>\r\n<DefinitelyNotAComponent></DefinitelyNotAComponent>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index e891b44230..57e5d27840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddAttribute(2, "attributeafter", "after");
-            builder.SetKey(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddAttribute(2, "attributeafter", "after");
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      someObject
@@ -25,8 +25,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddContent(3, "Hello");
-            builder.CloseElement();
+            __builder.AddContent(3, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index a14f2215f5..c46f7100b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (817:21,37 [10] )
+Generated Location: (827:21,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1103:33,7 [49] )
+Generated Location: (1117:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index fc8f090857..49027ac9d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "data-slider-min", 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "data-slider-min", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Min
@@ -24,7 +24,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  someObject
@@ -33,7 +33,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 1a6054d07f..d5a06aa130 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (987:29,49 [10] )
+Generated Location: (997:29,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -9,7 +9,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1228:40,7 [109] )
+Generated Location: (1240:40,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index f2ece3f4a5..669aa6b472 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @KEY=\"someObject\" attributeafter=\"after\">Hello</elem>");
+            __builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @KEY=\"someObject\" attributeafter=\"after\">Hello</elem>");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 5b1fb6b01c..81fe48cac3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (766:20,7 [49] )
+Generated Location: (770:20,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index d8598d0bde..4ab0319ccd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -16,12 +16,12 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddAttribute(2, "attributeafter", "after");
-            builder.AddElementReferenceCapture(3, (__value) => {
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddAttribute(2, "attributeafter", "after");
+            __builder.AddElementReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      myElem = __value;
@@ -31,8 +31,8 @@ namespace Test
 #nullable disable
             }
             );
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 2928fdff8c..ac62465376 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1088:26,37 [6] )
+Generated Location: (1098:26,37 [6] )
 |myElem|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 253327bc4d..7cec406182 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -16,11 +16,11 @@ namespace Test
         #pragma warning restore 0169
         #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "type", "text");
-            builder.AddAttribute(2, "data-slider-min", 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "type", "text");
+            __builder.AddAttribute(2, "data-slider-min", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                      Min
@@ -29,7 +29,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddElementReferenceCapture(3, (__value) => {
+            __builder.AddElementReferenceCapture(3, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                  _element = __value;
@@ -39,7 +39,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 9c3fd8e610..670974cf7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1260:34,49 [8] )
+Generated Location: (1270:34,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1525:46,7 [56] )
+Generated Location: (1537:46,7 [56] )
 |
         [Parameter] public int Min { get; set; }
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 90b396b95b..2ebd414c51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @rEF=\"myElem\" attributeafter=\"after\">Hello</elem>");
+            __builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @rEF=\"myElem\" attributeafter=\"after\">Hello</elem>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
index 48c27464dd..0c480f76a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddElementReferenceCapture(1, (__value) => {
+            __builder.OpenElement(0, "elem");
+            __builder.AddElementReferenceCapture(1, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
             myElem = __value;
@@ -24,8 +24,8 @@ namespace Test
 #nullable disable
             }
             );
-            builder.AddContent(2, "Hello");
-            builder.CloseElement();
+            __builder.AddContent(2, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
index fad6f59013..ac7adc105d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (697:19,12 [6] )
+Generated Location: (703:19,12 [6] )
 |myElem|
 
 Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
 |
-Generated Location: (1005:32,7 [78] )
+Generated Location: (1015:32,7 [78] )
 |
     ElementReference myElem;
     void DoStuff() { GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 6c3bcb0b12..f051832363 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                             someAttributes
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "attributeafter", "after");
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "attributeafter", "after");
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 408d3e7f39..5f97cfc9c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1320:33,7 [93] )
+Generated Location: (1334:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 825f2bfebb..52beeca87d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @ATTributes=\"someAttributes\" attributeafter=\"after\">Hello</elem>");
+            __builder.AddMarkupContent(0, "<elem attributebefore=\"before\" @ATTributes=\"someAttributes\" attributeafter=\"after\">Hello</elem>");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index a2ea5ae837..9e83a67391 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (777:20,7 [93] )
+Generated Location: (781:20,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index fe225f1b0f..a023ad48df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               someAttributes
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "attributeafter", "after");
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "attributeafter", "after");
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index c1e979a475..8ec5df3e2b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1322:33,7 [93] )
+Generated Location: (1336:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index f26cb231d1..fad15e7ed8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attributebefore", "before");
-            builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attributebefore", "before");
+            __builder.AddMultipleAttributes(2, Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                              someAttributes
@@ -24,9 +24,9 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(3, "attributeafter", "after");
-            builder.AddContent(4, "Hello");
-            builder.CloseElement();
+            __builder.AddAttribute(3, "attributeafter", "after");
+            __builder.AddContent(4, "Hello");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 8648f2ac30..82d3039280 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1321:33,7 [93] )
+Generated Location: (1335:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index e38e513ef8..aea4039807 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 169c928ba1..6a700f10c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1290:30,7 [87] )
+Generated Location: (1298:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 65218e85e9..a423dfa1b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index ca02602fe9..eaf562b672 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1235:30,7 [87] )
+Generated Location: (1243:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 625a829f09..3540fb6d95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index e54bde9dba..2a62756e27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1235:30,7 [105] )
+Generated Location: (1243:30,7 [105] )
 |
     private int counter;
     private void Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 22f737baca..8d79605427 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index d7ef33c134..790b9be8a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1235:30,7 [141] )
+Generated Location: (1243:30,7 [141] )
 |
     private int counter;
     private Task Increment(UIMouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 5213f7450a..4aeef8e446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 68ba511dd7..e1fb9986e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1235:30,7 [123] )
+Generated Location: (1243:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index fadfeadfcd..ef79810505 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 8ccf81d829..a8f670e7fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1235:30,7 [106] )
+Generated Location: (1243:30,7 [106] )
 |
     private int counter;
     private void Increment(UIChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 7ab2887299..50f18a1b27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         EventCallback.Factory.Create(this, Increment)
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 1442a9d81c..c565ef85e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1172:30,7 [87] )
+Generated Location: (1180:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index affc4e321c..19339d0b13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 8d42326f5f..0f30f98457 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1135:30,7 [87] )
+Generated Location: (1143:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 8b7a809f7c..4ef3fc99ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index b03e262de6..5e48d447b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1135:30,7 [95] )
+Generated Location: (1143:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 1b3b0f1cd8..1d3203fee7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 8d2327ae8f..75957fa3cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1135:30,7 [123] )
+Generated Location: (1143:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index c20a11f566..3bc7d08c7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             )));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 11fa6a5327..1d827bbc3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1135:30,7 [131] )
+Generated Location: (1143:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 1d5d156139..4611e1077d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
+            __builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 5e878ccf2c..5467376a30 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<input @onCLICK=\"OnClick\">");
+            __builder.AddMarkupContent(0, "<input @onCLICK=\"OnClick\">");
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 54283ab676..b7884360e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (704:20,7 [49] )
+Generated Location: (708:20,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 9f00ae5035..cdf780c44a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index e29449cd92..0596bca6c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIEventArgs e) {
     }
 |
-Generated Location: (1042:30,7 [44] )
+Generated Location: (1050:30,7 [44] )
 |
     void OnClick(UIEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index da94940dce..90e9186fb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 4857f742c6..704483c5c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1042:30,7 [49] )
+Generated Location: (1050:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 2712e85839..2c665782af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  x => { }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index da94940dce..90e9186fb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 4857f742c6..704483c5c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(UIMouseEventArgs e) {
     }
 |
-Generated Location: (1042:30,7 [49] )
+Generated Location: (1050:30,7 [49] )
 |
     void OnClick(UIMouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 2712e85839..2c665782af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  x => { }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index d507642ef4..a339aab373 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index f88c0b9fa3..bae27b996d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1042:30,7 [31] )
+Generated Location: (1050:30,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 81eac56708..9d3dc19487 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "input");
-            builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  () => { }
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 6177aa2275..93e723cf92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<input onclick=\"foo\">");
+            __builder.AddMarkupContent(0, "<input onclick=\"foo\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 84e9d3db48..e9a3b5ca54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index f3f9065268..7793531abe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 99bcfbb9ff..7395ef5af5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index f7a895d896..7869cdebe7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "MyEvent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "MyEvent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index b3875ce643..9931408550 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -18,9 +18,9 @@ using Test.Shared;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -54,12 +54,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "Foo", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "Foo", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 04e2e871a1..5f284d1210 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1193:43,7 [38] )
+Generated Location: (1197:43,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
index 6d84ef5d37..2551625019 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
+            __builder.OpenComponent<Test.MyComponent<int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddComponentReferenceCapture(2, (__value) => {
+            __builder.AddComponentReferenceCapture(2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _my = (Test.MyComponent<int>)__value;
@@ -33,7 +33,7 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
index a998fd45fd..8869512906 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1036:28,38 [3] )
+Generated Location: (1044:28,38 [3] )
 |_my|
 
 Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
 |
-Generated Location: (1321:40,7 [72] )
+Generated Location: (1331:40,7 [72] )
 |
     MyComponent<int> _my;
     void DoStuff() { GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
index 482bb78b4a..bbcfa74722 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -49,12 +49,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
index 5b2f2a7e50..b85825c088 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (868:26,28 [3] )
+Generated Location: (872:26,28 [3] )
 |_my|
 
 Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1091:37,7 [90] )
+Generated Location: (1095:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index d063fb39a3..383c6e3de5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateTest_MyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                           "hi"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , 2, (context) => (builder2) => {
-                builder2.AddMarkupContent(3, "\r\n  ");
-                builder2.OpenElement(4, "div");
-                builder2.AddContent(5, 
+            , 2, (context) => (__builder2) => {
+                __builder2.AddMarkupContent(3, "\r\n  ");
+                __builder2.OpenElement(4, "div");
+                __builder2.AddContent(5, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
-                builder2.AddMarkupContent(6, "\r\n");
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(6, "\r\n");
             }
             );
         }
@@ -46,12 +46,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
+        public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddAttribute(__seq1, "ChildContent", __arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddAttribute(__seq1, "ChildContent", __arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 0d5ad55166..e2052de080 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
+            __builder.OpenComponent<Test.MyComponent<int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.SetKey(
+            __builder.SetKey(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _someKey
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 43b4974734..c2c2966874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (997:28,38 [8] )
+Generated Location: (1005:28,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1238:39,7 [47] )
+Generated Location: (1248:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index b4f149381b..fcf9a78f16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -47,12 +47,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.SetKey(__arg1);
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.SetKey(__arg1);
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 3cdea8b1fe..df8e691bed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (854:26,28 [8] )
+Generated Location: (858:26,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1056:36,7 [47] )
+Generated Location: (1060:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 14a877347f..1e617b6b4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
   "My value"
@@ -22,8 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(1, "\r\n\r\n");
-            builder.AddMarkupContent(2, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(1, "\r\n\r\n");
+            __builder.AddMarkupContent(2, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index d09f73e085..6d3f553d68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.SomeOtherComponent>(0);
-            builder.CloseComponent();
-            builder.AddMarkupContent(1, "\r\n\r\n");
-            builder.AddMarkupContent(2, "<h1>Hello</h1>");
+            __builder.OpenComponent<Test.SomeOtherComponent>(0);
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(1, "\r\n\r\n");
+            __builder.AddMarkupContent(2, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 143da42ed4..641d0cb298 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -17,9 +17,9 @@ using System;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index dedaf0b24f..2992055209 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,8 +21,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenElement(0, "div");
-            builder.AddContent(1, 
+            __builder.OpenElement(0, "div");
+            __builder.AddContent(1, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
       myValue
@@ -31,8 +31,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddMarkupContent(2, "  ");
-            builder.CloseElement();
+            __builder.AddMarkupContent(2, "  ");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 78a26d69b6..1c7d63b87a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (576:17,2 [40] )
+Generated Location: (578:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 81b1c955a4..a8340499a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -11,15 +11,15 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(2, "Hi!");
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "Hi!");
             }
             ));
-            builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddContent(4, 
+            __builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(4, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
               "bye!"
@@ -30,7 +30,7 @@ namespace Test
                 );
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 5cddba9bfe..9d353958e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -11,12 +11,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent>(0);
-            builder.AddAttribute(1, "Item", "Hello");
-            builder.AddAttribute(2, "MyEvent", "MyEventHandler");
-            builder.CloseComponent();
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Item", "Hello");
+            __builder.AddAttribute(2, "MyEvent", "MyEventHandler");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index ef96ec79b3..f2ceb6361a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (848:23,7 [39] )
+Generated Location: (858:23,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index c44d0e1b6d..60f201c50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,10 +20,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "li");
-                builder2.AddContent(1, "#");
-                builder2.AddContent(2, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "li");
+                __builder2.AddContent(1, "#");
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                context.Index
@@ -32,8 +32,8 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddContent(3, " - ");
-                builder2.AddContent(4, 
+                __builder2.AddContent(3, " - ");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                 context.Item.ToLower()
@@ -42,7 +42,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -51,8 +51,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(5);
-            builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(
+            __builder.OpenComponent<Test.MyComponent>(5);
+            __builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment<Test.Context>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                         template
@@ -61,7 +61,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 9ac860c6ab..5896bf1144 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (576:17,2 [54] )
+Generated Location: (578:17,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1631:48,107 [2] )
+Generated Location: (1647:48,107 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 106b0e3cb3..4245d11504 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.OpenComponent<Test.MyComponent>(1);
+                __builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 ));
-                builder2.CloseComponent();
-                builder2.CloseElement();
+                __builder2.CloseComponent();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index d600e1b868..da87e2cd45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (576:17,2 [45] )
+Generated Location: (578:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1436:40,89 [3] )
+Generated Location: (1450:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1615:49,7 [76] )
+Generated Location: (1629:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index be4d738229..0fc9c79187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,10 +21,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.OpenComponent<Test.MyComponent>(1);
-                builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.OpenComponent<Test.MyComponent>(1);
+                __builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.String>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                      person.Name
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
                 ));
-                builder2.CloseComponent();
-                builder2.CloseElement();
+                __builder2.CloseComponent();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -43,10 +43,10 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(3);
-            builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => {
-                builder2.AddMarkupContent(5, "\r\n");
-                builder2.AddContent(6, 
+            __builder.OpenComponent<Test.MyComponent>(3);
+            __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddMarkupContent(5, "\r\n");
+                __builder2.AddContent(6, 
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
   "hello, world!"
@@ -55,10 +55,10 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.AddMarkupContent(7, "\r\n");
+                __builder2.AddMarkupContent(7, "\r\n");
             }
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 1623292d3d..601ddb21de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (576:17,2 [45] )
+Generated Location: (578:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1436:40,89 [3] )
+Generated Location: (1450:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2171:65,7 [76] )
+Generated Location: (2199:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index a8b3f2986a..3cce17476b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,9 +20,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                         person.Name
@@ -31,7 +31,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,8 +40,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(2);
-            builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(
+            __builder.OpenComponent<Test.MyComponent>(2);
+            __builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment<Test.Person>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                               template
@@ -50,7 +50,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index 217bf53d43..bbd7ec5a32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (576:17,2 [47] )
+Generated Location: (578:17,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1203:37,73 [2] )
+Generated Location: (1213:37,73 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 77202fcb17..260bf8d149 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
  RenderPerson((person) => 
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(1, "div");
-                builder2.AddContent(2, 
+            (__builder2) => {
+                __builder2.OpenElement(1, "div");
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                  person.Name
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 315aff9a3b..4eedb74b90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1365:48,7 [138] )
+Generated Location: (1377:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 9a35bff8bc..7e46a81fc2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(0, "div");
-                builder2.AddContent(1, 
+            (__builder2) => {
+                __builder2.OpenElement(0, "div");
+                __builder2.AddContent(1, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                   person.Name
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index f95a024385..a3b0e50906 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (576:17,2 [45] )
+Generated Location: (578:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1189:38,67 [3] )
+Generated Location: (1199:38,67 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1368:47,7 [76] )
+Generated Location: (1378:47,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 0f6f57973d..f21c38cce0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
   RenderPerson((person) => 
@@ -21,9 +21,9 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.OpenElement(1, "div");
-                builder2.AddContent(2, 
+            (__builder2) => {
+                __builder2.OpenElement(1, "div");
+                __builder2.AddContent(2, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                   person.Name
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                builder2.CloseElement();
+                __builder2.CloseElement();
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index fb191596ac..8d853cc485 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1368:48,7 [138] )
+Generated Location: (1380:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index b61b330d68..514248aa56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -11,7 +11,7 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -20,8 +20,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.AddMarkupContent(0, "<div>Joey</div>");
+            (__builder2) => {
+                __builder2.AddMarkupContent(0, "<div>Joey</div>");
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -30,8 +30,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            builder.OpenComponent<Test.MyComponent>(1);
-            builder.AddAttribute(2, "Person", 
+            __builder.OpenComponent<Test.MyComponent>(1);
+            __builder.AddAttribute(2, "Person", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                       template
@@ -40,7 +40,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 12530595ce..7d46380c18 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (576:17,2 [27] )
+Generated Location: (578:17,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (880:27,45 [2] )
+Generated Location: (886:27,45 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 125f7e0926..2b59e51e85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddContent(0, 
+            __builder.AddContent(0, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
  RenderPerson(
@@ -21,8 +21,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            (builder2) => {
-                builder2.AddMarkupContent(1, "<div>HI</div>");
+            (__builder2) => {
+                __builder2.AddMarkupContent(1, "<div>HI</div>");
             }
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 454048faae..01f474539b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1077:38,7 [54] )
+Generated Location: (1085:38,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 1f39ff61b1..7a8947af80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.Counter>(0);
-            builder.AddAttribute(1, "v", 
+            __builder.OpenComponent<Test.Counter>(0);
+            __builder.AddAttribute(1, "v", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                   y
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y));
-            builder.CloseComponent();
+            __builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index c5c29b77eb..c9f47a4851 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1098:31,7 [24] )
+Generated Location: (1108:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 8171a8f1e2..29a77a9f76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.User>(0);
-            builder.AddAttribute(1, "Name", 
+            __builder.OpenComponent<Test.User>(0);
+            __builder.AddAttribute(1, "Name", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    UserName
@@ -23,8 +23,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName));
-            builder.AddAttribute(3, "IsActive", 
+            __builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName));
+            __builder.AddAttribute(3, "IsActive", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                               UserIsActive
@@ -33,8 +33,8 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive));
-            builder.CloseComponent();
+            __builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive));
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index da76161cce..ac3ce2f184 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1574:41,7 [88] )
+Generated Location: (1588:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index 4b66c56e87..b69675629b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -12,12 +12,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
-            builder.OpenComponent<Test.SurveyPrompt>(1);
-            builder.AddAttribute(2, "Title", "\r\n");
-            builder.CloseComponent();
+            __builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
+            __builder.OpenComponent<Test.SurveyPrompt>(1);
+            __builder.AddAttribute(2, "Title", "\r\n");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index b5d11da0a8..e73f1774c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -12,12 +12,12 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
-            builder.OpenComponent<Test.SurveyPrompt>(1);
-            builder.AddAttribute(2, "Title", "<div>Test!</div>");
-            builder.CloseComponent();
+            __builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
+            __builder.OpenComponent<Test.SurveyPrompt>(1);
+            __builder.AddAttribute(2, "Title", "<div>Test!</div>");
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index d2b2173405..07f1e78773 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "p");
-            builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.OpenElement(0, "p");
+            __builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnComponentHover
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddAttribute(2, "style", "background:" + " " + (
+            __builder.AddAttribute(2, "style", "background:" + " " + (
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        ParentBgColor
@@ -32,7 +32,7 @@ namespace Test
 #line hidden
 #nullable disable
             ) + ";");
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 6d61644640..955dc1f6a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1334:39,7 [132] )
+Generated Location: (1344:39,7 [132] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index a7c3e6447e..92ca67bae4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -11,17 +11,17 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "div");
-            builder.AddMarkupContent(1, "\r\n    ");
-            builder.OpenElement(2, "script");
-            builder.AddAttribute(3, "src", "some/url.js");
-            builder.AddAttribute(4, "anotherattribute", true);
-            builder.AddMarkupContent(5, "\r\n        some text\r\n        some more text\r\n    ");
-            builder.CloseElement();
-            builder.AddMarkupContent(6, "\r\n");
-            builder.CloseElement();
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n    ");
+            __builder.OpenElement(2, "script");
+            __builder.AddAttribute(3, "src", "some/url.js");
+            __builder.AddAttribute(4, "anotherattribute", true);
+            __builder.AddMarkupContent(5, "\r\n        some text\r\n        some more text\r\n    ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index 0d11282409..eeb80a1f60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -18,22 +18,22 @@ using Microsoft.AspNetCore.Components.RenderTree;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
   
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 
 #line default
 #line hidden
 #nullable disable
-            builder.AddContent(0, "    ");
-            builder.OpenElement(1, "p");
-            builder.AddContent(2, "Output: ");
-            builder.AddContent(3, 
+            __builder.AddContent(0, "    ");
+            __builder.OpenElement(1, "p");
+            __builder.AddContent(2, "Output: ");
+            __builder.AddContent(3, 
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
                 output
@@ -42,8 +42,8 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
-            builder.AddMarkupContent(4, "\r\n");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 53749a6138..902be776e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
-                HtmlContent - (188:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (188:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
-                MarkupElement - (192:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlContent - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (195:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                    CSharpExpression - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (204:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-                HtmlContent - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (214:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                CSharpCode - (216:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (216:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 
+                CSharpCode - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
+                HtmlContent - (190:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (190:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
+                MarkupElement - (194:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlContent - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                    CSharpExpression - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+                HtmlContent - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                CSharpCode - (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 01adfec434..5086da6818 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (56:2,2 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
-Generated Location: (747:24,2 [132] )
+Generated Location: (749:24,2 [134] )
 |
     var output = string.Empty;
-    if (builder == null) output = "Builder is null!";
+    if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index c9ca9cb828..e38b0e9e0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -18,26 +18,26 @@ using Microsoft.AspNetCore.Components.Rendering;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
         }
         #pragma warning restore 1998
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 
 #line default
 #line hidden
 #nullable disable
-        builder.AddContent(0, "        ");
-        builder.OpenElement(1, "p");
-        builder.AddContent(2, "Output: ");
-        builder.AddContent(3, 
+        __builder.AddContent(0, "        ");
+        __builder.OpenElement(1, "p");
+        __builder.AddContent(2, "Output: ");
+        __builder.AddContent(3, 
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
                     output
@@ -46,8 +46,8 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line hidden
 #nullable disable
         );
-        builder.CloseElement();
-        builder.AddMarkupContent(4, "\r\n");
+        __builder.CloseElement();
+        __builder.AddMarkupContent(4, "\r\n");
 #nullable restore
 #line 10 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index b6fa718da7..03c3279b6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-            CSharpCode - (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder builder)\n    {\n        var output = string.Empty;\n        if (builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
-            HtmlContent - (269:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (269:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
-            MarkupElement - (277:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                HtmlContent - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (280:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
-                CSharpExpression - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (289:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-            HtmlContent - (299:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (299:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+            CSharpCode - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        var output = string.Empty;\n        if (__builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
+            HtmlContent - (273:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (273:8,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+            MarkupElement - (281:8,8 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                HtmlContent - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (284:8,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
+                CSharpExpression - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
+            HtmlContent - (303:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (303:8,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index 5638b26888..33931628e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -1,24 +1,24 @@
-Source Location: (60:2,7 [209] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
-Generated Location: (800:26,7 [209] )
+Generated Location: (802:26,7 [213] )
 |
-    void RenderChildComponent(RenderTreeBuilder builder)
+    void RenderChildComponent(RenderTreeBuilder __builder)
     {
         var output = string.Empty;
-        if (builder == null) output = "Builder is null!";
+        if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
 
-Source Location: (301:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1527:52,0 [7] )
+Generated Location: (1545:52,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 7c3ab26b0d..a731c9cd0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            builder.AddContent(1, 
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
+            __builder.AddContent(1, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
   "My value"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 80cc186a87..6c615d6065 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -11,11 +11,11 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            builder.OpenComponent<Test.SomeOtherComponent>(1);
-            builder.CloseComponent();
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
+            __builder.OpenComponent<Test.SomeOtherComponent>(1);
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 694aaaae26..4bbe2ae0ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -12,9 +12,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(0, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index e13102d420..5213196255 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -11,9 +11,9 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.AddMarkupContent(0, "<div class=\"first second\">Hello</div>");
+            __builder.AddMarkupContent(0, "<div class=\"first second\">Hello</div>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 0580f5da63..d83a551701 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -11,10 +11,10 @@ namespace Test
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenElement(0, "elem");
-            builder.AddAttribute(1, "attr", 
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "attr", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
             Foo
@@ -23,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            builder.CloseElement();
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index bf784c5015..9edc33678f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (915:30,11 [29] )
+Generated Location: (923:30,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index e6b23f2802..e90aac13f8 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -50,7 +50,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </GenerateStaticWebAssetsManifestDependsOn>
 
     <GetCurrentProjectStaticWebAssetsDependsOn>
-      ResolveStaticWebAssetsInputs;
+      ResolveCurrentProjectStaticWebAssetsInputs;
       $(GetCurrentProjectStaticWebAssetsDependsOn)
     </GetCurrentProjectStaticWebAssetsDependsOn>
 
@@ -59,11 +59,21 @@ Copyright (c) .NET Foundation. All rights reserved.
       $(AssignTargetPathsDependsOn)
     </AssignTargetPathsDependsOn>
 
-    <ResolveStaticWebAssetsInputsDependsOn Condition="$(NoBuild) != 'true'">
-      _ResolveStaticWebAssetsProjectReferences;
+    <ResolveStaticWebAssetsInputsDependsOn>
+      ResolveCurrentProjectStaticWebAssetsInputs;
       $(ResolveStaticWebAssetsInputsDependsOn)
     </ResolveStaticWebAssetsInputsDependsOn>
 
+    <ResolveStaticWebAssetsInputsDependsOn Condition="$(NoBuild) != 'true'">
+      ResolveReferencedProjectsStaticWebAssets;
+      $(ResolveStaticWebAssetsInputsDependsOn)
+    </ResolveStaticWebAssetsInputsDependsOn>
+
+    <ResolveReferencedProjectsStaticWebAssetsDependsOn>
+      ResolveReferences;
+      $(ResolveReferencedProjectsStaticWebAssetsDependsOn)
+    </ResolveReferencedProjectsStaticWebAssetsDependsOn>
+
     <GenerateStaticWebAssetsPackTargetsDependsOn>
       _CreateStaticWebAssetsCustomPropsCacheFile;
       $(GenerateStaticWebAssetsPackTargetsDependsOn)
@@ -209,27 +219,68 @@ Copyright (c) .NET Foundation. All rights reserved.
        * Assets from the referenced packages. These will be implicitly included when nuget
          restores the package and includes the package props file for the package.
   -->
+
+    <!-- StaticWebAssets from the current project come from ResolveCurrentProjectStaticWebAssetsInputs which is a dependency of this target. -->
+    <!-- StaticWebAssets from referenced projects come from ResolveReferencedProjectsStaticWebAssets which is a dependency of this target. -->
+    <!-- StaticWebAssets from packages are already available, so we don't do anything. -->
   <Target
     Name="ResolveStaticWebAssetsInputs"
-    DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)">
+    DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)" />
 
-    <!-- StaticWebAssets from the current project -->
+  <!-- This is a helper task to compute the project references we need to invoke to retrieve
+       the static assets for a given application. We do it this way so that we can
+       pass additional build properties to compute the assets from the package when referenced
+       as a project. For example, Identity uses this hook to extend the project reference and
+       pass in the bootstrap version to use.
+  -->
 
-    <PropertyGroup>
-      <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(PackageId)</StaticWebAssetBasePath>
-    </PropertyGroup>
+  <Target Name="ResolveReferencedProjectsStaticWebAssets" DependsOnTargets="$(ResolveReferencedProjectsStaticWebAssetsDependsOn)">
 
     <ItemGroup>
+      <!-- It is explicitly ok to take a dependency on _MSBuildProjectReferenceExistent as it is
+        something many other products already take a dependency on. -->
+      <_StaticWebAssetsProjectReference Include="@(_MSBuildProjectReferenceExistent)" />
+    </ItemGroup>
+
+    <MSBuild
+      Condition="'@(_StaticWebAssetsProjectReference)' != '' and '%(_StaticWebAssetsProjectReference.BuildReference)' == 'true' and '@(ProjectReferenceWithConfiguration)' != ''"
+      Targets="GetCurrentProjectStaticWebAssets"
+      Properties="%(_StaticWebAssetsProjectReference.SetConfiguration); %(_StaticWebAssetsProjectReference.SetPlatform);  %(_StaticWebAssetsProjectReference.SetTargetFramework)"
+      RemoveProperties="%(_StaticWebAssetsProjectReference.GlobalPropertiesToRemove)"
+      Projects="@(_StaticWebAssetsProjectReference)"
+      BuildInParallel="$(BuildInParallel)"
+      ContinueOnError="!$(BuildingProject)"
+      SkipNonexistentTargets="true">
+
+      <Output TaskParameter="TargetOutputs" ItemName="_ReferencedProjectStaticWebAssets" />
+    </MSBuild>
+
+    <ItemGroup>
+      <StaticWebAsset
+        Include="@(_ReferencedProjectStaticWebAssets)"
+        KeepMetadata="ContentRoot;BasePath;RelativePath;SourceId;SourceType" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="ResolveCurrentProjectStaticWebAssetsInputs" DependsOnTargets="$(ResolveCurrentProjectStaticWebAssetsInputsDependsOn)">
+
+      <PropertyGroup>
+        <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">_content/$(PackageId)</StaticWebAssetBasePath>
+      </PropertyGroup>
+
+      <ItemGroup>
 
       <_ThisProjectStaticWebAsset
-        Include="$(MSBuildProjectDirectory)\wwwroot\**"
-        Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-      <!--
-        Should we promote 'wwwroot\**'' to a property?
-        We don't want to capture any content outside the content root, that's why we don't do
-        @(Content) here.
-      -->
-      <StaticWebAsset Include="@(_ThisProjectStaticWebAsset)">
+        Include="@(Content)"
+        Condition="$([System.String]::Copy('%(Identity)').StartsWith('wwwroot'))">
+
+        <!-- Remove the wwwroot\ prefix -->
+        <RelativePath>$([System.String]::Copy('%(Identity)').Substring(8))</RelativePath>
+
+      </_ThisProjectStaticWebAsset>
+
+      <StaticWebAsset Include="@(_ThisProjectStaticWebAsset->'%(FullPath)')" RemoveMetadata="CopyToPublishDirectory;ExcludeFromSingleFile">
         <!-- (Package, Project, '' (CurrentProject)) -->
         <SourceType></SourceType>
         <!-- Identifier describing the source, the package id, the project name, empty for the current project.  -->
@@ -238,52 +289,19 @@ Copyright (c) .NET Foundation. All rights reserved.
           Full path to the content root for the item:
           * For packages it corresponds to %userprofile%/.nuget/packages/<<PackageId>>/<<PackageVersion>>/razorContent
           * For referenced projects it corresponds to <<FullProjectRefPath>>/wwwroot
-          * For the current projects it corresponds to $(MSBuildThisProjectFileDirectory)wwwroot\
+          * For the current projects it corresponds to $(MSBuildProjectDirectory)wwwroot\
         -->
-        <ContentRoot>$(MSBuildProjectDirectory)\wwwroot\</ContentRoot>
+        <ContentRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)\wwwroot\'))</ContentRoot>
         <!-- Subsection (folder) from the url space where content for this library will be served. -->
         <BasePath>$(StaticWebAssetBasePath)</BasePath>
         <!-- Relative path from the content root for the file. At publish time, we combine the BasePath + Relative
-  path to determine the final path for the file. -->
-        <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
+             path to determine the final path for the file.
+        -->
+        <RelativePath>%(RelativePath)</RelativePath>
 
       </StaticWebAsset>
     </ItemGroup>
 
-    <!-- StaticWebAssets from referenced projects. -->
-
-    <MSBuild
-      Condition="'@(_StaticWebAssetsProjectReference->Count())' != '0'"
-      Projects="@(_StaticWebAssetsProjectReference)"
-      BuildInParallel="$(BuildInParallel)"
-      ContinueOnError="!$(BuildingProject)"
-      Targets="GetCurrentProjectStaticWebAssets"
-      Properties="_StaticWebAssetsSkipDependencies=true"
-      SkipNonexistentTargets="true">
-      <Output TaskParameter="TargetOutputs" ItemName="_ReferencedProjectStaticWebAssets" />
-    </MSBuild>
-
-    <ItemGroup>
-      <StaticWebAsset Include="@(_ReferencedProjectStaticWebAssets)" />
-    </ItemGroup>
-
-    <!-- StaticWebAssets from packages are already available, so we don't do anything. -->
-  </Target>
-
-  <!-- This is a helper task to compute the project references we need to invoke to retrieve
-       the static assets for a given application. We do it this way so that we can
-       pass additional build properties to compute the assets from the package when referenced
-       as a project. For example, Identity uses this hook to extend the project reference and
-       pass in the bootstrap version to use.
-  -->
-  <Target Name="_ResolveStaticWebAssetsProjectReferences"
-    DependsOnTargets="ResolveReferences"
-    Condition="'$(_StaticWebAssetsSkipDependencies)' == ''">
-
-    <ItemGroup>
-      <_StaticWebAssetsProjectReference Include="%(ReferencePath.MSBuildSourceProjectFile)" />
-    </ItemGroup>
-
   </Target>
 
   <!--
@@ -317,9 +335,11 @@ Copyright (c) .NET Foundation. All rights reserved.
        prevents the content from being packed even though we are including it explictily in
        GenerateStaticWebAssetsPackTargets
    -->
-  <Target Name="_RemoveWebRootContentFromPackaging" DependsOnTargets="_CreateStaticWebAssetsCustomPropsCacheFile" >
+  <Target Name="_RemoveWebRootContentFromPackaging" DependsOnTargets="ResolveStaticWebAssetsInputs">
     <ItemGroup>
-      <Content Remove="@(_CurrentProjectStaticWebAsset->'wwwroot\%(RelativePath)')"  />
+      <Content
+        Condition="'%(StaticWebAsset.SourceType)' == ''"
+        Remove="@(StaticWebAsset->'wwwroot\%(RelativePath)')"  />
     </ItemGroup>
   </Target>
 
@@ -498,4 +518,4 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>

From 778246c67472f67a7fab4f839e5442a1badab390 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 14 Aug 2019 14:22:46 -0700
Subject: [PATCH 242/337] Add tooling support for TypeScript files to RazorSDK
 (dotnet/aspnetcore-tooling#971)

Fixes https://github.com/aspnet/AspNetCore/issues/12840\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/304cafcffe0c190b6a93ec1887cd25d119f6524c
---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets               | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 2bf7ada2df..b862d9f369 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -40,6 +40,11 @@ Copyright (c) .NET Foundation. All rights reserved.
       Activates the set of nesting behaviors we want from solution explorer.
     -->
     <ProjectCapability Include="WebNestingDefaults" />
+
+    <!--
+      Tooling support for TypeScript files.
+    -->
+    <ProjectCapability Include="SupportsTypeScriptNuGet" />
   </ItemGroup>
 
   <!--

From 781743fa306c6afc1fa53007a7d2f1eada5f35ce Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2019 20:12:47 +0000
Subject: [PATCH 243/337] [release/3.0] Update dependencies from
 aspnet/Extensions (dotnet/aspnetcore-tooling#975)

* Update dependencies from https://github.com/aspnet/Extensions build 20190815.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19415-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190814.4

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19414.4
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19414.4
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19414.4
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19414.4
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview9.19414.4
- Microsoft.Extensions.Logging - 3.0.0-preview9.19414.4

* Update dependencies from https://github.com/aspnet/Extensions build 20190815.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.2

* React to namespace removal
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/543a1ae2a33d2aca4bcb65f9142bc145c07191a9
---
 .../test/DefaultRazorProjectFileSystemTest.cs                   | 1 -
 .../test/ServerLifecycleTest.cs                                 | 2 +-
 .../IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs | 2 +-
 .../test/IntegrationTests/BuildIncrementalismTest.cs            | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest.cs               | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest11.cs             | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest22NetFx.cs        | 2 +-
 .../test/IntegrationTests/BuildServerIntegrationTest.cs         | 1 -
 .../test/IntegrationTests/BuildWithComponentsIntegrationTest.cs | 2 +-
 9 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
index a22bb737fa..a158f1dc8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
index d2e46631ec..c2dff43150 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index d1fd24c9c8..91a7fd89f6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index 31c67f5acc..d87b5642e0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 9c9bce24d5..6acfd7c50b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyModel;
 using Xunit;
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
index 84b6b77ea0..a3b255ed18 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
index 263e20747c..d2ec513242 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 7cab7ac3ee..db779af38f 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -7,7 +7,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 2138f539ac..848587311d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests

From 9584c7e34f18d8aed968c5e03a6f160e0f921cf6 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 14 Aug 2019 12:49:01 -0700
Subject: [PATCH 244/337] Revert "Fix a bug with ref and declaration phase"

This reverts commit dotnet/aspnetcore-tooling@09b50151ef3f15ed05f5e8efc68e540a6781704e.

# Conflicts:
#	src/Razor/test/RazorLanguage.Test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c0e934ed7c0ee90f78f1966c8f40d34af5e54900
---
 .../src/Extensions/EliminateMethodBodyPass.cs     |  4 ++--
 .../ComponentDeclarationIntegrationTest.cs        | 15 ---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
index c14950aae5..96d336ca72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
@@ -8,8 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 {
     internal sealed class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass
     {
-        // Run late in the optimization phase
-        public override int Order => int.MaxValue;
+        // Run early in the optimization phase
+        public override int Order => int.MinValue;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 2e2d33795b..e9b8583cd4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -70,21 +70,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             Assert.Same(typeof(StringBuilder), property.PropertyType);
         }
 
-        [Fact]
-        public void DeclarationConfiguration_IncludesRef()
-        {
-            // Arrange & Act
-            var component = CompileToComponent(@"
-@using System.Text
-<div @ref=""myDiv"" />
-");
-
-            // Assert
-            var field = component.GetType().GetField("myDiv", BindingFlags.NonPublic | BindingFlags.Instance);
-            Assert.NotNull(field);
-            Assert.Same(typeof(ElementReference), field.FieldType);
-        }
-
         [Fact]
         public void DeclarationConfiguration_IncludesInherits()
         {

From f3536ca40358860da0fa9f46244c57b75eae5d3c Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 15 Aug 2019 14:07:12 -0700
Subject: [PATCH 245/337] Revert "Fix: dotnet/aspnetcore-tooling#11197
 automatic backing-field for @ref (dotnet/aspnetcore-tooling#707)"

This reverts commit dadf9fa.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/afddfcb49e520829b176a450d67ecf8cb3f379a8
---
 .../src/ComponentResources.resx               |   5 +-
 .../Components/ComponentDiagnosticFactory.cs  |  32 +---
 .../ComponentReferenceCaptureLoweringPass.cs  | 101 ++----------
 .../src/Extensions/EliminateMethodBodyPass.cs |   4 +-
 .../ReferenceCaptureIntermediateNode.cs       |   1 +
 .../ComponentChildContentIntegrationTest.cs   |   2 +-
 .../ComponentCodeGenerationTestBase.cs        | 147 +++---------------
 ...ComponentDiagnosticRazorIntegrationTest.cs |   6 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../Component_WithRef/TestComponent.ir.txt    |   7 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  53 -------
 .../TestComponent.ir.txt                      |  22 ---
 .../TestComponent.mappings.txt                |  16 --
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  14 +-
 .../Element_WithRef/TestComponent.ir.txt      |   7 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.mappings.txt                |  14 +-
 .../TestComponent.codegen.cs                  |  43 -----
 .../TestComponent.ir.txt                      |  24 ---
 .../TestComponent.mappings.txt                |  16 --
 .../TestComponent.codegen.cs                  |  39 -----
 .../TestComponent.diagnostics.txt             |   1 -
 .../TestComponent.ir.txt                      |  21 ---
 .../TestComponent.mappings.txt                |   5 -
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |   0
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.codegen.cs                  |  14 +-
 .../Component_WithRef/TestComponent.ir.txt    |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  41 -----
 .../TestComponent.ir.txt                      |  13 --
 .../TestComponent.mappings.txt                |  16 --
 .../TestComponent.codegen.cs                  |  14 +-
 .../TestComponent.ir.txt                      |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../Element_WithRef/TestComponent.codegen.cs  |  14 +-
 .../Element_WithRef/TestComponent.ir.txt      |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |   5 +-
 .../TestComponent.mappings.txt                |  12 +-
 .../TestComponent.codegen.cs                  |  42 -----
 .../TestComponent.ir.txt                      |  15 --
 .../TestComponent.mappings.txt                |  16 --
 .../TestComponent.codegen.cs                  |  38 -----
 .../TestComponent.diagnostics.txt             |   1 -
 .../TestComponent.ir.txt                      |  14 --
 .../TestComponent.mappings.txt                |   5 -
 .../TestComponent.codegen.cs                  |  24 +--
 .../TestComponent.ir.txt                      |   3 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |  16 ++
 .../TestComponent.mappings.txt                |  16 --
 .../TestComponent.codegen.cs                  |  19 +--
 .../TestComponent.ir.txt                      |   1 -
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   0
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../src/RefTagHelperDescriptorProvider.cs     |  20 +--
 .../RefTagHelperDescriptorProviderTest.cs     |  11 +-
 .../BuildWithComponentsIntegrationTest.cs     |   2 +-
 76 files changed, 326 insertions(+), 864 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_SuppressField => GenericComponent_WithComponentRef_CreatesDiagnostic}/TestComponent.codegen.cs (93%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_SuppressField => GenericComponent_WithComponentRef_CreatesDiagnostic}/TestComponent.ir.txt (71%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_SuppressField => GenericComponent_WithComponentRef_CreatesDiagnostic}/TestComponent.mappings.txt (57%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference_SuppressField => GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic}/TestComponent.codegen.cs (100%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference_SuppressField => GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic}/TestComponent.ir.txt (79%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference_SuppressField => GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic}/TestComponent.mappings.txt (87%)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/{GenericComponent_WithComponentRef_SuppressField => GenericComponent_WithComponentRef_CreatesDiagnostic}/TestComponent.codegen.cs (90%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/{GenericComponent_WithComponentRef_SuppressField => GenericComponent_WithComponentRef_CreatesDiagnostic}/TestComponent.ir.txt (78%)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference_SuppressField => GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic}/TestComponent.codegen.cs (100%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference_SuppressField => GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic}/TestComponent.ir.txt (87%)
 rename src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/{GenericComponent_WithComponentRef_TypeInference_SuppressField => GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic}/TestComponent.mappings.txt (84%)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 610c13afcf..291c4d8723 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -196,10 +196,7 @@
     <value>route template</value>
   </data>
   <data name="RefTagHelper_Documentation" xml:space="preserve">
-    <value>Generates the specified field, and populates it during rendering with a reference to the element or component.</value>
-  </data>
-  <data name="RefTagHelper_SuppressField_Documentation" xml:space="preserve">
-    <value>Suppresses the generation of a field by '@ref'. Specify '@ref:suppressField' to define your own property or field.</value>
+    <value>Populates the specified field or property with a reference to the element or component.</value>
   </data>
   <data name="SplatTagHelper_Documentation" xml:space="preserve">
     <value>Merges a collection of attributes into the current element or component.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 0b37c16233..05ef511fee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -396,35 +396,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             return RazorDiagnostic.Create(DuplicateComponentParameterDirective, source ?? SourceSpan.Undefined, attributeName, directiveAttributeName);
         }
 
-        public static readonly RazorDiagnosticDescriptor RefSuppressFieldNotMinimized =
-            new RazorDiagnosticDescriptor(
-                $"{DiagnosticPrefix}10011",
-                () =>
-                    "The directive attribute '@ref:suppressField' must be used as a minimized attribute. Providing an attribute value like '@ref:suppressField=\"false\"' " +
-                    "is not supported.",
-                RazorDiagnosticSeverity.Error);
-
-        public static RazorDiagnostic Create_RefSuppressFieldNotMinimized(SourceSpan? source = null)
-        {
-            return RazorDiagnostic.Create(RefSuppressFieldNotMinimized, source ?? SourceSpan.Undefined);
-        }
-
-        public static readonly RazorDiagnosticDescriptor RefSuppressFieldRequiredForGeneric =
-            new RazorDiagnosticDescriptor(
-                $"{DiagnosticPrefix}10012",
-                () =>
-                    "Using '@ref' on a generic-typed component requires manually defining a field to hold the component reference. Use '@ref:suppressField' to " +
-                    "suppress field generation, and manually define a field inside '@code {{ }}' to contain the reference.",
-                RazorDiagnosticSeverity.Error);
-
-        public static RazorDiagnostic Create_RefSuppressFieldRequiredForGeneric(SourceSpan? source = null)
-        {
-            return RazorDiagnostic.Create(RefSuppressFieldRequiredForGeneric, source ?? SourceSpan.Undefined);
-        }
-
         public static readonly RazorDiagnosticDescriptor ComponentNamesCannotStartWithLowerCase =
             new RazorDiagnosticDescriptor(
-                $"{DiagnosticPrefix}10013",
+                $"{DiagnosticPrefix}10011",
                 () => "Component '{0}' starts with a lowercase character. Component names cannot start with a lowercase character.",
                 RazorDiagnosticSeverity.Error);
 
@@ -438,7 +412,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor UnexpectedMarkupElement =
             new RazorDiagnosticDescriptor(
-                $"{DiagnosticPrefix}10014",
+                $"{DiagnosticPrefix}10012",
                 () => "Found markup element with unexpected name '{0}'. If this is intended to be a component, add a @using directive for its namespace.",
                 RazorDiagnosticSeverity.Warning);
 
@@ -452,7 +426,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         public static readonly RazorDiagnosticDescriptor InconsistentStartAndEndTagName =
             new RazorDiagnosticDescriptor(
-                $"{DiagnosticPrefix}10015",
+                $"{DiagnosticPrefix}10013",
                 () => "The start tag name '{0}' does not match the end tag name '{1}'. Components must have matching start and end tag names (case-sensitive).",
                 RazorDiagnosticSeverity.Error);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
index 6a24a46f80..b4d776aacf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentReferenceCaptureLoweringPass.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
@@ -35,109 +33,34 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
                 if (node.TagHelper.IsRefTagHelper())
                 {
-                    // We've found an @ref directive attribute.
-                    //
-                    // If we can't get a nonempty identifier, do nothing because there will
-                    // already be a diagnostic for empty values
-                    var identifier = DetermineIdentifierToken(node);
-                    if (identifier == null)
-                    {
-                        continue;
-                    }
-
-                    var rewritten = RewriteUsage(reference.Parent, identifier);
-                    reference.Replace(rewritten);
-
-                    // Now we need to check if the field generation has been suppressed.
-                    //
-                    // You have to suppress field generation for generic types because we don't know the
-                    // type name to create the field.
-                    var generateField = ShouldGenerateField(reference.Parent);
-
-                    // Insert the field with other fields, near the top of the class.
-                    if (generateField)
-                    {
-                        var position = 0;
-                        while (position < @class.Children.Count && @class.Children[i] is FieldDeclarationIntermediateNode)
-                        {
-                            position++;
-                        }
-
-                        @class.Children.Insert(position, CreateField(rewritten.FieldTypeName, identifier));
-                    }
+                    reference.Replace(RewriteUsage(@class, reference.Parent, node));
                 }
             }
         }
 
-        private ReferenceCaptureIntermediateNode RewriteUsage(IntermediateNode parent, IntermediateToken identifier)
+        private IntermediateNode RewriteUsage(ClassDeclarationIntermediateNode classNode, IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
         {
+            // If we can't get a nonempty attribute name, do nothing because there will
+            // already be a diagnostic for empty values
+            var identifierToken = DetermineIdentifierToken(node);
+            if (identifierToken == null)
+            {
+                return node;
+            }
+
             // Determine whether this is an element capture or a component capture, and
             // if applicable the type name that will appear in the resulting capture code
             var componentTagHelper = (parent as ComponentIntermediateNode)?.Component;
             if (componentTagHelper != null)
             {
-                return new ReferenceCaptureIntermediateNode(identifier, componentTagHelper.GetTypeName());
+                return new ReferenceCaptureIntermediateNode(identifierToken, componentTagHelper.GetTypeName());
             }
             else
             {
-                return new ReferenceCaptureIntermediateNode(identifier);
+                return new ReferenceCaptureIntermediateNode(identifierToken);
             }
         }
 
-        private bool ShouldGenerateField(IntermediateNode parent)
-        {
-            var parameters = parent.FindDescendantNodes<TagHelperDirectiveAttributeParameterIntermediateNode>();
-            for (var i = 0; i < parameters.Count; i++)
-            {
-                var parameter = parameters[i];
-                if (parameter.TagHelper.IsRefTagHelper() && parameter.BoundAttributeParameter.Name == "suppressField")
-                {
-                    if (parameter.HasDiagnostics)
-                    {
-                        parent.Diagnostics.AddRange(parameter.GetAllDiagnostics());
-                    }
-
-                    parent.Children.Remove(parameter);
-
-                    if (parameter.AttributeStructure == AttributeStructure.Minimized)
-                    {
-                        return false;
-                    }
-
-                    // We do not support non-minimized attributes here because we can't allow the value to be dynamic.
-                    // As a design/experience decision, we don't let you write @ref:suppressField="false" even though
-                    // we could parse it. The rationale is that it's misleading, you type something that looks like code,
-                    // but it's not really.
-                    parent.Diagnostics.Add(ComponentDiagnosticFactory.Create_RefSuppressFieldNotMinimized(parameter.Source));
-                }
-            }
-
-            if (parent is ComponentIntermediateNode component && component.Component.IsGenericTypedComponent())
-            {
-                // We cannot automatically generate a 'ref' field for generic components because we don't know
-                // how to write the type.
-                parent.Diagnostics.Add(ComponentDiagnosticFactory.Create_RefSuppressFieldRequiredForGeneric(parent.Source));
-                return false;
-            }
-
-            return true;
-        }
-
-        private IntermediateNode CreateField(string fieldType, IntermediateToken identifier)
-        {
-            return new FieldDeclarationIntermediateNode()
-            {
-                FieldName = identifier.Content,
-                FieldType = fieldType,
-                Modifiers = { "private" },
-                SuppressWarnings =
-                {
-                    "0414", // Field is assigned by never used
-                    "0169", // Field is never used
-                }, 
-            };
-        }
-
         private IntermediateToken DetermineIdentifierToken(TagHelperDirectiveAttributeIntermediateNode attributeNode)
         {
             IntermediateToken foundToken = null;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
index 96d336ca72..c14950aae5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/EliminateMethodBodyPass.cs
@@ -8,8 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 {
     internal sealed class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass
     {
-        // Run early in the optimization phase
-        public override int Order => int.MinValue;
+        // Run late in the optimization phase
+        public override int Order => int.MaxValue;
 
         protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
index 48e6bc7d03..eb6f2d9c47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ReferenceCaptureIntermediateNode.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
index 13d5fa9e82..624de396b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentChildContentIntegrationTest.cs
@@ -163,7 +163,7 @@ Some Content
             // Assert
             Assert.Collection(
                 generated.Diagnostics,
-                d => Assert.Equal("RZ10014", d.Id),
+                d => Assert.Equal("RZ10012", d.Id),
                 d => Assert.Equal("RZ9996", d.Id));
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index df812b8432..895e84e9c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -3305,39 +3305,10 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 <MyComponent TItem=int Item=""3"" @ref=""_my"" />
+
 @code {
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-}
-", throwOnFailure: false);
-
-            // Assert
-            var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Same(diagnostic.Id, ComponentDiagnosticFactory.RefSuppressFieldRequiredForGeneric.Id);
-        }
-
-        [Fact]
-        public void GenericComponent_WithComponentRef_SuppressField()
-        {
-            // Arrange
-            AdditionalSyntaxTrees.Add(Parse(@"
-using Microsoft.AspNetCore.Components;
-
-namespace Test
-{
-    public class MyComponent<TItem> : ComponentBase
-    {
-        [Parameter] public TItem Item { get; set; }
-    }
-}
-"));
-
-            // Act
-            var generated = CompileToCSharp(@"
-<MyComponent TItem=int Item=""3"" @ref=""_my"" @ref:suppressField />
-@code {
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
 }
 ");
 
@@ -3367,38 +3338,6 @@ namespace Test
             var generated = CompileToCSharp(@"
 <MyComponent Item=""3"" @ref=""_my"" />
 
-@code {
-    private MyComponent<int> _my;
-    public void Foo() { System.GC.KeepAlive(_my); }
-}
-", throwOnFailure: true);
-
-            // Assert
-            var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Same(diagnostic.Id, ComponentDiagnosticFactory.RefSuppressFieldRequiredForGeneric.Id);
-
-        }
-
-        [Fact]
-        public void GenericComponent_WithComponentRef_TypeInference_SuppressField()
-        {
-            // Arrange
-            AdditionalSyntaxTrees.Add(Parse(@"
-using Microsoft.AspNetCore.Components;
-
-namespace Test
-{
-    public class MyComponent<TItem> : ComponentBase
-    {
-        [Parameter] public TItem Item { get; set; }
-    }
-}
-"));
-
-            // Act
-            var generated = CompileToCSharp(@"
-<MyComponent Item=""3"" @ref=""_my"" @ref:suppressField />
-
 @code {
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
@@ -3900,7 +3839,13 @@ namespace Test
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<elem attributebefore=""before"" @ref=""myElem"" attributeafter=""after"">Hello</elem>");
+<elem attributebefore=""before"" @ref=""myElem"" attributeafter=""after"">Hello</elem>
+
+@code {
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+}
+");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -3916,7 +3861,10 @@ namespace Test
 <input type=""text"" data-slider-min=""@Min"" @ref=""@_element"" />
 
 @code {
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     }
 ");
 
@@ -3926,35 +3874,6 @@ namespace Test
             CompileToAssembly(generated);
         }
 
-        [Fact]
-        public void Element_WithRef_SuppressField()
-        {
-            // Arrange/Act
-            var generated = CompileToCSharp(@"
-<elem @ref=""myElem"" @ref:suppressField>Hello</elem>
-@code {
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-}");
-
-            // Assert
-            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
-            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
-            CompileToAssembly(generated);
-        }
-
-        [Fact]
-        public void Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic()
-        {
-            // Arrange/Act
-            var generated = CompileToCSharp(@"
-<elem @ref=""myElem"" @ref:suppressField=""false"">Hello</elem>", throwOnFailure: false);
-
-            // Assert
-            var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Same(diagnostic.Id, ComponentDiagnosticFactory.RefSuppressFieldNotMinimized.Id);
-        }
-
         [Fact]
         public void Component_WithRef()
         {
@@ -3972,7 +3891,13 @@ namespace Test
 
             // Arrange/Act
             var generated = CompileToCSharp(@"
-<MyComponent ParamBefore=""before"" @ref=""myInstance"" ParamAfter=""after"" />");
+<MyComponent ParamBefore=""before"" @ref=""myInstance"" ParamAfter=""after"" />
+
+@code {
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+}
+");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -4000,36 +3925,12 @@ namespace Test
 <MyComponent @ref=""myInstance"" SomeProp=""val"">
     Some <el>further</el> content
 </MyComponent>
-");
 
-            // Assert
-            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
-            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
-            CompileToAssembly(generated);
-        }
-
-        [Fact]
-        public void Component_WithRef_SuppressField()
-        {
-            // Arrange
-            AdditionalSyntaxTrees.Add(Parse(@"
-using Microsoft.AspNetCore.Components;
-
-namespace Test
-{
-    public class MyComponent : ComponentBase
-    {
-    }
-}
-"));
-
-            // Arrange/Act
-            var generated = CompileToCSharp(@"
-<MyComponent @ref=""myInstance"" @ref:suppressField />
 @code {
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-}");
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+}
+");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
index dc0b1b4cf9..863e2a0d16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiagnosticRazorIntegrationTest.cs
@@ -140,7 +140,7 @@ namespace Test
 
             // Assert
             var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Equal("RZ10013", diagnostic.Id);
+            Assert.Equal("RZ10011", diagnostic.Id);
             Assert.Equal(
                 "Component 'lowerCase' starts with a lowercase character. Component names cannot start with a lowercase character.",
                 diagnostic.GetMessage());
@@ -159,7 +159,7 @@ namespace Test
 
             // Assert
             var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Equal("RZ10014", diagnostic.Id);
+            Assert.Equal("RZ10012", diagnostic.Id);
             Assert.Equal(RazorDiagnosticSeverity.Warning, diagnostic.Severity);
             Assert.Equal(
                 "Found markup element with unexpected name 'PossibleComponent'. If this is intended to be a component, add a @using directive for its namespace.",
@@ -196,7 +196,7 @@ namespace Test
 
             // Assert
             var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Equal("RZ10015", diagnostic.Id);
+            Assert.Equal("RZ10013", diagnostic.Id);
             Assert.Equal(
                 "The start tag name 'MyComponent' does not match the end tag name 'mycomponent'. Components must have matching start and end tag names (case-sensitive).",
                 diagnostic.GetMessage());
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
index 0dcd6ea2b9..e18bbb4149 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(4,1): Warning RZ10014: Found markup element with unexpected name 'SomeComponent'. If this is intended to be a component, add a @using directive for its namespace.
+x:\dir\subdir\Test\TestComponent.cshtml(4,1): Warning RZ10012: Found markup element with unexpected name 'SomeComponent'. If this is intended to be a component, add a @using directive for its namespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index ee79e51bc7..9fe44c8dcf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private Test.MyComponent myInstance;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -46,6 +41,15 @@ __o = typeof(MyComponent);
 #nullable disable
         }
         #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 25a4ad4d99..2e4013600f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - Test.MyComponent - myInstance
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -23,3 +22,9 @@ Document -
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
                         HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (189:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (189:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 58fd008a0c..af797a4e3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1283:34,40 [10] )
+Generated Location: (1085:29,40 [10] )
 |myInstance|
 
+Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1450:45,7 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
deleted file mode 100644
index ba331d501d..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// <auto-generated/>
-#pragma warning disable 1591
-namespace Test
-{
-    #line hidden
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        #pragma warning disable 219
-        private void __RazorDirectiveTokenHelpers__() {
-        }
-        #pragma warning restore 219
-        #pragma warning disable 0414
-        private static System.Object __o = null;
-        #pragma warning restore 0414
-        #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
-        {
-            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
-            }
-            ));
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   myInstance = default(Test.MyComponent);
-
-#line default
-#line hidden
-#nullable disable
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-__o = typeof(MyComponent);
-
-#line default
-#line hidden
-#nullable disable
-        }
-        #pragma warning restore 1998
-#nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-
-#line default
-#line hidden
-#nullable disable
-    }
-}
-#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
deleted file mode 100644
index 25bc61b8d8..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Document - 
-    NamespaceDeclaration -  - Test
-        UsingDirective - (3:1,1 [12] ) - System
-        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
-        UsingDirective - (53:3,1 [17] ) - System.Linq
-        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
-        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            DesignTimeDirective - 
-            CSharpCode - 
-                IntermediateToken -  - CSharp - #pragma warning disable 0414
-            CSharpCode - 
-                IntermediateToken -  - CSharp - private static System.Object __o = null;
-            CSharpCode - 
-                IntermediateToken -  - CSharp - #pragma warning restore 0414
-            MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [52] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
-                HtmlContent - (52:0,52 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (52:0,52 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent myInstance;\n    void DoStuff() { GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
deleted file mode 100644
index 9b23b9d6be..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|myInstance|
-Generated Location: (1018:27,19 [10] )
-|myInstance|
-
-Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-|
-Generated Location: (1383:43,7 [81] )
-|
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 94157bb880..aa03027573 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private Test.MyComponent myInstance;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -45,6 +40,15 @@ __o = typeof(MyComponent);
 #nullable disable
         }
         #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 514feb7edb..a2aae2c90d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - Test.MyComponent - myInstance
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -28,5 +27,9 @@ Document -
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
                         HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
-                HtmlContent - (97:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (97:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (213:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (213:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index e79503fbd8..eceb35d3f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1239:33,19 [10] )
+Generated Location: (1041:28,19 [10] )
 |myInstance|
 
+Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1406:44,7 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 5d2a1913e2..51ee950d02 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementReference myElem;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -34,6 +29,15 @@ namespace Test
 #nullable disable
         }
         #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index c321049510..6da670c14d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - myElem
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -25,3 +24,9 @@ Document -
                     HtmlAttribute -  - attributeafter=" - "
                         HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+                HtmlContent - (80:0,80 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (80:0,80 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (220:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (220:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementReference myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index a5390e3ed9..128fa2be26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1115:29,37 [6] )
+Generated Location: (881:24,37 [6] )
 |myElem|
 
+Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+Generated Location: (1126:33,7 [128] )
+|
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 51761425a0..5f22a7aec4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementReference _element;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         }
@@ -46,7 +41,10 @@ namespace Test
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 647bf2d50e..5acd58a514 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - _element
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
@@ -25,7 +24,7 @@ Document -
                     ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
                 HtmlContent - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (61:0,61 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (129:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (129:4,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] public int Min { get; set; }\n    
+                HtmlContent - (237:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (237:7,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementReference _element;\n\n        [Parameter] public int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 809182470a..bf4a929596 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,19 +1,25 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (1137:30,37 [3] )
+Generated Location: (901:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1326:38,49 [8] )
+Generated Location: (1090:33,49 [8] )
 |_element|
 
-Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
 |
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1573:47,7 [56] )
+Generated Location: (1337:42,7 [164] )
 |
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
deleted file mode 100644
index e806b81275..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// <auto-generated/>
-#pragma warning disable 1591
-namespace Test
-{
-    #line hidden
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        #pragma warning disable 219
-        private void __RazorDirectiveTokenHelpers__() {
-        }
-        #pragma warning restore 219
-        #pragma warning disable 0414
-        private static System.Object __o = null;
-        #pragma warning restore 0414
-        #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
-        {
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            myElem = default(Microsoft.AspNetCore.Components.ElementReference);
-
-#line default
-#line hidden
-#nullable disable
-        }
-        #pragma warning restore 1998
-#nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-
-#line default
-#line hidden
-#nullable disable
-    }
-}
-#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
deleted file mode 100644
index e505e82004..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Document - 
-    NamespaceDeclaration -  - Test
-        UsingDirective - (3:1,1 [12] ) - System
-        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
-        UsingDirective - (53:3,1 [17] ) - System.Linq
-        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
-        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            DesignTimeDirective - 
-            CSharpCode - 
-                IntermediateToken -  - CSharp - #pragma warning disable 0414
-            CSharpCode - 
-                IntermediateToken -  - CSharp - private static System.Object __o = null;
-            CSharpCode - 
-                IntermediateToken -  - CSharp - #pragma warning restore 0414
-            MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
-                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
-                HtmlContent - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementReference myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
deleted file mode 100644
index c3556e4657..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|myElem|
-Generated Location: (856:24,12 [6] )
-|myElem|
-
-Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-|
-Generated Location: (1101:33,7 [78] )
-|
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
deleted file mode 100644
index f98dd68089..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// <auto-generated/>
-#pragma warning disable 1591
-namespace Test
-{
-    #line hidden
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
-        #pragma warning disable 219
-        private void __RazorDirectiveTokenHelpers__() {
-        }
-        #pragma warning restore 219
-        #pragma warning disable 0414
-        private static System.Object __o = null;
-        #pragma warning restore 0414
-        #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
-        {
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            myElem = default(Microsoft.AspNetCore.Components.ElementRef);
-
-#line default
-#line hidden
-#nullable disable
-        }
-        #pragma warning restore 1998
-    }
-}
-#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
deleted file mode 100644
index bd82282e59..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
+++ /dev/null
@@ -1 +0,0 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,41): Error RZ10011: The directive attribute '@ref:suppressField' must be used as a minimized attribute. Providing an attribute value like '@ref:suppressField="false" is not supported.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
deleted file mode 100644
index 69ddf6a8cd..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Document - 
-    NamespaceDeclaration -  - Test
-        UsingDirective - (3:1,1 [12] ) - System
-        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
-        UsingDirective - (53:3,1 [17] ) - System.Linq
-        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
-        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
-            DesignTimeDirective - 
-            CSharpCode - 
-                IntermediateToken -  - CSharp - #pragma warning disable 0414
-            CSharpCode - 
-                IntermediateToken -  - CSharp - private static System.Object __o = null;
-            CSharpCode - 
-                IntermediateToken -  - CSharp - #pragma warning restore 0414
-            MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
-                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
deleted file mode 100644
index b77841ef4b..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|myElem|
-Generated Location: (1083:29,12 [6] )
-|myElem|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
similarity index 93%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index c7d9b20432..5b6d83a8c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -58,10 +58,10 @@ __o = typeof(MyComponent<>);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
similarity index 71%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index f5a1218aee..f634b69431 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -14,15 +14,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-                HtmlContent - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (146:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (146:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent<int> _my;\n    void DoStuff() { GC.KeepAlive(_my); }\n
+                HtmlContent - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (147:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (147:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
similarity index 57%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
index d0bf71a61d..b7ec0ca120 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -13,14 +13,14 @@ Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1491:45,38 [3] )
 |_my|
 
-Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1856:61,7 [72] )
+Generated Location: (1856:61,7 [90] )
 |
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
similarity index 100%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
similarity index 79%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index 3f12dd56b1..2d876f125f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -14,16 +14,16 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [54] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-                HtmlContent - (54:0,54 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (54:0,54 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                HtmlContent - (156:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (156:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                HtmlContent - (137:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (137:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
similarity index 87%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index 868efd46b6..317c9822e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1143:33,28 [3] )
 |_my|
 
-Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
index 0dcd6ea2b9..e18bbb4149 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(4,1): Warning RZ10014: Found markup element with unexpected name 'SomeComponent'. If this is intended to be a component, add a @using directive for its namespace.
+x:\dir\subdir\Test\TestComponent.cshtml(4,1): Warning RZ10012: Found markup element with unexpected name 'SomeComponent'. If this is intended to be a component, add a @using directive for its namespace.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 45f0b5c057..ba86a76a59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private Test.MyComponent myInstance;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
@@ -34,6 +29,15 @@ namespace Test
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index be89b1cae3..c724647179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - Test.MyComponent - myInstance
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
@@ -16,3 +15,5 @@ Document -
                     ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
                         HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 3ad55818a2..0ca7d8ee94 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1071:26,40 [10] )
+Generated Location: (873:21,40 [10] )
 |myInstance|
 
+Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1162:33,7 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
deleted file mode 100644
index c4fc11129d..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.codegen.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <auto-generated/>
-#pragma warning disable 1591
-namespace Test
-{
-    #line hidden
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
-        {
-            __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddComponentReferenceCapture(1, (__value) => {
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                   myInstance = (Test.MyComponent)__value;
-
-#line default
-#line hidden
-#nullable disable
-            }
-            );
-            __builder.CloseComponent();
-        }
-        #pragma warning restore 1998
-#nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-
-#line default
-#line hidden
-#nullable disable
-    }
-}
-#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
deleted file mode 100644
index a39ce1d3c4..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.ir.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Document - 
-    NamespaceDeclaration -  - Test
-        UsingDirective - (3:1,1 [14] ) - System
-        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
-        UsingDirective - (53:3,1 [19] ) - System.Linq
-        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
-        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [52] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
-            CSharpCode - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent myInstance;\n    void DoStuff() { GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
deleted file mode 100644
index dad9e5fd6d..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_SuppressField/TestComponent.mappings.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|myInstance|
-Generated Location: (724:19,19 [10] )
-|myInstance|
-
-Source Location: (61:1,7 [81] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-|
-Generated Location: (1013:31,7 [81] )
-|
-    MyComponent myInstance;
-    void DoStuff() { GC.KeepAlive(myInstance); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 251726dde2..500298b6c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private Test.MyComponent myInstance;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
@@ -38,6 +33,15 @@ namespace Test
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index e99793984f..1bc1814490 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - Test.MyComponent - myInstance
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [97] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
@@ -17,3 +16,5 @@ Document -
                     ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
                         HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
+            CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Test.MyComponent myInstance;\n    public void Foo() { System.GC.KeepAlive(myInstance); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 6a8210af48..1f290c1c54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1282:32,19 [10] )
+Generated Location: (1084:27,19 [10] )
 |myInstance|
 
+Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+Generated Location: (1373:39,7 [104] )
+|
+    private Test.MyComponent myInstance;
+    public void Foo() { System.GC.KeepAlive(myInstance); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 4ab0319ccd..bccd61fb44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementReference myElem;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
@@ -35,6 +30,15 @@ namespace Test
             __builder.CloseElement();
         }
         #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index c51872c53f..b9ffc7754d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - myElem
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,3 +17,5 @@ Document -
                     HtmlAttribute -  - attributeafter=" - "
                         HtmlAttributeValue - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (61:0,61 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
+            CSharpCode - (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Microsoft.AspNetCore.Components.ElementReference myElem;\n    public void Foo() { System.GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index ac62465376..33a1ffc706 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (1098:26,37 [6] )
+Generated Location: (864:21,37 [6] )
 |myElem|
 
+Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+Generated Location: (1176:34,7 [128] )
+|
+    private Microsoft.AspNetCore.Components.ElementReference myElem;
+    public void Foo() { System.GC.KeepAlive(myElem); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 7cec406182..f425681378 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -10,11 +10,6 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementReference _element;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
@@ -45,7 +40,10 @@ namespace Test
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index c0fd524c30..62d17f05fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementReference - _element
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
@@ -16,5 +15,5 @@ Document -
                         CSharpExpressionAttributeValue - (36:0,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Min
                     ReferenceCapture - (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _element
-            CSharpCode - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        [Parameter] public int Min { get; set; }\n    
+            CSharpCode - (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        private ElementReference _element;\n\n        [Parameter] public int Min { get; set; }\n        public void Foo() { System.GC.KeepAlive(_element); }\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index 670974cf7b..f35554549b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,14 +1,20 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1270:34,49 [8] )
+Generated Location: (1034:29,49 [8] )
 |_element|
 
-Source Location: (72:2,7 [56] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
 |
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1537:46,7 [56] )
+Generated Location: (1301:41,7 [164] )
 |
+        private ElementReference _element;
+
         [Parameter] public int Min { get; set; }
+        public void Foo() { System.GC.KeepAlive(_element); }
     |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
deleted file mode 100644
index 0c480f76a7..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.codegen.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <auto-generated/>
-#pragma warning disable 1591
-namespace Test
-{
-    #line hidden
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
-        {
-            __builder.OpenElement(0, "elem");
-            __builder.AddElementReferenceCapture(1, (__value) => {
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            myElem = __value;
-
-#line default
-#line hidden
-#nullable disable
-            }
-            );
-            __builder.AddContent(2, "Hello");
-            __builder.CloseElement();
-        }
-        #pragma warning restore 1998
-#nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-       
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-
-#line default
-#line hidden
-#nullable disable
-    }
-}
-#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
deleted file mode 100644
index 89666189e8..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.ir.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Document - 
-    NamespaceDeclaration -  - Test
-        UsingDirective - (3:1,1 [14] ) - System
-        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
-        UsingDirective - (53:3,1 [19] ) - System.Linq
-        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
-        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (39:0,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
-                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
-            CSharpCode - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    ElementReference myElem;\n    void DoStuff() { GC.KeepAlive(myElem); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
deleted file mode 100644
index ac7adc105d..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressField/TestComponent.mappings.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|myElem|
-Generated Location: (703:19,12 [6] )
-|myElem|
-
-Source Location: (60:1,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-|
-Generated Location: (1015:32,7 [78] )
-|
-    ElementReference myElem;
-    void DoStuff() { GC.KeepAlive(myElem); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
deleted file mode 100644
index 65d6d0d152..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.codegen.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <auto-generated/>
-#pragma warning disable 1591
-namespace Test
-{
-    #line hidden
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
-    {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private global::Microsoft.AspNetCore.Components.ElementRef myElem;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
-        #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
-        {
-            builder.OpenElement(0, "elem");
-            builder.AddElementReferenceCapture(1, (__value) => {
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-            myElem = __value;
-
-#line default
-#line hidden
-#nullable disable
-            }
-            );
-            builder.AddContent(2, "Hello");
-            builder.CloseElement();
-        }
-        #pragma warning restore 1998
-    }
-}
-#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
deleted file mode 100644
index bd82282e59..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.diagnostics.txt
+++ /dev/null
@@ -1 +0,0 @@
-x:\dir\subdir\Test\TestComponent.cshtml(1,41): Error RZ10011: The directive attribute '@ref:suppressField' must be used as a minimized attribute. Providing an attribute value like '@ref:suppressField="false" is not supported.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
deleted file mode 100644
index b482efeff5..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.ir.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Document - 
-    NamespaceDeclaration -  - Test
-        UsingDirective - (3:1,1 [14] ) - System
-        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
-        UsingDirective - (53:3,1 [19] ) - System.Linq
-        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
-        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - global::Microsoft.AspNetCore.Components.ElementRef - myElem
-            MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlContent - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (47:0,47 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
-                    ReferenceCapture - (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
deleted file mode 100644
index 7fbcfcd168..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_SuppressFieldWithValue_ResultsInDiagnostic/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (12:0,12 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|myElem|
-Generated Location: (926:24,12 [6] )
-|myElem|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
index b33b86132c..2bae2266c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs
@@ -10,16 +10,11 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private Test.MyComponent<TItem> _my;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            builder.OpenComponent<Test.MyComponent<int>>(0);
-            builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck<int>(
+            __builder.OpenComponent<Test.MyComponent<int>>(0);
+            __builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<int>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                              3
@@ -28,7 +23,7 @@ namespace Test
 #line hidden
 #nullable disable
             ));
-            builder.AddComponentReferenceCapture(2, (__value) => {
+            __builder.AddComponentReferenceCapture(2, (__value) => {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       _my = (Test.MyComponent<int>)__value;
@@ -38,9 +33,18 @@ namespace Test
 #nullable disable
             }
             );
-            builder.CloseComponent();
+            __builder.CloseComponent();
         }
         #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
index 22c8243ee5..5dbefda847 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - Test.MyComponent<TItem> - _my
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
@@ -14,3 +13,5 @@ Document -
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
+            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
index a259494405..35cce98a12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt
@@ -1,5 +1,16 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1218:33,38 [3] )
+Generated Location: (1044:28,38 [3] )
 |_my|
 
+Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (1331:40,7 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
similarity index 90%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index 2551625019..2bae2266c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -37,10 +37,10 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
similarity index 78%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index 3ed36f4932..5dbefda847 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -7,11 +7,11 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
                     ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    MyComponent<int> _my;\n    void DoStuff() { GC.KeepAlive(_my); }\n
+            CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
new file mode 100644
index 0000000000..35cce98a12
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|_my|
+Generated Location: (1044:28,38 [3] )
+|_my|
+
+Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+Generated Location: (1331:40,7 [90] )
+|
+    private MyComponent<int> _my;
+    public void Foo() { System.GC.KeepAlive(_my); }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
deleted file mode 100644
index 8869512906..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_SuppressField/TestComponent.mappings.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|_my|
-Generated Location: (1044:28,38 [3] )
-|_my|
-
-Source Location: (73:1,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
-|
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
-|
-Generated Location: (1331:40,7 [72] )
-|
-    MyComponent<int> _my;
-    void DoStuff() { GC.KeepAlive(_my); }
-|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
index 523fdcd46c..bbcfa74722 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs
@@ -10,15 +10,10 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
-        #pragma warning disable 0414
-        #pragma warning disable 0169
-        private Test.MyComponent<TItem> _my;
-        #pragma warning restore 0169
-        #pragma warning restore 0414
         #pragma warning disable 1998
-        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 
+            __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                    3
@@ -54,12 +49,12 @@ namespace __Blazor.Test.TestComponent
     #line hidden
     internal static class TypeInference
     {
-        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
+        public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
-        builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
-        builder.AddAttribute(__seq0, "Item", __arg0);
-        builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
-        builder.CloseComponent();
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
+        __builder.AddAttribute(__seq0, "Item", __arg0);
+        __builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent<TItem>)__value); });
+        __builder.CloseComponent();
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
index ee14362fb9..cde256a50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
-            FieldDeclaration -  - private - Test.MyComponent<TItem> - _my
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
index 7c936d6582..3c103a0ec3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1067:31,28 [3] )
+Generated Location: (872:26,28 [3] )
 |_my|
 
 Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1290:42,7 [90] )
+Generated Location: (1095:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
similarity index 100%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.codegen.cs
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
similarity index 87%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index 30bbe933db..cde256a50b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -7,12 +7,12 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [54] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
-            CSharpCode - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
+            CSharpCode - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private MyComponent<int> _my;\n    public void Foo() { System.GC.KeepAlive(_my); }\n
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
             ComponentTypeInferenceMethod -  - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
similarity index 84%
rename from src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
rename to src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index b85825c088..3c103a0ec3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_SuppressField/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (872:26,28 [3] )
 |_my|
 
-Source Location: (65:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
index 3dc20da67f..1eafca4181 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -62,24 +62,16 @@ namespace Microsoft.CodeAnalysis.Razor
                 });
             });
 
-            builder.BindAttribute(@ref =>
+            builder.BindAttribute(attribute =>
             {
-                @ref.Documentation = ComponentResources.RefTagHelper_Documentation;
-                @ref.Name = "@ref";
+                attribute.Documentation = ComponentResources.RefTagHelper_Documentation;
+                attribute.Name = "@ref";
 
                 // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                 // a C# property will crash trying to create the tooltips.
-                @ref.SetPropertyName("Ref");
-                @ref.TypeName = typeof(object).FullName;
-                @ref.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
-
-                @ref.BindAttributeParameter(suppressField =>
-                {
-                    suppressField.Name = "suppressField";
-                    suppressField.Documentation = ComponentResources.RefTagHelper_SuppressField_Documentation;
-                    suppressField.TypeName = typeof(bool).FullName;
-                    suppressField.SetPropertyName("SuppressField");
-                });
+                attribute.SetPropertyName("Ref");
+                attribute.TypeName = typeof(object).FullName;
+                attribute.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
             });
 
             return builder.Build();
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index 5740418f77..140520153e 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -39,7 +39,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.True(item.CaseSensitive);
 
             Assert.Equal(
-                "Generates the specified field, and populates it during rendering with a reference to the element or component.",
+                "Populates the specified field or property with a reference to the element or component.",
                 item.Documentation);
 
             Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName);
@@ -75,7 +75,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(attribute.IsIndexerStringProperty);
 
             Assert.Equal(
-                "Generates the specified field, and populates it during rendering with a reference to the element or component.",
+                "Populates the specified field or property with a reference to the element or component.",
                 attribute.Documentation);
 
             Assert.Equal("@ref", attribute.Name);
@@ -85,13 +85,6 @@ namespace Microsoft.CodeAnalysis.Razor
             Assert.False(attribute.IsStringProperty);
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
-
-            var parameter = Assert.Single(attribute.BoundAttributeParameters);
-            Assert.Empty(parameter.Diagnostics);
-            Assert.Equal(":suppressField", parameter.DisplayName);
-            Assert.Equal("Suppresses the generation of a field by '@ref'. Specify '@ref:suppressField' to define your own property or field.", parameter.Documentation);
-            Assert.True(parameter.IsBooleanProperty);
-            Assert.Equal("suppressField", parameter.Name);
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 848587311d..ce867b6b8d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // Verify component compilation succeeded
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "ComponentApp.dll"), "ComponentApp.Components.Pages.Counter");
 
-            Assert.BuildWarning(result, "RZ10014");
+            Assert.BuildWarning(result, "RZ10012");
         }
 
         [Fact]

From c32e2a5969555bacccb20189180cfb64f4645fb4 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 15 Aug 2019 14:42:21 -0700
Subject: [PATCH 246/337] Set LangVersion the same way as roslyn
 (dotnet/aspnetcore-tooling#978)

* Set LangVersion the same way as roslyn

* Update commit link
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/7da15da123077cf4b52398c949c6aa6aaee2b9ee
---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets        | 10 +++++-----
 .../Microsoft.NET.Sdk.Razor.Component.targets          |  6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index bba60c4553..c74674d432 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project ToolsVersion="14.0">
   <!--
   What follows in this file is based on:
-     https://github.com/dotnet/roslyn/blob/db4f836b97db1e7ad261e51c67cc80c6f3c28791/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
+     https://github.com/dotnet/roslyn/blob/21263069b7e8522441d829fc59a3aa5b3a3cf938/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
 
   We need to keep this basically up to date, as well as track the set of modifications we've made. Try to keep the formatting
   similar to the original to reduce noise. In general try to only deviate from the CoreCompile target when we need to for
@@ -111,10 +111,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <LangVersion Condition="'$(LangVersion)' == '' AND
-        (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
-         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">preview</LangVersion>
+    <PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(TargetFrameworkVersion)' != 'v3.0') AND
+                            ('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(TargetFrameworkVersion)' != 'v2.1')">
+      <MaxSupportedLangVersion Condition="'$(MaxSupportedLangVersion)' == ''">7.3</MaxSupportedLangVersion>
+      <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
     </PropertyGroup>
 
     <Csc
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 73fb23e194..18e39122e2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -180,12 +180,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <LangVersion Condition="'$(LangVersion)' == '' AND
-        (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
-         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">8.0</LangVersion>
-    </PropertyGroup>
-
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"

From 2873952822ad8ce76d2b153da0a894bad0cf6c97 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Thu, 15 Aug 2019 15:27:12 -0700
Subject: [PATCH 247/337]  Set LangVersion the same way as roslyn
 (dotnet/aspnetcore-tooling#979)

* Set LangVersion the same way as roslyn

* Update commit link
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b82d4f958386828a4664fcce73acfcf2e1e5a066
---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets        | 10 +++++-----
 .../Microsoft.NET.Sdk.Razor.Component.targets          |  6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index bba60c4553..c74674d432 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project ToolsVersion="14.0">
   <!--
   What follows in this file is based on:
-     https://github.com/dotnet/roslyn/blob/db4f836b97db1e7ad261e51c67cc80c6f3c28791/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
+     https://github.com/dotnet/roslyn/blob/21263069b7e8522441d829fc59a3aa5b3a3cf938/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
 
   We need to keep this basically up to date, as well as track the set of modifications we've made. Try to keep the formatting
   similar to the original to reduce noise. In general try to only deviate from the CoreCompile target when we need to for
@@ -111,10 +111,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <LangVersion Condition="'$(LangVersion)' == '' AND
-        (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
-         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">preview</LangVersion>
+    <PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(TargetFrameworkVersion)' != 'v3.0') AND
+                            ('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(TargetFrameworkVersion)' != 'v2.1')">
+      <MaxSupportedLangVersion Condition="'$(MaxSupportedLangVersion)' == ''">7.3</MaxSupportedLangVersion>
+      <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
     </PropertyGroup>
 
     <Csc
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 73fb23e194..18e39122e2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -180,12 +180,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <LangVersion Condition="'$(LangVersion)' == '' AND
-        (('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
-         ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">8.0</LangVersion>
-    </PropertyGroup>
-
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"

From f757fc2d181f659d4c2f8bc8400ed646b2d2ac11 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2019 03:42:30 +0000
Subject: [PATCH 248/337] [master] Update dependencies from aspnet/Extensions
 (dotnet/aspnetcore-tooling#970)

* Update dependencies from https://github.com/aspnet/Extensions build 20190813.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19413.3
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19413.3

* Update dependencies from https://github.com/aspnet/Extensions build 20190816.10

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19416.10
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.NonCapturingTimer.Sources - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19416.10

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 5.0.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19411.12 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.8.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19411.12 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19411.12 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* * React to namespace removal
- a portion of [release/3.0] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#975)
- w/ thanks to @jkotalik !
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a988d3e05dc27738ca53476bb12b616f617c7965
---
 .../test/DefaultRazorProjectFileSystemTest.cs                   | 1 -
 .../test/ServerLifecycleTest.cs                                 | 2 +-
 .../IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs | 2 +-
 .../test/IntegrationTests/BuildIncrementalismTest.cs            | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest.cs               | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest11.cs             | 2 +-
 .../test/IntegrationTests/BuildIntegrationTest22NetFx.cs        | 2 +-
 .../test/IntegrationTests/BuildServerIntegrationTest.cs         | 1 -
 .../test/IntegrationTests/BuildWithComponentsIntegrationTest.cs | 2 +-
 9 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
index a22bb737fa..a158f1dc8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
index d2e46631ec..c2dff43150 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/ServerLifecycleTest.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index d1fd24c9c8..91a7fd89f6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index 31c67f5acc..d87b5642e0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 9c9bce24d5..6acfd7c50b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyModel;
 using Xunit;
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
index 84b6b77ea0..a3b255ed18 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
index 263e20747c..d2ec513242 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
index 7cab7ac3ee..db779af38f 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -7,7 +7,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index 2138f539ac..848587311d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests

From e18cc9a77679f7b07c39a7281bd8d4e4f29c8fd4 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Wed, 14 Aug 2019 18:44:17 -0700
Subject: [PATCH 249/337] Pass views assembly to linker

1. Re-schedule target to run before linker
2. Add additional linker input item
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/88b5f29a63065857e51cbef659fb9c98e29b5df1
---
 .../Microsoft.NET.Sdk.Razor.StaticWebAssets.targets         | 4 ++--
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index e90aac13f8..a200ec63ab 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -487,12 +487,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
 
     <!--
-    Called after ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when
+    Called after ComputeResolvedFilesToPublishList but before CopyFilesToPublishDirectory - this target is called when
     publishing the project to get a list of files to the output directory.
   -->
   <Target
     Name="_StaticWebAssetsComputeFilesToPublish"
-    AfterTargets="ComputeRefAssembliesToPublish"
+    AfterTargets="ComputeResolvedFilesToPublishList"
     DependsOnTargets="ResolveStaticWebAssetsInputs">
 
     <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index e001d5f5da..b0b8683454 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -779,18 +779,20 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!--
-    Called after ComputeFilesToPublish and ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when
+    Called after ComputeResolvedFilesToPublishList but before CopyFilesToPublishDirectory - this target is called when
     publishing the project to get a list of files to the output directory.
   -->
   <Target
     Name="_RazorComputeFilesToPublish"
-    AfterTargets="ComputeRefAssembliesToPublish"
+    AfterTargets="ComputeResolvedFilesToPublishList"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '@(RazorGenerate)'!=''">
 
     <!-- If we generated an assembly/pdb then include those -->
     <ItemGroup>
       <ResolvedFileToPublish Include="@(RazorIntermediateAssembly)" Condition="'$(CopyBuildOutputToPublishDirectory)'=='true'">
         <RelativePath>@(RazorIntermediateAssembly->'%(Filename)%(Extension)')</RelativePath>
+        <!-- Pass assembly to linker and crossgen -->
+        <PostprocessAssembly>true</PostprocessAssembly>
       </ResolvedFileToPublish>
       <ResolvedFileToPublish Include="@(_RazorDebugSymbolsIntermediatePath)" Condition="'$(CopyOutputSymbolsToPublishDirectory)'=='true'">
         <RelativePath>@(_RazorDebugSymbolsIntermediatePath->'%(Filename)%(Extension)')</RelativePath>

From cb35a0aa4045b2912fbccfaa70994dd2315f4a31 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Tue, 20 Aug 2019 08:20:36 -0700
Subject: [PATCH 250/337] Reaction to API review changes

This change updates the snapshot of components APIs used in compiler
tests and updates the tests to react tot hose changes.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c8cc588bcada049b194458a965e9e3f8538dab60
---
 .../ComponentBindIntegrationTest.cs           |   1 +
 .../ComponentCodeGenerationTestBase.cs        |  72 +-
 .../ComponentDeclarationIntegrationTest.cs    |   4 +-
 .../ComponentDirectiveIntegrationTest.cs      |   4 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  15 +-
 .../TestComponent.mappings.txt                |   9 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  15 +-
 .../TestComponent.mappings.txt                |   9 +-
 .../TestComponent.codegen.cs                  |  13 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   5 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   8 +-
 .../TestComponent.ir.txt                      |  17 +-
 .../TestComponent.mappings.txt                |   6 +-
 .../TestComponent.codegen.cs                  |   5 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   5 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |   5 +-
 .../TestComponent.ir.txt                      |  11 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |  10 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  17 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   7 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  41 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  43 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  41 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  29 +-
 .../TestComponent.mappings.txt                |   9 +-
 .../TestComponent.codegen.cs                  |  17 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  17 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  17 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  17 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  11 +-
 .../TestComponent.mappings.txt                |   9 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  17 +-
 .../TestComponent.codegen.cs                  |   9 -
 .../TestComponent.ir.txt                      |  14 +-
 .../TestComponent.mappings.txt                |   5 -
 .../TestComponent.codegen.cs                  |  13 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  13 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  11 +-
 .../TestComponent.mappings.txt                |   9 +-
 .../TestComponent.codegen.cs                  |   7 +
 .../TestComponent.ir.txt                      |  11 +-
 .../TestComponent.mappings.txt                |   5 +
 .../Regression_784/TestComponent.codegen.cs   |  17 +-
 .../Regression_784/TestComponent.ir.txt       |  35 +-
 .../Regression_784/TestComponent.mappings.txt |  21 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.codegen.cs                  |  13 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   9 +-
 .../TestComponent.ir.txt                      |  17 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   7 +-
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   6 +-
 .../TestComponent.ir.txt                      |  11 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  10 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  31 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  33 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  31 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.diagnostics.txt             |   2 +-
 .../TestComponent.ir.txt                      |  27 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |   2 +-
 .../TestComponent.mappings.txt                |   2 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |   5 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.codegen.cs                  |  15 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   8 +-
 .../TestComponent.codegen.cs                  |  12 +-
 .../TestComponent.ir.txt                      |   7 +-
 .../TestComponent.codegen.cs                  |  13 +-
 .../TestComponent.ir.txt                      |  13 +-
 .../TestComponent.mappings.txt                |   4 +-
 .../TestComponent.codegen.cs                  |  11 +-
 .../TestComponent.ir.txt                      |   9 +-
 .../TestComponent.codegen.cs                  |   7 +
 .../TestComponent.ir.txt                      |   1 +
 .../Regression_784/TestComponent.codegen.cs   |  17 +-
 .../Regression_784/TestComponent.ir.txt       |  25 +-
 .../Regression_784/TestComponent.mappings.txt |   8 +-
 .../BaseTagHelperDescriptorProviderTest.cs    |  10 +-
 .../BindTagHelperDescriptorProviderTest.cs    |  18 +-
 ...omponentTagHelperDescriptorProviderTest.cs |  17 +-
 ...tHandlerTagHelperDescriptorProviderTest.cs |  11 +-
 ...NetCore.Components.Forms.netstandard2.0.cs |  75 ++
 ...spNetCore.Components.Web.netstandard2.0.cs | 420 +++++++++++
 ...etCore.Components.netstandard2.0.Manual.cs |  36 -
 ...ft.AspNetCore.Components.netstandard2.0.cs | 712 ++++++------------
 .../Components/Pages/Counter.razor            |   2 +-
 .../Components/Shared/NavMenu.razor           |   4 +-
 .../ComponentApp/Components/_Imports.razor    |   1 +
 220 files changed, 2195 insertions(+), 1554 deletions(-)
 delete mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.mappings.txt
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Forms.netstandard2.0.cs
 create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
index 486f821dbe..77bd6c9ed3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentBindIntegrationTest.cs
@@ -83,6 +83,7 @@ namespace Test
             // We're looking for VS crash issues. Meaning if the parser returns
             // diagnostics we don't want to throw.
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@page"" />
 @functions {
     public string page { get; set; } = ""text"";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 895e84e9c5..c10ecd7ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -1181,6 +1181,7 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
@@ -1210,6 +1211,7 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
@@ -1240,6 +1242,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @bind=""@CurrentDate"" @bind:event=""oninput"" @bind:format=""MM/dd"" />
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -1258,6 +1261,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @bind-value=""@CurrentDate"" @bind-value:format=""MM/dd"" />
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -1996,20 +2000,22 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent OnClick=""@(EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment))""/>
+@using Microsoft.AspNetCore.Components.Web
+<MyComponent OnClick=""@(EventCallback.Factory.Create<MouseEventArgs>(this, Increment))""/>
 
 @code {
     private int counter;
@@ -2173,13 +2179,14 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2208,24 +2215,26 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <MyComponent OnClick=""@Increment""/>
 
 @code {
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 }");
@@ -2243,13 +2252,14 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2279,24 +2289,26 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <MyComponent OnClick=""@Increment""/>
 
 @code {
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
@@ -2315,24 +2327,26 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <MyComponent OnClick=""@Increment""/>
 
 @code {
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 }");
@@ -2398,7 +2412,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public Action<UIEventArgs> OnClick { get; set; }
+        public Action<EventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2440,10 +2454,11 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <DynamicElement @onclick=""OnClick"" />
 
 @code {
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 }");
 
             // Assert
@@ -2465,7 +2480,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public Action<UIEventArgs> OnClick { get; set; }
+        public Action<EventArgs> OnClick { get; set; }
     }
 }
 "));
@@ -2476,7 +2491,7 @@ namespace Test
 
 @code {
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 }");
@@ -2494,6 +2509,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input onclick=""foo"" />");
 
             // Assert
@@ -2509,6 +2525,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""() => { }"" />");
 
             // Assert
@@ -2524,6 +2541,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""x => { }"" />");
 
             // Assert
@@ -2539,6 +2557,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
     void OnClick() {
@@ -2558,9 +2577,10 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 }");
 
@@ -2577,9 +2597,10 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 }");
 
@@ -2597,6 +2618,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
     Task OnClick() 
@@ -2619,9 +2641,10 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
@@ -2641,6 +2664,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""@(async () => await Task.Delay(10))"" />
 ");
 
@@ -2658,6 +2682,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using System.Threading.Tasks
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""@(async (e) => await Task.Delay(10))"" />
 ");
 
@@ -2689,9 +2714,10 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 }");
 
@@ -2708,9 +2734,10 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onCLICK=""OnClick"" />
 @code {
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 }");
 
@@ -4551,6 +4578,7 @@ namespace New.Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <div>
   <a onclick=""test()"" @onclick=""() => {}"">Learn the ten cool tricks your compiler author will hate!</a>
 </div>");
@@ -4591,6 +4619,7 @@ namespace New.Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <div>
   <input type=""text"" value=""17"" @bind=""@text""></input>
 </div>
@@ -4615,6 +4644,7 @@ namespace New.Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <div>
   <input type=""text"" Value=""17"" @bind=""@text""></input>
 </div>
@@ -4638,6 +4668,7 @@ namespace New.Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <div>
   <input type=""text"" @bind-value=""@text"" @bind-value:event=""oninput"" @oninput=""() => {}""></input>
 </div>
@@ -5011,11 +5042,12 @@ Welcome to your new app.
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <p @onmouseover=""OnComponentHover"" style=""background: @ParentBgColor;"" />
 @code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index e9b8583cd4..b441a86f38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -156,7 +156,7 @@ namespace Test
 
         public class BaseClass : IComponent
         {
-            public void Configure(RenderHandle renderHandle)
+            public void Attach(RenderHandle renderHandle)
             {
             }
 
@@ -164,7 +164,7 @@ namespace Test
             {
             }
 
-            public Task SetParametersAsync(ParameterCollection parameters)
+            public Task SetParametersAsync(ParameterView parameters)
             {
                 throw new System.NotImplementedException();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
index 111cd7978e..b7e968f74a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
@@ -126,12 +126,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             [Parameter]
             public RenderFragment Body { get; set; }
 
-            public void Configure(RenderHandle renderHandle)
+            public void Attach(RenderHandle renderHandle)
             {
                 throw new NotImplementedException();
             }
 
-            public Task SetParametersAsync(ParameterCollection parameters)
+            public Task SetParametersAsync(ParameterView parameters)
             {
                 throw new NotImplementedException();
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index 923f53aa34..dee5f78f1f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -26,9 +33,9 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async (e) => await Task.Delay(10)
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 544e34faff..0a5c9e6973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -16,11 +17,13 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (75:2,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (88:1,57 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (88:1,57 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (132:2,57 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (132:2,57 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index b9c3ad0c68..9886669a0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -3,8 +3,13 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (436:18,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1116:31,19 [33] )
+Generated Location: (1282:38,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 7cb838c658..bc969c8af6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -26,9 +33,9 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -38,9 +45,9 @@ using System.Threading.Tasks;
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index d104d57b31..0417372324 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -16,13 +17,15 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(MouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 019d1a5033..1b311ffac3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -3,21 +3,26 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (436:18,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1114:31,17 [7] )
+Generated Location: (1280:38,17 [7] )
 |OnClick|
 
-Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1315:41,7 [91] )
+Generated Location: (1481:48,7 [89] )
 |
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 4f94884c3c..8d02e2b54c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -26,9 +33,9 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async () => await Task.Delay(10)
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index f5666d5321..bb7807ad5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -16,11 +17,13 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (75:2,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (131:2,56 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (131:2,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index 85bcb66ba4..f8399b23fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -3,8 +3,13 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (436:18,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1116:31,19 [32] )
+Generated Location: (1282:38,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 0497f44ac4..6193a76695 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -26,9 +33,9 @@ using System.Threading.Tasks;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -38,7 +45,7 @@ using System.Threading.Tasks;
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 531cbcd767..e2eabc9498 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -16,13 +17,15 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index a5deb24ba1..03be8bfadf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -3,19 +3,24 @@ Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (285:11,0 [28] )
 |using System.Threading.Tasks|
 
-Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (436:18,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1114:31,17 [7] )
+Generated Location: (1280:38,17 [7] )
 |OnClick|
 
-Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1315:41,7 [73] )
+Generated Location: (1481:48,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index afb7769b91..16eb333f1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                Enabled
@@ -28,8 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled);
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 05148553b7..1566cc4b13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -15,19 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [16] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
-                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (22:0,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, 
-                            IntermediateToken -  - CSharp - Enabled
-                            IntermediateToken -  - CSharp - )
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index ca548a7cfe..8aa24d9f91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (953:25,31 [7] )
+Generated Location: (895:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1286:36,7 [41] )
+Generated Location: (1095:35,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index ebaa5698f5..f1402c510f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -22,7 +29,7 @@ namespace Test
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                CurrentDate
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index 9b157d9f6e..ad7a8b56eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,21 +15,23 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (58:1,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (59:1,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                    HtmlAttribute - (58:1,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
                             IntermediateToken -  - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: "MM/dd"
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+                HtmlContent - (117:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (117:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 34b78741d0..afd07bee75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,18 @@
-Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (59:1,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (937:25,15 [11] )
+Generated Location: (1101:32,15 [11] )
 |CurrentDate|
 
-Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1316:36,7 [77] )
+Generated Location: (1480:43,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 88df4b2931..2c81c2ab06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -28,7 +28,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , format: 
+            ;
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        Format
@@ -36,8 +37,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format);
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index 0b39357e3b..a36619c209 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -15,22 +15,15 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (18:0,18 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: 
+                    HtmlAttribute - (39:0,39 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind:format=" - "
+                        CSharpExpressionAttributeValue - (54:0,54 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
-                            IntermediateToken -  - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: Format
-                            IntermediateToken -  - CSharp - )
                 HtmlContent - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (64:0,64 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index a90f46fda1..da2906c913 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,27 [11] )
+Generated Location: (891:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1161:33,55 [6] )
+Generated Location: (1114:34,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1517:44,7 [135] )
+Generated Location: (1313:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index f71815f894..0a5479cea8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -28,8 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , format: "MM/dd/yyyy");
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy");
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index e00832392c..76cd88c845 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -15,22 +15,15 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (18:0,18 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: 
-                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
-                            IntermediateToken -  - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
-                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (39:0,39 [26] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind:format=" - "
+                        HtmlAttributeValue - (54:0,54 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (54:0,54 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - MM/dd/yyyy
                 HtmlContent - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (67:0,67 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 6e175bf68d..70ce319ca6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (949:25,27 [11] )
+Generated Location: (891:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1338:36,7 [77] )
+Generated Location: (1095:35,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 8bb172e78b..4bec837daf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            ParentValue
@@ -28,8 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index c957b3db86..ed0c4bfc67 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -15,19 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (18:0,18 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 4eb477f456..8138e0a4d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (949:25,27 [11] )
+Generated Location: (891:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1294:36,7 [50] )
+Generated Location: (1095:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index f883f7afd9..e88bce3b6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -22,7 +29,7 @@ namespace Test
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 7093da7936..7d31616d54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,21 +15,23 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (64:1,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                            IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (65:1,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (64:1,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
                             IntermediateToken -  - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: "MM/dd"
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (63:0,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+                HtmlContent - (107:1,63 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (107:1,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 3bcfc76cdf..01aae5776f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -1,13 +1,18 @@
-Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (65:1,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (943:25,21 [11] )
+Generated Location: (1107:32,21 [11] )
 |CurrentDate|
 
-Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1322:36,7 [77] )
+Generated Location: (1486:43,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index a0f1f280f0..29c1053e5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __o = 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
@@ -28,8 +28,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            );
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+            ;
         }
         #pragma warning restore 1998
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 93c9467f1a..ad76db6807 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -15,16 +15,9 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
                 HtmlContent - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (30:0,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index f6c8f0bf36..876a9ff033 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (937:25,15 [11] )
+Generated Location: (879:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1282:36,7 [50] )
+Generated Location: (1083:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index b1dfdbee8f..ae88864dc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __o = new System.Action<System.EventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -45,7 +45,7 @@ __o = typeof(MyComponent);
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 6541f42012..fcae53e045 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -20,5 +20,5 @@ Document -
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(EventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 12601265bb..b003737829 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (950:25,23 [9] )
+Generated Location: (923:25,23 [9] )
 |Increment|
 
-Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 |
-Generated Location: (1456:45,7 [100] )
+Generated Location: (1429:45,7 [98] )
 |
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 30c2e33e4a..4978aae651 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __o = new System.Action<System.EventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         e => { Increment(); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 1af432007d..b7c197ca34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (951:25,24 [21] )
+Generated Location: (924:25,24 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1469:45,7 [87] )
+Generated Location: (1442:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index f6933a3843..ed63574005 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                           OnClick
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
             }
             ));
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(DynamicElement);
 
 #line default
@@ -42,9 +49,9 @@ __o = typeof(DynamicElement);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index d7a54982db..2ff059cf3f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,13 +15,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (44:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+                HtmlContent - (81:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (81:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<MouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 72848bac9f..5cb8bc4a78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,14 +1,19 @@
-Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1007:25,26 [7] )
+Generated Location: (1173:32,26 [7] )
 |OnClick|
 
-Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1514:45,7 [62] )
+Generated Location: (1680:52,7 [60] )
 |
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index bcdaaceb08..8ea8d9783a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -20,15 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       () => Increment()
-
-#line default
-#line hidden
-#nullable disable
-            );
+            __o = "";
             __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
             }
             ));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index 651d67138d..be32db415c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -15,11 +15,9 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => Increment()
-                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute -  - @onclick - AttributeStructure.DoubleQuotes
+                        HtmlContent - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - () => Increment()
                 HtmlContent - (43:0,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (43:0,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
             CSharpCode - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 4a28e67157..53f3c595e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -1,8 +1,3 @@
-Source Location: (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
-|() => Increment()|
-Generated Location: (1004:25,23 [17] )
-|() => Increment()|
-
 Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
@@ -10,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1518:45,7 [87] )
+Generated Location: (1226:37,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index cc9599e104..4917950d58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -22,7 +29,7 @@ namespace Test
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
             
     private string text = "hi";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
index 02b5d2763b..1a102a5457 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'Value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'Value' is used by the '@bind' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,3): Error RZ10008: The attribute 'Value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'Value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index e6acb85f74..2e45fac267 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,31 +15,33 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
-                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                            HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                         HtmlAttribute -  - Value=" - "
-                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            HtmlAttributeValue - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (113:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (113:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (163:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (163:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 7262a51e39..08e0539814 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,18 @@
-Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (962:25,40 [4] )
+Generated Location: (1126:32,40 [4] )
 |text|
 
-Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1291:36,12 [35] )
+Generated Location: (1455:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index e8d5d697b3..b9ce8a2d6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.ChangeEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                () => {}
 
 #line default
@@ -31,7 +38,7 @@ namespace Test
             );
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
 
 #line default
@@ -42,7 +49,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
             
     private string text = "hi";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
index ed7f0b9a9c..7ce167ce3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,80): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the '@bind-value' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,80): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the '@bind-value' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index c8b2872737..1ee533154c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,33 +15,35 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
-                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                        HtmlAttribute - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                            HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute - (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
-                                IntermediateToken - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.ChangeEventArgs>(this, 
+                                IntermediateToken - (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        HtmlAttribute - (85:2,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                                IntermediateToken - (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (86:2,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (85:2,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (112:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (162:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (148:2,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (148:2,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (156:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (156:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (206:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (206:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 7e3beb221b..90f5409f7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,18 +1,23 @@
-Source Location: (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1061:25,79 [8] )
+Generated Location: (1223:32,79 [8] )
 |() => {}|
 
-Source Location: (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:2,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1320:34,35 [4] )
+Generated Location: (1482:41,35 [4] )
 |text|
 
-Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1649:45,12 [35] )
+Generated Location: (1811:52,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index cc9599e104..4917950d58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -22,7 +29,7 @@ namespace Test
         {
             __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
             
     private string text = "hi";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
index 87b660b463..360fcb1f95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the '@bind' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 723920a879..09596c8cea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,31 +15,33 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
-                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                            HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                         HtmlAttribute -  - value=" - "
-                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            HtmlAttributeValue - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (69:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (119:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (113:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (113:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (163:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (163:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 7262a51e39..08e0539814 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,13 +1,18 @@
-Source Location: (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (962:25,40 [4] )
+Generated Location: (1126:32,40 [4] )
 |text|
 
-Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1291:36,12 [35] )
+Generated Location: (1455:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 5959396c75..b562fbe334 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 () => {}
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
index adbe7b6d1b..bbf80721b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,3): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index 657771dad7..4bd48b0978 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,19 +15,21 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
-                        HtmlContent - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (93:2,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (93:2,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
                         HtmlAttribute -  - onclick=" - "
-                            HtmlAttributeValue - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test()
-                        HtmlAttribute - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                            HtmlAttributeValue - (65:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (65:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test()
+                        HtmlAttribute - (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                                IntermediateToken - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                                IntermediateToken - (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    HtmlContent - (154:2,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (154:2,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index 6c41f0d357..eb4ba33b69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -1,5 +1,10 @@
-Source Location: (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1013:25,32 [8] )
+Generated Location: (1179:32,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index 613b9c90be..c652f866cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,10 +27,10 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                        EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        EventCallback.Factory.Create<MouseEventArgs>(this, Increment)
 
 #line default
 #line hidden
@@ -33,7 +40,7 @@ namespace Test
             }
             ));
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent);
 
 #line default
@@ -42,7 +49,7 @@ __o = typeof(MyComponent);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index b5c8912a82..de66db16f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,11 +15,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [66] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
-                HtmlContent - (91:0,91 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (91:0,91 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (44:1,0 [89] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<MouseEventArgs>(this, Increment)
+                HtmlContent - (133:1,89 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (133:1,89 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index f1bbda428f..b6cb825cb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,16 +1,21 @@
-Source Location: (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml)
-|EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
-Generated Location: (1176:25,24 [63] )
-|EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)|
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml)
+|EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
+Generated Location: (1344:32,24 [61] )
+|EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
+
+Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1737:45,7 [87] )
+Generated Location: (1903:52,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index cb5bbaf9e8..5353f83ed0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 6785ec354b..e3038b601c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1175:25,23 [9] )
+Generated Location: (1179:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1682:45,7 [87] )
+Generated Location: (1686:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 1993bb3081..563d1df5ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
             }
             ));
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent);
 
 #line default
@@ -42,10 +49,10 @@ __o = typeof(MyComponent);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index e53ed45aae..c379757ede 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,11 +15,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(MouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index eeb8da148b..2a590e855a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,19 +1,24 @@
-Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1175:25,23 [9] )
+Generated Location: (1343:32,23 [9] )
 |Increment|
 
-Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1682:45,7 [105] )
+Generated Location: (1850:52,7 [103] )
 |
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index a8937ccdd8..5e157d0d73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
             }
             ));
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent);
 
 #line default
@@ -42,10 +49,10 @@ __o = typeof(MyComponent);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index cdbe950c2e..76cc892f7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,11 +15,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(MouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 293a85f387..7c07f01dbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,20 +1,25 @@
-Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1175:25,23 [9] )
+Generated Location: (1343:32,23 [9] )
 |Increment|
 
-Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
 |
-Generated Location: (1682:45,7 [141] )
+Generated Location: (1850:52,7 [139] )
 |
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index e146803ca1..7ab0627213 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -20,7 +20,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 1cf26fd915..080d884d11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1175:25,23 [9] )
+Generated Location: (1179:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1682:45,7 [123] )
+Generated Location: (1686:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 402b5e2577..735010701d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
 
 #line default
@@ -33,7 +40,7 @@ namespace Test
             }
             ));
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
 __o = typeof(MyComponent);
 
 #line default
@@ -42,10 +49,10 @@ __o = typeof(MyComponent);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index e90ef0ae9c..0b15039c86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,11 +15,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-                HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+                HtmlContent - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(ChangeEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 6be3c367a3..88d9713f37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,19 +1,24 @@
-Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1175:25,23 [9] )
+Generated Location: (1343:32,23 [9] )
 |Increment|
 
-Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1682:45,7 [106] )
+Generated Location: (1850:52,7 [104] )
 |
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 42cde47e64..27e6eac9ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -23,9 +30,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 94d094aba5..fbaff0b86a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,11 +15,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (6:0,6 [19] x:\dir\subdir\Test\TestComponent.cshtml) -  @onCLICK=" - "
-                        HtmlAttributeValue - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - OnClick
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (50:1,6 [19] x:\dir\subdir\Test\TestComponent.cshtml) -  @onCLICK=" - "
+                        HtmlAttributeValue - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - OnClick
+                HtmlContent - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(MouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 42198cd134..01d1037d52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -1,11 +1,16 @@
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (900:26,7 [49] )
+Generated Location: (1064:33,7 [47] )
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 5a369347e3..faf02f910b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -32,9 +39,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index 5e4c6c8261..edc13cae62 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,13 +15,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+                HtmlContent - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(EventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 004a4b3064..4f132ed602 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,16 +1,21 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,17 [7] )
+Generated Location: (1164:32,17 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 |
-Generated Location: (1199:35,7 [44] )
+Generated Location: (1365:42,7 [42] )
 |
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index df2ee06b5f..dc964e9b85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -32,9 +39,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index e7f312ba86..0e1b27d1b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,13 +15,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(MouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 12c73d9850..49ef3dcaf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,16 +1,21 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,17 [7] )
+Generated Location: (1164:32,17 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1199:35,7 [49] )
+Generated Location: (1365:42,7 [47] )
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index cacf184f71..fca5207019 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  x => { }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index e1a6a47c3d..d619245f3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,9 +15,11 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 0b0c2d59a7..2f3e5bc613 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,10 @@
-Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (998:25,17 [8] )
+Generated Location: (1164:32,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index df2ee06b5f..dc964e9b85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -32,9 +39,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index e7f312ba86..0e1b27d1b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,13 +15,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+                HtmlContent - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(MouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 12c73d9850..49ef3dcaf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,16 +1,21 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,17 [7] )
+Generated Location: (1164:32,17 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1199:35,7 [49] )
+Generated Location: (1365:42,7 [47] )
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index cacf184f71..cf7458ed0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -20,15 +20,6 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 x => { }
-
-#line default
-#line hidden
-#nullable disable
-            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index e1a6a47c3d..fec5cfbd8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -15,8 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
-                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (6:0,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  @onclick=" - "
+                        HtmlAttributeValue - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - x
+                        HtmlAttributeValue - (18:0,18 [3] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (19:0,19 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - =>
+                        HtmlAttributeValue - (21:0,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (22:0,22 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - {
+                        HtmlAttributeValue - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (24:0,24 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
deleted file mode 100644
index 0b0c2d59a7..0000000000
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|x => { }|
-Generated Location: (998:25,17 [8] )
-|x => { }|
-
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 09c791040d..3a696287ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -32,7 +39,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index 9fff4a39b7..b60c32ad09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,13 +15,15 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-                HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+                HtmlContent - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (72:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 6277f4b8b0..2af1a8b06e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,14 +1,19 @@
-Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (998:25,17 [7] )
+Generated Location: (1164:32,17 [7] )
 |OnClick|
 
-Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1199:35,7 [31] )
+Generated Location: (1365:42,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 0470de96c4..7a6d81473c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  () => { }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index 234a1523df..f7262ee345 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,9 +15,11 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index e847cd4baf..52a10228c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -1,5 +1,10 @@
-Source Location: (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (998:25,17 [9] )
+Generated Location: (1164:32,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index cf7458ed0c..df0c79a6cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index f32c4c6f73..5191583e87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,7 +15,9 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (6:0,6 [14] x:\dir\subdir\Test\TestComponent.cshtml) -  onclick=" - "
-                        HtmlAttributeValue - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (50:1,6 [14] x:\dir\subdir\Test\TestComponent.cshtml) -  onclick=" - "
+                        HtmlAttributeValue - (60:1,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:1,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7df0b6a556
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 6d0d7b4270..2683f01037 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,9 +27,9 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnComponentHover
 
 #line default
@@ -31,7 +38,7 @@ namespace Test
             );
             __o = 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        ParentBgColor
 
 #line default
@@ -41,11 +48,11 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 041a016b22..50d3feedf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,22 +15,24 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlAttribute - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute -  - style=" - "
-                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
-                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
-                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-                HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                HtmlContent - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (215:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                        HtmlAttributeValue - (86:1,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (86:1,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (97:1,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (99:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (112:1,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (112:1,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+                HtmlContent - (117:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (117:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (257:8,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (257:8,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(MouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index a8eca1cffb..14fb1bf510 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,26 +1,31 @@
-Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (998:25,17 [16] )
+Generated Location: (1164:32,17 [16] )
 |OnComponentHover|
 
-Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (99:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1227:34,55 [13] )
+Generated Location: (1393:41,55 [13] )
 |ParentBgColor|
 
-Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 |
-Generated Location: (1433:44,7 [132] )
+Generated Location: (1599:51,7 [130] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index ef6da3215c..cae7bb3d7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -20,9 +27,9 @@ using System.Threading.Tasks;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async (e) => await Task.Delay(10)
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 4e09b37aa8..5212899dfb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (75:2,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (50:1,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async (e) => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index cbedf87f52..c28606eb3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -20,9 +27,9 @@ using System.Threading.Tasks;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -33,9 +40,9 @@ using System.Threading.Tasks;
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 9506593db1..2f95161f9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(UIMouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(MouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 7e21507a0f..4a18dbb4bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (68:2,7 [91] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1166:36,7 [91] )
+Generated Location: (1332:43,7 [89] )
 |
-    Task OnClick(UIMouseEventArgs e) 
+    Task OnClick(MouseEventArgs e) 
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 78afedb132..6d7dd7383d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -20,9 +27,9 @@ using System.Threading.Tasks;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                    async () => await Task.Delay(10)
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index 6bd28357c8..b624135b5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (75:2,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (50:1,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - async () => await Task.Delay(10)
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 6ae61c727e..44c19bd800 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -11,6 +11,13 @@ namespace Test
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
 using System.Threading.Tasks;
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
 #line default
 #line hidden
 #nullable disable
@@ -20,9 +27,9 @@ using System.Threading.Tasks;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -33,7 +40,7 @@ using System.Threading.Tasks;
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index ffc83adba1..a8fa8d0cef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
+        UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index a41ae9f1a1..4a12aaef2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (68:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick() 
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1166:36,7 [73] )
+Generated Location: (1332:43,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 2541094ca1..ea0bccd577 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             __builder.OpenElement(0, "input");
             __builder.AddAttribute(1, "type", "checkbox");
-            __builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(2, "@bind", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                Enabled
@@ -23,9 +23,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, Enabled));
-            __builder.SetUpdatesAttributeName("checked");
+            );
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 89234d1345..54ca46159a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -8,18 +8,11 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [16] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox
-                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (22:0,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (30:0,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => Enabled = __value, 
-                            IntermediateToken -  - CSharp - Enabled
-                            IntermediateToken -  - CSharp - )
             CSharpCode - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public bool Enabled { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 1222e91fab..6739e0a671 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1289:33,7 [41] )
+Generated Location: (1004:31,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index f1a508dfba..18a5f2ac4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -16,7 +23,7 @@ namespace Test
             __builder.OpenElement(0, "input");
             __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                CurrentDate
 
 #line default
@@ -29,7 +36,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index 1074182376..57708b0f47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -5,21 +5,22 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (58:1,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                            IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (59:1,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                    HtmlAttribute - (58:1,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
                             IntermediateToken -  - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: "MM/dd"
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 45630affba..4365e3b700 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (82:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1254:32,7 [77] )
+Generated Location: (1418:39,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index e5001a53a8..a0830475fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             __builder.OpenElement(0, "input");
             __builder.AddAttribute(1, "type", "text");
-            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(2, "@bind", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -23,7 +23,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , format: 
+            );
+            __builder.AddAttribute(3, "@bind:format", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        Format
@@ -31,9 +32,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: Format));
-            __builder.SetUpdatesAttributeName("value");
+            );
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index 2a4c0c7d9e..a3c058d33d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -8,21 +8,14 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (18:0,18 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: 
+                    HtmlAttribute - (39:0,39 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind:format=" - "
+                        CSharpExpressionAttributeValue - (54:0,54 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
-                            IntermediateToken -  - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: Format
-                            IntermediateToken -  - CSharp - )
             CSharpCode - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n    public string Format { get; set; } = "MM/dd/yyyy";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 7c238de261..7bd777765f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1512:41,7 [135] )
+Generated Location: (1255:40,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index f5ca651db2..199b63b554 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             __builder.OpenElement(0, "input");
             __builder.AddAttribute(1, "type", "text");
-            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(2, "@bind", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            CurrentDate
@@ -23,9 +23,8 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            , format: "MM/dd/yyyy"));
-            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, CurrentDate, format: "MM/dd/yyyy"));
-            __builder.SetUpdatesAttributeName("value");
+            );
+            __builder.AddAttribute(3, "@bind:format", "MM/dd/yyyy");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 10d2a58ffe..49c7895135 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -8,21 +8,14 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (18:0,18 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: 
-                            IntermediateToken -  - CSharp - "MM/dd/yyyy"
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
-                            IntermediateToken -  - CSharp - CurrentDate
-                            IntermediateToken -  - CSharp - , format: "MM/dd/yyyy"
-                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (39:0,39 [26] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind:format=" - "
+                        HtmlAttributeValue - (54:0,54 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (54:0,54 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - MM/dd/yyyy
             CSharpCode - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index c9ee946efc..92e6044f5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1333:33,7 [77] )
+Generated Location: (1070:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 6a8df83973..074bbe215b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
             __builder.OpenElement(0, "input");
             __builder.AddAttribute(1, "type", "text");
-            __builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(2, "@bind", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                            ParentValue
@@ -23,9 +23,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            __builder.SetUpdatesAttributeName("value");
+            );
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index 28c6e60c01..d57debb71c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -8,18 +8,11 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute -  - type=" - "
+                    HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
                         HtmlAttributeValue - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (18:0,18 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (26:0,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
             CSharpCode - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index df9ef70cde..0225956d1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1289:33,7 [50] )
+Generated Location: (1000:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index 834b00f6c7..df95b116e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -16,7 +23,7 @@ namespace Test
             __builder.OpenElement(0, "input");
             __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                      CurrentDate
 
 #line default
@@ -29,7 +36,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index f38b81a9ce..e0f607d294 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -5,21 +5,22 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                MarkupElement - (44:1,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (64:1,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                            IntermediateToken - (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
+                            IntermediateToken - (65:1,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: 
                             IntermediateToken -  - CSharp - "MM/dd"
                             IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                    HtmlAttribute - (64:1,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                         CSharpExpressionAttributeValue -  - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => CurrentDate = __value, 
                             IntermediateToken -  - CSharp - CurrentDate
                             IntermediateToken -  - CSharp - , format: "MM/dd"
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
+            CSharpCode - (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index e621c140a2..dbcde9630c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (72:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1261:32,7 [77] )
+Generated Location: (1425:39,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index f33c8ef27c..cf6fd8e483 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(1, "@bind", 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                ParentValue
@@ -22,9 +22,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            ));
-            __builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
-            __builder.SetUpdatesAttributeName("value");
+            );
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index 06c4759182..ba4dc458d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -8,15 +8,8 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                    HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                        CSharpExpressionAttributeValue - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                             IntermediateToken - (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
-                    HtmlAttribute - (14:0,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
-                            IntermediateToken -  - CSharp - ParentValue
-                            IntermediateToken -  - CSharp - )
             CSharpCode - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public int ParentValue { get; set; } = 42;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 63481733de..1e47ca487c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1221:32,7 [50] )
+Generated Location: (932:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 60e82434d0..262067aae3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __builder.AddAttribute(1, "OnClick", new System.Action<System.EventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
@@ -30,7 +30,7 @@ namespace Test
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index fa48814866..53553b531f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -11,5 +11,5 @@ Document -
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIEventArgs e) {\n        counter++;\n    }\n
+            CSharpCode - (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(EventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 347d2fd0a5..76cc1ff2ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (46:2,7 [100] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 |
-Generated Location: (1017:30,7 [100] )
+Generated Location: (990:30,7 [98] )
 |
     private int counter;
-    private void Increment(UIEventArgs e) {
+    private void Increment(EventArgs e) {
         counter++;
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 949fa9edd1..5a2d41b691 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", new System.Action<Microsoft.AspNetCore.Components.UIEventArgs>(
+            __builder.AddAttribute(1, "OnClick", new System.Action<System.EventArgs>(
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                         e => { Increment(); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 745b870673..1b3db951f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1030:30,7 [87] )
+Generated Location: (1003:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 1cc2197614..4c71667162 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.DynamicElement>(0);
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                           OnClick
 
 #line default
@@ -27,9 +34,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index e432d4d02c..87601b15c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                Component - (44:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
+                    ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<UIMouseEventArgs> OnClick { get; set; }\n
+            CSharpCode - (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private Action<MouseEventArgs> OnClick { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 5cd296bcf7..34ad66eeca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (48:2,7 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1075:30,7 [62] )
+Generated Location: (1241:37,7 [60] )
 |
-    private Action<UIMouseEventArgs> OnClick { get; set; }
+    private Action<MouseEventArgs> OnClick { get; set; }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 8bc122e22e..8632fa0885 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -14,15 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                       () => Increment()
-
-#line default
-#line hidden
-#nullable disable
-            ));
+            __builder.AddAttribute(1, "@onclick", "() => Increment()");
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index b92548c14d..1c8f441484 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -8,10 +8,8 @@ Document -
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => Increment()
-                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute -  - @onclick - AttributeStructure.DoubleQuotes
+                        HtmlContent - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - () => Increment()
             CSharpCode - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 15d2cfcd80..9fac1cac91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1079:30,7 [87] )
+Generated Location: (805:22,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 84e4c4e33a..7691ac3161 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -20,7 +27,7 @@ namespace Test
             __builder.AddAttribute(4, "Value", "17");
             __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
 
 #line default
@@ -35,7 +42,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
             
     private string text = "hi";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
index 02b5d2763b..1a102a5457 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'Value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'Value' is used by the '@bind' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,3): Error RZ10008: The attribute 'Value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'Value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index e576ff6450..1783e5ad1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -5,29 +5,30 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
-                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                            HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                         HtmlAttribute -  - Value=" - "
-                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            HtmlAttributeValue - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 1131d4aec6..ed71312a8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1532:38,12 [35] )
+Generated Location: (1696:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 0a08de4245..f98698a73e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -17,9 +24,9 @@ namespace Test
             __builder.AddMarkupContent(1, "\r\n  ");
             __builder.OpenElement(2, "input");
             __builder.AddAttribute(3, "type", "text");
-            __builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
+            __builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.ChangeEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                () => {}
 
 #line default
@@ -28,7 +35,7 @@ namespace Test
             ));
             __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
 
 #line default
@@ -43,7 +50,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
             
     private string text = "hi";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
index ed7f0b9a9c..7ce167ce3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,80): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the '@bind-value' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,80): Error RZ10008: The attribute 'oninput' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'oninput' is used by the '@bind-value' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 5fabd9fb16..34a92ffb58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -5,31 +5,32 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (44:1,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
-                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
-                        HtmlAttribute - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                            HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                        HtmlAttribute - (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIChangeEventArgs>(this, 
-                                IntermediateToken - (86:1,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.ChangeEventArgs>(this, 
+                                IntermediateToken - (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                        HtmlAttribute - (85:2,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                                IntermediateToken - (42:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (86:2,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (41:1,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
+                        HtmlAttribute - (85:2,34 [5] x:\dir\subdir\Test\TestComponent.cshtml) - oninput=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (104:1,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (148:2,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (148:2,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 0da513786a..a530cf8a2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (126:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1866:46,12 [35] )
+Generated Location: (2028:53,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index b8c9293933..0aba3aeb2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -20,7 +27,7 @@ namespace Test
             __builder.AddAttribute(4, "value", "17");
             __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
 
 #line default
@@ -35,7 +42,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
             
     private string text = "hi";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
index 87b660b463..360fcb1f95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the '@bind' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,3): Error RZ10008: The attribute 'value' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'value' is used by the '@bind' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index aecb5d607d..2e1fc7edd2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -5,29 +5,30 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
-                            HtmlAttributeValue - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (22:1,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
+                            HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text
                         HtmlAttribute -  - value=" - "
-                            HtmlAttributeValue - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (35:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
+                            HtmlAttributeValue - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 17
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
-                                IntermediateToken - (47:1,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
+                                IntermediateToken - (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                        HtmlAttribute - (46:1,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
+                        HtmlAttribute - (90:2,39 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (61:1,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
+                    HtmlContent - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 1131d4aec6..ed71312a8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (83:3,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1532:38,12 [35] )
+Generated Location: (1696:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 736e64d96a..871f214c17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -17,9 +24,9 @@ namespace Test
             __builder.AddMarkupContent(1, "\r\n  ");
             __builder.OpenElement(2, "a");
             __builder.AddAttribute(3, "onclick", "test()");
-            __builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 () => {}
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
index adbe7b6d1b..bbf80721b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.diagnostics.txt
@@ -1 +1 @@
-x:\dir\subdir\Test\TestComponent.cshtml(2,3): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
+x:\dir\subdir\Test\TestComponent.cshtml(3,3): Error RZ10008: The attribute 'onclick' is used two or more times for this element. Attributes must be unique (case-insensitive). The attribute 'onclick' is used by the '@onclick' directive attribute.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index 45ace5fb3a..e970d831de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -5,21 +5,22 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    MarkupElement - (9:1,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
-                        HtmlContent - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (49:1,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
+                MarkupElement - (44:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
+                        HtmlContent - (93:2,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (93:2,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
                         HtmlAttribute -  - onclick=" - "
-                            HtmlAttributeValue - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                                IntermediateToken - (21:1,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test()
-                        HtmlAttribute - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                            HtmlAttributeValue - (65:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (65:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test()
+                        HtmlAttribute - (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
-                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                                IntermediateToken - (39:1,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                                IntermediateToken - (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (110:1,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    HtmlContent - (154:2,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (154:2,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index aea4039807..d447b3ee04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -8,16 +8,23 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                        EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                        EventCallback.Factory.Create<MouseEventArgs>(this, Increment)
 
 #line default
 #line hidden
@@ -27,7 +34,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index e1362a1622..f0d049c4f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [66] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [65] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (24:0,24 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<UIMouseEventArgs>(this, Increment)
-            CSharpCode - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
+                Component - (44:1,0 [89] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<MouseEventArgs>(this, Increment)
+            CSharpCode - (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment() {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 6a700f10c8..822be515cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (102:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1298:30,7 [87] )
+Generated Location: (1464:37,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index a423dfa1b5..42651329f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index eaf562b672..f164a922a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1243:30,7 [87] )
+Generated Location: (1247:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 3540fb6d95..2c62367bf9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
 
 #line default
@@ -27,10 +34,10 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 16b93e72b8..5ad9c376ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIMouseEventArgs e) {\n        counter++;\n    }\n
+                Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(MouseEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 2a62756e27..bdbc4237e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (46:2,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1243:30,7 [105] )
+Generated Location: (1411:37,7 [103] )
 |
     private int counter;
-    private void Increment(UIMouseEventArgs e) {
+    private void Increment(MouseEventArgs e) {
         counter++;
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 8d79605427..2843ecb025 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
 
 #line default
@@ -27,10 +34,10 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index 99c95e6564..b0afa992ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(UIMouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
+                Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private Task Increment(MouseEventArgs e) {\n        counter++;\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 790b9be8a2..ee6caa7849 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
-Source Location: (46:2,7 [141] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
 |
-Generated Location: (1243:30,7 [141] )
+Generated Location: (1411:37,7 [139] )
 |
     private int counter;
-    private Task Increment(UIMouseEventArgs e) {
+    private Task Increment(MouseEventArgs e) {
         counter++;
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 4aeef8e446..fc735d5239 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index e1fb9986e6..4a9fe1a151 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1243:30,7 [123] )
+Generated Location: (1247:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index ef79810505..71d147c025 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.MyComponent>(0);
-            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "OnClick", Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>(Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                        Increment
 
 #line default
@@ -27,10 +34,10 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index e453150540..d8aa7e8884 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
-                        CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
-            CSharpCode - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(UIChangeEventArgs e) {\n        counter++;\n    }\n
+                Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                        CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
+            CSharpCode - (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private int counter;\n    private void Increment(ChangeEventArgs e) {\n        counter++;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index a8f670e7fc..4fbbc124ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (46:2,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 |
-Generated Location: (1243:30,7 [106] )
+Generated Location: (1411:37,7 [104] )
 |
     private int counter;
-    private void Increment(UIChangeEventArgs e) {
+    private void Increment(ChangeEventArgs e) {
         counter++;
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 5467376a30..8a2bc393a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
@@ -17,9 +24,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 33c36944db..e746f62e6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,8 +5,9 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input @onCLICK="OnClick">
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(MouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index b7884360e6..5f82913831 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (708:20,7 [49] )
+Generated Location: (872:27,7 [47] )
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index cdf780c44a..467d90e842 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -27,9 +34,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index aed450fd43..11cc765bcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIEventArgs e) {\n    }\n
+            CSharpCode - (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(EventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 0596bca6c3..14cead9ce8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (37:1,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 |
-Generated Location: (1050:30,7 [44] )
+Generated Location: (1216:37,7 [42] )
 |
-    void OnClick(UIEventArgs e) {
+    void OnClick(EventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 90e9186fb7..7b486b43c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -27,9 +34,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 9211a9e5a1..59ab34f294 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(MouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 704483c5c6..d9c7271f33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1050:30,7 [49] )
+Generated Location: (1216:37,7 [47] )
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index 2c665782af..becce32d67 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  x => { }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index ee30388162..5a3e44bafc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (44:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 90e9186fb7..7b486b43c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -27,9 +34,9 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 9211a9e5a1..59ab34f294 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(UIMouseEventArgs e) {\n    }\n
+            CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick(MouseEventArgs e) {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 704483c5c6..d9c7271f33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
-Source Location: (37:1,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1050:30,7 [49] )
+Generated Location: (1216:37,7 [47] )
 |
-    void OnClick(UIMouseEventArgs e) {
+    void OnClick(MouseEventArgs e) {
     }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 2c665782af..1c5c56c3ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -13,17 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-#nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-                 x => { }
-
-#line default
-#line hidden
-#nullable disable
-            ));
-            __builder.CloseElement();
+            __builder.AddMarkupContent(0, "<input @onclick=\"x => { }\">");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index ee30388162..2a7da659fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -7,9 +7,4 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
-                        CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
-                            IntermediateToken -  - CSharp - )
+                MarkupBlock -  - <input @onclick="x => { }">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index a339aab373..696b79bd9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnClick
 
 #line default
@@ -27,7 +34,7 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index 9cd8015de0..d59c47cb75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -5,13 +5,14 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
+            CSharpCode - (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index bae27b996d..4c8c812648 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (37:1,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     void OnClick() {
     }
 |
-Generated Location: (1050:30,7 [31] )
+Generated Location: (1216:37,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 9d3dc19487..fc44e9f1af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  () => { }
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index 857b8fbca4..cfddff9ca0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -5,11 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                MarkupElement - (44:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { }
                             IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index 93e723cf92..a33be57a79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 4b4f7fc2f1..70a0037442 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input onclick="foo">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 07f1e78773..4cd1eef10e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -8,15 +8,22 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "p");
-            __builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
+            __builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  OnComponentHover
 
 #line default
@@ -25,7 +32,7 @@ namespace Test
             ));
             __builder.AddAttribute(2, "style", "background:" + " " + (
 #nullable restore
-#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                        ParentBgColor
 
 #line default
@@ -36,11 +43,11 @@ namespace Test
         }
         #pragma warning restore 1998
 #nullable restore
-#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
        
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index e7ce186d9a..a6bf10b6f8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -5,20 +5,21 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlAttribute - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
+                MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                    HtmlAttribute - (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
                         CSharpExpressionAttributeValue -  - 
-                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.UIMouseEventArgs>(this, 
-                            IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover
                             IntermediateToken -  - CSharp - )
                     HtmlAttribute -  - style=" - "
-                        HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
-                        CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
-                        HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
-            CSharpCode - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(UIMouseEventArgs e)\n    {\n    }\n
+                        HtmlAttributeValue - (86:1,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (86:1,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background:
+                        CSharpExpressionAttributeValue - (97:1,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (99:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor
+                        HtmlAttributeValue - (112:1,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (112:1,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;
+            CSharpCode - (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentBgColor { get; set; } = "#FFFFFF";\n\n    public void OnComponentHover(MouseEventArgs e)\n    {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 955dc1f6a6..f8582a7315 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
-Source Location: (82:1,7 [132] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 |
-Generated Location: (1344:39,7 [132] )
+Generated Location: (1510:46,7 [130] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 |
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
index 117d9c0c34..bd19fc23cb 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BaseTagHelperDescriptorProviderTest.cs
@@ -31,13 +31,15 @@ namespace Microsoft.CodeAnalysis.Razor
         // don't want to update the tests when that happens.
         protected static TagHelperDescriptor[] ExcludeBuiltInComponents(TagHelperDescriptorProviderContext context)
         {
-            return context.Results
+            var results =
+             context.Results
+                .Where(c => c.AssemblyName != "Microsoft.AspNetCore.Razor.Test.ComponentShim")
+                .Where(c => !c.DisplayName.StartsWith("Microsoft.AspNetCore.Components.Web"))
                 .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.Bind")
-                .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.BindAttributes")
-                .Where(c => c.GetTypeName() != "Microsoft.AspNetCore.Components.EventHandlers")
-                .Where(c => !c.GetTypeName().StartsWith("Microsoft.AspNetCore.Components.Routing"))
                 .OrderBy(c => c.Name)
                 .ToArray();
+
+            return results;
         }
 
         protected static TagHelperDescriptor[] AssertAndExcludeFullyQualifiedNameMatchComponents(
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 89b42a0ae3..f097b079f7 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -24,9 +24,9 @@ namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Configure(RenderHandle renderHandle) { }
+        public void Attach(RenderHandle renderHandle) { }
 
-        public Task SetParametersAsync(ParameterCollection parameters)
+        public Task SetParametersAsync(ParameterView parameters)
         {
             return Task.CompletedTask;
         }
@@ -149,9 +149,9 @@ namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Configure(RenderHandle renderHandle) { }
+        public void Attach(RenderHandle renderHandle) { }
 
-        public Task SetParametersAsync(ParameterCollection parameters)
+        public Task SetParametersAsync(ParameterView parameters)
         {
             return Task.CompletedTask;
         }
@@ -271,9 +271,9 @@ namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Configure(RenderHandle renderHandle) { }
+        public void Attach(RenderHandle renderHandle) { }
 
-        public Task SetParametersAsync(ParameterCollection parameters)
+        public Task SetParametersAsync(ParameterView parameters)
         {
             return Task.CompletedTask;
         }
@@ -523,7 +523,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
-    [BindInputElement(null, null, ""myprop"", ""myevent"")]
+    [BindInputElement(null, null, ""myprop"", ""myevent"", false, null)]
     public class BindAttributes
     {
     }
@@ -579,7 +579,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
-    [BindInputElement(""checkbox"", null, ""myprop"", ""myevent"")]
+    [BindInputElement(""checkbox"", null, ""myprop"", ""myevent"", false, null)]
     public class BindAttributes
     {
     }
@@ -647,7 +647,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace Test
 {
-    [BindInputElement(""checkbox"", ""somevalue"", ""myprop"", ""myevent"")]
+    [BindInputElement(""checkbox"", ""somevalue"", ""myprop"", ""myevent"", false, null)]
     public class BindAttributes
     {
     }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 42461de24c..28d2986df6 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -23,9 +23,9 @@ namespace Test
 {
     public class MyComponent : IComponent
     {
-        public void Configure(RenderHandle renderHandle) { }
+        public void Attach(RenderHandle renderHandle) { }
 
-        public Task SetParametersAsync(ParameterCollection parameters)
+        public Task SetParametersAsync(ParameterView parameters)
         {
             return Task.CompletedTask;
         }
@@ -145,9 +145,9 @@ namespace Test
 {
     public class MyComponent<T> : IComponent
     {
-        public void Configure(RenderHandle renderHandle) { }
+        public void Attach(RenderHandle renderHandle) { }
 
-        public Task SetParametersAsync(ParameterCollection parameters)
+        public Task SetParametersAsync(ParameterView parameters)
         {
             return Task.CompletedTask;
         }
@@ -578,7 +578,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public Action<UIMouseEventArgs> OnClick { get; set; }
+        public Action<EventArgs> OnClick { get; set; }
     }
 }
 
@@ -604,7 +604,7 @@ namespace Test
 
             var attribute = Assert.Single(component.BoundAttributes);
             Assert.Equal("OnClick", attribute.Name);
-            Assert.Equal("System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>", attribute.TypeName);
+            Assert.Equal("System.Action<System.EventArgs>", attribute.TypeName);
 
             Assert.False(attribute.HasIndexer);
             Assert.False(attribute.IsBooleanProperty);
@@ -733,6 +733,7 @@ namespace Test
             // Arrange
 
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
+using System;
 using Microsoft.AspNetCore.Components;
 
 namespace Test
@@ -740,7 +741,7 @@ namespace Test
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+        public EventCallback<EventArgs> OnClick { get; set; }
     }
 }
 
@@ -769,7 +770,7 @@ namespace Test
                 a =>
                 {
                     Assert.Equal("OnClick", a.Name);
-                    Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs>", a.TypeName);
+                    Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.EventArgs>", a.TypeName);
                     Assert.False(a.HasIndexer);
                     Assert.False(a.IsBooleanProperty);
                     Assert.False(a.IsEnum);
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index 673ad67050..f242f4995d 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -18,10 +18,11 @@ namespace Microsoft.CodeAnalysis.Razor
             var compilation = BaseCompilation.AddSyntaxTrees(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
-    [EventHandler(""onclick"", typeof(Action<UIMouseEventArgs>))]
+    [EventHandler(""onclick"", typeof(Action<MouseEventArgs>))]
     public class EventHandlers
     {
     }
@@ -61,7 +62,7 @@ namespace Test
 
             Assert.Equal(
                 "Sets the '@onclick' attribute to the provided string or delegate value. " +
-                "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>'.",
+                "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs>'.",
                 item.Documentation);
 
             // These are all trivially derived from the assembly/namespace/type name
@@ -107,15 +108,15 @@ namespace Test
 
             Assert.Equal(
                 "Sets the '@onclick' attribute to the provided string or delegate value. " +
-                "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>'.",
+                "A delegate value should be of type 'System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs>'.",
                 attribute.Documentation);
 
             Assert.Equal("@onclick", attribute.Name);
             Assert.Equal("onclick", attribute.GetPropertyName());
-            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>> Test.EventHandlers.onclick", attribute.DisplayName);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs>> Test.EventHandlers.onclick", attribute.DisplayName);
 
             // Defined from the property type
-            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs>>", attribute.TypeName);
+            Assert.Equal("Microsoft.AspNetCore.Components.EventCallback<System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs>>", attribute.TypeName);
             Assert.False(attribute.IsStringProperty);
             Assert.False(attribute.IsBooleanProperty);
             Assert.False(attribute.IsEnum);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Forms.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Forms.netstandard2.0.cs
new file mode 100644
index 0000000000..4674ff0fb4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Forms.netstandard2.0.cs
@@ -0,0 +1,75 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components.Forms
+{
+    public partial class DataAnnotationsValidator : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        public DataAnnotationsValidator() { }
+        protected override void OnInitialized() { }
+    }
+    public sealed partial class EditContext
+    {
+        public EditContext(object model) { }
+        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.FieldChangedEventArgs> OnFieldChanged { add { } remove { } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.ValidationRequestedEventArgs> OnValidationRequested { add { } remove { } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.ValidationStateChangedEventArgs> OnValidationStateChanged { add { } remove { } }
+        public Microsoft.AspNetCore.Components.Forms.FieldIdentifier Field(string fieldName) { throw null; }
+        public System.Collections.Generic.IEnumerable<string> GetValidationMessages() { throw null; }
+        public System.Collections.Generic.IEnumerable<string> GetValidationMessages(Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
+        public System.Collections.Generic.IEnumerable<string> GetValidationMessages(System.Linq.Expressions.Expression<System.Func<object>> accessor) { throw null; }
+        public bool IsModified() { throw null; }
+        public bool IsModified(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
+        public bool IsModified(System.Linq.Expressions.Expression<System.Func<object>> accessor) { throw null; }
+        public void MarkAsUnmodified() { }
+        public void MarkAsUnmodified(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+        public void NotifyFieldChanged(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+        public void NotifyValidationStateChanged() { }
+        public bool Validate() { throw null; }
+    }
+    public static partial class EditContextDataAnnotationsExtensions
+    {
+        public static Microsoft.AspNetCore.Components.Forms.EditContext AddDataAnnotationsValidation(this Microsoft.AspNetCore.Components.Forms.EditContext editContext) { throw null; }
+    }
+    public sealed partial class FieldChangedEventArgs : System.EventArgs
+    {
+        public FieldChangedEventArgs(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+        public Microsoft.AspNetCore.Components.Forms.FieldIdentifier FieldIdentifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct FieldIdentifier : System.IEquatable<Microsoft.AspNetCore.Components.Forms.FieldIdentifier>
+    {
+        private readonly object _dummy;
+        public FieldIdentifier(object model, string fieldName) { throw null; }
+        public string FieldName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public static Microsoft.AspNetCore.Components.Forms.FieldIdentifier Create<TField>(System.Linq.Expressions.Expression<System.Func<TField>> accessor) { throw null; }
+        public bool Equals(Microsoft.AspNetCore.Components.Forms.FieldIdentifier otherIdentifier) { throw null; }
+        public override bool Equals(object obj) { throw null; }
+        public override int GetHashCode() { throw null; }
+    }
+    public sealed partial class ValidationMessageStore
+    {
+        public ValidationMessageStore(Microsoft.AspNetCore.Components.Forms.EditContext editContext) { }
+        public System.Collections.Generic.IEnumerable<string> this[Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier] { get { throw null; } }
+        public System.Collections.Generic.IEnumerable<string> this[System.Linq.Expressions.Expression<System.Func<object>> accessor] { get { throw null; } }
+        public void Add(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier, System.Collections.Generic.IEnumerable<string> messages) { }
+        public void Add(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier, string message) { }
+        public void Add(System.Linq.Expressions.Expression<System.Func<object>> accessor, System.Collections.Generic.IEnumerable<string> messages) { }
+        public void Add(System.Linq.Expressions.Expression<System.Func<object>> accessor, string message) { }
+        public void Clear() { }
+        public void Clear(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
+        public void Clear(System.Linq.Expressions.Expression<System.Func<object>> accessor) { }
+    }
+    public sealed partial class ValidationRequestedEventArgs : System.EventArgs
+    {
+        public static readonly new Microsoft.AspNetCore.Components.Forms.ValidationRequestedEventArgs Empty;
+        public ValidationRequestedEventArgs() { }
+    }
+    public sealed partial class ValidationStateChangedEventArgs : System.EventArgs
+    {
+        public static readonly new Microsoft.AspNetCore.Components.Forms.ValidationStateChangedEventArgs Empty;
+        public ValidationStateChangedEventArgs() { }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
new file mode 100644
index 0000000000..191e398a7c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
@@ -0,0 +1,420 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class BindInputElementAttribute : System.Attribute
+    {
+        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute, bool isInvariantCulture, string format) { }
+        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Format { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public bool IsInvariantCulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+}
+namespace Microsoft.AspNetCore.Components.Forms
+{
+    public static partial class EditContextFieldClassExtensions
+    {
+        public static string FieldCssClass(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
+        public static string FieldCssClass<TField>(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<TField>> accessor) { throw null; }
+    }
+    public partial class EditForm : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        public EditForm() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.Forms.EditContext> ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.Forms.EditContext EditContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Forms.EditContext> OnInvalidSubmit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Forms.EditContext> OnSubmit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Forms.EditContext> OnValidSubmit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override void OnParametersSet() { }
+    }
+    public abstract partial class InputBase<TValue> : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        protected InputBase() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected string CssClass { get { throw null; } }
+        protected TValue CurrentValue { get { throw null; } set { } }
+        protected string CurrentValueAsString { get { throw null; } set { } }
+        protected Microsoft.AspNetCore.Components.Forms.EditContext EditContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected Microsoft.AspNetCore.Components.Forms.FieldIdentifier FieldIdentifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public TValue Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> ValueChanged { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Linq.Expressions.Expression<System.Func<TValue>> ValueExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected virtual string FormatValueAsString(TValue value) { throw null; }
+        public override System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
+        protected abstract bool TryParseValueFromString(string value, out TValue result, out string validationErrorMessage);
+    }
+    public partial class InputCheckbox : Microsoft.AspNetCore.Components.Forms.InputBase<bool>
+    {
+        public InputCheckbox() { }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out bool result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputDate<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue>
+    {
+        public InputDate() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ParsingErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override string FormatValueAsString(TValue value) { throw null; }
+        protected override bool TryParseValueFromString(string value, out TValue result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputNumber<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue>
+    {
+        public InputNumber() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ParsingErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override string FormatValueAsString(TValue value) { throw null; }
+        protected override bool TryParseValueFromString(string value, out TValue result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputSelect<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue>
+    {
+        public InputSelect() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out TValue result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputText : Microsoft.AspNetCore.Components.Forms.InputBase<string>
+    {
+        public InputText() { }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out string result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputTextArea : Microsoft.AspNetCore.Components.Forms.InputBase<string>
+    {
+        public InputTextArea() { }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out string result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class ValidationMessage<TValue> : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        public ValidationMessage() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Linq.Expressions.Expression<System.Func<TValue>> For { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected virtual void Dispose(bool disposing) { }
+        protected override void OnParametersSet() { }
+        void System.IDisposable.Dispose() { }
+    }
+    public partial class ValidationSummary : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        public ValidationSummary() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        protected virtual void Dispose(bool disposing) { }
+        protected override void OnParametersSet() { }
+        void System.IDisposable.Dispose() { }
+    }
+}
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    public sealed partial class WebEventDescriptor
+    {
+        public WebEventDescriptor() { }
+        public int BrowserRendererId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo EventFieldInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public ulong EventHandlerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+}
+namespace Microsoft.AspNetCore.Components.Routing
+{
+    public partial class NavLink : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        public NavLink() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ActiveClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected string CssClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.Routing.NavLinkMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        public void Dispose() { }
+        protected override void OnInitialized() { }
+        protected override void OnParametersSet() { }
+    }
+    public enum NavLinkMatch
+    {
+        Prefix = 0,
+        All = 1,
+    }
+}
+namespace Microsoft.AspNetCore.Components.Web
+{
+    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", "value", "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", null, "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", "value", "value", "onchange", true, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", null, "value", "onchange", true, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange", false, null)]
+    public static partial class BindAttributes
+    {
+    }
+    public partial class ClipboardEventArgs : System.EventArgs
+    {
+        public ClipboardEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DataTransfer
+    {
+        public DataTransfer() { }
+        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.DataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DataTransferItem
+    {
+        public DataTransferItem() { }
+        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DragEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public DragEventArgs() { }
+        public Microsoft.AspNetCore.Components.Web.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ErrorEventArgs : System.EventArgs
+    {
+        public ErrorEventArgs() { }
+        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.Web.ErrorEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    public static partial class EventHandlers
+    {
+    }
+    public partial class FocusEventArgs : System.EventArgs
+    {
+        public FocusEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class KeyboardEventArgs : System.EventArgs
+    {
+        public KeyboardEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class MouseEventArgs : System.EventArgs
+    {
+        public MouseEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class PointerEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public PointerEventArgs() { }
+        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ProgressEventArgs : System.EventArgs
+    {
+        public ProgressEventArgs() { }
+        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class TouchEventArgs : System.EventArgs
+    {
+        public TouchEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class TouchPoint
+    {
+        public TouchPoint() { }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public static partial class WebEventCallbackFactoryEventArgsExtensions
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.DragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.DragEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.FocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.FocusEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.PointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.PointerEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.TouchEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.WheelEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.DragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.DragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.FocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.FocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.MouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.PointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.PointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.TouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.WheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+    }
+    public partial class WheelEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public WheelEventArgs() { }
+        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
index a2763ad286..ed14f101cd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
@@ -45,39 +45,3 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public override string ToString() { throw null; }
     }
 }
-
-namespace Microsoft.AspNetCore.Components.Routing
-{
-    public partial class NavLink : Microsoft.AspNetCore.Components.IComponent, System.IDisposable
-    {
-        public NavLink() { }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public string ActiveClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
-        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues = true)]
-        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { get; private set; }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public RenderFragment ChildContent { get; set; }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public Microsoft.AspNetCore.Components.Routing.NavLinkMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
-        public void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
-        public void Dispose() { }
-        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
-    }
-
-    public partial class Router : Microsoft.AspNetCore.Components.IComponent, System.IDisposable
-    {
-        public Router() { }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public System.Reflection.Assembly AppAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public Microsoft.AspNetCore.Components.RenderFragment NotFoundContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public Microsoft.AspNetCore.Components.RenderFragment<AuthenticationState> NotAuthorizedContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
-        [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public Microsoft.AspNetCore.Components.RenderFragment AuthorizingContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } }
-        public void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
-        public void Dispose() { }
-        protected virtual void Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, System.Type handler, System.Collections.Generic.IDictionary<string, object> parameters) { }
-        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index d772cf7e2d..93b30fbf50 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -3,28 +3,6 @@
 
 namespace Microsoft.AspNetCore.Components
 {
-    public partial class AuthenticationState
-    {
-        public AuthenticationState(System.Security.Claims.ClaimsPrincipal user) { }
-        public System.Security.Claims.ClaimsPrincipal User { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public delegate void AuthenticationStateChangedHandler(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.AuthenticationState> task);
-    public abstract partial class AuthenticationStateProvider
-    {
-        protected AuthenticationStateProvider() { }
-        public event Microsoft.AspNetCore.Components.AuthenticationStateChangedHandler AuthenticationStateChanged { add { } remove { } }
-        public abstract System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.AuthenticationState> GetAuthenticationStateAsync();
-        protected void NotifyAuthenticationStateChanged(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.AuthenticationState> task) { }
-    }
-    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange")]
-    public static partial class BindAttributes
-    {
-    }
     public static partial class BindConverter
     {
         public static bool FormatValue(bool value, System.Globalization.CultureInfo culture = null) { throw null; }
@@ -81,55 +59,54 @@ namespace Microsoft.AspNetCore.Components
         public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
-    public sealed partial class BindInputElementAttribute : System.Attribute
-    {
-        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute) { }
-        public BindInputElementAttribute(string type, string suffix, string valueAttribute, string changeAttribute, bool isInvariantCulture, string format) { }
-        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public bool IsInvariantCulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Format { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class CascadingParameterAttribute : System.Attribute
     {
         public CascadingParameterAttribute() { }
         public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
+    public partial class CascadingValue<TValue> : Microsoft.AspNetCore.Components.IComponent
+    {
+        public CascadingValue() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public bool IsFixed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public TValue Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
+    }
+    public partial class ChangeEventArgs : System.EventArgs
+    {
+        public ChangeEventArgs() { }
+        public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
     public abstract partial class ComponentBase : Microsoft.AspNetCore.Components.IComponent, Microsoft.AspNetCore.Components.IHandleAfterRender, Microsoft.AspNetCore.Components.IHandleEvent
     {
         public ComponentBase() { }
         protected virtual void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
         protected System.Threading.Tasks.Task InvokeAsync(System.Action workItem) { throw null; }
         protected System.Threading.Tasks.Task InvokeAsync(System.Func<System.Threading.Tasks.Task> workItem) { throw null; }
-        void Microsoft.AspNetCore.Components.IComponent.Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        void Microsoft.AspNetCore.Components.IComponent.Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
         System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleAfterRender.OnAfterRenderAsync() { throw null; }
         System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleEvent.HandleEventAsync(Microsoft.AspNetCore.Components.EventCallbackWorkItem callback, object arg) { throw null; }
-        protected virtual void OnAfterRender() { }
-        protected virtual System.Threading.Tasks.Task OnAfterRenderAsync() { throw null; }
+        protected virtual void OnAfterRender(bool firstRender) { }
+        protected virtual System.Threading.Tasks.Task OnAfterRenderAsync(bool firstRender) { throw null; }
         protected virtual void OnInitialized() { }
         protected virtual System.Threading.Tasks.Task OnInitializedAsync() { throw null; }
         protected virtual void OnParametersSet() { }
         protected virtual System.Threading.Tasks.Task OnParametersSetAsync() { throw null; }
-        public virtual System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
+        public virtual System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
         protected virtual bool ShouldRender() { throw null; }
         protected void StateHasChanged() { }
     }
-    public partial class DataTransfer
-    {
-        public DataTransfer() { }
-        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UIDataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
     public abstract partial class Dispatcher
     {
         protected Dispatcher() { }
+        public void AssertAccess() { }
         public abstract bool CheckAccess();
         public static Microsoft.AspNetCore.Components.Dispatcher CreateDefault() { throw null; }
         public abstract System.Threading.Tasks.Task InvokeAsync(System.Action workItem);
@@ -142,8 +119,8 @@ namespace Microsoft.AspNetCore.Components
     public readonly partial struct ElementReference
     {
         private readonly object _dummy;
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public string __internalId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public ElementReference(string id) { throw null; }
+        public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventCallback
@@ -165,69 +142,49 @@ namespace Microsoft.AspNetCore.Components
         public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Func<object, System.Threading.Tasks.Task> callback) { throw null; }
         public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> CreateInferred<T>(object receiver, System.Action<T> callback, T value) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> CreateInferred<TValue>(object receiver, System.Action<TValue> callback, TValue value) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> CreateInferred<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback, T value) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> CreateInferred<TValue>(object receiver, System.Func<TValue, System.Threading.Tasks.Task> callback, TValue value) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, Microsoft.AspNetCore.Components.EventCallback callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, Microsoft.AspNetCore.Components.EventCallback callback) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, Microsoft.AspNetCore.Components.EventCallback<T> callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action<T> callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, Microsoft.AspNetCore.Components.EventCallback<TValue> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Action callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Action<TValue> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Func<TValue, System.Threading.Tasks.Task> callback) { throw null; }
     }
     public static partial class EventCallbackFactoryBinderExtensions
     {
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset> setter, System.DateTimeOffset existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset> setter, System.DateTimeOffset existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset?> setter, System.DateTimeOffset? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset?> setter, System.DateTimeOffset? existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset> setter, System.DateTimeOffset existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset> setter, System.DateTimeOffset existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset?> setter, System.DateTimeOffset? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTimeOffset?> setter, System.DateTimeOffset? existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
     }
-    public static partial class EventCallbackFactoryUIEventArgsExtensions
+    public static partial class EventCallbackFactoryEventArgsExtensions
     {
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIChangeEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIClipboardEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIDragEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIErrorEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIFocusEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIPointerEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIProgressEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UITouchEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIWheelEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIChangeEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIDragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIFocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIKeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIMouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIPointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UITouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.ChangeEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<System.EventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.EventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.ChangeEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<System.EventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<System.EventArgs, System.Threading.Tasks.Task> callback) { throw null; }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventCallbackWorkItem
@@ -238,13 +195,13 @@ namespace Microsoft.AspNetCore.Components
         public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct EventCallback<T>
+    public readonly partial struct EventCallback<TValue>
     {
         private readonly object _dummy;
-        public static readonly Microsoft.AspNetCore.Components.EventCallback<T> Empty;
+        public static readonly Microsoft.AspNetCore.Components.EventCallback<TValue> Empty;
         public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; }
         public bool HasDelegate { get { throw null; } }
-        public System.Threading.Tasks.Task InvokeAsync(T arg) { throw null; }
+        public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; }
     }
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
     public sealed partial class EventHandlerAttribute : System.Attribute
@@ -253,108 +210,10 @@ namespace Microsoft.AspNetCore.Components
         public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.UIChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.UIErrorEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.UIChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(Microsoft.AspNetCore.Components.UIEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
-    public static partial class EventHandlers
-    {
-    }
     public partial interface IComponent
     {
-        void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
-        System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters);
-    }
-    public partial interface IComponentContext
-    {
-        bool IsConnected { get; }
+        void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
+        System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters);
     }
     public partial interface IHandleAfterRender
     {
@@ -369,16 +228,6 @@ namespace Microsoft.AspNetCore.Components
     {
         public InjectAttribute() { }
     }
-    public partial interface IUriHelper
-    {
-        event System.EventHandler<Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs> OnLocationChanged;
-        string GetAbsoluteUri();
-        string GetBaseUri();
-        void NavigateTo(string uri);
-        void NavigateTo(string uri, bool forceLoad);
-        System.Uri ToAbsoluteUri(string href);
-        string ToBaseRelativePath(string baseUri, string locationAbsolute);
-    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
     public sealed partial class LayoutAttribute : System.Attribute
     {
@@ -389,7 +238,21 @@ namespace Microsoft.AspNetCore.Components
     {
         protected LayoutComponentBase() { }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
-        protected Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class LayoutView : Microsoft.AspNetCore.Components.IComponent
+    {
+        public LayoutView() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Type Layout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
+    }
+    public sealed partial class LocationChangeException : System.Exception
+    {
+        public LocationChangeException(string message, System.Exception innerException) { }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct MarkupString
@@ -405,14 +268,32 @@ namespace Microsoft.AspNetCore.Components
         public NavigationException(string uri) { }
         public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct Parameter
+    public abstract partial class NavigationManager
     {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public bool Cascading { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected NavigationManager() { }
+        public string BaseUri { get { throw null; } protected set { } }
+        public string Uri { get { throw null; } protected set { } }
+        public event System.EventHandler<Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs> LocationChanged { add { } remove { } }
+        protected virtual void EnsureInitialized() { }
+        protected void Initialize(string baseUri, string uri) { }
+        public void NavigateTo(string uri, bool forceLoad = false) { }
+        protected abstract void NavigateToCore(string uri, bool forceLoad);
+        protected void NotifyLocationChanged(bool isInterceptedLink) { }
+        public System.Uri ToAbsoluteUri(string relativeUri) { throw null; }
+        public string ToBaseRelativePath(string uri) { throw null; }
+    }
+    public abstract partial class OwningComponentBase : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        protected OwningComponentBase() { }
+        protected bool IsDisposed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected System.IServiceProvider ScopedServices { get { throw null; } }
+        protected virtual void Dispose(bool disposing) { }
+        void System.IDisposable.Dispose() { }
+    }
+    public abstract partial class OwningComponentBase<TService> : Microsoft.AspNetCore.Components.OwningComponentBase, System.IDisposable
+    {
+        protected OwningComponentBase() { }
+        protected TService Service { get { throw null; } }
     }
     [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class ParameterAttribute : System.Attribute
@@ -421,32 +302,38 @@ namespace Microsoft.AspNetCore.Components
         public bool CaptureUnmatchedValues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct ParameterCollection
+    public readonly partial struct ParameterValue
     {
         private readonly object _dummy;
         private readonly int _dummyPrimitive;
-        public static Microsoft.AspNetCore.Components.ParameterCollection Empty { get { throw null; } }
-        public static Microsoft.AspNetCore.Components.ParameterCollection FromDictionary(System.Collections.Generic.IDictionary<string, object> parameters) { throw null; }
-        public Microsoft.AspNetCore.Components.ParameterEnumerator GetEnumerator() { throw null; }
-        public T GetValueOrDefault<T>(string parameterName) { throw null; }
-        public T GetValueOrDefault<T>(string parameterName, T defaultValue) { throw null; }
-        public System.Collections.Generic.IReadOnlyDictionary<string, object> ToDictionary() { throw null; }
-        public bool TryGetValue<T>(string parameterName, out T result) { throw null; }
-    }
-    public static partial class ParameterCollectionExtensions
-    {
-        public static void SetParameterProperties(this in Microsoft.AspNetCore.Components.ParameterCollection parameterCollection, object target) { }
+        public bool Cascading { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public partial struct ParameterEnumerator
+    public readonly partial struct ParameterView
     {
-        private object _dummy;
-        private int _dummyPrimitive;
-        public Microsoft.AspNetCore.Components.Parameter Current { get { throw null; } }
-        public bool MoveNext() { throw null; }
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public static Microsoft.AspNetCore.Components.ParameterView Empty { get { throw null; } }
+        public static Microsoft.AspNetCore.Components.ParameterView FromDictionary(System.Collections.Generic.IDictionary<string, object> parameters) { throw null; }
+        public Microsoft.AspNetCore.Components.ParameterView.Enumerator GetEnumerator() { throw null; }
+        public TValue GetValueOrDefault<TValue>(string parameterName) { throw null; }
+        public TValue GetValueOrDefault<TValue>(string parameterName, TValue defaultValue) { throw null; }
+        public void SetParameterProperties(object target) { }
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> ToDictionary() { throw null; }
+        public bool TryGetValue<TValue>(string parameterName, out TValue result) { throw null; }
+        [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+        public partial struct Enumerator
+        {
+            private object _dummy;
+            private int _dummyPrimitive;
+            public Microsoft.AspNetCore.Components.ParameterValue Current { get { throw null; } }
+            public bool MoveNext() { throw null; }
+        }
     }
     public delegate void RenderFragment(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder);
-    public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment<T>(T value);
+    public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment<TValue>(TValue value);
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderHandle
     {
@@ -462,137 +349,22 @@ namespace Microsoft.AspNetCore.Components
         public RouteAttribute(string template) { }
         public string Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public partial class UIChangeEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    public sealed partial class RouteData
     {
-        public UIChangeEventArgs() { }
-        public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public RouteData(System.Type pageType, System.Collections.Generic.IReadOnlyDictionary<string, object> routeValues) { }
+        public System.Type PageType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> RouteValues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public partial class UIClipboardEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
+    public partial class RouteView : Microsoft.AspNetCore.Components.IComponent
     {
-        public UIClipboardEventArgs() { }
-    }
-    public partial class UIDataTransferItem
-    {
-        public UIDataTransferItem() { }
-        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIDragEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIDragEventArgs() { }
-        public Microsoft.AspNetCore.Components.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIErrorEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
-    {
-        public UIErrorEventArgs() { }
-        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIEventArgs
-    {
-        public static readonly Microsoft.AspNetCore.Components.UIEventArgs Empty;
-        public UIEventArgs() { }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIFocusEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
-    {
-        public UIFocusEventArgs() { }
-    }
-    public partial class UIKeyboardEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
-    {
-        public UIKeyboardEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIMouseEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
-    {
-        public UIMouseEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIPointerEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIPointerEventArgs() { }
-        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIProgressEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
-    {
-        public UIProgressEventArgs() { }
-        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UITouchEventArgs : Microsoft.AspNetCore.Components.UIEventArgs
-    {
-        public UITouchEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UITouchPoint
-    {
-        public UITouchPoint() { }
-        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIWheelEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIWheelEventArgs() { }
-        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public abstract partial class UriHelperBase : Microsoft.AspNetCore.Components.IUriHelper
-    {
-        protected UriHelperBase() { }
-        public event System.EventHandler<Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs> OnLocationChanged { add { } remove { } }
-        protected virtual void EnsureInitialized() { }
-        public string GetAbsoluteUri() { throw null; }
-        public virtual string GetBaseUri() { throw null; }
-        public virtual void InitializeState(string uriAbsolute, string baseUriAbsolute) { }
-        public void NavigateTo(string uri) { }
-        public void NavigateTo(string uri, bool forceLoad) { }
-        protected abstract void NavigateToCore(string uri, bool forceLoad);
-        protected void SetAbsoluteBaseUri(string baseUri) { }
-        protected void SetAbsoluteUri(string uri) { }
-        public System.Uri ToAbsoluteUri(string href) { throw null; }
-        public string ToBaseRelativePath(string baseUri, string locationAbsolute) { throw null; }
-        protected void TriggerOnLocationChanged(bool isinterceptedLink) { }
+        public RouteView() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Type DefaultLayout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RouteData RouteData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        protected virtual void Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
+        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
     }
 }
 namespace Microsoft.AspNetCore.Components.CompilerServices
@@ -604,79 +376,39 @@ namespace Microsoft.AspNetCore.Components.CompilerServices
         public static T TypeCheck<T>(T value) { throw null; }
     }
 }
-namespace Microsoft.AspNetCore.Components.Forms
+namespace Microsoft.AspNetCore.Components.Rendering
 {
-    public sealed partial class EditContext
+    public sealed partial class RenderTreeBuilder : System.IDisposable
     {
-        public EditContext(object model) { }
-        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.FieldChangedEventArgs> OnFieldChanged { add { } remove { } }
-        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.ValidationRequestedEventArgs> OnValidationRequested { add { } remove { } }
-        public event System.EventHandler<Microsoft.AspNetCore.Components.Forms.ValidationStateChangedEventArgs> OnValidationStateChanged { add { } remove { } }
-        public Microsoft.AspNetCore.Components.Forms.FieldIdentifier Field(string fieldName) { throw null; }
-        public System.Collections.Generic.IEnumerable<string> GetValidationMessages() { throw null; }
-        public System.Collections.Generic.IEnumerable<string> GetValidationMessages(Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
-        public bool IsModified() { throw null; }
-        public bool IsModified(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
-        public void MarkAsUnmodified() { }
-        public void MarkAsUnmodified(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
-        public void NotifyFieldChanged(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
-        public void NotifyValidationStateChanged() { }
-        public bool Validate() { throw null; }
-    }
-    public static partial class EditContextDataAnnotationsExtensions
-    {
-        public static Microsoft.AspNetCore.Components.Forms.EditContext AddDataAnnotationsValidation(this Microsoft.AspNetCore.Components.Forms.EditContext editContext) { throw null; }
-    }
-    public static partial class EditContextExpressionExtensions
-    {
-        public static System.Collections.Generic.IEnumerable<string> GetValidationMessages(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<object>> accessor) { throw null; }
-        public static bool IsModified(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<object>> accessor) { throw null; }
-    }
-    public static partial class EditContextFieldClassExtensions
-    {
-        public static string FieldClass(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
-        public static string FieldClass<TField>(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<TField>> accessor) { throw null; }
-    }
-    public sealed partial class FieldChangedEventArgs
-    {
-        internal FieldChangedEventArgs() { }
-        public Microsoft.AspNetCore.Components.Forms.FieldIdentifier FieldIdentifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct FieldIdentifier
-    {
-        private readonly object _dummy;
-        public FieldIdentifier(object model, string fieldName) { throw null; }
-        public string FieldName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public static Microsoft.AspNetCore.Components.Forms.FieldIdentifier Create<T>(System.Linq.Expressions.Expression<System.Func<T>> accessor) { throw null; }
-        public override bool Equals(object obj) { throw null; }
-        public override int GetHashCode() { throw null; }
-    }
-    public sealed partial class ValidationMessageStore
-    {
-        public ValidationMessageStore(Microsoft.AspNetCore.Components.Forms.EditContext editContext) { }
-        public System.Collections.Generic.IEnumerable<string> this[Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier] { get { throw null; } }
-        public System.Collections.Generic.IEnumerable<string> this[System.Linq.Expressions.Expression<System.Func<object>> accessor] { get { throw null; } }
-        public void Add(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier, string message) { }
-        public void AddRange(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier, System.Collections.Generic.IEnumerable<string> messages) { }
+        public RenderTreeBuilder() { }
+        public void AddAttribute(int sequence, in Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) { }
+        public void AddAttribute(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback value) { }
+        public void AddAttribute(int sequence, string name, bool value) { }
+        public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
+        public void AddAttribute(int sequence, string name, object value) { }
+        public void AddAttribute(int sequence, string name, string value) { }
+        public void AddAttribute<TArgument>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<TArgument> value) { }
+        public void AddComponentReferenceCapture(int sequence, System.Action<object> componentReferenceCaptureAction) { }
+        public void AddContent(int sequence, Microsoft.AspNetCore.Components.MarkupString markupContent) { }
+        public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment) { }
+        public void AddContent(int sequence, object textContent) { }
+        public void AddContent(int sequence, string textContent) { }
+        public void AddContent<TValue>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<TValue> fragment, TValue value) { }
+        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
+        public void AddMarkupContent(int sequence, string markupContent) { }
+        public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
         public void Clear() { }
-        public void Clear(in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { }
-    }
-    public static partial class ValidationMessageStoreExpressionExtensions
-    {
-        public static void Add(this Microsoft.AspNetCore.Components.Forms.ValidationMessageStore store, System.Linq.Expressions.Expression<System.Func<object>> accessor, string message) { }
-        public static void AddRange(this Microsoft.AspNetCore.Components.Forms.ValidationMessageStore store, System.Linq.Expressions.Expression<System.Func<object>> accessor, System.Collections.Generic.IEnumerable<string> messages) { }
-        public static void Clear(this Microsoft.AspNetCore.Components.Forms.ValidationMessageStore store, System.Linq.Expressions.Expression<System.Func<object>> accessor) { }
-    }
-    public sealed partial class ValidationRequestedEventArgs
-    {
-        internal ValidationRequestedEventArgs() { }
-    }
-    public sealed partial class ValidationStateChangedEventArgs
-    {
-        internal ValidationStateChangedEventArgs() { }
+        public void CloseComponent() { }
+        public void CloseElement() { }
+        public void CloseRegion() { }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetFrames() { throw null; }
+        public void OpenComponent(int sequence, System.Type componentType) { }
+        public void OpenComponent<TComponent>(int sequence) where TComponent : Microsoft.AspNetCore.Components.IComponent { }
+        public void OpenElement(int sequence, string elementName) { }
+        public void OpenRegion(int sequence) { }
+        public void SetKey(object value) { }
+        public void SetUpdatesAttributeName(string updatesAttributeName) { }
+        void System.IDisposable.Dispose() { }
     }
 }
 namespace Microsoft.AspNetCore.Components.RenderTree
@@ -701,7 +433,21 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public ArrayRange(T[] array, int count) { throw null; }
         public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<T> Clone() { throw null; }
     }
-    
+    public partial class EventFieldInfo
+    {
+        public EventFieldInfo() { }
+        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RenderBatch
+    {
+        private readonly object _dummy;
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<ulong> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderTreeDiff
     {
@@ -735,71 +481,49 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         PermutationListEntry = 9,
         PermutationListEnd = 10,
     }
-    public enum RenderTreeFrameType
+    public enum RenderTreeFrameType : short
     {
-        None = 0,
-        Element = 1,
-        Text = 2,
-        Attribute = 3,
-        Component = 4,
-        Region = 5,
-        ElementReferenceCapture = 6,
-        ComponentReferenceCapture = 7,
-        Markup = 8,
-    }
-}
-namespace Microsoft.AspNetCore.Components.Rendering
-{
-    public partial class RenderTreeBuilder
-    {
-        public const string ChildContent = "ChildContent";
-        public void AddAttribute(int sequence, in Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) { }
-        public void AddAttribute(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback value) { }
-        public void AddAttribute(int sequence, string name, System.Action value) { }
-        public void AddAttribute(int sequence, string name, bool value) { }
-        public void AddAttribute(int sequence, string name, System.Func<System.Threading.Tasks.Task> value) { }
-        public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
-        public void AddAttribute(int sequence, string name, object value) { }
-        public void AddAttribute(int sequence, string name, string value) { }
-        public void AddAttribute<T>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<T> value) { }
-        public void AddComponentReferenceCapture(int sequence, System.Action<object> componentReferenceCaptureAction) { }
-        public void AddContent(int sequence, Microsoft.AspNetCore.Components.MarkupString markupContent) { }
-        public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment) { }
-        public void AddContent(int sequence, object textContent) { }
-        public void AddContent(int sequence, string textContent) { }
-        public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
-        public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
-        public void AddMarkupContent(int sequence, string markupContent) { }
-        public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }
-        public void Clear() { }
-        public void CloseComponent() { }
-        public void CloseElement() { }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetFrames() { throw null; }
-        public void OpenComponent(int sequence, System.Type componentType) { }
-        public void OpenComponent<TComponent>(int sequence) where TComponent : Microsoft.AspNetCore.Components.IComponent { }
-        public void OpenElement(int sequence, string elementName) { }
-        public void SetKey(object value) { }
-        public void SetUpdatesAttributeName(string updatesAttributeName) { }
+        None = (short)0,
+        Element = (short)1,
+        Text = (short)2,
+        Attribute = (short)3,
+        Component = (short)4,
+        Region = (short)5,
+        ElementReferenceCapture = (short)6,
+        ComponentReferenceCapture = (short)7,
+        Markup = (short)8,
     }
 }
 namespace Microsoft.AspNetCore.Components.Routing
 {
+    public partial interface IHostEnvironmentNavigationManager
+    {
+        void Initialize(string baseUri, string uri);
+    }
     public partial interface INavigationInterception
     {
         System.Threading.Tasks.Task EnableNavigationInterceptionAsync();
     }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct LocationChangedEventArgs
+    public partial class LocationChangedEventArgs : System.EventArgs
     {
-        private readonly object _dummy;
-        private readonly int _dummyPrimitive;
-        public LocationChangedEventArgs(string location, bool isNavigationIntercepted) { throw null; }
+        public LocationChangedEventArgs(string location, bool isNavigationIntercepted) { }
         public bool IsNavigationIntercepted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public enum NavLinkMatch
+    public partial class Router : Microsoft.AspNetCore.Components.IComponent, Microsoft.AspNetCore.Components.IHandleAfterRender, System.IDisposable
     {
-        Prefix = 0,
-        All = 1,
+        public Router() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Collections.Generic.IEnumerable<System.Reflection.Assembly> AdditionalAssemblies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Reflection.Assembly AppAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.RouteData> Found { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment NotFound { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
+        public void Dispose() { }
+        System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleAfterRender.OnAfterRenderAsync() { throw null; }
+        public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
     }
 }
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
index e7244066a2..3e757725b6 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
@@ -4,7 +4,7 @@
 
 <p>Current count: @currentCount</p>
 
-<button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
+<button class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
 
 @functions {
     int currentCount = 0;
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor b/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
index 8269b96b25..a05cec10f0 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
@@ -1,11 +1,11 @@
 <div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">ComponentApp</a>
-    <button class="navbar-toggler" onclick="@ToggleNavMenu">
+    <button class="navbar-toggler" @onclick="@ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>
 </div>
 
-<div class="@NavMenuCssClass" onclick="@ToggleNavMenu">
+<div class="@NavMenuCssClass" @onclick="@ToggleNavMenu">
     <ul class="nav flex-column">
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
diff --git a/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
index 287317eba6..d9b1efc333 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
@@ -1,2 +1,3 @@
 @using ComponentApp.Components.Shared
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web

From 5f7c8d9d7432940116ee59c2aa406db0a2dd0eb0 Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Wed, 21 Aug 2019 13:30:21 -0700
Subject: [PATCH 251/337] Apply fix for NuGet warning \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/fb3187b34fff015c774a1c5dc623333a041ad890

---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj  | 2 ++
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec  | 1 +
 src/Razor/Microsoft.NET.Sdk.Razor/src/_._                       | 0
 3 files changed, 3 insertions(+)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/_._

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 436cad2245..24bf87a38e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -36,6 +36,8 @@
     <Compile Include="..\Microsoft.AspNetCore.Razor.Tools\Client.cs">
       <Link>Shared\Client.cs</Link>
     </Compile>
+
+    <Content Include="_._" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <Target Name="LayoutDependencies" BeforeTargets="Build" Condition="'$(IsInnerBuild)' != 'true'">
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index a88be875b6..85713bd963 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -8,6 +8,7 @@
     <file src="Sdk\*" target="Sdk" />
     <file src="build\**" target="build" />
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
+    <file src="_._" target="lib\netstandard2.0\_._" />
 
     <file src="$outputPath$\**" target="\" />
   </files>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/_._ b/src/Razor/Microsoft.NET.Sdk.Razor/src/_._
new file mode 100644
index 0000000000..e69de29bb2

From ce19e27b005fc8784b1226fdd317fa06ace60e1e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 22 Aug 2019 08:37:01 -0700
Subject: [PATCH 252/337]  Retarget to netcoreapp5.0
 (dotnet/aspnetcore-tooling#996)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5908616812d8539f656215cafb736e9796a536d6
---
 .../Microsoft.AspNetCore.Razor.Tools.csproj   |  2 +-
 ...crosoft.AspNetCore.Razor.Tools.Test.csproj |  2 +-
 .../src/Microsoft.NET.Sdk.Razor.csproj        | 12 +++--
 .../src/Microsoft.NET.Sdk.Razor.nuspec        |  1 +
 src/Razor/Microsoft.NET.Sdk.Razor/src/_._     |  0
 ...osoft.NET.Sdk.Razor.CodeGeneration.targets |  2 +-
 ...icrosoft.NET.Sdk.Razor.Compilation.targets |  4 +-
 .../Sdk.Razor.CurrentVersion.targets          |  2 +-
 .../test/BuildVariables.cs                    |  6 +--
 ...ApplicationPartDiscoveryIntegrationTest.cs |  2 +-
 .../IntegrationTests/BuildIntegrationTest.cs  |  6 ++-
 .../InitializeTestProjectAttribute.cs         |  4 +-
 .../MSBuildIntegrationTestBase.cs             |  2 +-
 .../IntegrationTests/PackIntegrationTest.cs   | 48 +++++++++----------
 .../PublishIntegrationTest.cs                 |  4 +-
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  4 +-
 ...tCore.Razor.Test.MvcShim.Version1_X.csproj |  2 +-
 ...tCore.Razor.Test.MvcShim.Version2_X.csproj |  2 +-
 ...osoft.AspNetCore.Razor.Test.MvcShim.csproj |  2 +-
 .../AppWithP2PReference.csproj                |  2 +-
 .../AppWithPackageAndP2PReference.csproj      |  2 +-
 .../ClassLibrary/ClassLibrary.csproj          |  2 +-
 .../ClassLibrary2/ClassLibrary2.csproj        |  2 +-
 .../ComponentApp/ComponentApp.csproj          |  2 +-
 .../test/testassets/Directory.Build.targets   |  2 +-
 .../LargeProject/LargeProject.csproj          |  2 +-
 .../MvcWithComponents.csproj                  |  2 +-
 .../PackageLibraryDirectDependency.csproj     |  2 +-
 .../RestoreTestProjects.csproj                |  2 +-
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  2 +-
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  2 +-
 .../testassets/SimplePages/SimplePages.csproj |  2 +-
 32 files changed, 69 insertions(+), 64 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/_._

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
index cec75baae8..0231311c43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
 
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>rzc</AssemblyName>
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
index 48976ae144..85055698c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
   </PropertyGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 436cad2245..d8d2688d5e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
-    <TargetFrameworks>netcoreapp3.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp5.0;net46</TargetFrameworks>
 
     <TargetName>Microsoft.NET.Sdk.Razor.Tasks</TargetName>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
@@ -19,8 +19,8 @@
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" Condition="'$(TargetFramework)'=='net46'" />
 
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp5.0'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp5.0'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,13 +36,15 @@
     <Compile Include="..\Microsoft.AspNetCore.Razor.Tools\Client.cs">
       <Link>Shared\Client.cs</Link>
     </Compile>
+
+    <Content Include="_._" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <Target Name="LayoutDependencies" BeforeTargets="Build" Condition="'$(IsInnerBuild)' != 'true'">
     <!-- Layout tasks, compiler, and extensions in the sdk-output folder. The entire folder structure gets packaged as-is into the SDK -->
     <MSBuild
       Projects="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj"
-      Properties="PublishDir=$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
+      Properties="PublishDir=$(SdkOutputPath)tools\netcoreapp5.0;TargetFramework=netcoreapp5.0"
       Targets="Publish" />
 
     <ItemGroup>
@@ -55,7 +57,7 @@
 
     <ItemGroup>
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
-      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netcoreapp3.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netcoreapp5.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
 
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\System.Collections.Immutable.dll" />
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\System.Reflection.Metadata.dll" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index a88be875b6..85713bd963 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -8,6 +8,7 @@
     <file src="Sdk\*" target="Sdk" />
     <file src="build\**" target="build" />
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
+    <file src="_._" target="lib\netstandard2.0\_._" />
 
     <file src="$outputPath$\**" target="\" />
   </files>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/_._ b/src/Razor/Microsoft.NET.Sdk.Razor/src/_._
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 52037f43c4..4a138f5806 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -39,7 +39,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_RazorGenerateInputsHash></_RazorGenerateInputsHash>
     <_RazorGenerateInputsHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateInputsHashFile>
 
-    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.0\rzc.dll</_RazorToolAssembly>
+    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp5.0\rzc.dll</_RazorToolAssembly>
   </PropertyGroup>
 
   <!--
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index c74674d432..815a162dd1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -35,7 +35,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Remove comment above ^
 
     Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll
-    
+
     Remove Returns="@(CscCommandLineArgs)"
     Remove <Import Project="Microsoft.Managed.Core.targets"/>
     Remove Returns="@(CscCommandLineArgs)"
@@ -60,7 +60,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Remove additional steps after calling CSC
 
     Add our FileWrites after the call to CSC
-    
+
     Add Condition="'@(RazorCompile)'!=''" as a condition to the RazorCoreCompile target.
   -->
   <Target Name="RazorCoreCompile"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index e001d5f5da..c0bccb8f6b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
     <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
     <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
-    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.0</_RazorSdkTasksTFM>
+    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp5.0</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
   </PropertyGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
index 2fc7b8eae6..d213b173c1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
@@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     internal static partial class BuildVariables
     {
         private static string _msBuildPath = string.Empty;
-        private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
+        private static string _MicrosoftNETCoreApp50PackageVersion = string.Empty;
         private static string _microsoftNetCompilersToolsetPackageVersion = string.Empty;
 
         static partial void InitializeVariables();
@@ -20,12 +20,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        public static string MicrosoftNETCoreApp30PackageVersion
+        public static string MicrosoftNETCoreApp50PackageVersion
         {
             get
             {
                 InitializeVariables();
-                return _microsoftNETCoreApp30PackageVersion;
+                return _MicrosoftNETCoreApp50PackageVersion;
             }
         }
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index 91a7fd89f6..cdc3d1161d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
         [InitializeTestProject("SimpleMvcFSharp", language: "F#", additionalProjects: "ClassLibrary")]
         public async Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttributeToNonCSharpProjects()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 6acfd7c50b..27757de3d2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -472,7 +472,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
         [InitializeTestProject("SimpleMvcFSharp", language: "F#")]
         public async Task Build_SimpleMvcFSharp_NoopsWithoutFailing()
         {
@@ -645,7 +645,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             var result = await DotnetMSBuild(
                 "Build",
-                "/p:Nullable=enable",
+                // Remove /p:LangVersion=Default once we've picked up a compiler that supports .NET 5.0.
+                // Tracked by https://github.com/aspnet/AspNetCore/issues/13304
+                "/p:Nullable=enable /p:LangVersion=Default",
                 suppressBuildServer: true);
             var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
index 5dc1651e47..0134607143 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
@@ -37,8 +37,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
-#if NETCOREAPP3_0
-            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp3.0";
+#if NETCOREAPP
+            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp5.0";
 #else
 #error Target frameworks need to be updated
 #endif
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index e8a001c49d..e665dae1b2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // Let the test app know it is running as part of a test.
                 "/p:RunningAsTest=true",
 
-                $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
+                $"/p:MicrosoftNETCoreApp50PackageVersion={BuildVariables.MicrosoftNETCoreApp50PackageVersion}",
                 $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}",
 
                 // Additional restore sources for projects that require built packages
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index 80e404a083..0cb085c4ae 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -29,12 +29,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.NuspecContains(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                @"<files include=""any/netcoreapp5.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("contentFiles", "any", "netcoreapp3.0", "Views", "Shared", "_Layout.cshtml"));
+                Path.Combine("contentFiles", "any", "netcoreapp5.0", "Views", "Shared", "_Layout.cshtml"));
         }
 
         [Fact]
@@ -56,25 +56,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecDoesNotContain(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NuspecDoesNotContain(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                @"<files include=""any/netcoreapp5.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll"));
         }
 
         [Fact]
@@ -94,25 +94,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecDoesNotContain(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NuspecDoesNotContain(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                @"<files include=""any/netcoreapp5.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll"));
         }
 
         [Fact]
@@ -129,21 +129,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.symbols.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb"));
+                Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll"),
+                Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.pdb"));
         }
 
         [Fact]
@@ -163,19 +163,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp5.0", "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                    @"<files include=""any/netcoreapp5.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
             }
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", "netcoreapp5.0", "ClassLibrary.Views.dll"));
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index cebd5de38c..828562ec9b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -329,7 +329,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
         [InitializeTestProject("SimpleMvcFSharp", language: "F#")]
         public async Task Publish_SimpleMvcFSharp_NoopsWithoutFailing()
         {
@@ -434,7 +434,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
 
             Assert.BuildFailed(result);
-            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp3.0/SimpleMvc.dll because it couldn't be found.
+            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp5.0/SimpleMvc.dll because it couldn't be found.
 
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 9f0dab1860..529ea2b87d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -7,7 +7,7 @@
       This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project
       has netcoreapp dependencies that need to be built first.
     -->
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants>
     <!-- Copy references locally so that we can use them in the test. -->
@@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         static partial void InitializeVariables()
         {
             _msBuildPath = @"$(_DesktopMSBuildPath)";
-            _microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
+            _MicrosoftNETCoreApp50PackageVersion = "$(MicrosoftNETCoreApp50PackageVersion)";
             _microsoftNetCompilersToolsetPackageVersion = "$(MicrosoftNetCompilersToolsetPackageVersion)";
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
index b3c5ef2c7b..6716f785b6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp5.0;net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
index b3c5ef2c7b..6716f785b6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp5.0;net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index 868c485056..b8820459f1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp5.0;net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index d5034c583f..377fb0c40b 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
index 076d9b77b0..6a7f03177d 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)' == ''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
     <RestoreSources>
       $(RestoreSources);
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 57ca5669a8..4c17afc86d 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <Copyright>© Microsoft</Copyright>
     <Product>Razor Test</Product>
     <Company>Microsoft</Company>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 8ba54d6c98..6d3e3c14b3 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
index 68b1028aa0..7da4a8dd84 100644
--- a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
+++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
index 39f4f47645..aab0801a4f 100644
--- a/src/Razor/test/testassets/Directory.Build.targets
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -2,7 +2,7 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp5.0' ">$(MicrosoftNETCoreApp50PackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index b2b6b1019a..4af74dfb31 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 31429c409f..f3e82bec69 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
index eacc72651e..0da697ebe9 100644
--- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <Copyright>© Microsoft</Copyright>
     <Product>Razor Test</Product>
     <Company>Microsoft</Company>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index b7ae27c5e0..cfecab6ecf 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 1cde2c2ba5..09c0554589 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 611e331385..88b07b0f72 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 1cde2c2ba5..09c0554589 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From 61726ae9dfed4fa92517e95bc0b551173c5c5b05 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 10 Sep 2019 17:45:59 -0700
Subject: [PATCH 253/337] Restore test projects prior to running SDK tests
 (dotnet/aspnetcore-tooling#1078)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e6bb507271f53dd8493057f0535b52b23171e66d
---
 .../IntegrationTests/BuildIncrementalismTest.cs  |  4 ++--
 .../MSBuildIntegrationTestBase.cs                | 16 +---------------
 .../test/IntegrationTests/PackIntegrationTest.cs |  4 ++--
 src/Razor/test/testassets/Directory.Build.props  |  2 ++
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index d87b5642e0..d9a4cfc8e9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var thumbprintLookup = new Dictionary<string, FileThumbPrint>();
 
             // Act 1
-            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+            var result = await DotnetMSBuild("Build");
 
             var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
             var filesToIgnore = new[]
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // We want to make sure nothing changed between multiple incremental builds.
                 using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
                 {
-                    result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+                    result = await DotnetMSBuild("Build");
                 }
 
                 Assert.BuildPassed(result);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index e8a001c49d..b82e000de2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -69,8 +69,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             bool suppressTimeout = false,
             bool suppressBuildServer = false,
             string buildServerPipeName = null,
-            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
-            bool runRestoreBeforeBuildOrPublish = true)
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
         {
             var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
 
@@ -117,23 +116,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             if (!string.IsNullOrEmpty(target))
             {
-                // Restore before build or publish
-                if (runRestoreBeforeBuildOrPublish &&
-                    (string.Equals("Build", target, StringComparison.OrdinalIgnoreCase)
-                        || string.Equals("Publish", target, StringComparison.OrdinalIgnoreCase)))
-                {
-                    buildArgumentList.Add($"/t:Restore");
-                }
-
                 buildArgumentList.Add($"/t:{target}");
             }
             else
             {
-                // By default, restore then build
-                if (runRestoreBeforeBuildOrPublish)
-                {
-                    buildArgumentList.Add($"/t:Restore");
-                }
                 buildArgumentList.Add($"/t:Build");
             }
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index 80e404a083..f1502e0a37 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -230,10 +230,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
         public async Task Pack_NoBuild_IncludesStaticWebAssets()
         {
-            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+            var result = await DotnetMSBuild("Build");
             Assert.BuildPassed(result, allowWarnings: true);
 
-            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true", runRestoreBeforeBuildOrPublish: false);
+            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true");
             Assert.BuildPassed(pack, allowWarnings: true);
 
             Assert.FileExists(pack, OutputPath, "PackageLibraryDirectDependency.dll");
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 1bdf3f0025..c1270c5a7f 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -33,6 +33,8 @@
     </RestoreSources>
   </PropertyGroup>
 
+  <Import Project="$(SolutionRoot)..\..\eng\Versions.props" />
+
   <PropertyGroup>
     <!-- Working around an issue in XDT transforms -->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>

From 1606d9b0d308d4e348c8a4ad42bf7f7f7d662980 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Thu, 12 Sep 2019 22:02:18 -0700
Subject: [PATCH 254/337] Support netcoreapp3.1 TFM
 (dotnet/aspnetcore-tooling#1122)

* Support netcoreapp3.1 TFM

* Update branding to preview1

* Skip failing 1.1 test
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/133b252f09e9d77608b6e0e767f299f1db1b5c64
---
 .../Microsoft.AspNetCore.Razor.Tools.csproj   |  2 +-
 ...crosoft.AspNetCore.Razor.Tools.Test.csproj |  2 +-
 .../src/Microsoft.NET.Sdk.Razor.csproj        | 12 +++--
 .../src/Microsoft.NET.Sdk.Razor.nuspec        |  3 ++
 ...osoft.NET.Sdk.Razor.CodeGeneration.targets |  6 +--
 .../Sdk.Razor.CurrentVersion.targets          |  2 +-
 .../test/BuildVariables.cs                    |  6 +--
 .../IntegrationTests/BuildIntegrationTest.cs  |  2 +-
 .../BuildIntegrationTest11.cs                 |  2 +-
 .../InitializeTestProjectAttribute.cs         |  4 +-
 .../MSBuildIntegrationTestBase.cs             |  4 +-
 .../IntegrationTests/PackIntegrationTest.cs   | 50 ++++++++++---------
 .../PublishIntegrationTest.cs                 |  2 +-
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  4 +-
 ...tCore.Razor.Test.MvcShim.Version1_X.csproj |  2 +-
 ...tCore.Razor.Test.MvcShim.Version2_X.csproj |  2 +-
 ...osoft.AspNetCore.Razor.Test.MvcShim.csproj |  4 +-
 .../AppWithP2PReference.csproj                |  4 +-
 .../AppWithPackageAndP2PReference.csproj      |  4 +-
 .../ClassLibrary/ClassLibrary.csproj          |  4 +-
 .../ClassLibrary2/ClassLibrary2.csproj        |  6 +--
 .../ComponentApp/ComponentApp.csproj          |  2 +-
 .../test/testassets/Directory.Build.props     |  5 +-
 .../test/testassets/Directory.Build.targets   |  2 +-
 .../LargeProject/LargeProject.csproj          |  6 +--
 .../MvcWithComponents.csproj                  |  2 +-
 .../PackageLibraryDirectDependency.csproj     |  4 +-
 .../RestoreTestProjects.csproj                |  2 +-
 .../testassets/SimpleMvc/SimpleMvc.csproj     |  2 +-
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |  2 +-
 .../testassets/SimplePages/SimplePages.csproj |  2 +-
 31 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
index cec75baae8..d95e126d74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
 
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>rzc</AssemblyName>
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
index 48976ae144..8430edfc23 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
   </PropertyGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 24bf87a38e..ba33b9f833 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
-    <TargetFrameworks>netcoreapp3.0;net46</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net46</TargetFrameworks>
 
     <TargetName>Microsoft.NET.Sdk.Razor.Tasks</TargetName>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
@@ -11,6 +11,8 @@
 
     <!-- Allow assemblies outside of lib in the package -->
     <NoWarn>$(NoWarn);NU5100</NoWarn>
+    <!-- It is intentional to not include build/netstandard2.0/Microsoft.NET.Sdk.Razor.targets -->
+    <NoWarn>$(NoWarn);NU5129</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,8 +21,8 @@
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" Condition="'$(TargetFramework)'=='net46'" />
 
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='$(DefaultNetCoreTargetFramework)'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='$(DefaultNetCoreTargetFramework)'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,7 +46,7 @@
     <!-- Layout tasks, compiler, and extensions in the sdk-output folder. The entire folder structure gets packaged as-is into the SDK -->
     <MSBuild
       Projects="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj"
-      Properties="PublishDir=$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
+      Properties="PublishDir=$(SdkOutputPath)tools\$(DefaultNetCoreTargetFramework);TargetFramework=$(DefaultNetCoreTargetFramework)"
       Targets="Publish" />
 
     <ItemGroup>
@@ -57,7 +59,7 @@
 
     <ItemGroup>
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
-      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\netcoreapp3.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\$(DefaultNetCoreTargetFramework)*\Microsoft.NET.Sdk.Razor.Tasks.*" />
 
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\System.Collections.Immutable.dll" />
       <ProjectOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\net46*\System.Reflection.Metadata.dll" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 85713bd963..fc409c5e90 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -2,6 +2,9 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <dependencies>
+      <group targetFramework=".NETStandard2.0" />
+    </dependencies>
   </metadata>
 
   <files>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 52037f43c4..5cc0be05e9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -39,7 +39,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_RazorGenerateInputsHash></_RazorGenerateInputsHash>
     <_RazorGenerateInputsHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateInputsHashFile>
 
-    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.0\rzc.dll</_RazorToolAssembly>
+    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\$(DefaultNetCoreTargetFramework)\rzc.dll</_RazorToolAssembly>
   </PropertyGroup>
 
   <!--
@@ -174,8 +174,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="_ResolveGeneratedRazorCompileInputs">
     <ItemGroup>
-      <RazorCompile 
-        Include="%(RazorGenerateWithTargetPath.GeneratedOutput)" 
+      <RazorCompile
+        Include="%(RazorGenerateWithTargetPath.GeneratedOutput)"
         Condition="'%(RazorGenerateWithTargetPath.DocumentKind)'=='mvc'" />
     </ItemGroup>
   </Target>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index b0b8683454..6345c52e96 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
     <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
     <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
-    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.0</_RazorSdkTasksTFM>
+    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework)</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
   </PropertyGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
index 2fc7b8eae6..1373497c3e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
@@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     internal static partial class BuildVariables
     {
         private static string _msBuildPath = string.Empty;
-        private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
+        private static string _microsoftNETCoreApp31PackageVersion = string.Empty;
         private static string _microsoftNetCompilersToolsetPackageVersion = string.Empty;
 
         static partial void InitializeVariables();
@@ -20,12 +20,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        public static string MicrosoftNETCoreApp30PackageVersion
+        public static string MicrosoftNETCoreApp31PackageVersion
         {
             get
             {
                 InitializeVariables();
-                return _microsoftNETCoreApp30PackageVersion;
+                return _microsoftNETCoreApp31PackageVersion;
             }
         }
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 6acfd7c50b..6ccfae6bf0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -639,7 +639,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
         }
 
-        [Fact]
+        [Fact(Skip = "Default C# version is 7.3 for netcoreapp3.1 and later https://github.com/aspnet/AspNetCore/issues/13930")]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_ImplicitCSharp8_NullableEnforcement_WarningsDuringBuild_NoBuildServer()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
index a3b255ed18..dc7d470a3c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
         }
 
-        [Fact]
+        [Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")]
         [InitializeTestProject("SimpleMvc11")]
         public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
index 5dc1651e47..ebf9ddb067 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
@@ -37,8 +37,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
-#if NETCOREAPP3_0
-            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp3.0";
+#if NETCOREAPP
+            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp3.1";
 #else
 #error Target frameworks need to be updated
 #endif
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index b82e000de2..34c4b87961 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // Let the test app know it is running as part of a test.
                 "/p:RunningAsTest=true",
 
-                $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
+                $"/p:MicrosoftNETCoreApp31PackageVersion={BuildVariables.MicrosoftNETCoreApp31PackageVersion}",
                 $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}",
 
                 // Additional restore sources for projects that require built packages
@@ -104,7 +104,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             {
                 if (!Directory.Exists(LocalNugetPackagesCacheTempPath))
                 {
-                    // The local cache folder needs to exist so that nuget 
+                    // The local cache folder needs to exist so that nuget
                     Directory.CreateDirectory(LocalNugetPackagesCacheTempPath);
                 }
             }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index f1502e0a37..e148aa2b24 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -11,6 +11,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
     public class PackIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
     {
+        private static readonly string TFM = "netcoreapp3.1";
+
         public PackIntegrationTest(BuildServerTestFixture buildServer)
             : base(buildServer)
         {
@@ -29,12 +31,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.NuspecContains(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                $@"<files include=""any/{TFM}/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("contentFiles", "any", "netcoreapp3.0", "Views", "Shared", "_Layout.cshtml"));
+                Path.Combine("contentFiles", "any", TFM, "Views", "Shared", "_Layout.cshtml"));
         }
 
         [Fact]
@@ -56,25 +58,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecDoesNotContain(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NuspecDoesNotContain(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                $@"<files include=""any/{TFM}/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", TFM, "ClassLibrary.Views.dll"));
         }
 
         [Fact]
@@ -94,25 +96,25 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecDoesNotContain(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NuspecDoesNotContain(
                 result,
                 Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                $@"<files include=""any/{TFM}/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", TFM, "ClassLibrary.Views.dll"));
         }
 
         [Fact]
@@ -129,21 +131,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.symbols.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.pdb")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.pdb")}\" />");
             }
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.symbols.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.pdb"));
+                Path.Combine("lib", TFM, "ClassLibrary.Views.dll"),
+                Path.Combine("lib", TFM, "ClassLibrary.Views.pdb"));
         }
 
         [Fact]
@@ -163,19 +165,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, "netcoreapp3.0", "ClassLibrary.Views.dll")}\" " +
-                    $"target=\"{Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll")}\" />");
+                    $"<file src=\"{Path.Combine(Project.DirectoryPath, "bin", Configuration, TFM, "ClassLibrary.Views.dll")}\" " +
+                    $"target=\"{Path.Combine("lib", TFM, "ClassLibrary.Views.dll")}\" />");
 
                 Assert.NuspecContains(
                     result,
                     Path.Combine("obj", Configuration, "ClassLibrary.1.0.0.nuspec"),
-                    @"<files include=""any/netcoreapp3.0/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
+                    $@"<files include=""any/{TFM}/Views/Shared/_Layout.cshtml"" buildAction=""Content"" />");
             }
 
             Assert.NupkgContains(
                 result,
                 Path.Combine("bin", Configuration, "ClassLibrary.1.0.0.nupkg"),
-                Path.Combine("lib", "netcoreapp3.0", "ClassLibrary.Views.dll"));
+                Path.Combine("lib", TFM, "ClassLibrary.Views.dll"));
         }
 
         [Fact]
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index cebd5de38c..037600112b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -434,7 +434,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
 
             Assert.BuildFailed(result);
-            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp3.0/SimpleMvc.dll because it couldn't be found.
+            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp3.1/SimpleMvc.dll because it couldn't be found.
 
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 9f0dab1860..0ae4b051c3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -7,7 +7,7 @@
       This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project
       has netcoreapp dependencies that need to be built first.
     -->
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants>
     <!-- Copy references locally so that we can use them in the test. -->
@@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         static partial void InitializeVariables()
         {
             _msBuildPath = @"$(_DesktopMSBuildPath)";
-            _microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
+            _microsoftNETCoreApp31PackageVersion = "$(MicrosoftNETCoreApp31PackageVersion)";
             _microsoftNetCompilersToolsetPackageVersion = "$(MicrosoftNetCompilersToolsetPackageVersion)";
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
index b3c5ef2c7b..2708eb193f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
index b3c5ef2c7b..2708eb193f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index 868c485056..4b556f73e1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
-    
+
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj" />
   </ItemGroup>
 
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index d5034c583f..6102fad181 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
index 076d9b77b0..730b0e4988 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)' == ''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
     <RestoreSources>
       $(RestoreSources);
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 57ca5669a8..87ec461496 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <Copyright>© Microsoft</Copyright>
     <Product>Razor Test</Product>
     <Company>Microsoft</Company>
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 8ba54d6c98..0a331a69c0 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
@@ -13,7 +13,7 @@
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
   </ItemGroup>
diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
index 68b1028aa0..488b36eb48 100644
--- a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
+++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index c1270c5a7f..fb8728a71e 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -18,7 +18,7 @@
 
     <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
     <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
-  
+
     <!-- Necessary while testing with unreleased packages. -->
     <RestoreSources>
       $(RestoreSources);
@@ -38,6 +38,9 @@
   <PropertyGroup>
     <!-- Working around an issue in XDT transforms -->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
+
+    <!-- Working around https://github.com/NuGet/Home/issues/8467 -->
+    <NoWarn>$(NoWarn);NU5131</NoWarn>
   </PropertyGroup>
 
   <!-- Don't use the server when building in place. This locks up rzc.dll -->
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
index 39f4f47645..4e299bd016 100644
--- a/src/Razor/test/testassets/Directory.Build.targets
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -2,7 +2,7 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreApp31PackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index b2b6b1019a..109a8d32bc 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -33,8 +33,8 @@
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
-  </ItemGroup>  
+  </ItemGroup>
 
   <!-- Test Placeholder -->
-  
+
 </Project>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 31429c409f..c16ec85c0b 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
index eacc72651e..8bebdb3285 100644
--- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <Copyright>© Microsoft</Copyright>
     <Product>Razor Test</Product>
     <Company>Microsoft</Company>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index b7ae27c5e0..ced12b1fa3 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 1cde2c2ba5..5a395f6802 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 611e331385..ef683132a5 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 1cde2c2ba5..5a395f6802 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From 901f8aa76df0f84bb572b3ba8a5a672178b1e920 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2019 19:38:15 +0000
Subject: [PATCH 255/337] [release/3.0] Update dependencies from
 aspnet/Extensions (dotnet/aspnetcore-tooling#1132)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.2
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.Logging - 3.0.0-rc2.19463.2

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.3
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.3
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.Logging - 3.0.0

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.5

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.5
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.5
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.Logging - 3.0.0

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta4-19462-11 (parent: Microsoft.Extensions.Logging)

* Restore test projects prior to running SDK tests (dotnet/aspnetcore-tooling#1078)

* Fix 3.0 tests
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/eaf897c5428581c80ef5829cafb98104a804c9a8
---
 .../BuildIncrementalismTest.cs                 |  4 ++--
 .../MSBuildIntegrationTestBase.cs              | 16 +---------------
 .../IntegrationTests/PackIntegrationTest.cs    |  4 ++--
 .../test/IntegrationTests/ProjectDirectory.cs  | 18 +++++++++---------
 .../AppWithPackageAndP2PReference.csproj       |  9 +++------
 .../test/testassets/Directory.Build.props      | 15 ++-------------
 6 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
index d87b5642e0..d9a4cfc8e9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var thumbprintLookup = new Dictionary<string, FileThumbPrint>();
 
             // Act 1
-            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+            var result = await DotnetMSBuild("Build");
 
             var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
             var filesToIgnore = new[]
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // We want to make sure nothing changed between multiple incremental builds.
                 using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
                 {
-                    result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+                    result = await DotnetMSBuild("Build");
                 }
 
                 Assert.BuildPassed(result);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index e8a001c49d..b82e000de2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -69,8 +69,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             bool suppressTimeout = false,
             bool suppressBuildServer = false,
             string buildServerPipeName = null,
-            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
-            bool runRestoreBeforeBuildOrPublish = true)
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
         {
             var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
 
@@ -117,23 +116,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             if (!string.IsNullOrEmpty(target))
             {
-                // Restore before build or publish
-                if (runRestoreBeforeBuildOrPublish &&
-                    (string.Equals("Build", target, StringComparison.OrdinalIgnoreCase)
-                        || string.Equals("Publish", target, StringComparison.OrdinalIgnoreCase)))
-                {
-                    buildArgumentList.Add($"/t:Restore");
-                }
-
                 buildArgumentList.Add($"/t:{target}");
             }
             else
             {
-                // By default, restore then build
-                if (runRestoreBeforeBuildOrPublish)
-                {
-                    buildArgumentList.Add($"/t:Restore");
-                }
                 buildArgumentList.Add($"/t:Build");
             }
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index 80e404a083..f1502e0a37 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -230,10 +230,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
         public async Task Pack_NoBuild_IncludesStaticWebAssets()
         {
-            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+            var result = await DotnetMSBuild("Build");
             Assert.BuildPassed(result, allowWarnings: true);
 
-            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true", runRestoreBeforeBuildOrPublish: false);
+            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true");
             Assert.BuildPassed(pack, allowWarnings: true);
 
             Assert.FileExists(pack, OutputPath, "PackageLibraryDirectDependency.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
index 6f19052ebb..1506165b14 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 var newProjectFilePath = Path.Combine(directoryPath, targetProjectName + extension);
                 File.Move(oldProjectFilePath, newProjectFilePath);
 
-                CopyGlobalJson(repositoryRoot, destinationPath);
+                CopyRepositoryAssets(repositoryRoot, destinationPath);
 
                 return new ProjectDirectory(
                     destinationPath,
@@ -140,16 +140,16 @@ $@"<Project>
                     });
             }
 
-            void CopyGlobalJson(string repositoryRoot, string projectRoot)
+            void CopyRepositoryAssets(string repositoryRoot, string projectRoot)
             {
-                var srcGlobalJson = Path.Combine(repositoryRoot, "global.json");
-                if (!File.Exists(srcGlobalJson))
-                {
-                    throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests.");
-                }
+                var files = new[] { "global.json", "NuGet.config" };
 
-                var destinationGlobalJson = Path.Combine(projectRoot, "global.json");
-                File.Copy(srcGlobalJson, destinationGlobalJson);
+                foreach (var file in files)
+                {
+                    var srcFile = Path.Combine(repositoryRoot, file);
+                    var destinationFile = Path.Combine(projectRoot, file);
+                    File.Copy(srcFile, destinationFile);
+                }
             }
         }
 
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
index 076d9b77b0..1bc4281ac7 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)' == ''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
-    <RestoreSources>
-      $(RestoreSources);
-      $(RuntimeAdditionalRestoreSources)
-    </RestoreSources>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'==''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources)</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 1bdf3f0025..5d13eb6e52 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -18,21 +18,10 @@
 
     <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
     <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
-  
-    <!-- Necessary while testing with unreleased packages. -->
-    <RestoreSources>
-      $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
-      https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-
-    <RestoreSources Condition="$(BuildingTestAppsIndependently) == false">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/roslyn/api/v3/index.json;
-    </RestoreSources>
   </PropertyGroup>
 
+  <Import Project="$(SolutionRoot)..\..\eng\Versions.props" />
+
   <PropertyGroup>
     <!-- Working around an issue in XDT transforms -->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>

From a2081d584f4b2a0694a88132214df429513a1d26 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Sun, 15 Sep 2019 08:05:47 -0700
Subject: [PATCH 256/337] Fix razor tool assembly path
 (dotnet/aspnetcore-tooling#1138)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/88cd749f381e5b02e5ed3dd0d9c24f2272fea816
---
 .../Microsoft.NET.Sdk.Razor.CodeGeneration.targets              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 5cc0be05e9..25ea86a65d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -39,7 +39,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_RazorGenerateInputsHash></_RazorGenerateInputsHash>
     <_RazorGenerateInputsHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateInputsHashFile>
 
-    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\$(DefaultNetCoreTargetFramework)\rzc.dll</_RazorToolAssembly>
+    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.1\rzc.dll</_RazorToolAssembly>
   </PropertyGroup>
 
   <!--

From bcd542a1bb22e0cea7a159d293c0706d4f35aa42 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 19 Sep 2019 18:36:02 +0200
Subject: [PATCH 257/337] [Infrastructure] Install procdump and capture dumps
 on build hangs (dotnet/aspnetcore-tooling#1146)

* Captures process dumps when the build hangs.
* Captures process dumps when a child process hangs inside a test.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a9b7e24791078493c4cb7676478b1b76cd0a4894
---
 .../IntegrationTests/MSBuildProcessManager.cs | 98 ++++++++++++++++---
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  | 14 +++
 2 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index de81c1f049..50bdadf639 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -83,22 +83,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             process.BeginOutputReadLine();
             process.BeginErrorReadLine();
 
-            var timeoutTask = Task.Delay(timeout.Value).ContinueWith<ProcessResult>((t) =>
-            {
-                // Don't timeout during debug sessions
-                while (Debugger.IsAttached)
-                {
-                    Thread.Sleep(TimeSpan.FromSeconds(1));
-                }
-
-                if (!process.HasExited)
-                {
-                    // This is a timeout.
-                    process.Kill();
-                }
-
-                throw new TimeoutException($"command '${process.StartInfo.FileName} {process.StartInfo.Arguments}' timed out after {timeout}. Output: {output.ToString()}");
-            });
+            var timeoutTask = GetTimeoutForProcess(process, timeout);
 
             var waitTask = Task.Run(() =>
             {
@@ -142,6 +127,87 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     output.AppendLine(e.Data);
                 }
             }
+
+            async Task<ProcessResult> GetTimeoutForProcess(Process process, TimeSpan? timeout)
+            {
+                await Task.Delay(timeout.Value);
+
+                // Don't timeout during debug sessions
+                while (Debugger.IsAttached)
+                {
+                    Thread.Sleep(TimeSpan.FromSeconds(1));
+                }
+                if (!process.HasExited)
+                {
+                    var procDumpProcess = await CaptureDump(process);
+                    if (procDumpProcess != null && procDumpProcess.HasExited)
+                    {
+                        Console.WriteLine("ProcDump failed to run.");
+                        procDumpProcess.Kill();
+                    }
+
+                    // This is a timeout.
+                    process.Kill();
+                }
+
+                throw new TimeoutException($"command '${process.StartInfo.FileName} {process.StartInfo.Arguments}' timed out after {timeout}. Output: {output.ToString()}");
+            }
+
+            async Task<Process> CaptureDump(Process process)
+            {
+                var metadataAttributes = Assembly.GetExecutingAssembly()
+                    .GetCustomAttributes<AssemblyMetadataAttribute>();
+
+                var procDumpPath = metadataAttributes
+                    .SingleOrDefault(ama => ama.Key == "ProcDumpPath")?.Value;
+
+                if (string.IsNullOrEmpty(procDumpPath))
+                {
+                    Console.WriteLine("ProcDumpPath not defined.");
+                    return null;
+                }
+                var procDumpExePath = Path.Combine(procDumpPath, "procdump.exe");
+                if (!File.Exists(procDumpExePath))
+                {
+                    Console.WriteLine($"Can't find procdump.exe in '{procDumpPath}'.");
+                    return null;
+                }
+
+                var dumpDirectory = metadataAttributes
+                    .SingleOrDefault(ama => ama.Key == "ArtifactsLogDir")?.Value;
+
+                if (string.IsNullOrEmpty(dumpDirectory))
+                {
+                    Console.WriteLine("ArtifactsLogDir not defined.");
+                    return null;
+                }
+
+                if (!Directory.Exists(dumpDirectory))
+                {
+                    Console.WriteLine($"'{dumpDirectory}' does not exist.");
+                    return null;
+                }
+
+                var procDumpPattern = Path.Combine(dumpDirectory, "HangingProcess_PROCESSNAME_PID_YYMMDD_HHMMSS.dmp");
+                var procDumpStartInfo = new ProcessStartInfo(
+                    procDumpExePath,
+                    $"-accepteula -ma {process.Id} {procDumpPattern}")
+                {
+                    CreateNoWindow = true,
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true
+                };
+
+                var procDumpProcess = Process.Start(procDumpStartInfo);
+                var tcs = new TaskCompletionSource<object>();
+
+                procDumpProcess.Exited += (s, a) => tcs.TrySetResult(null);
+                procDumpProcess.EnableRaisingEvents = true;
+
+                await Task.WhenAny(tcs.Task, Task.Delay(timeout ?? TimeSpan.FromSeconds(30)));
+                return procDumpProcess;
+            }
         }
 
         internal class ProcessResult
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 0ae4b051c3..e99c60292c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -43,6 +43,16 @@
       <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\TestPackageRestoreSource</_Parameter2>
     </AssemblyAttribute>
 
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>ArtifactsLogDir</_Parameter1>
+      <_Parameter2>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfiguration)'))</_Parameter2>
+    </AssemblyAttribute>
+
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>ProcDumpToolPath</_Parameter1>
+      <_Parameter2>$(ProcDumpPath)</_Parameter2>
+    </AssemblyAttribute>
+
   </ItemGroup>
 
   <!-- The test projects rely on these binaries being available -->
@@ -112,4 +122,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
   </Target>
 
+  <Target Name="EnsureLogFolder" AfterTargets="Build">
+    <MakeDir Directories="$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfiguration)'))" />
+  </Target>
+
 </Project>

From dfbb36ee1011a3ff58bcb7cab04f6537e56758b6 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 20 Sep 2019 11:09:22 +0200
Subject: [PATCH 258/337] [Infrastructure] Fix invalid variable names

ProcDumpPath -> ProcDumpToolPath
_BuildConfiguration -> _BuildConfig\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f283e4a7c0d47054c9a178ff0b29f00e68f307d3
---
 .../test/IntegrationTests/MSBuildProcessManager.cs            | 2 +-
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index 50bdadf639..97000aa280 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     .GetCustomAttributes<AssemblyMetadataAttribute>();
 
                 var procDumpPath = metadataAttributes
-                    .SingleOrDefault(ama => ama.Key == "ProcDumpPath")?.Value;
+                    .SingleOrDefault(ama => ama.Key == "ProcDumpToolPath")?.Value;
 
                 if (string.IsNullOrEmpty(procDumpPath))
                 {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index e99c60292c..0efaf7b8fd 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -45,7 +45,7 @@
 
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>ArtifactsLogDir</_Parameter1>
-      <_Parameter2>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfiguration)'))</_Parameter2>
+      <_Parameter2>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfig)'))</_Parameter2>
     </AssemblyAttribute>
 
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
@@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
   </Target>
 
   <Target Name="EnsureLogFolder" AfterTargets="Build">
-    <MakeDir Directories="$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfiguration)'))" />
+    <MakeDir Directories="$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfig)'))" />
   </Target>
 
 </Project>

From 66f2aac299a0f52148c9a4dee56c9dcb06bab15d Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 10 Sep 2019 13:37:39 -0700
Subject: [PATCH 259/337] Integrate Razor LanguageServer (without plugin) into
 src/Razor.

- Added tests for both the language server and the common language server projects.
- Updated publish MSBuild bits to publish to `artifacts/LanguageServer/$(Configuration)/TFM`
- Updated the language server to be netcoreapp3.0

aspnet/AspNetCoredotnet/aspnetcore-tooling#13494
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/984c638b37579a4ecdca4abe48fdf59e1f21ac51
---
 .../src/DefaultRazorIntermediateNodeLoweringPhase.cs            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
index f3180eb618..2e8a0368a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1099,8 +1099,6 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 if (node.Source != null)
                 {
-                    Debug.Assert(node.Source.Value.FilePath != null);
-
                     node.Source = new SourceSpan(
                         node.Source.Value.FilePath,
                         node.Source.Value.AbsoluteIndex,

From 5bb36d86f1f8cbcef832f02c671a863288ea47cf Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 12 Sep 2019 14:27:54 -0700
Subject: [PATCH 260/337] Integrate Razor VSCode extension functional tests
 into src/Razor.

- Added the `.vscode-test` to `.gitignore` because that's the VSCode folder that gets created when dynamically downloading VSCode for CI purposes.
- Migrated functional tests to use the non-deprecated VSCode functional testing APIs. This involved creating a runTest file to control downloading VSCode and passing in appropriate parameters as well as creating an index that discovers tests that should be run.
- Changed functional tests to operate on the existing Razor testapps (instead of the old ones).
- Updated the "default" completion tests to be latest Razor/Blazor.
- Added VSCode launch configurations to enable easy debugging via F5.

aspnet/AspNetCoredotnet/aspnetcore-tooling#13494
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/66e4e8a16917a3b986b92d07b054d8f34bf3a979
---
 .../test/testassets/MvcWithComponents/Views/Home/Index.cshtml   | 2 +-
 .../test/testassets/MvcWithComponents/Views/_ViewImports.cshtml | 1 +
 src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml   | 1 +
 src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml | 1 +
 src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml | 1 +
 src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
index 8832e1ad15..b824f4e3e8 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
@@ -2,4 +2,4 @@
     ViewData["Title"] = "Home Page";
 }
 
-Hello world!
\ No newline at end of file
+Hello world!
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
index 7e47b2893e..b570117928 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
@@ -1,3 +1,4 @@
 @using MvcWithComponents
 @using MvcWithComponents.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
index da00289ea5..26ba8ed20e 100644
--- a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
@@ -1,3 +1,4 @@
 @using SimpleMvc
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
index ab07b6cfbc..4d7ce82c24 100644
--- a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
@@ -1,2 +1,3 @@
 @using SimpleMvc11
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
index 477d4ba603..c8d7fa63cc 100644
--- a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
@@ -2,3 +2,4 @@
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace SimpleMvc21
+@inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml
index 477d4ba603..c8d7fa63cc 100644
--- a/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml
@@ -2,3 +2,4 @@
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace SimpleMvc21
+@inject DateTime TheTime

From fd7b5b6604da7667bd84c8b6a51f53f01319d1bf Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 23 Sep 2019 15:34:21 -0700
Subject: [PATCH 261/337] Switch to embedded PackageIcon \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/2aee3e23bb2ddf60193ffc20f0188ca19fdb8586

---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj   | 1 +
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 24bf87a38e..d4e86db5b6 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -75,6 +75,7 @@
 
     <ItemGroup>
       <NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
+      <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 85713bd963..6fe840ccd7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -10,6 +10,7 @@
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
     <file src="_._" target="lib\netstandard2.0\_._" />
 
+    <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
 </package>

From bc9f13b3ef22e277d59519d26a4abaebaa2dc8ef Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Tue, 24 Sep 2019 09:56:51 -0700
Subject: [PATCH 262/337] Merge branches \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/973448284cf444ef643c1b2d0ca978d79ae5ab17

---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 6fe840ccd7..55d4970b68 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>

From 5ac56229e1e075c46240d0e53d0a967753f278e0 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 24 Sep 2019 18:12:16 -0700
Subject: [PATCH 263/337] Fixup build errors \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/83b434dfc3452bfe050bc7193c2e5a7520726ecb

---
 ...ft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj | 5 ++++-
 ...ft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj | 5 ++++-
 .../Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj    | 3 +++
 .../test/Microsoft.AspNetCore.Razor.Language.Test.csproj     | 3 +++
 .../src/Microsoft.NET.Sdk.Razor.csproj                       | 2 +-
 .../src/Microsoft.NET.Sdk.Razor.nuspec                       | 5 +++++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index 60f85d388f..2a07595fca 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
-    
+
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
index 5f09868d52..e03b65a877 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
-    
+
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 310177f1b9..9ad9d37327 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index 4430c2e13b..abdd61a8fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index d4e86db5b6..381d0011fa 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -10,7 +10,7 @@
     <!-- Do not disable ApiCheck. We need to be aware of when we make changes to the Tasks since they need to be backwards compatible. -->
 
     <!-- Allow assemblies outside of lib in the package -->
-    <NoWarn>$(NoWarn);NU5100</NoWarn>
+    <NoWarn>$(NoWarn);NU5100;NU5129</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 55d4970b68..b49cc5c2de 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -3,6 +3,9 @@
   <metadata>
     $CommonMetadataElements$
     <icon>packageIcon.png</icon>
+    <dependencies>
+      <group targetFramework=".NETStandard2.0" />
+    </dependencies>
   </metadata>
 
   <files>
@@ -14,4 +17,6 @@
     <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
+
+
 </package>

From b553f8a08dc6705f508fd25b733640285647887b Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 24 Sep 2019 18:13:26 -0700
Subject: [PATCH 264/337] Remove empty lines \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/f925f138ef31a9c6421ea195de62a6beca406526

---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index b49cc5c2de..6fadcf8138 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -17,6 +17,4 @@
     <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
-
-
 </package>

From f6c5aa73c107bed4688e330fad3edc385f74ed58 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Wed, 25 Sep 2019 18:11:35 +0200
Subject: [PATCH 265/337] Capture process dumps for child dotnet processes
 (dotnet/aspnetcore-tooling#1170)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e283d0be151cff29ba2498d930f8b4bae849dc9d
---
 .../IntegrationTests/MSBuildProcessManager.cs | 74 +++++++++++++++----
 1 file changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index 97000aa280..d5d9ee61de 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -76,6 +76,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var output = new StringBuilder();
             var outputLock = new object();
 
+            var diagnostics = new StringBuilder();
+            diagnostics.AppendLine("Process execution diagnostics:");
+
             process.ErrorDataReceived += Process_ErrorDataReceived;
             process.OutputDataReceived += Process_OutputDataReceived;
 
@@ -83,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             process.BeginOutputReadLine();
             process.BeginErrorReadLine();
 
-            var timeoutTask = GetTimeoutForProcess(process, timeout);
+            var timeoutTask = GetTimeoutForProcess(process, timeout, diagnostics);
 
             var waitTask = Task.Run(() =>
             {
@@ -100,10 +103,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 process.WaitForExit();
 
+
                 string outputString;
                 lock (outputLock)
                 {
-                    outputString = output.ToString();
+                    // This marks the end of the diagnostic info which we collect when something goes wrong.
+                    diagnostics.AppendLine("Process output:");
+
+                    // Expected output
+                    // Process execution diagnostics:
+                    // ...
+                    // Process output:
+                    outputString = diagnostics.ToString();
+                    outputString += output.ToString();
                 }
 
                 var result = new ProcessResult(process.StartInfo.FileName, process.StartInfo.Arguments, process.ExitCode, outputString);
@@ -128,7 +140,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 }
             }
 
-            async Task<ProcessResult> GetTimeoutForProcess(Process process, TimeSpan? timeout)
+            async Task<ProcessResult> GetTimeoutForProcess(Process process, TimeSpan? timeout, StringBuilder diagnostics)
             {
                 await Task.Delay(timeout.Value);
 
@@ -139,12 +151,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 }
                 if (!process.HasExited)
                 {
-                    var procDumpProcess = await CaptureDump(process);
-                    if (procDumpProcess != null && procDumpProcess.HasExited)
-                    {
-                        Console.WriteLine("ProcDump failed to run.");
-                        procDumpProcess.Kill();
-                    }
+                    await CollectDumps(process, timeout, diagnostics);
 
                     // This is a timeout.
                     process.Kill();
@@ -153,7 +160,46 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 throw new TimeoutException($"command '${process.StartInfo.FileName} {process.StartInfo.Arguments}' timed out after {timeout}. Output: {output.ToString()}");
             }
 
-            async Task<Process> CaptureDump(Process process)
+            static async Task CollectDumps(Process process, TimeSpan? timeout, StringBuilder diagnostics)
+            {
+                var procDumpProcess = await CaptureDump(process, timeout, diagnostics);
+                var allDotNetProcesses = Process.GetProcessesByName("dotnet");
+
+                var allDotNetChildProcessCandidates = allDotNetProcesses
+                    .Where(p => p.StartTime >= process.StartTime && p.Id != process.Id);
+
+                if (!allDotNetChildProcessCandidates.Any())
+                {
+                    diagnostics.AppendLine("Couldn't find any candidate child process.");
+                    foreach (var dotnetProcess in allDotNetProcesses)
+                    {
+                        diagnostics.AppendLine($"Found dotnet process with PID {dotnetProcess.Id} and start time {dotnetProcess.StartTime}.");
+                    }
+                }
+
+                foreach (var childProcess in allDotNetChildProcessCandidates)
+                {
+                    diagnostics.AppendLine($"Found child process candidate '{childProcess.Id}'.");
+                }
+
+                var childrenProcessDumpProcesses = await Task.WhenAll(allDotNetChildProcessCandidates.Select(d => CaptureDump(d, timeout, diagnostics)));
+                foreach (var childProcess in childrenProcessDumpProcesses)
+                {
+                    if (childProcess != null && childProcess.HasExited)
+                    {
+                        diagnostics.AppendLine($"ProcDump failed to run for child dotnet process candidate '{process.Id}'.");
+                        childProcess.Kill();
+                    }
+                }
+
+                if (procDumpProcess != null && procDumpProcess.HasExited)
+                {
+                    diagnostics.AppendLine($"ProcDump failed to run for '{process.Id}'.");
+                    procDumpProcess.Kill();
+                }
+            }
+
+            static async Task<Process> CaptureDump(Process process, TimeSpan? timeout, StringBuilder diagnostics)
             {
                 var metadataAttributes = Assembly.GetExecutingAssembly()
                     .GetCustomAttributes<AssemblyMetadataAttribute>();
@@ -163,13 +209,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 if (string.IsNullOrEmpty(procDumpPath))
                 {
-                    Console.WriteLine("ProcDumpPath not defined.");
+                    diagnostics.AppendLine("ProcDumpPath not defined.");
                     return null;
                 }
                 var procDumpExePath = Path.Combine(procDumpPath, "procdump.exe");
                 if (!File.Exists(procDumpExePath))
                 {
-                    Console.WriteLine($"Can't find procdump.exe in '{procDumpPath}'.");
+                    diagnostics.AppendLine($"Can't find procdump.exe in '{procDumpPath}'.");
                     return null;
                 }
 
@@ -178,13 +224,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 if (string.IsNullOrEmpty(dumpDirectory))
                 {
-                    Console.WriteLine("ArtifactsLogDir not defined.");
+                    diagnostics.AppendLine("ArtifactsLogDir not defined.");
                     return null;
                 }
 
                 if (!Directory.Exists(dumpDirectory))
                 {
-                    Console.WriteLine($"'{dumpDirectory}' does not exist.");
+                    diagnostics.AppendLine($"'{dumpDirectory}' does not exist.");
                     return null;
                 }
 

From b30d6fda919f09f2b3dcb1fa4f6edbe4eb83ba22 Mon Sep 17 00:00:00 2001
From: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>
Date: Wed, 25 Sep 2019 10:10:33 -0700
Subject: [PATCH 266/337] Capture process dumps for child dotnet processes
 (dotnet/aspnetcore-tooling#1170) (dotnet/aspnetcore-tooling#1171)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/00e5f3e4d1802d284b75425a6b9ddd1beada9e78
---
 .../IntegrationTests/MSBuildProcessManager.cs | 74 +++++++++++++++----
 1 file changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index 97000aa280..d5d9ee61de 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -76,6 +76,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var output = new StringBuilder();
             var outputLock = new object();
 
+            var diagnostics = new StringBuilder();
+            diagnostics.AppendLine("Process execution diagnostics:");
+
             process.ErrorDataReceived += Process_ErrorDataReceived;
             process.OutputDataReceived += Process_OutputDataReceived;
 
@@ -83,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             process.BeginOutputReadLine();
             process.BeginErrorReadLine();
 
-            var timeoutTask = GetTimeoutForProcess(process, timeout);
+            var timeoutTask = GetTimeoutForProcess(process, timeout, diagnostics);
 
             var waitTask = Task.Run(() =>
             {
@@ -100,10 +103,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 process.WaitForExit();
 
+
                 string outputString;
                 lock (outputLock)
                 {
-                    outputString = output.ToString();
+                    // This marks the end of the diagnostic info which we collect when something goes wrong.
+                    diagnostics.AppendLine("Process output:");
+
+                    // Expected output
+                    // Process execution diagnostics:
+                    // ...
+                    // Process output:
+                    outputString = diagnostics.ToString();
+                    outputString += output.ToString();
                 }
 
                 var result = new ProcessResult(process.StartInfo.FileName, process.StartInfo.Arguments, process.ExitCode, outputString);
@@ -128,7 +140,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 }
             }
 
-            async Task<ProcessResult> GetTimeoutForProcess(Process process, TimeSpan? timeout)
+            async Task<ProcessResult> GetTimeoutForProcess(Process process, TimeSpan? timeout, StringBuilder diagnostics)
             {
                 await Task.Delay(timeout.Value);
 
@@ -139,12 +151,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 }
                 if (!process.HasExited)
                 {
-                    var procDumpProcess = await CaptureDump(process);
-                    if (procDumpProcess != null && procDumpProcess.HasExited)
-                    {
-                        Console.WriteLine("ProcDump failed to run.");
-                        procDumpProcess.Kill();
-                    }
+                    await CollectDumps(process, timeout, diagnostics);
 
                     // This is a timeout.
                     process.Kill();
@@ -153,7 +160,46 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 throw new TimeoutException($"command '${process.StartInfo.FileName} {process.StartInfo.Arguments}' timed out after {timeout}. Output: {output.ToString()}");
             }
 
-            async Task<Process> CaptureDump(Process process)
+            static async Task CollectDumps(Process process, TimeSpan? timeout, StringBuilder diagnostics)
+            {
+                var procDumpProcess = await CaptureDump(process, timeout, diagnostics);
+                var allDotNetProcesses = Process.GetProcessesByName("dotnet");
+
+                var allDotNetChildProcessCandidates = allDotNetProcesses
+                    .Where(p => p.StartTime >= process.StartTime && p.Id != process.Id);
+
+                if (!allDotNetChildProcessCandidates.Any())
+                {
+                    diagnostics.AppendLine("Couldn't find any candidate child process.");
+                    foreach (var dotnetProcess in allDotNetProcesses)
+                    {
+                        diagnostics.AppendLine($"Found dotnet process with PID {dotnetProcess.Id} and start time {dotnetProcess.StartTime}.");
+                    }
+                }
+
+                foreach (var childProcess in allDotNetChildProcessCandidates)
+                {
+                    diagnostics.AppendLine($"Found child process candidate '{childProcess.Id}'.");
+                }
+
+                var childrenProcessDumpProcesses = await Task.WhenAll(allDotNetChildProcessCandidates.Select(d => CaptureDump(d, timeout, diagnostics)));
+                foreach (var childProcess in childrenProcessDumpProcesses)
+                {
+                    if (childProcess != null && childProcess.HasExited)
+                    {
+                        diagnostics.AppendLine($"ProcDump failed to run for child dotnet process candidate '{process.Id}'.");
+                        childProcess.Kill();
+                    }
+                }
+
+                if (procDumpProcess != null && procDumpProcess.HasExited)
+                {
+                    diagnostics.AppendLine($"ProcDump failed to run for '{process.Id}'.");
+                    procDumpProcess.Kill();
+                }
+            }
+
+            static async Task<Process> CaptureDump(Process process, TimeSpan? timeout, StringBuilder diagnostics)
             {
                 var metadataAttributes = Assembly.GetExecutingAssembly()
                     .GetCustomAttributes<AssemblyMetadataAttribute>();
@@ -163,13 +209,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 if (string.IsNullOrEmpty(procDumpPath))
                 {
-                    Console.WriteLine("ProcDumpPath not defined.");
+                    diagnostics.AppendLine("ProcDumpPath not defined.");
                     return null;
                 }
                 var procDumpExePath = Path.Combine(procDumpPath, "procdump.exe");
                 if (!File.Exists(procDumpExePath))
                 {
-                    Console.WriteLine($"Can't find procdump.exe in '{procDumpPath}'.");
+                    diagnostics.AppendLine($"Can't find procdump.exe in '{procDumpPath}'.");
                     return null;
                 }
 
@@ -178,13 +224,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 if (string.IsNullOrEmpty(dumpDirectory))
                 {
-                    Console.WriteLine("ArtifactsLogDir not defined.");
+                    diagnostics.AppendLine("ArtifactsLogDir not defined.");
                     return null;
                 }
 
                 if (!Directory.Exists(dumpDirectory))
                 {
-                    Console.WriteLine($"'{dumpDirectory}' does not exist.");
+                    diagnostics.AppendLine($"'{dumpDirectory}' does not exist.");
                     return null;
                 }
 

From c05fca5137e11edd9fc74e0b3c6336473807425e Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 25 Sep 2019 10:50:13 -0700
Subject: [PATCH 267/337] Remove 1.x tests (dotnet/aspnetcore-tooling#1169)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/bd71bcf87b1c9a9401454c2df9ebed1f8157f91e
---
 .../BuildIntegrationTest11.cs                 |  58 ----------
 .../RestoreTestProjects.csproj                |   2 -
 .../test/testassets/SimpleMvc11/Program.cs    |  13 ---
 .../testassets/SimpleMvc11/SimpleMvc11.csproj |  23 ----
 .../SimpleMvc11/Views/Home/Index.cshtml       | 108 ------------------
 .../SimpleMvc11/Views/Shared/_Layout.cshtml   |  71 ------------
 .../SimpleMvc11/Views/_ViewImports.cshtml     |   3 -
 .../SimpleMvc11/Views/_ViewStart.cshtml       |   3 -
 .../testassets/SimpleMvc11NetFx/Program.cs    |  13 ---
 .../SimpleMvc11NetFx/SimpleMvc11NetFx.csproj  |  19 ---
 .../SimpleMvc11NetFx/Views/Home/Index.cshtml  | 108 ------------------
 .../Views/Shared/_Layout.cshtml               |  71 ------------
 .../Views/_ViewImports.cshtml                 |   2 -
 .../SimpleMvc11NetFx/Views/_ViewStart.cshtml  |   3 -
 14 files changed, 497 deletions(-)
 delete mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Program.cs
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
 delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
deleted file mode 100644
index dc7d470a3c..0000000000
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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.Threading.Tasks;
-using Microsoft.AspNetCore.Testing;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
-{
-    public class BuildIntegrationTest11 : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
-    {
-        public BuildIntegrationTest11(BuildServerTestFixture buildServer)
-            : base(buildServer)
-        {
-        }
-
-        [Fact]
-        [InitializeTestProject("SimpleMvc11")]
-        public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects()
-        {
-            var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems");
-
-            Assert.BuildPassed(result);
-            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor");
-            Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
-        }
-
-        [Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")]
-        [InitializeTestProject("SimpleMvc11")]
-        public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects()
-        {
-            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1";
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "SimpleMvc11.dll");
-            Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb");
-            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll");
-            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.pdb");
-        }
-
-        [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
-
-        [InitializeTestProject("SimpleMvc11NetFx")]
-        public async Task RazorSdk_DoesNotBuildViewsForNetFx11Projects()
-        {
-            MSBuildIntegrationTestBase.TargetFramework = "net461";
-            var result = await DotnetMSBuild("Build");
-
-            Assert.BuildPassed(result);
-            Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.exe");
-            Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.pdb");
-            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.dll");
-            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.pdb");
-        }
-    }
-}
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index ced12b1fa3..90b54c171b 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -4,8 +4,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
-    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
     <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
     <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
     <ProjectReference Include="..\SimpleMvc22NetFx\SimpleMvc22NetFx.csproj" />
diff --git a/src/Razor/test/testassets/SimpleMvc11/Program.cs b/src/Razor/test/testassets/SimpleMvc11/Program.cs
deleted file mode 100644
index 5fbbd9ded7..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-namespace SimpleMvc11
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            // Just make sure we have a reference to MVC 1.1
-            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
-            System.Console.WriteLine(t.FullName);
-        }
-    }
-}
diff --git a/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj b/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
deleted file mode 100644
index b1523f9512..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <!--
-    This project references a shipped version of MVC and should not reference local builds of
-    the CodeGeneration targets, rzc, or any of the test shims.
-  -->
-
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-  </PropertyGroup>
-
-  <!-- Test Placeholder -->
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.8">
-      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
deleted file mode 100644
index 00afab6a0c..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
+++ /dev/null
@@ -1,108 +0,0 @@
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
-    <ol class="carousel-indicators">
-        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-        <li data-target="#myCarousel" data-slide-to="1"></li>
-        <li data-target="#myCarousel" data-slide-to="2"></li>
-        <li data-target="#myCarousel" data-slide-to="3"></li>
-    </ol>
-    <div class="carousel-inner" role="listbox">
-        <div class="item active">
-            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    Learn how to build ASP.NET apps that can run anywhere.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-        <div class="item">
-            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    There are powerful new features in Visual Studio for building modern web apps.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-        <div class="item">
-            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-        <div class="item">
-            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-    </div>
-    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-        <span class="sr-only">Previous</span>
-    </a>
-    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-        <span class="sr-only">Next</span>
-    </a>
-</div>
-
-<div class="row">
-    <div class="col-md-3">
-        <h2>Application uses</h2>
-        <ul>
-            <li>Sample pages using ASP.NET Core MVC</li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
-            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
-        </ul>
-    </div>
-    <div class="col-md-3">
-        <h2>How to</h2>
-        <ul>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
-        </ul>
-    </div>
-    <div class="col-md-3">
-        <h2>Overview</h2>
-        <ul>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
-        </ul>
-    </div>
-    <div class="col-md-3">
-        <h2>Run &amp; Deploy</h2>
-        <ul>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
deleted file mode 100644
index 2172e5e566..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - SimpleMvc11</title>
-
-    <environment names="Development">
-        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-        <link rel="stylesheet" href="~/css/site.css" />
-    </environment>
-    <environment names="Staging,Production">
-        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
-              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
-              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
-        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
-    </environment>
-</head>
-<body>
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc11</a>
-            </div>
-            <div class="navbar-collapse collapse">
-                <ul class="nav navbar-nav">
-                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
-                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-    <div class="container body-content">
-        @RenderBody()
-        <hr />
-        <footer>
-            <p>&copy; 2018 - SimpleMvc11</p>
-        </footer>
-    </div>
-
-    <environment names="Development">
-        <script src="~/lib/jquery/dist/jquery.js"></script>
-        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-        <script src="~/js/site.js" asp-append-version="true"></script>
-    </environment>
-    <environment names="Staging,Production">
-        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
-                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
-                asp-fallback-test="window.jQuery"
-                crossorigin="anonymous"
-                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
-        </script>
-        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
-                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
-                crossorigin="anonymous"
-                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
-        </script>
-        <script src="~/js/site.min.js" asp-append-version="true"></script>
-    </environment>
-
-    @RenderSection("Scripts", required: false)
-</body>
-</html>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
deleted file mode 100644
index 4d7ce82c24..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@using SimpleMvc11
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
deleted file mode 100644
index a5f10045db..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
deleted file mode 100644
index 5fbbd9ded7..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-namespace SimpleMvc11
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            // Just make sure we have a reference to MVC 1.1
-            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
-            System.Console.WriteLine(t.FullName);
-        }
-    }
-}
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
deleted file mode 100644
index b280ec0c9c..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <!--
-    This project references a shipped version of MVC and should not reference local builds of
-    the CodeGeneration targets, rzc, or any of the test shims.
-  -->
-
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-  </PropertyGroup>
-
-  <!-- Test Placeholder -->
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.8" />
-  </ItemGroup>
-</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
deleted file mode 100644
index 00afab6a0c..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
+++ /dev/null
@@ -1,108 +0,0 @@
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
-    <ol class="carousel-indicators">
-        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-        <li data-target="#myCarousel" data-slide-to="1"></li>
-        <li data-target="#myCarousel" data-slide-to="2"></li>
-        <li data-target="#myCarousel" data-slide-to="3"></li>
-    </ol>
-    <div class="carousel-inner" role="listbox">
-        <div class="item active">
-            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    Learn how to build ASP.NET apps that can run anywhere.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-        <div class="item">
-            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    There are powerful new features in Visual Studio for building modern web apps.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-        <div class="item">
-            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-        <div class="item">
-            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
-            <div class="carousel-caption" role="option">
-                <p>
-                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
-                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
-                        Learn More
-                    </a>
-                </p>
-            </div>
-        </div>
-    </div>
-    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-        <span class="sr-only">Previous</span>
-    </a>
-    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-        <span class="sr-only">Next</span>
-    </a>
-</div>
-
-<div class="row">
-    <div class="col-md-3">
-        <h2>Application uses</h2>
-        <ul>
-            <li>Sample pages using ASP.NET Core MVC</li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
-            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
-        </ul>
-    </div>
-    <div class="col-md-3">
-        <h2>How to</h2>
-        <ul>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
-        </ul>
-    </div>
-    <div class="col-md-3">
-        <h2>Overview</h2>
-        <ul>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
-        </ul>
-    </div>
-    <div class="col-md-3">
-        <h2>Run &amp; Deploy</h2>
-        <ul>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
-            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
deleted file mode 100644
index 2172e5e566..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - SimpleMvc11</title>
-
-    <environment names="Development">
-        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-        <link rel="stylesheet" href="~/css/site.css" />
-    </environment>
-    <environment names="Staging,Production">
-        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
-              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
-              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
-        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
-    </environment>
-</head>
-<body>
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc11</a>
-            </div>
-            <div class="navbar-collapse collapse">
-                <ul class="nav navbar-nav">
-                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
-                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-    <div class="container body-content">
-        @RenderBody()
-        <hr />
-        <footer>
-            <p>&copy; 2018 - SimpleMvc11</p>
-        </footer>
-    </div>
-
-    <environment names="Development">
-        <script src="~/lib/jquery/dist/jquery.js"></script>
-        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-        <script src="~/js/site.js" asp-append-version="true"></script>
-    </environment>
-    <environment names="Staging,Production">
-        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
-                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
-                asp-fallback-test="window.jQuery"
-                crossorigin="anonymous"
-                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
-        </script>
-        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
-                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
-                crossorigin="anonymous"
-                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
-        </script>
-        <script src="~/js/site.min.js" asp-append-version="true"></script>
-    </environment>
-
-    @RenderSection("Scripts", required: false)
-</body>
-</html>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
deleted file mode 100644
index 6f6d009d40..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-@using SimpleMvc11NetFx
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml
deleted file mode 100644
index a5f10045db..0000000000
--- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}

From eda950317721b41e9e85b526122f4f36eee3c801 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Wed, 25 Sep 2019 14:17:10 -0700
Subject: [PATCH 268/337] RazorSDK doesn't overwrite ErrorLog \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/aed7bc8ec6ca448178570fd145b50b7e4f7d79c3

---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets        | 10 +++++++---
 .../Microsoft.NET.Sdk.Razor.Component.targets          | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index c74674d432..0a2da72772 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -35,7 +35,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Remove comment above ^
 
     Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll
-    
+
     Remove Returns="@(CscCommandLineArgs)"
     Remove <Import Project="Microsoft.Managed.Core.targets"/>
     Remove Returns="@(CscCommandLineArgs)"
@@ -60,7 +60,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Remove additional steps after calling CSC
 
     Add our FileWrites after the call to CSC
-    
+
     Add Condition="'@(RazorCompile)'!=''" as a condition to the RazorCoreCompile target.
   -->
   <Target Name="RazorCoreCompile"
@@ -117,6 +117,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <RazorCompilationErrorLog Condition="'$(RazorCompilationErrorLog)'==''">$(IntermediateOutputPath)$(RazorTargetName).Compilation.log</RazorCompilationErrorLog>
+    </PropertyGroup>
+
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
@@ -137,7 +141,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          EmitDebugInformation="$(DebugSymbols)"
          EnvironmentVariables="$(CscEnvironment)"
          ErrorEndLocation="$(ErrorEndLocation)"
-         ErrorLog="$(ErrorLog)"
+         ErrorLog="$(RazorCompilationErrorLog)"
          ErrorReport="$(ErrorReport)"
          Features="$(Features)"
          FileAlignment="$(FileAlignment)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 18e39122e2..4627554192 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -180,6 +180,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <RazorComponentErrorLog Condition="'$(RazorComponentErrorLog)'==''"><$(IntermediateOutputPath)$(RazorTargetName).Component.log/RazorComponentErrorLog>
+    </PropertyGroup>
+
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
@@ -198,7 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          EmitDebugInformation="$(DebugSymbols)"
          EnvironmentVariables="$(CscEnvironment)"
          ErrorEndLocation="$(ErrorEndLocation)"
-         ErrorLog="$(ErrorLog)"
+         ErrorLog="$(RazorComponentErrorLog)"
          ErrorReport="$(ErrorReport)"
          Features="$(Features)"
          FileAlignment="$(FileAlignment)"
@@ -265,10 +269,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
   </Target>
 
-  <!-- 
+  <!--
     Once RazorCompileComponentDeclaration is completed, we have all the inputs required for code generation of
     RazorComponents and RazorGenerate items. We'll initialize the inputs for RazorGenerate and invoke it.
-    This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as 
+    This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as
     part of PrepareForRun \ PrepareForPublish for non-components (.cshtml) files.
    -->
   <Target

From 287b183189ceb212a8a00629b08d1834026b708c Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Wed, 25 Sep 2019 15:56:03 -0700
Subject: [PATCH 269/337] Responding to Pranav's feedback \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/353a27828e9cd60ba4109830df49f636523269bc

---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets               | 4 ----
 .../netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index 0a2da72772..540fab290d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -117,10 +117,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <RazorCompilationErrorLog Condition="'$(RazorCompilationErrorLog)'==''">$(IntermediateOutputPath)$(RazorTargetName).Compilation.log</RazorCompilationErrorLog>
-    </PropertyGroup>
-
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 4627554192..249603d2c7 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -180,10 +180,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <RazorComponentErrorLog Condition="'$(RazorComponentErrorLog)'==''"><$(IntermediateOutputPath)$(RazorTargetName).Component.log/RazorComponentErrorLog>
-    </PropertyGroup>
-
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"

From 39d8e322d135681abb496db43d0cd78a99189250 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 27 Sep 2019 14:22:21 -0700
Subject: [PATCH 270/337] Fix misc attribute content sometimes getting ignored
 (dotnet/aspnetcore-tooling#1176)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8108f500211e9ec7bb578f7d0c709f4cb474d98a
---
 .../src/Legacy/HtmlMarkupParser.cs            |  4 ----
 .../CodeGenerationIntegrationTest/Tags.cshtml |  4 ++++
 .../Tags_DesignTime.diagnostics.txt           |  2 +-
 .../Tags_DesignTime.ir.txt                    | 19 +++++++++++++++---
 .../Tags_Runtime.codegen.cs                   | 11 +++++++---
 .../Tags_Runtime.diagnostics.txt              |  2 +-
 .../Tags_Runtime.ir.txt                       | 19 +++++++++++++++---
 .../ParsersCanNestRecursively.stree.txt       |  4 ++--
 .../StopsParsingCodeAfterElseBranch.stree.txt |  4 ++--
 ...ingOfAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...EndOfAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...tweenAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...ionInAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...leTransitionInEmail_DoesNotThrow.stree.txt |  4 ++--
 ...leTransitionInRegex_DoesNotThrow.stree.txt |  4 ++--
 ...WithExpressionBlock_DoesNotThrow.stree.txt | 20 +++++++++----------
 ...oubleTransition_EndOfFile_Throws.stree.txt |  2 +-
 ...ansitionsInAttributeValue_Throws.stree.txt |  4 ++--
 .../_WithDoubleTransition1.stree.txt          |  4 ++--
 .../_WithDoubleTransition2.stree.txt          |  4 ++--
 ...ithDoubleTransition_DoesNotThrow.stree.txt |  4 ++--
 ...arsesDirectiveAttributesAsMarkup.stree.txt |  4 ++--
 ...eAttributesWithParameterAsMarkup.stree.txt |  4 ++--
 ...taAttributesWithExperimentalFlag.stree.txt |  4 ++--
 .../DoubleQuotedLiteralAttribute.stree.txt    |  4 ++--
 ...eWithWhitespaceSurroundingEquals.stree.txt |  4 ++--
 .../MultiPartLiteralAttribute.stree.txt       |  4 ++--
 .../MultiValueExpressionAttribute.stree.txt   |  4 ++--
 .../NewLineBetweenAttributes.stree.txt        |  8 ++++----
 .../NewLinePrecedingAttribute.stree.txt       |  4 ++--
 .../SimpleExpressionAttribute.stree.txt       |  4 ++--
 .../SimpleLiteralAttribute.stree.txt          |  4 ++--
 ...eWithWhitespaceSurroundingEquals.stree.txt |  4 ++--
 .../SymbolBoundAttributes1.stree.txt          |  4 ++--
 .../SymbolBoundAttributes2.stree.txt          |  4 ++--
 .../SymbolBoundAttributes3.stree.txt          |  4 ++--
 .../SymbolBoundAttributes4.stree.txt          |  4 ++--
 .../SymbolBoundAttributes5.stree.txt          |  4 ++--
 .../SymbolBoundAttributes6.stree.txt          |  4 ++--
 ...ttributes_BeforeEqualWhitespace1.stree.txt |  8 ++++----
 ...ttributes_BeforeEqualWhitespace2.stree.txt |  8 ++++----
 ...ttributes_BeforeEqualWhitespace3.stree.txt |  8 ++++----
 ...ttributes_BeforeEqualWhitespace4.stree.txt |  8 ++++----
 ...ttributes_BeforeEqualWhitespace5.stree.txt |  8 ++++----
 ...ttributes_BeforeEqualWhitespace6.stree.txt |  8 ++++----
 ...ymbolBoundAttributes_Whitespace1.stree.txt |  8 ++++----
 ...ymbolBoundAttributes_Whitespace2.stree.txt |  8 ++++----
 ...ymbolBoundAttributes_Whitespace3.stree.txt |  8 ++++----
 ...ymbolBoundAttributes_Whitespace4.stree.txt |  8 ++++----
 ...ymbolBoundAttributes_Whitespace5.stree.txt |  8 ++++----
 ...ymbolBoundAttributes_Whitespace6.stree.txt |  8 ++++----
 .../UnquotedLiteralAttribute.stree.txt        |  2 +-
 ...tesWorkWithConditionalAttributes.stree.txt |  4 ++--
 ...paceAndNewLinePrecedingAttribute.stree.txt |  4 ++--
 ...etInAttributeValueIfDoubleQuoted.stree.txt |  4 ++--
 ...etInAttributeValueIfSingleQuoted.stree.txt |  4 ++--
 ...shInAttributeValueIfDoubleQuoted.stree.txt |  4 ++--
 ...shInAttributeValueIfSingleQuoted.stree.txt |  4 ++--
 ...esForwardSlashInAttributeContent.stree.txt |  2 +-
 .../SupportsTagsWithAttributes.stree.txt      |  6 +++---
 ...lyHandlesOddlySpacedHTMLElements.stree.txt |  4 ++--
 ...hToCodeOnEmailAddressInAttribute.stree.txt |  4 ++--
 ...ingOfAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...EndOfAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...tweenAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...ionInAttributeValue_DoesNotThrow.stree.txt |  4 ++--
 ...leTransitionInEmail_DoesNotThrow.stree.txt |  4 ++--
 ...leTransitionInRegex_DoesNotThrow.stree.txt |  4 ++--
 ...WithExpressionBlock_DoesNotThrow.stree.txt | 20 +++++++++----------
 ...ansitionsInAttributeValue_Throws.stree.txt |  4 ++--
 ...dTagAtEOFErrorsWithIncompleteTag.stree.txt |  2 +-
 .../ScriptTag_Incomplete.stree.txt            |  2 +-
 ...hToCodeOnEmailAddressInAttribute.stree.txt |  4 ++--
 ...acterEncounteredInAttributeValue.stree.txt |  4 ++--
 .../AllowsCompatibleTagStructures3.stree.txt  |  4 ++--
 .../AllowsCompatibleTagStructures5.stree.txt  |  4 ++--
 .../CanHandleSymbolBoundAttributes1.stree.txt |  4 ++--
 .../CanHandleSymbolBoundAttributes2.stree.txt |  4 ++--
 .../CanHandleSymbolBoundAttributes3.stree.txt |  4 ++--
 .../CanHandleSymbolBoundAttributes4.stree.txt |  4 ++--
 .../CanHandleSymbolBoundAttributes5.stree.txt |  4 ++--
 .../CanHandleSymbolBoundAttributes7.stree.txt |  4 ++--
 ...HandleWithoutEndTagTagStructure2.stree.txt |  4 ++--
 ...HandleWithoutEndTagTagStructure4.stree.txt |  4 ++--
 ...orEmptyTagHelperBoundAttributes1.stree.txt |  4 ++--
 ...rEmptyTagHelperBoundAttributes10.stree.txt |  4 ++--
 ...rEmptyTagHelperBoundAttributes11.stree.txt |  8 ++++----
 ...rEmptyTagHelperBoundAttributes12.stree.txt |  6 +++---
 ...rEmptyTagHelperBoundAttributes13.stree.txt |  4 ++--
 ...rEmptyTagHelperBoundAttributes14.stree.txt |  4 ++--
 ...orEmptyTagHelperBoundAttributes2.stree.txt |  4 ++--
 ...orEmptyTagHelperBoundAttributes3.stree.txt |  4 ++--
 ...orEmptyTagHelperBoundAttributes4.stree.txt |  8 ++++----
 ...orEmptyTagHelperBoundAttributes5.stree.txt |  8 ++++----
 ...orEmptyTagHelperBoundAttributes6.stree.txt |  6 +++---
 ...orEmptyTagHelperBoundAttributes7.stree.txt |  6 +++---
 ...orEmptyTagHelperBoundAttributes8.stree.txt |  6 +++---
 ...orEmptyTagHelperBoundAttributes9.stree.txt | 12 +++++------
 ...lformedTagHelpersWithAttributes1.stree.txt |  2 +-
 ...formedTagHelpersWithAttributes10.stree.txt |  2 +-
 ...formedTagHelpersWithAttributes11.stree.txt |  4 ++--
 ...formedTagHelpersWithAttributes12.stree.txt |  4 ++--
 ...formedTagHelpersWithAttributes16.stree.txt |  2 +-
 ...formedTagHelpersWithAttributes17.stree.txt |  2 +-
 ...formedTagHelpersWithAttributes19.stree.txt |  2 +-
 ...lformedTagHelpersWithAttributes2.stree.txt |  4 ++--
 ...formedTagHelpersWithAttributes20.stree.txt |  6 +++---
 ...lformedTagHelpersWithAttributes3.stree.txt |  2 +-
 ...lformedTagHelpersWithAttributes4.stree.txt |  4 ++--
 ...lformedTagHelpersWithAttributes5.stree.txt |  2 +-
 ...lformedTagHelpersWithAttributes6.stree.txt |  2 +-
 ...lformedTagHelpersWithAttributes7.stree.txt |  2 +-
 ...lformedTagHelpersWithAttributes9.stree.txt |  2 +-
 ...ForNonStringTagHelperAttributes1.stree.txt |  4 ++--
 ...orNonStringTagHelperAttributes10.stree.txt | 12 +++++------
 ...orNonStringTagHelperAttributes11.stree.txt | 12 +++++------
 ...orNonStringTagHelperAttributes12.stree.txt |  4 ++--
 ...ForNonStringTagHelperAttributes2.stree.txt |  4 ++--
 ...ForNonStringTagHelperAttributes3.stree.txt |  4 ++--
 ...ForNonStringTagHelperAttributes4.stree.txt |  4 ++--
 ...ForNonStringTagHelperAttributes5.stree.txt |  4 ++--
 ...ForNonStringTagHelperAttributes6.stree.txt |  4 ++--
 ...ForNonStringTagHelperAttributes7.stree.txt |  8 ++++----
 ...ForNonStringTagHelperAttributes8.stree.txt | 12 +++++------
 ...ForNonStringTagHelperAttributes9.stree.txt | 12 +++++------
 ...tes_ComponentDirectiveAttributes.stree.txt |  8 ++++----
 ...eTreeRewriter_AllowsInvalidHtml5.stree.txt |  4 ++--
 ...atesErrorForIncompleteTagHelper1.stree.txt |  4 ++--
 ...atesErrorForIncompleteTagHelper4.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks1.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks2.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks3.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks4.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks5.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks6.stree.txt |  8 ++++----
 ...plexAttributeTagHelperTagBlocks7.stree.txt | 12 +++++------
 ...esOddlySpacedTagHelperTagBlocks1.stree.txt |  8 ++++----
 ...esOddlySpacedTagHelperTagBlocks2.stree.txt |  8 ++++----
 ...esOddlySpacedTagHelperTagBlocks3.stree.txt |  8 ++++----
 ...writer_RewritesScriptTagHelpers5.stree.txt |  8 ++++----
 ...writer_RewritesScriptTagHelpers6.stree.txt |  8 ++++----
 ...writer_RewritesScriptTagHelpers7.stree.txt |  8 ++++----
 ...r_RewritesSelfClosingTagHelpers1.stree.txt |  8 ++++----
 ...r_RewritesSelfClosingTagHelpers2.stree.txt |  8 ++++----
 ...r_RewritesSelfClosingTagHelpers3.stree.txt |  8 ++++----
 ...esTagHelpersWithPlainAttributes1.stree.txt |  8 ++++----
 ...esTagHelpersWithPlainAttributes2.stree.txt |  8 ++++----
 ...esTagHelpersWithPlainAttributes3.stree.txt |  8 ++++----
 ...esTagHelpersWithPlainAttributes4.stree.txt | 12 +++++------
 ...gHelpersWithQuotelessAttributes1.stree.txt |  4 ++--
 ...gHelpersWithQuotelessAttributes2.stree.txt |  4 ++--
 ...gHelpersWithQuotelessAttributes3.stree.txt |  4 ++--
 ...gHelpersWithQuotelessAttributes4.stree.txt |  4 ++--
 ...gHelpersWithQuotelessAttributes5.stree.txt |  8 ++++----
 ...rstandsEmptyAttributeTagHelpers1.stree.txt |  4 ++--
 ...rstandsEmptyAttributeTagHelpers2.stree.txt |  4 ++--
 ...rstandsEmptyAttributeTagHelpers3.stree.txt |  2 +-
 ...rstandsEmptyAttributeTagHelpers4.stree.txt | 10 +++++-----
 ...rstandsEmptyAttributeTagHelpers5.stree.txt | 10 +++++-----
 ...tandsMinimizedAttributes_Block12.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block13.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block14.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block15.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block20.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block21.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block22.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block23.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block24.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block25.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block26.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block27.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block28.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block29.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block30.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block31.stree.txt |  4 ++--
 ...tandsMinimizedAttributes_Block32.stree.txt |  8 ++++----
 ...tandsMinimizedAttributes_Block33.stree.txt |  8 ++++----
 ...dsMinimizedAttributes_Document12.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document13.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document14.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document15.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document20.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document21.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document22.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document23.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document24.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document25.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document26.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document27.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document28.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document29.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document30.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document31.stree.txt |  4 ++--
 ...dsMinimizedAttributes_Document32.stree.txt |  8 ++++----
 ...dsMinimizedAttributes_Document33.stree.txt |  8 ++++----
 ...partNonStringTagHelperAttributes.stree.txt |  4 ++--
 .../AllowsPrefixedTagHelpers10.stree.txt      |  4 ++--
 .../AllowsPrefixedTagHelpers11.stree.txt      |  4 ++--
 .../AllowsPrefixedTagHelpers8.stree.txt       |  4 ++--
 .../AllowsPrefixedTagHelpers9.stree.txt       |  4 ++--
 ...agInCSharpBlock_WithAttrTextTag1.stree.txt |  4 ++--
 ...agInCSharpBlock_WithAttrTextTag2.stree.txt |  4 ++--
 ...agInCSharpBlock_WithAttrTextTag3.stree.txt |  4 ++--
 ...agInCSharpBlock_WithAttrTextTag4.stree.txt |  6 +++---
 ...agInCSharpBlock_WithAttrTextTag5.stree.txt |  4 ++--
 ...lperElementOptForIncompleteHTML4.stree.txt |  2 +-
 ...lperElementOptForIncompleteHTML5.stree.txt |  2 +-
 ...lperElementOptForIncompleteHTML6.stree.txt |  4 ++--
 ...lperElementOptForIncompleteHTML7.stree.txt |  4 ++--
 ...tForIncompleteHTMLInCSharpBlock4.stree.txt |  2 +-
 ...tForIncompleteHTMLInCSharpBlock5.stree.txt |  2 +-
 ...tForIncompleteHTMLInCSharpBlock6.stree.txt |  2 +-
 ...tForIncompleteHTMLInCSharpBlock7.stree.txt |  4 ++--
 ...tForIncompleteHTMLInCSharpBlock8.stree.txt |  4 ++--
 ...rIncompleteTextTagInCSharpBlock3.stree.txt |  2 +-
 ...rIncompleteTextTagInCSharpBlock4.stree.txt |  2 +-
 ...rIncompleteTextTagInCSharpBlock5.stree.txt |  4 ++--
 ...rIncompleteTextTagInCSharpBlock6.stree.txt |  4 ++--
 ...tOptOutCSharp_WithAttributeData1.stree.txt |  4 ++--
 ...tOptOutCSharp_WithAttributeData2.stree.txt |  4 ++--
 ...tOptOutCSharp_WithAttributeData3.stree.txt |  4 ++--
 ...tOptOutCSharp_WithAttributeData4.stree.txt |  6 +++---
 ...tOptOutCSharp_WithAttributeData5.stree.txt |  4 ++--
 ...entOptOutHTML_WithAttributeData1.stree.txt |  4 ++--
 ...entOptOutHTML_WithAttributeData2.stree.txt |  4 ++--
 ...entOptOutHTML_WithAttributeData3.stree.txt |  4 ++--
 ...entOptOutHTML_WithAttributeData4.stree.txt |  6 +++---
 ...entOptOutHTML_WithAttributeData5.stree.txt |  4 ++--
 ...ersInInvalidHtmlTypedScriptTags2.stree.txt |  4 ++--
 ...ersInInvalidHtmlTypedScriptTags3.stree.txt |  4 ++--
 ...ersInInvalidHtmlTypedScriptTags4.stree.txt |  8 ++++----
 ...aseSensitiveTagHelpersCorrectly1.stree.txt |  4 ++--
 ...aseSensitiveTagHelpersCorrectly2.stree.txt |  4 ++--
 ...aseSensitiveTagHelpersCorrectly3.stree.txt |  4 ++--
 ...aseSensitiveTagHelpersCorrectly4.stree.txt |  4 ++--
 ...aseSensitiveTagHelpersCorrectly5.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly1.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly10.stree.txt |  8 ++++----
 ...sCreateTagHelperBlocksCorrectly2.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly3.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly4.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly5.stree.txt |  8 ++++----
 ...sCreateTagHelperBlocksCorrectly6.stree.txt |  8 ++++----
 ...sCreateTagHelperBlocksCorrectly7.stree.txt |  8 ++++----
 ...sCreateTagHelperBlocksCorrectly8.stree.txt |  8 ++++----
 ...sCreateTagHelperBlocksCorrectly9.stree.txt |  8 ++++----
 ...formedTagHelperBlocksCorrectly10.stree.txt |  8 ++++----
 ...lformedTagHelperBlocksCorrectly2.stree.txt |  4 ++--
 ...lformedTagHelperBlocksCorrectly3.stree.txt |  8 ++++----
 ...lformedTagHelperBlocksCorrectly5.stree.txt |  4 ++--
 ...lformedTagHelperBlocksCorrectly6.stree.txt |  8 ++++----
 ...lformedTagHelperBlocksCorrectly7.stree.txt |  4 ++--
 ...lformedTagHelperBlocksCorrectly8.stree.txt |  8 ++++----
 ...lformedTagHelperBlocksCorrectly9.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly10.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly11.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly12.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly13.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly14.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly15.stree.txt |  4 ++--
 ...CreateTagHelperBlocksCorrectly16.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly17.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly18.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly19.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly20.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly21.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly22.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly23.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly24.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly25.stree.txt |  8 ++++----
 ...CreateTagHelperBlocksCorrectly26.stree.txt | 12 +++++------
 ...CreateTagHelperBlocksCorrectly27.stree.txt | 12 +++++------
 ...CreateTagHelperBlocksCorrectly28.stree.txt | 12 +++++------
 ...CreateTagHelperBlocksCorrectly29.stree.txt | 12 +++++------
 ...CreateTagHelperBlocksCorrectly30.stree.txt | 12 +++++------
 ...sCreateTagHelperBlocksCorrectly5.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly6.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly7.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly8.stree.txt |  4 ++--
 ...sCreateTagHelperBlocksCorrectly9.stree.txt |  4 ++--
 ...TagHelpersInHtmlTypedScriptTags1.stree.txt |  4 ++--
 ...TagHelpersInHtmlTypedScriptTags2.stree.txt | 12 +++++------
 ...TagHelpersInHtmlTypedScriptTags3.stree.txt |  8 ++++----
 ...TagHelpersInHtmlTypedScriptTags4.stree.txt |  8 ++++----
 284 files changed, 790 insertions(+), 759 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index ed3e705216..8754420217 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1149,8 +1149,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var nameContent = string.Concat(name.LiteralTokens.Nodes.Select(s => s.Content));
             if (IsConditionalAttributeName(nameContent))
             {
-                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
-
                 // We now have the value prefix which is usually whitespace and/or a quote
                 valuePrefix = OutputAsMarkupLiteral();
 
@@ -1178,8 +1176,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (quote != SyntaxKind.Marker && At(quote))
                 {
                     AcceptAndMoveNext();
-                    // Again, block chunk generator will render the suffix
-                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
                     valueSuffix = OutputAsMarkupLiteral();
                 }
             }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml
index f32934b44a..05c96f57a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml
@@ -2,4 +2,8 @@
     <script type="text/javascript" @{} ></script @foo >
 }
 
+<script type="text/html">
+    <%var x = window == null%>
+</script>
+
 <script></script @
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt
index b67fb8bdc0..1c8ad9da89 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.diagnostics.txt
@@ -1 +1 @@
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml(5,11): Error RZ1024: End of file or an unexpected character was reached before the "script" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml(9,11): Error RZ1024: End of file or an unexpected character was reached before the "script" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt
index c06477366a..b3a19f88d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.ir.txt
@@ -23,8 +23,21 @@ Document -
                     IntermediateToken - (44:1,40 [15] Tags.cshtml) - Html - </script @foo >
                 CSharpCode - (59:1,55 [2] Tags.cshtml)
                     IntermediateToken - (59:1,55 [2] Tags.cshtml) - CSharp - \n
-                HtmlContent - (64:3,0 [20] Tags.cshtml)
+                HtmlContent - (64:3,0 [38] Tags.cshtml)
                     IntermediateToken - (64:3,0 [2] Tags.cshtml) - Html - \n
                     IntermediateToken - (66:4,0 [7] Tags.cshtml) - Html - <script
-                    IntermediateToken - (73:4,7 [1] Tags.cshtml) - Html - >
-                    IntermediateToken - (74:4,8 [10] Tags.cshtml) - Html - </script @
+                    IntermediateToken - (73:4,7 [17] Tags.cshtml) - Html -  type="text/html"
+                    IntermediateToken - (90:4,24 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (91:4,25 [6] Tags.cshtml) - Html - \n    
+                    IntermediateToken - (97:5,4 [5] Tags.cshtml) - Html - <%var
+                HtmlAttribute - (102:5,9 [4] Tags.cshtml) -  x = - 
+                HtmlAttribute - (106:5,13 [9] Tags.cshtml) -  window = - 
+                HtmlContent - (115:5,22 [41] Tags.cshtml)
+                    IntermediateToken - (115:5,22 [7] Tags.cshtml) - Html - = null%
+                    IntermediateToken - (122:5,29 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (123:5,30 [2] Tags.cshtml) - Html - \n
+                    IntermediateToken - (125:6,0 [9] Tags.cshtml) - Html - </script>
+                    IntermediateToken - (134:6,9 [4] Tags.cshtml) - Html - \n\n
+                    IntermediateToken - (138:8,0 [7] Tags.cshtml) - Html - <script
+                    IntermediateToken - (145:8,7 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (146:8,8 [10] Tags.cshtml) - Html - </script @
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs
index ff6fc1a8d3..941e40bb79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.codegen.cs
@@ -1,11 +1,11 @@
-#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "42fb758ed87c3709cfb3f3aeff7a9cf8d242b74c"
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "75edd5542ddb6f78ab6a4d309bb3525a99ecfa55"
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml")]
 namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
 {
     #line hidden
-    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"42fb758ed87c3709cfb3f3aeff7a9cf8d242b74c", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"75edd5542ddb6f78ab6a4d309bb3525a99ecfa55", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Tags_Runtime
     {
         #pragma warning disable 1998
@@ -13,7 +13,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         {
             WriteLiteral("    <script type=\"text/javascript\" ");
             WriteLiteral(" ></script @foo >\r\n");
-            WriteLiteral("\r\n<script></script @");
+            WriteLiteral("\r\n<script type=\"text/html\">\r\n    <%var");
+            BeginWriteAttribute("x", " x =", 102, "", 106, 0);
+            EndWriteAttribute();
+            BeginWriteAttribute("window", " window =", 106, "", 115, 0);
+            EndWriteAttribute();
+            WriteLiteral("= null%>\r\n</script>\r\n\r\n<script></script @");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt
index b67fb8bdc0..1c8ad9da89 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.diagnostics.txt
@@ -1 +1 @@
-TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml(5,11): Error RZ1024: End of file or an unexpected character was reached before the "script" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags.cshtml(9,11): Error RZ1024: End of file or an unexpected character was reached before the "script" tag could be parsed.  Elements inside markup blocks must be complete. They must either be self-closing ("<br />") or have matching end tags ("<p>Hello</p>").  If you intended to display a "<" character, use the "&lt;" HTML entity.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt
index 38757651f0..f50d573ada 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_Runtime.ir.txt
@@ -20,8 +20,21 @@ Document -
                     IntermediateToken - (59:1,55 [2] Tags.cshtml) - Html - \n
                 CSharpCode - (61:2,0 [0] Tags.cshtml)
                     IntermediateToken - (61:2,0 [0] Tags.cshtml) - CSharp - 
-                HtmlContent - (64:3,0 [20] Tags.cshtml)
+                HtmlContent - (64:3,0 [38] Tags.cshtml)
                     IntermediateToken - (64:3,0 [2] Tags.cshtml) - Html - \n
                     IntermediateToken - (66:4,0 [7] Tags.cshtml) - Html - <script
-                    IntermediateToken - (73:4,7 [1] Tags.cshtml) - Html - >
-                    IntermediateToken - (74:4,8 [10] Tags.cshtml) - Html - </script @
+                    IntermediateToken - (73:4,7 [17] Tags.cshtml) - Html -  type="text/html"
+                    IntermediateToken - (90:4,24 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (91:4,25 [6] Tags.cshtml) - Html - \n    
+                    IntermediateToken - (97:5,4 [5] Tags.cshtml) - Html - <%var
+                HtmlAttribute - (102:5,9 [4] Tags.cshtml) -  x = - 
+                HtmlAttribute - (106:5,13 [9] Tags.cshtml) -  window = - 
+                HtmlContent - (115:5,22 [41] Tags.cshtml)
+                    IntermediateToken - (115:5,22 [7] Tags.cshtml) - Html - = null%
+                    IntermediateToken - (122:5,29 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (123:5,30 [2] Tags.cshtml) - Html - \n
+                    IntermediateToken - (125:6,0 [9] Tags.cshtml) - Html - </script>
+                    IntermediateToken - (134:6,9 [4] Tags.cshtml) - Html - \n\n
+                    IntermediateToken - (138:8,0 [7] Tags.cshtml) - Html - <script
+                    IntermediateToken - (145:8,7 [1] Tags.cshtml) - Html - >
+                    IntermediateToken - (146:8,8 [10] Tags.cshtml) - Html - </script @
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
index dffaf4686c..b235fed62a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
@@ -103,7 +103,7 @@ RazorDocument - [0..352)::352 - [@foreach(var c in db.Categories) {LF
                                                 MarkupTextLiteral - [195..199)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[href];
                                                 Equals;[=];
-                                                MarkupTextLiteral - [200..201)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [200..201)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     DoubleQuote;["];
                                                 GenericBlock - [201..257)::56
                                                     MarkupDynamicAttributeValue - [201..257)::56 - [@Html.ActionUrl("Products", "Detail", new { id = p.Id })]
@@ -139,7 +139,7 @@ RazorDocument - [0..352)::352 - [@foreach(var c in db.Categories) {LF
                                                                                 Whitespace;[ ];
                                                                                 RightBrace;[}];
                                                                                 RightParenthesis;[)];
-                                                MarkupTextLiteral - [257..258)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [257..258)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     DoubleQuote;["];
                                             CloseAngle;[>];
                                         MarkupTextLiteral - [259..259)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
index 6ea3f05e53..f4dfa89174 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
@@ -159,14 +159,14 @@ RazorDocument - [0..314)::314 - [@if(int i = 0; i < 10; new Foo { Bar = "baz" })
                     MarkupTextLiteral - [262..263)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     Equals;[=];
-                    MarkupTextLiteral - [264..266)::2 - [ "] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [264..266)::2 - [ "] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                         DoubleQuote;["];
                     GenericBlock - [266..269)::3
                         MarkupLiteralAttributeValue - [266..269)::3 - [baz]
                             MarkupTextLiteral - [266..269)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[baz];
-                    MarkupTextLiteral - [269..270)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [269..270)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMinimizedAttributeBlock - [270..273)::3 - [ })]
                     MarkupTextLiteral - [270..271)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
index 7f968fcc3f..b08e365411 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..23)::23 - [@{<span foo='@@def' />}]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..18)::5
                                             MarkupBlock - [13..15)::2
@@ -32,7 +32,7 @@ RazorDocument - [0..23)::23 - [@{<span foo='@@def' />}]
                                             MarkupLiteralAttributeValue - [15..18)::3 - [def]
                                                 MarkupTextLiteral - [15..18)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[def];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [19..20)::1
                                         MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
index 931cd0b1e2..439763c3fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..23)::23 - [@{<span foo='abc@@' />}]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..18)::5
                                             MarkupLiteralAttributeValue - [13..16)::3 - [abc]
@@ -32,7 +32,7 @@ RazorDocument - [0..23)::23 - [@{<span foo='abc@@' />}]
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [19..20)::1
                                         MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
index 0e56c91bea..b32d5a6822 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..28)::28 - [@{<span foo='abc @@ def' />}]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..23)::10
                                             MarkupLiteralAttributeValue - [13..16)::3 - [abc]
@@ -38,7 +38,7 @@ RazorDocument - [0..28)::28 - [@{<span foo='abc @@ def' />}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [20..23)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[def];
-                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [24..25)::1
                                         MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
index aea355dd25..9a403936c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..20)::20 - [@{<span foo='@@' />}]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..15)::2
                                             MarkupBlock - [13..15)::2
@@ -29,7 +29,7 @@ RazorDocument - [0..20)::20 - [@{<span foo='@@' />}]
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [16..17)::1
                                         MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
index 440b6e0f7b..480eaf7a51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..45)::45 - [@{<span foo='abc@def.com abc@@def.com @@' />}]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..40)::27
                                             MarkupLiteralAttributeValue - [13..24)::11 - [abc@def.com]
@@ -46,7 +46,7 @@ RazorDocument - [0..45)::45 - [@{<span foo='abc@def.com abc@@def.com @@' />}]
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [39..40)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [40..41)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [41..42)::1
                                         MarkupTextLiteral - [41..42)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
index 071e88d493..3f25fa1782 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..118)::118 - [@{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..113)::100
                                             MarkupLiteralAttributeValue - [13..45)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+]
@@ -77,7 +77,7 @@ RazorDocument - [0..118)::118 - [@{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@
                                                     Text;[)*$];
                                                     ForwardSlash;[/];
                                                     Text;[i];
-                                        MarkupTextLiteral - [113..114)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [113..114)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMiscAttributeContent - [114..115)::1
                                         MarkupTextLiteral - [114..115)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
index 06b8e19b9b..9b4efd9401 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..21)::8
                                             MarkupBlock - [13..15)::2
@@ -47,7 +47,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                                                         IntegerLiteral;[3];
                                                                 RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
                                                                     RightParenthesis;[)];
-                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [22..50)::28 - [ bar='@(2+3)@@@DateTime.Now']
                                         MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -55,7 +55,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                         MarkupTextLiteral - [23..26)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[bar];
                                         Equals;[=];
-                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [28..49)::21
                                             MarkupDynamicAttributeValue - [28..34)::6 - [@(2+3)]
@@ -93,7 +93,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                                                         Identifier;[DateTime];
                                                                         Dot;[.];
                                                                         Identifier;[Now];
-                                        MarkupTextLiteral - [49..50)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [49..50)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [50..72)::22 - [ baz='@DateTime.Now@@']
                                         MarkupTextLiteral - [50..51)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -101,7 +101,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                         MarkupTextLiteral - [51..54)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[baz];
                                         Equals;[=];
-                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [56..71)::15
                                             MarkupDynamicAttributeValue - [56..69)::13 - [@DateTime.Now]
@@ -121,7 +121,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [70..71)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [71..72)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [71..72)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [72..95)::23 - [ bat='@DateTime.Now @@']
                                         MarkupTextLiteral - [72..73)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -129,7 +129,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                         MarkupTextLiteral - [73..76)::3 - [bat] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[bat];
                                         Equals;[=];
-                                        MarkupTextLiteral - [77..78)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [77..78)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [78..94)::16
                                             MarkupDynamicAttributeValue - [78..91)::13 - [@DateTime.Now]
@@ -150,7 +150,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [93..94)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [94..95)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [94..95)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [95..117)::22 - [ zoo='@@@DateTime.Now']
                                         MarkupTextLiteral - [95..96)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -158,7 +158,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                         MarkupTextLiteral - [96..99)::3 - [zoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[zoo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [100..101)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [100..101)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [101..116)::15
                                             MarkupBlock - [101..103)::2
@@ -180,7 +180,7 @@ RazorDocument - [0..121)::121 - [@{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.N
                                                                         Identifier;[DateTime];
                                                                         Dot;[.];
                                                                         Identifier;[Now];
-                                        MarkupTextLiteral - [116..117)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [116..117)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [117..118)::1
                                         MarkupTextLiteral - [117..118)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
index 56adc1414b..da26fe2d8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..15)::15 - [@{<span foo='@@]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..15)::2
                                             MarkupBlock - [13..15)::2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
index c724b78d64..b869f26632 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..21)::21 - [@{<span foo='@ @' />}]
                                         MarkupTextLiteral - [8..11)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..16)::3
                                             MarkupDynamicAttributeValue - [13..14)::1 - [@]
@@ -46,7 +46,7 @@ RazorDocument - [0..21)::21 - [@{<span foo='@ @' />}]
                                                                 CSharpCodeBlock - [16..16)::0
                                                                     CSharpExpressionLiteral - [16..16)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                         Marker;[];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [17..18)::1
                                         MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
index 48df1c0bfc..bd38826bb7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
@@ -29,7 +29,7 @@ RazorDocument - [0..30)::30 - [@section s {<span foo='@@' />}]
                                         MarkupTextLiteral - [18..21)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [23..25)::2
                                             MarkupBlock - [23..25)::2
@@ -37,7 +37,7 @@ RazorDocument - [0..30)::30 - [@section s {<span foo='@@' />}]
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [24..25)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [26..27)::1
                                         MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
index 2659456d6f..2bbe5cc9d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
@@ -29,7 +29,7 @@ RazorDocument - [0..44)::44 - [@section s {<span foo='@DateTime.Now @@' />}]
                                         MarkupTextLiteral - [18..21)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [23..39)::16
                                             MarkupDynamicAttributeValue - [23..36)::13 - [@DateTime.Now]
@@ -50,7 +50,7 @@ RazorDocument - [0..44)::44 - [@section s {<span foo='@DateTime.Now @@' />}]
                                                     Transition;[@];
                                                 MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                     Transition;[@];
-                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [40..41)::1
                                         MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
index 63dbd49360..bbd0281f2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
@@ -42,7 +42,7 @@ RazorDocument - [0..75)::75 - [@{ var foo = bar; Html.ExecuteTemplate(foo, @<p f
                                             MarkupTextLiteral - [48..51)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 Text;[foo];
                                             Equals;[=];
-                                            MarkupTextLiteral - [52..53)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [52..53)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 SingleQuote;['];
                                             GenericBlock - [53..55)::2
                                                 MarkupBlock - [53..55)::2
@@ -50,7 +50,7 @@ RazorDocument - [0..75)::75 - [@{ var foo = bar; Html.ExecuteTemplate(foo, @<p f
                                                         Transition;[@];
                                                     MarkupEphemeralTextLiteral - [54..55)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                                         Transition;[@];
-                                            MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [55..56)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 SingleQuote;['];
                                         CloseAngle;[>];
                                     MarkupTextLiteral - [57..62)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt
index 4cbebe5321..e8c4ec1095 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesAsMarkup.stree.txt
@@ -11,7 +11,7 @@ RazorDocument - [0..27)::27 - [<span @class='@foo'></span>]
                         Transition;[@];
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [14..18)::4
                         MarkupDynamicAttributeValue - [14..18)::4 - [@foo]
@@ -24,7 +24,7 @@ RazorDocument - [0..27)::27 - [<span @class='@foo'></span>]
                                             CSharpCodeBlock - [15..18)::3
                                                 CSharpExpressionLiteral - [15..18)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                     Identifier;[foo];
-                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupEndTag - [20..27)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt
index cc833ddb21..4742d0f6c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ComponentFileKind_ParsesDirectiveAttributesWithParameterAsMarkup.stree.txt
@@ -11,7 +11,7 @@ RazorDocument - [0..33)::33 - [<span @class:param='@foo'></span>]
                         Transition;[@];
                         Text;[class:param];
                     Equals;[=];
-                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [20..24)::4
                         MarkupDynamicAttributeValue - [20..24)::4 - [@foo]
@@ -24,7 +24,7 @@ RazorDocument - [0..33)::33 - [<span @class:param='@foo'></span>]
                                             CSharpCodeBlock - [21..24)::3
                                                 CSharpExpressionLiteral - [21..24)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                     Identifier;[foo];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupEndTag - [26..33)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
index 91ef6c8bd3..dcab17b569 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..32)::32 - [@{<span data-foo='@foo'></span>}]
                                         MarkupTextLiteral - [8..16)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[data-foo];
                                         Equals;[=];
-                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [18..22)::4
                                             MarkupDynamicAttributeValue - [18..22)::4 - [@foo]
@@ -34,7 +34,7 @@ RazorDocument - [0..32)::32 - [@{<span data-foo='@foo'></span>}]
                                                                 CSharpCodeBlock - [19..22)::3
                                                                     CSharpExpressionLiteral - [19..22)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                         Identifier;[foo];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     CloseAngle;[>];
                                 MarkupEndTag - [24..31)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
index eaab6eb162..522918f3b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..27)::27 - [@{<a href="Foo Bar Baz" />}]
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [11..22)::11
                                             MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
@@ -37,7 +37,7 @@ RazorDocument - [0..27)::27 - [@{<a href="Foo Bar Baz" />}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [19..22)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Baz];
-                                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMiscAttributeContent - [23..24)::1
                                         MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
index da6e6fd85b..59949b3f82 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
@@ -24,7 +24,7 @@ RazorDocument - [0..26)::26 - [@{<a href LF= LF'@Foo' />}]
                                             Whitespace;[ ];
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [13..17)::4 - [ LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [13..17)::4 - [ LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Whitespace;[ ];
                                             NewLine;[LF];
                                             SingleQuote;['];
@@ -39,7 +39,7 @@ RazorDocument - [0..26)::26 - [@{<a href LF= LF'@Foo' />}]
                                                                 CSharpCodeBlock - [18..21)::3
                                                                     CSharpExpressionLiteral - [18..21)::3 - [Foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                         Identifier;[Foo];
-                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [22..23)::1
                                         MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
index 32849f4eed..449c6e679d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..27)::27 - [@{<a href='Foo Bar Baz' />}]
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [11..22)::11
                                             MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
@@ -37,7 +37,7 @@ RazorDocument - [0..27)::27 - [@{<a href='Foo Bar Baz' />}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [19..22)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Baz];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [23..24)::1
                                         MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
index 810f3a08c7..9a528190d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..29)::29 - [@{<a href='@foo bar @baz' />}]
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [11..24)::13
                                             MarkupDynamicAttributeValue - [11..15)::4 - [@foo]
@@ -51,7 +51,7 @@ RazorDocument - [0..29)::29 - [@{<a href='@foo bar @baz' />}]
                                                                 CSharpCodeBlock - [21..24)::3
                                                                     CSharpExpressionLiteral - [21..24)::3 - [baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                         Identifier;[baz];
-                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [25..26)::1
                                         MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
index 91de5c77b1..9284b6d6e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..32)::32 - [@{<aLFhref='Foo'LFabcd='Bar' />}]
                                         MarkupTextLiteral - [6..10)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [12..15)::3
                                             MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
                                                 MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [16..28)::12 - [LFabcd='Bar']
                                         MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -35,13 +35,13 @@ RazorDocument - [0..32)::32 - [@{<aLFhref='Foo'LFabcd='Bar' />}]
                                         MarkupTextLiteral - [18..22)::4 - [abcd] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[abcd];
                                         Equals;[=];
-                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [24..27)::3
                                             MarkupLiteralAttributeValue - [24..27)::3 - [Bar]
                                                 MarkupTextLiteral - [24..27)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [28..29)::1
                                         MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
index 219a8eaa05..c50f1edec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..20)::20 - [@{<aLFhref='Foo' />}]
                                         MarkupTextLiteral - [6..10)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [12..15)::3
                                             MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
                                                 MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [16..17)::1
                                         MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
index 87ce1cb744..f62fcea9b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..20)::20 - [@{<a href='@foo' />}]
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [11..15)::4
                                             MarkupDynamicAttributeValue - [11..15)::4 - [@foo]
@@ -34,7 +34,7 @@ RazorDocument - [0..20)::20 - [@{<a href='@foo' />}]
                                                                 CSharpCodeBlock - [12..15)::3
                                                                     CSharpExpressionLiteral - [12..15)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                         Identifier;[foo];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [16..17)::1
                                         MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
index 243a97aba5..71e57bd7e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..19)::19 - [@{<a href='Foo' />}]
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [11..14)::3
                                             MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
                                                 MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [15..16)::1
                                         MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
index 4633a61d10..3363750b09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
@@ -24,7 +24,7 @@ RazorDocument - [0..27)::27 - [@{<a href LF= 	LF'Foo' />}]
                                             Whitespace;[ ];
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [14..19)::5 - [ 	LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [14..19)::5 - [ 	LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Whitespace;[ 	];
                                             NewLine;[LF];
                                             SingleQuote;['];
@@ -32,7 +32,7 @@ RazorDocument - [0..27)::27 - [@{<a href LF= 	LF'Foo' />}]
                                             MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
                                                 MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [23..24)::1
                                         MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
index 6a0b8855a0..dc163ac41b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..21)::21 - [@{<a [item]='Foo' />}]
                                             Text;[item];
                                             RightBracket;[]];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
                                                 MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [17..18)::1
                                         MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
index 55515d7460..b35f003282 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..22)::22 - [@{<a [(item,='Foo' />}]
                                             LeftBracket;[[];
                                             Text;[(item,];
                                         Equals;[=];
-                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [14..17)::3
                                             MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
                                                 MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [18..19)::1
                                         MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
index 7e9f79e40f..14dbd17409 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..22)::22 - [@{<a (click)='Foo' />}]
                                         MarkupTextLiteral - [5..12)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [14..17)::3
                                             MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
                                                 MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [18..19)::1
                                         MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
index cc0ee42338..b7b93fab26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..23)::23 - [@{<a (^click)='Foo' />}]
                                         MarkupTextLiteral - [5..13)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(^click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [15..18)::3
                                             MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
                                                 MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [19..20)::1
                                         MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
index 2bceb1e701..51a3ab853e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..25)::25 - [@{<a *something='Foo' />}]
                                         MarkupTextLiteral - [5..15)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[*something];
                                         Equals;[=];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [17..20)::3
                                             MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
                                                 MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [21..22)::1
                                         MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
index 42409d68bb..c257aeddef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..21)::21 - [@{<a #local='Foo' />}]
                                         MarkupTextLiteral - [5..11)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[#local];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
                                                 MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [17..18)::1
                                         MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
index 948765f401..2dd3fffe2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
@@ -25,13 +25,13 @@ RazorDocument - [0..38)::38 - [@{<a [item]LF='Foo'	[item]=LF'Bar' />}]
                                         MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [15..18)::3
                                             MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
                                                 MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [19..34)::15 - [	[item]=LF'Bar']
                                         MarkupTextLiteral - [19..20)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -41,14 +41,14 @@ RazorDocument - [0..38)::38 - [@{<a [item]LF='Foo'	[item]=LF'Bar' />}]
                                             Text;[item];
                                             RightBracket;[]];
                                         Equals;[=];
-                                        MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                             SingleQuote;['];
                                         GenericBlock - [30..33)::3
                                             MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
                                                 MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [34..35)::1
                                         MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
index f4752e38b0..c020e7c836 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
@@ -24,13 +24,13 @@ RazorDocument - [0..40)::40 - [@{<a [(item,LF='Foo'	[(item,=LF'Bar' />}]
                                         MarkupTextLiteral - [12..14)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [Foo]
                                                 MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [20..36)::16 - [	[(item,=LF'Bar']
                                         MarkupTextLiteral - [20..21)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -39,14 +39,14 @@ RazorDocument - [0..40)::40 - [@{<a [(item,LF='Foo'	[(item,=LF'Bar' />}]
                                             LeftBracket;[[];
                                             Text;[(item,];
                                         Equals;[=];
-                                        MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                             SingleQuote;['];
                                         GenericBlock - [32..35)::3
                                             MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
                                                 MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [36..37)::1
                                         MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
index adfbf037c6..403687e9a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..40)::40 - [@{<a (click)LF='Foo'	(click)=LF'Bar' />}]
                                         MarkupTextLiteral - [12..14)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [Foo]
                                                 MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [20..36)::16 - [	(click)=LF'Bar']
                                         MarkupTextLiteral - [20..21)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -37,14 +37,14 @@ RazorDocument - [0..40)::40 - [@{<a (click)LF='Foo'	(click)=LF'Bar' />}]
                                         MarkupTextLiteral - [21..28)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                             SingleQuote;['];
                                         GenericBlock - [32..35)::3
                                             MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
                                                 MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [36..37)::1
                                         MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
index 14b11adff4..3a677aa3db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..42)::42 - [@{<a (^click)LF='Foo'	(^click)=LF'Bar' />}]
                                         MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [17..20)::3
                                             MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
                                                 MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [21..38)::17 - [	(^click)=LF'Bar']
                                         MarkupTextLiteral - [21..22)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -37,14 +37,14 @@ RazorDocument - [0..42)::42 - [@{<a (^click)LF='Foo'	(^click)=LF'Bar' />}]
                                         MarkupTextLiteral - [22..30)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(^click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [31..34)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [31..34)::3 - [LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                             SingleQuote;['];
                                         GenericBlock - [34..37)::3
                                             MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
                                                 MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [38..39)::1
                                         MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
index 400be0767b..4b9f7e3f7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..46)::46 - [@{<a *somethingLF='Foo'	*something=LF'Bar' />}]
                                         MarkupTextLiteral - [15..17)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [19..22)::3
                                             MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
                                                 MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [23..42)::19 - [	*something=LF'Bar']
                                         MarkupTextLiteral - [23..24)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -37,14 +37,14 @@ RazorDocument - [0..46)::46 - [@{<a *somethingLF='Foo'	*something=LF'Bar' />}]
                                         MarkupTextLiteral - [24..34)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[*something];
                                         Equals;[=];
-                                        MarkupTextLiteral - [35..38)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [35..38)::3 - [LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                             SingleQuote;['];
                                         GenericBlock - [38..41)::3
                                             MarkupLiteralAttributeValue - [38..41)::3 - [Bar]
                                                 MarkupTextLiteral - [38..41)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [42..43)::1
                                         MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
index 789dfc7621..bf93ad7e28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..38)::38 - [@{<a #localLF='Foo'	#local=LF'Bar' />}]
                                         MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                         Equals;[=];
-                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [15..18)::3
                                             MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
                                                 MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [19..34)::15 - [	#local=LF'Bar']
                                         MarkupTextLiteral - [19..20)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -37,14 +37,14 @@ RazorDocument - [0..38)::38 - [@{<a #localLF='Foo'	#local=LF'Bar' />}]
                                         MarkupTextLiteral - [20..26)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[#local];
                                         Equals;[=];
-                                        MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             NewLine;[LF];
                                             SingleQuote;['];
                                         GenericBlock - [30..33)::3
                                             MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
                                                 MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [34..35)::1
                                         MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
index 627579c898..241683bef1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
@@ -25,13 +25,13 @@ RazorDocument - [0..40)::40 - [@{<a LF  [item]='Foo'	LF[item]='Bar' />}]
                                             Text;[item];
                                             RightBracket;[]];
                                         Equals;[=];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [17..20)::3
                                             MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
                                                 MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [21..36)::15 - [	LF[item]='Bar']
                                         MarkupTextLiteral - [21..24)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -42,13 +42,13 @@ RazorDocument - [0..40)::40 - [@{<a LF  [item]='Foo'	LF[item]='Bar' />}]
                                             Text;[item];
                                             RightBracket;[]];
                                         Equals;[=];
-                                        MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [32..35)::3
                                             MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
                                                 MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [36..37)::1
                                         MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
index 49cff6166b..993f446d3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
@@ -24,13 +24,13 @@ RazorDocument - [0..42)::42 - [@{<a LF  [(item,='Foo'	LF[(item,='Bar' />}]
                                             LeftBracket;[[];
                                             Text;[(item,];
                                         Equals;[=];
-                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [18..21)::3
                                             MarkupLiteralAttributeValue - [18..21)::3 - [Foo]
                                                 MarkupTextLiteral - [18..21)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [22..38)::16 - [	LF[(item,='Bar']
                                         MarkupTextLiteral - [22..25)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -40,13 +40,13 @@ RazorDocument - [0..42)::42 - [@{<a LF  [(item,='Foo'	LF[(item,='Bar' />}]
                                             LeftBracket;[[];
                                             Text;[(item,];
                                         Equals;[=];
-                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [34..37)::3
                                             MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
                                                 MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [38..39)::1
                                         MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
index bb34ae31da..09be6b80eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..42)::42 - [@{<a LF  (click)='Foo'	LF(click)='Bar' />}]
                                         MarkupTextLiteral - [9..16)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [18..21)::3
                                             MarkupLiteralAttributeValue - [18..21)::3 - [Foo]
                                                 MarkupTextLiteral - [18..21)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [22..38)::16 - [	LF(click)='Bar']
                                         MarkupTextLiteral - [22..25)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -38,13 +38,13 @@ RazorDocument - [0..42)::42 - [@{<a LF  (click)='Foo'	LF(click)='Bar' />}]
                                         MarkupTextLiteral - [25..32)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [34..37)::3
                                             MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
                                                 MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [38..39)::1
                                         MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
index 00eddb322f..9024fc2d73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..44)::44 - [@{<a LF  (^click)='Foo'	LF(^click)='Bar' />}]
                                         MarkupTextLiteral - [9..17)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(^click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [19..22)::3
                                             MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
                                                 MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [23..40)::17 - [	LF(^click)='Bar']
                                         MarkupTextLiteral - [23..26)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -38,13 +38,13 @@ RazorDocument - [0..44)::44 - [@{<a LF  (^click)='Foo'	LF(^click)='Bar' />}]
                                         MarkupTextLiteral - [26..34)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[(^click)];
                                         Equals;[=];
-                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [36..39)::3
                                             MarkupLiteralAttributeValue - [36..39)::3 - [Bar]
                                                 MarkupTextLiteral - [36..39)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [40..41)::1
                                         MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
index f832c6c058..6ab9b95ff0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..48)::48 - [@{<a LF  *something='Foo'	LF*something='Bar' />}]
                                         MarkupTextLiteral - [9..19)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[*something];
                                         Equals;[=];
-                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [21..24)::3
                                             MarkupLiteralAttributeValue - [21..24)::3 - [Foo]
                                                 MarkupTextLiteral - [21..24)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [25..44)::19 - [	LF*something='Bar']
                                         MarkupTextLiteral - [25..28)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -38,13 +38,13 @@ RazorDocument - [0..48)::48 - [@{<a LF  *something='Foo'	LF*something='Bar' />}]
                                         MarkupTextLiteral - [28..38)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[*something];
                                         Equals;[=];
-                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [40..43)::3
                                             MarkupLiteralAttributeValue - [40..43)::3 - [Bar]
                                                 MarkupTextLiteral - [40..43)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [43..44)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [43..44)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [44..45)::1
                                         MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
index 5b0311ff46..d60bd00437 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
@@ -23,13 +23,13 @@ RazorDocument - [0..40)::40 - [@{<a LF  #local='Foo'	LF#local='Bar' />}]
                                         MarkupTextLiteral - [9..15)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[#local];
                                         Equals;[=];
-                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [17..20)::3
                                             MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
                                                 MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [21..36)::15 - [	LF#local='Bar']
                                         MarkupTextLiteral - [21..24)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -38,13 +38,13 @@ RazorDocument - [0..40)::40 - [@{<a LF  #local='Foo'	LF#local='Bar' />}]
                                         MarkupTextLiteral - [24..30)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[#local];
                                         Equals;[=];
-                                        MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [32..35)::3
                                             MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
                                                 MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [36..37)::1
                                         MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
index 2e77374d79..f080505b4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
@@ -23,7 +23,7 @@ RazorDocument - [0..25)::25 - [@{<a href=Foo Bar Baz />}]
                                         Equals;[=];
                                         GenericBlock - [10..13)::3
                                             MarkupLiteralAttributeValue - [10..13)::3 - [Foo]
-                                                MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
                                     MarkupMinimizedAttributeBlock - [13..17)::4 - [ Bar]
                                         MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
index 40509adc08..6d3e5ff327 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..30)::30 - [@{<a href='@foo ~/Foo/Bar' />}]
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [11..25)::14
                                             MarkupDynamicAttributeValue - [11..15)::4 - [@foo]
@@ -43,7 +43,7 @@ RazorDocument - [0..30)::30 - [@{<a href='@foo ~/Foo/Bar' />}]
                                                     Text;[Foo];
                                                     ForwardSlash;[/];
                                                     Text;[Bar];
-                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [26..27)::1
                                         MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
index 0c757c152f..c0f11eea56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..22)::22 - [@{<a 	LFhref='Foo' />}]
                                         MarkupTextLiteral - [8..12)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [14..17)::3
                                             MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
                                                 MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[Foo];
-                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [18..19)::1
                                         MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
index 9e2ebb7588..032272b7d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..29)::29 - [@{<foo><bar baz=">" /></foo>}]
                                             MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 Text;[baz];
                                             Equals;[=];
-                                            MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 DoubleQuote;["];
                                             GenericBlock - [17..18)::1
                                                 MarkupLiteralAttributeValue - [17..18)::1 - [>]
                                                     MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         CloseAngle;[>];
-                                            MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 DoubleQuote;["];
                                         MarkupMiscAttributeContent - [19..20)::1
                                             MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
index c99bb7f478..167959449b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..29)::29 - [@{<foo><bar baz='>' /></foo>}]
                                             MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 Text;[baz];
                                             Equals;[=];
-                                            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 SingleQuote;['];
                                             GenericBlock - [17..18)::1
                                                 MarkupLiteralAttributeValue - [17..18)::1 - [>]
                                                     MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         CloseAngle;[>];
-                                            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 SingleQuote;['];
                                         MarkupMiscAttributeContent - [19..20)::1
                                             MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
index b3bf3e616d..71b793bf6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..33)::33 - [@{<foo><bar baz="/"></bar></foo>}]
                                             MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 Text;[baz];
                                             Equals;[=];
-                                            MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 DoubleQuote;["];
                                             GenericBlock - [17..18)::1
                                                 MarkupLiteralAttributeValue - [17..18)::1 - [/]
                                                     MarkupTextLiteral - [17..18)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         ForwardSlash;[/];
-                                            MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 DoubleQuote;["];
                                         CloseAngle;[>];
                                     MarkupEndTag - [20..26)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
index 5881782048..91929b7c24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..33)::33 - [@{<foo><bar baz='/'></bar></foo>}]
                                             MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 Text;[baz];
                                             Equals;[=];
-                                            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [16..17)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 SingleQuote;['];
                                             GenericBlock - [17..18)::1
                                                 MarkupLiteralAttributeValue - [17..18)::1 - [/]
                                                     MarkupTextLiteral - [17..18)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         ForwardSlash;[/];
-                                            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 SingleQuote;['];
                                         CloseAngle;[>];
                                     MarkupEndTag - [20..26)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt
index 4083296791..769a3401e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/HandlesForwardSlashInAttributeContent.stree.txt
@@ -29,7 +29,7 @@ RazorDocument - [0..20)::20 - [@{<p / class=foo />}]
                                         Equals;[=];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [foo]
-                                                MarkupTextLiteral - [13..16)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [13..16)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[foo];
                                     MarkupMiscAttributeContent - [16..17)::1
                                         MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
index 21916ea67e..cec5e67cac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..51)::51 - [@{<foo bar="baz"><biz><boz zoop=zork/></biz></foo
                                         MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[bar];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [12..15)::3
                                             MarkupLiteralAttributeValue - [12..15)::3 - [baz]
                                                 MarkupTextLiteral - [12..15)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[baz];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupElement - [17..44)::27
@@ -47,7 +47,7 @@ RazorDocument - [0..51)::51 - [@{<foo bar="baz"><biz><boz zoop=zork/></biz></foo
                                                 Equals;[=];
                                                 GenericBlock - [32..36)::4
                                                     MarkupLiteralAttributeValue - [32..36)::4 - [zork]
-                                                        MarkupTextLiteral - [32..36)::4 - [zork] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                        MarkupTextLiteral - [32..36)::4 - [zork] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                             Text;[zork];
                                             ForwardSlash;[/];
                                             CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
index d407c11ec6..22a277385d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
@@ -20,14 +20,14 @@ RazorDocument - [0..39)::39 - [<div ><p class = 'bar'> Foo </p></div >]
                         MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Whitespace;[ ];
                         Equals;[=];
-                        MarkupTextLiteral - [16..18)::2 - [ '] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [16..18)::2 - [ '] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Whitespace;[ ];
                             SingleQuote;['];
                         GenericBlock - [18..21)::3
                             MarkupLiteralAttributeValue - [18..21)::3 - [bar]
                                 MarkupTextLiteral - [18..21)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[bar];
-                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             SingleQuote;['];
                     CloseAngle;[>];
                 MarkupTextLiteral - [23..28)::5 - [ Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
index 77310407c8..e311d83d19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..51)::51 - [<a href="mailto:example@microsoft.com">Email me</
                     MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[href];
                     Equals;[=];
-                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [9..37)::28
                         MarkupLiteralAttributeValue - [9..37)::28 - [mailto:example@microsoft.com]
                             MarkupTextLiteral - [9..37)::28 - [mailto:example@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[mailto:example@microsoft.com];
-                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [39..47)::8 - [Email me] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
index 0fe538762c..22b8491406 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..22)::22 - [{<span foo='@@def' />}]
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..17)::5
                         MarkupBlock - [12..14)::2
@@ -23,7 +23,7 @@ RazorDocument - [0..22)::22 - [{<span foo='@@def' />}]
                         MarkupLiteralAttributeValue - [14..17)::3 - [def]
                             MarkupTextLiteral - [14..17)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[def];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [18..19)::1
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
index 10f6f191b0..cdda1cd2ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..22)::22 - [{<span foo='abc@@' />}]
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..17)::5
                         MarkupLiteralAttributeValue - [12..15)::3 - [abc]
@@ -23,7 +23,7 @@ RazorDocument - [0..22)::22 - [{<span foo='abc@@' />}]
                                 Transition;[@];
                             MarkupEphemeralTextLiteral - [16..17)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                 Transition;[@];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [18..19)::1
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
index 89e33f24f2..4eb0a63e06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..27)::27 - [{<span foo='abc @@ def' />}]
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..22)::10
                         MarkupLiteralAttributeValue - [12..15)::3 - [abc]
@@ -29,7 +29,7 @@ RazorDocument - [0..27)::27 - [{<span foo='abc @@ def' />}]
                                 Whitespace;[ ];
                             MarkupTextLiteral - [19..22)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[def];
-                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [23..24)::1
                     MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
index 769eb56d25..b0b9484139 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..19)::19 - [{<span foo='@@' />}]
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..14)::2
                         MarkupBlock - [12..14)::2
@@ -20,7 +20,7 @@ RazorDocument - [0..19)::19 - [{<span foo='@@' />}]
                                 Transition;[@];
                             MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                 Transition;[@];
-                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [15..16)::1
                     MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
index fef5ae37c3..0554b2d0c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..44)::44 - [{<span foo='abc@def.com abc@@def.com @@' />}]
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..39)::27
                         MarkupLiteralAttributeValue - [12..23)::11 - [abc@def.com]
@@ -37,7 +37,7 @@ RazorDocument - [0..44)::44 - [{<span foo='abc@def.com abc@@def.com @@' />}]
                                 Transition;[@];
                             MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                 Transition;[@];
-                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [40..41)::1
                     MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
index ad65481c31..4b1d4fc6db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..117)::117 - [{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [12..112)::100
                         MarkupLiteralAttributeValue - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+]
@@ -68,7 +68,7 @@ RazorDocument - [0..117)::117 - [{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[
                                 Text;[)*$];
                                 ForwardSlash;[/];
                                 Text;[i];
-                    MarkupTextLiteral - [112..113)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [112..113)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [113..114)::1
                     MarkupTextLiteral - [113..114)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
index b8f69cb320..2305c82335 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                     MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..20)::8
                         MarkupBlock - [12..14)::2
@@ -38,7 +38,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                                                     IntegerLiteral;[3];
                                             RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
                                                 RightParenthesis;[)];
-                    MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [21..49)::28 - [ bar='@(2+3)@@@DateTime.Now']
                     MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -46,7 +46,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                     MarkupTextLiteral - [22..25)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bar];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [27..48)::21
                         MarkupDynamicAttributeValue - [27..33)::6 - [@(2+3)]
@@ -84,7 +84,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [48..49)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [48..49)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [49..71)::22 - [ baz='@DateTime.Now@@']
                     MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -92,7 +92,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                     MarkupTextLiteral - [50..53)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[baz];
                     Equals;[=];
-                    MarkupTextLiteral - [54..55)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [54..55)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [55..70)::15
                         MarkupDynamicAttributeValue - [55..68)::13 - [@DateTime.Now]
@@ -112,7 +112,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                                 Transition;[@];
                             MarkupEphemeralTextLiteral - [69..70)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                 Transition;[@];
-                    MarkupTextLiteral - [70..71)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [70..71)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [71..94)::23 - [ bat='@DateTime.Now @@']
                     MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -120,7 +120,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                     MarkupTextLiteral - [72..75)::3 - [bat] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bat];
                     Equals;[=];
-                    MarkupTextLiteral - [76..77)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [76..77)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [77..93)::16
                         MarkupDynamicAttributeValue - [77..90)::13 - [@DateTime.Now]
@@ -141,7 +141,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                                 Transition;[@];
                             MarkupEphemeralTextLiteral - [92..93)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
                                 Transition;[@];
-                    MarkupTextLiteral - [93..94)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [93..94)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [94..116)::22 - [ zoo='@@@DateTime.Now']
                     MarkupTextLiteral - [94..95)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -149,7 +149,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                     MarkupTextLiteral - [95..98)::3 - [zoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[zoo];
                     Equals;[=];
-                    MarkupTextLiteral - [99..100)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [99..100)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [100..115)::15
                         MarkupBlock - [100..102)::2
@@ -171,7 +171,7 @@ RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.No
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [115..116)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [115..116)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [116..117)::1
                     MarkupTextLiteral - [116..117)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
index 731fbdb8e9..9c85cd9623 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..18)::18 - [<span foo='@ @' />]
                     MarkupTextLiteral - [6..9)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[foo];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [11..14)::3
                         MarkupDynamicAttributeValue - [11..12)::1 - [@]
@@ -35,7 +35,7 @@ RazorDocument - [0..18)::18 - [<span foo='@ @' />]
                                             CSharpCodeBlock - [14..14)::0
                                                 CSharpExpressionLiteral - [14..14)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                     Marker;[];
-                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [15..16)::1
                     MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt
index d60cf69092..d82b4f623f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFErrorsWithIncompleteTag.stree.txt
@@ -23,7 +23,7 @@ RazorDocument - [0..14)::14 - [@{<foo bar=baz]
                                         Equals;[=];
                                         GenericBlock - [11..14)::3
                                             MarkupLiteralAttributeValue - [11..14)::3 - [baz]
-                                                MarkupTextLiteral - [11..14)::3 - [baz] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [11..14)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[baz];
                                     CloseAngle;[<Missing>];
                     RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt
index 91b0d16085..ba558cdc92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_Incomplete.stree.txt
@@ -1,7 +1,7 @@
 RazorDocument - [0..13)::13 - [<script type=]
     MarkupBlock - [0..13)::13
         MarkupElement - [0..13)::13
-            MarkupStartTag - [0..13)::13 - [<script type=] - Gen<None> - SpanEditHandler;Accepts:Any
+            MarkupStartTag - [0..13)::13 - [<script type=] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[script];
                 MarkupAttributeBlock - [7..13)::6 - [ type=]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
index 8761033bc1..99335b990d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..53)::53 - [@{<a href="mailto:anurse@microsoft.com">Email me<
                                         MarkupTextLiteral - [5..9)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[href];
                                         Equals;[=];
-                                        MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [11..38)::27
                                             MarkupLiteralAttributeValue - [11..38)::27 - [mailto:anurse@microsoft.com]
                                                 MarkupTextLiteral - [11..38)::27 - [mailto:anurse@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[mailto:anurse@microsoft.com];
-                                        MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [38..39)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupTextLiteral - [40..48)::8 - [Email me] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
index 13dac52374..bd98e054cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..21)::21 - [@{<foo bar="@baz" />}]
                                         MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[bar];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [12..16)::4
                                             MarkupDynamicAttributeValue - [12..16)::4 - [@baz]
@@ -34,7 +34,7 @@ RazorDocument - [0..21)::21 - [@{<foo bar="@baz" />}]
                                                                 CSharpCodeBlock - [13..16)::3
                                                                     CSharpExpressionLiteral - [13..16)::3 - [baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                         Identifier;[baz];
-                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMiscAttributeContent - [17..18)::1
                                         MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
index 7e8026c0f4..57e7823a04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..19)::19 - [<input type='text'>]
                     MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         MarkupLiteralAttributeValue - [13..17)::4 - [text]
                             MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[text];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
index 13abef1f59..86a6919a3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..27)::27 - [<input type='text'></input>]
                     MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         MarkupLiteralAttributeValue - [13..17)::4 - [text]
                             MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[text];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [19..27)::8 - [</input>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
index 8c4fc58380..8ce5207ab4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
@@ -17,12 +17,12 @@ RazorDocument - [0..30)::30 - [<ul bound [item]='items'></ul>]
                         Text;[item];
                         RightBracket;[]];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [18..23)::5
                         CSharpExpressionLiteral - [18..23)::5 - [items] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[items];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [25..30)::5 - [</ul>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
index d42f0e947d..84a9a37563 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
@@ -17,12 +17,12 @@ RazorDocument - [0..32)::32 - [<ul bound [(item)]='items'></ul>]
                         Text;[(item)];
                         RightBracket;[]];
                     Equals;[=];
-                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [20..25)::5
                         CSharpExpressionLiteral - [20..25)::5 - [items] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[items];
-                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [27..32)::5 - [</ul>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
index 417309a6a7..0acd0c5753 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
@@ -15,12 +15,12 @@ RazorDocument - [0..55)::55 - [<button bound (click)='doSomething()'>Click Me</b
                     MarkupTextLiteral - [14..21)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[(click)];
                     Equals;[=];
-                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [23..36)::13
                         CSharpExpressionLiteral - [23..36)::13 - [doSomething()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[doSomething()];
-                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [38..46)::8 - [Click Me] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
index b8664c7daa..d2ab596a3f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
@@ -15,12 +15,12 @@ RazorDocument - [0..56)::56 - [<button bound (^click)='doSomething()'>Click Me</
                     MarkupTextLiteral - [14..22)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[(^click)];
                     Equals;[=];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [24..37)::13
                         CSharpExpressionLiteral - [24..37)::13 - [doSomething()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[doSomething()];
-                    MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [39..47)::8 - [Click Me] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
index b2c2be51a6..2a17b586c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
@@ -15,12 +15,12 @@ RazorDocument - [0..46)::46 - [<template bound *something='value'></template>]
                     MarkupTextLiteral - [16..26)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[*something];
                     Equals;[=];
-                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [28..33)::5
                         MarkupTextLiteral - [28..33)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[value];
-                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [35..46)::11 - [</template>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
index aa7e2fe686..bac65eeedf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
@@ -15,12 +15,12 @@ RazorDocument - [0..32)::32 - [<div bound #local='value'></div>]
                     MarkupTextLiteral - [11..17)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[#local];
                     Equals;[=];
-                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [19..24)::5
                         MarkupTextLiteral - [19..24)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[value];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [26..32)::6 - [</div>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
index 06ae9e6c0d..090e52dcca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..19)::19 - [<input type='text'>]
                     MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         MarkupLiteralAttributeValue - [13..17)::4 - [text]
                             MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[text];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
index 14a832acc5..8bc473614e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..26)::26 - [<input type='text'><input>]
                     MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         MarkupLiteralAttributeValue - [13..17)::4 - [text]
                             MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[text];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
         MarkupTagHelperElement - [19..26)::7 - input[StartTagOnly] - InputTagHelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
index 569dcbeaf8..6937a24def 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..17)::17 - [<myth bound='' />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..13)::0
                         CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [14..15)::1
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
index 073c868ffa..f788e58531 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..17)::17 - [<myth BouND='' />]
                     MarkupTextLiteral - [6..11)::5 - [BouND] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[BouND];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..13)::0
                         CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [14..15)::1
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
index 4a3b4d140a..6b645d8c86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..29)::29 - [<myth BOUND=''    bOUnd="" />]
                     MarkupTextLiteral - [6..11)::5 - [BOUND] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[BOUND];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..13)::0
                         CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [14..26)::12 - bOUnd - DoubleQuotes - Bound - [    bOUnd=""]
                     MarkupTextLiteral - [14..18)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,11 +22,11 @@ RazorDocument - [0..29)::29 - [<myth BOUND=''    bOUnd="" />]
                     MarkupTextLiteral - [18..23)::5 - [bOUnd] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bOUnd];
                     Equals;[=];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [25..25)::0
                         CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [26..27)::1
                     MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
index b7e9a4d5db..a88f2f766b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
@@ -13,17 +13,17 @@ RazorDocument - [0..32)::32 - [<myth BOUND= nAMe='john'></myth>]
                     MarkupTagHelperAttributeValue - [12..12)::0
                         CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                 MarkupTagHelperAttribute - [12..24)::12 - nAMe - SingleQuotes - Bound - [ nAMe='john']
-                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     MarkupTextLiteral - [13..17)::4 - [nAMe] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[nAMe];
                     Equals;[=];
-                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [19..23)::4
                         MarkupTextLiteral - [19..23)::4 - [john] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[john];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [25..32)::7 - [</myth>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
index 8a1c10c10d..a481acc898 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..28)::28 - [<myth bound='    @true  ' />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..24)::11
                         MarkupBlock - [13..22)::9
@@ -28,7 +28,7 @@ RazorDocument - [0..28)::28 - [<myth bound='    @true  ' />]
                                                 Keyword;[true];
                         CSharpExpressionLiteral - [22..24)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[  ];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [25..26)::1
                     MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
index 2a9079aef2..b258c86d31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..30)::30 - [<myth bound='    @(true)  ' />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..26)::13
                         MarkupBlock - [13..24)::11
@@ -32,7 +32,7 @@ RazorDocument - [0..30)::30 - [<myth bound='    @(true)  ' />]
                                                 RightParenthesis;[)];
                         CSharpExpressionLiteral - [24..26)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[  ];
-                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [27..28)::1
                     MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
index 2ee082dd17..062be46ba2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..25)::25 - [<myth bound='    true' />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..21)::8
                         CSharpExpressionLiteral - [13..21)::8 - [    true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[    ];
                             Text;[true];
-                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [22..23)::1
                     MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
index 43d705d118..e0945db0f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..21)::21 - [<myth bound='    ' />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[    ];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [18..19)::1
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
index 710ffe6a91..b1a4d9090c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..27)::27 - [<myth bound=''  bound="" />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..13)::0
                         CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [14..24)::10 - bound - DoubleQuotes - Bound - [  bound=""]
                     MarkupTextLiteral - [14..16)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,11 +22,11 @@ RazorDocument - [0..27)::27 - [<myth bound=''  bound="" />]
                     MarkupTextLiteral - [16..21)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [23..23)::0
                         CSharpExpressionLiteral - [23..23)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [24..25)::1
                     MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
index f7c9bea081..4d4340f5e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..30)::30 - [<myth bound=' '  bound="  " />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..14)::1
                         CSharpExpressionLiteral - [13..14)::1 - [ ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[ ];
-                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [15..27)::12 - bound - DoubleQuotes - Bound - [  bound="  "]
                     MarkupTextLiteral - [15..17)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -23,12 +23,12 @@ RazorDocument - [0..30)::30 - [<myth bound=' '  bound="  " />]
                     MarkupTextLiteral - [17..22)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [24..26)::2
                         CSharpExpressionLiteral - [24..26)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[  ];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [27..28)::1
                     MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
index 5443e52234..cc21cab405 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..29)::29 - [<myth bound='true' bound=  />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         CSharpExpressionLiteral - [13..17)::4 - [true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[true];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [18..25)::7 - bound - DoubleQuotes - Bound - [ bound=]
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -26,7 +26,7 @@ RazorDocument - [0..29)::29 - [<myth bound='true' bound=  />]
                     MarkupTagHelperAttributeValue - [25..25)::0
                         CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                 MarkupMiscAttributeContent - [25..27)::2
-                    MarkupTextLiteral - [25..27)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..27)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[  ];
                 ForwardSlash;[/];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
index 6ad9c9e82a..52b638b1fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
@@ -13,16 +13,16 @@ RazorDocument - [0..23)::23 - [<myth bound= name='' />]
                     MarkupTagHelperAttributeValue - [12..12)::0
                         CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                 MarkupTagHelperAttribute - [12..20)::8 - name - SingleQuotes - Bound - [ name='']
-                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     MarkupTextLiteral - [13..17)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [19..19)::0
                         MarkupTextLiteral - [19..19)::0 - []
-                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [20..21)::1
                     MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
index e62ea27a5e..c05ed296bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
@@ -13,17 +13,17 @@ RazorDocument - [0..25)::25 - [<myth bound= name='  ' />]
                     MarkupTagHelperAttributeValue - [12..12)::0
                         CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                 MarkupTagHelperAttribute - [12..22)::10 - name - SingleQuotes - Bound - [ name='  ']
-                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     MarkupTextLiteral - [13..17)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [19..21)::2
                         MarkupTextLiteral - [19..21)::2 - [  ]
                             Whitespace;[  ];
-                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [22..23)::1
                     MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
index d326cc13d1..a09c2c8a6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..46)::46 - [<myth bound='true' name='john' bound= name= />]
                     MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [13..17)::4
                         CSharpExpressionLiteral - [13..17)::4 - [true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[true];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [18..30)::12 - name - SingleQuotes - Bound - [ name='john']
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -23,12 +23,12 @@ RazorDocument - [0..46)::46 - [<myth bound='true' name='john' bound= name= />]
                     MarkupTextLiteral - [19..23)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [25..29)::4
                         MarkupTextLiteral - [25..29)::4 - [john] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[john];
-                    MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [29..30)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [30..37)::7 - bound - DoubleQuotes - Bound - [ bound=]
                     MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -39,7 +39,7 @@ RazorDocument - [0..46)::46 - [<myth bound='true' name='john' bound= name= />]
                     MarkupTagHelperAttributeValue - [37..37)::0
                         CSharpExpressionLiteral - [37..37)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                 MarkupTagHelperAttribute - [37..43)::6 - name - DoubleQuotes - Bound - [ name=]
-                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     MarkupTextLiteral - [38..42)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
@@ -47,7 +47,7 @@ RazorDocument - [0..46)::46 - [<myth bound='true' name='john' bound= name= />]
                     MarkupTagHelperAttributeValue - [43..43)::0
                         MarkupTextLiteral - [43..43)::0 - []
                 MarkupMiscAttributeContent - [43..44)::1
-                    MarkupTextLiteral - [43..44)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                 ForwardSlash;[/];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
index e3339e0ff6..30883a8889 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..10)::10 - [<p class=']
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..10)::0
                         MarkupTextLiteral - [10..10)::0 - []
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
index a4e330100d..d087307908 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..31)::31 - [<p class=btn" bar="foo"<strong>]
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [btn]
-                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
                 MarkupMiscAttributeContent - [12..31)::19
                     MarkupTextLiteral - [12..31)::19 - [" bar="foo"<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
index 5f4c685132..41740648ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..31)::31 - [<p class="btn bar="foo"<strong>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..18)::8
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
@@ -22,7 +22,7 @@ RazorDocument - [0..31)::31 - [<p class="btn bar="foo"<strong>]
                             MarkupTextLiteral - [14..18)::4 - [bar=] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[bar];
                                 Equals;[=];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMinimizedTagHelperAttribute - [19..23)::4 - foo" - Minimized - Unbound - [foo"]
                     MarkupTextLiteral - [19..23)::4 - [foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
index 5e5f1bf591..86673ee967 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..28)::28 - [<p class="btn bar="foo"></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..18)::8
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
@@ -22,7 +22,7 @@ RazorDocument - [0..28)::28 - [<p class="btn bar="foo"></p>]
                             MarkupTextLiteral - [14..18)::4 - [bar=] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[bar];
                                 Equals;[=];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMinimizedTagHelperAttribute - [19..23)::4 - foo" - Minimized - Unbound - [foo"]
                     MarkupTextLiteral - [19..23)::4 - [foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
index 28fa369031..4c1d57ee6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..15)::15 - [<p class="@do {]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..15)::5
                         MarkupDynamicAttributeValue - [10..15)::5 - [@do {]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
index eccf711a65..9b5e377ceb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..21)::21 - [<p class="@do {"></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..21)::11
                         MarkupDynamicAttributeValue - [10..21)::11 - [@do {"></p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
index 88b1479078..9c170c6493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..38)::38 - [<p class=some=thing attr="@value"></p>]
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..13)::4
                         MarkupLiteralAttributeValue - [9..13)::4 - [some]
-                            MarkupTextLiteral - [9..13)::4 - [some] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..13)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[some];
                 MarkupMiscAttributeContent - [13..33)::20
                     MarkupTextLiteral - [13..26)::13 - [=thing attr="] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
index abf2c1ee61..8112c96e24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..24)::24 - [<p bar="false"" <strong>]
                     MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bar];
                     Equals;[=];
-                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [8..13)::5
                         MarkupLiteralAttributeValue - [8..13)::5 - [false]
                             MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[false];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [14..24)::10
                     MarkupTextLiteral - [14..24)::10 - [" <strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt
index c7ec7c7f17..bd4efb84e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes20.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..43)::43 - [<p attr="@if (true) <p attr='@foo'> }"></p>]
                     MarkupTextLiteral - [3..7)::4 - [attr] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[attr];
                     Equals;[=];
-                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [9..43)::34
                         MarkupDynamicAttributeValue - [9..43)::34 - [@if (true) <p attr='@foo'> }"></p>]
@@ -36,7 +36,7 @@ RazorDocument - [0..43)::43 - [<p attr="@if (true) <p attr='@foo'> }"></p>]
                                                     MarkupTextLiteral - [23..27)::4 - [attr] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         Text;[attr];
                                                     Equals;[=];
-                                                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         SingleQuote;['];
                                                     GenericBlock - [29..33)::4
                                                         MarkupDynamicAttributeValue - [29..33)::4 - [@foo]
@@ -49,7 +49,7 @@ RazorDocument - [0..43)::43 - [<p attr="@if (true) <p attr='@foo'> }"></p>]
                                                                             CSharpCodeBlock - [30..33)::3
                                                                                 CSharpExpressionLiteral - [30..33)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                                                     Identifier;[foo];
-                                                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                         SingleQuote;['];
                                                 CloseAngle;[>];
                                             MarkupTextLiteral - [35..39)::4 - [ }">] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
index 8f2705857a..bffeb23151 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..23)::23 - [<p bar='false  <strong>]
                     MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bar];
                     Equals;[=];
-                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [8..23)::15
                         MarkupLiteralAttributeValue - [8..13)::5 - [false]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
index 27f487ab85..97f1a6c37d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..23)::23 - [<p bar='false  <strong']
                     MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bar];
                     Equals;[=];
-                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [8..22)::14
                         MarkupLiteralAttributeValue - [8..13)::5 - [false]
@@ -22,6 +22,6 @@ RazorDocument - [0..23)::23 - [<p bar='false  <strong']
                             MarkupTextLiteral - [15..22)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 OpenAngle;[<];
                                 Text;[strong];
-                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
index 2b87ff47b3..34c09fd634 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..13)::13 - [<p bar=false']
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [7..12)::5
                         MarkupLiteralAttributeValue - [7..12)::5 - [false]
-                            MarkupTextLiteral - [7..12)::5 - [false] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [7..12)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[false];
                 MarkupMiscAttributeContent - [12..13)::1
                     MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
index be1e33691a..7a60f595a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..14)::14 - [<p bar="false']
                     MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bar];
                     Equals;[=];
-                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [8..14)::6
                         MarkupLiteralAttributeValue - [8..14)::6 - [false']
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
index 75e49cc462..d5351a5631 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..20)::20 - [<p bar="false' ></p>]
                     MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bar];
                     Equals;[=];
-                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [8..20)::12
                         MarkupLiteralAttributeValue - [8..14)::6 - [false']
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
index 19770a0945..2e609ba6aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..25)::25 - [<p class=btn" bar<strong>]
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [btn]
-                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
                 MarkupMiscAttributeContent - [12..25)::13
                     MarkupTextLiteral - [12..25)::13 - [" bar<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
index e6dd180a67..1afdbe7e75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..19)::19 - [<person age="12" />]
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..15)::2
                         CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[12];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [16..17)::1
                     MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
index 1ae7742122..dbc9614a21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..15)::2
                         CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[12];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
                     MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -23,12 +23,12 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@
                     MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[birthday];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..39)::12
                         CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[DateTime.Now];
-                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [40..70)::30 - name - DoubleQuotes - Bound - [ name="@@BoundStringAttribute"]
                     MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,7 +36,7 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@
                     MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [47..69)::22
                         MarkupBlock - [47..49)::2
@@ -46,7 +46,7 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@
                                 Transition;[@];
                         MarkupTextLiteral - [49..69)::20 - [BoundStringAttribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[BoundStringAttribute];
-                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [70..71)::1
                     MarkupTextLiteral - [70..71)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
index cff16eb252..b4d98fbb97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" n
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..22)::9
                         MarkupBlock - [13..15)::2
@@ -37,7 +37,7 @@ RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" n
                                                 IntegerLiteral;[1];
                                             CSharpExpressionLiteral - [21..22)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                                                 RightParenthesis;[)];
-                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [23..47)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
                     MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -45,12 +45,12 @@ RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" n
                     MarkupTextLiteral - [24..32)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[birthday];
                     Equals;[=];
-                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [34..46)::12
                         CSharpExpressionLiteral - [34..46)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[DateTime.Now];
-                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [47..74)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
                     MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -58,7 +58,7 @@ RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" n
                     MarkupTextLiteral - [48..52)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [53..54)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [53..54)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [54..73)::19
                         MarkupTextLiteral - [54..59)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -76,7 +76,7 @@ RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" n
                                                 Identifier;[DateTime];
                                                 Dot;[.];
                                                 Identifier;[Now];
-                    MarkupTextLiteral - [73..74)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [73..74)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [74..75)::1
                     MarkupTextLiteral - [74..75)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt
index 58fba8ce3f..a8c15d092b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes12.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..39)::39 - [<person age="@{flag == 0 ? 11 : 12}" />]
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..35)::22
                         MarkupBlock - [13..35)::22
@@ -38,7 +38,7 @@ RazorDocument - [0..39)::39 - [<person age="@{flag == 0 ? 11 : 12}" />]
                                                 IntegerLiteral;[12];
                                         RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
                                             RightBrace;[}];
-                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [36..37)::1
                     MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
index 3a4eb926df..0af2d73896 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..34)::34 - [<person birthday="DateTime.Now" />]
                     MarkupTextLiteral - [8..16)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[birthday];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..30)::12
                         CSharpExpressionLiteral - [18..30)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[DateTime.Now];
-                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [31..32)::1
                     MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
index 36d6def7eb..517ad1d2d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..35)::35 - [<person age="@DateTime.Now.Year" />]
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..31)::18
                         MarkupBlock - [13..31)::18
@@ -26,7 +26,7 @@ RazorDocument - [0..35)::35 - [<person age="@DateTime.Now.Year" />]
                                                 Identifier;[Now];
                                                 Dot;[.];
                                                 Identifier;[Year];
-                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [32..33)::1
                     MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
index 2514097fc9..5322ea7a7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..36)::36 - [<person age=" @DateTime.Now.Year" />]
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..32)::19
                         MarkupBlock - [13..32)::19
@@ -30,7 +30,7 @@ RazorDocument - [0..36)::36 - [<person age=" @DateTime.Now.Year" />]
                                                 Identifier;[Now];
                                                 Dot;[.];
                                                 Identifier;[Year];
-                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [33..34)::1
                     MarkupTextLiteral - [33..34)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
index b7c33d5ee7..cf0a4ec787 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..22)::22 - [<person name="John" />]
                     MarkupTextLiteral - [8..12)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [14..18)::4
                         MarkupTextLiteral - [14..18)::4 - [John] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[John];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [19..20)::1
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
index 40f512e21a..21e1af2a92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..37)::37 - [<person name="Time: @DateTime.Now" />]
                     MarkupTextLiteral - [8..12)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [14..33)::19
                         MarkupTextLiteral - [14..19)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -28,7 +28,7 @@ RazorDocument - [0..37)::37 - [<person name="Time: @DateTime.Now" />]
                                                 Identifier;[DateTime];
                                                 Dot;[.];
                                                 Identifier;[Now];
-                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [34..35)::1
                     MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
index ffb468a4a3..9d01bdafaa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..27)::14
                         CSharpExpressionLiteral - [13..14)::1 - [1] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
@@ -37,7 +37,7 @@ RazorDocument - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag
                         CSharpExpressionLiteral - [25..27)::2 - [ 2] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Whitespace;[ ];
                             Text;[2];
-                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [28..86)::58 - birthday - SingleQuotes - Bound - [ birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now']
                     MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -45,7 +45,7 @@ RazorDocument - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag
                     MarkupTextLiteral - [29..37)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[birthday];
                     Equals;[=];
-                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [39..85)::46
                         CSharpExpressionLiteral - [39..45)::6 - [(bool)] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
@@ -93,7 +93,7 @@ RazorDocument - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag
                                                 Identifier;[DateTime];
                                                 Dot;[.];
                                                 Identifier;[Now];
-                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 ForwardSlash;[/];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
index 400226b998..9f5cd21e9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Ti
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..15)::2
                         CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[12];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
                     MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -23,12 +23,12 @@ RazorDocument - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Ti
                     MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[birthday];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..39)::12
                         CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[DateTime.Now];
-                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [40..67)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
                     MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,7 +36,7 @@ RazorDocument - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Ti
                     MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [47..66)::19
                         MarkupTextLiteral - [47..52)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -54,7 +54,7 @@ RazorDocument - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Ti
                                                 Identifier;[DateTime];
                                                 Dot;[.];
                                                 Identifier;[Now];
-                    MarkupTextLiteral - [66..67)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [66..67)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [67..68)::1
                     MarkupTextLiteral - [67..68)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
index a6361b8d0b..5bbee23170 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Ti
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..15)::2
                         CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[12];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
                     MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -23,12 +23,12 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Ti
                     MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[birthday];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..39)::12
                         CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[DateTime.Now];
-                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [40..70)::30 - name - DoubleQuotes - Bound - [ name="Time: @@ @DateTime.Now"]
                     MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,7 +36,7 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Ti
                     MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[name];
                     Equals;[=];
-                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [47..69)::22
                         MarkupTextLiteral - [47..52)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -60,7 +60,7 @@ RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Ti
                                                 Identifier;[DateTime];
                                                 Dot;[.];
                                                 Identifier;[Now];
-                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [70..71)::1
                     MarkupTextLiteral - [70..71)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt
index 65d96f9566..9118b9908d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/Rewrites_ComponentDirectiveAttributes.stree.txt
@@ -12,12 +12,12 @@ RazorDocument - [0..60)::60 - [<input @bind-value="Message" @bind-value:event="o
                     MarkupTextLiteral - [8..18)::10 - [bind-value]
                         Text;[bind-value];
                     Equals;[=];
-                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [20..27)::7
                         CSharpExpressionLiteral - [20..27)::7 - [Message] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[Message];
-                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperDirectiveAttribute - [28..57)::29
                     MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -31,12 +31,12 @@ RazorDocument - [0..60)::60 - [<input @bind-value="Message" @bind-value:event="o
                     MarkupTextLiteral - [41..46)::5 - [event]
                         Text;[event];
                     Equals;[=];
-                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [48..56)::8
                         MarkupTextLiteral - [48..56)::8 - [onchange] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[onchange];
-                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [57..58)::1
                     MarkupTextLiteral - [57..58)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
index cf46a0834f..857397eb39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..19)::19 - [< class="foo" <p />]
                     MarkupTextLiteral - [2..7)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [8..9)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
                             MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [13..14)::1
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
index 2ed0823d1f..3bd2c13667 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..73)::73 - [<p class=foo dynamic=@DateTime.Now style=color:re
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
-                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
                 MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -41,7 +41,7 @@ RazorDocument - [0..73)::73 - [<p class=foo dynamic=@DateTime.Now style=color:re
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [41..51)::10
                         MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
-                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
                 CloseAngle;[>];
             MarkupTagHelperElement - [52..60)::8 - strong[StartTagAndEndTag] - strongtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
index acba7a8979..1b2046e56b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..52)::52 - [<p class="foo">Hello <p style="color:red;">World<
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [15..21)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -32,13 +32,13 @@ RazorDocument - [0..52)::52 - [<p class="foo">Hello <p style="color:red;">World<
                         MarkupTextLiteral - [24..29)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[style];
                         Equals;[=];
-                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [31..41)::10
                             MarkupLiteralAttributeValue - [31..41)::10 - [color:red;]
                                 MarkupTextLiteral - [31..41)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[color:red;];
-                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupTextLiteral - [43..48)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
index 62a46d7e1b..219e227fc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..51)::51 - [<p class="@DateTime.Now" style='@DateTime.Now'></
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..23)::13
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..51)::51 - [<p class="@DateTime.Now" style='@DateTime.Now'></
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
                     MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,7 +33,7 @@ RazorDocument - [0..51)::51 - [<p class="@DateTime.Now" style='@DateTime.Now'></
                     MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [32..45)::13
                         MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
@@ -48,7 +48,7 @@ RazorDocument - [0..51)::51 - [<p class="@DateTime.Now" style='@DateTime.Now'></
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [47..51)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
index 3ebf48a454..f64298d554 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..153)::153 - [<p class="@do { var foo = bar; <text>Foo</text>
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..74)::64
                         MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
@@ -62,7 +62,7 @@ RazorDocument - [0..153)::153 - [<p class="@do { var foo = bar; <text>Foo</text>
                                         GreaterThan;[>];
                                         RightParenthesis;[)];
                                         Semicolon;[;];
-                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [75..148)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
                     MarkupTextLiteral - [75..76)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -70,7 +70,7 @@ RazorDocument - [0..153)::153 - [<p class="@do { var foo = bar; <text>Foo</text>
                     MarkupTextLiteral - [76..81)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [83..147)::64
                         MarkupDynamicAttributeValue - [83..147)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
@@ -122,7 +122,7 @@ RazorDocument - [0..153)::153 - [<p class="@do { var foo = bar; <text>Foo</text>
                                         GreaterThan;[>];
                                         RightParenthesis;[)];
                                         Semicolon;[;];
-                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [149..153)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
index 9ea39a5bf5..3920141b9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..62)::62 - [<p class="@DateTime.Now" style='@DateTime.Now'>He
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..23)::13
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..62)::62 - [<p class="@DateTime.Now" style='@DateTime.Now'>He
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
                     MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,7 +33,7 @@ RazorDocument - [0..62)::62 - [<p class="@DateTime.Now" style='@DateTime.Now'>He
                     MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [32..45)::13
                         MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
@@ -48,7 +48,7 @@ RazorDocument - [0..62)::62 - [<p class="@DateTime.Now" style='@DateTime.Now'>He
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [47..58)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
index ccd70b5787..50fdae1085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..164)::164 - [<p class="@do { var foo = bar; <text>Foo</text>
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..74)::64
                         MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
@@ -62,7 +62,7 @@ RazorDocument - [0..164)::164 - [<p class="@do { var foo = bar; <text>Foo</text>
                                         GreaterThan;[>];
                                         RightParenthesis;[)];
                                         Semicolon;[;];
-                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [75..148)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
                     MarkupTextLiteral - [75..76)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -70,7 +70,7 @@ RazorDocument - [0..164)::164 - [<p class="@do { var foo = bar; <text>Foo</text>
                     MarkupTextLiteral - [76..81)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [83..147)::64
                         MarkupDynamicAttributeValue - [83..147)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
@@ -122,7 +122,7 @@ RazorDocument - [0..164)::164 - [<p class="@do { var foo = bar; <text>Foo</text>
                                         GreaterThan;[>];
                                         RightParenthesis;[)];
                                         Semicolon;[;];
-                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [149..160)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
index 80c82a5ec0..5199be1c54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..69)::69 - [<p class="@DateTime.Now">Hello</p> <p style='@Dat
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..23)::13
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..69)::69 - [<p class="@DateTime.Now">Hello</p> <p style='@Dat
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [25..30)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -47,7 +47,7 @@ RazorDocument - [0..69)::69 - [<p class="@DateTime.Now">Hello</p> <p style='@Dat
                     MarkupTextLiteral - [38..43)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [44..45)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [44..45)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [45..58)::13
                         MarkupDynamicAttributeValue - [45..58)::13 - [@DateTime.Now]
@@ -62,7 +62,7 @@ RazorDocument - [0..69)::69 - [<p class="@DateTime.Now">Hello</p> <p style='@Dat
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [58..59)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [58..59)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [60..65)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
index b3c3b71e1c..6109fde080 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..171)::171 - [<p class="@do { var foo = bar; <text>Foo</text>
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..74)::64
                         MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
@@ -62,7 +62,7 @@ RazorDocument - [0..171)::171 - [<p class="@do { var foo = bar; <text>Foo</text>
                                         GreaterThan;[>];
                                         RightParenthesis;[)];
                                         Semicolon;[;];
-                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [76..81)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -84,7 +84,7 @@ RazorDocument - [0..171)::171 - [<p class="@do { var foo = bar; <text>Foo</text>
                     MarkupTextLiteral - [89..94)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [95..96)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [95..96)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [96..160)::64
                         MarkupDynamicAttributeValue - [96..160)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
@@ -136,7 +136,7 @@ RazorDocument - [0..171)::171 - [<p class="@do { var foo = bar; <text>Foo</text>
                                         GreaterThan;[>];
                                         RightParenthesis;[)];
                                         Semicolon;[;];
-                    MarkupTextLiteral - [160..161)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [160..161)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [162..167)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
index a40af76de2..2fb28c3926 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..23)::13
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
                     MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,7 +33,7 @@ RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>
                     MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [32..45)::13
                         MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
@@ -48,7 +48,7 @@ RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [47..59)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -66,7 +66,7 @@ RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>
                         MarkupTextLiteral - [67..72)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [73..74)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [73..74)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         GenericBlock - [74..87)::13
                             MarkupDynamicAttributeValue - [74..87)::13 - [@DateTime.Now]
@@ -81,7 +81,7 @@ RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>
                                                         Identifier;[DateTime];
                                                         Dot;[.];
                                                         Identifier;[Now];
-                        MarkupTextLiteral - [87..88)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [87..88)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupTextLiteral - [89..109)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
index b48530199c..0b1d263b98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..66)::66 - [<p      class="     foo"    style="   color :  re
                     MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [15..23)::8
                         MarkupLiteralAttributeValue - [15..23)::8 - [     foo]
@@ -18,7 +18,7 @@ RazorDocument - [0..66)::66 - [<p      class="     foo"    style="   color :  re
                                 Whitespace;[     ];
                             MarkupTextLiteral - [20..23)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [24..57)::33 - style - DoubleQuotes - Unbound - [    style="   color :  red  ;   "]
                     MarkupTextLiteral - [24..28)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -26,7 +26,7 @@ RazorDocument - [0..66)::66 - [<p      class="     foo"    style="   color :  re
                     MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [35..56)::21
                         MarkupLiteralAttributeValue - [35..43)::8 - [   color]
@@ -52,7 +52,7 @@ RazorDocument - [0..66)::66 - [<p      class="     foo"    style="   color :  re
                         MarkupLiteralAttributeValue - [53..56)::3 - [   ]
                             MarkupTextLiteral - [53..56)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Whitespace;[   ];
-                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [57..61)::4
                     MarkupTextLiteral - [57..61)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
index 1747206b92..002409e66b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..77)::77 - [<p      class="     foo"    style="   color :  re
                     MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [15..23)::8
                         MarkupLiteralAttributeValue - [15..23)::8 - [     foo]
@@ -18,7 +18,7 @@ RazorDocument - [0..77)::77 - [<p      class="     foo"    style="   color :  re
                                 Whitespace;[     ];
                             MarkupTextLiteral - [20..23)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [24..57)::33 - style - DoubleQuotes - Unbound - [    style="   color :  red  ;   "]
                     MarkupTextLiteral - [24..28)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -26,7 +26,7 @@ RazorDocument - [0..77)::77 - [<p      class="     foo"    style="   color :  re
                     MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [35..56)::21
                         MarkupLiteralAttributeValue - [35..43)::8 - [   color]
@@ -52,7 +52,7 @@ RazorDocument - [0..77)::77 - [<p      class="     foo"    style="   color :  re
                         MarkupLiteralAttributeValue - [53..56)::3 - [   ]
                             MarkupTextLiteral - [53..56)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Whitespace;[   ];
-                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [57..61)::4
                     MarkupTextLiteral - [57..61)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
index 17887106ad..82112b38b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..73)::73 - [<p     class="   foo  " >Hello</p> <p    style="
                     MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [14..22)::8
                         MarkupLiteralAttributeValue - [14..20)::6 - [   foo]
@@ -21,7 +21,7 @@ RazorDocument - [0..73)::73 - [<p     class="   foo  " >Hello</p> <p    style="
                         MarkupLiteralAttributeValue - [20..22)::2 - [  ]
                             MarkupTextLiteral - [20..22)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Whitespace;[  ];
-                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [23..24)::1
                     MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -46,7 +46,7 @@ RazorDocument - [0..73)::73 - [<p     class="   foo  " >Hello</p> <p    style="
                     MarkupTextLiteral - [41..46)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [48..61)::13
                         MarkupLiteralAttributeValue - [48..60)::12 - [  color:red;]
@@ -57,7 +57,7 @@ RazorDocument - [0..73)::73 - [<p     class="   foo  " >Hello</p> <p    style="
                         MarkupLiteralAttributeValue - [60..61)::1 - [ ]
                             MarkupTextLiteral - [60..61)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Whitespace;[ ];
-                    MarkupTextLiteral - [61..62)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [61..62)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [62..63)::1
                     MarkupTextLiteral - [62..63)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
index 3e88278df7..8a9c34d8bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..41)::41 - [<script class="foo" style="color:red;" />]
                     MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [15..18)::3
                         MarkupLiteralAttributeValue - [15..18)::3 - [foo]
                             MarkupTextLiteral - [15..18)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [19..38)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..41)::41 - [<script class="foo" style="color:red;" />]
                     MarkupTextLiteral - [20..25)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..37)::10
                         MarkupLiteralAttributeValue - [27..37)::10 - [color:red;]
                             MarkupTextLiteral - [27..37)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [38..39)::1
                     MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
index ce47809446..5357d27b46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
@@ -18,13 +18,13 @@ RazorDocument - [0..67)::67 - [<p>Hello <script class="foo" style="color:red;"><
                         MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [24..27)::3
                             MarkupLiteralAttributeValue - [24..27)::3 - [foo]
                                 MarkupTextLiteral - [24..27)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[foo];
-                        MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [27..28)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     MarkupTagHelperAttribute - [28..47)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                         MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -32,13 +32,13 @@ RazorDocument - [0..67)::67 - [<p>Hello <script class="foo" style="color:red;"><
                         MarkupTextLiteral - [29..34)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[style];
                         Equals;[=];
-                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [36..46)::10
                             MarkupLiteralAttributeValue - [36..46)::10 - [color:red;]
                                 MarkupTextLiteral - [36..46)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[color:red;];
-                        MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [46..47)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupTagHelperEndTag - [48..57)::9 - [</script>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
index 81f89f3081..e6e4a4c0ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
@@ -18,7 +18,7 @@ RazorDocument - [0..77)::77 - [<p>Hello <script class="@@foo@bar.com" style="col
                         MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [24..37)::13
                             MarkupBlock - [24..26)::2
@@ -29,7 +29,7 @@ RazorDocument - [0..77)::77 - [<p>Hello <script class="@@foo@bar.com" style="col
                             MarkupLiteralAttributeValue - [26..37)::11 - [foo@bar.com]
                                 MarkupTextLiteral - [26..37)::11 - [foo@bar.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[foo@bar.com];
-                        MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [37..38)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     MarkupTagHelperAttribute - [38..57)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                         MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -37,13 +37,13 @@ RazorDocument - [0..77)::77 - [<p>Hello <script class="@@foo@bar.com" style="col
                         MarkupTextLiteral - [39..44)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[style];
                         Equals;[=];
-                        MarkupTextLiteral - [45..46)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [45..46)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [46..56)::10
                             MarkupLiteralAttributeValue - [46..56)::10 - [color:red;]
                                 MarkupTextLiteral - [46..56)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[color:red;];
-                        MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [56..57)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupTagHelperEndTag - [58..67)::9 - [</script>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
index cdd8993f77..8c00dcb65d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..36)::36 - [<p class="foo" style="color:red;" />]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..36)::36 - [<p class="foo" style="color:red;" />]
                     MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [22..32)::10
                         MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
                             MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [33..34)::1
                     MarkupTextLiteral - [33..34)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
index 1b96cc1caa..ed266cc908 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
@@ -18,13 +18,13 @@ RazorDocument - [0..55)::55 - [<p>Hello <p class="foo" style="color:red;" /> Wor
                         MarkupTextLiteral - [12..17)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [19..22)::3
                             MarkupLiteralAttributeValue - [19..22)::3 - [foo]
                                 MarkupTextLiteral - [19..22)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[foo];
-                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     MarkupTagHelperAttribute - [23..42)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                         MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -32,13 +32,13 @@ RazorDocument - [0..55)::55 - [<p>Hello <p class="foo" style="color:red;" /> Wor
                         MarkupTextLiteral - [24..29)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[style];
                         Equals;[=];
-                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [31..41)::10
                             MarkupLiteralAttributeValue - [31..41)::10 - [color:red;]
                                 MarkupTextLiteral - [31..41)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[color:red;];
-                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     MarkupMiscAttributeContent - [42..43)::1
                         MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
index f2e68f8dfa..af795e12c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
@@ -12,13 +12,13 @@ RazorDocument - [0..52)::52 - [Hello<p class="foo" /> <p style="color:red;" />Wo
                     MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [15..18)::3
                         MarkupLiteralAttributeValue - [15..18)::3 - [foo]
                             MarkupTextLiteral - [15..18)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [19..20)::1
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -37,13 +37,13 @@ RazorDocument - [0..52)::52 - [Hello<p class="foo" /> <p style="color:red;" />Wo
                     MarkupTextLiteral - [26..31)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [33..43)::10
                         MarkupLiteralAttributeValue - [33..43)::10 - [color:red;]
                             MarkupTextLiteral - [33..43)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [43..44)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [43..44)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [44..45)::1
                     MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
index 1f1c00012e..29e97ff837 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..38)::38 - [<p class="foo" style="color:red;"></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..38)::38 - [<p class="foo" style="color:red;"></p>]
                     MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [22..32)::10
                         MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
                             MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [34..38)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
index bed786ce0b..9a4a238ea7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..49)::49 - [<p class="foo" style="color:red;">Hello World</p>
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..49)::49 - [<p class="foo" style="color:red;">Hello World</p>
                     MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [22..32)::10
                         MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
                             MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [34..45)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
index 3366d7ed09..ddb55a3923 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..56)::56 - [<p class="foo">Hello</p> <p style="color:red;">Wo
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [15..20)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -38,13 +38,13 @@ RazorDocument - [0..56)::56 - [<p class="foo">Hello</p> <p style="color:red;">Wo
                     MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [35..45)::10
                         MarkupLiteralAttributeValue - [35..45)::10 - [color:red;]
                             MarkupTextLiteral - [35..45)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [45..46)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [45..46)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [47..52)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
index e3e248f40b..591365bb3e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..99)::99 - [<p class="foo" style="color:red;">Hello World <st
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..99)::99 - [<p class="foo" style="color:red;">Hello World <st
                     MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [22..32)::10
                         MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
                             MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
-                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [34..46)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -48,13 +48,13 @@ RazorDocument - [0..99)::99 - [<p class="foo" style="color:red;">Hello World <st
                         MarkupTextLiteral - [54..59)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [60..61)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [60..61)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         GenericBlock - [61..64)::3
                             MarkupLiteralAttributeValue - [61..64)::3 - [foo]
                                 MarkupTextLiteral - [61..64)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[foo];
-                        MarkupTextLiteral - [64..65)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [64..65)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupTextLiteral - [66..86)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
index dc9e705e9f..2ce0880bef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..56)::56 - [<p class=foo dynamic=@DateTime.Now style=color:re
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
-                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
                 MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -41,7 +41,7 @@ RazorDocument - [0..56)::56 - [<p class=foo dynamic=@DateTime.Now style=color:re
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [41..51)::10
                         MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
-                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [52..56)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
index f609519290..e60c28b9dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..67)::67 - [<p class=foo dynamic=@DateTime.Now style=color:re
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
-                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
                 MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -41,7 +41,7 @@ RazorDocument - [0..67)::67 - [<p class=foo dynamic=@DateTime.Now style=color:re
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [41..51)::10
                         MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
-                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
                 CloseAngle;[>];
             MarkupTextLiteral - [52..63)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
index 725028c4d2..613e9fd565 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..69)::69 - [<p class=foo dynamic=@DateTime.Now style=color@@:
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
-                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
                 MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -41,7 +41,7 @@ RazorDocument - [0..69)::69 - [<p class=foo dynamic=@DateTime.Now style=color@@:
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [41..53)::12
                         MarkupLiteralAttributeValue - [41..46)::5 - [color]
-                            MarkupTextLiteral - [41..46)::5 - [color] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..46)::5 - [color] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color];
                         MarkupBlock - [46..48)::2
                             MarkupTextLiteral - [46..47)::1 - [@] - Gen<LitAttr:@(46:0,46)> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
index 8ff07ec1ed..146dc1b816 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..96)::96 - [<p class=foo dynamic=@DateTime.Now>Hello</p> <p s
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
-                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
                 MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -55,7 +55,7 @@ RazorDocument - [0..96)::96 - [<p class=foo dynamic=@DateTime.Now>Hello</p> <p s
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [54..64)::10
                         MarkupLiteralAttributeValue - [54..64)::10 - [color:red;]
-                            MarkupTextLiteral - [54..64)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [54..64)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
                 MarkupTagHelperAttribute - [64..86)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
index 4c8ad505c1..a84353c61f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
@@ -12,7 +12,7 @@ RazorDocument - [0..117)::117 - [<p class=foo dynamic=@DateTime.Now style=color:
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [9..12)::3
                         MarkupLiteralAttributeValue - [9..12)::3 - [foo]
-                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
                 MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -41,7 +41,7 @@ RazorDocument - [0..117)::117 - [<p class=foo dynamic=@DateTime.Now style=color:
                     Equals;[=];
                     MarkupTagHelperAttributeValue - [41..51)::10
                         MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
-                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[color:red;];
                 CloseAngle;[>];
             MarkupTextLiteral - [52..64)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -59,13 +59,13 @@ RazorDocument - [0..117)::117 - [<p class=foo dynamic=@DateTime.Now style=color:
                         MarkupTextLiteral - [72..77)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [78..79)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [78..79)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         GenericBlock - [79..82)::3
                             MarkupLiteralAttributeValue - [79..82)::3 - [foo]
                                 MarkupTextLiteral - [79..82)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[foo];
-                        MarkupTextLiteral - [82..83)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [82..83)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupTextLiteral - [84..104)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
index 8d78aa6741..812b156152 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..16)::16 - [<p class=""></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..10)::0
                         MarkupTextLiteral - [10..10)::0 - []
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [12..16)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
index 4c062cddf9..1ffbad01be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..16)::16 - [<p class=''></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..10)::0
                         MarkupTextLiteral - [10..10)::0 - []
-                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [12..16)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
index b82bd69b7d..bf92b6fffc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
@@ -1,7 +1,7 @@
 RazorDocument - [0..14)::14 - [<p class=></p>]
     MarkupBlock - [0..14)::14
         MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - ptaghelper
-            MarkupTagHelperStartTag - [0..10)::10 - [<p class=>] - Gen<None> - SpanEditHandler;Accepts:Any
+            MarkupTagHelperStartTag - [0..10)::10 - [<p class=>] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[p];
                 MarkupTagHelperAttribute - [2..9)::7 - class - DoubleQuotes - Unbound - [ class=]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
index cf02383422..6986ffec04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..33)::33 - [<p class1='' class2= class3="" />]
                     MarkupTextLiteral - [3..9)::6 - [class1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class1];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [11..11)::0
                         MarkupTextLiteral - [11..11)::0 - []
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [12..20)::8 - class2 - DoubleQuotes - Unbound - [ class2=]
                     MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -25,16 +25,16 @@ RazorDocument - [0..33)::33 - [<p class1='' class2= class3="" />]
                     MarkupTagHelperAttributeValue - [20..20)::0
                         MarkupTextLiteral - [20..20)::0 - []
                 MarkupTagHelperAttribute - [20..30)::10 - class3 - DoubleQuotes - Unbound - [ class3=""]
-                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     MarkupTextLiteral - [21..27)::6 - [class3] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class3];
                     Equals;[=];
-                    MarkupTextLiteral - [28..29)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [28..29)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [29..29)::0
                         MarkupTextLiteral - [29..29)::0 - []
-                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [30..31)::1
                     MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
index 768a93f630..eb17396a39 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
@@ -10,21 +10,21 @@ RazorDocument - [0..31)::31 - [<p class1=''class2=""class3= />]
                     MarkupTextLiteral - [3..9)::6 - [class1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class1];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [11..11)::0
                         MarkupTextLiteral - [11..11)::0 - []
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupTagHelperAttribute - [12..21)::9 - class2 - DoubleQuotes - Unbound - [class2=""]
                     MarkupTextLiteral - [12..18)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class2];
                     Equals;[=];
-                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [20..20)::0
                         MarkupTextLiteral - [20..20)::0 - []
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [21..28)::7 - class3 - DoubleQuotes - Unbound - [class3=]
                     MarkupTextLiteral - [21..27)::6 - [class3] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,7 +33,7 @@ RazorDocument - [0..31)::31 - [<p class1=''class2=""class3= />]
                     MarkupTagHelperAttributeValue - [28..28)::0
                         MarkupTextLiteral - [28..28)::0 - []
                 MarkupMiscAttributeContent - [28..29)::1
-                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                 ForwardSlash;[/];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
index fe5d6fd5f8..3635da96eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
@@ -21,11 +21,11 @@ RazorDocument - [0..32)::32 - [@{<input int-prefix-value='' />}]
                                         MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[int-prefix-value];
                                         Equals;[=];
-                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [27..27)::0
                                             CSharpExpressionLiteral - [27..27)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [28..29)::1
                                         MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
index b280afb3c6..8695b4af8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
@@ -21,11 +21,11 @@ RazorDocument - [0..34)::34 - [@{<input string-prefix-value=''/>}]
                                         MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[string-prefix-value];
                                         Equals;[=];
-                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [30..30)::0
                                             MarkupTextLiteral - [30..30)::0 - []
-                                        MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [30..31)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     ForwardSlash;[/];
                                     CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
index 96c8c36003..e9db26a2d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
@@ -21,12 +21,12 @@ RazorDocument - [0..32)::32 - [@{<input int-prefix-value='3'/>}]
                                         MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[int-prefix-value];
                                         Equals;[=];
-                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [27..28)::1
                                             CSharpExpressionLiteral - [27..28)::1 - [3] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                                                 Text;[3];
-                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     ForwardSlash;[/];
                                     CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
index 98d61ab15a..4a4dac9f5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..46)::46 - [@{<input string-prefix-value='some string' />}]
                                         MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[string-prefix-value];
                                         Equals;[=];
-                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [30..41)::11
                                             MarkupTextLiteral - [30..34)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -29,7 +29,7 @@ RazorDocument - [0..46)::46 - [@{<input string-prefix-value='some string' />}]
                                             MarkupTextLiteral - [34..41)::7 - [ string] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                 Whitespace;[ ];
                                                 Text;[string];
-                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [42..43)::1
                                         MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
index 7664ec06e2..0346338d31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..41)::41 - [@{<input unbound-required class='btn' />}]
                                         MarkupTextLiteral - [26..31)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [32..33)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [32..33)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [33..36)::3
                                             MarkupLiteralAttributeValue - [33..36)::3 - [btn]
                                                 MarkupTextLiteral - [33..36)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [37..38)::1
                                         MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
index 25bcd111d6..5b700f8c43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..35)::35 - [@{<p bound-string class='btn'></p>}]
                                         MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [25..28)::3
                                             MarkupLiteralAttributeValue - [25..28)::3 - [btn]
                                                 MarkupTextLiteral - [25..28)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     CloseAngle;[>];
                                 MarkupTagHelperEndTag - [30..34)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
index f57f78fc06..7efcc5f43d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..41)::41 - [@{<input class='btn' unbound-required />}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [20..37)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
                                         MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
index 4e5dc02713..2a6b8a96b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..35)::35 - [@{<p class='btn' bound-string></p>}]
                                         MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [12..15)::3
                                             MarkupLiteralAttributeValue - [12..15)::3 - [btn]
                                                 MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [16..29)::13 - bound-string - Minimized - Bound - [ bound-string]
                                         MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
index 9f5ca01f01..df1c7887d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..46)::46 - [@{<input bound-required-string class='btn' />}]
                                         MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [38..41)::3
                                             MarkupLiteralAttributeValue - [38..41)::3 - [btn]
                                                 MarkupTextLiteral - [38..41)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [42..43)::1
                                         MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
index 5ac62870b1..353f33a5d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..46)::46 - [@{<input class='btn' bound-required-string />}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [20..42)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
                                         MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
index 304bc83217..ed760371aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..43)::43 - [@{<input bound-required-int class='btn' />}]
                                         MarkupTextLiteral - [28..33)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [34..35)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [35..38)::3
                                             MarkupLiteralAttributeValue - [35..38)::3 - [btn]
                                                 MarkupTextLiteral - [35..38)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [38..39)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMiscAttributeContent - [39..40)::1
                                         MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
index 21c03176d4..374822bdae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
@@ -26,13 +26,13 @@ RazorDocument - [0..32)::32 - [@{<p bound-int class='btn'></p>}]
                                         MarkupTextLiteral - [15..20)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [22..25)::3
                                             MarkupLiteralAttributeValue - [22..25)::3 - [btn]
                                                 MarkupTextLiteral - [22..25)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     CloseAngle;[>];
                                 MarkupTagHelperEndTag - [27..31)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
index 6927648f4b..e5f59f4fa6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..43)::43 - [@{<input class='btn' bound-required-int />}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [20..39)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
                                         MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
index a42df8f2d6..b040d3d84b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
@@ -21,13 +21,13 @@ RazorDocument - [0..32)::32 - [@{<p class='btn' bound-int></p>}]
                                         MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [12..15)::3
                                             MarkupLiteralAttributeValue - [12..15)::3 - [btn]
                                                 MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [16..26)::10 - bound-int - Minimized - Bound - [ bound-int]
                                         MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
index 82d4899171..0737c3c3d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..57)::57 - [@{<input class='@DateTime.Now + 1' bound-required
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [16..33)::17
                                             MarkupDynamicAttributeValue - [16..29)::13 - [@DateTime.Now]
@@ -46,7 +46,7 @@ RazorDocument - [0..57)::57 - [@{<input class='@DateTime.Now + 1' bound-required
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [32..33)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[1];
-                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [34..53)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
                                         MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
index d44ffc1fa8..1b52e27608 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
@@ -21,7 +21,7 @@ RazorDocument - [0..46)::46 - [@{<p class='@DateTime.Now + 1' bound-int></p>}]
                                         MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [12..29)::17
                                             MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
@@ -46,7 +46,7 @@ RazorDocument - [0..46)::46 - [@{<p class='@DateTime.Now + 1' bound-int></p>}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [28..29)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[1];
-                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [30..40)::10 - bound-int - Minimized - Bound - [ bound-int]
                                         MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
index 3d0a162a8f..b189fe0934 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
@@ -26,7 +26,7 @@ RazorDocument - [0..129)::129 - [@{<input    bound-required-int class='@DateTime
                                         MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [38..55)::17
                                             MarkupDynamicAttributeValue - [38..51)::13 - [@DateTime.Now]
@@ -51,7 +51,7 @@ RazorDocument - [0..129)::129 - [@{<input    bound-required-int class='@DateTime
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [54..55)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[1];
-                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [56..80)::24 - bound-required-string - Minimized - Bound - [   bound-required-string]
                                         MarkupTextLiteral - [56..59)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -64,7 +64,7 @@ RazorDocument - [0..129)::129 - [@{<input    bound-required-int class='@DateTime
                                         MarkupTextLiteral - [81..86)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [87..88)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [87..88)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [88..105)::17
                                             MarkupDynamicAttributeValue - [88..101)::13 - [@DateTime.Now]
@@ -89,7 +89,7 @@ RazorDocument - [0..129)::129 - [@{<input    bound-required-int class='@DateTime
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [104..105)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[1];
-                                        MarkupTextLiteral - [105..106)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [105..106)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [106..124)::18 - unbound-required - Minimized - Unbound - [  unbound-required]
                                         MarkupTextLiteral - [106..108)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
index b29b523237..5045858817 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
@@ -26,7 +26,7 @@ RazorDocument - [0..104)::104 - [@{<p    bound-int class='@DateTime.Now + 1'   b
                                         MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [25..42)::17
                                             MarkupDynamicAttributeValue - [25..38)::13 - [@DateTime.Now]
@@ -51,7 +51,7 @@ RazorDocument - [0..104)::104 - [@{<p    bound-int class='@DateTime.Now + 1'   b
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [41..42)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[1];
-                                        MarkupTextLiteral - [42..43)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [42..43)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [43..58)::15 - bound-string - Minimized - Bound - [   bound-string]
                                         MarkupTextLiteral - [43..46)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -64,7 +64,7 @@ RazorDocument - [0..104)::104 - [@{<p    bound-int class='@DateTime.Now + 1'   b
                                         MarkupTextLiteral - [59..64)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [65..66)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [65..66)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         MarkupTagHelperAttributeValue - [66..83)::17
                                             MarkupDynamicAttributeValue - [66..79)::13 - [@DateTime.Now]
@@ -89,7 +89,7 @@ RazorDocument - [0..104)::104 - [@{<p    bound-int class='@DateTime.Now + 1'   b
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [82..83)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[1];
-                                        MarkupTextLiteral - [83..84)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [83..84)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupMinimizedTagHelperAttribute - [84..98)::14 - bound-string - Minimized - Bound - [  bound-string]
                                         MarkupTextLiteral - [84..86)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
index f30adc9039..2fdaa0868a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..29)::29 - [<input int-prefix-value='' />]
                     MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[int-prefix-value];
                     Equals;[=];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [25..25)::0
                         CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
-                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [26..27)::1
                     MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
index c8402947c8..08bf6be38e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..31)::31 - [<input string-prefix-value=''/>]
                     MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[string-prefix-value];
                     Equals;[=];
-                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [28..28)::0
                         MarkupTextLiteral - [28..28)::0 - []
-                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 ForwardSlash;[/];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
index 1073b6dcce..11c35e9738 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..29)::29 - [<input int-prefix-value='3'/>]
                     MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[int-prefix-value];
                     Equals;[=];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [25..26)::1
                         CSharpExpressionLiteral - [25..26)::1 - [3] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
                             Text;[3];
-                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 ForwardSlash;[/];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
index db5120a644..f3b42e62e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..43)::43 - [<input string-prefix-value='some string' />]
                     MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[string-prefix-value];
                     Equals;[=];
-                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [28..39)::11
                         MarkupTextLiteral - [28..32)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -18,7 +18,7 @@ RazorDocument - [0..43)::43 - [<input string-prefix-value='some string' />]
                         MarkupTextLiteral - [32..39)::7 - [ string] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Whitespace;[ ];
                             Text;[string];
-                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [40..41)::1
                     MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
index adfdb4997a..a0f4d372dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
@@ -15,13 +15,13 @@ RazorDocument - [0..38)::38 - [<input unbound-required class='btn' />]
                     MarkupTextLiteral - [24..29)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [31..34)::3
                         MarkupLiteralAttributeValue - [31..34)::3 - [btn]
                             MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [35..36)::1
                     MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
index 3619bf04fb..8d6eb3895f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
@@ -15,13 +15,13 @@ RazorDocument - [0..32)::32 - [<p bound-string class='btn'></p>]
                     MarkupTextLiteral - [16..21)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [23..26)::3
                         MarkupLiteralAttributeValue - [23..26)::3 - [btn]
                             MarkupTextLiteral - [23..26)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [28..32)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
index bb3a09acef..bd392ebaca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..38)::38 - [<input class='btn' unbound-required />]
                     MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [14..17)::3
                         MarkupLiteralAttributeValue - [14..17)::3 - [btn]
                             MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [18..35)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
index 05e69ed46a..a5d56b5d4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..32)::32 - [<p class='btn' bound-string></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
index b8bdaa9a32..fac0ca1d88 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
@@ -15,13 +15,13 @@ RazorDocument - [0..43)::43 - [<input bound-required-string class='btn' />]
                     MarkupTextLiteral - [29..34)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [36..39)::3
                         MarkupLiteralAttributeValue - [36..39)::3 - [btn]
                             MarkupTextLiteral - [36..39)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [40..41)::1
                     MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
index 809d101bcb..44e24eec99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..43)::43 - [<input class='btn' bound-required-string />]
                     MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [14..17)::3
                         MarkupLiteralAttributeValue - [14..17)::3 - [btn]
                             MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [18..40)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
index d2a0becaf5..d95095a2ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
@@ -15,13 +15,13 @@ RazorDocument - [0..40)::40 - [<input bound-required-int class='btn' />]
                     MarkupTextLiteral - [26..31)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [32..33)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [32..33)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [33..36)::3
                         MarkupLiteralAttributeValue - [33..36)::3 - [btn]
                             MarkupTextLiteral - [33..36)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMiscAttributeContent - [37..38)::1
                     MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
index ba99c42800..c06d878da2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
@@ -15,13 +15,13 @@ RazorDocument - [0..29)::29 - [<p bound-int class='btn'></p>]
                     MarkupTextLiteral - [13..18)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [20..23)::3
                         MarkupLiteralAttributeValue - [20..23)::3 - [btn]
                             MarkupTextLiteral - [20..23)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [25..29)::4 - [</p>]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
index 9938367174..469b6d91f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..40)::40 - [<input class='btn' bound-required-int />]
                     MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [14..17)::3
                         MarkupLiteralAttributeValue - [14..17)::3 - [btn]
                             MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [18..37)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
index 56b05f2f39..f745ff8f16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..29)::29 - [<p class='btn' bound-int></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [14..24)::10 - bound-int - Minimized - Bound - [ bound-int]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
index dda375000b..53741e1a93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..54)::54 - [<input class='@DateTime.Now + 1' bound-required-i
                     MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [14..31)::17
                         MarkupDynamicAttributeValue - [14..27)::13 - [@DateTime.Now]
@@ -35,7 +35,7 @@ RazorDocument - [0..54)::54 - [<input class='@DateTime.Now + 1' bound-required-i
                                 Whitespace;[ ];
                             MarkupTextLiteral - [30..31)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[1];
-                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [32..51)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
                     MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
index a086544147..a9fb407701 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..43)::43 - [<p class='@DateTime.Now + 1' bound-int></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..27)::17
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -35,7 +35,7 @@ RazorDocument - [0..43)::43 - [<p class='@DateTime.Now + 1' bound-int></p>]
                                 Whitespace;[ ];
                             MarkupTextLiteral - [26..27)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[1];
-                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [28..38)::10 - bound-int - Minimized - Bound - [ bound-int]
                     MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
index 438ff977ce..1663d17fc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
@@ -15,7 +15,7 @@ RazorDocument - [0..126)::126 - [<input    bound-required-int class='@DateTime.N
                     MarkupTextLiteral - [29..34)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [36..53)::17
                         MarkupDynamicAttributeValue - [36..49)::13 - [@DateTime.Now]
@@ -40,7 +40,7 @@ RazorDocument - [0..126)::126 - [<input    bound-required-int class='@DateTime.N
                                 Whitespace;[ ];
                             MarkupTextLiteral - [52..53)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[1];
-                    MarkupTextLiteral - [53..54)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [53..54)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [54..78)::24 - bound-required-string - Minimized - Bound - [   bound-required-string]
                     MarkupTextLiteral - [54..57)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -53,7 +53,7 @@ RazorDocument - [0..126)::126 - [<input    bound-required-int class='@DateTime.N
                     MarkupTextLiteral - [79..84)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [86..103)::17
                         MarkupDynamicAttributeValue - [86..99)::13 - [@DateTime.Now]
@@ -78,7 +78,7 @@ RazorDocument - [0..126)::126 - [<input    bound-required-int class='@DateTime.N
                                 Whitespace;[ ];
                             MarkupTextLiteral - [102..103)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[1];
-                    MarkupTextLiteral - [103..104)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [103..104)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [104..122)::18 - unbound-required - Minimized - Unbound - [  unbound-required]
                     MarkupTextLiteral - [104..106)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
index 6b70ada3ec..a84a2d3683 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
@@ -15,7 +15,7 @@ RazorDocument - [0..101)::101 - [<p    bound-int class='@DateTime.Now + 1'   bou
                     MarkupTextLiteral - [16..21)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [23..40)::17
                         MarkupDynamicAttributeValue - [23..36)::13 - [@DateTime.Now]
@@ -40,7 +40,7 @@ RazorDocument - [0..101)::101 - [<p    bound-int class='@DateTime.Now + 1'   bou
                                 Whitespace;[ ];
                             MarkupTextLiteral - [39..40)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[1];
-                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [41..56)::15 - bound-string - Minimized - Bound - [   bound-string]
                     MarkupTextLiteral - [41..44)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -53,7 +53,7 @@ RazorDocument - [0..101)::101 - [<p    bound-int class='@DateTime.Now + 1'   bou
                     MarkupTextLiteral - [57..62)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [63..64)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [63..64)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [64..81)::17
                         MarkupDynamicAttributeValue - [64..77)::13 - [@DateTime.Now]
@@ -78,7 +78,7 @@ RazorDocument - [0..101)::101 - [<p    bound-int class='@DateTime.Now + 1'   bou
                                 Whitespace;[ ];
                             MarkupTextLiteral - [80..81)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[1];
-                    MarkupTextLiteral - [81..82)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [81..82)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [82..96)::14 - bound-string - Minimized - Bound - [  bound-string]
                     MarkupTextLiteral - [82..84)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt
index 51348bf9d0..5a116dae22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMultipartNonStringTagHelperAttributes.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..30)::30 - [<person age="(() => 123)()" />]
                     MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[age];
                     Equals;[=];
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [13..26)::13
                         CSharpExpressionLiteral - [13..26)::13 - [(() => 123)()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
@@ -20,7 +20,7 @@ RazorDocument - [0..30)::30 - [<person age="(() => 123)()" />]
                             CloseAngle;[>];
                             Whitespace;[ ];
                             Text;[123)()];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [27..28)::1
                     MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
index 6b9e1a1f12..5a1805b5d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..47)::47 - [<th:myth class="btn">words and spaces</th:myth>]
                     MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..19)::3
                         MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                             MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [21..37)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
index 4fe58fe635..59b74555a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..34)::34 - [<th:myth2 bound="@DateTime.Now" />]
                     MarkupTextLiteral - [10..15)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[bound];
                     Equals;[=];
-                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [17..30)::13
                         MarkupBlock - [17..30)::13
@@ -24,7 +24,7 @@ RazorDocument - [0..34)::34 - [<th:myth2 bound="@DateTime.Now" />]
                                                 Identifier;[DateTime];
                                                 Dot;[.];
                                                 Identifier;[Now];
-                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [31..32)::1
                     MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
index 53c0c892c3..a3ef260467 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..23)::23 - [<th:myth class="btn" />]
                     MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..19)::3
                         MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                             MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [20..21)::1
                     MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
index 33ddd48291..d70be0ff14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..24)::24 - [<th:myth2 class="btn" />]
                     MarkupTextLiteral - [10..15)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [17..20)::3
                         MarkupLiteralAttributeValue - [17..20)::3 - [btn]
                             MarkupTextLiteral - [17..20)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [21..22)::1
                     MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
index 36f03692c3..0cddbae480 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..22)::22 - [@{<!text class="btn">}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
index 891c5297d7..33a85928e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..30)::30 - [@{<!text class="btn"></!text>}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupEndTag - [21..29)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
index 128de38bf2..a081ac9860 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..47)::47 - [@{<!text class="btn">words with spaces</!text>}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupTextLiteral - [21..38)::17 - [words with spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
index 2cc6fc5b3a..0ce937b430 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..47)::47 - [@{<!text class='btn1 btn2' class2=btn></!text>}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [16..25)::9
                                             MarkupLiteralAttributeValue - [16..20)::4 - [btn1]
@@ -33,7 +33,7 @@ RazorDocument - [0..47)::47 - [@{<!text class='btn1 btn2' class2=btn></!text>}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [21..25)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn2];
-                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [26..37)::11 - [ class2=btn]
                                         MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -43,7 +43,7 @@ RazorDocument - [0..47)::47 - [@{<!text class='btn1 btn2' class2=btn></!text>}]
                                         Equals;[=];
                                         GenericBlock - [34..37)::3
                                             MarkupLiteralAttributeValue - [34..37)::3 - [btn]
-                                                MarkupTextLiteral - [34..37)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [34..37)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
                                     CloseAngle;[>];
                                 MarkupEndTag - [38..46)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
index 68864e97d9..abdb6a42df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..50)::50 - [@{<!text class='btn1 @DateTime.Now btn2'></!text>
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [16..39)::23
                                             MarkupLiteralAttributeValue - [16..20)::4 - [btn1]
@@ -47,7 +47,7 @@ RazorDocument - [0..50)::50 - [@{<!text class='btn1 @DateTime.Now btn2'></!text>
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [35..39)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn2];
-                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [39..40)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     CloseAngle;[>];
                                 MarkupEndTag - [41..49)::8 - [</!text>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
index ee66c8047f..3a7cde5335 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
@@ -1,7 +1,7 @@
 RazorDocument - [0..10)::10 - [<!p class=]
     MarkupBlock - [0..10)::10
         MarkupElement - [0..10)::10
-            MarkupStartTag - [0..10)::10 - [<!p class=] - Gen<None> - SpanEditHandler;Accepts:Any
+            MarkupStartTag - [0..10)::10 - [<!p class=] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Bang;[!];
                 Text;[p];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
index d8fc2bc069..b78dfe1d29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
@@ -11,7 +11,7 @@ RazorDocument - [0..14)::14 - [<!p class="btn]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [11..14)::3
                         MarkupLiteralAttributeValue - [11..14)::3 - [btn]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
index 560ec950e3..d69071ac02 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
@@ -11,12 +11,12 @@ RazorDocument - [0..15)::15 - [<!p class="btn"]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [11..14)::3
                         MarkupLiteralAttributeValue - [11..14)::3 - [btn]
                             MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
index 4aae4d9300..cbd61e6fb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
@@ -11,13 +11,13 @@ RazorDocument - [0..17)::17 - [<!p class="btn" /]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [11..14)::3
                         MarkupLiteralAttributeValue - [11..14)::3 - [btn]
                             MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [15..16)::1
                     MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
index a4553c78cb..ee610d65e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
@@ -24,7 +24,7 @@ RazorDocument - [0..13)::13 - [@{<!p class=}]
                                         Equals;[=];
                                         GenericBlock - [12..13)::1
                                             MarkupLiteralAttributeValue - [12..13)::1 - [}]
-                                                MarkupTextLiteral - [12..13)::1 - [}] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [12..13)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[}];
                                     CloseAngle;[<Missing>];
                     RazorMetaCode - [13..13)::0 - Gen<None> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
index 4eb9d06416..006b6b4d11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..17)::17 - [@{<!p class="btn}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..17)::4
                                             MarkupLiteralAttributeValue - [13..17)::4 - [btn}]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
index 0c7a00828d..0c4ef5f368 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..19)::19 - [@{<!p class="btn@@}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..19)::6
                                             MarkupLiteralAttributeValue - [13..16)::3 - [btn]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
index c2ce0b5aa3..8cadcccfc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..18)::18 - [@{<!p class="btn"}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [btn]
                                                 MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMinimizedAttributeBlock - [17..18)::1 - [}]
                                         MarkupTextLiteral - [17..18)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
index a2cbc80690..3bf562e849 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..20)::20 - [@{<!p class="btn" /}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [btn]
                                                 MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMiscAttributeContent - [17..18)::1
                                         MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
index dca3d187b9..1c0539e3ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
@@ -24,7 +24,7 @@ RazorDocument - [0..16)::16 - [@{<!text class=}]
                                         Equals;[=];
                                         GenericBlock - [15..16)::1
                                             MarkupLiteralAttributeValue - [15..16)::1 - [}]
-                                                MarkupTextLiteral - [15..16)::1 - [}] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [15..16)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[}];
                                     CloseAngle;[<Missing>];
                     RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
index 9b3b552c08..f9d5e6ef3c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..20)::20 - [@{<!text class="btn}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [16..20)::4
                                             MarkupLiteralAttributeValue - [16..20)::4 - [btn}]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
index d09a1c8d3d..4aef8cae46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..21)::21 - [@{<!text class="btn"}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMinimizedAttributeBlock - [20..21)::1 - [}]
                                         MarkupTextLiteral - [20..21)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
index 6ac32b74b0..70dc270938 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..23)::23 - [@{<!text class="btn" /}]
                                         MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [16..19)::3
                                             MarkupLiteralAttributeValue - [16..19)::3 - [btn]
                                                 MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [19..20)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     MarkupMiscAttributeContent - [20..21)::1
                                         MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
index 8b490e6137..b71f09adf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..19)::19 - [@{<!p class="btn">}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [btn]
                                                 MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
index 02a7efb7f0..5f02516c0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..24)::24 - [@{<!p class="btn"></!p>}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [btn]
                                                 MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupEndTag - [18..23)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
index 7e359df115..5aceb7e8f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
@@ -22,13 +22,13 @@ RazorDocument - [0..41)::41 - [@{<!p class="btn">words with spaces</!p>}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                         GenericBlock - [13..16)::3
                                             MarkupLiteralAttributeValue - [13..16)::3 - [btn]
                                                 MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
-                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [16..17)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             DoubleQuote;["];
                                     CloseAngle;[>];
                                 MarkupTextLiteral - [18..35)::17 - [words with spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
index fdb98b1be0..a7a0e0f91b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..41)::41 - [@{<!p class='btn1 btn2' class2=btn></!p>}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..22)::9
                                             MarkupLiteralAttributeValue - [13..17)::4 - [btn1]
@@ -33,7 +33,7 @@ RazorDocument - [0..41)::41 - [@{<!p class='btn1 btn2' class2=btn></!p>}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [18..22)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn2];
-                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [22..23)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     MarkupAttributeBlock - [23..34)::11 - [ class2=btn]
                                         MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -43,7 +43,7 @@ RazorDocument - [0..41)::41 - [@{<!p class='btn1 btn2' class2=btn></!p>}]
                                         Equals;[=];
                                         GenericBlock - [31..34)::3
                                             MarkupLiteralAttributeValue - [31..34)::3 - [btn]
-                                                MarkupTextLiteral - [31..34)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn];
                                     CloseAngle;[>];
                                 MarkupEndTag - [35..40)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
index 4dd069d28c..08bccd56b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
@@ -22,7 +22,7 @@ RazorDocument - [0..44)::44 - [@{<!p class='btn1 @DateTime.Now btn2'></!p>}]
                                         MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[class];
                                         Equals;[=];
-                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                         GenericBlock - [13..36)::23
                                             MarkupLiteralAttributeValue - [13..17)::4 - [btn1]
@@ -47,7 +47,7 @@ RazorDocument - [0..44)::44 - [@{<!p class='btn1 @DateTime.Now btn2'></!p>}]
                                                     Whitespace;[ ];
                                                 MarkupTextLiteral - [32..36)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                                     Text;[btn2];
-                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             SingleQuote;['];
                                     CloseAngle;[>];
                                 MarkupEndTag - [38..43)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:None
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
index caed17da76..9e3036562e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
@@ -11,12 +11,12 @@ RazorDocument - [0..16)::16 - [<!p class="btn">]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [11..14)::3
                         MarkupLiteralAttributeValue - [11..14)::3 - [btn]
                             MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
index 77641949ad..36b7be64ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
@@ -11,13 +11,13 @@ RazorDocument - [0..21)::21 - [<!p class="btn"></!p>]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [11..14)::3
                         MarkupLiteralAttributeValue - [11..14)::3 - [btn]
                             MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupEndTag - [16..21)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
index 6128928f8c..567db01f9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
@@ -11,13 +11,13 @@ RazorDocument - [0..37)::37 - [<!p class="btn">words and spaces</!p>]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [11..14)::3
                         MarkupLiteralAttributeValue - [11..14)::3 - [btn]
                             MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [16..32)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
index 07f0f249d0..98036f87ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
@@ -11,7 +11,7 @@ RazorDocument - [0..38)::38 - [<!p class='btn1 btn2' class2=btn></!p>]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [11..20)::9
                         MarkupLiteralAttributeValue - [11..15)::4 - [btn1]
@@ -22,7 +22,7 @@ RazorDocument - [0..38)::38 - [<!p class='btn1 btn2' class2=btn></!p>]
                                 Whitespace;[ ];
                             MarkupTextLiteral - [16..20)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn2];
-                    MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [21..32)::11 - [ class2=btn]
                     MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -32,7 +32,7 @@ RazorDocument - [0..38)::38 - [<!p class='btn1 btn2' class2=btn></!p>]
                     Equals;[=];
                     GenericBlock - [29..32)::3
                         MarkupLiteralAttributeValue - [29..32)::3 - [btn]
-                            MarkupTextLiteral - [29..32)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [29..32)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
                 CloseAngle;[>];
             MarkupEndTag - [33..38)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
index 5a44b0a363..22ffd69773 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
@@ -11,7 +11,7 @@ RazorDocument - [0..41)::41 - [<!p class='btn1 @DateTime.Now btn2'></!p>]
                     MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [11..34)::23
                         MarkupLiteralAttributeValue - [11..15)::4 - [btn1]
@@ -36,7 +36,7 @@ RazorDocument - [0..41)::41 - [<!p class='btn1 @DateTime.Now btn2'></!p>]
                                 Whitespace;[ ];
                             MarkupTextLiteral - [30..34)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn2];
-                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupEndTag - [36..41)::5 - [</!p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
index bf424f1f0b..4450b4ee70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..44)::44 - [<script types='text/html'><input /></script>]
                     MarkupTextLiteral - [8..13)::5 - [types] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[types];
                     Equals;[=];
-                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [15..24)::9
                         MarkupLiteralAttributeValue - [15..24)::9 - [text/html]
@@ -18,7 +18,7 @@ RazorDocument - [0..44)::44 - [<script types='text/html'><input /></script>]
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[html];
-                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [26..35)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
index d5505e8178..dbd6822130 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..51)::51 - [<script type='text/html invalid'><input /></scrip
                     MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [14..31)::17
                         MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
@@ -23,7 +23,7 @@ RazorDocument - [0..51)::51 - [<script type='text/html invalid'><input /></scrip
                                 Whitespace;[ ];
                             MarkupTextLiteral - [24..31)::7 - [invalid] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[invalid];
-                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [33..42)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
index 5102001848..b0aca0fea5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..60)::60 - [<script type='text/ng-*' type='text/html'><input
                     MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [14..23)::9
                         MarkupLiteralAttributeValue - [14..23)::9 - [text/ng-*]
@@ -18,7 +18,7 @@ RazorDocument - [0..60)::60 - [<script type='text/ng-*' type='text/html'><input
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[ng-*];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [24..41)::17 - [ type='text/html']
                     MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -26,7 +26,7 @@ RazorDocument - [0..60)::60 - [<script type='text/ng-*' type='text/html'><input
                     MarkupTextLiteral - [25..29)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [31..40)::9
                         MarkupLiteralAttributeValue - [31..40)::9 - [text/html]
@@ -34,7 +34,7 @@ RazorDocument - [0..60)::60 - [<script type='text/ng-*' type='text/html'><input
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[html];
-                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTextLiteral - [42..51)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt
index efa4cd5f46..69237591cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly1.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..28)::28 - [<p class='foo' catchAll></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [14..23)::9 - catchAll - Minimized - Unbound - [ catchAll]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt
index b3397e054d..9e56cc278d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly2.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..28)::28 - [<p CLASS='foo' CATCHAll></p>]
                     MarkupTextLiteral - [3..8)::5 - [CLASS] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[CLASS];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [14..23)::9 - CATCHAll - Minimized - Unbound - [ CATCHAll]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt
index abf07adaa8..10d12d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly3.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..28)::28 - [<P class='foo' CATCHAll></P>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupMinimizedTagHelperAttribute - [14..23)::9 - CATCHAll - Minimized - Unbound - [ CATCHAll]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt
index 67601f532c..211c7dd391 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly4.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..19)::19 - [<P class='foo'></P>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupEndTag - [15..19)::4 - [</P>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt
index 94fc32106e..205ae2dfe0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesCaseSensitiveTagHelpersCorrectly5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..19)::19 - [<p Class='foo'></p>]
                     MarkupTextLiteral - [3..8)::5 - [Class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[Class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [foo]
                             MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[foo];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupEndTag - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
index ec8ccca336..5ee6707ec5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..26)::26 - [<p class="btn"><p></p></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupElement - [15..22)::7
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
index 608d1e1450..b489212ead 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..113)::113 - [<strong catchAll="hi"><strong><strong><strong c
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupElement - [22..104)::82
@@ -39,13 +39,13 @@ RazorDocument - [0..113)::113 - [<strong catchAll="hi"><strong><strong><strong c
                                 MarkupTextLiteral - [46..54)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[catchAll];
                                 Equals;[=];
-                                MarkupTextLiteral - [55..56)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                MarkupTextLiteral - [55..56)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     DoubleQuote;["];
                                 MarkupTagHelperAttributeValue - [56..58)::2
                                     MarkupLiteralAttributeValue - [56..58)::2 - [hi]
                                         MarkupTextLiteral - [56..58)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[hi];
-                                MarkupTextLiteral - [58..59)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                MarkupTextLiteral - [58..59)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     DoubleQuote;["];
                             CloseAngle;[>];
                         MarkupElement - [60..77)::17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
index 3e3493b6db..c27b045937 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..48)::48 - [<strong catchAll="hi"><strong></strong></strong>]
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupElement - [22..39)::17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
index 29d3350aa5..11851c327a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..43)::43 - [<p class="btn"><strong><p></p></strong></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupElement - [15..39)::24
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
index 6b86720e7a..4470ff5da3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..55)::55 - [<strong catchAll="hi"><p><strong></strong></p></s
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupElement - [22..46)::24
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
index 8405d2eef7..6ae5f26b33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..57)::57 - [<p class="btn"><strong catchAll="hi"><p></p></str
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperElement - [15..53)::38 - strong[StartTagAndEndTag] - catchAllTagHelper
@@ -29,13 +29,13 @@ RazorDocument - [0..57)::57 - [<p class="btn"><strong catchAll="hi"><p></p></str
                         MarkupTextLiteral - [23..31)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[catchAll];
                         Equals;[=];
-                        MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [32..33)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [33..35)::2
                             MarkupLiteralAttributeValue - [33..35)::2 - [hi]
                                 MarkupTextLiteral - [33..35)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[hi];
-                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupElement - [37..44)::7
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
index 23c2e444d6..49ea5ff24c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..67)::67 - [<strong catchAll="hi"><p class="btn"><strong></st
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperElement - [22..58)::36 - p[StartTagAndEndTag] - pTagHelper
@@ -29,13 +29,13 @@ RazorDocument - [0..67)::67 - [<strong catchAll="hi"><p class="btn"><strong></st
                         MarkupTextLiteral - [25..30)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [31..32)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [32..35)::3
                             MarkupLiteralAttributeValue - [32..35)::3 - [btn]
                                 MarkupTextLiteral - [32..35)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[btn];
-                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupElement - [37..54)::17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
index dd9fea20e4..01e73cba7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..45)::45 - [<p class="btn"><p class="btn"><p></p></p></p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperElement - [15..41)::26 - p[StartTagAndEndTag] - pTagHelper
@@ -29,13 +29,13 @@ RazorDocument - [0..45)::45 - [<p class="btn"><p class="btn"><p></p></p></p>]
                         MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[class];
                         Equals;[=];
-                        MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [25..28)::3
                             MarkupLiteralAttributeValue - [25..28)::3 - [btn]
                                 MarkupTextLiteral - [25..28)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[btn];
-                        MarkupTextLiteral - [28..29)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [28..29)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupElement - [30..37)::7
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
index 21526f8fe0..3cedd737eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..79)::79 - [<strong catchAll="hi"><strong catchAll="hi"><stro
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperElement - [22..70)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
@@ -29,13 +29,13 @@ RazorDocument - [0..79)::79 - [<strong catchAll="hi"><strong catchAll="hi"><stro
                         MarkupTextLiteral - [30..38)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Text;[catchAll];
                         Equals;[=];
-                        MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [39..40)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                         MarkupTagHelperAttributeValue - [40..42)::2
                             MarkupLiteralAttributeValue - [40..42)::2 - [hi]
                                 MarkupTextLiteral - [40..42)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[hi];
-                        MarkupTextLiteral - [42..43)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        MarkupTextLiteral - [42..43)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             DoubleQuote;["];
                     CloseAngle;[>];
                 MarkupElement - [44..61)::17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
index f15b50d720..b35bc7f9ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..59)::59 - [<p class="btn"><p><p><p class="btn"><p></p></p></
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupElement - [15..55)::40
@@ -39,13 +39,13 @@ RazorDocument - [0..59)::59 - [<p class="btn"><p><p><p class="btn"><p></p></p></
                                 MarkupTextLiteral - [24..29)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     Text;[class];
                                 Equals;[=];
-                                MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     DoubleQuote;["];
                                 MarkupTagHelperAttributeValue - [31..34)::3
                                     MarkupLiteralAttributeValue - [31..34)::3 - [btn]
                                         MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Text;[btn];
-                                MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                MarkupTextLiteral - [34..35)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                     DoubleQuote;["];
                             CloseAngle;[>];
                         MarkupElement - [36..43)::7
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
index ad7c779ccd..ae7efe7aac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" </p]
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..18)::2
                         MarkupLiteralAttributeValue - [16..18)::2 - [hi]
                             MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" </p]
                     MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..30)::3
                         MarkupLiteralAttributeValue - [27..30)::3 - [btn]
                             MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [31..32)::1
                     MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
index 090ec992d5..6626113510 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
@@ -10,12 +10,12 @@ RazorDocument - [0..14)::14 - [<p class="btn"]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
index b1f9b84420..7a091f7704 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..31)::31 - [<p notRequired="hi" class="btn"]
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..18)::2
                         MarkupLiteralAttributeValue - [16..18)::2 - [hi]
                             MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,12 +24,12 @@ RazorDocument - [0..31)::31 - [<p notRequired="hi" class="btn"]
                     MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..30)::3
                         MarkupLiteralAttributeValue - [27..30)::3 - [btn]
                             MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[<Missing>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
index cac3cea9fe..dd234ccf8a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..18)::18 - [<p class="btn"></p]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [15..18)::3 - [</p]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
index b2b9d8c34b..5bb9e9e16c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn"></p]
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..18)::2
                         MarkupLiteralAttributeValue - [16..18)::2 - [hi]
                             MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn"></p]
                     MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..30)::3
                         MarkupLiteralAttributeValue - [27..30)::3 - [btn]
                             MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [32..35)::3 - [</p]
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
index ffc314935b..344692192b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..18)::18 - [<p class="btn" <p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [14..15)::1
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
index 95276cdab8..11f8d77b73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" <p>]
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..18)::2
                         MarkupLiteralAttributeValue - [16..18)::2 - [hi]
                             MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" <p>]
                     MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [27..30)::3
                         MarkupLiteralAttributeValue - [27..30)::3 - [btn]
                             MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [31..32)::1
                     MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
index 2f0937fa9e..02201c2860 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..18)::18 - [<p class="btn" </p]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [14..15)::1
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
index fe16ad6ab9..23834d9b7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..24)::24 - [<strong catchAll="hi" />]
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [21..22)::1
                     MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
index d6f75f2a9f..d34eb6606f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..35)::35 - [<strong catchAll="@DateTime.Now" />]
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..31)::13
                         MarkupDynamicAttributeValue - [18..31)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..35)::35 - [<strong catchAll="@DateTime.Now" />]
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [32..33)::1
                     MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
index 6bd5c9b475..7bbca39c69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..47)::47 - [<strong catchAll="hi">words and spaces</strong>]
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..20)::2
                         MarkupLiteralAttributeValue - [18..20)::2 - [hi]
                             MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [22..38)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
index a0d04d2b2c..f1cb474637 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..58)::58 - [<strong catchAll="@DateTime.Now">words and spaces
                     MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [18..31)::13
                         MarkupDynamicAttributeValue - [18..31)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..58)::58 - [<strong catchAll="@DateTime.Now">words and spaces
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [33..49)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
index b39cc67203..5592cdc198 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..19)::19 - [<div class="btn" />]
                     MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [12..15)::3
                         MarkupLiteralAttributeValue - [12..15)::3 - [btn]
                             MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [16..17)::1
                     MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
index a31cde472d..abfb90c482 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..23)::23 - [<div class="btn"></div>]
                     MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     GenericBlock - [12..15)::3
                         MarkupLiteralAttributeValue - [12..15)::3 - [btn]
                             MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupEndTag - [17..23)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
index 56ec6f33fc..3b64e047c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..33)::33 - [<p notRequired="a" class="btn" />]
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..17)::1
                         MarkupLiteralAttributeValue - [16..17)::1 - [a]
                             MarkupTextLiteral - [16..17)::1 - [a] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[a];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [18..30)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..33)::33 - [<p notRequired="a" class="btn" />]
                     MarkupTextLiteral - [19..24)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [26..29)::3
                         MarkupLiteralAttributeValue - [26..29)::3 - [btn]
                             MarkupTextLiteral - [26..29)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [30..31)::1
                     MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
index e7c49df6fb..7bd28b0ac8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..45)::45 - [<p notRequired="@DateTime.Now" class="btn" />]
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..29)::13
                         MarkupDynamicAttributeValue - [16..29)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..45)::45 - [<p notRequired="@DateTime.Now" class="btn" />]
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [30..42)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,13 +33,13 @@ RazorDocument - [0..45)::45 - [<p notRequired="@DateTime.Now" class="btn" />]
                     MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [38..41)::3
                         MarkupLiteralAttributeValue - [38..41)::3 - [btn]
                             MarkupTextLiteral - [38..41)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [41..42)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [42..43)::1
                     MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
index c003750ce1..602f472c61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..51)::51 - [<p notRequired="a" class="btn">words and spaces</
                     MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[notRequired];
                     Equals;[=];
-                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [16..17)::1
                         MarkupLiteralAttributeValue - [16..17)::1 - [a]
                             MarkupTextLiteral - [16..17)::1 - [a] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[a];
-                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [18..30)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..51)::51 - [<p notRequired="a" class="btn">words and spaces</
                     MarkupTextLiteral - [19..24)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [26..29)::3
                         MarkupLiteralAttributeValue - [26..29)::3 - [btn]
                             MarkupTextLiteral - [26..29)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [31..47)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
index 06355bf233..0a1508e927 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..28)::28 - [<div style="" class="btn" />]
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..28)::28 - [<div style="" class="btn" />]
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [25..26)::1
                     MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
index b23c7746c2..ea25294ac4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..41)::41 - [<div style="@DateTime.Now" class="btn" />]
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..25)::13
                         MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..41)::41 - [<div style="@DateTime.Now" class="btn" />]
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [26..38)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,13 +33,13 @@ RazorDocument - [0..41)::41 - [<div style="@DateTime.Now" class="btn" />]
                     MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [34..37)::3
                         MarkupLiteralAttributeValue - [34..37)::3 - [btn]
                             MarkupTextLiteral - [34..37)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [38..39)::1
                     MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
index a69b0bdd08..e86496b7c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..48)::48 - [<div style="" class="btn">words and spaces</div>]
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..48)::48 - [<div style="" class="btn">words and spaces</div>]
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [26..42)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
index 9f939b4eea..4710b0fc3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..71)::71 - [<div style="@DateTime.Now" class="@DateTime.Now">
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..25)::13
                         MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..71)::71 - [<div style="@DateTime.Now" class="@DateTime.Now">
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [26..48)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
                     MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,7 +33,7 @@ RazorDocument - [0..71)::71 - [<div style="@DateTime.Now" class="@DateTime.Now">
                     MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [34..47)::13
                         MarkupDynamicAttributeValue - [34..47)::13 - [@DateTime.Now]
@@ -48,7 +48,7 @@ RazorDocument - [0..71)::71 - [<div style="@DateTime.Now" class="@DateTime.Now">
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [49..65)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
index 95768527cf..a968b1125d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..63)::63 - [<div style="" class="btn">words<strong>and</stron
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..63)::63 - [<div style="" class="btn">words<strong>and</stron
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [26..31)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
index bb831df610..022c83310c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..31)::31 - [<p class="btn" catchAll="hi" />]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [14..28)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..31)::31 - [<p class="btn" catchAll="hi" />]
                     MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [25..27)::2
                         MarkupLiteralAttributeValue - [25..27)::2 - [hi]
                             MarkupTextLiteral - [25..27)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [28..29)::1
                     MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
index 3f8a72bb82..a9c4c20ef5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..49)::49 - [<p class="btn" catchAll="hi">words and spaces</p>
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [14..28)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,13 +24,13 @@ RazorDocument - [0..49)::49 - [<p class="btn" catchAll="hi">words and spaces</p>
                     MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [25..27)::2
                         MarkupLiteralAttributeValue - [25..27)::2 - [hi]
                             MarkupTextLiteral - [25..27)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [29..45)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
index a3036a1c45..4f7b900664 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..42)::42 - [<div style="" class="btn" catchAll="hi" />]
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..42)::42 - [<div style="" class="btn" catchAll="hi" />]
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
                     MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,13 +36,13 @@ RazorDocument - [0..42)::42 - [<div style="" class="btn" catchAll="hi" />]
                     MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [36..38)::2
                         MarkupLiteralAttributeValue - [36..38)::2 - [hi]
                             MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [39..40)::1
                     MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
index 9a603b3e4e..063a4bd7a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..63)::63 - [<div style="" class="btn" catchAll="hi" >words an
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..63)::63 - [<div style="" class="btn" catchAll="hi" >words an
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
                     MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,13 +36,13 @@ RazorDocument - [0..63)::63 - [<div style="" class="btn" catchAll="hi" >words an
                     MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [36..38)::2
                         MarkupLiteralAttributeValue - [36..38)::2 - [hi]
                             MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [39..40)::1
                     MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
index ce933507e9..299d41d22b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..65)::65 - [<div style="" class="btn" catchAll="@@hi" >words
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..65)::65 - [<div style="" class="btn" catchAll="@@hi" >words
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [25..41)::16 - catchAll - DoubleQuotes - Unbound - [ catchAll="@@hi"]
                     MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,7 +36,7 @@ RazorDocument - [0..65)::65 - [<div style="" class="btn" catchAll="@@hi" >words
                     MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [36..40)::4
                         MarkupBlock - [36..38)::2
@@ -47,7 +47,7 @@ RazorDocument - [0..65)::65 - [<div style="" class="btn" catchAll="@@hi" >words
                         MarkupLiteralAttributeValue - [38..40)::2 - [hi]
                             MarkupTextLiteral - [38..40)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [40..41)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [40..41)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [41..42)::1
                     MarkupTextLiteral - [41..42)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
index 16f40ca649..66753f7bd0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now"
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..25)::13
                         MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now"
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [26..48)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
                     MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -33,7 +33,7 @@ RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now"
                     MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [34..47)::13
                         MarkupDynamicAttributeValue - [34..47)::13 - [@DateTime.Now]
@@ -48,7 +48,7 @@ RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now"
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [48..73)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
                     MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -56,7 +56,7 @@ RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now"
                     MarkupTextLiteral - [49..57)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [58..59)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [58..59)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [59..72)::13
                         MarkupDynamicAttributeValue - [59..72)::13 - [@DateTime.Now]
@@ -71,7 +71,7 @@ RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now"
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [72..73)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [72..73)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [73..74)::1
                     MarkupTextLiteral - [73..74)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
index e6389d0c59..fae4f1917f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
@@ -10,11 +10,11 @@ RazorDocument - [0..78)::78 - [<div style="" class="btn" catchAll="hi" >words<st
                     MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[style];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [12..12)::0
                         MarkupTextLiteral - [12..12)::0 - []
-                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
                     MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -22,13 +22,13 @@ RazorDocument - [0..78)::78 - [<div style="" class="btn" catchAll="hi" >words<st
                     MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [21..24)::3
                         MarkupLiteralAttributeValue - [21..24)::3 - [btn]
                             MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
                     MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -36,13 +36,13 @@ RazorDocument - [0..78)::78 - [<div style="" class="btn" catchAll="hi" >words<st
                     MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[catchAll];
                     Equals;[=];
-                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [36..38)::2
                         MarkupLiteralAttributeValue - [36..38)::2 - [hi]
                             MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[hi];
-                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [39..40)::1
                     MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
index ac9ad91046..f801f2c8f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..17)::17 - [<p class="btn" />]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [14..15)::1
                     MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
index 405623c7ca..de832b25f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..27)::27 - [<p class="@DateTime.Now" />]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..23)::13
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..27)::27 - [<p class="@DateTime.Now" />]
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 MarkupMiscAttributeContent - [24..25)::1
                     MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
index b0032b1097..d6bf5ef204 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..35)::35 - [<p class="btn">words and spaces</p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [15..31)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
index 036d6ce433..d6ec53fc94 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..45)::45 - [<p class="@DateTime.Now">words and spaces</p>]
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..23)::13
                         MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
@@ -25,7 +25,7 @@ RazorDocument - [0..45)::45 - [<p class="@DateTime.Now">words and spaces</p>]
                                                     Identifier;[DateTime];
                                                     Dot;[.];
                                                     Identifier;[Now];
-                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [25..41)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
index 44e66d59f3..7811d88207 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..50)::50 - [<p class="btn">words<strong>and</strong>spaces</p
                     MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                     MarkupTagHelperAttributeValue - [10..13)::3
                         MarkupLiteralAttributeValue - [10..13)::3 - [btn]
                             MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[btn];
-                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTextLiteral - [15..20)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
index ab41052e02..f96a8ae57b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..43)::43 - [<script type='text/html'><input /></script>]
                     MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [14..23)::9
                         MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
@@ -18,7 +18,7 @@ RazorDocument - [0..43)::43 - [<script type='text/html'><input /></script>]
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[html];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperElement - [25..34)::9 - input[SelfClosing] - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
index 02f84b0a0b..96cec55978 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
@@ -10,13 +10,13 @@ RazorDocument - [0..76)::76 - [<script id='scriptTag' type='text/html' class='so
                     MarkupTextLiteral - [8..10)::2 - [id] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[id];
                     Equals;[=];
-                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [12..21)::9
                         MarkupLiteralAttributeValue - [12..21)::9 - [scriptTag]
                             MarkupTextLiteral - [12..21)::9 - [scriptTag] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[scriptTag];
-                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [22..39)::17 - [ type='text/html']
                     MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -24,7 +24,7 @@ RazorDocument - [0..76)::76 - [<script id='scriptTag' type='text/html' class='so
                     MarkupTextLiteral - [23..27)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [29..38)::9
                         MarkupLiteralAttributeValue - [29..38)::9 - [text/html]
@@ -32,7 +32,7 @@ RazorDocument - [0..76)::76 - [<script id='scriptTag' type='text/html' class='so
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[html];
-                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 MarkupAttributeBlock - [39..57)::18 - [ class='something']
                     MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
@@ -40,13 +40,13 @@ RazorDocument - [0..76)::76 - [<script id='scriptTag' type='text/html' class='so
                     MarkupTextLiteral - [40..45)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
                     Equals;[=];
-                    MarkupTextLiteral - [46..47)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [46..47)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [47..56)::9
                         MarkupLiteralAttributeValue - [47..56)::9 - [something]
                             MarkupTextLiteral - [47..56)::9 - [something] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[something];
-                    MarkupTextLiteral - [56..57)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [56..57)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperElement - [58..67)::9 - input[SelfClosing] - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
index 4c82e8fa9f..486a563920 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..84)::84 - [<script type='text/html'><p><script type='text/ht
                     MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [14..23)::9
                         MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
@@ -18,7 +18,7 @@ RazorDocument - [0..84)::84 - [<script type='text/html'><p><script type='text/ht
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[html];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperElement - [25..75)::50 - p[StartTagAndEndTag] - ptaghelper
@@ -36,7 +36,7 @@ RazorDocument - [0..84)::84 - [<script type='text/html'><p><script type='text/ht
                             MarkupTextLiteral - [36..40)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[type];
                             Equals;[=];
-                            MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..42)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 SingleQuote;['];
                             GenericBlock - [42..51)::9
                                 MarkupLiteralAttributeValue - [42..51)::9 - [text/html]
@@ -44,7 +44,7 @@ RazorDocument - [0..84)::84 - [<script type='text/html'><p><script type='text/ht
                                         Text;[text];
                                         ForwardSlash;[/];
                                         Text;[html];
-                            MarkupTextLiteral - [51..52)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [51..52)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 SingleQuote;['];
                         CloseAngle;[>];
                     MarkupTagHelperElement - [53..62)::9 - input[SelfClosing] - inputtaghelper
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
index 9abd2f61a0..29d9adaaa4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
@@ -10,7 +10,7 @@ RazorDocument - [0..85)::85 - [<script type='text/html'><p><script type='text/ h
                     MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[type];
                     Equals;[=];
-                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                     GenericBlock - [14..23)::9
                         MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
@@ -18,7 +18,7 @@ RazorDocument - [0..85)::85 - [<script type='text/html'><p><script type='text/ h
                                 Text;[text];
                                 ForwardSlash;[/];
                                 Text;[html];
-                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         SingleQuote;['];
                 CloseAngle;[>];
             MarkupTagHelperElement - [25..76)::51 - p[StartTagAndEndTag] - ptaghelper
@@ -36,7 +36,7 @@ RazorDocument - [0..85)::85 - [<script type='text/html'><p><script type='text/ h
                             MarkupTextLiteral - [36..40)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 Text;[type];
                             Equals;[=];
-                            MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [41..42)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 SingleQuote;['];
                             GenericBlock - [42..52)::10
                                 MarkupLiteralAttributeValue - [42..47)::5 - [text/]
@@ -48,7 +48,7 @@ RazorDocument - [0..85)::85 - [<script type='text/html'><p><script type='text/ h
                                         Whitespace;[ ];
                                     MarkupTextLiteral - [48..52)::4 - [html] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                         Text;[html];
-                            MarkupTextLiteral - [52..53)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                            MarkupTextLiteral - [52..53)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                 SingleQuote;['];
                         CloseAngle;[>];
                     MarkupTextLiteral - [54..63)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any

From 3dcc779659b94ce312b0abdadd27b88196bab06c Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 27 Sep 2019 14:27:10 -0700
Subject: [PATCH 271/337] Prefer child content over a matching component
 (dotnet/aspnetcore-tooling#1180)

* Prefer child content over a matching component

* feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9c83a0994494e5d13e552655c85b7dd40372c778
---
 .../src/Components/ComponentLoweringPass.cs   | 12 +++--
 .../ComponentCodeGenerationTestBase.cs        | 40 ++++++++++++++-
 .../TestComponent.diagnostics.txt             |  1 +
 .../TestComponent.codegen.cs                  | 50 +++++++++++++++++++
 .../TestComponent.ir.txt                      | 29 +++++++++++
 .../TestComponent.diagnostics.txt             |  1 +
 .../TestComponent.codegen.cs                  | 37 ++++++++++++++
 .../TestComponent.ir.txt                      | 22 ++++++++
 8 files changed, 186 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
index 2954c6361c..3a7e3c748e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentLoweringPass.cs
@@ -34,7 +34,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             {
                 var reference = references[i];
                 var node = (TagHelperIntermediateNode)reference.Node;
+                if (node.TagHelpers.Any(t => t.IsChildContentTagHelper()))
+                {
+                    // This is a child content tag helper. This will be rewritten when we visit its parent.
+                    continue;
+                }
 
+                // The element didn't match any child content descriptors. Look for any matching component descriptors.
                 var count = 0;
                 for (var j = 0; j < node.TagHelpers.Count; j++)
                 {
@@ -42,7 +48,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     {
                         // Only allow a single component tag helper per element. If there are multiple, we'll just consider
                         // the first one and ignore the others.
-                        if (count++ > 1)
+                        if (++count > 1)
                         {
                             node.Diagnostics.Add(ComponentDiagnosticFactory.Create_MultipleComponents(node.Source, node.TagName, node.TagHelpers));
                             break;
@@ -54,10 +60,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     reference.Replace(RewriteAsComponent(node, node.TagHelpers.First(t => t.IsComponentTagHelper())));
                 }
-                else if (node.TagHelpers.Any(t => t.IsChildContentTagHelper()))
-                {
-                    // Ignore, this will be handled when we rewrite the parent.
-                }
                 else
                 {
                     reference.Replace(RewriteAsElement(node));
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index c10ecd7ccc..a6cc308951 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -1698,6 +1698,44 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void MultipleChildContentMatchingComponentName()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    public class MyComponent : ComponentBase
+    {
+        [Parameter]
+        public RenderFragment Header { get; set; }
+
+        [Parameter]
+        public RenderFragment Footer { get; set; }
+    }
+
+    public class Header : ComponentBase
+    {
+    }
+}
+"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<MyComponent>
+  <Header>Hi!</Header>
+  <Footer>Bye!</Footer>
+</MyComponent>
+<Header>Hello!</Header>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Directives
@@ -1804,7 +1842,7 @@ namespace Test3
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
             AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
-            var result = CompileToAssembly(generated, throwOnFailure: !DesignTime);
+            var result = CompileToAssembly(generated, throwOnFailure: false);
 
             if (DesignTime)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..a60f089416
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(4,1): Error RZ9985: Multiple components use the tag 'SomeComponent'. Components: Test2.SomeComponent, Test3.SomeComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
new file mode 100644
index 0000000000..cbbb4df936
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+            }
+            ));
+            __builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+            }
+            ));
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(MyComponent);
+
+#line default
+#line hidden
+#nullable disable
+            __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+            }
+            ));
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = typeof(Header);
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
new file mode 100644
index 0000000000..aea9472c47
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [78] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (17:1,2 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (25:1,10 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (25:1,10 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                    ComponentChildContent - (41:2,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        HtmlContent - (49:2,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (49:2,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye!
+                HtmlContent - (78:3,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (78:3,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (80:4,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Header
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (88:4,8 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (88:4,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello!
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt
new file mode 100644
index 0000000000..a60f089416
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.diagnostics.txt
@@ -0,0 +1 @@
+x:\dir\subdir\Test\TestComponent.cshtml(4,1): Error RZ9985: Multiple components use the tag 'SomeComponent'. Components: Test2.SomeComponent, Test3.SomeComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
new file mode 100644
index 0000000000..fb27ee3716
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenComponent<Test.MyComponent>(0);
+            __builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(2, "Hi!");
+            }
+            ));
+            __builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(4, "Bye!");
+            }
+            ));
+            __builder.CloseComponent();
+            __builder.AddMarkupContent(5, "\r\n");
+            __builder.OpenComponent<Test.Header>(6);
+            __builder.AddAttribute(7, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.AddContent(8, "Hello!");
+            }
+            ));
+            __builder.CloseComponent();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
new file mode 100644
index 0000000000..bb0c9a9624
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                Component - (0:0,0 [78] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentChildContent - (17:1,2 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
+                        HtmlContent - (25:1,10 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (25:1,10 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi!
+                    ComponentChildContent - (41:2,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
+                        HtmlContent - (49:2,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (49:2,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye!
+                HtmlContent - (78:3,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (78:3,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                Component - (80:4,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Header
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (88:4,8 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (88:4,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello!

From 5acc0ae2889f335cba859feef4d70b934fec808d Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 30 Sep 2019 19:40:34 -0700
Subject: [PATCH 272/337] Add Blazor partial class support in Visual Studio.
 (dotnet/aspnetcore-tooling#1182)

- No longer mark declaration files as single file generators. Prior to this we relied on SingleFileGenerators to dynamically update the declaration files when .razor files changed. However, to make partial classes work we can no longer depend on declaration files being available because their existence causes us to have to mangle class names for opened documents; otherwise you get two files with same name and result in ambiguous definition errors.
- Stopped including declaration files as part of the users compilation. This was intended to make the design time experience operate more similar to how Blazor apps function at runtime (directly access each component instead of their declarations). We now rely on the background code generation effort built from the find all references work to supply users with strongly typed component names.
- Stop mangling class names for Visual Studio. Razor.VSCode has its own set of configurations which i'm not addressing as part of this changeset.
- Start generating components with the partial modifier to their class name to enable partial class support.
- Updated existing tests to expect partial modifier.

aspnet/AspNetCoredotnet/aspnetcore-tooling#5487\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ecb3b1bdf0f6e6ed6f331163c69487f3f7bc94ec
---
 .../BasicComponent_DesignTime.codegen.cs           |  2 +-
 .../BasicComponent_DesignTime.ir.txt               |  2 +-
 .../BasicComponent_DesignTime.mappings.txt         |  8 ++++----
 .../BasicComponent_Runtime.codegen.cs              |  2 +-
 .../BasicComponent_Runtime.ir.txt                  |  2 +-
 .../Components/ComponentDocumentClassifierPass.cs  |  1 +
 .../ComponentDocumentClassifierPassTest.cs         |  2 +-
 .../ComponentDeclarationIntegrationTest.cs         |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../BindToElementWithCulture/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../ChildComponent_Generic/TestComponent.ir.txt    |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 10 +++++-----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../ChildComponent_Simple/TestComponent.codegen.cs |  2 +-
 .../ChildComponent_Simple/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../ComponentImports/_Imports.codegen.cs           |  2 +-
 .../ComponentImports/_Imports.ir.txt               |  2 +-
 .../ComponentImports/_Imports.mappings.txt         |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 12 ++++++------
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Counter.codegen.cs                             |  2 +-
 .../Counter.ir.txt                                 |  2 +-
 .../Counter.mappings.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithDocType/TestComponent.codegen.cs |  2 +-
 .../Component_WithDocType/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../Component_WithImportsFile/TestComponent.ir.txt |  2 +-
 .../Component_WithKey/TestComponent.codegen.cs     |  2 +-
 .../Component_WithKey/TestComponent.ir.txt         |  2 +-
 .../Component_WithKey/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Component_WithRef/TestComponent.codegen.cs     |  2 +-
 .../Component_WithRef/TestComponent.ir.txt         |  2 +-
 .../Component_WithRef/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithSplat/TestComponent.codegen.cs   |  2 +-
 .../Component_WithSplat/TestComponent.ir.txt       |  2 +-
 .../Component_WithSplat/TestComponent.mappings.txt |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs       |  2 +-
 .../Element_WithKey/TestComponent.ir.txt           |  2 +-
 .../Element_WithKey/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs       |  2 +-
 .../Element_WithRef/TestComponent.ir.txt           |  2 +-
 .../Element_WithRef/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithSplat/TestComponent.codegen.cs     |  2 +-
 .../Element_WithSplat/TestComponent.ir.txt         |  2 +-
 .../Element_WithSplat/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../GenericComponent_WithKey/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 10 +++++-----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 10 +++++-----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../RazorTemplate_InCodeBlock/TestComponent.ir.txt |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../Regression_597/TestComponent.codegen.cs        |  2 +-
 .../Regression_597/TestComponent.ir.txt            |  2 +-
 .../Regression_597/TestComponent.mappings.txt      |  4 ++--
 .../Regression_609/TestComponent.codegen.cs        |  2 +-
 .../Regression_609/TestComponent.ir.txt            |  2 +-
 .../Regression_609/TestComponent.mappings.txt      |  6 +++---
 .../Regression_772/TestComponent.codegen.cs        |  2 +-
 .../Regression_772/TestComponent.ir.txt            |  2 +-
 .../Regression_772/TestComponent.mappings.txt      |  2 +-
 .../Regression_773/TestComponent.codegen.cs        |  2 +-
 .../Regression_773/TestComponent.ir.txt            |  2 +-
 .../Regression_773/TestComponent.mappings.txt      |  2 +-
 .../Regression_784/TestComponent.codegen.cs        |  2 +-
 .../Regression_784/TestComponent.ir.txt            |  2 +-
 .../Regression_784/TestComponent.mappings.txt      |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../BindToElementWithCulture/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../ChildComponent_Generic/TestComponent.ir.txt    |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../ChildComponent_Simple/TestComponent.codegen.cs |  2 +-
 .../ChildComponent_Simple/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../ComponentImports/_Imports.codegen.cs           |  2 +-
 .../ComponentImports/_Imports.ir.txt               |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Counter.codegen.cs                             |  2 +-
 .../Counter.ir.txt                                 |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithDocType/TestComponent.codegen.cs |  2 +-
 .../Component_WithDocType/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../Component_WithImportsFile/TestComponent.ir.txt |  2 +-
 .../Component_WithKey/TestComponent.codegen.cs     |  2 +-
 .../Component_WithKey/TestComponent.ir.txt         |  2 +-
 .../Component_WithKey/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Component_WithRef/TestComponent.codegen.cs     |  2 +-
 .../Component_WithRef/TestComponent.ir.txt         |  2 +-
 .../Component_WithRef/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithSplat/TestComponent.codegen.cs   |  2 +-
 .../Component_WithSplat/TestComponent.ir.txt       |  2 +-
 .../Component_WithSplat/TestComponent.mappings.txt |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs       |  2 +-
 .../Element_WithKey/TestComponent.ir.txt           |  2 +-
 .../Element_WithKey/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs       |  2 +-
 .../Element_WithRef/TestComponent.ir.txt           |  2 +-
 .../Element_WithRef/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithSplat/TestComponent.codegen.cs     |  2 +-
 .../Element_WithSplat/TestComponent.ir.txt         |  2 +-
 .../Element_WithSplat/TestComponent.mappings.txt   |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../GenericComponent_WithKey/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../RazorTemplate_InCodeBlock/TestComponent.ir.txt |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Regression_597/TestComponent.codegen.cs        |  2 +-
 .../Regression_597/TestComponent.ir.txt            |  2 +-
 .../Regression_597/TestComponent.mappings.txt      |  2 +-
 .../Regression_609/TestComponent.codegen.cs        |  2 +-
 .../Regression_609/TestComponent.ir.txt            |  2 +-
 .../Regression_609/TestComponent.mappings.txt      |  2 +-
 .../Regression_772/TestComponent.codegen.cs        |  2 +-
 .../Regression_772/TestComponent.ir.txt            |  2 +-
 .../Regression_773/TestComponent.codegen.cs        |  2 +-
 .../Regression_773/TestComponent.ir.txt            |  2 +-
 .../Regression_784/TestComponent.codegen.cs        |  2 +-
 .../Regression_784/TestComponent.ir.txt            |  2 +-
 .../Regression_784/TestComponent.mappings.txt      |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Microsoft.NET.Sdk.Razor.Component.targets      |  4 ----
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets     | 14 --------------
 998 files changed, 1220 insertions(+), 1237 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 92d78d57b2..5b6a7f8b5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -8,7 +8,7 @@ namespace __GeneratedComponent
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    public partial class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index a08e83f549..98c5fca72d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (51:2,1 [17] ) - System.Linq
         UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+        ClassDeclaration -  - public partial - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             DesignTimeDirective - 
                 DirectiveToken - (12:0,12 [11] BasicComponent.cshtml) - IDisposable
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 4e620df0e8..728e0023db 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |IDisposable|
-Generated Location: (641:17,0 [11] )
+Generated Location: (649:17,0 [11] )
 |IDisposable|
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1240:35,13 [15] )
+Generated Location: (1248:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1437:43,6 [29] )
+Generated Location: (1445:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1689:52,12 [37] )
+Generated Location: (1697:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 2059dba321..f1f8cd28b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -9,7 +9,7 @@ namespace __GeneratedComponent
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    public partial class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
index 885d9ddd37..663160b90d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (51:2,1 [19] ) - System.Linq
         UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+        ClassDeclaration -  - public partial - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (25:1,0 [91] BasicComponent.cshtml) - div
                     HtmlAttribute - (29:1,4 [25] BasicComponent.cshtml) -  class=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index ea13bcb6c6..d1828ca044 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             @class.ClassName = computedClass;
             @class.Modifiers.Clear();
             @class.Modifiers.Add("public");
+            @class.Modifiers.Add("partial");
 
             if (FileKinds.IsComponentImport(codeDocument.GetFileKind()))
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
index 25415097f0..1989a7f3e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
@@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Assert
             Assert.Equal($"{ComponentsApi.ComponentBase.FullTypeName}", visitor.Class.BaseType);
-            Assert.Equal(new[] { "public", }, visitor.Class.Modifiers);
+            Assert.Equal(new[] { "public", "partial" }, visitor.Class.Modifiers);
             Assert.Equal("Test", visitor.Class.ClassName);
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index b441a86f38..94425c895b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -121,7 +121,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index dee5f78f1f..7fdac946cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 0a5c9e6973..1776638976 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index 9886669a0c..8401222f05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -10,6 +10,6 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1282:38,19 [33] )
+Generated Location: (1290:38,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index bc969c8af6..01fb793ed4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 0417372324..efd5f61a5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 1b311ffac3..fdcc121b0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -10,7 +10,7 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1280:38,17 [7] )
+Generated Location: (1288:38,17 [7] )
 |OnClick|
 
 Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +20,7 @@ Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1481:48,7 [89] )
+Generated Location: (1489:48,7 [89] )
 |
     Task OnClick(MouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 8d02e2b54c..dd0d3b23dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index bb7807ad5f..e2ee0d7c05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index f8399b23fe..8193f7248a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -10,6 +10,6 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1282:38,19 [32] )
+Generated Location: (1290:38,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 6193a76695..2b26ceb0a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index e2eabc9498..121af12b51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 03be8bfadf..9f295a0a35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -10,7 +10,7 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1280:38,17 [7] )
+Generated Location: (1288:38,17 [7] )
 |OnClick|
 
 Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +20,7 @@ Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1481:48,7 [73] )
+Generated Location: (1489:48,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 84cac0e8e8..8b87f31658 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index ec89ce657d..0790665cfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 1916b07cd6..0cf0d9f553 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2059:48,7 [50] )
+Generated Location: (2067:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 5a00dd85eb..67d274e681 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 40c7a8ac25..4b85287dbf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index b494dcb312..4951291164 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (969:25,30 [11] )
+Generated Location: (977:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1579:43,7 [65] )
+Generated Location: (1587:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 57e2130887..a8017f7f60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index a212e7bae1..5bc8c33a41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 9ecd211b8e..86504b3c33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1883:47,7 [50] )
+Generated Location: (1891:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 4484f1a45f..46d63a0d06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 30cebd1865..de77fc3ddf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 25c6988086..a885821348 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1883:47,7 [55] )
+Generated Location: (1891:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index c8bfc0fe1a..e65799997d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 0268f19e3b..f8c2a5e0d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 2ef0335db5..2a7ec03df2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1586:47,7 [50] )
+Generated Location: (1594:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index e1f835a623..e3e80bbb44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 8bd5424b6c..c2255708b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index febf366dee..6653660695 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (890:25,26 [11] )
+Generated Location: (898:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1562:46,7 [50] )
+Generated Location: (1570:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 60071ceb0f..9a7f87f621 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 9d7522111f..9c01570bd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index d4819b00d3..5ad7a60815 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1762:48,7 [50] )
+Generated Location: (1770:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 35ac8c9678..fd51374f9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index c669dfee2b..955016a0cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 28c62af7a3..5f860ae11c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (969:25,30 [11] )
+Generated Location: (977:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1399:43,7 [65] )
+Generated Location: (1407:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index c8bfc0fe1a..e65799997d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 3c83d639da..181e137835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 94cb7ac41c..f72ee7609e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1586:47,7 [50] )
+Generated Location: (1594:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index e1f835a623..e3e80bbb44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index a212e7bae1..5bc8c33a41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 1cc33f50d5..500ede1187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (890:25,26 [11] )
+Generated Location: (898:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1562:46,7 [50] )
+Generated Location: (1570:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 49a81abc8a..edbbbd509d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 50706736a0..28774dd004 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index bc42633054..66be5b3944 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1586:47,7 [55] )
+Generated Location: (1594:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 555897d252..83a8fd2a31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 6f9c65d90c..6011905aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 8354f5d085..18c001cfab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (977:25,24 [11] )
+Generated Location: (985:25,24 [11] )
 |person.Name|
 
 Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1578:47,1 [37] )
+Generated Location: (1586:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 3cf27c8dbc..56711a817d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
index 657741b08e..704d05beba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index eb604f4eb9..3b21ee4855 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1090:32,19 [11] )
+Generated Location: (1098:32,19 [11] )
 |ParentValue|
 
 Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1330:40,82 [28] )
+Generated Location: (1338:40,82 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1731:51,7 [55] )
+Generated Location: (1739:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 2ad7e8ca39..ef334675df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index 8af89adba4..f32d667aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 80054575f7..fcb9120c38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (955:25,33 [11] )
+Generated Location: (963:25,33 [11] )
 |CurrentDate|
 
 Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1334:36,7 [77] )
+Generated Location: (1342:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 2f9f73f9f3..0e0321cc17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index c2bffe88ef..86d7d5524e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index d491685d6e..3e46ea8e60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (955:25,33 [11] )
+Generated Location: (963:25,33 [11] )
 |ParentValue|
 
 Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1300:36,7 [50] )
+Generated Location: (1308:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 6c72cf50ff..599ea3cbcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
index d55cce1b12..8adadb919e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index d647010517..c4c65bc4c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1090:32,19 [11] )
+Generated Location: (1098:32,19 [11] )
 |ParentValue|
 
 Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1334:40,86 [28] )
+Generated Location: (1342:40,86 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1735:51,7 [55] )
+Generated Location: (1743:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index d132d64692..d2529bca65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 0d17a3b15d..3cf26978c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index b90f2ba46c..2761bdc878 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (941:25,19 [11] )
+Generated Location: (949:25,19 [11] )
 |ParentValue|
 
 Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1286:36,7 [55] )
+Generated Location: (1294:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index d132d64692..d2529bca65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index 13e4603f0c..3cd18bc247 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index b9f8a07075..853d8f12d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (941:25,19 [11] )
+Generated Location: (949:25,19 [11] )
 |ParentValue|
 
 Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1286:36,7 [55] )
+Generated Location: (1294:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 58e2c3ead9..a5ad6630ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 3d5a20a277..44d7a5fc47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 10c2355493..7940b19c98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (940:25,18 [11] )
+Generated Location: (948:25,18 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1285:36,7 [55] )
+Generated Location: (1293:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 1f93482650..e4e400a97b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index 4e0a9b45d9..749907c9dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 714d158f92..96607846e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (935:25,13 [11] )
+Generated Location: (943:25,13 [11] )
 |ParentValue|
 
 Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1280:36,7 [55] )
+Generated Location: (1288:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 6d964a9648..1bdb445896 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
index bd3a07f1da..7798c2595b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 38458c0f94..ba0aa7055a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1106:32,35 [11] )
+Generated Location: (1114:32,35 [11] )
 |ParentValue|
 
 Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1451:43,7 [44] )
+Generated Location: (1459:43,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index cb84e6838b..f46994a9fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
index 87417806aa..9cfbed5187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 72f36493d0..633a0cbb9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1106:32,35 [11] )
+Generated Location: (1114:32,35 [11] )
 |ParentValue|
 
 Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.CurrentCulture|
-Generated Location: (1366:40,102 [26] )
+Generated Location: (1374:40,102 [26] )
 |CultureInfo.CurrentCulture|
 
 Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1763:51,7 [44] )
+Generated Location: (1771:51,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 752a6e8a4c..2ea285ae7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
index 9cf34bf2c6..15704802ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index 880cdf737d..e88bfac2da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (846:24,2 [46] )
+Generated Location: (854:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1100:32,55 [26] )
+Generated Location: (1108:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1351:40,87 [2] )
+Generated Location: (1359:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1582:48,21 [6] )
+Generated Location: (1590:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index ae565ac6c6..20374c2f49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
index 5ec41f2891..f70171dcac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index 880cdf737d..e88bfac2da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (846:24,2 [46] )
+Generated Location: (854:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1100:32,55 [26] )
+Generated Location: (1108:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1351:40,87 [2] )
+Generated Location: (1359:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1582:48,21 [6] )
+Generated Location: (1590:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 16eb333f1b..6c54d3261d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 1566cc4b13..de3d230b83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 8aa24d9f91..20a570652a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (895:25,31 [7] )
+Generated Location: (903:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1095:35,7 [41] )
+Generated Location: (1103:35,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index f1402c510f..aa5257a6a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index ad7a8b56eb..e88e490e4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index afd07bee75..8c57cdc690 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (59:1,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (1101:32,15 [11] )
+Generated Location: (1109:32,15 [11] )
 |CurrentDate|
 
 Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1480:43,7 [77] )
+Generated Location: (1488:43,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 2c81c2ab06..b2463f4eae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index a36619c209..a872ec7277 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index da2906c913..25e1ae13e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (891:25,27 [11] )
+Generated Location: (899:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1114:34,55 [6] )
+Generated Location: (1122:34,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1313:44,7 [135] )
+Generated Location: (1321:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 0a5479cea8..d5b835dcc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 76cd88c845..bede3eb214 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 70ce319ca6..c294f9cc50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (891:25,27 [11] )
+Generated Location: (899:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1095:35,7 [77] )
+Generated Location: (1103:35,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 4bec837daf..58e1e4c874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index ed0c4bfc67..b98622244e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 8138e0a4d2..ad8f3bda42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (891:25,27 [11] )
+Generated Location: (899:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1095:35,7 [50] )
+Generated Location: (1103:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 703bc0e0ce..039ced4101 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
index ae0fc3cd64..fa7402fb14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 5d2ae4e43d..dbd883ed09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (951:25,29 [11] )
+Generated Location: (959:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1476:36,7 [77] )
+Generated Location: (1484:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index b15ddfef53..c00df8a132 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index 4f650a79fa..cd3f477f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 341e1eea38..573a569aad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (951:25,29 [11] )
+Generated Location: (959:25,29 [11] )
 |CurrentDate|
 
 Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1330:36,7 [77] )
+Generated Location: (1338:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 63f4552487..7e809d5ebe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index 6723842455..31c35a74a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index b443bef47e..cb9b451459 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (951:25,29 [11] )
+Generated Location: (959:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1340:36,7 [77] )
+Generated Location: (1348:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index e88bce3b6e..839cdeee36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 7d31616d54..d34118194a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 01aae5776f..fade921ecd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (65:1,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (1107:32,21 [11] )
+Generated Location: (1115:32,21 [11] )
 |CurrentDate|
 
 Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1486:43,7 [77] )
+Generated Location: (1494:43,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index f883f7afd9..7425d43101 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index ef8d403731..584539acdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 073152fdb4..c8df4dbee8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (943:25,21 [11] )
+Generated Location: (951:25,21 [11] )
 |CurrentDate|
 
 Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1322:36,7 [77] )
+Generated Location: (1330:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index 29c1053e5e..0290e9b793 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
index 9a5add6521..99d0e7ae8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index 876a9ff033..ec7e65c7c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (879:25,15 [11] )
+Generated Location: (887:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1083:35,7 [50] )
+Generated Location: (1091:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 29c1053e5e..0290e9b793 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index ad76db6807..912ce95305 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 876a9ff033..ec7e65c7c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (879:25,15 [11] )
+Generated Location: (887:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1083:35,7 [50] )
+Generated Location: (1091:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 68a2080324..ee4e81aee3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
index 1c62ade910..906c47fb07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index 7ec03d3ee7..acd0d909a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1170:34,34 [4] )
+Generated Location: (1178:34,34 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index bc51fcd9ef..e622c99563 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 153e88860b..697027ba8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 9f0f4fc7de..62fc1c0068 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1173:34,37 [5] )
+Generated Location: (1181:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1765:56,7 [21] )
+Generated Location: (1773:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index a5df564c24..80697f0b93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 7c63eb10ec..d4333e1089 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index a3dae2375d..0fa14c3f4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1091:34,37 [5] )
+Generated Location: (1099:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1747:55,7 [21] )
+Generated Location: (1755:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 4f7323a5d8..654c0915dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 0dbf027145..7dcdb9e98a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 61ebc61d7b..3871d99abb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (977:25,38 [2] )
+Generated Location: (985:25,38 [2] )
 |18|
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1145:33,24 [5] )
+Generated Location: (1153:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1632:50,7 [21] )
+Generated Location: (1640:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index b64f5abb07..05c7a07f83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 8f8e5cf377..e2aaaf777e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 674ff91c47..522b15f143 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (963:25,24 [5] )
+Generated Location: (971:25,24 [5] )
 |Value|
 
 Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1421:42,24 [5] )
+Generated Location: (1429:42,24 [5] )
 |Value|
 
 Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1816:60,7 [21] )
+Generated Location: (1824:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 749e03142d..ac68dd9c2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index 7f3d877c2b..ee10c3e939 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index 8a754a980e..d5c8f1708f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1170:34,34 [4] )
+Generated Location: (1178:34,34 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1464:43,8 [17] )
+Generated Location: (1472:43,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index d13dc319a9..b594c622c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index b9592300fd..4a657e5f69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
index 1f4ebd3b11..2d90d746d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1144:33,8 [17] )
+Generated Location: (1152:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index dcdd42885f..066b2c3328 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
index fa0a3d720e..5632e2f7a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index 7d02d0f497..0d14de6349 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1170:34,34 [4] )
+Generated Location: (1178:34,34 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1382:43,50 [2] )
+Generated Location: (1390:43,50 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 12f3793bd4..ec2e163edf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
index 25eb275509..dc8995e56c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
index 4b634587b2..32b7d596b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1143:33,37 [2] )
+Generated Location: (1151:33,37 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index a4f1ef9faf..33dd581cec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
index c02da938f9..0ec89fc98c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
index 91992ce60b..822413c0bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index e3c32b785d..968a8fdfc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
index 4bcc57c881..34c70b6497 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
index a1d9146951..34863580bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |"how are you?"|
-Generated Location: (1368:41,21 [14] )
+Generated Location: (1376:41,21 [14] )
 |"how are you?"|
 
 Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1786:57,21 [6] )
+Generated Location: (1794:57,21 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 763208227c..3b6399bae9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index 898fc12d48..737f45f2ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 29fd9cd544..932513beb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [48] )
 
 Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(__builder); |
-Generated Location: (1016:31,2 [34] )
+Generated Location: (1024:31,2 [34] )
 | RenderChildComponent(__builder); |
 
 Source Location: (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
         |
-Generated Location: (1228:40,7 [77] )
+Generated Location: (1236:40,7 [77] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -23,7 +23,7 @@ Source Location: (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1741:60,23 [9] )
+Generated Location: (1749:60,23 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 3bb8afce2a..334615b4a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
index fca1e65ac8..cb01235ab4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 109a769b74..ced963e356 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
         |
-Generated Location: (1017:31,2 [50] )
+Generated Location: (1025:31,2 [50] )
 |
     void RenderChildComponent()
     {
@@ -18,13 +18,13 @@ Source Location: (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1515:51,23 [9] )
+Generated Location: (1523:51,23 [9] )
 |
     }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1646:59,2 [25] )
+Generated Location: (1654:59,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 7af1cd161e..ef933bc582 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index 248bff85e3..2447c2c068 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index a013914c8f..62364faa13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (891:25,20 [6] )
+Generated Location: (899:25,20 [6] )
 |string|
 
 Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1096:34,34 [3] )
+Generated Location: (1104:34,34 [3] )
 |int|
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1385:43,46 [4] )
+Generated Location: (1393:43,46 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1693:52,22 [17] )
+Generated Location: (1701:52,22 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2050:62,6 [29] )
+Generated Location: (2058:62,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 208c80726f..a819c8eb10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index 9eb3be33a1..3a74f391c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
index f426774039..6c216e161b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |new List<long>()|
-Generated Location: (1142:33,36 [16] )
+Generated Location: (1150:33,36 [16] )
 |new List<long>()|
 
 Source Location: (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1352:41,22 [17] )
+Generated Location: (1360:41,22 [17] )
 |context.ToLower()|
 
 Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (1560:50,6 [29] )
+Generated Location: (1568:50,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 4837552cab..1622bc616a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
index 9fc99566f6..a887854aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
index d71bd72c42..937416839d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1156:33,20 [17] )
+Generated Location: (1164:33,20 [17] )
 |context.ToLower()|
 
 Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1377:42,16 [7] )
+Generated Location: (1385:42,16 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 0ac21533e2..58f8e5a3e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
index 042b7cb159..682293c17a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 79da952af0..4bd3cc288d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
index b98ae09892..b76382b456 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 0ac21533e2..58f8e5a3e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
index 18ae06bcf2..425da4b7c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 0ac21533e2..58f8e5a3e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
index a11869b683..c81ff937e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index ae88864dc8..1d2b6b3e13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index fcae53e045..3067b79c9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index b003737829..2ecb0afbb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (923:25,23 [9] )
+Generated Location: (931:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1429:45,7 [98] )
+Generated Location: (1437:45,7 [98] )
 |
     private int counter;
     private void Increment(EventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 24df5d5d96..8913f19f05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
index ac003d6aa2..41770aa8f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
index 886078a3e0..5d3920f4ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1023:25,28 [7] )
+Generated Location: (1031:25,28 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 8a92d8e5be..f7352fef5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
index 541586f717..0eb8c4d559 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index bfc910e3cd..09902b8cbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (984:25,31 [13] )
+Generated Location: (992:25,31 [13] )
 |42.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 820652633e..448b9305da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
index 0951329005..5312b07cca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
index 2ffb89de20..55b338fc26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1072:26,54 [26] )
+Generated Location: (1080:26,54 [26] )
 |context.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index a3634216a3..b1d65fb7e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index bf81825dc6..f8241a525f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
index d146087517..1cea8aef07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1047:26,32 [23] )
+Generated Location: (1055:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index a3634216a3..b1d65fb7e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index 0d9d741f9b..4fdd253a12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
index d146087517..1cea8aef07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1047:26,32 [23] )
+Generated Location: (1055:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 4978aae651..83643e9665 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index 74e0e162f7..8e0345da0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index b7c197ca34..dd71c048d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (924:25,24 [21] )
+Generated Location: (932:25,24 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1442:45,7 [87] )
+Generated Location: (1450:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 47210e050e..7ab834bd56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
index 52c31f052a..b7dc70611a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
index e34837f351..268dd1e139 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |43.ToString()|
-Generated Location: (942:26,55 [13] )
+Generated Location: (950:26,55 [13] )
 |43.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index b5992d9e8a..2392c8179c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
index ae2202df8a..3041dde946 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage"
                 DirectiveToken - (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
index 8dd4c199df..d72859c66f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/MyPage"|
-Generated Location: (713:19,37 [9] )
+Generated Location: (721:19,37 [9] )
 |"/MyPage"|
 
 Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/AnotherRoute/{id}"|
-Generated Location: (942:29,37 [20] )
+Generated Location: (950:29,37 [20] )
 |"/AnotherRoute/{id}"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 15f0710ed8..d9b6ab374e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index 37ecb57cb6..82af84767f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index 13c6f4aba3..d0ee4d7f0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (969:25,17 [3] )
+Generated Location: (977:25,17 [3] )
 |123|
 
 Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1238:34,18 [4] )
+Generated Location: (1246:34,18 [4] )
 |true|
 
 Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (1532:44,20 [14] )
+Generated Location: (1540:44,20 [14] )
 |new SomeType()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index ed63574005..e2360f9690 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 2ff059cf3f..bcca583ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 5cb8bc4a78..08a8a06465 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1173:32,26 [7] )
+Generated Location: (1181:32,26 [7] )
 |OnClick|
 
 Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1680:52,7 [60] )
+Generated Location: (1688:52,7 [60] )
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index 4d90da0a66..803232690f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using AnotherTest;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
index 7e7c4b5c22..7a9b86a7d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
index 2facaeab6c..91b232a1f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1445:42,13 [7] )
+Generated Location: (1453:42,13 [7] )
 |context|
 
 Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (2226:69,13 [7] )
+Generated Location: (2234:69,13 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index dba8b3e6a1..734c541107 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -23,7 +23,7 @@ using System.Reflection;
 #line hidden
 #nullable disable
     [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-    public class _Imports : System.Object
+    public partial class _Imports : System.Object
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
index ee3d779d11..e14e2107c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -9,7 +9,7 @@ Document -
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - 
             IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-        ClassDeclaration -  - public - _Imports - System.Object - 
+        ClassDeclaration -  - public partial - _Imports - System.Object - 
             DesignTimeDirective - 
                 DirectiveToken - (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) - MainLayout
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
index 47a3c52604..1e49237c4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
@@ -10,11 +10,11 @@ Generated Location: (448:19,0 [23] )
 
 Source Location: (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor)
 |MainLayout|
-Generated Location: (841:32,0 [10] )
+Generated Location: (849:32,0 [10] )
 |MainLayout|
 
 Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
 |Foo|
-Generated Location: (1281:49,6 [3] )
+Generated Location: (1289:49,6 [3] )
 |Foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index fcccf73b5a..1e1fc9b09f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
index 9eab05c608..4a042e8416 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index 6e8856f24e..fb16c68a65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (979:25,27 [11] )
+Generated Location: (987:25,27 [11] )
 |"very-cool"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index fd817fd0b7..d82732a8cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index 493a563308..c6fcff6179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
             DesignTimeDirective - 
                 DirectiveToken - (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1
                 DirectiveToken - (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 626321cc28..7aeb6d9389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -5,32 +5,32 @@ Generated Location: (276:11,0 [38] )
 
 Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TItem1|
-Generated Location: (689:23,22 [6] )
+Generated Location: (697:23,22 [6] )
 |TItem1|
 
 Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TItem2|
-Generated Location: (908:33,22 [6] )
+Generated Location: (916:33,22 [6] )
 |TItem2|
 
 Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
     |
-Generated Location: (1415:50,1 [38] )
+Generated Location: (1423:50,1 [38] )
 |foreach (var item2 in Items2)
 {
     |
 
 Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildContent(item2)|
-Generated Location: (1581:59,6 [19] )
+Generated Location: (1589:59,6 [19] )
 |ChildContent(item2)|
 
 Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1732:66,8 [3] )
+Generated Location: (1740:66,8 [3] )
 |
 }|
 
@@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1914:76,7 [185] )
+Generated Location: (1922:76,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index de8fb88166..1d4b0a0e43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Foo = Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
index 49b772e1d5..5af20cdaca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [32] x:\dir\subdir\Test\TestComponent.cshtml) - static Test2.SomeComponent
         UsingDirective - (36:1,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Foo = Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index b18ce55394..89b714505e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
index d7543ebcf9..b85efa325c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index 5f5c3fccdf..5efbef1353 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1323:36,43 [4] )
+Generated Location: (1331:36,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 090642d184..7bb86097aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
index b91de37da2..911863c1c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index 23e9abd843..186e32d368 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (978:25,26 [1] )
+Generated Location: (986:25,26 [1] )
 |1|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1554:44,26 [1] )
+Generated Location: (1562:44,26 [1] )
 |2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index ac01a589cf..e5d3bd9a15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
index a874feb5e5..3e327e8aac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (57:2,11 [8] x:\dir\subdir\Test\_Imports.razor) - New.Test
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 022aa82fcc..37d3a33f1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class Counter : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
index 510e28febf..21b3864e33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (11:0,11 [8] Counter.razor) - New.Test
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
index f0453f843a..c5dc313fbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (11:0,11 [8] x:\dir\subdir\Test\Pages/Counter.razor)
 |New.Test|
-Generated Location: (850:31,44 [8] )
+Generated Location: (858:31,44 [8] )
 |New.Test|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 871aff83f5..c113cb57c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
index 1bff96642b..3e37806580 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 2ccb2c7033..8c2e5fe5ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (1144:34,1 [18] )
+Generated Location: (1152:34,1 [18] )
 |if (true)
 {
     |
@@ -10,7 +10,7 @@ Generated Location: (1144:34,1 [18] )
 Source Location: (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1322:43,38 [3] )
+Generated Location: (1330:43,38 [3] )
 |
 }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
index f62729fa19..b0db755550 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index fe5bbc7cc0..06a881a0e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
index 094e0f80a8..76139301ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 8ea8d9783a..5b73a6c0a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index be32db415c..3353494634 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 53f3c595e4..be00786267 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1226:37,7 [87] )
+Generated Location: (1234:37,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 6b2c4db765..8a6612870d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
index e23e80d14e..a81183d4be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor)
             IntermediateToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - CSharp - [Serializable]
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - [Serializable]
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 1ffc621022..ba4e389975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 8061dce1d7..7e414f514d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 1f2a201d47..43458de26a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1116:30,40 [12] )
+Generated Location: (1124:30,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1470:47,7 [49] )
+Generated Location: (1478:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index b26e07ae5f..1699f12aae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index 13312be860..db322fecfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index be1d874768..76333b9027 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1072:29,19 [9] )
+Generated Location: (1080:29,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index ba2bab42ad..0a9bcda7fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
index 156bb74137..ed187e3370 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (24:1,11 [11] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
index 084270fa26..739b232ae0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (327:12,0 [10] )
 
 Source Location: (24:1,11 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |AnotherTest|
-Generated Location: (719:24,44 [11] )
+Generated Location: (727:24,44 [11] )
 |AnotherTest|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 9fe44c8dcf..b4b4c48eab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 2e4013600f..3b188dad97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index af797a4e3d..3b6b930545 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1085:29,40 [10] )
+Generated Location: (1093:29,40 [10] )
 |myInstance|
 
 Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1450:45,7 [104] )
+Generated Location: (1458:45,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index aa03027573..0233eaeb4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index a2aae2c90d..3527fba401 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index eceb35d3f6..46671b9c79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1041:28,19 [10] )
+Generated Location: (1049:28,19 [10] )
 |myInstance|
 
 Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1406:44,7 [104] )
+Generated Location: (1414:44,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index e63835fdbe..c4601ebdd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
index 75b0855ba8..317e992fd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index e350d50bba..39d4db26b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1155:26,51 [14] )
+Generated Location: (1163:26,51 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1690:47,7 [93] )
+Generated Location: (1698:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 437aa936f8..a9f73f1b87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
index 2c052ccece..a8a59d2237 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 1071f34353..cfc099e3b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1157:26,53 [14] )
+Generated Location: (1165:26,53 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1692:47,7 [93] )
+Generated Location: (1700:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 2b30a0fc0c..d571e065d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
index dcd6ec48af..608ba5264d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index a4d068708f..4534d0e8aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (959:25,20 [2] )
+Generated Location: (967:25,20 [2] )
 |18|
 
 Source Location: (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1142:33,39 [14] )
+Generated Location: (1150:33,39 [14] )
 |someAttributes|
 
 Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1500:50,7 [93] )
+Generated Location: (1508:50,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index d31201916b..354200c7b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
index 5413c22919..5279e9fe92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index e6f880d0aa..fb05948d7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1156:26,52 [14] )
+Generated Location: (1164:26,52 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1691:47,7 [93] )
+Generated Location: (1699:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 3243bc0179..e5f4f383e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using Test2;
 #nullable disable
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
index 2a28310682..122278bd76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         UsingDirective - (46:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage"
                 DirectiveToken - (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
index d6ee48c3df..5350d38db7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [11] )
 
 Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/MyPage"|
-Generated Location: (847:26,37 [9] )
+Generated Location: (855:26,37 [9] )
 |"/MyPage"|
 
 Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/AnotherRoute/{id}"|
-Generated Location: (1076:36,37 [20] )
+Generated Location: (1084:36,37 [20] )
 |"/AnotherRoute/{id}"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index d60d215ff3..1f89693af5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
index 37a4617d8e..6f0e7a47c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         UsingDirective - (15:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 6c8eb2ea9a..4ef8941320 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index d46e2e25e2..2df363efa0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 5c3c63a812..65c601f948 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (846:24,2 [40] )
+Generated Location: (854:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1069:33,43 [7] )
+Generated Location: (1077:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 02c86e143a..848a00a4ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index afb6766d6a..8e623de3ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 7ec86b882d..bc4ddfe735 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (846:24,2 [40] )
+Generated Location: (854:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1068:33,42 [7] )
+Generated Location: (1076:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index 1a7c0465eb..4e08d723a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
index 6e788003a9..999022b95d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 8d0f8e9df3..4cd3b0d63f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 1caa937f75..f76be959fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index ecd295ad1c..a745b983cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (976:25,23 [7] )
+Generated Location: (984:25,23 [7] )
 |message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1278:34,48 [7] )
+Generated Location: (1286:34,48 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2353:57,12 [30] )
+Generated Location: (2361:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 7652aed053..fe848920d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 81db5db1e1..1fbb764c2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 626a5a0bb8..e5c80fe12c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1113:25,31 [9] )
+Generated Location: (1121:25,31 [9] )
 |(s) => {}|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1429:34,59 [7] )
+Generated Location: (1437:34,59 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2504:57,12 [30] )
+Generated Location: (2512:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 8ebc97e75f..19d7562121 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 2c92b68993..babb3ca22b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 2784a10f15..4b22752f72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1063:25,59 [9] )
+Generated Location: (1071:25,59 [9] )
 |(s) => {}|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1348:34,29 [7] )
+Generated Location: (1356:34,29 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2423:57,12 [30] )
+Generated Location: (2431:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index a5a20e720c..55f854572c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
index 55906fb718..b88d9593c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 1a7c0465eb..4e08d723a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
index 4a74314e02..d88259351a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 4917950d58..f17748b1ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 2e45fac267..382c472e41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 08e0539814..dd1b9fc559 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1126:32,40 [4] )
+Generated Location: (1134:32,40 [4] )
 |text|
 
 Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1455:43,12 [35] )
+Generated Location: (1463:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
index c57b44be65..ebe618b419 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index b9ce8a2d6e..007176df97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 1ee533154c..d651f3df3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 90f5409f7a..6277ec5af2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1223:32,79 [8] )
+Generated Location: (1231:32,79 [8] )
 |() => {}|
 
 Source Location: (86:2,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1482:41,35 [4] )
+Generated Location: (1490:41,35 [4] )
 |text|
 
 Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1811:52,12 [35] )
+Generated Location: (1819:52,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 4917950d58..f17748b1ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 09596c8cea..006a65a075 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 08e0539814..dd1b9fc559 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1126:32,40 [4] )
+Generated Location: (1134:32,40 [4] )
 |text|
 
 Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1455:43,12 [35] )
+Generated Location: (1463:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index b562fbe334..0494d167d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index 4bd48b0978..15410c9711 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index eb4ba33b69..a4a8de8b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1179:32,32 [8] )
+Generated Location: (1187:32,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
index f5084c8f15..749ab79d84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
index 571cb8412f..c8936356d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 90ef6d42f7..cd15a39fdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 6ef5325c98..84f9d29759 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index 151176cd4f..69b644aa3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (912:25,37 [10] )
+Generated Location: (920:25,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1116:35,7 [49] )
+Generated Location: (1124:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index b8c949ec27..6b0af75e6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index d3d4ec8299..3ea736f333 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 25deb5f4b0..429345fdf4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (901:25,37 [3] )
+Generated Location: (909:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (1121:34,49 [10] )
+Generated Location: (1129:34,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1325:44,7 [109] )
+Generated Location: (1333:44,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 4d3ac61da7..126cbce953 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index c644e00e2b..60ce180b19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 5fcd706664..a0bb647cba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (900:26,7 [49] )
+Generated Location: (908:26,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 51ee950d02..856fb948b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index 6da670c14d..1c74425cbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 128fa2be26..c51736a13c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (881:24,37 [6] )
+Generated Location: (889:24,37 [6] )
 |myElem|
 
 Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1126:33,7 [128] )
+Generated Location: (1134:33,7 [128] )
 |
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 5f22a7aec4..cd81610446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 5acd58a514..40e6ecee53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index bf4a929596..aef5b0284f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (901:25,37 [3] )
+Generated Location: (909:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1090:33,49 [8] )
+Generated Location: (1098:33,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
         [Parameter] public int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1337:42,7 [164] )
+Generated Location: (1345:42,7 [164] )
 |
         private ElementReference _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 965abd8a50..dd06fe3e4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 27d46dcac7..bd4b7a3579 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
index 4a7fee9ede..02d0c657bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 745f25995e..8d64ef342f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1125:25,44 [14] )
+Generated Location: (1133:25,44 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1334:35,7 [93] )
+Generated Location: (1342:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 21eb746abd..7e93b454b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 6e83da6e4a..b382d4f18d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 3d403febff..dc098abcb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (900:26,7 [93] )
+Generated Location: (908:26,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index c46b76cf90..a6aef64d4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
index 26b987b602..25606a8c70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 8089ffd525..7fd4be80ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1127:25,46 [14] )
+Generated Location: (1135:25,46 [14] )
 |someAttributes|
 
 Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1336:35,7 [93] )
+Generated Location: (1344:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index b246c7fd8e..7612a9b225 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
index c0246900dd..42b0de041a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index bb7f972a65..e679a6fe4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1126:25,45 [14] )
+Generated Location: (1134:25,45 [14] )
 |someAttributes|
 
 Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1335:35,7 [93] )
+Generated Location: (1343:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index c652f866cb..f5a031e133 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index de66db16f7..7de1dc47b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index b6cb825cb3..73d3f9c36c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
-Generated Location: (1344:32,24 [61] )
+Generated Location: (1352:32,24 [61] )
 |EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
 
 Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1903:52,7 [87] )
+Generated Location: (1911:52,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 5353f83ed0..1d1c5bbce1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index 4af13ee8b7..2312ffb6cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index e3038b601c..14559e0381 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1179:25,23 [9] )
+Generated Location: (1187:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1686:45,7 [87] )
+Generated Location: (1694:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 563d1df5ee..9c7915c284 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index c379757ede..310c88b923 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 2a590e855a..a45c60c32f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1343:32,23 [9] )
+Generated Location: (1351:32,23 [9] )
 |Increment|
 
 Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1850:52,7 [103] )
+Generated Location: (1858:52,7 [103] )
 |
     private int counter;
     private void Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 5e157d0d73..8b89c2aa9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index 76cc892f7e..100ecc72d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 7c07f01dbd..d7564bd3b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1343:32,23 [9] )
+Generated Location: (1351:32,23 [9] )
 |Increment|
 
 Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -16,7 +16,7 @@ Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1850:52,7 [139] )
+Generated Location: (1858:52,7 [139] )
 |
     private int counter;
     private Task Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 7ab0627213..a9b555b48c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 20092e795c..3480729ec9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 080d884d11..070d3e4a80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1179:25,23 [9] )
+Generated Location: (1187:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1686:45,7 [123] )
+Generated Location: (1694:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 735010701d..ef9e774f85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index 0b15039c86..cca8a88595 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 88d9713f37..65f1fbac89 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1343:32,23 [9] )
+Generated Location: (1351:32,23 [9] )
 |Increment|
 
 Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1850:52,7 [104] )
+Generated Location: (1858:52,7 [104] )
 |
     private int counter;
     private void Increment(ChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 954e9007b9..0ef91b49e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index ef4fa09760..051f34b558 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 9bdd713f1a..a97950dcc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1076:25,24 [45] )
+Generated Location: (1084:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1619:45,7 [87] )
+Generated Location: (1627:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 5003d15f3c..9086452809 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index 4af13ee8b7..2312ffb6cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 8a1f8344d8..4635ad9daf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1582:45,7 [87] )
+Generated Location: (1590:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index fa5a6c4e59..1af6ec9ac3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index e60135c9b0..635bf3e438 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index d04825c09f..970b250a5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1582:45,7 [95] )
+Generated Location: (1590:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 3afaaad32b..1e3d615141 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 20092e795c..3480729ec9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 61213c43c9..564f0e4a51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1582:45,7 [123] )
+Generated Location: (1590:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index f070a61d20..9abf50fde5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 0b7403d8c3..174bc9c60c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 84a885f977..a3e8e761fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1582:45,7 [131] )
+Generated Location: (1590:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 7bc79b2b01..115b73ab91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 27e6eac9ef..f07021ed07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index fbaff0b86a..0e064de694 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 01d1037d52..e9a734f8ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1064:33,7 [47] )
+Generated Location: (1072:33,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index faf02f910b..fc4b8e213e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index edc13cae62..23d5ef910b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 4f132ed602..c999a8456c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(EventArgs e) {
     }
 |
-Generated Location: (1365:42,7 [42] )
+Generated Location: (1373:42,7 [42] )
 |
     void OnClick(EventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index dc964e9b85..5fbc7cf4c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 0e1b27d1b9..da27753f28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 49ef3dcaf6..73fed903fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1365:42,7 [47] )
+Generated Location: (1373:42,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index fca5207019..1b0cf7c3ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index d619245f3d..4bfbd322ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 2f3e5bc613..a7672c7e36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (1164:32,17 [8] )
+Generated Location: (1172:32,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index dc964e9b85..5fbc7cf4c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 0e1b27d1b9..da27753f28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 49ef3dcaf6..73fed903fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1365:42,7 [47] )
+Generated Location: (1373:42,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index fec5cfbd8f..ac2dab59b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 3a696287ad..4017700844 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index b60c32ad09..cb12bf8b6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 2af1a8b06e..999457560a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1365:42,7 [31] )
+Generated Location: (1373:42,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 7a6d81473c..ffe44f5995 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index f7262ee345..178cd3ceb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index 52a10228c8..55c29e460e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (1164:32,17 [9] )
+Generated Location: (1172:32,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index df0c79a6cb..3d9855ff5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 5191583e87..b7fe8d87f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 7090ffb026..d3493b4c48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
index 93f6af217c..168465ac86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
index 8584530928..95633b5f10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |(int x) => {}|
-Generated Location: (1332:40,31 [13] )
+Generated Location: (1340:40,31 [13] )
 |(int x) => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index 32a5e149aa..de861983b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
index 2b4c766c99..4dca9b91d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
index 458b346f18..2805c448c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1350:40,31 [7] )
+Generated Location: (1358:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 36d80f3477..bc13e130aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
index 2b4c766c99..4dca9b91d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 6db713282c..bc7bd641ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1439:40,31 [7] )
+Generated Location: (1447:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index abeb020cc1..a28f8dce5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
index 2b4c766c99..4dca9b91d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 5da6791c80..39e5dcc93a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1332:40,31 [7] )
+Generated Location: (1340:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index b3788a98f4..863d440862 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test.Shared;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index 94be1bdd45..54becf8a6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Test.Shared
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 37ca1aa1d0..cd31dfd755 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1098:32,19 [1] )
+Generated Location: (1106:32,19 [1] )
 |3|
 
 Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Hello|
-Generated Location: (1269:40,28 [5] )
+Generated Location: (1277:40,28 [5] )
 |Hello|
 
 Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1618:57,7 [38] )
+Generated Location: (1626:57,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index 5b6d83a8c0..b9a60dcaf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index f634b69431..85fdfcc5f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
index b7ec0ca120..c950299d31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (890:25,19 [3] )
+Generated Location: (898:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1159:34,29 [1] )
+Generated Location: (1167:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1491:45,38 [3] )
+Generated Location: (1499:45,38 [3] )
 |_my|
 
 Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +18,7 @@ Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1856:61,7 [90] )
+Generated Location: (1864:61,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
index 80c6779224..3da4f72d97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index 2d876f125f..e6b8351e48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index 317c9822e4..cb113e9f9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (958:25,19 [1] )
+Generated Location: (966:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1143:33,28 [3] )
+Generated Location: (1151:33,28 [3] )
 |_my|
 
 Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1516:51,7 [90] )
+Generated Location: (1524:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index d3d98b440d..f3321b628f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index f0f2a741c9..19086d53a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
index eed197611e..79a2ffad1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (970:25,26 [4] )
+Generated Location: (978:25,26 [4] )
 |"hi"|
 
 Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1154:33,8 [17] )
+Generated Location: (1162:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 6033862880..6cc25d558a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index 509efd2240..24235138c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 9f7368292f..39638474c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (890:25,19 [3] )
+Generated Location: (898:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1159:34,29 [1] )
+Generated Location: (1167:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1522:46,38 [8] )
+Generated Location: (1530:46,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1874:63,7 [47] )
+Generated Location: (1882:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 7f84ecedc2..2c91e55ec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index a834c28a2e..d6d0f25875 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 9093430ce1..d9ce2b95a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (958:25,19 [1] )
+Generated Location: (966:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1129:33,28 [8] )
+Generated Location: (1137:33,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1481:50,7 [47] )
+Generated Location: (1489:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 83a65c13b4..7bd71349a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 632e80e8d9..b97b644059 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 95c444b36c..b37b592b3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (850:24,6 [10] )
+Generated Location: (858:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 5cbcb559fd..930aa172c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
index 4edb1a8a14..8bb2192d4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 6676cb0502..80e09bdef9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using System;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
index 927fe7d9a8..f2a48c5949 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - System
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 8bdbb60f09..ac10a4d51c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index 104b50853b..f6e0431c7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index cc263bb7da..2e6c6499c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (846:24,2 [40] )
+Generated Location: (854:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1012:32,6 [7] )
+Generated Location: (1020:32,6 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 9295208389..58629a7b37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
index 03dfd3e21f..9233c69b73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
index 3a33c2a08a..e750457279 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1124:28,14 [6] )
+Generated Location: (1132:28,14 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index a38b595d69..b879426548 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
index 7a231f2e1a..5512d95633 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index db6e74ad1a..5aff46ae38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (1249:38,7 [39] )
+Generated Location: (1257:38,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index af1c571a8c..b1f9770253 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
index 1fed8fe995..e43ec298e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 7cef5a2c1e..c7385e1fed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (846:24,2 [54] )
+Generated Location: (854:24,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Index|
-Generated Location: (1116:32,63 [13] )
+Generated Location: (1124:32,63 [13] )
 |context.Index|
 
 Source Location: (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Item.ToLower()|
-Generated Location: (1332:39,80 [22] )
+Generated Location: (1340:39,80 [22] )
 |context.Item.ToLower()|
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1599:47,107 [2] )
+Generated Location: (1607:47,107 [2] )
 |; |
 
 Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1832:55,24 [8] )
+Generated Location: (1840:55,24 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 7bbc4fe7a6..48f6a62cb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 15e21249c8..29ce09a37f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 3661589ffb..6e4bdeb354 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (846:24,2 [45] )
+Generated Location: (854:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1226:34,69 [11] )
+Generated Location: (1234:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1799:53,89 [3] )
+Generated Location: (1807:53,89 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1978:62,7 [76] )
+Generated Location: (1986:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index b2d64c6017..4a13a2885d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 280e1a3345..599f28f9a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 96e3449c79..6e848206cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (846:24,2 [45] )
+Generated Location: (854:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1226:34,69 [11] )
+Generated Location: (1234:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1799:53,89 [3] )
+Generated Location: (1807:53,89 [3] )
 |;
 |
 
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2051:61,6 [15] )
+Generated Location: (2059:61,6 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +29,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2425:79,7 [76] )
+Generated Location: (2433:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index a6a1643d45..8eb1225746 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
index 5cdd6a65b9..cd0cb8b280 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index 8f8fa4f40f..8a730bfcdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (846:24,2 [47] )
+Generated Location: (854:24,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1102:32,56 [11] )
+Generated Location: (1110:32,56 [11] )
 |person.Name|
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1324:40,73 [2] )
+Generated Location: (1332:40,73 [2] )
 |; |
 
 Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1562:48,30 [8] )
+Generated Location: (1570:48,30 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index ba72315905..b90678dfb8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
index 34ab875be8..c6aaf81588 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 2f65973e87..8b7879ad5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (850:24,6 [25] )
+Generated Location: (858:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (997:27,33 [11] )
+Generated Location: (1005:27,33 [11] )
 |person.Name|
 
 Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1064:33,0 [1] )
+Generated Location: (1072:33,0 [1] )
 |)|
 
 Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1244:42,7 [138] )
+Generated Location: (1252:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 0f5c223833..061003e11d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
index 2640488d84..78d49e08ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index f839f8e262..a26def3bcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (846:24,2 [45] )
+Generated Location: (854:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1094:33,50 [11] )
+Generated Location: (1102:33,50 [11] )
 |person.Name|
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1310:41,67 [3] )
+Generated Location: (1318:41,67 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1489:50,7 [76] )
+Generated Location: (1497:50,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 3093889906..d8d64d9fde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
index 25517a3745..e3b4694a96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 6dc660afd7..e07a94842d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (850:24,6 [25] )
+Generated Location: (858:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (998:27,34 [11] )
+Generated Location: (1006:27,34 [11] )
 |person.Name|
 
 Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1065:33,0 [1] )
+Generated Location: (1073:33,0 [1] )
 |)|
 
 Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1245:42,7 [138] )
+Generated Location: (1253:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 605c196eca..ba51ff79c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
index d062ce15dd..57fd4d2864 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index e68b9e7c4f..b3d0981a58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (846:24,2 [27] )
+Generated Location: (854:24,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1086:33,45 [2] )
+Generated Location: (1094:33,45 [2] )
 |; |
 
 Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1252:41,22 [8] )
+Generated Location: (1260:41,22 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 6495fb500f..120d5acb21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
index f6be33ade2..aa0c0ee968 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index d7620053b6..34753e68c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson(|
-Generated Location: (850:24,6 [13] )
+Generated Location: (858:24,6 [13] )
 |RenderPerson(|
 
 Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (885:26,0 [1] )
+Generated Location: (893:26,0 [1] )
 |)|
 
 Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1065:35,7 [54] )
+Generated Location: (1073:35,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index afa761f1ee..33825838d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index e0aafb2816..13c0a91675 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 62902491e7..0213ca9e85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (882:25,18 [1] )
+Generated Location: (890:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1520:46,7 [24] )
+Generated Location: (1528:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index d181ad3baa..4fda0dc061 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 842e1a2894..6a33cfef99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 6f6d5c5392..6ca17d2c2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (883:25,19 [8] )
+Generated Location: (891:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1253:35,46 [12] )
+Generated Location: (1261:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1921:56,7 [88] )
+Generated Location: (1929:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index 020c4b2ffd..18660d6d9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
index 622a2a9eb8..aa507e5482 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/"
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
index 50ca507c80..c0fb161bf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/"|
-Generated Location: (631:18,37 [3] )
+Generated Location: (639:18,37 [3] )
 |"/"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index 020c4b2ffd..18660d6d9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
index 458f772f25..9624dc31ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/"
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
index 50ca507c80..c0fb161bf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/"|
-Generated Location: (631:18,37 [3] )
+Generated Location: (639:18,37 [3] )
 |"/"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 2683f01037..51cbfd3b5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 50d3feedf1..daebd65a52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 14fb1bf510..e8bb1d649e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -5,12 +5,12 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (1164:32,17 [16] )
+Generated Location: (1172:32,17 [16] )
 |OnComponentHover|
 
 Source Location: (99:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1393:41,55 [13] )
+Generated Location: (1401:41,55 [13] )
 |ParentBgColor|
 
 Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +21,7 @@ Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1599:51,7 [130] )
+Generated Location: (1607:51,7 [130] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
index bfc819e290..30ca542683 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index 076898ac35..4b5f6a8517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index b79bd17799..d2e0e08d1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 894c267cc3..34c80001e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -9,7 +9,7 @@ Source Location: (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml)
     if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
-Generated Location: (1017:31,2 [138] )
+Generated Location: (1025:31,2 [138] )
 |
     var output = string.Empty;
     if (__builder == null) output = "Builder is null!";
@@ -18,13 +18,13 @@ Generated Location: (1017:31,2 [138] )
 
 Source Location: (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1293:42,16 [6] )
+Generated Location: (1301:42,16 [6] )
 |output|
 
 Source Location: (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1390:47,38 [2] )
+Generated Location: (1398:47,38 [2] )
 |
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index f06361ba0c..ac84d0d333 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index 42c3660ca5..8e3e7ef7bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index 0e616a2a32..9bd6d6d986 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -11,7 +11,7 @@ Source Location: (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml)
         if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
-Generated Location: (1070:33,7 [221] )
+Generated Location: (1078:33,7 [221] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -22,14 +22,14 @@ Generated Location: (1070:33,7 [221] )
 
 Source Location: (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1433:46,20 [6] )
+Generated Location: (1441:46,20 [6] )
 |output|
 
 Source Location: (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1592:53,30 [9] )
+Generated Location: (1600:53,30 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index ad8aa14710..a0284c7ec0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 35e3f7c321..13e1c3de4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 8eacd0f0e4..fd50a6b5eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (850:24,6 [10] )
+Generated Location: (858:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 28fe1e3b44..49d1e8750a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
index 35cade949f..fc0c406756 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index b2571c3cd6..8c93eba3be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
index 5f10fd43f9..c7c90f4e44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /my/url
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/my/url"
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
index 33faf34d87..583d309981 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/my/url"|
-Generated Location: (637:18,37 [9] )
+Generated Location: (645:18,37 [9] )
 |"/my/url"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
index 341855a002..4fdbf78ead 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 92ff4bb6b5..710c047fb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
index 34f9b31b7a..3043d63824 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 9a0ef8f6c5..05e9ef8676 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (876:25,12 [3] )
+Generated Location: (884:25,12 [3] )
 |Foo|
 
 Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1076:35,11 [29] )
+Generated Location: (1084:35,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index cae7bb3d7f..eab49a6045 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 5212899dfb..127fb7b765 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index c28606eb3b..5fa17a9b98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 2f95161f9b..b42dd6f4fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 4a18dbb4bc..e4687bd712 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1332:43,7 [89] )
+Generated Location: (1340:43,7 [89] )
 |
     Task OnClick(MouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 6d7dd7383d..88caac3c59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index b624135b5a..adab7b7583 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 44c19bd800..ba00b2da01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index a8fa8d0cef..0bfa1a3926 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 4a12aaef2c..eba61f56ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1332:43,7 [73] )
+Generated Location: (1340:43,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 5cd6084037..55234cdba3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index 0e5d245109..91cbc7faf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index d6bdff1db6..bb848b0032 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1681:32,7 [50] )
+Generated Location: (1689:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 814786e547..6e3e68877b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index b3e91d9b99..0aab8e86f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index dc0537f1c7..36538febe3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1143:28,7 [65] )
+Generated Location: (1151:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 4446948e63..3b8e29ac25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index ff2e3f4654..c06a89bb4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index be126a558b..6c56427d45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1465:31,7 [50] )
+Generated Location: (1473:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index e538b50f99..20888e990a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 743e22d318..500bc17c10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 8436b299b5..14cb2239dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1465:31,7 [55] )
+Generated Location: (1473:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 30a38342d4..905a27f074 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 9e326bc91b..919df85e19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index aa6d34cc88..d9080bb10a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1165:31,7 [50] )
+Generated Location: (1173:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index f335bf5a5f..57819b41eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index b486ac5e19..a315ac1d07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 370629cb01..6dd6701c76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1155:31,7 [50] )
+Generated Location: (1163:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 032d60eb93..a5f326dc6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 3550f88eb5..213251c8b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 7c171fc52e..91e202afd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1384:32,7 [50] )
+Generated Location: (1392:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 37549da1d7..2e83f7e80a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 1c009d6652..b1a439ad32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 7edbda14cc..a7b081890e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (963:28,7 [65] )
+Generated Location: (971:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 7fb0afa274..cc197ea8ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 7c554e3b6d..bf2c911a81 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 56e7bb69bf..7a3e31de98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1168:31,7 [50] )
+Generated Location: (1176:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index fdd9b14c6d..8c314dfe8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index ff2e3f4654..c06a89bb4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 15b74739f3..912a736913 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1158:31,7 [50] )
+Generated Location: (1166:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 08d517b75d..e842e725c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index c17544f755..af14d603b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 5fbe3fefa3..3cf7ba4a3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1168:31,7 [55] )
+Generated Location: (1176:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 6d07521a8d..23d0b99cc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index e92bb8d38c..68bafe0a3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 6df29f3a49..7ecdcae141 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1160:31,1 [37] )
+Generated Location: (1168:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 613222c7f6..04a8a17176 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
index 3a18e39b03..8611693c34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index 5121cb2545..6cf5ab743f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1668:47,7 [55] )
+Generated Location: (1676:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 31bcd414be..7c56e32bfd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index ae698d2ed9..d1cc9dead3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 36a3a6787f..1a322e71bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1329:33,7 [77] )
+Generated Location: (1337:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 9b7a94d904..d084b59085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 0e78bca4d0..506a9096b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index d55e8ff852..044e942756 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1295:33,7 [50] )
+Generated Location: (1303:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 18a0238b4e..1c92205d34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
index 899deaf92c..6fdc9764e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index c5b19b594e..7b4350e731 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1680:47,7 [55] )
+Generated Location: (1688:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index 185622af05..c57aab1843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 739850cfda..aeddf44934 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index ecc5662337..67d43fbead 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1231:32,7 [55] )
+Generated Location: (1239:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index e362885db8..41e11178d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index 7195476b1c..dc6e87d5b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 7d00ca8c1e..893229c07f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1226:32,7 [55] )
+Generated Location: (1234:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 619b0b8e13..36ed42e264 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 729e293437..0a67936ae1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 6bebfc4fe7..487022a470 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1225:32,7 [55] )
+Generated Location: (1233:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index d6a2abadc8..4d443cb1b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index b7087b24f1..251032f7ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 56389a7f3a..dcbe8e118f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1220:32,7 [55] )
+Generated Location: (1228:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 40d4fd3f92..d195381c7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
index ed2e9412fa..d20205e899 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index cf9ddc8421..d2ffac1876 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1452:40,7 [44] )
+Generated Location: (1460:40,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index 21b6da91dd..dba56cb64c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
index f8b1ccf42c..27e347cf49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 7185c67db9..b8c7cde3cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1764:48,7 [44] )
+Generated Location: (1772:48,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 4bf4bb55ed..4d112ecd48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
index 5cdabfec09..134bb19f97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index 4d58618c50..39e731d943 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (578:17,2 [46] )
+Generated Location: (586:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1240:37,87 [2] )
+Generated Location: (1248:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index bbcf6f148a..8000165752 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
index f9e237eb0b..0a67fa82e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index 4d58618c50..39e731d943 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (578:17,2 [46] )
+Generated Location: (586:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1240:37,87 [2] )
+Generated Location: (1248:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index ea0bccd577..e3ea91923e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 54ca46159a..f03a53b0ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [16] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 6739e0a671..f82da25f1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1004:31,7 [41] )
+Generated Location: (1012:31,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 18a5f2ac4e..fb8be2a7a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index 57708b0f47..0f2fb7b29c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (58:1,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 4365e3b700..f0ab4a9389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1418:39,7 [77] )
+Generated Location: (1426:39,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index a0830475fe..365cd0fd2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index a3c058d33d..b7e07ce4fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 7bd777765f..b6ebac2a58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1255:40,7 [135] )
+Generated Location: (1263:40,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 199b63b554..180ec8b4a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 49c7895135..253d1a43cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 92e6044f5a..6fa42d943b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1070:32,7 [77] )
+Generated Location: (1078:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 074bbe215b..7982c658be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index d57debb71c..49af9aa64e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 0225956d1b..ff6af30e2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1000:31,7 [50] )
+Generated Location: (1008:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index b9c32b05ce..e1b3e14167 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
index b71f1d9158..4a8ebe5425 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index f0745afcf9..2c8d626f1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1473:33,7 [77] )
+Generated Location: (1481:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 59f408200b..73badd4052 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index c8f1da04df..12e8358835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 93c761ce73..d8e2dac7f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1327:33,7 [77] )
+Generated Location: (1335:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 72cdde4320..095e21ebe9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index c7e00f2e95..2fc9c593a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index b025fa5efd..fb9f3e27ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1337:33,7 [77] )
+Generated Location: (1345:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index df95b116e7..e3f1f50afc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index e0f607d294..26ef780f72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (64:1,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index dbcde9630c..22f9fe8567 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1425:39,7 [77] )
+Generated Location: (1433:39,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index d0e1c44a28..962b4bfac5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index a0cfa23ccd..646618d8a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index d4ce7a14da..b28c475580 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1260:32,7 [77] )
+Generated Location: (1268:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index efd411045d..730860ac50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
index b411813ed9..baa38277f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @BIND=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index 1e47ca487c..55387b25ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (932:30,7 [50] )
+Generated Location: (940:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index cf6fd8e483..98f3f2dab1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index ba4dc458d2..320c21a818 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 1e47ca487c..55387b25ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (932:30,7 [50] )
+Generated Location: (940:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index fb263e71f4..4511fb4203 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
index 98b5c39ad0..7f0d118565 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index 2599613705..5b5d3244b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 4a78015578..bc08833b99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 4b355ceb8d..a9c56a2527 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1161:31,7 [21] )
+Generated Location: (1169:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index b9ab2dd10a..d6cc7ddc10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 195a0fa760..0cea8934fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index e2a20c072e..4ecaa60ff3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1157:31,7 [21] )
+Generated Location: (1165:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 6ea930455a..2e01d853e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 93ba4b1e33..520adbe55f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 07a70b8d49..d80bdfe097 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1210:36,7 [21] )
+Generated Location: (1218:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index ac6d954783..740004ff74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 54e6d6c0cd..39e2326b8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 7f44977f7a..209f291188 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1266:38,7 [21] )
+Generated Location: (1274:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 0bb36c7382..dbec07d0cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index fab3ec66bf..6960ff368f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index 7f604a1f31..22d9a102cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index 72e2c2439d..fa1d8c9193 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 63bfb017d4..dae026e762 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
index 144a66535a..f63cfe330c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 95bc507285..f29ad718c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
index 5197da2fe7..ad0b6b8c9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index aa8664b283..c090103318 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
index da9aeec8fc..5530117c44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index d647245581..e4f239c2b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
index e249ff3423..559787dc57 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index aa66c33fae..03e45c5c04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index e1ce33423f..0e434b2fa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(__builder); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index dde6339cd1..1ec6b9fca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(__builder); |
-Generated Location: (748:24,2 [34] )
+Generated Location: (756:24,2 [34] )
 | RenderChildComponent(__builder); |
 
 Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
 |
-Generated Location: (960:33,7 [69] )
+Generated Location: (968:33,7 [69] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -17,7 +17,7 @@ Generated Location: (960:33,7 [69] )
 Source Location: (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1335:46,0 [7] )
+Generated Location: (1343:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 6d56a97182..481ebef830 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
index 245d496a55..d5e7301336 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent()\n    {\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index c0fb7475bb..69488d8b9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
 |
-Generated Location: (749:24,2 [42] )
+Generated Location: (757:24,2 [42] )
 |
     void RenderChildComponent()
     {
@@ -12,12 +12,12 @@ Generated Location: (749:24,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1113:37,0 [7] )
+Generated Location: (1121:37,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1294:45,2 [25] )
+Generated Location: (1302:45,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 43bdd76f0b..b0d7535388 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index 86933a0298..cf7e855efe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [228] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (57:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index e500bc5ec2..09f1b42acd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index a3b338c0a5..8ba90435bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [229] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (58:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index b266ad2524..24a8d5ea42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
index 62a5b6d11d..cbbfb6747c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (32:1,2 [53] x:\dir\subdir\Test\TestComponent.cshtml) - GenericFragment - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 87a8aa17ab..b96ed574f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
index 66f6f1ad64..ad50575236 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 9607da8f82..33e0d55d49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
index c83ccedc4c..7eda56960d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 6780492298..469aadd4bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
index df9a630b1b..cb53acabed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [47] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 3fc75879c6..51384104c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
index c2753690f5..c58b90dded 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (13:0,13 [34] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 262067aae3..8c825de9de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 53553b531f..9aff8ff428 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 76cc1ff2ed..f3cff83bbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (990:30,7 [98] )
+Generated Location: (998:30,7 [98] )
 |
     private int counter;
     private void Increment(EventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 0d90dfec5d..b0cf616b93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
index d39fff22ee..c52c45380f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (13:0,13 [37] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 18120398fc..65f1fb330a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
index 5a9a8969bc..72adc534bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index be87aac4d1..088e82ba83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
index b862d55beb..cae3fd1646 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [107] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index 38c700ecbd..7495074ab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index b9754436cb..75d86a2b66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (30:1,2 [118] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index 38c700ecbd..7495074ab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index a889a9e5e5..88babfaa53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (45:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 5a2d41b691..59f4e117d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index 0a2b8aae72..24d8b093b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 1b3db951f6..d4cf015fc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1003:30,7 [87] )
+Generated Location: (1011:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index f37bbf3287..0af4836048 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
index 81d9728d7a..e3d6621434 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - some-attribute - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index 0426607b43..7d13b0d3c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
index 2eb66a0f0b..11debcfefc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
@@ -7,6 +7,6 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (45:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 3a6ab74a42..45d920ba24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index 40d6b5e3c5..8000b2daf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 4c71667162..01d4d22cdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 87601b15c2..88619c6e56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
                     ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 34ad66eeca..29b7ca26e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1241:37,7 [60] )
+Generated Location: (1249:37,7 [60] )
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index 50d7066fe5..fd2c964e59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using AnotherTest;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
index 16d079b116..065b10211a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (22:2,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
                     ComponentChildContent - (45:3,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index 29effcf6e5..e65f403066 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -23,7 +23,7 @@ using System.Reflection;
 #line hidden
 #nullable disable
     [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-    public class _Imports : System.Object
+    public partial class _Imports : System.Object
     {
         #pragma warning disable 1998
         protected void Execute()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
index e2abbca8dd..2d5262445c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -9,7 +9,7 @@ Document -
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - 
             IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-        ClassDeclaration -  - public - _Imports - System.Object - 
+        ClassDeclaration -  - public partial - _Imports - System.Object - 
             MethodDeclaration -  - protected - void - Execute
                 CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
                     IntermediateToken - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) - CSharp - Foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index cc03ae9e8f..92eeab5973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
index a740d77bf1..bb7d2bbd84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter
                     ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 5a4a7f4e97..e278e10afa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index d596262eab..e02f45569c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (1:0,1 [40] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Item1</h1>\n
                 CSharpCode - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index d266ed96bb..830e2d6d1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (775:26,1 [34] )
+Generated Location: (783:26,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (775:26,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1424:51,0 [3] )
+Generated Location: (1432:51,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1604:60,7 [185] )
+Generated Location: (1612:60,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 1a6bfd994b..e05c695de5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Foo = Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
index 0588c17fee..b0b78a2635 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - static Test2.SomeComponent
         UsingDirective - (36:1,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Foo = Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (55:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (70:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 453434e63d..cb28337cb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
index bf70025a0b..4f1736bf0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 MarkupBlock -  - \n<mycomponent></mycomponent>\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 01dc21cdee..d577cf2a9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
index a58911a312..be1a9c342d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index 03822cedcd..f14834a5db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
index d7e2828ab0..27d9922b47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
@@ -7,6 +7,6 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index e9a5ae3f06..06c73ef0b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class Counter : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
index 8a6c4dfbd2..e524cb258d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
@@ -7,6 +7,6 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (21:1,0 [12] Counter.razor) - Counter2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 8c15a1cea5..8deff24077 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
index 580d2962cd..1e3b4c0494 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                 HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 257c9a4d9c..82206d510e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (725:20,1 [18] )
+Generated Location: (733:20,1 [18] )
 |if (true)
 {
     |
@@ -11,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (966:30,38 [5] )
+Generated Location: (974:30,38 [5] )
 |
 }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index 88c97a9e79..ba7c557a07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
index 41daeb1b8b..10da908cb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <!DOCTYPE html>\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index 1202b7c81d..1ca18e16b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
index 5f6457ac2f..34108d9c57 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 8632fa0885..94d8540a09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index 1c8f441484..10110bdd17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - @onclick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 9fac1cac91..99c940c080 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (805:22,7 [87] )
+Generated Location: (813:22,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 6bc2168491..00208b896c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
index fa1ae256a2..ceb2775332 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -9,6 +9,6 @@ Document -
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor)
             IntermediateToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - CSharp - [Serializable]
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 5e5218e2e5..2031e415bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 1d4696f21c..b41180f006 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 9a0a659ea6..90e0c8aa9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (834:21,40 [12] )
+Generated Location: (842:21,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1081:32,7 [49] )
+Generated Location: (1089:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 8bc7566313..b528bea11e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index c80ab6a5ea..dfa54bd417 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index d55a54212a..0524b9fbdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1045:27,19 [9] )
+Generated Location: (1053:27,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 6b44f2b991..343f6b54e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
index 1e37dae58c..3d8effc235 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (39:3,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
                     ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.SingleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index ba86a76a59..ad5479c69d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index c724647179..7da0ce2b7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 0ca7d8ee94..6c720134d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (873:21,40 [10] )
+Generated Location: (881:21,40 [10] )
 |myInstance|
 
 Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1162:33,7 [104] )
+Generated Location: (1170:33,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 500298b6c9..201ca9d03a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 1bc1814490..7d1c67f32f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [97] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 1f290c1c54..7a7028eb28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1084:27,19 [10] )
+Generated Location: (1092:27,19 [10] )
 |myInstance|
 
 Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1373:39,7 [104] )
+Generated Location: (1381:39,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index bd2bf2016c..746ff1518b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
index 30826c2804..3429b2d1ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index f34385a2d5..860b30df36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1308:32,7 [93] )
+Generated Location: (1316:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index a60d0a704e..301d92f34c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
index a26f802577..b0ca2494c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 55b27f4e33..071348e585 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1310:32,7 [93] )
+Generated Location: (1318:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 16332db5ac..1fcd536fea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
index 286bcc16d5..44551cade9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 06f9c88ebe..2c07b4039e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1079:36,7 [93] )
+Generated Location: (1087:36,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 104536cb0c..170a5b1255 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
index 328956d3b4..ab5ee99b5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [93] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 8ce8b2b18b..34e5da0a5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1309:32,7 [93] )
+Generated Location: (1317:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 90128a13fa..ef10095f8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using Test2;
 #nullable disable
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
index 8a1b089bae..8001655739 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         UsingDirective - (46:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (59:3,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (74:3,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 1cfe84eccd..2a000ec541 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
index b802e539fb..d6914eb2c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         UsingDirective - (15:1,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (28:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (43:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index d50deab626..6969144ef8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index 854427f5fd..05be10eaa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 1c7d63b87a..91356d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (578:17,2 [40] )
+Generated Location: (586:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 71c3425ad5..0e9df4dee9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index 0ccf3f8fed..292cda17cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 1c7d63b87a..91356d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (578:17,2 [40] )
+Generated Location: (586:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index b4857ae33a..720b7182b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
index 5b3a5785b4..c8c04397d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 38b43f29a1..7bac017262 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 105f53f39a..25345f1b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 80f868260e..ae8f96b2a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2013:41,12 [30] )
+Generated Location: (2021:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index fb1c3023f6..3007a71be0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index f30e0af346..9cec88099f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 44794b9c49..6bb2ccfb90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2171:41,12 [30] )
+Generated Location: (2179:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 81081bdf5c..8b46f7e97a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 4c1d2f3e36..b234a58f15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 3dd3bd719e..8ff639eb64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2093:41,12 [30] )
+Generated Location: (2101:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 46ef7ee9ac..0223186764 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
index cf083f5ca4..8c20c432a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 3511a5d9b9..d598722d48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
index e434a9fce7..955189823e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - Foo - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 7691ac3161..8698a027f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 1783e5ad1b..e28b89d9a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index ed71312a8a..f76be5b17e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1696:45,12 [35] )
+Generated Location: (1704:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 3a62a163aa..1692b5a96d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
index 1620f5850d..039aab4499 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index f98698a73e..0d94284032 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 34a92ffb58..2fb3c958c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index a530cf8a2f..867fd2df72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (2028:53,12 [35] )
+Generated Location: (2036:53,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 0aba3aeb2a..5c4151e716 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 2e1fc7edd2..67311e03d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index ed71312a8a..f76be5b17e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1696:45,12 [35] )
+Generated Location: (1704:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 871f214c17..f9ca0bdec8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index e970d831de..931b4be212 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index ac15f56cc4..1d52b314c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
index bc80339ed7..8c19f54db3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [145] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 338fb49b28..b75affc937 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
index f3e523b7a0..07844b458a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <NotAComponent></NotAComponent>\n<DefinitelyNotAComponent></DefinitelyNotAComponent>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 57e5d27840..a587a2314f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 9272a58d70..820653d513 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [84] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index c46f7100b8..32edccc7d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (827:21,37 [10] )
+Generated Location: (835:21,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1117:33,7 [49] )
+Generated Location: (1125:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 49027ac9d0..59e76bdd99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index c84161056a..5713386341 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index d5a06aa130..2bf586f3fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (997:29,49 [10] )
+Generated Location: (1005:29,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -9,7 +9,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1240:40,7 [109] )
+Generated Location: (1248:40,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 669aa6b472..c2b19618c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 554b419774..90fb3ecb8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <elem attributebefore="before" @KEY="someObject" attributeafter="after">Hello</elem>
             CSharpCode - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 81fe48cac3..28a17769e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (770:20,7 [49] )
+Generated Location: (778:20,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index bccd61fb44..75c9f9dcb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index b9ffc7754d..0b5f3c72e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 33a1ffc706..de1df1b068 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (864:21,37 [6] )
+Generated Location: (872:21,37 [6] )
 |myElem|
 
 Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1176:34,7 [128] )
+Generated Location: (1184:34,7 [128] )
 |
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index f425681378..01ec096e78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 62d17f05fd..c627461520 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index f35554549b..78f9115f7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1034:29,49 [8] )
+Generated Location: (1042:29,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
         [Parameter] public int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1301:41,7 [164] )
+Generated Location: (1309:41,7 [164] )
 |
         private ElementReference _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 2ebd414c51..e5693cb9ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index ee469bdbbc..15382360d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <elem attributebefore="before" @rEF="myElem" attributeafter="after">Hello</elem>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index f051832363..808c64c366 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
index 3d2bb8827d..279394a318 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 5f97cfc9c3..32dd6a1f4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1334:33,7 [93] )
+Generated Location: (1342:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 52beeca87d..7b966c1ca2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index a92e72da17..aa001c3e44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <elem attributebefore="before" @ATTributes="someAttributes" attributeafter="after">Hello</elem>
             CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 9e83a67391..2463912511 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (781:20,7 [93] )
+Generated Location: (789:20,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index a023ad48df..34490d41e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
index 9b36e0b4c1..d7f1c8bbb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [98] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 8ec5df3e2b..9a3a536897 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1336:33,7 [93] )
+Generated Location: (1344:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index fad15e7ed8..2b420a0229 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
index e028cc8181..326e1bdaa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 82d3039280..af6aa3bfeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1335:33,7 [93] )
+Generated Location: (1343:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index d447b3ee04..fe520fc600 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index f0d049c4f8..a0a30b8ab0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [89] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 822be515cc..cf419cfbeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1464:37,7 [87] )
+Generated Location: (1472:37,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 42651329f0..7305b70217 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index bf9f7bbe21..bcc2d307aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index f164a922a0..1c36f36b4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1247:30,7 [87] )
+Generated Location: (1255:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 2c62367bf9..b0dde1ec8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 5ad9c376ce..399f6aaccf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index bdbc4237e2..e73ad85539 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1411:37,7 [103] )
+Generated Location: (1419:37,7 [103] )
 |
     private int counter;
     private void Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 2843ecb025..78fb42ebb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index b0afa992ef..2267e969d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index ee6caa7849..ce6a03a2f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1411:37,7 [139] )
+Generated Location: (1419:37,7 [139] )
 |
     private int counter;
     private Task Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index fc735d5239..d9052cfeb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 655b21550e..375dc6ca85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 4a9fe1a151..3f2be92e4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1247:30,7 [123] )
+Generated Location: (1255:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 71d147c025..078a67e995 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index d8aa7e8884..ce367272ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 4fbbc124ec..4d9f2df89d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1411:37,7 [104] )
+Generated Location: (1419:37,7 [104] )
 |
     private int counter;
     private void Increment(ChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 50f18a1b27..40914c447e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index 59a76bd0f7..9d562d79a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index c565ef85e5..7b0d879493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1180:30,7 [87] )
+Generated Location: (1188:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 19339d0b13..8f65beaa0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index bf9f7bbe21..bcc2d307aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 0f30f98457..4e00aa71c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1143:30,7 [87] )
+Generated Location: (1151:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 4ef3fc99ee..a58a3e01e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index d54c458849..c933d37792 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 5e48d447b8..1e809cd67f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1143:30,7 [95] )
+Generated Location: (1151:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 1d3203fee7..40e4530fd0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 655b21550e..375dc6ca85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 75957fa3cb..9caaa5c2b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1143:30,7 [123] )
+Generated Location: (1151:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index 3bc7d08c7c..cd54b177d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 1302ce6e14..6850ddde90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 1d827bbc3d..9126a97304 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1143:30,7 [131] )
+Generated Location: (1151:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 4611e1077d..469d7009f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 399a50f0ad..8d61935237 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input onfocus="alert("Test");">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 8a2bc393a8..9cef9c2f9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index e746f62e6e..920909a97a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input @onCLICK="OnClick">
             CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 5f82913831..cd25566915 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (872:27,7 [47] )
+Generated Location: (880:27,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 467d90e842..a52a09b1a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index 11cc765bcb..5ffa1c26eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 14cead9ce8..7ce0cd386b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(EventArgs e) {
     }
 |
-Generated Location: (1216:37,7 [42] )
+Generated Location: (1224:37,7 [42] )
 |
     void OnClick(EventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 7b486b43c4..ea0b4bacd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 59ab34f294..cf1177e1dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index d9c7271f33..2beea7ab95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1216:37,7 [47] )
+Generated Location: (1224:37,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index becce32d67..1a3f72a26f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index 5a3e44bafc..ad0d2cd629 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 7b486b43c4..ea0b4bacd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 59ab34f294..cf1177e1dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index d9c7271f33..2beea7ab95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1216:37,7 [47] )
+Generated Location: (1224:37,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 1c5c56c3ae..5d561a71d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index 2a7da659fc..60704a5e36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input @onclick="x => { }">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 696b79bd9c..c364c24b92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index d59c47cb75..0496b08d28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 4c8c812648..b435f29199 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1216:37,7 [31] )
+Generated Location: (1224:37,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index fc44e9f1af..0d33c0a7aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index cfddff9ca0..80d0091f0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index a33be57a79..21a407ad54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 70a0037442..e85051e51d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -6,6 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input onclick="foo">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index e9a3b5ca54..e91d8df717 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
index 2214655b97..e8eb031160 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [48] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index 7793531abe..7175a038f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
index 033d43f1e1..7108e765d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 7395ef5af5..30b6b017c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
index 033d43f1e1..7108e765d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 7869cdebe7..bce4f61c97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
index 033d43f1e1..7108e765d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 9931408550..8f65d3cb5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test.Shared;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index f92c602e93..464ec36079 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Test.Shared
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (20:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 5f284d1210..3347fa49ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1197:43,7 [38] )
+Generated Location: (1205:43,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index 2bae2266c8..c3d4972aad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index 5dbefda847..173aa8f3d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
index 35cce98a12..98497b2473 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1044:28,38 [3] )
+Generated Location: (1052:28,38 [3] )
 |_my|
 
 Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1331:40,7 [90] )
+Generated Location: (1339:40,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
index bbcfa74722..ff15df9e2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index cde256a50b..8fbb88c926 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index 3c103a0ec3..92049ea4d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (872:26,28 [3] )
+Generated Location: (880:26,28 [3] )
 |_my|
 
 Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1095:37,7 [90] )
+Generated Location: (1103:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index 383c6e3de5..d8a7967fa3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index 0b361fd41c..b7cd7e9fcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index e2052de080..8f217b96c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index f910f85b44..3d92af0ed0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index c2c2966874..6b29370fdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1005:28,38 [8] )
+Generated Location: (1013:28,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1248:39,7 [47] )
+Generated Location: (1256:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index fcf9a78f16..d134245da6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index bfaf4a6def..c9391bc849 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index df8e691bed..5ec0506266 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (858:26,28 [8] )
+Generated Location: (866:26,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1060:36,7 [47] )
+Generated Location: (1068:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 1e617b6b4e..121ad727ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 0b3d0fe26d..763a2bc3bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 6d3f553d68..324adf9e46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
index bfd9d69a0d..c6dc3beb1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
                 HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 641d0cb298..3c19ffe010 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using System;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
index 0319c00bbc..652c51b282 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [14] x:\dir\subdir\Test\TestComponent.cshtml) - System
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 2992055209..7f03cf522e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index e80069bb13..89e65ae57e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 1c7d63b87a..91356d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (578:17,2 [40] )
+Generated Location: (586:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index a8340499a0..650a35e5af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
index 80f8dce702..d16ec66028 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (19:1,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 9d353958e1..056b2540d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
index 72984229f1..0a9913a083 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index f2ceb6361a..7a4c8ccae0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (858:23,7 [39] )
+Generated Location: (866:23,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index 60f201c50b..88c0572aca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
index 4b747bb9b0..70c86a1eef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Test.Context> template = (context) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 5896bf1144..189474be14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (578:17,2 [54] )
+Generated Location: (586:17,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1647:48,107 [2] )
+Generated Location: (1655:48,107 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 4245d11504..2bc235cb2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 5634baf6df..78f478f163 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index da87e2cd45..836caab115 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (578:17,2 [45] )
+Generated Location: (586:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1450:40,89 [3] )
+Generated Location: (1458:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1629:49,7 [76] )
+Generated Location: (1637:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 0fc9c79187..1a54116eb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 746f757a3d..61f3ca9b38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 601ddb21de..ad61d61350 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (578:17,2 [45] )
+Generated Location: (586:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1450:40,89 [3] )
+Generated Location: (1458:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2199:65,7 [76] )
+Generated Location: (2207:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 3cce17476b..bafe4bdc50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
index 7e65894e97..cfcce32483 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Person> template = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index bbd7ec5a32..aeeba7280b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (578:17,2 [47] )
+Generated Location: (586:17,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1213:37,73 [2] )
+Generated Location: (1221:37,73 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 260bf8d149..bd3cd885b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
index 67cf9969c2..700ce91d72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 4eedb74b90..f75add9cec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1377:48,7 [138] )
+Generated Location: (1385:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 7e46a81fc2..7a0e0e8c03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
index d6be2227fd..d59185849d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index a3b0e50906..41e5e233b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (578:17,2 [45] )
+Generated Location: (586:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1199:38,67 [3] )
+Generated Location: (1207:38,67 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1378:47,7 [76] )
+Generated Location: (1386:47,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index f21c38cce0..d5b8baf16f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
index a7e7a36d96..90b50ab84b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (2:0,2 [49] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 8d853cc485..ed8cc20619 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1380:48,7 [138] )
+Generated Location: (1388:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 514248aa56..84c8907576 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
index 7457e4752d..25f8aafe53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment template = 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 7d46380c18..015a9c01ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (578:17,2 [27] )
+Generated Location: (586:17,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (886:27,45 [2] )
+Generated Location: (894:27,45 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 2b59e51e85..5f6d44c0e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
index de25acd7a8..4b92f44678 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 01f474539b..a196ca0047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1085:38,7 [54] )
+Generated Location: (1093:38,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 7a8947af80..063bc389ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 629774d50b..cf75d527c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index c9f47a4851..9eda2687ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1108:31,7 [24] )
+Generated Location: (1116:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 29a77a9f76..d889b32a86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index d376d038a3..eb577d71be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index ac3ce2f184..cee873f72e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1588:41,7 [88] )
+Generated Location: (1596:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index b69675629b..fed072391c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
index 84bd548664..79ffa51288 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index e73f1774c1..39b5e8deb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
index 2a2f7afa73..32daefbab0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 4cd1eef10e..bd9df63baa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index a6bf10b6f8..67d623e21a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
                     HtmlAttribute - (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index f8582a7315..2f1479d830 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1510:46,7 [130] )
+Generated Location: (1518:46,7 [130] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 92ca67bae4..11af4cefd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
index 6c57ae497f..8b5f47c1b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index eeb80a1f60..16726f5372 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 902be776e5..4110afc7a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 5086da6818..8dc476fe25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
     if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
-Generated Location: (749:24,2 [134] )
+Generated Location: (757:24,2 [134] )
 |
     var output = string.Empty;
     if (__builder == null) output = "Builder is null!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index e38b0e9e0a..112f0033d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index 03c3279b6b..bcd50c61c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
             CSharpCode - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        var output = string.Empty;\n        if (__builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index 33931628e4..05d990ee12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
         if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
-Generated Location: (802:26,7 [213] )
+Generated Location: (810:26,7 [213] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -18,7 +18,7 @@ Generated Location: (802:26,7 [213] )
 Source Location: (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1545:52,0 [7] )
+Generated Location: (1553:52,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index a731c9cd0f..f5ef41e3b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 319f07784d..0ec96376e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>\n\n
                 CSharpExpression - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 6c615d6065..d1804d339d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
index f7adbb2050..5705f5828c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>\n\n
                 Component - (18:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 4bbe2ae0ef..d319c30c28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
index aba3ac5260..5be8a555b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -6,6 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /my/url
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index 5213196255..56f8b8e45d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
index f094db2671..4924d8da0d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <div class="first second">Hello</div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index d83a551701..6ccca11c24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
index ed2d4ed2e0..a01a9ef1cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [18] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlAttribute - (5:0,5 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 9edc33678f..833739d291 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (923:30,11 [29] )
+Generated Location: (931:30,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 249603d2c7..b208426546 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -123,10 +123,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup>
       <FileWrites Include="@(_RazorComponentDeclaration)" />
     </ItemGroup>
-
-    <ItemGroup Condition="'$(DesignTimeBuild)'=='true'">
-      <Compile Include="@(_RazorComponentDeclaration)" />
-    </ItemGroup>
   </Target>
 
   <Target
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index b862d9f369..0b27cfce4a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -47,20 +47,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectCapability Include="SupportsTypeScriptNuGet" />
   </ItemGroup>
 
-  <!--
-    For now we need to treat component files as if they have a single file generator. This will allow us
-    to trigger a workspace update for the declaration files when they change.
-  -->
-  <ItemGroup>
-    <Content Update="**\*.razor">
-      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
-    </Content>
-
-    <Content Update="$(_RazorComponentInclude)">
-      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
-    </Content>
-  </ItemGroup>
-
   <!--
     WebSdk imports these capabilities for nesting in DotNetCoreWeb projects.
     Conditinally import these capabilities if the project isn't targeting the WebSdk.

From 0d5d6e7db6071c2340dc91d8a0782d5231cc391b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 30 Sep 2019 22:13:12 -0700
Subject: [PATCH 273/337] Update baselines to unbreak tests
 (dotnet/aspnetcore-tooling#1184)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/49542e048847cc37de13ed583e45b86f7d4a25a3
---
 .../TestComponent.codegen.cs                                    | 2 +-
 .../TestComponent.ir.txt                                        | 2 +-
 .../TestComponent.codegen.cs                                    | 2 +-
 .../TestComponent.ir.txt                                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
index cbbb4df936..bc7d121824 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
index aea9472c47..6431c6c83a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
index fb27ee3716..1ad49ddc7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
index bb0c9a9624..0020d34b73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [78] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (17:1,2 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context

From 1e9c0f01af37ff8d0d6c149bbfa680fd601739e7 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 30 Sep 2019 19:40:34 -0700
Subject: [PATCH 274/337] Add Blazor partial class support in Visual Studio.
 (dotnet/aspnetcore-tooling#1182)

- No longer mark declaration files as single file generators. Prior to this we relied on SingleFileGenerators to dynamically update the declaration files when .razor files changed. However, to make partial classes work we can no longer depend on declaration files being available because their existence causes us to have to mangle class names for opened documents; otherwise you get two files with same name and result in ambiguous definition errors.
- Stopped including declaration files as part of the users compilation. This was intended to make the design time experience operate more similar to how Blazor apps function at runtime (directly access each component instead of their declarations). We now rely on the background code generation effort built from the find all references work to supply users with strongly typed component names.
- Stop mangling class names for Visual Studio. Razor.VSCode has its own set of configurations which i'm not addressing as part of this changeset.
- Start generating components with the partial modifier to their class name to enable partial class support.
- Updated existing tests to expect partial modifier.

aspnet/AspNetCoredotnet/aspnetcore-tooling#5487\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/73858cdd37bcb3bca40d803f0f805b48ef03db3f
---
 .../BasicComponent_DesignTime.codegen.cs           |  2 +-
 .../BasicComponent_DesignTime.ir.txt               |  2 +-
 .../BasicComponent_DesignTime.mappings.txt         |  8 ++++----
 .../BasicComponent_Runtime.codegen.cs              |  2 +-
 .../BasicComponent_Runtime.ir.txt                  |  2 +-
 .../Components/ComponentDocumentClassifierPass.cs  |  1 +
 .../ComponentDocumentClassifierPassTest.cs         |  2 +-
 .../ComponentDeclarationIntegrationTest.cs         |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../BindToElementWithCulture/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../ChildComponent_Generic/TestComponent.ir.txt    |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 10 +++++-----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../ChildComponent_Simple/TestComponent.codegen.cs |  2 +-
 .../ChildComponent_Simple/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../ComponentImports/_Imports.codegen.cs           |  2 +-
 .../ComponentImports/_Imports.ir.txt               |  2 +-
 .../ComponentImports/_Imports.mappings.txt         |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 12 ++++++------
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Counter.codegen.cs                             |  2 +-
 .../Counter.ir.txt                                 |  2 +-
 .../Counter.mappings.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithDocType/TestComponent.codegen.cs |  2 +-
 .../Component_WithDocType/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../Component_WithImportsFile/TestComponent.ir.txt |  2 +-
 .../Component_WithKey/TestComponent.codegen.cs     |  2 +-
 .../Component_WithKey/TestComponent.ir.txt         |  2 +-
 .../Component_WithKey/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Component_WithRef/TestComponent.codegen.cs     |  2 +-
 .../Component_WithRef/TestComponent.ir.txt         |  2 +-
 .../Component_WithRef/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithSplat/TestComponent.codegen.cs   |  2 +-
 .../Component_WithSplat/TestComponent.ir.txt       |  2 +-
 .../Component_WithSplat/TestComponent.mappings.txt |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs       |  2 +-
 .../Element_WithKey/TestComponent.ir.txt           |  2 +-
 .../Element_WithKey/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs       |  2 +-
 .../Element_WithRef/TestComponent.ir.txt           |  2 +-
 .../Element_WithRef/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithSplat/TestComponent.codegen.cs     |  2 +-
 .../Element_WithSplat/TestComponent.ir.txt         |  2 +-
 .../Element_WithSplat/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../GenericComponent_WithKey/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 10 +++++-----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     | 10 +++++-----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../RazorTemplate_InCodeBlock/TestComponent.ir.txt |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  8 ++++----
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../Regression_597/TestComponent.codegen.cs        |  2 +-
 .../Regression_597/TestComponent.ir.txt            |  2 +-
 .../Regression_597/TestComponent.mappings.txt      |  4 ++--
 .../Regression_609/TestComponent.codegen.cs        |  2 +-
 .../Regression_609/TestComponent.ir.txt            |  2 +-
 .../Regression_609/TestComponent.mappings.txt      |  6 +++---
 .../Regression_772/TestComponent.codegen.cs        |  2 +-
 .../Regression_772/TestComponent.ir.txt            |  2 +-
 .../Regression_772/TestComponent.mappings.txt      |  2 +-
 .../Regression_773/TestComponent.codegen.cs        |  2 +-
 .../Regression_773/TestComponent.ir.txt            |  2 +-
 .../Regression_773/TestComponent.mappings.txt      |  2 +-
 .../Regression_784/TestComponent.codegen.cs        |  2 +-
 .../Regression_784/TestComponent.ir.txt            |  2 +-
 .../Regression_784/TestComponent.mappings.txt      |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../BindToElementWithCulture/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../ChildComponent_Generic/TestComponent.ir.txt    |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../ChildComponent_Simple/TestComponent.codegen.cs |  2 +-
 .../ChildComponent_Simple/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../ComponentImports/_Imports.codegen.cs           |  2 +-
 .../ComponentImports/_Imports.ir.txt               |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Counter.codegen.cs                             |  2 +-
 .../Counter.ir.txt                                 |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithDocType/TestComponent.codegen.cs |  2 +-
 .../Component_WithDocType/TestComponent.ir.txt     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../Component_WithImportsFile/TestComponent.ir.txt |  2 +-
 .../Component_WithKey/TestComponent.codegen.cs     |  2 +-
 .../Component_WithKey/TestComponent.ir.txt         |  2 +-
 .../Component_WithKey/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Component_WithRef/TestComponent.codegen.cs     |  2 +-
 .../Component_WithRef/TestComponent.ir.txt         |  2 +-
 .../Component_WithRef/TestComponent.mappings.txt   |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../Component_WithSplat/TestComponent.codegen.cs   |  2 +-
 .../Component_WithSplat/TestComponent.ir.txt       |  2 +-
 .../Component_WithSplat/TestComponent.mappings.txt |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithKey/TestComponent.codegen.cs       |  2 +-
 .../Element_WithKey/TestComponent.ir.txt           |  2 +-
 .../Element_WithKey/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Element_WithRef/TestComponent.codegen.cs       |  2 +-
 .../Element_WithRef/TestComponent.ir.txt           |  2 +-
 .../Element_WithRef/TestComponent.mappings.txt     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../Element_WithSplat/TestComponent.codegen.cs     |  2 +-
 .../Element_WithSplat/TestComponent.ir.txt         |  2 +-
 .../Element_WithSplat/TestComponent.mappings.txt   |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../GenericComponent_WithKey/TestComponent.ir.txt  |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../RazorTemplate_InCodeBlock/TestComponent.ir.txt |  2 +-
 .../TestComponent.mappings.txt                     |  6 +++---
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Regression_597/TestComponent.codegen.cs        |  2 +-
 .../Regression_597/TestComponent.ir.txt            |  2 +-
 .../Regression_597/TestComponent.mappings.txt      |  2 +-
 .../Regression_609/TestComponent.codegen.cs        |  2 +-
 .../Regression_609/TestComponent.ir.txt            |  2 +-
 .../Regression_609/TestComponent.mappings.txt      |  2 +-
 .../Regression_772/TestComponent.codegen.cs        |  2 +-
 .../Regression_772/TestComponent.ir.txt            |  2 +-
 .../Regression_773/TestComponent.codegen.cs        |  2 +-
 .../Regression_773/TestComponent.ir.txt            |  2 +-
 .../Regression_784/TestComponent.codegen.cs        |  2 +-
 .../Regression_784/TestComponent.ir.txt            |  2 +-
 .../Regression_784/TestComponent.mappings.txt      |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  4 ++--
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.codegen.cs                       |  2 +-
 .../TestComponent.ir.txt                           |  2 +-
 .../TestComponent.mappings.txt                     |  2 +-
 .../Microsoft.NET.Sdk.Razor.Component.targets      |  4 ----
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets     | 14 --------------
 998 files changed, 1220 insertions(+), 1237 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
index 92d78d57b2..5b6a7f8b5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.cs
@@ -8,7 +8,7 @@ namespace __GeneratedComponent
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    public partial class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
index a08e83f549..98c5fca72d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (51:2,1 [17] ) - System.Linq
         UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+        ClassDeclaration -  - public partial - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             DesignTimeDirective - 
                 DirectiveToken - (12:0,12 [11] BasicComponent.cshtml) - IDisposable
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
index 4e620df0e8..728e0023db 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (12:0,12 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |IDisposable|
-Generated Location: (641:17,0 [11] )
+Generated Location: (649:17,0 [11] )
 |IDisposable|
 
 Source Location: (38:1,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |this.ToString()|
-Generated Location: (1240:35,13 [15] )
+Generated Location: (1248:35,13 [15] )
 |this.ToString()|
 
 Source Location: (79:3,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |string.Format("{0}", "Hello")|
-Generated Location: (1437:43,6 [29] )
+Generated Location: (1445:43,6 [29] )
 |string.Format("{0}", "Hello")|
 
 Source Location: (132:6,12 [37] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent.cshtml)
 |
     void IDisposable.Dispose(){ }
 |
-Generated Location: (1689:52,12 [37] )
+Generated Location: (1697:52,12 [37] )
 |
     void IDisposable.Dispose(){ }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index 2059dba321..f1f8cd28b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -9,7 +9,7 @@ namespace __GeneratedComponent
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
+    public partial class AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 : Microsoft.AspNetCore.Components.ComponentBase, IDisposable
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
index 885d9ddd37..663160b90d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (51:2,1 [19] ) - System.Linq
         UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
         UsingDirective - (102:4,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
+        ClassDeclaration -  - public partial - AspNetCore_d3c3d6059615673cb46fc4974164d61eabadb890 - Microsoft.AspNetCore.Components.ComponentBase - IDisposable
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (25:1,0 [91] BasicComponent.cshtml) - div
                     HtmlAttribute - (29:1,4 [25] BasicComponent.cshtml) -  class=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
index ea13bcb6c6..d1828ca044 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDocumentClassifierPass.cs
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             @class.ClassName = computedClass;
             @class.Modifiers.Clear();
             @class.Modifiers.Add("public");
+            @class.Modifiers.Add("partial");
 
             if (FileKinds.IsComponentImport(codeDocument.GetFileKind()))
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
index 25415097f0..1989a7f3e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentDocumentClassifierPassTest.cs
@@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             // Assert
             Assert.Equal($"{ComponentsApi.ComponentBase.FullTypeName}", visitor.Class.BaseType);
-            Assert.Equal(new[] { "public", }, visitor.Class.Modifiers);
+            Assert.Equal(new[] { "public", "partial" }, visitor.Class.Modifiers);
             Assert.Equal("Test", visitor.Class.ClassName);
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index b441a86f38..94425c895b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -121,7 +121,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index dee5f78f1f..7fdac946cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 0a5c9e6973..1776638976 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
index 9886669a0c..8401222f05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt
@@ -10,6 +10,6 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |async (e) => await Task.Delay(10)|
-Generated Location: (1282:38,19 [33] )
+Generated Location: (1290:38,19 [33] )
 |async (e) => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index bc969c8af6..01fb793ed4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 0417372324..efd5f61a5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 1b311ffac3..fdcc121b0a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -10,7 +10,7 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1280:38,17 [7] )
+Generated Location: (1288:38,17 [7] )
 |OnClick|
 
 Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +20,7 @@ Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1481:48,7 [89] )
+Generated Location: (1489:48,7 [89] )
 |
     Task OnClick(MouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 8d02e2b54c..dd0d3b23dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index bb7807ad5f..e2ee0d7c05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
index f8399b23fe..8193f7248a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt
@@ -10,6 +10,6 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |async () => await Task.Delay(10)|
-Generated Location: (1282:38,19 [32] )
+Generated Location: (1290:38,19 [32] )
 |async () => await Task.Delay(10)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 6193a76695..2b26ceb0a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index e2eabc9498..121af12b51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 03be8bfadf..9f295a0a35 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -10,7 +10,7 @@ Generated Location: (436:18,0 [41] )
 
 Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1280:38,17 [7] )
+Generated Location: (1288:38,17 [7] )
 |OnClick|
 
 Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +20,7 @@ Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1481:48,7 [73] )
+Generated Location: (1489:48,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 84cac0e8e8..8b87f31658 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index ec89ce657d..0790665cfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 1916b07cd6..0cf0d9f553 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2059:48,7 [50] )
+Generated Location: (2067:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 5a00dd85eb..67d274e681 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 40c7a8ac25..4b85287dbf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index b494dcb312..4951291164 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (969:25,30 [11] )
+Generated Location: (977:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1579:43,7 [65] )
+Generated Location: (1587:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 57e2130887..a8017f7f60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index a212e7bae1..5bc8c33a41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 9ecd211b8e..86504b3c33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1883:47,7 [50] )
+Generated Location: (1891:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 4484f1a45f..46d63a0d06 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 30cebd1865..de77fc3ddf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 25c6988086..a885821348 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1883:47,7 [55] )
+Generated Location: (1891:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index c8bfc0fe1a..e65799997d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 0268f19e3b..f8c2a5e0d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index 2ef0335db5..2a7ec03df2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1586:47,7 [50] )
+Generated Location: (1594:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index e1f835a623..e3e80bbb44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index 8bd5424b6c..c2255708b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index febf366dee..6653660695 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (890:25,26 [11] )
+Generated Location: (898:25,26 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1562:46,7 [50] )
+Generated Location: (1570:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 60071ceb0f..9a7f87f621 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 9d7522111f..9c01570bd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index d4819b00d3..5ad7a60815 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1762:48,7 [50] )
+Generated Location: (1770:48,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 35ac8c9678..fd51374f9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index c669dfee2b..955016a0cc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 28c62af7a3..5f860ae11c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (969:25,30 [11] )
+Generated Location: (977:25,30 [11] )
 |ParentValue|
 
 Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1399:43,7 [65] )
+Generated Location: (1407:43,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index c8bfc0fe1a..e65799997d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 3c83d639da..181e137835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 94cb7ac41c..f72ee7609e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1586:47,7 [50] )
+Generated Location: (1594:47,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index e1f835a623..e3e80bbb44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index a212e7bae1..5bc8c33a41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 1cc33f50d5..500ede1187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (890:25,26 [11] )
+Generated Location: (898:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1562:46,7 [50] )
+Generated Location: (1570:46,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 49a81abc8a..edbbbd509d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 50706736a0..28774dd004 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index bc42633054..66be5b3944 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (978:25,26 [11] )
+Generated Location: (986:25,26 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1586:47,7 [55] )
+Generated Location: (1594:47,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 555897d252..83a8fd2a31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 6f9c65d90c..6011905aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 8354f5d085..18c001cfab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (977:25,24 [11] )
+Generated Location: (985:25,24 [11] )
 |person.Name|
 
 Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1578:47,1 [37] )
+Generated Location: (1586:47,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 3cf27c8dbc..56711a817d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
index 657741b08e..704d05beba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index eb604f4eb9..3b21ee4855 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1090:32,19 [11] )
+Generated Location: (1098:32,19 [11] )
 |ParentValue|
 
 Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1330:40,82 [28] )
+Generated Location: (1338:40,82 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1731:51,7 [55] )
+Generated Location: (1739:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 2ad7e8ca39..ef334675df 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index 8af89adba4..f32d667aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 80054575f7..fcb9120c38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (955:25,33 [11] )
+Generated Location: (963:25,33 [11] )
 |CurrentDate|
 
 Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1334:36,7 [77] )
+Generated Location: (1342:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 2f9f73f9f3..0e0321cc17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index c2bffe88ef..86d7d5524e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index d491685d6e..3e46ea8e60 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (955:25,33 [11] )
+Generated Location: (963:25,33 [11] )
 |ParentValue|
 
 Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1300:36,7 [50] )
+Generated Location: (1308:36,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 6c72cf50ff..599ea3cbcc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
index d55cce1b12..8adadb919e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index d647010517..c4c65bc4c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1090:32,19 [11] )
+Generated Location: (1098:32,19 [11] )
 |ParentValue|
 
 Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.InvariantCulture|
-Generated Location: (1334:40,86 [28] )
+Generated Location: (1342:40,86 [28] )
 |CultureInfo.InvariantCulture|
 
 Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1735:51,7 [55] )
+Generated Location: (1743:51,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index d132d64692..d2529bca65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 0d17a3b15d..3cf26978c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index b90f2ba46c..2761bdc878 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (941:25,19 [11] )
+Generated Location: (949:25,19 [11] )
 |ParentValue|
 
 Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1286:36,7 [55] )
+Generated Location: (1294:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index d132d64692..d2529bca65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index 13e4603f0c..3cd18bc247 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index b9f8a07075..853d8f12d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (941:25,19 [11] )
+Generated Location: (949:25,19 [11] )
 |ParentValue|
 
 Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1286:36,7 [55] )
+Generated Location: (1294:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 58e2c3ead9..a5ad6630ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 3d5a20a277..44d7a5fc47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 10c2355493..7940b19c98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (940:25,18 [11] )
+Generated Location: (948:25,18 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1285:36,7 [55] )
+Generated Location: (1293:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index 1f93482650..e4e400a97b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index 4e0a9b45d9..749907c9dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 714d158f92..96607846e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (935:25,13 [11] )
+Generated Location: (943:25,13 [11] )
 |ParentValue|
 
 Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1280:36,7 [55] )
+Generated Location: (1288:36,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 6d964a9648..1bdb445896 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
index bd3a07f1da..7798c2595b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index 38458c0f94..ba0aa7055a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1106:32,35 [11] )
+Generated Location: (1114:32,35 [11] )
 |ParentValue|
 
 Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1451:43,7 [44] )
+Generated Location: (1459:43,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index cb84e6838b..f46994a9fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
index 87417806aa..9cfbed5187 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [26] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 72f36493d0..633a0cbb9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [26] )
 
 Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1106:32,35 [11] )
+Generated Location: (1114:32,35 [11] )
 |ParentValue|
 
 Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |CultureInfo.CurrentCulture|
-Generated Location: (1366:40,102 [26] )
+Generated Location: (1374:40,102 [26] )
 |CultureInfo.CurrentCulture|
 
 Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1763:51,7 [44] )
+Generated Location: (1771:51,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 752a6e8a4c..2ea285ae7e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
index 9cf34bf2c6..15704802ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index 880cdf737d..e88bfac2da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (846:24,2 [46] )
+Generated Location: (854:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1100:32,55 [26] )
+Generated Location: (1108:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1351:40,87 [2] )
+Generated Location: (1359:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1582:48,21 [6] )
+Generated Location: (1590:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index ae565ac6c6..20374c2f49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
index 5ec41f2891..f70171dcac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index 880cdf737d..e88bfac2da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (846:24,2 [46] )
+Generated Location: (854:24,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (55:0,55 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1100:32,55 [26] )
+Generated Location: (1108:32,55 [26] )
 |context.ToLowerInvariant()|
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1351:40,87 [2] )
+Generated Location: (1359:40,87 [2] )
 |; |
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1582:48,21 [6] )
+Generated Location: (1590:48,21 [6] )
 |header|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index 16eb333f1b..6c54d3261d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 1566cc4b13..de3d230b83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 8aa24d9f91..20a570652a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (31:0,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Enabled|
-Generated Location: (895:25,31 [7] )
+Generated Location: (903:25,31 [7] )
 |Enabled|
 
 Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1095:35,7 [41] )
+Generated Location: (1103:35,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index f1402c510f..aa5257a6a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index ad7a8b56eb..e88e490e4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index afd07bee75..8c57cdc690 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (59:1,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (1101:32,15 [11] )
+Generated Location: (1109:32,15 [11] )
 |CurrentDate|
 
 Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1480:43,7 [77] )
+Generated Location: (1488:43,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index 2c81c2ab06..b2463f4eae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index a36619c209..a872ec7277 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index da2906c913..25e1ae13e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (891:25,27 [11] )
+Generated Location: (899:25,27 [11] )
 |CurrentDate|
 
 Source Location: (55:0,55 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Format|
-Generated Location: (1114:34,55 [6] )
+Generated Location: (1122:34,55 [6] )
 |Format|
 
 Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1313:44,7 [135] )
+Generated Location: (1321:44,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 0a5479cea8..d5b835dcc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 76cd88c845..bede3eb214 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 70ce319ca6..c294f9cc50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (891:25,27 [11] )
+Generated Location: (899:25,27 [11] )
 |CurrentDate|
 
 Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1095:35,7 [77] )
+Generated Location: (1103:35,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 4bec837daf..58e1e4c874 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index ed0c4bfc67..b98622244e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 8138e0a4d2..ad8f3bda42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (891:25,27 [11] )
+Generated Location: (899:25,27 [11] )
 |ParentValue|
 
 Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1095:35,7 [50] )
+Generated Location: (1103:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index 703bc0e0ce..039ced4101 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
index ae0fc3cd64..fa7402fb14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index 5d2ae4e43d..dbd883ed09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (951:25,29 [11] )
+Generated Location: (959:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1476:36,7 [77] )
+Generated Location: (1484:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index b15ddfef53..c00df8a132 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index 4f650a79fa..cd3f477f92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 341e1eea38..573a569aad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (951:25,29 [11] )
+Generated Location: (959:25,29 [11] )
 |CurrentDate|
 
 Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1330:36,7 [77] )
+Generated Location: (1338:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 63f4552487..7e809d5ebe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index 6723842455..31c35a74a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index b443bef47e..cb9b451459 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (29:0,29 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (951:25,29 [11] )
+Generated Location: (959:25,29 [11] )
 |CurrentDate|
 
 Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1340:36,7 [77] )
+Generated Location: (1348:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index e88bce3b6e..839cdeee36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index 7d31616d54..d34118194a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index 01aae5776f..fade921ecd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (65:1,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (1107:32,21 [11] )
+Generated Location: (1115:32,21 [11] )
 |CurrentDate|
 
 Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1486:43,7 [77] )
+Generated Location: (1494:43,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index f883f7afd9..7425d43101 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index ef8d403731..584539acdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index 073152fdb4..c8df4dbee8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CurrentDate|
-Generated Location: (943:25,21 [11] )
+Generated Location: (951:25,21 [11] )
 |CurrentDate|
 
 Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1322:36,7 [77] )
+Generated Location: (1330:36,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index 29c1053e5e..0290e9b793 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
index 9a5add6521..99d0e7ae8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index 876a9ff033..ec7e65c7c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (879:25,15 [11] )
+Generated Location: (887:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1083:35,7 [50] )
+Generated Location: (1091:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index 29c1053e5e..0290e9b793 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index ad76db6807..912ce95305 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 876a9ff033..ec7e65c7c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (15:0,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (879:25,15 [11] )
+Generated Location: (887:25,15 [11] )
 |ParentValue|
 
 Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1083:35,7 [50] )
+Generated Location: (1091:35,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 68a2080324..ee4e81aee3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
index 1c62ade910..906c47fb07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index 7ec03d3ee7..acd0d909a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1170:34,34 [4] )
+Generated Location: (1178:34,34 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index bc51fcd9ef..e622c99563 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 153e88860b..697027ba8b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 9f0f4fc7de..62fc1c0068 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1173:34,37 [5] )
+Generated Location: (1181:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1765:56,7 [21] )
+Generated Location: (1773:56,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index a5df564c24..80697f0b93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 7c63eb10ec..d4333e1089 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index a3dae2375d..0fa14c3f4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1091:34,37 [5] )
+Generated Location: (1099:34,37 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1747:55,7 [21] )
+Generated Location: (1755:55,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 4f7323a5d8..654c0915dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 0dbf027145..7dcdb9e98a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 61ebc61d7b..3871d99abb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (977:25,38 [2] )
+Generated Location: (985:25,38 [2] )
 |18|
 
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1145:33,24 [5] )
+Generated Location: (1153:33,24 [5] )
 |Value|
 
 Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1632:50,7 [21] )
+Generated Location: (1640:50,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index b64f5abb07..05c7a07f83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 8f8e5cf377..e2aaaf777e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 674ff91c47..522b15f143 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (963:25,24 [5] )
+Generated Location: (971:25,24 [5] )
 |Value|
 
 Source Location: (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1421:42,24 [5] )
+Generated Location: (1429:42,24 [5] )
 |Value|
 
 Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1816:60,7 [21] )
+Generated Location: (1824:60,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 749e03142d..ac68dd9c2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index 7f3d877c2b..ee10c3e939 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index 8a754a980e..d5c8f1708f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1170:34,34 [4] )
+Generated Location: (1178:34,34 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1464:43,8 [17] )
+Generated Location: (1472:43,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index d13dc319a9..b594c622c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index b9592300fd..4a657e5f69 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
index 1f4ebd3b11..2d90d746d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1144:33,8 [17] )
+Generated Location: (1152:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index dcdd42885f..066b2c3328 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
index fa0a3d720e..5632e2f7a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index 7d02d0f497..0d14de6349 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (890:25,19 [6] )
+Generated Location: (898:25,19 [6] )
 |string|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1170:34,34 [4] )
+Generated Location: (1178:34,34 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1382:43,50 [2] )
+Generated Location: (1390:43,50 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 12f3793bd4..ec2e163edf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
index 25eb275509..dc8995e56c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
index 4b634587b2..32b7d596b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1143:33,37 [2] )
+Generated Location: (1151:33,37 [2] )
 |17|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index a4f1ef9faf..33dd581cec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
index c02da938f9..0ec89fc98c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
index 91992ce60b..822413c0bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index e3c32b785d..968a8fdfc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
index 4bcc57c881..34c70b6497 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
index a1d9146951..34863580bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |"how are you?"|
-Generated Location: (1368:41,21 [14] )
+Generated Location: (1376:41,21 [14] )
 |"how are you?"|
 
 Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1786:57,21 [6] )
+Generated Location: (1794:57,21 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 763208227c..3b6399bae9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index 898fc12d48..737f45f2ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index 29fd9cd544..932513beb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [48] )
 
 Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(__builder); |
-Generated Location: (1016:31,2 [34] )
+Generated Location: (1024:31,2 [34] )
 | RenderChildComponent(__builder); |
 
 Source Location: (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (101:4,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
         |
-Generated Location: (1228:40,7 [77] )
+Generated Location: (1236:40,7 [77] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -23,7 +23,7 @@ Source Location: (193:7,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1741:60,23 [9] )
+Generated Location: (1749:60,23 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 3bb8afce2a..334615b4a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
index fca1e65ac8..cb01235ab4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 109a769b74..ced963e356 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (54:1,2 [50] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
         |
-Generated Location: (1017:31,2 [50] )
+Generated Location: (1025:31,2 [50] )
 |
     void RenderChildComponent()
     {
@@ -18,13 +18,13 @@ Source Location: (119:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1515:51,23 [9] )
+Generated Location: (1523:51,23 [9] )
 |
     }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1646:59,2 [25] )
+Generated Location: (1654:59,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 7af1cd161e..ef933bc582 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index 248bff85e3..2447c2c068 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index a013914c8f..62364faa13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (891:25,20 [6] )
+Generated Location: (899:25,20 [6] )
 |string|
 
 Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1096:34,34 [3] )
+Generated Location: (1104:34,34 [3] )
 |int|
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1385:43,46 [4] )
+Generated Location: (1393:43,46 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1693:52,22 [17] )
+Generated Location: (1701:52,22 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2050:62,6 [29] )
+Generated Location: (2058:62,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 208c80726f..a819c8eb10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index 9eb3be33a1..3a74f391c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
index f426774039..6c216e161b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |new List<long>()|
-Generated Location: (1142:33,36 [16] )
+Generated Location: (1150:33,36 [16] )
 |new List<long>()|
 
 Source Location: (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1352:41,22 [17] )
+Generated Location: (1360:41,22 [17] )
 |context.ToLower()|
 
 Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (1560:50,6 [29] )
+Generated Location: (1568:50,6 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 4837552cab..1622bc616a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
index 9fc99566f6..a887854aba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
index d71bd72c42..937416839d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (960:25,21 [4] )
+Generated Location: (968:25,21 [4] )
 |"hi"|
 
 Source Location: (50:1,20 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1156:33,20 [17] )
+Generated Location: (1164:33,20 [17] )
 |context.ToLower()|
 
 Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1377:42,16 [7] )
+Generated Location: (1385:42,16 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 0ac21533e2..58f8e5a3e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
index 042b7cb159..682293c17a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 79da952af0..4bd3cc288d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
index b98ae09892..b76382b456 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 0ac21533e2..58f8e5a3e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
index 18ae06bcf2..425da4b7c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 0ac21533e2..58f8e5a3e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
index a11869b683..c81ff937e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index ae88864dc8..1d2b6b3e13 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index fcae53e045..3067b79c9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index b003737829..2ecb0afbb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (923:25,23 [9] )
+Generated Location: (931:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1429:45,7 [98] )
+Generated Location: (1437:45,7 [98] )
 |
     private int counter;
     private void Increment(EventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 24df5d5d96..8913f19f05 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
index ac003d6aa2..41770aa8f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
index 886078a3e0..5d3920f4ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1023:25,28 [7] )
+Generated Location: (1031:25,28 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 8a92d8e5be..f7352fef5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
index 541586f717..0eb8c4d559 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index bfc910e3cd..09902b8cbb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (984:25,31 [13] )
+Generated Location: (992:25,31 [13] )
 |42.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 820652633e..448b9305da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
index 0951329005..5312b07cca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
index 2ffb89de20..55b338fc26 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1072:26,54 [26] )
+Generated Location: (1080:26,54 [26] )
 |context.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index a3634216a3..b1d65fb7e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index bf81825dc6..f8241a525f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
index d146087517..1cea8aef07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1047:26,32 [23] )
+Generated Location: (1055:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index a3634216a3..b1d65fb7e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index 0d9d741f9b..4fdd253a12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
index d146087517..1cea8aef07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1047:26,32 [23] )
+Generated Location: (1055:26,32 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 4978aae651..83643e9665 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index 74e0e162f7..8e0345da0e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index b7c197ca34..dd71c048d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (924:25,24 [21] )
+Generated Location: (932:25,24 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1442:45,7 [87] )
+Generated Location: (1450:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index 47210e050e..7ab834bd56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
index 52c31f052a..b7dc70611a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
index e34837f351..268dd1e139 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |43.ToString()|
-Generated Location: (942:26,55 [13] )
+Generated Location: (950:26,55 [13] )
 |43.ToString()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index b5992d9e8a..2392c8179c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
index ae2202df8a..3041dde946 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage"
                 DirectiveToken - (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
index 8dd4c199df..d72859c66f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/MyPage"|
-Generated Location: (713:19,37 [9] )
+Generated Location: (721:19,37 [9] )
 |"/MyPage"|
 
 Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/AnotherRoute/{id}"|
-Generated Location: (942:29,37 [20] )
+Generated Location: (950:29,37 [20] )
 |"/AnotherRoute/{id}"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 15f0710ed8..d9b6ab374e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index 37ecb57cb6..82af84767f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index 13c6f4aba3..d0ee4d7f0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (969:25,17 [3] )
+Generated Location: (977:25,17 [3] )
 |123|
 
 Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1238:34,18 [4] )
+Generated Location: (1246:34,18 [4] )
 |true|
 
 Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (1532:44,20 [14] )
+Generated Location: (1540:44,20 [14] )
 |new SomeType()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index ed63574005..e2360f9690 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 2ff059cf3f..bcca583ccc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 5cb8bc4a78..08a8a06465 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1173:32,26 [7] )
+Generated Location: (1181:32,26 [7] )
 |OnClick|
 
 Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1680:52,7 [60] )
+Generated Location: (1688:52,7 [60] )
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index 4d90da0a66..803232690f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using AnotherTest;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
index 7e7c4b5c22..7a9b86a7d8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
index 2facaeab6c..91b232a1f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1445:42,13 [7] )
+Generated Location: (1453:42,13 [7] )
 |context|
 
 Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (2226:69,13 [7] )
+Generated Location: (2234:69,13 [7] )
 |context|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index dba8b3e6a1..734c541107 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -23,7 +23,7 @@ using System.Reflection;
 #line hidden
 #nullable disable
     [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-    public class _Imports : System.Object
+    public partial class _Imports : System.Object
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
index ee3d779d11..e14e2107c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -9,7 +9,7 @@ Document -
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - 
             IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-        ClassDeclaration -  - public - _Imports - System.Object - 
+        ClassDeclaration -  - public partial - _Imports - System.Object - 
             DesignTimeDirective - 
                 DirectiveToken - (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) - MainLayout
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
index 47a3c52604..1e49237c4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
@@ -10,11 +10,11 @@ Generated Location: (448:19,0 [23] )
 
 Source Location: (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor)
 |MainLayout|
-Generated Location: (841:32,0 [10] )
+Generated Location: (849:32,0 [10] )
 |MainLayout|
 
 Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
 |Foo|
-Generated Location: (1281:49,6 [3] )
+Generated Location: (1289:49,6 [3] )
 |Foo|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index fcccf73b5a..1e1fc9b09f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
index 9eab05c608..4a042e8416 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index 6e8856f24e..fb16c68a65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (979:25,27 [11] )
+Generated Location: (987:25,27 [11] )
 |"very-cool"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index fd817fd0b7..d82732a8cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index 493a563308..c6fcff6179 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
             DesignTimeDirective - 
                 DirectiveToken - (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1
                 DirectiveToken - (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 626321cc28..7aeb6d9389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -5,32 +5,32 @@ Generated Location: (276:11,0 [38] )
 
 Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TItem1|
-Generated Location: (689:23,22 [6] )
+Generated Location: (697:23,22 [6] )
 |TItem1|
 
 Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TItem2|
-Generated Location: (908:33,22 [6] )
+Generated Location: (916:33,22 [6] )
 |TItem2|
 
 Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
     |
-Generated Location: (1415:50,1 [38] )
+Generated Location: (1423:50,1 [38] )
 |foreach (var item2 in Items2)
 {
     |
 
 Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildContent(item2)|
-Generated Location: (1581:59,6 [19] )
+Generated Location: (1589:59,6 [19] )
 |ChildContent(item2)|
 
 Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1732:66,8 [3] )
+Generated Location: (1740:66,8 [3] )
 |
 }|
 
@@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1914:76,7 [185] )
+Generated Location: (1922:76,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index de8fb88166..1d4b0a0e43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Foo = Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
index 49b772e1d5..5af20cdaca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [32] x:\dir\subdir\Test\TestComponent.cshtml) - static Test2.SomeComponent
         UsingDirective - (36:1,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Foo = Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index b18ce55394..89b714505e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
index d7543ebcf9..b85efa325c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index 5f5c3fccdf..5efbef1353 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1323:36,43 [4] )
+Generated Location: (1331:36,43 [4] )
 |true|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 090642d184..7bb86097aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
index b91de37da2..911863c1c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index 23e9abd843..186e32d368 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (978:25,26 [1] )
+Generated Location: (986:25,26 [1] )
 |1|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1554:44,26 [1] )
+Generated Location: (1562:44,26 [1] )
 |2|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index ac01a589cf..e5d3bd9a15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
index a874feb5e5..3e327e8aac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (57:2,11 [8] x:\dir\subdir\Test\_Imports.razor) - New.Test
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 022aa82fcc..37d3a33f1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class Counter : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
index 510e28febf..21b3864e33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (11:0,11 [8] Counter.razor) - New.Test
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
index f0453f843a..c5dc313fbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (11:0,11 [8] x:\dir\subdir\Test\Pages/Counter.razor)
 |New.Test|
-Generated Location: (850:31,44 [8] )
+Generated Location: (858:31,44 [8] )
 |New.Test|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 871aff83f5..c113cb57c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
index 1bff96642b..3e37806580 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 2ccb2c7033..8c2e5fe5ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (1144:34,1 [18] )
+Generated Location: (1152:34,1 [18] )
 |if (true)
 {
     |
@@ -10,7 +10,7 @@ Generated Location: (1144:34,1 [18] )
 Source Location: (66:3,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }|
-Generated Location: (1322:43,38 [3] )
+Generated Location: (1330:43,38 [3] )
 |
 }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
index f62729fa19..b0db755550 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index fe5bbc7cc0..06a881a0e8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
index 094e0f80a8..76139301ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 8ea8d9783a..5b73a6c0a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index be32db415c..3353494634 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 53f3c595e4..be00786267 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1226:37,7 [87] )
+Generated Location: (1234:37,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 6b2c4db765..8a6612870d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
index e23e80d14e..a81183d4be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor)
             IntermediateToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - CSharp - [Serializable]
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - [Serializable]
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 1ffc621022..ba4e389975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 8061dce1d7..7e414f514d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 1f2a201d47..43458de26a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1116:30,40 [12] )
+Generated Location: (1124:30,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1470:47,7 [49] )
+Generated Location: (1478:47,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index b26e07ae5f..1699f12aae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index 13312be860..db322fecfe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index be1d874768..76333b9027 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1072:29,19 [9] )
+Generated Location: (1080:29,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index ba2bab42ad..0a9bcda7fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
index 156bb74137..ed187e3370 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (24:1,11 [11] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
index 084270fa26..739b232ae0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (327:12,0 [10] )
 
 Source Location: (24:1,11 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |AnotherTest|
-Generated Location: (719:24,44 [11] )
+Generated Location: (727:24,44 [11] )
 |AnotherTest|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 9fe44c8dcf..b4b4c48eab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 2e4013600f..3b188dad97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index af797a4e3d..3b6b930545 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1085:29,40 [10] )
+Generated Location: (1093:29,40 [10] )
 |myInstance|
 
 Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1450:45,7 [104] )
+Generated Location: (1458:45,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index aa03027573..0233eaeb4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index a2aae2c90d..3527fba401 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index eceb35d3f6..46671b9c79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1041:28,19 [10] )
+Generated Location: (1049:28,19 [10] )
 |myInstance|
 
 Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1406:44,7 [104] )
+Generated Location: (1414:44,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index e63835fdbe..c4601ebdd3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
index 75b0855ba8..317e992fd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index e350d50bba..39d4db26b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1155:26,51 [14] )
+Generated Location: (1163:26,51 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1690:47,7 [93] )
+Generated Location: (1698:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 437aa936f8..a9f73f1b87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
index 2c052ccece..a8a59d2237 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 1071f34353..cfc099e3b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1157:26,53 [14] )
+Generated Location: (1165:26,53 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1692:47,7 [93] )
+Generated Location: (1700:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 2b30a0fc0c..d571e065d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
index dcd6ec48af..608ba5264d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index a4d068708f..4534d0e8aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |18|
-Generated Location: (959:25,20 [2] )
+Generated Location: (967:25,20 [2] )
 |18|
 
 Source Location: (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1142:33,39 [14] )
+Generated Location: (1150:33,39 [14] )
 |someAttributes|
 
 Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1500:50,7 [93] )
+Generated Location: (1508:50,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index d31201916b..354200c7b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
index 5413c22919..5279e9fe92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index e6f880d0aa..fb05948d7a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1156:26,52 [14] )
+Generated Location: (1164:26,52 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1691:47,7 [93] )
+Generated Location: (1699:47,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 3243bc0179..e5f4f383e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using Test2;
 #nullable disable
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
index 2a28310682..122278bd76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         UsingDirective - (46:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage"
                 DirectiveToken - (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
index d6ee48c3df..5350d38db7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [11] )
 
 Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/MyPage"|
-Generated Location: (847:26,37 [9] )
+Generated Location: (855:26,37 [9] )
 |"/MyPage"|
 
 Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/AnotherRoute/{id}"|
-Generated Location: (1076:36,37 [20] )
+Generated Location: (1084:36,37 [20] )
 |"/AnotherRoute/{id}"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index d60d215ff3..1f89693af5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
index 37a4617d8e..6f0e7a47c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         UsingDirective - (15:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 6c8eb2ea9a..4ef8941320 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index d46e2e25e2..2df363efa0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 5c3c63a812..65c601f948 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (846:24,2 [40] )
+Generated Location: (854:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1069:33,43 [7] )
+Generated Location: (1077:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 02c86e143a..848a00a4ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index afb6766d6a..8e623de3ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 7ec86b882d..bc4ddfe735 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (846:24,2 [40] )
+Generated Location: (854:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1068:33,42 [7] )
+Generated Location: (1076:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index 1a7c0465eb..4e08d723a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
index 6e788003a9..999022b95d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 8d0f8e9df3..4cd3b0d63f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 1caa937f75..f76be959fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index ecd295ad1c..a745b983cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (976:25,23 [7] )
+Generated Location: (984:25,23 [7] )
 |message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1278:34,48 [7] )
+Generated Location: (1286:34,48 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2353:57,12 [30] )
+Generated Location: (2361:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 7652aed053..fe848920d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 81db5db1e1..1fbb764c2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 626a5a0bb8..e5c80fe12c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1113:25,31 [9] )
+Generated Location: (1121:25,31 [9] )
 |(s) => {}|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1429:34,59 [7] )
+Generated Location: (1437:34,59 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2504:57,12 [30] )
+Generated Location: (2512:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 8ebc97e75f..19d7562121 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 2c92b68993..babb3ca22b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 2784a10f15..4b22752f72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1063:25,59 [9] )
+Generated Location: (1071:25,59 [9] )
 |(s) => {}|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1348:34,29 [7] )
+Generated Location: (1356:34,29 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2423:57,12 [30] )
+Generated Location: (2431:57,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index a5a20e720c..55f854572c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
index 55906fb718..b88d9593c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 1a7c0465eb..4e08d723a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
index 4a74314e02..d88259351a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 4917950d58..f17748b1ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 2e45fac267..382c472e41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index 08e0539814..dd1b9fc559 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1126:32,40 [4] )
+Generated Location: (1134:32,40 [4] )
 |text|
 
 Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1455:43,12 [35] )
+Generated Location: (1463:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
index c57b44be65..ebe618b419 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index b9ce8a2d6e..007176df97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 1ee533154c..d651f3df3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 90f5409f7a..6277ec5af2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1223:32,79 [8] )
+Generated Location: (1231:32,79 [8] )
 |() => {}|
 
 Source Location: (86:2,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1482:41,35 [4] )
+Generated Location: (1490:41,35 [4] )
 |text|
 
 Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1811:52,12 [35] )
+Generated Location: (1819:52,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 4917950d58..f17748b1ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 09596c8cea..006a65a075 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index 08e0539814..dd1b9fc559 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -5,14 +5,14 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |text|
-Generated Location: (1126:32,40 [4] )
+Generated Location: (1134:32,40 [4] )
 |text|
 
 Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1455:43,12 [35] )
+Generated Location: (1463:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index b562fbe334..0494d167d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index 4bd48b0978..15410c9711 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
index eb4ba33b69..a4a8de8b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => {}|
-Generated Location: (1179:32,32 [8] )
+Generated Location: (1187:32,32 [8] )
 |() => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
index f5084c8f15..749ab79d84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
index 571cb8412f..c8936356d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 90ef6d42f7..cd15a39fdf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 6ef5325c98..84f9d29759 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index 151176cd4f..69b644aa3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (912:25,37 [10] )
+Generated Location: (920:25,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1116:35,7 [49] )
+Generated Location: (1124:35,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index b8c949ec27..6b0af75e6d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index d3d4ec8299..3ea736f333 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index 25deb5f4b0..429345fdf4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (901:25,37 [3] )
+Generated Location: (909:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (1121:34,49 [10] )
+Generated Location: (1129:34,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -14,7 +14,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1325:44,7 [109] )
+Generated Location: (1333:44,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 4d3ac61da7..126cbce953 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index c644e00e2b..60ce180b19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 5fcd706664..a0bb647cba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (900:26,7 [49] )
+Generated Location: (908:26,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index 51ee950d02..856fb948b6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index 6da670c14d..1c74425cbd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 128fa2be26..c51736a13c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (881:24,37 [6] )
+Generated Location: (889:24,37 [6] )
 |myElem|
 
 Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1126:33,7 [128] )
+Generated Location: (1134:33,7 [128] )
 |
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index 5f22a7aec4..cd81610446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 5acd58a514..40e6ecee53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index bf4a929596..aef5b0284f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (37:0,37 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Min|
-Generated Location: (901:25,37 [3] )
+Generated Location: (909:25,37 [3] )
 |Min|
 
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1090:33,49 [8] )
+Generated Location: (1098:33,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
         [Parameter] public int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1337:42,7 [164] )
+Generated Location: (1345:42,7 [164] )
 |
         private ElementReference _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 965abd8a50..dd06fe3e4b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index 27d46dcac7..bd4b7a3579 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
index 4a7fee9ede..02d0c657bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 745f25995e..8d64ef342f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (44:0,44 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1125:25,44 [14] )
+Generated Location: (1133:25,44 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1334:35,7 [93] )
+Generated Location: (1342:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 21eb746abd..7e93b454b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 6e83da6e4a..b382d4f18d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 3d403febff..dc098abcb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (900:26,7 [93] )
+Generated Location: (908:26,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index c46b76cf90..a6aef64d4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
index 26b987b602..25606a8c70 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 8089ffd525..7fd4be80ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1127:25,46 [14] )
+Generated Location: (1135:25,46 [14] )
 |someAttributes|
 
 Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1336:35,7 [93] )
+Generated Location: (1344:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index b246c7fd8e..7612a9b225 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
index c0246900dd..42b0de041a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index bb7f972a65..e679a6fe4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (45:0,45 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1126:25,45 [14] )
+Generated Location: (1134:25,45 [14] )
 |someAttributes|
 
 Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1335:35,7 [93] )
+Generated Location: (1343:35,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index c652f866cb..f5a031e133 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index de66db16f7..7de1dc47b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index b6cb825cb3..73d3f9c36c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
-Generated Location: (1344:32,24 [61] )
+Generated Location: (1352:32,24 [61] )
 |EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
 
 Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1903:52,7 [87] )
+Generated Location: (1911:52,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 5353f83ed0..1d1c5bbce1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index 4af13ee8b7..2312ffb6cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index e3038b601c..14559e0381 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1179:25,23 [9] )
+Generated Location: (1187:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1686:45,7 [87] )
+Generated Location: (1694:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 563d1df5ee..9c7915c284 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index c379757ede..310c88b923 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 2a590e855a..a45c60c32f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1343:32,23 [9] )
+Generated Location: (1351:32,23 [9] )
 |Increment|
 
 Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1850:52,7 [103] )
+Generated Location: (1858:52,7 [103] )
 |
     private int counter;
     private void Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 5e157d0d73..8b89c2aa9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index 76cc892f7e..100ecc72d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 7c07f01dbd..d7564bd3b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1343:32,23 [9] )
+Generated Location: (1351:32,23 [9] )
 |Increment|
 
 Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -16,7 +16,7 @@ Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1850:52,7 [139] )
+Generated Location: (1858:52,7 [139] )
 |
     private int counter;
     private Task Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 7ab0627213..a9b555b48c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 20092e795c..3480729ec9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 080d884d11..070d3e4a80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1179:25,23 [9] )
+Generated Location: (1187:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1686:45,7 [123] )
+Generated Location: (1694:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 735010701d..ef9e774f85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index 0b15039c86..cca8a88595 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 88d9713f37..65f1fbac89 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1343:32,23 [9] )
+Generated Location: (1351:32,23 [9] )
 |Increment|
 
 Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +15,7 @@ Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1850:52,7 [104] )
+Generated Location: (1858:52,7 [104] )
 |
     private int counter;
     private void Increment(ChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 954e9007b9..0ef91b49e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index ef4fa09760..051f34b558 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index 9bdd713f1a..a97950dcc0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1076:25,24 [45] )
+Generated Location: (1084:25,24 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1619:45,7 [87] )
+Generated Location: (1627:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 5003d15f3c..9086452809 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index 4af13ee8b7..2312ffb6cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 8a1f8344d8..4635ad9daf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1582:45,7 [87] )
+Generated Location: (1590:45,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index fa5a6c4e59..1af6ec9ac3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index e60135c9b0..635bf3e438 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index d04825c09f..970b250a5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1582:45,7 [95] )
+Generated Location: (1590:45,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 3afaaad32b..1e3d615141 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 20092e795c..3480729ec9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 61213c43c9..564f0e4a51 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1582:45,7 [123] )
+Generated Location: (1590:45,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index f070a61d20..9abf50fde5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 0b7403d8c3..174bc9c60c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 84a885f977..a3e8e761fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1075:25,23 [9] )
+Generated Location: (1083:25,23 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -11,7 +11,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1582:45,7 [131] )
+Generated Location: (1590:45,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 7bc79b2b01..115b73ab91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 27e6eac9ef..f07021ed07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index fbaff0b86a..0e064de694 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 01d1037d52..e9a734f8ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -8,7 +8,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1064:33,7 [47] )
+Generated Location: (1072:33,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index faf02f910b..fc4b8e213e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index edc13cae62..23d5ef910b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 4f132ed602..c999a8456c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(EventArgs e) {
     }
 |
-Generated Location: (1365:42,7 [42] )
+Generated Location: (1373:42,7 [42] )
 |
     void OnClick(EventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index dc964e9b85..5fbc7cf4c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 0e1b27d1b9..da27753f28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index 49ef3dcaf6..73fed903fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1365:42,7 [47] )
+Generated Location: (1373:42,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index fca5207019..1b0cf7c3ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index d619245f3d..4bfbd322ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
index 2f3e5bc613..a7672c7e36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => { }|
-Generated Location: (1164:32,17 [8] )
+Generated Location: (1172:32,17 [8] )
 |x => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index dc964e9b85..5fbc7cf4c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 0e1b27d1b9..da27753f28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 49ef3dcaf6..73fed903fd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1365:42,7 [47] )
+Generated Location: (1373:42,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index fec5cfbd8f..ac2dab59b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 3a696287ad..4017700844 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index b60c32ad09..cb12bf8b6b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 2af1a8b06e..999457560a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1164:32,17 [7] )
+Generated Location: (1172:32,17 [7] )
 |OnClick|
 
 Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1365:42,7 [31] )
+Generated Location: (1373:42,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index 7a6d81473c..ffe44f5995 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index f7262ee345..178cd3ceb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
index 52a10228c8..55c29e460e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt
@@ -5,6 +5,6 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (1164:32,17 [9] )
+Generated Location: (1172:32,17 [9] )
 |() => { }|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index df0c79a6cb..3d9855ff5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 5191583e87..b7fe8d87f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 7090ffb026..d3493b4c48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
index 93f6af217c..168465ac86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
index 8584530928..95633b5f10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |(int x) => {}|
-Generated Location: (1332:40,31 [13] )
+Generated Location: (1340:40,31 [13] )
 |(int x) => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index 32a5e149aa..de861983b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
index 2b4c766c99..4dca9b91d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
index 458b346f18..2805c448c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1350:40,31 [7] )
+Generated Location: (1358:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 36d80f3477..bc13e130aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
index 2b4c766c99..4dca9b91d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 6db713282c..bc7bd641ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1439:40,31 [7] )
+Generated Location: (1447:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index abeb020cc1..a28f8dce5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
index 2b4c766c99..4dca9b91d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 5da6791c80..39e5dcc93a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -5,11 +5,11 @@ Generated Location: (320:12,0 [10] )
 
 Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1091:32,19 [1] )
+Generated Location: (1099:32,19 [1] )
 |3|
 
 Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |x => {}|
-Generated Location: (1332:40,31 [7] )
+Generated Location: (1340:40,31 [7] )
 |x => {}|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index b3788a98f4..863d440862 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test.Shared;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index 94be1bdd45..54becf8a6c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Test.Shared
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 37ca1aa1d0..cd31dfd755 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -5,19 +5,19 @@ Generated Location: (320:12,0 [17] )
 
 Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1098:32,19 [1] )
+Generated Location: (1106:32,19 [1] )
 |3|
 
 Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Hello|
-Generated Location: (1269:40,28 [5] )
+Generated Location: (1277:40,28 [5] )
 |Hello|
 
 Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1618:57,7 [38] )
+Generated Location: (1626:57,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index 5b6d83a8c0..b9a60dcaf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index f634b69431..85fdfcc5f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
index b7ec0ca120..c950299d31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (890:25,19 [3] )
+Generated Location: (898:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1159:34,29 [1] )
+Generated Location: (1167:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1491:45,38 [3] )
+Generated Location: (1499:45,38 [3] )
 |_my|
 
 Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +18,7 @@ Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1856:61,7 [90] )
+Generated Location: (1864:61,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
index 80c6779224..3da4f72d97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index 2d876f125f..e6b8351e48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index 317c9822e4..cb113e9f9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (958:25,19 [1] )
+Generated Location: (966:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1143:33,28 [3] )
+Generated Location: (1151:33,28 [3] )
 |_my|
 
 Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1516:51,7 [90] )
+Generated Location: (1524:51,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index d3d98b440d..f3321b628f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index f0f2a741c9..19086d53a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
index eed197611e..79a2ffad1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (970:25,26 [4] )
+Generated Location: (978:25,26 [4] )
 |"hi"|
 
 Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1154:33,8 [17] )
+Generated Location: (1162:33,8 [17] )
 |context.ToLower()|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index 6033862880..6cc25d558a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index 509efd2240..24235138c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 9f7368292f..39638474c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,23 +1,23 @@
 Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (890:25,19 [3] )
+Generated Location: (898:25,19 [3] )
 |int|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1159:34,29 [1] )
+Generated Location: (1167:34,29 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1522:46,38 [8] )
+Generated Location: (1530:46,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1874:63,7 [47] )
+Generated Location: (1882:63,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index 7f84ecedc2..2c91e55ec6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index a834c28a2e..d6d0f25875 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index 9093430ce1..d9ce2b95a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (958:25,19 [1] )
+Generated Location: (966:25,19 [1] )
 |3|
 
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1129:33,28 [8] )
+Generated Location: (1137:33,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1481:50,7 [47] )
+Generated Location: (1489:50,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 83a65c13b4..7bd71349a9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 632e80e8d9..b97b644059 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 95c444b36c..b37b592b3a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (850:24,6 [10] )
+Generated Location: (858:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 5cbcb559fd..930aa172c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
index 4edb1a8a14..8bb2192d4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 6676cb0502..80e09bdef9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using System;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
index 927fe7d9a8..f2a48c5949 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - System
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 8bdbb60f09..ac10a4d51c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index 104b50853b..f6e0431c7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index cc263bb7da..2e6c6499c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,13 +2,13 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (846:24,2 [40] )
+Generated Location: (854:24,2 [40] )
 | 
   var myValue = "Expression value";
 |
 
 Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1012:32,6 [7] )
+Generated Location: (1020:32,6 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 9295208389..58629a7b37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
index 03dfd3e21f..9233c69b73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
index 3a33c2a08a..e750457279 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1124:28,14 [6] )
+Generated Location: (1132:28,14 [6] )
 |"bye!"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index a38b595d69..b879426548 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
index 7a231f2e1a..5512d95633 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index db6e74ad1a..5aff46ae38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (1249:38,7 [39] )
+Generated Location: (1257:38,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index af1c571a8c..b1f9770253 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
index 1fed8fe995..e43ec298e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 7cef5a2c1e..c7385e1fed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (846:24,2 [54] )
+Generated Location: (854:24,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (63:0,63 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Index|
-Generated Location: (1116:32,63 [13] )
+Generated Location: (1124:32,63 [13] )
 |context.Index|
 
 Source Location: (80:0,80 [22] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.Item.ToLower()|
-Generated Location: (1332:39,80 [22] )
+Generated Location: (1340:39,80 [22] )
 |context.Item.ToLower()|
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1599:47,107 [2] )
+Generated Location: (1607:47,107 [2] )
 |; |
 
 Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1832:55,24 [8] )
+Generated Location: (1840:55,24 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 7bbc4fe7a6..48f6a62cb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 15e21249c8..29ce09a37f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 3661589ffb..6e4bdeb354 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (846:24,2 [45] )
+Generated Location: (854:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1226:34,69 [11] )
+Generated Location: (1234:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1799:53,89 [3] )
+Generated Location: (1807:53,89 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1978:62,7 [76] )
+Generated Location: (1986:62,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index b2d64c6017..4a13a2885d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 280e1a3345..599f28f9a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 96e3449c79..6e848206cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (846:24,2 [45] )
+Generated Location: (854:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1226:34,69 [11] )
+Generated Location: (1234:34,69 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1799:53,89 [3] )
+Generated Location: (1807:53,89 [3] )
 |;
 |
 
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2051:61,6 [15] )
+Generated Location: (2059:61,6 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +29,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2425:79,7 [76] )
+Generated Location: (2433:79,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index a6a1643d45..8eb1225746 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
index 5cdd6a65b9..cd0cb8b280 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index 8f8fa4f40f..8a730bfcdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (846:24,2 [47] )
+Generated Location: (854:24,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (56:0,56 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1102:32,56 [11] )
+Generated Location: (1110:32,56 [11] )
 |person.Name|
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1324:40,73 [2] )
+Generated Location: (1332:40,73 [2] )
 |; |
 
 Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1562:48,30 [8] )
+Generated Location: (1570:48,30 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index ba72315905..b90678dfb8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
index 34ab875be8..c6aaf81588 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 2f65973e87..8b7879ad5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (850:24,6 [25] )
+Generated Location: (858:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (997:27,33 [11] )
+Generated Location: (1005:27,33 [11] )
 |person.Name|
 
 Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1064:33,0 [1] )
+Generated Location: (1072:33,0 [1] )
 |)|
 
 Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1244:42,7 [138] )
+Generated Location: (1252:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 0f5c223833..061003e11d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
index 2640488d84..78d49e08ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index f839f8e262..a26def3bcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (846:24,2 [45] )
+Generated Location: (854:24,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1094:33,50 [11] )
+Generated Location: (1102:33,50 [11] )
 |person.Name|
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1310:41,67 [3] )
+Generated Location: (1318:41,67 [3] )
 |;
 |
 
@@ -24,7 +24,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1489:50,7 [76] )
+Generated Location: (1497:50,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index 3093889906..d8d64d9fde 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
index 25517a3745..e3b4694a96 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 6dc660afd7..e07a94842d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -1,16 +1,16 @@
 Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson((person) => |
-Generated Location: (850:24,6 [25] )
+Generated Location: (858:24,6 [25] )
 |RenderPerson((person) => |
 
 Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (998:27,34 [11] )
+Generated Location: (1006:27,34 [11] )
 |person.Name|
 
 Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (1065:33,0 [1] )
+Generated Location: (1073:33,0 [1] )
 |)|
 
 Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -22,7 +22,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1245:42,7 [138] )
+Generated Location: (1253:42,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 605c196eca..ba51ff79c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
index d062ce15dd..57fd4d2864 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index e68b9e7c4f..b3d0981a58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (846:24,2 [27] )
+Generated Location: (854:24,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1086:33,45 [2] )
+Generated Location: (1094:33,45 [2] )
 |; |
 
 Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1252:41,22 [8] )
+Generated Location: (1260:41,22 [8] )
 |template|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 6495fb500f..120d5acb21 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
index f6be33ade2..aa0c0ee968 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index d7620053b6..34753e68c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
 Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderPerson(|
-Generated Location: (850:24,6 [13] )
+Generated Location: (858:24,6 [13] )
 |RenderPerson(|
 
 Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |)|
-Generated Location: (885:26,0 [1] )
+Generated Location: (893:26,0 [1] )
 |)|
 
 Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1065:35,7 [54] )
+Generated Location: (1073:35,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index afa761f1ee..33825838d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index e0aafb2816..13c0a91675 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 62902491e7..0213ca9e85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (882:25,18 [1] )
+Generated Location: (890:25,18 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1520:46,7 [24] )
+Generated Location: (1528:46,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index d181ad3baa..4fda0dc061 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 842e1a2894..6a33cfef99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 6f6d5c5392..6ca17d2c2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,11 +1,11 @@
 Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (883:25,19 [8] )
+Generated Location: (891:25,19 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1253:35,46 [12] )
+Generated Location: (1261:35,46 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1921:56,7 [88] )
+Generated Location: (1929:56,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index 020c4b2ffd..18660d6d9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
index 622a2a9eb8..aa507e5482 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/"
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
index 50ca507c80..c0fb161bf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/"|
-Generated Location: (631:18,37 [3] )
+Generated Location: (639:18,37 [3] )
 |"/"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index 020c4b2ffd..18660d6d9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
index 458f772f25..9624dc31ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/"
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
index 50ca507c80..c0fb161bf1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (6:0,6 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/"|
-Generated Location: (631:18,37 [3] )
+Generated Location: (639:18,37 [3] )
 |"/"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 2683f01037..51cbfd3b5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index 50d3feedf1..daebd65a52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index 14fb1bf510..e8bb1d649e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -5,12 +5,12 @@ Generated Location: (320:12,0 [41] )
 
 Source Location: (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnComponentHover|
-Generated Location: (1164:32,17 [16] )
+Generated Location: (1172:32,17 [16] )
 |OnComponentHover|
 
 Source Location: (99:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentBgColor|
-Generated Location: (1393:41,55 [13] )
+Generated Location: (1401:41,55 [13] )
 |ParentBgColor|
 
 Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +21,7 @@ Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1599:51,7 [130] )
+Generated Location: (1607:51,7 [130] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
index bfc819e290..30ca542683 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index 076898ac35..4b5f6a8517 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index b79bd17799..d2e0e08d1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 894c267cc3..34c80001e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -9,7 +9,7 @@ Source Location: (56:2,2 [138] x:\dir\subdir\Test\TestComponent.cshtml)
     if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
     |
-Generated Location: (1017:31,2 [138] )
+Generated Location: (1025:31,2 [138] )
 |
     var output = string.Empty;
     if (__builder == null) output = "Builder is null!";
@@ -18,13 +18,13 @@ Generated Location: (1017:31,2 [138] )
 
 Source Location: (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1293:42,16 [6] )
+Generated Location: (1301:42,16 [6] )
 |output|
 
 Source Location: (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1390:47,38 [2] )
+Generated Location: (1398:47,38 [2] )
 |
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index f06361ba0c..ac84d0d333 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index 42c3660ca5..8e3e7ef7bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index 0e616a2a32..9bd6d6d986 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -11,7 +11,7 @@ Source Location: (60:2,7 [221] x:\dir\subdir\Test\TestComponent.cshtml)
         if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
         |
-Generated Location: (1070:33,7 [221] )
+Generated Location: (1078:33,7 [221] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -22,14 +22,14 @@ Generated Location: (1070:33,7 [221] )
 
 Source Location: (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |output|
-Generated Location: (1433:46,20 [6] )
+Generated Location: (1441:46,20 [6] )
 |output|
 
 Source Location: (303:8,30 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     }
 |
-Generated Location: (1592:53,30 [9] )
+Generated Location: (1600:53,30 [9] )
 |
     }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index ad8aa14710..a0284c7ec0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 35e3f7c321..13e1c3de4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
index 8eacd0f0e4..fd50a6b5eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |"My value"|
-Generated Location: (850:24,6 [10] )
+Generated Location: (858:24,6 [10] )
 |"My value"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 28fe1e3b44..49d1e8750a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
index 35cade949f..fc0c406756 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index b2571c3cd6..8c93eba3be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
index 5f10fd43f9..c7c90f4e44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /my/url
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
                 DirectiveToken - (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/my/url"
             CSharpCode - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
index 33faf34d87..583d309981 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |"/my/url"|
-Generated Location: (637:18,37 [9] )
+Generated Location: (645:18,37 [9] )
 |"/my/url"|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index cf7458ed0c..6c09e3f0cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
index 341855a002..4fdbf78ead 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index 92ff4bb6b5..710c047fb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
index 34f9b31b7a..3043d63824 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 9a0ef8f6c5..05e9ef8676 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (12:0,12 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (876:25,12 [3] )
+Generated Location: (884:25,12 [3] )
 |Foo|
 
 Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (1076:35,11 [29] )
+Generated Location: (1084:35,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
index cae7bb3d7f..eab49a6045 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
index 5212899dfb..127fb7b765 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [36] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index c28606eb3b..5fa17a9b98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index 2f95161f9b..b42dd6f4fe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index 4a18dbb4bc..e4687bd712 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1332:43,7 [89] )
+Generated Location: (1340:43,7 [89] )
 |
     Task OnClick(MouseEventArgs e) 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
index 6d7dd7383d..88caac3c59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
index b624135b5a..adab7b7583 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [35] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 44c19bd800..ba00b2da01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index a8fa8d0cef..0bfa1a3926 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks
         UsingDirective - (32:1,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (75:2,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 4a12aaef2c..eba61f56ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1332:43,7 [73] )
+Generated Location: (1340:43,7 [73] )
 |
     Task OnClick() 
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 5cd6084037..55234cdba3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index 0e5d245109..91cbc7faf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index d6bdff1db6..bb848b0032 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1681:32,7 [50] )
+Generated Location: (1689:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 814786e547..6e3e68877b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index b3e91d9b99..0aab8e86f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index dc0537f1c7..36538febe3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (1143:28,7 [65] )
+Generated Location: (1151:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 4446948e63..3b8e29ac25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index ff2e3f4654..c06a89bb4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index be126a558b..6c56427d45 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1465:31,7 [50] )
+Generated Location: (1473:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index e538b50f99..20888e990a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 743e22d318..500bc17c10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 8436b299b5..14cb2239dc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1465:31,7 [55] )
+Generated Location: (1473:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 30a38342d4..905a27f074 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 9e326bc91b..919df85e19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index aa6d34cc88..d9080bb10a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1165:31,7 [50] )
+Generated Location: (1173:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index f335bf5a5f..57819b41eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index b486ac5e19..a315ac1d07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index 370629cb01..6dd6701c76 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1155:31,7 [50] )
+Generated Location: (1163:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 032d60eb93..a5f326dc6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 3550f88eb5..213251c8b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 7c171fc52e..91e202afd7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1384:32,7 [50] )
+Generated Location: (1392:32,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 37549da1d7..2e83f7e80a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 1c009d6652..b1a439ad32 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 7edbda14cc..a7b081890e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
-Generated Location: (963:28,7 [65] )
+Generated Location: (971:28,7 [65] )
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 7fb0afa274..cc197ea8ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 7c554e3b6d..bf2c911a81 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 56e7bb69bf..7a3e31de98 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1168:31,7 [50] )
+Generated Location: (1176:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index fdd9b14c6d..8c314dfe8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index ff2e3f4654..c06a89bb4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 15b74739f3..912a736913 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1158:31,7 [50] )
+Generated Location: (1166:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 08d517b75d..e842e725c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index c17544f755..af14d603b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 5fbe3fefa3..3cf7ba4a3b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1168:31,7 [55] )
+Generated Location: (1176:31,7 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 6d07521a8d..23d0b99cc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index e92bb8d38c..68bafe0a3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 6df29f3a49..7ecdcae141 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1160:31,1 [37] )
+Generated Location: (1168:31,1 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
index 613222c7f6..04a8a17176 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
index 3a18e39b03..8611693c34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
index 5121cb2545..6cf5ab743f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1668:47,7 [55] )
+Generated Location: (1676:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 31bcd414be..7c56e32bfd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
index ae698d2ed9..d1cc9dead3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 36a3a6787f..1a322e71bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (113:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1329:33,7 [77] )
+Generated Location: (1337:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
index 9b7a94d904..d084b59085 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
index 0e78bca4d0..506a9096b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
index d55e8ff852..044e942756 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (86:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1295:33,7 [50] )
+Generated Location: (1303:33,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
index 18a0238b4e..1c92205d34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
index 899deaf92c..6fdc9764e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (47:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
index c5b19b594e..7b4350e731 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1680:47,7 [55] )
+Generated Location: (1688:47,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
index 185622af05..c57aab1843 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
index 739850cfda..aeddf44934 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
index ecc5662337..67d43fbead 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_OverridesEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1231:32,7 [55] )
+Generated Location: (1239:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
index e362885db8..41e11178d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
index 7195476b1c..dc6e87d5b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
index 7d00ca8c1e..893229c07f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (43:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1226:32,7 [55] )
+Generated Location: (1234:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
index 619b0b8e13..36ed42e264 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
index 729e293437..0a67936ae1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
index 6bebfc4fe7..487022a470 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithStringAttribute_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (42:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1225:32,7 [55] )
+Generated Location: (1233:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
index d6a2abadc8..4d443cb1b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
index b7087b24f1..251032f7ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlAttribute - (12:0,12 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
index 56389a7f3a..dcbe8e118f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (37:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1220:32,7 [55] )
+Generated Location: (1228:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
index 40d4fd3f92..d195381c7b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
index ed2e9412fa..d20205e899 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [83] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
index cf9ddc8421..d2ffac1876 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1452:40,7 [44] )
+Generated Location: (1460:40,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
index 21b6da91dd..dba56cb64c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using System.Globalization;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
index f8b1ccf42c..27e347cf49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Globalization
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (29:1,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
index 7185c67db9..b8c7cde3cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; }
 |
-Generated Location: (1764:48,7 [44] )
+Generated Location: (1772:48,7 [44] )
 |
     public int ParentValue { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 4bf4bb55ed..4d112ecd48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
index 5cdabfec09..134bb19f97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index 4d58618c50..39e731d943 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (578:17,2 [46] )
+Generated Location: (586:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1240:37,87 [2] )
+Generated Location: (1248:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index bbcf6f148a..8000165752 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
index f9e237eb0b..0a67fa82e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<string> header = (context) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index 4d58618c50..39e731d943 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<string> header = (context) => |
-Generated Location: (578:17,2 [46] )
+Generated Location: (586:17,2 [46] )
 | RenderFragment<string> header = (context) => |
 
 Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1240:37,87 [2] )
+Generated Location: (1248:37,87 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
index ea0bccd577..e3ea91923e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
index 54ca46159a..f03a53b0ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [16] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
index 6739e0a671..f82da25f1a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public bool Enabled { get; set; }
 |
-Generated Location: (1004:31,7 [41] )
+Generated Location: (1012:31,7 [41] )
 |
     public bool Enabled { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
index 18a5f2ac4e..fb8be2a7a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
index 57708b0f47..0f2fb7b29c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (58:1,14 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
index 4365e3b700..f0ab4a9389 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1418:39,7 [77] )
+Generated Location: (1426:39,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
index a0830475fe..365cd0fd2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
index a3c058d33d..b7e07ce4fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
index 7bd777765f..b6ebac2a58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (73:1,7 [135] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string Format { get; set; } = "MM/dd/yyyy";
 |
-Generated Location: (1255:40,7 [135] )
+Generated Location: (1263:40,7 [135] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
index 199b63b554..180ec8b4a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
index 49c7895135..253d1a43cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [67] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
index 92e6044f5a..6fa42d943b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (76:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1070:32,7 [77] )
+Generated Location: (1078:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
index 074bbe215b..7982c658be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
index d57debb71c..49af9aa64e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [12] x:\dir\subdir\Test\TestComponent.cshtml) -  type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
index 0225956d1b..ff6af30e2f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (51:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1000:31,7 [50] )
+Generated Location: (1008:31,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
index b9c32b05ce..e1b3e14167 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
index b71f1d9158..4a8ebe5425 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
index f0745afcf9..2c8d626f1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultCultureAndDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1473:33,7 [77] )
+Generated Location: (1481:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
index 59f408200b..73badd4052 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
index c8f1da04df..12e8358835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
index 93c761ce73..d8e2dac7f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1327:33,7 [77] )
+Generated Location: (1335:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
index 72cdde4320..095e21ebe9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
index c7e00f2e95..2fc9c593a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
index b025fa5efd..fb9f3e27ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithDefaultFormat_Override/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (78:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1337:33,7 [77] )
+Generated Location: (1345:33,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
index df95b116e7..e3f1f50afc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
index e0f607d294..26ef780f72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (64:1,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
index dbcde9630c..22f9fe8567 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1425:39,7 [77] )
+Generated Location: (1433:39,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
index d0e1c44a28..962b4bfac5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
index a0cfa23ccd..646618d8a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (20:0,20 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
index d4ce7a14da..b28c475580 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix_CanOverrideEvent/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (100:1,7 [77] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
-Generated Location: (1260:32,7 [77] )
+Generated Location: (1268:32,7 [77] )
 |
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
index efd411045d..730860ac50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
index b411813ed9..baa38277f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @BIND=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
index 1e47ca487c..55387b25ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_IsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (932:30,7 [50] )
+Generated Location: (940:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
index cf6fd8e483..98f3f2dab1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
index ba4dc458d2..320c21a818 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (6:0,6 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
index 1e47ca487c..55387b25ee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (39:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (932:30,7 [50] )
+Generated Location: (940:30,7 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index fb263e71f4..4511fb4203 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
index 98b5c39ad0..7f0d118565 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index 2599613705..5b5d3244b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 4a78015578..bc08833b99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 4b355ceb8d..a9c56a2527 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1161:31,7 [21] )
+Generated Location: (1169:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index b9ab2dd10a..d6cc7ddc10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 195a0fa760..0cea8934fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index e2a20c072e..4ecaa60ff3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1157:31,7 [21] )
+Generated Location: (1165:31,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index 6ea930455a..2e01d853e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 93ba4b1e33..520adbe55f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 07a70b8d49..d80bdfe097 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1210:36,7 [21] )
+Generated Location: (1218:36,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index ac6d954783..740004ff74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 54e6d6c0cd..39e2326b8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 7f44977f7a..209f291188 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1266:38,7 [21] )
+Generated Location: (1274:38,7 [21] )
 |
     string Value;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 0bb36c7382..dbec07d0cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index fab3ec66bf..6960ff368f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index 7f604a1f31..22d9a102cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index 72e2c2439d..fa1d8c9193 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 63bfb017d4..dae026e762 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
index 144a66535a..f63cfe330c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 95bc507285..f29ad718c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
index 5197da2fe7..ad0b6b8c9a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index aa8664b283..c090103318 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
index da9aeec8fc..5530117c44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index d647245581..e4f239c2b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
index e249ff3423..559787dc57 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index aa66c33fae..03e45c5c04 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
index e1ce33423f..0e434b2fa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(__builder); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index dde6339cd1..1ec6b9fca5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(__builder); |
-Generated Location: (748:24,2 [34] )
+Generated Location: (756:24,2 [34] )
 | RenderChildComponent(__builder); |
 
 Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
 |
-Generated Location: (960:33,7 [69] )
+Generated Location: (968:33,7 [69] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -17,7 +17,7 @@ Generated Location: (960:33,7 [69] )
 Source Location: (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1335:46,0 [7] )
+Generated Location: (1343:46,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 6d56a97182..481ebef830 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
index 245d496a55..d5e7301336 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent()\n    {\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index c0fb7475bb..69488d8b9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void RenderChildComponent()
     {
 |
-Generated Location: (749:24,2 [42] )
+Generated Location: (757:24,2 [42] )
 |
     void RenderChildComponent()
     {
@@ -12,12 +12,12 @@ Generated Location: (749:24,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1113:37,0 [7] )
+Generated Location: (1121:37,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1294:45,2 [25] )
+Generated Location: (1302:45,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index 43bdd76f0b..b0d7535388 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index 86933a0298..cf7e855efe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [228] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (57:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index e500bc5ec2..09f1b42acd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index a3b338c0a5..8ba90435bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [229] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (58:1,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index b266ad2524..24a8d5ea42 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
index 62a5b6d11d..cbbfb6747c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (32:1,2 [53] x:\dir\subdir\Test\TestComponent.cshtml) - GenericFragment - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index 87a8aa17ab..b96ed574f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
index 66f6f1ad64..ad50575236 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index 9607da8f82..33e0d55d49 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
index c83ccedc4c..7eda56960d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 6780492298..469aadd4bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
index df9a630b1b..cb53acabed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [47] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index 3fc75879c6..51384104c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
index c2753690f5..c58b90dded 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (13:0,13 [34] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index 262067aae3..8c825de9de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 53553b531f..9aff8ff428 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 76cc1ff2ed..f3cff83bbe 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (990:30,7 [98] )
+Generated Location: (998:30,7 [98] )
 |
     private int counter;
     private void Increment(EventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 0d90dfec5d..b0cf616b93 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
index d39fff22ee..c52c45380f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (13:0,13 [37] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 18120398fc..65f1fb330a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
index 5a9a8969bc..72adc534bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index be87aac4d1..088e82ba83 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
index b862d55beb..cae3fd1646 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [107] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index 38c700ecbd..7495074ab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index b9754436cb..75d86a2b66 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (30:1,2 [118] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index 38c700ecbd..7495074ab8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index a889a9e5e5..88babfaa53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (45:1,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - item
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index 5a2d41b691..59f4e117d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index 0a2b8aae72..24d8b093b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 1b3db951f6..d4cf015fc7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1003:30,7 [87] )
+Generated Location: (1011:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index f37bbf3287..0af4836048 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
index 81d9728d7a..e3d6621434 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - some-attribute - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index 0426607b43..7d13b0d3c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -10,7 +10,7 @@ namespace Test
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
index 2eb66a0f0b..11debcfefc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt
@@ -7,6 +7,6 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (45:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index 3a6ab74a42..45d920ba24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index 40d6b5e3c5..8000b2daf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 4c71667162..01d4d22cdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 87601b15c2..88619c6e56 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
                     ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index 34ad66eeca..29b7ca26e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1241:37,7 [60] )
+Generated Location: (1249:37,7 [60] )
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index 50d7066fe5..fd2c964e59 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using AnotherTest;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
index 16d079b116..065b10211a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherTest
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (22:2,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
                     ComponentChildContent - (45:3,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
index 29effcf6e5..e65f403066 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
@@ -23,7 +23,7 @@ using System.Reflection;
 #line hidden
 #nullable disable
     [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-    public class _Imports : System.Object
+    public partial class _Imports : System.Object
     {
         #pragma warning disable 1998
         protected void Execute()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
index e2abbca8dd..2d5262445c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
@@ -9,7 +9,7 @@ Document -
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - 
             IntermediateToken -  - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
-        ClassDeclaration -  - public - _Imports - System.Object - 
+        ClassDeclaration -  - public partial - _Imports - System.Object - 
             MethodDeclaration -  - protected - void - Execute
                 CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
                     IntermediateToken - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) - CSharp - Foo
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index cc03ae9e8f..92eeab5973 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
index a740d77bf1..bb7d2bbd84 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter
                     ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index 5a4a7f4e97..e278e10afa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent<TItem1, TItem2> : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index d596262eab..e02f45569c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (1:0,1 [40] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Item1</h1>\n
                 CSharpCode - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index d266ed96bb..830e2d6d1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (775:26,1 [34] )
+Generated Location: (783:26,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (775:26,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1424:51,0 [3] )
+Generated Location: (1432:51,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1604:60,7 [185] )
+Generated Location: (1612:60,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 1a6bfd994b..e05c695de5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Foo = Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
index 0588c17fee..b0b78a2635 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - static Test2.SomeComponent
         UsingDirective - (36:1,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Foo = Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (55:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (70:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 453434e63d..cb28337cb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
index bf70025a0b..4f1736bf0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 MarkupBlock -  - \n<mycomponent></mycomponent>\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index 01dc21cdee..d577cf2a9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
index a58911a312..be1a9c342d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index 03822cedcd..f14834a5db 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
index d7e2828ab0..27d9922b47 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.ir.txt
@@ -7,6 +7,6 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index e9a5ae3f06..06c73ef0b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -22,7 +22,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class Counter : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class Counter : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
index 8a6c4dfbd2..e524cb258d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.ir.txt
@@ -7,6 +7,6 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
-        ClassDeclaration -  - public - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - Counter - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (21:1,0 [12] Counter.razor) - Counter2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 8c15a1cea5..8deff24077 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
index 580d2962cd..1e3b4c0494 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                 HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 257c9a4d9c..82206d510e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (725:20,1 [18] )
+Generated Location: (733:20,1 [18] )
 |if (true)
 {
     |
@@ -11,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (966:30,38 [5] )
+Generated Location: (974:30,38 [5] )
 |
 }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index 88c97a9e79..ba7c557a07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
index 41daeb1b8b..10da908cb1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <!DOCTYPE html>\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index 1202b7c81d..1ca18e16b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
index 5f6457ac2f..34108d9c57 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 8632fa0885..94d8540a09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index 1c8f441484..10110bdd17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - @onclick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 9fac1cac91..99c940c080 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (805:22,7 [87] )
+Generated Location: (813:22,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index 6bc2168491..00208b896c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -29,7 +29,7 @@ using System.Reflection;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
index fa1ae256a2..ceb2775332 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.ir.txt
@@ -9,6 +9,6 @@ Document -
         UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
         CSharpCode - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor)
             IntermediateToken - (57:2,11 [14] x:\dir\subdir\Test\_Imports.razor) - CSharp - [Serializable]
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index 5e5218e2e5..2031e415bf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 1d4696f21c..b41180f006 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index 9a0a659ea6..90e0c8aa9f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (834:21,40 [12] )
+Generated Location: (842:21,40 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1081:32,7 [49] )
+Generated Location: (1089:32,7 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 8bc7566313..b528bea11e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index c80ab6a5ea..dfa54bd417 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index d55a54212a..0524b9fbdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1045:27,19 [9] )
+Generated Location: (1053:27,19 [9] )
 |123 + 456|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 6b44f2b991..343f6b54e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
index 1e37dae58c..3d8effc235 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (39:3,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
                     ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.SingleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index ba86a76a59..ad5479c69d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index c724647179..7da0ce2b7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 0ca7d8ee94..6c720134d4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (873:21,40 [10] )
+Generated Location: (881:21,40 [10] )
 |myInstance|
 
 Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1162:33,7 [104] )
+Generated Location: (1170:33,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index 500298b6c9..201ca9d03a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 1bc1814490..7d1c67f32f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [97] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 1f290c1c54..7a7028eb28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1084:27,19 [10] )
+Generated Location: (1092:27,19 [10] )
 |myInstance|
 
 Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1373:39,7 [104] )
+Generated Location: (1381:39,7 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index bd2bf2016c..746ff1518b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
index 30826c2804..3429b2d1ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index f34385a2d5..860b30df36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1308:32,7 [93] )
+Generated Location: (1316:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index a60d0a704e..301d92f34c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
index a26f802577..b0ca2494c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 55b27f4e33..071348e585 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1310:32,7 [93] )
+Generated Location: (1318:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index 16332db5ac..1fcd536fea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
index 286bcc16d5..44551cade9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 06f9c88ebe..2c07b4039e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (69:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1079:36,7 [93] )
+Generated Location: (1087:36,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 104536cb0c..170a5b1255 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
index 328956d3b4..ab5ee99b5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [93] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 8ce8b2b18b..34e5da0a5e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1309:32,7 [93] )
+Generated Location: (1317:32,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index 90128a13fa..ef10095f8e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -17,7 +17,7 @@ using Test2;
 #nullable disable
     [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")]
     [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
index 8a1b089bae..8001655739 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         UsingDirective - (46:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         RouteAttributeExtensionNode -  - /MyPage
         RouteAttributeExtensionNode -  - /AnotherRoute/{id}
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (59:3,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (74:3,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 1cfe84eccd..2a000ec541 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ using Test3;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
index b802e539fb..d6914eb2c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.ir.txt
@@ -7,7 +7,7 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test2
         UsingDirective - (15:1,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Test3
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (28:2,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 HtmlContent - (43:2,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index d50deab626..6969144ef8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index 854427f5fd..05be10eaa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 1c7d63b87a..91356d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (578:17,2 [40] )
+Generated Location: (586:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 71c3425ad5..0e9df4dee9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index 0ccf3f8fed..292cda17cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 1c7d63b87a..91356d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (578:17,2 [40] )
+Generated Location: (586:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index b4857ae33a..720b7182b1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
index 5b3a5785b4..c8c04397d2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index 38b43f29a1..7bac017262 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 105f53f39a..25345f1b0c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 80f868260e..ae8f96b2a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2013:41,12 [30] )
+Generated Location: (2021:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index fb1c3023f6..3007a71be0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index f30e0af346..9cec88099f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index 44794b9c49..6bb2ccfb90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2171:41,12 [30] )
+Generated Location: (2179:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index 81081bdf5c..8b46f7e97a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index 4c1d2f3e36..b234a58f15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index 3dd3bd719e..8ff639eb64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2093:41,12 [30] )
+Generated Location: (2101:41,12 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 46ef7ee9ac..0223186764 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
index cf083f5ca4..8c20c432a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 3511a5d9b9..d598722d48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
index e434a9fce7..955189823e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute -  - Foo - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 7691ac3161..8698a027f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 1783e5ad1b..e28b89d9a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index ed71312a8a..f76be5b17e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1696:45,12 [35] )
+Generated Location: (1704:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 3a62a163aa..1692b5a96d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
index 1620f5850d..039aab4499 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index f98698a73e..0d94284032 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index 34a92ffb58..2fb3c958c5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index a530cf8a2f..867fd2df72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (2028:53,12 [35] )
+Generated Location: (2036:53,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 0aba3aeb2a..5c4151e716 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 2e1fc7edd2..67311e03d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index ed71312a8a..f76be5b17e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1696:45,12 [35] )
+Generated Location: (1704:45,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index 871f214c17..f9ca0bdec8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index e970d831de..931b4be212 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index ac15f56cc4..1d52b314c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
index bc80339ed7..8c19f54db3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [145] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
index 338fb49b28..b75affc937 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
index f3e523b7a0..07844b458a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ElementWithUppercaseTagName_CanHideWarningWithBang/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <NotAComponent></NotAComponent>\n<DefinitelyNotAComponent></DefinitelyNotAComponent>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
index 57e5d27840..a587a2314f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
index 9272a58d70..820653d513 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [84] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (72:0,72 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
index c46f7100b8..32edccc7d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (37:0,37 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (827:21,37 [10] )
+Generated Location: (835:21,37 [10] )
 |someObject|
 
 Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (1117:33,7 [49] )
+Generated Location: (1125:33,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
index 49027ac9d0..59e76bdd99 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
index c84161056a..5713386341 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
index d5a06aa130..2bf586f3fc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |someObject|
-Generated Location: (997:29,49 [10] )
+Generated Location: (1005:29,49 [10] )
 |someObject|
 
 Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -9,7 +9,7 @@ Source Location: (74:2,7 [109] x:\dir\subdir\Test\TestComponent.cshtml)
 
         [Parameter] public int Min { get; set; }
     |
-Generated Location: (1240:40,7 [109] )
+Generated Location: (1248:40,7 [109] )
 |
         private object someObject = new object();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 669aa6b472..c2b19618c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index 554b419774..90fb3ecb8d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <elem attributebefore="before" @KEY="someObject" attributeafter="after">Hello</elem>
             CSharpCode - (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 81fe48cac3..28a17769e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithKey_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (95:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object someObject = new object();
 |
-Generated Location: (770:20,7 [49] )
+Generated Location: (778:20,7 [49] )
 |
     private object someObject = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
index bccd61fb44..75c9f9dcb9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
index b9ffc7754d..0b5f3c72e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [80] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
index 33a1ffc706..de1df1b068 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElem|
-Generated Location: (864:21,37 [6] )
+Generated Location: (872:21,37 [6] )
 |myElem|
 
 Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (91:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
 |
-Generated Location: (1176:34,7 [128] )
+Generated Location: (1184:34,7 [128] )
 |
     private Microsoft.AspNetCore.Components.ElementReference myElem;
     public void Foo() { System.GC.KeepAlive(myElem); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
index f425681378..01ec096e78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
index 62d17f05fd..c627461520 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute -  - type=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
index f35554549b..78f9115f7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AndOtherAttributes/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (49:0,49 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_element|
-Generated Location: (1034:29,49 [8] )
+Generated Location: (1042:29,49 [8] )
 |_element|
 
 Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -10,7 +10,7 @@ Source Location: (72:2,7 [164] x:\dir\subdir\Test\TestComponent.cshtml)
         [Parameter] public int Min { get; set; }
         public void Foo() { System.GC.KeepAlive(_element); }
     |
-Generated Location: (1301:41,7 [164] )
+Generated Location: (1309:41,7 [164] )
 |
         private ElementReference _element;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 2ebd414c51..e5693cb9ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index ee469bdbbc..15382360d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithRef_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <elem attributebefore="before" @rEF="myElem" attributeafter="after">Hello</elem>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
index f051832363..808c64c366 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
index 3d2bb8827d..279394a318 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
index 5f97cfc9c3..32dd6a1f4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1334:33,7 [93] )
+Generated Location: (1342:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 52beeca87d..7b966c1ca2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index a92e72da17..aa001c3e44 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <elem attributebefore="before" @ATTributes="someAttributes" attributeafter="after">Hello</elem>
             CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 9e83a67391..2463912511 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (781:20,7 [93] )
+Generated Location: (789:20,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index a023ad48df..34490d41e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
index 9b36e0b4c1..d7f1c8bbb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [98] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 8ec5df3e2b..9a3a536897 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (109:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1336:33,7 [93] )
+Generated Location: (1344:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index fad15e7ed8..2b420a0229 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
index e028cc8181..326e1bdaa1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index 82d3039280..af6aa3bfeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Element_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (107:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1335:33,7 [93] )
+Generated Location: (1343:33,7 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index d447b3ee04..fe520fc600 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index f0d049c4f8..a0a30b8ab0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [89] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 822be515cc..cf419cfbeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1464:37,7 [87] )
+Generated Location: (1472:37,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 42651329f0..7305b70217 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index bf9f7bbe21..bcc2d307aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index f164a922a0..1c36f36b4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1247:30,7 [87] )
+Generated Location: (1255:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 2c62367bf9..b0dde1ec8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 5ad9c376ce..399f6aaccf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index bdbc4237e2..e73ad85539 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1411:37,7 [103] )
+Generated Location: (1419:37,7 [103] )
 |
     private int counter;
     private void Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index 2843ecb025..78fb42ebb6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index b0afa992ef..2267e969d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index ee6caa7849..ce6a03a2f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1411:37,7 [139] )
+Generated Location: (1419:37,7 [139] )
 |
     private int counter;
     private Task Increment(MouseEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index fc735d5239..d9052cfeb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 655b21550e..375dc6ca85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 4a9fe1a151..3f2be92e4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1247:30,7 [123] )
+Generated Location: (1255:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 71d147c025..078a67e995 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index d8aa7e8884..ce367272ff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index 4fbbc124ec..4d9f2df89d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1411:37,7 [104] )
+Generated Location: (1419:37,7 [104] )
 |
     private int counter;
     private void Increment(ChangeEventArgs e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 50f18a1b27..40914c447e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index 59a76bd0f7..9d562d79a1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index c565ef85e5..7b0d879493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1180:30,7 [87] )
+Generated Location: (1188:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 19339d0b13..8f65beaa0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index bf9f7bbe21..bcc2d307aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index 0f30f98457..4e00aa71c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1143:30,7 [87] )
+Generated Location: (1151:30,7 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index 4ef3fc99ee..a58a3e01e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index d54c458849..c933d37792 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 5e48d447b8..1e809cd67f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -5,7 +5,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1143:30,7 [95] )
+Generated Location: (1151:30,7 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 1d3203fee7..40e4530fd0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 655b21550e..375dc6ca85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 75957fa3cb..9caaa5c2b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1143:30,7 [123] )
+Generated Location: (1151:30,7 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index 3bc7d08c7c..cd54b177d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 1302ce6e14..6850ddde90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index 1d827bbc3d..9126a97304 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1143:30,7 [131] )
+Generated Location: (1151:30,7 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
index 4611e1077d..469d7009f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
index 399a50f0ad..8d61935237 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input onfocus="alert("Test");">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
index 8a2bc393a8..9cef9c2f9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
index e746f62e6e..920909a97a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input @onCLICK="OnClick">
             CSharpCode - (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
index 5f82913831..cd25566915 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (872:27,7 [47] )
+Generated Location: (880:27,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 467d90e842..a52a09b1a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
index 11cc765bcb..5ffa1c26eb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
index 14cead9ce8..7ce0cd386b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(EventArgs e) {
     }
 |
-Generated Location: (1216:37,7 [42] )
+Generated Location: (1224:37,7 [42] )
 |
     void OnClick(EventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
index 7b486b43c4..ea0b4bacd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
index 59ab34f294..cf1177e1dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
index d9c7271f33..2beea7ab95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1216:37,7 [47] )
+Generated Location: (1224:37,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
index becce32d67..1a3f72a26f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
index 5a3e44bafc..ad0d2cd629 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
index 7b486b43c4..ea0b4bacd5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
index 59ab34f294..cf1177e1dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
index d9c7271f33..2beea7ab95 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick(MouseEventArgs e) {
     }
 |
-Generated Location: (1216:37,7 [47] )
+Generated Location: (1224:37,7 [47] )
 |
     void OnClick(MouseEventArgs e) {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 1c5c56c3ae..5d561a71d7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index 2a7da659fc..60704a5e36 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input @onclick="x => { }">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
index 696b79bd9c..c364c24b92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
index d59c47cb75..0496b08d28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
index 4c8c812648..b435f29199 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1216:37,7 [31] )
+Generated Location: (1224:37,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
index fc44e9f1af..0d33c0a7aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
index cfddff9ca0..80d0091f0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - input
                     HtmlAttribute - (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
index a33be57a79..21a407ad54 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
index 70a0037442..e85051e51d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt
@@ -6,6 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <input onclick="foo">
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index e9a3b5ca54..e91d8df717 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
index 2214655b97..e8eb031160 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [48] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index 7793531abe..7175a038f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
index 033d43f1e1..7108e765d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 7395ef5af5..30b6b017c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
index 033d43f1e1..7108e765d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 7869cdebe7..bce4f61c97 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
index 033d43f1e1..7108e765d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Test
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index 9931408550..8f65d3cb5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Test.Shared;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index f92c602e93..464ec36079 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Test.Shared
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (20:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 5f284d1210..3347fa49ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     MyClass Hello = new MyClass();
 |
-Generated Location: (1197:43,7 [38] )
+Generated Location: (1205:43,7 [38] )
 |
     MyClass Hello = new MyClass();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index 2bae2266c8..c3d4972aad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index 5dbefda847..173aa8f3d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
index 35cce98a12..98497b2473 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1044:28,38 [3] )
+Generated Location: (1052:28,38 [3] )
 |_my|
 
 Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1331:40,7 [90] )
+Generated Location: (1339:40,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
index bbcfa74722..ff15df9e2a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index cde256a50b..8fbb88c926 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index 3c103a0ec3..92049ea4d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (872:26,28 [3] )
+Generated Location: (880:26,28 [3] )
 |_my|
 
 Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -8,7 +8,7 @@ Source Location: (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1095:37,7 [90] )
+Generated Location: (1103:37,7 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index 383c6e3de5..d8a7967fa3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index 0b361fd41c..b7cd7e9fcb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
                     ComponentChildContent -  - ChildContent - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index e2052de080..8f217b96c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index f910f85b44..3d92af0ed0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index c2c2966874..6b29370fdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1005:28,38 [8] )
+Generated Location: (1013:28,38 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1248:39,7 [47] )
+Generated Location: (1256:39,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index fcf9a78f16..d134245da6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index bfaf4a6def..c9391bc849 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index df8e691bed..5ec0506266 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
 Source Location: (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (858:26,28 [8] )
+Generated Location: (866:26,28 [8] )
 |_someKey|
 
 Source Location: (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1060:36,7 [47] )
+Generated Location: (1068:36,7 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index 1e617b6b4e..121ad727ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 0b3d0fe26d..763a2bc3bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 6d3f553d68..324adf9e46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
index bfd9d69a0d..c6dc3beb1b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
                 HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 641d0cb298..3c19ffe010 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -14,7 +14,7 @@ using System;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
index 0319c00bbc..652c51b282 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [14] x:\dir\subdir\Test\TestComponent.cshtml) - System
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 2992055209..7f03cf522e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index e80069bb13..89e65ae57e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 1c7d63b87a..91356d82da 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
 | 
   var myValue = "Expression value";
 |
-Generated Location: (578:17,2 [40] )
+Generated Location: (586:17,2 [40] )
 | 
   var myValue = "Expression value";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index a8340499a0..650a35e5af 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
index 80f8dce702..d16ec66028 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (19:1,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 9d353958e1..056b2540d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
index 72984229f1..0a9913a083 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index f2ceb6361a..7a4c8ccae0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (858:23,7 [39] )
+Generated Location: (866:23,7 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index 60f201c50b..88c0572aca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
index 4b747bb9b0..70c86a1eef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Test.Context> template = (context) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 5896bf1144..189474be14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Test.Context> template = (context) => |
-Generated Location: (578:17,2 [54] )
+Generated Location: (586:17,2 [54] )
 | RenderFragment<Test.Context> template = (context) => |
 
 Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1647:48,107 [2] )
+Generated Location: (1655:48,107 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 4245d11504..2bc235cb2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 5634baf6df..78f478f163 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index da87e2cd45..836caab115 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (578:17,2 [45] )
+Generated Location: (586:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1450:40,89 [3] )
+Generated Location: (1458:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1629:49,7 [76] )
+Generated Location: (1637:49,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 0fc9c79187..1a54116eb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 746f757a3d..61f3ca9b38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 601ddb21de..ad61d61350 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (578:17,2 [45] )
+Generated Location: (586:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1450:40,89 [3] )
+Generated Location: (1458:40,89 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2199:65,7 [76] )
+Generated Location: (2207:65,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index 3cce17476b..bafe4bdc50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
index 7e65894e97..cfcce32483 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment<Person> template = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index bbd7ec5a32..aeeba7280b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment<Person> template = (person) => |
-Generated Location: (578:17,2 [47] )
+Generated Location: (586:17,2 [47] )
 | RenderFragment<Person> template = (person) => |
 
 Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (1213:37,73 [2] )
+Generated Location: (1221:37,73 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
index 260bf8d149..bd3cd885b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
index 67cf9969c2..700ce91d72 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (1:0,1 [49] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
index 4eedb74b90..f75add9cec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (60:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1377:48,7 [138] )
+Generated Location: (1385:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
index 7e46a81fc2..7a0e0e8c03 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
index d6be2227fd..d59185849d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    RenderFragment<Person> p = (person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
index a3b0e50906..41e5e233b5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
 Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     RenderFragment<Person> p = (person) => |
-Generated Location: (578:17,2 [45] )
+Generated Location: (586:17,2 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
 Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1199:38,67 [3] )
+Generated Location: (1207:38,67 [3] )
 |;
 |
 
@@ -19,7 +19,7 @@ Source Location: (84:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (1378:47,7 [76] )
+Generated Location: (1386:47,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
index f21c38cce0..d5b8baf16f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
index a7e7a36d96..90b50ab84b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (2:0,2 [49] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
index 8d853cc485..ed8cc20619 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt
@@ -7,7 +7,7 @@ Source Location: (62:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
 
     object RenderPerson(RenderFragment<Person> p) => null;
 |
-Generated Location: (1380:48,7 [138] )
+Generated Location: (1388:48,7 [138] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index 514248aa56..84c8907576 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
index 7457e4752d..25f8aafe53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderFragment template = 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 7d46380c18..015a9c01ef 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2:0,2 [27] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderFragment template = |
-Generated Location: (578:17,2 [27] )
+Generated Location: (586:17,2 [27] )
 | RenderFragment template = |
 
 Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |; |
-Generated Location: (886:27,45 [2] )
+Generated Location: (894:27,45 [2] )
 |; |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
index 2b59e51e85..5f6d44c0e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
index de25acd7a8..4b92f44678 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpExpression - (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
index 01f474539b..a196ca0047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (38:1,7 [54] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     object RenderPerson(RenderFragment p) => null;
 |
-Generated Location: (1085:38,7 [54] )
+Generated Location: (1093:38,7 [54] )
 |
     object RenderPerson(RenderFragment p) => null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 7a8947af80..063bc389ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 629774d50b..cf75d527c3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
                     ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index c9f47a4851..9eda2687ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1108:31,7 [24] )
+Generated Location: (1116:31,7 [24] )
 |
     string y = null;
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 29a77a9f76..d889b32a86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index d376d038a3..eb577d71be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
                     ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index ac3ce2f184..cee873f72e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1588:41,7 [88] )
+Generated Location: (1596:41,7 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index b69675629b..fed072391c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
index 84bd548664..79ffa51288 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index e73f1774c1..39b5e8deb0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
index 2a2f7afa73..32daefbab0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
index 4cd1eef10e..bd9df63baa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
index a6bf10b6f8..67d623e21a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p
                     HtmlAttribute - (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - "
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
index f8582a7315..2f1479d830 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml)
     {
     }
 |
-Generated Location: (1510:46,7 [130] )
+Generated Location: (1518:46,7 [130] )
 |
     public string ParentBgColor { get; set; } = "#FFFFFF";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 92ca67bae4..11af4cefd1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
index 6c57ae497f..8b5f47c1b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index eeb80a1f60..16726f5372 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 902be776e5..4110afc7a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [51] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.RenderTree
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
index 5086da6818..8dc476fe25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt
@@ -4,7 +4,7 @@ Source Location: (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
     if (__builder == null) output = "Builder is null!";
     else output = "Builder is not null!";
 |
-Generated Location: (749:24,2 [134] )
+Generated Location: (757:24,2 [134] )
 |
     var output = string.Empty;
     if (__builder == null) output = "Builder is null!";
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
index e38b0e9e0a..112f0033d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components.Rendering;
 #line default
 #line hidden
 #nullable disable
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
index 03c3279b6b..bcd50c61c7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.ir.txt
@@ -6,7 +6,7 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         UsingDirective - (1:0,1 [50] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Rendering
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
             CSharpCode - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
                 IntermediateToken - (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent(RenderTreeBuilder __builder)\n    {\n        var output = string.Empty;\n        if (__builder == null) output = "Builder is null!";\n        else output = "Builder is not null!";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
index 33931628e4..05d990ee12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt
@@ -6,7 +6,7 @@ Source Location: (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml)
         if (__builder == null) output = "Builder is null!";
         else output = "Builder is not null!";
 |
-Generated Location: (802:26,7 [213] )
+Generated Location: (810:26,7 [213] )
 |
     void RenderChildComponent(RenderTreeBuilder __builder)
     {
@@ -18,7 +18,7 @@ Generated Location: (802:26,7 [213] )
 Source Location: (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1545:52,0 [7] )
+Generated Location: (1553:52,0 [7] )
 |    }
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
index a731c9cd0f..f5ef41e3b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
index 319f07784d..0ec96376e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>\n\n
                 CSharpExpression - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 6c615d6065..d1804d339d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
index f7adbb2050..5705f5828c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>\n\n
                 Component - (18:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
index 4bbe2ae0ef..d319c30c28 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs
@@ -9,7 +9,7 @@ namespace Test
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
     [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")]
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
index aba3ac5260..5be8a555b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt
@@ -6,6 +6,6 @@ Document -
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         RouteAttributeExtensionNode -  - /my/url
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
index 5213196255..56f8b8e45d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
index f094db2671..4924d8da0d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InsideAttribute_InMarkupBlock/TestComponent.ir.txt
@@ -5,6 +5,6 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <div class="first second">Hello</div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
index d83a551701..6ccca11c24 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
index ed2d4ed2e0..a01a9ef1cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [18] x:\dir\subdir\Test\TestComponent.cshtml) - elem
                     HtmlAttribute - (5:0,5 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
index 9edc33678f..833739d291 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Whitespace_BetweenElementAndFunctions/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (31:1,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |
         int Foo = 18;
     |
-Generated Location: (923:30,11 [29] )
+Generated Location: (931:30,11 [29] )
 |
         int Foo = 18;
     |
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 249603d2c7..b208426546 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -123,10 +123,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup>
       <FileWrites Include="@(_RazorComponentDeclaration)" />
     </ItemGroup>
-
-    <ItemGroup Condition="'$(DesignTimeBuild)'=='true'">
-      <Compile Include="@(_RazorComponentDeclaration)" />
-    </ItemGroup>
   </Target>
 
   <Target
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index b862d9f369..0b27cfce4a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -47,20 +47,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectCapability Include="SupportsTypeScriptNuGet" />
   </ItemGroup>
 
-  <!--
-    For now we need to treat component files as if they have a single file generator. This will allow us
-    to trigger a workspace update for the declaration files when they change.
-  -->
-  <ItemGroup>
-    <Content Update="**\*.razor">
-      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
-    </Content>
-
-    <Content Update="$(_RazorComponentInclude)">
-      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
-    </Content>
-  </ItemGroup>
-
   <!--
     WebSdk imports these capabilities for nesting in DotNetCoreWeb projects.
     Conditinally import these capabilities if the project isn't targeting the WebSdk.

From ef8830ffec8f36863b44dc359377e92515b28468 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 30 Sep 2019 22:13:12 -0700
Subject: [PATCH 275/337] Update baselines to unbreak tests
 (dotnet/aspnetcore-tooling#1184)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0d1e0d6eba2e12e9b216c97ae2b567215dae25d7
---
 .../TestComponent.codegen.cs                                    | 2 +-
 .../TestComponent.ir.txt                                        | 2 +-
 .../TestComponent.codegen.cs                                    | 2 +-
 .../TestComponent.ir.txt                                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
index cbbb4df936..bc7d121824 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
index aea9472c47..6431c6c83a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning disable 0414
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
index fb27ee3716..1ad49ddc7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -8,7 +8,7 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
-    public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
index bb0c9a9624..0020d34b73 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.ir.txt
@@ -5,7 +5,7 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
-        ClassDeclaration -  - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [78] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent - (17:1,2 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - context

From 1d789575aea905e3824c33769a0e37c756ac6def Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 2 Oct 2019 12:17:01 -0700
Subject: [PATCH 276/337] Embedded resource convention workaround \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/6e6faf5aaad00c9eba5d3b0c7dc9775bd9870b6d

---
 ...oft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj | 4 +++-
 .../Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
index 5f09868d52..d50e41ea9b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -4,6 +4,8 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,4 +35,4 @@
 
     <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 310177f1b9..53bb890712 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -4,6 +4,8 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>

From 7a61205024182657b3771aa5de2cfb0cbcd017e1 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 2 Oct 2019 12:21:01 -0700
Subject: [PATCH 277/337] Add workaround to one more project \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/381138fc723f857094ef138290642559dfae6177

---
 .../test/Microsoft.AspNetCore.Razor.Language.Test.csproj        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index 4430c2e13b..61591de7d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -4,6 +4,8 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
+
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>

From 3ce7953fec3c6bfb721cd96acf4ec94e59aeb1d7 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 2 Oct 2019 12:33:27 -0700
Subject: [PATCH 278/337] One more missed convention location \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/1e6b4887c4539652e3a104dc0a9d73273809fb91

---
 ...osoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index 60f85d388f..07770f8006 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -4,6 +4,8 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>

From 371f2c246b2e109cf05187124694e5eb7de7897d Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 2 Oct 2019 12:56:34 -0700
Subject: [PATCH 279/337] Switch to embedded package icon \n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/fba50fdcd4d5ac3d1ddbb1d8a840673b68e0aca4

---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj  | 1 +
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index ba33b9f833..9c811eb9c2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -77,6 +77,7 @@
 
     <ItemGroup>
       <NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
+      <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index fc409c5e90..6fadcf8138 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
     <dependencies>
       <group targetFramework=".NETStandard2.0" />
     </dependencies>
@@ -13,6 +14,7 @@
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
     <file src="_._" target="lib\netstandard2.0\_._" />
 
+    <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
 </package>

From f19dc083051231b82f804f7b7fa724c348eb3d98 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 1 Oct 2019 12:52:27 -0700
Subject: [PATCH 280/337] Fix dotnet/aspnetcore-tooling#10498 - void elements
 with directive attributes

This change updates tag helper binding logic to allow directive
attributes (when they appear alone) to bind to any kind of tag
(start/end, void, self-closing).

Tag Helpers don't have a semantic that allows this level of flexibility
- using StartTagOnly as suggested in the issue means that this would
*only* work for void elements.

There's no change to any of the directive attribute implementations
because this is a global change in the tag helper infra.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/fd72afc1c606e749f6e5ac7d7165a2daa1139703
---
 .../src/Legacy/TagHelperBlockRewriter.cs      | 25 +++++--
 .../src/Legacy/TagHelperParseTreeRewriter.cs  | 10 ++-
 .../ComponentCodeGenerationTestBase.cs        | 69 ++++++++++++++++---
 .../test/Legacy/TagHelperBlockRewriterTest.cs | 51 ++++++++++++++
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  4 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  4 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.ir.txt                      |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.codegen.cs                  | 44 ++++++++++++
 .../TestComponent.ir.txt                      | 29 ++++++++
 .../TestComponent.mappings.txt                | 14 ++++
 .../TestComponent.ir.txt                      | 20 +++---
 .../TestComponent.mappings.txt                |  6 +-
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 22 +++---
 .../TestComponent.mappings.txt                | 12 ++--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 22 +++---
 .../TestComponent.mappings.txt                | 12 ++--
 .../TestComponent.codegen.cs                  | 52 ++++++++++++++
 .../TestComponent.ir.txt                      | 34 +++++++++
 .../TestComponent.mappings.txt                | 21 ++++++
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 18 ++---
 .../TestComponent.mappings.txt                | 12 ++--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  4 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      |  4 +-
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.ir.txt                      |  4 +-
 .../TestComponent.mappings.txt                |  2 +-
 .../TestComponent.mappings.txt                |  9 +++
 .../TestComponent.codegen.cs                  | 43 ++++++++++++
 .../TestComponent.ir.txt                      | 20 ++++++
 .../TestComponent.mappings.txt                |  9 +++
 .../TestComponent.ir.txt                      | 20 +++---
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 22 +++---
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 22 +++---
 .../TestComponent.mappings.txt                |  8 +--
 .../TestComponent.codegen.cs                  | 51 ++++++++++++++
 .../TestComponent.ir.txt                      | 23 +++++++
 .../TestComponent.mappings.txt                | 11 +++
 .../TestComponent.codegen.cs                  |  2 +-
 .../TestComponent.ir.txt                      | 10 +--
 .../TestComponent.mappings.txt                |  8 +--
 ..._DirectiveAttribute_SelfClosing.cspans.txt |  7 ++
 ...s_DirectiveAttribute_SelfClosing.stree.txt | 32 +++++++++
 ...uctures_DirectiveAttribute_Void.cspans.txt |  7 ++
 ...ructures_DirectiveAttribute_Void.stree.txt | 31 +++++++++
 58 files changed, 728 insertions(+), 166 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_StartEndTag/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.stree.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.cspans.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.stree.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
index 9d47a0b97f..3456bdcc12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -11,11 +12,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     internal static class TagHelperBlockRewriter
     {
         public static TagMode GetTagMode(
-            MarkupStartTagSyntax tagBlock,
-            TagHelperBinding bindingResult,
-            ErrorSink errorSink)
+            MarkupStartTagSyntax startTag,
+            MarkupEndTagSyntax endTag,
+            TagHelperBinding bindingResult)
         {
-            var childSpan = tagBlock.GetLastToken()?.Parent;
+            var childSpan = startTag.GetLastToken()?.Parent;
 
             // Self-closing tags are always valid despite descriptors[X].TagStructure.
             if (childSpan?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false)
@@ -23,6 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return TagMode.SelfClosing;
             }
 
+            var hasDirectiveAttribute = false;
             foreach (var descriptor in bindingResult.Descriptors)
             {
                 var boundRules = bindingResult.Mappings[descriptor];
@@ -32,6 +34,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     return TagMode.StartTagOnly;
                 }
+
+                // Directive attribute will tolerate forms that don't work for tag helpers. For instance:
+                //
+                // <input @onclick="..."> vs <input onclick="..." />
+                //
+                // We don't want this to become an error just because you added a directive attribute.
+                if (descriptor.IsAnyComponentDocumentTagHelper() && !descriptor.IsComponentOrChildContentTagHelper())
+                {
+                    hasDirectiveAttribute = true;
+                }
+            }
+
+            if (hasDirectiveAttribute && startTag.IsVoidElement() && endTag == null)
+            {
+                return TagMode.StartTagOnly;
             }
 
             return TagMode.StartTagAndEndTag;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
index 0af7a34363..25e191a369 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperParseTreeRewriter.cs
@@ -104,7 +104,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (startTag != null)
                 {
                     var tagName = startTag.GetTagNameWithOptionalBang();
-                    if (TryRewriteTagHelperStart(startTag, out tagHelperStart, out tagHelperInfo))
+                    if (TryRewriteTagHelperStart(startTag, node.EndTag, out tagHelperStart, out tagHelperInfo))
                     {
                         // This is a tag helper.
                         if (tagHelperInfo.TagMode == TagMode.SelfClosing || tagHelperInfo.TagMode == TagMode.StartTagOnly)
@@ -215,7 +215,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return base.VisitMarkupTextLiteral(node);
             }
 
-            private bool TryRewriteTagHelperStart(MarkupStartTagSyntax startTag, out MarkupTagHelperStartTagSyntax rewritten, out TagHelperInfo tagHelperInfo)
+            private bool TryRewriteTagHelperStart(
+                MarkupStartTagSyntax startTag,
+                MarkupEndTagSyntax endTag,
+                out MarkupTagHelperStartTagSyntax rewritten,
+                out TagHelperInfo tagHelperInfo)
             {
                 rewritten = null;
                 tagHelperInfo = null;
@@ -278,7 +282,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     _errorSink,
                     _source);
 
-                var tagMode = TagHelperBlockRewriter.GetTagMode(startTag, tagHelperBinding, _errorSink);
+                var tagMode = TagHelperBlockRewriter.GetTagMode(startTag, endTag, tagHelperBinding);
                 tagHelperInfo = new TagHelperInfo(tagName, tagMode, tagHelperBinding);
                 rewritten = rewrittenStartTag;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index a6cc308951..8e889fe94f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -184,7 +184,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-<MyComponent 
+<MyComponent
     IntProperty=""123""
     BoolProperty=""true""
     StringProperty=""My string""
@@ -317,7 +317,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-@{ 
+@{
   var myValue = ""Expression value"";
 }
 <elem data-abc=""Literal value"" data-def=""@myValue"" />");
@@ -335,7 +335,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-@{ 
+@{
   var myValue = ""Expression value"";
 }
 <elem data-abc=""Literal value"" data-def=""@(myValue)"" />");
@@ -353,7 +353,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
-@{ 
+@{
   var myValue = ""Expression value"";
 }
 <div>@myValue <!-- @myValue --> </div>");
@@ -471,7 +471,7 @@ namespace Test
             var generated = CompileToCSharp(@"
 <InputText @bind-Value=""person.Name"" />
 
-@functions 
+@functions
 {
     Person person = new Person();
 }");
@@ -896,6 +896,37 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BindToElement_WithoutCloseTag()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", null, ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+
+            // Act
+            var generated = CompileToCSharp(@"
+<div>
+  <input @bind=""@ParentValue"">
+</div>
+@code {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void BindToElement_WithStringAttribute_WritesAttributes()
         {
@@ -2608,6 +2639,28 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void EventHandler_OnElement_WithoutCloseTag()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
+<div>
+  <input @onclick=""OnClick"">
+</div>
+@code {
+    void OnClick() {
+    }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void EventHandler_OnElement_WithEventArgsMethodGroup()
         {
@@ -2659,7 +2712,7 @@ namespace Test
 @using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
@@ -2682,7 +2735,7 @@ namespace Test
 @using Microsoft.AspNetCore.Components.Web
 <input @onclick=""OnClick"" />
 @code {
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
@@ -4300,7 +4353,7 @@ namespace Test
         {
             // Arrange/Act
             var generated = CompileToCSharp(@"
-   
+
 @(""My value"")
 
 <h1>Hello</h1>");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
index c581a53c3c..b574dbdf12 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs
@@ -233,6 +233,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             EvaluateData(descriptors, "<input></input>");
         }
 
+        [Fact]
+        public void AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing()
+        {
+            // Arrange
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                    {
+                        rule
+                            .RequireTagName("*")
+                            .RequireAttributeDescriptor(b =>
+                            {
+                                b.Name = "@onclick";
+                                b.Metadata.Add(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString);
+                            });
+                    })
+                    .AddMetadata(ComponentMetadata.SpecialKindKey, ComponentMetadata.EventHandler.TagHelperKind)
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input @onclick=\"@test\"/>");
+        }
+
+        [Fact]
+        public void AllowsCompatibleTagStructures_DirectiveAttribute_Void()
+        {
+            // Arrange
+            var descriptors = new TagHelperDescriptor[]
+            {
+                TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
+                    .TagMatchingRuleDescriptor(rule =>
+                    {
+                        rule
+                            .RequireTagName("*")
+                            .RequireAttributeDescriptor(b =>
+                            {
+                                b.Name = "@onclick";
+                                b.Metadata.Add(ComponentMetadata.Common.DirectiveAttribute, bool.TrueString);
+                            });
+ 
+                    })
+                    .AddMetadata(ComponentMetadata.SpecialKindKey, ComponentMetadata.EventHandler.TagHelperKind)
+                    .Build(),
+            };
+
+            // Act & Assert
+            EvaluateData(descriptors, "<input @onclick=\"@test\">");
+        }
+
         [Fact]
         public void CreatesErrorForMalformedTagHelpersWithAttributes1()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 01fb793ed4..3c3aba9118 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -47,7 +47,7 @@ using Microsoft.AspNetCore.Components.Web;
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index efd5f61a5f..50ca165e90 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -27,5 +27,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(MouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(MouseEventArgs e)\n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index fdcc121b0a..aa427218f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -13,16 +13,16 @@ Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1288:38,17 [7] )
 |OnClick|
 
-Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1489:48,7 [89] )
+Generated Location: (1489:48,7 [88] )
 |
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index 2b26ceb0a9..a24d9c7fb2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -47,7 +47,7 @@ using Microsoft.AspNetCore.Components.Web;
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 121af12b51..c058d26d07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -27,5 +27,5 @@ Document -
                             IntermediateToken -  - CSharp - )
                 HtmlContent - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (103:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick()\n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index 9f295a0a35..67eb8cd433 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -13,16 +13,16 @@ Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1288:38,17 [7] )
 |OnClick|
 
-Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1489:48,7 [73] )
+Generated Location: (1489:48,7 [72] )
 |
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 6011905aba..42ffb23814 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -23,5 +23,5 @@ Document -
                             IntermediateToken -  - CSharp - __value => person.Name = __value
                 HtmlContent - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-            CSharpCode - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
+            CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 18c001cfab..093f41905c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (985:25,24 [11] )
 |person.Name|
 
-Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2008cd5509
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
new file mode 100644
index 0000000000..848c2003b0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute - (15:1,8 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                            CSharpExpressionAttributeValue - (23:1,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                    HtmlContent - (37:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (37:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (45:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (45:2,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
new file mode 100644
index 0000000000..3447888130
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (889:25,17 [11] )
+|ParentValue|
+
+Source Location: (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1093:35,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index 82af84767f..ca17aeed14 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -14,13 +14,13 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
-                        IntermediateToken - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
-                    ComponentAttribute - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
-                        IntermediateToken - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
-                    ComponentAttribute - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
-                        HtmlContent - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
-                    ComponentAttribute - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
-                        IntermediateToken - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
+                Component - (0:0,0 [131] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
+                    ComponentAttribute - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                        HtmlContent - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
+                    ComponentAttribute - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index d0ee4d7f0c..16ff811516 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
 Generated Location: (977:25,17 [3] )
 |123|
 
-Source Location: (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
 Generated Location: (1246:34,18 [4] )
 |true|
 
-Source Location: (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
 Generated Location: (1540:44,20 [14] )
 |new SomeType()|
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 4ef8941320..086b0604f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-   
+  
   var myValue = "Expression value";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index 2df363efa0..283c88862a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -14,14 +14,14 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
-                MarkupElement - (45:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
-                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
-                    HtmlAttribute - (75:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
-                        CSharpExpressionAttributeValue - (86:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                CSharpCode - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n  var myValue = "Expression value";\n
+                MarkupElement - (44:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (49:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (67:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (68:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
+                    HtmlAttribute - (74:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (85:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (87:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 65c601f948..4a022743de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-| 
+Source Location: (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
   var myValue = "Expression value";
 |
-Generated Location: (854:24,2 [40] )
-| 
+Generated Location: (854:24,2 [39] )
+|
   var myValue = "Expression value";
 |
 
-Source Location: (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (87:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1077:33,43 [7] )
+Generated Location: (1076:33,43 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 848a00a4ca..af02d86fdd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-   
+  
   var myValue = "Expression value";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index 8e623de3ad..3c5bd6bebd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -14,14 +14,14 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
-                MarkupElement - (45:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
-                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
-                    HtmlAttribute - (75:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
-                        CSharpExpressionAttributeValue - (86:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                CSharpCode - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n  var myValue = "Expression value";\n
+                MarkupElement - (44:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (49:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (67:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (68:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
+                    HtmlAttribute - (74:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (85:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (86:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index bc4ddfe735..7404e8e160 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-| 
+Source Location: (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
   var myValue = "Expression value";
 |
-Generated Location: (854:24,2 [40] )
-| 
+Generated Location: (854:24,2 [39] )
+|
   var myValue = "Expression value";
 |
 
-Source Location: (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (86:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1076:33,42 [7] )
+Generated Location: (1075:33,42 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e92de3eba3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
@@ -0,0 +1,52 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   OnClick
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void OnClick() {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
new file mode 100644
index 0000000000..97e79d0f8a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [26] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute - (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                                IntermediateToken - (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                                IntermediateToken -  - CSharp - )
+                    HtmlContent - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (87:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:3,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
new file mode 100644
index 0000000000..fe6d37f7e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
@@ -0,0 +1,21 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (1174:32,19 [7] )
+|OnClick|
+
+Source Location: (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick() {
+    }
+|
+Generated Location: (1375:42,7 [31] )
+|
+    void OnClick() {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index ac10a4d51c..5a976275ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -22,7 +22,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-   
+  
   var myValue = "Expression value";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index f6e0431c7b..29d00813ad 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -14,12 +14,12 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
-                MarkupElement - (45:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    CSharpExpression - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
-                    HtmlContent - (58:3,13 [1] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (58:3,13 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
-                    HtmlContent - (76:3,31 [1] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (76:3,31 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                CSharpCode - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n  var myValue = "Expression value";\n
+                MarkupElement - (44:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    CSharpExpression - (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                    HtmlContent - (57:3,13 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (57:3,13 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                    HtmlContent - (75:3,31 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (75:3,31 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 2e6c6499c6..55a4c77160 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -1,14 +1,14 @@
-Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-| 
+Source Location: (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
   var myValue = "Expression value";
 |
-Generated Location: (854:24,2 [40] )
-| 
+Generated Location: (854:24,2 [39] )
+|
   var myValue = "Expression value";
 |
 
-Source Location: (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myValue|
-Generated Location: (1020:32,6 [7] )
+Generated Location: (1019:32,6 [7] )
 |myValue|
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
index 5fa17a9b98..821992aeca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs
@@ -42,7 +42,7 @@ using Microsoft.AspNetCore.Components.Web;
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
index b42dd6f4fe..b74890263c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt
@@ -14,5 +14,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
                             IntermediateToken - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(MouseEventArgs e) \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick(MouseEventArgs e)\n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
index e4687bd712..3650f0224e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (112:3,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1340:43,7 [89] )
+Generated Location: (1340:43,7 [88] )
 |
-    Task OnClick(MouseEventArgs e) 
+    Task OnClick(MouseEventArgs e)
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
index ba00b2da01..890ed46fe8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs
@@ -42,7 +42,7 @@ using Microsoft.AspNetCore.Components.Web;
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
        
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
index 0bfa1a3926..a8a43f9f9d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt
@@ -14,5 +14,5 @@ Document -
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
                             IntermediateToken - (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                             IntermediateToken -  - CSharp - )
-            CSharpCode - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick() \n    {\n        return Task.CompletedTask;\n    }\n
+            CSharpCode - (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Task OnClick()\n    {\n        return Task.CompletedTask;\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
index eba61f56ed..b3fecf26ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt
@@ -1,13 +1,13 @@
-Source Location: (112:3,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
 |
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
 |
-Generated Location: (1340:43,7 [73] )
+Generated Location: (1340:43,7 [72] )
 |
-    Task OnClick() 
+    Task OnClick()
     {
         return Task.CompletedTask;
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 68bafe0a3d..85045fdcfb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -14,5 +14,5 @@ Document -
                     ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
-            CSharpCode - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
+            CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    Person person = new Person();\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 7ecdcae141..96363f507f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,4 +1,4 @@
-Source Location: (57:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_StartEndTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_StartEndTag/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6ed1154bcf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_StartEndTag/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (45:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (932:30,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
new file mode 100644
index 0000000000..5803014b53
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "@bind", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n");
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
new file mode 100644
index 0000000000..e61855a4bf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (9:1,2 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute - (15:1,8 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
+                            CSharpExpressionAttributeValue - (23:1,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                                IntermediateToken - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                    HtmlContent - (37:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (37:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
new file mode 100644
index 0000000000..c25138f2f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1133:34,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index 8000b2daf6..fb48ace206 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -7,13 +7,13 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
-                        IntermediateToken - (32:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
-                    ComponentAttribute - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
-                        IntermediateToken - (56:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
-                    ComponentAttribute - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
-                        HtmlContent - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-                            IntermediateToken - (83:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
-                    ComponentAttribute - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
-                        IntermediateToken - (115:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
+                Component - (0:0,0 [131] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
+                    ComponentAttribute - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
+                    ComponentAttribute - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                        HtmlContent - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+                            IntermediateToken - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
+                    ComponentAttribute - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
+                        IntermediateToken - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
index 6969144ef8..8d53571062 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-   
+  
   var myValue = "Expression value";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
index 05be10eaa1..3830ce95f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
-                MarkupElement - (45:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
-                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
-                    HtmlAttribute - (75:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
-                        CSharpExpressionAttributeValue - (86:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (88:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                CSharpCode - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n  var myValue = "Expression value";\n
+                MarkupElement - (44:3,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (49:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (67:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (68:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
+                    HtmlAttribute - (74:3,30 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (85:3,41 [10] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (87:3,43 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
index 91356d82da..e28f42097c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ExplicitExpression/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-| 
+Source Location: (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
   var myValue = "Expression value";
 |
-Generated Location: (586:17,2 [40] )
-| 
+Generated Location: (586:17,2 [39] )
+|
   var myValue = "Expression value";
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
index 0e9df4dee9..650b7ee888 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-   
+  
   var myValue = "Expression value";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
index 292cda17cb..2ccdfc42e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.ir.txt
@@ -7,14 +7,14 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
-                MarkupElement - (45:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
-                    HtmlAttribute - (50:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
-                        HtmlAttributeValue - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (61:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
-                        HtmlAttributeValue - (68:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (69:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
-                    HtmlAttribute - (75:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
-                        CSharpExpressionAttributeValue - (86:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (87:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                CSharpCode - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n  var myValue = "Expression value";\n
+                MarkupElement - (44:3,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (49:3,5 [25] x:\dir\subdir\Test\TestComponent.cshtml) -  data-abc=" - "
+                        HtmlAttributeValue - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (60:3,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Literal
+                        HtmlAttributeValue - (67:3,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) -  
+                            IntermediateToken - (68:3,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - value
+                    HtmlAttribute - (74:3,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  data-def=" - "
+                        CSharpExpressionAttributeValue - (85:3,41 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            IntermediateToken - (86:3,42 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
index 91356d82da..e28f42097c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DataDashAttribute_ImplicitExpression/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-| 
+Source Location: (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
   var myValue = "Expression value";
 |
-Generated Location: (586:17,2 [40] )
-| 
+Generated Location: (586:17,2 [39] )
+|
   var myValue = "Expression value";
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
new file mode 100644
index 0000000000..a0a824d92b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
@@ -0,0 +1,51 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "div");
+            __builder.AddMarkupContent(1, "\r\n  ");
+            __builder.OpenElement(2, "input");
+            __builder.AddAttribute(3, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   OnClick
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n");
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void OnClick() {
+    }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
new file mode 100644
index 0000000000..6cca7e6fcd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (44:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
+                    MarkupElement - (53:2,2 [26] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                        HtmlAttribute - (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                            CSharpExpressionAttributeValue -  - 
+                                IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                                IntermediateToken - (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
+                                IntermediateToken -  - CSharp - )
+                    HtmlContent - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a0d0ac06fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
@@ -0,0 +1,11 @@
+Source Location: (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnClick() {
+    }
+|
+Generated Location: (1417:41,7 [31] )
+|
+    void OnClick() {
+    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index 7f03cf522e..a1ea2a2c22 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -15,7 +15,7 @@ namespace Test
         {
 #nullable restore
 #line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-   
+  
   var myValue = "Expression value";
 
 #line default
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index 89e65ae57e..c84c47ff38 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -7,9 +7,9 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                CSharpCode - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  \n  var myValue = "Expression value";\n
-                MarkupElement - (45:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    CSharpExpression - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-                        IntermediateToken - (51:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
+                CSharpCode - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n  var myValue = "Expression value";\n
+                MarkupElement - (44:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    CSharpExpression - (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
                     MarkupBlock -  -   
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
index 91356d82da..e28f42097c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.mappings.txt
@@ -1,9 +1,9 @@
-Source Location: (2:0,2 [40] x:\dir\subdir\Test\TestComponent.cshtml)
-| 
+Source Location: (2:0,2 [39] x:\dir\subdir\Test\TestComponent.cshtml)
+|
   var myValue = "Expression value";
 |
-Generated Location: (586:17,2 [40] )
-| 
+Generated Location: (586:17,2 [39] )
+|
   var myValue = "Expression value";
 |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.cspans.txt
new file mode 100644
index 0000000000..a40388da90
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Transition span at (7:0,7 [1] ) (Accepts:None) - Parent: Expression block at (7:0,7 [8] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:0,7 [8] )
+Markup span at (15:0,15 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Expression block at (17:0,17 [5] )
+Code span at (18:0,18 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (17:0,17 [5] )
+Markup span at (22:0,22 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [25] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.stree.txt
new file mode 100644
index 0000000000..4767764612
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..25)::25 - [<input @onclick="@test"/>]
+    MarkupBlock - [0..25)::25
+        MarkupElement - [0..25)::25
+            MarkupStartTag - [0..25)::25 - [<input @onclick="@test"/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMiscAttributeContent - [6..23)::17
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [7..15)::8
+                        CSharpImplicitExpression - [7..15)::8
+                            CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [8..15)::7
+                                CSharpCodeBlock - [8..15)::7
+                                    CSharpExpressionLiteral - [8..15)::7 - [onclick] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[onclick];
+                    MarkupTextLiteral - [15..17)::2 - [="] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Equals;[=];
+                        DoubleQuote;["];
+                    CSharpCodeBlock - [17..22)::5
+                        CSharpImplicitExpression - [17..22)::5
+                            CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [18..22)::4
+                                CSharpCodeBlock - [18..22)::4
+                                    CSharpExpressionLiteral - [18..22)::4 - [test] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[test];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.cspans.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.cspans.txt
new file mode 100644
index 0000000000..6bf72d0a28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
+Transition span at (7:0,7 [1] ) (Accepts:None) - Parent: Expression block at (7:0,7 [8] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:0,7 [8] )
+Markup span at (15:0,15 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
+Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Expression block at (17:0,17 [5] )
+Code span at (18:0,18 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (17:0,17 [5] )
+Markup span at (22:0,22 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [24] )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.stree.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.stree.txt
new file mode 100644
index 0000000000..053d68870d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..24)::24 - [<input @onclick="@test">]
+    MarkupBlock - [0..24)::24
+        MarkupElement - [0..24)::24
+            MarkupStartTag - [0..24)::24 - [<input @onclick="@test">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                MarkupMiscAttributeContent - [6..23)::17
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [7..15)::8
+                        CSharpImplicitExpression - [7..15)::8
+                            CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [8..15)::7
+                                CSharpCodeBlock - [8..15)::7
+                                    CSharpExpressionLiteral - [8..15)::7 - [onclick] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[onclick];
+                    MarkupTextLiteral - [15..17)::2 - [="] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Equals;[=];
+                        DoubleQuote;["];
+                    CSharpCodeBlock - [17..22)::5
+                        CSharpImplicitExpression - [17..22)::5
+                            CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [18..22)::4
+                                CSharpCodeBlock - [18..22)::4
+                                    CSharpExpressionLiteral - [18..22)::4 - [test] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[test];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                CloseAngle;[>];

From 73877e9c2f1690af4be0a17ecf40f5046ab20e41 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 1 Oct 2019 17:55:59 -0700
Subject: [PATCH 281/337] Allow expressions with @bind:event

Fixes aspnet/AspNetCoredotnet/aspnetcore-tooling#13181

The big change here is that we have to allow an HtmlAttributeIRNode to have
a dynamically computed attribute name. This isn't something that exists
anywhere else in the system.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/559f0f5e52ce379ca60a07adcebdf4241fa9906f
---
 .../Components/ComponentBindLoweringPass.cs   | 68 ++++++++++++++-----
 .../ComponentDesignTimeNodeWriter.cs          | 60 ++++++++++++++--
 .../src/Components/ComponentNodeWriter.cs     |  4 +-
 .../Components/ComponentRuntimeNodeWriter.cs  | 39 +++++++++--
 .../HtmlAttributeIntermediateNode.cs          |  4 ++
 .../ComponentCodeGenerationTestBase.cs        | 58 ++++++++++++++++
 .../TestComponent.codegen.cs                  | 59 ++++++++++++++++
 .../TestComponent.ir.txt                      | 33 +++++++++
 .../TestComponent.mappings.txt                | 24 +++++++
 .../TestComponent.codegen.cs                  | 59 ++++++++++++++++
 .../TestComponent.ir.txt                      | 33 +++++++++
 .../TestComponent.mappings.txt                | 24 +++++++
 .../TestComponent.codegen.cs                  | 56 +++++++++++++++
 .../TestComponent.ir.txt                      | 24 +++++++
 .../TestComponent.mappings.txt                | 14 ++++
 .../TestComponent.codegen.cs                  | 56 +++++++++++++++
 .../TestComponent.ir.txt                      | 24 +++++++
 .../TestComponent.mappings.txt                | 14 ++++
 18 files changed, 626 insertions(+), 27 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
index 7de5cb4582..8d3166a88e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentBindLoweringPass.cs
@@ -275,6 +275,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 out var valueAttributeName,
                 out var changeAttributeName,
                 out var expressionAttributeName,
+                out var changeAttributeNode,
                 out var valueAttribute,
                 out var changeAttribute,
                 out var expressionAttribute))
@@ -393,12 +394,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
                     },
                     AttributeName = changeAttributeName,
+                    AttributeNameExpression = changeAttributeNode,
                     Source = node.Source,
 
                     Prefix = changeAttributeName + "=\"",
                     Suffix = "\"",
 
-                    EventUpdatesAttributeName = valueNode.AttributeName,
+                    EventUpdatesAttributeName = valueAttributeName,
                 };
 
                 changeNode.Children.Add(new CSharpExpressionAttributeValueIntermediateNode());
@@ -510,6 +512,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             out string valueAttributeName,
             out string changeAttributeName,
             out string expressionAttributeName,
+            out CSharpExpressionIntermediateNode changeAttributeNode,
             out BoundAttributeDescriptor valueAttribute,
             out BoundAttributeDescriptor changeAttribute,
             out BoundAttributeDescriptor expressionAttribute)
@@ -517,10 +520,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             valueAttributeName = null;
             changeAttributeName = null;
             expressionAttributeName = null;
+            changeAttributeNode = null;
             valueAttribute = null;
             changeAttribute = null;
             expressionAttribute = null;
 
+            // The tag helper specifies attribute names, they should win.
+            //
+            // This handles cases like <input type="text" bind="@Foo" /> where the tag helper is
+            // generated to match a specific tag and has metadata that identify the attributes.
+            //
+            // We expect 1 bind tag helper per-node.
+            var node = bindEntry.BindNode;
+            var attributeName = node.AttributeName;
+
             // Even though some of our 'bind' tag helpers specify the attribute names, they
             // should still satisfy one of the valid syntaxes.
             if (!TryParseBindAttribute(bindEntry, out valueAttributeName))
@@ -528,24 +541,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return false;
             }
 
-            if (bindEntry.BindEventNode != null)
-            {
-                changeAttributeName = GetAttributeContent(bindEntry.BindEventNode)?.Content?.Trim('"');
-            }
-
-            // The tag helper specifies attribute names, they should win.
-            //
-            // This handles cases like <input type="text" bind="@Foo" /> where the tag helper is 
-            // generated to match a specific tag and has metadata that identify the attributes.
-            //
-            // We expect 1 bind tag helper per-node.
-            var node = bindEntry.BindNode;
-            var attributeName = node.AttributeName;
             valueAttributeName = node.TagHelper.GetValueAttributeName() ?? valueAttributeName;
 
             // If there an attribute that specifies the event like @bind:event="oninput",
             // that should be preferred. Otherwise, use the one from the tag helper.
-            changeAttributeName ??= node.TagHelper.GetChangeAttributeName();
+            if (bindEntry.BindEventNode == null)
+            {
+                // @bind:event not specified
+                changeAttributeName ??= node.TagHelper.GetChangeAttributeName();
+            }
+            else if (TryExtractEventNodeStaticText(bindEntry.BindEventNode, out var text))
+            {
+                // @bind:event="oninput" - change attribute is static
+                changeAttributeName = text;
+            }
+            else
+            {
+                // @bind:event="@someExpr" - we can't know the name of the change attribute, it's dynamic
+                changeAttributeNode = ExtractEventNodeExpression(bindEntry.BindEventNode);
+            }
 
             expressionAttributeName = node.TagHelper.GetExpressionAttributeName();
 
@@ -554,7 +568,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             if (componentTagHelper == null)
             {
                 // If it's not a component node then there isn't too much else to figure out.
-                return attributeName != null && changeAttributeName != null;
+                return attributeName != null && (changeAttributeName != null || changeAttributeNode != null);
             }
 
             // If this is a component, we need an attribute name for the value.
@@ -597,6 +611,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
 
             return true;
+
+            static bool TryExtractEventNodeStaticText(TagHelperDirectiveAttributeParameterIntermediateNode node, out string text)
+            {
+                if (node.Children[0] is HtmlContentIntermediateNode html)
+                {
+                    text = GetAttributeContent(html).Content;
+                    return true;
+                }
+
+                text = null;
+                return false;
+            }
+
+            static CSharpExpressionIntermediateNode ExtractEventNodeExpression(TagHelperDirectiveAttributeParameterIntermediateNode node)
+            {
+                if (node.Children[0] is CSharpExpressionIntermediateNode expression)
+                {
+                    return expression;
+                }
+
+                return null;
+            }
         }
 
         private void RewriteNodesForComponentDelegateBind(
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index 78cdcc5496..dab006906c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -85,6 +85,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(node));
             }
 
+            WriteCSharpExpressionInnards(context, node);
+        }
+
+        private void WriteCSharpExpressionInnards(CodeRenderingContext context, CSharpExpressionIntermediateNode node, string type = null)
+        {
             if (node.Children.Count == 0)
             {
                 return;
@@ -95,9 +100,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 using (context.CodeWriter.BuildLinePragma(node.Source.Value, context))
                 {
                     var offset = DesignTimeVariable.Length + " = ".Length;
+
+                    if (type != null)
+                    {
+                        offset += type.Length + 2; // two parenthesis
+                    }
+
                     context.CodeWriter.WritePadding(offset, node.Source, context);
                     context.CodeWriter.WriteStartAssignment(DesignTimeVariable);
 
+                    if (type != null)
+                    {
+                        context.CodeWriter.Write("(");
+                        context.CodeWriter.Write(type);
+                        context.CodeWriter.Write(")");
+                    }
+
                     for (var i = 0; i < node.Children.Count; i++)
                     {
                         if (node.Children[i] is IntermediateToken token && token.IsCSharp)
@@ -209,6 +227,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(node));
             }
 
+            // This expression may contain code so we have to render it or else the design-time
+            // exprience is broken.
+            if (node.AttributeNameExpression is CSharpExpressionIntermediateNode expression)
+            {
+                WriteCSharpExpressionInnards(context, expression, "string");
+            }
+
             context.RenderChildren(node);
         }
 
@@ -275,11 +300,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Do nothing
         }
 
-        protected override void BeginWriteAttribute(CodeWriter codeWriter, string key)
+        protected override void BeginWriteAttribute(CodeRenderingContext context, string key)
         {
-            if (codeWriter == null)
+            if (context == null)
             {
-                throw new ArgumentNullException(nameof(codeWriter));
+                throw new ArgumentNullException(nameof(context));
             }
 
             if (key == null)
@@ -287,7 +312,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(key));
             }
 
-            codeWriter
+            context.CodeWriter
                 .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}")
                 .Write("-1")
                 .WriteParameterSeparator()
@@ -295,6 +320,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 .WriteParameterSeparator();
         }
 
+        protected override void BeginWriteAttribute(CodeRenderingContext context, IntermediateNode expression)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddAttribute}");
+            context.CodeWriter.Write("-1");
+            context.CodeWriter.WriteParameterSeparator();
+
+            var tokens = GetCSharpTokens(expression);
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                context.CodeWriter.Write(tokens[i].Content);
+            }
+
+            context.CodeWriter.WriteParameterSeparator();
+        }
+
         public override void WriteComponent(CodeRenderingContext context, ComponentIntermediateNode node)
         {
             if (context == null)
@@ -679,7 +729,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // __builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
             // OR
             // __builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
-            BeginWriteAttribute(context.CodeWriter, node.AttributeName);
+            BeginWriteAttribute(context, node.AttributeName);
             context.CodeWriter.Write($"({node.TypeName})(");
 
             WriteComponentChildContentInnards(context, node);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
index e2b224db7a..df21a531fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentNodeWriter.cs
@@ -12,7 +12,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 {
     internal abstract class ComponentNodeWriter : IntermediateNodeWriter, ITemplateTargetExtension
     {
-        protected abstract void BeginWriteAttribute(CodeWriter codeWriter, string key);
+        protected abstract void BeginWriteAttribute(CodeRenderingContext context, string key);
+
+        protected abstract void BeginWriteAttribute(CodeRenderingContext context, IntermediateNode expression);
 
         protected abstract void WriteReferenceCaptureInnards(CodeRenderingContext context, ReferenceCaptureIntermediateNode node, bool shouldTypeCheck);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index c2ae3e539b..6d49082b4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -233,7 +233,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Debug.Assert(_currentAttributeValues.Count == 0);
             context.RenderChildren(node);
 
-            WriteAttribute(context, node.AttributeName, _currentAttributeValues);
+            if (node.AttributeNameExpression == null)
+            {
+                WriteAttribute(context, node.AttributeName, _currentAttributeValues);
+            }
+            else
+            {
+                WriteAttribute(context, node.AttributeNameExpression, _currentAttributeValues);
+            }
             _currentAttributeValues.Clear();
 
             if (!string.IsNullOrEmpty(node.EventUpdatesAttributeName))
@@ -659,7 +666,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // _builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... }));
             // OR
             // _builder.AddAttribute(1, "ChildContent", (RenderFragment<Person>)((person) => (__builder73) => { ... }));
-            BeginWriteAttribute(context.CodeWriter, node.AttributeName);
+            BeginWriteAttribute(context, node.AttributeName);
             context.CodeWriter.Write($"({node.TypeName})(");
 
             WriteComponentChildContentInnards(context, node);
@@ -837,14 +844,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
         private void WriteAttribute(CodeRenderingContext context, string key, IList<IntermediateToken> value)
         {
-            BeginWriteAttribute(context.CodeWriter, key);
+            BeginWriteAttribute(context, key);
             WriteAttributeValue(context, value);
             context.CodeWriter.WriteEndMethodInvocation();
         }
 
-        protected override void BeginWriteAttribute(CodeWriter codeWriter, string key)
+        private void WriteAttribute(CodeRenderingContext context, IntermediateNode nameExpression, IList<IntermediateToken> value)
         {
-            codeWriter
+            BeginWriteAttribute(context, nameExpression);
+            WriteAttributeValue(context, value);
+            context.CodeWriter.WriteEndMethodInvocation();
+        }
+
+        protected override void BeginWriteAttribute(CodeRenderingContext context, string key)
+        {
+            context.CodeWriter
                 .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddAttribute}")
                 .Write((_sourceSequence++).ToString())
                 .WriteParameterSeparator()
@@ -852,6 +866,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 .WriteParameterSeparator();
         }
 
+        protected override void BeginWriteAttribute(CodeRenderingContext context, IntermediateNode nameExpression)
+        {
+            context.CodeWriter.WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.AddAttribute}");
+            context.CodeWriter.Write((_sourceSequence++).ToString());
+            context.CodeWriter.WriteParameterSeparator();
+
+            var tokens = GetCSharpTokens(nameExpression);
+            for (var i = 0; i < tokens.Count; i++)
+            {
+                WriteCSharpToken(context, tokens[i]);
+            }
+
+            context.CodeWriter.WriteParameterSeparator();
+        }
+
         private static string GetHtmlContent(HtmlContentIntermediateNode node)
         {
             var builder = new StringBuilder();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
index 8acbfcc90a..8fd1cc9df4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/HtmlAttributeIntermediateNode.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
@@ -9,6 +10,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
     {
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
+        public CSharpExpressionIntermediateNode AttributeNameExpression { get; set; }
+
         public string AttributeName { get; set; }
 
         public string Prefix { get; set; }
@@ -32,6 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             formatter.WriteContent(AttributeName);
 
             formatter.WriteProperty(nameof(AttributeName), AttributeName);
+            formatter.WriteProperty(nameof(AttributeNameExpression), string.Join(string.Empty, AttributeNameExpression?.FindDescendantNodes<IntermediateToken>().Select(n => n.Content) ?? Array.Empty<string>()));
             formatter.WriteProperty(nameof(Prefix), Prefix);
             formatter.WriteProperty(nameof(Suffix), Suffix);
             formatter.WriteProperty(nameof(EventUpdatesAttributeName), EventUpdatesAttributeName);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 8e889fe94f..c99e39269e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -1011,6 +1011,64 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void BindToElement_WithEventAsExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+@{ var x = ""anotherevent""; }
+<div @bind-value=""@ParentValue"" @bind-value:event=""@x"" />
+@code {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void BindToElement_WithEventAsExplicitExpression()
+        {
+            // Arrange
+            AdditionalSyntaxTrees.Add(Parse(@"
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace Test
+{
+    [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")]
+    public static class BindAttributes
+    {
+    }
+}"));
+            // Act
+            var generated = CompileToCSharp(@"
+@{ var x = ""anotherevent""; }
+<div @bind-value=""@ParentValue"" @bind-value:event=""@(x.ToString())"" />
+@code {
+    public string ParentValue { get; set; } = ""hi"";
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void BuiltIn_BindToInputWithoutType_WritesAttributes()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..bcbcf21991
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   var x = "anotherevent"; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                       __o = (string)x.ToString();
+
+#line default
+#line hidden
+#nullable disable
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..0fc0e38366
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  var x = "anotherevent"; 
+                MarkupElement - (30:1,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                            IntermediateToken - (49:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - =" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (100:1,70 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (100:1,70 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (109:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (109:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d605e888a2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+| var x = "anotherevent"; |
+Generated Location: (854:24,2 [25] )
+| var x = "anotherevent"; |
+
+Source Location: (49:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1098:32,19 [11] )
+|ParentValue|
+
+Source Location: (83:1,53 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|x.ToString()|
+Generated Location: (1300:40,53 [12] )
+|x.ToString()|
+
+Source Location: (109:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1631:50,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..f9a2e87af7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   var x = "anotherevent"; 
+
+#line default
+#line hidden
+#nullable disable
+            __o = Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            );
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                      __o = (string)x;
+
+#line default
+#line hidden
+#nullable disable
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue);
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..d439ed52cd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  var x = "anotherevent"; 
+                MarkupElement - (30:1,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                            IntermediateToken - (49:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - =" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                HtmlContent - (87:1,57 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (87:1,57 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (96:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (96:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..2e114c69c0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt
@@ -0,0 +1,24 @@
+Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+| var x = "anotherevent"; |
+Generated Location: (854:24,2 [25] )
+| var x = "anotherevent"; |
+
+Source Location: (49:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (1098:32,19 [11] )
+|ParentValue|
+
+Source Location: (82:1,52 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|x|
+Generated Location: (1299:40,52 [1] )
+|x|
+
+Source Location: (96:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1619:50,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..045b8bd4db
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   var x = "anotherevent"; 
+
+#line default
+#line hidden
+#nullable disable
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __builder.AddAttribute(2, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                     x.ToString()
+
+#line default
+#line hidden
+#nullable disable
+            , Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..26063fac5d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  var x = "anotherevent"; 
+                MarkupElement - (30:1,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                            IntermediateToken - (49:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - =" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (109:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (109:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..40c7108b28
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExplicitExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+| var x = "anotherevent"; |
+Generated Location: (586:17,2 [25] )
+| var x = "anotherevent"; |
+
+Source Location: (109:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1575:47,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs
new file mode 100644
index 0000000000..8ccdb1a97d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+   var x = "anotherevent"; 
+
+#line default
+#line hidden
+#nullable disable
+            __builder.OpenElement(0, "div");
+            __builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                   ParentValue
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __builder.AddAttribute(2, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                    x
+
+#line default
+#line hidden
+#nullable disable
+            , Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, ParentValue));
+            __builder.SetUpdatesAttributeName("myvalue");
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    public string ParentValue { get; set; } = "hi";
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt
new file mode 100644
index 0000000000..bbad89af49
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpCode - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  var x = "anotherevent"; 
+                MarkupElement - (30:1,0 [57] x:\dir\subdir\Test\TestComponent.cshtml) - div
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+                            IntermediateToken - (49:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+                    HtmlAttribute - (48:1,18 [12] x:\dir\subdir\Test\TestComponent.cshtml) - =" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => ParentValue = __value, 
+                            IntermediateToken -  - CSharp - ParentValue
+                            IntermediateToken -  - CSharp - )
+            CSharpCode - (96:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (96:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt
new file mode 100644
index 0000000000..db23e28959
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithEventAsExpression/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
+| var x = "anotherevent"; |
+Generated Location: (586:17,2 [25] )
+| var x = "anotherevent"; |
+
+Source Location: (96:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    public string ParentValue { get; set; } = "hi";
+|
+Generated Location: (1563:47,7 [55] )
+|
+    public string ParentValue { get; set; } = "hi";
+|
+

From 4281704bf638ec314f1e6d4c5f0e1527793e30ce Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Tue, 8 Oct 2019 12:52:37 -0700
Subject: [PATCH 282/337] Pass through the correct LangVersion to csc
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/ce09369eb4162fe4bccf1a91bfdc5229f11afdbe

---
 .../Microsoft.NET.Sdk.Razor.Compilation.targets             | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index 540fab290d..c512c7ee49 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -111,12 +111,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
-    <PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(TargetFrameworkVersion)' != 'v3.0') AND
-                            ('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(TargetFrameworkVersion)' != 'v2.1')">
-      <MaxSupportedLangVersion Condition="'$(MaxSupportedLangVersion)' == ''">7.3</MaxSupportedLangVersion>
-      <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
-    </PropertyGroup>
-
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"

From 49f8ae28cff35893f88787e08191c90a67f4e561 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 10 Oct 2019 09:43:59 -0700
Subject: [PATCH 283/337] Add support for using a 3.0 SDK on VS 16.4.

- The 3.0 SDK adds RazorDeclaration files to the compile list if they exist. If a user builds in VS and then does a project level operation (adding a property group or item group to their project file) a design time build will trigger for unrelated reasons and declaration files will be included as part of the C# compilation resulting in duplicate member errors. This change ensures that even if declaration files are added we then remove them to ensure we avoid those declaration additions.
- One unfortunate aspect of this change is that declarations are added to the compile list for a brief moment resulting in errors and then are instantly removed in some situations. I say "some situations" because when this happens it is highly dependent on how / when the project system decides to perform a design time build.

aspnet/AspNetCoredotnet/aspnetcore-tooling#14646
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b64c9317c42b6283dd28313e363012f7e6b56166
---
 .../Microsoft.NET.Sdk.Razor.DesignTime.targets        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 0b27cfce4a..4d8e0b5c4d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -47,6 +47,17 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectCapability Include="SupportsTypeScriptNuGet" />
   </ItemGroup>
 
+  <!--
+    In order to properly support Blazor partial classes we need to ensure that older SDKs don't
+    add declaration files to the compile list. We do all the compilation work in-memory in latest
+    VS.
+  -->
+  <Target Name="_RemoveRazorDeclartionsFromCompile" AfterTargets="RazorGenerateComponentDeclaration">
+    <ItemGroup Condition="'$(DesignTimeBuild)'=='true'">
+      <Compile Remove="@(_RazorComponentDeclaration)" />
+    </ItemGroup>
+  </Target>
+
   <!--
     WebSdk imports these capabilities for nesting in DotNetCoreWeb projects.
     Conditinally import these capabilities if the project isn't targeting the WebSdk.

From 82e62cb34feda3e2aae24b8e5905e176293b8101 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 16 Oct 2019 14:34:59 -0700
Subject: [PATCH 284/337] Add a flag to prevent config, json files from being
 copied to the build output directory (dotnet/aspnetcore-tooling#1240)

Fixes https://github.com/aspnet/AspNetCore/issues/14017\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/8a99b917996dcc42c4bebd654418a6b1267e8f53
---
 .../Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props |  9 +++++++--
 .../IntegrationTests/BuildIntrospectionTest.cs     | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
index f54b74ebf4..beb01baa38 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props
@@ -28,8 +28,13 @@ Copyright (c) .NET Foundation. All rights reserved.
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' ">
     <!-- Publish everything under wwwroot, all JSON files, all config files and all Razor files -->
     <Content Include="wwwroot\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
-    <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+
+    <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'" />
+    <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'" />
+
+    <!-- When ExcludeConfigFilesFromBuildOutput is set, do not copy .,config, .json files to the build output directory. -->
+    <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" Condition="'$(ExcludeConfigFilesFromBuildOutput)'=='true'" />
+    <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" Condition="'$(ExcludeConfigFilesFromBuildOutput)'=='true'" />
 
     <!-- Set CopyToPublishDirectory to Never for items under AppDesignerFolder ("Properties", by default) to avoid publishing launchSettings.json -->
     <Content Update="$(AppDesignerFolder)\**" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 2c86bf957c..fcb33acbf2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -207,5 +207,19 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task IntrospectJsonContentFiles_WithExcludeConfigFilesFromBuildOutputSet()
+        {
+            // Verifies that the fix for https://github.com/aspnet/AspNetCore/issues/14017 works.
+            var result = await DotnetMSBuild("_IntrospectContentItems", "/p:ExcludeConfigFilesFromBuildOutput=true");
+
+            Assert.BuildPassed(result);
+            var launchSettingsPath = Path.Combine("Properties", "launchSettings.json");
+            Assert.BuildOutputContainsLine(result, $"Content: {launchSettingsPath} CopyToOutputDirectory= CopyToPublishDirectory=Never ExcludeFromSingleFile=true");
+            Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
+            Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
+        }
     }
 }

From 163c09f9849258cc50e80277d319014936cb5b55 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 15 Oct 2019 10:29:33 -0700
Subject: [PATCH 285/337] Add support for partial component class editing ->
 refresh components.

- We now do aggressive detection on the type of C# class that's being edited. In order to not impact C# scenarios we only do work if C# assets are available to us. Meaning, we inspect the old document and if that document has its' semantic model available we spend cycles to determine if it's a component. In the case that we find a C# component class that wasn't previously caught we enqueue an update.
- Added several tests to ensure we enqueue and that we properly detect component classes.

aspnet/AspNetCoredotnet/aspnetcore-tooling#14646
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d8b62e121fe748f2c581066ac451918e67bf77a5
---
 .../src/ComponentDetectionConventions.cs      | 28 +++++++++++++++++++
 .../ComponentTagHelperDescriptorProvider.cs   |  6 ++--
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentDetectionConventions.cs

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentDetectionConventions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentDetectionConventions.cs
new file mode 100644
index 0000000000..214f9e36a4
--- /dev/null
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentDetectionConventions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class ComponentDetectionConventions
+    {
+        public static bool IsComponent(INamedTypeSymbol symbol, INamedTypeSymbol icomponentSymbol)
+        {
+            if (symbol is null)
+            {
+                throw new ArgumentNullException(nameof(symbol));
+            }
+
+            if (icomponentSymbol is null)
+            {
+                throw new ArgumentNullException(nameof(icomponentSymbol));
+            }
+
+            return
+                symbol.DeclaredAccessibility == Accessibility.Public &&
+                !symbol.IsAbstract &&
+                symbol.AllInterfaces.Contains(icomponentSymbol);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index f160b53a90..ebc1947ca7 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -573,10 +573,8 @@ namespace Microsoft.CodeAnalysis.Razor
                     return false;
                 }
 
-                return
-                    symbol.DeclaredAccessibility == Accessibility.Public &&
-                    !symbol.IsAbstract &&
-                    symbol.AllInterfaces.Contains(_symbols.IComponent);
+                var isComponent = ComponentDetectionConventions.IsComponent(symbol, _symbols.IComponent);
+                return isComponent;
             }
         }
     }

From 5badd941826385510e48d0d824ab53320ed49fb2 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Mon, 7 Oct 2019 12:03:44 -0700
Subject: [PATCH 286/337] Add support for PreventDefault and StopPropagation in
 event handlers \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/ae5be3efc0f15b79f5b19eaff192be0096cf8319

---
 .../src/ComponentResources.resx               |   6 +
 .../ComponentDesignTimeNodeWriter.cs          |   7 +-
 .../Components/ComponentDiagnosticFactory.cs  |  16 ++
 .../ComponentEventHandlerLoweringPass.cs      |  87 +++++++-
 .../src/Components/ComponentMetadata.cs       |   2 +
 .../Components/ComponentRuntimeNodeWriter.cs  |   4 +-
 .../src/Components/ComponentsApi.cs           |   4 +
 .../ComponentAttributeIntermediateNode.cs     |  26 +++
 .../ComponentCodeGenerationTestBase.cs        |  73 +++++++
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../Component_WithKey/TestComponent.ir.txt    |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../Component_WithRef/TestComponent.ir.txt    |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../Component_WithSplat/TestComponent.ir.txt  |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.codegen.cs                  |  16 ++
 .../TestComponent.ir.txt                      |  19 +-
 .../TestComponent.mappings.txt                |  10 +
 .../TestComponent.codegen.cs                  |  43 ++++
 .../TestComponent.ir.txt                      |  24 +++
 .../TestComponent.mappings.txt                |  10 +
 .../TestComponent.codegen.cs                  |  69 +++++++
 .../TestComponent.ir.txt                      |  33 +++
 .../TestComponent.mappings.txt                |  29 +++
 .../TestComponent.codegen.cs                  |  36 ++++
 .../TestComponent.ir.txt                      |  22 ++
 .../TestComponent.mappings.txt                |   5 +
 .../TestComponent.codegen.cs                  |  62 ++++++
 .../TestComponent.ir.txt                      |  32 +++
 .../TestComponent.mappings.txt                |  28 +++
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../Regression_597/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.ir.txt       |   8 +-
 .../Regression_772/TestComponent.ir.txt       |   2 +-
 .../Regression_773/TestComponent.ir.txt       |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../Component_WithKey/TestComponent.ir.txt    |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../Component_WithRef/TestComponent.ir.txt    |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../Component_WithSplat/TestComponent.ir.txt  |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.ir.txt                      |   6 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.codegen.cs                  |  19 +-
 .../TestComponent.ir.txt                      |   8 +-
 .../TestComponent.codegen.cs                  |  39 ++++
 .../TestComponent.ir.txt                      |  15 ++
 .../TestComponent.codegen.cs                  |  64 ++++++
 .../TestComponent.ir.txt                      |  22 ++
 .../TestComponent.mappings.txt                |   9 +
 .../TestComponent.codegen.cs                  |  31 +++
 .../TestComponent.ir.txt                      |  13 ++
 .../TestComponent.codegen.cs                  |  57 ++++++
 .../TestComponent.ir.txt                      |  21 ++
 .../TestComponent.mappings.txt                |  13 ++
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   4 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../TestComponent.ir.txt                      |   2 +-
 .../Regression_597/TestComponent.ir.txt       |   4 +-
 .../Regression_609/TestComponent.ir.txt       |   8 +-
 .../Regression_772/TestComponent.ir.txt       |   2 +-
 .../Regression_773/TestComponent.ir.txt       |   2 +-
 ...EventHandlerTagHelperDescriptorProvider.cs |  76 ++++++-
 .../IntermediateNodeWriter.cs                 |   2 +-
 ...spNetCore.Components.Web.netstandard2.0.cs | 193 +++++++++---------
 ...ft.AspNetCore.Components.netstandard2.0.cs |   3 +
 216 files changed, 1439 insertions(+), 413 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 291c4d8723..965fe99190 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -162,6 +162,12 @@
   <data name="EventHandlerTagHelper_Documentation" xml:space="preserve">
     <value>Sets the '{0}' attribute to the provided string or delegate value. A delegate value should be of type '{1}'.</value>
   </data>
+  <data name="EventHandlerTagHelper_PreventDefault_Documentation" xml:space="preserve">
+    <value>Specifies whether to cancel(if cancelable) the default action that belongs to the '{0}' event.</value>
+  </data>
+  <data name="EventHandlerTagHelper_StopPropagation_Documentation" xml:space="preserve">
+    <value>Specifies whether to prevent further propagation of the '{0}' event in the capturing and bubbling phases.</value>
+  </data>
   <data name="ImplementsDirective_Description" xml:space="preserve">
     <value>Declares an interface implementation for the current class.</value>
   </data>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
index dab006906c..c1e0c625f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs
@@ -700,10 +700,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 }
             }
 
-            bool NeedsTypeCheck(ComponentAttributeIntermediateNode n)
+            static bool NeedsTypeCheck(ComponentAttributeIntermediateNode n)
             {
-                return n.BoundAttribute != null && !n.BoundAttribute.IsWeaklyTyped();
-            }   
+                // Weakly typed attributes will have their TypeName set to null.
+                return n.BoundAttribute != null && n.TypeName != null;
+            }
         }
 
         private IReadOnlyList<IntermediateToken> GetCSharpTokens(IntermediateNode node)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index 05ef511fee..c179ab8d17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -438,5 +438,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 startTagName,
                 endTagName);
         }
+
+        public static readonly RazorDiagnosticDescriptor EventHandlerParameter_Duplicates =
+            new RazorDiagnosticDescriptor(
+            $"{DiagnosticPrefix}10014",
+            () => "The attribute '{0}' was matched by multiple event handlers parameter attributes. Duplicates:{1}",
+            RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateEventHandlerParameter_Duplicates(SourceSpan? source, string attribute, TagHelperDirectiveAttributeParameterIntermediateNode[] attributes)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                EventHandlerParameter_Duplicates,
+                source ?? SourceSpan.Undefined,
+                attribute,
+                Environment.NewLine + string.Join(Environment.NewLine, attributes.Select(p => p.TagHelper.DisplayName)));
+            return diagnostic;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index 5e33dd1ad2..421b51c819 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
@@ -31,12 +32,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Each usage will be represented by a tag helper property that is a descendant of either
             // a component or element.
             var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
+            var parameterReferences = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeParameterIntermediateNode>();
 
             var parents = new HashSet<IntermediateNode>();
             for (var i = 0; i < references.Count; i++)
             {
                 parents.Add(references[i].Parent);
             }
+            for (var i = 0; i < parameterReferences.Count; i++)
+            {
+                parents.Add(parameterReferences[i].Parent);
+            }
 
             foreach (var parent in parents)
             {
@@ -59,6 +65,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     reference.Replace(RewriteUsage(reference.Parent, node));
                 }
             }
+
+            for (var i = 0; i < parameterReferences.Count; i++)
+            {
+                var reference = parameterReferences[i];
+                var node = (TagHelperDirectiveAttributeParameterIntermediateNode)reference.Node;
+
+                if (!reference.Parent.Children.Contains(node))
+                {
+                    // This node was removed as a duplicate, skip it.
+                    continue;
+                }
+
+                if (node.TagHelper.IsEventHandlerTagHelper())
+                {
+                    reference.Replace(RewriteParameterUsage(reference.Parent, node));
+                }
+            }
         }
 
         private void ProcessDuplicates(IntermediateNode parent)
@@ -109,6 +132,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     parent.Children.Remove(property);
                 }
             }
+
+            var parameterDuplicates = parent.Children
+                .OfType<TagHelperDirectiveAttributeParameterIntermediateNode>()
+                .Where(p => p.TagHelper?.IsEventHandlerTagHelper() ?? false)
+                .GroupBy(p => p.AttributeName)
+                .Where(g => g.Count() > 1);
+
+            foreach (var duplicate in parameterDuplicates)
+            {
+                parent.Diagnostics.Add(ComponentDiagnosticFactory.CreateEventHandlerParameter_Duplicates(
+                    parent.Source,
+                    duplicate.Key,
+                    duplicate.ToArray()));
+                foreach (var property in duplicate)
+                {
+                    parent.Children.Remove(property);
+                }
+            }
         }
 
         private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperDirectiveAttributeIntermediateNode node)
@@ -198,7 +239,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             }
         }
 
-        private static IReadOnlyList<IntermediateToken> GetAttributeContent(TagHelperDirectiveAttributeIntermediateNode node)
+        private static IReadOnlyList<IntermediateToken> GetAttributeContent(IntermediateNode node)
         {
             var template = node.FindDescendantNodes<TemplateIntermediateNode>().FirstOrDefault();
             if (template != null)
@@ -222,5 +263,49 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return node.FindDescendantNodes<IntermediateToken>();
             }
         }
+
+        private IntermediateNode RewriteParameterUsage(IntermediateNode parent, TagHelperDirectiveAttributeParameterIntermediateNode node)
+        {
+            // Now rewrite the node to look like:
+            //
+            // builder.AddEventPreventDefaultAttribute(2, "onclick", true); // If minimized.
+            // or
+            // builder.AddEventPreventDefaultAttribute(2, "onclick", someBoolExpression); // If a bool expression is provided in the value.
+
+            string eventHandlerMethod;
+            if (node.BoundAttributeParameter.Name == "preventDefault")
+            {
+                eventHandlerMethod = ComponentsApi.RenderTreeBuilder.AddEventPreventDefaultAttribute;
+            }
+            else if (node.BoundAttributeParameter.Name == "stopPropagation")
+            {
+                eventHandlerMethod = ComponentsApi.RenderTreeBuilder.AddEventStopPropagationAttribute;
+            }
+            else
+            {
+                // Unsupported event handler attribute parameter. This can only happen if bound attribute descriptor
+                // is configured to expect a parameter other than 'preventDefault' and 'stopPropagation'.
+                return node;
+            }
+
+            var result = new ComponentAttributeIntermediateNode(node)
+            {
+                Annotations =
+                    {
+                        [ComponentMetadata.Common.OriginalAttributeName] = node.OriginalAttributeName,
+                        [ComponentMetadata.Common.AddAttributeMethodName] = eventHandlerMethod,
+                    },
+            };
+
+            result.Children.Clear();
+            if (node.AttributeStructure != AttributeStructure.Minimized)
+            {
+                var tokens = GetAttributeContent(node);
+                result.Children.Add(new CSharpExpressionIntermediateNode());
+                result.Children[0].Children.AddRange(tokens);
+            }
+
+            return result;
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
index fdf26952a6..6a2dd46d29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMetadata.cs
@@ -42,6 +42,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string OriginalAttributeName = "Common.OriginalAttributeName";
 
             public static readonly string DirectiveAttribute = "Common.DirectiveAttribute";
+
+            public static readonly string AddAttributeMethodName = "Common.AddAttributeMethodName";
         }
 
         public static class Bind
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 6d49082b4a..82fb75666f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -509,10 +509,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 throw new ArgumentNullException(nameof(node));
             }
 
+            var addAttributeMethod = node.Annotations[ComponentMetadata.Common.AddAttributeMethodName] as string ?? ComponentsApi.RenderTreeBuilder.AddAttribute;
+
             // _builder.AddAttribute(1, "Foo", 42);
             context.CodeWriter.Write(_scopeStack.BuilderVarName);
             context.CodeWriter.Write(".");
-            context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.AddAttribute);
+            context.CodeWriter.Write(addAttributeMethod);
             context.CodeWriter.Write("(");
             context.CodeWriter.Write((_sourceSequence++).ToString());
             context.CodeWriter.Write(", ");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
index d8a0e1f23a..92d54a2582 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
@@ -97,6 +97,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             public static readonly string SetKey = nameof(SetKey);
 
             public static readonly string SetUpdatesAttributeName = nameof(SetUpdatesAttributeName);
+
+            public static readonly string AddEventPreventDefaultAttribute = nameof(AddEventPreventDefaultAttribute);
+
+            public static readonly string AddEventStopPropagationAttribute = nameof(AddEventStopPropagationAttribute);
         }
 
         public static class RuntimeHelpers
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
index 6690b64d17..bd335c58b0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/ComponentAttributeIntermediateNode.cs
@@ -88,6 +88,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
             }
         }
 
+        public ComponentAttributeIntermediateNode(TagHelperDirectiveAttributeParameterIntermediateNode directiveAttributeParameterNode)
+        {
+            if (directiveAttributeParameterNode == null)
+            {
+                throw new ArgumentNullException(nameof(directiveAttributeParameterNode));
+            }
+
+            AttributeName = directiveAttributeParameterNode.AttributeNameWithoutParameter;
+            AttributeStructure = directiveAttributeParameterNode.AttributeStructure;
+            BoundAttribute = directiveAttributeParameterNode.BoundAttribute;
+            PropertyName = directiveAttributeParameterNode.BoundAttributeParameter.GetPropertyName();
+            Source = directiveAttributeParameterNode.Source;
+            TagHelper = directiveAttributeParameterNode.TagHelper;
+            TypeName = directiveAttributeParameterNode.BoundAttributeParameter.TypeName;
+
+            for (var i = 0; i < directiveAttributeParameterNode.Children.Count; i++)
+            {
+                Children.Add(directiveAttributeParameterNode.Children[i]);
+            }
+
+            for (var i = 0; i < directiveAttributeParameterNode.Diagnostics.Count; i++)
+            {
+                Diagnostics.Add(directiveAttributeParameterNode.Diagnostics[i]);
+            }
+        }
+
         public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
 
         public string AttributeName { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index c99e39269e..b7b77640cf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2848,6 +2848,7 @@ namespace Test
 
             // Act
             var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @onclick=""x => { }"" />");
 
             // Assert
@@ -2896,6 +2897,78 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void EventHandler_PreventDefault_StopPropagation_Minimized()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @onclick:preventDefault @onclick:stopPropagation />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_PreventDefault_StopPropagation()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @onfocus:preventDefault=""true"" @onclick:stopPropagation=""Foo"" @onfocus:stopPropagation=""false"" />
+@code {
+    bool Foo { get; set; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_WithDelegate_PreventDefault()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @onfocus=""OnFocus"" @onfocus:preventDefault=""ShouldPreventDefault()"" />
+@code {
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+}");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void EventHandler_PreventDefault_Duplicates()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @onclick:preventDefault=""true"" @onclick:preventDefault />");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Generics
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index 0790665cfe..ba3c92108c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -15,13 +15,13 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 4b85287dbf..8dcb457c9e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -15,13 +15,13 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 5bc8c33a41..494aa80cee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index de77fc3ddf..022ca202fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index f8c2a5e0d4..a23eb60fe1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
                 HtmlContent - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index c2255708b6..1d5e3064e7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (71:0,71 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 9c01570bd7..0c9741cbed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -15,13 +15,13 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 955016a0cc..4d0f24d3ce 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -15,13 +15,13 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
                 HtmlContent - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index 181e137835..74f6356ff6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index 5bc8c33a41..6779d53a09 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 28774dd004..d04a27bbe3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
                 HtmlContent - (41:0,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 42ffb23814..94e5ee5986 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
-                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
-                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
                 HtmlContent - (39:0,39 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
index 15704802ec..21f5f37a86 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -26,6 +26,6 @@ Document -
                     ComponentChildContent -  - ChildContent - context
                         HtmlContent - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some Content\n
-                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - AttributeStructure.DoubleQuotes
                         CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
index f70171dcac..8fd88bd576 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -29,6 +29,6 @@ Document -
                     ComponentChildContent - (169:3,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
                         HtmlContent - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye!
-                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - AttributeStructure.DoubleQuotes
                         CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
index 906c47fb07..4419651748 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -17,6 +17,6 @@ Document -
                 Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index 697027ba8b..829d65c707 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -17,10 +17,10 @@ Document -
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index d4333e1089..47d67825d6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -17,10 +17,10 @@ Document -
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
                 HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 7dcdb9e98a..572fdbd6a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -15,13 +15,13 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
                 HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index e2aaaf777e..5879907ce5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -15,19 +15,19 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (64:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index ee10c3e939..c6a824365e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -25,6 +25,6 @@ Document -
                             IntermediateToken - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index 4a657e5f69..46f67d8119 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -23,7 +23,7 @@ Document -
                                 IntermediateToken - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
                         HtmlContent - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
index 5632e2f7a5..51c17f72a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -17,9 +17,9 @@ Document -
                 Component - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
-                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Other -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (48:0,48 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
index dc8995e56c..44b450bc29 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
-                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Other -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
index 0ec89fc98c..3b2fbe7e25 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
index 34c70b6497..7917f2de9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -15,19 +15,19 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (31:1,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (50:1,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (50:1,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (51:1,20 [16] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "how are you?"
                 HtmlContent - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (72:2,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (91:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (91:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (92:2,20 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index 2447c2c068..b286f4b20b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -30,6 +30,6 @@ Document -
                         IntermediateToken - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentTypeArgument - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
                         IntermediateToken - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
-                    ComponentAttribute - (44:0,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:0,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (45:0,45 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index 3a74f391c9..ad4473c54b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -26,10 +26,10 @@ Document -
                             IntermediateToken - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
                         HtmlContent - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
-                    ComponentAttribute - (34:0,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (34:0,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - Items - AttributeStructure.DoubleQuotes
                         CSharpExpression - (35:0,35 [18] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new List<long>()
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
index a887854aba..deb87d7b53 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -21,7 +21,7 @@ Document -
                     ComponentChildContent - (89:2,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntFragment - context
                         CSharpExpression - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
index b76382b456..460c8f4176 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -24,6 +24,6 @@ Document -
                                     IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
                             HtmlContent - (53:0,53 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                 IntermediateToken - (53:0,53 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Nested text
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 3067b79c9a..d423d3cd92 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
index 0eb8c4d559..3a098f1f19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -15,6 +15,6 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - AttributeStructure.DoubleQuotes
                         CSharpExpression - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 42.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
index 5312b07cca..b56477d97c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -24,6 +24,6 @@ Document -
                                     IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
                             CSharpExpression - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
                                 IntermediateToken - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index f8241a525f..65f57f0835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -26,6 +26,6 @@ Document -
                                 IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
                         HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index 4fdd253a12..a746a2c7a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -26,6 +26,6 @@ Document -
                                 IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
                         HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index 8e0345da0e..30a12c7f87 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [23] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); }
                 HtmlContent - (49:0,49 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
index b7dc70611a..116aa3a668 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -15,9 +15,9 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - some-attribute - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - some-attribute -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
-                    ComponentAttribute -  - another-attribute - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - another-attribute -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (53:0,53 [16] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 43.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index ca17aeed14..c972ae73ed 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -15,12 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [131] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - AttributeStructure.DoubleQuotes
                         IntermediateToken - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
-                    ComponentAttribute - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - BoolProperty - AttributeStructure.DoubleQuotes
                         IntermediateToken - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
-                    ComponentAttribute - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - AttributeStructure.DoubleQuotes
                         HtmlContent - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
-                    ComponentAttribute - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - ObjectProperty - AttributeStructure.DoubleQuotes
                         IntermediateToken - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index bcca583ccc..8c392e23a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -18,7 +18,7 @@ Document -
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (44:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
                             IntermediateToken - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
index 4a042e8416..92666584a4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter
-                    ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - Coolness - AttributeStructure.DoubleQuotes
                         CSharpExpression - (26:0,26 [13] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "very-cool"
                 HtmlContent - (43:0,43 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
index b85efa325c..039ecb9569 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -21,8 +21,8 @@ Document -
                 HtmlContent - (32:1,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (32:1,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (34:2,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - intproperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute -  - intproperty -  - AttributeStructure.SingleQuotes
                         HtmlContent - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
-                    ComponentAttribute - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - BoolProperty - AttributeStructure.SingleQuotes
                         IntermediateToken - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
index 911863c1c2..384c375f79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - AttributeStructure.SingleQuotes
                         IntermediateToken - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 1
                 HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - Mycomponent
-                    ComponentAttribute - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - AttributeStructure.SingleQuotes
                         IntermediateToken - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index 3353494634..86f735b6b4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - @onclick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - @onclick -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - () => Increment()
                 HtmlContent - (43:0,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index 7e414f514d..e0e4bafcbc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -15,11 +15,11 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     SetKey - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
-                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (75:0,75 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index db322fecfe..3ba2778480 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                         HtmlContent - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (72:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
                     SetKey - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
-                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - SomeProp -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
                 HtmlContent - (96:2,14 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
index ed187e3370..22acc920d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -21,13 +21,13 @@ Document -
                 HtmlContent - (37:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (37:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (39:3,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
-                    ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - AttributeStructure.SingleQuotes
                         HtmlContent - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - head
                 HtmlContent - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (92:5,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - FooterComponent
-                    ComponentAttribute - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - Footer - AttributeStructure.SingleQuotes
                         HtmlContent - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - feet
                 HtmlContent - (143:6,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 3b188dad97..2e72b3df58 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -15,11 +15,11 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     ReferenceCapture - (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
-                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 3527fba401..70ca2c5590 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                         HtmlContent - (73:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (73:1,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  content\n
                     ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
-                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - SomeProp -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
                 HtmlContent - (97:2,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
index 317e992fd5..fd486d874d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -15,12 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     Splat - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
-                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (92:0,92 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
index a8a59d2237..57c9716439 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -15,12 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     Splat - (51:0,51 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
-                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (95:0,95 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
index 608ba5264d..1bf7065b5a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
                     Splat - (37:0,37 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
index 5279e9fe92..647fd31975 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -15,12 +15,12 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [93] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     Splat - (51:0,51 [15] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
-                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
                 HtmlContent - (93:0,93 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
index 999022b95d..2eee46efee 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - mESSAGE -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
                 HtmlContent - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index f76be959fe..aaaed7935f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -15,16 +15,16 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
-                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
                 HtmlContent - (59:0,59 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 1fbb764c2f..679f60b093 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -15,16 +15,16 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
-                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
                 HtmlContent - (70:0,70 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index babb3ca22b..38f828f596 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -15,16 +15,16 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - (58:0,58 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
-                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
                 HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
index b88d9593c6..c5dd3966aa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -15,13 +15,13 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - mESSAGE -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Message -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - anotherone
                 HtmlContent - (66:0,66 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
index d88259351a..51448d61ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - Foo - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Foo -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - foo - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - foo -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
                 HtmlContent - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index 7de1dc47b8..93ccbb8f6e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -18,7 +18,7 @@ Document -
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (44:1,0 [89] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [63] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<MouseEventArgs>(this, Increment)
                 HtmlContent - (133:1,89 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index 2312ffb6cd..c3b8d2552b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 310c88b923..8cbd696e50 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -18,7 +18,7 @@ Document -
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index 100ecc72d6..3a7ba794ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -18,7 +18,7 @@ Document -
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 3480729ec9..a3a8996541 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index cca8a88595..7f1a5afbdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -18,7 +18,7 @@ Document -
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (79:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index 051f34b558..f364942357 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [47] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create(this, Increment)
                 HtmlContent - (73:0,73 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index 2312ffb6cd..c3b8d2552b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index 635bf3e438..f6272fb3f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 3480729ec9..a3a8996541 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 174bc9c60c..f33782fba5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 6c09e3f0cf..1b0cf7c3ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -8,6 +8,13 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 219
@@ -20,6 +27,15 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 x => { }
+
+#line default
+#line hidden
+#nullable disable
+            );
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index ac2dab59b0..4bfbd322ac 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -5,6 +5,7 @@ Document -
         UsingDirective - (53:3,1 [17] ) - System.Linq
         UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             DesignTimeDirective - 
             CSharpCode - 
@@ -14,13 +15,11 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    HtmlAttribute - (6:0,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) -  @onclick=" - "
-                        HtmlAttributeValue - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - 
-                            IntermediateToken - (17:0,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - x
-                        HtmlAttributeValue - (18:0,18 [3] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (19:0,19 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - =>
-                        HtmlAttributeValue - (21:0,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (22:0,22 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - {
-                        HtmlAttributeValue - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) -  
-                            IntermediateToken - (24:0,24 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - }
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a7672c7e36
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+|x => { }|
+Generated Location: (1172:32,17 [8] )
+|x => { }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
new file mode 100644
index 0000000000..770a1f26b7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                true
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt
new file mode 100644
index 0000000000..4039629956
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    ComponentAttribute - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - PreventDefault - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    HtmlAttribute -  - @onclick:preventDefault - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt
new file mode 100644
index 0000000000..fd7a4715c9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (1158:32,32 [4] )
+|true|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
new file mode 100644
index 0000000000..1bdae075cb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                true
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                Foo
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                               false
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    bool Foo { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
new file mode 100644
index 0000000000..de4bf6f53e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    ComponentAttribute - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - StopPropagation - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                    ComponentAttribute - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - StopPropagation - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - false
+                HtmlContent - (148:1,104 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (148:1,104 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool Foo { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
new file mode 100644
index 0000000000..9681e57134
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (1158:32,32 [4] )
+|true|
+
+Source Location: (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|Foo|
+Generated Location: (1474:41,64 [3] )
+|Foo|
+
+Source Location: (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|false|
+Generated Location: (1820:50,95 [5] )
+|false|
+
+Source Location: (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    bool Foo { get; set; }
+|
+Generated Location: (2019:60,7 [30] )
+|
+    bool Foo { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
new file mode 100644
index 0000000000..4ecc5d8f95
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = true;
+            __o = true;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
new file mode 100644
index 0000000000..fd1d8c7ac6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    ComponentAttribute -  - onclick - PreventDefault - AttributeStructure.Minimized
+                    ComponentAttribute -  - onclick - StopPropagation - AttributeStructure.Minimized
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.mappings.txt
new file mode 100644
index 0000000000..7df0b6a556
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs
new file mode 100644
index 0000000000..b2c036ce7b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs
@@ -0,0 +1,62 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.FocusEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnFocus
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                   ShouldPreventDefault()
+
+#line default
+#line hidden
+#nullable disable
+            );
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt
new file mode 100644
index 0000000000..0f44245062
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt
@@ -0,0 +1,32 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (44:1,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.FocusEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnFocus
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (95:1,51 [22] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (95:1,51 [22] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ShouldPreventDefault()
+                HtmlContent - (121:1,77 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (121:1,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnFocus(FocusEventArgs e) { }\n\n    bool ShouldPreventDefault() { return false; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt
new file mode 100644
index 0000000000..5ddbb2a57d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt
@@ -0,0 +1,28 @@
+Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
+|using Microsoft.AspNetCore.Components.Web|
+Generated Location: (320:12,0 [41] )
+|using Microsoft.AspNetCore.Components.Web|
+
+Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnFocus|
+Generated Location: (1172:32,17 [7] )
+|OnFocus|
+
+Source Location: (95:1,51 [22] x:\dir\subdir\Test\TestComponent.cshtml)
+|ShouldPreventDefault()|
+Generated Location: (1478:41,51 [22] )
+|ShouldPreventDefault()|
+
+Source Location: (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+|
+Generated Location: (1694:51,7 [95] )
+|
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
index 168465ac86..9ad07a9a7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -18,9 +18,9 @@ Document -
                 HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (13:1,0 [48] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (int x) => {}
                 HtmlContent - (61:1,48 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (61:1,48 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
index 4dca9b91d0..44ab063ae5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -18,9 +18,9 @@ Document -
                 HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
                 HtmlContent - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
index 4dca9b91d0..44ab063ae5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -18,9 +18,9 @@ Document -
                 HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
                 HtmlContent - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
index 4dca9b91d0..44ab063ae5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -18,9 +18,9 @@ Document -
                 HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
                 HtmlContent - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (55:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index 54becf8a6c..9c951be5f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -18,9 +18,9 @@ Document -
                 HtmlContent - (18:0,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (18:0,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (20:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - Foo - AttributeStructure.DoubleQuotes
                         CSharpExpression - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Hello
                 HtmlContent - (57:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index 85fdfcc5f3..13a8d8d6ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
-                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
                 HtmlContent - (45:0,45 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index e6b8351e48..c6eeb0374f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
                 HtmlContent - (35:0,35 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index 19086d53a7..2cdeef5fe6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -23,7 +23,7 @@ Document -
                                 IntermediateToken - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
                         HtmlContent - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                    ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (25:0,25 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index 24235138c4..1aeb6243b9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -17,7 +17,7 @@ Document -
                 Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
-                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     SetKey - (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
                 HtmlContent - (50:0,50 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index d6d0f25875..f4c89a8a31 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -15,7 +15,7 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     SetKey - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
                 HtmlContent - (40:0,40 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
index 5512d95633..ff143059cb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         HtmlContent - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
-                    ComponentAttribute -  - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - MyEvent -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - MyEventHandler
                 HtmlContent - (53:0,53 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
index e43ec298e6..c6d78aa93f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -29,7 +29,7 @@ Document -
                 CSharpCode - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
                 Component - (112:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (135:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (135:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - Template - AttributeStructure.DoubleQuotes
                         CSharpExpression - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
                 HtmlContent - (147:1,35 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 29ce09a37f..5517d3afcd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -19,7 +19,7 @@ Document -
                 Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
                         Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - AttributeStructure.DoubleQuotes
                                 CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                     IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 599f28f9a7..872d1c54d0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -19,7 +19,7 @@ Document -
                 Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
                         Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - AttributeStructure.DoubleQuotes
                                 CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                     IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
index cd0cb8b280..3464af0fff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -23,7 +23,7 @@ Document -
                 CSharpCode - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
                 Component - (78:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (107:1,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (107:1,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - PersonTemplate - AttributeStructure.DoubleQuotes
                         CSharpExpression - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
                 HtmlContent - (119:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
index 57fd4d2864..3f22ca9f48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -23,7 +23,7 @@ Document -
                 CSharpCode - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
                 Component - (50:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - Person - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Person -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (71:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
                 HtmlContent - (83:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index 13c0a91675..c15c37d084 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -15,10 +15,10 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
-                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
-                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y)
                 HtmlContent - (23:0,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index 6a33cfef99..3780ef71c4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -15,16 +15,16 @@ Document -
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
-                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
-                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName)
-                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
-                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive)
                 HtmlContent - (62:0,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
index aa507e5482..a2d07bbc64 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -24,6 +24,6 @@ Document -
                 HtmlContent - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
-                    ComponentAttribute - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - AttributeStructure.DoubleQuotes
                         HtmlContent - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
index 9624dc31ba..d65b5a1fd0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -24,7 +24,7 @@ Document -
                 HtmlContent - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (35:2,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
-                    ComponentAttribute - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - AttributeStructure.DoubleQuotes
                         HtmlContent - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <div>Test!</div>
                 HtmlContent - (108:6,41 [2] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
index 91cbc7faf6..6023dde685 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -8,13 +8,13 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index 0aab8e86f4..9c10837ce2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -8,13 +8,13 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
             CSharpCode - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index c06a89bb4d..bd872bfb37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index 500bc17c10..cdc7c01425 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
index 919df85e19..21f3858392 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - OnChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
             CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
index a315ac1d07..5a380e5a48 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [71] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
index 213251c8b9..c612caf1e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.ir.txt
@@ -8,13 +8,13 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueExpression - ValueExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
index b1a439ad32..05895fb7ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.ir.txt
@@ -8,13 +8,13 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParam - SomeParam - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamChanged - SomeParamChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
-                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml) - SomeParamExpression - SomeParamExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => ParentValue
             CSharpCode - (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
index bf2c911a81..626c7912cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
index c06a89bb4d..db05d6ff7d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)
             CSharpCode - (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
index af14d603b1..4bd09938a5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => ParentValue = __value
             CSharpCode - (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
index 85045fdcfb..76b02b3d3d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - InputText
-                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
-                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => person.Name = __value
             CSharpCode - (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
index 134bb19f97..0f6c21d896 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt
@@ -19,6 +19,6 @@ Document -
                     ComponentChildContent -  - ChildContent - context
                         HtmlContent - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (120:1,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some Content\n
-                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - AttributeStructure.DoubleQuotes
                         CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
index 0a67fa82e6..5e5bd85563 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt
@@ -22,6 +22,6 @@ Document -
                     ComponentChildContent - (169:3,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - context
                         HtmlContent - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (177:3,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye!
-                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (112:1,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - AttributeStructure.DoubleQuotes
                         CSharpExpression - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
index 7f0d118565..4a0518a755 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt
@@ -10,6 +10,6 @@ Document -
                 Component - (0:0,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
index bc08833b99..4556df1239 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt
@@ -10,10 +10,10 @@ Document -
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
             CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
index 0cea8934fa..347396c34d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt
@@ -10,10 +10,10 @@ Document -
                 Component - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
             CSharpCode - (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
index 520adbe55f..3dc5e0c446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt
@@ -8,13 +8,13 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (36:0,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         CSharpExpression - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (38:0,38 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => Value = __value, Value)
             CSharpCode - (52:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
index 39e2326b8f..b6bf92ce01 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt
@@ -8,19 +8,19 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
                 HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value
-                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - __value => Value = __value
             CSharpCode - (73:2,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index 6960ff368f..f4bf8ba223 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -18,6 +18,6 @@ Document -
                             IntermediateToken - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index fa1d8c9193..b15d1b5550 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -16,7 +16,7 @@ Document -
                                 IntermediateToken - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
                         HtmlContent - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
index f63cfe330c..4020a3ce07 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt
@@ -10,9 +10,9 @@ Document -
                 Component - (0:0,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
-                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (33:0,33 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
-                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Other -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (48:0,48 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
index ad0b6b8c9a..3a860517ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
-                    ComponentAttribute -  - Other - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Other -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (35:0,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
index 5530117c44..180d94b5bc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
index 559787dc57..ef42eee009 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt
@@ -8,19 +8,19 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
                 HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (31:1,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (50:1,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (50:1,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (51:1,20 [16] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (52:1,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "how are you?"
                 HtmlContent - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (70:1,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (72:2,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (91:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (91:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (92:2,20 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index cf7e855efe..d2566ae1b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -24,6 +24,6 @@ Document -
                         IntermediateToken - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentTypeArgument - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2
                         IntermediateToken - (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
-                    ComponentAttribute - (44:0,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:0,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (45:0,45 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index 8ba90435bd..25d2ee4994 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -20,10 +20,10 @@ Document -
                             IntermediateToken - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
                         HtmlContent - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
-                    ComponentAttribute - (34:0,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (34:0,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - Items - AttributeStructure.DoubleQuotes
                         CSharpExpression - (35:0,35 [18] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (36:0,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new List<long>()
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
index cbbfb6747c..745f800981 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.ir.txt
@@ -14,7 +14,7 @@ Document -
                     ComponentChildContent - (89:2,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntFragment - context
                         CSharpExpression - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context
-                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
index 7eda56960d..21c7a73901 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
@@ -12,6 +12,6 @@ Document -
                         HtmlContent - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text
                         MarkupBlock -  - <some-child a="1">Nested text</some-child>
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
index 9aff8ff428..ab3675e578 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
index 72adc534bd..54f487dc65 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt
@@ -8,6 +8,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - AttributeStructure.DoubleQuotes
                         CSharpExpression - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 42.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
index cae3fd1646..eddef57c20 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt
@@ -17,6 +17,6 @@ Document -
                                     IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
                             CSharpExpression - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
                                 IntermediateToken - (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant()
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index 75d86a2b66..9115a0a1a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -19,6 +19,6 @@ Document -
                                 IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
                         HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index 88babfaa53..5f4fd8ae79 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -19,6 +19,6 @@ Document -
                                 IntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
                         HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
-                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
index 24d8b093b4..bf79db583d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [23] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); }
             CSharpCode - (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
index e3d6621434..cf273faa4c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt
@@ -8,9 +8,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - some-attribute - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - some-attribute -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (29:0,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo
-                    ComponentAttribute -  - another-attribute - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - another-attribute -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (53:0,53 [16] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 43.ToString()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
index fb48ace206..5b46f6501b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt
@@ -8,12 +8,12 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [131] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - AttributeStructure.DoubleQuotes
                         IntermediateToken - (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123
-                    ComponentAttribute - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - BoolProperty - AttributeStructure.DoubleQuotes
                         IntermediateToken - (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
-                    ComponentAttribute - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - AttributeStructure.DoubleQuotes
                         HtmlContent - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (82:3,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string
-                    ComponentAttribute - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - ObjectProperty - AttributeStructure.DoubleQuotes
                         IntermediateToken - (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType()
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
index 88619c6e56..5fea46eb46 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement
-                    ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - onclick - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
                             IntermediateToken - (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
index bb7d2bbd84..4f46bf5066 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt
@@ -8,6 +8,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter
-                    ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (25:0,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - Coolness - AttributeStructure.DoubleQuotes
                         CSharpExpression - (26:0,26 [13] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "very-cool"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
index 4f1736bf0c..7cac04dc75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.ir.txt
@@ -10,8 +10,8 @@ Document -
                 Component - (0:0,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                 MarkupBlock -  - \n<mycomponent></mycomponent>\n
                 Component - (34:2,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - intproperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute -  - intproperty -  - AttributeStructure.SingleQuotes
                         HtmlContent - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
-                    ComponentAttribute - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - BoolProperty - AttributeStructure.SingleQuotes
                         IntermediateToken - (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
index be1a9c342d..6c5e95dd7c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - AttributeStructure.SingleQuotes
                         IntermediateToken - (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 1
                 HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (33:1,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - Mycomponent
-                    ComponentAttribute - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - AttributeStructure.SingleQuotes
                         IntermediateToken - (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 2
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
index 10110bdd17..842a729909 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - @onclick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - @onclick -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - () => Increment()
             CSharpCode - (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
index b41180f006..793533d6f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.ir.txt
@@ -8,11 +8,11 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [75] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     SetKey - (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - someDate.Day
-                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (66:0,66 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
             CSharpCode - (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
index dfa54bd417..bfff03747f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.ir.txt
@@ -13,6 +13,6 @@ Document -
                             IntermediateToken - (45:0,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
                         MarkupBlock -  - <el>further</el> content\n
                     SetKey - (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 123 + 456
-                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - SomeProp -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (40:0,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
index 3d8effc235..009c889692 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.ir.txt
@@ -9,12 +9,12 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (39:3,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - HeaderComponent
-                    ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - AttributeStructure.SingleQuotes
                         HtmlContent - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:3,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - head
                 HtmlContent - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (90:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 Component - (92:5,0 [51] x:\dir\subdir\Test\TestComponent.cshtml) - FooterComponent
-                    ComponentAttribute - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - AttributeStructure.SingleQuotes
+                    ComponentAttribute - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - Footer - AttributeStructure.SingleQuotes
                         HtmlContent - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (117:5,25 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - feet
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
index 7da0ce2b7c..c9bded4349 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt
@@ -8,11 +8,11 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - ParamBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     ReferenceCapture - (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
-                    ComponentAttribute -  - ParamAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - ParamAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (64:0,64 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
             CSharpCode - (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
index 7d1c67f32f..c174e98a63 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt
@@ -13,7 +13,7 @@ Document -
                             IntermediateToken - (46:0,46 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    Some 
                         MarkupBlock -  - <el>further</el> content\n
                     ReferenceCapture - (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance
-                    ComponentAttribute -  - SomeProp - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - SomeProp -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (41:0,41 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val
             CSharpCode - (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
index 3429b2d1ec..f732aebd1c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.ir.txt
@@ -8,12 +8,12 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [92] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     Splat - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
-                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (83:0,83 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
             CSharpCode - (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
index b0ca2494c6..9ef6e28850 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.ir.txt
@@ -8,12 +8,12 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     Splat - (51:0,51 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
-                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (86:0,86 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
             CSharpCode - (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
index 44551cade9..869643fef0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - AttributeStructure.DoubleQuotes
                         IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18
                     Splat - (37:0,37 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (39:0,39 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
index ab5ee99b5e..4de9d37048 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.ir.txt
@@ -8,12 +8,12 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [93] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - AttributeBefore - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeBefore -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before
                     Splat - (51:0,51 [15] x:\dir\subdir\Test\TestComponent.cshtml)
                         IntermediateToken - (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - someAttributes
-                    ComponentAttribute -  - AttributeAfter - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - AttributeAfter -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (84:0,84 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after
             CSharpCode - (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
index c8c04397d2..cb44fd330f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.ir.txt
@@ -8,9 +8,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - mESSAGE -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
index 25345f1b0c..3968361edb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [59] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
-                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:0,47 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
             CSharpCode - (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
index 9cec88099f..c5ebd832d3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [70] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
-                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (58:0,58 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
             CSharpCode - (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
index b234a58f15..2cdf19815f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (57:0,57 [12] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - (58:0,58 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (s) => {}
-                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - message
-                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageChanged - MessageChanged - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => message = __value, message)
-                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - MessageExpression - MessageExpression - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - () => message
             CSharpCode - (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
index 8c20c432a3..de23e13021 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.ir.txt
@@ -8,12 +8,12 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Message - Message - AttributeStructure.DoubleQuotes
                         HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - mESSAGE - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - mESSAGE -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (37:0,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - Message - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Message -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (52:0,52 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - anotherone
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
index 955189823e..6033f160f0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.ir.txt
@@ -8,9 +8,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - Foo - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Foo -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
-                    ComponentAttribute -  - foo - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - foo -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (29:0,29 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - test
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
index a0a30b8ab0..b3908dd30c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [89] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [64] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [63] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create<MouseEventArgs>(this, Increment)
             CSharpCode - (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
index bcc2d307aa..dfc09dfba9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
index 399f6aaccf..45b6fbe5e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
index 2267e969d7..6678b8436e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
index 375dc6ca85..a8600992a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
index ce367272ff..50ecda9627 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.ir.txt
@@ -9,7 +9,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (44:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (66:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
index 9d562d79a1..e98dd224ca 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [48] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [47] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - EventCallback.Factory.Create(this, Increment)
             CSharpCode - (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
index bcc2d307aa..dfc09dfba9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
index c933d37792..14662ded68 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
index 375dc6ca85..a8600992a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
index 6850ddde90..7fabab90be 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (22:0,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - AttributeStructure.DoubleQuotes
                         CSharpExpression - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment
             CSharpCode - (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
index 5d561a71d7..1a3f72a26f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs
@@ -8,12 +8,29 @@ namespace Test
     using System.Linq;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
     public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
     {
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.AddMarkupContent(0, "<input @onclick=\"x => { }\">");
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 x => { }
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __builder.CloseElement();
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
index 60704a5e36..ad0d2cd629 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt
@@ -5,6 +5,12 @@ Document -
         UsingDirective - (53:3,1 [19] ) - System.Linq
         UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupBlock -  - <input @onclick="x => { }">
+                MarkupElement - (44:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { }
+                            IntermediateToken -  - CSharp - )
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
new file mode 100644
index 0000000000..abde22376c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "@onclick:preventDefault", true);
+            __builder.AddEventPreventDefaultAttribute(2, "onclick", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                true
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt
new file mode 100644
index 0000000000..243f6a6294
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.ir.txt
@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (44:1,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    ComponentAttribute - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - PreventDefault - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    HtmlAttribute -  - @onclick:preventDefault - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
new file mode 100644
index 0000000000..2b163cbdf5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
@@ -0,0 +1,64 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "input");
+            __builder.AddEventPreventDefaultAttribute(1, "onfocus", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                true
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.AddEventStopPropagationAttribute(2, "onclick", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                Foo
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.AddEventStopPropagationAttribute(3, "onfocus", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                               false
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    bool Foo { get; set; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
new file mode 100644
index 0000000000..d6d453bd47
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (44:1,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    ComponentAttribute - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - StopPropagation - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                    ComponentAttribute - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - StopPropagation - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - false
+            CSharpCode - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool Foo { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
new file mode 100644
index 0000000000..4df5db3ef2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    bool Foo { get; set; }
+|
+Generated Location: (1720:55,7 [30] )
+|
+    bool Foo { get; set; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d00a9ee79c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
@@ -0,0 +1,31 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "input");
+            __builder.AddEventPreventDefaultAttribute(1, "onclick", true);
+            __builder.AddEventStopPropagationAttribute(2, "onclick", true);
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
new file mode 100644
index 0000000000..ce28568d1b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (44:1,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    ComponentAttribute -  - onclick - PreventDefault - AttributeStructure.Minimized
+                    ComponentAttribute -  - onclick - StopPropagation - AttributeStructure.Minimized
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6bdce64595
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs
@@ -0,0 +1,57 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+using Microsoft.AspNetCore.Components.Web;
+
+#line default
+#line hidden
+#nullable disable
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "input");
+            __builder.AddAttribute(1, "onfocus", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.FocusEventArgs>(this, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                 OnFocus
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __builder.AddEventPreventDefaultAttribute(2, "onfocus", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                   ShouldPreventDefault()
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt
new file mode 100644
index 0000000000..e761b1337c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (44:1,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                    HtmlAttribute - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.FocusEventArgs>(this, 
+                            IntermediateToken - (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnFocus
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (95:1,51 [22] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken - (95:1,51 [22] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ShouldPreventDefault()
+            CSharpCode - (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnFocus(FocusEventArgs e) { }\n\n    bool ShouldPreventDefault() { return false; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a485117b18
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt
@@ -0,0 +1,13 @@
+Source Location: (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+|
+Generated Location: (1505:46,7 [95] )
+|
+    void OnFocus(FocusEventArgs e) { }
+
+    bool ShouldPreventDefault() { return false; }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
index e8eb031160..b8a261ff0b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.ir.txt
@@ -9,9 +9,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [48] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - (int x) => {}
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
index 7108e765d3..33915d9422 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -9,9 +9,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
index 7108e765d3..33915d9422 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -9,9 +9,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
index 7108e765d3..33915d9422 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.ir.txt
@@ -9,9 +9,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (13:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - MyEvent - MyEvent - AttributeStructure.DoubleQuotes
                         IntermediateToken - (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => {}
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
         ClassDeclaration -  - internal static - TypeInference -  - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
index 464ec36079..19fea6e058 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.ir.txt
@@ -9,9 +9,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (20:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
-                    ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (47:1,27 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Foo - Foo - AttributeStructure.DoubleQuotes
                         CSharpExpression - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Hello
             CSharpCode - (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
index 173aa8f3d6..4f18ec8923 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 Component - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
-                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
             CSharpCode - (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
index 8fbb88c926..15d902fdc4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     ReferenceCapture - (28:0,28 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my
             CSharpCode - (46:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index b7cd7e9fcb..2687c31346 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -16,7 +16,7 @@ Document -
                                 IntermediateToken - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
                         HtmlContent - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                    ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (25:0,25 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
     NamespaceDeclaration -  - __Blazor.Test.TestComponent
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
index 3d92af0ed0..f1f34dac11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.ir.txt
@@ -10,7 +10,7 @@ Document -
                 Component - (0:0,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentTypeArgument - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         IntermediateToken - (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int
-                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     SetKey - (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
             CSharpCode - (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
index c9391bc849..cc684d6009 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.ir.txt
@@ -8,7 +8,7 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         IntermediateToken - (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3
                     SetKey - (28:0,28 [8] x:\dir\subdir\Test\TestComponent.cshtml) - _someKey
             CSharpCode - (51:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
index 0a9913a083..1643d14855 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         HtmlContent - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
-                    ComponentAttribute -  - MyEvent - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - MyEvent -  - AttributeStructure.DoubleQuotes
                         HtmlContent - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (35:0,35 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - MyEventHandler
             CSharpCode - (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
index 70c86a1eef..096a378dfa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt
@@ -22,6 +22,6 @@ Document -
                 CSharpCode - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
                 Component - (112:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (135:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (135:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - Template - AttributeStructure.DoubleQuotes
                         CSharpExpression - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
index 78f478f163..fe44a59ada 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt
@@ -12,7 +12,7 @@ Document -
                 Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
                         Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - AttributeStructure.DoubleQuotes
                                 CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                     IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 61f3ca9b38..de4cc19276 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -12,7 +12,7 @@ Document -
                 Template - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml)
                     MarkupElement - (48:1,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
                         Component - (53:1,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                            ComponentAttribute - (72:1,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - AttributeStructure.DoubleQuotes
                                 CSharpExpression - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
                                     IntermediateToken - (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name
                 CSharpCode - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
index cfcce32483..5624706a94 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt
@@ -16,6 +16,6 @@ Document -
                 CSharpCode - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
                 Component - (78:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute - (107:1,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (107:1,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - PersonTemplate - AttributeStructure.DoubleQuotes
                         CSharpExpression - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
index 25f8aafe53..4bf8d688c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt
@@ -14,6 +14,6 @@ Document -
                 CSharpCode - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; 
                 Component - (50:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                    ComponentAttribute -  - Person - AttributeStructure.DoubleQuotes
+                    ComponentAttribute -  - Person -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - (71:1,21 [9] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
index cf75d527c3..16b79cd5f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt
@@ -8,10 +8,10 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
-                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y
-                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => y = __value, y)
             CSharpCode - (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
index eb577d71be..9803e3b207 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt
@@ -8,16 +8,16 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - User
-                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName
-                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserName = __value, UserName)
-                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken - (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive
-                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (45:0,45 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged -  - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => UserIsActive = __value, UserIsActive)
             CSharpCode - (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
index 79ffa51288..2705c4c853 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt
@@ -10,6 +10,6 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
-                    ComponentAttribute - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - AttributeStructure.DoubleQuotes
                         HtmlContent - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (88:6,21 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
index 32daefbab0..d8337981c8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt
@@ -10,6 +10,6 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupBlock -  - <h1>Hello, world!</h1>\n\nWelcome to your new app.\n\n
                 Component - (67:6,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt
-                    ComponentAttribute - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - AttributeStructure.DoubleQuotes
+                    ComponentAttribute - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - AttributeStructure.DoubleQuotes
                         HtmlContent - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml)
                             IntermediateToken - (88:6,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <div>Test!</div>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 52710e8fd7..5522b50163 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -83,11 +83,21 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     if (Equals(attribute.AttributeClass, eventHandlerAttribute))
                     {
+                        var enablePreventDefault = false;
+                        var enableStopPropagation = false;
+                        if (attribute.ConstructorArguments.Length == 4)
+                        {
+                            enablePreventDefault = (bool)attribute.ConstructorArguments[2].Value;
+                            enableStopPropagation = (bool)attribute.ConstructorArguments[3].Value;
+                        }
+
                         results.Add(new EventHandlerData(
                             type.ContainingAssembly.Name,
                             type.ToDisplayString(),
                             (string)attribute.ConstructorArguments[0].Value,
-                            (INamedTypeSymbol)attribute.ConstructorArguments[1].Value));
+                            (INamedTypeSymbol)attribute.ConstructorArguments[1].Value,
+                            enablePreventDefault,
+                            enableStopPropagation));
                     }
                 }
             }
@@ -133,6 +143,36 @@ namespace Microsoft.CodeAnalysis.Razor
                     });
                 });
 
+                if (entry.EnablePreventDefault)
+                {
+                    builder.TagMatchingRule(rule =>
+                    {
+                        rule.TagName = "*";
+
+                        rule.Attribute(a =>
+                        {
+                            a.Name = attributeName + ":preventDefault";
+                            a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                            a.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+                        });
+                    });
+                }
+
+                if (entry.EnableStopPropagation)
+                {
+                    builder.TagMatchingRule(rule =>
+                    {
+                        rule.TagName = "*";
+
+                        rule.Attribute(a =>
+                        {
+                            a.Name = attributeName + ":stopPropagation";
+                            a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+                            a.Metadata[ComponentMetadata.Common.DirectiveAttribute] = bool.TrueString;
+                        });
+                    });
+                }
+
                 builder.BindAttribute(a =>
                 {
                     a.Documentation = string.Format(
@@ -154,6 +194,30 @@ namespace Microsoft.CodeAnalysis.Razor
                     // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like
                     // a C# property will crash trying to create the tooltips.
                     a.SetPropertyName(entry.Attribute);
+
+                    if (entry.EnablePreventDefault)
+                    {
+                        a.BindAttributeParameter(parameter =>
+                        {
+                            parameter.Name = "preventDefault";
+                            parameter.TypeName = typeof(bool).FullName;
+                            parameter.Documentation = string.Format(ComponentResources.EventHandlerTagHelper_PreventDefault_Documentation, attributeName);
+
+                            parameter.SetPropertyName("PreventDefault");
+                        });
+                    }
+
+                    if (entry.EnableStopPropagation)
+                    {
+                        a.BindAttributeParameter(parameter =>
+                        {
+                            parameter.Name = "stopPropagation";
+                            parameter.TypeName = typeof(bool).FullName;
+                            parameter.Documentation = string.Format(ComponentResources.EventHandlerTagHelper_StopPropagation_Documentation, attributeName);
+
+                            parameter.SetPropertyName("StopPropagation");
+                        });
+                    }
                 });
 
                 results.Add(builder.Build());
@@ -168,12 +232,16 @@ namespace Microsoft.CodeAnalysis.Razor
                 string assembly,
                 string typeName,
                 string element,
-                INamedTypeSymbol eventArgsType)
+                INamedTypeSymbol eventArgsType,
+                bool enablePreventDefault,
+                bool enableStopPropagation)
             {
                 Assembly = assembly;
                 TypeName = typeName;
                 Attribute = element;
                 EventArgsType = eventArgsType;
+                EnablePreventDefault = enablePreventDefault;
+                EnableStopPropagation = enableStopPropagation;
             }
 
             public string Assembly { get; }
@@ -183,6 +251,10 @@ namespace Microsoft.CodeAnalysis.Razor
             public string Attribute { get; }
 
             public INamedTypeSymbol EventArgsType { get; }
+
+            public bool EnablePreventDefault { get; }
+
+            public bool EnableStopPropagation { get; }
         }
 
         private class EventHandlerDataVisitor : SymbolVisitor
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
index 6784ea7ab2..32fe31d860 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
@@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         public override void VisitComponentAttribute(ComponentAttributeIntermediateNode node)
         {
-            WriteContentNode(node, node.AttributeName, string.Format("AttributeStructure.{0}", node.AttributeStructure));
+            WriteContentNode(node, node.AttributeName, node.PropertyName, string.Format("AttributeStructure.{0}", node.AttributeStructure));
         }
 
         public override void VisitComponentChildContent(ComponentChildContentIntermediateNode node)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
index 191e398a7c..9fde10eb7e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
@@ -172,9 +172,15 @@ namespace Microsoft.AspNetCore.Components.Web
     [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange", false, null)]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", "value", "value", "onchange", true, "yyyy-MM-dd")]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", null, "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("datetime-local", "value", "value", "onchange", true, "yyyy-MM-ddTHH:mm:ss")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("datetime-local", null, "value", "onchange", true, "yyyy-MM-ddTHH:mm:ss")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("month", "value", "value", "onchange", true, "yyyy-MM")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("month", null, "value", "onchange", true, "yyyy-MM")]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", "value", "value", "onchange", true, null)]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", null, "value", "onchange", true, null)]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("time", "value", "value", "onchange", true, "HH:mm:ss")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("time", null, "value", "onchange", true, "HH:mm:ss")]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange", false, null)]
     [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange", false, null)]
     public static partial class BindAttributes
@@ -214,97 +220,97 @@ namespace Microsoft.AspNetCore.Components.Web
         public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.Web.ErrorEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.Web.ErrorEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs), true, true)]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs), true, true)]
     public static partial class EventHandlers
     {
     }
@@ -409,6 +415,11 @@ namespace Microsoft.AspNetCore.Components.Web
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.TouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
         public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.WheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
     }
+    public static partial class WebRenderTreeBuilderExtensions
+    {
+        public static void AddEventPreventDefaultAttribute(this Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int sequence, string eventName, bool value) { }
+        public static void AddEventStopPropagationAttribute(this Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder, int sequence, string eventName, bool value) { }
+    }
     public partial class WheelEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
     {
         public WheelEventArgs() { }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 93b30fbf50..c244065999 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -207,8 +207,11 @@ namespace Microsoft.AspNetCore.Components
     public sealed partial class EventHandlerAttribute : System.Attribute
     {
         public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
+        public EventHandlerAttribute(string attributeName, System.Type eventArgsType, bool enablestopPropagation, bool enablePreventDefault) { }
         public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public bool EnableStopPropagation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public bool EnablePreventDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     public partial interface IComponent
     {

From 7f126d5694340a6e75169f106322343ef8a52a3e Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 11 Oct 2019 18:02:18 -0700
Subject: [PATCH 287/337] Addressed minor comments \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/c170fd9837f73570b93cddf2a2ce20dddb7049f0

---
 .../src/ComponentResources.resx                              | 2 +-
 .../src/Components/ComponentDiagnosticFactory.cs             | 2 +-
 .../src/Components/ComponentEventHandlerLoweringPass.cs      | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index 965fe99190..b457a1f9f7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -163,7 +163,7 @@
     <value>Sets the '{0}' attribute to the provided string or delegate value. A delegate value should be of type '{1}'.</value>
   </data>
   <data name="EventHandlerTagHelper_PreventDefault_Documentation" xml:space="preserve">
-    <value>Specifies whether to cancel(if cancelable) the default action that belongs to the '{0}' event.</value>
+    <value>Specifies whether to cancel (if cancelable) the default action that belongs to the '{0}' event.</value>
   </data>
   <data name="EventHandlerTagHelper_StopPropagation_Documentation" xml:space="preserve">
     <value>Specifies whether to prevent further propagation of the '{0}' event in the capturing and bubbling phases.</value>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
index c179ab8d17..0aa49c6446 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDiagnosticFactory.cs
@@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
         public static readonly RazorDiagnosticDescriptor EventHandler_Duplicates =
             new RazorDiagnosticDescriptor(
             $"{DiagnosticPrefix}9990",
-            () => "The attribute '{0}' was matched by multiple event handlers attributes. Duplicates:{1}",
+            () => "The attribute '{0}' was matched by multiple event handler attributes. Duplicates:{1}",
             RazorDiagnosticSeverity.Error);
 
         public static RazorDiagnostic CreateEventHandler_Duplicates(SourceSpan? source, string attribute, TagHelperDirectiveAttributeIntermediateNode[] attributes)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
index 421b51c819..2e72dfe397 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentEventHandlerLoweringPass.cs
@@ -32,13 +32,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             // Each usage will be represented by a tag helper property that is a descendant of either
             // a component or element.
             var references = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeIntermediateNode>();
-            var parameterReferences = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeParameterIntermediateNode>();
-
             var parents = new HashSet<IntermediateNode>();
             for (var i = 0; i < references.Count; i++)
             {
                 parents.Add(references[i].Parent);
             }
+
+            // We need to do something similar for directive attribute parameters like @onclick:preventDefault.
+            var parameterReferences = documentNode.FindDescendantReferences<TagHelperDirectiveAttributeParameterIntermediateNode>();
             for (var i = 0; i < parameterReferences.Count; i++)
             {
                 parents.Add(parameterReferences[i].Parent);

From 054c1c5e59e4fc6e9fa156a6ff1c99e0529c38ec Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 18 Oct 2019 11:23:05 -0700
Subject: [PATCH 288/337] Retarget rzc.dll to netcoreapp3.0
 (dotnet/aspnetcore-tooling#1253)

Based on the discussions here: https://github.com/aspnet/AspNetCore-Internal/issues/3201#issuecomment-539631557

rzc.dll targeting netcoreapp3.1 causes shared fx version conflicts when consumed as a package in the AspNetCore repo.
A fairly trivial workaround is to have it target it netcoreapp3.0 and allow it to roll-forward to the available shared fx.
This follows csc.dll's behavior, as well as solves the version conflict.

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/3201\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/3807c6a6c1cc9657798acb3f8825e912146c3c7c
---
 .../src/Microsoft.AspNetCore.Razor.Tools.csproj           | 8 +++++++-
 .../src/runtimeconfig.template.json                       | 3 +++
 .../src/Microsoft.NET.Sdk.Razor.csproj                    | 2 +-
 .../Microsoft.NET.Sdk.Razor.CodeGeneration.targets        | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Tools/src/runtimeconfig.template.json

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
index d95e126d74..5a08e5c723 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -3,7 +3,13 @@
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
 
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <!--
+      This is intentionally targeting netcoreapp3.0. This allows using the Microsoft.NET.Sdk.Razor package without having to solve diamond dependency problems in AspNetCore.
+      We use a runtimeconfig.json.template to allow roll forwards.
+      In addition, the SDK stamps an exact version of the shared fx to use in all runtimeconfig.json that are contained in the SDK.
+      See the discussion here: https://github.com/aspnet/AspNetCore-Internal/issues/3201#issuecomment-539631557
+    -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>rzc</AssemblyName>
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/runtimeconfig.template.json b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/runtimeconfig.template.json
new file mode 100644
index 0000000000..2c73f39890
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+    "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 9c811eb9c2..dd3272a750 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -46,7 +46,7 @@
     <!-- Layout tasks, compiler, and extensions in the sdk-output folder. The entire folder structure gets packaged as-is into the SDK -->
     <MSBuild
       Projects="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj"
-      Properties="PublishDir=$(SdkOutputPath)tools\$(DefaultNetCoreTargetFramework);TargetFramework=$(DefaultNetCoreTargetFramework)"
+      Properties="PublishDir=$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
       Targets="Publish" />
 
     <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index 25ea86a65d..5f8081d69c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -39,7 +39,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_RazorGenerateInputsHash></_RazorGenerateInputsHash>
     <_RazorGenerateInputsHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateInputsHashFile>
 
-    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.1\rzc.dll</_RazorToolAssembly>
+    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.0\rzc.dll</_RazorToolAssembly>
   </PropertyGroup>
 
   <!--

From 18457ddc856865bdaad2d95f061ada729443d1f8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2019 18:12:55 +0000
Subject: [PATCH 289/337] [release/3.1] Update dependencies from dotnet/arcade
 (dotnet/aspnetcore-tooling#1257)

* Update dependencies from https://github.com/dotnet/arcade build 20191017.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3

* Remove duplicate icon element
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/ce261e995356de8a0142f4989c6776d5718270f1
---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 6fadcf8138..dda16e9730 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -2,7 +2,6 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
-    <icon>packageIcon.png</icon>
     <dependencies>
       <group targetFramework=".NETStandard2.0" />
     </dependencies>

From e2dc96c7b95dfafe1e0a3d9e085631ddec93f472 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 28 Oct 2019 11:43:45 -0700
Subject: [PATCH 290/337] Fix runtime preventDefault / stopPropagation break.

- The Blazor runtime doesn't support adding attributes prior to any sort of content frames being applied. This change ensures that `ComponentAttributes` (how preventDefault / stopPropagation are represented) are handled like other HTML attributes (applied first).
- Updated existing tests and their baselines.

aspnet/AspNetCoredotnet/aspnetcore-tooling#16611
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/1513cd2a5bf714c007fdc8e5e3ec25af530438d6
---
 .../Components/ComponentRuntimeNodeWriter.cs  |  4 +++
 .../MarkupElementIntermediateNode.cs          |  1 +
 .../ComponentCodeGenerationTestBase.cs        |  4 +--
 .../TestComponent.codegen.cs                  | 17 ++++++++---
 .../TestComponent.ir.txt                      | 29 ++++++++++++-------
 .../TestComponent.mappings.txt                | 21 +++++++++-----
 .../TestComponent.ir.txt                      |  4 ++-
 .../TestComponent.codegen.cs                  |  4 +--
 .../TestComponent.codegen.cs                  | 24 ++++++++++-----
 .../TestComponent.ir.txt                      | 25 ++++++++++------
 .../TestComponent.mappings.txt                |  4 +--
 .../TestComponent.codegen.cs                  |  3 +-
 .../TestComponent.ir.txt                      |  4 ++-
 13 files changed, 96 insertions(+), 48 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
index 82fb75666f..b57552e5e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs
@@ -191,6 +191,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 {
                     context.RenderNode(attribute);
                 }
+                else if (child is ComponentAttributeIntermediateNode componentAttribute)
+                {
+                    context.RenderNode(componentAttribute);
+                }
                 else if (child is SplatIntermediateNode splat)
                 {
                     context.RenderNode(splat);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
index db29186789..cd7ddc756c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Intermediate/MarkupElementIntermediateNode.cs
@@ -19,6 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
         public IEnumerable<IntermediateNode> Body => Children.Where(c =>
         {
             return
+                c as ComponentAttributeIntermediateNode == null &&
                 c as HtmlAttributeIntermediateNode == null &&
                 c as SplatIntermediateNode == null &&
                 c as SetKeyIntermediateNode == null &&
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index b7b77640cf..1fde6741b2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2905,7 +2905,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using Microsoft.AspNetCore.Components.Web
-<input @onclick:preventDefault @onclick:stopPropagation />");
+<button @onclick:preventDefault @onclick:stopPropagation>Click Me</button>");
 
             // Assert
             AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
@@ -2921,7 +2921,7 @@ namespace Test
             // Act
             var generated = CompileToCSharp(@"
 @using Microsoft.AspNetCore.Components.Web
-<input @onfocus:preventDefault=""true"" @onclick:stopPropagation=""Foo"" @onfocus:stopPropagation=""false"" />
+<button @onclick=""() => Foo = false"" @onfocus:preventDefault=""true"" @onclick:stopPropagation=""Foo"" @onfocus:stopPropagation=""false"">Click Me</button>
 @code {
     bool Foo { get; set; }
 }");
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
index 1bdae075cb..64cf9089f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
@@ -27,10 +27,10 @@ using Microsoft.AspNetCore.Components.Web;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+            __o = Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                true
+                  () => Foo = false
 
 #line default
 #line hidden
@@ -39,7 +39,7 @@ using Microsoft.AspNetCore.Components.Web;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                Foo
+                                                              true
 
 #line default
 #line hidden
@@ -48,7 +48,16 @@ using Microsoft.AspNetCore.Components.Web;
             __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                                               false
+                                                                                              Foo
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __o = Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<System.Boolean>(
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                                                                                             false
 
 #line default
 #line hidden
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
index de4bf6f53e..3d45ad10b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
@@ -17,17 +17,24 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (44:1,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    ComponentAttribute - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
+                MarkupElement - (44:1,0 [149] x:\dir\subdir\Test\TestComponent.cshtml) - button
+                    HtmlContent - (176:1,132 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (176:1,132 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Click Me
+                    HtmlAttribute - (62:1,18 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (62:1,18 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => Foo = false
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (106:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
-                    ComponentAttribute - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - StopPropagation - AttributeStructure.DoubleQuotes
+                            IntermediateToken - (106:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (138:1,94 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - StopPropagation - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
-                    ComponentAttribute - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - StopPropagation - AttributeStructure.DoubleQuotes
+                            IntermediateToken - (138:1,94 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                    ComponentAttribute - (169:1,125 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - StopPropagation - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - false
-                HtmlContent - (148:1,104 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    IntermediateToken - (148:1,104 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-            CSharpCode - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool Foo { get; set; }\n
+                            IntermediateToken - (169:1,125 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - false
+                HtmlContent - (193:1,149 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    IntermediateToken - (193:1,149 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool Foo { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
index 9681e57134..cad9e04b78 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
@@ -3,26 +3,31 @@ Source Location: (1:0,1 [41] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (320:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (62:1,18 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => Foo = false|
+Generated Location: (1173:32,18 [17] )
+|() => Foo = false|
+
+Source Location: (106:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1158:32,32 [4] )
+Generated Location: (1500:41,62 [4] )
 |true|
 
-Source Location: (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (138:1,94 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (1474:41,64 [3] )
+Generated Location: (1846:50,94 [3] )
 |Foo|
 
-Source Location: (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (169:1,125 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |false|
-Generated Location: (1820:50,95 [5] )
+Generated Location: (2222:59,125 [5] )
 |false|
 
-Source Location: (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     bool Foo { get; set; }
 |
-Generated Location: (2019:60,7 [30] )
+Generated Location: (2421:69,7 [30] )
 |
     bool Foo { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
index fd1d8c7ac6..e4b3f44b85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
@@ -17,6 +17,8 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 HtmlContent - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml)
                     IntermediateToken - (42:0,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                MarkupElement - (44:1,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (44:1,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - button
+                    HtmlContent - (101:1,57 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (101:1,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Click Me
                     ComponentAttribute -  - onclick - PreventDefault - AttributeStructure.Minimized
                     ComponentAttribute -  - onclick - StopPropagation - AttributeStructure.Minimized
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
index abde22376c..42db467644 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs
@@ -21,8 +21,7 @@ using Microsoft.AspNetCore.Components.Web;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "input");
-            __builder.AddAttribute(1, "@onclick:preventDefault", true);
-            __builder.AddEventPreventDefaultAttribute(2, "onclick", 
+            __builder.AddEventPreventDefaultAttribute(1, "onclick", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 true
@@ -31,6 +30,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line hidden
 #nullable disable
             );
+            __builder.AddAttribute(2, "@onclick:preventDefault", true);
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
index 2b163cbdf5..4a66d9e841 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs
@@ -20,34 +20,44 @@ using Microsoft.AspNetCore.Components.Web;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenElement(0, "input");
-            __builder.AddEventPreventDefaultAttribute(1, "onfocus", 
+            __builder.OpenElement(0, "button");
+            __builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                true
+                  () => Foo = false
+
+#line default
+#line hidden
+#nullable disable
+            ));
+            __builder.AddEventPreventDefaultAttribute(2, "onfocus", 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                                                              true
 
 #line default
 #line hidden
 #nullable disable
             );
-            __builder.AddEventStopPropagationAttribute(2, "onclick", 
+            __builder.AddEventStopPropagationAttribute(3, "onclick", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                Foo
+                                                                                              Foo
 
 #line default
 #line hidden
 #nullable disable
             );
-            __builder.AddEventStopPropagationAttribute(3, "onfocus", 
+            __builder.AddEventStopPropagationAttribute(4, "onfocus", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
-                                                                                               false
+                                                                                                                             false
 
 #line default
 #line hidden
 #nullable disable
             );
+            __builder.AddContent(5, "Click Me");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
index d6d453bd47..fd4127c304 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.ir.txt
@@ -8,15 +8,22 @@ Document -
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (44:1,0 [104] x:\dir\subdir\Test\TestComponent.cshtml) - input
-                    ComponentAttribute - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
+                MarkupElement - (44:1,0 [149] x:\dir\subdir\Test\TestComponent.cshtml) - button
+                    HtmlContent - (176:1,132 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (176:1,132 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Click Me
+                    HtmlAttribute - (62:1,18 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
+                        CSharpExpressionAttributeValue -  - 
+                            IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+                            IntermediateToken - (62:1,18 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => Foo = false
+                            IntermediateToken -  - CSharp - )
+                    ComponentAttribute - (106:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - PreventDefault - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken - (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
-                    ComponentAttribute - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - StopPropagation - AttributeStructure.DoubleQuotes
+                            IntermediateToken - (106:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true
+                    ComponentAttribute - (138:1,94 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - StopPropagation - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken - (108:1,64 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
-                    ComponentAttribute - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - StopPropagation - AttributeStructure.DoubleQuotes
+                            IntermediateToken - (138:1,94 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                    ComponentAttribute - (169:1,125 [5] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus - StopPropagation - AttributeStructure.DoubleQuotes
                         CSharpExpression - 
-                            IntermediateToken - (139:1,95 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - false
-            CSharpCode - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
-                IntermediateToken - (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool Foo { get; set; }\n
+                            IntermediateToken - (169:1,125 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - false
+            CSharpCode - (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+                IntermediateToken - (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool Foo { get; set; }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
index 4df5db3ef2..de4927d371 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt
@@ -1,8 +1,8 @@
-Source Location: (157:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     bool Foo { get; set; }
 |
-Generated Location: (1720:55,7 [30] )
+Generated Location: (2205:65,7 [30] )
 |
     bool Foo { get; set; }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
index d00a9ee79c..e166732cc1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs
@@ -20,9 +20,10 @@ using Microsoft.AspNetCore.Components.Web;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenElement(0, "input");
+            __builder.OpenElement(0, "button");
             __builder.AddEventPreventDefaultAttribute(1, "onclick", true);
             __builder.AddEventStopPropagationAttribute(2, "onclick", true);
+            __builder.AddContent(3, "Click Me");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
index ce28568d1b..99262a0fb5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.ir.txt
@@ -8,6 +8,8 @@ Document -
         UsingDirective - (1:0,1 [43] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupElement - (44:1,0 [58] x:\dir\subdir\Test\TestComponent.cshtml) - input
+                MarkupElement - (44:1,0 [74] x:\dir\subdir\Test\TestComponent.cshtml) - button
+                    HtmlContent - (101:1,57 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        IntermediateToken - (101:1,57 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Click Me
                     ComponentAttribute -  - onclick - PreventDefault - AttributeStructure.Minimized
                     ComponentAttribute -  - onclick - StopPropagation - AttributeStructure.Minimized

From 7f36d6e5f0307a693ba7d36ab9c67a74ab53ef48 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 31 Oct 2019 12:31:50 -0700
Subject: [PATCH 291/337] Associate inputs and outputs for .Views dll with a
 set in FastUpToDate check (dotnet/aspnetcore-tooling#1277)

Follow up to https://github.com/dotnet/project-system/issues/5596

FastUpToDateCheck now has a way to associate inputs and outputs using the Set attribute.
This change prevents FastUpToDateCheck from rebuilding a project when a *.cshtml file is
newer than the project's dll output.

Fixes https://github.com/aspnet/AspNetCore/issues/13204\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2bf9c124908d9ecf5623819312a8a4ac2e96cf4c
---
 .../src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 6345c52e96..84d7bb730c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -307,7 +307,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Add all cshtml files to UpToDateCheckInput - a collection of files used by FastUpToDateCheck to determine
       if any of the the project inputs have changed.
     -->
-    <UpToDateCheckInput Condition="'$(RazorCompileOnBuild)'=='true'" Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
+    <UpToDateCheckInput Condition="'$(RazorCompileOnBuild)'=='true'" Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" Set="RazorViews" />
 
     <!--
       Add all .razor files to UpToDateCheckInput. Component compilation is not controlled by RazorCompileOnBuild,
@@ -320,7 +320,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       if any of the project's outputs have changed.
     -->
     <UpToDateCheckBuilt Include="@(RazorIntermediateAssembly)"
-      Condition="'$(RazorCompileOnBuild)'=='true' AND '@(Content->WithMetadataValue('Extension', '.cshtml'))' != ''" />
+      Condition="'$(RazorCompileOnBuild)'=='true' AND '@(Content->WithMetadataValue('Extension', '.cshtml'))' != ''" Set="RazorViews" />
 
     <!-- Set up watchers for dotnet-watch -->
     <Watch Include="@(Content->WithMetadataValue('Extension', '.razor'))" />

From db9b8526d9d49c0e86a357a12489956f150aa5a6 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Wed, 13 Nov 2019 15:36:20 -0800
Subject: [PATCH 292/337] Go to definition (dotnet/aspnetcore-tooling#1313)

Go to definition
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6ad962ea1a94a2d5c329e00396a9a34aa644b5b2
---
 .../test/RazorPageDocumentClassifierPassTest.cs               | 4 ++--
 .../test/RazorPageDocumentClassifierPassTest.cs               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
index 8e9f111579..d86e144c78 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
@@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             // Arrange
             var content = @"
 @* some comment *@
-     
+
 @page
 ";
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
@@ -363,7 +363,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
         {
             PageDirective.Register(builder);
         }
-        
+
         private static DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
         {
             for (var i = 0; i < engine.Phases.Count; i++)
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
index 286edb49bf..c66ac3d4e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
@@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Arrange
             var content = @"
 @* some comment *@
-     
+
 @page
 ";
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));

From 075c91176e36a9e25b0616cfd4ba9f742470c9a1 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 14 Nov 2019 09:47:26 -0800
Subject: [PATCH 293/337] Razor GoToImplementation \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/12d1eae488010783414b22e983ce070450047ed8

---
 .../test/testassets/MvcWithComponents/Views/Home/Index.cshtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
index b824f4e3e8..8832e1ad15 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
@@ -2,4 +2,4 @@
     ViewData["Title"] = "Home Page";
 }
 
-Hello world!
+Hello world!
\ No newline at end of file

From d5bf4f3f93aeb1a3229e14d30dd1514f07a0a007 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Fri, 15 Nov 2019 10:31:46 -0800
Subject: [PATCH 294/337] PR feedback \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/2c43ce16887b7458bc0567e156c93ffa7b077b78

---
 .../test/testassets/MvcWithComponents/Views/Home/Index.cshtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
index 8832e1ad15..b824f4e3e8 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml
@@ -2,4 +2,4 @@
     ViewData["Title"] = "Home Page";
 }
 
-Hello world!
\ No newline at end of file
+Hello world!

From da085ad36d144384cc3b3e01daa4c8c923014fd2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2019 21:28:03 +0000
Subject: [PATCH 295/337] [release/3.1] Update dependencies from
 aspnet/Extensions (dotnet/aspnetcore-tooling#1347)

* Update dependencies from https://github.com/aspnet/Extensions build 20191118.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.0-rtm.19568.3
- Microsoft.AspNetCore.Testing - 3.1.0-rtm.19568.3
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.0-rtm.19568.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.0-rtm.19568.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.0-rtm.19568.3
- Microsoft.Extensions.Logging - 3.1.0

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.1.0 (parent: Microsoft.Extensions.Logging)

* Update flaky test

* another test
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b6f8920b2ee552f3dfa7e76b9b4193db8e09807d
---
 .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 0e3497a483..bc8b17d705 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         public ITestOutputHelper Output { get; private set; }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/17233")]
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest()
         {
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/17233")]
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Rebuild_Success_RecreatesManifestAndCache()
         {

From fefb8a56aeaaa5c89e07218fbcd1ce5ad5407394 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Wed, 20 Nov 2019 11:05:30 -0800
Subject: [PATCH 296/337] Rename support in VS Code and other fixes
 (dotnet/aspnetcore-tooling#1336)

* Rename support in VS Code and other fixes

* feedback

* more feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5e2a8c79244734afc2f989439d1df33b0237d3c2
---
 src/Razor/test/testassets/MvcWithComponents/Test.cs      | 9 +++++++++
 .../MvcWithComponents/Views/Shared/NavMenu.razor         | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Test.cs

diff --git a/src/Razor/test/testassets/MvcWithComponents/Test.cs b/src/Razor/test/testassets/MvcWithComponents/Test.cs
new file mode 100644
index 0000000000..eaa1ddd367
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Test.cs
@@ -0,0 +1,9 @@
+namespace MvcWithComponents
+{
+    public class Test
+    {
+        public static string Foo { get; set; }
+
+        public static string Bar { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor b/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
index d6eede9b18..e036fead2b 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
@@ -1,2 +1,4 @@
+@Test.Foo @* Used in a test. Don't remove *@
+
 NavMenu content
 

From 6942c1c7e3c971b2639020dde6fbc68e362db3e8 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Wed, 20 Nov 2019 19:27:17 -0800
Subject: [PATCH 297/337] Switch to Arcade model for PackageIcon
 (dotnet/aspnetcore-tooling#1325)

* Update dependencies from Arcade
* Switch to dotnet-eng\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e37c190d7dcec40b243f353dfcd0c586236f898a
---
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj | 1 -
 .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 381d0011fa..c206dc8ee5 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -75,7 +75,6 @@
 
     <ItemGroup>
       <NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
-      <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
index 6fadcf8138..b76f30e32b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
@@ -2,19 +2,18 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
-    <icon>packageIcon.png</icon>
     <dependencies>
       <group targetFramework=".NETStandard2.0" />
     </dependencies>
   </metadata>
 
   <files>
+    $CommonFileElements$
     <file src="Sdk\*" target="Sdk" />
     <file src="build\**" target="build" />
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
     <file src="_._" target="lib\netstandard2.0\_._" />
 
-    <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
 </package>

From 6ec0c445ceaaaef41aac29c36478750c29ad5ae1 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 27 Nov 2019 15:48:58 -0800
Subject: [PATCH 298/337] Load the netcoreapp3.1 compiled task when running in
 Core MSBuild

Fixes https://github.com/aspnet/AspNetCore/issues/17308
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/51e2a0ee646d3a161af4d88340419343286eba48
---
 .../Sdk.Razor.CurrentVersion.targets          |  2 +-
 .../BuildIntrospectionTest.cs                 | 47 +++++++++++++++++++
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  5 ++
 .../RazorTest.Introspection.targets           |  7 +++
 4 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 84d7bb730c..e5e8d926a0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
     <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
     <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
-    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework)</_RazorSdkTasksTFM>
+    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
   </PropertyGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index fcb33acbf2..acff14237e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -2,7 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@@ -221,5 +224,49 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
         }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task IntrospectRazorTasksDllPath()
+        {
+            // Regression test for https://github.com/aspnet/AspNetCore/issues/17308
+            var solutionRoot = GetType().Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                .First(a => a.Key == "Testing.RepoRoot")
+                .Value;
+
+            var tfm =
+#if NETCOREAPP3_1
+                "netcoreapp3.1";
+#else
+#error Target framework needs to be updated.
+#endif
+
+            var expected = Path.Combine(solutionRoot, "artifacts", "bin", "Microsoft.NET.Sdk.Razor", Configuration, "sdk-output", "tasks", tfm, "Microsoft.NET.Sdk.Razor.Tasks.dll");
+
+            // Verifies the fix for https://github.com/aspnet/AspNetCore/issues/17308
+            var result = await DotnetMSBuild("_IntrospectRazorTasks");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, $"RazorTasksPath: {expected}");
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task IntrospectRazorTasksDllPath_DesktopMsBuild()
+        {
+            var solutionRoot = GetType().Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                .First(a => a.Key == "Testing.RepoRoot")
+                .Value;
+
+            var tfm = "net46";
+            var expected = Path.Combine(solutionRoot, "artifacts", "bin", "Microsoft.NET.Sdk.Razor", Configuration, "sdk-output", "tasks", tfm, "Microsoft.NET.Sdk.Razor.Tasks.dll");
+
+            // Verifies the fix for https://github.com/aspnet/AspNetCore/issues/17308
+            var result = await DotnetMSBuild("_IntrospectRazorTasks", msBuildProcessKind: MSBuildProcessKind.Desktop);
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, $"RazorTasksPath: {expected}");
+        }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 0efaf7b8fd..e52fbfb440 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -53,6 +53,11 @@
       <_Parameter2>$(ProcDumpPath)</_Parameter2>
     </AssemblyAttribute>
 
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>Testing.RepoRoot</_Parameter1>
+      <_Parameter2>$(RepoRoot)</_Parameter2>
+    </AssemblyAttribute>
+
   </ItemGroup>
 
   <!-- The test projects rely on these binaries being available -->
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index c3fca78317..de0fc9ee3e 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -46,4 +46,11 @@
   <Target Name="_IntrospectContentItems">
     <Message Text="Content: %(Content.Identity) CopyToOutputDirectory=%(Content.CopyToOutputDirectory) CopyToPublishDirectory=%(Content.CopyToPublishDirectory) ExcludeFromSingleFile=%(Content.ExcludeFromSingleFile)" Importance="High" />
   </Target>
+
+  <Target Name="_IntrospectRazorTasks">
+    <PropertyGroup>
+      <_SdkTaskPath>$([System.IO.Path]::GetFullPath('$(RazorSdkBuildTasksAssembly)'))</_SdkTaskPath>
+    </PropertyGroup>
+    <Message Text="RazorTasksPath: $(_SdkTaskPath)" Importance="High" />
+  </Target>
 </Project>

From 0c907a8225664907afdd5e35afe7b3f603b2b3d0 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 5 Dec 2019 05:50:03 -0800
Subject: [PATCH 299/337] [Static web assets][Fixes #AspNetCore/17079]
 PublishSingleFile results in 404 errors for Nuget components \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/53dd89a41d4c3fa9553636746e7074236e583a99

---
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets |  5 ++--
 .../MSBuildIntegrationTestBase.cs             |  2 ++
 .../StaticWebAssetsIntegrationTest.cs         | 25 +++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index a200ec63ab..693b0d87dd 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -506,14 +506,15 @@ Copyright (c) .NET Foundation. All rights reserved.
 
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
         <RelativePath>$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)','$([MSBuild]::NormalizePath('wwwroot\%(BasePath)\%(RelativePath)'))'))</RelativePath>
-
       </_ExternalPublishStaticWebAsset>
 
       <!-- Remove any existing external static web asset that might have been added as part of the
            regular publish pipeline. -->
       <ResolvedFileToPublish Remove="@(_ExternalPublishStaticWebAsset)" />
 
-      <ResolvedFileToPublish Include="@(_ExternalPublishStaticWebAsset)" />
+      <ResolvedFileToPublish Include="@(_ExternalPublishStaticWebAsset)">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      </ResolvedFileToPublish>
     </ItemGroup>
 
   </Target>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index 34c4b87961..ddc33fb6f0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -40,6 +40,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         protected string PublishOutputPath => Path.Combine(OutputPath, "publish");
 
+        protected string GetRidSpecificPublishOutputPath(string rid) => Path.Combine(OutputPath, rid, "publish");
+
         // Used by the test framework to set the project that we're working with
         internal static ProjectDirectory Project
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index bc8b17d705..fa747f98b3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -83,6 +83,31 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, PublishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        public async Task Publish_CopiesStaticWebAssetsToDestinationFolder_PublishSingleFile()
+        {
+            var runtimeIdentifier = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "win-x64" : (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "osx-x64" : "linux-x64");
+            var result = await DotnetMSBuild("Publish", $"/restore /p:PublishSingleFile=true /p:RuntimeIdentifier={runtimeIdentifier}");
+
+            Assert.BuildPassed(result);
+            var publishOutputPath = GetRidSpecificPublishOutputPath(runtimeIdentifier);
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.js"));
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.v4.js"));
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "css", "site.css"));
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "js", "project-direct-dep.js"));
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "css", "site.css"));
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "js", "pkg-direct-dep.js"));
+            Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
+
+            // Validate that static web assets don't get published as content too on their regular path
+            Assert.FileDoesNotExist(result, publishOutputPath, Path.Combine("wwwroot", "js", "project-transitive-dep.js"));
+            Assert.FileDoesNotExist(result, publishOutputPath, Path.Combine("wwwroot", "js", "project-transitive-dep.v4.js"));
+
+            // Validate that the manifest never gets copied
+            Assert.FileDoesNotExist(result, publishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
+        }
+
         [Fact]
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_WithBuildReferencesDisabled_CopiesStaticWebAssetsToDestinationFolder()

From 3ff767b3d3d66a5fa740e556df07c3278ceb0c46 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 10 Dec 2019 10:17:40 -0800
Subject: [PATCH 300/337] [StaticWebAssets][Fixes #AspNetCore/17426] Publish no
 build doesn't copy static web assets from referenced projects \n\nCommit
 migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/6685cd61050a0f010d68ba118b2570693a3d9b8f

---
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets | 20 ++++++++-----------
 .../StaticWebAssetsIntegrationTest.cs         | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index a200ec63ab..1ed75f2965 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -54,23 +54,19 @@ Copyright (c) .NET Foundation. All rights reserved.
       $(GetCurrentProjectStaticWebAssetsDependsOn)
     </GetCurrentProjectStaticWebAssetsDependsOn>
 
-    <AssignTargetPathsDependsOn>
+    <GetCopyToOutputDirectoryItemsDependsOn>
+      $(GetCopyToOutputDirectoryItemsDependsOn);
       GenerateStaticWebAssetsManifest;
-      $(AssignTargetPathsDependsOn)
-    </AssignTargetPathsDependsOn>
+    </GetCopyToOutputDirectoryItemsDependsOn>
 
     <ResolveStaticWebAssetsInputsDependsOn>
       ResolveCurrentProjectStaticWebAssetsInputs;
-      $(ResolveStaticWebAssetsInputsDependsOn)
-    </ResolveStaticWebAssetsInputsDependsOn>
-
-    <ResolveStaticWebAssetsInputsDependsOn Condition="$(NoBuild) != 'true'">
       ResolveReferencedProjectsStaticWebAssets;
       $(ResolveStaticWebAssetsInputsDependsOn)
     </ResolveStaticWebAssetsInputsDependsOn>
 
     <ResolveReferencedProjectsStaticWebAssetsDependsOn>
-      ResolveReferences;
+      PrepareProjectReferences;
       $(ResolveReferencedProjectsStaticWebAssetsDependsOn)
     </ResolveReferencedProjectsStaticWebAssetsDependsOn>
 
@@ -187,14 +183,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
       <!-- This is the list of inputs that will be used for generating the manifest used during development. -->
     <ItemGroup>
-      <Content
+      <ContentWithTargetPath
         Include="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
-        Condition="'@(_ExternalStaticWebAsset->Count())' != '0'"
-        Link="$(TargetName).StaticWebAssets.xml">
+        Condition="'@(_ExternalStaticWebAsset->Count())' != '0'">
 
+        <TargetPath>$(TargetName).StaticWebAssets.xml</TargetPath>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-      </Content>
+      </ContentWithTargetPath>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index bc8b17d705..3120da0be1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -104,6 +104,26 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
         }
 
+        [Fact]
+        [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        public async Task Publish_NoBuild_CopiesStaticWebAssetsToDestinationFolder()
+        {
+            var build = await DotnetMSBuild("Build", "/restore");
+
+            Assert.BuildPassed(build);
+
+            var publish = await DotnetMSBuild("Publish", "/p:NoBuild=true");
+
+            Assert.BuildPassed(publish);
+
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.v4.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "css", "site.css"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "js", "project-direct-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "css", "site.css"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryDirectDependency", "js", "pkg-direct-dep.js"));
+            Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
+        }
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]

From 541323631fc1b2662f3fbdc83154581c2f9e2c0d Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 26 Nov 2019 04:52:46 -0800
Subject: [PATCH 301/337] [StaticWebAssets] Updates manifest generation to
 allow multiple content roots under the same base path for a given project.
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/5e68cb88e4602aa5c814325abee7334265c55d33

---
 .../src/GenerateStaticWebAssetsManifest.cs    |  36 ++++-
 .../src/ValidateStaticWebAssetsUniquePaths.cs |  86 +++++++++++
 ...soft.NET.Sdk.Razor.StaticWebAssets.targets |  19 ++-
 ...erateAspNetCoreStaticAssetsManifestTest.cs |  69 ++++++++-
 .../ValidateStaticWebAssetsUniquePathsTest.cs | 141 ++++++++++++++++++
 5 files changed, 336 insertions(+), 15 deletions(-)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/ValidateStaticWebAssetsUniquePaths.cs
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/ValidateStaticWebAssetsUniquePathsTest.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
index 3ab75b0452..b8d5d717df 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/GenerateStaticWebAssetsManifest.cs
@@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
     {
         private const string ContentRoot = "ContentRoot";
         private const string BasePath = "BasePath";
+        private const string SourceId = "SourceId";
 
         [Required]
         public string TargetManifestPath { get; set; }
@@ -76,13 +77,19 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 // so it needs to always be '/'.
                 var normalizedBasePath = basePath.Replace("\\", "/");
 
+                // contentRoot can have forward and trailing slashes and sometimes consecutive directory
+                // separators. To be more flexible we will normalize the content root so that it contains a
+                // single trailing separator.
+                var normalizedContentRoot = $"{contentRoot.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)}{Path.DirectorySeparatorChar}";
+
                 // At this point we already know that there are no elements with different base paths and same content roots
                 // or viceversa. Here we simply skip additional items that have the same base path and same content root.
-                if (!nodes.Exists(e => e.Attribute(BasePath).Value.Equals(normalizedBasePath, StringComparison.OrdinalIgnoreCase)))
+                if (!nodes.Exists(e => e.Attribute("BasePath").Value.Equals(normalizedBasePath, StringComparison.OrdinalIgnoreCase) &&
+                    e.Attribute("Path").Value.Equals(normalizedContentRoot, StringComparison.OrdinalIgnoreCase)))
                 {
                     nodes.Add(new XElement("ContentRoot",
                         new XAttribute("BasePath", normalizedBasePath),
-                        new XAttribute("Path", contentRoot)));
+                        new XAttribute("Path", normalizedContentRoot)));
                 }
             }
 
@@ -102,7 +109,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             {
                 var contentRootDefinition = ContentRootDefinitions[i];
                 if (!EnsureRequiredMetadata(contentRootDefinition, BasePath) ||
-                    !EnsureRequiredMetadata(contentRootDefinition, ContentRoot))
+                    !EnsureRequiredMetadata(contentRootDefinition, ContentRoot) ||
+                    !EnsureRequiredMetadata(contentRootDefinition, SourceId))
                 {
                     return false;
                 }
@@ -126,23 +134,35 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 var contentRootDefinition = ContentRootDefinitions[i];
                 var basePath = contentRootDefinition.GetMetadata(BasePath);
                 var contentRoot = contentRootDefinition.GetMetadata(ContentRoot);
+                var sourceId = contentRootDefinition.GetMetadata(SourceId);
 
                 if (basePaths.TryGetValue(basePath, out var existingBasePath))
                 {
                     var existingBasePathContentRoot = existingBasePath.GetMetadata(ContentRoot);
-                    if (!string.Equals(contentRoot, existingBasePathContentRoot, StringComparison.OrdinalIgnoreCase))
+                    var existingSourceId = existingBasePath.GetMetadata(SourceId);
+                    if (!string.Equals(contentRoot, existingBasePathContentRoot, StringComparison.OrdinalIgnoreCase) &&
+                        // We want to check this case to allow for client-side blazor projects to have multiple different content
+                        // root sources exposed under the same base path while still requiring unique base paths/content roots across
+                        // project/package boundaries.
+                        !string.Equals(sourceId, existingSourceId, StringComparison.OrdinalIgnoreCase))
                     {
                         // Case:
-                        // Item1: /_content/Library, /package/aspnetContent1
-                        // Item2: /_content/Library, /package/aspnetContent2
+                        // Item2: /_content/Library, project:/project/aspnetContent2
+                        // Item1: /_content/Library, package:/package/aspnetContent1
                         Log.LogError($"Duplicate base paths '{basePath}' for content root paths '{contentRoot}' and '{existingBasePathContentRoot}'. " +
                             $"('{contentRootDefinition.ItemSpec}', '{existingBasePath.ItemSpec}')");
                         return false;
                     }
+
                     // It was a duplicate, so we skip it.
                     // Case:
-                    // Item1: /_content/Library, /package/aspnetContent
-                    // Item2: /_content/Library, /package/aspnetContent
+                    // Item1: /_content/Library, project:/project/aspnetContent
+                    // Item2: /_content/Library, project:/project/aspnetContent
+
+                    // It was a separate content root exposed from the same project/package, so we skip it.
+                    // Case:
+                    // Item1: /_content/Library, project:/project/aspnetContent/bin/debug/netstandard2.1/dist
+                    // Item2: /_content/Library, project:/project/wwwroot
                 }
                 else
                 {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/ValidateStaticWebAssetsUniquePaths.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/ValidateStaticWebAssetsUniquePaths.cs
new file mode 100644
index 0000000000..23ec446549
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/ValidateStaticWebAssetsUniquePaths.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class ValidateStaticWebAssetsUniquePaths : Task
+    {
+        private const string BasePath = "BasePath";
+        private const string RelativePath = "RelativePath";
+        private const string TargetPath = "TargetPath";
+
+        [Required]
+        public ITaskItem[] StaticWebAssets { get; set; }
+
+        [Required]
+        public ITaskItem[] WebRootFiles { get; set; }
+
+        public override bool Execute()
+        {
+            var assetsByWebRootPaths = new Dictionary<string, ITaskItem>(StringComparer.OrdinalIgnoreCase);
+            for (var i = 0; i < StaticWebAssets.Length; i++)
+            {
+                var contentRootDefinition = StaticWebAssets[i];
+                if (!EnsureRequiredMetadata(contentRootDefinition, BasePath) ||
+                    !EnsureRequiredMetadata(contentRootDefinition, RelativePath))
+                {
+                    return false;
+                }
+                else
+                {
+                    var webRootPath = GetWebRootPath(
+                        contentRootDefinition.GetMetadata(BasePath),
+                        contentRootDefinition.GetMetadata(RelativePath));
+
+                    if (assetsByWebRootPaths.TryGetValue(webRootPath, out var existingWebRootPath))
+                    {
+                        if (!string.Equals(contentRootDefinition.ItemSpec, existingWebRootPath.ItemSpec, StringComparison.OrdinalIgnoreCase))
+                        {
+                            Log.LogError($"Conflicting assets with the same path '{webRootPath}' for content root paths '{contentRootDefinition.ItemSpec}' and '{existingWebRootPath.ItemSpec}'.");
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        assetsByWebRootPaths.Add(webRootPath, contentRootDefinition);
+                    }
+                }
+            }
+
+            for (var i = 0; i < WebRootFiles.Length; i++)
+            {
+                var webRootFile = WebRootFiles[i];
+                var relativePath = webRootFile.GetMetadata(TargetPath);
+                var webRootFileWebRootPath = GetWebRootPath("/", relativePath);
+                if (assetsByWebRootPaths.TryGetValue(webRootFileWebRootPath, out var existingAsset))
+                {
+                    Log.LogError($"The static web asset '{existingAsset.ItemSpec}' has a conflicting web root path '{webRootFileWebRootPath}' with the project file '{webRootFile.ItemSpec}'.");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        // Normalizes /base/relative \base\relative\ base\relative and so on to /base/relative
+        private string GetWebRootPath(string basePath, string relativePath) => $"/{Path.Combine(basePath, relativePath.TrimStart('.').TrimStart('/')).Replace("\\", "/").Trim('/')}";
+
+        private bool EnsureRequiredMetadata(ITaskItem item, string metadataName)
+        {
+            var value = item.GetMetadata(metadataName);
+            if (string.IsNullOrEmpty(value))
+            {
+                Log.LogError($"Missing required metadata '{metadataName}' for '{item.ItemSpec}'.");
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index a200ec63ab..d233f8682f 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -32,6 +32,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
     Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
 
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.Razor.Tasks.ValidateStaticWebAssetsUniquePaths"
+    AssemblyFile="$(RazorSdkBuildTasksAssembly)"
+    Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
+
   <UsingTask
     TaskName="Microsoft.AspNetCore.Razor.Tasks.GenerateStaticWebAsssetsPropsFile"
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
@@ -145,11 +150,12 @@ Copyright (c) .NET Foundation. All rights reserved.
         Condition="'%(SourceType)' != ''">
           <BasePath>%(StaticWebAsset.BasePath)</BasePath>
           <ContentRoot>%(StaticWebAsset.ContentRoot)</ContentRoot>
+          <SourceId>%(StaticWebAsset.SourceId)</SourceId>
       </_ExternalStaticWebAsset>
     </ItemGroup>
 
     <!-- We need a transform here to make sure we hash the metadata -->
-    <Hash ItemsToHash="@(_ExternalStaticWebAsset->'%(Identity)%(BasePath)%(ContentRoot)')">
+    <Hash ItemsToHash="@(_ExternalStaticWebAsset->'%(Identity)%(SourceId)%(BasePath)%(ContentRoot)')">
       <Output TaskParameter="HashResult" PropertyName="_StaticWebAssetsCacheHash" />
     </Hash>
 
@@ -181,6 +187,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     Outputs="$(_GeneratedStaticWebAssetsDevelopmentManifest)"
     DependsOnTargets="$(GenerateStaticWebAssetsManifestDependsOn)">
 
+    <ItemGroup>
+      <_WebRootFiles Include="@(ContentWithTargetPath)" Condition="$([System.String]::Copy('%(TargetPath)').Replace('\','/').StartsWith('wwwroot/'))" />
+      <_ReferencedStaticWebAssets Include="@(StaticWebAsset)" Condition="'%(SourceType)' != ''" />
+    </ItemGroup>
+
+    <ValidateStaticWebAssetsUniquePaths
+      StaticWebAssets="@(_ReferencedStaticWebAssets)"
+      WebRootFiles="@(_WebRootFiles)" />
+
     <GenerateStaticWebAssetsManifest
       ContentRootDefinitions="@(_ExternalStaticWebAsset)"
       TargetManifestPath="$(_GeneratedStaticWebAssetsDevelopmentManifest)" />
@@ -273,7 +288,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
       <_ThisProjectStaticWebAsset
         Include="@(Content)"
-        Condition="$([System.String]::Copy('%(Identity)').StartsWith('wwwroot'))">
+        Condition="$([System.String]::Copy('%(Identity)').Replace('\','/').StartsWith('wwwroot/'))">
 
         <!-- Remove the wwwroot\ prefix -->
         <RelativePath>$([System.String]::Copy('%(Identity)').Substring(8))</RelativePath>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs
index 8bb80e5c2c..bc89a9b185 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/GenerateAspNetCoreStaticAssetsManifestTest.cs
@@ -89,12 +89,14 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                     CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
                     {
                         ["BasePath"] = "MyLibrary",
-                        ["ContentRoot"] = Path.Combine("nuget","MyLibrary")
+                        ["ContentRoot"] = Path.Combine("nuget", "MyLibrary"),
+                        ["SourceId"] = "MyLibrary"
                     }),
                     CreateItem(Path.Combine("wwwroot", "otherLib.js"), new Dictionary<string,string>
                     {
                         ["BasePath"] = "MyLibrary",
-                        ["ContentRoot"] = Path.Combine("nuget", "MyOtherLibrary")
+                        ["ContentRoot"] = Path.Combine("nuget", "MyOtherLibrary"),
+                        ["SourceId"] = "MyOtherLibrary"
                     })
                 }
             };
@@ -111,6 +113,58 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 message);
         }
 
+        [Fact]
+        public void AllowsMultipleContentRootsWithSameBasePath_ForTheSameSourceId()
+        {
+            // Arrange
+            var file = Path.GetTempFileName();
+            var expectedDocument = $@"<StaticWebAssets Version=""1.0"">
+  <ContentRoot BasePath=""Blazor.Client"" Path=""{Path.Combine(".", "nuget", $"Blazor.Client{Path.DirectorySeparatorChar}")}"" />
+  <ContentRoot BasePath=""Blazor.Client"" Path=""{Path.Combine(".", "nuget", "bin", "debug", $"netstandard2.1{Path.DirectorySeparatorChar}")}"" />
+</StaticWebAssets>";
+
+            var buildEngine = new Mock<IBuildEngine>();
+
+            var task = new GenerateStaticWebAssetsManifest
+            {
+                BuildEngine = buildEngine.Object,
+                ContentRootDefinitions = new TaskItem[]
+                {
+                    CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "Blazor.Client",
+                        ["ContentRoot"] = Path.Combine(".", "nuget","Blazor.Client"),
+                        ["SourceId"] = "Blazor.Client"
+                    }),
+                    CreateItem(Path.Combine("wwwroot", "otherLib.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "Blazor.Client",
+                        ["ContentRoot"] = Path.Combine(".", "nuget", "bin","debug","netstandard2.1"),
+                        ["SourceId"] = "Blazor.Client"
+                    })
+                },
+                TargetManifestPath = file
+            };
+
+            try
+            {
+                // Act
+                var result = task.Execute();
+
+                // Assert
+                Assert.True(result);
+                var document = File.ReadAllText(file);
+                Assert.Equal(expectedDocument, document);
+            }
+            finally
+            {
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+            }
+        }
+
         [Fact]
         public void ReturnsError_ForDuplicateContentRoots()
         {
@@ -128,11 +182,13 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                     CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
                     {
                         ["BasePath"] = "MyLibrary",
+                        ["SourceId"] = "MyLibrary",
                         ["ContentRoot"] = Path.Combine(".", "MyLibrary")
                     }),
                     CreateItem(Path.Combine("wwwroot", "otherLib.js"), new Dictionary<string,string>
                     {
                         ["BasePath"] = "MyOtherLibrary",
+                        ["SourceId"] = "MyOtherLibrary",
                         ["ContentRoot"] = Path.Combine(".", "MyLibrary")
                     })
                 }
@@ -191,7 +247,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             // Arrange
             var file = Path.GetTempFileName();
             var expectedDocument = $@"<StaticWebAssets Version=""1.0"">
-  <ContentRoot BasePath=""MyLibrary"" Path=""{Path.Combine(".", "nuget", "MyLibrary", "razorContent")}"" />
+  <ContentRoot BasePath=""MyLibrary"" Path=""{Path.Combine(".", "nuget", "MyLibrary", $"razorContent{Path.DirectorySeparatorChar}")}"" />
 </StaticWebAssets>";
 
             try
@@ -206,7 +262,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                         CreateItem(Path.Combine("wwwroot","sample.js"), new Dictionary<string,string>
                         {
                             ["BasePath"] = "MyLibrary",
-                            ["ContentRoot"] = Path.Combine(".", "nuget", "MyLibrary", "razorContent")
+                            ["ContentRoot"] = Path.Combine(".", "nuget", "MyLibrary", "razorContent"),
+                            ["SourceId"] = "MyLibrary"
                         }),
                     },
                     TargetManifestPath = file
@@ -235,7 +292,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             // Arrange
             var file = Path.GetTempFileName();
             var expectedDocument = $@"<StaticWebAssets Version=""1.0"">
-  <ContentRoot BasePath=""Base/MyLibrary"" Path=""{Path.Combine(".", "nuget", "MyLibrary", "razorContent")}"" />
+  <ContentRoot BasePath=""Base/MyLibrary"" Path=""{Path.Combine(".", "nuget", "MyLibrary", $"razorContent{Path.DirectorySeparatorChar}")}"" />
 </StaticWebAssets>";
 
             try
@@ -251,12 +308,14 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                         {
                             // Base path needs to be normalized to '/' as it goes in the url
                             ["BasePath"] = "Base\\MyLibrary",
+                            ["SourceId"] = "MyLibrary",
                             ["ContentRoot"] = Path.Combine(".", "nuget", "MyLibrary", "razorContent")
                         }),
                         // Comparisons are case insensitive
                         CreateItem(Path.Combine("wwwroot, site.css"), new Dictionary<string,string>
                         {
                             ["BasePath"] = "Base\\MyLIBRARY",
+                            ["SourceId"] = "MyLibrary",
                             ["ContentRoot"] = Path.Combine(".", "nuget", "MyLIBRARY", "razorContent")
                         }),
                     },
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ValidateStaticWebAssetsUniquePathsTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ValidateStaticWebAssetsUniquePathsTest.cs
new file mode 100644
index 0000000000..a1a7a09337
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ValidateStaticWebAssetsUniquePathsTest.cs
@@ -0,0 +1,141 @@
+// 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.Collections.Generic;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Tasks
+{
+    public class ValidateStaticWebAssetsUniquePathsTest
+    {
+        [Fact]
+        public void ReturnsError_WhenStaticWebAssetsWebRootPathMatchesExistingContentItemPath()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new ValidateStaticWebAssetsUniquePaths
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine(".", "Library", "wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "/",
+                        ["RelativePath"] = "/sample.js",
+                    })
+                },
+                WebRootFiles = new TaskItem[]
+                {
+                    CreateItem(Path.Combine(".", "App", "wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["TargetPath"] = "/SAMPLE.js",
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"The static web asset '{Path.Combine(".", "Library", "wwwroot", "sample.js")}' has a conflicting web root path '/SAMPLE.js' with the project file '{Path.Combine(".", "App", "wwwroot", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void ReturnsError_WhenMultipleStaticWebAssetsHaveTheSameWebRootPath()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+            buildEngine.Setup(e => e.LogErrorEvent(It.IsAny<BuildErrorEventArgs>()))
+                .Callback<BuildErrorEventArgs>(args => errorMessages.Add(args.Message));
+
+            var task = new ValidateStaticWebAssetsUniquePaths
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine(".", "Library", "wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "/",
+                        ["RelativePath"] = "/sample.js",
+                    }),
+                    CreateItem(Path.Combine(".", "Library", "bin", "dist", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "/",
+                        ["RelativePath"] = "/sample.js",
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            var message = Assert.Single(errorMessages);
+            Assert.Equal($"Conflicting assets with the same path '/sample.js' for content root paths '{Path.Combine(".", "Library", "bin", "dist", "sample.js")}' and '{Path.Combine(".", "Library", "wwwroot", "sample.js")}'.", message);
+        }
+
+        [Fact]
+        public void ReturnsSuccess_WhenStaticWebAssetsDontConflictWithApplicationContentItems()
+        {
+            // Arrange
+            var errorMessages = new List<string>();
+            var buildEngine = new Mock<IBuildEngine>();
+
+            var task = new ValidateStaticWebAssetsUniquePaths
+            {
+                BuildEngine = buildEngine.Object,
+                StaticWebAssets = new TaskItem[]
+                {
+                    CreateItem(Path.Combine(".", "Library", "wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "/_library",
+                        ["RelativePath"] = "/sample.js",
+                    }),
+                    CreateItem(Path.Combine(".", "Library", "wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["BasePath"] = "/_library",
+                        ["RelativePath"] = "/sample.js",
+                    })
+                },
+                WebRootFiles = new TaskItem[]
+                {
+                    CreateItem(Path.Combine(".", "App", "wwwroot", "sample.js"), new Dictionary<string,string>
+                    {
+                        ["TargetPath"] = "/SAMPLE.js",
+                    })
+                }
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        private static TaskItem CreateItem(
+            string spec,
+            IDictionary<string, string> metadata)
+        {
+            var result = new TaskItem(spec);
+            foreach (var (key, value) in metadata)
+            {
+                result.SetMetadata(key, value);
+            }
+
+            return result;
+        }
+    }
+}

From 91efa9310f80d08bd4235197edcd8c4035a0628c Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Fri, 13 Dec 2019 16:58:27 -0800
Subject: [PATCH 302/337] TagHelper QuickInfo (dotnet/aspnetcore-tooling#1443)

Add Hover support for TagHelpers and Components\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c7815ea4f2e52697d621b32c013b0ae7cc9544ec
---
 .../test/LegacySectionTargetExtensionTest.cs    |  2 +-
 .../test/DefaultExtensionAssemblyLoaderTest.cs  |  2 +-
 .../TagHelpers/EnvironementTagHelper.cs         | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/Razor/test/testassets/SimpleMvc22/TagHelpers/EnvironementTagHelper.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
index bef1d0718f..edf09ff60a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 ";
 
             var output = context.CodeWriter.GenerateCode();
-            Assert.Equal(expected, output);
+            Assert.Equal(expected, output, ignoreLineEndingDifferences: true);
         }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
index ad619e5570..2997bd08b3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
@@ -121,7 +121,7 @@ Delta: Gamma: Beta: Test B
 
                 var actual = builder.ToString();
 
-                Assert.Equal(expected, actual);
+                Assert.Equal(expected, actual, ignoreLineEndingDifferences: true);
             }
         }
     }
diff --git a/src/Razor/test/testassets/SimpleMvc22/TagHelpers/EnvironementTagHelper.cs b/src/Razor/test/testassets/SimpleMvc22/TagHelpers/EnvironementTagHelper.cs
new file mode 100644
index 0000000000..cca753a803
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc22/TagHelpers/EnvironementTagHelper.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+// Used for testing purposes to verify multiple TagHelpers applying to a single element.
+namespace SimpleMvc22.TagHelpers
+{
+    /// <summary>
+    /// I made it!
+    /// </summary>
+    [HtmlTargetElement("environment")]
+    public class EnvironmentTagHelper : TagHelper
+    {
+        /// <summary>
+        /// Exclude it!
+        /// </summary>
+        public string Exclude {get; set;}
+    }
+}
\ No newline at end of file

From 52b9fd85a2914dd4e9312aa1bc45d950bddccd79 Mon Sep 17 00:00:00 2001
From: Kevin Pilch <kevinpi@microsoft.com>
Date: Wed, 8 Jan 2020 16:51:55 -0800
Subject: [PATCH 303/337] Update links for repo moves/renames
 (dotnet/aspnetcore-tooling#1474)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/fae9a5fdbc19edcf5b59a093ce347897a78b0386
---
 .../test/Components/ComponentMarkupBlockPassTest.cs         | 4 ++--
 .../IntegrationTests/ComponentCodeGenerationTestBase.cs     | 6 +++---
 .../IntegrationTests/ComponentDeclarationIntegrationTest.cs | 2 +-
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets   | 2 +-
 .../ApplicationPartDiscoveryIntegrationTest.cs              | 4 ++--
 .../test/IntegrationTests/BuildIntegrationTest.cs           | 6 +++---
 .../test/IntegrationTests/BuildIntrospectionTest.cs         | 2 +-
 .../test/IntegrationTests/PublishIntegrationTest.cs         | 2 +-
 .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs | 4 ++--
 .../Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs   | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
index ca9885009a..365b7909f9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 
             Pass.Engine = Engine;
         }
-        
+
         private DefaultRazorProjectEngine ProjectEngine { get; }
 
         private RazorEngine Engine { get; }
@@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
         }
 
-        // See: https://github.com/aspnet/AspNetCore/issues/6480
+        // See: https://github.com/dotnet/aspnetcore/issues/6480
         [Fact]
         public void Execute_RewritesHtml_HtmlAttributePrefix()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 1fde6741b2..b9fb0e4020 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -5120,7 +5120,7 @@ namespace Test
             CompileToAssembly(generated);
         }
 
-        [Fact] // https://github.com/aspnet/Blazor/issues/597
+        [Fact] // https://github.com/dotnet/blazor/issues/597
         public void Regression_597()
         {
             // Arrange
@@ -5186,7 +5186,7 @@ namespace Test
             CompileToAssembly(generated);
         }
 
-        [Fact] // https://github.com/aspnet/Blazor/issues/772
+        [Fact] // https://github.com/dotnet/blazor/issues/772
         public void Regression_772()
         {
             // Arrange
@@ -5224,7 +5224,7 @@ Welcome to your new app.
                 d => Assert.Equal("RZ1035", d.Id));
         }
 
-        [Fact] // https://github.com/aspnet/Blazor/issues/773
+        [Fact] // https://github.com/dotnet/blazor/issues/773
         public void Regression_773()
         {
             // Arrange
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
index 94425c895b..8e9215906e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
@@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             Assert.Contains(typeof(IDoCoolThings), component.GetType().GetInterfaces());
         }
 
-        [Fact] // Regression test for https://github.com/aspnet/Blazor/issues/453
+        [Fact] // Regression test for https://github.com/dotnet/blazor/issues/453
         public void DeclarationConfiguration_FunctionsBlockHasLineMappings_MappingsApplyToError()
         {
             // Arrange & Act 1
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index e455f17f84..dfee69656f 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -516,7 +516,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!--
-    Temporarary workaround for https://github.com/aspnet/AspNetCore/issues/6859. This can be removed after a VS insertion with a newer copy of the DesignTime targets.
+    Temporarary workaround for https://github.com/dotnet/aspnetcore/issues/6859. This can be removed after a VS insertion with a newer copy of the DesignTime targets.
   -->
   <ItemGroup>
     <Content Update="$(_RazorComponentInclude)">
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index cdc3d1161d..f258b6eaa1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        // Regression test for https://github.com/aspnet/AspNetCore/issues/11315
+        // Regression test for https://github.com/dotnet/aspnetcore/issues/11315
         [Fact]
         [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
         public async Task BuildIncrementalism_CausingRecompilation_WhenApplicationPartAttributeIsGenerated()
@@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.AssemblyHasAttribute(result, Path.Combine(OutputPath, "AppWithP2PReference.dll"), "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/13303")]
         [InitializeTestProject("SimpleMvcFSharp", language: "F#", additionalProjects: "ClassLibrary")]
         public async Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttributeToNonCSharpProjects()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index 460da98477..598f21c93b 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -472,7 +472,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotContain(result, razorAssemblyInfo, "Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/13303")]
         [InitializeTestProject("SimpleMvcFSharp", language: "F#")]
         public async Task Build_SimpleMvcFSharp_NoopsWithoutFailing()
         {
@@ -639,14 +639,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
         }
 
-        [Fact(Skip = "Default C# version is 7.3 for netcoreapp3.1 and later https://github.com/aspnet/AspNetCore/issues/13930")]
+        [Fact(Skip = "Default C# version is 7.3 for netcoreapp3.1 and later https://github.com/dotnet/aspnetcore/issues/13930")]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_ImplicitCSharp8_NullableEnforcement_WarningsDuringBuild_NoBuildServer()
         {
             var result = await DotnetMSBuild(
                 "Build",
                 // Remove /p:LangVersion=Default once we've picked up a compiler that supports .NET 5.0.
-                // Tracked by https://github.com/aspnet/AspNetCore/issues/13304
+                // Tracked by https://github.com/dotnet/aspnetcore/issues/13304
                 "/p:Nullable=enable /p:LangVersion=Default",
                 suppressBuildServer: true);
             var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index fcb33acbf2..dad5b50ff9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -212,7 +212,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("SimpleMvc")]
         public async Task IntrospectJsonContentFiles_WithExcludeConfigFilesFromBuildOutputSet()
         {
-            // Verifies that the fix for https://github.com/aspnet/AspNetCore/issues/14017 works.
+            // Verifies that the fix for https://github.com/dotnet/aspnetcore/issues/14017 works.
             var result = await DotnetMSBuild("_IntrospectContentItems", "/p:ExcludeConfigFilesFromBuildOutput=true");
 
             Assert.BuildPassed(result);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index 828562ec9b..f17512a89d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -329,7 +329,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/13303")]
         [InitializeTestProject("SimpleMvcFSharp", language: "F#")]
         public async Task Publish_SimpleMvcFSharp_NoopsWithoutFailing()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index bc8b17d705..065107a52e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         public ITestOutputHelper Output { get; private set; }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/17233")]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/17233")]
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest()
         {
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/17233")]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/17233")]
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Rebuild_Success_RecreatesManifestAndCache()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
index 05dd86b430..5fcc9d1220 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ReferenceResolverTest.cs
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         [Fact]
         public void Resolve_Works_WhenAssemblyReferencesAreRecursive()
         {
-            // Test for https://github.com/aspnet/AspNetCore/issues/12693
+            // Test for https://github.com/dotnet/aspnetcore/issues/12693
             // Arrange
             var resolver = new TestReferencesToMvcResolver(new[]
             {

From 8ea0f36d39cee6fb6942523f0a02c65c681786a7 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 9 Jan 2020 13:30:28 -0800
Subject: [PATCH 304/337] Remove Test variant Newtonsoft.Json.

- Our Newtonsoft.Json versions are now aligned.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e7a506b1f4401b9fd0e1079c5af1424a987428f2
---
 .../test/Microsoft.AspNetCore.Razor.Language.Test.csproj         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index abdd61a8fd..120eee7bb4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -23,7 +23,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(TEST_NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 
 </Project>

From 18830cb2fe12eac74238567fcaa0cecd045bf703 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jkotalik12@gmail.com>
Date: Wed, 15 Jan 2020 10:31:41 -0800
Subject: [PATCH 305/337] Update BuildIntrospectionTest.cs\n\nCommit migrated
 from
 https://github.com/dotnet/aspnetcore-tooling/commit/6712efc3afdd9ca6adeb25999b7dd5b5b7bbedc5

---
 .../test/IntegrationTests/BuildIntrospectionTest.cs           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 629b376ef0..2f6c52ce96 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -235,8 +235,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 .Value;
 
             var tfm =
-#if NETCOREAPP3_1
-                "netcoreapp3.1";
+#if NETCOREAPP5_0
+                "netcoreapp5.0";
 #else
 #error Target framework needs to be updated.
 #endif

From 427ec8a4c7722e1e7ae08ee924b48b11a7568727 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 16 Jan 2020 17:28:38 -0800
Subject: [PATCH 306/337] Rely on regular restores for RID-specific package
 restores (dotnet/aspnetcore-tooling#1502)

* Rely on regular restores for RID-specific package restores

* Pin the runtime to a previously shippped version in SDK tests

* Update src/Razor/test/testapps/Directory.Build.targets
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/b0a60a0231d38642709c009431dbb72dcb1d96e6
---
 .../StaticWebAssetsIntegrationTest.cs         | 11 ++---
 ...AppWithPackageAndP2PReferenceAndRID.csproj | 41 +++++++++++++++++++
 .../Program.cs                                | 13 ++++++
 .../test/testassets/Directory.Build.targets   |  6 ++-
 .../RestoreTestProjects.csproj                |  1 +
 5 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
 create mode 100644 src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 7e6f0f40ce..1b1ee5ec7d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.CommandLineUtils;
 using Xunit;
 using Xunit.Abstractions;
@@ -83,15 +84,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, PublishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("AppWithPackageAndP2PReferenceAndRID", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_CopiesStaticWebAssetsToDestinationFolder_PublishSingleFile()
         {
-            var runtimeIdentifier = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "win-x64" : (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "osx-x64" : "linux-x64");
-            var result = await DotnetMSBuild("Publish", $"/restore /p:PublishSingleFile=true /p:RuntimeIdentifier={runtimeIdentifier}");
+            var result = await DotnetMSBuild("Publish", $"/restore /p:PublishSingleFile=true /p:ReferenceLocallyBuiltPackages=true");
 
             Assert.BuildPassed(result);
-            var publishOutputPath = GetRidSpecificPublishOutputPath(runtimeIdentifier);
+            var publishOutputPath = GetRidSpecificPublishOutputPath("win-x64");
             Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.js"));
             Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.v4.js"));
             Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "css", "site.css"));
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
new file mode 100644
index 0000000000..d657733943
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'=='' AND EXISTS('$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\')">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources)</RestoreAdditionalProjectSources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="PackageLibraryDirectDependency" Version="1.0.0" Condition="'$(ReferenceLocallyBuiltPackages)' == 'true'" />
+    <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll" />
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs
new file mode 100644
index 0000000000..dc3ac4e250
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs
@@ -0,0 +1,13 @@
+
+namespace AppWithP2PReference
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
index 1c03be36fc..c2b36add81 100644
--- a/src/Razor/test/testassets/Directory.Build.targets
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -2,7 +2,11 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreApp50PackageVersion)</RuntimeFrameworkVersion>
+    <!--
+      The runtime version is only useful to restore and compile test projects, and not used to run tests.
+      We'll keep it pinned to a version that has already been shipped.
+     -->
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 90b54c171b..3d29b2038c 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />
 
     <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" />
+    <ProjectReference Include="..\AppWithPackageAndP2PReferenceAndRID\AppWithPackageAndP2PReferenceAndRID.csproj" />
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
     <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
     <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />

From 4520c6498aa542ca6cf1a4158d996f789014ed2d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2020 17:55:52 -0800
Subject: [PATCH 307/337] [release/3.1] Update dependencies from
 dotnet/extensions (dotnet/aspnetcore-tooling#1496)

* Update dependencies from https://github.com/dotnet/extensions build 20200115.6

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20065.6
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20065.6
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20065.6
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20065.6
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20065.6
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.4 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/dotnet/extensions build 20200115.7

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20065.7
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20065.7
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20065.7
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20065.7
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20065.7
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.4 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/dotnet/extensions build 20200115.8

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20065.8
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20065.8
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20065.8
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20065.8
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20065.8
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.7 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/dotnet/extensions build 20200115.9

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20065.9
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20065.9
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20065.9
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20065.9
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20065.9
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.9 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/dotnet/extensions build 20200116.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20066.2
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20066.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20066.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20066.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20066.2
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.1 (parent: Microsoft.Extensions.Logging)

* Add System.Text.Json to nuget.config

* Update dependencies from https://github.com/dotnet/extensions build 20200116.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20066.3
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20066.3
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20066.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20066.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20066.3
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.1 (parent: Microsoft.Extensions.Logging)

* fix nuget.config

* Update dependencies from https://github.com/dotnet/extensions build 20200116.5

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20066.5
- Microsoft.AspNetCore.Testing - 3.1.2-servicing.20066.5
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20066.5
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.1.2-servicing.20066.5
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20066.5
- Microsoft.Extensions.Logging - 3.1.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.6 (parent: Microsoft.Extensions.Logging)

* fixup nuget.config

* Rely on regular restores for RID-specific package restores (dotnet/aspnetcore-tooling#1502)

* Rely on regular restores for RID-specific package restores

* Pin the runtime to a previously shippped version in SDK tests

* Update src/Razor/test/testapps/Directory.Build.targets

Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Pranav K <prkrishn@hotmail.com>
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/5fd301284eb58f9402374cf8f5a1b06440dc511e
---
 .../StaticWebAssetsIntegrationTest.cs         | 11 ++---
 ...AppWithPackageAndP2PReferenceAndRID.csproj | 41 +++++++++++++++++++
 .../Program.cs                                | 13 ++++++
 .../test/testassets/Directory.Build.targets   |  6 ++-
 .../RestoreTestProjects.csproj                |  1 +
 5 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
 create mode 100644 src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index cbaf6d7633..905d31f970 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.CommandLineUtils;
 using Xunit;
 using Xunit.Abstractions;
@@ -83,15 +84,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, PublishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("AppWithPackageAndP2PReferenceAndRID", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_CopiesStaticWebAssetsToDestinationFolder_PublishSingleFile()
         {
-            var runtimeIdentifier = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "win-x64" : (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "osx-x64" : "linux-x64");
-            var result = await DotnetMSBuild("Publish", $"/restore /p:PublishSingleFile=true /p:RuntimeIdentifier={runtimeIdentifier}");
+            var result = await DotnetMSBuild("Publish", $"/restore /p:PublishSingleFile=true /p:ReferenceLocallyBuiltPackages=true");
 
             Assert.BuildPassed(result);
-            var publishOutputPath = GetRidSpecificPublishOutputPath(runtimeIdentifier);
+            var publishOutputPath = GetRidSpecificPublishOutputPath("win-x64");
             Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.js"));
             Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary", "js", "project-transitive-dep.v4.js"));
             Assert.FileExists(result, publishOutputPath, Path.Combine("wwwroot", "_content", "ClassLibrary2", "css", "site.css"));
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
new file mode 100644
index 0000000000..d657733943
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'=='' AND EXISTS('$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\')">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources)</RestoreAdditionalProjectSources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
+    <FrameworkReference Remove="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="PackageLibraryDirectDependency" Version="1.0.0" Condition="'$(ReferenceLocallyBuiltPackages)' == 'true'" />
+    <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll" />
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs
new file mode 100644
index 0000000000..dc3ac4e250
--- /dev/null
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/Program.cs
@@ -0,0 +1,13 @@
+
+namespace AppWithP2PReference
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
index 4e299bd016..c2b36add81 100644
--- a/src/Razor/test/testassets/Directory.Build.targets
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -2,7 +2,11 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreApp31PackageVersion)</RuntimeFrameworkVersion>
+    <!--
+      The runtime version is only useful to restore and compile test projects, and not used to run tests.
+      We'll keep it pinned to a version that has already been shipped.
+     -->
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 90b54c171b..3d29b2038c 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />
 
     <ProjectReference Include="..\AppWithP2PReference\AppWithP2PReference.csproj" />
+    <ProjectReference Include="..\AppWithPackageAndP2PReferenceAndRID\AppWithPackageAndP2PReferenceAndRID.csproj" />
     <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
     <ProjectReference Include="..\ClassLibrary2\ClassLibrary2.csproj" />
     <ProjectReference Include="..\ClassLibraryMvc21\ClassLibraryMvc21.csproj" />

From 3ce497f20db7496414d7af6d9741aad87c76369e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 17 Jan 2020 10:35:11 -0800
Subject: [PATCH 308/337] Avoid restoring RID specific packs that don't exist.
 \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/182696308614677297a22affe249ca7af954048c

---
 .../AppWithPackageAndP2PReferenceAndRID.csproj              | 6 ++++++
 src/Razor/test/testassets/Directory.Build.targets           | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
index d657733943..c6d44d95f5 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
@@ -14,6 +14,12 @@
   <ItemGroup>
     <!-- Avoid referencing the AspNetCore framework since we want the ability to target work-in-progress shims -->
     <FrameworkReference Remove="Microsoft.AspNetCore.App" />
+
+    <!-- RID specific installs attempts to restore runtime packs which cause cyclical dependencies .-->
+    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
+    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
+    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets
index c2b36add81..1c03be36fc 100644
--- a/src/Razor/test/testassets/Directory.Build.targets
+++ b/src/Razor/test/testassets/Directory.Build.targets
@@ -2,11 +2,7 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <!--
-      The runtime version is only useful to restore and compile test projects, and not used to run tests.
-      We'll keep it pinned to a version that has already been shipped.
-     -->
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreApp50PackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>

From a30ed5c8412115563a0b2954e0d4495bd55b96d1 Mon Sep 17 00:00:00 2001
From: Kevin Pilch <kevinpi@microsoft.com>
Date: Thu, 23 Jan 2020 12:20:49 -0800
Subject: [PATCH 309/337] Update links for repo moves
 (dotnet/aspnetcore-tooling#1531)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6b8cdab2f3819ae872e25a0dbfc99ec3c1930f71
---
 .../src/Microsoft.AspNetCore.Razor.Tools.csproj             | 2 +-
 .../test/IntegrationTests/BuildIntrospectionTest.cs         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
index 5a08e5c723..a7a3a4d347 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -7,7 +7,7 @@
       This is intentionally targeting netcoreapp3.0. This allows using the Microsoft.NET.Sdk.Razor package without having to solve diamond dependency problems in AspNetCore.
       We use a runtimeconfig.json.template to allow roll forwards.
       In addition, the SDK stamps an exact version of the shared fx to use in all runtimeconfig.json that are contained in the SDK.
-      See the discussion here: https://github.com/aspnet/AspNetCore-Internal/issues/3201#issuecomment-539631557
+      See the discussion here: https://github.com/dotnet/aspnetcore-internal/issues/3201#issuecomment-539631557
     -->
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 2f6c52ce96..2e894fce62 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -229,7 +229,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("SimpleMvc")]
         public async Task IntrospectRazorTasksDllPath()
         {
-            // Regression test for https://github.com/aspnet/AspNetCore/issues/17308
+            // Regression test for https://github.com/dotnet/aspnetcore/issues/17308
             var solutionRoot = GetType().Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
                 .First(a => a.Key == "Testing.RepoRoot")
                 .Value;
@@ -243,7 +243,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             var expected = Path.Combine(solutionRoot, "artifacts", "bin", "Microsoft.NET.Sdk.Razor", Configuration, "sdk-output", "tasks", tfm, "Microsoft.NET.Sdk.Razor.Tasks.dll");
 
-            // Verifies the fix for https://github.com/aspnet/AspNetCore/issues/17308
+            // Verifies the fix for https://github.com/dotnet/aspnetcore/issues/17308
             var result = await DotnetMSBuild("_IntrospectRazorTasks");
 
             Assert.BuildPassed(result);
@@ -262,7 +262,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var tfm = "net46";
             var expected = Path.Combine(solutionRoot, "artifacts", "bin", "Microsoft.NET.Sdk.Razor", Configuration, "sdk-output", "tasks", tfm, "Microsoft.NET.Sdk.Razor.Tasks.dll");
 
-            // Verifies the fix for https://github.com/aspnet/AspNetCore/issues/17308
+            // Verifies the fix for https://github.com/dotnet/aspnetcore/issues/17308
             var result = await DotnetMSBuild("_IntrospectRazorTasks", msBuildProcessKind: MSBuildProcessKind.Desktop);
 
             Assert.BuildPassed(result);

From ef4151425a58f690ee2f52e3566b52845a481db9 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 23 Jan 2020 13:50:59 -0800
Subject: [PATCH 310/337] Skip
 Publish_CopiesStaticWebAssetsToDestinationFolder_PublishSingleFile.
 (dotnet/aspnetcore-tooling#1532)

This test has around a 50% pass rate. Always find myself having to retry builds to work around this. Skipping for now until flakyness can be resolved.

dotnet/AspNetCoredotnet/aspnetcore-tooling#18543\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/4187049b4f9768495b2df2b2041c9b5563f7446f
---
 .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 1b1ee5ec7d..34cba58b06 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, PublishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "Flaky test: https://github.com/dotnet/aspnetcore/issues/18543")]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("AppWithPackageAndP2PReferenceAndRID", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_CopiesStaticWebAssetsToDestinationFolder_PublishSingleFile()

From 3dd1427ad82dce7898b43950939c9b7e7dfbfde0 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 24 Jan 2020 10:40:36 -0800
Subject: [PATCH 311/337] Skip
 Publish_NoBuild_CopiesStaticWebAssetsToDestinationFolder.

- This test has around a pretty high failure rate. Always find myself having to retry builds to work around this. Skipping for now until flakyness can be resolved.

dotnet/aspnetcoredotnet/aspnetcore-tooling#18561
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/09514f5b4d35a92120398e82147f0f61f14e2b53
---
 .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 34cba58b06..da3d6c99c1 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
         }
 
-        [Fact]
+        [Fact(Skip = "Flaky test: https://github.com/dotnet/aspnetcore/issues/18561")]
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_NoBuild_CopiesStaticWebAssetsToDestinationFolder()
         {

From 07fcf46959a1b09756f326d8a29bad3ccb7bcc20 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Tue, 28 Jan 2020 17:17:47 -0800
Subject: [PATCH 312/337]  Supply the `PropertyName` for Context TagHelper
 results. (dotnet/aspnetcore-tooling#1545)

Supply the PropertyName for Context TagHelper results
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d5b77f46f96444b5e66f705acd99d5c6bb870c0f
---
 .../src/ComponentTagHelperDescriptorProvider.cs                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index ebc1947ca7..75569b2b3c 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -301,6 +301,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 b.Name = ComponentMetadata.ChildContent.ParameterAttributeName;
                 b.TypeName = typeof(string).FullName;
                 b.Metadata.Add(ComponentMetadata.Component.ChildContentParameterNameKey, bool.TrueString);
+                b.Metadata.Add(TagHelperMetadata.Common.PropertyName, b.Name);
 
                 if (childContentName == null)
                 {

From a32887aec4a2f351430fe01459c69d028f2d202b Mon Sep 17 00:00:00 2001
From: Ajay Bhargav B <ajbaaska@microsoft.com>
Date: Thu, 30 Jan 2020 18:24:32 -0800
Subject: [PATCH 313/337] Sync client settings with LSP server
 (dotnet/aspnetcore-tooling#1549)

* Sync client settings with LSP server

* feedback

* Skip flaky test https://github.com/dotnet/aspnetcore/issues/18707

* Cleanup

* Make it abstract for consistency
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/9a05bd16c6f075f90ae2fe7ae0b9ab03199eb9b6
---
 .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index da3d6c99c1..b87b87a662 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, publishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact]
+        [Fact(Skip = "flaky test: https://github.com/dotnet/aspnetcore/issues/18707")]
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_WithBuildReferencesDisabled_CopiesStaticWebAssetsToDestinationFolder()
         {

From 718a130b3f558bb0272b1c4b635ded5ab699d212 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 6 Feb 2020 16:44:48 -0800
Subject: [PATCH 314/337] Fix # in FilePath (dotnet/aspnetcore-tooling#1553)

Fix # in FilePath
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d29c3b2f12a0a474b39383e9150fce395c49de53
---
 .../testassets/MvcWithComponents/Views/Home/#FileName.cshtml     | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml

diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml
new file mode 100644
index 0000000000..c227f7c471
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml
@@ -0,0 +1 @@
+@page "/filename"

From 2be31713ce3ce937b00d1a74163afeb77f3e9437 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav B <ajbaaska@microsoft.com>
Date: Mon, 10 Feb 2020 12:56:51 -0800
Subject: [PATCH 315/337] Upgrade roslyn deps to 3.4.0
 (dotnet/aspnetcore-tooling#1564)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/6cd4f21348120b54ed8e669c98ff983365b07e5e
---
 ...ViewComponentTagHelperDescriptorFactory.cs | 16 +++++++-------
 .../src/ViewComponentTypeVisitor.cs           |  2 +-
 ...ViewComponentTagHelperDescriptorFactory.cs | 16 +++++++-------
 .../src/ViewComponentTypeVisitor.cs           |  2 +-
 ...ViewComponentTagHelperDescriptorFactory.cs | 16 +++++++-------
 .../src/ViewComponentTypeVisitor.cs           |  2 +-
 .../src/BindTagHelperDescriptorProvider.cs    |  6 ++---
 .../ComponentTagHelperDescriptorProvider.cs   | 12 +++++-----
 .../src/DefaultTagHelperDescriptorFactory.cs  | 22 +++++++++----------
 ...EventHandlerTagHelperDescriptorProvider.cs |  2 +-
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
index 06b5bed18f..795786f5b8 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -110,11 +110,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
             {
                 // Will invoke asynchronously. Method must not return Task or Task<T>.
-                if (Equals(returnType, _taskSymbol))
+                if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
                 {
                     // This is ok.
                 }
-                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
+                else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     // This is ok.
                 }
@@ -134,13 +134,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                     method = null;
                     return false;
                 }
-                else if (Equals(returnType, _taskSymbol))
+                else if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
                     return false;
                 }
-                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
+                else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
@@ -208,13 +208,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
         private string GetIndexerValueTypeName(IParameterSymbol parameter)
         {
             INamedTypeSymbol dictionaryType;
-            if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
+            if (SymbolEqualityComparer.Default.Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)parameter.Type;
             }
-            else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
+            else if (parameter.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
+                dictionaryType = parameter.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -234,7 +234,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
 
         private string GetShortName(INamedTypeSymbol componentType)
         {
-            var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
             var name = viewComponentAttribute
                 ?.NamedArguments
                 .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
index 916bc60653..450e4e1557 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
                 return false;
             }
 
-            var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
+            var attribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
 
             if (attribute != null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
index 75b4cd62be..ef989c3f7f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -104,11 +104,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
             if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
             {
                 // Will invoke asynchronously. Method must not return Task or Task<T>.
-                if (Equals(returnType, _taskSymbol))
+                if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
                 {
                     // This is ok.
                 }
-                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
+                else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     // This is ok.
                 }
@@ -128,13 +128,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
                     method = null;
                     return false;
                 }
-                else if (Equals(returnType, _taskSymbol))
+                else if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
                     return false;
                 }
-                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
+                else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
@@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
         private string GetIndexerValueTypeName(IParameterSymbol parameter)
         {
             INamedTypeSymbol dictionaryType;
-            if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
+            if (SymbolEqualityComparer.Default.Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)parameter.Type;
             }
-            else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
+            else if (parameter.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
+                dictionaryType = parameter.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 
         private string GetShortName(INamedTypeSymbol componentType)
         {
-            var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
             var name = viewComponentAttribute
                 ?.NamedArguments
                 .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
index 0281880866..1d7463884c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
                 return false;
             }
 
-            var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
+            var attribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
 
             if (attribute != null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
index aaa765fb63..c266d7541d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
@@ -104,11 +104,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
             {
                 // Will invoke asynchronously. Method must not return Task or Task<T>.
-                if (Equals(returnType, _taskSymbol))
+                if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
                 {
                     // This is ok.
                 }
-                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
+                else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     // This is ok.
                 }
@@ -128,13 +128,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                     method = null;
                     return false;
                 }
-                else if (Equals(returnType, _taskSymbol))
+                else if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
                     return false;
                 }
-                else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
+                else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
                 {
                     diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
                     method = null;
@@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         private string GetIndexerValueTypeName(IParameterSymbol parameter)
         {
             INamedTypeSymbol dictionaryType;
-            if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
+            if (SymbolEqualityComparer.Default.Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)parameter.Type;
             }
-            else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
+            else if (parameter.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
+                dictionaryType = parameter.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         private string GetShortName(INamedTypeSymbol componentType)
         {
-            var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
             var name = viewComponentAttribute
                 ?.NamedArguments
                 .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
index 498b28fdc2..8c7a3b4065 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 return false;
             }
 
-            var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
+            var attribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
 
             if (attribute != null)
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
index e21332c150..05dea796a6 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -235,7 +235,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
                     // We need to check the constructor argument length here, because this can show up as 0
                     // if the language service fails to initialize. This is an invalid case, so skip it.
-                    if (Equals(attribute.AttributeClass, bindElement) && attribute.ConstructorArguments.Length == 4)
+                    if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, bindElement) && attribute.ConstructorArguments.Length == 4)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
@@ -246,7 +246,7 @@ namespace Microsoft.CodeAnalysis.Razor
                             (string)attribute.ConstructorArguments[2].Value,
                             (string)attribute.ConstructorArguments[3].Value));
                     }
-                    else if (Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 4)
+                    else if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 4)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
@@ -257,7 +257,7 @@ namespace Microsoft.CodeAnalysis.Razor
                             (string)attribute.ConstructorArguments[2].Value,
                             (string)attribute.ConstructorArguments[3].Value));
                     }
-                    else if (Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 6)
+                    else if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 6)
                     {
                         results.Add(new ElementBindData(
                             type.ContainingAssembly.Name,
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
index 75569b2b3c..38fbfb6ba8 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -328,7 +328,7 @@ namespace Microsoft.CodeAnalysis.Razor
             var properties = new Dictionary<string, (IPropertySymbol, PropertyKind)>(StringComparer.Ordinal);
             do
             {
-                if (Equals(type, symbols.ComponentBase))
+                if (SymbolEqualityComparer.Default.Equals(type, symbols.ComponentBase))
                 {
                     // The ComponentBase base class doesn't have any [Parameter].
                     // Bail out now to avoid walking through its many members, plus the members
@@ -381,7 +381,7 @@ namespace Microsoft.CodeAnalysis.Razor
                         kind = PropertyKind.Ignored;
                     }
 
-                    if (!property.GetAttributes().Any(a => Equals(a.AttributeClass, symbols.ParameterAttribute)))
+                    if (!property.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, symbols.ParameterAttribute)))
                     {
                         if (property.IsOverride)
                         {
@@ -399,7 +399,7 @@ namespace Microsoft.CodeAnalysis.Razor
                         kind = PropertyKind.Enum;
                     }
 
-                    if (kind == PropertyKind.Default && Equals(property.Type, symbols.RenderFragment))
+                    if (kind == PropertyKind.Default && SymbolEqualityComparer.Default.Equals(property.Type, symbols.RenderFragment))
                     {
                         kind = PropertyKind.ChildContent;
                     }
@@ -407,12 +407,12 @@ namespace Microsoft.CodeAnalysis.Razor
                     if (kind == PropertyKind.Default &&
                         property.Type is INamedTypeSymbol namedType &&
                         namedType.IsGenericType &&
-                        Equals(namedType.ConstructedFrom, symbols.RenderFragmentOfT))
+                        SymbolEqualityComparer.Default.Equals(namedType.ConstructedFrom, symbols.RenderFragmentOfT))
                     {
                         kind = PropertyKind.ChildContent;
                     }
 
-                    if (kind == PropertyKind.Default && Equals(property.Type, symbols.EventCallback))
+                    if (kind == PropertyKind.Default && SymbolEqualityComparer.Default.Equals(property.Type, symbols.EventCallback))
                     {
                         kind = PropertyKind.EventCallback;
                     }
@@ -420,7 +420,7 @@ namespace Microsoft.CodeAnalysis.Razor
                     if (kind == PropertyKind.Default &&
                         property.Type is INamedTypeSymbol namedType2 &&
                         namedType2.IsGenericType &&
-                        Equals(namedType2.ConstructedFrom, symbols.EventCallbackOfT))
+                        SymbolEqualityComparer.Default.Equals(namedType2.ConstructedFrom, symbols.EventCallbackOfT))
                     {
                         kind = PropertyKind.EventCallback;
                     }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
index 17924a0018..4eb83b36b7 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorFactory.cs
@@ -80,7 +80,7 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             var targetElementAttributes = type
                 .GetAttributes()
-                .Where(attribute => Equals(attribute.AttributeClass, _htmlTargetElementAttributeSymbol));
+                .Where(attribute => SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, _htmlTargetElementAttributeSymbol));
 
             // If there isn't an attribute specifying the tag name derive it from the name
             if (!targetElementAttributes.Any())
@@ -139,7 +139,7 @@ namespace Microsoft.CodeAnalysis.Razor
 
         private void AddAllowedChildren(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
         {
-            var restrictChildrenAttribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, _restrictChildrenAttributeSymbol)).FirstOrDefault();
+            var restrictChildrenAttribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _restrictChildrenAttributeSymbol)).FirstOrDefault();
             if (restrictChildrenAttribute == null)
             {
                 return;
@@ -174,7 +174,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private void AddTagOutputHint(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
         {
             string outputElementHint = null;
-            var outputElementHintAttribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, _outputElementHintAttributeSymbol)).FirstOrDefault();
+            var outputElementHintAttribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _outputElementHintAttributeSymbol)).FirstOrDefault();
             if (outputElementHintAttribute != null)
             {
                 outputElementHint = (string)(outputElementHintAttribute.ConstructorArguments[0]).Value;
@@ -189,7 +189,7 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             var attributeNameAttribute = property
                 .GetAttributes()
-                .Where(a => Equals(a.AttributeClass, _htmlAttributeNameAttributeSymbol))
+                .Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _htmlAttributeNameAttributeSymbol))
                 .FirstOrDefault();
 
             bool hasExplicitName;
@@ -310,13 +310,13 @@ namespace Microsoft.CodeAnalysis.Razor
         private IReadOnlyList<ITypeSymbol> GetDictionaryArgumentTypes(IPropertySymbol property)
         {
             INamedTypeSymbol dictionaryType;
-            if (Equals((property.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
+            if (SymbolEqualityComparer.Default.Equals((property.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
             {
                 dictionaryType = (INamedTypeSymbol)property.Type;
             }
-            else if (property.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
+            else if (property.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
             {
-                dictionaryType = property.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
+                dictionaryType = property.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
             }
             else
             {
@@ -380,7 +380,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private bool IsPotentialDictionaryProperty(IPropertySymbol property)
         {
             return
-                (Equals((property.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol) || property.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol))) &&
+                (SymbolEqualityComparer.Default.Equals((property.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol) || property.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol))) &&
                 GetDictionaryArgumentTypes(property)?[0].SpecialType == SpecialType.System_String;
         }
 
@@ -397,8 +397,8 @@ namespace Microsoft.CodeAnalysis.Razor
                         property.Parameters.Length == 0 &&
                         property.GetMethod != null &&
                         property.GetMethod.DeclaredAccessibility == Accessibility.Public &&
-                        property.GetAttributes().Where(a => Equals(a.AttributeClass, _htmlAttributeNotBoundAttributeSymbol)).FirstOrDefault() == null &&
-                        (property.GetAttributes().Any(a => Equals(a.AttributeClass, _htmlAttributeNameAttributeSymbol)) ||
+                        property.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _htmlAttributeNotBoundAttributeSymbol)).FirstOrDefault() == null &&
+                        (property.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _htmlAttributeNameAttributeSymbol)) ||
                         property.SetMethod != null && property.SetMethod.DeclaredAccessibility == Accessibility.Public ||
                         IsPotentialDictionaryProperty(property)) &&
                         !accessibleProperties.ContainsKey(property.Name))
@@ -418,7 +418,7 @@ namespace Microsoft.CodeAnalysis.Razor
         {
             if (ExcludeHidden)
             {
-                var editorBrowsableAttribute = symbol.GetAttributes().Where(a => Equals(a.AttributeClass, _editorBrowsableAttributeSymbol)).FirstOrDefault();
+                var editorBrowsableAttribute = symbol.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _editorBrowsableAttributeSymbol)).FirstOrDefault();
 
                 if (editorBrowsableAttribute == null)
                 {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
index 5522b50163..9f5cf0d20a 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -81,7 +81,7 @@ namespace Microsoft.CodeAnalysis.Razor
                 {
                     var attribute = attributes[j];
 
-                    if (Equals(attribute.AttributeClass, eventHandlerAttribute))
+                    if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, eventHandlerAttribute))
                     {
                         var enablePreventDefault = false;
                         var enableStopPropagation = false;

From e4fb1d44cee27564cde27a84baca34434b58729e Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 11 Oct 2019 14:26:03 -0700
Subject: [PATCH 316/337] Revert "Remove 1.x tests
 (dotnet/aspnetcore-tooling#1169)"

This reverts commit dotnet/aspnetcore-tooling@bd71bcf87b1c9a9401454c2df9ebed1f8157f91e.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/61b1896d00511a37d97cfadff9237099e5628c9c
---
 .../BuildIntegrationTest11.cs                 |  58 ++++++++++
 .../RestoreTestProjects.csproj                |   2 +
 .../test/testassets/SimpleMvc11/Program.cs    |  13 +++
 .../testassets/SimpleMvc11/SimpleMvc11.csproj |  23 ++++
 .../SimpleMvc11/Views/Home/Index.cshtml       | 108 ++++++++++++++++++
 .../SimpleMvc11/Views/Shared/_Layout.cshtml   |  71 ++++++++++++
 .../SimpleMvc11/Views/_ViewImports.cshtml     |   3 +
 .../SimpleMvc11/Views/_ViewStart.cshtml       |   3 +
 .../testassets/SimpleMvc11NetFx/Program.cs    |  13 +++
 .../SimpleMvc11NetFx/SimpleMvc11NetFx.csproj  |  19 +++
 .../SimpleMvc11NetFx/Views/Home/Index.cshtml  | 108 ++++++++++++++++++
 .../Views/Shared/_Layout.cshtml               |  71 ++++++++++++
 .../Views/_ViewImports.cshtml                 |   2 +
 .../SimpleMvc11NetFx/Views/_ViewStart.cshtml  |   3 +
 14 files changed, 497 insertions(+)
 create mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
 create mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
new file mode 100644
index 0000000000..dc7d470a3c
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -0,0 +1,58 @@
+// 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.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildIntegrationTest11 : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildIntegrationTest11(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc11")]
+        public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects()
+        {
+            var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems");
+
+            Assert.BuildPassed(result);
+            Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor");
+            Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
+        }
+
+        [Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")]
+        [InitializeTestProject("SimpleMvc11")]
+        public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects()
+        {
+            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1";
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc11.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.pdb");
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+
+        [InitializeTestProject("SimpleMvc11NetFx")]
+        public async Task RazorSdk_DoesNotBuildViewsForNetFx11Projects()
+        {
+            MSBuildIntegrationTestBase.TargetFramework = "net461";
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.exe");
+            Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.pdb");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.dll");
+            Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.pdb");
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index 3d29b2038c..d639324487 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -4,6 +4,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
+    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
     <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
     <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
     <ProjectReference Include="..\SimpleMvc22NetFx\SimpleMvc22NetFx.csproj" />
diff --git a/src/Razor/test/testassets/SimpleMvc11/Program.cs b/src/Razor/test/testassets/SimpleMvc11/Program.cs
new file mode 100644
index 0000000000..5fbbd9ded7
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc11
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to MVC 1.1
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj b/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
new file mode 100644
index 0000000000..b1523f9512
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC and should not reference local builds of
+    the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.8">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..2172e5e566
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc11</title>
+
+    <environment names="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment names="Staging,Production">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc11</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2018 - SimpleMvc11</p>
+        </footer>
+    </div>
+
+    <environment names="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment names="Staging,Production">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..4d7ce82c24
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using SimpleMvc11
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
new file mode 100644
index 0000000000..5fbbd9ded7
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc11
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to MVC 1.1
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
new file mode 100644
index 0000000000..b280ec0c9c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC and should not reference local builds of
+    the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.8" />
+  </ItemGroup>
+</Project>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..2172e5e566
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc11</title>
+
+    <environment names="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment names="Staging,Production">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc11</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2018 - SimpleMvc11</p>
+        </footer>
+    </div>
+
+    <environment names="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment names="Staging,Production">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..6f6d009d40
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using SimpleMvc11NetFx
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

From ca63634583bc785a38385a838aa5419fef21f2f3 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Date: Fri, 11 Oct 2019 15:59:13 -0700
Subject: [PATCH 317/337] unskip test \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/e5c0e3fbb3385b1f0d770445b91cf471d4738bbf

---
 .../test/IntegrationTests/BuildIntegrationTest11.cs       | 4 ++--
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj              | 8 ++++++++
 .../RestoreTestProjects/RestoreTestProjects.csproj        | 3 +--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
index dc7d470a3c..eb15dbb44a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
@@ -25,14 +25,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
         }
 
-        [Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")]
+        [Fact]
         [InitializeTestProject("SimpleMvc11")]
         public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects()
         {
             MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1";
             var result = await DotnetMSBuild("Build");
 
-            Assert.BuildPassed(result);
+            Assert.BuildPassed(result, allowWarnings: true);
             Assert.FileExists(result, OutputPath, "SimpleMvc11.dll");
             Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb");
             Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index e52fbfb440..1f3678c219 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -125,6 +125,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
   <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
     <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
+
+    <!-- This target restores SimpleMvc11 and SimpleMvc11NetFx separately because otherwise the TFMs in SimpleMvc11.csproj and SimpleMvc11NetFx.csproj are not respected. -->
+    <PropertyGroup>
+      <TargetFramework11>netcoreapp1.1</TargetFramework11>
+      <TargetFrameworkNetFx>net461</TargetFrameworkNetFx>
+    </PropertyGroup>
+    <MSBuild Projects="..\testapps\SimpleMvc11\SimpleMvc11.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);TargetFramework=$(TargetFramework11)" />
+    <MSBuild Projects="..\testapps\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);TargetFramework=$(TargetFrameworkNetFx)" />
   </Target>
 
   <Target Name="EnsureLogFolder" AfterTargets="Build">
diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index d639324487..ab772a0f92 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -4,8 +4,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
-    <ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
+    <!-- Intentionally not including SimpleMvc11 and SimpleMvc11NetFx here because they are restored in a separate target. -->
     <ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
     <ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
     <ProjectReference Include="..\SimpleMvc22NetFx\SimpleMvc22NetFx.csproj" />

From f1ccf855ebfcf253732bbecf36174f1455209b38 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav B <ajbaaska@microsoft.com>
Date: Thu, 13 Feb 2020 16:37:15 -0800
Subject: [PATCH 318/337] LSP Razor formatting for Razor code block directives
 (dotnet/aspnetcore-tooling#1573)

LSP Razor formatting for Razor code block directives
- Support for @code/@functions block formatting
    - Except when it contains Markup or other Razor constructs
- Added a RazorFormattingService which is invoked by the RazorFormattingEndpoint.
- Added a custom razor/rangeFormatting command that the server can use to ask the client to format a range of the projected C# or HTML document
- Added a CSharpFormatter and HTMLFormatter that invoke the above mentioned command
- Added FormattingSpan and its corresponding visitor to represent Razor understanding of indentation
- Moved the document mapping code to a separate RazorDocumentMappingService service for ease of use
- Added necessary extension methods for convenience. Some of them were copied from Roslyn
- Some cleanup
- Added a C# test formatter to enable unit testing. Right now it calls Roslyn APIs directly. As far as I've seen its behavior is the same as OmniSharp formatting except it doesn't remove trailing whitespace and empty lines. I am following up with people to understand why that is the case.
Added/updated tests
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/62051b9ad7f1bb09b6091bf6b5fd8df30d0ed5b2
---
 .../src/ClassifiedSpanVisitor.cs                             | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
index 81edb96152..f162744130 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
@@ -18,6 +18,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public ClassifiedSpanVisitor(RazorSourceDocument source)
         {
+            if (source is null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
             _source = source;
             _spans = new List<ClassifiedSpanInternal>();
             _currentBlockKind = BlockKindInternal.Markup;

From b84fc9b3b65465354cb3b534e48e045bb594cb29 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav B <ajbaaska@microsoft.com>
Date: Tue, 25 Feb 2020 13:40:08 -0800
Subject: [PATCH 319/337] Generate pure HTML document as part of Razor code
 generation (dotnet/aspnetcore-tooling#1624)

* Generate pure HTML document as part of Razor code generation

* feedback
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/478e2ceda86cf1bd41a3886f42387d161f43617b
---
 .../CodeGenerationIntegrationTest.cs          |  24 ++
 ...iveWithViewImports_DesignTime.codegen.html |   1 +
 .../BasicComponent_DesignTime.codegen.html    |   9 +
 .../Basic_DesignTime.codegen.html             |   8 +
 ...completeDirectives_DesignTime.codegen.html |  15 ++
 .../InheritsViewModel_DesignTime.codegen.html |   2 +
 ...itsWithViewImports_DesignTime.codegen.html |   2 +
 .../InjectWithModel_DesignTime.codegen.html   |   3 +
 ...njectWithSemicolon_DesignTime.codegen.html |   5 +
 .../Inject_DesignTime.codegen.html            |   1 +
 ...alidNamespaceAtEOF_DesignTime.codegen.html |   1 +
 ...ormedPageDirective_DesignTime.codegen.html |   4 +
 ...xpressionTagHelper_DesignTime.codegen.html |   6 +
 .../Model_DesignTime.codegen.html             |   1 +
 .../MultipleModels_DesignTime.codegen.html    |   2 +
 .../PageWithNamespace_DesignTime.codegen.html |   3 +
 ...adingPageDirective_DesignTime.codegen.html |   2 +
 ...sWithRouteTemplate_DesignTime.codegen.html |  13 +
 ...rPagesWithoutModel_DesignTime.codegen.html |  36 +++
 .../RazorPages_DesignTime.codegen.html        |  40 +++
 .../Sections_DesignTime.codegen.html          |  14 ++
 .../UsingDirectives_DesignTime.codegen.html   |   4 +
 ...ComponentTagHelper_DesignTime.codegen.html |   6 +
 .../ViewWithNamespace_DesignTime.codegen.html |   2 +
 .../_ViewImports_DesignTime.codegen.html      |   1 +
 .../src/DefaultRazorCSharpLoweringPhase.cs    |   1 -
 .../src/DefaultRazorHtmlDocument.cs           |  35 +++
 .../src/DefaultRazorTagHelperBinderPhase.cs   |   2 -
 .../src/RazorCodeDocumentExtensions.cs        |  22 +-
 .../src/RazorEngine.cs                        |   2 +-
 .../src/RazorHtmlDocument.cs                  |  29 +++
 .../src/RazorHtmlWriter.cs                    | 166 ++++++++++++
 .../CodeGenerationIntegrationTest.cs          |   1 +
 .../test/RazorProjectEngineTest.cs            |   2 +-
 ...TagHelperDirective_DesignTime.codegen.html |   1 +
 ...AttributeDirective_DesignTime.codegen.html |   6 +
 .../Await_DesignTime.codegen.html             |  26 ++
 .../Blocks_DesignTime.codegen.html            |  37 +++
 .../CSharp7_DesignTime.codegen.html           |  43 ++++
 .../CSharp8_DesignTime.codegen.html           |  67 +++++
 .../CodeBlockAtEOF_DesignTime.codegen.html    |   1 +
 ...ockWithTextElement_DesignTime.codegen.html |   4 +
 .../CodeBlock_DesignTime.codegen.html         |   5 +
 ...ditionalAttributes_DesignTime.codegen.html |  15 ++
 .../DesignTime_DesignTime.codegen.html        |  15 ++
 .../EmptyCodeBlock_DesignTime.codegen.html    |   3 +
 ...ExplicitExpression_DesignTime.codegen.html |   3 +
 ...itExpressionInCode_DesignTime.codegen.html |   3 +
 ...ImplicitExpression_DesignTime.codegen.html |   3 +
 ...citExpressionAtEOF_DesignTime.codegen.html |   3 +
 ...pressionWithMarkup_DesignTime.codegen.html |   1 +
 ...ExplicitExpression_DesignTime.codegen.html |   1 +
 .../ExpressionsInCode_DesignTime.codegen.html |  16 ++
 ...ctionsBlockMinimal_DesignTime.codegen.html |   7 +
 .../FunctionsBlock_DesignTime.codegen.html    |  12 +
 .../HiddenSpansInCode_DesignTime.codegen.html |   3 +
 ...ntWithQuote_Double_DesignTime.codegen.html |   2 +
 ...ntWithQuote_Single_DesignTime.codegen.html |   2 +
 .../Implements_DesignTime.codegen.html        |   5 +
 ...citExpressionAtEOF_DesignTime.codegen.html |   3 +
 ...ImplicitExpression_DesignTime.codegen.html |   3 +
 ...completeDirectives_DesignTime.codegen.html |  25 ++
 .../Inherits_DesignTime.codegen.html          |   3 +
 .../InlineBlocks_DesignTime.codegen.html      |   3 +
 .../Instrumented_DesignTime.codegen.html      |  38 +++
 .../MarkupInCodeBlock_DesignTime.codegen.html |   5 +
 ...arkup_InCodeBlocks_DesignTime.codegen.html |  45 ++++
 .../NestedCSharp_DesignTime.codegen.html      |   8 +
 .../NestedCodeBlocks_DesignTime.codegen.html  |   4 +
 .../NoLinePragmas_DesignTime.codegen.html     |  38 +++
 ...itionalExpressions_DesignTime.codegen.html |  11 +
 .../OpenedIf_DesignTime.codegen.html          |   5 +
 .../ParserError_DesignTime.codegen.html       |   5 +
 .../RazorComments_DesignTime.codegen.html     |  18 ++
 ...TagHelperDirective_DesignTime.codegen.html |   1 +
 .../Sections_DesignTime.codegen.html          |  17 ++
 .../SimpleUnspacedIf_DesignTime.codegen.html  |   4 +
 ...trolFlowStatements_DesignTime.codegen.html | 102 ++++++++
 .../StringLiterals_DesignTime.codegen.html    | 237 ++++++++++++++++++
 .../Tags_DesignTime.codegen.html              |   9 +
 .../Templates_DesignTime.codegen.html         |  53 ++++
 ...edExpressionInCode_DesignTime.codegen.html |   3 +
 .../Usings_DesignTime.codegen.html            |  15 ++
 .../IntegrationTests/IntegrationTestBase.cs   |  30 +++
 84 files changed, 1426 insertions(+), 8 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorHtmlDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlDocument.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 7b1ff9a8bf..b93507ffb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -540,6 +540,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -559,6 +560,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -584,6 +586,7 @@ public class MyService<TModel>
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -620,6 +623,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -655,6 +659,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -674,6 +679,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -693,6 +699,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -712,6 +719,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -728,6 +736,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -753,6 +762,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -769,6 +779,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -792,6 +803,7 @@ public class MyApp
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -824,6 +836,7 @@ public class MyApp
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -857,6 +870,7 @@ public class MyService<TModel>
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -873,6 +887,7 @@ public class MyService<TModel>
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -895,6 +910,7 @@ public class ThisShouldBeGenerated
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -923,6 +939,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -946,6 +963,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -962,6 +980,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -985,6 +1004,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1001,6 +1021,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1017,6 +1038,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1049,6 +1071,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1065,6 +1088,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
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
new file mode 100644
index 0000000000..e2017f6ce6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
@@ -0,0 +1 @@
+                         
\ 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
new file mode 100644
index 0000000000..e7b0219a38
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
@@ -0,0 +1,9 @@
+                       
+<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
new file mode 100644
index 0000000000..08d042e897
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
@@ -0,0 +1,8 @@
+<div class="                ">
+    Hello world
+                                  
+</div>
+   
+                    
+ 
+<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
new file mode 100644
index 0000000000..85fabc0abd
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..6adf1586e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..b1214751a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..b05e435fda
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..0c20f0ce0c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..8a218bdd8d
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..c72931e132
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
@@ -0,0 +1 @@
+           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
new file mode 100644
index 0000000000..9645bac584
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+      "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
new file mode 100644
index 0000000000..4649d9d2d6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
@@ -0,0 +1,6 @@
+               
+
+                                           
+
+<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
new file mode 100644
index 0000000000..1638a82fb4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..4a2f4743cf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..6742b0a9e3
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..8f9ba3e623
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..dbfd76ba01
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
@@ -0,0 +1,13 @@
+              
+
+               
+                                          
+
+            
+                                     
+     
+                                        
+     
+ 
+
+<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
new file mode 100644
index 0000000000..ae827b1270
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
@@ -0,0 +1,36 @@
+     
+
+                          
+                                          
+
+            
+                                                  
+     
+                             
+                                                         
+     
+
+                                    
+
+                         
+     
+                                        
+     
+ 
+
+<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>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
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
new file mode 100644
index 0000000000..dc0c2ec4e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
@@ -0,0 +1,40 @@
+     
+
+               
+                          
+                                          
+
+            
+                                     
+     
+                                                      
+         
+                                 
+                                                             
+         
+
+                                        
+     
+
+                         
+     
+                                        
+     
+ 
+
+<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>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
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
new file mode 100644
index 0000000000..849f18b015
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -0,0 +1,14 @@
+               
+
+                                           
+
+   
+                                         
+ 
+
+<div>Some body</div>
+
+                   
+    <div>This is in Section 1</div>
+    <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
new file mode 100644
index 0000000000..52fe51a130
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+                            
+                         
+             
+             
\ 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
new file mode 100644
index 0000000000..5b456be824
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
@@ -0,0 +1,6 @@
+                          
+  
+                      
+ 
+
+<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
new file mode 100644
index 0000000000..835b3a68ca
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..262e601e9c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
@@ -0,0 +1 @@
+                                  
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
index f09c68069a..5206b7b45c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorHtmlDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorHtmlDocument.cs
new file mode 100644
index 0000000000..82de883267
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorHtmlDocument.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class DefaultRazorHtmlDocument : RazorHtmlDocument
+    {
+        private readonly string _generatedHtml;
+        private readonly RazorCodeGenerationOptions _options;
+
+        public DefaultRazorHtmlDocument(
+            string generatedHtml,
+            RazorCodeGenerationOptions options)
+        {
+            if (generatedHtml == null)
+            {
+                throw new ArgumentNullException(nameof(generatedHtml));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            _generatedHtml = generatedHtml;
+            _options = options;
+        }
+
+        public override string GeneratedHtml => _generatedHtml;
+
+        public override RazorCodeGenerationOptions Options => _options;
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
index e9982aa2c5..9a0f8c1bc3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
@@ -102,8 +102,6 @@ namespace Microsoft.AspNetCore.Razor.Language
             return string.Equals(descriptor.Name, typePattern, StringComparison.Ordinal);
         }
 
-        
-
         internal abstract class DirectiveVisitor : SyntaxWalker
         {
             public abstract HashSet<TagHelperDescriptor> Matches { get; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
index 704a9da482..e968b1d6de 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -3,9 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -118,6 +115,25 @@ namespace Microsoft.AspNetCore.Razor.Language
             document.Items[typeof(DocumentIntermediateNode)] = documentNode;
         }
 
+        internal static RazorHtmlDocument GetHtmlDocument(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var razorHtmlObj = document.Items[typeof(RazorHtmlDocument)];
+            if (razorHtmlObj == null)
+            {
+                var razorHtmlDocument = RazorHtmlWriter.GetHtmlDocument(document);
+                document.Items[typeof(RazorHtmlDocument)] = razorHtmlDocument;
+
+                return razorHtmlDocument;
+            }
+
+            return (RazorHtmlDocument)razorHtmlObj;
+        }
+
         public static RazorCSharpDocument GetCSharpDocument(this RazorCodeDocument document)
         {
             if (document == null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
index cb8a10389a..864c5c2da5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
 #pragma warning disable CS0618 // Type or member is obsolete
         private static RazorEngine CreateCore(RazorConfiguration configuration, bool designTime, Action<IRazorEngineBuilder> configure)
-#pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning restore CS0618 // Type or member is obsolete
         {
             if (configuration == null)
             {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlDocument.cs
new file mode 100644
index 0000000000..2f14695577
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlDocument.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal abstract class RazorHtmlDocument
+    {
+        public abstract string GeneratedHtml { get; }
+
+        public abstract RazorCodeGenerationOptions Options { get; }
+
+        public static RazorHtmlDocument Create(string generatedHtml, RazorCodeGenerationOptions options)
+        {
+            if (generatedHtml == null)
+            {
+                throw new ArgumentNullException(nameof(generatedHtml));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            return new DefaultRazorHtmlDocument(generatedHtml, options);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
new file mode 100644
index 0000000000..6d29531efb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
@@ -0,0 +1,166 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    // We want to generate a HTML document that contains only pure HTML.
+    // So we want replace all non-HTML content with whitespace.
+    // Ideally we should just use ClassifiedSpans to generate this document but
+    // not all characters in the document are included in the ClassifiedSpans.
+    internal class RazorHtmlWriter : SyntaxWalker
+    {
+        private bool _isHtml;
+
+        private RazorHtmlWriter(RazorSourceDocument source)
+        {
+            if (source is null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            Source = source;
+            Builder = new StringBuilder(Source.Length);
+            _isHtml = true;
+        }
+
+        public RazorSourceDocument Source { get; }
+
+        public StringBuilder Builder { get; }
+
+        public static RazorHtmlDocument GetHtmlDocument(RazorCodeDocument codeDocument)
+        {
+            var options = codeDocument.GetCodeGenerationOptions();
+            if (options == null || !options.DesignTime)
+            {
+                // Not needed in run time. This pass generates the backing HTML document that is used to provide HTML intellisense.
+                return null;
+            }
+
+            var writer = new RazorHtmlWriter(codeDocument.Source);
+            var syntaxTree = codeDocument.GetSyntaxTree();
+
+            writer.Visit(syntaxTree.Root);
+
+            var generatedHtml = writer.Builder.ToString();
+            Debug.Assert(
+                writer.Source.Length == writer.Builder.Length,
+                $"The backing HTML document should be the same length as the original document. Expected: {writer.Source.Length} Actual: {writer.Builder.Length}");
+
+            var razorHtmlDocument = new DefaultRazorHtmlDocument(generatedHtml, options);
+            return razorHtmlDocument;
+        }
+
+        public override void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitRazorCommentBlock);
+        }
+
+        public override void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitRazorMetaCode);
+        }
+
+        public override void VisitMarkupTransition(MarkupTransitionSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitMarkupTransition);
+        }
+
+        public override void VisitCSharpTransition(CSharpTransitionSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitCSharpTransition);
+        }
+
+        public override void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitCSharpEphemeralTextLiteral);
+        }
+
+        public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitCSharpExpressionLiteral);
+        }
+
+        public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+        {
+            WriteNode(node, isHtml: false, base.VisitCSharpStatementLiteral);
+        }
+
+        public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitMarkupStartTag);
+        }
+
+        public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitMarkupEndTag);
+        }
+
+        public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitMarkupTagHelperStartTag);
+        }
+
+        public override void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitMarkupTagHelperEndTag);
+        }
+
+        public override void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitMarkupEphemeralTextLiteral);
+        }
+
+        public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitMarkupTextLiteral);
+        }
+
+        public override void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+        {
+            WriteNode(node, isHtml: true, base.VisitUnclassifiedTextLiteral);
+        }
+
+        public override void VisitToken(SyntaxToken token)
+        {
+            base.VisitToken(token);
+            WriteToken(token);
+        }
+
+        private void WriteToken(SyntaxToken token)
+        {
+            var content = token.Content;
+            if (_isHtml)
+            {
+                // If we're in HTML context, append the content directly.
+                Builder.Append(content);
+                return;
+            }
+
+            // We're in non-HTML context. Let's replace all non-whitespace chars with a space.
+            foreach (var c in content)
+            {
+                if (char.IsWhiteSpace(c))
+                {
+                    Builder.Append(c);
+                }
+                else
+                {
+                    Builder.Append(' ');
+                }
+            }
+        }
+
+        private void WriteNode<TNode>(TNode node, bool isHtml, Action<TNode> handler) where TNode : SyntaxNode
+        {
+            var old = _isHtml;
+            _isHtml = isHtml;
+            handler(node);
+            _isHtml = old;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 22133be03f..175c69abf6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -1001,6 +1001,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
             // Assert
             AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(codeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
             AssertSourceMappingsMatchBaseline(codeDocument);
             AssertLinePragmas(codeDocument, designTime: true);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
index 576c3cc448..c9fa4504cd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
@@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 feature => Assert.IsType<HtmlNodeOptimizationPass>(feature),
                 feature => Assert.IsType<ImplementsDirectivePass>(feature),
                 feature => Assert.IsType<InheritsDirectivePass>(feature),
-                feature => Assert.IsType<MetadataAttributePass>(feature), 
+                feature => Assert.IsType<MetadataAttributePass>(feature),
                 feature => Assert.IsType<PreallocatedTagHelperAttributeOptimizationPass>(feature));
         }
 
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
new file mode 100644
index 0000000000..0da46f2152
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..fd82d19806
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..22593ca1ef
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
@@ -0,0 +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>
+</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>
+</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
new file mode 100644
index 0000000000..dc08c79219
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
@@ -0,0 +1,37 @@
+  
+              
+ 
+
+                 
+    <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>That time, we wrote 5 lines!</p>
+                       
+    <p>Oh no! An error occurred:              </p>
+ 
+
+<p>i is now   </p>
+
+                     
+    <p>This block is locked, for your security!</p>
+ 
\ 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
new file mode 100644
index 0000000000..a2aad32abe
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
@@ -0,0 +1,43 @@
+<body>
+      
+                                                                                                    
+         
+                                                
+          
+
+                                                     
+
+                                  
+                                                   
+                                                           
+                                                                                             
+     
+
+                                                           
+     
+                                      
+         
+                           
+         
+     
+    <p>
+        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
new file mode 100644
index 0000000000..2e0ee4dc6e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
@@ -0,0 +1,67 @@
+                                 
+
+  
+                                               
+     
+                    
+     
+
+                                                   
+     
+
+     
+
+                       
+                                                           
+
+                                      
+                             
+                             
+     
+                              
+     
+ 
+
+            
+                
+
+                 
+ 
+                                   
+                                     
+                      
+  
+
+                                                
+ 
+        
+ 
+
+             
+                     
+                      
+
+            
+                 
+     
+              
+              
+     
+
+                                                     
+     
+                                                                 
+                                      
+     
+
+                                       
+
+                                          
+
+                                                          
+
+                       
+     
+                                         
+     
+ 
\ 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
new file mode 100644
index 0000000000..136d06384a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
@@ -0,0 +1 @@
+  
\ 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
new file mode 100644
index 0000000000..a6e01f1a0e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+  
+               <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
new file mode 100644
index 0000000000..f857199dcf
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
@@ -0,0 +1,5 @@
+  
+                                  
+                                                                    
+     
+ 
\ 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
new file mode 100644
index 0000000000..46a4402680
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
@@ -0,0 +1,15 @@
+  
+                  
+                    
+    <a href="Foo" />
+    <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="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
+ 
\ 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
new file mode 100644
index 0000000000..be5ba4979a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
@@ -0,0 +1,15 @@
+<div>
+                                           
+    <p>This is item #  </p>
+             
+</div>
+
+<p>
+               
+      <p>Bar      Biz</p> 
+</p>
+
+                 
+    <p>Foo</p>
+        
+ 
\ 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
new file mode 100644
index 0000000000..9ebe0e3a78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+This is markup
+
+   
\ 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
new file mode 100644
index 0000000000..9ebe0e3a78
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+This is markup
+
+   
\ 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
new file mode 100644
index 0000000000..1568f6aa34
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+  
+     
+ 
\ 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
new file mode 100644
index 0000000000..76ee36910b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+This is markup
+
+ !
\ 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
new file mode 100644
index 0000000000..6eaf3f7aa0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+This is markup
+
+  
\ 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
new file mode 100644
index 0000000000..fc59317849
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000..33b749a2f9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000000..de86958add
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..6393f9703b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
@@ -0,0 +1,7 @@
+
+
+	           
+                          
+	                   
+ 
+ 
\ 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
new file mode 100644
index 0000000000..46d84b460b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
@@ -0,0 +1,12 @@
+            
+
+ 
+
+            
+                                
+                             
+                            
+     
+ 
+
+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
new file mode 100644
index 0000000000..13484a1b45
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+  
+        
+ 
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.html
new file mode 100644
index 0000000000..21fdc4d316
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.html
@@ -0,0 +1,2 @@
+<!-- " -->
+<img src="~/images/submit.png" />
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.html
new file mode 100644
index 0000000000..1c32421c7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.html
@@ -0,0 +1,2 @@
+<!-- ' -->
+<img src="~/images/submit.png" />
\ 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
new file mode 100644
index 0000000000..d0776340e1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
@@ -0,0 +1,5 @@
+                       
+
+            
+                                  
+ 
\ 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
new file mode 100644
index 0000000000..f1c2edafa2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+This is markup
+
+ 
\ 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
new file mode 100644
index 0000000000..c3ca733a2b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+                               
+    <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
new file mode 100644
index 0000000000..b7d08f3856
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -0,0 +1,25 @@
+                                                                                   
+
+             
+              
+               
+
+                
+                 
+                  
+
+                
+                 
+                  
+
+         
+          
+
+          
+           
+
+        
+         
+
+         {
+            
\ 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
new file mode 100644
index 0000000000..b60ac0100e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+                               
+
+      
\ 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
new file mode 100644
index 0000000000..3b6fa1cd06
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+             (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
new file mode 100644
index 0000000000..111d1f7474
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
@@ -0,0 +1,38 @@
+  
+              
+               <p>Bar</p> 
+      Hello, World
+    <p>Hello, World</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>That time, we wrote 5 lines!</p>
+                       
+    <p>Oh no! An error occurred:              </p>
+ 
+
+                     
+    <p>This block is locked, for your security!</p>
+ 
\ 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
new file mode 100644
index 0000000000..9148ce7323
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
@@ -0,0 +1,5 @@
+  
+                                  
+        <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
new file mode 100644
index 0000000000..4b346c914a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
@@ -0,0 +1,45 @@
+
+  
+                             
+     
+                                                   
+      
+
+                                 
+     
+        <div>            </div>
+     
+ 
+
+                         
+                                 
+
+            
+                                        
+     
+                                             
+        <div>
+            <h3>Happy birthday             !</h3>
+        </div>
+
+        <ul>
+                                                  
+         
+            <li>     Happy birthday!</li>
+         
+        </ul>
+
+                            
+         
+                   
+         
+
+        <h4>Secret message</h4>
+     
+
+                
+     
+                                        
+                                    
+     
+ 
\ 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
new file mode 100644
index 0000000000..c1b9240ee0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
@@ -0,0 +1,8 @@
+  
+                                         
+     
+        <div>
+                             .
+        </div>
+     
+ 
\ 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
new file mode 100644
index 0000000000..c56380dfcb
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+          
+              
+     
+ 
\ 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
new file mode 100644
index 0000000000..b7c02278c1
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
@@ -0,0 +1,38 @@
+  
+              
+ 
+
+                 
+    <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>That time, we wrote 5 lines!</p>
+                       
+    <p>Oh no! An error occurred:              </p>
+ 
+
+                                  
+<p>i is now   </p>
+
+                     
+    <p>This block is locked, for your security!</p>
+ 
\ 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
new file mode 100644
index 0000000000..7ad423b1f2
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
@@ -0,0 +1,11 @@
+  
+                  
+                           
+                               
+                                              
+ 
+
+              
+                       
+                           
+                                          
\ 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
new file mode 100644
index 0000000000..1675f64383
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..d007646328
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
@@ -0,0 +1,5 @@
+  
+  
+          
+          
+ 
\ 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
new file mode 100644
index 0000000000..f851e2e597
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
@@ -0,0 +1,18 @@
+                                    
+<p>This should           be shown</p>
+
+  
+                                       
+                                                       
+                     
+                  
+     
+ 
+
+                           
+<p>But this should show the comment syntax:     </p>
+
+         
+
+<input value="@*this razor comment is the actual value*@" 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
new file mode 100644
index 0000000000..77def406f5
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
@@ -0,0 +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
new file mode 100644
index 0000000000..72ff37f26c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -0,0 +1,17 @@
+  
+                                        
+ 
+
+<div>This is in the Body>
+
+                   
+    <div class="some       ">This is in Section 2</div>
+ 
+
+                   
+    <div>This is in Section 1</div>
+ 
+
+                          
+                                  <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
new file mode 100644
index 0000000000..11a63ced54
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+          
+ 
+	<div></div>
+ 
\ 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
new file mode 100644
index 0000000000..3d06dc8b90
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
@@ -0,0 +1,102 @@
+<p>Before Text</p>
+
+  
+                                                                                                
+
+                
+     
+                                             
+                                                    
+                                                  
+                                                    
+            
+                                
+     
+
+                                
+                                
+            
+
+                                          
+             
+
+      
+                     
+                                
+
+                                
+                       
+
+                                                                 
+                           
+
+                
+                       
+ 
+
+            
+                       
+     
+                   
+
+                                             
+                                                    
+            
+                                               
+        
+                                    
+                                    
+                
+
+                                             
+                 
+
+          
+                         
+                                    
+
+                                    
+                           
+
+                                                                     
+                               
+
+                   
+                           
+     
+
+                         
+
+                                
+     
+                                 
+     
+
+ 
+
+                             
+      
+
+                                      
+         
+
+   
+                 
+                            
+
+                             
+                   
+
+                                                              
+                              
+                       
+
+            
+                   
+
+                            <p>Hello!</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
new file mode 100644
index 0000000000..b47c6a931c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
@@ -0,0 +1,237 @@
+<p>This is line 1</p>
+<p>This is line 2</p>
+<p>This is line 3</p>
+<p>This is line 4</p>
+<p>This is line 5</p>
+<p>This is line 6</p>
+<p>This is line 7</p>
+<p>This is line 8</p>
+<p>This is line 9</p>
+<p>This is line 10</p>
+<p>This is line 11</p>
+<p>This is line 12</p>
+<p>This is line 13</p>
+<p>This is line 14</p>
+<p>This is line 15</p>
+<p>This is line 16</p>
+<p>This is line 17</p>
+<p>This is line 18</p>
+<p>This is line 19</p>
+<p>This is line 20</p>
+<p>This is line 21</p>
+<p>This is line 22</p>
+<p>This is line 23</p>
+<p>This is line 24</p>
+<p>This is line 25</p>
+<p>This is line 26</p>
+<p>This is line 27</p>
+<p>This is line 28</p>
+<p>This is line 29</p>
+<p>This is line 30</p>
+<p>This is line 31</p>
+<p>This is line 32</p>
+<p>This is line 33</p>
+<p>This is line 34</p>
+<p>This is line 35</p>
+<p>This is line 36</p>
+<p>This is line 37</p>
+<p>This is line 38</p>
+<p>This is line 39</p>
+<p>This is line 40</p>
+<p>This is line 41</p>
+<p>This is line 42</p>
+<p>This is line 43</p>
+<p>This is line 44</p>
+<p>This is line 45</p>
+<p>This is line 46</p>
+<p>This is line 47</p>
+<p>This is line 48</p>
+<p>This is line 49</p>
+<p>This is line 50</p>
+<p>This is line 51</p>
+<p>This is line 52</p>
+<p>This is line 53</p>
+<p>This is line 54</p>
+<p>This is line 55</p>
+<p>This is line 56</p>
+<p>This is line 57</p>
+<p>This is line 58</p>
+<p>This is line 59</p>
+<p>This is line 60</p>
+<p>This is line 61</p>
+<p>This is line 62</p>
+<p>This is line 63</p>
+<p>This is line 64</p>
+<p>This is line 65</p>
+<p>This is line 66</p>
+<p>This is line 67</p>
+<p>This is line 68</p>
+<p>This is line 69</p>
+<p>This is line 70</p>
+<p>This is line 71</p>
+<p>This is line 72</p>
+<p>This is line 73</p>
+<p>This is line 74</p>
+<p>This is line 75</p>
+<p>This is line 76</p>
+<p>This is line 77</p>
+<p>This is line 78</p>
+<p>This is line 79</p>
+<p>This is line 80</p>
+<p>This is line 81</p>
+<p>This is line 82</p>
+<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>
+    <p>This is line 4 nested</p>
+    <p>This is line 5 nested</p>
+    <p>This is line 6 nested</p>
+    <p>This is line 7 nested</p>
+    <p>This is line 8 nested</p>
+    <p>This is line 9 nested</p>
+    <p>This is line 10 nested</p>
+    <p>This is line 11 nested</p>
+    <p>This is line 12 nested</p>
+    <p>This is line 13 nested</p>
+    <p>This is line 14 nested</p>
+    <p>This is line 15 nested</p>
+    <p>This is line 16 nested</p>
+    <p>This is line 17 nested</p>
+    <p>This is line 18 nested</p>
+    <p>This is line 19 nested</p>
+    <p>This is line 20 nested</p>
+    <p>This is line 21 nested</p>
+    <p>This is line 22 nested</p>
+    <p>This is line 23 nested</p>
+    <p>This is line 24 nested</p>
+    <p>This is line 25 nested</p>
+    <p>This is line 26 nested</p>
+    <p>This is line 27 nested</p>
+    <p>This is line 28 nested</p>
+    <p>This is line 29 nested</p>
+    <p>This is line 30 nested</p>
+    <p>This is line 31 nested</p>
+    <p>This is line 32 nested</p>
+    <p>This is line 33 nested</p>
+    <p>This is line 34 nested</p>
+    <p>This is line 35 nested</p>
+    <p>This is line 36 nested</p>
+    <p>This is line 37 nested</p>
+    <p>This is line 38 nested</p>
+    <p>This is line 39 nested</p>
+    <p>This is line 40 nested</p>
+    <p>This is line 41 nested</p>
+    <p>This is line 42 nested</p>
+    <p>This is line 43 nested</p>
+    <p>This is line 44 nested</p>
+    <p>This is line 45 nested</p>
+    <p>This is line 46 nested</p>
+    <p>This is line 47 nested</p>
+    <p>This is line 48 nested</p>
+    <p>This is line 49 nested</p>
+    <p>This is line 50 nested</p>
+    <p>This is line 51 nested</p>
+    <p>This is line 52 nested</p>
+    <p>This is line 53 nested</p>
+    <p>This is line 54 nested</p>
+    <p>This is line 55 nested</p>
+    <p>This is line 56 nested</p>
+    <p>This is line 57 nested</p>
+    <p>This is line 58 nested</p>
+    <p>This is line 59 nested</p>
+    <p>This is line 60 nested</p>
+    <p>This is line 61 nested</p>
+    <p>This is line 62 nested</p>
+    <p>This is line 63 nested</p>
+    <p>This is line 64 nested</p>
+    <p>This is line 65 nested</p>
+    <p>This is line 66 nested</p>
+    <p>This is line 67 nested</p>
+    <p>This is line 68 nested</p>
+    <p>This is line 69 nested</p>
+    <p>This is line 70 nested</p>
+    <p>This is line 71 nested</p>
+    <p>This is line 72 nested</p>
+    <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>
+<p>This is line 4</p>
+<p>This is line 5</p>
+<p>This is line 6</p>
+<p>This is line 7</p>
+<p>This is line 8</p>
+<p>This is line 9</p>
+<p>This is line 10</p>
+<p>This is line 11</p>
+<p>This is line 12</p>
+<p>This is line 13</p>
+<p>This is line 14</p>
+<p>This is line 15</p>
+<p>This is line 16</p>
+<p>This is line 17</p>
+<p>This is line 18</p>
+<p>This is line 19</p>
+<p>This is line 20</p>
+<p>This is line 21</p>
+<p>This is line 22</p>
+<p>This is line 23</p>
+<p>This is line 24</p>
+<p>This is line 25</p>
+<p>This is line 26</p>
+<p>This is line 27</p>
+<p>This is line 28</p>
+<p>This is line 29</p>
+<p>This is line 30</p>
+<p>This is line 31</p>
+<p>This is line 32</p>
+<p>This is line 33</p>
+<p>This is line 34</p>
+<p>This is line 35</p>
+<p>This is line 36</p>
+<p>This is line 37</p>
+<p>This is line 38</p>
+<p>This is line 39</p>
+<p>This is line 40</p>
+<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>
+    <p>This is line 4 nested</p>
+    <p>This is line 5 nested</p>
+    <p>This is line 6 nested</p>
+    <p>This is line 7 nested</p>
+    <p>This is line 8 nested</p>
+    <p>This is line 9 nested</p>
+    <p>This is line 10 nested</p>
+    <p>This is line 11 nested</p>
+    <p>This is line 12 nested</p>
+    <p>This is line 13 nested</p>
+    <p>This is line 14 nested</p>
+    <p>This is line 15 nested</p>
+    <p>This is line 16 nested</p>
+    <p>This is line 17 nested</p>
+    <p>This is line 18 nested</p>
+    <p>This is line 19 nested</p>
+    <p>This is line 20 nested</p>
+    <p>This is line 21 nested</p>
+    <p>This is line 22 nested</p>
+    <p>This is line 23 nested</p>
+    <p>This is line 24 nested</p>
+    <p>This is line 25 nested</p>
+    <p>This is line 26 nested</p>
+    <p>This is line 27 nested</p>
+    <p>This is line 28 nested</p>
+    <p>This is line 29 nested</p>
+    <p>30</p>
+ !
\ 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
new file mode 100644
index 0000000000..419c13c11c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
@@ -0,0 +1,9 @@
+  
+    <script type="text/javascript"     ></script @foo >
+ 
+
+<script type="text/html">
+    <%var x = window == null%>
+</script>
+
+<script></script @
\ No newline at end of file
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
new file mode 100644
index 0000000000..de0b735525
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
@@ -0,0 +1,53 @@
+            
+                                                                       
+                                             
+                                            
+                                                            
+             
+           
+     
+ 
+
+  
+                                 <text>This works      !</text> 
+            
+ 
+
+   
+                                 <p class="     ">Hello</p> 
+                   
+ 
+
+<ul>
+              <li>Item #     </li>  
+</ul>
+
+<p>
+           
+       This is line#      of markup<br/>
+ 
+</p>
+
+<p>
+           
+      : This is line#      of markup<br />
+ 
+</p>
+
+<p>
+           
+      :: This is line#      of markup<br />
+ 
+</p>
+
+
+<ul>
+                 <li>
+        Item #     
+                             
+        <ul>
+            <li>Child Items... ?</li>
+                                                           
+        </ul>
+    </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
new file mode 100644
index 0000000000..ae3e23d828
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+  
+          
+ 
\ 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
new file mode 100644
index 0000000000..d16439d975
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
@@ -0,0 +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
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index 84ed8ac87f..1f50719819 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -361,6 +361,36 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             IntermediateNodeVerifier.Verify(document, baseline);
         }
 
+        internal void AssertHtmlDocumentMatchesBaseline(RazorHtmlDocument htmlDocument)
+        {
+            if (FileName == null)
+            {
+                var message = $"{nameof(AssertHtmlDocumentMatchesBaseline)} should only be called from an integration test ({nameof(FileName)} is null).";
+                throw new InvalidOperationException(message);
+            }
+
+            var baselineFileName = Path.ChangeExtension(FileName, ".codegen.html");
+
+            if (GenerateBaselines)
+            {
+                var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
+                File.WriteAllText(baselineFullPath, htmlDocument.GeneratedHtml);
+                return;
+            }
+
+            var htmlFile = TestFile.Create(baselineFileName, GetType().GetTypeInfo().Assembly);
+            if (!htmlFile.Exists())
+            {
+                throw new XunitException($"The resource {baselineFileName} was not found.");
+            }
+
+            var baseline = htmlFile.ReadAllText();
+
+            // Normalize newlines to match those in the baseline.
+            var actual = htmlDocument.GeneratedHtml.Replace("\r", "").Replace("\n", "\r\n");
+            Assert.Equal(baseline, actual);
+        }
+
         protected void AssertCSharpDocumentMatchesBaseline(RazorCSharpDocument cSharpDocument)
         {
             if (FileName == null)

From d41276b0fae63be0701c71924563e19e424cb13a Mon Sep 17 00:00:00 2001
From: Ajay Bhargav B <ajbaaska@microsoft.com>
Date: Thu, 27 Feb 2020 14:49:52 -0800
Subject: [PATCH 320/337] Publish generated HTML in the client
 (dotnet/aspnetcore-tooling#1633)

* Publish generated HTML in the client

* feedback

* fix
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a666c6f5e3296a79d84fb15e8f03f4e62566d2da
---
 .../src/RazorCodeDocumentExtensions.cs                    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
index e968b1d6de..6d22aa5f27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -126,9 +126,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             if (razorHtmlObj == null)
             {
                 var razorHtmlDocument = RazorHtmlWriter.GetHtmlDocument(document);
-                document.Items[typeof(RazorHtmlDocument)] = razorHtmlDocument;
-
-                return razorHtmlDocument;
+                if (razorHtmlDocument != null)
+                {
+                    document.Items[typeof(RazorHtmlDocument)] = razorHtmlDocument;
+                    return razorHtmlDocument;
+                }
             }
 
             return (RazorHtmlDocument)razorHtmlObj;

From b89d98da1994449381b1714f2fd84cce20532a72 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 24 Feb 2020 21:04:34 -0800
Subject: [PATCH 321/337] Split Razor Language Server into library and
 executable.

- This is a pre-requisite work item to run our language server in-process in Visual Studio. VS is a .NET framework application so we can't have a language server which targets netcoreapp be loaded. Therefore, in order to account for this I needed to re-target our language server library to netstandard2.0 so it can be referenced via a netcoreapp (rzls.exe) and a .NET framework app.
- Added a new `rzls` project to be the maintainer of our OOP language server
- Had to make adjustments to the existing language server project to be compatible with netstandard2.0.
- Created a new `RazorLanguageServer` type to initiate our Language Server but not start and initialize it. To enable a consumer to initialize the new language server I had to use private reflection to `Initialize` O#'s internal type. This is a temporary measure which I intend to expand the O# lib to make their Initialize method public.

dotnet/aspnetcoredotnet/aspnetcore-tooling#19185
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/79841b93718ef5a0db77a7e6917ac620d786e849
---
 .../src/Properties/AssemblyInfo.cs                              | 2 +-
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
index 0abe91703d..f4d78acaaa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.OmniSharpPlugin.StrongNamed, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 923cde5083..30de565649 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.OmniSharpPlugin.StrongNamed, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

From d69938f36de3861e03924050341f875e5ca79655 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Thu, 27 Feb 2020 21:11:04 -0800
Subject: [PATCH 322/337] Initialize LSP documents earlier.

- Prior to this we would start tracking LSP documents when an `ITextView` was associated with our `ITextBuffer`. The issue with this is when the `ILanguageClient` infrastructure initializes itself before we do and starts our `LanguageServer` it's we start retrieving requests that require access to our `LSPDocumentManager`. That's an issue because our `LSPDocumentManager` may not have been initialized yet resulting in failure to fulfill requests.
- Changed how we initialize `ITextBuffer`s. Before we were setting up all of the logic to change the content type of a text buffer and populate its properties at the `EditorFactory` layer; however, how we were doing it (waiting for the ITextBuffer to load) resulted in `ITextDocumentListener` events firing prior to our content type changes would occur. This is a problem becasue the `ILanguageaClient` infrastructure will start making its decision to turn on LSP features for your `ITextBuffer` at the point and time. Now we change the `ITextBuffer`s content type (and set properties) during the `ITextDocumentListener` created pipeline.

This resulted in almost all of our logic in our editor factory to be split out into two classes.
  1. `LSPEditorFeatureDetector`, we needed to be able to detect the "enabledness" of features in two locations. Once at the `EditorFactory` layer to ensure we know when to disallow other editor factories participation in the `ITextBuffer` creation and a second at the `ITextDocumentListener` layer when we inspect an `ITextDocument` and need to determine if we want to "initialize" it (change its content type etc.).
  2. `RazorLSPTextDocumentCreatedListener`, this is our `ITextDocumentListener` i've been referring to. It now houses the logic on how to change the content type and populate the `ITextBuffer`'s properties.

- Changed our `LSPDocumentManager` to no longer depend on `ITextView`s for ref counting documents. Instead we just take an `ITextBuffer` and keep an internal count of how many times we've been asked to track a document. In practice this number never goes past 1 however it doesn't hurt to be defensive.
- Added IVT from CodeAnalysis.Razor to our LanguageServerClient project in order to enable the retrieval of our `FilePathComparison` type.
- Given the new refactoring of our feature detector and the `ITextDocumentListener` pieces I was able to add extensive testing to ensure all things work as expected.

Fixes dotnet/aspnetcoredotnet/aspnetcore-tooling#19160
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/d0a7dfce094b3bd283a1718fbe22eabcdec9e68f
---
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index 30de565649..f59363b736 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -12,6 +12,7 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServerClient.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

From 26c5807c98f8d898b34033a71a6b9b6b59ce7369 Mon Sep 17 00:00:00 2001
From: Tanay Parikh <TanayParikh@users.noreply.github.com>
Date: Thu, 12 Mar 2020 22:45:50 -0700
Subject: [PATCH 323/337] <text> Tag IntelliSense Support
 (dotnet/aspnetcore-tooling#1675)

* <text> Tag IntelliSense Implementation

* Text node language context support

* Added Tests\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a0f99cd14f2ded43a0087be52e29e67f5aaaba71
---
 .../src/Legacy/CSharpCodeParser.cs                             | 2 +-
 src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index ac0b03e3c2..9832833a33 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -689,7 +689,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         ParseCodeBlock(builder, block);
 
                         // ParseCodeBlock is responsible for parsing the insides of a code block (non-inclusive of braces).
-                        // Therefore, there's one of two cases after parsing: 
+                        // Therefore, there's one of two cases after parsing:
                         //  1. We've hit the End of File (incomplete parse block).
                         //  2. It's a complete parse block and we're at a right brace.
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx
index fd92b354d9..7527a23812 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Resources.resx
@@ -141,4 +141,7 @@
   <data name="TagHelper_PartialRequiredAttributeOperator" xml:space="preserve">
     <value>Required attribute '{0}' has a partial CSS operator. '{1}' must be followed by an equals.</value>
   </data>
+  <data name="MarkupTransition_Description" xml:space="preserve">
+    <value>Create a inline HTML element without tags.</value>
+  </data>
 </root>
\ No newline at end of file

From 926bbfa14bcb16b2a2d065807c56642680cd41a2 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Sat, 21 Mar 2020 10:36:35 -0700
Subject: [PATCH 324/337] Update Roslyn tooling versions.

- Moved from 3.4.0 Roslyn to 3.6.0-3.20168.4 for tooling builds.
- As part of this change I found that our package versions were starting to get really confusing for which Roslyn packages were runtime vs. which ones were tooling. Therefore, I rebranded each of the versions to be `Tooling_` or `Runtime_` accordingly. Moved all `VSIX_` => `Tooling_`.
- Roslyn's bits depended on a newer `StreamJsonRpc`, `Microsoft.VisualStudio.Threading` and `Microsoft.VisualStudio.LanguageServer.Client` packages so updated those dependencies to not have version conflicts.
- This new update brought in loads of new analyzers. Went through the warnings and either applied the fix or suppressed.
- This is in preparation for consuming new pieces from latest Roslyn packages.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/df5261e418ce0049fa0a7e50de0e3ed34d4dfc4b
---
 ...oft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj | 2 +-
 ...oft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj | 2 +-
 .../Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj     | 4 ++--
 .../src/Microsoft.CodeAnalysis.Razor.csproj                   | 4 ++--
 .../test/Microsoft.CodeAnalysis.Razor.Test.csproj             | 4 ++--
 .../Microsoft.AspNetCore.Razor.Test.Common.csproj             | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index 2a07595fca..63812740f1 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
index c309dc15e6..35ed6aa142 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index af825d362d..8609730955 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
-    
+
     <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
     <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
index e1efe71870..5a294ccb6c 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(Runtime_MicrosoftCodeAnalysisCommonPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
index 8334edb354..44fb5d161b 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -15,13 +15,13 @@
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
-    
+
      <!-- Included for definitions of Tag Helper types -->
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
   </ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index ecc1c90709..7e1f994a0f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>

From 36c2448bd3539e067bec1e7b97c9cdff389b7a1a Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Tue, 31 Mar 2020 11:07:08 -0700
Subject: [PATCH 325/337] Serialize project state from VS to project.razor.json
 (dotnet/aspnetcore-tooling#1711)

Serialize project state to project.razor.json\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/fef50ba62387cb87d34970b4c88290c233361927
---
 .../src/DiscoverCommand.cs                    |   1 +
 .../src/GenerateCommand.cs                    |   2 +-
 .../Microsoft.AspNetCore.Razor.Tools.csproj   |   2 +-
 .../Properties/AssemblyInfo.cs                |   1 +
 .../TagHelperDescriptorJsonConverter.cs       | 442 ++++++++++++++++++
 5 files changed, 446 insertions(+), 2 deletions(-)
 create mode 100644 src/Shared/RazorShared/TagHelperDescriptorJsonConverter.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
index 91ac10fea3..1c96b83e85 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/DiscoverCommand.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.Razor.Serialization;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
 using Newtonsoft.Json;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
index 7ebc74cb73..0406225fc8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/GenerateCommand.cs
@@ -7,9 +7,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.Razor.Serialization;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
 using Newtonsoft.Json;
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
index a7a3a4d347..ffda95c107 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\TagHelperDescriptorJsonConverter.cs">
+    <Compile Include="..\Microsoft.CodeAnalysis.Razor.Workspaces\Serialization\TagHelperDescriptorJsonConverter.cs">
       <Link>Shared\TagHelperDescriptorJsonConverter.cs</Link>
     </Compile>
     <Compile Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Serialization\RazorDiagnosticJsonConverter.cs">
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
index 098d7b5b27..145a421a52 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
@@ -12,4 +12,5 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServerClient.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Shared/RazorShared/TagHelperDescriptorJsonConverter.cs b/src/Shared/RazorShared/TagHelperDescriptorJsonConverter.cs
new file mode 100644
index 0000000000..3e610c08c7
--- /dev/null
+++ b/src/Shared/RazorShared/TagHelperDescriptorJsonConverter.cs
@@ -0,0 +1,442 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.CodeAnalysis.Razor.Serialization
+{
+    internal class TagHelperDescriptorJsonConverter : JsonConverter
+    {
+        public static readonly TagHelperDescriptorJsonConverter Instance = new TagHelperDescriptorJsonConverter();
+
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(TagHelperDescriptor).IsAssignableFrom(objectType);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType != JsonToken.StartObject)
+            {
+                return null;
+            }
+
+            var descriptor = JObject.Load(reader);
+            var descriptorKind = descriptor[nameof(TagHelperDescriptor.Kind)].Value<string>();
+            var typeName = descriptor[nameof(TagHelperDescriptor.Name)].Value<string>();
+            var assemblyName = descriptor[nameof(TagHelperDescriptor.AssemblyName)].Value<string>();
+            var tagMatchingRules = descriptor[nameof(TagHelperDescriptor.TagMatchingRules)].Value<JArray>();
+            var boundAttributes = descriptor[nameof(TagHelperDescriptor.BoundAttributes)].Value<JArray>();
+            var childTags = descriptor[nameof(TagHelperDescriptor.AllowedChildTags)].Value<JArray>();
+            var documentation = descriptor[nameof(TagHelperDescriptor.Documentation)].Value<string>();
+            var tagOutputHint = descriptor[nameof(TagHelperDescriptor.TagOutputHint)].Value<string>();
+            var caseSensitive = descriptor[nameof(TagHelperDescriptor.CaseSensitive)].Value<bool>();
+            var diagnostics = descriptor[nameof(TagHelperDescriptor.Diagnostics)].Value<JArray>();
+            var metadata = descriptor[nameof(TagHelperDescriptor.Metadata)].Value<JObject>();
+
+            var builder = TagHelperDescriptorBuilder.Create(descriptorKind, typeName, assemblyName);
+
+            builder.Documentation = documentation;
+            builder.TagOutputHint = tagOutputHint;
+            builder.CaseSensitive = caseSensitive;
+
+            foreach (var tagMatchingRule in tagMatchingRules)
+            {
+                var rule = tagMatchingRule.Value<JObject>();
+                builder.TagMatchingRule(b => ReadTagMatchingRule(b, rule, serializer));
+            }
+
+            foreach (var boundAttribute in boundAttributes)
+            {
+                var attribute = boundAttribute.Value<JObject>();
+                builder.BindAttribute(b => ReadBoundAttribute(b, attribute, serializer));
+            }
+
+            foreach (var childTag in childTags)
+            {
+                var tag = childTag.Value<JObject>();
+                builder.AllowChildTag(childTagBuilder => ReadAllowedChildTag(childTagBuilder, tag, serializer));
+            }
+
+            foreach (var diagnostic in diagnostics)
+            {
+                var diagnosticReader = diagnostic.CreateReader();
+                var diagnosticObject = serializer.Deserialize<RazorDiagnostic>(diagnosticReader);
+                builder.Diagnostics.Add(diagnosticObject);
+            }
+
+            var metadataReader = metadata.CreateReader();
+            var metadataValue = serializer.Deserialize<Dictionary<string, string>>(metadataReader);
+            foreach (var item in metadataValue)
+            {
+                builder.Metadata[item.Key] = item.Value;
+            }
+
+            return builder.Build();
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var tagHelper = (TagHelperDescriptor)value;
+
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.Kind));
+            writer.WriteValue(tagHelper.Kind);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.Name));
+            writer.WriteValue(tagHelper.Name);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.AssemblyName));
+            writer.WriteValue(tagHelper.AssemblyName);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.Documentation));
+            writer.WriteValue(tagHelper.Documentation);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.TagOutputHint));
+            writer.WriteValue(tagHelper.TagOutputHint);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.CaseSensitive));
+            writer.WriteValue(tagHelper.CaseSensitive);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.TagMatchingRules));
+            writer.WriteStartArray();
+            foreach (var ruleDescriptor in tagHelper.TagMatchingRules)
+            {
+                WriteTagMatchingRule(writer, ruleDescriptor, serializer);
+            }
+            writer.WriteEndArray();
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.BoundAttributes));
+            writer.WriteStartArray();
+            foreach (var boundAttribute in tagHelper.BoundAttributes)
+            {
+                WriteBoundAttribute(writer, boundAttribute, serializer);
+            }
+            writer.WriteEndArray();
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.AllowedChildTags));
+            writer.WriteStartArray();
+            foreach (var allowedChildTag in tagHelper.AllowedChildTags)
+            {
+                WriteAllowedChildTags(writer, allowedChildTag, serializer);
+            }
+            writer.WriteEndArray();
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.Diagnostics));
+            serializer.Serialize(writer, tagHelper.Diagnostics);
+
+            writer.WritePropertyName(nameof(TagHelperDescriptor.Metadata));
+            WriteMetadata(writer, tagHelper.Metadata);
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteAllowedChildTags(JsonWriter writer, AllowedChildTagDescriptor allowedChildTag, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(nameof(AllowedChildTagDescriptor.Name));
+            writer.WriteValue(allowedChildTag.Name);
+
+            writer.WritePropertyName(nameof(AllowedChildTagDescriptor.DisplayName));
+            writer.WriteValue(allowedChildTag.DisplayName);
+
+            writer.WritePropertyName(nameof(AllowedChildTagDescriptor.Diagnostics));
+            serializer.Serialize(writer, allowedChildTag.Diagnostics);
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteBoundAttribute(JsonWriter writer, BoundAttributeDescriptor boundAttribute, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.Kind));
+            writer.WriteValue(boundAttribute.Kind);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.Name));
+            writer.WriteValue(boundAttribute.Name);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.TypeName));
+            writer.WriteValue(boundAttribute.TypeName);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.IsEnum));
+            writer.WriteValue(boundAttribute.IsEnum);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.IndexerNamePrefix));
+            writer.WriteValue(boundAttribute.IndexerNamePrefix);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.IndexerTypeName));
+            writer.WriteValue(boundAttribute.IndexerTypeName);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.Documentation));
+            writer.WriteValue(boundAttribute.Documentation);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.Diagnostics));
+            serializer.Serialize(writer, boundAttribute.Diagnostics);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.Metadata));
+            WriteMetadata(writer, boundAttribute.Metadata);
+
+            writer.WritePropertyName(nameof(BoundAttributeDescriptor.BoundAttributeParameters));
+            writer.WriteStartArray();
+            foreach (var boundAttributeParameter in boundAttribute.BoundAttributeParameters)
+            {
+                WriteBoundAttributeParameter(writer, boundAttributeParameter, serializer);
+            }
+            writer.WriteEndArray();
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteBoundAttributeParameter(JsonWriter writer, BoundAttributeParameterDescriptor boundAttributeParameter, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Kind));
+            writer.WriteValue(boundAttributeParameter.Kind);
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Name));
+            writer.WriteValue(boundAttributeParameter.Name);
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.TypeName));
+            writer.WriteValue(boundAttributeParameter.TypeName);
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.IsEnum));
+            writer.WriteValue(boundAttributeParameter.IsEnum);
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Documentation));
+            writer.WriteValue(boundAttributeParameter.Documentation);
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Diagnostics));
+            serializer.Serialize(writer, boundAttributeParameter.Diagnostics);
+
+            writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Metadata));
+            WriteMetadata(writer, boundAttributeParameter.Metadata);
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteMetadata(JsonWriter writer, IReadOnlyDictionary<string, string> metadata)
+        {
+            writer.WriteStartObject();
+            foreach (var kvp in metadata)
+            {
+                writer.WritePropertyName(kvp.Key);
+                writer.WriteValue(kvp.Value);
+            }
+            writer.WriteEndObject();
+        }
+
+        private static void WriteTagMatchingRule(JsonWriter writer, TagMatchingRuleDescriptor ruleDescriptor, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.TagName));
+            writer.WriteValue(ruleDescriptor.TagName);
+
+            writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.ParentTag));
+            writer.WriteValue(ruleDescriptor.ParentTag);
+
+            writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.TagStructure));
+            writer.WriteValue(ruleDescriptor.TagStructure);
+
+            writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.Attributes));
+            writer.WriteStartArray();
+            foreach (var requiredAttribute in ruleDescriptor.Attributes)
+            {
+                WriteRequiredAttribute(writer, requiredAttribute, serializer);
+            }
+            writer.WriteEndArray();
+
+            writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.Diagnostics));
+            serializer.Serialize(writer, ruleDescriptor.Diagnostics);
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteRequiredAttribute(JsonWriter writer, RequiredAttributeDescriptor requiredAttribute, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Name));
+            writer.WriteValue(requiredAttribute.Name);
+
+            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.NameComparison));
+            writer.WriteValue(requiredAttribute.NameComparison);
+
+            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Value));
+            writer.WriteValue(requiredAttribute.Value);
+
+            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.ValueComparison));
+            writer.WriteValue(requiredAttribute.ValueComparison);
+
+            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Diagnostics));
+            serializer.Serialize(writer, requiredAttribute.Diagnostics);
+
+            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Metadata));
+            WriteMetadata(writer, requiredAttribute.Metadata);
+
+            writer.WriteEndObject();
+        }
+
+        private static void ReadTagMatchingRule(TagMatchingRuleDescriptorBuilder builder, JObject rule, JsonSerializer serializer)
+        {
+            var tagName = rule[nameof(TagMatchingRuleDescriptor.TagName)].Value<string>();
+            var attributes = rule[nameof(TagMatchingRuleDescriptor.Attributes)].Value<JArray>();
+            var parentTag = rule[nameof(TagMatchingRuleDescriptor.ParentTag)].Value<string>();
+            var tagStructure = rule[nameof(TagMatchingRuleDescriptor.TagStructure)].Value<int>();
+            var diagnostics = rule[nameof(TagMatchingRuleDescriptor.Diagnostics)].Value<JArray>();
+
+            builder.TagName = tagName;
+            builder.ParentTag = parentTag;
+            builder.TagStructure = (TagStructure)tagStructure;
+
+            foreach (var attribute in attributes)
+            {
+                var attibuteValue = attribute.Value<JObject>();
+                builder.Attribute(b => ReadRequiredAttribute(b, attibuteValue, serializer));
+            }
+
+            foreach (var diagnostic in diagnostics)
+            {
+                var diagnosticReader = diagnostic.CreateReader();
+                var diagnosticObject = serializer.Deserialize<RazorDiagnostic>(diagnosticReader);
+                builder.Diagnostics.Add(diagnosticObject);
+            }
+        }
+
+        private static void ReadRequiredAttribute(RequiredAttributeDescriptorBuilder builder, JObject attribute, JsonSerializer serializer)
+        {
+            var name = attribute[nameof(RequiredAttributeDescriptor.Name)].Value<string>();
+            var nameComparison = attribute[nameof(RequiredAttributeDescriptor.NameComparison)].Value<int>();
+            var value = attribute[nameof(RequiredAttributeDescriptor.Value)].Value<string>();
+            var valueComparison = attribute[nameof(RequiredAttributeDescriptor.ValueComparison)].Value<int>();
+            var diagnostics = attribute[nameof(RequiredAttributeDescriptor.Diagnostics)].Value<JArray>();
+            var metadata = attribute[nameof(RequiredAttributeDescriptor.Metadata)].Value<JObject>();
+
+            builder.Name = name;
+            builder.NameComparisonMode = (RequiredAttributeDescriptor.NameComparisonMode)nameComparison;
+            builder.Value = value;
+            builder.ValueComparisonMode = (RequiredAttributeDescriptor.ValueComparisonMode)valueComparison;
+
+            foreach (var diagnostic in diagnostics)
+            {
+                var diagnosticReader = diagnostic.CreateReader();
+                var diagnosticObject = serializer.Deserialize<RazorDiagnostic>(diagnosticReader);
+                builder.Diagnostics.Add(diagnosticObject);
+            }
+
+            var metadataReader = metadata.CreateReader();
+            var metadataValue = serializer.Deserialize<Dictionary<string, string>>(metadataReader);
+            foreach (var item in metadataValue)
+            {
+                builder.Metadata[item.Key] = item.Value;
+            }
+        }
+
+        private static void ReadAllowedChildTag(AllowedChildTagDescriptorBuilder builder, JObject childTag, JsonSerializer serializer)
+        {
+            var name = childTag[nameof(AllowedChildTagDescriptor.Name)].Value<string>();
+            var displayName = childTag[nameof(AllowedChildTagDescriptor.DisplayName)].Value<string>();
+            var diagnostics = childTag[nameof(AllowedChildTagDescriptor.Diagnostics)].Value<JArray>();
+
+            builder.Name = name;
+            builder.DisplayName = displayName;
+
+            foreach (var diagnostic in diagnostics)
+            {
+                var diagnosticReader = diagnostic.CreateReader();
+                var diagnosticObject = serializer.Deserialize<RazorDiagnostic>(diagnosticReader);
+                builder.Diagnostics.Add(diagnosticObject);
+            }
+        }
+
+        private static void ReadBoundAttribute(BoundAttributeDescriptorBuilder builder, JObject attribute, JsonSerializer serializer)
+        {
+            var descriptorKind = attribute[nameof(BoundAttributeDescriptor.Kind)].Value<string>();
+            var name = attribute[nameof(BoundAttributeDescriptor.Name)].Value<string>();
+            var typeName = attribute[nameof(BoundAttributeDescriptor.TypeName)].Value<string>();
+            var isEnum = attribute[nameof(BoundAttributeDescriptor.IsEnum)].Value<bool>();
+            var indexerNamePrefix = attribute[nameof(BoundAttributeDescriptor.IndexerNamePrefix)].Value<string>();
+            var indexerTypeName = attribute[nameof(BoundAttributeDescriptor.IndexerTypeName)].Value<string>();
+            var documentation = attribute[nameof(BoundAttributeDescriptor.Documentation)].Value<string>();
+            var diagnostics = attribute[nameof(BoundAttributeDescriptor.Diagnostics)].Value<JArray>();
+            var metadata = attribute[nameof(BoundAttributeDescriptor.Metadata)].Value<JObject>();
+            var boundAttributeParameters = attribute[nameof(BoundAttributeDescriptor.BoundAttributeParameters)].Value<JArray>();
+
+            builder.Name = name;
+            builder.TypeName = typeName;
+            builder.Documentation = documentation;
+
+            if (indexerNamePrefix != null)
+            {
+                builder.AsDictionary(indexerNamePrefix, indexerTypeName);
+            }
+
+            if (isEnum)
+            {
+                builder.IsEnum = true;
+            }
+
+            foreach (var diagnostic in diagnostics)
+            {
+                var diagnosticReader = diagnostic.CreateReader();
+                var diagnosticObject = serializer.Deserialize<RazorDiagnostic>(diagnosticReader);
+                builder.Diagnostics.Add(diagnosticObject);
+            }
+
+            var metadataReader = metadata.CreateReader();
+            var metadataValue = serializer.Deserialize<Dictionary<string, string>>(metadataReader);
+            foreach (var item in metadataValue)
+            {
+                builder.Metadata[item.Key] = item.Value;
+            }
+
+            foreach (var boundAttributeParameter in boundAttributeParameters)
+            {
+                var parameter = boundAttributeParameter.Value<JObject>();
+                builder.BindAttributeParameter(b => ReadBoundAttributeParameter(b, parameter, serializer));
+            }
+        }
+
+        private static void ReadBoundAttributeParameter(BoundAttributeParameterDescriptorBuilder builder, JObject parameter, JsonSerializer serializer)
+        {
+            var descriptorKind = parameter[nameof(BoundAttributeParameterDescriptor.Kind)].Value<string>();
+            var name = parameter[nameof(BoundAttributeParameterDescriptor.Name)].Value<string>();
+            var typeName = parameter[nameof(BoundAttributeParameterDescriptor.TypeName)].Value<string>();
+            var isEnum = parameter[nameof(BoundAttributeParameterDescriptor.IsEnum)].Value<bool>();
+            var documentation = parameter[nameof(BoundAttributeParameterDescriptor.Documentation)].Value<string>();
+            var diagnostics = parameter[nameof(BoundAttributeParameterDescriptor.Diagnostics)].Value<JArray>();
+            var metadata = parameter[nameof(BoundAttributeParameterDescriptor.Metadata)].Value<JObject>();
+
+            builder.Name = name;
+            builder.TypeName = typeName;
+            builder.Documentation = documentation;
+
+            if (isEnum)
+            {
+                builder.IsEnum = true;
+            }
+
+            foreach (var diagnostic in diagnostics)
+            {
+                var diagnosticReader = diagnostic.CreateReader();
+                var diagnosticObject = serializer.Deserialize<RazorDiagnostic>(diagnosticReader);
+                builder.Diagnostics.Add(diagnosticObject);
+            }
+
+            var metadataReader = metadata.CreateReader();
+            var metadataValue = serializer.Deserialize<Dictionary<string, string>>(metadataReader);
+            foreach (var item in metadataValue)
+            {
+                builder.Metadata[item.Key] = item.Value;
+            }
+        }
+    }
+}

From 1af2060d53503eb1448051b9f3b3e45f6415cc8e Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 28 Apr 2020 19:25:49 +0200
Subject: [PATCH 326/337] [Fixes dotnet/aspnetcore-tooling#17233
 dotnet/aspnetcore-tooling#18543 dotnet/aspnetcore-tooling#18707
 dotnet/aspnetcore-tooling#18561][Static web assets] Improve test reliability
 (dotnet/aspnetcore-tooling#1844)

* Improves the reliability of the affected tests with retries
* Pack and restore fail/hang in some occasions. The retries minimize
  the chances of these happening.
* For pack, we retry a few times but we ultimately continue as we've
  seen the package gets generated when pack hangs and looks correct.
  If that were not to be the case in the future, the test will fail.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/0d03b576172b447b356c9559073b6f3911717520
---
 .../StaticWebAssetsIntegrationTest.cs         | 67 +++++++++++++++----
 1 file changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index b87b87a662..5966051fdb 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -33,11 +33,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         public ITestOutputHelper Output { get; private set; }
 
-        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/17233")]
+        [Fact]
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest()
         {
-            var result = await DotnetMSBuild("Build", "/restore");
+            await RestoreWithRetry();
+            var result = await DotnetMSBuild("Build");
 
             var expectedManifest = GetExpectedManifest();
 
@@ -64,7 +65,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_CopiesStaticWebAssetsToDestinationFolder()
         {
-            var result = await DotnetMSBuild("Publish", "/restore");
+            await RestoreWithRetry();
+            var result = await DotnetMSBuild("Publish");
 
             Assert.BuildPassed(result);
 
@@ -84,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, PublishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [ConditionalFact(Skip = "Flaky test: https://github.com/dotnet/aspnetcore/issues/18543")]
+        [ConditionalFact]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("AppWithPackageAndP2PReferenceAndRID", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_CopiesStaticWebAssetsToDestinationFolder_PublishSingleFile()
@@ -109,11 +111,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, publishOutputPath, "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact(Skip = "flaky test: https://github.com/dotnet/aspnetcore/issues/18707")]
+        [Fact]
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_WithBuildReferencesDisabled_CopiesStaticWebAssetsToDestinationFolder()
         {
-            var build = await DotnetMSBuild("Build", "/restore");
+            await RestoreWithRetry();
+            var build = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(build);
 
@@ -130,11 +133,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js"));
         }
 
-        [Fact(Skip = "Flaky test: https://github.com/dotnet/aspnetcore/issues/18561")]
+        [Fact]
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_NoBuild_CopiesStaticWebAssetsToDestinationFolder()
         {
-            var build = await DotnetMSBuild("Build", "/restore");
+            await RestoreWithRetry();
+            var build = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(build);
 
@@ -155,7 +159,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_DoesNotEmbedManifestWhen_NoStaticResourcesAvailable()
         {
-            var result = await DotnetMSBuild("Build", "/restore");
+            await RestoreWithRetry();
+            var result = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(result);
 
@@ -171,7 +176,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Clean_Success_RemovesManifestAndCache()
         {
-            var result = await DotnetMSBuild("Build", "/restore");
+            await RestoreWithRetry();
+            var result = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(result);
 
@@ -188,12 +194,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml");
         }
 
-        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/17233")]
+        [Fact]
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Rebuild_Success_RecreatesManifestAndCache()
         {
             // Arrange
-            var result = await DotnetMSBuild("Build", "/restore");
+            await RestoreWithRetry();
+            var result = await DotnetMSBuild("Build");
 
             var expectedManifest = GetExpectedManifest();
 
@@ -239,7 +246,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task GenerateStaticWebAssetsManifest_IncrementalBuild_ReusesManifest()
         {
-            var result = await DotnetMSBuild("GenerateStaticWebAssetsManifest", "/restore");
+            await RestoreWithRetry();
+            var result = await DotnetMSBuild("GenerateStaticWebAssetsManifest");
 
             Assert.BuildPassed(result);
 
@@ -276,7 +284,38 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         public Task InitializeAsync()
         {
-            return PackageTestProjects.PackAsync(Output);
+            try
+            {
+                return PackageTestProjects.PackAsync(Output);
+            }
+            catch (Exception ex)
+            {
+                // We observed pack would "complete" in the past but MSBuild would get stuck.
+                // The generated package looked right, but it caused flakyness on our build infrastructure.
+                // We will try and continue running (even if the process didn't complete) and see if we can
+                // complete the test successfully.
+                Output.WriteLine($"Pack failed or did not complete: '{ex}'.");
+                return Task.CompletedTask;
+            }
+        }
+
+        private async Task RestoreWithRetry()
+        {
+            for (var i = 0; i < 3; i++)
+            {
+                try
+                {
+                    var result = await DotnetMSBuild("Restore");
+                    if (result.ExitCode == 0)
+                    {
+                        break;
+                    }
+                }
+                catch
+                {
+                    // Keep retrying if it fails.
+                }
+            }
         }
 
         public Task DisposeAsync()

From 7eca4ab2ecc807236838cdb959cbc99f89867afc Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Mon, 4 May 2020 21:19:08 +0200
Subject: [PATCH 327/337] [Static web assets] Use prebuilt packages in tests

* Avoids running dotnet restore and dotnet pack during tests which caused test hangs\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/300eeb08d2d200c0ac95e79d36c4294de00d44e4
---
 .../MSBuildIntegrationTestBase.cs             |  30 +---
 .../IntegrationTests/MSBuildProcessManager.cs |   8 +-
 .../StaticWebAssetsIntegrationTest.cs         | 140 ++----------------
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj  |  15 +-
 .../AppWithPackageAndP2PReference.csproj      |   2 +-
 ...AppWithPackageAndP2PReferenceAndRID.csproj |   2 +-
 ...PackageLibraryDirectDependency.1.0.0.nupkg | Bin 0 -> 5103 bytes
 ...ageLibraryTransitiveDependency.1.0.0.nupkg | Bin 0 -> 4978 bytes
 .../RestoreTestProjects.csproj                |  10 +-
 src/Razor/test/testassets/nuget.config        |   6 +
 10 files changed, 28 insertions(+), 185 deletions(-)
 create mode 100644 src/Razor/test/testassets/PregeneratedPackages/PackageLibraryDirectDependency.1.0.0.nupkg
 create mode 100644 src/Razor/test/testassets/PregeneratedPackages/PackageLibraryTransitiveDependency.1.0.0.nupkg
 create mode 100644 src/Razor/test/testassets/nuget.config

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
index 2a38d92bbe..d79ec34f56 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -15,9 +15,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
     public abstract class MSBuildIntegrationTestBase
     {
-        internal static readonly string LocalNugetPackagesCacheTempPath =
-            Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()) + Path.DirectorySeparatorChar;
-
         private static readonly AsyncLocal<ProjectDirectory> _project = new AsyncLocal<ProjectDirectory>();
         private static readonly AsyncLocal<string> _projectTfm = new AsyncLocal<string>();
 
@@ -49,10 +46,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             set { _project.Value = value; }
         }
 
-        // Whether to use a local cache or not to prevent polluting the global cache
-        // with test packages.
-        public bool UseLocalPackageCache { get; set; }
-
         protected string RazorIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "Razor");
 
         protected string RazorComponentIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "RazorDeclaration");
@@ -75,14 +68,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
 
-            // Additional restore sources for packages used in testing
-            var additionalRestoreSources = string.Join(
-                ',',
-                typeof(PackageTestProjectsFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
-                    .Where(a => a.Key == "Testing.AdditionalRestoreSources")
-                    .Select(a => a.Value)
-                    .ToArray());
-
             var buildArgumentList = new List<string>
             {
                 // Disable node-reuse. We don't want msbuild processes to stick around
@@ -97,20 +82,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 $"/p:MicrosoftNETCoreApp50PackageVersion={BuildVariables.MicrosoftNETCoreApp50PackageVersion}",
                 $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}",
-
-                // Additional restore sources for projects that require built packages
-                $"/p:RuntimeAdditionalRestoreSources={additionalRestoreSources}",
             };
 
-            if (UseLocalPackageCache)
-            {
-                if (!Directory.Exists(LocalNugetPackagesCacheTempPath))
-                {
-                    // The local cache folder needs to exist so that nuget
-                    Directory.CreateDirectory(LocalNugetPackagesCacheTempPath);
-                }
-            }
-
             if (!suppressBuildServer)
             {
                 buildArgumentList.Add($@"/p:_RazorBuildServerPipeName=""{buildServerPipeName ?? BuildServer.PipeName}""");
@@ -132,8 +105,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Project,
                 buildArguments,
                 timeout,
-                msBuildProcessKind,
-                UseLocalPackageCache ? LocalNugetPackagesCacheTempPath : null);
+                msBuildProcessKind);
         }
 
         internal void AddProjectFileContent(string content)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
index d5d9ee61de..2f2ddc2d46 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
@@ -19,8 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             ProjectDirectory project,
             string arguments,
             TimeSpan? timeout = null,
-            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
-            string localPackageCache = null)
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
         {
             var processStartInfo = new ProcessStartInfo()
             {
@@ -30,11 +29,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 RedirectStandardOutput = true,
             };
 
-            if (localPackageCache != null)
-            {
-                processStartInfo.Environment.Add("NUGET_PACKAGES", localPackageCache);
-            }
-
             if (msBuildProcessKind == MSBuildProcessKind.Desktop)
             {
                 if (string.IsNullOrEmpty(BuildVariables.MSBuildPath))
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
index 5966051fdb..810f24b194 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs
@@ -16,28 +16,22 @@ using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
-    public class StaticWebAssetsIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>, IClassFixture<PackageTestProjectsFixture>, IAsyncLifetime
+    public class StaticWebAssetsIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
     {
         public StaticWebAssetsIntegrationTest(
             BuildServerTestFixture buildServer,
-            PackageTestProjectsFixture packageTestProjects,
             ITestOutputHelper output)
             : base(buildServer)
         {
-            UseLocalPackageCache = true;
-            PackageTestProjects = packageTestProjects;
             Output = output;
         }
 
-        public PackageTestProjectsFixture PackageTestProjects { get; private set; }
-
         public ITestOutputHelper Output { get; private set; }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        [InitializeTestProject("AppWithPackageAndP2PReference", language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest()
         {
-            await RestoreWithRetry();
             var result = await DotnetMSBuild("Build");
 
             var expectedManifest = GetExpectedManifest();
@@ -65,7 +59,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_CopiesStaticWebAssetsToDestinationFolder()
         {
-            await RestoreWithRetry();
             var result = await DotnetMSBuild("Publish");
 
             Assert.BuildPassed(result);
@@ -115,7 +108,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_WithBuildReferencesDisabled_CopiesStaticWebAssetsToDestinationFolder()
         {
-            await RestoreWithRetry();
             var build = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(build);
@@ -137,7 +129,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Publish_NoBuild_CopiesStaticWebAssetsToDestinationFolder()
         {
-            await RestoreWithRetry();
             var build = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(build);
@@ -159,7 +150,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_DoesNotEmbedManifestWhen_NoStaticResourcesAvailable()
         {
-            await RestoreWithRetry();
             var result = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(result);
@@ -173,10 +163,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        [InitializeTestProject("AppWithPackageAndP2PReference", language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Clean_Success_RemovesManifestAndCache()
         {
-            await RestoreWithRetry();
             var result = await DotnetMSBuild("Build");
 
             Assert.BuildPassed(result);
@@ -195,11 +184,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        [InitializeTestProject("AppWithPackageAndP2PReference", language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task Rebuild_Success_RecreatesManifestAndCache()
         {
             // Arrange
-            await RestoreWithRetry();
             var result = await DotnetMSBuild("Build");
 
             var expectedManifest = GetExpectedManifest();
@@ -243,10 +231,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("AppWithPackageAndP2PReference",language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
+        [InitializeTestProject("AppWithPackageAndP2PReference", language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })]
         public async Task GenerateStaticWebAssetsManifest_IncrementalBuild_ReusesManifest()
         {
-            await RestoreWithRetry();
             var result = await DotnetMSBuild("GenerateStaticWebAssetsManifest");
 
             Assert.BuildPassed(result);
@@ -282,47 +269,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        public Task InitializeAsync()
-        {
-            try
-            {
-                return PackageTestProjects.PackAsync(Output);
-            }
-            catch (Exception ex)
-            {
-                // We observed pack would "complete" in the past but MSBuild would get stuck.
-                // The generated package looked right, but it caused flakyness on our build infrastructure.
-                // We will try and continue running (even if the process didn't complete) and see if we can
-                // complete the test successfully.
-                Output.WriteLine($"Pack failed or did not complete: '{ex}'.");
-                return Task.CompletedTask;
-            }
-        }
-
-        private async Task RestoreWithRetry()
-        {
-            for (var i = 0; i < 3; i++)
-            {
-                try
-                {
-                    var result = await DotnetMSBuild("Restore");
-                    if (result.ExitCode == 0)
-                    {
-                        break;
-                    }
-                }
-                catch
-                {
-                    // Keep retrying if it fails.
-                }
-            }
-        }
-
-        public Task DisposeAsync()
-        {
-            return Task.CompletedTask;
-        }
-
         private string GetExpectedManifest()
         {
             // We need to do this for Mac as apparently the temp folder in mac is prepended by /private by the os, even though the current user
@@ -330,7 +276,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // validate the behavior at runtime.
             var source = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? $"/private{Project.SolutionPath}" : Project.SolutionPath;
 
-            var restorePath = LocalNugetPackagesCacheTempPath;
+            var nugetPackages = Environment.GetEnvironmentVariable("NUGET_PACKAGES");
+            var restorePath = !string.IsNullOrEmpty(nugetPackages) ?
+                nugetPackages :
+                Path.Combine(
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Environment.GetEnvironmentVariable("USERPROFILE") : Environment.GetEnvironmentVariable("HOME"),
+                    ".nuget",
+                    "packages");
+
             var projects = new[]
             {
                 Path.Combine(restorePath, "packagelibrarytransitivedependency", "1.0.0", "build", "..", "staticwebassets") + Path.DirectorySeparatorChar,
@@ -347,71 +300,4 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 </StaticWebAssets>";
         }
     }
-
-    public class PackageTestProjectsFixture
-    {
-        private const int MaxPackRetries = 3;
-        private const int MaxPackTimeoutInMinutes = 5;
-
-        private bool _packed;
-
-        internal async Task PackAsync(ITestOutputHelper output)
-        {
-            if (_packed)
-            {
-                return;
-            }
-
-            var projectsToPack = GetProjectsToPack();
-
-            foreach (var project in projectsToPack)
-            {
-                output.WriteLine(project);
-            }
-
-            foreach (var project in projectsToPack)
-            {
-                var psi = new ProcessStartInfo
-                {
-                    FileName = DotNetMuxer.MuxerPathOrDefault(),
-#if DEBUG
-                    Arguments = "msbuild /t:Restore;Pack /p:Configuration=Debug",
-#else
-                    Arguments = "msbuild /t:Restore;Pack /p:Configuration=Release",
-#endif
-                    WorkingDirectory = project,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true
-                };
-
-                for (int i = 0; i < MaxPackRetries; i++)
-                {
-                    try
-                    {
-                        var result = await MSBuildProcessManager.RunProcessCoreAsync(
-                            psi,
-                            TimeSpan.FromMinutes(MaxPackTimeoutInMinutes));
-
-                        output.WriteLine(result.Output);
-                        Assert.Equal(0, result.ExitCode);
-                        break;
-                    }
-                    catch
-                    {
-                        await Task.Delay(1000);
-                    }
-                }
-            }
-
-            _packed = true;
-        }
-
-        public static string[] GetProjectsToPack()
-        {
-            return typeof(PackageTestProjectsFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
-                .Where(a => a.Key == "Testing.ProjectToPack")
-                .Select(a => a.Value)
-                .ToArray();
-        }
-    }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 0bba7a6407..84daa6f3fb 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -28,19 +28,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>Testing.ProjectToPack</_Parameter1>
-      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\PackageLibraryDirectDependency</_Parameter2>
-    </AssemblyAttribute>
-
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>Testing.ProjectToPack</_Parameter1>
-      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\PackageLibraryTransitiveDependency</_Parameter2>
-    </AssemblyAttribute>
-
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>Testing.AdditionalRestoreSources</_Parameter1>
-      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\TestPackageRestoreSource</_Parameter2>
+      <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\PregeneratedPackages</_Parameter2>
     </AssemblyAttribute>
 
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
@@ -126,6 +116,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
   <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
     <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
 
+    <MSBuild Projects="..\testapps\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
+    <MSBuild Projects="..\testapps\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
+
     <!-- This target restores SimpleMvc11 and SimpleMvc11NetFx separately because otherwise the TFMs in SimpleMvc11.csproj and SimpleMvc11NetFx.csproj are not respected. -->
     <PropertyGroup>
       <TargetFramework11>netcoreapp1.1</TargetFramework11>
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
index f92a85eee6..a082defa12 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'==''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'==''">$(MSBuildThisFileDirectory)..\PregeneratedPackages\</RuntimeAdditionalRestoreSources>
     <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources)</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
index c6d44d95f5..9a11149cd1 100644
--- a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
+++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'=='' AND EXISTS('$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\')">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'=='' AND EXISTS('$(MSBuildThisFileDirectory)..\PregeneratedPackages\')">$(MSBuildThisFileDirectory)..\PregeneratedPackages\</RuntimeAdditionalRestoreSources>
     <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources)</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
diff --git a/src/Razor/test/testassets/PregeneratedPackages/PackageLibraryDirectDependency.1.0.0.nupkg b/src/Razor/test/testassets/PregeneratedPackages/PackageLibraryDirectDependency.1.0.0.nupkg
new file mode 100644
index 0000000000000000000000000000000000000000..3d51146a4a5b0c65192a74eaa47200572d9e52d0
GIT binary patch
literal 5103
zcmcIo2UJtrwxz2SL5!dRDqIjmNTC-2>Agq^5Sk$g5DXzCp$VcOO^Q-Qib@j!L8U|i
zsTXNN0D&k)ih}em3QEa~-f=%ZuKzpUAO9y~XD8?6%(cc`d#}0HHZx>o0?^UX?WcRI
zm1}lBPee?Vo{o;4fsT%icGU@w!Vo~f@1IHW!|n_auCOJxD-m%4^0s8Ghu4uIE3vig
zNKo9}j>lP(5yA#nHd)FulQaSpJ2E^wQ&S~X$@lmnS_>G>_7IB@o{SzJw`sx8IcFR?
zmX=)j-nA#WelXe8D{XBKUo>AejnVGUiZ8*P@K{^}9!<p`W0@2QY^5K#^C>Ot5)0W<
z16zR%SlzhpF2ls@aGw=7$<VPVRXP!)2L7XX5pvq#nH2k-<F7`#>_&;aNClG8sa&2i
z<>a!vtO1cHf)lJM-NxIkP8&#aipKI6cx86zHf5l0RqDFFc&acXFK$8;8j%Ze{JI0x
zW!L4{coA*|hN}2zh~;ayX}>Lic|S<7nJN<#3zT8q5*fF#TyU?tXHr<`{`J#DhF3H8
zo)VSD7?sLMXZCM=>U&an(KJ4XX?I0ve44=#m*B1_BeXLfj`!C><538r77B;LB2id`
zKM?Cpz@ZQ^3C1RkV6L!ry>|_($3Flp4+x4{Wjz&-)COIgM?1@w#4eO`$bVp$h^yeT
zt}i#~6<R6FSdsS}X<Zus9DDPPci8QVcl*Q}uM0Qr2fWoN6l#pUf8TNJLQtR<$2c35
zj<o`R3|J$d5~|>+LAEzH#FBam_i+x1l6-(xTO|e2nYjGsV`FWD2l!udWy|`VzT=uM
z-e*3+ImBV{)h*RSw1;8+FgQ~S+-J@mw_o>#KQ28tiHHhB#ezuQS7*KL`FqbYQ}0CC
z@Ru(4F(Jhj#r7dO8~pMVCJ0c)%!!tD1yH@$*;r~Rb<;&==7PbOscgX8JW{FHm7SfC
z#VTrM?$VNvj`4wEfh;?l;iD6&lJ%o7XrsZ9c6j1u`T*$}SkC2WY03DyH%wSNoO7W|
z!ouWoW#|r5U|gAT&zov@Cget8e6qr^vrtl3a6{x;XKOQTN;PALtSS-!&xQoXUHwO_
zD1o_V@6R7Le8Nl%5;q;4ByGZ=ok3U>Q5FaW{U&Tk3}(UF0RylCs5WBT%`>~NMM8ob
zLh@THNDt^`G+x-{_S~*|0cf&PQV#G{1}jUCq=o@c8)zZc+Fptt=DxBLvC+eIGEOgh
zIrq=#X5F0Eq8v8_Yq=0Fmqt>z(Y^&ojlkh$HKW^#Q};IS5?m)oZl3T<6w(4{SNg<G
zv%3o_H(pj%yxCLv1tWT;db+1d`c>-#@6<EB77mMmN=I{!;b#I)WJq#~2c?`cF;Wi0
zuNv7^l_Rc9BLXAcv~G0!+GX@w)v0x>%sPvh05o+0tyux|?y>#&0Y|Q79&QieFfYMF
zX@OREqUtU?JjyK!AFYAcuTwH)T7_S8TUx6t5EvB;ZoqPYBH=rW;kA=x=#!+O6U|2+
zeZt}(1zxxK0QkctY@0U+e2$J3c)2L*)LY?h*WQ*N;OKmyD70!o|D3r`XWV8@v*^KA
zq75Gsy!|qhyOYQM<{H|oSbk)v%s8ezp4muacw6W-`)qsm-7l4BUKO|(H)qa%Qh-z1
zNGy{eQLWZf;l^c_?MK;aZi<ySmCynSd;M}fVvzM^v{k)Bk>qR>{LsQR${p^$1!Ay?
z_yWM1X+-<U+4gCR{J|NMkNz>$It<jfjoO#FS`Hsfx#bzdp48_=1{}J3jS9?M_Scxn
z+zf6n(ET8HgONKzMD@%H`bL!&N8npJ>u#N~;c~YASXav&<2C-LDMn*|tTBMqPtvcC
z6;s4w{bVkO*Je$xRBo;xsq*01R-V1pos(lyiz#Ulb65$4_L!rF<PBpIB&>lvpEH_R
z0x_nK=cSJ?pM$=#O^%s)etZN4!-RNs5$9b#K6SwP>91$?70<y$_+MP)X}2GgeU#WC
zT`|)MJ)Mzo35M5+vi(+$@h2y?C<@7LL8GgVV0j+G3Jo4(t!JaaD)@Kuggn$YjzO<s
zg(BX8$kcJAC&I>^>}qZHE>o!<mgUtbN>2wXPtrw$wD-!@O7~<wXD|5GqWuUyT5KPX
z=g1p}dM`RwX!{YKhD~?Y`Be<xuc_H+@t#r}C47sPuRTHinw)Z`P~1QwJE13B$2w)&
zr`g4aKd@kK=;i`MWGk}xP?wKOL*cf)Zwr5b+u%h!uaw0*#o04Y?Zoa^m{il}<TVI%
zof-S|Cd(`xso(dYJK@vAK9-M~tSVqNR}#E##Q+h1BG7o5?Ogl8*HU3h=HDO@kB&_?
zcs|#-gcakhGv2}9OnU9LQV__ALNdPk^P8QJ5G=U#&_`CH^>Jd~mj44wrPQ65w;or4
zYou08Okd48t$wt9|3`^RK;Qd_GRAw#&0C?31Cuf1HvJV6s*AR5Ds$IgFb#Xx%x`U#
znJk(?CuJ{5k6zO>8q98@x};4`5|Tz#mX~h_vHI)Oa{5QvS6lf%!}&KtYpzoFB`P-(
z)LVmR2Zl5Xr*u#4J7nKes^i_8mmnGm`P$7^`HWt5GH?Fb)<dm$zH+4sZSry6F0bk)
zzt4-y03a`KleSb+biC>qlgWeY^@0XjvN0AI_HFps<FPl|Q`vPp1Aa=@a{_SCV4&om
ziV{VqagO*6h}Xl5%V>*W{sJeED=L!$nN@$1$f>-q=DbTbXUHQ46V)Q47+yQSDE)N5
zg}1tj@r={*@N@L(+(GPDPCgm~Mtid>u}e4;nRf6Aj1O5A(({k4sSd{2D}q3;uQ?{?
zoEQwbr5x>f(qwM-^5d9-5cXNThhWarBcJ#?eCr+Fon<TMArwL!M%T$W9_|+U3r?;K
zVTcD+)D!RYKahm{yc-=S`ct0Cy(vAOU3pCP_~7ko_y^c^zRZxX>_IPCg#v&WEtV)5
z5dx9b)-zez4*!mCFzTVEUw*S2b<Td%YusYY_-U(!Z72HOC}6N9b9^j4UU?>>($h0d
z-gn>ZSJ6T7b$2=#CsgDqX(G{gTd|>fXjP3zcEhP{wvM8OZ7+_i`&p%FnLnZnw6Q_U
z_#bFW4W`Y`-e?RGWQ<1OJqeyJM4&nWXM!SXdg4()3nH9|Mp&bq)d>U?kpRTuJ#mEO
zc(Os`c|h2@#;72GO`rEJ?@`7#g-k`E<zsnfrxULW7`y(tmG3XdtD5j+EElaYXzV4w
z-m%?Ti3_T`>Q+eMtBBRLRzH6@dOHXDSSiNQ#@2=Ts(R2Rc1)a}V-<t^_#Cb>P5A=P
z++8qd_Dc=7rEH=A*@cggsTyAvE|oq*43xo0B=_>qRcT~M?Q}Y-x1CoWGK|8`=})B1
zRB^yELnKc54>tsr=q@Fd$H`f|YNozON)R04>r7RDH4hwF{gQ64R497+7W;#)Z*CO*
zJHg5xTk`{M+;S-@Whz^rcG^XcW+AoO4iM)<Gj8|D>4sA-^pL*o`>EEUv3ObYs?P-)
zdv>%T{$DKqMmm4+7f=^aXMFxb5Y!!iLjaT#5)$i*RS&vwgTb-`+9oeuDORVTR;<-k
zQc({gy;Q6dvjSBJmk3KMo|A1WsZb#0+C0e=tIM>}S3l_%8mro&uqV8J-Hi|nnnRAX
zq42k3#@-kr+7ga;MG?_h*WW4pZ{5^41)VOCkrov>eF~ze3{jzoN*9Qg<oAe_?H5}}
zfW@VyB&4O-7g(DmIhhsZW^&3j>6~;C+T&<4>E<Cg%|Q%p$o%c7B_56?powT7)c={2
zP0wW>3QG%@h^df-r9mqHbUD9Ygmg+4Bq9r{G~eYmkH&4_PcA=AZ!{_LT;vm_x%$1h
z<);n8kNx3`a)$rdA0PyQ0HS%10@A)1wn_9Fwx2O3pS_R|)oYUgw(1v^o40nfw{;j&
zj9;~xc0$eanfDlouh<YbqX9e7hVU;8xD!CQORkd0AEmS;5`_c06MFT|k_~}v9bFdP
z-In>2AI;75+Dw6Dn&H=mrjlM{eP+mAaTN=hKDN?cZwskt^F%|Ug*jWF>}RP@tLD+?
zGy<;xFh{yk#r~D<va&MtKdp0Gk7UI0=gK(ElUuYZ@-S_-)AYm=QCOmrr9TcuZ~*#w
zU~&`4v<jZRWl67EGwH0mg~F-O!3DZ%dJtD7mhbjy=)B4J!it=U9x+m&nA*}+`VPxU
zkO`3B$Is4R8Me880DrQle?U8Ywhb%)Tz+9wRFF?rba7r-qpK5Qq!92}8g7niMSaOe
z924;G|9WUxv-g}*t3Fs?q~+ivkLL0x3L7F({>u5paNZaUxqTpT!u!qPCOSt;-_1Vi
zDXY;WSfVJWY4C;#$D0Z#$V&p}ni|(c$dMyf(M;8mvk3e5NUkJ`v0)x5+FpXLR(!|H
zN=eda|J6%w!!vbq-{bJlKF2FrqTh>_J@aUse9r;6zxo^y0fqNLBTxj82Z{(s!ijJY
zf|f-kzi%fLo`|O1kVQx#T~N+4GDw7+3<NCW?2ME{Izy0flpGiWMk0VXf(H_Ti%D=Y
zYy<<EMw#n0r$5~;dc%?G!7Q*bc9JD(BTd9ty2$tyxtKIMB7yae%=A1kwPmtMuK7yQ
zbtv&Y@0lT)kYviu0#)>w&(nj!Zh;aWt*!}MAB5j{OfSrMkNMTNN~rd#PG3iu8?30J
zF}B;_JhQCLs?f&*Jr)rCn;q*@;@3YlrZ-T$1(r&umD7#PSH9t>xg(jk5eOCiM;A>w
zLT{B$Wm)niks4tMw+_Tw+EoTS^ceM>H#bahemhWc3}&eDJmw>ed?Z9T;^QjY3;DB2
z{UG*`Z01lufuO>!rufg-+?QF6HQ!rM>jypz9nZP>S~KGSRO%8VReZ8lfbmPOWFzjY
zFmJ@AzGvOO2T33Tgg?hj-;@*1p%GKN*xvGmC(`M8UeA{8x8kW68anf+Iz<arwwb9v
ze0rgMLI56^hHY$rse_fyusU`A*~MrHhvKs68KYT@&%uE;DPFaEtnECmt2G`Uzi;Nh
z;!Do}p!@Gn255i#>Gjh&ftlgIKe)FA-hIl9wqSlE4}UepKSTbiQ`?2yqOHIGsBilj
z`t2`DfnDe?`~UO8U@!V!iQGj$$ND$=Zy5QZM0;`fD%>tE<!{{oh2HJ8vR9sVtpw4|
zihdML|Djm@Y~fdGvTFgt{y%HWUZlOUv5S=O3#4C($j^x1kH+?<{ar+1j$ewvUVyzh
fau-11;QvF$G&5vo`EG)Z_HJOLqdUs={nx($&VN_z

literal 0
HcmV?d00001

diff --git a/src/Razor/test/testassets/PregeneratedPackages/PackageLibraryTransitiveDependency.1.0.0.nupkg b/src/Razor/test/testassets/PregeneratedPackages/PackageLibraryTransitiveDependency.1.0.0.nupkg
new file mode 100644
index 0000000000000000000000000000000000000000..bf0b526a9b2ce97909c5cc61ff3f7db97d5911ac
GIT binary patch
literal 4978
zcmcIn2{@E(+n&fSRF*=PY=g|mU}#WTiY8%fV>irT#$e2hB}8NisVrF&N)g%jC2J*w
zku4-CQX)#omhb8Pj`!8;=s*6x_xQe<<DUDNd7kII&N=V<zRv41MAGl(27y4#ph@j)
z!_Di~6*9X(ATBx(hz<DFj*KHxppYM*39&Y=E%Myq^GxfUqASXHH%r8W!+p*6d|Dgy
zcrvQ>8IxYZ>O3DUSb=dAr*b}HQRC+7mp(xni)MfKa`h4LDf_Vak*n$&l1eEPQ*S<F
z8p7xeRt;Xd3L9|@zj%A$%=gIa;AMN?BR84Sq&gT{jRV7DeIXj(n6qz}i%uj4!+5d~
zkdbutjZA*Ikmz%FHB~4K@4OFMpfs%<ss~sdT3p&%neVqvZk8_Ta|TB&LP!E$&!x~>
z?%=ZVn&P(iC+)w=_}AOGDVu85`8~chjD(HaYkwd4WY_)Z#G5#&bD?bVpG9-Do^yHB
z2IYu_#`7-thnF9UH#x_olad#K^3qp7n;(~#T1g-OV4+ucqUfqbfeSJ}_4x<CCukqf
zoAGt6kOn}otu1<x;ol^!rd{(q21x1+NGc87VTf^b#W>^6;vL8s@_7?7#+`zv;=OU&
zI1<hsi*t884{`URkZ_JyP{?zw@?2wLOB`m)kMMlVqEb943<Gndt$ndn<iHbU$D9l?
zPexu{>&vpQQ4wakmm$vYHc!DaJmwv0KO_>vCM%S1%H7ddvSQ8feF+xAGmD)>%b4y^
z`kIT37NG)mPHxPfq9{<S*{13AMC`)?Er?s&%8T44smH!8(QNL1^M>yPib}yxlHbc;
z3;~UsKB&kOTH)|nOSxD{p?m8^lf9Xxb;lvM;Pu`_W@$3d{^_vSS}FHv5rc8Z^(ak}
zc{T!Su_>96y5F9=MzKded0Ub2p6)=T=^o^@kS$f=xmDJO;&UzTF<WE9vmm~W<h03b
zFRSPJ0(sZWy^p^<y`Z(#2FDWwy(7oMiSuX>LH^}FYIS8fxNKv>={vWhtccREI-4-o
zA>8g*h_H=Cc2Uy|ux0<g00RNph9WMbMpX=e^7}v_RbV3G9iZ+wDus%1$70A>1&BQK
zH`WA8B+i-ZU*Xo_4t(7Gy|}3*Ji|pd6Vt5IRarKBW_OGNqP3?3as)<y`--N4!5k53
z;FDA9JRIzDxjFQ}{)gw~wfD#D<?INiKVWo;2|^O<jb?#E#rdI(oP~C#D;u-jBFXlb
zSv)Em*8G=d{Fn0b32k=gGe$0h!xa%o>fV}!Iiv3eWY+u6b3^J>%*2ux-|&kiuVLxV
zA+-tKFr(*ZTRmT%=%nZ;9O@#M_cvTIBePlCm1g^EVI3WqdJnkX$-k54ZZh{Oduik_
zuhfjDj^tCTYrD$%OK^GhB9n3wgSxD9sFC;YM^UEV2No^wVL{$2Ivn$b2l3bMXh+}O
zjL{zUN5`kSD9xOyH5?x^9HQ6QFLJzZ@9Kc*^qBpdTu1;0^+<mWvQ#%clXbohQazU{
zYTj-!Y&n<>SID?0I%GOxt~G+Ei??mEo*n--A|jT;cN(o|Nlp<Oe7j~C;6lnL;-v(V
zHGRg@w5MaYBs)`1pwIOt@e4b`&X})rVBhyu(!v^Sm`)i#g+7guSvpOG3wJTWEv8v-
zhn0Sj61Z(D>Z4lqj88`|QOnF9o$Nzfp(c9KK=IX4uQ13D3bn^v81}oU>hJTA-O$Ep
zPPnpq$OO=V-NJb9j<bDGoL!+qyf?Ckt8-YNy2M%~a~3RUT5UJc$+{=(*tf!6ketBR
zgb|k6R-u6pdd~{_xGb8SKZwig+3i}P!JF7^7=-Q#OM4RnHwsH?(p+&D*wo>lcsrDX
zZV3u~3!dO+H_GJhNs87H^H|ir_+qkiS5D~sBI;Ekwjk4V@m%LSrkVx0A^aynFG(9C
z1v)DK@}Y{jLKvQ>Q}ct8PfoQ5YiHVM3Ke+^m%kV9E&$7$gmd2FBK5Ib>d%;ln%*P~
zn|@)>LCxzXr8miV4hW&ocUFdkzhY@sbK+i2zQGrsiw&FjW@fLy$h}f+{Q9azFI%O4
zN|f+I+^u)<%5Vv*=Uq)a1Ir0G?n6VINBWBHhxg576<K4elPk}DI*n<`xpd&RpAQ}8
zsd-y`m8AQ#*_ua{1)FciM#qiLIzGtP7aP2)=~47xnQDWm30Pih>RGQtQ?D1qt|RK~
z2aqib%eCEC560))V{=0NUpmu1n$#6C*)><=SciP1JRf<%2<F<6eh1|m$md+&3p!+v
zr&kVg`2~z5yKv>O24;DgiduH$BHV70!V;%6h$}G5pdzGZo$VeCab*qB#yDs!$3*?{
zev2)KZ0F9{wW;=CSlOM=Bo7UObh;j{aHC`?B0~dFzqtrE3tZ^EztV6+Ic}8PX5)Dz
zY2o2RHQm|}POQz)DRzp=drDLg1Qf&&KD}B~w|<?nSTx<wKh59prps?b=*f(&s6onD
zWS4<Q)@6B9mQJ0NnuOVnsgbGIE3(c#f|ns|((X%|?xF)oi3G6)1>ES{@F~M~_=JMF
zu%>vK0LJP27xe_D!)F=Z#4hkC<=A{0^Nn7f8J*w~;;Wk66l^c3#JoQF^33Ur2yo1E
zuzShF+-r0`;YE;I!S$u0C!;l~ja&l`T|I~6Ja#eWGqSuWS-AJQ_ybM6CNJm`{|%j@
zU^C%OMg|(ih;1r>$Zma5g@IN|vn68i@y{cN0$UT3Tu=0U<sONrNl&z83ET75<Bnd_
zYrCjZezn=w)|1NwZ|^7#>7(h2o+kvH%wkd3uUG>kZC?q#YOSuwU-av+WRS&!IZ#is
zWZP;E%(pPDHc%J5?Ulwq5!VArN&DJxMj7)WafWa67TMp#>?@LJFA`oOchTSdXfIjU
zoWI_TJUwg%HBj?eP{0<qVhp;)&HFB0wT?Zke_sg^0WP=f#6R}3%a-+tDK}giSnW~q
zXpX+#oQE~eR9L&D>S=H%fbIfaeVI(lN$%*Y_dFNHP}i7xVKUw<U)N|d!4(DGlj&`t
zZ-qLx(B%t3cl)e_6k{X4h)jC?WXFIT?7uy_z6rR%3}DIf!0h0KCt{)cct^4a#lwjT
zIY}X%!%?+7$T)~G6+^{4n&TW!QYe65KuBZ{66Hp0^O@EYT;cN}^ITD3*%6=E9_$*;
z+ijxBzks^l<>Yd@Z>$($)m3(WAvS;kuD>5;;5VAS+87l0t?_uHFX5}KZWI(6a#3pc
zy8j)U3ma?Ask^fR!rwfx%oH&yB}-Tv6t=W2wO~x&A<BKw&8#s#z4s#DEyk#$<_#|=
zmZl98$qGcd3fR6c_rg_pzUUK!%X(*%AkzK=^t`8%CE=PD;%ZH-1Vah%@K;7#wb#f3
zW^SCN@kV3$&6we4lIW4_5bw{?vxBqHW=6t7d*+uFjxj2~lSq1rT$p5PxLd7M3DZ{n
z=7RYV0*|LRV|p!SdWyQI)HCen(%ko-D;q#cKdm5dBS1ncU_kzo@;AKn4<Y><{Tua9
z7zLUU$dQMjNg*LI&h94zjUwqxo|(17VKv}JmE#54Jtfsm(27T@jbKw~wRnj*OjS*(
zy`);DA{$+l32w|p>zx#K360Tsrm}-vZwAF3{eu)R)cz!=??t5IO)z9<92M{G{5!V)
z|5DX6fJ)w1gh@$AiX2r%9918Xg53v~<SJx?j~1zviI*K2kf;z*f=VbsYf#&a;{e7c
zI~WHEwfZ>$Oi92{`IGT>efVEx`?yLmM;s<z0#>gOhe6f<BkqL&caER97pJwJ+Z(wK
zG6gt00|N{Uptu5#jt|ZO^T*MF5-3oTtFs*SuWDBgiz7h@ls;YAE+nM=S&uP|W|I4E
z3T3F<ZUE`h?~?6B8pwHe=`kElmr*xX>}M<O^Fl`LTa1Ds6*^H~#wfOar6q;MFQ{lW
z&43HsM4saN#qXx_2Ks5cf1>uIr7<7eke&c283Oh9eqgrJ@^Gi(+^KdZ=Set<4aC=t
zm>t&)RNCy}^Sbp~39^Jf&lAiQqq~+F>rYJ9x}j6iC5V`+wow&PH!V_m!}yl74jvw%
znySvrq3Y#r3Lmr&c^RST?H!xtSDCi7X|w)a@9C-5NCYC17ENK_-+k-j+2jQFnrF7u
zBX`6&5yx-)6H}#_R9PhNPrkrZbR{qEVQSPqI(q4LS-m~h)wXBiPEpw{Fyq4QmvhEj
zttJ<&2xDqEU)D#Q{KZdf`nh`4Y2(`0+00B5cv*an2TnicQ$M(SYUZv??ebwbo5uHw
zbY98Oai#K4Ur!F&0sr^!1@R9>R303S_5{*jDWJ%Y^Go`7M*^kb$liEI90lrzqhhca
zDhBEZq(QkKM*v5r;(-frRVA!E7Utk2ujHiYaMVdvS<wNea8%w&Q6BD~gjIr&C~jCs
z(iM~yvQ?ftkZ*%CtH-L;68?lJoBR3_A0x+SC1ke~IxQjI*mdin#mgBk;Q-_}$n^5m
zP=?oI4bVf+N?nwO-U0MfdCBNuJRWvSYG`WJqEN79pAEe(qZ*scM?OoQc7#zG*KK^s
z8;&YX*<C#S_U+LLIfoBc??$g5XV`l%IpY=kgTjx#Njk3{W8<Q#a@zQoI4T4MKI&OA
zFb!lb>|ItXC(xIAqLE*EvtkKSRmDE3k^H&@J=Cm}0KC;jFFCQqIzLSF`ed<nV5d+Q
zzr?a^!k~bHFo`KElw)*;;;DJOL&-PnURLpoAarq^uwOaihOnG|X58?BZ$8FSQ7+_a
z>Oqb!sT!3)vC2ygl-vs`(Gv%Q&-nSV#xg6f-GgR~`ilhirJh;5@fFdt(skv<M^PPP
z4Yp57V&0=>{fD`EEj2A-UX<FHpHe^3NJbRvBo@Ml1CGTXOS92be%SH22qo(KS>t%S
zY~x?+yNiw+^nbVUz->RheroCsk$-=1XS2HflrgYjej~O2yLJ5;_E#;~Hf%qz2mf(H
z_H&rYUwHd=m^aM-xzq1N-)VQ-=yI%oqW^|Me>loc?4544jotAl_CNHloso9B%yy&z
zpnLwK8u|yG^K+D6`N4J+753kEho4b@mCCnK`vBBmB=(&EJ2T%lz|@}qK^`<jGBExK
Q!3w;S=s}>zoIk$(3p67k#Q*>R

literal 0
HcmV?d00001

diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
index ab772a0f92..2f8960787b 100644
--- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
+++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
@@ -22,15 +22,7 @@
     <ProjectReference Include="..\SimpleMvcFSharp\SimpleMvcFSharp.fsproj" />
     <ProjectReference Include="..\SimpleMvc\SimpleMvc.csproj" />
     <ProjectReference Include="..\SimplePages\SimplePages.csproj" />
-    <ProjectReference Include="..\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" />
-    <ProjectReference Include="..\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" />
-
-    <!--
-      We don't add AppWithPackageAndP2PReference, PackageLibraryDirectDependency or PackageLibraryTransitiveDependency here
-      as PackageLibraryDirectDependency and PackageLibraryTransitiveDependency are test packages that
-      need to be produced on the fly and AppWithPackageAndP2PReference depends on them so adding them here
-      will make restore fail.
-    -->
+    <ProjectReference Include="..\AppWithPackageAndP2PReference\AppWithPackageAndP2PReference.csproj" />
 
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj"/>
diff --git a/src/Razor/test/testassets/nuget.config b/src/Razor/test/testassets/nuget.config
new file mode 100644
index 0000000000..901ce91b14
--- /dev/null
+++ b/src/Razor/test/testassets/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="pregenerated" value=".\PregeneratedPackages\" />
+  </packageSources>
+</configuration>

From 069b409dd4eae142106558d0a4f631cb2b7d4938 Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Thu, 7 May 2020 17:35:41 -0700
Subject: [PATCH 328/337] Fix perf issue in LineTrackingStringbuffer.ScanLines.

I noticed several hundred ms spent in this method from a customer profile. Primarilly, the method was doing a linear scan of all lines trying to find one that contained the requested position. I changed this to a binary search, but kept/improved the optimization around checking next/previous lines before instigating the search.

Note, there was also a bug where the old code did:

else if (absoluteIndex > _currentLine.Index && _currentLine.Index + 1 < _lines.Count)

but it should have been coparing absoluteIndex with _currentLine.Start
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/32a0f28708cf14f1c35349031fd6f9d33899220b
---
 .../src/Legacy/LineTrackingStringBuffer.cs    | 87 ++++++++++++++-----
 1 file changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
index 99879dff15..d99264cb2c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
@@ -82,25 +82,51 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TextLine selected = null;
 
-            if (_currentLine != null)
-            {
-                if (_currentLine.Contains(absoluteIndex))
-                {
-                    // This index is on the last read line
-                    selected = _currentLine;
-                }
-                else if (absoluteIndex > _currentLine.Index && _currentLine.Index + 1 < _lines.Count)
-                {
-                    // This index is ahead of the last read line
-                    selected = ScanLines(absoluteIndex, _currentLine.Index);
-                }
-            }
-
-            // Have we found a line yet?
-            if (selected == null)
+            if (_currentLine == null)
             {
                 // Scan from line 0
-                selected = ScanLines(absoluteIndex, 0);
+                selected = ScanLines(absoluteIndex, 0, _lines.Count);
+            }
+            else if (absoluteIndex >= _currentLine.End)
+            {
+                if (_currentLine.Index + 1 < _lines.Count)
+                {
+                    // This index is after the last read line
+                    var nextLine = _lines[_currentLine.Index + 1];
+
+                    // Optimization to not search if it's the common case where the line after _currentLine is being requested.
+                    if (nextLine.Contains(absoluteIndex))
+                    {
+                        selected = nextLine;
+                    }
+                    else
+                    {
+                        selected = ScanLines(absoluteIndex, _currentLine.Index, _lines.Count);
+                    }
+                }
+            }
+            else if (absoluteIndex < _currentLine.Start)
+            {
+                if (_currentLine.Index > 0)
+                {
+                    // This index is before the last read line
+                    var prevLine = _lines[_currentLine.Index - 1];
+
+                    // Optimization to not search if it's the common case where the line before _currentLine is being requested.
+                    if (prevLine.Contains(absoluteIndex))
+                    {
+                        selected = prevLine;
+                    }
+                    else
+                    {
+                        selected = ScanLines(absoluteIndex, 0, _currentLine.Index);
+                    }
+                }
+            }
+            else
+            {
+                // This index is on the last read line
+                selected = _currentLine;
             }
 
             Debug.Assert(selected == null || selected.Contains(absoluteIndex));
@@ -108,18 +134,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return selected;
         }
 
-        private TextLine ScanLines(int absoluteIndex, int startPos)
+        private TextLine ScanLines(int absoluteIndex, int startLineIndex, int endLineIndex)
         {
-            for (int i = 0; i < _lines.Count; i++)
-            {
-                var idx = (i + startPos) % _lines.Count;
-                Debug.Assert(idx >= 0 && idx < _lines.Count);
+            // binary search for the line containing absoluteIndex
+            var lowIndex = startLineIndex;
+            var highIndex = _lines.Count;
 
-                if (_lines[idx].Contains(absoluteIndex))
+            while (lowIndex != highIndex)
+            {
+                var midIndex = (lowIndex + highIndex) / 2;
+                var midLine = _lines[midIndex];
+
+                if (absoluteIndex >= midLine.End)
                 {
-                    return _lines[idx];
+                    lowIndex = midIndex + 1;
+                }
+                else if (absoluteIndex < midLine.Start)
+                {
+                    highIndex = midIndex;
+                }
+                else
+                {
+                    return midLine;
                 }
             }
+
             return null;
         }
 

From c027fcf8e60f894d81a3de560822ea3b287123e7 Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Thu, 7 May 2020 20:44:15 -0700
Subject: [PATCH 329/337] Missed a minor optimization as I wasn't using a
 parameter for the binary search method. The files I've opened don't actually
 hit the code path (they always hit the optimization for checking the
 previous/next/current line) \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/75f34eec6069cb39a2c6bb5303f27a132bb73b51

---
 .../src/Legacy/LineTrackingStringBuffer.cs                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
index d99264cb2c..eb3c20c8c2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LineTrackingStringBuffer.cs
@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             // binary search for the line containing absoluteIndex
             var lowIndex = startLineIndex;
-            var highIndex = _lines.Count;
+            var highIndex = endLineIndex;
 
             while (lowIndex != highIndex)
             {

From ed7338c15af0c9a06cbfed44fa32d44cabebf8fc Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 8 May 2020 16:05:32 -0700
Subject: [PATCH 330/337] Remove RazorDeveloperTools because they were
 infrequently used and caused problems. \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/c2d717bc98d8018424cdd6d2988c27152bc80ba5

---
 .../src/Properties/AssemblyInfo.cs                               | 1 -
 .../Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
index f4d78acaaa..1ca6548f16 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs
@@ -15,7 +15,6 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("RazorDeveloperTools, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
index f59363b736..c83b18dbc5 100644
--- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
+++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs
@@ -22,5 +22,4 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("RazorDeveloperTools, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

From b0d819f1e8eea6275b4e05b6d2ba6fc069b3b06c Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Sat, 9 May 2020 06:06:13 -0700
Subject: [PATCH 331/337] Several changes targeted to improving perf of
 RazorSyntaxTree.Parse (dotnet/aspnetcore-tooling#1874)

* Several changes targeted to improving perf of RazorSyntaxTree.Parse

1) Modify ParserHelpers.IsNewLine to use a switch instead of Array.IndexOf
2) Modify Tokenizer.CreateToken to take in an array of RazorDiagnostics rather than an IReadOnlyList as that was causing a ToArray call on an empty diagnostics very often (during a SyntaxFactory.Token call)
3) Modify TokenizerBackedParser.Putback to allow an IReadOnlyList as a parameter to not require creation of a reverse enumerator.
4) Cut down allocations in HtmlMarkupParser.GetParserState by:
    a) Using an IReadOnlyList instead of IEnumerable to get rid of the allocations from the .any calls
    b) Don't allocate while reading initial spacing
    c) Inline the IsSpacingToken code so cut down on code executed and need to allocate a separate Func
5) Modify CSharpCodeParser.IsSpacingToken to now be a set of methods instead of a single method that allocates a Func. This is a very high traffic method.
6) Implement a fairly rudimentary Whitespace token cache, as they can be reused. This was based off Roslyn's SyntaxNodeCache, but simplified significantly. It's probably worth investigating whether you should more fully embrance token caching outside of whitespace.

* PR feedback and added one more optimization in LocateOwner that's been bugging me for years. Assuming all chidlren are contained within a nodes span, we can short-circuit the DFS this code was doing significantly cutting time in this method which is important as it's exercised on the main thread during typing.

* missed a space

* StringTextToSnapshot's switch to IsNewLine needed to use start as the index to begin the search, not zero.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/45411f752667c3d5801ab1382f46aa45978d2926
---
 .../src/Legacy/CSharpCodeParser.cs            | 69 +++++++++++--------
 .../Legacy/CSharpLanguageCharacteristics.cs   |  2 +-
 .../src/Legacy/CSharpTokenizer.cs             |  2 +-
 .../src/Legacy/HtmlLanguageCharacteristics.cs |  2 +-
 .../src/Legacy/HtmlMarkupParser.cs            | 29 ++++++--
 .../src/Legacy/HtmlTokenizer.cs               |  2 +-
 .../src/Legacy/LanguageCharacteristics.cs     |  2 +-
 .../src/Legacy/LegacySyntaxNodeExtensions.cs  | 13 +++-
 .../src/Legacy/ParserHelpers.cs               | 20 +++---
 .../src/Legacy/Tokenizer.cs                   |  2 +-
 .../src/Legacy/TokenizerBackedParser.cs       |  8 +++
 .../Syntax/InternalSyntax/SyntaxFactory.cs    | 13 ++--
 .../InternalSyntax/WhitespaceTokenCache.cs    | 46 +++++++++++++
 .../test/Legacy/TokenizerLookaheadTest.cs     |  2 +-
 14 files changed, 155 insertions(+), 57 deletions(-)
 create mode 100644 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/WhitespaceTokenCache.cs

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index 9832833a33..f3ee43d6dd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         });
 
         private static readonly Func<SyntaxToken, bool> IsValidStatementSpacingToken =
-            IsSpacingToken(includeNewLines: true, includeComments: true);
+            IsSpacingTokenIncludingNewLinesAndComments;
 
         internal static readonly DirectiveDescriptor AddTagHelperDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
             SyntaxConstants.CSharp.AddTagHelperKeyword,
@@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     NextToken();
 
-                    var precedingWhitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                    var precedingWhitespace = ReadWhile(IsSpacingTokenIncludingNewLinesAndComments);
 
                     // We are usually called when the other parser sees a transition '@'. Look for it.
                     SyntaxToken transitionToken = null;
@@ -1317,7 +1317,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                         if (At(SyntaxKind.Whitespace))
                         {
-                            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                            AcceptWhile(IsSpacingTokenIncludingComments);
 
                             if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
                                 tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
@@ -1443,7 +1443,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         directiveBuilder.Add(OutputTokensAsStatementLiteral());
                     }
 
-                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    AcceptWhile(IsSpacingTokenIncludingComments);
                     SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
 
                     switch (descriptor.Kind)
@@ -1455,7 +1455,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             TryAccept(SyntaxKind.Semicolon);
                             directiveBuilder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Whitespace));
 
-                            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                            AcceptWhile(IsSpacingTokenIncludingComments);
 
                             if (At(SyntaxKind.NewLine))
                             {
@@ -1478,7 +1478,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
                             break;
                         case DirectiveKind.RazorBlock:
-                            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                            AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
                             SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
                             directiveBuilder.Add(OutputTokensAsUnclassifiedLiteral());
 
@@ -1502,7 +1502,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             });
                             break;
                         case DirectiveKind.CodeBlock:
-                            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                            AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
                             SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
                             directiveBuilder.Add(OutputTokensAsUnclassifiedLiteral());
 
@@ -1753,7 +1753,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             AcceptAndMoveNext();
 
             // Accept 1 or more spaces between the await and the following code.
-            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            AcceptWhile(IsSpacingTokenIncludingComments);
 
             // Top level basically indicates if we're within an expression or statement.
             // Ex: topLevel true = @await Foo()  |  topLevel false = @{ await Foo(); }
@@ -1806,12 +1806,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private void ParseConditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
         {
             AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
 
             // Parse the condition, if present (if not present, we'll let the C# compiler complain)
             if (TryParseCondition(builder))
             {
-                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
 
                 ParseExpectedCodeBlock(builder, block);
             }
@@ -1874,7 +1874,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Assert(SyntaxKind.Keyword);
             var block = new Block(CurrentToken, CurrentStart);
             AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
             ParseExpectedCodeBlock(builder, block);
         }
 
@@ -1937,7 +1937,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var block = new Block(CurrentToken, CurrentStart);
 
             AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
             if (At(CSharpKeyword.If))
             {
                 // ElseIf
@@ -2059,7 +2059,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 Accept(whitespace);
                 Assert(CSharpKeyword.While);
                 AcceptAndMoveNext();
-                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
                 if (TryParseCondition(builder) && TryAccept(SyntaxKind.Semicolon))
                 {
                     SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
@@ -2078,7 +2078,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var topLevel = transition != null;
             var block = new Block(CurrentToken, CurrentStart);
             var usingToken = EatCurrentToken();
-            var whitespaceOrComments = ReadWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            var whitespaceOrComments = ReadWhile(IsSpacingTokenIncludingComments);
             var atLeftParen = At(SyntaxKind.LeftParenthesis);
             var atIdentifier = At(SyntaxKind.Identifier);
             var atStatic = At(CSharpKeyword.Static);
@@ -2115,7 +2115,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         builder.Add(transition);
                     }
                     AcceptAndMoveNext();
-                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    AcceptWhile(IsSpacingTokenIncludingComments);
                     ParseStandardStatement(builder);
                 }
                 else
@@ -2132,7 +2132,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
 
                 AcceptAndMoveNext();
-                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                AcceptWhile(IsSpacingTokenIncludingComments);
             }
 
             if (topLevel)
@@ -2145,7 +2145,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             Assert(CSharpKeyword.Using);
             AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            AcceptWhile(IsSpacingTokenIncludingComments);
 
             Assert(SyntaxKind.LeftParenthesis);
             if (transition != null)
@@ -2156,7 +2156,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Parse condition
             if (TryParseCondition(builder))
             {
-                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
 
                 // Parse code block
                 ParseExpectedCodeBlock(builder, block);
@@ -2174,14 +2174,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 AcceptAndMoveNext();
                 var isStatic = false;
                 var nonNamespaceTokenCount = TokenBuilder.Count;
-                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                AcceptWhile(IsSpacingTokenIncludingComments);
                 var start = CurrentStart;
                 if (At(SyntaxKind.Identifier))
                 {
                     // non-static using
                     nonNamespaceTokenCount = TokenBuilder.Count;
                     TryParseNamespaceOrTypeName(directiveBuilder);
-                    var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                    var whitespace = ReadWhile(IsSpacingTokenIncludingNewLinesAndComments);
                     if (At(SyntaxKind.Assign))
                     {
                         // Alias
@@ -2189,7 +2189,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         Assert(SyntaxKind.Assign);
                         AcceptAndMoveNext();
 
-                        AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                        AcceptWhile(IsSpacingTokenIncludingNewLinesAndComments);
 
                         // One more namespace or type name
                         TryParseNamespaceOrTypeName(directiveBuilder);
@@ -2205,7 +2205,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     // static using
                     isStatic = true;
                     AcceptAndMoveNext();
-                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    AcceptWhile(IsSpacingTokenIncludingComments);
                     nonNamespaceTokenCount = TokenBuilder.Count;
                     TryParseNamespaceOrTypeName(directiveBuilder);
                 }
@@ -2391,7 +2391,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             while (!EndOfFile)
             {
-                var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                var whitespace = ReadWhile(IsSpacingTokenIncludingNewLinesAndComments);
                 if (At(SyntaxKind.RazorCommentTransition))
                 {
                     Accept(whitespace);
@@ -2622,11 +2622,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 result.Value == keyword;
         }
 
-        protected static Func<SyntaxToken, bool> IsSpacingToken(bool includeNewLines, bool includeComments)
-        {
-            return token => token.Kind == SyntaxKind.Whitespace ||
-                          (includeNewLines && token.Kind == SyntaxKind.NewLine) ||
-                          (includeComments && token.Kind == SyntaxKind.CSharpComment);
+        protected static bool IsSpacingToken(SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.Whitespace;
+        }
+
+        protected static bool IsSpacingTokenIncludingNewLines(SyntaxToken token)
+        {
+            return IsSpacingToken(token) || token.Kind == SyntaxKind.NewLine;
+        }
+
+        protected static bool IsSpacingTokenIncludingComments(SyntaxToken token)
+        {
+            return IsSpacingToken(token) || token.Kind == SyntaxKind.CSharpComment;
+        }
+
+        protected static bool IsSpacingTokenIncludingNewLinesAndComments(SyntaxToken token)
+        {
+            return IsSpacingTokenIncludingNewLines(token) || token.Kind == SyntaxKind.CSharpComment;
         }
 
         protected class Block
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
index 3a017b54de..c251448df4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return new CSharpTokenizer(source);
         }
 
-        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, RazorDiagnostic[] errors)
         {
             return SyntaxFactory.Token(kind, content, errors);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs
index 21cd0dc00b..625ccb1741 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpTokenizer.cs
@@ -344,7 +344,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return base.GetTokenContent(type);
         }
 
-        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, RazorDiagnostic [] errors)
         {
             return SyntaxFactory.Token(kind, content, errors);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs
index 5efd2b80a5..8ef842f56e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlLanguageCharacteristics.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, RazorDiagnostic [] errors)
         {
             return SyntaxFactory.Token(kind, content, errors);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index 8754420217..c62be1c46e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1718,12 +1718,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
+        private IReadOnlyList<SyntaxToken> FastReadWhitespaceAndNewLines()
+        {
+            if (EnsureCurrent() && (CurrentToken.Kind == SyntaxKind.Whitespace || CurrentToken.Kind == SyntaxKind.NewLine))
+            {
+                var whitespaceTokens = new List<SyntaxToken>();
+
+                whitespaceTokens.Add(CurrentToken);
+                NextToken();
+
+                while (EnsureCurrent() && (CurrentToken.Kind == SyntaxKind.Whitespace || CurrentToken.Kind == SyntaxKind.NewLine))
+                {
+                    whitespaceTokens.Add(CurrentToken);
+                    NextToken();
+                }
+
+                return whitespaceTokens;
+            }
+
+            return Array.Empty<SyntaxToken>();
+        }
+
         private ParserState GetParserState(ParseMode mode)
         {
-            var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true));
+            var whitespace = FastReadWhitespaceAndNewLines();
             try
             {
-                if (!whitespace.Any() && EndOfFile)
+                if (whitespace.Count == 0 && EndOfFile)
                 {
                     return ParserState.EOF;
                 }
@@ -1742,7 +1763,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     // Let the transition parser handle the preceding whitespace.
                     return ParserState.CodeTransition;
                 }
-                else if (whitespace.Any())
+                else if (whitespace.Count > 0)
                 {
                     // This whitespace isn't sensitive to what comes after it.
                     return ParserState.Misc;
@@ -1792,7 +1813,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             finally
             {
-                if (whitespace.Any())
+                if (whitespace.Count > 0)
                 {
                     PutCurrentBack();
                     PutBack(whitespace);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
index b06f49f9ea..97a270e9e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             get { return SyntaxKind.RazorCommentStar; }
         }
 
-        protected override SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind type, RazorDiagnostic[] errors)
         {
             return SyntaxFactory.Token(type, content, errors);
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs
index 94b3f9acee..29583baa37 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LanguageCharacteristics.cs
@@ -103,6 +103,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return type == KnownTokenType.Unknown || !Equals(GetKnownTokenType(type), GetKnownTokenType(KnownTokenType.Unknown));
         }
 
-        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors);
+        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, RazorDiagnostic[] errors);
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
index bdfbb27c43..95152d53a8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
@@ -95,14 +95,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return null;
             }
 
+            if (node.EndPosition < change.Span.AbsoluteIndex)
+            {
+                // no need to look into this node as it completely precedes the change
+                return null;
+            }
+
             if (IsSpanKind(node))
             {
                 var editHandler = node.GetSpanContext()?.EditHandler ?? SpanEditHandler.CreateDefault();
                 return editHandler.OwnsChange(node, change) ? node : null;
             }
 
-            SyntaxNode owner = null;
-            IEnumerable<SyntaxNode> children;
+            IReadOnlyList<SyntaxNode> children;
             if (node is MarkupStartTagSyntax startTag)
             {
                 children = startTag.Children;
@@ -124,8 +129,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 children = node.ChildNodes();
             }
 
-            foreach (var child in children)
+            SyntaxNode owner = null;
+            for (int i = 0; i < children.Count; i++)
             {
+                var child = children[i];
                 owner = LocateOwner(child, change);
                 if (owner != null)
                 {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
index e3af908e77..17f015e7ea 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/ParserHelpers.cs
@@ -10,16 +10,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal static class ParserHelpers
     {
-        public static char[] NewLineCharacters = new[]
+        public static bool IsNewLine(char value)
         {
-            '\r', // Carriage return
-            '\n', // Linefeed
-            '\u0085', // Next Line
-            '\u2028', // Line separator
-            '\u2029' // Paragraph separator
-        };
+            switch (value)
+            {
+                case '\r': // Carriage return
+                case '\n': // Linefeed
+                case '\u0085': // Next Line
+                case '\u2028': // Line separator
+                case '\u2029': // Paragraph separator
+                    return true;
+            }
 
-        public static bool IsNewLine(char value) => Array.IndexOf<char>(NewLineCharacters, value) != -1;
+            return false;
+        }
 
         public static bool IsNewLine(string value)
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs
index 09ad7eb1b6..5e22cdfeb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/Tokenizer.cs
@@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public SourceLocation CurrentStart { get; private set; }
 
-        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors);
+        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, RazorDiagnostic [] errors);
 
         protected abstract StateResult Dispatch();
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
index 66c5977d3c..e6f80228fb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
@@ -185,6 +185,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
+        protected internal void PutBack(IReadOnlyList<SyntaxToken> tokens)
+        {
+            for (int i = tokens.Count - 1; i >= 0; i--)
+            {
+                PutBack(tokens[i]);
+            }
+        }
+
         protected internal void PutCurrentBack()
         {
             if (!EndOfFile && CurrentToken != null)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
index b8dba7bdf7..6f60cc6b41 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
@@ -1,20 +1,19 @@
 // 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.Collections.Generic;
-using System.Linq;
+using System;
 
 namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
 {
     internal static partial class SyntaxFactory
     {
-        internal static SyntaxToken Token(SyntaxKind kind, string content, IEnumerable<RazorDiagnostic> diagnostics)
-        {
-            return Token(kind, content, diagnostics.ToArray());
-        }
-
         internal static SyntaxToken Token(SyntaxKind kind, string content, params RazorDiagnostic[] diagnostics)
         {
+            if (kind == SyntaxKind.Whitespace && diagnostics.Length == 0)
+            {
+                return WhitespaceTokenCache.GetToken(content);
+            }
+
             return new SyntaxToken(kind, content, diagnostics);
         }
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/WhitespaceTokenCache.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/WhitespaceTokenCache.cs
new file mode 100644
index 0000000000..f7fede8aa7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/WhitespaceTokenCache.cs
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    // Simplified version of Roslyn's SyntaxNodeCache
+    internal static class WhitespaceTokenCache
+    {
+        private const int CacheSizeBits = 8;
+        private const int CacheSize = 1 << CacheSizeBits;
+        private const int CacheMask = CacheSize - 1;
+        private static readonly Entry[] s_cache = new Entry[CacheSize];
+
+        private struct Entry
+        {
+            public int Hash { get; }
+            public SyntaxToken Token { get; }
+
+            internal Entry(int hash, SyntaxToken token)
+            {
+                Hash = hash;
+                Token = token;
+            }
+        }
+
+        public static SyntaxToken GetToken(string content)
+        {
+            var hash = content.GetHashCode();
+
+            var idx = hash & CacheMask;
+            var e = s_cache[idx];
+
+            if (e.Hash == hash && e.Token?.Content == content)
+            {
+                return e.Token;
+            }
+
+            var token = new SyntaxToken(SyntaxKind.Whitespace, content, Array.Empty<RazorDiagnostic>());
+            s_cache[idx] = new Entry(hash, token);
+
+            return token;
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs
index 655a88d14a..5561f2e3c0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Legacy/TokenizerLookaheadTest.cs
@@ -191,7 +191,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             protected override SyntaxToken CreateToken(
                 string content,
                 SyntaxKind type,
-                IReadOnlyList<RazorDiagnostic> errors)
+                RazorDiagnostic[] errors)
             {
                 throw new NotImplementedException();
             }

From f701a188c2f24fe3414aa9d09255fea154488cd2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 02:32:33 +0000
Subject: [PATCH 332/337] [master] Update dependencies from dotnet/arcade
 dotnet/runtime (dotnet/aspnetcore-tooling#1873)

* Update dependencies from https://github.com/dotnet/runtime build 20200507.11

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11

* Update dependencies from https://github.com/dotnet/arcade build 20200506.5

- Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5

* Update SDKs and TFMs

* Try fixing SDK target

* Try removing reference to xunit?

* Try again?

* Revert test tfm

* Remove more xunit references

* Update dependencies from https://github.com/dotnet/runtime build 20200508.3

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3

* Use `dotnet msbuild` in CI builds

* Update dependencies from https://github.com/dotnet/runtime build 20200509.5

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5

* Try undoing `$(EnableFrameworkPathOverride) workaround

* Fix windows builds

* Fix NET.sdk.Razor.Test

* Try fix codecheck

* Skip tests failing with CS1701

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: John Luo <johluo@microsoft.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a60b721dbb07a55a4a91452ef3cf8af4e6fbec46
---
 .../CodeGenerationIntegrationTest.cs                 | 12 ++++++------
 .../CodeGenerationIntegrationTest.cs                 | 12 ++++++------
 .../netstandard2.0/Sdk.Razor.CurrentVersion.targets  |  2 +-
 .../ApplicationPartDiscoveryIntegrationTest.cs       |  2 +-
 .../test/IntegrationTests/BuildIntrospectionTest.cs  |  4 ++--
 .../InitializeTestProjectAttribute.cs                |  2 +-
 .../test/IntegrationTests/PackIntegrationTest.cs     |  2 +-
 .../test/IntegrationTests/PublishIntegrationTest.cs  |  2 +-
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj         |  2 +-
 .../Microsoft.AspNetCore.Razor.Test.Common.csproj    |  1 -
 10 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 1ff7ec5794..367b72d260 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -181,7 +181,7 @@ public class MyModel
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void Sections_Runtime()
         {
             // Arrange
@@ -315,7 +315,7 @@ public class MyService<TModel>
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void ModelExpressionTagHelper_Runtime()
         {
             // Arrange
@@ -338,7 +338,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void RazorPages_Runtime()
         {
             // Arrange
@@ -373,7 +373,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void RazorPagesWithoutModel_Runtime()
         {
             // Arrange
@@ -422,7 +422,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void ViewComponentTagHelper_Runtime()
         {
             // Arrange
@@ -793,7 +793,7 @@ public class ThisShouldBeGenerated
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
             Assert.Equal("RZ2001", Assert.Single(diagnotics).Id);
         }
-        
+
         [Fact]
         public void ModelExpressionTagHelper_DesignTime()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index b93507ffb3..150d4e012b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -224,7 +224,7 @@ public class MyModel
             AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void Sections_Runtime()
         {
             // Arrange
@@ -364,7 +364,7 @@ public class MyService<TModel>
             AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void ModelExpressionTagHelper_Runtime()
         {
             // Arrange
@@ -388,7 +388,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
             AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void RazorPages_Runtime()
         {
             // Arrange
@@ -425,7 +425,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void RazorPagesWithoutModel_Runtime()
         {
             // Arrange
@@ -477,7 +477,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
             AssertLinePragmas(compiled.CodeDocument, designTime: false);
         }
 
-        [Fact]
+        [Fact(Skip = "Reenable after CS1701 errors are resolved")]
         public void ViewComponentTagHelper_Runtime()
         {
             // Arrange
@@ -918,7 +918,7 @@ public class ThisShouldBeGenerated
             var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
             Assert.Equal("RZ2001", Assert.Single(diagnotics).Id);
         }
-        
+
         [Fact]
         public void ModelExpressionTagHelper_DesignTime()
         {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index dfee69656f..0b6cf45554 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
     <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
     <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
-    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp5.0</_RazorSdkTasksTFM>
+    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net5.0</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
   </PropertyGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
index f258b6eaa1..32f91bbdd2 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ApplicationPartDiscoveryIntegrationTest.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         public Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute_WhenBuildingUsingDotnetMsbuild()
             => Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute(MSBuildProcessKind.Dotnet);
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "net5.0 TFM is not recognized on Desktop MSBuild. A VS update will be needed.")]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
         public Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute_WhenBuildingUsingDesktopMsbuild()
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
index 2e894fce62..c28c02c0d3 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs
@@ -235,8 +235,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 .Value;
 
             var tfm =
-#if NETCOREAPP5_0
-                "netcoreapp5.0";
+#if NETCOREAPP
+                "net5.0";
 #else
 #error Target framework needs to be updated.
 #endif
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
index 0134607143..ccc1b06af9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/InitializeTestProjectAttribute.cs
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
 #if NETCOREAPP
-            MSBuildIntegrationTestBase.TargetFramework = "netcoreapp5.0";
+            MSBuildIntegrationTestBase.TargetFramework = "net5.0";
 #else
 #error Target frameworks need to be updated
 #endif
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
index 56c1cefaba..dfe9c90f48 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
     public class PackIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
     {
-        private static readonly string TFM = "netcoreapp5.0";
+        private static readonly string TFM = "net5.0";
 
         public PackIntegrationTest(BuildServerTestFixture buildServer)
             : base(buildServer)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
index f17512a89d..0b1231567d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PublishIntegrationTest.cs
@@ -434,7 +434,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
 
             Assert.BuildFailed(result);
-            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp5.0/SimpleMvc.dll because it couldn't be found.
+            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/net5.0/SimpleMvc.dll because it couldn't be found.
 
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index 84daa6f3fb..e6cb9bd946 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -7,7 +7,7 @@
       This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project
       has netcoreapp dependencies that need to be built first.
     -->
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants>
     <!-- Copy references locally so that we can use them in the test. -->
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index 7e1f994a0f..d0c78e7bdf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -17,7 +17,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Runtime_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>

From d1e7d8e46644f0fd6815625c57f98d0fde1cf92a Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Mon, 11 May 2020 10:26:56 -0700
Subject: [PATCH 333/337] Improve HtmlTokenizer.AtToken performance.
 (dotnet/aspnetcore-tooling#1880)

Our razor typing test measured 153 CPU ms in this method. Optimized by fewer calls to CurrentCharacter, not checking '<' twice, and uswing a switch stmt.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/c601c2f11eda36eecbf598d4506fb305f5b3d075
---
 .../src/Legacy/HtmlTokenizer.cs               | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
index 97a270e9e6..aab93bdef8 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlTokenizer.cs
@@ -253,21 +253,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return EndToken(SyntaxKind.NewLine);
         }
 
-        private bool AtToken()
+        private bool AtToken()
         {
-            return CurrentCharacter == '<' ||
-                   CurrentCharacter == '<' ||
-                   CurrentCharacter == '!' ||
-                   CurrentCharacter == '/' ||
-                   CurrentCharacter == '?' ||
-                   CurrentCharacter == '[' ||
-                   CurrentCharacter == '>' ||
-                   CurrentCharacter == ']' ||
-                   CurrentCharacter == '=' ||
-                   CurrentCharacter == '"' ||
-                   CurrentCharacter == '\'' ||
-                   CurrentCharacter == '@' ||
-                   (CurrentCharacter == '-' && Peek() == '-');
+            switch (CurrentCharacter)
+            {
+                case '<':
+                case '!':
+                case '/':
+                case '?':
+                case '[':
+                case '>':
+                case ']':
+                case '=':
+                case '"':
+                case '\'':
+                case '@':
+                    return true;
+                case '-':
+                    return Peek() == '-';
+            }
+
+            return false;
         }
 
         private StateResult Transition(HtmlTokenizerState state)

From 485924edd2b7395d67ed5e3344daa70612769d54 Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Mon, 11 May 2020 10:27:40 -0700
Subject: [PATCH 334/337] Improve Annotation and SpanContext performance.
 (dotnet/aspnetcore-tooling#1881)

The razor perf test shows about 70 ms CPU of WithSpanContext is in allocation. GetAnnotation similarly is showing about 60 ms in allocation (of which this only partly improves)\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/a060f129ff01176eb30b20379e951e05fedbc7a4
---
 .../src/Legacy/LegacySyntaxNodeExtensions.cs  | 28 +++++++++++++------
 .../src/Syntax/SyntaxNodeExtensions.cs        |  5 ++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
index 95152d53a8..46bcd01003 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/LegacySyntaxNodeExtensions.cs
@@ -67,17 +67,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             var newAnnotation = new SyntaxAnnotation(SyntaxConstants.SpanContextKind, spanContext);
 
-            var newAnnotations = new List<SyntaxAnnotation>();
-            newAnnotations.Add(newAnnotation);
-            foreach (var annotation in node.GetAnnotations())
-            {
-                if (annotation.Kind != newAnnotation.Kind)
-                {
-                    newAnnotations.Add(annotation);
+            List<SyntaxAnnotation> newAnnotations = null;
+            if (node.ContainsAnnotations)
+            {
+                var existingNodeAnnotations = node.GetAnnotations();
+                for (int i = 0; i < existingNodeAnnotations.Length; i++)
+                {
+                    var annotation = existingNodeAnnotations[i];
+                    if (annotation.Kind != newAnnotation.Kind)
+                    {
+                        if (newAnnotations == null)
+                        {
+                            newAnnotations = new List<SyntaxAnnotation>();
+                            newAnnotations.Add(newAnnotation);
+                        }
+
+                        newAnnotations.Add(annotation);
+                    }
                 }
             }
+
+            var newAnnotationsArray = newAnnotations == null ? new[] { newAnnotation } : newAnnotations.ToArray();
 
-            return node.WithAnnotations(newAnnotations.ToArray());
+            return node.WithAnnotations(newAnnotationsArray);
         }
 
         public static SyntaxNode LocateOwner(this SyntaxNode node, SourceChange change)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
index 677c06d894..ae0973cfff 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/SyntaxNodeExtensions.cs
@@ -28,6 +28,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
                 throw new ArgumentNullException(nameof(node));
             }
 
+            if (!node.ContainsAnnotations)
+            {
+                return null;
+            }
+
             var annotation = node.GetAnnotations().FirstOrDefault(n => n.Kind == key);
             return annotation?.Data;
         }

From a70de6b67b45d8218a19c20382eb9bc1aab9d7f6 Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Mon, 11 May 2020 10:28:31 -0700
Subject: [PATCH 335/337] Small perf improvement in
 TokenizerBackedParser.Accept and ReadWhile. (dotnet/aspnetcore-tooling#1882)

In the razor perf typing test, Accept was showing 27 ms allocating enumerators. Additionally, modified ReadWhile to only allocate if it would return a non-empty collection (and to not use the complexity introduced by using yield enumerators)\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/27a14af36aba89c11c5b9964774fa555fde08a52
---
 .../src/Legacy/CSharpCodeParser.cs            |  8 ++--
 .../src/Legacy/HtmlMarkupParser.cs            |  4 +-
 .../src/Legacy/TokenizerBackedParser.cs       | 38 +++++++++----------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index f3ee43d6dd..f3b6e22919 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -893,7 +893,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        protected bool TryParseDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, IEnumerable<SyntaxToken> whitespace, CSharpTransitionSyntax transition, string directive)
+        protected bool TryParseDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, IReadOnlyList<SyntaxToken> whitespace, CSharpTransitionSyntax transition, string directive)
         {
             if (_directiveParserMap.TryGetValue(directive, out var handler))
             {
@@ -1679,7 +1679,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder, IEnumerable<SyntaxToken> whitespace, CSharpTransitionSyntax transition)
+        private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder, IReadOnlyList<SyntaxToken> whitespace, CSharpTransitionSyntax transition)
         {
             var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
             Debug.Assert(CurrentToken.Kind == SyntaxKind.Keyword && result.HasValue);
@@ -2387,7 +2387,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private IEnumerable<SyntaxToken> SkipToNextImportantToken(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        private IReadOnlyList<SyntaxToken> SkipToNextImportantToken(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             while (!EndOfFile)
             {
@@ -2406,7 +2406,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     return whitespace;
                 }
             }
-            return Enumerable.Empty<SyntaxToken>();
+            return Array.Empty<SyntaxToken>();
         }
 
         private void DefaultSpanContextConfig(SpanContextBuilder spanContext)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
index c62be1c46e..8c416986ec 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1085,9 +1085,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private bool TryParseAttributeName(out IEnumerable<SyntaxToken> nameTokens)
+        private bool TryParseAttributeName(out IReadOnlyList<SyntaxToken> nameTokens)
         {
-            nameTokens = Enumerable.Empty<SyntaxToken>();
+            nameTokens = Array.Empty<SyntaxToken>();
             //
             // We are currently here <input |name="..." />
             // If we encounter a transition (@) here, it can be parsed as CSharp or Markup depending on the feature flag.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
index e6f80228fb..2cf825d005 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs
@@ -266,14 +266,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return true;
         }
 
-        protected internal IEnumerable<SyntaxToken> ReadWhile(params SyntaxKind[] types)
+        protected internal IReadOnlyList<SyntaxToken> ReadWhile(Func<SyntaxToken, bool> condition)
         {
-            return ReadWhile(token => types.Any(expected => expected == token.Kind));
-        }
+            if (!EnsureCurrent() || !condition(CurrentToken))
+            {
+                return Array.Empty<SyntaxToken>();
+            }
+
+            var result = new List<SyntaxToken>();
+            do
+            {
+                result.Add(CurrentToken);
+                NextToken();
+            }
+            while (EnsureCurrent() && condition(CurrentToken));
 
-        protected internal IEnumerable<SyntaxToken> ReadWhile(Func<SyntaxToken, bool> condition)
-        {
-            return ReadWhileLazy(condition).ToList();
+            return result;
         }
 
         protected bool AtIdentifier(bool allowKeywords)
@@ -283,17 +291,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     (allowKeywords && Language.IsKeyword(CurrentToken)));
         }
 
-        // Don't open this to sub classes because it's lazy but it looks eager.
-        // You have to advance the Enumerable to read the next characters.
-        internal IEnumerable<SyntaxToken> ReadWhileLazy(Func<SyntaxToken, bool> condition)
-        {
-            while (EnsureCurrent() && condition(CurrentToken))
-            {
-                yield return CurrentToken;
-                NextToken();
-            }
-        }
-
         protected RazorCommentBlockSyntax ParseRazorComment()
         {
             if (!Language.KnowsTokenType(KnownTokenType.CommentStart) ||
@@ -430,13 +427,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         protected internal void AcceptWhile(Func<SyntaxToken, bool> condition)
         {
-            Accept(ReadWhileLazy(condition));
+            Accept(ReadWhile(condition));
         }
 
-        protected internal void Accept(IEnumerable<SyntaxToken> tokens)
+        protected internal void Accept(IReadOnlyList<SyntaxToken> tokens)
         {
-            foreach (var token in tokens)
+            for(int i = 0; i < tokens.Count; i++)
             {
+                var token = tokens[i];
                 Accept(token);
             }
         }

From 016fd1ee9e3e263072dae8f07601adfe0d911f3a Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Mon, 11 May 2020 12:42:39 -0700
Subject: [PATCH 336/337] Improve CSharpLanguageCharacteristics.MapKeyword
 performance (dotnet/aspnetcore-tooling#1879)

* Improve CSharpLanguageCharacteristics.MapKeyword performance

The razor typing perf test profile I'm looking at has 156 ms of CPU cycles spent in this method, mostly in Enum.ToString()
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/e821a4642e2148329cdf35c1b6cbd64e7ab9ae10
---
 .../Legacy/CSharpLanguageCharacteristics.cs   | 110 +++++++++++++++++-
 1 file changed, 107 insertions(+), 3 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
index c251448df4..febc9f6493 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpLanguageCharacteristics.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
@@ -9,8 +10,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class CSharpLanguageCharacteristics : LanguageCharacteristics<CSharpTokenizer>
     {
-        private static readonly CSharpLanguageCharacteristics _instance = new CSharpLanguageCharacteristics();
-
         private static Dictionary<SyntaxKind, string> _tokenSamples = new Dictionary<SyntaxKind, string>()
         {
             { SyntaxKind.Arrow, "->" },
@@ -64,8 +63,108 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             { SyntaxKind.Transition, "@" },
         };
 
+        // Allows performance optimization of GetKeyword such that it need not do Enum.ToString
+        private static IReadOnlyDictionary<CSharpKeyword, string> _keywordNames = new Dictionary<CSharpKeyword, string>()
+        {
+            { CSharpKeyword.Await, "await" },
+            { CSharpKeyword.Abstract, "abstract" },
+            { CSharpKeyword.Byte, "byte" },
+            { CSharpKeyword.Class, "class" },
+            { CSharpKeyword.Delegate, "delegate" },
+            { CSharpKeyword.Event, "event" },
+            { CSharpKeyword.Fixed, "fixed" },
+            { CSharpKeyword.If, "if" },
+            { CSharpKeyword.Internal, "internal" },
+            { CSharpKeyword.New, "new" },
+            { CSharpKeyword.Override, "override" },
+            { CSharpKeyword.Readonly, "readonly" },
+            { CSharpKeyword.Short, "short" },
+            { CSharpKeyword.Struct, "struct" },
+            { CSharpKeyword.Try, "try" },
+            { CSharpKeyword.Unsafe, "unsafe" },
+            { CSharpKeyword.Volatile, "volatile" },
+            { CSharpKeyword.As, "as" },
+            { CSharpKeyword.Do, "do" },
+            { CSharpKeyword.Is, "is" },
+            { CSharpKeyword.Params, "params" },
+            { CSharpKeyword.Ref, "ref" },
+            { CSharpKeyword.Switch, "switch" },
+            { CSharpKeyword.Ushort, "ushort" },
+            { CSharpKeyword.While, "while" },
+            { CSharpKeyword.Case, "case" },
+            { CSharpKeyword.Const, "const" },
+            { CSharpKeyword.Explicit, "explicit" },
+            { CSharpKeyword.Float, "float" },
+            { CSharpKeyword.Null, "null" },
+            { CSharpKeyword.Sizeof, "sizeof" },
+            { CSharpKeyword.Typeof, "typeof" },
+            { CSharpKeyword.Implicit, "implicit" },
+            { CSharpKeyword.Private, "private" },
+            { CSharpKeyword.This, "this" },
+            { CSharpKeyword.Using, "using" },
+            { CSharpKeyword.Extern, "extern" },
+            { CSharpKeyword.Return, "return" },
+            { CSharpKeyword.Stackalloc, "stackalloc" },
+            { CSharpKeyword.Uint, "uint" },
+            { CSharpKeyword.Base, "base" },
+            { CSharpKeyword.Catch, "catch" },
+            { CSharpKeyword.Continue, "continue" },
+            { CSharpKeyword.Double, "double" },
+            { CSharpKeyword.For, "for" },
+            { CSharpKeyword.In, "in" },
+            { CSharpKeyword.Lock, "lock" },
+            { CSharpKeyword.Object, "object" },
+            { CSharpKeyword.Protected, "protected" },
+            { CSharpKeyword.Static, "static" },
+            { CSharpKeyword.False, "false" },
+            { CSharpKeyword.Public, "public" },
+            { CSharpKeyword.Sbyte, "sbyte" },
+            { CSharpKeyword.Throw, "throw" },
+            { CSharpKeyword.Virtual, "virtual" },
+            { CSharpKeyword.Decimal, "decimal" },
+            { CSharpKeyword.Else, "else" },
+            { CSharpKeyword.Operator, "operator" },
+            { CSharpKeyword.String, "string" },
+            { CSharpKeyword.Ulong, "ulong" },
+            { CSharpKeyword.Bool, "bool" },
+            { CSharpKeyword.Char, "char" },
+            { CSharpKeyword.Default, "default" },
+            { CSharpKeyword.Foreach, "foreach" },
+            { CSharpKeyword.Long, "long" },
+            { CSharpKeyword.Void, "void" },
+            { CSharpKeyword.Enum, "enum" },
+            { CSharpKeyword.Finally, "finally" },
+            { CSharpKeyword.Int, "int" },
+            { CSharpKeyword.Out, "out" },
+            { CSharpKeyword.Sealed, "sealed" },
+            { CSharpKeyword.True, "true" },
+            { CSharpKeyword.Goto, "goto" },
+            { CSharpKeyword.Unchecked, "unchecked" },
+            { CSharpKeyword.Interface, "interface" },
+            { CSharpKeyword.Break, "break" },
+            { CSharpKeyword.Checked, "checked" },
+            { CSharpKeyword.Namespace, "namespace" },
+            { CSharpKeyword.When,  "when" },
+        };
+
+        private static readonly CSharpLanguageCharacteristics _instance = new CSharpLanguageCharacteristics();
+
         protected CSharpLanguageCharacteristics()
         {
+#if DEBUG
+            var values = Enum.GetValues(typeof(CSharpKeyword));
+
+            Debug.Assert(values.Length == _keywordNames.Count, "_keywordNames and CSharpKeyword are out of sync");
+            for (var i = 0; i < values.Length; i++)
+            {
+                var keyword = (CSharpKeyword) values.GetValue(i);
+
+                var expectedValue = keyword.ToString().ToLowerInvariant();
+                var actualValue = _keywordNames[keyword];
+
+                Debug.Assert(expectedValue == actualValue, "_keywordNames and CSharpKeyword are out of sync for " + expectedValue);
+            }
+#endif
         }
 
         public static CSharpLanguageCharacteristics Instance => _instance;
@@ -170,7 +269,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public static string GetKeyword(CSharpKeyword keyword)
         {
-            return keyword.ToString().ToLowerInvariant();
+            if (!_keywordNames.TryGetValue(keyword, out var value))
+            {
+                value = keyword.ToString().ToLowerInvariant();
+            }
+
+            return value;
         }
     }
 }
\ No newline at end of file

From d782a064621de7c7042c185d26ce7ba71e4d37a6 Mon Sep 17 00:00:00 2001
From: Todd Grunke <toddgrun@microsoft.com>
Date: Wed, 13 May 2020 16:00:34 -0700
Subject: [PATCH 337/337] Decrease allocations from using method groups
 (dotnet/aspnetcore-tooling#1896)

* Previous optimization didn't help as much as intended.

By specifying a method group as the arguments to method like ReadWhile, an allocation was still occurring. Instead, cache the Func as a member in the class and use it instead of the method group.\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/2e6aa150bc201c6381ccabfffd97e8361bb317e9
---
 .../src/Legacy/CSharpCodeParser.cs            | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index f3b6e22919..7339e9149f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -16,6 +16,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             '@', '!', '<', '/', '?', '[', '>', ']', '=', '"', '\'', '*'
         });
 
+        // Following four high traffic methods cached as using method groups would cause allocation on every invocation.
+        protected static readonly Func<SyntaxToken, bool> IsSpacingToken = (token) =>
+        {
+            return token.Kind == SyntaxKind.Whitespace;
+        };
+
+        protected static readonly Func<SyntaxToken, bool> IsSpacingTokenIncludingNewLines = (token) =>
+        {
+            return IsSpacingToken(token) || token.Kind == SyntaxKind.NewLine;
+        };
+
+        protected static readonly Func<SyntaxToken, bool> IsSpacingTokenIncludingComments = (token) =>
+        {
+            return IsSpacingToken(token) || token.Kind == SyntaxKind.CSharpComment;
+        };
+
+        protected static readonly Func<SyntaxToken, bool> IsSpacingTokenIncludingNewLinesAndComments = (token) =>
+        {
+            return IsSpacingTokenIncludingNewLines(token) || token.Kind == SyntaxKind.CSharpComment;
+        };
+
         private static readonly Func<SyntaxToken, bool> IsValidStatementSpacingToken =
             IsSpacingTokenIncludingNewLinesAndComments;
 
@@ -2622,26 +2643,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 result.Value == keyword;
         }
 
-        protected static bool IsSpacingToken(SyntaxToken token)
-        {
-            return token.Kind == SyntaxKind.Whitespace;
-        }
-
-        protected static bool IsSpacingTokenIncludingNewLines(SyntaxToken token)
-        {
-            return IsSpacingToken(token) || token.Kind == SyntaxKind.NewLine;
-        }
-
-        protected static bool IsSpacingTokenIncludingComments(SyntaxToken token)
-        {
-            return IsSpacingToken(token) || token.Kind == SyntaxKind.CSharpComment;
-        }
-
-        protected static bool IsSpacingTokenIncludingNewLinesAndComments(SyntaxToken token)
-        {
-            return IsSpacingTokenIncludingNewLines(token) || token.Kind == SyntaxKind.CSharpComment;
-        }
-
         protected class Block
         {
             public Block(string name, SourceLocation start)